67 files changed, 251929 insertions, 271146 deletions

diff --git a/tde-i18n-af/messages/tdepim/kmail.po b/tde-i18n-af/messages/tdepim/kmail.po
index 1c6d41ce572..c615f4c59e4 100644
--- a/tde-i18n-af/messages/tdepim/kmail.po
+++ b/tde-i18n-af/messages/tdepim/kmail.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 3_3_branch\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-11-10 16:33+0200\n"
 "Last-Translator: Frikkie Thirion <frix@expertron.co.za>\n"
 "Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -11,13 +11,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Frikkie Thirion"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -164,6 +164,11 @@ msgstr ""
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+msgid "Clear"
+msgstr ""
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -239,9 +244,9 @@ msgstr ""
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -263,12 +268,12 @@ msgstr ""
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -297,8 +302,9 @@ msgstr ""
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -348,13 +354,15 @@ msgstr ""
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr ""
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr ""
 
@@ -397,9 +405,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -456,9 +464,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -497,7 +505,7 @@ msgstr ""
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr ""
 
@@ -505,28 +513,29 @@ msgstr ""
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -535,23 +544,23 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -559,8 +568,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -637,8 +646,8 @@ msgstr ""
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -676,9 +685,9 @@ msgstr ""
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -746,8 +755,7 @@ msgstr ""
 msgid "Server Information"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "Klaar"
@@ -883,17 +891,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -928,10 +935,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -942,8 +948,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -953,8 +959,8 @@ msgstr ""
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -963,8 +969,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1148,8 +1154,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1169,8 +1175,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1200,15 +1206,15 @@ msgstr "Vee Uit"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1238,15 +1244,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr ""
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Stel KMail op..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr ""
@@ -1276,6 +1286,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr ""
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Verwyder Opskrif"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr ""
@@ -1284,6 +1299,11 @@ msgstr ""
 msgid "Modify..."
 msgstr ""
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Verwyder Opskrif"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr ""
@@ -1300,17 +1320,15 @@ msgstr ""
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr ""
@@ -1332,8 +1350,7 @@ msgstr ""
 msgid "Common Options"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr ""
@@ -1384,14 +1401,14 @@ msgstr ""
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1409,9 +1426,9 @@ msgstr ""
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr ""
 
@@ -1490,6 +1507,10 @@ msgstr ""
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr ""
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr ""
@@ -1604,8 +1625,7 @@ msgstr ""
 msgid "Misspelled Words"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nuwe boodskap"
@@ -1796,8 +1816,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1806,40 +1826,33 @@ msgstr ""
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1855,8 +1868,7 @@ msgstr ""
 msgid "Show s&pam status in fancy headers"
 msgstr "Vertoon al die boodskap opskrifte"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1865,8 +1877,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1892,8 +1903,7 @@ msgstr "Outo"
 msgid "&Override character encoding:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr ""
@@ -1997,13 +2007,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2027,21 +2036,20 @@ msgstr ""
 msgid "&Forward:"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr ""
 
@@ -2077,8 +2085,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2113,10 +2121,9 @@ msgstr ""
 msgid "Ne&w"
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr ""
@@ -2125,16 +2132,15 @@ msgstr ""
 msgid "&Value:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2161,13 +2167,13 @@ msgstr ""
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2192,62 +2198,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2264,10 +2264,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2346,8 +2346,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2376,8 +2375,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2401,8 +2400,8 @@ msgstr ""
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2469,16 +2468,14 @@ msgstr ""
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2513,32 +2510,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2604,8 +2596,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2614,8 +2606,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2668,19 +2660,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2693,14 +2684,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2809,17 +2800,16 @@ msgstr "Stuur aan"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2836,15 +2826,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2915,8 +2905,8 @@ msgstr "Redigeer Identiteit"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3166,6 +3156,11 @@ msgstr "Vee Gids uit"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Kies Alle Boodskappe"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3197,8 +3192,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3215,10 +3210,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3239,10 +3235,10 @@ msgstr ""
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3251,7 +3247,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr ""
@@ -3292,9 +3288,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3345,8 +3341,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3357,8 +3353,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3384,8 +3379,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3416,7 +3411,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Vee Gids uit"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr ""
@@ -3442,9 +3437,9 @@ msgstr ""
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3465,11 +3460,20 @@ msgstr "Kaneleer"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Onbekend"
@@ -3587,73 +3591,18 @@ msgstr "Status:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>B"
-"<br>o"
-"<br>o"
-"<br>d"
-"<br>s"
-"<br>k"
-"<br>a"
-"<br>p</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>B<br>o<br>o<br>d<br>s<br>k<br>a<br>p</"
+"b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>G"
-"<br>e"
-"<br>e"
-"<br>n"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>B"
-"<br>o"
-"<br>o"
-"<br>d"
-"<br>s"
-"<br>k"
-"<br>a"
-"<br>p</b></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>G<br>e<br>e<br>n<br> <br>H<br>T<br>M<br>L<br> "
+"<br>B<br>o<br>o<br>d<br>s<br>k<br>a<br>p</b></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3665,12 +3614,9 @@ msgstr "Jou naam:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3679,11 +3625,9 @@ msgstr "Organisiasie"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3692,14 +3636,11 @@ msgstr "E-pos adres:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3709,21 +3650,12 @@ msgstr "E-pos adres:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3746,12 +3678,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3764,20 +3695,18 @@ msgstr ""
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3796,11 +3725,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3813,18 +3741,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3845,14 +3772,12 @@ msgstr ""
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3861,15 +3786,12 @@ msgstr ""
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3909,7 +3831,7 @@ msgstr ""
 msgid "&Picture"
 msgstr ""
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr ""
 
@@ -3927,8 +3849,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -3977,8 +3899,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr ""
 
@@ -4024,14 +3946,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4068,14 +3990,18 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
+msgstr ""
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+msgid "Error"
 msgstr ""
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4220,14 +4146,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4254,136 +4180,110 @@ msgstr ""
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4397,136 +4297,110 @@ msgstr "Sertifikaat Bestuurder..."
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4539,9 +4413,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4567,26 +4442,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4597,8 +4472,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4620,8 +4495,8 @@ msgstr ""
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4641,8 +4516,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4678,11 +4553,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4722,8 +4597,7 @@ msgid "Critical error: Unable to collect mail: "
 msgstr ""
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
 msgstr ""
 
 #: kmacctimap.cpp:300
@@ -4813,6 +4687,50 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr ""
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr ""
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr ""
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr ""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr ""
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr ""
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr ""
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Pos"
@@ -4866,9 +4784,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4915,11 +4833,11 @@ msgstr ""
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Stoor na Lêer"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Vervang"
 
@@ -4937,7 +4855,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4956,210 +4874,210 @@ msgstr "Gaan na die vorige ongeleesde boodskap"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Vee boodskappe uit"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Vee boodskappe uit"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr ""
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr ""
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiëer na hierdie gids"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Skuif boodskappe"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Vee boodskappe uit"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Maak URL oop..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr ""
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr ""
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr ""
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Die lêer bestaan alreeds"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 #, fuzzy
 msgid "&Overwrite"
 msgstr "Oorskryf"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr ""
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Enkripteer"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr ""
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Heg Handtekening Aan"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr ""
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Pos"
@@ -5256,7 +5174,7 @@ msgstr "Grootte"
 msgid "Encoding"
 msgstr "Enkodering"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr ""
 
@@ -5268,7 +5186,7 @@ msgstr "Enkripteer"
 msgid "Sign"
 msgstr "Onderteken"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "Verwyder lêer aanhangsel"
@@ -5291,7 +5209,8 @@ msgstr "Primêre Ontvanger"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5301,9 +5220,9 @@ msgstr "Addisionele Ontvangers"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5312,9 +5231,8 @@ msgstr "Versteekte Ontvangers"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5326,7 +5244,7 @@ msgstr "Stuur Nou"
 msgid "&Send Mail Via"
 msgstr ""
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr ""
@@ -5397,8 +5315,7 @@ msgstr ""
 msgid "Cl&ean Spaces"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Gebruik vaste grootte skrif tipe"
@@ -5543,31 +5460,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr ""
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5669,8 +5586,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5678,42 +5595,44 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr ""
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr ""
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Heg lêer aan"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Heg aan"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Voeg lêer by..."
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr ""
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5753,273 +5672,285 @@ msgid ""
 "View"
 msgstr "Bekyk"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Intekening..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Intekening..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Stoor As..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Eienskappe"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Voeg aangangesl by..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "Biep"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Stoor aanhangsel as"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Verwyder lêer aanhangsel"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Stoor Aanhangsels..."
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "onbenoem"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr ""
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr ""
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr ""
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr ""
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr ""
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr ""
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Stuur Nou"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Versteekte Ontvangers"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Addisionele Ontvangers"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr ""
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr ""
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr ""
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr ""
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr ""
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr ""
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Boodskap met onderwerp: "
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Boodskap met onderwerp: "
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Boodskap met onderwerp: "
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Boodskap met onderwerp: "
@@ -6066,8 +5997,8 @@ msgstr ""
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6101,9 +6032,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6326,102 +6256,86 @@ msgstr ""
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6433,6 +6347,16 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "Skep Filter"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "Skep Filter"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr ""
@@ -6515,6 +6439,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr ""
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Aan"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr ""
@@ -6523,16 +6452,29 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr ""
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr ""
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Kopiëer Na"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Vee Uit"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6541,8 +6483,8 @@ msgstr "Vee Gids uit"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6614,19 +6556,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6665,8 +6604,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6700,8 +6639,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6827,10 +6766,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -6852,9 +6789,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -6863,14 +6799,14 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6883,11 +6819,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6896,15 +6832,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Skuif Na"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -6917,8 +6858,7 @@ msgstr "Skuif boodskappe na gids"
 msgid "Permissions (ACL)"
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr ""
@@ -6943,8 +6883,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr ""
@@ -6964,14 +6903,13 @@ msgstr "Kyk vir nuwe pos in hierdie gids"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -6984,9 +6922,9 @@ msgstr ""
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -6998,17 +6936,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Besigtig Kolomme"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Vee Gids uit"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Stuurder"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Ontvanger"
@@ -7020,11 +6962,11 @@ msgstr "Redigeer Identiteit"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7043,12 +6985,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7081,17 +7023,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7162,7 +7104,8 @@ msgstr ""
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7186,8 +7129,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7224,13 +7167,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7286,13 +7227,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7300,8 +7241,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7309,7 +7250,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Kon nie gids skep nie"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7410,9 +7351,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7552,10 +7493,10 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7611,124 +7552,123 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "uitboks"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "gestuurde pos"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "gemors"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "in proses"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "Vervang"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr ""
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7736,11 +7676,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Maak Asblik leeg"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
@@ -7818,8 +7758,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -7857,8 +7796,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1173
@@ -7884,8 +7823,8 @@ msgstr "Versteekte Ontvangers"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7898,29 +7837,32 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Vee Uit"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -7933,9 +7875,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -7949,8 +7891,8 @@ msgstr ""
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -7967,8 +7909,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -7984,7 +7926,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8325,8 +8268,7 @@ msgstr "Stoor aangangsels..."
 msgid "Appl&y All Filters"
 msgstr "Wend Filters Aan"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Wend Filters Aan"
@@ -8363,8 +8305,8 @@ msgstr "Totaal Kolom"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Wissel die vertoon van die kolom, wat die totale aantal boodskappe in die gids "
-"bevat"
+"Wissel die vertoon van die kolom, wat die totale aantal boodskappe in die "
+"gids bevat"
 
 #: kmmainwidget.cpp:3026
 #, fuzzy
@@ -8377,8 +8319,8 @@ msgstr "Totaal Kolom"
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Wissel die vertoon van die kolom, wat die totale aantal boodskappe in die gids "
-"bevat"
+"Wissel die vertoon van die kolom, wat die totale aantal boodskappe in die "
+"gids bevat"
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -8445,7 +8387,6 @@ msgstr "Volgende ongeleesde boodskap"
 msgid "Go to the next unread message"
 msgstr "Gaan na die volgende ongeleesde boodskap"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Volgende boodskap"
@@ -8493,8 +8434,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Rol af in huidige boodskap. Gaan na die volgende ongeleesde boodskap sodra die "
-"einde van die huidige boodskap bereik word."
+"Rol af in huidige boodskap. Gaan na die volgende ongeleesde boodskap sodra "
+"die einde van die huidige boodskap bereik word."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -8587,25 +8528,25 @@ msgstr "Initsialiseer..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8613,8 +8554,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8622,8 +8563,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8652,17 +8593,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr ""
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr ""
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Vertoon aanhangsels soos voorgestel deur die stuurder."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8712,29 +8653,26 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8743,11 +8681,10 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8756,14 +8693,13 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8772,13 +8708,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8787,9 +8721,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8799,9 +8732,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8816,11 +8748,9 @@ msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9073,15 +9003,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9090,18 +9019,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9111,14 +9039,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr ""
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9158,7 +9085,8 @@ msgstr "Kyk na aanhangsel: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9182,12 +9110,14 @@ msgstr "Maak aanhangsel oop?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9209,6 +9139,68 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "Ongelees"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr ""
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "Vee Uit"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "Vervang"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "Stuur aan"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "Wagtou"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "Stuurder"
+
+#: kmsearchpattern.h:228
+#, fuzzy
+msgid "Watched"
+msgstr "Hou gesprekslyn dop"
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignoreer gesprekslyn"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Aan: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "Stoor Aanhangsels..."
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9291,17 +9283,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9325,8 +9317,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9351,8 +9343,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9363,13 +9356,11 @@ msgstr ""
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9388,8 +9379,9 @@ msgstr ""
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9423,30 +9415,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9458,6 +9450,10 @@ msgstr ""
 msgid "Exit"
 msgstr ""
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr ""
@@ -9483,8 +9479,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9561,8 +9558,8 @@ msgstr ""
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9583,10 +9580,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9616,8 +9612,8 @@ msgstr ""
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9630,10 +9626,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9856,22 +9852,18 @@ msgstr "Redigeer Boodksap"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9882,8 +9874,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9898,14 +9890,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10000,8 +9992,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10033,8 +10025,9 @@ msgstr ""
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10044,8 +10037,8 @@ msgstr ""
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10065,70 +10058,68 @@ msgstr ""
 msgid "Unencrypted Message Warning"
 msgstr ""
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr ""
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10151,10 +10142,10 @@ msgstr ""
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10164,8 +10155,8 @@ msgstr ""
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10205,8 +10196,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr ""
 
@@ -10235,8 +10225,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10272,18 +10262,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10525,8 +10515,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10642,10 +10632,11 @@ msgstr ""
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10662,7 +10653,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -10679,1643 +10671,12 @@ msgstr ""
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Gaan"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Gids"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Boodskap"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Stuur aan"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Ondertekening"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, no-c-format
-msgid "To:"
-msgstr "Aan:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC:"
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "Antwoord Aan"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Beantwoord aan almal..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "Stuur aan"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Wys:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "Vervang"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Beantwoord aan: "
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Beantwoord aan almal..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Redigeer Boodksap"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Voeg lêer by..."
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "Vervang"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "Vervang"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, no-c-format
-msgid "Remove the signature when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Vertoon al die boodskap opskrifte"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Vertoon al die boodskap opskrifte"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Vee boodskappe uit"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "Merk boodskap as nie aangestuur"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12433,6 +10794,11 @@ msgstr ""
 msgid "Add as BCC"
 msgstr ""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Kaneleer"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12449,10 +10815,10 @@ msgstr "Versteekte Ontvangers"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12470,8 +10836,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12574,10 +10940,19 @@ msgstr ""
 msgid " bytes"
 msgstr ""
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr ""
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12723,13 +11098,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -12745,8 +11118,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -12764,8 +11136,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -12773,8 +11144,7 @@ msgid "(No special capabilities available)"
 msgstr ""
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:358
@@ -12843,8 +11213,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12861,17 +11231,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr ""
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr ""
@@ -12906,6 +11281,10 @@ msgstr ""
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+msgid "&Apply"
+msgstr ""
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -12920,6 +11299,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Intekening..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -12958,9 +11341,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -12994,6 +11377,16 @@ msgstr ""
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr "Aan:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC:"
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13023,36 +11416,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13283,6 +11672,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13318,76 +11711,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13453,6 +11776,16 @@ msgstr ""
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "Oorskryf"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13553,9 +11886,9 @@ msgstr "Vee Boodskappe Uit"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13585,9 +11918,9 @@ msgstr "Vee Gids uit"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13597,15 +11930,15 @@ msgstr "Adresboek"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13614,8 +11947,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13631,139 +11964,1509 @@ msgstr ""
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Ondertekening"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
 msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
 msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
 msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
 msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
 msgstr ""
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "Ongelees"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "Vee Uit"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr ""
+
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "Antwoord Aan"
+
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Beantwoord aan almal..."
+
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "Stuur aan"
+
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Wys:"
+
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
 msgstr "Vervang"
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Voeg lêer by..."
+
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "Vervang"
+
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "Vervang"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr ""
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr ""
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr ""
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr ""
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr ""
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr ""
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr ""
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, no-c-format
+msgid "Remove the signature when replying"
+msgstr ""
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Vertoon al die boodskap opskrifte"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Vertoon al die boodskap opskrifte"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Vee boodskappe uit"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "Merk boodskap as nie aangestuur"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, no-c-format
+msgid "&File"
+msgstr ""
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Intekening..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Gaan"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Gids"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Boodskap"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
 msgstr "Stuur aan"
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "Wagtou"
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "Stuurder"
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Stel Enkodering"
 
-#: kmsearchpattern.h:228
-#, fuzzy
-msgid "Watched"
-msgstr "Hou gesprekslyn dop"
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "Ignoreer gesprekslyn"
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: kmcomposerui.rc:34
+#, no-c-format
+msgid "&Options"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
 msgstr ""
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "Aan: "
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "Stoor Aanhangsels..."
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
 msgstr ""
 
-#: util.h:208
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
 msgstr ""
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "Oorskryf"
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr ""
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr ""
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr ""
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr ""
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr ""
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr ""
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Beantwoord aan: "
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Beantwoord aan almal..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Redigeer Boodksap"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr ""
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -13825,10 +13528,6 @@ msgstr "Oorskryf"
 #~ msgstr "Boodskap skuif het gevaal."
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "Stel KMail op..."
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Maak oop met..."
 
diff --git a/tde-i18n-ar/messages/tdepim/kmail.po b/tde-i18n-ar/messages/tdepim/kmail.po
index 06428c17e23..e769ab2ceb1 100644
--- a/tde-i18n-ar/messages/tdepim/kmail.po
+++ b/tde-i18n-ar/messages/tdepim/kmail.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2006-12-23 17:52+0100\n"
 "Last-Translator: محمد سعد  Mohamed SAAD <metehyi@free.fr>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "أحمد محمد زواوي,أسامة علي المقداد,محمد سعد Mohamed SAAD"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -171,6 +171,12 @@ msgstr "&بلا ( إستعمل بحذر )"
 msgid "Account for semiautomatic resource handling"
 msgstr "حساب لـلتعامل مع المصادر الشبه تلقائية"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "مسح الماضي"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -246,13 +252,13 @@ msgstr "إسم الد&خول:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"لقد أعطاك مزود الإنترنت الخاص بك  <em>إسم مستخدم</em>  "
-"للتحقق من هويتك  عند خوادم البريد . إنها عادة تكون الجزء الأول لعنوان بريدك "
-"الإلكتروني (الجزء قبل علامة <em>@</em>)."
+"لقد أعطاك مزود الإنترنت الخاص بك  <em>إسم مستخدم</em>  للتحقق من هويتك  عند "
+"خوادم البريد . إنها عادة تكون الجزء الأول لعنوان بريدك الإلكتروني (الجزء قبل "
+"علامة <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -273,18 +279,18 @@ msgstr "&خزَن كلمة المرور POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "اختر هذا الخيار كي يقوم KMail بحفظ كلمة المرور.\n"
 "اذا كان TDEWallet متوفرا سيجري حفظ كلمة المرور فيه و هذا يعتبر الائمن.\n"
-"و لكن اذا لم يكن TDEWallet متوفرا سيجري حفظ كلمة المرور في ملف اعدادات KMail. و "
-"رغم ان كلمة المرور ستكون محفوظة بشكل معتًم لا يجب اعتبارها آمنة من التشفير "
-"العكسي اذا تمكن الوصول الى ملف الاعدادات.."
+"و لكن اذا لم يكن TDEWallet متوفرا سيجري حفظ كلمة المرور في ملف اعدادات "
+"KMail. و رغم ان كلمة المرور ستكون محفوظة بشكل معتًم لا يجب اعتبارها آمنة من "
+"التشفير العكسي اذا تمكن الوصول الى ملف الاعدادات.."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -312,11 +318,12 @@ msgstr "&ترشيح الرسائل إذا كان حجمها أكبر من"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"إذا حدّدت هذا الخيار، فسيتم استخدام مرشحات POP لتقرير طريقة التعامل مع الرسائل. "
-"يمكنك إختيار إنزال، محو أو إبقاء الرسائل على الخادم."
+"إذا حدّدت هذا الخيار، فسيتم استخدام مرشحات POP لتقرير طريقة التعامل مع "
+"الرسائل. يمكنك إختيار إنزال، محو أو إبقاء الرسائل على الخادم."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -365,13 +372,15 @@ msgstr "&نص بدون تشفير"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -414,9 +423,9 @@ msgstr "مجال الاسماء:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "هنا تشاهد مجالات الاسماء المختلفة المدعومة من خادمك IMAP. كل مجال اسماء يمثل "
 "صدر (prefix)  فاصل لمجموعات المجلدت. على سبيل المثال مجالات الاسماء تسمح ل "
@@ -478,12 +487,12 @@ msgstr "حمَل ملفات ال&ملحقات عند الطلب"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"نشط هذا لالغاء التحميل التلقاءي عندما تختار رسالة و لكن عندما تنقر على الملحق. "
-"و بهذه الطريقر سترى بريدك الالكتروني باللحظة."
+"نشط هذا لالغاء التحميل التلقاءي عندما تختار رسالة و لكن عندما تنقر على "
+"الملحق. و بهذه الطريقر سترى بريدك الالكتروني باللحظة."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -494,8 +503,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"فقط المجلدات المفتوحة في شجرة المجلدات (الموسعة) قد يتم فحصها . استخدم هذا اذا "
-"كان عندك عدة مجلدات على الخادم."
+"فقط المجلدات المفتوحة في شجرة المجلدات (الموسعة) قد يتم فحصها . استخدم هذا "
+"اذا كان عندك عدة مجلدات على الخادم."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -523,7 +532,7 @@ msgstr "<لا شيء>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "صندوق الوارد"
 
@@ -531,8 +540,8 @@ msgstr "صندوق الوارد"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "من الظاهر ان الخادم لا يدعم ترقيم الرساءل بشكل موحد ، و لكن هذا شرط لترك "
 "الرسائل على الخادم.\n"
@@ -543,32 +552,33 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"من الظاهر ان الخادم لا يدعم سحب رؤس الرساءل ، و لكن هذا شرط لتصفية الرسائل على "
-"الخادم.\n"
-"و فيما ال بعض الخوادم لا تعلن مسبقأ عن امكانيتها لديك الخيار بترك وظيفة التصفية "
-"للرسائل على الخادم جارية."
+"من الظاهر ان الخادم لا يدعم سحب رؤس الرساءل ، و لكن هذا شرط لتصفية الرسائل "
+"على الخادم.\n"
+"و فيما ال بعض الخوادم لا تعلن مسبقأ عن امكانيتها لديك الخيار بترك وظيفة "
+"التصفية للرسائل على الخادم جارية."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"الرجاء الملاحظة أن هذه الميزة يمكن أن تسبب خراب البريد الوارد من بعض الخدم التي "
-"لا تدعم النقل بواسطة المواسير.\n"
+"الرجاء الملاحظة أن هذه الميزة يمكن أن تسبب خراب البريد الوارد من بعض الخدم "
+"التي لا تدعم النقل بواسطة المواسير.\n"
 "هذه الميزة قابلة للتهيئة لأن بعض الخدم يدعم هذة الميزة ولكنها لا تعلن عن "
 "مقدراتها. للتحقق من أن خادم POP3 الخاص بك يدعم هذه الميزة، استخدم زر \"تحقق "
 "ماذا يدعم الخادم\" في نهاية مربع الحوار.\n"
-"إذا كان خادمك لا يعلن عن هذه الميزة ولكنك تريد سرعة أكثر، فقم ببعض الإختبارات "
-"بإرسال لنفسك دفعة من الرسائل ومن ثم قم بانزالهم."
+"إذا كان خادمك لا يعلن عن هذه الميزة ولكنك تريد سرعة أكثر، فقم ببعض "
+"الإختبارات بإرسال لنفسك دفعة من الرسائل ومن ثم قم بانزالهم."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -576,45 +586,45 @@ msgstr "الرجاء اولآ تحديد الخادم و المنفذ في لس�
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "لا يبدو ال الخادم يدعم خط الانابيب ، لذلك ألغيي هذا الخيار.\n"
 "بما انً بعض الخوادم لا تعلن صحيحا عن امكانيتها يمكنك ايداء تشغيل خط الأنابيب. "
-"ولكن انتبه ان هذه الصفة اذا كان الخادمPOP  لا يدعم خط الانابيب ( pipelining ) "
-"قد تؤدي الى ارسال بريد فاسد. لذلك عليك قبل استعمال هذه الصفة لبريد مهمً ، ان "
-"تختبرها مع ارسال عدد كبير من الرسائل الى نفسك حيث تقوم بسحبها مرة واحدة من "
-"الخادم POP."
+"ولكن انتبه ان هذه الصفة اذا كان الخادمPOP  لا يدعم خط الانابيب "
+"( pipelining ) قد تؤدي الى ارسال بريد فاسد. لذلك عليك قبل استعمال هذه الصفة "
+"لبريد مهمً ، ان تختبرها مع ارسال عدد كبير من الرسائل الى نفسك حيث تقوم بسحبها "
+"مرة واحدة من الخادم POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"لا يبدو ان الخادم يدعم ارقام الرسائل الوحيدة ، و لكن هذا مطلوب كي تحفظ الرسائل "
-"على الخادم ، لذلك تمً الغاء هذا الخيار.\n"
-"بما ان بعض الخوادم لا تعلن صحيحا عن قدراتها، لا يزال بامكانك تشغيل ترك الرسائل "
-"المسحوبة على الخادم."
+"لا يبدو ان الخادم يدعم ارقام الرسائل الوحيدة ، و لكن هذا مطلوب كي تحفظ "
+"الرسائل على الخادم ، لذلك تمً الغاء هذا الخيار.\n"
+"بما ان بعض الخوادم لا تعلن صحيحا عن قدراتها، لا يزال بامكانك تشغيل ترك "
+"الرسائل المسحوبة على الخادم."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"لا يبدو ان الخادم يدعم سحب ترويسات الرسائل ، و لكن هذا مطلوب لتصفية الرسائل على "
-"الخادم ، لذلك تمً الغاء هذا الخيار.\n"
+"لا يبدو ان الخادم يدعم سحب ترويسات الرسائل ، و لكن هذا مطلوب لتصفية الرسائل "
+"على الخادم ، لذلك تمً الغاء هذا الخيار.\n"
 "بما ان بعض الخوادم لا تعلن صحيحا عن قدراتها، لا يزال بامكانك تشغيل تصفية "
 "الرسائل المسحوبة على الخادم."
 
@@ -695,8 +705,8 @@ msgstr "حساب IMAP "
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "أنت تحتاج إلى إضافة حساب في قسم الشبكة من الإعدادات كي تستقبال بريد."
 
 #: accountwizard.cpp:87
@@ -733,13 +743,13 @@ msgstr "اهلأ وسهلا الى KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>يبدو انك تستعمل KMail للمرة الاولى. يمكنك استعمال هذا المرشد لتحضير حسابات "
-"بريدك. عليك فقط ادخال معلومات الاتصال اللتي حصلت عليها من مزودك بلبريد الى "
-"الصفحات التالية.</qt>"
+"<qt>يبدو انك تستعمل KMail للمرة الاولى. يمكنك استعمال هذا المرشد لتحضير "
+"حسابات بريدك. عليك فقط ادخال معلومات الاتصال اللتي حصلت عليها من مزودك "
+"بلبريد الى الصفحات التالية.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -801,8 +811,7 @@ msgstr "استعمل التسليم المحلًي"
 msgid "Server Information"
 msgstr "معلومات الخادم"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "لا شيء"
@@ -895,8 +904,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p> عفوآ ، لم اجد عدة اكتشاف البريد غير المرغوب. الرجاء اعادة تنفيذ هذا المرشد "
-"بعد اعادة تركيب برنامجك لمكافحة البريد غير المرغوب.</p>"
+"<p> عفوآ ، لم اجد عدة اكتشاف البريد غير المرغوب. الرجاء اعادة تنفيذ هذا "
+"المرشد بعد اعادة تركيب برنامجك لمكافحة البريد غير المرغوب.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -942,27 +951,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>يمكنك هنا احصول على بعض المساعدة  كي تهيئ قواعد مرشح KMail's لتطبيق بعض "
-"الأدوات المعروفة عامتا لمكافحة الفيروس.</p>"
-"<p>ان المرشد يستطيع اكتشاف هذه الأدوات على حاسوبك و انشاء قواعد المرشح لتصنيف "
-"الرسائل مستخدما هذه الأدوات و عزل الرسائل اللتي تحتوي على فيروس. المرشد لن يأخذ "
-"بعين الاعتبار قواعد المرشح الموجودة مسبقا بل سيضيف القواعد الجديدة دائما.</p>"
-"<p><b>تحذير:</b> بما ان KMail سيبدو واقفا عن العمل خلال البحث عن الفيروسات في "
-"الرسائل ، ستراقب بعض المشاكل في ردودية KMail ( اي السرعة ) لأنً عمليات البحث عن "
-"الفيروسات قد تستغرق وقتا طويلا ، الرجاء أخذ بعين الأعتبار امكانية محو قواعد "
-"المرشح المنشأة من قبل المرشد حيث تسترجع السلوك الأولي."
+"الأدوات المعروفة عامتا لمكافحة الفيروس.</p><p>ان المرشد يستطيع اكتشاف هذه "
+"الأدوات على حاسوبك و انشاء قواعد المرشح لتصنيف الرسائل مستخدما هذه الأدوات و "
+"عزل الرسائل اللتي تحتوي على فيروس. المرشد لن يأخذ بعين الاعتبار قواعد المرشح "
+"الموجودة مسبقا بل سيضيف القواعد الجديدة دائما.</p><p><b>تحذير:</b> بما ان "
+"KMail سيبدو واقفا عن العمل خلال البحث عن الفيروسات في الرسائل ، ستراقب بعض "
+"المشاكل في ردودية KMail ( اي السرعة ) لأنً عمليات البحث عن الفيروسات قد "
+"تستغرق وقتا طويلا ، الرجاء أخذ بعين الأعتبار امكانية محو قواعد المرشح "
+"المنشأة من قبل المرشد حيث تسترجع السلوك الأولي."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -990,8 +998,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"المجلد الافتراضي لرسائل البريد غير المرغوب هو سلة المهملات ، ولكن يمكنك تغيير "
-"ذلك في رؤية المجلًدات في الاسفل."
+"المجلد الافتراضي لرسائل البريد غير المرغوب هو سلة المهملات ، ولكن يمكنك "
+"تغيير ذلك في رؤية المجلًدات في الاسفل."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -999,15 +1007,13 @@ msgstr "أنقل الرسائل غير المر&غوبة المحتملة إلى
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "المجلًد الافتراضي هو مجلًد البريد الوارد، ولكن يمكنك تغيير ذلك في رؤية "
-"المجلًدات في الاسفل. "
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"المجلًدات في الاسفل. <p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1017,12 +1023,12 @@ msgstr "افحص الرسائل مستخدما ألأدوات المضاضة ل�
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"دع الادوات المضاضة للفيروسات تفحص رسائلك. المرشد سوف ينشىء المرشحات الملائمة. "
-"تقوم الادوات عادتا بالتأشير على الرسائل المصابة كي يجري تنفيذ اوامر عليها مثل "
-"النقل الى مجلد مخصص."
+"دع الادوات المضاضة للفيروسات تفحص رسائلك. المرشد سوف ينشىء المرشحات "
+"الملائمة. تقوم الادوات عادتا بالتأشير على الرسائل المصابة كي يجري تنفيذ "
+"اوامر عليها مثل النقل الى مجلد مخصص."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1031,8 +1037,8 @@ msgstr "انقل الرسائل المصابة بلفيروس الى المجل�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "سيتم انشاء مرشح لكشف الرسائل المصابة بلفيروس و نقلها الى مجلد معين سابقا. "
 "المجلد الافتراضي هو سلة المهملات، و لكن يمكنك تغيير ذلك في رؤية المجلدات."
@@ -1043,10 +1049,11 @@ msgstr "اضافيا ، علّم الرسائل المصابة بلفيروس ك
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"علّم الرسائل المصنفة باصابة الفيروس كرسائل مقروءة ، و انقلها الى المجلد المحدد."
+"علّم الرسائل المصنفة باصابة الفيروس كرسائل مقروءة ، و انقلها الى المجلد "
+"المحدد."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1240,8 +1247,8 @@ msgstr "خطأ أثناء قراءة المجلد %1 على الخادم."
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1261,8 +1268,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1293,20 +1300,20 @@ msgstr "محذوف"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>ليس هناك أي من هوياتك تطابق المستلم لهذه الرسالة،"
-"<br> رجاء اختر أي من هذه العناوين هو لك:"
+"<qt>ليس هناك أي من هوياتك تطابق المستلم لهذه الرسالة،<br> رجاء اختر أي من "
+"هذه العناوين هو لك:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>العديد من الهويات تطابق لالمستلم لهذه الرسالة،"
-"<br>الرجاء اختيار أي من العناوين التالية هي لك:"
+"<qt>العديد من الهويات تطابق لالمستلم لهذه الرسالة،<br>الرجاء اختيار أي من "
+"العناوين التالية هي لك:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1335,18 +1342,21 @@ msgstr "خطأ عند ضغط  \"%1\". أجهاض عملية الضغط."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>تم اصلاح هذا الإعداد من مراقب النظام.</p>"
-"<p>إذا كنت تظن أن هذا خطأ، الرجاء الإتصال به.</p></qt>"
+"<qt><p>تم اصلاح هذا الإعداد من مراقب النظام.</p><p>إذا كنت تظن أن هذا خطأ، "
+"الرجاء الإتصال به.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&حمّل مواصفات..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "هيئ KMail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "ا&ضف..."
@@ -1376,6 +1386,11 @@ msgstr "<qt>هل تريد فعلا حذف الهوية المسماة <b>%1</b>�
 msgid "Remove Identity"
 msgstr "حذف الهوية"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "إ&زالة"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "اضف..."
@@ -1384,6 +1399,11 @@ msgstr "اضف..."
 msgid "Modify..."
 msgstr "تعديل..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "إ&زالة"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "إجعله افتراضيا"
@@ -1400,17 +1420,15 @@ msgstr "حسابات الإ&رسال"
 msgid "Outgoing accounts (add at least one):"
 msgstr "الحسابات القادرة على الإرسال (إضف واحدة على الأقل):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "الإسم"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "النوع"
@@ -1432,8 +1450,7 @@ msgstr "إجعله افتراضيا"
 msgid "Common Options"
 msgstr "خيارات متداولة"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "أكَد &قبل الإرسال"
@@ -1484,17 +1501,16 @@ msgstr "المجال الإفت&راضي:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>يستعمل النطاق الافتراضي لتكملة عناوين البريد الإلكتروني التي تحتوي فقط على "
-"إسم المستخدم </p></qt>"
+"<qt><p>يستعمل النطاق الافتراضي لتكملة عناوين البريد الإلكتروني التي تحتوي "
+"فقط على إسم المستخدم </p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1512,9 +1528,9 @@ msgstr "إضافة طريقة نقل"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 ( الإفتراضي )"
 
@@ -1599,6 +1615,10 @@ msgstr "تعديل حساب"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>عاجز عن ايجاد الحساب <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "الأل&وان"
@@ -1707,8 +1727,7 @@ msgstr "وصلة متبوعة"
 msgid "Misspelled Words"
 msgstr "كلمات التهجئة الخاطئة"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "رسالة جديدة"
@@ -1898,11 +1917,11 @@ msgstr "الوضع الافتراضي لخيوط المتابعة هو مغلق"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"افتح خيوط المتابعة التي تحتوي على رسائل &جديدة , غير مقروءة أو رسائل مهمة افتح "
-"أيضا خيوط المتابعة المراقبة."
+"افتح خيوط المتابعة التي تحتوي على رسائل &جديدة , غير مقروءة أو رسائل مهمة "
+"افتح أيضا خيوط المتابعة المراقبة."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1910,67 +1929,51 @@ msgstr "عرض التاريخ"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"هذه التعابير <qt>"
-"<p><strong> ممكن أن تستخدم للتاريخ:</strong></p>"
-"<ul>"
-"<li>d - اليوم كرقم بدون صفر في المقدمة مثل (1-31) </li>"
-"<li>dd - اليوم كرقم مع صفر في المقدمة (01-31)</li>"
-"<li>ddd - الاسم المختصر لاسم اليوم (Mon - Sun)</li>"
-"<li>dddd - الاسم الكامل أو الطويل لليوم (Monday - Sunday) </li>"
-"<li>M - الشهر كرقم بدون صفر المقدمة (1-12)</li>"
-"<li>MM - الشهر كرقم مع صفر في البداية(01-12)</li>"
-"<li>MMM -الاسم المختصر للشهر (Jan - Dec)</li>"
-"<li>MMMM - الاسم الكامل للشهر (January - December)</li>"
-"<li>yy - السنة ممثلة برقمين(00-99)</li>"
-"<li>yyyy -السنة ممثلة بأربعة أرقام(0000-9999)</li></ul>"
-"<p><strong>هذه التعابير ربما تستخدم للوقت:</string></p> "
-"<ul>"
-"<li>h - الساعة بدون صفر في المقدمة(0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh -الساعة مع صفر في المقدمة (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - الدقائق بدون صفر في المقدمة (0-59)</li>"
-"<li>mm -الدقائق مع صفر في المقدمة(00-59)</li>"
-"<li>s -الثواني بدون صفر المقدمة(0-59)</li>"
-"<li>ss -الثواني مع صفر في المقدمة (00-59)</li>"
-"<li>z -أجزاء الثواني بدون صفر المقدمة</li>"
-"<li>zzz - أجزاء الثواني مع أصفار المقدمة (000-999)</li>"
-"<li>AP - التبديل بين وضعي صباحا أو مساء.AP تستبدل ب ص أو م.</li>"
-"<li>ap - التبديل بين وضعي صباحا أو مساء بأحرف صغيرة.</li>"
-"<li>Z - توقيت الزمن في هيئة أعداد (-0500)</li></ul>"
-"<p><strong> جميع المحارف التي ستدخل غير هذه سيتم تجاهلها.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"هذه التعابير <qt><p><strong> ممكن أن تستخدم للتاريخ:</strong></p><ul><li>d - "
+"اليوم كرقم بدون صفر في المقدمة مثل (1-31) </li><li>dd - اليوم كرقم مع صفر في "
+"المقدمة (01-31)</li><li>ddd - الاسم المختصر لاسم اليوم (Mon - Sun)</"
+"li><li>dddd - الاسم الكامل أو الطويل لليوم (Monday - Sunday) </li><li>M - "
+"الشهر كرقم بدون صفر المقدمة (1-12)</li><li>MM - الشهر كرقم مع صفر في "
+"البداية(01-12)</li><li>MMM -الاسم المختصر للشهر (Jan - Dec)</li><li>MMMM - "
+"الاسم الكامل للشهر (January - December)</li><li>yy - السنة ممثلة "
+"برقمين(00-99)</li><li>yyyy -السنة ممثلة بأربعة أرقام(0000-9999)</li></"
+"ul><p><strong>هذه التعابير ربما تستخدم للوقت:</string></p> <ul><li>h - "
+"الساعة بدون صفر في المقدمة(0-23 or 1-12 if AM/PM display)</li><li>hh -الساعة "
+"مع صفر في المقدمة (00-23 or 01-12 if AM/PM display)</li><li>m - الدقائق بدون "
+"صفر في المقدمة (0-59)</li><li>mm -الدقائق مع صفر في المقدمة(00-59)</li><li>s "
+"-الثواني بدون صفر المقدمة(0-59)</li><li>ss -الثواني مع صفر في المقدمة "
+"(00-59)</li><li>z -أجزاء الثواني بدون صفر المقدمة</li><li>zzz - أجزاء "
+"الثواني مع أصفار المقدمة (000-999)</li><li>AP - التبديل بين وضعي صباحا أو "
+"مساء.AP تستبدل ب ص أو م.</li><li>ap - التبديل بين وضعي صباحا أو مساء بأحرف "
+"صغيرة.</li><li>Z - توقيت الزمن في هيئة أعداد (-0500)</li></ul><p><strong> "
+"جميع المحارف التي ستدخل غير هذه سيتم تجاهلها.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "تغيير إعدادات التسلسلات سيغير قيم جميع المجلدات المحددة."
 
 #: configuredialog.cpp:2221
@@ -1985,8 +1988,7 @@ msgstr "إظهار &شريط حالة HTML "
 msgid "Show s&pam status in fancy headers"
 msgstr "أظهر حالة البريد غير المر&غوب في الترويسات المزينة"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "استبدل الايقونات الضاحكة (smileys ) بالايقونات العاطفية ( emoticons)"
@@ -1995,8 +1997,7 @@ msgstr "استبدل الايقونات الضاحكة (smileys ) بالايقو
 msgid "Use smaller font for quoted text"
 msgstr "استخدم أحرف اصغر للنص المنقول"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "اعرض أظهار/أخفاء علامات النقل"
@@ -2022,8 +2023,7 @@ msgstr "تلقائي"
 msgid "&Override character encoding:"
 msgstr "ا&رغام تشفير الأحرف"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "تمكين أيقونة صينية النظام"
@@ -2127,22 +2127,19 @@ msgstr "<b>%f</b> ستستبدل اسم ملف التحرير."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>حافظات الأمكنة التالية مدعمة في تعابير الرد:"
-"<br><b>%D</b>: تاريخ، <b>%S</b>: موضوع،"
-"<br><b>%e</b>: عنوان المرسل, <b>%F</b>: إسم المرسل، <b>%f</b>"
-": توقيع المرسل بالأحرف الأولى،"
-"<br><b>%T</b>:إسم المستقبل, <b>%t</b>: إسم وعنوان المستلم،"
-"<br><b>%C</b>: أسماء من لهم النسخ الكربونية، <b>%c</b>"
-": أسماء وعناوين من لهم نسخ كربونية"
-"<br><b>%%</b>: توقيع بالمائة <b>%_</b>: فراغ <b>%L</b>: فاصل سطر</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>حافظات الأمكنة التالية مدعمة في تعابير الرد:<br><b>%D</b>: تاريخ، <b>%S</"
+"b>: موضوع،<br><b>%e</b>: عنوان المرسل, <b>%F</b>: إسم المرسل، <b>%f</b>: "
+"توقيع المرسل بالأحرف الأولى،<br><b>%T</b>:إسم المستقبل, <b>%t</b>: إسم "
+"وعنوان المستلم،<br><b>%C</b>: أسماء من لهم النسخ الكربونية، <b>%c</b>: أسماء "
+"وعناوين من لهم نسخ كربونية<br><b>%%</b>: توقيع بالمائة <b>%_</b>: فراغ <b>"
+"%L</b>: فاصل سطر</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2165,21 +2162,20 @@ msgstr "&ردَ على الكلَ:"
 msgid "&Forward:"
 msgstr "&حوّل إلى مراسل آخر:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "مؤشر ال&إقتباس:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "في تاريخ %D ، قمت بكتابة:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "في تاريخ %D ، كتب المراسل %F :"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "رسالة محولة"
 
@@ -2215,8 +2211,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2251,10 +2247,9 @@ msgstr "القيمة"
 msgid "Ne&w"
 msgstr "&جديد"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "الإ&سم:"
@@ -2263,16 +2258,15 @@ msgstr "الإ&سم:"
 msgid "&Value:"
 msgstr "ال&قيمة:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "تسمية ملحقات مطابقة ل- Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "شغل هذا الخيار لتجعل برنامج  Outlook (tm) يتفهم أسماء ملحقات تحتوي أحرف غير "
 "انكليزية."
@@ -2301,20 +2295,20 @@ msgstr "مرفق"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "لقد اخترت تشفير أسماء ملحقات تحتوي أحرف غير-أنكليزية بشكل ان Outlook(tm) و "
 "برامج بريد أخرى تفهمها ، و هي برامج بريد لا تدعم تشفير أسماء ملحقات بطريقة "
 "مطابقة للقياسيات.\n"
 "لاحظ أنً KMail بأمكانه أنشاء رسائل غير مطابقة للقياسيات ، و بالتالي انً رسائلك "
-"قد تكون غير مفهومة من  برامج البريد المطابقة للقياسيات. لذلك و اذا لم يكن لديك "
-"خيار آخر عليك استعمال هذا الخيار."
+"قد تكون غير مفهومة من  برامج البريد المطابقة للقياسيات. لذلك و اذا لم يكن "
+"لديك خيار آخر عليك استعمال هذا الخيار."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2338,105 +2332,91 @@ msgstr "طرف خلفي للت&شفير"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>الرسائل أحيانا تأتي على تنسيقين. هذا الخيار يتحكم فيما إذا كنت تريد جزء ا لـ "
-"HTML أو جزء النص العادي ليتم عرضه.</p>"
-"<p>عرض جزء ال HTML يجعل الرسالة تظهر بشكل أفضل، ولكن في نفس الوقت تزيد المخاطرة "
-"في الأمن  والفتحات تصبح مستثمرة.</p>"
-"<p>عرض جزء مخطط النص يفقد الكثير من تنسيقات الرسالة، ولكنها تجعلها غالبا <em>"
-"مستحيلة</em> لاستثمار الثغرات الأمنية في مقدم HTML </p>"
-"<p>الخيار التالي يحميك ضدّ أحد الأسباب الخاطئة لرسائل HTML، ولكنه لا يستطيع "
-"حماية الأمن لأنه لم يكن معلوما في وقت تمت كتابة هذه النسخة من KMail.</p>"
-"<p>لذلك هو مستحسم ل <em>not</em>فضل HTML لرسالة نصية.</p>"
-"<p><b>ملاحظة:</b> تستطيع ضبط هذا الخيارعلى محلد per-folder قواعد م < <i>مجلد</i>"
-"قواعد البرنامج لا تزال غير معرف</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>الرسائل أحيانا تأتي على تنسيقين. هذا الخيار يتحكم فيما إذا كنت تريد "
+"جزء ا لـ HTML أو جزء النص العادي ليتم عرضه.</p><p>عرض جزء ال HTML يجعل "
+"الرسالة تظهر بشكل أفضل، ولكن في نفس الوقت تزيد المخاطرة في الأمن  والفتحات "
+"تصبح مستثمرة.</p><p>عرض جزء مخطط النص يفقد الكثير من تنسيقات الرسالة، ولكنها "
+"تجعلها غالبا <em>مستحيلة</em> لاستثمار الثغرات الأمنية في مقدم HTML </"
+"p><p>الخيار التالي يحميك ضدّ أحد الأسباب الخاطئة لرسائل HTML، ولكنه لا يستطيع "
+"حماية الأمن لأنه لم يكن معلوما في وقت تمت كتابة هذه النسخة من KMail.</"
+"p><p>لذلك هو مستحسم ل <em>not</em>فضل HTML لرسالة نصية.</p><p><b>ملاحظة:</b> "
+"تستطيع ضبط هذا الخيارعلى محلد per-folder قواعد م < <i>مجلد</i>قواعد البرنامج "
+"لا تزال غير معرف</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>بعض الإعلانات الدعائية مكتوبة بلغة HTML وتتضمن إشارات إلى, على سبيل المثال، "
-"الصور التي يضيفها المعلنين لاكتشاف إذا كنت قد قرأت إعلاناتهم أو لا  (&quot;web "
-"bugs&quot;).</p>"
-"<p>ليس هناك سبب متوفر لتحميل الملفات  ولكن الأمور تسير على هذا الشكل،منذ أن كان "
-"المرسل يستطيع أن يحمل الصور المطلوبة إلى رسالته كملف مرفق.</p>"
-"<p>للحماية من بعض الأخطاء للHTML والخاصة إعدادات الخصائص لبرنامج ال KMail، هذا "
-"الخيار هو <em>غير معرف</em> افتراضيا.</p>"
-"<p>ومع ذلك، إذا رغبت أن، على سبيل المثال، ، عرض الصور في رسائل HTML، التي لتكن "
-"مرفقة بها، تستطيع تفعيل هذا الخيار، ولكن يجب عليك أن تكون مرتديا للمشاكل "
-"المستعصية.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>بعض الإعلانات الدعائية مكتوبة بلغة HTML وتتضمن إشارات إلى, على سبيل "
+"المثال، الصور التي يضيفها المعلنين لاكتشاف إذا كنت قد قرأت إعلاناتهم أو لا  "
+"(&quot;web bugs&quot;).</p><p>ليس هناك سبب متوفر لتحميل الملفات  ولكن الأمور "
+"تسير على هذا الشكل،منذ أن كان المرسل يستطيع أن يحمل الصور المطلوبة إلى "
+"رسالته كملف مرفق.</p><p>للحماية من بعض الأخطاء للHTML والخاصة إعدادات "
+"الخصائص لبرنامج ال KMail، هذا الخيار هو <em>غير معرف</em> افتراضيا.</"
+"p><p>ومع ذلك، إذا رغبت أن، على سبيل المثال، ، عرض الصور في رسائل HTML، التي "
+"لتكن مرفقة بها، تستطيع تفعيل هذا الخيار، ولكن يجب عليك أن تكون مرتديا "
+"للمشاكل المستعصية.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>بوليصة تنبيه تحويل ملكية رسالة</h3>"
-"<p>MDNs عموميا من الذي يطلق عادة وبشكل شائع <b>قراءة المستقبل</b>"
-".الرسالة التي طلبها المؤلف تنبيه بنقل ملكية لترسل وبرنامج مستقبل البريد أنشأ "
-"ردا مما يجعل المؤلف يعلم مالذي حصل لرسالته. أنماط تحذيرات نقل الملكية تتضمن <b>"
-"عرضت</b> (i.e. قراءة), <b>حذف</b> و <b>غير مضمن</b> (e.g. متابعة).</p>"
-"<p>الخيارات التالية متوفرة للتحكم بإرسال برنامج KMail من MDNs:</p>"
-"<ul>"
-"<li><em>تجاهل</em>: تجاهل أي طلبات تحذير نقل الملكية. لن يرسل MDN تلقائيا "
-"مطلقاً ) مستحسن(.</li>"
-"<li><em>اسأل</em>: أجب الطلبات فقط بعد سؤال المستخدم عن الإذن. بهذا الشكل، "
-"تستطيع أن ترسل MDNs للرسائل المحددة بينما فترة الغداء أو تجاهلها للأخريات</li>"
-"<li><em>ينكر</em>: دائما يرسل <b>ممانعة</b> تنبيه. هذا فقط <em>طفيف</em> "
-"أفضل من إرسال MDNs دائما المؤلف سيبقى يعلم أن الرسائل ...، هو فقط لا يستطيع أن "
-"يخبر ما إذا كان حذف أو قرأ الخ.</li>"
-"<li><em>أرسل دائما</em>: دائما أرسل الطلبات لتغيير الملكية. هذا يعني أن المؤلف "
-"للرسالة متى كانت ستصل وبالإضافة إلى ما حدث له)عرضت، حذفت,...(هذا العنصر تخزينه "
-"أقوى ولكن منذ أن جعلت أكثر  على سبيل المثال إدارة علاقات العملاء,لقد فعلت منذ "
-"فترة.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>بوليصة تنبيه تحويل ملكية رسالة</h3><p>MDNs عموميا من الذي يطلق عادة "
+"وبشكل شائع <b>قراءة المستقبل</b>.الرسالة التي طلبها المؤلف تنبيه بنقل ملكية "
+"لترسل وبرنامج مستقبل البريد أنشأ ردا مما يجعل المؤلف يعلم مالذي حصل لرسالته. "
+"أنماط تحذيرات نقل الملكية تتضمن <b>عرضت</b> (i.e. قراءة), <b>حذف</b> و "
+"<b>غير مضمن</b> (e.g. متابعة).</p><p>الخيارات التالية متوفرة للتحكم بإرسال "
+"برنامج KMail من MDNs:</p><ul><li><em>تجاهل</em>: تجاهل أي طلبات تحذير نقل "
+"الملكية. لن يرسل MDN تلقائيا مطلقاً ) مستحسن(.</li><li><em>اسأل</em>: أجب "
+"الطلبات فقط بعد سؤال المستخدم عن الإذن. بهذا الشكل، تستطيع أن ترسل MDNs "
+"للرسائل المحددة بينما فترة الغداء أو تجاهلها للأخريات</li><li><em>ينكر</em>: "
+"دائما يرسل <b>ممانعة</b> تنبيه. هذا فقط <em>طفيف</em> أفضل من إرسال MDNs "
+"دائما المؤلف سيبقى يعلم أن الرسائل ...، هو فقط لا يستطيع أن يخبر ما إذا كان "
+"حذف أو قرأ الخ.</li><li><em>أرسل دائما</em>: دائما أرسل الطلبات لتغيير "
+"الملكية. هذا يعني أن المؤلف للرسالة متى كانت ستصل وبالإضافة إلى ما حدث "
+"له)عرضت، حذفت,...(هذا العنصر تخزينه أقوى ولكن منذ أن جعلت أكثر  على سبيل "
+"المثال إدارة علاقات العملاء,لقد فعلت منذ فترة.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2452,13 +2432,13 @@ msgstr "السماح للرسالة بتحميل إعدادات &خارجية م
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>تحذير:</b> شمل HTML في البريد الإلكتروني يمكن أن يزيد المخاطرة التي يمكن أن "
-"يتعرض لها النظام لديك. <a href=\"whatsthis:%1\">مزيدا عن بريد HTML...</a> "
+"<b>تحذير:</b> شمل HTML في البريد الإلكتروني يمكن أن يزيد المخاطرة التي يمكن "
+"أن يتعرض لها النظام لديك. <a href=\"whatsthis:%1\">مزيدا عن بريد HTML...</a> "
 "<a href=\"whatsthis:%2\">مزيدا عن مراجع خارجية...</a>"
 
 #: configuredialog.cpp:3824
@@ -2520,8 +2500,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>تحذير</b> الجواب بدون حذر على طلبات تأكيد قد يرفع الحماية عن حياتك الخاصة.<a "
-"href=\"whatsthis:%1\">للمزيد...</a>"
+"<b>تحذير</b> الجواب بدون حذر على طلبات تأكيد قد يرفع الحماية عن حياتك الخاصة."
+"<a href=\"whatsthis:%1\">للمزيد...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2540,8 +2520,7 @@ msgstr "تغيير اعدادات HTML العامة سيركب على كل قي�
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "هذا الخيار يحتاج الى dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "لا وكيل"
@@ -2570,8 +2549,8 @@ msgstr "الرسائل المهمة لا ينقضي أجل&ها"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "عند محاولة إيجاد رسائل غير مقروءة:"
 
@@ -2595,8 +2574,8 @@ msgstr "كرر في جميع المجلدات"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "عند دخول مجلًد:"
 
@@ -2665,26 +2644,23 @@ msgstr "أدلة (\"maildir\" format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>هذا يحدد أي تنسيق صندوق بريد سوف يكون الافتراضي للمجلدات المحلية:</p>"
-"<p><b>صندوق وارد:</b> مجلدات بريد KMail يعاد إحضارها عن طريق ملف لكل بريد. كل "
-"رسالة على حدة موصولة من ببعضها عن طريق خط يبدأ ب \"من\". هذا يحفظ مساحة على "
-"القرص، ولكن ربما أقل, على سبيل المثال: عند نقل الرسائل بين المجلدات.</p>"
-"<p><b>دليل البريد:</b> مجلدات بريد KMail مثّلت بمجلدات حقيقية على القرص. "
-"الرسائل كل على حدة ملفات منفصلة. هذا يجب أن يضيع بت من المساحة على القرص، ولكن "
-"يجب أن يكون قوي البنية أكثر، على سبيل المثال: عند نقل الرسائل بين المجلدات.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>هذا يحدد أي تنسيق صندوق بريد سوف يكون الافتراضي للمجلدات المحلية:</"
+"p><p><b>صندوق وارد:</b> مجلدات بريد KMail يعاد إحضارها عن طريق ملف لكل بريد. "
+"كل رسالة على حدة موصولة من ببعضها عن طريق خط يبدأ ب \"من\". هذا يحفظ مساحة "
+"على القرص، ولكن ربما أقل, على سبيل المثال: عند نقل الرسائل بين المجلدات.</"
+"p><p><b>دليل البريد:</b> مجلدات بريد KMail مثّلت بمجلدات حقيقية على القرص. "
+"الرسائل كل على حدة ملفات منفصلة. هذا يجب أن يضيع بت من المساحة على القرص، "
+"ولكن يجب أن يكون قوي البنية أكثر، على سبيل المثال: عند نقل الرسائل بين "
+"المجلدات.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2719,52 +2695,41 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>عند القفز إلى الرسالة غير المقروءة التالية، من الممكن أن يحدث أنه ليس هنالك "
-"المزيد من الرسائل غير المقروءة تتبع لهذه الرسالة.</p>"
-"<p><b>لا تكرر:</b> البحث سيتوقف عند آخر رسالة من الرسالة الأخيرة في هذا "
-"المجلد</p>"
-"<p><b>كرر في المجلد الحالي </b> البحث سيكمل من أعلى لائحة الرسائل، ولكن ليس من "
-"مجلد آخر.</p>"
-"<p><b>كرر في جميع المجلدات</b> البحث سيكمل من أعلى لائحة الرسائل. إذا لم يتم "
-"إيجاد أي رسائل غير مقروءة سينتقل إلى المجلد التالي.</p>"
-"<p>على نحو مماثل، عند البحث عن الرسالة السابقة غير المقروءة ، البحث سيبدأ من "
-"أسفل لائحة الرسائل ويكمل إلى المجلد السابق معتمدا على أي خيار تم تحديده.</p>"
-"</qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>عند القفز إلى الرسالة غير المقروءة التالية، من الممكن أن يحدث أنه ليس "
+"هنالك المزيد من الرسائل غير المقروءة تتبع لهذه الرسالة.</p><p><b>لا تكرر:</"
+"b> البحث سيتوقف عند آخر رسالة من الرسالة الأخيرة في هذا المجلد</p><p><b>كرر "
+"في المجلد الحالي </b> البحث سيكمل من أعلى لائحة الرسائل، ولكن ليس من مجلد "
+"آخر.</p><p><b>كرر في جميع المجلدات</b> البحث سيكمل من أعلى لائحة الرسائل. "
+"إذا لم يتم إيجاد أي رسائل غير مقروءة سينتقل إلى المجلد التالي.</p><p>على نحو "
+"مماثل، عند البحث عن الرسالة السابقة غير المقروءة ، البحث سيبدأ من أسفل لائحة "
+"الرسائل ويكمل إلى المجلد السابق معتمدا على أي خيار تم تحديده.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>تسمح الفهرسة في النص الكامل بلبحث السريع في محتويات رسائلك. عند تشغيلها  "
-"سيعمل حوار البحث بسرعة فائقة. كما يقوم شريط  أدوات البحث بفرز الرسائل حسب "
-"المحتوى.</p>"
-"<p>هذا يتطلب حجم ما على القرص ( تقريبا نصف حجم القرص للرسائل).</p>"
-"<p>بعد التشغيل ، يجب القيام ببناء الفهرس ، و لكن يمكنك متابعة العمل ب-KMail "
-"بينما يجري تنفيذ هذه العملية.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>تسمح الفهرسة في النص الكامل بلبحث السريع في محتويات رسائلك. عند "
+"تشغيلها  سيعمل حوار البحث بسرعة فائقة. كما يقوم شريط  أدوات البحث بفرز "
+"الرسائل حسب المحتوى.</p><p>هذا يتطلب حجم ما على القرص ( تقريبا نصف حجم القرص "
+"للرسائل).</p><p>بعد التشغيل ، يجب القيام ببناء الفهرس ، و لكن يمكنك متابعة "
+"العمل ب-KMail بينما يجري تنفيذ هذه العملية.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2830,8 +2795,8 @@ msgstr "اخفا&ء مجلدات البرمجيات الجماعية"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "لن ترى مجلدات موارد IMAP في شجرة المجلدات اذا كان هذا الخيار محدد."
 
 #: configuredialog.cpp:4909
@@ -2842,8 +2807,8 @@ msgstr "م&جلدات الموارد موجودة في الحساب:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "لن ترى مجلدات موارد IMAP في شجرة المجلدات اذا كان هذا الخيار محدد."
 
 #: configuredialog.cpp:4921
@@ -2897,19 +2862,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "تسمية ملحقات مطابقة ل- Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "ارسال دعوة تلقائي"
@@ -2923,22 +2887,21 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>عادتا ترسل الدعوات كملحقات للرسائل. بدلا عن ذلك يقوم هذا الزر بتغيير رسائل "
-"الدعوات كي يتم ارسالها   و هذا ضروري لارسال دعوات و الحصول عليها لبرنامج "
-"Microsoft Outlook، في جسم الرسالة."
-"<br>ولكن ، عندما تفعل ذلك ، لن تحصل على شرح نصًي مفهوم من برامج البريد ، لذلك "
-"سيبدو نص الرسالة مزعجا للاشخاص اللذين يستعملون برامج بريدية لا تفهم الدعوات."
-"<br>اما الأشخاص اللذي لديهم برامج بريد تفهم الدعوات فباستطاعتهم متابعة العمل مع "
-"ذلك.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>عادتا ترسل الدعوات كملحقات للرسائل. بدلا عن ذلك يقوم هذا الزر بتغيير "
+"رسائل الدعوات كي يتم ارسالها   و هذا ضروري لارسال دعوات و الحصول عليها "
+"لبرنامج Microsoft Outlook، في جسم الرسالة.<br>ولكن ، عندما تفعل ذلك ، لن "
+"تحصل على شرح نصًي مفهوم من برامج البريد ، لذلك سيبدو نص الرسالة مزعجا للاشخاص "
+"اللذين يستعملون برامج بريدية لا تفهم الدعوات.<br>اما الأشخاص اللذي لديهم "
+"برامج بريد تفهم الدعوات فباستطاعتهم متابعة العمل مع ذلك.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3046,17 +3009,16 @@ msgstr "&حوًل الرسالة"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3074,15 +3036,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3146,8 +3108,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>انً لائحة التوزيع المسماة <b>%1</b> سبق وجودها. الرجاء اختيار إسم "
-"مختلف.</qt>"
+"<qt>انً لائحة التوزيع المسماة <b>%1</b> سبق وجودها. الرجاء اختيار إسم مختلف.</"
+"qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3156,8 +3118,8 @@ msgstr "تحرير الهوية"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3423,6 +3385,11 @@ msgstr "اختر مجلد"
 msgid "Filters"
 msgstr "المرشح %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "اختيار كل النصً"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3454,11 +3421,11 @@ msgstr "تس&جيل وقائع نشاط المرشح"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"يمكنك  هنا تشغيل او توقيف تسجيل الوقائع للمرشح. سيجري طبعا تجميع بيانات تسجيل "
-"الوقائع و عرضها فقط عند تشغيل ذلك."
+"يمكنك  هنا تشغيل او توقيف تسجيل الوقائع للمرشح. سيجري طبعا تجميع بيانات "
+"تسجيل الوقائع و عرضها فقط عند تشغيل ذلك."
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3474,15 +3441,17 @@ msgstr "سجًل وقائع تقدير ق&واعد المرشح"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3502,10 +3471,10 @@ msgstr "غير محدود"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "جمع بيانات سجلّ ألوقائع يستخدم الذاكرة مؤقتاّ لتخزين بيانات سجلّ ألوقائع، يمكنك "
 "هنا الحدّ من الكمية الأقصى من الذاكرة المستعملة: إذا  تخطى حجم بيانات سجل "
@@ -3519,7 +3488,7 @@ msgstr ""
 "لم استطع كتابة الملف %1: \n"
 "\"%2\" هي شرح الخطأ المفصًل."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "خطأ KMail "
@@ -3560,13 +3529,13 @@ msgstr "تعري&ف المستخدم:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "تعريف هوية المستخدم هو إسم الدخول على الخادم IMAP. و هذا يمكن ان يكون إسم "
-"المستخدم او عنوان بريده الكامل ، إسم الدخول احسابك على الخادم هو الذي سيطلعك اي "
-"منه هو."
+"المستخدم او عنوان بريده الكامل ، إسم الدخول احسابك على الخادم هو الذي سيطلعك "
+"اي منه هو."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3617,10 +3586,11 @@ msgstr "ليس لديك أذون القراءة/الكتابة لمجلد سلّ
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"لم يجري بعد سحب المعلومات من الخادم ، الرجاء استعمال فحص البريد \"Check Mail\"."
+"لم يجري بعد سحب المعلومات من الخادم ، الرجاء استعمال فحص البريد \"Check Mail"
+"\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3630,8 +3600,7 @@ msgstr "خطأ : لا يوجد حساب محدد لهذا المجلد"
 msgid "Connecting to server %1, please wait..."
 msgstr "جاري الاتصال مع الخادم %1 ، الرجاء الانتظار...."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "خطأ عند الاتصال بلخادم %1"
@@ -3659,8 +3628,8 @@ msgstr "أضف أذون"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "هل تريد حقا ازالة أذونك الخاصة لهذا المجلد ؟ لن تستطيع الوصول اليه بعد ذلك."
 
@@ -3693,7 +3662,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "اختر مجلد"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "مجلًدات محلية"
@@ -3718,9 +3687,9 @@ msgstr "اختر اختصار للمجلًد"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>لاختيار المجلد الحالي عليك تحديد مفتاح او تركيبة مفاتيح ، انقر الزر في "
 "الاسفل و ثم انقر المفتاح/المفاتيح التي تريد ربطها بلمجلًد.</qt>"
@@ -3743,13 +3712,21 @@ msgstr "إ&لغاء"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>إنّ المجلّد اللذي محيته هو تابع للحساب <b>%1</b> "
-"اللذي كان يضع فيه البريد. سيجري وضع البريد الجديد لهذا الحساب في مجلّد البريد "
-"الوارد الرئيسي.</qt>"
+"<qt>إنّ المجلّد اللذي محيته هو تابع للحساب <b>%1</b> اللذي كان يضع فيه البريد. "
+"سيجري وضع البريد الجديد لهذا الحساب في مجلّد البريد الوارد الرئيسي.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3875,69 +3852,17 @@ msgstr "حالة البريد غير المرغوب:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3949,19 +3874,13 @@ msgstr "&إسمك:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>إسمك</h3>"
-"<p>هذا الحقل يجب أن يحمل إسمك, كما انك ستفضلها لتظهر في رأس البريد عند "
-"ارساله</p>"
-"<p>إذا تركت هذه فارغة، إسمك الحقيقي لن يظهر، فقط عنوان البريد الإلكتروني.</p>"
-"</qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
+msgstr ""
+"<qt><h3>إسمك</h3><p>هذا الحقل يجب أن يحمل إسمك, كما انك ستفضلها لتظهر في رأس "
+"البريد عند ارساله</p><p>إذا تركت هذه فارغة، إسمك الحقيقي لن يظهر، فقط عنوان "
+"البريد الإلكتروني.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3969,17 +3888,13 @@ msgstr "المن&ظمة:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>منظمة</h3>"
-"<p>هذا الحقل يجب أن يحتوي على إسم منظمتك إذا رغبت في أن تظهر على ترويسة البريد "
-"الخارج لديك.</p>"
-"<p>من الآمن والعادي أن تترك فارغة.</p></qt>"
+"<qt><h3>منظمة</h3><p>هذا الحقل يجب أن يحتوي على إسم منظمتك إذا رغبت في أن "
+"تظهر على ترويسة البريد الخارج لديك.</p><p>من الآمن والعادي أن تترك فارغة.</"
+"p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3988,20 +3903,15 @@ msgstr "&البريد الإلكتروني:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>عنوان البريد الإلكتروني</h3>"
-"<p>الحقل يجب أن يحتوي على عنوان بريدك الإلكتروني كاملا.</p>"
-"<p>إذا تركت هذه فارغة، أو خطأ، الأشخاص سوف يواجهون مشاكل في إعادة الإرسال "
-"لك.</p></qt>"
+"<qt><h3>عنوان البريد الإلكتروني</h3><p>الحقل يجب أن يحتوي على عنوان بريدك "
+"الإلكتروني كاملا.</p><p>إذا تركت هذه فارغة، أو خطأ، الأشخاص سوف يواجهون "
+"مشاكل في إعادة الإرسال لك.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4010,21 +3920,12 @@ msgstr "&البريد الإلكتروني:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4047,19 +3948,17 @@ msgstr "اختر مفتاحك OpenPGP  الذي سيتم به التوقيع ا�
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>سيستعمل مفتاح OpenPGP اللذي تختاره هنا لتوقيع رسائلك رقميا. يمكنك ايضا "
-"استعمال مفاتيح GnuPG.</p>"
-"<p>يمكن ترك هذا الخقل فارغ ، ولكن لن يستطيع KMail توقيع رسائلك الالكترونية "
-"مستخدما OpenPGP ، لن يكون هناك تأثير على وظائف البريد العادية.</p>"
-"<p>يمكنك معرفة المزيد عن المفاتيح على موقع <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>سيستعمل مفتاح OpenPGP اللذي تختاره هنا لتوقيع رسائلك رقميا. يمكنك "
+"ايضا استعمال مفاتيح GnuPG.</p><p>يمكن ترك هذا الخقل فارغ ، ولكن لن يستطيع "
+"KMail توقيع رسائلك الالكترونية مستخدما OpenPGP ، لن يكون هناك تأثير على "
+"وظائف البريد العادية.</p><p>يمكنك معرفة المزيد عن المفاتيح على موقع "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4071,30 +3970,27 @@ msgstr "مفتاحك OpenPGP للتشفير"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "اختر المفتاح OpenPGP الذي يستخدم عند التوقيع لنفسك و لصفة  \"اضافة مفتاحي "
 "العلني\" في المحرر."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>سيستعمل مفتاح OpenPGP اللذي تختاره هنا لتشفير الرسائل اللتي ترسلها الى نفسك "
-"و الى صفة \"اضف مفتاحي العلني\" في محرر الرسائل. يمكنك ايضا استعممال مفاتيح "
-"GnuPG .</p>"
-"<p>يمكنك ترك هذا الحقل فارغ ولكن لن يستطيع KMail تشفير نسخات بريدك الخارج "
-"مستخدما  OpenPGP ، لن يكون هناك تأثير على وظائف البريد العادية.</p>"
-"<p>لمعرفة المزيد عن المفاتيح  اذهب الى الموقع <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>سيستعمل مفتاح OpenPGP اللذي تختاره هنا لتشفير الرسائل اللتي ترسلها "
+"الى نفسك و الى صفة \"اضف مفتاحي العلني\" في محرر الرسائل. يمكنك ايضا "
+"استعممال مفاتيح GnuPG .</p><p>يمكنك ترك هذا الحقل فارغ ولكن لن يستطيع KMail "
+"تشفير نسخات بريدك الخارج مستخدما  OpenPGP ، لن يكون هناك تأثير على وظائف "
+"البريد العادية.</p><p>لمعرفة المزيد عن المفاتيح  اذهب الى الموقع <a>http://"
+"www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4112,17 +4008,15 @@ msgstr "اختر سندات S/MIME اللتي ستستخدم للتوقيع ال
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>سيستعمل السند (الشهادة ) S/MIME (X.509) اللذي تختاره هنا لتوقيع رسائلك "
-"رقميا.</p>"
-"<p>يمكنك ترك هذا الحقل فارغ و لكن لن يستطيع KMail توقيع بريدك الالكتروني رقميا "
-"بواسطة S/MIME ، اما وظائف البريد العادية فلن يكن عليها اي مفعول.</p></qt>"
+"<qt><p>سيستعمل السند (الشهادة ) S/MIME (X.509) اللذي تختاره هنا لتوقيع "
+"رسائلك رقميا.</p><p>يمكنك ترك هذا الحقل فارغ و لكن لن يستطيع KMail توقيع "
+"بريدك الالكتروني رقميا بواسطة S/MIME ، اما وظائف البريد العادية فلن يكن "
+"عليها اي مفعول.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4134,27 +4028,25 @@ msgstr "شهادتك (سنداتك) S/MIME للتشفير"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"اختر السند S/MIME الذي يستخدم عند التشفير لنفسك و لصفة  \"اضافة مفتاحي العام\" "
-"في المحرر."
+"اختر السند S/MIME الذي يستخدم عند التشفير لنفسك و لصفة  \"اضافة مفتاحي العام"
+"\" في المحرر."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4174,23 +4066,19 @@ msgstr "الر&د - الى العنوان:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>الرد على العناوين</h3>"
-"<p>هذا يضبط ال <tt>الرد إلى:</tt> لتتضمن الترويسة عنوان بريد إلكتروني مختلف إلى "
-"المعتاد <tt>من:</tt> عنوان.</p>"
-"<p>من الممكن أن يكون هذا مفيدا عندما يكون لديك مجموعة من الناس يعملون معا ضمن "
-"قواعد واحدة. على سبيل المثال، أنت ربما تريد أي بريد لتحصل على بريدك في <tt>"
-"من:</tt> حقل،بدون مسؤولية الذهاب إلى عناوين المجموعة.</p>"
-"<p>إذا شككت، أترك هذا الحقل فارغا.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>الرد على العناوين</h3><p>هذا يضبط ال <tt>الرد إلى:</tt> لتتضمن "
+"الترويسة عنوان بريد إلكتروني مختلف إلى المعتاد <tt>من:</tt> عنوان.</p><p>من "
+"الممكن أن يكون هذا مفيدا عندما يكون لديك مجموعة من الناس يعملون معا ضمن "
+"قواعد واحدة. على سبيل المثال، أنت ربما تريد أي بريد لتحصل على بريدك في "
+"<tt>من:</tt> حقل،بدون مسؤولية الذهاب إلى عناوين المجموعة.</p><p>إذا شككت، "
+"أترك هذا الحقل فارغا.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4198,22 +4086,17 @@ msgstr "&عناوين الملحقات المخفية:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (مرفق مخفي) عناوين</h3>"
-"<p>العناوين التي أدخلتها هنا سوف تضاف إلى كل بريد صادر تم إرساله عن طريق هذه "
-"الهوية. هم لن يكونوا مرئيين للمستلمين الآخرين.</p>"
-"<p>هذه عادة تستخدم لإرسال نسخة من كل رسالة مرسلة إلى حساب من آخر من حساباتك.</p>"
-"<p>إذا شككت، أترك هذا الحقل فارغا.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (مرفق مخفي) عناوين</h3><p>العناوين التي أدخلتها هنا سوف تضاف إلى "
+"كل بريد صادر تم إرساله عن طريق هذه الهوية. هم لن يكونوا مرئيين للمستلمين "
+"الآخرين.</p><p>هذه عادة تستخدم لإرسال نسخة من كل رسالة مرسلة إلى حساب من آخر "
+"من حساباتك.</p><p>إذا شككت، أترك هذا الحقل فارغا.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4253,7 +4136,7 @@ msgstr "&التوقيع"
 msgid "&Picture"
 msgstr "ال&صورة"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "عنوان البريد الإلكتروني غير صالح"
 
@@ -4276,8 +4159,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "ان واحد من مفاتيح التوقيع OpenPGP المهيئ لا يحتوي على اي هوية مستخدم معين مع "
 "عنوان البريد الالكتروني لهذه الهوية (%1)."
@@ -4319,16 +4202,16 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"مجلد البريد المرسل المخصص للهوية \"%1\"غير موجود (بعد الآن). سيتم استخدام مجلد "
-"البريد المرسل الإفتراضي."
+"مجلد البريد المرسل المخصص للهوية \"%1\"غير موجود (بعد الآن). سيتم استخدام "
+"مجلد البريد المرسل الإفتراضي."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"مجلد المسودات العادي للهوية \"%1\" غير موجود (بعد الآن) ، لذلك ستستخدم مجلدات "
-"المسودات الإفتراضية."
+"مجلد المسودات العادي للهوية \"%1\" غير موجود (بعد الآن) ، لذلك ستستخدم "
+"مجلدات المسودات الإفتراضية."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4336,13 +4219,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"مجلد المسودات العادي للهوية \"%1\" غير موجود (بعد الآن) ، لذلك ستستخدم مجلدات "
-"المسودات الإفتراضية."
+"مجلد المسودات العادي للهوية \"%1\" غير موجود (بعد الآن) ، لذلك ستستخدم "
+"مجلدات المسودات الإفتراضية."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (إفتراضي)"
 
@@ -4389,14 +4272,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr "تم نزوح الاعدادات تلقائيا و لكن عليك ان تفحص مجددا اعدادات حسابك."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "لم من الامكان نزوح الاعدادات تلقائيا فعليك من فضلك  ان تفحص مجددا اعدادات "
 "حسابك."
@@ -4437,14 +4320,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "الخطأ: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "انقطعة المواصلة مع الخادم %1 او انتهت مدتها. سيتم اعادة الاتصال تلقائيا اذا "
 "امكن الامر."
@@ -4598,14 +4486,14 @@ msgstr "أعرض المحفوظات (Archives)"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4634,273 +4522,239 @@ msgstr "مفتاح تشفير غير صالح للاستعمال"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يومين</p>\n"
-"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من  %n أيام.</p> \n"
-"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من  %n يوم.</p>"
+"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من يوم.</p>\n"
+"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من يومين</p>\n"
+"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من  %n أيام.</p> \n"
+"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من  %n يوم.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مجته في أقل من %n أيام.</p> \n"
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مجته في أقل من %n يوم.</p>"
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدًته في أقل من يوم.</p>\n"
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدًته في أقل من يومين.</p>\n"
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مجته في أقل من %n أيام.</p> \n"
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مجته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في اقل من %n أيام.</p> \n"
-"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في اقل من %n يوم.</p>"
+"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في أقل من يوم.</p>\n"
+"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في أقل من يومين.</p>\n"
+"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في اقل من %n أيام.</p> \n"
+"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في اقل من %n يوم.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسند توقيعك S/MIME </p><p align=center><b>%1</b> "
-"( الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسند توقيعك S/MIME </p><p align=center><b>%1</b> "
-"( الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسنج توقيعك S/MIME </p><p align=center><b>%1</b> "
-"(الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسنج توقيعك S/MIME </p><p align=center><b>%1</b> "
-"(الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسند توقيعك S/MIME "
+"</p><p align=center><b>%1</b> ( الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل "
+"من يوم.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسند توقيعك S/MIME "
+"</p><p align=center><b>%1</b> ( الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل "
+"من يومين.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسنج توقيعك S/MIME "
+"</p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل "
+"من %n أيام.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسنج توقيعك S/MIME "
+"</p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل "
+"من %n يوم.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من  %n أيام</p> \n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من  %n يوم</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"يوم</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"يومين</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من  "
+"%n أيام</p> \n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من  "
+"%n يوم</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من يوم.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من يومين.</"
+"p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من %n أيام.</"
+"p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يوم.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يومين.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"%n أيام.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"%n يوم.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم.</p> "
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يوم.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يومين.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل من "
+"%n أيام.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل من "
+"%n يوم.</p> "
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام .</p>\n"
-" "
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم .</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من يوم.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من يومين.</"
+"p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من %n أيام .</"
+"p>\n"
+" <p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من %n يوم .</"
+"p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p>\n"
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p>"
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</"
+"p><p>تنتهي مدته في أقل من يوم.</p>\n"
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</"
+"p><p>تنتهي مدته في أقل من يومين.</p>\n"
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n أيام.</p>\n"
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم</p>\n"
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين</p>\n"
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p> \n"
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p>"
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من يوم</p>\n"
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من يومين</p>\n"
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n أيام.</p> \n"
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم</p>\n"
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين</p>\n"
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p> \n"
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p> "
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من يوم</p>\n"
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من يومين</p>\n"
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من %n أيام.</p> \n"
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من %n يوم.</p> "
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4914,262 +4768,228 @@ msgstr "قريبا تنتهي مدًة صلاحية السند S/MIME"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يومين</p>\n"
-"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من  %n أيام.</p> \n"
-"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من  %n يوم.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من يوم.</p>\n"
+"<p>مفتاح توقيعك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من يومين</p>\n"
+"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من  %n أيام.</p> \n"
+"<p>مفتاح توقيعك OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدته في أقل من  %n يوم.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مجته في أقل من %n أيام.</p> \n"
-"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مجته في أقل من %n يوم.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدًته في أقل من يوم.</p>\n"
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مدًته في أقل من يومين.</p>\n"
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مجته في أقل من %n أيام.</p> \n"
+"<p>مفتاح تشفيرك OpenPGP </p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>تنتهي مجته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في اقل من %n أيام.</p> \n"
-"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>تنتهي مدته في اقل من %n يوم.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في أقل من يوم.</p>\n"
+"<p>مفتاح OpenPGP الى</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في أقل من يومين.</p>\n"
+"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في اقل من %n أيام.</p> \n"
+"<p>مفتاح OpenPGP الى </p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>تنتهي "
+"مدته في اقل من %n يوم.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسند توقيعك S/MIME </p><p align=center><b>%1</b> "
-"( الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسند توقيعك S/MIME </p><p align=center><b>%1</b> "
-"( الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسنج توقيعك S/MIME </p><p align=center><b>%1</b> "
-"(الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>الخاص بسنج توقيعك S/MIME </p><p align=center><b>%1</b> "
-"(الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسند توقيعك S/MIME "
+"</p><p align=center><b>%1</b> ( الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل "
+"من يوم.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسند توقيعك S/MIME "
+"</p><p align=center><b>%1</b> ( الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل "
+"من يومين.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسنج توقيعك S/MIME "
+"</p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل "
+"من %n أيام.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>الخاص بسنج توقيعك S/MIME "
+"</p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل "
+"من %n يوم.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من  %n أيام</p> \n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من  %n يوم</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"يوم</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"يومين</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من  "
+"%n أيام</p> \n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من  "
+"%n يوم</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p>\n"
-"<p>السند الجذري </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من يوم.</p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من يومين.</"
+"p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من %n أيام.</"
+"p>\n"
+"<p>السند الجذري </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدًته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يوم.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يومين.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"%n أيام.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند توقيعك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدته في أقل من "
+"%n يوم.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند تشفيرك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم.</p> "
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يوم.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p><p>تنتهي مدًته في أقل من "
+"يومين.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل من "
+"%n أيام.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند تشفيرك S/MIME </"
+"p><p align=center><b>%1</b> (الرقم التسلسلي  %2)</p><p>تنتهي مدته في أقل من "
+"%n يوم.</p> "
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n أيام .</p>\n"
-" "
-"<p>السند المرحلي CA </p><p align=center><b>%3</b></p>"
-"<p>لسند S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من %n يوم .</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من يوم.</p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من يومين.</"
+"p>\n"
+"<p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من %n أيام .</"
+"p>\n"
+" <p>السند المرحلي CA </p><p align=center><b>%3</b></p><p>لسند S/MIME </p><p "
+"align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي مدته في أقل من %n يوم .</"
+"p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يوم.</p>\n"
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</p>"
-"<p>تنتهي مدته في أقل من يومين.</p>\n"
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p>\n"
-"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</"
+"p><p>تنتهي مدته في أقل من يوم.</p>\n"
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (الرقم التسلسلي %2)</"
+"p><p>تنتهي مدته في أقل من يومين.</p>\n"
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n أيام.</p>\n"
+"<p>سند توقيعك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم</p>\n"
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين</p>\n"
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p> \n"
-"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من يوم</p>\n"
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من يومين</p>\n"
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n أيام.</p> \n"
+"<p>سند تشفيرك S/MIME </p><p align=center><b>%1</b> (رقم تسلسلي %2)</"
+"p><p>تنتهي مدًته في أقل من %n يوم.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يوم</p>\n"
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من يومين</p>\n"
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n أيام.</p> \n"
-"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p>"
-"<p>تنتهي مدًته في أقل من %n يوم.</p> "
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من يوم</p>\n"
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من يومين</p>\n"
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من %n أيام.</p> \n"
+"<p>سند S/MIME الى</p><p align=center><b>%1</b> (رقم تسلسلي %2)</p><p>تنتهي "
+"مدًته في أقل من %n يوم.</p> "
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5181,14 +5001,16 @@ msgstr "قريبا تنتهي مدًة صلاحية السند S/MIME"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "واحد او العديد من مفاتيحك للتشفير OpenPGP  او سندات S/MIME غير صالح للتشفير. "
-"الرجاء اعادة اعداد مفاتيحك للتشفير و سنداتك لهذه الهوية في حوار اعداد الهوية.\n"
+"الرجاء اعادة اعداد مفاتيحك للتشفير و سنداتك لهذه الهوية في حوار اعداد "
+"الهوية.\n"
 "اذا اخترت المتابعة  ، و انت بحاجة الى المفاتيح فيما بعد ، سيعاد حثًك لتحديد "
 "مفاتيح الاستعمال."
 
@@ -5207,7 +5029,8 @@ msgstr ""
 "واحد أو العديد من سندات مفاتيح توقيعك المحكمة ل- OpenPGP أو S/MIME غير صالح "
 "للإستعمال. ألرجاء إعادة التحكم بمفاتيح توقيعك أو بسنداتك لهذه الهوية في حوار "
 "التحكُم بلهوية.\n"
-"سيجري سؤالك عن المفتاح للإستخدام إذا إحتجت إلى المفاتيح و  إخترت المتابعة الآن."
+"سيجري سؤالك عن المفتاح للإستخدام إذا إحتجت إلى المفاتيح و  إخترت المتابعة "
+"الآن."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5217,13 +5040,13 @@ msgstr "مفاتيح توقيع غير صالحة للأستعمال"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"فحص تفضيلات التشفير للمرسل إليه يدِلّ على أنّه يجب فشفير الرسالة بواسطة OpenPGP "
-"، على ألأقلّ لبعض المراسلين، \n"
+"فحص تفضيلات التشفير للمرسل إليه يدِلّ على أنّه يجب فشفير الرسالة بواسطة "
+"OpenPGP ، على ألأقلّ لبعض المراسلين، \n"
 "و لكنك لم تحدِد مفاتيح تشفير موثوقة OpenPGP و صالحة لهذه الهوية.\n"
 "يمكنك المتابعة بدون التشفير إلى ذاتك ، و لكن إنتبِه إلى أنّك لنْ تستطيع قراءة "
 "رسائلك إذا فعلت ذالك."
@@ -5232,21 +5055,21 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"فحص تفضيلات التشفير للمرسل إليه يدِلّ على أنّه يجب فشفير الرسالة بواسطة S/MIME "
-"، على ألأقلّ لبعض المراسلين، \n"
+"فحص تفضيلات التشفير للمرسل إليه يدِلّ على أنّه يجب فشفير الرسالة بواسطة S/"
+"MIME ، على ألأقلّ لبعض المراسلين، \n"
 "و لكنك لم تحدِد سندات تشفير S/MIME و صالحة لهذه الهوية.\n"
 "يمكنك المتابعة بدون التشفير إلى ذاتك ، و لكن إنتبِه إلى أنّك لنْ تستطيع قراءة "
 "رسائلك إذا فعلت ذالك."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5260,13 +5083,13 @@ msgstr "لا توقِع بِـــOpenPGPع"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"فحص تفضيلات التوقيع للمرسل إليهم يدِلّ على أنّه يجب فشفير الرسالة بواسطة S/MIME "
-"، على ألأقلّ لبعض المراسلين، \n"
+"فحص تفضيلات التوقيع للمرسل إليهم يدِلّ على أنّه يجب فشفير الرسالة بواسطة S/"
+"MIME ، على ألأقلّ لبعض المراسلين، \n"
 "و لكنك لم تحدِد سندات تشفير S/MIME  صالحة لهذه الهوية."
 
 #: keyresolver.cpp:1275
@@ -5289,8 +5112,8 @@ msgstr "استعمال التوقيع غير ممكن"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "لم تحدًد مفتاح تشفير لنفسك ( التشفير للذات ). لن تستطع فكً التشفير لرسائلك اذا "
 "قمت بتشفيرها."
@@ -5312,8 +5135,8 @@ msgstr "لم تحدًد مفتاح تشفير لمستلم هذه الرسالة
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "لم تحدًد مفتاح تشفير لأي مستلم لهذه الرسالة ، لذلك لن ينجح تشفير الرسالة."
 
@@ -5359,11 +5182,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "لم اجِد مفاتيح تشفير موثوقة و صالحة لِــ \"%1\".\n"
 "\n"
@@ -5412,10 +5235,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "خطأ حرج: غير قادر على تجميع البريد:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"فشلت في إضافة رسالة:\n"
+msgid "Failed to add message:\n"
+msgstr "فشلت في إضافة رسالة:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5509,6 +5330,50 @@ msgstr "حساب IMAP منق&طع الإتصال"
 msgid "&Maildir mailbox"
 msgstr "صندوق &بريد Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "تحديد موضوع الرسالة"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "إرسال مرفق: إلى العنوان"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "إرسال مرفق مخفي: إلى العنوان."
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "إضافة ترويسة إلى رسالة"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "قراءة جسم رسالة من ملف"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "اعداد جسم الرسالة."
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "إضافة مرفق إلى البريد الإلكتروني. يمكن لهذا أن يعاد تكراره."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "تحقق فقط من البريد الجديد"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "فقط إفتح نافذة تحرير"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "شاهد ملف الرسالة المعنية"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "إرسال رسالة إلى عنوان و أرفق الملف الذي يشير اليه ال'URL'"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "بريد"
@@ -5552,8 +5417,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"برنامج KMail سوف ينشيء مجلدات البرمجيات الجماعية المطلوبة كمجلّدات فرعية من %1، "
-" إذا كنت لا تريد ذالك ، إضغط \"لا\"، وسيتم تعطيل المصدر IMAP"
+"برنامج KMail سوف ينشيء مجلدات البرمجيات الجماعية المطلوبة كمجلّدات فرعية من "
+"%1،  إذا كنت لا تريد ذالك ، إضغط \"لا\"، وسيتم تعطيل المصدر IMAP"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5565,13 +5430,12 @@ msgstr "%1: وجدتُ المجلّد %2. سيتم تحديده كمجلّد ا�
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt> وجد KMail مجلّدات البرمجيات الجماعية التالية في %1 و هو بحاجة إلى تطبيق "
-"العمليات التالية: %2"
-"<br>إذا لم تكن تشاء ذلك ، ألغي و سيتم تعطيل المورِد IMAP."
+"العمليات التالية: %2<br>إذا لم تكن تشاء ذلك ، ألغي و سيتم تعطيل المورِد IMAP."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5622,11 +5486,11 @@ msgstr "نسخ الارتباط إلى الحافظة."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>ملف <b>%1</b> موجود.<br>هل تريد استبداله؟</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "حفظ إلى ملف"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&استبدال"
 
@@ -5644,7 +5508,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5664,11 +5528,11 @@ msgstr "الملف لا يحتوي رسالة"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "الملف يحتوي عدًة رسائل. سترى فقط الرسالة الاولى."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5677,114 +5541,114 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "محو رسائل"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "جاري نقل رسالة %3 من %2 من %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "حجم القرص الفارغ غير كافي ؟"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "أنقل إلى هذا المجلد"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "أنسخ إلى هذا المجلد"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "نقل رسائل"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "محو رسائل"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "جاري فتح URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>هل تريد حقاً تنفيذ <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "نفّذ"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "لم توجد ملحقات لتحفظ."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "حفظ الملحق كــ"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "attachment.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "ملحق %1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "الملف المسمى %1 موجود مسبقا. هل تريد الكتابة عليه ؟"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "الملف موجود مسبقاً"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "كتابة &فوقية"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 " ان الجزء %1 من الرسالة تم تشفيره. هل تريد الإحتفاظ بالشيفرة عند الحفظ ؟"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "سؤال KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "حافِظ على التشفير"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "لا تحافظ"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "ان الجزء %1 من الرسالة موقّع . هل تريد الإحتفاظ بالتوقيع عند الحفظ ؟"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "حافظ على التوقيع"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5793,21 +5657,22 @@ msgstr ""
 "لم اتمكن من كتابة الملف %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "لم يمكن كتابة الملف %1 ."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"لا يوجد خانة لهذا العنوان الالكتروني في دفتر عناوينك. أضِفهم إلى دفتر العناوين "
-"و فيما بعد اضِف عناوين إتصال فورية مستخدماً زبونك المفضل للمراسلة الفورية."
+"لا يوجد خانة لهذا العنوان الالكتروني في دفتر عناوينك. أضِفهم إلى دفتر "
+"العناوين و فيما بعد اضِف عناوين إتصال فورية مستخدماً زبونك المفضل للمراسلة "
+"الفورية."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5817,76 +5682,76 @@ msgstr ""
 " %1\n"
 " إستحالة تحديد مع من تريد الدردشة."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "لا يقدِمّ طرف خلفية Chiasmus وظيفة \"x-obtain-keys\". الرجاء التبليغ عن هذا "
 "الخطأ."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "خطأ الطرف الخلفي لِــ Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "نتيجة من الطرف الخلفي لِــ غير متوقّعة. الدالة \"x-obtain-keys\" لم تنتِج لائحة "
 "سلاسل. الرجاء التبليغ عن هذا الخطأ."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "لم أجِد أي مفتاح. الرجاء التأكد انك اعطيت مسار مفتاح صالح في إعدادات Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "تحديد مفتاح التشفير Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "الطرف الخلفي لِــ Chiasmus لا يقدّم وظيفة \"x-decrypt\". الرجاء التبليغ عن هذا "
 "الخطأ."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 "الدالة \"x-decrypt\" لا تتقبّل الضوابط المنتظرة. الرجاء التبليغ عن هذا الخطأ."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "خطأ التشفير  Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "قيمة ناتجة عن الطرف الخلفي لِــ Chiasmus: لم تنتِج الوظيفة \"x-decrypt\" صفيفة "
 "بايت ( byte ) . الرجاء التبليغ عن هذا الخطأ."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "بريد"
@@ -5985,7 +5850,7 @@ msgstr "الحجم"
 msgid "Encoding"
 msgstr "الترميز"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "إضغط"
 
@@ -5997,7 +5862,7 @@ msgstr "شفّر"
 msgid "Sign"
 msgstr "وقَع"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "أسم الملحق:"
 
@@ -6019,7 +5884,8 @@ msgstr "المرسل اليهم الأوليين"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>سترسل نسخة عن هذه الرسالة إلى كل من تضع عنوانه في هذا الحقل..</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -6029,13 +5895,13 @@ msgstr "مراسلين اضافيين"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>سترسل نسخة عن هذه الرسالة إلى كل من تضع إسمه في هذا الحقل. حسب التقنية يكون "
-"ذالك مشابه لأن تضع كل العناوين الألكترونية في الحقل <b>إلى:</b> "
-"و لكن يختلف ذالك بأنّ مستلم المرفق المخفي يكون فقط مشارِك في الرسالة و ليس هو "
+"<qt>سترسل نسخة عن هذه الرسالة إلى كل من تضع إسمه في هذا الحقل. حسب التقنية "
+"يكون ذالك مشابه لأن تضع كل العناوين الألكترونية في الحقل <b>إلى:</b> و لكن "
+"يختلف ذالك بأنّ مستلم المرفق المخفي يكون فقط مشارِك في الرسالة و ليس هو "
 "المستلم الرئيسي.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6044,9 +5910,8 @@ msgstr "مراسلون مخفيون"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>نفس الشيئ مثل الحقل <b>نسخة إلى:</b> و لكن يختلف في انّ كلّ المرسل إليهم "
 "الآخرين لا يرون من إستلم المرفق المخفي.</qt>"
@@ -6059,7 +5924,7 @@ msgstr "إرسال ال&بريد"
 msgid "&Send Mail Via"
 msgstr "إرسال ال&بريد عن طريق"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "إرسال &فيما بعد"
@@ -6126,8 +5991,7 @@ msgstr "إ&زالة حروف علامة التصريح"
 msgid "Cl&ean Spaces"
 msgstr "ن&ظف الفراغات"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "استعمل خط &ثابت"
@@ -6269,31 +6133,31 @@ msgstr "هيئة الرسالة ال&مشفًرة"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "قياسي"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "لائحة مرتبة ( عشرية )"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "لائحة مرتبة ( Alpha lower )"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "لائحة مرتبة (Alpha upper)"
 
@@ -6400,8 +6264,8 @@ msgstr "أغاق المحرر"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "إنّ الرسالة التي إنتهيت من تحريرها تبدو و كأنها تُدِلّ على مرجع ملف ملحق و لكن "
@@ -6412,49 +6276,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "تذكير بِإضافة ملف ملحق."
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "أ&رسل كما هو"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail لم يستطع تحديد الموقع للملفات الملحقة (%1).</p>"
-"<p>يجب عليك أن تحدد المسار الكامل إن أردت إضافة ملف ملحق ما.</p></qt>"
+"<qt><p>KMail لم يستطع تحديد الموقع للملفات الملحقة (%1).</p><p>يجب عليك أن "
+"تحدد المسار الكامل إن أردت إضافة ملف ملحق ما.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "أضف ملفّ ملحق"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&ملحقات"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "إدراج ملف"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "إدراج ملف"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>حصل خطأ عند محاولة تصدير المفتاح من الطرف الخلفي:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>حصل خطأ عند محاولة تصدير المفتاح من الطرف الخلفي:</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6493,300 +6357,308 @@ msgid ""
 "View"
 msgstr "أعرض"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "حرر..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "تحرير نص أوامر..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "احفظ با&سم"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&خصائص"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "إضف ملحق..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "لم يتمكن KMail من ضغط الملف."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "الملف المضغوط أكبر من الملف الأصلي. هل تريد الحفاظ على الملف الأصلي ؟"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "حافظ عليه"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "لم يتمكن KMail من فك ضغط الملف."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "إحفظ الملحق كـ"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "اضافة كنصً"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "إضافة كملحق"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "ألصق ك&ملحق"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "غير مسمى"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>لقد طلبت تشفير الرسالة إلى ذاتك ، و لكن الهوية المحدّدة حالياً لا تعرِف "
-"مفتاح تشفير ( OpenPGP أو  S/MIME ) للإستعمال لذالك.</p>"
-"<p> الرجاء إختيار المفتاح ( المفاتيح ) اللتي تريد إستعمالها في إعدادات "
-"الهوية.</p></qt>"
+"<qt><p>لقد طلبت تشفير الرسالة إلى ذاتك ، و لكن الهوية المحدّدة حالياً لا تعرِف "
+"مفتاح تشفير ( OpenPGP أو  S/MIME ) للإستعمال لذالك.</p><p> الرجاء إختيار "
+"المفتاح ( المفاتيح ) اللتي تريد إستعمالها في إعدادات الهوية.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "مفتاح تشفير غير معروف"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>كي تستطيع توقيع هذه الرسالة عليك أولآ تحديد مفتاح توقيع ( OpenPGP أو S/MIME "
-") للإستعمال.</p>"
-"<p>الرجاء تحديد المفتاح للإستعمال في إعدادات الهوية.</p></qt>"
+"<qt><p>كي تستطيع توقيع هذه الرسالة عليك أولآ تحديد مفتاح توقيع ( OpenPGP أو "
+"S/MIME ) للإستعمال.</p><p>الرجاء تحديد المفتاح للإستعمال في إعدادات الهوية.</"
+"p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "مفتاح توقيع غير معروف"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"حاليا KMail  في نمط الأتصال المقطوع ، ستُحفظ رسائلك في صندوق البريد الصادر إلى "
-"حين إعادة الأتصال."
+"حاليا KMail  في نمط الأتصال المقطوع ، ستُحفظ رسائلك في صندوق البريد الصادر "
+"إلى حين إعادة الأتصال."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "متّصل / غير متّصِل"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"يجب عليك إدخال عنوان بريدك الالكتروني في الحقل من: .يجب عليك ايضا تحديد عنوان "
-"بريدك لكل الهويات ، حيث لا تحتاج الى إدخالها لكل رسالة."
+"يجب عليك إدخال عنوان بريدك الالكتروني في الحقل من: .يجب عليك ايضا تحديد "
+"عنوان بريدك لكل الهويات ، حيث لا تحتاج الى إدخالها لكل رسالة."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"يجب عليك تحديد على الاقل إسم واحد للمرسل اليه، اما في الحقل الى: او الحقل مرفق "
-"(نسخة كربونية) او حقل المرفق المخفي."
+"يجب عليك تحديد على الاقل إسم واحد للمرسل اليه، اما في الحقل الى: او الحقل "
+"مرفق (نسخة كربونية) او حقل المرفق المخفي."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "لم تحدد موضوعاً. أرسل الرسالة رغما عن ذلك ؟ "
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "لم يحدد إسم"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "لم تحدد موضوعاً. أرسل الرسالة رغما عن ذلك ؟ "
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "لم يحدد موضوع "
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "أ&رسِل كما هو"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&حدِد الموضوع"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&حافِظ على العلامة ، لا توقِع / تشفِر"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&حافِظ على العلامة ، لا  تشفِر"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&حافِظ على العلامة ، لا توقِع"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "وقَع / شفّر (محو العلامة )"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr " شفّر (محو العلامة )"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "وقَع (محو العلامة )"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>توقيع / تشفير رسائل من نوع على الخط غير ممكن ، </p>"
-"<p>هل تريد محو علامتك ؟</p></qt>"
+"<qt><p>توقيع / تشفير رسائل من نوع على الخط غير ممكن ، </p><p>هل تريد محو "
+"علامتك ؟</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "توقيع / تشفير الرسالة ؟"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"مجلد المسودات العادي للهوية \"%1\" غير موجود (بعد الآن) ، لذلك ستستخدم مجلدات "
-"المسودات الإفتراضية."
+"مجلد المسودات العادي للهوية \"%1\" غير موجود (بعد الآن) ، لذلك ستستخدم "
+"مجلدات المسودات الإفتراضية."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "الرجاء إنشاء حساب للإرسال ثم حاول مرة أخرى. "
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "جاهز لإرسال بريد إلكتروني..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "أرسل تأكيد"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "أ&رسل الآن"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "لا احد للارسال اليه"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "مراسلين اضافيين"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "المدقق الإملائي"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "المدقق الإملائي"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " ألغي التدقيق الإملائي."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " تم إيقاف التدقيق الإملائي."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " إنتهى التدقيق الإملائي."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "المدقق الإملائي"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "الرجاء إعداد الطرف الخلفي للتشفير Chiasmus أولا.\n"
 "يمكنك إعداد ذالك في لسان الطرف الخلفي للتشفير في صفحة حوار الأمن."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"يبدو و كأنّ تصريف البرنامج  libkleopatra  قد تمّ بدون دعم Chiasmus. يمكنك إعادة "
-"تصريف libkleopatra مع الخيار --enable-chiasmus."
+"يبدو و كأنّ تصريف البرنامج  libkleopatra  قد تمّ بدون دعم Chiasmus. يمكنك "
+"إعادة تصريف libkleopatra مع الخيار --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "لا وجد طرف خلفي Chiasmus مهيئ"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "لم يجد أي مفتاح Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "إختيار مفتاح تشفير Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "الرسالة وقعت من قبل %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "الرسالة وقعت من قبل %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "رسالة OpenPGP - مشفَرة"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "رسالة بعنوان:"
@@ -6836,11 +6708,11 @@ msgstr "التدقيق الإملائي - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"لا يمكن بدء ISpell/Aspell. الرجاء التأكد من أن Ispell أو Aspell مركبة صحيحا على "
-"جهازك و في ضابطة ال- PATH لديك."
+"لا يمكن بدء ISpell/Aspell. الرجاء التأكد من أن Ispell أو Aspell مركبة صحيحا "
+"على جهازك و في ضابطة ال- PATH لديك."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6873,13 +6745,11 @@ msgstr "<qt>عمليات ترشيح كثيرة في قواعد المرشح <b>%
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>حدث مرشح غير معروف <b>%1</b>"
-"<br>في قاعدة المرشح <b>%2</b>."
-"<br>تجاهلها</qt>"
+"<qt>حدث مرشح غير معروف <b>%1</b><br>في قاعدة المرشح <b>%2</b>.<br>تجاهلها</"
+"qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7098,165 +6968,127 @@ msgstr "شغِل الصوت"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>هذه لائحة في المرشحات المعرفة، لقد عولجت من الأعلى إلى الأسفل.</p>"
-"<p>إضغط على أي مرشح لتحريره باستخدام المتحكمات في اليد اليمنى منتصف الصندوق.</p>"
-"</qt>"
+"<qt><p>هذه لائحة في المرشحات المعرفة، لقد عولجت من الأعلى إلى الأسفل.</"
+"p><p>إضغط على أي مرشح لتحريره باستخدام المتحكمات في اليد اليمنى منتصف "
+"الصندوق.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>إضغط هذا الزر لتكوين مرشح جديد.</p>"
-"<p>المرشح سوف يدرج قبل المرشح المحدد حالياً ، ولكنك تستطيع دائماً تغيير ذلك "
-"لاحقا.</p>"
-"<p>إذا ضغط هذا الزر عن طريق الخطأ،تستطيع التراجع عن طريق الضغط على <em>حذف</em> "
-"زر.</p></qt>"
+"<qt><p>إضغط هذا الزر لتكوين مرشح جديد.</p><p>المرشح سوف يدرج قبل المرشح "
+"المحدد حالياً ، ولكنك تستطيع دائماً تغيير ذلك لاحقا.</p><p>إذا ضغط هذا الزر عن "
+"طريق الخطأ،تستطيع التراجع عن طريق الضغط على <em>حذف</em> زر.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>اضغط هذا الزر لنسخ مرشح.</p>"
-"<p>إذا نقرت هذا الزر عن غير قصد ، يمكنك التراجع  بالضغط على الزر <em>حذف</em>"
-".</p></qt>"
+"<qt><p>اضغط هذا الزر لنسخ مرشح.</p><p>إذا نقرت هذا الزر عن غير قصد ، يمكنك "
+"التراجع  بالضغط على الزر <em>حذف</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>أنقر على هذا الزر كي يتم <em>حذف</em> المرشح المحدد حالياً نم اللائحة في "
-"الأعلى.</p>"
-"<p>لا يمكن إسترجاع المرشح بعد حذفه ، و لكن يمكنك دائماً الخروج من الحوار عندما "
-"تنقر الزر <em>إلغاء</em> لإهمال التغييرات المحددة.</p></qt>"
+"<qt><p>أنقر على هذا الزر كي يتم <em>حذف</em> المرشح المحدد حالياً نم اللائحة "
+"في الأعلى.</p><p>لا يمكن إسترجاع المرشح بعد حذفه ، و لكن يمكنك دائماً الخروج "
+"من الحوار عندما تنقر الزر <em>إلغاء</em> لإهمال التغييرات المحددة.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأعلى</em> "
-"في اللائحة العليا.</p>"
-"<p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على الرائل. أي "
-"أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p>"
-"<p>إذا نقرت هذا الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>"
-"إلى ألأسفل</em>.</p></qt>"
+"<qt><p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأعلى</em> في اللائحة "
+"العليا.</p><p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على "
+"الرائل. أي أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p><p>إذا نقرت هذا "
+"الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>إلى ألأسفل</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأعلى</em> "
-"في اللائحة العليا.</p>"
-"<p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على الرائل. أي "
-"أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p>"
-"<p>إذا نقرت هذا الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>"
-"إلى ألأسفل</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأعلى</em> في اللائحة "
+"العليا.</p><p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على "
+"الرائل. أي أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p><p>إذا نقرت هذا "
+"الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>إلى ألأسفل</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأسفل</em> "
-"في اللائحة أعلاه.</p>"
-"<p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على الرائل. أي "
-"أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p>"
-"<p>إذا نقرت هذا الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>"
-"إلى ألأعلى</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأسفل</em> في اللائحة "
+"أعلاه.</p><p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على "
+"الرائل. أي أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p><p>إذا نقرت هذا "
+"الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>إلى ألأعلى</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأسفل</em> "
-"في اللائحة أعلاه.</p>"
-"<p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على الرائل. أي "
-"أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p>"
-"<p>إذا نقرت هذا الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>"
-"إلى ألأعلى</em>.</p></qt>"
+"<qt><p>أنقر هذا الزر لنقل المرشح المحدد حالياً إلى <em>ألأسفل</em> في اللائحة "
+"أعلاه.</p><p> و هذا مهم لأنّ ترتيب المرشحات هو اللذي يحدد ترتيب تطبيقها على "
+"الرائل. أي أنّ المرشح الأول في اللائحة هو اللذي يطبق أولاً.</p><p>إذا نقرت هذا "
+"الزر عن غير قصد ، يمكنك الأسترجاع عند نقر الزر <em>إلى ألأعلى</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>إضغط هذا الزر لإعادة تسمية المرشح المحدد الحالي.</p>"
-"<p>المرشحات سميت تلقائيا، ما دامت تبدأ بـ \"<<\".</p>"
-"<p>إذا أعدت تسمية مرشح عن طريق الخطأ وأردت تسمية تلقائية، إضغط هذا الزر وحدد "
-"<em>مسح</em> تتبع بواسطة <em>موافق</em> في الصندوق الظاهر.</p></qt>"
+"<qt><p>إضغط هذا الزر لإعادة تسمية المرشح المحدد الحالي.</p><p>المرشحات سميت "
+"تلقائيا، ما دامت تبدأ بـ \"<<\".</p><p>إذا أعدت تسمية مرشح عن طريق الخطأ "
+"وأردت تسمية تلقائية، إضغط هذا الزر وحدد <em>مسح</em> تتبع بواسطة <em>موافق</"
+"em> في الصندوق الظاهر.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>تحقق من هذا الزر لدعم صندوق المطابقة لإظهاره</p>"
-"<p>هذا مفيد إذا كنت قد عرفت قاعدة للرسائل المعلمة ليتم تحميلها فيما بعد. من دون "
-"الإمكانية لدعم الصندوق الظاهر، هذه الرسائل لا يمكن مطلقا أن تحمل إذا لم يكن "
-"هناك رسائل أخرى كبيرة تنتظر في الخادم، أو إذا أردت أن تغير القاعدة لتعليم "
-"الرسائل بشكل مختلف.</p></qt>"
+"<qt><p>تحقق من هذا الزر لدعم صندوق المطابقة لإظهاره</p><p>هذا مفيد إذا كنت "
+"قد عرفت قاعدة للرسائل المعلمة ليتم تحميلها فيما بعد. من دون الإمكانية لدعم "
+"الصندوق الظاهر، هذه الرسائل لا يمكن مطلقا أن تحمل إذا لم يكن هناك رسائل أخرى "
+"كبيرة تنتظر في الخادم، أو إذا أردت أن تغير القاعدة لتعليم الرسائل بشكل مختلف."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7266,6 +7098,16 @@ msgstr "قواعد مرشح POP3"
 msgid "Filter Rules"
 msgstr "قواعد المرشح"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "إست&يراد"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "إست&يراد"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "مرشحات متوفرة"
@@ -7346,6 +7188,11 @@ msgstr "ايضا إضافة هذا المرشّح إلى شريط الأدوات
 msgid "Icon for this filter:"
 msgstr "أيقونة هذا المرشّح:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "إلى"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "أعلى"
@@ -7354,16 +7201,29 @@ msgstr "أعلى"
 msgid "Down"
 msgstr "أسفل"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "اعادة تسمية..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "جديد"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "أ&نسخ إلى"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "محذوف"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7372,8 +7232,8 @@ msgstr "اختر اختصار للمجلًد"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "هناك على الأقل مرشح واحِد يستهدِف الحساب  IMAP الموصول. مرشحات مثل هؤلاء تطبق "
 "فقط يدويا أو عند جلب بريد الحساب IMAP  الموصول."
@@ -7383,8 +7243,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"المرشحات التالية لم تحفظ لأنها كانت معطوبة ( على سبيل المثال لا تحتوي على أعمال "
-"ولا على قواعد بحث)"
+"المرشحات التالية لم تحفظ لأنها كانت معطوبة ( على سبيل المثال لا تحتوي على "
+"أعمال ولا على قواعد بحث)"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7454,27 +7314,24 @@ msgstr "حلّ مشاكل قناع IMAP "
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>حل مشكلة IMAP الصرفة</b></p>"
-"<p>إذا كانت لديك مشكلة مع مزامنة مجلد IMAP،يجب عليك أولا محاولة إعادة بناء ملف "
-"الفهرس. هذا سوف يأخذ بعض الوقت لإعادة البناء، ولكنه لن يسبب أي مشاكل.</p>"
-"<p>إذا كان هذا غير كاف، تستطيع محاولة إعادة التحديث ذاكرة IMAP. إذا فعلت هذا، "
-"سوف تفقد جميع التغييرات المحلية لهذا المجلد وجميع مجلداته الفرعية.</p>"
+"<p><b>حل مشكلة IMAP الصرفة</b></p><p>إذا كانت لديك مشكلة مع مزامنة مجلد IMAP،"
+"يجب عليك أولا محاولة إعادة بناء ملف الفهرس. هذا سوف يأخذ بعض الوقت لإعادة "
+"البناء، ولكنه لن يسبب أي مشاكل.</p><p>إذا كان هذا غير كاف، تستطيع محاولة "
+"إعادة التحديث ذاكرة IMAP. إذا فعلت هذا، سوف تفقد جميع التغييرات المحلية لهذا "
+"المجلد وجميع مجلداته الفرعية.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7511,8 +7368,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7550,8 +7407,8 @@ msgstr "أعيد إنشاء الفهرس لهذا المجلد."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "المجلد %1 ليس في حالة تزامن (كانت الحالة %2). هل تريد الإعادة\n"
 "إلى حالة تزامن وتزامن بأي طريقة ؟"
@@ -7683,13 +7540,11 @@ msgstr "إنشاء مجلدات فرعية على الخادم"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>يبدو انّ المجلّد  <b>%1</b> قد تمّ حذفه. هل تريد حذفه من الخادِم ؟ </p></qt>"
+"<qt><p>يبدو انّ المجلّد  <b>%1</b> قد تمّ حذفه. هل تريد حذفه من الخادِم ؟ </p></"
+"qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7710,12 +7565,11 @@ msgstr "جاري سحب المجلدات لمجال الأسماء %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>يبدو انّ المجلّد  <b>%1</b> قد تمّ حذفه. هل تريد حذفه من الخادِم ؟ </p></qt>"
+"<qt><p>يبدو انّ المجلّد  <b>%1</b> قد تمّ حذفه. هل تريد حذفه من الخادِم ؟ </p></"
+"qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7723,20 +7577,20 @@ msgstr "تمً الاجهاض"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"لا يدعم الخادم IMAP  %1 امكانية التعليق التوضيحي. لا يمكن إستعمال التخزين XML "
-"على هذا الخادِم ، الرجاء إعادة تثبيت KMail بطريقة مختلفة."
+"لا يدعم الخادم IMAP  %1 امكانية التعليق التوضيحي. لا يمكن إستعمال التخزين "
+"XML على هذا الخادِم ، الرجاء إعادة تثبيت KMail بطريقة مختلفة."
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"لا يدعم الخادم IMAP  %1 امكانية التعليق التوضيحي. لا يمكن إستعمال التخزين XML "
-"على هذا الخادِم ، الرجاء إعادة تثبيت KMail بطريقة مختلفة."
+"لا يدعم الخادم IMAP  %1 امكانية التعليق التوضيحي. لا يمكن إستعمال التخزين "
+"XML على هذا الخادِم ، الرجاء إعادة تثبيت KMail بطريقة مختلفة."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7749,16 +7603,16 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>هناك رسائل جديدة في هذا الملف و لم يتم بعد رفعها إلى الخادِم ، و لكن لا يبدو "
-"انّ لديك الأذون الكافية لرفعها الآن  غلى الخادِم. الرجاء الإتصال بمديرك ليسمح "
-"لك برفع رسائلك الجديدة ، او أحذف هذه الرسائل من هذا المجلّد.</p> "
-"<p>هل تريد نقل هذه الرسائل غلى مجلّد آخر الان ؟</p>"
+"<p>هناك رسائل جديدة في هذا الملف و لم يتم بعد رفعها إلى الخادِم ، و لكن لا "
+"يبدو انّ لديك الأذون الكافية لرفعها الآن  غلى الخادِم. الرجاء الإتصال بمديرك "
+"ليسمح لك برفع رسائلك الجديدة ، او أحذف هذه الرسائل من هذا المجلّد.</p> <p>هل "
+"تريد نقل هذه الرسائل غلى مجلّد آخر الان ؟</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7767,19 +7621,24 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>هناك رسائل جديدة في هذا الملف و لم يتم بعد رفعها إلى الخادِم ، و لكن لا يبدو "
-"انّ لديك الأذون الكافية لرفعها الآن  غلى الخادِم. الرجاء الإتصال بمديرك ليسمح "
-"لك برفع رسائلك الجديدة ، او أحذف هذه الرسائل من هذا المجلّد.</p> "
-"<p>هل تريد نقل هذه الرسائل غلى مجلّد آخر الان ؟</p>"
+"<p>هناك رسائل جديدة في هذا الملف و لم يتم بعد رفعها إلى الخادِم ، و لكن لا "
+"يبدو انّ لديك الأذون الكافية لرفعها الآن  غلى الخادِم. الرجاء الإتصال بمديرك "
+"ليسمح لك برفع رسائلك الجديدة ، او أحذف هذه الرسائل من هذا المجلّد.</p> <p>هل "
+"تريد نقل هذه الرسائل غلى مجلّد آخر الان ؟</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "أنقل إلى:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "لا تنقل"
 
@@ -7791,8 +7650,7 @@ msgstr "نقل الرسائل إلى المجلد"
 msgid "Permissions (ACL)"
 msgstr "أذون ( ACL )"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "عام"
@@ -7817,8 +7675,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "استعمل &أيقونات مخصصة "
@@ -7837,21 +7694,19 @@ msgstr "طبِق غلى البريد الجديد/غير المقروء في ه�
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>إذا كان هذا الخيار محدد سيتم تبليغك عن أي بريد جديد/غير مقروء في هذا "
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>إذا كان هذا الخيار محدد سيتم تبليغك عن أي بريد جديد/غير مقروء في هذا "
 "المجلّد. كذالك ستقف عند هذا المجلّد عند القفز إلى المجلّد السابق/التالي اللذي "
-"يحتوي على بريد غير مقروء.</p>"
-"<p> ألغي هذا الخيار إذا كنت لا تريد هذا التبليغ. قد يساعدك ذالك على إهمال أي "
-"بريد  جديد/ غير مقروء في سلّة المهملات أو في مجلّد البريد غير المرغوب.</p></qt>"
+"يحتوي على بريد غير مقروء.</p><p> ألغي هذا الخيار إذا كنت لا تريد هذا "
+"التبليغ. قد يساعدك ذالك على إهمال أي بريد  جديد/ غير مقروء في سلّة المهملات "
+"أو في مجلّد البريد غير المرغوب.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7863,9 +7718,9 @@ msgstr "احفظ الأجوبة في هذا المجلد"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "حدد هذا الخيار إذا كنت تريد وضع أجوبة البريد في هذا المجلّد بدلآ عن المجلّد "
 "بريد مرسل."
@@ -7878,17 +7733,21 @@ msgstr "اعرض عامود المرسل/المستقبل في لائحة الر
 msgid "Sho&w column:"
 msgstr "أ&ظهر العمود:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "إجعله افتراضيا"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "المرسل"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "المراسل"
@@ -7899,16 +7758,16 @@ msgstr "&هوية المرسل:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "حدِد  هوية المرسِل المستعملة لإرسال بريد أو الإجابة على بريد في هذا المجلّد.ذلك "
-"يعني انك إذا كنت تعمل في أحد مجلّداتك سيستعمل KMail عنوان بريد المرسل و توقيعه "
-"أو مفاتيح تشفيره تلقائياً.يمكن تعريف الهويات في حوار الإعدادات الرئيسية ( "
-"إعدادات --> إعداد KMail )"
+"يعني انك إذا كنت تعمل في أحد مجلّداتك سيستعمل KMail عنوان بريد المرسل و "
+"توقيعه أو مفاتيح تشفيره تلقائياً.يمكن تعريف الهويات في حوار الإعدادات "
+"الرئيسية ( إعدادات --> إعداد KMail )"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7926,12 +7785,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7963,17 +7822,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -8044,7 +7903,8 @@ msgstr "خطأ عند جلب معلومات المجلّد."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "فهرس البريد ل'%1' هو من إصدارة غير معروفة من برنامج KMail (%2).\n"
 "هذا الفهرس يمكن إعادة توليده من مجلد بريدك، ولكن بعض المعلومات، تتضمن علامات "
@@ -8074,8 +7934,8 @@ msgstr "خطأ فتح %1 ، هذا المجلّد غير موجود."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "خطأ عند فتح %1 إما هذا ليس مجلد دليل بريد صالح أو ليس لديك أذون الوصول."
 
@@ -8117,20 +7977,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>مجلد الفهرس '%2' يبدو على أنه منتهي الصلاحية. لتفادي مقاطعة الرسالة سوف تتم "
-"إعادة إنشاء الفهرس. وكنتيجة الرسائل المحذوفة ممكن تعاود الظهور وأعلام الحالة "
-"ربما تضيع.</p>"
-"<p>الرجاء قراءة المدخلة المقابلة في <a href=\"%1\">قسم FAQ في الدليل للبرنامج "
-"KMail</a> لمزيد من المعلومات عن كيفية حل هذه المشكلة من البداية مجددا.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>مجلد الفهرس '%2' يبدو على أنه منتهي الصلاحية. لتفادي مقاطعة الرسالة "
+"سوف تتم إعادة إنشاء الفهرس. وكنتيجة الرسائل المحذوفة ممكن تعاود الظهور "
+"وأعلام الحالة ربما تضيع.</p><p>الرجاء قراءة المدخلة المقابلة في <a href="
+"\"%1\">قسم FAQ في الدليل للبرنامج KMail</a> لمزيد من المعلومات عن كيفية حل "
+"هذه المشكلة من البداية مجددا.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8191,7 +8048,7 @@ msgstr ""
 "'%1' لم تظهر لتصبح مجلد.\n"
 "الرجاء نقل الملف بعيدا."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8199,7 +8056,7 @@ msgstr ""
 "الأذون للمجلد %1 غير صحيحة.\n"
 "الرجاء التأكد من انك تستطيع عرض وتعديل محتويات هذا المجلد."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8209,8 +8066,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8218,7 +8075,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "فشل في إنشاء مجلد "
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8319,9 +8176,9 @@ msgstr "&يحل مشكلة الذاكرة المخبئة IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>لست قادر على إنشاء مجلّد <b>%1</b> لسبب عدم توفر الأذون على الخادِم. إذا "
 "كنت تظن أن بإمكانك إنشاء مجلّدات فرعية هنا ، إطلب من المدير ان يعطيك الأذون "
@@ -8468,17 +8325,17 @@ msgstr "المجلّد %1 صالح للقراءة فقط."
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>هل تريد فعلا محو الرسالة المحددة ؟"
-"<br>لن تستطيع إسترجاع الرسالة بعد حذفها.</qt>\n"
-"<qt>هل تريد فعلا محو الرسالتين المحددتين ؟"
-"<br>لن تستطيع إسترجاع الرسالتين بعد حذفها.</qt>\n"
-"<qt>هل تريد فعلا محو الرسائل ال- %n المحدّدة ؟"
-"<br>لن تستطيع إسترجاعها بعد حذفها.</qt>"
+"<qt>هل تريد فعلا محو الرسالة المحددة ؟<br>لن تستطيع إسترجاع الرسالة بعد "
+"حذفها.</qt>\n"
+"<qt>هل تريد فعلا محو الرسالتين المحددتين ؟<br>لن تستطيع إسترجاع الرسالتين "
+"بعد حذفها.</qt>\n"
+"<qt>هل تريد فعلا محو الرسائل ال- %n المحدّدة ؟<br>لن تستطيع إسترجاعها بعد "
+"حذفها.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8530,136 +8387,133 @@ msgstr ""
 "فشل تعديل %1\n"
 "( لا يوجد حجم كافِ على الجهاز؟ )"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "الترخيص التوقيع الطلب"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "الرجاء إنشاء سند من الملحق و الرجوع للمرسِل."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
-"اِنّ حالة KMail معيّنة انّ تكون منقطعة الأتصال بلشبكة، كُلّ أعمال الشبكة "
-"متوقِفة"
+"اِنّ حالة KMail معيّنة انّ تكون منقطعة الأتصال بلشبكة، كُلّ أعمال الشبكة متوقِفة"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
-"اِنّ حالة KMail معيّنة انّ تكون على الأتصال بلشبكة، متابعة تنفيذ كُلّ أعمال "
-"الشبكة "
+"اِنّ حالة KMail معيّنة انّ تكون على الأتصال بلشبكة، متابعة تنفيذ كُلّ أعمال الشبكة "
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "إن KMail في حالة إنقطاع الإتصال حالياً. كيف تريد أن تتابع ؟"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "إعمل على الخط"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "إعمل بدون إتصال"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "ليس لديك أذون القراءة/الكتابة لمجلد بريدك الوارِد."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "الصادر"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "ليس لديك أذون القراءة/الكتابة لمجلد بريدك الصادِرد."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "بريد مرسل"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "ليس لديك أذون القراءة/الكتابة لمجلد بريدك المرسلد."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "سلة المهملات"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "ليس لديك أذون القراءة/الكتابة لمجلد سلّتك لِلمهملات"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "مسودات"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "ليس لديك أذون القرأة/الكتابة لمجلد مسوداتك."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&استبدال"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "ليس لديك أذون القراءة/الكتابة لمجلد سلّتك لِلمهملات"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "آخر بحث"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>المجلّد <i>%4</i> موجود سابقاً. %1 يستعمل الآن المجلّد <i>%5</i> لرسائله."
 "<p>يمكن لِـ %2 ان ينقل محتويات <i>%6<i> غلى هذا المجلّد عنك رغم ان ذلك سيستبدل "
-"ﻷي ملفات موجودة بنفس الإسم في <i>%7</i>."
-"<p><strong>هل تريد %3 ان ينقل ملفات البريد الآن ؟</strong></qt>"
+"ﻷي ملفات موجودة بنفس الإسم في <i>%7</i>.<p><strong>هل تريد %3 ان ينقل ملفات "
+"البريد الآن ؟</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt> المجلّد <i>%4</i> موجود سابقاً. يستعمل %1 الآن المجلّد <i>%5</i> "
-"لرسائله.  يمكن لِـ %2 ان ينقل محتوى <i>%6</i> إلى هذا المجلد بدلآ عنك."
-"<p><strong>هل تريد %3 ان ينقل ملفات البريد الآن ؟</strong></qt>"
+"<qt> المجلّد <i>%4</i> موجود سابقاً. يستعمل %1 الآن المجلّد <i>%5</i> لرسائله.  "
+"يمكن لِـ %2 ان ينقل محتوى <i>%6</i> إلى هذا المجلد بدلآ عنك.<p><strong>هل "
+"تريد %3 ان ينقل ملفات البريد الآن ؟</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "تهجير ملفات البريد ؟"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "إلتقى KMail خطأ مصيري و سينتهي تنفيذه الآن"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8670,11 +8524,11 @@ msgstr ""
 "The error was:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "افراغ سلة المهملات"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "هل أنت متأكد من أنك تريد إفراغ مجلد المحذوفات لكل الحسابات ؟"
 
@@ -8752,8 +8606,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>وصل بريد جديد</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8791,11 +8644,11 @@ msgstr "هل أنت متأكد من أنك تريد إفراغ مجلد المه
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>هل أنت متأكد من أنك تريد نقل كل الرسائل من المجلد <b>%1</b> "
-"إلى سلة المهملات ؟</qt>"
+"<qt>هل أنت متأكد من أنك تريد نقل كل الرسائل من المجلد <b>%1</b> إلى سلة "
+"المهملات ؟</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8819,11 +8672,11 @@ msgstr "محو البحث>"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>هل انت متأكد انًك تريد محو البحث <b>%1</b> ؟"
-"<br>اي رسائل يريك اياها ستكون موجودة في ملفها الأصلي.</qt>"
+"<qt>هل انت متأكد انًك تريد محو البحث <b>%1</b> ؟<br>اي رسائل يريك اياها ستكون "
+"موجودة في ملفها الأصلي.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8835,37 +8688,39 @@ msgstr "<qt>هل أنت متأكد من أنك تريد حذف المجلد ال
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>هل أنت متأكد من أنك تريد حذف المجلد الفارغ <b>%1</b> "
-"وكل مجلداتها الفرعية ؟ هذه المجلدات الفرعية ممكن أن لا تكون فارغة ومحتوياتها و "
-"سيتم حذف محتوياتها أيضاً. "
-"<p><b>إنتبه </b> لن يتم حفظ رسائلك المحذوفة في سلة المهملات أي ستكون محذوفة "
-"بشكل دا~م و لن تستطيع إسترجاعها.</qt>"
+"<qt>هل أنت متأكد من أنك تريد حذف المجلد الفارغ <b>%1</b> وكل مجلداتها "
+"الفرعية ؟ هذه المجلدات الفرعية ممكن أن لا تكون فارغة ومحتوياتها و سيتم حذف "
+"محتوياتها أيضاً. <p><b>إنتبه </b> لن يتم حفظ رسائلك المحذوفة في سلة المهملات "
+"أي ستكون محذوفة بشكل دا~م و لن تستطيع إسترجاعها.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>هل أنت متأكد من أنك تريد حذف المجلد<b>%1</b>, مهملا محتوياته ؟</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>هل أنت متأكد أنك تريد محو المجلّد <b>%1</b> و كلّ مجلّداته الفرعية ، ماحياً "
 "كلّ محتوياتها ؟</qt>"
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "محذوف"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8880,9 +8735,9 @@ msgstr "هل أنت متأكد من أنك تريد إنهاء اجل كل ال�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "استخدام من HTML في البريد يجعلك أكثر عرضة للهجوم من \" لا فائدة منه\" وربما "
 "يزيد الإحتمالية بأن نظامك سوف يسوى بواسطة نظام آمن آخر."
@@ -8898,8 +8753,8 @@ msgstr "إستخدِم HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "السماح بتحميل مراجع خارجية في البريد html سيجعلك أكثر تعرضاً  \"للبريد غير "
 "المرغوب\" كما يزيد إحتمال تعرض نظامك لمحاولات حالية أو مستقبلية للعبث بألأمن."
@@ -8918,8 +8773,8 @@ msgstr "تطبيق المرشح على لائحة الإرسال %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr "ن."
 
@@ -8936,7 +8791,8 @@ msgstr "لا يمكن بدء مسيّر الشهادات. الرجاء التأ�
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "لا يمكن بدء تشغيل عارض سجل الوقائع GnuPG ( kwatchgnupg ) ، الرجاء التأكد من "
 "تثبيت النظام."
@@ -9274,8 +9130,7 @@ msgstr "إحفظ ال&ملحقات..."
 msgid "Appl&y All Filters"
 msgstr "طب&ق كل المرشحات"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "ط&بق المرشح"
@@ -9389,7 +9244,6 @@ msgstr "الرسالة التالية &غير المقروءة"
 msgid "Go to the next unread message"
 msgstr "إذهب إلى الرسالة التالية غير المقروءة"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "الرسالة ال&سابقة"
@@ -9532,8 +9386,8 @@ msgstr "جاري الابتداء..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9542,20 +9396,21 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "تحتوي هذه الرسالة على طلب تبليغ عى إستلامك للرسالة.\n"
-"و هي تحتوي على تعليمة إجراء معلّمة \"كمطلوبة\"، و لكن غير معروفة من قبل KMail.\n"
+"و هي تحتوي على تعليمة إجراء معلّمة \"كمطلوبة\"، و لكن غير معروفة من قبل "
+"KMail.\n"
 "يمكنك تجاهل هذا الطلب أو جعل KMail يرسل الجواب \"فشلتُ\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9566,8 +9421,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9578,8 +9433,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9613,17 +9468,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "الإستلام:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "الملحق: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "أظهر الملحقات كما هو مقترح من المرسل."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9673,33 +9528,29 @@ msgstr "خصائص جزء الرسالة "
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>حجم الجزء:</p>"
-"<p>أحياناً ،  سيعطي %1 فقط حجم مقرّب هنا ، لأن عملية حساب الحجم الصحيح قد تستمر "
-"وقتاً طويلاً ، و عندها سترى  كلمة \"(تقريباً)\" بجانب الحجم المعروض.</p></qt>"
+"<qt><p>حجم الجزء:</p><p>أحياناً ،  سيعطي %1 فقط حجم مقرّب هنا ، لأن عملية حساب "
+"الحجم الصحيح قد تستمر وقتاً طويلاً ، و عندها سترى  كلمة \"(تقريباً)\" بجانب "
+"الحجم المعروض.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9708,17 +9559,14 @@ msgstr "ال&وصف:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>وصف الجزء</p>"
-"<p>هذه فقط معلومات وصف الجزء، كثيرا مثل الموضوع هو لكل الرسالة. أغلب وكلاء "
-"البريد سوف يظهرون هذه المعلومات في استعراض الرسائل خاصتهم،رموز الملحقات على "
-"الجانب الطويل.</p></qt>"
+"<qt><p>وصف الجزء</p><p>هذه فقط معلومات وصف الجزء، كثيرا مثل الموضوع هو لكل "
+"الرسالة. أغلب وكلاء البريد سوف يظهرون هذه المعلومات في استعراض الرسائل "
+"خاصتهم،رموز الملحقات على الجانب الطويل.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9726,14 +9574,13 @@ msgstr "&الترميز:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9742,13 +9589,11 @@ msgstr "إقترح العرض &تلقائي"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9757,14 +9602,12 @@ msgstr "&وقع هذا الجزء"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>حدد هذا الخيار إذا كنت تريد توقيع هذا الجزء من الرسالة ،</p>"
-"<p>سيتم التوقيع بلمفتاح المقترن بلهوية المحددة حالياً.</p></qt>"
+"<qt><p>حدد هذا الخيار إذا كنت تريد توقيع هذا الجزء من الرسالة ،</p><p>سيتم "
+"التوقيع بلمفتاح المقترن بلهوية المحددة حالياً.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9772,13 +9615,11 @@ msgstr "&شفّر هذا الجزء "
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>حدد هذا الخيار إذا كنت تريد هذا الجزء من الرسالة أن يشفر.</p>"
-"<p>الجزء سوف يكون مشفرا للمستلمين لهذ الرسالة</p></qt>"
+"<qt><p>حدد هذا الخيار إذا كنت تريد هذا الجزء من الرسالة أن يشفر.</p><p>الجزء "
+"سوف يكون مشفرا للمستلمين لهذ الرسالة</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9792,15 +9633,13 @@ msgstr "مرشح ميفاق مكتب البريد"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"رسائل الترشيح وجد في حساب POP: <b>%1</b>"
-"<p>الرسائل التي أظهرت أكبر حجم محدود يجب أ، تعيد إنشاء الحساب."
-"<br>أنت تستطيع أن تحدد ماذا تريد لتفعل معهم عن الطريق التحقق من الزر المناسب."
+"رسائل الترشيح وجد في حساب POP: <b>%1</b><p>الرسائل التي أظهرت أكبر حجم محدود "
+"يجب أ، تعيد إنشاء الحساب.<br>أنت تستطيع أن تحدد ماذا تريد لتفعل معهم عن "
+"الطريق التحقق من الزر المناسب."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10052,40 +9891,39 @@ msgstr "زبون البريد لمحيط سطح المكتب  K Desktop"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>سحب محتويات المجلد </h2> "
-"<p>الرجاء الانتظار...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>سحب محتويات المجلد </h2> <p>الرجاء الانتظار...</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>مقطوع الاتصال</h2> "
-"<p>يعمل  KMailحاليا في نمط الاتصال المقطوع. أنقر <a href=\"kmail:goOnline\"> "
-"هنا </a> لاعادة الاتصال....</p>&nbsp; "
+"<h2 style='margin-top: 0px;'>مقطوع الاتصال</h2> <p>يعمل  KMailحاليا في نمط "
+"الاتصال المقطوع. أنقر <a href=\"kmail:goOnline\"> هنا </a> لاعادة الاتصال...."
+"</p>&nbsp; "
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10093,18 +9931,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>مرحبا بك على KMail %1</h2>"
-"<p>KMail هو زبون البريد لمحيط سطح المكتب K Desktop Environment. و هو مصمم كي "
-"يكون مطابقا مع معايير البريد على الانترنت بما فيها MIME, SMTP, POP3 و IMAP.</p>"
-"\n"
-"<ul>"
-"<li>لدى KMail مواصفات عديدة و قوية  يمكنك قراءة وصفها في وثائق <a href=\"%2\">"
-"</a></li>\n"
+"<h2 style='margin-top: 0px;'>مرحبا بك على KMail %1</h2><p>KMail هو زبون "
+"البريد لمحيط سطح المكتب K Desktop Environment. و هو مصمم كي يكون مطابقا مع "
+"معايير البريد على الانترنت بما فيها MIME, SMTP, POP3 و IMAP.</p>\n"
+"<ul><li>لدى KMail مواصفات عديدة و قوية  يمكنك قراءة وصفها في وثائق <a href="
+"\"%2\"></a></li>\n"
 "<li> انً <a href=\"%3\">صفحة موقع KMail </A> تخبرك عن الاصدارات الجديدة ل "
 "KMail</li></ul>\n"
 "%8\n"
-"<p>تحتوي هذه الاصدارة الجديدة من KMail ( مقارنتا ب KMail %4, و هو  جزء من TDE "
-"%5):</p>\n"
+"<p>تحتوي هذه الاصدارة الجديدة من KMail ( مقارنتا ب KMail %4, و هو  جزء من "
+"TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10113,20 +9949,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; طاقم KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>الرجاء أخذ لحظة للتعبئة ضمن لوحة الإعدادات في KMail ضمن إعدادات &gt; إعداد "
-"KMail.\n"
+"<p>الرجاء أخذ لحظة للتعبئة ضمن لوحة الإعدادات في KMail ضمن إعدادات &gt; "
+"إعداد KMail.\n"
 "أنت يجب أن تنشيء على الأقل هوية افتراضية وحساب بريد وارد كما هو البريد "
 "الصادر.</p>\n"
 
@@ -10167,7 +10001,8 @@ msgstr "عرض المرفق: %1"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: الوثيقة المرفقة تحتوي على بيانات ثنائية النوع. سئوحاول درج الاحرف%n  "
@@ -10195,12 +10030,14 @@ msgstr "إفتح المرفق ؟"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10222,6 +10059,58 @@ msgstr "( موائمة أي من التالي )"
 msgid "(match all of the following)"
 msgstr "( موائمة كلً من التالي )"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "قرء"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "قديم"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "محذوف"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "تم الرد عليه"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "حوّلت الى"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "وضِعَ في صفّ الانتظار"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "أُرسل"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "مراقب"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "تم التجاهل"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "بريد غير مرغوب"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "واجِب"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "لديه ملحق"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10306,20 +10195,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"فشل نقل الرسالة \"%1\" من مجلد \"صندوق الصادر\" إلىمجلد \"الرسائل المرسلة\" .\n"
-"الأسباب الممكنة ربما هي نقص حجم القرص أو أذن الكتابة. الرجاء حاول إصلاح المشكلة "
-"وأنقل الرسالة يدويا."
+"فشل نقل الرسالة \"%1\" من مجلد \"صندوق الصادر\" إلىمجلد \"الرسائل المرسلة"
+"\" .\n"
+"الأسباب الممكنة ربما هي نقص حجم القرص أو أذن الكتابة. الرجاء حاول إصلاح "
+"المشكلة وأنقل الرسالة يدويا."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "لا يمكن إرسال رسائل دون تحديد عنوان المرسل. \n"
 " فضلاً اضبط عنوان البريد الإلكتروني للهويّة '%1' في قسم الهويّة من مربّع حوار "
@@ -10350,8 +10240,8 @@ msgstr "بدء اجراء الارسال..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "لقد إخترت إرسال كلً الرسائل مستخدماً الإرسال غير المشفًر ، هل تريد المتابعة ؟"
 
@@ -10377,8 +10267,9 @@ msgstr "فشل في إرسال ( بعض ) رسائل المصفوفة في صف
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10395,20 +10286,15 @@ msgstr "تم إلغاء الإرسال."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>فشل الإرسال:</p>"
-"<p>%1</p>"
-"<p>الرسالة سوف تبقى في مجلد صندوق الصادر حتى إذا أنت أصلحت الخطأ أو حذف الرسالة "
-"من مجلد الصندوق الصادر.</p>"
-"<p>استخدمة ميفاق النقل التالية :  %2</p>"
-"<p>هل تريد مني أن أكمل إرسال الرسائل المتبقية؟</p>"
+"<p>فشل الإرسال:</p><p>%1</p><p>الرسالة سوف تبقى في مجلد صندوق الصادر حتى إذا "
+"أنت أصلحت الخطأ أو حذف الرسالة من مجلد الصندوق الصادر.</p><p>استخدمة ميفاق "
+"النقل التالية :  %2</p><p>هل تريد مني أن أكمل إرسال الرسائل المتبقية؟</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10426,8 +10312,9 @@ msgstr "&إلغاء الإرسال"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10473,36 +10360,36 @@ msgstr "أنت تحتاج إلى إسم مستخدم وكلمة مرور لاس�
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"يبدو انً %1 يجري تنفيذه حاليا على شاشة أخرى على هذا الحاسوب. تنفيذ البرنامج %2 "
-"اكثر من مرة واحدة قد يتسبب بضياع البريد. ليس عليك بدء تشغيل %1 حتى تتاكًد من "
-"انه غير جاري تنفيذه سابقا."
+"يبدو انً %1 يجري تنفيذه حاليا على شاشة أخرى على هذا الحاسوب. تنفيذ البرنامج "
+"%2 اكثر من مرة واحدة قد يتسبب بضياع البريد. ليس عليك بدء تشغيل %1 حتى تتاكًد "
+"من انه غير جاري تنفيذه سابقا."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"يبدو انً %1 يجري تنفيذه حاليا على شاشة أخرى على هذا الحاسوب. تنفيذ البرنامج %1 "
-"و %2 اكثر من مرة واحدة قد يتسبب بضياع البريد. ليس عليك بدء تشغيل %2 حتى تتاكًد "
-"من ان %1 غير جاري تنفيذه الآن."
+"يبدو انً %1 يجري تنفيذه حاليا على شاشة أخرى على هذا الحاسوب. تنفيذ البرنامج "
+"%1 و %2 اكثر من مرة واحدة قد يتسبب بضياع البريد. ليس عليك بدء تشغيل %2 حتى "
+"تتاكًد من ان %1 غير جاري تنفيذه الآن."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "يبدو أنّ %1 هو قيد التنفيذ على %3. إن تنفيذ %1 و %2 في نفس الوقت قد يسبب ضياع "
 "البريد. ليس عليك القيام ببدء تشغيل %2 على هذا الحاسوب إلا إذا كنت متأكداً أنّ "
@@ -10517,6 +10404,10 @@ msgstr "ابدأ %1"
 msgid "Exit"
 msgstr "إنهاء"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "رسائل جديدة في"
@@ -10545,8 +10436,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -10625,11 +10517,11 @@ msgstr "&يحتاج الخادم إلى التوثيق"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"تحقق من هذا الخيار إذا كان الخادم SMTP يتطلب توثيقا قبل قبول البريد. هذا معروف "
-"ك 'توثيق SMTP' أو ببساطة ASMTP."
+"تحقق من هذا الخيار إذا كان الخادم SMTP يتطلب توثيقا قبل قبول البريد. هذا "
+"معروف ك 'توثيق SMTP' أو ببساطة ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10649,15 +10541,13 @@ msgstr "أ&رسل إسم المضيف  المعتاد إلى الخادم"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"تحقق من هذا الخيار لجعل برنامج KMail يستخدم إسم مضيف مخصص عندما يعرّف نفسه على "
-"خادم البريد."
-"<p> هذا مفيد عندما لا يتم ضبط إسم المضيف لنظامك بشكل صحيح أو لقناع إسم المضيف "
-"الحقيقي لنظامك."
+"تحقق من هذا الخيار لجعل برنامج KMail يستخدم إسم مضيف مخصص عندما يعرّف نفسه "
+"على خادم البريد.<p> هذا مفيد عندما لا يتم ضبط إسم المضيف لنظامك بشكل صحيح أو "
+"لقناع إسم المضيف الحقيقي لنظامك."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10687,8 +10577,8 @@ msgstr "مسموح فقط الملفات المحليّة."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "غير ممكن ان يكون حقل الخادم فارغا. الرجاء ادخال الاسم أو العنوان IP  للخادم "
 "SMTP."
@@ -10703,10 +10593,10 @@ msgstr "خطأ عند عرض مجلد %1"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10928,33 +10818,26 @@ msgstr "&حرر الرسالة"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>المعلومات المبنية أعيدت بواسطة آلة التشفير فالمحتويات لا يمكن معالجتها بشكل "
-"صحيح، يحتمل أن تكون المحتويات قد تضررت.</p>"
-"<p>الرجاء الاتصال بمسؤول النظام لديك.</p></qt>"
+"<qt><p>المعلومات المبنية أعيدت بواسطة آلة التشفير فالمحتويات لا يمكن "
+"معالجتها بشكل صحيح، يحتمل أن تكون المحتويات قد تضررت.</p><p>الرجاء الاتصال "
+"بمسؤول النظام لديك.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>لم يتم إيجاد أي إضافة تشفير نشطة ولم يعمل فتح PGP بشكل صحيح</p>"
-"<p>تستطيع أن تعمل شيئين لتغيير هذه: </p>"
-"<ul>"
-"<li><em>إمّا</em>أن تنشط الإضافة باستخدام إعدادات-> إعدادKMail -< مربع "
-"الإضافة</li>"
-"<li><em>أو</em> حدد العلامة فتحPGP وإعداداتها في نفس المربع السابق.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>لم يتم إيجاد أي إضافة تشفير نشطة ولم يعمل فتح PGP بشكل صحيح</p><p>تستطيع "
+"أن تعمل شيئين لتغيير هذه: </p><ul><li><em>إمّا</em>أن تنشط الإضافة باستخدام "
+"إعدادات-> إعدادKMail -< مربع الإضافة</li><li><em>أو</em> حدد العلامة فتحPGP "
+"وإعداداتها في نفس المربع السابق.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10966,8 +10849,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "الطرف الخلفي لِـ Chiasmus لا يوفِر وظيفة \"x-encrypt\". الرجاء التقرير عن هذا "
 "العطل."
@@ -10985,14 +10868,14 @@ msgstr "خطأ التشفير  Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -11101,8 +10984,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "إنّ فحص تفضيلات التشفير للمراسل يتطلب مسائلتك عن ما إذا كنت تريد تشفير هذه "
@@ -11130,9 +11013,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"<qt>"
-"<p>هناك تفضيلات تشفير متضاربة لهؤلاء المراسلين.</p>"
-"<p>هل يجب تشفير هذه الرسالة؟</p></qt>"
+"<qt><p>هناك تفضيلات تشفير متضاربة لهؤلاء المراسلين.</p><p>هل يجب تشفير هذه "
+"الرسالة؟</p></qt>"
 
 #: messagecomposer.cpp:909
 msgid "Do &Not Encrypt"
@@ -11140,8 +11022,9 @@ msgstr "&لا تشفير"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "لقد طلبت تشفير هذه الرسالة و كذلك تشفير نسخة لنفسك ، و لكن لم يتم إعداد أي "
 "مفاتيح تشفير موثوق بها لهذه الهوية."
@@ -11153,13 +11036,13 @@ msgstr "أرسل غير مشفّرة ؟"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "لن يتم تشفير بعض الأجزاء من هذه الرسالة.\n"
-"أنّ إرسال رسائل مشفرة جزئياً قد يخالف سياسة الموقع و / أو يتسبب بتسرب المعلومات "
-"الحساسة.\n"
+"أنّ إرسال رسائل مشفرة جزئياً قد يخالف سياسة الموقع و / أو يتسبب بتسرب "
+"المعلومات الحساسة.\n"
 "تشفير كلّ الأجزاء بدلاً عن ذلك ؟"
 
 #: messagecomposer.cpp:950
@@ -11182,50 +11065,44 @@ msgstr "&شفّر كل الأجزاء"
 msgid "Unencrypted Message Warning"
 msgstr "تحذير رسالة غير مشفرة"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>خطأ: الإضافات للتشفير  لم تنتج أي بيانات مشفرة. </p>"
-"<p>الرجاء إرسال تقرير بهذا الخطأ:"
-"<br>%2</p></qt>"
+"<qt><p>خطأ: الإضافات للتشفير  لم تنتج أي بيانات مشفرة. </p><p>الرجاء إرسال "
+"تقرير بهذا الخطأ:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>ليست كل الأحرف مناسبة للترميز المختار."
-"<br>"
-"<br>أرسل الرسالة رغماً عن ذلك ؟</qt>"
+"<qt>ليست كل الأحرف مناسبة للترميز المختار.<br><br>أرسل الرسالة رغماً عن ذلك ؟"
+"</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "قد تفقد بعض الأحرف"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "غيّر الترميز"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "إستحالة توقيع هذه الرسالة، حيث يبدو أنّ الطرف الخلفي المختار لا يدعم توقيع "
 "الرسائل، مع أن ذلك ليس من المتوقع ان يحدث فعلاً ، الرجاء التقرير عن هذا الخطأ."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11233,33 +11110,34 @@ msgstr ""
 "إستحالة توقيع هذه الرسالة، حيث يبدو أنّ الطرف الخلفي المختار لا يدعم توقيع "
 "الرسائل، مع أن ذلك ليس من المتوقع ان يحدث فعلاً ، الرجاء التقرير عن هذا الخطأ."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "إستحالة تشفير هذه الرسالة، حيث يبدو أنّ الطرف الخلفي المختار لا يدعم التشفير، "
 "مع أن ذلك ليس من المتوقع ان يحدث فعلاً ، الرجاء التقرير عن هذا الخطأ."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -11281,10 +11159,10 @@ msgstr "هيئة &صندوق البريد ( Mailbox ):"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11294,12 +11172,12 @@ msgstr "المجلد يحتو&ي على:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"حدد إذا ما كنت تريد إستعمال المجلّد الجديد لحفظ البريد أو لحفظ عناصر البرمجيات "
-"الجماعية كلمهمات أو الملاحظات. إفتراضياً سيحتوي المجلد الجديد فقظ البريد. إذا "
-"لم تكن متأكد أترك هذا الخيار كما هو."
+"حدد إذا ما كنت تريد إستعمال المجلّد الجديد لحفظ البريد أو لحفظ عناصر "
+"البرمجيات الجماعية كلمهمات أو الملاحظات. إفتراضياً سيحتوي المجلد الجديد فقظ "
+"البريد. إذا لم تكن متأكد أترك هذا الخيار كما هو."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11337,8 +11215,7 @@ msgstr "نتائج مختلفة للتواقيع"
 msgid "The crypto engine returned no cleartext data."
 msgstr "محرك التشفير لم ينتِج بيانات نص واضح."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "الحالة: "
 
@@ -11367,8 +11244,8 @@ msgstr "ليست هناك %1 إضافات وجدت."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "الرسالة موقعة، لكن صلاحية التوقيع لا يمكن التحقق منها. <br />السبب: %1"
 
 #: objecttreeparser.cpp:737
@@ -11405,26 +11282,26 @@ msgstr "بريمج إضافة التشفير \"%1\" لا يستطيع فكّ ت�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>إنتبِه:</b> الرسالة HTML هذه قد تحتوي على مراجع خارجية للصور أو غيرها. "
-"لأسباب أمنية و لحماية الحياة الخاصة لن يجري تحميل المراجع الخارجية. إذا كنت تثق "
-"بمرسل هذه الرسالة ببإمكانك تحميل المراجع الخارجية لهذه الرسالة <a "
-"href=\"kmail:loadExternal\">عند النقر هنا</a>."
+"لأسباب أمنية و لحماية الحياة الخاصة لن يجري تحميل المراجع الخارجية. إذا كنت "
+"تثق بمرسل هذه الرسالة ببإمكانك تحميل المراجع الخارجية لهذه الرسالة <a href="
+"\"kmail:loadExternal\">عند النقر هنا</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>إنتبه:</b> هذه الرسالة هي من النوع HTML. لأسباب أمنية، يجري الآن عرض الرموز "
-"HTML الخام. إذا كنت تثق بمرسِل هذه الرسالة فبإمكانك تفعيل العرض HTML المنسق "
-"لهذه الرالة <a href=\"kmail:showHTML\">عند النقر هنا</a>."
+"<b>إنتبه:</b> هذه الرسالة هي من النوع HTML. لأسباب أمنية، يجري الآن عرض "
+"الرموز HTML الخام. إذا كنت تثق بمرسِل هذه الرسالة فبإمكانك تفعيل العرض HTML "
+"المنسق لهذه الرالة <a href=\"kmail:showHTML\">عند النقر هنا</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11688,8 +11565,8 @@ msgstr "المُخَزّن: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "لم يتم تخزين عنوان بريد في %1 المستخدمة للتوقيع، لذلك لا نستطيع مقارنتها "
 "بعناوين بريد المرسل %2."
@@ -11808,13 +11685,14 @@ msgstr "رسالة الخطأ Kioslave"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"إن مخدمك POP3 لا يدعم أمر UIDL. هذا الأمر مطلوب لتحديد الطرق، أيا من البريد على "
-"الخادم KMail تمت مشاهدته من قبل.\n"
+"إن مخدمك POP3 لا يدعم أمر UIDL. هذا الأمر مطلوب لتحديد الطرق، أيا من البريد "
+"على الخادم KMail تمت مشاهدته من قبل.\n"
 "الخيار لترك البريد على الخادم سيجعله لا يعمل بشكل صحيح."
 
 #: popaccount.cpp:752
@@ -11839,7 +11717,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr "جلب رسالة %1 من %2  (%3 من %4 KB) ل- %5@%6 (%7 باقون عند الخادم )"
 
 #: popaccount.cpp:912
@@ -11856,1787 +11735,14 @@ msgstr "رد غير صحيح من الخادم"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "الخادم الخاص بك لا يدعم الأمر TOP. لذلك ليس من المستحيل جلب الترويسات للبريد "
 "الإلكتروني الكبير أولا، قبل تحميلها."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "إ&ذهب"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "ال&مجلد"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&رسالة"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "ردً خاص"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&حوّل"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "شريط أدوات HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "توقَيع"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "وقّع الرسائل &تلقائيا"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"عند تمكين هذا الخيار ، سيتم توقيع كل الرسائل اللتي ترسلها إفتراضياً ، طبعاً لا "
-"يزال ممكن تعطيل التوقيع لكل رسالة بشكل خاص."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "تشفير"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "أظهر النص ال&مشفر/الموقع بعد التحرير"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "تخزين &مشفر للرسائل المرسلة"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "أنقر لتخزن تشفير الرسالة"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>خزن الرسائل المشفرة</h1>\n"
-"عندما يكون هذا الصندوق مفعل، أرسل الرسائل المشفرة المخزنة كما لو أنها أرسلت. "
-"هذا ليس مستحسن، كما أنك لن تكون قادرا على قراءة الرسالة بعد ذلك إذا انتهت رسالة "
-"ضرورية.\n"
-"<p>\n"
-"مع ذلك، هناك ربما قواعد محلية تتطلب منك تشغيل هذا الخيار. عندما تقع في الشك، "
-"تحقق مع مدير النظام المحلي لديك.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "أعرض دائماً مفاتيح التشفير &للموافقة"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "شفّر الرسائل تلقائيا &عند الإمكان"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"عند تمكين هذا الخيار ، سيتم تشفير كل رسالة ترسلها حسب الإمكان و الطلب، طبعاً لا "
-"يزال بإمكانك تعطيل التشفير التلقائي لكل رسالة لوحدها."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "عدم توقيع/تشفير عند ال&حفظ كمسودة"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "إلى:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "مرفق:"
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "عام"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&ردً إلى"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "رُدً إلى &الكل..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&حوّل"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "اختصار :"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&استبدال"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "خصائص المجلد"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "المجلد يحتوي قائمة &بريدية"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "قائمة &العناوين:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&عادي:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "غير &مقروء:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "الأجل الأقصى لصلاحية الرسالة"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "إ&نه الأجلّ بعد:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "أنه أجلّ الرسائل &المقروءة"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "إنقضاء الأجل ب&عد:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "أنه أجل الرسائل &غير المقروءة"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "يوم ( أيام )"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "أسبوع/أسابيع"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "شهر/ أشهر"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "متقدم"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&هوية المرسل:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "هيئة ال&تخزين:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&لائحة العروض:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "تسيير مفعول السندات مستعملاً CRLs."
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "تسيير مفعول السندات على الخط  (OCSP)."
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "تسيير مفعول السند على الخط"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL مجاوب OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"أدخل هنا عنوان خادم التحقق على الخط من الشهادات (المجيب OCSP). يبدء رابط الموقع "
-"عامتاً بِــ http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "لا تفحص سياسات الشهادة"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"إفتراضياً يستعمل GnuPG الملف ~/.gnupg/policies.txt كي يفحص إذا ما كانت هناك "
-"سياسة شهادات مسموحة. إذا كان هذا الخيار محدد ، لن يتم فحص السياسات."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "مطالب HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "لا تقوم بأي مطالب HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "تعطيل إستخدام HTTP لِـ S/MIME كاملاً."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "إستخدِم هذا الوكيل ( proxy ) لمطالِب HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "إستخدِم وكيل النظام (proxy )HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"إذا كان هذا الخيار محدد،  سيتم إستعمال القيمة الظاهرة على اليمين للوكيل HTTP "
-"لكل الطلبات HTTP ( و هذا القيمة تستنتج من المتغيير المحيطي http_proxy)."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"أدخل هنا موقعك للوكيل HTTP ، اللذي سيتم إستعماله لكل الطلبات HTTP المتعلقة بِــ "
-"S/MIME. بناء الجملة يكون المضيف:المنفذ ، مثالاً myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "مطالب LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "لا تقوم بأي مطالب LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "يعطل بشكل تام إستعمال الـ LDAP لِــ S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "المضيف الرئيسي لمطالب LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "ا&ضف..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "ال&برمجيات الجماعية"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "إسترجاع إعدادات المحرفّ"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "غير محدود"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "إعدادات التوقيع"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "ردَ على ال&مرسل:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "رُدً إلى &الكل..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "رسالة محولة"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "حذر عند محاولة إرسال رسالة &غير موقعة"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "تحقق ليتم التحذير عند إرسال رسالة غير موقعة"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر عند المحاولة لإرسال رسالة غير موقعة</h1>\n"
-"إذا تم التحقق من هذا الصندوق، سوف تحذر عند المحاولة لإرسال أجزاء أو كل الرسالة "
-"غير موقعة.\n"
-"<p>\n"
-"من المستحسن إبقاء هذا الخيار مفعل لتكامل أعلى. \n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&حذر عند محاولة إرسال رسائل غير مشفرة"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "إفحص ليتم التحذير عند إرسال رسائل غير مشفرة."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر عند محاولة إرسال رسالة غير مشفرة</h1>\n"
-"إذا تم اختيار هذا الصندوق، سوف يتم تحذيرك عندما تحاول إرسال أجزاء من أو كامل "
-"الرسالة غير مشفرة. \n"
-"<p>\n"
-"من المستحسن أن تترك هذا الخيار فعّال لأعلى وثوقية.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "حذر إذا كان عنوان الم&راسل ليس في السند"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "حدد هذا الخيار ليتم تحذيرك إن لم يكن العنوان في السند"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر إذا كان عنوان البريد للمستلم ليس في شهادة</h1>\n"
-"إذا كان هذا الخيار مفعل، التحذير مصدر إذا كان عنوان البريد الإلكتروني إذا كان "
-"المستلم غير متضمنة في الشهادة المستخدمة للتشفير.\n"
-"<p>\n"
-"من المفضل ترك هذا الخيار مفعلا لأعلى مستوى أمان.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"حذِر إذا ما كان أجل الشهادات/المفاتيح ينتهي قريباً ( هيئ العتبة في الأسفل )"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "للتوقيع"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "للتشفير"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " أيام"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "حدد عدد الأيام هنا"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر إذا انتهت شهادة التوقيع</h1>\n"
-"حدد العدد الأقل من الأيام حيث يجب أن تتوفر الشهادة وسارية الصلاحية وذلك بدون "
-"تنبيه خطر.\n"
-"<p>\n"
-"إعدادات ال SPHINX المفضلة هي 14 يوم.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر عندما تنتهي شهادة تشفير</h1>\n"
-"حدد العدد الأقل من الأيام الذي يجب أن تكون به شهادة التشفير متوفرة بدون إصدار "
-"تحذير.\n"
-"<p>\n"
-"إعداد ال SPHINX المفضل هو 14 يوم.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر إذا كانت الشهادة في السلسلة منتهية</h1>\n"
-"حدد العدد الأقل للأيام حيث أن كل الشهادات في السلسلة ينبغي أن تكون صالحة دون "
-"إصدار تحذير.\n"
-"<p>\n"
-"الإعداد المفضل لل SPHINX هو 14 يوم.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر إذا انتهت شهادة CA</h1>\n"
-"حدد أقل عدد من الأيام حيث يتوجب شهادة CA أن تكون صالحةبدون استخدام تحذير.\n"
-"<p>\n"
-"إعدادات ال SPHINX المفضلة هي 14 يوم.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>حذر إذا انتهت شهادة الجذر</h1>\n"
-"تحدي العدد الأقل من الأيام حيث يجب أن تكون شهادة الجذر صالحةوبدون تحذير.\n"
-"<p>\n"
-"إعدادات ال SPHINX المفضلة هي 14 يوم.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "لسندات الجذر:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "لشهادات CA المرحلية:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "لشهادات/مفاتيح المستخدم الطرفي:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "إعادة تمكين كلّ التحذيرات \"لا تسأل مرة ثانية\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "محتويات ال&مجلد:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&استبدال"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&استبدال"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "ارسل الرسائل المصفوفة عند التحقق من البريد"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>حدد إذا كنت تريد KMail أن يرسل كل الرسائل في صندوق البريد الصادر عند التحقق "
-"اليدوي أو عند التحقق عن كل البريد ، أو إذا كنت لا تريد إطلاقاً أي رسالة أن ترسل "
-"تلقائياً. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>هناك رسائل جديدة في هذا الملف و لم يتم بعد رفعها إلى الخادِم ، و لكن لا يبدو "
-"انّ لديك الأذون الكافية لرفعها الآن  غلى الخادِم. الرجاء الإتصال بمديرك ليسمح "
-"لك برفع رسائلك الجديدة ، او أحذف هذه الرسائل من هذا المجلّد.</p> "
-"<p>هل تريد نقل هذه الرسائل غلى مجلّد آخر الان ؟</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "المجلد المختار الأكثر حداثة في حوار اختيار المجلًدات."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "أعلِن إشعار بريد جديد"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "حدِدد ال&محِرر:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "استعمل ال&محرر الخارجي بدلا من المحرِر الداخلي"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "تمكين وظائف البرمجيات الجماعية"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "ارسل دعوات البرمجيات الجماعية في جسم البريد"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "ارسال دعوة تلقائي"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>تمكين هذا الخيار يجعل تخزين الخانات من تطبيقات Kontact ( KOrganizer ، "
-"KAddressBook و KNotes.)</p>"
-"<p>إذا كنت تريد تعيين هذا الخيار يجب عليك أيضاً تبليغ التطبيقات عن إستعمال "
-"موارِد IMAP ، يتم تثبيت ذالك في مركز التحكُم بكي دي أي .</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>عادتاً ليس عليك مشاهدة المجلّدات اللتي تحفظ موارِد IMAP لأي سبب كان. إذا كنت "
-"تريد رؤيتها رغماً عن ذلك يمكنك تحديد ذلك هنا.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>إختر هيئة التخزين لمجلّدات البرمجيات الجماعية."
-"<ul>"
-"<li>إفتراضياً الهيئة القياسية المستخدمة تكون ical ( لمجلّدات التقويم ) و vcard "
-"( لمجلّدات دفتر العناوين ). هذه الهيئة تجعل كلّ خصائص Kontact متوفّرة.</li>"
-"<li> تستعمل هيئة Kolab XML نموذج معتاد يطابق اكثر النموذج المستعمل في Outlook. "
-"و توفِر هذه الهيئة تطابق محسّن ل- Outlook عند إستعمال خادِم Kolab أو ما حلً "
-"يشابِهه.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>ينتقي هذا ، المجلّد الأبتدائي لمجلدات موارِد IMAP.</p>"
-"<p>إفتراضياً يقوم الخادم Kolab بتعيين صندوق الوارد ( IMAP inbox ) كمجلّد "
-"إبتدائي.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>هذه هوية الحساب ( ID ) اللذي يحمل مجلّدات موارد IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>يمكنك الخيار بين هذه اللغات المتوفرة إذا كنت تريد تحديد أسماء المجلّدات "
-"لتخزينات IMAP كلغتك المحلّية.</p>"
-"<p> و لكن لاحظ من فضلك أنّ السبب الوحيد لذالك هو للتطابق مع Microsoft Outlook. "
-"لكن ذالك فكرةٌ غير جيّدة حيث يصبِح تغيير اللغة صعباً. </p>"
-"<p>لذالك لا تحدد هذا إلا إذا لم يكن لديك غير هذا الخيار.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "تستخدم هذه القيمة لإتخاذ القرار بعرض مقدِمة KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "عدد الوصلات الاقصى لكل مضيف"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"يستعمل هذا لحصر عدد الإتصالات بألمضيف عند التحقُق من البريد الجديد. إفتراضياً "
-"يكون عدد الإتصالات غير محصور (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "أعرض تحرير سطر البحث السريع"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"هذا الخيار يسمح أو يلغي تحرير سطر البحث على لائحة الرسائل اللذي يُستعمل للبحث "
-"السريع عن معلومات المعروضة في لائحة الرسائل."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "احفظ شيفرة الاحرف الأصلية عند الرد أو إعادة الإرسال إن أمكن."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "أضف التوقيع &تلقائيا"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"تذكًر هذه الهوية كي تستعمل في نوافذ المحرر في المستقبل.\n"
-"......."
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"تذكًر هذا المجلًد للرسائل المرسمة كي تُستعمل في نوافذ المحرر في المستقبل."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "تذكًر طريقة نقل البريد هذه كي تستعمل في نوافذ المحرر في المستقبل."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"تذكًر هذه الهوية كي تستعمل في نوافذ المحرر في المستقبل.\n"
-"......."
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&بدّل الكلمة في العمود:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "حذر إذا كانت شهادة الجذر تنتهي &بأقل من:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"حدِد هذا الخيار إذا كنت تريد Outlook &#8482; أنّ يفهم أسماء الملحقات اللتي "
-"تحتوي على أحرف غير أنكليزية."
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "أطلب و&أرسل تلقائياً حقول ورسوم بيانية"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>حدًد هذا الخيار إذا كنت تريد البرنامج أن يقوم بتنبيهات موقع الرسالة.</p>"
-"<p>هذا الخيار يفعل الافتراضي فقط، لا زلت تستطيع تفعيل أو إلغاء تفعيل طلبات MDN "
-"في كل رسالة في المتصفح، عنصر القائمة <em>خيارات</em>->&gt;<em>"
-"طلبات تنبيه المواقع</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "استخدم العناوين الحديثة للاتمام التلقائي"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"الغي هذا الخيار هذا كنت لا تريد اظهار العناوين المستعملة محدثا في لائحة الاتمام "
-"التلقائي في حقل ادخال العنوان."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "فترة الحفظ التلقائي:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"من الممكن إنشاء نسخة إحتياطية للنصّ داخل المحرِر بشكل انتظامي . هنا تُحدِد "
-"الفترة لإنشاء النسخات الأحتياطية.  يمكنك إلغاء الحفظ التلقائي عنجما تضع القيمة "
-"0 هنا."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "استبدل &البادئة المعروفة ب \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "استبدل البادئة المعروفة ب \"Fwd&:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "إستخدام إقتباس &ذكي"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "إنتهى أجلّ التوقيع."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "نوع محدد المرسل اليه"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"يثبت نوع حوار الخيار للعناوين الى ،\n"
-".......مرفق و مرفق مخفي."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "نوع محرر عناوين المراسلين"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"يثبت نوع محرر العناوين الى ،\n"
-".......مرفق و مرفق مخفي."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "العدد الاقصى لاسطر محرر العناوين المرسل اليهم."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "احفظ شيفرة الاحرف الأصلية عند الرد أو إعادة الإرسال إن أمكن."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"بعض رسائل البريد ، خاصتا تلك اللتي يجري انشاءها تلقائيا ، لا تحدد تشفيرة الاحرف "
-"كي يتم عرضها بشكل سليم. في هذه الحالات يمكنك تحديد هنا شيفرة أحرف أحتياطية "
-"للاستعمال. حدد شيفرة  الاحرف الأكثر استعمالآ في انحاء بلادك. افتراضيا ستستعمل "
-"شيفرة الاحرف المحددة لكامل النظام."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"تغيير هذا من قيمته الافتراضية 'تلقائي' سيفرض استعمال التشفير المحدد لكلً "
-"الرسائل الالكترونية ، بصرف النظر عن ما يحددونه بطبيعتهم."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"تمكين هذا اذا كنت تريد استبدال الأيقونات الضاحكة مثل (-: اللتي تظهر في الرسالة "
-"بأيقونات أنفعالية ( رسومات صغيرة )."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"مكًن هذا الخيار كي ترى المستويات المختلفة للنص المنقول. الغاء الخيار لأخفاء "
-"مستويات النص المنقول."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "مستوى الاخفاء التلقائي:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "صغًر حجم الحرف للنص المنقول"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "تمكين هذا الخيار لعرض النص المنقول بأحرف اصغر."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "تخزين &مشفر للرسائل المرسلة"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "أظهر حالة البريد غير المر&غوب في الترويسات المزينة"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "ارسل تبليغ الأستلام مع مرسل فارغ."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"ارسل تبليغ استلام رسالة مع حقل مرسِل فارغ. بعض الخوادِم قد تكون مهيّئة لرفض "
-"رسائل كهذه ، لذلك عليك إلغاء هذا الخيار إذا قابلت بعض المشاكِل."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "لائحة الرسائل - رسائل جديدة"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "أضِف &علامات الرد"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13751,6 +11857,11 @@ msgstr "إضافة كمرفق"
 msgid "Add as BCC"
 msgstr "إضافة كمرفق مخفي"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "إ&لغاء"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13767,15 +11878,15 @@ msgstr "المراسلين المحددين"
 #: recipientspicker.cpp:784
 #, fuzzy
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"لقد اخترت عنوان واحد للارسال اليه. العدد الاقصى المدعوم للعناوين هو %1. الرجاء "
-"ضبط الخيار.\n"
-"لقد اخترت عناوين  %n للارسال اليهم. العدد الاقصى المدعوم للعناوين هو %1. الرجاء "
-"ضبط الخيار."
+"لقد اخترت عنوان واحد للارسال اليه. العدد الاقصى المدعوم للعناوين هو %1. "
+"الرجاء ضبط الخيار.\n"
+"لقد اخترت عناوين  %n للارسال اليهم. العدد الاقصى المدعوم للعناوين هو %1. "
+"الرجاء ضبط الخيار."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13791,8 +11902,8 @@ msgstr "إستخدم حوار إختيار- العنوان"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "هذا الزر يفتح حوار منفصل حيث يمكنك اختيار المراسلين من بين جميع العناوين "
 "الموجودة."
@@ -13897,10 +12008,19 @@ msgstr "أكبر من أو مساو إلى"
 msgid " bytes"
 msgstr " بايت"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " أيام"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "كي يتم تنفيذ بحثك يجب تحميل كل رسائل المجلد %1 من الخادم. و هذا قد يدوم بعض "
 "الوقت. هل تريد متابعة البحث ؟"
@@ -14058,16 +12178,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"جمع البيانات للحساب '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "جمع البيانات للحساب '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14086,10 +12202,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"محتويات نص الاوامر '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "محتويات نص الاوامر '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14112,20 +12226,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"إمكانيات Sieve: \n"
+msgid "Sieve capabilities:\n"
+msgstr "إمكانيات Sieve: \n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "( لا يوجد امكانيات خاصة )"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"نصوص اوامر Sieve متوفرة :\n"
+msgid "Available Sieve scripts:\n"
+msgstr "نصوص اوامر Sieve متوفرة :\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14203,8 +12313,8 @@ msgstr "إستخدم هذا الحقل لادخال توقيع إعتباطي ث
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "إستعمل هذا المُطلب كي تحدد ملف نصً يحتوي على توقيعك. سيتم قرائته كلما أنشأت "
 "رسالة جديدة او أضفت توقيع جديد."
@@ -14223,11 +12333,11 @@ msgstr "يفتح الملف المحدد في محرر النص."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "يمكنك اضافة هنا امر اعتباطي ، مع او بدون مسار path اعتمادا على اذا كان الامر "
 "هذا معرف في متغيرتك  Path. يقوم عندها KMail بتشغيل هذا الامر و باضافة نتائجه "
@@ -14238,6 +12348,11 @@ msgstr ""
 msgid "S&pecify command:"
 msgstr "&حدد الامر:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "الخانة الجديدة:"
@@ -14274,6 +12389,11 @@ msgstr "إضافة حساب"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>هل تريد فعلا حذف الهوية المسماة <b>%1</b>؟</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "تطبيق إ&لى:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14288,6 +12408,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "تحرير نص أوامر..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14327,9 +12451,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14369,6 +12493,16 @@ msgstr ""
 "لا يمكن فتح ملف \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "إلى:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "مرفق:"
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14404,36 +12538,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14443,8 +12573,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14460,8 +12589,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14503,8 +12631,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -14674,6 +12801,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14710,113 +12841,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...انك تستطيع الذهاب الى الرسالة التالية و السابقة عند استعمال\n"
-"أزرار الأسهم يمين و يسار على التوالي ؟</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>... أنك تستطيع سريعاً إنشاء مرشحات على المرسل، المراسل،\n"
-"الموضوع و على قوائم البريد بهذه الطريقة:<em> أدوات - &gt; انشاء &nbsp; مرشح "
-"</em>؟ </p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...أنّك تستطيع التخلّي عن &quot;[إسم لائحة البريد]&quot;\n"
-"المضافة إلى حقل الموضوع عند بعض لوائح توزيع البريد عندما تستعمل\n"
-"مفعول المرشح \n"
-"<em>إعادة كتابة الترويسة</em> ؟ فقط إستعمل\n"
-"<pre>إعادة كتابة الترويسة &quot;الموضوع&quot;\n"
-"   إستبدل&quot;\\s*\\[إسم لائحة التوزيع\\]\\s*&quot;\n"
-"   بِــ &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...أنك تستطيع إنشاء ترابط بين لائحات توزيع البريد و المجلّدات\n"
-"في الحوار <em>المجلّد-&gt; تدبير لائحة توزيع البريد</em> ؟ ستستطيع بعد ذلك\n"
-"إستعمال <em>الرسالة-&gt;جديد&nbsp;الرسالة &nbsp; إلى &nbsp; لائحة توزيع "
-"البريد&nbsp;...</em>\n"
-"كي تفتح المحرر و يكون عنوان لائحة التوزيع جاهز للإستعمال.\n"
-"بطريقة بديلة ، تستطيع أيضاً النقر على المجلّد بزرّ الفأرة الوسط./p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...ذلك أنك تستطيع تحديد أيقونات مخصصة لكل مجلد على حدة؟\n"
-"أنظر <em>المجلّد -&gt; الخصائص</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...أنّ KMail يستطيع عرض شريط ألوان يدلّ على نوع الرسالة\n"
-"(نص عادي/HTML/OpenPGP) المعروضة حالياً ؟</p>\n"
-"<p>و هذا يمنع محاولات التصديق على توقيعات مزوّرة \n"
-"عند إرسال رسائل HTML تقلّد إطارات حالة التوقيع بِــ KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>... أنك تستطيع ترشيح أي ترويسة الرسالة بإدخال إسم الترويسة ببساطة\n"
-"في أول حقل التحرير من شروط البحث ؟</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...أنك تستطيع ترشيح الرسائل من النوع HTML-فقط عند إستعمال الشرط\n"
-"<pre>&quot;نوع المحتوى&quot; يحتوي على &quot;text/html&quot; ؟</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>... ان عند الردً ، فقط القسم المختار من الرسالة يتم إقتباسه ؟</p>\n"
-"<p>اذا لم تحدد أي نص ، يتم إقتباس كل الرسالة.</p>\n"
-"<p>و هذا يعمل ايضا  مع نصوص الملحقات اذا إخترت \n"
-"<em>عرض-&gt;الملحقات-&gt;على السطر</em></p>\n"
-"<p>هذه الميّزة متوفرة لكل أوامر الرد ما عدا\n"
-"<em>الرسالة -&gt;رُدً بدون الإقتباس.</em></p>\n"
-"<p align=\"right\"><em>مساهمة من David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "ليس هناك شيء للتراجع."
@@ -14884,6 +12908,15 @@ msgstr "مرفق #%1 (غير مسمى)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "الملف المسمى %1 موجود سابقا. هل تريد الكتابة عليه ؟"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "كتابة فوقية على الملف ؟"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14915,8 +12948,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"الخادم الذي تعمل عليه لم يدرج \"غائب\" في قائمة الامتدادات المدعومة في الغربال "
-"Sieve .\n"
+"الخادم الذي تعمل عليه لم يدرج \"غائب\" في قائمة الامتدادات المدعومة في "
+"الغربال Sieve .\n"
 "بدونها، KMail لا يستطيع تثبيت لك الردود غائب عن المكتب.\n"
 "الرجاء الإتصال بمدير نظامك."
 
@@ -15000,9 +13033,9 @@ msgstr "ا&رسل الرسم مع كل رسالة"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "أختر هذا المربع اذا كنت تريد KMail ان يضيف ما يسمى ترويسة X-Face الى الرسائل "
 "المحررة بهذه الهوية. X-Face هي عبارة عن رسمة صغيرة الحجم (48x48 pixels) في "
@@ -15034,9 +13067,9 @@ msgstr "أختر ملف..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "استعمل هذا لاختيار ملف صورة تستطيع انشاء رسمة منها. يجب ان تكون الصورة مربعة "
 "الشكل و عالية التباين. ذو خلفية مضائة حيث تكون النتيجة احسن."
@@ -15047,20 +13080,20 @@ msgstr "حدد من دفتر العناوين"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "يمكنك استعمال نسخة صورة مصغرة عن الصورة اللتي وضعت في حقل دفتر عناوينك."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>يمكن ل KMail ارسال رسمة صغيرة (48x48 pixels) ، قليلة الجودة وحيدة الالوان "
-"(ابيض و اسود ) مع كل رسالة. و من الممكن ان تكون هذه صورة لك او اي رسمة. ستظهر "
-"هذه الصورة في قارئ بريد المرسل اليه (اذا كان ذلك مدعوما منه)."
+"<qt>يمكن ل KMail ارسال رسمة صغيرة (48x48 pixels) ، قليلة الجودة وحيدة "
+"الالوان (ابيض و اسود ) مع كل رسالة. و من الممكن ان تكون هذه صورة لك او اي "
+"رسمة. ستظهر هذه الصورة في قارئ بريد المرسل اليه (اذا كان ذلك مدعوما منه)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15068,11 +13101,11 @@ msgstr "استعمل هذا الحقل لادخال سلسمة اعتباطية
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"يوجد امثلة عند  <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"يوجد امثلة عند  <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www."
+"xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15087,128 +13120,1682 @@ msgstr "لا يوجد رسم"
 msgid "You do not have your own contact defined in the address book."
 msgstr "ليس لديك تعريف لفريق مراسلة في دفتر عناوينك."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "توقَيع"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "وقّع الرسائل &تلقائيا"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"عند تمكين هذا الخيار ، سيتم توقيع كل الرسائل اللتي ترسلها إفتراضياً ، طبعاً لا "
+"يزال ممكن تعطيل التوقيع لكل رسالة بشكل خاص."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "تشفير"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "تحديد موضوع الرسالة"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "إرسال مرفق: إلى العنوان"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "أظهر النص ال&مشفر/الموقع بعد التحرير"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "إرسال مرفق مخفي: إلى العنوان."
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "إضافة ترويسة إلى رسالة"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "تخزين &مشفر للرسائل المرسلة"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "قراءة جسم رسالة من ملف"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "أنقر لتخزن تشفير الرسالة"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "اعداد جسم الرسالة."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>خزن الرسائل المشفرة</h1>\n"
+"عندما يكون هذا الصندوق مفعل، أرسل الرسائل المشفرة المخزنة كما لو أنها أرسلت. "
+"هذا ليس مستحسن، كما أنك لن تكون قادرا على قراءة الرسالة بعد ذلك إذا انتهت "
+"رسالة ضرورية.\n"
+"<p>\n"
+"مع ذلك، هناك ربما قواعد محلية تتطلب منك تشغيل هذا الخيار. عندما تقع في الشك، "
+"تحقق مع مدير النظام المحلي لديك.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "إضافة مرفق إلى البريد الإلكتروني. يمكن لهذا أن يعاد تكراره."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "أعرض دائماً مفاتيح التشفير &للموافقة"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "تحقق فقط من البريد الجديد"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "فقط إفتح نافذة تحرير"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "شفّر الرسائل تلقائيا &عند الإمكان"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "شاهد ملف الرسالة المعنية"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"عند تمكين هذا الخيار ، سيتم تشفير كل رسالة ترسلها حسب الإمكان و الطلب، طبعاً "
+"لا يزال بإمكانك تعطيل التشفير التلقائي لكل رسالة لوحدها."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "إرسال رسالة إلى عنوان و أرفق الملف الذي يشير اليه ال'URL'"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "عدم توقيع/تشفير عند ال&حفظ كمسودة"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "قرء"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "قديم"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "عام"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "محذوف"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&ردً إلى"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "تم الرد عليه"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "رُدً إلى &الكل..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "حوّلت الى"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&حوّل"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "وضِعَ في صفّ الانتظار"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "اختصار :"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "أُرسل"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&استبدال"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "مراقب"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "محتويات ال&مجلد:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "تم التجاهل"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&استبدال"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "بريد غير مرغوب"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&استبدال"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "خصائص المجلد"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "المجلد يحتوي قائمة &بريدية"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "قائمة &العناوين:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&عادي:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "غير &مقروء:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "الأجل الأقصى لصلاحية الرسالة"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "إ&نه الأجلّ بعد:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "أنه أجلّ الرسائل &المقروءة"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "إنقضاء الأجل ب&عد:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "أنه أجل الرسائل &غير المقروءة"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "يوم ( أيام )"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "أسبوع/أسابيع"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "شهر/ أشهر"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "متقدم"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&هوية المرسل:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "هيئة ال&تخزين:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&لائحة العروض:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "ارسل الرسائل المصفوفة عند التحقق من البريد"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>حدد إذا كنت تريد KMail أن يرسل كل الرسائل في صندوق البريد الصادر عند "
+"التحقق اليدوي أو عند التحقق عن كل البريد ، أو إذا كنت لا تريد إطلاقاً أي "
+"رسالة أن ترسل تلقائياً. </p></qt>"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "واجِب"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "لديه ملحق"
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>هناك رسائل جديدة في هذا الملف و لم يتم بعد رفعها إلى الخادِم ، و لكن لا "
+"يبدو انّ لديك الأذون الكافية لرفعها الآن  غلى الخادِم. الرجاء الإتصال بمديرك "
+"ليسمح لك برفع رسائلك الجديدة ، او أحذف هذه الرسائل من هذا المجلّد.</p> <p>هل "
+"تريد نقل هذه الرسائل غلى مجلّد آخر الان ؟</p>"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "المجلد المختار الأكثر حداثة في حوار اختيار المجلًدات."
+
+#: kmail.kcfg:101
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "الملف المسمى %1 موجود سابقا. هل تريد الكتابة عليه ؟"
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "كتابة فوقية على الملف ؟"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "أعلِن إشعار بريد جديد"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "حدِدد ال&محِرر:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "استعمل ال&محرر الخارجي بدلا من المحرِر الداخلي"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "تمكين وظائف البرمجيات الجماعية"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "ارسل دعوات البرمجيات الجماعية في جسم البريد"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "ارسال دعوة تلقائي"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>تمكين هذا الخيار يجعل تخزين الخانات من تطبيقات Kontact ( KOrganizer ، "
+"KAddressBook و KNotes.)</p><p>إذا كنت تريد تعيين هذا الخيار يجب عليك أيضاً "
+"تبليغ التطبيقات عن إستعمال موارِد IMAP ، يتم تثبيت ذالك في مركز التحكُم بكي دي "
+"أي .</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>عادتاً ليس عليك مشاهدة المجلّدات اللتي تحفظ موارِد IMAP لأي سبب كان. إذا كنت "
+"تريد رؤيتها رغماً عن ذلك يمكنك تحديد ذلك هنا.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>إختر هيئة التخزين لمجلّدات البرمجيات الجماعية.<ul><li>إفتراضياً الهيئة "
+"القياسية المستخدمة تكون ical ( لمجلّدات التقويم ) و vcard ( لمجلّدات دفتر "
+"العناوين ). هذه الهيئة تجعل كلّ خصائص Kontact متوفّرة.</li><li> تستعمل هيئة "
+"Kolab XML نموذج معتاد يطابق اكثر النموذج المستعمل في Outlook. و توفِر هذه "
+"الهيئة تطابق محسّن ل- Outlook عند إستعمال خادِم Kolab أو ما حلً يشابِهه.</li></"
+"ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>ينتقي هذا ، المجلّد الأبتدائي لمجلدات موارِد IMAP.</p><p>إفتراضياً يقوم "
+"الخادم Kolab بتعيين صندوق الوارد ( IMAP inbox ) كمجلّد إبتدائي.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>هذه هوية الحساب ( ID ) اللذي يحمل مجلّدات موارد IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>يمكنك الخيار بين هذه اللغات المتوفرة إذا كنت تريد تحديد أسماء المجلّدات "
+"لتخزينات IMAP كلغتك المحلّية.</p><p> و لكن لاحظ من فضلك أنّ السبب الوحيد لذالك "
+"هو للتطابق مع Microsoft Outlook. لكن ذالك فكرةٌ غير جيّدة حيث يصبِح تغيير اللغة "
+"صعباً. </p><p>لذالك لا تحدد هذا إلا إذا لم يكن لديك غير هذا الخيار.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "تستخدم هذه القيمة لإتخاذ القرار بعرض مقدِمة KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "عدد الوصلات الاقصى لكل مضيف"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"يستعمل هذا لحصر عدد الإتصالات بألمضيف عند التحقُق من البريد الجديد. إفتراضياً "
+"يكون عدد الإتصالات غير محصور (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "أعرض تحرير سطر البحث السريع"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"هذا الخيار يسمح أو يلغي تحرير سطر البحث على لائحة الرسائل اللذي يُستعمل للبحث "
+"السريع عن معلومات المعروضة في لائحة الرسائل."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "احفظ شيفرة الاحرف الأصلية عند الرد أو إعادة الإرسال إن أمكن."
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "أضف التوقيع &تلقائيا"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"تذكًر هذه الهوية كي تستعمل في نوافذ المحرر في المستقبل.\n"
+"......."
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr "تذكًر هذا المجلًد للرسائل المرسمة كي تُستعمل في نوافذ المحرر في المستقبل."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "تذكًر طريقة نقل البريد هذه كي تستعمل في نوافذ المحرر في المستقبل."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"تذكًر هذه الهوية كي تستعمل في نوافذ المحرر في المستقبل.\n"
+"......."
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&بدّل الكلمة في العمود:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "حذر إذا كانت شهادة الجذر تنتهي &بأقل من:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"حدِد هذا الخيار إذا كنت تريد Outlook &#8482; أنّ يفهم أسماء الملحقات اللتي "
+"تحتوي على أحرف غير أنكليزية."
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "أطلب و&أرسل تلقائياً حقول ورسوم بيانية"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>حدًد هذا الخيار إذا كنت تريد البرنامج أن يقوم بتنبيهات موقع الرسالة.</"
+"p><p>هذا الخيار يفعل الافتراضي فقط، لا زلت تستطيع تفعيل أو إلغاء تفعيل طلبات "
+"MDN في كل رسالة في المتصفح، عنصر القائمة <em>خيارات</em>->&gt;<em>طلبات "
+"تنبيه المواقع</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "استخدم العناوين الحديثة للاتمام التلقائي"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"الغي هذا الخيار هذا كنت لا تريد اظهار العناوين المستعملة محدثا في لائحة "
+"الاتمام التلقائي في حقل ادخال العنوان."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "فترة الحفظ التلقائي:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"من الممكن إنشاء نسخة إحتياطية للنصّ داخل المحرِر بشكل انتظامي . هنا تُحدِد "
+"الفترة لإنشاء النسخات الأحتياطية.  يمكنك إلغاء الحفظ التلقائي عنجما تضع "
+"القيمة 0 هنا."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "استبدل &البادئة المعروفة ب \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "استبدل البادئة المعروفة ب \"Fwd&:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "إستخدام إقتباس &ذكي"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "إنتهى أجلّ التوقيع."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "نوع محدد المرسل اليه"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"يثبت نوع حوار الخيار للعناوين الى ،\n"
+".......مرفق و مرفق مخفي."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "نوع محرر عناوين المراسلين"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"يثبت نوع محرر العناوين الى ،\n"
+".......مرفق و مرفق مخفي."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "العدد الاقصى لاسطر محرر العناوين المرسل اليهم."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "احفظ شيفرة الاحرف الأصلية عند الرد أو إعادة الإرسال إن أمكن."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"بعض رسائل البريد ، خاصتا تلك اللتي يجري انشاءها تلقائيا ، لا تحدد تشفيرة "
+"الاحرف كي يتم عرضها بشكل سليم. في هذه الحالات يمكنك تحديد هنا شيفرة أحرف "
+"أحتياطية للاستعمال. حدد شيفرة  الاحرف الأكثر استعمالآ في انحاء بلادك. "
+"افتراضيا ستستعمل شيفرة الاحرف المحددة لكامل النظام."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"تغيير هذا من قيمته الافتراضية 'تلقائي' سيفرض استعمال التشفير المحدد لكلً "
+"الرسائل الالكترونية ، بصرف النظر عن ما يحددونه بطبيعتهم."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"تمكين هذا اذا كنت تريد استبدال الأيقونات الضاحكة مثل (-: اللتي تظهر في "
+"الرسالة بأيقونات أنفعالية ( رسومات صغيرة )."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"مكًن هذا الخيار كي ترى المستويات المختلفة للنص المنقول. الغاء الخيار لأخفاء "
+"مستويات النص المنقول."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "مستوى الاخفاء التلقائي:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "صغًر حجم الحرف للنص المنقول"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "تمكين هذا الخيار لعرض النص المنقول بأحرف اصغر."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "تخزين &مشفر للرسائل المرسلة"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "أظهر حالة البريد غير المر&غوب في الترويسات المزينة"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "ارسل تبليغ الأستلام مع مرسل فارغ."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"ارسل تبليغ استلام رسالة مع حقل مرسِل فارغ. بعض الخوادِم قد تكون مهيّئة لرفض "
+"رسائل كهذه ، لذلك عليك إلغاء هذا الخيار إذا قابلت بعض المشاكِل."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "لائحة الرسائل - رسائل جديدة"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "أضِف &علامات الرد"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "حرر ال&ملف"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "حرر..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "إ&ذهب"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "ال&مجلد"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&رسالة"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "ردً خاص"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&حوّل"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "إسترجاع إعدادات المحرفّ"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "شريط أدوات HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "خيارات متداولة"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "شريط أدوات HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "تسيير مفعول السندات مستعملاً CRLs."
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "تسيير مفعول السندات على الخط  (OCSP)."
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "تسيير مفعول السند على الخط"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL مجاوب OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"أدخل هنا عنوان خادم التحقق على الخط من الشهادات (المجيب OCSP). يبدء رابط "
+"الموقع عامتاً بِــ http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "لا تفحص سياسات الشهادة"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"إفتراضياً يستعمل GnuPG الملف ~/.gnupg/policies.txt كي يفحص إذا ما كانت هناك "
+"سياسة شهادات مسموحة. إذا كان هذا الخيار محدد ، لن يتم فحص السياسات."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "مطالب HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "لا تقوم بأي مطالب HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "تعطيل إستخدام HTTP لِـ S/MIME كاملاً."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "إستخدِم هذا الوكيل ( proxy ) لمطالِب HTTP:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "إستخدِم وكيل النظام (proxy )HTTP:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"إذا كان هذا الخيار محدد،  سيتم إستعمال القيمة الظاهرة على اليمين للوكيل HTTP "
+"لكل الطلبات HTTP ( و هذا القيمة تستنتج من المتغيير المحيطي http_proxy)."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"أدخل هنا موقعك للوكيل HTTP ، اللذي سيتم إستعماله لكل الطلبات HTTP المتعلقة "
+"بِــ S/MIME. بناء الجملة يكون المضيف:المنفذ ، مثالاً myproxy.nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "مطالب LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "لا تقوم بأي مطالب LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "يعطل بشكل تام إستعمال الـ LDAP لِــ S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "المضيف الرئيسي لمطالب LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "ا&ضف..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "ال&برمجيات الجماعية"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "إسترجاع إعدادات المحرفّ"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "غير محدود"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "إعدادات التوقيع"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "ردَ على ال&مرسل:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "رُدً إلى &الكل..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "رسالة محولة"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "حذر عند محاولة إرسال رسالة &غير موقعة"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "تحقق ليتم التحذير عند إرسال رسالة غير موقعة"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر عند المحاولة لإرسال رسالة غير موقعة</h1>\n"
+"إذا تم التحقق من هذا الصندوق، سوف تحذر عند المحاولة لإرسال أجزاء أو كل "
+"الرسالة غير موقعة.\n"
+"<p>\n"
+"من المستحسن إبقاء هذا الخيار مفعل لتكامل أعلى. \n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&حذر عند محاولة إرسال رسائل غير مشفرة"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "إفحص ليتم التحذير عند إرسال رسائل غير مشفرة."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر عند محاولة إرسال رسالة غير مشفرة</h1>\n"
+"إذا تم اختيار هذا الصندوق، سوف يتم تحذيرك عندما تحاول إرسال أجزاء من أو كامل "
+"الرسالة غير مشفرة. \n"
+"<p>\n"
+"من المستحسن أن تترك هذا الخيار فعّال لأعلى وثوقية.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "حذر إذا كان عنوان الم&راسل ليس في السند"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "حدد هذا الخيار ليتم تحذيرك إن لم يكن العنوان في السند"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر إذا كان عنوان البريد للمستلم ليس في شهادة</h1>\n"
+"إذا كان هذا الخيار مفعل، التحذير مصدر إذا كان عنوان البريد الإلكتروني إذا "
+"كان المستلم غير متضمنة في الشهادة المستخدمة للتشفير.\n"
+"<p>\n"
+"من المفضل ترك هذا الخيار مفعلا لأعلى مستوى أمان.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"حذِر إذا ما كان أجل الشهادات/المفاتيح ينتهي قريباً ( هيئ العتبة في الأسفل )"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "للتوقيع"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "للتشفير"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "حدد عدد الأيام هنا"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر إذا انتهت شهادة التوقيع</h1>\n"
+"حدد العدد الأقل من الأيام حيث يجب أن تتوفر الشهادة وسارية الصلاحية وذلك بدون "
+"تنبيه خطر.\n"
+"<p>\n"
+"إعدادات ال SPHINX المفضلة هي 14 يوم.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر عندما تنتهي شهادة تشفير</h1>\n"
+"حدد العدد الأقل من الأيام الذي يجب أن تكون به شهادة التشفير متوفرة بدون "
+"إصدار تحذير.\n"
+"<p>\n"
+"إعداد ال SPHINX المفضل هو 14 يوم.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر إذا كانت الشهادة في السلسلة منتهية</h1>\n"
+"حدد العدد الأقل للأيام حيث أن كل الشهادات في السلسلة ينبغي أن تكون صالحة دون "
+"إصدار تحذير.\n"
+"<p>\n"
+"الإعداد المفضل لل SPHINX هو 14 يوم.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر إذا انتهت شهادة CA</h1>\n"
+"حدد أقل عدد من الأيام حيث يتوجب شهادة CA أن تكون صالحةبدون استخدام تحذير.\n"
+"<p>\n"
+"إعدادات ال SPHINX المفضلة هي 14 يوم.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>حذر إذا انتهت شهادة الجذر</h1>\n"
+"تحدي العدد الأقل من الأيام حيث يجب أن تكون شهادة الجذر صالحةوبدون تحذير.\n"
+"<p>\n"
+"إعدادات ال SPHINX المفضلة هي 14 يوم.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "لسندات الجذر:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "لشهادات CA المرحلية:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "لشهادات/مفاتيح المستخدم الطرفي:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "إعادة تمكين كلّ التحذيرات \"لا تسأل مرة ثانية\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...انك تستطيع الذهاب الى الرسالة التالية و السابقة عند استعمال\n"
+"أزرار الأسهم يمين و يسار على التوالي ؟</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>... أنك تستطيع سريعاً إنشاء مرشحات على المرسل، المراسل،\n"
+"الموضوع و على قوائم البريد بهذه الطريقة:<em> أدوات - &gt; انشاء &nbsp; مرشح "
+"</em>؟ </p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...أنّك تستطيع التخلّي عن &quot;[إسم لائحة البريد]&quot;\n"
+"المضافة إلى حقل الموضوع عند بعض لوائح توزيع البريد عندما تستعمل\n"
+"مفعول المرشح \n"
+"<em>إعادة كتابة الترويسة</em> ؟ فقط إستعمل\n"
+"<pre>إعادة كتابة الترويسة &quot;الموضوع&quot;\n"
+"   إستبدل&quot;\\s*\\[إسم لائحة التوزيع\\]\\s*&quot;\n"
+"   بِــ &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...أنك تستطيع إنشاء ترابط بين لائحات توزيع البريد و المجلّدات\n"
+"في الحوار <em>المجلّد-&gt; تدبير لائحة توزيع البريد</em> ؟ ستستطيع بعد ذلك\n"
+"إستعمال <em>الرسالة-&gt;جديد&nbsp;الرسالة &nbsp; إلى &nbsp; لائحة توزيع "
+"البريد&nbsp;...</em>\n"
+"كي تفتح المحرر و يكون عنوان لائحة التوزيع جاهز للإستعمال.\n"
+"بطريقة بديلة ، تستطيع أيضاً النقر على المجلّد بزرّ الفأرة الوسط./p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...ذلك أنك تستطيع تحديد أيقونات مخصصة لكل مجلد على حدة؟\n"
+"أنظر <em>المجلّد -&gt; الخصائص</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...أنّ KMail يستطيع عرض شريط ألوان يدلّ على نوع الرسالة\n"
+"(نص عادي/HTML/OpenPGP) المعروضة حالياً ؟</p>\n"
+"<p>و هذا يمنع محاولات التصديق على توقيعات مزوّرة \n"
+"عند إرسال رسائل HTML تقلّد إطارات حالة التوقيع بِــ KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>... أنك تستطيع ترشيح أي ترويسة الرسالة بإدخال إسم الترويسة ببساطة\n"
+"في أول حقل التحرير من شروط البحث ؟</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...أنك تستطيع ترشيح الرسائل من النوع HTML-فقط عند إستعمال الشرط\n"
+"<pre>&quot;نوع المحتوى&quot; يحتوي على &quot;text/html&quot; ؟</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>... ان عند الردً ، فقط القسم المختار من الرسالة يتم إقتباسه ؟</p>\n"
+"<p>اذا لم تحدد أي نص ، يتم إقتباس كل الرسالة.</p>\n"
+"<p>و هذا يعمل ايضا  مع نصوص الملحقات اذا إخترت \n"
+"<em>عرض-&gt;الملحقات-&gt;على السطر</em></p>\n"
+"<p>هذه الميّزة متوفرة لكل أوامر الرد ما عدا\n"
+"<em>الرسالة -&gt;رُدً بدون الإقتباس.</em></p>\n"
+"<p align=\"right\"><em>مساهمة من David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15303,14 +14890,17 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>شفر جميع أجزاء الرسالة بشكل إفتراضي</h1>\n"
-#~ "إذا كان هذا الخيار محددا، كل أجزاء الرسالة (على سبيل المثال جسم الرسالة العام وكل الملحقات) مشفرة افتراضيا.\n"
+#~ "إذا كان هذا الخيار محددا، كل أجزاء الرسالة (على سبيل المثال جسم الرسالة "
+#~ "العام وكل الملحقات) مشفرة افتراضيا.\n"
 #~ "<p>\n"
 #~ "هذا إعداد إفتراضي، لا زلت تستطيع التعديل عليه على كل رسالة فردية.\n"
 #~ "</qt>"
@@ -15324,12 +14914,16 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>إسأل قبل تشفير كل جزء</h1>\n"
-#~ "عندما يكون هذا الخيار محددا، سوف تسأل عن كل جزء من الرسالة،(على سبيل المثال جسم الرسالة العام علاوة على الملحقات) كل على حدة إذا كنت تريد الجزء ليتم تشفيره.\n"
+#~ "عندما يكون هذا الخيار محددا، سوف تسأل عن كل جزء من الرسالة،(على سبيل "
+#~ "المثال جسم الرسالة العام علاوة على الملحقات) كل على حدة إذا كنت تريد "
+#~ "الجزء ليتم تشفيره.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15343,7 +14937,8 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15362,18 +14957,29 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>تشفير الخوارزميات</h1>\n"
-#~ "الخوارزمية هي وصف للكمبيوتر كيف يجب أن يقوم ببعض المهام. خوارزمية التشفير تصف كيف أن الحاسب يطبق المفتاح خاصتك إلى رسائلك لذلك هذا فقط يستطيع المستلم قراءة الرسالة.\n"
+#~ "الخوارزمية هي وصف للكمبيوتر كيف يجب أن يقوم ببعض المهام. خوارزمية التشفير "
+#~ "تصف كيف أن الحاسب يطبق المفتاح خاصتك إلى رسائلك لذلك هذا فقط يستطيع "
+#~ "المستلم قراءة الرسالة.\n"
 #~ "<p>\n"
-#~ "التحديد لخوارزمية سلسلة التشفير تحدد كم أنه من السهل أو الصعب فك وقراءة الرسالة. كيفما كان، جميع الخوارزميات قدمت في بيئة ال SPHINX تعتبر لتكون آمنة جدا. عامة، الافتراضي سيعمل جيد جدا هنا.\n"
+#~ "التحديد لخوارزمية سلسلة التشفير تحدد كم أنه من السهل أو الصعب فك وقراءة "
+#~ "الرسالة. كيفما كان، جميع الخوارزميات قدمت في بيئة ال SPHINX تعتبر لتكون "
+#~ "آمنة جدا. عامة، الافتراضي سيعمل جيد جدا هنا.\n"
 #~ "<p>\n"
 #~ "هذا الإعداد هو الافتراضي، تستطيع المتابعة لكل رسالة على حدة.\n"
 #~ "</qt>"
@@ -15387,16 +14993,21 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>تدقيق الشهادة يمكنه الإنتهاء بحفظ محلي للشهادة</h1>\n"
-#~ "إذا كان هذا الخيار محددا، التحقق من سلسلة الشهادةتستطيع الإنتهاء مع حفظ محلي للشهادة.\n"
+#~ "إذا كان هذا الخيار محددا، التحقق من سلسلة الشهادةتستطيع الإنتهاء مع حفظ "
+#~ "محلي للشهادة.\n"
 #~ "<p>\n"
-#~ "الشهادات المحلية المحفوظة شهادتك الخاصة كما الشهادات المتقدمة في الإتصالات أعضاء ومؤلفين الشهادة(CAs. )\n"
+#~ "الشهادات المحلية المحفوظة شهادتك الخاصة كما الشهادات المتقدمة في "
+#~ "الإتصالات أعضاء ومؤلفين الشهادة(CAs. )\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15408,12 +15019,15 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>دائما تحقق من مسار الترخيص بالنسبة لجذر الترخيص</h1>\n"
-#~ "إذا كان هذا الخيار في وضع تفعيل، مسار الشهادة يعود إلى شهادة المستلم سيتم التحقق منه دائما بجميع الطرق إلى شهادة الجذر.\n"
+#~ "إذا كان هذا الخيار في وضع تفعيل، مسار الشهادة يعود إلى شهادة المستلم سيتم "
+#~ "التحقق منه دائما بجميع الطرق إلى شهادة الجذر.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15425,14 +15039,17 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>تحقق من مسار الترخيص</h1>\n"
-#~ "إذا كان هذا الخيار بوضع التفعيل، المسار الكامل لشهادة المستلم رفعت للجذر ليتم التحقق منها.\n"
+#~ "إذا كان هذا الخيار بوضع التفعيل، المسار الكامل لشهادة المستلم رفعت للجذر "
+#~ "ليتم التحقق منها.\n"
 #~ "<p>\n"
 #~ "لاحظ أنه ليس من الممكن إلغاء التفعيل للتحقق من شهادة المستلم ذاتيا.\n"
 #~ "</qt>"
@@ -15446,16 +15063,26 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>استخدام قوائم إعادة توظيف الشهادة(CRLs)</h1>\n"
-#~ "قائمة إعادة توظيف الشهادة تحتوي على شهادات تم سحبها ولا يتوجب استخدامها لأهداف تتعلق بالتشفير بعد ذلك.المستخدم يجب أن يحصل على سحب شهادته أو شهادتها لأنه أو لأنها يظن أن تكامل الشهادة قد حل بالتساوي. ( على سبيل المثال. )\n"
+#~ "قائمة إعادة توظيف الشهادة تحتوي على شهادات تم سحبها ولا يتوجب استخدامها "
+#~ "لأهداف تتعلق بالتشفير بعد ذلك.المستخدم يجب أن يحصل على سحب شهادته أو "
+#~ "شهادتها لأنه أو لأنها يظن أن تكامل الشهادة قد حل بالتساوي. ( على سبيل "
+#~ "المثال. )\n"
 #~ "<p>\n"
-#~ "من المستحسن استخدام CRLs لدرجة أمن عالي.في صندوق الحوار للشهادة وإدارة CRLs ،تستطيع أن تحدد ممكان جلب CRLs؟\n"
+#~ "من المستحسن استخدام CRLs لدرجة أمن عالي.في صندوق الحوار للشهادة وإدارة "
+#~ "CRLs ،تستطيع أن تحدد ممكان جلب CRLs؟\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15467,14 +15094,16 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>حذر إذا كان CRL ينتهي في المستقبل القريب</h1>\n"
-#~ "في هذا الحقل تستطيع أن تحدد كم قريبا قبل أن ينتهي CRLلقد تم تحذيرك عن هذا الإنتهاء.\n"
+#~ "في هذا الحقل تستطيع أن تحدد كم قريبا قبل أن ينتهي CRLلقد تم تحذيرك عن هذا "
+#~ "الإنتهاء.\n"
 #~ "<p>\n"
 #~ "الإعداد المفضل لبيئة SPHINX هو سبعة أيام.\n"
 #~ "</qt>"
@@ -15488,16 +15117,20 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>دائما تشفير لذات</h1>\n"
-#~ "إذا حقق هذا الخيار، الرسائل المشفرة التي أرسلت منك ستكون أيضا مشفرة تستخدم المرسل.\n"
+#~ "إذا حقق هذا الخيار، الرسائل المشفرة التي أرسلت منك ستكون أيضا مشفرة "
+#~ "تستخدم المرسل.\n"
 #~ "<p>\n"
-#~ "من المفضل ترك هذا الخيار بوضع التشغيل لتمكينك من قراءة الرسائل التي أرسلتها.\n"
+#~ "من المفضل ترك هذا الخيار بوضع التشغيل لتمكينك من قراءة الرسائل التي "
+#~ "أرسلتها.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15509,16 +15142,21 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>حذر إذا انتهت الشهادة</h1>\n"
-#~ "إذا تم اختيار هذا الخيار، سيتم تحذيرك عندما تحاول استخدام شهادة للتشفير التي انتهت خلال قدر معين من الأيام.\n"
+#~ "إذا تم اختيار هذا الخيار، سيتم تحذيرك عندما تحاول استخدام شهادة للتشفير "
+#~ "التي انتهت خلال قدر معين من الأيام.\n"
 #~ "<p>\n"
-#~ "من المفضل الإبقاء على هذا الخيار مفعلا لتجنب استخدام الشهادات التي تنتهي في المستقبل القريب.\n"
+#~ "من المفضل الإبقاء على هذا الخيار مفعلا لتجنب استخدام الشهادات التي تنتهي "
+#~ "في المستقبل القريب.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15539,8 +15177,27 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "حدد أي من الشهادات تريد إرسالها"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>إرسال شهادات</h1> بدون الشهادة خاصتك، المستلم لن يكون على تحيد ما إذا كنت أنت من أرسل الرسالة أو إذا كانت الرسالة متضمنة على جزء ثالث. <p> المستلم يستطيع الحصول على شهادتك من الخادم الرئيسي، ولكنك أنت كذلك تستطيع تضمين شهادتك في رسالتك. ولك الخيار إذا أردت عدم تضمين لشهادة على الإطلاق، فقط شهادتك الخاصة أو كامل السلسلة من الشهادات التي تصرّح شهادتك الخاصة، متضمنا أو غير متضمنا الشهادة الجذر. <p> من المضل دوما تضمين شهادتك الخاصة على الأقل مع الرسالة.<p> هذا الإعداد إفتراضي، تستطيع تجاهله لكل رسالة على حدة.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>إرسال شهادات</h1> بدون الشهادة خاصتك، المستلم لن يكون على تحيد "
+#~ "ما إذا كنت أنت من أرسل الرسالة أو إذا كانت الرسالة متضمنة على جزء ثالث. "
+#~ "<p> المستلم يستطيع الحصول على شهادتك من الخادم الرئيسي، ولكنك أنت كذلك "
+#~ "تستطيع تضمين شهادتك في رسالتك. ولك الخيار إذا أردت عدم تضمين لشهادة على "
+#~ "الإطلاق، فقط شهادتك الخاصة أو كامل السلسلة من الشهادات التي تصرّح شهادتك "
+#~ "الخاصة، متضمنا أو غير متضمنا الشهادة الجذر. <p> من المضل دوما تضمين "
+#~ "شهادتك الخاصة على الأقل مع الرسالة.<p> هذا الإعداد إفتراضي، تستطيع تجاهله "
+#~ "لكل رسالة على حدة.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "أرسل &شهادتك الخاصة"
@@ -15560,14 +15217,17 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>وقع كل أجزاء الرسالة بشكل افتراضي</h1>\n"
-#~ "إذا كان هذا الخيار محدد، كل أجزاء الرسالة ( على سبيل المثال جسم الرسالة العام وكل الملحقات) موقعة افتراضيا.\n"
+#~ "إذا كان هذا الخيار محدد، كل أجزاء الرسالة ( على سبيل المثال جسم الرسالة "
+#~ "العام وكل الملحقات) موقعة افتراضيا.\n"
 #~ "<p>\n"
 #~ "هذا إعداد افتراضي، تستطيع أن تبقى متجاهلا لكل رسالة على حدة.\n"
 #~ "</qt>"
@@ -15581,12 +15241,16 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>إسأل قبل توقيع أي جزء</h1>\n"
-#~ "إذا كان هذا الخيار محددا، سوف تسأل عن كل جزء من أجزاء الرسالة (على سبيل المثال جسم الرسالة العام علاوة على كل الملحقات) على حدة بغض النظر عمّا إذا كنت تريد الجزء ليوقّع.\n"
+#~ "إذا كان هذا الخيار محددا، سوف تسأل عن كل جزء من أجزاء الرسالة (على سبيل "
+#~ "المثال جسم الرسالة العام علاوة على كل الملحقات) على حدة بغض النظر عمّا إذا "
+#~ "كنت تريد الجزء ليوقّع.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15600,7 +15264,8 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15610,7 +15275,8 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ "ذا التعيين إفتراضي ، و لكن لا يزال بلإمكان تخطيه لكل تعيين شخصي.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "يتم إعداد سند التوقيع على صفحة <em>السندات<em/>."
 
 #~ msgid "RSA + SHA-1"
@@ -15622,18 +15288,29 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>خوارزمية التوقيع</h1>\n"
-#~ "الخوارزمية وصف للحاسب الآلي بكيفية معالجة مهام عديدة. خوارزمية التوقيع تصف كيف أن الحاسب الآلي يطبق مفتاح توقيعك إلى الرسالة لذلك المستلم يستطيع تحديد ما إذا كانت الرسالة واقعيا منك أم لا.\n"
+#~ "الخوارزمية وصف للحاسب الآلي بكيفية معالجة مهام عديدة. خوارزمية التوقيع "
+#~ "تصف كيف أن الحاسب الآلي يطبق مفتاح توقيعك إلى الرسالة لذلك المستلم يستطيع "
+#~ "تحديد ما إذا كانت الرسالة واقعيا منك أم لا.\n"
 #~ "<p>\n"
-#~ "التحديد لسلسلة خوارزميات التوقيع تحدد كم أنه من الصعب أو كم أنه من السهل توقيع رسالة. كيفما كان، جميع الخوارزميات تتوزع في ال SPHINX . عموما، الافتراضي سوف يعمل جيدا هنا.\n"
+#~ "التحديد لسلسلة خوارزميات التوقيع تحدد كم أنه من الصعب أو كم أنه من السهل "
+#~ "توقيع رسالة. كيفما كان، جميع الخوارزميات تتوزع في ال SPHINX . عموما، "
+#~ "الافتراضي سوف يعمل جيدا هنا.\n"
 #~ "<p>\n"
 #~ "هذا الإعداد افتراضي، تستطيع التأكد والمرور عليها لكل رسالة على حدة.\n"
 #~ "</qt>"
@@ -15650,12 +15327,16 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>خزن الرسائل مع التواقيع</h1>\n"
-#~ "عندما يكون هذا الصندوق محددا، أرسل الرسائل المخزنة مع بعضها البعض مع التواقيع مردودة لها. هذا مستحسن، لأنها تعطيك الصلاحية للتحقق فيما بعد إذا وقعت رسالة أو جزء مخصص منها.\n"
+#~ "عندما يكون هذا الصندوق محددا، أرسل الرسائل المخزنة مع بعضها البعض مع "
+#~ "التواقيع مردودة لها. هذا مستحسن، لأنها تعطيك الصلاحية للتحقق فيما بعد إذا "
+#~ "وقعت رسالة أو جزء مخصص منها.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15670,12 +15351,18 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>توقيع الأجزاء المتعددة</h1>\n"
-#~ "عندما يتم تحديد هذا الخيار، التوقيع والبيانات الموقعة ستصبح أجزاء منفصلة عن أجزاء متعددة موقعة من أجزاء الرسالة. بيانات الرسالة الموقعة ستصبح مقروءة حتى عن طريق مستخدم بريد لا يدعم خوارزمية التوقيع ولا تدعم إعادة تشفير ASN.1.  \n"
+#~ "عندما يتم تحديد هذا الخيار، التوقيع والبيانات الموقعة ستصبح أجزاء منفصلة "
+#~ "عن أجزاء متعددة موقعة من أجزاء الرسالة. بيانات الرسالة الموقعة ستصبح "
+#~ "مقروءة حتى عن طريق مستخدم بريد لا يدعم خوارزمية التوقيع ولا تدعم إعادة "
+#~ "تشفير ASN.1.  \n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15687,12 +15374,16 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>رسالة موقعة معتمة</h1>\n"
-#~ "عندما يكون هذا الخيار محددا، كلا التوقيع والبيانات الموقعة ستكون غير مشفرة نحو كتلة ASN.1 واحدة. الرسائل ستكون مقروءة فقط من قبل مستخدم البريد العلاء يدعمون تشفير ASN.1.\n"
+#~ "عندما يكون هذا الخيار محددا، كلا التوقيع والبيانات الموقعة ستكون غير "
+#~ "مشفرة نحو كتلة ASN.1 واحدة. الرسائل ستكون مقروءة فقط من قبل مستخدم البريد "
+#~ "العلاء يدعمون تشفير ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15719,16 +15410,21 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>حذر عندما تنتهي الشهادة</h1>\n"
-#~ "إذا كان هذا الخيار مفعلا، بعدها سيتم تحذيرك عند محاولة استخدام شهادة للتوقيع تنتهي بكمّ معين من الأيام.\n"
+#~ "إذا كان هذا الخيار مفعلا، بعدها سيتم تحذيرك عند محاولة استخدام شهادة "
+#~ "للتوقيع تنتهي بكمّ معين من الأيام.\n"
 #~ "<p>\n"
-#~ "من المستحسن إبقاء هذا الخيار مفعل لتجنب استخدام الشهادات التي تنتهي بالمستقبل القريب.\n"
+#~ "من المستحسن إبقاء هذا الخيار مفعل لتجنب استخدام الشهادات التي تنتهي "
+#~ "بالمستقبل القريب.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15740,14 +15436,16 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>حذر إذا لم يكن موقعو الشهادات في الترخيص</h1>\n"
-#~ "إذا كان هذا الخيار محددا، التحذير فعالا إذا كان عنوان البريد الإلكتروني للموقع غير مضمنة في الشهادة المستخدمة للتوقيع.\n"
+#~ "إذا كان هذا الخيار محددا، التحذير فعالا إذا كان عنوان البريد الإلكتروني "
+#~ "للموقع غير مضمنة في الشهادة المستخدمة للتوقيع.\n"
 #~ "<p>\n"
 #~ "من المفضل ترك هذا الخيار فعال للحد الأعلى للتكامل.\n"
 #~ "</qt>"
@@ -15764,9 +15462,6 @@ msgstr "كتابة فوقية على الملف ؟"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "حفظ في مجلد ال&مسودات"
 
-#~ msgid "Configure KMail"
-#~ msgstr "هيئ KMail"
-
 #, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "افتح بـ..."
diff --git a/tde-i18n-az/messages/tdepim/kmail.po b/tde-i18n-az/messages/tdepim/kmail.po
index cebc1d7a5dd..bb4cc71c119 100644
--- a/tde-i18n-az/messages/tdepim/kmail.po
+++ b/tde-i18n-az/messages/tdepim/kmail.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-03-18 00:20+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mətin Əmirov"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -167,6 +167,11 @@ msgstr ""
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+msgid "Clear"
+msgstr ""
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,9 +253,9 @@ msgstr "&Giriş:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -274,12 +279,12 @@ msgstr ""
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -310,8 +315,9 @@ msgstr ""
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -365,13 +371,15 @@ msgstr ""
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr ""
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr ""
 
@@ -418,9 +426,9 @@ msgstr "&Dəyişdir"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -479,9 +487,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -523,7 +531,7 @@ msgstr "<yoxdur>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 #, fuzzy
 msgid "inbox"
 msgstr "gələn"
@@ -532,28 +540,29 @@ msgstr "gələn"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -562,23 +571,23 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -586,8 +595,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -601,8 +610,7 @@ msgstr ""
 msgid ""
 "_n:  message\n"
 " messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: accountdialog.cpp:1746
 msgid ""
@@ -669,8 +677,8 @@ msgstr "Hesab Əlavə Et"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -711,9 +719,9 @@ msgstr "İmla yoxlaması - KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -786,8 +794,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Təsdiqləmə Göndər"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "&Heç biri"
@@ -922,17 +929,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -968,10 +974,9 @@ msgstr "İsmarıcı Qovluğa Daşı"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -982,8 +987,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -994,8 +999,8 @@ msgstr "Silinən spam ismarışları seçili qovluğa daşı"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -1004,8 +1009,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1096,8 +1101,7 @@ msgstr ""
 msgid ""
 "_n: 1 message of size %1 was archived.\n"
 "%n messages with the total size of %1 were archived."
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: backupjob.cpp:179
 #, c-format
@@ -1207,8 +1211,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1230,8 +1234,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1261,15 +1265,15 @@ msgstr "&Sil"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1299,15 +1303,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr ""
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Hesabı Quraşdır"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 #, fuzzy
 msgid "&Add..."
@@ -1343,6 +1351,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "başlığı çıxart"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Sil"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 #, fuzzy
 msgid "Add..."
@@ -1352,6 +1365,11 @@ msgstr "Əlavə Et..."
 msgid "Modify..."
 msgstr ""
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Sil"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr ""
@@ -1368,17 +1386,15 @@ msgstr ""
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, fuzzy, no-c-format
 msgid "Name"
 msgstr "Ad"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, fuzzy, no-c-format
 msgid "Type"
 msgstr "Növ"
@@ -1403,8 +1419,7 @@ msgstr "Ə&sas olaraq Seç"
 msgid "Common Options"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr ""
@@ -1458,14 +1473,14 @@ msgstr ""
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1485,9 +1500,9 @@ msgstr ""
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr ""
 
@@ -1572,6 +1587,10 @@ msgstr ""
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr ""
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr ""
@@ -1605,8 +1624,7 @@ msgstr ""
 #: configuredialog.cpp:1539
 #, fuzzy
 msgid "Message List - New Messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: configuredialog.cpp:1540
 #, fuzzy
@@ -1621,8 +1639,7 @@ msgstr "&İsmarıc"
 #: configuredialog.cpp:1542
 #, fuzzy
 msgid "Message List - Todo Messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: configuredialog.cpp:1543
 msgid "Message List - Date Field"
@@ -1692,8 +1709,7 @@ msgstr ""
 msgid "Misspelled Words"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "&İsmarıc"
@@ -1888,8 +1904,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1898,40 +1914,33 @@ msgstr ""
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1946,8 +1955,7 @@ msgstr ""
 msgid "Show s&pam status in fancy headers"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1956,8 +1964,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1984,8 +1991,7 @@ msgstr "Avtomatik"
 msgid "&Override character encoding:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr ""
@@ -2092,13 +2098,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2124,23 +2129,22 @@ msgstr ""
 msgid "&Forward:"
 msgstr "&Çatdır:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 #, fuzzy
 msgid "On %D, you wrote:"
 msgstr "%D tarixində siz yazdınız ki:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 #, fuzzy
 msgid "On %D, %F wrote:"
 msgstr "%D tarixində, %F yazdı ki: "
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Çatdırılmış İsmarıc"
@@ -2178,8 +2182,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2217,10 +2221,9 @@ msgstr "Qiymət"
 msgid "Ne&w"
 msgstr "&Yeni"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Ad:"
@@ -2230,16 +2233,15 @@ msgstr "&Ad:"
 msgid "&Value:"
 msgstr "&Mənbə:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2266,13 +2268,13 @@ msgstr ""
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2299,62 +2301,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2372,10 +2368,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2456,8 +2452,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2486,8 +2481,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2511,8 +2506,8 @@ msgstr ""
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2580,16 +2575,14 @@ msgstr ""
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2624,32 +2617,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2719,8 +2707,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2729,8 +2717,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2783,19 +2771,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2808,14 +2795,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2928,17 +2915,16 @@ msgstr "Çatdırılmış"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2955,15 +2941,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3033,8 +3019,8 @@ msgstr ""
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3200,8 +3186,7 @@ msgstr "Zibilə Daşı"
 #: expirypropertiesdialog.cpp:107
 #, fuzzy
 msgid "Delete permanently"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: expirypropertiesdialog.cpp:113
 msgid ""
@@ -3285,6 +3270,11 @@ msgstr "Səs Faylını Seç"
 msgid "Filters"
 msgstr "Süzgəc Qaydaları"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Səs Faylını Seç"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3316,8 +3306,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3334,10 +3324,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3360,10 +3351,10 @@ msgstr "limitsiz"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3372,7 +3363,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr ""
@@ -3414,9 +3405,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3476,8 +3467,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3488,8 +3479,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3515,8 +3505,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3549,7 +3539,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Səs Faylını Seç"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr ""
@@ -3576,9 +3566,9 @@ msgstr "Səs Faylını Seç"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3602,11 +3592,20 @@ msgstr "&Ləğv Et"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 #, fuzzy
 msgid "Unknown"
@@ -3734,39 +3733,13 @@ msgstr "Vəziyyət:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr ""
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr ""
 
 #: identitydialog.cpp:93
@@ -3779,12 +3752,9 @@ msgstr ""
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3794,11 +3764,9 @@ msgstr "Qu&ruluş:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3807,14 +3775,11 @@ msgstr ""
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3824,21 +3789,12 @@ msgstr "Epoçt Ünvanı"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3862,12 +3818,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3881,20 +3836,18 @@ msgstr "Enkripsiya"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3913,11 +3866,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3930,18 +3882,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3964,14 +3915,12 @@ msgstr ""
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3980,15 +3929,12 @@ msgstr ""
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -4029,7 +3975,7 @@ msgstr ""
 msgid "&Picture"
 msgstr ""
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr ""
 
@@ -4047,8 +3993,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4097,8 +4043,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr ""
 
@@ -4149,14 +4095,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4195,14 +4141,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Xəta : %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4303,8 +4254,7 @@ msgstr ""
 msgid ""
 "_n: 1 message was imported.\n"
 "%n messages were imported."
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: importjob.cpp:83
 #, fuzzy
@@ -4357,14 +4307,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4392,136 +4342,110 @@ msgstr "Enkripsiya"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4536,136 +4460,110 @@ msgstr "Vəsiqə"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4678,9 +4576,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4706,26 +4605,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4736,8 +4635,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4760,8 +4659,8 @@ msgstr "Cərgə Yeri"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4781,8 +4680,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4818,11 +4717,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4864,10 +4763,8 @@ msgstr ""
 
 #: kmaccount.cpp:277
 #, fuzzy
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgid "Failed to add message:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -4956,6 +4853,54 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr ""
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr "CC: -ni -address-ə göndər."
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "CC: -ni -address-ə göndər."
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr ""
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr ""
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr ""
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr ""
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 #, fuzzy
 msgid "Mail"
@@ -5012,9 +4957,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5067,11 +5012,11 @@ msgstr "URL ara yaddaşa köçürüldü."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr ""
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 #, fuzzy
 msgid "&Replace"
 msgstr "&Dəyişdir"
@@ -5091,7 +5036,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 #, fuzzy
 msgid ""
 "File %1 exists.\n"
@@ -5108,224 +5053,223 @@ msgstr "&İsmarıc"
 #: kmcommands.cpp:1047 kmcommands.cpp:1075
 #, fuzzy
 msgid "The file does not contain a message."
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "&İsmarıc"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "&İsmarıc"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr ""
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr ""
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr ""
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "&İsmarıc"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "&İsmarıc"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 #, fuzzy
 msgid "Opening URL..."
 msgstr "URL açılır..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "əmri icra et"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr ""
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Əlavə Açılsın?"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr ""
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Enkripsiya"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Şifrələ"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "İmzalar"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr ""
 "Fayla yazıla bilmir:\n"
 "%1"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "KMail"
@@ -5361,8 +5305,7 @@ msgstr ""
 #: kmcomposewin.cpp:295
 #, fuzzy
 msgid "Set a subject for this message"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmcomposewin.cpp:297
 #, fuzzy
@@ -5432,7 +5375,7 @@ msgstr "Böyüklük"
 msgid "Encoding"
 msgstr "Dönüşdürülür"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "Editor"
@@ -5447,7 +5390,7 @@ msgstr "Şifrələ"
 msgid "Sign"
 msgstr "İmzala"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "Əlavə Açılsın?"
@@ -5469,7 +5412,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5479,9 +5423,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5490,9 +5434,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5505,7 +5448,7 @@ msgstr "&Sendmail"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 #, fuzzy
 msgid "Send &Later"
@@ -5579,8 +5522,7 @@ msgstr ""
 msgid "Cl&ean Spaces"
 msgstr "&Boşluqları Təmizlə "
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr ""
@@ -5736,31 +5678,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr ""
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5869,8 +5811,8 @@ msgstr "Editor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5878,21 +5820,20 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr ""
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr ""
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
@@ -5900,12 +5841,16 @@ msgstr ""
 msgid "Attach File"
 msgstr "Fayl İlişdir"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, fuzzy, no-c-format
 msgid "&Attach"
 msgstr "İliş&dir"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Fayl Əlavə Et"
+
 #: kmcomposewin.cpp:2959
 #, fuzzy
 msgid "Insert File"
@@ -5913,9 +5858,8 @@ msgstr "Fayl Əlavə Et"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5956,293 +5900,303 @@ msgid ""
 "View"
 msgstr ""
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Düzəlt..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Düzəlt..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Fərqli Qeyd Et..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Xassələr"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr ""
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr ""
 "Fayla yazıla bilmir:\n"
 "%1"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "&Bip"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr ""
 "Fayla yazıla bilmir:\n"
 "%1"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr ""
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Əlavə Açılsın?"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Əlavə Açılsın?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 #, fuzzy
 msgid "unnamed"
 msgstr "adsız"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "To: qismində ən az bir alıcı müəyyənləşdirməlisiniz."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Bir mövzu müəyyənləşdirmədiniz. İsmarıc yenə də göndərilsin?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr ""
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 #, fuzzy
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Bir mövzu müəyyənləşdirmədiniz. İsmarıc yenə də göndərilsin?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr ""
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr ""
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr ""
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 #, fuzzy
 msgid "&Keep markup, do not encrypt"
 msgstr "Şifrələ"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Kodlanmış İsmarıc"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Kodlanmış İsmarıc"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 #, fuzzy
 msgid "About to send email..."
 msgstr "E-poçt göndərmək haqqında..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 #, fuzzy
 msgid "Send Confirmation"
 msgstr "Təsdiqləmə Göndər"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr ""
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Alındı: "
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Alındı: "
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "İmla Yoxlayıcı"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "İmla Yoxlayıcı"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr ""
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr ""
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr ""
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 #, fuzzy
 msgid "Spellchecker"
 msgstr "İmla Yoxlayıcı"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "&İsmarıc"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "&İsmarıc"
@@ -6291,8 +6245,8 @@ msgstr "İmla yoxlaması - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6326,9 +6280,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6574,106 +6527,89 @@ msgstr ""
 #: kmfilterdlg.cpp:55
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6686,6 +6622,16 @@ msgstr ""
 msgid "Filter Rules"
 msgstr "Süzgəc Qaydaları"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "İ&dxal Et"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "İ&dxal Et"
+
 #: kmfilterdlg.cpp:155
 #, fuzzy
 msgid "Available Filters"
@@ -6773,6 +6719,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr ""
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Bir yer&ə"
+
 #: kmfilterdlg.cpp:612
 #, fuzzy
 msgid "Up"
@@ -6783,17 +6734,29 @@ msgstr "Yuxarı"
 msgid "Down"
 msgstr "Aşağı"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 #, fuzzy
 msgid "Rename..."
 msgstr "Yenidən adlandır..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, fuzzy, no-c-format
 msgid "New"
 msgstr "Yeni"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+msgid "Copy"
+msgstr ""
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "&Sil"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6802,8 +6765,8 @@ msgstr "Səs Faylını Seç"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6876,19 +6839,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6925,8 +6885,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6961,8 +6921,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7027,8 +6987,7 @@ msgstr ""
 msgid ""
 "_n: Retrieving one new message\n"
 "Retrieving %n new messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
@@ -7103,10 +7062,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7128,9 +7085,8 @@ msgstr "Qovluqlarda Axtar"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7139,14 +7095,14 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7162,11 +7118,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7175,15 +7131,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Zibilə Daşı"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -7197,8 +7158,7 @@ msgstr "İsmarıcı Qovluğa Daşı"
 msgid "Permissions (ACL)"
 msgstr "Oxumuş"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, fuzzy, no-c-format
 msgid "General"
 msgstr "Ümumi"
@@ -7223,8 +7183,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr ""
@@ -7243,14 +7202,13 @@ msgstr ""
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7263,9 +7221,9 @@ msgstr ""
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7276,17 +7234,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Ə&sas olaraq Seç"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, fuzzy, no-c-format
 msgid "Sender"
 msgstr "Göndərən"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, fuzzy, no-c-format
 msgid "Receiver"
 msgstr "Alıcı"
@@ -7298,11 +7260,11 @@ msgstr "kimliyi qur"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7322,12 +7284,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7359,17 +7321,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7459,7 +7421,8 @@ msgstr ""
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7483,8 +7446,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7529,13 +7492,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7592,13 +7553,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7606,8 +7567,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7617,7 +7578,7 @@ msgstr ""
 "Fayl oxuna bilmir:\n"
 "%1"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 #, fuzzy
 msgid ""
 "Cannot create file `%1' in %2.\n"
@@ -7721,9 +7682,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7864,23 +7825,21 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
 #, fuzzy
 msgid "Delete Messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmheaders.cpp:1600
 #, fuzzy
 msgid "Delete Message"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmheaders.cpp:1624
 msgid "Messages deleted successfully."
@@ -7925,128 +7884,127 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr ""
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr ""
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 #, fuzzy
 msgid "trash"
 msgstr "zibil"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr ""
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Dəyişdir"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 "Faylı oxuna səlahiyyətinə sahbid deyilsiniz:\n"
 "%1"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr ""
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8054,12 +8012,12 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 #, fuzzy
 msgid "Empty Trash"
 msgstr "Zibili Boşalt"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
@@ -8138,8 +8096,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -8178,8 +8135,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1173
@@ -8205,8 +8162,8 @@ msgstr "Alındı: "
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -8219,29 +8176,32 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "&Sil"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8254,9 +8214,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8271,8 +8231,8 @@ msgstr ""
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8291,8 +8251,8 @@ msgstr "%1 Məktublaşma Qrupunda süz..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8308,7 +8268,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8372,8 +8333,7 @@ msgstr ""
 #: kmmainwidget.cpp:2696
 #, fuzzy
 msgid "Send Queued Messages Via"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmmainwidget.cpp:2707
 msgid "&Address Book..."
@@ -8523,8 +8483,7 @@ msgstr "<ismarıc>"
 #: kmmainwidget.cpp:2843
 #, fuzzy
 msgid "Paste Messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmmainwidget.cpp:2847
 msgid "&New Message..."
@@ -8653,8 +8612,7 @@ msgstr ""
 msgid "Appl&y All Filters"
 msgstr "Mövcud Süzgəclər"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr ""
@@ -8767,7 +8725,6 @@ msgstr ""
 msgid "Go to the next unread message"
 msgstr ""
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr ""
@@ -8908,25 +8865,25 @@ msgstr " Başladılır..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8934,8 +8891,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8943,8 +8900,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8975,16 +8932,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Alındı: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr ""
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr ""
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9035,29 +8992,26 @@ msgstr "İsmarıc Qismi Xüsusiyyətləi"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9067,11 +9021,10 @@ msgstr "&İzahat:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9080,14 +9033,13 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9096,13 +9048,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9111,9 +9061,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -9123,9 +9072,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -9140,11 +9088,9 @@ msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9397,15 +9343,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9414,18 +9359,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9435,14 +9379,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr ""
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9482,7 +9425,8 @@ msgstr ""
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9509,12 +9453,14 @@ msgstr "Əlavə Açılsın?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9537,11 +9483,71 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "Hazır."
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr ""
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "&Sil"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "&Dəyişdir"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "İ&rəli"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "&Sorğu"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "&Göndər"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr ""
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "nəzərə alınmadı"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Kimə: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "Əlavə Açılsın?"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmsearchpatternedit.cpp:35
 #, fuzzy
@@ -9627,17 +9633,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9663,8 +9669,8 @@ msgstr "Göndərmə əməliyyatı başlayır..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9690,8 +9696,9 @@ msgstr "Növbədəki (bə'zi) ismarıclar yollana bilmədi."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9702,13 +9709,11 @@ msgstr ""
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9727,8 +9732,9 @@ msgstr ""
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9762,30 +9768,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9797,6 +9803,10 @@ msgstr "Vəziyyət:"
 msgid "Exit"
 msgstr ""
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -9805,8 +9815,7 @@ msgstr "&İsmarıc"
 #: kmsystemtray.cpp:567
 #, fuzzy
 msgid "There are no unread messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: kmsystemtray.cpp:569
 #, c-format
@@ -9825,8 +9834,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9908,8 +9918,8 @@ msgstr ""
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9930,10 +9940,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9964,8 +9973,8 @@ msgstr "Sadəcə olaraq yerli fayllara icazə var."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9981,10 +9990,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10221,22 +10230,18 @@ msgstr ""
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10247,8 +10252,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10263,14 +10268,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10369,8 +10374,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10404,8 +10409,9 @@ msgstr "Şifrələ"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10415,8 +10421,8 @@ msgstr ""
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10437,70 +10443,68 @@ msgstr ""
 msgid "Unencrypted Message Warning"
 msgstr "Kodlanmış İsmarıc"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr ""
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10523,10 +10527,10 @@ msgstr ""
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10537,8 +10541,8 @@ msgstr "Cərgə Yeri"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10577,8 +10581,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 #, fuzzy
 msgid "Status: "
 msgstr "Vəziyyət:"
@@ -10609,8 +10612,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10625,8 +10628,7 @@ msgstr "&İsmarıc"
 #: objecttreeparser.cpp:760
 #, fuzzy
 msgid "Decrypt Message"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 msgid "Encrypted data not shown."
@@ -10647,18 +10649,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10906,8 +10908,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -11025,10 +11027,11 @@ msgstr "Kioslave Xəta İsmarıcı"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11045,7 +11048,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -11063,1644 +11067,12 @@ msgstr ""
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "&Go"
-msgstr "&Get"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, fuzzy, no-c-format
-msgid "F&older"
-msgstr "Qovl&uq"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, fuzzy, no-c-format
-msgid "&Message"
-msgstr "&İsmarıc"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, fuzzy, no-c-format
-msgid "&Forward"
-msgstr "İ&rəli"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "İmzala"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Enkripsiya"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Alıcı:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, no-c-format
-msgid "CC:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Ümumi"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "Cavab ver: "
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Cavab ver: "
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "İ&rəli"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Dəyişdir"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, fuzzy, no-c-format
-msgid "Day(s)"
-msgstr "Gün"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Advanced"
-msgstr "Ətraflı"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "kimliyi qur"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Vəsiqə"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Vəsiqə"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Vəsiqə"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Vəsiqə"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Əlavə Et..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "limitsiz"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Təsdiqləmə Göndər"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Cavab ver: "
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Cavab ver: "
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Çatdırılmış İsmarıc"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "Cərgə Yeri"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Enkripsiya"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, fuzzy, no-c-format
-msgid " days"
-msgstr " gün"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Vəsiqə"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Cərgə Yeri"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Dəyişdir"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Dəyişdir"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, no-c-format
-msgid "Remove the signature when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "İsmarıcı yollayan müəyyənləşdirilə bilmədi"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "İsmarıcı Qovluğa Daşı"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12815,6 +11187,11 @@ msgstr "Hesab Əlavə Et"
 msgid "Add as BCC"
 msgstr "Hesab Əlavə Et"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Ləğv Et"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12831,10 +11208,10 @@ msgstr "Alındı: "
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12852,8 +11229,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12975,10 +11352,19 @@ msgstr "böyükdür və ya bərabərdir"
 msgid " bytes"
 msgstr ""
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, fuzzy, no-c-format
+msgid " days"
+msgstr " gün"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13056,8 +11442,7 @@ msgstr ""
 msgid ""
 "_n: %n message searched\n"
 "%n messages searched"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: searchwindow.cpp:419
 #, fuzzy
@@ -13085,8 +11470,7 @@ msgstr ""
 msgid ""
 "_n: %n message\n"
 "%n messages"
-msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
 
 #: searchwindow.cpp:429
 #, c-format
@@ -13126,13 +11510,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13150,8 +11532,7 @@ msgid ""
 msgstr "Hesab növü: Imap Hesabı"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13169,8 +11550,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13180,8 +11560,7 @@ msgstr "İşlədilə bilməz."
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Mövcud Süzgəclər"
 
 #: sievedebugdialog.cpp:358
@@ -13250,8 +11629,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13271,17 +11650,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr ""
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr ""
@@ -13317,6 +11701,10 @@ msgstr "Hesab əlavə et"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+msgid "&Apply"
+msgstr ""
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13331,6 +11719,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Düzəlt..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13370,9 +11762,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13408,6 +11800,16 @@ msgstr "Şifrələ"
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Alıcı:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, no-c-format
+msgid "CC:"
+msgstr ""
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13439,36 +11841,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13702,6 +12100,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -13739,76 +12141,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13874,6 +12206,16 @@ msgstr ""
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "Fayl Əlavə Et"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13975,9 +12317,9 @@ msgstr "&İsmarıc"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14007,9 +12349,9 @@ msgstr "Səs Faylını Seç"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14018,15 +12360,15 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14035,8 +12377,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14052,144 +12394,1509 @@ msgstr ""
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "İmzala"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Enkripsiya"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr "CC: -ni -address-ə göndər."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr "CC: -ni -address-ə göndər."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
 msgstr ""
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
 msgstr ""
-"Bu ismarıc əlavə edilə bilmədi:\n"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
 msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "Hazır."
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "&Sil"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Ümumi"
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "Cavab ver: "
+
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Cavab ver: "
+
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "İ&rəli"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr ""
+
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
 msgstr "&Dəyişdir"
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Cərgə Yeri"
+
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Dəyişdir"
+
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Dəyişdir"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr ""
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr ""
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr ""
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, fuzzy, no-c-format
+msgid "Day(s)"
+msgstr "Gün"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:451
+#, fuzzy, no-c-format
+msgid "Advanced"
+msgstr "Ətraflı"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "kimliyi qur"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr ""
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr ""
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr ""
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, no-c-format
+msgid "Remove the signature when replying"
+msgstr ""
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "İsmarıcı yollayan müəyyənləşdirilə bilmədi"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr ""
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Bu ismarıc əlavə edilə bilmədi:\n"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "İsmarıcı Qovluğa Daşı"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, no-c-format
+msgid "&File"
+msgstr ""
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Düzəlt..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, fuzzy, no-c-format
+msgid "&Go"
+msgstr "&Get"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, fuzzy, no-c-format
+msgid "F&older"
+msgstr "Qovl&uq"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, fuzzy, no-c-format
+msgid "&Message"
+msgstr "&İsmarıc"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, fuzzy, no-c-format
+msgid "&Forward"
 msgstr "İ&rəli"
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "&Sorğu"
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "&Göndər"
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, no-c-format
+msgid "&Settings"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
 msgstr ""
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "nəzərə alınmadı"
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Ümumi Qurğular"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
 msgstr ""
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "Kimə: "
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "Əlavə Açılsın?"
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
 msgstr ""
 
-#: util.h:208
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
 msgstr ""
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "Fayl Əlavə Et"
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Vəsiqə"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Vəsiqə"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Vəsiqə"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Vəsiqə"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Əlavə Et..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr ""
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr ""
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "limitsiz"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Təsdiqləmə Göndər"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Cavab ver: "
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Cavab ver: "
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Çatdırılmış İsmarıc"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "Cərgə Yeri"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Enkripsiya"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Vəsiqə"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Todo"
diff --git a/tde-i18n-be/messages/tdepim/kmail.po b/tde-i18n-be/messages/tdepim/kmail.po
index 4864343aeb6..bf67b914cb2 100644
--- a/tde-i18n-be/messages/tdepim/kmail.po
+++ b/tde-i18n-be/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-02-03 01:09+0100\n"
 "Last-Translator: Siarhei Liantsevich <serzh.by@gmail.com>\n"
 "Language-Team: Belarusian\n"
@@ -21,13 +21,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Eugene Zelenko,Дарафей Праляскоўскі, Сяржук Лянцэвіч"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -171,6 +171,12 @@ msgstr ""
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Ачысціць тэ&кст"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -246,9 +252,9 @@ msgstr "&Імя карыстальніка:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -270,12 +276,12 @@ msgstr "Зах&оўваць пароль POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -305,8 +311,9 @@ msgstr ""
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -356,13 +363,15 @@ msgstr "Ачысціць тэ&кст"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -405,9 +414,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -465,9 +474,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -506,7 +515,7 @@ msgstr "<няма>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Уваходныя"
 
@@ -514,28 +523,29 @@ msgstr "Уваходныя"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -544,23 +554,23 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -568,8 +578,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -646,8 +656,8 @@ msgstr "IMAP рахунак"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -684,9 +694,9 @@ msgstr "Запрашаем у KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -749,8 +759,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Інфармацыя аб серверы"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Няма"
@@ -886,17 +895,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -932,10 +940,9 @@ msgstr "Перанесці магчымы спам у:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -946,8 +953,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -957,8 +964,8 @@ msgstr ""
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -967,8 +974,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1159,8 +1166,8 @@ msgstr "Немагчыма прачытаць тэчку %1 на серверы:
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1180,8 +1187,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1211,15 +1218,15 @@ msgstr "Выдаленае"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1249,15 +1256,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Загрузіць профіль..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Наставіць KMail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Дадаць..."
@@ -1287,6 +1298,11 @@ msgstr "<qt>Вы сапраўды жадаеце выдаліць увасабл
 msgid "Remove Identity"
 msgstr "Выдаліць увасабленне"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "В&ыдаліць"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Дадаць..."
@@ -1295,6 +1311,11 @@ msgstr "Дадаць..."
 msgid "Modify..."
 msgstr "Змяніць..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "В&ыдаліць"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Зрабіць прадвызначаным"
@@ -1311,17 +1332,15 @@ msgstr "&Адпраўка"
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Назва"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Тып"
@@ -1343,8 +1362,7 @@ msgstr ""
 msgid "Common Options"
 msgstr "Агульныя параметры"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr ""
@@ -1395,14 +1413,14 @@ msgstr ""
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1420,9 +1438,9 @@ msgstr "Дадаць транспарт"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (па змаўчанні)"
 
@@ -1501,6 +1519,10 @@ msgstr "Змяніць рахунак"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Немагчыма знайсці рахунак <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Колер&ы"
@@ -1609,8 +1631,7 @@ msgstr "Наведаная спасылка"
 msgid "Misspelled Words"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Новае паведамленне"
@@ -1801,8 +1822,8 @@ msgstr "Па змаўчанні тэмы згорнутыя"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1811,40 +1832,33 @@ msgstr ""
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1859,8 +1873,7 @@ msgstr "Паказваць радок стат&усу HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1869,8 +1882,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1898,8 +1910,7 @@ msgstr "Аўтаматычна"
 msgid "&Override character encoding:"
 msgstr "Зьмяніць кадзіроўку"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr ""
@@ -2002,13 +2013,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2032,21 +2042,20 @@ msgstr "Адказаць &усім:"
 msgid "&Forward:"
 msgstr "&Пераслаць:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Перасланае паведамленне"
 
@@ -2082,8 +2091,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2118,10 +2127,9 @@ msgstr "Значэнне"
 msgid "Ne&w"
 msgstr "Но&вае"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Імя:"
@@ -2130,16 +2138,15 @@ msgstr "&Імя:"
 msgid "&Value:"
 msgstr "&Значэнне:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2166,13 +2173,13 @@ msgstr "далучаны"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2197,62 +2204,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2269,10 +2270,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2352,8 +2353,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2382,8 +2382,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2407,8 +2407,8 @@ msgstr ""
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2475,16 +2475,14 @@ msgstr "Тэчкі (фармат \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2519,32 +2517,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2612,8 +2605,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2623,8 +2616,8 @@ msgstr "Тэчкі &рэсурсаў знаходзяцца ў рахунку:"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2677,19 +2670,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2702,14 +2694,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2818,17 +2810,16 @@ msgstr "&Пераслаць"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2846,15 +2837,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2924,8 +2915,8 @@ msgstr "Рэдагаваць увасабленне"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3188,6 +3179,11 @@ msgstr "Выбраць тэчку"
 msgid "Filters"
 msgstr "Фільтар %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Пазначыць &усе паведамленні"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3219,8 +3215,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3237,10 +3233,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3261,10 +3258,10 @@ msgstr "неабмежаваны"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3273,7 +3270,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Памылка KMail"
@@ -3314,9 +3311,9 @@ msgstr "Ідэнтыфікатар &карыстальніка:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3366,8 +3363,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3378,8 +3375,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3405,8 +3401,8 @@ msgstr "Дадаць правы доступу"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3436,7 +3432,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Выбраць тэчку"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
@@ -3462,9 +3458,9 @@ msgstr "Каро&ткі спіс тэчак"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3485,11 +3481,20 @@ msgstr "&Адмяніць"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Невядомы"
@@ -3608,79 +3613,18 @@ msgstr "Статус спама:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>п"
-"<br>а"
-"<br>в"
-"<br>е"
-"<br>д"
-"<br>а"
-"<br>м"
-"<br>л"
-"<br>е"
-"<br>н"
-"<br>н"
-"<br>е</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> "
+"<br>п<br>а<br>в<br>е<br>д<br>а<br>м<br>л<br>е<br>н<br>н<br>е</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>Н"
-"<br>е"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>п"
-"<br>а"
-"<br>в"
-"<br>е"
-"<br>д"
-"<br>а"
-"<br>м"
-"<br>л"
-"<br>е"
-"<br>н"
-"<br>н"
-"<br>е</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>Н<br>е<br> <br>H<br>T<br>M<br>L<br> "
+"<br>п<br>а<br>в<br>е<br>д<br>а<br>м<br>л<br>е<br>н<br>н<br>е</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3692,12 +3636,9 @@ msgstr "&Ваша імя:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3706,11 +3647,9 @@ msgstr "Устано&ва:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3719,14 +3658,11 @@ msgstr "&Адрас электроннай пошты:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3736,21 +3672,12 @@ msgstr "&Адрас электроннай пошты:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3773,12 +3700,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3791,20 +3717,18 @@ msgstr "Ваш ключ OpenPGP для шыфравання"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3823,11 +3747,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3840,18 +3763,17 @@ msgstr "Ваш сертыфікат S/MIME для шыфравання"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3872,14 +3794,12 @@ msgstr "Адрас для &адказу:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3888,15 +3808,12 @@ msgstr ""
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3936,7 +3853,7 @@ msgstr "&Подпіс"
 msgid "&Picture"
 msgstr "&Выява"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Некарэктны адрас электроннай пошты"
 
@@ -3955,8 +3872,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4005,8 +3922,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (па змаўчанні)"
 
@@ -4051,14 +3968,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4096,14 +4013,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Памылка: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4253,14 +4175,14 @@ msgstr "Архівы спісу"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4288,136 +4210,110 @@ msgstr "Ваш ключ OpenPGP для шыфравання"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4432,136 +4328,110 @@ msgstr "Сертыфікат S/MIME для подпісу:"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4574,9 +4444,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4602,26 +4473,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4632,8 +4503,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4656,8 +4527,8 @@ msgstr "Для падпісання"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4677,8 +4548,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4714,11 +4585,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4758,10 +4629,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr ""
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Немагчыма дадаць паведамленне:\n"
+msgid "Failed to add message:\n"
+msgstr "Немагчыма дадаць паведамленне:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -4853,6 +4722,50 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr ""
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr ""
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Дадаць 'загаловак' да паведамлення"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Прачытаць цела паведамлення з 'файла'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr ""
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr ""
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr ""
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Пошта"
@@ -4906,9 +4819,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4955,11 +4868,11 @@ msgstr "URL скапіяваны ў буфер абмену."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Файл <b>%1</b> існуе.<br>Вы жадаеце яго замяніць?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Захаваць у файле"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Замяніць"
 
@@ -4977,7 +4890,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4997,124 +4910,124 @@ msgstr "Файл не змяшчае паведамлення."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Выдаленне паведамленняў"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Выдаленне паведамленняў"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr ""
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Перанесці ў гэтую тэчку"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Капіяваць у гэтую тэчку"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Перанос паведамленняў"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Выдаленне паведамленняў"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr ""
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Вы сапраўды жадаеце выканаць <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Выканаць"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr ""
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Захаваць далучэнні ў"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "далучэнне.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "далучэнне.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Файл ужо існуе"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Перазапісаць"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Пытанне KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Шыфраваньне"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "&Не зашыфроўваць"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Захаваць подпіс"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5123,85 +5036,85 @@ msgstr ""
 "Немагчыма запісаць у файл %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Немагчыма запісаць у файл %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Выбар ключа расшыфравання Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Пошта"
@@ -5298,7 +5211,7 @@ msgstr "Памер"
 msgid "Encoding"
 msgstr "Знаказбор"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr ""
 
@@ -5310,7 +5223,7 @@ msgstr "Зашыфраваць"
 msgid "Sign"
 msgstr "Падпісаць"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Назва далучэння:"
 
@@ -5332,7 +5245,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5342,9 +5256,9 @@ msgstr "Дадатковыя адрасаты"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5353,9 +5267,8 @@ msgstr "Схаваныя адрасаты"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5366,7 +5279,7 @@ msgstr "&Адаслаць пошту"
 msgid "&Send Mail Via"
 msgstr "&Адаслаць пошту праз"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Даслаць &пазней"
@@ -5437,8 +5350,7 @@ msgstr "Вы&даліць сымбалі цытавання"
 msgid "Cl&ean Spaces"
 msgstr "Ач&ысціць прагалы"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr ""
@@ -5580,31 +5492,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандартны"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5708,8 +5620,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5717,42 +5629,44 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Напамін аб далучэнні файла"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Даслаць як ёсць"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Далучыць файл"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Далучыць"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Уставіць файл"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Уставіць файл"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5792,276 +5706,288 @@ msgid ""
 "View"
 msgstr "Паказаць"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Рэдагаваць..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Рэдагаваць скрыпт..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Захаваць &як..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Уласцівасці"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Дадаць далучэнне..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Немагчыма запісаць у файл %1."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Пакінуць"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Немагчыма запісаць у файл %1."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Захаваць далучэнне як"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Дадаць як тэкст"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Дадаць як далучэнне"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Зьмяшчае далучэнне"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "безназоўны"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Імя не ўказаная"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Тэма не ўказаная"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Д&аслаць як ёсць"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Указаць тэму"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Падпісаць/зашыфраваць паведамленне?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Калі ласка, стварыце рахунак для адпраўкі і паспрабуйце зноў."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr ""
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Даслаць пацверджанне"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Даслаць зараз"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<адрасаты>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Дадатковыя адрасаты"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Праверка правапісу"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Праверка правапісу"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr ""
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr ""
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Праверка правапісу скончаная."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Праверка правапісу"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Ключы Chiasmus не знойдзены"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Выбар ключа шыфравання Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Паведамленне падпісана %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Паведамленне падпісана %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP паведамленне - зашыфраванае"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Паведамленні з тэмай: "
@@ -6109,8 +6035,8 @@ msgstr "Праверка правапісу - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6144,9 +6070,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6364,102 +6289,86 @@ msgstr "Прайграваць гук"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6471,6 +6380,16 @@ msgstr "Правілы фільтру POP3"
 msgid "Filter Rules"
 msgstr "Правілы фільтру"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Імпартаваць"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Імпартаваць"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Даступныя фільтры"
@@ -6552,6 +6471,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "Значка для гэтай тэчкі:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Каму"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Уверх"
@@ -6560,16 +6484,29 @@ msgstr "Уверх"
 msgid "Down"
 msgstr "Уніз"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Перайменаваць..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Новы"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Капіяваць у"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Выдаленае"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6578,8 +6515,8 @@ msgstr "Каро&ткі спіс тэчак"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6651,19 +6588,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6702,8 +6636,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6737,8 +6671,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6866,10 +6800,8 @@ msgstr "Стварэнне падтэчак на серверы"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -6891,9 +6823,8 @@ msgstr "Выдаленне тэчак з сервера"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -6903,14 +6834,14 @@ msgstr "Перарванае"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6923,11 +6854,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6936,15 +6867,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Перанесці ў:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "Не змяняць"
@@ -6957,8 +6893,7 @@ msgstr "Перанесці паведамленні ў тэчку"
 msgid "Permissions (ACL)"
 msgstr "Правы доступу (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Агульныя"
@@ -6983,8 +6918,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr ""
@@ -7003,14 +6937,13 @@ msgstr ""
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7023,9 +6956,9 @@ msgstr ""
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7036,17 +6969,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Паказваць калонку:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Зрабіць прадвызначаным"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Адпраўнік"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, fuzzy, no-c-format
 msgid "Receiver"
 msgstr "Прыём"
@@ -7058,11 +6995,11 @@ msgstr "Новае ўвасабленне"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7081,12 +7018,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7119,17 +7056,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7200,7 +7137,8 @@ msgstr ""
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7224,8 +7162,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7264,13 +7202,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7326,13 +7262,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7340,8 +7276,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7349,7 +7285,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Немагчыма стварыць тэчку"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7448,9 +7384,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7586,10 +7522,10 @@ msgstr "%1 Тэчка даступная толькі для чытання."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7642,123 +7578,122 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Зыходныя"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Дасланыя"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Сметнік"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Чарнавікі"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Апошні пошук"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7766,11 +7701,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Ачысцiць сметнік"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Вы ўпэўнены ў тым, што жадаеце ачысцiць тэчкі сметнікаў для ўсіх рахункаў?"
@@ -7853,8 +7788,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -7892,11 +7826,11 @@ msgstr "Вы ўпэўнены ў тым, што жадаеце ачысцiць �
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Вы ўпэўнены ў тым, што жадаеце перанесці ўсе паведамленні з тэчкі <b>%1</b> "
-"у сметнік?</qt>"
+"<qt>Вы ўпэўнены ў тым, што жадаеце перанесці ўсе паведамленні з тэчкі <b>%1</"
+"b> у сметнік?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -7920,8 +7854,8 @@ msgstr "Выдаліць пошук"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7935,29 +7869,32 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Выдаленае"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -7970,9 +7907,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -7986,8 +7923,8 @@ msgstr ""
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8004,8 +7941,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8021,7 +7958,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8355,8 +8293,7 @@ msgstr "Захаваць &далучэнні..."
 msgid "Appl&y All Filters"
 msgstr "Ужы&ць усе фільтры"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "У&жыць фільтр"
@@ -8469,7 +8406,6 @@ msgstr "Наступнага &непрачытанага паведамленн�
 msgid "Go to the next unread message"
 msgstr "Перайсці да наступнага непрачытанага паведамлення"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Папярэдняга паведамлення"
@@ -8607,25 +8543,25 @@ msgstr ""
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8633,8 +8569,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8642,8 +8578,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8672,16 +8608,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Квітанцыя: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Далучэнне: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr ""
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8731,29 +8667,26 @@ msgstr "Уласціваcці часткі паведамлення"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8762,11 +8695,10 @@ msgstr "&Апісанне:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8775,14 +8707,13 @@ msgstr "&Знаказбор:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8791,13 +8722,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8806,9 +8735,8 @@ msgstr "&Падпісаць гэтую частку"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8818,9 +8746,8 @@ msgstr "зашы&фраваць гэтую частку"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8835,11 +8762,9 @@ msgstr "POP фільтр"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9090,15 +9015,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9107,18 +9031,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9128,15 +9051,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9176,7 +9097,8 @@ msgstr "Паказаць далучэнне: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9200,12 +9122,14 @@ msgstr "Адкрыць далучэнне?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9227,6 +9151,58 @@ msgstr "(адпавядае любым з наступных)"
 msgid "(match all of the following)"
 msgstr "(адпавядае ўсім з наступных)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Прачытанае"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Старое"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Выдаленае"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Есць адказ"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Перасланае"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "У чарзе"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Дасланае"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Назіраемае"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ігнараванае"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Спам"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Не спам"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Заданне"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Змяшчае далучэнне"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9307,17 +9283,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9341,8 +9317,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9367,8 +9343,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9379,13 +9356,11 @@ msgstr "Адпраўка перапыненая."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9404,8 +9379,9 @@ msgstr "&Перапыніць адпраўку"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9439,30 +9415,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9474,6 +9450,10 @@ msgstr ""
 msgid "Exit"
 msgstr "Выхад"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Новыя паведамленні ў"
@@ -9498,8 +9478,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9576,8 +9557,8 @@ msgstr "Сервер &патрабуе ідэнтыфікацыю"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9598,10 +9579,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9631,8 +9611,8 @@ msgstr ""
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9646,10 +9626,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9875,22 +9855,18 @@ msgstr "&Рэдагаваць паведамленне"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9901,8 +9877,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9917,14 +9893,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10019,8 +9995,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10052,8 +10028,9 @@ msgstr "&Не зашыфроўваць"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10063,8 +10040,8 @@ msgstr "Даслаць незашыфраваным?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10084,70 +10061,68 @@ msgstr "&Зашыфраваць усе часткі"
 msgid "Unencrypted Message Warning"
 msgstr "Папярэджанне: незашыфраванае паведамленне"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Некаторыя літары будуць страчаны"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Страціць літары"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Змяніць знакзбор"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10169,10 +10144,10 @@ msgstr "&Фармат паштовай скрынкі:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10182,8 +10157,8 @@ msgstr "Змест &тэчкі:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10222,8 +10197,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Статус: "
 
@@ -10252,8 +10226,8 @@ msgstr "Не знойдзена дапаўненне %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10289,18 +10263,18 @@ msgstr "Дапаўненне крыптаграфіі \"%1\" ня можа ра�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10557,8 +10531,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10674,10 +10648,11 @@ msgstr ""
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10694,7 +10669,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -10711,1643 +10687,12 @@ msgstr ""
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Іс&ці"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Т&эчка"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Паведамленне"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Пераслаць"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Падпісанне"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Падпісваць паведамленні &аўтаматычна"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Шыфраванне"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Захоўваць дасланыя паведамленні зашыф&раванымі"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Аўтаматычна зашыфроўваць &паведамленні калі гэта магчыма"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Каму: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Копія: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Агульныя"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Адказаць"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Адказаць &усім..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Пераслаць"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Скарот:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Уласцівасці тэчкі"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Неп&рачытанае:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Advanced"
-msgstr "Асаблівы"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Фармат захоўвання:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "&Не дасылаць сертыфікаты"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Дадаць..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "&Існуючыя ўвасабленні:"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "неабмежаваны"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Канфігурацыя подпісу"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Адказаць: "
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Перасланае паведамленне"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Для падпісання"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Для шыфравання"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " дзён"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Выбраць колькасьць дзён тут"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Зьмест &тэчкі:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Указаць р&эдактар:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Выкарыстоўваць з&нешні рэдактар замест унутранага"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Дадаваць подпіс а&ўтаматычна"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, no-c-format
-msgid "Remove the signature when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Захоўваць дасланыя паведамленні зашыф&раванымі"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Спіс паведамленняў - новыя паведамленні"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Дадаць сымбалі &цытавання"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12463,6 +10808,11 @@ msgstr "Дадаць рахунак"
 msgid "Add as BCC"
 msgstr "Дадаць рахунак"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Адмяніць"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12479,10 +10829,10 @@ msgstr "Выбраныя адрасаты"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12499,8 +10849,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12603,10 +10953,19 @@ msgstr "больш ці роўна"
 msgid " bytes"
 msgstr "байтаў"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " дзён"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12763,15 +11122,12 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -12791,8 +11147,7 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -12814,8 +11169,7 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -12823,10 +11177,8 @@ msgid "(No special capabilities available)"
 msgstr ""
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Даступныя скрыпты Sieve:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Даступныя скрыпты Sieve:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -12894,8 +11246,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12912,17 +11264,22 @@ msgstr "Адчыняе ўказаны файл у тэкставым рэдак�
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "У&казаць каманду:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Новы элемэнт:"
@@ -12959,6 +11316,11 @@ msgstr "Дадаць рахунак"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Вы сапраўды жадаеце выдаліць увасабленне <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Ужываць &для:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -12973,6 +11335,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Рэдагаваць скрыпт..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13012,9 +11378,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13053,6 +11419,16 @@ msgstr ""
 "Немагчыма адчыніць файл \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Каму: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Копія: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13082,36 +11458,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13121,8 +11493,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -13138,8 +11509,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -13181,8 +11551,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -13352,6 +11721,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13388,76 +11761,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13523,6 +11826,16 @@ msgstr "Далучэнне #%1 (безназоўнае)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Файл з назвай \"%1\" ужо існуе. Ці вы сапраўды хочаце перазапісаць яго?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Перазапісаць файл?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13622,9 +11935,9 @@ msgstr "&Пасылаць выяву з кожным паведамленнем"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13655,9 +11968,9 @@ msgstr "Выбраць файл..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13666,15 +11979,15 @@ msgstr "Узяць з адраснай кнігі"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13683,8 +11996,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13700,129 +12013,1509 @@ msgstr "Няма выявы"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Падпісанне"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Падпісваць паведамленні &аўтаматычна"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Шыфраванне"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Дадаць 'загаловак' да паведамлення"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Захоўваць дасланыя паведамленні зашыф&раванымі"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Прачытаць цела паведамлення з 'файла'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
 msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Аўтаматычна зашыфроўваць &паведамленні калі гэта магчыма"
+
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Прачытанае"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Агульныя"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Старое"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Адказаць"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Выдаленае"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Адказаць &усім..."
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Есць адказ"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Пераслаць"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Перасланае"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Скарот:"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "У чарзе"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Дасланае"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Зьмест &тэчкі:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Назіраемае"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ігнараванае"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Спам"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Уласцівасці тэчкі"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Не спам"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr ""
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Заданне"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr ""
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Змяшчае далучэнне"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Неп&рачытанае:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
 msgstr ""
 
-#: util.h:208
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:451
+#, fuzzy, no-c-format
+msgid "Advanced"
+msgstr "Асаблівы"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Фармат захоўвання:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Файл з назвай \"%1\" ужо існуе. Ці вы сапраўды хочаце перазапісаць яго?"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Перазапісаць файл?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Указаць р&эдактар:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Выкарыстоўваць з&нешні рэдактар замест унутранага"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Дадаваць подпіс а&ўтаматычна"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr ""
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, no-c-format
+msgid "Remove the signature when replying"
+msgstr ""
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Захоўваць дасланыя паведамленні зашыф&раванымі"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr ""
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Спіс паведамленняў - новыя паведамленні"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Дадаць сымбалі &цытавання"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Рэдагаваць &файл"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Рэдагаваць..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Іс&ці"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Т&эчка"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Паведамленне"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Пераслаць"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "&Існуючыя ўвасабленні:"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Агульныя параметры"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "&Не дасылаць сертыфікаты"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr ""
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Дадаць..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr ""
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "&Існуючыя ўвасабленні:"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "неабмежаваны"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Канфігурацыя подпісу"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Адказаць: "
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Перасланае паведамленне"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Для падпісання"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Для шыфравання"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Выбраць колькасьць дзён тут"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -13942,9 +13635,6 @@ msgstr "Перазапісаць файл?"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "Захаваць у тэчцы &чарнавікоў"
 
-#~ msgid "Configure KMail"
-#~ msgstr "Наставіць KMail"
-
 #~ msgid "Mark Message as Not &To-do"
 #~ msgstr "Зняць з паведамлення паметку \"зрабіць\""
 
diff --git a/tde-i18n-bg/messages/tdepim/kmail.po b/tde-i18n-bg/messages/tdepim/kmail.po
index c26c9be3985..e2324394c58 100644
--- a/tde-i18n-bg/messages/tdepim/kmail.po
+++ b/tde-i18n-bg/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-14 00:55+0000\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -29,7 +29,7 @@ msgstr ""
 "Златко Попов,Ясен Праматаров,Борислав Александров,Веселина Николова,Красимир "
 "Арнаудов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -175,6 +175,12 @@ msgstr "&Без (използвайте внимателно)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Сметка за полуавтоматично управление на ресурс"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Изтриване на изтеклите"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -190,7 +196,8 @@ msgstr "Изтриване на изтеклите"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Изтриване на всички остарели заделяния за ресурса, съответстващ на тази сметка."
+"Изтриване на всички остарели заделяния за ресурса, съответстващ на тази "
+"сметка."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -250,13 +257,13 @@ msgstr "Потребителско и&ме:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "<em>Потребителско име</em>, дадено ви от доставчика на Интернет, с което се "
-"представяте пред техните сървъри. Обикновено това е първата част от вашата "
-"е-поща (частта преди <em>@</em>)."
+"представяте пред техните сървъри. Обикновено това е първата част от вашата е-"
+"поща (частта преди <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -277,16 +284,16 @@ msgstr "Запомняне на &POP паролата"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Включете тази отметка, ако искате KMail да запомни паролата.\n"
-"Ако е инсталиран TDEWallet, той ще бъде използван за съхраняване на паролата, "
-"което се счита за по-сигурно.\n"
+"Ако е инсталиран TDEWallet, той ще бъде използван за съхраняване на "
+"паролата, което се счита за по-сигурно.\n"
 "Но ако не е инсталиран, паролата ще се съхранява в конфигурационния файл на "
 "KMail. Паролата не се съхранява в явен вид, но това не трябва да се смята за "
 "сигурна защита от опит за разшифроване, ако някой има достъп до "
@@ -318,12 +325,13 @@ msgstr "&Филтриране на съобщения по-големи от"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ако включите тази опция ще бъдат използвани POP филтри за определяне какво да "
-"се прави със съобщенията. Можете да изберете да ги изтеглите, изтриете или "
-"запазите на сървъра."
+"Ако включите тази опция ще бъдат използвани POP филтри за определяне какво "
+"да се прави със съобщенията. Можете да изберете да ги изтеглите, изтриете "
+"или запазите на сървъра."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -372,13 +380,15 @@ msgstr "Обикновен те&кст"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -421,9 +431,9 @@ msgstr "Обекти:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Тук виждате различните обекти, които IMAP сървъра ви поддържа. Всеки обект "
 "представлява представка, разделяща група от папки. Те позволяват на KMail, "
@@ -485,9 +495,9 @@ msgstr "Зареждане на прикрепени фа&йлове при по
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Включете това, ако не искате автоматично да зареждате прикрепени файлове, "
 "когато маркирате е-писмо, а само когато щракнете върху прикрепения файл. По "
@@ -502,8 +512,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Само отворени в дървото папки се проверяват за под папки. Използвайте го, ако "
-"на сървъра има много папки."
+"Само отворени в дървото папки се проверяват за под папки. Използвайте го, "
+"ако на сървъра има много папки."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -531,7 +541,7 @@ msgstr "<без>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Входяща"
 
@@ -539,8 +549,8 @@ msgstr "Входяща"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Изглежда сървърът не поддържа уникални номера на съобщенията, но това се "
 "изисква само, ако съобщенията се пазят на сървъра.\n"
@@ -551,33 +561,34 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Изглежда сървърът не поддържа изтегляне заглавните части на съобщения, но това "
-"се изисква за филтриране на съобщенията на сървъра.\n"
+"Изглежда сървърът не поддържа изтегляне заглавните части на съобщения, но "
+"това се изисква за филтриране на съобщенията на сървъра.\n"
 "Тъй като някои сървъри не обявяват правилно способностите си, все пак имате "
 "възможност да активирате филтрирането на съобщенията на сървъра."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Имайте предвид, че това може да стане причина някои не поддържащи конвейер POP3 "
-"сървъри да изпратят повредени писма;\n"
-"Това обаче може да се настрои, защото някои сървъри поддържат конвейер, но не "
-"го обявяват. За да проверите дали вашият POP3 сървър има такава поддръжка, "
-"използвайте бутона \"Проверка какво поддържа сървъра\" в долната част на "
-"диалоговия прозорец.\n"
-"Ако сървърът не я обявява, но искате повече скорост, тогава направете няколко "
-"теста като си изпратете писма и ги изтеглите."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Имайте предвид, че това може да стане причина някои не поддържащи конвейер "
+"POP3 сървъри да изпратят повредени писма;\n"
+"Това обаче може да се настрои, защото някои сървъри поддържат конвейер, но "
+"не го обявяват. За да проверите дали вашият POP3 сървър има такава "
+"поддръжка, използвайте бутона \"Проверка какво поддържа сървъра\" в долната "
+"част на диалоговия прозорец.\n"
+"Ако сървърът не я обявява, но искате повече скорост, тогава направете "
+"няколко теста като си изпратете писма и ги изтеглите."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -585,48 +596,48 @@ msgstr "Моля, първо задайте сървър и порт в подп
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Изглежда сървърът не поддържа конвейерна обработка; затова тази опция е "
 "изключена.\n"
 "Тъй като някои сървъри не обявяват правилно способностите си, все пак имате "
-"възможност да активирате конвейерната обработка Имайте предвид, че това може да "
-"стане причина някои не поддържащи конвейер POP сървъри да изпратят повредени "
-"писма. Затова преди да използвате тази възможност за важна кореспонденция, "
-"трябва да я тествате изпращайки на себе си множество тестови съобщения, които "
-"след това да свалите наведнъж от POP сървъра."
+"възможност да активирате конвейерната обработка Имайте предвид, че това може "
+"да стане причина някои не поддържащи конвейер POP сървъри да изпратят "
+"повредени писма. Затова преди да използвате тази възможност за важна "
+"кореспонденция, трябва да я тествате изпращайки на себе си множество тестови "
+"съобщения, които след това да свалите наведнъж от POP сървъра."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Изглежда сървърът не поддържа уникално номериране на съобщенията, но това се "
 "изисква за оставянето им на сървъра; затова тази опция е изключена.\n"
-"Тъй като някои сървъри не обявяват правилно способностите си, все пак можете да "
-"активирате запазването на съобщения на сървъра."
+"Тъй като някои сървъри не обявяват правилно способностите си, все пак можете "
+"да активирате запазването на съобщения на сървъра."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Изглежда сървърът не поддържа изтегляне на заглавните части на съобщенията, но "
-"това е изискване при филтриране съобщения на сървъра, затова тази опция беше "
-"забранена.\n"
+"Изглежда сървърът не поддържа изтегляне на заглавните части на съобщенията, "
+"но това е изискване при филтриране съобщения на сървъра, затова тази опция "
+"беше забранена.\n"
 "Тъй като някои сървъри не обявяват правилно способностите си, все пак имате "
 "възможност да активирате филтрирането на съобщения."
 
@@ -708,8 +719,8 @@ msgstr "IMAP сметка"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Трябва да добавите сметка в секцията мрежа на настройките, за да получавате "
 "поща."
@@ -748,12 +759,12 @@ msgstr "Добре дошли в KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Изглежда стартирате KMail за първи път. Можете да използвате помощника за "
-"настройка на пощенските си сметки. Просто в следващите страници въведете "
+"<qt>Изглежда стартирате KMail за първи път. Можете да използвате помощника "
+"за настройка на пощенските си сметки. Просто в следващите страници въведете "
 "данните за електронната си поща.</qt>"
 
 #: accountwizard.cpp:200
@@ -816,8 +827,7 @@ msgstr "Използване на локална доставка"
 msgid "Server Information"
 msgstr "Информация за сървър"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Без"
@@ -956,36 +966,34 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Тук ще получите помощ при настройката филтрите на KMail да използват някои "
-"добре познати анти-вирусни инструменти.</p>"
-"<p>Помощникът може да ги открие на компютъра ви, както и да създаде правила за "
-"филтриране (с цел класифициране и отделяне на съобщенията, съдържащи вируси). "
-"Няма да бъдат взети предвид съществуващите правила за филтриране. Винаги се "
-"добавят нови.</p>"
-"<p><b>Предупреждение:</b> Програмата блокира по време на сканирането за вируси, "
-"така че е възможно да имате проблеми с функционирането и. За да се върнете към "
-"предишното поведение на KMail, изтрийте създадени от помощника правилата за "
-"филтриране."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Тук ще получите помощ при настройката филтрите на KMail да използват "
+"някои добре познати анти-вирусни инструменти.</p><p>Помощникът може да ги "
+"открие на компютъра ви, както и да създаде правила за филтриране (с цел "
+"класифициране и отделяне на съобщенията, съдържащи вируси). Няма да бъдат "
+"взети предвид съществуващите правила за филтриране. Винаги се добавят нови.</"
+"p><p><b>Предупреждение:</b> Програмата блокира по време на сканирането за "
+"вируси, така че е възможно да имате проблеми с функционирането и. За да се "
+"върнете към предишното поведение на KMail, изтрийте създадени от помощника "
+"правилата за филтриране."
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Моля, изберете инструментите, които да се използват за откриване на спам и "
-"продължете към следващата страница.</p>"
+"<p>Моля, изберете инструментите, които да се използват за откриване на спам "
+"и продължете към следващата страница.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1013,14 +1021,13 @@ msgstr "Преместване на веро&ятен спам в:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Папката по подразбиране е \"входяща\", но можете да я промените по-долу."
-"<p>Не всички инструменти поддържат класифицирането като несигурно. Ако не сте "
-"избрали такъв инструмент, не можете да изберете и папка."
+"<p>Не всички инструменти поддържат класифицирането като несигурно. Ако не "
+"сте избрали такъв инструмент, не можете да изберете и папка."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1030,11 +1037,11 @@ msgstr "Проверка на съобщения с анти-вирусните
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Оставете анти-вирусните инструменти да проверяват съобщенията ви. Помощникът ще "
-"създаде подходящите филтри. Обикновено съобщенията се маркират от "
+"Оставете анти-вирусните инструменти да проверяват съобщенията ви. Помощникът "
+"ще създаде подходящите филтри. Обикновено съобщенията се маркират от "
 "инструментите, така че филтрите могат да реагират на това и, например, да "
 "преместят съобщението с вирус в специална папка."
 
@@ -1045,12 +1052,12 @@ msgstr "Преместване на откритите вирусни съобщ
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Филтър, който да открива класифицираните като заразени съобщения и да ги "
-"премества в определена папка. Папката по подразбиране е \"Кошче\", но можете да "
-"я промените в изгледът с папки."
+"премества в определена папка. Папката по подразбиране е \"Кошче\", но можете "
+"да я промените в изгледът с папки."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1058,11 +1065,11 @@ msgstr "Допълнително, маркиране заразените с в�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Маркиране на съобщенията, класифицирани като заразени с вирус като прочетени и "
-"преместването им в избраната папка."
+"Маркиране на съобщенията, класифицирани като заразени с вирус като прочетени "
+"и преместването им в избраната папка."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1256,8 +1263,8 @@ msgstr "Грешка при прочитането на папка %1 на съ�
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1277,8 +1284,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1309,17 +1316,17 @@ msgstr "Изтрити"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Нито един от вашите самоличности не съвпада с получателя на съобщението."
 "<br>Моля, изберете кой от следните адреси е вашия:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Нито един от вашите самоличности не съвпада с получателя на съобщението."
 "<br>Моля, изберете кой от следните адреси е вашия:"
@@ -1352,18 +1359,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Тази настройка е направена от администратора ви.</p>"
-"<p>Ако смятате, че това е грешка, моля, свържете се с него.</p></qt>"
+"<qt><p>Тази настройка е направена от администратора ви.</p><p>Ако смятате, "
+"че това е грешка, моля, свържете се с него.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Зареждане на профил..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Настройване на сметка"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Д&обавяне..."
@@ -1393,6 +1403,11 @@ msgstr "<qt>Наистина ли искате самоличността <b>%1<
 msgid "Remove Identity"
 msgstr "Изтриване на самоличност"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "И&зтриване"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Добавяне..."
@@ -1401,6 +1416,11 @@ msgstr "Добавяне..."
 msgid "Modify..."
 msgstr "Промяна..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "И&зтриване"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Настройване като подразбиращ се"
@@ -1417,17 +1437,15 @@ msgstr "Изпра&щане"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Изходящи сметки (добавете поне една):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Име"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Вид"
@@ -1449,8 +1467,7 @@ msgstr "Настройки по подразбиране"
 msgid "Common Options"
 msgstr "Общи настройки"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Потвър&ждение преди изпращане"
@@ -1501,17 +1518,16 @@ msgstr "Домей&н по подразбиране:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> Домейнът по подразбиране се използва за допълване на пощенски адрес, който "
-"се състои само от име на потребител.</p></qt>"
+"<qt><p> Домейнът по подразбиране се използва за допълване на пощенски адрес, "
+"който се състои само от име на потребител.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1529,9 +1545,9 @@ msgstr "Добавяне на пощенски транспорт"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (по подразбиране)"
 
@@ -1614,6 +1630,10 @@ msgstr "Промяна на сметка"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Грешка при откриване на сметка <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Цветов&е"
@@ -1722,8 +1742,7 @@ msgstr "Посетена препратка"
 msgid "Misspelled Words"
 msgstr "Сгрешени думи"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Ново съобщение"
@@ -1911,8 +1930,8 @@ msgstr "Затворени нишки по подразбиране"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Отваряне на нишки с нови, непрочетени или важн&и съобщения и отваряне на "
 "наблюдаваните нишки."
@@ -1923,73 +1942,56 @@ msgstr "Показване на датата"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Следните изрази могат да се ползват за дата:</strong></p>"
-"<ul>"
-"<li>d - ден от месеца като число без водеща нула (1-31)</li>"
-"<li>dd - ден от месеца като число с водеща нула (01-31)</li>"
-"<li>ddd - съкратено име на ден от седмицата (Mon - Sun)</li>"
-"<li>dddd - пълно име на ден от седмицата (Monday - Sunday)</li>"
-"<li>M - месец като число без водеща нула (1-12)</li>"
-"<li>MM - месец като число с водеща нула (01-12)</li>"
-"<li>MMM - съкратено име на месец (Jan - Dec)</li>"
-"<li>MMMM - пълно име на месец (January - December)</li>"
-"<li>yy - година като двуцифрено число (00-99)</li>"
-"<li>yyyy - година като четири цифри (0000-9999)</li></ul>"
-"<p><strong>Следните изрази могат да се ползват за час:</string></p> "
-"<ul>"
-"<li>h - часът без водеща нула (0-23 или 1-12,, ако са показани AM/PM)</li>"
-"<li>hh - часът с водеща нула (00-23 или 01-12,, ако са показани AM/PM)</li>"
-"<li>m - минути без водеща нула (0-59)</li>"
-"<li>mm - минути с водеща нула (00-59)</li>"
-"<li>s - секунди без водеща нула (0-59)</li>"
-"<li>ss - секунди с водеща нула (00-59)</li>"
-"<li>z - милисекунди без водещи нули (0-999)</li>"
-"<li>zzz - милисекунди с водещи нули (000-999)</li>"
-"<li>AP - превключване между AM/PM. АР ще бъде заменено или с \"AM\" или с "
-"\"PM\".</li>"
-"<li>ap - превключване между AM/PM. АР ще бъде заменено или с \"am\" или с "
-"\"pm\".</li>"
-"<li>Z - часови пояс в цифрова форма (-0500)</li></ul>"
-"<p><strong>Всички други въведени символи ще бъдат пренебрегнати.</strong></p>"
-"</qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Следните изрази могат да се ползват за дата:</strong></"
+"p><ul><li>d - ден от месеца като число без водеща нула (1-31)</li><li>dd - "
+"ден от месеца като число с водеща нула (01-31)</li><li>ddd - съкратено име "
+"на ден от седмицата (Mon - Sun)</li><li>dddd - пълно име на ден от седмицата "
+"(Monday - Sunday)</li><li>M - месец като число без водеща нула (1-12)</"
+"li><li>MM - месец като число с водеща нула (01-12)</li><li>MMM - съкратено "
+"име на месец (Jan - Dec)</li><li>MMMM - пълно име на месец (January - "
+"December)</li><li>yy - година като двуцифрено число (00-99)</li><li>yyyy - "
+"година като четири цифри (0000-9999)</li></ul><p><strong>Следните изрази "
+"могат да се ползват за час:</string></p> <ul><li>h - часът без водеща нула "
+"(0-23 или 1-12,, ако са показани AM/PM)</li><li>hh - часът с водеща нула "
+"(00-23 или 01-12,, ако са показани AM/PM)</li><li>m - минути без водеща нула "
+"(0-59)</li><li>mm - минути с водеща нула (00-59)</li><li>s - секунди без "
+"водеща нула (0-59)</li><li>ss - секунди с водеща нула (00-59)</li><li>z - "
+"милисекунди без водещи нули (0-999)</li><li>zzz - милисекунди с водещи нули "
+"(000-999)</li><li>AP - превключване между AM/PM. АР ще бъде заменено или с "
+"\"AM\" или с \"PM\".</li><li>ap - превключване между AM/PM. АР ще бъде "
+"заменено или с \"am\" или с \"pm\".</li><li>Z - часови пояс в цифрова форма "
+"(-0500)</li></ul><p><strong>Всички други въведени символи ще бъдат "
+"пренебрегнати.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Промяната глобалните настройки на нишките ще отмени всички специфични стойности "
-"за папките."
+"Промяната глобалните настройки на нишките ще отмени всички специфични "
+"стойности за папките."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2003,8 +2005,7 @@ msgstr "Показване на &HTML лентата за състоянието
 msgid "Show s&pam status in fancy headers"
 msgstr "Информация за &спама в декорираните заглавни части"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Заместване на усмивките с емоции"
@@ -2013,8 +2014,7 @@ msgstr "Заместване на усмивките с емоции"
 msgid "Use smaller font for quoted text"
 msgstr "Използване на по-малък шрифт за цитирания текст"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Показване на отварящи/затварящи кавички"
@@ -2040,8 +2040,7 @@ msgstr "Авто"
 msgid "&Override character encoding:"
 msgstr "Пре&покриваща кодова таблица:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Икона в системния панел"
@@ -2144,21 +2143,19 @@ msgstr "<b>%f</b> ще бъде заместен с името на редакт
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Поддържат се следните променливи за отговор: "
-"<br><b>%D</b>: дата, <b>%S</b>: тема,"
-"<br><b>%e</b>: адрес на подател, <b>%F</b>: име на подател, <b>%f</b>"
-": инициали на подател,"
-"<br><b>%T</b>: име на получател, <b>%t</b>: име и адрес на получател, "
-"<br><b>%C</b>: копиране на имена, <b>%c</b>: копиране на имена и адреси,"
-"<br><b>%%</b> знак за процент, <b>%_</b>: интервал, <b>%L</b>: край на ред</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Поддържат се следните променливи за отговор: <br><b>%D</b>: дата, <b>%S</"
+"b>: тема,<br><b>%e</b>: адрес на подател, <b>%F</b>: име на подател, <b>%f</"
+"b>: инициали на подател,<br><b>%T</b>: име на получател, <b>%t</b>: име и "
+"адрес на получател, <br><b>%C</b>: копиране на имена, <b>%c</b>: копиране на "
+"имена и адреси,<br><b>%%</b> знак за процент, <b>%_</b>: интервал, <b>%L</"
+"b>: край на ред</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2181,21 +2178,20 @@ msgstr "Отговор до вси&чки:"
 msgid "&Forward:"
 msgstr "П&репращане:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Сим&вол за цитат:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "На %D написахте:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "На %D %F написа:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Препратено съобщение"
 
@@ -2233,11 +2229,11 @@ msgstr "Въведете нова представка при препращан
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Този списък се проверява за всяко изходящо съобщение дали съдържа необходимите "
-"кодови таблици."
+"Този списък се проверява за всяко изходящо съобщение дали съдържа "
+"необходимите кодови таблици."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2273,10 +2269,9 @@ msgstr "Стойност"
 msgid "Ne&w"
 msgstr "Но&в"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Име:"
@@ -2285,19 +2280,19 @@ msgstr "&Име:"
 msgid "&Value:"
 msgstr "Сто&йност:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Съвместимо с Outlook именуване на прикрепените файлове"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Активирайте тази опция за да може Outlook(tm) да разбира имената на "
-"прикрепените файлове, съдържащи символи, които не са част от английската азбука"
+"прикрепените файлове, съдържащи символи, които не са част от английската "
+"азбука"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2325,17 +2320,18 @@ msgstr "прикрепен"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Избрахте да кодирате имената на прикрепените файлове, съдържащи символи "
 "различни от английските, по начин разбираем за Outlook(tm) и други пощенски "
-"клиенти, които не поддържат стандартно кодирани имена на прикрепените файлове.\n"
+"клиенти, които не поддържат стандартно кодирани имена на прикрепените "
+"файлове.\n"
 "Имайте предвид, че KMail може да създаде нестандартни съобщения и има "
 "вероятност в последствие съобщенията ви да не бъдат разбрани от пощенски "
 "клиенти, придържащи се към стандарта. Не активирайте тази опция освен, ако "
@@ -2363,109 +2359,94 @@ msgstr "Мод&ули за шифроване"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Съобщенията понякога идват в два формата. Тази настройка задава дали искате "
-"да бъде показан HTML или обикновен\t текст.</p>"
-"<p>HTML-ът изглежда по-красиво, но увеличава риска за компютъра ви.</p>"
-"<p>При показването на съобщение като обикновен текст се губи част от "
-"форматирането, но за сметка на това е почти <em>невъзможно</em> "
-"да се пробие защитата.</p>"
-"<p>Настройката по-долу предпазва от неправилно използване на HTML съобщенията, "
-"но не и от атаки, появили се след създаването на тази версия на KMail.</p>"
-"<p>Препоръчва се да <em>не</em> избирате HTML пред обикновения текст.</p>"
-"<p><b>Забележка:</b> Можете да настройвате тази опция за всяка папка от "
-"главното меню <i>Папка</i>.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Съобщенията понякога идват в два формата. Тази настройка задава дали "
+"искате да бъде показан HTML или обикновен\t текст.</p><p>HTML-ът изглежда по-"
+"красиво, но увеличава риска за компютъра ви.</p><p>При показването на "
+"съобщение като обикновен текст се губи част от форматирането, но за сметка "
+"на това е почти <em>невъзможно</em> да се пробие защитата.</p><p>Настройката "
+"по-долу предпазва от неправилно използване на HTML съобщенията, но не и от "
+"атаки, появили се след създаването на тази версия на KMail.</p><p>Препоръчва "
+"се да <em>не</em> избирате HTML пред обикновения текст.</p><p><b>Забележка:</"
+"b> Можете да настройвате тази опция за всяка папка от главното меню "
+"<i>Папка</i>.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Някои реклами в съобщенията са в HTML формат и съдържат препратки към "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Някои реклами в съобщенията са в HTML формат и съдържат препратки към "
 "изображения, използвани за проверка дали сте прочели писмото (&quot;web "
-"bugs&quot;). </p>"
-"<p>Няма разумна причина да се зареждат изображения от Интернет понеже подателят "
-"винаги може да ги прикрепи направо към писмото.</p>"
-"<p>За предпазване от злоупотреба с HTML тази опция е <em>изключена</em> "
-"по подразбиране.</p>"
-"<p>Ако все пак искате в HTML съобщенията да виждате изображения, които не са "
-"прикрепени към тях, можете да я включите, но трябва да сте наясно с този "
-"проблем.</p></qt>"
+"bugs&quot;). </p><p>Няма разумна причина да се зареждат изображения от "
+"Интернет понеже подателят винаги може да ги прикрепи направо към писмото.</"
+"p><p>За предпазване от злоупотреба с HTML тази опция е <em>изключена</em> по "
+"подразбиране.</p><p>Ако все пак искате в HTML съобщенията да виждате "
+"изображения, които не са прикрепени към тях, можете да я включите, но трябва "
+"да сте наясно с този проблем.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Известие за доставка на съобщение (ИДС)</h3> "
-"<p>ИДС е съкращение на това което често се нарича <b>известие за прочитане</b>"
-". Авторът на дадено съобщение иска да му бъде изпратено известие дали "
-"съобщението е доставено. Пощенската програма на получателя генерира отговор от "
-"който може да се научи какво се е случило със съобщението. Нормалните видове са "
-"<b>показано</b> (т.е. прочетено), <b>изтрито</b> и <b>изпратено</b> "
-"(напр. препратено) </p> "
-"<p>Следните настройки контролират изпращането на ИДС от KMail: </p> "
-"<ul> "
-"<li><em>Игнориране</em>: Игнорира всякакви искания за известия. ИДС никога няма "
-"да бъде изпратено автоматично (препоръчително) </li> "
-"<li><em>Питане</em>: Отговаря на искания за известия само след получено "
-"разрешение от потребителя. По този начин можете да пратите ИДС за отделни "
-"съобщения и да откажете или игнорирате останалите.</li>"
-"<li><em>Отказ</em>: Винаги изпраща известие за <b>отказ</b>. Това е <em>"
-"малко</em> по-добре от изпращането на ИДС всеки път. Авторът ще знае, че "
-"съобщението е получено, но няма да знае дали е било прочетено или изтрито и "
-"т.н.</li> "
-"<li><em>Изпращане винаги</em>: Винаги изпраща исканото известие. Това означава, "
-"че авторът на съобщението ще научи кога е отворено съобщението и какво се е "
-"случило с него (видяно, изтрито и т.н.). Тази опция не се препоръчва, но "
-"спомага за поддържането на добри бизнес взаимоотношения.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Известие за доставка на съобщение (ИДС)</h3> <p>ИДС е съкращение на "
+"това което често се нарича <b>известие за прочитане</b>. Авторът на дадено "
+"съобщение иска да му бъде изпратено известие дали съобщението е доставено. "
+"Пощенската програма на получателя генерира отговор от който може да се научи "
+"какво се е случило със съобщението. Нормалните видове са <b>показано</b> (т."
+"е. прочетено), <b>изтрито</b> и <b>изпратено</b> (напр. препратено) </p> "
+"<p>Следните настройки контролират изпращането на ИДС от KMail: </p> <ul> "
+"<li><em>Игнориране</em>: Игнорира всякакви искания за известия. ИДС никога "
+"няма да бъде изпратено автоматично (препоръчително) </li> <li><em>Питане</"
+"em>: Отговаря на искания за известия само след получено разрешение от "
+"потребителя. По този начин можете да пратите ИДС за отделни съобщения и да "
+"откажете или игнорирате останалите.</li><li><em>Отказ</em>: Винаги изпраща "
+"известие за <b>отказ</b>. Това е <em>малко</em> по-добре от изпращането на "
+"ИДС всеки път. Авторът ще знае, че съобщението е получено, но няма да знае "
+"дали е било прочетено или изтрито и т.н.</li> <li><em>Изпращане винаги</em>: "
+"Винаги изпраща исканото известие. Това означава, че авторът на съобщението "
+"ще научи кога е отворено съобщението и какво се е случило с него (видяно, "
+"изтрито и т.н.). Тази опция не се препоръчва, но спомага за поддържането на "
+"добри бизнес взаимоотношения.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2481,14 +2462,14 @@ msgstr "Писмата да &зареждат външни препратки о
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ВНИМАНИЕ:</b> Разрешаването на HTML в електронната поща понижава сигурността "
-"на компютъра ви. <a href=\"whatsthis:%1\"> Повече за HTML писмата...</a> "
-"<a href=\"whatsthis:%2\">Повече за външните препратки...</a>"
+"<b>ВНИМАНИЕ:</b> Разрешаването на HTML в електронната поща понижава "
+"сигурността на компютъра ви. <a href=\"whatsthis:%1\"> Повече за HTML "
+"писмата...</a> <a href=\"whatsthis:%2\">Повече за външните препратки...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2547,8 +2528,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>ВНИМАНИЕ:</b> Безогледното връщане на потвърждения не е добре за сигурността "
-"ви. <a href=\"whatsthis:%1\">Повече...</a>"
+"<b>ВНИМАНИЕ:</b> Безогледното връщане на потвърждения не е добре за "
+"сигурността ви. <a href=\"whatsthis:%1\">Повече...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2562,15 +2543,14 @@ msgstr "Автоматично импортиране на ключове и с�
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Промяната на глобалните HTML настройки ще засегне всички специфичните стойности "
-"на папките."
+"Промяната на глобалните HTML настройки ще засегне всички специфичните "
+"стойности на папките."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Опцията изисква dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "без прокси"
@@ -2600,8 +2580,8 @@ msgstr "&Без изтичане срока на важните съобщени
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "При опит за търсене на непрочетени съобщения:"
 
@@ -2625,8 +2605,8 @@ msgstr "Повторение във всички папки"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "При влизане в папка:"
 
@@ -2695,28 +2675,24 @@ msgstr "Директории (maildir формат)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Това избира кой формат за пощенска кутия ще се използва по подразбиране за "
-"локалните папки:</p>"
-"<p><b>mbox:</b> Пощенските папки на KMail представляват отделни файлове за "
-"всяка папка. Отделните съобщения са разделени едно от друго посредством линия "
-"започваща с \"От\". Това спестява място на диска, но може да не е толкова "
-"удобно при, например, размяна на съобщения между папките.</p>"
-"<p><b>maildir:</b> Пощенските папки на KMail представляват отделни папки на "
-"диска. Отделните съобщения са отделни файлове. Това може да хаби повече място "
-"на диска, но е по-добро решение при, например, размяна на съобщения между "
-"папките.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Това избира кой формат за пощенска кутия ще се използва по "
+"подразбиране за локалните папки:</p><p><b>mbox:</b> Пощенските папки на "
+"KMail представляват отделни файлове за всяка папка. Отделните съобщения са "
+"разделени едно от друго посредством линия започваща с \"От\". Това спестява "
+"място на диска, но може да не е толкова удобно при, например, размяна на "
+"съобщения между папките.</p><p><b>maildir:</b> Пощенските папки на KMail "
+"представляват отделни папки на диска. Отделните съобщения са отделни "
+"файлове. Това може да хаби повече място на диска, но е по-добро решение при, "
+"например, размяна на съобщения между папките.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2749,55 +2725,47 @@ msgstr "ГБ"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Когато преминавате към следващо непрочетено съобщение, може да се случи да "
-"няма повече непрочетени съобщения след текущото.</p>"
-"<p><b>Без повтаряне:</b> Търсенето ще бъде прекратено след последното съобщение "
-"в текущата папка.</p>"
-"<p><b>Повтаряне в текущата папка:</b> Търсенето ще продължи от началото на "
-"списъка със съобщения без да преминава в друга папка.</p>"
-"<p><b>Повтаряне във всички папки:</b> Търсенето ще продължи от началото на "
-"списъка със съобщения., ако не са открити непрочетени съобщения ще продължи със "
-"следващата папка.</p>"
-"<p>По същия начин, когато търсите за предишни непрочетени съобщения, търсенето "
-"ще започне от края на списъка със съобщения и ще продължи в предишната папка в "
-"зависимост от това коя опция е избрана.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p> Когато преминавате към следващо непрочетено съобщение, може да се "
+"случи да няма повече непрочетени съобщения след текущото.</p><p><b>Без "
+"повтаряне:</b> Търсенето ще бъде прекратено след последното съобщение в "
+"текущата папка.</p><p><b>Повтаряне в текущата папка:</b> Търсенето ще "
+"продължи от началото на списъка със съобщения без да преминава в друга папка."
+"</p><p><b>Повтаряне във всички папки:</b> Търсенето ще продължи от началото "
+"на списъка със съобщения., ако не са открити непрочетени съобщения ще "
+"продължи със следващата папка.</p><p>По същия начин, когато търсите за "
+"предишни непрочетени съобщения, търсенето ще започне от края на списъка със "
+"съобщения и ще продължи в предишната папка в зависимост от това коя опция е "
+"избрана.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Пълното индексиране на текста позволява много бързо търсене в съдържанието "
-"на съобщенията. Когато е включено, диалоговия прозорец за търсене ще работи "
-"много бързо. Освен това лентата за търсене ще маркира съобщения въз основа на "
-"съдържанието им.</p>"
-"<p>Отнема определено количество дисково пространство (около половината "
-"пространство, което заема съобщението).</p>"
-"<p>След включване на опцията ще трябва да бъде създаден индекс, но вие можете "
-"да продължите да използвате KMail докато тече тази операция.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Пълното индексиране на текста позволява много бързо търсене в "
+"съдържанието на съобщенията. Когато е включено, диалоговия прозорец за "
+"търсене ще работи много бързо. Освен това лентата за търсене ще маркира "
+"съобщения въз основа на съдържанието им.</p><p>Отнема определено количество "
+"дисково пространство (около половината пространство, което заема "
+"съобщението).</p><p>След включване на опцията ще трябва да бъде създаден "
+"индекс, но вие можете да продължите да използвате KMail докато тече тази "
+"операция.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2864,8 +2832,8 @@ msgstr "&Скриване на екипните папки"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Ако е включена тази отметка, няма да виждате IMAP ресурсните папки в списъка."
 
@@ -2875,8 +2843,8 @@ msgstr "Показване &само на екипните папки за та�
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Ако е включена тази отметка, няма да виждате нормалните папки за екипните "
 "сметки."
@@ -2910,7 +2878,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Включете тази опция, за да може Outlook(tm) да разбира отговорите ви на покани"
+"Включете тази опция, за да може Outlook(tm) да разбира отговорите ви на "
+"покани"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2921,7 +2890,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Включете тази опция, за да може Outlook(tm) да разбира отговорите ви на покани"
+"Включете тази опция, за да може Outlook(tm) да разбира отговорите ви на "
+"покани"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2937,21 +2907,21 @@ msgid ""
 msgstr ""
 "Ако Microsoft Outlook се използва заедно с Microsoft Exchange server, има "
 "проблем с интерпретирането на груповите е-писма. Включете тази опция, за да "
-"изпращате групови покани така че да са разбираеми за Microsoft Exchange server."
+"изпращате групови покани така че да са разбираеми за Microsoft Exchange "
+"server."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Съвместимо с Outlook именуване на прикрепените файлове"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Автоматично изпращане на покана"
@@ -2966,24 +2936,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Обикновено поканите се изпращат като прикрепени файлове към поща. А в този "
-"случай пощата с покана да се изпраща в текста на електронното писмо. Това е "
-"необходимо при изпращането на покана и отговори до Microsoft Outlook."
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Обикновено поканите се изпращат като прикрепени файлове към поща. А в "
+"този случай пощата с покана да се изпраща в текста на електронното писмо. "
+"Това е необходимо при изпращането на покана и отговори до Microsoft Outlook."
 "<br>Но ако направите това, повече няма да получавате описание, което може да "
 "бъде прочетено от пощенската програма. Следователно хора, които имат "
 "неразбираща поканите програма, резултатното съобщение ще изглежда много "
-"странно."
-"<br>Тези, които имат разбираща покани пощенска програма, ще могат да работят с "
-"тази функция.</qt>"
+"странно.<br>Тези, които имат разбираща покани пощенска програма, ще могат да "
+"работят с тази функция.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3087,29 +3056,26 @@ msgstr "Препращане"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тук можете да създавате, редактирате и изтривате шаблони за отговор или "
-"препращане. Създайте потребителски шаблон като щракнете с десния бутон на "
-"мишката или от менюто. Можете също така да зададете клавишна комбинация за по "
-"бързо боравене с шаблона.</p>"
-"<p>Можете да напишете команди за заместване или да ги изберете от менюто <i>"
-"Вмъкване на команда</i>.</p>"
-"<p>Има два вида шаблони: тези, които се използват за <i>Отговор</i>, <i>"
-"Отговор до всички</i>, <i>Препращане</i> и <i>Универсални</i>"
-", който може да се използва а всички видове операции. Не можете да задавате "
-"клавишна комбинация за последните.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Тук можете да създавате, редактирате и изтривате шаблони за отговор "
+"или препращане. Създайте потребителски шаблон като щракнете с десния бутон "
+"на мишката или от менюто. Можете също така да зададете клавишна комбинация "
+"за по бързо боравене с шаблона.</p><p>Можете да напишете команди за "
+"заместване или да ги изберете от менюто <i>Вмъкване на команда</i>.</"
+"p><p>Има два вида шаблони: тези, които се използват за <i>Отговор</i>, "
+"<i>Отговор до всички</i>, <i>Препращане</i> и <i>Универсални</i>, който може "
+"да се използва а всички видове операции. Не можете да задавате клавишна "
+"комбинация за последните.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3126,15 +3092,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3206,11 +3172,11 @@ msgstr "Редактиране с:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
-"KMail не може да определи кога е затворен редактора. За да се избегне загубата "
-"на информация ще бъде прекъснато редактирането на прикрепения файл."
+"KMail не може да определи кога е затворен редактора. За да се избегне "
+"загубата на информация ще бъде прекъснато редактирането на прикрепения файл."
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3386,7 +3352,8 @@ msgstr "Безвъзвратно изтриване"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Забележка: Настройките ще се активират непосредствено след като ги потвърдите."
+"Забележка: Настройките ще се активират непосредствено след като ги "
+"потвърдите."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3461,6 +3428,11 @@ msgstr "Избор на филтри"
 msgid "Filters"
 msgstr "Филтри"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Маркиране на целия текст"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3490,11 +3462,11 @@ msgstr "Дейности на филтъра на &дневника"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Можете да активирате или деактивирате дейностите на филтъра. Разбира се, данни "
-"се записват и показват само ако е активирано. "
+"Можете да активирате или деактивирате дейностите на филтъра. Разбира се, "
+"данни се записват и показват само ако е активирано. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3510,16 +3482,17 @@ msgstr "Оценка на пр&авилото за филтриране"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Можете да контролирате обратната връзка при запис, засягаща прилагането на "
 "правила за филтриране:, ако тази опция е включена ще получавате детайлна "
-"обратна връзка за всяко отделно правило за филтриране; иначе ще бъде получавана "
-"обратна връзка само за резултата от прилагането на всички правила на отделен "
-"филтър."
+"обратна връзка за всяко отделно правило за филтриране; иначе ще бъде "
+"получавана обратна връзка само за резултата от прилагането на всички правила "
+"на отделен филтър."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3539,13 +3512,13 @@ msgstr "неограничен"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Събирането на данни използва памет за временното им съхраняване; тук можете да "
-"ограничите максималното количество памет, което да бъде използвано., ако "
+"Събирането на данни използва памет за временното им съхраняване; тук можете "
+"да ограничите максималното количество памет, което да бъде използвано., ако "
 "размерът на събраните данни надхвърли този лимит, най-старите данни ще бъдат "
 "премахнати докато не се влезе в тези рамки. "
 
@@ -3557,7 +3530,7 @@ msgstr ""
 "Грешка при запис на файла %1:\n"
 "\"%2\" е детайлното описание на грешката."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Грешка в Kmail"
@@ -3598,13 +3571,13 @@ msgstr "&Идентификатор на потребител:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Идентификаторът на потребител е име на сметка на IMAP сървъра. То може да е "
-"обикновено потребителско име или пълният адрес на потребителя. Потребителското "
-"име за вашата сметка на сървъра ще ви каже кое точно е."
+"обикновено потребителско име или пълният адрес на потребителя. "
+"Потребителското име за вашата сметка на сървъра ще ви каже кое точно е."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3655,8 +3628,8 @@ msgstr "Нямате права за писане/четене в папка \"�
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Информацията все още не е получена от сървъра Моля,използвайте \"Проверка на "
 "поща\"."
@@ -3669,8 +3642,7 @@ msgstr "Грешка: няма дефинирана IMAP сметка за та�
 msgid "Connecting to server %1, please wait..."
 msgstr "Свързване със сървъра %1. Моля, изчакайте..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Грешка при свързване със сървъра %1"
@@ -3698,8 +3670,8 @@ msgstr "Добавяне на права"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Наистина ли искате собствените ви права за тази папка да бъдат изтрити? След "
 "това няма да имате достъп до нея."
@@ -3733,7 +3705,7 @@ msgstr "Използване:"
 msgid "Select Folder"
 msgstr "Избор на папка"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Локални папки"
@@ -3757,13 +3729,13 @@ msgstr "Избор на пряк път до папка"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>За да изберете клавиш или комбинация от клавиши, избиращи текущата папка, "
-"натиснете бутона по-долу и след това клавиша(ите), които искате да асоциирате с "
-"тази папка.</qt>"
+"<qt>За да изберете клавиш или комбинация от клавиши, избиращи текущата "
+"папка, натиснете бутона по-долу и след това клавиша(ите), които искате да "
+"асоциирате с тази папка.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3783,13 +3755,22 @@ msgstr "О&тказ"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Изтритата папка беше свързана със сметка <b>%1</b>"
-", която доставяше поща. Папката в която ще се получава нова поща беше променена "
-"на \"Входяща\".</qt>"
+"<qt>Изтритата папка беше свързана със сметка <b>%1</b>, която доставяше "
+"поща. Папката в която ще се получава нова поща беше променена на \"Входяща\"."
+"</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Общо: %2<br>Непрочетени: %3<br>Размер: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Квота: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3912,70 +3893,18 @@ msgstr "Спам статус:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>с"
-"<br>ъ"
-"<br>о"
-"<br>б"
-"<br>щ"
-"<br>е"
-"<br>н"
-"<br>и"
-"<br>е</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> "
+"<br>с<br>ъ<br>о<br>б<br>щ<br>е<br>н<br>и<br>е</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>с"
-"<br>ъ"
-"<br>о"
-"<br>б"
-"<br>щ"
-"<br>е"
-"<br>н"
-"<br>и"
-"<br>е</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>H<br>T<br>M<br>L<br> <br>с<br>ъ<br>о<br>б<br>щ<br>е<br>н<br>и<br>е</"
+"qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3987,19 +3916,14 @@ msgstr "Вашето &име:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Вашето име</h3>"
-"<p> Това поле трябва да съдържа вашето име така както искате то да се появява в "
-"заглавната част на изпратено съобщение;</p>"
-"<p>Ако оставите това поле празно, вашето име няма да се показва; само "
-"електронния адрес.</p></qt>"
+"<qt><h3>Вашето име</h3><p> Това поле трябва да съдържа вашето име така както "
+"искате то да се появява в заглавната част на изпратено съобщение;</p><p>Ако "
+"оставите това поле празно, вашето име няма да се показва; само електронния "
+"адрес.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4007,17 +3931,14 @@ msgstr "&Организация:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Организация</h3>"
-"<p>Това поле трябва да съдържа името на вашата организация, ако искате тя да "
-"бъде показвана в заглавната част на изпратените съобщения.</p>"
-"<p>По-безопасно (и нормално) е да оставите полето празно.</p></qt>"
+"<qt><h3>Организация</h3><p>Това поле трябва да съдържа името на вашата "
+"организация, ако искате тя да бъде показвана в заглавната част на "
+"изпратените съобщения.</p><p>По-безопасно (и нормално) е да оставите полето "
+"празно.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4026,20 +3947,15 @@ msgstr "&Е-поща:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Е-поща</h3>"
-"<p>Това поле трябва да съдържа пълният ви електронен адрес.</p>"
-"<p>Ако оставите полето празно или го попълните грешно, хората ще имат проблеми "
-"като ви отговорят.</p></qt>"
+"<qt><h3>Е-поща</h3><p>Това поле трябва да съдържа пълният ви електронен "
+"адрес.</p><p>Ако оставите полето празно или го попълните грешно, хората ще "
+"имат проблеми като ви отговорят.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4048,21 +3964,12 @@ msgstr "&Е-поща:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4086,19 +3993,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>OpenPGP ключът, който изберете тук, ще бъде използван за подписване на "
-"съобщенията ви. Можете също така да използвате и GnuPG ключове.</p>"
-"<p>Можете да оставите полето празно, но KMail няма да може да подписва "
-"съобщения с OpenPGP. Нормалните функции на пощата няма да бъдат засегнати.</p>"
-"<p>Можете да научите повече за ключовете на <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>OpenPGP ключът, който изберете тук, ще бъде използван за подписване "
+"на съобщенията ви. Можете също така да използвате и GnuPG ключове.</"
+"p><p>Можете да оставите полето празно, но KMail няма да може да подписва "
+"съобщения с OpenPGP. Нормалните функции на пощата няма да бъдат засегнати.</"
+"p><p>Можете да научите повече за ключовете на <a>http://www.gnupg.org</a></"
+"p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4110,30 +4016,27 @@ msgstr "Вашият OpenPGP ключ за шифроване"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Изберете OpenPGP ключ, който ще бъде използван за шифроване до вас самите и за "
-"функцията \"Прикрепяне на публичния ми ключ\" при съчиняване на съобщение."
+"Изберете OpenPGP ключ, който ще бъде използван за шифроване до вас самите и "
+"за функцията \"Прикрепяне на публичния ми ключ\" при съчиняване на съобщение."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Изберете OpenPGP ключ, който ще бъде използван за шифроване до вас самите и "
-"за функцията \"Прикрепяне на публичния ми ключ\" при съчиняване на съобщение. "
-"Можете да използвате и GnuPG ключове.</p>"
-"<p>Можете да оставите полето празно, но KMail няма да може да подписва "
-"съобщенията. Нормалните функции на пощата няма да бъдат засегнати.</p>"
-"<p>Можете да научите повече за ключовете на <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Изберете OpenPGP ключ, който ще бъде използван за шифроване до вас "
+"самите и за функцията \"Прикрепяне на публичния ми ключ\" при съчиняване на "
+"съобщение. Можете да използвате и GnuPG ключове.</p><p>Можете да оставите "
+"полето празно, но KMail няма да може да подписва съобщенията. Нормалните "
+"функции на пощата няма да бъдат засегнати.</p><p>Можете да научите повече за "
+"ключовете на <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4153,18 +4056,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) сертификатът, който изберете ще бъде използван за електронно "
-"подписване на съобщенията ви.</p>"
-"<p> Можете да оставите полето празно, но KMail няма да може да подписва "
-"съобщения използвайки S/MIME Нормалните функции на пощата няма да бъдат "
-"засегнати.</p></qt>"
+"<qt><p>S/MIME (X.509) сертификатът, който изберете ще бъде използван за "
+"електронно подписване на съобщенията ви.</p><p> Можете да оставите полето "
+"празно, но KMail няма да може да подписва съобщения използвайки S/MIME "
+"Нормалните функции на пощата няма да бъдат засегнати.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4176,28 +4076,26 @@ msgstr "Вашият S/MIME сертификат за шифроване"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Изберете S/MIME сертификат, който да се използва при шифроване до вас самите и "
-"за възможността \"Прикрепяне на публичния ми ключ\" при съчинение на съобщение."
+"Изберете S/MIME сертификат, който да се използва при шифроване до вас самите "
+"и за възможността \"Прикрепяне на публичния ми ключ\" при съчинение на "
+"съобщение."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>S/MIME сертификатът, който изберете, ще бъде използван за шифроване на "
-"съобщения до вас самите и за възможността \"Прикрепяне на публичния ми ключ\" "
-"при съчинение на съобщение.</p>"
-"<p>Можете да оставите полето празно, но KMail няма да може да подписва "
-"съобщенията чрез S/MIME; нормалните функции на пощата няма да бъдат "
-"засегнати.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>S/MIME сертификатът, който изберете, ще бъде използван за шифроване "
+"на съобщения до вас самите и за възможността \"Прикрепяне на публичния ми "
+"ключ\" при съчинение на съобщение.</p><p>Можете да оставите полето празно, "
+"но KMail няма да може да подписва съобщенията чрез S/MIME; нормалните "
+"функции на пощата няма да бъдат засегнати.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4217,24 +4115,20 @@ msgstr "Ад&рес за отговор:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адреси за отговор</h3>"
-"<p>В заглавната част това настройва <tt>Отговор на:</tt> "
-"да съдържа различен електронен адрес от нормалния <tt>От:</tt>.</p>"
-"<p>Намира приложение, ако имате група от хора работещи заедно на сходни "
-"длъжности. Например можете да искате всяко изпратено съобщение да съдържа вашия "
-"електронен адрес в полето <tt>От:</tt>, но всеки отговор да отива към груповия "
-"адрес.</p>"
-"<p>Ако се двоумите, оставете полето празно.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адреси за отговор</h3><p>В заглавната част това настройва "
+"<tt>Отговор на:</tt> да съдържа различен електронен адрес от нормалния "
+"<tt>От:</tt>.</p><p>Намира приложение, ако имате група от хора работещи "
+"заедно на сходни длъжности. Например можете да искате всяко изпратено "
+"съобщение да съдържа вашия електронен адрес в полето <tt>От:</tt>, но всеки "
+"отговор да отива към груповия адрес.</p><p>Ако се двоумите, оставете полето "
+"празно.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4242,25 +4136,19 @@ msgstr "Адреси за &скрити копия:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адреси за скрито копие до(BCC)</h3>"
-"<p>Адресите, които въведете тук, ще се добавят към всяко изпратено от тази "
-"самоличност писмо. Те няма да са видими за другите получатели.</p>"
-"<p>Обикновено това се ползва за изпращане на копие от всяко съобщение до друга "
-"ваша сметка.</p>"
-"<p>За да посочите повече от един адрес, използвайте запетая за разделяне на "
-"получателите.</p>"
-"<p>Ако се двоумите, оставете полето празно.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адреси за скрито копие до(BCC)</h3><p>Адресите, които въведете тук, "
+"ще се добавят към всяко изпратено от тази самоличност писмо. Те няма да са "
+"видими за другите получатели.</p><p>Обикновено това се ползва за изпращане "
+"на копие от всяко съобщение до друга ваша сметка.</p><p>За да посочите "
+"повече от един адрес, използвайте запетая за разделяне на получателите.</"
+"p><p>Ако се двоумите, оставете полето празно.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4298,7 +4186,7 @@ msgstr "&Подпис"
 msgid "&Picture"
 msgstr "&Изображение"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Невалидна е-поща"
 
@@ -4314,15 +4202,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Един от настроените OpenPGP ключове за подписване не съдържа потребителско ID "
-"със съответната е-поща за тази самоличност (%1).\n"
-"Това може да доведе до предупреждаващи съобщения до получаващата страна, когато "
-"се опитат да проверят подписите, направени с тези настройки."
+"Един от настроените OpenPGP ключове за подписване не съдържа потребителско "
+"ID със съответната е-поща за тази самоличност (%1).\n"
+"Това може да доведе до предупреждаващи съобщения до получаващата страна, "
+"когато се опитат да проверят подписите, направени с тези настройки."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Един от настроените OpenPGP ключове за шифроване не съдържа потребителско ID "
 "със съответния електронен адрес за тази самоличност (%1)."
@@ -4336,8 +4224,8 @@ msgid ""
 msgstr ""
 "Един от настроените S/MIME сертификати за подписване не съдържа съответния "
 "електронен адрес за тази самоличност (%1).\n"
-"Това може да доведе до предупреждаващи съобщения до получаващата страна, когато "
-"се опитат да проверят подписите, направени с тези настройки."
+"Това може да доведе до предупреждаващи съобщения до получаващата страна, "
+"когато се опитат да проверят подписите, направени с тези настройки."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4372,21 +4260,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Потребителска папка за чернови за самоличност \"%1\" не съществува. Затова ще "
-"бъде използвана тази по подразбиране."
+"Потребителска папка за чернови за самоличност \"%1\" не съществува. Затова "
+"ще бъде използвана тази по подразбиране."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Потребителска папка за шаблони за самоличност \"%1\" не съществува. Затова ще "
-"бъде използвана тази по подразбиране."
+"Потребителска папка за шаблони за самоличност \"%1\" не съществува. Затова "
+"ще бъде използвана тази по подразбиране."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (по подразбиране)"
 
@@ -4433,19 +4321,19 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Настройките бяха мигрирана автоматично, но би трябвало да проверите настройките "
-"на сметката си."
+"Настройките бяха мигрирана автоматично, но би трябвало да проверите "
+"настройките на сметката си."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Не бе възможно автоматичното мигриране на настройките, така че, моля, проверете "
-"настройките на сметката си."
+"Не бе възможно автоматичното мигриране на настройките, така че, моля, "
+"проверете настройките на сметката си."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4460,8 +4348,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Грешка при качване на съобщение с дата %1 от <i>%2</i> и тема <i>%3</i> "
-"на сървъра."
+"Грешка при качване на съобщение с дата %1 от <i>%2</i> и тема <i>%3</i> на "
+"сървъра."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4482,20 +4370,25 @@ msgstr "Папката е доста близо до квотното огран
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "Тъй като нямате права за писане в тази папка, помолете собственикът и да "
 "освободи малко място в нея."
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Грешка: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Връзката към сървъра %1 бе затворена неочаквано., ако е възможно автоматично ще "
-"бъде установена наново."
+"Връзката към сървъра %1 бе затворена неочаквано., ако е възможно автоматично "
+"ще бъде установена наново."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4644,20 +4537,20 @@ msgstr "Архиви на списък"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Един или повече от вашите OpenPGP ключове или S/MIME удостоверения не е напълно "
-"надежден за шифроване."
+"Един или повече от вашите OpenPGP ключове или S/MIME удостоверения не е "
+"напълно надежден за шифроване."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Един или повече от вашите OpenPGP ключове или S/MIME удостоверения не е напълно "
-"надежден за шифроване."
+"Един или повече от вашите OpenPGP ключове или S/MIME удостоверения не е "
+"напълно надежден за шифроване."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4691,237 +4584,182 @@ msgstr "Не напълно надеждни ключове за шифрова�
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+" <p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+" <p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>изтича "
+"след по-малко от ден.</p>\n"
+"<p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>изтича "
+"след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за подписване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от ден.</p>\n"
+"<p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за подписване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от ден.</p>\n"
+"<p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-" "
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+" <p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от ден.</p>\n"
+"<p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за подписване</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за подписване</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от ден.</p>\n"
+"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+" <p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от ден.</p>\n"
+"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Вашият S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
+" <p>Вашият S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
+"(сериен номер %2)</p><p>изтича след по-малко от ден.</p>\n"
 "<p>Вашият S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"(сериен номер %2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Вашият S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
+" <p>Вашият S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
+"(сериен номер %2)</p><p>изтича след по-малко от ден.</p>\n"
 "<p>Вашият S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"(сериен номер %2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+" <p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4935,226 +4773,171 @@ msgstr "S/MIME сертификатът изтича скоро"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Вашият OpenPGP ключ за подписване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-" "
-"<p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+" <p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Вашият OpenPGP ключ за шифроване</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-" "
-"<p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+" <p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>изтича "
+"след по-малко от ден.</p>\n"
+"<p>OpenPGP ключът за</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>изтича "
+"след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за подписване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от ден.</p>\n"
+"<p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за подписване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от ден.</p>\n"
+"<p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за вашия S/MIME "
+"сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Коренния сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+" <p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от ден.</p>\n"
+"<p>Коренния сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за подписване</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за подписване</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашия S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от ден.</p>\n"
+"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за вашия S/"
+"MIME сертификат за шифроване</p><p align=center><b>%1</b> (сериен номер %2)</"
+"p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от ден.</p>\n"
+"<p>Междинният СА сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (сериен номер %2)</p><p>изтича след "
+"по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-" "
+" <p>Вашият S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
+"(сериен номер %2)</p><p>изтича след по-малко от ден.</p>\n"
 "<p>Вашият S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Вашият S/MIME сертификат за подписване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"(сериен номер %2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-" "
-"<p>Вашият S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
+" <p>Вашият S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
+"(сериен номер %2)</p><p>изтича след по-малко от ден.</p>\n"
 "<p>Вашият S/MIME сертификат за шифроване</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"(сериен номер %2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от ден.</p>\n"
-"<p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> "
-"(сериен номер %2)</p>"
-"<p>изтича след по-малко от %n дни.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от ден.</p>\n"
+"<p>Вашият S/MIME сертификат за</p><p align=center><b>%1</b> (сериен номер "
+"%2)</p><p>изтича след по-малко от %n дни.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5166,18 +4949,19 @@ msgstr "S/MIME сертификатът изтича скоро"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Един или повече от настроените OpenPGP ключове за шифроване или S/MIME "
-"сертификата е непригоден за шифроване. Моля, настройте наново ключовете си за "
-"шифроване и сертификатите за тази самоличност в диалоговия прозорец "
+"сертификата е непригоден за шифроване. Моля, настройте наново ключовете си "
+"за шифроване и сертификатите за тази самоличност в диалоговия прозорец "
 "\"Самоличност\".\n"
-"Ако изберете да продължите и ключовете потрябват по-късно, ще бъдете попитан за "
-"ключове, които да се използват."
+"Ако изберете да продължите и ключовете потрябват по-късно, ще бъдете попитан "
+"за ключове, които да се използват."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5205,43 +4989,43 @@ msgstr "Неизползваеми ключове за подписване"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Проверката на настройките за шифроване на получателя установи, че съобщението "
-"трябва да се шифрова с OpenPGP, поне за някои получатели.\n"
+"Проверката на настройките за шифроване на получателя установи, че "
+"съобщението трябва да се шифрова с OpenPGP, поне за някои получатели.\n"
 "Само че вие не сте настроили валидни надеждни OpenPGP ключове за тази "
 "самоличност.\n"
-"Можете да продължите без шифроване до самите вас, но имайте предвид, че няма да "
-"можете да четете собствените си съобщения."
+"Можете да продължите без шифроване до самите вас, но имайте предвид, че няма "
+"да можете да четете собствените си съобщения."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Проверката на настройките за шифроване на получателя установи, че съобщението "
-"трябва да се шифрова с S/MIME, поне за някои получатели.\n"
+"Проверката на настройките за шифроване на получателя установи, че "
+"съобщението трябва да се шифрова с S/MIME, поне за някои получатели.\n"
 "Само че вие не сте настроили валидни S/MIME сертификати за шифроване за тази "
 "самоличност.\n"
-"Можете да продължите без шифроване до самите вас, но имайте предвид, че няма да "
-"можете да четете собствените си съобщения."
+"Можете да продължите без шифроване до самите вас, но имайте предвид, че няма "
+"да можете да четете собствените си съобщения."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Проверката на настройките за подписване на получателя установи, че съобщението "
-"трябва да се подпише с OpenPGP, поне за някои получатели.\n"
+"Проверката на настройките за подписване на получателя установи, че "
+"съобщението трябва да се подпише с OpenPGP, поне за някои получатели.\n"
 "Само че вие не сте настроили валидни надеждни OpenPGP ключове за тази "
 "самоличност."
 
@@ -5251,13 +5035,13 @@ msgstr "Без OpenPGP подпис"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Проверката на настройките за подписване на получателя установи, че съобщението "
-"трябва да се подпише с S/MIME, поне за някои получатели.\n"
+"Проверката на настройките за подписване на получателя установи, че "
+"съобщението трябва да се подпише с S/MIME, поне за някои получатели.\n"
 "Само че вие не сте настроили валидни надеждни S/MIME сертификати за тази "
 "самоличност."
 
@@ -5271,8 +5055,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Проверката на настройките за подписване на получателя установи, че няма общ тип "
-"подпис съвпадащ с вашите налични ключове за подписване.\n"
+"Проверката на настройките за подписване на получателя установи, че няма общ "
+"тип подпис съвпадащ с вашите налични ключове за подписване.\n"
 "Изпращане на съобщението без подписване?"
 
 #: keyresolver.cpp:1335
@@ -5281,8 +5065,8 @@ msgstr "Не е възможно подписване"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Не избрахте ключ за шифроване до вас самите. Ако шифровате собствените си "
 "съобщения, няма да можете да ги разшифровате след това."
@@ -5301,16 +5085,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Не избрахте ключ за шифроване за получателя на съобщението. Затова съобщението "
-"няма да бъде шифровано."
+"Не избрахте ключ за шифроване за получателя на съобщението. Затова "
+"съобщението няма да бъде шифровано."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Не избрахте ключ за шифроване за който и да е от получателите на съобщението. "
-"Затова съобщението няма да бъде шифровано."
+"Не избрахте ключ за шифроване за който и да е от получателите на "
+"съобщението. Затова съобщението няма да бъде шифровано."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5321,16 +5105,16 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Не избрахте ключ за шифроване за един от получателите., ако го шифровате този "
-"човек няма да може да разшифровате съобщението."
+"Не избрахте ключ за шифроване за един от получателите., ако го шифровате "
+"този човек няма да може да разшифровате съобщението."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Не избрахте ключ за шифроване за някои от получателите: ако го шифровате тези "
-"хора няма да могат да разшифроват съобщението."
+"Не избрахте ключ за шифроване за някои от получателите: ако го шифровате "
+"тези хора няма да могат да разшифроват съобщението."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5354,11 +5138,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Не е открит валиден и надежден шифроващ ключ за \"%1\".\n"
 "\n"
@@ -5407,10 +5191,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Критична грешка: събирането на поща невъзможно: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Грешка при добавяне добавяне на съобщение:\n"
+msgid "Failed to add message:\n"
+msgstr "Грешка при добавяне добавяне на съобщение:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5455,8 +5237,7 @@ msgstr "Преместване на съобщение %3 от %2 от %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Грешка при изтриване на поща от пощенска кутия <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Грешка при изтриване на поща от пощенска кутия <b>%1</b>:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5502,6 +5283,52 @@ msgstr "IMAP &несвързана"
 msgid "&Maildir mailbox"
 msgstr "Пощенска кутия &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Задаване тема на съобщение"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Изпращане на \"копие до:\" до \"адрес\""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Изпращане \"скр. копие до:\" до \"адрес\""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Добавяне на \"заглавна част\" към съобщение"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Прочитане на тяло на съобщение от \"файл\""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Задаване тяло на съобщение"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Добавяне на прикрепен файл към пощата. Това може да се повтаря"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Проверка само за нова поща"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Само отваряне на прозорец за съчинение"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Преглед на дадения файл със съобщения"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Изпращане на съобщение до \"адрес\" и съответно прикачване на файла към "
+"който сочи адреса"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Поща"
@@ -5544,8 +5371,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail ще създаде необходимите екипни папки като подпапки на %1; ако не искате, "
-"натиснете \"Отказ\" и IMAP ресурс ще бъде изключен"
+"KMail ще създаде необходимите екипни папки като подпапки на %1; ако не "
+"искате, натиснете \"Отказ\" и IMAP ресурс ще бъде изключен"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5557,13 +5384,13 @@ msgstr "%1: открита папка %2. Ще бъде посочена кат�
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail откри следните екипни папки в %1 и трябва да изпълни следните "
-"операции: %2"
-"<br>Ако не искате това, натиснете \"Отказ\" и IMAP ресурса ще бъде изключен"
+"операции: %2<br>Ако не искате това, натиснете \"Отказ\" и IMAP ресурса ще "
+"бъде изключен"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5611,11 +5438,11 @@ msgstr "Адресът (URL) е копиран в буфера."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Файл <b>%1</b> съществува.<br>Искате ли да го замените?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Запис във файл"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Замяна"
 
@@ -5633,7 +5460,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Съобщението беше премахнато по време на записа и не беше запазено."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5653,11 +5480,11 @@ msgstr "Файлът не съдържа съобщение."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Файлът съдържа множество съобщения. Показано е само първото съобщение."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5666,83 +5493,83 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Филтриране на съобщенията"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Филтриране на съобщение %1 от %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Недостатъчно дисково пространство?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Преместване в тази папка"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Копиране в тази папка"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr "Повреден IMAP кеш в папка %1. Копирането е прекъснато."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Преместване на съобщенията"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Изтриване на съобщенията"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Отваряне на адрес (URL)..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Наистина ли искате да изпълните <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Не са открити прикрепени файлове, които да бъдат записани."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Запис на прикрепените файлове в"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "прикрепен файл.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "прикрепен файл.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Вече има файл с име %1. Искате ли да бъде презаписан?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Вече има такъв файл"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Презапис"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5750,30 +5577,31 @@ msgstr ""
 "Частта %1 от съобщението е шифрована. Искате ли да запазите шифроването при "
 "запис?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail въпрос"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Запазване на шифроването"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Без запазване"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"Частта %1 от съобщението е подписано. Искате ли да запазите подписа при запис?"
+"Частта %1 от съобщението е подписано. Искате ли да запазите подписа при "
+"запис?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Запазване на подписа"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5782,22 +5610,22 @@ msgstr ""
 "Грешка при запис на файл %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Грешка при запис на файл %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Няма запис в адресника за този адрес. Добави ги и след това добавете адрес за "
-"моментни съобщения като използвате предпочитания си клиент за изпращане на "
-"съобщения."
+"Няма запис в адресника за този адрес. Добави ги и след това добавете адрес "
+"за моментни съобщения като използвате предпочитания си клиент за изпращане "
+"на съобщения."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5807,71 +5635,71 @@ msgstr ""
 " %1\n"
 " не е възможно да се определи с кого да се започне разговор."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus не предлага функцията \"x-obtain-keys\". Моля, съобщете за тази "
 "програмна грешка."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus грешка"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Неочаквана стойност, върната от Chiasmus: Функцията \"x-obtain-keys\" не върна "
-"списък с низове. Моля, съобщете тази програмна грешка."
+"Неочаквана стойност, върната от Chiasmus: Функцията \"x-obtain-keys\" не "
+"върна списък с низове. Моля, съобщете тази програмна грешка."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Не са открити ключове. Моля, проверете дали е зададен валиден път в настройките "
-"на Chiasmus."
+"Не са открити ключове. Моля, проверете дали е зададен валиден път в "
+"настройките на Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Избор на Chiasmus разшифроващ ключ"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus не предлага \"x-decrypt\" функцията. Моля, съобщете за тази програмна "
-"грешка."
+"Chiasmus не предлага \"x-decrypt\" функцията. Моля, съобщете за тази "
+"програмна грешка."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Функцията \"x-decrypt\" не приема очакваните параметри. Моля, съобщете за тази "
-"програмна грешка."
+"Функцията \"x-decrypt\" не приема очакваните параметри. Моля, съобщете за "
+"тази програмна грешка."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus грешка при разшифроване"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Неочаквана стойност, върната от Chiasmus: Функцията \"x-decrypt\" не върна "
 "масив от байтове. Моля, съобщете за тази програмна грешка."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5881,7 +5709,7 @@ msgstr ""
 "До: %2\n"
 "Тема: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Поща: %1"
@@ -5980,7 +5808,7 @@ msgstr "Размер"
 msgid "Encoding"
 msgstr "Кодова таблица"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Компресиране"
 
@@ -5992,7 +5820,7 @@ msgstr "Шифроване"
 msgid "Sign"
 msgstr "Електронно подписване"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Име на прикрепен файл:"
 
@@ -6014,7 +5842,8 @@ msgstr "Основни получатели"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>Електронният адрес, който поставите в полето, ще получи копие на "
 "съобщението.</qt>"
@@ -6026,14 +5855,14 @@ msgstr "Допълнителни получатели"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Електронните адреси, които добавите в това поле, ще получат копие от "
-"писмото. Технически това е същото като да напишете всички адреси в полето \"<b>"
-"До:</b>\", но разликата се състои в това, че получателят на копието няма да "
-"бъде основният получател, а само страничен наблюдател.</qt>"
+"писмото. Технически това е същото като да напишете всички адреси в полето "
+"\"<b>До:</b>\", но разликата се състои в това, че получателят на копието "
+"няма да бъде основният получател, а само страничен наблюдател.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6041,12 +5870,11 @@ msgstr "Скрити получатели"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>В основата си това е същото като полето <b>Копие до:</b>"
-", но се различава по това, че всички останали получатели не виждат кой получава "
+"<qt>В основата си това е същото като полето <b>Копие до:</b>, но се "
+"различава по това, че всички останали получатели не виждат кой получава "
 "копие.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -6057,7 +5885,7 @@ msgstr "&Изпращане на поща"
 msgid "&Send Mail Via"
 msgstr "&Изпращане на поща с"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Изпращане &по-късно"
@@ -6122,8 +5950,7 @@ msgstr "&Изтриване на символи за цитиране"
 msgid "Cl&ean Spaces"
 msgstr "Изчистване на ин&тервалите"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Равноширок шрифт"
@@ -6264,31 +6091,31 @@ msgstr "&Формат на шифрованото съобщение"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандартен"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Списък с водачи (диск)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Списък с водачи (кръг)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Списък с водачи (квадрат)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Номериран списък (десетично)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Номериран списък (малки букви)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Номериран списък (големи букви)"
 
@@ -6372,16 +6199,16 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Нов запис на съобщението в папка \"Чернови\". По-късно може да бъде изпратено "
-"по всяко време."
+"Нов запис на съобщението в папка \"Чернови\". По-късно може да бъде "
+"изпратено по всяко време."
 
 #: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Запис на съобщението в папка \"Чернови\". По-късно може да бъде редактирано и "
-"изпратено."
+"Запис на съобщението в папка \"Чернови\". По-късно може да бъде редактирано "
+"и изпратено."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6393,8 +6220,8 @@ msgstr "Затваряне на прозореца за съчиняване"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Съобщението, което написахте сочи към прикрепен файл, но не сте прикрепили "
@@ -6405,52 +6232,51 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Напомняне за прикрепени файлове"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Изпращане &както си е"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail не откри местоположението на прикрепен файл (%1); </p> "
+"<qt><p>KMail не откри местоположението на прикрепен файл (%1); </p> "
 "<p>трябва да посочите пълният път, ако искате да прикрепите файл.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Вашият администратор е забранил прикрепянето на файлове по-големи от %1 "
-"МБ.</p>"
+"<qt><p>Вашият администратор е забранил прикрепянето на файлове по-големи от "
+"%1 МБ.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Прикрепяне на файл"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Прикреп&яне"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Вмъкване на файл"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Вмъкване на файл"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Възникна грешка при опит за експортиране на ключа:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Възникна грешка при опит за експортиране на ключа:</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6489,293 +6315,303 @@ msgid ""
 "View"
 msgstr "Преглед"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Редактиране..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Редактиране с..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Запис като..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Настройки"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Добавяне на прикрепен файл..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail не може да компресира файла."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"Компресираният файл е по-голям от оригиналния. Искате ли да запазите оригинала?"
+"Компресираният файл е по-голям от оригиналния. Искате ли да запазите "
+"оригинала?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Запазване"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail не може да разкомпресира файла."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Запис на прикрепения файл като"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Добавяне като текст"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Добавяне като прикрепен файл"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
-"Моля, изберете дали искате да вмъкнете съдържанието като текст в редактора или "
-"да изпратено като прикрепен файл."
+"Моля, изберете дали искате да вмъкнете съдържанието като текст в редактора "
+"или да изпратено като прикрепен файл."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Поставяне като прикрепен файл?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "без име"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Поискахте съобщението да бъде шифровано до вас самите, но текущата "
-"самоличност не е определила (OpenPGP или S/MIME) ключ.</p>"
-"<p>Моля, направете го от настройките на самоличността.</p></qt>"
+"<qt><p>Поискахте съобщението да бъде шифровано до вас самите, но текущата "
+"самоличност не е определила (OpenPGP или S/MIME) ключ.</p><p>Моля, направете "
+"го от настройките на самоличността.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Неопределен шифроващ ключ"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>За да може да бъде подписано съобщението първо трябва да определите (OpenPGP "
-"or S/MIME) ключ, който да бъде използван.</p>"
-"<p>Моля, направете го от настройките на самоличността.</p></qt>"
+"<qt><p>За да може да бъде подписано съобщението първо трябва да определите "
+"(OpenPGP or S/MIME) ключ, който да бъде използван.</p><p>Моля, направете го "
+"от настройките на самоличността.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Неопределен подписващ ключ"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"В момента програмата е изключена от мрежата. Съобщенията ви ще бъдат запазени в "
-"папка \"изходящи\" докато се включите."
+"В момента програмата е изключена от мрежата. Съобщенията ви ще бъдат "
+"запазени в папка \"изходящи\" докато се включите."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Вкл/Изкл"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Трябва да въведете вашата е-поща в полето \"От:\". Задайте е-пощата си за "
 "всички самоличности, за да не я въвеждате ръчно при всяко съобщение."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Трябва да посочите поне един получател в полето \"До\", \"Копие до\", или "
 "\"Скрито копие до\"."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Полето е празно. Изпращане на съобщението въпреки това?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Полето \"До\" не е попълнено"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Не сте написали тема. Изпращане на съобщението въпреки това?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Няма тема"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Изпращане &както си е"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Задаване на тема"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Запазване на метатекст, без подписване/шифроване"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Запазване на метатекст, без шифроване"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Запазване на метатекст, без подписване"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Подписване/шифроване (изтриване на метатекст)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Шифроване (изтриване на метатекст)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Подписване (изтриване на метатекст)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Вграденото подписване/шифроване на HTML съобщение е невъзможно;</p>"
-"<p>Искате ли метатекстът да бъде изтрит?</p></qt>"
+"<qt><p>Вграденото подписване/шифроване на HTML съобщение е невъзможно;</"
+"p><p>Искате ли метатекстът да бъде изтрит?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Подписване/Шифроване на съобщение?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Потребителска папка за чернови или шаблони за самоличност \"%1\" не съществува. "
-"Затова ще бъде използвана тази по подразбиране."
+"Потребителска папка за чернови или шаблони за самоличност \"%1\" не "
+"съществува. Затова ще бъде използвана тази по подразбиране."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Моля, създайте сметка за изпращане и опитайте отново."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Подготовка за изпращане..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Изпращане на потвърждение"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Изпра&щане сега"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Без получатели"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Допълнителни получатели"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Проверка на правописа: вкл."
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Проверка на правописа: изкл."
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Проверката на правописа е отменена."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Проверката на правописа е спряна."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Проверката на правописа завърши."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Проверка на правописа"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Моля, първо настройте шифроваща услуга за Chiasmus шифроване.\n"
 "Можете да направите това от подпрозореца \"Crypto Backends\" в прозореца "
 "\"Сигурност\"."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Изглежда libkleopatra е компилирана с Chiasmus поддръжка. Може би ще искате да "
-"компилирате наново libkleopatra с --enable-chiasmus."
+"Изглежда libkleopatra е компилирана с Chiasmus поддръжка. Може би ще искате "
+"да компилирате наново libkleopatra с --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Не е настроен Chiasmus"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Не са открити Chiasmus ключове"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Избор на Chiasmus шифроващ ключ"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Съобщението ще бъде подписано"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Съобщението няма да бъде подписано"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Съобщението ще бъде шифровано"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Съобщението няма да бъде шифровано"
 
@@ -6824,8 +6660,8 @@ msgstr "Проверка на правопис - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Грешка при стартиране на ISpell/Aspell. Уверете се, че имате инсталирани и "
 "правилно настроени ISpell или Aspell в пътя ви."
@@ -6861,12 +6697,10 @@ msgstr "<qt>Твърде много действия в правило за фи
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Неизвестно действие на филтър <b>%1</b> "
-"<br>в правило <b>%2</b>."
+"<qt>Неизвестно действие на филтър <b>%1</b> <br>в правило <b>%2</b>."
 "<br>Игнориране.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7087,165 +6921,131 @@ msgstr "Звуков сигнал"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Това е списък от дефинирани филтри. Те се обработват отгоре надолу</p>"
-"<p>Щракнете върху филтър, за да го редактирате чрез бутоните отдясно в "
+"<qt><p>Това е списък от дефинирани филтри. Те се обработват отгоре надолу</"
+"p><p>Щракнете върху филтър, за да го редактирате чрез бутоните отдясно в "
 "диалоговия прозорец.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>За да създадете нов филтър натиснете бутона.</p>"
-"<p>Той ще бъде вмъкнат точно преди текущо избраният, но по-късно можете винаги "
-"да промените това.</p>"
-"<p>Ако сте го натиснали по погрешка, може да отмените това с бутона \"<em>"
-"Изтриване</em>\"( в дясно).</p></qt>"
+"<qt><p>За да създадете нов филтър натиснете бутона.</p><p>Той ще бъде "
+"вмъкнат точно преди текущо избраният, но по-късно можете винаги да промените "
+"това.</p><p>Ако сте го натиснали по погрешка, може да отмените това с бутона "
+"\"<em>Изтриване</em>\"( в дясно).</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натиснете бутона за да създадете нов филтър.</p>"
-"<p>Ако сте го натиснали по погрешка, може да отмените това с бутона \"<em>"
-"Изтриване</em>\"( в дясно).</p></qt>"
+"<qt><p>Натиснете бутона за да създадете нов филтър.</p><p>Ако сте го "
+"натиснали по погрешка, може да отмените това с бутона \"<em>Изтриване</em>"
+"\"( в дясно).</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натиснете бутона, за да <em>изтриете</em> текущо избраният филтър от "
-"списъкът по-горе.</p>"
-"<p>Няма начин да върнете изтрит филтър, но винаги можете да излезете от този "
-"диалогов прозорец чрез натискане на \"<em>Отмяна</em>"
-"\" за да отмените промените.</p></qt>"
+"<qt><p>Натиснете бутона, за да <em>изтриете</em> текущо избраният филтър от "
+"списъкът по-горе.</p><p>Няма начин да върнете изтрит филтър, но винаги "
+"можете да излезете от този диалогов прозорец чрез натискане на \"<em>Отмяна</"
+"em>\" за да отмените промените.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натиснете бутона, за да преместите текущо избраният филтър <em>нагоре</em> "
-"в списъка</p>"
-"<p>Това е полезно понеже реда на филтрите в списъка определя и реда по който те "
-"се прилагат върху съобщенията. Най-горният филтър се прилага първи върху "
-"съобщение.</p></qt>"
+"<qt><p>Натиснете бутона, за да преместите текущо избраният филтър "
+"<em>нагоре</em> в списъка</p><p>Това е полезно понеже реда на филтрите в "
+"списъка определя и реда по който те се прилагат върху съобщенията. Най-"
+"горният филтър се прилага първи върху съобщение.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Натиснете бутона, за да преместите текущо избраният филтър <em>нагоре</em> "
-"в списъка</p>"
-"<p>Това е полезно понеже реда на филтрите в списъка определя и реда по който те "
-"се прилагат върху съобщенията. Най горният филтър се прилага първи върху "
-"съобщение.</p>"
-"<p>Ако сте го натиснали по невнимание, използвайте бутона \"<em>надолу</em>"
-"\" (в дясно)</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Натиснете бутона, за да преместите текущо избраният филтър "
+"<em>нагоре</em> в списъка</p><p>Това е полезно понеже реда на филтрите в "
+"списъка определя и реда по който те се прилагат върху съобщенията. Най "
+"горният филтър се прилага първи върху съобщение.</p><p>Ако сте го натиснали "
+"по невнимание, използвайте бутона \"<em>надолу</em>\" (в дясно)</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Натиснете бутона, за да преместите текущо избраният филтър <em>надолу</em> "
-"в списъка</p>"
-"<p>Това е полезно понеже реда на филтрите в списъка определя и реда по който те "
-"се прилагат върху съобщенията. Най-горният филтър се прилага първи върху "
-"съобщение.</p>"
-"<p>Ако сте натиснали го по невнимание използвайте бутона \"<em>нагоре</em>"
-"\" (в дясно)</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Натиснете бутона, за да преместите текущо избраният филтър "
+"<em>надолу</em> в списъка</p><p>Това е полезно понеже реда на филтрите в "
+"списъка определя и реда по който те се прилагат върху съобщенията. Най-"
+"горният филтър се прилага първи върху съобщение.</p><p>Ако сте натиснали го "
+"по невнимание използвайте бутона \"<em>нагоре</em>\" (в дясно)</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натиснете бутона, за да преместите текущо избраният филтър <em>надолу</em> "
-"в списъка</p>"
-"<p>Това е полезно понеже реда на филтрите в списъка определя и реда по който те "
-"се прилагат върху съобщенията. Най-горният филтър се прилага първи върху "
-"съобщение.</p></qt>"
+"<qt><p>Натиснете бутона, за да преместите текущо избраният филтър "
+"<em>надолу</em> в списъка</p><p>Това е полезно понеже реда на филтрите в "
+"списъка определя и реда по който те се прилагат върху съобщенията. Най-"
+"горният филтър се прилага първи върху съобщение.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Натиснете бутона, за да преименувате текущо избрания филтър.</p>"
-"<p> Филтрите автоматично получават име, ако започват с \"&lt;\".</p>"
-"<p>Ако сте преименували филтър по невнимание, натиснете този бутон и изберете "
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Натиснете бутона, за да преименувате текущо избрания филтър.</p><p> "
+"Филтрите автоматично получават име, ако започват с \"&lt;\".</p><p>Ако сте "
+"преименували филтър по невнимание, натиснете този бутон и изберете "
 "\"<em>Изчистване</em>\" и след това \"<em>Да</em>\" в появилия се диалогов "
 "прозорец.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Включете тук, за да бъде показван диалогов прозорец за потвърждение.</p>"
-"<p>Това е полезно понеже реда на филтрите в списъка определя и реда по който те "
-"се прилагат върху съобщенията. Без възможността за показване на диалогов "
-"прозорец, тези съобщения може никога да не бъдат изтеглени, ако на сървъра няма "
-"други обемни съобщения или, ако искате да промените правилата да маркират "
-"съобщенията по различен начин.</p></qt>"
+"<qt><p>Включете тук, за да бъде показван диалогов прозорец за потвърждение.</"
+"p><p>Това е полезно понеже реда на филтрите в списъка определя и реда по "
+"който те се прилагат върху съобщенията. Без възможността за показване на "
+"диалогов прозорец, тези съобщения може никога да не бъдат изтеглени, ако на "
+"сървъра няма други обемни съобщения или, ако искате да промените правилата "
+"да маркират съобщенията по различен начин.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7255,6 +7055,16 @@ msgstr "Правила за филтриране на РОР3"
 msgid "Filter Rules"
 msgstr "Правила за филтриране"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Импортиране"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Импортиране"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Налични филтри"
@@ -7278,8 +7088,8 @@ msgstr "Глобални настройки"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"Винаги показ&ване на съобщенията \"Изтегляне на поща по-късно\" в прозорец за "
-"потвърждение"
+"Винаги показ&ване на съобщенията \"Изтегляне на поща по-късно\" в прозорец "
+"за потвърждение"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7337,6 +7147,11 @@ msgstr "Допълнително добавяне на филтъра към л�
 msgid "Icon for this filter:"
 msgstr "Икона за този филтър:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "До"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Нагоре"
@@ -7345,16 +7160,29 @@ msgstr "Нагоре"
 msgid "Down"
 msgstr "Надолу"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Преименуване..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Нов"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Копир&ане в"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Изтрити"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7363,12 +7191,12 @@ msgstr "Избор на пряк път до папка"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Поне един филтър се прилага за папка на включена IMAP сметка. Такива филтри ще "
-"бъдат приложени само при ръчно филтриране и при филтриране на входяща IMAP "
-"поща."
+"Поне един филтър се прилага за папка на включена IMAP сметка. Такива филтри "
+"ще бъдат приложени само при ръчно филтриране и при филтриране на входяща "
+"IMAP поща."
 
 #: kmfilterdlg.cpp:786
 msgid ""
@@ -7432,15 +7260,16 @@ msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Имената на папки не могат да започват със символа \".\" (точка). Моля, изберете "
-"друго име за папка."
+"Имената на папки не могат да започват със символа \".\" (точка). Моля, "
+"изберете друго име за папка."
 
 #: kmfolder.cpp:932
 msgid ""
 "Your IMAP server does not allow the character '%1'; please choose another "
 "folder name."
 msgstr ""
-"IMAP сървъра ви не позволява символ \"%1\". Моля, изберете друго име за папка."
+"IMAP сървъра ви не позволява символ \"%1\". Моля, изберете друго име за "
+"папка."
 
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
@@ -7448,29 +7277,25 @@ msgstr "Откриване на проблеми с IMAP кеш"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Откриване на проблеми с IMAP кеша.</b></p>"
-"<p>Ако имате проблеми със синхронизирането на IMAP папка, първо трябва да "
-"опитате да създадете отново индексния файл. Това ще отнеме известно време, но "
-"няма да причини някакви проблеми.</p>"
-"<p>Ако това не е достатъчно, можете да опитате да опресните IMAP кеша., ако "
-"направите това, ще загубите всички локални промени за тази папка и всички нейни "
-"подпапки.</p>"
+"<p><b>Откриване на проблеми с IMAP кеша.</b></p><p>Ако имате проблеми със "
+"синхронизирането на IMAP папка, първо трябва да опитате да създадете отново "
+"индексния файл. Това ще отнеме известно време, но няма да причини някакви "
+"проблеми.</p><p>Ако това не е достатъчно, можете да опитате да опресните "
+"IMAP кеша., ако направите това, ще загубите всички локални промени за тази "
+"папка и всички нейни подпапки.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7501,16 +7326,16 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"UID кешът за папка %1 не може да бъде прочетен. Сигурно има проблем с правата "
-"за достъп или файлът е повреден."
+"UID кешът за папка %1 не може да бъде прочетен. Сигурно има проблем с "
+"правата за достъп или файлът е повреден."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"UID кешът за папка %1 не може да бъде записан. Сигурно има проблем с правата за "
-"достъп или файлът е повреден."
+"UID кешът за папка %1 не може да бъде записан. Сигурно има проблем с правата "
+"за достъп или файлът е повреден."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7531,8 +7356,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Сигурни ли сте, че искате IMAP кеша на папка %1 и всички нейни подпапки да бъде "
-"опреснен?\n"
+"Сигурни ли сте, че искате IMAP кеша на папка %1 и всички нейни подпапки да "
+"бъде опреснен?\n"
 "Това ще изтрие всички локално извършени промени в папките."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7549,11 +7374,11 @@ msgstr "Индексът на тази папка бе създаден нано
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Папка %1 не е в първоначално състояние на синхронизация (състоянието беше %2). "
-"Искате ли да я възстановите до първоначалното и състояние и да я "
+"Папка %1 не е в първоначално състояние на синхронизация (състоянието беше "
+"%2). Искате ли да я възстановите до първоначалното и състояние и да я "
 "синхронизирате?"
 
 #: kmfoldercachedimap.cpp:777
@@ -7659,8 +7484,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Правата ви за достъп до папка <b>%1</b> са ограничени. Не можете повече да "
-"добавяте там.</p>"
+"<p>Правата ви за достъп до папка <b>%1</b> са ограничени. Не можете повече "
+"да добавяте там.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7681,15 +7506,11 @@ msgstr "Създаване на подпапки на сървъра"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Пощата в папка <b>%1</b> на сървъра е изтрита. Искате ли да я изтриете и "
-"локално?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Пощата в папка <b>%1</b> на сървъра е изтрита. Искате ли да я "
+"изтриете и локално?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7710,13 +7531,11 @@ msgstr "Изтегляне на папки за обект %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p> Изглежда папка <b>%1</b> е изтрита. Искате ли да я изтриете от сървъра?</p>"
-"</qt>"
+"<qt><p> Изглежда папка <b>%1</b> е изтрита. Искате ли да я изтриете от "
+"сървъра?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7724,16 +7543,16 @@ msgstr "Прекъснат"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"IMAP сървърът %1 няма поддръжка за IMAP анотации. XML хранилището не може да се "
-"използва на този сървър. Моля, променете настройките на KMail."
+"IMAP сървърът %1 няма поддръжка за IMAP анотации. XML хранилището не може да "
+"се използва на този сървър. Моля, променете настройките на KMail."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP сървърът %1 не поддържа IMAP анотации. XML хранилището не може да се "
 "използва на този сървър. Моля, променете настройките на KMail."
@@ -7748,16 +7567,16 @@ msgstr "lost+found"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Има нови съобщения в папка <b>%1</b>, които все още не са качени на сървъра, "
-"но изглежда нямате достатъчно права за достъп в папката.</p>"
-"<p>Засегнатите съобщения ще бъдат преместени в <b>%2</b> "
-"с цел да се избегне загубата на данни.</p>"
+"<p>Има нови съобщения в папка <b>%1</b>, които все още не са качени на "
+"сървъра, но изглежда нямате достатъчно права за достъп в папката.</"
+"p><p>Засегнатите съобщения ще бъдат преместени в <b>%2</b> с цел да се "
+"избегне загубата на данни.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7765,20 +7584,24 @@ msgstr "Недостатъчни права за достъп"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Има нови съобщения в папката (%1), които все още не са качени на сървъра, но "
-"изглежда нямате достатъчно права за достъп в папката. Моля, свържете се с "
-"администратора си, за да разреши качване на нови съобщения или ги преместете от "
-"тази папка.</p> "
-"<p>Искате ли да преместите съобщенията в друга папка?</p>"
+"<p>Има нови съобщения в папката (%1), които все още не са качени на сървъра, "
+"но изглежда нямате достатъчно права за достъп в папката. Моля, свържете се с "
+"администратора си, за да разреши качване на нови съобщения или ги преместете "
+"от тази папка.</p> <p>Искате ли да преместите съобщенията в друга папка?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Преместване в:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Без преместване"
 
@@ -7790,8 +7613,7 @@ msgstr "Преместване на съобщенията в папка"
 msgid "Permissions (ACL)"
 msgstr "Права (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Общи"
@@ -7815,8 +7637,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Изпол&зване на потребителски икони"
@@ -7835,23 +7656,21 @@ msgstr "Индикация при нова/непрочетена поща в т
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ако е включена тази опция, ще бъдете уведомявани за нова/непрочетена поща в "
-"папката. Освен това, при преминаването към следваща/предишна папка с "
-"непрочетени съобщения ще спре на тази папка.</p>"
-"<p>Изключете опцията, ако не искате да бъдете уведомявани за нова/непрочетена "
-"поща в папката и, ако искате тя да бъде прескачана при преминаване към "
-"следваща/предишна папка с непрочетени съобщения. Това намира приложение при "
-"игнориране на нова/непрочетена поща в папките \"Кошче\" или \"Спам\".</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Ако е включена тази опция, ще бъдете уведомявани за нова/непрочетена "
+"поща в папката. Освен това, при преминаването към следваща/предишна папка с "
+"непрочетени съобщения ще спре на тази папка.</p><p>Изключете опцията, ако не "
+"искате да бъдете уведомявани за нова/непрочетена поща в папката и, ако "
+"искате тя да бъде прескачана при преминаване към следваща/предишна папка с "
+"непрочетени съобщения. Това намира приложение при игнориране на нова/"
+"непрочетена поща в папките \"Кошче\" или \"Спам\".</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7863,13 +7682,13 @@ msgstr "Запазване на отговорите в тази папка"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Включете тази отметка, ако искате отговорите, които сте писали на съобщения в "
-"тази папка, да бъдат поставени в същата папка след изпращане вместо в папката "
-"\"Изпратени\"."
+"Включете тази отметка, ако искате отговорите, които сте писали на съобщения "
+"в тази папка, да бъдат поставени в същата папка след изпращане вместо в "
+"папката \"Изпратени\"."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7879,17 +7698,21 @@ msgstr "Показване на колоната \"Подател/Получат
 msgid "Sho&w column:"
 msgstr "По&казване на колона:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Настройки по подразбиране"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Подател"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Получател"
@@ -7900,18 +7723,18 @@ msgstr "Самоличност на пода&теля:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Изберете самоличността на подателя, който да се използва при писане на нова "
 "поща или отговаряне в тази папка. Това означава, че, ако сте в една от "
-"работните си папки, можете да накарате KMail да използва съответния електронен "
-"адрес, подпис и подписващ или шифроващ ключ автоматично. Самоличностите могат "
-"да бъдат настроени в главния диалогов прозорец за настройки. (Настройки->"
-"Настройване на KMail)"
+"работните си папки, можете да накарате KMail да използва съответния "
+"електронен адрес, подпис и подписващ или шифроващ ключ автоматично. "
+"Самоличностите могат да бъдат настроени в главния диалогов прозорец за "
+"настройки. (Настройки->Настройване на KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7929,21 +7752,22 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Настройките определят кои потребители, споделящи папката, ще получат състояние "
-"\"зает\" в списъка си свободен/зает и трябва да видят аларма за тази папка. "
-"Настройките се отнасят само за папките \"Календар\" и \"Задачи\" (за задачи "
-"настройките се използват само за аларми).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Настройките определят кои потребители, споделящи папката, ще получат "
+"състояние \"зает\" в списъка си свободен/зает и трябва да видят аларма за "
+"тази папка. Настройките се отнасят само за папките \"Календар\" и \"Задачи"
+"\" (за задачи настройките се използват само за аларми).\n"
 "\n"
 "Примери на употреба:, ако шефа сподели папка със секретарката си, само шефът "
-"трябва да бъде отбелязан като \"зает\" за срещите си, така че трябва да избере "
-"\"Админ\", тъй като секретарката няма администраторски права върху папката.\n"
+"трябва да бъде отбелязан като \"зает\" за срещите си, така че трябва да "
+"избере \"Админ\", тъй като секретарката няма администраторски права върху "
+"папката.\n"
 "От друга страна, ако работна група споделя Календар за групови срещи, всички "
 "които четат папките трябва да бъдат отбелязани като \"заети\" за срещи.\n"
 "Обща папка за компанията с допълнителни събития в нея ще използва \"Никой\", "
@@ -7965,8 +7789,8 @@ msgstr "Всички читатели на папката"
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
-"Тази настройка ви дава възможност да изключите алармите за споделените от други "
-"папки. "
+"Тази настройка ви дава възможност да изключите алармите за споделените от "
+"други папки. "
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -7980,23 +7804,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Зададохте папката да съдържа екипна информация, а също така е включена опцията "
-"за скриване на екипни папки. Това означава, че папката ще изчезне след като "
-"диалоговия прозорец се затвори., ако искате отново да премахнете папката, ще "
-"трябва временно да изключите скриването на екипни папки, за да можете да я "
-"виждате."
+"Зададохте папката да съдържа екипна информация, а също така е включена "
+"опцията за скриване на екипни папки. Това означава, че папката ще изчезне "
+"след като диалоговия прозорец се затвори., ако искате отново да премахнете "
+"папката, ще трябва временно да изключите скриването на екипни папки, за да "
+"можете да я виждате."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8065,12 +7889,13 @@ msgstr "Грешка при получаване информацията за �
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Пощенския индекс за \"%1\" е от неизвестна версия на KMail (%2).\n"
 "Този индекс може да бъде възстановен от вашата пощенската папка, но част от "
-"информацията може да бъде загубена. Искате ли да промените индексния си файл до "
-"по-стара версия?"
+"информацията може да бъде загубена. Искате ли да промените индексния си файл "
+"до по-стара версия?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8095,8 +7920,8 @@ msgstr "Грешка при отваряне на %1; папката липсв�
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Грешка при отваряне на %1. Или това е невалидна maildir папка или вие нямате "
 "необходимите права за достъп."
@@ -8118,8 +7943,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: аварийно завършване с цел предотвратяване на загубата "
-"на данни."
+"KMFolderMaildir::addMsg: аварийно завършване с цел предотвратяване на "
+"загубата на данни."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8143,21 +7968,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Индексът на папка \"%2\" изглежда е изтекъл. За да се избегнат проблеми със "
-"съобщенията, индексът ще бъде генериран наново. Като резултат изтритите "
-"съобщения могат да се появят отново и да бъдат загубени флагчетата на "
-"статуса.</p>"
-"<p>За повече информация как избегнете повторното появяване на този проблем, "
-"моля, прочетете тази секция от <a href=\"%1\">ръководство за KMail</a>.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Индексът на папка \"%2\" изглежда е изтекъл. За да се избегнат "
+"проблеми със съобщенията, индексът ще бъде генериран наново. Като резултат "
+"изтритите съобщения могат да се появят отново и да бъдат загубени флагчетата "
+"на статуса.</p><p>За повече информация как избегнете повторното появяване на "
+"този проблем, моля, прочетете тази секция от <a href=\"%1\">ръководство за "
+"KMail</a>.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8217,7 +8039,7 @@ msgstr ""
 "\"%1\" не не изглежда да е папка.\n"
 "Моля, премахнете файла."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8225,7 +8047,7 @@ msgstr ""
 "Правата на папката \"%1\" са неправилни. Моля, уверете се, че можете да "
 "преглеждате и променяте съдържанието на папката."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8236,17 +8058,18 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"От времето на последната проверка на пощата папка с такова име е била изтрита. "
-"Трябва първо да проверите пощите преди да създадете друга папка с такова име."
+"От времето на последната проверка на пощата папка с такова име е била "
+"изтрита. Трябва първо да проверите пощите преди да създадете друга папка с "
+"такова име."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Папката не може да бъде създадена"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8344,13 +8167,13 @@ msgstr "&Откриване на проблеми с IMAP кеша..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Грешка при създаване на папка .\"<b>%1</b>\" заради недостатъчни права на "
-"сървъра., ако мислите , че би трябвало да можете да създавате подпапки тук, "
-"помолете администратора си да ви даде права.</qt> "
+"<qt>Грешка при създаване на папка .\"<b>%1</b>\" заради недостатъчни права "
+"на сървъра., ако мислите , че би трябвало да можете да създавате подпапки "
+"тук, помолете администратора си да ви даде права.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8485,15 +8308,15 @@ msgstr "Папка %1 е само за четене."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Наистина ли искате маркираното съобщение да бъде изтрито?"
-"<br>Веднъж изтрито, то не може да бъде възстановено.</qt>\n"
-"<qt>Наистина ли искате маркираните %n съобщения да бъдат изтрити?"
-"<br>Веднъж изтрити, те не могат да бъдат възстановени.</qt>"
+"<qt>Наистина ли искате маркираното съобщение да бъде изтрито?<br>Веднъж "
+"изтрито, то не може да бъде възстановено.</qt>\n"
+"<qt>Наистина ли искате маркираните %n съобщения да бъдат изтрити?<br>Веднъж "
+"изтрити, те не могат да бъдат възстановени.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8545,132 +8368,130 @@ msgstr ""
 "Грешка при промяна на %1\n"
 "(Няма място на диска?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Искане на сертифициран подпис"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Моля, създайте удостоверение от прикрепен файл и го върнете на подателя."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail е изключена от мрежата. Всички задачи са преустановени."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail е включена в мрежата. Всички задачи са възстановени."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "В момента KMail не е включена в мрежата. Какъв режим ще изберете?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Работа в мрежата"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Работа извън мрежата"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Нямате права за писане/четене в папка \"входяща\"."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Изходяща"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Нямате права за писане/четене в папка \"Изходяща\"."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Изпратена"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Нямате права за писане/четене в папка \"Изпратена\"."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Кошче"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Нямате права за писане/четене в папка \"Кошче\"."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Чернови"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Нямате права за писане/четене в папка \"Чернови\"."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "Шаблони"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Нямате права за писане/четене в папката с шаблоните."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Последно търсене"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Папката <i>%4</i> съществува. %1 използва папка <i>%5</i> "
-"за съобщенията си."
-"<p>%2 може да премести съдържанието на <i>%6<i> в тази папка, макар че това "
-"може да замени някои файлове със същите имена в <i>%7</i>."
+"<qt>Папката <i>%4</i> съществува. %1 използва папка <i>%5</i> за съобщенията "
+"си.<p>%2 може да премести съдържанието на <i>%6<i> в тази папка, макар че "
+"това може да замени някои файлове със същите имена в <i>%7</i>."
 "<p><strong>Искате ли %3 да премести файловете?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Папката <i>%4</i> съществува. %1 използва папка <i>%5</i> "
-"за съобщенията си. %2 може да премести съдържанието на <i>%6<i> в тази папка."
+"<qt>Папката <i>%4</i> съществува. %1 използва папка <i>%5</i> за съобщенията "
+"си. %2 може да премести съдържанието на <i>%6<i> в тази папка."
 "<p><strong>Искате ли %3 да премести файловете?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Преместване на файловете?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail се натъкна на фатална грешка и ще прекъсне"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8681,11 +8502,11 @@ msgstr ""
 "Грешката е:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Изпразване на кошчето"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Сигурни ли сте, че искате кошчето да бъде изпразнено за всички сметки?"
 
@@ -8760,8 +8581,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Пристигна нова поща</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8799,11 +8619,11 @@ msgstr "Сигурни ли сте, че искате кошчето да бъд
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Сигурни ли сте, че искате всички съобщения от папка <b>%1</b> "
-"да бъдат преместени в кошчето?</qt>"
+"<qt>Сигурни ли сте, че искате всички съобщения от папка <b>%1</b> да бъдат "
+"преместени в кошчето?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8827,8 +8647,8 @@ msgstr "Изтриване на търсене"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt>Сигурни ли сте, че искате търсене <b>%1</b> да бъде изтрито?"
 "<br>Съобщенията все още ще бъдат достъпни в оригиналните им папки.</qt>"
@@ -8843,41 +8663,41 @@ msgstr "<qt>Наистина ли искате празната папка <b>%1
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Сигурни ли сте, че искате празната папката <b>%1</b> "
-"и всички нейни подпапки да бъдат изтрити? Тези подпапки може да не са празни и "
-"съдържанието им също ще бъде изтрито. "
-"<p><b>Имайте предвид</b>, че изтритите съобщения не се съхраняват в кошчето, а "
-"се изтриват безвъзвратно.</qt>"
+"<qt>Сигурни ли сте, че искате празната папката <b>%1</b> и всички нейни "
+"подпапки да бъдат изтрити? Тези подпапки може да не са празни и съдържанието "
+"им също ще бъде изтрито. <p><b>Имайте предвид</b>, че изтритите съобщения не "
+"се съхраняват в кошчето, а се изтриват безвъзвратно.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Сигурни ли сте, че папката <b>%1</b> и с нейното съдържание да бъдат "
-"изтрити? "
-"<p><b>Имайте предвид</b>, че изтритите съобщения не се съхраняват в кошчето, а "
-"се изтриват безвъзвратно.</qt>"
+"изтрити? <p><b>Имайте предвид</b>, че изтритите съобщения не се съхраняват в "
+"кошчето, а се изтриват безвъзвратно.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Сигурни ли сте, че искате папката <b>%1</b> и всички нейни подпапки да "
-"бъдат изтрити? "
-"<p><b>Имайте предвид</b>, че изтритите съобщения не се съхраняват в кошчето, а "
-"се изтриват безвъзвратно.</qt>"
+"бъдат изтрити? <p><b>Имайте предвид</b>, че изтритите съобщения не се "
+"съхраняват в кошчето, а се изтриват безвъзвратно.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Изтрити"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8895,9 +8715,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Използването на HTML в писма ще ви направи по-уязвими към спам и може да "
 "увеличи риска от проблеми със сигурността."
@@ -8913,11 +8733,11 @@ msgstr "Използване на HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Зареждането на външни препратки в html поща ще ви направи по-уязвими за спам и "
-"и може да увеличи риска от проблеми със сигурността."
+"Зареждането на външни препратки в html поща ще ви направи по-уязвими за спам "
+"и и може да увеличи риска от проблеми със сигурността."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8933,14 +8753,14 @@ msgstr "Филтриране на пощенски списък %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Отговорът на KMail \"Извън офиса\" е свързан с филтрирането от страна на IMAP "
-"сървъра, но все още не сте настроили такъв.\n"
-"Можете да го направите от подпрозореца \"Филтриране\", когато настройвате IMAP "
-"сметката."
+"Отговорът на KMail \"Извън офиса\" е свързан с филтрирането от страна на "
+"IMAP сървъра, но все още не сте настроили такъв.\n"
+"Можете да го направите от подпрозореца \"Филтриране\", когато настройвате "
+"IMAP сметката."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -8957,7 +8777,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Грешка при стартиране управлението на удостоверенията. Моля, проверете "
 "инсталацията си."
@@ -9279,8 +9100,7 @@ msgstr "&Запис на прикрепените файлове..."
 msgid "Appl&y All Filters"
 msgstr "Прила&гане на всички филтри"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Прилага&не на филтър"
@@ -9317,7 +9137,8 @@ msgstr "Колона \"&Общо\""
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Промяна на изобразяването на колона, показваща общия брой съобщения в папките."
+"Промяна на изобразяването на колона, показваща общия брой съобщения в "
+"папките."
 
 #: kmmainwidget.cpp:3026
 msgid ""
@@ -9395,7 +9216,6 @@ msgstr "&Следващо непрочетено съобщение"
 msgid "Go to the next unread message"
 msgstr "Преминаване към следващото непрочетено съобщение"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Пре&дишно съобщение"
@@ -9443,8 +9263,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Превъртане надолу на текущото съобщение. При достигане на краят му преминаване "
-"към следващото непрочетено съобщение."
+"Превъртане надолу на текущото съобщение. При достигане на краят му "
+"преминаване към следващото непрочетено съобщение."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9534,73 +9354,73 @@ msgstr " Инициализиране..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Съобщението съдържа искане за изпращане на известие за доставка на съобщението "
-"(ИДС).\n"
-"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ\" "
-"или нормален отговор."
+"Съобщението съдържа искане за изпращане на известие за доставка на "
+"съобщението (ИДС).\n"
+"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ"
+"\" или нормален отговор."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Съобщението съдържа искане за изпращане на известие за доставка на съобщението "
-"(ИДС).\n"
+"Съобщението съдържа искане за изпращане на известие за доставка на "
+"съобщението (ИДС).\n"
 "То съдържа инструкция за обработка, която е маркирана като \"изисквана\", но "
 "която е непозната за KMail.\n"
-"Можете да пренебрегнете искането или да позволите на KMail да изпрати отговор "
-"\"неуспешно\"."
+"Можете да пренебрегнете искането или да позволите на KMail да изпрати "
+"отговор \"неуспешно\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Съобщението съдържа искане за изпращане на известие за доставка на съобщението "
-"(ИДС),\n"
+"Съобщението съдържа искане за изпращане на известие за доставка на "
+"съобщението (ИДС),\n"
 " но се иска изпращане на известието на повече от един адрес.\n"
-"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ\" "
-"или нормален отговор."
+"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ"
+"\" или нормален отговор."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Съобщението съдържа искане за изпращане на известие за доставка на съобщението "
-"(ИДС),\n"
+"Съобщението съдържа искане за изпращане на известие за доставка на "
+"съобщението (ИДС),\n"
 "но не е зададен обратен адрес.\n"
-"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ\" "
-"или нормален отговор."
+"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ"
+"\" или нормален отговор."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Съобщението съдържа искане за изпращане на известие за доставка на съобщението "
-"(ИДС),\n"
+"Съобщението съдържа искане за изпращане на известие за доставка на "
+"съобщението (ИДС),\n"
 "но обратният адрес се различава от адреса посочен в искането за известие.\n"
-"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ\" "
-"или нормален отговор."
+"Можете да пренебрегнете искането или да позволите на KMail да изпрати \"отказ"
+"\" или нормален отговор."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9619,23 +9439,23 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Заглавната част на \"Известие за доставка на съобщение\" съдържа изискван, но "
-"непознат параметър"
+"Заглавната част на \"Известие за доставка на съобщение\" съдържа изискван, "
+"но непознат параметър"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Доставка: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Прикрепен файл: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Прикрепеният файл е бил изтрит."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Прикрепеният файл \"%1\" е изтрит\"."
 
@@ -9683,46 +9503,39 @@ msgstr "Информация за част от съобщение"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME типът</em> на файл:</p>"
-"<p>Обикновено не се налага да променяте тази настройка, тъй като типа на файла "
-"се проверява автоматично, но понякога %1 не може правилно да открие типа. Тук "
-"можете да поправите това.</p></qt>"
+"<qt><p><em>MIME типът</em> на файл:</p><p>Обикновено не се налага да "
+"променяте тази настройка, тъй като типа на файла се проверява автоматично, "
+"но понякога %1 не може правилно да открие типа. Тук можете да поправите това."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Размерът на частта:</p>"
-"<p>понякога %1 ще показва приблизителен размер, тъй като пресмятането на точния "
-"размер ще отнеме твърде много време; в този случай това сте се покаже чрез "
-"добавянето на \"(прибл.)\" към показания размер.</p></qt>"
+"<qt><p>Размерът на частта:</p><p>понякога %1 ще показва приблизителен "
+"размер, тъй като пресмятането на точния размер ще отнеме твърде много време; "
+"в този случай това сте се покаже чрез добавянето на \"(прибл.)\" към "
+"показания размер.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Файловото име на частта:</p>"
-"<p>въпреки че по подразбиране това е името на прикрепения файл, не се указва "
-"файлът за прикрепяне; по-скоро се предлага име на файл, което да бъде "
-"използвано от пощенският агент на получателя при запис на частта на диска.</p>"
-"</qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
+msgstr ""
+"<qt><p>Файловото име на частта:</p><p>въпреки че по подразбиране това е "
+"името на прикрепения файл, не се указва файлът за прикрепяне; по-скоро се "
+"предлага име на файл, което да бъде използвано от пощенският агент на "
+"получателя при запис на частта на диска.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9730,17 +9543,15 @@ msgstr "&Описание:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Описание на частта:</p>"
-"<p>това е просто описание на частта, както \"Тема\" е за цялото съобщение; "
-"повечето пощенски агенти ще покажат тази информация при преглед на съобщение до "
-"иконата за прикрепени файлове.</p></qt>"
+"<qt><p>Описание на частта:</p><p>това е просто описание на частта, както "
+"\"Тема\" е за цялото съобщение; повечето пощенски агенти ще покажат тази "
+"информация при преглед на съобщение до иконата за прикрепени файлове.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9748,23 +9559,21 @@ msgstr "&Кодиране:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Кодирането при транспорт на тази част:</p> "
-"<p>обикновено не се налага да променяте това, тъй като %1 ще използва подходящо "
-"кодиране по подразбиране, в зависимост от MIME типа; понякога можете значително "
-"да намалите размера на съобщението, например, ако PostScript файл не съдържа "
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Кодирането при транспорт на тази част:</p> <p>обикновено не се налага "
+"да променяте това, тъй като %1 ще използва подходящо кодиране по "
+"подразбиране, в зависимост от MIME типа; понякога можете значително да "
+"намалите размера на съобщението, например, ако PostScript файл не съдържа "
 "двоични данни, а само обикновен текст -- в този случай, изборът на "
-"\"Отпечатване на маркираното\" пред \"base64\" ще спести до 25% от размера на "
-"съобщението.</p></qt>"
+"\"Отпечатване на маркираното\" пред \"base64\" ще спести до 25% от размера "
+"на съобщението.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9772,21 +9581,18 @@ msgstr "Предла&гане на автоматично показване"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Включете тази отметка, ако искате да предложите на получателя автоматично "
-"(вградено) показване на тази част при предварителен преглед на съобщението, "
-"вместо изгледа с икони (по подразбиране);</p>"
-"<p>технически това се изпълнява при настройване на полето<em>"
-"Излагане на съдържание</em>в заглавната част на \"вътрешно\" вместо \"прикрепен "
-"файл\" (по подразбиране).</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Включете тази отметка, ако искате да предложите на получателя "
+"автоматично (вградено) показване на тази част при предварителен преглед на "
+"съобщението, вместо изгледа с икони (по подразбиране);</p><p>технически това "
+"се изпълнява при настройване на полето<em>Излагане на съдържание</em>в "
+"заглавната част на \"вътрешно\" вместо \"прикрепен файл\" (по подразбиране)."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9794,16 +9600,13 @@ msgstr "&Подписване на тази част"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Включете тази отметка, ако искате тази част на съобщението да бъде "
-"подписана;</p>"
-"<p>Подписът ще бъде създаден с ключа, който сте задали за текущо избраната "
-"самоличност.</p></qt>"
+"<qt><p>Включете тази отметка, ако искате тази част на съобщението да бъде "
+"подписана;</p><p>Подписът ще бъде създаден с ключа, който сте задали за "
+"текущо избраната самоличност.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9811,14 +9614,12 @@ msgstr "&Шифроване на тази част"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Включете тази отметка, ако искате тази част на съобщението да бъде "
-"шифрована.</p>"
-"<p>Частта ще бъде шифрована за получателите на съобщението</p></qt>"
+"<qt><p>Включете тази отметка, ако искате тази част на съобщението да бъде "
+"шифрована.</p><p>Частта ще бъде шифрована за получателите на съобщението</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9832,16 +9633,14 @@ msgstr "POP филтър"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Открито е съобщения за филтриране за POP сметка: <b>%1</b>"
-"<p>Показаните съобщения надхвърлят максималното ограничение, което сте "
-"определили за тази сметка."
-"<br> Можете да изберете какво искате да правите с тях чрез съответния бутон."
+"Открито е съобщения за филтриране за POP сметка: <b>%1</b><p>Показаните "
+"съобщения надхвърлят максималното ограничение, което сте определили за тази "
+"сметка.<br> Можете да изберете какво искате да правите с тях чрез съответния "
+"бутон."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9854,8 +9653,8 @@ msgstr "Съобщения, филтрирани според правила: н
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Показване на съобщения, съвпадащи с правило и маркирани като \"Изтегляне\" или "
-"\"Изтриване\""
+"Показване на съобщения, съвпадащи с правило и маркирани като \"Изтегляне\" "
+"или \"Изтриване\""
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10095,40 +9894,39 @@ msgstr "Пощенският клиент на TDE"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Извличане съдържанието на папка</h2>"
-"<p>Моля, изчакайте . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Извличане съдържанието на папка</h2><p>Моля, "
+"изчакайте . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Изключена мрежа</h2>"
-"<p>В момента KMail е изключена от мрежата. Натиснете <a href=\"kmail:goOnline\">"
-"тук</a>, за да я включите. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Изключена мрежа</h2><p>В момента KMail е "
+"изключена от мрежата. Натиснете <a href=\"kmail:goOnline\">тук</a>, за да я "
+"включите. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10136,15 +9934,14 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Добре дошли в KMail %1</h2>"
-"<p>KMail е пощенският клиент на графичната среда TDE. Той е проектиран да бъде "
-"напълно съвместим с Интернет стандартите за поща, включително MIME, SMTP, POP3 "
-"и IMAP.</p>\n"
-"<ul>"
-"<li>KMail има много възможности, които са описани в <a href=\"%2\">"
-"документацията</a></li>\n"
-"<li>Страницата <a href=\"%3\">на KMail</A> предлага информация за нови версии "
-"на програмата</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Добре дошли в KMail %1</h2><p>KMail е "
+"пощенският клиент на графичната среда TDE. Той е проектиран да бъде напълно "
+"съвместим с Интернет стандартите за поща, включително MIME, SMTP, POP3 и "
+"IMAP.</p>\n"
+"<ul><li>KMail има много възможности, които са описани в <a href="
+"\"%2\">документацията</a></li>\n"
+"<li>Страницата <a href=\"%3\">на KMail</A> предлага информация за нови "
+"версии на програмата</li></ul>\n"
 "%8\n"
 "<p>Някои от новите възможности в тази версия на програмата включват (в "
 "сравнение с версия %4 на TDE %5):</p>\n"
@@ -10156,15 +9953,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Екипът на KMail </p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10178,8 +9973,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Важни промени</span> "
-"(в сравнение с KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Важни промени</span> (в "
+"сравнение с KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10210,13 +10005,14 @@ msgstr "Преглед на прикрепен файл: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Прикрепеният файл съдържа двоични данни. Опит за показване на първия "
 "знак]\n"
-"[KMail: Прикрепеният файл съдържа двоични данни. Опит за показване на първите "
-"%n знака.]"
+"[KMail: Прикрепеният файл съдържа двоични данни. Опит за показване на "
+"първите %n знака.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10241,17 +10037,19 @@ msgstr "Отваряне на прикрепен файл?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"Изтриването на прикрепения файл може да направи невалиден електронния подпис на "
-"съобщението."
+"Изтриването на прикрепения файл може да направи невалиден електронния подпис "
+"на съобщението."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"Промяната на прикрепения файл може да направи невалиден електронния подпис на "
-"съобщението."
+"Промяната на прикрепения файл може да направи невалиден електронния подпис "
+"на съобщението."
 
 #: kmreaderwin.cpp:2956
 msgid "Attachments:"
@@ -10271,6 +10069,58 @@ msgstr "(съвпадение поне на едно)"
 msgid "(match all of the following)"
 msgstr "(съвпадение на всички)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Прочетени"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Стари"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Изтрити"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Отговорени"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Препратени"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "На опашката"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Изпратени"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Следени"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Игнорирани"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Спам"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Любителски"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Задачи"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Имащи прикрепени файлове"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Цялото съобщение"
@@ -10348,25 +10198,25 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Грешка при преместването на изпратеното съобщение \"%1\" от папка \"Изходяща\" "
-"в папка \"Изпратена\".\n"
+"Грешка при преместването на изпратеното съобщение \"%1\" от папка \"Изходяща"
+"\" в папка \"Изпратена\".\n"
 "Възможни причини са липса на място на диска или недостатъчни права. Моля, "
 "опитайте да коригирате проблема и преместете съобщението ръчно."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Не е възможно изпращане на съобщение без указване на адрес на подателя.\n"
-"Моля, задайте електронния адрес на самоличност \"%1\" в раздела \"Самоличност\" "
-"и опитайте отново."
+"Моля, задайте електронния адрес на самоличност \"%1\" в раздела \"Самоличност"
+"\" и опитайте отново."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10391,11 +10241,11 @@ msgstr "Инициализиране на процес за изпращане..
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Избрахте да изпратите цялата поща на опашката с нешифрован транспорт. Искате ли "
-"да продължите? "
+"Избрахте да изпратите цялата поща на опашката с нешифрован транспорт. Искате "
+"ли да продължите? "
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10420,8 +10270,9 @@ msgstr "Неуспешно изпращане на (някои) съобщени
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10438,21 +10289,17 @@ msgstr "Изпращането е прекъснато."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Изпращането беше неуспешно:</p>"
-"<p>%1</p>"
-"<p>Съобщението ще остане в папка \"Изходяща\" докато отстраните проблема (напр. "
-"невалиден адрес) или го изтриете от там.</p>"
-"<p>Бе използван следният транспортен протокол:\n"
-":  %2</p>"
-"<p>Искате ли да продължите с изпращането на оставащите съобщения?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Изпращането беше неуспешно:</p><p>%1</p><p>Съобщението ще остане в папка "
+"\"Изходяща\" докато отстраните проблема (напр. невалиден адрес) или го "
+"изтриете от там.</p><p>Бе използван следният транспортен протокол:\n"
+":  %2</p><p>Искате ли да продължите с изпращането на оставащите съобщения?</"
+"p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10470,8 +10317,9 @@ msgstr "&Прекъсване на изпращането"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10498,8 +10346,8 @@ msgstr ""
 "Изпращането беше неуспешно:\n"
 "%1\n"
 "Съобщението ще остане в папка \"Изходяща\" и ще бъде изпратено отново.\n"
-"Моля, махнете го от там, ако не искате да се случи последното. Беше използван "
-"следния транспортен протокол:\n"
+"Моля, махнете го от там, ако не искате да се случи последното. Беше "
+"използван следния транспортен протокол:\n"
 "  %2"
 
 #: kmsender.cpp:980
@@ -10517,9 +10365,9 @@ msgstr "Трябва да предоставите име и парола за �
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 вече работи на друг екран на тази машина. Стартирането на %2 повече от "
 "веднъж може да причини загуба на поща. Не би трябвало да стартирате %1 освен "
@@ -10527,9 +10375,9 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "%1 вече работи на друг екран на тази машина. Стартирането на %1 и %2 "
 "едновременно може да причини загуба на поща. Не би трябвало да стартирате %2 "
@@ -10537,23 +10385,23 @@ msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 вече работи на %2. Стартирането на %1 повече от веднъж може да причини "
-"загуба на поща. Не би трябвало да стартирате %1 на този компютър освен, ако сте "
-"сигурни, че не е стартиран на %2."
+"загуба на поща. Не би трябвало да стартирате %1 на този компютър освен, ако "
+"сте сигурни, че не е стартиран на %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 вече работи на %3. Стартирането на %1 и %2 едновременно може да причини "
-"загуба на поща. Не би трябвало да стартирате %2 на този компютър освен, ако сте "
-"сигурни че %1 не е стартиран на %3."
+"загуба на поща. Не би трябвало да стартирате %2 на този компютър освен, ако "
+"сте сигурни че %1 не е стартиран на %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10564,6 +10412,10 @@ msgstr "Стартиране на %1"
 msgid "Exit"
 msgstr "Изход"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Нови съобщения в"
@@ -10590,15 +10442,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"Портфейлът (TDEWallet) е недостъпен. Горещо се препоръчва да го използвате за "
-"управление на паролите си.\n"
-"Вместо това KMail може да съхранява паролата в своя конфигурационен файл. Тя не "
-"се съхранява в отворен вид, но това не е сигурна защита от разшифроване при "
-"положение, че има достъп до конфигурационния файл.\n"
+"Портфейлът (TDEWallet) е недостъпен. Горещо се препоръчва да го използвате "
+"за управление на паролите си.\n"
+"Вместо това KMail може да съхранява паролата в своя конфигурационен файл. Тя "
+"не се съхранява в отворен вид, но това не е сигурна защита от разшифроване "
+"при положение, че има достъп до конфигурационния файл.\n"
 "Искате ли да паролата за сметка \"%1\" да бъде записана в конфигурационния "
 "файл?"
 
@@ -10668,9 +10521,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Команда за локално изпълнение преди изпращане на поща. Това може да се използва "
-"за настройка на ssh тунел, например. Оставете го празно, ако няма да се "
-"изпълнява команда."
+"Команда за локално изпълнение преди изпращане на поща. Това може да се "
+"използва за настройка на ssh тунел, например. Оставете го празно, ако няма "
+"да се изпълнява команда."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10678,11 +10531,11 @@ msgstr "Сървъра &изисква удостоверяване"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Включете тази отметка, ако вашият SMTP сървър изисква удостоверяване преди да "
-"приеме поща. Това е известно като \"Authenticated SMTP\" или просто ASMTP."
+"Включете тази отметка, ако вашият SMTP сървър изисква удостоверяване преди "
+"да приеме поща. Това е известно като \"Authenticated SMTP\" или просто ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10702,15 +10555,14 @@ msgstr "Изпра&щане на потребителски хост до сър
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Включете тази отметка, ако искате KMail да използва потребителско име на хост с "
-"което да се идентифицира пред пощенския сървър."
-"<p>Това намира приложение, ако хостът на системата ви не е зададен правилно или "
-"се опитвате да го маскирате."
+"Включете тази отметка, ако искате KMail да използва потребителско име на "
+"хост с което да се идентифицира пред пощенския сървър.<p>Това намира "
+"приложение, ако хостът на системата ви не е зададен правилно или се опитвате "
+"да го маскирате."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10739,11 +10591,11 @@ msgstr "Разрешени са само локални файлове."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Полето за хост не може да е празно. Моля, въведете името или IP адреса на SMTP "
-"сървъра."
+"Полето за хост не може да е празно. Моля, въведете името или IP адреса на "
+"SMTP сървъра."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10755,15 +10607,15 @@ msgstr "Грешка при показване на съдържанието н�
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"Локалното отписване от папки ще премахне цялата информация за тях. На сървъра "
-"тези папки няма да бъдат променени. Натиснете \"Отказ\" ако искате да проверите "
-"дали локалните промени са записани на сървъра  -това става като проверите "
-"пощата."
+"Локалното отписване от папки ще премахне цялата информация за тях. На "
+"сървъра тези папки няма да бъдат променени. Натиснете \"Отказ\" ако искате "
+"да проверите дали локалните промени са записани на сървъра  -това става като "
+"проверите пощата."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10834,8 +10686,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail не може да открие пощенски списък в тази папка. Моля, попълнете адресите "
-"ръчно."
+"KMail не може да открие пощенски списък в тази папка. Моля, попълнете "
+"адресите ръчно."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10982,35 +10834,28 @@ msgstr "Редактиране на с&ъобщение"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Информацията, върната от приставката за шифроване, не може да бъде "
-"обработена правилно - приставката може да е повредена.</p> "
-"<p>Моля, свържете се със системния администратор.</p></qt>"
+"<qt><p>Информацията, върната от приставката за шифроване, не може да бъде "
+"обработена правилно - приставката може да е повредена.</p> <p>Моля, свържете "
+"се със системния администратор.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Не е открит активна приставка за шифроване и вграденият OpenPGP код не "
-"работи правилно.</p>"
-"<p>Можете да направите две неща за да промените това:</p>"
-"<ul>"
-"<li><em>или</em> да активирате приставката в \"Настройки->"
-"Настройване на KMail ->Приставки\"</li> "
-"<li><em>или</em> да укажете традиционни настройки на OpenPGP в същия диалогов "
-"прозорец на страницата \"Самоличност->Допълнителни\".</li></ul>"
+"работи правилно.</p><p>Можете да направите две неща за да промените това:</"
+"p><ul><li><em>или</em> да активирате приставката в \"Настройки->Настройване "
+"на KMail ->Приставки\"</li> <li><em>или</em> да укажете традиционни "
+"настройки на OpenPGP в същия диалогов прозорец на страницата \"Самоличност-"
+">Допълнителни\".</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11022,8 +10867,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Помощното приложение Chiasmus не предлага функцията \"x-encrypt\" . Моля, "
 "съобщете за програмната грешка."
@@ -11042,20 +10887,20 @@ msgstr "Chiasmus грешка при шифроване"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Неочаквана стойност, върната от помощното приложение Chiasmus: Функцията "
-"\"x-encrypt\" не върна масив от байтове. Моля, съобщете за програмната грешка."
+"Неочаквана стойност, върната от помощното приложение Chiasmus: Функцията \"x-"
+"encrypt\" не върна масив от байтове. Моля, съобщете за програмната грешка."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Форматът за вградено OpenPGP шифроване на съобщения не поддържа шифроване или "
-"подписване на прикрепени файлове.\n"
+"Форматът за вградено OpenPGP шифроване на съобщения не поддържа шифроване "
+"или подписване на прикрепени файлове.\n"
 "Наистина ли да бъде използван остарял вътрешен OpenPGP?"
 
 #: messagecomposer.cpp:640
@@ -11165,8 +11010,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Проверката на настройките за шифроване на получателя показва, че ще бъдете "
@@ -11203,8 +11048,9 @@ msgstr "Б&ез шифроване"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Поискахте да шифровате съобщението и да шифровате копие до вас самите, но за "
 "тази самоличност не са настроени валидни надеждни ключове за шифроване."
@@ -11216,8 +11062,8 @@ msgstr "Изпращане нешифровано?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Някои части от съобщението няма да бъдат шифровани.\n"
@@ -11233,8 +11079,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Съобщението няма да бъде шифровано.\n"
-"Изпращането на нешифровано съобщение може да нарушава политиката на сайта и/или "
-"да доведе до изтичане на поверителна информация.\n"
+"Изпращането на нешифровано съобщение може да нарушава политиката на сайта и/"
+"или да доведе до изтичане на поверителна информация.\n"
 "Шифроване на съобщението?"
 
 #: messagecomposer.cpp:955
@@ -11245,92 +11091,87 @@ msgstr "Шифрова&не на всички части"
 msgid "Unencrypted Message Warning"
 msgstr "Предупреждение за нешифровано съобщение"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Грешка: помощното приложение за шифроване не върна кодирани данни. </p>"
-"<p>Моля, съобщете за тази грешка:"
-"<br>%2</p></qt>"
+"<qt><p>Грешка: помощното приложение за шифроване не върна кодирани данни. </"
+"p><p>Моля, съобщете за тази грешка:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Не всички символи са подходящи за избраната кодова таблица\n"
-"<br>"
-"<br>Изпращане на съобщението въпреки това?</qt>"
+"<br><br>Изпращане на съобщението въпреки това?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Някои символи ще бъдат загубени"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Загуба на символи"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Промяна на кодова таблица"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Съобщението не може да бъде подписано, тъй като избраната помощна програма "
-"изглежда не поддържа подписване; това не трябва да се случва. Моля, съобщете за "
-"тази програмна грешка."
+"изглежда не поддържа подписване; това не трябва да се случва. Моля, съобщете "
+"за тази програмна грешка."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Съобщението не може да бъде подписано, тъй като избраната помощна програма "
-"изглежда не поддържа подписване; това не трябва да се случва. Моля, съобщете за "
-"тази програмна грешка."
+"изглежда не поддържа подписване; това не трябва да се случва. Моля, съобщете "
+"за тази програмна грешка."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Преглед на GnuPG журнал за операцията по подписване"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "Подписването беше неуспешно. Проверете дали gpg програмата е стартирана."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Съобщението не може да бъде шифровано, тъй като избраната помощна програма не "
-"поддържа шифроване; това не трябва да се случва. Моля, съобщете за тази "
+"Съобщението не може да бъде шифровано, тъй като избраната помощна програма "
+"не поддържа шифроване; това не трябва да се случва. Моля, съобщете за тази "
 "програмна грешка."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Преглед на GnuPG журнал за операцията по шифроване"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Съобщението не може да бъде подписано и шифровано, тъй като избраната помощна "
-"програма не поддържа комбинирано подписване и шифроване; това не трябва да се "
-"случва. Моля, съобщете за тази програмна грешка."
+"Съобщението не може да бъде подписано и шифровано, тъй като избраната "
+"помощна програма не поддържа комбинирано подписване и шифроване; това не "
+"трябва да се случва. Моля, съобщете за тази програмна грешка."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11351,15 +11192,15 @@ msgstr "&Формат на кутията:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Изберете дали искате да съхранявате съобщенията в тази папка като файл за всяко "
-"съобщение (maildir) или като един голям файл (mbox). KMail използва maildir по "
-"подразбиране и това трябва да бъде променяно само в редки случаи., ако не сте "
-"сигурни, оставете полето както си е."
+"Изберете дали искате да съхранявате съобщенията в тази папка като файл за "
+"всяко съобщение (maildir) или като един голям файл (mbox). KMail използва "
+"maildir по подразбиране и това трябва да бъде променяно само в редки "
+"случаи., ако не сте сигурни, оставете полето както си е."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11368,12 +11209,12 @@ msgstr "Съдържание на &папка:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Изберете дали искате новата папка да бъде използвана за хранилище за поща или "
-"за хранилище на екипни неща като задачи или бележки. По подразбиране е поща., "
-"ако не сте сигурни, оставете полето както си е."
+"Изберете дали искате новата папка да бъде използвана за хранилище за поща "
+"или за хранилище на екипни неща като задачи или бележки. По подразбиране е "
+"поща., ако не сте сигурни, оставете полето както си е."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11411,8 +11252,7 @@ msgstr "Различни резултати за електронните под
 msgid "The crypto engine returned no cleartext data."
 msgstr "Върнатите данни не съдържат чист текст."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Състояние: "
 
@@ -11441,11 +11281,11 @@ msgstr "Не е открита %1приставка."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Съобщението е подписано, но валидността на подписа не може да бъде "
-"проверена.<br />Причина: %1"
+"Съобщението е подписано, но валидността на подписа не може да бъде проверена."
+"<br />Причина: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11479,10 +11319,10 @@ msgstr "Приставката за шифроване \"%1\" не може да
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Забележка:</b> Това HTML съобщение може да съдържа външни препратки към "
 "изображения и др. От съображения за сигурност външните препратки не са "
@@ -11491,14 +11331,15 @@ msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Забележка:</b> Това е HTML съобщение. От съображения за сигурност е показан "
-"само необработен HTML. Ако имате доверие на подателя можете да активирате "
-"форматирания такъв като щракнете <a href=\"kmail:showHTML\"> тук</a>."
+"<b>Забележка:</b> Това е HTML съобщение. От съображения за сигурност е "
+"показан само необработен HTML. Ако имате доверие на подателя можете да "
+"активирате форматирания такъв като щракнете <a href=\"kmail:showHTML\"> тук</"
+"a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11747,11 +11588,11 @@ msgstr "запазен: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Не е записан пощенски адрес в %1 за подписване, затова не може да се сравни с "
-"адреса на подателя %2."
+"Не е записан пощенски адрес в %1 за подписване, затова не може да се сравни "
+"с адреса на подателя %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11866,13 +11707,15 @@ msgstr "Съобщение за грешка на Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Вашият POP3 сървър (сметка %1) не поддържа командата UIDL: тази команда е "
-"необходима за определяне кои от пощите на сървъра вече са прегледани от KMail\n"
+"необходима за определяне кои от пощите на сървъра вече са прегледани от "
+"KMail\n"
 "Оставянето на поща на сървъра няма да работи правилно."
 
 #: popaccount.cpp:752
@@ -11893,7 +11736,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Изтегляне на %1 от %2 (%3 от %4 кБ) за %5@%6 (%7 кБ остават на сървъра)."
 
@@ -11911,1903 +11755,15 @@ msgstr "Невалиден отговор от сървъра"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Вашият сървър не поддържа командата TOP. Затова не е възможно получаването "
 "заглавните части на големи писма, преди изтеглянето им."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Навигация"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Папка"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "С&ъобщение"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Специален отговор"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "П&репращане"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML лента с инструменти"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Подписване"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Автоматично подписване на съоб&щенията"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Когато е включена тази опция, всички изпращани от вас съобщения ще бъдат "
-"подписани по подразбиране. Разбира се възможно е да изключите подписването на "
-"всяко писмо поотделно."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Шифроване"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr "При шифроване на е-поща, да се прави същото и към моето удостоверение"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Когато е включена тази опция, съобщението/файла ще бъде шифровано не само с "
-"публичния ключ на получателя, но и с вашия ключ. Това ще ви позволи да "
-"разшифровате съобщението/файла по-късно. По принцип е добра идея."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Показване на под&писан/шифрован текст след съчиняване"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Когато е включена тази опция, подписаният/шифрованият текст ще бъде показан в "
-"отделен прозорец, позволявайки ви да видите как ще изглежда преди да бъде "
-"изпратено. Това е добра идея, когато проверявате дали системата ви за шифроване "
-"работи."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Съхраня&ване на изпратените съобщенията шифровани"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Отметнете тук за да съхранявате съобщенията шифровани "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Съхраняване съобщенията шифровани</h1>\n"
-"Ако е включена тази опция, изпратените съобщения се съхраняват шифровани (както "
-"са изпратени). Това не се препоръчва, понеже няма да може да четете съобщенията "
-"след изтичане на удостоверението."
-"<p>\n"
-"Обаче, може да има някакви локални правила, изискващи от вас да включите "
-"опцията. Ако се двоумите, попитайте администратора.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Винаги показване на шифроващите ключове з&а одобрение"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Когато е включена тази опция прикрепеният файл ще показва списък с публични "
-"ключове от които можете да изберете един, който ще се използва за шифроване., "
-"ако е изключена, прикрепеният файл ще показва диалогов прозорец само, ако не "
-"открие подходящия ключ или, ако има няколко, които могат да бъдат използвани."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Автоматично шифроване на съоб&щенията"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Когато настройката е включена, всяко писмо, което изпращате, ще бъде шифровано "
-"всеки път, когато е възможно и желателно. Разбира се можете да изключите "
-"автоматичното шифроване за всяко писмо поотделно."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Без подписване/шифроване при зап&ис като чернова"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Как работи това?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "До: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Копие до: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Универсално"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Отговор"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Отговор до всички"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Препращане"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Пряк път:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Тип &шаблон:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Настройки на папка"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Па&пката съдържа пощенски списък"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Показване на &адрес:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Нор&мално:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Неп&рочетено:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Изтичане на съобщение"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Изтичане след:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Маркиране на про&четените съобщения като изтекли"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Изтичане с&лед:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Маркиране на непро&четените съобщения като изтекли"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Ден(и)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Седмица(и)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Месец(и)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Допълнителни"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Самоли&чност на подател:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Фор&мат на хранилище:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Показване на &списък:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Проверка на сертификати чрез CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Ако е включена тази опция, S/MIME сертификатите ще се проверяват чрез "
-"Certificate Revocation Lists (CRLs)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Проверка на сертификати в Интернет (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Ако е включена тази опция, S/MIME сертификатите са проверявани в Интернет чрез "
-"Online Certificates Status Protocol (OCSP). Попълнете адреса (URL) на OCSP "
-"по-долу."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Проверка на удостоверение в Интернет"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP адрес (URL):"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Въведете адресът на сървъра за проверка на сертификати в Интернет (OCSP "
-"отговарящ). Адреса (URL) обикновено започва с http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Подпис на OCSP отговарящ:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Игнориране на обслужващ адрес (URL) на сертификатите"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Без проверка на политиката за сертификати"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"По подразбиране GnuPG използва файла ~/.gnupg/policies.txt за проверка дали "
-"политиката за сертификати е включена. Ако е включена тази опция, политиката не "
-"се проверява."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Никога консултиране с CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ако е включена тази опция, CRLs (списъците с анулирани сертификати) не се "
-"използват за проверка на S/MIME сертификати."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Изтегляне на липсващите удостоверения от издателя"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Ако е включена тази опция, липсващи сертификати се изтеглят при необходимост "
-"(това е приложимо за двата метода за проверка, CRLs и OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP заявки"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Без HTTP заявки"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Изцяло изключва използването на HTTP за S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Използване на това прокси за HTTP заявки: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Използване на системното HTTP прокси:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Ако е включена тази опция, стойността за HTTP прокси, показана вдясно (която се "
-"взима от променливата на средата http_proxy), ще бъде използвана за всяка HTTP "
-"заявка."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Въведете местоположението на HTTP проксито, което ще се използва за всички HTTP "
-"заявки, свързани с S/MIME. Синтаксиса е хост:порт, например "
-"myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Игнориране на HTTP CRL точка на разпределяне за сертификати"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Когато търсите местоположението на CRL, сертификата за тестване обикновено "
-"съдържа така наречените \"CRL Distribution Point\" (DP) записи, които описват "
-"начина за достъп до URL. Използва се първият открит DP запис. С тази опция "
-"всички записи, които използват HTTP схемата ще бъдат игнорирани при търсене на "
-"подходяща DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP заявки"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Без LDAP заявки"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Изцяло изключване на използването на LDAP за S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Игнориране на LDAP CRL точка на разпределяне за сертификати"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Когато търсите местоположението на CRL, сертификата за тестване обикновено "
-"съдържа така наречените \"CRL Distribution Point\" (DP) записи, които описват "
-"начина за достъп до URL. Използва се първият открит DP запис. С тази опция "
-"всички записи, които използват LDAP схемата ще бъдат игнорирани при търсене на "
-"подходяща DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Основен хост за LDAP заявки:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Въвеждането на LDAP сървър тук ще насочи всички LDAP заявки първо към този "
-"сървър. По-точно, тази настройка заменя всеки зададен хост и порт в LDAP URL, и "
-"също ще бъде използван, ако в адреса (URL) са пропуснати хост и порт. Други "
-"LDAP сървъри ще бъдат използвани само ако връзката до \"проксито\" е "
-"неуспешна.\n"
-"Синтаксисът е \"ХОСТ\" или \"ХОСТ:ПОРТ\"., ако ПОРТ е пропуснат, порт 389 "
-"(стандартният LDAP порт) се използва."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Добавяне на участник"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "Д&обавяне"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Участник:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Група:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Настройване на участниците"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Подсказки"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Показване текста на участника в &подсказките"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "Дали са се показва подсказка с текст от реда"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Променливи"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Метод на въвеждане на променливите"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Един прозорец за всяка променлива на участник"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Ще бъде показан прозорец за всяка променлива на участника"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Един прозорец за всички променливи на участник"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Ще се покаже прозорец където можете да въведете стойностите за променливите на "
-"участник"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Разделител:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Настройване на шаблони"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Отговор до подателя"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Отговор до всички / Отговор до списъка"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Препращане на съобщение"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Предупре&ждение при опит за изпращане на неподписани съобщения"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Отметнете тук, ако искате да бъдете предупредени при изпращане на неподписани "
-"съобщения."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение при опит за изпращане на неподписани съобщения</h1>\n"
-"Ако е включена тази опция, ще бъдете предупредени при опит за изпращане на част "
-"или цялото съобщение неподписано.\n"
-"<p>\n"
-"Препоръчително е да оставите тази опция включена.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "П&редупреждение при опит за изпращане на нешифровани съобщения"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Отметнете тук, ако искате да бъдете предупредени при изпращане на нешифровани "
-"съобщения."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение при опит за изпращане на нешифровани съобщения</h1>\n"
-"Ако е включена тази опция ще бъдете предупредени при опит за изпращане на части "
-"или цялото съобщение нешифровано.\n"
-"<p>\n"
-"Препоръчително е да включите отметката.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Предупреждение ак&о е-пощата на получателя не е в сертификата"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Отметнете тук за да бъдете предупредени, ако е-пощата не е в удостоверението"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение, ако електронния адрес на получателя не е в "
-"удостоверението</h1>\n"
-"Ако е включена тази опция, се показва предупреждение, ако адреса на получателя "
-"не се съдържа в удостоверението използван за шифроване.\n"
-"<p>\n"
-"За максимална сигурност е препоръчително да включите отметката.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Предупреждение ако удостоверенията/ключовете изтичат скоро (настройте тук)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "За подписване"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "За шифроване"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " дни"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Изберете брой дни "
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение, ако удостоверението за подпис изтича</h1>\n"
-"Изберете минимален брой дни за валидност на удостоверението преди да бъде "
-"показано предупреждение.\n"
-"<p>\n"
-"Препоръчителната настройка на SPHINX е 14 дни.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение, ако удостоверението за шифроване изтича</h1>\n"
-"Изберете минималния брой дни за който да бъде валидно удостоверението за "
-"шифроване преди да бъде показано предупреждение.\n"
-"<p>\n"
-"Препоръчителната настройка на SPHINX е 14 дни.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение, ако удостоверението във веригата изтича</h1>\n"
-"Изберете минимален брой дни за валидност на всички удостоверенията във веригата "
-"преди да бъде показано предупреждение.\n"
-"<p>\n"
-"Препоръчителната настройка на SPHINX е 14 дни.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение за изтичане на CA удостоверение</h1>\n"
-"Изберете минимален брой дни за които CA удостоверението ще е валидно без да "
-"бъде показано предупреждение.\n"
-"<p>\n"
-"Препоръчителната настройка на SPHINX е 14 дни.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждение за изтичане на коренно удостоверение</h1>\n"
-"Избиране минимален брой дни за които коренния удостоверението ще бъде валиден "
-"без да се показва предупреждение.\n"
-"<p>\n"
-"Препоръчителна настройка на SPHINX е 14 дни.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "За коренни удостоверения:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "За междинни CA удостоверения:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "За потребителски удостоверения/ключове:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Включване отново на предупрежденията \"Изключване въпроса\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Съдържание на шаблон"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Пряк път до шаблон"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Тип шаблон"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Изпращане на пощата на опашката за проверка"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Изберете дали искате KMail да изпраща всички съобщения в папка \"Изходящи\" "
-"при ръчна или автоматична проверка на пощата, или въобще не искате автоматично "
-"изпращане на съобщенията. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Автоматично преместване на несинхронизирана поща от папките с недостатъчни "
-"права"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Ако в папката има нови съобщения, които все още не са качени на сървъра, но "
-"нямате достатъчно права за достъп, те автоматично ще бъдат преместени в "
-"директория \"lost + found\"."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Разрешаване на локални флагчета в папките, които са само за четене"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Тази настройка позволява на администраторите да задават минимално забавяне "
-"между две проверки на пощата.\"\n"
-"           \"Потребителят не може да избира по-малка от зададената тук "
-"стойност."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Последно избраната папка в прозореца за избор на папка."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Пренебрегване на umask и използване на \"запис-четене само за потребителя\""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Правила за показване на икона в системния панел"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Затваряне на програмата при затваряне на прозореца, дори когато има система в "
-"системния панел."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Подробно известяване за нова поща"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Ако е включена тази опция, тогава за всяка папка броят на новополучените "
-"съобщения се показва в известяването за нова поща. В противен случай ще "
-"получите само обикновено съобщение - \"Получихте нова поща\"."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Редактор:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Използване на в&ъншен редактор вместо прозореца за съчиняване"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"Прагът над който потребителят ще бъде предупреден за наближаващия лимит."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Разрешаване на функциите за работа в екип"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Прехвърляне на заглавни части \"От:/До:\" от отговор в отговор"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook има известен брой слабости в изпълнението си на iCalendar "
-"стандарта; тази опция се справя с една от тях. Ако имате проблеми с Outlook "
-"потребители, които не могат да получат отговорите ви, опитайте с тази опция."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Изпращане на групови покани в тялото на съобщение"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook има известен брой слабости в изпълнението си на iCalendar "
-"стандарта; тази опция се справя с една от тях. Ако имате проблеми с Outlook "
-"потребители, които не могат да получат отговорите ви, опитайте с тази опция."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Обмен на съвместими покани"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Ако Microsoft Outlook се използва заедно с Microsoft Exchange server, има "
-"проблем с интерпретирането на груповите е-писма. Включете тази опция, за да "
-"изпращате групови покани така че да са разбираеми за Microsoft Exchange server."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Ако е включена тази отметка, няма да виждате прозореца за съчиняване на "
-"съобщения. Вместо това всички покани се изпращат автоматично. Ако искате да "
-"видите съобщението преди изпращането му, изключете опцията. Но имайте предвид, "
-"че текстът в прозореца за съчиняване е с iCalendar синтаксис и не трябва да се "
-"опитвате да го променяте на ръка."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Изтриване на поканите след като отговорът до тях е изпратен"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Ако е включена тази отметка, поканите на които е отговорено ще бъдат преместени "
-"в кошчето (веднага след изпращането на отговора)."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Включването на това прави възможно съхраняването на записите от приложенията "
-"на Kontact (KOrganizer, KAddressBook, и KNotes.)</p>"
-"<p>Ако искате да настроите тази опция, трябва да настроите и приложението да "
-"използва IMAP ресурсите. Това се прави в Контролен Център на TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Обикновено няма причина да искате да видите папките. съдържащи IMAP "
-"ресурсите. Но ако е необходимо да ги видите, можете да направите настройките "
-"тук.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Ако сметката за групова информация \"\n"
-"          \"не се използва за нормална поща, включете опцията, за да накарате "
-"KMail  \"\n"
-"          \"да показва само груповите папки. Това намира приложение при \"\n"
-"          \"поща през допълнителна включена IMAP сметка.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Изберете формат за съхраняване на екипните папки. "
-"<ul>"
-"<li>Формата по подразбиране е да използвате стандартите ical (за папки "
-"календар) и vcard (за папки на адресника). Този формат прави достъпни всички "
-"възможности на Kontact</li>"
-"<li>Форматът Kolab XML използва потребителски модел, който е по-близък до този "
-"на Outlook. Той има по-добра съвместимост с Outlook при използване на Kolab "
-"сървър или съвместимо решение.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Това избира родителя на IMAP ресурните папки.</p> "
-"<p>По подразбиране Kolab сървърът настройва папка \"Входящи\" на IMAP да бъде "
-"родителска.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Това е ID на сметката с IMAP ресурсните папки.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Ако искате да настроите имената на папки за IMAP хранилището на вашия език, "
-"можете да изберете между тези езици.</p>"
-"<p> Моля, имайте предвид, че единствената причина да направите това е "
-"съвместимост с Microsoft Outlook. Счита се за лоша идея да пипате това, тъй "
-"като прави смяната на езици невъзможна. </p>"
-"<p>Така че не го настройвайте, освен ако не е наложително.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Филтриране на получената нова поща за груповите папки."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Синхронизиране на груповите промени в DIMAP папките веднага след влизане в "
-"мрежата."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Тази стойност се използва, за да се реши дали да бъде показано въведение за "
-"KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Максимален брой връзки за хост"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Това може да се използва за ограничаване броя връзки за хост при проверка за "
-"нова поща. По подразбиране броя връзки е неограничен (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Показване на лента бързо търсене"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Тази опция включва или изключва лентата за търсене над списъка със съобщения, "
-"което може да се използва за бързо търсене на информация в списъка със "
-"съобщения."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Скриване на локалната вх. кутия, ако не се използва"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Forward Inline As Default."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "\";\" да бъде разделител при съчиняване."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Запазване на оригиналната кодова таблица при отговор или препращане, ако е "
-"възможно"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "А&втоматично добавяне на подпис"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Запомняне на тази самоличност за използване в други прозорци за съставяне на "
-"съобщения.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Запомняне на папка за изпратени обекти, за използване в други прозорци за "
-"съставяне на съобщения."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Запомняне на пощенски транспорт за използване в други прозорци за съставяне на "
-"съобщения."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Запомняне на тази самоличност за използване в други прозорци за съставяне на "
-"съобщения.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Пре&насяне на думите в колона:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Максимален брой редове за редактор на получателя."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Включете тази отметка за да може Outlook &#8482; да разбира имена на "
-"прикрепените файлове, съдържащи символи, които не са част от английската азбука"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Автоматично и&скане на известие за доставка на съобщение (ИДС)"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Включете тази опция, ако искате KMail да изисква известяване за доставка на "
-"съобщение (ИДС) за всяко от изходящите съобщения.</p>"
-"<p>Тази опция засяга само стойността по подразбиране. Въпреки това от менюто на "
-"редактора можете да включите или изключите искането на ИДС за отделно "
-"съобщение.<em>Настройки</em>-><em>Искане на известие за доставка на "
-"съобщение</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Използване на последните адреси за автозавършване"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Изключете опцията, ако не искате последно използваните адреси да се появяват в "
-"списъка за автозавършване в полетата за адрес."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Интервал на автозапис:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Периодично може да се създава резервно копие на текста в прозореца за "
-"съчиняване. Използваният интервал се задава тук. Можете да изключите автозаписа "
-"като зададете стойност 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Вмъкване на подпис над цитирания текст"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "За&мяна на разпознатата представка с \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Замяна на разпознатата представка с \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Интелигентно &цитиране"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Подписът е изтекъл."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Тип за избор на адрес"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Задава типа на диалоговия прозорец за избор на получатели за \"До\",\n"
-"        \"Копие до\" и \"Скр. копие до\"."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Тип на редактора на получателя"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Задава типа на редактора за получател за редактиране на \"До\",\n"
-"        \"Копие до\" и \"Скр. копие до\"."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Максимален брой редове за редактор на получателя."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"List of message part types to strip off mails that are being forwarded inline."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Максималният позволен размер в МБ за прикрепен файл."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Показване на панела за управление на участниците при съчиняване."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr "Показване на журнала за GnuPG дори след успешно шифроване."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Запазване на оригиналната кодова таблица при отговор или препращане, ако е "
-"възможно"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Някои съобщения, особено тези генерирани автоматично, не задават кодова "
-"таблица, която е необходима за правилно показване. В такива случаи ще се "
-"използва кодова таблица по подразбиране, която можете да настроите тук. Задайте "
-"кодовата таблица, която се използва най-често във вашата страна. По "
-"подразбиране се използва кодирането на компютъра."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Промяната на \"Авто\" (по подразбиране) ще доведе до използването на указаното "
-"кодиране за всички писма, независимо от тяхното собствено."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Включете това, ако искате усмивки като :-) в текста на съобщението да бъдат "
-"заменени от емоции (малки картинки)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Включете тази опция за показване на различни нива цитиран текст. Изключете я, "
-"за да скриете нивата на цитирания текст."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Ниво на автоматично сгъване:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Намаляване на размера на шрифт на цитиран текст"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Включете тази опция, ако искате цитираният текст да е с по-малък шрифт."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Съхраня&ване на изпратените съобщенията шифровани"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Показване на потребителския агент в декорираните заглавни части"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Включете тази опция ако искате потребителският агент (User-Agent) и X-Mailer да "
-"се показват в декорираните заглавни части."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Разрешаване изтриването на прикрепени файлове."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Разрешаване редактирането на прикрепени файлове."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Разшифроване на съобщенията при преглед или питане за разшифроване"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Изпращане на известие за доставка на съобщение (ИДС) без изпращач."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Изпращане на известие за доставка на съобщение (ИДС) с празно поле за изпращач. "
-"Някои сървъри може да са настроени да отхвърлят такива съобщения ,така че ако "
-"имате проблеми с изпращането на ИДС, изключете тази опция."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Фразите бяха конвертирани в шаблони"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Остарелите фрази са преобразувани в шаблони"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Шаблон за нови съобщения"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Шаблон за отговор"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Шаблон за отговор до всички"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Шаблон за препращане"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Символи за цитиране"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-"Разрешаване настройките на \"извън офиса\" да бъдат променяни от потребителя."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Разрешаване на потребителите да зареждат sieve скриптове, но да не могат да "
-"променят настройките, напр. домейна."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "Изпращане на отговори \"извън офиса\" само на адреси от този домейн."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "Разрешаване на СПАМА да получава отговори \"извън офиса\"."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"При стартиране на KMail проверка дали все още е активиран отговора \"извън "
-"офиса\"."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "Използвани са %1 от %2 %3"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13916,6 +11872,11 @@ msgstr "Добавяне като \"Копие до\""
 msgid "Add as BCC"
 msgstr "Добавяне като \"Скр. копие до\""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "О&тказ"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13931,13 +11892,13 @@ msgstr "Маркираните получатели"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Избрахте 1 получател. Максималният брой получатели е %1. Моля, променете, ако е "
-"необходимо.\n"
+"Избрахте 1 получател. Максималният брой получатели е %1. Моля, променете, "
+"ако е необходимо.\n"
 "Избрахте %n получателя. Максимално поддържания брой получатели е %1. Моля, "
 "променете, ако е необходимо."
 
@@ -13955,8 +11916,8 @@ msgstr "Използване диалоговия прозорец за избо
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Бутонът отваря отделен диалогов прозорец, където от всички налични адреси "
 "можете да изберете получател."
@@ -14061,13 +12022,23 @@ msgstr "е по-голямо или равно на"
 msgid " bytes"
 msgstr " байта"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " дни"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "За да изпълните търсенето всички съобщения от папка %1 трябва да бъдат "
-"изтеглени от сървъра. Това ще отнеме време. Искате ли да продължите търсенето?"
+"изтеглени от сървъра. Това ще отнеме време. Искате ли да продължите "
+"търсенето?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14213,16 +12184,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Събиране на данни за сметка \"%1\"...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Събиране на данни за сметка \"%1\"...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14241,10 +12208,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Съдържание на скрипт \"%1\":\n"
+msgid "Contents of script '%1':\n"
+msgstr "Съдържание на скрипт \"%1\":\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14267,20 +12232,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve възможности:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve възможности:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(няма налични специални възможности)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Налични Sieve скриптове:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Налични Sieve скриптове:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14329,8 +12290,8 @@ msgstr ""
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
 msgstr ""
-"Натиснете на управляващите елементи по-долу, за да получите помощ за начина на "
-"въвеждане."
+"Натиснете на управляващите елементи по-долу, за да получите помощ за начина "
+"на въвеждане."
 
 #: signatureconfigurator.cpp:72
 msgid ""
@@ -14360,8 +12321,8 @@ msgstr "Използвайте полето за да въведете прои�
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Използвайте питането за да укажете текстов, файл съдържащ подписа ви. Той ще "
 "бъде четен всеки път когато пишете ново писмо или добавяте подпис."
@@ -14380,21 +12341,27 @@ msgstr "Отваря указания файл в текстов редакто�
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Можете да добавите произволна команда тук, със или без път, в зависимост дали "
-"командата е във вашия път. За всяко ново съобщение KMail ще изпълнява командата "
-"и ще използва резултата(в стандартния изход) като подпис. Обикновено използвани "
-"с този механизъм команди са \"fortune\" или \"ksig -random\"."
+"Можете да добавите произволна команда тук, със или без път, в зависимост "
+"дали командата е във вашия път. За всяко ново съобщение KMail ще изпълнява "
+"командата и ще използва резултата(в стандартния изход) като подпис. "
+"Обикновено използвани с този механизъм команди са \"fortune\" или \"ksig -"
+"random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "По&сочете команда:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Път"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Нов запис:"
@@ -14428,6 +12395,11 @@ msgstr "Добавяне на група"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Наистина ли искате групата да бъде изтрита?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Прилагане &към:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Редактиране на участник"
@@ -14440,6 +12412,10 @@ msgstr "Редактиране на група"
 msgid "Edit &group..."
 msgstr "Редактиране на &група..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Редактиране..."
@@ -14478,13 +12454,13 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Ако включите тази отметка, въведената вдясно стойност ще бъде записана. Ако "
-"използвате същата променлива по-късно, дори и за друг участник, тази стойност "
-"ще бъде по подразбиране."
+"използвате същата променлива по-късно, дори и за друг участник, тази "
+"стойност ще бъде по подразбиране."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14519,6 +12495,16 @@ msgstr "Без включване"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Съдържанието на файл %1 не може да бъде вмъкнато: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "До: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Копие до: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14548,57 +12534,46 @@ msgstr "Командата за обработка не може да бъде �
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тук можете да създавате шаблони за композиране на нови съобщения, отговори и "
-"препращане.</p>"
-"<p>Просто напишете командата за заместване или я изберете от менюто <i>"
-"Вмъкване на команда</i>.</p>"
-"<p>Посочените шаблони са специфични за всяка папка и препокриват глобалните и "
-"личните.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Тук можете да създавате шаблони за композиране на нови съобщения, "
+"отговори и препращане.</p><p>Просто напишете командата за заместване или я "
+"изберете от менюто <i>Вмъкване на команда</i>.</p><p>Посочените шаблони са "
+"специфични за всяка папка и препокриват глобалните и личните.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тук можете да създавате шаблони за композиране на нови съобщения, отговори и "
-"препращане.</p>"
-"<p>Просто напишете командата за заместване или я изберете от менюто <i>"
-"Вмъкване на команда</i>.</p>"
-"<p>Посочените шаблони са всеобщи и препокриват глобалните и личните.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Тук можете да създавате шаблони за композиране на нови съобщения, "
+"отговори и препращане.</p><p>Просто напишете командата за заместване или я "
+"изберете от менюто <i>Вмъкване на команда</i>.</p><p>Посочените шаблони са "
+"всеобщи и препокриват глобалните и личните.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тук можете да създавате шаблони за композиране на нови съобщения, отговори и "
-"препращане.</p>"
-"<p>Просто напишете командата за заместване или я изберете от менюто <i>"
-"Вмъкване на команда</i>.</p>"
-"<p>Посоченият шаблон е глобален, но може да бъде препокрит от личните и "
-"специфичните за всяка папка такива.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Тук можете да създавате шаблони за композиране на нови съобщения, "
+"отговори и препращане.</p><p>Просто напишете командата за заместване или я "
+"изберете от менюто <i>Вмъкване на команда</i>.</p><p>Посоченият шаблон е "
+"глобален, но може да бъде препокрит от личните и специфичните за всяка папка "
+"такива.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14852,6 +12827,10 @@ msgstr "Обработка на тялото на съобщението и вм
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Обработка на тялото на съобщението и заместване с резултата"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Задаване позиция на курсора"
@@ -14884,117 +12863,6 @@ msgstr "Включване търсенето на грешки"
 msgid "Turn Debug Off"
 msgstr "Изключване търсенето на грешки"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>... можете да преминете към следващото и предишното съобщение\n"
-"чрез клавишите дясна или лява стрелка?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>... можете бързо да създадете филтри за подател, получател,\n"
-"тема и пощенски списък от <em>Съобщение-&gt;Създаване на&nbsp;филтър</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... можете да се отървете от \n"
-"&quot;[име на пощенския списък]&quot;,\n"
-"което някои пощенски списъци добавят, \n"
-"чрез филтриране с функцията <em>Преправяне\n"
-" на заглавна част</em>? Просто в "
-"<pre>&quot;Тема&quot;</pre> заместете "
-"<pre>&quot;\\s*\\[име на пощенски списък\\]\\s*&quot;</pre> с "
-"<pre>&quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>... можете да асоциирате пощенски списък с папки от\n"
-"<em>Папка-&gt;Управление на пощенски списък</em>? След това можете да "
-"използвате\n"
-"<em>Съобщение-&gt;Ново&nbsp;съобщение&nbsp;до&nbsp;пощенски&nbsp;списък...</em>"
-",\n"
-"за да отворите прозорец за съчиняване.\n"
-"Или просто можете да щракнете със средния бутон на мишката върху папката.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>... можете да зададете потребителски икони за всяка отделна папка?\n"
-"Вижте <em>Папка-&gt;Настройки</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>... KMail може да показва различни цветове за различните типовете съобщения\n"
-"(обикновен текст/HTML/OpenPGP)?</p>\n"
-"<p>Това ще попречи на опитите да се имитират удостоверения за подписи\n"
-"чрез изпращане на HTML съобщения, наподобяващи тези на KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>... можете да филтрирате всяка от заглавните части просто като въведете "
-"името и\n"
-"в полето за търсене?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... можете да филтрирате HTML съобщения с правилото:\n"
-"<pre>&quot;Content-type&quot; съдържа &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>... когато отговаряте на съобщение ще бъде цитирана само маркираната "
-"част?</p>\n"
-"<p>Ако не е маркирано нищо, тогава ще бъде цитирано цялото съобщение.</p>\n"
-"<p>Ако е включена отметката <em>Преглед-&gt;Прикрепени файлове-&gt;Вградени</em>"
-",\n"
-" това ще се отнася и за текста на прикрепените файлове.</p>\n"
-"<p>Тази функция работи със всички команди за отговор освен със\n"
-"<em>Съобщение-&gt;Отговор без цитиране</em>.</p>\n"
-"<p align=\"right\">благодарение на David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Няма нищо за отмяна."
@@ -15060,6 +12928,15 @@ msgstr "Прикрепен файл #%1 (без име)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Показване на журналния GnuPG файл за тази операция"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Вече има файл с име \"%1\". Искате ли да бъде презаписан?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Презапис на файл?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15175,9 +13052,9 @@ msgstr "&Изпращане на изображение с всяко съобщ
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Включете тази отметка, ако искате KMail да добави така наречената X-Face "
 "заглавна част към съобщенията на тази самоличност. X-Face е малко (48х48 "
@@ -15209,13 +13086,13 @@ msgstr "Избор на файл..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Използвайте това за избор на файл с изображение. Изображението трябва да е с "
-"висок контраст и приблизително квадратна форма. Светъл фон спомага за по-добър "
-"резултат."
+"висок контраст и приблизително квадратна форма. Светъл фон спомага за по-"
+"добър резултат."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15223,21 +13100,22 @@ msgstr "Задаване от адресника"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Можете да използвате версия с умален мащаб на изображението, което зададохте в "
-"адресника."
+"Можете да използвате версия с умален мащаб на изображението, което зададохте "
+"в адресника."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail може да изпраща малко (48x48 пиксела), нискокачествено, едноцветно "
 "изображение с всяко съобщение, например ваша снимка или глиф, което ще се "
-"покаже в пощенския клиент на получателя (ако има поддръжка на такава функция)."
+"покаже в пощенския клиент на получателя (ако има поддръжка на такава "
+"функция)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15245,11 +13123,11 @@ msgstr "Използвайте това поле за да зададете пр
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Примери има на <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Примери има на <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www."
+"xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15264,130 +13142,1807 @@ msgstr "Няма изображение"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Нямате дефиниран собствен контакт в адресника."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Общо: %2<br>Непрочетени: %3<br>Размер: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Подписване"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Квота: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Автоматично подписване на съоб&щенията"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Задаване тема на съобщение"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Когато е включена тази опция, всички изпращани от вас съобщения ще бъдат "
+"подписани по подразбиране. Разбира се възможно е да изключите подписването "
+"на всяко писмо поотделно."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Изпращане на \"копие до:\" до \"адрес\""
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Шифроване"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Изпращане \"скр. копие до:\" до \"адрес\""
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "При шифроване на е-поща, да се прави същото и към моето удостоверение"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Добавяне на \"заглавна част\" към съобщение"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Когато е включена тази опция, съобщението/файла ще бъде шифровано не само с "
+"публичния ключ на получателя, но и с вашия ключ. Това ще ви позволи да "
+"разшифровате съобщението/файла по-късно. По принцип е добра идея."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Прочитане на тяло на съобщение от \"файл\""
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Показване на под&писан/шифрован текст след съчиняване"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Задаване тяло на съобщение"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Когато е включена тази опция, подписаният/шифрованият текст ще бъде показан "
+"в отделен прозорец, позволявайки ви да видите как ще изглежда преди да бъде "
+"изпратено. Това е добра идея, когато проверявате дали системата ви за "
+"шифроване работи."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Добавяне на прикрепен файл към пощата. Това може да се повтаря"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Съхраня&ване на изпратените съобщенията шифровани"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Проверка само за нова поща"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Отметнете тук за да съхранявате съобщенията шифровани "
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Само отваряне на прозорец за съчинение"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Съхраняване съобщенията шифровани</h1>\n"
+"Ако е включена тази опция, изпратените съобщения се съхраняват шифровани "
+"(както са изпратени). Това не се препоръчва, понеже няма да може да четете "
+"съобщенията след изтичане на удостоверението.<p>\n"
+"Обаче, може да има някакви локални правила, изискващи от вас да включите "
+"опцията. Ако се двоумите, попитайте администратора.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Преглед на дадения файл със съобщения"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Винаги показване на шифроващите ключове з&а одобрение"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Изпращане на съобщение до \"адрес\" и съответно прикачване на файла към който "
-"сочи адреса"
+"Когато е включена тази опция прикрепеният файл ще показва списък с публични "
+"ключове от които можете да изберете един, който ще се използва за "
+"шифроване., ако е изключена, прикрепеният файл ще показва диалогов прозорец "
+"само, ако не открие подходящия ключ или, ако има няколко, които могат да "
+"бъдат използвани."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Прочетени"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Автоматично шифроване на съоб&щенията"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Стари"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Когато настройката е включена, всяко писмо, което изпращате, ще бъде "
+"шифровано всеки път, когато е възможно и желателно. Разбира се можете да "
+"изключите автоматичното шифроване за всяко писмо поотделно."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Изтрити"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Без подписване/шифроване при зап&ис като чернова"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Отговорени"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Как работи това?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Препратени"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Универсално"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "На опашката"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Отговор"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Изпратени"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Отговор до всички"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Следени"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Препращане"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Игнорирани"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Пряк път:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Спам"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Тип &шаблон:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Любителски"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Съдържание на шаблон"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Задачи"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Пряк път до шаблон"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Имащи прикрепени файлове"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Тип шаблон"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "Използвани са %1 от %2 %3"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Настройки на папка"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Път"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Па&пката съдържа пощенски списък"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Показване на &адрес:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Нор&мално:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Неп&рочетено:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Изтичане на съобщение"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Изтичане след:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Маркиране на про&четените съобщения като изтекли"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Изтичане с&лед:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Маркиране на непро&четените съобщения като изтекли"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Ден(и)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Седмица(и)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Месец(и)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Допълнителни"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Самоли&чност на подател:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Фор&мат на хранилище:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Показване на &списък:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Изпращане на пощата на опашката за проверка"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Вече има файл с име \"%1\". Искате ли да бъде презаписан?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Изберете дали искате KMail да изпраща всички съобщения в папка "
+"\"Изходящи\" при ръчна или автоматична проверка на пощата, или въобще не "
+"искате автоматично изпращане на съобщенията. </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Презапис на файл?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Автоматично преместване на несинхронизирана поща от папките с недостатъчни "
+"права"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Ако в папката има нови съобщения, които все още не са качени на сървъра, но "
+"нямате достатъчно права за достъп, те автоматично ще бъдат преместени в "
+"директория \"lost + found\"."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Разрешаване на локални флагчета в папките, които са само за четене"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Тази настройка позволява на администраторите да задават минимално забавяне "
+"между две проверки на пощата.\"\n"
+"           \"Потребителят не може да избира по-малка от зададената тук "
+"стойност."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Последно избраната папка в прозореца за избор на папка."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Пренебрегване на umask и използване на \"запис-четене само за потребителя\""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Правила за показване на икона в системния панел"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Затваряне на програмата при затваряне на прозореца, дори когато има система "
+"в системния панел."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Подробно известяване за нова поща"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Ако е включена тази опция, тогава за всяка папка броят на новополучените "
+"съобщения се показва в известяването за нова поща. В противен случай ще "
+"получите само обикновено съобщение - \"Получихте нова поща\"."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Редактор:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Използване на в&ъншен редактор вместо прозореца за съчиняване"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"Прагът над който потребителят ще бъде предупреден за наближаващия лимит."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Разрешаване на функциите за работа в екип"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Прехвърляне на заглавни части \"От:/До:\" от отговор в отговор"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook има известен брой слабости в изпълнението си на iCalendar "
+"стандарта; тази опция се справя с една от тях. Ако имате проблеми с Outlook "
+"потребители, които не могат да получат отговорите ви, опитайте с тази опция."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Изпращане на групови покани в тялото на съобщение"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook има известен брой слабости в изпълнението си на iCalendar "
+"стандарта; тази опция се справя с една от тях. Ако имате проблеми с Outlook "
+"потребители, които не могат да получат отговорите ви, опитайте с тази опция."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Обмен на съвместими покани"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Ако Microsoft Outlook се използва заедно с Microsoft Exchange server, има "
+"проблем с интерпретирането на груповите е-писма. Включете тази опция, за да "
+"изпращате групови покани така че да са разбираеми за Microsoft Exchange "
+"server."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Ако е включена тази отметка, няма да виждате прозореца за съчиняване на "
+"съобщения. Вместо това всички покани се изпращат автоматично. Ако искате да "
+"видите съобщението преди изпращането му, изключете опцията. Но имайте "
+"предвид, че текстът в прозореца за съчиняване е с iCalendar синтаксис и не "
+"трябва да се опитвате да го променяте на ръка."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Изтриване на поканите след като отговорът до тях е изпратен"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Ако е включена тази отметка, поканите на които е отговорено ще бъдат "
+"преместени в кошчето (веднага след изпращането на отговора)."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Включването на това прави възможно съхраняването на записите от "
+"приложенията на Kontact (KOrganizer, KAddressBook, и KNotes.)</p><p>Ако "
+"искате да настроите тази опция, трябва да настроите и приложението да "
+"използва IMAP ресурсите. Това се прави в Контролен Център на TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Обикновено няма причина да искате да видите папките. съдържащи IMAP "
+"ресурсите. Но ако е необходимо да ги видите, можете да направите настройките "
+"тук.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Ако сметката за групова информация \"\n"
+"          \"не се използва за нормална поща, включете опцията, за да "
+"накарате KMail  \"\n"
+"          \"да показва само груповите папки. Това намира приложение при \"\n"
+"          \"поща през допълнителна включена IMAP сметка.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Изберете формат за съхраняване на екипните папки. <ul><li>Формата по "
+"подразбиране е да използвате стандартите ical (за папки календар) и vcard "
+"(за папки на адресника). Този формат прави достъпни всички възможности на "
+"Kontact</li><li>Форматът Kolab XML използва потребителски модел, който е по-"
+"близък до този на Outlook. Той има по-добра съвместимост с Outlook при "
+"използване на Kolab сървър или съвместимо решение.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Това избира родителя на IMAP ресурните папки.</p> <p>По подразбиране "
+"Kolab сървърът настройва папка \"Входящи\" на IMAP да бъде родителска.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Това е ID на сметката с IMAP ресурсните папки.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Ако искате да настроите имената на папки за IMAP хранилището на вашия "
+"език, можете да изберете между тези езици.</p><p> Моля, имайте предвид, че "
+"единствената причина да направите това е съвместимост с Microsoft Outlook. "
+"Счита се за лоша идея да пипате това, тъй като прави смяната на езици "
+"невъзможна. </p><p>Така че не го настройвайте, освен ако не е наложително.</"
+"p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Филтриране на получената нова поща за груповите папки."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Синхронизиране на груповите промени в DIMAP папките веднага след влизане в "
+"мрежата."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Тази стойност се използва, за да се реши дали да бъде показано въведение за "
+"KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Максимален брой връзки за хост"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Това може да се използва за ограничаване броя връзки за хост при проверка за "
+"нова поща. По подразбиране броя връзки е неограничен (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Показване на лента бързо търсене"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Тази опция включва или изключва лентата за търсене над списъка със "
+"съобщения, което може да се използва за бързо търсене на информация в "
+"списъка със съобщения."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Скриване на локалната вх. кутия, ако не се използва"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Forward Inline As Default."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "\";\" да бъде разделител при съчиняване."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Запазване на оригиналната кодова таблица при отговор или препращане, ако е "
+"възможно"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "А&втоматично добавяне на подпис"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Запомняне на тази самоличност за използване в други прозорци за съставяне на "
+"съобщения.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Запомняне на папка за изпратени обекти, за използване в други прозорци за "
+"съставяне на съобщения."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Запомняне на пощенски транспорт за използване в други прозорци за съставяне "
+"на съобщения."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Запомняне на тази самоличност за използване в други прозорци за съставяне на "
+"съобщения.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Пре&насяне на думите в колона:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Максимален брой редове за редактор на получателя."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Включете тази отметка за да може Outlook &#8482; да разбира имена на "
+"прикрепените файлове, съдържащи символи, които не са част от английската "
+"азбука"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Автоматично и&скане на известие за доставка на съобщение (ИДС)"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Включете тази опция, ако искате KMail да изисква известяване за "
+"доставка на съобщение (ИДС) за всяко от изходящите съобщения.</p><p>Тази "
+"опция засяга само стойността по подразбиране. Въпреки това от менюто на "
+"редактора можете да включите или изключите искането на ИДС за отделно "
+"съобщение.<em>Настройки</em>-><em>Искане на известие за доставка на "
+"съобщение</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Използване на последните адреси за автозавършване"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Изключете опцията, ако не искате последно използваните адреси да се появяват "
+"в списъка за автозавършване в полетата за адрес."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Интервал на автозапис:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Периодично може да се създава резервно копие на текста в прозореца за "
+"съчиняване. Използваният интервал се задава тук. Можете да изключите "
+"автозаписа като зададете стойност 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Вмъкване на подпис над цитирания текст"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "За&мяна на разпознатата представка с \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Замяна на разпознатата представка с \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Интелигентно &цитиране"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Подписът е изтекъл."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Тип за избор на адрес"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Задава типа на диалоговия прозорец за избор на получатели за \"До\",\n"
+"        \"Копие до\" и \"Скр. копие до\"."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Тип на редактора на получателя"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Задава типа на редактора за получател за редактиране на \"До\",\n"
+"        \"Копие до\" и \"Скр. копие до\"."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Максимален брой редове за редактор на получателя."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Максималният позволен размер в МБ за прикрепен файл."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Показване на панела за управление на участниците при съчиняване."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr "Показване на журнала за GnuPG дори след успешно шифроване."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Запазване на оригиналната кодова таблица при отговор или препращане, ако е "
+"възможно"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Някои съобщения, особено тези генерирани автоматично, не задават кодова "
+"таблица, която е необходима за правилно показване. В такива случаи ще се "
+"използва кодова таблица по подразбиране, която можете да настроите тук. "
+"Задайте кодовата таблица, която се използва най-често във вашата страна. По "
+"подразбиране се използва кодирането на компютъра."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Промяната на \"Авто\" (по подразбиране) ще доведе до използването на "
+"указаното кодиране за всички писма, независимо от тяхното собствено."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Включете това, ако искате усмивки като :-) в текста на съобщението да бъдат "
+"заменени от емоции (малки картинки)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Включете тази опция за показване на различни нива цитиран текст. Изключете "
+"я, за да скриете нивата на цитирания текст."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Ниво на автоматично сгъване:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Намаляване на размера на шрифт на цитиран текст"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Включете тази опция, ако искате цитираният текст да е с по-малък шрифт."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Съхраня&ване на изпратените съобщенията шифровани"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Показване на потребителския агент в декорираните заглавни части"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Включете тази опция ако искате потребителският агент (User-Agent) и X-Mailer "
+"да се показват в декорираните заглавни части."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Разрешаване изтриването на прикрепени файлове."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Разрешаване редактирането на прикрепени файлове."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Разшифроване на съобщенията при преглед или питане за разшифроване"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Изпращане на известие за доставка на съобщение (ИДС) без изпращач."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Изпращане на известие за доставка на съобщение (ИДС) с празно поле за "
+"изпращач. Някои сървъри може да са настроени да отхвърлят такива съобщения ,"
+"така че ако имате проблеми с изпращането на ИДС, изключете тази опция."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Фразите бяха конвертирани в шаблони"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Остарелите фрази са преобразувани в шаблони"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Шаблон за нови съобщения"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Шаблон за отговор"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Шаблон за отговор до всички"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Шаблон за препращане"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Символи за цитиране"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+"Разрешаване настройките на \"извън офиса\" да бъдат променяни от потребителя."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Разрешаване на потребителите да зареждат sieve скриптове, но да не могат да "
+"променят настройките, напр. домейна."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "Изпращане на отговори \"извън офиса\" само на адреси от този домейн."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "Разрешаване на СПАМА да получава отговори \"извън офиса\"."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"При стартиране на KMail проверка дали все още е активиран отговора \"извън "
+"офиса\"."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Редактиране на файл"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Редактиране..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Навигация"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Папка"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "С&ъобщение"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Специален отговор"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "П&репращане"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Подсказки"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Настройване на участниците"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML лента с инструменти"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Общи настройки"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML лента с инструменти"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Проверка на сертификати чрез CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Ако е включена тази опция, S/MIME сертификатите ще се проверяват чрез "
+"Certificate Revocation Lists (CRLs)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Проверка на сертификати в Интернет (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Ако е включена тази опция, S/MIME сертификатите са проверявани в Интернет "
+"чрез Online Certificates Status Protocol (OCSP). Попълнете адреса (URL) на "
+"OCSP по-долу."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Проверка на удостоверение в Интернет"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP адрес (URL):"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Въведете адресът на сървъра за проверка на сертификати в Интернет (OCSP "
+"отговарящ). Адреса (URL) обикновено започва с http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Подпис на OCSP отговарящ:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Игнориране на обслужващ адрес (URL) на сертификатите"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Без проверка на политиката за сертификати"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"По подразбиране GnuPG използва файла ~/.gnupg/policies.txt за проверка дали "
+"политиката за сертификати е включена. Ако е включена тази опция, политиката "
+"не се проверява."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Никога консултиране с CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ако е включена тази опция, CRLs (списъците с анулирани сертификати) не се "
+"използват за проверка на S/MIME сертификати."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Изтегляне на липсващите удостоверения от издателя"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Ако е включена тази опция, липсващи сертификати се изтеглят при необходимост "
+"(това е приложимо за двата метода за проверка, CRLs и OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP заявки"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Без HTTP заявки"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Изцяло изключва използването на HTTP за S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Използване на това прокси за HTTP заявки: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Използване на системното HTTP прокси:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Ако е включена тази опция, стойността за HTTP прокси, показана вдясно (която "
+"се взима от променливата на средата http_proxy), ще бъде използвана за всяка "
+"HTTP заявка."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Въведете местоположението на HTTP проксито, което ще се използва за всички "
+"HTTP заявки, свързани с S/MIME. Синтаксиса е хост:порт, например myproxy."
+"nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Игнориране на HTTP CRL точка на разпределяне за сертификати"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Когато търсите местоположението на CRL, сертификата за тестване обикновено "
+"съдържа така наречените \"CRL Distribution Point\" (DP) записи, които "
+"описват начина за достъп до URL. Използва се първият открит DP запис. С тази "
+"опция всички записи, които използват HTTP схемата ще бъдат игнорирани при "
+"търсене на подходяща DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP заявки"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Без LDAP заявки"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Изцяло изключване на използването на LDAP за S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Игнориране на LDAP CRL точка на разпределяне за сертификати"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Когато търсите местоположението на CRL, сертификата за тестване обикновено "
+"съдържа така наречените \"CRL Distribution Point\" (DP) записи, които "
+"описват начина за достъп до URL. Използва се първият открит DP запис. С тази "
+"опция всички записи, които използват LDAP схемата ще бъдат игнорирани при "
+"търсене на подходяща DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Основен хост за LDAP заявки:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Въвеждането на LDAP сървър тук ще насочи всички LDAP заявки първо към този "
+"сървър. По-точно, тази настройка заменя всеки зададен хост и порт в LDAP "
+"URL, и също ще бъде използван, ако в адреса (URL) са пропуснати хост и порт. "
+"Други LDAP сървъри ще бъдат използвани само ако връзката до \"проксито\" е "
+"неуспешна.\n"
+"Синтаксисът е \"ХОСТ\" или \"ХОСТ:ПОРТ\"., ако ПОРТ е пропуснат, порт 389 "
+"(стандартният LDAP порт) се използва."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Добавяне на участник"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "Д&обавяне"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Участник:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Група:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Настройване на участниците"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Подсказки"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Показване текста на участника в &подсказките"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "Дали са се показва подсказка с текст от реда"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Променливи"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Метод на въвеждане на променливите"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Един прозорец за всяка променлива на участник"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "Ще бъде показан прозорец за всяка променлива на участника"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Един прозорец за всички променливи на участник"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Ще се покаже прозорец където можете да въведете стойностите за променливите "
+"на участник"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Разделител:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Настройване на шаблони"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Отговор до подателя"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Отговор до всички / Отговор до списъка"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Препращане на съобщение"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Предупре&ждение при опит за изпращане на неподписани съобщения"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Отметнете тук, ако искате да бъдете предупредени при изпращане на "
+"неподписани съобщения."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение при опит за изпращане на неподписани съобщения</h1>\n"
+"Ако е включена тази опция, ще бъдете предупредени при опит за изпращане на "
+"част или цялото съобщение неподписано.\n"
+"<p>\n"
+"Препоръчително е да оставите тази опция включена.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "П&редупреждение при опит за изпращане на нешифровани съобщения"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Отметнете тук, ако искате да бъдете предупредени при изпращане на "
+"нешифровани съобщения."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение при опит за изпращане на нешифровани съобщения</h1>\n"
+"Ако е включена тази опция ще бъдете предупредени при опит за изпращане на "
+"части или цялото съобщение нешифровано.\n"
+"<p>\n"
+"Препоръчително е да включите отметката.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Предупреждение ак&о е-пощата на получателя не е в сертификата"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Отметнете тук за да бъдете предупредени, ако е-пощата не е в удостоверението"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение, ако електронния адрес на получателя не е в "
+"удостоверението</h1>\n"
+"Ако е включена тази опция, се показва предупреждение, ако адреса на "
+"получателя не се съдържа в удостоверението използван за шифроване.\n"
+"<p>\n"
+"За максимална сигурност е препоръчително да включите отметката.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Предупреждение ако удостоверенията/ключовете изтичат скоро (настройте тук)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "За подписване"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "За шифроване"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Изберете брой дни "
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение, ако удостоверението за подпис изтича</h1>\n"
+"Изберете минимален брой дни за валидност на удостоверението преди да бъде "
+"показано предупреждение.\n"
+"<p>\n"
+"Препоръчителната настройка на SPHINX е 14 дни.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение, ако удостоверението за шифроване изтича</h1>\n"
+"Изберете минималния брой дни за който да бъде валидно удостоверението за "
+"шифроване преди да бъде показано предупреждение.\n"
+"<p>\n"
+"Препоръчителната настройка на SPHINX е 14 дни.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение, ако удостоверението във веригата изтича</h1>\n"
+"Изберете минимален брой дни за валидност на всички удостоверенията във "
+"веригата преди да бъде показано предупреждение.\n"
+"<p>\n"
+"Препоръчителната настройка на SPHINX е 14 дни.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение за изтичане на CA удостоверение</h1>\n"
+"Изберете минимален брой дни за които CA удостоверението ще е валидно без да "
+"бъде показано предупреждение.\n"
+"<p>\n"
+"Препоръчителната настройка на SPHINX е 14 дни.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждение за изтичане на коренно удостоверение</h1>\n"
+"Избиране минимален брой дни за които коренния удостоверението ще бъде "
+"валиден без да се показва предупреждение.\n"
+"<p>\n"
+"Препоръчителна настройка на SPHINX е 14 дни.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "За коренни удостоверения:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "За междинни CA удостоверения:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "За потребителски удостоверения/ключове:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Включване отново на предупрежденията \"Изключване въпроса\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>... можете да преминете към следващото и предишното съобщение\n"
+"чрез клавишите дясна или лява стрелка?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>... можете бързо да създадете филтри за подател, получател,\n"
+"тема и пощенски списък от <em>Съобщение-&gt;Създаване на&nbsp;филтър</em>?</"
+"p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... можете да се отървете от \n"
+"&quot;[име на пощенския списък]&quot;,\n"
+"което някои пощенски списъци добавят, \n"
+"чрез филтриране с функцията <em>Преправяне\n"
+" на заглавна част</em>? Просто в <pre>&quot;Тема&quot;</pre> заместете "
+"<pre>&quot;\\s*\\[име на пощенски списък\\]\\s*&quot;</pre> с <pre>&quot;"
+"&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>... можете да асоциирате пощенски списък с папки от\n"
+"<em>Папка-&gt;Управление на пощенски списък</em>? След това можете да "
+"използвате\n"
+"<em>Съобщение-&gt;Ново&nbsp;съобщение&nbsp;до&nbsp;пощенски&nbsp;списък...</"
+"em>,\n"
+"за да отворите прозорец за съчиняване.\n"
+"Или просто можете да щракнете със средния бутон на мишката върху папката.</"
+"p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>... можете да зададете потребителски икони за всяка отделна папка?\n"
+"Вижте <em>Папка-&gt;Настройки</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>... KMail може да показва различни цветове за различните типовете "
+"съобщения\n"
+"(обикновен текст/HTML/OpenPGP)?</p>\n"
+"<p>Това ще попречи на опитите да се имитират удостоверения за подписи\n"
+"чрез изпращане на HTML съобщения, наподобяващи тези на KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>... можете да филтрирате всяка от заглавните части просто като въведете "
+"името и\n"
+"в полето за търсене?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... можете да филтрирате HTML съобщения с правилото:\n"
+"<pre>&quot;Content-type&quot; съдържа &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>... когато отговаряте на съобщение ще бъде цитирана само маркираната част?"
+"</p>\n"
+"<p>Ако не е маркирано нищо, тогава ще бъде цитирано цялото съобщение.</p>\n"
+"<p>Ако е включена отметката <em>Преглед-&gt;Прикрепени файлове-&gt;Вградени</"
+"em>,\n"
+" това ще се отнася и за текста на прикрепените файлове.</p>\n"
+"<p>Тази функция работи със всички команди за отговор освен със\n"
+"<em>Съобщение-&gt;Отговор без цитиране</em>.</p>\n"
+"<p align=\"right\">благодарение на David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Показване на лента бързо търсене"
diff --git a/tde-i18n-bn/messages/tdepim/kmail.po b/tde-i18n-bn/messages/tdepim/kmail.po
index ae0ff500e0b..4f341aa9664 100644
--- a/tde-i18n-bn/messages/tdepim/kmail.po
+++ b/tde-i18n-bn/messages/tdepim/kmail.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2006-02-06 01:01-0600\n"
 "Last-Translator: Deepayan Sarkar <deepayan@bengalinux.org>\n"
 "Language-Team: Bengali <kde-translation@bengalinux.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "দীপায়ন সরকার"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -166,6 +166,12 @@ msgstr "কিছু না (সাবধানে ব্যবহার কর�
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "ইতিবৃত্ত ফাঁকা করো"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -241,13 +247,13 @@ msgstr "&লগ-ইন:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"আপনার ইন্টারনেট সেবা সরবরাহকারীর কাছ থেকে আপনার একটি <em>"
-"ব্যবহারকারীরনাম (username)</em> পাওয়া উচিত্‍। সাধারণত, এটি হবে আপনার ই-মেইল "
-"ঠিকানার প্রথম অংশ (<em>@</em>-এর আগে)।"
+"আপনার ইন্টারনেট সেবা সরবরাহকারীর কাছ থেকে আপনার একটি <em>ব্যবহারকারীরনাম "
+"(username)</em> পাওয়া উচিত্‍। সাধারণত, এটি হবে আপনার ই-মেইল ঠিকানার প্রথম অংশ "
+"(<em>@</em>-এর আগে)।"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -268,12 +274,12 @@ msgstr "পপ (POP) পাসওয়ার্ড সঞ্চি&ত রাখ�
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -302,12 +308,13 @@ msgstr "এর চেয়ে &বড় বার্তা ফিল্টার ক
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "যদি আপনি এটি নির্বাচন করেন, তাহলে পপ ফিল্টার ব্যবহার করে নির্ধারণ করা হবে "
-"বার্তাগুলি নিয়ে কী করা হবে। এর পর আপনি সিদ্ধান্ত নিতে পারেন সেগুলি ডাউনলোড "
-"করতে, মুছে ফেলতে অথবা সার্ভার-এ রেখে দিতে। "
+"বার্তাগুলি নিয়ে কী করা হবে। এর পর আপনি সিদ্ধান্ত নিতে পারেন সেগুলি ডাউনলোড করতে, "
+"মুছে ফেলতে অথবা সার্ভার-এ রেখে দিতে। "
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -356,13 +363,15 @@ msgstr "Clear te&xt"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -405,9 +414,9 @@ msgstr "নেম-স্পেস:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -466,14 +475,13 @@ msgstr "অ্যাটা&চমেন্ট শুধুমাত্র চা
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"এটি সক্রিয় করা থাকলে কোন বার্তা নির্বাচন করলে নিজে থেকে তার সঙ্গে সংযুক্ত "
-"ফাইলগুলি (অ্যাটাচমেন্ট) লোড করা হবে না, কেবলমাত্র একটি অ্যাটাচমেন্ট-এর উপর "
-"ক্লিক করলে তবেই সেটি লোড করা হবে। এর ফলে বড় ফাইল সংযুক্ত থাকলেও বার্তাটি "
-"তত্‍ক্ষণাত্‍ দেখানো হবে। "
+"এটি সক্রিয় করা থাকলে কোন বার্তা নির্বাচন করলে নিজে থেকে তার সঙ্গে সংযুক্ত ফাইলগুলি "
+"(অ্যাটাচমেন্ট) লোড করা হবে না, কেবলমাত্র একটি অ্যাটাচমেন্ট-এর উপর ক্লিক করলে তবেই "
+"সেটি লোড করা হবে। এর ফলে বড় ফাইল সংযুক্ত থাকলেও বার্তাটি তত্‍ক্ষণাত্‍ দেখানো হবে। "
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -511,7 +519,7 @@ msgstr "<কিছু না>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "ইনবক্স"
 
@@ -519,54 +527,54 @@ msgstr "ইনবক্স"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
-msgstr ""
-"অনুগ্রহ করে প্রথমে \"সাধারণ\" ট্যাব-এ একটি সার্ভার এবং পোর্ট নির্ধারণ করুন।"
+msgstr "অনুগ্রহ করে প্রথমে \"সাধারণ\" ট্যাব-এ একটি সার্ভার এবং পোর্ট নির্ধারণ করুন।"
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -574,8 +582,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -650,8 +658,8 @@ msgstr "আই-ম্যাপ (IMAP) অ্যাকাউন্ট"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -688,9 +696,9 @@ msgstr "কে-মেইল-এ স্বাগতম্"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -753,8 +761,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "সার্ভার তথ্য"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "কিছু না"
@@ -888,17 +895,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -913,8 +919,7 @@ msgstr "স্প্যাম হিসাবে সনাক্ত করা �
 
 #: antispamwizard.cpp:947
 msgid "Mark messages which have been classified as spam as read."
-msgstr ""
-"কোন বার্তা স্প্যাম হিসাবে সনাক্ত করা হলে সেগুলি পঠিত হিসাবে চিহ্নিত করা হবে।"
+msgstr "কোন বার্তা স্প্যাম হিসাবে সনাক্ত করা হলে সেগুলি পঠিত হিসাবে চিহ্নিত করা হবে।"
 
 #: antispamwizard.cpp:950
 msgid "Move &known spam to:"
@@ -932,10 +937,9 @@ msgstr "&সম্ভাব্য স্প্যাম এখানে সর�
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -946,8 +950,8 @@ msgstr "অ্যান্টি-ভাইরাস টুল ব্যবহা
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -957,8 +961,8 @@ msgstr "সনাক্ত করা ভাইরাসযুক্ত বার
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -967,8 +971,8 @@ msgstr "এ ছাড়াও, সনাক্ত করা বার্তাগ�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1161,8 +1165,8 @@ msgstr "সার্ভার-এ %1 ফোল্ডার-টি পড়তে �
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1182,8 +1186,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1213,15 +1217,15 @@ msgstr "মুছে ফেলা"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1239,8 +1243,7 @@ msgstr ""
 #: compactionjob.cpp:99
 #, c-format
 msgid "For safety reasons, compaction has been disabled for %1"
-msgstr ""
-"নিরাপত্তাজনিত কারণে %1-এর জন্য জমাট করা (compaction) নিষ্ক্রিয় করা হয়েছে"
+msgstr "নিরাপত্তাজনিত কারণে %1-এর জন্য জমাট করা (compaction) নিষ্ক্রিয় করা হয়েছে"
 
 #: compactionjob.cpp:176 compactionjob.cpp:259
 msgid "Folder \"%1\" successfully compacted"
@@ -1252,15 +1255,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "প্রোফাই&ল লোড করো..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "কে-মেইল কনফিগার করো"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "যো&গ করো..."
@@ -1290,6 +1297,11 @@ msgstr "<qt>আপনি কি সত্যিই <b>%1</b> নামক পর
 msgid "Remove Identity"
 msgstr "পরিচিতি সরিয়ে ফেলো"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "মুছে ফেলো (&ম)"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "যোগ করো..."
@@ -1298,6 +1310,11 @@ msgstr "যোগ করো..."
 msgid "Modify..."
 msgstr "বদলাও..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "মুছে ফেলো (&ম)"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "ডিফল্ট হিসেবে নির্দিষ্ট করো"
@@ -1314,17 +1331,15 @@ msgstr "প্রের&ণ"
 msgid "Outgoing accounts (add at least one):"
 msgstr "বহির্মুখী অ্যাকাউন্ট (অন্তত একটি যোগ করুন):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "নাম"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "ধরন"
@@ -1346,8 +1361,7 @@ msgstr "ডিফল্ট নির্দিষ্ট করো"
 msgid "Common Options"
 msgstr "সাধারণ অপশন"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "পাঠাবার আগে &অনুমোদন চাও"
@@ -1398,14 +1412,14 @@ msgstr "ডিফল্ট ডোমে&ইন:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1423,9 +1437,9 @@ msgstr "বার্তাবাহক যোগ করো"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (ডিফল্ট)"
 
@@ -1504,6 +1518,10 @@ msgstr "অ্যাকাউন্ট পাল্টাও"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>অ্যাকাউন্ট <b>%1</b>-র অবস্থান নির্দিষ্ট করতে ব্যর্থ।</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "র&ঙ"
@@ -1612,8 +1630,7 @@ msgstr "দেখা লিঙ্ক"
 msgid "Misspelled Words"
 msgstr "বানান ভুল করা শব্দ"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "নতুন বার্তা"
@@ -1802,8 +1819,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1812,40 +1829,33 @@ msgstr "তারিখ প্রদর্শন"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1860,8 +1870,7 @@ msgstr "এইচ-টি-এম-এল স্ট্যাটা&স বার �
 msgid "Show s&pam status in fancy headers"
 msgstr "কেতাদুরস্ত হেডার-এ স্প্যা&ম স্ট্যাটাস দেখাও"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1870,8 +1879,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1897,8 +1905,7 @@ msgstr "স্বয়ংক্রীয়"
 msgid "&Override character encoding:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "সিস্টেম ট্রে আইকন সক্রিয় করো"
@@ -2002,13 +2009,12 @@ msgstr "<b>%f</b>-এর পরিবর্তে সম্পাদন কর�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2032,21 +2038,20 @@ msgstr "সক&লকে উত্তর পাঠাও:"
 msgid "&Forward:"
 msgstr "&ফরওয়ার্ড করো:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&উদ্ধৃতি নির্দেশক:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D তারিখে, আপনি লিখেছিলেন:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D তারিখে, %F লিখেছিলেন:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "ফরওয়ার্ড করা বার্তা"
 
@@ -2082,8 +2087,8 @@ msgstr "ফরওয়ার্ড করা বার্তার বিষয়ে
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2118,10 +2123,9 @@ msgstr "মান"
 msgid "Ne&w"
 msgstr "নতুন (&ত)"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "না&ম:"
@@ -2130,16 +2134,15 @@ msgstr "না&ম:"
 msgid "&Value:"
 msgstr "মা&ন:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2166,13 +2169,13 @@ msgstr "attached"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2197,62 +2200,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2269,10 +2266,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2351,8 +2348,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2381,8 +2377,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2406,8 +2402,8 @@ msgstr "সব ফোল্ডারে ঘোরো"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2476,16 +2472,14 @@ msgstr "ঢিরেক্টরি (\"maildir\" ফর্ম্যাট)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2521,32 +2515,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2612,8 +2601,8 @@ msgstr "গ্রুপওয়্যার ফোল্ডার লুকো&ও
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2622,8 +2611,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2676,19 +2665,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2701,14 +2689,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2774,8 +2762,7 @@ msgstr "বর্ণনা"
 #: configuredialog_p.cpp:302
 msgid "&Select a profile and click 'OK' to load its settings:"
 msgstr ""
-"একটি প্রোফাই&ল নির্বাচন করুন এবং 'বেশ' বাটনটি ক্লিক করে তার বৈশিষ্ট্যাবলী লোড "
-"করুন:"
+"একটি প্রোফাই&ল নির্বাচন করুন এবং 'বেশ' বাটনটি ক্লিক করে তার বৈশিষ্ট্যাবলী লোড করুন:"
 
 #: configuredialog_p.cpp:342
 msgid ""
@@ -2819,17 +2806,16 @@ msgstr "&ফরোয়ার্ড করো"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2846,15 +2832,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2923,8 +2909,8 @@ msgstr "পরিচিতি সম্পাদন করো"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3173,6 +3159,11 @@ msgstr "ফোল্ডার নির্বাচন করো"
 msgid "Filters"
 msgstr "ফিল্টার %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "সব লেখা নির্বাচন করো"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3204,8 +3195,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3222,10 +3213,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3246,10 +3238,10 @@ msgstr "অসীম"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3258,7 +3250,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "কে-মেইল সমস্যা"
@@ -3299,9 +3291,9 @@ msgstr "ব্য&বহারকারী পরিচায়ক:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3351,8 +3343,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3361,11 +3353,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
-msgstr ""
-"সার্ভার %1-এর সঙ্গে যোগাযোগ স্থাপন করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
+msgstr "সার্ভার %1-এর সঙ্গে যোগাযোগ স্থাপন করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "সার্ভার %1-এর সঙ্গে যোগাযোগ স্থাপনে সমস্যা হয়েছে"
@@ -3391,8 +3381,8 @@ msgstr "অনুমতি যোগ করো"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3422,7 +3412,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "ফোল্ডার নির্বাচন করো"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "স্থানীয় ফোল্ডার"
@@ -3447,9 +3437,9 @@ msgstr ""
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3470,11 +3460,20 @@ msgstr "বাতি&ল"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "অজ্ঞাত"
@@ -3593,52 +3592,16 @@ msgstr "স্প্যাম স্ট্যাটাস:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>এইচ<br>টি<br>এম<br>এল<br> <br>বা<br>র<br>তা<br></b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt><b>"
-"<br>এইচ"
-"<br>টি"
-"<br>এম"
-"<br>এল"
-"<br> "
-"<br>বা"
-"<br>র"
-"<br>তা"
-"<br></b> "
-"<br>ন"
-"<br>য়</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><b><br>এইচ<br>টি<br>এম<br>এল<br> <br>বা<br>র<br>তা<br></b> <br>ন<br>য়</"
+"qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3650,12 +3613,9 @@ msgstr "&আপনার নাম:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3664,11 +3624,9 @@ msgstr "সংস্থা (&স):"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3677,14 +3635,11 @@ msgstr "&ই-মেইল ঠিকানা:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3694,21 +3649,12 @@ msgstr "&ই-মেইল ঠিকানা:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3731,12 +3677,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3749,20 +3694,18 @@ msgstr "আপনার ওপেন-পি-জি-পি এনক্রিপ�
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3781,11 +3724,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3798,18 +3740,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3830,14 +3771,12 @@ msgstr "উত্ত&র পাবার ঠিকানা:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3846,15 +3785,12 @@ msgstr "&BCC ঠিকানা:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3895,7 +3831,7 @@ msgstr "স্বাক্ষ&র"
 msgid "&Picture"
 msgstr ""
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "অবৈধ ই-মেইল ঠিকানা"
 
@@ -3914,8 +3850,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -3964,8 +3900,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (ডিফল্ট)"
 
@@ -4012,14 +3948,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4057,14 +3993,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "সমস্যা: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4212,14 +4153,14 @@ msgstr "লিস্ট আর্কাইভ"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4247,136 +4188,110 @@ msgstr "আপনার ওপেন-পি-জি-পি এনক্রিপ�
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4390,136 +4305,110 @@ msgstr ""
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4532,9 +4421,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4560,26 +4450,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4590,8 +4480,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4613,8 +4503,8 @@ msgstr ""
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4634,8 +4524,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4671,11 +4561,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4717,10 +4607,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "সাঙ্ঘাতিক সমস্যা: মেইল সংগ্রহ করা যায়নি:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"বার্তা যোগ করা যায়নি:\n"
+msgid "Failed to add message:\n"
+msgstr "বার্তা যোগ করা যায়নি:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -4806,6 +4694,50 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr "মেই&ল-ডির ডাকবাক্স"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "বার্তার বিষয় নির্ধারণ করো"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "বার্তায় 'হেডার' যোগ করো "
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr ""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr ""
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "শুধু নতুন মেইল-এর জন্য পরীক্ষা করো"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "শুধু রচনাক্ষেত্র উইণ্ডো খোলো"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "মেইল"
@@ -4860,9 +4792,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4910,14 +4842,13 @@ msgstr "ইউ-আর-এল-টি ক্লীপবোর্ড-এ কপি
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
-"<qt><b>%1</b> নামক ফাইল আগে থেকেই আছে।"
-"<br>আপনি কি সেটি বদলাতে চান?</qt>"
+"<qt><b>%1</b> নামক ফাইল আগে থেকেই আছে।<br>আপনি কি সেটি বদলাতে চান?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "ফাইলে সংরক্ষণ করো"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&বদলাও"
 
@@ -4935,7 +4866,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4955,122 +4886,122 @@ msgstr "ফাইলটিতে কোন বার্তা নেই।"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "ফাইলটিতে একাধিক বার্তা রয়েছে। শুধু প্রথম বার্তাটি প্রদর্শিত হচ্ছে।"
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "বার্তা মুছে ফেলা হচ্ছে"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "%1 থেকে %2-টি বার্তার %3 নম্বরটি স্থানান্তরিত করা হচ্ছে।"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "ডিস্ক-এ যথেষ্ট ফাঁকা জায়গার অভাব?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "এই ফোল্ডার-এ সরাও"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "এই ফোল্ডার-এ কপি করো"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "বার্তা সরানো হচ্ছে"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "বার্তা মুছে ফেলা হচ্ছে"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "ইউ-আর-এল খোলা হচ্ছে..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>আপনি কি সত্যিই <b>%1</b> চালাতে চান?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "চালাও"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "সংরক্ষণ করার মত কোন অ্যাটাচমেন্ট পাওয়া যায়নি।"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "অ্যাটাচমেন্ট এখানে সংরক্ষণ করো"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "attachment.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "attachment.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "%1 নামক একটি ফাইল আগে থেকেই আছে। আপনি কি সেটি মুছে লিখতে চান?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "ফাইল আগে থেকেই আছে"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "কে-মেইল প্রশ্ন"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "এনক্রিপশন রাখো"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "রেখো না"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "স্বাক্ষর রাখো"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5079,85 +5010,85 @@ msgstr ""
 "ফাইল %1 লেখা যায়নি:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "ফাইল %1 লেখা যায়নি।"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "মেইল"
@@ -5256,7 +5187,7 @@ msgstr "মাপ"
 msgid "Encoding"
 msgstr "এনকোডিং"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "সঙ্কোচন"
 
@@ -5268,7 +5199,7 @@ msgstr "এনক্রিপ্ট"
 msgid "Sign"
 msgstr "স্বাক্ষর"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "অ্যাটাচমেন্ট-এর নাম:"
 
@@ -5288,7 +5219,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5298,9 +5230,9 @@ msgstr "অতিরিক্ত গ্রাহক"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5309,9 +5241,8 @@ msgstr "গুপ্ত গ্রাহক"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5322,7 +5253,7 @@ msgstr "মেই&ল পাঠাও"
 msgid "&Send Mail Via"
 msgstr "এর মারফত মেই&ল পাঠাও"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&পরে পাঠাও"
@@ -5389,8 +5320,7 @@ msgstr "উদ্ধৃতিচিহ্ন &সরিয়ে ফেলো"
 msgid "Cl&ean Spaces"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "ফিক্সড &ফন্ট ব্যবহার করো"
@@ -5532,31 +5462,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "স্ট্যাণ্ডার্ড"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5660,54 +5590,56 @@ msgstr "রচনাক্ষেত্র বন্ধ করো"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"মনে হচ্ছে আপনার রচনা করা বার্তায় আপনি একটি অ্যাটাচমেন্ট-এর কথা বলেছেন, কিন্তু "
-"কোন কিছু সংযুক্ত করা হয়নি।\n"
+"মনে হচ্ছে আপনার রচনা করা বার্তায় আপনি একটি অ্যাটাচমেন্ট-এর কথা বলেছেন, কিন্তু কোন "
+"কিছু সংযুক্ত করা হয়নি।\n"
 "আপনি কি এই বার্তাটির সঙ্গে কোন ফাইল সংযুক্ত করতে চান?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "ফাইল অ্যাটাচমেন্ট স্মারক"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "যেমন &আছে পাঠাও"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "ফাইল সংযুক্ত করো"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "সংযুক্ত &করো"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "ফাইল অন্তর্ভুক্ত করো"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "ফাইল অন্তর্ভুক্ত করো"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5747,276 +5679,287 @@ msgid ""
 "View"
 msgstr "দেখাও"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "সম্পাদনা..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "স্ক্রিপ্ট সম্পাদন করো..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&নতুন নামে সংরক্ষণ করো..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "বৈশিষ্ট্যা&বলী"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "অ্যাটাচমেন্ট যোগ করো..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "কে-মেইল ফাইল-টি সঙ্কোচন করতে পারেনি।"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr ""
-"সঙ্কোচন করা ফাইলটি মূল ফাইলটির চেয়ে বড়। আপনি কি মূল ফাইলটি রেখে দিতে চান?"
+msgstr "সঙ্কোচন করা ফাইলটি মূল ফাইলটির চেয়ে বড়। আপনি কি মূল ফাইলটি রেখে দিতে চান?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "রাখো"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "কে-মেইল সঙ্কুচিত ফাইলটি পুনরুদ্ধার করতে পারেনি।"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "অ্যাটাচমেন্ট নতুন নামে সংরক্ষণ করো"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "অ্যাটাচমেন্ট হিসাবে যোগ করো"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "অ্যাটা&চমেন্ট হিসাবে পেস্ট করো"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "নামহীন"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "অনির্দিষ্ট এনক্রিপশন কী (Key)"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "অনির্দিষ্ট স্বাক্ষর কী (Key)"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "আপনি বার্তার কোন বিষয় উল্লেখ করেননি। তা সত্ত্বেও বার্তাটি পাঠাব?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "কোন নাম উল্লিখিত হয়নি"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "আপনি বার্তার কোন বিষয় উল্লেখ করেননি। তা সত্ত্বেও বার্তাটি পাঠাব?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "বিষয় উল্লিখিত হয়নি"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "যে&মন আছে পাঠাও"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "বিষয় &উল্লেখ করব"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "বার্তা এনক্রিপ্ট/স্বাক্ষর করা হবে?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "অনুগ্রহ করে পাঠানোর জন্য একটি অ্যাকাউন্ট তৈরি করে আবার চেষ্টা করুন।"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "ই-মেইল পাঠাতে চলেছি..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr ""
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&এখন পাঠাও"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<গ্রাহক>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "অতিরিক্ত গ্রাহক"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "বানান পরীক্ষক"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "বানান পরীক্ষক"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " বানান পরীক্ষা বাতিল"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " বানান পরীক্ষা স্থগিত"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " বানান পরীক্ষা সম্পূর্ণ"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "বানান পরীক্ষক"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "বার্তা স্বাক্ষর করেছেন %1।"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "বার্তা স্বাক্ষর করেছেন %1।"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "ওপেন-পি-জি-পি বার্তা - এনক্রিপ্ট করা"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "ওপেন-পি-জি-পি বার্তা - এনক্রিপ্ট করা"
@@ -6066,8 +6009,8 @@ msgstr "বানান পরীক্ষা - কে-মেইল"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6101,9 +6044,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6323,102 +6265,86 @@ msgstr "শব্দ বাজাও"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6430,6 +6356,16 @@ msgstr "পপ-৩ ফিল্টার নিয়মাবলী"
 msgid "Filter Rules"
 msgstr "ফিল্টার নিয়মাবলী"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&আমদানি"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&আমদানি"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "যে যে ফিল্টার আপাতত আছে"
@@ -6510,6 +6446,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "এই ফিল্টারের জন্য আইকন:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "গ্রা&হক"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "উপরে"
@@ -6518,16 +6459,29 @@ msgstr "উপরে"
 msgid "Down"
 msgstr "নীচে"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "নাম পাল্টাও..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "নতুন"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "কপি পাঠা&ও"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "মুছে ফেলা"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6536,8 +6490,8 @@ msgstr "ফোল্ডার নির্বাচন করো"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6545,8 +6499,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"নিম্নোক্ত ফিল্টারগুলি সংরক্ষিত হয়নি কারণ এগুলি অবৈধ (উদাহরণস্বরূপ, হয়ত এগুলিতে "
-"কোন কাজ নির্ধারিত হয়নি, বা কোন সন্ধান নিয়মাবলী নেই)।"
+"নিম্নোক্ত ফিল্টারগুলি সংরক্ষিত হয়নি কারণ এগুলি অবৈধ (উদাহরণস্বরূপ, হয়ত এগুলিতে কোন "
+"কাজ নির্ধারিত হয়নি, বা কোন সন্ধান নিয়মাবলী নেই)।"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -6611,19 +6565,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6662,8 +6613,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6697,8 +6648,8 @@ msgstr "এই ফোল্ডারের সূচী নতুন করে �
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6825,10 +6776,8 @@ msgstr "সার্ভার-এ সাব-ফোল্ডার তৈরি �
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -6850,9 +6799,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -6861,14 +6809,14 @@ msgstr "থামিয়ে দেওয়া হয়েছে"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6881,11 +6829,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6894,15 +6842,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "সরিয়ে নিয়ে যাও:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "সরিও না"
 
@@ -6914,8 +6867,7 @@ msgstr "বার্তা ফোল্ডার-এ সরাও"
 msgid "Permissions (ACL)"
 msgstr "অনুমতি (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "সাধারণ"
@@ -6940,8 +6892,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "স্বনির্বাচিত আ&ইকন ব্যবহার করো"
@@ -6960,14 +6911,13 @@ msgstr ""
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -6980,9 +6930,9 @@ msgstr "উত্তর এই ফোল্ডার-এ রাখো"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -6993,17 +6943,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "কলা&ম দেখাও:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "ডিফল্ট নির্দিষ্ট করো"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "প্রেরক"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "গ্রাহক"
@@ -7014,11 +6968,11 @@ msgstr "প্রেরক &পরিচিতি:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7037,12 +6991,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7073,17 +7027,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7154,7 +7108,8 @@ msgstr "ফোল্ডার তথ্য পড়তে সমস্যা।"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7177,8 +7132,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7196,8 +7151,7 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: তথ্য ক্ষয় প্রতিরোধ করতে অস্বাভাবিক সমাপ্তি ঘটানো "
-"হচ্ছে।"
+"KMFolderMaildir::addMsg: তথ্য ক্ষয় প্রতিরোধ করতে অস্বাভাবিক সমাপ্তি ঘটানো হচ্ছে।"
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -7219,13 +7173,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7243,8 +7195,7 @@ msgstr ""
 #: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr ""
-"অভ্যন্তরীন ত্রুটি। অনুগ্রহ করে বিস্তারিত বিবরণ কপি করে নিয়ে একটি বাগ-রিপোর্ট "
-"পাঠান।"
+"অভ্যন্তরীন ত্রুটি। অনুগ্রহ করে বিস্তারিত বিবরণ কপি করে নিয়ে একটি বাগ-রিপোর্ট পাঠান।"
 
 #: kmfoldermbox.cpp:602
 #, c-format
@@ -7285,13 +7236,13 @@ msgstr ""
 "'%1' একটি ফোল্ডার বলে মনে হচ্ছে না।\n"
 "অনুগ্রহ করে ফাইলটি অন্য কোথাও সরিয়ে নিন।"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7299,8 +7250,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7308,7 +7259,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "ফোল্ডার তৈরি করতে ব্যর্থ"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7406,9 +7357,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7544,10 +7495,10 @@ msgstr "%1 ফোল্ডার-টি শুধু পড়া যায়।"
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7600,141 +7551,139 @@ msgstr ""
 "%1 পরিবর্তন করা যায়নি\n"
 "(ডিভাইস-এ স্থানাভাব?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "আউটবক্স"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "প্রেরিত-মেইল"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "আবর্জনা"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "খসড়া"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&বদলাও"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "শেষ সন্ধান"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 "কে-মেইল একটি মারাত্মক সমস্যার সম্মুখীন হয়েছে এবং এবার বিনা বাক্যব্যয়ে থেমে যাবে"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
 "The error was:\n"
 "%1"
 msgstr ""
-"কে-মেইল একটি মারাত্মক সমস্যার সম্মুখীন হয়েছে এবং এবার বিনা বাক্যব্যয়ে থেমে "
-"যাবে।\n"
+"কে-মেইল একটি মারাত্মক সমস্যার সম্মুখীন হয়েছে এবং এবার বিনা বাক্যব্যয়ে থেমে যাবে।\n"
 "যে সমস্যাটি ঘটেছে সেটি হল:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "আবর্জনা ফাঁকা করো"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
@@ -7810,8 +7759,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>নতুন মেইল এসেছে</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -7849,8 +7797,8 @@ msgstr "আপনি কি আবর্জনা ফোল্ডার ফা�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1173
@@ -7875,8 +7823,8 @@ msgstr "সন্ধান মুছে ফেলো"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7889,29 +7837,32 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "মুছে ফেলা"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -7924,9 +7875,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -7940,8 +7891,8 @@ msgstr "এইচ-টি-এম-এল ব্যবহার করো"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -7958,8 +7909,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -7975,7 +7926,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8311,8 +8263,7 @@ msgstr "অ্যাটা&চমেন্ট সংরক্ষণ করো...
 msgid "Appl&y All Filters"
 msgstr "সমস্ত ফিল্টার প্রয়ো&গ করো"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "ফিল্টা&র প্রয়োগ করো"
@@ -8425,7 +8376,6 @@ msgstr "পর&বর্তী অপঠিত বার্তা"
 msgid "Go to the next unread message"
 msgstr "পরবর্তী অপঠিত বার্তায় যাও"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "পূর্ববর্তী বার্তা (&আ)"
@@ -8562,25 +8512,25 @@ msgstr " চালু করা হচ্ছে..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8588,8 +8538,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8597,8 +8547,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8627,17 +8577,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "প্রাপ্তিস্বীকার: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "অ্যাটাচমেন্ট: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "অ্যাটা&চমেন্ট শুধুমাত্র চাওয়া হলে লোড করো"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8687,29 +8637,26 @@ msgstr "বার্তার অংশের বৈশিষ্ট্যাব�
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8718,11 +8665,10 @@ msgstr "&বর্ণনা:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8731,14 +8677,13 @@ msgstr "&এনকোডিং:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8747,13 +8692,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8762,9 +8705,8 @@ msgstr "এই অংশটি স্বাক্ষ&র করো"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8774,9 +8716,8 @@ msgstr "এই অংশটি &এনক্রিপ্ট করো"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8791,11 +8732,9 @@ msgstr "পপ ফিল্টার"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9046,15 +8985,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9063,18 +9001,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9084,15 +9021,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9132,7 +9067,8 @@ msgstr "অ্যাটাচমেন্ট দেখাও: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9156,12 +9092,14 @@ msgstr "অ্যাটাচমেন্ট খুলব?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9183,6 +9121,58 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "পঠিত"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "পুরনো"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "মুছে ফেলা"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "উত্তর দেওয়া"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "ফরোয়ার্ড করা"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "সারিভুক্ত"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "প্রেরিত"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "লক্ষ্য রাখা"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "অগ্রাহ্য করা"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "স্প্যাম"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "হ্যাম"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "করা বাকি"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "অ্যাটাচমেন্ট আছে"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9265,17 +9255,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9301,8 +9291,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9327,8 +9317,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9339,13 +9330,11 @@ msgstr "পাঠানো বাতিল।"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9364,8 +9353,9 @@ msgstr ""
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9399,30 +9389,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9434,6 +9424,10 @@ msgstr "%1 শুরু করো"
 msgid "Exit"
 msgstr "প্রস্থান করো"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "নতুন বার্তা আছে"
@@ -9460,8 +9454,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9520,8 +9515,7 @@ msgstr "এস-এম-টি-পি সার্ভার-এর ডোমেই
 #: kmtransport.cpp:406
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
-msgstr ""
-"এস-এম-টি-পি সার্ভার যে সংখ্যক পোর্ট ব্যবহার করে। সাধারণত এই সংখ্যাটি 25।"
+msgstr "এস-এম-টি-পি সার্ভার যে সংখ্যক পোর্ট ব্যবহার করে। সাধারণত এই সংখ্যাটি 25।"
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -9539,8 +9533,8 @@ msgstr "সার্ভার-এর &অথেন্টিকেশন প্�
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9561,10 +9555,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9594,8 +9587,8 @@ msgstr "শুধু স্থানীয় ফাইল অনুমোদিত
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9608,10 +9601,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9830,22 +9823,18 @@ msgstr "বার্তা সম্পা&দন করো"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9858,8 +9847,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9874,14 +9863,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -9976,8 +9965,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10009,8 +9998,9 @@ msgstr ""
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10020,8 +10010,8 @@ msgstr ""
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10041,70 +10031,68 @@ msgstr "সবকটি অংশ &এনক্রিপ্ট করো"
 msgid "Unencrypted Message Warning"
 msgstr ""
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "কিছু অক্ষর হারিয়ে যাবে"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "এনকোডিং পরিবর্তন করো"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10126,10 +10114,10 @@ msgstr "মেইল-বক্স ফর্ম্যা&ট:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10139,8 +10127,8 @@ msgstr ""
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10179,8 +10167,7 @@ msgstr "স্বাক্ষরের জন্য আলাদা ফলাফ
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "স্ট্যাটাস:"
 
@@ -10209,8 +10196,8 @@ msgstr "%1 প্লাগ-ইন পাওয়া যায়নি।"
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10247,27 +10234,27 @@ msgstr ""
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>বিজ্ঞপ্তি:</b> এটি একটি এইচ-টি-এম-এল বার্তা। নিরাপত্তাজনিত কারণে  শুধু মূল "
-"এইচ-টি-এম-এল কোড প্রদর্শিত হয়েছে। যদি আপনি এই বার্তার প্রেরককে  বিশ্বাস করেন, "
-"তাহলে <a href=\"kmail:showHTML\">এইখানে ক্লিক করে</a> "
-"আপনি এই  বার্তাটির জন্য এইচ-টি-এম-এল ফর্ম্যাটিং সক্রিয় করতে পারেন। "
+"<b>বিজ্ঞপ্তি:</b> এটি একটি এইচ-টি-এম-এল বার্তা। নিরাপত্তাজনিত কারণে  শুধু মূল এইচ-"
+"টি-এম-এল কোড প্রদর্শিত হয়েছে। যদি আপনি এই বার্তার প্রেরককে  বিশ্বাস করেন, তাহলে "
+"<a href=\"kmail:showHTML\">এইখানে ক্লিক করে</a> আপনি এই  বার্তাটির জন্য এইচ-টি-"
+"এম-এল ফর্ম্যাটিং সক্রিয় করতে পারেন। "
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>বিজ্ঞপ্তি:</b> এটি একটি এইচ-টি-এম-এল বার্তা। নিরাপত্তাজনিত কারণে  শুধু মূল "
-"এইচ-টি-এম-এল কোড প্রদর্শিত হয়েছে। যদি আপনি এই বার্তার প্রেরককে  বিশ্বাস করেন, "
-"তাহলে <a href=\"kmail:showHTML\">এইখানে ক্লিক করে</a> "
-"আপনি এই  বার্তাটির জন্য এইচ-টি-এম-এল ফর্ম্যাটিং সক্রিয় করতে পারেন। "
+"<b>বিজ্ঞপ্তি:</b> এটি একটি এইচ-টি-এম-এল বার্তা। নিরাপত্তাজনিত কারণে  শুধু মূল এইচ-"
+"টি-এম-এল কোড প্রদর্শিত হয়েছে। যদি আপনি এই বার্তার প্রেরককে  বিশ্বাস করেন, তাহলে "
+"<a href=\"kmail:showHTML\">এইখানে ক্লিক করে</a> আপনি এই  বার্তাটির জন্য এইচ-টি-"
+"এম-এল ফর্ম্যাটিং সক্রিয় করতে পারেন। "
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -10513,8 +10500,8 @@ msgstr "সঞ্চিত :"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10630,10 +10617,11 @@ msgstr "Kioslave সমস্যাসূচক বার্তা"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10650,15 +10638,15 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "%5@%6-র জন্য %2-টি বার্তার %1 নম্বর বার্তা আনা হচ্ছে (%4 কে.বি.-র মধ্যে %3) "
 "(সার্ভার-এ এখনো %7 কে.বি. বাকি)"
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
-msgstr ""
-"%5@%6-এর জন্য %2-টি বার্তার %1 নম্বর বার্তা আনা হচ্ছে (%4 কে.বি.-র মধ্যে %3)"
+msgstr "%5@%6-এর জন্য %2-টি বার্তার %1 নম্বর বার্তা আনা হচ্ছে (%4 কে.বি.-র মধ্যে %3)"
 
 #: popaccount.cpp:949
 msgid "Unable to complete LIST operation."
@@ -10670,1643 +10658,12 @@ msgstr "সার্ভার থেকে অবৈধ উত্তর"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "যা&ও"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "ফোল্ডা&র"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&রচনা"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&ফরোয়ার্ড"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "এইচ-টি-এম-এল টুলবার"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "স্বাক্ষর করা হচ্ছে"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "এনক্রিপ্ট করা হচ্ছে"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "বার্তা এনক্রিপ্ট করা অবস্থায় সংরক্ষণ করতে চাইলে সক্রিয় করুন"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "গ্রাহক: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "সাধারণ"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&উত্তর প্রাপক"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "&সবাইকে উত্তর দাও..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&ফরোয়ার্ড"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&বদলাও"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "ফোল্ডার বৈশিষ্ট্যাবলী"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "ফোল্ডার একটি মে&ইলিং-লিস্ট ধারণ করে"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "লিস্ট-&এর ঠিকানা:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "স্বাভাবি&ক:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "অপঠি&ত"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "দিন"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "সপ্তাহ"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "মাস"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "অগ্রসর"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "প্রেরক &পরিচিতি:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "যো&গ করো..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "গ্রু&পওয়্যার"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "ফন্ট সেটিংস পূর্বাবস্থায় ফেরাও"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "অসীম"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "স্বাক্ষর কনফিগারেশন"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "প্রে&রককে উত্তর পাঠাও:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "&সবাইকে উত্তর দাও..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "ফরওয়ার্ড করা বার্তা"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "স্বাক্ষ&র না করে বার্তা পাঠাবার চেষ্টা করলে সতর্ক করো"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "এনক্রিপশনবিহীন বার্তা পাঠানোর চেষ্টা করলে &সতর্ক করো"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " দিনের জন্য রেখে দাও"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "ফোল্ডা&র-এর বিষয়বস্তু:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&বদলাও"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&বদলাও"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "মেইল পরীক্ষা করলে সারিভুক্ত মেইল পাঠাও"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "সিস্টেম ট্রে আইকন প্রদর্শন করার নিয়মাবলী"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "বিস্তারিত নতুন মেইল বিজ্ঞপ্তি"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "সম্পা&দক বেছে নিন:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&রচনাক্ষেত্রের পরিবর্তে বহিঃস্থ সম্পাদক ব্যবহার করো"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "চটপট সন্ধান লাইন সম্পাদন প্রদর্শন করো"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "নিজে থেকে স্বাক্ষর যো&গ করো"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "এই কলাম-এর পর &নতুন লাইনে যাও:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "স্বয়ংক্রিয় সংরক্ষণ বিরতি:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "পরিচিত উপপদ বদলে \"&Fwd:\" বসাও"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "বুদ্ধি খাটিয়ে &উদ্ধৃতিচিহ্ন লাগাও"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, no-c-format
-msgid "Remove the signature when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "বার্তার সব হেডার দেখাও"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "কেতাদুরস্ত হেডার-এ স্প্যা&ম স্ট্যাটাস দেখাও"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "বার্তা তালিকা - নতুন বার্তা"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "উদ্ধৃতিচিহ্ন যো&গ করো"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12415,6 +10772,11 @@ msgstr ""
 msgid "Add as BCC"
 msgstr ""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "বাতি&ল"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12430,10 +10792,10 @@ msgstr ""
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12450,8 +10812,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12554,10 +10916,19 @@ msgstr "এর সমান অথবা বেশী"
 msgid " bytes"
 msgstr " বাইট"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " দিনের জন্য রেখে দাও"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12709,13 +11080,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -12733,8 +11102,7 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -12752,8 +11120,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -12761,8 +11128,7 @@ msgid "(No special capabilities available)"
 msgstr ""
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:358
@@ -12831,8 +11197,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12849,17 +11215,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "কমান্ড &উল্লেখ করুন:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "নতুন এন্ট্রি:"
@@ -12896,6 +11267,11 @@ msgstr "অ্যাকাউন্ট যোগ করো"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>আপনি কি সত্যিই <b>%1</b> নামক পরিচিতিটি সরিয়ে ফেলতে চান?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "এখানে প্রয়ো&গ করো:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -12910,6 +11286,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "স্ক্রিপ্ট সম্পাদন করো..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -12949,9 +11329,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -12988,6 +11368,16 @@ msgstr ""
 "ফাইল \"%1\" খোলা যাচ্ছে না:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "গ্রাহক: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13023,36 +11413,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13287,6 +11673,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13323,76 +11713,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "বাতিল করার মত কিছু নেই।"
@@ -13459,6 +11779,15 @@ msgstr "অ্যাটাচমেন্ট নং %1 (নামহীন)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "\"%1\" নামক একটি ফাইল আগে থেকেই আছে। আপনি কি সেটি মুছে লিখতে চান?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "ফাইল মুছে লিখব?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13472,8 +11801,8 @@ msgid ""
 "Yours sincerely,\n"
 "-- <enter your name and email address here>\n"
 msgstr ""
-"প্রথম পূর্বাহ্ণ -র অফিস পর্যন্ত জরুরি ঘটনা অনুগ্রহ করে পরিচিতিআমি %1 পর্যন্ত "
-"অফিসের বাইরে।\n"
+"প্রথম পূর্বাহ্ণ -র অফিস পর্যন্ত জরুরি ঘটনা অনুগ্রহ করে পরিচিতিআমি %1 পর্যন্ত অফিসের "
+"বাইরে।\n"
 "\n"
 "জরুরি দরকার থাকলে অনুগ্রহ করে <বিকল্প ব্যক্তির নাম>-এর সঙ্গে যোগাযোগ করুন।\n"
 "\n"
@@ -13568,9 +11897,9 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13599,9 +11928,9 @@ msgstr "ফাইল নির্বাচন করো..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13610,15 +11939,15 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13627,8 +11956,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13644,128 +11973,1509 @@ msgstr "কোন ছবি নেই"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "স্বাক্ষর করা হচ্ছে"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "বার্তার বিষয় নির্ধারণ করো"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "এনক্রিপ্ট করা হচ্ছে"
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "বার্তায় 'হেডার' যোগ করো "
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
 msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "বার্তা এনক্রিপ্ট করা অবস্থায় সংরক্ষণ করতে চাইলে সক্রিয় করুন"
+
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "শুধু নতুন মেইল-এর জন্য পরীক্ষা করো"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "শুধু রচনাক্ষেত্র উইণ্ডো খোলো"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "পঠিত"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "পুরনো"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "মুছে ফেলা"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "সাধারণ"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "উত্তর দেওয়া"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&উত্তর প্রাপক"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "ফরোয়ার্ড করা"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "&সবাইকে উত্তর দাও..."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "সারিভুক্ত"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&ফরোয়ার্ড"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "প্রেরিত"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "লক্ষ্য রাখা"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&বদলাও"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "অগ্রাহ্য করা"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "ফোল্ডা&র-এর বিষয়বস্তু:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "স্প্যাম"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&বদলাও"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "হ্যাম"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&বদলাও"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "করা বাকি"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "ফোল্ডার বৈশিষ্ট্যাবলী"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "অ্যাটাচমেন্ট আছে"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "ফোল্ডার একটি মে&ইলিং-লিস্ট ধারণ করে"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "লিস্ট-&এর ঠিকানা:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "স্বাভাবি&ক:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "অপঠি&ত"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
 msgstr ""
 
-#: util.h:208
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "দিন"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "সপ্তাহ"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "মাস"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "অগ্রসর"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "প্রেরক &পরিচিতি:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "মেইল পরীক্ষা করলে সারিভুক্ত মেইল পাঠাও"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "\"%1\" নামক একটি ফাইল আগে থেকেই আছে। আপনি কি সেটি মুছে লিখতে চান?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "ফাইল মুছে লিখব?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "সিস্টেম ট্রে আইকন প্রদর্শন করার নিয়মাবলী"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "বিস্তারিত নতুন মেইল বিজ্ঞপ্তি"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "সম্পা&দক বেছে নিন:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&রচনাক্ষেত্রের পরিবর্তে বহিঃস্থ সম্পাদক ব্যবহার করো"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "চটপট সন্ধান লাইন সম্পাদন প্রদর্শন করো"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "নিজে থেকে স্বাক্ষর যো&গ করো"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "এই কলাম-এর পর &নতুন লাইনে যাও:"
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "স্বয়ংক্রিয় সংরক্ষণ বিরতি:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "পরিচিত উপপদ বদলে \"&Fwd:\" বসাও"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "বুদ্ধি খাটিয়ে &উদ্ধৃতিচিহ্ন লাগাও"
+
+#: kmail.kcfg:470
+#, no-c-format
+msgid "Remove the signature when replying"
+msgstr ""
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "বার্তার সব হেডার দেখাও"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "কেতাদুরস্ত হেডার-এ স্প্যা&ম স্ট্যাটাস দেখাও"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "বার্তা তালিকা - নতুন বার্তা"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "উদ্ধৃতিচিহ্ন যো&গ করো"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "ফাই&ল সম্পাদন করো"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "সম্পাদনা..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "যা&ও"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "ফোল্ডা&র"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&রচনা"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&ফরোয়ার্ড"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "ফন্ট সেটিংস পূর্বাবস্থায় ফেরাও"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "এইচ-টি-এম-এল টুলবার"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "সাধারণ অপশন"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "এইচ-টি-এম-এল টুলবার"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr ""
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "যো&গ করো..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "গ্রু&পওয়্যার"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "ফন্ট সেটিংস পূর্বাবস্থায় ফেরাও"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "অসীম"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "স্বাক্ষর কনফিগারেশন"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "প্রে&রককে উত্তর পাঠাও:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "&সবাইকে উত্তর দাও..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "ফরওয়ার্ড করা বার্তা"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "স্বাক্ষ&র না করে বার্তা পাঠাবার চেষ্টা করলে সতর্ক করো"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "এনক্রিপশনবিহীন বার্তা পাঠানোর চেষ্টা করলে &সতর্ক করো"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr ""
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -13900,9 +13610,6 @@ msgstr "ফাইল মুছে লিখব?"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "&খসড়া ফোল্ডার-এ সংরক্ষণ করো"
 
-#~ msgid "Configure KMail"
-#~ msgstr "কে-মেইল কনফিগার করো"
-
 #, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "...দিয়ে খোলো"
diff --git a/tde-i18n-br/messages/tdepim/kmail.po b/tde-i18n-br/messages/tdepim/kmail.po
index 38790b1562e..f948b9bc468 100644
--- a/tde-i18n-br/messages/tdepim/kmail.po
+++ b/tde-i18n-br/messages/tdepim/kmail.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail-1.1\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2005-01-23 05:51+0100\n"
 "Last-Translator: Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <Suav.Icb@wanadoo.fr>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Thierry Vignaud, Jañ-Mai Drapier"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -168,6 +168,12 @@ msgstr ""
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "&Eilgeriañ da"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -247,9 +253,9 @@ msgstr "&Anv ereañ :"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -271,12 +277,12 @@ msgstr "Enro&llañ an tremenger POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -306,8 +312,9 @@ msgstr ""
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -358,13 +365,15 @@ msgstr "Goullonderiñ ar s&krid"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -408,9 +417,9 @@ msgstr "Erlec'hiañ :"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -471,9 +480,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -513,7 +522,7 @@ msgstr "<hini ebet>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Boest degemer"
 
@@ -521,28 +530,29 @@ msgstr "Boest degemer"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -551,23 +561,23 @@ msgstr "Spisait ur servijer hag ur porzh war ar vlavennig gentañ mar plij."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -575,8 +585,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -653,8 +663,8 @@ msgstr "Kont IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Ret eo deoc'h ouzhpennañ ur gont e rann rouedad ar gefluniadur a-benn resev "
 "posteloù."
@@ -693,9 +703,9 @@ msgstr "Degemer e KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -758,8 +768,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Titouroù diwar ar servijer"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ebet"
@@ -896,17 +905,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -941,10 +949,9 @@ msgstr "Fiñval ar c'hemennadoù kozh da :"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -955,8 +962,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -967,8 +974,8 @@ msgstr "Kaset an holl kemennadoù d'al lastez"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -978,8 +985,8 @@ msgstr "&Merkañ an holl"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1173,8 +1180,8 @@ msgstr "Fazi en ur lenn ar renkell %1 war ar servijer : "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1194,8 +1201,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1225,15 +1232,15 @@ msgstr "Dilamet"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1263,15 +1270,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Kargañ ar profil ..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Kefluniañ Kmail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Ouzhpennañ ..."
@@ -1301,6 +1312,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Lemel an anvelezh"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "L&emel"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ouzhpennañ ..."
@@ -1309,6 +1325,11 @@ msgstr "Ouzhpennañ ..."
 msgid "Modify..."
 msgstr "Kemmañ ..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "L&emel"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Lakaat dre ziouer"
@@ -1325,17 +1346,15 @@ msgstr "&Kas"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Kontoù kas : (termenit unan d'an nebeutañ) :"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Anv"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Seurt"
@@ -1357,8 +1376,7 @@ msgstr "Lakaat an hini dre ziouer"
 msgid "Common Options"
 msgstr "Dibaboù boutin"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Kadarnaat &goude kas"
@@ -1411,14 +1429,14 @@ msgstr "Domani dre &ziouer :"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1436,9 +1454,9 @@ msgstr "Ouzhpennañ un doug"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (dre ziouer)"
 
@@ -1520,6 +1538,10 @@ msgstr "Kemmañ ar gont"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>N'eo ket bet kavet ar gont <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Livioù"
@@ -1630,8 +1652,7 @@ msgstr "Liamm heuliet"
 msgid "Misspelled Words"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Kemennad nevez"
@@ -1836,8 +1857,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1846,40 +1867,33 @@ msgstr "Diskouez an deiziad"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1895,8 +1909,7 @@ msgstr ""
 msgid "Show s&pam status in fancy headers"
 msgstr "Diskouez an holl reollinoù ar c'hemennad"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1905,8 +1918,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1934,8 +1946,7 @@ msgstr "Emgefreek"
 msgid "&Override character encoding:"
 msgstr "Kemmañ ar c'hodadur"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Bevaat arlun barlenn ar reizhiad"
@@ -2040,13 +2051,12 @@ msgstr ""
 #: configuredialog.cpp:2930
 #, fuzzy
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "An erlec'harouezennoù a heul zo aotreet en troiennoù eilgeriañ :\n"
 "%D=deiziad, %S=dodenn, %F=kaser, %%=arouezenn dregant"
@@ -2072,21 +2082,20 @@ msgstr "Eilgeri&añ d'an holl :"
 msgid "&Forward:"
 msgstr "&War-raok :"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "D'ar %D, e skrivoc'h :"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "D'ar %D, %F a skrivas :"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Kemennad dazkaset"
 
@@ -2124,8 +2133,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2160,10 +2169,9 @@ msgstr "Gwerzh"
 msgid "Ne&w"
 msgstr "&Nevez"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Anv :"
@@ -2172,16 +2180,15 @@ msgstr "&Anv :"
 msgid "&Value:"
 msgstr "&Gwerzh :"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2208,13 +2215,13 @@ msgstr "staget"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2239,62 +2246,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2311,10 +2312,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2398,8 +2399,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "proksi ebet"
@@ -2429,8 +2429,8 @@ msgstr "Emaon o gwaskañ an teuliad : graet %d kemennad"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2456,8 +2456,8 @@ msgstr "Kemennad rineget"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "En ur vont e ur renkell :"
 
@@ -2529,16 +2529,14 @@ msgstr "Kenkelloù (furmad « maildir »)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2572,32 +2570,27 @@ msgstr "Go"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2665,8 +2658,8 @@ msgstr "&Kuzhat ar renkelloù strollant"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2676,8 +2669,8 @@ msgstr "Enrollañ postel nevez er gont :"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2732,19 +2725,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
@@ -2757,14 +2749,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2871,17 +2863,16 @@ msgstr "War-raok"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2899,15 +2890,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2975,8 +2966,8 @@ msgstr "&Ensoc'hañ ur restr"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3231,6 +3222,11 @@ msgstr "Dibabit ur renkell"
 msgid "Filters"
 msgstr "Sil %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Dibabit an &holl gemennadoù"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3264,8 +3260,8 @@ msgstr "Diluzit un teuliad"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3283,10 +3279,11 @@ msgstr "Reolennoù silañ"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3308,10 +3305,10 @@ msgstr "hep muzul"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3320,7 +3317,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Fazi KMail"
@@ -3362,9 +3359,9 @@ msgstr "Anvelezh PGP an arveriad :"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3417,8 +3414,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3429,8 +3426,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Fazi en ur kevreañ ouzh ar servijer %1"
@@ -3456,8 +3452,8 @@ msgstr "Ouzhpennañ aotroù"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3487,7 +3483,7 @@ msgstr "Arveriadur :"
 msgid "Select Folder"
 msgstr "Dibabit ur renkell"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Renkelloù lec'hel"
@@ -3512,9 +3508,9 @@ msgstr "Dibabit ur verradenn evit ar renkell"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3535,11 +3531,20 @@ msgstr "&Nullañ"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Dianav"
@@ -3659,72 +3664,18 @@ msgstr "Termeniñ ar &stad"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>K"
-"<br>e"
-"<br>m"
-"<br>e"
-"<br>n"
-"<br>n"
-"<br>a"
-"<br>d"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>K<br>e<br>m<br>e<br>n<br>n<br>a<br>d<br> <br>H<br>T<br>M<br>L</"
+"b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>K"
-"<br>e"
-"<br>m"
-"<br>e"
-"<br>n"
-"<br>n"
-"<br>a"
-"<br>d"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> e"
-"<br>b"
-"<br>e"
-"<br>t</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>K<br>e<br>m<br>e<br>n<br>n<br>a<br>d<br><br>H<br>T<br>M<br>L<br> "
+"e<br>b<br>e<br>t</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3736,12 +3687,9 @@ msgstr "&Ho anv :"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3750,11 +3698,9 @@ msgstr "Ao&zadur :"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3763,14 +3709,11 @@ msgstr "&Chomlec'h postel :"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3780,21 +3723,12 @@ msgstr "&Chomlec'h postel :"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3817,12 +3751,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3835,20 +3768,18 @@ msgstr "Hoc'h alc'hwez enrinegadur OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3867,11 +3798,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3884,18 +3814,17 @@ msgstr "Ho testeni enrinegadur S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3918,14 +3847,12 @@ msgstr "Chomlec'h &eilgeriañ :"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3934,15 +3861,12 @@ msgstr "Chomlec'hoù &BCC :"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3983,7 +3907,7 @@ msgstr "&Sinadur"
 msgid "&Picture"
 msgstr "&Skeudenn"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "N'eo ket mat ar chomlec'h postel"
 
@@ -4002,8 +3926,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4052,8 +3976,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (dre ziouer)"
 
@@ -4068,8 +3992,8 @@ msgstr "Chomlec'h postel"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Ret eo deoc'h reiñ un anv arveriad hag un tremenger evit moned ar "
-"boest-lizheroù-mañ."
+"Ret eo deoc'h reiñ un anv arveriad hag un tremenger evit moned ar boest-"
+"lizheroù-mañ."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4101,14 +4025,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4146,14 +4070,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Fazi : %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4312,14 +4241,14 @@ msgstr "Karned chomlec'hioù"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4347,136 +4276,110 @@ msgstr "Enrinegañ"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4491,136 +4394,110 @@ msgstr "Skoazeller an testeni"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4634,9 +4511,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4663,26 +4541,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4693,8 +4571,8 @@ msgstr "Ne signit ket gant OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4716,8 +4594,8 @@ msgstr "N'eo ket possubl sinañ"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4743,8 +4621,8 @@ msgstr ""
 #: keyresolver.cpp:1514
 #, fuzzy
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Ne m'eus ket gallet kavout an alc'hwezioù foran\n"
 "evit degemererien ar postel-mañ.\n"
@@ -4784,11 +4662,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4832,10 +4710,8 @@ msgstr ""
 "e %s"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Sac'het oc'h ouzhpennañ kemennad :\n"
+msgid "Failed to add message:\n"
+msgstr "Sac'het oc'h ouzhpennañ kemennad :\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -4881,8 +4757,8 @@ msgstr "Emaon o fiñval ar c'hemennad %3 diwar %2 eus %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Ne m'eus ket dilemelet ar postel eus ar voest-lizheroù <b>%1</b> :"
-"<br>%2</qt>"
+"<qt>Ne m'eus ket dilemelet ar postel eus ar voest-lizheroù <b>%1</b> :<br>"
+"%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -4924,6 +4800,53 @@ msgstr "&Digevreañ IMAP"
 msgid "&Maildir mailbox"
 msgstr "Boestoù-lizheroù &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Lakaat dodenn ar c'hemennad"
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr "Chomlec'h ouzhpennet er c'harned chomlec'hioù."
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "Chomlec'h ouzhpennet er c'harned chomlec'hioù."
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Ouzhpennañ 'reollin' d'ar c'hemennad"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Lenn korf ar c'hemennad eus 'restr'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Lakaat korf ar c'hemennad"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+
+#: kmail_options.h:21
+#, fuzzy
+msgid "Only check for new mail"
+msgstr "Emaon o wiriañ posteloù endeo !"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr ""
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Lizher"
@@ -4978,9 +4901,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5028,14 +4951,14 @@ msgstr "URL eilet er golver."
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
-"<qt>Bez' ez eus ar restr <b>%1</b> endeo."
-"<br>Ha fellout a ra deoc'h e erlec'hiañ ?</qt>"
+"<qt>Bez' ez eus ar restr <b>%1</b> endeo.<br>Ha fellout a ra deoc'h e "
+"erlec'hiañ ?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Enrollañ en ur restr"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Erlec'hiañ"
 
@@ -5053,7 +4976,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5073,123 +4996,123 @@ msgstr "N'eo ket ur c'hemennad ar restr."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Emaon o tistruj ar c'hemennadoù"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Emaon o fiñval ar c'hemennad %3 diwar %2 eus %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "N'eus ket a-walc'h a egor dieub war ar bladenn ?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Fiñval d'ar renkell-se"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Eilañ er renkell-mañ"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Emaon o fiñval ar c'hemennadoù"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Emaon o tistruj ar c'hemennadoù"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Emaon o tigeriñ an URL ..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ha fellout a ra deoc'h da seveniñ <b>%1</b> ?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Seveniñ"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr ""
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Enrollañ ar stagadennoù e"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "stagadenn.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "stagadenn.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "Ur restr a vez graet « %1 » dioutañ a zo c'hoazh. C'hoant ho peus e rasklañ ?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Ar restr a zo endeo"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Rasklañ"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Goulenn KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Mirit an enrinegadur"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ne mirit ket"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Mirit ar sinadur"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5198,86 +5121,86 @@ msgstr ""
 "Ne m'eus ket gallet skrivañ ar restr %1 :\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Ne m'eus ket gallet skrivañ ar restr %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Dibab alc'hwez an enrinegadur"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Lizher"
@@ -5377,7 +5300,7 @@ msgstr "Ment"
 msgid "Encoding"
 msgstr "Kodadur"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Moustrañ"
 
@@ -5389,7 +5312,7 @@ msgstr "Enrinegañ"
 msgid "Sign"
 msgstr "Sinañ"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Anv ar stagadenn :"
 
@@ -5411,7 +5334,8 @@ msgstr "Degemerer kentañ"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5421,9 +5345,9 @@ msgstr "Degemererien ouzhpenn"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5432,9 +5356,8 @@ msgstr "Degemererien kuzhet"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5445,7 +5368,7 @@ msgstr "&Kas ar posteloù"
 msgid "&Send Mail Via"
 msgstr "&Send ar postel dre"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Kas d&iwezhatoc'h"
@@ -5513,8 +5436,7 @@ msgstr "&Krochediñ arouezennoù dianav"
 msgid "Cl&ean Spaces"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Implijit an nodrezh in&gal"
@@ -5660,31 +5582,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr "Kemennad rineget"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Reoliek"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5780,7 +5702,8 @@ msgstr ""
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
-"Hag e fell deoc'h enrollañ ar c'hemennad evel m'emañ, pe nullañ ar c'hemennad ?"
+"Hag e fell deoc'h enrollañ ar c'hemennad evel m'emañ, pe nullañ ar "
+"c'hemennad ?"
 
 #: kmcomposewin.cpp:2262
 msgid "Close Composer"
@@ -5788,8 +5711,8 @@ msgstr "Serriñ an Aozer"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5798,46 +5721,47 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Gwelet stagadennoù :"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Kas evel m'emañ"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Stagañ ur restr"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Stagañ"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Ensoc'hañ ur restr"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Ensoc'hañ ur restr"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Degouezhet ez eus ar fazi en ur enporzhañ an alc'hwez eus ar goulev :</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Degouezhet ez eus ar fazi en ur enporzhañ an alc'hwez eus ar goulev :"
+"</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -5876,182 +5800,194 @@ msgid ""
 "View"
 msgstr "Sell"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Aozañ ..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Aozañ an uzhiaoueg ..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Enrollañ e ..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Perzhioù"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Ouzhpennañ ur stagadenn ..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Ne m'eus ket gallet skrivañ ar restr %1."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Mirout"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Ne m'eus ket gallet skrivañ ar restr %1."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Enrollañ ar stagadenn e"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Ouzhpennañ evel skrid"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Ouzhpennañ evel ur stagadenn"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Pegañ evel &stagadenn"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "anv ebet"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 #, fuzzy
 msgid "Undefined Encryption Key"
 msgstr "Enrinegañ"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Ret eo deoc'h termeniñ un degemerer"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "N'eus anv spisaet ebet"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "N'eus dodenn spisaet ebet"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "K&as evel m'emañ"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Spisait an dodenn"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Enrinegañ"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Kemennad rineget"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 #, fuzzy
 msgid "Please create an account for sending and try again."
 msgstr ""
@@ -6059,103 +5995,103 @@ msgstr ""
 "kas er c'hefluniadur ha\n"
 "klaskit adarre."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Emañ o vont da kas ur postel ..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Kas ar gadarnadur"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Kas bremañ"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "N'eus degemerer ebet"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Degemererien ouzhpenn"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Ostilh Gwiriekaat"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Ostilh Gwiriekaat"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Nullet eo gwiriekaat ar skritur."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Paouezet eo gwiriekaat ar skritur."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Echu eo gwiriekaat ar skritur."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Ostilh Gwiriekaat"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "N'eo ket bet kavet ur sinadur"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Dibab alc'hwez an enrinegadur"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Sinet eo bet ar c'hemennad gant %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Sinet eo bet ar c'hemennad gant %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Fazi postel Pop"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Kemennad gant dodenn : "
@@ -6203,8 +6139,8 @@ msgstr "Gwiriekaat ar skritur - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "N'hellan ket loc'hañ ISpell/Aspell. Bezit sur mar plij oc'h eus ISpell pe "
 "Aspell staliaet reizh war ho reizhiad hag en ho PATH."
@@ -6240,13 +6176,11 @@ msgstr "<qt>Re obererezhioù sil int e reolenn silañ <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Obererezh sil <b>%1</b> dianav"
-"<br>e reolenn silañ <b>%2</b>."
-"<br>Tremen a ran.</qt>"
+"<qt>Obererezh sil <b>%1</b> dianav<br>e reolenn silañ <b>%2</b>.<br>Tremen a "
+"ran.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6467,102 +6401,86 @@ msgstr "Seniñ son"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6574,6 +6492,16 @@ msgstr "Reolennoù silañ POP3"
 msgid "Filter Rules"
 msgstr "Reolennoù silañ"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Enporzh"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Enporzh"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Siloù da gaout"
@@ -6657,6 +6585,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "Arlun evit ar sil-se :"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Da"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Uhel"
@@ -6665,16 +6598,29 @@ msgstr "Uhel"
 msgid "Down"
 msgstr "Izel"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Adenvel ..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nevez"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Eilañ da"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Dilamet"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6683,8 +6629,8 @@ msgstr "Dibabit ur verradenn evit ar renkell"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6757,19 +6703,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6808,8 +6751,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6846,8 +6789,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6981,14 +6924,11 @@ msgstr "Emaon o krouiñ un is-renkell war ar servijer"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Lemelet e oa ar renkell <b>%1</b>. C'hoant ho peus da zilemel anezhañ eus ar "
-"servijer ?</p></qt>"
+"<qt><p>Lemelet e oa ar renkell <b>%1</b>. C'hoant ho peus da zilemel anezhañ "
+"eus ar servijer ?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7010,13 +6950,11 @@ msgstr "Emaon o tegas roll ar renkelloù"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Lemelet e oa ar renkell <b>%1</b>. C'hoant ho peus da zilemel anezhañ eus ar "
-"servijer ?</p></qt>"
+"<qt><p>Lemelet e oa ar renkell <b>%1</b>. C'hoant ho peus da zilemel anezhañ "
+"eus ar servijer ?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7024,14 +6962,14 @@ msgstr "Dilaoskelet"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7047,11 +6985,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7060,15 +6998,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Fiñval da :"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ne fiñvit ket"
 
@@ -7081,8 +7024,7 @@ msgstr "Fiñval ar c'hemennad er renkell"
 msgid "Permissions (ACL)"
 msgstr "Aotreoù (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Pennañ"
@@ -7107,8 +7049,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Implij &arlunoù diouzhoc'h"
@@ -7128,14 +7069,13 @@ msgstr "N'hellan ket ouzhpennañ ur c'hemennad en teuliad ezvoest"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7150,9 +7090,9 @@ msgstr "N'hellan ket ouzhpennañ ur c'hemennad en teuliad ezvoest"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7163,17 +7103,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Diskoue&z ar vann :"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Lakaat an hini dre ziouer"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Kaser"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Degemerer"
@@ -7185,11 +7129,11 @@ msgstr "Anvelezh"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7208,12 +7152,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7244,17 +7188,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7333,7 +7277,8 @@ msgstr ""
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7357,8 +7302,8 @@ msgstr "Fazi en ur zigeriñ %1; mankout a ra ar renkell-se."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7398,13 +7343,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7441,8 +7384,8 @@ msgstr "N'hellan ket ouzhpennañ ur c'hemennad d'ar renkell :"
 #: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr ""
-"N'hellan ket ouzhpennañ ur c'hemennad d'ar renkell (N'eus egor laosket war an "
-"drobarzhell ?)"
+"N'hellan ket ouzhpennañ ur c'hemennad d'ar renkell (N'eus egor laosket war "
+"an drobarzhell ?)"
 
 #: kmfoldermgr.cpp:68
 msgid "Are you sure you want to expire old messages?"
@@ -7462,13 +7405,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7476,8 +7419,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7485,7 +7428,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "N'hellan ket krouiñ ar renkell"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7585,9 +7528,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7718,10 +7661,10 @@ msgstr "%1 Lenn-hepken eo ar renkell."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7772,11 +7715,11 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
@@ -7784,129 +7727,128 @@ msgstr ""
 "kas er c'hefluniadur ha\n"
 "klaskit adarre."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 #, fuzzy
 msgid "Work Online"
 msgstr "pe"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 #, fuzzy
 msgid "Work Offline"
 msgstr "pe"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "N'hoc'h ket aotreet da lenn/skrivañ da renkell ho teuliad degemer."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Ezvoest"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "N'hoc'h ket aotreet da lenn/skrivañ da renkell ho teuliad ezvoest."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Kemennadoù kaset"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 #, fuzzy
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "N'hoc'h ket aotreet da lenn ar restr :\n"
 "%s"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Pod-lastez"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 #, fuzzy
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 "N'hoc'h ket aotreet da lenn ar restr :\n"
 "%s"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Broulhed"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 #, fuzzy
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 "N'hoc'h ket aotreet da lenn ar restr :\n"
 "%s"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "patromoù"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 "N'hoc'h ket aotreet da lenn ar restr :\n"
 "%s"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Klask diwezhañ"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7914,11 +7856,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Pod-lastez goullo"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Ha sur oc'h bezañ mennet da zilemel renkell pod-lastez an holl zarempreda ?"
@@ -7994,8 +7936,7 @@ msgstr "%n kemennad nevez e %1"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Deuet eo ur postel nevez</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8033,11 +7974,11 @@ msgstr "Ha sur oc'h bezañ mennet da zilemel renkell ar pod-lastez ?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Ha sur oc'h e fell deoc'h fiñval an holl gemennadoù eus ar renkell <b>%1<b> "
-"d'ar pod-lastez ?</qt>"
+"<qt>Ha sur oc'h e fell deoc'h fiñval an holl gemennadoù eus ar renkell <b>"
+"%1<b> d'ar pod-lastez ?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8062,8 +8003,8 @@ msgstr "Dilemel ar glask"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "Ha sur oc'h e fell deoc'h lemel an teuliad\n"
 "\"%s\", o tiverkañ e endal'had ?"
@@ -8075,17 +8016,16 @@ msgstr "Distruj ar renkell"
 #: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Ha sur oc'h bezañ mennet da zilemel ar renkell goullo <strong>%1</strong>"
-" ?</qt>"
+"<qt>Ha sur oc'h bezañ mennet da zilemel ar renkell goullo <strong>%1</"
+"strong> ?</qt>"
 
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "Ha sur oc'h e fell deoc'h lemel an teuliad\n"
 "\"%s\", o tiverkañ e endal'had ?"
@@ -8093,24 +8033,28 @@ msgstr ""
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ha sur oc'h e fell deoc'h lemel an teuliad <b>%1</b>"
-", o tiverkañ e endal'had ?"
+"<qt>Ha sur oc'h e fell deoc'h lemel an teuliad <b>%1</b>, o tiverkañ e "
+"endal'had ?"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ha sur oc'h e fell deoc'h lemel an teuliad <b>%1</b> "
-"(gant he is-renkelloù), o tiverkañ e endal'had ?"
+"<qt>Ha sur oc'h e fell deoc'h lemel an teuliad <b>%1</b> (gant he is-"
+"renkelloù), o tiverkañ e endal'had ?"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Dilamet"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8124,9 +8068,9 @@ msgstr "Ha sur oc'h e fell deoc'h marvaat pep kemennad kozh ?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8141,8 +8085,8 @@ msgstr "Implijit HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8160,8 +8104,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8177,7 +8121,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8520,8 +8465,7 @@ msgstr "Enroll&añ ar stagadennoù ..."
 msgid "Appl&y All Filters"
 msgstr "Arlo&añ an holl siloù"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&rloañ ar sil"
@@ -8636,7 +8580,6 @@ msgstr "Kemennad &anlennet a-heul"
 msgid "Go to the next unread message"
 msgstr "Mont d'ar c'hemennad anlennet a-heul"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Kemennad kent"
@@ -8774,25 +8717,25 @@ msgstr " Emaon o teraouiñ ..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8800,8 +8743,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8809,8 +8752,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8841,16 +8784,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Resevet : "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Stagadenn : %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr ""
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8902,29 +8845,26 @@ msgstr "Perzhioù lodennoù ar c'hemennad"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8933,11 +8873,10 @@ msgstr "&Deskrivadur :"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8946,14 +8885,13 @@ msgstr "&Kodadur :"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8962,13 +8900,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8977,9 +8913,8 @@ msgstr "&Sinañ ar perzh-mañ"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8989,9 +8924,8 @@ msgstr "Enrineg&añ an barzh-mañ"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -9006,11 +8940,9 @@ msgstr "Sil POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9270,35 +9202,34 @@ msgstr "Ar c'hliant postel evit an endro burev K."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9306,15 +9237,13 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Degemer e KMail %1</h2>"
-"<p>Kliant postel an endro burev TDE eo KMail. Il est conçu pour respecter les "
-"standards de messagerie d'Internet, comme « MIME », « SMTP », « POP3 » et "
-"« IMAP ».</p>\n"
-"<ul>"
-"<li>Bez eo kalz arc'hweloù gant KMail; Gwelit he <a href=\"%2\">teuliadur</a>"
-"</li>\n"
-"<li><a href=\"%3\">Lec'hienn KMail</a> a ziskouez titouroù diwar-benn stummoù "
-"nevez KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Degemer e KMail %1</h2><p>Kliant postel an "
+"endro burev TDE eo KMail. Il est conçu pour respecter les standards de "
+"messagerie d'Internet, comme « MIME », « SMTP », « POP3 » et « IMAP ».</p>\n"
+"<ul><li>Bez eo kalz arc'hweloù gant KMail; Gwelit he <a href="
+"\"%2\">teuliadur</a></li>\n"
+"<li><a href=\"%3\">Lec'hienn KMail</a> a ziskouez titouroù diwar-benn "
+"stummoù nevez KMail</li></ul>\n"
 "%8\n"
 "<p>Setu arc'hweloù nevez KMail (disheñvel ar stumm %4 pourchaset gant TDE "
 "%5) :</p>\n"
@@ -9326,15 +9255,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Skipailh KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9374,7 +9301,8 @@ msgstr "Gwelet stagadennoù : %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9398,12 +9326,14 @@ msgstr "Digeriñ ar stagadenn"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9425,6 +9355,58 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lenn"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Kozh"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Dilamet"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Eilgeriet"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Dazkaset"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "El lost"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Kaset"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Gwellet"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Divrud"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spamek"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Postel reoliek"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Traoù d'ober"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Gant stagadenn(où)"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9508,17 +9490,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9542,8 +9524,8 @@ msgstr "Emaon o teraouiñ an argerzh kaser ..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9569,8 +9551,9 @@ msgstr "Falladur o kas (lod ar) kemennadoù el lost."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9581,13 +9564,11 @@ msgstr "Nulaet eo ar gas."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9608,8 +9589,9 @@ msgstr "Hentenn kas"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9643,35 +9625,35 @@ msgstr ""
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Ret eo deoc'h reiñ un anv arveriad hag un tremenger evit implij ar "
-"servijer-SMTP-mañ."
+"Ret eo deoc'h reiñ un anv arveriad hag un tremenger evit implij ar servijer-"
+"SMTP-mañ."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9683,6 +9665,10 @@ msgstr "Loc'hañ %1"
 msgid "Exit"
 msgstr "Er-maez"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Kemennadoù nevez e"
@@ -9707,8 +9693,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9785,8 +9772,8 @@ msgstr ""
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9807,10 +9794,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9840,8 +9826,8 @@ msgstr ""
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9857,10 +9843,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10095,22 +10081,18 @@ msgstr "&Aozañ ar c'hemennad"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10121,8 +10103,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10137,14 +10119,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10243,8 +10225,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10280,8 +10262,9 @@ msgstr "Kemennad rineget"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10292,8 +10275,8 @@ msgstr "Kas ar re el lost"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10314,72 +10297,70 @@ msgstr "&Enrinegañ pep perzh"
 msgid "Unencrypted Message Warning"
 msgstr "Kemennad rineget"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "&Krochediñ arouezennoù dianav"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Lose Characters"
 msgstr "&Krochediñ arouezennoù dianav"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Kemmañ ar c'hodadur"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10401,10 +10382,10 @@ msgstr "&Furmad ar voest-lizheroù :"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10415,8 +10396,8 @@ msgstr "Teuliadoù"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10458,8 +10439,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stad : "
 
@@ -10490,8 +10470,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10529,18 +10509,18 @@ msgstr "N'hellan ket ezrinegañ ar gemennad :"
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10789,8 +10769,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10910,10 +10890,11 @@ msgstr "Kemennad fazi Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10930,7 +10911,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Emaon o tegas ar c'hemennad %1 diwar %2 (%3 Ko diwar %4) evit %5@%6 (%7 ko o "
 "chom war ar servijer)."
@@ -10950,1643 +10932,12 @@ msgstr "N'eo ket mat respont ar servijer"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Mont"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Teuliad"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Kemennad"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&War-raok"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barrenn an ostilhoù HTLM"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Emaon o sinañ"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Enrinegañ"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Fazi postel Pop"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Fazi postel Pop"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Da : "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC : "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Hollvedel"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Eilgeriañ"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Eilgeriañ d'an ho&ll re ..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "War-raok"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "B&erradenn :"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Erlec'hiañ"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Dibarzhoù ar renkell"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, fuzzy, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Ereet gant"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Roll ar &chomlec'hoù :"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "B&oas :"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Anl&ennet :"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "&Kemennad"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "K&abac'hat goude :"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "Kemennad dazkaset"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Kabac'hat goud&e :"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "Kemennad dazkaset"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Deiz(ioù)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Sizhun(ioù)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Miz(ioù)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Barek"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "Anvelezh"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "Karned chomlec'hioù"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Kefluniadur"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Restr sinadur :"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Implijit proksi HTTP ar reiziad :"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Ouzhpennañ ..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "Strolladoù : "
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "adkorañ kefluniadur an nodrezhoù"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "hep muzul"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "KefluniadurSMime"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Eilgeriañ d'ar c'ha&ser :"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Eilgeriañ d'an ho&ll re ..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Kemennad dazkaset"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, fuzzy, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Kemennad rineget"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, fuzzy, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Kemennad rineget"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Kemennadoù peurgaset."
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Evit sinañ"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Enrinegañ"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " deiz"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Dibabit niver a deiz bremañ"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Diluzit un teuliad"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Endal'had ar &renkell :"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Erlec'hiañ"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Erlec'hiañ"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politikerez diskouez arlun barlenn ar reizhiad"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Kemennadenn KMail"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Spisait an ao&zer :"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, fuzzy, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Norezh roll kemennadoù"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "O&uzhpennañ ar sinadur ent emgefreek"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Plega&ñ emgefreek e bann :"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Kemennadoù peurgaset."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, fuzzy, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Kemennadenn KMail"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "Gwiriekaat ar postel ..."
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Kabac'het eo ar sinadur."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, fuzzy, no-c-format
-msgid "Type of addressee selector"
-msgstr "Troc'hañ an diuzadenn"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, fuzzy, no-c-format
-msgid "Type of recipients editor"
-msgstr "Troc'hañ an diuzadenn"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Troc'hañ an diuzadenn"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Fazi postel Pop"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Diskouez an holl reollinoù ar c'hemennad"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Kemennadenn KMail"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Roll ar c'hemennadoù - Kemennadoù nevez"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "&Krochediñ arouezennoù dianav"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12693,6 +11044,11 @@ msgstr "Ouzhpennañ evel CC"
 msgid "Add as BCC"
 msgstr "Ouzhpennañ evel BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Nullañ"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12708,10 +11064,10 @@ msgstr "Degemererien dibabet"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12729,8 +11085,8 @@ msgstr "Troc'hañ an diuzadenn"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12841,10 +11197,19 @@ msgstr ""
 msgid " bytes"
 msgstr " okted"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " deiz"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12987,15 +11352,12 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 #, fuzzy
@@ -13013,8 +11375,7 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13034,8 +11395,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13044,8 +11404,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Siloù da gaout"
 
 #: sievedebugdialog.cpp:358
@@ -13119,8 +11478,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13137,17 +11496,22 @@ msgstr "Digeriñ a ra ar restre spisaet en ur aozer skrid."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "S&pisait an urzhiad :"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Hent"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Bouetadur nevez :"
@@ -13183,6 +11547,11 @@ msgstr "Ouzhpennañ ur gont"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Arloañ ouzh :"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13197,6 +11566,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Aozañ an uzhiaoueg ..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13239,9 +11612,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13280,6 +11653,16 @@ msgstr ""
 "N'hellan ket digeriñ ar restr « %1 »:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Da : "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC : "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13311,36 +11694,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13350,8 +11729,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -13367,8 +11745,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -13410,8 +11787,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 msgid "&Insert Command..."
@@ -13577,6 +11953,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -13613,76 +11993,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13750,6 +12060,17 @@ msgstr "Stagadenn #%1 (dianav)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Bez' ez eus un restr gant an anv « %1 » endeo. Ha fellout a ra deoc'h e "
+"rasklañ ?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Rasklañ ar restr ?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13852,9 +12173,9 @@ msgstr "&Kas ur skeudenn gant pep kemennad"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13885,9 +12206,9 @@ msgstr "Dibabit ur restr ..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13896,15 +12217,15 @@ msgstr "Lakaat digant ar c'harned chomlec'hioù"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13913,8 +12234,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13930,133 +12251,1509 @@ msgstr "Skeudenn ebet"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Emaon o sinañ"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Enrinegañ"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Lakaat dodenn ar c'hemennad"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr "Chomlec'h ouzhpennet er c'harned chomlec'hioù."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr "Chomlec'h ouzhpennet er c'harned chomlec'hioù."
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Ouzhpennañ 'reollin' d'ar c'hemennad"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Fazi postel Pop"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Lenn korf ar c'hemennad eus 'restr'"
+#: composercryptoconfiguration.ui:87
+#, fuzzy, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Fazi postel Pop"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Lakaat korf ar c'hemennad"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
 msgstr ""
 
-#: kmail_options.h:21
-#, fuzzy
-msgid "Only check for new mail"
-msgstr "Emaon o wiriañ posteloù endeo !"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
+
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lenn"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Hollvedel"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Kozh"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Eilgeriañ"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Dilamet"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Eilgeriañ d'an ho&ll re ..."
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Eilgeriet"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "War-raok"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Dazkaset"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "B&erradenn :"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "El lost"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Erlec'hiañ"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Kaset"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Endal'had ar &renkell :"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Gwellet"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Erlec'hiañ"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Divrud"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Erlec'hiañ"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spamek"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Dibarzhoù ar renkell"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Postel reoliek"
+#: folderpropertiesdialog.ui:63
+#, fuzzy, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Ereet gant"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Traoù d'ober"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Roll ar &chomlec'hoù :"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Gant stagadenn(où)"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "B&oas :"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Anl&ennet :"
+
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "&Kemennad"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "K&abac'hat goude :"
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "Kemennad dazkaset"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Kabac'hat goud&e :"
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "Kemennad dazkaset"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Deiz(ioù)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Sizhun(ioù)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Miz(ioù)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Barek"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "Anvelezh"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Hent"
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "Karned chomlec'hioù"
 
-#: util.h:208
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Bez' ez eus un restr gant an anv « %1 » endeo. Ha fellout a ra deoc'h e "
-"rasklañ ?"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Rasklañ ar restr ?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politikerez diskouez arlun barlenn ar reizhiad"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Kemennadenn KMail"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Spisait an ao&zer :"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, fuzzy, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Norezh roll kemennadoù"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Sinañ kemennadoù ent emgefreek gant PGP"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "O&uzhpennañ ar sinadur ent emgefreek"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Plega&ñ emgefreek e bann :"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Kemennadoù peurgaset."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, fuzzy, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Kemennadenn KMail"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "Gwiriekaat ar postel ..."
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Kabac'het eo ar sinadur."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, fuzzy, no-c-format
+msgid "Type of addressee selector"
+msgstr "Troc'hañ an diuzadenn"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, fuzzy, no-c-format
+msgid "Type of recipients editor"
+msgstr "Troc'hañ an diuzadenn"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Troc'hañ an diuzadenn"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Fazi postel Pop"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Diskouez an holl reollinoù ar c'hemennad"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Kemennadenn KMail"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Roll ar c'hemennadoù - Kemennadoù nevez"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "&Krochediñ arouezennoù dianav"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Aozañ ar &restr"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Aozañ ..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, fuzzy, no-c-format
+msgid "&View"
+msgstr "Gwelet..."
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Mont"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Teuliad"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Kemennad"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&War-raok"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "adkorañ kefluniadur an nodrezhoù"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barrenn an ostilhoù HTLM"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Dibaboù boutin"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barrenn an ostilhoù HTLM"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Kefluniadur"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Restr sinadur :"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Diluzit un teuliad"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Diluzit un teuliad"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Diluzit un teuliad"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Implijit proksi HTTP ar reiziad :"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Diluzit un teuliad"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Diluzit un teuliad"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Ouzhpennañ ..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "Strolladoù : "
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "adkorañ kefluniadur an nodrezhoù"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "hep muzul"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "KefluniadurSMime"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Eilgeriañ d'ar c'ha&ser :"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Eilgeriañ d'an ho&ll re ..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Kemennad dazkaset"
+
+#: warningconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Kemennad rineget"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, fuzzy, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Kemennad rineget"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Kemennadoù peurgaset."
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Evit sinañ"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Enrinegañ"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Dibabit niver a deiz bremañ"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Diluzit un teuliad"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Diluzit un teuliad"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Diluzit un teuliad"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #~ msgid ""
 #~ "_: recipient address field\n"
@@ -14230,9 +13927,6 @@ msgstr "Rasklañ ar restr ?"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "Enrollañ e renkell ar &broulhed"
 
-#~ msgid "Configure KMail"
-#~ msgstr "Kefluniañ Kmail"
-
 #~ msgid "Open with..."
 #~ msgstr "Digeriñ gant ..."
 
@@ -14352,8 +14046,10 @@ msgstr "Rasklañ ar restr ?"
 
 #, fuzzy
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr "Treuzkas peurc'hraet ..."
 
 #, fuzzy
@@ -14374,8 +14070,10 @@ msgstr "Rasklañ ar restr ?"
 
 #, fuzzy
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr "Treuzkas peurc'hraet ..."
 
 #, fuzzy
@@ -14499,8 +14197,11 @@ msgstr "Rasklañ ar restr ?"
 #~ msgstr "Ensoc'hañ ur restr"
 
 #~ msgid ""
-#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/Mail for its messages.\n"
-#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but this will replace existing files with the same name in the directory ~/Mail (e.g. inbox).\n"
+#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/"
+#~ "Mail for its messages.\n"
+#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but "
+#~ "this will replace existing files with the same name in the directory ~/"
+#~ "Mail (e.g. inbox).\n"
 #~ "Should KMail move the mail folders now?"
 #~ msgstr ""
 #~ "Bez' ez eus ar renkell ~/KMail endeo. Adalek bremañ KMail a\n"
@@ -14911,9 +14612,6 @@ msgstr "Rasklañ ar restr ?"
 #~ msgid "Unable to obtain the selected public key."
 #~ msgstr "Ne m'eus ket gallet kavout an alc'hwezioù foran evit\n"
 
-#~ msgid "View..."
-#~ msgstr "Gwelet..."
-
 #, fuzzy
 #~ msgid "Choose Signature Command"
 #~ msgstr "Dibab restr ar sinadur"
@@ -15332,7 +15030,9 @@ msgstr "Rasklañ ar restr ?"
 #~ msgstr "Kefluniadur"
 
 #, fuzzy
-#~ msgid "You need to add an account in the networksection of the settings in order to receive mail."
+#~ msgid ""
+#~ "You need to add an account in the networksection of the settings in order "
+#~ "to receive mail."
 #~ msgstr ""
 #~ "Ret eo deoc'h ouzhpennañ ur gont e\n"
 #~ "rann rouedad ar gefluniadur a-benn\n"
@@ -15833,7 +15533,8 @@ msgstr "Rasklañ ar restr ?"
 #~ msgstr "<netra>"
 
 #, fuzzy
-#~ msgid "Sorry, only messages in the outbox folder and drafts folder can be edited."
+#~ msgid ""
+#~ "Sorry, only messages in the outbox folder and drafts folder can be edited."
 #~ msgstr "N'heller aozañ nemet kemennadoù en teuliad ezvoest"
 
 #~ msgid "&Move..."
diff --git a/tde-i18n-bs/messages/tdepim/kmail.po b/tde-i18n-bs/messages/tdepim/kmail.po
index fbdc57df7cf..128aae42ded 100644
--- a/tde-i18n-bs/messages/tdepim/kmail.po
+++ b/tde-i18n-bs/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-12-12 16:40-0800\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@linux.org.ba>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Vedran Ljubović"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -174,6 +174,12 @@ msgstr "&Ništa (koristiti pažljivo)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Račun za poluautomatsko rukovanje resursima"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Očisti prošli"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -252,13 +258,13 @@ msgstr "&Login:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Vaš Internet provajder (ISP) vam je dao <em>korisničko ime</em> "
-"koje se koristi kako biste se identificirali njihovim serverima. Ono je obično "
-"prvi dio vaše email aderse (dio prije <em>@</em>)."
+"Vaš Internet provajder (ISP) vam je dao <em>korisničko ime</em> koje se "
+"koristi kako biste se identificirali njihovim serverima. Ono je obično prvi "
+"dio vaše email aderse (dio prije <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -281,17 +287,17 @@ msgstr "Sp&remi POP šifru u datoteku sa postavkama"
 #, fuzzy
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Uključite ovu opciju ako želite da KMail čuva SMTP šifru u svojoj "
-"konfiguracijskoj datoteci. Šifra se čuva u nečitljivom obliku, ali je ne treba "
-"smatrati sigurnom od pokušaja dešifrovanja u slučaju da neko dobije pristup "
-"konfiguracijskoj datoteci."
+"konfiguracijskoj datoteci. Šifra se čuva u nečitljivom obliku, ali je ne "
+"treba smatrati sigurnom od pokušaja dešifrovanja u slučaju da neko dobije "
+"pristup konfiguracijskoj datoteci."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -321,12 +327,13 @@ msgstr "&Filtriraj poruke ako su veće od"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ako izaberete ovu opciju, POP filteri će biti korišteni kako bi se odlučilo šta "
-"raditi sa porukama. Možete ih zatim izabrati za download, obrisati ih ili "
-"sačuvati ih na serveru."
+"Ako izaberete ovu opciju, POP filteri će biti korišteni kako bi se odlučilo "
+"šta raditi sa porukama. Možete ih zatim izabrati za download, obrisati ih "
+"ili sačuvati ih na serveru."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -376,13 +383,15 @@ msgstr "Običan &tekst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -427,9 +436,9 @@ msgstr "Zamijeni:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -491,9 +500,9 @@ msgstr "Ne prikazuj &priloge u pregledu poruke"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Uključite ovu opciju ako želite da se prilozi ne otvaraju automatski kada "
 "kliknete na poruku nego samo kada kliknete na prilog. Na ovaj način velike "
@@ -508,8 +517,9 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Poddirektoriji će biti traženi samo u direktorijima koji su otvoreni (rašireni) "
-"u stablu direktorija. Koristite ovo ako se na serveru nalazi mnogo direktorija."
+"Poddirektoriji će biti traženi samo u direktorijima koji su otvoreni "
+"(rašireni) u stablu direktorija. Koristite ovo ako se na serveru nalazi "
+"mnogo direktorija."
 
 #: accountdialog.cpp:1044
 #, fuzzy
@@ -538,7 +548,7 @@ msgstr "<nijedan>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "inbox"
 
@@ -546,46 +556,47 @@ msgstr "inbox"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Izgleda da server ne podržava jedinstvene brojeve poruka, što je potrebno za "
 "ostavljanje poruka na serveru.\n"
-"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam je "
-"mogućnost da svejedno uključite ostavljanje poruka na serveru."
+"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam "
+"je mogućnost da svejedno uključite ostavljanje poruka na serveru."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Izgleda da server ne podržava dobavljanje zaglavlja poruke, što je potrebno za "
-"ostavljanje poruka na serveru.\n"
-"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam je "
-"mogućnost da svejedno uključite ostavljanje poruka na serveru."
+"Izgleda da server ne podržava dobavljanje zaglavlja poruke, što je potrebno "
+"za ostavljanje poruka na serveru.\n"
+"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam "
+"je mogućnost da svejedno uključite ostavljanje poruka na serveru."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Molim obratite pažnju da korištenjem ove mogućnosti možete izazvati prijem "
 "neispravnih poruka kod nekih POP3 servera koji ne podržavaju pipelining.\n"
-"Neki serveri podržavaju pipelining, ali ne daju obavjest o svojim mogućnostima. "
-"Stoga je ova opcija izmjenjiva. Da biste provjerili da li vaš POP3 server "
-"prijavljuje podršku za pipelining, upotrijebite dugme \"Provjeri šta server "
-"podržava\" na dnu ovog dijaloga.\n"
-"Ako vaš server ne prijavljuje ovu podršku, a htjeli biste veću brzinu, trebali "
-"biste najprije napraviti test: pošaljite sebi nekoliko poruka odjednom i zatim "
-"ih skinite i provjerite njihovu ispravnost."
+"Neki serveri podržavaju pipelining, ali ne daju obavjest o svojim "
+"mogućnostima. Stoga je ova opcija izmjenjiva. Da biste provjerili da li vaš "
+"POP3 server prijavljuje podršku za pipelining, upotrijebite dugme \"Provjeri "
+"šta server podržava\" na dnu ovog dijaloga.\n"
+"Ako vaš server ne prijavljuje ovu podršku, a htjeli biste veću brzinu, "
+"trebali biste najprije napraviti test: pošaljite sebi nekoliko poruka "
+"odjednom i zatim ih skinite i provjerite njihovu ispravnost."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -593,48 +604,48 @@ msgstr "Molim najprije navedite server i port u kartici Općenito."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Izgleda da server ne podržava pipelining; stoga je ova opcija isključena.\n"
-"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam je "
-"mogućnost da svejedno uključite pipelining. Ali zapamtite da ova mogućnost može "
-"izazvati da pojedini POP serveri koji ne podržavaju pipelining pošalju "
-"korumpirane poruke. Stoga prije korištenja ove mogućnosti, trebali biste "
-"najprije napraviti test: pošaljite sebi nekoliko poruka odjednom i zatim ih "
-"skinite i provjerite njihovu ispravnost."
+"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam "
+"je mogućnost da svejedno uključite pipelining. Ali zapamtite da ova "
+"mogućnost može izazvati da pojedini POP serveri koji ne podržavaju "
+"pipelining pošalju korumpirane poruke. Stoga prije korištenja ove "
+"mogućnosti, trebali biste najprije napraviti test: pošaljite sebi nekoliko "
+"poruka odjednom i zatim ih skinite i provjerite njihovu ispravnost."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Izgleda da server ne podržava jedinstvene brojeve poruka, što je potrebno za "
 "ostavljanje poruka na serveru; stoga je ova opcija isključena.\n"
-"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam je "
-"mogućnost da svejedno uključite ostavljanje poruka na serveru."
+"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam "
+"je mogućnost da svejedno uključite ostavljanje poruka na serveru."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Izgleda da server ne podržava dobavljanje zaglavlja poruke, što je potrebno za "
-"ostavljanje poruka na serveru; stoga je ova opcija isključena.\n"
-"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam je "
-"mogućnost da svejedno uključite ostavljanje poruka na serveru."
+"Izgleda da server ne podržava dobavljanje zaglavlja poruke, što je potrebno "
+"za ostavljanje poruka na serveru; stoga je ova opcija isključena.\n"
+"Pošto neki serveri ne objavljuju ispravno svoje mogućnosti, ostavljena vam "
+"je mogućnost da svejedno uključite ostavljanje poruka na serveru."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -717,8 +728,8 @@ msgstr "Dodaj korisnički račun"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Trebate dodati korisnički račun u postavkama, odjeljak Mreža, da bi mogli "
 "primati poštu."
@@ -764,9 +775,9 @@ msgstr "Provjera pravopisa - KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -838,8 +849,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Operacije servera"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "&Ništa"
@@ -976,28 +986,27 @@ msgstr ""
 #: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Ovdje možete potražiti pomoć za podešavanje KMail pravila filtriranja tako "
-"da se koriste neki poznati anti-virus alati.</p> "
-"<p>Čarobnjak može otkriti ove alate na vašem računaru kao i napraviti pravila "
-"filtriranja koja klasificiraju poruke koristeći ove alate i odvajaju poruke "
-"koje su klasificirane kao virusi. Čarobnjak neće uzimati u obzir postojeća "
-"pravila filtriranja: samo će dodavati nova pravila.</p> "
-"<p><b>Pažnja:</b> Pošto je KMail blokiran tokom otkrivanja virus poruka, možda "
-"ćete imati problema u smislu zaglavljivanja KMaila pošto anti-virus alati rade "
-"prilično sporo. Možete uvijek obrisati pravila filtriranja koja je napravio "
-"čarobnjak kako biste se vratili na prijašnje ponašanje."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Ovdje možete potražiti pomoć za podešavanje KMail pravila filtriranja "
+"tako da se koriste neki poznati anti-virus alati.</p> <p>Čarobnjak može "
+"otkriti ove alate na vašem računaru kao i napraviti pravila filtriranja koja "
+"klasificiraju poruke koristeći ove alate i odvajaju poruke koje su "
+"klasificirane kao virusi. Čarobnjak neće uzimati u obzir postojeća pravila "
+"filtriranja: samo će dodavati nova pravila.</p> <p><b>Pažnja:</b> Pošto je "
+"KMail blokiran tokom otkrivanja virus poruka, možda ćete imati problema u "
+"smislu zaglavljivanja KMaila pošto anti-virus alati rade prilično sporo. "
+"Možete uvijek obrisati pravila filtriranja koja je napravio čarobnjak kako "
+"biste se vratili na prijašnje ponašanje."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1014,8 +1023,8 @@ msgstr "Označi izabrane poruke kao pročitane"
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
 msgstr ""
-"Označi poruke koje su klasificirane kao spam kao pročitane, osim pomjeranja u "
-"izabrani direktorij."
+"Označi poruke koje su klasificirane kao spam kao pročitane, osim pomjeranja "
+"u izabrani direktorij."
 
 #: antispamwizard.cpp:950
 #, fuzzy
@@ -1035,10 +1044,9 @@ msgstr "Premjesti stare poruke u:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1049,13 +1057,13 @@ msgstr "Provjeri poruke koristeći anti-virus alate"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Dopusti anti-virusnim alatima da provjere vaše poruke. Čarobnjak će napraviti "
-"odgovarajuće filtere. Alati obično označavaju poruke tako da ih pravila "
-"filtriranja prepoznaju i vrše akciju npr. premještaju poruke sa virusom u "
-"poseban direktorij."
+"Dopusti anti-virusnim alatima da provjere vaše poruke. Čarobnjak će "
+"napraviti odgovarajuće filtere. Alati obično označavaju poruke tako da ih "
+"pravila filtriranja prepoznaju i vrše akciju npr. premještaju poruke sa "
+"virusom u poseban direktorij."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1064,11 +1072,11 @@ msgstr "Premjesti prepoznate zaražene poruke u izabrani direktorij"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Filter koji prepoznaje poruke klasificirane kao zaražene virusom i pomjera te "
-"poruke u predefinisani direktorij koji je napravljen. Podrazumijevani "
+"Filter koji prepoznaje poruke klasificirane kao zaražene virusom i pomjera "
+"te poruke u predefinisani direktorij koji je napravljen. Podrazumijevani "
 "direktorij je direktorij Smeće, ali možete to promijeniti u pogledu "
 "direktorija."
 
@@ -1078,8 +1086,8 @@ msgstr "Dodatno, označi zaražene poruke kao pročitane"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Označi poruke koje su klasificirane kao zaražene virusom kao pročitane, osim "
 "pomjeranja u izabrani direktorij."
@@ -1277,8 +1285,8 @@ msgstr "Greška prilikom čitanja direktorija %1 na serveru:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1298,8 +1306,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1330,21 +1338,21 @@ msgstr "obrisana"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Nijedan od vaših identiteta ne odgovara primatelju ove poruke,"
-"<br>molim izaberite koja od sljedećih adresa je vaša:"
+"<qt>Nijedan od vaših identiteta ne odgovara primatelju ove poruke,<br>molim "
+"izaberite koja od sljedećih adresa je vaša:"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Nijedan od vaših identiteta ne odgovara primatelju ove poruke,"
-"<br>molim izaberite koja od sljedećih adresa je vaša:"
+"<qt>Nijedan od vaših identiteta ne odgovara primatelju ove poruke,<br>molim "
+"izaberite koja od sljedećih adresa je vaša:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1374,18 +1382,22 @@ msgstr "Greška prilikom sabijanja \"%1\". Sabijanje prekinuto."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Navedene postavke su popravljene od strane administratora.</p>"
-"<p>Ukoliko mislite da je riječ o grešci, kontaktirajte administratora.</p></qt>"
+"<qt><p>Navedene postavke su popravljene od strane administratora.</"
+"p><p>Ukoliko mislite da je riječ o grešci, kontaktirajte administratora.</"
+"p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Učitaj profil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Po&desi KMail..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Dodaj..."
@@ -1416,6 +1428,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Ukloni identitet"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Ukloni..."
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Dodaj..."
@@ -1424,6 +1441,11 @@ msgstr "Dodaj..."
 msgid "Modify..."
 msgstr "Izmijeni..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Ukloni..."
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Postavi za podrazumjevano"
@@ -1440,17 +1462,15 @@ msgstr "&Slanje"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Izlazni računi (dodajte barem jedan):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Vrsta"
@@ -1473,8 +1493,7 @@ msgstr "Postavi za podrazumjevano"
 msgid "Common Options"
 msgstr "Uobičajene opcije"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Potvrda &prije slanja"
@@ -1525,17 +1544,16 @@ msgstr "Po&drazumjevana domena:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Podrazumijevana domena se koristi za dovršavanje email adresa koje sadrže "
-"samo korisničko ime.</p></qt>"
+"<qt> <p>Podrazumijevana domena se koristi za dovršavanje email adresa koje "
+"sadrže samo korisničko ime.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1556,9 +1574,9 @@ msgstr "Dodaj transport"
 #: configuredialog.cpp:832
 #, fuzzy
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1  (Podrazumjevani) "
 
@@ -1637,6 +1655,10 @@ msgstr "Izmijeni račun"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ne mogu locirati račun <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Boje"
@@ -1752,8 +1774,7 @@ msgstr "Kliknuti link"
 msgid "Misspelled Words"
 msgstr "Pogrešno napisane riječi"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nova poruka"
@@ -1946,8 +1967,8 @@ msgstr "Threadovi zatvoreni po defaultu"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Otvori threadove koji sadrže nove, nepročitane ili važne &poruke i otvori "
 "nadzirane threadove"
@@ -1958,70 +1979,53 @@ msgstr "Prikaz datuma"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Ove ključne riječi se mogu koristiti za datum:</strong></p>"
-"<ul>"
-"<li>d - dan kao broj bez početne nule (1-31)</li>"
-"<li>dd - dan kao broj sa početnom nulom (01-31)</li>"
-"<li>ddd - skraćeni naziv dana (Pon - Ned)</li>"
-"<li>dddd - puni naziv dana (Ponedeljak - Nedelja)</li>"
-"<li>M - mjesec kao broj bez početne nule (1-12)</li>"
-"<li>MM - mjesec kao broj sa početnom nulom (01-12)</li>"
-"<li>MMM - skraćeni naziv mjeseca (Jan - Dec)</li>"
-"<li>MMMM - puni naziv mjeseca (Januar - Decembar)</li>"
-"<li>yy - godina kao dvocifreni broj (00-99)</li>"
-"<li>yyyy - godina kao četverocifreni broj (0000-9999)</li></ul>"
-"<p><strong>Sljedeće ključne riječi se mogu koristiti za vrijeme:</string></p> "
-"<ul>"
-"<li>h - sat bez početne nule (0-23 ili 1-12 ako je uključen AM/PM prikaz)</li>"
-"<li>hh - sat sa početnom nulom (00-23 ili 01-12 ako je uključen AM/PM "
-"prikaz)</li>"
-"<li>m - minute bez početne nule (0-59)</li>"
-"<li>mm - minute sa početnom nulom (00-59)</li>"
-"<li>s - sekunde bez početne nule (0-59)</li>"
-"<li>ss - sekunde sa početnom nulom (00-59)</li>"
-"<li>z - milisekunde bez početnih nula (0-999)</li>"
-"<li>zzz - milisekunde sa početnim nulama (000-999)</li>"
-"<li>AP - prebaci na AM/PM prikaz. AP će biti zamijenjeno sa \"AM\" ili "
-"\"PM\".</li>"
-"<li>ap - prebaci na AM/PM prikaz. ap će biti zamijenjeno sa \"am\" ili "
-"\"pm\".</li>"
-"<li>Z - vremenska zona u numeričkom obliku (-0500)</li></ul>"
-"<p><strong>Svi drugi uneseni znakovi će biti ignorisani.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Ove ključne riječi se mogu koristiti za datum:</strong></"
+"p><ul><li>d - dan kao broj bez početne nule (1-31)</li><li>dd - dan kao broj "
+"sa početnom nulom (01-31)</li><li>ddd - skraćeni naziv dana (Pon - Ned)</"
+"li><li>dddd - puni naziv dana (Ponedeljak - Nedelja)</li><li>M - mjesec kao "
+"broj bez početne nule (1-12)</li><li>MM - mjesec kao broj sa početnom nulom "
+"(01-12)</li><li>MMM - skraćeni naziv mjeseca (Jan - Dec)</li><li>MMMM - puni "
+"naziv mjeseca (Januar - Decembar)</li><li>yy - godina kao dvocifreni broj "
+"(00-99)</li><li>yyyy - godina kao četverocifreni broj (0000-9999)</li></"
+"ul><p><strong>Sljedeće ključne riječi se mogu koristiti za vrijeme:</"
+"string></p> <ul><li>h - sat bez početne nule (0-23 ili 1-12 ako je uključen "
+"AM/PM prikaz)</li><li>hh - sat sa početnom nulom (00-23 ili 01-12 ako je "
+"uključen AM/PM prikaz)</li><li>m - minute bez početne nule (0-59)</li><li>mm "
+"- minute sa početnom nulom (00-59)</li><li>s - sekunde bez početne nule "
+"(0-59)</li><li>ss - sekunde sa početnom nulom (00-59)</li><li>z - "
+"milisekunde bez početnih nula (0-999)</li><li>zzz - milisekunde sa početnim "
+"nulama (000-999)</li><li>AP - prebaci na AM/PM prikaz. AP će biti "
+"zamijenjeno sa \"AM\" ili \"PM\".</li><li>ap - prebaci na AM/PM prikaz. ap "
+"će biti zamijenjeno sa \"am\" ili \"pm\".</li><li>Z - vremenska zona u "
+"numeričkom obliku (-0500)</li></ul><p><strong>Svi drugi uneseni znakovi će "
+"biti ignorisani.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Promjena u globalnim postavkama threadovanja će promijeniti vrijednosti "
 "specifične za pojedine direktorije."
@@ -2039,8 +2043,7 @@ msgstr "Prikaži HTML statusnu trak&u"
 msgid "Show s&pam status in fancy headers"
 msgstr "Prikaži cijelo zaglavlje poruke"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -2049,8 +2052,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2076,8 +2078,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Ikona u sistemskom tray-u"
@@ -2181,22 +2182,19 @@ msgstr "<b>%f</b> će biti zamijenjeno imenom datoteke za editovanje."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>Sljedeći posebni simboli su podržani u frazama odgovora:\n"
-"<br><b>%D</b>: datum, <b>%S</b>: tema,"
-"<br><b>%e</b>: adresa pošiljatelja, <b>%F</b>: ime pošiljatelja, <b>%f</b>"
-": inicijali pošiljatelja,\n"
+"<br><b>%D</b>: datum, <b>%S</b>: tema,<br><b>%e</b>: adresa pošiljatelja, <b>"
+"%F</b>: ime pošiljatelja, <b>%f</b>: inicijali pošiljatelja,\n"
 "<br><b>%T</b>: ime primatelja, <b>%t</b>: ime i adresa primatelja,\n"
 "<br><b>%C</b>: imena primalaca kopije, <b>%c</b>: imena i adrese primalaca "
-"kopije, "
-"<br><b>%%</b>: postotak, <b>%_</b>: razmak, <b>%L</b>: novi red</qt>"
+"kopije, <br><b>%%</b>: postotak, <b>%_</b>: razmak, <b>%L</b>: novi red</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2219,21 +2217,20 @@ msgstr "Odgovori &svima:"
 msgid "&Forward:"
 msgstr "P&roslijedi:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Indikator citiranja:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Dana %D napisali ste:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Dana %D, %F je napisao/la:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Proslijeđena poruka"
 
@@ -2271,11 +2268,11 @@ msgstr "Unesite novi prefiks proslijeđivanja:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Pri svakom slanju maila, ova lista će biti pretražena odozgo prema dole tražeći "
-"skup znakova koji sadrži sve potrebne znakove."
+"Pri svakom slanju maila, ova lista će biti pretražena odozgo prema dole "
+"tražeći skup znakova koji sadrži sve potrebne znakove."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2311,10 +2308,9 @@ msgstr "Vrijednost"
 msgid "Ne&w"
 msgstr "&Nova"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Ime:"
@@ -2323,19 +2319,18 @@ msgstr "&Ime:"
 msgid "&Value:"
 msgstr "&Vrijednost:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Imenovanje priloga kompatibilno sa Outlook-om"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije imena priloga "
-"koja sadrže ne-engleske znakove"
+"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije imena "
+"priloga koja sadrže ne-engleske znakove"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2344,7 +2339,8 @@ msgstr "&Uključi prepoznavanje nedostajućih priloga"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Prepoznaj bilo koju od sljedećih ključnih riječi kao pokušaj dodavanja priloga:"
+"Prepoznaj bilo koju od sljedećih ključnih riječi kao pokušaj dodavanja "
+"priloga:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2362,21 +2358,21 @@ msgstr "priloženo"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Izabrali ste da kodirate imena priloga koja sadrže ne-engleske znakove na način "
-"koji razumije Outlook(tm) i drugi e-mail klijenti koji ne podržavaju standardno "
-"kodirana imena priloga.\n"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Izabrali ste da kodirate imena priloga koja sadrže ne-engleske znakove na "
+"način koji razumije Outlook(tm) i drugi e-mail klijenti koji ne podržavaju "
+"standardno kodirana imena priloga.\n"
 "Zapamtite da rezultat mogu biti poruke koje nisu sukladne otvorenim "
-"standardima, pa konsekventno se može desiti da neki mail klijenti koji poštuju "
-"standarde neće razumjeti vaše poruke. Zato ne biste trebali uključivati ovu "
-"opciju osim ako nemate izbora."
+"standardima, pa konsekventno se može desiti da neki mail klijenti koji "
+"poštuju standarde neće razumjeti vaše poruke. Zato ne biste trebali "
+"uključivati ovu opciju osim ako nemate izbora."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2400,114 +2396,99 @@ msgstr "Kripto doda&ci"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Emailovi ponekad dolaze u oba formata. Ova opcija određuje da li želite "
-"prikazati HTML dio ili dio sa čistim tekstom.</p>"
-"<p>Prikazivanjem HTML dijela poruka izgleda ljepše, ali istovremeno povećavate "
-"rizik zloupotrebe sigurnosnih rupa.</p>"
-"<p>Prikazivanjem čistog teksta gubi se većina formatiranja poruke, ali "
-"istovremeno čini se gotovo <em>nemoguća</em> zloupotreba eventualnih rupa u "
-"Konqueror slagaču HTMLa.</p>"
-"<p>Sljedeća opcija vas čuva od jedne česte zloupotrebe HTML poruka, ali vas ne "
-"može sačuvati od sigurnosnih rupa koje nisu bile poznate u vrijeme pravljenja "
-"ove verzije KMaila.</p>"
-"<p>Stoga preporučujemo da <em>ne</em> preferirate HTML u odnosu na čisti "
-"tekst.</p>"
-"<p><b>Napomena:</b> Ovu opciju možete podešavati posebno za svaki direktorij u "
-"meniju <i>Direktorij</i> vašeg glavnog KMail prozora.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p> Emailovi ponekad dolaze u oba formata. Ova opcija određuje da li "
+"želite prikazati HTML dio ili dio sa čistim tekstom.</p><p>Prikazivanjem "
+"HTML dijela poruka izgleda ljepše, ali istovremeno povećavate rizik "
+"zloupotrebe sigurnosnih rupa.</p><p>Prikazivanjem čistog teksta gubi se "
+"većina formatiranja poruke, ali istovremeno čini se gotovo <em>nemoguća</em> "
+"zloupotreba eventualnih rupa u Konqueror slagaču HTMLa.</p><p>Sljedeća "
+"opcija vas čuva od jedne česte zloupotrebe HTML poruka, ali vas ne može "
+"sačuvati od sigurnosnih rupa koje nisu bile poznate u vrijeme pravljenja ove "
+"verzije KMaila.</p><p>Stoga preporučujemo da <em>ne</em> preferirate HTML u "
+"odnosu na čisti tekst.</p><p><b>Napomena:</b> Ovu opciju možete podešavati "
+"posebno za svaki direktorij u meniju <i>Direktorij</i> vašeg glavnog KMail "
+"prozora.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Neke e-mail reklame su u HTMLu i sadrže reference na npr. slike koje autori "
-"reklama koriste da bi potvrdili da ste pročitali mail (&quot;web "
-"bugs&quot;).</p>"
-"<p>Ne postoji nikakav logičan razlog zašto biste čitali slike sa Interneta na "
-"ovaj način, pošto pošiljalac uvijek može zakačiti potrebne slike na samu "
-"poruku.</p>"
-"<p>Kako biste se sačuvali od ovakve zloupotrebe opcije prikazivanja HTML slika "
-"u KMailu, ova opcija je po instalaciji <em>isključena</em>.</p>"
-"<p>Ako svejedno želite da npr. vidite slike u HTML porukama koje nisu prikačene "
-"za njih, možete uključiti ovu opciju, ali trebate biti svjesni mogućeg "
-"problema.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Neke e-mail reklame su u HTMLu i sadrže reference na npr. slike koje "
+"autori reklama koriste da bi potvrdili da ste pročitali mail (&quot;web "
+"bugs&quot;).</p><p>Ne postoji nikakav logičan razlog zašto biste čitali "
+"slike sa Interneta na ovaj način, pošto pošiljalac uvijek može zakačiti "
+"potrebne slike na samu poruku.</p><p>Kako biste se sačuvali od ovakve "
+"zloupotrebe opcije prikazivanja HTML slika u KMailu, ova opcija je po "
+"instalaciji <em>isključena</em>.</p><p>Ako svejedno želite da npr. vidite "
+"slike u HTML porukama koje nisu prikačene za njih, možete uključiti ovu "
+"opciju, ali trebate biti svjesni mogućeg problema.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Politika obavješenja o stanju poruke</h3> "
-"<p>MDN (Message Disposition Notification) je opštiji slučaj onoga što se obično "
-"zove <b>potvrda čitanja</b>. Autor poruke je zatražio da bude poslano "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Politika obavješenja o stanju poruke</h3> <p>MDN (Message "
+"Disposition Notification) je opštiji slučaj onoga što se obično zove "
+"<b>potvrda čitanja</b>. Autor poruke je zatražio da bude poslano "
 "obavještenje o stanju, tj. da e-mail program primatelja generiše odgovor iz "
-"kojeg autor može saznati šta se desilo sa njegovom/njenom porukom. Uobičajene "
-"vrsta stanja su <b>prikazana</b> (tj. pročitana poruka), <b>obrisana</b> i <b>"
-"poslana</b> (tj. proslijeđena poruka).</p>"
-"<p>Dostupne su sljedeće opcije za kontrolu KMailovog slanja MDNova:</p>"
-"<ul>"
-"<li><em>Ignoriši</em>: Ignoriše sve zahtjeve za obavještenjima o stanju. MDNovi "
-"neće nikada biti poslani automatski (preporučeno).</li>"
-"<li><em>Pitaj</em>: Odgovor će biti poslan tek nakon što se dobije dozvola od "
-"korisnika. Na ovaj način možete slati MDNove za poruke za koje to želite "
-"učiniti, odbijajući ili ignorišući ostale.</li> "
-"<li><em>Odbij</em>: Uvijek šalje obavještenje da je poruka <b>odbijena</b>"
-". Ovo je tek  <em>neznatno</em> bolje od slanja običnog MDNa. Autor će i dalje "
-"znati da je poruka primljena i da je na nju reagovano, jedino neće znati kako "
-"(da li je poruka obrisana, pročitana itd.</li> "
-"<li><em>Uvijek šalji</em>: Uvijek šalje traženo obavještenje o stanju. Ovo "
-"znači da će autor poruke znati da li je reagovano na poruku kao i šta se desilo "
-"s njom (da li je prikazana, obrisana itd.). Ova opcija se ne preporučuje, ali "
-"pošto ona može biti korisna npr. za odjel odnosa s javnošću, ostavljena je kao "
-"mogućnost.</li></ul></qt>"
+"kojeg autor može saznati šta se desilo sa njegovom/njenom porukom. "
+"Uobičajene vrsta stanja su <b>prikazana</b> (tj. pročitana poruka), "
+"<b>obrisana</b> i <b>poslana</b> (tj. proslijeđena poruka).</p><p>Dostupne "
+"su sljedeće opcije za kontrolu KMailovog slanja MDNova:</"
+"p><ul><li><em>Ignoriši</em>: Ignoriše sve zahtjeve za obavještenjima o "
+"stanju. MDNovi neće nikada biti poslani automatski (preporučeno).</"
+"li><li><em>Pitaj</em>: Odgovor će biti poslan tek nakon što se dobije "
+"dozvola od korisnika. Na ovaj način možete slati MDNove za poruke za koje to "
+"želite učiniti, odbijajući ili ignorišući ostale.</li> <li><em>Odbij</em>: "
+"Uvijek šalje obavještenje da je poruka <b>odbijena</b>. Ovo je tek  "
+"<em>neznatno</em> bolje od slanja običnog MDNa. Autor će i dalje znati da je "
+"poruka primljena i da je na nju reagovano, jedino neće znati kako (da li je "
+"poruka obrisana, pročitana itd.</li> <li><em>Uvijek šalji</em>: Uvijek šalje "
+"traženo obavještenje o stanju. Ovo znači da će autor poruke znati da li je "
+"reagovano na poruku kao i šta se desilo s njom (da li je prikazana, obrisana "
+"itd.). Ova opcija se ne preporučuje, ali pošto ona može biti korisna npr. za "
+"odjel odnosa s javnošću, ostavljena je kao mogućnost.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2523,15 +2504,15 @@ msgstr "Omogući mailovima da učitaju &vanjske reference sa Interneta"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>PAŽNJA:</b> Omogućivši HTML u porukama povećali ste rizik da vaš sistem bude "
-"ugrožen sadašnjim i budućim sigurnosnim zloupotrebama. <a href=\"whatsthis:%1\">"
-"Više o HTML porukama...</a> <a href=\"whatsthis:%2\">"
-"Više o eksternim referencama...</a>"
+"<b>PAŽNJA:</b> Omogućivši HTML u porukama povećali ste rizik da vaš sistem "
+"bude ugrožen sadašnjim i budućim sigurnosnim zloupotrebama. <a href="
+"\"whatsthis:%1\">Više o HTML porukama...</a> <a href=\"whatsthis:%2\">Više o "
+"eksternim referencama...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2614,8 +2595,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2644,8 +2624,8 @@ msgstr "I&sključi važne poruke iz isticanja"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Prilikom traženja nepročitanih poruka:"
 
@@ -2669,8 +2649,8 @@ msgstr "Kruži kroz sve direktorije"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2742,28 +2722,25 @@ msgstr "Direktoriji (\"maildir\" format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Ovim izabirete koji format poštanskog sandučeta će biti podrazumijevan za "
-"lokalne direktorije:</p>"
-"<p><b>mbox:</b> Svaki KMail direktorij je predstavljen jednom jedinstvenom "
-"datotekom. Pojedinačne poruke su međusobno odvojene linijom koja počinje sa "
-"\"From \". Ovo štedi prostor na disku, ali može biti manje robusno, npr. pri "
-"premještanju poruka iz jednog u drugi direktorij.</p>"
-"<p><b>maildir:</b> KMail direktoriji su predstavljeni stvarnim direktorijima na "
-"disku. Pojedinačne poruke su odvojene datoteke. Ovo može utrošiti malo više "
-"prostora na disku, ali trebalo bi biti robusnije, npr. pri premještanju poruka "
-"iz jednog u drugi direktorij.</p>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Ovim izabirete koji format poštanskog sandučeta će biti "
+"podrazumijevan za lokalne direktorije:</p><p><b>mbox:</b> Svaki KMail "
+"direktorij je predstavljen jednom jedinstvenom datotekom. Pojedinačne poruke "
+"su međusobno odvojene linijom koja počinje sa \"From \". Ovo štedi prostor "
+"na disku, ali može biti manje robusno, npr. pri premještanju poruka iz "
+"jednog u drugi direktorij.</p><p><b>maildir:</b> KMail direktoriji su "
+"predstavljeni stvarnim direktorijima na disku. Pojedinačne poruke su "
+"odvojene datoteke. Ovo može utrošiti malo više prostora na disku, ali "
+"trebalo bi biti robusnije, npr. pri premještanju poruka iz jednog u drugi "
+"direktorij.</p>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2798,45 +2775,37 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pri skoku na iduću nepročitanu poruku, može se desiti da nema više "
-"nepročitanih poruka ispod trenutne poruke.</p>"
-"<p><b>Nemoj kružiti:</b> Pretraga će se zaustaviti na zadnjoj poruci u "
-"trenutnom direktoriju.</p> "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Pri skoku na iduću nepročitanu poruku, može se desiti da nema više "
+"nepročitanih poruka ispod trenutne poruke.</p><p><b>Nemoj kružiti:</b> "
+"Pretraga će se zaustaviti na zadnjoj poruci u trenutnom direktoriju.</p> "
 "<p><b>Kruži kroz trenutni direktorij:</b> Pretraga će nastaviti od početka "
-"liste poruka, ali neće preći u idući direktorij.</p> "
-"<p><b>Kruži kroz sve direktorije:</b> Pretraga će nastaviti od početka liste "
-"poruka. Ako nije pronađeno više nepročitanih poruka, nastaviće se sa idućim "
-"direktorijem.</p>"
-"<p>Slično, kada tražite prethodnu nepročitanu poruku, pretraga će opet početi "
-"sa dna liste poruka i nastaviti sa prethodnim direktorijem ovisno o izabranim "
-"opcijama.</p></qt>"
+"liste poruka, ali neće preći u idući direktorij.</p> <p><b>Kruži kroz sve "
+"direktorije:</b> Pretraga će nastaviti od početka liste poruka. Ako nije "
+"pronađeno više nepročitanih poruka, nastaviće se sa idućim direktorijem.</"
+"p><p>Slično, kada tražite prethodnu nepročitanu poruku, pretraga će opet "
+"početi sa dna liste poruka i nastaviti sa prethodnim direktorijem ovisno o "
+"izabranim opcijama.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2903,8 +2872,8 @@ msgstr "&Sakrij groupware direktorije"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Kada je ovo uključeno, nećete vidjeti direktorije sa IMAP resursima u stablu "
 "direktorija."
@@ -2917,8 +2886,8 @@ msgstr "Resursni direktoriji su &poddirektoriji:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Kada je ovo uključeno, nećete vidjeti direktorije sa IMAP resursima u stablu "
 "direktorija."
@@ -2950,8 +2919,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije vaše odgovore "
-"na pozive"
+"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije vaše "
+"odgovore na pozive"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2962,8 +2931,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije vaše odgovore "
-"na pozive"
+"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije vaše "
+"odgovore na pozive"
 
 #: configuredialog.cpp:4963
 #, fuzzy
@@ -2978,19 +2947,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Imenovanje priloga kompatibilno sa Outlook-om"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatska detekcija mailing liste"
@@ -3003,23 +2971,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Pozivi se normalno šalju kao prilozi e-mail poruke. Ovaj prekidač znači da "
-"će poruke sa pozivom biti poslane u tekstu poruke; ovo je potrebno da biste "
-"slali pozive i odgovore na pozive korisnicima Microsoft Outlooka. "
-"<br>Ali kada ovo uradite više nećete dobiti opisni tekst koji e-mail programi "
-"mogu čitati. Tako kada poruku dobije osoba koja koristi e-mail program koji ne "
-"razumije pozive, rezultujuća poruka će izgledati vrlo čudno. "
-"<br>Ljudi čiji e-mail programi ne razumiju pozive će i dalje moći uraditi nešto "
-"s tim.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Pozivi se normalno šalju kao prilozi e-mail poruke. Ovaj prekidač znači "
+"da će poruke sa pozivom biti poslane u tekstu poruke; ovo je potrebno da "
+"biste slali pozive i odgovore na pozive korisnicima Microsoft Outlooka. "
+"<br>Ali kada ovo uradite više nećete dobiti opisni tekst koji e-mail "
+"programi mogu čitati. Tako kada poruku dobije osoba koja koristi e-mail "
+"program koji ne razumije pozive, rezultujuća poruka će izgledati vrlo čudno. "
+"<br>Ljudi čiji e-mail programi ne razumiju pozive će i dalje moći uraditi "
+"nešto s tim.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3129,17 +3097,16 @@ msgstr "&Proslijedi"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3157,15 +3124,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3238,8 +3205,8 @@ msgstr "Izmijeni identitet"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3515,6 +3482,11 @@ msgstr "Obriši direktorij"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Izaberi &sve poruke"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3546,8 +3518,8 @@ msgstr "&Zabilježi aktivnosti filtera"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Ovdje možete uključivati i isključivati bilježenje aktivnosti filtera u "
 "dnevnik. Naravno, podaci se prikupljaju i prikazuju samo kada je bilježenje "
@@ -3567,10 +3539,11 @@ msgstr "Zapiši procjenu &pravila filtera"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Možete kontrolisati feedback u dnevniku koji se tiče procjene pravila "
 "filtriranja i primjenjenih filtera. Ako vam je ova opcija uključena, imaćete "
@@ -3595,15 +3568,15 @@ msgstr "neograničeno"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Prikupljanje podataka koristi memoriju za privremeni smještaj podataka. Ovdje "
-"možete ograničiti maksimalnu količinu memorije koja će se koristiti: ako "
-"veličina prikupljenih podataka pređe ovo ograničenje, biće odbačeni najstariji "
-"podaci dok dnevnik ne bude manji od ograničenja."
+"Prikupljanje podataka koristi memoriju za privremeni smještaj podataka. "
+"Ovdje možete ograničiti maksimalnu količinu memorije koja će se koristiti: "
+"ako veličina prikupljenih podataka pređe ovo ograničenje, biće odbačeni "
+"najstariji podaci dok dnevnik ne bude manji od ograničenja."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3613,7 +3586,7 @@ msgstr ""
 "Ne mogu pisati u datoteku %1:\n"
 "\"%2\" je detaljan opis greške."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail greška"
@@ -3659,13 +3632,13 @@ msgstr "&Korisnički ID:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Korisnički ID je login korisnika na IMAP serveru. Ovo može biti jednostavno "
-"korisničko ime ili puna e-mail adresa korisnika. Login vašeg vlastitog računa "
-"na serveru će vam reći koje od ovoga je slučaj."
+"korisničko ime ili puna e-mail adresa korisnika. Login vašeg vlastitog "
+"računa na serveru će vam reći koje od ovoga je slučaj."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 #, fuzzy
@@ -3719,11 +3692,11 @@ msgstr "Nemate odgovarajuće privilegije za pristup vašem direktoriju smeće."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Informacije još uvijek nisu dobavljene sa servera, molim koristite \"Provjeri "
-"poštu\"."
+"Informacije još uvijek nisu dobavljene sa servera, molim koristite "
+"\"Provjeri poštu\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3733,8 +3706,7 @@ msgstr "Greška: nije definisan nijedan IMAP račun za ovaj direktorij"
 msgid "Connecting to server %1, please wait..."
 msgstr "Spajam se na server %1, molim sačekajte..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Greška pri spajanju na server %1"
@@ -3762,8 +3734,8 @@ msgstr "Dodaj dozvole"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Da li stvarno želite obrisati vlastite dozvole za ovaj direktorij? Više mu "
 "nećete moći pristupiti."
@@ -3798,7 +3770,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Obriši direktorij"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokalni direktoriji"
@@ -3824,9 +3796,9 @@ msgstr "Izaberite datoteku sa zvukom"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3847,11 +3819,20 @@ msgstr "&Odustani"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Nepoznato"
@@ -3972,69 +3953,17 @@ msgstr "Status: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>P"
-"<br>o"
-"<br>r"
-"<br>u"
-"<br>k"
-"<br>a</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>P<br>o<br>r<br>u<br>k<br>a</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>i"
-"<br>j"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>P"
-"<br>o"
-"<br>r"
-"<br>u"
-"<br>k"
-"<br>a</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>i<br>j<br>e<br> <br>H<br>T<br>M<br>L<br> "
+"<br>P<br>o<br>r<br>u<br>k<br>a</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4046,19 +3975,14 @@ msgstr "&Vaše ime:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Vaše ime</h3>"
-"<p>Ovo polje bi trebalo sadržavati vaše ime, onako kako želite da se prikazuje "
-"u zaglavlju e-mail poruka koje šaljete.</p>"
-"<p>Ako ostavite ovo polje praznim, umjesto vašeg pravog imena ispisivaće se "
-"vaša e-mail adresa.</p></qt>"
+"<qt><h3>Vaše ime</h3><p>Ovo polje bi trebalo sadržavati vaše ime, onako kako "
+"želite da se prikazuje u zaglavlju e-mail poruka koje šaljete.</p><p>Ako "
+"ostavite ovo polje praznim, umjesto vašeg pravog imena ispisivaće se vaša e-"
+"mail adresa.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4066,17 +3990,14 @@ msgstr "Organi&zacija:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizacija</h3>"
-"<p>U ovo polje trebate popuniti ime vaše organizacije onako kako biste željeli "
-"da se prikazuje u e-mail porukama koje šaljete.</p>"
-"<p>Bezbijedno je (i normalno) da ostavite ovo polje praznim.</p></qt>"
+"<qt><h3>Organizacija</h3><p>U ovo polje trebate popuniti ime vaše "
+"organizacije onako kako biste željeli da se prikazuje u e-mail porukama koje "
+"šaljete.</p><p>Bezbijedno je (i normalno) da ostavite ovo polje praznim.</"
+"p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4085,20 +4006,15 @@ msgstr "&Email adresa:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-mail adresa</h3>"
-"<p>U ovom polju trebate unijeti vašu punu e-mail adresu.</p>"
-"<p>Ako ostavite ovo polje praznim ili ga pogrešno popunite, drugi neće moći "
-"odgovoriti na vaše poruke.</p></qt>"
+"<qt><h3>E-mail adresa</h3><p>U ovom polju trebate unijeti vašu punu e-mail "
+"adresu.</p><p>Ako ostavite ovo polje praznim ili ga pogrešno popunite, drugi "
+"neće moći odgovoriti na vaše poruke.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4107,21 +4023,12 @@ msgstr "&Email adresa:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4141,25 +4048,23 @@ msgstr "Vaš OpenPGP ključ za potpis"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Odaberite OpenPGP ključ koji želite koristiti za digitalno potpisivanje vaših "
-"poruka."
+"Odaberite OpenPGP ključ koji želite koristiti za digitalno potpisivanje "
+"vaših poruka."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP ključ koji ovdje izaberete će se koristiti za digitalno potpisivanje "
-"poruka. Takođe možete koristiti GnuPG ključeve.</p>"
-"<p>Možete ostaviti ovo polje praznim, ali u tom slučaju KMail neće biti u "
-"stanju da digitalno potpisuje poruke koristeći OpenPGP. Ovo neće utjecati na "
-"normalne e-mail funkcije.</p>"
-"<p>Možete saznati više o ključevima na <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>OpenPGP ključ koji ovdje izaberete će se koristiti za digitalno "
+"potpisivanje poruka. Takođe možete koristiti GnuPG ključeve.</p><p>Možete "
+"ostaviti ovo polje praznim, ali u tom slučaju KMail neće biti u stanju da "
+"digitalno potpisuje poruke koristeći OpenPGP. Ovo neće utjecati na normalne "
+"e-mail funkcije.</p><p>Možete saznati više o ključevima na <a>http://www."
+"gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4171,31 +4076,28 @@ msgstr "Vaš OpenPGP ključ za šifrovanje"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Odaberite OpenPGP ključ koji želite koristiti za šifrovanje poruka koje šaljete "
-"sebi i za opciju \"Zakači moj javni ključ\" u sastavljaču."
+"Odaberite OpenPGP ključ koji želite koristiti za šifrovanje poruka koje "
+"šaljete sebi i za opciju \"Zakači moj javni ključ\" u sastavljaču."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP ključ koji ovdje izaberete će se koristiti za šifrovanje poruka koje "
-"šaljete sebi kao i za opciju \"Zakači moj javni ključ\" u sastavljaču. Takođe "
-"možete koristiti GnuPG ključeve.</p>"
-"<p>Možete ostaviti ovo polje praznim, ali u tom slučaju KMail neće biti u "
-"stanju da šifruje poruke koje šaljete sebi koristeći OpenPGP. Ovo neće utjecati "
-"na normalne e-mail funkcije.</p>"
-"<p>Možete saznati više o ključevima na <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>OpenPGP ključ koji ovdje izaberete će se koristiti za šifrovanje "
+"poruka koje šaljete sebi kao i za opciju \"Zakači moj javni ključ\" u "
+"sastavljaču. Takođe možete koristiti GnuPG ključeve.</p><p>Možete ostaviti "
+"ovo polje praznim, ali u tom slučaju KMail neće biti u stanju da šifruje "
+"poruke koje šaljete sebi koristeći OpenPGP. Ovo neće utjecati na normalne e-"
+"mail funkcije.</p><p>Možete saznati više o ključevima na <a>http://www.gnupg."
+"org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4215,18 +4117,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) certifikat koji ovdje izaberete će se koristiti za digitalno "
-"potpisivanje poruka.</p>"
-"<p>Možete ostaviti ovo polje praznim, ali u tom slučaju KMail neće biti u "
-"stanju da digitalno potpisuje poruke koristeći S/MIME. Ovo neće utjecati na "
-"normalne e-mail funkcije.</p></qt>"
+"<qt><p>S/MIME (X.509) certifikat koji ovdje izaberete će se koristiti za "
+"digitalno potpisivanje poruka.</p><p>Možete ostaviti ovo polje praznim, ali "
+"u tom slučaju KMail neće biti u stanju da digitalno potpisuje poruke "
+"koristeći S/MIME. Ovo neće utjecati na normalne e-mail funkcije.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4238,27 +4137,25 @@ msgstr "Vaš S/MIME certifikat za šifrovanje"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Izaberite S/MIME certifikat koji ćete koristiti za šifrovanje poruka koje "
 "šaljete samim sebi i za opciju \"Zakači moj certifikat\" u sastavljaču."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME certifikat koji ovdje izaberete će se koristiti za šifrovanje poruka "
-"za same sebe kao i za opciju \"Zakači moj certifikat\" u sastavljaču.</p> "
-"<p>Možete ostaviti ovo polje praznim, ali u tom slučaju KMail neće biti u "
-"stanju da šifruje izlazne poruke za vas koristeći S/MIME. Ovo neće utjecati na "
-"normalne e-mail funkcije.</p></qt>"
+"<qt><p>S/MIME certifikat koji ovdje izaberete će se koristiti za šifrovanje "
+"poruka za same sebe kao i za opciju \"Zakači moj certifikat\" u sastavljaču."
+"</p> <p>Možete ostaviti ovo polje praznim, ali u tom slučaju KMail neće biti "
+"u stanju da šifruje izlazne poruke za vas koristeći S/MIME. Ovo neće "
+"utjecati na normalne e-mail funkcije.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4278,24 +4175,20 @@ msgstr "&Reply-To adresa:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Reply-to adresa</h3> "
-"<p>Ovo podešava <tt>Reply-to:</tt> (Odgovori-na) polje zaglavlja koje može "
-"sadržavati različitu e-mail adresu od uobičajene adrese u polju <tt>Od:</tt>"
-".</p> "
-"<p>Ovo može biti korisno npr. kada grupa ljudi radi zajedno na sličnim ulogama. "
-"Na primjer, možda ćete željeti da poruke koje šaljete imaju vašu pravu e-mail "
-"adresu u polju <tt>Od:</tt>, ali da odgovori idu na adresu čitave grupe.</p>"
-"<p>Ako niste sigurni, ostavite polje praznim.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Reply-to adresa</h3> <p>Ovo podešava <tt>Reply-to:</tt> (Odgovori-"
+"na) polje zaglavlja koje može sadržavati različitu e-mail adresu od "
+"uobičajene adrese u polju <tt>Od:</tt>.</p> <p>Ovo može biti korisno npr. "
+"kada grupa ljudi radi zajedno na sličnim ulogama. Na primjer, možda ćete "
+"željeti da poruke koje šaljete imaju vašu pravu e-mail adresu u polju <tt>Od:"
+"</tt>, ali da odgovori idu na adresu čitave grupe.</p><p>Ako niste sigurni, "
+"ostavite polje praznim.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4303,25 +4196,20 @@ msgstr "&BCC adrese:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy, \"Nevidljiva kopija\") adrese</h3>"
-"<p>Adrese koje ovdje unesete će biti dodane svakoj poruci koja bude poslana sa "
-"ovog identiteta. One neće biti vidljive drugim primateljima.</p> "
-"<p>Ovo se često koristi da biste poslali kopiju svake poslane poruke na neki "
-"drugi račun koji pripada vama.</p>"
-"<p>Da navedete više od jedne adrese, koristite zareze da razdvojite listu BCC "
-"primatelja.</p>"
-"<p>Ako niste sigurni, ostavite ovo polje praznim.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy, \"Nevidljiva kopija\") adrese</h3><p>Adrese "
+"koje ovdje unesete će biti dodane svakoj poruci koja bude poslana sa ovog "
+"identiteta. One neće biti vidljive drugim primateljima.</p> <p>Ovo se često "
+"koristi da biste poslali kopiju svake poslane poruke na neki drugi račun "
+"koji pripada vama.</p><p>Da navedete više od jedne adrese, koristite zareze "
+"da razdvojite listu BCC primatelja.</p><p>Ako niste sigurni, ostavite ovo "
+"polje praznim.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4362,7 +4250,7 @@ msgstr "&Potpis"
 msgid "&Picture"
 msgstr "&Potpis"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Pogrešna e-mail adresa"
 
@@ -4378,15 +4266,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Jedan od podešenih OpenPGP ključeva za potpisivanje ne sadrži ID korisnika sa "
-"podešenom e-mail adresom za ovaj identitet (%1).\n"
+"Jedan od podešenih OpenPGP ključeva za potpisivanje ne sadrži ID korisnika "
+"sa podešenom e-mail adresom za ovaj identitet (%1).\n"
 "Ovo može rezultirati porukama upozorenja na strani primatelja kada pokuša "
 "provjeriti potpise napravljene ovom konfiguracijom."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Jedan od podešenih OpenPGP ključeva za šifrovanje ne sadrži ID korisnika sa "
 "podešenom e-mail adresom za ovaj identitet (%1)."
@@ -4398,8 +4286,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Jedan od podešenih S/MIME certifikata za potpisivanje ne sadrži ID korisnika sa "
-"podešenom e-mail adresom za ovaj identitet (%1).\n"
+"Jedan od podešenih S/MIME certifikata za potpisivanje ne sadrži ID korisnika "
+"sa podešenom e-mail adresom za ovaj identitet (%1).\n"
 "Ovo može rezultirati porukama upozorenja na strani primatelja kada pokuša "
 "provjeriti potpise napravljene ovom konfiguracijom."
 
@@ -4437,8 +4325,8 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Vlastiti direktorij nacrta za identitet \"%1\" (više) ne postoji. Stoga će biti "
-"korišten uobičajeni direktorij za nacrte."
+"Vlastiti direktorij nacrta za identitet \"%1\" (više) ne postoji. Stoga će "
+"biti korišten uobičajeni direktorij za nacrte."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4446,13 +4334,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Vlastiti direktorij nacrta za identitet \"%1\" (više) ne postoji. Stoga će biti "
-"korišten uobičajeni direktorij za nacrte."
+"Vlastiti direktorij nacrta za identitet \"%1\" (više) ne postoji. Stoga će "
+"biti korišten uobičajeni direktorij za nacrte."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Default)"
 
@@ -4499,14 +4387,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4545,14 +4433,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Greška: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4704,14 +4597,14 @@ msgstr "Arhive liste"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4740,259 +4633,212 @@ msgstr "Neupotrebljivi ključevi za šifrovanje"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ističe "
+"za manje od %n dan.</p>\n"
+"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ističe "
+"za manje od %n dana.</p>\n"
+"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ističe "
+"za manje od %n dana.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dan.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dan.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5006,248 +4852,201 @@ msgstr "S/MIME certifikat ističe uskoro"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ističe "
+"za manje od %n dan.</p>\n"
+"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ističe "
+"za manje od %n dana.</p>\n"
+"<p>OpenPGP ključ za</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ističe "
+"za manje od %n dana.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Korijenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dan.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Korijenski certifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"certifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dan.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Certifikat CA posrednika</p><p align=center><b>%3</b></p><p>za S/MIME "
+"certifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš S/MIME certifikat za potpisivanje</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dan.</p>\n"
+"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš S/MIME certifikat za šifrovanje</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dan.</p>\n"
-"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ističe za manje od %n dan.</p>\n"
+"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>S/MIME certifikat za</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5259,9 +5058,10 @@ msgstr "S/MIME certifikat ističe uskoro"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5269,8 +5069,8 @@ msgstr ""
 "certifikata nije upotrebljiv za šifrovanje. Molim promijenite konfiguraciju "
 "vaših ključeva i certifikata za ovaj identitet u prozoru za podešavanje "
 "identiteta.\n"
-"Ako odlučite da nastavite, a ključevi budu potrebni kasnije, bićete upitani da "
-"navedete ključeve za upotrebu."
+"Ako odlučite da nastavite, a ključevi budu potrebni kasnije, bićete upitani "
+"da navedete ključeve za upotrebu."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5284,11 +5084,12 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Jedan ili više od vaših OpenPGP ključeva za potpisivanje ili S/MIME certifikata "
-"nije upotrebljiv za potpisivanje. Molim promijenite konfiguraciju vaših "
-"ključeva i certifikata za ovaj identitet u prozoru za podešavanje identiteta.\n"
-"Ako odlučite da nastavite, a ključevi budu potrebni kasnije, bićete upitani da "
-"navedete ključeve za upotrebu."
+"Jedan ili više od vaših OpenPGP ključeva za potpisivanje ili S/MIME "
+"certifikata nije upotrebljiv za potpisivanje. Molim promijenite "
+"konfiguraciju vaših ključeva i certifikata za ovaj identitet u prozoru za "
+"podešavanje identiteta.\n"
+"Ako odlučite da nastavite, a ključevi budu potrebni kasnije, bićete upitani "
+"da navedete ključeve za upotrebu."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5298,36 +5099,36 @@ msgstr "Neupotrebljivi ključevi za potpisivanje"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Provjera postavki enkripcije primatelja je otkrila da poruka treba biti "
 "šifrovana koristeći OpenPGP, barem za neke od primatelja.\n"
 "Ali vi niste podesili ispravne OpenPGP ključeve za ovaj identitet.\n"
-"Možete nastaviti bez šifrovanja samom sebi, ali imajte na umu da ako to uradite "
-"nećete moći čitati vlastite poruke."
+"Možete nastaviti bez šifrovanja samom sebi, ali imajte na umu da ako to "
+"uradite nećete moći čitati vlastite poruke."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Provjera postavki enkripcije primatelja je otkrila da poruka treba biti "
 "šifrovana koristeći S/MIME, barem za neke od primatelja.\n"
 "Ali vi niste podesili ispravne S/MIME ključeve za ovaj identitet.\n"
-"Možete nastaviti bez šifrovanja samom sebi, ali imajte na umu da ako to uradite "
-"nećete moći čitati vlastite poruke."
+"Možete nastaviti bez šifrovanja samom sebi, ali imajte na umu da ako to "
+"uradite nećete moći čitati vlastite poruke."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5341,8 +5142,8 @@ msgstr "Ne potpisuj koristeći OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5361,8 +5162,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Provjera postavki potpisivanja primatelja je otkrila da trebate biti upitani da "
-"li želite potpisati poruku ili ne.\n"
+"Provjera postavki potpisivanja primatelja je otkrila da trebate biti upitani "
+"da li želite potpisati poruku ili ne.\n"
 "Želite li potpisati poruku?"
 
 #: keyresolver.cpp:1335
@@ -5372,11 +5173,11 @@ msgstr "Za potpisivanje"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Niste izabrali ključ kojim ćete šifrovati samim sebi (encrypt to self). Nećete "
-"moći dešifrovati vlastite poruke nakon što ih šifrujete."
+"Niste izabrali ključ kojim ćete šifrovati samim sebi (encrypt to self). "
+"Nećete moći dešifrovati vlastite poruke nakon što ih šifrujete."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5392,13 +5193,13 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Niste izabrali ključ za šifrovanje za primatelja ove poruke.Stoga poruka neće "
-"biti šifrovana."
+"Niste izabrali ključ za šifrovanje za primatelja ove poruke.Stoga poruka "
+"neće biti šifrovana."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Niste izabrali ključ za šifrovanje niti za jednog od primatelja ove poruke. "
 "Stoga poruka neće biti šifrovana."
@@ -5420,8 +5221,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Niste izabrali ključ za šifrovanje za neke od primatelja ove poruke. Ove osobe "
-"neće moći dešifrovati poruku ako je šifrujete."
+"Niste izabrali ključ za šifrovanje za neke od primatelja ove poruke. Ove "
+"osobe neće moći dešifrovati poruku ako je šifrujete."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5438,18 +5239,19 @@ msgid ""
 msgstr ""
 "Postoji problem sa ključevima za šifrovanje za \"%1\".\n"
 "\n"
-"Molim ponovo izaberite ključeve koji trebaju biti korišteni za ovog primatelja."
+"Molim ponovo izaberite ključeve koji trebaju biti korišteni za ovog "
+"primatelja."
 
 #: keyresolver.cpp:1678
 #, fuzzy
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Nije pronađen nijedan ispravan i povjerljiv ključ za \"%1\".\n"
 "\n"
@@ -5499,10 +5301,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritična greška: Ne mogu pokupiti poštu: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Ne mogu dodati poruku:\n"
+msgid "Failed to add message:\n"
+msgstr "Ne mogu dodati poruku:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5597,6 +5397,50 @@ msgstr "&Diskonektovani IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir sandučić"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Podesite temu poruke"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Pošalji kopiju na 'adresu'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Pošalji nevidljivu kopiju na 'adresu'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Dodaj 'header' poruci"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Učitaj tijelo poruke iz 'datoteke'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Podesi tijelo poruke"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Dodaj prilog poruci. Ovo može biti ponovljeno"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Samo provjeri da li ima novih poruka"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Otvori samo sastavljač poruka"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Pregledaj datu datoteku sa porukom"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Pošalji poruku na 'adresu' odg. zakači datoteku na koju pokazuje 'URL'"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mail"
@@ -5641,8 +5485,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail će sada napraviti potrebne direktorije za IMAP resurs kao poddirektorije "
-"od %1. Ako ne želite ovo, pritisnite \"Ne\" i IMAP resurs će biti isključen"
+"KMail će sada napraviti potrebne direktorije za IMAP resurs kao "
+"poddirektorije od %1. Ako ne želite ovo, pritisnite \"Ne\" i IMAP resurs će "
+"biti isključen"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5655,12 +5500,13 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"KMail će sada napraviti potrebne direktorije za IMAP resurs kao poddirektorije "
-"od %1. Ako ne želite ovo, pritisnite \"Ne\" i IMAP resurs će biti isključen"
+"KMail će sada napraviti potrebne direktorije za IMAP resurs kao "
+"poddirektorije od %1. Ako ne želite ovo, pritisnite \"Ne\" i IMAP resurs će "
+"biti isključen"
 
 #: kmailicalifaceimpl.cpp:1802
 #, fuzzy
@@ -5713,11 +5559,11 @@ msgstr "URL kopiran na clipboard."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Datoteka <b>%1</b> već postoji.<br>Želite li je zamijeniti?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Snimi u datoteku"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Zami&jeni"
 
@@ -5735,7 +5581,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5756,11 +5602,11 @@ msgstr "Datoteka ne sadrži poruku."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Datoteka sadrži više poruka. Prikazana je samo prva poruka."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5769,120 +5615,120 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Brišem poruke"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Premještam poruku %3 od %2 sa %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Nema dovoljno slobodnog prostora na disku?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Prebaci u ovaj direktorij"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiraj u ovaj direktorij"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Premještam poruke"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Brišem poruke"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Otvaram URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Da li stvarno želite pobrisati izvršiti <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "Izvrši naredbu"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nisam pronašao priloge koje bi trebalo snimiti."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Snimi priloge u"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "prilog.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "prilog.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Datoteka pod imenom %1 već postoji. Želite li je zamijeniti?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Datoteka već postoji"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 #, fuzzy
 msgid "&Overwrite"
 msgstr "Piši preko"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Dio %1 poruke je šifrovan. Želite li zadržati enkripciju prilikom snimanja?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail pitanje"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Kriptografija"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "&Nemoj šifrovati"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Dio %1 poruke je potpisan. Želite li zadržati potpis prilikom snimanja?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "&Potpis"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5891,21 +5737,21 @@ msgstr ""
 "Ne mogu zapisati datoteku %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Ne mogu pisati u datoteku %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Nema stavke u adresaru za ovu e-mail adresu. Dodajte ih u adresar i zatim "
 "dodajte adrese za instant poruke koristeći vaš omiljeni program."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5915,67 +5761,67 @@ msgstr ""
 "%1\n"
 " nije moguće odrediti s kim da razgovarate."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Izbor ključa za šifrovanje"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Mail"
@@ -6076,7 +5922,7 @@ msgstr "Veličina"
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "Sastavljač"
@@ -6089,7 +5935,7 @@ msgstr "Šifriraj"
 msgid "Sign"
 msgstr "Potpiši"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "nema priloga"
@@ -6112,9 +5958,11 @@ msgstr "Primarni primatelji"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>E-mail adrese koje ste unijeli u ovo polje će primiti kopiju e-maila.</qt>"
+"<qt>E-mail adrese koje ste unijeli u ovo polje će primiti kopiju e-maila.</"
+"qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6123,14 +5971,14 @@ msgstr "Dodatni primatelji"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>E-mail adrese koje unesete u ovo polje će primiti kopiju e-maila. Tehnički "
-"to je ista stvar kao da ste stavili sve adrese u polje <b>Za:</b> "
-"ali razlika je u tome da ono obično simbolizira da je primatelj Karbon Kopije "
-"(CC) slušalac, a ne glavni primatelj.</qt>"
+"<qt>E-mail adrese koje unesete u ovo polje će primiti kopiju e-maila. "
+"Tehnički to je ista stvar kao da ste stavili sve adrese u polje <b>Za:</b> "
+"ali razlika je u tome da ono obično simbolizira da je primatelj Karbon "
+"Kopije (CC) slušalac, a ne glavni primatelj.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6138,13 +5986,11 @@ msgstr "Skriveni primatelji"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>U suštini ista stvar kao polje <b>Kopija za:</b> "
-"ali razlika je u tome što ostali primatelji ne vide ko prima nevidljivu "
-"kopiju.</qt>"
+"<qt>U suštini ista stvar kao polje <b>Kopija za:</b> ali razlika je u tome "
+"što ostali primatelji ne vide ko prima nevidljivu kopiju.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
@@ -6156,7 +6002,7 @@ msgstr "&Sendmail"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Pošalji &kasnije"
@@ -6227,8 +6073,7 @@ msgstr "&Ukloni navodnike"
 msgid "Cl&ean Spaces"
 msgstr "&Očisti razmake"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "K&oristi fiksni font"
@@ -6373,31 +6218,31 @@ msgstr "&Kriptografski format poruke"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standardno"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Lista sa tačkama (disk)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Lista sa tačkama (kružić)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Lista sa tačkama (kocka)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Lista sa brojevima (decimalni)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Lista sa brojevima (mala slova)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Lista sa brojevima (velika slova)"
 
@@ -6501,61 +6346,61 @@ msgstr "Zatvori sastavljač"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Izgleda da se u poruci koju ste napisali spominje prilog, ali ste ga zaboravili "
-"zakačiti.\n"
+"Izgleda da se u poruci koju ste napisali spominje prilog, ali ste ga "
+"zaboravili zakačiti.\n"
 "Želite li sada priložiti neku datoteku vašoj poruci?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Podsjetnik za prilog"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Pošalji &kao što jeste"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail nije prepoznao lokaciju priloga (%1).</p>"
-"<p>Morate navesti punu stazu ako želite priložiti datoteku.</p></qt>"
+"<qt><p>KMail nije prepoznao lokaciju priloga (%1).</p><p>Morate navesti punu "
+"stazu ako želite priložiti datoteku.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Priloži datoteku"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Priloži"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Umetni datoteku"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Umetni datoteku"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Došlo je do greške dok sam pokušavao izvesti ključeve iz backenda:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Došlo je do greške dok sam pokušavao izvesti ključeve iz backenda:</"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6595,21 +6440,36 @@ msgid ""
 "View"
 msgstr "Pogledaj"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Izmijeni..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Izmijeni..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Snimi &kao..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Osobine"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Priloži datoteku..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Ne mogu pisati u datoteku %1."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -6617,281 +6477,274 @@ msgid ""
 msgstr ""
 "Dio %1 poruke je potpisan. Želite li zadržati potpis prilikom snimanja?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "&Zvuk"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Ne mogu pisati u datoteku %1."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Snimi prilog kao"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Priloži datoteku..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "ima prilog"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "bez imena"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zatražili ste da poruke budu šifrovane vama samim, ali trenutno izabrani "
-"identitet ne sadrži nijedan (OpenPGP ili S/MIME) ključ za šifrovanje koji biste "
-"koristili za ovo.</p>"
-"<p>Molim izaberite ključeve koje ćete koristiti u konfiguraciji identiteta.</p>"
-"</qt>"
+"<qt><p>Zatražili ste da poruke budu šifrovane vama samim, ali trenutno "
+"izabrani identitet ne sadrži nijedan (OpenPGP ili S/MIME) ključ za "
+"šifrovanje koji biste koristili za ovo.</p><p>Molim izaberite ključeve koje "
+"ćete koristiti u konfiguraciji identiteta.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Ključ za šifrovanje nije definisan"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kako biste mogli potpisati ovu poruku najprije trebate definisati OpenPGP "
-"ili S/MIME ključ koji će biti korišten za ovo.</p>"
-"<p>Molim izaberite ključ koji ćete koristiti u postavkama identiteta.</p></qt>"
+"<qt><p>Kako biste mogli potpisati ovu poruku najprije trebate definisati "
+"OpenPGP ili S/MIME ključ koji će biti korišten za ovo.</p><p>Molim izaberite "
+"ključ koji ćete koristiti u postavkama identiteta.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nije definisan ključ za potpisivanje"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Morate unijeti vašu e-mail adresu u polje Od:. Takođe biste trebali podesiti "
-"e-mail adresu za sve identitete, tako da je ne morate unositi za svaku poruku "
-"posebno."
+"e-mail adresu za sve identitete, tako da je ne morate unositi za svaku "
+"poruku posebno."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Morate navesti barem jednog primatelja, ili u polje Za:, ili kao CC ili BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Niste upisali temu"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Niste upisali temu"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Pošalji &kao što jeste"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Navedi temu"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Č&uvaj markup, nemoj potpisati/šifrovati"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Č&uvaj markup, nemoj šifrovati"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Č&uvaj markup, nemoj potpisati"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Potpiši/šifruj (obriši markup)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Šifruj (obriši markup)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Potpiši (obriši markup)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Nije moguće potpisivanje/šifrovanje HTML poruka u sastavu poruke.</p> "
-"<p>Želite li obrisati vaš markup?</p></qt>"
+"<qt> <p>Nije moguće potpisivanje/šifrovanje HTML poruka u sastavu poruke.</"
+"p> <p>Želite li obrisati vaš markup?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Potpiši/šifriraj poruku?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Vlastiti direktorij nacrta za identitet \"%1\" (više) ne postoji. Stoga će biti "
-"korišten uobičajeni direktorij za nacrte."
+"Vlastiti direktorij nacrta za identitet \"%1\" (više) ne postoji. Stoga će "
+"biti korišten uobičajeni direktorij za nacrte."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Molim podesite neki račun za slanje i pokušajte ponovo."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Spremam se poslati e-mail..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Potvrda slanja poruke"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Pošalji &odmah"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<primatelji>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Dodatni primatelji"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Provjera pravopisa"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Provjera pravopisa"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Provjera pravopisa prekinuta."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Provjera pravopisa zaustavljena."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Provjera pravopisa završena."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Provjera pravopisa"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Nije pronađen potpis"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Izbor ključa za šifrovanje"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Poruku je potpisao %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Poruku je potpisao %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP poruka - šifrovana"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Poruka sa temom:"
@@ -6941,8 +6794,8 @@ msgstr "Provjera pravopisa - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Ne mogu pokrenuti ISpell/Aspell. Molim provjerite da li imate ISpell ili "
 "Aspell, da li su ispravno podešeni i da li su u vašem PATHu."
@@ -6978,12 +6831,10 @@ msgstr "<qt>Previše akcija filtriranja u filter pravilu <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Nepoznata akcija filtriranja <b>%1</b>"
-"<br>u filter pravilu <b>%2</b>."
+"<qt>Nepoznata akcija filtriranja <b>%1</b><br>u filter pravilu <b>%2</b>."
 "<br>Ignoriram ga.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7206,166 +7057,138 @@ msgstr "Odsviraj zvuk"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ovo je lista definisanih filtera. Oni će biti obrađeni odozgo na dole.</p>"
-"<p>Kliknite na neki filter da ga izmijenite koristeći kontrole u desnoj "
+"<qt><p>Ovo je lista definisanih filtera. Oni će biti obrađeni odozgo na dole."
+"</p><p>Kliknite na neki filter da ga izmijenite koristeći kontrole u desnoj "
 "polovini dijaloga.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da napravite novi filter.</p>"
-"<p>On će biti ubačen odmah ispred trenutno izabranog, što uvijek možete kasnije "
-"promijeniti.</p>"
-"<p>Ako ste slučajno pritisnuli ovo dugme, možete ga poništiti klikajući na "
-"dugme <em>Obriši</em>.</p></qt>"
+"<qt><p>Kliknite na ovo dugme da napravite novi filter.</p><p>On će biti "
+"ubačen odmah ispred trenutno izabranog, što uvijek možete kasnije "
+"promijeniti.</p><p>Ako ste slučajno pritisnuli ovo dugme, možete ga "
+"poništiti klikajući na dugme <em>Obriši</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da kopirate filter.</p>"
-"<p>Ako ste slučajno pritisnuli ovo dugme, možete ga poništiti klikajući na "
-"dugme <em>Obriši</em>.</p></qt>"
+"<qt><p>Kliknite na ovo dugme da kopirate filter.</p><p>Ako ste slučajno "
+"pritisnuli ovo dugme, možete ga poništiti klikajući na dugme <em>Obriši</em>."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da <em>obrišete</em> trenutno izabrani filter sa liste "
-"gore.</p>"
-"<p>Nema načina da vratite filter kada ga jednom obrišete, ali možete uvijek "
-"izaći iz ovog dijaloga klikajući na <em>Odustani</em> "
-"da poništite napravljene izmjene.</p></qt>"
+"<qt><p>Kliknite na ovo dugme da <em>obrišete</em> trenutno izabrani filter "
+"sa liste gore.</p><p>Nema načina da vratite filter kada ga jednom obrišete, "
+"ali možete uvijek izaći iz ovog dijaloga klikajući na <em>Odustani</em> da "
+"poništite napravljene izmjene.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno mjesto "
-"<em>dolje</em> na listi iznad.</p>"
-"<p>Ovo je korisno jer redoslijed filtera na listi određuje kojim redom će oni "
-"biti izvršeni na porukama: Prvi filter na listi će prvi biti izvršen.</p>"
-"<p>Ako ste slučajno pritisnuli ovo dugme, možete poništiti njegov efekat "
-"klikanjem na dugme <em>Gore</em>.</p></qt>"
+"<qt><p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno "
+"mjesto <em>dolje</em> na listi iznad.</p><p>Ovo je korisno jer redoslijed "
+"filtera na listi određuje kojim redom će oni biti izvršeni na porukama: Prvi "
+"filter na listi će prvi biti izvršen.</p><p>Ako ste slučajno pritisnuli ovo "
+"dugme, možete poništiti njegov efekat klikanjem na dugme <em>Gore</em>.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno mjesto "
-"<em>gore</em> na listi iznad.</p>"
-"<p>Ovo je korisno jer redoslijed filtera na listi određuje kojim redom će oni "
-"biti izvršeni na porukama: Prvi filter na listi će prvi biti izvršen.</p>"
-"<p>Ako ste slučajno pritisnuli ovo dugme, možete poništiti njegov efekat "
-"klikanjem na dugme <em>Dolje</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno "
+"mjesto <em>gore</em> na listi iznad.</p><p>Ovo je korisno jer redoslijed "
+"filtera na listi određuje kojim redom će oni biti izvršeni na porukama: Prvi "
+"filter na listi će prvi biti izvršen.</p><p>Ako ste slučajno pritisnuli ovo "
+"dugme, možete poništiti njegov efekat klikanjem na dugme <em>Dolje</em>.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno mjesto "
-"<em>dolje</em> na listi iznad.</p>"
-"<p>Ovo je korisno jer redoslijed filtera na listi određuje kojim redom će oni "
-"biti izvršeni na porukama: Prvi filter na listi će prvi biti izvršen.</p>"
-"<p>Ako ste slučajno pritisnuli ovo dugme, možete poništiti njegov efekat "
-"klikanjem na dugme <em>Gore</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno "
+"mjesto <em>dolje</em> na listi iznad.</p><p>Ovo je korisno jer redoslijed "
+"filtera na listi određuje kojim redom će oni biti izvršeni na porukama: Prvi "
+"filter na listi će prvi biti izvršen.</p><p>Ako ste slučajno pritisnuli ovo "
+"dugme, možete poništiti njegov efekat klikanjem na dugme <em>Gore</em>.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno mjesto "
-"<em>dolje</em> na listi iznad.</p>"
-"<p>Ovo je korisno jer redoslijed filtera na listi određuje kojim redom će oni "
-"biti izvršeni na porukama: Prvi filter na listi će prvi biti izvršen.</p>"
-"<p>Ako ste slučajno pritisnuli ovo dugme, možete poništiti njegov efekat "
-"klikanjem na dugme <em>Gore</em>.</p></qt>"
+"<qt><p>Klikanjem na ovo dugme pomjerate trenutno izabrani filter za jedno "
+"mjesto <em>dolje</em> na listi iznad.</p><p>Ovo je korisno jer redoslijed "
+"filtera na listi određuje kojim redom će oni biti izvršeni na porukama: Prvi "
+"filter na listi će prvi biti izvršen.</p><p>Ako ste slučajno pritisnuli ovo "
+"dugme, možete poništiti njegov efekat klikanjem na dugme <em>Gore</em>.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da promijenite ime trenutno odabranog filtera.</p>"
-"<p>Filteri dobijaju imena automatski, dok god počinju sa \"<<\".</p>"
-"<p>Ako ste slučajno promijenili ime filtera i želite vratiti automatsko "
-"imenovanje, kliknite na ovo dugme i izaberite <em>Očisti</em> a zatim <em>"
-"U redu</em> u dijalogu koji dobijete.</p></qt>"
+"<qt><p>Kliknite na ovo dugme da promijenite ime trenutno odabranog filtera.</"
+"p><p>Filteri dobijaju imena automatski, dok god počinju sa \"<<\".</p><p>Ako "
+"ste slučajno promijenili ime filtera i želite vratiti automatsko imenovanje, "
+"kliknite na ovo dugme i izaberite <em>Očisti</em> a zatim <em>U redu</em> u "
+"dijalogu koji dobijete.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da prisilite prikazivanje dijaloga potvrde.</p>"
-"<p>Ovo je korisno ako ste definisali skup pravila koji označava poruku za "
-"naknadni download. Bez mogućnosti prisiljavanja dijaloga, ove poruke nikad ne "
-"bi mogle biti downloadovane ako nema drugih velikih poruka koje čekaju na "
+"<qt><p>Kliknite na ovo dugme da prisilite prikazivanje dijaloga potvrde.</"
+"p><p>Ovo je korisno ako ste definisali skup pravila koji označava poruku za "
+"naknadni download. Bez mogućnosti prisiljavanja dijaloga, ove poruke nikad "
+"ne bi mogle biti downloadovane ako nema drugih velikih poruka koje čekaju na "
 "serveru, ili ako želite izmijeniti skup pravila tako da drugačije označite "
 "poruke.</p></qt>"
 
@@ -7377,6 +7200,16 @@ msgstr "POP3 pravila filtriranja"
 msgid "Filter Rules"
 msgstr "Pravila filtriranja"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Uvezi"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Uvezi"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Dostupni filteri"
@@ -7465,6 +7298,11 @@ msgstr "Dodaj ovaj filter na meni Primijeni filter"
 msgid "Icon for this filter:"
 msgstr "Ikona za ovaj filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Za:"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Gore"
@@ -7473,16 +7311,29 @@ msgstr "Gore"
 msgid "Down"
 msgstr "Dolje"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Promijeni ime..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Novi"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopiraj u"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "obrisana"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7491,8 +7342,8 @@ msgstr "Izaberite datoteku sa zvukom"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7500,8 +7351,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Sljedeći filteri nisu snimljeni zato što su neispravni (tj. ne sadrže nijednu "
-"akciju ili nijedno pravilo za pretragu)."
+"Sljedeći filteri nisu snimljeni zato što su neispravni (tj. ne sadrže "
+"nijednu akciju ili nijedno pravilo za pretragu)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7567,29 +7418,26 @@ msgstr "Rješavanje problema sa IMAP cache-om"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Rješavanje problema sa IMAP cache-om.</b></p>"
-"<p>Ako imate problema prilikom sinhronizacije IMAP direktorija, trebate "
-"najprije pokušati ponovo napraviti indesknu datoteku. Za ovo će trebati nešto "
-"vremena, ali ova akcija ne može izazvati nikakve probleme.</p>"
-"<p>Ako ovo nije riješilo problem, možete probati sa osvježavanjem IMAP cache-a. "
-"Ako ovo uradite, izgubićete sve promjene koje ste lokalno napravili u ovom "
-"direktoriju kao i sve njegove poddirektorije.</p>"
+"<p><b>Rješavanje problema sa IMAP cache-om.</b></p><p>Ako imate problema "
+"prilikom sinhronizacije IMAP direktorija, trebate najprije pokušati ponovo "
+"napraviti indesknu datoteku. Za ovo će trebati nešto vremena, ali ova akcija "
+"ne može izazvati nikakve probleme.</p><p>Ako ovo nije riješilo problem, "
+"možete probati sa osvježavanjem IMAP cache-a. Ako ovo uradite, izgubićete "
+"sve promjene koje ste lokalno napravili u ovom direktoriju kao i sve njegove "
+"poddirektorije.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7626,8 +7474,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7650,9 +7498,10 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Da li ste sigurni da želite osvježiti IMAP cache direktorija %1 i svih njegovih "
-"poddirektorija?\n"
-"Ovo će poništiti sve izmjene koje ste lokalno napravili na vašim direktorijima"
+"Da li ste sigurni da želite osvježiti IMAP cache direktorija %1 i svih "
+"njegovih poddirektorija?\n"
+"Ovo će poništiti sve izmjene koje ste lokalno napravili na vašim "
+"direktorijima"
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7668,11 +7517,11 @@ msgstr "Indeks ovog direktorija je ponovo napravljen."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Direktorij %1 nije u inicijalnom sinh. stanju (stanje je bilo %2). Želite li ga "
-"resetovati u inicijalno sinh. stanje i svejedno sinhronizovati?"
+"Direktorij %1 nije u inicijalnom sinh. stanju (stanje je bilo %2). Želite li "
+"ga resetovati u inicijalno sinh. stanje i svejedno sinhronizovati?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7802,13 +7651,10 @@ msgstr "Pravim poddirektorije na serveru"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Izgleda da je direktorij <b>%1</b> obrisan. Želite li ga obrisati sa "
+"<qt> <p>Izgleda da je direktorij <b>%1</b> obrisan. Želite li ga obrisati sa "
 "servera?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
@@ -7830,12 +7676,10 @@ msgstr "Dobavljam listu direktorija"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Izgleda da je direktorij <b>%1</b> obrisan. Želite li ga obrisati sa "
+"<qt> <p>Izgleda da je direktorij <b>%1</b> obrisan. Želite li ga obrisati sa "
 "servera?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7844,14 +7688,14 @@ msgstr "Prekinuto"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7865,11 +7709,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7878,15 +7722,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Pr&emjesti u"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "&Nemoj potpisati"
@@ -7901,8 +7750,7 @@ msgstr "Premjesti poruku u direktorij"
 msgid "Permissions (ACL)"
 msgstr "Dozvole"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Općenito"
@@ -7927,8 +7775,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Koristi vlastite &ikone"
@@ -7948,14 +7795,13 @@ msgstr "Ignoriši novu poštu u ovom direktoriju"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7969,9 +7815,9 @@ msgstr "Čuvaj odgovore u ovom direktoriju"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Uključite ovu opciju ako želite da odgovori koje pišete na poruke u ovom "
 "direktoriju budu ostavljene u istom direktoriju nakon slanja, umjesto u "
@@ -7986,17 +7832,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Prelomi &riječ na koloni:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Postavi za podrazumjevano"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Pošiljalac"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Primatelj"
@@ -8008,11 +7858,11 @@ msgstr "Identite&t pošiljaoca:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -8031,12 +7881,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -8070,23 +7920,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Podesili ste ovaj direktorij tako da sadrži groupware informacije, a aktivna je "
-"generalna opcija za sakrivanje groupware direktorija. To znači da će ovaj "
-"direktorij nestati kada zatvorite konfiguracioni prozor. Ako želite da ponovo "
-"uklonite direktorij, moraćete privremeno isključiti sakrivanje groupware "
-"direktorija kako biste ga mogli vidjeti."
+"Podesili ste ovaj direktorij tako da sadrži groupware informacije, a aktivna "
+"je generalna opcija za sakrivanje groupware direktorija. To znači da će ovaj "
+"direktorij nestati kada zatvorite konfiguracioni prozor. Ako želite da "
+"ponovo uklonite direktorij, moraćete privremeno isključiti sakrivanje "
+"groupware direktorija kako biste ga mogli vidjeti."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8156,7 +8006,8 @@ msgstr "Greška prilikom dobavljanja informacija o direktoriju."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Indeks poruke '%1' je od neke nepoznate verzije KMail-a (%2).\n"
 "Ovaj indeks može biti ponovo napravljen iz vašeg mail direktorija, ali neki "
@@ -8189,8 +8040,8 @@ msgstr "Greška prilikom otvaranja %1; direktorij nedostaje."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Greška prilikom otvaranja %1. Ili ovo nije ispravan maildir direktorij ili "
 "nemate privilegije za pristup."
@@ -8235,21 +8086,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Indeks direktorija '%2' djeluje kao da je zastario. Da bismo spriječili "
-"oštećenje poruka, indeks će biti ponovo generisan. Kao rezultat, obrisane "
-"poruke se mogu ponovo pojaviti, a statusne oznake mogu biti izgubljene.</p> "
-"<p>Molim pročitajte odgovarajuće poglavlje u <a href=\"%1\">"
-"FAQ dijelu priručnika za KMail</a> za informacije o tome kako spriječiti "
-"ponovno javljanje ovog problema.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>Indeks direktorija '%2' djeluje kao da je zastario. Da bismo "
+"spriječili oštećenje poruka, indeks će biti ponovo generisan. Kao rezultat, "
+"obrisane poruke se mogu ponovo pojaviti, a statusne oznake mogu biti "
+"izgubljene.</p> <p>Molim pročitajte odgovarajuće poglavlje u <a href="
+"\"%1\">FAQ dijelu priručnika za KMail</a> za informacije o tome kako "
+"spriječiti ponovno javljanje ovog problema.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8310,7 +8158,7 @@ msgstr ""
 "Izgleda da '%1' nije direktorij.\n"
 "Molim sklonite tu datoteku."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8318,7 +8166,7 @@ msgstr ""
 "Privilegije direktorija '%1' nisu ispravne.\n"
 "Molim provjerite da li možete gledati i mijenjati sadržaj ovog direktorija."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8328,8 +8176,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8337,7 +8185,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Ne mogu napraviti direktorij"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8440,9 +8288,9 @@ msgstr "&Rješavanje problema sa IMAP Cache-om..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8594,17 +8442,17 @@ msgstr "%1 Direktorij je samo za čitanje."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Da li stvarno želite obrisati %n izabranu poruku?"
-"<br>Kada ih jednom obrišete, više ih ne možete vratiti.</qt>\n"
-"<qt>Da li stvarno želite obrisati %n izabrane poruke?"
-"<br>Kada ih jednom obrišete, više ih ne možete vratiti.</qt>\n"
-"<qt>Da li stvarno želite obrisati %n izabranih poruka?"
-"<br>Kada ih jednom obrišete, više ih ne možete vratiti.</qt>"
+"<qt>Da li stvarno želite obrisati %n izabranu poruku?<br>Kada ih jednom "
+"obrišete, više ih ne možete vratiti.</qt>\n"
+"<qt>Da li stvarno želite obrisati %n izabrane poruke?<br>Kada ih jednom "
+"obrišete, više ih ne možete vratiti.</qt>\n"
+"<qt>Da li stvarno želite obrisati %n izabranih poruka?<br>Kada ih jednom "
+"obrišete, više ih ne možete vratiti.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8660,126 +8508,125 @@ msgstr ""
 "Greška pri izmjeni %1\n"
 "(Nema prostora na uređaju?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Zahtjev za potpis certifikata"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Molim napravite certifikat iz priloga i vratite pošiljaocu."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nemate odgovarajuće privilegije za pristup vašem inbox direktoriju."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "outbox"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nemate odgovarajuće privilegije za pristup vašem outbox direktoriju."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "poslana-pošta"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Nemate odgovarajuće privilegije za pristup vašem direktoriju poslana-pošta."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "smeće"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nemate odgovarajuće privilegije za pristup vašem direktoriju smeće."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "nacrti"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nemate odgovarajuće privilegije za pristup vašem direktoriju nacrti."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "Zami&jeni"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nemate odgovarajuće privilegije za pristup vašem direktoriju smeće."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Posljednja pretraga"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail je izazvao fatalnu grešku i sada će završiti s radom"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8790,11 +8637,11 @@ msgstr ""
 "Greška je:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Da li ste sigurni da želite isprazniti direktorije sa smećem za sve račune?"
@@ -8878,8 +8725,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Stigla je nova pošta</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8898,8 +8744,8 @@ msgstr "Ovaj direktorij nema podešenu opciju za brisanje starih poruka"
 #: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite brisati stare poruke u direktoriju <b>%1</b>"
-"?</qt>"
+"<qt>Da li ste sigurni da želite brisati stare poruke u direktoriju <b>%1</b>?"
+"</qt>"
 
 #: kmmainwidget.cpp:1133
 msgid "Expire Folder"
@@ -8919,11 +8765,11 @@ msgstr "Da li ste sigurni da želite isprazniti direktorij sa smećem?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite premjestiti sve poruke iz direktorija <b>%1</b> "
-"u smeće?</qt>"
+"<qt>Da li ste sigurni da želite premjestiti sve poruke iz direktorija <b>%1</"
+"b> u smeće?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8949,11 +8795,11 @@ msgstr "Obriši direktorij"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite obrisati direktorij pretrage <b>%1</b>"
-"? Poruke prikazane u njemu neće biti obrisane ako to uradite, pošto se one "
+"<qt>Da li ste sigurni da želite obrisati direktorij pretrage <b>%1</b>? "
+"Poruke prikazane u njemu neće biti obrisane ako to uradite, pošto se one "
 "ustvari nalaze u drugom direktoriju.</qt>"
 
 #: kmmainwidget.cpp:1214
@@ -8968,37 +8814,40 @@ msgstr ""
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite obrisati prazan direktorij <b>%1</b> "
-"i sve njegove poddirektorije? Ovi poddirektoriji možda nisu prazni, tako da će "
+"<qt>Da li ste sigurni da želite obrisati prazan direktorij <b>%1</b> i sve "
+"njegove poddirektorije? Ovi poddirektoriji možda nisu prazni, tako da će "
 "njihovim sadržaj takođe biti izgubljen.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite obrisati direktorij <b>%1</b>"
-", zajedno sa njegovim sadržajem?</qt>"
+"<qt>Da li ste sigurni da želite obrisati direktorij <b>%1</b>, zajedno sa "
+"njegovim sadržajem?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite obrisati direktorij <b>%1</b> "
-"i sve poddirektorije, zajedno sa njihovim sadržajem?</qt>"
+"<qt>Da li ste sigurni da želite obrisati direktorij <b>%1</b> i sve "
+"poddirektorije, zajedno sa njihovim sadržajem?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "obrisana"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -9015,13 +8864,13 @@ msgstr "Da li ste sigurni da želite pobrisati sve stare poruke?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Upotreba HTMLa u porukama vas čini ranjivijim na \"spam\" i može povećati "
-"vjerovatnoću da vaš sistem bude ugrožen drugim sadašnjim i budućim sigurnosnim "
-"zloupotrebama."
+"vjerovatnoću da vaš sistem bude ugrožen drugim sadašnjim i budućim "
+"sigurnosnim zloupotrebama."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -9035,12 +8884,12 @@ msgstr "Koristi HTML"
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Upotreba HTMLa u porukama vas čini ranjivijim na \"spam\" i može povećati "
-"vjerovatnoću da vaš sistem bude ugrožen drugim sadašnjim i budućim sigurnosnim "
-"zloupotrebama."
+"vjerovatnoću da vaš sistem bude ugrožen drugim sadašnjim i budućim "
+"sigurnosnim zloupotrebama."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -9056,8 +8905,8 @@ msgstr "Filter na mailing-listu %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMailova funkcija automatskog odgovora zasnovana je na filtriranju na strani "
@@ -9075,11 +8924,13 @@ msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
 msgstr ""
-"Ne mogu pokrenuti upravitelj certifikatima. Molim provjerite vašu instalaciju."
+"Ne mogu pokrenuti upravitelj certifikatima. Molim provjerite vašu "
+"instalaciju."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Ne mogu pokrenuti GnuPG preglednik dnevnika (kwatchgnupg). Molim provjerite "
 "vašu instalaciju."
@@ -9424,8 +9275,7 @@ msgstr "Snimi pri&loge..."
 msgid "Appl&y All Filters"
 msgstr "Primijeni &filtere"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Primijeni &filter"
@@ -9542,7 +9392,6 @@ msgstr "Sljedeća &nepročitana poruka"
 msgid "Go to the next unread message"
 msgstr "Idi na sljedeću nepročitanu poruku"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Prethodna poruka"
@@ -9687,8 +9536,8 @@ msgstr " Inicijalizacija..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9699,23 +9548,23 @@ msgstr ""
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Ova poruka sadrži zahtjev za slanje obavještenja o stanju poruke.\n"
-"Ona sadrži procesnu instrukciju koja je označena kao \"obavezna\", ali KMail ne "
-"zna ništa o tome.\n"
-"Možete ili ignorisati taj zahtjev ili dozvoliti KMailu da odgovor da je poruka "
-"\"neuspješna\"."
+"Ona sadrži procesnu instrukciju koja je označena kao \"obavezna\", ali KMail "
+"ne zna ništa o tome.\n"
+"Možete ili ignorisati taj zahtjev ili dozvoliti KMailu da odgovor da je "
+"poruka \"neuspješna\"."
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9728,8 +9577,8 @@ msgstr ""
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9742,16 +9591,16 @@ msgstr ""
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ova poruka sadrži zahtjev za slanje obavještenja o stanju poruke,\n"
-"ali \"return-path\" adresa se razlikuje od adrese na koju je zatraženo slanje "
-"obavještenja.\n"
+"ali \"return-path\" adresa se razlikuje od adrese na koju je zatraženo "
+"slanje obavještenja.\n"
 "Možete ili ignorisati taj zahtjev ili dozvoliti KMailu da pošalje običan "
 "odgovor ili odgovor da je poruka \"odbijena\"."
 
@@ -9779,17 +9628,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Potvrda: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Prilog: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Prikaži priloge kako je pošiljalac sugerisao."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9839,46 +9688,38 @@ msgstr "Svojstva dijela poruke"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME tip</em> datoteke:</p>"
-"<p>Obično ne trebate dirati ovu postavku, pošto je tip datoteke automatski "
-"određen. Ali ponekad, %1 možda neće ispravno odrediti tip. Ovdje to možete "
-"popraviti.</p></qt>"
+"<qt><p><em>MIME tip</em> datoteke:</p><p>Obično ne trebate dirati ovu "
+"postavku, pošto je tip datoteke automatski određen. Ali ponekad, %1 možda "
+"neće ispravno odrediti tip. Ovdje to možete popraviti.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Veličina dijela:</p>"
-"<p>Ponekad %1 ovdje daje samo procjenjenu veličinu, pošto bi računanje tačne "
-"veličine trajalo previše. Ako je ovo slučaj, to će biti prikazano dodajući "
-"\"(proc.)\" na prikazanu veličinu.</p></qt>"
+"<qt><p>Veličina dijela:</p><p>Ponekad %1 ovdje daje samo procjenjenu "
+"veličinu, pošto bi računanje tačne veličine trajalo previše. Ako je ovo "
+"slučaj, to će biti prikazano dodajući \"(proc.)\" na prikazanu veličinu.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Datotečno ime dijela poruke:</p>"
-"<p>Iako je ovo obično naziv priključene datoteke, ono ne određuje datoteku koja "
-"će biti priključena. Umjesto toga, ono predlaže ime za datoteku koje će "
-"koristiti mail klijent primatelja prilikom snimanja dijela poruke na disk.</p>"
-"</qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
+msgstr ""
+"<qt><p>Datotečno ime dijela poruke:</p><p>Iako je ovo obično naziv "
+"priključene datoteke, ono ne određuje datoteku koja će biti priključena. "
+"Umjesto toga, ono predlaže ime za datoteku koje će koristiti mail klijent "
+"primatelja prilikom snimanja dijela poruke na disk.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9886,17 +9727,15 @@ msgstr "&Opis:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Opis dijela poruke:</p>"
-"<p>Ovo je čisto informativni opis dijela poruke, slično kao što je Tema za "
-"cijelu poruku. Većina e-mail klijenata će prikazati ovu informaciju prilikom "
-"pregleda poruke pored ikone priloga.</p></qt>"
+"<qt><p>Opis dijela poruke:</p><p>Ovo je čisto informativni opis dijela "
+"poruke, slično kao što je Tema za cijelu poruku. Većina e-mail klijenata će "
+"prikazati ovu informaciju prilikom pregleda poruke pored ikone priloga.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9904,23 +9743,21 @@ msgstr "&Kodiranje:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Transportno kodiranje dijela poruke:</p>"
-"<p>U normalnim okolnostima ne trebate ovo mijenjati, pošto će %1 koristiti "
-"odgovarajuće podrazumjevano kodiranje, ovisno o MIME tipu. Ipak, ponekad možete "
-"znatno smanjiti veličinu rezultujuće poruke npr. ako PostScript datoteka ne "
-"sadrži binarne podatke, nego se sastoji od čistog teksta. U tom slučaju, "
-"birajući \"quoted printable\" umjesto podrazumjevanog \"base64\" će uštediti do "
-"25% veličine rezultujuće poruke.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Transportno kodiranje dijela poruke:</p><p>U normalnim okolnostima ne "
+"trebate ovo mijenjati, pošto će %1 koristiti odgovarajuće podrazumjevano "
+"kodiranje, ovisno o MIME tipu. Ipak, ponekad možete znatno smanjiti veličinu "
+"rezultujuće poruke npr. ako PostScript datoteka ne sadrži binarne podatke, "
+"nego se sastoji od čistog teksta. U tom slučaju, birajući \"quoted printable"
+"\" umjesto podrazumjevanog \"base64\" će uštediti do 25% veličine "
+"rezultujuće poruke.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9928,20 +9765,17 @@ msgstr "Predloži &automatsko prikazivanje"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Uključite ovu opciju ako želite predložiti primatelju da prikaže ovaj dio "
-"automatski (inline) pri pregledu poruke, umjesto uobičajenog prikaza ikone. </p>"
-"<p>Tehnički, ovo se izvodi podešavajući polje <em>Content-Disposition</em> "
-"u zaglavlju ovog dijela na \"inline\" umjesto uobičajenog \"attachment\".</p>"
-"</qt>"
+"<qt><p>Uključite ovu opciju ako želite predložiti primatelju da prikaže ovaj "
+"dio automatski (inline) pri pregledu poruke, umjesto uobičajenog prikaza "
+"ikone. </p><p>Tehnički, ovo se izvodi podešavajući polje <em>Content-"
+"Disposition</em> u zaglavlju ovog dijela na \"inline\" umjesto uobičajenog "
+"\"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9949,15 +9783,13 @@ msgstr "&Potpiši ovaj dio"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Uključite ovu opciju ako želite da ovaj dio poruke bude potpisan.</p>"
-"<p>Potpis će biti napravljen sa ključem koji ste pridružili trenutno izabranom "
-"identitetu.</p></qt>"
+"<qt><p>Uključite ovu opciju ako želite da ovaj dio poruke bude potpisan.</"
+"p><p>Potpis će biti napravljen sa ključem koji ste pridružili trenutno "
+"izabranom identitetu.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9965,13 +9797,11 @@ msgstr "Ši&friraj ovaj dio"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Uključite ovu opciju ako želite da ovaj dio poruke bude šifrovan.</p>"
-"<p>Dio će biti šifrovan za primatelje ove poruke</p></qt>"
+"<qt><p>Uključite ovu opciju ako želite da ovaj dio poruke bude šifrovan.</"
+"p><p>Dio će biti šifrovan za primatelje ove poruke</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9985,15 +9815,12 @@ msgstr "POP filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Poruke za filtriranje pronađene na POP računu: <b>%1</b>"
-"<p>Prikazane poruke prelaze granicu maksimalne veličine koju ste definisali za "
-"ovaj račun."
+"Poruke za filtriranje pronađene na POP računu: <b>%1</b><p>Prikazane poruke "
+"prelaze granicu maksimalne veličine koju ste definisali za ovaj račun."
 "<br>Možete izabrati šta želite uraditi s njima birajući odgovarajuće dugme."
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -10248,15 +10075,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -10266,18 +10092,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10285,17 +10110,15 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2>Dobro došli u KMail %1</h2>"
-"<p>KMail je email aplikacija za TDE. Ona je dizajnirana tako da bude potpuno "
-"sukladna standardima za Internet poštu, među kojima su MIME, SMTP, POP3 i "
-"IMAP.</p>\n"
-"<ul>"
-"<li>KMail ima mnoge napredne mogućnosti opisane u <a href=\"%2\">"
-"dokumentaciji</a></li>\n"
-"<li><a href=\"%3\">KMail stranica</A> vam pruža informacije o novim verzijama "
-"KMail-a</li></ul>\n"
-"<p><span style='font-size:125%; font-weight:bold;'>Važne izmjene</span> "
-"(u poređenju sa KMail-om %8):</p>\n"
+"<h2>Dobro došli u KMail %1</h2><p>KMail je email aplikacija za TDE. Ona je "
+"dizajnirana tako da bude potpuno sukladna standardima za Internet poštu, "
+"među kojima su MIME, SMTP, POP3 i IMAP.</p>\n"
+"<ul><li>KMail ima mnoge napredne mogućnosti opisane u <a href="
+"\"%2\">dokumentaciji</a></li>\n"
+"<li><a href=\"%3\">KMail stranica</A> vam pruža informacije o novim "
+"verzijama KMail-a</li></ul>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Važne izmjene</span> (u "
+"poređenju sa KMail-om %8):</p>\n"
 "<ul>\n"
 "%9</ul>\n"
 "<p>Neke od novih mogućnosti u ovoj verziji KMaila uključuju (u poređenju sa "
@@ -10308,20 +10131,18 @@ msgstr ""
 "<p>&nbsp; &nbsp; KMail Team</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Molim odvojite malo vremena za popunjavanje KMail panela za podešavanje koji "
-"se nalazi pod Postavke-&gt;Podesi KMail.\n"
+"<p>Molim odvojite malo vremena za popunjavanje KMail panela za podešavanje "
+"koji se nalazi pod Postavke-&gt;Podesi KMail.\n"
 "Trebaćete napraviti najmanje jedan podrazumjevani identitet, te po jedan "
 "dolazni i odlazni mail račun.</p>\n"
 
@@ -10360,7 +10181,8 @@ msgstr "Pogledaj prilog: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Prilog sadrži binarne podatke. Pokušavam prikazati prvih %n znak.]\n"
@@ -10389,12 +10211,14 @@ msgstr "Otvori prilog?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10416,6 +10240,71 @@ msgstr "(nađi bilo šta od navedenog)"
 msgid "(match all of the following)"
 msgstr "(nađi sve od navedenog)"
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "Spreman."
+
+#: kmsearchpattern.h:222
+#, fuzzy
+msgid "Old"
+msgstr "stara"
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "obrisana"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "odgovorena"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "proslijeđena"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "Stavi u &red za slanje"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "poslana"
+
+#: kmsearchpattern.h:228
+#, fuzzy
+msgid "Watched"
+msgstr "nadgledana"
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "ignorisana"
+
+#: kmsearchpattern.h:230
+#, fuzzy
+msgid "Spam"
+msgstr "spam"
+
+#: kmsearchpattern.h:231
+#, fuzzy
+msgid "Ham"
+msgstr "ham"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Za: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "prilog"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10502,10 +10391,10 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Prebacivanje poslane poruke \"%1\" iz \"outbox\" direktorija u direktorij "
 "\"poslana-pošta\" nije uspjelo.\n"
@@ -10515,8 +10404,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Nije moguće poslati poruke bez navođenja adrese pošiljaoca.\n"
 "Molim podesite e-mail adresu identiteta '%1' u odjeljku Identiteti "
@@ -10546,8 +10435,8 @@ msgstr "Pokrećem proces za slanje..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10573,15 +10462,16 @@ msgstr "Nisam mogao poslati (neke od) poredanih poruka."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Slanje prekinuto:\n"
 "%1\n"
-"Poruka će ostati u direktoriju 'outbox' sve dok ili ne popravite problem (npr. "
-"neispravna adresa) ili ne uklonite poruku iz 'outbox' direktorija.\n"
+"Poruka će ostati u direktoriju 'outbox' sve dok ili ne popravite problem "
+"(npr. neispravna adresa) ili ne uklonite poruku iz 'outbox' direktorija.\n"
 "Korišten je sljedeći transportni protokol:\n"
 "  %2"
 
@@ -10591,20 +10481,17 @@ msgstr "Slanje prekinuto."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Slanje nije uspjelo:</p>"
-"<p>%1</p>"
-"<p>Poruka će ostati u direktoriju 'outbox' sve dok ili ne popravite problem "
-"(npr. neispravna adresa) ili ne uklonite poruku iz 'outbox' direktorija.</p>"
-"<p>Korišten je sljedeći transportni protokol:  %2</p> "
-"<p>Želite li da nastavim sa slanjem preostalih poruka?</p>"
+"<p>Slanje nije uspjelo:</p><p>%1</p><p>Poruka će ostati u direktoriju "
+"'outbox' sve dok ili ne popravite problem (npr. neispravna adresa) ili ne "
+"uklonite poruku iz 'outbox' direktorija.</p><p>Korišten je sljedeći "
+"transportni protokol:  %2</p> <p>Želite li da nastavim sa slanjem preostalih "
+"poruka?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10622,15 +10509,16 @@ msgstr "&Prekini slanje"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Slanje nije uspjelo:\n"
 "%1\n"
-"Poruka će ostati u direktoriju 'outbox' sve dok ili ne popravite problem (npr. "
-"neispravna adresa) ili ne uklonite poruku iz 'outbox' direktorija.\n"
+"Poruka će ostati u direktoriju 'outbox' sve dok ili ne popravite problem "
+"(npr. neispravna adresa) ili ne uklonite poruku iz 'outbox' direktorija.\n"
 "Korišten je sljedeći transportni protokol:\n"
 "  %2"
 
@@ -10670,9 +10558,9 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "Izgleda da je %1 već pokrenut na drugom display-u ovog istog računara. "
 "Višestruko pokretanje %2 može izazvati gubitak poruka. Ne biste trebali "
@@ -10680,19 +10568,19 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"Izgleda da je pokrenut %1 na drugom display-u ovog istog računara. Istovremeno "
-"pokretanje %1 i %2 može izazvati gubitak poruka. Ne biste trebali pokretati %2 "
-"ako niste sigurni da %1 nije pokrenut."
+"Izgleda da je pokrenut %1 na drugom display-u ovog istog računara. "
+"Istovremeno pokretanje %1 i %2 može izazvati gubitak poruka. Ne biste "
+"trebali pokretati %2 ako niste sigurni da %1 nije pokrenut."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "Izgleda da je %1 već pokrenut na %2. Višestruko pokretanje %1 može izazvati "
 "gubitak poruka. Ne biste trebali pokretati %1 na ovom računaru ako niste "
@@ -10700,9 +10588,9 @@ msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "Izgleda da je %1 već pokrenut na %3. Istovremeno pokretanje %1 i %2 može "
 "izazvati gubitak poruka. Ne biste trebali pokretati %2 na ovom računaru ako "
@@ -10717,6 +10605,10 @@ msgstr "Pokreni %1"
 msgid "Exit"
 msgstr "Izađi"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nove poruke u"
@@ -10746,14 +10638,15 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Uključite ovu opciju ako želite da KMail čuva SMTP šifru u svojoj "
-"konfiguracijskoj datoteci. Šifra se čuva u nečitljivom obliku, ali je ne treba "
-"smatrati sigurnom od pokušaja dešifrovanja u slučaju da neko dobije pristup "
-"konfiguracijskoj datoteci."
+"konfiguracijskoj datoteci. Šifra se čuva u nečitljivom obliku, ali je ne "
+"treba smatrati sigurnom od pokušaja dešifrovanja u slučaju da neko dobije "
+"pristup konfiguracijskoj datoteci."
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
 #, fuzzy
@@ -10833,11 +10726,12 @@ msgstr "Server &traži potvrdu autentičnosti"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Uključite ovu opciju ako vaš SMTP server traži da potvrdite vaš identitet prije "
-"prihvatanja pošte. Ovo je poznato kao 'Authenticated SMTP' ili kraće ASMTP."
+"Uključite ovu opciju ako vaš SMTP server traži da potvrdite vaš identitet "
+"prije prihvatanja pošte. Ovo je poznato kao 'Authenticated SMTP' ili kraće "
+"ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10858,15 +10752,14 @@ msgstr "Poša&lji vlastito ime računara serveru"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Uključite ovu opciju ako želite da KMail, kada se identificira mail serveru, "
-"koristi neko posebno ime računara (hostname). "
-"<p> Ovo je korisno ako vaš sistemski hostname nije ispravno podešen ili ako "
-"želite sakriti stvarni hostname vašeg računara."
+"koristi neko posebno ime računara (hostname). <p> Ovo je korisno ako vaš "
+"sistemski hostname nije ispravno podešen ili ako želite sakriti stvarni "
+"hostname vašeg računara."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10897,8 +10790,8 @@ msgstr "Samo su lokalne datoteke dozvoljene."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Domensko ime ili numerička adresa SMTP servera."
 
 #: kmtransport.cpp:788
@@ -10912,10 +10805,10 @@ msgstr "Greška prilikom listanja direktorija %1:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10990,8 +10883,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail nije mogao otkriti mailing listu u ovom direktoriju. Molim ručno unesite "
-"potrebne adrese."
+"KMail nije mogao otkriti mailing listu u ovom direktoriju. Molim ručno "
+"unesite potrebne adrese."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -11148,35 +11041,27 @@ msgstr "&Edituj poruku"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Informacije o strukturi koje je vratio kripto dodatak nisu mogle biti "
-"ispravno obrađene; možda je dodatak oštećen.</p> "
-"<p>Molim kontaktirajte vašeg sistemskog administratora.</p></qt>"
+"<qt> <p>Informacije o strukturi koje je vratio kripto dodatak nisu mogle "
+"biti ispravno obrađene; možda je dodatak oštećen.</p> <p>Molim kontaktirajte "
+"vašeg sistemskog administratora.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Nije pronađen nijedan aktivan kripto dodatak, a ugrađeni OpenPGP kôd ne radi "
-"ispravno.</p> "
-"<p>Možete uraditi dvije stvari da ovo popravite:</p> "
-"<ul> "
-"<li><em>ili</em> aktivirajte dodatak koristeći Postavke->Podesi KMail->"
-"Dijalog za dodatke.</li> "
-"<li><em>ili</em> navedite tradicionalne OpenPGP postavke u kartici Identitet->"
-"Napredno istog dijaloga.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Nije pronađen nijedan aktivan kripto dodatak, a ugrađeni OpenPGP kôd ne "
+"radi ispravno.</p> <p>Možete uraditi dvije stvari da ovo popravite:</p> <ul> "
+"<li><em>ili</em> aktivirajte dodatak koristeći Postavke->Podesi KMail-"
+">Dijalog za dodatke.</li> <li><em>ili</em> navedite tradicionalne OpenPGP "
+"postavke u kartici Identitet->Napredno istog dijaloga.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11188,8 +11073,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -11204,14 +11089,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Inline OpenPGP format kripto poruke ne podržava šifrovanje ili potpisivanje "
@@ -11237,8 +11122,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Provjera postavki potpisivanja primatelja je otkrila da trebate biti upitani da "
-"li želite potpisati poruku ili ne.\n"
+"Provjera postavki potpisivanja primatelja je otkrila da trebate biti upitani "
+"da li želite potpisati poruku ili ne.\n"
 "Želite li potpisati poruku?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11328,12 +11213,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Provjera postavki enkripcije primatelja je otkrila da trebate biti upitani da "
-"li želite šifrovati ovu poruku ili ne.\n"
+"Provjera postavki enkripcije primatelja je otkrila da trebate biti upitani "
+"da li želite šifrovati ovu poruku ili ne.\n"
 "Želite li šifrovati poruku?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11366,11 +11251,12 @@ msgstr "&Nemoj šifrovati"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Zatražili ste da šifrujete ovu poruku kao i da šifrujete kopiju samom sebi, ali "
-"za ovaj identitet nije konfigurisan nijedan ispravan provjerljiv ključ "
+"Zatražili ste da šifrujete ovu poruku kao i da šifrujete kopiju samom sebi, "
+"ali za ovaj identitet nije konfigurisan nijedan ispravan provjerljiv ključ "
 "enkripcije."
 
 #: messagecomposer.cpp:930
@@ -11381,13 +11267,13 @@ msgstr "Snimi &nešifrovano"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Neki dijelovi ove poruke neće biti šifrovani.\n"
-"Slanje samo djelomično šifrovanih poruka bi moglo prekršiti politiku sajta "
-"i/ili procuriti osjetljive informacije.\n"
+"Slanje samo djelomično šifrovanih poruka bi moglo prekršiti politiku sajta i/"
+"ili procuriti osjetljive informacije.\n"
 "Da li da umjesto toga šifrujem sve dijelove?"
 
 #: messagecomposer.cpp:950
@@ -11410,52 +11296,46 @@ msgstr "Š&ifruj sve dijelove"
 msgid "Unencrypted Message Warning"
 msgstr "Upozorenje o nešifrovanoj poruci"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Greška: Dodatak nije vratio kodirane podatke.</p>"
-"<p>Molim prijavite ovaj bug:"
-"<br>%2</p></qt>"
+"<qt><p>Greška: Dodatak nije vratio kodirane podatke.</p><p>Molim prijavite "
+"ovaj bug:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Svi znakovi se ne uklapaju u odabrano kodiranje."
-"<br>"
-"<br>Svejedno pošalji poruku?</qt>"
+"<qt>Svi znakovi se ne uklapaju u odabrano kodiranje.<br><br>Svejedno pošalji "
+"poruku?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Neki znakovi će biti izgubljeni"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Izgubi znakove"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Promijeni kodiranje"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Ova poruka nije mogla biti potpisana, pošto izgleda da izabrani backend ne "
 "podržava potpisivanje. Ovo se u biti ne bi trebalo desiti nikad, molim "
 "prijavite ovaj bug."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11464,38 +11344,39 @@ msgstr ""
 "podržava potpisivanje. Ovo se u biti ne bi trebalo desiti nikad, molim "
 "prijavite ovaj bug."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Ova poruka nije mogla biti šifrovana, pošto izgleda da izabrani backend ne "
-"podržava šifrovanje. Ovo se u biti nikad ne bi trebalo desiti, molim prijavite "
-"ovaj bug."
+"podržava šifrovanje. Ovo se u biti nikad ne bi trebalo desiti, molim "
+"prijavite ovaj bug."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Ova poruka nije mogla biti potpisana i šifrovana, pošto izgleda da izabrani "
-"backend ne podržava istovremeno potpisivanje i šifrovanje. Ovo se u biti nikad "
-"ne bi trebalo desiti, molim prijavite ovaj bug."
+"backend ne podržava istovremeno potpisivanje i šifrovanje. Ovo se u biti "
+"nikad ne bi trebalo desiti, molim prijavite ovaj bug."
 
 #: newfolderdialog.cpp:59
 #, fuzzy
@@ -11518,10 +11399,10 @@ msgstr "&Format sandučića:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11532,8 +11413,8 @@ msgstr "&Sadržaj direktorija:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11577,8 +11458,7 @@ msgstr "Različiti rezultati za potpise"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Kripto dodatak nije vratio podatke u vidu čistog teksta."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11607,11 +11487,11 @@ msgstr "Nije pronađen %1 dodatak."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Poruka je potpisana, ali ispravnost potpisa ne može biti potvrđena.<br />"
-"Razlog: %1"
+"Poruka je potpisana, ali ispravnost potpisa ne može biti potvrđena.<br /"
+">Razlog: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11648,27 +11528,27 @@ msgstr "Kripto dodatak \"%1\" ne može dešifrovati poruke."
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Napomena:</b> Ovo je HTML poruka. Iz sigurnosnih razloga, prikazan je samo "
-"sirovi HTML kod. Ako vjerujete pošiljaocu ove poruke onda možete aktivirati "
-"formatirani HTML prikaz za ovu poruku klikajući <a href=\"kmail:showHTML\">"
-"ovdje</a>."
+"<b>Napomena:</b> Ovo je HTML poruka. Iz sigurnosnih razloga, prikazan je "
+"samo sirovi HTML kod. Ako vjerujete pošiljaocu ove poruke onda možete "
+"aktivirati formatirani HTML prikaz za ovu poruku klikajući <a href=\"kmail:"
+"showHTML\">ovdje</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Napomena:</b> Ovo je HTML poruka. Iz sigurnosnih razloga, prikazan je samo "
-"sirovi HTML kod. Ako vjerujete pošiljaocu ove poruke onda možete aktivirati "
-"formatirani HTML prikaz za ovu poruku klikajući <a href=\"kmail:showHTML\">"
-"ovdje</a>."
+"<b>Napomena:</b> Ovo je HTML poruka. Iz sigurnosnih razloga, prikazan je "
+"samo sirovi HTML kod. Ako vjerujete pošiljaocu ove poruke onda možete "
+"aktivirati formatirani HTML prikaz za ovu poruku klikajući <a href=\"kmail:"
+"showHTML\">ovdje</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11917,7 +11797,8 @@ msgstr "Upozorenje:"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"E-mail adresa pošiljaoca nije smještena u %1 koji je korišten za potpisivanje."
+"E-mail adresa pošiljaoca nije smještena u %1 koji je korišten za "
+"potpisivanje."
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11929,11 +11810,11 @@ msgstr "spremljeno: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"E-mail adresa nije smještena u %1 koji je korišten za potpisivanje, tako da je "
-"ne možemo uporediti sa adresom pošiljaoca %2."
+"E-mail adresa nije smještena u %1 koji je korišten za potpisivanje, tako da "
+"je ne možemo uporediti sa adresom pošiljaoca %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -12049,13 +11930,14 @@ msgstr "Kioslave greška"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Vaš POP3 server ne podržava UIDL naredbu. Ova naredba je neophodna za pouzdano "
-"utvrđivanje koje poruke na serveru je KMail već vidio.\n"
+"Vaš POP3 server ne podržava UIDL naredbu. Ova naredba je neophodna za "
+"pouzdano utvrđivanje koje poruke na serveru je KMail već vidio.\n"
 "Iz ovog razloga mogućnost čuvanja poruka na serveru neće raditi ispravno."
 
 #: popaccount.cpp:752
@@ -12079,7 +11961,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Skidam poruku %1 od %2 (%3 od %4 KB) sa %5 (na serveru preostaje %6 KB)."
 
@@ -12098,1802 +11981,14 @@ msgstr "Neispravan odgovor servera"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Vaš server ne podržava naredbu TOP. Stoga nije moguće dobiti zaglavlja velikih "
-"poruka prije downloada."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Idi"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Di&rektorij"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Poru&ka"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "P&roslijedi"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML traka s alatima"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Potpisivanje"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Automatski potpiši poruke"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Kada je ova opcija uključena, sve poruke koje pošaljete će automatski biti "
-"potpisane. Naravno, još uvijek je moguće spriječiti potpisivanje pojedinačne "
-"poruke."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Kriptografija"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Kada je ova opcija uključena, poruka/datoteka neće biti šifrovana samo "
-"primateljevim javnim ključem, nego i vašim ključem. Ovo vam omogućuje da "
-"dešifrujete poruku/datoteku kasnije. Ovo je generalno dobra ideja."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Prikaži p&otpisani/šifrovani tekst nakon sastavljanja"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Kada je ova opcija uključena, poslani/šifrovani tekst će biti prikazan u "
-"zasebnom prozoru, što vam omogućuje da vidite kako će izgledati prije nego što "
-"ga pošaljete. Ovo je dobra ideja ako želite provjeriti kako funkcioniše vaš "
-"sistem šifrovanja."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Snimi poslane poruke š&ifrovano"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Uključite da snimate poruke u šifrovanom obliku "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Čuvaj poruke u šifrovanom obliku</h1>\n"
-"Kada je uključena ova opcija, poslane poruke će biti čuvane u šifrovanom obliku "
-"kao što su i poslane. Ovo se ne preporučuje, pošto nećete moći pročitati poruke "
-"ako potrebni certifikat istekne.\n"
-"<p>\n"
-"Ipak, možda postoje neka lokalna pravila koja od vas traže da uključite ovu "
-"opciju. Ako niste sigurni, pitajte vašeg lokalnog administratora.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Uvijek pokaži ključeve za šifrovanje &radi odobrenja"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Ako je ova opcija uključena, program će vam uvijek prikazati listu javnih "
-"ključeva među kojima možete izabrati onaj koji će biti korišten za šifrovanje. "
-"Ako je isključena, program će vam samo prikazati prozor ako ne može naći "
-"odgovarajući ključ ili ako se može koristiti nekoliko."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automatski š&ifriraj poruke kad god je moguće"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Kada je ova opcija uključena, sve poruke koje pošaljete će automatski biti "
-"šifrovane kad god je enkripcija moguća i poželjna. Naravno, još uvijek je "
-"moguće spriječiti šifrovanje za svaku pojedinačnu poruku."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nikad ne potpisuj / ne šifruj prilikom s&nimanja kao nacrt"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Za: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Općenito"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "Odgovo&ri na"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Odgovori svim&a..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "P&roslijedi"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Pri&kaži:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "Zami&jeni"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Opcije direktorija"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Direktorij sadrži &mailing listu"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Adresa liste:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormalno:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "N&epročitana:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Brisanje starih poruka"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Briši stare poruke nakon:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Briši stare &pročitane poruke"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Briši stare n&akon:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Briši stare &nepročitane poruke"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dana"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Sedmica"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mjeseci"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Napredno"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identite&t pošiljaoca:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Smještajni format:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Lista prikazuje:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Provjeri certifikate koristeći CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Ako je uključena ova opcija, S/MIME certifikati će biti provjeravani koristeći "
-"Liste opoziva certifikata (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Provjeri certifikate on-line (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Ako je ova opcija uključena, S/MIME certifikati se provjeravaju online "
-"koristeći Online protokol za status certifikata (OCSP). Unesite URL za OCSP "
-"responder ispod."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "On-line provjera certifikata"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP responder URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Unesite ovdje adresu servera za online provjeru certifikata (OCSP responder). "
-"URL obično počinje sa http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP responder potpis:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Za korijenske certifikate:"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Nemoj provjeravati politiku certifikata"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Normalno GnuPG koristi datoteku ~/.gnupg/policies.txt da bi provjerio da li je "
-"dozvoljena politika certifikata. Ako je uključena ova opcija, politike neće "
-"biti provjeravane."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nikad ne konsultuj CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ako je ova opcija isključena, Liste opoziva certifikata (CRL) se nikad ne "
-"koriste za provjeru S/MIME certifikata."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Dobavi nedostajuće certifikate izdavača"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Ako je ova opcija uključena, nedostajući certifikati izdavača su dobavljeni "
-"kada je to potrebno (ovo se odnosi na oba metoda provjere, CRLove i OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Za korijenske certifikate:"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Za korijenske certifikate:"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Dodaj..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Poništi postavke fonta"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"Vaš server ne podržava naredbu TOP. Stoga nije moguće dobiti zaglavlja "
+"velikih poruka prije downloada."
 
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "neograničeno"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Potvrda slanja poruke"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Odgovori pošiljaocu:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Odgovori svim&a..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Proslijeđena poruka"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Upozori prije slanja &nepotpisanih poruka"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Uključite da biste bili upozoreni prilikom slanja nepotpisanih poruka."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori prilikom pokušaja slanja nepotpisanih poruka</h1>\n"
-"Ako je ova opcija uključena, bićete upozoreni kada pokušate slati dijelove ili "
-"čitavu poruku bez potpisivanja.\n"
-"<p>\n"
-"Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog integriteta.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Upozori pri pokušaju slanja ne-šifrovane poruke"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Uključite da biste bili upozoreni prilikom slanja ne-šifrovanih poruka."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori prilikom pokušaja slanja nešifrovanih poruka</h1>\n"
-"Ako je ova opcija uključena, bićete upozoreni kada pokušate slati dijelove ili "
-"čitavu poruku bez šifrovanja.\n"
-"<p>\n"
-"Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog integriteta.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Upozori ako e-mail adresa &primatelja nije u certifikatu"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Uključite da biste bili upozoreni ako adresa nije u certifikatu"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori ako e-mail adresa primatelja nije u certifikatu</h1>\n"
-"Ako je ova opcija uključena, biće prikazano upozorenje ako e-mail adresa "
-"primatelja poruke nije sadržana u certifikatu koji je korišten za šifrovanje.\n"
-"<p>\n"
-"Preporučuje se da ostavite ovu opciju uključenom radi maksimalne sigurnosti.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Upozori ako certifikati/ključevi ističu uskoro (ispod podesite ograničenja)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Za potpisivanje"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Za šifrovanje"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dana"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Ovdje izaberite broj dana"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori ako certifikat za potpisivanje ističe</h1>\n"
-"Izaberite minimalan broj dana tokom kojih je certifikat za potpisivanje "
-"ispravan bez prikazivanja upozorenja.\n"
-"<p>\n"
-"Predložena SPHINX postavka je 14 dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori ako certifikat za šifrovanje ističe</h1>\n"
-"Izaberite minimalan broj dana tokom kojih je certifikat za šifrovanje ispravan "
-"bez prikazivanja upozorenja.\n"
-"<p>\n"
-"Predložena SPHINX postavka je 14 dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori ako certifikat iz lanca ističe</h1>\n"
-"Izaberite minimalan broj dana tokom kojih svi certifikati u lancu trebaju biti "
-"ispravni bez prikazivanja upozorenja.\n"
-"<p>\n"
-"Predložena SPHINX postavka je 14 dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori ako CA certifikat ističe</h1>\n"
-"Izaberite minimalan broj dana tokom kojih je CA certifikat ispravan bez "
-"prikazivanja upozorenja.\n"
-"<p>\n"
-"Predložena SPHINX postavka je 14 dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozori ako korijenski certifikat ističe</h1>\n"
-"Izaberite minimalan broj dana tokom kojih je korijenski certifikat ispravan bez "
-"prikazivanja upozorenja.\n"
-"<p>\n"
-"Predložena SPHINX postavka je 14 dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Za korijenske certifikate:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Za certifikate CA posrednika:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Za certifikate/ključeve korisnika:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, fuzzy, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Ponovo uključi sva \"Ne pitaj više\" upozorenja"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Sadržaj direktorija:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "Zami&jeni"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "Zami&jeni"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Pošalji poštu iz reda čekanja prilikom provjere pošte"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Izaberite da li želite da KMail šalje sve poruke iz outboxa prilikom ručnih "
-"ili svih provjera nove pošte ili ne želite uopšte slati poruke automatski.</p>"
-"</qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Najskorije korišten direktorij u prozoru za izbor direktorija."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politika prikazivanja ikone u sistemskom trayu"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Detaljna obavijest o novim porukama"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Ako je uključena ova opcija, za svaki direktorij biće prikazan broj novih "
-"poruka u obavještenju o novoj pošti. U suprotnom, dobićete jednostavnu poruku "
-"'Imate novu poštu'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Navedite e&ditor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Koristi &vanjski editor umjesto sastavljača"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Uključi groupware funkcionalnost"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Zamijeni Od:/Za: polja u zaglavlju u odgovoru na poziv"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook ima veći broj nedostataka u svojoj implementaciji iCalendar "
-"standarda. Ova opcija zaobilazi jedan od njih. Ako imate problema sa "
-"korisnicima Outlooka koji ne mogu dobiti vaše pozivnice, probajte podesiti ovu "
-"opciju."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Šalji groupware pozivnice u tijelu poruke"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook ima veći broj nedostataka u svojoj implementaciji iCalendar "
-"standarda. Ova opcija zaobilazi jedan od njih. Ako imate problema sa "
-"korisnicima Outlooka koji ne mogu dobiti vaše pozivnice, probajte podesiti ovu "
-"opciju."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automatska detekcija mailing liste"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Uključivanje ove opcije vam omogućuje da čuvate unose iz Kontact aplikacija "
-"(Organizer, Adresar i Bilješke) na IMAP serveru.</p>"
-"<p>Ako želite podesiti ovu opciju, morate takođe podesiti pojedinačne "
-"aplikacije da koriste IMAP resurs; ovo se radi iz TDE Kontrolnog centra.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Obično nemate razloga da vidite direktorije koji drže IMAP resurse. Ali ako "
-"ih morate vidjeti, možete to podesiti ovdje.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Ovo bira roditelja IMAP resursnih direktorija.</p>"
-"<p>Kolab server automatski postavlja IMAP inbox kao roditelja.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Ovo je ID računa koji sadrži IMAP resursne direktorije.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Ako želite podesiti imena direktorija na IMAP serveru tako da budu na vašem "
-"jeziku, možete izabrati jedan od ovih dostupnih jezika.</p>"
-"<p> Molim zapamtite da je jedini razlog zašto ovo treba raditi je "
-"kompatibilnost sa Microsoft Outlookom. Ovo se smatra lošom idejom, jer kada "
-"jednom to uradite promjena jezika je nemoguća. </p>"
-"<p>Nemojte mijenjati ovu opciju osim ako morate.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Ova vrijednost se koristi za odlučivanje da li će biti prikazan KMail uvodni "
-"ekran."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimalan broj konekcija po računaru"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ovo se može koristiti da se ograniči broj konekcija po računaru prilikom "
-"provjere nove pošte. Podrazumijevani broj konekcija je neograničen (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Prikaži polje za brzu pretragu"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, fuzzy, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ova opcija uključuje ili isključuje polje za pretragu iznad liste poruka koje "
-"se može koristiti za brzo pronalaženje informacija prikazanih na listi poruka."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"&Čuvaj originalni kodni raspored pri odgovoru ili proslijeđivanju (ako je "
-"moguće)."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomatski dodaj potpis"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, fuzzy, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamti ovaj identitet tako da će on biti korišten i za buduće prozore "
-"sastavljača."
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamti ovaj direktorij za poslanu poštu, tako da će biti korišten i za buduće "
-"prozore sastavljača."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamti ovaj mail transport, tako da će biti korišten i za buduće prozore "
-"sastavljača."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamti ovaj identitet tako da će on biti korišten i za buduće prozore "
-"sastavljača."
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Prelomi &riječ na koloni:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-"Upozori ako certifikati/ključevi ističu uskoro (ispod podesite ograničenja)"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije imena priloga "
-"koja sadrže ne-engleske znakove"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Automatski traži obavijest o &prijemu poruke"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aktiviraj ovu opciju ukoliko želite da KMail zahtjeva MDNs za svaku od vaših "
-"odlazecih poruka</p>"
-"<p> Ova opcija se odnosi samo na podrazmjevano; uvijek možete aktivirati i "
-"deaktivirati MDN zahjeve pojedinačne poruke u meni sekciji<em>Opcije</em>->"
-"&gt;<em>Request Disposition Notification</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Interval auto-snimanja:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Možete redovno praviti rezervnu kopiju teksta u sastavljaču. Ovdje podešavate "
-"interval u kojem se prave rezervne kopije. Možete isključiti auto-snimanje ako "
-"podesite vrijednost na nulu."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Zamijeni prepoznate prefik&se sa \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Zamijeni prepoznate prefikse sa \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Upotrijebi pametno &citiranje"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Potpis je istekao."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maksimalan broj konekcija po računaru"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"&Čuvaj originalni kodni raspored pri odgovoru ili proslijeđivanju (ako je "
-"moguće)."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Snimi poslane poruke š&ifrovano"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Prikaži cijelo zaglavlje poruke"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Obavijesti o stanju poruke"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Popis poruka - polje datuma"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "Označi poruku kao ne-pro&slijeđenu"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Dodaj &navodnike"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -14013,6 +12108,11 @@ msgstr ""
 msgid "Add as BCC"
 msgstr ""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Odustani"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14030,10 +12130,10 @@ msgstr "Skriveni primatelji"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -14051,8 +12151,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -14156,10 +12256,19 @@ msgstr "je veće ili jednako od"
 msgid " bytes"
 msgstr " bajta"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dana"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -14320,13 +12429,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -14344,8 +12451,7 @@ msgid ""
 msgstr "Vrsta računa: IMAP račun"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -14363,8 +12469,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -14373,8 +12478,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Dostupni filteri"
 
 #: sievedebugdialog.cpp:358
@@ -14450,12 +12554,12 @@ msgstr "Koristite ovo polje da unesete bilo koji statični potpis."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Koristite ovaj requester da navedete tekstualnu datoteku koja sadrži vaš "
-"potpis. Ona će biti pročitana svaki put kada kreirate novu poruku ili zakačite "
-"novi potpis."
+"potpis. Ona će biti pročitana svaki put kada kreirate novu poruku ili "
+"zakačite novi potpis."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14471,22 +12575,27 @@ msgstr "Otvara navedenu datoteku u editoru teksta."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Ovdje možete navesti bilo koju naredbu, sa ili bez putanje ovisno o tome da li "
-"ili ne je ta naredba u vašem sistemskom PATH-u. Za svaku novu poruku, KMail će "
-"izvršiti tu naredbu i koristiti njen izlaz (na standardni izlaz) kao potpis. "
-"Uobičajene naredbe koje se koriste sa ovim mehanizmom su \"fortune\" ili \"ksig "
-"-random\"."
+"Ovdje možete navesti bilo koju naredbu, sa ili bez putanje ovisno o tome da "
+"li ili ne je ta naredba u vašem sistemskom PATH-u. Za svaku novu poruku, "
+"KMail će izvršiti tu naredbu i koristiti njen izlaz (na standardni izlaz) "
+"kao potpis. Uobičajene naredbe koje se koriste sa ovim mehanizmom su "
+"\"fortune\" ili \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Navedite &naredbu:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Novi zapis:"
@@ -14524,6 +12633,11 @@ msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 "<qt>Da li stvarno želite pobrisati identitet pod imenom <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Primijeni &na: "
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14538,6 +12652,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Izmijeni..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14577,9 +12695,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14618,6 +12736,16 @@ msgstr ""
 "Ne mogu otvoriti datoteku \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Za: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14653,36 +12781,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14917,6 +13041,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14953,114 +13081,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...da možete preći na sljedeću ili prethodnu poruku u direktoriju\n"
-"koristeći dugmad sa strelicama lijevo i desno respektivno?</p>\n"
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"\n"
-"<p>...da možete rapidno praviti filtere na primaoca, pošiljaoca,\n"
-"temu i mailing listu koristeći <em>Alati-&gt;Napravi&nbsp;filter</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>..da se možete otarasiti &quot;[imena mailing liste]&quot;\n"
-"koje se dodaje temi kod nekih mailig lista koristeći filter akciju\n"
-"<em>prepiši header</em>? Samo koristite\n"
-"<pre>prepiši header &quot;Tema&quot;\n"
-"   zamijeni &quot;\\s*\\[ime mailing liste\\]\\s*&quot;\n"
-"   sa &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...da možete pridružiti mailing liste direktorijima u\n"
-"<em>Direktorij-&gt;Osobine...</em> dijalogu? Kasnije možete koristiti\n"
-"<em>Poruka-&gt;Nova&nbsp;poruka&nbsp;na&nbsp;mailing&nbsp;listu...</em>\n"
-"da otvorite prozor za pisanje poruke sa adresom mailing liste.\n"
-"Alternativno, možete kliknuti srednjim dugmetom miša na direktorij</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...da možete pridružiti vlastite ikone pojedinačno svakom direktoriju?\n"
-"Pogledajte <em>Direktorij-&gt;Osobine...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...da KMail može pokazati obojenu traku koja pokazuje vrstu\n"
-"(Običan tekst/HTML/OpenPGP) poruke koja je trenutno prikazana?</p>\n"
-"<p>Ovo sprječava pokušaje lažiranja uspješne provjere potpisa koristeći\n"
-"HTML poruke koje imitiraju statusne okvirove KMailovog potpisa.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...da možete filtrirati po osnovu bilo kojeg polja zaglavlja jednostavno\n"
-"unoseći njegovo ime u prvo polje pravila za pretragu?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...da možete filtrirati samo-HTML poruke koristeći pravilo\n"
-"<pre>&quot;Content-type&quot; sadrži &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...da će prilikom odgovora biti citiran samo onaj dio poruke koji ste "
-"izabrali?</p>\n"
-"<p>Ako ništa nije izabrano, biće citirana čitava poruka.</p>\n"
-"<p>Ovo radi čak i za tekst priloga ako ste izabrali opciju\n"
-"<em>Pogled-&gt;Prilozi-&gt;U sastavu poruke</em>.</p>\n"
-"<p>Ova opcija je dostupna sa svim naredbama za odgovor osim\n"
-"<em>Poruka-&gt;Odgovori bez citiranja</em>.</p>\n"
-"<p align=\"right\"><em>napisao: David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nemam šta vratiti."
@@ -15114,7 +13134,8 @@ msgstr ""
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
-"Ne mogu pokrenuti upravitelj certifikatima. Molim provjerite vašu instalaciju."
+"Ne mogu pokrenuti upravitelj certifikatima. Molim provjerite vašu "
+"instalaciju."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -15129,6 +13150,17 @@ msgstr "Prilog #%1 (bez imena)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Datoteka pod imenom %1 već postoji. Želite li je zamijeniti?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "Piši preko"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15245,9 +13277,9 @@ msgstr "Pošalji po&redane poruke"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -15280,9 +13312,9 @@ msgstr "Izaberite datoteku sa zvukom"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -15292,15 +13324,15 @@ msgstr "Dodaj u adresar"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -15310,8 +13342,8 @@ msgstr "Koristite ovo polje da unesete bilo koji statični potpis."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -15327,143 +13359,1707 @@ msgstr ""
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Potpisivanje"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Automatski potpiši poruke"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Kada je ova opcija uključena, sve poruke koje pošaljete će automatski biti "
+"potpisane. Naravno, još uvijek je moguće spriječiti potpisivanje pojedinačne "
+"poruke."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Kriptografija"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Podesite temu poruke"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Kada je ova opcija uključena, poruka/datoteka neće biti šifrovana samo "
+"primateljevim javnim ključem, nego i vašim ključem. Ovo vam omogućuje da "
+"dešifrujete poruku/datoteku kasnije. Ovo je generalno dobra ideja."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Pošalji kopiju na 'adresu'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Prikaži p&otpisani/šifrovani tekst nakon sastavljanja"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Pošalji nevidljivu kopiju na 'adresu'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Kada je ova opcija uključena, poslani/šifrovani tekst će biti prikazan u "
+"zasebnom prozoru, što vam omogućuje da vidite kako će izgledati prije nego "
+"što ga pošaljete. Ovo je dobra ideja ako želite provjeriti kako funkcioniše "
+"vaš sistem šifrovanja."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Dodaj 'header' poruci"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Snimi poslane poruke š&ifrovano"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Učitaj tijelo poruke iz 'datoteke'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Uključite da snimate poruke u šifrovanom obliku "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Podesi tijelo poruke"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Čuvaj poruke u šifrovanom obliku</h1>\n"
+"Kada je uključena ova opcija, poslane poruke će biti čuvane u šifrovanom "
+"obliku kao što su i poslane. Ovo se ne preporučuje, pošto nećete moći "
+"pročitati poruke ako potrebni certifikat istekne.\n"
+"<p>\n"
+"Ipak, možda postoje neka lokalna pravila koja od vas traže da uključite ovu "
+"opciju. Ako niste sigurni, pitajte vašeg lokalnog administratora.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Dodaj prilog poruci. Ovo može biti ponovljeno"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Uvijek pokaži ključeve za šifrovanje &radi odobrenja"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Samo provjeri da li ima novih poruka"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Ako je ova opcija uključena, program će vam uvijek prikazati listu javnih "
+"ključeva među kojima možete izabrati onaj koji će biti korišten za "
+"šifrovanje. Ako je isključena, program će vam samo prikazati prozor ako ne "
+"može naći odgovarajući ključ ili ako se može koristiti nekoliko."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Otvori samo sastavljač poruka"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automatski š&ifriraj poruke kad god je moguće"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Pregledaj datu datoteku sa porukom"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Kada je ova opcija uključena, sve poruke koje pošaljete će automatski biti "
+"šifrovane kad god je enkripcija moguća i poželjna. Naravno, još uvijek je "
+"moguće spriječiti šifrovanje za svaku pojedinačnu poruku."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Pošalji poruku na 'adresu' odg. zakači datoteku na koju pokazuje 'URL'"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nikad ne potpisuj / ne šifruj prilikom s&nimanja kao nacrt"
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "Spreman."
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-#, fuzzy
-msgid "Old"
-msgstr "stara"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Općenito"
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "obrisana"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "Odgovo&ri na"
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
-msgstr "odgovorena"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Odgovori svim&a..."
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
-msgstr "proslijeđena"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "P&roslijedi"
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "Stavi u &red za slanje"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Pri&kaži:"
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "poslana"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "Zami&jeni"
 
-#: kmsearchpattern.h:228
-#, fuzzy
-msgid "Watched"
-msgstr "nadgledana"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Sadržaj direktorija:"
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "ignorisana"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "Zami&jeni"
 
-#: kmsearchpattern.h:230
-#, fuzzy
-msgid "Spam"
-msgstr "spam"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "Zami&jeni"
 
-#: kmsearchpattern.h:231
-#, fuzzy
-msgid "Ham"
-msgstr "ham"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Opcije direktorija"
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "Za: "
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Direktorij sadrži &mailing listu"
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "prilog"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Adresa liste:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormalno:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "N&epročitana:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Brisanje starih poruka"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Briši stare poruke nakon:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Briši stare &pročitane poruke"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Briši stare n&akon:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Briši stare &nepročitane poruke"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dana"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Sedmica"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mjeseci"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Napredno"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identite&t pošiljaoca:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Smještajni format:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Lista prikazuje:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Pošalji poštu iz reda čekanja prilikom provjere pošte"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Izaberite da li želite da KMail šalje sve poruke iz outboxa prilikom "
+"ručnih ili svih provjera nove pošte ili ne želite uopšte slati poruke "
+"automatski.</p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Najskorije korišten direktorij u prozoru za izbor direktorija."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politika prikazivanja ikone u sistemskom trayu"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Detaljna obavijest o novim porukama"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Ako je uključena ova opcija, za svaki direktorij biće prikazan broj novih "
+"poruka u obavještenju o novoj pošti. U suprotnom, dobićete jednostavnu "
+"poruku 'Imate novu poštu'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Navedite e&ditor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Koristi &vanjski editor umjesto sastavljača"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Uključi groupware funkcionalnost"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Zamijeni Od:/Za: polja u zaglavlju u odgovoru na poziv"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook ima veći broj nedostataka u svojoj implementaciji "
+"iCalendar standarda. Ova opcija zaobilazi jedan od njih. Ako imate problema "
+"sa korisnicima Outlooka koji ne mogu dobiti vaše pozivnice, probajte "
+"podesiti ovu opciju."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Šalji groupware pozivnice u tijelu poruke"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook ima veći broj nedostataka u svojoj implementaciji "
+"iCalendar standarda. Ova opcija zaobilazi jedan od njih. Ako imate problema "
+"sa korisnicima Outlooka koji ne mogu dobiti vaše pozivnice, probajte "
+"podesiti ovu opciju."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automatska detekcija mailing liste"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Uključivanje ove opcije vam omogućuje da čuvate unose iz Kontact "
+"aplikacija (Organizer, Adresar i Bilješke) na IMAP serveru.</p><p>Ako želite "
+"podesiti ovu opciju, morate takođe podesiti pojedinačne aplikacije da "
+"koriste IMAP resurs; ovo se radi iz TDE Kontrolnog centra.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Obično nemate razloga da vidite direktorije koji drže IMAP resurse. Ali "
+"ako ih morate vidjeti, možete to podesiti ovdje.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Ovo bira roditelja IMAP resursnih direktorija.</p><p>Kolab server "
+"automatski postavlja IMAP inbox kao roditelja.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Ovo je ID računa koji sadrži IMAP resursne direktorije.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Ako želite podesiti imena direktorija na IMAP serveru tako da budu na "
+"vašem jeziku, možete izabrati jedan od ovih dostupnih jezika.</p><p> Molim "
+"zapamtite da je jedini razlog zašto ovo treba raditi je kompatibilnost sa "
+"Microsoft Outlookom. Ovo se smatra lošom idejom, jer kada jednom to uradite "
+"promjena jezika je nemoguća. </p><p>Nemojte mijenjati ovu opciju osim ako "
+"morate.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Ova vrijednost se koristi za odlučivanje da li će biti prikazan KMail uvodni "
+"ekran."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimalan broj konekcija po računaru"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ovo se može koristiti da se ograniči broj konekcija po računaru prilikom "
+"provjere nove pošte. Podrazumijevani broj konekcija je neograničen (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Prikaži polje za brzu pretragu"
+
+#: kmail.kcfg:309
+#, fuzzy, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ova opcija uključuje ili isključuje polje za pretragu iznad liste poruka "
+"koje se može koristiti za brzo pronalaženje informacija prikazanih na listi "
+"poruka."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"&Čuvaj originalni kodni raspored pri odgovoru ili proslijeđivanju (ako je "
+"moguće)."
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomatski dodaj potpis"
+
+#: kmail.kcfg:336
+#, fuzzy, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamti ovaj identitet tako da će on biti korišten i za buduće prozore "
+"sastavljača."
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Zapamti ovaj direktorij za poslanu poštu, tako da će biti korišten i za "
+"buduće prozore sastavljača."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Zapamti ovaj mail transport, tako da će biti korišten i za buduće prozore "
+"sastavljača."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamti ovaj identitet tako da će on biti korišten i za buduće prozore "
+"sastavljača."
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Prelomi &riječ na koloni:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+"Upozori ako certifikati/ključevi ističu uskoro (ispod podesite ograničenja)"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Uključite ovu opciju kako biste postigli da Outlook(tm) razumije imena "
+"priloga koja sadrže ne-engleske znakove"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Automatski traži obavijest o &prijemu poruke"
+
+#: kmail.kcfg:417
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Aktiviraj ovu opciju ukoliko želite da KMail zahtjeva MDNs za svaku "
+"od vaših odlazecih poruka</p><p> Ova opcija se odnosi samo na podrazmjevano; "
+"uvijek možete aktivirati i deaktivirati MDN zahjeve pojedinačne poruke u "
+"meni sekciji<em>Opcije</em>->&gt;<em>Request Disposition Notification</em>.</"
+"p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Interval auto-snimanja:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Možete redovno praviti rezervnu kopiju teksta u sastavljaču. Ovdje "
+"podešavate interval u kojem se prave rezervne kopije. Možete isključiti auto-"
+"snimanje ako podesite vrijednost na nulu."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Zamijeni prepoznate prefik&se sa \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Zamijeni prepoznate prefikse sa \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Upotrijebi pametno &citiranje"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Potpis je istekao."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maksimalan broj konekcija po računaru"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"&Čuvaj originalni kodni raspored pri odgovoru ili proslijeđivanju (ako je "
+"moguće)."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Snimi poslane poruke š&ifrovano"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Prikaži cijelo zaglavlje poruke"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Obavijesti o stanju poruke"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Popis poruka - polje datuma"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "Označi poruku kao ne-pro&slijeđenu"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Dodaj &navodnike"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Edituj &datoteku"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Izmijeni..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Idi"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Di&rektorij"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Poru&ka"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "P&roslijedi"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Poništi postavke fonta"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML traka s alatima"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Uobičajene opcije"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML traka s alatima"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Provjeri certifikate koristeći CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Ako je uključena ova opcija, S/MIME certifikati će biti provjeravani "
+"koristeći Liste opoziva certifikata (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Provjeri certifikate on-line (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Ako je ova opcija uključena, S/MIME certifikati se provjeravaju online "
+"koristeći Online protokol za status certifikata (OCSP). Unesite URL za OCSP "
+"responder ispod."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "On-line provjera certifikata"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP responder URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Unesite ovdje adresu servera za online provjeru certifikata (OCSP "
+"responder). URL obično počinje sa http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP responder potpis:"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Za korijenske certifikate:"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Nemoj provjeravati politiku certifikata"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Normalno GnuPG koristi datoteku ~/.gnupg/policies.txt da bi provjerio da li "
+"je dozvoljena politika certifikata. Ako je uključena ova opcija, politike "
+"neće biti provjeravane."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nikad ne konsultuj CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ako je ova opcija isključena, Liste opoziva certifikata (CRL) se nikad ne "
+"koriste za provjeru S/MIME certifikata."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Dobavi nedostajuće certifikate izdavača"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Ako je ova opcija uključena, nedostajući certifikati izdavača su dobavljeni "
+"kada je to potrebno (ovo se odnosi na oba metoda provjere, CRLove i OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Za korijenske certifikate:"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Za korijenske certifikate:"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Dodaj..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Poništi postavke fonta"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "neograničeno"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Potvrda slanja poruke"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Odgovori pošiljaocu:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Odgovori svim&a..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Proslijeđena poruka"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Upozori prije slanja &nepotpisanih poruka"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Uključite da biste bili upozoreni prilikom slanja nepotpisanih poruka."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori prilikom pokušaja slanja nepotpisanih poruka</h1>\n"
+"Ako je ova opcija uključena, bićete upozoreni kada pokušate slati dijelove "
+"ili čitavu poruku bez potpisivanja.\n"
+"<p>\n"
+"Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog "
+"integriteta.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Upozori pri pokušaju slanja ne-šifrovane poruke"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Uključite da biste bili upozoreni prilikom slanja ne-šifrovanih poruka."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori prilikom pokušaja slanja nešifrovanih poruka</h1>\n"
+"Ako je ova opcija uključena, bićete upozoreni kada pokušate slati dijelove "
+"ili čitavu poruku bez šifrovanja.\n"
+"<p>\n"
+"Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog "
+"integriteta.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Upozori ako e-mail adresa &primatelja nije u certifikatu"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Uključite da biste bili upozoreni ako adresa nije u certifikatu"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori ako e-mail adresa primatelja nije u certifikatu</h1>\n"
+"Ako je ova opcija uključena, biće prikazano upozorenje ako e-mail adresa "
+"primatelja poruke nije sadržana u certifikatu koji je korišten za "
+"šifrovanje.\n"
+"<p>\n"
+"Preporučuje se da ostavite ovu opciju uključenom radi maksimalne "
+"sigurnosti.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Upozori ako certifikati/ključevi ističu uskoro (ispod podesite ograničenja)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Za potpisivanje"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Za šifrovanje"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Ovdje izaberite broj dana"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori ako certifikat za potpisivanje ističe</h1>\n"
+"Izaberite minimalan broj dana tokom kojih je certifikat za potpisivanje "
+"ispravan bez prikazivanja upozorenja.\n"
+"<p>\n"
+"Predložena SPHINX postavka je 14 dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori ako certifikat za šifrovanje ističe</h1>\n"
+"Izaberite minimalan broj dana tokom kojih je certifikat za šifrovanje "
+"ispravan bez prikazivanja upozorenja.\n"
+"<p>\n"
+"Predložena SPHINX postavka je 14 dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori ako certifikat iz lanca ističe</h1>\n"
+"Izaberite minimalan broj dana tokom kojih svi certifikati u lancu trebaju "
+"biti ispravni bez prikazivanja upozorenja.\n"
+"<p>\n"
+"Predložena SPHINX postavka je 14 dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori ako CA certifikat ističe</h1>\n"
+"Izaberite minimalan broj dana tokom kojih je CA certifikat ispravan bez "
+"prikazivanja upozorenja.\n"
+"<p>\n"
+"Predložena SPHINX postavka je 14 dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozori ako korijenski certifikat ističe</h1>\n"
+"Izaberite minimalan broj dana tokom kojih je korijenski certifikat ispravan "
+"bez prikazivanja upozorenja.\n"
+"<p>\n"
+"Predložena SPHINX postavka je 14 dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Za korijenske certifikate:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Za certifikate CA posrednika:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Za certifikate/ključeve korisnika:"
+
+#: warningconfiguration.ui:388
+#, fuzzy, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Ponovo uključi sva \"Ne pitaj više\" upozorenja"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...da možete preći na sljedeću ili prethodnu poruku u direktoriju\n"
+"koristeći dugmad sa strelicama lijevo i desno respektivno?</p>\n"
+
+#: tips:10
 #, fuzzy
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Datoteka pod imenom %1 već postoji. Želite li je zamijeniti?"
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"\n"
+"<p>...da možete rapidno praviti filtere na primaoca, pošiljaoca,\n"
+"temu i mailing listu koristeći <em>Alati-&gt;Napravi&nbsp;filter</em>?</p>\n"
 
-#: util.h:210
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>..da se možete otarasiti &quot;[imena mailing liste]&quot;\n"
+"koje se dodaje temi kod nekih mailig lista koristeći filter akciju\n"
+"<em>prepiši header</em>? Samo koristite\n"
+"<pre>prepiši header &quot;Tema&quot;\n"
+"   zamijeni &quot;\\s*\\[ime mailing liste\\]\\s*&quot;\n"
+"   sa &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
 #, fuzzy
-msgid "Overwrite File?"
-msgstr "Piši preko"
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...da možete pridružiti mailing liste direktorijima u\n"
+"<em>Direktorij-&gt;Osobine...</em> dijalogu? Kasnije možete koristiti\n"
+"<em>Poruka-&gt;Nova&nbsp;poruka&nbsp;na&nbsp;mailing&nbsp;listu...</em>\n"
+"da otvorite prozor za pisanje poruke sa adresom mailing liste.\n"
+"Alternativno, možete kliknuti srednjim dugmetom miša na direktorij</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...da možete pridružiti vlastite ikone pojedinačno svakom direktoriju?\n"
+"Pogledajte <em>Direktorij-&gt;Osobine...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...da KMail može pokazati obojenu traku koja pokazuje vrstu\n"
+"(Običan tekst/HTML/OpenPGP) poruke koja je trenutno prikazana?</p>\n"
+"<p>Ovo sprječava pokušaje lažiranja uspješne provjere potpisa koristeći\n"
+"HTML poruke koje imitiraju statusne okvirove KMailovog potpisa.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...da možete filtrirati po osnovu bilo kojeg polja zaglavlja jednostavno\n"
+"unoseći njegovo ime u prvo polje pravila za pretragu?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...da možete filtrirati samo-HTML poruke koristeći pravilo\n"
+"<pre>&quot;Content-type&quot; sadrži &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...da će prilikom odgovora biti citiran samo onaj dio poruke koji ste "
+"izabrali?</p>\n"
+"<p>Ako ništa nije izabrano, biće citirana čitava poruka.</p>\n"
+"<p>Ovo radi čak i za tekst priloga ako ste izabrali opciju\n"
+"<em>Pogled-&gt;Prilozi-&gt;U sastavu poruke</em>.</p>\n"
+"<p>Ova opcija je dostupna sa svim naredbama za odgovor osim\n"
+"<em>Poruka-&gt;Odgovori bez citiranja</em>.</p>\n"
+"<p align=\"right\"><em>napisao: David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15595,16 +15191,20 @@ msgstr "Piši preko"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozori prilikom pokušaja slanja nešifrovanih poruka</h1>\n"
-#~ "Ako je ova opcija uključena, bićete upozoreni kada pokušate slati dijelove ili čitavu poruku bez šifrovanja.\n"
+#~ "Ako je ova opcija uključena, bićete upozoreni kada pokušate slati "
+#~ "dijelove ili čitavu poruku bez šifrovanja.\n"
 #~ "<p>\n"
-#~ "Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog integriteta.\n"
+#~ "Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog "
+#~ "integriteta.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15615,16 +15215,21 @@ msgstr "Piši preko"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozori prilikom pokušaja slanja nešifrovanih poruka</h1>\n"
-#~ "Ako je ova opcija uključena, bićete upozoreni kada pokušate slati dijelove ili čitavu poruku bez šifrovanja.\n"
+#~ "Ako je ova opcija uključena, bićete upozoreni kada pokušate slati "
+#~ "dijelove ili čitavu poruku bez šifrovanja.\n"
 #~ "<p>\n"
-#~ "Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog integriteta.\n"
+#~ "Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog "
+#~ "integriteta.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15681,22 +15286,29 @@ msgstr "Piši preko"
 
 #, fuzzy
 #~ msgid "Warn if CA certificate e&xpires in less than:"
-#~ msgstr "Upozori ako certifikati/ključevi ističu uskoro (ispod podesite ograničenja)"
+#~ msgstr ""
+#~ "Upozori ako certifikati/ključevi ističu uskoro (ispod podesite "
+#~ "ograničenja)"
 
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozori prilikom pokušaja slanja nešifrovanih poruka</h1>\n"
-#~ "Ako je ova opcija uključena, bićete upozoreni kada pokušate slati dijelove ili čitavu poruku bez šifrovanja.\n"
+#~ "Ako je ova opcija uključena, bićete upozoreni kada pokušate slati "
+#~ "dijelove ili čitavu poruku bez šifrovanja.\n"
 #~ "<p>\n"
-#~ "Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog integriteta.\n"
+#~ "Preporučeno je da ovu opciju ostavite uključenom radi maksimalnog "
+#~ "integriteta.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15707,16 +15319,20 @@ msgstr "Piši preko"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozori ako e-mail adresa primatelja nije u certifikatu</h1>\n"
-#~ "Ako je ova opcija uključena, biće prikazano upozorenje ako e-mail adresa primatelja poruke nije sadržana u certifikatu koji je korišten za šifrovanje.\n"
+#~ "Ako je ova opcija uključena, biće prikazano upozorenje ako e-mail adresa "
+#~ "primatelja poruke nije sadržana u certifikatu koji je korišten za "
+#~ "šifrovanje.\n"
 #~ "<p>\n"
-#~ "Preporučuje se da ostavite ovu opciju uključenom radi maksimalne sigurnosti.\n"
+#~ "Preporučuje se da ostavite ovu opciju uključenom radi maksimalne "
+#~ "sigurnosti.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15731,10 +15347,6 @@ msgstr "Piši preko"
 #~ msgstr "Spasi u direktoriju &nacrta"
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "Po&desi KMail..."
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Otvori s..."
 
@@ -15784,11 +15396,41 @@ msgstr "Piši preko"
 #~ msgstr "Molim izaberite spam filtere koji će biti napravljeni u KMailu."
 
 #, fuzzy
-#~ msgid "<p>Here you can get some assistance in setting up KMail's filter rules to use some commonly-known anti-spam tools.</p><p>The wizard can detect those tools on your computer as well as create filter rules to classify messages using these tools and to separate messages classified as spam. The wizard will not take any existing filter rules into consideration: it will always append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen during the scan of the messages for spam, you may encounter problems with the responsiveness of KMail because anti-spam tool operations are usually time consuming; please consider deleting the filter rules created by the wizard to get back to the former behavior."
-#~ msgstr "<p>Ovdje možete potražiti pomoć za podešavanje KMail pravila filtriranja tako da se koriste neki poznati anti-spam alati.</p> <p>Čarobnjak može otkriti ove alate na vašem računaru kao i napraviti pravila filtriranja koja klasificiraju poruke koristeći ove alate i odvajaju poruke koje su klasificirane kao spam. Čarobnjak neće uzimati u obzir postojeća pravila filtriranja: samo će dodavati nova pravila.</p> <p><b>Pažnja:</b> Pošto je KMail blokiran tokom otkrivanja spam poruka, možda ćete imati problema u smislu zaglavljivanja KMaila pošto anti-spam alati rade prilično sporo. Možete uvijek obrisati pravila filtriranja koja je napravio čarobnjak kako biste se vratili na prijašnje ponašanje."
+#~ msgid ""
+#~ "<p>Here you can get some assistance in setting up KMail's filter rules to "
+#~ "use some commonly-known anti-spam tools.</p><p>The wizard can detect "
+#~ "those tools on your computer as well as create filter rules to classify "
+#~ "messages using these tools and to separate messages classified as spam. "
+#~ "The wizard will not take any existing filter rules into consideration: it "
+#~ "will always append the new rules.</p><p><b>Warning:</b> As KMail appears "
+#~ "to be frozen during the scan of the messages for spam, you may encounter "
+#~ "problems with the responsiveness of KMail because anti-spam tool "
+#~ "operations are usually time consuming; please consider deleting the "
+#~ "filter rules created by the wizard to get back to the former behavior."
+#~ msgstr ""
+#~ "<p>Ovdje možete potražiti pomoć za podešavanje KMail pravila filtriranja "
+#~ "tako da se koriste neki poznati anti-spam alati.</p> <p>Čarobnjak može "
+#~ "otkriti ove alate na vašem računaru kao i napraviti pravila filtriranja "
+#~ "koja klasificiraju poruke koristeći ove alate i odvajaju poruke koje su "
+#~ "klasificirane kao spam. Čarobnjak neće uzimati u obzir postojeća pravila "
+#~ "filtriranja: samo će dodavati nova pravila.</p> <p><b>Pažnja:</b> Pošto "
+#~ "je KMail blokiran tokom otkrivanja spam poruka, možda ćete imati problema "
+#~ "u smislu zaglavljivanja KMaila pošto anti-spam alati rade prilično sporo. "
+#~ "Možete uvijek obrisati pravila filtriranja koja je napravio čarobnjak "
+#~ "kako biste se vratili na prijašnje ponašanje."
 
-#~ msgid "<p>For these tools it is possible to let the wizard create filter rules. KMail tried to find the tools in the PATH of your system; the wizard does not allow you to create rules for tools which were not found: this is to keep your configuration consistent and to minimize the risk of unpredicted behavior.</p>"
-#~ msgstr "<p>Možete dozvoliti čarobnjaku da napravi pravila filtriranja za ove alate. KMail je pokušao pronaći alate u vašem sistemskom PATH-u. Čarobnjak vam ne dozvoljava da pravite pravila za alate koji nisu pronađeni. Razlog za to je da se održi konzistentnost konfiguracije i minimizira rizik neočekivanog ponašanja.</p>"
+#~ msgid ""
+#~ "<p>For these tools it is possible to let the wizard create filter rules. "
+#~ "KMail tried to find the tools in the PATH of your system; the wizard does "
+#~ "not allow you to create rules for tools which were not found: this is to "
+#~ "keep your configuration consistent and to minimize the risk of "
+#~ "unpredicted behavior.</p>"
+#~ msgstr ""
+#~ "<p>Možete dozvoliti čarobnjaku da napravi pravila filtriranja za ove "
+#~ "alate. KMail je pokušao pronaći alate u vašem sistemskom PATH-u. "
+#~ "Čarobnjak vam ne dozvoljava da pravite pravila za alate koji nisu "
+#~ "pronađeni. Razlog za to je da se održi konzistentnost konfiguracije i "
+#~ "minimizira rizik neočekivanog ponašanja.</p>"
 
 #~ msgid "(found on this system)"
 #~ msgstr "(pronađeno na sistemu)"
@@ -15799,17 +15441,43 @@ msgstr "Piši preko"
 #~ msgid "Classify messages manually as spam"
 #~ msgstr "Ručno klasificiraj poruke kao spam"
 
-#~ msgid "Sometimes messages are classified wrongly or even not at all; the latter might be by intention, because you perhaps filter out messages from mailing lists before you let the anti-spam tools classify the rest of the messages. You can correct these wrong or missing classifications manually by using the appropriate toolbar buttons which trigger special filters created by this wizard."
-#~ msgstr "Ponekad se poruke klasificiraju pogrešno, ili čak nikako. Ova druga mogućnost se može desiti namjerno, npr. ako filtrirate poruke iz mailing listi prije nego što anti-spam alati dođu na red. Ove pogrešne ili nepostojeće klasifikacije možete ispraviti ručno koristeći odgovarajuće alate na traci s alatima koji pokreću posebne filtere koje je napravio čarobnjak."
+#~ msgid ""
+#~ "Sometimes messages are classified wrongly or even not at all; the latter "
+#~ "might be by intention, because you perhaps filter out messages from "
+#~ "mailing lists before you let the anti-spam tools classify the rest of the "
+#~ "messages. You can correct these wrong or missing classifications manually "
+#~ "by using the appropriate toolbar buttons which trigger special filters "
+#~ "created by this wizard."
+#~ msgstr ""
+#~ "Ponekad se poruke klasificiraju pogrešno, ili čak nikako. Ova druga "
+#~ "mogućnost se može desiti namjerno, npr. ako filtrirate poruke iz mailing "
+#~ "listi prije nego što anti-spam alati dođu na red. Ove pogrešne ili "
+#~ "nepostojeće klasifikacije možete ispraviti ručno koristeći odgovarajuće "
+#~ "alate na traci s alatima koji pokreću posebne filtere koje je napravio "
+#~ "čarobnjak."
 
 #~ msgid "Classify messages using the anti-spam tools"
 #~ msgstr "Klasificiraj poruke koristeći anti-spam alate"
 
-#~ msgid "Let the anti-spam tools classify your messages. The wizard will create appropriate filters. The messages are usually marked by the tools so that following filters can react on this and, for example, move spam messages to a special folder."
-#~ msgstr "Dopusti anti-spam alatima da klasificiraju vaše poruke. Čarobnjak će napraviti odgovarajuće filtere. Alati obično označavaju poruke tako da ih pravila filtriranja prepoznaju i vrše akciju npr. premještaju spam poruke u poseban direktorij."
+#~ msgid ""
+#~ "Let the anti-spam tools classify your messages. The wizard will create "
+#~ "appropriate filters. The messages are usually marked by the tools so that "
+#~ "following filters can react on this and, for example, move spam messages "
+#~ "to a special folder."
+#~ msgstr ""
+#~ "Dopusti anti-spam alatima da klasificiraju vaše poruke. Čarobnjak će "
+#~ "napraviti odgovarajuće filtere. Alati obično označavaju poruke tako da ih "
+#~ "pravila filtriranja prepoznaju i vrše akciju npr. premještaju spam poruke "
+#~ "u poseban direktorij."
 
-#~ msgid "A filter to detect messages classified as spam and to move those messages into a predefined folder is created. The default folder is the trash folder, but you may change that in the folder view."
-#~ msgstr "Filter koji prepoznaje poruke klasificirane kao spam i pomjera te poruke u predefinisani direktorij koji je napravljen. Podrazumijevani direktorij je direktorij Smeće, ali možete to promijeniti u pogledu direktorija."
+#~ msgid ""
+#~ "A filter to detect messages classified as spam and to move those messages "
+#~ "into a predefined folder is created. The default folder is the trash "
+#~ "folder, but you may change that in the folder view."
+#~ msgstr ""
+#~ "Filter koji prepoznaje poruke klasificirane kao spam i pomjera te poruke "
+#~ "u predefinisani direktorij koji je napravljen. Podrazumijevani direktorij "
+#~ "je direktorij Smeće, ali možete to promijeniti u pogledu direktorija."
 
 #~ msgid "Additionally, mark detected spam messages as read"
 #~ msgstr "Dodatno, označi spam poruke kao pročitane"
@@ -15838,8 +15506,10 @@ msgstr "Piši preko"
 #~ msgstr "[%1] %2"
 
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
 #~ "Prijenos završen. %n nova poruka u %1 KB (na serveru preostaje %2 KB).\n"
 #~ "Prijenos završen. %n nove poruke u %1 KB (na serveru preostaje %2 KB).\n"
@@ -15865,12 +15535,17 @@ msgstr "Piši preko"
 #~ msgstr "Prijenos završen. Nema novih poruka."
 
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "Prijenos za račun %3 završen. %n nova poruka u %1 KB (na serveru preostaje %2 KB).\n"
-#~ "Prijenos za račun %3 završen. %n nove poruke u %1 KB (na serveru preostaje %2 KB).\n"
-#~ "Prijenos za račun %3 završen. %n novih poruka u %1 KB (na serveru preostaje %2 KB)."
+#~ "Prijenos za račun %3 završen. %n nova poruka u %1 KB (na serveru "
+#~ "preostaje %2 KB).\n"
+#~ "Prijenos za račun %3 završen. %n nove poruke u %1 KB (na serveru "
+#~ "preostaje %2 KB).\n"
+#~ "Prijenos za račun %3 završen. %n novih poruka u %1 KB (na serveru "
+#~ "preostaje %2 KB)."
 
 #~ msgid ""
 #~ "_n: Transmission for account %2 complete. %n message in %1 KB.\n"
@@ -15895,10 +15570,18 @@ msgstr "Piši preko"
 #~ msgstr "S&tani"
 
 #, fuzzy
-#~ msgid "Check this option if you want to be notified about new mail that is moved to this folder; unchecking this is useful, for example, for ignoring spam folders."
-#~ msgstr "Uključite ovu opciju ako ne želite da budete obaviješteni o novoj pošti koja stigne u ovaj direktorij. Ovo je korisno, na primjer, za ignorisanje spama."
+#~ msgid ""
+#~ "Check this option if you want to be notified about new mail that is moved "
+#~ "to this folder; unchecking this is useful, for example, for ignoring spam "
+#~ "folders."
+#~ msgstr ""
+#~ "Uključite ovu opciju ako ne želite da budete obaviješteni o novoj pošti "
+#~ "koja stigne u ovaj direktorij. Ovo je korisno, na primjer, za ignorisanje "
+#~ "spama."
 
-#~ msgid "<qt>The destination folder of the account <b>%1</b> was restored to the inbox.</qt>"
+#~ msgid ""
+#~ "<qt>The destination folder of the account <b>%1</b> was restored to the "
+#~ "inbox.</qt>"
 #~ msgstr "<qt>Odredišni direktorij računa <b>%1</b> je vraćen u inbox.</qt>"
 
 #, fuzzy
@@ -16030,11 +15713,23 @@ msgstr "Piši preko"
 #~ msgid "&Jump to first unread message when entering a folder"
 #~ msgstr "&Idi na prvu nepročitanu poruku prilikom ulaska u direktorij"
 
-#~ msgid "Your email address is not valid because it does not contain a <emph>@</emph>: you will not create valid messages if you do not change your address."
-#~ msgstr "Vaša e-mail adresa nije ispravna pošto ne sadrži znak <emph>@</emph>. Poruke koje napišete neće biti ispravne sve dok ne promijenite vašu adresu."
+#~ msgid ""
+#~ "Your email address is not valid because it does not contain a <emph>@</"
+#~ "emph>: you will not create valid messages if you do not change your "
+#~ "address."
+#~ msgstr ""
+#~ "Vaša e-mail adresa nije ispravna pošto ne sadrži znak <emph>@</emph>. "
+#~ "Poruke koje napišete neće biti ispravne sve dok ne promijenite vašu "
+#~ "adresu."
 
-#~ msgid "Your email address is not valid because it contains more than one <emph>@</emph>: you will not create valid messages if you do not change your address."
-#~ msgstr "Vaša e-mail adresa nije ispravna pošto sadrži više od jednog znaka <emph>@</emph>. Poruke koje napišete neće biti ispravne sve dok ne promijenite vašu adresu."
+#~ msgid ""
+#~ "Your email address is not valid because it contains more than one "
+#~ "<emph>@</emph>: you will not create valid messages if you do not change "
+#~ "your address."
+#~ msgstr ""
+#~ "Vaša e-mail adresa nije ispravna pošto sadrži više od jednog znaka "
+#~ "<emph>@</emph>. Poruke koje napišete neće biti ispravne sve dok ne "
+#~ "promijenite vašu adresu."
 
 #~ msgid "cannot open ~/dead.letter.tmp for saving the current message: "
 #~ msgstr "ne mogu otvoriti ~/dead.letter.tmp za snimanje trenutne poruke: "
@@ -16106,12 +15801,18 @@ msgstr "Piši preko"
 #~ msgstr "O&briši"
 
 #~ msgid ""
-#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/Mail for its messages.\n"
-#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but this will replace existing files with the same name in the directory ~/Mail (e.g. inbox).\n"
+#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/"
+#~ "Mail for its messages.\n"
+#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but "
+#~ "this will replace existing files with the same name in the directory ~/"
+#~ "Mail (e.g. inbox).\n"
 #~ "Should KMail move the mail folders now?"
 #~ msgstr ""
-#~ "Direktorij ~/KMail postoji. Od sada, KMail koristi direktorij ~/Mail za svoje poruke.\n"
-#~ "KMail može pomaknuti sadržaj ~/KMail direktorija u ~/Mail, međutim to će zamijeniti postojeće datoteke sa istim imenom u direktoriju ~/Mail (npr. inbox).\n"
+#~ "Direktorij ~/KMail postoji. Od sada, KMail koristi direktorij ~/Mail za "
+#~ "svoje poruke.\n"
+#~ "KMail može pomaknuti sadržaj ~/KMail direktorija u ~/Mail, međutim to će "
+#~ "zamijeniti postojeće datoteke sa istim imenom u direktoriju ~/Mail (npr. "
+#~ "inbox).\n"
 #~ "Da želite li da KMail pomakne direktorije ?"
 
 #~ msgid "Expire old Messages?"
@@ -16141,8 +15842,12 @@ msgstr "Piši preko"
 #~ msgid "Copy to Clipboard"
 #~ msgstr "Kopiraj na clipboard"
 
-#~ msgid "Support for 3rd-party CryptPlugs has been discontinued. Support for the GnuPG cryptographic backend is now included directly in KMail."
-#~ msgstr "Podrška za kripto-dodatke trećih lica je prekinuta. Podrška za GnuPG kriptografski sistem je sada uključena direktno u KMail."
+#~ msgid ""
+#~ "Support for 3rd-party CryptPlugs has been discontinued. Support for the "
+#~ "GnuPG cryptographic backend is now included directly in KMail."
+#~ msgstr ""
+#~ "Podrška za kripto-dodatke trećih lica je prekinuta. Podrška za GnuPG "
+#~ "kriptografski sistem je sada uključena direktno u KMail."
 
 #~ msgid "Antispam wizard"
 #~ msgstr "Anti-spam čarobnjak"
diff --git a/tde-i18n-ca/messages/tdepim/kmail.po b/tde-i18n-ca/messages/tdepim/kmail.po
index 520cc79a7d6..8207b4788f5 100644
--- a/tde-i18n-ca/messages/tdepim/kmail.po
+++ b/tde-i18n-ca/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-07-29 20:36+0200\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -19,14 +19,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 "Sebastià Pla i Sanz,Antoni Bella Perez,Albert Astals Cid,Josep Ma. Ferrer"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "&Cap (empreu-ho amb cura)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Compte per a gestionar recursos semiautomàticament"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Neteja passat"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -189,8 +195,8 @@ msgstr "Neteja passat"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Esborra totes les assignacions desfasades per al recurs representat per aquest "
-"compte."
+"Esborra totes les assignacions desfasades per al recurs representat per "
+"aquest compte."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -250,14 +256,14 @@ msgstr "&Usuari:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"El vostre proveïdor d'accés a Internet us va donar un <em>nom d'usuari</em>"
-", el qual s'usarà per a autenticar-se amb els seus servidors. Habitualment és "
-"la primera part de la vostra adreça de correu electrònic (la que hi ha abans de "
-"la <em>@</em>)."
+"El vostre proveïdor d'accés a Internet us va donar un <em>nom d'usuari</em>, "
+"el qual s'usarà per a autenticar-se amb els seus servidors. Habitualment és "
+"la primera part de la vostra adreça de correu electrònic (la que hi ha abans "
+"de la <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -278,16 +284,16 @@ msgstr "&Desa la contrasenya POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Marqueu aquesta opció perquè el KMail emmagatzemi la contrasenya\n"
-"Si el TDEWallet està disponible la contrasenya es desarà allí, la qual cosa es "
-"considera segura.\n"
+"Si el TDEWallet està disponible la contrasenya es desarà allí, la qual cosa "
+"es considera segura.\n"
 "En canvi, si el TDEWallet no està disponible, la contrasenya es desarà al "
 "fitxer de configuració del KMail. La contrasenya s'emmagatzema en un format "
 "ofuscat, però no s'hauria de considerar segur contra intents de desxifrat si "
@@ -319,12 +325,13 @@ msgstr "&Filtra els missatges si són més grans que"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Si seleccioneu aquesta opció, els filtres POP s'usaran per a decidir què fer "
-"amb els missatges. Llavors podreu escollir entre descarregar-los, esborrar-los "
-"o deixar-los al servidor."
+"amb els missatges. Llavors podreu escollir entre descarregar-los, esborrar-"
+"los o deixar-los al servidor."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -373,13 +380,15 @@ msgstr "Te&xt en clar"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -422,19 +431,20 @@ msgstr "Espais de nom:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Aquí veieu els diferents espais de nom que admet el vostre servidor IMAP. Cada "
-"espai de nom representa un prefix que separa grups de carpetes. Els espais de "
-"nom permeten, per exemple, que KMail mostri les carpetes personals i "
-"compartides en un compte."
+"Aquí veieu els diferents espais de nom que admet el vostre servidor IMAP. "
+"Cada espai de nom representa un prefix que separa grups de carpetes. Els "
+"espais de nom permeten, per exemple, que KMail mostri les carpetes personals "
+"i compartides en un compte."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
 msgstr ""
-"Refresca els espais de nom des del servidor. Això sobreescriu tots els canvis."
+"Refresca els espais de nom des del servidor. Això sobreescriu tots els "
+"canvis."
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -487,9 +497,9 @@ msgstr "Carre&ga els adjunts sota demanda"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Activeu per no carregar els adjunts automàticament en seleccionar el correu "
 "electrònic sinó en prémer sobre l'adjunt. D'aquesta forma també els correus "
@@ -504,8 +514,9 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Només se cerquen subcarpetes a les carpetes que estan obertes (desplegades) a "
-"l'arbre de carpetes. Useu aquesta opció si hi ha moltes carpetes al servidor."
+"Només se cerquen subcarpetes a les carpetes que estan obertes (desplegades) "
+"a l'arbre de carpetes. Useu aquesta opció si hi ha moltes carpetes al "
+"servidor."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -533,7 +544,7 @@ msgstr "<cap>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "entrada"
 
@@ -541,8 +552,8 @@ msgstr "entrada"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "El servidor no sembla permetre números de missatge únics, que és un requisit "
 "per deixar els missatges al servidor.\n"
@@ -554,32 +565,33 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"El servidor no sembla permetre la recuperació de les capçaleres dels missatges, "
-"que és un requisit per filtrar els missatges en el servidor.\n"
+"El servidor no sembla permetre la recuperació de les capçaleres dels "
+"missatges, que és un requisit per filtrar els missatges en el servidor.\n"
 "Ja que alguns servidors no anuncien correctament les seves capacitats encara "
 "teniu la possibilitat de deixar activada l'opció de filtrar els missatges al "
 "servidor."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Tingueu en compte que aquesta funció pot causar que en servidors POP3 que no "
 "permetin el paral·lelisme acabin enviant missatges corromputs.\n"
-"Això és configurable, atès que alguns servidors permeten el paral·lelisme però "
-"no anuncien les seves capacitats. Per a comprovar si el vostre servidor POP3 "
-"anuncia el funcionament de paral·lelisme empreu el botó \"Comprova què és el "
-"que permet el servidor\" a sota del diàleg.\n"
+"Això és configurable, atès que alguns servidors permeten el paral·lelisme "
+"però no anuncien les seves capacitats. Per a comprovar si el vostre servidor "
+"POP3 anuncia el funcionament de paral·lelisme empreu el botó \"Comprova què "
+"és el que permet el servidor\" a sota del diàleg.\n"
 "Si el vostre servidor no ho anuncia, però voleu més velocitat, haureu de fer "
 "algunes proves prèvies enviant-vos diversos missatges i descarregant-los "
 "després."
@@ -590,35 +602,36 @@ msgstr "Primer especifiqueu un servidor i un port a la pestanya General."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "El servidor no sembla permetre el paral·lelisme, per tant, s'ha desactivat "
 "aquesta opció.\n"
-"Ja que hi ha alguns servidors que no anuncien correctament les seves capacitats "
-"encara teniu la possibilitat d'activar el paral·lelisme. Però tingueu en compte "
-"que aquesta característica pot causar que alguns servidors que no permeten el "
-"paral·lelisme enviïn missatges corromputs. Per tant abans d'usar aquesta "
-"característica amb correu important, primer hauríeu de provar-ho enviant-vos "
-"una quantitat gran de missatges de prova i descarregant-los d'un cop del "
-"servidor POP."
+"Ja que hi ha alguns servidors que no anuncien correctament les seves "
+"capacitats encara teniu la possibilitat d'activar el paral·lelisme. Però "
+"tingueu en compte que aquesta característica pot causar que alguns servidors "
+"que no permeten el paral·lelisme enviïn missatges corromputs. Per tant abans "
+"d'usar aquesta característica amb correu important, primer hauríeu de provar-"
+"ho enviant-vos una quantitat gran de missatges de prova i descarregant-los "
+"d'un cop del servidor POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "El servidor no sembla permetre números de missatge únics, que és un requisit "
-"per deixar els missatges al servidor, per tant aquesta opció s'ha desactivat\n"
+"per deixar els missatges al servidor, per tant aquesta opció s'ha "
+"desactivat\n"
 "Ja que alguns servidors no anuncien correctament les seves capacitats encara "
 "teniu la possibilitat de deixar activada l'opció de deixar els missatges "
 "recuperats al servidor."
@@ -628,12 +641,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"El servidor no sembla permetre la recuperació de les capçaleres dels missatges, "
-"que és un requisit per filtrar els missatges al servidor, per tant aquesta "
-"opció s'ha desactivat.\n"
+"El servidor no sembla permetre la recuperació de les capçaleres dels "
+"missatges, que és un requisit per filtrar els missatges al servidor, per "
+"tant aquesta opció s'ha desactivat.\n"
 "Ja que alguns servidors no anuncien correctament les seves capacitats encara "
 "teniu la possibilitat de deixar activada l'opció de filtrar els missatges al "
 "servidor."
@@ -716,8 +729,8 @@ msgstr "Compte IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Heu d'afegir un compte a les opcions de xarxa per a poder rebre el correu."
 
@@ -755,14 +768,14 @@ msgstr "Benvingut al KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Sembla que heu engegat el KMail per primera vegada. Podeu usar aquest "
 "auxiliar per configurar els vostres comptes de correu. Només heu d'introduir "
-"les dades de connexió que hàgiu rebut del vostre proveïdor de correu electrònic "
-"a les següents pàgines.</qt>"
+"les dades de connexió que hàgiu rebut del vostre proveïdor de correu "
+"electrònic a les següents pàgines.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -824,8 +837,7 @@ msgstr "Usa lliurament local"
 msgid "Server Information"
 msgstr "Informació del servidor"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Cap"
@@ -918,8 +930,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>No s'han trobat eines de detecció de correu brossa. Instal·leu el programari "
-"de detecció i torneu a executar aquest assistent.</p>"
+"<p>No s'han trobat eines de detecció de correu brossa. Instal·leu el "
+"programari de detecció i torneu a executar aquest assistent.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -945,8 +957,8 @@ msgstr "<br>El missatges brossa no es mouen a cap carpeta.</p>"
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>La carpeta pels missatges classificats com a dubtosos (brossa probable) és "
-"<i>"
+"<p>La carpeta pels missatges classificats com a dubtosos (brossa probable) "
+"és <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -966,37 +978,35 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Aquí podeu obtenir ajuda per configurar les regles de filtratge del KMail "
-"per usar algunes de les eines més comunes contra els virus.</p>"
-"<p>L'assistent pot detectar aquestes eines al vostre ordinador així com crear "
-"regles de filtratge per classificar els missatges i separar els missatges que "
-"tinguin virus. L'assistent no tindrà en compte cap regla existent: sempre "
-"afegeix regles noves.</p>"
-"<p><b>Atenció:</b> Com el KMail es bloqueja mentre es comprova si els correus "
-"tenen virus, podeu trobar problemes amb la resposta del KMail ja que les eines "
-"contra els virus normalment consumeixen bastant de temps. Considereu eliminar "
-"les regles de filtratge creades per l'assistent per recuperar el comportament "
-"anterior."
+"per usar algunes de les eines més comunes contra els virus.</"
+"p><p>L'assistent pot detectar aquestes eines al vostre ordinador així com "
+"crear regles de filtratge per classificar els missatges i separar els "
+"missatges que tinguin virus. L'assistent no tindrà en compte cap regla "
+"existent: sempre afegeix regles noves.</p><p><b>Atenció:</b> Com el KMail es "
+"bloqueja mentre es comprova si els correus tenen virus, podeu trobar "
+"problemes amb la resposta del KMail ja que les eines contra els virus "
+"normalment consumeixen bastant de temps. Considereu eliminar les regles de "
+"filtratge creades per l'assistent per recuperar el comportament anterior."
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Seleccioneu les eines a usar per a la detecció i aneu a la pàgina "
-"següent.</p>"
+"<p>Seleccioneu les eines a usar per a la detecció i aneu a la pàgina següent."
+"</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1005,7 +1015,8 @@ msgstr "&Marca els missatges detectats com a correu brossa com a llegits"
 #: antispamwizard.cpp:947
 msgid "Mark messages which have been classified as spam as read."
 msgstr ""
-"Marca els missatges que s'hagin classificat com a correu brossa com a llegits."
+"Marca els missatges que s'hagin classificat com a correu brossa com a "
+"llegits."
 
 #: antispamwizard.cpp:950
 msgid "Move &known spam to:"
@@ -1025,15 +1036,14 @@ msgstr "Mou el correu brossa &probable a:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "La carpeta per omissió és la d'entrada, però podeu canviar-ho a la vista de "
-"carpetes inferior. "
-"<p>No totes les eines admeten classificacions dubtoses. Si no heu seleccionat "
-"una eina que ho admeti, tampoc podreu seleccionar una carpeta."
+"carpetes inferior. <p>No totes les eines admeten classificacions dubtoses. "
+"Si no heu seleccionat una eina que ho admeti, tampoc podreu seleccionar una "
+"carpeta."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1043,13 +1053,13 @@ msgstr "Comprova els missatges usant les eines antivirus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Permet que les eines antivirus comprovin els vostres missatges. L'assistent "
-"crearà els filtres apropiats. Les eines solen marcar els missatges per tal que "
-"els filtres posteriors hi puguin reaccionar i, per exemple, moure els missatges "
-"amb virus a una carpeta especial."
+"crearà els filtres apropiats. Les eines solen marcar els missatges per tal "
+"que els filtres posteriors hi puguin reaccionar i, per exemple, moure els "
+"missatges amb virus a una carpeta especial."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1058,11 +1068,11 @@ msgstr "Mou els missatges amb virus detectats a la carpeta seleccionada"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Es crea un filtre per detectar els missatges infectats per virus i moure'ls a "
-"una carpeta determinada. La carpeta per omissió és la paperera, però podeu "
+"Es crea un filtre per detectar els missatges infectats per virus i moure'ls "
+"a una carpeta determinada. La carpeta per omissió és la paperera, però podeu "
 "canviar-la a la vista de les carpetes."
 
 #: antispamwizard.cpp:1084
@@ -1071,8 +1081,8 @@ msgstr "A més a més, marca els missatges amb virus detectats com a llegits"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Marca els missatges que s'hagin classificat com a infectats per virus com a "
 "llegits a més a més de moure'ls a la carpeta seleccionada."
@@ -1255,9 +1265,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Això pot ser perquè no disposeu de prou permisos per a fer-ho o que la carpeta "
-"ja és present al servidor. El missatge d'error de la comunicació amb el "
-"servidor és aquest:"
+"Això pot ser perquè no disposeu de prou permisos per a fer-ho o que la "
+"carpeta ja és present al servidor. El missatge d'error de la comunicació amb "
+"el servidor és aquest:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1270,8 +1280,8 @@ msgstr "S'ha produït un error en llegir la carpeta %1 al servidor: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1291,8 +1301,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1323,20 +1333,21 @@ msgstr "Esborrat"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Cap de les vostres identitats coincideix amb el receptor d'aquest missatge,"
-"<br> seleccioneu quina de les següents adreces és la vostra, si hi és:"
+"<qt>Cap de les vostres identitats coincideix amb el receptor d'aquest "
+"missatge,<br> seleccioneu quina de les següents adreces és la vostra, si hi "
+"és:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Diverses identitats vostres coincideixen amb el receptor d'aquest missatge,"
-"<br> seleccioneu quina de les següents adreces és la vostra:"
+"<qt>Diverses identitats vostres coincideixen amb el receptor d'aquest "
+"missatge,<br> seleccioneu quina de les següents adreces és la vostra:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1366,18 +1377,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aquesta opció ha estat establerta pel vostre administrador.</p>"
-"<p>Si creieu que es tracta d'un error, contacteu amb ell.</p></qt>"
+"<qt><p>Aquesta opció ha estat establerta pel vostre administrador.</p><p>Si "
+"creieu que es tracta d'un error, contacteu amb ell.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Carre&ga perfil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configura el compte"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Afegeix..."
@@ -1407,6 +1421,11 @@ msgstr "<qt>De veres voleu eliminar la identitat anomenada <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Elimina identitat"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "E&limina"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Afegeix..."
@@ -1415,6 +1434,11 @@ msgstr "Afegeix..."
 msgid "Modify..."
 msgstr "Modifica..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "E&limina"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Estableix per omissió"
@@ -1431,17 +1455,15 @@ msgstr "En&via"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Comptes de sortida (afegiu-ne un com a mínim):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nom"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipus"
@@ -1463,8 +1485,7 @@ msgstr "Estableix per omissió"
 msgid "Common Options"
 msgstr "Opcions comuns"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Confirma abans d'&enviar"
@@ -1515,17 +1536,16 @@ msgstr "&Domini predeterminat:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El nom de domini per omissió s'empra per a completar l'adreça de correu que "
-"tan sols consisteixi en un nom d'usuari.</p></qt>"
+"<qt><p>El nom de domini per omissió s'empra per a completar l'adreça de "
+"correu que tan sols consisteixi en un nom d'usuari.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1543,9 +1563,9 @@ msgstr "Afegeix transport"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (predeterminat)"
 
@@ -1628,6 +1648,10 @@ msgstr "Modifica compte"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>No s'ha pogut localitzar el compte <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Colo&rs"
@@ -1736,8 +1760,7 @@ msgstr "Enllaç visitat"
 msgid "Misspelled Words"
 msgstr "Paraules mal escrites"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Missatge nou"
@@ -1858,7 +1881,8 @@ msgstr "&No mostris el plafó de vista prèvia de missatges"
 #: configuredialog.cpp:1895
 msgid "Show the message preview pane belo&w the message list"
 msgstr ""
-"Mos&tra el plafó de vista prèvia del missatge a sota de la llista de missatges"
+"Mos&tra el plafó de vista prèvia del missatge a sota de la llista de "
+"missatges"
 
 #: configuredialog.cpp:1896
 msgid "Show the message preview pane ne&xt to the message list"
@@ -1928,8 +1952,8 @@ msgstr "Fils de conversa tancats per omissió"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Obre els fils de con&versa que continguin missatges nous, sense llegir o "
 "importants i mostra els fils vigilats."
@@ -1940,72 +1964,58 @@ msgstr "Mostra la data"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquestes són les expressions que poden usar-se per a la data:</strong> </p>"
-"<ul>"
-"<li>d - El dia com a un número sense el zero afegit (1-31)</li>"
-"<li>dd - El dia com a un número amb el zero afegit (01-31)</li>"
-"<li>ddd - El nom del dia en format abreujat (dil - diu)</li>"
-"<li>dddd - El nom del dia en format llarg (dilluns - diumenge)</li>"
-"<li>M - El mes com a un número sense el zero afegit (1-12)</li> "
-"<li>MM - El dia com a un número amb el zero afegit (01-12)</li>"
-"<li>MMM - El nom del mes en format abreujat (gen - dec)</li>"
-"<li>MMMM - El nom del mes en format abreujat (gener - desembre)</li>"
-"<li>yy - L'any com a un número de dos dígits (00-99)</li>"
-"<li>yyyy - L'any com a un número de quatre dígits (0000-9999) </li></ul><B>"
-"Per al temps poden usar-se les següents expressions:</p><strong> "
-"<ul>"
-"<li>h - L'hora sense el zero afegit (0-23 o 1-12 si són AM/PM)</li>"
-"<li>hh - L'hora amb el zero afegit (00-23 o 01-12 si són AM/PM)</li>"
-"<li>m - Els minuts sense el zero afegit (0-59)</li>"
-"<li>mm - Els minuts amb el zero afegit (00-59) </li>"
-"<li>s - Els segons sense el zero afegit (0-59)</li>"
-"<li>ss - Els segons amb el zero afegit (00-59)</li>"
-"<li>z - Els mil·lisegons sense els zeros afegits (0-999) </li>"
-"<li>zzz - Els mil·lisegons amb els zeros afegits (000-999)</li>"
-"<li>AP - La marca per a mostrar AM/PM. AP se substituirà per \"AM\" o "
-"\"PM\".</li>"
-"<li>ap - La marca per a mostrar AM/PM. ap se substituirà per \"am\" o "
-"\"pm\".</li>"
-"<li>Z - La zona horària en format numèric (-0500)</li></ul>"
-"<p><strong>Tots els altres caràcters introduïts s'ometran.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p>Aquestes són les expressions que poden usar-se per a la data:</"
+"strong> </p><ul><li>d - El dia com a un número sense el zero afegit (1-31)</"
+"li><li>dd - El dia com a un número amb el zero afegit (01-31)</li><li>ddd - "
+"El nom del dia en format abreujat (dil - diu)</li><li>dddd - El nom del dia "
+"en format llarg (dilluns - diumenge)</li><li>M - El mes com a un número "
+"sense el zero afegit (1-12)</li> <li>MM - El dia com a un número amb el zero "
+"afegit (01-12)</li><li>MMM - El nom del mes en format abreujat (gen - dec)</"
+"li><li>MMMM - El nom del mes en format abreujat (gener - desembre)</"
+"li><li>yy - L'any com a un número de dos dígits (00-99)</li><li>yyyy - L'any "
+"com a un número de quatre dígits (0000-9999) </li></ul><B>Per al temps poden "
+"usar-se les següents expressions:</p><strong> <ul><li>h - L'hora sense el "
+"zero afegit (0-23 o 1-12 si són AM/PM)</li><li>hh - L'hora amb el zero "
+"afegit (00-23 o 01-12 si són AM/PM)</li><li>m - Els minuts sense el zero "
+"afegit (0-59)</li><li>mm - Els minuts amb el zero afegit (00-59) </li><li>s "
+"- Els segons sense el zero afegit (0-59)</li><li>ss - Els segons amb el zero "
+"afegit (00-59)</li><li>z - Els mil·lisegons sense els zeros afegits (0-999) "
+"</li><li>zzz - Els mil·lisegons amb els zeros afegits (000-999)</li><li>AP - "
+"La marca per a mostrar AM/PM. AP se substituirà per \"AM\" o \"PM\".</"
+"li><li>ap - La marca per a mostrar AM/PM. ap se substituirà per \"am\" o \"pm"
+"\".</li><li>Z - La zona horària en format numèric (-0500)</li></"
+"ul><p><strong>Tots els altres caràcters introduïts s'ometran.</strong></p></"
+"qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Canviar la configuració global dels fils de conversa afectarà a tots els valors "
-"específics de les carpetes."
+"Canviar la configuració global dels fils de conversa afectarà a tots els "
+"valors específics de les carpetes."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2019,8 +2029,7 @@ msgstr "Mostra la barra d'estat &HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Mostra l'estat de correu brossa en capçaleres &decorades"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Substitueix les emoticones per icones"
@@ -2029,8 +2038,7 @@ msgstr "Substitueix les emoticones per icones"
 msgid "Use smaller font for quoted text"
 msgstr "Usa una lletra més petita per al text citat"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Mostra les marques per plegar/desplegar les cites"
@@ -2056,8 +2064,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Rectifica la codificació de caràcters:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Habilita la icona a la safata del sistema"
@@ -2160,22 +2167,19 @@ msgstr "<b>%f</b> se substituirà amb el nom del fitxer a editar."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Les següents variables poden usar-se a les frases de resposta:"
-"<br><b>%D</b>: data, <b>%S</b>: assumpte,"
-"<br><b>%e</b>: adreça del remitent, <b>%F</b>: nom del remitent, <b>%f</b>"
-": inicials del remitent,"
-"<br><b>%T</b>: nom del destinatari, <b>%t</b>: adreça i nom del destinatari"
-"<br><b>%C</b>: noms de còpia oculta, <b>%c</b>: noms i adreces de còpia oculta"
-"<br><b>%%</b>: símbol de percentatge, <b>%_</b>: espai, <b>%L</b>"
-": salt de línia</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Les següents variables poden usar-se a les frases de resposta:<br><b>%D</"
+"b>: data, <b>%S</b>: assumpte,<br><b>%e</b>: adreça del remitent, <b>%F</b>: "
+"nom del remitent, <b>%f</b>: inicials del remitent,<br><b>%T</b>: nom del "
+"destinatari, <b>%t</b>: adreça i nom del destinatari<br><b>%C</b>: noms de "
+"còpia oculta, <b>%c</b>: noms i adreces de còpia oculta<br><b>%%</b>: símbol "
+"de percentatge, <b>%_</b>: espai, <b>%L</b>: salt de línia</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2198,21 +2202,20 @@ msgstr "Respon a &tots:"
 msgid "&Forward:"
 msgstr "Reen&via:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "In&dicador de cita:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "A %D, vàreu escriure:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "A %D, %F va escriure:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Missatge reenviat"
 
@@ -2250,11 +2253,11 @@ msgstr "Introduïu un prefix nou per a reenviar:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Aquesta llista es comprova de dalt a baix cada vegada que s'envia un missatge "
-"cercant un joc de caràcters amb tots els caràcters requerits."
+"Aquesta llista es comprova de dalt a baix cada vegada que s'envia un "
+"missatge cercant un joc de caràcters amb tots els caràcters requerits."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2289,10 +2292,9 @@ msgstr "Valor"
 msgid "Ne&w"
 msgstr "&Nou"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "No&m:"
@@ -2301,16 +2303,15 @@ msgstr "No&m:"
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Anomenament dels adjunts compatible amb l'Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Activeu aquesta opció per fer que l'Outlook(tm) comprengui els noms dels "
 "adjunts que continguin caràcters no anglesos"
@@ -2341,21 +2342,22 @@ msgstr "adjuntat"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Heu triat codificar noms adjunts que contenen caràcters no anglesos d'una forma "
-"que entenen l'Outlook(tm) i altres clients de correu que no funcionen per a "
-"noms adjunts codificats d'acord amb els estàndards.\n"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Heu triat codificar noms adjunts que contenen caràcters no anglesos d'una "
+"forma que entenen l'Outlook(tm) i altres clients de correu que no funcionen "
+"per a noms adjunts codificats d'acord amb els estàndards.\n"
 "Tingueu present que el KMail pot crear missatges que no compleixin els "
-"estàndards, i com a conseqüència, és possible que els vostres missatges no els "
-"entenguin els clients de correu conformes amb els estàndards. Per tant, a menys "
-"que no tingueu altra alternativa, no hauríeu d'habilitar aquesta opció."
+"estàndards, i com a conseqüència, és possible que els vostres missatges no "
+"els entenguin els clients de correu conformes amb els estàndards. Per tant, "
+"a menys que no tingueu altra alternativa, no hauríeu d'habilitar aquesta "
+"opció."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2379,113 +2381,101 @@ msgstr "Connectors de &xifratge"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Els missatges de correu de vegades arriben en ambdós formats. Aquesta opció "
-"controla si desitgeu veure la part HTML o la part de text pla.</p> "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Els missatges de correu de vegades arriben en ambdós formats. Aquesta "
+"opció controla si desitgeu veure la part HTML o la part de text pla.</p> "
 "<p>Mostrar la part HTML fa que el missatge tingui una millor aparença, però "
-"tanmateix incrementa el risc que s'explotin forats de seguretat.</p>"
-"<p>Mostrar la part de text pla fa que es perdi gran part del format del "
-"missatge però fa gairebé <em>impossible</em> que s'explotin forats de seguretat "
-"al motor de l'HTML (Konqueror).</p>"
-"<p>L'opció inferior us protegeix contra el mal ús habitual dels missatges HTML, "
-"però no pot protegir-vos contra altres errors de seguretat no coneguts en el "
-"moment en què s'escrivia aquesta versió del KMail.</p>"
-"<p>És aconsellable <em>no</em> preferir HTML a text pla.</p>"
-"<p><b>Nota:</b> podeu configurar aquesta opció per a cada carpeta des del menú "
-"<i>Carpeta</i> a la finestra principal del KMail.</p></qt>"
+"tanmateix incrementa el risc que s'explotin forats de seguretat.</"
+"p><p>Mostrar la part de text pla fa que es perdi gran part del format del "
+"missatge però fa gairebé <em>impossible</em> que s'explotin forats de "
+"seguretat al motor de l'HTML (Konqueror).</p><p>L'opció inferior us "
+"protegeix contra el mal ús habitual dels missatges HTML, però no pot "
+"protegir-vos contra altres errors de seguretat no coneguts en el moment en "
+"què s'escrivia aquesta versió del KMail.</p><p>És aconsellable <em>no</em> "
+"preferir HTML a text pla.</p><p><b>Nota:</b> podeu configurar aquesta opció "
+"per a cada carpeta des del menú <i>Carpeta</i> a la finestra principal del "
+"KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Alguns missatges d'anunci estan en HTML i contenen referències a imatges que "
-"aquests anuncis usen per a saber si s'ha llegit el seu correu (&quot;errors "
-"web&quot;).</p>"
-"<p>No hi ha cap motiu vàlid per a carregar imatges de la xarxa així, atès que "
-"el remitent sempre pot adjuntar-les directament.</p>"
-"<p>Per a protegir-vos d'aquest mal ús de l'HTML, aquesta opció està <em>"
-"deshabilitada</em> per omissió.</p>"
-"<p>D'altra manera, si voleu veure imatges en missatges HTML que no estiguin "
-"adjuntes, podeu habilitar aquesta opció, però haureu d'estar atent a aquest "
-"possible problema.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Alguns missatges d'anunci estan en HTML i contenen referències a "
+"imatges que aquests anuncis usen per a saber si s'ha llegit el seu correu "
+"(&quot;errors web&quot;).</p><p>No hi ha cap motiu vàlid per a carregar "
+"imatges de la xarxa així, atès que el remitent sempre pot adjuntar-les "
+"directament.</p><p>Per a protegir-vos d'aquest mal ús de l'HTML, aquesta "
+"opció està <em>deshabilitada</em> per omissió.</p><p>D'altra manera, si "
+"voleu veure imatges en missatges HTML que no estiguin adjuntes, podeu "
+"habilitar aquesta opció, però haureu d'estar atent a aquest possible "
+"problema.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Política de notificació de disposició de missatge (MDN)</h3>"
-"<p>Els MDN són una generalització del que normalment anomenem <b>"
-"justificant de recepció</b>. L'autor del missatge sol·licita que s'enviï una "
-"notificació de disposició i el programa de correu del receptor genera una "
-"resposta amb què l'autor pot saber què ha passat amb el seu missatge. Els tipus "
-"de disposició comuns inclouen <b>mostrat</b> (per exemple, que s'ha llegit), <b>"
-"esborrat</b> i <b>tramès</b> (per exemple, que ha estat reenviat).</p>"
-"<p>Les opcions següents estan disponibles per a controlar l'enviament MDN des "
-"del KMail:</p>"
-"<ul>"
-"<li><em>Ignora</em>: Ignora totes les peticions per a notificacions de "
-"disposició. No s'enviarà cap MDN automàticament (recomanat).</li>"
-"<li><em>Pregunta</em>: Respon les peticions després de demanar permís a "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Política de notificació de disposició de missatge (MDN)</h3><p>Els "
+"MDN són una generalització del que normalment anomenem <b>justificant de "
+"recepció</b>. L'autor del missatge sol·licita que s'enviï una notificació de "
+"disposició i el programa de correu del receptor genera una resposta amb què "
+"l'autor pot saber què ha passat amb el seu missatge. Els tipus de disposició "
+"comuns inclouen <b>mostrat</b> (per exemple, que s'ha llegit), <b>esborrat</"
+"b> i <b>tramès</b> (per exemple, que ha estat reenviat).</p><p>Les opcions "
+"següents estan disponibles per a controlar l'enviament MDN des del KMail:</"
+"p><ul><li><em>Ignora</em>: Ignora totes les peticions per a notificacions de "
+"disposició. No s'enviarà cap MDN automàticament (recomanat).</"
+"li><li><em>Pregunta</em>: Respon les peticions després de demanar permís a "
 "l'usuari. D'aquesta manera podeu enviar els MDN per a missatges seleccionats "
-"mentre que els rebutgeu o ignoreu per a altres.</li>"
-"<li><em>Denega</em>: Envia sempre una notificació de <b>denegat</b>"
-". Això és <em>una mica</em> millor que enviar-les sempre. L'autor sabrà que els "
-"missatges s'han gestionat, però no podrà dir si s'han esborrat o llegit, "
-"etc.</li>"
-"<li><em>Envia sempre</em>: Envia sempre la notificació de disposició "
-"sol·licitada. Això significa que l'autor del missatge sabrà quan s'ha gestionat "
-"el missatge i què ha passat amb el mateix (s'ha mostrat, s'ha esborrat, etc.). "
-"Aquesta opció es desaconsella vivament, però, com que té sentit, per exemple en "
-"la gestió de relacions amb els clients, està disponible.</li></ul></qt>"
+"mentre que els rebutgeu o ignoreu per a altres.</li><li><em>Denega</em>: "
+"Envia sempre una notificació de <b>denegat</b>. Això és <em>una mica</em> "
+"millor que enviar-les sempre. L'autor sabrà que els missatges s'han "
+"gestionat, però no podrà dir si s'han esborrat o llegit, etc.</"
+"li><li><em>Envia sempre</em>: Envia sempre la notificació de disposició "
+"sol·licitada. Això significa que l'autor del missatge sabrà quan s'ha "
+"gestionat el missatge i què ha passat amb el mateix (s'ha mostrat, s'ha "
+"esborrat, etc.). Aquesta opció es desaconsella vivament, però, com que té "
+"sentit, per exemple en la gestió de relacions amb els clients, està "
+"disponible.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2501,15 +2491,15 @@ msgstr "&Permet carregar referències externes d'Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>ATENCIÓ:</b> Permetre HTML en el correu pot incrementar el risc que el "
-"vostre sistema estigui compromès per forats de seguretat presents i futurs. <a "
-"href=\"whatsthis:%1\">Més informació quant a correus HTML...</a> "
-"i <a href=\"whatsthis:%2\">Més informació quant a referències externes...</a>"
+"vostre sistema estigui compromès per forats de seguretat presents i futurs. "
+"<a href=\"whatsthis:%1\">Més informació quant a correus HTML...</a> i <a "
+"href=\"whatsthis:%2\">Més informació quant a referències externes...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2583,15 +2573,14 @@ msgstr "Importa claus i certificats automàticament"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Canviar la configuració global de l'HTML sobreescriurà els valors específics de "
-"les carpetes."
+"Canviar la configuració global de l'HTML sobreescriurà els valors específics "
+"de les carpetes."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Aquesta opció necessita dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "sense intermediari"
@@ -2620,8 +2609,8 @@ msgstr "Impedei&x que caduquin els missatges importants"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Quan s'intentin trobar missatges sense llegir:"
 
@@ -2645,8 +2634,8 @@ msgstr "Recorre totes les carpetes"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "En entrar a una carpeta:"
 
@@ -2715,27 +2704,23 @@ msgstr "Directoris (format \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Això selecciona quin format de bústia s'emprarà a les carpetes locals:</p>"
-"<p><b>mbox:</b> Les carpetes del KMail es representen per un fitxer cada una. "
-"Els missatges se separen mitjançant una línia que comença per \"From\". Això "
-"estalvia espai al disc però és menys robust, p.ex. en moure correu entre "
-"carpetes.</p>"
-"<p><b>maildir:</b> Les carpetes del KMail es representen per carpetes reals al "
-"disc. Els missatges són fitxers separats. Pot ocasionar una mica de pèrdua "
-"d'espai al disc però és molt més robust a l'hora de moure missatges entre "
-"carpetes.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Això selecciona quin format de bústia s'emprarà a les carpetes locals:"
+"</p><p><b>mbox:</b> Les carpetes del KMail es representen per un fitxer cada "
+"una. Els missatges se separen mitjançant una línia que comença per \"From\". "
+"Això estalvia espai al disc però és menys robust, p.ex. en moure correu "
+"entre carpetes.</p><p><b>maildir:</b> Les carpetes del KMail es representen "
+"per carpetes reals al disc. Els missatges són fitxers separats. Pot "
+"ocasionar una mica de pèrdua d'espai al disc però és molt més robust a "
+"l'hora de moure missatges entre carpetes.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2768,54 +2753,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Quan se salta al missatge següent sense llegir, podria passar que per sota "
-"del missatge actual no n'hi hagi més sense llegir.</p>"
-"<p><b>No ho recórreguis tot:</b> La cerca s'aturarà a l'últim missatge de la "
-"carpeta actual.</p>"
-"<p><b>Recorre la carpeta actual:</b> La cerca anirà des del primer a l'últim "
-"missatge de la carpeta actual.</p>"
-"<p><b>Recorre totes les carpetes:</b> La cerca anirà des del primer a l'últim "
-"missatge. Si no es troben missatges sense llegir es continuarà per la següent "
-"carpeta.</p>"
-"<p>De manera semblant, en cercar un missatge anterior sense llegir, la cerca "
-"començarà des del final de la llista de missatges i continuarà cap a la carpeta "
-"anterior depenent de l'opció que hàgiu escollit.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Quan se salta al missatge següent sense llegir, podria passar que per "
+"sota del missatge actual no n'hi hagi més sense llegir.</p><p><b>No ho "
+"recórreguis tot:</b> La cerca s'aturarà a l'últim missatge de la carpeta "
+"actual.</p><p><b>Recorre la carpeta actual:</b> La cerca anirà des del "
+"primer a l'últim missatge de la carpeta actual.</p><p><b>Recorre totes les "
+"carpetes:</b> La cerca anirà des del primer a l'últim missatge. Si no es "
+"troben missatges sense llegir es continuarà per la següent carpeta.</p><p>De "
+"manera semblant, en cercar un missatge anterior sense llegir, la cerca "
+"començarà des del final de la llista de missatges i continuarà cap a la "
+"carpeta anterior depenent de l'opció que hàgiu escollit.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>La indexació de tot el text permet cerques molt ràpides del contingut dels "
-"missatges. En habilitar-ho, el diàleg de cerca anirà molt ràpid. També, la "
-"barra d'eines de cerca seleccionarà missatges basant-se en el contingut.</p>"
-"<p>Ocupa una certa quantitat d'espai en disc (aproximadament la meitat de "
-"l'espai en disc dels missatges).</p>"
-"<p>Després d'habilitar-ho caldrà construir l'índex, però podeu continuar usant "
-"el KMail mentre s'executa aquesta operació.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>La indexació de tot el text permet cerques molt ràpides del contingut "
+"dels missatges. En habilitar-ho, el diàleg de cerca anirà molt ràpid. També, "
+"la barra d'eines de cerca seleccionarà missatges basant-se en el contingut.</"
+"p><p>Ocupa una certa quantitat d'espai en disc (aproximadament la meitat de "
+"l'espai en disc dels missatges).</p><p>Després d'habilitar-ho caldrà "
+"construir l'índex, però podeu continuar usant el KMail mentre s'executa "
+"aquesta operació.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2882,11 +2858,11 @@ msgstr "Oculta &les carpetes groupware"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Quan aquesta opció estigui activada no veureu les carpetes de recursos IMAP a "
-"l'arbre de carpetes."
+"Quan aquesta opció estigui activada no veureu les carpetes de recursos IMAP "
+"a l'arbre de carpetes."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2894,11 +2870,11 @@ msgstr "Mostra n&omés les carpetes de treball en grup per aquest compte"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Quan aquesta opció estigui activada no veureu les carpetes de correu normals a "
-"l'arbre de carpetes pel compte configurat pel treball en grup."
+"Quan aquesta opció estigui activada no veureu les carpetes de correu normals "
+"a l'arbre de carpetes pel compte configurat pel treball en grup."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2956,24 +2932,23 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"El Microsoft Outlook, quan s'utilitza en combinació amb un servidor Microsoft "
-"Exchange, té un problema en interpretar els estàndards de correus-e de treball "
-"en grup. Activeu aquesta opció per enviar invitacions de treball en grup de "
-"manera que el Microsoft Exchange els entengui."
+"El Microsoft Outlook, quan s'utilitza en combinació amb un servidor "
+"Microsoft Exchange, té un problema en interpretar els estàndards de correus-"
+"e de treball en grup. Activeu aquesta opció per enviar invitacions de "
+"treball en grup de manera que el Microsoft Exchange els entengui."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Anomenament dels adjunts compatible amb l'Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Enviament d'invitacions automàtic"
@@ -2983,28 +2958,28 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Quan aquesta opció està activada, l'usuari no veu la finestra de l'editor del "
-"correu. Els missatges d'invitació s'enviaran automàticament"
+"Quan aquesta opció està activada, l'usuari no veu la finestra de l'editor "
+"del correu. Els missatges d'invitació s'enviaran automàticament"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Les invitacions s'envien normalment com a adjunts a un correu. Aquest "
-"interruptor canvia els correus d'invitació perquè s'enviïn al text del correu; "
-"això és necessari per enviar invitacions i respostes a Microsoft Outlook. "
-"<br>Però, quan feu això, ja no obteniu text descriptiu que puguin llegir els "
-"programes de correu; per tant, els missatges resultants semblaran molt estranys "
-"a la gent que té programes de correu que no entenen les invitacions. "
-"<br>La gent que té programes de correu que entenen les invitacions encara "
-"podran treballar d'aquesta forma.</qt>"
+"interruptor canvia els correus d'invitació perquè s'enviïn al text del "
+"correu; això és necessari per enviar invitacions i respostes a Microsoft "
+"Outlook. <br>Però, quan feu això, ja no obteniu text descriptiu que puguin "
+"llegir els programes de correu; per tant, els missatges resultants semblaran "
+"molt estranys a la gent que té programes de correu que no entenen les "
+"invitacions. <br>La gent que té programes de correu que entenen les "
+"invitacions encara podran treballar d'aquesta forma.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3109,30 +3084,28 @@ msgstr "Reenviament"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí podeu afegir, editar i suprimir plantilles personalitzades de missatge "
-"per usar quan editeu un missatge de resposta o de reenviament. Creeu la "
-"plantilla personalitzada seleccionant-ho amb el menú del botó dret o el menú de "
-"la barra d'eines. També podeu assignar-hi una combinació de teclat per "
-"accelerar les operacions.</p>"
-"<p>Les plantilles de missatge permeten ordres de substitució simplement "
-"teclejant-les o seleccionant-les des del menú <i>Insereix ordre</i>.</p>"
-"<p>Hi ha quatre tipus de plantilles personalitzades: emprades per: <i>"
-"Resposta</i>, <i>Resposta a tots</i>, <i>Reenviament</i>, i <i>General</i> "
-"que es pot usar per tota classe d'operacions. No podeu assignar una drecera de "
-"teclat a les plantilles <i>General</i>.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Aquí podeu afegir, editar i suprimir plantilles personalitzades de "
+"missatge per usar quan editeu un missatge de resposta o de reenviament. "
+"Creeu la plantilla personalitzada seleccionant-ho amb el menú del botó dret "
+"o el menú de la barra d'eines. També podeu assignar-hi una combinació de "
+"teclat per accelerar les operacions.</p><p>Les plantilles de missatge "
+"permeten ordres de substitució simplement teclejant-les o seleccionant-les "
+"des del menú <i>Insereix ordre</i>.</p><p>Hi ha quatre tipus de plantilles "
+"personalitzades: emprades per: <i>Resposta</i>, <i>Resposta a tots</i>, "
+"<i>Reenviament</i>, i <i>General</i> que es pot usar per tota classe "
+"d'operacions. No podeu assignar una drecera de teclat a les plantilles "
+"<i>General</i>.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3149,15 +3122,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3175,15 +3148,16 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"La drecera seleccionada ja s'usa en una altra plantilla personalitzada, encara "
-"voleu continuar amb l'assignació?"
+"La drecera seleccionada ja s'usa en una altra plantilla personalitzada, "
+"encara voleu continuar amb l'assignació?"
 
 #: customtemplates.cpp:438
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
-"La drecera seleccionada ja està en ús,encara voleu continuar amb l'assignació?"
+"La drecera seleccionada ja està en ús,encara voleu continuar amb "
+"l'assignació?"
 
 #: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
@@ -3222,8 +3196,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Ja existeix una llista de distribució amb el nom <b>%1</b>"
-". Escolliu un nom diferent.</qt>"
+"<qt>Ja existeix una llista de distribució amb el nom <b>%1</b>. Escolliu un "
+"nom diferent.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3232,8 +3206,8 @@ msgstr "Edita amb:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "El KMail no pot detectar quan es tanca l'editor seleccionat. Per a evitar la "
 "pèrdua de dades, s'interromp l'edició de l'adjunt."
@@ -3380,8 +3354,8 @@ msgstr "S'ha cancel·lat l'acció d'eliminar missatges antics de la carpeta %1."
 #: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr ""
-"S'ha cancel·lat l'acció de moure missatges antics de la carpeta %1 a la carpeta "
-"%2."
+"S'ha cancel·lat l'acció de moure missatges antics de la carpeta %1 a la "
+"carpeta %2."
 
 #: expirypropertiesdialog.cpp:31
 msgid "Mail Expiry Properties"
@@ -3491,6 +3465,11 @@ msgstr "Selecció de filtres"
 msgid "Filters"
 msgstr "Filtres"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Selecciona tot el text"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3522,12 +3501,12 @@ msgstr "&Registra les activitats de filtratge"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Aquí podeu activar i desactivar el registre de les activitats de filtratge. "
-"Naturalment, només es recullen i es mostren les dades de registre quan s'activa "
-"el registre. "
+"Naturalment, només es recullen i es mostren les dades de registre quan "
+"s'activa el registre. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3543,16 +3522,17 @@ msgstr "Registra l'avaluació de les &regles de filtratge"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Podeu controlar la informació al registre referent a l'avaluació de les regles "
-"de filtratge dels filtres aplicats: tenir marcada aquesta opció donarà "
-"informació detallada per a cada regla de filtratge. Alternativament, només es "
-"donarà informació quant al resultat de l'avaluació de totes les regles d'un sol "
-"filtre."
+"Podeu controlar la informació al registre referent a l'avaluació de les "
+"regles de filtratge dels filtres aplicats: tenir marcada aquesta opció "
+"donarà informació detallada per a cada regla de filtratge. Alternativament, "
+"només es donarà informació quant al resultat de l'avaluació de totes les "
+"regles d'un sol filtre."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3572,15 +3552,15 @@ msgstr "sense límit"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "En recollir dades de registre s'usa memòria per a guardar-les temporalment; "
 "aquí podeu limitar la quantitat màxima de memòria a usar: si la mida de les "
-"dades de registre recollides excedeix aquest límit llavors es descartaran les "
-"dades més antigues fins que ja no s'excedeixi el límit. "
+"dades de registre recollides excedeix aquest límit llavors es descartaran "
+"les dades més antigues fins que ja no s'excedeixi el límit. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3590,7 +3570,7 @@ msgstr ""
 "No s'ha pogut escriure el fitxer %1:\n"
 "\"%2\" és la descripció detallada de l'error."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "S'ha produït un error al KMail"
@@ -3631,13 +3611,14 @@ msgstr "&Identificador d'usuari:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"L'identificador d'usuari és la connexió d'usuari al servidor IMAP. Això pot ser "
-"un nom d'usuari o l'adreça de correu completa de l'usuari. La connexió per al "
-"vostre compte al servidor us dirà de quina de les dues opcions es tracta."
+"L'identificador d'usuari és la connexió d'usuari al servidor IMAP. Això pot "
+"ser un nom d'usuari o l'adreça de correu completa de l'usuari. La connexió "
+"per al vostre compte al servidor us dirà de quina de les dues opcions es "
+"tracta."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3688,8 +3669,8 @@ msgstr "No teniu permís de lectura/escriptura sobre la vostra paperera."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "La informació encara no s'ha recuperat des del servidor, useu \"Comprova el "
 "correu\"."
@@ -3702,8 +3683,7 @@ msgstr "Error: no hi ha un compte IMAP definit per a aquesta carpeta"
 msgid "Connecting to server %1, please wait..."
 msgstr "S'està connectant al servidor %1, espereu..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "S'ha produït un error en connectar-se al servidor %1"
@@ -3732,8 +3712,8 @@ msgstr "Afegeix permisos"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Realment voleu eliminar els vostres propis permisos d'aquesta carpeta? No hi "
 "podreu accedir més endavant."
@@ -3767,7 +3747,7 @@ msgstr "Ús:"
 msgid "Select Folder"
 msgstr "Tria carpeta"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Carpetes locals"
@@ -3791,13 +3771,13 @@ msgstr "Seleccioneu la drecera per a la carpeta"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Per escollir una tecla o una combinació de tecles que seleccionen la "
-"carpeta actual, premeu el botó inferior i premeu les tecles que voleu associar "
-"a aquesta carpeta.</qt>"
+"carpeta actual, premeu el botó inferior i premeu les tecles que voleu "
+"associar a aquesta carpeta.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3817,14 +3797,23 @@ msgstr "C&ancel·la"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>La carpeta que heu esborrat estava associada amb el compte <b>%1</b> "
-"que hi lliurava el correu. S'ha reiniciat la carpeta on el compte lliura el "
+"<qt>La carpeta que heu esborrat estava associada amb el compte <b>%1</b> que "
+"hi lliurava el correu. S'ha reiniciat la carpeta on el compte lliura el "
 "correu a la carpeta d'entrada principal.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Total: %2<br>Sense llegir: %3<br>Mida: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Quota: %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Desconegut"
@@ -3947,71 +3936,18 @@ msgstr "Estat de correu brossa:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>M"
-"<br>i"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>t"
-"<br>g"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>M<br>i<br>s<br>s<br>a<br>t<br>g<br>e<br> <br>H<br>T<br>M<br>L</"
+"b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>M"
-"<br>i"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>t"
-"<br>g"
-"<br>e"
-"<br> "
-"<br>n"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>M<br>i<br>s<br>s<br>a<br>t<br>g<br>e<br> <br>n<br>o<br> "
+"<br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4023,19 +3959,14 @@ msgstr "El &vostre nom:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>El vostre nom</h3>"
-"<p>Aquest camp hauria de contenir el vostre nom, tal com voleu que aparegui a "
-"la capçalera del correu electrònic que envieu.</p>"
-"<p>Si el deixeu en blanc, el vostre nom real no apareixerà, tan sols l'adreça "
-"de correu electrònic.</p></qt>"
+"<qt><h3>El vostre nom</h3><p>Aquest camp hauria de contenir el vostre nom, "
+"tal com voleu que aparegui a la capçalera del correu electrònic que envieu.</"
+"p><p>Si el deixeu en blanc, el vostre nom real no apareixerà, tan sols "
+"l'adreça de correu electrònic.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4043,17 +3974,14 @@ msgstr "Organit&zació:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organització</h3>"
-"<p>Aquest camp hauria de contenir el nom de la vostra organització, tal com "
-"voleu que aparegui a la capçalera del correu electrònic que envieu.</p>"
-"<p>És segur (i normal) deixar aquest espai en blanc.</p></qt>"
+"<qt><h3>Organització</h3><p>Aquest camp hauria de contenir el nom de la "
+"vostra organització, tal com voleu que aparegui a la capçalera del correu "
+"electrònic que envieu.</p><p>És segur (i normal) deixar aquest espai en "
+"blanc.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4062,21 +3990,15 @@ msgstr "A&dreça de correu:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Adreça de correu</h3>"
-"<p>Aquest camp hauria de contenir tota la vostra adreça de correu "
-"electrònic.</p>"
-"<p>Si el deixeu en blanc, o aquesta és incorrecta, la gent no us podrà "
-"respondre.</p></qt>"
+"<qt><h3>Adreça de correu</h3><p>Aquest camp hauria de contenir tota la "
+"vostra adreça de correu electrònic.</p><p>Si el deixeu en blanc, o aquesta "
+"és incorrecta, la gent no us podrà respondre.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4085,21 +4007,12 @@ msgstr "A&dreça de correu:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4123,20 +4036,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>La clau OpenPGP aquí escollida serà l'emprada per a signar digitalment els "
-"missatges. També podeu usar claus GnuPG.</p>"
-"<p>Podeu deixar aquest camp en blanc, però el KMail no serà capaç de signar "
-"digitalment correus electrònics. Les funcions normals del correu no se'n veuran "
-"afectades.</p>Podeu trobar més informació quant a les claus a <a>"
-"http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>La clau OpenPGP aquí escollida serà l'emprada per a signar "
+"digitalment els missatges. També podeu usar claus GnuPG.</p><p>Podeu deixar "
+"aquest camp en blanc, però el KMail no serà capaç de signar digitalment "
+"correus electrònics. Les funcions normals del correu no se'n veuran "
+"afectades.</p>Podeu trobar més informació quant a les claus a <a>http://www."
+"gnupg.org</a></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4148,31 +4059,28 @@ msgstr "La vostra clau de xifratge OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Seleccioneu la clau OpenPGP per xifrar a vós mateix i per a la característica "
-"\"Adjunta la meva clau pública\" a l'editor."
+"Seleccioneu la clau OpenPGP per xifrar a vós mateix i per a la "
+"característica \"Adjunta la meva clau pública\" a l'editor."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>La clau OpenPGP aquí escollida serà l'emprada per a xifrar els vostres "
-"propis missatges i per a la característica \"Adjunta la meva clau pública\" a "
-"l'editor. També podeu usar claus GnuPG.</p>"
-"<p>Podeu deixar aquest camp en blanc, però el KMail no serà capaç de xifrar els "
-"correus electrònics sortints. Les funcions normals del correu no se'n veuran "
-"afectades.</p>Podeu trobar més informació quant a les claus a <a>"
-"http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>La clau OpenPGP aquí escollida serà l'emprada per a xifrar els "
+"vostres propis missatges i per a la característica \"Adjunta la meva clau "
+"pública\" a l'editor. També podeu usar claus GnuPG.</p><p>Podeu deixar "
+"aquest camp en blanc, però el KMail no serà capaç de xifrar els correus "
+"electrònics sortints. Les funcions normals del correu no se'n veuran "
+"afectades.</p>Podeu trobar més informació quant a les claus a <a>http://www."
+"gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4187,23 +4095,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Seleccioneu el certificat S/MIME que desitgeu usar per a signar digitalment els "
-"vostres missatges."
+"Seleccioneu el certificat S/MIME que desitgeu usar per a signar digitalment "
+"els vostres missatges."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El certificat S/MIME (X.509) que escolliu serà l'emprat per a signar "
-"digitalment els missatges.</p>"
-"<p>Podeu deixar aquest camp en blanc, però el KMail no serà capaç de signar "
-"digitalment correus electrònics usant S/MIME. Les funcions normals del correu "
-"no se'n veuran afectades.</p></qt>"
+"<qt><p>El certificat S/MIME (X.509) que escolliu serà l'emprat per a signar "
+"digitalment els missatges.</p><p>Podeu deixar aquest camp en blanc, però el "
+"KMail no serà capaç de signar digitalment correus electrònics usant S/MIME. "
+"Les funcions normals del correu no se'n veuran afectades.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4215,27 +4120,25 @@ msgstr "El vostre certificat de xifratge S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Seleccioneu el certificat S/MIME que desitgeu usar per a xifrar-vos a vós "
 "mateix i per a la característica \"Adjunta la meva clau pública\" a l'editor."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El certificat S/MIME que trieu aquí s'usarà per xifrar missatges a vós "
-"mateix i per a la característica \"Adjunta el meu certificat\" a l'editor.</p>"
-"<p>Podeu deixar-ho en blanc, però el KMail no podrà xifrar copies dels "
-"missatges de sortida a vós mateix usant S/MIME. Les funcions normals del correu "
-"no es veuran afectades.</p></qt>"
+"<qt><p>El certificat S/MIME que trieu aquí s'usarà per xifrar missatges a "
+"vós mateix i per a la característica \"Adjunta el meu certificat\" a "
+"l'editor.</p><p>Podeu deixar-ho en blanc, però el KMail no podrà xifrar "
+"copies dels missatges de sortida a vós mateix usant S/MIME. Les funcions "
+"normals del correu no es veuran afectades.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4255,25 +4158,20 @@ msgstr "Adreça de &Respon-a:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adreça de Respon-a</h3>"
-"<p>Aquest camp estableix la capçalera <tt>Reply-to:</tt> "
-"perquè contingui una adreça de correu electrònic diferent a la normal <tt>"
-"From:</tt>.</p>"
-"<p>Aquesta us podrà ser d'ajuda quan tingueu a un grup de gent que treballa en "
-"papers similars. Per exemple, podríeu desitjar enviar qualsevol correu per a "
-"tenir el vostre correu al camp <tt>From:</tt>, però que qualsevol resposta es "
-"dirigeixi a un grup d'adreces.</p>"
-"<p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adreça de Respon-a</h3><p>Aquest camp estableix la capçalera "
+"<tt>Reply-to:</tt> perquè contingui una adreça de correu electrònic diferent "
+"a la normal <tt>From:</tt>.</p><p>Aquesta us podrà ser d'ajuda quan tingueu "
+"a un grup de gent que treballa en papers similars. Per exemple, podríeu "
+"desitjar enviar qualsevol correu per a tenir el vostre correu al camp "
+"<tt>From:</tt>, però que qualsevol resposta es dirigeixi a un grup d'adreces."
+"</p><p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4281,26 +4179,19 @@ msgstr "Adre&ça BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) Adreces de còpia oculta</h3>"
-"<p>Les adreces que introduïu aquí s'afegiran a cada missatge sortint quan "
-"envieu correu amb aquesta identitat. No seran visibles per als altres "
-"destinataris.</p>"
-"<p>Això sol usar-se per enviar una còpia de cada missatge a un altre compte "
-"vostre.</p> "
-"<p>Per especificar més d'una adreça useu comes per separar la llista de "
-"destinataris BCC</p>"
-"<p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) Adreces de còpia oculta</h3><p>Les adreces "
+"que introduïu aquí s'afegiran a cada missatge sortint quan envieu correu amb "
+"aquesta identitat. No seran visibles per als altres destinataris.</p><p>Això "
+"sol usar-se per enviar una còpia de cada missatge a un altre compte vostre.</"
+"p> <p>Per especificar més d'una adreça useu comes per separar la llista de "
+"destinataris BCC</p><p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4338,7 +4229,7 @@ msgstr "&Signatura"
 msgid "&Picture"
 msgstr "I&matge"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Adreça de correu-e no vàlida"
 
@@ -4357,13 +4248,13 @@ msgstr ""
 "Una de les claus de signatura configurades a l'OpenPGP no conté cap "
 "identificador d'usuari amb l'adreça de correu configurada per a aquesta "
 "identitat (%1).\n"
-"Això pot provocar missatges d'avís a la banda receptora en provar de verificar "
-"signatures fetes amb aquesta configuració."
+"Això pot provocar missatges d'avís a la banda receptora en provar de "
+"verificar signatures fetes amb aquesta configuració."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Una de les claus de xifratge configurades a l'OpenPGP no conté cap "
 "identificador d'usuari amb l'adreça de correu configurada per a aquesta "
@@ -4378,8 +4269,8 @@ msgid ""
 msgstr ""
 "Un dels certificats de signatura configurats a l'S/MIME no conté l'adreça de "
 "correu configurada per a aquesta identitat (%1).\n"
-"Això pot provocar missatges d'avís a la banda receptora en provar de verificar "
-"signatures fetes amb aquesta configuració."
+"Això pot provocar missatges d'avís a la banda receptora en provar de "
+"verificar signatures fetes amb aquesta configuració."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4414,21 +4305,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"La carpeta d'esborranys per la identitat \"%1\" no existeix, per tant s'usarà "
-"la carpeta d'esborranys predeterminada."
+"La carpeta d'esborranys per la identitat \"%1\" no existeix, per tant "
+"s'usarà la carpeta d'esborranys predeterminada."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"La carpeta de plantilles personalitzades per la identitat \"%1\" no existeix; "
-"per tant s'usarà la carpeta de plantilles predeterminada."
+"La carpeta de plantilles personalitzades per la identitat \"%1\" no "
+"existeix; per tant s'usarà la carpeta de plantilles predeterminada."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Per omissió)"
 
@@ -4476,16 +4367,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "La configuració s'ha migrat automàticament però hauríeu de comprovar la "
 "configuració del vostre compte."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "No ha estat possible migrar la vostra configuració automàticament, per tant "
 "comproveu la configuració del compte."
@@ -4525,17 +4416,22 @@ msgstr "La carpeta és massa a prop del seu límit de quota. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "Com que no teniu privilegis d'escriptura en aquesta carpeta, demaneu al seu "
 "propietari que alliberi espai de la carpeta."
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Error: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "La connexió al servidor %1 s'ha tancat o ha expirat inesperadament. Es "
 "restablirà automàticament si és possible."
@@ -4583,7 +4479,8 @@ msgstr "S'ha produït un error en recuperar missatges del servidor."
 #: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr ""
-"S'ha produït un error en recuperar la informació de l'estructura d'un missatge."
+"S'ha produït un error en recuperar la informació de l'estructura d'un "
+"missatge."
 
 #: imapjob.cpp:543
 msgid "Uploading message data failed."
@@ -4688,20 +4585,20 @@ msgstr "Arxius de la llista"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Una o més de les vostres claus OpenPGP configurades de xifratge o certificats "
-"S/MIME no tenen plena confiança per al xifratge."
+"Una o més de les vostres claus OpenPGP configurades de xifratge o "
+"certificats S/MIME no tenen plena confiança per al xifratge."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Una o més de les vostres claus OpenPGP configurades de xifratge o certificats "
-"S/MIME no tenen plena confiança per al xifratge."
+"Una o més de les vostres claus OpenPGP configurades de xifratge o "
+"certificats S/MIME no tenen plena confiança per al xifratge."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4735,230 +4632,182 @@ msgstr "Claus de xifratge sense confiança plena"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</"
+"p><p>caduca en menys d'un dia.</p>\n"
+"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</"
+"p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de signatura S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de signatura S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> (número "
+"de sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> (número "
+"de sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de "
+"sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de "
+"sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>El vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
+"(número de sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
 "<p>El vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"(número de sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>El vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
+"(número de sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
 "<p>El vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"(número de sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4972,219 +4821,171 @@ msgstr "El certificat S/MIME caduca aviat"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>La clau de signatura OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> "
-"(ID de clau 0x%2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>La clau de xifratge OpenPGP</p><p align=center><b>%1</b> (ID de clau 0x"
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</"
+"p><p>caduca en menys d'un dia.</p>\n"
+"<p>La clau OpenPGP per a</p><p align=center><b>%1</b> (ID de clau 0x%2)</"
+"p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de signatura S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de signatura S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al vostre "
+"certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat arrel</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat arrel</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> (número "
+"de sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> (número "
+"de sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de "
+"sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> (número de "
+"sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> "
-"<p> per al certificat S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat CA intermedi</p><p align=center><b>%3</b></p> <p> per al "
+"certificat S/MIME</p><p align=center><b>%1</b> (número de sèrie %2)</"
+"p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>El vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
+"(número de sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
 "<p>El vostre certificat de signatura S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"(número de sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>El vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
+"(número de sèrie %2)</p><p>caduca en menys d'un dia.</p>\n"
 "<p>El vostre certificat de xifratge S/MIME</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"(número de sèrie %2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys d'un dia.</p>\n"
-"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> "
-"(número de sèrie %2)</p>"
-"<p>caduca en menys de %n dies.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys d'un dia.</p>\n"
+"<p>El certificat S/MIME per a</p><p align=center><b>%1</b> (número de sèrie "
+"%2)</p><p>caduca en menys de %n dies.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5196,16 +4997,17 @@ msgstr "El certificat S/MIME caduca aviat"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Una o diverses claus de xifratge OpenPGP de les que teniu configurades o dels "
-"certificats S/MIME, no es poden usar per xifrar. Torneu a configurar les "
-"vostres claus de xifratge i certificats per a aquesta identitat al diàleg de "
-"configuració d'identitat.\n"
+"Una o diverses claus de xifratge OpenPGP de les que teniu configurades o "
+"dels certificats S/MIME, no es poden usar per xifrar. Torneu a configurar "
+"les vostres claus de xifratge i certificats per a aquesta identitat al "
+"diàleg de configuració d'identitat.\n"
 "Si trieu continuar, i més tard necessiteu les claus, se us demanarà que "
 "especifiqueu quines claus s'han d'usar."
 
@@ -5221,10 +5023,10 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Una o diverses claus de signatura OpenPGP de les que teniu configurades o dels "
-"certificats de signat S/MIME, no es poden usar per signar. Torneu a configurar "
-"les vostres claus de signatura i certificats per a aquesta identitat al diàleg "
-"de configuració d'identitat.\n"
+"Una o diverses claus de signatura OpenPGP de les que teniu configurades o "
+"dels certificats de signat S/MIME, no es poden usar per signar. Torneu a "
+"configurar les vostres claus de signatura i certificats per a aquesta "
+"identitat al diàleg de configuració d'identitat.\n"
 "Si trieu continuar, i més tard necessiteu les claus, se us demanarà que "
 "especifiqueu quines claus s'han d'usar."
 
@@ -5236,40 +5038,40 @@ msgstr "Claus de signatura no usables"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "L'examen de les preferències de xifratge del destinatari ha mostrat que el "
 "missatge s'hauria de xifrar usant OpenPGP, per a alguns destinataris com a "
 "mínim.\n"
-"Malgrat això, no heu configurat claus de xifratge OpenPGP vàlides i fiables per "
-"a aquesta identitat.\n"
-"Podeu continuar sense xifrar a vós mateix, però sigueu conscient que no podreu "
-"llegir els vostres propis missatges si ho feu."
+"Malgrat això, no heu configurat claus de xifratge OpenPGP vàlides i fiables "
+"per a aquesta identitat.\n"
+"Podeu continuar sense xifrar a vós mateix, però sigueu conscient que no "
+"podreu llegir els vostres propis missatges si ho feu."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "L'examen de les preferències de xifratge del destinatari ha mostrat que el "
 "missatge s'hauria de xifrar usant S/MIME, per a alguns destinataris com a "
 "mínim.\n"
-"Malgrat això, no heu configurat claus de xifratge S/MIME vàlides per a aquesta "
-"identitat.\n"
-"Podeu continuar sense xifrar a vós mateix, però sigueu conscient que no podreu "
-"llegir els vostres propis missatges si ho feu."
+"Malgrat això, no heu configurat claus de xifratge S/MIME vàlides per a "
+"aquesta identitat.\n"
+"Podeu continuar sense xifrar a vós mateix, però sigueu conscient que no "
+"podreu llegir els vostres propis missatges si ho feu."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5285,8 +5087,8 @@ msgstr "No signis amb OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5306,8 +5108,9 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"L'examen de les preferències de signatura del destinatari mostra que no hi ha "
-"cap tipus de signatura coincident amb les claus de signatura disponibles.\n"
+"L'examen de les preferències de signatura del destinatari mostra que no hi "
+"ha cap tipus de signatura coincident amb les claus de signatura "
+"disponibles.\n"
 "Envio el missatge sense signar?"
 
 #: keyresolver.cpp:1335
@@ -5316,8 +5119,8 @@ msgstr "No es pot signar"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "No heu seleccionat una clau de xifratge per a vós mateix (autoxifratge). No "
 "podreu desxifrar el vostre propi missatge si el xifreu."
@@ -5336,16 +5139,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"No heu seleccionat una clau de xifratge per al destinatari d'aquest missatge, "
-"per tant el missatge no es xifrarà."
+"No heu seleccionat una clau de xifratge per al destinatari d'aquest "
+"missatge, per tant el missatge no es xifrarà."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"No heu seleccionat una clau de xifratge per a algun dels destinataris d'aquest "
-"missatge, per tant el missatge no es xifrarà."
+"No heu seleccionat una clau de xifratge per a algun dels destinataris "
+"d'aquest missatge, per tant el missatge no es xifrarà."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5382,18 +5185,19 @@ msgid ""
 msgstr ""
 "Hi ha un problema amb les claus de xifratge per a \"%1\".\n"
 "\n"
-"Seleccioneu novament les claus que s'hauran d'emprar per a aquest destinatari."
+"Seleccioneu novament les claus que s'hauran d'emprar per a aquest "
+"destinatari."
 
 #: keyresolver.cpp:1678
 #, fuzzy
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "No s'ha trobat cap clau vàlida de confiança per \"%1\".\n"
 "\n"
@@ -5442,10 +5246,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Error crític: No es pot recollir el correu: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"S'ha produït un error en afegir el missatge:\n"
+msgid "Failed to add message:\n"
+msgstr "S'ha produït un error en afegir el missatge:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5535,6 +5337,52 @@ msgstr "IMAP &desconnectat"
 msgid "&Maildir mailbox"
 msgstr "Directori &maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Estableix l'assumpte del missatge"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Envia CC: a l'\"adreça\""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Envia BCC: a l'\"adreça\""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Afegeix la 'capçalera' al missatge"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Llegeix el cos del missatge des del 'fitxer'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Estableix el cos del missatge"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Afegeix com a adjunt al correu. Això pot repetir-se"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Comprova només si hi ha correu nou"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Obre només la finestra de l'editor"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Visualitza el fitxer de missatge donat"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Envia un missatge a l'\"adreça\" resposta adjuntant el fitxer al que apunta "
+"l'\"URL\""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Correu"
@@ -5578,7 +5426,8 @@ msgid ""
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
 "Ara el KMail crearà les carpetes de treball en grup requerides com a "
-"subcarpetes de %1. Si no ho voleu, cancel·leu i es deshabilitarà el recurs IMAP"
+"subcarpetes de %1. Si no ho voleu, cancel·leu i es deshabilitarà el recurs "
+"IMAP"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5587,18 +5436,18 @@ msgstr "%1: no s'ha trobat la carpeta. Es crearà."
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
-"%1: s'ha trobat la carpeta %2. S'establirà com a carpeta principal de treball "
-"en grup."
+"%1: s'ha trobat la carpeta %2. S'establirà com a carpeta principal de "
+"treball en grup."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail ha trobat les següents carpetes de treball en grup a %1 i ha "
-"d'efectuar les operacions següents: %2"
-"<br>Si no ho voleu, cancel·leu i es deshabilitarà el recurs IMAP"
+"d'efectuar les operacions següents: %2<br>Si no ho voleu, cancel·leu i es "
+"deshabilitarà el recurs IMAP"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5646,11 +5495,11 @@ msgstr "URL copiat al porta-retalls."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>El fitxer <b>%1</b> ja existeix.<br>Voleu substituir-lo?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Desa al fitxer"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Substitueix"
 
@@ -5668,7 +5517,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "El missatge s'ha suprimit mentre es desava. No s'ha desat."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5689,11 +5538,11 @@ msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "El fitxer conté múltiples missatges. Només es mostra el primer missatge."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5703,105 +5552,105 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrat de missatges"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "S'està filtrant el missatge %1 de %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "No hi ha prou espai lliure al disc?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mou a aquesta carpeta"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copia a aquesta carpeta"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "S'ha detectat una memòria cau de l'IMAP corrupte a la carpeta %1. S'ha "
 "cancel·lat la copia dels missatges."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "S'estan movent els missatges"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "S'estan esborrant els missatges"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "S'està obrint l'URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Realment desitgeu executar <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Executa"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "No s'han trobat adjunts a desar."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Desa els adjunts a"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "adjunt.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "adjunt.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Ja existeix un fitxer anomenat %1. Desitgeu sobreescriure'l?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "El fitxer ja existeix"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Sobreescriu"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"La part %1 del missatge està xifrada. Desitgeu mantenir el xifratge en "
-"desar-lo?"
+"La part %1 del missatge està xifrada. Desitgeu mantenir el xifratge en desar-"
+"lo?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Pregunta del KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Manté el xifrat"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "No el mantinguis"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5809,11 +5658,11 @@ msgstr ""
 "La part %1 del missatge està signada. Desitgeu mantenir la signatura en "
 "desar-lo?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Manté la signatura"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5822,22 +5671,22 @@ msgstr ""
 "No s'ha pogut escriure el fitxer %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "No s'ha pogut escriure el fitxer %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "No hi ha cap entrada a la llibreta d'adreces per a aquesta adreça de correu. "
-"Afegiu-la a la llibreta d'adreces i després afegiu adreces de missatgeria usant "
-"el vostre client de missatgeria preferit."
+"Afegiu-la a la llibreta d'adreces i després afegiu adreces de missatgeria "
+"usant el vostre client de missatgeria preferit."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5848,51 +5697,51 @@ msgstr ""
 " %1\n"
 " no es possible determinar amb qui xatejar."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"El dorsal Chiasmus no ofereix la funció \"x-obtain-keys\". Si us plau, informeu "
-"d'aquest error."
+"El dorsal Chiasmus no ofereix la funció \"x-obtain-keys\". Si us plau, "
+"informeu d'aquest error."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Error al dorsal Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Valor de retorn inesperat des del dorsal Chiasmus: la funció \"x-obtain-keys\" "
-"no ha retornat una llista de cadenes. Si us plau, informeu d'aquest error."
+"Valor de retorn inesperat des del dorsal Chiasmus: la funció \"x-obtain-keys"
+"\" no ha retornat una llista de cadenes. Si us plau, informeu d'aquest error."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"No s'han trobat claus. Comproveu que s'ha establert un camí de claus vàlid a la "
-"configuració Chiasmus."
+"No s'han trobat claus. Comproveu que s'ha establert un camí de claus vàlid a "
+"la configuració Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Selecció de la clau de xifratge Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "El dorsal Chiasmus no ofereix la funció \"x-decrypt\". Si us plau, informeu "
 "d'aquest error."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5900,19 +5749,19 @@ msgstr ""
 "La funció \"x-decrypt\" no accepta els paràmetres esperats. Si us plau, "
 "informeu d'aquest error."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Error de desxifratge Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Valor de retorn inesperat des del dorsal Chiasmus: la funció \"x-decrypt\" no "
-"ha retornat una matriu de bytes. Si us plau, informeu d'aquest error."
+"Valor de retorn inesperat des del dorsal Chiasmus: la funció \"x-decrypt\" "
+"no ha retornat una matriu de bytes. Si us plau, informeu d'aquest error."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5922,7 +5771,7 @@ msgstr ""
 "Per a: %2\n"
 "Assumpte: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Correu: %1"
@@ -6021,7 +5870,7 @@ msgstr "Mida"
 msgid "Encoding"
 msgstr "Codificació"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comprimeix"
 
@@ -6033,7 +5882,7 @@ msgstr "Xifra"
 msgid "Sign"
 msgstr "Signa"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nom de l'adjunt:"
 
@@ -6055,10 +5904,11 @@ msgstr "Destinataris primaris"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Les adreces de correu electrònic que poseu en aquest camp rebran una còpia "
-"del correu electrònic.</qt>"
+"<qt>Les adreces de correu electrònic que poseu en aquest camp rebran una "
+"còpia del correu electrònic.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6067,14 +5917,15 @@ msgstr "Destinataris addicionals"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
-msgstr ""
-"<qt>Les adreces de correu electrònic que poseu en aquest camp rebran una còpia "
-"del correu electrònic. Tècnicament és el mateix que posar totes les adreces al "
-"camp <b>A:</b> però difereix en el fet que simbolitza que el receptor de la "
-"còpia de carbó (CC) és un oient, no el destinatari principal.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
+msgstr ""
+"<qt>Les adreces de correu electrònic que poseu en aquest camp rebran una "
+"còpia del correu electrònic. Tècnicament és el mateix que posar totes les "
+"adreces al camp <b>A:</b> però difereix en el fet que simbolitza que el "
+"receptor de la còpia de carbó (CC) és un oient, no el destinatari principal."
+"</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6082,13 +5933,12 @@ msgstr "Destinataris ocults"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Essencialment el mateix que el camp <b>Copia a:</b> "
-"però és diferent en el fet que tots els altres destinataris no veuen qui rep "
-"una còpia oculta.</qt>"
+"<qt>Essencialment el mateix que el camp <b>Copia a:</b> però és diferent en "
+"el fet que tots els altres destinataris no veuen qui rep una còpia oculta.</"
+"qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6098,7 +5948,7 @@ msgstr "&Envia correu"
 msgid "&Send Mail Via"
 msgstr "&Envia correu a través de"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Envia més &tard"
@@ -6163,8 +6013,7 @@ msgstr "E&limina caràcters de citació"
 msgid "Cl&ean Spaces"
 msgstr "Neteja els &espais"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Tipogra&fia d'amplada fixa"
@@ -6305,31 +6154,31 @@ msgstr "Format de &xifratge del missatges"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Estàndard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Llista de bales (disc)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Llista de bales (cercle)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Llista de bales (quadrat)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Llista ordenada (numerals)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Llista ordenada (lletra minúscula)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Llista ordenada (lletra majúscula)"
 
@@ -6421,8 +6270,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Desa aquest missatge a la carpeta d'esborranys. Podrà ser editat i enviat més "
-"tard."
+"Desa aquest missatge a la carpeta d'esborranys. Podrà ser editat i enviat "
+"més tard."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6434,64 +6283,64 @@ msgstr "Tanca l'editor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"El fitxer que heu editat es refereix a un adjunt però encara no hi heu adjuntat "
-"res.\n"
+"El fitxer que heu editat es refereix a un adjunt però encara no hi heu "
+"adjuntat res.\n"
 "Desitgeu adjuntar un fitxer al vostre missatge?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Recordatori de fitxer adjunt"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Envia t&al qual"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El KMail no ha pogut reconèixer la localització de l'adjunt (%1).</p>"
-"<p>Haureu d'especificar la ruta completa si desitgeu adjuntar un fitxer.</p>"
-"</qt>"
+"<qt><p>El KMail no ha pogut reconèixer la localització de l'adjunt (%1).</"
+"p><p>Haureu d'especificar la ruta completa si desitgeu adjuntar un fitxer.</"
+"p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>L'administrador ha prohibit l'adjunció de fitxers superiors a %1 MB.</p>"
+"<qt><p>L'administrador ha prohibit l'adjunció de fitxers superiors a %1 MB.</"
+"p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Adjunta el fitxer"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Adjunta"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Insereix el fitxer"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Insereix el fitxer"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>S'ha produït un error en provar d'exportar la clau des del dorsal:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>S'ha produït un error en provar d'exportar la clau des del dorsal:</"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6530,97 +6379,108 @@ msgid ""
 "View"
 msgstr "Visualitza"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Edita..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Edita amb..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Desa com a..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Propietats"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Afegeix adjunt..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "El KMail no ha pogut comprimir el fitxer."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "El fitxer comprimit és més gran que l'original. Voleu mantenir l'original?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Manté"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "El KMail no ha pogut descomprimir el fitxer."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Desa l'adjunt com a"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Afegeix com a text"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Afegeix com a adjunt"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
-"Seleccioneu si voleu inserir el contingut com a text dins l'editor, o afegir el "
-"fitxer referenciat com un adjunt."
+"Seleccioneu si voleu inserir el contingut com a text dins l'editor, o afegir "
+"el fitxer referenciat com un adjunt."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Enganxo com a text o com un adjunt?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "sense nom"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Heu demanat que el missatge es xifri a vós mateix, però la identitat "
-"seleccionada actualment no defineix una clau de xifratge (OpenPGP o S/MIME) per "
-"usar-la amb aquest objectiu.</p> "
-"<p>Seleccioneu la clau o claus a usar a la configuració d'identitat.</p></qt>"
+"<qt><p>Heu demanat que el missatge es xifri a vós mateix, però la identitat "
+"seleccionada actualment no defineix una clau de xifratge (OpenPGP o S/MIME) "
+"per usar-la amb aquest objectiu.</p> <p>Seleccioneu la clau o claus a usar a "
+"la configuració d'identitat.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Clau de xifratge no definida"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Per a poder signar aquest missatge primer haureu de definir la clau de "
-"signatura a usar (OpenPGP o S/MIME).</p>"
-"<p>Escolliu la clau a usar a la configuració de la identitat.</p></qt>"
+"<qt> <p>Per a poder signar aquest missatge primer haureu de definir la clau "
+"de signatura a usar (OpenPGP o S/MIME).</p><p>Escolliu la clau a usar a la "
+"configuració de la identitat.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Clau de signatura no definida"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6628,165 +6488,164 @@ msgstr ""
 "El KMail està actualment en mode desconnectat, els vostres missatges es "
 "conservaran a la carpeta de sortida fins que us connecteu."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Connectat/desconnectat"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Heu d'introduir la vostra adreça de correu electrònic en el camp De:. També heu "
-"d'establir l'adreça de correu electrònic per a totes les identitats de forma "
-"que no hàgiu d'introduir-la per cada missatge."
+"Heu d'introduir la vostra adreça de correu electrònic en el camp De:. També "
+"heu d'establir l'adreça de correu electrònic per a totes les identitats de "
+"forma que no hàgiu d'introduir-la per cada missatge."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Almenys haureu d'especificar un destinatari ja sigui en el camp Per a: o com a "
-"CC o com a BCC."
+"Almenys haureu d'especificar un destinatari ja sigui en el camp Per a: o com "
+"a CC o com a BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "El camp \"A:\" és buit. Envio el missatge igualment?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "No s'ha especificat \"A:\""
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "No heu especificat un assumpte. Voleu que enviï el missatge igualment?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "No s'ha especificat l'assumpte"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Envia t&al qual"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Especifica l'assumpte"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Manté el format, no signis/xifris"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Manté el format, no xifris"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Manté el format, no signis"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Signa/Xifra (elimina el format)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Xifra (elimina el format)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Signa (elimina el format)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>No és possible la signatura/xifratge en línia de missatges HTML.</p> "
+"<qt><p>No és possible la signatura/xifratge en línia de missatges HTML.</p> "
 "<p>Voleu que esborri el marcatge?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Voleu signar/xifrar el missatge?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"La carpeta d'esborranys o la de plantilles per la identitat \"%1\" no existeix, "
-"per tant s'usarà la carpeta d'esborranys o de plantilles predeterminada."
+"La carpeta d'esborranys o la de plantilles per la identitat \"%1\" no "
+"existeix, per tant s'usarà la carpeta d'esborranys o de plantilles "
+"predeterminada."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Creeu un compte per a enviar i proveu-ho novament."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "A punt d'enviar el correu..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Envia la confirmació"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Envia ara"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Cap destinatari"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinataris addicionals"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Corrector ortogràfic: activat"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Corrector ortogràfic: desactivat"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Comprovació ortogràfica cancel·lada."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Comprovació ortogràfica aturada."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Comprovació ortogràfica completada."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Corrector ortogràfic"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Per a usar el xifratge Chiasmus configureu primer un dorsal de xifratge.\n"
-"Podeu fer-ho a la pestanya de connectors de xifratge del diàleg de configuració "
-"de la pàgina de Seguretat."
+"Podeu fer-ho a la pestanya de connectors de xifratge del diàleg de "
+"configuració de la pàgina de Seguretat."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6794,31 +6653,31 @@ msgstr ""
 "Sembla com si libkleopatra es va compilar sense acceptar el Chiasmus. Potser "
 "heu de recompilar libkleopatra amb --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "No hi ha cap dorsal Chiasmus configurat"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "No s'han trobat claus Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Selecció de la clau de xifratge Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "El missatge se signarà"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "El missatge no se signarà"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "El missatge es xifrarà"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "El missatge no es xifrarà"
 
@@ -6867,8 +6726,8 @@ msgstr "Ortografia - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "No s'ha pogut executar l'ISpell/Aspell. Assegureu-vos que teniu un dels dos "
 "correctament configurat i en la vostra PATH."
@@ -6904,12 +6763,10 @@ msgstr "<qt>Hi ha massa accions a la regla de filtratge <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Acció desconeguda del filtre <b>%1</b>"
-"<br>a la regla de filtre <b>%2</b>."
+"<qt>Acció desconeguda del filtre <b>%1</b><br>a la regla de filtre <b>%2</b>."
 "<br>S'està ignorant-la.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7130,161 +6987,131 @@ msgstr "Reprodueix un so"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aquesta és la llista de filtres definits. Serà processat de dalt a baix.</p>"
-"<p>Cliqueu a sobre de qualsevol filtre per a editar-lo emprant els controls de "
-"la meitat dreta del diàleg.</p></qt>"
+"<qt><p>Aquesta és la llista de filtres definits. Serà processat de dalt a "
+"baix.</p><p>Cliqueu a sobre de qualsevol filtre per a editar-lo emprant els "
+"controls de la meitat dreta del diàleg.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per a crear un nou filtre.</p>"
-"<p>El filtre serà inserit just després del que teniu actualment seleccionat, "
-"però més tard podreu canviar-ho.</p>"
-"<p>Si cliquèssiu aquest botó accidentalment, podreu desfer l'acció clicant en "
-"el botó <em>Esborra</em>.</p></qt>"
+"<qt><p>Cliqueu aquest botó per a crear un nou filtre.</p><p>El filtre serà "
+"inserit just després del que teniu actualment seleccionat, però més tard "
+"podreu canviar-ho.</p><p>Si cliquèssiu aquest botó accidentalment, podreu "
+"desfer l'acció clicant en el botó <em>Esborra</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per copiar un filtre.</p>"
-"<p>Si cliquèssiu aquest botó accidentalment, podreu desfer l'acció clicant en "
-"el botó <em>Esborra</em>.</p></qt>"
+"<qt><p>Cliqueu aquest botó per copiar un filtre.</p><p>Si cliquèssiu aquest "
+"botó accidentalment, podreu desfer l'acció clicant en el botó <em>Esborra</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per a <em>esborrar</em> el filtre seleccionat de la "
-"llista.</p>"
-"<p>No hi ha cap manera de recuperar el filtre una vegada ha estat esborrat, "
-"però sempre podeu prémer el botó <em>Cancel·la</em> per a desfer els canvis.</p>"
-"</qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Cliqueu aquest botó per a <em>esborrar</em> el filtre seleccionat de "
+"la llista.</p><p>No hi ha cap manera de recuperar el filtre una vegada ha "
+"estat esborrat, però sempre podeu prémer el botó <em>Cancel·la</em> per a "
+"desfer els canvis.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per a moure el filtre seleccionat actualment a <em>"
-"l'inici</em> de la llista.</p> "
-"<p>Això és útil ja que l'ordre dels filtres de la llista determina l'ordre en "
-"que s'apliquen als missatges: el filtre inicial s'aplica el primer.</p></qt>"
+"<qt><p>Cliqueu aquest botó per a moure el filtre seleccionat actualment a "
+"<em>l'inici</em> de la llista.</p> <p>Això és útil ja que l'ordre dels "
+"filtres de la llista determina l'ordre en que s'apliquen als missatges: el "
+"filtre inicial s'aplica el primer.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per a moure el filtre seleccionat actualment  cap <em>"
-"amunt</em> a la llista.</p>"
-"<p>Això és útil per a determinar l'ordre en què es filtraran els missatges: "
-"Primer s'usarà el primer filtre.</p>"
-"<p>Si heu clicat aquest botó accidentalment podreu desfer l'acció clicant en el "
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Cliqueu aquest botó per a moure el filtre seleccionat actualment  cap "
+"<em>amunt</em> a la llista.</p><p>Això és útil per a determinar l'ordre en "
+"què es filtraran els missatges: Primer s'usarà el primer filtre.</p><p>Si "
+"heu clicat aquest botó accidentalment podreu desfer l'acció clicant en el "
 "botó <em>Avall</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per a moure el filtre seleccionat actualment cap <em>"
-"avall</em> a la llista.</p>"
-"<p>Això és útil per a determinar l'ordre en què es filtraran els missatges: "
-"Primer s'usarà el primer filtre.</p> "
-"<p>Si heu clicat aquest botó accidentalment podreu desfer l'acció clicant en el "
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Cliqueu aquest botó per a moure el filtre seleccionat actualment cap "
+"<em>avall</em> a la llista.</p><p>Això és útil per a determinar l'ordre en "
+"què es filtraran els missatges: Primer s'usarà el primer filtre.</p> <p>Si "
+"heu clicat aquest botó accidentalment podreu desfer l'acció clicant en el "
 "botó <em>Amunt</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per a moure el filtre seleccionat actualment al <em>"
-"final</em> de la llista.</p> "
-"<p>Això és útil ja que l'ordre dels filtres de la llista determina l'ordre en "
-"que s'apliquen als missatges: el filtre inicial s'aplica el primer.</p></qt>"
+"<qt><p>Cliqueu aquest botó per a moure el filtre seleccionat actualment al "
+"<em>final</em> de la llista.</p> <p>Això és útil ja que l'ordre dels filtres "
+"de la llista determina l'ordre en que s'apliquen als missatges: el filtre "
+"inicial s'aplica el primer.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliqueu aquest botó per a reanomenar el filtre seleccionat actualment.</p>"
-"<p>Els filtres s'anomenen automàticament, sempre que comencin per \"&lt;\".</p>"
-"<p>Si reanomeneu un filtre accidentalment i desitgeu tornar al nom automàtic, "
-"cliqueu aquest botó i seleccioneu <em>Neteja</em> i tot seguit <em>Bé</em> "
-"en el diàleg emergent.</p></qt>"
+"<qt><p>Cliqueu aquest botó per a reanomenar el filtre seleccionat actualment."
+"</p><p>Els filtres s'anomenen automàticament, sempre que comencin per \"&lt;"
+"\".</p><p>Si reanomeneu un filtre accidentalment i desitgeu tornar al nom "
+"automàtic, cliqueu aquest botó i seleccioneu <em>Neteja</em> i tot seguit "
+"<em>Bé</em> en el diàleg emergent.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marqueu aquest botó per a forçar que aparegui el diàleg de confirmació.</p>"
-"<p>Això és útil si heu definit regles marcant els missatges perquè siguin "
-"descarregats després. Sense la possibilitat de forçar el diàleg de confirmació, "
-"aquests missatges no es podrien descarregar mai, a menys que n'hi hagi d'altres "
-"esperant al servidor, o fins que desitgeu canviar les regles que marquen els "
-"missatges per a diferenciar-los.</p></qt>"
+"<qt><p>Marqueu aquest botó per a forçar que aparegui el diàleg de "
+"confirmació.</p><p>Això és útil si heu definit regles marcant els missatges "
+"perquè siguin descarregats després. Sense la possibilitat de forçar el "
+"diàleg de confirmació, aquests missatges no es podrien descarregar mai, a "
+"menys que n'hi hagi d'altres esperant al servidor, o fins que desitgeu "
+"canviar les regles que marquen els missatges per a diferenciar-los.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7294,6 +7121,16 @@ msgstr "Regles de filtratge POP3"
 msgid "Filter Rules"
 msgstr "Regles de filtratge"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importa"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importa"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtres disponibles"
@@ -7339,8 +7176,8 @@ msgstr "Aplica aquest filtre als missatges de tots els comptes"
 #: kmfilterdlg.cpp:208
 msgid "from all but online IMAP accounts"
 msgstr ""
-"Aplica aquest filtre als missatges de tots els comptes excepte els comptes IMAP "
-"en línia"
+"Aplica aquest filtre als missatges de tots els comptes excepte els comptes "
+"IMAP en línia"
 
 #: kmfilterdlg.cpp:211
 msgid "from checked accounts only"
@@ -7378,6 +7215,11 @@ msgstr "A més a més, afegeix aquest filtre a la barra d'eines"
 msgid "Icon for this filter:"
 msgstr "Icona per a aquest filtre:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "A"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Amunt"
@@ -7386,16 +7228,29 @@ msgstr "Amunt"
 msgid "Down"
 msgstr "Avall"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Reanomena..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nou"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Co&pia a"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Esborrat"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7404,12 +7259,12 @@ msgstr "Seleccioneu la drecera per a la carpeta"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Com a mínim hi ha un filtre que s'aplica a una carpeta d'un compte IMAP en "
-"línia. Aquests filtres només s'aplicaran en filtrar manualment i al correu IMAP "
-"entrant en línia."
+"línia. Aquests filtres només s'aplicaran en filtrar manualment i al correu "
+"IMAP entrant en línia."
 
 #: kmfilterdlg.cpp:786
 msgid ""
@@ -7465,24 +7320,24 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Els noms de les carpetes no poden contenir el caràcter / (barra). Escolliu un "
-"nom de carpeta diferent."
+"Els noms de les carpetes no poden contenir el caràcter / (barra). Escolliu "
+"un nom de carpeta diferent."
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Els noms de les carpetes no podem començar amb un . (punt). Escolliu un altre "
-"nom per a la carpeta."
+"Els noms de les carpetes no podem començar amb un . (punt). Escolliu un "
+"altre nom per a la carpeta."
 
 #: kmfolder.cpp:932
 msgid ""
 "Your IMAP server does not allow the character '%1'; please choose another "
 "folder name."
 msgstr ""
-"El vostre servidor IMAP no permet el caràcter '%1', si us plau, trieu un altre "
-"nom de carpeta."
+"El vostre servidor IMAP no permet el caràcter '%1', si us plau, trieu un "
+"altre nom de carpeta."
 
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
@@ -7490,29 +7345,25 @@ msgstr "Solució de problemes al cau de l'IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Solució de problemes al cau de l'IMAP.</b></p>"
-"<p> Si teniu problemes amb la sincronització d'una carpeta IMAP, primer hauríeu "
-"de provar refer el fitxer d'índex. Això durarà un cert temps, però no originarà "
-"cap problema.</p>"
-"<p>Si no n'hi ha prou, podeu provar de refrescar el cau de l'IMAP. Si ho feu, "
-"perdreu tots els vostres canvis locals per a aquesta carpeta i totes les seves "
-"subcarpetes.</p>"
+"<p><b>Solució de problemes al cau de l'IMAP.</b></p><p> Si teniu problemes "
+"amb la sincronització d'una carpeta IMAP, primer hauríeu de provar refer el "
+"fitxer d'índex. Això durarà un cert temps, però no originarà cap problema.</"
+"p><p>Si no n'hi ha prou, podeu provar de refrescar el cau de l'IMAP. Si ho "
+"feu, perdreu tots els vostres canvis locals per a aquesta carpeta i totes "
+"les seves subcarpetes.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7543,16 +7394,16 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"No s'ha pogut llegir el fitxer cau de la carpeta %1. Pot haver-hi un problema "
-"amb els permisos del sistema de fitxers, o s'ha corromput."
+"No s'ha pogut llegir el fitxer cau de la carpeta %1. Pot haver-hi un "
+"problema amb els permisos del sistema de fitxers, o s'ha corromput."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"No s'ha pogut escriure al fitxer cau de la carpeta %1. Pot haver-hi un problema "
-"amb els permisos del sistema de fitxers."
+"No s'ha pogut escriure al fitxer cau de la carpeta %1. Pot haver-hi un "
+"problema amb els permisos del sistema de fitxers."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7575,7 +7426,8 @@ msgid ""
 msgstr ""
 "Esteu segur de voler refrescar el cau de l'IMAP de la carpeta %1 i totes les "
 "seves subcarpetes?\n"
-"Això eliminarà tots els canvis que hàgiu fet localment a les vostres carpetes."
+"Això eliminarà tots els canvis que hàgiu fet localment a les vostres "
+"carpetes."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7591,11 +7443,11 @@ msgstr "S'ha recreat l'índex d'aquesta carpeta."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"La carpeta %1 no està en un estat inicial de sincronització (l'estat era %2). "
-"Desitgeu tornar a l'estat de sincronització inicial i sincronitzar-la "
+"La carpeta %1 no està en un estat inicial de sincronització (l'estat era "
+"%2). Desitgeu tornar a l'estat de sincronització inicial i sincronitzar-la "
 "igualment?"
 
 #: kmfoldercachedimap.cpp:777
@@ -7723,15 +7575,11 @@ msgstr "S'estan creant subcarpetes en el servidor"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Els correus de la carpeta <b>%1</b> del servidor s'han esborrat. Voleu "
-"esborrar-los localment?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Els correus de la carpeta <b>%1</b> del servidor s'han esborrat. "
+"Voleu esborrar-los localment?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7752,12 +7600,10 @@ msgstr "S'estan rebent les carpetes per a l'espai de nom %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Sembla que la carpeta <b>%1</b> s'ha esborrat. Voleu esborrar-la del "
+"<qt><p>Sembla que la carpeta <b>%1</b> s'ha esborrat. Voleu esborrar-la del "
 "servidor?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7766,19 +7612,19 @@ msgstr "S'ha avortat"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"El servidor IMAP %1 no permet les anotacions IMAP. L'emmagatzemament XML no es "
-"pot usar en aquest servidor. Configureu el KMail d'una altra manera."
+"El servidor IMAP %1 no permet les anotacions IMAP. L'emmagatzemament XML no "
+"es pot usar en aquest servidor. Configureu el KMail d'una altra manera."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"El servidor IMAP %1 no permet les anotacions IMAP. L'emmagatzemament XML no es "
-"pot usar en aquest servidor. Reconfigureu el KMail de manera diferent."
+"El servidor IMAP %1 no permet les anotacions IMAP. L'emmagatzemament XML no "
+"es pot usar en aquest servidor. Reconfigureu el KMail de manera diferent."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7790,17 +7636,16 @@ msgstr "perdut+trobat"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Hi ha missatges nous en la carpeta <b>%1</b>, que encara no s'han pujat al "
-"servidor, però la carpeta s'ha esborrat del servidor o no teniu drets d'accés "
-"suficients sobre la carpeta per a pujar-los.</p>"
-"<p>Tots els missatges afectats es mouran a <b>%2</b> "
-"per evitar la pèrdua da dades.</p>"
+"<p>Hi ha missatges nous en la carpeta <b>%1</b>, que encara no s'han pujat "
+"al servidor, però la carpeta s'ha esborrat del servidor o no teniu drets "
+"d'accés suficients sobre la carpeta per a pujar-los.</p><p>Tots els "
+"missatges afectats es mouran a <b>%2</b> per evitar la pèrdua da dades.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7808,21 +7653,26 @@ msgstr "Drets d'accés insuficients"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Hi ha missatges nous en aquesta carpeta (%1), que encara no s'han pujat al "
-"servidor, però la carpeta s'ha esborrat del servidor o ara no sembla que "
+"<p>Hi ha missatges nous en aquesta carpeta (%1), que encara no s'han pujat "
+"al servidor, però la carpeta s'ha esborrat del servidor o ara no sembla que "
 "tingueu drets d'accés suficients sobre la carpeta per a pujar-los. Contacteu "
-"amb l'administrador per a què us permeti pujar nous missatges o moveu-los fora "
-"d'aquesta carpeta.</p> "
-"<p>Voleu moure ara aquests missatges a una altra carpeta?</p>"
+"amb l'administrador per a què us permeti pujar nous missatges o moveu-los "
+"fora d'aquesta carpeta.</p> <p>Voleu moure ara aquests missatges a una altra "
+"carpeta?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Mou a:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "No moguis"
 
@@ -7834,8 +7684,7 @@ msgstr "Mou els missatges a la carpeta"
 msgid "Permissions (ACL)"
 msgstr "Permisos (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "General"
@@ -7859,8 +7708,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Empra &icones personalitzades"
@@ -7879,23 +7727,21 @@ msgstr "Actua sobre el correu nou o sense llegir d'aquesta carpeta"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Si s'habilita aquesta opció se us notificarà si hi ha correu nou o sense "
-"llegir en aquesta carpeta. A més, en anar a la carpeta següent o anterior amb "
-"missatges sense llegir, us aturareu en aquesta carpeta.</p>"
-"<p>Desmarqueu aquesta opció si no voleu que se us notifiqui la presència de "
-"correu nous o sense llegir i si voleu que aquesta carpeta s'ometi en anar a la "
-"carpeta següent o anterior amb missatges sense llegir. Això és útil per a "
-"ignorar el correu nou o sense llegir de les carpetes paperera i correu "
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Si s'habilita aquesta opció se us notificarà si hi ha correu nou o "
+"sense llegir en aquesta carpeta. A més, en anar a la carpeta següent o "
+"anterior amb missatges sense llegir, us aturareu en aquesta carpeta.</"
+"p><p>Desmarqueu aquesta opció si no voleu que se us notifiqui la presència "
+"de correu nous o sense llegir i si voleu que aquesta carpeta s'ometi en anar "
+"a la carpeta següent o anterior amb missatges sense llegir. Això és útil per "
+"a ignorar el correu nou o sense llegir de les carpetes paperera i correu "
 "brossa.</p></qt>"
 
 #: kmfolderdia.cpp:431
@@ -7908,13 +7754,13 @@ msgstr "Manté les respostes en aquesta carpeta"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Marqueu aquesta opció si voleu que les respostes que escriviu a correus "
-"d'aquesta carpeta es posin a aquesta carpeta després d'enviar-se en comptes de "
-"la carpeta de correu enviat."
+"d'aquesta carpeta es posin a aquesta carpeta després d'enviar-se en comptes "
+"de la carpeta de correu enviat."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7924,17 +7770,21 @@ msgstr "Mostra la columna Remitent/Destinatari a la llista de missatges"
 msgid "Sho&w column:"
 msgstr "Most&ra la columna:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Estableix per omissió"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Remitent"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Destinatari"
@@ -7945,18 +7795,18 @@ msgstr "&Identitat del remitent:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Seleccioneu la identitat del remitent a usar en escriure correu nou o respondre "
-"al correu d'aquesta carpeta. Això significa que podeu fer que el KMail usi "
-"automàticament l'adreça del remitent, la firma i les claus de signatura o "
-"xifratge corresponents, si esteu a dins d'una de les carpetes de treball. Les "
-"identitats es poden establir al diàleg de configuració principal. (Arranjament "
-"-> Configura el KMail)"
+"Seleccioneu la identitat del remitent a usar en escriure correu nou o "
+"respondre al correu d'aquesta carpeta. Això significa que podeu fer que el "
+"KMail usi automàticament l'adreça del remitent, la firma i les claus de "
+"signatura o xifratge corresponents, si esteu a dins d'una de les carpetes de "
+"treball. Les identitats es poden establir al diàleg de configuració "
+"principal. (Arranjament -> Configura el KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7974,12 +7824,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Aquesta opció defineix quins usuaris que comparteixen aquesta carpeta han de "
 "tenir períodes \"ocupat\" a les seves llistes d'ocupació i han de veure les "
@@ -7989,13 +7839,13 @@ msgstr ""
 "\n"
 "Exemple de casos d'ús: si el patró comparteix una carpeta amb la seva "
 "secretaria, només el patró s'ha de marcar com a ocupat durant les seves "
-"reunions, per tant hauria de seleccionar \"Admins\", ja que la secretaria no té "
-"drets d'administració a la carpeta.\n"
+"reunions, per tant hauria de seleccionar \"Admins\", ja que la secretaria no "
+"té drets d'administració a la carpeta.\n"
 "D'altra banda, si un grup de treball comparteix un calendari per a les seves "
-"reunions, tots els lectors de les carpetes s'han de marcar com a ocupats durant "
-"les reunions.\n"
-"Una carpeta de tota l'empresa, amb esdeveniments opcionals ha d'usar \"Ningú\" "
-"ja que no se sap qui anirà als esdeveniments."
+"reunions, tots els lectors de les carpetes s'han de marcar com a ocupats "
+"durant les reunions.\n"
+"Una carpeta de tota l'empresa, amb esdeveniments opcionals ha d'usar \"Ningú"
+"\" ja que no se sap qui anirà als esdeveniments."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8013,8 +7863,8 @@ msgstr "Tots els lectors d'aquesta carpeta"
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
-"Aquest paràmetre us permet desactivar les alarmes de carpetes compartides amb "
-"d'altres. "
+"Aquest paràmetre us permet desactivar les alarmes de carpetes compartides "
+"amb d'altres. "
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -8028,23 +7878,24 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Heu configurat aquesta carpeta perquè contingui informació de groupware i "
 "l'opció de configuració general per ocultar carpetes de groupware és activa. "
-"Això significa que aquesta carpeta desapareixerà un cop es tanqui el diàleg de "
-"configuració. Si voleu tornar a eliminar la carpeta, haureu de deshabilitar "
-"temporalment l'ocultació de carpetes groupware per a poder veure-la."
+"Això significa que aquesta carpeta desapareixerà un cop es tanqui el diàleg "
+"de configuració. Si voleu tornar a eliminar la carpeta, haureu de "
+"deshabilitar temporalment l'ocultació de carpetes groupware per a poder "
+"veure-la."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8113,12 +7964,13 @@ msgstr "S'ha produït un error en obtenir informació quant a la carpeta."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "L'índex del correu de '%1' és d'una versió desconeguda del KMail (%2).\n"
 "Aquest índex es pot regenerar des de la carpeta de correu, però pot perdre's "
-"alguna informació, incloent els estats. Desitgeu que es desactualitzi el vostre "
-"fitxer d'índex?"
+"alguna informació, incloent els estats. Desitgeu que es desactualitzi el "
+"vostre fitxer d'índex?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8143,8 +7995,8 @@ msgstr "S'ha produït un error en obrir %1. Falta la carpeta."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "S'ha produït un error en obrir %1. O no és una carpeta maildir vàlida o no "
 "teniu suficients permisos d'accés."
@@ -8160,8 +8012,8 @@ msgstr "No s'ha pogut sincronitzar la carpeta maildir."
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"No s'ha pogut afegir el missatge a la carpeta, possiblement hi ha poc espai en "
-"disc."
+"No s'ha pogut afegir el missatge a la carpeta, possiblement hi ha poc espai "
+"en disc."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -8178,8 +8030,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"La vostra bústia de sortida conté missatges que no semblen haver estat creats "
-"pel KMail.\n"
+"La vostra bústia de sortida conté missatges que no semblen haver estat "
+"creats pel KMail.\n"
 "Elimineu-los si no desitgeu que el KMail els enviï."
 
 #: kmfoldermbox.cpp:112
@@ -8192,22 +8044,19 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>L'índex de la carpeta '%2' sembla estar desactualitzat. Per a evitar que es "
-"corrompin els missatges es regenerarà l'índex. Com a resultat d'això podria ser "
-"que reapareguin missatges esborrats anteriorment i es poden perdre les marques "
-"de l'estat dels missatges.</p>"
-"<p>Llegiu l'entrada corresponent en la <a href=\"%1\">"
-"secció de les PMF del manual del KMail</a> per a informació a sobre de com "
-"prevenir que aquest problema es repeteixi.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>L'índex de la carpeta '%2' sembla estar desactualitzat. Per a evitar "
+"que es corrompin els missatges es regenerarà l'índex. Com a resultat d'això "
+"podria ser que reapareguin missatges esborrats anteriorment i es poden "
+"perdre les marques de l'estat dels missatges.</p><p>Llegiu l'entrada "
+"corresponent en la <a href=\"%1\">secció de les PMF del manual del KMail</a> "
+"per a informació a sobre de com prevenir que aquest problema es repeteixi.</"
+"p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8268,7 +8117,7 @@ msgstr ""
 "'%1' no sembla una carpeta.\n"
 "Moveu el fitxer a un altre lloc."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8276,7 +8125,7 @@ msgstr ""
 "Els permisos de la carpeta '%1' no són correctes.\n"
 "Assegureu-vos que podeu veure i modificar el contingut d'aquesta carpeta."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8286,8 +8135,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 "S'ha esborrat una carpeta amb el mateix nom des de la darrera comprovació de "
 "correu. Primer heu de comprovar els correus abans de crear una altra carpeta "
@@ -8297,7 +8146,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "No s'ha pogut crear la carpeta"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8395,13 +8244,13 @@ msgstr "Soluciona els pro&blemes al cau de l'IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>No es pot crear la carpeta <b>%1</b> ja que no teniu suficients permisos al "
-"servidor. Si creieu que hauríeu de ser capaç de crear subcarpetes, demaneu a "
-"l'administrador que us doni els permisos per fer-ho.</qt> "
+"<qt>No es pot crear la carpeta <b>%1</b> ja que no teniu suficients permisos "
+"al servidor. Si creieu que hauríeu de ser capaç de crear subcarpetes, "
+"demaneu a l'administrador que us doni els permisos per fer-ho.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8418,23 +8267,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>No s'ha pogut moure o copiar la carpeta <b>%1</b> "
-"aquí perquè ja existeix una carpeta amb el mateix nom.</qt>"
+"<qt>No s'ha pogut moure o copiar la carpeta <b>%1</b> aquí perquè ja "
+"existeix una carpeta amb el mateix nom.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>No s'ha pogut moure o copiar la carpeta <b>%1</b> "
-"perquè no es pot copiar completament en ella mateixa.</qt>"
+"<qt>No s'ha pogut moure o copiar la carpeta <b>%1</b> perquè no es pot "
+"copiar completament en ella mateixa.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>No es pot moure o copiar la carpeta <b>%1</b> a dins d'una carpeta "
-"filla.</qt>"
+"<qt>No es pot moure o copiar la carpeta <b>%1</b> a dins d'una carpeta filla."
+"</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8540,15 +8389,15 @@ msgstr "La carpeta %1 és de només lectura."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Realment voleu esborrar el missatge seleccionat?"
-"<br>Una vegada que l'hàgiu esborrat serà irrecuperable!</qt>\n"
-"<qt>Realment voleu esborrar els %n missatges seleccionats?"
-"<br>Una vegada que els hàgiu esborrat seran irrecuperables!</qt>"
+"<qt>Realment voleu esborrar el missatge seleccionat?<br>Una vegada que "
+"l'hàgiu esborrat serà irrecuperable!</qt>\n"
+"<qt>Realment voleu esborrar els %n missatges seleccionats?<br>Una vegada que "
+"els hàgiu esborrat seran irrecuperables!</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8600,141 +8449,140 @@ msgstr ""
 "S'ha produït un error en modificar %1\n"
 "(No hi ha prou espai lliure en el dispositiu?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Petició de la signatura del certificat"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Creeu un certificat a partir de l'adjunt i retorneu-lo al remitent."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "S'ha establert que el KMail estigui desconnectat; s'han suspès tots els "
 "treballs de xarxa"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
-"S'ha establert que el KMail estigui connectat; s'han reprès tots els treballs "
-"de xarxa"
+"S'ha establert que el KMail estigui connectat; s'han reprès tots els "
+"treballs de xarxa"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail està actualment en el mode desconnectat. Voleu continuar?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Treballa en línia"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Treballa desconnectat"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 "No teniu permís de lectura/escriptura sobre la vostra carpeta d'entrada."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "sortida"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "No teniu permís de lectura/escriptura sobre la vostra carpeta de sortida."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "enviats"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "No teniu permís de lectura/escriptura sobre la vostra carpeta d'enviats."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "paperera"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "No teniu permís de lectura/escriptura sobre la vostra paperera."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "esborranys"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 "No teniu permís de lectura/escriptura sobre la vostra carpeta esborranys."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "plantilles"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 "No teniu permís de lectura/escriptura sobre la vostra carpeta de plantilles."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Última cerca"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>La carpeta <i>%4</i> existeix. %1 usa ara la carpeta <i>%5</i> "
-"per als seus missatges."
-"<p>%2 pot moure els continguts de <i>%6<i> a aquesta carpeta per vostè, però "
-"això pot reemplaçar algun fitxer existent amb el mateix nom a <i>%7</i>."
-"<p><strong>Voleu que %3 mogui els fitxers de correu ara?</strong></qt>"
+"<qt>La carpeta <i>%4</i> existeix. %1 usa ara la carpeta <i>%5</i> per als "
+"seus missatges.<p>%2 pot moure els continguts de <i>%6<i> a aquesta carpeta "
+"per vostè, però això pot reemplaçar algun fitxer existent amb el mateix nom "
+"a <i>%7</i>.<p><strong>Voleu que %3 mogui els fitxers de correu ara?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>La carpeta <i>%4</i> existeix. %1 usa ara la carpeta <i>%5</i> "
-"per als seus missatges. %2 pot moure els continguts de <i>%6</i> "
-"a aquesta carpeta per vostè."
-"<p><strong>Voleu que %3 mogui els fitxers de correu ara?</strong></qt>"
+"<qt>La carpeta <i>%4</i> existeix. %1 usa ara la carpeta <i>%5</i> per als "
+"seus missatges. %2 pot moure els continguts de <i>%6</i> a aquesta carpeta "
+"per vostè.<p><strong>Voleu que %3 mogui els fitxers de correu ara?</strong></"
+"qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Voleu migrar els fitxers de correu?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "El KMail ha trobat un error fatal i terminarà ara"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8745,11 +8593,11 @@ msgstr ""
 "L'error fou:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Buida la paperera"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Realment desitgeu buidar les papereres de tots els comptes?"
 
@@ -8824,8 +8672,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Ha arribat correu nou</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8863,11 +8710,11 @@ msgstr "Realment desitgeu buidar la paperera?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Realment desitgeu moure tots els missatges de la carpeta <b>%1</b> "
-"a la paperera?</qt>"
+"<qt>Realment desitgeu moure tots els missatges de la carpeta <b>%1</b> a la "
+"paperera?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8891,12 +8738,11 @@ msgstr "Esborra la cerca"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Esteu segur de voler esborrar la cerca <b>%1</b>? "
-"<br>Tots els seus missatges encara estaran disponibles a la seua carpeta "
-"original.</qt>"
+"<qt>Esteu segur de voler esborrar la cerca <b>%1</b>? <br>Tots els seus "
+"missatges encara estaran disponibles a la seua carpeta original.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8908,41 +8754,42 @@ msgstr "<qt>Realment desitgeu esborrar la carpeta buida <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Esteu segur que desitgeu esborrar la carpeta buida <b>%1</b> "
-"i totes les seves subcarpetes? Aquestes carpetes podrien no estar buides i el "
-"seu contingut també s'esborrarà. "
-"<p><b>Aneu amb compte</b> ja que els missatges esborrats no es desen a la "
-"carpeta Paperera i s'esborren per sempre.</qt>"
+"<qt>Esteu segur que desitgeu esborrar la carpeta buida <b>%1</b> i totes les "
+"seves subcarpetes? Aquestes carpetes podrien no estar buides i el seu "
+"contingut també s'esborrarà. <p><b>Aneu amb compte</b> ja que els missatges "
+"esborrats no es desen a la carpeta Paperera i s'esborren per sempre.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Esteu segur que desitgeu esborrar la carpeta <b>%1</b>"
-", descartant el seu contingut? "
-"<p><b>Aneu amb compte</b> ja que els missatges esborrats no es desen a la "
-"carpeta Paperera i s'esborren per sempre.</qt>"
+"<qt>Esteu segur que desitgeu esborrar la carpeta <b>%1</b>, descartant el "
+"seu contingut? <p><b>Aneu amb compte</b> ja que els missatges esborrats no "
+"es desen a la carpeta Paperera i s'esborren per sempre.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Esteu segur que desitgeu esborrar la carpeta <b>%1</b> "
-"i totes les seves subcarpetes, eliminant el seu contingut? "
-"<p><b>Aneu amb compte</b> ja que els missatges esborrats no es desen a la "
-"carpeta Paperera i s'esborren per sempre.</qt>"
+"<qt>Esteu segur que desitgeu esborrar la carpeta <b>%1</b> i totes les seves "
+"subcarpetes, eliminant el seu contingut? <p><b>Aneu amb compte</b> ja que "
+"els missatges esborrats no es desen a la carpeta Paperera i s'esborren per "
+"sempre.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Esborrat"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8950,8 +8797,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Esteu segur que voleu refrescar el cau de l'IMAP?\n"
-"Això eliminarà tots els canvis que hàgiu fet localment a les vostres carpetes "
-"IMAP."
+"Això eliminarà tots els canvis que hàgiu fet localment a les vostres "
+"carpetes IMAP."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8959,12 +8806,12 @@ msgstr "Desitgeu realment que caduquin tots els missatges antics?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Usar HTML en el correu us farà més vulnerable a l''\"spam\" (correu brossa) i "
-"podeu estar incrementant la possibilitat que el vostre sistema es vegi "
+"Usar HTML en el correu us farà més vulnerable a l''\"spam\" (correu brossa) "
+"i podeu estar incrementant la possibilitat que el vostre sistema es vegi "
 "compromès per altres forats de seguretat presents i futurs."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8978,11 +8825,11 @@ msgstr "Usa HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Usar HTML en el correu us farà més vulnerable a l''\"spam\" (correu brossa) i "
-"podeu estar incrementant la possibilitat que el vostre sistema es vegi "
+"Usar HTML en el correu us farà més vulnerable a l''\"spam\" (correu brossa) "
+"i podeu estar incrementant la possibilitat que el vostre sistema es vegi "
 "compromès per altres forats de seguretat presents i futurs."
 
 #: kmmainwidget.cpp:1381
@@ -8999,14 +8846,15 @@ msgstr "Filtra a la Llista de correu %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "La funcionalitat de resposta Fora de l'oficina del KMail es basa en el "
-"filtratge per part del servidor. Encara no heu configurat un servidor IMAP per "
-"a això.\n"
-"Podeu fer-ho a la pestanya \"Filtratge\" de la configuració per al compte IMAP."
+"filtratge per part del servidor. Encara no heu configurat un servidor IMAP "
+"per a això.\n"
+"Podeu fer-ho a la pestanya \"Filtratge\" de la configuració per al compte "
+"IMAP."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -9023,10 +8871,11 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"No s'ha pogut iniciar el Visor de bitàcola de GnuPG (kwatchgnupg). Comproveu la "
-"instal·lació."
+"No s'ha pogut iniciar el Visor de bitàcola de GnuPG (kwatchgnupg). Comproveu "
+"la instal·lació."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9346,8 +9195,7 @@ msgstr "Desa els ad&junts..."
 msgid "Appl&y All Filters"
 msgstr "Aplica tots els &filtres"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Aplica el filtratge"
@@ -9384,8 +9232,8 @@ msgstr "Columna del &total"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Activa/desactiva la visió de la columna mostrant el nombre total de missatges "
-"de les carpetes."
+"Activa/desactiva la visió de la columna mostrant el nombre total de "
+"missatges de les carpetes."
 
 #: kmmainwidget.cpp:3026
 msgid ""
@@ -9396,8 +9244,8 @@ msgstr "Columna de la &mida"
 #: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Activa/desactiva la visió de la columna mostrant el nombre total de missatges "
-"de les carpetes."
+"Activa/desactiva la visió de la columna mostrant el nombre total de "
+"missatges de les carpetes."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9463,7 +9311,6 @@ msgstr "Missatge següent &sense llegir"
 msgid "Go to the next unread message"
 msgstr "Vés al missatge següent sense llegir"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Missatge &anterior"
@@ -9511,8 +9358,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Descendeix en l'actual missatge. Si s'arriba al final del missatge, anirà cap "
-"al missatge següent sense llegir."
+"Descendeix en l'actual missatge. Si s'arriba al final del missatge, anirà "
+"cap al missatge següent sense llegir."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9602,8 +9449,8 @@ msgstr " S'està inicialitzant..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9614,22 +9461,22 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Aquest missatge conté una petició per a enviar una notificació quant a la "
 "vostra recepció del missatge.\n"
-"Conté una instrucció de processament que està marcada com a \"requerit\", però "
-"per al KMail és desconeguda.\n"
+"Conté una instrucció de processament que està marcada com a \"requerit\", "
+"però per al KMail és desconeguda.\n"
 "Podeu ignorar-la o permetre que el KMail enviï una resposta de \"fallida\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9637,13 +9484,13 @@ msgstr ""
 "Aquest missatge conté una petició per a enviar una notificació quant a la "
 "vostra recepció del missatge.\n"
 "però se us demana que envieu la notificació a més d'una adreça.\n"
-"Podeu ignorar-la o permetre que el KMail enviï una resposta de \"denegada\" o "
-"normal."
+"Podeu ignorar-la o permetre que el KMail enviï una resposta de \"denegada\" "
+"o normal."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9651,13 +9498,13 @@ msgstr ""
 "Aquest missatge conté una petició per a enviar una notificació quant a la "
 "vostra recepció del missatge.\n"
 "però no hi ha establerta cap ruta de retorn.\n"
-"Podeu ignorar-la o permetre que el KMail enviï una resposta de \"denegada\" o "
-"normal."
+"Podeu ignorar-la o permetre que el KMail enviï una resposta de \"denegada\" "
+"o normal."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9667,8 +9514,8 @@ msgstr ""
 "vostra recepció del missatge.\n"
 "però l'adreça de la ruta de retorn és diferent de l'adreça a la que s'ha "
 "d'enviar la notificació.\n"
-"Podeu ignorar-la o permetre que el KMail enviï una resposta de \"denegada\" o "
-"normal."
+"Podeu ignorar-la o permetre que el KMail enviï una resposta de \"denegada\" "
+"o normal."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9694,16 +9541,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Recepció: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Adjunt: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Aquest adjunt s'ha esborrat."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "L'adjunt '%1' s'ha esborrat."
 
@@ -9751,45 +9598,39 @@ msgstr "Propietats, part del missatge"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El <em>tipus MIME</em> del fitxer:</p>"
-"<p>normalment no necessitareu tocar aquesta opció ja que el tipus de fitxer es "
-"comprova automàticament, però a vegades %1 pot no detectar el tipus de fitxer "
-"correctament. Aquí és on podreu solucionar-ho.</p></qt>"
+"<qt><p>El <em>tipus MIME</em> del fitxer:</p><p>normalment no necessitareu "
+"tocar aquesta opció ja que el tipus de fitxer es comprova automàticament, "
+"però a vegades %1 pot no detectar el tipus de fitxer correctament. Aquí és "
+"on podreu solucionar-ho.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>La mida de la part:</p>"
-"<p>algunes vegades, %1 tan sols us oferirà una mida estimada perquè trigaria "
-"massa a calcular la mida exacta. Quan aquest sigui el cas, serà visible perquè "
-"s'afegirà \"(est.)\" a la mida mostrada.</p></qt>"
+"<qt><p>La mida de la part:</p><p>algunes vegades, %1 tan sols us oferirà una "
+"mida estimada perquè trigaria massa a calcular la mida exacta. Quan aquest "
+"sigui el cas, serà visible perquè s'afegirà \"(est.)\" a la mida mostrada.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El nom del fitxer de la part:</p>"
-"<p>tot i que per omissió és el nom del fitxer adjunt, no s'especifica el fitxer "
-"que s'adjuntarà: tan sols se suggereix un nom perquè el programa de correu del "
-"destinatari l'usi en desar aquesta part al disc.</p></qt>"
+"<qt><p>El nom del fitxer de la part:</p><p>tot i que per omissió és el nom "
+"del fitxer adjunt, no s'especifica el fitxer que s'adjuntarà: tan sols se "
+"suggereix un nom perquè el programa de correu del destinatari l'usi en desar "
+"aquesta part al disc.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9797,18 +9638,15 @@ msgstr "&Descripció:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Una descripció de la part:</p>"
-"<p>això tan sols és una descripció informativa de la part, com ara l'Assumpte "
-"ho és per al mateix missatge. La majoria dels programes de correu mostraran "
-"aquesta informació en la previsualització del missatge, al costat de la icona "
-"de l'adjunt.</p></qt>"
+"<qt><p>Una descripció de la part:</p><p>això tan sols és una descripció "
+"informativa de la part, com ara l'Assumpte ho és per al mateix missatge. La "
+"majoria dels programes de correu mostraran aquesta informació en la "
+"previsualització del missatge, al costat de la icona de l'adjunt.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9816,23 +9654,21 @@ msgstr "&Codificació:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>La codificació del transport d'aquesta part:</p>"
-"<p>normalment no necessitareu canviar això, atès que, %1 emprarà una "
-"codificació per omissió decent depenent del tipus MIME. Tot i així, algunes "
-"vegades, podríeu reduir significativament la mida del missatge, p.ex. si un "
-"fitxer PostScript no conté dades binaries, sinó només text. En aquest cas, "
-"escollint \"citació-imprimible\" en comptes de \"base64\" estalviareu fins al "
-"25% de la mida del missatge.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>La codificació del transport d'aquesta part:</p><p>normalment no "
+"necessitareu canviar això, atès que, %1 emprarà una codificació per omissió "
+"decent depenent del tipus MIME. Tot i així, algunes vegades, podríeu reduir "
+"significativament la mida del missatge, p.ex. si un fitxer PostScript no "
+"conté dades binaries, sinó només text. En aquest cas, escollint \"citació-"
+"imprimible\" en comptes de \"base64\" estalviareu fins al 25% de la mida del "
+"missatge.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9840,21 +9676,17 @@ msgstr "Suggereix mostrar &automàticament"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marqueu aquesta opció si desitgeu suggerir al destinatari que vegi "
+"<qt><p>Marqueu aquesta opció si desitgeu suggerir al destinatari que vegi "
 "automàticament (dins del missatge) d'aquesta part en comptes de la vista "
-"predeterminada en la icona;</p>"
-"<p>tècnicament això es fa posant la capçalera <em>Content-Disposition</em> "
-"d'aquesta part com a \"incloure\" en comptes del valor per omissió que és "
-"\"adjunt\".</p></qt>"
+"predeterminada en la icona;</p><p>tècnicament això es fa posant la capçalera "
+"<em>Content-Disposition</em> d'aquesta part com a \"incloure\" en comptes "
+"del valor per omissió que és \"adjunt\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9862,16 +9694,13 @@ msgstr "&Signa aquesta part"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marqueu aquesta opció si desitgeu que aquesta part del missatge sigui "
-"signada.</p>"
-"<p>La signatura es farà amb la clau que tingueu associada a la identitat "
-"actualment seleccionada.</p></qt>"
+"<qt><p>Marqueu aquesta opció si desitgeu que aquesta part del missatge sigui "
+"signada.</p><p>La signatura es farà amb la clau que tingueu associada a la "
+"identitat actualment seleccionada.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9879,13 +9708,11 @@ msgstr "&Xifra aquesta part"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marqueu aquesta opció si desitgeu que aquesta part del missatge es xifri.</p>"
-"<p>La part es xifrarà per als destinataris del missatge</p></qt>"
+"<qt><p>Marqueu aquesta opció si desitgeu que aquesta part del missatge es "
+"xifri.</p><p>La part es xifrarà per als destinataris del missatge</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9899,15 +9726,12 @@ msgstr "Filtre POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Els missatges a filtrar trobats en el compte POP:<b>%1</b>"
-"<p>Els missatges mostrats excedeixen la mida màxima que heu definit per a "
-"aquest compte. "
+"Els missatges a filtrar trobats en el compte POP:<b>%1</b><p>Els missatges "
+"mostrats excedeixen la mida màxima que heu definit per a aquest compte. "
 "<br>Podeu seleccionar què desitgeu fer amb ells marcant el botó apropiat."
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -10160,40 +9984,39 @@ msgstr "El client de correu per a l'entorn d'escriptori K."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>S'està recuperant el contingut de la carpeta</h2>"
-"<p>Paciència. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>S'està recuperant el contingut de la carpeta</"
+"h2><p>Paciència. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Desconnectat</h2>"
-"<p>El KMail ara està en mode desconnectat. Cliqueu <a href=\"kmail:goOnline\">"
-"aquí</a> per a connectar-vos. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Desconnectat</h2><p>El KMail ara està en mode "
+"desconnectat. Cliqueu <a href=\"kmail:goOnline\">aquí</a> per a connectar-"
+"vos. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10201,13 +10024,12 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Benvingut al KMail %1</h2>"
-"<p>El KMail és el client de correu per a l'entorn d'escriptori TDE. Està "
-"dissenyat per a ser completament compatible amb els estàndards de correu "
-"d'Internet, inclosos el MIME, SMTP, POP3 i IMAP.</p>\n"
-"<ul>"
-"<li>El KMail conté moltes característiques què es descriuen a la <a href=\"%2\">"
-"documentació</a></li>\n"
+"<h2 style='margin-top: 0px;'>Benvingut al KMail %1</h2><p>El KMail és el "
+"client de correu per a l'entorn d'escriptori TDE. Està dissenyat per a ser "
+"completament compatible amb els estàndards de correu d'Internet, inclosos el "
+"MIME, SMTP, POP3 i IMAP.</p>\n"
+"<ul><li>El KMail conté moltes característiques què es descriuen a la <a href="
+"\"%2\">documentació</a></li>\n"
 "<li>La <a href=\"%3\">pàgina web del KMail</a> us ofereix informació quant a "
 "les noves versions</li></ul>\n"
 "%8\n"
@@ -10221,22 +10043,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; L'equip del KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Preneu-vos un moment per a omplir el plafó de configuració a "
-"Arranjament-&gt;Configura el KMail.\n"
-"Abans d'enviar correu cal crear almenys una identitat per omissió i un compte "
-"de correu amb sortida i entrada.</p>\n"
+"<p>Preneu-vos un moment per a omplir el plafó de configuració a Arranjament-"
+"&gt;Configura el KMail.\n"
+"Abans d'enviar correu cal crear almenys una identitat per omissió i un "
+"compte de correu amb sortida i entrada.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10275,7 +10095,8 @@ msgstr "Visualitza l'adjunt: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: L'adjunt conté dades binàries. Es provarà de mostrar el primer "
@@ -10306,17 +10127,19 @@ msgstr "Voleu obrir l'adjunt?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "L'esborrat d'un adjunt pot invalidar qualsevol signatura digital d'aquest "
 "missatge."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"La modificació d'un adjunt pot invalidar qualsevol signatura digital d'aquest "
-"missatge."
+"La modificació d'un adjunt pot invalidar qualsevol signatura digital "
+"d'aquest missatge."
 
 #: kmreaderwin.cpp:2956
 msgid "Attachments:"
@@ -10336,6 +10159,58 @@ msgstr "(casa amb qualsevol dels següents)"
 msgid "(match all of the following)"
 msgstr "(casa amb tots els següents)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Llegit"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Antic"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Esborrat"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Respost"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Reenviat"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "En cua"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Enviat"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Vigilat"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorat"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Correu brossa"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Correu legítim"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Pendent"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Té un adjunt"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Missatge sencer"
@@ -10408,30 +10283,30 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Error crític: No es pot processar el correu enviat (sense espai?). S'ha produït "
-"un error en moure el missatge a la carpeta d'\"enviats\"."
+"Error crític: No es pot processar el correu enviat (sense espai?). S'ha "
+"produït un error en moure el missatge a la carpeta d'\"enviats\"."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"L'acció de moure el missatge enviat \"%1\" des de la carpeta \"sortida\" a la "
-"d'\"enviats\" ha fallat.\n"
-"Els possibles motius són la falta d'espai al disc o els permisos d'escriptura. "
-"Solucioneu el problema i moveu el missatge manualment."
+"L'acció de moure el missatge enviat \"%1\" des de la carpeta \"sortida\" a "
+"la d'\"enviats\" ha fallat.\n"
+"Els possibles motius són la falta d'espai al disc o els permisos "
+"d'escriptura. Solucioneu el problema i moveu el missatge manualment."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "No és possible enviar missatges sense especificar una adreça de remitent.\n"
-"Establiu l'adreça de correu de la identitat '%1' a la secció d'identitats del "
-"diàleg de configuració i llavors torneu a provar."
+"Establiu l'adreça de correu de la identitat '%1' a la secció d'identitats "
+"del diàleg de configuració i llavors torneu a provar."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10456,8 +10331,8 @@ msgstr "S'està iniciant el procés d'enviament..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Heu triat d'enviar tot el correu de la cua usant un transport sense xifrar, "
 "voleu continuar? "
@@ -10484,15 +10359,17 @@ msgstr "S'ha produït un error en enviar (alguns) missatges de la cua."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Enviament avortat:\n"
 "%1\n"
 "El missatge romandrà a la carpeta 'sortida' fins que solucioneu el problema "
-"(p.ex. una adreça incorrecta) o elimineu el missatge de la carpeta 'sortida'.\n"
+"(p.ex. una adreça incorrecta) o elimineu el missatge de la carpeta "
+"'sortida'.\n"
 "S'ha emprat el següent protocol de transport:\n"
 "  %2"
 
@@ -10502,21 +10379,17 @@ msgstr "Enviament avortat."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Enviament fallit:</p>"
-"<p>%1</p>"
-"<p>El missatge romandrà a la carpeta 'sortida' fins que solucioneu el problema "
-"(p.ex. una adreça incorrecta) o elimineu el missatge de la carpeta "
-"'sortida'.</p>"
-"<p>S'ha emprat el següent protocol de transport:  %2</p>"
-"<p>Desitgeu que continuï enviant els missatges que resten?</p>"
+"<p>Enviament fallit:</p><p>%1</p><p>El missatge romandrà a la carpeta "
+"'sortida' fins que solucioneu el problema (p.ex. una adreça incorrecta) o "
+"elimineu el missatge de la carpeta 'sortida'.</p><p>S'ha emprat el següent "
+"protocol de transport:  %2</p><p>Desitgeu que continuï enviant els missatges "
+"que resten?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10534,15 +10407,17 @@ msgstr "&Avorta l'enviament"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Enviament fallit:\n"
 "%1\n"
 "El missatge romandrà a la carpeta 'sortida' fins que solucioneu el problema "
-"(p.ex. una adreça incorrecta) o elimineu el missatge de la carpeta 'sortida'.\n"
+"(p.ex. una adreça incorrecta) o elimineu el missatge de la carpeta "
+"'sortida'.\n"
 "S'ha emprat el següent protocol de transport:\n"
 " %2"
 
@@ -10581,9 +10456,9 @@ msgstr "Cal introduir l'usuari i contrasenya per a usar aquest servidor SMTP."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "Sembla que %1 ja s'està executant a una altra pantalla en aquesta màquina. "
 "L'execució de %2 més d'un cop pot causar la pèrdua de correu. No hauríeu "
@@ -10591,9 +10466,9 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "Sembla que %1 ja s'està executant a una altra pantalla en aquesta màquina. "
 "L'execució de %1 i %2 al mateix temps pot causar la pèrdua de correu. No "
@@ -10601,23 +10476,23 @@ msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "Sembla que %1 ja s'està executant a %2. L'execució de %1 més d'un cop pot "
-"causar la pèrdua de correu. No hauríeu d'engegar %1 en aquest ordinador a menys "
-"que estigueu segur que no s'està executant ja a %2."
+"causar la pèrdua de correu. No hauríeu d'engegar %1 en aquest ordinador a "
+"menys que estigueu segur que no s'està executant ja a %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"Sembla que %1 ja s'està executant a %3. L'execució de %1 i %2 al mateix temps "
-"pot causar la pèrdua de correu. No hauríeu d'engegar %2 en aquest ordinador a "
-"menys que estigueu segur que %1 no s'està executant a %3."
+"Sembla que %1 ja s'està executant a %3. L'execució de %1 i %2 al mateix "
+"temps pot causar la pèrdua de correu. No hauríeu d'engegar %2 en aquest "
+"ordinador a menys que estigueu segur que %1 no s'està executant a %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10628,6 +10503,10 @@ msgstr "Inicia %1"
 msgid "Exit"
 msgstr "Sortida"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nous missatges en"
@@ -10654,17 +10533,19 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"El TDEWallet no està disponible. Es recomana usar el TDEWallet per a gestionar "
-"les contrasenyes.\n"
+"El TDEWallet no està disponible. Es recomana usar el TDEWallet per a "
+"gestionar les contrasenyes.\n"
 "De totes maneres, el KMail pot emmagatzemar la contrasenya al seu fitxer de "
 "configuració. La contrasenya s'emmagatzema en un format ofuscat, però no "
-"s'hauria de considerar segur contra el desxifratge si s'accedeix al contingut "
-"del fitxer de configuració.\n"
-"Voleu emmagatzemar la contrasenya per al compte '%1' al fitxer de configuració?"
+"s'hauria de considerar segur contra el desxifratge si s'accedeix al "
+"contingut del fitxer de configuració.\n"
+"Voleu emmagatzemar la contrasenya per al compte '%1' al fitxer de "
+"configuració?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
 msgid "TDEWallet Not Available"
@@ -10722,8 +10603,8 @@ msgstr "El nom de domini o adreça numèrica del servidor SMTP."
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
 msgstr ""
-"El número del port que el servidor SMTP està escoltant. El port predeterminat "
-"és el 25."
+"El número del port que el servidor SMTP està escoltant. El port "
+"predeterminat és el 25."
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10734,8 +10615,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Un comandament que s'executarà abans d'enviar correu. Per exemple pot usar-se "
-"per a configurar túnels ssh. Deixeu-ho buit si no s'ha d'executar cap "
+"Un comandament que s'executarà abans d'enviar correu. Per exemple pot usar-"
+"se per a configurar túnels ssh. Deixeu-ho buit si no s'ha d'executar cap "
 "comandament."
 
 #: kmtransport.cpp:427
@@ -10744,12 +10625,12 @@ msgstr "El servidor nece&ssita autenticació"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Marqueu aquesta opció si el vostre servidor SMTP requereix autenticació abans "
-"d'acceptar el correu. Això és conegut com a 'SMTP autenticat' o simplement com "
-"a ASMTP."
+"Marqueu aquesta opció si el vostre servidor SMTP requereix autenticació "
+"abans d'acceptar el correu. Això és conegut com a 'SMTP autenticat' o "
+"simplement com a ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10769,15 +10650,14 @@ msgstr "Envia un nom de màquina personalitzat al servi&dor"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Marqueu aquesta opció per a fer que el KMail usi un nom de màquina "
-"personalitzat quan s'identifiqui al servidor de correu."
-"<p> Això és útil quan el nom de la màquina del vostre sistema no pot "
-"establir-se correctament o per emmascarar-lo."
+"personalitzat quan s'identifiqui al servidor de correu.<p> Això és útil quan "
+"el nom de la màquina del vostre sistema no pot establir-se correctament o "
+"per emmascarar-lo."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10787,8 +10667,8 @@ msgstr "N&om de la màquina:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Introduïu el nom de la màquina que el KMail haurà d'usar quan s'identifiqui al "
-"servidor."
+"Introduïu el nom de la màquina que el KMail haurà d'usar quan s'identifiqui "
+"al servidor."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10808,8 +10688,8 @@ msgstr "Tan sols es permeten fitxers locals."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "El camp del remot no pot estar buit. Introduïu el nom o l'adreça IP del "
 "servidor SMTP."
@@ -10824,10 +10704,10 @@ msgstr "S'ha produït un error en llistar la carpeta %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "La cancel·lació de la subscripció local suprimirà tota la informació que es "
 "presenta localment sobre aquestes carpetes. Les carpetes no canviaran al "
@@ -10903,8 +10783,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"El KMail no ha pogut detectar una llista de correu en aquesta carpeta. Ompliu "
-"les adreces a mà."
+"El KMail no ha pogut detectar una llista de correu en aquesta carpeta. "
+"Ompliu les adreces a mà."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -11051,35 +10931,28 @@ msgstr "&Edita el missatge"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>L'estructura de la informació retornada pel connector de xifratge no s'ha "
-"pogut processar correctament. El connector podria estar danyat.</p> "
+"<qt><p>L'estructura de la informació retornada pel connector de xifratge no "
+"s'ha pogut processar correctament. El connector podria estar danyat.</p> "
 "<p>Contacteu amb l'administrador del vostre sistema.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>No s'ha trobat cap connector de xifratge i el codi OpenPGP no s'executa "
-"correctament.</p>"
-"<p>Podeu fer dues coses per a canviar això:</p>"
-"<ul> "
-"<li><em>BÉ</em> activar un connector emprant el diàleg Arranjament->"
-"Configura el KMail->Connectors.</li>"
-"<li><em>O BÉ</em> especificar la configuració tradicional de l'OpenPGP en el "
-"mateix diàleg però a Identitat->Avançada.</li></ul>"
+"correctament.</p><p>Podeu fer dues coses per a canviar això:</p><ul> "
+"<li><em>BÉ</em> activar un connector emprant el diàleg Arranjament-"
+">Configura el KMail->Connectors.</li><li><em>O BÉ</em> especificar la "
+"configuració tradicional de l'OpenPGP en el mateix diàleg però a Identitat-"
+">Avançada.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11091,8 +10964,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "El dorsal Chiasmus no ofereix la funció \"x-encrypt\". Si us plau, informeu "
 "d'aquest error."
@@ -11102,8 +10975,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"La funció \"x-encrypt\" no accepta els paràmetres esperats. Si us plau informeu "
-"d'aquest error."
+"La funció \"x-encrypt\" no accepta els paràmetres esperats. Si us plau "
+"informeu d'aquest error."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11111,16 +10984,16 @@ msgstr "Hi ha hagut un error de xifratge Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"El dorsal Chiasmus ha retornat un valor no esperat: la funció \"x-encrypt\" no "
-"ha retornat un vector de bytes. Si us plau, informeu d'aquest error."
+"El dorsal Chiasmus ha retornat un valor no esperat: la funció \"x-encrypt\" "
+"no ha retornat un vector de bytes. Si us plau, informeu d'aquest error."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "El format de missatge de xifratge OpenPGP en línia no permet el xifratge o "
@@ -11176,8 +11049,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Heu demanat signar aquest missatge, però no s'han configurat claus de signatura "
-"vàlides per a aquesta identitat."
+"Heu demanat signar aquest missatge, però no s'han configurat claus de "
+"signatura vàlides per a aquesta identitat."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11194,8 +11067,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Algunes parts d'aquest missatge no se signaran.\n"
-"L'enviament de missatges signats només parcialment podria violar la política de "
-"lloc.\n"
+"L'enviament de missatges signats només parcialment podria violar la política "
+"de lloc.\n"
 "Voleu signar totes les parts?"
 
 #: messagecomposer.cpp:827
@@ -11235,8 +11108,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "L'examen de les preferències de xifratge del destinatari ha fet que se us "
@@ -11273,11 +11146,12 @@ msgstr "&No el xifris"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Heu demanat xifrar aquest missatge, i xifrar una còpia per a vós mateix, però "
-"no s'han configurat claus de xifratge fiables per a aquesta identitat."
+"Heu demanat xifrar aquest missatge, i xifrar una còpia per a vós mateix, "
+"però no s'han configurat claus de xifratge fiables per a aquesta identitat."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11286,13 +11160,13 @@ msgstr "Voleu enviar-lo sense xifrar?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Algunes parts d'aquest missatge no es xifraran.\n"
-"L'enviament de missatges xifrats només parcialment podria violar la política de "
-"lloc i/o filtrar informació sensible.\n"
+"L'enviament de missatges xifrats només parcialment podria violar la política "
+"de lloc i/o filtrar informació sensible.\n"
 "Voleu xifrar totes les parts?"
 
 #: messagecomposer.cpp:950
@@ -11315,51 +11189,45 @@ msgstr "&Xifra totes las parts"
 msgid "Unencrypted Message Warning"
 msgstr "Avís de missatge sense xifrar"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Error: El dorsal no ha retornat cap dada codificada.</p>"
-"<p>Si us plau, informeu d'aquest error:"
-"<br>%2</p></qt>"
+"<qt><p>Error: El dorsal no ha retornat cap dada codificada.</p><p>Si us "
+"plau, informeu d'aquest error:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>No tots els caràcters estan al joc de caràcters escollit."
-"<br>"
-"<br>Voleu enviar el missatge igualment?</qt>"
+"<qt>No tots els caràcters estan al joc de caràcters escollit.<br><br>Voleu "
+"enviar el missatge igualment?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Es perdran alguns caràcters"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Perd caràcters"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Canvia la codificació"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Aquest missatge no s'ha pogut signar, atès que el dorsal triat no sembla que "
 "suporti la signatura. Això de fet no hauria de passar, si us plau, informeu "
 "d'aquest error."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11368,40 +11236,41 @@ msgstr ""
 "suporti la signatura. Això de fet no hauria de passar, si us plau, informeu "
 "d'aquest error."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Registre d'auditoria del GnuPG per operacions de signatura"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"Ha fallat l'operació de signat. Assegureu-vos que el programa gpg-agent s'està "
-"executant."
+"Ha fallat l'operació de signat. Assegureu-vos que el programa gpg-agent "
+"s'està executant."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Aquest missatge no s'ha pogut xifrar, atès que el dorsal triat no sembla que "
 "suporti el xifratge. Això de fet no hauria de passar, si us plau, informeu "
 "d'aquest error."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Registre d'auditoria del GnuPG per operacions de xifratge"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Aquest missatge no s'ha pogut signar i xifrar, atès que el dorsal triat no "
-"sembla que permeti la combinació de signatura i xifratge. Això de fet no hauria "
-"de passar, si us plau, informeu d'aquest error."
+"sembla que permeti la combinació de signatura i xifratge. Això de fet no "
+"hauria de passar, si us plau, informeu d'aquest error."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11422,15 +11291,15 @@ msgstr "For&mat de la bústia:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Seleccioneu si voleu emmagatzemar els missatges d'aquesta carpeta com a "
-"\"maildir\" (un fitxer per missatge) o \"mbox\" (un sol fitxer gran). KMail usa "
-"maildir per omissió i això només cal canviar-ho en rares circumstàncies. Si no "
-"esteu segur, deixeu l'opció tal com està."
+"\"maildir\" (un fitxer per missatge) o \"mbox\" (un sol fitxer gran). KMail "
+"usa maildir per omissió i això només cal canviar-ho en rares circumstàncies. "
+"Si no esteu segur, deixeu l'opció tal com està."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11439,8 +11308,8 @@ msgstr "&Contingut de la carpeta:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Seleccioneu si voleu que la nova carpeta s'usi com a magatzem de correu o "
 "d'ítems de treball en grup, com ara tasques o notes. Per omissió es desa "
@@ -11482,8 +11351,7 @@ msgstr "Diferents resultats a les signatures"
 msgid "The crypto engine returned no cleartext data."
 msgstr "El motor de xifratge no ha retornat el text en clar."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Estat: "
 
@@ -11512,8 +11380,8 @@ msgstr "No s'ha trobat el connector %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "El missatge està signat, però no es pot comprovar la validesa de la "
 "signatura.<br />Motiu: %1"
@@ -11550,28 +11418,28 @@ msgstr "El connector de xifratge en \"%1\" no pot desxifrar missatges."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b> Aquest missatge HTML pot contenir referències externes a imatges. "
-"Per motius de seguretat i privadesa no es carreguen les referències externes. "
-"Si teniu confiança en el remitent d'aquest missatge podeu carregar les "
-"referències externes del missatge <a href=\"kmail:loadExternal\">"
-"clicant aquí</a>."
+"<b>Nota:</b> Aquest missatge HTML pot contenir referències externes a "
+"imatges. Per motius de seguretat i privadesa no es carreguen les referències "
+"externes. Si teniu confiança en el remitent d'aquest missatge podeu carregar "
+"les referències externes del missatge <a href=\"kmail:loadExternal\">clicant "
+"aquí</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Nota:</b> Aquest és un missatge HTML. Per motius de seguretat, només es "
-"mostrarà el codi HTML pur. Si teniu confiança en el remitent d'aquest missatge "
-"llavors podeu activar la visualització formatada de l'HTML d'aquest missatge <a "
-"href=\"kmail:showHTML\">clicant aquí</a>."
+"mostrarà el codi HTML pur. Si teniu confiança en el remitent d'aquest "
+"missatge llavors podeu activar la visualització formatada de l'HTML d'aquest "
+"missatge <a href=\"kmail:showHTML\">clicant aquí</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11822,11 +11690,11 @@ msgstr "desat: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"No hi ha adreces de correu desades en el %1, que s'empra per a signar, per tant "
-"no es pot comparar amb l'adreça del remitent %2."
+"No hi ha adreces de correu desades en el %1, que s'empra per a signar, per "
+"tant no es pot comparar amb l'adreça del remitent %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11941,10 +11809,11 @@ msgstr "Missatge d'error del tdeioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "El vostre servidor POP3 (compte: %1) no permet el comandament UIDL: aquest "
 "comandament és necessari per a saber d'una forma fiable quins missatges del "
@@ -11957,7 +11826,8 @@ msgid ""
 "_n: Fetched 1 message from %1. Deleting messages from server...\n"
 "Fetched %n messages from %1. Deleting messages from server..."
 msgstr ""
-"S'ha obtingut 1 missatge de %1. S'està esborrant el missatge del servidor...\n"
+"S'ha obtingut 1 missatge de %1. S'està esborrant el missatge del "
+"servidor...\n"
 "S'han obtingut %n missatges de %1. S'estan esborrant els missatges del "
 "servidor..."
 
@@ -11971,10 +11841,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"S'està descarregant el missatge %1 de %2 (%3 de %4 KB) per %5@%6 (queden %7 KB "
-"en el servidor)."
+"S'està descarregant el missatge %1 de %2 (%3 de %4 KB) per %5@%6 (queden %7 "
+"KB en el servidor)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11990,1928 +11861,15 @@ msgstr "Resposta no vàlida des del servidor"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "El vostre servidor no permet el comandament TOP. No és possible obtenir les "
 "capçaleres dels missatges llargs abans de descarregar-los sencers."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Vés"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Carpeta"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Missatge"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Resposta especial"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Reen&via"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barra d'eines HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signatura"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Signa els missa&tges automàticament"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Quan aquesta opció està habilitada se signaran per omissió tots els missatges "
-"que envieu. Evidentment, encara és possible deshabilitar la signatura per a "
-"cada missatge individualment."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Xifratge"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"En xifrar els correus, també &xifra sempre al certificat de la meva pròpia "
-"identitat"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Quan s'habilita aquesta opció, el missatge o fitxer no solament es xifrarà amb "
-"la clau pública del receptor, sinó també amb la vostra clau. Això us permetrà "
-"desxifrar el missatge o fitxer més tard. Generalment això és una bona idea."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Mostra el text s&ignat/xifrat després de l'edició"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Quan s'habilita aquesta opció, el text signat/xifrat es mostrarà en una "
-"finestra separada, facilitant-vos saber quin aspecte tindrà abans d'enviar-lo. "
-"Això és una bona idea quan esteu verificant que funciona el vostre sistema de "
-"xifratge."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "&Desa els missatges que s'enviïn xifrats"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Marqueu-ho per a desar els missatges xifrats "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Desa els missatges xifrats</h1>\n"
-"Quan està marcada aquesta opció, els missatges que s'enviïn xifrats es desaran "
-"en el mateix format en el qual s'han enviat. Això no és el més recomanable, "
-"atès que després d'un temps no els podreu llegir perquè el certificat "
-"segurament haurà caducat.\n"
-"<p>\n"
-"De tota manera, podria ser que hi hagués regles locals que requereixin tenir "
-"aquesta opció habilitada. Si teniu cap dubte, comproveu-ho amb el vostre "
-"administrador local.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Mostra sempre les claus de xifratge &per aprovar-les"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Quan aquesta opció està habilitada, l'aplicació sempre us mostrarà una llista "
-"de claus públiques d'on podeu triar la que s'usarà per al xifratge. Si no està "
-"habilitada, l'aplicació només mostrarà el diàleg si no pot trobar la clau "
-"correcta o si n'hi ha diverses que podrien usar-se."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Xifra els missatges automàticament &sempre que sigui possible"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Quan aquesta opció està habilitada es xifraran tots els missatges que envieu "
-"que puguin xifrar-se. Evidentment, tot i això és possible deshabilitar el "
-"xifratge per a cada missatge individualment."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "No signis/xifris mai en desar com a esborran&y"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Com funciona?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "A: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "General"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Respon"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Respon a tots"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Reenvia"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Drecera:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Tipus de plan&tilla:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Propietats de la carpeta"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "La carpeta manté una llista de &correu"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Adreça de les llistes:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Sense llegir:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Caducitat dels missatges"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Fes que &caduqui després de:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Fes que caduquin els missatges &llegits"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Fes que caduquin &després de:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Fes que caduquin els missatges &sense llegir"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dia(dies)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Setmana(es)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mes(os)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avançada"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Identitat del remitent:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Format d'e&mmagatzematge:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "La &llista mostra:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Valida els certificats usant CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Si se selecciona aquesta opció, els certificats S/MIME es validen usant llistes "
-"de revocació de certificats (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Valida els certificats en línia (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Si se selecciona aquesta opció, els certificats S/MIME es validen en línia "
-"usant el protocol d'estat de certificats en línia (Online Certificates Status "
-"Protocol, OCSP). Ompliu l'URL del contestador OCSP a sota."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Validació de certificat en línia"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL del contestador OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Introduïu aquí l'adreça del servidor per a la validació en línia de certificats "
-"(contestador OCSP). Normalment l'URL comença amb http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Signatura del contestador OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignora l'URL de servei dels certificats"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "No comprovis les polítiques de certificat"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Per omissió, GnuPG usa el fitxer ~/.gnupg/policies.txt per comprovar si es "
-"permet una política de certificat. Si se selecciona aquesta opció, no es "
-"comproven les polítiques."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "No consultis mai una CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Si es marca aquesta opció, no s'usen mai les llistes de revocació de "
-"certificats per validar certificats S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Obté els certificats d'emissor que falten"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Si es marca aquesta opció, els certificats d'emissor que falten s'obtenen quan "
-"es necessari (això aplica als dos mètodes de validació, CRL i OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Peticions HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "No facis cap petició HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Deshabilita totalment l'ús d'HTTP per a S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Useu aquest intermediari per a les peticions HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Useu l'intermediari HTTP del sistema:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Si se selecciona aquesta opció, el valor de l'intermediari HTTP que es mostra a "
-"la dreta (provinent de la variable d'entorn http_proxy) s'usarà per a totes les "
-"peticions HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Introduïu aquí la localització del vostre intermediari HTTP, que s'usarà per a "
-"totes les peticions HTTP relacionades amb S/MIME. La sintaxi és host:port, per "
-"exemple elmeu.enlloc.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignora a l'HTTP el punt de distribució de CRL dels certificats"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"En cercar la localització d'una CRL, el certificat que es vol comprovar conté "
-"normalment entrades que es coneixen com a \"Punt de distribució de CRL\" (DP), "
-"que són URL que descriuen com accedir l'URL. S'usa la primera entrada DP que es "
-"troba. Amb aquesta opció s'ignoren totes les entrades que usen l'esquema HTTP "
-"en cercar un DP adequat."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Peticions LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "No facis cap petició LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Deshabilita totalment l'ús d'LDAP per a S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignora a l'LDAP el punt de distribució de CRL dels certificats"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"En cercar la localització d'una CRL, el certificat que es vol comprovar conté "
-"normalment entrades que es coneixen com a \"Punt de distribució de CRL\" (DP), "
-"que són URL que descriuen com accedir l'URL. S'usa la primera entrada DP que es "
-"troba. Amb aquesta opció s'ignoren totes les entrades que usen l'esquema LDAP "
-"en cercar un DP adequat."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Màquina primària per a peticions LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"La introducció d'un servidor LDAP aquí farà que totes les peticions LDAP vagin "
-"primer a aquest servidor. Més precisament, aquest valor modifica la màquina i "
-"el port especificats a un URL LDAP i també s'usarà si la màquina i el port "
-"s'han omès a l'URL. Altres servidors LDAP només s'usaran si falla la connexió a "
-"\"l'intermediari\".\n"
-"La sintaxi és \"màquina\" o \"màquina:port\". Si s'omet el port, s'usa el port "
-"389 que és l'estàndard LDAP."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Afegeix un retall"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Afegeix"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Retall:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Grup:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Paràmetres dels retalls"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Rètols informatius"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Mostra el text del retall al rè&tol informatiu"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Decideix si el rètol informatiu s'ha de mostrar contenint el text de la línia "
-"apuntada"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variables"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Mètode d'entrada per a les variables"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Diàleg particular per a cada variable d'un retall"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Es mostrarà un diàleg d'entrada per cada variable d'un retall"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Un diàleg per a totes les variables d'un retall"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Es mostrarà un diàleg particular a on podreu introduir els valors per a totes "
-"les variables d'un retall"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Delimitador:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Respon al remitent"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Respon a tots / Respon a la llista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Missatge reenviat"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Avisa &si s'intenten enviar missatges sense signar"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Marqueu-ho perquè se us avisi quan s'enviïn missatges sense signar."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa si s'intenten enviar missatges sense signar</h1>\n"
-"Si aquesta opció està marcada, se us avisarà quan intenteu enviar parts del "
-"missatge o el missatge sencer sense signar.\n"
-"<p>\n"
-"Per tal d'aconseguir un màxim d'integritat es recomana deixar aquesta opció "
-"habilitada.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Avisa en provar d'enviar &missatges sense xifrar"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Marqueu-ho per a ser avisat quan envieu missatges sense xifrar."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa en provar d'enviar missatges sense xifrar</h1>\n"
-"Si aquesta caixa està marcada, farà que se us avisi quan intenteu enviar alguna "
-"de les parts del missatge sense xifrar.\n"
-"<p>\n"
-"Es recomana deixar aquesta opció habilitada per aconseguir un màxim "
-"d'integritat.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Avisa si l'adreça de correu del destinatari &no és en el certificat"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Marqueu-ho perquè se us avisi si l'adreça no és en el certificat"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa si l'adreça de correu d'un destinatari no és al certificat</h1>\n"
-"Si aquesta opció està marcada, se us avisarà si l'adreça de correu del "
-"destinatari no és en el certificat emprat per a xifrar.\n"
-"<p>\n"
-"Per tal d'augmentar la seguretat es recomana deixar marcada aquesta opció.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Avisa si el certificats/claus caduquen aviat (configureu els llindars a sota)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Per a la signatura"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Per al xifratge"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dies"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Seleccioneu aquí el nombre de dies"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa si caduca el certificat de signatura</h1>\n"
-"Selecciona el nombre mínim de dies que el certificat de signatura hauria de ser "
-"vàlid sense emetre un avís.\n"
-"<p>\n"
-"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa si caduca el certificat de xifratge</h1>\n"
-"Selecciona el nombre mínim de dies que el certificat de xifratge ha de ser "
-"vàlid sense emetre un avís.\n"
-"<p>\n"
-"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa si caduca un certificat de la cadena</h1>\n"
-"Selecciona el nombre mínim de dies que haurien de ser vàlids tots els "
-"certificats de la cadena sense emetre un avís.\n"
-"<p>\n"
-"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa si caduca el certificat CA</h1>\n"
-"Selecciona el nombre mínim de dies que el certificat CA hauria de ser vàlid "
-"sense emetre un avís.\n"
-"<p>\n"
-"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisa si caduca el certificat arrel</h1>\n"
-"Selecciona el nombre mínim de dies que el certificat arrel hauria de ser vàlid "
-"sense emetre un avís.\n"
-"<p>\n"
-"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Per a certificats arrel:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Per a certificats CA intermedis:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Per a certificats/claus d'usuari final:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Torna a habilitar tots els avisos \"No tornis a preguntar\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Contingut de la plantilla"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Drecera de la plantilla"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Tipus de plantilla"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Envia el correu de la cua en comprovar el correu"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Seleccioneu si voleu que el KMail enviï tots els missatges de la carpeta "
-"sortida en comprovar el correu manualment o automàtica, o si no voleu que mai "
-"s'enviïn els missatges automàticament.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Mou automàticament els correus no sincronitzats des de les carpetes amb drets "
-"d'accés insuficients"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Si hi ha missatges nous en una carpeta, que encara no s'han pujat al servidor, "
-"però ara no teniu drets d'accés suficients a la carpeta per a pujar-los, "
-"llavors aquests missatges es mouran automàticament a la carpeta de perdut i "
-"trobat."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Permet els indicadors locals a les carpetes de només lectura"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Aquest paràmetre permet als administradors indicar un retard mínim entre dues "
-"comprovacions de correu.\"\n"
-"           \"L'usuari no podrà seleccionar un valor inferior al valor establert "
-"aquí."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"La carpeta seleccionada més recentment al diàleg de selecció de carpetes."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Ignora el paràmetre \"umask\" dels usuaris i empra en el seu lloc "
-"\"lectura-escriptura només per l'usuari\"."
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Política per mostrar la icona de la safata del sistema"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Tanca l'aplicació quan es tanqui la finestra principal, inclús si hi ha una "
-"icona activa a la safata del sistema."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Notificació verbosa de correu nou"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Si s'habilita aquesta opció a la notificació de correu nou es mostra el nombre "
-"de nous missatges arribats per a cada carpeta. Altrament, només tindreu un "
-"missatge senzill de 'Ha arribat correu nou'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Especifica &l'editor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Empra l'editor extern en comptes de l'editor per omissió"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"El llindar d'avís a l'usuari de què una carpeta està arribant al seu límit de "
-"quota."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Habilita la funcionalitat de groupware"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Fes malbé les capçaleres De:/A: a les respostes a respostes"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook té una sèrie de defectes a la implementació de l'estàndard "
-"iCalendar. Aquesta opció evita un d'ells. Si teniu problemes amb els usuaris "
-"Outlook que no poden obtenir les vostres respostes, proveu habilitar aquesta "
-"opció."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Envia les invitacions groupware al cos del missatge"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook té una sèrie de defectes a la implementació de l'estàndard "
-"iCalendar. Aquesta opció evita un d'ells. Si teniu problemes amb els usuaris "
-"Outlook que no poden obtenir les vostres invitacions, proveu habilitar aquesta "
-"opció."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Enviament d'invitacions compatible amb l'Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"El Microsoft Outlook, quan s'utilitza en combinació amb un servidor Microsoft "
-"Exchange, té un problema en interpretar els estàndards de correus-e de treball "
-"en grup. Activeu aquesta opció per enviar invitacions de treball en grup de "
-"manera que el Microsoft Exchange els entengui."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Quan es marca això no veureu la finestra de l'editor de correu. En lloc d'això "
-"s'envien automàticament tots els correus d'invitació. Si voleu veure el correu "
-"abans d'enviar-lo, podeu desmarcar aquesta opció. Però tingueu present que el "
-"text de la finestra de l'editor té la sintaxi iCalendar i no hauríeu de provar "
-"de modificar-lo a mà."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Esborra els correus d'invitació després d'enviar la seva resposta"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Quan això està marcat, els correus d'invitació rebuts que s'han contestat es "
-"mouran a la paperera, una vegada la resposta s'hagi enviat correctament."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Aquesta habilitació fa possible guardar les entrades de les aplicacions "
-"Kontact (KOrganizer, KAddressBook i KNotes).</p>"
-"<p>Si voleu establir aquesta opció també heu d'establir les aplicacions que "
-"usaran el recurs IMAP; això és fa al centre de control TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalment no tindreu cap motiu per a veure les carpetes que contenen els "
-"recursos IMAP, però si us cal veure'ls aquí podeu habilitar-ho.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Si el compte usat per emmagatzemar la informació de treball en grup \"\n"
-"          \"no s'usa per gestionar el correu normal, indiqueu aquesta opció per "
-"fer que el KMail només \"\n"
-"          \"mostri les carpetes de treball en grup. Això és útil si esteu "
-"gestionant el correu normal \"\n"
-"          \"via un compte IMAP en línia addicional.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Tria el format de magatzem de les carpetes de treball en grup. "
-"<ul>"
-"<li>Els formats usats per omissió són els estàndards ical (per a carpetes de "
-"calendari) i vcard (per a carpetes de llibres d'adreces). Aquests formats fan "
-"que totes les característiques de Kontact estiguin disponibles.</li>"
-"<li>El format XML Kolab usa un model a mida que coincideix més estretament amb "
-"el format d'Outlook. Aquest format proporciona millor compatibilitat Outlook en "
-"usar un servidor Kolab o una solució compatible.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Això tria el pare de les carpetes de recursos IMAP.</p> "
-"<p>Per omissió, el servidor Kolab estableix la carpeta d'entrada IMAP com a "
-"pare.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Aquest és l'identificador del compte que conté les carpetes de recursos "
-"IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Si voleu posar els noms de carpetes del magatzem IMAP en l'idioma local, "
-"podeu triar entre aquests idiomes disponibles.</p>"
-"<p> Tingueu present que l'única raó per fer-ho és per compatibilitat amb "
-"Microsoft Outlook. Es considera una mala idea fer-ho, atès que fa impossible "
-"canviar l'idioma. </p>"
-"<p>Per tant no establiu aquest valor si no hi esteu obligats.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "També filtra els correus nous rebuts en carpetes de treball en grup."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Sincronitza els canvis del treball en grup en les carpetes DIMAP immediatament "
-"en connectar-se."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Aquest valor s'usa per a decidir si s'ha de mostrar la introducció del KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Nombre màxim de connexions per remot"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Això es pot usar per restringir el nombre de connexions per remot mentre es "
-"comprova si hi ha correu nou. Per omissió el nombre de connexions és il·limitat "
-"(0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Mostra la línia de cerca ràpida"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Aquesta opció habilita o deshabilita la línia d'edició de cerca ràpida dalt de "
-"la llista de missatges que es pot usar per cercar ràpidament la informació que "
-"es mostra a la llista de missatges."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Amaga la bústia local si no s'usa"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Reenvia en línia com a predeterminat."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Permet que el caràcter de punt i coma (';') es pugui usar com a separador a "
-"l'editor de missatges."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Manté el joc de caràcters original en respondre o reenviar si és possible"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Afegei&x la signatura automàticament"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Recorda aquesta identitat, de manera que també s'usarà en futures finestres de "
-"l'editor.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Recorda aquesta carpeta per als ítems enviats, de manera que també s'usarà en "
-"futures finestres de l'editor."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Recorda aquest transport de correu, de manera que també s'usarà en futures "
-"finestres de l'editor."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Recorda aquesta identitat, de manera que també s'usarà en futures finestres de "
-"l'editor.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Ajus&t de les paraules a la columna:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Nombre màxim de línies de l'editor de destinataris."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Activeu aquesta opció per fer que Outlook &#8482; comprengui els noms dels "
-"adjunts que continguin caràcters no anglesos"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Petició automàtica de les notificacions de disposició del &missatge"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Habiliteu aquesta opció si voleu que el KMail demani notificacions de "
-"disposició del missatge (Message Disposition Notifications - MDN) per a "
-"cadascun dels missatges que envieu.</p>"
-"<p>Aquesta opció tan sols tindrà efecte per omissió. Encara podreu habilitar o "
-"deshabilitar les peticions MDN individualment en cada missatge des del mateix "
-"editor, ítem del menú <em>Opcions</em>->&gt;<em>Notificació de disposició del "
-"missatge</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Usa les adreces recents per a l'autocompleció"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Deshabiliteu aquesta opció si no voleu que apareguin les adreces que heu usat "
-"fa poc a la llista d'autocompleció dels camps d'adreça de l'editor."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Desa automàticament cada:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Es pot crear una còpia de seguretat del text de la finestra de l'editor. "
-"L'interval usat per crear les còpies de seguretat s'estableix aquí. Podeu "
-"deshabilitar l'autodesament establint el valor a 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Insereix les signatures a dalt del text citat"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Subs&titueix el prefix reconegut amb \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Substitueix el prefix reconegut amb \"F&wd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Em&pra la citació intel·ligent"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "La signatura ha caducat."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tipus de selector de destinatari"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Estableix el tipus del diàleg de selecció de destinataris per als\n"
-"         camps A, CC i BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Tipus d'editor de destinataris"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Estableix el tipus de l'editor de destinataris per a l'edició dels\n"
-"         camps A, CC i BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Nombre màxim de línies de l'editor de destinataris."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Llista dels tipus de parts de missatges a desprendre's pels correus que es "
-"reenvien en línia."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-"La mida màxima en MB que es permet que tinguin els adjunts dels correus."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Mostra el plafó de gestió de retalls de text i inserció en l'editor."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Mostra el registre d'auditoria del GnuPG inclús després de què les operacions "
-"de xifratge finalitzin correctament."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Manté el joc de caràcters original en respondre o reenviar si és possible"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Alguns correus, especialment els generats automàticament, no especifiquen la "
-"codificació de caràcters que s'ha d'usar per a mostrar-los correctament. En "
-"aquests casos s'usarà una codificació de caràcters de reserva, que podeu "
-"configurar aquí. Establiu-ho a la codificació de caràcters més comuna a les "
-"vostres terres. Per omissió s'usa la codificació configurada per a tot el "
-"sistema."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"En canviar el valor per omissió 'Auto' es forçarà l'ús de la codificació "
-"especificada per a tots els correus, independentment del que s'hi especifiqui."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Habiliteu-ho si voleu substituir les emoticones com ara :-) que apareguin al "
-"text del missatge per icones (petites imatges)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Habiliteu aquesta opció per a mostrar diferents nivells de text citat. "
-"Deshabiliteu-la per a ocultar els nivells de text citat."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Nivell de plegat automàtic:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Redueix la mida de lletra pel text citat"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Habiliteu aquesta opció per a mostrar el text citat amb una lletra més petita."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "&Desa els missatges que s'enviïn xifrats"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Mostra l'agent d'usuari amb capçaleres decorades"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Habiliteu aquesta opció per visualitzar les línies de capçalera Agent d'Usuari "
-"i X-Mailer amb capçaleres decorades."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Permet esborrar adjunts de correus existents."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Permet editar adjunts de correus existents."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-"Desxifra sempre els missatges en visualitzar-los o pregunta abans del "
-"desxifratge"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Envia notificacions de disposició del missatge amb un remitent buit."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Envia notificacions de disposició del missatge amb un remitent buit. Alguns "
-"servidors poden haver-se configurat per a rebutjar aquests missatges, per tant, "
-"si experimenteu problemes en enviar MDN, desmarqueu aquesta opció."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Les frases s'han convertit a plantilles"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Les frases antigues s'han convertit a plantilles"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Plantilla de missatge pels missatges nous"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Plantilla de missatge per les respostes"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Plantilla de missatge per les respostes a tots"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Plantilla de missatge pels reenviaments"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Caràcters de citació"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-"Permet que els paràmetres de 'fora de l'oficina' siguin modificables per "
-"l'usuari."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Permet als usuaris que pengin scripts «sieve» de 'fora de l'oficina', però no "
-"permetre que canviïn altres paràmetres, com el domini al que reaccionar o el "
-"commutador de reacció al correu brossa."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Envia respostes 'fora de l'oficina' a correus que només provinguin d'aquest "
-"domini."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Permet les respostes 'fora de l'oficina' a enviar a correus marcats com a "
-"correu brossa."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Comprova si encara hi ha activa una resposta 'fora de l'oficina' configurada en "
-"engegar el KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "s'utilitza %1 de %2 %3"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14020,6 +11978,11 @@ msgstr "Afegeix a CC"
 msgid "Add as BCC"
 msgstr "Afegeix a BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "C&ancel·la"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14035,15 +11998,15 @@ msgstr "Destinataris seleccionats"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Heu seleccionat 1 destinatari. El número màxim de destinataris admès és %1. "
 "Adapteu la selecció.\n"
-"Heu seleccionat %n destinataris. El número màxim de destinataris admès és %1. "
-"Adapteu la selecció."
+"Heu seleccionat %n destinataris. El número màxim de destinataris admès és "
+"%1. Adapteu la selecció."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -14059,8 +12022,8 @@ msgstr "Usa el diàleg de selecció d'adreces"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Aquest botó obre un diàleg a part on podeu seleccionar destinataris de totes "
 "les adreces disponibles."
@@ -14165,10 +12128,19 @@ msgstr "és més gran o igual que"
 msgid " bytes"
 msgstr " octets"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dies"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Per executar la vostra cerca s'han de descarregar tots els missatges de la "
 "carpeta %1 del servidor. Això pot trigar una mica. Voleu continuar amb la "
@@ -14318,16 +12290,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"S'estan recollint dades pel compte '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "S'estan recollint dades pel compte '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14346,10 +12314,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Contingut del guió '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Contingut del guió '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14372,20 +12338,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Capacitats Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Capacitats Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(No hi ha disponible cap capacitat especial)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Guions Sieve disponibles:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Guions Sieve disponibles:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14428,8 +12390,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Marqueu aquesta caixa si voleu que el KMail afegeixi una signatura als correus "
-"escrits amb aquesta identitat."
+"Marqueu aquesta caixa si voleu que el KMail afegeixi una signatura als "
+"correus escrits amb aquesta identitat."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14464,8 +12426,8 @@ msgstr "Useu aquest camp per introduir una signatura estàtica arbitrària."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Useu aquest camp per especificar un fitxer de text que conté la vostra "
 "signatura. Es llegirà cada cop que creeu un nou correu o afegiu una nova "
@@ -14485,22 +12447,27 @@ msgstr "Obre el fitxer especificat en un editor de text."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Aquí podeu afegir una ordre arbitrària, bé amb ruta o bé sense ruta, depenent "
-"si l'ordre és o no a la vostra ruta. Per a cada nou correu, el KMail executarà "
-"l'ordre i usarà la sortida (a la sortida estàndard) com a signatura. Algunes "
-"ordres que s'usen habitualment amb aquest mecanisme són \"fortune\" o "
-"\"ksig-random\"."
+"Aquí podeu afegir una ordre arbitrària, bé amb ruta o bé sense ruta, "
+"depenent si l'ordre és o no a la vostra ruta. Per a cada nou correu, el "
+"KMail executarà l'ordre i usarà la sortida (a la sortida estàndard) com a "
+"signatura. Algunes ordres que s'usen habitualment amb aquest mecanisme són "
+"\"fortune\" o \"ksig-random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Es&pecifica l'ordre:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Camí"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Entrada nova:"
@@ -14534,6 +12501,11 @@ msgstr "Afegeix grup"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Esteu segur que voleu eliminar aquest grup i tots els seus retalls?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "A&plica a:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Edita un retall"
@@ -14546,6 +12518,10 @@ msgstr "Edita un grup"
 msgid "Edit &group..."
 msgstr "Edita un &grup..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Edita..."
@@ -14584,13 +12560,13 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Si habiliteu aquesta opció, el valor introduït a la dreta es desarà. Si més "
-"tard useu la mateixa variable, inclús en un altre retall, el valor introduït a "
-"la dreta serà el valor predeterminat per a aquesta variable."
+"tard useu la mateixa variable, inclús en un altre retall, el valor introduït "
+"a la dreta serà el valor predeterminat per a aquesta variable."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14625,6 +12601,16 @@ msgstr "No habilitis"
 msgid "Cannot insert content from file %1: %2"
 msgstr "No es pot inserir el contingut des del fitxer %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "A: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14654,61 +12640,51 @@ msgstr "No s'ha pogut engegar l'ordre del conducte des de la plantilla: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí podeu crear les plantilles de missatges a usar quan editeu nous "
-"missatges o respostes, o quan reenvieu missatges.</p>"
-"<p>Les plantilles de missatges permeten ordres de substitució, només "
-"teclejant-les o seleccionant-les des del menú <i>Insereix ordre</i>.</p>"
-"<p>Les plantilles indicades aquí són específiques de carpeta. Prevalen sobre "
-"les plantilles globals i sobre les plantilles per identitat, si s'han "
-"indicat.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aquí podeu crear les plantilles de missatges a usar quan editeu nous "
+"missatges o respostes, o quan reenvieu missatges.</p><p>Les plantilles de "
+"missatges permeten ordres de substitució, només teclejant-les o seleccionant-"
+"les des del menú <i>Insereix ordre</i>.</p><p>Les plantilles indicades aquí "
+"són específiques de carpeta. Prevalen sobre les plantilles globals i sobre "
+"les plantilles per identitat, si s'han indicat.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí podeu crear les plantilles de missatges a usar quan editeu nous "
-"missatges o respostes, o quan reenvieu missatges.</p>"
-"<p>Les plantilles de missatges permeten ordres de substitució, només "
-"teclejant-les o seleccionant-les des del menú <i>Insereix ordre</i>.</p>"
-"<p>Les plantilles indicades aquí són per totes les identitats de correu. "
-"Prevalen sobre les plantilles globals i sobre les plantilles per carpeta, si "
-"s'han indicat.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aquí podeu crear les plantilles de missatges a usar quan editeu nous "
+"missatges o respostes, o quan reenvieu missatges.</p><p>Les plantilles de "
+"missatges permeten ordres de substitució, només teclejant-les o seleccionant-"
+"les des del menú <i>Insereix ordre</i>.</p><p>Les plantilles indicades aquí "
+"són per totes les identitats de correu. Prevalen sobre les plantilles "
+"globals i sobre les plantilles per carpeta, si s'han indicat.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí podeu crear les plantilles de missatges a usar quan editeu nous "
-"missatges o respostes, o quan reenvieu missatges.</p>"
-"<p>Les plantilles de missatges permeten ordres de substitució, només "
-"teclejant-les o seleccionant-les des del menú <i>Insereix ordre</i>.</p>"
-"<p>Aquesta és una plantilla (predeterminada) global. Es poden substituir per "
-"les plantilles per identitat i per les plantilles per carpeta, si s'han "
-"indicat.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aquí podeu crear les plantilles de missatges a usar quan editeu nous "
+"missatges o respostes, o quan reenvieu missatges.</p><p>Les plantilles de "
+"missatges permeten ordres de substitució, només teclejant-les o seleccionant-"
+"les des del menú <i>Insereix ordre</i>.</p><p>Aquesta és una plantilla "
+"(predeterminada) global. Es poden substituir per les plantilles per "
+"identitat i per les plantilles per carpeta, si s'han indicat.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14943,7 +12919,8 @@ msgstr "Insereix el resultat d'una odre"
 #: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
-"Canalitza el cos del missatge original i insereix el resultat com a text citat"
+"Canalitza el cos del missatge original i insereix el resultat com a text "
+"citat"
 
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
@@ -14953,7 +12930,8 @@ msgstr ""
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
-"Canalitza el missatge original amb capçaleres i insereix el resultat tal com és"
+"Canalitza el missatge original amb capçaleres i insereix el resultat tal com "
+"és"
 
 #: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
@@ -14963,6 +12941,10 @@ msgstr "Canalitza el cos del missatge actual i insereix el resultat tal com és"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Canalitza el cos del missatge actual i substitueix amb el resultat"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Indica la posició del cursor"
@@ -14995,114 +12977,6 @@ msgstr "Activa la depuració"
 msgid "Turn Debug Off"
 msgstr "Desactiva la depuració"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...que podeu anar al missatge següent i previ usant les\n"
-"fletxes dreta i esquerra respectivament?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...que podeu crear ràpidament filtres segons el destinatari,\n"
-"remitent, assumpte i llista de correu amb <em>Eines-&gt;Crea&nbsp;filtre</em>"
-"?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que podeu aconseguir desfer-vos del &quot;[nom llista de\n"
-"correu]&quot; afegit al subjecte d'algunes llistes, emprant\n"
-"l'acció de filtratge <em>reescriu capçalera</em>? Fent ús de\n"
-"<pre>reescriu capçalera &quot;Subject&quot;\n"
-"   substitueix &quot;\\s*\\[nom_llista_de_correu\\]\\s*&quot;\n"
-"   per &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...que podeu associar llistes de correu amb les carpetes\n"
-"en el diàleg <em>Carpeta-&gt;Gestió de les llistes de correu</em>"
-"? Llavors podreu usar\n"
-"<em>Missatge-&gt;Nou&nbsp;missatge&nbsp;a&nbsp;la&nbsp;llista&nbsp;de&nbsp;corre"
-"u...</em>\n"
-"per a obrir l'editor amb la llista de correu preseleccionada.\n"
-"Alternativament, podeu prémer el botó central del ratolí sobre la carpeta.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...que podeu assignar icones personalitzades individualment per a\n"
-"cada carpeta? Mireu en <em>Carpeta-&gt;Propietats...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...que el KMail pot emprar una barra de color per a indicar el tipus de "
-"missatge (text pla/HTML/OpenPGP) que es mostra?</p>\n"
-"<p>Això evita els intents de simular una signatura correcta enviant missatges\n"
-"HTML que simulin l'aspecte dels marcs d'estat de signatura del KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...que podeu filtrar qualsevol capçalera simplement introduint\n"
-"el seu nom en el primer camp editable d'una cadena de cerca?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que podeu filtrar la sortida dels missatges HTML amb la regla\n"
-"<pre>&quot;Content-type&quot; conté &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...que en respondre, tan sols se citaran les parts seleccionades del "
-"missatge?</p>\n"
-"<p>Si no hi ha res seleccionat, se citarà tot el missatge.</p>\n"
-"<p>Això fins i tot funciona amb el text dels adjunts quan heu seleccionat\n"
-"<em>Visualitza-&gt;Adjunts-&gt;Inclosos</em>.</p>\n"
-"<p>Aquesta característica està disponible per a tots els comandaments de\n"
-"respondre excepte per a <em>Missatge-&gt;Respon sense citar</em>.</p>\n"
-"<p align=\"right\"><em>contribució de David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "No hi ha res per desfer."
@@ -15168,6 +13042,17 @@ msgstr "Adjunt núm. %1 (sense nom)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Mostra el registre d'auditoria del GnuPG per a aquesta operació"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Ja existeix un fitxer anomenat \"%1\". Esteu segur que desitgeu "
+"sobreescriure'l?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Sobreescriure el fitxer?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15284,14 +13169,14 @@ msgstr "&Envia la imatge amb cada missatge"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Marqueu aquesta opció si voleu que KMail afegeixi el què s'anomena una "
-"capçalera X-Face als missatges escrits amb aquesta identitat. Una X-Face és una "
-"imatge en blanc i negre petita (48x48 píxels) que alguns clients de correu "
-"poden mostrar."
+"capçalera X-Face als missatges escrits amb aquesta identitat. Una X-Face és "
+"una imatge en blanc i negre petita (48x48 píxels) que alguns clients de "
+"correu poden mostrar."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15320,13 +13205,13 @@ msgstr "Selecciona un fitxer..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Useu-ho per a seleccionar un fitxer d'imatge des d'on crear el dibuix. La "
-"imatge hauria de ser d'alt contrast i forma quasi quadrada. Un fons suau ajuda "
-"a millorar el resultat."
+"imatge hauria de ser d'alt contrast i forma quasi quadrada. Un fons suau "
+"ajuda a millorar el resultat."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15334,17 +13219,17 @@ msgstr "Agafa de la llibreta d'adreces"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Podeu usar una versió en petit de la imatge que hàgiu establert a la vostra "
 "entrada a la llibreta d'adreces."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail pot enviar una imatge petita (48x48 píxels), monocroma i de baixa "
 "qualitat amb cada missatge. Per exemple, podria ser una foto vostra o una "
@@ -15356,11 +13241,11 @@ msgstr "Useu aquest camp per introduir una cadena X-Face arbitrària."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Hi ha exemples disponibles a <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Hi ha exemples disponibles a <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15376,132 +13261,1830 @@ msgstr "Cap imatge"
 msgid "You do not have your own contact defined in the address book."
 msgstr "No teniu el vostre propi contacte definit a la llibreta d'adreces."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Total: %2<br>Sense llegir: %3<br>Mida: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signatura"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Quota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Signa els missa&tges automàticament"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Estableix l'assumpte del missatge"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Quan aquesta opció està habilitada se signaran per omissió tots els "
+"missatges que envieu. Evidentment, encara és possible deshabilitar la "
+"signatura per a cada missatge individualment."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Envia CC: a l'\"adreça\""
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Xifratge"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Envia BCC: a l'\"adreça\""
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"En xifrar els correus, també &xifra sempre al certificat de la meva pròpia "
+"identitat"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Afegeix la 'capçalera' al missatge"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Quan s'habilita aquesta opció, el missatge o fitxer no solament es xifrarà "
+"amb la clau pública del receptor, sinó també amb la vostra clau. Això us "
+"permetrà desxifrar el missatge o fitxer més tard. Generalment això és una "
+"bona idea."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Llegeix el cos del missatge des del 'fitxer'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Mostra el text s&ignat/xifrat després de l'edició"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Estableix el cos del missatge"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Quan s'habilita aquesta opció, el text signat/xifrat es mostrarà en una "
+"finestra separada, facilitant-vos saber quin aspecte tindrà abans d'enviar-"
+"lo. Això és una bona idea quan esteu verificant que funciona el vostre "
+"sistema de xifratge."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Afegeix com a adjunt al correu. Això pot repetir-se"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "&Desa els missatges que s'enviïn xifrats"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Comprova només si hi ha correu nou"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Marqueu-ho per a desar els missatges xifrats "
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Obre només la finestra de l'editor"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Desa els missatges xifrats</h1>\n"
+"Quan està marcada aquesta opció, els missatges que s'enviïn xifrats es "
+"desaran en el mateix format en el qual s'han enviat. Això no és el més "
+"recomanable, atès que després d'un temps no els podreu llegir perquè el "
+"certificat segurament haurà caducat.\n"
+"<p>\n"
+"De tota manera, podria ser que hi hagués regles locals que requereixin tenir "
+"aquesta opció habilitada. Si teniu cap dubte, comproveu-ho amb el vostre "
+"administrador local.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Visualitza el fitxer de missatge donat"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Mostra sempre les claus de xifratge &per aprovar-les"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Envia un missatge a l'\"adreça\" resposta adjuntant el fitxer al que apunta "
-"l'\"URL\""
+"Quan aquesta opció està habilitada, l'aplicació sempre us mostrarà una "
+"llista de claus públiques d'on podeu triar la que s'usarà per al xifratge. "
+"Si no està habilitada, l'aplicació només mostrarà el diàleg si no pot trobar "
+"la clau correcta o si n'hi ha diverses que podrien usar-se."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Llegit"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Xifra els missatges automàticament &sempre que sigui possible"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Antic"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Quan aquesta opció està habilitada es xifraran tots els missatges que envieu "
+"que puguin xifrar-se. Evidentment, tot i això és possible deshabilitar el "
+"xifratge per a cada missatge individualment."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Esborrat"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "No signis/xifris mai en desar com a esborran&y"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Respost"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Com funciona?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Reenviat"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "General"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "En cua"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Respon"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Enviat"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Respon a tots"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Vigilat"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Reenvia"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorat"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Drecera:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Correu brossa"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Tipus de plan&tilla:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Correu legítim"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Contingut de la plantilla"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Pendent"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Drecera de la plantilla"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Té un adjunt"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Tipus de plantilla"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "s'utilitza %1 de %2 %3"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Propietats de la carpeta"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Camí"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "La carpeta manté una llista de &correu"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Adreça de les llistes:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Sense llegir:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Caducitat dels missatges"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Fes que &caduqui després de:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Fes que caduquin els missatges &llegits"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Fes que caduquin &després de:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Fes que caduquin els missatges &sense llegir"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dia(dies)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Setmana(es)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mes(os)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avançada"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Identitat del remitent:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Format d'e&mmagatzematge:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "La &llista mostra:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Envia el correu de la cua en comprovar el correu"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Ja existeix un fitxer anomenat \"%1\". Esteu segur que desitgeu "
-"sobreescriure'l?"
+"<qt><p>Seleccioneu si voleu que el KMail enviï tots els missatges de la "
+"carpeta sortida en comprovar el correu manualment o automàtica, o si no "
+"voleu que mai s'enviïn els missatges automàticament.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Sobreescriure el fitxer?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Mou automàticament els correus no sincronitzats des de les carpetes amb "
+"drets d'accés insuficients"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Si hi ha missatges nous en una carpeta, que encara no s'han pujat al "
+"servidor, però ara no teniu drets d'accés suficients a la carpeta per a "
+"pujar-los, llavors aquests missatges es mouran automàticament a la carpeta "
+"de perdut i trobat."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Permet els indicadors locals a les carpetes de només lectura"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Aquest paràmetre permet als administradors indicar un retard mínim entre "
+"dues comprovacions de correu.\"\n"
+"           \"L'usuari no podrà seleccionar un valor inferior al valor "
+"establert aquí."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"La carpeta seleccionada més recentment al diàleg de selecció de carpetes."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Ignora el paràmetre \"umask\" dels usuaris i empra en el seu lloc \"lectura-"
+"escriptura només per l'usuari\"."
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Política per mostrar la icona de la safata del sistema"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Tanca l'aplicació quan es tanqui la finestra principal, inclús si hi ha una "
+"icona activa a la safata del sistema."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Notificació verbosa de correu nou"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Si s'habilita aquesta opció a la notificació de correu nou es mostra el "
+"nombre de nous missatges arribats per a cada carpeta. Altrament, només "
+"tindreu un missatge senzill de 'Ha arribat correu nou'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Especifica &l'editor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Empra l'editor extern en comptes de l'editor per omissió"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"El llindar d'avís a l'usuari de què una carpeta està arribant al seu límit "
+"de quota."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Habilita la funcionalitat de groupware"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Fes malbé les capçaleres De:/A: a les respostes a respostes"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook té una sèrie de defectes a la implementació de l'estàndard "
+"iCalendar. Aquesta opció evita un d'ells. Si teniu problemes amb els usuaris "
+"Outlook que no poden obtenir les vostres respostes, proveu habilitar aquesta "
+"opció."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Envia les invitacions groupware al cos del missatge"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook té una sèrie de defectes a la implementació de l'estàndard "
+"iCalendar. Aquesta opció evita un d'ells. Si teniu problemes amb els usuaris "
+"Outlook que no poden obtenir les vostres invitacions, proveu habilitar "
+"aquesta opció."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Enviament d'invitacions compatible amb l'Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"El Microsoft Outlook, quan s'utilitza en combinació amb un servidor "
+"Microsoft Exchange, té un problema en interpretar els estàndards de correus-"
+"e de treball en grup. Activeu aquesta opció per enviar invitacions de "
+"treball en grup de manera que el Microsoft Exchange els entengui."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Quan es marca això no veureu la finestra de l'editor de correu. En lloc "
+"d'això s'envien automàticament tots els correus d'invitació. Si voleu veure "
+"el correu abans d'enviar-lo, podeu desmarcar aquesta opció. Però tingueu "
+"present que el text de la finestra de l'editor té la sintaxi iCalendar i no "
+"hauríeu de provar de modificar-lo a mà."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Esborra els correus d'invitació després d'enviar la seva resposta"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Quan això està marcat, els correus d'invitació rebuts que s'han contestat es "
+"mouran a la paperera, una vegada la resposta s'hagi enviat correctament."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Aquesta habilitació fa possible guardar les entrades de les aplicacions "
+"Kontact (KOrganizer, KAddressBook i KNotes).</p><p>Si voleu establir aquesta "
+"opció també heu d'establir les aplicacions que usaran el recurs IMAP; això "
+"és fa al centre de control TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalment no tindreu cap motiu per a veure les carpetes que contenen els "
+"recursos IMAP, però si us cal veure'ls aquí podeu habilitar-ho.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Si el compte usat per emmagatzemar la informació de treball en grup \"\n"
+"          \"no s'usa per gestionar el correu normal, indiqueu aquesta opció "
+"per fer que el KMail només \"\n"
+"          \"mostri les carpetes de treball en grup. Això és útil si esteu "
+"gestionant el correu normal \"\n"
+"          \"via un compte IMAP en línia addicional.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Tria el format de magatzem de les carpetes de treball en grup. "
+"<ul><li>Els formats usats per omissió són els estàndards ical (per a "
+"carpetes de calendari) i vcard (per a carpetes de llibres d'adreces). "
+"Aquests formats fan que totes les característiques de Kontact estiguin "
+"disponibles.</li><li>El format XML Kolab usa un model a mida que coincideix "
+"més estretament amb el format d'Outlook. Aquest format proporciona millor "
+"compatibilitat Outlook en usar un servidor Kolab o una solució compatible.</"
+"li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Això tria el pare de les carpetes de recursos IMAP.</p> <p>Per omissió, "
+"el servidor Kolab estableix la carpeta d'entrada IMAP com a pare.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Aquest és l'identificador del compte que conté les carpetes de recursos "
+"IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Si voleu posar els noms de carpetes del magatzem IMAP en l'idioma local, "
+"podeu triar entre aquests idiomes disponibles.</p><p> Tingueu present que "
+"l'única raó per fer-ho és per compatibilitat amb Microsoft Outlook. Es "
+"considera una mala idea fer-ho, atès que fa impossible canviar l'idioma. </"
+"p><p>Per tant no establiu aquest valor si no hi esteu obligats.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "També filtra els correus nous rebuts en carpetes de treball en grup."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Sincronitza els canvis del treball en grup en les carpetes DIMAP "
+"immediatament en connectar-se."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Aquest valor s'usa per a decidir si s'ha de mostrar la introducció del KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Nombre màxim de connexions per remot"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Això es pot usar per restringir el nombre de connexions per remot mentre es "
+"comprova si hi ha correu nou. Per omissió el nombre de connexions és "
+"il·limitat (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Mostra la línia de cerca ràpida"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Aquesta opció habilita o deshabilita la línia d'edició de cerca ràpida dalt "
+"de la llista de missatges que es pot usar per cercar ràpidament la "
+"informació que es mostra a la llista de missatges."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Amaga la bústia local si no s'usa"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Reenvia en línia com a predeterminat."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Permet que el caràcter de punt i coma (';') es pugui usar com a separador a "
+"l'editor de missatges."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Manté el joc de caràcters original en respondre o reenviar si és possible"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Afegei&x la signatura automàticament"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Recorda aquesta identitat, de manera que també s'usarà en futures finestres "
+"de l'editor.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Recorda aquesta carpeta per als ítems enviats, de manera que també s'usarà "
+"en futures finestres de l'editor."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Recorda aquest transport de correu, de manera que també s'usarà en futures "
+"finestres de l'editor."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Recorda aquesta identitat, de manera que també s'usarà en futures finestres "
+"de l'editor.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Ajus&t de les paraules a la columna:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Nombre màxim de línies de l'editor de destinataris."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Activeu aquesta opció per fer que Outlook &#8482; comprengui els noms dels "
+"adjunts que continguin caràcters no anglesos"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Petició automàtica de les notificacions de disposició del &missatge"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Habiliteu aquesta opció si voleu que el KMail demani notificacions de "
+"disposició del missatge (Message Disposition Notifications - MDN) per a "
+"cadascun dels missatges que envieu.</p><p>Aquesta opció tan sols tindrà "
+"efecte per omissió. Encara podreu habilitar o deshabilitar les peticions MDN "
+"individualment en cada missatge des del mateix editor, ítem del menú "
+"<em>Opcions</em>->&gt;<em>Notificació de disposició del missatge</em>.</p></"
+"qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Usa les adreces recents per a l'autocompleció"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Deshabiliteu aquesta opció si no voleu que apareguin les adreces que heu "
+"usat fa poc a la llista d'autocompleció dels camps d'adreça de l'editor."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Desa automàticament cada:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Es pot crear una còpia de seguretat del text de la finestra de l'editor. "
+"L'interval usat per crear les còpies de seguretat s'estableix aquí. Podeu "
+"deshabilitar l'autodesament establint el valor a 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Insereix les signatures a dalt del text citat"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Subs&titueix el prefix reconegut amb \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Substitueix el prefix reconegut amb \"F&wd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Em&pra la citació intel·ligent"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "La signatura ha caducat."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tipus de selector de destinatari"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Estableix el tipus del diàleg de selecció de destinataris per als\n"
+"         camps A, CC i BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Tipus d'editor de destinataris"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Estableix el tipus de l'editor de destinataris per a l'edició dels\n"
+"         camps A, CC i BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Nombre màxim de línies de l'editor de destinataris."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Llista dels tipus de parts de missatges a desprendre's pels correus que es "
+"reenvien en línia."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+"La mida màxima en MB que es permet que tinguin els adjunts dels correus."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Mostra el plafó de gestió de retalls de text i inserció en l'editor."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Mostra el registre d'auditoria del GnuPG inclús després de què les "
+"operacions de xifratge finalitzin correctament."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Manté el joc de caràcters original en respondre o reenviar si és possible"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Alguns correus, especialment els generats automàticament, no especifiquen la "
+"codificació de caràcters que s'ha d'usar per a mostrar-los correctament. En "
+"aquests casos s'usarà una codificació de caràcters de reserva, que podeu "
+"configurar aquí. Establiu-ho a la codificació de caràcters més comuna a les "
+"vostres terres. Per omissió s'usa la codificació configurada per a tot el "
+"sistema."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"En canviar el valor per omissió 'Auto' es forçarà l'ús de la codificació "
+"especificada per a tots els correus, independentment del que s'hi "
+"especifiqui."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Habiliteu-ho si voleu substituir les emoticones com ara :-) que apareguin al "
+"text del missatge per icones (petites imatges)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Habiliteu aquesta opció per a mostrar diferents nivells de text citat. "
+"Deshabiliteu-la per a ocultar els nivells de text citat."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Nivell de plegat automàtic:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Redueix la mida de lletra pel text citat"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Habiliteu aquesta opció per a mostrar el text citat amb una lletra més "
+"petita."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "&Desa els missatges que s'enviïn xifrats"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Mostra l'agent d'usuari amb capçaleres decorades"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Habiliteu aquesta opció per visualitzar les línies de capçalera Agent "
+"d'Usuari i X-Mailer amb capçaleres decorades."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Permet esborrar adjunts de correus existents."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Permet editar adjunts de correus existents."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+"Desxifra sempre els missatges en visualitzar-los o pregunta abans del "
+"desxifratge"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Envia notificacions de disposició del missatge amb un remitent buit."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Envia notificacions de disposició del missatge amb un remitent buit. Alguns "
+"servidors poden haver-se configurat per a rebutjar aquests missatges, per "
+"tant, si experimenteu problemes en enviar MDN, desmarqueu aquesta opció."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Les frases s'han convertit a plantilles"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Les frases antigues s'han convertit a plantilles"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Plantilla de missatge pels missatges nous"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Plantilla de missatge per les respostes"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Plantilla de missatge per les respostes a tots"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Plantilla de missatge pels reenviaments"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Caràcters de citació"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+"Permet que els paràmetres de 'fora de l'oficina' siguin modificables per "
+"l'usuari."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Permet als usuaris que pengin scripts «sieve» de 'fora de l'oficina', però "
+"no permetre que canviïn altres paràmetres, com el domini al que reaccionar o "
+"el commutador de reacció al correu brossa."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Envia respostes 'fora de l'oficina' a correus que només provinguin d'aquest "
+"domini."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Permet les respostes 'fora de l'oficina' a enviar a correus marcats com a "
+"correu brossa."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Comprova si encara hi ha activa una resposta 'fora de l'oficina' configurada "
+"en engegar el KMail."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Ed&ita el fitxer"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Edita..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Vés"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Carpeta"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Missatge"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Resposta especial"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Reen&via"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Rètols informatius"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Paràmetres dels retalls"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra d'eines HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opcions comuns"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barra d'eines HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Valida els certificats usant CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Si se selecciona aquesta opció, els certificats S/MIME es validen usant "
+"llistes de revocació de certificats (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Valida els certificats en línia (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Si se selecciona aquesta opció, els certificats S/MIME es validen en línia "
+"usant el protocol d'estat de certificats en línia (Online Certificates "
+"Status Protocol, OCSP). Ompliu l'URL del contestador OCSP a sota."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Validació de certificat en línia"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL del contestador OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Introduïu aquí l'adreça del servidor per a la validació en línia de "
+"certificats (contestador OCSP). Normalment l'URL comença amb http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Signatura del contestador OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignora l'URL de servei dels certificats"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "No comprovis les polítiques de certificat"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Per omissió, GnuPG usa el fitxer ~/.gnupg/policies.txt per comprovar si es "
+"permet una política de certificat. Si se selecciona aquesta opció, no es "
+"comproven les polítiques."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "No consultis mai una CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Si es marca aquesta opció, no s'usen mai les llistes de revocació de "
+"certificats per validar certificats S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Obté els certificats d'emissor que falten"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Si es marca aquesta opció, els certificats d'emissor que falten s'obtenen "
+"quan es necessari (això aplica als dos mètodes de validació, CRL i OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Peticions HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "No facis cap petició HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Deshabilita totalment l'ús d'HTTP per a S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Useu aquest intermediari per a les peticions HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Useu l'intermediari HTTP del sistema:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Si se selecciona aquesta opció, el valor de l'intermediari HTTP que es "
+"mostra a la dreta (provinent de la variable d'entorn http_proxy) s'usarà per "
+"a totes les peticions HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Introduïu aquí la localització del vostre intermediari HTTP, que s'usarà per "
+"a totes les peticions HTTP relacionades amb S/MIME. La sintaxi és host:port, "
+"per exemple elmeu.enlloc.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignora a l'HTTP el punt de distribució de CRL dels certificats"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"En cercar la localització d'una CRL, el certificat que es vol comprovar "
+"conté normalment entrades que es coneixen com a \"Punt de distribució de CRL"
+"\" (DP), que són URL que descriuen com accedir l'URL. S'usa la primera "
+"entrada DP que es troba. Amb aquesta opció s'ignoren totes les entrades que "
+"usen l'esquema HTTP en cercar un DP adequat."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Peticions LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "No facis cap petició LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Deshabilita totalment l'ús d'LDAP per a S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignora a l'LDAP el punt de distribució de CRL dels certificats"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"En cercar la localització d'una CRL, el certificat que es vol comprovar "
+"conté normalment entrades que es coneixen com a \"Punt de distribució de CRL"
+"\" (DP), que són URL que descriuen com accedir l'URL. S'usa la primera "
+"entrada DP que es troba. Amb aquesta opció s'ignoren totes les entrades que "
+"usen l'esquema LDAP en cercar un DP adequat."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Màquina primària per a peticions LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"La introducció d'un servidor LDAP aquí farà que totes les peticions LDAP "
+"vagin primer a aquest servidor. Més precisament, aquest valor modifica la "
+"màquina i el port especificats a un URL LDAP i també s'usarà si la màquina i "
+"el port s'han omès a l'URL. Altres servidors LDAP només s'usaran si falla la "
+"connexió a \"l'intermediari\".\n"
+"La sintaxi és \"màquina\" o \"màquina:port\". Si s'omet el port, s'usa el "
+"port 389 que és l'estàndard LDAP."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Afegeix un retall"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Afegeix"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Retall:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Grup:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Paràmetres dels retalls"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Rètols informatius"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Mostra el text del retall al rè&tol informatiu"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Decideix si el rètol informatiu s'ha de mostrar contenint el text de la "
+"línia apuntada"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variables"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Mètode d'entrada per a les variables"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Diàleg particular per a cada variable d'un retall"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "Es mostrarà un diàleg d'entrada per cada variable d'un retall"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Un diàleg per a totes les variables d'un retall"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Es mostrarà un diàleg particular a on podreu introduir els valors per a "
+"totes les variables d'un retall"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Delimitador:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Respon al remitent"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Respon a tots / Respon a la llista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Missatge reenviat"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Avisa &si s'intenten enviar missatges sense signar"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Marqueu-ho perquè se us avisi quan s'enviïn missatges sense signar."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa si s'intenten enviar missatges sense signar</h1>\n"
+"Si aquesta opció està marcada, se us avisarà quan intenteu enviar parts del "
+"missatge o el missatge sencer sense signar.\n"
+"<p>\n"
+"Per tal d'aconseguir un màxim d'integritat es recomana deixar aquesta opció "
+"habilitada.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Avisa en provar d'enviar &missatges sense xifrar"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Marqueu-ho per a ser avisat quan envieu missatges sense xifrar."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa en provar d'enviar missatges sense xifrar</h1>\n"
+"Si aquesta caixa està marcada, farà que se us avisi quan intenteu enviar "
+"alguna de les parts del missatge sense xifrar.\n"
+"<p>\n"
+"Es recomana deixar aquesta opció habilitada per aconseguir un màxim "
+"d'integritat.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Avisa si l'adreça de correu del destinatari &no és en el certificat"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Marqueu-ho perquè se us avisi si l'adreça no és en el certificat"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa si l'adreça de correu d'un destinatari no és al certificat</h1>\n"
+"Si aquesta opció està marcada, se us avisarà si l'adreça de correu del "
+"destinatari no és en el certificat emprat per a xifrar.\n"
+"<p>\n"
+"Per tal d'augmentar la seguretat es recomana deixar marcada aquesta opció.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Avisa si el certificats/claus caduquen aviat (configureu els llindars a sota)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Per a la signatura"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Per al xifratge"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Seleccioneu aquí el nombre de dies"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa si caduca el certificat de signatura</h1>\n"
+"Selecciona el nombre mínim de dies que el certificat de signatura hauria de "
+"ser vàlid sense emetre un avís.\n"
+"<p>\n"
+"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa si caduca el certificat de xifratge</h1>\n"
+"Selecciona el nombre mínim de dies que el certificat de xifratge ha de ser "
+"vàlid sense emetre un avís.\n"
+"<p>\n"
+"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa si caduca un certificat de la cadena</h1>\n"
+"Selecciona el nombre mínim de dies que haurien de ser vàlids tots els "
+"certificats de la cadena sense emetre un avís.\n"
+"<p>\n"
+"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa si caduca el certificat CA</h1>\n"
+"Selecciona el nombre mínim de dies que el certificat CA hauria de ser vàlid "
+"sense emetre un avís.\n"
+"<p>\n"
+"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisa si caduca el certificat arrel</h1>\n"
+"Selecciona el nombre mínim de dies que el certificat arrel hauria de ser "
+"vàlid sense emetre un avís.\n"
+"<p>\n"
+"El paràmetre recomanat per a SPHINX és de 14 dies.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Per a certificats arrel:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Per a certificats CA intermedis:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Per a certificats/claus d'usuari final:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Torna a habilitar tots els avisos \"No tornis a preguntar\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...que podeu anar al missatge següent i previ usant les\n"
+"fletxes dreta i esquerra respectivament?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...que podeu crear ràpidament filtres segons el destinatari,\n"
+"remitent, assumpte i llista de correu amb <em>Eines-&gt;Crea&nbsp;filtre</"
+"em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que podeu aconseguir desfer-vos del &quot;[nom llista de\n"
+"correu]&quot; afegit al subjecte d'algunes llistes, emprant\n"
+"l'acció de filtratge <em>reescriu capçalera</em>? Fent ús de\n"
+"<pre>reescriu capçalera &quot;Subject&quot;\n"
+"   substitueix &quot;\\s*\\[nom_llista_de_correu\\]\\s*&quot;\n"
+"   per &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...que podeu associar llistes de correu amb les carpetes\n"
+"en el diàleg <em>Carpeta-&gt;Gestió de les llistes de correu</em>? Llavors "
+"podreu usar\n"
+"<em>Missatge-&gt;Nou&nbsp;missatge&nbsp;a&nbsp;la&nbsp;llista&nbsp;de&nbsp;"
+"correu...</em>\n"
+"per a obrir l'editor amb la llista de correu preseleccionada.\n"
+"Alternativament, podeu prémer el botó central del ratolí sobre la carpeta.</"
+"p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...que podeu assignar icones personalitzades individualment per a\n"
+"cada carpeta? Mireu en <em>Carpeta-&gt;Propietats...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...que el KMail pot emprar una barra de color per a indicar el tipus de "
+"missatge (text pla/HTML/OpenPGP) que es mostra?</p>\n"
+"<p>Això evita els intents de simular una signatura correcta enviant "
+"missatges\n"
+"HTML que simulin l'aspecte dels marcs d'estat de signatura del KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...que podeu filtrar qualsevol capçalera simplement introduint\n"
+"el seu nom en el primer camp editable d'una cadena de cerca?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que podeu filtrar la sortida dels missatges HTML amb la regla\n"
+"<pre>&quot;Content-type&quot; conté &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...que en respondre, tan sols se citaran les parts seleccionades del "
+"missatge?</p>\n"
+"<p>Si no hi ha res seleccionat, se citarà tot el missatge.</p>\n"
+"<p>Això fins i tot funciona amb el text dels adjunts quan heu seleccionat\n"
+"<em>Visualitza-&gt;Adjunts-&gt;Inclosos</em>.</p>\n"
+"<p>Aquesta característica està disponible per a tots els comandaments de\n"
+"respondre excepte per a <em>Missatge-&gt;Respon sense citar</em>.</p>\n"
+"<p align=\"right\"><em>contribució de David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Mostra el camp de cerca ràpida de carpetes"
diff --git a/tde-i18n-cs/messages/tdepim/kmail.po b/tde-i18n-cs/messages/tdepim/kmail.po
index 94e129bb2c6..0907454d939 100644
--- a/tde-i18n-cs/messages/tdepim/kmail.po
+++ b/tde-i18n-cs/messages/tdepim/kmail.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-04-22 14:33+0200\n"
 "Last-Translator: Lukáš Tinkl <lukas@kde.org>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -24,23 +24,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"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"
+"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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 "Milan Hejpetr,Lukáš Tinkl,Ivo Jánský,Klára Cihlářová,Petr Uzel,Jakub Friedl"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"mhejpetr@iss.cz,lukas@kde.org,Ivo.Jansky@seznam.cz,koty@seznam.cz,"
-"petr.uzel@centrum.cz,jfriedl@suse.cz"
+"mhejpetr@iss.cz,lukas@kde.org,Ivo.Jansky@seznam.cz,koty@seznam.cz,petr."
+"uzel@centrum.cz,jfriedl@suse.cz"
 
 #: aboutdata.cpp:53
 msgid "Maintainer"
@@ -183,6 +183,12 @@ msgstr "Žá&dný (používat opatrně)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Účet pro poloautomatickou správu zdrojů"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Vyčistit minulé"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -258,13 +264,13 @@ msgstr "&Uživatel:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Váš poskytovatel připojení do Internetu vám přidělil <em>jméno uživatele</em>"
-", které je používáno k autentizaci na jeho serverech. Obvykle jde o první část "
-"vaší poštovní adresy (část před <em>@</em> )."
+"Váš poskytovatel připojení do Internetu vám přidělil <em>jméno uživatele</"
+"em>, které je používáno k autentizaci na jeho serverech. Obvykle jde o první "
+"část vaší poštovní adresy (část před <em>@</em> )."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -285,12 +291,12 @@ msgstr "Uložit POP &heslo"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Zvolte, pokud si přejete, aby KMail uložil heslo.\n"
 "V případě, že je k dispozici TDEWallet, použije se pro vyšší bezpečnost k "
@@ -325,11 +331,13 @@ msgstr "&Filtrovat zprávy, pokud jsou větší než"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Pokud zvolíte tuto možnost, budou, k rozhodnutí co dělat se zprávami, použity "
-"POP filtry. Můžete vybrat, zda je stáhnout, smazat nebo ponechat na serveru."
+"Pokud zvolíte tuto možnost, budou, k rozhodnutí co dělat se zprávami, "
+"použity POP filtry. Můžete vybrat, zda je stáhnout, smazat nebo ponechat na "
+"serveru."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -378,13 +386,15 @@ msgstr "Čistý te&xt"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -427,14 +437,14 @@ msgstr "Prostory jmen:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Zde vidíte různé jmenné prostory, které váš IMAP server podporuje. Každý jmenný "
-"prostor představuje předponu oddělující skupiny složek. Jmenné prostory "
-"například umožňují zobrazovat vaše osobní složky a sdílené složky v jednom "
-"účtu."
+"Zde vidíte různé jmenné prostory, které váš IMAP server podporuje. Každý "
+"jmenný prostor představuje předponu oddělující skupiny složek. Jmenné "
+"prostory například umožňují zobrazovat vaše osobní složky a sdílené složky v "
+"jednom účtu."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -491,12 +501,13 @@ msgstr "Načíst pří&lohy na požádání"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Aktivujte pro nahrávání příloh, pouze pokud kliknete na přílohu, ne automaticky "
-"při zvolení zprávy. Takto budou i velké zprávy zobrazeny skoro okamžitě."
+"Aktivujte pro nahrávání příloh, pouze pokud kliknete na přílohu, ne "
+"automaticky při zvolení zprávy. Takto budou i velké zprávy zobrazeny skoro "
+"okamžitě."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -536,7 +547,7 @@ msgstr "<žádný>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Došlá pošta"
 
@@ -544,45 +555,47 @@ msgstr "Došlá pošta"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Server zřejmě nepodporuje jedinečná čísla zpráv, což je ovšem pro ponechání "
 "zpráv na serveru vyžadováno.\n"
-"Protože některé servery neoznamují správně své schopnosti, máte stále možnost "
-"ponechávání zpráv na serveru zapnout."
+"Protože některé servery neoznamují správně své schopnosti, máte stále "
+"možnost ponechávání zpráv na serveru zapnout."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Server zřejmě nepodporuje stahování hlaviček zpráv, což je ovšem předpokladem "
-"pro filtrování zpráv na serveru.\n"
-"Protože některé servery neoznamují správně své schopnosti, máte stále možnost "
-"filtrování zpráv na serveru zapnout."
+"Server zřejmě nepodporuje stahování hlaviček zpráv, což je ovšem "
+"předpokladem pro filtrování zpráv na serveru.\n"
+"Protože některé servery neoznamují správně své schopnosti, máte stále "
+"možnost filtrování zpráv na serveru zapnout."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Prosím, uvědomte si, že tato volba může způsobit, že POP3 servery, "
 "nepodporující proudové zpracování, budou posílat poškozené zprávy.\n"
-"Tato možnost konfigurace je zde proto, že některé servery, podporující proudové "
-"zpracování, nejsou schopny tuto vlastnost oznámit. Pro kontrolu, zda POP3 "
-"server oznamuje proudové zpracování, použijte tlačítko vespod dialogu.\n"
+"Tato možnost konfigurace je zde proto, že některé servery, podporující "
+"proudové zpracování, nejsou schopny tuto vlastnost oznámit. Pro kontrolu, "
+"zda POP3 server oznamuje proudové zpracování, použijte tlačítko vespod "
+"dialogu.\n"
 "Pokud server tuto vlastnost neoznamuje a vy potřebujete vysokou rychlost, "
-"udělejte napřed několik testů - třeba tak, že sami sobě pošlete několik zpráv a "
-"pak se je pokusíte stáhnout."
+"udělejte napřed několik testů - třeba tak, že sami sobě pošlete několik "
+"zpráv a pak se je pokusíte stáhnout."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -590,47 +603,49 @@ msgstr "Prosím nejprve specifikujte server a port v záložce Obecné."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Server zřejmě nepodporuje pipelining, proto byla tato volba zakázána.\n"
-"Protože některé servery neoznamují korektně své schopnosti, máte možnost funkci "
-"stále zapnout. Uvědomte si ale prosím, že zapnutí této funkce může u některých "
-"POP serverů, které ji nepodporují, způsobit zasílání poškozených zpráv. Proto "
-"byste funkci měli nejprve otestovat zasláním většího množství testovacích zpráv "
-"na vlastní adresu, které z POP serveru stáhnete všechny najednou."
+"Protože některé servery neoznamují korektně své schopnosti, máte možnost "
+"funkci stále zapnout. Uvědomte si ale prosím, že zapnutí této funkce může u "
+"některých POP serverů, které ji nepodporují, způsobit zasílání poškozených "
+"zpráv. Proto byste funkci měli nejprve otestovat zasláním většího množství "
+"testovacích zpráv na vlastní adresu, které z POP serveru stáhnete všechny "
+"najednou."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Server zřejmě nepodporuje jedinečná čísla zpráv, což je ovšem pro ponechání "
 "zpráv na serveru vyžadováno. Proto byla tato volba zakázána.\n"
-"Protože některé servery neoznamují správně své schopnosti, máte stále možnost "
-"ponechávání zpráv na serveru zapnout."
+"Protože některé servery neoznamují správně své schopnosti, máte stále "
+"možnost ponechávání zpráv na serveru zapnout."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Server zřejmě nepodporuje stahování hlaviček zpráv, což je ovšem předpokladem "
-"pro filtrování zpráv na serveru. Proto byla tato volba zakázána.\n"
-"Protože některé servery neoznamují správně své schopnosti, máte stále možnost "
-"filtrování zpráv na serveru zapnout."
+"Server zřejmě nepodporuje stahování hlaviček zpráv, což je ovšem "
+"předpokladem pro filtrování zpráv na serveru. Proto byla tato volba "
+"zakázána.\n"
+"Protože některé servery neoznamují správně své schopnosti, máte stále "
+"možnost filtrování zpráv na serveru zapnout."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -713,10 +728,11 @@ msgstr "IMAP účet"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Je nutné přidat účet v sekci Síť v nastaveních, aby bylo možné přijímat poštu."
+"Je nutné přidat účet v sekci Síť v nastaveních, aby bylo možné přijímat "
+"poštu."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -752,13 +768,13 @@ msgstr "Vítejte v KMailu"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Zdá se, že je to poprvé, co jste spustili KMail. Můžete použít průvodce pro "
-"nastavení poštovních účtů. Stačí na následujících stránkách vyplnit údaje, "
-"které jste získali od poskytovatele poštovní schránky.</qt>"
+"<qt>Zdá se, že je to poprvé, co jste spustili KMail. Můžete použít průvodce "
+"pro nastavení poštovních účtů. Stačí na následujících stránkách vyplnit "
+"údaje, které jste získali od poskytovatele poštovní schránky.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -820,8 +836,7 @@ msgstr "Použít místní doručování"
 msgid "Server Information"
 msgstr "Informace o serveru"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Žádný"
@@ -914,8 +929,9 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Lituji, ale nebyly nalezeny žádné nástroje pro detekci spamu. Nainstalujte "
-"software pro detekci spamu a poté znovu spusťte tohoto průvodce.</p>"
+"<p>Lituji, ale nebyly nalezeny žádné nástroje pro detekci spamu. "
+"Nainstalujte software pro detekci spamu a poté znovu spusťte tohoto průvodce."
+"</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -959,26 +975,25 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Zde můžete s pomocí průvodce vytvořit filtrovací pravidla aplikace KMail, "
-"které pak budou používat některé ze známých antivirových nástrojů.</p>"
-"<p>Průvodce dokáže tyto nástroje vyhledat, vytvořit pravidla na vyhledávání "
-"virů a spolu s nástroji je pak použít. Průvodce nebude brát ohledy na již "
-"existující pravidla. Vždy si vytvoří nová.</p>"
-"<p><b>Varování:</b> Během vyhledávání virů ve zprávách se může zdát, že KMail "
-"zatuhl. Vyhledávání virů může být časově velmi náročné. Pokud je to váš případ "
-"a přejete si navrátit k předešlému nastavení, smažte filtry vytvořené "
+"které pak budou používat některé ze známých antivirových nástrojů.</"
+"p><p>Průvodce dokáže tyto nástroje vyhledat, vytvořit pravidla na "
+"vyhledávání virů a spolu s nástroji je pak použít. Průvodce nebude brát "
+"ohledy na již existující pravidla. Vždy si vytvoří nová.</p><p><b>Varování:</"
+"b> Během vyhledávání virů ve zprávách se může zdát, že KMail zatuhl. "
+"Vyhledávání virů může být časově velmi náročné. Pokud je to váš případ a "
+"přejete si navrátit k předešlému nastavení, smažte filtry vytvořené "
 "průvodcem."
 
 #: antispamwizard.cpp:919
@@ -987,7 +1002,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Prosím, vyberte nástroj pro detekci spamu a pokračujte na další stránce.</p>"
+"<p>Prosím, vyberte nástroj pro detekci spamu a pokračujte na další stránce.</"
+"p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1015,15 +1031,13 @@ msgstr "&Přesunout pravděpodobný spam do:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Výchozí složkou je složka Došlá pošta, můžete to však změnit v pohledu na "
-"složky níže. "
-"<p>Ne všechny nástroje podporují zařazení jako nejistý. Pokud jste nezvolili "
-"vhodný nástroj, nemůžete zvolit ani složku."
+"složky níže. <p>Ne všechny nástroje podporují zařazení jako nejistý. Pokud "
+"jste nezvolili vhodný nástroj, nemůžete zvolit ani složku."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1033,12 +1047,12 @@ msgstr "Překontrolovat zprávy pomocí antivirových nástrojů"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Vaše zprávy překontrolují antivirové nástroje. Průvodce pak vytvoří příslušné "
-"filtry. Zprávy jsou obvykle označeny nástroji tak, že umožní filtrům reagovat a "
-"např. přesunout zavirované zprávy do zvláštní složky."
+"Vaše zprávy překontrolují antivirové nástroje. Průvodce pak vytvoří "
+"příslušné filtry. Zprávy jsou obvykle označeny nástroji tak, že umožní "
+"filtrům reagovat a např. přesunout zavirované zprávy do zvláštní složky."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1047,8 +1061,8 @@ msgstr "Všechny zavirované zprávy přesunout do zvolené složky"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Filtr detekuje zprávy označené jako zavirované a přesune je do nastavené "
 "složky. Výchozí složka je koš, ale můžete jí změnit."
@@ -1059,8 +1073,8 @@ msgstr "A zároveň označit zavirované zprávy jako přečtené"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Zprávy označené jako zavirované označí jako přečtené a přesune je do zvolené "
 "složky."
@@ -1244,8 +1258,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Je možné, že nemáte práva provést tuto operaci nebo je složka již na serveru. "
-"Chybová zpráva z komunikace se serverem je zde:"
+"Je možné, že nemáte práva provést tuto operaci nebo je složka již na "
+"serveru. Chybová zpráva z komunikace se serverem je zde:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1258,8 +1272,8 @@ msgstr "Chyba při čtení složky %1 na serveru: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1279,8 +1293,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1311,20 +1325,20 @@ msgstr "Smazáno"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Žádná z vašich identit neodpovídá příjemci této zprávy, "
-"<br>prosím zvolte, která z těchto adres je vaše (pokud nějaká je):"
+"<qt>Žádná z vašich identit neodpovídá příjemci této zprávy, <br>prosím "
+"zvolte, která z těchto adres je vaše (pokud nějaká je):"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Několik z vašich identit odpovídá příjemci této zprávy, "
-"<br>prosím zvolte, která z těchto adres je vaše:"
+"<qt>Několik z vašich identit odpovídá příjemci této zprávy, <br>prosím "
+"zvolte, která z těchto adres je vaše:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1353,18 +1367,21 @@ msgstr "Nastala chyba při komprimaci složky \"%1\". Komprimace přerušena."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Toto nastavení bylo spraveno vaším administrátorem.</p>"
-"<p>Pokud myslíte, že je to chyba, prosím kontaktujte ho.</p></qt>"
+"<qt><p>Toto nastavení bylo spraveno vaším administrátorem.</p><p>Pokud "
+"myslíte, že je to chyba, prosím kontaktujte ho.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Načíst profi&l..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Nastavení účtu"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Přid&at..."
@@ -1395,6 +1412,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Odstranit identitu"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Odstranit"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Přidat"
@@ -1403,6 +1425,11 @@ msgstr "Přidat"
 msgid "Modify..."
 msgstr "Změnit..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Odstranit"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Nastavit jako výchozí"
@@ -1419,17 +1446,15 @@ msgstr "&Odesílání"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Odchozí účty (přidejte alespoň jeden):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Název"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Typ"
@@ -1451,8 +1476,7 @@ msgstr "Nastavit jako výchozí"
 msgid "Common Options"
 msgstr "Obvyklé možnosti"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "P&otvrzení před odesláním"
@@ -1503,17 +1527,16 @@ msgstr "Implici&tní doména:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Implicitní doména se používá pro doplňování emailové adresy, je-li zadáno "
-"pouze jméno uživatele.</p></qt>"
+"<qt><p>Implicitní doména se používá pro doplňování emailové adresy, je-li "
+"zadáno pouze jméno uživatele.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1531,9 +1554,9 @@ msgstr "Přidat transport"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Výchozí)"
 
@@ -1618,6 +1641,10 @@ msgstr "Změnit účet"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Nelze nalézt účet <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "B&arvy"
@@ -1726,8 +1753,7 @@ msgstr "Navštívený odkaz"
 msgid "Misspelled Words"
 msgstr "Chybně napsaná slova"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nová zpráva"
@@ -1916,8 +1942,8 @@ msgstr "Implicitně jsou vlákna uzavřena"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr "Otevřít vlákna, která obsahují nové, nepřečtené nebo důležité zpráv&y"
 
 #: configuredialog.cpp:2055
@@ -1926,69 +1952,52 @@ msgstr "Zobrazení data"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Pro datum mohou být použity tyto výrazy:</strong></p>"
-"<ul>"
-"<li>d - den jako číslo bez úvodní nuly (1-31)</li>"
-"<li>dd - den jako číslo s úvodní nulou (01-31)</li>"
-"<li>ddd - zkrácené jméno dne (Po - Ne)</li>"
-"<li>dddd - úplné jméno dne (Pondělí - Neděle)</li>"
-"<li>M - měsíc jako číslo bez úvodní nuly (1-12)</li>"
-"<li>MM - měsíc jako číslo s úvodní nulou (01-12)</li>"
-"<li>MMM - zkrácené jméno měsíce (Led - Pros)</li>"
-"<li>MMMM - úplné jméno měsíce (Leden - Prosinec)</li>"
-"<li>yy - rok jako dvoumístné číslo (00-99)</li>"
-"<li>yyyy - rok jako čtyřmístné číslo (0000-9999)</li></ul>"
-"<p><strong>Pro čas mohou být použity tyto výrazy:</string></p> "
-"<ul>"
-"<li>h - hodina bez úvodní nuly (0-23 nebo 1-12 u AM/PM zobrazování)</li>"
-"<li>hh - hodina s úvodní nulou (00-23 nebo 01-12 u AM/PM zobrazování)</li>"
-"<li>m - minuty bez úvodní nuly (0-59)</li>"
-"<li>mm - minuty s úvodní nulou (00-59)</li>"
-"<li>s - sekundy bez úvodní nuly (0-59)</li>"
-"<li>ss - sekundy s úvodní nulou (00-59)</li>"
-"<li>z - milisekundy bez úvodních nul (0-999)</li>"
-"<li>zzz - milisekundy s úvodními nulami (000-999)</li>"
-"<li>AP - přepnout na AM/PM zobrazování. AP bude nahrazeno buď \"AM\" nebo "
-"\"PM\".</li>"
-"<li>ap - přepnout na AM/PM zobrazování. ap bude nahrazeno buď \"am\" nebo "
-"\"pm\".</li>"
-"<li>Z - časová zóna v numerickém formátu (-0500)</li></ul>"
-"<p><strong>Všechny ostatní vstupní znaky budou ignorovány.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Pro datum mohou být použity tyto výrazy:</strong></"
+"p><ul><li>d - den jako číslo bez úvodní nuly (1-31)</li><li>dd - den jako "
+"číslo s úvodní nulou (01-31)</li><li>ddd - zkrácené jméno dne (Po - Ne)</"
+"li><li>dddd - úplné jméno dne (Pondělí - Neděle)</li><li>M - měsíc jako "
+"číslo bez úvodní nuly (1-12)</li><li>MM - měsíc jako číslo s úvodní nulou "
+"(01-12)</li><li>MMM - zkrácené jméno měsíce (Led - Pros)</li><li>MMMM - "
+"úplné jméno měsíce (Leden - Prosinec)</li><li>yy - rok jako dvoumístné číslo "
+"(00-99)</li><li>yyyy - rok jako čtyřmístné číslo (0000-9999)</li></"
+"ul><p><strong>Pro čas mohou být použity tyto výrazy:</string></p> <ul><li>h "
+"- hodina bez úvodní nuly (0-23 nebo 1-12 u AM/PM zobrazování)</li><li>hh - "
+"hodina s úvodní nulou (00-23 nebo 01-12 u AM/PM zobrazování)</li><li>m - "
+"minuty bez úvodní nuly (0-59)</li><li>mm - minuty s úvodní nulou (00-59)</"
+"li><li>s - sekundy bez úvodní nuly (0-59)</li><li>ss - sekundy s úvodní "
+"nulou (00-59)</li><li>z - milisekundy bez úvodních nul (0-999)</li><li>zzz - "
+"milisekundy s úvodními nulami (000-999)</li><li>AP - přepnout na AM/PM "
+"zobrazování. AP bude nahrazeno buď \"AM\" nebo \"PM\".</li><li>ap - přepnout "
+"na AM/PM zobrazování. ap bude nahrazeno buď \"am\" nebo \"pm\".</li><li>Z - "
+"časová zóna v numerickém formátu (-0500)</li></ul><p><strong>Všechny ostatní "
+"vstupní znaky budou ignorovány.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Změna globálního nastavení vláken přepíše všechny hodnoty, specifické pro "
 "složky."
@@ -2005,8 +2014,7 @@ msgstr "Zobrazit stavový pr&uh HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Zobrazovat stav s&pamu v ozdobných hlavičkách"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Nahradit smajlíky emotikony"
@@ -2015,8 +2023,7 @@ msgstr "Nahradit smajlíky emotikony"
 msgid "Use smaller font for quoted text"
 msgstr "Pro citace použít menší font"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Zobrazit expand/collapse quote marks"
@@ -2042,8 +2049,7 @@ msgstr "Automaticky"
 msgid "&Override character encoding:"
 msgstr "&Obejít kódování znaků:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Povolit ikonu v systémové části panelu"
@@ -2145,21 +2151,19 @@ msgstr "<b>%f</b> bude nahrazeno jménem upravovaného souboru."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>Ve stylizaci odpovědi jsou podporovány následující substituční zkratky:"
-"<br><b>%D</b>: datum, <b>%S</b>: předmět,"
-"<br><b>%e</b>: adresa odesílatele, <b>%F</b>: jméno odesílatele, <b>%f</b>"
-": iniciály odesílatele,"
-"<br><b>%T</b>: jméno příjemce, <b>%t</b>: jméno a adresa příjemce,"
-"<br><b>%C</b>: jméno příjemce kopie, <b>%c</b>: jméno a adresa příjemce kopie,,"
-"<br><b>%%</b>: značka procenta, <b>%_</b>: mezera, <b>%L</b>: konec řádky</qt>"
+"<br><b>%D</b>: datum, <b>%S</b>: předmět,<br><b>%e</b>: adresa odesílatele, "
+"<b>%F</b>: jméno odesílatele, <b>%f</b>: iniciály odesílatele,<br><b>%T</b>: "
+"jméno příjemce, <b>%t</b>: jméno a adresa příjemce,<br><b>%C</b>: jméno "
+"příjemce kopie, <b>%c</b>: jméno a adresa příjemce kopie,,<br><b>%%</b>: "
+"značka procenta, <b>%_</b>: mezera, <b>%L</b>: konec řádky</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2182,21 +2186,20 @@ msgstr "Odpovědět vše&m:"
 msgid "&Forward:"
 msgstr "&Předat dál:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Ukazatel citace:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Dne %D jste napsal(a):"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Dne %D %F napsal(a):"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Předaná zpráva"
 
@@ -2234,8 +2237,8 @@ msgstr "Vložit nový prefix přeposlání:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Tento seznam je prohlížen pro každou odesílanou zprávu odshora dolů. Je "
 "zjišťována znaková sada, která obsahuje všechny požadované znaky."
@@ -2274,10 +2277,9 @@ msgstr "Hodnota"
 msgid "Ne&w"
 msgstr "&Nová"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Jméno:"
@@ -2286,16 +2288,15 @@ msgstr "&Jméno:"
 msgid "&Value:"
 msgstr "&Hodnota:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Pojmenování příloh kompatibilní s Outlookem"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Zapněte tuto možnost, aby Outlook(tm) pochopil názvy příloh obsahující "
 "neanglické znaky."
@@ -2307,7 +2308,8 @@ msgstr "Povolit detekci c&hybějících příloh"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Rozeznat jakékoliv z následujících klíčových slov jako záměr připojit přílohu:"
+"Rozeznat jakékoliv z následujících klíčových slov jako záměr připojit "
+"přílohu:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2325,13 +2327,13 @@ msgstr "přiloženo"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Chcete zašifrovat jména příloh obsahující neanglické znaky tak, aby byly "
 "čitelné pro Outlook(tm) a ostatní poštovní klienty, které nepodporují "
@@ -2362,111 +2364,97 @@ msgstr "Moduly šifrová&ní"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Emaily občas přicházejí v obou formátech. Tyto volby určují, zda chcete "
-"zobrazovat HTML část, či zda chcete vidět pouze textovou (plain text) část.</p>"
-"<p>Zobrazování HTML části je samozřejmě hezčí, ale poněkud zvyšuje riziko "
-"zneužití potenciálních bezpečnostních děr.</p>"
-"<p>Zobrazování čistého textu pochopitelně postrádá možnosti formátování textu, "
-"ale na druhé straně <em>znemožňuje<em> zneužití případných chyb v HTML "
-"interpretru (Konqueror).</p>"
-"<p>Volba níže chrání pouze před jedním běžným zneužitím HTML pošty. Nemůže vás "
-"ochránit před bezpečnostními problémy, které nejsou, v době vývoje této verze "
-"KMailu, známy.</p>"
-"<p>Není tedy radno preferovat HTML před prostým textem.</p>"
-"<p><b>Poznámka:</p> Toto lze nastavit i v rámci složek z nabídky <i>Složka</i> "
-"v hlavním okně KMailu.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Emaily občas přicházejí v obou formátech. Tyto volby určují, zda "
+"chcete zobrazovat HTML část, či zda chcete vidět pouze textovou (plain text) "
+"část.</p><p>Zobrazování HTML části je samozřejmě hezčí, ale poněkud zvyšuje "
+"riziko zneužití potenciálních bezpečnostních děr.</p><p>Zobrazování čistého "
+"textu pochopitelně postrádá možnosti formátování textu, ale na druhé straně "
+"<em>znemožňuje<em> zneužití případných chyb v HTML interpretru (Konqueror).</"
+"p><p>Volba níže chrání pouze před jedním běžným zneužitím HTML pošty. Nemůže "
+"vás ochránit před bezpečnostními problémy, které nejsou, v době vývoje této "
+"verze KMailu, známy.</p><p>Není tedy radno preferovat HTML před prostým "
+"textem.</p><p><b>Poznámka:</p> Toto lze nastavit i v rámci složek z nabídky "
+"<i>Složka</i> v hlavním okně KMailu.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Některé (např.) reklamní maily bývají často v HTML a obsahují odkazy do sítě "
-"na obrázky, které jsou pak používány při prohlížení těchto zpráv pro zjištění, "
-"zda byla zpráva přečtena (tzv. &quot;webové štěnice&quot;).</p>"
-"<p>Pokud odesilatel obrázky nepřipojí přímo ke zprávě, není jiná možnost jak se "
-"k nim dostat.</p>"
-"<p>Kvůli ochraně před zneužitím zobrazování HTML v KMailu je tato možnost "
-"implicitně <em>vypnuta</em>.</p>"
-"<p>Pokud chcete obrázky v HTML zprávách vidět, lze tuto volbu samozřejmě "
-"zapnout, ale je třeba počítat s možnými problémy.</p><qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Některé (např.) reklamní maily bývají často v HTML a obsahují odkazy "
+"do sítě na obrázky, které jsou pak používány při prohlížení těchto zpráv pro "
+"zjištění, zda byla zpráva přečtena (tzv. &quot;webové štěnice&quot;).</"
+"p><p>Pokud odesilatel obrázky nepřipojí přímo ke zprávě, není jiná možnost "
+"jak se k nim dostat.</p><p>Kvůli ochraně před zneužitím zobrazování HTML v "
+"KMailu je tato možnost implicitně <em>vypnuta</em>.</p><p>Pokud chcete "
+"obrázky v HTML zprávách vidět, lze tuto volbu samozřejmě zapnout, ale je "
+"třeba počítat s možnými problémy.</p><qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Politika oznámení o naložení se zprávou</h3>"
-"<p>MDN (oznámení o naložení se zprávou) je zevšeobecněním funkce <b>"
-"potvrzení o doručení</b>. Autor zprávy pomocí MDN požaduje, aby byl informován "
-"o osudu zprávy. Příjemcův emailový klient může jako odpověď zaslat informace o "
-"tom, jak bylo se zprávou naloženo. Obvyklou odpovědí bývá <b>zobrazeno</b> "
-"(tj. přečteno), <b>smazáno</b> nebo <b>odbaveno</b> (např. přeposláno "
-"jinam).</p> "
-"<p>Způsob odpovídání na MDN požadavky lze v KMailu nastavit takto:</p>"
-"<ul>"
-"<li><em>Ignorovat</em>: všechny MDN požadavky jsou ignorovány. MDN informace "
-"nebudou nikdy zasílány automaticky (doporučené nastavení).</li>"
-"<li><em>Dotázat se</em>: program se vždy dotazuje uživatele, zda na MDN "
-"požadavek odpovědět. Lze tak zasílat MDN informace jen o vybraných zprávách a "
-"odmítat je nebo požadavek zcela ignorovat u ostatních zpráv.</li>"
-"<li><em>Odmítnout</em>: program vždy odešle zamítavou odpověď. Z hlediska "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Politika oznámení o naložení se zprávou</h3><p>MDN (oznámení o "
+"naložení se zprávou) je zevšeobecněním funkce <b>potvrzení o doručení</b>. "
+"Autor zprávy pomocí MDN požaduje, aby byl informován o osudu zprávy. "
+"Příjemcův emailový klient může jako odpověď zaslat informace o tom, jak bylo "
+"se zprávou naloženo. Obvyklou odpovědí bývá <b>zobrazeno</b> (tj. přečteno), "
+"<b>smazáno</b> nebo <b>odbaveno</b> (např. přeposláno jinam).</p> <p>Způsob "
+"odpovídání na MDN požadavky lze v KMailu nastavit takto:</"
+"p><ul><li><em>Ignorovat</em>: všechny MDN požadavky jsou ignorovány. MDN "
+"informace nebudou nikdy zasílány automaticky (doporučené nastavení).</"
+"li><li><em>Dotázat se</em>: program se vždy dotazuje uživatele, zda na MDN "
+"požadavek odpovědět. Lze tak zasílat MDN informace jen o vybraných zprávách "
+"a odmítat je nebo požadavek zcela ignorovat u ostatních zpráv.</"
+"li><li><em>Odmítnout</em>: program vždy odešle zamítavou odpověď. Z hlediska "
 "soukromí je to jen o málo lepší, než zasílání MDN informací. Autor zprávy se "
-"totiž dozví, že zpráva byla doručena, nedozví se pouze, jak s ní bylo naloženo "
-"(zda byla přečtena, smazána atd.).</li>"
-"<li><em>Vždy odeslat</em>: vždy odeslat odpověď na MDN požadavek. Autor zprávy "
-"se tak nejen dozví, že zpráva byla doručena, ale i jak s ní bylo naloženo (zda "
-"byla zobrazena, smazána atd.). Takové nastavení se důrazně nedoporučuje, ale "
-"protože má smysl například pro správu vztahů se zákazníky, je v KMailu "
-"dostupné.</li></ul></qt>"
+"totiž dozví, že zpráva byla doručena, nedozví se pouze, jak s ní bylo "
+"naloženo (zda byla přečtena, smazána atd.).</li><li><em>Vždy odeslat</em>: "
+"vždy odeslat odpověď na MDN požadavek. Autor zprávy se tak nejen dozví, že "
+"zpráva byla doručena, ale i jak s ní bylo naloženo (zda byla zobrazena, "
+"smazána atd.). Takové nastavení se důrazně nedoporučuje, ale protože má "
+"smysl například pro správu vztahů se zákazníky, je v KMailu dostupné.</li></"
+"ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2482,15 +2470,15 @@ msgstr "Umožnit zprávám načítat e&xterní odkazy z Internetu"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>POZOR:</b> Povolení HTML v poště učiní systém více zranitelným vůči napadení "
-"zneužitím nějaké, dosud neznámé, bezpečnostní chyby. <a href=\"whatsthis:%1\">"
-"Více o HTML zprávách...</a> <a href=\"whatsthis:%2\">"
-"Více o externích odkazech...</a>"
+"<b>POZOR:</b> Povolení HTML v poště učiní systém více zranitelným vůči "
+"napadení zneužitím nějaké, dosud neznámé, bezpečnostní chyby. <a href="
+"\"whatsthis:%1\">Více o HTML zprávách...</a> <a href=\"whatsthis:%2\">Více o "
+"externích odkazech...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2551,8 +2539,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>POZOR:</b> Bezvýhradné vracení potvrzenek poněkud narušuje vaše soukromí. <a "
-"href=\"whatsthis:%1\">Více...</a>"
+"<b>POZOR:</b> Bezvýhradné vracení potvrzenek poněkud narušuje vaše soukromí. "
+"<a href=\"whatsthis:%1\">Více...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2573,8 +2561,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Tato volba vyžaduje dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "žádná proxy"
@@ -2603,8 +2590,8 @@ msgstr "Nenechat v&ypršet důležité zprávy"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Při hledání nepřečtených zpráv:"
 
@@ -2628,8 +2615,8 @@ msgstr "Kolovat ve všech složkách"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Při vstupu do složky:"
 
@@ -2698,27 +2685,23 @@ msgstr "jako adresáře (formát \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Zde je možno vybrat, který formát schránky bude implicitní pro lokální "
-"složky:</p>"
-"<p><b>mbox:</b> Složky KMailu jsou reprezentovány každý jedním souborem. "
-"Jednotlivé zprávy jsou odděleny od ostatních řádkou, začínající na \"From \". "
-"Šetří se tak místo na disku, ale je to méně robustní, např. při přesouvání "
-"zpráv mezi složkami.</p>"
-"<p><b>maildir:</b> Složky KMailu jsou reprezentovány reálnými složkami na "
-"disku. Jednotlivé zprávy jsou v samostatných souborech. Zabírá to na disku více "
-"místa, ale je to robustnější např. při přesouvání zpráv mezi složkami.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Zde je možno vybrat, který formát schránky bude implicitní pro "
+"lokální složky:</p><p><b>mbox:</b> Složky KMailu jsou reprezentovány každý "
+"jedním souborem. Jednotlivé zprávy jsou odděleny od ostatních řádkou, "
+"začínající na \"From \". Šetří se tak místo na disku, ale je to méně "
+"robustní, např. při přesouvání zpráv mezi složkami.</p><p><b>maildir:</b> "
+"Složky KMailu jsou reprezentovány reálnými složkami na disku. Jednotlivé "
+"zprávy jsou v samostatných souborech. Zabírá to na disku více místa, ale je "
+"to robustnější např. při přesouvání zpráv mezi složkami.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2751,54 +2734,44 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Při skákání na další nepřečtenou zprávu se může stát, že již nebude další "
-"nepřečtená zpráva dostupná.</p>"
-"<p><b>Bez opakování:</b> Hledání bude zastaveno na poslední zprávě v aktuální "
-"složce.</p>"
-"<p><b>Okakovat v aktuální složce:</b> Hledání bude pokračovat na vrchol seznamu "
-"zpráv, ale nepůjde již do další složky.</p>"
-"<p><b>Opakovat ve všech složkách:</b> Hledání bude pokračovat na vrchol seznamu "
-"zpráv. Pokud nebudou nalezeny další nepřečtené zprávy, tak se bude pokračovat v "
-"dalších složkách.</p>"
-"<p>Podobně, pokud hledáte předchozí nepřečtenou zprávu, hledání začne vespod "
-"seznamu zpráv a bude pokračovat v další složce podle toho, jaká volba je "
-"vybrána.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Při skákání na další nepřečtenou zprávu se může stát, že již nebude "
+"další nepřečtená zpráva dostupná.</p><p><b>Bez opakování:</b> Hledání bude "
+"zastaveno na poslední zprávě v aktuální složce.</p><p><b>Okakovat v aktuální "
+"složce:</b> Hledání bude pokračovat na vrchol seznamu zpráv, ale nepůjde již "
+"do další složky.</p><p><b>Opakovat ve všech složkách:</b> Hledání bude "
+"pokračovat na vrchol seznamu zpráv. Pokud nebudou nalezeny další nepřečtené "
+"zprávy, tak se bude pokračovat v dalších složkách.</p><p>Podobně, pokud "
+"hledáte předchozí nepřečtenou zprávu, hledání začne vespod seznamu zpráv a "
+"bude pokračovat v další složce podle toho, jaká volba je vybrána.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fulltextové indexování umožňuje velmi rychlé vyhledávání v obsahu vašich "
-"zpráv. Pokud je povoleno, vyhledávací dialog pracuje velmi rychle. Navíc, "
-"vyhledávací nástrojová lišta vybírá zprávy na základě obsahu</p>"
-"<p>Indexování vyžaduje jisté množství diskového prostoru (asi polovina celkové "
-"velikosti zpráv).</p>"
-"<p>Po povolení indexování musí být nejprve vytvořen index. Můžete však "
-"pokračovat v práci s KMail v průběhu této operace.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Fulltextové indexování umožňuje velmi rychlé vyhledávání v obsahu "
+"vašich zpráv. Pokud je povoleno, vyhledávací dialog pracuje velmi rychle. "
+"Navíc, vyhledávací nástrojová lišta vybírá zprávy na základě obsahu</"
+"p><p>Indexování vyžaduje jisté množství diskového prostoru (asi polovina "
+"celkové velikosti zpráv).</p><p>Po povolení indexování musí být nejprve "
+"vytvořen index. Můžete však pokračovat v práci s KMail v průběhu této "
+"operace.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2864,8 +2837,8 @@ msgstr "S&krýt groupwarové složky"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "Pokud zvolíte, neuvidíte ve stromovém pohledu složek IMAP složky."
 
 #: configuredialog.cpp:4909
@@ -2874,11 +2847,11 @@ msgstr "Z&obrazovat pouze groupwarové složky pro tento účet"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Pokud zvolíte, neuvidíte ve stromovém pohledu složek normální poštovní složky u "
-"účtu nastaveného pro groupware."
+"Pokud zvolíte, neuvidíte ve stromovém pohledu složek normální poštovní "
+"složky u účtu nastaveného pro groupware."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2933,19 +2906,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Pojmenování příloh kompatibilní s Outlookem"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatické posílání pozvánek"
@@ -2959,23 +2931,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Pozvánky jsou obvykle odesílány jako přílohy. Zde můžete provést změnu, "
 "která zajistí odeslání přímo v těle zprávy. To je důležité především pro "
-"odesílání pozvání a odpovědí Microsoft Outlooku. "
-"<br>Pokud toto nastavení provedete, nebudou zprávy obsahovat popisný text pro "
-"poštovní klienty. Uživatelé, kteří používají poštovní klienty nepoužívající "
-"pozvánky, uvidí nesrozumitelný text. "
-"<br>Uživatelé používající poštovní klienty se schopností pracovat s pozvánkami "
-"nebudou mít žádné problémy pracovat ani s touto verzí.</qt>"
+"odesílání pozvání a odpovědí Microsoft Outlooku. <br>Pokud toto nastavení "
+"provedete, nebudou zprávy obsahovat popisný text pro poštovní klienty. "
+"Uživatelé, kteří používají poštovní klienty nepoužívající pozvánky, uvidí "
+"nesrozumitelný text. <br>Uživatelé používající poštovní klienty se "
+"schopností pracovat s pozvánkami nebudou mít žádné problémy pracovat ani s "
+"touto verzí.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3079,17 +3051,16 @@ msgstr "Přeposlat"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3107,15 +3078,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3161,8 +3132,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"Ve vašem seznamu nejsou žádní příjemci. Nejprve zvolte nějaké příjemce a poté "
-"zkuste znovu."
+"Ve vašem seznamu nejsou žádní příjemci. Nejprve zvolte nějaké příjemce a "
+"poté zkuste znovu."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3187,8 +3158,8 @@ msgstr "Upravit identitu"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3450,6 +3421,11 @@ msgstr "Vybrat složku"
 msgid "Filters"
 msgstr "Filtr %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Vybrat všechen text"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3481,11 +3457,11 @@ msgstr "Zaznamenávat činnost fi&ltrů"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Zde můžete zapnout a vypnout záznam aktivit filtrů. Záznamy jsou pořizovány jen "
-"při zapnutí této funkce."
+"Zde můžete zapnout a vypnout záznam aktivit filtrů. Záznamy jsou pořizovány "
+"jen při zapnutí této funkce."
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3501,15 +3477,17 @@ msgstr "Zaznamenávat vyhodnocení p&ravidla filtru"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3529,14 +3507,14 @@ msgstr "neomezené"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Záznamy jsou dočasně ukládány v paměti. Zde můžete nastavit maximální velikost "
-"paměti, která se pro tento účel použije. Jestliže záznamy dosáhnou zde stanové "
-"velikosti, starší data se smažou a bude se pokračovat v záznamu."
+"Záznamy jsou dočasně ukládány v paměti. Zde můžete nastavit maximální "
+"velikost paměti, která se pro tento účel použije. Jestliže záznamy dosáhnou "
+"zde stanové velikosti, starší data se smažou a bude se pokračovat v záznamu."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3546,7 +3524,7 @@ msgstr ""
 "Nelze zapsat soubor %1:\n"
 "detailní chybová zpráva: %2"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Chyba KMailu"
@@ -3587,13 +3565,13 @@ msgstr "Identifikátor &uživatele:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Identifikátor uživatele je jeho přihlašovací jméno k IMAP serveru. Může jít o "
-"jednoduché uživatelské jméno nebo emailovou adresu. Zda jde o první nebo druhou "
-"možnost zjistíte podle typu svého přihlašovacího jména."
+"Identifikátor uživatele je jeho přihlašovací jméno k IMAP serveru. Může jít "
+"o jednoduché uživatelské jméno nebo emailovou adresu. Zda jde o první nebo "
+"druhou možnost zjistíte podle typu svého přihlašovacího jména."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3644,8 +3622,8 @@ msgstr "Nemáte práva pro čtení a zápis do svého koše."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Informace ještě nebyly získány ze serveru; použijte \"Zkontrolovat poštu\"."
 
@@ -3657,8 +3635,7 @@ msgstr "Chyba: není definován žádný IMAP účet pro tuto složku"
 msgid "Connecting to server %1, please wait..."
 msgstr "Připojuji se na server %1, prosím vyčkejte..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Chyba při připojování se na server %1"
@@ -3686,8 +3663,8 @@ msgstr "Přidat oprávnění"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Chcete si skutečně odejmout vlastní přístupová práva ke složce? Po odejmutí "
 "nebudete mít k této složce přístup."
@@ -3721,7 +3698,7 @@ msgstr "Využití:"
 msgid "Select Folder"
 msgstr "Vybrat složku"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokální složky"
@@ -3745,9 +3722,9 @@ msgstr "Vybrat zkratku pro složku"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Klávesovou zkratku pro výběr aktuální složky nastavíte kliknutím na "
 "tlačítko a stisknutím požadované kombinace kláves.</qt>"
@@ -3770,13 +3747,22 @@ msgstr "Z&rušit"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Složka, kterou jste smazali byla spojena s účtem <b>%1</b>"
-", který do ní ukládal poštu. Tento účet bude nadále ukládat poštu do složky "
-"'Došlá pošta'.</qt>"
+"<qt>Složka, kterou jste smazali byla spojena s účtem <b>%1</b>, který do ní "
+"ukládal poštu. Tento účet bude nadále ukládat poštu do složky 'Došlá pošta'."
+"</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3901,67 +3887,17 @@ msgstr "Stav spamu:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>z"
-"<br>p"
-"<br>r"
-"<br>á"
-"<br>v"
-"<br>a</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>z<br>p<br>r<br>á<br>v<br>a</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>z"
-"<br>p"
-"<br>r"
-"<br>á"
-"<br>v"
-"<br>a</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>e<br> <br>H<br>T<br>M<br>L<br> <br>z<br>p<br>r<br>á<br>v<br>a</"
+"qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3973,19 +3909,14 @@ msgstr "Vaše &jméno:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Vaše jméno</h3>"
-"<p>Toto pole by mělo obsahovat vaše jméno, jak byste chtěli, aby se zobrazilo v "
-"hlavičce emailu, který bude odeslán.</p>"
-"<p>Pokud toto zanecháte prázdné, vaše skutečné jméno se neobjeví, objeví se "
-"pouze emailová adresa.</p></qt>"
+"<qt><h3>Vaše jméno</h3><p>Toto pole by mělo obsahovat vaše jméno, jak byste "
+"chtěli, aby se zobrazilo v hlavičce emailu, který bude odeslán.</p><p>Pokud "
+"toto zanecháte prázdné, vaše skutečné jméno se neobjeví, objeví se pouze "
+"emailová adresa.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3993,17 +3924,13 @@ msgstr "Or&ganizace:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizace</h3>"
-"<p>Toto pole by mělo obsahovat jméno vaší organizace, jak byste chtěli, aby se "
-"zobrazilo v hlavičce emailu, který bude odeslán.</p>"
-"<p>Je bezpečné (a běžné) zanechat pole prázdné.</p></qt>"
+"<qt><h3>Organizace</h3><p>Toto pole by mělo obsahovat jméno vaší organizace, "
+"jak byste chtěli, aby se zobrazilo v hlavičce emailu, který bude odeslán.</"
+"p><p>Je bezpečné (a běžné) zanechat pole prázdné.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4012,20 +3939,15 @@ msgstr "&Emailová adresa:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Emailová adresa</h3>"
-"<p>Toto pole by mělo obsahovat vaši plnou emailovou adresu.</p>"
-"<p>Pokud pole necháte prázdné, nebo špatně vyplníte, lidé budou mít problému s "
-"odpovídáním vám</p></qt>"
+"<qt><h3>Emailová adresa</h3><p>Toto pole by mělo obsahovat vaši plnou "
+"emailovou adresu.</p><p>Pokud pole necháte prázdné, nebo špatně vyplníte, "
+"lidé budou mít problému s odpovídáním vám</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4034,21 +3956,12 @@ msgstr "&Emailová adresa:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4071,19 +3984,17 @@ msgstr "Vyberte klíč Open PGP, který bude použit k podepisování zpráv."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>OpenPGP klíč, který zde vyberete, bude použit pro podepisování zpráv. Lze "
-"také použít GnuPG klíče.</p> "
-"<p>Můžete toto nechat prázdné, ale KMail nebude schopen kryptograficky "
-"podepisovat emaily. Obyčejné funkce pošty nebudou ovlivněny.</p> "
-"<p>O klíčích můžete nalézt více na adrese <a>http://www.gnupg.org</a></qt>"
+"<qt><p>OpenPGP klíč, který zde vyberete, bude použit pro podepisování zpráv. "
+"Lze také použít GnuPG klíče.</p> <p>Můžete toto nechat prázdné, ale KMail "
+"nebude schopen kryptograficky podepisovat emaily. Obyčejné funkce pošty "
+"nebudou ovlivněny.</p> <p>O klíčích můžete nalézt více na adrese <a>http://"
+"www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4095,29 +4006,27 @@ msgstr "Váš šifrovací OpenPGP klíč"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Vyberte OpenPGP klíč, který má být použit pro šifrování pro vás a pro funkci "
 "\"Přiložit můj veřejný klíč\" v editoru."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Zde vybraný OpenPGP klíč se bude používat pro šifrování zpráv pro vás a pro "
-"funkci \"Přiložit můj veřejný klíč\" editoru. Můžete použít i GnuPG klíče.</p> "
-"<p>Položku můžete nechat nevyplněnou, ale nebude možné pro vás šifrovat kopie "
-"odchozí pošty pomocí OpenPGP. Běžné poštovní funkce zůstanou zachovány.</p> "
-"<p>Více se můžete o klíčích dozvědět na adrese <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Zde vybraný OpenPGP klíč se bude používat pro šifrování zpráv pro vás "
+"a pro funkci \"Přiložit můj veřejný klíč\" editoru. Můžete použít i GnuPG "
+"klíče.</p> <p>Položku můžete nechat nevyplněnou, ale nebude možné pro vás "
+"šifrovat kopie odchozí pošty pomocí OpenPGP. Běžné poštovní funkce zůstanou "
+"zachovány.</p> <p>Více se můžete o klíčích dozvědět na adrese <a>http://www."
+"gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4135,17 +4044,15 @@ msgstr "Vyberte S/MIME certifikát, který bude použit k podepisování zpráv.
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) certifikát, který zde zvolíte, se bude používat pro digitální "
-"podepisování zpráv.</p>"
-"<p>Položku můžete ponechat nevyplněnou, ale KMail nebude schopen podepisovat "
-"zprávy pomocí S/MIME. Běžné poštovní funkce zůstanou zachovány.</p></qt>"
+"<qt><p>S/MIME (X.509) certifikát, který zde zvolíte, se bude používat pro "
+"digitální podepisování zpráv.</p><p>Položku můžete ponechat nevyplněnou, ale "
+"KMail nebude schopen podepisovat zprávy pomocí S/MIME. Běžné poštovní funkce "
+"zůstanou zachovány.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4157,26 +4064,24 @@ msgstr "Váš šifrovací S/MIME certifikát"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Vyberte S/MIME certifikát pro šifrování pro vás a funkci \"Přiložit můj "
 "certifikát\" editoru."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zde vybraný S/MIME certifikát se bude používat pro šifrování zpráv pro vás a "
-"pro funkci \"Přiložit můj certifikát\" editoru.</p>"
-"<p>Položku můžete nechat nevyplněnou, ale nebude možné pro vás šifrovat kopie "
-"odchozí pošty pomocí S/MIME. Běžné poštovní funkce zůstanou zachovány.</p></qt>"
+"<qt><p>Zde vybraný S/MIME certifikát se bude používat pro šifrování zpráv "
+"pro vás a pro funkci \"Přiložit můj certifikát\" editoru.</p><p>Položku "
+"můžete nechat nevyplněnou, ale nebude možné pro vás šifrovat kopie odchozí "
+"pošty pomocí S/MIME. Běžné poštovní funkce zůstanou zachovány.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4196,24 +4101,19 @@ msgstr "Ad&resa pro odpovědi:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Odpovědět na adresu</h3>"
-"<p>Toto nastaví <tt>Odpovědět na:</tt> hlavičku tak, aby obsahovala jinou "
-"emailovou adresu než normální <tt>Od:</tt> adresu.</p>"
-"<p>Tato volba je užitečná, pokud máte více lidí pracujících společně v "
-"podobných rolích. Například chcete, aby všechny odeslané emaily měly vaši "
-"emailovou adresu v poli <tt>Od:</tt>, ale všechny odpovědi aby šly na adresu "
-"skupiny.</p>"
-"<p>Pokud nevíte, zanechte pole prázdné.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Odpovědět na adresu</h3><p>Toto nastaví <tt>Odpovědět na:</tt> "
+"hlavičku tak, aby obsahovala jinou emailovou adresu než normální <tt>Od:</"
+"tt> adresu.</p><p>Tato volba je užitečná, pokud máte více lidí pracujících "
+"společně v podobných rolích. Například chcete, aby všechny odeslané emaily "
+"měly vaši emailovou adresu v poli <tt>Od:</tt>, ale všechny odpovědi aby šly "
+"na adresu skupiny.</p><p>Pokud nevíte, zanechte pole prázdné.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4221,24 +4121,19 @@ msgstr "Adresy &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) adresy</h3>"
-"<p>Zde vložené adresy budou přidány ke každé odchozí zprávě, která je odesílána "
-"s touto identitou. Nebudou viditelné pro ostatní příjemce zprávy.</p>"
-"<p>Obvykle se to používá k posílání kopií všech odeslaných zpráv na nějaký váš "
-"další účet.</p> "
-"<p>Více adres můžete zadat tak, že je oddělíte čárkou.</p>"
-"<p>Pokud si nejste jisti, ponechte pole prázdné.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) adresy</h3><p>Zde vložené adresy budou "
+"přidány ke každé odchozí zprávě, která je odesílána s touto identitou. "
+"Nebudou viditelné pro ostatní příjemce zprávy.</p><p>Obvykle se to používá k "
+"posílání kopií všech odeslaných zpráv na nějaký váš další účet.</p> <p>Více "
+"adres můžete zadat tak, že je oddělíte čárkou.</p><p>Pokud si nejste jisti, "
+"ponechte pole prázdné.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4276,7 +4171,7 @@ msgstr "&Podpis"
 msgid "&Picture"
 msgstr "O&brázek"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Neplatná emailová adresa"
 
@@ -4292,18 +4187,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Jeden z nastavených OpenPGP podepisovacích klíčů neobsahuje žádné ID uživatele "
-"s emailovou adresou této identity (%1).\n"
-"To může na straně příjemce vyvolat varování během ověřování podpisů vytvořených "
-"s touto konfigurací."
+"Jeden z nastavených OpenPGP podepisovacích klíčů neobsahuje žádné ID "
+"uživatele s emailovou adresou této identity (%1).\n"
+"To může na straně příjemce vyvolat varování během ověřování podpisů "
+"vytvořených s touto konfigurací."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Jeden z nastavených OpenPGP šifrovacích klíčů neobsahuje žádné ID uživatele s "
-"emailovou adresou této identity (%1). "
+"Jeden z nastavených OpenPGP šifrovacích klíčů neobsahuje žádné ID uživatele "
+"s emailovou adresou této identity (%1). "
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4341,8 +4236,8 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"Volitelná složka odeslané pošty pro identitu \"%1\" (již) neexistuje. Bude tedy "
-"použita výchozí složka odeslané pošty."
+"Volitelná složka odeslané pošty pro identitu \"%1\" (již) neexistuje. Bude "
+"tedy použita výchozí složka odeslané pošty."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4362,8 +4257,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Implicitní)"
 
@@ -4405,21 +4300,21 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail v nastavení účtu nalezl předponu \"%1\", která je vzhledem k podpoře IMAP "
-"jmenných prostorů zastaralá."
+"KMail v nastavení účtu nalezl předponu \"%1\", která je vzhledem k podpoře "
+"IMAP jmenných prostorů zastaralá."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Nastavení bylo automaticky přeneseno, ale měli byste si zkontrolovat nastavení "
-"vašeho účtu."
+"Nastavení bylo automaticky přeneseno, ale měli byste si zkontrolovat "
+"nastavení vašeho účtu."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Nebylo možné přenést vaše nastavení automaticky, proto prosím zkontrolujte "
 "nastavení vašeho účtu."
@@ -4461,14 +4356,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Chyba: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Spojení se serverem %1 bylo neočekávaně přerušeno nebo vypršel časový limit. "
 "Spojení bude automaticky obnoveno, pokud to bude možné."
@@ -4621,14 +4521,14 @@ msgstr "Archív diskuzní skupiny"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4657,256 +4557,212 @@ msgstr "Nepoužitelné šifrovací klíče"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>vyprší "
+"za méně než jeden den.</p>\n"
+"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>vyprší "
+"za méně než %n dny.</p>\n"
+"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>vyprší "
+"za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro S/MIME "
+"certifikát</p><p align=center><b>%1</b> (serial number %2)</p><p>vyprší za "
+"méně než jeden den.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro S/MIME "
+"certifikát</p><p align=center><b>%1</b> (serial number %2)</p><p>vyprší za "
+"méně než %n dny.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro S/MIME "
+"certifikát</p><p align=center><b>%1</b> (serial number %2)</p><p>vyprší za "
+"méně než %n dnů.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo "
+"%2)</p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo "
+"%2)</p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo "
+"%2)</p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro S/"
+"MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší "
+"za méně než jeden den.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro S/"
+"MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší "
+"za méně než %n dny.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro S/"
+"MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší "
+"za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dnů</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dnů</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů</p>"
+"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4920,245 +4776,201 @@ msgstr "S/MIME certifikát brzy vyprší"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš podepisovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš šifrovací OpenPGP klíč</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>vyprší "
+"za méně než jeden den.</p>\n"
+"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>vyprší "
+"za méně než %n dny.</p>\n"
+"<p>OpenPGP klíč pro</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>vyprší "
+"za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro váš S/MIME "
+"šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Kořenový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro S/MIME "
+"certifikát</p><p align=center><b>%1</b> (serial number %2)</p><p>vyprší za "
+"méně než jeden den.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro S/MIME "
+"certifikát</p><p align=center><b>%1</b> (serial number %2)</p><p>vyprší za "
+"méně než %n dny.</p>\n"
+"<p>Kořenový certifikát</p><p align=center><b>%3</b></p><p>pro S/MIME "
+"certifikát</p><p align=center><b>%1</b> (serial number %2)</p><p>vyprší za "
+"méně než %n dnů.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo "
+"%2)</p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo "
+"%2)</p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové číslo "
+"%2)</p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro váš "
+"S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p>"
-"<p>pro S/MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro S/"
+"MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší "
+"za méně než jeden den.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro S/"
+"MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší "
+"za méně než %n dny.</p>\n"
+"<p>Certifikát zprostředkující CA</p><p align=center><b>%3</b></p><p>pro S/"
+"MIME certifikát</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší "
+"za méně než %n dnů.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš S/MIME podepisovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dnů</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než jeden den.</p>\n"
+"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dny.</p>\n"
+"<p>Váš S/MIME šifrovací certifikát</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za méně než %n dnů</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než jeden den.</p>\n"
-"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dny.</p>\n"
-"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za méně než %n dnů</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než jeden den.</p>\n"
+"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dny.</p>\n"
+"<p>S/MIME certifikát pro</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za méně než %n dnů</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5170,17 +4982,18 @@ msgstr "S/MIME certifikát brzy vyprší"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Jeden nebo více vašich nastavených OpenPGP šifrovacích klíčů nebo S/MIME "
-"certifikátů není pro šifrování použitelný. Prosím upravte nastavení šifrovacích "
-"klíčů a certifikátů v dialogu pro nastavení identity.\n"
-" Pokud budete přesto pokračovat, a klíče budou později potřeba, budete požádáni "
-"o určení klíčů, které se mají použít."
+"certifikátů není pro šifrování použitelný. Prosím upravte nastavení "
+"šifrovacích klíčů a certifikátů v dialogu pro nastavení identity.\n"
+" Pokud budete přesto pokračovat, a klíče budou později potřeba, budete "
+"požádáni o určení klíčů, které se mají použít."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5196,9 +5009,10 @@ msgid ""
 msgstr ""
 "Jeden nebo více vašich nastavených OpenPGP podepisovacích klíčů nebo S/MIME "
 "podepisovacích certifikátů není pro podepisování použitelný. Prosím upravte "
-"nastavení podepisovacích klíčů a certifikátů v dialogu pro nastavení identity.\n"
-" Pokud budete přesto pokračovat, a klíče budou později potřeba, budete požádáni "
-"o určení klíčů, které se mají použít."
+"nastavení podepisovacích klíčů a certifikátů v dialogu pro nastavení "
+"identity.\n"
+" Pokud budete přesto pokračovat, a klíče budou později potřeba, budete "
+"požádáni o určení klíčů, které se mají použít."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5208,13 +5022,13 @@ msgstr "Nepoužitelné podepisovací klíče"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Z nastavení šifrování pro příjemce vyplývá, že by zpráva alespoň pro jednoho z "
-"příjemců měla být zašifrována pomocí OpenPGP.\n"
+"Z nastavení šifrování pro příjemce vyplývá, že by zpráva alespoň pro jednoho "
+"z příjemců měla být zašifrována pomocí OpenPGP.\n"
 "Nemáte však pro tuto identitu nastaveny platné důvěryhodné OpenPGP šifrovací "
 "klíče.\n"
 "Můžete pokračovat bez šifrování pro sebe, ale uvědomte si, že nebudete moci "
@@ -5224,26 +5038,27 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Z nastavení šifrování pro příjemce vyplývá, že by zpráva alespoň pro jednoho z "
-"příjemců měla být zašifrována pomocí S/MIME.\n"
-"Nemáte však pro tuto identitu nastaveny platné S/MIME šifrovací certifikáty.\n"
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Z nastavení šifrování pro příjemce vyplývá, že by zpráva alespoň pro jednoho "
+"z příjemců měla být zašifrována pomocí S/MIME.\n"
+"Nemáte však pro tuto identitu nastaveny platné S/MIME šifrovací "
+"certifikáty.\n"
 "Můžete pokračovat bez šifrování pro sebe, ale uvědomte si, že nebudete moci "
 "číst své vlastní zprávy."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Z nastavení podepisování pro příjemce vyplývá, že by zpráva alespoň pro jednoho "
-"z příjemců měla být podepsána pomocí OpenPGP.\n"
+"Z nastavení podepisování pro příjemce vyplývá, že by zpráva alespoň pro "
+"jednoho z příjemců měla být podepsána pomocí OpenPGP.\n"
 "Nemáte však pro tuto identitu nastaveny platné OpenPGP podepisovací "
 "certifikáty."
 
@@ -5253,14 +5068,15 @@ msgstr "Nepodepisovat pomocí OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Z nastavení podepisování pro příjemce vyplývá, že by zpráva alespoň pro jednoho "
-"z příjemců měla být podepsána pomocí S/MIME.\n"
-"Nemáte však pro tuto identitu nastaveny platné S/MIME podepisovací certifikáty."
+"Z nastavení podepisování pro příjemce vyplývá, že by zpráva alespoň pro "
+"jednoho z příjemců měla být podepsána pomocí S/MIME.\n"
+"Nemáte však pro tuto identitu nastaveny platné S/MIME podepisovací "
+"certifikáty."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5282,8 +5098,8 @@ msgstr "Podepisování není možné"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Nezvolili jste svůj šifrovací klíč (šifrovat pro sebe). Nebudete moci "
 "rozšifrovat vlastní zašifrované zprávy."
@@ -5307,11 +5123,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Nevybrali jste šifrovací klíč pro žádného z příjemců této zprávy. Tudíž zpráva "
-"nebude zašifrována."
+"Nevybrali jste šifrovací klíč pro žádného z příjemců této zprávy. Tudíž "
+"zpráva nebude zašifrována."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5330,8 +5146,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nevybrali jste šifrovací klíče pro několik z příjemců. Tyto osoby nebudou mít "
-"možnost zprávu dešifrovat pokud ji zašifrujete."
+"Nevybrali jste šifrovací klíče pro několik z příjemců. Tyto osoby nebudou "
+"mít možnost zprávu dešifrovat pokud ji zašifrujete."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5354,11 +5170,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Pro \"%1\" nebyl nalezen platný a důvěryhodný šifrovací klíč.\n"
 "\n"
@@ -5407,10 +5223,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritická chyba: Nemohu stáhnout poštu: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Nepodařilo se přidat zprávu:\n"
+msgid "Failed to add message:\n"
+msgstr "Nepodařilo se přidat zprávu:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5455,8 +5269,7 @@ msgstr "Přenáší se zpráva %3 ze %2 z %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Není možné odstranit poštu z poštovního schránky <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Není možné odstranit poštu z poštovního schránky <b>%1</b>:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5504,6 +5317,51 @@ msgstr "O&dpojený IMAP"
 msgid "&Maildir mailbox"
 msgstr "Poštovní &schránka Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Nastavit předmět zprávy"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Poslat kopii (CC) na adresu 'address'."
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Poslat slepou kopii (BCC) na adresu 'address'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Přidat hlavičku 'header' ke zprávě"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Načíst tělo zprávy ze souboru 'file'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Nastavit tělo zprávy"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Přidat přílohu do zprávy, lze opakovat"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Pouze zkontrolovat novou poštu"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Otevřít pouze okno editoru zpráv"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Zobrazit daný soubor se zprávou"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Odeslat zprávu na adresu ('address') resp. připojit soubor, kam ukazuje 'URL'"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Pošta"
@@ -5560,13 +5418,13 @@ msgstr "%1: nalezena složka %2, bude nastavena jako hlavní groupware složka."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail nalezl následující groupware složky v %1 a potřebuje provést "
-"následující operace: %2"
-"<br>Pokud tak učinit nechcete, zrušte operaci a IMAP zdroj bude zakázán."
+"následující operace: %2<br>Pokud tak učinit nechcete, zrušte operaci a IMAP "
+"zdroj bude zakázán."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5616,11 +5474,11 @@ msgstr "URL zkopírováno do schránky."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Soubor <b>%1</b> existuje.<br>Přejete si jej přepsat?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Uložit do souboru"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Nahradit"
 
@@ -5638,7 +5496,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Zpráva byla odstraněna během ukládání a nebyla uložena."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5658,11 +5516,11 @@ msgstr "Soubor neobsahuje zprávu."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Tento soubor obsahuje více zpráv; pouze první bude zobrazena."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5672,111 +5530,111 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrování zpráv"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtruje se zpráva %1 z %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Na disku není žádné volné místo?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Přesunout do této složky"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Zkopírovat do této složky"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Přesun zpráv"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Mazání zpráv"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Otevírání URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Chcete opravdu spustit <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Spustit"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nenalezeny žádné přílohy k uložení."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Uložit přílohy do"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "příloha.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "příloha.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Soubor s tímto názvem (%1) již existuje. Přejete si jej přepsat?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Soubor již existuje"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Přepsat"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "Část zprávy '%1' je šifrována. Chcete šifrování ponechat při uložení?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Dotaz KMailu"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Ponechat šifrování"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Neponechávat"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "Část zprávy '%1' je podepsána. Chcete šifrování ponechat při uložení?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Ponechat podpis"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5785,22 +5643,22 @@ msgstr ""
 "Nelze zapsat soubor %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Nelze zapsat soubor %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Pro tuto emailovou adresu neexistuje záznam v knize adres. Vložte ji do knihy "
-"adres a pak pomocí své oblíbené chatovací aplikace přidejte instant messaging "
-"adresy."
+"Pro tuto emailovou adresu neexistuje záznam v knize adres. Vložte ji do "
+"knihy adres a pak pomocí své oblíbené chatovací aplikace přidejte instant "
+"messaging adresy."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5810,51 +5668,51 @@ msgstr ""
 " %1\n"
 " nelze určit, s kým navázat rozhovor."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Chiasmus backend nepodporuje funkci \"x-obtain-keys\". Nahlaste to prosím jako "
-"chybu."
+"Chiasmus backend nepodporuje funkci \"x-obtain-keys\". Nahlaste to prosím "
+"jako chybu."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chyba backendu Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Neočekávaná návratová hodnota z Chiasmus backendu: Funkce \"x-obtain-keys\" "
 "nevrátila seznam řetězců. Nahlaste to prosím jako chybu."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Nebyly nalezeny žádné klíče. Zkontrolujte prosím, zda byla v konfiguraci "
 "Chiasmu nastavena platná cesta."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Výběr dešifrovacího Chiasmus klíče"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus backend nepodporuje funkci \"x-decrypt\". Nahlaste to prosím jako "
 "chybu."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5862,26 +5720,26 @@ msgstr ""
 "Funkce \"x-decrypt\" nepřijímá očekávané parametry. Nahlaste to prosím jako "
 "chybu."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Dešifrovací chyba Chiasmu"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Neočekávaná návratová hodnota z Chiasmus backendu: Funkce \"x-decrypt\" "
 "nevrátila pole bajtů. Nahlaste to prosím jako chybu."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Pošta"
@@ -5980,7 +5838,7 @@ msgstr "Velikost"
 msgid "Encoding"
 msgstr "Kódování"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Zkomprimovat"
 
@@ -5992,7 +5850,7 @@ msgstr "Šifrovat"
 msgid "Sign"
 msgstr "Podepsat"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Název přílohy:"
 
@@ -6014,7 +5872,8 @@ msgstr "Primární příjemci"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>Poštovní adresa v tomto poli obdrží kopii zprávy</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -6024,14 +5883,14 @@ msgstr "Další příjemci"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Na emailové adresy zadané v tomto poli bude doručena kopie zprávy. Výsledek "
-"je v podstatě stejný, jakoby byly všechny adresy vloženy do pole <b>Komu:</b>"
-", ale adresát kopie (CC) je obvykle považován za pasivního posluchače, ne "
-"hlavního příjemce.</qt>"
+"<qt>Na emailové adresy zadané v tomto poli bude doručena kopie zprávy. "
+"Výsledek je v podstatě stejný, jakoby byly všechny adresy vloženy do pole "
+"<b>Komu:</b>, ale adresát kopie (CC) je obvykle považován za pasivního "
+"posluchače, ne hlavního příjemce.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6039,9 +5898,8 @@ msgstr "Skrytí příjemci"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>V podstatě totéž jako <b>Kopie:</b>, s tím rozdílem, že ostatní příjemci "
 "příjemce slepé kopie nevidí.</qt>"
@@ -6054,7 +5912,7 @@ msgstr "Po&slat zprávu"
 msgid "&Send Mail Via"
 msgstr "Po&slat zprávu pomocí"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Poslat &později"
@@ -6119,8 +5977,7 @@ msgstr "Odst&ranit znaky citace"
 msgid "Cl&ean Spaces"
 msgstr "Zruš&it mezery"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Použít neproporcionální font"
@@ -6263,31 +6120,31 @@ msgstr "Formát ši&frované zprávy"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standardní"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Seznam s odrážkami (disk)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Seznam s odrážkami (kolečko)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Seznam s odrážkami (čtvereček)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Číslovaný seznam (čísla)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Číslovaný seznam (malá písmena)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Číslovaný seznam (velká písmena)"
 
@@ -6378,7 +6235,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Uložit zprávu do složky konceptů; ta může být poté upravena a odeslána později."
+"Uložit zprávu do složky konceptů; ta může být poté upravena a odeslána "
+"později."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6390,8 +6248,8 @@ msgstr "Zavřít editor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Zpráva, kterou jste napsali, se pravděpodobně odkazuje na připojený soubor, "
@@ -6402,49 +6260,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Upozornění na přílohu"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Po&slat tak, jak je"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail nemůže rozpoznat umístění přílohy (%1).</p>"
-"<p>Je třeba zadat celou cestu, pokud si přejete připojit soubor.</p></qt>"
+"<qt><p>KMail nemůže rozpoznat umístění přílohy (%1).</p><p>Je třeba zadat "
+"celou cestu, pokud si přejete připojit soubor.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Přiložit soubor"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Při&ložit"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Vložit soubor"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Vložit soubor"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Během pokusu o export klíče z backendu došlo k chybě</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Během pokusu o export klíče z backendu došlo k chybě</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6483,188 +6341,197 @@ msgid ""
 "View"
 msgstr "Zobrazit"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Upravit..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Upravit skript..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Uložit j&ako..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Vlastnosti"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Přidat přílohu..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail nemohl zkomprimovat soubor."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Zkomprimovaný soubor je větší než originál; přejete si ponechat originál?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Ponechat"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail nemohl rozbalit soubor."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Uložit přílohu jako"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Přidat jako text"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Přidat jako přílohu"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Vložit jako přílo&hu"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nepojmenováno"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Nastavili jste šifrování zpráv pro sebe, ale aktuální identita nemá nastaven "
-"žádný k tomu potřebný OpenPGP nebo S/MIME šifrovací klíč.</p>"
-"<p>Prosím nastavte patřičné klíče pro tuto identitu.</p></qt>"
+"<qt><p>Nastavili jste šifrování zpráv pro sebe, ale aktuální identita nemá "
+"nastaven žádný k tomu potřebný OpenPGP nebo S/MIME šifrovací klíč.</"
+"p><p>Prosím nastavte patřičné klíče pro tuto identitu.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Nedefinovaný šifrovací klíč"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>K tomu, abyste mohli podepsat tuto zprávu, je třeba napřed definovat klíč "
-"(OpenPGP nebo S/MIME), který k tomu bude použit.</p>"
-"<p>Prosím zvolte vhodný klíč v dialogu nastavení identity.</p></qt>"
+"<qt><p>K tomu, abyste mohli podepsat tuto zprávu, je třeba napřed definovat "
+"klíč (OpenPGP nebo S/MIME), který k tomu bude použit.</p><p>Prosím zvolte "
+"vhodný klíč v dialogu nastavení identity.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nedefinovaný podepisovací klíč"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"KMail je nyní v režimu offline. Vaše zprávy budou uloženy ve složce 'Odchozí', "
-"dokud nepřejde KMail do režimu online."
+"KMail je nyní v režimu offline. Vaše zprávy budou uloženy ve složce "
+"'Odchozí', dokud nepřejde KMail do režimu online."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Do pole Od: musíte zadat svou emailovou adresu. Měli byste také svou emailovou "
-"adresu nastavit pro všechny identity, abyste ji nemuseli zadávat pro každou "
-"zprávu zvlášť."
+"Do pole Od: musíte zadat svou emailovou adresu. Měli byste také svou "
+"emailovou adresu nastavit pro všechny identity, abyste ji nemuseli zadávat "
+"pro každou zprávu zvlášť."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "V poli Komu:, CC nebo BCC je nutné specifikovat minimálně jednoho příjemce."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Nebyl zadán adresát zprávy. I přesto zprávu odeslat?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Nebyl zadán adresát"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nebyl zadán předmět zprávy. I přesto zprávu odeslat?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nebyl zadán předmět"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Poslat tak, jak j&e"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "Zadat před&mět zprávy"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Ponechat &formátování, nepodepisovat/nešifrovat"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Ponechat &formátování, nešifrovat"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Ponechat &formátování, nepodepisovat"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Podepsat/zašifrovat (odstranit formátování)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Zašifrovat (odstranit formátování)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Podepsat (odstranit formátování)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vložené (inline) podepisování/šifrování HTML zpráv není možné.</p>"
-"<p>Přejete si odstranit formátování?</p></qt>"
+"<qt><p>Vložené (inline) podepisování/šifrování HTML zpráv není možné.</"
+"p><p>Přejete si odstranit formátování?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Podepsat/zašifrovat zprávu?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6672,108 +6539,108 @@ msgstr ""
 "Volitelná složka konceptů nebo šablon pro identitu \"%1\" (již) neexistuje. "
 "Bude tedy použita výchozí složka konceptů či šablon."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Prosím vytvořte si účet pro odesílání a zkuste znovu."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Chystáte se poslat email..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Potvrzení odeslání"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Poslat nyní"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Žádní příjemci"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Další příjemci"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Kontrola pravopisu: zap"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Kontrola pravopisu: vyp"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Kontrola pravopisu přerušena."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Kontrola pravopisu zastavena."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Kontrola pravopisu dokončena."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Kontrola pravopisu"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Prosíme nejprve nastavte šifrovací modul pro Chiasmus.\n"
-"Můžete tak učinit na kartě Moduly šifrování na stránce Bezpečnost dialogu pro "
-"nastavení KMailu."
+"Můžete tak učinit na kartě Moduly šifrování na stránce Bezpečnost dialogu "
+"pro nastavení KMailu."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Zdá se, že libkleopatra byla zkompilována bez podpory Chiasmu. Možná ji budete "
-"muset překompilovat s parametrem --enable-chiasmus."
+"Zdá se, že libkleopatra byla zkompilována bez podpory Chiasmu. Možná ji "
+"budete muset překompilovat s parametrem --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Není nastaven Chiasmus backend"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nebyly nalezeny Chiasmus klíče"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Výběr šifrovacího klíče pro Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Zpráva byla podepsána klíčem %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Zpráva byla podepsána klíčem %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Zpráva OpenPGP - šifrováno"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Zpráva s předmětem: "
@@ -6823,8 +6690,8 @@ msgstr "Kontrola pravopisu - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Chyba při spuštění ISpellu/Aspellu. Prosím ujistěte se, zda máte správně "
 "nastaven ISpell/Aspell a zda je v PATH."
@@ -6860,13 +6727,11 @@ msgstr "<qt>Příliš mnoho akcí v pravidle filtru <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Neznámá akce filtru <b>%1</b>"
-"<br>v pravidle <b>%2</b>."
-"<br>Ignorováno.</qt>"
+"<qt>Neznámá akce filtru <b>%1</b><br>v pravidle <b>%2</b>.<br>Ignorováno.</"
+"qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7086,154 +6951,128 @@ msgstr "Přehrát zvuk"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Toto je seznam definovaných filtrů. Jsou zpracovávány shora dolů.</p>"
-"<p>Klikněte na filtr, který chcete editovat - používá nastavení z pravé "
+"<qt><p>Toto je seznam definovaných filtrů. Jsou zpracovávány shora dolů.</"
+"p><p>Klikněte na filtr, který chcete editovat - používá nastavení z pravé "
 "poloviny dialogu.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pro vytvoření nového filtru zmáčkněte toto tlačítko.</p>"
-"<p>Bude vložen před aktuálně vybraný filtr. Můžete to ale později změnit. </p>"
-"<p>Pokud bylo toto tlačítko zmáčknuto nedopatřením, lze provést návrat "
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Pro vytvoření nového filtru zmáčkněte toto tlačítko.</p><p>Bude "
+"vložen před aktuálně vybraný filtr. Můžete to ale později změnit. </"
+"p><p>Pokud bylo toto tlačítko zmáčknuto nedopatřením, lze provést návrat "
 "kliknutím na tlačítko <em>Smazat</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klikněte na toto tlačítko pro zkopírování filtru.</p>"
-"<p>Pokud bylo toto tlačítko zmáčknuto nedopatřením, lze provést návrat "
-"kliknutím na tlačítko <em>Smazat</em>, umístěné vpravo.</p></qt>"
+"<qt><p>Klikněte na toto tlačítko pro zkopírování filtru.</p><p>Pokud bylo "
+"toto tlačítko zmáčknuto nedopatřením, lze provést návrat kliknutím na "
+"tlačítko <em>Smazat</em>, umístěné vpravo.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pro <em>zrušení</em> filtru, vybraného v seznamu nahoře, zmáčkněte toto "
-"tlačítko.</p>"
-"<p>Neexistuje cesta, jak získat zpět takto smazaný filtr, ale pro neprovedení "
-"změn lze zrušit dialog standardním tlačítkem <em>Zrušit</em>.</p><qt>"
+"<qt><p>Pro <em>zrušení</em> filtru, vybraného v seznamu nahoře, zmáčkněte "
+"toto tlačítko.</p><p>Neexistuje cesta, jak získat zpět takto smazaný filtr, "
+"ale pro neprovedení změn lze zrušit dialog standardním tlačítkem <em>Zrušit</"
+"em>.</p><qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pro přesunutí filtru, vybraného v seznamu výše, <em>na vrchol</em> "
-"zmáčkněte toto tlačítko.</p>"
-"<p>Je to užitečné, protože pořadí filtrů v seznamu určuje pořadí, ve kterém "
-"budou aplikovány na zprávy: Filtr nejvýše je aplikován jako první.</p></qt>"
+"<qt><p>Pro přesunutí filtru, vybraného v seznamu výše, <em>na vrchol</em> "
+"zmáčkněte toto tlačítko.</p><p>Je to užitečné, protože pořadí filtrů v "
+"seznamu určuje pořadí, ve kterém budou aplikovány na zprávy: Filtr nejvýše "
+"je aplikován jako první.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pro přesunutí filtru, vybraného v seznamu výše, <em>nahoru</em> "
-"zmáčkněte toto tlačítko.</p>"
-"<p>Je to užitečné, protože pořadí filtrů v seznamu určuje pořadí, ve kterém "
-"budou aplikovány na zprávy: Filtr nejvýše je aplikován jako první.</p>"
-"<p>Pokud bylo toto tlačítko zmáčknuto nedopatřením, lze se vrátit kliknutím na "
-"tlačítko <em>Dolů</em> (vpravo)</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Pro přesunutí filtru, vybraného v seznamu výše, <em>nahoru</em> "
+"zmáčkněte toto tlačítko.</p><p>Je to užitečné, protože pořadí filtrů v "
+"seznamu určuje pořadí, ve kterém budou aplikovány na zprávy: Filtr nejvýše "
+"je aplikován jako první.</p><p>Pokud bylo toto tlačítko zmáčknuto "
+"nedopatřením, lze se vrátit kliknutím na tlačítko <em>Dolů</em> (vpravo)</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pro přesunutí filtru, vybraného v seznamu výše, <em>dolů</em> "
-"zmáčkněte toto tlačítko.</p>"
-"<p>Je to užitečné, protože pořadí filtrů v seznamu určuje pořadí, ve kterém "
-"budou aplikovány na zprávy: Filtr nejvýše je aplikován jako první.</p>"
-"<p>Pokud bylo toto tlačítko zmáčknuto nedopatřením, lze se vrátit kliknutím na "
-"tlačítko <em>Nahoru</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Pro přesunutí filtru, vybraného v seznamu výše, <em>dolů</em> "
+"zmáčkněte toto tlačítko.</p><p>Je to užitečné, protože pořadí filtrů v "
+"seznamu určuje pořadí, ve kterém budou aplikovány na zprávy: Filtr nejvýše "
+"je aplikován jako první.</p><p>Pokud bylo toto tlačítko zmáčknuto "
+"nedopatřením, lze se vrátit kliknutím na tlačítko <em>Nahoru</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pro přesunutí filtru, vybraného v seznamu výše, <em>dospodu</em> "
-"zmáčkněte toto tlačítko.</p>"
-"<p>Je to užitečné, protože pořadí filtrů v seznamu určuje pořadí, ve kterém "
-"budou aplikovány na zprávy: Filtr nejvýše je aplikován jako první.</p></qt>"
+"<qt><p>Pro přesunutí filtru, vybraného v seznamu výše, <em>dospodu</em> "
+"zmáčkněte toto tlačítko.</p><p>Je to užitečné, protože pořadí filtrů v "
+"seznamu určuje pořadí, ve kterém budou aplikovány na zprávy: Filtr nejvýše "
+"je aplikován jako první.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KLiknutím na toto tlačítko přejmenujete právě zvolený filtr.</p>"
-"<p>Filtry, jejichž jméno začíná na \"&lt;\", jsou pojmenovány automaticky.</p>"
-"<p>Pokud jste filtr náhodou přejmenovali a chcete zpět automaticky vytvořené "
-"jméno, klikněte na tlačítko a pak na <em>Vyprázdnit</em> a <em>OK</em>.</p></qt>"
+"<qt><p>KLiknutím na toto tlačítko přejmenujete právě zvolený filtr.</"
+"p><p>Filtry, jejichž jméno začíná na \"&lt;\", jsou pojmenovány automaticky."
+"</p><p>Pokud jste filtr náhodou přejmenovali a chcete zpět automaticky "
+"vytvořené jméno, klikněte na tlačítko a pak na <em>Vyprázdnit</em> a <em>OK</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zmáčkněte toto tlačítko, aby byl zobrazen potvrzovací dialog.</p>"
-"<p>To je užitečné, pokud máte definována pravidla, která označují zprávy k "
+"<qt><p>Zmáčkněte toto tlačítko, aby byl zobrazen potvrzovací dialog.</"
+"p><p>To je užitečné, pokud máte definována pravidla, která označují zprávy k "
 "pozdějšímu stažení. Bez možnosti vynutit dialog by nebyly tyto zprávy nikdy "
 "staženy, pokud by na serveru nečekaly jiné velké zprávy nebo pokud byste "
 "nechtěli změnit pravidla pro zprávy.</p></qt>"
@@ -7246,6 +7085,16 @@ msgstr "Pravidla filtru POP3"
 msgid "Filter Rules"
 msgstr "Pravidla filtru"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importovat"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importovat"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Dostupné filtry"
@@ -7327,6 +7176,11 @@ msgstr "Přidat tento filtr také do nástrojové lišty"
 msgid "Icon for this filter:"
 msgstr "Ikona tohoto filtru:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Komu"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Nahoru"
@@ -7335,16 +7189,29 @@ msgstr "Nahoru"
 msgid "Down"
 msgstr "Dolů"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Přejmenovat..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nová"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "K&opírovat do"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Smazáno"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7353,8 +7220,8 @@ msgstr "Vybrat zkratku pro složku"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Nejméně jeden filtr má za cíl složku na online IMAP účtu. Takové filtry jsou "
 "používány pouze při ruční aplikaci a při filtrování příchozí IMAP pošty."
@@ -7435,28 +7302,24 @@ msgstr "Problémy s IMAP cache"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Řešení problémů s IMAP cache.</b></p>"
-"<p>Pokud máte problémy se synchronizací IMAP složky, pokuste se nejprve obnovit "
-"indexový soubor. To chvíli trvá, ale nezpůsobuje další žádné problémy.</p>"
-"<p>Pokud to nestačí, můžete se pokusit o obnovení IMAP cache. Pokud tak "
-"učiníte, přijdete o všechny lokální změny v této složce a jejích "
-"podsložkách.</p>"
+"<p><b>Řešení problémů s IMAP cache.</b></p><p>Pokud máte problémy se "
+"synchronizací IMAP složky, pokuste se nejprve obnovit indexový soubor. To "
+"chvíli trvá, ale nezpůsobuje další žádné problémy.</p><p>Pokud to nestačí, "
+"můžete se pokusit o obnovení IMAP cache. Pokud tak učiníte, přijdete o "
+"všechny lokální změny v této složce a jejích podsložkách.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7491,8 +7354,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7531,11 +7394,11 @@ msgstr "Index této složky byl znovu vytvořen."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Složka %1 není v počátečním stavu synchronizace (stav byl %2). Chcete ji vrátit "
-"do počátečního stavu synchronizace a synchronizovat i tak?"
+"Složka %1 není v počátečním stavu synchronizace (stav byl %2). Chcete ji "
+"vrátit do počátečního stavu synchronizace a synchronizovat i tak?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7661,15 +7524,12 @@ msgstr "Vytváření podsložek na serveru"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 "<qt>\n"
-"<p>Zdá se, že zprávy ve složce <b>%1</b> byly smazány. Přejete si ji odstranit "
-"i lokálně? "
-"<br>UID: %2</p></qt>"
+"<p>Zdá se, že zprávy ve složce <b>%1</b> byly smazány. Přejete si ji "
+"odstranit i lokálně? <br>UID: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7690,9 +7550,8 @@ msgstr "Stahování složek prostoru jmen '%1'"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 "<qt>\n"
 "<p>Zdá se, že složka <b>%1</b> byla smazána. Přejete si ji odstranit i ze "
@@ -7704,19 +7563,19 @@ msgstr "Přerušeno"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"IMAP server %1 nepodporuje IMAP anotace. Uložení ve formátu XML nelze na tomto "
-"serveru použít; prosím nastavte KMail jinak."
+"IMAP server %1 nepodporuje IMAP anotace. Uložení ve formátu XML nelze na "
+"tomto serveru použít; prosím nastavte KMail jinak."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"IMAP server %1 nepodporuje IMAP anotace. Uložení ve formátu XML nelze na tomto "
-"serveru použít; prosím nastavte KMail jinak."
+"IMAP server %1 nepodporuje IMAP anotace. Uložení ve formátu XML nelze na "
+"tomto serveru použít; prosím nastavte KMail jinak."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7729,16 +7588,16 @@ msgstr "ztráty+nálezy"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Ve složce <b>%1</b> jsou nové zprávy, které ještě nebyly nahrány na server, "
-"ale zdá se, že nyní nemáte pro jejich nahrání dostatečná přístupová práva.</p> "
-"<p>Všechny zprávy budou přesunuty do složky <b>%2</b>"
-", aby se předešlo ztrátám dat.</p>"
+"<p>Ve složce <b>%1</b> jsou nové zprávy, které ještě nebyly nahrány na "
+"server, ale zdá se, že nyní nemáte pro jejich nahrání dostatečná přístupová "
+"práva.</p> <p>Všechny zprávy budou přesunuty do složky <b>%2</b>, aby se "
+"předešlo ztrátám dat.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7747,20 +7606,24 @@ msgstr "Nedostatečné oprávnění"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>V této složce (%1) jsou nové zprávy, které ještě nebyly nahrány na server, "
-"ale zdá se, že nyní nemáte pro jejich nahrání dostatečná přístupová práva. "
-"Požádejte svého administrátora o patřičná práva nebo zprávy ze složky "
-"odstraňte.</p> "
-"<p>Chcete zprávy nyní přesunout do jiné složky?</p>"
+"<p>V této složce (%1) jsou nové zprávy, které ještě nebyly nahrány na "
+"server, ale zdá se, že nyní nemáte pro jejich nahrání dostatečná přístupová "
+"práva. Požádejte svého administrátora o patřičná práva nebo zprávy ze složky "
+"odstraňte.</p> <p>Chcete zprávy nyní přesunout do jiné složky?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Přesunout do:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Nepřesouvat"
 
@@ -7772,8 +7635,7 @@ msgstr "Přesunout zprávu do složky"
 msgid "Permissions (ACL)"
 msgstr "Oprávnění (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Obecné"
@@ -7797,8 +7659,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Použít &vlastní ikony"
@@ -7817,23 +7678,22 @@ msgstr "Reagovat na nové/nepřečtené zprávy v této složce"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pokud je tato volba zapnuta, budete upozorňováni na novou a nepřečtenou "
-"poštu v této složce. Navíc při přecházení na předchozí či další složku s "
-"nepřečtenými zprávami se budete zastavovat i na této složce.</p>"
-"<p>Pokud nechcete být na novou a nepřečtenou poštu v této složce upozorňováni, "
-"nebo chcete, aby byla složka přeskakována při přecházení na předchozí či další "
-"složku s nepřečtenými zprávami, volbu vypněte. To je užitečné pro ignorování "
-"nové a nepřečtené pošty v koši nebo složce se spamem.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Pokud je tato volba zapnuta, budete upozorňováni na novou a "
+"nepřečtenou poštu v této složce. Navíc při přecházení na předchozí či další "
+"složku s nepřečtenými zprávami se budete zastavovat i na této složce.</"
+"p><p>Pokud nechcete být na novou a nepřečtenou poštu v této složce "
+"upozorňováni, nebo chcete, aby byla složka přeskakována při přecházení na "
+"předchozí či další složku s nepřečtenými zprávami, volbu vypněte. To je "
+"užitečné pro ignorování nové a nepřečtené pošty v koši nebo složce se spamem."
+"</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7845,9 +7705,9 @@ msgstr "Ponechat odpovědi v této složce"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Tuto volbu zaškrtněte, pokud chcete, aby se vaše odpovědi na zprávy z této "
 "složky ukládaly do této složky, nikoliv do nastavené složky pro odeslanou "
@@ -7861,17 +7721,21 @@ msgstr "Sloupec odesílatele/příjemce v seznamu zpráv"
 msgid "Sho&w column:"
 msgstr "Zo&brazit sloupec:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Nastavit jako výchozí"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Odesílatel"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Příjemce"
@@ -7882,17 +7746,17 @@ msgstr "Identita ode&sílatele:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Zvolte identitu odesílatele, která se má používat pro psaní nových zpráv nebo "
-"odpovídání na zprávy, nacházíte-li se v této složce. KMail si tak můžete "
-"nastavit, aby podle aktuální složky automaticky nastavoval vhodnou adresu "
-"odesílatele, podpis a šifrovací a podepisovací klíče. Identity lze nastavit v "
-"hlavním konfiguračním dialogu (Nastavení -> Nastavit KMail)."
+"Zvolte identitu odesílatele, která se má používat pro psaní nových zpráv "
+"nebo odpovídání na zprávy, nacházíte-li se v této složce. KMail si tak "
+"můžete nastavit, aby podle aktuální složky automaticky nastavoval vhodnou "
+"adresu odesílatele, podpis a šifrovací a podepisovací klíče. Identity lze "
+"nastavit v hlavním konfiguračním dialogu (Nastavení -> Nastavit KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7910,17 +7774,17 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Toto nastavení určuje, kteří uživatelé sdílející tuto složku mají být "
 "zaneprázdněni  a mít nastaveny alarmy pro události a úkoly v této složce. "
-"Nastavení platí pouze pro složky kalendáře a úkolů (v případě úkolů se vztahuje "
-"pouze na alarmy).\n"
+"Nastavení platí pouze pro složky kalendáře a úkolů (v případě úkolů se "
+"vztahuje pouze na alarmy).\n"
 "\n"
 "Příklad použití: pokud šéf sdílí složku se svou sekretářkou, měl by být jako "
 "zaneprázdněný během svých schůzek veden pouze šéf. Může proto zvolit "
@@ -7959,22 +7823,22 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Tuto složku jste nastavili pro groupwarové informace a zároveň je nastavena "
 "obecná volba pro skrývání groupwarových složek. To znamená, že složka zmizí, "
-"jakmile zavřete dialog. Pokud budete chtít složku opět zobrazit, musíte dočasně "
-"vypnout skrývání groupwarových složek."
+"jakmile zavřete dialog. Pokud budete chtít složku opět zobrazit, musíte "
+"dočasně vypnout skrývání groupwarových složek."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8043,7 +7907,8 @@ msgstr "Chyba při zjišťování informací o složce."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Index pošty pro '%1' pochází z neznámé verze KMailu (%2).\n"
 "Index lze znovu vygenerovat ze složky pošty, ale je možné, že některé "
@@ -8075,8 +7940,8 @@ msgstr "Chyba při otevírání %1; tato složka chybí."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Chyba při otevírání %1. Nejde o korektní složku typu maildir nebo nemáte "
 "potřebná přístupová práva."
@@ -8107,7 +7972,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"Mezi zprávami k odeslání jsou takové, které zřejmě nebyly vytvořeny KMailem.\n"
+"Mezi zprávami k odeslání jsou takové, které zřejmě nebyly vytvořeny "
+"KMailem.\n"
 "Prosím smažte je, pokud nechcete, aby je KMail odeslal."
 
 #: kmfoldermbox.cpp:112
@@ -8120,21 +7986,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Index složky '%2' se zdá být zastaralý. Abyste předešli porušení zpráv, bude "
-"index znovu vytvořen. Následně se mohou objevit již smazané zprávy a stavové "
-"příznaky mohou být ztraceny.</p>"
-"<p>Přečtěte si prosím odpovídající záznam v <a href=\"%1\">"
-"FAQ sekci KMail manuálu</a> ohledně informací, jak se vyhnout tomuto problému v "
-"budoucnosti.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Index složky '%2' se zdá být zastaralý. Abyste předešli porušení "
+"zpráv, bude index znovu vytvořen. Následně se mohou objevit již smazané "
+"zprávy a stavové příznaky mohou být ztraceny.</p><p>Přečtěte si prosím "
+"odpovídající záznam v <a href=\"%1\">FAQ sekci KMail manuálu</a> ohledně "
+"informací, jak se vyhnout tomuto problému v budoucnosti.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8194,7 +8056,7 @@ msgstr ""
 "'%1' se nezdá být složkou.\n"
 "Prosím odstraňte soubor."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8202,7 +8064,7 @@ msgstr ""
 "Oprávnění ke složce '%1' jsou chybná.\n"
 "Prosím ujistěte se, že můžete prohlížet a měnit obsah složky."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8212,8 +8074,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8221,7 +8083,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Nepodařilo se vytvořit složku"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8320,9 +8182,9 @@ msgstr "&Problém IMAP Cache..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Není možné vytvořit složku<b>%1</b> kvůuli nedostatečným oprávněním na "
 "serveru. Pokud si myslíte, že byste tato práva mít měli, požádejte vašeho "
@@ -8343,15 +8205,16 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Není možné přesunout nebo zkopírovat složku <b>%1</b>"
-", složka již existuje.</qt>"
+"<qt>Není možné přesunout nebo zkopírovat složku <b>%1</b>, složka již "
+"existuje.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Nelze přesunout nebo zkopírovat složku <b>%1</b>, protože není úplná.</qt>"
+"<qt>Nelze přesunout nebo zkopírovat složku <b>%1</b>, protože není úplná.</"
+"qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
@@ -8467,17 +8330,17 @@ msgstr "%1; složka je pouze ke čtení"
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Opravdu chcete smazat označenou zprávu?"
-"<br>Jakmile je smazána, nelze ji obnovit.</qt>\n"
-"<qt>Opravdu chcete smazat %n označené zprávy?"
-"<br>Jakmile jsou smazány, nelze je obnovit.</qt>\n"
-"<qt>Opravdu chcete smazat %n označených zpráv?"
-"<br>Jakmile jsou smazány, nelze je obnovit.</qt>"
+"<qt>Opravdu chcete smazat označenou zprávu?<br>Jakmile je smazána, nelze ji "
+"obnovit.</qt>\n"
+"<qt>Opravdu chcete smazat %n označené zprávy?<br>Jakmile jsou smazány, nelze "
+"je obnovit.</qt>\n"
+"<qt>Opravdu chcete smazat %n označených zpráv?<br>Jakmile jsou smazány, "
+"nelze je obnovit.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8529,130 +8392,129 @@ msgstr ""
 "Chyba při modifikaci %1\n"
 "(Možná není na zařízení dost místa?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Požadavek na podpis certifikátu"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Prosím vytvořte certifikát z přílohy a vraťte jej odesílateli."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail je nastaven na offline, všechny síťové úlohy jsou odloženy"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail je nastaven na online, všechny síťové úlohy jsou obnoveny"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail je právě v offline režimu; jak si přejete pokračovat?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Pracovat online"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Pracovat offline"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nemáte práva pro čtení a zápis do své složky došlé pošty."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Odchozí"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nemáte práva pro čtení a zápis do své složky odesílané pošty."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Odeslaná pošta"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Nemáte práva pro čtení a zápis do své složky odeslané pošty."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Koš"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nemáte práva pro čtení a zápis do svého koše."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Koncepty"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nemáte práva pro čtení a zápis do své složky konceptů."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "šablony"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nemáte práva pro čtení a zápis do své složky šablon."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Poslední hledání"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Složka<i>%4</i> existuje. %1 nyní pro své zprávy používá složku <i>%5</i>. "
-"<p>%2 může do této složky přesunout obsah složky <i>%6</i>"
-", což ale může přepsat soubory se stejnými jmény ve složce <i>%7</i>."
-"<p><strong>Chcete aby %3 nyní přesunul poštovní soubory?</strong></qt>"
+"<qt>Složka<i>%4</i> existuje. %1 nyní pro své zprávy používá složku <i>%5</"
+"i>. <p>%2 může do této složky přesunout obsah složky <i>%6</i>, což ale může "
+"přepsat soubory se stejnými jmény ve složce <i>%7</i>.<p><strong>Chcete aby "
+"%3 nyní přesunul poštovní soubory?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Složka<i>%4</i> existuje. %1 nyní pro své zprávy používá složku <i>%5</i>"
-". %2 může do této složky přesunout obsah složky <i>%6</i>."
+"<qt>Složka<i>%4</i> existuje. %1 nyní pro své zprávy používá složku <i>%5</"
+"i>. %2 může do této složky přesunout obsah složky <i>%6</i>."
 "<p><strong>Chcete aby %3 nyní přesunul poštovní soubory?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Přenést poštovní soubory?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail narazil na závažnou chybu a bude nyní ukončen."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8663,11 +8525,11 @@ msgstr ""
 "Chyba:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Vyprázdnit koš"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Skutečně chcete vyprázdnit složky koše všech účtů?"
 
@@ -8743,8 +8605,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Přišla nová pošta</b> <br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8782,10 +8643,11 @@ msgstr "Skutečně chcete vyprázdnit složku koše?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Skutečně chcete přesunout všechny zprávy ze složky <b>%1</b> do koše?</qt>"
+"<qt>Skutečně chcete přesunout všechny zprávy ze složky <b>%1</b> do koše?</"
+"qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8809,11 +8671,11 @@ msgstr "Smazat hledání"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Jste si jist(a), že chcete smazat složku hledání <b>%1</b>"
-"? Zprávy v ní nebudou smazány, protože jsou uloženy v jiné složce.</qt>"
+"<qt>Jste si jist(a), že chcete smazat složku hledání <b>%1</b>? Zprávy v ní "
+"nebudou smazány, protože jsou uloženy v jiné složce.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8825,40 +8687,41 @@ msgstr "<qt>Skutečně chcete odstranit prázdnou složku <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Jste si jisti, že chcete smazat prázdnou složku <b>%1</b> "
-"a všechny její podsložky? Podsložky nemusí být prázdné a jejich obsah bude "
-"taktéž zrušen. "
+"<qt>Jste si jisti, že chcete smazat prázdnou složku <b>%1</b> a všechny její "
+"podsložky? Podsložky nemusí být prázdné a jejich obsah bude taktéž zrušen. "
 "<p><b>Pozor</b>, zrušené zprávy nejsou přesunuty do koše, nýbrž smazány "
 "trvale.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Jste si jisti, že chcete smazat složku <b>%1</b> a zrušit tak její obsah? "
-"<p><b>Pozor</b>, zrušené zprávy nejsou přesunuty do koše, nýbrž smazány "
-"trvale.</qt>"
+"<qt>Jste si jisti, že chcete smazat složku <b>%1</b> a zrušit tak její "
+"obsah? <p><b>Pozor</b>, zrušené zprávy nejsou přesunuty do koše, nýbrž "
+"smazány trvale.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Jste si jisti, že chcete smazat složku <b>%1</b> "
-"a všechny její podsložky a zrušit tak jejich obsah?</qt> "
-"<p><b>Pozor</b>, zrušené zprávy nejsou přesunuty do koše, nýbrž smazány "
-"trvale.</qt>"
+"<qt>Jste si jisti, že chcete smazat složku <b>%1</b> a všechny její "
+"podsložky a zrušit tak jejich obsah?</qt> <p><b>Pozor</b>, zrušené zprávy "
+"nejsou přesunuty do koše, nýbrž smazány trvale.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Smazáno"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8874,13 +8737,13 @@ msgstr "Skutečně chcete nechat zaniknout všechny staré zprávy?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Použití HTML v poště učiní systém více zranitelným vůči \"spamu\" a může zvýšit "
-"pravděpodobnost, že bude systém napaden zneužitím nějaké, dosud neznámé, "
-"bezpečnostní chyby."
+"Použití HTML v poště učiní systém více zranitelným vůči \"spamu\" a může "
+"zvýšit pravděpodobnost, že bude systém napaden zneužitím nějaké, dosud "
+"neznámé, bezpečnostní chyby."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8893,12 +8756,12 @@ msgstr "Použít HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Použití HTML v poště učiní systém více zranitelným vůči \"spamu\" a může zvýšit "
-"pravděpodobnost, že bude systém napaden zneužitím nějaké, dosud neznámé, "
-"bezpečnostní chyby."
+"Použití HTML v poště učiní systém více zranitelným vůči \"spamu\" a může "
+"zvýšit pravděpodobnost, že bude systém napaden zneužitím nějaké, dosud "
+"neznámé, bezpečnostní chyby."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8914,8 +8777,8 @@ msgstr "Filtr na Mailing-Listu %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "Funkce odpovědi KMail Mimo kancelář závisí na filtrování na straně serveru. "
@@ -8936,7 +8799,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Nelze spustit prohlížeč záznamů GnuPG; prosím zkontrolujte svoji instalaci."
 
@@ -9260,8 +9124,7 @@ msgstr "Uloži&t přílohy..."
 msgid "Appl&y All Filters"
 msgstr "Aplikovat všechny filtr&y"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&plikovat filtr"
@@ -9377,7 +9240,6 @@ msgstr "Násled&ující nepřečtená"
 msgid "Go to the next unread message"
 msgstr "Přejít na následující nepřečtenou zprávu"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Předchozí zpráva"
@@ -9425,8 +9287,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Aktuální zprávu rolovat dolů. Po konci zprávy přejít na následující nepřečtenou "
-"zprávu."
+"Aktuální zprávu rolovat dolů. Po konci zprávy přejít na následující "
+"nepřečtenou zprávu."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9518,8 +9380,8 @@ msgstr " Inicializace..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9529,10 +9391,10 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Tato zpráva obsahuje žádost o potvrzení doručení.\n"
@@ -9542,8 +9404,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9555,8 +9417,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9568,8 +9430,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9604,17 +9466,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Příjem:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Příloha: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Zobrazit přílohy, jak doporučil odesilatel."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9664,44 +9526,36 @@ msgstr "Vlastnosti součásti zprávy"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME typ</em> souboru:</p> Běžně není nutné toto nastavení měnit, "
-"protože typy souborů jsou zjišťovány automaticky. Někdy ale může dojít k tomu, "
-"že %1 nezjistí typ korektně. Zde to pak můžete napravit</p></qt>"
+"<qt><p><em>MIME typ</em> souboru:</p> Běžně není nutné toto nastavení měnit, "
+"protože typy souborů jsou zjišťovány automaticky. Někdy ale může dojít k "
+"tomu, že %1 nezjistí typ korektně. Zde to pak můžete napravit</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Velikost část:</p>"
-"<p>Někdy %1 sdělí pouze odhad velikosti, protože výpočet přesné velikosti "
-"zabere příliš mnoho času. V takovém případě to bude sděleno přidáním "
-"\"(odhad)\" k zobrazované velikosti.</p></qt>"
+"<qt><p>Velikost část:</p><p>Někdy %1 sdělí pouze odhad velikosti, protože "
+"výpočet přesné velikosti zabere příliš mnoho času. V takovém případě to bude "
+"sděleno přidáním \"(odhad)\" k zobrazované velikosti.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jméno souboru části:</p>"
-"<p>Ačkoliv se zdá, že jde o jméno připojeného souboru, není tomu tak. Přesněji "
-"řečeno - jde o jméno souboru, použité v poštovním agentovi příjemce při "
-"ukládání části na disk.</p></qt>"
+"<qt><p>Jméno souboru části:</p><p>Ačkoliv se zdá, že jde o jméno připojeného "
+"souboru, není tomu tak. Přesněji řečeno - jde o jméno souboru, použité v "
+"poštovním agentovi příjemce při ukládání části na disk.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9709,17 +9563,15 @@ msgstr "&Popis:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Popis části:</p>"
-"<p>Toto je pouze informativní popis části, stejně jako je předmět informativním "
-"popisem pro celou zprávu. Většina poštovních agentů zobrazí tuto informaci ve "
-"svých náhledech zpráv vedle ikony příloh.</p></qt>"
+"<qt><p>Popis části:</p><p>Toto je pouze informativní popis části, stejně "
+"jako je předmět informativním popisem pro celou zprávu. Většina poštovních "
+"agentů zobrazí tuto informaci ve svých náhledech zpráv vedle ikony příloh.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9727,22 +9579,20 @@ msgstr "Kó&dování"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kódování pro transport této části:</p>"
-"<p>Běžně nebudete toto potřebovat měnit, protože %1 bude používat přijatelné "
-"implicitní kódování, odvozené z MIME typu. Občas ale lze významně redukovat "
-"velikost výsledné zprávy - např. pokud PostScriptový soubor obsahuje pouze "
-"čistý text. V tomto případě volba \"quoted-printable\", namísto implicitního "
-"\"base64\", ušetří cca 25% místa ve výsledné zprávě.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Kódování pro transport této části:</p><p>Běžně nebudete toto "
+"potřebovat měnit, protože %1 bude používat přijatelné implicitní kódování, "
+"odvozené z MIME typu. Občas ale lze významně redukovat velikost výsledné "
+"zprávy - např. pokud PostScriptový soubor obsahuje pouze čistý text. V tomto "
+"případě volba \"quoted-printable\", namísto implicitního \"base64\", ušetří "
+"cca 25% místa ve výsledné zprávě.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9750,19 +9600,17 @@ msgstr "Navrhnout &automatické zobrazení"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zvolte tuto možnost, pokud chcete, aby u příjemce byla tato část automaticky "
-"zobrazena v náhledu zprávy namísto implicitního zobrazení ve formě ikony.</p>"
-"<p>Technicky je to zařízeno nastavením hlavičky <em>Content-Disposition</em> "
-"této části na \"inline\" namísto implicitního \"attachment\".</p></qt>"
+"<qt><p>Zvolte tuto možnost, pokud chcete, aby u příjemce byla tato část "
+"automaticky zobrazena v náhledu zprávy namísto implicitního zobrazení ve "
+"formě ikony.</p><p>Technicky je to zařízeno nastavením hlavičky <em>Content-"
+"Disposition</em> této části na \"inline\" namísto implicitního \"attachment"
+"\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9770,15 +9618,13 @@ msgstr "&Podepsat tuto část"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zvolte tuto možnost, pokud chcete tuto část zprávy podepsat.</p>"
-"<p>Podpis bude vytvořen za pomoci klíče, který jste svázali s aktuálně vybranou "
-"identitou.</p></qt>"
+"<qt><p>Zvolte tuto možnost, pokud chcete tuto část zprávy podepsat.</"
+"p><p>Podpis bude vytvořen za pomoci klíče, který jste svázali s aktuálně "
+"vybranou identitou.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9786,13 +9632,11 @@ msgstr "Zaši&frovat tuto část"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zvolte tuto možnost, pokud chcete tuto část zprávy šifrovat. </p>"
-"<p>Část bude šifrována pro příjemce této zprávy</p></qt>"
+"<qt><p>Zvolte tuto možnost, pokud chcete tuto část zprávy šifrovat. </"
+"p><p>Část bude šifrována pro příjemce této zprávy</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9806,15 +9650,12 @@ msgstr "POP filtr"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"V POP účtu: <b>%1</b> byly nalezeny zprávy k filtrování."
-"<p> Zobrazené zprávy překročily limit maximální velikosti, který jste "
-"definovali pro tento účet."
+"V POP účtu: <b>%1</b> byly nalezeny zprávy k filtrování.<p> Zobrazené zprávy "
+"překročily limit maximální velikosti, který jste definovali pro tento účet."
 "<br>Můžete specifikovat, co s nimi chcete udělat, pokud zmáčknete příslušné "
 "tlačítko"
 
@@ -10069,40 +9910,38 @@ msgstr "Emailový klient pro TDE"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Získávám obsah složky</h2>"
-"<p>Prosím čekejte . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Získávám obsah složky</h2><p>Prosím "
+"čekejte . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail je právě v offline režimu. Kliknutím <a href=\"kmail:goOnline\">sem</a> "
-"přejdete online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail je právě v offline režimu. "
+"Kliknutím <a href=\"kmail:goOnline\">sem</a> přejdete online . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10110,13 +9949,11 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Vítejte do KMail %1</h2>"
-"<p>KMail je emailový klient pro K Desktop Environment. Je vytvořen tak, aby byl "
-"plně kompatibilní s Internetovými poštovními standardy včetně MIME, SMTP, POP3 "
-"a IMAP.</p>\n"
-"<ul>"
-"<li>KMail má mnoho výkonných rysů, které jsou popsány v <a href=\"%2\">"
-"dokumentaci</a></li>\n"
+"<h2 style='margin-top: 0px;'>Vítejte do KMail %1</h2><p>KMail je emailový "
+"klient pro K Desktop Environment. Je vytvořen tak, aby byl plně kompatibilní "
+"s Internetovými poštovními standardy včetně MIME, SMTP, POP3 a IMAP.</p>\n"
+"<ul><li>KMail má mnoho výkonných rysů, které jsou popsány v <a href="
+"\"%2\">dokumentaci</a></li>\n"
 "<li><a href=\"%3\">Domovská stránka</a> nabízí informace o nových verzích "
 "programu KMail</li></ul>\n"
 "%8\n"
@@ -10129,15 +9966,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Tým KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10151,8 +9986,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Důležité změny</span> "
-"(v porovnání s KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Důležité změny</span> (v "
+"porovnání s KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10183,7 +10018,8 @@ msgstr "Zobrazit přílohu: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Příloha obsahuje binární data. Pokus o zobrazení prvního znak.]\n"
@@ -10212,12 +10048,14 @@ msgstr "Otevřít přílohu?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10239,6 +10077,58 @@ msgstr "(odpovídá něčemu z toho, co následuje)"
 msgid "(match all of the following)"
 msgstr "(odpovídá všemu, co následuje)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Přečteno"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Staré"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Smazáno"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Odpovězeno"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Předané dál"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Ve frontě"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Odesláno"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Sledováno"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorováno"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Úkol"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Má přílohu"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10318,15 +10208,15 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Kritická chyba: Nemohu zpracovat zprávy (nedostatek prostoru na disku?). Zprávy "
-"byly přesunuty do složky \"odchozí pošta\"."
+"Kritická chyba: Nemohu zpracovat zprávy (nedostatek prostoru na disku?). "
+"Zprávy byly přesunuty do složky \"odchozí pošta\"."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Přesun odeslané zprávy \"%1\" z \"Odchozí pošta\" do \"Odeslaná pošta\" "
 "selhal.\n"
@@ -10336,8 +10226,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Zprávy nelze odesílat bez určení adresy odesílatele.\n"
 "Nastavte prosím emailovou adresu identity '%1' v sekci Identity v dialogu "
@@ -10367,8 +10257,8 @@ msgstr "Je inicializováno odesílání..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr "Chcete odeslat všechny zprávy nešifrovaně. Pokračovat?"
 
 #: kmsender.cpp:505
@@ -10393,15 +10283,16 @@ msgstr "Nepodařilo se odeslat (některé) pozdržené zprávy."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Odesílání zrušeno:\n"
 "%1\n"
-"Zpráva bude umístěna do složky odchozí pošty, dokud neodstraníte problém (např. "
-"špatnou adresu) nebo dokud ji neodstraníte z odchozí složky.\n"
+"Zpráva bude umístěna do složky odchozí pošty, dokud neodstraníte problém "
+"(např. špatnou adresu) nebo dokud ji neodstraníte z odchozí složky.\n"
 "Byl použit tento přenosový protokol:\n"
 "  %2"
 
@@ -10411,20 +10302,16 @@ msgstr "Odesílání zrušeno."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Odesílání selhalo:</p>"
-"<p>%1</p>"
-"<p>Zpráva bude umístěna do složky odchozí pošty, dokud neodstraníte problém "
-"(např. špatnou adresu) nebo dokud ji neodstraníte z odchozí složky.</p>"
-"<p>Byl použit tento přenosový protokol: %2</p> "
-"<p>Přejete si pokračovat v odesílání dalších zpráv?</p>"
+"<p>Odesílání selhalo:</p><p>%1</p><p>Zpráva bude umístěna do složky odchozí "
+"pošty, dokud neodstraníte problém (např. špatnou adresu) nebo dokud ji "
+"neodstraníte z odchozí složky.</p><p>Byl použit tento přenosový protokol: "
+"%2</p> <p>Přejete si pokračovat v odesílání dalších zpráv?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10442,15 +10329,16 @@ msgstr "Zrušit o&desílání"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Odesílání selhalo:\n"
 "%1\n"
-"Zpráva bude umístěna do složky odchozí pošty, dokud neodstraníte problém (např. "
-"špatnou adresu) nebo dokud ji neodstraníte z odchozí složky.\n"
+"Zpráva bude umístěna do složky odchozí pošty, dokud neodstraníte problém "
+"(např. špatnou adresu) nebo dokud ji neodstraníte z odchozí složky.\n"
 "Byl použit tento přenosový protokol:\n"
 " %2"
 
@@ -10470,8 +10358,8 @@ msgstr ""
 "Odesílání selhalo:\n"
 "%1\n"
 "Zpráva bude umístěna do složky odchozí pošta a bude učiněn další pokus.\n"
-"Prosím, smažte zprávu z této složky, pokud nechcete, aby byl učiněn další pokus "
-"o odeslání.\n"
+"Prosím, smažte zprávu z této složky, pokud nechcete, aby byl učiněn další "
+"pokus o odeslání.\n"
 "Byl použit tento přenosový protokol:\n"
 "  %2"
 
@@ -10491,9 +10379,9 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 zřejmě již běží na jiné obrazovce na tomto stroji. Vícenásobné spuštění "
 "programu %2 může způsobit ztrátu pošty. Pokud si nejste jistí, že %1 neběží, "
@@ -10501,33 +10389,33 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 zřejmě běží na jiné obrazovce na tomto stroji. Současný běh programů %1 a %2 "
-"může způsobit ztrátu pošty. Pokud si nejste jistí, že %1 neběží, neměli byste "
-"spouštět %2."
+"%1 zřejmě běží na jiné obrazovce na tomto stroji. Současný běh programů %1 a "
+"%2 může způsobit ztrátu pošty. Pokud si nejste jistí, že %1 neběží, neměli "
+"byste spouštět %2."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 již zřejmě běží na %2. Vícenásobné spuštění programu %1 může způsobit ztrátu "
-"pošty. Neměli byste na tomto počítači %1 spouštět, pokud si nejste jistí, že "
-"neběží na %2."
+"%1 již zřejmě běží na %2. Vícenásobné spuštění programu %1 může způsobit "
+"ztrátu pošty. Neměli byste na tomto počítači %1 spouštět, pokud si nejste "
+"jistí, že neběží na %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 zřejmě běží na %3. Současný běh programů %1 a %2 může způsobit ztrátu pošty. "
-"Pokud si nejste jistí, že %1 neběží na %3, neměli byste spouštět %2 na tomto "
-"počítači."
+"%1 zřejmě běží na %3. Současný běh programů %1 a %2 může způsobit ztrátu "
+"pošty. Pokud si nejste jistí, že %1 neběží na %3, neměli byste spouštět %2 "
+"na tomto počítači."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10538,6 +10426,10 @@ msgstr "Spustit %1"
 msgid "Exit"
 msgstr "Ukončit"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nové zprávy v"
@@ -10565,8 +10457,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet není dostupný. Pro správu hesel doporučujeme používat TDEWallet.\n"
@@ -10642,8 +10535,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "Příkaz, který bude spuštěn před odesláním zprávy. Může být použit např. k "
-"nastavení šifrovaného tunelu (ssh). Pokud nic takového nepotřebujete, nechte to "
-"prázdné."
+"nastavení šifrovaného tunelu (ssh). Pokud nic takového nepotřebujete, nechte "
+"to prázdné."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10651,8 +10544,8 @@ msgstr "Server &vyžaduje autentizaci"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Zvolte tuto možnost, pokud váš SMTP server vyžaduje, před přijetím zprávy, "
 "autentizaci. Známo jako 'Autentizované SMTP' nebo jednoduše ASMTP."
@@ -10675,15 +10568,14 @@ msgstr "Posl&at na server vlastní jméno hostitele"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Zvolte tuto možnost, aby se KMail mohl poštovnímu serveru prokazovat vlastním "
-"jménem hostitele."
-"<p>Je to užitečné, pokud nelze korektně nastavit systémové jméno hostitele nebo "
-"pokud chcete skrýt skutečné jméno vašeho hostitele."
+"Zvolte tuto možnost, aby se KMail mohl poštovnímu serveru prokazovat "
+"vlastním jménem hostitele.<p>Je to užitečné, pokud nelze korektně nastavit "
+"systémové jméno hostitele nebo pokud chcete skrýt skutečné jméno vašeho "
+"hostitele."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10713,8 +10605,8 @@ msgstr "Dovoleny jsou pouze lokální soubory."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Pole Server nemůže být prázdné. Zadejte jméno nebo IP adresu SMTP serveru."
 
@@ -10728,10 +10620,10 @@ msgstr "Chyba při výpisu složky %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10953,35 +10845,27 @@ msgstr "V&ytvořit/upravit zprávu"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Informace o struktuře, vrácené zásuvným modulem šifrování nemohou být "
-"korektně zpracovány. Modul je možná poškozen.</p>"
-"<p>OBRAŤTE SE NA SYSTÉMOVÉHO ADMINISTRÁTORA</p></qt>"
+"<qt> <p>Informace o struktuře, vrácené zásuvným modulem šifrování nemohou "
+"být korektně zpracovány. Modul je možná poškozen.</p><p>OBRAŤTE SE NA "
+"SYSTÉMOVÉHO ADMINISTRÁTORA</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Nebyl nalezen aktivní zásuvný modul šifrování a vestavěný kód OpenPGP nebyl "
-"úspěšný.</p>"
-"<p>Pro nápravu můžete udělat 2 věci:</p>"
-"<ul>"
-"<li><em>buď</em> aktivovat zásuvný modul přes dialog Nastavení->"
-"Konfigurace KMailu->Zásuvné moduly.</li>"
-"<li><em>nebo</em> specifikovat tradiční nastavení OpenPGP přes dialog Identita->"
-"Rozšířené.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Nebyl nalezen aktivní zásuvný modul šifrování a vestavěný kód OpenPGP "
+"nebyl úspěšný.</p><p>Pro nápravu můžete udělat 2 věci:</p><ul><li><em>buď</"
+"em> aktivovat zásuvný modul přes dialog Nastavení->Konfigurace KMailu-"
+">Zásuvné moduly.</li><li><em>nebo</em> specifikovat tradiční nastavení "
+"OpenPGP přes dialog Identita->Rozšířené.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10993,8 +10877,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus backend nepodporuje funkci \"x-encrypt\". Nahlaste to prosím jako "
 "chybu."
@@ -11013,16 +10897,16 @@ msgstr "Chyba šifrování Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Neočekávaná návratová hodnota z Chiasmus backendu: Funkce \"x-encrypt\" "
 "nevrátila pole bajtů. Nahlaste to prosím jako chybu."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Vkládaný (inline) OpenPGP formát šifrovaných zpráv nepodporuje šifrování ani "
@@ -11047,8 +10931,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Z nastavení podepisování pro příjemce vyplývá, že máte být dotázáni, zda zprávu "
-"podepsat.\n"
+"Z nastavení podepisování pro příjemce vyplývá, že máte být dotázáni, zda "
+"zprávu podepsat.\n"
 "Podepsat zprávu?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11135,8 +11019,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Z nastavení šifrování pro příjemce vyplývá, že máte být dotázáni, zda zprávu "
@@ -11173,11 +11057,13 @@ msgstr "&Nešifrovat"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Požádali jste o zašifrování této zprávy a o zašifrování její kopie pro vás, ale "
-"pro tuto identitu nebyly nastaveny žádné platné důvěryhodné šifrovací klíče."
+"Požádali jste o zašifrování této zprávy a o zašifrování její kopie pro vás, "
+"ale pro tuto identitu nebyly nastaveny žádné platné důvěryhodné šifrovací "
+"klíče."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11186,13 +11072,13 @@ msgstr "Odeslat nešifrovaně?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Některé části této zprávy nebudou zašifrovány.\n"
-"Odesílání částečně zašifrovaných zpráv může odporovat místním pravidlům a/nebo "
-"způsobit prozrazení tajných informací.\n"
+"Odesílání částečně zašifrovaných zpráv může odporovat místním pravidlům a/"
+"nebo způsobit prozrazení tajných informací.\n"
 "Chcete raději zašifrovat všechny části?"
 
 #: messagecomposer.cpp:950
@@ -11215,50 +11101,44 @@ msgstr "Ši&frovat všechny části"
 msgid "Unencrypted Message Warning"
 msgstr "Nezašifrovaná zpráva"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Chyba: Modul šifrování nevrátil zašifrovaná data.</p> "
-"<p>Prosím, nahlaste tuto chybu:"
-"<br>%2</p></qt>"
+"<qt><p>Chyba: Modul šifrování nevrátil zašifrovaná data.</p> <p>Prosím, "
+"nahlaste tuto chybu:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Ne všechny znaky se hodí do vybraného kódování."
-"<br>"
-"<br>I tak zprávu odeslat?</qt>"
+"<qt>Ne všechny znaky se hodí do vybraného kódování.<br><br>I tak zprávu "
+"odeslat?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Budou ztraceny některé znaky"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Ztratit znaky"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Změnit kódování"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Tuto zprávu nelze podepsat, protože zvolený backend zřejmě podepisování "
 "nepodporuje. To by se nemělo nikdy stát. Nahlaste prosím chybu."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11266,33 +11146,34 @@ msgstr ""
 "Tuto zprávu nelze podepsat, protože zvolený backend zřejmě podepisování "
 "nepodporuje. To by se nemělo nikdy stát. Nahlaste prosím chybu."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "Podepsání selhalo; ujistěte se, že program gpg-agent je spuštěn."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Tuto zprávu nelze zašifrovat, protože zvolený backend zřejmě šifrování "
 "nepodporuje. To by se nemělo nikdy stát. Nahlaste prosím chybu."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Tuto zprávu nelze podepsat a zašifrovat, protože zvolený backend zřejmě "
 "nepodporuje podepisování a šifrování současně. To by se nemělo nikdy stát. "
@@ -11317,10 +11198,10 @@ msgstr "&Formát poštovní schránky:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Zvolte, zda chcete zprávy v této složce ukládat jako jednotlivé soubory "
 "(maildir) nebo jako jeden velký soubor (mbox). KMail ve výchozím nastavení "
@@ -11334,12 +11215,12 @@ msgstr "Složka obsa&huje:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Zvolte, zda má být nová složka používána pro ukládání pošty nebo pro ukládání "
-"groupware položek, například úkolů či poznámek. Výchozí je pošta. Pokud si "
-"nejste jistí, ponechte volbu beze změny."
+"Zvolte, zda má být nová složka používána pro ukládání pošty nebo pro "
+"ukládání groupware položek, například úkolů či poznámek. Výchozí je pošta. "
+"Pokud si nejste jistí, ponechte volbu beze změny."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11377,8 +11258,7 @@ msgstr "Rozdílné výsledky pro podpisy"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Šifrovací nástroj nevrátil data v čistém textu."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr " Stav: "
 
@@ -11407,8 +11287,8 @@ msgstr "Zásuvný modul %1 nebyl nalezen."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Zpráva je podepsána, ale platnost podpisu nemůže být ověřena.<br />Důvod: %1"
 
@@ -11446,10 +11326,10 @@ msgstr "Zásuvný modul šifrování \"%1\" nemůže dešifrovat zprávy."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Poznámka:</b> Tato HTML zpráva může obsahovat externí odkazy na obrázky, "
 "soubory atd. Z bezpečnostních důvodů a z důvodu ochrany soukromí nejsou tyto "
@@ -11458,15 +11338,15 @@ msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Poznámka:</b> Toto je zpráva v HTML. Z bezpečnostních důvodů je zobrazen "
 "pouze čistý HTML kód. Pokud odesilateli této zprávy důvěřujete, můžete "
-"aktivovat zobrazování formátovaného HTML pro tuto zprávu kliknutím <a "
-"href=\"kmail:showHTML\">zde</a>."
+"aktivovat zobrazování formátovaného HTML pro tuto zprávu kliknutím <a href="
+"\"kmail:showHTML\">zde</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11726,11 +11606,11 @@ msgstr "uloženo: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Není adresa, uložená v %1, použitém pro podepisování, takže ji nelze porovnat s "
-"adresou odesílatele %2."
+"Není adresa, uložená v %1, použitém pro podepisování, takže ji nelze "
+"porovnat s adresou odesílatele %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11845,13 +11725,15 @@ msgstr "Chybová zpráva TDEIO slave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Server POP3 (účet: %1) nepodporuje příkaz UIDL. Tento příkaz je potřebný pro "
-"spolehlivé určení toho, které zprávy na serveru již byly KMailem prohlíženy.\n"
+"spolehlivé určení toho, které zprávy na serveru již byly KMailem "
+"prohlíženy.\n"
 "Možnost ponechání zpráv na serveru nebude tudíž fungovat, jak by měla."
 
 #: popaccount.cpp:752
@@ -11874,7 +11756,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Stahuje se zpráva %1 z %2 (%3 ze %4 KB) pro %5@%6 (%7 KB zůstává na serveru)."
 
@@ -11892,1847 +11775,15 @@ msgstr "Neplatná odpověď serveru"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Váš server, bohužel, nepodporuje příkaz TOP. Není tak možno napřed stáhnout "
 "hlavičky dlouhých zpráv před jejich transportem do KMailu."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Pře&jít"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Sl&ožka"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Zpráva"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Odpovědět jinak"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Předat dál"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Nástrojová lišta HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Podepisování"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Automaticky podepisovat zprávy"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Pokud je zvolena tato možnost, budou implicitně podepisovány všechny odeslané "
-"zprávy. Samozřejmě je možné podepisování, pro každou zprávu zvlášť, vypnout."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Šifrování"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Pokud je tato volba povolena, nebude zpráva či soubor zašifrována pouze "
-"veřejným klíčem příjemce, ale i vaším klíčem. To vám umožní pozdější "
-"rozšifrování zprávy či souboru. Obvykle je výhodné tuto volbu používat."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Po napsání zobraz&it podepsaný/zašifrovaný text"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Pokud je povolena tato volba, bude v samostatném okně zobrazen zašifrovaný "
-"a/nebo podepsaný text. Můžete si ho tak před odesláním prohlédnout. Je to dobré "
-"pro ověření funkce šifrovacího systému."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Ukládat odeslané z&právy šifrovaně"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Zvolte pro ukládání zpráv šifrovaně "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ukládat zprávy šifrovaně</h1>\n"
-"Pokud je zaškrtnuto toto políčko, jsou odeslané zprávy ukládány tak jak byly "
-"odeslány. Není to doporučováno, protože pokud vyprší potřebný certifikát, "
-"nebudete si je již moci přečíst.\n"
-"<p>\n"
-"Nicméně, mohou existovat interní směrnice, které budou tuto věc vyžadovat. "
-"Pokud si nejste jisti, konzultujte to s vaším administrátorem.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Vždy zobrazit ši&frovací klíče ke schválení"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Pokud je zapnuta tato volba, program vždy zobrazí seznam veřejných klíčů, ze "
-"kterých můžete vybrat klíč k zašifrování. Pokud je volba vypnuta, zobrazí se "
-"dialog pouze tehdy, pokud aplikace nemůže najít správný klíč nebo je možností "
-"několik."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Auto&maticky šifrovat zprávy, pokud je to možné"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Pokud je zvolena tato možnost, bude každá zpráva, kterou odešlete, šifrována "
-"kdykoliv to bude žádoucí a možné. Samozřejmě je možné automatické šifrování, "
-"pro každou zprávu zvlášť, vypnout."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nikdy nepodepiso&vat/nešifrovat při ukládání konceptu"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Jak to funguje?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Komu: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopie: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Univerzální"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Odpovědět"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Odpovědět všem"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Předat dál"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Zk&ratka:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Typ šablony:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Vlastnosti složky"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Složka obsahuje poštovní &konferenci"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Adresa seznamu:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormální:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "N&epřečtené:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Zánik starých zpráv"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Zaniknou&t za:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Nechat zaniknout přečtené zp&rávy"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Zan&iknout za:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Nechat zanikno&ut nepřečtené zprávy"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "dnech"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "týdnech"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "měsících"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Pokročilé"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identita odesí&latele:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "For&mát uložení:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Seznam zobrazuje:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validovat certifikáty pomocí CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Pokud je zvolena tato volba, jsou S/MIME certifikáty ověřovány pomocí seznamu "
-"zneplatněných certifikátů (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validovat certifikáty online (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Pokud je zvolena tato volba, jsou S/MIME certifikáty ověřovány online pomocí "
-"protokolu OCSP (Online Certificates Status Protocol) . Níže zadejte adresu OCSP "
-"responderu."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Online validace certifikátů"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL OCSP responderu:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Zde zadejte adresu serveru pro online ověřování certifikátů (OCSP responderu). "
-"Adresa obvykle začíná řetězcem http://"
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Podpis OCSP responderu:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorovat servisní URL certifikátů"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Nekontrolovat omezení certifikátů"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Standardně GnuPG používá soubor ~/.gnupg/policies.txt ke kontrole, zda je "
-"povoleno omezení certifikátů. Pokud je tato volba vybrána, omezení nejsou "
-"kontrolována."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nikdy se nedotazovat CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Pokud je tato volba zaškrtnuta, nejsou pro ověřování S/MIME certifikátů nikdy "
-"používány seznamy zneplatněných certifikátů (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Získat chybějící certifikáty vydavatelů"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Pokud je zapnuta tato volba, jsou v případě potřeby staženy chybějící "
-"certifikáty vydavatelů (platí pro obě ověřovací metody - CRL i OCSP)."
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP dotazy"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Neprovádět žádné HTTP dotazy"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Zcela zakáže použití HTTP pro S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Použít tuto proxy pro HTTP dotazy:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Používat systémovou HTTP proxy:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Pokud je zvolena tato volba, je pro každý HTTP požadavek používána HTTP proxy "
-"uvedená vpravo (hodnota pochází z proměnné prostředí http_proxy)."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Zde zadejte umístění HTTP proxy, která se bude používat pro všechny HTTP "
-"požadavky spojené s S/MIME. Formát je počítač:port, například "
-"\"myproxy.nowhere.com:3128\"."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorovat HTTP CRL distribuční bod certifikátů"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Při hledání CRL seznamů se obvykle používá tzv. CRL distribuční bod (DP)uvedený "
-"v testovaném certifikátu. Jedná se o URL pro přístup k seznamu. Používá se "
-"první nalezený distribuční bod. Je-li zapnuta tato volba, ignorují se všechny "
-"položky využívající HTTP protokol."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP požadavky"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Neprovádět žádné LDAP požadavky"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Zcela zakáže použití LDAP pro S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorovat LDAP CRL distribuční bod certifikátů"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Při hledání CRL seznamů se obvykle používá tzv. CRL distribuční bod (DP)uvedený "
-"v testovaném certifikátu. Jedná se o URL pro přístup k seznamu. Používá se "
-"první nalezený distribuční bod. Je-li zapnuta tato volba, ignorují se všechny "
-"položky využívající LDAP protokol."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primární hostitel LDAP požadavků:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Všechny LDAP požadavky budou nejprve směrovány na zde zadaný LDAP server. "
-"Přesněji, zdejší nastavení přepíše jakýkoliv počítač a port v LDAP URL a "
-"použije se také tehdy, pokud URL počítač a port neobsahuje. Další LDAP servery "
-"se použijí pouze tehdy, pokud spojení s \"proxy\" selže.\n"
-"Formát je \"počítač\" nebo \"počítač:port\". Pokud je port vynechán, použije se "
-"standardní port 389."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "Přid&at..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Obnovit nastavení písma"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "neomezené"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Odpovědět odesílateli"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Odpovědět všem / do konference"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Předat zprávu"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "&Upozornění před odesláním nepodepsaných zpráv"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Zvolte, pokud chcete být upozorněni při odesílání nepodepsaných zpráv."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění při pokusu o odeslání nepodepsané zprávy</h1>\n"
-"Pokud je toto políčko zaškrtnuté, budete upozorněni, pokud budete odesílat "
-"zprávu (nebo část zprávy), jež není podepsána.\n"
-"<p>\n"
-"Pro maximální bezpečnost je doporučeno ponechat tuto volbu zapnutou.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Upozornění před pokusem odeslat nešifrovanou zprávu"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Zvolte pro upozornění před pokusem odeslat nešifrovanou zprávu."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění při pokusu o odeslání nezašifrované zprávy</h1>\n"
-"Pokud je toto políčko zaškrtnuté, budete upozorněni, pokud budete odesílat "
-"zprávu (nebo část zprávy), jež není zašifrována.\n"
-"<p>\n"
-"Pro maximální bezpečnost je doporučeno ponechat tuto volbu zapnutou.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Upozo&rnit, pokud příjemcův email není v certifikátu"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Zvolte pro upozornění, pokud adresa není v certifikátu"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění, pokud není příjemcova adresa obsažena v certifikátu</h1>\n"
-"Pokud je vybrána tato možnost, je vydáno varování v případě, že adresa příjemce "
-"není obsažena v certifikátu, používaném pro šifrování.\n"
-"<p>\n"
-"Pro maximální bezpečnost je doporučeno mít tuto volbu zapnutou.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Upozornění, pokud CA certifikát brzy vyprší (detaily níže)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Pro podepisování"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Pro šifrování"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dní"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Zde vyberte počet dnů"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění při vypršení certifikátu podpisu</h1>\n"
-"Nastavení minimálního počtu dnů, po které bude certifikát podpisu považován za "
-"platný a nebudou generována upozornění.\n"
-"<p>\n"
-"Doporučená hodnota (SPHINX) je 14 dnů.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění, pokud vyprší certifikát pro šifrování</h1>\n"
-"Zadání minimálního počtu dnů po které bude certifikát platný bez vydání "
-"varování.\n"
-"<p>\n"
-"Doporučovaným nastavením ve SPHINX je 14 dnů.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění při vypršení certifikátu certifikační autority (CA)</h1>\n"
-"Nastavení minimálního počtu dnů, po které budou všechny certifikáty považovány "
-"za platné a nebudou generována upozornění.\n"
-"<p>\n"
-"Doporučená hodnota SPHINX je 14 dnů.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění při vypršení certifikátu certifikační autority (CA)</h1>\n"
-"Nastavení minimálního počtu dnů, po které bude CA certifikát považován za "
-"platný a nebudou generována upozornění.\n"
-"<p>\n"
-"Doporučená hodnota (SPHINX) je 14 dnů.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozornění při vypršení kořenového certifikátu</h1>\n"
-"Nastavení minimálního počtu dnů, po které bude kořenový certifikát považován za "
-"platný a nebudou generována upozornění.\n"
-"<p>\n"
-"Doporučená hodnota (SPHINX) je 14 dnů.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Pro kořenové certifikáty:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Pro certifikáty prostředníků:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Pro koncové certifikáty/klíče:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Reaktivovat všechna \"Znovu se neptat\" upozornění"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Obsah šablony"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Zkratka šablony"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Typ šablony"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Při kontrole pošty odeslat zprávy ve frontě"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Zvolte, zda chcete aby KMail odesílal odchozí zprávy při všech kontrolách "
-"pošty, při manuálních kontrolách pošty, nebo aby je automaticky neodesílal "
-"vůbec.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>V této složce (%1) jsou nové zprávy, které ještě nebyly nahrány na server, "
-"ale zdá se, že nyní nemáte pro jejich nahrání dostatečná přístupová práva. "
-"Požádejte svého administrátora o patřičná práva nebo zprávy ze složky "
-"odstraňte.</p> "
-"<p>Chcete zprávy nyní přesunout do jiné složky?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Naposledy zvolená složka v dialogu pro výběr složky."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Pravidla zobrazování ikony v panelu"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Detailní oznámení o nové poště"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Pokud je tato volba povolena, je při oznámení nové pošty zobrazen počet nových "
-"zpráv v jednotlivých složkách. V opačném případě je zobrazeno pouze jednoduché "
-"hlášení 'Přišla nová pošta'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Zadejte e&ditor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Používat e&xterní editor místo vestavěného"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Povolit groupwarové funkce"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Upravit hlavičky 'Od/Komu' v odpovědích na odpovědi"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Implementace standardu iCalendar v aplikaci Microsoft Outlook je nedokonalá. "
-"Tato volba řeší jednu z chyb. Pokud uživatelé Outlooku nedostávají vaše "
-"odpovědi, povolte tuto volbu."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Posílat groupwarové pozvánky v těle zprávy"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Implementace standardu iCalendar v aplikaci Microsoft Outlook je nedokonalá. "
-"Tato volba řeší jednu z chyb. Pokud uživatelé Outlooku nedostávají vaše "
-"pozvánky, povolte tuto volbu."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automatické posílání pozvánek"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Pokud je zapnuta tato volba, nezobrazuje se okno editoru zpráv, všechny "
-"pozvánky jsou odesílány automaticky. Pokud chcete zprávu před odesláním vidět, "
-"volbu vypněte. Text však musí zůstat v iCalendar formátu, a proto byste ho "
-"neměli ručně upravovat."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Zapnutí této volby umožňuje ukládat položky z Kontact modulů (KOrganizer, "
-"KAddressBook a KNotes.)</p>"
-"<p>Pokud chcete zapnout, měli byste nastavit  také aplikace používající IMAP "
-"zdroje, což lze provést v Ovládacím centru TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Obvykle není žádný důvod zobrazovat složky obsahující IMAP zdroje. Pokud je "
-"však zobrazovat potřebujete, můžete tak nastavit zde.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Zvolte úložný formát groupware složek. "
-"<ul>"
-"<li>Výchozím formátem je ical (pro kalendářové složky) a vcard (pro adresářové "
-"složky). Při použití těchto standardů jsou dostupné všechny funkce "
-"Kontactu.</li>"
-"<li>Formát Kolab XML je bližší formátu používanému Outlookem. Při použití se "
-"serverem Kolab nebo kompatibilním tak lze dosáhnout lepší komaptibility s "
-"Outlookem.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Zde se nastavuje rodič složek s IMAP zdroji.</p>"
-"<p>Ve výchozím nastavení je to složka příchozí pošty.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Toto je ID účtu obsahujícího složky s IMAP zdroji.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Pokud chcete nastavit jména úložných IMAP složek do místníhojazyka, můžete "
-"si vybrat mezi těmito odstupnými jazyky.</p>"
-"<p>Jediným důvodem k takovému nastavení je kompatibilita s Microsoft Outlookem. "
-"Jinak je to považováno za špatný nápad, neboť to znemožňuje přepínání "
-"jazyků.</p>"
-"<p>Proto tuto volbu nezapínejte, pokud nemusíte.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Tato hodnota určuje, zda má být zobrazován Úvod do KMailu"
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maximální počet spojení na hostitele"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Toto lze použít k omezení počtu spojení na jeden počítač při kontrole nové "
-"pošty. Výchozí počet spojení je neomezený (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Zobrazovat políčko pro rychle hledání"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Tato volba povoluje či zakazuje zobrazení vyhledávací lišty nad seznamem zpráv. "
-"Lištu můžete používat pro vyhledávání zpráv v seznamu."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Ponechat výchozí znakovou sadu při odpovědi nebo přeposlání (pokud je to možné)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomaticky připojit podpis"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamatovat si tuto identitu, takže bude použita i v budoucích oknech editoru."
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamatovat si tuto složku pro odeslané položky, takže bude použita i v "
-"budoucích oknech editoru."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamatovat si tento přenos pošty, takže bude použit i v budoucích oknech "
-"editoru."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamatovat si tuto identitu, takže bude použita i v budoucích oknech editoru."
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Za&lamovat slova na sloupci:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Upozornění, pokud kořenový certi&fikát vyprší dřív než:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Zapněte tuto možnost, aby Outlook &#8482; pochopil názvy příloh obsahující "
-"neanglické znaky."
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Automaticky požadovat oznámení o &naložení"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Povolte tuto volbu, pokud chcete, aby KMail požadoval oznámení o naložení se "
-"zprávou (MDN) pro každou odchozí zprávu.</p>"
-"<p>Tato volba určuje výchozí chování; stále můžete MDN povolit nebo zakázat "
-"individuálně pro každou zprávu v editoru nových zpráv volbou <em>Možnosti</em>"
-"-&gt;<em>Požadovat oznámení o naložení</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Používat nedávné adresy pro automatické doplňování"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Pokud nechcete, aby se při automatickém doplňování adres při psaní nové zprávy "
-"zobrazovaly nedávné adresy, zakažte tuto volbu."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Interval automatického ukládání:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Text v okně editoru lze pravidelně zálohovat. Zde se nastavuje časový interval "
-"mezi zálohami. Chcete-li automatické ukládání zakázat, nastavte zde 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Nahradit rozpoznaný prefi&x za \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Nahradit rozpoznaný prefix za \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Použít inteligentní citování"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Podpis vypršel."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Typ výběru adresáta"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Nastavuje typ dialogu pro výběr příjemců pro Komu,\n"
-"        CC a BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Typ editoru příjemců"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Nastavuje typ editoru příjemců pro Komu,\n"
-"        CC a BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maximální počet řádků příjemců v editoru."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Ponechat výchozí znakovou sadu při odpovědi nebo přeposlání (pokud je to možné)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Některé emaily, zejména automaticky vytvářené, neobsahují informaci o kódování "
-"znaků, která je potřebná ke správnému zobrazení. V takových případech se "
-"používá záložní kódování, které lze nastavit zde. Jako záložní kódování "
-"nastavte kódování, které je ve vašem okolí nejpoužívanější. Jako výchozí je "
-"použito kódování nastavené v celém systému."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Změna z výchozího 'Automaticky' vynutí používání zvoleného kódování pro všechny "
-"zprávy, bez ohledu na to, jaké kódování samy předepisují."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Tuto volbu povolte, pokud chcete textové smajlíky zobrazovat jako emotikony "
-"(malé obrázky)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"tuto volbu povolte, pokud chcete zobrazovat různé úrovně citovaného textu. V "
-"opačném případě ji zakažte."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatická úroveň svinutí"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Zmenšit velikost písma citovaného textu"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Tuto volbu povolte, pokud chcete zobrazovat citovaný text menším písmem."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Ukládat odeslané z&právy šifrovaně"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Zobrazovat uživatelský program v ozdobných hlavičkách"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Upozornění na naložení se zprávou odesílat s prázdným odesílatelem."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Upozornění na naložení se zprávou odesílat s prázdným řetězcem odesílatele. "
-"Některé servery mohou být nastaveny, aby takové zprávy odmítaly. Pokud proto "
-"máte s odesíláním upozornění na naložení se zprávou problémy, deaktivujte tuto "
-"volbu."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Šablona nové zprávy"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Šablona zprávy pro odpověď"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Šablona zprávy pro odpověď všem"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Šablona zprávy pro přeposlání"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Znak&y pro citaci"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 z %2 %3 využito"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13844,6 +11895,11 @@ msgstr "Přidat jako 'CC'"
 msgid "Add as BCC"
 msgstr "Přidat jako 'BCC'"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Z&rušit"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13859,13 +11915,13 @@ msgstr "Vybraní příjemci"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Zvolili jste jednoho příjemce. Maximální podporovaný počet příjemců je "
-"%1.Prosím upravte výběr.\n"
+"Zvolili jste jednoho příjemce. Maximální podporovaný počet příjemců je %1."
+"Prosím upravte výběr.\n"
 "Zvolili jste %n příjemce. Maximální podporovaný počet příjemců je %1.Prosím "
 "upravte výběr.\n"
 "Zvolili jste %n příjemců. Maximální podporovaný počet příjemců je %1.Prosím "
@@ -13885,8 +11941,8 @@ msgstr "Použít dialog pro výběr adres"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Toto tlačítko otvírá zvláštní dialog pro výběr příjemců ze všech dostupných "
 "adres."
@@ -13991,10 +12047,19 @@ msgstr "je větší nebo rovno"
 msgid " bytes"
 msgstr " bajtů"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dní"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "K zahájení hledání je třeba nejprve stáhnout ze serveru všechny zprávy ze "
 "složky %1. Toto může nějakou dobu trvat. Přejete si pokračovat v hledání?"
@@ -14150,16 +12215,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Nahrávám data pro účet '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Nahrávám data pro účet '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14178,10 +12239,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Obsah skriptu '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Obsah skriptu '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14204,20 +12263,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Možnosti Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Možnosti Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Nejsou dostupné žádné zvláštní schopnosti)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Dostupné Sieve skripty:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Dostupné Sieve skripty:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14296,8 +12351,8 @@ msgstr "Zde zadejte text libovolného statického podpisu."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Zde zadejte textový soubor s podpisem. Bude načten při vytvoření každé nové "
 "zprávy nebo přílohy."
@@ -14316,21 +12371,26 @@ msgstr "Otevře zadaný soubor v textovém editoru."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Zde můžete zadat libovolný příkaz, s úplnou cesto nebo bez ní (v závislosti na "
-"tom, zda je příkaz ve vaší cestě). Při vytvoření každé nové zprávy KMail "
-"nastavený příkaz spustí a jeho standardní výstup použije jako podpis. Obvykle "
-"se používají například příkazy \"fortune\" or \"ksig --random\"."
+"Zde můžete zadat libovolný příkaz, s úplnou cesto nebo bez ní (v závislosti "
+"na tom, zda je příkaz ve vaší cestě). Při vytvoření každé nové zprávy KMail "
+"nastavený příkaz spustí a jeho standardní výstup použije jako podpis. "
+"Obvykle se používají například příkazy \"fortune\" or \"ksig --random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Zadat příkaz:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Cesta"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nová položka:"
@@ -14368,6 +12428,11 @@ msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 "<qt>Chcete opravdu odstranit identitu, pojmenovanou jako <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Aplikova&t na:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14382,6 +12447,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Upravit skript..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14421,9 +12490,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14460,6 +12529,16 @@ msgstr "Nepovolovat"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Není možné vložit obsah souboru %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Komu: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopie: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14495,36 +12574,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14789,6 +12864,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Nastavit pozici kurzoru"
@@ -14821,111 +12900,6 @@ msgstr "Zapnout ladění"
 msgid "Turn Debug Off"
 msgstr "Vypnout ladění"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...že můžete přecházet na další nebo předchozí zprávu pomocí\n"
-"šipek vpravo resp. vlevo?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...že můžete rychle vytvářet filtry pro odesilatele, příjemce, \n"
-"předmět a poštovní konference pomocí <em>Nástroje->Vytvořit&nbsp;filtr</em>?</p>"
-"\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...že se můžete zbavit položky &quot;[jména poštovní konference]&quot;,\n"
-"přidané do předmětu některých konferencí, za pomoci akce filtru \n"
-"<em>přepsat hlavičku</em>? Viz.\n"
-"<pre>přepsat hlavičku &quot;Subject&quot;\n"
-"   nahradit &quot;\\s*\\[jméno poštovní konference\\]\\s*&quot;\n"
-"   za &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...že můžete propojit poštovní konference se složkami v dialogu\n"
-"<em>Složka-&gt;Správa poštovní konference</em>? Pak můžete volbou\n"
-"<em>Zpráva-&gt;Nová zpráva do poštovní konference...</em> otevřít \n"
-"editor zprávy s přednastavenou adresou konference.\n"
-"Můžete také kliknout prostředním tlačítkem myši na složku.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...že můžete ke každé složce individuálně přidat volitelnou ikonu? Podívejte "
-"se do <em>Složka -&gt; Vlastnosti</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...že KMail může zobrazovat aktuálně viditelné zprávy tak, že budou\n"
-"barevně odlišeny podle typu (Prostý text/HTML/OpenPGP)?</p>\n"
-"<p>Takto lze zamezit pokusům o poslání falešných ověření podpisu pomocí\n"
-"zprávy v HTML, která napodobuje stavové rámy podpisu KMailu.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...že můžete odfiltrovat hlavičky pomocí jednoduchého zadání jejich jména\n"
-"v prvním editačním poli vyhledávacího pravidla?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...že můžete vyfiltrovat zprávy v HTML pomocí pravidla\n"
-"<pre>&quot;Content-type&quot; obsahuje &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...že při odpovídání je citována pouze část zprávy?</p>\n"
-"<p>Pokud není nic vybráno je citována celá zpráva.</p>\n"
-"<p>Tato událost pracuje pouze s přílohami, které vyberete v nabídce\n"
-"<em>Pohled-&gt;Přilohy-&gt;Vložené</em>.</p>\n"
-"<p>Tato volba je dostupná pro všechny příkazy odpovědi kromě\n"
-"<em>Zpráva-&gt;Odpovědět bez citace</em>.</p>\n"
-"<p align=\"right\"><em>přidal David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Neexistuje nic, co by šlo vrátit zpět."
@@ -14994,6 +12968,15 @@ msgstr "Příloha: č. %1 (nepojmenována)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Soubor s názvem \"%1\" již existuje. Opravdu jej chcete přepsat?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Přepsat soubor?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15109,9 +13092,9 @@ msgstr "Ode&sílat obrázek s každou zprávou"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Tuto volbu povolte, pokud chcete, aby KMail do zpráv napsaných pod touto "
 "identitou vkládal tzv. X-Face hlavičku. X-Face je malá (48 x 48 pixelů) "
@@ -15143,12 +13126,12 @@ msgstr "Vybrat soubor..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Použít tento soubor jako zdroj obrázku. Obrázek by měl být vysoce kontrastní a "
-"přibližně čtvercový. Světlé pozadí může zvýšit kvalitu výsledku."
+"Použít tento soubor jako zdroj obrázku. Obrázek by měl být vysoce kontrastní "
+"a přibližně čtvercový. Světlé pozadí může zvýšit kvalitu výsledku."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15156,20 +13139,20 @@ msgstr "Nastavit z Knihy adres"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Můžete použít zmenšenou verzi obrázku, který máte nastaven v knize adres."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail může posílat malý(48x48 pixelů), nepříliš kvalitní, černobílý obrázek "
-"s každou zprávou. Například vaši podobiznu. Tento obrázek bude zobrazen v "
-"příjemcově klientu (pokud to podporuje)."
+"<qt>KMail může posílat malý(48x48 pixelů), nepříliš kvalitní, černobílý "
+"obrázek s každou zprávou. Například vaši podobiznu. Tento obrázek bude "
+"zobrazen v příjemcově klientu (pokud to podporuje)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15177,11 +13160,11 @@ msgstr "Toto pole použijte pro zadání libovolného X-Face řetězce."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Ukázky jsou dostupné na <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Ukázky jsou dostupné na <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15196,129 +13179,1746 @@ msgstr "Žádný obrázek"
 msgid "You do not have your own contact defined in the address book."
 msgstr "V knize adres nemáte svůj vlastní kontakt."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Podepisování"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Automaticky podepisovat zprávy"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Pokud je zvolena tato možnost, budou implicitně podepisovány všechny "
+"odeslané zprávy. Samozřejmě je možné podepisování, pro každou zprávu zvlášť, "
+"vypnout."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Šifrování"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Nastavit předmět zprávy"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Pokud je tato volba povolena, nebude zpráva či soubor zašifrována pouze "
+"veřejným klíčem příjemce, ale i vaším klíčem. To vám umožní pozdější "
+"rozšifrování zprávy či souboru. Obvykle je výhodné tuto volbu používat."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Poslat kopii (CC) na adresu 'address'."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Po napsání zobraz&it podepsaný/zašifrovaný text"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Poslat slepou kopii (BCC) na adresu 'address'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Pokud je povolena tato volba, bude v samostatném okně zobrazen zašifrovaný a/"
+"nebo podepsaný text. Můžete si ho tak před odesláním prohlédnout. Je to "
+"dobré pro ověření funkce šifrovacího systému."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Přidat hlavičku 'header' ke zprávě"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Ukládat odeslané z&právy šifrovaně"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Načíst tělo zprávy ze souboru 'file'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Zvolte pro ukládání zpráv šifrovaně "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Nastavit tělo zprávy"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ukládat zprávy šifrovaně</h1>\n"
+"Pokud je zaškrtnuto toto políčko, jsou odeslané zprávy ukládány tak jak byly "
+"odeslány. Není to doporučováno, protože pokud vyprší potřebný certifikát, "
+"nebudete si je již moci přečíst.\n"
+"<p>\n"
+"Nicméně, mohou existovat interní směrnice, které budou tuto věc vyžadovat. "
+"Pokud si nejste jisti, konzultujte to s vaším administrátorem.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Přidat přílohu do zprávy, lze opakovat"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Vždy zobrazit ši&frovací klíče ke schválení"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Pouze zkontrolovat novou poštu"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Pokud je zapnuta tato volba, program vždy zobrazí seznam veřejných klíčů, ze "
+"kterých můžete vybrat klíč k zašifrování. Pokud je volba vypnuta, zobrazí se "
+"dialog pouze tehdy, pokud aplikace nemůže najít správný klíč nebo je "
+"možností několik."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Otevřít pouze okno editoru zpráv"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Auto&maticky šifrovat zprávy, pokud je to možné"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Zobrazit daný soubor se zprávou"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Pokud je zvolena tato možnost, bude každá zpráva, kterou odešlete, šifrována "
+"kdykoliv to bude žádoucí a možné. Samozřejmě je možné automatické šifrování, "
+"pro každou zprávu zvlášť, vypnout."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nikdy nepodepiso&vat/nešifrovat při ukládání konceptu"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Jak to funguje?"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Univerzální"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Odpovědět"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Odpovědět všem"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Předat dál"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Zk&ratka:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Typ šablony:"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Obsah šablony"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Zkratka šablony"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Typ šablony"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Vlastnosti složky"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Složka obsahuje poštovní &konferenci"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Adresa seznamu:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormální:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "N&epřečtené:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Zánik starých zpráv"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Zaniknou&t za:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Nechat zaniknout přečtené zp&rávy"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Zan&iknout za:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Nechat zanikno&ut nepřečtené zprávy"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "dnech"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "týdnech"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "měsících"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identita odesí&latele:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "For&mát uložení:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Seznam zobrazuje:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Při kontrole pošty odeslat zprávy ve frontě"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Odeslat zprávu na adresu ('address') resp. připojit soubor, kam ukazuje 'URL'"
+"<qt><p>Zvolte, zda chcete aby KMail odesílal odchozí zprávy při všech "
+"kontrolách pošty, při manuálních kontrolách pošty, nebo aby je automaticky "
+"neodesílal vůbec.</p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Přečteno"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Staré"
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>V této složce (%1) jsou nové zprávy, které ještě nebyly nahrány na "
+"server, ale zdá se, že nyní nemáte pro jejich nahrání dostatečná přístupová "
+"práva. Požádejte svého administrátora o patřičná práva nebo zprávy ze složky "
+"odstraňte.</p> <p>Chcete zprávy nyní přesunout do jiné složky?</p>"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Smazáno"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Odpovězeno"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Předané dál"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Naposledy zvolená složka v dialogu pro výběr složky."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Ve frontě"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Odesláno"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Pravidla zobrazování ikony v panelu"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Sledováno"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorováno"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Detailní oznámení o nové poště"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Pokud je tato volba povolena, je při oznámení nové pošty zobrazen počet "
+"nových zpráv v jednotlivých složkách. V opačném případě je zobrazeno pouze "
+"jednoduché hlášení 'Přišla nová pošta'."
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Zadejte e&ditor:"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Úkol"
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Používat e&xterní editor místo vestavěného"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Má přílohu"
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 z %2 %3 využito"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Povolit groupwarové funkce"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Cesta"
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Upravit hlavičky 'Od/Komu' v odpovědích na odpovědi"
 
-#: util.h:208
+#: kmail.kcfg:173
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Soubor s názvem \"%1\" již existuje. Opravdu jej chcete přepsat?"
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Implementace standardu iCalendar v aplikaci Microsoft Outlook je nedokonalá. "
+"Tato volba řeší jednu z chyb. Pokud uživatelé Outlooku nedostávají vaše "
+"odpovědi, povolte tuto volbu."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Přepsat soubor?"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Posílat groupwarové pozvánky v těle zprávy"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Implementace standardu iCalendar v aplikaci Microsoft Outlook je nedokonalá. "
+"Tato volba řeší jednu z chyb. Pokud uživatelé Outlooku nedostávají vaše "
+"pozvánky, povolte tuto volbu."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automatické posílání pozvánek"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Pokud je zapnuta tato volba, nezobrazuje se okno editoru zpráv, všechny "
+"pozvánky jsou odesílány automaticky. Pokud chcete zprávu před odesláním "
+"vidět, volbu vypněte. Text však musí zůstat v iCalendar formátu, a proto "
+"byste ho neměli ručně upravovat."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Zapnutí této volby umožňuje ukládat položky z Kontact modulů (KOrganizer, "
+"KAddressBook a KNotes.)</p><p>Pokud chcete zapnout, měli byste nastavit  "
+"také aplikace používající IMAP zdroje, což lze provést v Ovládacím centru "
+"TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Obvykle není žádný důvod zobrazovat složky obsahující IMAP zdroje. Pokud "
+"je však zobrazovat potřebujete, můžete tak nastavit zde.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Zvolte úložný formát groupware složek. <ul><li>Výchozím formátem je ical "
+"(pro kalendářové složky) a vcard (pro adresářové složky). Při použití těchto "
+"standardů jsou dostupné všechny funkce Kontactu.</li><li>Formát Kolab XML je "
+"bližší formátu používanému Outlookem. Při použití se serverem Kolab nebo "
+"kompatibilním tak lze dosáhnout lepší komaptibility s Outlookem.</li></ul></"
+"p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Zde se nastavuje rodič složek s IMAP zdroji.</p><p>Ve výchozím nastavení "
+"je to složka příchozí pošty.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Toto je ID účtu obsahujícího složky s IMAP zdroji.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Pokud chcete nastavit jména úložných IMAP složek do místníhojazyka, "
+"můžete si vybrat mezi těmito odstupnými jazyky.</p><p>Jediným důvodem k "
+"takovému nastavení je kompatibilita s Microsoft Outlookem. Jinak je to "
+"považováno za špatný nápad, neboť to znemožňuje přepínání jazyků.</"
+"p><p>Proto tuto volbu nezapínejte, pokud nemusíte.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Tato hodnota určuje, zda má být zobrazován Úvod do KMailu"
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maximální počet spojení na hostitele"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Toto lze použít k omezení počtu spojení na jeden počítač při kontrole nové "
+"pošty. Výchozí počet spojení je neomezený (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Zobrazovat políčko pro rychle hledání"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Tato volba povoluje či zakazuje zobrazení vyhledávací lišty nad seznamem "
+"zpráv. Lištu můžete používat pro vyhledávání zpráv v seznamu."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Ponechat výchozí znakovou sadu při odpovědi nebo přeposlání (pokud je to "
+"možné)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomaticky připojit podpis"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamatovat si tuto identitu, takže bude použita i v budoucích oknech "
+"editoru."
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Zapamatovat si tuto složku pro odeslané položky, takže bude použita i v "
+"budoucích oknech editoru."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Zapamatovat si tento přenos pošty, takže bude použit i v budoucích oknech "
+"editoru."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamatovat si tuto identitu, takže bude použita i v budoucích oknech "
+"editoru."
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Za&lamovat slova na sloupci:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Upozornění, pokud kořenový certi&fikát vyprší dřív než:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Zapněte tuto možnost, aby Outlook &#8482; pochopil názvy příloh obsahující "
+"neanglické znaky."
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Automaticky požadovat oznámení o &naložení"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Povolte tuto volbu, pokud chcete, aby KMail požadoval oznámení o "
+"naložení se zprávou (MDN) pro každou odchozí zprávu.</p><p>Tato volba určuje "
+"výchozí chování; stále můžete MDN povolit nebo zakázat individuálně pro "
+"každou zprávu v editoru nových zpráv volbou <em>Možnosti</em>-&gt;"
+"<em>Požadovat oznámení o naložení</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Používat nedávné adresy pro automatické doplňování"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Pokud nechcete, aby se při automatickém doplňování adres při psaní nové "
+"zprávy zobrazovaly nedávné adresy, zakažte tuto volbu."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Interval automatického ukládání:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Text v okně editoru lze pravidelně zálohovat. Zde se nastavuje časový "
+"interval mezi zálohami. Chcete-li automatické ukládání zakázat, nastavte zde "
+"0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Nahradit rozpoznaný prefi&x za \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Nahradit rozpoznaný prefix za \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Použít inteligentní citování"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Podpis vypršel."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Typ výběru adresáta"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Nastavuje typ dialogu pro výběr příjemců pro Komu,\n"
+"        CC a BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Typ editoru příjemců"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Nastavuje typ editoru příjemců pro Komu,\n"
+"        CC a BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maximální počet řádků příjemců v editoru."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Ponechat výchozí znakovou sadu při odpovědi nebo přeposlání (pokud je to "
+"možné)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Některé emaily, zejména automaticky vytvářené, neobsahují informaci o "
+"kódování znaků, která je potřebná ke správnému zobrazení. V takových "
+"případech se používá záložní kódování, které lze nastavit zde. Jako záložní "
+"kódování nastavte kódování, které je ve vašem okolí nejpoužívanější. Jako "
+"výchozí je použito kódování nastavené v celém systému."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Změna z výchozího 'Automaticky' vynutí používání zvoleného kódování pro "
+"všechny zprávy, bez ohledu na to, jaké kódování samy předepisují."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Tuto volbu povolte, pokud chcete textové smajlíky zobrazovat jako emotikony "
+"(malé obrázky)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"tuto volbu povolte, pokud chcete zobrazovat různé úrovně citovaného textu. V "
+"opačném případě ji zakažte."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatická úroveň svinutí"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Zmenšit velikost písma citovaného textu"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Tuto volbu povolte, pokud chcete zobrazovat citovaný text menším písmem."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Ukládat odeslané z&právy šifrovaně"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Zobrazovat uživatelský program v ozdobných hlavičkách"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Upozornění na naložení se zprávou odesílat s prázdným odesílatelem."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Upozornění na naložení se zprávou odesílat s prázdným řetězcem odesílatele. "
+"Některé servery mohou být nastaveny, aby takové zprávy odmítaly. Pokud proto "
+"máte s odesíláním upozornění na naložení se zprávou problémy, deaktivujte "
+"tuto volbu."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Šablona nové zprávy"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Šablona zprávy pro odpověď"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Šablona zprávy pro odpověď všem"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Šablona zprávy pro přeposlání"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Znak&y pro citaci"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Upravit soubor"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Upravit..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Pře&jít"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Sl&ožka"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Zpráva"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Odpovědět jinak"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Předat dál"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Obnovit nastavení písma"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Nástrojová lišta HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Obvyklé možnosti"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Nástrojová lišta HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validovat certifikáty pomocí CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Pokud je zvolena tato volba, jsou S/MIME certifikáty ověřovány pomocí "
+"seznamu zneplatněných certifikátů (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validovat certifikáty online (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Pokud je zvolena tato volba, jsou S/MIME certifikáty ověřovány online pomocí "
+"protokolu OCSP (Online Certificates Status Protocol) . Níže zadejte adresu "
+"OCSP responderu."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Online validace certifikátů"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL OCSP responderu:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Zde zadejte adresu serveru pro online ověřování certifikátů (OCSP "
+"responderu). Adresa obvykle začíná řetězcem http://"
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Podpis OCSP responderu:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorovat servisní URL certifikátů"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Nekontrolovat omezení certifikátů"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Standardně GnuPG používá soubor ~/.gnupg/policies.txt ke kontrole, zda je "
+"povoleno omezení certifikátů. Pokud je tato volba vybrána, omezení nejsou "
+"kontrolována."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nikdy se nedotazovat CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Pokud je tato volba zaškrtnuta, nejsou pro ověřování S/MIME certifikátů "
+"nikdy používány seznamy zneplatněných certifikátů (CRL)."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Získat chybějící certifikáty vydavatelů"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Pokud je zapnuta tato volba, jsou v případě potřeby staženy chybějící "
+"certifikáty vydavatelů (platí pro obě ověřovací metody - CRL i OCSP)."
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP dotazy"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Neprovádět žádné HTTP dotazy"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Zcela zakáže použití HTTP pro S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Použít tuto proxy pro HTTP dotazy:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Používat systémovou HTTP proxy:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Pokud je zvolena tato volba, je pro každý HTTP požadavek používána HTTP "
+"proxy uvedená vpravo (hodnota pochází z proměnné prostředí http_proxy)."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Zde zadejte umístění HTTP proxy, která se bude používat pro všechny HTTP "
+"požadavky spojené s S/MIME. Formát je počítač:port, například \"myproxy."
+"nowhere.com:3128\"."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorovat HTTP CRL distribuční bod certifikátů"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Při hledání CRL seznamů se obvykle používá tzv. CRL distribuční bod "
+"(DP)uvedený v testovaném certifikátu. Jedná se o URL pro přístup k seznamu. "
+"Používá se první nalezený distribuční bod. Je-li zapnuta tato volba, "
+"ignorují se všechny položky využívající HTTP protokol."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP požadavky"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Neprovádět žádné LDAP požadavky"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Zcela zakáže použití LDAP pro S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorovat LDAP CRL distribuční bod certifikátů"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Při hledání CRL seznamů se obvykle používá tzv. CRL distribuční bod "
+"(DP)uvedený v testovaném certifikátu. Jedná se o URL pro přístup k seznamu. "
+"Používá se první nalezený distribuční bod. Je-li zapnuta tato volba, "
+"ignorují se všechny položky využívající LDAP protokol."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primární hostitel LDAP požadavků:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Všechny LDAP požadavky budou nejprve směrovány na zde zadaný LDAP server. "
+"Přesněji, zdejší nastavení přepíše jakýkoliv počítač a port v LDAP URL a "
+"použije se také tehdy, pokud URL počítač a port neobsahuje. Další LDAP "
+"servery se použijí pouze tehdy, pokud spojení s \"proxy\" selže.\n"
+"Formát je \"počítač\" nebo \"počítač:port\". Pokud je port vynechán, použije "
+"se standardní port 389."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "Přid&at..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Obnovit nastavení písma"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "neomezené"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Odpovědět odesílateli"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Odpovědět všem / do konference"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Předat zprávu"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "&Upozornění před odesláním nepodepsaných zpráv"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Zvolte, pokud chcete být upozorněni při odesílání nepodepsaných zpráv."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění při pokusu o odeslání nepodepsané zprávy</h1>\n"
+"Pokud je toto políčko zaškrtnuté, budete upozorněni, pokud budete odesílat "
+"zprávu (nebo část zprávy), jež není podepsána.\n"
+"<p>\n"
+"Pro maximální bezpečnost je doporučeno ponechat tuto volbu zapnutou.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Upozornění před pokusem odeslat nešifrovanou zprávu"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Zvolte pro upozornění před pokusem odeslat nešifrovanou zprávu."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění při pokusu o odeslání nezašifrované zprávy</h1>\n"
+"Pokud je toto políčko zaškrtnuté, budete upozorněni, pokud budete odesílat "
+"zprávu (nebo část zprávy), jež není zašifrována.\n"
+"<p>\n"
+"Pro maximální bezpečnost je doporučeno ponechat tuto volbu zapnutou.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Upozo&rnit, pokud příjemcův email není v certifikátu"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Zvolte pro upozornění, pokud adresa není v certifikátu"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění, pokud není příjemcova adresa obsažena v certifikátu</h1>\n"
+"Pokud je vybrána tato možnost, je vydáno varování v případě, že adresa "
+"příjemce není obsažena v certifikátu, používaném pro šifrování.\n"
+"<p>\n"
+"Pro maximální bezpečnost je doporučeno mít tuto volbu zapnutou.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Upozornění, pokud CA certifikát brzy vyprší (detaily níže)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Pro podepisování"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Pro šifrování"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Zde vyberte počet dnů"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění při vypršení certifikátu podpisu</h1>\n"
+"Nastavení minimálního počtu dnů, po které bude certifikát podpisu považován "
+"za platný a nebudou generována upozornění.\n"
+"<p>\n"
+"Doporučená hodnota (SPHINX) je 14 dnů.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění, pokud vyprší certifikát pro šifrování</h1>\n"
+"Zadání minimálního počtu dnů po které bude certifikát platný bez vydání "
+"varování.\n"
+"<p>\n"
+"Doporučovaným nastavením ve SPHINX je 14 dnů.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění při vypršení certifikátu certifikační autority (CA)</h1>\n"
+"Nastavení minimálního počtu dnů, po které budou všechny certifikáty "
+"považovány za platné a nebudou generována upozornění.\n"
+"<p>\n"
+"Doporučená hodnota SPHINX je 14 dnů.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění při vypršení certifikátu certifikační autority (CA)</h1>\n"
+"Nastavení minimálního počtu dnů, po které bude CA certifikát považován za "
+"platný a nebudou generována upozornění.\n"
+"<p>\n"
+"Doporučená hodnota (SPHINX) je 14 dnů.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozornění při vypršení kořenového certifikátu</h1>\n"
+"Nastavení minimálního počtu dnů, po které bude kořenový certifikát považován "
+"za platný a nebudou generována upozornění.\n"
+"<p>\n"
+"Doporučená hodnota (SPHINX) je 14 dnů.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Pro kořenové certifikáty:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Pro certifikáty prostředníků:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Pro koncové certifikáty/klíče:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Reaktivovat všechna \"Znovu se neptat\" upozornění"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...že můžete přecházet na další nebo předchozí zprávu pomocí\n"
+"šipek vpravo resp. vlevo?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...že můžete rychle vytvářet filtry pro odesilatele, příjemce, \n"
+"předmět a poštovní konference pomocí <em>Nástroje->Vytvořit&nbsp;filtr</em>?"
+"</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...že se můžete zbavit položky &quot;[jména poštovní konference]&quot;,\n"
+"přidané do předmětu některých konferencí, za pomoci akce filtru \n"
+"<em>přepsat hlavičku</em>? Viz.\n"
+"<pre>přepsat hlavičku &quot;Subject&quot;\n"
+"   nahradit &quot;\\s*\\[jméno poštovní konference\\]\\s*&quot;\n"
+"   za &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...že můžete propojit poštovní konference se složkami v dialogu\n"
+"<em>Složka-&gt;Správa poštovní konference</em>? Pak můžete volbou\n"
+"<em>Zpráva-&gt;Nová zpráva do poštovní konference...</em> otevřít \n"
+"editor zprávy s přednastavenou adresou konference.\n"
+"Můžete také kliknout prostředním tlačítkem myši na složku.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...že můžete ke každé složce individuálně přidat volitelnou ikonu? "
+"Podívejte se do <em>Složka -&gt; Vlastnosti</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...že KMail může zobrazovat aktuálně viditelné zprávy tak, že budou\n"
+"barevně odlišeny podle typu (Prostý text/HTML/OpenPGP)?</p>\n"
+"<p>Takto lze zamezit pokusům o poslání falešných ověření podpisu pomocí\n"
+"zprávy v HTML, která napodobuje stavové rámy podpisu KMailu.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...že můžete odfiltrovat hlavičky pomocí jednoduchého zadání jejich "
+"jména\n"
+"v prvním editačním poli vyhledávacího pravidla?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...že můžete vyfiltrovat zprávy v HTML pomocí pravidla\n"
+"<pre>&quot;Content-type&quot; obsahuje &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...že při odpovídání je citována pouze část zprávy?</p>\n"
+"<p>Pokud není nic vybráno je citována celá zpráva.</p>\n"
+"<p>Tato událost pracuje pouze s přílohami, které vyberete v nabídce\n"
+"<em>Pohled-&gt;Přilohy-&gt;Vložené</em>.</p>\n"
+"<p>Tato volba je dostupná pro všechny příkazy odpovědi kromě\n"
+"<em>Zpráva-&gt;Odpovědět bez citace</em>.</p>\n"
+"<p align=\"right\"><em>přidal David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15411,16 +15011,20 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Implicitně podepsat všechny části zprávy</h1>\n"
-#~ "Pokud je zvolena tato možnost, všechny části zprávy (tj. tělo zprávy a všechny přílohy) jsou implicitně podepsány.\n"
+#~ "Pokud je zvolena tato možnost, všechny části zprávy (tj. tělo zprávy a "
+#~ "všechny přílohy) jsou implicitně podepsány.\n"
 #~ "<p>\n"
-#~ "Toto nastavení je implicitní, můžete jej ale změnit individuálně pro každou zprávu.\n"
+#~ "Toto nastavení je implicitní, můžete jej ale změnit individuálně pro "
+#~ "každou zprávu.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15432,12 +15036,16 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Dotázat se před podepsáním každé části</h1>\n"
-#~ "Pokud je zvolena tato možnost, budete dotázáni pro každou část zprávy (např. tělo zprávy a všechny přílohy) individuálně, zda ji chcete mít podepsánu.\n"
+#~ "Pokud je zvolena tato možnost, budete dotázáni pro každou část zprávy "
+#~ "(např. tělo zprávy a všechny přílohy) individuálně, zda ji chcete mít "
+#~ "podepsánu.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15451,14 +15059,16 @@ msgstr "Přepsat soubor?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Nešifrovat zprávy</h1>\n"
 #~ "Pokud je zvolena tato možnost, nebudou zprávy implicitně šifrovány.\n"
 #~ "<p>\n"
-#~ "Jedná se o implicitní nastavení, které můžete změnit individuálně pro každou zprávu.\n"
+#~ "Jedná se o implicitní nastavení, které můžete změnit individuálně pro "
+#~ "každou zprávu.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15470,20 +15080,34 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Šifrovací algoritmus</h1>\n"
-#~ "Algoritmus je vlastně předpis pro počítač, ve kterém je popsáno, jak provést nějaký úkol. Šifrovací algoritmus popisuje způsob, jakým počítač aplikuje váš klíč na zprávu tak, aby si ji mohl přečíst pouze vámi zamýšlený příjemce.\n"
+#~ "Algoritmus je vlastně předpis pro počítač, ve kterém je popsáno, jak "
+#~ "provést nějaký úkol. Šifrovací algoritmus popisuje způsob, jakým počítač "
+#~ "aplikuje váš klíč na zprávu tak, aby si ji mohl přečíst pouze vámi "
+#~ "zamýšlený příjemce.\n"
 #~ "<p>\n"
-#~ "Výběr spolehlivého šifrovacího algoritmu předurčuje, jak lehké nebo jak  obtížné je odposlechnout a číst zprávu. Nicméně všechny algoritmy, poskytované prostředím SPHINX, jsou považovány za velmi bezpečné. Obecně vzato, i implicitní nastavení bude pracovat velmi dobře.\n"
+#~ "Výběr spolehlivého šifrovacího algoritmu předurčuje, jak lehké nebo jak  "
+#~ "obtížné je odposlechnout a číst zprávu. Nicméně všechny algoritmy, "
+#~ "poskytované prostředím SPHINX, jsou považovány za velmi bezpečné. Obecně "
+#~ "vzato, i implicitní nastavení bude pracovat velmi dobře.\n"
 #~ "<p>\n"
-#~ "Toto nastavení je implicitní, můžete jej měnit individuálně pro každou zprávu.\n"
+#~ "Toto nastavení je implicitní, můžete jej měnit individuálně pro každou "
+#~ "zprávu.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15495,16 +15119,21 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kontrola certifikátu může skončit lokálně uloženým certifikátem</h1>\n"
-#~ "Pokud je zvolena tato možnost, kontrola řetězce certifikátů může skončit lokálně uloženým certifikátem.\n"
+#~ "Pokud je zvolena tato možnost, kontrola řetězce certifikátů může skončit "
+#~ "lokálně uloženým certifikátem.\n"
 #~ "<p>\n"
-#~ "Lokálně uložené certifikáty jsou vaše vlastní certifikáty, stejně tak jako certifikáty vašich partnerů a certifikačních autorit (CA).\n"
+#~ "Lokálně uložené certifikáty jsou vaše vlastní certifikáty, stejně tak "
+#~ "jako certifikáty vašich partnerů a certifikačních autorit (CA).\n"
 #~ "</qt>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15516,12 +15145,15 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vždy kontrolovat cestu certifikátu až ke kořenovému certifikátu</h1>\n"
-#~ "Pokud je zvolena tato možnost, cesta certifikátu, patřící k certifikátu příjemce bude vždy kontrolována až ke kořenovému certifikátu.\n"
+#~ "Pokud je zvolena tato možnost, cesta certifikátu, patřící k certifikátu "
+#~ "příjemce bude vždy kontrolována až ke kořenovému certifikátu.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15533,14 +15165,17 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kontrola cesty certifikátu</h1>\n"
-#~ "Pokud je zvolena tato možnost, je kontrolována celá cesta certifikátu příjemce až ke kořenovému certifikátu.\n"
+#~ "Pokud je zvolena tato možnost, je kontrolována celá cesta certifikátu "
+#~ "příjemce až ke kořenovému certifikátu.\n"
 #~ "<p>\n"
 #~ "Není možné vypnout kontrolu samotného certifikátu příjemce.\n"
 #~ "</qt>"
@@ -15554,16 +15189,26 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Používat seznamy zneplatněných certifikátů (CRL)</h1>\n"
-#~ "Seznam zneplatněných certifikátů obsahuje certifikáty, které byly zrušeny a už by neměly být používány pro účely šifrování. Uživatel si může nechat certifikát zneplatnit, pokud má obavu, že byl kompromitován (například se někdo dozvěděl jeho PIN).\n"
+#~ "Seznam zneplatněných certifikátů obsahuje certifikáty, které byly zrušeny "
+#~ "a už by neměly být používány pro účely šifrování. Uživatel si může nechat "
+#~ "certifikát zneplatnit, pokud má obavu, že byl kompromitován (například se "
+#~ "někdo dozvěděl jeho PIN).\n"
 #~ "<p>\n"
-#~ "Doporučujeme používat CRL pro maximální bezpečnost. V dialogu nastavení pro certifikáty a CRL můžete nastavit, odkud chcete stahovat CRL.\n"
+#~ "Doporučujeme používat CRL pro maximální bezpečnost. V dialogu nastavení "
+#~ "pro certifikáty a CRL můžete nastavit, odkud chcete stahovat CRL.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15575,12 +15220,14 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozornění pokud CRL vyprší v blízké budoucnosti</h1>\n"
-#~ "Pokud je toto políčko zaškrtnuté, budete varováni, pokud bude jeden z CRL seznamů, které používáte, blízko vypršení.\n"
+#~ "Pokud je toto políčko zaškrtnuté, budete varováni, pokud bude jeden z CRL "
+#~ "seznamů, které používáte, blízko vypršení.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15589,14 +15236,16 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozornění pokud CRL vyprší v blízké budoucnosti</h1>\n"
-#~ "V tomto poli můžete specifikovat jak dlouho před vypršením CRL budete varováni.\n"
+#~ "V tomto poli můžete specifikovat jak dlouho před vypršením CRL budete "
+#~ "varováni.\n"
 #~ "<p>\n"
 #~ "Doporučené nastavení v prostředí SPHINX je 7 dnů.\n"
 #~ "</qt>"
@@ -15605,21 +15254,27 @@ msgstr "Přepsat soubor?"
 #~ msgstr "Vždy šifrova&t pro sebe"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Zaškrtněte, pokud chcete mít šifrované zprávy šifrované i svým soukromým klíčem."
+#~ msgstr ""
+#~ "Zaškrtněte, pokud chcete mít šifrované zprávy šifrované i svým soukromým "
+#~ "klíčem."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vždy šifrovat pro sebe</h1>\n"
-#~ "Pokud je toto políčko zaškrtnuté, vámi zaslaná šifrovaná zpráva bude šifrována také vaším vlastním klíčem.\n"
+#~ "Pokud je toto políčko zaškrtnuté, vámi zaslaná šifrovaná zpráva bude "
+#~ "šifrována také vaším vlastním klíčem.\n"
 #~ "<p>\n"
-#~ "Doporučuje se ponechat tuto volbu zapnutou, abyste mohli číst zprávy, které  odešlete.\n"
+#~ "Doporučuje se ponechat tuto volbu zapnutou, abyste mohli číst zprávy, "
+#~ "které  odešlete.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15631,16 +15286,21 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozornění při vypršení certifikátu</h1>\n"
-#~ "Pokud je zvolena tato možnost, bude vydáno upozornění při pokusu použít certifikát pro podpis, který vyprší v zadaném počtu dnů.\n"
+#~ "Pokud je zvolena tato možnost, bude vydáno upozornění při pokusu použít "
+#~ "certifikát pro podpis, který vyprší v zadaném počtu dnů.\n"
 #~ "<p>\n"
-#~ "Je doporučeno ponechat tuto volbu zapnutou, aby se zabránilo používání certifikátů, kterým v blízké budoucnosti skončí platnost.\n"
+#~ "Je doporučeno ponechat tuto volbu zapnutou, aby se zabránilo používání "
+#~ "certifikátů, kterým v blízké budoucnosti skončí platnost.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15661,8 +15321,29 @@ msgstr "Přepsat soubor?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Zvolte, které certifikáty poslat"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Posílání certifikátů</h1>  Bez certifikátu není příjemce schopen poznat, zda jste to byl(a) opravdu vy, kdo mu poslal(a) zprávu nebo zda zpráva nebyla pozměněna třetí stranou. <p>  Příjemce může váš certifikát získat z centrálního serveru, ale také je možné váš certifikát přibalit ke zprávě. Je možno stanovit, zda nechcete certifikát přibalovat vůbec nebo zda přibalovat pouze váš vlastní certifikát či zda přibalovat celý řetězec certifikátů, který certifikuje váš vlastní certifikát. A to včetně nebo bez root certifikátu. <p>  Je doporučeno vždy přiložit ke zprávě alespoň váš vlastní certifikát. <p> Toto nastavení je implicitní, lze to ale změnit individuálně pro každou zprávu </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Posílání certifikátů</h1>  Bez certifikátu není příjemce schopen "
+#~ "poznat, zda jste to byl(a) opravdu vy, kdo mu poslal(a) zprávu nebo zda "
+#~ "zpráva nebyla pozměněna třetí stranou. <p>  Příjemce může váš certifikát "
+#~ "získat z centrálního serveru, ale také je možné váš certifikát přibalit "
+#~ "ke zprávě. Je možno stanovit, zda nechcete certifikát přibalovat vůbec "
+#~ "nebo zda přibalovat pouze váš vlastní certifikát či zda přibalovat celý "
+#~ "řetězec certifikátů, který certifikuje váš vlastní certifikát. A to "
+#~ "včetně nebo bez root certifikátu. <p>  Je doporučeno vždy přiložit ke "
+#~ "zprávě alespoň váš vlastní certifikát. <p> Toto nastavení je implicitní, "
+#~ "lze to ale změnit individuálně pro každou zprávu </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Poslat váš &vlastní certifikát"
@@ -15677,38 +15358,48 @@ msgstr "Přepsat soubor?"
 #~ msgstr "&Podepsat všechny části zprávy"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Zvolte, pokud chcete, aby všechny části zprávy byly implicitně podepsány"
+#~ msgstr ""
+#~ "Zvolte, pokud chcete, aby všechny části zprávy byly implicitně podepsány"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Implicitně podepsat všechny části zprávy</h1>\n"
-#~ "Pokud je zvolena tato možnost, všechny části zprávy (např. tělo zprávy a všechny přílohy) jsou implicitně podepsány.\n"
+#~ "Pokud je zvolena tato možnost, všechny části zprávy (např. tělo zprávy a "
+#~ "všechny přílohy) jsou implicitně podepsány.\n"
 #~ "<p>\n"
-#~ "Toto nastavení je implicitní, můžete jej ale změnit individuálně pro každou zprávu.\n"
+#~ "Toto nastavení je implicitní, můžete jej ale změnit individuálně pro "
+#~ "každou zprávu.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Dotázat se před podepsáním každé část&i"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Zvolte, pokud chcete být dotázáni, zda podepisovat jednotlivé části zprávy"
+#~ msgstr ""
+#~ "Zvolte, pokud chcete být dotázáni, zda podepisovat jednotlivé části zprávy"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Dotázat se před podepsáním každé části</h1>\n"
-#~ "Pokud je zvolena tato možnost, budete dotázáni pro každou část zprávy (např. tělo zprávy a všechny přílohy) individuálně, zda ji chcete mít podepsánu.\n"
+#~ "Pokud je zvolena tato možnost, budete dotázáni pro každou část zprávy "
+#~ "(např. tělo zprávy a všechny přílohy) individuálně, zda ji chcete mít "
+#~ "podepsánu.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15722,18 +15413,22 @@ msgstr "Přepsat soubor?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Nepodepisovat zprávy</h1>\n"
 #~ "Pokud je zvolena tato možnost, nebudou zprávy implicitně podepisovány.\n"
 #~ "<p>\n"
-#~ "Jedná se o implicitní nastavení, které můžete změnit individuálně pro každou zprávu.\n"
+#~ "Jedná se o implicitní nastavení, které můžete změnit individuálně pro "
+#~ "každou zprávu.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Podepisovací certifikát se nastavuje na stránce <em>Certifikáty</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Podepisovací certifikát se nastavuje na stránce <em>Certifikáty</em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15744,20 +15439,34 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmus podepisování</h1>\n"
-#~ "Algoritmus je postup pro počítač, ve kterém je popsáno, jak vykonat určitý úkol. Algoritmus podpisu popisuje, jakým způsobem počítač aplikuje váš podepisovací klíč na vaši zprávu, aby příjemce mohl ověřit, že zpráva je opravdu od vás.\n"
+#~ "Algoritmus je postup pro počítač, ve kterém je popsáno, jak vykonat "
+#~ "určitý úkol. Algoritmus podpisu popisuje, jakým způsobem počítač aplikuje "
+#~ "váš podepisovací klíč na vaši zprávu, aby příjemce mohl ověřit, že zpráva "
+#~ "je opravdu od vás.\n"
 #~ "<p>\n"
-#~ "Výběrem určitého algoritmu je dáno, jak je snadné nebo jak je obtížné zprávu padělat. Nicméně všechny algoritmy, poskytované v prostředí SPHINX jsou považovány za velmi bezpečné. I ten, který je nastaven implicitně, bude pracovat skvěle.\n"
+#~ "Výběrem určitého algoritmu je dáno, jak je snadné nebo jak je obtížné "
+#~ "zprávu padělat. Nicméně všechny algoritmy, poskytované v prostředí SPHINX "
+#~ "jsou považovány za velmi bezpečné. I ten, který je nastaven implicitně, "
+#~ "bude pracovat skvěle.\n"
 #~ "<p>\n"
-#~ "Toto nastavení je implicitní, lze to ale změnit individuálně pro každou zprávu.\n"
+#~ "Toto nastavení je implicitní, lze to ale změnit individuálně pro každou "
+#~ "zprávu.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15772,12 +15481,17 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ukládat zprávy s podpisy</h1>\n"
-#~ "Pokud je zaškrtnuta tato volba, jsou odeslané zprávy ukládány s podpisy, které na ně byly aplikovány. Je to doporučené, protože vám to umožní pozdější kontrolu, zda jste zprávu nebo nějakou její část opravdu podepsali.\n"
+#~ "Pokud je zaškrtnuta tato volba, jsou odeslané zprávy ukládány s podpisy, "
+#~ "které na ně byly aplikovány. Je to doporučené, protože vám to umožní "
+#~ "pozdější kontrolu, zda jste zprávu nebo nějakou její část opravdu "
+#~ "podepsali.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15792,12 +15506,18 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Oddělený podpis</h1>\n"
-#~ "Pokud je zvolena tato možnost, budou podepsaná data a podpis v různých (oddělených) částech zprávy Multipart/Signed. Podepsaná data zprávy budou čitelná i v poštovních klientech, které nepodporují podepisovací algoritmus a nepodporují dekódování ASN.1.\n"
+#~ "Pokud je zvolena tato možnost, budou podepsaná data a podpis v různých "
+#~ "(oddělených) částech zprávy Multipart/Signed. Podepsaná data zprávy budou "
+#~ "čitelná i v poštovních klientech, které nepodporují podepisovací "
+#~ "algoritmus a nepodporují dekódování ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15809,12 +15529,16 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Krytě podepsané zprávy</h1>\n"
-#~ "Pokud je vybrána tato možnost, jsou podpis i jím podepsaná data zakódovány do jednoho bloku ASN.1. Zprávy budou čitelné pouze poštovními programy, které podporují dekódování ASN.1\n"
+#~ "Pokud je vybrána tato možnost, jsou podpis i jím podepsaná data "
+#~ "zakódovány do jednoho bloku ASN.1. Zprávy budou čitelné pouze poštovními "
+#~ "programy, které podporují dekódování ASN.1\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15826,8 +15550,22 @@ msgstr "Přepsat soubor?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Nastavit, jak často musí být vkládán PIN"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Zadávání PIN</h1> Zde můžete nastavit, jak často je nutné pro přístup do vašeho osobního bezpečného prostředí (PSE) s vašimi certifikáty zadávat PIN. <p>Čím častěji je nutné PIN zadávat, tím jste lépe chráněni proti falšování vašich zpráv, ale tím méně pohodlná je práce. <p>Pokud si nejste jistí, co nastavit, ponechte volbu beze změny. <p>Z bezpečnostních důvodů není možné nutnost zadávání PIN vypnout úplně.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Zadávání PIN</h1> Zde můžete nastavit, jak často je nutné pro "
+#~ "přístup do vašeho osobního bezpečného prostředí (PSE) s vašimi "
+#~ "certifikáty zadávat PIN. <p>Čím častěji je nutné PIN zadávat, tím jste "
+#~ "lépe chráněni proti falšování vašich zpráv, ale tím méně pohodlná je "
+#~ "práce. <p>Pokud si nejste jistí, co nastavit, ponechte volbu beze změny. "
+#~ "<p>Z bezpečnostních důvodů není možné nutnost zadávání PIN vypnout úplně."
+#~ "</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Jednou za relaci"
@@ -15844,16 +15582,21 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozornění při vypršení certifikátu</h1>\n"
-#~ "Pokud je zvolena tato možnost, bude vydáno upozornění při pokusu použít certifikát pro podpis, který vyprší v zadaném počtu dnů.\n"
+#~ "Pokud je zvolena tato možnost, bude vydáno upozornění při pokusu použít "
+#~ "certifikát pro podpis, který vyprší v zadaném počtu dnů.\n"
 #~ "<p>\n"
-#~ "Je doporučeno ponechat tuto volbu zapnutou, aby se zabránilo používání certifikátů, kterým v blízké budoucnosti skončí platnost.\n"
+#~ "Je doporučeno ponechat tuto volbu zapnutou, aby se zabránilo používání "
+#~ "certifikátů, kterým v blízké budoucnosti skončí platnost.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15865,14 +15608,16 @@ msgstr "Přepsat soubor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozornění, pokud není příjemcova adresa obsažena v certifikátu</h1>\n"
-#~ "Pokud je vybrána tato možnost, je vydáno varování v případě, že adresa příjemce není obsažena v certifikátu, používaném pro šifrování.\n"
+#~ "Pokud je vybrána tato možnost, je vydáno varování v případě, že adresa "
+#~ "příjemce není obsažena v certifikátu, používaném pro šifrování.\n"
 #~ "<p>\n"
 #~ "Pro maximální bezpečnost je doporučeno mít tuto volbu zapnutou.\n"
 #~ "</qt>"
diff --git a/tde-i18n-cy/messages/tdepim/kmail.po b/tde-i18n-cy/messages/tdepim/kmail.po
index 701bf90c63f..d3e474bd2f6 100644
--- a/tde-i18n-cy/messages/tdepim/kmail.po
+++ b/tde-i18n-cy/messages/tdepim/kmail.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-02-25 13:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Kyfieithu: KD"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -174,6 +174,12 @@ msgstr "Di&m (cymerwch ofal)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Cyfrif i drin adnoddau yn hanner-ymysgogol"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Clirio Gorffenol"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -253,13 +259,13 @@ msgstr "&Mewngofnodi:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Mae eich Darparwr Gwasanaeth Rhyngrwyd (ISP) wedi rhoi <em>enw defnyddiwr</em> "
-"i chi er mwyn eich dilysu gyda'i gweinyddion. Fel arfer, rhan gyntaf eich "
-"cyfeiriad ebost (y rhan cyn y <em>@</em>) yw hwn."
+"Mae eich Darparwr Gwasanaeth Rhyngrwyd (ISP) wedi rhoi <em>enw defnyddiwr</"
+"em> i chi er mwyn eich dilysu gyda'i gweinyddion. Fel arfer, rhan gyntaf "
+"eich cyfeiriad ebost (y rhan cyn y <em>@</em>) yw hwn."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -282,12 +288,12 @@ msgstr "Cadw eich cyf&rinair POP yn y ffeil ffurfweddu"
 #, fuzzy
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Brithwch y dewisiad yma i wneud i KMail gadw'r cyfrinair SMTP yn ei ffeil "
 "ffurfweddiad.  Cedwir y cyfrinair mewn fformat drysedig, ond ni ddylir ei "
@@ -323,12 +329,13 @@ msgstr "Hidlo negeseuon os ydynt yn &fwy na"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Os dewisiwch y dewisiad yma, defnyddir hidlenni i benderfynu beth i'w wneud â'r "
-"negeseuon.  Wedyn, cewch ddewis i'w lawrlwytho, eu dileu, neu eu cadw ar y "
-"gweinydd."
+"Os dewisiwch y dewisiad yma, defnyddir hidlenni i benderfynu beth i'w wneud "
+"â'r negeseuon.  Wedyn, cewch ddewis i'w lawrlwytho, eu dileu, neu eu cadw ar "
+"y gweinydd."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -377,13 +384,15 @@ msgstr "Gwagu te&stun"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -429,9 +438,9 @@ msgstr "Amnewid:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -492,9 +501,9 @@ msgstr "Ll&wytho atodiadau pan mae angen"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -534,7 +543,7 @@ msgstr "<dim>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "blwch derbyn"
 
@@ -542,38 +551,39 @@ msgstr "blwch derbyn"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 #, fuzzy
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Noder y gall y nodwedd yma achosi i rai gweinyddion POP3 sydd ddim yn cynnal "
 "blaenbeipio anfon ebostiau llwgr.\n"
 " Gellir ffurfweddu hyn, gan fod rhai gweinyddion yn cynnal blaenbeipio, ond "
-"dydyn nhw ddim yn hysbysu eu galluoedd.  I wirio os hysbysa eich gweinydd POP3 "
-"gynhaliaeth blaenbeipio, defnyddiwch y botwm wrth waelod yr ymgom.\n"
+"dydyn nhw ddim yn hysbysu eu galluoedd.  I wirio os hysbysa eich gweinydd "
+"POP3 gynhaliaeth blaenbeipio, defnyddiwch y botwm wrth waelod yr ymgom.\n"
 " Os ni hysbysa eich gweinydd gynhaliaeth, ond rydych eisiau mwy o gyflymder, "
-"dylech chi wneud rhai arbrofion yn gyntaf gan anfon swp o ebostiau i'ch hunan "
-"a'u lawrlwytho."
+"dylech chi wneud rhai arbrofion yn gyntaf gan anfon swp o ebostiau i'ch "
+"hunan a'u lawrlwytho."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 #, fuzzy
@@ -582,23 +592,23 @@ msgstr "Penodwch raglen ebostio yn y gosodiadau."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -606,8 +616,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -690,11 +700,11 @@ msgstr "Ychwanegu Cyfrif"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Rhaid i chi ychwanegu cyfrif yn yr adran rhwydwaith y gosodiadau er mwyn derbyn "
-"ebost."
+"Rhaid i chi ychwanegu cyfrif yn yr adran rhwydwaith y gosodiadau er mwyn "
+"derbyn ebost."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -731,9 +741,9 @@ msgstr "Gwirydd Sillafu - KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -797,8 +807,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Gwybodaeth am y Gweinydd"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Dim"
@@ -936,17 +945,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -983,10 +991,9 @@ msgstr "&Symud Pob Neges i'r Sbwriel"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -997,8 +1004,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -1009,8 +1016,8 @@ msgstr "Symudwyd pob neges i'r sbwriel"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -1020,8 +1027,8 @@ msgstr "Nodi negeseuon dewisiedig fel wedi'u darllen"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1229,8 +1236,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1252,8 +1259,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1284,21 +1291,21 @@ msgstr "Wedi'u dileu"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, "
-"<br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
+"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> dewiswch "
+"pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, "
-"<br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
+"Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> dewiswch "
+"pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1327,18 +1334,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mae eich gweinyddwr wedi penderfynu ar y gosodiad yma.</p>"
-"<p>Os meddyliwch mai gwall yw hwn, cysylltwch â fo.</p></qt>"
+"<qt><p>Mae eich gweinyddwr wedi penderfynu ar y gosodiad yma.</p><p>Os "
+"meddyliwch mai gwall yw hwn, cysylltwch â fo.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Llwytho &Proffil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Ffurf&weddu..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Ychwanegu..."
@@ -1369,6 +1379,11 @@ msgstr "<qt>Ydych wir eisiau gwaredu'r dynodiad o'r enw <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "G&waredu"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "G&waredu"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ychwanegu..."
@@ -1377,6 +1392,11 @@ msgstr "Ychwanegu..."
 msgid "Modify..."
 msgstr "Addasu..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "G&waredu"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Gosod fel Rhagosod"
@@ -1393,17 +1413,15 @@ msgstr "&Anfon"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Cyfrifon allfynd (ychwanegwch o leiaf un):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Math\t"
@@ -1425,8 +1443,7 @@ msgstr "Gosod yn Ragosodyn"
 msgid "Common Options"
 msgstr "Dewisiadau Cyffredin"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Cadarnha&u cyn anfon"
@@ -1478,17 +1495,16 @@ msgstr "Parth &rhagosod:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir y parth rhagosod i gwblhau cyfeiriadau ebost sy'n cynnwys enw'r "
-"defnyddiwr yn unig.</p></qt>"
+"<qt><p>Defnyddir y parth rhagosod i gwblhau cyfeiriadau ebost sy'n cynnwys "
+"enw'r defnyddiwr yn unig.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1508,9 +1524,9 @@ msgstr "Ychwanegu Cludiant"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (rhagosod)"
 
@@ -1591,6 +1607,10 @@ msgstr "Addasu cyfrif"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Methu lleoli cyfrif<b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Lliwi&au"
@@ -1707,8 +1727,7 @@ msgstr "Cyswllt dilynedig"
 msgid "Misspelled Words"
 msgstr "Geiriau a gamsillafwyd"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Neges Newydd"
@@ -1916,8 +1935,8 @@ msgstr "R&hagosod yr edeifion yw ar gau "
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Agor edeifion sy'n cynnwys &negeseuon newydd, heb eu darllen, neu bwysig, ac "
 "agor edeifion a wylir arnynt."
@@ -1928,67 +1947,53 @@ msgstr "Ymddangosiad y Dyddiad"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Gellir defnyddio'r mynegiadau yma ar gyfer y dyddiad:</strong></p>"
-"<ul>"
-"<li>d - y diwrnod fel rhif heb sero arweiniol (1-31)</li>"
-"<li>dd -  y diwrnod fel rhif efo sero arweiniol (01-31)</li>"
-"<li>ddd - enw talfyredig y diwrnod (Llun - Sul)</li>"
-"<li>dddd - enw hir y diwrnod (Dydd Llun - Dydd Sul)</li>"
-"<li>M - y mis fel rhif heb sero arweiniol (1-12)</li>"
-"<li>MM - y mis fel rhif efo sero arweiniol (01-12)</li>"
-"<li>MMM - enw talfyredig y mis (Ion - Rhag)</li>"
-"<li>MMMM - enw hir y mis (Ionawr - Rhagfyr)</li>"
-"<li>yy - y flwyddyn fel rhif dau-ddigid (00-99)</li>"
-"<li>yyyy - y flwyddyn fel rhif pedwar-digid (0000-9999)</li></ul>"
-"<p><strong>Gellir defnyddio'r mynegiadau yma ar gyfer yr amser:</string></p> "
-"<ul>"
-"<li>h - yr awr heb sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li>"
-"<li>hh - yr awr efo sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li>"
-"<li>m -  y munudau heb sero arweiniol (0-59)</li>"
-"<li>mm - y munudau efo sero arweiniol (00-59)</li>"
-"<li>s - yr eiliadau heb sero arweiniol (0-59)</li>"
-"<li>ss - yr eiliadau efo sero arweiniol (00-59)</li>"
-"<li>z - y milieiliadau heb sero arweiniol (0-999)</li>"
-"<li>zzz - y milieiliadau efo sero arweiniol (000-999)</li>"
-"<li>AP - newid i ddangos YB/YP.  Amnewidir AP gan \"AM\" neu \"PM\".</li>"
-"<li>ap - newid i ddangos YB/YP.  Amnewidir ap gan \"am\" neu \"pm\".</li>"
-"<li>Z - amserfa mewn ffurf rhifol (-0500)</li></ul>"
-"<p><strong>Anwybyddir pob nod arall o fewnbwn.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Gellir defnyddio'r mynegiadau yma ar gyfer y dyddiad:</"
+"strong></p><ul><li>d - y diwrnod fel rhif heb sero arweiniol (1-31)</"
+"li><li>dd -  y diwrnod fel rhif efo sero arweiniol (01-31)</li><li>ddd - enw "
+"talfyredig y diwrnod (Llun - Sul)</li><li>dddd - enw hir y diwrnod (Dydd "
+"Llun - Dydd Sul)</li><li>M - y mis fel rhif heb sero arweiniol (1-12)</"
+"li><li>MM - y mis fel rhif efo sero arweiniol (01-12)</li><li>MMM - enw "
+"talfyredig y mis (Ion - Rhag)</li><li>MMMM - enw hir y mis (Ionawr - "
+"Rhagfyr)</li><li>yy - y flwyddyn fel rhif dau-ddigid (00-99)</li><li>yyyy - "
+"y flwyddyn fel rhif pedwar-digid (0000-9999)</li></ul><p><strong>Gellir "
+"defnyddio'r mynegiadau yma ar gyfer yr amser:</string></p> <ul><li>h - yr "
+"awr heb sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li><li>hh - yr "
+"awr efo sero arweiniol (0-23 neu 1-12 os yn dangos YB/YP)</li><li>m -  y "
+"munudau heb sero arweiniol (0-59)</li><li>mm - y munudau efo sero arweiniol "
+"(00-59)</li><li>s - yr eiliadau heb sero arweiniol (0-59)</li><li>ss - yr "
+"eiliadau efo sero arweiniol (00-59)</li><li>z - y milieiliadau heb sero "
+"arweiniol (0-999)</li><li>zzz - y milieiliadau efo sero arweiniol (000-999)</"
+"li><li>AP - newid i ddangos YB/YP.  Amnewidir AP gan \"AM\" neu \"PM\".</"
+"li><li>ap - newid i ddangos YB/YP.  Amnewidir ap gan \"am\" neu \"pm\".</"
+"li><li>Z - amserfa mewn ffurf rhifol (-0500)</li></ul><p><strong>Anwybyddir "
+"pob nod arall o fewnbwn.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Bydd newid y gosodiad edafu eang yn anwybyddu pob gwerth sy'n benodol i "
 "blygell."
@@ -2006,8 +2011,7 @@ msgstr "Dangos b&ar cyflwr HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -2016,8 +2020,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2045,8 +2048,7 @@ msgstr "Ymysgogol"
 msgid "&Override character encoding:"
 msgstr "Goso&d Amgodiad"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "hysbysiad cafn cysawd"
@@ -2153,22 +2155,19 @@ msgstr "Amnewidir <b>%f</b> efo'r enw ffeil i'w olygu."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Cynhelir y dalfannau dilynol yn yr ymadroddion ymateb: "
-"<br><b>%D</b>: dyddiad, <b>%S</b>: pwnc,  "
-"<br><b>%e</b>: cyfeiriad yr anfonwr, <b>%F</b>: enw'r anfonwr, <b>%f</b>"
-": blaenlythrennau'r anfonwr, "
-"<br><b>%T</b>: enw'r derbyniwr, <b>%t</b>: enw a chyfeiriad y derbyniwr "
-"<br><b>%C</b>: enwau'r copi carbon, <b>%c</b>: enwau a chyfeiriadau'r copi "
-"carbon "
-"<br><b>%%</b>: nod canran, <b>%_</b>: gofodnod, <b>%L</b>: llin-dorriad</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Cynhelir y dalfannau dilynol yn yr ymadroddion ymateb: <br><b>%D</b>: "
+"dyddiad, <b>%S</b>: pwnc,  <br><b>%e</b>: cyfeiriad yr anfonwr, <b>%F</b>: "
+"enw'r anfonwr, <b>%f</b>: blaenlythrennau'r anfonwr, <br><b>%T</b>: enw'r "
+"derbyniwr, <b>%t</b>: enw a chyfeiriad y derbyniwr <br><b>%C</b>: enwau'r "
+"copi carbon, <b>%c</b>: enwau a chyfeiriadau'r copi carbon <br><b>%%</b>: "
+"nod canran, <b>%_</b>: gofodnod, <b>%L</b>: llin-dorriad</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2191,21 +2190,20 @@ msgstr "Ateb i &bawb:"
 msgid "&Forward:"
 msgstr "B&laenyrru:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Dynodydd dyfynnod:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Ar %D, wnaethoch ysgrifennu:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Ar %D, ysgrifennodd %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Neges a Flaenyrrwyd"
 
@@ -2244,8 +2242,8 @@ msgstr "Mewnodosd rhagddodiad blaenyrriad newydd:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Gwirir y rhestr yma am bob un neges allfynd o'r pen i'r gwaelod ar gyfer set "
 "nodau sy'n cynnwys y nodau gorfodol i gyd."
@@ -2283,10 +2281,9 @@ msgstr "Gwerth"
 msgid "Ne&w"
 msgstr "Ne&wydd"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Enw:"
@@ -2295,8 +2292,7 @@ msgstr "&Enw:"
 msgid "&Value:"
 msgstr "&Gwerth:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
@@ -2304,8 +2300,8 @@ msgstr ""
 #: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
 "wahoddiadau"
@@ -2334,13 +2330,13 @@ msgstr "atodedig"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2368,115 +2364,102 @@ msgstr "Ategion &Cêl"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mae negeseuon weithiau yn dod yn y dau fformat.  Mae'r dewisiad yma yn "
-"rheoli a hoffech un ai'r rhan HTML neu'r rhan destun i'w dangos.</p>"
-"<p>Mae dangos y rhan HTML yn gwneud i'r neges edrych yn well, ond wrth yr un "
-"adeg mae'n cynyddu'r perygl y bydd tyllau diogelwch yn cael eu ymelwa.</p>"
-"<p>Mae dangos y rhan destun plaen yn colli y mwyafrif o fformatio'r neges, ond "
-"mae'n ei gwneud hi bron yn <em>amhosibl</em> i ymelwa tyllau diogelwch yn y "
-"llunydd HTML (Konqueror).</p>"
-"<p>Mae'r dewisiad isod yn amddiffyn yn erbyn un cam-ddefnydd cyffredin "
-"negeseuon HTML, ond mae'n methu amddiffyn yn erbyn problemau diogelwch nad "
-"adnabuwyd wrth yr adeg a ysgrifennwyd y fersiwn yma o KMail.</p>"
-"<p>Y peth callaf, felly, yw <em>peidio</em> â dewis HTML yn lle testun "
-"plaen.</p>"
-"<p><b>Noder:</b> Gallwch osod y dewisiad yma ar sail pob-plygell o'r ddewislen "
-"<i>Plygell</i> ym mhrif ffenestr KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Mae negeseuon weithiau yn dod yn y dau fformat.  Mae'r dewisiad yma "
+"yn rheoli a hoffech un ai'r rhan HTML neu'r rhan destun i'w dangos.</"
+"p><p>Mae dangos y rhan HTML yn gwneud i'r neges edrych yn well, ond wrth yr "
+"un adeg mae'n cynyddu'r perygl y bydd tyllau diogelwch yn cael eu ymelwa.</"
+"p><p>Mae dangos y rhan destun plaen yn colli y mwyafrif o fformatio'r neges, "
+"ond mae'n ei gwneud hi bron yn <em>amhosibl</em> i ymelwa tyllau diogelwch "
+"yn y llunydd HTML (Konqueror).</p><p>Mae'r dewisiad isod yn amddiffyn yn "
+"erbyn un cam-ddefnydd cyffredin negeseuon HTML, ond mae'n methu amddiffyn yn "
+"erbyn problemau diogelwch nad adnabuwyd wrth yr adeg a ysgrifennwyd y "
+"fersiwn yma o KMail.</p><p>Y peth callaf, felly, yw <em>peidio</em> â dewis "
+"HTML yn lle testun plaen.</p><p><b>Noder:</b> Gallwch osod y dewisiad yma ar "
+"sail pob-plygell o'r ddewislen <i>Plygell</i> ym mhrif ffenestr KMail.</p></"
+"qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mae rhai hysbysebion ebost yn HTML ac yn cynnwys cyfeiriadau i, er "
-"enghraifft, delweddau a ddefnyddir gan yr hysbysebwyr i gadarnhau eich bod chi "
-"wedi darllen eu negese (&quot;llau gwê&quot;).</p>"
-"<p>Does dim rheswm dilys i lanlwytho delweddau o'r Ryngrwyd fel hyn, oherwydd "
-"gall yr anfonwr o hyd atodi'r delweddau gofynnol yn uniongyrchol i'r neges.</p>"
-"<p>I amddiffyn yn erbyn cam-ddefnydd felly o'r nodwedd dangos HTML KMail, <em>"
-"analluogir</em> y dewisiad yma gan ragosod.</p>"
-"<p>Er hynny, os hoffech, er enghraifft, weld delweddau mewn neges HTML nad oedd "
-"wedi'u atodi iddi, gallwch alluogi'r dewisiad yma, ond dylech chi fod yn "
-"ymwybodol o'r problem posibl.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Mae rhai hysbysebion ebost yn HTML ac yn cynnwys cyfeiriadau i, er "
+"enghraifft, delweddau a ddefnyddir gan yr hysbysebwyr i gadarnhau eich bod "
+"chi wedi darllen eu negese (&quot;llau gwê&quot;).</p><p>Does dim rheswm "
+"dilys i lanlwytho delweddau o'r Ryngrwyd fel hyn, oherwydd gall yr anfonwr o "
+"hyd atodi'r delweddau gofynnol yn uniongyrchol i'r neges.</p><p>I amddiffyn "
+"yn erbyn cam-ddefnydd felly o'r nodwedd dangos HTML KMail, <em>analluogir</"
+"em> y dewisiad yma gan ragosod.</p><p>Er hynny, os hoffech, er enghraifft, "
+"weld delweddau mewn neges HTML nad oedd wedi'u atodi iddi, gallwch alluogi'r "
+"dewisiad yma, ond dylech chi fod yn ymwybodol o'r problem posibl.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Polisi Hysbysiad Lleoliad Neges</h3>"
-"<p>Mae MDNau (Message Disposition Notifications) yn cyffredinoliad o beth a "
-"gelwir yn arferol <b>derbynneb ddarllen</b>.  Mae awdur y neges yn gofyn am "
-"hysbysiad lleoliad i'w anfon, ac mae rhaglen ebost y derbyniwr yn creu ateb y "
-"gall yr awdur yn dysgu ohono be wnaeth ddigwydd i'w neges.  Mae mathau lleoliad "
-"cyffredin yn cynnwys <b>wedi'i dangos</b> (h.y. wedi'i darllen), <b>"
-"wedi'i dileu</b> a <b>wedi''i danfon</b> (h.y. wedi'i blaenyrru).</p>"
-"<p>Mae'r dewisiadau dilynnol ar gael i reoli y ffordd y mae KMail yn anfon "
-"MDNau:</p>"
-"<ul>"
-"<li><em>Anwybyddu</em>: Anwybyddu unrhyw cais ar gyfer hysbysiadau lleoliad "
-"neges.  Ni anfonir MDN byth yn ymysgogol (argymhellir).</li>"
-"<li><em>Gofyn</em>: Ateb ceisiadau ar ôl gofyn i'r defnyddiwr ar gyfer caniatâd "
-"yn unig.  Felly, gallwch anfon MDNau ar gyfer negeseuon penodol tra'n ei "
-"gwrthod neu eu anwybyddu ar gyfer eraill.</li>"
-"<li><em>Gwrthod</em>: Anfon hysbysiad <b>wedi'i gwrthod</b> "
-"o hyd.  Mae hyn yn unig <em>ychydig bach</em> yn well nag anfon MDNau o hyd.  "
-"Bydd yr awdur yn dal i wybod bod rhywun wedi gweithredu ar sail y neges, yr "
-"unig beth yw na all wybod a's darllenwyd neu ddileuwyd ayyb.</li>"
-"<li><em>Anfon o hyd</em>: Anfon yr hysbysiad lleoliad ceisiedig o hyd.  Golyga "
-"hyn bod awdur y neges yn cael gwybod pryd oedd rhywun yn gweithredu ar sail y "
-"neges ac, yn ychwanegol, beth a wnaeth ddigwydd iddi (wedi'i darllen, wedi'i "
-"dileu, ayyb).  Annogir i chi beidio â defnyddio'r dewisiad yma, ond darperir "
-"gan ei fod yn gwneud llawer o synnwyr ar gyfer e.e. rheoli'r berthynas efo "
-"cwsmeriaid.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Polisi Hysbysiad Lleoliad Neges</h3><p>Mae MDNau (Message "
+"Disposition Notifications) yn cyffredinoliad o beth a gelwir yn arferol "
+"<b>derbynneb ddarllen</b>.  Mae awdur y neges yn gofyn am hysbysiad lleoliad "
+"i'w anfon, ac mae rhaglen ebost y derbyniwr yn creu ateb y gall yr awdur yn "
+"dysgu ohono be wnaeth ddigwydd i'w neges.  Mae mathau lleoliad cyffredin yn "
+"cynnwys <b>wedi'i dangos</b> (h.y. wedi'i darllen), <b>wedi'i dileu</b> a "
+"<b>wedi''i danfon</b> (h.y. wedi'i blaenyrru).</p><p>Mae'r dewisiadau "
+"dilynnol ar gael i reoli y ffordd y mae KMail yn anfon MDNau:</"
+"p><ul><li><em>Anwybyddu</em>: Anwybyddu unrhyw cais ar gyfer hysbysiadau "
+"lleoliad neges.  Ni anfonir MDN byth yn ymysgogol (argymhellir).</"
+"li><li><em>Gofyn</em>: Ateb ceisiadau ar ôl gofyn i'r defnyddiwr ar gyfer "
+"caniatâd yn unig.  Felly, gallwch anfon MDNau ar gyfer negeseuon penodol "
+"tra'n ei gwrthod neu eu anwybyddu ar gyfer eraill.</li><li><em>Gwrthod</em>: "
+"Anfon hysbysiad <b>wedi'i gwrthod</b> o hyd.  Mae hyn yn unig <em>ychydig "
+"bach</em> yn well nag anfon MDNau o hyd.  Bydd yr awdur yn dal i wybod bod "
+"rhywun wedi gweithredu ar sail y neges, yr unig beth yw na all wybod a's "
+"darllenwyd neu ddileuwyd ayyb.</li><li><em>Anfon o hyd</em>: Anfon yr "
+"hysbysiad lleoliad ceisiedig o hyd.  Golyga hyn bod awdur y neges yn cael "
+"gwybod pryd oedd rhywun yn gweithredu ar sail y neges ac, yn ychwanegol, "
+"beth a wnaeth ddigwydd iddi (wedi'i darllen, wedi'i dileu, ayyb).  Annogir i "
+"chi beidio â defnyddio'r dewisiad yma, ond darperir gan ei fod yn gwneud "
+"llawer o synnwyr ar gyfer e.e. rheoli'r berthynas efo cwsmeriaid.</li></ul></"
+"qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2492,15 +2475,15 @@ msgstr "&Caniatáu i negeseuon lwytho cyfeirnodau allanol o'r Ryngrwyd"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>RHYBUDD:</b> Gall caniatáu HTML yn ebost gynyddu'r risg y bydd eich cysawd "
-"yn cael ei beryglu gan ymelwadau presennol a disgwyliedig.  <a "
-"href=\"whatsthis:%1\">Mwy am ebostau HTML...</a> <a href=\"whatsthis:%2\">"
-"Mwy am cyfeiriadau allanol...</a>"
+"<b>RHYBUDD:</b> Gall caniatáu HTML yn ebost gynyddu'r risg y bydd eich "
+"cysawd yn cael ei beryglu gan ymelwadau presennol a disgwyliedig.  <a href="
+"\"whatsthis:%1\">Mwy am ebostau HTML...</a> <a href=\"whatsthis:%2\">Mwy am "
+"cyfeiriadau allanol...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2579,14 +2562,14 @@ msgstr "Atodi llo&fnod yn ymysgogol"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Bydd newid y gosodiad HTML eang yn anwybyddu pob gwerth sy'n benodol i blygell."
+"Bydd newid y gosodiad HTML eang yn anwybyddu pob gwerth sy'n benodol i "
+"blygell."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2616,8 +2599,8 @@ msgstr ""
 #: configuredialog.cpp:4580
 #, fuzzy
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Wrth geisio canfod negeseuon nas darllenwyd:"
 
@@ -2642,8 +2625,8 @@ msgstr "Dolennu mewn Pob Plygell"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2715,27 +2698,23 @@ msgstr "Cyfeiriaduron (fformat \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Dewisa hwn pa fformat blwch ebost fydd y rhagosod ar gyfer plygyll lleol:</p>"
-"<p><b>mbox:</b> Cynrychiolir plygyll ebost KMail gan un ffeil bob un.  Gwahanir "
-"negeseuon unigol o'u gilydd gan linell sy'n dechrau efo \"From \".  Mae hyn yn "
-"cynilo lle ar y ddisg, ond gall fod yn llai gadarn, e.e. wrth symud negeseuon "
-"rhwng plygyll.</p>"
-"<p><b>maildir:</b> Cynrychiolir plygyll ebost KMail gan blygyll go iawn ar y "
-"ddisg.  Mae negeseuon unigol yn ffeiliau ar wahân.  Gall hyn golli tipyn o le "
-"ar y ddisg, ond dylai fod yn fwy gadarn, e.e. wrth symud negeseuon rhwng "
-"plygyll.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Dewisa hwn pa fformat blwch ebost fydd y rhagosod ar gyfer plygyll "
+"lleol:</p><p><b>mbox:</b> Cynrychiolir plygyll ebost KMail gan un ffeil bob "
+"un.  Gwahanir negeseuon unigol o'u gilydd gan linell sy'n dechrau efo \"From "
+"\".  Mae hyn yn cynilo lle ar y ddisg, ond gall fod yn llai gadarn, e.e. "
+"wrth symud negeseuon rhwng plygyll.</p><p><b>maildir:</b> Cynrychiolir "
+"plygyll ebost KMail gan blygyll go iawn ar y ddisg.  Mae negeseuon unigol yn "
+"ffeiliau ar wahân.  Gall hyn golli tipyn o le ar y ddisg, ond dylai fod yn "
+"fwy gadarn, e.e. wrth symud negeseuon rhwng plygyll.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2772,45 +2751,38 @@ msgstr ""
 #, fuzzy
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wrth neidio i'r neges nesaf heb ei darllen, gall ddigwydd nad oes mwy o "
-"negeseuon heb eu darllen dan y neges gyfredol.</p>"
-"<p><b>Peidio â dolennu:</b> Bydd y chwiliad yn aros wrth y neges olaf yn y "
-"blygell gyfredol.</p>"
-"<p><b>Dolennu yn y blygell gyfredol:</b> Bydd y chwiliad yn mynd ymlaen wrth "
-"ben y rhestr negeseuon, ond peidio â mynd ymlaen i blygell arall.</p>"
-"<p><b>Dolennu ym mhob plygell:</b> Bydd y chwiliad yn mynd ymlaen wrth ben y "
-"rhestr negeseuon.  Os ni chanfyddir negeseuon heb eu darllen bydd o'n mynd "
-"ymlaen wedyn i'r plygell nesaf.</p>"
-"<p>Yn yr un modd, wrth chwilio am y neges flaenorol heb ei darllen, bydd y "
-"chwiliad yn dechrau o waelod y rhestr negeseuon a mynd ymlaen i'r blygell "
-"flaenorol, yn dibynnu ar ba ddewisiad a ddewisir.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Wrth neidio i'r neges nesaf heb ei darllen, gall ddigwydd nad oes mwy "
+"o negeseuon heb eu darllen dan y neges gyfredol.</p><p><b>Peidio â dolennu:</"
+"b> Bydd y chwiliad yn aros wrth y neges olaf yn y blygell gyfredol.</"
+"p><p><b>Dolennu yn y blygell gyfredol:</b> Bydd y chwiliad yn mynd ymlaen "
+"wrth ben y rhestr negeseuon, ond peidio â mynd ymlaen i blygell arall.</"
+"p><p><b>Dolennu ym mhob plygell:</b> Bydd y chwiliad yn mynd ymlaen wrth ben "
+"y rhestr negeseuon.  Os ni chanfyddir negeseuon heb eu darllen bydd o'n mynd "
+"ymlaen wedyn i'r plygell nesaf.</p><p>Yn yr un modd, wrth chwilio am y neges "
+"flaenorol heb ei darllen, bydd y chwiliad yn dechrau o waelod y rhestr "
+"negeseuon a mynd ymlaen i'r blygell flaenorol, yn dibynnu ar ba ddewisiad a "
+"ddewisir.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2879,8 +2851,8 @@ msgstr "&Iaith ar gyfer plygyll cylchwedd:"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2890,8 +2862,8 @@ msgstr "Mae'r plygyll adnodd yn is-&blygyll o:"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2951,19 +2923,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2976,14 +2947,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -3095,17 +3066,16 @@ msgstr "&Blaenyrru"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3123,15 +3093,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3204,8 +3174,8 @@ msgstr "Golygu Dynodiad"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3466,6 +3436,11 @@ msgstr "Dewis Plygell"
 msgid "Filters"
 msgstr "Hidlo %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Dewis &Pob Neges"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3498,8 +3473,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3516,10 +3491,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3541,10 +3517,10 @@ msgstr "Diderfyn"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3553,7 +3529,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Gwall KMail"
@@ -3595,9 +3571,9 @@ msgstr "&Defnyddio Tystysgrif"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3649,8 +3625,8 @@ msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3661,8 +3637,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3688,8 +3663,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3719,7 +3694,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Dewis Plygell"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Plygyll Lleol"
@@ -3746,9 +3721,9 @@ msgstr "Rh&estr fer o blygyll"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3769,11 +3744,20 @@ msgstr "Didd&ymu"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Anhysbys"
@@ -3895,55 +3879,16 @@ msgstr "Cyflwr:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>N<br>e<br>g<br>e<br>s<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>D"
-"<br>i"
-"<br>m"
-"<br> "
-"<br>N"
-"<br>e"
-"<br>g"
-"<br>e"
-"<br>s"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>D<br>i<br>m<br> <br>N<br>e<br>g<br>e<br>s<br> <br>H<br>T<br>M<br>L</"
+"qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3956,19 +3901,13 @@ msgstr "&Eich enw:"
 #: identitydialog.cpp:123
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Eich enw</h3>"
-"<p>Dylai'r maes yma gynnwys eich enw, fel yr hoffech iddo ymddangos ym mhenawd "
-"yr ebost a anfonir.</p>"
-"<p>Os gadewch hwn yn wag, ni ddengys eich enw go iawn, ond cyfeiriad ebost yn "
-"unig.</p></qt>"
+"<qt><h3>Eich enw</h3><p>Dylai'r maes yma gynnwys eich enw, fel yr hoffech "
+"iddo ymddangos ym mhenawd yr ebost a anfonir.</p><p>Os gadewch hwn yn wag, "
+"ni ddengys eich enw go iawn, ond cyfeiriad ebost yn unig.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3976,17 +3915,13 @@ msgstr "Mu&diad:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Mudiad</h3>"
-"<p>Dylai'r maes yma gynnwys enw eich mudiad, os hoffech iddo ei ddangos ym "
-"mhenawd yr ebost a anfonir.</p>"
-"<p>Mae'n ddiogel (ac arferol) i adael hwn yn wag.</p></qt>"
+"<qt><h3>Mudiad</h3><p>Dylai'r maes yma gynnwys enw eich mudiad, os hoffech "
+"iddo ei ddangos ym mhenawd yr ebost a anfonir.</p><p>Mae'n ddiogel (ac "
+"arferol) i adael hwn yn wag.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3995,20 +3930,15 @@ msgstr "C&yfeiriad ebost:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Cyfeiriad ebost</h3>"
-"<p>Dylai'r maes yma gynnwys eich cyfeiriad ebost llawn.</p>"
-"<p>Os gadewch hwn yn wag, neu roi un anghywir, bydd pawb yn cael trafferth wrth "
-"ateb i chi.</p></qt>"
+"<qt><h3>Cyfeiriad ebost</h3><p>Dylai'r maes yma gynnwys eich cyfeiriad ebost "
+"llawn.</p><p>Os gadewch hwn yn wag, neu roi un anghywir, bydd pawb yn cael "
+"trafferth wrth ateb i chi.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4017,21 +3947,12 @@ msgstr "C&yfeiriad ebost:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4053,25 +3974,23 @@ msgstr "Eich Allwedd OpenPGP"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
-"wrth gêl-ysgrifennu i'ch hunan."
+"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon "
+"ac wrth gêl-ysgrifennu i'ch hunan."
 
 #: identitydialog.cpp:198
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:205
 #, fuzzy
@@ -4086,30 +4005,27 @@ msgstr "Eich Allwedd OpenPGP"
 #: identitydialog.cpp:218
 #, fuzzy
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
-"wrth gêl-ysgrifennu i'ch hunan."
+"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon "
+"ac wrth gêl-ysgrifennu i'ch hunan."
 
 #: identitydialog.cpp:223
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 #, fuzzy
@@ -4127,24 +4043,22 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
-"wrth gêl-ysgrifennu i'ch hunan."
+"Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon "
+"ac wrth gêl-ysgrifennu i'ch hunan."
 
 #: identitydialog.cpp:247
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:252
 #, fuzzy
@@ -4157,26 +4071,24 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-ysgrifo "
-"negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</p>"
-"Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau "
-"gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
-"Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Defnyddir yr allwedd PGP a ddewisir yma i lofnodi negeseuon ac i gêl-"
+"ysgrifo negeseuon i'ch hun.  Gallwch hefyd ddefnyddio alleddau GnuPG.</"
+"p>Gallwch adael hwn yn wag, ond ni fydd KMail yn gallu llofnodi ebostau gêl-"
+"ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>Gallwch "
+"ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:280
 #, fuzzy
@@ -4197,24 +4109,20 @@ msgstr "&Cyfeiriad Ateb-I:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Cyfeiriadau Ateb-I</h3>"
-"<p>Mae hwn yn gosod y penawd <tt>Ateb-i:</tt> i gynnwys cyfeiriad ebost "
-"gwahanol i'r cyfeiriad <tt>Oddiwrth:</tt> rferol.</p>"
-"<p>Gall hyn fod yn ddefnyddiol pan mae gennych cylch o bobl sy'n gweithio efo'u "
-"gilydd mewn ffyrdd tebyg.  Er enghraifft, efallai hoffech i ebostau a anfonir "
-"gael eich cyfeiriad yn y maes <tt>Oddiwrth:</tt>, ond i ymatebion fynd i "
-"gyfeiriad cylch.</p>"
-"<p>Os mewn amheuaeth, gadewch y maes yma'n wag.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Cyfeiriadau Ateb-I</h3><p>Mae hwn yn gosod y penawd <tt>Ateb-i:</tt> "
+"i gynnwys cyfeiriad ebost gwahanol i'r cyfeiriad <tt>Oddiwrth:</tt> rferol.</"
+"p><p>Gall hyn fod yn ddefnyddiol pan mae gennych cylch o bobl sy'n gweithio "
+"efo'u gilydd mewn ffyrdd tebyg.  Er enghraifft, efallai hoffech i ebostau a "
+"anfonir gael eich cyfeiriad yn y maes <tt>Oddiwrth:</tt>, ond i ymatebion "
+"fynd i gyfeiriad cylch.</p><p>Os mewn amheuaeth, gadewch y maes yma'n wag.</"
+"p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4223,23 +4131,18 @@ msgstr "Cyfeiriadau &BCC:"
 #: identitydialog.cpp:345
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Cyfeiriadau BCC (Blind Carbon Copy)</h3>"
-"<p>Ychwanegir y cyfeiriadau a fewnosodir yma i bob ebost allan a anfonir efo'r "
-"dynodiad yma.  Ni fyddant yn weladwy i dderbynwyr eraill. </p>"
-"<p>Defnyddir hyn yn gyffredin i anfon copi o bob neges anfonedig i gyfrif arall "
-"sy'n biau i chi.</p>"
-"<p>Os mewn amheuaeth, gadewch y maes yma'n wag.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Cyfeiriadau BCC (Blind Carbon Copy)</h3><p>Ychwanegir y cyfeiriadau "
+"a fewnosodir yma i bob ebost allan a anfonir efo'r dynodiad yma.  Ni fyddant "
+"yn weladwy i dderbynwyr eraill. </p><p>Defnyddir hyn yn gyffredin i anfon "
+"copi o bob neges anfonedig i gyfrif arall sy'n biau i chi.</p><p>Os mewn "
+"amheuaeth, gadewch y maes yma'n wag.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4279,7 +4182,7 @@ msgstr "&Llofnod"
 msgid "&Picture"
 msgstr "&Llun"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Cyfeiriad Ebost Annilys"
 
@@ -4298,8 +4201,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4345,8 +4248,8 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
-"(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
+"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn "
+"bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4354,13 +4257,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
-"(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
+"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn "
+"bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Rhagosod)"
 
@@ -4410,14 +4313,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4456,14 +4359,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Gwall: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4622,14 +4530,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4657,136 +4565,110 @@ msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4801,136 +4683,110 @@ msgstr "Dewin Tystygrif"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4944,9 +4800,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4974,26 +4831,26 @@ msgstr "Allwedd Lofnodi heb ei Diffinio"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5004,8 +4861,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5028,8 +4885,8 @@ msgstr "Defnyddio ar gyfer &Llofnodi"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -5048,15 +4905,13 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"<qt>"
-"<p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y neges "
-"yma.</p>"
-"<p>A ddylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
+"<qt><p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y "
+"neges yma.</p><p>A ddylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -5096,11 +4951,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -5148,10 +5003,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Gwall argyfyngus: Methu casglu ebost:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Methu ychwanegu'r neges:\n"
+msgid "Failed to add message:\n"
+msgstr "Methu ychwanegu'r neges:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5244,6 +5097,63 @@ msgstr "IMAP wedi'i Dda&d-gysylltu"
 msgid "&Maildir mailbox"
 msgstr "Blwch &ebost Maildir"
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "Gosd pwnc y neges."
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr "Anfon CC: i 'gyfeiriad'."
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "Anfon BCC: i 'gyfeiriad'."
+
+#: kmail_options.h:17
+#, fuzzy
+msgid "Add 'header' to message"
+msgstr "Ychwanegu 'penawd' i'r neges."
+
+#: kmail_options.h:18
+#, fuzzy
+msgid "Read message body from 'file'"
+msgstr "Darllen corff y neges o 'ffeil'."
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Gosod corff y neges."
+
+#: kmail_options.h:20
+#, fuzzy
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Ychwanegu atodiad i'r ebost.  Gellir ailadrodd hwn."
+
+#: kmail_options.h:21
+#, fuzzy
+msgid "Only check for new mail"
+msgstr "Ymofyn am ebost newydd yn unig."
+
+#: kmail_options.h:22
+#, fuzzy
+msgid "Only open composer window"
+msgstr "Agor ffenestr gyfansoddi yn unig."
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "Dan y c&warel neges"
+
+#: kmail_options.h:24
+#, fuzzy
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Anfon neges i bob un 'cyfeiriad', gan atodi'r ffeil y mae'r 'URL' yn ei "
+"benodi."
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Post"
@@ -5287,8 +5197,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel "
-"is-blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
+"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel is-"
+"blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
 "IMAP."
 
 #: kmailicalifaceimpl.cpp:1787
@@ -5302,12 +5212,12 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel "
-"is-blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
+"Bydd KMail rwan yn creu y plygyll gofynnol ar gyfer yr adnodd IMAP fel is-"
+"blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
 "IMAP."
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5358,11 +5268,11 @@ msgstr "Copiwyd yr URL i'r gludfwrdd."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Mae ffeil <b>%1</b> mewn bod.<br>Ydych eisiau ei amnewid?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Cadw i Ffeil"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Amnewid"
 
@@ -5380,7 +5290,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5402,11 +5312,11 @@ msgstr "nid yw'n cynnwys"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5416,112 +5326,112 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Dileu Negeseuon"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Symud neges %3 o %2 oddiwrth %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Dim digon o le gwag ar y ddisg?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Symud i'r Blygell Yma"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "Methwyd symud y negeseuon."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "Dileu Negeseuon"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Agor URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ydych wir eisiau gweithredu <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Gweithredu"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Ni chanfuwyd atodiadau i'w cadw."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Cadw Atodiad Fel..."
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "Mae ffeil o'r enw %1 mewn bod yn barod.  Ydych eisiau ysgrifennu drosto?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Ffeil yn Bodoli'n Barod"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"Mae'r rhan yma o'r neges wedi'i chêl-ysgrifo.  Ydych eisiau dal y "
-"cêl-ysgrifaeth wrth gadw?"
+"Mae'r rhan yma o'r neges wedi'i chêl-ysgrifo.  Ydych eisiau dal y cêl-"
+"ysgrifaeth wrth gadw?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Cwestiwn KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Cêl-ysgrifaeth"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Peidio â Chêl-ysg&rifo"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -5530,98 +5440,98 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i llofnodi.  Ydych eisiau dal y llofnod wrth "
 "gadw?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Llofnod"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Post"
@@ -5720,7 +5630,7 @@ msgstr "Maint"
 msgid "Encoding"
 msgstr "Amgodiad"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Compress"
 
@@ -5732,7 +5642,7 @@ msgstr "Cêl-ysgrifo"
 msgid "Sign"
 msgstr "Llofnodi"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "atodiad"
@@ -5756,7 +5666,8 @@ msgstr "<derbynwyr>"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5766,9 +5677,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5778,9 +5689,8 @@ msgstr "<derbynwyr>"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5792,7 +5702,7 @@ msgstr "&Anfon Ebost"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Anfon yn &Nes Ymlaen"
@@ -5864,8 +5774,7 @@ msgstr "G&waredu Nodau Dyfynnu"
 msgid "Cl&ean Spaces"
 msgstr "Glan&hau Gofodnodau"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Def&nyddio Wynebfath Penodol"
@@ -6010,31 +5919,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr "Cêl-ysgrifo pob rhan o'r neges yma?"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Safonol"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -6141,58 +6050,59 @@ msgstr "Cyfan&soddydd Newydd"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Ymddengys bod y neges yr ydych wedi cyfansoddi yn cyfeirio i ffeil atodiedig, "
-"ond nid ydych wedi atodi rhywbeth.\n"
+"Ymddengys bod y neges yr ydych wedi cyfansoddi yn cyfeirio i ffeil "
+"atodiedig, ond nid ydych wedi atodi rhywbeth.\n"
 "Ydych eisiau atodi ffeil i'ch neges?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Atgoffydd Atodiad Ffeil"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Anfon e"
 
 #: kmcomposewin.cpp:2415
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Methodd KMail adnabod lleoliad yr atodiad (%1).</p>"
-"<p>Rhaid i chi benodi'r llwybr llawn os hoffech atodi ffeil.</p></qt>"
+"<qt><p>Methodd KMail adnabod lleoliad yr atodiad (%1).</p><p>Rhaid i chi "
+"benodi'r llwybr llawn os hoffech atodi ffeil.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Atodi Ffeil"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Atodi"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Mewnosod Ffeil"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Mewnosod Ffeil"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -6233,21 +6143,36 @@ msgid ""
 "View"
 msgstr "Gweld"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Golygu..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Golygu..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Cad&w Fel..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Priodweddau"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -6256,273 +6181,269 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i llofnodi.  Ydych eisiau dal y llofnod wrth "
 "gadw?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Cadw"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Cadw Atodiad Fel..."
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "di-enw"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf ddiffinio'r "
-"allwedd OpenPGP a ddylir ei defnyddio ar gyfer hyn.</p>"
-"<p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad "
-"cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
+"<qt><p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf "
+"ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio ar gyfer hyn.</"
+"p><p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r "
+"dynodiad cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Allwedd Lofnodi heb ei Diffinio"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Rhaid i chi benodi o leiaf un derbyniwr yn y maes I:."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Dim Enw wedi'i Benodi"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ni Phenodwyd Pwnc"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "A&nfon e"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "&Na, Gadewch i Mi Benodi'r Pwnc"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Llofnodi/Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Cêl-ysgrifo'r Neges?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
-"(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
+"Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn "
+"bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Creuwch gyfrif ar gyfer anfon a ceisiwch eto."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Ar fin anfon ebost..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Anfon Cadarnhad"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Anfo&n Rwan"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Diddymwyd y gwirio sillafu."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Arhoswyd y gwiriad sillafu."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Gwiriad sillafu yn gyflawn."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Ni Chanfuwyd Tystysgrif"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Neges OpenPGP - wedi'i chelu"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Rhestr Negeseuon"
@@ -6572,8 +6493,8 @@ msgstr "Gwirydd Sillafu - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Ni ellid dechrau ISpell/Aspell.  Sicrhewch bod ISpell neu Aspell wedi ei "
 "ffurfweddu yn iawn, ac yn eich PATH."
@@ -6609,13 +6530,11 @@ msgstr "<qt>Gormod o weithredoedd hidlo yn y rheol hidlo <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Gweithred hidlo anhysbys <b>%1</b>"
-"<br>yn y rheol hidlo <b>%2</b>."
-"<br>Yn ei hanwybyddu.</qt>"
+"<qt>Gweithred hidlo anhysbys <b>%1</b><br>yn y rheol hidlo <b>%2</b>.<br>Yn "
+"ei hanwybyddu.</qt>"
 
 #: kmfilteraction.cpp:601
 #, fuzzy
@@ -6852,175 +6771,147 @@ msgstr "chwarae sŵm"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dyma'r rhestr o hidlau wedi'u rhagddiffinio.  Prosesir o ben i waelod.</p>"
-"<p>Cliciwch ar unrhyw hidlen i'w golygu gan ddefnyddio'r rheolyddion yn hanner "
-"dde yr ymgom.</p></qt>"
+"<qt><p>Dyma'r rhestr o hidlau wedi'u rhagddiffinio.  Prosesir o ben i waelod."
+"</p><p>Cliciwch ar unrhyw hidlen i'w golygu gan ddefnyddio'r rheolyddion yn "
+"hanner dde yr ymgom.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i greu hidlen newydd.</p>"
-"<p>Mewnosodir yr hidlen cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid "
-"hynny yn nes ymlaen.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm <em>Dileu</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i greu hidlen newydd.</p><p>Mewnosodir yr hidlen "
+"cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid hynny yn nes ymlaen.</"
+"p><p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud "
+"hyn gan glicio ar y botwm <em>Dileu</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i greu hidlen newydd.</p>"
-"<p>Mewnosodir yr hidlen cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid "
-"hynny yn nes ymlaen.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm <em>Dileu</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i greu hidlen newydd.</p><p>Mewnosodir yr hidlen "
+"cyn i'r un a ddewisir ar hyn o bryd, ond gallwch newid hynny yn nes ymlaen.</"
+"p><p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud "
+"hyn gan glicio ar y botwm <em>Dileu</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i <em>ddileu</em> yr hidlen a ddewisir ar hyn o bryd "
-"o'r rhestr uchod.</p>"
-"<p>Nid oes ffordd o gael yr hidlen yn ôl wedi'i dileu, ond gallwch gadael yr "
-"ymgom gan glicio <em>Diddymu</em> i daflu'r newidion a wnaed.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i <em>ddileu</em> yr hidlen a ddewisir ar hyn o "
+"bryd o'r rhestr uchod.</p><p>Nid oes ffordd o gael yr hidlen yn ôl wedi'i "
+"dileu, ond gallwch gadael yr ymgom gan glicio <em>Diddymu</em> i daflu'r "
+"newidion a wnaed.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i lawr</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i lawr</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i fyny</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Lawr</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i fyny</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Lawr</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i lawr</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i lawr</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un lle <em>"
-"i lawr</em> yn y rhestr uchod.</p>"
-"<p>Mae hyn yn ddefnyddiol, gan fod trefn yr hidlau yn effeithio'r trefn y maent "
-"yn dod i rym ar negeseuon.  Ceisir yr hidlen uchaf yn gyntaf.</p>"
-"<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
-"glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i symud yr hidlen a ddewisir ar hyn o bryd un "
+"lle <em>i lawr</em> yn y rhestr uchod.</p><p>Mae hyn yn ddefnyddiol, gan fod "
+"trefn yr hidlau yn effeithio'r trefn y maent yn dod i rym ar negeseuon.  "
+"Ceisir yr hidlen uchaf yn gyntaf.</p><p>Os ydych wedi clicio'r botwm yma "
+"wrth gamgymeriad, gallwch ddatwneud hyn gan glicio ar y botwm  <em>I Fyny</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliciwch y botwm yma i ailenwi'r hidlen a ddewisir ar hyn o bryd.</p>"
-"<p>Enwir hidlau yn ymysgogol, ond iddynt ddechrau efo \"<<\".</p>"
-"<p>Os ydych wedi ailenwi hidlen wrth ddamwain ac eisiau enwi ymysgogol yn ôl, "
-"cliciwch y botwm yma a dewiswch <em>Gwagu</em> ac wedyn <em>Iawn</em> "
-"yn yr ymgom a ymddengys.</p></qt>"
+"<qt><p>Cliciwch y botwm yma i ailenwi'r hidlen a ddewisir ar hyn o bryd.</"
+"p><p>Enwir hidlau yn ymysgogol, ond iddynt ddechrau efo \"<<\".</p><p>Os "
+"ydych wedi ailenwi hidlen wrth ddamwain ac eisiau enwi ymysgogol yn ôl, "
+"cliciwch y botwm yma a dewiswch <em>Gwagu</em> ac wedyn <em>Iawn</em> yn yr "
+"ymgom a ymddengys.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Brithwch yma i orfodi i'r ymgom gadarnhad ymddangos.</p>"
-"<p>Gall hyn fod yn ddefnyddiol os ydych wedi diffinio casgliad rheolau sy'n "
-"nodi negeseuon i'w lawrlwytho yn nes ymlaen.  Heb y bosibilrwydd o orfodi'r "
-"naidlen ymgom, ni ellir lawrlwytho'r negeseuon yma pe bai negeseuon mawr eraill "
-"yn aros ar y gweinydd, neu pe baech eisiau newid y casgliad rheolau i nodi'r "
-"negeseuon yn wahanol.</p></qt>"
+"<qt><p>Brithwch yma i orfodi i'r ymgom gadarnhad ymddangos.</p><p>Gall hyn "
+"fod yn ddefnyddiol os ydych wedi diffinio casgliad rheolau sy'n nodi "
+"negeseuon i'w lawrlwytho yn nes ymlaen.  Heb y bosibilrwydd o orfodi'r "
+"naidlen ymgom, ni ellir lawrlwytho'r negeseuon yma pe bai negeseuon mawr "
+"eraill yn aros ar y gweinydd, neu pe baech eisiau newid y casgliad rheolau i "
+"nodi'r negeseuon yn wahanol.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7030,6 +6921,16 @@ msgstr "Rheolau Hidlo POP3"
 msgid "Filter Rules"
 msgstr "Rheolau Hidlo"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Mewnforio"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Mewnforio"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Hidlau ar Gael"
@@ -7119,6 +7020,11 @@ msgstr "Ychwanegu'r hidlen yma i'r ddewislen Gweithredu Gweithredoedd Hidlo"
 msgid "Icon for this filter:"
 msgstr "eicon ar gyfer yr hidlen yma:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "I"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "I Fyny"
@@ -7127,16 +7033,29 @@ msgstr "I Fyny"
 msgid "Down"
 msgstr "I Lawr"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Ailenwi..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Newydd"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copïo I"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Wedi'u dileu"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7145,8 +7064,8 @@ msgstr "Rh&estr fer o blygyll"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7222,29 +7141,25 @@ msgstr "Cywiro y gelc IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Cywiro'r celc IMAP.</b></p>"
-"<p>Os oes gennych broblemau efo cydamseru plygell IMAP, dylech geisio "
-"ail-adeiladu'r ffeil mynegai yn gyntaf.  Bydd hwn yn cymryd ychydig o amser i "
-"ail-adeiladu, ond ni fydd yn achosi problemau.</p>"
-"<p>O nid yw hynny'n ddigonol, gallwch geisio ailfywio'r celc IMAP.  Os wnewch "
-"hyn, byddwch yn colli pob newidiad lleol ar gyfer y blygell yma a'i holl "
-"is-blygyll.</p>"
+"<p><b>Cywiro'r celc IMAP.</b></p><p>Os oes gennych broblemau efo cydamseru "
+"plygell IMAP, dylech geisio ail-adeiladu'r ffeil mynegai yn gyntaf.  Bydd "
+"hwn yn cymryd ychydig o amser i ail-adeiladu, ond ni fydd yn achosi "
+"problemau.</p><p>O nid yw hynny'n ddigonol, gallwch geisio ailfywio'r celc "
+"IMAP.  Os wnewch hyn, byddwch yn colli pob newidiad lleol ar gyfer y blygell "
+"yma a'i holl is-blygyll.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7281,8 +7196,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7304,8 +7219,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Ydych yn sicr yr hoffech ailfywio celc IMAP plygell %1, a'i holl is-blygyll?n "
-"Bydd hyn yn gwaredu pob newid a wnaethoch yn lleol i'ch plygyll."
+"Ydych yn sicr yr hoffech ailfywio celc IMAP plygell %1, a'i holl is-blygyll?"
+"n Bydd hyn yn gwaredu pob newid a wnaethoch yn lleol i'ch plygyll."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7322,8 +7237,8 @@ msgstr "Ailgreuwyd mynegai y blygell yma."
 #: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Nid yw plygell %1 mewn cyflwr cydamseru cychwynnol (%2 oedd y cyflwr). \n"
 "Ydych am ei ailosod i'r cyflwr cydamseru cychwynnol a cydamseru serch hynny?"
@@ -7459,10 +7374,8 @@ msgstr "Creu is-blygyll ar y gweinydd"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7484,9 +7397,8 @@ msgstr "Nôl rhestr plygyll"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7495,14 +7407,14 @@ msgstr "Terfynwyd"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7516,11 +7428,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7529,15 +7441,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "&Symud I"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -7551,8 +7468,7 @@ msgstr "Symud Neges i Blygell"
 msgid "Permissions (ACL)"
 msgstr "Caniatadau"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
@@ -7577,8 +7493,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Defnyddio &eiconau addasiedig"
@@ -7598,14 +7513,13 @@ msgstr "Ymofyn Ebost yn y Blygell yma"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7620,9 +7534,9 @@ msgstr "&Darfod hen negeseuon yn y blygell yma"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7634,17 +7548,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Colofn Faint"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Gosod yn Ragosodyn"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Anfonwr"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Derbyniwr"
@@ -7656,11 +7574,11 @@ msgstr "Dynodiad yr &Anfonwr:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7680,12 +7598,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7718,17 +7636,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7807,7 +7725,8 @@ msgstr "Gwall wrth lanlwytho'r plygell"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Mae'r mynegai ebost ar gyfer '%1' o fersiwn anhysbys KMail (%2).\n"
 "Gellir ailgreu'r mynegai o'ch plygell ebost, ond gall fod rhyw wybodaeth, yn "
@@ -7841,8 +7760,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:92
 #, fuzzy
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Gwall wrth agor %1.  Unai nid plygell maildir ddilys yw hon, neu nid oes "
 "gennych ganiatadau cyrchiad digonol."
@@ -7889,21 +7808,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ymddengys bod mynegai plygell '%2' wedi dyddio.  Er mwyn osgoi llygru "
+"<qt><p>Ymddengys bod mynegai plygell '%2' wedi dyddio.  Er mwyn osgoi llygru "
 "negeseuon, ail-greuir y mynegai.  Fel canlyniad, gall negeseuon a ddileuwyd "
-"ail-ymddangos a gall baneri cyflwr gael eu colli.</p>"
-"<p>Darllenwch y cofnod cyfatebol yn yr <a href=\"%1\">"
-"adran FAQ (Cwestiynau a Ofynnir yn Aml) o'r llawlyfr KMail</a> "
-"ar gyfer gwybodaeth am sut i atal i'r broblem yma ddigwydd eto.</p></qt>"
+"ail-ymddangos a gall baneri cyflwr gael eu colli.</p><p>Darllenwch y cofnod "
+"cyfatebol yn yr <a href=\"%1\">adran FAQ (Cwestiynau a Ofynnir yn Aml) o'r "
+"llawlyfr KMail</a> ar gyfer gwybodaeth am sut i atal i'r broblem yma "
+"ddigwydd eto.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7962,7 +7878,7 @@ msgstr ""
 "Ymddengys nad yw '%1' yn blygell.\n"
 "Symudwch y ffeil allan o'r ffordd."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 #, fuzzy
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
@@ -7971,7 +7887,7 @@ msgstr ""
 "Mae caniatadau plygell '%1' yn anghywir.\n"
 "Sicrhewch y gallwch ddarllen ac addasu cynnwys y blygell yma."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 #, fuzzy
 msgid ""
 "KMail could not create folder '%1';\n"
@@ -7982,8 +7898,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7991,7 +7907,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Methwyd creu plygell"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8095,9 +8011,9 @@ msgstr "&Cywiro Celc IMAP..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8243,13 +8159,13 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ydych wir eisiau dileu'r negeseuon dewisiedig?"
-"<br>Wedi'u dileu, ni ellir eu adfer!</qt>"
+"<qt>Ydych wir eisiau dileu'r negeseuon dewisiedig?<br>Wedi'u dileu, ni ellir "
+"eu adfer!</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8307,127 +8223,126 @@ msgstr ""
 "Methiant wrth addasu %1\n"
 "(Dim lle ar ôl ar y ddyfais?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Cais Llofnod Tystysgrif"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Llofnodwch y dystysgrif yma a'i dychwelyd i'r anfonwr."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch derbyn."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "blwch anfon"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch anfon."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "ebostau anfonedig"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch anfonedig."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "sbwriel"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "drafftiau"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell drafftiau."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Amnewid"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Chwiliad Diwethaf"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8437,11 +8352,11 @@ msgstr ""
 "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan.\n"
 "Y gwall oedd:n %1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
@@ -8522,8 +8437,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -8561,8 +8475,8 @@ msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Ydych wir eisiau symud pob neges o blygell <b>%1</b> i'r sbwriel?</qt>"
 
@@ -8590,12 +8504,12 @@ msgstr "<derbynwyr>"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Ydych wir eisiau dileu'r blygell chwilio <b>%1</b>"
-"?  Ni ddileuir y negeseuon a ddangosir ynddi os gwnewch, oherwydd cedwir mewn "
-"plygell wahanol.</qt>"
+"<qt>Ydych wir eisiau dileu'r blygell chwilio <b>%1</b>?  Ni ddileuir y "
+"negeseuon a ddangosir ynddi os gwnewch, oherwydd cedwir mewn plygell wahanol."
+"</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8608,36 +8522,39 @@ msgstr "<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b> "
-"a;i holl is-blygyll?  Mae'n bosibl nad ydy'r is-blygyll yna yn wag, a bydd eu "
-"cynnwys yn cael eu gwaredu hefyd.</qt>"
+"<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b> a;i holl is-blygyll?  "
+"Mae'n bosibl nad ydy'r is-blygyll yna yn wag, a bydd eu cynnwys yn cael eu "
+"gwaredu hefyd.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Ydych wir eisiau dileu'r blygell <b>%1</b>, gan daflu ei chynnwys?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ydych wir eisiau dileu'r blygell <b>%1</b> a'i holl is-blygyll, gan daflu "
-"ei chynnwys?</qt>"
+"<qt>Ydych wir eisiau dileu'r blygell <b>%1</b> a'i holl is-blygyll, gan "
+"daflu ei chynnwys?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Wedi'u dileu"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8653,13 +8570,13 @@ msgstr "Ydych wir eisiau darfod pob hen neges?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach\" "
-"a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol a "
-"disgwyliedig eraill."
+"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach"
+"\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol "
+"a disgwyliedig eraill."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8673,12 +8590,12 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach\" "
-"a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol a "
-"disgwyliedig eraill."
+"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan \"ebostach"
+"\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol "
+"a disgwyliedig eraill."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8694,12 +8611,12 @@ msgstr "Hidlo ar Restr Ebost %1 ..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Mae swyddogaeth Ateb pan Allan o'r Swyddfa KMail yn dibynnu ar hidlo ar ochr y "
-"gweinydd.  Nid ydych wedi ffurfweddu gweinydd IMAP eto ar gyfer hyn.\n"
+"Mae swyddogaeth Ateb pan Allan o'r Swyddfa KMail yn dibynnu ar hidlo ar ochr "
+"y gweinydd.  Nid ydych wedi ffurfweddu gweinydd IMAP eto ar gyfer hyn.\n"
 "Gallwch wneud hyn ar dab \"Hidlo\" y ffurfweddiad cyfrif IMAP."
 
 #: kmmainwidget.cpp:1743
@@ -8716,7 +8633,8 @@ msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 
 #: kmmainwidget.cpp:2508
@@ -9062,8 +8980,7 @@ msgstr "Cadw A&todiadau..."
 msgid "Appl&y All Filters"
 msgstr "Gweithred&u Hidlau"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Gweithred&u Hidlau"
@@ -9177,7 +9094,6 @@ msgstr "Neges Nesaf &Heb ei Darllen"
 msgid "Go to the next unread message"
 msgstr "Mynd i'r neges nesaf heb ei darllen"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Neges &Blaenorol"
@@ -9321,72 +9237,72 @@ msgstr "Ymgychwyn..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad.\n"
-"Mae'n cynnwys cyfarwyddiad prosesu a nodwyd fel \"gofynnol\", ond sy'n anhysbys "
-"i KMail.\n"
+"Mae'n cynnwys cyfarwyddiad prosesu a nodwyd fel \"gofynnol\", ond sy'n "
+"anhysbys i KMail.\n"
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"methiant\"."
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad,\n"
 "ond ceisir anfon yr hysbysiad i fwy nag un cyfeiriad.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad,\n"
 "ond ni osodir llwybr dychwelyd.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mae'r neges hon yn cynnwys cais i anfon hysbysiad lleoliad,\n"
-"ond mae'r cyfeiriad llwybr-dywchelyd yn wahanol i'r cyfeiriad y ceisir anfon yr "
-"hysbysiad iddo.\n"
-"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
-"neu arferol."
+"ond mae'r cyfeiriad llwybr-dywchelyd yn wahanol i'r cyfeiriad y ceisir anfon "
+"yr hysbysiad iddo.\n"
+"Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd"
+"\" neu arferol."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9405,24 +9321,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Ni wnaeth y penawd \"Dewisiadau-Hysbysiad-Lleoliad\" gynnwys paramedr gofynnol, "
-"ond anhysbys"
+"Ni wnaeth y penawd \"Dewisiadau-Hysbysiad-Lleoliad\" gynnwys paramedr "
+"gofynnol, ond anhysbys"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Derbynneb:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Atodiad: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Dangos atodiadau fel yr awgrymir gan yr anfonwr."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 #, fuzzy
 msgid "The attachment '%1' has been deleted."
 msgstr "Diddymwyd y digwyddiad %1"
@@ -9474,47 +9390,41 @@ msgstr "Priodweddau Darnau'r Neges"
 #: kmmsgpartdlg.cpp:88
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Math MIME</em> y ffeil.</p>"
-"<p>Fel arfer, nid oes angen i chi cyffwrdd â'r gosodiad yma, gan wirir math y "
-"ffeil yn ymysgogol.  Ond weithiau, efallai ni fydd %1 yn darganfod y math yn "
-"gywir.  Dyma lle y gallwch drwsio hynny.</p></qt>"
+"<qt><p><em>Math MIME</em> y ffeil.</p><p>Fel arfer, nid oes angen i chi "
+"cyffwrdd â'r gosodiad yma, gan wirir math y ffeil yn ymysgogol.  Ond "
+"weithiau, efallai ni fydd %1 yn darganfod y math yn gywir.  Dyma lle y "
+"gallwch drwsio hynny.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Maint y rhan.</p>"
-"<p>Weithiau, bydd %1 yn rhoi maint amcangyfrifol yn unig yma, oherwydd buasai "
-"cyfrifo y maint cywir yn cymryd gormod o amser.  Os felly, gwneir hyn yn "
-"weledol gan ychwanegu  \"(est.)\" i'r maint a ddangosir.</p></qt>"
+"<qt><p>Maint y rhan.</p><p>Weithiau, bydd %1 yn rhoi maint amcangyfrifol yn "
+"unig yma, oherwydd buasai cyfrifo y maint cywir yn cymryd gormod o amser.  "
+"Os felly, gwneir hyn yn weledol gan ychwanegu  \"(est.)\" i'r maint a "
+"ddangosir.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Enw ffeil y rhan.</p>"
-"<p>Er bod y rhagosod yma yw'r ffeil atodedig, nid yw'n penodi'r ffeil i'w "
-"atodi.  Yn lle, mae'n awgrymu enw ffeil i'w ddefnyddio gan ddibynnydd ebost y "
-"derbyniwr wrth gadw'r rhan i'r ddisg.</p></qt>"
+"<qt><p>Enw ffeil y rhan.</p><p>Er bod y rhagosod yma yw'r ffeil atodedig, "
+"nid yw'n penodi'r ffeil i'w atodi.  Yn lle, mae'n awgrymu enw ffeil i'w "
+"ddefnyddio gan ddibynnydd ebost y derbyniwr wrth gadw'r rhan i'r ddisg.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9523,17 +9433,15 @@ msgstr "&Disgrifiad:"
 #: kmmsgpartdlg.cpp:128
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Disgrifiad y rhan.</p>"
-"<p>Disgrifiad gwybodaethol y rhan yw hwn, yn debyg iawn i Bwnc amr gyfer yr "
-"holl neges.  Bydd y mwyafrif o ddibynnyddion ebost yn dangos y wybodaeth yma yn "
-"eu rhagolygon neges, wrth ymyl eicon yr atodiad.</p></qt>"
+"<qt><p>Disgrifiad y rhan.</p><p>Disgrifiad gwybodaethol y rhan yw hwn, yn "
+"debyg iawn i Bwnc amr gyfer yr holl neges.  Bydd y mwyafrif o ddibynnyddion "
+"ebost yn dangos y wybodaeth yma yn eu rhagolygon neges, wrth ymyl eicon yr "
+"atodiad.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9542,23 +9450,21 @@ msgstr "&Amgodiad:"
 #: kmmsgpartdlg.cpp:143
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Amgodiad cludiant y rhan yma.</p>"
-"<p>Fel arfer, nid oes angen newid hyn, oherwydd bydd %1 yn defnyddio amgodiad "
-"rhagosod synhwyrol, yn dibynnu ar y math MIME.  Ond weithiau gallwch leihau "
-"maint y neges ganlynol yn arwyddocaol, e.e. os nid yw ffeil PostScript yn "
-"cynnwys data deuol, ond testun pur yn unig.  Os felly, bydd dewis "
-"\"argraffadwy-dyfynedig\" yn lle'r \"bas64\" rhagosod yn cynilo i fyny at 25% "
-"ym maint canlynol y neges.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Amgodiad cludiant y rhan yma.</p><p>Fel arfer, nid oes angen newid "
+"hyn, oherwydd bydd %1 yn defnyddio amgodiad rhagosod synhwyrol, yn dibynnu "
+"ar y math MIME.  Ond weithiau gallwch leihau maint y neges ganlynol yn "
+"arwyddocaol, e.e. os nid yw ffeil PostScript yn cynnwys data deuol, ond "
+"testun pur yn unig.  Os felly, bydd dewis \"argraffadwy-dyfynedig\" yn lle'r "
+"\"bas64\" rhagosod yn cynilo i fyny at 25% ym maint canlynol y neges.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9567,20 +9473,17 @@ msgstr "Awgrymu dangosydd &ymysgogol"
 #: kmmsgpartdlg.cpp:159
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Brithwch y dewisiad yma os hoffech awgrymu i'r derbyniwr y dylir dangos y "
-"rhan yma yn ymysgogol (mewnlin) yn y rhagolwg neges, yn lle'r golwg eicon "
-"rhagosod.</p>"
-"<p>Yn dechnegol, gwneir hyn gan osod maes penawd <em>Lleoliad-Cynnwys</em> "
-"i \"fewnlin\" yn lle'r  \"atodiad\" rhagosod.</p></qt>"
+"<qt><p>Brithwch y dewisiad yma os hoffech awgrymu i'r derbyniwr y dylir "
+"dangos y rhan yma yn ymysgogol (mewnlin) yn y rhagolwg neges, yn lle'r golwg "
+"eicon rhagosod.</p><p>Yn dechnegol, gwneir hyn gan osod maes penawd "
+"<em>Lleoliad-Cynnwys</em> i \"fewnlin\" yn lle'r  \"atodiad\" rhagosod.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9589,15 +9492,13 @@ msgstr "&Llofnodi'r rhan yma"
 #: kmmsgpartdlg.cpp:171
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Britwch y dewisiad yma os hoffech i'r rhan neges yma gael ei llofnodi.</p>"
-"<p>Gwneir y llofnod efo'r allwedd yr ydych wedi cysylltu efo'r dynodiad a "
-"ddewisir ar hyn o bryd.</p></qt>"
+"<qt><p>Britwch y dewisiad yma os hoffech i'r rhan neges yma gael ei llofnodi."
+"</p><p>Gwneir y llofnod efo'r allwedd yr ydych wedi cysylltu efo'r dynodiad "
+"a ddewisir ar hyn o bryd.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9606,14 +9507,11 @@ msgstr "Cêl-y&sgrifo'r rhan yma"
 #: kmmsgpartdlg.cpp:181
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Brithwch y dewisiad yma os hoffech i'r rhan neges yma i gael ei "
-"chêl-ysgrifo.</p>"
-"<p>Cêl-ysgrifir y rhan ar gyfer derbynwyr y neges.</p></qt>"
+"<qt><p>Brithwch y dewisiad yma os hoffech i'r rhan neges yma i gael ei chêl-"
+"ysgrifo.</p><p>Cêl-ysgrifir y rhan ar gyfer derbynwyr y neges.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9628,16 +9526,13 @@ msgstr "Hidlenni POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Negeseuon i'w hidlo a ganfuwyd ar y Cyfrif POP: <b>%1</b>"
-"<p>Mae'r negeseuon a ddangosir yma yn fwy na'r terfyn maint uchaf a ddiffinwyd "
-"ar gyfer y cyfrif yma."
-"<br>Gallwch ddewis beth i wneud efo nhw gan fritho'r botwm addas."
+"Negeseuon i'w hidlo a ganfuwyd ar y Cyfrif POP: <b>%1</b><p>Mae'r negeseuon "
+"a ddangosir yma yn fwy na'r terfyn maint uchaf a ddiffinwyd ar gyfer y "
+"cyfrif yma.<br>Gallwch ddewis beth i wneud efo nhw gan fritho'r botwm addas."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9894,15 +9789,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9912,18 +9806,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9931,15 +9824,13 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2>Croeso i KMail %1</h2>"
-"<p>Y dibynnydd ebost ar gyfer yr Amgylchedd Penbwrdd K yw KMail.  Dylunir i fod "
-"yn hollol gyfaddas â safonau ebostio y Rhyngrwyd, yn cynnwys MIME, SMTP, POP3 "
-"ac IMAP.</p>\n"
-"<ul>"
-"<li>Mae gan KMail lawer o nodweddion grymus a ddisgrifir yn y <a href=\"%2\">"
-"ddogfennaeth</a></li>\n"
-"<li>Mae'r <a href=\"%3\">dudalen gartref KMail</a> yn cynnig gwybodaeth ynglyn "
-"â fersiynau newydd o KMail</li></ul>\n"
+"<h2>Croeso i KMail %1</h2><p>Y dibynnydd ebost ar gyfer yr Amgylchedd "
+"Penbwrdd K yw KMail.  Dylunir i fod yn hollol gyfaddas â safonau ebostio y "
+"Rhyngrwyd, yn cynnwys MIME, SMTP, POP3 ac IMAP.</p>\n"
+"<ul><li>Mae gan KMail lawer o nodweddion grymus a ddisgrifir yn y <a href="
+"\"%2\">ddogfennaeth</a></li>\n"
+"<li>Mae'r <a href=\"%3\">dudalen gartref KMail</a> yn cynnig gwybodaeth "
+"ynglyn â fersiynau newydd o KMail</li></ul>\n"
 "<p><span style='font-size:125%; font-weight:bold;'>Newidiadau pwysig</span> "
 "(i gymharu â KMail %8):</p>\n"
 "<ul>\n"
@@ -9954,22 +9845,20 @@ msgstr ""
 "<p>&nbsp; &nbsp; Y Tîm KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Arhoswch am eiliad i lenwi'r panel ffurfweddiad KMail wrth "
-"Gosodiadau-&gt;Ffurfweddu KMail.\n"
-"Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a chyfrif "
-"ebost anfon.</p>\n"
+"<p>Arhoswch am eiliad i lenwi'r panel ffurfweddiad KMail wrth Gosodiadau-&gt;"
+"Ffurfweddu KMail.\n"
+"Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a "
+"chyfrif ebost anfon.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10007,7 +9896,8 @@ msgstr "Gweld Atodiad: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Mae'r atodiad yn cynnwys data deuol.  Ceisio dangos y nod cyntaf.]\n"
@@ -10037,12 +9927,14 @@ msgstr "Agor Atodiad?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10066,6 +9958,59 @@ msgstr "Cyd&weddu ag unrhyw un o'r dilynnol"
 msgid "(match all of the following)"
 msgstr "Cy&dweddu â pob un o'r dilynnol"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Darllen"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Hen"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Wedi'u dileu"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Wedi'u ateb"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Wedi'u blaenyrru"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Mewn Ciw"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Anfonwyd"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Wedi'u gwylio"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Anwybyddwyd"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Ebostach"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ebost iawn"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "I:"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Efo Atodiad"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10150,21 +10095,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Methodd symud y neges a anfonwyd \"%1\" o'r \"blwch anfon\" i'r blygell \"ebost "
-"a anfonwyd\".\n"
+"Methodd symud y neges a anfonwyd \"%1\" o'r \"blwch anfon\" i'r blygell "
+"\"ebost a anfonwyd\".\n"
 "Rhesymau posibl: diffyg lle ar y ddisg, neu ganiatad ysgrifennu.  Ceisiwch "
 "trwsio'r broblem a symud y neges â llaw."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -10191,8 +10136,8 @@ msgstr "Ymgychwyn y broses anfon..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10217,8 +10162,9 @@ msgstr "Methodd anfon (rhai) negeseuon yn y rhes."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10235,20 +10181,16 @@ msgstr "Erthylwyd anfon/"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Methwyd anfon:</p>"
-"<p>%1</p>"
-"<p>Bydd y neges yn aros yn y blygell 'blwch anfon' tan i chi drwsio'r broblem "
-"(e.e. cyferiad wedi'i dorri) neu symud y neges o'r blygell 'blwch anfon'.</p>"
-"<p>Defnyddwyd y protocol cludiant dilynnol: %2</p>"
-"<p>Ydych eisiau i mi ddal i anfon gweddill y negeseuon?</p> "
+"<p>Methwyd anfon:</p><p>%1</p><p>Bydd y neges yn aros yn y blygell 'blwch "
+"anfon' tan i chi drwsio'r broblem (e.e. cyferiad wedi'i dorri) neu symud y "
+"neges o'r blygell 'blwch anfon'.</p><p>Defnyddwyd y protocol cludiant "
+"dilynnol: %2</p><p>Ydych eisiau i mi ddal i anfon gweddill y negeseuon?</p> "
 
 #: kmsender.cpp:730
 #, fuzzy
@@ -10269,8 +10211,9 @@ msgstr "&Erthylu anfon"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10314,34 +10257,35 @@ msgstr "Terfynodd Sendmail yn anarferol."
 #, fuzzy
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Rhaid i chi ddarparu defnydd-enw a chyfrinair i ddefnyddio'r gweinydd SMTP yma."
+"Rhaid i chi ddarparu defnydd-enw a chyfrinair i ddefnyddio'r gweinydd SMTP "
+"yma."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -10353,6 +10297,10 @@ msgstr "Dechrau %1"
 msgid "Exit"
 msgstr "Terfynu"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -10382,8 +10330,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Brithwch y dewisiad yma i wneud i KMail gadw'r cyfrinair SMTP yn ei ffeil "
@@ -10460,8 +10409,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Gorchymyn i'w redeg yn lleol, cyn anfon ebost.  Gellir defnyddio hwn i sefydlu "
-"twnelau ssh, er enghraifft.  Gadewch yn wag os ni ddylir rhedeg gorchymyn."
+"Gorchymyn i'w redeg yn lleol, cyn anfon ebost.  Gellir defnyddio hwn i "
+"sefydlu twnelau ssh, er enghraifft.  Gadewch yn wag os ni ddylir rhedeg "
+"gorchymyn."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10469,8 +10419,8 @@ msgstr "Mae angen &dilysiant ar y gweinydd."
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Brithwch y dewisiad yma os mae angen ar eich gweinydd dilysiant cyn derbyn "
 "ebost.  Gelwir hyn yn 'SMTP wedi'i Ddilysu' (ASMTP, Authenticated SMTP)."
@@ -10496,15 +10446,14 @@ msgstr "A&nfon enw gwesteiwr addasiedig i'r gweinydd"
 #: kmtransport.cpp:478
 #, fuzzy
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Brithwch y dewisiad yma i wneud i KMail ddefnyddio enw gwesteiwr addasiedig "
-"wrth ddynodi ei hun i'r gweinydd ebost."
-"<p>Mae hyn yn ddefnyddiol pan nid yw enw gwesteiwr eich cysawd wedi'i osod yn "
-"gywir, neu i guddio enw gwesteiwr go iawn eich cysawd."
+"wrth ddynodi ei hun i'r gweinydd ebost.<p>Mae hyn yn ddefnyddiol pan nid yw "
+"enw gwesteiwr eich cysawd wedi'i osod yn gywir, neu i guddio enw gwesteiwr "
+"go iawn eich cysawd."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10537,8 +10486,8 @@ msgstr "Caniateir ffeiliau lleol yn unig."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Enw parth neu gyfeiriad rhifiadol y gweinydd SMTP."
 
 #: kmtransport.cpp:788
@@ -10553,10 +10502,10 @@ msgstr "Gwall wrth lanlwytho'r plygell"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10791,35 +10740,27 @@ msgstr "G&olygu Neges"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ni ellid prosesu gwybodaeth adeiledd a ddychwelwyd gan y ategyn Celu; "
-"efallai mae'r ategyn wedi cael niwed.</p>"
-"<p>Cyswlltwch â gweinyddwr eich cysawd.</p></qt>"
+"<qt><p>Ni ellid prosesu gwybodaeth adeiledd a ddychwelwyd gan y ategyn Celu; "
+"efallai mae'r ategyn wedi cael niwed.</p><p>Cyswlltwch â gweinyddwr eich "
+"cysawd.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Ni chanfuwyd Ategyn Celu gweithredol, a ni redodd y côd mewnadeiladedig yn "
-"llwyddiannus.</p>"
-"<p>Gallwch wneud dau beth i newid hyn:</p>"
-"<ul>"
-"<li><em>unai</em> gweithredu Ategyn gan ddefnyddio yr ymgom Gosodiadau->"
-"Ffurfweddu KMail->Ategyn.</li>"
-"<li><em>neu</em> benodi gosodiadau OpenPGP traddodiadol ar dab Dynodiad->"
-"Uwch yr un un ymgom.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Ni chanfuwyd Ategyn Celu gweithredol, a ni redodd y côd mewnadeiladedig "
+"yn llwyddiannus.</p><p>Gallwch wneud dau beth i newid hyn:</"
+"p><ul><li><em>unai</em> gweithredu Ategyn gan ddefnyddio yr ymgom Gosodiadau-"
+">Ffurfweddu KMail->Ategyn.</li><li><em>neu</em> benodi gosodiadau OpenPGP "
+"traddodiadol ar dab Dynodiad->Uwch yr un un ymgom.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10831,8 +10772,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10847,14 +10788,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10953,8 +10894,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10981,9 +10922,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"<qt>"
-"<p>Gwrthdaro yn yr hoffterau cêl-ysgrifo!</p>"
-"<p>Dylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
+"<qt><p>Gwrthdaro yn yr hoffterau cêl-ysgrifo!</p><p>Dylai'r neges yma gael "
+"ei chêl-ysgrifo?</p></qt>"
 
 #: messagecomposer.cpp:909
 #, fuzzy
@@ -10992,8 +10932,9 @@ msgstr "Peidio â Chêl-ysg&rifo"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -11003,8 +10944,8 @@ msgstr "Anfon heb ei Gêl-ysgrifo?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -11025,80 +10966,75 @@ msgstr "Cêl-ys&grifo Pob Darn"
 msgid "Unencrypted Message Warning"
 msgstr "Neges wedi'i chêl-ysgrifo"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Gwall: Ni dychwelodd yr Ategyn Celu '%1' ddata wedi'i amgodio.</p> "
-"<p>Rhowch adroddiad ynglyn â'r nam yma:"
-"<br>%2</p></qt>"
+"<qt><p>Gwall: Ni dychwelodd yr Ategyn Celu '%1' ddata wedi'i amgodio.</p> "
+"<p>Rhowch adroddiad ynglyn â'r nam yma:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Ni ffitia pob nod i mewn i'r amgodiad a ddewiswyd."
-"<br>"
-"<br>Anfon y neges beth bynnag?</qt>"
+"<qt>Ni ffitia pob nod i mewn i'r amgodiad a ddewiswyd.<br><br>Anfon y neges "
+"beth bynnag?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Bydd rhai nodau yn cael eu colli"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Lose Characters"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Goso&d Amgodiad"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -11120,10 +11056,10 @@ msgstr "&Fformat Blwch Ebost"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11134,8 +11070,8 @@ msgstr "Eiconau Plygell"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11180,8 +11116,7 @@ msgstr "Canlyniadau gwahanol ar gyfer y llofnodion"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Ni ddychwelodd y peiriant celu ddata testun clir!"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Cyflwr:"
 
@@ -11211,8 +11146,8 @@ msgstr "Ni chanfuwyd rhaglennig %1."
 #: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Llofnodir y neges, ond ni ellir gwirio dilysrwydd y llofnod.<br />Rheswm: %1"
 
@@ -11253,27 +11188,27 @@ msgstr "Ni all y rhaglennig celu \"%1\" ddatgelu negeseuon."
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y côd "
-"crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
-"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a "
-"href=\"kmail:showHTML\">gan glicio yma</a>."
+"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y "
+"côd crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
+"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a href=\"kmail:"
+"showHTML\">gan glicio yma</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y côd "
-"crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
-"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a "
-"href=\"kmail:showHTML\">gan glicio yma</a>."
+"<b>Noder:</b> Neges HTML yw hon.  Ar gyfer rhesymau diogelwch, dangosir y "
+"côd crai un unig. Os ymddiriedir anfonwr y neges yma, gallwch weithredu "
+"ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a href=\"kmail:"
+"showHTML\">gan glicio yma</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11523,8 +11458,8 @@ msgstr "cedwyd:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Ni chedwir cyfeiriad ebost yn y %1 a ddefnyddir ar gyfer llofnodi, felly ni "
 "ellir ei gymharu â chyfeiriad yr anfonwr %2."
@@ -11646,14 +11581,15 @@ msgstr "Neges Wall Kioslave"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Ni chynhela eich gweinydd POP3 y gorchymyn UIDL.  Mae angen y gorchymyn yma i "
-"benodi, mewn ffordd dibynnadwy, pa ebostau ar y gweinydd sydd wedi eu gweld o'r "
-"blaen gan KMail. \n"
+"Ni chynhela eich gweinydd POP3 y gorchymyn UIDL.  Mae angen y gorchymyn yma "
+"i benodi, mewn ffordd dibynnadwy, pa ebostau ar y gweinydd sydd wedi eu "
+"gweld o'r blaen gan KMail. \n"
 "Ni weithia'r nodwedd i adael ebostau ar y gweinydd yn iawn felly."
 
 #: popaccount.cpp:752
@@ -11671,7 +11607,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Nôl neges %1 o %2 (%3 o %4 KB) oddiwrth %5 (mae %6 KB yn aros ar y gweinydd)."
 
@@ -11691,1729 +11628,14 @@ msgstr "Ymateb Annilys o'r Gweinydd"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Ni chynhelir y gorchymyn TOP gan eich gweinydd.  Felly ni ellir nôl penawdau "
 "ebostau mawr, cyn eu lawrlwytho."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Mynd"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "P&lygell"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Neges"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "B&laenyrru"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "Llofnodi"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "L&lofnodi negeseuon yn ymysgogol gan ddefnyddio OpenPGP"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, llofnodir gan ragosod pob neges yr anfonwch.  "
-"Wrth gwrs, mae o hyd yn bosibl analluogi llofnodi ar gyfer pob neges yn "
-"unigol.</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Cêl-ysgrifaeth"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Dangos testun llofnodedig/cêl-ysgrifedig wedi cyfansoddi"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Brithwch i gadw negeseuon wedi'u cêl-ysgrifo"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Cadw Negeseuon yn Gêl-ysgrifedig</h1>\n"
-"Pan frithwch y blwch yma, cedwir negeseuon a anfonwyd fel y's anfonwyd, sef, yn "
-"gêl-ysgrifedig.  Ni argymhellir hyn oherwydd ni fyddwch yn gallu darllen y "
-"negeseuon mwyach os darfodir tystysgrif ofynnol.\n"
-"<p>\n"
-"Serch hynny, gall fod rheolau lleol sy'n eich gorfod troi'r dewisiad yma "
-"arnodd.  Mewn amheuaeth, gwiriwch efo'ch gweinyddwr lleol.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Dangos yr allweddau &cêl-ysgrifo ar gyfer cymeradwydo o hyd"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Cêl-ysgrifennu negeseuon yn ymysgogol lle &bo'n bosibl."
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, celir pob neges yr anfonwch pan mae "
-"cêl-ysgrifaeth yn bosibl a dymunol.  Wrth gwrs, mae o hyd yn bosibl analluogi'r "
-"cêl-ysgrifaeth ymysgogol ar gyfer pob neges yn unigol.</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, no-c-format
-msgid "To:"
-msgstr "I:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC:"
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Cyffredinol"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Ateb I"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Ateb i &Bawb..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "B&laenyrru"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Byrlwybr:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Amnewid"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Priodweddau Plygell"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Mae'r &blygell yn cynnwys rhestr ebost"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "C&yfeiriad y rhestr:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Ar&ferol:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Heb eu darllen:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Neges yn Darfod"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Dar&fod ar ôl:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "&Darfod negeseuon darlleniedig"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Darfod ar ô&l:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Darfod negeseuon &heb eu darllen"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Diwrnod(au)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Wythnos(au)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mis(oedd)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Uwch"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "Dynodiad yr &Anfonwr:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "Fformat &Cadw:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "&Ymddangosiad y Rhestri:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Creu Tystysgrif"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Llofnod dilys"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "&Peidio ac anfon tystysgrifau"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Wrth ychwanegu tystysgrifau"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Ychwanegu..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Cylchwedd"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Dynodiadau &sy'n bodoli:"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "Diderfyn"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Ffurfweddu Llofnod"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Ate&b i'r anfonwr:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Ateb i &Bawb..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Neges a Flaenyrrwyd"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Rhybuddio wrth geisio anfon negeseuon &heb eu llofnodi"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Brithwch i gael eich rhybuddio wrth anfon negeseuon heb eu llofnodi."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu llofnodi</h1>\n"
-"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
-"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
-"<p>\n"
-"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Brithwch i gael eich rhybuddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo</h1>\n"
-"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
-"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
-"<p>\n"
-"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Rhybuddio os nad oes &cyfeiriad ebost y derbyniwr yn y dystysgrif"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Brithwch i gael eich rhybuddio os nid yw'r cyfeiriad yn y dystysgrif"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os nad yw cyfeiriad ebost yr anfonwr yn y dystysgrif</h1>\n"
-"Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a ddefnyddir ar "
-"gyfer cêl-ysgrifo yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
-"<p>\n"
-"Argymhellir gadael y dewisiad yma arnodd ar gyfer diogelwch uchaf.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Rhybuddio os bydd y dystys&grif CA yn darfod mewn llai na"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "Defnyddio ar gyfer &Llofnodi"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Cêl-ysgrifaeth"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "o ddiwrnodau"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Dewis y nifer o ddiwrnodau yma"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd y dystysgrif lofnod </h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif lofnod fod yn ddilys "
-"heb roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd tystysgrif gêl-ysgrifo</h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif gêl-ysgrifo fod yn "
-"ddilys heb roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd tystysgrif yn y cadwyn</h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai pob tystysgrif yn y cadwyn fod yn "
-"ddilys heb roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd y dystysgrif CA </h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif CA fod yn ddilys heb "
-"roi rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Rhybuddio os derfydd y dystysgrif wraidd </h1>\n"
-"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif fod yn ddilys heb roi "
-"rhybudd.\n"
-"<p>\n"
-"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Anfon &eich tystysgrif eich hun"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Chwilio am Dystysgrifau Eraill"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "&Peidio ac anfon tystysgrifau"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Eiconau Plygell"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Amnewid"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Amnewid"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, fuzzy, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "&Dangos y cafn cysawd o hyd"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Hysbysiad Ebost Newydd"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Penodi golyg&ydd"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Galluogi swyddogaeth cylchwedd"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, fuzzy, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-"M&odd etifeddiaeth: Llarpio penawdau Oddiwrth:/I: mewn atebion i wahoddiadau"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Atodi llo&fnod yn ymysgogol"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Lapio &geiriau wrth golofn:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Rhybuddio os bydd y dystysgrif &wraidd yn darfod mewn llai na"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
-"wahoddiadau"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Galluogwch y dewisiad yma os ydych eisiau i KMail ofyn am Hysbysiadau "
-"Lleoliad Negeseuon (Message Disposition Notifications - MDNs) ar gyfer bob un "
-"o'ch negeseuon allfynd.</p>"
-"<p>Mae'r dewisiad yma yn effeithio ar y rhagosod yn unig; gallwch o hyd alluogi "
-"neu analluogi gofyn am MDNs ar sail pob-neges yn y cyfansoddydd, eitem dewislen "
-"<em>Dewisiadau</em>->&gt; <em>Gofyn am Hysbysiad Lleoliad</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "Cyfnod y&mofyn:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Amnewid rha&gddodiad a adnabyddir gan \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Amnewid rhagddodiad a adnabyddir gan \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Defnyddion dyfynnu dea&llus"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Mae'r llofnod wedi darfod."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Dangos pob penawd y negeseuon"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Hysbysiadau Lleoliad Neges"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Rhestr Negeseuon - Maes Dyddiad"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "Nodi Neges fel Wedi'i &Blaenyrru"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "&Ychwanegu Nodau Dyfynnu"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13531,6 +11753,11 @@ msgstr "Ychwanegu e"
 msgid "Add as BCC"
 msgstr "Ychwanegu Cyfrif"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Didd&ymu"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13547,10 +11774,10 @@ msgstr "<derbynwyr>"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13568,8 +11795,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13682,10 +11909,19 @@ msgstr "yn fwy na neu'n gyfartal i"
 msgid " bytes"
 msgstr "beit"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "o ddiwrnodau"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13841,13 +12077,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13865,8 +12099,7 @@ msgid ""
 msgstr "Math cyfrif: cyfrif POP"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13884,8 +12117,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13894,8 +12126,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Hidlau ar Gael"
 
 #: sievedebugdialog.cpp:358
@@ -13964,8 +12195,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13985,17 +12216,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Pen&odi gorchymyn:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Llwybr"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Cofnod newydd:"
@@ -14032,6 +12268,11 @@ msgstr "Ychwanegu cyfrif"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Ydych wir eisiau gwaredu'r dynodiad o'r enw <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Gwethr&edu ar:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14046,6 +12287,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Golygu..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14085,9 +12330,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14126,6 +12371,16 @@ msgstr ""
 "Methu agor ffeil \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr "I:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC:"
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14163,36 +12418,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14426,6 +12677,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -14463,114 +12718,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"\n"
-"<p>...y gallwch creu hidlau yn gyflym ar anfonwr, dderbyniwr,\n"
-"bwnc a rhestri ebost ego <em>Offer-&gt;Creu&nbsp;Hidlen</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...y gallwch gael gwared â'r &quot;[enw'r rhest ebost]&quot;\n"
-"a ychwanegir i bwnc rhai rhestri ebost gan ddefnyddio'r weithred\n"
-"hidlo <em>ail-ysgrifennu penawd</em> Defnyddiwch\n"
-"<pre>ail-ysgrifennu penawd &quot;Pwnc&quot;\n"
-"   amnewid &quot;\\s*\\[enw'r rhestr ebost\\]\\s*&quot;\n"
-"   efo&quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...y gallwch cysylltu rhestri ebost â plygyll yn yr ymgom\n"
-"<em>Plygell-&gt;Priodweddau...</em> ? Wedyn gallwch ddefnyddio\n"
-"<em>Neges-&gt;Newydd&nbsp;Neges&nbsp;i&nbsp;Rhestr&nbsp;Ebost...</em>\n"
-"i agor y cyfansoddydd efo'r cyfeiriad rhestr ebost yno yn barod.\n"
-"Fel arall, gallwch glicio efo botwm canol y llygoden ar y blygell.</p>\n"
-
-#: tips.cpp:35
-#, fuzzy
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...y gallwch neilltuo eiconau addasiedig i bob plygell yn unigol?\n"
-"Gweler <em>Plygell-&gt;Priodweddau...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...y gall KMail ddangos bar lliw yn dynodi'r math o neges\n"
-"(Testun Plaen/HTML/OpenPGP) a ddangosir yn gyfredol?</p>\n"
-"<p>Mae hyn yn difetha cynlluniau i ffugo gwiriad llofnod llwyddiannus gan\n"
-"anfon ebostau HTML sy'n dynwared fframau cyflwr llofnod KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...y gallwch hidlo ar unrhyw penawd gan fewnosod ei enw ym maes golygu "
-"cyntaf rheol chwilio?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...y gallwch hidlo allan negeseuon HTML-yn-unig efo'r rheol\n"
-"<pre>&quot;Math-cynnwys&quot; yn cynnwys &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-#, fuzzy
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...y bydd y rhan ddewisiedig o'r neges yn unig yn cael ei dyfynnu wrth "
-"ateb?</p>\n"
-"<p>Os ni ddewisir rhywbeth, dyfynnir yr holl neges.</p>\n"
-"<p>Mae hyn yn gweithio hyd yn oed efo testun atodiadau os ddewiswch\n"
-"<em>Gweld-&gt;Atodiadau-&gt;Mewnlin</em>.</p>\n"
-"<p>Mae'r nodwedd yma ar gael efo pob gorchymyn ateb heblaw\n"
-"<em>Neges-&gt;Ateb Heb Ddyfynnu</em>.</p>\n"
-"<p align=\"right\"><em>cyfrannwyd gan David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 #, fuzzy
 msgid "There is nothing to undo."
@@ -14639,6 +12786,17 @@ msgstr "Atodiad #%1 (di-enw)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu "
+"drosti?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Trosysgrifo'r Ffeil?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14762,9 +12920,9 @@ msgstr "Dileu Negeseuon"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14796,9 +12954,9 @@ msgstr "Dewis Ffeil..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14808,15 +12966,15 @@ msgstr "Ychwanegu i'r Llyfr Cyfeiriadau"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14825,8 +12983,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14842,142 +13000,1629 @@ msgstr "Dim Llun"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "Llofnodi"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "L&lofnodi negeseuon yn ymysgogol gan ddefnyddio OpenPGP"
+
+#: composercryptoconfiguration.ui:38
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"<qt><p>Pan alluogir y dewisiad yma, llofnodir gan ragosod pob neges yr "
+"anfonwch.  Wrth gwrs, mae o hyd yn bosibl analluogi llofnodi ar gyfer pob "
+"neges yn unigol.</p></qt>"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Cêl-ysgrifaeth"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
-msgstr "Gosd pwnc y neges."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr "Anfon CC: i 'gyfeiriad'."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Dangos testun llofnodedig/cêl-ysgrifedig wedi cyfansoddi"
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr "Anfon BCC: i 'gyfeiriad'."
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-#, fuzzy
-msgid "Add 'header' to message"
-msgstr "Ychwanegu 'penawd' i'r neges."
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
 
-#: kmail_options.h:18
-#, fuzzy
-msgid "Read message body from 'file'"
-msgstr "Darllen corff y neges o 'ffeil'."
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Brithwch i gadw negeseuon wedi'u cêl-ysgrifo"
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Gosod corff y neges."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Cadw Negeseuon yn Gêl-ysgrifedig</h1>\n"
+"Pan frithwch y blwch yma, cedwir negeseuon a anfonwyd fel y's anfonwyd, sef, "
+"yn gêl-ysgrifedig.  Ni argymhellir hyn oherwydd ni fyddwch yn gallu darllen "
+"y negeseuon mwyach os darfodir tystysgrif ofynnol.\n"
+"<p>\n"
+"Serch hynny, gall fod rheolau lleol sy'n eich gorfod troi'r dewisiad yma "
+"arnodd.  Mewn amheuaeth, gwiriwch efo'ch gweinyddwr lleol.\n"
+"</qt>"
 
-#: kmail_options.h:20
-#, fuzzy
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Ychwanegu atodiad i'r ebost.  Gellir ailadrodd hwn."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Dangos yr allweddau &cêl-ysgrifo ar gyfer cymeradwydo o hyd"
 
-#: kmail_options.h:21
-#, fuzzy
-msgid "Only check for new mail"
-msgstr "Ymofyn am ebost newydd yn unig."
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-#, fuzzy
-msgid "Only open composer window"
-msgstr "Agor ffenestr gyfansoddi yn unig."
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Cêl-ysgrifennu negeseuon yn ymysgogol lle &bo'n bosibl."
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "Dan y c&warel neges"
+#: composercryptoconfiguration.ui:117
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"<qt><p>Pan alluogir y dewisiad yma, celir pob neges yr anfonwch pan mae cêl-"
+"ysgrifaeth yn bosibl a dymunol.  Wrth gwrs, mae o hyd yn bosibl analluogi'r "
+"cêl-ysgrifaeth ymysgogol ar gyfer pob neges yn unigol.</p></qt>"
 
-#: kmail_options.h:24
-#, fuzzy
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
-"Anfon neges i bob un 'cyfeiriad', gan atodi'r ffeil y mae'r 'URL' yn ei benodi."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Darllen"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Hen"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Cyffredinol"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Wedi'u dileu"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Ateb I"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Wedi'u ateb"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Ateb i &Bawb..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Wedi'u blaenyrru"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "B&laenyrru"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Mewn Ciw"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Byrlwybr:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Anfonwyd"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Amnewid"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Wedi'u gwylio"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Eiconau Plygell"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Anwybyddwyd"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Amnewid"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Ebostach"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Amnewid"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ebost iawn"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Priodweddau Plygell"
 
-#: kmsearchpattern.h:232
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Mae'r &blygell yn cynnwys rhestr ebost"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "C&yfeiriad y rhestr:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Ar&ferol:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Heb eu darllen:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Neges yn Darfod"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Dar&fod ar ôl:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "&Darfod negeseuon darlleniedig"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Darfod ar ô&l:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Darfod negeseuon &heb eu darllen"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Diwrnod(au)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Wythnos(au)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mis(oedd)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Uwch"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "Dynodiad yr &Anfonwr:"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "Fformat &Cadw:"
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "&Ymddangosiad y Rhestri:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, fuzzy, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "&Dangos y cafn cysawd o hyd"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Hysbysiad Ebost Newydd"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Penodi golyg&ydd"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Galluogi swyddogaeth cylchwedd"
+
+#: kmail.kcfg:172
+#, fuzzy, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+"M&odd etifeddiaeth: Llarpio penawdau Oddiwrth:/I: mewn atebion i wahoddiadau"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Atodi llo&fnod yn ymysgogol"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Lapio &geiriau wrth golofn:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Rhybuddio os bydd y dystysgrif &wraidd yn darfod mewn llai na"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
+"wahoddiadau"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
+
+#: kmail.kcfg:417
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Galluogwch y dewisiad yma os ydych eisiau i KMail ofyn am Hysbysiadau "
+"Lleoliad Negeseuon (Message Disposition Notifications - MDNs) ar gyfer bob "
+"un o'ch negeseuon allfynd.</p><p>Mae'r dewisiad yma yn effeithio ar y "
+"rhagosod yn unig; gallwch o hyd alluogi neu analluogi gofyn am MDNs ar sail "
+"pob-neges yn y cyfansoddydd, eitem dewislen <em>Dewisiadau</em>->&gt; "
+"<em>Gofyn am Hysbysiad Lleoliad</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "Cyfnod y&mofyn:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Amnewid rha&gddodiad a adnabyddir gan \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Amnewid rhagddodiad a adnabyddir gan \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Defnyddion dyfynnu dea&llus"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Mae'r llofnod wedi darfod."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Dangos pob penawd y negeseuon"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Hysbysiadau Lleoliad Neges"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Rhestr Negeseuon - Maes Dyddiad"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "Nodi Neges fel Wedi'i &Blaenyrru"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "&Ychwanegu Nodau Dyfynnu"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Golygu &Ffeil"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Golygu..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, fuzzy, no-c-format
+msgid "&View"
+msgstr "Gweld..."
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Mynd"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "P&lygell"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Neges"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "B&laenyrru"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Dynodiadau &sy'n bodoli:"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Dewisiadau Cyffredin"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Creu Tystysgrif"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Llofnod dilys"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "&Peidio ac anfon tystysgrifau"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Wrth ychwanegu tystysgrifau"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Ychwanegu..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Cylchwedd"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Dynodiadau &sy'n bodoli:"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "Diderfyn"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Ffurfweddu Llofnod"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Ate&b i'r anfonwr:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Ateb i &Bawb..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Neges a Flaenyrrwyd"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Rhybuddio wrth geisio anfon negeseuon &heb eu llofnodi"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Brithwch i gael eich rhybuddio wrth anfon negeseuon heb eu llofnodi."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu llofnodi</h1>\n"
+"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
+"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
+"<p>\n"
+"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Brithwch i gael eich rhybuddio wrth geisio anfon negeseuon heb eu cêl-"
+"ysgrifo."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo</h1>\n"
+"Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio os geiswch anfon "
+"rhannau o'r neges, neu'r holl neges, heb eu llofnodi.\n"
+"<p>\n"
+"Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Rhybuddio os nad oes &cyfeiriad ebost y derbyniwr yn y dystysgrif"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Brithwch i gael eich rhybuddio os nid yw'r cyfeiriad yn y dystysgrif"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os nad yw cyfeiriad ebost yr anfonwr yn y dystysgrif</h1>\n"
+"Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a ddefnyddir "
+"ar gyfer cêl-ysgrifo yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
+"<p>\n"
+"Argymhellir gadael y dewisiad yma arnodd ar gyfer diogelwch uchaf.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Rhybuddio os bydd y dystys&grif CA yn darfod mewn llai na"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "Defnyddio ar gyfer &Llofnodi"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Cêl-ysgrifaeth"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Dewis y nifer o ddiwrnodau yma"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd y dystysgrif lofnod </h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif lofnod fod yn ddilys "
+"heb roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd tystysgrif gêl-ysgrifo</h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif gêl-ysgrifo fod yn "
+"ddilys heb roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd tystysgrif yn y cadwyn</h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai pob tystysgrif yn y cadwyn fod yn "
+"ddilys heb roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd y dystysgrif CA </h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif CA fod yn ddilys heb "
+"roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Rhybuddio os derfydd y dystysgrif wraidd </h1>\n"
+"Dewis y nifer lleiaf o ddiwrnodau a ddylai'r dystysgrif fod yn ddilys heb "
+"roi rhybudd.\n"
+"<p>\n"
+"14 diwrnod yw'r gosodiad a argymhellir ar gyfer SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Anfon &eich tystysgrif eich hun"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Chwilio am Dystysgrifau Eraill"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "&Peidio ac anfon tystysgrifau"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
 #, fuzzy
-msgid "To Do"
-msgstr "I:"
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"\n"
+"<p>...y gallwch creu hidlau yn gyflym ar anfonwr, dderbyniwr,\n"
+"bwnc a rhestri ebost ego <em>Offer-&gt;Creu&nbsp;Hidlen</em>?</p>\n"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Efo Atodiad"
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...y gallwch gael gwared â'r &quot;[enw'r rhest ebost]&quot;\n"
+"a ychwanegir i bwnc rhai rhestri ebost gan ddefnyddio'r weithred\n"
+"hidlo <em>ail-ysgrifennu penawd</em> Defnyddiwch\n"
+"<pre>ail-ysgrifennu penawd &quot;Pwnc&quot;\n"
+"   amnewid &quot;\\s*\\[enw'r rhestr ebost\\]\\s*&quot;\n"
+"   efo&quot;&quot;</pre>\n"
+"</p>\n"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: tips:29
+#, fuzzy
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
 msgstr ""
+"<p>...y gallwch cysylltu rhestri ebost â plygyll yn yr ymgom\n"
+"<em>Plygell-&gt;Priodweddau...</em> ? Wedyn gallwch ddefnyddio\n"
+"<em>Neges-&gt;Newydd&nbsp;Neges&nbsp;i&nbsp;Rhestr&nbsp;Ebost...</em>\n"
+"i agor y cyfansoddydd efo'r cyfeiriad rhestr ebost yno yn barod.\n"
+"Fel arall, gallwch glicio efo botwm canol y llygoden ar y blygell.</p>\n"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Llwybr"
+#: tips:39
+#, fuzzy
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...y gallwch neilltuo eiconau addasiedig i bob plygell yn unigol?\n"
+"Gweler <em>Plygell-&gt;Priodweddau...</em></p>\n"
 
-#: util.h:208
+#: tips:46
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
 msgstr ""
-"Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu drosti?"
+"<p>...y gall KMail ddangos bar lliw yn dynodi'r math o neges\n"
+"(Testun Plaen/HTML/OpenPGP) a ddangosir yn gyfredol?</p>\n"
+"<p>Mae hyn yn difetha cynlluniau i ffugo gwiriad llofnod llwyddiannus gan\n"
+"anfon ebostau HTML sy'n dynwared fframau cyflwr llofnod KMail.</p>\n"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Trosysgrifo'r Ffeil?"
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...y gallwch hidlo ar unrhyw penawd gan fewnosod ei enw ym maes golygu "
+"cyntaf rheol chwilio?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...y gallwch hidlo allan negeseuon HTML-yn-unig efo'r rheol\n"
+"<pre>&quot;Math-cynnwys&quot; yn cynnwys &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+#, fuzzy
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...y bydd y rhan ddewisiedig o'r neges yn unig yn cael ei dyfynnu wrth "
+"ateb?</p>\n"
+"<p>Os ni ddewisir rhywbeth, dyfynnir yr holl neges.</p>\n"
+"<p>Mae hyn yn gweithio hyd yn oed efo testun atodiadau os ddewiswch\n"
+"<em>Gweld-&gt;Atodiadau-&gt;Mewnlin</em>.</p>\n"
+"<p>Mae'r nodwedd yma ar gael efo pob gorchymyn ateb heblaw\n"
+"<em>Neges-&gt;Ateb Heb Ddyfynnu</em>.</p>\n"
+"<p align=\"right\"><em>cyfrannwyd gan David F. Newman</em></p>\n"
 
 #~ msgid ""
 #~ "_: recipient address field\n"
@@ -14999,7 +14644,9 @@ msgstr "Trosysgrifo'r Ffeil?"
 
 #, fuzzy
 #~ msgid "The error message from the server communication is here:"
-#~ msgstr "Gall hyn fod o achos nid oes gennych ganiatad i wneud hyn.  Dyma'r neges wall o'r cyfathrebiaeth gweinydd:"
+#~ msgstr ""
+#~ "Gall hyn fod o achos nid oes gennych ganiatad i wneud hyn.  Dyma'r neges "
+#~ "wall o'r cyfathrebiaeth gweinydd:"
 
 #, fuzzy
 #~ msgid "Todo"
@@ -15056,16 +14703,20 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cêl-ysgrifo pob rhan y neges gan ragosod</h1>\n"
-#~ "Os dewisir y dewisiad yma, cêl-ysgrifir pob rhan o neges (h.y. prif gorff y neges a pob atodiad) gan ragosod.\n"
+#~ "Os dewisir y dewisiad yma, cêl-ysgrifir pob rhan o neges (h.y. prif gorff "
+#~ "y neges a pob atodiad) gan ragosod.\n"
 #~ "<p>\n"
-#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges unigol.\n"
+#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges "
+#~ "unigol.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15077,12 +14728,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gofyn cyn cêl-ysgrifo pob rhan</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, byddwch yn cael eich gofyn am bob rhan o'r neges (h.y. prif gorff y neges yn ogystal â pob atodiad) yn unigol a hoffech gêl-ysgrifo'r rhan.\n"
+#~ "Pan ddewisir y dewisiad yma, byddwch yn cael eich gofyn am bob rhan o'r "
+#~ "neges (h.y. prif gorff y neges yn ogystal â pob atodiad) yn unigol a "
+#~ "hoffech gêl-ysgrifo'r rhan.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15098,14 +14753,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Peidio â chêl-ysgrifo negeseuon</h1>\n"
 #~ "Os dewisir y dewisiad yma, ni chêl-ysgrifir negeseuon gan ragosod.\n"
 #~ "<p>\n"
-#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges unigol.\n"
+#~ "Rhagosodiad yw hwn - gallwch o hyd ei anwybyddu ar gyfer pob neges "
+#~ "unigol.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15117,18 +14774,31 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algorithm Cêl-ysgrifo</h1>\n"
-#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  Mae'r algorithm cêl-ysgrifo yn disgrifio sut mae'r cyfrifiadur yn gweithredu allwedd eich derbyniwr i'ch neges er mwyn i'r derbyniwr arfaethedig yn unig allu darllen y neges.\n"
+#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  "
+#~ "Mae'r algorithm cêl-ysgrifo yn disgrifio sut mae'r cyfrifiadur yn "
+#~ "gweithredu allwedd eich derbyniwr i'ch neges er mwyn i'r derbyniwr "
+#~ "arfaethedig yn unig allu darllen y neges.\n"
 #~ "<p>\n"
-#~ "Mae dewis rhyw algorithm cêl-ysgrifo yn penodi faint mor hawdd neu faint mor anodd yw hi i ryng-gipio a darllen neges.  Serch hynny, ystyrir bod pob algorithm a ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel rheol, bydd y rhagosodiad yn gweithio yn berffaith iawn yma.\n"
+#~ "Mae dewis rhyw algorithm cêl-ysgrifo yn penodi faint mor hawdd neu faint "
+#~ "mor anodd yw hi i ryng-gipio a darllen neges.  Serch hynny, ystyrir bod "
+#~ "pob algorithm a ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel "
+#~ "rheol, bydd y rhagosodiad yn gweithio yn berffaith iawn yma.\n"
 #~ "<p>\n"
 #~ "Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob neges unigol.\n"
 #~ "</qt>"
@@ -15145,16 +14815,23 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Gall y gwirio tystysgrif orffen efo tystysgrif a gedwir yn lleol</h1>\n"
-#~ "Os dewisir y dewisiad yma, gall y gwirio tystysgrif orffen efo tystysgrif a gedwir yn lleol.\n"
+#~ "<h1>Gall y gwirio tystysgrif orffen efo tystysgrif a gedwir yn lleol</"
+#~ "h1>\n"
+#~ "Os dewisir y dewisiad yma, gall y gwirio tystysgrif orffen efo tystysgrif "
+#~ "a gedwir yn lleol.\n"
 #~ "<p>\n"
-#~ "Cynhwysa \"tystysgrifau a gedwir yn lleol\" eich tystysgrifau eich hyn, yn ogystal â thystysgrifau partneriaid cyfathrebu ac awdurdodau tystysgrifo (CAs).\n"
+#~ "Cynhwysa \"tystysgrifau a gedwir yn lleol\" eich tystysgrifau eich hyn, "
+#~ "yn ogystal â thystysgrifau partneriaid cyfathrebu ac awdurdodau "
+#~ "tystysgrifo (CAs).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15166,12 +14843,15 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwirio llwybr y dystysgrif hyd at y dystysgrif wraidd bob tro</h1>\n"
-#~ "Os troir y dewisiad yma arnodd, gwirir llwybr y dystysgrif sy'n biau i dystysgrif y derbyniwr hyd at y dystysgrif wraidd bob tro.\n"
+#~ "Os troir y dewisiad yma arnodd, gwirir llwybr y dystysgrif sy'n biau i "
+#~ "dystysgrif y derbyniwr hyd at y dystysgrif wraidd bob tro.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15183,14 +14863,17 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwirio llwybr y dystysgrif</h1>\n"
-#~ "Os troir y dewisiad yma arnodd, gwirir holl lwybr tystysgrif y derbyniwr hyd at y dystysgrif wraidd.\n"
+#~ "Os troir y dewisiad yma arnodd, gwirir holl lwybr tystysgrif y derbyniwr "
+#~ "hyd at y dystysgrif wraidd.\n"
 #~ "<p>\n"
 #~ "Noder nid yw'n bosibl atal gwirio tystysgrif y derbyniwr ei hun.\n"
 #~ "</qt>"
@@ -15204,16 +14887,28 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Defnyddio rhestri dirymu tystysgrifau (CRLau)</h1>\n"
-#~ "Mae rhestr dirymu tystysgrifau yn cynnwys tystysgrifau sydd wedi'u tynnu yn ôl, a ni ddylir eu defnyddio mwyach ar gyfer pwrpas cêl-ysgrifo.  Gall defnyddiwr ddymuno cael dirymu ei d/thystysgrif gan ei f/bod yn amau bod cywirdeb y dystysgrif wedi'i beryglu (e.e. mae rhywun wedi dyfalu'r PIN).\n"
+#~ "Mae rhestr dirymu tystysgrifau yn cynnwys tystysgrifau sydd wedi'u tynnu "
+#~ "yn ôl, a ni ddylir eu defnyddio mwyach ar gyfer pwrpas cêl-ysgrifo.  Gall "
+#~ "defnyddiwr ddymuno cael dirymu ei d/thystysgrif gan ei f/bod yn amau bod "
+#~ "cywirdeb y dystysgrif wedi'i beryglu (e.e. mae rhywun wedi dyfalu'r "
+#~ "PIN).\n"
 #~ "<p>\n"
-#~ "Argymhellir defnyddio CRLau ar gyfer diogelwch mwyaf.  Yn yr ymgom ffurfweddu rheolaeth tystysgrifau a CRLau, gallwch benodi o le i nôl y CRLau.\n"
+#~ "Argymhellir defnyddio CRLau ar gyfer diogelwch mwyaf.  Yn yr ymgom "
+#~ "ffurfweddu rheolaeth tystysgrifau a CRLau, gallwch benodi o le i nôl y "
+#~ "CRLau.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15221,17 +14916,20 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "&Rhybuddio os bydd yn CRL yn darfod mewn llai na"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Brithwch i gael eich rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf"
+#~ msgstr ""
+#~ "Brithwch i gael eich rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf</h1>\n"
-#~ "Os brithir y blwch yma, byddwch yn eich rhybuddio os bydd un o'r CRLau yr ydych yn defnyddio am darfod yn y dyfodol nesaf.\n"
+#~ "Os brithir y blwch yma, byddwch yn eich rhybuddio os bydd un o'r CRLau yr "
+#~ "ydych yn defnyddio am darfod yn y dyfodol nesaf.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15240,14 +14938,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os bydd CRL yn darfod yn y dyfodol nesaf</h1>\n"
-#~ "Yn y maes yma, gallwch benodi faint mor fuan cyn i CRL ddarfod y byddwch yn cael eich rhybuddio am y darfod.\n"
+#~ "Yn y maes yma, gallwch benodi faint mor fuan cyn i CRL ddarfod y byddwch "
+#~ "yn cael eich rhybuddio am y darfod.\n"
 #~ "<p>\n"
 #~ "Y gosodiad a argymhellir ar gyfer yr amgylchedd SPHINX yw 7 diwrnod.\n"
 #~ "</qt>"
@@ -15256,21 +14956,27 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Cêl-ysgrifo o hyd pan anfonir i chi eich &hun"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Brithwch i gêl-ysgrifo negeseuon cêl-ysgrifiedig gan ddefnyddio eich allwedd eich hun hefyd."
+#~ msgstr ""
+#~ "Brithwch i gêl-ysgrifo negeseuon cêl-ysgrifiedig gan ddefnyddio eich "
+#~ "allwedd eich hun hefyd."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cêl-ysgrifo o hyd pan anfonir i chi eich hun</h1>\n"
-#~ "Os frithir y blwch yma, bydd negeseuon cêl-ysgrifedig a anfonir gennych hefyd yn cael ei cêl-ysgrifo gan ddefnyddio eich allwedd eich hun.\n"
+#~ "Os frithir y blwch yma, bydd negeseuon cêl-ysgrifedig a anfonir gennych "
+#~ "hefyd yn cael ei cêl-ysgrifo gan ddefnyddio eich allwedd eich hun.\n"
 #~ "<p>\n"
-#~ "Argymhellir gadael y dewisiad yma arnodd i alluogi i chi ddarllen y negeseuon a anfonwyd gennych.\n"
+#~ "Argymhellir gadael y dewisiad yma arnodd i alluogi i chi ddarllen y "
+#~ "negeseuon a anfonwyd gennych.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15278,21 +14984,28 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Rhybuddio os bydd &tystysgrif yn y cadwyn yn darfod mewn llai na"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Brithwch i gael eich rhybuddio os bydd y dystysgrif yn darfod yn fuan"
+#~ msgstr ""
+#~ "Brithwch i gael eich rhybuddio os bydd y dystysgrif yn darfod yn fuan"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os derfydd y dystysgrif</h1>\n"
-#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio defnyddio tystysgrif ar gyfer gêl-ysgrifo sy'n darfod yn ystod y nifer penodol o ddiwrnodau.\n"
+#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio "
+#~ "defnyddio tystysgrif ar gyfer gêl-ysgrifo sy'n darfod yn ystod y nifer "
+#~ "penodol o ddiwrnodau.\n"
 #~ "<p>\n"
-#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau sydd am ddarfod yn y dyfodol agos.\n"
+#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau "
+#~ "sydd am ddarfod yn y dyfodol agos.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15315,8 +15028,29 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Dewis pa dystysgrif i'w hanfon"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Anfon Tystysgrifau</h1> heb eich tystysgrif, ni fydd y derbyniwr yn gallu penodi a chi yn wir oedd wedi anfon y neges, neu a addaswyd y neges gan drydydd plaid.<p> Gall y derbyniwr gael eich tystysgrif o weinydd canolog, ond gallwch hefyd ddewis amgau eich tystysgrif efo'ch neges.  Gallwch ddewis peidio â cynnwys tystysgrif o gwbl, cynnwys eich tystysgrif eich hun yn unig, neu gynnwys yr holl gadwyn o dystysgrifau sy'n tystysgrifo eich tystysgrif eich hun, yn cynnwys neu peidio â chynnwys y dystysgrif wraidd.<p> Argymhellir gynnwys o hyd o leiaf eich tystysgrif eich hun efo'r neges.<p> Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob gosodiad unigol. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Anfon Tystysgrifau</h1> heb eich tystysgrif, ni fydd y derbyniwr "
+#~ "yn gallu penodi a chi yn wir oedd wedi anfon y neges, neu a addaswyd y "
+#~ "neges gan drydydd plaid.<p> Gall y derbyniwr gael eich tystysgrif o "
+#~ "weinydd canolog, ond gallwch hefyd ddewis amgau eich tystysgrif efo'ch "
+#~ "neges.  Gallwch ddewis peidio â cynnwys tystysgrif o gwbl, cynnwys eich "
+#~ "tystysgrif eich hun yn unig, neu gynnwys yr holl gadwyn o dystysgrifau "
+#~ "sy'n tystysgrifo eich tystysgrif eich hun, yn cynnwys neu peidio â "
+#~ "chynnwys y dystysgrif wraidd.<p> Argymhellir gynnwys o hyd o leiaf eich "
+#~ "tystysgrif eich hun efo'r neges.<p> Rhagosodiad yw hwn, gallwch ei "
+#~ "anwybyddu ar gyfer pob gosodiad unigol. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Anfon &eich tystysgrif eich hun"
@@ -15336,14 +15070,17 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Llofnodi pob rhan o'r neges gan ragosod</h1>\n"
-#~ "Os ddewisir y dewisiad yma, llofnodir pob rhan o'r neges (h.y. prif gorff y neges yn ogystal â phob atodiad)  gan ragosod.\n"
+#~ "Os ddewisir y dewisiad yma, llofnodir pob rhan o'r neges (h.y. prif gorff "
+#~ "y neges yn ogystal â phob atodiad)  gan ragosod.\n"
 #~ "<p>\n"
 #~ "Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob gosodiad unigol.\n"
 #~ "</qt>"
@@ -15357,12 +15094,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gofyn cyn llofnodi pob rhan</h1>\n"
-#~ "Os ddewisir y dewisiad yma, gofynnir i chi ar gyfer pob rhan o'r neges (h.y. prif gorff y neges yn ogystal â phob atodiad) yn unigol a ydych eisiau i'r rhan gael ei llofnodi.\n"
+#~ "Os ddewisir y dewisiad yma, gofynnir i chi ar gyfer pob rhan o'r neges (h."
+#~ "y. prif gorff y neges yn ogystal â phob atodiad) yn unigol a ydych eisiau "
+#~ "i'r rhan gael ei llofnodi.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15378,7 +15119,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15389,7 +15131,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "</qt>"
 
 #, fuzzy
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Ffurfweddir y dystysgrif lofnod ar y dudalen <em>Dystysgrifau</em>!"
 
 #~ msgid "RSA + SHA-1"
@@ -15401,18 +15144,31 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algorithm Llofnod</h1>\n"
-#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  Mae'r algorithm llofnod yn disgrifio sut mae'r cyfrifiadur yn gweithredu eich allwedd lofnod i'ch neges er mwyn i'r derbyniwr allu penodi a yw'r neges yn dod yn wir oddi wrthych.\n"
+#~ "Disgrifiad i'r cyfrifiadur am sut i weithredu tasg penodol yw algorithm.  "
+#~ "Mae'r algorithm llofnod yn disgrifio sut mae'r cyfrifiadur yn gweithredu "
+#~ "eich allwedd lofnod i'ch neges er mwyn i'r derbyniwr allu penodi a yw'r "
+#~ "neges yn dod yn wir oddi wrthych.\n"
 #~ "<p>\n"
-#~ "Mae dewis rhyw algorithm llofnod yn penodi faint mor hawdd neu faint mor anodd yw hi i ffugio neges.  Serch hynny, ystyrir bod pob algorithm a ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel rheol, bydd y rhagosodiad yn gweithio yn berffaith iawn yma.\n"
+#~ "Mae dewis rhyw algorithm llofnod yn penodi faint mor hawdd neu faint mor "
+#~ "anodd yw hi i ffugio neges.  Serch hynny, ystyrir bod pob algorithm a "
+#~ "ddarperir yn yr amgylchedd SPHINX yn ddiogel iawn.  Fel rheol, bydd y "
+#~ "rhagosodiad yn gweithio yn berffaith iawn yma.\n"
 #~ "<p>\n"
 #~ "Rhagosodiad yw hwn, gallwch ei anwybyddu ar gyfer pob neges unigol.\n"
 #~ "</qt>"
@@ -15429,12 +15185,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cadw negeseuon efo llofnodion</h1>\n"
-#~ "Pan frithir y blwch yma, cedwir negeseuon anfonedig ynghyd â'r llofnodion a weithredwyd iddynt.  Argymhellir hyn, oherwydd mae'n galluogi i chi wirio yn nes ymlaen a wnaethoch chi lofnodi neges neu rhan ohoni.\n"
+#~ "Pan frithir y blwch yma, cedwir negeseuon anfonedig ynghyd â'r llofnodion "
+#~ "a weithredwyd iddynt.  Argymhellir hyn, oherwydd mae'n galluogi i chi "
+#~ "wirio yn nes ymlaen a wnaethoch chi lofnodi neges neu rhan ohoni.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15449,12 +15209,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Llofnod datgysylltiedig amlran</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y llofnod a'r data llofnodedig yn rhannau ar wahân o ran neges Amlran/Llofnodedig.  Bydd data neges llofnodedig yn ddarllenadwy hyd yn oed gan Asiantau Defnyddiwr Ebost nad yw yn cynnal yr algorithm llofnodi a nad yw yn cynnal datgodiad ASN.1.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y llofnod a'r data llofnodedig yn "
+#~ "rhannau ar wahân o ran neges Amlran/Llofnodedig.  Bydd data neges "
+#~ "llofnodedig yn ddarllenadwy hyd yn oed gan Asiantau Defnyddiwr Ebost nad "
+#~ "yw yn cynnal yr algorithm llofnodi a nad yw yn cynnal datgodiad ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15466,12 +15232,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Negeseuon llofnodedig afloyw</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, amgodir y llofnod a'r data llofnodedig i mewn i un bloc ASN.1.  Bydd negeseuon yn ddarllenadwy gan Asiantau Defnyddiwr Ebost sy'n cynnal datgodiad ASN.1 yn unig.\n"
+#~ "Pan ddewisir y dewisiad yma, amgodir y llofnod a'r data llofnodedig i "
+#~ "mewn i un bloc ASN.1.  Bydd negeseuon yn ddarllenadwy gan Asiantau "
+#~ "Defnyddiwr Ebost sy'n cynnal datgodiad ASN.1 yn unig.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15484,8 +15254,23 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Dewis faint mor aml a ddylai roi'r PIN"
 
 #, fuzzy
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Mewnosod PIN</h1>Yma, gallwch ddewis faint mor aml y mae angen i chi fewnosod y PIN er mwyn cyrchu eich amgylchedd diogelwch personol (PSE) sy'n cynnwys eich tystysgrifau.<p> Yr amlaf y mae angen i chi fewnosod eich PIN, y mwyaf y'ch amddiffynnir yn erbyn negeseuon ebost sy'n cael eu ffugio yn eich enw chi, ond y mwyaf anghyfleus y bydd gweithrediadau.<p> Os ydych yn ansicr am beth i'w ddewis yma, gadewch y dewisiad yma fel mae.<p> Noder nad yw yn bosibl atal mewnosod PIN yn hollol, am resymau diogelwch.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Mewnosod PIN</h1>Yma, gallwch ddewis faint mor aml y mae angen i "
+#~ "chi fewnosod y PIN er mwyn cyrchu eich amgylchedd diogelwch personol "
+#~ "(PSE) sy'n cynnwys eich tystysgrifau.<p> Yr amlaf y mae angen i chi "
+#~ "fewnosod eich PIN, y mwyaf y'ch amddiffynnir yn erbyn negeseuon ebost "
+#~ "sy'n cael eu ffugio yn eich enw chi, ond y mwyaf anghyfleus y bydd "
+#~ "gweithrediadau.<p> Os ydych yn ansicr am beth i'w ddewis yma, gadewch y "
+#~ "dewisiad yma fel mae.<p> Noder nad yw yn bosibl atal mewnosod PIN yn "
+#~ "hollol, am resymau diogelwch.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Unwaith bob sesiwn"
@@ -15503,16 +15288,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os derfydd y dystysgrif</h1>\n"
-#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio defnyddio tystysgrif ar gyfer llofnodi sy'n darfod yn ystod y nifer penodol o ddiwrnodau.\n"
+#~ "Os brithir y dewisiad yma, byddwch yn cael eich rhybuddio wrth geisio "
+#~ "defnyddio tystysgrif ar gyfer llofnodi sy'n darfod yn ystod y nifer "
+#~ "penodol o ddiwrnodau.\n"
 #~ "<p>\n"
-#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau sydd am ddarfod yn y dyfodol agos.\n"
+#~ "Argymhellir cadw'r dewisiad yma arnodd i osgoi defnyddio tystysgrifau "
+#~ "sydd am ddarfod yn y dyfodol agos.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15525,14 +15316,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rhybuddio os nad yw cyfeiriad ebost yr anfonwr yn y dystysgrif</h1>\n"
-#~ "Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a ddefnyddir ar gyfer llofnodi yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
+#~ "Os brithir y dewisiad yma, rhoir rhybudd os nid yw'r dystysgrif a "
+#~ "ddefnyddir ar gyfer llofnodi yn cynnwys  cyfeiriad ebost yr anfonwr.\n"
 #~ "<p>\n"
 #~ "Argymhellir gadael y dewisiad yma arnodd ar gyfer cywirdeb uchaf.\n"
 #~ "</qt>"
@@ -15631,22 +15424,38 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "In a few easy steps, this wizard will help you with the creation of a certificate. You use your certificates in order to sign messages, to encrypt messages and to decrypt messages that other people send to you in encrypted form.\n"
+#~ "In a few easy steps, this wizard will help you with the creation of a "
+#~ "certificate. You use your certificates in order to sign messages, to "
+#~ "encrypt messages and to decrypt messages that other people send to you in "
+#~ "encrypted form.\n"
 #~ "<p>\n"
-#~ "The certificates can either be generated in a centralized or a decentralized manner. Please contact your local help desk if you are unsure how to create a certificate in your organization."
+#~ "The certificates can either be generated in a centralized or a "
+#~ "decentralized manner. Please contact your local help desk if you are "
+#~ "unsure how to create a certificate in your organization."
 #~ msgstr ""
 #~ "<b>Croeso i'r Dewin Tystysgrif!</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "Mewn rhai camau hawdd, bydd y dewin yma yn eich cynorthwyo i greu tystysgrif.  Rydych yn defnyddio eich tystysgrifau i lofnodi negeseuon, gêl-ysgrifo negeseuon, a datgelu negeseuon a anfonir i chi gan bobl eraill mewn ffurf gêl-ysgrifedig.\n"
+#~ "Mewn rhai camau hawdd, bydd y dewin yma yn eich cynorthwyo i greu "
+#~ "tystysgrif.  Rydych yn defnyddio eich tystysgrifau i lofnodi negeseuon, "
+#~ "gêl-ysgrifo negeseuon, a datgelu negeseuon a anfonir i chi gan bobl "
+#~ "eraill mewn ffurf gêl-ysgrifedig.\n"
 #~ "<p>\n"
-#~ "Gellir creu y tystysgrifau mewn ffordd canoledig neu ddatcanoledig.  Cysylltwch â'ch canolfan gymorth leol os nid ydych yn sicr am sut i greu tystysgrif yn eich mudiad."
+#~ "Gellir creu y tystysgrifau mewn ffordd canoledig neu ddatcanoledig.  "
+#~ "Cysylltwch â'ch canolfan gymorth leol os nid ydych yn sicr am sut i greu "
+#~ "tystysgrif yn eich mudiad."
 
 #~ msgid "Your Personal Data"
 #~ msgstr "Eich Data Personol"
 
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "Ar y dudalen yma, byddwch yn rhoi data personol i'w cadw yn eich tystysgrif, ac a fydd yn helpu i bobl eraill benodi mai chi sy'n anfon y neges."
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "Ar y dudalen yma, byddwch yn rhoi data personol i'w cadw yn eich "
+#~ "tystysgrif, ac a fydd yn helpu i bobl eraill benodi mai chi sy'n anfon y "
+#~ "neges."
 
 #~ msgid "Enter your name here"
 #~ msgstr "Rhowch eich enw yma"
@@ -15657,14 +15466,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Enter your organization here"
 #~ msgstr "Rhowch eich mudiad yma"
 
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
-#~ msgstr "Rhowch eich mudiad (e.e. eich cwmni, eich adran, neu eich awdurdod) yma fel y dylai ei ddangos yn y tystysgrif."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
+#~ msgstr ""
+#~ "Rhowch eich mudiad (e.e. eich cwmni, eich adran, neu eich awdurdod) yma "
+#~ "fel y dylai ei ddangos yn y tystysgrif."
 
 #~ msgid "Enter your email address here"
 #~ msgstr "Rhowch eich cyfeiriad ebost yma"
 
-#~ msgid "Enter the email address here which you want to use in connection with the certificate."
-#~ msgstr "Rhowch y cyfeiriad ebost yma yr hoffech ddefnyddio mewn cysylltiad â'r dystysgrif."
+#~ msgid ""
+#~ "Enter the email address here which you want to use in connection with the "
+#~ "certificate."
+#~ msgstr ""
+#~ "Rhowch y cyfeiriad ebost yma yr hoffech ddefnyddio mewn cysylltiad â'r "
+#~ "dystysgrif."
 
 #~ msgid "&Department:"
 #~ msgstr "&Adran:"
@@ -15675,8 +15492,14 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Certificate Generation"
 #~ msgstr "Creu Tystysgrif"
 
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "Ar y dudalen yma, byddwch yn dewis a wneir creu tystysgrif yn ganolog neu yn ganoledig neu yn ddatganoledig.  Gwiriwch efo'ch canolfan gymorth leol os nad ydych yn sicr ynglyn â beth i'w ddewis yma."
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "Ar y dudalen yma, byddwch yn dewis a wneir creu tystysgrif yn ganolog neu "
+#~ "yn ganoledig neu yn ddatganoledig.  Gwiriwch efo'ch canolfan gymorth leol "
+#~ "os nad ydych yn sicr ynglyn â beth i'w ddewis yma."
 
 #~ msgid "Certificate &Generation"
 #~ msgstr "C&reu Tystysgrif"
@@ -15695,15 +15518,24 @@ msgstr "Trosysgrifo'r Ffeil?"
 
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "Mae eich ddwy allwedd llofnodi yn barod rwan i'w anfon i'r CA (awdurdod tysysgrifo), fydd yn creu tystysgrif i chi a'i hanfon yn ôl mewn ebost.  Adolygwch y dystysgrif isod.  Dylech hefyd ysgrifennu'r prawfswm i lawr i chi allu ei gydweddu â'r dystysgrif a dychwelir gan y CA.\n"
+#~ "Mae eich ddwy allwedd llofnodi yn barod rwan i'w anfon i'r CA (awdurdod "
+#~ "tysysgrifo), fydd yn creu tystysgrif i chi a'i hanfon yn ôl mewn ebost.  "
+#~ "Adolygwch y dystysgrif isod.  Dylech hefyd ysgrifennu'r prawfswm i lawr i "
+#~ "chi allu ei gydweddu â'r dystysgrif a dychwelir gan y CA.\n"
 #~ "<p>\n"
-#~ "Os hoffech newid rhywbeth, gwthiwch Yn Ôl a gwnewch eich newidiadau.  Fel arall, gwthiwch Gorffen i anfon y ddwy allwedd llofnodi i'r CA..\n"
+#~ "Os hoffech newid rhywbeth, gwthiwch Yn Ôl a gwnewch eich newidiadau.  Fel "
+#~ "arall, gwthiwch Gorffen i anfon y ddwy allwedd llofnodi i'r CA..\n"
 #~ "</qt>"
 
 #~ msgid "Extension"
@@ -15774,11 +15606,15 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "[%1] %2"
 
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
-#~ "Trosglwyddiad yn gyflawn.  %n neges newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd).\n"
-#~ "Trosglwyddiad yn gyflawn.  %n o negeseuon newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd)."
+#~ "Trosglwyddiad yn gyflawn.  %n neges newydd mewn %1 KB (%2 KB yn weddill "
+#~ "ar y gweinydd).\n"
+#~ "Trosglwyddiad yn gyflawn.  %n o negeseuon newydd mewn %1 KB (%2 KB yn "
+#~ "weddill ar y gweinydd)."
 
 #~ msgid ""
 #~ "_n: Transmission complete. %n message in %1 KB.\n"
@@ -15798,11 +15634,15 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Trosglwyddiad yn gyflawn. Dim neges newydd."
 
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "Trosglwyddiad yn gyflawn ar gyfer cyfrif %3.  %n neges newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd).\n"
-#~ "Trosglwyddiad yn gyflawnar gyfer cyfrif %3.  %n o negeseuon newydd mewn %1 KB (%2 KB yn weddill ar y gweinydd)."
+#~ "Trosglwyddiad yn gyflawn ar gyfer cyfrif %3.  %n neges newydd mewn %1 KB "
+#~ "(%2 KB yn weddill ar y gweinydd).\n"
+#~ "Trosglwyddiad yn gyflawnar gyfer cyfrif %3.  %n o negeseuon newydd mewn "
+#~ "%1 KB (%2 KB yn weddill ar y gweinydd)."
 
 #~ msgid ""
 #~ "_n: Transmission for account %2 complete. %n message in %1 KB.\n"
@@ -15836,8 +15676,11 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Mark Thread as &Ham"
 #~ msgstr "Nodi'r Edefyn fel E&bost Iawn"
 
-#~ msgid "<qt>The destination folder of the account <b>%1</b> was restored to the inbox.</qt>"
-#~ msgstr "<qt>Adferwyd plygell cyrchfan y cyfrif <b>%1</b> i'r blwch derbyn.</qt>"
+#~ msgid ""
+#~ "<qt>The destination folder of the account <b>%1</b> was restored to the "
+#~ "inbox.</qt>"
+#~ msgstr ""
+#~ "<qt>Adferwyd plygell cyrchfan y cyfrif <b>%1</b> i'r blwch derbyn.</qt>"
 
 #, fuzzy
 #~ msgid "Additionally, mark detected spam messages as read"
@@ -15896,8 +15739,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Invalid Reply-To Address"
 #~ msgstr "Cyfeiriad Ebost Annilys"
 
-#~ msgid "The wallet could not be opened. This error is most probably caused by providing a wrong password."
-#~ msgstr "Ni ellid agor y waled.  Mwy na thebyg, achosir y gwall yma gan ddarparu cyfrinair anghywir."
+#~ msgid ""
+#~ "The wallet could not be opened. This error is most probably caused by "
+#~ "providing a wrong password."
+#~ msgstr ""
+#~ "Ni ellid agor y waled.  Mwy na thebyg, achosir y gwall yma gan ddarparu "
+#~ "cyfrinair anghywir."
 
 #~ msgid "Local"
 #~ msgstr "Lleol"
@@ -15938,12 +15785,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Cynnwys yn yr ymofyn:"
 
 #~ msgid ""
-#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/Mail for its messages.\n"
-#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but this will replace existing files with the same name in the directory ~/Mail (e.g. inbox).\n"
+#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/"
+#~ "Mail for its messages.\n"
+#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but "
+#~ "this will replace existing files with the same name in the directory ~/"
+#~ "Mail (e.g. inbox).\n"
 #~ "Should KMail move the mail folders now?"
 #~ msgstr ""
-#~ "Mae'r cyfeiriadur ~/KMail yn bodoli.  Ond ers dipyn, defnyddia KMail y cyfeiriadur ~/Mail ar gyfer ei negeseuon.\n"
-#~ "Gall KMail symud cynnwys y cyfeiriadur ~/KMail i mewn i ~/Mail, ond bydd hyn yn amnewid ffeiliau cyfredol efo'r un un enw yn y cyfeiriadur ~/Mail (e.e. blwch derbyn).\n"
+#~ "Mae'r cyfeiriadur ~/KMail yn bodoli.  Ond ers dipyn, defnyddia KMail y "
+#~ "cyfeiriadur ~/Mail ar gyfer ei negeseuon.\n"
+#~ "Gall KMail symud cynnwys y cyfeiriadur ~/KMail i mewn i ~/Mail, ond bydd "
+#~ "hyn yn amnewid ffeiliau cyfredol efo'r un un enw yn y cyfeiriadur ~/Mail "
+#~ "(e.e. blwch derbyn).\n"
 #~ "Dylai KMail symud y plygyll ebost rwan?"
 
 #~ msgid "&Compact"
@@ -16006,12 +15859,23 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "sboncio"
 
 #, fuzzy
-#~ msgid "Your email address is not valid because it does not contain a <emph>@</emph>: you will not create valid messages if you do not change your address."
-#~ msgstr "Nid yw eich cyfeiriad ebost yn ddilys oherwydd nid yw'n cynnwys <emph>@</emph>.  Ni chreuir negeseuon dilys heb i chi newid eich cyfeiriad."
+#~ msgid ""
+#~ "Your email address is not valid because it does not contain a <emph>@</"
+#~ "emph>: you will not create valid messages if you do not change your "
+#~ "address."
+#~ msgstr ""
+#~ "Nid yw eich cyfeiriad ebost yn ddilys oherwydd nid yw'n cynnwys <emph>@</"
+#~ "emph>.  Ni chreuir negeseuon dilys heb i chi newid eich cyfeiriad."
 
 #, fuzzy
-#~ msgid "Your email address is not valid because it contains more than one <emph>@</emph>: you will not create valid messages if you do not change your address."
-#~ msgstr "Nid yw eich cyfeiriad ebost yn ddilys oherwydd mae'n cynnwys mwy nag un <emph>@</emph>.  Ni chreuir negeseuon dilys heb i chi newid eich cyfeiriad."
+#~ msgid ""
+#~ "Your email address is not valid because it contains more than one "
+#~ "<emph>@</emph>: you will not create valid messages if you do not change "
+#~ "your address."
+#~ msgstr ""
+#~ "Nid yw eich cyfeiriad ebost yn ddilys oherwydd mae'n cynnwys mwy nag un "
+#~ "<emph>@</emph>.  Ni chreuir negeseuon dilys heb i chi newid eich "
+#~ "cyfeiriad."
 
 #~ msgid "&Thread list of message headers"
 #~ msgstr "&Edafu'r rhestr o benawdau neges"
@@ -16077,8 +15941,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Anfon &Rwan"
 
 #, fuzzy
-#~ msgid "In order to let Outlook recognize you as the receiver, you need to indicate which one of the following addresses is your email address:"
-#~ msgstr "Er mwyn gadael i Outlook(tm) eich adnabod fel y derbyniwr, rhaid i chi benodi pa un o'r cyfeiriadau ebost dilynnol yw eich cyfeiriad ebost:"
+#~ msgid ""
+#~ "In order to let Outlook recognize you as the receiver, you need to "
+#~ "indicate which one of the following addresses is your email address:"
+#~ msgstr ""
+#~ "Er mwyn gadael i Outlook(tm) eich adnabod fel y derbyniwr, rhaid i chi "
+#~ "benodi pa un o'r cyfeiriadau ebost dilynnol yw eich cyfeiriad ebost:"
 
 #~ msgid "The answer was registered in your calendar."
 #~ msgstr "Cofrestrwyd yr ateb yn eich calendr."
@@ -16086,14 +15954,19 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "The answer was registered in your task list."
 #~ msgstr "Cofrestrwyd yr ateb yn eich rhestr dasgau."
 
-#~ msgid "None of your identities match the receiver of this message,<br> please choose which of the following addresses is yours:"
-#~ msgstr "Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
+#~ msgid ""
+#~ "None of your identities match the receiver of this message,<br> please "
+#~ "choose which of the following addresses is yours:"
+#~ msgstr ""
+#~ "Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, <br> "
+#~ "dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
 #~ msgid "Write your name here."
 #~ msgstr "Ysgrifennwch eich enw yma."
 
 #~ msgid "You can write the company or organization you work for."
-#~ msgstr "Gallwch ysgrifennu enw'r cwmni neu mudiad yr ydych yn gweithio iddo."
+#~ msgstr ""
+#~ "Gallwch ysgrifennu enw'r cwmni neu mudiad yr ydych yn gweithio iddo."
 
 #~ msgid "Groupware Functionality for KMail"
 #~ msgstr "Swyddogaeth Gylchwedd ar gyfer KMail"
@@ -16114,8 +15987,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Creu Plygell"
 
 #, fuzzy
-#~ msgid "<b>You do not seem to have any groupware folders configured in KMail.</b><br>This is probably because you are running KMail for the first time, or because you have enabled the groupware functionality for the first time.<br>You now have the choice between disabling the groupware functionality, or leaving it enabled and going through this wizard.<br>If you disable the groupware functionality for now, you can always enable it again from the KMail configure dialog."
-#~ msgstr "<b>Ymddengys nad ydych wedi ffurfweddu plygyll cylchwedd yn KMail.</b><br>Mwy na thebyg, y rheswm yw eich bod yn rhedeg KMail am y tro cyntaf, neu wedi galluogi'r swyddogaeth cylchewedd am y tro cyntaf.<br>Mae gennych y dewis rwan rhwng analluogi'r swyddogaeth cylchwedd, neu ei gadael yn alluog a mynd drwy'r dewin yma.<br>Os analluogwch y swyddogaeth cylchwedd rwan, gallwch o hyd ei halluogi eto o'r ymgom ffurfweddu KMail."
+#~ msgid ""
+#~ "<b>You do not seem to have any groupware folders configured in KMail.</"
+#~ "b><br>This is probably because you are running KMail for the first time, "
+#~ "or because you have enabled the groupware functionality for the first "
+#~ "time.<br>You now have the choice between disabling the groupware "
+#~ "functionality, or leaving it enabled and going through this wizard.<br>If "
+#~ "you disable the groupware functionality for now, you can always enable it "
+#~ "again from the KMail configure dialog."
+#~ msgstr ""
+#~ "<b>Ymddengys nad ydych wedi ffurfweddu plygyll cylchwedd yn KMail.</"
+#~ "b><br>Mwy na thebyg, y rheswm yw eich bod yn rhedeg KMail am y tro "
+#~ "cyntaf, neu wedi galluogi'r swyddogaeth cylchewedd am y tro cyntaf."
+#~ "<br>Mae gennych y dewis rwan rhwng analluogi'r swyddogaeth cylchwedd, neu "
+#~ "ei gadael yn alluog a mynd drwy'r dewin yma.<br>Os analluogwch y "
+#~ "swyddogaeth cylchwedd rwan, gallwch o hyd ei halluogi eto o'r ymgom "
+#~ "ffurfweddu KMail."
 
 #~ msgid "Groupware Functions"
 #~ msgstr "Swyddogaethau Cylchwedd"
@@ -16138,26 +16025,56 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Please set at least your name and email address."
 #~ msgstr "Gosodwch o leiaf eich enw a'ch cyfeiriad ebost."
 
-#~ msgid "If the groupware server is a kolab server with default settings, you only need to set these settings."
-#~ msgstr "Os mae'r gweinydd cylchwedd yn weinydd kolab efo gosodiadau rhagosod, mae angen i chi osod y gosodiadau yma yn unig."
+#~ msgid ""
+#~ "If the groupware server is a kolab server with default settings, you only "
+#~ "need to set these settings."
+#~ msgstr ""
+#~ "Os mae'r gweinydd cylchwedd yn weinydd kolab efo gosodiadau rhagosod, mae "
+#~ "angen i chi osod y gosodiadau yma yn unig."
 
-#~ msgid "If you want, you can create new accounts before going on with groupware configuration."
-#~ msgstr "Os hoffech, gallwch greu cyfrifon newydd cyn gyrru ymlaen efo ffurfweddu'r gylchwedd."
+#~ msgid ""
+#~ "If you want, you can create new accounts before going on with groupware "
+#~ "configuration."
+#~ msgstr ""
+#~ "Os hoffech, gallwch greu cyfrifon newydd cyn gyrru ymlaen efo "
+#~ "ffurfweddu'r gylchwedd."
 
-#~ msgid "If you want to make your groupware folders work with other applications, you might want to select a different language than English.<br>If this is not an issue, leave the language as is."
-#~ msgstr "Os hoffech wneud i'ch plygyll cylchwedd weithio efo cynhwysiadau eraill, mwy na thebyg byddwch eisiau dewis iaith arall yn lle Saesneg. <br>Os nid yw hyn o bwys, gadewch yr iaith fel mae hi. "
+#~ msgid ""
+#~ "If you want to make your groupware folders work with other applications, "
+#~ "you might want to select a different language than English.<br>If this is "
+#~ "not an issue, leave the language as is."
+#~ msgstr ""
+#~ "Os hoffech wneud i'ch plygyll cylchwedd weithio efo cynhwysiadau eraill, "
+#~ "mwy na thebyg byddwch eisiau dewis iaith arall yn lle Saesneg. <br>Os nid "
+#~ "yw hyn o bwys, gadewch yr iaith fel mae hi. "
 
-#~ msgid "The groupware functionality needs some special folders to store the contents of the calendar, contacts, tasks etc.<br>Please select the folder that the groupware folders should be subfolders of."
-#~ msgstr "Mae angen ar y swyddogaeth cylchwedd rai plygyll arbennig i gadw cynnwys y calendr, cysylltiadau, tasgau, ayyb.<br>Dewiswch y blygell y dylai'r plygyll cylchwedd fod yn is-blygyll ohoni."
+#~ msgid ""
+#~ "The groupware functionality needs some special folders to store the "
+#~ "contents of the calendar, contacts, tasks etc.<br>Please select the "
+#~ "folder that the groupware folders should be subfolders of."
+#~ msgstr ""
+#~ "Mae angen ar y swyddogaeth cylchwedd rai plygyll arbennig i gadw cynnwys "
+#~ "y calendr, cysylltiadau, tasgau, ayyb.<br>Dewiswch y blygell y dylai'r "
+#~ "plygyll cylchwedd fod yn is-blygyll ohoni."
 
 #~ msgid "<unnamed>"
 #~ msgstr "<di-enw>"
 
-#~ msgid "You have chosen the folder <b>%1</b> as parent of the groupware folders. When pressing the Finish button, those folders will be created if they do not already exist"
-#~ msgstr "Rydych wedi dewis y blygell <b>%1</b> fel rhiant y plygyll cylchwedd. Ar ôl i chi wthio'r botwm Gorffen, bydd y plygyll yma yn cael eu creu os nad ydynt mewn bod eisoes."
+#~ msgid ""
+#~ "You have chosen the folder <b>%1</b> as parent of the groupware folders. "
+#~ "When pressing the Finish button, those folders will be created if they do "
+#~ "not already exist"
+#~ msgstr ""
+#~ "Rydych wedi dewis y blygell <b>%1</b> fel rhiant y plygyll cylchwedd. Ar "
+#~ "ôl i chi wthio'r botwm Gorffen, bydd y plygyll yma yn cael eu creu os nad "
+#~ "ydynt mewn bod eisoes."
 
-#~ msgid "The folders present indicates that you want to use the selected folder language"
-#~ msgstr "Mae'r plygyll sydd yma yn awgrymu eich bod chi eisiau defnyddio'r iaith benodol i'r plygyll"
+#~ msgid ""
+#~ "The folders present indicates that you want to use the selected folder "
+#~ "language"
+#~ msgstr ""
+#~ "Mae'r plygyll sydd yma yn awgrymu eich bod chi eisiau defnyddio'r iaith "
+#~ "benodol i'r plygyll"
 
 #, fuzzy
 #~ msgid "The folder language cannot be guessed, please select a language:"
@@ -16213,8 +16130,10 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "blaenyrru i"
 
 #, fuzzy
-#~ msgid "You need to supply a user name and a password to access this mailbox."
-#~ msgstr "Rhaid i chi ddarparu defnydd-enw a chyfrinair i gyrchu'r blwch ebost yma."
+#~ msgid ""
+#~ "You need to supply a user name and a password to access this mailbox."
+#~ msgstr ""
+#~ "Rhaid i chi ddarparu defnydd-enw a chyfrinair i gyrchu'r blwch ebost yma."
 
 #~ msgid "On Program Exit, Perform Following Tasks"
 #~ msgstr "Wrth Terfynu'r Rhaglen, Gweithredu'r Tasgau Dilynol"
@@ -16313,8 +16232,24 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Security & Privacy Settings"
 #~ msgstr "Gosodiadau Diogelwch a Preifatrwydd"
 
-#~ msgid "<qt><p>This option enables the <em>unconditional</em> sending of delivery- and read confirmations (&quot;receipts&quot;).</p><p>Returning these confirmations (so-called <em>receipts</em>) makes it easy for the sender to track whether and - more importantly - <em>when</em> you read his/her message.</p><p>You can return <em>delivery</em> confirmations in a fine-grained manner using the &quot;confirm delivery&quot; filter action. We advise against issuing <em>read</em> confirmations at all.</p></qt>"
-#~ msgstr "<qt><p>Galluoga'r dewisiad yma yr anfon <em>diamod</em> o gadarnhadau derbyn a darllen (&quot;derbynnebau&quot;).</p><p>Mae dychwelyd y gadarnhadau yma (<em>derbynebau</em> ys dywedir) yn ei gwneud hi'n haws i'r anfonwr i ddilyn a ydych chi wedi darllen, ac - yn mwy bwysig - <em>pryd</em> y wnaethoch ddarllen ei neges.</p><p>Gallwch ddychwelyd cadarnhadau <em>derbyn</em> mewn ffordd graen mân gan ddefnyddio'r weithred hidlo &quot;cadarnhau derbyn&quot;.  Rydym yn eich cynghori yn erbyn cyhoeddi cadarnhadau <em>darllen</em> o gwbl.</p></qt>"
+#~ msgid ""
+#~ "<qt><p>This option enables the <em>unconditional</em> sending of "
+#~ "delivery- and read confirmations (&quot;receipts&quot;).</p><p>Returning "
+#~ "these confirmations (so-called <em>receipts</em>) makes it easy for the "
+#~ "sender to track whether and - more importantly - <em>when</em> you read "
+#~ "his/her message.</p><p>You can return <em>delivery</em> confirmations in "
+#~ "a fine-grained manner using the &quot;confirm delivery&quot; filter "
+#~ "action. We advise against issuing <em>read</em> confirmations at all.</"
+#~ "p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Galluoga'r dewisiad yma yr anfon <em>diamod</em> o gadarnhadau "
+#~ "derbyn a darllen (&quot;derbynnebau&quot;).</p><p>Mae dychwelyd y "
+#~ "gadarnhadau yma (<em>derbynebau</em> ys dywedir) yn ei gwneud hi'n haws "
+#~ "i'r anfonwr i ddilyn a ydych chi wedi darllen, ac - yn mwy bwysig - "
+#~ "<em>pryd</em> y wnaethoch ddarllen ei neges.</p><p>Gallwch ddychwelyd "
+#~ "cadarnhadau <em>derbyn</em> mewn ffordd graen mân gan ddefnyddio'r "
+#~ "weithred hidlo &quot;cadarnhau derbyn&quot;.  Rydym yn eich cynghori yn "
+#~ "erbyn cyhoeddi cadarnhadau <em>darllen</em> o gwbl.</p></qt>"
 
 #~ msgid "Open&PGP"
 #~ msgstr "Open&PGP"
@@ -16334,9 +16269,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&New"
 #~ msgstr "&Newydd"
 
-#~ msgid "Confi&gure..."
-#~ msgstr "Ffurf&weddu..."
-
 #~ msgid "Deac&tivate"
 #~ msgstr "Di&weithredu"
 
@@ -16428,20 +16360,40 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Can't save to addressbook."
 #~ msgstr "Methu cadw i'r llyfr cyfeiriadau."
 
-#~ msgid "<qt>The email address <b>%1</b> was added to your addressbook. You can add more information to this entry by opening the addressbook.</qt>"
-#~ msgstr "<qt>Ychwanegwyd y cyfeiriad ebost <b>%1</b> i'ch llyfr cyfeiriadau. Gallwch ychwanegu mwy o wybodaeth i'r cofnod yma gan agor y llyfr cyfeiriadau.</qt>"
+#~ msgid ""
+#~ "<qt>The email address <b>%1</b> was added to your addressbook. You can "
+#~ "add more information to this entry by opening the addressbook.</qt>"
+#~ msgstr ""
+#~ "<qt>Ychwanegwyd y cyfeiriad ebost <b>%1</b> i'ch llyfr cyfeiriadau. "
+#~ "Gallwch ychwanegu mwy o wybodaeth i'r cofnod yma gan agor y llyfr "
+#~ "cyfeiriadau.</qt>"
 
 #~ msgid "<qt>The email address <b>%1</b> is already in your addressbook.</qt>"
-#~ msgstr "<qt>Mae'r cyfeiriad ebost <b>%1</b> eisoes yn eich llyfr cyfeiriadau.</qt>"
+#~ msgstr ""
+#~ "<qt>Mae'r cyfeiriad ebost <b>%1</b> eisoes yn eich llyfr cyfeiriadau.</qt>"
 
-#~ msgid "No external address book application found. You might want to install KAddressBook from the tdepim module."
-#~ msgstr "Ni chanfuwyd cymhwysiad llyfr cyfeiriadau allanol.  Efallai hoffech osod KLlyfrCyfeiriadau o'r modiwl tdepim."
+#~ msgid ""
+#~ "No external address book application found. You might want to install "
+#~ "KAddressBook from the tdepim module."
+#~ msgstr ""
+#~ "Ni chanfuwyd cymhwysiad llyfr cyfeiriadau allanol.  Efallai hoffech osod "
+#~ "KLlyfrCyfeiriadau o'r modiwl tdepim."
 
-#~ msgid "The VCard was added to your addressbook. You can add more information to this entry by opening the addressbook."
-#~ msgstr "Ychwanegwyd y VCard i'ch llyfr cyfeiriadau.  Gallwch ychwanegu mwy o wybodaeth i'r cofnod yma gan agor y llyfr cyfeiriadau."
+#~ msgid ""
+#~ "The VCard was added to your addressbook. You can add more information to "
+#~ "this entry by opening the addressbook."
+#~ msgstr ""
+#~ "Ychwanegwyd y VCard i'ch llyfr cyfeiriadau.  Gallwch ychwanegu mwy o "
+#~ "wybodaeth i'r cofnod yma gan agor y llyfr cyfeiriadau."
 
-#~ msgid "The VCard's primary email address is already in your addressbook. However you may save the VCard into a file and import it into the addressbook manually."
-#~ msgstr "Mae prif gyfeiriad ebost y VCard yn eich llyfr cyfeiriadau eisoes.  Ond gallwch gadw'r VCard i mewn i ffeil, a'i fewnforio i'r llyfr cyfeiriadau â llaw."
+#~ msgid ""
+#~ "The VCard's primary email address is already in your addressbook. However "
+#~ "you may save the VCard into a file and import it into the addressbook "
+#~ "manually."
+#~ msgstr ""
+#~ "Mae prif gyfeiriad ebost y VCard yn eich llyfr cyfeiriadau eisoes.  Ond "
+#~ "gallwch gadw'r VCard i mewn i ffeil, a'i fewnforio i'r llyfr cyfeiriadau "
+#~ "â llaw."
 
 #~ msgid "Cancel job"
 #~ msgstr "Diddymu'r swydd"
@@ -16464,23 +16416,47 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&Attach file..."
 #~ msgstr "A&todi ffeil..."
 
-#~ msgid "You specified not to sign some parts of this message, but you wanted to be warned not to send unsigned messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â llofnodi rhai darnau o'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu llofnodi!"
+#~ msgid ""
+#~ "You specified not to sign some parts of this message, but you wanted to "
+#~ "be warned not to send unsigned messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â llofnodi rhai darnau o'r neges yma, ond "
+#~ "roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu "
+#~ "llofnodi!"
 
-#~ msgid "You specified not to sign this message, but you wanted to be warned not to send unsigned messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â llofnodi'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu llofnodi!"
+#~ msgid ""
+#~ "You specified not to sign this message, but you wanted to be warned not "
+#~ "to send unsigned messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â llofnodi'r neges yma, ond roeddech chi "
+#~ "eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu llofnodi!"
 
 #~ msgid "Sign all parts of this message?"
 #~ msgstr "Llofnodi pob rhan o'r neges yma?"
 
-#~ msgid "<qt><p>You have a trusted OpenPGP key for every recipient of this message and the message will be signed.</p><p>Should this message also be encrypted?</p></qt>"
-#~ msgstr "<qt><p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y neges yma, a bydd y neges yn cael ei llofnodi.</p><p>A ddylai'r neges yma gael ei chêl-ysgrifo hefyd?</p></qt>"
+#~ msgid ""
+#~ "<qt><p>You have a trusted OpenPGP key for every recipient of this message "
+#~ "and the message will be signed.</p><p>Should this message also be "
+#~ "encrypted?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Mae gennych allwedd OpenPGP ymddiriedig ar gyfer pob derbyniwr y "
+#~ "neges yma, a bydd y neges yn cael ei llofnodi.</p><p>A ddylai'r neges yma "
+#~ "gael ei chêl-ysgrifo hefyd?</p></qt>"
 
-#~ msgid "You specified not to encrypt some parts of this message, but you wanted to be warned not to send unencrypted messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â chêl-ysgrifo rhai darnau o'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu cêl-ysgrifo!"
+#~ msgid ""
+#~ "You specified not to encrypt some parts of this message, but you wanted "
+#~ "to be warned not to send unencrypted messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â chêl-ysgrifo rhai darnau o'r neges yma, "
+#~ "ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu "
+#~ "cêl-ysgrifo!"
 
-#~ msgid "You specified not to encrypt this message, but you wanted to be warned not to send unencrypted messages!"
-#~ msgstr "Rydych wedi penderfynu peidio â chêl-ysgrifo'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu cêl-ysgrifo!"
+#~ msgid ""
+#~ "You specified not to encrypt this message, but you wanted to be warned "
+#~ "not to send unencrypted messages!"
+#~ msgstr ""
+#~ "Rydych wedi penderfynu peidio â chêl-ysgrifo'r neges yma, ond roeddech "
+#~ "chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu cêl-ysgrifo!"
 
 #~ msgid "Encryption Warning"
 #~ msgstr "Rhybudd Cêl-ysgrifo"
@@ -16488,11 +16464,19 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Warning: Your S/MIME Plug-in configuration is unsafe."
 #~ msgstr "Rhybudd: Mae eich ffurfweddiad Ategyn S/MIME yn anniogel."
 
-#~ msgid "Encrypted messages should be stored in unencrypted form; saving locally in encrypted form is not allowed."
-#~ msgstr "Dylai cadw negeseuon wedi'u cêl-ysgrifo mewn ffurff heb ei gêl-ysgrifo; ni chaniateir cadw'n lleol mewn ffurf wedi ei gêl-ysgrifo."
+#~ msgid ""
+#~ "Encrypted messages should be stored in unencrypted form; saving locally "
+#~ "in encrypted form is not allowed."
+#~ msgstr ""
+#~ "Dylai cadw negeseuon wedi'u cêl-ysgrifo mewn ffurff heb ei gêl-ysgrifo; "
+#~ "ni chaniateir cadw'n lleol mewn ffurf wedi ei gêl-ysgrifo."
 
-#~ msgid "Please correct the wrong settings in KMail's Plug-in configuration pages as soon as possible."
-#~ msgstr "Gwiriwch y gosodiadau anghywir yn nhudalennau ffurfweddiad Ategyn KMail mor gyflym ac sy'n bosibl."
+#~ msgid ""
+#~ "Please correct the wrong settings in KMail's Plug-in configuration pages "
+#~ "as soon as possible."
+#~ msgstr ""
+#~ "Gwiriwch y gosodiadau anghywir yn nhudalennau ffurfweddiad Ategyn KMail "
+#~ "mor gyflym ac sy'n bosibl."
 
 #~ msgid "Store message in the recommended way?"
 #~ msgstr "Cadw'r neges yn y ffordd argymelledig?"
@@ -16506,38 +16490,88 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "<qt><p>This message could not be signed.</p>%1</qt>"
 #~ msgstr "<qt><p>Ni ellid llofnodi'r neges yma.</p>%1</qt>"
 
-#~ msgid "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-in '%1' did not return an encoded text block.</p><p>Probably a recipient's public key was not found or is untrusted.</p></qt>"
-#~ msgstr "<qt><p><b>Ni ellid cêl-ysgrifo'r neges yma!</b></p><p>Ni ddychwelodd yr Ategyn Celu '%1' floc testun amgodiedig.</p><p>Mwy na thebyg ni chanfuwyd allwedd gyhoeddus derbyniwr, neu ni ellid rhoi ymddiried ynddi.</p></qt>"
+#~ msgid ""
+#~ "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-"
+#~ "in '%1' did not return an encoded text block.</p><p>Probably a "
+#~ "recipient's public key was not found or is untrusted.</p></qt>"
+#~ msgstr ""
+#~ "<qt><p><b>Ni ellid cêl-ysgrifo'r neges yma!</b></p><p>Ni ddychwelodd yr "
+#~ "Ategyn Celu '%1' floc testun amgodiedig.</p><p>Mwy na thebyg ni chanfuwyd "
+#~ "allwedd gyhoeddus derbyniwr, neu ni ellid rhoi ymddiried ynddi.</p></qt>"
 
 #~ msgid "<qt><p>This message could not be encrypted!</p>%1</qt>"
 #~ msgstr "<qt><p>Ni ellid cêl-ysgrifo'r neges yma!</p>%1</qt>"
 
-#~ msgid "<qt><p>Error: The Crypto Plug-in '%1' returned<br>       \" structuring.makeMultiMime \"<br>but did <b>not</b> specify a Content-Type header for the ciphertext that was generated.</p><p>Please report this bug:<br>%2</p></qt>"
-#~ msgstr "<qt><p>Gwall: Dychwelodd yr Ategyn Celu '%1'<br>       \" structuring.makeMultiMime \"<br>ond<b>ni</b> phenododd benawd Math-Cynnwys (Content-Type) ar gyfer y testun seiffr a greuwyd.</p><p>Rhowch adroddiad ynglyn â'r nam yma:<br>%2</p></qt>"
+#~ msgid ""
+#~ "<qt><p>Error: The Crypto Plug-in '%1' returned<br>       \" structuring."
+#~ "makeMultiMime \"<br>but did <b>not</b> specify a Content-Type header for "
+#~ "the ciphertext that was generated.</p><p>Please report this bug:<br>%2</"
+#~ "p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Gwall: Dychwelodd yr Ategyn Celu '%1'<br>       \" structuring."
+#~ "makeMultiMime \"<br>ond<b>ni</b> phenododd benawd Math-Cynnwys (Content-"
+#~ "Type) ar gyfer y testun seiffr a greuwyd.</p><p>Rhowch adroddiad ynglyn "
+#~ "â'r nam yma:<br>%2</p></qt>"
 
 #~ msgid "No, let me change the encoding"
 #~ msgstr "Na, gadewch i mi newid yr amgodiad"
 
-#~ msgid "<qt>This message could not be signed because the OpenPGP key which should be used for signing messages with this identity couldn't be found in your keyring.<br><br>You can change the OpenPGP key which should be used with the current identity in the identity configuration.</qt>"
-#~ msgstr "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni ellid canfod yr allwedd OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon efo'r dynodiad yma ar eich modrwy allweddau.<br><br>Gallwch newid yr allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiadau.</qt>"
+#~ msgid ""
+#~ "<qt>This message could not be signed because the OpenPGP key which should "
+#~ "be used for signing messages with this identity couldn't be found in your "
+#~ "keyring.<br><br>You can change the OpenPGP key which should be used with "
+#~ "the current identity in the identity configuration.</qt>"
+#~ msgstr ""
+#~ "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni ellid canfod yr allwedd "
+#~ "OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon efo'r "
+#~ "dynodiad yma ar eich modrwy allweddau.<br><br>Gallwch newid yr allwedd "
+#~ "OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad "
+#~ "dynodiadau.</qt>"
 
-#~ msgid "<qt>This message could not be signed because you didn't define the OpenPGP key which should be used for signing messages with this identity.<br><br>You can define the OpenPGP key which should be used with the current identity in the identity configuration.</qt>"
-#~ msgstr "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni wnaethoch benodi yr allwedd OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon efo'r dynodiad yma.<br><br>Gallwch newid yr allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiadau.</qt>"
+#~ msgid ""
+#~ "<qt>This message could not be signed because you didn't define the "
+#~ "OpenPGP key which should be used for signing messages with this identity."
+#~ "<br><br>You can define the OpenPGP key which should be used with the "
+#~ "current identity in the identity configuration.</qt>"
+#~ msgstr ""
+#~ "<qt>Ni allwyd llofnodi'r neges yma oherwydd ni wnaethoch benodi yr "
+#~ "allwedd OpenPGP a ddylai gael ei defnyddio ar gyfer llofnodi negeseuon "
+#~ "efo'r dynodiad yma.<br><br>Gallwch newid yr allwedd OpenPGP a ddylir ei "
+#~ "defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiadau.</qt>"
 
 #~ msgid "Select Certificate [%1]"
 #~ msgstr "Dewis Tystysgrif [%1]"
 
-#~ msgid "The certificate you want to use for signing expires in %1 days.<br>This means that after this period, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
+#~ msgid ""
+#~ "The certificate you want to use for signing expires in %1 days.<br>This "
+#~ "means that after this period, the recipients will not be able to check "
+#~ "your signature any longer."
+#~ msgstr ""
+#~ "Bydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn "
+#~ "darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
 
-#~ msgid "The certificate you want to use for signing expired %1 days ago.<br>This means that the recipients will not be able to check your signature."
-#~ msgstr "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi wedi darfod %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod."
+#~ msgid ""
+#~ "The certificate you want to use for signing expired %1 days ago.<br>This "
+#~ "means that the recipients will not be able to check your signature."
+#~ msgstr ""
+#~ "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi wedi "
+#~ "darfod %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod."
 
-#~ msgid "The certificate you want to use for signing expires today.<br>This means that, starting from tomorrow, the recipients will not be able to check your signature any longer."
-#~ msgstr "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach, yn dechrau o yfory."
+#~ msgid ""
+#~ "The certificate you want to use for signing expires today.<br>This means "
+#~ "that, starting from tomorrow, the recipients will not be able to check "
+#~ "your signature any longer."
+#~ msgstr ""
+#~ "Mae'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod "
+#~ "heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod "
+#~ "mwyach, yn dechrau o yfory."
 
 #~ msgid "<qt><p>%1</p><p>Do you still want to use this certificate?</p></qt>"
-#~ msgstr "<qt><p>%1</p><p>Ydych eisiau defnyddio'r dystysgrif yma fodd bynnag?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>%1</p><p>Ydych eisiau defnyddio'r dystysgrif yma fodd bynnag?</p></"
+#~ "qt>"
 
 #~ msgid "Certificate Warning"
 #~ msgstr "Rhybudd Tystysgrif"
@@ -16545,44 +16579,117 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&Don't Use Certificate"
 #~ msgstr "&Peidio â Defnyddio Tystysgrif"
 
-#~ msgid "The root certificate of the certificate you want to use for signing expires in %1 days.<br>This means that after this period, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
+#~ msgid ""
+#~ "The root certificate of the certificate you want to use for signing "
+#~ "expires in %1 days.<br>This means that after this period, the recipients "
+#~ "will not be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr "
+#~ "yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
 
-#~ msgid "The root certificate of the certificate you want to use for signing expired %1 days ago.<br>This means that the recipients will not be able to check your signature."
-#~ msgstr "Darfu tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod."
+#~ msgid ""
+#~ "The root certificate of the certificate you want to use for signing "
+#~ "expired %1 days ago.<br>This means that the recipients will not be able "
+#~ "to check your signature."
+#~ msgstr ""
+#~ "Darfu tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar "
+#~ "gyfer llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn "
+#~ "gallu gwirio'ch llofnod."
 
-#~ msgid "The root certificate of the certificate you want to use for signing expires today.<br>This means that beginning from tomorrow, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach, yn dechrau o yfory."
+#~ msgid ""
+#~ "The root certificate of the certificate you want to use for signing "
+#~ "expires today.<br>This means that beginning from tomorrow, the recipients "
+#~ "will not be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif wraidd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod mwyach, yn dechrau o yfory."
 
-#~ msgid "The CA certificate of the certificate you want to use for signing expires in %1 days.<br>This means that after this period, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
+#~ msgid ""
+#~ "The CA certificate of the certificate you want to use for signing expires "
+#~ "in %1 days.<br>This means that after this period, the recipients will not "
+#~ "be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod mewn %1 o ddiwrnodau.<br> Golyga hyn na fydd derbynwyr "
+#~ "yn gallu gwirio'ch llofnod mwyach ar ôl y cyfnod yma."
 
-#~ msgid "The CA certificate of the certificate you want to use for signing expired %1 days ago.<br>This means that the recipients will not be able to check your signature."
-#~ msgstr "Darfu tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod."
+#~ msgid ""
+#~ "The CA certificate of the certificate you want to use for signing expired "
+#~ "%1 days ago.<br>This means that the recipients will not be able to check "
+#~ "your signature."
+#~ msgstr ""
+#~ "Darfu tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi %1 o ddiwrnodau yn ôl.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod."
 
-#~ msgid "The CA certificate of the certificate you want to use for signing expires today.<br>This means that beginning from tomorrow, the recipients will not be able to check your signature any longer."
-#~ msgstr "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu gwirio'ch llofnod mwyach, yn dechrau o yfory."
+#~ msgid ""
+#~ "The CA certificate of the certificate you want to use for signing expires "
+#~ "today.<br>This means that beginning from tomorrow, the recipients will "
+#~ "not be able to check your signature any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif CA y dystysgrif yr ydych eisiau ei defnyddio ar gyfer "
+#~ "llofnodi yn darfod heddiw.<br> Golyga hyn na fydd derbynwyr yn gallu "
+#~ "gwirio'ch llofnod mwyach, yn dechrau o yfory."
 
-#~ msgid "The certificate you want to use for signing does not contain your sender email address.<br>This means that it is not possible for the recipients to check whether the email really came from you."
-#~ msgstr "Nid yw'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn cynnwys eich cyfeiriad ebost anfonwr.<br>Golyga hyn na fydd derbynwyr yn gallu gwirio bod yr ebost wedi dod oddiwrthoch chi yn wir."
+#~ msgid ""
+#~ "The certificate you want to use for signing does not contain your sender "
+#~ "email address.<br>This means that it is not possible for the recipients "
+#~ "to check whether the email really came from you."
+#~ msgstr ""
+#~ "Nid yw'r dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi yn "
+#~ "cynnwys eich cyfeiriad ebost anfonwr.<br>Golyga hyn na fydd derbynwyr yn "
+#~ "gallu gwirio bod yr ebost wedi dod oddiwrthoch chi yn wir."
 
 #~ msgid "[unknown error]"
 #~ msgstr "[gwall anhysbys]"
 
-#~ msgid "<qt><p><b>This message could not be signed!</b></p><p>The Crypto Plug-In '%1' reported the following details:</p><p><i>%2</i></p><p>Your configuration might be invalid or the Plug-In damaged.</p><p><b>Please contact your system administrator.</b></p></qt>"
-#~ msgstr "<qt><p><b>Ni ellid llofnodi'r neges yma!</b></p><p>Adroddodd yr Ategyn Celu '%1' y manylion yma:</p><p><i>%2</i></p><p>Gall fod eich ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> <p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
+#~ msgid ""
+#~ "<qt><p><b>This message could not be signed!</b></p><p>The Crypto Plug-In "
+#~ "'%1' reported the following details:</p><p><i>%2</i></p><p>Your "
+#~ "configuration might be invalid or the Plug-In damaged.</p><p><b>Please "
+#~ "contact your system administrator.</b></p></qt>"
+#~ msgstr ""
+#~ "<qt><p><b>Ni ellid llofnodi'r neges yma!</b></p><p>Adroddodd yr Ategyn "
+#~ "Celu '%1' y manylion yma:</p><p><i>%2</i></p><p>Gall fod eich "
+#~ "ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> "
+#~ "<p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
 
-#~ msgid "<qt>No active Crypto Plug-In could be found.<br><br>Please activate a Plug-In in the configuration dialog.</qt>"
-#~ msgstr "<qt>Ni ellid canfod Ategyn Celu gweithredol.<br><br>Gweithredwch Ategyn yn yr ymgom ffurfweddiad.</qt>"
+#~ msgid ""
+#~ "<qt>No active Crypto Plug-In could be found.<br><br>Please activate a "
+#~ "Plug-In in the configuration dialog.</qt>"
+#~ msgstr ""
+#~ "<qt>Ni ellid canfod Ategyn Celu gweithredol.<br><br>Gweithredwch Ategyn "
+#~ "yn yr ymgom ffurfweddiad.</qt>"
 
-#~ msgid "<qt><p>The certification revocation lists, that are used for checking the validity of the certificate you want to use for encrypting, expire in %1 days.</p><p>Do you still want to encrypt this message?</p></qt>"
-#~ msgstr "<qt><p>Bydd y rhestri dirymu tystysgrifau, a ddefnyddir i wirio dilysrwydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi, yn darfod mewn %1  o ddiwrnodau.</p><p>Ydych chi eisiau cêl-ysgrifo'r neges yma beth bynnag?</p></qt>"
+#~ msgid ""
+#~ "<qt><p>The certification revocation lists, that are used for checking the "
+#~ "validity of the certificate you want to use for encrypting, expire in %1 "
+#~ "days.</p><p>Do you still want to encrypt this message?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Bydd y rhestri dirymu tystysgrifau, a ddefnyddir i wirio "
+#~ "dilysrwydd y dystysgrif yr ydych eisiau ei defnyddio ar gyfer llofnodi, "
+#~ "yn darfod mewn %1  o ddiwrnodau.</p><p>Ydych chi eisiau cêl-ysgrifo'r "
+#~ "neges yma beth bynnag?</p></qt>"
 
-#~ msgid "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-In '%1' reported the following details:</p><p><i>%2</i></p><p>Your configuration might be invalid or the Plug-In damaged.</p><p><b>Please contact your system administrator.</b></p></qt>"
-#~ msgstr "<qt><p><b>Ni ellid cêl-ysgrifo'r neges hon!</b></p><p>Adroddodd yr Ategyn Celu '%1' y manylion dilynnol:</p><p><i>%2</i></p><p>Gall fod eich ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> <p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
+#~ msgid ""
+#~ "<qt><p><b>This message could not be encrypted!</b></p><p>The Crypto Plug-"
+#~ "In '%1' reported the following details:</p><p><i>%2</i></p><p>Your "
+#~ "configuration might be invalid or the Plug-In damaged.</p><p><b>Please "
+#~ "contact your system administrator.</b></p></qt>"
+#~ msgstr ""
+#~ "<qt><p><b>Ni ellid cêl-ysgrifo'r neges hon!</b></p><p>Adroddodd yr Ategyn "
+#~ "Celu '%1' y manylion dilynnol:</p><p><i>%2</i></p><p>Gall fod eich "
+#~ "ffurfweddiad yn annilys, neu bod yr Ategyn wedi cael niwed.</p> "
+#~ "<p><b>Cysylltwch â gweinyddwr eich cysawd.</b></p></qt> "
 
-#~ msgid "Enter different address for recipient %1 or enter \" * \" to see all certificates:"
-#~ msgstr "Rhowch cyfeiriad gwahanol ar gyfer derbyniwr %1 neu rowch  \" * \" i weld pob tystysgrif:"
+#~ msgid ""
+#~ "Enter different address for recipient %1 or enter \" * \" to see all "
+#~ "certificates:"
+#~ msgstr ""
+#~ "Rhowch cyfeiriad gwahanol ar gyfer derbyniwr %1 neu rowch  \" * \" i weld "
+#~ "pob tystysgrif:"
 
 #~ msgid "Select Certificate for Encryption [%1]"
 #~ msgstr "Dewis Tystysgrif ar gyfer Cêl-ysgrifo [%1]"
@@ -16590,29 +16697,71 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&Select certificate for recipient %1:"
 #~ msgstr "D&ewis tystysgrif ar gyfer derbyniwr %1:"
 
-#~ msgid "(Certificates matching address \"%1\", press [Cancel] to use different address for recipient %2.)"
-#~ msgstr "(Mae'r tystysgrifau yn cydweddu â chyfeiriad \"%1\", gwthiwch [Diddymu] i ddefnyddio cyfeiriad gwahanol ar gyfer derbyniwr %2.)"
+#~ msgid ""
+#~ "(Certificates matching address \"%1\", press [Cancel] to use different "
+#~ "address for recipient %2.)"
+#~ msgstr ""
+#~ "(Mae'r tystysgrifau yn cydweddu â chyfeiriad \"%1\", gwthiwch [Diddymu] i "
+#~ "ddefnyddio cyfeiriad gwahanol ar gyfer derbyniwr %2.)"
 
 #~ msgid "Certificate Warning [%1]"
 #~ msgstr "Rhybudd Tystysgrif [%1]"
 
-#~ msgid "The certificate of the recipient you want to send this message to expires in %1 days.<br>This means that after this period, the recipient will not be able to read your message any longer."
-#~ msgstr "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod mewn %1 o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges mwyach ar ôl y cyfnod yna."
+#~ msgid ""
+#~ "The certificate of the recipient you want to send this message to expires "
+#~ "in %1 days.<br>This means that after this period, the recipient will not "
+#~ "be able to read your message any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod "
+#~ "mewn %1 o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen "
+#~ "eich neges mwyach ar ôl y cyfnod yna."
 
-#~ msgid "The certificate of the recipient you want to send this message to expired %1 days ago.<br>This means that the recipient will not be able to read your message."
-#~ msgstr "Darfuwyd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo ers %1 o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges."
+#~ msgid ""
+#~ "The certificate of the recipient you want to send this message to expired "
+#~ "%1 days ago.<br>This means that the recipient will not be able to read "
+#~ "your message."
+#~ msgstr ""
+#~ "Darfuwyd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo ers %1 "
+#~ "o ddiwrnodau.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich "
+#~ "neges."
 
-#~ msgid "The certificate of the recipient you want to send this message to expires today.<br>This means that beginning from tomorrow, the recipient will not be able to read your message any longer."
-#~ msgstr "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod heddiw.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges mwyach yn dechrau o yfory."
+#~ msgid ""
+#~ "The certificate of the recipient you want to send this message to expires "
+#~ "today.<br>This means that beginning from tomorrow, the recipient will not "
+#~ "be able to read your message any longer."
+#~ msgstr ""
+#~ "Bydd tystysgrif y derbyniwr yr ydych am anfon y neges yma iddo yn darfod "
+#~ "heddiw.<br>Golyga hyn na fydd y derbyniwr yn gallu darllen eich neges "
+#~ "mwyach yn dechrau o yfory."
 
-#~ msgid "One of the certificates in the chain of the certificate of the recipient you want to send this message to expires in %1 days.<br>This means that after this period, the recipient might not be able to read your message any longer."
-#~ msgstr "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych am anfon y neges yma iddo yn darfod mewn %1 o ddiwrnodau.<br>Golyga hyn y gall y derbyniwr fethu darllen eich neges mwyach ar ôl y cyfnod yna."
+#~ msgid ""
+#~ "One of the certificates in the chain of the certificate of the recipient "
+#~ "you want to send this message to expires in %1 days.<br>This means that "
+#~ "after this period, the recipient might not be able to read your message "
+#~ "any longer."
+#~ msgstr ""
+#~ "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych "
+#~ "am anfon y neges yma iddo yn darfod mewn %1 o ddiwrnodau.<br>Golyga hyn y "
+#~ "gall y derbyniwr fethu darllen eich neges mwyach ar ôl y cyfnod yna."
 
-#~ msgid "One of the certificates in the chain of the certificate of the recipient you want to send this message to expired %1 days ago.<br>This means that the recipient might not be able to read your message."
-#~ msgstr "Darfuwyd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych am anfon y neges yma iddo ers %1 o ddiwrnodau.<br>Golyga hyn y gall y derbyniwr fethu darllen eich neges."
+#~ msgid ""
+#~ "One of the certificates in the chain of the certificate of the recipient "
+#~ "you want to send this message to expired %1 days ago.<br>This means that "
+#~ "the recipient might not be able to read your message."
+#~ msgstr ""
+#~ "Darfuwyd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr "
+#~ "ydych am anfon y neges yma iddo ers %1 o ddiwrnodau.<br>Golyga hyn y gall "
+#~ "y derbyniwr fethu darllen eich neges."
 
-#~ msgid "One of the certificates in the chain of the certificate of the recipient you want to send this message to expires today.<br>This means that beginning from tomorrow, the recipient might not be able to read your message any longer."
-#~ msgstr "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych am anfon y neges yma iddo yn darfod heddiw.<br>Golyga hyn y gall y derbyniwr fethu darllen eich neges mwyach yn dechrau o yfory."
+#~ msgid ""
+#~ "One of the certificates in the chain of the certificate of the recipient "
+#~ "you want to send this message to expires today.<br>This means that "
+#~ "beginning from tomorrow, the recipient might not be able to read your "
+#~ "message any longer."
+#~ msgstr ""
+#~ "Bydd un o'r tystysgrifau yn y cadwyn o dystysgrifau'r derbyniwr yr ydych "
+#~ "am anfon y neges yma iddo yn darfod heddiw.<br>Golyga hyn y gall y "
+#~ "derbyniwr fethu darllen eich neges mwyach yn dechrau o yfory."
 
 #~ msgid "Unable to obtain your public key."
 #~ msgstr "Methu nôl eich allwedd gyhoeddus."
@@ -16623,8 +16772,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Unable to obtain the selected public key."
 #~ msgstr "Methu cael yr allwedd gyhoeddus ddewisiedig."
 
-#~ msgid "<qt><p>In order to be able to encrypt this message you first have to define the OpenPGP key, which should be used to encrypt the message to yourself.</p><p>You can define the OpenPGP key, which should be used with the current identity, in the identity configuration.</p></qt>"
-#~ msgstr "<qt><p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio i gêl-ysgrifo'r neges i chi eich hun.</p><p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
+#~ msgid ""
+#~ "<qt><p>In order to be able to encrypt this message you first have to "
+#~ "define the OpenPGP key, which should be used to encrypt the message to "
+#~ "yourself.</p><p>You can define the OpenPGP key, which should be used with "
+#~ "the current identity, in the identity configuration.</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Er mwyn gallu cêl-ysgrifo'r neges yma, rhaid i chi yn gyntaf "
+#~ "ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio i gêl-ysgrifo'r neges i "
+#~ "chi eich hun.</p><p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei "
+#~ "defnyddio efo'r dynodiad cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
 
 #~ msgid "&Yes, Send as Is"
 #~ msgstr "&Iawn, Anfon fel Mae"
@@ -16706,19 +16863,26 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Mae tasg wedi'i neilltuo i chi: <br>%1"
 
 #~ msgid "Sender <b>accepts</b> the invitation to meet in %1<br>from %2 to %3."
-#~ msgstr "<b>Derbynna</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
+#~ msgstr ""
+#~ "<b>Derbynna</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
 
 #~ msgid "Sender <b>accepts</b> the task <b>%1</b>."
 #~ msgstr "<b>Derbynna</b> yr anfonwr y dasg <b>%1</b>."
 
-#~ msgid "Sender <b>tentatively accepts</b> the invitation to meet in %1<br>from %2 to %3."
-#~ msgstr "<b>Derbynna</b> yr anfonwr <b>yn betrus</b> y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
+#~ msgid ""
+#~ "Sender <b>tentatively accepts</b> the invitation to meet in %1<br>from %2 "
+#~ "to %3."
+#~ msgstr ""
+#~ "<b>Derbynna</b> yr anfonwr <b>yn betrus</b> y gwahoddiad i gyfarfod yn %1 "
+#~ "<br> o %2 i %3."
 
 #~ msgid "Sender <b>tentatively accepts</b> the task <b>%1</b>."
 #~ msgstr "<b>Derbynna</b> yr anfonwr <b>yn betrus</b> y dasg <b>%1</b>."
 
-#~ msgid "Sender <b>declines</b> the invitation to meet in %1<br>from %2 to %3."
-#~ msgstr "<b>Gwrthoda</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
+#~ msgid ""
+#~ "Sender <b>declines</b> the invitation to meet in %1<br>from %2 to %3."
+#~ msgstr ""
+#~ "<b>Gwrthoda</b> yr anfonwr y gwahoddiad i gyfarfod yn %1 <br> o %2 i %3."
 
 #~ msgid "Sender <b>declines</b> the task %1."
 #~ msgstr "<b>Gwrthoda</b> yr anfonwr y dasg <b>%1</b>."
@@ -16756,8 +16920,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Folder is read-only."
 #~ msgstr "Mae'r blygell yn ddarllenadwy yn unig."
 
-#~ msgid "<qt>Do you really want to delete the selected message?<br>Once deleted, it cannot be restored!</qt>"
-#~ msgstr "<qt>Ydych wir eisiau dileu'r neges ddewisiedig?<br>Wedi'i ddileu, ni ellir ei adfer!</qt>"
+#~ msgid ""
+#~ "<qt>Do you really want to delete the selected message?<br>Once deleted, "
+#~ "it cannot be restored!</qt>"
+#~ msgstr ""
+#~ "<qt>Ydych wir eisiau dileu'r neges ddewisiedig?<br>Wedi'i ddileu, ni "
+#~ "ellir ei adfer!</qt>"
 
 #~ msgid "<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>"
 #~ msgstr "<qt>Methodd weithredu sgript llofnod<br><b>%1</b>:<br>%2</qt>"
@@ -16777,8 +16945,12 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Empty &Trash"
 #~ msgstr "Gwagu'r &Sbwriel"
 
-#~ msgid "Expire old messages from all folders? Expired messages are permanently deleted."
-#~ msgstr "Darfod hen negeseuon o bob plygell?  Dileuir negeseuon wedi darfod yn barhaol."
+#~ msgid ""
+#~ "Expire old messages from all folders? Expired messages are permanently "
+#~ "deleted."
+#~ msgstr ""
+#~ "Darfod hen negeseuon o bob plygell?  Dileuir negeseuon wedi darfod yn "
+#~ "barhaol."
 
 #~ msgid "Don't Expire"
 #~ msgstr "Peidio â Darfod"
@@ -16789,8 +16961,14 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Copy Link Location"
 #~ msgstr "Copïo Lleoliad Cyswllt"
 
-#~ msgid "Operations on the parent of a closed thread are now performed on all messages of that thread. That means it is now possible for example to delete a whole thread or subthread by closing it and deleting the parent."
-#~ msgstr "Gweithredir gweithredoedd ar riant edefyn caëedig ar bob neges yn yr edefyn yna rwan.  Golyga hyn ei bod hi'n bosibl, er enghraifft, i ddileu holl edefyn neu is-edefyn drwy ei gau a dileu'r rhiant."
+#~ msgid ""
+#~ "Operations on the parent of a closed thread are now performed on all "
+#~ "messages of that thread. That means it is now possible for example to "
+#~ "delete a whole thread or subthread by closing it and deleting the parent."
+#~ msgstr ""
+#~ "Gweithredir gweithredoedd ar riant edefyn caëedig ar bob neges yn yr "
+#~ "edefyn yna rwan.  Golyga hyn ei bod hi'n bosibl, er enghraifft, i ddileu "
+#~ "holl edefyn neu is-edefyn drwy ei gau a dileu'r rhiant."
 
 #~ msgid "KMail can now be embedded in the Kontact container application."
 #~ msgstr "Gellir mewnadeiladu KMail yn y cymhwysiad cynhwysydd Kyswllt."
@@ -16802,7 +16980,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Cynhelir gwirio sillafu tra'n teipio."
 
 #~ msgid "Panel applet showing unread message totals."
-#~ msgstr "Rhaglennig Panel sy'n dangos cyfansymiau o negeseuon heb eu darllen."
+#~ msgstr ""
+#~ "Rhaglennig Panel sy'n dangos cyfansymiau o negeseuon heb eu darllen."
 
 #~ msgid "Per folder duplicate mail removal"
 #~ msgstr "Gwaredu ebostau dyblyg ym mhob plygell."
@@ -16820,7 +16999,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "Blaenbeipio SMTP (cyflymach i anfon ebost)."
 
 #~ msgid "Separate reader window improvements, including new tool bar"
-#~ msgstr "Gwelliannau i'r ffenestr ddarllenydd ar wahân, yn cynnwys bar offer newydd"
+#~ msgstr ""
+#~ "Gwelliannau i'r ffenestr ddarllenydd ar wahân, yn cynnwys bar offer newydd"
 
 #~ msgid "Configurable startup folder."
 #~ msgstr "Plygell cychwyn a ellir ei ffurfweddu."
@@ -16846,14 +17026,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "More flexible layout (no message pane or panes side by side)"
 #~ msgstr "Cynllun mwy hyblyg (dim cwarel(i) neges ymyl wrth ymyl)"
 
-#~ msgid "View..."
-#~ msgstr "Gweld..."
-
 #~ msgid "Properties..."
 #~ msgstr "Priodweddau..."
 
-#~ msgid "Only one instance of KMail can be run at any one time. It is already running with PID %1 on host %2 according to the lock file located at %3."
-#~ msgstr "Dim ond un enghraifft o KMail a ellir ei redeg wrth un adeg.  Mae'n rhedeg eisoes efo PID %1 ar westeiwr %2, yn ôl y ffeil clo a leolir wrth %3."
+#~ msgid ""
+#~ "Only one instance of KMail can be run at any one time. It is already "
+#~ "running with PID %1 on host %2 according to the lock file located at %3."
+#~ msgstr ""
+#~ "Dim ond un enghraifft o KMail a ellir ei redeg wrth un adeg.  Mae'n "
+#~ "rhedeg eisoes efo PID %1 ar westeiwr %2, yn ôl y ffeil clo a leolir wrth "
+#~ "%3."
 
 #~ msgid "Good signature!"
 #~ msgstr "Llofnod dilys!"
@@ -16888,16 +17070,24 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>X.500 Directory Services</h1>\n"
-#~ "You can use X.500 directory services to retrieve certificates and certificate revocation lists that are not saved locally. Ask your local administrator if you want to make use of this feature and are unsure which directory service you can use.\n"
+#~ "You can use X.500 directory services to retrieve certificates and "
+#~ "certificate revocation lists that are not saved locally. Ask your local "
+#~ "administrator if you want to make use of this feature and are unsure "
+#~ "which directory service you can use.\n"
 #~ "<p>\n"
-#~ "If you do not use a directory service, you can still use local certificates.\n"
+#~ "If you do not use a directory service, you can still use local "
+#~ "certificates.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwasanaethau Cyfeiriadur X.500</h1>\n"
-#~ "Gallwch ddefnyddio gwasanaethau cyfeiriadur X.500 i nôl tystysgrifau a rhestri dirymu tystysgrifau na chedwir yn lleol.  Gofynnwch i'ch gweinyddwr lleol os hoffech ddefnyddio'r nodwedd yma, ac os ydych yn ansicr o ba wasanaeth cyfeiriadur i'w ddefnyddio.\n"
+#~ "Gallwch ddefnyddio gwasanaethau cyfeiriadur X.500 i nôl tystysgrifau a "
+#~ "rhestri dirymu tystysgrifau na chedwir yn lleol.  Gofynnwch i'ch "
+#~ "gweinyddwr lleol os hoffech ddefnyddio'r nodwedd yma, ac os ydych yn "
+#~ "ansicr o ba wasanaeth cyfeiriadur i'w ddefnyddio.\n"
 #~ "<p>\n"
-#~ "Os ni ddefnyddiwch gwasanaeth cyfeiriadur, gallwch ddal i ddefnyddio tystysgrifau lleol serch hynny.\n"
+#~ "Os ni ddefnyddiwch gwasanaeth cyfeiriadur, gallwch ddal i ddefnyddio "
+#~ "tystysgrifau lleol serch hynny.\n"
 #~ "</qt>"
 
 #~ msgid "Local/Remote Certificates"
@@ -16912,12 +17102,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>First Local, Then Directory Services</h1>\n"
-#~ "When this option is selected, the email client will first try to find the necessary certificates on your local computer. If they cannot be found there, it will query the directory services specified in the list above in the order given there.\n"
+#~ "When this option is selected, the email client will first try to find the "
+#~ "necessary certificates on your local computer. If they cannot be found "
+#~ "there, it will query the directory services specified in the list above "
+#~ "in the order given there.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn gyntaf, wedyn gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y tystysgrifau gofynnol ar eich cyfrifiadur lleol yn gyntaf.  Os na ellir eu canfod yna, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "tystysgrifau gofynnol ar eich cyfrifiadur lleol yn gyntaf.  Os na ellir "
+#~ "eu canfod yna, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y "
+#~ "rhestr uchod yn y trefn a rhoir yna.\n"
 #~ "</qt>"
 
 #~ msgid "&Local only, don't use directory services"
@@ -16929,16 +17125,22 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Local Only, Don't Use Directory Services</h1>\n"
-#~ "When this option is selected, the email client will only try to find the necessary certificates on your local computer. If they cannot be found there, they are not available for the operation in question.\n"
+#~ "When this option is selected, the email client will only try to find the "
+#~ "necessary certificates on your local computer. If they cannot be found "
+#~ "there, they are not available for the operation in question.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn unig, peidiwch â defnyddio gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y tystysgrifau gofynnol ar eich cyfrifiadur lleol yn unig.  Os na ellir eu canfod yna, nid ydynt ar gael ar gyfer y weithrediad penodol.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "tystysgrifau gofynnol ar eich cyfrifiadur lleol yn unig.  Os na ellir eu "
+#~ "canfod yna, nid ydynt ar gael ar gyfer y weithrediad penodol.\n"
 #~ "</qt>"
 
 #~ msgid "&Directory services only, don't use locally saved information"
-#~ msgstr "&Gwasanaethau cyfeiriadur yn unig, peidiwch â defnyddio gwybodaeth a gedwir yn lleol"
+#~ msgstr ""
+#~ "&Gwasanaethau cyfeiriadur yn unig, peidiwch â defnyddio gwybodaeth a "
+#~ "gedwir yn lleol"
 
 #~ msgid "Click to use remote certificates only"
 #~ msgstr "Cliciwch i ddefnyddio tystysgrifau pell yn unig"
@@ -16946,29 +17148,45 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Directory Services Only</h1>\n"
-#~ "When this option is selected, the email client will not use the certificates on your local computer. Instead, it will query the directory services specified in the list above in the order given there. If none of the services has the certificate in question, it cannot be used for the operation.\n"
+#~ "When this option is selected, the email client will not use the "
+#~ "certificates on your local computer. Instead, it will query the directory "
+#~ "services specified in the list above in the order given there. If none of "
+#~ "the services has the certificate in question, it cannot be used for the "
+#~ "operation.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwasanaethau cyfeiriadur yn unig</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r tystysgrifau ar eich cyfrifiadur lleol.  Yn lle, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif benodol, nid yw ar gael ar gyfer y weithrediad.\n"
+#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r "
+#~ "tystysgrifau ar eich cyfrifiadur lleol.  Yn lle, bydd yn holi y "
+#~ "gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir "
+#~ "yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif benodol, nid yw ar "
+#~ "gael ar gyfer y weithrediad.\n"
 #~ "</qt>"
 
 #~ msgid "Local/Remote CRLs"
 #~ msgstr "CRLau Lleol/Pell"
 
 #~ msgid "Click to use both local and remote CRLs"
-#~ msgstr "Cliciwch i ddefnyddio Rhestri Dirymu Tystysgrifau (CRLau) lleol a pell ill dau"
+#~ msgstr ""
+#~ "Cliciwch i ddefnyddio Rhestri Dirymu Tystysgrifau (CRLau) lleol a pell "
+#~ "ill dau"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>First Local, Then Directory Services</h1>\n"
-#~ "When this option is selected, the email client will first try to find the necessary certificate revocation lists (CRLs) on your local computer. If they cannot be found there, it will query the directory services specified in the list above in the order given there.\n"
+#~ "When this option is selected, the email client will first try to find the "
+#~ "necessary certificate revocation lists (CRLs) on your local computer. If "
+#~ "they cannot be found there, it will query the directory services "
+#~ "specified in the list above in the order given there.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn gyntaf, wedyn gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y rhestri dirymu tystysgrifau (CRLau)   gofynnol ar eich cyfrifiadur lleol yn gyntaf.  Os na ellir eu canfod yna, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "rhestri dirymu tystysgrifau (CRLau)   gofynnol ar eich cyfrifiadur lleol "
+#~ "yn gyntaf.  Os na ellir eu canfod yna, bydd yn holi y gwasanaethau "
+#~ "cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.\n"
 #~ "</qt>"
 
 #~ msgid "Click to use only local CRLs"
@@ -16977,12 +17195,18 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Local Only, Don't Use Directory Services</h1>\n"
-#~ "When this option is selected, the email client will only try to find the necessary certificate revocation lists (CRLs) on your local computer. If they cannot be found there, they are not available for the operation in question.\n"
+#~ "When this option is selected, the email client will only try to find the "
+#~ "necessary certificate revocation lists (CRLs) on your local computer. If "
+#~ "they cannot be found there, they are not available for the operation in "
+#~ "question.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lleol yn unig, peidiwch â defnyddio gwasanaethau cyfeiriadur</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y rhestri dirymu tystysgrifau (CRLau) gofynnol ar eich cyfrifiadur lleol yn unig.  Os na ellir eu canfod yna, nid ydynt ar gael ar gyfer y weithrediad penodol.\n"
+#~ "Pan ddewisir y dewisiad yma, bydd y dibynnydd ebost yn ceisio canfod y "
+#~ "rhestri dirymu tystysgrifau (CRLau) gofynnol ar eich cyfrifiadur lleol yn "
+#~ "unig.  Os na ellir eu canfod yna, nid ydynt ar gael ar gyfer y "
+#~ "weithrediad penodol.\n"
 #~ "</qt>"
 
 #~ msgid "Click to use remote CRLs only"
@@ -16991,12 +17215,20 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Directory Services Only</h1>\n"
-#~ "When this option is selected, the email client will not use the certificate revocation lists (CRLs) on your local computer. Instead, it will query the directory services specified in the list above in the order given there. If none of the services has the certificate in question, it cannot be used for the operation.\n"
+#~ "When this option is selected, the email client will not use the "
+#~ "certificate revocation lists (CRLs) on your local computer. Instead, it "
+#~ "will query the directory services specified in the list above in the "
+#~ "order given there. If none of the services has the certificate in "
+#~ "question, it cannot be used for the operation.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwasanaethau cyfeiriadur yn unig</h1>\n"
-#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r rhestri dirymu tystysgrifau (CRLau) ar eich cyfrifiadur lleol.  Yn lle, bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y trefn a rhoir yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif benodol, nid yw ar gael ar gyfer y weithrediad.\n"
+#~ "Pan ddewisir y dewisiad yma, ni fydd y dibynnydd ebost yn defnyddio'r "
+#~ "rhestri dirymu tystysgrifau (CRLau) ar eich cyfrifiadur lleol.  Yn lle, "
+#~ "bydd yn holi y gwasanaethau cyfeiriadur a phenodir yn y rhestr uchod yn y "
+#~ "trefn a rhoir yna.  Os nid oes gan un o'r gwasanaethau y dystysgrif "
+#~ "benodol, nid yw ar gael ar gyfer y weithrediad.\n"
 #~ "</qt>"
 
 #~ msgid "Click to add a service"
@@ -17005,12 +17237,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Add a Directory Service</h1>\n"
-#~ "By clicking this button, you can select a new directory service to be used for retrieving certificates and CRLs. You will be asked for the server name and an optional description.\n"
+#~ "By clicking this button, you can select a new directory service to be "
+#~ "used for retrieving certificates and CRLs. You will be asked for the "
+#~ "server name and an optional description.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ychwanegu Gwasanaeth Cyfeiriadur</h1>\n"
-#~ "Gan glicio'r botwm yma, gallwch ddewis gwasanaeth cyfeiriadur newydd i'w ddefnyddio ar gyfer nôl tystysgrifau a CRLau.  Byddwch yn cael eich gofyn am enw'r gweinydd a disgrifiad dewisol.\n"
+#~ "Gan glicio'r botwm yma, gallwch ddewis gwasanaeth cyfeiriadur newydd i'w "
+#~ "ddefnyddio ar gyfer nôl tystysgrifau a CRLau.  Byddwch yn cael eich gofyn "
+#~ "am enw'r gweinydd a disgrifiad dewisol.\n"
 #~ "</qt>"
 
 #~ msgid "&Remove Service"
@@ -17019,12 +17255,16 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Remove Directory Service</h1>\n"
-#~ "By clicking this button, you can remove the currently selected directory service in the list above. You will have a chance to rethink your decision before the entry is deleted from the list.\n"
+#~ "By clicking this button, you can remove the currently selected directory "
+#~ "service in the list above. You will have a chance to rethink your "
+#~ "decision before the entry is deleted from the list.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gwaredu Gwasanaeth Cyfeiriadur</h1>\n"
-#~ "Gan glicio'r botwm yma, gallwch waredu'r gwasanaeth cyfeiriadur a ddewisir ar hyn o bryd yn y rhestr uchod.  Byddwch yn cael cyfle i ail-ystyried eich penderfyniad cyn i'r cofnod gael ei ddileu o'r rhestr.\n"
+#~ "Gan glicio'r botwm yma, gallwch waredu'r gwasanaeth cyfeiriadur a "
+#~ "ddewisir ar hyn o bryd yn y rhestr uchod.  Byddwch yn cael cyfle i ail-"
+#~ "ystyried eich penderfyniad cyn i'r cofnod gael ei ddileu o'r rhestr.\n"
 #~ "</qt>"
 
 #~ msgid "Connection is encrypted"
@@ -17040,23 +17280,55 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "<p>...y gallwch ddefnuddio bysyll Chwith/Dde eich\n"
 #~ "bysellfwrdd i fynd i'r neges flaenorol/nesaf?</p>\n"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME tree (if visible) between message list and reader pane</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel darllenydd</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME "
+#~ "tree (if visible) between message list and reader pane</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel "
+#~ "darllenydd</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME tree (if visible) below reader pane</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </li><li>Coeden MIME (os yn weladwy) dan y cwarel darllenydd</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Long folder list</li><li>MIME "
+#~ "tree (if visible) below reader pane</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) dan y cwarel darllenydd</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Basically long folder list</ li><li>MIME tree (if visible) below folder list</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir sylfaenol o blygyll </li><li>Coeden MIME (os yn weladwy) dan y rhestr plygyll</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Basically long folder list</ "
+#~ "li><li>MIME tree (if visible) below folder list</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr hir sylfaenol o blygyll "
+#~ "</li><li>Coeden MIME (os yn weladwy) dan y rhestr plygyll</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Medium folder list</li><li>MIME tree (if visible) between message list and reader pane</li><li>Full width reader pane</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr canolig o blygyll </li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel darllenydd</li><li>Cwarel darllenydd lled llawn</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Medium folder list</li><li>MIME "
+#~ "tree (if visible) between message list and reader pane</li><li>Full width "
+#~ "reader pane</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr canolig o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon a'r cwarel "
+#~ "darllenydd</li><li>Cwarel darllenydd lled llawn</li></ul></qt>"
 
-#~ msgid " <qt><h3>KMail Window Layout</h3><ul><li>Short folder list</li><li>MIME tree (if visible) between message list / folder tree and reader pane</li><li>Full width reader pane and MIME tree</li></ul></qt>"
-#~ msgstr "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr byr o blygyll </li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon / coeden MIME a'r cwarel darllenydd</li><li>Cwarel darllenydd lled llawn a choeden MIME</li></ul></qt>"
+#~ msgid ""
+#~ " <qt><h3>KMail Window Layout</h3><ul><li>Short folder list</li><li>MIME "
+#~ "tree (if visible) between message list / folder tree and reader pane</"
+#~ "li><li>Full width reader pane and MIME tree</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Haenlun Ffenest KMail </h3><ul><li>Rhestr byr o blygyll </"
+#~ "li><li>Coeden MIME (os yn weladwy) rhwng y rhestr negeseuon / coeden MIME "
+#~ "a'r cwarel darllenydd</li><li>Cwarel darllenydd lled llawn a choeden "
+#~ "MIME</li></ul></qt>"
 
-#~ msgid " <qt><p>Below, you can change the arrangement of KMail's window components (folder list, message list, reader pane and the optional MIME tree).</p></qt>"
-#~ msgstr "<qt><p>Yn isod, gallwch newid trefniant cydrannau ffenest KMail(rhestr plygyll, rhestr negeseuon, cwarel darllenydd, a'r goeden MIME ddewisol.</p></qt>"
+#~ msgid ""
+#~ " <qt><p>Below, you can change the arrangement of KMail's window "
+#~ "components (folder list, message list, reader pane and the optional MIME "
+#~ "tree).</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Yn isod, gallwch newid trefniant cydrannau ffenest KMail(rhestr "
+#~ "plygyll, rhestr negeseuon, cwarel darllenydd, a'r goeden MIME ddewisol.</"
+#~ "p></qt>"
 
 #~ msgid "&Window Layout"
 #~ msgstr "&Haenlun Ffenest"
@@ -17082,5 +17354,9 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid " <qt>No HTML Message</qt>"
 #~ msgstr "<qt>Dim Neges HTML</qt>"
 
-#~ msgid " <qt><p>The OpenPGP key you choose here will be used to sign messages and to encrypt messages to yourself.</p></qt>"
-#~ msgstr "<qt><p>Defnyddir yr allwedd OpenPGP y dewiswch yma i lofnodi negeseuon ac i gêl-ysgrifennu i'ch hunan. .</p></qt>"
+#~ msgid ""
+#~ " <qt><p>The OpenPGP key you choose here will be used to sign messages and "
+#~ "to encrypt messages to yourself.</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>Defnyddir yr allwedd OpenPGP y dewiswch yma i lofnodi negeseuon ac "
+#~ "i gêl-ysgrifennu i'ch hunan. .</p></qt>"
diff --git a/tde-i18n-da/messages/tdepim/kmail.po b/tde-i18n-da/messages/tdepim/kmail.po
index 7d1b63d7279..41dc9a98a67 100644
--- a/tde-i18n-da/messages/tdepim/kmail.po
+++ b/tde-i18n-da/messages/tdepim/kmail.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-14 11:28+0200\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: \n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Erik Kjær Pedersen,Martin Schlander"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -171,6 +171,12 @@ msgstr "Ing&en (brug med omhu)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto for semiautomatisk ressource håndtering"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Ryd fortid"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -186,7 +192,8 @@ msgstr "Ryd fortid"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Slet alle forældede allokeringer for ressourcen repræsenteret ved denne konto."
+"Slet alle forældede allokeringer for ressourcen repræsenteret ved denne "
+"konto."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -246,13 +253,13 @@ msgstr "&Brugernavn:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Din internet service-udbyder gav dig et <em>brugernavn</em> "
-"som bruges at godkende dig med deres servere. Det er sædvanligvis den første "
-"del af din e-mail-adresse ( den del der er før <em>@</em> )."
+"Din internet service-udbyder gav dig et <em>brugernavn</em> som bruges at "
+"godkende dig med deres servere. Det er sædvanligvis den første del af din e-"
+"mail-adresse ( den del der er før <em>@</em> )."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -273,19 +280,19 @@ msgstr "&Gem POP-kodeord"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Afkryds dette for at få KMail til at gemme kodeordet.\n"
 "Hvis TDEWallet er tilgængelig vil kodeordet blive opbevaret der hvilket "
 "betragtes som sikkert.\n"
-"Hvis TDEWallet imidlertid ikke er tilgængelig vil kodeordet blive opbevaret i "
-"KMails indstillingsfil. Kodeordet gemmes i en sammenrodet form, men bør ikke "
-"betragtes som sikker fra dekryptering, hvis der opnås adgang til "
+"Hvis TDEWallet imidlertid ikke er tilgængelig vil kodeordet blive opbevaret "
+"i KMails indstillingsfil. Kodeordet gemmes i en sammenrodet form, men bør "
+"ikke betragtes som sikker fra dekryptering, hvis der opnås adgang til "
 "indstillingsfilerne."
 
 #: accountdialog.cpp:640
@@ -314,12 +321,13 @@ msgstr "&Filtrér breve hvis de er større end"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Hvis du vælger dette, vil POP-filtre blive brugt til at afgøre hvad der skal "
-"gøres med breve. Du kan så vælge at downloade, slette eller lade dem blive på "
-"serveren."
+"gøres med breve. Du kan så vælge at downloade, slette eller lade dem blive "
+"på serveren."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -368,13 +376,15 @@ msgstr "Klar te&kst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -417,14 +427,14 @@ msgstr "Navnerum:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Her ser du de forskellige navnerum som IMAP-serveren understøtter. Hvert "
-"navnerum repræsenterar et præfix som skiller grupper af mapper ad. Navnerum gør "
-"det for eksempel muligt for Kmail at vise dine personlige mapper og delte "
-"mapper i en konto."
+"navnerum repræsenterar et præfix som skiller grupper af mapper ad. Navnerum "
+"gør det for eksempel muligt for Kmail at vise dine personlige mapper og "
+"delte mapper i en konto."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -481,13 +491,13 @@ msgstr "Indlæs &bilag ved når der bliver bedt om det"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Aktivér dette for ikke at indlæse bilag automatisk når du vælger en  e-mail, "
-"men kun når du klikker på bilaget. På denne måde vises også meget store breve "
-"øjeblikkeligt."
+"men kun når du klikker på bilaget. På denne måde vises også meget store "
+"breve øjeblikkeligt."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -527,7 +537,7 @@ msgstr "<ingen>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "indbakke"
 
@@ -535,43 +545,44 @@ msgstr "indbakke"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Serveren synes ikke at understøtte entydige beskednumre, men dette er en "
 "forudsætning for at kunne efterlade breve på serveren.\n"
-"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig have "
-"muligheden for at slå efterladning af breve på serveren til."
+"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig "
+"have muligheden for at slå efterladning af breve på serveren til."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Serveren synes ikke at understøtte at hente brevoverskrifter, men dette er en "
-"forudsætning for at kunne efterlade breve på serveren.\n"
-"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig have "
-"muligheden for at slå efterladning af breve på serveren til."
+"Serveren synes ikke at understøtte at hente brevoverskrifter, men dette er "
+"en forudsætning for at kunne efterlade breve på serveren.\n"
+"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig "
+"have muligheden for at slå efterladning af breve på serveren til."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Bemærk venligst, at denne egenskab kan få nogle POP3-servere der ikke "
 "understøtter pipelining til at sende korrupte breve.\n"
 "Dette kan indstilles idet nogle servere understøtter pipelining uden at "
-"annoncere at de kan. For at tjekke om din POP3-server annoncerer understøttelse "
-"af pipelining, brug \"Tjek hvad serveren understøtter\"-knappen nederst i "
-"dialogen.\n"
+"annoncere at de kan. For at tjekke om din POP3-server annoncerer "
+"understøttelse af pipelining, brug \"Tjek hvad serveren understøtter\"-"
+"knappen nederst i dialogen.\n"
 "Hvis din server ikke annoncerer det, men du ønsker højere hastighed, bør du "
 "først teste lidt inden du sender en masse breve og downloader dem."
 
@@ -581,51 +592,51 @@ msgstr "Angiv venligst en server og port i det generelle faneblad først."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Serveren synes ikke at understøtte pipelining, men dette er en forudsætning for "
-"at kunne efterlade breve på serveren.\n"
-"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig have "
-"muligheden for at slå pipelining til. Men bemærk venligst at denne funktion kan "
-"få nogle POP-servere der ikke understøtter pipelining til at sende korrumperede "
-"breve. Så før brug af denne funktion med vigtige breve, bør du først teste det "
-"ved at sende dig selv et større antal testbreve som du alle henter på én gang "
-"fra POP-serveren."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Serveren synes ikke at understøtte pipelining, men dette er en forudsætning "
+"for at kunne efterlade breve på serveren.\n"
+"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig "
+"have muligheden for at slå pipelining til. Men bemærk venligst at denne "
+"funktion kan få nogle POP-servere der ikke understøtter pipelining til at "
+"sende korrumperede breve. Så før brug af denne funktion med vigtige breve, "
+"bør du først teste det ved at sende dig selv et større antal testbreve som "
+"du alle henter på én gang fra POP-serveren."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Serveren synes ikke at understøtte entydige beskednumre, men dette er en "
 "forudsætning for at kunne efterlade breve på serveren. Derfor er denne "
 "valgmulighed deaktiveret.\n"
-"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig have "
-"muligheden for at slå efterladning af breve på serveren til."
+"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig "
+"have muligheden for at slå efterladning af breve på serveren til."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Serveren synes ikke at understøtte entydige beskednumre, men dette er en "
 "forudsætning for at kunne filtrere breve på serveren. Derfor er denne "
 "valgmulighed blevet deaktiveret\n"
-"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig have "
-"muligheden for at slå filtrering af breve på serveren til."
+"Da visse servere ikke annoncerer deres evner rigtigt, vil du måske stadig "
+"have muligheden for at slå filtrering af breve på serveren til."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -705,8 +716,8 @@ msgstr "IMAP-konto"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Du bliver nødt til at tilføje en konto i netværksdelen af opsætningen for at "
 "kunne modtage post."
@@ -745,9 +756,9 @@ msgstr "Velkommen til Kmail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Det virker som om dette er første gangen du starter Kmail. Du kan bruge "
 "denne guide til at indstille dine e-mail-konti. Skriv blot  forbindelsesdata "
@@ -813,8 +824,7 @@ msgstr "Brug lokal leverance"
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ingen"
@@ -953,26 +963,25 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Her kan du få noget assistance med at indstille KMail's filterregler til at "
-"bruge nogle almindeligt kendte anti-virus værktøjer.</p>"
-"Guiden kan detektere værktøjerne på din computer, og også lave filterregler til "
-"at klassificere brevene ved brug af disse værktøjer og adskille de breve der "
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Her kan du få noget assistance med at indstille KMail's filterregler til "
+"at bruge nogle almindeligt kendte anti-virus værktøjer.</p>Guiden kan "
+"detektere værktøjerne på din computer, og også lave filterregler til at "
+"klassificere brevene ved brug af disse værktøjer og adskille de breve der "
 "indeholder virus. Guiden vil ikke tage nogen eksisterende filterregler i "
-"betragtning men vil tilføje nye regler i alle tilfælde.</p> "
-"<p><b>ADVARSEL:</b>Da KMail ser ud til at være frosset mens brevene skannes for "
-"virus, kan du komme ud for problemer med KMail's reaktionstid da anti-virus "
+"betragtning men vil tilføje nye regler i alle tilfælde.</p> <p><b>ADVARSEL:</"
+"b>Da KMail ser ud til at være frosset mens brevene skannes for virus, kan du "
+"komme ud for problemer med KMail's reaktionstid da anti-virus "
 "værktøjsoperationer sædvanligvis tager meget lang tid. Overvej i så tilfælde "
 "venligst at slette filterreglerne der bliver lavet af guiden for at komme "
 "tilbage til den tidligere opførsel."
@@ -1001,8 +1010,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Standardmappe for spam er affaldsspanden, men du kan ændre det i mappevisningen "
-"nedenfor."
+"Standardmappe for spam er affaldsspanden, men du kan ændre det i "
+"mappevisningen nedenfor."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1010,10 +1019,9 @@ msgstr "Flyt &formodentlig spam til:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Standardmappen er indbakken, men du kan ændre det i mappevisningen nedenfor."
 "<p>Alle værktøjer understøtter ikke klassificering som usikker. Hvis du ikke "
@@ -1027,8 +1035,8 @@ msgstr "Klassificér breve ved brug af anti-virus værktøjer"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Lad anti-virus værktøjer klassificere dine breve. Guiden vil lave passende "
 "filtre. Brevene bliver sædvanligvis markeret af værktøjerne så de følgende "
@@ -1041,8 +1049,8 @@ msgstr "Flyt detekteret virus-post til den valgte mappe"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Et filter til at detektere breve klassificeret som virusinficerede og til at "
 "flytte disse til en foruddefineret mappe bliver lavet. Standardmappen er "
@@ -1054,11 +1062,11 @@ msgstr "Derudover, markér detekteret virus-post som læst"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Ud over at flytte breve der er blevet klassificeret som virusinficeret post til "
-"de valgte mapper, markeres brevene som læst."
+"Ud over at flytte breve der er blevet klassificeret som virusinficeret post "
+"til de valgte mapper, markeres brevene som læst."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1239,8 +1247,8 @@ msgid ""
 "communication is here:"
 msgstr ""
 "Dette kunne være fordi du ikke har tilladelse til at gøre dette eller fordi "
-"mappen allerede findes på serveren. Fejlmeddelelsen fra serverkommunikationen "
-"er her:"
+"mappen allerede findes på serveren. Fejlmeddelelsen fra "
+"serverkommunikationen er her:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1253,8 +1261,8 @@ msgstr "Fejl ved læsning af mappen %1 på serveren:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1274,8 +1282,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1306,20 +1314,20 @@ msgstr "Slettet"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Ingen af dine identiteter matcher modtageren af dette brev,"
-"<br>vælg venligst hvilken af følgende adresser der er din, om nogen:"
+"<qt>Ingen af dine identiteter matcher modtageren af dette brev,<br>vælg "
+"venligst hvilken af følgende adresser der er din, om nogen:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Adskillige af dine identiteter matcher modtageren af dette brev,"
-"<br>vælg venligst hvilken af følgende adresser der er din:"
+"<qt>Adskillige af dine identiteter matcher modtageren af dette brev,<br>vælg "
+"venligst hvilken af følgende adresser der er din:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1348,18 +1356,21 @@ msgstr "Der opstod en fejl ved komprimering af \"%1\". Komprimering afbrudt."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Denne indstilling er fastsat af din administrator.</p>"
-"<p>Hvis du mener det er en fejl, så henvend dig venligst til ham.</p></qt>"
+"<qt><p>Denne indstilling er fastsat af din administrator.</p><p>Hvis du "
+"mener det er en fejl, så henvend dig venligst til ham.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Indlæs profiler..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Indstil konto"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Tilføj..."
@@ -1389,6 +1400,11 @@ msgstr "<qt>Vil du fjerne identiteten <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Fjern identitet"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Fjern"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Tilføj..."
@@ -1397,6 +1413,11 @@ msgstr "Tilføj..."
 msgid "Modify..."
 msgstr "Ændr..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Fjern"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Sæt som standard"
@@ -1413,17 +1434,15 @@ msgstr "&Send"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Udgående konti (tilføj mindst én):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Navn"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1445,8 +1464,7 @@ msgstr "Sæt standard"
 msgid "Common Options"
 msgstr "Almindelige tilvalg"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Bekræft &før afsendelse"
@@ -1497,17 +1515,16 @@ msgstr "Stan&dard-domæne:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Standard-domænet bruges til at komplettere e-mail-adresser der kun består af "
-"brugerens navn.</p></qt>"
+"<qt><p>Standard-domænet bruges til at komplettere e-mail-adresser der kun "
+"består af brugerens navn.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1525,9 +1542,9 @@ msgstr "Tilføj overførsel"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Standard)"
 
@@ -1610,6 +1627,10 @@ msgstr "Ændr konto"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Kan ikke finde kontoen <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Farver"
@@ -1718,8 +1739,7 @@ msgstr "Besøgt link"
 msgid "Misspelled Words"
 msgstr "Forkert stavede ord"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nyt brev"
@@ -1907,8 +1927,8 @@ msgstr "Tråde lukkede som standard"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Åbn tråde der indeholder nye, ulæste eller vigtige &breve og åbne tråde der "
 "kigges på"
@@ -1919,69 +1939,53 @@ msgstr "Dato-visning"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt> "
-"<p><strong>Disse udtryk kan bruges datoen:</strong></p>"
-"<ul>"
-"<li>d - dag som tal uden indledende nul (1-31)</li>"
-"<li>dd - dag som tal med indledende nul  (01-31)</li>"
-"<li>ddd - det forkortede navn for dagen (Man - Søn)</li>"
-"<li>dddd - det lange navn for dagen (Mandag - Søndag)</li>"
-"<li>M - måned som et tal uden indledende nul (1-12)</li>"
-"<li>MM - måned som et tal med indledende nul (01-12)</li>"
-"<li>MMM - det forkortede navn for måneden (Jan - Dec)</li>"
-"<li>MMMM - det lange navn for måneden (Januar - December)</li>"
-"<li>yy - år som et tocifret tal (00-99)</li>"
-"<li>yyyy - år som et fircifret tal (0000-9999)</li></ul>"
-"<p><strong>Disse udtryk kan bruges for tidspunktet:</strong></p> "
-"<ul>"
-"<li>h - time uden indledende nul (0-23 eller 1-12 med AM/PM-visning)</li>"
-"<li>hh - time med indledende nul (00-23 eller 01-12 med AM/PM-visning)</li>"
-"<li>m - minut uden indledende nul (0-59)</li>"
-"<li>mm - minut med indledende nul (00-59)</li>"
-"<li>s - sekund uden indledende nul  (0-59)</li>"
-"<li>ss - sekund med indledende nul (00-59)</li>"
-"<li>z - millisekund uden indledende nul (0-999)</li>"
-"<li>zzz - millisekund med indledende nul (000-999)</li>"
-"<li>AP - skift til AM/PM-visning. AP vil blive erstattet af enten \"AM\" eller "
-"\"PM\".</li>"
-"<li>ap - skift til AM/PM-visning. ap vil blive erstattet af enten \"am\" eller "
-"\"pm\".</li>"
-"<li>Z - zone i numerisk form ( -0500 )</li></ul>"
-"<p><strong>Alle andre inddata-tegn vil blive ignoreret.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt> <p><strong>Disse udtryk kan bruges datoen:</strong></p><ul><li>d - dag "
+"som tal uden indledende nul (1-31)</li><li>dd - dag som tal med indledende "
+"nul  (01-31)</li><li>ddd - det forkortede navn for dagen (Man - Søn)</"
+"li><li>dddd - det lange navn for dagen (Mandag - Søndag)</li><li>M - måned "
+"som et tal uden indledende nul (1-12)</li><li>MM - måned som et tal med "
+"indledende nul (01-12)</li><li>MMM - det forkortede navn for måneden (Jan - "
+"Dec)</li><li>MMMM - det lange navn for måneden (Januar - December)</"
+"li><li>yy - år som et tocifret tal (00-99)</li><li>yyyy - år som et "
+"fircifret tal (0000-9999)</li></ul><p><strong>Disse udtryk kan bruges for "
+"tidspunktet:</strong></p> <ul><li>h - time uden indledende nul (0-23 eller "
+"1-12 med AM/PM-visning)</li><li>hh - time med indledende nul (00-23 eller "
+"01-12 med AM/PM-visning)</li><li>m - minut uden indledende nul (0-59)</"
+"li><li>mm - minut med indledende nul (00-59)</li><li>s - sekund uden "
+"indledende nul  (0-59)</li><li>ss - sekund med indledende nul (00-59)</"
+"li><li>z - millisekund uden indledende nul (0-999)</li><li>zzz - millisekund "
+"med indledende nul (000-999)</li><li>AP - skift til AM/PM-visning. AP vil "
+"blive erstattet af enten \"AM\" eller \"PM\".</li><li>ap - skift til AM/PM-"
+"visning. ap vil blive erstattet af enten \"am\" eller \"pm\".</li><li>Z - "
+"zone i numerisk form ( -0500 )</li></ul><p><strong>Alle andre inddata-tegn "
+"vil blive ignoreret.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Ændring af den globale trådningsopsætning, vil gå forud for alle "
 "mappespecifikke værdier."
@@ -1998,8 +2002,7 @@ msgstr "&Vis HTML statuslinje"
 msgid "Show s&pam status in fancy headers"
 msgstr "Vis s&pam-status i  smarte brevoverskrifter"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Erstat smileys med emotikoner"
@@ -2008,8 +2011,7 @@ msgstr "Erstat smileys med emotikoner"
 msgid "Use smaller font for quoted text"
 msgstr "Brug mindre skrifttype til citeret tekst"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Vis udvid/kollpas citationsmarkeringer"
@@ -2035,8 +2037,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "Sæt &tegnsæt ud af kraft:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Aktivér statusikon"
@@ -2138,21 +2139,19 @@ msgstr "<b>%f</b> vil blive erstattet med det filnavn, der skal redigeres."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Følgende pladsholdere er understøttede i svarsætninger:"
-"<br><b>%D</b>: dato, <b>%S</b>: emne,"
-"<br><b>%e</b>: afsenders adresse, <b>%F</b>: afsenders navn, <b>%f</b>"
-": afsenders initialer,"
-"<br><b>%T</b>: modtagers navn, <b>%t</b>: modtagers navn og adresse,"
-"<br><b>%C</b>: carbon copy navne, <b>%c</b>: carbon copy navne og adresser,"
-"<br><b>%%</b>: procent tegn, <b>%_</b>: mellemrum, <b>%L</b>: linjebrud</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Følgende pladsholdere er understøttede i svarsætninger:<br><b>%D</b>: "
+"dato, <b>%S</b>: emne,<br><b>%e</b>: afsenders adresse, <b>%F</b>: afsenders "
+"navn, <b>%f</b>: afsenders initialer,<br><b>%T</b>: modtagers navn, <b>%t</"
+"b>: modtagers navn og adresse,<br><b>%C</b>: carbon copy navne, <b>%c</b>: "
+"carbon copy navne og adresser,<br><b>%%</b>: procent tegn, <b>%_</b>: "
+"mellemrum, <b>%L</b>: linjebrud</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2175,21 +2174,20 @@ msgstr "Svar &til alle:"
 msgid "&Forward:"
 msgstr "&Videresend:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Citations-indikator:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D skrev du:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D skrev %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Videresendt brev"
 
@@ -2227,11 +2225,11 @@ msgstr "Indtast nyt videresend-præfiks:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Denne liste tjekkes for hvert udgående brev fra top til bund, for at finde et "
-"tegnsæt, der indeholder alle de nødvendige tegn."
+"Denne liste tjekkes for hvert udgående brev fra top til bund, for at finde "
+"et tegnsæt, der indeholder alle de nødvendige tegn."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2240,7 +2238,8 @@ msgstr "Indtast tegnsæt:"
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"&Behold det oprindelige tegnsæt, når der svares eller videresendes (om muligt)"
+"&Behold det oprindelige tegnsæt, når der svares eller videresendes (om "
+"muligt)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2266,10 +2265,9 @@ msgstr "Værdi"
 msgid "Ne&w"
 msgstr "&Ny "
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Navn:"
@@ -2278,16 +2276,15 @@ msgstr "&Navn:"
 msgid "&Value:"
 msgstr "&Værdi:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-kompatibel navngivning af bilag"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Slå dette til for at få Outlook(tm) til at forstå dine bilags navne når de "
 "indeholder ikke-engelske tegn"
@@ -2316,21 +2313,21 @@ msgstr "Vedlagt"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Du har valgt at indkode bilagsnavne der indeholder tegn der ikke er engelske  "
-"på en måde der kan forstås af Outlook(tm) og andre e-mail-klienter der ikke "
-"understøtter standard-kompliant indkodede bilagsnavne.\n"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Du har valgt at indkode bilagsnavne der indeholder tegn der ikke er "
+"engelske  på en måde der kan forstås af Outlook(tm) og andre e-mail-klienter "
+"der ikke understøtter standard-kompliant indkodede bilagsnavne.\n"
 "Bemærk at KMail måske vil lave ikke-standard kompliante breve, og som en "
 "konsekvens er det muligt at dine breve ikke vil blive forstået af standard "
-"kompliante e-mail-klienter. Så med mindre du ikke har noget andet valg, bør du "
-"ikke aktivere dette."
+"kompliante e-mail-klienter. Så med mindre du ikke har noget andet valg, bør "
+"du ikke aktivere dette."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2354,113 +2351,99 @@ msgstr "Krypto-bage&nder"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Breve kommer sommetider i begge formater. Dette valg kontrollerer om du "
-"ønsker at HTML-delen eller ren tekst-delen skal vises.</p>"
-"<p>Visning af HTML-delen får brevet til at se bedre ud, men samtidig forøges "
-"risikoen for sikkerhedshuller, der kan udnyttes.</p>"
-"<p>Visning af ren tekst taber meget af brevets formatering, men gør det næsten "
-"<em>umuligt</em> at udnytte sikkerhedshuller i HTML-fremviseren (Konqueror).</p>"
-"<p>Valget nedenfor sikrer mod et almindeligt misbrug af HTML-breve. Men det kan "
-"ikke sikre mod sikkerhedsproblemer, som ikke var kendt på det tidspunkt denne "
-"version af KMail blev skrevet.</p>"
-"<p>Det er derfor tilrådeligt <em>ikke</em> at foretrække HTML frem for ren "
-"tekst.</p>"
-"<p><b>Bemærk:</b> Du kan sætte dette tilvalg for hver enkelt mappe fra <i>"
-"Mappe</i>-menuen i KMail's hovedvindue.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Breve kommer sommetider i begge formater. Dette valg kontrollerer om "
+"du ønsker at HTML-delen eller ren tekst-delen skal vises.</p><p>Visning af "
+"HTML-delen får brevet til at se bedre ud, men samtidig forøges risikoen for "
+"sikkerhedshuller, der kan udnyttes.</p><p>Visning af ren tekst taber meget "
+"af brevets formatering, men gør det næsten <em>umuligt</em> at udnytte "
+"sikkerhedshuller i HTML-fremviseren (Konqueror).</p><p>Valget nedenfor "
+"sikrer mod et almindeligt misbrug af HTML-breve. Men det kan ikke sikre mod "
+"sikkerhedsproblemer, som ikke var kendt på det tidspunkt denne version af "
+"KMail blev skrevet.</p><p>Det er derfor tilrådeligt <em>ikke</em> at "
+"foretrække HTML frem for ren tekst.</p><p><b>Bemærk:</b> Du kan sætte dette "
+"tilvalg for hver enkelt mappe fra <i>Mappe</i>-menuen i KMail's hovedvindue."
+"</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Nogle e-mail-reklamer er i HTML og indeholder referencer til billeder, som "
-"reklamerne bruger til at finde ud af om du har læst deres breve "
-"(&quot;netlus&quot;).</p>"
-"<p>Der er ingen gyldig grund til at indlæse billeder fra nettet på denne måde, "
-"da senderen altid kan vedlægge de krævede billeder direkte.</p>"
-"<p>For at beskytte mod et sådant misbrug af HTML-fremvisningsegenskaben ved "
-"KMail, er dette <em>deaktiveret</em> som standard.</p>"
-"<p>Hvis du ikke desto mindre ønsker f. eks. at se billeder i HTML-breve, der "
-"ikke var med som bilag, kan du aktivere dette valg, men du bør være klar over "
-"det mulige problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Nogle e-mail-reklamer er i HTML og indeholder referencer til "
+"billeder, som reklamerne bruger til at finde ud af om du har læst deres "
+"breve (&quot;netlus&quot;).</p><p>Der er ingen gyldig grund til at indlæse "
+"billeder fra nettet på denne måde, da senderen altid kan vedlægge de krævede "
+"billeder direkte.</p><p>For at beskytte mod et sådant misbrug af HTML-"
+"fremvisningsegenskaben ved KMail, er dette <em>deaktiveret</em> som standard."
+"</p><p>Hvis du ikke desto mindre ønsker f. eks. at se billeder i HTML-breve, "
+"der ikke var med som bilag, kan du aktivere dette valg, men du bør være klar "
+"over det mulige problem.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>'Message Dispositon Notification'-politik</h3>"
-"<p>MDN'er er en generalisering af det der almindeligvis kaldes <b>"
-"læse-kvittering</b>. Brevets forfatter beder om besked at få at vide hvad der "
-"sker med brevet og modtagerens e-mail-program  genererer et svar ud fra hvilket "
-"forfatteren kan lære hvad der skete med brevet. Almindelige typer svar "
-"inkluderer  <b>vist</b> (altså læst), <b>slettet</b> og <b>behandlet</b> "
-"(altså f.eks. videresendt).</p>"
-"<p>Følgende valgmuligheder er til stede for at kontrollere KMail's   udsending "
-"af MDN'er:</p>"
-"<ul>"
-"<li><em>Ignorér</em>: Ignorerer alle forespørgsler. Ingen MDN vil nogensinde "
-"blive sendt automatisk    (anbefalet).</li>"
-"<li><em>Spørg</em>: Svarer kun på forespørgsler efter at have bedt brugeren om "
-"tilladelse. På denne måde kan du sende MDN'er til udvalgte breve mens du nægter "
-"eller ignorerer dem for andre.</li>"
-"<li><em>Nægt</em>: Sender altid en <b>nægtet</b> meddelelse. Dette er kun <em>"
-"lidt</em> bedre end altid at sende MDN'er. Forfatteren vil stadig vide at der "
-"er blevet reageret på brevet, han kan blot ikke vide om det blev slettet eller "
-"læst.</li>"
-"<li><em>Send altid</em>: Sender altid den forespurgte meddelelse. Det betyder "
-"at forfatteren af brevet får at vide hvornår der blev reageret på brevet, og "
-"derudover hvad der skete med det (vist, slettet osv.). Vi advarer stærkt mod "
-"denne mulighed, men da det sommetider giver mening f.eks. i forbindelse med "
-"kundeforhold, er det blevet gjort muligt.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>'Message Dispositon Notification'-politik</h3><p>MDN'er er en "
+"generalisering af det der almindeligvis kaldes <b>læse-kvittering</b>. "
+"Brevets forfatter beder om besked at få at vide hvad der sker med brevet og "
+"modtagerens e-mail-program  genererer et svar ud fra hvilket forfatteren kan "
+"lære hvad der skete med brevet. Almindelige typer svar inkluderer  <b>vist</"
+"b> (altså læst), <b>slettet</b> og <b>behandlet</b> (altså f.eks. "
+"videresendt).</p><p>Følgende valgmuligheder er til stede for at kontrollere "
+"KMail's   udsending af MDN'er:</p><ul><li><em>Ignorér</em>: Ignorerer alle "
+"forespørgsler. Ingen MDN vil nogensinde blive sendt automatisk    "
+"(anbefalet).</li><li><em>Spørg</em>: Svarer kun på forespørgsler efter at "
+"have bedt brugeren om tilladelse. På denne måde kan du sende MDN'er til "
+"udvalgte breve mens du nægter eller ignorerer dem for andre.</"
+"li><li><em>Nægt</em>: Sender altid en <b>nægtet</b> meddelelse. Dette er kun "
+"<em>lidt</em> bedre end altid at sende MDN'er. Forfatteren vil stadig vide "
+"at der er blevet reageret på brevet, han kan blot ikke vide om det blev "
+"slettet eller læst.</li><li><em>Send altid</em>: Sender altid den "
+"forespurgte meddelelse. Det betyder at forfatteren af brevet får at vide "
+"hvornår der blev reageret på brevet, og derudover hvad der skete med det "
+"(vist, slettet osv.). Vi advarer stærkt mod denne mulighed, men da det "
+"sommetider giver mening f.eks. i forbindelse med kundeforhold, er det blevet "
+"gjort muligt.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2476,15 +2459,15 @@ msgstr "Tillad breve at indlæse &ydre referencer fra nettet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>ADVARSEL:</b> Brug af HTML i e-mail kan forøge sandsynligheden for at dit "
 "system vil blive kompromitteret af nuværende og fremtidige "
-"sikkerhedsudnyttelser. <a href=\"whatsthis:%1\">Mere om HTML-post...</a> "
-"<a href=\"whatsthis:%2\">Mere om eksterne referencer...</a>"
+"sikkerhedsudnyttelser. <a href=\"whatsthis:%1\">Mere om HTML-post...</a> <a "
+"href=\"whatsthis:%2\">Mere om eksterne referencer...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2543,8 +2526,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>ADVARSEL:</b> Ubetingede kvitteringer underminerer dit privatliv. <a "
-"href=\"whatsthis:%1\">Mere...</a>"
+"<b>ADVARSEL:</b> Ubetingede kvitteringer underminerer dit privatliv. <a href="
+"\"whatsthis:%1\">Mere...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2565,8 +2548,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Dette tilvalg kræver dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "ingen proxy"
@@ -2595,8 +2577,8 @@ msgstr "E&kskludér vigtige brev fra at løbe ud"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Når du forsøger at finde ulæste breve:"
 
@@ -2620,8 +2602,8 @@ msgstr "Gå i løkke i alle mapper"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Når en mappe åbnes:"
 
@@ -2690,28 +2672,24 @@ msgstr "Mapper (\"maildir\"-format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Dette vælger hvilket postkasseformat, der vil være standard for lokale "
-"mapper:</p>"
-"<p><b>mbox:</b> KMail's e-mail-mapper er repræsenteret som en enkelt fil. De "
-"individuelle breve er adskilt fra hinanden ved en linje der starter med \"From "
-"\". Dette sparer plads på disken, men det kan være mindre robust, f.eks. når "
-"breve flyttes mellem mapper.</p>"
-"<p><b>maildir:</b> KMail's e-mail-mapper er repræsenteret ved rigtige mapper på "
-"disken. Individuelle breve er adskilte filer. Dette vil spilde lidt plads på "
-"disken, men det skulle være mere robust, f.eks. når breve flyttes mellem "
-"mapper.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Dette vælger hvilket postkasseformat, der vil være standard for "
+"lokale mapper:</p><p><b>mbox:</b> KMail's e-mail-mapper er repræsenteret som "
+"en enkelt fil. De individuelle breve er adskilt fra hinanden ved en linje "
+"der starter med \"From \". Dette sparer plads på disken, men det kan være "
+"mindre robust, f.eks. når breve flyttes mellem mapper.</p><p><b>maildir:</b> "
+"KMail's e-mail-mapper er repræsenteret ved rigtige mapper på disken. "
+"Individuelle breve er adskilte filer. Dette vil spilde lidt plads på disken, "
+"men det skulle være mere robust, f.eks. når breve flyttes mellem mapper.</"
+"p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2744,51 +2722,41 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Når du springer til den næste ulæste brev, kan det ske at der ikke er flere "
-"ulæste breve under dette brev.</p>"
-"<p><b>Gå ikke i løkke:</b> Søgningen vil standse ved det sidste brev i denne "
-"mappe.</p>"
-"<p><b>Løkke i denne mappe:</b> Søgningen vil fortsætte for oven af brevlisten, "
-"men ikke gå ind i en anden mappe.</p>"
-"<p><b>Løkke i alle mapper:</b> Søgningen vil fortsætte for oven i brevlisten. "
-"Hvis der ikke er flere ulæste breve, så vil den fortsætte i næste mappe.</p>"
-"<p>Tilsvarende, når der søges efter forrige ulæste brev, så vil søgningen "
-"starte fra bunden af brevlisten og fortsætte til forrige mappe afhængig af "
-"hvilket valg der er gjort her.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Når du springer til den næste ulæste brev, kan det ske at der ikke er "
+"flere ulæste breve under dette brev.</p><p><b>Gå ikke i løkke:</b> Søgningen "
+"vil standse ved det sidste brev i denne mappe.</p><p><b>Løkke i denne mappe:"
+"</b> Søgningen vil fortsætte for oven af brevlisten, men ikke gå ind i en "
+"anden mappe.</p><p><b>Løkke i alle mapper:</b> Søgningen vil fortsætte for "
+"oven i brevlisten. Hvis der ikke er flere ulæste breve, så vil den fortsætte "
+"i næste mappe.</p><p>Tilsvarende, når der søges efter forrige ulæste brev, "
+"så vil søgningen starte fra bunden af brevlisten og fortsætte til forrige "
+"mappe afhængig af hvilket valg der er gjort her.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fuldtekstindeksering muliggør meget hurtig søgning i brevenes indhold. Når "
-"det er aktiveret, fungerer søgedialogen meget hurtigt. Desuden vælger "
-"søgelinjen også breve baseret på indhold.</p>"
-"<p>Den optager en vis mængde diskplads (omkring halvdelen af diskpladsen for "
-"brevene).</p> "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Fuldtekstindeksering muliggør meget hurtig søgning i brevenes "
+"indhold. Når det er aktiveret, fungerer søgedialogen meget hurtigt. Desuden "
+"vælger søgelinjen også breve baseret på indhold.</p><p>Den optager en vis "
+"mængde diskplads (omkring halvdelen af diskpladsen for brevene).</p> "
 "<p>Efter den er aktiveret skal indekset bygges, men du kan fortsætte med at "
 "bruge Kmail mens det står på.</p></qt>"
 
@@ -2857,8 +2825,8 @@ msgstr "S&kjul Groupware-mapper"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Når dette er afkrydset vil du ikke se IMAP's ressource-mapper i mappetræet."
 
@@ -2868,8 +2836,8 @@ msgstr "Vis &kun groupware-mapper for denne konto"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Når dette er markeret, ser du ikke normale brevmapper i mappetræet for konti "
 "som er indstillet for groupware."
@@ -2883,8 +2851,8 @@ msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
-"Synkronisér groupware-ændringer i ikke-forbundne IMAP-mapper straks når du er "
-"online."
+"Synkronisér groupware-ændringer i ikke-forbundne IMAP-mapper straks når du "
+"er online."
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -2930,23 +2898,22 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Microsoft Outlook, brugt i kombination med en Microsoft Exchange server, har et "
-"problem med at forstå standardiseret groupware e-mail. Slå dette til for at "
-"sende groupware invitationer på en måde som Microsoft Exchange forstår."
+"Microsoft Outlook, brugt i kombination med en Microsoft Exchange server, har "
+"et problem med at forstå standardiseret groupware e-mail. Slå dette til for "
+"at sende groupware invitationer på en måde som Microsoft Exchange forstår."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-kompatibel navngivning af bilag"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatisk afsendelse af invitation"
@@ -2956,28 +2923,27 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Når dette er aktiveret, ser brugeren ikke brevvinduet. Indbydelsesbreve sendes "
-"automatisk."
+"Når dette er aktiveret, ser brugeren ikke brevvinduet. Indbydelsesbreve "
+"sendes automatisk."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Invitationer sendes normalt som bilag til et brev. Dette flag ændrer "
 "invitationsbreve til at blive sendt i brevets tekst i stedet for.  Dette er "
-"nødvendigt for at sende invitationer og svar til Microsoft Outlook."
-"<br>Men når du gør dette, får du ikke længere beskrivende tekst som "
-"e-mail-programmer kan læse. Så for folk der har e-mail-programmer der ikke "
-"forstår invitationerne, vil brevene se meget mærkelige ud."
-"<br>Folk der har e-mail-programmer der forstår invitationer vil stadig kunne "
-"virke med dette.</qt>"
+"nødvendigt for at sende invitationer og svar til Microsoft Outlook.<br>Men "
+"når du gør dette, får du ikke længere beskrivende tekst som e-mail-"
+"programmer kan læse. Så for folk der har e-mail-programmer der ikke forstår "
+"invitationerne, vil brevene se meget mærkelige ud.<br>Folk der har e-mail-"
+"programmer der forstår invitationer vil stadig kunne virke med dette.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3081,30 +3047,27 @@ msgstr "Videresend"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Her kan du tilføje, redigere og fjerne egne brevskabeloner som kan bruges "
-"når du skriver et svar eller videresender et brev. Opret en egen skabelon ved "
-"at markere den med menuen som vises med højre museknap eller med "
-"værktøjslinjens menu. Du kan også tildele skabelonen en tastaturskombination "
-"for hurtigere brug.</p>"
-"<p>Brevskabeloner understøtter erstatningskommandoer ved  helt enkelt at "
-"indtaste dem eller vælge dem i menuen <i>Indsæt kommando</i>.</p>"
-"<p>Der er fire typer af egne skabeloner som bruges for <i>Svar</i>, <i>"
-"Svar til alle</i>, <i>Videresend</i> og <i>Universelt</i> "
-"som kan bruges til alle slags handlinger. Du kan ikke tildele genvejstaster til "
-"<i>Universelle</i> skabeloner.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Her kan du tilføje, redigere og fjerne egne brevskabeloner som kan "
+"bruges når du skriver et svar eller videresender et brev. Opret en egen "
+"skabelon ved at markere den med menuen som vises med højre museknap eller "
+"med værktøjslinjens menu. Du kan også tildele skabelonen en "
+"tastaturskombination for hurtigere brug.</p><p>Brevskabeloner understøtter "
+"erstatningskommandoer ved  helt enkelt at indtaste dem eller vælge dem i "
+"menuen <i>Indsæt kommando</i>.</p><p>Der er fire typer af egne skabeloner "
+"som bruges for <i>Svar</i>, <i>Svar til alle</i>, <i>Videresend</i> og "
+"<i>Universelt</i> som kan bruges til alle slags handlinger. Du kan ikke "
+"tildele genvejstaster til <i>Universelle</i> skabeloner.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3121,15 +3084,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3147,15 +3110,16 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Den valgte genvejstast bruges allerede af en anden egendefineret skabelon Vil "
-"du alligevel fortsætte med tildelingen?"
+"Den valgte genvejstast bruges allerede af en anden egendefineret skabelon "
+"Vil du alligevel fortsætte med tildelingen?"
 
 #: customtemplates.cpp:438
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
-"Den valgte genvej bruges allerede. Vil du stadigvæk fortsætte med tildelingen?"
+"Den valgte genvej bruges allerede. Vil du stadigvæk fortsætte med "
+"tildelingen?"
 
 #: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
@@ -3194,8 +3158,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Distributionsliste med det angivne navn <b>%1</b> "
-"findes allerede. Vælg et andet navn.</qt>"
+"<qt>Distributionsliste med det angivne navn <b>%1</b> findes allerede. Vælg "
+"et andet navn.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3204,11 +3168,11 @@ msgstr "Redigér med:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
-"KMail kan ikke opdage om den valgte editor er lukket. For at undge datatab vil "
-"redigering af bilaget blive afbrudt."
+"KMail kan ikke opdage om den valgte editor er lukket. For at undge datatab "
+"vil redigering af bilaget blive afbrudt."
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3458,6 +3422,11 @@ msgstr "Vælg filtre"
 msgid "Filters"
 msgstr "Filtre"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Markér al tekst"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3489,11 +3458,11 @@ msgstr "&Log filteraktiviteter"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Du kan slå logning af filteraktivititeter til og fra her. Naturligvis samles og "
-"vises log-data kun når logning er slået til. "
+"Du kan slå logning af filteraktivititeter til og fra her. Naturligvis samles "
+"og vises log-data kun når logning er slået til. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3509,16 +3478,17 @@ msgstr "Log filter&regel evalering"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Du kan kontrollere tilbagemeldingen i loggen der drejer sig om evalueringen af "
-"filterregler for anvendte filtre. At have dette tilvalg afkrydset vil give "
-"detaljeret tilbagemelding for hver enkelt filterregel. Alternativt vil kun  "
-"tilbagemelding om resultatet af evalueringen af alle regler i et enkelt filter "
-"blive givet."
+"Du kan kontrollere tilbagemeldingen i loggen der drejer sig om evalueringen "
+"af filterregler for anvendte filtre. At have dette tilvalg afkrydset vil "
+"give detaljeret tilbagemelding for hver enkelt filterregel. Alternativt vil "
+"kun  tilbagemelding om resultatet af evalueringen af alle regler i et enkelt "
+"filter blive givet."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3538,16 +3508,16 @@ msgstr "ubegrænset"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Samling af log-data betyder et vist forbrug af hukommelse, hvor disse data "
-"midlertidigt kan opbevares. Du kan begrænse den maksimale mængde hukommelse der "
-"skal bruges til at opbevare log-data. Hvis de indsamlede log-data går ud over "
-"denne grænse, vil de ældste data blive kasseret indtil grænsen ikke længere er "
-"overskredet."
+"midlertidigt kan opbevares. Du kan begrænse den maksimale mængde hukommelse "
+"der skal bruges til at opbevare log-data. Hvis de indsamlede log-data går ud "
+"over denne grænse, vil de ældste data blive kasseret indtil grænsen ikke "
+"længere er overskredet."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3557,7 +3527,7 @@ msgstr ""
 "Kunne ikke skrive filen %1:\n"
 "\"%2\" er den detaljerede fejlbeskrivelse."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail-fejl"
@@ -3598,13 +3568,13 @@ msgstr "&Brugeridentifikator:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Brugeidentifikatoren er login for brugeren på IMAP-serveren. Dette kan være et "
-"simpelt brugernavn eller den fulde e-mail-adresse for brugeren; login for din "
-"egen konto på serveren vil fortælle dig hvilket det er."
+"Brugeidentifikatoren er login for brugeren på IMAP-serveren. Dette kan være "
+"et simpelt brugernavn eller den fulde e-mail-adresse for brugeren; login for "
+"din egen konto på serveren vil fortælle dig hvilket det er."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3655,8 +3625,8 @@ msgstr "Du har ikke læse/skrivetilladelse til din affaldsmappe."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Information endnu ikke hentet fra serveren, brug venligst \"Tjek post\"."
 
@@ -3668,8 +3638,7 @@ msgstr "Fejl: ingen IMAP-konto defineret for denne mappe"
 msgid "Connecting to server %1, please wait..."
 msgstr "Forbinder til serveren %1, vent venligst..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Fejl ved at forbinde til serveren %1"
@@ -3697,11 +3666,11 @@ msgstr "Tilføj tilladelser"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Ønsker du virkelig at fjerne dine egne tilladelser til denne mappe? Du vil ikke "
-"kunne få adgang til den bagefter."
+"Ønsker du virkelig at fjerne dine egne tilladelser til denne mappe? Du vil "
+"ikke kunne få adgang til den bagefter."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3732,7 +3701,7 @@ msgstr "Brug:"
 msgid "Select Folder"
 msgstr "Vælg mappe"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale mapper"
@@ -3756,9 +3725,9 @@ msgstr "Vælg genvej til mappe"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>For at angive en tast eller tastekombination som vælger nuværende mappe, "
 "klikkes på knappen nedenfor og der trykkes derefter på tasten eller tasterne "
@@ -3782,13 +3751,22 @@ msgstr "&Annullér"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Mappen du slettede hørte sammen med kontoen <b>%1</b> "
-"som levererede breve til den. Mappen som kontoen leverer nye breve til er "
-"nulstillet til hovedindbakken.</qt>"
+"<qt>Mappen du slettede hørte sammen med kontoen <b>%1</b> som levererede "
+"breve til den. Mappen som kontoen leverer nye breve til er nulstillet til "
+"hovedindbakken.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Total: %2<br>Ulæst: %3<br>Størrelse: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Kvote: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3911,55 +3889,16 @@ msgstr "Spam-status:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>B<br>r<br>e<br>v</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>I"
-"<br>k "
-"<br>k "
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>B"
-"<br>r"
-"<br>e"
-"<br>v</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>I<br>k <br>k <br>e<br> <br>H<br>T<br>M<br>L<br> "
+"<br>B<br>r<br>e<br>v</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3971,19 +3910,14 @@ msgstr "&Dit navn:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Dit navn</h3>"
-"<p>Dette felt skal have dit navn som du gerne vil have det skal se ud i "
-"overskriftsfeltet i en e-mail ser sendes ud.</p>"
-"<p>Hvis du efterlader dette blankt, vil dit rigtige navn ikke være der, kun "
-"e-mail-adressen.</p></qt>"
+"<qt><h3>Dit navn</h3><p>Dette felt skal have dit navn som du gerne vil have "
+"det skal se ud i overskriftsfeltet i en e-mail ser sendes ud.</p><p>Hvis du "
+"efterlader dette blankt, vil dit rigtige navn ikke være der, kun e-mail-"
+"adressen.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3991,17 +3925,14 @@ msgstr "Organi&sation:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisation</h3>"
-"<p>Dette felt skal have navnet på din organisation, hvis du gerne vil have den "
-"skal vises i e-mailens overskriftsfelter, der sendes ud.</p>"
-"<p>Det er sikkert (og normalt) at efterlade dette blankt.</p></qt>"
+"<qt><h3>Organisation</h3><p>Dette felt skal have navnet på din organisation, "
+"hvis du gerne vil have den skal vises i e-mailens overskriftsfelter, der "
+"sendes ud.</p><p>Det er sikkert (og normalt) at efterlade dette blankt.</p></"
+"qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4010,20 +3941,15 @@ msgstr "&E-mail-adresse:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-mail-adresse</h3>"
-"<p>Dette felt skal have din fulde e-mail-adresse.</p>"
-"<p>Hvis du efterlader dette blankt, eller skriver det forkert, vil folk have "
-"besvær med at svare dig.</p></qt>"
+"<qt><h3>E-mail-adresse</h3><p>Dette felt skal have din fulde e-mail-adresse."
+"</p><p>Hvis du efterlader dette blankt, eller skriver det forkert, vil folk "
+"have besvær med at svare dig.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4032,21 +3958,12 @@ msgstr "&E-mail-adresse:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4066,24 +3983,22 @@ msgstr "Din OpenPGP underskriftsnøgle"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Vælg den OpenPGP-nøgle der skal bruges til at underskrive dine breve digitalt."
+"Vælg den OpenPGP-nøgle der skal bruges til at underskrive dine breve "
+"digitalt."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Den OpenPGP-nøgle du vælger her vil blive brugt til at underskrive dine "
-"breve digitalt. Du kan også bruge GnuPG-nøgler.</p> "
-"<p>Du kan efterlade dette blankt, men så vil KMail ikke kunne underskrive "
-"e-mail digitalt med OpenPGP. Normale post-funktioner vil ikke blive "
-"påvirket.</p> "
-"<p>Du kan finde ud af mere om nøgler på <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Den OpenPGP-nøgle du vælger her vil blive brugt til at underskrive "
+"dine breve digitalt. Du kan også bruge GnuPG-nøgler.</p> <p>Du kan efterlade "
+"dette blankt, men så vil KMail ikke kunne underskrive e-mail digitalt med "
+"OpenPGP. Normale post-funktioner vil ikke blive påvirket.</p> <p>Du kan "
+"finde ud af mere om nøgler på <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4095,31 +4010,27 @@ msgstr "Din OpenPGP underskriftsnøgle"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Vælg den OpenPGP-nøgle der skal bruges når du krypterer til dig selv og til "
 "\"Vedlæg min offentlige nøgle\"'funktionen i brevskriveren."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Den OpenPGP-nøgle du vælger her vil blive brugt til at kryptere breve til "
-"dig selv og til \"Vedlæg offentlig nøgle\"-funktionen i brevskriveren. Du kan "
-"også bruge GnuPG-nøgler.</p> "
-"<p>Du kan efterlade dette blankt, men så vil KMail ikke kunne kryptere kopier "
-"af udgående breve med OpenPGP. Normale post-funktioner vil ikke blive "
-"påvirket.</p> "
-"<p>Du kan finde ud af mere om nøgler på <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Den OpenPGP-nøgle du vælger her vil blive brugt til at kryptere breve "
+"til dig selv og til \"Vedlæg offentlig nøgle\"-funktionen i brevskriveren. "
+"Du kan også bruge GnuPG-nøgler.</p> <p>Du kan efterlade dette blankt, men så "
+"vil KMail ikke kunne kryptere kopier af udgående breve med OpenPGP. Normale "
+"post-funktioner vil ikke blive påvirket.</p> <p>Du kan finde ud af mere om "
+"nøgler på <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4134,23 +4045,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Vælg det S/MIME certifikat der skal bruges til at underskrive breve digitalt, "
-"når du underskriver dine breve."
+"Vælg det S/MIME certifikat der skal bruges til at underskrive breve "
+"digitalt, når du underskriver dine breve."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Det S/MIME (X.509) certifikat du vælger her vil blive brugt til at "
-"underskrive breve digitalt.</p>"
-"<p>Du kan efterlade det blankt, men KMail vil så ikke kunne underskrive breve "
-"digitalt ved brug af S/MIME. Normale postfunktioner vil ikke blive påvirket.</p>"
-"</qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Det S/MIME (X.509) certifikat du vælger her vil blive brugt til at "
+"underskrive breve digitalt.</p><p>Du kan efterlade det blankt, men KMail vil "
+"så ikke kunne underskrive breve digitalt ved brug af S/MIME. Normale "
+"postfunktioner vil ikke blive påvirket.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4162,27 +4070,26 @@ msgstr "Dit S/MIME krypteringscertifikat"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Vælg det S/MIME certifikat der skal bruges når der krypteres til dig selv og "
 "til \"Vedlæg mit certifikat\"-funktionen i brevskriveren."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Den OpenPGP-nøgle du vælger her vil blive brugt til at underskrive breve og "
-"til at kryptere breve til dig selv. Du kan også bruge GnuPG-nøgler.</p> "
-"<p>Du kan efterlade dette blankt, men så vil KMail ikke kunne underskrive "
-"e-mail kryptografisk. Normale post-funktioner vil ikke blive påvirket.</p> "
-"<p>Du kan finde ud af mere om nøgler på <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>Den OpenPGP-nøgle du vælger her vil blive brugt til at underskrive "
+"breve og til at kryptere breve til dig selv. Du kan også bruge GnuPG-nøgler."
+"</p> <p>Du kan efterlade dette blankt, men så vil KMail ikke kunne "
+"underskrive e-mail kryptografisk. Normale post-funktioner vil ikke blive "
+"påvirket.</p> <p>Du kan finde ud af mere om nøgler på <a>http://www.gnupg."
+"org</a></p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4202,24 +4109,20 @@ msgstr "&Svaradresse:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Reply-To adresser</h3>"
-"<p>Dette sætter <tt>Reply-to:</tt> overskriftsdelen til en anden e-mail adresse "
-"end den normale <tt>From:</tt>-adresse.</p>"
-"<p>Dette kan være nyttigt når du har en gruppe folk der arbejder sammen i "
-"lignende roller. For eksempel, vil du måske ønske at al e-mail der sende skal "
-"have din e-mail-adresse i <tt>From:</tt>-feltet, men at svar skal gå til en "
-"gruppeadresse.</p>"
-"<p>Hvis du er i tvivl, så lad dette felt være blankt.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Reply-To adresser</h3><p>Dette sætter <tt>Reply-to:</tt> "
+"overskriftsdelen til en anden e-mail adresse end den normale <tt>From:</tt>-"
+"adresse.</p><p>Dette kan være nyttigt når du har en gruppe folk der arbejder "
+"sammen i lignende roller. For eksempel, vil du måske ønske at al e-mail der "
+"sende skal have din e-mail-adresse i <tt>From:</tt>-feltet, men at svar skal "
+"gå til en gruppeadresse.</p><p>Hvis du er i tvivl, så lad dette felt være "
+"blankt.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4227,25 +4130,19 @@ msgstr "&BCC-adresser:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy)- adresser</h3>"
-"<p>Adresserne du indtaster her vil blive tilføjet hver udgående post der sendes "
-"med denne identitet De vil ikke være synlige for andre modtagere.</p>"
-"<p>Dette er almindeligt brugt til at sende en kopi af hvert sendt brev til   en "
-"anden af dine konti.</p>"
-"<p>For at angive mere end en adresse bruges kommaer til at adskille listen af "
-"BBC-modtager</p>"
-"<p>Hvis du er i tvivl, så lad feltet være blankt.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy)- adresser</h3><p>Adresserne du indtaster her "
+"vil blive tilføjet hver udgående post der sendes med denne identitet De vil "
+"ikke være synlige for andre modtagere.</p><p>Dette er almindeligt brugt til "
+"at sende en kopi af hvert sendt brev til   en anden af dine konti.</p><p>For "
+"at angive mere end en adresse bruges kommaer til at adskille listen af BBC-"
+"modtager</p><p>Hvis du er i tvivl, så lad feltet være blankt.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4283,7 +4180,7 @@ msgstr "&Underskrift"
 msgid "&Picture"
 msgstr "&Billede"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ugyldig e-mail-adresse"
 
@@ -4299,18 +4196,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"En af de indstillede OpenPGP underskriftsnøgler indeholder ikke noget bruger-ID "
-"med den indstillede e-mail-adresse for denne identitet (%1).\n"
+"En af de indstillede OpenPGP underskriftsnøgler indeholder ikke noget bruger-"
+"ID med den indstillede e-mail-adresse for denne identitet (%1).\n"
 "Dette kan resultere i advarselsbeskeder på den modtagende side, når det "
 "forsøges at verificere underskrifter lavet med denne indstilling."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"En af de indstillede OpenPGP krypteringsnøgler indeholder ikke noget bruger-ID "
-"med den indstillede e-mail-adresse for denne identitet (%1)"
+"En af de indstillede OpenPGP krypteringsnøgler indeholder ikke noget bruger-"
+"ID med den indstillede e-mail-adresse for denne identitet (%1)"
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4319,8 +4216,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"En af de indstillede S/MIME underskriftsnøgler indeholder ikke noget bruger-ID "
-"med den indstillede e-mail-adresse for denne identitet (%1).\n"
+"En af de indstillede S/MIME underskriftsnøgler indeholder ikke noget bruger-"
+"ID med den indstillede e-mail-adresse for denne identitet (%1).\n"
 "Dette kan resultere i advarselsbeskeder på den modtagende side, når det "
 "forsøges at verificere underskrifter lavet med denne indstilling."
 
@@ -4329,8 +4226,8 @@ msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"En af de indstillede S/MIME krypteringsnøgler indeholder ikke noget bruger-ID "
-"med den indstillede e-mail-adresse for denne identitet (%1)."
+"En af de indstillede S/MIME krypteringsnøgler indeholder ikke noget bruger-"
+"ID med den indstillede e-mail-adresse for denne identitet (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4357,21 +4254,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Den brugervalgte kladde-mappe for identitet \"%1\" eksisterer ikke (længere). "
-"Derfor vil standard kladde-mappen blive brugt."
+"Den brugervalgte kladde-mappe for identitet \"%1\" eksisterer ikke "
+"(længere). Derfor vil standard kladde-mappen blive brugt."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Den brugervalgte skabelonmappe for identitet \"%1\" eksisterer ikke (længere). "
-"Derfor vil standard skabelonmappen blive brugt."
+"Den brugervalgte skabelonmappe for identitet \"%1\" eksisterer ikke "
+"(længere). Derfor vil standard skabelonmappen blive brugt."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Standard)"
 
@@ -4414,24 +4311,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"Kmail har detekteret en præfix-indgang i indstillingen af kontoen \"%1\" som er "
-"forældet med hensyn til understøttelse af IMAP-navnerum."
+"Kmail har detekteret en præfix-indgang i indstillingen af kontoen \"%1\" som "
+"er forældet med hensyn til understøttelse af IMAP-navnerum."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Indstillingen er overført automatisk, men du bør kontrollere din "
 "kontoindstilling."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Det var ikke muligt at overføre din indstilling automatisk, kontrollér derfor "
-"din kontoindstilling."
+"Det var ikke muligt at overføre din indstilling automatisk, kontrollér "
+"derfor din kontoindstilling."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4446,8 +4343,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Kunne ikke uploade brevet med dato %1 fra <i>%2</i> med emnet <i>%3</i> "
-"til serveren."
+"Kunne ikke uploade brevet med dato %1 fra <i>%2</i> med emnet <i>%3</i> til "
+"serveren."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4468,17 +4365,22 @@ msgstr "Mappen er for tæt på kvotegrænsen. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "Bed venligst ejeren af mappen om at frigøre noget plads i den, siden du ikke "
 "har skriverettigheder til den."
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Fejl: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Forbindelsen til serveren %1 lukkedes uventet eller overskred en tidsgrænse. "
 "Den genetableres automatisk om muligt."
@@ -4630,20 +4532,20 @@ msgstr "Liste af arkiver"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"En eller flere af dine konfigurerede OpenPGP-krypteringsnøgler eller "
-"S/MIME-certifikater er ikke fuldt betroet til kryptering."
+"En eller flere af dine konfigurerede OpenPGP-krypteringsnøgler eller S/MIME-"
+"certifikater er ikke fuldt betroet til kryptering."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"En eller flere af dine konfigurerede OpenPGP-krypteringsnøgler eller "
-"S/MIME-certifikater er ikke fuldt betroet til kryptering."
+"En eller flere af dine konfigurerede OpenPGP-krypteringsnøgler eller S/MIME-"
+"certifikater er ikke fuldt betroet til kryptering."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4677,220 +4579,182 @@ msgstr "Ikke fuldt betroede krypteringsnøgler"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end én dag.</p>\n"
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end %n dage.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end én dag.</p>\n"
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end %n dage.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
+"(serienummer %2)</p><p>udløber om mindre end én dag.</p>\n"
 "<p>Dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"(serienummer %2)</p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
+"(serienummer %2)</p><p>udløber om mindre end én dag.</p>\n"
 "<p>Dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"(serienummer %2)</p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4904,209 +4768,171 @@ msgstr "S/MIME-certifikatet udløber snart"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Din OpenPGP underskriftsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Din OpenPGP krypteringsnøgle</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>OpenPGP-nøglen for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Rod-certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end én dag.</p>\n"
+"<p>Rod-certifikatet</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end %n dage.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Mellem-CA certifikatet</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"underskriftscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for dit S/MIME "
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end én dag.</p>\n"
+"<p>Mellem-CA certifikater</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certifikatet</p><p align=center><b>%1</b> (serienummer %2)</p><p>udløber om "
+"mindre end %n dage.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
+"(serienummer %2)</p><p>udløber om mindre end én dag.</p>\n"
 "<p>Dit S/MIME underskriftscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"(serienummer %2)</p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
+"(serienummer %2)</p><p>udløber om mindre end én dag.</p>\n"
 "<p>Dit S/MIME krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"(serienummer %2)</p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end én dag.</p>\n"
-"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>udløber om mindre end %n dage.</p>"
+"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end én dag.</p>\n"
+"<p>S/MIME certifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>udløber om mindre end %n dage.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5118,9 +4944,10 @@ msgstr "S/MIME-certifikatet udløber snart"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5144,8 +4971,8 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "En eller flere af dine indstillede OpenPGP underskriftsnøgler eller S/MIME "
-"underskriftscertifikater er ikke brugbart til underskrift. Genindstil venligst "
-"dine  underskriftsnøgler og certifikater for denne identitet i "
+"underskriftscertifikater er ikke brugbart til underskrift. Genindstil "
+"venligst dine  underskriftsnøgler og certifikater for denne identitet i "
 "indstillingsdialogen for identiteter.\n"
 "Hvis du vælger at fortsætte, og der senere bliver brug for nøglerne, vil du "
 "blive bedt om at angive hvilke nøgler der skal bruges."
@@ -5158,43 +4985,43 @@ msgstr "Ubrugelige underskriftsnøgler"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal krypteres "
-"ved brug af OpenPGP, i det mindste for nogle modtagere.\n"
+"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal "
+"krypteres ved brug af OpenPGP, i det mindste for nogle modtagere.\n"
 "Du har imidlertid ikke indstillet gyldige troværdige krypteringsnøgler for "
 "OpenPGP for denne identitet.\n"
-"Du kan fortsætte uden selv at kryptere, men vær klar over at du ikke vil kunne "
-"læse dine egne breve hvis du gør det."
+"Du kan fortsætte uden selv at kryptere, men vær klar over at du ikke vil "
+"kunne læse dine egne breve hvis du gør det."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal krypteres "
-"ved brug af S/MIME, i det mindste for nogle modtagere.\n"
-"Du har imidlertid ikke indstillet gyldige troværdige krypteringsnøgler for "
-"S/MIME for denne identitet.\n"
-"Du kan fortsætte uden selv at kryptere, men vær klar over at du ikke vil kunne "
-"læse dine egne breve hvis du gør det."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal "
+"krypteres ved brug af S/MIME, i det mindste for nogle modtagere.\n"
+"Du har imidlertid ikke indstillet gyldige troværdige krypteringsnøgler for S/"
+"MIME for denne identitet.\n"
+"Du kan fortsætte uden selv at kryptere, men vær klar over at du ikke vil "
+"kunne læse dine egne breve hvis du gør det."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal krypteres "
-"ved brug af OpenPGP, i det mindste for nogle modtagere.\n"
+"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal "
+"krypteres ved brug af OpenPGP, i det mindste for nogle modtagere.\n"
 "Du har imidlertid ikke indstillet gyldige troværdige krypteringsnøgler for "
 "OpenPGP for denne identitet."
 
@@ -5204,15 +5031,15 @@ msgstr "Underskriv ikke med OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal krypteres "
-"ved brug af S/MIME, i det mindste for nogle modtagere.\n"
-"Du har imidlertid ikke indstillet gyldige troværdige krypteringsnøgler for "
-"S/MIME for denne identitet."
+"Undersøgelse af modtagerens foretrukne kryptering gav at brevet skal "
+"krypteres ved brug af S/MIME, i det mindste for nogle modtagere.\n"
+"Du har imidlertid ikke indstillet gyldige troværdige krypteringsnøgler for S/"
+"MIME for denne identitet."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5234,11 +5061,11 @@ msgstr "Ingen underskrift mulig"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Du valgte ikke en krypteringsnøgle for dig selv (kryptér til digslev). Du vil "
-"ikke kunne afkode dit eget brev hvis du krypterer det."
+"Du valgte ikke en krypteringsnøgle for dig selv (kryptér til digslev). Du "
+"vil ikke kunne afkode dit eget brev hvis du krypterer det."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5259,8 +5086,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Du valgte ikke en krypteringsnøgle for nogen af modtagerne af denne besked. "
 "Derfor vil det ikke blive krypteret."
@@ -5274,16 +5101,16 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du valgte ikke en krypteringsnøgle for en af modtagerne. Denne person vil ikke "
-"kunne dekryptere beskeden hvis du krypterer den."
+"Du valgte ikke en krypteringsnøgle for en af modtagerne. Denne person vil "
+"ikke kunne dekryptere beskeden hvis du krypterer den."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du valgte ikke en krypteringsnøgle for nogle af modtagerne. Disse personer vil "
-"ikke kunne dekryptere beskeden hvis du krypterer den."
+"Du valgte ikke en krypteringsnøgle for nogle af modtagerne. Disse personer "
+"vil ikke kunne dekryptere beskeden hvis du krypterer den."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5307,11 +5134,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Ingen gyldig eller troværdig krypteringsnøgle fundet for \"%1\".\n"
 "\n"
@@ -5360,10 +5187,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Alvorlig fejl: Ude af stand til at hente post:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Lykkedes ikke at tilføje brev:\n"
+msgid "Failed to add message:\n"
+msgstr "Lykkedes ikke at tilføje brev:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5453,6 +5278,50 @@ msgstr "&Ikke forbundet IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-postkasse"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Sæt emnet for brevet"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Send CC: til 'adresse'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Send BCC: til 'adresse'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Tilføj 'header' til brevet"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Læs brødtekst fra 'fil'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Sæt brødteksten for brevet"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Tilføj et bilag til brevet. Dette kan gentages"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Tjek kun for ny post"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Åbn kun brevskrivningsvinduet"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Vis den givne brevfil"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Send besked til 'adresse' henholdsvis vedlæg filen 'URL'-en peger på"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Post"
@@ -5495,8 +5364,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail vil nu oprette de krævede groupware-mapper som undermapper af %1. Hvis du "
-"ikke ønsker dette, så annullér så vil IMAP-ressourcen blive slået fra"
+"KMail vil nu oprette de krævede groupware-mapper som undermapper af %1. Hvis "
+"du ikke ønsker dette, så annullér så vil IMAP-ressourcen blive slået fra"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5508,13 +5377,13 @@ msgstr "%1: fandt mappen %2. Den vil blive sat som hovedmappe for groupware."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>Kmail fandt følgende groupware-mapper i %1 og behøver at udføre følgende "
-"handlinger: %2."
-"<br>Hvis du ikke vil gøre dette, så annullér så deaktiveres IMAP-ressourcen."
+"handlinger: %2.<br>Hvis du ikke vil gøre dette, så annullér så deaktiveres "
+"IMAP-ressourcen."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5562,11 +5431,11 @@ msgstr "URL kopieret til klippebordet."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Filen <b>%1</b> eksisterer.<br>Vil du erstatte den?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Gem til fil"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Erstat"
 
@@ -5585,7 +5454,7 @@ msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 "Brevet blev fjernet mens det var ved at blive gemt. Det er ikke blevet gemt."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5605,11 +5474,11 @@ msgstr "Filen indeholder ikke et brev."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Filen indeholder flere breve. Kun det første brev bliver vist."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5619,83 +5488,83 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrering af breve"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer brev %1 ud af %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Ikke nok fri diskplads?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Flyt til denne mappe"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiér til denne mappe"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr "Korrupt IMAP-cache detekteret i mappen %1. Kopiering af breve afbrudt."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Flytning af breve"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Sletning af breve"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Åbner URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Vil du virkelig udføre <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Udfør"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Fandt ingen bilag at gemme."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Gem bilag til"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "bilag.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "bilag.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "En fil med navnet %1 findes allerede. Vil du overskrive den?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Filen eksisterer allerede"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Overskriv"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5703,31 +5572,31 @@ msgstr ""
 "Delen %1 af brevet er krypteret. Ønsker du at bevare krypteringen når der "
 "gemmes?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail Spørgsmål"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Behold kryptering"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Behold ikke"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"Delen %1 af brevet er underskrevet. Ønsker du at bevare underskriften når der "
-"gemmes?"
+"Delen %1 af brevet er underskrevet. Ønsker du at bevare underskriften når "
+"der gemmes?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Behold underskrift"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5736,22 +5605,22 @@ msgstr ""
 "Kunne ikke skrive filen %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Kunne ikke skrive filen %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Der er ingen indgang i adressebogen for denne e-mail-adresse. Tilføj den til  "
-"adressebogen og tilføj så instant messaging adresser ved brug af din foretrukne "
-"messaging klient."
+"Der er ingen indgang i adressebogen for denne e-mail-adresse. Tilføj den "
+"til  adressebogen og tilføj så instant messaging adresser ved brug af din "
+"foretrukne messaging klient."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5761,51 +5630,51 @@ msgstr ""
 " %1\n"
 " Det er ikke muligt at afgøre hvem der skal chattes med."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Chiasmus-grænsefladen sørger ikke for funktionen \"x-obtain-keys\". Rapportér "
-"fejlen."
+"Chiasmus-grænsefladen sørger ikke for funktionen \"x-obtain-keys\". "
+"Rapportér fejlen."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Fejl i Chiasmus-grænseflade"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Uventet returværdi fra Chiasmus-grænsefladen. Funktionen \"x-obtain-keys\" "
 "returnerede ikke en strengliste. Rapportér fejlen."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Ingen nøgler fundet. Kontrollér at en gyldig nøglesøgesti er indstillet i "
 "Chiasmus indstillinger."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus afkrypteringsnøgle-valg"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus-grænsefladen sørger ikke for funktionen \"x-decrypt\". Rapportér "
 "fejlen."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5813,19 +5682,19 @@ msgstr ""
 "Funktionen \"x-decrypt\" accepterer ikke de forventede parametre. Rapportér "
 "fejlen."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus afkodningsfejl"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Uventet returværdi fra Chiasmus-grænsefladen. Funktionen \"x-decrypt\" "
 "returnerede ikke et bytefelt. Rapportér fejlen."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5835,7 +5704,7 @@ msgstr ""
 "Til: %2\n"
 "Emne: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Post: %1"
@@ -5934,7 +5803,7 @@ msgstr "Størrelse"
 msgid "Encoding"
 msgstr "Tegnsæt"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimér"
 
@@ -5946,7 +5815,7 @@ msgstr "Kryptér"
 msgid "Sign"
 msgstr "Underskriv"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Navn på bilag:"
 
@@ -5968,10 +5837,11 @@ msgstr "Primære modtager"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>E-mail-adresserne du putter ind i dette felt modtager en kopi af "
-"brevet.</qt>"
+"<qt>E-mail-adresserne du putter ind i dette felt modtager en kopi af brevet."
+"</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5980,12 +5850,12 @@ msgstr "Yderligere modtager"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>E-mail-adresserne du putter  ind i dette felt modtager en kopi af e-mailen. "
-"Teknisk er det det samme som at putte alle adresserne i <b>To:</b> "
+"<qt>E-mail-adresserne du putter  ind i dette felt modtager en kopi af e-"
+"mailen. Teknisk er det det samme som at putte alle adresserne i <b>To:</b> "
 "feltet men forskelligt derved at det sædvanligvis symboliserer modtageren "
 "Carbon Copy (CC) som en lytter, ikke hovedmodtageren.</qt>"
 
@@ -5995,12 +5865,11 @@ msgstr "Skjulte modtager"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Essentielt det samme som <b>Copy To:</b> felt men adskiller sig derved at "
-"alle andre modtagere ikke ser hvem, der modtager en blind kopi.</qt>"
+"<qt>Essentielt det samme som <b>Copy To:</b> felt men adskiller sig derved "
+"at alle andre modtagere ikke ser hvem, der modtager en blind kopi.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6010,7 +5879,7 @@ msgstr "&Send post"
 msgid "&Send Mail Via"
 msgstr "&Send post via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Send &senere"
@@ -6075,8 +5944,7 @@ msgstr "&Fjern citationstegn"
 msgid "Cl&ean Spaces"
 msgstr "&Rene mellemrum"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Brug fast&bredde-skrifttype"
@@ -6217,31 +6085,31 @@ msgstr "&Kryptografisk brevformat"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Kugleliste (Disk)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Kugleliste (Cirkel)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Kugleliste (Firkant)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Ordnet liste (Decimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Ordnet liste (Alfabetisk små)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Ordnet  liste (Alfabetisk store)"
 
@@ -6333,8 +6201,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Gem brevet i mappen Kladder. Det kan derefter redigeres og sendes på et senere "
-"tidspunkt."
+"Gem brevet i mappen Kladder. Det kan derefter redigeres og sendes på et "
+"senere tidspunkt."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6346,8 +6214,8 @@ msgstr "Luk brevskriver"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Brevet du har skrevet synes at referere til en vedlagt fil men du har ingen "
@@ -6358,52 +6226,51 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Fil-bilag påmindelse "
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Send &som det er"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail kunne ikke genkende stedet for bilaget (%1).</p>"
-"<p>Du skal angive fuld sti når du ønsker at vedlægge en fil.</p></qt>"
+"<qt><p>KMail kunne ikke genkende stedet for bilaget (%1).</p><p>Du skal "
+"angive fuld sti når du ønsker at vedlægge en fil.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt> "
-"<p>Din administrator har forbudt vedhæftning af filer større end %1 MB.</p>"
+"<qt> <p>Din administrator har forbudt vedhæftning af filer større end %1 MB."
+"</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Vedlæg fil"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Vedlæg"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Indsæt fil"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Indsæt fil"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Der opstod en fejl under forsøget på at eksportere nøglen fra det "
-"underliggende program:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Der opstod en fejl under forsøget på at eksportere nøglen fra det "
+"underliggende program:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6442,19 +6309,34 @@ msgid ""
 "View"
 msgstr "Vis"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Redigér..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Redigér med..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Gem &som..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Egenskaber"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Tilføj bilag..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail kunne ikke komprimere filen."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6462,78 +6344,74 @@ msgstr ""
 "Den komprimerede fil er større end den originale. Ønsker du at beholder den  "
 "originale?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Behold"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail kunne ikke dekomprimere filen."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Gem bilag som"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Tilføj som tekst"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Tilføj som bilag"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Vælg venligst hvorvidt du ønsker at indsætte indholdet som tekst i editoren, "
 "eller tilføje den pågældende fil som et bilag."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Indsæt som tekst eller bilag?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "unavngiven"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Du har bedt om at beskeder krypteres til dig selv, men den nuværende valgte "
-"identitet definerer ikke en (OpenPGP eller S/MIME) krypteringsnøgle at bruge "
-"til dette.</p>"
-"<p>Vælg venligst nøglerne der skal bruges i identitetsindstillingen.</p></qt>"
+"<qt><p>Du har bedt om at beskeder krypteres til dig selv, men den nuværende "
+"valgte identitet definerer ikke en (OpenPGP eller S/MIME) krypteringsnøgle "
+"at bruge til dette.</p><p>Vælg venligst nøglerne der skal bruges i "
+"identitetsindstillingen.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Udefineret krypteringsnøgle"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>For at kunne underskrive dette brev må du først definere den (OpenPGP eller "
-"S/MIME) underskriftsnøgle som skal bruges.</p>"
-"<p>Vælg venligst den nøgle som skal bruges i identitetsindstillingen.</p></qt>"
+"<qt> <p>For at kunne underskrive dette brev må du først definere den "
+"(OpenPGP eller S/MIME) underskriftsnøgle som skal bruges.</p><p>Vælg "
+"venligst den nøgle som skal bruges i identitetsindstillingen.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Udefineret underskriftsnøgle"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6541,90 +6419,89 @@ msgstr ""
 "Kmail er for øjeblikket i offline tilstand. Dine breve beholdes i udbakken "
 "indtil du går online."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Du skal indtaste din e-mail-adresse i From:-feltet. Du skal også sætte din "
-"e-mail-adresse for alle identiteter, så du ikke behøver at skrive den for hvert "
-"brev."
+"Du skal indtaste din e-mail-adresse i From:-feltet. Du skal også sætte din e-"
+"mail-adresse for alle identiteter, så du ikke behøver at skrive den for "
+"hvert brev."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Du skal angive mindst én modtager, enten i feltet Til: eller som CC eller BCC."
+"Du skal angive mindst én modtager, enten i feltet Til: eller som CC eller "
+"BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Feltet 'Til' er tomt. Send brevet alligevel?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Til: ikke angivet"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du angav ikke et emne. Skal brevet sendes alligevel?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Intet emne angivet"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "S&end som det er"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "Angiv emnet"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Behold opmarkering, underskriv/kryptér ikke"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Behold opmarkering, kryptér ikke"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Behold opmarkering, underskriv ikke"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Underskriv/Kryptér (slet opmarkering)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Kryptér (slet opmarkering)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Underskriv (slet opmarkering)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Indlejret underskrift/kryptering af HTML-beskeder er ikke mulig.</p>"
-"<p>Ønsker du at slette din opmarkering?</p></qt>"
+"<qt><p>Indlejret underskrift/kryptering af HTML-beskeder er ikke mulig.</"
+"p><p>Ønsker du at slette din opmarkering?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Underskriv/Kryptér brev?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6632,105 +6509,105 @@ msgstr ""
 "Den brugervalgte kladde- eller skabelonmappe for identitet \"%1\" eksisterer "
 "ikke (længere). Derfor vil standard kladde- eller skabelonmappen blive brugt."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Angiv venligst en konto  til at sende fra og prøv igen."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Ved at sende e-mail..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Send bekræftelse"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Send nu"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Ingen modtagere"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Yderligere modtager"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Stavekontrol: på"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Stavekontrol: af"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Stavekontrol annulleret."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Stavekontrol standset."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Stavekontrol udført."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Stavekontrol "
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Indstil først et krypto-plugin at bruge for kryptering med Chiasmius.\n"
 "Du kan gøre dette i fanebladet Krypto-plugin på siden Sikkerhed i "
 "indstillingsdialogen."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Det virker som om libkleopatra blev kompileret uden støtte for Chiasmus. Du vil "
-"måske genkompilere libkleopatra med --enable-chiasmus."
+"Det virker som om libkleopatra blev kompileret uden støtte for Chiasmus. Du "
+"vil måske genkompilere libkleopatra med --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Ingen Chiasmus-grænseflade indstillet"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Ingen Chiasmus-nøgler fundet"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus krypteringsnøgle-valg"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Brevet vil blive signeret"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Brevet vil ikke blive signeret"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Brevet vil blive krypteret"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Brevet vil ikke blive krypteret"
 
@@ -6779,8 +6656,8 @@ msgstr "Stavekontrol - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell kunne ikke startes. Tjek venligst om ISpell eller Aspell er "
 "korrekt indstillet og er i din sti (PATH)."
@@ -6816,12 +6693,10 @@ msgstr "<qt>For mange filterhandlinger i filterreglen <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Ukendt filterhandling <b>%1</b>"
-"<br>i filterreglen <b>%2</b>."
+"<qt>Ukendt filterhandling <b>%1</b><br>i filterreglen <b>%2</b>."
 "<br>Ignorerer det.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7042,162 +6917,131 @@ msgstr "Afspil en lyd"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dette er listen af definerede filtre. De bliver behandlet oppefra og "
-"nedad.</p>"
-"<p>Klik på et vilkårligt filter for at redigere det ved brug af kontrollerne i "
-"højre halvdel af dialogen.</p></qt>"
+"<qt><p>Dette er listen af definerede filtre. De bliver behandlet oppefra og "
+"nedad.</p><p>Klik på et vilkårligt filter for at redigere det ved brug af "
+"kontrollerne i højre halvdel af dialogen.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at oprette et nyt filter.</p>"
-"<p>Filteret vil blive indsat lige før det valgte, men du kan altid ændre dette "
-"senere.</p>"
-"<p>Hvis du klikkede på denne knap ved et tilfælde, kan du fortryde det ved at "
-"klikke på <em>Slet</em>-knappen.</p></qt>"
+"<qt><p>Klik på denne knap for at oprette et nyt filter.</p><p>Filteret vil "
+"blive indsat lige før det valgte, men du kan altid ændre dette senere.</"
+"p><p>Hvis du klikkede på denne knap ved et tilfælde, kan du fortryde det ved "
+"at klikke på <em>Slet</em>-knappen.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at kopiere et filter.</p>"
-"<p>Hvis du klikkede på denne knap ved et tilfælde, kan du fortryde det ved at "
-"klikke på <em>Slet</em>-knappen.</p></qt>"
+"<qt><p>Klik på denne knap for at kopiere et filter.</p><p>Hvis du klikkede "
+"på denne knap ved et tilfælde, kan du fortryde det ved at klikke på "
+"<em>Slet</em>-knappen.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at <em>slette</em> det valgte filter fra listen "
-"ovenfor.</p>"
-"<p>Der er ingen måde at få filteret tilbage på, når det er slettet, men du kan "
-"altid forlade dialogen ved at klikke på <em>Annullér</em> "
-"og derved kassere de ændringer, der er lavet.</p></qt>"
+"<qt><p>Klik på denne knap for at <em>slette</em> det valgte filter fra "
+"listen ovenfor.</p><p>Der er ingen måde at få filteret tilbage på, når det "
+"er slettet, men du kan altid forlade dialogen ved at klikke på <em>Annullér</"
+"em> og derved kassere de ændringer, der er lavet.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at flytte nuværende valgte filter <em>længst op</em> "
-"i listen ovenfor.</p>"
-"<p>Dette er nyttigt eftersom filtrenes rækkefølge i listen afgør i hvilken "
-"rækkefølge de prøves på breve: det øverste filter prøves først.</p></qt>"
+"<qt><p>Klik på denne knap for at flytte nuværende valgte filter <em>længst "
+"op</em> i listen ovenfor.</p><p>Dette er nyttigt eftersom filtrenes "
+"rækkefølge i listen afgør i hvilken rækkefølge de prøves på breve: det "
+"øverste filter prøves først.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at flytte det valgte filter én <em>op</em> "
-"i listen ovenfor.</p>"
-"<p>Dette er nyttigt, da rækkefølgen af filtrene på listen afgør den rækkefølge "
-"i hvilken de prøves på brevene. Det øverste filter bliver prøvet først.</p>"
-"<p>Hvis du tilfældigvis har klikket på denne knap, kan du fortryde det ved at "
-"klikke på <em>Ned</em>-knappen.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klik på denne knap for at flytte det valgte filter én <em>op</em> i "
+"listen ovenfor.</p><p>Dette er nyttigt, da rækkefølgen af filtrene på listen "
+"afgør den rækkefølge i hvilken de prøves på brevene. Det øverste filter "
+"bliver prøvet først.</p><p>Hvis du tilfældigvis har klikket på denne knap, "
+"kan du fortryde det ved at klikke på <em>Ned</em>-knappen.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at flytte det valgte filter én <em>ned</em> "
-"i listen ovenfor.</p>"
-"<p>Dette er nyttigt, da rækkefølgen af filtrene på listen afgør den rækkefølge "
-"i hvilken de prøves på brevene. Det øverste filter bliver prøvet først.</p>"
-"<p>Hvis du har klikket på denne knap ved et tilfælde, kan du fortryde det ved "
-"at klikke på <em>Op</em>-knappen</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klik på denne knap for at flytte det valgte filter én <em>ned</em> i "
+"listen ovenfor.</p><p>Dette er nyttigt, da rækkefølgen af filtrene på listen "
+"afgør den rækkefølge i hvilken de prøves på brevene. Det øverste filter "
+"bliver prøvet først.</p><p>Hvis du har klikket på denne knap ved et "
+"tilfælde, kan du fortryde det ved at klikke på <em>Op</em>-knappen</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at flytte det valgte filter til <em>bunden</em> "
-"i listen ovenfor.</p>"
-"<p>Dette er nyttigt, da rækkefølgen af filtrene på listen afgør den rækkefølge "
-"i hvilken de prøves på brevene. Det øverste filter bliver prøvet først.</p>"
+"<qt><p>Klik på denne knap for at flytte det valgte filter til <em>bunden</"
+"em> i listen ovenfor.</p><p>Dette er nyttigt, da rækkefølgen af filtrene på "
+"listen afgør den rækkefølge i hvilken de prøves på brevene. Det øverste "
+"filter bliver prøvet først.</p>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik på denne knap for at omdøbe det valgte filter.</p>"
-"<p>Filtre bliver døbt automatisk, når blot de begynder med \"&lt;\".</p>"
-"<p>Hvis du har omdøbt et filter ved et tilfælde og ønsker automatisk "
-"navngivning tilbage, så klik på denne knap og vælg <em>Ryd</em> fulgt af <em>"
-"O.k.</em> i dialogen, der kommer frem.</p></qt>"
+"<qt><p>Klik på denne knap for at omdøbe det valgte filter.</p><p>Filtre "
+"bliver døbt automatisk, når blot de begynder med \"&lt;\".</p><p>Hvis du har "
+"omdøbt et filter ved et tilfælde og ønsker automatisk navngivning tilbage, "
+"så klik på denne knap og vælg <em>Ryd</em> fulgt af <em>O.k.</em> i "
+"dialogen, der kommer frem.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Afkryds her, for at tvinge bekræftelsesdialogen til at blive vist.</p>"
-"<p>Dette er nyttigt, hvis du har defineret et regelsæt, der mærker breve der "
-"skal downloades senere. Uden muligheden for at tvinge dialogen til at poppe op, "
-"kunne disse breve aldrig hentes hjem, hvis der ikke var andre store breve der "
-"ventede på serveren eller hvis du ønskede at ændre regelsættet til at mærke "
-"breve på en anden måde.</p></qt>"
+"<qt><p>Afkryds her, for at tvinge bekræftelsesdialogen til at blive vist.</"
+"p><p>Dette er nyttigt, hvis du har defineret et regelsæt, der mærker breve "
+"der skal downloades senere. Uden muligheden for at tvinge dialogen til at "
+"poppe op, kunne disse breve aldrig hentes hjem, hvis der ikke var andre "
+"store breve der ventede på serveren eller hvis du ønskede at ændre "
+"regelsættet til at mærke breve på en anden måde.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7207,6 +7051,16 @@ msgstr "POP3-filterregler"
 msgid "Filter Rules"
 msgstr "Filterregler"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importér"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importér"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Tilgængelige filtre"
@@ -7287,6 +7141,11 @@ msgstr "Tilføjer yderligere dette filter til værktøjslinjen"
 msgid "Icon for this filter:"
 msgstr "Ikon for dette filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Til"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Op"
@@ -7295,16 +7154,29 @@ msgstr "Op"
 msgid "Down"
 msgstr "Ned"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Omdøb..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Ny"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopiér til"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Slettet"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7313,8 +7185,8 @@ msgstr "Vælg genvej til mappe"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Mindst et filter har en mappe i en online IMAP-konto som mål. Sådanne filtre "
 "bruges ved manuel filtrering og ved filtrering af indkommende breve i online "
@@ -7325,8 +7197,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Følgende filtre er ikke blevet gemt fordi de var ugyldige (f.eks. indeholdende "
-"ingen handlinger eller ingen søgeregler)."
+"Følgende filtre er ikke blevet gemt fordi de var ugyldige (f.eks. "
+"indeholdende ingen handlinger eller ingen søgeregler)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7382,7 +7254,8 @@ msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Mappenavne kan ikke starte med et . (punktum); vælg venligst et andet mappenavn"
+"Mappenavne kan ikke starte med et . (punktum); vælg venligst et andet "
+"mappenavn"
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7396,29 +7269,25 @@ msgstr "Problemløsning i IMAP-cachen"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Problemløsning i IMAP-cache.</b></p>"
-"<p>Hvis du har problemer med at synkronisere en IMAP-mappe, bør du først "
-"forsøge at bygge indeksfilen igen. Det vil tage lidt tid at genbygge, men vil "
-"ikke give problemer derudover.</p>"
-"<p>Hvis det ikke er nok, kan du prøve at genopfriske IMAP-cachen. Hvis du gør "
-"dette, vil alle dine lokale ændringer for denne mappe og alle dens undermapper "
-"gå tabt.</p>"
+"<p><b>Problemløsning i IMAP-cache.</b></p><p>Hvis du har problemer med at "
+"synkronisere en IMAP-mappe, bør du først forsøge at bygge indeksfilen igen. "
+"Det vil tage lidt tid at genbygge, men vil ikke give problemer derudover.</"
+"p><p>Hvis det ikke er nok, kan du prøve at genopfriske IMAP-cachen. Hvis du "
+"gør dette, vil alle dine lokale ændringer for denne mappe og alle dens "
+"undermapper gå tabt.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7454,8 +7323,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "UID-cachefilen for mappen %1 kunne ikke skrives. Det kan være et problem med "
 "rettigheder i filsystemet."
@@ -7478,8 +7347,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Er du sikker på du ønsker at genopfriske IMAP-cachen for mappen %1 og alle dens "
-"undermapper?\n"
+"Er du sikker på du ønsker at genopfriske IMAP-cachen for mappen %1 og alle "
+"dens undermapper?\n"
 "Dette vil fjerne alle ændringer du har lavet lokalt af dine mapper"
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7496,11 +7365,12 @@ msgstr "Indekset for denne mappe er blevet lavet igen."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Mappen %1 er ikke i initial synkroniseringstilstand (tilstand er %2). Ønsker du "
-"at nulstille den til initial synkroniseringstilstand og synkronisere alligevel?"
+"Mappen %1 er ikke i initial synkroniseringstilstand (tilstand er %2). Ønsker "
+"du at nulstille den til initial synkroniseringstilstand og synkronisere "
+"alligevel?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7605,8 +7475,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Dine adgangrettigheder for mappen <b>%1</b> er begrænsede. Det kommer ikke "
-"længere til at være muligt at tilføje breve til denne mappe.</p>"
+"<p>Dine adgangrettigheder for mappen <b>%1</b> er begrænsede. Det kommer "
+"ikke længere til at være muligt at tilføje breve til denne mappe.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7627,15 +7497,11 @@ msgstr "Opretter undermapper på server"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Post på serveren i mappen <b>%1</b> blev slettet. Ønsker du at slette den  "
-"lokalt?"
-"<br>UID'er: %2</p></qt>"
+"<qt><p>Post på serveren i mappen <b>%1</b> blev slettet. Ønsker du at slette "
+"den  lokalt?<br>UID'er: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7656,13 +7522,11 @@ msgstr "Henter mapper for navnerum %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Det ser ud til at mappen <b>%1</b> blev slettet. Ønsker du at slette den fra "
-"serveren?</p></qt>"
+"<qt><p>Det ser ud til at mappen <b>%1</b> blev slettet. Ønsker du at slette "
+"den fra serveren?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7670,16 +7534,16 @@ msgstr "Afbrudt"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP-serveren %1 har ikke støtte for IMAP-anmærkninger. XML-lagring kan ikke "
 "bruges på serveren. Indstil Kmail på en anden måde."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP-serveren %1 har ikke støtte for IMAP-anmærkninger. XML-lagring kan ikke "
 "bruges på serveren. Indstil Kmail på en anden måde."
@@ -7694,17 +7558,17 @@ msgstr "tabt+fundet"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Der er nye brev i mappen <b>%1</b>, som endnu ikke er overført til serveren, "
-"men mappen er blevet slettet på serveren or du har ikke tilstrækkelige "
-"adgangrettigheder til mappen til at overføre dem.</p> "
-"<p>Alle breve som påvirkes vil derfor  blive flyttet til <b>%2</b> "
-"for at undgå datatab.</p>"
+"<p>Der er nye brev i mappen <b>%1</b>, som endnu ikke er overført til "
+"serveren, men mappen er blevet slettet på serveren or du har ikke "
+"tilstrækkelige adgangrettigheder til mappen til at overføre dem.</p> <p>Alle "
+"breve som påvirkes vil derfor  blive flyttet til <b>%2</b> for at undgå "
+"datatab.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7712,21 +7576,26 @@ msgstr "Utilstrækkelige adgangrettigheder"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-msgstr ""
-"<p>Der er nye breve i denne mappe (%1) som endnu ikke er overført til serveren, "
-"men mappen er blevet slettet på serveren eller du har ikke tilstrækkelige "
-"adgangsrettigheder til mappen nu til at kunne overføre dem. Kontakt "
-"systemadministratoren for at tillade overførsel af nye breve til dig, eller "
-"flytte dem fra mappen.</p> "
-"<p>Vil du flytte brevene til en anden mappe nu?</p>"
-
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
+msgstr ""
+"<p>Der er nye breve i denne mappe (%1) som endnu ikke er overført til "
+"serveren, men mappen er blevet slettet på serveren eller du har ikke "
+"tilstrækkelige adgangsrettigheder til mappen nu til at kunne overføre dem. "
+"Kontakt systemadministratoren for at tillade overførsel af nye breve til "
+"dig, eller flytte dem fra mappen.</p> <p>Vil du flytte brevene til en anden "
+"mappe nu?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Flyt til:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Flyt ikke"
 
@@ -7738,8 +7607,7 @@ msgstr "Flyt breve til mappe"
 msgid "Permissions (ACL)"
 msgstr "Tilladelser (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Generelt"
@@ -7763,8 +7631,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Brug selvvalgte &ikoner"
@@ -7783,23 +7650,21 @@ msgstr "Agér på ny post i denne mappe"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hvis dette er aktiveret bliver du underrettet om nye ulæste brev i mappen. "
-"Desuden stopper funktionerne som går til næste eller foregående mappe med "
-"ulæste breve i mappen.</p>"
-"<p>Afmarkér dette hvis du ikke vil underrettes om nye ulæste breve i mappen og "
-"hvis du ønsker at mappen skal springes over når næste eller foregående mappe "
-"med ulæste breve vises. Det er nyttigt at ignorere eventuelle nye eller ulæste "
-"breve i affaldsspanden og mappen med spam.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Hvis dette er aktiveret bliver du underrettet om nye ulæste brev i "
+"mappen. Desuden stopper funktionerne som går til næste eller foregående "
+"mappe med ulæste breve i mappen.</p><p>Afmarkér dette hvis du ikke vil "
+"underrettes om nye ulæste breve i mappen og hvis du ønsker at mappen skal "
+"springes over når næste eller foregående mappe med ulæste breve vises. Det "
+"er nyttigt at ignorere eventuelle nye eller ulæste breve i affaldsspanden og "
+"mappen med spam.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7811,9 +7676,9 @@ msgstr "Behold svar i denne mappe"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Afkryds dette hvis du ønsker at svar du skriver på breve i denne mappe skal "
 "puttes i denne mappe efter de er sendt, i stedet for i den mappe der er "
@@ -7827,17 +7692,21 @@ msgstr "Vis søjle med afsender og modtager i brevlisten"
 msgid "Sho&w column:"
 msgstr "&Vis søjle:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Sæt standard"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Afsender"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Modtager"
@@ -7848,17 +7717,18 @@ msgstr "&Afsenders identitet:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Vælg afsenderidentiteten som skal bruges når nye breve skrives eller ved svar "
-"på brev for denne mappe. Det betyder at hvis du er i en af dine arbejdsmapper, "
-"kan du få Kmail til at bruge tilsvarende afsenders e-mail-adresse, brevfod og "
-"underskrifts- eller krypteringsnøgler automatisk. Identiteter kan indstilles in "
-"i den almindelige indstillingsdialog (Indstillinger -> Indstil Kmail)."
+"Vælg afsenderidentiteten som skal bruges når nye breve skrives eller ved "
+"svar på brev for denne mappe. Det betyder at hvis du er i en af dine "
+"arbejdsmapper, kan du få Kmail til at bruge tilsvarende afsenders e-mail-"
+"adresse, brevfod og underskrifts- eller krypteringsnøgler automatisk. "
+"Identiteter kan indstilles in i den almindelige indstillingsdialog "
+"(Indstillinger -> Indstil Kmail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7876,24 +7746,24 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Denne indstilling angiver hvilke brugere som deler mappen skal få \"optagne\" "
-"perioder i deres ledig-optagne lister og skal se alarmen for begivenhederne "
-"eller opgaverne i mappen. Indstillingen gælder kun kalender- og opgavemapper "
-"(for opgaver bruges indstillingen kun til alarmer).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Denne indstilling angiver hvilke brugere som deler mappen skal få \"optagne"
+"\" perioder i deres ledig-optagne lister og skal se alarmen for "
+"begivenhederne eller opgaverne i mappen. Indstillingen gælder kun kalender- "
+"og opgavemapper (for opgaver bruges indstillingen kun til alarmer).\n"
 "\n"
-"Eksempel på brugertilfælde: Hvis chefen deler en mappe med sin sekretær, skal "
-"kun chefen markeres som optaget for sine møder, så han skal vælge "
-"\"Administrator\", eftersom sekretæren ikke har administratorsrettigheder til "
-"mappen.\n"
-"Hvis en arbejdsgruppe på den anden side deler en kalender for gruppemøder, skal "
-"alle læsere af mappen markeres som optaget ved mødet.\n"
+"Eksempel på brugertilfælde: Hvis chefen deler en mappe med sin sekretær, "
+"skal kun chefen markeres som optaget for sine møder, så han skal vælge "
+"\"Administrator\", eftersom sekretæren ikke har administratorsrettigheder "
+"til mappen.\n"
+"Hvis en arbejdsgruppe på den anden side deler en kalender for gruppemøder, "
+"skal alle læsere af mappen markeres som optaget ved mødet.\n"
 "En mappe for et helt foretagende som indeholder valgfrie aktiviteter ville "
 "bruge \"Ingen\", eftersom det ikke er kendt hvem der vil deltage i "
 "aktiviteterne."
@@ -7914,7 +7784,8 @@ msgstr "Alle læsere af denne mappe"
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
-"Denne indstilling tillader dig at deaktivere alarmer for mapper delt af andre. "
+"Denne indstilling tillader dig at deaktivere alarmer for mapper delt af "
+"andre. "
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -7928,23 +7799,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Du har indstillet denne mappe til at indeholde information fra groupware og det "
-"generelle indstillingsvalg at skjule groupware-mapper er aktiveret. Det betyder "
-"at mappen vil forsvinde så snart indstillingsdialogen lukkes. Hvis du vil "
-"fjerne mappen igen, skal du midlertidigt deaktivere at skjule groupware-mapper "
-"for at kunne se den."
+"Du har indstillet denne mappe til at indeholde information fra groupware og "
+"det generelle indstillingsvalg at skjule groupware-mapper er aktiveret. Det "
+"betyder at mappen vil forsvinde så snart indstillingsdialogen lukkes. Hvis "
+"du vil fjerne mappen igen, skal du midlertidigt deaktivere at skjule "
+"groupware-mapper for at kunne se den."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8013,7 +7884,8 @@ msgstr "Fejl ved at hente mappeinformation."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Postindekset for '%1' er fra en ukendt version af KMail (%2).\n"
 "Dette indeks kan regenereres fra din postmappe, men nogen information, "
@@ -8042,8 +7914,8 @@ msgstr "Fejl ved åbning af %1; denne mappe mangler."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Fejl ved åbning af %1. Enten er dette ikke en gyldig maildir-mappe, eller du "
 "har ikke tilstrækkelige tilladelser."
@@ -8087,21 +7959,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Indekset for mappen '%2' synes at være forældet. For at forhindre "
+"<qt><p>Indekset for mappen '%2' synes at være forældet. For at forhindre "
 "brev-korrumpering vil indekset blive regenereret. Det vil følge deraf at "
-"slettede breve kan vise sig igen og statusflag kan gå tabt.</p>"
-"<p>Læs venligst det tilsvarende afsnit i <a href=\"%1\">"
-"afsnittet om OSS af håndbogen for KMail</a> for information om hvordan dette "
-"problem kan forhindres i at ske igen.</p></qt>"
+"slettede breve kan vise sig igen og statusflag kan gå tabt.</p><p>Læs "
+"venligst det tilsvarende afsnit i <a href=\"%1\">afsnittet om OSS af "
+"håndbogen for KMail</a> for information om hvordan dette problem kan "
+"forhindres i at ske igen.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8160,7 +8029,7 @@ msgstr ""
 "'%1' synes ikke at være en mappe.\n"
 "Flyt venligst filen væk."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8168,7 +8037,7 @@ msgstr ""
 "Tilladelserne i mappen '%1' er forkerte.\n"
 "Sørg venligst for at du kan se og ændre indholdet i denne mappe."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8178,8 +8047,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 "En mappe med samme navn er blevet slettet siden sidste mail-tjek. Du er nødt "
 "til at tjekke mails først, før oprettelse af endnu en mappe med samme navn."
@@ -8188,7 +8057,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Kunne ikke oprette mappe"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8285,13 +8154,14 @@ msgstr "&Problemløsning i IMAP-cache..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Kan ikke oprette mappen <b>%1</b> på grund af utilstrækkelige rettigheder "
-"på serveren. Hvis du synes at du burde kunne oprette undermapper her, så bed "
-"din systemadministrator om at give dig rettigheder til at gøre det.</qt>"
+"<qt>Kan ikke oprette mappen <b>%1</b> på grund af utilstrækkelige "
+"rettigheder på serveren. Hvis du synes at du burde kunne oprette undermapper "
+"her, så bed din systemadministrator om at give dig rettigheder til at gøre "
+"det.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8430,15 +8300,15 @@ msgstr "%1 Mappe er skrivebeskyttet."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ønsker du at slette det valgte brev?"
-"<br>Når først det er slettet, kan det ikke genoprettes.</qt>\n"
-"<qt>Ønsker du at slette de %n valgte breve?"
-"<br>Når først de er slettede, kan de ikke genoprettes.</qt>"
+"<qt>Ønsker du at slette det valgte brev?<br>Når først det er slettet, kan "
+"det ikke genoprettes.</qt>\n"
+"<qt>Ønsker du at slette de %n valgte breve?<br>Når først de er slettede, kan "
+"de ikke genoprettes.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8490,132 +8360,131 @@ msgstr ""
 "Mislykkedes at ændre %1\n"
 "(Ingen plads tilovers på enheden?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Certifikatsunderskrifts-forespørgsel"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
-"Opret venligst et certifikat ud fra bilaget og send det tilbage til afsenderen."
+"Opret venligst et certifikat ud fra bilaget og send det tilbage til "
+"afsenderen."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "Kmail er indstillet til at være offline. Alle netværksjob er hvilende."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "Kmail er indstillet til at være online. Alle netværksjob genoptages."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "Kmail er for øjeblikket offline. Hvordan vil du fortsætte?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Arbejd online"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Arbejd offline"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Du har ikke læse/skrivetilladelse til din indbakke."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "udbakke"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Du har ikke læse/skrivetilladelse til din udbakke."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "sendt post"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Du har ikke læse/skrivetilladelse til din sendt-post-mappe."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "affald"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Du har ikke læse/skrivetilladelse til din affaldsmappe."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "kladder"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Du har ikke læse/skrivetilladelse til din kladde-mappe."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "skabeloner"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Du har ikke læse/skrivetilladelse til din skabelonmappe."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Sidste søgning"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Mappen <i>%4</i> findes allerede. %1 bruger anvender nu mappen <i>%5</i> "
-"til sine breve. "
-"<p>%2 kan flytte indholdet i <i>%6</i> til mappen for dig, selv om det kan "
-"erstatte eventuelle eksisterende filer med samme navn i <i>%7</i>. "
-"<p><strong>Vil du at %3 skal flytte brevfilerne nu?</strong></qt>"
+"til sine breve. <p>%2 kan flytte indholdet i <i>%6</i> til mappen for dig, "
+"selv om det kan erstatte eventuelle eksisterende filer med samme navn i <i>"
+"%7</i>. <p><strong>Vil du at %3 skal flytte brevfilerne nu?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Mappen <i>%4</i> findes allerede. %1 bruger nu mappen <i>%5</i> "
-"til sine breve. %2 kan flytte indholdet i <i>%6</i> til mappen for dig. "
+"<qt>Mappen <i>%4</i> findes allerede. %1 bruger nu mappen <i>%5</i> til sine "
+"breve. %2 kan flytte indholdet i <i>%6</i> til mappen for dig. "
 "<p><strong>Vil du at %3 skal flytte brevfilerne nu?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Overfør brevfiler?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail stødte på en fatal fejl og vil afslutte nu"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8626,11 +8495,11 @@ msgstr ""
 "Fejlen var:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Tøm affald"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Er du sikker på du vil tømme affaldsmapperne for alle konti?"
 
@@ -8705,8 +8574,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Ny post ankommet</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8744,11 +8612,11 @@ msgstr "Er du sikker på du vil tømme affaldsmappen?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Er du sikker på du vil flytte alle breve fra mappen <b>%1</b> "
-"til affaldsmappen?</qt>"
+"<qt>Er du sikker på du vil flytte alle breve fra mappen <b>%1</b> til "
+"affaldsmappen?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8772,12 +8640,11 @@ msgstr "Slet søgning"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette søgningen <b>%1</b>"
-"<br>Brevene den viser vil stadig være tilgængelige i deres oprindelige "
-"mappe.<qt>"
+"<qt>Er du sikker på at du vil slette søgningen <b>%1</b><br>Brevene den "
+"viser vil stadig være tilgængelige i deres oprindelige mappe.<qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8790,41 +8657,41 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette den tomme mappe <b>%1</b> "
-"og alle dens undermapper?  Disse undermapper er muligvis ikke tomme og deres "
-"indhold vil også blive kasseret."
-"<p><b>Husk</b> at kasserede breve ikke gemmes i din affaldsspand men bliver "
-"slettet permanent.</qt>"
+"<qt>Er du sikker på at du vil slette den tomme mappe <b>%1</b> og alle dens "
+"undermapper?  Disse undermapper er muligvis ikke tomme og deres indhold vil "
+"også blive kasseret.<p><b>Husk</b> at kasserede breve ikke gemmes i din "
+"affaldsspand men bliver slettet permanent.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Er du sikker på at du ønsker at slette mappen <b>%1</b> "
-"og kassere deres indhold?"
-"<p><b>Husk</b> at kasserede breve ikke gemmes i din affaldsspand men bliver "
-"slettet permanent.</qt>"
+"<qt>Er du sikker på at du ønsker at slette mappen <b>%1</b> og kassere deres "
+"indhold?<p><b>Husk</b> at kasserede breve ikke gemmes i din affaldsspand men "
+"bliver slettet permanent.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette mappen <b>%1</b> "
-"og alle dens undermapper og kassere deres indhold?"
-"<p><b>Husk</b> at kasserede breve ikke gemmes i din affaldsspand men bliver "
-"slettet permanent.</qt>"
+"<qt>Er du sikker på at du vil slette mappen <b>%1</b> og alle dens "
+"undermapper og kassere deres indhold?<p><b>Husk</b> at kasserede breve ikke "
+"gemmes i din affaldsspand men bliver slettet permanent.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Slettet"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8840,13 +8707,13 @@ msgstr "Er du sikker på du ønsker at lade alle gamle breve udløbe?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Brug af HTML i e-mail vil gøre dig mere sårbar for \"spam\" og kan forøge "
-"sandsynligheden for at dit system vil blive kompromitteret af andre nuværende "
-"og fremtidige sikkerhedsudnyttelser."
+"sandsynligheden for at dit system vil blive kompromitteret af andre "
+"nuværende og fremtidige sikkerhedsudnyttelser."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8859,12 +8726,12 @@ msgstr "Brug HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Indlæsning af eksterne referencer html vil gøre dig mere sårbar for \"spam\" og "
-"kan forøge sandsynligheden for at dit system vil blive kompromitteret af andre "
-"nuværende og fremtidige sikkerhedsudnyttelser."
+"Indlæsning af eksterne referencer html vil gøre dig mere sårbar for \"spam\" "
+"og kan forøge sandsynligheden for at dit system vil blive kompromitteret af "
+"andre nuværende og fremtidige sikkerhedsudnyttelser."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8880,8 +8747,8 @@ msgstr "Filter på postliste %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMail's 'Væk fra kontoret'-svarfunktionalitet afhænger af filtrering på "
@@ -8902,7 +8769,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Kunne ikke starte GnuPG Logviseren (kwatchgnupg). Tjek venligst din "
 "installation."
@@ -9224,8 +9092,7 @@ msgstr "&Gem bilag..."
 msgid "Appl&y All Filters"
 msgstr "An&vend alle filtre"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "An&vend filtre"
@@ -9338,7 +9205,6 @@ msgstr "Næste &ulæste brev"
 msgid "Go to the next unread message"
 msgstr "Gå til næste ulæste brev"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Forrige brev"
@@ -9477,26 +9343,26 @@ msgstr " Initialiserer..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at du "
-"har modtaget brevet.\n"
-"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" eller "
-"normalt svar."
+"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at "
+"du har modtaget brevet.\n"
+"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at du "
-"har modtaget brevet.\n"
+"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at "
+"du har modtaget brevet.\n"
 "Det indeholder en behandlingsinstruktion som markeres som \"nødvendig\", men "
 "som Kmail ikke kender til.\n"
 "Du kan enten ignorere forespørgslen, eller lade Kmail sende svaret "
@@ -9504,47 +9370,48 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at du "
-"har modtaget brevet,\n"
-"men forespørgslen angiver at bekræftelsen skal sendes til mere end en adresse.\n"
-"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" eller "
-"normalt svar."
+"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at "
+"du har modtaget brevet,\n"
+"men forespørgslen angiver at bekræftelsen skal sendes til mere end en "
+"adresse.\n"
+"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at du "
-"har modtaget brevet,\n"
+"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at "
+"du har modtaget brevet,\n"
 "men ingen returadresse er angivet.\n"
-"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" eller "
-"normalt svar."
+"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at du "
-"har modtaget brevet,\n"
+"Brevet indeholder en forespørgsel om at sende en håndteringsbekræftelse at "
+"du har modtaget brevet,\n"
 "men returadressen er forskellig sig fra adressen som det bedes om at "
 "håndteringsbekræftelsen skal sendes til.\n"
-"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" eller "
-"normalt svar."
+"Du kan enten ignorere forespørgslen, eller lade Kmail sende et \"nægtet\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9570,16 +9437,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Kvittering: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Bilag: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Dette bilag er blevet slettet."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Bilaget '%1' er blevet slettet."
 
@@ -9627,46 +9494,39 @@ msgstr "Brevdels-egenskaber"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME-typen</em> for filen.</p>"
-"<p>Normalt behøver du ikke at røre denne indstilling, da filens type bliver "
-"tjekket automatisk. Men sommetider, kan %1 måske ikke detektere typen rigtigt. "
-"Det er her du kan ordne dette.</p></qt>"
+"<qt><p><em>MIME-typen</em> for filen.</p><p>Normalt behøver du ikke at røre "
+"denne indstilling, da filens type bliver tjekket automatisk. Men sommetider, "
+"kan %1 måske ikke detektere typen rigtigt. Det er her du kan ordne dette.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Størrelsen af delen.</p>"
-"<p>Sommetider, vil %1 kun give en estimeret størrelse her, fordi beregning af "
-"den nøjagtige størrelse ville tage for lang tid. Når dette er tilfældet, vildet "
-"blive gjort synligt ved at tilføje \"(est.)\" til den størrelse der vises.</p>"
-"</qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
+msgstr ""
+"<qt><p>Størrelsen af delen.</p><p>Sommetider, vil %1 kun give en estimeret "
+"størrelse her, fordi beregning af den nøjagtige størrelse ville tage for "
+"lang tid. Når dette er tilfældet, vildet blive gjort synligt ved at tilføje "
+"\"(est.)\" til den størrelse der vises.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Filnavnet på delen.</p>"
-"<p>Selvom dette som standard er navnet på den vedlagte fil, angiver det ikke "
-"filen der skal vedlægges. Det foreslå snarere et filnavn som modtagers "
-"e-mailprogram kan bruge når denne del gemmes til disken.</p></qt>"
+"<qt><p>Filnavnet på delen.</p><p>Selvom dette som standard er navnet på den "
+"vedlagte fil, angiver det ikke filen der skal vedlægges. Det foreslå snarere "
+"et filnavn som modtagers e-mailprogram kan bruge når denne del gemmes til "
+"disken.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9674,16 +9534,14 @@ msgstr "&Beskrivelse:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>En beskrivelse af delen.</p>"
-"<p>Dette er blot en informationsbeskrivelse af delen, meget ligesom emnet er "
-"det for hele brevet. De fleste post-agenter vil vise denne information i deres "
+"<qt><p>En beskrivelse af delen.</p><p>Dette er blot en "
+"informationsbeskrivelse af delen, meget ligesom emnet er det for hele "
+"brevet. De fleste post-agenter vil vise denne information i deres "
 "forhåndsvisning af brevet, ved siden af ikonen for bilaget.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
@@ -9692,23 +9550,21 @@ msgstr "&Tegnsæt:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Transport-indkodning for denne .</p>"
-"<p>Du behøver normalt ikke at ændre dette, da %1 vil bruge en rimelig standard "
-"indkodning, afhængig af MIME-typen. Alligevel er det sommetider at du kan "
-"reducere størrelsen af det endelige brev væsentligt, f. eks. hvis en "
-"PostScript-fil ikke indeholder binære data, men består af ren tekst. I dette "
-"tilfælde vil valg af \"quoted-printable\" over standarden \"base64\" spare op "
-"til 25% i den endelige brevstørrelse.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Transport-indkodning for denne .</p><p>Du behøver normalt ikke at "
+"ændre dette, da %1 vil bruge en rimelig standard indkodning, afhængig af "
+"MIME-typen. Alligevel er det sommetider at du kan reducere størrelsen af det "
+"endelige brev væsentligt, f. eks. hvis en PostScript-fil ikke indeholder "
+"binære data, men består af ren tekst. I dette tilfælde vil valg af \"quoted-"
+"printable\" over standarden \"base64\" spare op til 25% i den endelige "
+"brevstørrelse.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9716,21 +9572,17 @@ msgstr "Foreslå &automatisk visning"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Afkryds dette hvis du ønsker at foreslå til modtageren automatisk "
+"<qt><p>Afkryds dette hvis du ønsker at foreslå til modtageren automatisk "
 "(indlejret)-visning af denne del af brev-forhåndsvisningen i stedet for "
-"standard-ikon-visningen.</p>"
-"<p>Teknisk set bliver dette udført ved at sætte denne dels <em>"
-"Content-Disposition</em> overskriftsfelt til \"indlejret\" i stedet for "
-"standarden \"attachment\".</p></qt>"
+"standard-ikon-visningen.</p><p>Teknisk set bliver dette udført ved at sætte "
+"denne dels <em>Content-Disposition</em> overskriftsfelt til \"indlejret\" i "
+"stedet for standarden \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9738,15 +9590,13 @@ msgstr "&Underskriv denne del"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"s<qt>"
-"<p>Afkryds dette hvis du ønsker at denne del af brevet skal underskrives.</p>"
-"<p>Underskriften vil blive lavet med den nøgle du knyttede til den valgte "
-"identitet.</p></qt>"
+"s<qt><p>Afkryds dette hvis du ønsker at denne del af brevet skal "
+"underskrives.</p><p>Underskriften vil blive lavet med den nøgle du knyttede "
+"til den valgte identitet.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9754,13 +9604,11 @@ msgstr "&Kryptér denne del"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Afkryds dette hvis du ønsker denne del af brevet skal krypteres.</p>"
-"<p>Delen vil så blive krypteret til modtageren af dette brev</p></qt>"
+"<qt><p>Afkryds dette hvis du ønsker denne del af brevet skal krypteres.</"
+"p><p>Delen vil så blive krypteret til modtageren af dette brev</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9774,15 +9622,12 @@ msgstr "POP-filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Breve der skal filtreres fundet på POP-konto: <b>%1</b>"
-"<p>De viste breve går ud over den maksimale størrelsesgrænse, som du har "
-"defineret for denne konto."
+"Breve der skal filtreres fundet på POP-konto: <b>%1</b><p>De viste breve går "
+"ud over den maksimale størrelsesgrænse, som du har defineret for denne konto."
 "<br>Du kan vælge hvad du ønsker at gøre med dem ved at afkrydse en passende "
 "knap."
 
@@ -10035,40 +9880,38 @@ msgstr "E-mail-klienten for desktopmiljøet TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Henter mappens indhold</h2>"
-"<p>Vent...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Henter mappens indhold</h2><p>Vent...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>Kmail er for øjeblikket i offline tilstand. Klik <a href=\"kmail:goOnline\">"
-"her</a> for at gå online...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>Kmail er for øjeblikket i "
+"offline tilstand. Klik <a href=\"kmail:goOnline\">her</a> for at gå online..."
+"</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10076,18 +9919,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Velkommen til KMail %1</h2>"
-"<p>KMail er e-mail-klienten for K-desktopmiljøet. Den er designet til at være "
-"fuldt kompatibel med internettets e-mail-standarder inkluderende MIME, SMTP, "
-"POP3 og IMAP.</p>\n"
-"<ul>"
-"<li>KMail har mange gode egenskaber, som er beskrevet i <a href=\"%2\">"
-"dokumentationen</a></li>\n"
+"<h2 style='margin-top: 0px;'>Velkommen til KMail %1</h2><p>KMail er e-mail-"
+"klienten for K-desktopmiljøet. Den er designet til at være fuldt kompatibel "
+"med internettets e-mail-standarder inkluderende MIME, SMTP, POP3 og IMAP.</"
+"p>\n"
+"<ul><li>KMail har mange gode egenskaber, som er beskrevet i <a href="
+"\"%2\">dokumentationen</a></li>\n"
 "<li><a href=\"%3\">KMails hjemmeside</A> giver information om nye udgaver af "
 "KMail</li></ul>\n"
 "%8\n"
-"<p>Nogle af de nye funktioner i denne udgave af KMail inkluderer (sammenlignet "
-"med KMail %4, som er en del af TDE %5):</p>\n"
+"<p>Nogle af de nye funktioner i denne udgave af KMail inkluderer "
+"(sammenlignet med KMail %4, som er en del af TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10096,22 +9938,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail-holdet</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
 "<p>Brug venligst et øjeblik på at udfylde KMail's indstillingspanel i "
 "Opsætning-&gt;Indstil KMail.\n"
-"Du skal i det mindste oprette en standard-identitet og en indkommende såvel som "
-"en udgående konto.</p>\n"
+"Du skal i det mindste oprette en standard-identitet og en indkommende såvel "
+"som en udgående konto.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10150,7 +9990,8 @@ msgstr "Vis bilag: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Bilag indeholder binære data. Forsøger at vise det første tegn.]\n"
@@ -10178,12 +10019,14 @@ msgstr "Åbn bilag?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Sletning af bilag kan gøre digital signatur af brevet ugyldig."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Ændring af bilag kan gøre digital signatur af brevet ugyldig."
 
 #: kmreaderwin.cpp:2956
@@ -10204,6 +10047,58 @@ msgstr "(passer med en vilkårlig af følgende)"
 msgid "(match all of the following)"
 msgstr "(passer med alle følgende)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Læs"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Gammel"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Slettet"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Besvaret"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Videresendt"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "I kø"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sendt"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Overvåget"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignoreret"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ikke spam"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Gøremål"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Har bilag"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Hele brevet"
@@ -10281,24 +10176,25 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Flytning af sendt brev \"%1\" fra \"udbakken\" til \"sendt-post\" mislykkedes.\n"
+"Flytning af sendt brev \"%1\" fra \"udbakken\" til \"sendt-post\" "
+"mislykkedes.\n"
 "Mulige grunde er mangel på diskplads eller skrivetilladelse Prøv venligst at "
 "ordne problemet og flyt brevet manuelt."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Det er ikke muligt at sende breve uden at angive en afsenderadresse.\n"
-"Sæt venligst e-mail-adressen for identiteten '%1' i afsnittet om identiteter af "
-"indstillingsdialogen og prøv så igen."
+"Sæt venligst e-mail-adressen for identiteten '%1' i afsnittet om identiteter "
+"af indstillingsdialogen og prøv så igen."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10323,8 +10219,8 @@ msgstr "Opstarter sendeprocessen..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Du har valgt at sende alle breve i køen med ukrypteret overførsel. Vil du "
 "fortsætte?"
@@ -10351,15 +10247,16 @@ msgstr "Lykkedes ikke at sende (nogle) breve i køen."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Mislykkedes at sende:\n"
 "%1\n"
-"Brevet vil forblive i 'udbakke'-mappen indtil du enten ordner problemet (f.eks. "
-"en forkert adresse) eller fjerner brevet fra 'udbakke'-mappen.\n"
+"Brevet vil forblive i 'udbakke'-mappen indtil du enten ordner problemet (f."
+"eks. en forkert adresse) eller fjerner brevet fra 'udbakke'-mappen.\n"
 "Følgende transport-protokol blev brugt:\n"
 "  %2"
 
@@ -10369,20 +10266,17 @@ msgstr "Afbrød afsendelse"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Mislykkedes at sende:</p>"
-"<p>%1</p>"
-"<p>Brevet vil forblive i 'udbakke'-mappen indtil du enten ordner problemet "
-"(f.eks. en forkert adresse) eller fjerner brevet fra 'udbakke'-mappen.</p>"
-"<p>Følgende transport-protokol blev brugt:  %2</p> "
-"<p>Ønsker du jeg skal fortsætte med at sende de tilbageværende breve?</p>"
+"<p>Mislykkedes at sende:</p><p>%1</p><p>Brevet vil forblive i 'udbakke'-"
+"mappen indtil du enten ordner problemet (f.eks. en forkert adresse) eller "
+"fjerner brevet fra 'udbakke'-mappen.</p><p>Følgende transport-protokol blev "
+"brugt:  %2</p> <p>Ønsker du jeg skal fortsætte med at sende de "
+"tilbageværende breve?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10400,15 +10294,16 @@ msgstr "&Afbryder afsendelse"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Mislykkedes at sende:\n"
 "%1\n"
-"Brevet vil forblive i 'udbakke'-mappen indtil du enten ordner problemet (f.eks. "
-"en fejlbehæftet adresse) eller fjerner brevet fra 'udbakke'-mappen.\n"
+"Brevet vil forblive i 'udbakke'-mappen indtil du enten ordner problemet (f."
+"eks. en fejlbehæftet adresse) eller fjerner brevet fra 'udbakke'-mappen.\n"
 "Følgende transport-protokol blev brugt:\n"
 "  %2"
 
@@ -10448,43 +10343,43 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 synes allerede at køre på en anden skærm på denne maskine. Kørsel af %2 mere "
-"end én gang kan forårsage tab af post. Du bør ikke starte %1 med mindre du er "
-"sikker på at den ikke allerede kører."
+"%1 synes allerede at køre på en anden skærm på denne maskine. Kørsel af %2 "
+"mere end én gang kan forårsage tab af post. Du bør ikke starte %1 med mindre "
+"du er sikker på at den ikke allerede kører."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 synes allerede at køre på en anden skærm på denne maskine. Kørsel af %1 og "
-"%2 samtidigt kan forårsage tab af post. Du bør ikke starte %2 med mindre du er "
-"sikker på at %1 ikke allerede kører."
+"%1 synes allerede at køre på en anden skærm på denne maskine. Kørsel af %1 "
+"og %2 samtidigt kan forårsage tab af post. Du bør ikke starte %2 med mindre "
+"du er sikker på at %1 ikke allerede kører."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 synes allerede at køre på %2. Kørsel af %1 mere end én gang kan forårsage "
-"tab af post. Du bør ikke starte %1 på denne computer med mindre du er sikker på "
-"at den ikke allerede kører på %2."
+"tab af post. Du bør ikke starte %1 på denne computer med mindre du er sikker "
+"på at den ikke allerede kører på %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 synes allerede at køre på %3. Kørsel af %1 og %2 samtidigt kan forårsage tab "
-"af post. Du bør ikke starte %2 på denne computer med mindre du er sikker på at "
-"%1 ikke kører på %3."
+"%1 synes allerede at køre på %3. Kørsel af %1 og %2 samtidigt kan forårsage "
+"tab af post. Du bør ikke starte %2 på denne computer med mindre du er sikker "
+"på at %1 ikke kører på %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10495,6 +10390,10 @@ msgstr "Start %1"
 msgid "Exit"
 msgstr "Afslut"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nye breve i"
@@ -10521,15 +10420,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet er ikke tilgængelig. Det anbefales stærkt at bruge TDEWallet til at "
-"håndtere dine kodeord.\n"
+"TDEWallet er ikke tilgængelig. Det anbefales stærkt at bruge TDEWallet til "
+"at håndtere dine kodeord.\n"
 "KMail kan imidlertid opbevare kodeordet i sin indstillingsfil i stedet for. "
-"Kodeordet gemmes i en sammenrodet form, men bør ikke betragtes som sikker fra "
-"dekryptering, hvis der opnås adgang til indstillingsfilerne.\n"
+"Kodeordet gemmes i en sammenrodet form, men bør ikke betragtes som sikker "
+"fra dekryptering, hvis der opnås adgang til indstillingsfilerne.\n"
 "Ønsker du at opbevare kodeordet for kontoen '%1' i indstillingsfilen?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10599,8 +10499,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "En kommando der skal køres lokalt før breve sendes. Dette kan bruges til "
-"opsætning af ssh-tunneler, for eksempel. Lad det være tomt hvis ingen kommando "
-"skal køres."
+"opsætning af ssh-tunneler, for eksempel. Lad det være tomt hvis ingen "
+"kommando skal køres."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10608,8 +10508,8 @@ msgstr "Server &kræver godkendelse"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Afkryds dette hvis din SMTP-server kræver godkendelse før breve accepteres. "
 "Dette er kendt som 'Authenticated SMTP' eller blot ASMTP."
@@ -10632,15 +10532,14 @@ msgstr "Sen&d brugervalgt værtsnavn til server"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Afkryds dette for at få KMail til at bruge et brugervalgt værtsnavn når den "
-"identificerer sig selv til postserveren."
-"<p> Dette er nyttigt når dit systems værtsnavn ikke kan sættes rigtigt eller "
-"for at maskere dit systems sande værtsnavn."
+"identificerer sig selv til postserveren.<p> Dette er nyttigt når dit systems "
+"værtsnavn ikke kan sættes rigtigt eller for at maskere dit systems sande "
+"værtsnavn."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10650,7 +10549,8 @@ msgstr "&Værtsnavn:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Indtast det værtsnavn KMail skal bruge når den identificerer sig til serveren."
+"Indtast det værtsnavn KMail skal bruge når den identificerer sig til "
+"serveren."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10670,8 +10570,8 @@ msgstr "Kun lokale filer tilladt."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Værtfeltet kan ikke være tomt. Angiv SMTP-serverens navn eller IP-adresse."
 
@@ -10685,15 +10585,15 @@ msgstr "Fejl mens en liste af mappen %1 blev vist:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"At opsige lokalt abonnement af mapper fjerner al information om mapperne  som "
-"er opbevaret lokalt. Mapperne ændres ikke på serveren. Klik på afbryd nu, hvis "
-"du vil sikre dig at alle lokale ændringer er skrevet til serveren ved først "
-"kigge efter e-mail."
+"At opsige lokalt abonnement af mapper fjerner al information om mapperne  "
+"som er opbevaret lokalt. Mapperne ændres ikke på serveren. Klik på afbryd "
+"nu, hvis du vil sikre dig at alle lokale ændringer er skrevet til serveren "
+"ved først kigge efter e-mail."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10912,34 +10812,27 @@ msgstr "&Redigér brev"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Struktur-information returneret af krypto-plugin kunne ikke behandles "
-"korrekt, og dit plugin er måske ødelagt.</p> "
-"<p>Kontakt venligst din systemadministrator</p></qt>"
+"<qt> <p>Struktur-information returneret af krypto-plugin kunne ikke "
+"behandles korrekt, og dit plugin er måske ødelagt.</p> <p>Kontakt venligst "
+"din systemadministrator</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Intet aktivt krypto-plugin blev fundet og den indbyggede OpenPGP kode kørte "
-"ikke rigtigt.</p>"
-"<p>Du kan gøre to ting for at ændre dette:</p>"
-"<li><em>enten</em>  Aktivér et plugin ved brug af Opsætning->Indstil KMail->"
-"Plugin-dialog</li>"
-"<li>em>ELLER</em> angiv traditionelle OpenPGP indstillinger på den samme "
-"dialogs  Identitet->Avanceret-side</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Intet aktivt krypto-plugin blev fundet og den indbyggede OpenPGP kode "
+"kørte ikke rigtigt.</p><p>Du kan gøre to ting for at ændre dette:</"
+"p><li><em>enten</em>  Aktivér et plugin ved brug af Opsætning->Indstil KMail-"
+">Plugin-dialog</li><li>em>ELLER</em> angiv traditionelle OpenPGP "
+"indstillinger på den samme dialogs  Identitet->Avanceret-side</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10951,8 +10844,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus-grænsefladen sørger ikke for funktionen \"x-encrypt\". Rapportér "
 "fejlen."
@@ -10971,20 +10864,20 @@ msgstr "Chiasmus krypteringsfejl"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Uventet returværdi fra Chiasmus-grænsefladen. Funktionen \"x-encrypt\" "
 "returnerede ikke et bytefelt. Rapportér fejlen."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Det indlejrede OpenPGP krypto-beskedformat understøtter ikke kryptering eller "
-"underskrift af bilag.\n"
+"Det indlejrede OpenPGP krypto-beskedformat understøtter ikke kryptering "
+"eller underskrift af bilag.\n"
 "Vil du virkelig bruge det forældede OpenPGP?"
 
 #: messagecomposer.cpp:640
@@ -11036,8 +10929,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Du har bedt om at underskrive dette brev, men ingen gyldige underskriftsnøgler "
-"er blevet indstillet for denne identitet."
+"Du har bedt om at underskrive dette brev, men ingen gyldige "
+"underskriftsnøgler er blevet indstillet for denne identitet."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11093,12 +10986,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Undersøgelse af modtagerens foretrukne kryptering gav at du vil blive spurgt om "
-"du vil kryptere dette brev eller ej.\n"
+"Undersøgelse af modtagerens foretrukne kryptering gav at du vil blive spurgt "
+"om du vil kryptere dette brev eller ej.\n"
 "Kryptér dette brev?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11131,12 +11024,13 @@ msgstr "Kryptér &ikke"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Du har bedt om at kryptere dette brev og at kryptere en kopi til dig selv, men "
-"ingen gyldige krypteringsnøgler der stoles på er blevet indstillet for denne "
-"identitet."
+"Du har bedt om at kryptere dette brev og at kryptere en kopi til dig selv, "
+"men ingen gyldige krypteringsnøgler der stoles på er blevet indstillet for "
+"denne identitet."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11145,8 +11039,8 @@ msgstr "Send ukrypteret?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Nogle dele af dette brev vil ikke blive krypteret.\n"
@@ -11162,8 +11056,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Dette brev vil ikke blive krypteret.\n"
-"At sende ikke-krypterede breve kan være imod stedets politik og/eller føre til "
-"læk af følsom information.\n"
+"At sende ikke-krypterede breve kan være imod stedets politik og/eller føre "
+"til læk af følsom information.\n"
 "Kryptér breve i stedet?"
 
 #: messagecomposer.cpp:955
@@ -11174,92 +11068,88 @@ msgstr "Kryptér &alle dele"
 msgid "Unencrypted Message Warning"
 msgstr "Advarsel mod ikke-krypteret brev"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Fejl: Det underliggende program returnerede ingen indkodede data.</p> "
-"<p>Rapportér venligst denne fejl:"
-"<br>%2</p></qt>"
+"<qt> <p> Fejl: Det underliggende program returnerede ingen indkodede data.</"
+"p> <p>Rapportér venligst denne fejl:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Ikke alle tegn passer med det valgte tegnsæt."
-"<br>"
-"<br>Send brevet alligevel?</qt>"
+"<qt>Ikke alle tegn passer med det valgte tegnsæt.<br><br>Send brevet "
+"alligevel?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Nogle tegn vil gå tabt"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Løse tegn"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Ændr &tegnsæt"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Dette brev kunne ikke blive underskrevet, da det valgte underliggende program "
-"ikke synes at understøtte underskrift. Dette burde ikke ske nogensinde, så "
-"rapportér venligst denne fejl."
+"Dette brev kunne ikke blive underskrevet, da det valgte underliggende "
+"program ikke synes at understøtte underskrift. Dette burde ikke ske "
+"nogensinde, så rapportér venligst denne fejl."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Dette brev kunne ikke blive underskrevet, da det valgte underliggende program "
-"ikke synes at understøtte underskrift. Dette burde ikke ske nogensinde, så "
-"rapportér venligst denne fejl."
+"Dette brev kunne ikke blive underskrevet, da det valgte underliggende "
+"program ikke synes at understøtte underskrift. Dette burde ikke ske "
+"nogensinde, så rapportér venligst denne fejl."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Overvågningslog for GnuPG til signeringshandling"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "Signeringshandlingen mislykkedes. Sørg for at programmet gpg-agent kører."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Dette brev kunne ikke blive krypteret, da det valgte underliggende program ikke "
-"synes at understøtte kryptering. Dette burde ikke ske nogensinde, så rapportér "
-"venligst denne fejl."
+"Dette brev kunne ikke blive krypteret, da det valgte underliggende program "
+"ikke synes at understøtte kryptering. Dette burde ikke ske nogensinde, så "
+"rapportér venligst denne fejl."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Overvågningslog for GnuPG til krypteringshandling"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Dette brev kunne ikke blive underskrevet og krypteret, da det valgte "
 "underliggende program ikke synes at understøtte kombineret underskrift og "
-"kryptering. Dette burde ikke ske nogensinde, så rapportér venligst denne fejl."
+"kryptering. Dette burde ikke ske nogensinde, så rapportér venligst denne "
+"fejl."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11280,14 +11170,14 @@ msgstr "Postkasse&format:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Vælg om du vil opbevare brevene i mappen som en fil pr brev (maildir) eller som "
-"en stor fil (mbox). Kmail bruger normalt maildir, og det behøver kun at ændres "
-"i sjældne tilfælde. Hvis du er usikker, så lad det være som det er."
+"Vælg om du vil opbevare brevene i mappen som en fil pr brev (maildir) eller "
+"som en stor fil (mbox). Kmail bruger normalt maildir, og det behøver kun at "
+"ændres i sjældne tilfælde. Hvis du er usikker, så lad det være som det er."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11296,12 +11186,12 @@ msgstr "Mappen &indholder:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Vælg om du ønsker at den nye mappe skal bruges til at opbevare breve eller til "
-"at opbevare groupware-ting såsom opgaver eller noter. Normalværdien er breve. "
-"Hvis du er usikker, så lad det være som det er."
+"Vælg om du ønsker at den nye mappe skal bruges til at opbevare breve eller "
+"til at opbevare groupware-ting såsom opgaver eller noter. Normalværdien er "
+"breve. Hvis du er usikker, så lad det være som det er."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11339,8 +11229,7 @@ msgstr "Forskellige resultater for underskrifter"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Krypto-maskinen sendte ingen klartekst-data tilbage."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status:"
 
@@ -11369,8 +11258,8 @@ msgstr "Intet %1 plug-in fundet."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Brevet er underskrevet, men gyldigheden af underskriften kan ikke "
 "verificeres.<br />Grund: %1"
@@ -11407,28 +11296,28 @@ msgstr "Krypto-plugin \"%1\" kan ikke afkryptere breve."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Bemærk:</b> Dette HTML-brev kan muligvis indeholde eksterne referencer til "
-"billeder osv. Af sikkerhed/privathedsgrunde bliver eksterne referencer ikke "
-"indlæst. Hvis du stoler på afsenderen af dette brev, så kan du indlæse de "
-"eksterne referencer for dette brev <a href=\"kmail:loadExternal\">"
-"ved at klikke her</a>."
+"<b>Bemærk:</b> Dette HTML-brev kan muligvis indeholde eksterne referencer "
+"til billeder osv. Af sikkerhed/privathedsgrunde bliver eksterne referencer "
+"ikke indlæst. Hvis du stoler på afsenderen af dette brev, så kan du indlæse "
+"de eksterne referencer for dette brev <a href=\"kmail:loadExternal\">ved at "
+"klikke her</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Bemærk:</b> Dette er et HTML-brev. Af sikkerhedgrunde vises kun den rå "
 "HTML-kode. Hvis du stoler på afsenderen af dette brev, så kan du aktivere "
-"formateret HTML-visning for dette brev <a href=\"kmail:showHTML\">"
-"ved at klikke her</a>."
+"formateret HTML-visning for dette brev <a href=\"kmail:showHTML\">ved at "
+"klikke her</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11678,8 +11567,8 @@ msgstr "opbevaret:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Ingen postadresse er gemt i den %1 der bruges til at underskrive, så vi kan "
 "ikke sammenligne den med afsenderens adresse %2."
@@ -11797,14 +11686,15 @@ msgstr "Kioslave-fejlmeddelelse"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Din POP3-server (Konto: %1) understøtter ikke UIDL-kommandoen. Denne kommando "
-"kræves for, på en troværdig måde, at afgøre hvilken post på serveren KMail "
-"allerede har set tidligere.\n"
+"Din POP3-server (Konto: %1) understøtter ikke UIDL-kommandoen. Denne "
+"kommando kræves for, på en troværdig måde, at afgøre hvilken post på "
+"serveren KMail allerede har set tidligere.\n"
 "Egenskaben om at efterlade post på serveren vil derfor ikke virke rigtigt."
 
 #: popaccount.cpp:752
@@ -11825,7 +11715,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Henter brev %1 af %2 (%3 af %4 kB) for %5@%6 (%7 kB endnu på serveren)."
 
@@ -11843,1898 +11734,15 @@ msgstr "Ugyldigt svar fra server"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Din server understøtter ikke TOP-kommandoen. Derfor er det ikke muligt kun at "
-"hente overskrifterne for store breve, før de tages ned."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Kør"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "M&appe"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Brev"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Svar speciel"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Videresend"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Html-værktøjslinje"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Underskriver"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Underskriv breve &automatisk"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Når dette er aktiveret, så vil alle breve du sender blive underskrevet som "
-"standard. Det er naturligvis stadig muligt at deaktivere underskrift for hvert "
-"brev individuelt."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Krypterer"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Når e-mails krypteres, skal der altid også krypteres til min egen identitets "
-"certifikat"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Når dette er aktiveret vil brevet/filen ikke kun blive krypteret med "
-"modtagerens offentlige nøgle, men også med din nøgle. Dette vil gøre dig i "
-"stand til at dekryptere brevet/filen på et senere tidspunkt. Dette er generelt "
-"en god idé."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Vis &underskrevet/krypteret tekst efter skrivning"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Når dette er aktiveret vil den underskrevne/krypterede tekst blive vist i et  "
-"separat vindue, og gøre det muligt at vide hvordan det ser ud efter det er "
-"sendt. Dette er en god idé når du verificerer at dit krypteringssystem virker."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Opbevar gemte breve &krypterede"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Tjek for at opbevare breve krypterede "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gem breve krypterede</h1>\n"
-"Når dette felt er afkrydset, bliver sendte breve gemt krypterede som de blev "
-"sendt. Dette anbefales ikke, idet du så ikke længere vil være i stand til at "
-"læse brevene længere hvis et nødvendigt certifikat udløber.\n"
-"<p>\n"
-"Der kan imidlertid være lokale regler der kræver at du slår dette til. Hvis du "
-"er i tvivl. så tjek med din lokale administrator.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Vis altid indkodningsnøgler til &godkendelse"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Når dette er aktiveret vil programmet altid vise dig en liste af offentlige "
-"nøgler ud fra hvilke du kan vælge den der bliver brugt til kryptering. Hvis det "
-"er deaktiveret vil programmet kun vise dialogen, hvis det ikke kan finde den "
-"rigtige nøgle eller hvis der er flere der kan bruges."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "&Kryptér breve automatisk om muligt"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Når dette er aktiveret, så vil hvert brev du sender blive krypteret når "
-"kryptering er mulig og ønsket. Det er naturligvis stadig muligt at deaktivere "
-"kryptering for hvert brev individuelt."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Kryptér/underskriv  aldrig når der &gemmes som kladde"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Hvordan virker dette?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Til: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universelt"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Svar"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Svar alle"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Videresend"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Genvej:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "S&kabelontype:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Mappeegenskaber"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Mappe indeholder en postliste"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Liste&adresse:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Ulæst:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Brev udløber"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "U&dløb efter:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Lad &læste breve udløbe"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Udløb e&fter:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Lad &ulæste breve udløbe"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dage"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Uger"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Måneder"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avanceret"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Afsenders identi&tet:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Opbevaringsformat:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Liste-visning"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validér certifikater ved brug af CRL'er"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Hvis dette er valgt, vil S/MIME certifikater blive valideret ved brug af "
-"Certificate Revocation Lists (CRL'er)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validér certifikater online (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Hvis dette er valgt, vil S/MIME certifikater blive valideret online ved brug af "
-"Online Certificates Status Protocol (OCSP). Udfyld URL'en for OCSP besvareren "
-"nedenfor."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Online certifikatsgodkendelse"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP-besvarers URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Indtast adressen her for serveren for online validering af certifikater "
-"(OCSP+besvarer). URL'en starter sædvanligvis med http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP svarunderskrift:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorér Service-URL for certifikater"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Tjek ikke certifikatpolitikker"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Som standard bruger GnuPG filen ~/.gnupg/policies.txt til at tjekke om en "
-"certifikatpolitik er tilladt. Hvis dette er valgt, bliver politikker ikke "
-"tjekket."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Konsultér aldrig en CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Hvis dette er afkrydset vil Certificate Revocation Lister aldrig blive brugt "
-"til at validere S/MIME-certifikater."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Hent manglende udsteder-certifikater"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Hvis dette er afkrydset vil manglende udstedercertifikater blive hentet om "
-"nødvendigt (dette gælder både valideringsmetoder, CRL'er og OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-forespørgsler"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Udfør ikke nogen HTTP-forespørgsler"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Deaktiverer i det hele taget brugen af HTTP for S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Brug denne proxy til HTTP-forespørgsler: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Brug systemets HTTP-proxy:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Hvis dette er valgt, vil værdien af den HTTP-proxy der vises til højre (som "
-"kommer fra miljøvariablen http_proxy) blive brugt til enhver HTTP-forespørgsel."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Indtast stedet for din  HTTP-proxy her, som vil blive brugt til alle "
-"HTTP-forespørgsler der relaterer til S/MIME. Syntaksen er vært:port, for "
-"eksempel minproxy.intetsted.dk:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorér HTTP CRL distributionspunkt for certifikater"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Når du kigger efter stedet for et CRL, indeholdet det der skal testes "
-"sædvanligvis såkaldte \"CRL-distributionspunkt\" (DP)-indgange som er URL'er "
-"der beskriver måden at få adgang til URL'en. Den først fundne DP-indgang "
-"bruges.  Med dette tilvalg bliver alle indgange der bruger HTTP-systemet "
-"ignoreret når der kigges efter en passende DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-Forespørgsler"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Udfør ikke nogen LDAP-forespørgsler"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Deaktiverer i det hele taget brugen af LDAP for S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorér LDAP CRL-distributionspunkt for certifikater"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Når du kigger efter stedet for et CRL, indeholdet det der skal testes "
-"sædvanligvis såkaldte \"CRL-distributionspunkt\" (DP)-indgange som er URL'er "
-"der beskriver måden at få adgang til URL'en. Den først fundne DP-indgang "
-"bruges.  Med dette tilvalg bliver alle indgange der bruger LDAP-systemet "
-"ignoreret når der kigges efter en passende DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primær vært for LDAP-forespørgsler:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Indtastning af en LDAP-server her vil få alle LDAP-forespørgsler til at gå til "
-"den server først. Mere præcist, denne indstilling sætter enhver angiven vært og "
-"port del i en LDAP URL ud af kraft, og vil også blive brugt hvis vært og port "
-"er blevet udeladt fra URL'en. Andre LDAP-servere vil kun blive brugt hvis "
-"forbindelsen til \"proxy\" mislykkedes.\n"
-"Syntaksen er \"VÆRT\" eller \"VÆRT:PORT\". Hvis PORT er udeladt, bruges port "
-"389 (standard LDAP port)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Tilføj stump"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Tilføj"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Stump"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Gruppe:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Stumpindstillinger"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Værktøjsvink"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Vis stumps tekst i &værktøjsvink"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Bestemmer om et værktøjsvink skal vises som indeholder tekst fra den bogmærkede "
-"linje"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variable"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Inputmetode for variable"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Enkelt dialog for hver variabel indeni i en stump"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "En inputdialog vil blive vist for hver variabel indeni en stump"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "En dialog for alle variable indeni en stump"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"En enkelt dialog vil blive vist hvor du kan indtaste værdierne for alle "
-"variable indeni en stump"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Ubegrænset:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Skabelonindstilling"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Svar til afsender"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Svar alle/Svar til liste"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Videresend brev"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Advar når det forsøges at sende ikke-&underskrevne breve"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Afkryds for at blive advaret når der sendes breve der ikke er underskrevet."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar ved forsøg på at sende breve der ikke er underskrevet</h1>\n"
-"Hvis dette felt er afkrydset, vil du blive advaret når du prøver at sende dele "
-"af eller hele brevet uden underskrift.\n"
-"<p>\n"
-"Det anbefales at lade dette tilvalg være slået til for maksimal integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Advar når der forsøges at sende ikke krypterede breve"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Afkryds for at blive advaret når der sendes breve der ikke er krypterede."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar når der forsøges at sende breve der ikke er krypterede</h1>\n"
-"Hvis dette felt er afkrydset, vil du blive advaret når du forsøger at sende "
-"dele af eller hele brevet uden kryptering.\n"
-"<p>\n"
-"Det anbefales at lade dette være slået til for for maksimal integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Advar hvis &modtagers e-mail-adresse &ikke er i certifikatet"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Afkryds for at blive advaret hvis adressen ikke er i certifikatet"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar hvis modtagerens e-mail-adresse ikke er i certifikatet</h1>\n"
-"Hvis dette er afkrydset, vil en advarsel blive udstedt hvis e-mail-adressen for "
-"modtageren ikke er indeholdt i certifikatet der bruges til kryptering.\n"
-"<p>\n"
-"Det anbefales at lade dette tilvalg være slået til for maksimal sikkerhed.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Advar hvis certifikat/nøgler udløber snart (indstil grænse nedenfor)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Til underskrift"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Til kryptering"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dage"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Vælg antal dage her"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar hvis underskriftscertifikat udløber</h1>\n"
-"Vælg det minimale antal dage underskriftscertifikatet skal være gyldigt uden at "
-"udstede en advarsel.\n"
-"<p>\n"
-"Den anbefalede SPHINX-indstilling er 14 dage.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar hvis krypteringscertifikat udløber</h1>\n"
-"Vælg det minimale antal dage krypteringscertifikatet skal være gyldigt uden at "
-"udstede en advarsel.\n"
-"<p>\n"
-"Den anbefalede SPHINX-indstilling er 14 dage.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar hvis et certifikat i kæden udløber</h1>\n"
-"Vælg det minimale antal dage alle certifikater i kæden skal være gyldige uden "
-"at udstede en advarsel.\n"
-"<p>\n"
-"Den anbefalede SPHINX-indstilling er 14 dage.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar hvis CA-certifikat udløber</h1>\n"
-"Vælg det minimale antal dage CA-certifikatet skal være gyldigt uden at udstede "
-"en advarsel.\n"
-"<p>\n"
-"Den anbefalede SPHINX-indstilling er 14 dage.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advar hvis root-certifikat udløber</h1>\n"
-"Vælg det minimale antal dage root-certifikatet skal være gyldigt uden at "
-"udstede en advarsel.\n"
-"<p>\n"
-"Den anbefalede SPHINX-indstilling er 14 dage.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Til root-certifikater:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Til middel CA-certifikater:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Til slutbruger-certifikater/nøgler"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Genaktivér alle \"Spørg ikke igen\" advarsler"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Skabelonindhold"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Skabelongenvej"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Skabelontype"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Send post i køen når der tjekkes post"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vælg om du ønsker at KMail skal sende alle breve i udbakken ved manuelle "
-"eller ved alle tjek for post, eller om du ikke ønsker at breve skal sendes "
-"automatisk overhovedet. </qt></p>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Flyt automatisk ikke synkroniserede breve fra mapper med utilstrækkelige "
-"adgangrettigheder"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Hvis der er nye breve i en mappe som endnu ikke er overført til serveren, men "
-"du ikke har tilstrækkelige adgangrettigheder til mappen til at overføre dem, "
-"kommer breven automatisk til at blive flyttet til en mappe for tabte og fundne "
-"breve."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Tillad lokal flag i skrivebeskyttede mapper"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Denne indstilling lader administratorer indstille et minimalt tidsinterval "
-"mellem to brevkontroller.\n"
-"Brugeren vil kke kunne vælge en mindre værdi end det som indstilles her."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Den mest nylige valgte mappe i mappevalgsdialogen."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Se bort fra brugerens indstilling af umask og brug i stedet \"læs-skriv kun for "
-"brugeren\"."
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politik for at vise statusikonen"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Luk programmet når hovedvinduet lukkes, selv hvis statusområdeikonet er "
-"aktiveret."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Snaksalig gøren opmærksom på ny post"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Hvis dette er aktiveret så vil antallet af nyligt ankomne breve blive vist i "
-"bekendtgørelsen om nye breve, ellers vil du kun få en simpel 'Ny post ankommet' "
-"besked."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Angiv &editor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Brug ekstern editor i stedet for brevskriveren"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"Tærskel for hvornår brugeren skal advares om at en mappe nærmer sig sin "
-"kvotebegrænsning."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Aktivér groupware funktionalitet"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Ordn Fra:/Til: headere i svar på svar"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook har et antal svage punkter i sin implementation af "
-"iCalendar-standarden. dette tilvalg forsøger at komme omkring  et af dem. Hvis "
-"du har problemer med at Outlook-brugere ikke kan komme til dine svar, så prøv "
-"at sætte dette tilvalg"
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Send groupware-invitationer i brødteksten"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook har et antal svage punkter i sin implementation af "
-"iCalendar-standarden. dette tilvalg forsøger at komme omkring et af dem. Hvis "
-"du har problemer med at Outlook-brugere ikke kan komme til dine invitationer, "
-"så prøv at sætte dette tilvalg"
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Udveksl kompatibel invitationsnavngivning"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook, brugt i kombination med en Microsoft Exchange server, har et "
-"problem med at forstå standardiseret groupware e-mail. Slå dette til for at "
-"sende groupware invitationer på en måde som Microsoft Exchange forstår."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Når dette er markeret ser du ikke brevvinduet. I stedet sendes alle "
-"indbydelsesbreve automatisk. Hvis du vil se brevet inden det sendes, kan du "
-"lade være med at markere dette. Vær dog klar over at teksten i brevvinduet har "
-"kalendersyntaks, og du bør ikke forsøge at ændre den manuelt."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Slet indbydelsesbreve efter svaret på dem er blevet sendt"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Når dette er afkrydset, vil modtagne indbydelsesbreve som er blevet svaret på, "
-"blive flyttet til affaldsmappen, når svaret er blevet afsendt."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Aktivering af dette gør det muligt at opbevare indgange fra "
-"Kontact-programmerne (KOrganizer, KAddressBook og KNotes).</p>"
-"<p>Udover dette, skal du sætte programmerne til at bruge IMAP-ressourcen. Dette "
-"gøres i TDE's kontrolcenter.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Sædvanligvis har du ikke nogen grund til at ville se de mapper der holder "
-"IMAP's ressources. Men hvis du har brug for at se dem, kan du indstille det "
-"her.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Hvis kontoen som bruges til at opbevare information om groupware ikke bruges "
-"til at håndtere sædvanlige breve, markeres dette for at Kmail kun skal vis "
-"groupware-mapper. Dette er nyttigt hvis du håndterer sædvanlige breve via en "
-"yderligere online IMAP-konto.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Vælg opbevaringsformat for groupware-mapperne. "
-"<ul>"
-"<li>Standardformatet som bruges er ical (til kalendermapper) og vcard (til "
-"adressebogsmapper). Disse formater gør at alle funktioner i Kontact er "
-"tilgængelige.</li>"
-"<li>Kolab XML-formatet bruger sin egen model som nærmere svarer til  den som "
-"bruges af Outlook. Formatet giver bedre funktion sammen med Outlook, når en "
-"Kolab-server eller lignende løsning bruges.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Dette vælger roden for IMAP's ressourcemapper. </p>"
-"<p>Standarden  for Kolab-serveren er at sætte det til at være IMAP's rod.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Dette er ID for den konto der holder IMAP-ressource-mapperne.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Hvis du ønsker at sætte mappenavnene for IMAP-opbevaring til dit lokale "
-"sprog, kan du vælge mellem disse tilgængelige sprog.</p> "
-"<p>Bemærk venligst, at den eneste grund til at gøre dette er for kompatibilitet "
-"med Microsoft Outlook. Det betragtes som en dårlig idé at sætte dette, da det "
-"gør det umuligt at ændre sprog.</p>"
-"<p>Så gør det ikke med mindre du er nødt til det.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Filtrér også nye breve modtaget i groupware-mapper."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr "Synkronisér groupwareændringer i DIMAP-mapper straks når du er online."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Denne værdi bruges til at afgøre om KMail's introduktion skal vises."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimalt antal forbindelser pr vært"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Dette kan bruges til at begrænse antallet af forbindelser pr vært mens der "
-"tjekkes for ny post. Som standard er antallet af frbindelser ubegrænset (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Vis hurtigsøgningens linjeredigering"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Dette aktiverer eller deaktiverer søgelinjens redigering ovenfor brevlisten som "
-"kan bruges til hurtigt at søge efter information vist i beskedlisten."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Skjul lokal indbakke hvis den er ubrugt"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Videresend indlejret som standard."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "Tillad semikolon (';') at blive brugt som adskiller i brevskriveren."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Behold det oprindelige tegnsæt, når der svares eller videresendes om muligt"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Indsæt a&utomatisk signatur"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Husk denne identitet, så den også vil blive brugt i fremtidige "
-"brevskrivervinduer.\n"
-"    "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Husk denne mappe for sendte ting, så den også vil blive brugt i fremtidige "
-"brevskrivervinduer."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Husk denne posttransport, så den også vil blive brugt i fremtidige "
-"brevskrivervinduer."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Husk denne identitet, så den også vil blive brugt i fremtidige "
-"brevskrivervinduer.\n"
-"    "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Om&brydning ved søjle:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Maksimalt antal modtager-editor-linjer."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Slå dette til for at få Outlook  &#8482;  til at forstå dine bilags navne når "
-"de indeholder ikke-engelske tegn"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Bed automatisk om &brevdispositionspåmindelser"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aktivér dette hvis du ønsker at KMail skal bede om "
-"brev-dispositionsbekendtgørelser (MDN'er) for hvert udgående brev.</p>"
-"<p> Dette påvirker kun standarden; du kan stadig aktivere eller deaktivere MDN "
-"forespørgsler på en pr-brev basis i brevskriveren, under menupunktet<em>"
-"Tilvalg</em>->><em>Forespørg dispositionsbekendtgørelse</em>.</p></qt> <em>"
-"Tilvalg</em>-><em>Bed om dispositionsmeddelelse</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Brug seneste adresser for automatisk komplettering"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Deaktivér dette hvis du ikke ønsker at senest brugte adresser skal vises i "
-"listen for automatisk komplettering i brevvinduets adressefelt."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Auto-gem interval:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"En sikkerhedskopi af teksten i brevskrivervinduet kan laves regelmæssigt. Det "
-"interval der bruges til at lave sikkerhedskopier sættes her. Du kan deaktivere "
-"autogemning ved at sætte det til værdien 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Indsæt signatur over citeret tekst"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Erstat genkendt præfi&ks med \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Erstat genkendt præfiks med \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Brug automatiske anførselstegn"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Underskriften er udløbet."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Type af modtager-vælger"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Sætter typen af dialogen til at vælge modtagere for Til,\n"
-"        CC og BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Type af modtager-editor"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Sætter typen af modtager-editor til at redigere Til,\n"
-"        CC og BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maksimalt antal modtager-editor-linjer."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Liste af brevdelstyper som skal fjernes fra breve som videresendes indlejret."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Maksimal størrelse i MB som bilag til breve må have."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Vis panelet til tekststumphåndtering og -indsættelse i brevskriveren."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Vis overvågningslog for GnuPG også efter krypteringshandlinger som blev "
-"gennemført."
+"Din server understøtter ikke TOP-kommandoen. Derfor er det ikke muligt kun "
+"at hente overskrifterne for store breve, før de tages ned."
 
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Behold det oprindelige tegnsæt, når der svares eller videresendes om muligt"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Nogle breve, især dem der genereres automatisk, angiver ikke det tegnsæt der "
-"skal bruges for at vise dem rigtigt. I sådanne tilfælde vil et reservetegnsæt "
-"blive brugt, som du kan indstille her. Sæt det til det der bruges mest "
-"almindeligt i din del af verden. Som standard bruges det tegnsæt der er "
-"indstillet for hele systemet."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Ændring af dette fra sin standard som 'Auto' vil tvinge til brugen af det "
-"angivne tegnsæt for alle breve, uanset hvad de selv siger."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Aktivér dette hvis du ønsker at smileyer såsom :-) som indgår i brevteksten "
-"skal erstattes af emotikoner (små billeder)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Aktivér dette for at vise forskellige niveauer af citeret tekst. Deaktivér for "
-"at skjule niveauerne med citeret tekst."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Komprimér niveau automatisk:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reducér tegnstørrelse for citeret tekst"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Aktivér dette for at vise citeret tekst med en mindre skrifttype."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Opbevar gemte breve &krypterede"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Vis brugeragent i  smarte brevoverskrifter"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Aktivér dette for at vise linjerne for beuger-agent og X-Mailer når flotte "
-"brevhoveder bruges."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Tillad at slette bilag til eksisterende breve."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Tillad at redigere bilag til eksisterende breve."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Dekryptér altid breve ved visning eller spørg før dekryptering"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Send brevdispositionspåmindelser med tom afsender."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Send brevdispositionspåmindelser med tom afsenderstreng. Nogle  servere er "
-"måske indstillet til at afslå sådanne  meddelelser, så hvis du kommer ud for "
-"problemer med at sende MDN'er ind, så afmarkér dette."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Sætninger er konverteret til skabeloner"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Gamle sætninger er konverteret til skabeloner"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Brevskabelon for nyt brev"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Brevskabelon for svar"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Brevskabelon for svar til alle"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Brevskabelon for videresend"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Tilføj tegn"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Tillad at 'ikke på kontoret'-indstillinger kan ændres af brugeren."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Tillad brugere at uploade 'ikke på kontoret'-sieve-scripts, men tillad dem ikke "
-"at ændre indstillinger, såsom domænet der skal reageres på og "
-"spamreaktionsomskrifteren."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Send kun 'ikke på kontoret'-svar til breve der kommer fra dette domæne."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Tillad 'ikke på kontoret'-svar at blive sendt til breve markeret som SPAM."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Tjek om der stadig er et aktivt 'ikke på kontoret'-svar konfigureret ved "
-"opstart af KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 af %2 %3 bruges"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13843,6 +11851,11 @@ msgstr "Tilføj som CC"
 msgid "Add as BCC"
 msgstr "Tilføj som BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Annullér"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13858,13 +11871,13 @@ msgstr "Udvalgte modtagere"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Du valgte 1 modtager. Maksimalt antal modtagere som understøttes er %1. Indstil "
-"valget.\n"
+"Du valgte 1 modtager. Maksimalt antal modtagere som understøttes er %1. "
+"Indstil valget.\n"
 "Du valgte %n modtagere. Maksimalt antal modtagere som understøttes er %1. "
 "Indstil valget."
 
@@ -13882,8 +11895,8 @@ msgstr "Brug dialogen for adressevalg"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Denne knap viser en separat dialog hvor du kan vælge modtagere blandt alle "
 "tilgængelige adresser."
@@ -13988,13 +12001,22 @@ msgstr "er større end eller lig med"
 msgid " bytes"
 msgstr " byte"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dage"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"For at udføre søgningen skal alle breve i mappen %1 være hentet  serveren. Det "
-"kan tage et stykke tid. Vil du fortsætte søgningen?"
+"For at udføre søgningen skal alle breve i mappen %1 være hentet  serveren. "
+"Det kan tage et stykke tid. Vil du fortsætte søgningen?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14140,16 +12162,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Indsamler data for kontoen '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Indsamler data for kontoen '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14168,10 +12186,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Indhold i scriptet '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Indhold i scriptet '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14194,20 +12210,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-muligheder:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-muligheder:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Ingen særlige muligheder tilgængelige)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Tilgængelige Sieve-scripter.\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Tilgængelige Sieve-scripter.\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14285,12 +12297,12 @@ msgstr "Brug dette felt til at indtaste en vilkårlig statisk underskrift."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Brug denne forespørger til at angive en tekstfil der indeholder din "
-"underskrift. Den vil blive læst hver gang du laver et nyt brev eller vedlægger "
-"en ny underskrift."
+"underskrift. Den vil blive læst hver gang du laver et nyt brev eller "
+"vedlægger en ny underskrift."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14306,22 +12318,27 @@ msgstr "Åbner den angive fil i en teksteditor."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Du kan tilføje en vilkårlig kommando her, enten med eller uden sti afhængig af "
-"om kommandoen er i din sti eller ej. For hvert nyt brev, vil KMail køre "
+"Du kan tilføje en vilkårlig kommando her, enten med eller uden sti afhængig "
+"af om kommandoen er i din sti eller ej. For hvert nyt brev, vil KMail køre "
 "kommandoen og bruge hvad der kommer af uddata (til standard-output) som en "
-"underskrift. Sædvanlige kommandoer til brug for denne mekanisme er \"fortune\" "
-"eller \"ksig -random\"."
+"underskrift. Sædvanlige kommandoer til brug for denne mekanisme er \"fortune"
+"\" eller \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Angiv kommando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Søgesti"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Ny indgang:"
@@ -14355,6 +12372,11 @@ msgstr "Tilføj gruppe"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Vil du virkelig fjerne denne gruppe og alle dens stumper?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Anvend &på:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Redigér stump"
@@ -14367,6 +12389,10 @@ msgstr "Redigér gruppe"
 msgid "Edit &group..."
 msgstr "Redigér &gruppe..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "R&edigér..."
@@ -14400,18 +12426,18 @@ msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
 msgstr ""
-"Aktivér dette for at gemme den indtastede værdi til højre som standardværdi for "
-"denne variabel"
+"Aktivér dette for at gemme den indtastede værdi til højre som standardværdi "
+"for denne variabel"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Hvis du aktiverer denne indstilling, vil værdien indtastet til højre blive "
-"gemt. Hvis du bruger samme variabel senere, selv i en anden stump, vil værdien "
-"indtastet til højre være standardværdien for den variabel."
+"gemt. Hvis du bruger samme variabel senere, selv i en anden stump, vil "
+"værdien indtastet til højre være standardværdien for den variabel."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14446,6 +12472,16 @@ msgstr "Aktivér ikke"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Kan ikke indsætte indhold fra filen '%1': %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Til: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14475,59 +12511,52 @@ msgstr "Kan ikke starte kommando fra skabelon: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Her kan du oprette brevskabeloner som kan bruges når du skriver nye breve "
-"eller svarer, eller når du videresender et brev.</p>"
-"<p>Brevskabelonerne understøtter erstatningskommandoer ved helt enkelt at "
-"indtaste dem, eller ved at vælge dem i menuen <i>Indsæt kommando</i>.</p>"
-"<p>Skabeloner som angives her er specifikke for en mappe. De sætter både "
-"globale skabeloner og skabeloner per identitet ud af kraft hvis de angives.</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Her kan du oprette brevskabeloner som kan bruges når du skriver nye "
+"breve eller svarer, eller når du videresender et brev.</"
+"p><p>Brevskabelonerne understøtter erstatningskommandoer ved helt enkelt at "
+"indtaste dem, eller ved at vælge dem i menuen <i>Indsæt kommando</i>.</"
+"p><p>Skabeloner som angives her er specifikke for en mappe. De sætter både "
+"globale skabeloner og skabeloner per identitet ud af kraft hvis de angives.</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Her kan du oprette brevskabeloner som kan bruges når du skriver nye breve "
-"eller svarer, eller når du videresender et brev.</p>"
-"<p>Brevskabelonerne understøtter erstatningskommandoer ved helt enkelt at "
-"indtaste dem, eller ved at vælge dem i menuen <i>Indsæt kommando</i>.</p>"
-"<p>Skabeloner som angives her gælder for en hel brevidentitet. De sætter "
-"globale skabeloner ud af kraft men sættes ud af kraft af skabeloner pr mapper "
-"hvis sådanne angives.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Her kan du oprette brevskabeloner som kan bruges når du skriver nye "
+"breve eller svarer, eller når du videresender et brev.</"
+"p><p>Brevskabelonerne understøtter erstatningskommandoer ved helt enkelt at "
+"indtaste dem, eller ved at vælge dem i menuen <i>Indsæt kommando</i>.</"
+"p><p>Skabeloner som angives her gælder for en hel brevidentitet. De sætter "
+"globale skabeloner ud af kraft men sættes ud af kraft af skabeloner pr "
+"mapper hvis sådanne angives.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Her kan du oprette brevskabeloner som kan bruges når du skriver nye breve "
-"eller svarer, eller når du viderebefordrar et brev.</p>"
-"<p>Brevskabelonerna understøtter erstatningskommandon ved at helt enkelt "
-"indtaste dem, eller ved at vælge dem i menuen <i>Indsætte kommando</i>.</p>"
-"<p>Dette er generelle skabeloner (standardskabeloner). De kan sættes ud af "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Her kan du oprette brevskabeloner som kan bruges når du skriver nye "
+"breve eller svarer, eller når du viderebefordrar et brev.</"
+"p><p>Brevskabelonerna understøtter erstatningskommandon ved at helt enkelt "
+"indtaste dem, eller ved at vælge dem i menuen <i>Indsætte kommando</i>.</"
+"p><p>Dette er generelle skabeloner (standardskabeloner). De kan sættes ud af "
 "kraft af skabeloner per identitet og skabeloner per mappe hvis sådanne "
 "angives.</p></qt>"
 
@@ -14781,6 +12810,10 @@ msgstr "Send nuværende brevtekst og indsæt resultatet som det er"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Send nuværende brevtekst og erstat den med resultatet"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Indstil markørpositionen"
@@ -14813,111 +12846,6 @@ msgstr "Aktivér fejlsøgning"
 msgid "Turn Debug Off"
 msgstr "Luk af for fejlsøgning"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...at du kan gå til næste og forrige brev ved at bruge henholdsvis\n"
-"højre og venstre piletast?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...at du hurtigt kan oprette filter på afsender, modtager,\n"
-"emne og postlister med <em>Værktøj&gt;Opret&nbsp;Filter</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...at du kan slippe af med &quot;[postlistenavn]&quot;\n"
-"tilføjet til emnet på visse e-mail-lister ved at bruge <em>omskriv\n"
-"header</em> filterhandlingen? Brug blot\n"
-"<pre>omskriv header &quot;Emne&quot;\n"
-"   erstat &quot;\\s*\\[postlistenavn\\]\\s*&quot;\n"
-"   med &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...at du kan associere postlister med mapper i\n"
-"<em>Mappe&gt;Håndtering af e-mail-liste...</em>-dialogen? Du kan så bruge\n"
-"<em>Brev-&gt;Nyt&nbsp;brev&nbsp;til&nbsp;Post&nbsp;liste...</em>\n"
-" til at åbne brevskriveren med postlisteadressen allerede sat.</p>\n"
-"Alternativt, kan du klikke med den midterste museknap på mappen.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...at du kan tilknytte egne ikoner til hver mappe individuelt?\n"
-"Se <em>Mappe&gt;Egenskaber...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...at KMail kan vise en farvet linje der viser hvad slags brev det er\n"
-"(Almindelig tekst/HTML/OpenPGP) der bliver vist for øjeblikket?</p>\n"
-"<p>Dette ødelægger forsøg på at snyde med at underskriftsverifikation er "
-"lykkedes\n"
-"ved at send HTML-breve der efterligner KMail's underskriftsstatus-rammer.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...at du kan filtrere på en vilkårlig header ved blot at indtaste dets navn\n"
-"i det første redigeringsfelt af en søgeregel?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...at du kan filtrere HTML breve væk med reglen\n"
-"<pre>&quot;Content-type&quot; indeholder &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...at når der svares, er det den markerede del af brevet der citeres?</p>\n"
-"<p>Hvis intet er markeret vil hele brevet blive citeret.</p>\n"
-"<p>Dette virker endog med tekst i bilag hvis du valgte\n"
-"<em>Vis-&gt;Bilag-&gt;Indlejret</em>.</p>\n"
-"<p>Denne egenskab er tilgængelig med alle svarkommandoer undtagen\n"
-"<em>Brev-&gt;Svar uden citering</em>.</p>\n"
-"<p align=\"right\"><em>bidrag ved David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Der er intet at fortryde."
@@ -14982,6 +12910,15 @@ msgstr "Bilag #%1 (unavngiven)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Vis overvågningslog for GnuPG for denne handling"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "En fil med navnet \"%1\" findes allerede. Vil du overskrive den?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Overskriv fil?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15013,8 +12950,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Din server havde ikke \"vacation\" på sin liste af understøttede "
-"Sieve-udvidelser.\n"
+"Din server havde ikke \"vacation\" på sin liste af understøttede Sieve-"
+"udvidelser.\n"
 "Uden det kan KMail ikke installere 'væk fra kontoret'-svar for dig.\n"
 "Kontakt venligst din systemadministrator."
 
@@ -15098,13 +13035,14 @@ msgstr "&Send billede med hvert brev"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Markér dette felt hvis du ønsker at Kmail skal tilføje et hoved med et såkaldt "
-"x-ansigt til breve som skrives med denne identitet. Et x-ansigt er et lille (48 "
-"x 48 billedpunkter) sort-hvidt billede som visse e-mail-programmer kan vise."
+"Markér dette felt hvis du ønsker at Kmail skal tilføje et hoved med et "
+"såkaldt x-ansigt til breve som skrives med denne identitet. Et x-ansigt er "
+"et lille (48 x 48 billedpunkter) sort-hvidt billede som visse e-mail-"
+"programmer kan vise."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15133,13 +13071,13 @@ msgstr "Vælg fil..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Brug dette for at vælge en billedfil som billedet laves ud fra. Billedet skal "
-"have høj kontrast og være næsten kvadratisk. En lys baggrund hjælper til med at "
-"forbedre resultatet."
+"Brug dette for at vælge en billedfil som billedet laves ud fra. Billedet "
+"skal have høj kontrast og være næsten kvadratisk. En lys baggrund hjælper "
+"til med at forbedre resultatet."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15147,20 +13085,22 @@ msgstr "Sæt fra adressebog"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Du kan bruge en nedskaleret version af billedet du har angivet i adressebogen."
+"Du kan bruge en nedskaleret version af billedet du har angivet i "
+"adressebogen."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>Kmail kan sende et lille (48 x 48 bildpunkter), sort-hvidt billede med i "
-"lav  kvalitet med hvert brev. Det kan for eksempel være et billede af dig eller "
-"et symbol. Det vises i modtagarens e-mail-program (hvis det understøttes)."
+"lav  kvalitet med hvert brev. Det kan for eksempel være et billede af dig "
+"eller et symbol. Det vises i modtagarens e-mail-program (hvis det "
+"understøttes)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15168,11 +13108,11 @@ msgstr "Brug dette felt til at indtaste en vilkårlig X-Face streng."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Eksempler er tilstede på <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Eksempler er tilstede på <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15187,128 +13127,1797 @@ msgstr "&Intet billede"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Du har ikke digselv som kontakt defineret i adressebogen."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Total: %2<br>Ulæst: %3<br>Størrelse: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Underskriver"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Kvote: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Underskriv breve &automatisk"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Sæt emnet for brevet"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Når dette er aktiveret, så vil alle breve du sender blive underskrevet som "
+"standard. Det er naturligvis stadig muligt at deaktivere underskrift for "
+"hvert brev individuelt."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Send CC: til 'adresse'"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Krypterer"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Send BCC: til 'adresse'"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Når e-mails krypteres, skal der altid også krypteres til min egen identitets "
+"certifikat"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Tilføj 'header' til brevet"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Når dette er aktiveret vil brevet/filen ikke kun blive krypteret med "
+"modtagerens offentlige nøgle, men også med din nøgle. Dette vil gøre dig i "
+"stand til at dekryptere brevet/filen på et senere tidspunkt. Dette er "
+"generelt en god idé."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Læs brødtekst fra 'fil'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Vis &underskrevet/krypteret tekst efter skrivning"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Sæt brødteksten for brevet"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Når dette er aktiveret vil den underskrevne/krypterede tekst blive vist i "
+"et  separat vindue, og gøre det muligt at vide hvordan det ser ud efter det "
+"er sendt. Dette er en god idé når du verificerer at dit krypteringssystem "
+"virker."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Tilføj et bilag til brevet. Dette kan gentages"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Opbevar gemte breve &krypterede"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Tjek kun for ny post"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Tjek for at opbevare breve krypterede "
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Åbn kun brevskrivningsvinduet"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gem breve krypterede</h1>\n"
+"Når dette felt er afkrydset, bliver sendte breve gemt krypterede som de blev "
+"sendt. Dette anbefales ikke, idet du så ikke længere vil være i stand til at "
+"læse brevene længere hvis et nødvendigt certifikat udløber.\n"
+"<p>\n"
+"Der kan imidlertid være lokale regler der kræver at du slår dette til. Hvis "
+"du er i tvivl. så tjek med din lokale administrator.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Vis den givne brevfil"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Vis altid indkodningsnøgler til &godkendelse"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Send besked til 'adresse' henholdsvis vedlæg filen 'URL'-en peger på"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Når dette er aktiveret vil programmet altid vise dig en liste af offentlige "
+"nøgler ud fra hvilke du kan vælge den der bliver brugt til kryptering. Hvis "
+"det er deaktiveret vil programmet kun vise dialogen, hvis det ikke kan finde "
+"den rigtige nøgle eller hvis der er flere der kan bruges."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Læs"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "&Kryptér breve automatisk om muligt"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Gammel"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Når dette er aktiveret, så vil hvert brev du sender blive krypteret når "
+"kryptering er mulig og ønsket. Det er naturligvis stadig muligt at "
+"deaktivere kryptering for hvert brev individuelt."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Slettet"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Kryptér/underskriv  aldrig når der &gemmes som kladde"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Besvaret"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Hvordan virker dette?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Videresendt"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universelt"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "I kø"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Svar"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sendt"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Svar alle"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Overvåget"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Videresend"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignoreret"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Genvej:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "S&kabelontype:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ikke spam"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Skabelonindhold"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Gøremål"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Skabelongenvej"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Har bilag"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Skabelontype"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 af %2 %3 bruges"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Mappeegenskaber"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Søgesti"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Mappe indeholder en postliste"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Liste&adresse:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Ulæst:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Brev udløber"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "U&dløb efter:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Lad &læste breve udløbe"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Udløb e&fter:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Lad &ulæste breve udløbe"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dage"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Uger"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Måneder"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Afsenders identi&tet:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Opbevaringsformat:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Liste-visning"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Send post i køen når der tjekkes post"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "En fil med navnet \"%1\" findes allerede. Vil du overskrive den?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Vælg om du ønsker at KMail skal sende alle breve i udbakken ved "
+"manuelle eller ved alle tjek for post, eller om du ikke ønsker at breve skal "
+"sendes automatisk overhovedet. </qt></p>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Overskriv fil?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Flyt automatisk ikke synkroniserede breve fra mapper med utilstrækkelige "
+"adgangrettigheder"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Hvis der er nye breve i en mappe som endnu ikke er overført til serveren, "
+"men du ikke har tilstrækkelige adgangrettigheder til mappen til at overføre "
+"dem, kommer breven automatisk til at blive flyttet til en mappe for tabte og "
+"fundne breve."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Tillad lokal flag i skrivebeskyttede mapper"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Denne indstilling lader administratorer indstille et minimalt tidsinterval "
+"mellem to brevkontroller.\n"
+"Brugeren vil kke kunne vælge en mindre værdi end det som indstilles her."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Den mest nylige valgte mappe i mappevalgsdialogen."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Se bort fra brugerens indstilling af umask og brug i stedet \"læs-skriv kun "
+"for brugeren\"."
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politik for at vise statusikonen"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Luk programmet når hovedvinduet lukkes, selv hvis statusområdeikonet er "
+"aktiveret."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Snaksalig gøren opmærksom på ny post"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Hvis dette er aktiveret så vil antallet af nyligt ankomne breve blive vist i "
+"bekendtgørelsen om nye breve, ellers vil du kun få en simpel 'Ny post "
+"ankommet' besked."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Angiv &editor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Brug ekstern editor i stedet for brevskriveren"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"Tærskel for hvornår brugeren skal advares om at en mappe nærmer sig sin "
+"kvotebegrænsning."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Aktivér groupware funktionalitet"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Ordn Fra:/Til: headere i svar på svar"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook har et antal svage punkter i sin implementation af "
+"iCalendar-standarden. dette tilvalg forsøger at komme omkring  et af dem. "
+"Hvis du har problemer med at Outlook-brugere ikke kan komme til dine svar, "
+"så prøv at sætte dette tilvalg"
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Send groupware-invitationer i brødteksten"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook har et antal svage punkter i sin implementation af "
+"iCalendar-standarden. dette tilvalg forsøger at komme omkring et af dem. "
+"Hvis du har problemer med at Outlook-brugere ikke kan komme til dine "
+"invitationer, så prøv at sætte dette tilvalg"
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Udveksl kompatibel invitationsnavngivning"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook, brugt i kombination med en Microsoft Exchange server, har "
+"et problem med at forstå standardiseret groupware e-mail. Slå dette til for "
+"at sende groupware invitationer på en måde som Microsoft Exchange forstår."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Når dette er markeret ser du ikke brevvinduet. I stedet sendes alle "
+"indbydelsesbreve automatisk. Hvis du vil se brevet inden det sendes, kan du "
+"lade være med at markere dette. Vær dog klar over at teksten i brevvinduet "
+"har kalendersyntaks, og du bør ikke forsøge at ændre den manuelt."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Slet indbydelsesbreve efter svaret på dem er blevet sendt"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Når dette er afkrydset, vil modtagne indbydelsesbreve som er blevet svaret "
+"på, blive flyttet til affaldsmappen, når svaret er blevet afsendt."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Aktivering af dette gør det muligt at opbevare indgange fra Kontact-"
+"programmerne (KOrganizer, KAddressBook og KNotes).</p><p>Udover dette, skal "
+"du sætte programmerne til at bruge IMAP-ressourcen. Dette gøres i TDE's "
+"kontrolcenter.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Sædvanligvis har du ikke nogen grund til at ville se de mapper der holder "
+"IMAP's ressources. Men hvis du har brug for at se dem, kan du indstille det "
+"her.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Hvis kontoen som bruges til at opbevare information om groupware ikke "
+"bruges til at håndtere sædvanlige breve, markeres dette for at Kmail kun "
+"skal vis groupware-mapper. Dette er nyttigt hvis du håndterer sædvanlige "
+"breve via en yderligere online IMAP-konto.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Vælg opbevaringsformat for groupware-mapperne. <ul><li>Standardformatet "
+"som bruges er ical (til kalendermapper) og vcard (til adressebogsmapper). "
+"Disse formater gør at alle funktioner i Kontact er tilgængelige.</"
+"li><li>Kolab XML-formatet bruger sin egen model som nærmere svarer til  den "
+"som bruges af Outlook. Formatet giver bedre funktion sammen med Outlook, når "
+"en Kolab-server eller lignende løsning bruges.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Dette vælger roden for IMAP's ressourcemapper. </p><p>Standarden  for "
+"Kolab-serveren er at sætte det til at være IMAP's rod.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Dette er ID for den konto der holder IMAP-ressource-mapperne.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Hvis du ønsker at sætte mappenavnene for IMAP-opbevaring til dit lokale "
+"sprog, kan du vælge mellem disse tilgængelige sprog.</p> <p>Bemærk venligst, "
+"at den eneste grund til at gøre dette er for kompatibilitet med Microsoft "
+"Outlook. Det betragtes som en dårlig idé at sætte dette, da det gør det "
+"umuligt at ændre sprog.</p><p>Så gør det ikke med mindre du er nødt til det."
+"</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Filtrér også nye breve modtaget i groupware-mapper."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr "Synkronisér groupwareændringer i DIMAP-mapper straks når du er online."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Denne værdi bruges til at afgøre om KMail's introduktion skal vises."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimalt antal forbindelser pr vært"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Dette kan bruges til at begrænse antallet af forbindelser pr vært mens der "
+"tjekkes for ny post. Som standard er antallet af frbindelser ubegrænset (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Vis hurtigsøgningens linjeredigering"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Dette aktiverer eller deaktiverer søgelinjens redigering ovenfor brevlisten "
+"som kan bruges til hurtigt at søge efter information vist i beskedlisten."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Skjul lokal indbakke hvis den er ubrugt"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Videresend indlejret som standard."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "Tillad semikolon (';') at blive brugt som adskiller i brevskriveren."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Behold det oprindelige tegnsæt, når der svares eller videresendes om muligt"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Indsæt a&utomatisk signatur"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Husk denne identitet, så den også vil blive brugt i fremtidige "
+"brevskrivervinduer.\n"
+"    "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Husk denne mappe for sendte ting, så den også vil blive brugt i fremtidige "
+"brevskrivervinduer."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Husk denne posttransport, så den også vil blive brugt i fremtidige "
+"brevskrivervinduer."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Husk denne identitet, så den også vil blive brugt i fremtidige "
+"brevskrivervinduer.\n"
+"    "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Om&brydning ved søjle:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Maksimalt antal modtager-editor-linjer."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Slå dette til for at få Outlook  &#8482;  til at forstå dine bilags navne "
+"når de indeholder ikke-engelske tegn"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Bed automatisk om &brevdispositionspåmindelser"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Aktivér dette hvis du ønsker at KMail skal bede om brev-"
+"dispositionsbekendtgørelser (MDN'er) for hvert udgående brev.</p><p> Dette "
+"påvirker kun standarden; du kan stadig aktivere eller deaktivere MDN "
+"forespørgsler på en pr-brev basis i brevskriveren, under "
+"menupunktet<em>Tilvalg</em>->><em>Forespørg dispositionsbekendtgørelse</em>."
+"</p></qt> <em>Tilvalg</em>-><em>Bed om dispositionsmeddelelse</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Brug seneste adresser for automatisk komplettering"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Deaktivér dette hvis du ikke ønsker at senest brugte adresser skal vises i "
+"listen for automatisk komplettering i brevvinduets adressefelt."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Auto-gem interval:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"En sikkerhedskopi af teksten i brevskrivervinduet kan laves regelmæssigt. "
+"Det interval der bruges til at lave sikkerhedskopier sættes her. Du kan "
+"deaktivere autogemning ved at sætte det til værdien 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Indsæt signatur over citeret tekst"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Erstat genkendt præfi&ks med \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Erstat genkendt præfiks med \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Brug automatiske anførselstegn"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Underskriften er udløbet."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Type af modtager-vælger"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Sætter typen af dialogen til at vælge modtagere for Til,\n"
+"        CC og BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Type af modtager-editor"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Sætter typen af modtager-editor til at redigere Til,\n"
+"        CC og BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maksimalt antal modtager-editor-linjer."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Liste af brevdelstyper som skal fjernes fra breve som videresendes indlejret."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Maksimal størrelse i MB som bilag til breve må have."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Vis panelet til tekststumphåndtering og -indsættelse i brevskriveren."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Vis overvågningslog for GnuPG også efter krypteringshandlinger som blev "
+"gennemført."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Behold det oprindelige tegnsæt, når der svares eller videresendes om muligt"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Nogle breve, især dem der genereres automatisk, angiver ikke det tegnsæt der "
+"skal bruges for at vise dem rigtigt. I sådanne tilfælde vil et "
+"reservetegnsæt blive brugt, som du kan indstille her. Sæt det til det der "
+"bruges mest almindeligt i din del af verden. Som standard bruges det tegnsæt "
+"der er indstillet for hele systemet."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Ændring af dette fra sin standard som 'Auto' vil tvinge til brugen af det "
+"angivne tegnsæt for alle breve, uanset hvad de selv siger."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Aktivér dette hvis du ønsker at smileyer såsom :-) som indgår i brevteksten "
+"skal erstattes af emotikoner (små billeder)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Aktivér dette for at vise forskellige niveauer af citeret tekst. Deaktivér "
+"for at skjule niveauerne med citeret tekst."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Komprimér niveau automatisk:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reducér tegnstørrelse for citeret tekst"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Aktivér dette for at vise citeret tekst med en mindre skrifttype."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Opbevar gemte breve &krypterede"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Vis brugeragent i  smarte brevoverskrifter"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Aktivér dette for at vise linjerne for beuger-agent og X-Mailer når flotte "
+"brevhoveder bruges."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Tillad at slette bilag til eksisterende breve."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Tillad at redigere bilag til eksisterende breve."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Dekryptér altid breve ved visning eller spørg før dekryptering"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Send brevdispositionspåmindelser med tom afsender."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Send brevdispositionspåmindelser med tom afsenderstreng. Nogle  servere er "
+"måske indstillet til at afslå sådanne  meddelelser, så hvis du kommer ud for "
+"problemer med at sende MDN'er ind, så afmarkér dette."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Sætninger er konverteret til skabeloner"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Gamle sætninger er konverteret til skabeloner"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Brevskabelon for nyt brev"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Brevskabelon for svar"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Brevskabelon for svar til alle"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Brevskabelon for videresend"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Tilføj tegn"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Tillad at 'ikke på kontoret'-indstillinger kan ændres af brugeren."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Tillad brugere at uploade 'ikke på kontoret'-sieve-scripts, men tillad dem "
+"ikke at ændre indstillinger, såsom domænet der skal reageres på og "
+"spamreaktionsomskrifteren."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Send kun 'ikke på kontoret'-svar til breve der kommer fra dette domæne."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Tillad 'ikke på kontoret'-svar at blive sendt til breve markeret som SPAM."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Tjek om der stadig er et aktivt 'ikke på kontoret'-svar konfigureret ved "
+"opstart af KMail."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Redigér &fil"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "R&edigér..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Kør"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "M&appe"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Brev"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Svar speciel"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Videresend"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Værktøjsvink"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Stumpindstillinger"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Html-værktøjslinje"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Almindelige tilvalg"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Html-værktøjslinje"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validér certifikater ved brug af CRL'er"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Hvis dette er valgt, vil S/MIME certifikater blive valideret ved brug af "
+"Certificate Revocation Lists (CRL'er)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validér certifikater online (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Hvis dette er valgt, vil S/MIME certifikater blive valideret online ved brug "
+"af Online Certificates Status Protocol (OCSP). Udfyld URL'en for OCSP "
+"besvareren nedenfor."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Online certifikatsgodkendelse"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP-besvarers URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Indtast adressen her for serveren for online validering af certifikater (OCSP"
+"+besvarer). URL'en starter sædvanligvis med http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP svarunderskrift:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorér Service-URL for certifikater"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Tjek ikke certifikatpolitikker"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Som standard bruger GnuPG filen ~/.gnupg/policies.txt til at tjekke om en "
+"certifikatpolitik er tilladt. Hvis dette er valgt, bliver politikker ikke "
+"tjekket."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Konsultér aldrig en CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Hvis dette er afkrydset vil Certificate Revocation Lister aldrig blive brugt "
+"til at validere S/MIME-certifikater."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Hent manglende udsteder-certifikater"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Hvis dette er afkrydset vil manglende udstedercertifikater blive hentet om "
+"nødvendigt (dette gælder både valideringsmetoder, CRL'er og OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-forespørgsler"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Udfør ikke nogen HTTP-forespørgsler"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Deaktiverer i det hele taget brugen af HTTP for S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Brug denne proxy til HTTP-forespørgsler: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Brug systemets HTTP-proxy:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Hvis dette er valgt, vil værdien af den HTTP-proxy der vises til højre (som "
+"kommer fra miljøvariablen http_proxy) blive brugt til enhver HTTP-"
+"forespørgsel."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Indtast stedet for din  HTTP-proxy her, som vil blive brugt til alle HTTP-"
+"forespørgsler der relaterer til S/MIME. Syntaksen er vært:port, for eksempel "
+"minproxy.intetsted.dk:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorér HTTP CRL distributionspunkt for certifikater"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Når du kigger efter stedet for et CRL, indeholdet det der skal testes "
+"sædvanligvis såkaldte \"CRL-distributionspunkt\" (DP)-indgange som er URL'er "
+"der beskriver måden at få adgang til URL'en. Den først fundne DP-indgang "
+"bruges.  Med dette tilvalg bliver alle indgange der bruger HTTP-systemet "
+"ignoreret når der kigges efter en passende DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-Forespørgsler"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Udfør ikke nogen LDAP-forespørgsler"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Deaktiverer i det hele taget brugen af LDAP for S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorér LDAP CRL-distributionspunkt for certifikater"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Når du kigger efter stedet for et CRL, indeholdet det der skal testes "
+"sædvanligvis såkaldte \"CRL-distributionspunkt\" (DP)-indgange som er URL'er "
+"der beskriver måden at få adgang til URL'en. Den først fundne DP-indgang "
+"bruges.  Med dette tilvalg bliver alle indgange der bruger LDAP-systemet "
+"ignoreret når der kigges efter en passende DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primær vært for LDAP-forespørgsler:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Indtastning af en LDAP-server her vil få alle LDAP-forespørgsler til at gå "
+"til den server først. Mere præcist, denne indstilling sætter enhver angiven "
+"vært og port del i en LDAP URL ud af kraft, og vil også blive brugt hvis "
+"vært og port er blevet udeladt fra URL'en. Andre LDAP-servere vil kun blive "
+"brugt hvis forbindelsen til \"proxy\" mislykkedes.\n"
+"Syntaksen er \"VÆRT\" eller \"VÆRT:PORT\". Hvis PORT er udeladt, bruges port "
+"389 (standard LDAP port)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Tilføj stump"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Tilføj"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Stump"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Gruppe:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Stumpindstillinger"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Værktøjsvink"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Vis stumps tekst i &værktøjsvink"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Bestemmer om et værktøjsvink skal vises som indeholder tekst fra den "
+"bogmærkede linje"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variable"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Inputmetode for variable"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Enkelt dialog for hver variabel indeni i en stump"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "En inputdialog vil blive vist for hver variabel indeni en stump"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "En dialog for alle variable indeni en stump"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"En enkelt dialog vil blive vist hvor du kan indtaste værdierne for alle "
+"variable indeni en stump"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Ubegrænset:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Skabelonindstilling"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Svar til afsender"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Svar alle/Svar til liste"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Videresend brev"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Advar når det forsøges at sende ikke-&underskrevne breve"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Afkryds for at blive advaret når der sendes breve der ikke er underskrevet."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar ved forsøg på at sende breve der ikke er underskrevet</h1>\n"
+"Hvis dette felt er afkrydset, vil du blive advaret når du prøver at sende "
+"dele af eller hele brevet uden underskrift.\n"
+"<p>\n"
+"Det anbefales at lade dette tilvalg være slået til for maksimal integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Advar når der forsøges at sende ikke krypterede breve"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Afkryds for at blive advaret når der sendes breve der ikke er krypterede."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar når der forsøges at sende breve der ikke er krypterede</h1>\n"
+"Hvis dette felt er afkrydset, vil du blive advaret når du forsøger at sende "
+"dele af eller hele brevet uden kryptering.\n"
+"<p>\n"
+"Det anbefales at lade dette være slået til for for maksimal integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Advar hvis &modtagers e-mail-adresse &ikke er i certifikatet"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Afkryds for at blive advaret hvis adressen ikke er i certifikatet"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar hvis modtagerens e-mail-adresse ikke er i certifikatet</h1>\n"
+"Hvis dette er afkrydset, vil en advarsel blive udstedt hvis e-mail-adressen "
+"for modtageren ikke er indeholdt i certifikatet der bruges til kryptering.\n"
+"<p>\n"
+"Det anbefales at lade dette tilvalg være slået til for maksimal sikkerhed.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Advar hvis certifikat/nøgler udløber snart (indstil grænse nedenfor)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Til underskrift"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Til kryptering"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Vælg antal dage her"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar hvis underskriftscertifikat udløber</h1>\n"
+"Vælg det minimale antal dage underskriftscertifikatet skal være gyldigt uden "
+"at udstede en advarsel.\n"
+"<p>\n"
+"Den anbefalede SPHINX-indstilling er 14 dage.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar hvis krypteringscertifikat udløber</h1>\n"
+"Vælg det minimale antal dage krypteringscertifikatet skal være gyldigt uden "
+"at udstede en advarsel.\n"
+"<p>\n"
+"Den anbefalede SPHINX-indstilling er 14 dage.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar hvis et certifikat i kæden udløber</h1>\n"
+"Vælg det minimale antal dage alle certifikater i kæden skal være gyldige "
+"uden at udstede en advarsel.\n"
+"<p>\n"
+"Den anbefalede SPHINX-indstilling er 14 dage.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar hvis CA-certifikat udløber</h1>\n"
+"Vælg det minimale antal dage CA-certifikatet skal være gyldigt uden at "
+"udstede en advarsel.\n"
+"<p>\n"
+"Den anbefalede SPHINX-indstilling er 14 dage.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advar hvis root-certifikat udløber</h1>\n"
+"Vælg det minimale antal dage root-certifikatet skal være gyldigt uden at "
+"udstede en advarsel.\n"
+"<p>\n"
+"Den anbefalede SPHINX-indstilling er 14 dage.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Til root-certifikater:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Til middel CA-certifikater:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Til slutbruger-certifikater/nøgler"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Genaktivér alle \"Spørg ikke igen\" advarsler"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...at du kan gå til næste og forrige brev ved at bruge henholdsvis\n"
+"højre og venstre piletast?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...at du hurtigt kan oprette filter på afsender, modtager,\n"
+"emne og postlister med <em>Værktøj&gt;Opret&nbsp;Filter</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...at du kan slippe af med &quot;[postlistenavn]&quot;\n"
+"tilføjet til emnet på visse e-mail-lister ved at bruge <em>omskriv\n"
+"header</em> filterhandlingen? Brug blot\n"
+"<pre>omskriv header &quot;Emne&quot;\n"
+"   erstat &quot;\\s*\\[postlistenavn\\]\\s*&quot;\n"
+"   med &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...at du kan associere postlister med mapper i\n"
+"<em>Mappe&gt;Håndtering af e-mail-liste...</em>-dialogen? Du kan så bruge\n"
+"<em>Brev-&gt;Nyt&nbsp;brev&nbsp;til&nbsp;Post&nbsp;liste...</em>\n"
+" til at åbne brevskriveren med postlisteadressen allerede sat.</p>\n"
+"Alternativt, kan du klikke med den midterste museknap på mappen.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...at du kan tilknytte egne ikoner til hver mappe individuelt?\n"
+"Se <em>Mappe&gt;Egenskaber...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...at KMail kan vise en farvet linje der viser hvad slags brev det er\n"
+"(Almindelig tekst/HTML/OpenPGP) der bliver vist for øjeblikket?</p>\n"
+"<p>Dette ødelægger forsøg på at snyde med at underskriftsverifikation er "
+"lykkedes\n"
+"ved at send HTML-breve der efterligner KMail's underskriftsstatus-rammer.</"
+"p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...at du kan filtrere på en vilkårlig header ved blot at indtaste dets "
+"navn\n"
+"i det første redigeringsfelt af en søgeregel?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...at du kan filtrere HTML breve væk med reglen\n"
+"<pre>&quot;Content-type&quot; indeholder &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...at når der svares, er det den markerede del af brevet der citeres?</"
+"p>\n"
+"<p>Hvis intet er markeret vil hele brevet blive citeret.</p>\n"
+"<p>Dette virker endog med tekst i bilag hvis du valgte\n"
+"<em>Vis-&gt;Bilag-&gt;Indlejret</em>.</p>\n"
+"<p>Denne egenskab er tilgængelig med alle svarkommandoer undtagen\n"
+"<em>Brev-&gt;Svar uden citering</em>.</p>\n"
+"<p align=\"right\"><em>bidrag ved David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Vis felt til hurtig mappesøgning"
diff --git a/tde-i18n-de/messages/tdepim/kmail.po b/tde-i18n-de/messages/tdepim/kmail.po
index 3a08c0120a4..7b31878bb6b 100644
--- a/tde-i18n-de/messages/tdepim/kmail.po
+++ b/tde-i18n-de/messages/tdepim/kmail.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-06 21:51+0200\n"
 "Last-Translator: Frederik Schwarzer <schwarzerf@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
@@ -28,13 +28,13 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Matthias Kiefer,Stephan Kulow,Frank Schütte, Stefan Winter"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -180,6 +180,12 @@ msgstr "&Keine (mit Vorsicht zu benutzen)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Zugang mit halbautomatischer Ressourcenvergabe"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Verlauf löschen"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -254,12 +260,12 @@ msgstr "B&enutzer:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Sie haben von Ihrem Internet-Provider einen <em>Benutzernamen</em> "
-"zur Anmeldung an dessen Server bekommen. Üblicherweise stimmt dieser mit dem "
+"Sie haben von Ihrem Internet-Provider einen <em>Benutzernamen</em> zur "
+"Anmeldung an dessen Server bekommen. Üblicherweise stimmt dieser mit dem "
 "ersten Teil der E-Mail-Adresse überein (der Teil vor dem <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -281,20 +287,21 @@ msgstr "&POP-Passwort speichern"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Markieren Sie dieses Ankreuzfeld, damit KMail Ihr Passwort speichert.\n"
-"Falls TDEWallet verfügbar ist, wird das Passwort dort gespeichert. Das gilt als "
-"verhältnismäßig sicher.\n"
-"Andernfalls wird das Passwort in der Konfigurationsdatei von KMail gespeichert. "
-"Das Passwort wird zwar in einem verschlüsselten Format gespeichert, dieses ist "
-"allerdings nicht besonders sicher gegenüber ernsthaften "
-"Entschlüsselungsversuchen, falls jemand Zugriff auf diese Datei erhält."
+"Falls TDEWallet verfügbar ist, wird das Passwort dort gespeichert. Das gilt "
+"als verhältnismäßig sicher.\n"
+"Andernfalls wird das Passwort in der Konfigurationsdatei von KMail "
+"gespeichert. Das Passwort wird zwar in einem verschlüsselten Format "
+"gespeichert, dieses ist allerdings nicht besonders sicher gegenüber "
+"ernsthaften Entschlüsselungsversuchen, falls jemand Zugriff auf diese Datei "
+"erhält."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -322,12 +329,13 @@ msgstr "Nachrichten &filtern, falls diese die angegebene Größe überschreiten"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Falls diese Option gewählt wird, werden Pop-Filter zur Filterung von "
-"Nachrichten verwendet. Sie können wählen, ob die Nachrichten heruntergeladen, "
-"gelöscht oder auf dem Server belassen werden."
+"Nachrichten verwendet. Sie können wählen, ob die Nachrichten "
+"heruntergeladen, gelöscht oder auf dem Server belassen werden."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -376,13 +384,15 @@ msgstr "Einfacher Te&xt"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -425,9 +435,9 @@ msgstr "Namensräume:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Hier sehen Sie die verschiedenen Namensräume, die von Ihrem IMAP-Server "
 "unterstützt werden. Jeder Namensraum repräsentiert ein Präfix, das die "
@@ -472,7 +482,8 @@ msgstr "I&MAP-Passwort speichern"
 #: accountdialog.cpp:976
 msgid "Automaticall&y compact folders (expunges deleted messages)"
 msgstr ""
-"Ordner automatisch komprimieren (beseitigt als &gelöscht markierte Nachrichten)"
+"Ordner automatisch komprimieren (beseitigt als &gelöscht markierte "
+"Nachrichten)"
 
 #: accountdialog.cpp:981
 msgid "Sho&w hidden folders"
@@ -493,13 +504,13 @@ msgstr "Anhänge auf A&nforderung laden"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Aktivieren Sie diese Einstellung, wenn Anhänge beim Auswählen der E-Mail nicht "
-"sofort heruntergeladen werden sollen, sondern erst beim Anklicken des Anhangs. "
-"So werden auch umfangreiche E-Mails sofort angezeigt."
+"Aktivieren Sie diese Einstellung, wenn Anhänge beim Auswählen der E-Mail "
+"nicht sofort heruntergeladen werden sollen, sondern erst beim Anklicken des "
+"Anhangs. So werden auch umfangreiche E-Mails sofort angezeigt."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -511,8 +522,8 @@ msgid ""
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
 "Nur Ordner, die in der Ordneransicht geöffnet (ausgeklappt) sind, werden auf "
-"Unterordner geprüft. Verwenden Sie diese Einstellung, wenn auf dem Server viele "
-"Ordner vorhanden sind."
+"Unterordner geprüft. Verwenden Sie diese Einstellung, wenn auf dem Server "
+"viele Ordner vorhanden sind."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -540,7 +551,7 @@ msgstr "<kein>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Posteingang"
 
@@ -548,8 +559,8 @@ msgstr "Posteingang"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Der Server bietet offenbar keine Unterstützung für die Vergabe eindeutiger "
 "Nachrichtennummern. Dies ist jedoch eine notwendige Voraussetzung für das "
@@ -562,8 +573,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Anscheinend unterstützt der Server das Abholen der Vorspanne nicht. Dies ist "
 "aber eine notwendige Voraussetzung für das Filtern von Nachrichten auf dem "
@@ -573,17 +584,18 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Bitte beachten Sie, dass diese Funktion einige POP3-Server, die kein Pipelining "
-"unterstützen, zum Versenden kaputter E-Mails veranlassen kann.\n"
+"Bitte beachten Sie, dass diese Funktion einige POP3-Server, die kein "
+"Pipelining unterstützen, zum Versenden kaputter E-Mails veranlassen kann.\n"
 "Die Funktion ist einstellbar, da einige Server Pipelining unterstützen, dies "
 "aber nicht bekannt machen. Verwenden Sie den Knopf oben im Dialog, um die "
 "Pipelining-Fähigkeiten Ihres Servers zu überprüfen.\n"
@@ -594,19 +606,19 @@ msgstr ""
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
 msgstr ""
-"Bitte geben Sie auf der Karteikarte \"Allgemein\" einen Server und einen Port "
-"an."
+"Bitte geben Sie auf der Karteikarte \"Allgemein\" einen Server und einen "
+"Port an."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Der Server unterstützt Pipelining nicht. Aus diesem Grund wurde diese "
 "Einstellung ausgeschaltet.\n"
@@ -615,21 +627,22 @@ msgstr ""
 "dass diese Funktionalität bei einigen POP-Servern, die Pipelining nicht "
 "unterstützen, zum Versenden kaputter E-Mails führen kann. Bevor Sie diese "
 "Funktionalität mit wichtigen E-Mails benutzen, sollten Sie zuvor das "
-"reibungslose Funktionieren mit einer großen Anzahl E-Mails prüfen, die sie zum "
-"Testen an sich selbst schicken und in einem Durchgang vom POP-Server abholen."
+"reibungslose Funktionieren mit einer großen Anzahl E-Mails prüfen, die sie "
+"zum Testen an sich selbst schicken und in einem Durchgang vom POP-Server "
+"abholen."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Der Server unterstützt anscheinend nicht die Vergabe eindeutiger "
 "Nachrichtennummern. Diese Funktionalität ist eine grundlegende Voraussetzung "
-"für das Belassen von Nachrichten auf dem Server. Diese Einstellung wurde darum "
-"deaktiviert.\n"
+"für das Belassen von Nachrichten auf dem Server. Diese Einstellung wurde "
+"darum deaktiviert.\n"
 "Da manche Server ihre Fähigkeiten nicht korrekt angeben, können Sie trotzdem "
 "versuchen die Einstellung für das Belassen der Nachrichten auf dem Server "
 "einzuschalten."
@@ -639,8 +652,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Anscheinend unterstützt der Server das Abholen der Vorspanne nicht. Dies ist "
 "aber eine notwendige Voraussetzung für das Filtern von Nachrichten auf dem "
@@ -726,8 +739,8 @@ msgstr "IMAP-Postfach"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Sie müssen ein Postfach in den Netzwerk-Einstellungen angeben, um E-Mail "
 "empfangen zu können."
@@ -766,14 +779,14 @@ msgstr "Willkommen bei KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Sie scheinen KMail zum ersten Mal zu starten. Sie können diesen Assistenten "
-"benutzen, um Ihre E-Mail-Zugänge einzurichten. Geben Sie dazu auf den nächsten "
-"Seiten die Verbindungsdaten ein, die Ihnen von Ihrem E-Mail-Anbieter mitgeteilt "
-"wurden.</qt>"
+"<qt>Sie scheinen KMail zum ersten Mal zu starten. Sie können diesen "
+"Assistenten benutzen, um Ihre E-Mail-Zugänge einzurichten. Geben Sie dazu "
+"auf den nächsten Seiten die Verbindungsdaten ein, die Ihnen von Ihrem E-Mail-"
+"Anbieter mitgeteilt wurden.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -835,8 +848,7 @@ msgstr "lokale Auslieferung"
 msgid "Server Information"
 msgstr "Server-Information"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Keine"
@@ -933,8 +945,8 @@ msgid ""
 "software and re-run this wizard.</p>"
 msgstr ""
 "<p>Es wurden keine Programme zur Erkennung von unerwünschten Nachrichten "
-"gefunden. Bitte installieren Sie ein solches Programm und starten Sie dann den "
-"Assistenten erneut.</p>"
+"gefunden. Bitte installieren Sie ein solches Programm und starten Sie dann "
+"den Assistenten erneut.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -981,38 +993,37 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Hier erhalten Sie Hilfestellung beim Aufsetzen der Filternregeln, mit denen "
-"Sie die verbreitetsten Anti-Virus-Programme in KMail benutzen können.</p> "
-"<p>Der Assistent kann die auf Ihrem Rechner vorhandenen Programme erkennen und "
-"die passenden Filterregeln generieren, um mit dem entsprechenden Programm "
-"Nachrichten, die Viren enthalten, zu erkennen und auszusortieren. Vorhandene "
-"Filterregeln werden dabei vom Assistenten nicht berücksichtigt. Es werden stets "
-"neue Regeln erstellt.</p> "
-"<p><b>Warnung:</b> Da die Oberfläche von KMail während der Überprüfung auf "
-"Viren blockiert ist, kann es zu längeren Wartezeiten kommen. Das Erkennen von "
-"Viren nimmt in der Regel viel Zeit in Anspruch. Haben Sie Probleme damit, "
-"sollten Sie das Löschen der vom Assistenten erstellten Regeln in Erwägung "
-"ziehen, um die normalen Reaktionszeiten wiederherzustellen."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Hier erhalten Sie Hilfestellung beim Aufsetzen der Filternregeln, mit "
+"denen Sie die verbreitetsten Anti-Virus-Programme in KMail benutzen können.</"
+"p> <p>Der Assistent kann die auf Ihrem Rechner vorhandenen Programme "
+"erkennen und die passenden Filterregeln generieren, um mit dem "
+"entsprechenden Programm Nachrichten, die Viren enthalten, zu erkennen und "
+"auszusortieren. Vorhandene Filterregeln werden dabei vom Assistenten nicht "
+"berücksichtigt. Es werden stets neue Regeln erstellt.</p> <p><b>Warnung:</b> "
+"Da die Oberfläche von KMail während der Überprüfung auf Viren blockiert ist, "
+"kann es zu längeren Wartezeiten kommen. Das Erkennen von Viren nimmt in der "
+"Regel viel Zeit in Anspruch. Haben Sie Probleme damit, sollten Sie das "
+"Löschen der vom Assistenten erstellten Regeln in Erwägung ziehen, um die "
+"normalen Reaktionszeiten wiederherzustellen."
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Bitte wählen Sie die Programme aus, die zur Erkennung benutzt werden sollen, "
-"und gehen Sie dann zur nächsten Seite.</p> "
+"<p>Bitte wählen Sie die Programme aus, die zur Erkennung benutzt werden "
+"sollen, und gehen Sie dann zur nächsten Seite.</p> "
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1031,8 +1042,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Der Standardordner für unerwünschte Nachrichten ist der Mülleimer. Sie können "
-"unten jedoch auch einen anderen Ordner auswählen."
+"Der Standardordner für unerwünschte Nachrichten ist der Mülleimer. Sie "
+"können unten jedoch auch einen anderen Ordner auswählen."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1040,16 +1051,14 @@ msgstr "&Eventuell unerwünschte Nachrichten verschieben nach:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Der Standardordner ist der Posteingang. Sie können unten jedoch auch einen "
-"anderen Ordner auswählen. "
-"<p>Nicht alle Erkennungsprogramme unterstützen eine \"eventuell\" Markierung. "
-"Wenn Sie kein entsprechendes Programm verwenden, können Sie auch keinen Ordner "
-"auswählen."
+"anderen Ordner auswählen. <p>Nicht alle Erkennungsprogramme unterstützen "
+"eine \"eventuell\" Markierung. Wenn Sie kein entsprechendes Programm "
+"verwenden, können Sie auch keinen Ordner auswählen."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1059,14 +1068,14 @@ msgstr "Nachrichten mit Anti-Virus-Programmen prüfen"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Lassen Sie Ihre Nachrichten von Anti-Virus-Programmen überprüfen. Der Assistent "
-"erstellt die passenden Filter. Normalerweise werden die Nachrichten von den "
-"Programmen markiert, so dass nachfolgende Filterregeln darauf reagieren und "
-"beispielsweise Nachrichten, die Viren enthalten, in einen besonderen Ordner "
-"verschieben können."
+"Lassen Sie Ihre Nachrichten von Anti-Virus-Programmen überprüfen. Der "
+"Assistent erstellt die passenden Filter. Normalerweise werden die "
+"Nachrichten von den Programmen markiert, so dass nachfolgende Filterregeln "
+"darauf reagieren und beispielsweise Nachrichten, die Viren enthalten, in "
+"einen besonderen Ordner verschieben können."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1075,8 +1084,8 @@ msgstr "Erkannte Viren-Nachrichten in den ausgewählten Ordner verschieben"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Es wird ein Filter angelegt, der Nachrichten, die als virenverseucht erkannt "
 "wurden, in einen vorgegebenen Ordner verschiebt. Die Standardeinstellung für "
@@ -1088,8 +1097,8 @@ msgstr "Erkannte Viren-Nachrichten zusätzlich als gelesen markieren"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Markiert Nachrichten, die als virenverseucht erkannt wurden, als gelesen und "
 "verschiebt sie in den ausgewählten Ordner."
@@ -1272,8 +1281,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Der Grund können fehlende Berechtigungen oder die Existenz eines gleichnamigen "
-"Ordners auf dem Server sein. Die Fehlermeldung des Servers lautet:"
+"Der Grund können fehlende Berechtigungen oder die Existenz eines "
+"gleichnamigen Ordners auf dem Server sein. Die Fehlermeldung des Servers "
+"lautet:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1286,8 +1296,8 @@ msgstr "Fehler beim Lesen des Ordners %1 auf dem Server: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1307,8 +1317,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1339,17 +1349,17 @@ msgstr "Gelöscht"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Keine Ihrer Identitäten passt zum Empfänger dieser Nachricht, "
-"<br>bitte wählen Sie aus der Liste Ihre eigene Adresse aus:"
+"<qt>Keine Ihrer Identitäten passt zum Empfänger dieser Nachricht, <br>bitte "
+"wählen Sie aus der Liste Ihre eigene Adresse aus:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Mehrere Ihrer Identitäten passen zum Empfänger dieser Nachricht, "
 "<br>bitte wählen Sie aus der Liste Ihre eigene Adresse aus:"
@@ -1381,19 +1391,22 @@ msgstr "Fehler beim Komprimieren von \"%1\": Komprimierung abgebrochen."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Diese Einstellung wurde durch Ihre Systemverwaltung geändert.</p> "
-"<p>Sind Sie der Meinung sind, es handelt sich dabei um einen Fehler, setzen Sie "
-"sich bitte mit der Systemverwaltung in Verbindung.</p></qt>"
+"<qt><p>Diese Einstellung wurde durch Ihre Systemverwaltung geändert.</p> "
+"<p>Sind Sie der Meinung sind, es handelt sich dabei um einen Fehler, setzen "
+"Sie sich bitte mit der Systemverwaltung in Verbindung.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Profil laden ..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Postfach einrichten"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Hin&zufügen ..."
@@ -1423,6 +1436,11 @@ msgstr "<qt>Wollen Sie die Identität <b>%1</b> wirklich löschen?</qt>"
 msgid "Remove Identity"
 msgstr "Identität löschen"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Ent&fernen"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Hinzufügen ..."
@@ -1431,6 +1449,11 @@ msgstr "Hinzufügen ..."
 msgid "Modify..."
 msgstr "Ändern ..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Ent&fernen"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Als Standard verwenden"
@@ -1447,17 +1470,15 @@ msgstr "&Versand"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Ausgangspostfächer (fügen Sie mindestens eines hinzu):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Name"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Typ"
@@ -1479,8 +1500,7 @@ msgstr "Als Standard verwenden"
 msgid "Common Options"
 msgstr "Allgemeine Einstellungen"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Vo&r Versenden nachfragen"
@@ -1531,17 +1551,16 @@ msgstr "S&tandard-Domain:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Die Standard-Domain wird zur automatischen Vervollständigung einer "
-"E-Mail-Adresse verwendet, falls nur ein Benutzername angegeben wurde.</p></qt>"
+"<qt> <p>Die Standard-Domain wird zur automatischen Vervollständigung einer E-"
+"Mail-Adresse verwendet, falls nur ein Benutzername angegeben wurde.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1559,9 +1578,9 @@ msgstr "Versandart hinzufügen"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Standard)"
 
@@ -1586,7 +1605,8 @@ msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
 msgstr ""
-"Diese Identität wurde geändert. Sie verwendet ab jetzt den Standardtransport:\n"
+"Diese Identität wurde geändert. Sie verwendet ab jetzt den "
+"Standardtransport:\n"
 "Diese %n Identitäten wurden geändert. Sie verwenden ab jetzt den "
 "Standardtransport:"
 
@@ -1647,6 +1667,10 @@ msgstr "Postfach ändern"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Das Postfach <b>%1</b> kann nicht gefunden werden.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Farben"
@@ -1755,8 +1779,7 @@ msgstr "Benutzte Verknüpfung"
 msgid "Misspelled Words"
 msgstr "Fehlerhafte Wörter"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Neue Nachricht"
@@ -1945,8 +1968,8 @@ msgstr "Nachrichtengruppen standardmäßig schließen"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Nachrichtengruppen mit neuen, ungelesenen oder wichtigen &Nachrichten und "
 "überwachte Gruppen öffnen."
@@ -1957,74 +1980,57 @@ msgstr "Datumsanzeige"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt> "
-"<p><strong>Folgende Ausdrücke können für die Datumsanzeige verwendet "
-"werden:</strong></p> "
-"<ul> "
-"<li>d - Tag als Zahl ohne führende Null (1-31)</li> "
-"<li>dd - Tag als Zahl mit führender Null (01-31)</li> "
-"<li>ddd - abgekürzter Wochentag (Mon - Son)</li> "
-"<li>dddd - ausgeschriebener Wochentag (Montag - Sonntag)</li> "
-"<li>M - Monat als Zahl ohne führende Null (1-12)</li> "
-"<li>MM - Monat als Zahl mit führender Null (01-12)</li> "
-"<li>MMM - abgekürzter Monatsname (Jan - Dez)</li> "
-"<li>MMMM - ausgeschriebener Monatsname (Januar - Dezember)</li> "
-"<li>yy - Jahr als zweistellige Zahl (00-99)</li> "
-"<li>yyyy - Jahr als vierstellige Zahl (0000-9999)</li></ul> "
-"<p><strong>Folgende Ausdrücke können zur Zeitanzeige verwendet werden:</string>"
-"</p> "
-"<ul> "
-"<li>h - Stunde ohne führende Null (0-23 bzw. 1-12 für die AM/PM-Anzeige)</li> "
-"<li>hh - Stunde mit führender Null (00-23 bzw. 01-12 für die AM/PM-Anzeige)</li> "
-"<li>m - Minuten ohne führende Null (0-59)</li> "
-"<li>mm - Minuten mit führender Null (00-59)</li> "
-"<li>s - Sekunden ohne führende Null (0-59)</li> "
-"<li>ss - Sekunden mit führender Null (00-59)</li> "
-"<li>z - Millisekunden ohne führende Null (0-999)</li> "
-"<li>zzz - Millisekunden mit führenden Nullen (000-999)</li> "
-"<li>AP - umschalten auf AM/PM-Anzeige. AP wird entweder durch \"AM\" oder "
-"\"PM\" ersetzt.</li> "
-"<li>ap - umschalten auf AM/PM-Anzeige. ap wird entweder durch \"am\" oder "
-"\"pm\" ersetzt.</li> "
-"<li>Z - Zeitzone in nummerischer Form (-0500)</li></ul> "
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt> <p><strong>Folgende Ausdrücke können für die Datumsanzeige verwendet "
+"werden:</strong></p> <ul> <li>d - Tag als Zahl ohne führende Null (1-31)</"
+"li> <li>dd - Tag als Zahl mit führender Null (01-31)</li> <li>ddd - "
+"abgekürzter Wochentag (Mon - Son)</li> <li>dddd - ausgeschriebener Wochentag "
+"(Montag - Sonntag)</li> <li>M - Monat als Zahl ohne führende Null (1-12)</"
+"li> <li>MM - Monat als Zahl mit führender Null (01-12)</li> <li>MMM - "
+"abgekürzter Monatsname (Jan - Dez)</li> <li>MMMM - ausgeschriebener "
+"Monatsname (Januar - Dezember)</li> <li>yy - Jahr als zweistellige Zahl "
+"(00-99)</li> <li>yyyy - Jahr als vierstellige Zahl (0000-9999)</li></ul> "
+"<p><strong>Folgende Ausdrücke können zur Zeitanzeige verwendet werden:</"
+"string></p> <ul> <li>h - Stunde ohne führende Null (0-23 bzw. 1-12 für die "
+"AM/PM-Anzeige)</li> <li>hh - Stunde mit führender Null (00-23 bzw. 01-12 für "
+"die AM/PM-Anzeige)</li> <li>m - Minuten ohne führende Null (0-59)</li> "
+"<li>mm - Minuten mit führender Null (00-59)</li> <li>s - Sekunden ohne "
+"führende Null (0-59)</li> <li>ss - Sekunden mit führender Null (00-59)</li> "
+"<li>z - Millisekunden ohne führende Null (0-999)</li> <li>zzz - "
+"Millisekunden mit führenden Nullen (000-999)</li> <li>AP - umschalten auf AM/"
+"PM-Anzeige. AP wird entweder durch \"AM\" oder \"PM\" ersetzt.</li> <li>ap - "
+"umschalten auf AM/PM-Anzeige. ap wird entweder durch \"am\" oder \"pm\" "
+"ersetzt.</li> <li>Z - Zeitzone in nummerischer Form (-0500)</li></ul> "
 "<p><strong>Alle anderen Zeichen werden ignoriert.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Eine Änderung der globalen Sortierung hat Vorrang vor allen ordnerspezifischen "
-"Einstellungen."
+"Eine Änderung der globalen Sortierung hat Vorrang vor allen "
+"ordnerspezifischen Einstellungen."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2038,8 +2044,7 @@ msgstr "HT&ML-Statusleiste anzeigen"
 msgid "Show s&pam status in fancy headers"
 msgstr "S&pam-Status im dekorativen Vorspann anzeigen"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Smileys durch Emoticons ersetzen"
@@ -2048,8 +2053,7 @@ msgstr "Smileys durch Emoticons ersetzen"
 msgid "Use smaller font for quoted text"
 msgstr "Für zitierten Text kleinere Schriftart benutzen"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Bei Zitaten Markierungen zum Ein-/Ausblenden anzeigen"
@@ -2075,8 +2079,7 @@ msgstr "Automatisch"
 msgid "&Override character encoding:"
 msgstr "&Original-Zeichensatz übergehen und diesen verwenden:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Anzeige im Systemabschnitt der Kontrollleiste"
@@ -2092,7 +2095,8 @@ msgstr "KMail immer in der Kontrollleiste anzeigen"
 #: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr ""
-"KMail nur in der Kontrollleiste anzeigen, wenn ungelesene Nachrichten vorliegen"
+"KMail nur in der Kontrollleiste anzeigen, wenn ungelesene Nachrichten "
+"vorliegen"
 
 #: configuredialog.cpp:2563 identitydialog.cpp:408
 msgid "&Templates"
@@ -2179,23 +2183,19 @@ msgstr "<b>%f</b> wird durch den Namen der zu bearbeitenden Datei ersetzt"
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Die folgenden Platzhalter werden beim Antworten unterstützt:"
-"<br><b>%D</b>: Datum, <b>%S</b>: Betreff,"
-"<br><b>%e</b>: Absenderadresse, <b>%F</b>: Absendername,<b>%f</b>"
-": Absenderinitialen,"
-"<br><b>%T</b>: Empfängername, <b>%t</b>: Empfängername und - adresse,"
-"<br><b>%C</b>: Adressen der Kopienempfänger, <b>%c</b>"
-": Namen und Adressen der Kopienempfänger, "
-"<br><b>%%</b>: Prozentzeichen, <b>%_</b>: Leerzeichen, <b>%L</b>"
-": Zeilenumbruch</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Die folgenden Platzhalter werden beim Antworten unterstützt:<br><b>%D</"
+"b>: Datum, <b>%S</b>: Betreff,<br><b>%e</b>: Absenderadresse, <b>%F</b>: "
+"Absendername,<b>%f</b>: Absenderinitialen,<br><b>%T</b>: Empfängername, <b>"
+"%t</b>: Empfängername und - adresse,<br><b>%C</b>: Adressen der "
+"Kopienempfänger, <b>%c</b>: Namen und Adressen der Kopienempfänger, <br><b>%"
+"%</b>: Prozentzeichen, <b>%_</b>: Leerzeichen, <b>%L</b>: Zeilenumbruch</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2218,21 +2218,20 @@ msgstr "A&ntwort an alle:"
 msgid "&Forward:"
 msgstr "W&eiterleitung:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Zitatkennzeichnung:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Am %D schrieben Sie:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Am %D schrieb %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
@@ -2250,8 +2249,8 @@ msgid ""
 "(entries are case-insensitive regular expressions):"
 msgstr ""
 "Folgende Präfixe erkennen\n"
-"(die Einträge sind reguläre Ausdrücke ohne Unterscheidung der "
-"Groß-/Kleinschreibung):"
+"(die Einträge sind reguläre Ausdrücke ohne Unterscheidung der Groß-/"
+"Kleinschreibung):"
 
 #: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
@@ -2273,11 +2272,11 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Für jede zu versendende E-Mail wird diese Liste von oben nach unten nach einem "
-"Zeichensatz durchsucht, der alle benötigten Zeichen enthält."
+"Für jede zu versendende E-Mail wird diese Liste von oben nach unten nach "
+"einem Zeichensatz durchsucht, der alle benötigten Zeichen enthält."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2313,10 +2312,9 @@ msgstr "Wert"
 msgid "Ne&w"
 msgstr "&Neu"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Name:"
@@ -2325,19 +2323,18 @@ msgstr "&Name:"
 msgid "&Value:"
 msgstr "W&ert:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-kompatible Vergabe von Namen für Anhänge"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Schalten Sie diese Einstellung ein, damit Outlook (tm) die Namen von Anhängen "
-"akzeptiert, die Sonderzeichen enthalten"
+"Schalten Sie diese Einstellung ein, damit Outlook (tm) die Namen von "
+"Anhängen akzeptiert, die Sonderzeichen enthalten"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2365,21 +2362,21 @@ msgstr "anhängend"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Sie haben sich dazu entschieden, die Namen von Anhängen, die nicht-englische "
 "Zeichen enthalten, so zu kodieren, dass Outlook(tm) und andere nicht den "
 "Standards folgende Programme diese verarbeiten können.\n"
-"Beachten Sie bitte, dass auch KMail in dieser Einstellung E-Mails erstellt, die "
-"eventuell nicht den Standards entsprechen und daher Probleme bei "
-"E-Mail-Programmen verursachen können, die sich an die Standards halten. Sie "
-"sollten diese Option also nur dann aktivieren, wenn es unbedingt nötig ist."
+"Beachten Sie bitte, dass auch KMail in dieser Einstellung E-Mails erstellt, "
+"die eventuell nicht den Standards entsprechen und daher Probleme bei E-Mail-"
+"Programmen verursachen können, die sich an die Standards halten. Sie sollten "
+"diese Option also nur dann aktivieren, wenn es unbedingt nötig ist."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2403,117 +2400,104 @@ msgstr "&Krypto-Module"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>E-Mails enhalten manchmal beide Format. Mit dieser Einstellung können Sie "
-"festlegen, ob die Nachricht als HTML oder als einfacher Text angezeigt wird.</p>"
-"<p>Die Darstellung in HTML lässt die Nachricht ansprechender aussehen, aber "
-"erhöht gleichzeitig die Gefahr der Ausnutzung von Sicherheitslücken.</p>"
-"<p> Bei der Darstellung als einfacher Text gehen viele Textformatierungen "
-"verloren, aber es wird beinahe <em>unmöglich</em>, Sicherheitslücken im "
-"Darstellungsmodul für HTML auszunutzen.</p>"
-"<p>Die darunter stehende Einstellung sichert Sie gegen den am häufigsten "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>E-Mails enhalten manchmal beide Format. Mit dieser Einstellung können "
+"Sie festlegen, ob die Nachricht als HTML oder als einfacher Text angezeigt "
+"wird.</p><p>Die Darstellung in HTML lässt die Nachricht ansprechender "
+"aussehen, aber erhöht gleichzeitig die Gefahr der Ausnutzung von "
+"Sicherheitslücken.</p><p> Bei der Darstellung als einfacher Text gehen viele "
+"Textformatierungen verloren, aber es wird beinahe <em>unmöglich</em>, "
+"Sicherheitslücken im Darstellungsmodul für HTML auszunutzen.</p><p>Die "
+"darunter stehende Einstellung sichert Sie gegen den am häufigsten "
 "vorkommenden Missbrauch von HTML-Nachrichten. Aber sie schützt nicht vor "
-"Sicherheitsproblemen, die noch nicht bekannt waren, als diese Version von KMail "
-"geschrieben wurde.</p>"
-"<p>Daher ist es ratsam, HTML <em>nicht</em> gegenüber einfachem Text zu "
-"bevorzugen. </p>"
-"<p><b>Hinweis:</b> Diese Option kann im Menü <i>Ordner</i> "
-"im Hauptfenster von KMail für jeden Ordner gesondert festgelegt werden.</p></qt>"
+"Sicherheitsproblemen, die noch nicht bekannt waren, als diese Version von "
+"KMail geschrieben wurde.</p><p>Daher ist es ratsam, HTML <em>nicht</em> "
+"gegenüber einfachem Text zu bevorzugen. </p><p><b>Hinweis:</b> Diese Option "
+"kann im Menü <i>Ordner</i> im Hauptfenster von KMail für jeden Ordner "
+"gesondert festgelegt werden.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Manche E-Mail-Werbung wird als HTML-Text versendet und enthält Referenzen "
-"(z. B. auf Bilddateien), die der Absender dazu benutzt, um herauszufinden, ob "
-"die Nachricht gelesen wurde (&quot;Web-Bugs&quot;).</p> "
-"<p>Es gibt keinen vernünftigen Grund Bilder auf diese Art aus dem Internet zu "
-"laden, da der Absender die Bilder per Anhang direkt mit der E-Mail versenden "
-"kann.</p> "
-"<p>Um Sie vor diesem Missbrauch der HTML-Ansicht von KMail zu schützen, ist "
-"diese Option standardmäßig <em>nicht aktiviert</em>.</p>"
-"<p>Wenn Bilder, die über Referenzen in HTML-Nachrichten eingebunden sind, "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Manche E-Mail-Werbung wird als HTML-Text versendet und enthält "
+"Referenzen (z. B. auf Bilddateien), die der Absender dazu benutzt, um "
+"herauszufinden, ob die Nachricht gelesen wurde (&quot;Web-Bugs&quot;).</p> "
+"<p>Es gibt keinen vernünftigen Grund Bilder auf diese Art aus dem Internet "
+"zu laden, da der Absender die Bilder per Anhang direkt mit der E-Mail "
+"versenden kann.</p> <p>Um Sie vor diesem Missbrauch der HTML-Ansicht von "
+"KMail zu schützen, ist diese Option standardmäßig <em>nicht aktiviert</em>.</"
+"p><p>Wenn Bilder, die über Referenzen in HTML-Nachrichten eingebunden sind, "
 "trotzdem angezeigt werden sollen, können Sie diese Option aktivieren. Sie "
 "sollten sich allerdings der möglichen Probleme bewusst sein.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt> "
-"<h3>Umgang mit Empfangs- und Lesebenachrichtigungen(MDNs)</h3> "
-"<p>MDNs sind eine Verallgemeinerung der so genannten <b>Lesebestätigungen</b>"
-". Der Verfasser der Nachricht fordert eine Benachrichtigung an, und das "
-"E-Mailprogramm des Empfängers generiert automatisch eine Antwort, die den "
-"Verfasser über den Verbleib der Nachricht in Kenntnis setzt. Übliche Typen von "
-"Benachrichtigungen sind <b>angezeigt</b> (also gelesen), <b>gelöscht</b> und <b>"
-"weitergeleitet</b>.</p> "
-"<p>Zum Versenden von MDNs bietet KMail folgende Einstellmöglichkeiten:</p> "
-"<ul> "
-"<li><em>Ignorieren</em>: Anforderungen nach Benachrichtigungen ignorieren. Es "
-"werden keine automatischen Benachrichtigungen versendet (empfohlene "
-"Einstellung).</li> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt> <h3>Umgang mit Empfangs- und Lesebenachrichtigungen(MDNs)</h3> <p>MDNs "
+"sind eine Verallgemeinerung der so genannten <b>Lesebestätigungen</b>. Der "
+"Verfasser der Nachricht fordert eine Benachrichtigung an, und das E-"
+"Mailprogramm des Empfängers generiert automatisch eine Antwort, die den "
+"Verfasser über den Verbleib der Nachricht in Kenntnis setzt. Übliche Typen "
+"von Benachrichtigungen sind <b>angezeigt</b> (also gelesen), <b>gelöscht</b> "
+"und <b>weitergeleitet</b>.</p> <p>Zum Versenden von MDNs bietet KMail "
+"folgende Einstellmöglichkeiten:</p> <ul> <li><em>Ignorieren</em>: "
+"Anforderungen nach Benachrichtigungen ignorieren. Es werden keine "
+"automatischen Benachrichtigungen versendet (empfohlene Einstellung).</li> "
 "<li><em>Nachfragen</em>: Benachrichtigungen werden nur nach Rückfrage "
 "versendet. Auf diese Weise können Sie für bestimmte Nachrichten "
 "Benachrichtigungen senden lassen und für andere nicht.</li> "
 "<li><em>Ablehnen</em>: Es wird eine <b>Ablehnungsbenachrichtigung</b> "
 "versendet. Das ist <em>kaum</em> besser als das Versenden der angeforderten "
-"Benachrichtigung. Der Verfasser erfährt, dass seine Nachricht angekommen ist, "
-"ihm fehlt nur die Information, was damit geschehen ist.</li> "
+"Benachrichtigung. Der Verfasser erfährt, dass seine Nachricht angekommen "
+"ist, ihm fehlt nur die Information, was damit geschehen ist.</li> "
 "<li><em>Immer senden</em>: Angeforderte Benachrichtigungen werden immer "
-"versendet. Der Verfasser der Nachricht erfährt also genau, wann seine Nachricht "
-"bearbeitet worden ist und was mit ihr passiert ist. Diese Einstellung sollte "
-"nur in Ausnahmefällen eingesetzt werden. Sie ist vorhanden, weil es unter "
-"bestimmten Umständen (z. B. Customer Relationship Management) eine sinnvolle "
-"Einstellung sein kann.</li></ul></qt>"
+"versendet. Der Verfasser der Nachricht erfährt also genau, wann seine "
+"Nachricht bearbeitet worden ist und was mit ihr passiert ist. Diese "
+"Einstellung sollte nur in Ausnahmefällen eingesetzt werden. Sie ist "
+"vorhanden, weil es unter bestimmten Umständen (z. B. Customer Relationship "
+"Management) eine sinnvolle Einstellung sein kann.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2529,15 +2513,15 @@ msgstr "Nachrichten dürfen e&xterne Referenzen aus dem Internet laden"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>Warnung:</b> Das Zulassen von HTML in E-Mails erhöht die Wahrscheinlichkeit, "
-"dass Ihr System durch aktuelle oder künftige Sicherheitslücken geschädigt wird. "
-"<a href=\"whatsthis:%1\">Mehr über HTML-Mails ...</a> <a href=\"whatsthis:%2\">"
-"Mehr über externe Referenzen ...</a>"
+"<b>Warnung:</b> Das Zulassen von HTML in E-Mails erhöht die "
+"Wahrscheinlichkeit, dass Ihr System durch aktuelle oder künftige "
+"Sicherheitslücken geschädigt wird. <a href=\"whatsthis:%1\">Mehr über HTML-"
+"Mails ...</a> <a href=\"whatsthis:%2\">Mehr über externe Referenzen ...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2546,8 +2530,8 @@ msgstr "Verschlüsselte Nachrichten"
 #: configuredialog.cpp:3826
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr ""
-"Verschlüsselte Nachrichten beim Betrachten automatisch zu Entschlüsseln, sofern "
-"möglich"
+"Verschlüsselte Nachrichten beim Betrachten automatisch zu Entschlüsseln, "
+"sofern möglich"
 
 #: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
@@ -2598,8 +2582,9 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>WARNUNG:</b> Empfangsbestätigungen, die ohne Einschränkung versendet werden, "
-"beeinträchtigen Ihre Privatsphäre. <a href=\"whatsthis:%1\">Mehr ...</a>"
+"<b>WARNUNG:</b> Empfangsbestätigungen, die ohne Einschränkung versendet "
+"werden, beeinträchtigen Ihre Privatsphäre. <a href=\"whatsthis:%1\">Mehr ..."
+"</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2620,8 +2605,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Diese Option erfordern dirmng >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "Kein Proxy"
@@ -2650,8 +2634,8 @@ msgstr "Aufbewahrungsfrist gilt nicht für &wichtige Nachrichten"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Regelung für die Suche nach ungelesenen Nachrichten:"
 
@@ -2675,8 +2659,8 @@ msgstr "In allen Ordnern zyklisch suchen"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Beim Öffnen eines Ordners:"
 
@@ -2723,8 +2707,8 @@ msgstr " s"
 #: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
 msgstr ""
-"Beim &Verschieben von Nachrichten in einen anderen Ordner nach der gewünschten "
-"Aktion fragen"
+"Beim &Verschieben von Nachrichten in einen anderen Ordner nach der "
+"gewünschten Aktion fragen"
 
 #: configuredialog.cpp:4646
 msgid ""
@@ -2747,28 +2731,25 @@ msgstr "Ordner (\"maildir\"-Format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Hiermit wird das Standardformat für lokale Mail-Ordner festgelegt:</p>"
-"<p><b>mbox:</b> In diesem Format entspricht jeder Mail-Ordner einer Datei. Die "
-"einzelnen E-Mails sind durch ihre \"From\"-Vorspannfelder voneinander getrennt. "
-"Dieses Format benötigt wenig Speicherplatz, ist aber weniger robust gegenüber "
-"Bearbeitungsvorgängen, z. B. dem Verschieben von E-Mails zwischen Ordnern.</p>"
-"<p><b>maildir:</b>In diesem Format werden die Mail-Ordner durch Ordner auf der "
-"Festplatte repräsentiert, jede E-Mail wird als eigene Datei abgelegt. Hierdurch "
-"wird mehr Platz auf der Festplatte benötigt, dafür sollte dieses Format "
-"robuster gegenüber Operationen wie dem Verschieben von E-Mails zwischen Ordnern "
-"sein.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Hiermit wird das Standardformat für lokale Mail-Ordner festgelegt:</"
+"p><p><b>mbox:</b> In diesem Format entspricht jeder Mail-Ordner einer Datei. "
+"Die einzelnen E-Mails sind durch ihre \"From\"-Vorspannfelder voneinander "
+"getrennt. Dieses Format benötigt wenig Speicherplatz, ist aber weniger "
+"robust gegenüber Bearbeitungsvorgängen, z. B. dem Verschieben von E-Mails "
+"zwischen Ordnern.</p><p><b>maildir:</b>In diesem Format werden die Mail-"
+"Ordner durch Ordner auf der Festplatte repräsentiert, jede E-Mail wird als "
+"eigene Datei abgelegt. Hierdurch wird mehr Platz auf der Festplatte "
+"benötigt, dafür sollte dieses Format robuster gegenüber Operationen wie dem "
+"Verschieben von E-Mails zwischen Ordnern sein.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2801,56 +2782,47 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Beim Durchgehen ungelesener Nachrichten sind irgendwann keine weiteren "
-"ungelesenen Nachrichten mehr vorhanden.</p> "
-"<p><b>Nicht zyklisch suchen:</b> Die Suche hält bei der letzten Nachricht im "
-"aktuellen Ordner an.</p> "
-"<p><b>Im aktuellen Ordner zyklisch suchen:</b> Die Suche wird am Anfang der "
-"Nachrichtenliste im aktuellen Ordner fortgesetzt. Es wird kein anderer Ordner "
-"durchsucht.</p> "
-"<p><b>In allen Ordnern zyklisch suchen:</b> Die Suche wird am Anfang der "
-"Nachrichtenliste im aktuellen Ordner fortgesetzt. Wird dabei keine ungelesene "
-"Nachricht gefunden, wird die Suche im nächsten Ordner fortgesetzt.</p> "
-"<p>Das Verhalten bei der Suche nach der vorhergehenden ungelesenen Nachricht "
-"ist analog. Die Suche startet am Ende der Nachrichtenliste und wird abhängig "
-"von der gewählten Einstellung im vorherigen Ordner fortgesetzt.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Beim Durchgehen ungelesener Nachrichten sind irgendwann keine "
+"weiteren ungelesenen Nachrichten mehr vorhanden.</p> <p><b>Nicht zyklisch "
+"suchen:</b> Die Suche hält bei der letzten Nachricht im aktuellen Ordner an."
+"</p> <p><b>Im aktuellen Ordner zyklisch suchen:</b> Die Suche wird am Anfang "
+"der Nachrichtenliste im aktuellen Ordner fortgesetzt. Es wird kein anderer "
+"Ordner durchsucht.</p> <p><b>In allen Ordnern zyklisch suchen:</b> Die Suche "
+"wird am Anfang der Nachrichtenliste im aktuellen Ordner fortgesetzt. Wird "
+"dabei keine ungelesene Nachricht gefunden, wird die Suche im nächsten Ordner "
+"fortgesetzt.</p> <p>Das Verhalten bei der Suche nach der vorhergehenden "
+"ungelesenen Nachricht ist analog. Die Suche startet am Ende der "
+"Nachrichtenliste und wird abhängig von der gewählten Einstellung im "
+"vorherigen Ordner fortgesetzt.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Volltextindexierung ermöglicht ein sehr schnelles Durchsuchen der "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Volltextindexierung ermöglicht ein sehr schnelles Durchsuchen der "
 "Nachrichteninhalte. Wenn diese Option eingeschaltet ist, arbeitet die Suche "
 "sehr schnell. Außerdem kann dann die Suchleiste Nachrichten nach Inhalt "
-"durchsuchen.</p>"
-"<p>Die Funktion benötigt eine bestimmte Menge Speicherplatz (etwa halb so viel "
-"wie die Nachrichten selbst).</p>"
-"<p>Nach dem Einschalten muss zunächst der Index aufgebaut werden, aber Sie "
-"können KMail währenddessen normal weiterbenutzen.</p></qt>"
+"durchsuchen.</p><p>Die Funktion benötigt eine bestimmte Menge Speicherplatz "
+"(etwa halb so viel wie die Nachrichten selbst).</p><p>Nach dem Einschalten "
+"muss zunächst der Index aufgebaut werden, aber Sie können KMail "
+"währenddessen normal weiterbenutzen.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2874,8 +2846,8 @@ msgstr "&Format der Arbeitsgruppenordner:"
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
-"Wählen Sie das Format, das zur Speicherung der Arbeitsgruppenordner verwendet "
-"werden soll."
+"Wählen Sie das Format, das zur Speicherung der Arbeitsgruppenordner "
+"verwendet werden soll."
 
 #: configuredialog.cpp:4840
 msgid "Deprecated Kolab1 (iCal/vCard)"
@@ -2920,11 +2892,11 @@ msgstr "&Arbeitsgruppenordner ausblenden"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Ist diese Einstellung markiert, werden in der Ordneransicht keine "
-"IMAP-Ressourceordner angezeigt."
+"Ist diese Einstellung markiert, werden in der Ordneransicht keine IMAP-"
+"Ressourceordner angezeigt."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2932,11 +2904,11 @@ msgstr "Für dieses Konto nur Gr&oupwareordner anzeigen"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Ist diese Einstellung markiert, werden in der Ordneransicht keine E-Mail-Ordner "
-"für die Konten angezeigt, die für Arbeitsgruppen  eingerichtet wurden."
+"Ist diese Einstellung markiert, werden in der Ordneransicht keine E-Mail-"
+"Ordner für die Konten angezeigt, die für Arbeitsgruppen  eingerichtet wurden."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2947,8 +2919,8 @@ msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
-"Änderungen von Arbeitsgruppendaten in DIMAP-Ordnern umgehend abgleichen, falls "
-"mit dem Netzwerk verbunden."
+"Änderungen von Arbeitsgruppendaten in DIMAP-Ordnern umgehend abgleichen, "
+"falls mit dem Netzwerk verbunden."
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -2961,7 +2933,8 @@ msgstr "Arbeitsgruppenfunktionen aktivi&eren"
 #: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr ""
-"Vorspannfelder für \"Von\" und \"An\" in Antworten auf Terminanfragen einsetzen"
+"Vorspannfelder für \"Von\" und \"An\" in Antworten auf Terminanfragen "
+"einsetzen"
 
 #: configuredialog.cpp:4949
 msgid ""
@@ -2997,22 +2970,21 @@ msgid ""
 msgstr ""
 "Wenn Microsoft Outlook in Verbindung mit einem Microsoft Exchange Server "
 "verwendet wird, hat es Probleme, standardkonforme Groupware E-Mails zu "
-"verstehen. Aktivieren Sie diese Einstellung, um Groupware-Einladungen in einem "
-"Format zu senden, das Microsoft Exchange versteht."
+"verstehen. Aktivieren Sie diese Einstellung, um Groupware-Einladungen in "
+"einem Format zu senden, das Microsoft Exchange versteht."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-kompatible Vergabe von Namen für Anhänge"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatisch Einladungen versenden"
@@ -3027,24 +2999,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Terminanfragen werden normalerweise als Anhänge versendet. Diese "
-"Einstellung bewirkt, dass Terminanfragen stattdessen im Text der Mail versendet "
-"werden. Dies ist bei Terminanfragen und Antworten an Microsoft Outlook nötig. "
-"<br>Wenn Sie diese Einstellung verwenden, erhalten Sie keinen erläuternden Text "
-"mehr, der von einem Mailprogramm gelesen werden kann. Für Personen, deren "
-"E-Mail-Programme Terminanfragen nicht verstehen, sehen die entsprechenden "
-"Nachrichten sehr merkwürdig aus. "
-"<br>Personen, deren E-Mail-Programm Terminanfragen versteht, können weiterhin "
-"damit arbeiten.</qt>"
+"Einstellung bewirkt, dass Terminanfragen stattdessen im Text der Mail "
+"versendet werden. Dies ist bei Terminanfragen und Antworten an Microsoft "
+"Outlook nötig. <br>Wenn Sie diese Einstellung verwenden, erhalten Sie keinen "
+"erläuternden Text mehr, der von einem Mailprogramm gelesen werden kann. Für "
+"Personen, deren E-Mail-Programme Terminanfragen nicht verstehen, sehen die "
+"entsprechenden Nachrichten sehr merkwürdig aus. <br>Personen, deren E-Mail-"
+"Programm Terminanfragen versteht, können weiterhin damit arbeiten.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3109,8 +3080,8 @@ msgstr "Beschreibung"
 #: configuredialog_p.cpp:302
 msgid "&Select a profile and click 'OK' to load its settings:"
 msgstr ""
-"Wäh&len Sie ein Profil und klicken Sie auf \"OK\", um dessen Einstellungen zu "
-"übernehmen:"
+"Wäh&len Sie ein Profil und klicken Sie auf \"OK\", um dessen Einstellungen "
+"zu übernehmen:"
 
 #: configuredialog_p.cpp:342
 msgid ""
@@ -3150,31 +3121,28 @@ msgstr "Weiterleiten"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier können Sie eigene Vorlagen für das Antworten auf oder das Weiterleiten "
-"von Nachrichten erstellen, ändern und löschen. Erstellen Sie eine eigene "
-"Vorlage, indem Sie den entsprechenden Eintrag im Kontextmenü anklicken oder im "
-"Menü Werkzeuge auswählen. Sie können der Vorlage auch eine Tastenkombination "
-"zuweisen, um einen schnelleren Zugriff darauf zu haben.</p>"
-"<p>Nachrichtenvorlagen unterstützen auch Platzhalter. Sie können einfach "
-"eingetippt oder über den Menüpunkt <i>Platzhalter einfügen</i> "
-"ausgewählt werden.</p>"
-"<p>Es gibt vier Typen von Vorlagen: zum <i>Antworten</i>, <i>Allen antworten</i>"
-", <i>Weiterleiten</i> und <i>Allgemein</i> für Vorlagen, die zu jeder Aktion "
-"passen. <i>Allgemein</i> Vorlagen können nicht mit einer Tastenkombination "
-"verknüpft werden.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Hier können Sie eigene Vorlagen für das Antworten auf oder das "
+"Weiterleiten von Nachrichten erstellen, ändern und löschen. Erstellen Sie "
+"eine eigene Vorlage, indem Sie den entsprechenden Eintrag im Kontextmenü "
+"anklicken oder im Menü Werkzeuge auswählen. Sie können der Vorlage auch eine "
+"Tastenkombination zuweisen, um einen schnelleren Zugriff darauf zu haben.</"
+"p><p>Nachrichtenvorlagen unterstützen auch Platzhalter. Sie können einfach "
+"eingetippt oder über den Menüpunkt <i>Platzhalter einfügen</i> ausgewählt "
+"werden.</p><p>Es gibt vier Typen von Vorlagen: zum <i>Antworten</i>, "
+"<i>Allen antworten</i>, <i>Weiterleiten</i> und <i>Allgemein</i> für "
+"Vorlagen, die zu jeder Aktion passen. <i>Allgemein</i> Vorlagen können nicht "
+"mit einer Tastenkombination verknüpft werden.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3184,8 +3152,8 @@ msgstr "<a href=\"whatsthis:%1\">Wie funktioniert das?</a>"
 #, fuzzy
 msgid "Additional recipients of the message when forwarding"
 msgstr ""
-"Verschlüsselte Nachrichten beim Betrachten automatisch zu Entschlüsseln, sofern "
-"möglich"
+"Verschlüsselte Nachrichten beim Betrachten automatisch zu Entschlüsseln, "
+"sofern möglich"
 
 #: customtemplates.cpp:123
 msgid "Additional recipients who get a copy of the message when forwarding"
@@ -3193,15 +3161,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3267,8 +3235,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Eine Verteilerliste mit dem Namen <b>%1</b> existiert schon. Bitte wählen "
-"Sie einen anderen Namen.</qt>"
+"<qt>Eine Verteilerliste mit dem Namen <b>%1</b> existiert schon. Bitte "
+"wählen Sie einen anderen Namen.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3277,8 +3245,8 @@ msgstr "Bearbeiten mit:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "KMail kann nicht ermitteln, wann der gewählte Editor geschlossen wird. Um "
 "Datenverlust zu vermeiden wurde das Bearbeiten des Anhangs abgebrochen."
@@ -3540,6 +3508,11 @@ msgstr "Filter auswählen"
 msgid "Filters"
 msgstr "Filter"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Gesamten Text auswählen"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3571,8 +3544,8 @@ msgstr "&Filtervorgänge protokollieren"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Hier kann die Protokollierung von Filteraktivitäten ein- und ausgeschaltet "
 "werden. Natürlich werden dennoch Protokolle geschrieben, aber nur bei "
@@ -3592,10 +3565,11 @@ msgstr "Protokollierung der Filter&regeln"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Hiermit wird die Ausführlichkeit der Protokollmeldungen zu den Filterregeln "
 "gesteuert: bei aktivierter Option wird die Anwendung jeder einzelnen "
@@ -3620,10 +3594,10 @@ msgstr "unbegrenzt"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Durch die Sammlung der Protokolldaten wird zeitweise Arbeitsspeicher belegt. "
 "Hier kann die Maximalgröße dieses Speichers begrenzt werden: falls die Menge "
@@ -3638,7 +3612,7 @@ msgstr ""
 "Die Datei %1 kann nicht geschrieben werden:\n"
 "Die ausführliche Fehlerbeschreibung laut: \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail-Fehler"
@@ -3679,14 +3653,14 @@ msgstr "&Benutzeridentifikation:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Die Benutzeridentifikation dient zur Anmeldung am IMAP-Server. Dabei kann es "
 "sich um einen einfachen Benutzernamen oder die komplette E-Mail-Adresse des "
-"Benutzers handeln; die Anmeldeanforderung des eigenen Benutzerzugangs auf dem "
-"Server gibt darüber Auskunft."
+"Benutzers handeln; die Anmeldeanforderung des eigenen Benutzerzugangs auf "
+"dem Server gibt darüber Auskunft."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3737,11 +3711,11 @@ msgstr "Sie haben keine Lese-/Schreibrechte für Ihren Mülleimerordner."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Diese Information wurde noch nicht vom Server heruntergeladen, bitte verwenden "
-"Sie \"Nach E-Mail sehen\"."
+"Diese Information wurde noch nicht vom Server heruntergeladen, bitte "
+"verwenden Sie \"Nach E-Mail sehen\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3751,8 +3725,7 @@ msgstr "Fehler: Für diesen Ordner ist kein IMAP-Zugang festgelegt."
 msgid "Connecting to server %1, please wait..."
 msgstr "Verbindung zu Server %1 wird aufgebaut. Bitte warten ..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Fehler beim Verbinden mit Server %1"
@@ -3781,11 +3754,11 @@ msgstr "Rechte hinzufügen"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Möchten Sie ihre Zugriffsrechte für diesen Ordner wirklich löschen? Sie können "
-"danach nicht mehr auf den Ordner zugreifen."
+"Möchten Sie ihre Zugriffsrechte für diesen Ordner wirklich löschen? Sie "
+"können danach nicht mehr auf den Ordner zugreifen."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3816,7 +3789,7 @@ msgstr "Nutzung:"
 msgid "Select Folder"
 msgstr "Ordner auswählen"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale Ordner"
@@ -3840,9 +3813,9 @@ msgstr "Kurzbefehl für Ordner auswählen"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Um einen Tastaturkurzbefehl für einen Ordner festzulegen, müssen Sie den "
 "Ordner auswählen, auf den Knopf unten klicken und die gewünschte(n) Taste(n) "
@@ -3867,14 +3840,23 @@ msgstr "&Abbrechen"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Der Ordner, den Sie gerade gelöscht haben, gehörte zu dem Zugang <b>%1</b>"
-". Dieser Zugang hat Nachrichten in diesem Ordner abgelegt. Nachrichten von "
+"<qt>Der Ordner, den Sie gerade gelöscht haben, gehörte zu dem Zugang <b>%1</"
+"b>. Dieser Zugang hat Nachrichten in diesem Ordner abgelegt. Nachrichten von "
 "diesem Zugang werden nun im Haupt-Posteingang abgelegt.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Gesamt: %2<br>Ungelesen: %3<br>Größe: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Kontingent: %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -3997,76 +3979,18 @@ msgstr "Spam-Status:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>N"
-"<br>a"
-"<br>c"
-"<br>h"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br>-"
+"<br>N<br>a<br>c<br>h<br>r<br>i<br>c<br>h<br>t</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>K"
-"<br>e"
-"<br>i"
-"<br>n"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>N"
-"<br>a"
-"<br>c"
-"<br>h"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>K<br>e<br>i<br>n<br>e<br> <br>H<br>T<br>M<br>L<br>-"
+"<br>N<br>a<br>c<br>h<br>r<br>i<br>c<br>h<br>t</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4078,19 +4002,14 @@ msgstr "I&hr Name:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Ihr Name</h3> "
-"<p>Dieses Feld sollte Ihren Namen in der Form enthalten, die im Vorspannfeld "
-"bei versendeten Nachrichten erscheinen soll.</p> "
-"<p>Falls dieses Feld leer bleibt, erscheint in der E-Mail nur die Adresse aber "
-"nicht der Name.</p></qt> "
+"<qt> <h3>Ihr Name</h3> <p>Dieses Feld sollte Ihren Namen in der Form "
+"enthalten, die im Vorspannfeld bei versendeten Nachrichten erscheinen soll.</"
+"p> <p>Falls dieses Feld leer bleibt, erscheint in der E-Mail nur die Adresse "
+"aber nicht der Name.</p></qt> "
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4098,17 +4017,13 @@ msgstr "&Organisation:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organisation</h3> "
-"<p>Das Feld sollte den Namen Ihrer Organisation/Firma enthalten, falls dieser "
-"Name im Nachrichtenvorspannfeld erscheinen soll.</p> "
-"<p>Dieses Feld wird meistens leer gelassen.</p></qt>"
+"<qt> <h3>Organisation</h3> <p>Das Feld sollte den Namen Ihrer Organisation/"
+"Firma enthalten, falls dieser Name im Nachrichtenvorspannfeld erscheinen "
+"soll.</p> <p>Dieses Feld wird meistens leer gelassen.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4117,20 +4032,16 @@ msgstr "&E-Mail-Adresse:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>E-Mailadresse</h3> "
-"<p>Dieses Feld sollte die vollständige E-Mail-Adresse enthalten.</p> "
-"<p>Falls dieses Feld leer bleibt oder falsch ausgefüllt ist, können dei "
-"Empfänger auf E-Mails von Ihnen nicht antworten.</p></qt>"
+"<qt> <h3>E-Mailadresse</h3> <p>Dieses Feld sollte die vollständige E-Mail-"
+"Adresse enthalten.</p> <p>Falls dieses Feld leer bleibt oder falsch "
+"ausgefüllt ist, können dei Empfänger auf E-Mails von Ihnen nicht antworten.</"
+"p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4139,21 +4050,12 @@ msgstr "&E-Mail-Adresse:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4178,22 +4080,19 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt> "
-"<p>Der hier ausgewählte OpenPGP-Schlüssel wird zum digitalen Unterschreiben von "
-"Nachrichten verwendet. Die Verwendung eines GnuPG-Schlüssels ist ebenfalls "
-"möglich.</p>"
-"<p>Dieses Feld kann auch leer gelassen werden. In diesem Fall kann KMail "
-"Nachrichten nicht kryptographisch signieren. Die normale Funktionalität wird "
-"dadurch in keiner Weise eingeschränkt.</p> "
-"<p>Weitere Informationen zu Schlüsseln finden Sie auf <a>"
-"http://www.gnupg.org</a></p>.</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt> <p>Der hier ausgewählte OpenPGP-Schlüssel wird zum digitalen "
+"Unterschreiben von Nachrichten verwendet. Die Verwendung eines GnuPG-"
+"Schlüssels ist ebenfalls möglich.</p><p>Dieses Feld kann auch leer gelassen "
+"werden. In diesem Fall kann KMail Nachrichten nicht kryptographisch "
+"signieren. Die normale Funktionalität wird dadurch in keiner Weise "
+"eingeschränkt.</p> <p>Weitere Informationen zu Schlüsseln finden Sie auf "
+"<a>http://www.gnupg.org</a></p>.</qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4205,8 +4104,8 @@ msgstr "Eigener OpenPGP-Schlüssel zur Verschlüsselung"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Dieser PGP-Schlüssel wird zur Verschlüsselung von Nachrichten an Sie selbst "
 "verwendet und für die Funktionalität \"Eigenen öffentlichen Schlüssel "
@@ -4214,25 +4113,21 @@ msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>Der hier ausgewählte OpenPGP-Schlüssel wird zur Verschlüsselung von "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>Der hier ausgewählte OpenPGP-Schlüssel wird zur Verschlüsselung von "
 "Nachrichten an Sie selbst verwendet und für die Funktionalität \"Eigenen "
-"öffentlichen Schlüssel anhängen\" im E-Mail-Editor. Die Verwendung von "
-"GnuPG-Schlüssels ist ebenfalls möglich.</p>"
-"<p>Dieses Feld kann auch leer gelassen werden. In diesem Fall kann KMail an Sie "
-"gehende Kopien ausgehender Nachrichten nicht mit OpenPGP verschlüsseln. Die "
-"normale Funktionalität wird dadurch in keiner Weise eingeschränkt.</p> "
-"<p>Weitere Informationen zu Schlüsseln finden Sie auf <a>"
-"http://www.gnupg.org</a></p>.</qt>"
+"öffentlichen Schlüssel anhängen\" im E-Mail-Editor. Die Verwendung von GnuPG-"
+"Schlüssels ist ebenfalls möglich.</p><p>Dieses Feld kann auch leer gelassen "
+"werden. In diesem Fall kann KMail an Sie gehende Kopien ausgehender "
+"Nachrichten nicht mit OpenPGP verschlüsseln. Die normale Funktionalität wird "
+"dadurch in keiner Weise eingeschränkt.</p> <p>Weitere Informationen zu "
+"Schlüsseln finden Sie auf <a>http://www.gnupg.org</a></p>.</qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4252,18 +4147,16 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Das ausgewählte S/MIME-Zertifikat (X.509) wird zum digitalen Unterschreiben "
-"von Nachrichten verwendet.</p> "
-"<p>Sie können dieses Feld leer lassen, aber KMail ist dann nicht in der Lage "
-"E-Mails mit S/MIME digital zu unterschreiben. Die normale Funktionalität wird "
-"dadurch nicht beeinträchtigt.</p></qt>"
+"<qt> <p>Das ausgewählte S/MIME-Zertifikat (X.509) wird zum digitalen "
+"Unterschreiben von Nachrichten verwendet.</p> <p>Sie können dieses Feld leer "
+"lassen, aber KMail ist dann nicht in der Lage E-Mails mit S/MIME digital zu "
+"unterschreiben. Die normale Funktionalität wird dadurch nicht beeinträchtigt."
+"</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4275,29 +4168,27 @@ msgstr "Eigenes S/MIME-Verschlüsselungszertifikat"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Wählen Sie das S/MIME-Zertifikat, das zum Verschlüsseln von Nachrichten an Sie "
-"und für die Funktion \"Eigenes Zertifikat anhängen\" im E-Mail-Editor verwendet "
-"wird."
+"Wählen Sie das S/MIME-Zertifikat, das zum Verschlüsseln von Nachrichten an "
+"Sie und für die Funktion \"Eigenes Zertifikat anhängen\" im E-Mail-Editor "
+"verwendet wird."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Das hier ausgewählte S/MIME-Zertifikat wird zur Verschlüsselung von "
+"<qt> <p>Das hier ausgewählte S/MIME-Zertifikat wird zur Verschlüsselung von "
 "Nachrichten an Sie selbst und für die Funktionalität \"Eigenes Zertifikat "
-"anhängen\" im Mail-Editor verwendet.</p>"
-"<p>Dieses Feld kann auch leer gelassen werden. In diesem Fall kann KMail an Sie "
-"gehende Kopien ausgehender Nachrichten nicht mit S/MIME verschlüsseln. Die "
-"normale Funktionalität wird dadurch in keiner Weise eingeschränkt.</p>.</qt>"
+"anhängen\" im Mail-Editor verwendet.</p><p>Dieses Feld kann auch leer "
+"gelassen werden. In diesem Fall kann KMail an Sie gehende Kopien ausgehender "
+"Nachrichten nicht mit S/MIME verschlüsseln. Die normale Funktionalität wird "
+"dadurch in keiner Weise eingeschränkt.</p>.</qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4317,24 +4208,20 @@ msgstr "&Antwortadresse:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Antwortadressen</h3> "
-"<p>Hiermit wird das Vorspannfeld <tt>Antwort an:</tt> mit einer vom Feld <tt>"
-"Von:</tt> abweichenden Adresse ausgefüllt.</p> "
-"<p>Das kann nützlich sein, falls eine Gruppe von Leuten in einem ähnlichen "
-"Aufgabenfeld arbeiten. In diesem Fall kann es wünschenswert sein, dass Ihre "
-"E-Mails die eigene Adresse im Feld <tt>Von:</tt> haben, die Antworten aber an "
-"eine Gruppenadresse gehen.</p> "
-"<p>Lassen Sie dieses Feld im Zweifelsfall leer.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Antwortadressen</h3> <p>Hiermit wird das Vorspannfeld <tt>Antwort "
+"an:</tt> mit einer vom Feld <tt>Von:</tt> abweichenden Adresse ausgefüllt.</"
+"p> <p>Das kann nützlich sein, falls eine Gruppe von Leuten in einem "
+"ähnlichen Aufgabenfeld arbeiten. In diesem Fall kann es wünschenswert sein, "
+"dass Ihre E-Mails die eigene Adresse im Feld <tt>Von:</tt> haben, die "
+"Antworten aber an eine Gruppenadresse gehen.</p> <p>Lassen Sie dieses Feld "
+"im Zweifelsfall leer.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4342,26 +4229,21 @@ msgstr "&Blindkopie-Adressen:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Blindkopie (BCC)-Adressen</h3> "
-"<p>Jede ausgehende Nachricht von dieser Identität wird zusätzlich an die hier "
-"eingetragenen Adressen verschickt. Diese Adressen sind für die anderen "
-"Empfänger nicht sichtbar.</p> "
-"<p>Dieses Feld wird üblicherweise dafür verwendet, um Kopien der eigenen "
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Blindkopie (BCC)-Adressen</h3> <p>Jede ausgehende Nachricht von "
+"dieser Identität wird zusätzlich an die hier eingetragenen Adressen "
+"verschickt. Diese Adressen sind für die anderen Empfänger nicht sichtbar.</"
+"p> <p>Dieses Feld wird üblicherweise dafür verwendet, um Kopien der eigenen "
 "Nachrichten an ein anderes eigenes Mail-Postfach zu verschicken.</p> "
-"<p>Wollen Sie mehr als eine Adresse angeben, trennen Sie die Liste der "
-"BCC-Empfänger durch Kommas.</p>"
-"<p>Im Zweifelsfalls lassen Sie dieses Feld frei.</p></qt>"
+"<p>Wollen Sie mehr als eine Adresse angeben, trennen Sie die Liste der BCC-"
+"Empfänger durch Kommas.</p><p>Im Zweifelsfalls lassen Sie dieses Feld frei.</"
+"p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4399,7 +4281,7 @@ msgstr "Si&gnatur"
 msgid "&Picture"
 msgstr "&Bild"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ungültige E-Mail-Adresse"
 
@@ -4418,13 +4300,13 @@ msgstr ""
 "Einer der eingestellten OpenPGP-Schlüssel zum Unterschreiben enthält keine "
 "Benutzerkennung, die mit der für diese Identität festgelegten E-Mail-Adresse "
 "übereinstimmt. (%1).\n"
-"Dies kann zu Warnungsmeldungen führen, wenn hierüber erstellte Signaturen beim "
-"Empfänger überprüft werden."
+"Dies kann zu Warnungsmeldungen führen, wenn hierüber erstellte Signaturen "
+"beim Empfänger überprüft werden."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Einer der eingestellten OpenPGP-Schlüssel zum Unterschreiben enthält keine "
 "Benutzerkennung, die mit der für diese Identität festgelegten E-Mail-Adresse "
@@ -4490,8 +4372,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Standard)"
 
@@ -4506,8 +4388,8 @@ msgstr "E-Mail-Adresse"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Sie müssen einen Benutzernamen und ein Passwort angeben, um auf dieses Postfach "
-"zugreifen zu können."
+"Sie müssen einen Benutzernamen und ein Passwort angeben, um auf dieses "
+"Postfach zugreifen zu können."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4540,16 +4422,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Die Konfiguration wurde automatisch umgestellt, aber Sie sollten dennoch die "
 "Einstellungen dieses Zugangs überprüfen."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Es ist nicht möglich, die Konfiguration automatisch umzustellen. Bitte "
 "überprüfen Sie daher die Einstellungen Ihres Zugangs."
@@ -4567,8 +4449,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Die Nachricht vom %1 von <i>%2</i> mit dem Betreff <i>%3</i> "
-"kann nicht zum Server hochgeladen werden."
+"Die Nachricht vom %1 von <i>%2</i> mit dem Betreff <i>%3</i> kann nicht zum "
+"Server hochgeladen werden."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4589,17 +4471,22 @@ msgstr "Der Ordner ist zu nahe an seinem Kontingent-Limit (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Für diesen Ordner haben Sie keine Schreibrechte. Bitten Sie bitte den Besitzer "
-"des Ordners, Patz zu schaffen."
+"Für diesen Ordner haben Sie keine Schreibrechte. Bitten Sie bitte den "
+"Besitzer des Ordners, Patz zu schaffen."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Fehler: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Die Verbindung zum Server %1 wurde unerwartet abgebrochen oder das Zeitlimit "
 "wurde überschritten. Die Verbindung wird später, sofern möglich, "
@@ -4754,20 +4641,20 @@ msgstr "Archive anzeigen"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Eines oder mehrere der gewählten OpenPGP-Schüssel oder S/MIME-Zertifikate sind "
-"nicht voll vertrauenswürdig."
+"Eines oder mehrere der gewählten OpenPGP-Schüssel oder S/MIME-Zertifikate "
+"sind nicht voll vertrauenswürdig."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Eines oder mehrere der gewählten OpenPGP-Schüssel oder S/MIME-Zertifikate sind "
-"nicht voll vertrauenswürdig."
+"Eines oder mehrere der gewählten OpenPGP-Schüssel oder S/MIME-Zertifikate "
+"sind nicht voll vertrauenswürdig."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4803,223 +4690,182 @@ msgstr "Nicht voll vertrauenswürdige Verschlüsselungsschlüssel"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>läuft in weniger als einem Tag ab.</p>\n"
-"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>läuft in weniger als %n Tagen ab.</p>"
+"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>läuft in weniger als einem Tag ab.</p>\n"
+"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>läuft in weniger als %n Tagen ab.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ihr OpenPGP-Schlüssel zum Verschlüsseln</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>läuft in weniger als einem Tag ab.</p>\n"
+"(KeyID 0x%2)</p><p>läuft in weniger als einem Tag ab.</p>\n"
 "<p>Ihr OpenPGP-Schlüssel zum Verschlüsseln</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>läuft in weniger als %n Tagen ab.</p>"
+"(KeyID 0x%2)</p><p>läuft in weniger als %n Tagen ab.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Der OpenPGP-Schlüssel für</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>läuft in weniger als einem Tag ab.</p>\n"
-"<p>Der OpenPGP-Signaturschlüssel für</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>läuft in weniger als %n Tagen ab.</p>"
+"<p>Der OpenPGP-Schlüssel für</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>läuft in weniger als einem Tag ab.</p>\n"
+"<p>Der OpenPGP-Signaturschlüssel für</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>läuft in weniger als %n Tagen ab.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center>"
-"<b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>des S/MIME-"
+"Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird in "
+"weniger als einem Tag ungültig.</p>\n"
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>des S/MIME-"
+"Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird in "
+"weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center>"
-"<b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center>"
-"<b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</"
+"b> (Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</"
+"b> (Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>des S/"
+"MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird "
+"in weniger als einem Tag ungültig.</p>\n"
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>des S/"
+"MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird "
+"in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ihr S/MIME-Signierungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
 "<p>Ihr S/MIME-Signierungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ihr S/MIME-Verschlüsselungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
 "<p>Ihr S/MIME-Verschlüsselungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5033,212 +4879,171 @@ msgstr "S/MIME-Zertifikat läuft bald ab"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>läuft in weniger als einem Tag ab.</p>\n"
-"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>läuft in weniger als %n Tagen ab.</p>"
+"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>läuft in weniger als einem Tag ab.</p>\n"
+"<p>Ihr OpenPGP-Signaturschlüssel</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>läuft in weniger als %n Tagen ab.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ihr OpenPGP-Schlüssel zum Verschlüsseln</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>läuft in weniger als einem Tag ab.</p>\n"
+"(KeyID 0x%2)</p><p>läuft in weniger als einem Tag ab.</p>\n"
 "<p>Ihr OpenPGP-Schlüssel zum Verschlüsseln</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>läuft in weniger als %n Tagen ab.</p>"
+"(KeyID 0x%2)</p><p>läuft in weniger als %n Tagen ab.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Der OpenPGP-Schlüssel für</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>läuft in weniger als einem Tag ab.</p>\n"
-"<p>Der OpenPGP-Signaturschlüssel für</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>läuft in weniger als %n Tagen ab.</p>"
+"<p>Der OpenPGP-Schlüssel für</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>läuft in weniger als einem Tag ab.</p>\n"
+"<p>Der OpenPGP-Signaturschlüssel für</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>läuft in weniger als %n Tagen ab.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center>"
-"<b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>Ihres zur "
+"Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>des S/MIME-"
+"Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird in "
+"weniger als einem Tag ungültig.</p>\n"
+"<p>Das Wurzelzertifikat</p><p align=center><b>%3</b></p> <p>des S/MIME-"
+"Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird in "
+"weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>"
-"%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Signierung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center>"
-"<b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>Ihres zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center>"
-"<b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</"
+"b> (Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>Ihres "
+"zur Verschlüsselung verwendeten S/MIME-Zertifikats</p><p align=center><b>%1</"
+"b> (Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> "
-"<p>des S/MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>des S/"
+"MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird "
+"in weniger als einem Tag ungültig.</p>\n"
+"<p>Das intermediäre CA-Zertifikat</p><p align=center><b>%3</b></p> <p>des S/"
+"MIME-Zertifikats</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>wird "
+"in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ihr S/MIME-Signierungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
 "<p>Ihr S/MIME-Signierungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ihr S/MIME-Verschlüsselungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
+"(Seriennummer %2)</p><p>wird in weniger als einem Tag ungültig.</p>\n"
 "<p>Ihr S/MIME-Verschlüsselungszertifikat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"(Seriennummer %2)</p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als einem Tag ungültig.</p>\n"
-"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>wird in weniger als %n Tagen ungültig.</p>"
+"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>wird in weniger als einem Tag ungültig.</p>\n"
+"<p>Das S/MIME-Zertifikat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>wird in weniger als %n Tagen ungültig.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5250,15 +5055,16 @@ msgstr "S/MIME-Zertifikat läuft bald ab"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Einer oder mehrere Ihrer OpenPGP-Verschlüssselungschlüssel oder "
-"S/MIME-Zertifikate kann nicht zur Verschlüsselung verwendet werden. Bitte "
-"ändern Sie die betroffenen Schlüssel bzw. Zertifikate für diese Identität im "
+"Einer oder mehrere Ihrer OpenPGP-Verschlüssselungschlüssel oder S/MIME-"
+"Zertifikate kann nicht zur Verschlüsselung verwendet werden. Bitte ändern "
+"Sie die betroffenen Schlüssel bzw. Zertifikate für diese Identität im "
 "Einrichtungsdialog im Abschnitt Identität.\n"
 "Falls Sie dennoch jetzt fortfahren, werden Sie bei Bedarf nach den zu "
 "verwendenden Schlüsseln gefragt."
@@ -5275,8 +5081,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Einer oder mehrere Ihrer OpenPGP-Verschlüssselungschlüssel oder "
-"S/MIME-Signierungszertifikate kann nicht zur Signierung verwendet werden. Bitte "
+"Einer oder mehrere Ihrer OpenPGP-Verschlüssselungschlüssel oder S/MIME-"
+"Signierungszertifikate kann nicht zur Signierung verwendet werden. Bitte "
 "ändern Sie die betroffenen Schlüssel bzw. Zertifikate für diese Identität im "
 "Einrichtungsdialog im Abschnitt Identität.\n"
 "Falls Sie dennoch jetzt fortfahren, werden Sie bei Bedarf nach den zu "
@@ -5290,38 +5096,40 @@ msgstr "Nicht verwendbare Signierungsschlüssel"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Die Auswertung der Verschlüsselungseinstellungen erfordert für zumindest einige "
-"Empfänger die Verschlüsselung mit OpenPGP.\n"
+"Die Auswertung der Verschlüsselungseinstellungen erfordert für zumindest "
+"einige Empfänger die Verschlüsselung mit OpenPGP.\n"
 "Sie haben aber für diese Identität bisher keinen gültigen vertrauenswürdigen "
 "OpenPGP-Schlüssel zur Verschlüsselung festgelegt.\n"
-"Sie können fortfahren, ohne die Nachricht an sich selbst zu verschlüsseln, sind "
-"dann aber später nicht mehr in der Lage, ihre eigenen Nachrichten zu lesen."
+"Sie können fortfahren, ohne die Nachricht an sich selbst zu verschlüsseln, "
+"sind dann aber später nicht mehr in der Lage, ihre eigenen Nachrichten zu "
+"lesen."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Die Auswertung der Verschlüsselungseinstellungen erfordert für zumindest einige "
-"Empfänger die Verschlüsselung mit S/MIME.\n"
-"Sie haben aber für diese Identität bisher kein gültiges S/MIME-Zertifikat zur "
-"Verschlüsselung festgelegt.\n"
-"Sie können fortfahren, ohne die Nachricht an sich selbst zu verschlüsseln, sind "
-"dann aber später nicht mehr in der Lage, ihre eigenen Nachrichten zu lesen."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Die Auswertung der Verschlüsselungseinstellungen erfordert für zumindest "
+"einige Empfänger die Verschlüsselung mit S/MIME.\n"
+"Sie haben aber für diese Identität bisher kein gültiges S/MIME-Zertifikat "
+"zur Verschlüsselung festgelegt.\n"
+"Sie können fortfahren, ohne die Nachricht an sich selbst zu verschlüsseln, "
+"sind dann aber später nicht mehr in der Lage, ihre eigenen Nachrichten zu "
+"lesen."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5336,15 +5144,15 @@ msgstr "Nicht mit OpenPGP signieren"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "Die Auswertung der Signierungseinstellungen erfordert für zumindest einige "
 "Empfänger die Signierung mit S/MIME.\n"
-"Sie haben aber für diese Identität bisher kein gültiges S/MIME-Zertifikat zur "
-"Signierung festgelegt."
+"Sie haben aber für diese Identität bisher kein gültiges S/MIME-Zertifikat "
+"zur Signierung festgelegt."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5356,8 +5164,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Sie haben keinen Signaturschlüssel, der den bevorzugten Signierungsmethoden des "
-"Empfängers entspricht.\n"
+"Sie haben keinen Signaturschlüssel, der den bevorzugten Signierungsmethoden "
+"des Empfängers entspricht.\n"
 "Soll diese Nachricht unsigniert versendet werden?"
 
 #: keyresolver.cpp:1335
@@ -5366,12 +5174,12 @@ msgstr "Signieren nicht möglich"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Sie haben bisher keinen Schlüssel zur Verschlüsselung an sich selbst gewählt. "
-"Sie sind nach der Verschlüsselung daher nicht in der Lage, die eigene Nachricht "
-"wieder zu entschlüsseln."
+"Sie haben bisher keinen Schlüssel zur Verschlüsselung an sich selbst "
+"gewählt. Sie sind nach der Verschlüsselung daher nicht in der Lage, die "
+"eigene Nachricht wieder zu entschlüsseln."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5387,13 +5195,13 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Sie haben keinen Verschlüsselungsschlüssel für den Empfänger dieser Nachricht "
-"ausgewählt, daher wird die Nachricht nicht verschlüsselt."
+"Sie haben keinen Verschlüsselungsschlüssel für den Empfänger dieser "
+"Nachricht ausgewählt, daher wird die Nachricht nicht verschlüsselt."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Sie haben keinen Verschlüsselungsschlüssel für irgendeinen Empfänger dieser "
 "Nachricht ausgewählt, daher wird die Nachricht nicht verschlüsselt."
@@ -5408,8 +5216,8 @@ msgid ""
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "Sie haben keinen Verschlüsselungsschlüssel für einen der Empfänger dieser "
-"Nachricht ausgewählt: diese Person wird nicht in derLage sein, diese Nachricht "
-"zu entschlüsseln."
+"Nachricht ausgewählt: diese Person wird nicht in derLage sein, diese "
+"Nachricht zu entschlüsseln."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5442,11 +5250,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Für \"%1\" wurde kein gültiger und vertrauenswürdiger Schlüssel gefunden.\n"
 "\n"
@@ -5495,10 +5303,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritischer Fehler: E-Mails können nicht abgeholt werden: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Fehler beim Hinzufügen der Nachricht:\n"
+msgid "Failed to add message:\n"
+msgstr "Fehler beim Hinzufügen der Nachricht:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5543,8 +5349,7 @@ msgstr "Nachricht %3 von %2 wird verschoben von %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Nachricht kann nicht aus Postfach <b>%1</b> gelöscht werden:"
-"<br>%2</qt>"
+"<qt>Nachricht kann nicht aus Postfach <b>%1</b> gelöscht werden:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5590,6 +5395,54 @@ msgstr "&Disconnected IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-Postfach"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Betreff der Nachricht setzen"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Kopie an \"Adresse\" senden"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Blindkopie (BCC) an \"Adresse\" senden"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "\"Vorspannfeld\" zu Nachricht hinzufügen"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Nachrichtentext aus \"Datei\" lesen"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Text der Nachricht festlegen"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+"Der E-Mail einen Anhang hinzufügen. Diese Funktion kann mehrfach ausgeführt "
+"werden"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Nur nach neuen Nachrichten schauen"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Nur Fenster für Nachrichtenerstellung öffnen"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Anzeige der angegebenen Nachrichtendatei"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Nachricht an \"Adresse\" senden und Datei anhängen, auf die die \"URL\" "
+"verweist"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mail"
@@ -5632,9 +5485,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail erstellt die für die IMAP-Terminplaner notwendigen Ordner als Unterordner "
-"von %1. Klicken Sie auf \"Abbrechen\", wenn Sie das nicht möchten. In diesem "
-"Fall wird der IMAP-Terminplaner deaktiviert"
+"KMail erstellt die für die IMAP-Terminplaner notwendigen Ordner als "
+"Unterordner von %1. Klicken Sie auf \"Abbrechen\", wenn Sie das nicht "
+"möchten. In diesem Fall wird der IMAP-Terminplaner deaktiviert"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5643,18 +5496,19 @@ msgstr "%1: kein Ordner gefunden. Er wird erstellt."
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
-"%1: Ordner %2 gefunden. Er wird als Hauptordner für den Terminplaner verwendet."
+"%1: Ordner %2 gefunden. Er wird als Hauptordner für den Terminplaner "
+"verwendet."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>Die folgenden Ordner wurden in %1 für den IMAP-Terminplaner gefunden. Daran "
-"müssen die folgenden Änderungen vorgenommen werden: %2 "
-"<br>Wenn Sie das nicht möchten, drücken Sie bitte auf \"Abbrechen\". In diesem "
-"Fall wird der IMAP-Terminplaner deaktiviert"
+"<qt>Die folgenden Ordner wurden in %1 für den IMAP-Terminplaner gefunden. "
+"Daran müssen die folgenden Änderungen vorgenommen werden: %2 <br>Wenn Sie "
+"das nicht möchten, drücken Sie bitte auf \"Abbrechen\". In diesem Fall wird "
+"der IMAP-Terminplaner deaktiviert"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5701,14 +5555,14 @@ msgstr "Die URL wurde in die Zwischenablage kopiert."
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
-"<qt>Die Datei <b>%1</b> existiert bereits."
-"<br>Möchten Sie die Datei ersetzen?</qt>"
+"<qt>Die Datei <b>%1</b> existiert bereits.<br>Möchten Sie die Datei ersetzen?"
+"</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Nachricht in Datei speichern"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Ersetzen"
 
@@ -5725,10 +5579,10 @@ msgstr ""
 #: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
-"Die Nachricht wurde gelöscht, während der Speichervorgang lief. Sie wurde nicht "
-"gespeichert."
+"Die Nachricht wurde gelöscht, während der Speichervorgang lief. Sie wurde "
+"nicht gespeichert."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5750,11 +5604,11 @@ msgstr ""
 "Diese Datei enthält mehrere Nachrichten. Es wird nur die erste Nachricht "
 "angezeigt."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5764,87 +5618,87 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Nachrichten werden gefiltert"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Nachricht %1 von %2 wird gefiltert."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Möglicherweise ist nicht genügend Platz auf dem Datenträger."
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "In diesen Ordner verschieben"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "In diesen Ordner kopieren"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Im Ordner %1 wurde ein beschädigter IMAP-Zwischenspeicher festgestellt. "
 "Kopieren der Nachrichten abgebrochen."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Nachrichten werden gelöscht"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Adresse wird aufgerufen ..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Wollen Sie <b>%1</b> wirklich ausführen?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Ausführen"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Es wurden keine Anhänge zum Speichern gefunden."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Anhänge speichern unter"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "Anhang.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "Anhang.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "Eine Datei mit dem Namen %1 existiert bereits. Soll die Datei überschrieben "
 "werden?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Die Datei existiert bereits"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Ü&berschreiben"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5852,19 +5706,19 @@ msgstr ""
 "Der Nachrichtenteil %1 ist verschlüsselt. Soll die Verschlüsselung beim "
 "Speichern beibehalten werden?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail Frage"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Verschlüsselung beibehalten"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Nicht verschlüsseln"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5872,11 +5726,11 @@ msgstr ""
 "Der Nachrichtenteil %1 ist signiert. Soll die Signierung beim Speichern "
 "beibehalten werden?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Signatur beibehalten"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5885,22 +5739,22 @@ msgstr ""
 "Die Datei %1 kann nicht geschrieben werden:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Die Datei %1 kann nicht geschrieben werden."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Es gibt keinen Adressbucheintrag zu dieser E-Mail-Adresse. Fügen Sie die "
-"Adresse zum Adressbuch hinzu, und tragen Sie dann mit Ihrem Instant-Messenger "
-"Client die Adressaten für Instant-Messages hinzu."
+"Adresse zum Adressbuch hinzu, und tragen Sie dann mit Ihrem Instant-"
+"Messenger Client die Adressaten für Instant-Messages hinzu."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5910,72 +5764,72 @@ msgstr ""
 "%1\n"
 "Es ist nicht möglich festzustellen, mit wem gechattet werden soll."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Das Chiasmus Hintergrundprogramm bietet die Funktion \"x-obtain-keys\" nicht "
 "an. Bitte melden Sie diesen Fehler."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Fehler im Chiasmus Hintergrundprogramm"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Unerwarteter Rückgabewert vom Chiasmus Hintergrundprogramm. Die Funktion "
-"\"x-obtain-keys\" hat keine Liste von Zeichenketten zurückgegeben. Bitte melden "
+"Unerwarteter Rückgabewert vom Chiasmus Hintergrundprogramm. Die Funktion \"x-"
+"obtain-keys\" hat keine Liste von Zeichenketten zurückgegeben. Bitte melden "
 "Sie diesen Fehler."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Es wurden keine Schlüssel gefunden. Bitte überprüfen Sie, ob in der "
-"Chiasmus-Konfiguration ein gültiger Pfad für die Schlüssel eingegeben wurde."
+"Es wurden keine Schlüssel gefunden. Bitte überprüfen Sie, ob in der Chiasmus-"
+"Konfiguration ein gültiger Pfad für die Schlüssel eingegeben wurde."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Auswahl der Schlüssel für die Entschlüsselung in Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Das Chiasmus Hintergrundprogramm bietet die Funktion \"x-decrypt\" nicht an. "
 "Bitte melden Sie diesen Fehler."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Die Funktion \"x-decrypt\" benötigt andere Parameter als erwartet. Bitte melden "
-"Sie diesen Fehler."
+"Die Funktion \"x-decrypt\" benötigt andere Parameter als erwartet. Bitte "
+"melden Sie diesen Fehler."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus Fehler beim Entschlüsseln"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Unerwarteter Rückgabewert vom Chiasmus Hintergrundprogramm. Die Funktion "
-"\"x-decrypt\" hat kein Bytefeld zurückgegeben. Bitte melden Sie diesen Fehler."
+"Unerwarteter Rückgabewert vom Chiasmus Hintergrundprogramm. Die Funktion \"x-"
+"decrypt\" hat kein Bytefeld zurückgegeben. Bitte melden Sie diesen Fehler."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5985,7 +5839,7 @@ msgstr ""
 "An: %2\n"
 "Betreff: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "E-Mail: %1"
@@ -6084,7 +5938,7 @@ msgstr "Größe"
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimieren"
 
@@ -6096,7 +5950,7 @@ msgstr "Verschlüsseln"
 msgid "Sign"
 msgstr "Signieren"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Name des Anhangs:"
 
@@ -6118,10 +5972,11 @@ msgstr "Hauptempfänger"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Die E-Mail-Adressen, die in dieses Feld eingetragen werden, erhalten eine "
-"Kopie der E-Mail.</qt>"
+"<qt>Die E-Mail-Adressen, die in dieses Feld eingetragen werden, erhalten "
+"eine Kopie der E-Mail.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6130,15 +5985,16 @@ msgstr "Zusätzliche Empfänger"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Die E-Mail-Adressen, die in dieses Feld eingetragen werden, erhalten eine "
-"Kopie der E-Mail. Technisch gesehen ist dies das Selbe, als wenn alle "
+"<qt>Die E-Mail-Adressen, die in dieses Feld eingetragen werden, erhalten "
+"eine Kopie der E-Mail. Technisch gesehen ist dies das Selbe, als wenn alle "
 "Adressaten im Feld <b>An:</b> stehen. Der Unterschied besteht darin, dass "
-"hiermit klargestellt wird, dass der Empfänger der Kopie (Carbon Copy, CC) nicht "
-"der Hauptempfänger ist, sondern diese E-Mail nur zur Kenntnisnahme erhält.</qt>"
+"hiermit klargestellt wird, dass der Empfänger der Kopie (Carbon Copy, CC) "
+"nicht der Hauptempfänger ist, sondern diese E-Mail nur zur Kenntnisnahme "
+"erhält.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6146,13 +6002,12 @@ msgstr "Versteckte Empfänger"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Im Grund das Selbe wie das Feld <b>Kopie an:</b> "
-"aber mit dem Unterschied, dass die anderen Empfänger nicht sehen können, wer "
-"eine Blindkopie erhält.</qt>"
+"<qt>Im Grund das Selbe wie das Feld <b>Kopie an:</b> aber mit dem "
+"Unterschied, dass die anderen Empfänger nicht sehen können, wer eine "
+"Blindkopie erhält.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6162,7 +6017,7 @@ msgstr "&E-Mail versenden"
 msgid "&Send Mail Via"
 msgstr "E-Mail versenden &mit"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "S&päter senden"
@@ -6227,8 +6082,7 @@ msgstr "Zi&tatzeichen entfernen"
 msgid "Cl&ean Spaces"
 msgstr "&Zwischenräume komprimieren"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Feste &Zeichenbreiten"
@@ -6369,31 +6223,31 @@ msgstr "&Nachrichtenverschlüsselungsformat"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Liste mit Gliederungspunkten (Scheibe)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Liste mit Gliederungspunkten (Kreis)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Liste mit Gliederungspunkten (Quadrat)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Geordnete Liste (Dezimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Geordnete Liste (Kleinbuchstaben)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Geordnete Liste (Großbuchstaben)"
 
@@ -6498,63 +6352,63 @@ msgstr "Editor schließen"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Die erstellte Nachricht scheint sich auf eine angehängte Datei zu beziehen, Sie "
-"haben aber nichts angehängt.\n"
+"Die erstellte Nachricht scheint sich auf eine angehängte Datei zu beziehen, "
+"Sie haben aber nichts angehängt.\n"
 "Wollen Sie eine Datei an Ihre Nachricht anhängen?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Erinnerungsfunktion für Dateianhänge"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Ohne Änderung &senden"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>KMail kann den Anhang (%1) nicht finden.</p> "
-"<p>Sie müssen den vollständigen Pfad für den Dateianhang angeben.</p></qt>"
+"<qt> <p>KMail kann den Anhang (%1) nicht finden.</p> <p>Sie müssen den "
+"vollständigen Pfad für den Dateianhang angeben.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Eine Systemverwalter-Richtlinie verhindert Anhänge größer als %1 MB.</p>"
+"<qt><p>Eine Systemverwalter-Richtlinie verhindert Anhänge größer als %1 MB.</"
+"p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Datei anhängen"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Anhän&gen"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Datei einfügen"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Datei einfügen"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt> "
-"<p>Beim Exportieren des Schlüssels ist ein Fehler aufgetreten:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt> <p>Beim Exportieren des Schlüssels ist ein Fehler aufgetreten:</p><p><b>"
+"%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6593,98 +6447,109 @@ msgid ""
 "View"
 msgstr "Anzeigen"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Bearbeiten ..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Bearbeiten mit ..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Speichern &unter ..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Eigenschaften"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Anhang hinzufügen ..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Die Datei kann nicht komprimiert werden."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"Die komprimierte Datei ist größer als das Original. Soll das Original wirklich "
-"komprimiert werden?"
+"Die komprimierte Datei ist größer als das Original. Soll das Original "
+"wirklich komprimiert werden?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Nicht komprimieren"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Die Datei kann nicht entpackt werden."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Anhang speichern unter"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Als Text hinzufügen"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Als Anhang hinzufügen"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
-"Bitte wählen Sie aus, ob Sie den Dateiinhalt in den Nachrichtentext einfügen, "
-"oder die Datei als Anhang hinzufügen möchten."
+"Bitte wählen Sie aus, ob Sie den Dateiinhalt in den Nachrichtentext "
+"einfügen, oder die Datei als Anhang hinzufügen möchten."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Als Text oder Anhang einfügen?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Sie haben angegeben, dass Nachrichten verschlüsselt an sie selbst verschickt "
-"werden, aber die gerade ausgewählte Identität legt keinen (OpenPGP oder S/MIME) "
-"Schlüssel hierfür fest.</p> "
-"<p>Bitte legen Sie den Schlüssel für diese Identität fest.</p></qt>"
+"<qt><p>Sie haben angegeben, dass Nachrichten verschlüsselt an sie selbst "
+"verschickt werden, aber die gerade ausgewählte Identität legt keinen "
+"(OpenPGP oder S/MIME) Schlüssel hierfür fest.</p> <p>Bitte legen Sie den "
+"Schlüssel für diese Identität fest.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Verschlüsselungsschlüssel nicht definiert"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Damit diese Nachricht signiert werden kann, muss zuerst ein OpenPGP- oder "
-"S/MIME-Schlüssel dafür festgelegt werden.</p>"
-"<p>Legen Sie bitte den für diese Identität verwendeten Schlüssel fest.</p></qt>"
+"<qt> <p>Damit diese Nachricht signiert werden kann, muss zuerst ein OpenPGP- "
+"oder S/MIME-Schlüssel dafür festgelegt werden.</p><p>Legen Sie bitte den für "
+"diese Identität verwendeten Schlüssel fest.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Signierungsschlüssel nicht definiert"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6692,206 +6557,203 @@ msgstr ""
 "KMail ist momentan im Offline-Modus. Ihre Nachrichten werden im Postausgang "
 "abgelegt bis Sie wieder online gehen."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Sie müssen eine E-Mail-Adresse im Feld Von: angeben. Außerdem sollten Sie für "
-"jede Identität Ihre E-Mail-Adresse festlegen, damit Sie diese nicht für jede "
-"Nachricht angeben müssen."
+"Sie müssen eine E-Mail-Adresse im Feld Von: angeben. Außerdem sollten Sie "
+"für jede Identität Ihre E-Mail-Adresse festlegen, damit Sie diese nicht für "
+"jede Nachricht angeben müssen."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Sie müssen zumindest einen Empfänger im Feld \"An:\" oder unter \"CC:\" oder "
 "\"BCC:\" angeben."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 "Sie haben keinen Empfänger angegeben. Soll die Nachricht trotzdem versendet "
 "werden?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Kein Empfänger angegeben"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 "Sie haben keinen Betreff angegeben. Soll die Nachricht trotzdem versendet "
 "werden?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Kein Betreff angegeben"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Ohne Änderung &senden"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Betreff angeben"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Formatierung &behalten, nicht signieren/verschlüsseln"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Formatierungen &beibehalten, nicht verschlüsseln"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Formatierungen &beibehalten, nicht signieren"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Signieren/Verschlüsseln (Formatierung entfernen)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Verschlüsseln (Formatierung entfernen)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Signieren (Formatierung entfernen)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Die Inline-Signierung/Verschlüsselung von HTML-Nachrichten ist nicht "
-"möglich.</p> "
-"<p>Möchten Sie die Formatierungen entfernen?</p></qt>"
+"<qt> <p>Die Inline-Signierung/Verschlüsselung von HTML-Nachrichten ist nicht "
+"möglich.</p> <p>Möchten Sie die Formatierungen entfernen?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Nachricht signieren/verschlüsseln?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 "Der eingestellte Ordner für Entwürfe oder Vorlagen für die Identität \"%1\" "
-"existiert nicht (mehr). Stattdessen wird der Standardordner für Entwürfe oder "
-"Vorlagen verwendet."
+"existiert nicht (mehr). Stattdessen wird der Standardordner für Entwürfe "
+"oder Vorlagen verwendet."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 "Bitte erstellen Sie einen Zugang für den Versand, und versuchen Sie es dann "
 "erneut."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Nachrichten werden versendet ..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Bestätigung senden"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Jetzt senden"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Keine Empfänger"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Zusätzliche Empfänger"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Rechtschreibprüfung: an"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Rechtschreibprüfung: aus"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Rechtschreibprüfung abgebrochen."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Rechtschreibprüfung angehalten."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Rechtschreibprüfung abgeschlossen."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Rechtschreibprüfung"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
-"Bitte konfigurieren Sie zuerst ein Verschlüsselungshintergrundprogramm für die "
-"Chiasmus-Verschlüsselung.\n"
+"Bitte konfigurieren Sie zuerst ein Verschlüsselungshintergrundprogramm für "
+"die Chiasmus-Verschlüsselung.\n"
 "Die entsprechende Einstellung befindet sich im Reiter \"Sicherheit\" -> "
 "\"Krypto-Module\"."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Offenbar wurde libkleopatra ohne Chiasmus-Untertützung kompiliert. Sie sollten "
-"libkleopatra mit der Option --enable-chiasmus neu kompilieren."
+"Offenbar wurde libkleopatra ohne Chiasmus-Untertützung kompiliert. Sie "
+"sollten libkleopatra mit der Option --enable-chiasmus neu kompilieren."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Kein Hintergrundgrogramm für Chiasmus eingerichtet"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Keine Chiasmus-Schlüssel gefunden"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Auswahl der Schlüssel für die Verschlüsselung mit Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Nachricht wird signiert"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Nachricht wird nicht signiert"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Nachricht wird verschlüsselt"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Nachricht wird nicht verschlüsselt"
 
@@ -6941,8 +6803,8 @@ msgstr "Rechtschreibprüfung - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/ASpell kann nicht gestartet werden. Bitte vergewissern Sie sich, dass "
 "ISpell oder ASpell richtig eingerichtet ist und sich in Ihrem PATH befindet."
@@ -6979,13 +6841,11 @@ msgstr "<qt>Zu viele Filteraktionen in Filterregel <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Unbekannter Filterbefehl <b>%1</b>"
-"<br> in Filterregel <b>%2</b>"
-"<br>Wird ignoriert.</qt>"
+"<qt>Unbekannter Filterbefehl <b>%1</b><br> in Filterregel <b>%2</b><br>Wird "
+"ignoriert.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7205,169 +7065,141 @@ msgstr "Einen Klang abspielen"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dies ist die Liste der eingerichteten Filter. Sie werden von oben nach unten "
-"abgearbeitet.</p>"
-"<p>Um einen Filter zu ändern, klicken Sie darauf und benutzen Sie die auf der "
-"rechten Seite des Dialogs angeordneten Knöpfe.</p></qt>"
+"<qt><p>Dies ist die Liste der eingerichteten Filter. Sie werden von oben "
+"nach unten abgearbeitet.</p><p>Um einen Filter zu ändern, klicken Sie darauf "
+"und benutzen Sie die auf der rechten Seite des Dialogs angeordneten Knöpfe.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klicken Sie auf diesen Knopf, um einen neuen Filter anzulegen.</p> "
-"<p>Er wird vor dem gerade markierten Filter eingefügt. Sie können dies später "
-"jederzeit ändern.</p> "
-"<p>Wenn Sie diesen Knopf aus Versehen gedrückt haben, können Sie den erzeugten "
-"Filter durch einen Klick auf den Knopf <em>Löschen</em> wieder entfernen.</p>"
-"</qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Klicken Sie auf diesen Knopf, um einen neuen Filter anzulegen.</p> "
+"<p>Er wird vor dem gerade markierten Filter eingefügt. Sie können dies "
+"später jederzeit ändern.</p> <p>Wenn Sie diesen Knopf aus Versehen gedrückt "
+"haben, können Sie den erzeugten Filter durch einen Klick auf den Knopf "
+"<em>Löschen</em> wieder entfernen.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicken Sie auf diesen Knopf, um einen Filter zu kopieren.</p> "
+"<qt><p>Klicken Sie auf diesen Knopf, um einen Filter zu kopieren.</p> "
 "<p>Wenn Sie diesen Knopf aus Versehen gedrückt haben, können Sie den Vorgang "
-"durch einen Klick auf den Knopf <em>Löschen</em> wieder rückgängig machen.</p>"
-"</qt>"
+"durch einen Klick auf den Knopf <em>Löschen</em> wieder rückgängig machen.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicken Sie diesen Knopf, um den gerade markierten Filter aus der Liste zu "
-"<em>entfernen</em>.</p> "
-"<p>Haben Sie einen Filter gelöscht, können Sie ihn nicht wiederherstellen. Aber "
-"wenn Sie den Dialog mit <em>Abbrechen</em> beenden, werden alle Änderungen "
-"verworfen.</p></qt>"
+"<qt><p>Klicken Sie diesen Knopf, um den gerade markierten Filter aus der "
+"Liste zu <em>entfernen</em>.</p> <p>Haben Sie einen Filter gelöscht, können "
+"Sie ihn nicht wiederherstellen. Aber wenn Sie den Dialog mit <em>Abbrechen</"
+"em> beenden, werden alle Änderungen verworfen.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der Liste nach "
-"<em>ganz oben</em> zu schieben.</p> "
-"<p>Hierdurch können Sie festlegen, in welcher Reihenfolge die Filter auf "
-"Nachrichten angewendet werden: Der oberste Filter wird zuerst angewendet.</p>"
-"</qt>"
+"<qt><p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der "
+"Liste nach <em>ganz oben</em> zu schieben.</p> <p>Hierdurch können Sie "
+"festlegen, in welcher Reihenfolge die Filter auf Nachrichten angewendet "
+"werden: Der oberste Filter wird zuerst angewendet.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der Liste um "
-"eine Position nach <em>oben</em> zu schieben.</p> "
-"<p>Hierdurch können Sie festlegen, in welcher Reihenfolge die Filter auf "
-"Nachrichten angewendet werden: Der oberste Filter wird zuerst angewendet.</p>"
-"<p>Wenn Sie diesen Knopf aus Versehen gedrückt haben, können Sie den Filter "
-"durch Klicken auf den Knopf <em>Abwärts</em> wieder nach unten verschieben.</p>"
-"</qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der "
+"Liste um eine Position nach <em>oben</em> zu schieben.</p> <p>Hierdurch "
+"können Sie festlegen, in welcher Reihenfolge die Filter auf Nachrichten "
+"angewendet werden: Der oberste Filter wird zuerst angewendet.</p><p>Wenn Sie "
+"diesen Knopf aus Versehen gedrückt haben, können Sie den Filter durch "
+"Klicken auf den Knopf <em>Abwärts</em> wieder nach unten verschieben.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der Liste um "
-"eine Position nach <em>unten</em> zu schieben.</p> "
-"<p>Hierdurch können Sie festlegen, in welcher Reihenfolge die Filter auf "
-"Nachrichten angewendet werden: Der oberste Filter wird zuerst angewendet.</p>"
-"<p>Wenn Sie diesen Knopf aus Versehen gedrückt haben, können Sie den Filter "
-"durch Klicken auf den Knopf <em>Aufwärts</em> wieder nach oben verschieben.</p>"
-"</qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der "
+"Liste um eine Position nach <em>unten</em> zu schieben.</p> <p>Hierdurch "
+"können Sie festlegen, in welcher Reihenfolge die Filter auf Nachrichten "
+"angewendet werden: Der oberste Filter wird zuerst angewendet.</p><p>Wenn Sie "
+"diesen Knopf aus Versehen gedrückt haben, können Sie den Filter durch "
+"Klicken auf den Knopf <em>Aufwärts</em> wieder nach oben verschieben.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der Liste um "
-"eine Position nach <em>ganz unten</em> zu schieben.</p> "
+"<qt><p>Klicken Sie diesen Knopf, um den gerade markierten Filter in der "
+"Liste um eine Position nach <em>ganz unten</em> zu schieben.</p> "
 "<p>Hierdurch können Sie festlegen, in welcher Reihenfolge die Filter auf "
-"Nachrichten angewendet werden: Der oberste Filter wird zuerst angewendet.</p>"
-"</qt>"
+"Nachrichten angewendet werden: Der oberste Filter wird zuerst angewendet.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicken Sie diesen Knopf, um den gerade markierten Filter umzubenennen.</p>"
-"<p>Filter werden automatisch benannt, solange sie mit \"&lt;\" beginnen.</p>"
-"<p>Wenn Sie einen Filter aus Versehen umbenannt haben und die automatische "
-"Benennung zurück haben wollen, klicken Sie diesen Knopf, wählen Sie <em>"
-"Löschen</em> und im daraufhin erscheinenden Dialog <em>OK</em>.</p></qt>"
+"<qt><p>Klicken Sie diesen Knopf, um den gerade markierten Filter "
+"umzubenennen.</p><p>Filter werden automatisch benannt, solange sie mit \"&lt;"
+"\" beginnen.</p><p>Wenn Sie einen Filter aus Versehen umbenannt haben und "
+"die automatische Benennung zurück haben wollen, klicken Sie diesen Knopf, "
+"wählen Sie <em>Löschen</em> und im daraufhin erscheinenden Dialog <em>OK</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wenn Sie dieses Ankreuzfeld markieren, wird die Anzeige eines "
-"Bestätigungsdialoges erzwungen.</p>"
-"<p>Diese Einstellung ist nützlich, wenn Sie ein Regelwerk definiert haben, das "
-"Nachrichten zum späteren Herunterladen markiert. Ohne die Möglichkeit den "
-"Dialog zu erzwingen, würden diese Nachrichten niemals heruntergeladen, es sei "
-"denn, andere große Nachrichten warten auf dem Server oder das Regelwerk wird "
-"geändert und damit die Nachrichten anders markiert.</p></qt>"
+"<qt><p>Wenn Sie dieses Ankreuzfeld markieren, wird die Anzeige eines "
+"Bestätigungsdialoges erzwungen.</p><p>Diese Einstellung ist nützlich, wenn "
+"Sie ein Regelwerk definiert haben, das Nachrichten zum späteren "
+"Herunterladen markiert. Ohne die Möglichkeit den Dialog zu erzwingen, würden "
+"diese Nachrichten niemals heruntergeladen, es sei denn, andere große "
+"Nachrichten warten auf dem Server oder das Regelwerk wird geändert und damit "
+"die Nachrichten anders markiert.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7377,6 +7209,16 @@ msgstr "POP3-Filterregeln"
 msgid "Filter Rules"
 msgstr "Filterregeln"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importieren"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importieren"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Vorhandene Filter"
@@ -7400,8 +7242,8 @@ msgstr "Globale Einstellungen"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"Für das \"&spätere Herunterladen\" markierte Nachrichten im Bestätigungsdialog "
-"immer anzeigen"
+"Für das \"&spätere Herunterladen\" markierte Nachrichten im "
+"Bestätigungsdialog immer anzeigen"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7459,6 +7301,11 @@ msgstr "Diesen Filter zur Werkzeugleiste hinzufügen"
 msgid "Icon for this filter:"
 msgstr "Symbol für diesen Filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "An"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Aufwärts"
@@ -7467,16 +7314,29 @@ msgstr "Aufwärts"
 msgid "Down"
 msgstr "Abwärts"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Umbenennen ..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Neu"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Ko&pieren nach"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Gelöscht"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7485,20 +7345,20 @@ msgstr "Kurzbefehl für Ordner auswählen"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Mindestens ein Filter bezieht sich auf einen Online-IMAP-Zugang. Solche Filter "
-"werden nur angewendet, wenn manuell gefiltert wird und wenn neue Nachrichten im "
-"IMAP-Zugang ankommen."
+"Mindestens ein Filter bezieht sich auf einen Online-IMAP-Zugang. Solche "
+"Filter werden nur angewendet, wenn manuell gefiltert wird und wenn neue "
+"Nachrichten im IMAP-Zugang ankommen."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Folgende Filter sind ungültig und können daher nicht gespeichert werden (d. h.: "
-"sie enthalten keine Aktion oder keine Suchregeln)."
+"Folgende Filter sind ungültig und können daher nicht gespeichert werden (d. "
+"h.: sie enthalten keine Aktion oder keine Suchregeln)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7571,29 +7431,25 @@ msgstr "Problembeseitigung im IMAP-Zwischenspeicher"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Problembeseitigung im IMAP-Zwischenspeicher.</b></p>"
-"<p>Falls Probleme beim Abgleichen eines IMAP-Ordners auftreten, sollten Sie "
-"zuerst die Indexdatei neu aufbauen. Das dauert einige Zeit, verursacht aber "
-"keine weiteren Probleme.</p>"
-"<p>Falls das nicht hilft, sollten Sie den IMAP-Zwischenspeicher neu aufbauen. "
-"Dadurch gehen alle lokalen Änderungen in diesem Ordner und allen Unterordnern "
-"verloren.</p>"
+"<p><b>Problembeseitigung im IMAP-Zwischenspeicher.</b></p><p>Falls Probleme "
+"beim Abgleichen eines IMAP-Ordners auftreten, sollten Sie zuerst die "
+"Indexdatei neu aufbauen. Das dauert einige Zeit, verursacht aber keine "
+"weiteren Probleme.</p><p>Falls das nicht hilft, sollten Sie den IMAP-"
+"Zwischenspeicher neu aufbauen. Dadurch gehen alle lokalen Änderungen in "
+"diesem Ordner und allen Unterordnern verloren.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7630,11 +7486,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"Der UID-Zwischenspeicher für Ordner %1 kann nicht geschrieben werden. Es liegt "
-"möglicherweise ein Problem mit den Dateiberechtigungen vor."
+"Der UID-Zwischenspeicher für Ordner %1 kann nicht geschrieben werden. Es "
+"liegt möglicherweise ein Problem mit den Dateiberechtigungen vor."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7673,12 +7529,12 @@ msgstr "Die Indexdatei dieses Ordners wurde neu aufgebaut."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Der Ordner %1 befindet sich nicht im Ausgangszustand (der Zustand war %2). Soll "
-"der Ordner in den Ausgangszustand zurückversetzt und der Abgleich dennoch "
-"durchgeführt werden?"
+"Der Ordner %1 befindet sich nicht im Ausgangszustand (der Zustand war %2). "
+"Soll der Ordner in den Ausgangszustand zurückversetzt und der Abgleich "
+"dennoch durchgeführt werden?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7805,15 +7661,11 @@ msgstr "Unterordner werden auf dem Server erstellt"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>E-Mails im Ordner <b>%1</b> wurden auf dem Server gelöscht. Sollen Sie auch "
-"lokal gelöscht werden? "
-"<br>UIDs: %2</p></qt>"
+"<qt><p>E-Mails im Ordner <b>%1</b> wurden auf dem Server gelöscht. Sollen "
+"Sie auch lokal gelöscht werden? <br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7835,13 +7687,11 @@ msgstr "Ordner für den Namensraum %1 werden heruntergeladen"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Anscheinend wurde der Ordner <b>%1</b> gelöscht. Soll er auf dem Server "
-"ebenfalls gelöscht werden?</p></qt>"
+"<qt> <p>Anscheinend wurde der Ordner <b>%1</b> gelöscht. Soll er auf dem "
+"Server ebenfalls gelöscht werden?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7849,21 +7699,21 @@ msgstr "Abgebrochen"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"Der IMAP-Server %1 unterstützt keine IMAP-Notizen. Daher kann für diesen Server "
-"kein XML-Speicher verwendet werden. Bitte ändern Sie die Konfiguration in "
-"KMail."
+"Der IMAP-Server %1 unterstützt keine IMAP-Notizen. Daher kann für diesen "
+"Server kein XML-Speicher verwendet werden. Bitte ändern Sie die "
+"Konfiguration in KMail."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"Der IMAP-Server %1 unterstützt keine IMAP-Notizen. Daher kann für diesen Server "
-"kein XML-Speicher verwendet werden. Bitte ändern Sie die Konfiguration in "
-"KMail."
+"Der IMAP-Server %1 unterstützt keine IMAP-Notizen. Daher kann für diesen "
+"Server kein XML-Speicher verwendet werden. Bitte ändern Sie die "
+"Konfiguration in KMail."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7875,17 +7725,17 @@ msgstr "Verloren+Gefunden"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Im Ordner <b>%1</b> befinden sich neue Nachrichten, die noch nicht zum "
-"Server hochgeladen wurden. Der Ordner wurde auf dem Server gelöscht, oder Sie "
-"haben kein Schreibrecht für diesen Ordner.</p>"
-"<p>Um Datenverlust zu vermeiden, werden die betroffenen Nachrichten in den "
-"Ordner <b>%2</b> verschoben."
+"Server hochgeladen wurden. Der Ordner wurde auf dem Server gelöscht, oder "
+"Sie haben kein Schreibrecht für diesen Ordner.</p><p>Um Datenverlust zu "
+"vermeiden, werden die betroffenen Nachrichten in den Ordner <b>%2</b> "
+"verschoben."
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7893,21 +7743,26 @@ msgstr "Ungenügende Zugriffsrechte"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Im Ordner <b>%1</b> befinden sich neue Nachrichten, die noch nicht zum "
-"Server hochgeladen wurden. Der Ordner wurde auf dem Server gelöscht, oder Sie "
-"haben kein Schreibrecht für diesen Ordner. Bitte fragen Sie Ihren "
-"Systemverwalter nach dem nötigen Schreibrecht, oder verschieben Sie die neuen "
-"Nachrichten aus diesem Ordner heraus.</p> "
-"<p>Möchten Sie diese Nachrichten jetzt in einen anderen Ordner verschieben?</p>"
+"Server hochgeladen wurden. Der Ordner wurde auf dem Server gelöscht, oder "
+"Sie haben kein Schreibrecht für diesen Ordner. Bitte fragen Sie Ihren "
+"Systemverwalter nach dem nötigen Schreibrecht, oder verschieben Sie die "
+"neuen Nachrichten aus diesem Ordner heraus.</p> <p>Möchten Sie diese "
+"Nachrichten jetzt in einen anderen Ordner verschieben?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Verschieben nach:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Nicht verschieben"
 
@@ -7919,8 +7774,7 @@ msgstr "Nachrichten in Ordner verschieben"
 msgid "Permissions (ACL)"
 msgstr "Rechte (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Allgemein"
@@ -7944,8 +7798,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "E&igene Symbole verwenden"
@@ -7964,24 +7817,22 @@ msgstr "Aktion bei neuen/ungelesenen Nachrichten in diesem Ordner"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wenn diese Option eingeschaltet ist, werden Sie über neue und ungelesene "
-"Nachrichten in diesem Ordner informiert. Außerdem hält die Funktion, die zum "
-"nächsten Ordner mit ungelesenen Nachrichten springt, bei diesem Ordner an.</p>"
-"<p>Schalten Sie die Option aus, wenn Sie nicht über neue und ungelesene "
-"Nachrichten benachrichtigt werden wollen und die Sprungfunktion nicht bei "
-"diesem Ordner anhalten soll. Das ist zum Beispiel nützlich, um neue und "
-"ungelesene Nachrichten in Ihrem Mülleimer oder Spam-Ordner zu ignorieren.</p>"
-"</qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Wenn diese Option eingeschaltet ist, werden Sie über neue und "
+"ungelesene Nachrichten in diesem Ordner informiert. Außerdem hält die "
+"Funktion, die zum nächsten Ordner mit ungelesenen Nachrichten springt, bei "
+"diesem Ordner an.</p><p>Schalten Sie die Option aus, wenn Sie nicht über "
+"neue und ungelesene Nachrichten benachrichtigt werden wollen und die "
+"Sprungfunktion nicht bei diesem Ordner anhalten soll. Das ist zum Beispiel "
+"nützlich, um neue und ungelesene Nachrichten in Ihrem Mülleimer oder Spam-"
+"Ordner zu ignorieren.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7993,9 +7844,9 @@ msgstr "Antworten in diesem Ordner aufbewahren"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Wählen Sie diese Option, wenn Antworten auf Nachrichten aus diesem Ordner im "
 "gleichen Ordner anstelle des eingestellten Versandordners gespeichert werden "
@@ -8009,17 +7860,21 @@ msgstr "Absender-/Empfängerspalte in Nachrichtenliste anzeigen"
 msgid "Sho&w column:"
 msgstr "Spal&te anzeigen:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Als Standard verwenden"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Absender"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Empfänger"
@@ -8030,16 +7885,16 @@ msgstr "Absender-&Identität:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Wählen Sie die Identität, die bei neuen Nachrichten oder Antworten auf "
-"Nachrichten in diesem Ordner benutzt werden soll. Damit kann KMail die zu einem "
-"Arbeitsordner gehörende Absenderadresse, Signatur und Signierungs- oder "
-"Verschlüsselungsschlüssel automatisch auswählen. Identitäten werden im "
+"Nachrichten in diesem Ordner benutzt werden soll. Damit kann KMail die zu "
+"einem Arbeitsordner gehörende Absenderadresse, Signatur und Signierungs- "
+"oder Verschlüsselungsschlüssel automatisch auswählen. Identitäten werden im "
 "Haupteinrichtungsdialog festgelegt. (Einstellungen -> KMail einrichten)"
 
 #: kmfolderdia.cpp:500
@@ -8058,28 +7913,28 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Diese Einstellung für Arbeitsgruppenordner legt fest, welche Benutzer "
 "\"Beschäftigt\"-Abschnitte und die entsprechenden Erinnerungen für solche "
-"Ereignisse oder Aufgaben erhalten. Diese Einstellung gilt nur für Kalender- und "
-"Aufgabenordner (bei Aufgaben wird diese Einstellung nur für Erinnerungen "
+"Ereignisse oder Aufgaben erhalten. Diese Einstellung gilt nur für Kalender- "
+"und Aufgabenordner (bei Aufgaben wird diese Einstellung nur für Erinnerungen "
 "benutzt).\n"
 "\n"
-"Verwendungsbeispiel: Benutzt ein Firmenchef einen Ordner gemeinsam mit seinem "
-"Sekretär, sollte nur die Arbeitszeit des Chefs bei einem Termin als "
-"\"beschäftigt\" gekennzeichnet werden, also sollte er \"Admins\" auswählen, da "
-"der Sekretär keine Administrationsrechte für den Ordner hat.\n"
-"Nutzt eine Arbeitsgruppe einen Kalenderordner für Besprechungstermine, sollten "
-"alle Leser für diese Termine als \"Beschäftigt\" markiert werden.\n"
-"Bei einem firmeninternen Ordner mit Besprechungen ohne Teilnahmepflicht sollte "
-"\"Niemand\" verwendet werden, da nicht automatisch klar ist, wer an solchen "
-"Terminen teilnimmt."
+"Verwendungsbeispiel: Benutzt ein Firmenchef einen Ordner gemeinsam mit "
+"seinem Sekretär, sollte nur die Arbeitszeit des Chefs bei einem Termin als "
+"\"beschäftigt\" gekennzeichnet werden, also sollte er \"Admins\" auswählen, "
+"da der Sekretär keine Administrationsrechte für den Ordner hat.\n"
+"Nutzt eine Arbeitsgruppe einen Kalenderordner für Besprechungstermine, "
+"sollten alle Leser für diese Termine als \"Beschäftigt\" markiert werden.\n"
+"Bei einem firmeninternen Ordner mit Besprechungen ohne Teilnahmepflicht "
+"sollte \"Niemand\" verwendet werden, da nicht automatisch klar ist, wer an "
+"solchen Terminen teilnimmt."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8097,8 +7952,8 @@ msgstr "Alle Leser dieses Ordners"
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
-"Diese Einstellung ermöglicht es Ihnen, Erinnerungen für Ordner zu deaktivieren, "
-"die von anderen freigegeben werden."
+"Diese Einstellung ermöglicht es Ihnen, Erinnerungen für Ordner zu "
+"deaktivieren, die von anderen freigegeben werden."
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -8112,25 +7967,25 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr ""
-"Sie haben diesen Ordner so eingerichtet, dass er Arbeitsgruppen-Informationen "
-"enthält. Gleichzeitig ist die allgemeine Einstellung aktiv, die bewirkt, dass "
-"Arbeitsgruppenordner nicht angezeigt werden. Daher wird dieser Ordner "
-"verschwinden, sobald der Einrichtungsdialog geschlossen wird. Wenn Sie den "
-"Ordner wieder entfernen möchten, müssen Sie das Ausblenden von "
-"Arbeitsgruppenordnern vorübergehend abschalten, um den Ordner wieder sehen zu "
-"können."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"Sie haben diesen Ordner so eingerichtet, dass er Arbeitsgruppen-"
+"Informationen enthält. Gleichzeitig ist die allgemeine Einstellung aktiv, "
+"die bewirkt, dass Arbeitsgruppenordner nicht angezeigt werden. Daher wird "
+"dieser Ordner verschwinden, sobald der Einrichtungsdialog geschlossen wird. "
+"Wenn Sie den Ordner wieder entfernen möchten, müssen Sie das Ausblenden von "
+"Arbeitsgruppenordnern vorübergehend abschalten, um den Ordner wieder sehen "
+"zu können."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8199,10 +8054,11 @@ msgstr "Fehler beim Abrufen der Ordnerinformationen."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
-"Der Nachrichtenindex zu \"%1\" stammt von einer unbekannten Version von KMail "
-"(%2).\n"
+"Der Nachrichtenindex zu \"%1\" stammt von einer unbekannten Version von "
+"KMail (%2).\n"
 "Die Indexdatei kann neu erstellt werden. Dabei können einige Informationen "
 "einschließlich der Statusinformationen verloren gehen. Soll die Indexdatei "
 "umgewandelt werden?"
@@ -8221,9 +8077,9 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"Der Nachrichtenindex zu \"%1\" ist beschädigt und wird jetzt wiederhergestellt. "
-"Dabei gehen allerdings einige Information, wie zum Beispiel Statusmarkierungen, "
-"verloren."
+"Der Nachrichtenindex zu \"%1\" ist beschädigt und wird jetzt "
+"wiederhergestellt. Dabei gehen allerdings einige Information, wie zum "
+"Beispiel Statusmarkierungen, verloren."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8231,8 +8087,8 @@ msgstr "Fehler beim Öffnen von %1. Dieser Ordner ist nicht vorhanden."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Fehler beim Öffnen von %1. Entweder handelt es sich nicht um einen gültigen "
 "Maildir-Ordner oder Sie verfügen nicht über die nötigen Zugriffsrechte."
@@ -8264,8 +8120,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"Ihr Postausgang enthält Nachrichten, die höchstwahrscheinlich nicht von KMail "
-"erstellt wurden.\n"
+"Ihr Postausgang enthält Nachrichten, die höchstwahrscheinlich nicht von "
+"KMail erstellt wurden.\n"
 "Bitte entfernen Sie diese von dort, wenn Sie nicht wollen, dass KMail diese "
 "versendet."
 
@@ -8279,22 +8135,19 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Der Index des Ordners \"%2\" scheint veraltet zu sein. Um die Zerstörung von "
-"Nachrichten zu vermeiden, wird der Index neu erstellt. Als Resultat könnten "
-"gelöschte Nachrichten wieder erscheinen und der Status einzelner Nachrichten "
-"verloren gehen.</p> "
-"<p>Bitte lesen Sie für weitere Informationen zur Vermeidung eines erneuten "
-"Auftretens dieses Problems im betreffenden <a href=\"%1\">"
-"FAQ-Abschnitt des Handbuchs zu KMail</a>.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>Der Index des Ordners \"%2\" scheint veraltet zu sein. Um die "
+"Zerstörung von Nachrichten zu vermeiden, wird der Index neu erstellt. Als "
+"Resultat könnten gelöschte Nachrichten wieder erscheinen und der Status "
+"einzelner Nachrichten verloren gehen.</p> <p>Bitte lesen Sie für weitere "
+"Informationen zur Vermeidung eines erneuten Auftretens dieses Problems im "
+"betreffenden <a href=\"%1\">FAQ-Abschnitt des Handbuchs zu KMail</a>.</p></"
+"qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8357,7 +8210,7 @@ msgstr ""
 "\"%1\" scheint kein Ordner zu sein.\n"
 "Bitte verschieben Sie die Datei."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8366,7 +8219,7 @@ msgstr ""
 "Bitte vergewissern Sie sich, dass Sie zur Ansicht und Änderung der "
 "Ordnerinhalte berechtigt sind."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8377,18 +8230,18 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"Ein Ordner gleichen Namens wurde seit dem letzten Abgleich gelöscht. Sie müssen "
-"zunächst E-Mails abrufen, bevor Sie einen neuen Ordner mit diesem Namen "
-"erstellen können."
+"Ein Ordner gleichen Namens wurde seit dem letzten Abgleich gelöscht. Sie "
+"müssen zunächst E-Mails abrufen, bevor Sie einen neuen Ordner mit diesem "
+"Namen erstellen können."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Ordner kann nicht angelegt werden"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8486,14 +8339,14 @@ msgstr "&Problembeseitigung im IMAP-Zwischenspeicher ..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Wegen unzureichender Rechte auf dem Server kann der Ordner <b>%1</b> "
-"nicht erstellt werden. Falls Sie der Meinung sind, Sie sollten hier Unterordner "
-"erstellen können. Wenden Sie sich an Ihre Systemverwalter, damit er Ihnen "
-"ausreichende Rechte zuweist.</qt> "
+"nicht erstellt werden. Falls Sie der Meinung sind, Sie sollten hier "
+"Unterordner erstellen können. Wenden Sie sich an Ihre Systemverwalter, damit "
+"er Ihnen ausreichende Rechte zuweist.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8510,8 +8363,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Ordner <b>%1</b> kann nicht kopiert oder verschoben werden, da ein anderer "
-"Ordner mit selben Namen bereits existiert.</qt>"
+"<qt>Ordner <b>%1</b> kann nicht kopiert oder verschoben werden, da ein "
+"anderer Ordner mit selben Namen bereits existiert.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -8632,15 +8485,15 @@ msgstr "%1 Der Ordner ist nur lesbar."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Soll die ausgewählte Nachricht wirklich gelöscht werden? "
-"<br>Sie kann nicht wiederhergestellt werden.</qt>\n"
-"<qt>Sollen die %n ausgewählten Nachrichten wirklich gelöscht werden? "
-"<br>Sie können nicht wiederhergestellt werden.</qt>"
+"<qt>Soll die ausgewählte Nachricht wirklich gelöscht werden? <br>Sie kann "
+"nicht wiederhergestellt werden.</qt>\n"
+"<qt>Sollen die %n ausgewählten Nachrichten wirklich gelöscht werden? <br>Sie "
+"können nicht wiederhergestellt werden.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8692,141 +8545,141 @@ msgstr ""
 "Keine Änderung möglich: \"%1\"\n"
 "(Nicht genügend Platz auf dem Datenträger?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Zertifikats-Signierungsanfrage"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Bitte erstellen Sie ein Zertifikat aus dem Anhang und senden Sie es an den "
 "Absender zurück."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
-"KMail ist \"offline\" eingestellt. Alle Vorgänge, die eine Netzwerkverbindung "
-"erfordern, werden ausgesetzt."
+"KMail ist \"offline\" eingestellt. Alle Vorgänge, die eine "
+"Netzwerkverbindung erfordern, werden ausgesetzt."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail ist \"online\" eingestellt. Alle Vorgänge, die eine Netzwerkverbindung "
 "erfordern, werden wiederaufgenommen."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail ist momentan im Offline-Modus. Wie möchten Sie fortfahren?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Online arbeiten"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Sie haben keine Lese-/Schreibrechte für Ihren Posteingangsordner."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Postausgang"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Sie haben keine Lese-/Schreibrechte für Ihren Postausgangsordner."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Versendete Nachrichten"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
-"Sie haben keine Lese-/Schreibrechte für Ihren Ordner \"Versendete "
-"Nachrichten\". "
+"Sie haben keine Lese-/Schreibrechte für Ihren Ordner \"Versendete Nachrichten"
+"\". "
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Mülleimer"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Sie haben keine Lese-/Schreibrechte für Ihren Mülleimerordner."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Entwürfe"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Sie haben keine Lese-/Schreibrechte für Ihren Entwurfsordner."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "Vorlagen"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Sie haben keine Schreibrechte für Ihren Vorlagenordner."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Letzte Suche"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Der Ordner <i>%4</i> existiert. %1 verwendet bisher <i>%5</i> "
-"für Nachrichten. "
-"<p>%2 kann den Inhalt von <i>%6<i> in diesen Ordner verschieben, dabei werden "
-"allerdings existierende Dateien gleichen Namens in <i>%7</i> überschrieben. "
-"<p><strong>Soll %3 die Nachrichten dennoch jetzt verschieben?</strong></qt>"
+"<qt>Der Ordner <i>%4</i> existiert. %1 verwendet bisher <i>%5</i> für "
+"Nachrichten. <p>%2 kann den Inhalt von <i>%6<i> in diesen Ordner "
+"verschieben, dabei werden allerdings existierende Dateien gleichen Namens in "
+"<i>%7</i> überschrieben. <p><strong>Soll %3 die Nachrichten dennoch jetzt "
+"verschieben?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Der Ordner <i>%4</i> existiert bereits. %1 verwendet bisher den Ordner <i>"
-"%5</i> für Nachrichten. %2 kann den Inhalt von <i>%6</i> "
-"in diesen Ordner verschieben."
-"<p><strong>Soll %3 diese Nachrichten jetzt verschieben?</strong></qt>"
+"<qt>Der Ordner <i>%4</i> existiert bereits. %1 verwendet bisher den Ordner "
+"<i>%5</i> für Nachrichten. %2 kann den Inhalt von <i>%6</i> in diesen Ordner "
+"verschieben.<p><strong>Soll %3 diese Nachrichten jetzt verschieben?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Mail-Dateien verschieben?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
-"In KMail ist ein schwerwiegender Fehler aufgetreten. Das Programm wird beendet."
+"In KMail ist ein schwerwiegender Fehler aufgetreten. Das Programm wird "
+"beendet."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8838,11 +8691,11 @@ msgstr ""
 "Die Fehlermeldung lautet:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Mülleimer leeren"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Sind Sie sicher, dass Sie die Mülleimer-Ordner für alle Postfächer leeren "
@@ -8919,8 +8772,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Neue Nachrichten eingetroffen</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8962,11 +8814,11 @@ msgstr "Sind Sie sicher, dass Sie den Mülleimer leeren möchten?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Wollen Sie alle Nachrichten des Ordners <b>%1</b> "
-"in den Mülleimer verschieben?</qt>"
+"<qt>Wollen Sie alle Nachrichten des Ordners <b>%1</b> in den Mülleimer "
+"verschieben?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8990,12 +8842,12 @@ msgstr "Suche löschen"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Wollen Sie die Suche <b>%1</b> wirklich löschen? "
-"<br>Die im Ordner angezeigten Nachrichten sind in ihrem Ursprungsordner immer "
-"noch verfügbar.</qt>"
+"<qt>Wollen Sie die Suche <b>%1</b> wirklich löschen? <br>Die im Ordner "
+"angezeigten Nachrichten sind in ihrem Ursprungsordner immer noch verfügbar.</"
+"qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -9004,45 +8856,49 @@ msgstr "Ordner entfernen"
 #: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Sind Sie sicher, dass Sie den leeren Ordner <b>%1</b> löschen wollen?</qt>"
+"<qt>Sind Sie sicher, dass Sie den leeren Ordner <b>%1</b> löschen wollen?</"
+"qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Sind Sie sicher, dass der leere Ordner <b>%1</b> "
-"und alle seine Unterordner gelöscht werden sollen? Diese Unterordner könnten "
-"noch Daten enthalten, die ebenfalls gelöscht würden. "
-"<p><b>Beachten</b> Sie, dass gelöschte Nachrichten nicht in den Ordner "
-"Mülleimer verschoben, sondern unwiderruflich gelöscht werden.</qt>"
+"<qt>Sind Sie sicher, dass der leere Ordner <b>%1</b> und alle seine "
+"Unterordner gelöscht werden sollen? Diese Unterordner könnten noch Daten "
+"enthalten, die ebenfalls gelöscht würden. <p><b>Beachten</b> Sie, dass "
+"gelöschte Nachrichten nicht in den Ordner Mülleimer verschoben, sondern "
+"unwiderruflich gelöscht werden.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Sind Sie sicher, dass der Ordner <b>%1</b> und dessen gesamter Inhalt "
-"gelöscht werden sollen? "
-"<p><b>Beachten</b> Sie, dass gelöschte Nachrichten nicht in den Ordner "
-"Mülleimer verschoben, sondern unwiderruflich gelöscht werden.</qt>"
+"gelöscht werden sollen? <p><b>Beachten</b> Sie, dass gelöschte Nachrichten "
+"nicht in den Ordner Mülleimer verschoben, sondern unwiderruflich gelöscht "
+"werden.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Sind Sie sicher, dass der Ordner <b>%1</b>, alle Unterordner und deren "
-"gesamter Inhalt gelöscht werden sollen? "
-"<p><b>Beachten</b> Sie, dass gelöschte Nachrichten nicht in den Ordner "
-"Mülleimer verschoben, sondern unwiderruflich gelöscht werden.</qt>"
+"gesamter Inhalt gelöscht werden sollen? <p><b>Beachten</b> Sie, dass "
+"gelöschte Nachrichten nicht in den Ordner Mülleimer verschoben, sondern "
+"unwiderruflich gelöscht werden.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Gelöscht"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -9060,9 +8916,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Die Nutzung von HTML macht Sie anfälliger für unerwünschte Mails (Werbung, "
 "\"Spam\") und erhöht die Wahrscheinlichkeit, dass Ihr System durch andere "
@@ -9079,13 +8935,13 @@ msgstr "HTML verwenden"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Die Nutzung von externen Referenzen in HTML-Nachrichten macht Sie anfälliger "
-"für unerwünschte Mails (Werbung, \"Spam\") und erhöht die Wahrscheinlichkeit, "
-"dass Ihr System durch andere aktuelle oder künftige Sicherheitslücken "
-"geschädigt wird."
+"für unerwünschte Mails (Werbung, \"Spam\") und erhöht die "
+"Wahrscheinlichkeit, dass Ihr System durch andere aktuelle oder künftige "
+"Sicherheitslücken geschädigt wird."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -9101,14 +8957,14 @@ msgstr "Nach Mailing-Liste %1 filtern ..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Abwesenheits-Benachrichtigungen basieren auf serverseitigen Filtern. Sie haben "
-"hierzu bisher noch keinen IMAP-Server eingerichtet.\n"
-"Die entsprechenden Einstellungen finden Sie auf der Karteikarte \"Filtern\" bei "
-"der Einrichtung des IMAP-Postfachs."
+"Abwesenheits-Benachrichtigungen basieren auf serverseitigen Filtern. Sie "
+"haben hierzu bisher noch keinen IMAP-Server eingerichtet.\n"
+"Die entsprechenden Einstellungen finden Sie auf der Karteikarte \"Filtern\" "
+"bei der Einrichtung des IMAP-Postfachs."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -9125,10 +8981,11 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Der GnuPG-Protokollbetrachter (kwatchgnupg) kann nicht gestartet werden. Bitte "
-"überprüfen Sie die korrekte Installation."
+"Der GnuPG-Protokollbetrachter (kwatchgnupg) kann nicht gestartet werden. "
+"Bitte überprüfen Sie die korrekte Installation."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9447,8 +9304,7 @@ msgstr "A&nhänge speichern ..."
 msgid "Appl&y All Filters"
 msgstr "A&lle Filter anwenden"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Filter anwenden"
@@ -9564,7 +9420,6 @@ msgstr "Nächste &ungelesene Nachricht"
 msgid "Go to the next unread message"
 msgstr "Zur nächsten ungelesenen Nachricht gehen"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Vorherige Nachricht"
@@ -9612,8 +9467,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"In der aktueller Nachricht nach unten blättern. Am Ende der aktuellen Nachricht "
-"zur nächsten ungelesenen Nachricht wechseln."
+"In der aktueller Nachricht nach unten blättern. Am Ende der aktuellen "
+"Nachricht zur nächsten ungelesenen Nachricht wechseln."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9703,21 +9558,21 @@ msgstr " Initialisierung läuft ..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Diese Nachricht enthält die Anforderung einer Empfangsbestätigung.\n"
-"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine normale "
-"Antwort schicken lassen."
+"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine "
+"normale Antwort schicken lassen."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Diese Nachricht enthält die Anforderung einer Empfangsbestätigung.\n"
@@ -9728,43 +9583,44 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Diese Nachricht enthält die Anforderung einer Empfangsbestätigung,\n"
 "aber die Bestätigung soll an mehr als eine Adresse versendet werden.\n"
-"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine normale "
-"Antwort senden lassen."
+"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine "
+"normale Antwort senden lassen."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Diese Nachricht enthält die Anforderung einer Empfangsbestätigung,\n"
 "aber es ist kein Antwortpfad angegeben.\n"
-"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine normale "
-"Antwort senden lassen."
+"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine "
+"normale Antwort senden lassen."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Diese Nachricht enthält die Anforderung einer Empfangsbestätigung,\n"
-"aber der Antwortpfad unterscheidet sich von der Adresse für die Bestätigung.\n"
-"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine normale "
-"Antwort senden lassen."
+"aber der Antwortpfad unterscheidet sich von der Adresse für die "
+"Bestätigung.\n"
+"Sie können die Anforderung ignorieren, KMail eine Ablehnung oder eine "
+"normale Antwort senden lassen."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9790,16 +9646,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Empfangsbestätigung: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Anhang: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Dieser Anhang wurde gelöscht."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Der Anhang \"%1\" wurde gelöscht."
 
@@ -9847,46 +9703,39 @@ msgstr "Eigenschaften des Nachrichtenteils"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Der <em>MIME-Typ</em> der Datei:</p> "
-"<p>Normalerweise muss diese Einstellung nicht manuell verändert werden, da der "
-"Dateityp automatisch festgestellt wird. Aber manchmal passieren %1 bei der "
-"Erkennung Fehler. Hier lassen sich solche Fehler korrigieren.</p></qt>"
+"<qt><p>Der <em>MIME-Typ</em> der Datei:</p> <p>Normalerweise muss diese "
+"Einstellung nicht manuell verändert werden, da der Dateityp automatisch "
+"festgestellt wird. Aber manchmal passieren %1 bei der Erkennung Fehler. Hier "
+"lassen sich solche Fehler korrigieren.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Die Größe des Teils:</p> "
-"<p>Hier wird von %1 manchmal nur eine geschätzte Größe angegeben, weil die "
-"Berechnung der exakten Größe zu zeitaufwändig wäre. In einem solchen Fall wird "
-"das durch \"(circa)\" angezeigt.</p></qt>"
+"<qt> <p>Die Größe des Teils:</p> <p>Hier wird von %1 manchmal nur eine "
+"geschätzte Größe angegeben, weil die Berechnung der exakten Größe zu "
+"zeitaufwändig wäre. In einem solchen Fall wird das durch \"(circa)\" "
+"angezeigt.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Der Name des Teils:</p> "
-"<p>Obwohl hier standardmäßig der Name der angehängten Datei angezeigt wird, ist "
-"das nicht die genaue Bedeutung dieses Feldes. Stattdessen wird ein Dateiname "
-"vorgeschlagen, unter dem der Empfänger der E-Mail diesen Teil auf Festplatte "
-"speichern sollte.</p></qt>"
+"<qt> <p>Der Name des Teils:</p> <p>Obwohl hier standardmäßig der Name der "
+"angehängten Datei angezeigt wird, ist das nicht die genaue Bedeutung dieses "
+"Feldes. Stattdessen wird ein Dateiname vorgeschlagen, unter dem der "
+"Empfänger der E-Mail diesen Teil auf Festplatte speichern sollte.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9894,17 +9743,15 @@ msgstr "&Beschreibung:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Eine Beschreibung für diesen Teil:</p> "
-"<p>Dies ist nur eine Beschreibung für diesen Nachrichtenteil, ähnlich zur "
-"Betreffzeile einer Nachricht. Viele Programme zeigen diese Informationen neben "
-"dem Symbol des Nachrichtenteils in der Nachrichtenvorschau.</p></qt>"
+"<qt> <p>Eine Beschreibung für diesen Teil:</p> <p>Dies ist nur eine "
+"Beschreibung für diesen Nachrichtenteil, ähnlich zur Betreffzeile einer "
+"Nachricht. Viele Programme zeigen diese Informationen neben dem Symbol des "
+"Nachrichtenteils in der Nachrichtenvorschau.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9912,22 +9759,20 @@ msgstr "&Kodierung:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Die Kodierung für diesen Nachrichtenteil:</p> "
-"<p>Diese Einstellung muss normalerweise nicht verändert werden, da %1 abhängig "
-"vom MIME-Typ eine sinnvolle Kodierung auswählt. Es ist allerdings manchmal "
-"sinnvoll, diese Auswahl manuell zu ändern. Zum Beispiel können Sie für eine "
-"PostScript-Datei, die keine Binärdaten enthält, \"quoted-printable\" an Stelle "
-"von \"base64\" wählen. Das reduziert die Nachrichtengröße um ca. 25 %.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt> <p>Die Kodierung für diesen Nachrichtenteil:</p> <p>Diese Einstellung "
+"muss normalerweise nicht verändert werden, da %1 abhängig vom MIME-Typ eine "
+"sinnvolle Kodierung auswählt. Es ist allerdings manchmal sinnvoll, diese "
+"Auswahl manuell zu ändern. Zum Beispiel können Sie für eine PostScript-"
+"Datei, die keine Binärdaten enthält, \"quoted-printable\" an Stelle von "
+"\"base64\" wählen. Das reduziert die Nachrichtengröße um ca. 25 %.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9935,21 +9780,18 @@ msgstr "&Automatische Anzeige vorschlagen"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Markieren Sie dieses Ankreuzfeld, wenn dem Empfänger an Stelle des "
+"<qt> <p>Markieren Sie dieses Ankreuzfeld, wenn dem Empfänger an Stelle des "
 "standardmäßigen Symbols die automatische eingebettete Anzeige dieses "
-"Nachrichtenteils vorgeschlagen werden soll.</p> "
-"<p>Das wird technisch erreicht durch die Veränderung des Vorspannfeldes <em>"
-"Inhalt-Platzierung (Content-Disposition)</em> auf \"eingebettet (inline)\" an "
-"Stelle des Standardwertes \"Anhang (attachment)\".</p></qt>"
+"Nachrichtenteils vorgeschlagen werden soll.</p> <p>Das wird technisch "
+"erreicht durch die Veränderung des Vorspannfeldes <em>Inhalt-Platzierung "
+"(Content-Disposition)</em> auf \"eingebettet (inline)\" an Stelle des "
+"Standardwertes \"Anhang (attachment)\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9957,16 +9799,13 @@ msgstr "Diesen Nachrichtenteil &signieren"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Markieren Sie dieses Ankreuzfeld, wenn dieser Nachrichtenteil signiert "
-"werden soll.</p> "
-"<p>Für die Signatur wird der mit der aktuell ausgewählten eigenen Identität "
-"verknüpfte Schlüssel verwendet.</p></qt>"
+"<qt> <p>Markieren Sie dieses Ankreuzfeld, wenn dieser Nachrichtenteil "
+"signiert werden soll.</p> <p>Für die Signatur wird der mit der aktuell "
+"ausgewählten eigenen Identität verknüpfte Schlüssel verwendet.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9974,15 +9813,12 @@ msgstr "Nachrichtenteil &verschlüsseln"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Markieren Sie dieses Ankreuzfeld, wenn dieser Nachrichtenteil verschlüsselt "
-"werden soll.</p> "
-"<p>Dieser Nachrichtenteil wird für die Empfänger der Nachricht "
-"verschlüsselt.</p></qt>"
+"<qt> <p>Markieren Sie dieses Ankreuzfeld, wenn dieser Nachrichtenteil "
+"verschlüsselt werden soll.</p> <p>Dieser Nachrichtenteil wird für die "
+"Empfänger der Nachricht verschlüsselt.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9996,15 +9832,12 @@ msgstr "POP-Filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Nachrichten zum Filtern auf dem POP-Zugang: <b>%1</b>"
-"<p>Die angezeigten Nachrichten übertreffen die für diesen Zugang festgelegte "
-"Maximalgröße."
+"Nachrichten zum Filtern auf dem POP-Zugang: <b>%1</b><p>Die angezeigten "
+"Nachrichten übertreffen die für diesen Zugang festgelegte Maximalgröße."
 "<br>Sie können durch Markieren des passenden Knopfes das weitere Vorgehen "
 "bestimmen."
 
@@ -10258,40 +10091,39 @@ msgstr "Das E-Mail-Programm für die K-Arbeitsumgebung."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Abholen des Ordnerinhalts</h2>"
-"<p>Bitte warten ...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Abholen des Ordnerinhalts</h2><p>Bitte "
+"warten ...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail ist momentan im Offline-Modus. Klicken Sie <a href=\"kmail:goOnline\">"
-"hier</a>, um online zu gehen ...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail ist momentan im Offline-"
+"Modus. Klicken Sie <a href=\"kmail:goOnline\">hier</a>, um online zu "
+"gehen ...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10299,13 +10131,11 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Willkommen bei KMail %1</h2>"
-"<p>KMail ist das E-Mail-Programm für TDE. Es wurde vollständig kompatibel zu "
-"den Internet-E-Mail-Standards entwickelt, inklusive MIME, SMTP, POP3 und "
-"IMAP.</p>\n"
-"<ul>"
-"<li>KMail verfügt über viele leistungsfähige Funktionen, die alle in der <a "
-"href=\"%2\">Dokumentation</a> beschrieben werden.</li>\n"
+"<h2 style='margin-top: 0px;'>Willkommen bei KMail %1</h2><p>KMail ist das E-"
+"Mail-Programm für TDE. Es wurde vollständig kompatibel zu den Internet-E-"
+"Mail-Standards entwickelt, inklusive MIME, SMTP, POP3 und IMAP.</p>\n"
+"<ul><li>KMail verfügt über viele leistungsfähige Funktionen, die alle in der "
+"<a href=\"%2\">Dokumentation</a> beschrieben werden.</li>\n"
 "<li>Auf der <a href=\"%3\">KMail-Homepage</a> finden Sie Informationen über "
 "neue Versionen von KMail.</li></ul>\n"
 "%8\n"
@@ -10319,20 +10149,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp;&nbsp; Das KMail-Team</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Bitte nehmen Sie sich einen Moment Zeit, um KMail unter "
-"Einstellungen-&gt;KMail einrichten über Ihre Benutzerdaten zu informieren.\n"
+"<p>Bitte nehmen Sie sich einen Moment Zeit, um KMail unter Einstellungen-&gt;"
+"KMail einrichten über Ihre Benutzerdaten zu informieren.\n"
 "Sie müssen zumindest eine primäre Identität sowie je ein Postfach für den "
 "Posteingang und Postausgang anlegen.</p>\n"
 
@@ -10341,8 +10169,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Wichtige Änderungen</span> "
-"(verglichen mit KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Wichtige Änderungen</"
+"span> (verglichen mit KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10373,7 +10201,8 @@ msgstr "Anhang ansehen: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Der Anhang enthält binäre Daten. Es wird versucht, das erste Zeichen "
@@ -10404,14 +10233,16 @@ msgstr "Anhang öffnen?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"Das Löschen eines Anhangs kann eine digitale Unterschrift für diese Nachricht "
-"ungültig machen."
+"Das Löschen eines Anhangs kann eine digitale Unterschrift für diese "
+"Nachricht ungültig machen."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Das Bearbeiten eines Anhangs kann eine digitale Unterschrift für diese "
 "Nachricht ungültig machen."
@@ -10434,6 +10265,58 @@ msgstr "(Trifft auf eines der Folgenden zu)"
 msgid "(match all of the following)"
 msgstr "(trifft auf alle Folgenden zu)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Gelesen"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Alt"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Beantwortet"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Weitergeleitet"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "In Postausgang"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Versendet"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Überwacht"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignoriert"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Aufgabe"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Hat einen Anhang"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Vollständige Nachricht"
@@ -10506,16 +10389,16 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Kritischer Fehler: Versendete Nachrichten können nicht verarbeitet werden (zu "
-"wenig Speicherplatz?). Das Kopieren der Nachricht in den Ordner \"Versendete "
-"Nachrichten\" ist fehlgeschlagen."
+"Kritischer Fehler: Versendete Nachrichten können nicht verarbeitet werden "
+"(zu wenig Speicherplatz?). Das Kopieren der Nachricht in den Ordner "
+"\"Versendete Nachrichten\" ist fehlgeschlagen."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Das Verschieben der versendeten Nachricht \"%1\" vom \"Postausgang\" in den "
 "Ordner für \"Versendete Nachrichten\" ist fehlgeschlagen.\n"
@@ -10526,8 +10409,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Es können keine Nachrichten ohne Absender-Adresse verschickt werden.\n"
 "Bitte legen Sie die E-Mail-Adresse zu \"%1\" im Einrichtungsdialog "
@@ -10556,8 +10439,8 @@ msgstr "Sendevorgang wird vorbereitet ..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Sie haben angegeben, alle im Postausgang befindlichen E-Mails über einen "
 "unverschlüsselten Transportweg zu versenden. Möchten Sie fortfahren? "
@@ -10585,16 +10468,17 @@ msgstr "Nicht alle wartenden Nachrichten können versendet werden."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Das Versenden wurde abgebrochen:\n"
 "%1\n"
-"Die Nachricht verbleibt im Postausgang, bis Sie entweder das Problem beseitigt "
-"haben (z. B. falsche Adresse) oder die Nachricht aus dem Postausgang "
-"entfernen.\n"
+"Die Nachricht verbleibt im Postausgang, bis Sie entweder das Problem "
+"beseitigt haben (z. B. falsche Adresse) oder die Nachricht aus dem "
+"Postausgang entfernen.\n"
 "Das folgende Transportprotokoll wurde benutzt:\n"
 "  %2"
 
@@ -10604,21 +10488,17 @@ msgstr "Versenden abgebrochen."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Das Versenden ist fehlgeschlagen:</p>"
-"<p>%1</p>"
-"<p>Die Nachricht verbleibt im Postausgang, bis Sie entweder das Problem "
-"beseitigt haben (z. B. falsche Adresse) oder die Nachricht aus dem Postausgang "
-"entfernen.</p>"
-"<p>Das folgende Transportprotokoll wurde benutzt:  %2</p> "
-"<p>Soll mit dem Versenden der verbleibenden Nachrichten fortgefahren werden?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Das Versenden ist fehlgeschlagen:</p><p>%1</p><p>Die Nachricht verbleibt "
+"im Postausgang, bis Sie entweder das Problem beseitigt haben (z. B. falsche "
+"Adresse) oder die Nachricht aus dem Postausgang entfernen.</p><p>Das "
+"folgende Transportprotokoll wurde benutzt:  %2</p> <p>Soll mit dem Versenden "
+"der verbleibenden Nachrichten fortgefahren werden?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10636,16 +10516,17 @@ msgstr "Versenden &abbrechen"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Das Versenden ist fehlgeschlagen:\n"
 "%1\n"
-"Die Nachricht verbleibt im Postausgang, bis Sie entweder das Problem beseitigt "
-"haben (z. B. falsche Adresse) oder die Nachricht aus dem Postausgang "
-"entfernen.\n"
+"Die Nachricht verbleibt im Postausgang, bis Sie entweder das Problem "
+"beseitigt haben (z. B. falsche Adresse) oder die Nachricht aus dem "
+"Postausgang entfernen.\n"
 "Das folgende Transportprotokoll wurde benutzt:\n"
 " %2"
 
@@ -10664,9 +10545,9 @@ msgid ""
 msgstr ""
 "Das Versenden ist fehlgeschlagen:\n"
 "%1\n"
-"Die Nachricht verbleibt im Postausgang und wird später erneut versendet. Wenn "
-"Sie die Nachricht nicht mehr senden möchten, können Sie die Nachricht aus dem "
-"Postausgang entfernen.\n"
+"Die Nachricht verbleibt im Postausgang und wird später erneut versendet. "
+"Wenn Sie die Nachricht nicht mehr senden möchten, können Sie die Nachricht "
+"aus dem Postausgang entfernen.\n"
 "Das folgende Transportprotokoll wurde benutzt:\n"
 "  %2"
 
@@ -10682,49 +10563,50 @@ msgstr "Sendmail wurde unerwartet beendet."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Sie müssen einen Benutzernamen und ein Passwort angeben, um auf diesen "
-"SMTP-Server zugreifen zu können."
+"Sie müssen einen Benutzernamen und ein Passwort angeben, um auf diesen SMTP-"
+"Server zugreifen zu können."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 scheint bereits auf einem anderen Bildschirm dieses Rechners zu laufen. Das "
-"mehrfache Starten von %2 kann zum Verlust von E-Mails führen. Sie sollten %1 "
-"nur dann starten, wenn sie sicher sind, dass es nicht bereits läuft."
+"%1 scheint bereits auf einem anderen Bildschirm dieses Rechners zu laufen. "
+"Das mehrfache Starten von %2 kann zum Verlust von E-Mails führen. Sie "
+"sollten %1 nur dann starten, wenn sie sicher sind, dass es nicht bereits "
+"läuft."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 scheint bereits auf einem anderen Bildschirm dieses Rechners zu laufen. Das "
-"Starten von %1 und %2 auf dem gleichen Rechner kann zum Verlust von E-Mails "
-"führen. Sie sollten %2 nur dann starten, wenn sie sicher sind, dass %1 nicht "
-"läuft."
+"%1 scheint bereits auf einem anderen Bildschirm dieses Rechners zu laufen. "
+"Das Starten von %1 und %2 auf dem gleichen Rechner kann zum Verlust von E-"
+"Mails führen. Sie sollten %2 nur dann starten, wenn sie sicher sind, dass %1 "
+"nicht läuft."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 scheint bereits auf %2 zu laufen. Das mehrfache Starten von %1 kann zum "
-"Verlust von E-Mails führen. Sie sollten %1 auf diesem Rechner nur dann starten, "
-"wenn Sie sicher sind, dass es nicht bereits auf %2 läuft."
+"Verlust von E-Mails führen. Sie sollten %1 auf diesem Rechner nur dann "
+"starten, wenn Sie sicher sind, dass es nicht bereits auf %2 läuft."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 läuft bereits auf %3. Die gleichzeitige Ausführung von %1 und %2 kann zum "
-"Verlust von E-Mails führen. Sie sollten %2 auf diesem Rechner nur dann starten, "
-"wenn Sie sicher sind, dass %1 nicht bereits auf %3 läuft."
+"Verlust von E-Mails führen. Sie sollten %2 auf diesem Rechner nur dann "
+"starten, wenn Sie sicher sind, dass %1 nicht bereits auf %3 läuft."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10735,6 +10617,10 @@ msgstr "%1 starten"
 msgid "Exit"
 msgstr "Beenden"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Neue Nachrichten in"
@@ -10761,12 +10647,13 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet ist nicht verfügbar. Sie sollten unbedingt TDEWallet zur Verwaltung "
-"Ihrer Passwörter einsetzen.\n"
+"TDEWallet ist nicht verfügbar. Sie sollten unbedingt TDEWallet zur "
+"Verwaltung Ihrer Passwörter einsetzen.\n"
 "KMail kann das Passwort auch in seiner Konfigurationsdatei speichern. Das "
 "Passwort wird zwar in einem verschlüsselten Format gespeichert, diese ist "
 "allerdings nicht besonders sicher gegenüber ernsthaften "
@@ -10840,9 +10727,10 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Ein Befehl, der lokal vor dem Versand der E-Mail ausgeführt werden soll. Dieses "
-"Feld kann z. B. für die Einrichtung eines ssh-Tunnels verwendet werden. Dieses "
-"Feld muss leer gelassen werden, falls kein Befehl ausgeführt werden soll."
+"Ein Befehl, der lokal vor dem Versand der E-Mail ausgeführt werden soll. "
+"Dieses Feld kann z. B. für die Einrichtung eines ssh-Tunnels verwendet "
+"werden. Dieses Feld muss leer gelassen werden, falls kein Befehl ausgeführt "
+"werden soll."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10850,12 +10738,12 @@ msgstr "Server verlangt &Autorisierung"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Markieren Sie dieses Feld, falls der SMTP-Server vor der Annahme von E-Mail "
-"eine Authentifizierung verlangt. Dies wird auch als \"Authenticated SMTP\" oder "
-"einfach ASMTP bezeichnet."
+"eine Authentifizierung verlangt. Dies wird auch als \"Authenticated SMTP\" "
+"oder einfach ASMTP bezeichnet."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10875,15 +10763,14 @@ msgstr "Benutzerdefinierten &Rechnernamen zum Server senden"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Markieren Sie dieses Ankreuzfeld, damit KMail einen benutzerdefinierten "
-"Rechnernamen zur Identifizierung gegenüber dem Server verwendet."
-"<p>Diese Einstellung ist nützlich, wenn der Rechnername nicht korrekt "
-"eingestellt ist oder der Rechnername geheim bleiben soll."
+"Rechnernamen zur Identifizierung gegenüber dem Server verwendet.<p>Diese "
+"Einstellung ist nützlich, wenn der Rechnername nicht korrekt eingestellt ist "
+"oder der Rechnername geheim bleiben soll."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10914,11 +10801,11 @@ msgstr "Nur lokale Dateien sind erlaubt."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Das Feld mit der Serveradresse darf nicht leer sein. Bitte geben Sie den Namen "
-"oder die IP-Adresse des SMTP-Servers ein."
+"Das Feld mit der Serveradresse darf nicht leer sein. Bitte geben Sie den "
+"Namen oder die IP-Adresse des SMTP-Servers ein."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10930,16 +10817,16 @@ msgstr "Fehler beim Anzeigen von Ordner %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"Lokale Austragung von Ordnern wird alle Informationen löschen, die lokal über "
-"diese Ordner vorhanden sind. Die Ordner werden nicht auf dem Server geändert. "
-"Wenn dieser Vorgang jetzt abgebrochen wird, kann durch Prüfung der E-Mails "
-"vorher sichergestellt werden, dass die lokalen Änderungen auf den Server "
-"übertragen wurden."
+"Lokale Austragung von Ordnern wird alle Informationen löschen, die lokal "
+"über diese Ordner vorhanden sind. Die Ordner werden nicht auf dem Server "
+"geändert. Wenn dieser Vorgang jetzt abgebrochen wird, kann durch Prüfung der "
+"E-Mails vorher sichergestellt werden, dass die lokalen Änderungen auf den "
+"Server übertragen wurden."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11158,35 +11045,28 @@ msgstr "Nachricht &bearbeiten"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Vom Krypto-Modul zurückgegebene Strukturinformationen können nicht "
-"verarbeitet werden; das Modul könnte beschädigt sein.</p>"
-"<p>Bitte benachrichtigen Sie den Systemverwalter.</p></qt>"
+"<qt> <p>Vom Krypto-Modul zurückgegebene Strukturinformationen können nicht "
+"verarbeitet werden; das Modul könnte beschädigt sein.</p><p>Bitte "
+"benachrichtigen Sie den Systemverwalter.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Es wurde weder ein Krypto-Modul gefunden noch konnte der eingebaute "
-"OpenPGP-Programmteil erfolgreich ausgeführt werden.</p> "
-"<p>Es gibt zwei mögliche Abhilfen:</p> "
-"<ul> "
-"<li><em>Entweder</em> Sie aktivieren ein Modul über Einstellungen-> "
-"KMail einrichten->Modul-Dialog.</li> "
-"<li><em>oder</em> Sie richten die OpenPGP-Einstellungen im gleichen Dialog "
-"unter Identität->Erweitert korrekt ein.</li></ul>"
+"OpenPGP-Programmteil erfolgreich ausgeführt werden.</p> <p>Es gibt zwei "
+"mögliche Abhilfen:</p> <ul> <li><em>Entweder</em> Sie aktivieren ein Modul "
+"über Einstellungen-> KMail einrichten->Modul-Dialog.</li> <li><em>oder</em> "
+"Sie richten die OpenPGP-Einstellungen im gleichen Dialog unter Identität-"
+">Erweitert korrekt ein.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11198,8 +11078,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Das Chiasmus-Hintergrundprogramm bietet die Funktion \"x-encrypt\" nicht an. "
 "Bitte melden Sie diesen Fehler."
@@ -11209,8 +11089,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Die Funktion \"x-encrypt\" benötigt andere Parameter als erwartet. Bitte melden "
-"Sie diesen Fehler."
+"Die Funktion \"x-encrypt\" benötigt andere Parameter als erwartet. Bitte "
+"melden Sie diesen Fehler."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11218,16 +11098,16 @@ msgstr "Fehler bei der Chiasmus-Verschlüsselung"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Unerwarteter Rückgabewert vom Chiasmus-Hintergrundprogramm. Die Funktion "
-"\"x-encrypt\" hat kein Bytefeld zurückgegeben. Bitte melden Sie diesen Fehler."
+"Unerwarteter Rückgabewert vom Chiasmus-Hintergrundprogramm. Die Funktion \"x-"
+"encrypt\" hat kein Bytefeld zurückgegeben. Bitte melden Sie diesen Fehler."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Das eingebettete OpenPGP-Kryptoformat unterstützt die Verschlüsselung oder "
@@ -11252,8 +11132,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Die Signierungseinstellungen für diesen Empfänger sehen vor, dass Sie vor der "
-"Signierung um Bestätigung gebeten werden.\n"
+"Die Signierungseinstellungen für diesen Empfänger sehen vor, dass Sie vor "
+"der Signierung um Bestätigung gebeten werden.\n"
 "Soll diese Nachricht signiert werden?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11283,8 +11163,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Diese Nachricht soll signiert werden, Sie haben aber für diese Identität noch "
-"keine gültigen Signierungsschlüssel festgelegt."
+"Diese Nachricht soll signiert werden, Sie haben aber für diese Identität "
+"noch keine gültigen Signierungsschlüssel festgelegt."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11342,12 +11222,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Die Signierungseinstellungen für diesen Empfänger sehen vor, dass Sie vor der "
-"Verschlüsselung um Bestätigung gebeten werden.\n"
+"Die Signierungseinstellungen für diesen Empfänger sehen vor, dass Sie vor "
+"der Verschlüsselung um Bestätigung gebeten werden.\n"
 "Soll die Nachricht verschlüsselt werden?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11380,12 +11260,13 @@ msgstr "N&icht verschlüsseln"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Sie haben angefordert, die Nachricht zu verschlüsseln und eine verschlüsselte "
-"Kopie an sich selbst zu schicken, es wurde aber bisher kein vertrauenswürdiger "
-"Verschlüsselungsschlüssel für diese Identität angegeben."
+"Sie haben angefordert, die Nachricht zu verschlüsseln und eine "
+"verschlüsselte Kopie an sich selbst zu schicken, es wurde aber bisher kein "
+"vertrauenswürdiger Verschlüsselungsschlüssel für diese Identität angegeben."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11394,13 +11275,14 @@ msgstr "Unverschlüsselt senden?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Einige Teile dieser Nachricht werden nicht verschlüsselt.\n"
 "Das Versenden von teilweise verschlüsselten Nachrichten könnte die lokalen "
-"Sicherheitsbestimmungen verletzen und/oder wichtige Informationen preisgeben.\n"
+"Sicherheitsbestimmungen verletzen und/oder wichtige Informationen "
+"preisgeben.\n"
 "Sollen stattdessen alle Teile verschlüsselt werden?"
 
 #: messagecomposer.cpp:950
@@ -11412,7 +11294,8 @@ msgid ""
 msgstr ""
 "Diese Nachricht wird nicht verschlüsselt.\n"
 "Das Versenden unverschlüsselter Nachrichten könnte die lokalen "
-"Sicherheitsbestimmungen verletzen und/oder wichtige Informationen preisgeben.\n"
+"Sicherheitsbestimmungen verletzen und/oder wichtige Informationen "
+"preisgeben.\n"
 "Soll die Nachricht stattdessen verschlüsselt werden?"
 
 #: messagecomposer.cpp:955
@@ -11423,93 +11306,88 @@ msgstr "A&lle Nachrichtenteile verschlüsseln"
 msgid "Unencrypted Message Warning"
 msgstr "Warnung unverschlüsselte Nachricht"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Fehler: Das Krypto-Modul hat keine verschlüsselten Daten zurückgeliefert.</p>"
-"<p>Bitte melden Sie diesen Fehler:"
-"<br>%2</p></qt>"
+"<qt> <p>Fehler: Das Krypto-Modul hat keine verschlüsselten Daten "
+"zurückgeliefert.</p><p>Bitte melden Sie diesen Fehler:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Manche Zeichen können mit der gewählten Kodierung nicht verwendet werden."
-"<br>"
-"<br>Soll die Nachricht trotzdem versendet werden?</qt>"
+"<br><br>Soll die Nachricht trotzdem versendet werden?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Einige Zeichen werden verloren gehen"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Zeichen verlieren"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Kodierung ändern"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Diese Nachricht kann nicht signiert werden, da das Krypto-Modul keine "
-"Signierung unterstützt. Das ist eigentlich unmöglich. Bitte melden Sie diesen "
-"Fehler."
+"Signierung unterstützt. Das ist eigentlich unmöglich. Bitte melden Sie "
+"diesen Fehler."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Diese Nachricht kann nicht signiert werden, da das Krypto-Modul keine "
-"Signierung unterstützt. Das ist eigentlich unmöglich. Bitte melden Sie diesen "
-"Fehler."
+"Signierung unterstützt. Das ist eigentlich unmöglich. Bitte melden Sie "
+"diesen Fehler."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "GnuPG-Prüfprotokoll für Signaturoperation"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"Das Signieren der Nachricht ist fehlgeschlagen. Bitte stellen Sie sicher, dass "
-"das Programm \"gpg-agent\" läuft."
+"Das Signieren der Nachricht ist fehlgeschlagen. Bitte stellen Sie sicher, "
+"dass das Programm \"gpg-agent\" läuft."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Diese Nachricht kann nicht verschlüsselt werden, da das Krypto-Modul keine "
 "Verschlüsselung unterstützt. Das ist eigentlich unmöglich. Bitte melden Sie "
 "diesen Fehler."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "GnuPG-Prüfprotokoll für Verschlüsselungsoperation"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Diese Nachricht kann nicht signiert und verschlüsselt werden, da das "
-"Krypto-Modul keine Signierung und Verschlüsselung unterstützt. Das ist "
-"eigentlich unmöglich. Bitte melden Sie diesen Fehler."
+"Diese Nachricht kann nicht signiert und verschlüsselt werden, da das Krypto-"
+"Modul keine Signierung und Verschlüsselung unterstützt. Das ist eigentlich "
+"unmöglich. Bitte melden Sie diesen Fehler."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11530,16 +11408,16 @@ msgstr "Mailbox-&Format:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Wählen Sie, ob die Nachrichten in diesem Ordner als eine Datei pro Nachricht "
 "(Maildir-Format) oder als eine große Datei (mbox-Format) gespeichert werden "
 "sollen. KMail verwendet üblicherweise das Maildir-Format. Diese Einstellung "
-"muss nur sehr selten geändert werden. Falls Sie unsicher sind, bleiben Sie bei "
-"der Standardeinstellung."
+"muss nur sehr selten geändert werden. Falls Sie unsicher sind, bleiben Sie "
+"bei der Standardeinstellung."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11548,11 +11426,11 @@ msgstr "Ordner en&thält:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Wählen Sie, ob der neue Ordner für Nachrichten oder Arbeitsgruppeneinträge wie "
-"Aufgaben oder Notizen verwendet werden soll. Die Standardeinstellung ist "
+"Wählen Sie, ob der neue Ordner für Nachrichten oder Arbeitsgruppeneinträge "
+"wie Aufgaben oder Notizen verwendet werden soll. Die Standardeinstellung ist "
 "Nachrichten. Behalten Sie im Zweifelsfall die Standardeinstellung bei."
 
 #: newfolderdialog.cpp:165
@@ -11562,7 +11440,8 @@ msgstr "Namensraum für &Ordner:"
 #: newfolderdialog.cpp:170
 msgid "Select the personal namespace the folder should be created in."
 msgstr ""
-"Wählen Sie den persönlichen Namensraum, in dem der Ordner angelegt werden soll."
+"Wählen Sie den persönlichen Namensraum, in dem der Ordner angelegt werden "
+"soll."
 
 #: newfolderdialog.cpp:193
 msgid "Please specify a name for the new folder."
@@ -11594,8 +11473,7 @@ msgid "The crypto engine returned no cleartext data."
 msgstr ""
 "Das Kryptographie-Programm lieferte keine unverschlüsselten Daten zurück."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11624,8 +11502,8 @@ msgstr "Es wurde kein %1-Modul gefunden."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Die Nachricht ist signiert, aber die Gültigkeit der Signatur kann nicht "
 "überprüft werden.<br />Grund: %1"
@@ -11662,27 +11540,28 @@ msgstr "Das Krypto-Modul \"%1\" kann keine Nachrichten entschlüsseln."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Hinweis:</b> Diese Nachricht im HTML-Format könnte externe Referenzen auf z. "
-"B. Bilder enthalten. Aus Sicherheitsgründen werden externe Referenzen nicht "
-"geladen. Falls der Absender vertrauenswürdig ist, aktivieren Sie externe "
-"Referenzen, indem Sie <a href=\"kmail:loadExternal\">hier</a> klicken."
+"<b>Hinweis:</b> Diese Nachricht im HTML-Format könnte externe Referenzen auf "
+"z. B. Bilder enthalten. Aus Sicherheitsgründen werden externe Referenzen "
+"nicht geladen. Falls der Absender vertrauenswürdig ist, aktivieren Sie "
+"externe Referenzen, indem Sie <a href=\"kmail:loadExternal\">hier</a> "
+"klicken."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Hinweis:</b> Dies ist eine Nachricht im HTML-Format. Aus Sicherheitsgründen "
-"wird nur der unformatierte HTML-Quelltext angezeigt. Falls der Absender "
-"vertrauenswürdig ist, aktivieren Sie die formatierte Anzeige, indem Sie <a "
-"href=\"kmail:showHTML\">hier</a> klicken."
+"<b>Hinweis:</b> Dies ist eine Nachricht im HTML-Format. Aus "
+"Sicherheitsgründen wird nur der unformatierte HTML-Quelltext angezeigt. "
+"Falls der Absender vertrauenswürdig ist, aktivieren Sie die formatierte "
+"Anzeige, indem Sie <a href=\"kmail:showHTML\">hier</a> klicken."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11922,8 +11801,8 @@ msgstr "Achtung:"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"Die E-Mail-Adresse des Absenders wurde nicht in dem %1 gespeichert, der für die "
-"Signatur verwendet wurde."
+"Die E-Mail-Adresse des Absenders wurde nicht in dem %1 gespeichert, der für "
+"die Signatur verwendet wurde."
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11935,17 +11814,19 @@ msgstr "gespeichert: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Im für die Unterschrift verwendeten %1 ist keine E-Mail-Adresse hinterlegt. "
-"Daher kann sie nicht mit der Absenderadresse der E-Mail (%2) verglichen werden."
+"Daher kann sie nicht mit der Absenderadresse der E-Mail (%2) verglichen "
+"werden."
 
 #: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr ""
-"Es sind nicht genügend Informationen zur Überprüfung der Signatur vorhanden: %1"
+"Es sind nicht genügend Informationen zur Überprüfung der Signatur vorhanden: "
+"%1"
 
 #: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
@@ -12059,10 +11940,11 @@ msgstr "Fehlermeldung des Ein-/Ausgabemoduls"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Der POP3-Server (Konto: %1) unterstützt den Befehl UIDL nicht. Dieser Befehl "
 "wird benötigt, um zuverlässig festzustellen, welche Nachrichten bereits von "
@@ -12088,7 +11970,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Abholen von Nachricht %1 von %2 (%3 von %4 KB) für %5@%6 (noch %7 KB auf dem "
 "Server)."
@@ -12107,1945 +11990,15 @@ msgstr "Ungültige Antwort vom Server"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Da der Mailserver den TOP-Befehl nicht unterstützt, ist es nicht möglich, von "
-"großen E-Mails zuerst nur den Vorspann abzuholen."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Gehe zu"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Ordner"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Nach&richt"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Antworten (speziell)"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "W&eiterleiten"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-Werkzeugleiste"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signieren"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Nachrichten &automatisch signieren"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Wenn diese Einstellung aktiviert ist, werden standardmäßig alle ausgehenden "
-"Nachrichten signiert. Natürlich können Sie die Signierung für jede Nachricht "
-"einzeln abschalten. "
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Verschlüsseln"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Beim Verschlüsseln von E-Mails auch für den eigenen Schlüssel lesbar machen"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Wenn diese Option gewählt ist, wird die Nachricht nicht nur mit dem "
-"öffentlichen Schlüssel des Empfängers, sondern auch mit ihrem eigenen Schlüssel "
-"verschlüsselt. Nur so ist es ihnen möglich, die eigene Nachricht später wieder "
-"zu entschlüsseln. Diese Option sollte also eigentlich immer gewählt werden."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "S&ignierten/verschlüsselten Text nach der Erstellung anzeigen"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Wenn diese Option gewählt ist, wird der signierte/verschlüsselte Text in einem "
-"Extrafenster angezeigt. Damit können Sie überprüfen, wie die Nachricht beim "
-"Empfänger ankommt. Das ist eine gute Möglichkeit zur Überprüfung, ob das "
-"Verschlüsselungssystem einwandfrei arbeitet."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Versendete Nachrichten &verschlüsselt speichern"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-"Markieren Sie dieses Ankreuzfeld, um Nachrichten verschlüsselt zu speichern "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Nachrichten verschlüsselt speichern</h1>\n"
-"Wenn dieses Ankreuzfeld markiert ist, werden versendete Nachrichten "
-"verschlüsselt gespeichert so wie sie versendet wurden. Das wird nicht "
-"empfohlen, da Sie die Nachrichten nicht mehr lesen können, sobald eines der "
-"Zertifikate abgelaufen ist.\n"
-"<p>\n"
-"Möglicherweise gibt es lokale Richtlinien, die die Aktivierung dieser Option "
-"dennoch erforderlich machen. Sprechen Sie im Zweifelsfalls mit dem lokalen "
-"Systemverwalter.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Verschlüsselungsschlüssel immer &zur Bestätigung anzeigen"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Wenn diese Option gewählt ist, zeigt die Anwendung immer eine Liste "
-"öffentlicher Schlüssel zur Auswahl des Schlüssels, der zur Verschlüsselung "
-"verwendet werden soll. Falls sie deaktiviert ist, wird der Dialog nur dann "
-"angezeigt, wenn die Anwendung keinen passenden Schlüssel findet oder mehrere "
-"Schlüssel zur Auswahl stehen."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Nachrichten möglichst automatisch ver&schlüsseln"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Wenn diese Option aktiviert ist, werden alle ausgehenden Nachrichten "
-"verschlüsselt, sofern Verschlüsselung möglich und sinnvoll ist. Diese "
-"Einstellung kann für jede einzelne Nachricht geändert werden."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-"Nachrichten beim Speichern als Entwurf &niemals signieren/verschlüsseln"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Wie funktioniert das?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "An: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopie: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Allgemein"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Antwort an"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Allen antworten"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Weiterleiten"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Kurzbefehl:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Vorlagen&typ:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Ordner-Eigenschaften"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Ordner enthält &Mailingliste"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Listenadresse:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "No&rmal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Ungelesen:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Löschen von alten Nachrichten"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Löschen &nach:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Ge&lesene Nachrichten löschen"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Löschen &nach:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Alte &ungelesene Nachrichten löschen"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Tag(e)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Woche(n)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Monat(e)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Erweitert"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Absender-&Identität:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Speicherformat:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listenelemente:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Gültige Zertifikate unter Verwendung von CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Falls diese Option gewählt ist, werden S/MIME-Zertifikate mit Hilfe von "
-"Zertifikatsrückruflisten (CRLs) überprüft."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Zertifikate online überprüfen (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Falls diese Option gewählt ist, werden S/MIME-Zertifikate online über das "
-"\"Online Certificates Status Protocol\" (OCSP) überprüft. Tragen Sie die URL "
-"des OCSP-Antwortservers unten ein."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Online-Zertifikatsüberprüfung"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL des OCSP-Antwortservers:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Geben Sie hier die Adresse des Servers für die Online-Überprüfung von "
-"Zertifikaten ein (OCSP-Antwortserver). Die URL beginnt üblicherweise mit "
-"http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Signatur des OCSP-Antwortservers:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Service-URL von Zertifikaten ignorieren"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Zertifikatseinstellungen nicht überprüfen"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Standardmäßig verwendet GnuPG die Datei ~/.gnupg/policies.txt zur Überprüfung, "
-"ob ein bestimmter Umgang mit einem Zertifikat erlaubt ist. Falls diese Option "
-"gewählt ist, wird die Überprüfung nicht durchgeführt."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "CRLs niemals verwenden"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Falls diese Option gewählt ist, werden Zertifikatsrückruflisten (CRLs) niemals "
-"für die Überprüfung von S/MIME-Zertifikaten verwendet."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Fehlende Ausstellerzertifikate herunterladen"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Falls diese Option ausgewählt ist, werden fehlende Ausstellerzertifikate "
-"heruntergeladen (das gilt für beide Überprüfungsmethoden, CRLs und OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-Anfragen"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Es sollen keine HTTP-Anfragen durchgeführt werden"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Damit wird die Verwendung von HTTP für S/MIME vollständig deaktiviert."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Dieser Proxy soll für HTTP-Anfragen verwendet werden: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Der System HTTP-Proxy soll verwendet werden:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Falls diese Einstellung gewählt ist, wird der rechts angezeigte "
-"HTTP-Proxyserver (die Einstellung stammt aus der Umgebungsvariable "
-"\"http_proxy\") für alle HTTP-Anfragen verwendet."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Geben Sie die Adresse ihres HTTP-Proxyservers ein. Dieser Proxy wird für alle "
-"HTTP-Anfragen im Zusammenhang mit S/MIME verwendet. Ein Eintrag hat die Form "
-"\"Rechner:Port\", also z. B. \"meinproxy.nirgendwo.com:3128\"."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "HTTP CRL-Verteilungspunkt von Zertifikaten ignorieren"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Für die Suche der Adresse für eine CRL enthält das fragliche Zertifikat häufig "
-"die Angabe eines \"CRL-Verteilers (Distribution Point DP)\", der die Angabe von "
-"URLs zur Beschreibung des Zugriffs auf die URL enthält. Der erste DP-Eintrag "
-"wird verwendet. Bei dieser Einstellung werden alle HTTP-URLs auf der Suche nach "
-"einem DP-Eintrag ignoriert."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-Anfragen"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Keine LDAP-Anfragen durchführen"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Damit werden LDAP-Anfragen für S/MIME vollständig deaktiviert."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "LDAP CRL-Verteilungspunkt von Zertifikaten ignorieren"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Für die Suche der Adresse für eine CRL enthält das fragliche Zertifikat häufig "
-"die Angabe eines \"CRL-Verteilers (Distribution Point DP)\", der die Angabe von "
-"URLs zur Beschreibung des Zugriffs auf die URL enthält. Der erste DP-Eintrag "
-"wird verwendet. Bei dieser Einstellung werden alle LDAP-URLs auf der Suche nach "
-"einem DP-Eintrag ignoriert."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primärer Rechner für LDAP-Anfragen:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Ein hier eingetragener LDAP-Server erhält alle LDAP-Anfragen zuerst. Diese "
-"Einstellung überschreibt auch alle Rechner- und Port-Einstellungen, die als "
-"Teil einer LDAP-URL angegeben werden. Andere LDAP-Server werden erst dann "
-"kontaktiert, wenn die Verbindung zum \"Proxy\" fehlschlägt.\n"
-"Die Syntax des Eintrags lautet \"Rechner\" oder \"Rechner:Port\". Im ersten "
-"Fall wird der Standard-LDAP-Port 389 verwendet."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Textbaustein hinzufügen"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Hinzufügen"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Textbaustein:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Gruppe:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Einstellungen für Textbausteine"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Kurzinfos"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Inhalt der Textbausteine in der &Kurzinfo anzeigen"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Legt fest, ob eine Kurzinfo angezeigt wird, die Text der als Lesezeichen "
-"markierten Zeile enthält"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variablen"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Eingabemethode für Variablen"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Je ein Dialog für jede Variable eines Textbausteins"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Zeigt ein Eingabefeld für jede Variable eines Textbausteines an."
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Ein Dialog für alle Variablen in einem Textbaustein."
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Zeigt ein einziges Eingabefeld für für Werte aller Variablen eines "
-"Textbausteines an."
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Trennzeichen:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Vorlagen einrichten"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Antwort an Absender:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Allen antworten / der Liste antworten"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Nachricht weiterleiten"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Vor dem Versand &unsignierter Nachrichten warnen"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Markieren Sie dieses Ankreuzfeld, um vor dem Versand unsignierter Nachrichten "
-"gewarnt zu werden."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Vor dem Versand unsignierter Nachrichten warnen</h1>\n"
-"Falls diese Option aktiviert ist, werden Sie vor dem Versand von unsignierten "
-"Nachrichten oder Nachrichtenteilen gewarnt.\n"
-"<p>\n"
-"Für maximale Sicherheit sollte diese Option aktiviert sein.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Vor dem Versand von unverschlüsselten Nachrichten &warnen"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Markieren Sie diese Option, um vor dem Versand unverschlüsselter Nachrichten "
-"gewarnt zu werden."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Vor dem Versand von unverschlüsselten Nachrichten warnen</h1>\n"
-"Falls dieses Ankreuzfeld markiert ist, werden Sie gewarnt, falls Sie Teile eine "
-"Nachricht oder ganze Nachrichten unverschlüsselt versenden wollen.\n"
-"<p>\n"
-"Für maximale Sicherheit sollte diese Option markiert sein.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Warnung, falls die E-Mail-Adresse des Em&pfängers nicht im Zertifikat enthalten "
-"ist"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Markieren Sie dieses Ankreuzfeld, um gewarnt zu werden, falls die "
-"E-Mail-Adresse des Empfängers nicht Teil des Zertifikats ist"
+"Da der Mailserver den TOP-Befehl nicht unterstützt, ist es nicht möglich, "
+"von großen E-Mails zuerst nur den Vorspann abzuholen."
 
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warnung, falls die E-Mail-Adresse des Empfängers nicht im Zertifikat "
-"enthalten ist</h1>\n"
-"Ist dieses Ankreuzfeld markiert, wird gewarnt, falls die E-Mail-Adresse des "
-"Empfängers nicht in dem Zertifikat enthalten ist, das für die Verschlüsselung "
-"verwendet wird.\n"
-"<p>\n"
-"Für maximale Sicherheit sollte diese Option eingeschaltet sein.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Warnung, falls Zertifikate/Schlüssel in Kürze ablaufen (Zeitgrenzen werden "
-"weiter unten festgelegt)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Zur Signierung"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Zur Verschlüsselung"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " Tag(e)"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Wählen Sie hier die Anzahl der Tage aus"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warnungszeitspanne vor dem Ablauf des Signierungszertifikats</h1>\n"
-"Hier können Sie die Zeitspanne in Tagen einstellen, die ein Zertifikat "
-"mindestens die Gültigkeit behalten muss, um ohne Warnung verwendet werden zu "
-"können.\n"
-"<p>\n"
-"Die für die SPHINX-Umgebung empfohlene Einstellung beträgt 14 Tage.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warnungszeitspanne bei drohendem Ablauf des Verschlüsselungszertifikats</h1>"
-"\n"
-"Wählen Sie die minimale Anzahl von Tagen, die das zur Verschlüsselung "
-"verwendete Zertifikat noch gültig sein muss, damit eine Warnung unterbleibt.\n"
-"<p>\n"
-"Für die SPHINX-Umgebung wird eine Einstellung von 14 Tagen empfohlen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warnung vor dem Ablauf eines Zertifikats in der Zertifikatskette</h1>\n"
-"Tragen Sie hier die Anzahl der Tage ein, die alle Zertifikate einer Kette "
-"mindestens noch Gültigkeit besitzen müssen, damit keine Warnung angezeigt "
-"wird.\n"
-"<p>\n"
-"Für die SPHINX-Umgebung wird eine Einstellung von 14 Tagen empfohlen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warnungszeitspanne vor dem Ablauf des Zertifikats der Zertifizierungsstelle "
-"(CA)</h1>\n"
-"Hier können Sie die minimale Zeitspanne in Tagen einstellen, die das Zertifikat "
-"der Zertifizierungsstelle mindestens noch gültig sein muss.\n"
-"<p>\n"
-"Für die SPHINX-Umgebung wird eine Einstellung von 14 Tagen empfohlen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warnungszeitspanne vor dem Ablauf des Wurzelzertifikats</h1>\n"
-"Hier können Sie die Zeitspanne in Tagen einstellen, die das Wurzelzertifikat "
-"mindestens die Gültigkeit behalten muss, um ohne Warnung verwendet werden zu "
-"können.\n"
-"<p>\n"
-"Die für die SPHINX-Umgebung empfohlene Einstellung beträgt 14 Tage.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Für Wurzelzertifikate:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Für intermediäre CA-Zertifikate:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Für Endbenutzerzertifikate/Schlüssel:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Alle \"Nicht wieder fragen\"-Warnungen reaktivieren"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Vorlageninhalt"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Kurzbefehl für Vorlage"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Vorlagentyp"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Wartende Nachrichten beim Mailabruf versenden"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p>Wählen Sie, ob KMail die Nachrichten im Postausgang versenden soll, wenn ein "
-"manueller oder automatischer Mailabruf erfolgt oder ob überhaupt kein "
-"automatisches Versenden durchgeführt werden soll.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Nicht synchronisierte E-Mails aus Ordnern mit ungenügenden Zugriffsrechten "
-"automatisch verschieben."
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Befinden sich in einem Ordner neue Nachrichten, die noch nicht auf den Server "
-"hochgeladen wurden und für den Sie ungenügende Zugriffsrechte zum Hochladen "
-"haben, werden diese E-Mails automatisch in einen \"Verloren+Gefunden\"-Ordner "
-"verschoben."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Lokale Markierungen in nur lesbaren Ordnern zulassen"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Diese Einstellung erlaubt es Systemverwaltern, einen Mindestzeitraum zwischen "
-"zwei E-Mail-Überprüfungen festzulegen.\"\n"
-"           \"Der Benutzer kann keinen kleineren Zeitraum als den hier "
-"angegebenen auswählen."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Der zuletzt gewählte Ordner im Ordnerauswahldialog."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Umask-Einstellungen des Benutzers ignorieren und stattdessen "
-"Lese-/Schreibzugriff nur für den Benutzer gebrauchen"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Regelungen zur Anzeige des Kontrollleistensymbols"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Anwendung mit dem Schließen des Hauptfensters beenden, selbst wenn das "
-"Kontrollleistensymbol angezeigt wird."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Ausführliche Benachrichtigung bei neuen Nachrichten"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Falls diese Option ausgewählt ist, wird für jeden Ordner die Anzahl neu "
-"eingegangener Nachrichten bei der Benachrichtigung bei neuen Nachrichten "
-"angezeigt; andernfalls erscheint lediglich eine Nachricht \"Neue "
-"Nachrichten\"-Benachrichtigung."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "E&ditor angeben:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "E&xternen Editor verwenden"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"Dies ist der Schwellwert für die Warnmeldung, die erscheint, wenn ein Ordner "
-"die Kontingent-Grenze zu überschreiten droht."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Arbeitsgruppenfunktionen aktivieren"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Bei Antworten auf Antworten Von:/An:-Vorspannfelder mischen"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Das Programm Microsoft Outlook implementiert den iCalendar-Standard nicht "
-"vollständig korrekt. Diese Option korrigiert einen solchen Fehler. Falls "
-"Benutzer von Outlook ihre Antworten nicht erhalten, können Sie diese Option "
-"auswählen."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Arbeitsgruppeneinladungen im Nachrichtenhauptteil versenden"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Das Programm Microsoft Outlook implementiert den iCalendar-Standard nicht "
-"vollständig korrekt. Diese Option korrigiert einen solchen Fehler. Falls "
-"Benutzer von Outlook ihre Einladungen nicht erhalten, wählen Sie diese Option "
-"aus."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Exchange-kompatibles Einladungsformat"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Wenn Microsoft Outlook in Verbindung mit einem Microsoft Exchange Server "
-"verwendet wird, hat es Probleme, standardkonforme Groupware E-Mails zu "
-"verstehen. Aktivieren Sie diese Einstellung, um Groupware-Einladungen in einem "
-"Format zu senden, das Microsoft Exchange versteht."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Falls diese Option markiert ist, erscheint das Fenster zur Nachrichteneingabe "
-"nicht. Stattdessen werden alle Einladungen automatisch versendet. Falls Sie die "
-"Nachrichten vor dem Versand sehen möchten, müssen Sie diese Einstellung "
-"deaktivieren. Der Text der Einladung ist allerdings in der Syntax von iCalendar "
-"verfasst und sollte daher nicht von Hand verändert werden."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Einladungen löschen, nachdem eine Antwort versendet wurde"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Wenn diese Einstellung aktiviert ist, werden Einladungs-Nachrichten in den "
-"Mülleimer verschoben, nachdem die Antwort auf sie erfolgreich versendet wurde."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Durch Aktivierung dieser Option können die Einträge der Kontakt-Anwendungen "
-"(KOrganizer, KAdressbuch, und Knotes) gespeichert werden.</p> "
-"<p>Falls Sie diese Option aktivieren wollen, müssen Sie außerdem die "
-"Anwendungen zur Verwendung der IMAP-Ressource einrichten. Das wird im "
-"Kontrollzentrum durchgeführt.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalerweise gibt es keinen Grund, die Ordner mit den IMAP-Ressourcen "
-"anzeigen zu lassen. Falls es dennoch nötig sein sollte, können Sie die "
-"Einstellung hier vornehmen.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Wenn das benutzte Konto zur Speicherung von Informationen über "
-"Arbeitsgruppen \"\n"
-"          \"nicht zur Verwaltung normaler E-Mails genutzt wird, sollte diese "
-"Auswahl eingestellt sein, damit KMail nur \"\n"
-"          \"Ordner von Arbeitsgruppen anzeigt. Dies ist hilfreich, wenn ebenso "
-"normale E-Mails \"\n"
-"          \"durch ein zusätzliches IMAP-Konto online verarbeitet werden.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Speicherformat der Arbeitsgruppenordner wählen. "
-"<ul> "
-"<li>Standardmäßig wird \"ical\" (für Kalenderordner) und \"vcard\" (für "
-"Adressbuchordner) verwendet. In diesen Formaten stehen alle Funktionen von "
-"Kontact zur Verfügung.</li> "
-"<li>Das Kolab XML-Format ist ein benutzerdefiniertes Modell, das mehr der "
-"Darstellung von Outlook entspricht. Dieses Format verfügt über eine bessere "
-"Kompatibilität zu Outlook bei Verwendung eines Kolab-Servers oder einer "
-"ähnlichen Lösung.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Hier wird der Stammordner der IMAP-Ressourcenordner gewählt.</p> "
-"<p>Standardmäßig legt der Kolab-Server den IMAP-Posteingangsordner als "
-"Stammordner fest.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Dies ist die ID des Benutzerzugangs, der die IMAP-Ressourcenordner "
-"verwaltet.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Falls Sie die Ordnernamen des IMAP-Speichers in ihrer eigenen Sprache "
-"benannt haben wollen, wählen Sie zwischen den verfügbaren Sprachen die "
-"gewünschte aus.</p> "
-"<p>Bitte beachten Sie, dass der einzige Grund dazu die Kompatibilität zu "
-"Microsoft Outlook ist. Generell ist es eher ungünstig, da damit ein "
-"Sprachwechsel unmöglich gemacht wird.</p> "
-"<p>Wählen Sie diese Option also nur aus, wenn dies unbedingt notwendig ist.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-"Auch Nachrichten filtern, die in Arbeitsgruppen-Ordnern eingegangen sind."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Arbeitsgruppendaten in DIMAP-Ordnern unmittelbar abgleichen, falls der Status "
-"\"Online\" ist."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Dieser Wert legt fest, ob die Einführung zu KMail angezeigt wird."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maximale Anzahl von Verbindungen pro Rechner"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Hiermit kann die maximale Anzahl von Verbindungen pro Rechner beim Abruf neuer "
-"Nachrichten begrenzt werden. Standardmäßig ist die Anzahl der Verbindungen "
-"unbegrenzt (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Eingabefeld zur Schnellsuche anzeigen"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Mit dieser Option wird die Anzeige der Eingabefeld zur Schnellsuche oberhalb "
-"der Nachrichtenliste ein-/ausgeschaltet. Sie ermöglicht die schnelle Suche von "
-"Informationen in der Nachrichtenliste."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Lokalen Posteingang ausblenden, falls unbenutzt"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Standardmäßig \"Im Text\" weiterleiten"
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Das Semikolon als Trennzeichen zwischen Empfängeradressen im Editor zulassen."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Originalen Zeichensatz beim Beantworten oder Weiterleiten möglichst beibehalten"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Si&gnatur automatisch einfügen"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Diese Identität merken, damit sie bei späterer Verwendung des E-Mail-Editors "
-"erneut benutzt wird.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Diesen Ordner für Gesendete merken, damit er bei späterer Verwendung des "
-"E-Mail-Editors erneut benutzt wird."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Diese Versandart merken, damit sie bei späterer Verwendung des E-Mail-Editors "
-"erneut benutzt wird."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Diese Identität merken, damit sie bei späterer Verwendung des E-Mail-Editors "
-"erneut benutzt wird.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Zeilenu&mbruch bei Spalte:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Maximale Anzahl von Empfängerzeilen im Editor."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Schalten Sie diese Einstellung ein, damit Outlook &#8482; die Namen von "
-"Anhängen akzeptiert, die Sonderzeichen enthalten"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "A&utomatisch Empfangs- und Lesebestätigungen anfordern"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Durch diese Option wird die Anforderung einer Empfangs- und Lesebestätigung "
-"(MDN) für jede versendete Nachricht aktiviert.</p>"
-"<p>Diese Option gibt die Standardeinstellung vor. MDNs können immer noch auf "
-"Nachrichtenebene im Fenster Nachricht erstellen über das Menü <em>"
-"Einstellungen</em>-><em>Empfangs- und Lesebestätigung anfordern</em> "
-"eingestellt werden.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Zuletzt benutzte Adressen beim Autovervollständigen benutzen"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Schalten Sie diese Option aus, wenn Sie nicht wollen, dass kürzlich benutzte "
-"Adressen beim Autovervollständigen von Empfängeradressen vorgeschlagen werden."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Intervall für automatisches Speichern:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Der Text im Editor kann regelmäßig gesichert werden. Der Abstand zwischen den "
-"Speichervorgängen kann hier festgelegt werden. Sie können das automatische "
-"Speichern auch abschalten, indem Sie hier den Wert 0 angeben."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Signatur vor zitiertem Text einfügen."
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "&Erkannte Präfixe durch \"Re:\" ersetzen"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Erkannte Präfixe durch \"&Fwd:\" ersetzen"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "I&ntelligent zitieren"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Die Signatur ist abgelaufen."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Art der Empfängerauswahl"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Legt den Dialogtyp zur Auswahl der Empfänger in den Feldern \"An\",\n"
-"\"Kopie\" und \"Blindkopie\" fest."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Art des Empfängereditors"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Legt die Art des Editors zur Bearbeitung der Empfänger für die Felder \"An\",\n"
-"\"Kopie\" und \"Blindkopie\" fest."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maximale Anzahl von Empfängerzeilen im Editor."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Liste der Nachrichtenteile, die beim Weiterleiten von Nachrichten \"im Text\" "
-"entfernt werden sollen."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Die maximal zulässige Größe in MB für E-Mail-Anhänge."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Textbaustein-Werkzeugleiste im E-Mail-Editor anzeigen."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"GnuPG-Prüfprotokoll auch anzeigen, wenn Kryptographieoperationen erfolgreich "
-"abgeschlossen wurden."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Originalen Zeichensatz beim Beantworten oder Weiterleiten möglichst beibehalten"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"In einigen E-Mails, insbesondere automatisch erzeugten, fehlen Informationen "
-"zur verwendeten Kodierung. Diese ist aber zur korrekten Darstellung "
-"erforderlich. In diesen Fällen wird eine Standardkodierung verwendet, die hier "
-"eingestellt werden kann. Verwenden Sie die Kodierung, die in ihrem Teil der "
-"Welt die am häufigsten verwendete ist. Standardmäßig wird die für das "
-"Gesamtsystem verwendete Kodierung verwendet."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Wenn Sie die Einstellung \"Automatisch\" nicht verwenden, wird die eingestellte "
-"Kodierung für alle E-Mails verwendet, auch dann, wenn E-Mails andere Vorgaben "
-"enthalten."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Aktivieren Sie diese Einstellung, damit Smileys wie \":-)\" im Nachrichtentext "
-"durch Emoticons (kleine Bilder) ersetzt werden."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Schalten Sie diese Option ein, um Zitate verschiedener Ebenen gestaffelt "
-"anzuzeigen. Wenn Sie diese Option ausschalten, werden die verschiedenen Ebenen "
-"ohne Unterschied dargestellt."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Stufe für automatisches Zusammenfalten:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Schriftgröße bei Zitaten verkleinern"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Wenn diese Option eingeschaltet ist, wird zitierter Text kleiner angezeigt."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Versendete Nachrichten &verschlüsselt speichern"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "E-Mail-Programm im dekorativen Vorspann anzeigen"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Durch Aktivierung dieser Auswahl, werden Informationen über den User-Agent und "
-"X-Mailer im dekorativen Vorspann angezeigt."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Löschen von Anhängen aus vorhandenen E-Mails zulassen."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Bearbeiten von Anhängen in vorhandenen E-Mails zulassen."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Nachrechten beim Betrachten immer entschlüsseln, oder vorher fragen"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Empfangs- und Lesebenachrichtigungen mit leerem Absender senden."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Sendet Empfangs- und Lesebenachrichtigungen mit leerem Absender-Vorspann. "
-"Manche Server sind so eingerichtet, dass Sie solche Nachrichten zurückweisen. "
-"Falls Sie also Schwierigkeiten beim Versenden von MDNs haben, deaktivieren Sie "
-"diese Einstellung."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "\"Redewendungen\" wurde zu \"Vorlagen\" geändert"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Alte Redewendungen wurden in Vorlagen umgewandelt"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Nachrichtenvorlage für neue Nachricht"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Nachrichtenvorlage für Antwort"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Nachrichtenvorlage für Antwort an alle"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Nachrichtenvorlage für Weiterleitung"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Zitatzeichen"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-"Einstellungen zur Abwesenheits-Benachrichtigung dürfen vom Benutzer geändert "
-"werden."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Ermöglicht es Benutzern, Abwesenheits-Benachrichtigungen via Sieve hochzuladen, "
-"aber nicht, irgendwelche Einstellungen zu ändern (Domäne, Spam-Reaktion)."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Abwesenheits-Benachrichtigungen nur für E-Mails von dieser Domäne senden."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Abwesenheits-Benachrichtigung auch für E-Mails senden, die als Spam markiert "
-"sind."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Beim Start der Anwendung prüfen, ob Abwesenheits-Benachrichtigungen aktiv sind."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 von %2 %3 benutzt"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14154,6 +12107,11 @@ msgstr "Hinzufügen als \"Kopie\""
 msgid "Add as BCC"
 msgstr "Hinzufügen als \"Blindkopie\""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Abbrechen"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14169,10 +12127,10 @@ msgstr "Ausgewählte Empfänger"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Sie haben einen Empfänger ausgewählt. Die maximal unterstützte Anzahl von "
 "Empfängern beträgt %1. Bitte passen Sie die Auswahl an.\n"
@@ -14193,11 +12151,11 @@ msgstr "Adress-Auswahldialog verwenden"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Dieser Knopf öffnet einen eigenen Dialog, mit dem Sie die Empfänger aus allen "
-"verfügbaren Adressen auswählen können."
+"Dieser Knopf öffnet einen eigenen Dialog, mit dem Sie die Empfänger aus "
+"allen verfügbaren Adressen auswählen können."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14299,10 +12257,19 @@ msgstr "ist größer als oder gleich"
 msgid " bytes"
 msgstr " Bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " Tag(e)"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Zur Durchführung der Suche müssen zunächst alle Nachrichten des Ordners %1 "
 "heruntergeladen werden. Das kann einige Zeit dauern. Wollen Sie dennoch "
@@ -14452,16 +12419,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Sammeln von Daten über Zugang \"%1\" ...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Sammeln von Daten über Zugang \"%1\" ...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14480,10 +12443,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Inhalt von Skript \"%1\":\n"
+msgid "Contents of script '%1':\n"
+msgstr "Inhalt von Skript \"%1\":\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14506,20 +12467,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-Fähigkeiten:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-Fähigkeiten:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(keine besonderen Fähigkeiten verfügbar)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Vorhandene Sieve-Skripte:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Vorhandene Sieve-Skripte:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14599,8 +12556,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Verwenden Sie diesen Anforderungsknopf, um eine Textdatei mit ihrer Signatur "
 "auszuwählen. Die Datei wird bei jeder neuen zu signierenden Mail neu gelesen."
@@ -14619,22 +12576,27 @@ msgstr "Öffnet die angegebene Datei in einem Texteditor."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Hier können Sie einen beliebigen Befehl eingeben, entweder mit oder ohne Pfad, "
-"abhängig davon, ob der Pfad zum Befehl in der Umgebungsvariablen \"PATH\" "
-"angegeben ist. Der Befehl wird für jede neue Nachricht ausgeführt und seine "
-"Ausgabe (an die Standardausgabe) als Signatur verwendet. Übliche Befehle sind "
-"\"fortune\" oder \"ksig -random\"."
+"Hier können Sie einen beliebigen Befehl eingeben, entweder mit oder ohne "
+"Pfad, abhängig davon, ob der Pfad zum Befehl in der Umgebungsvariablen \"PATH"
+"\" angegeben ist. Der Befehl wird für jede neue Nachricht ausgeführt und "
+"seine Ausgabe (an die Standardausgabe) als Signatur verwendet. Übliche "
+"Befehle sind \"fortune\" oder \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Befehl:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Pfad"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Neuer Eintrag:"
@@ -14670,6 +12632,11 @@ msgstr ""
 "Möchten Sie diese Gruppe und alle darin enthaltenen Textbausteine wirklich "
 "löschen?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Anwenden &auf:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Textbaustein bearbeiten"
@@ -14682,6 +12649,10 @@ msgstr "Gruppe bearbeiten"
 msgid "Edit &group..."
 msgstr "Gruppe &bearbeiten ..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Bearbeiten ..."
@@ -14720,13 +12691,13 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Wenn Sie diese Einstellung aktivieren, wird der rechts eingegebene Wert "
-"gespeichert. Wenn Sie dieselbe Variable später erneut verwenden, auch in einem "
-"anderen Textbaustein, erhält die Variable diesen Wert als Standardwert."
+"gespeichert. Wenn Sie dieselbe Variable später erneut verwenden, auch in "
+"einem anderen Textbaustein, erhält die Variable diesen Wert als Standardwert."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14761,6 +12732,16 @@ msgstr "Nicht einschalten"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Inhalt aus Datei %1 kann nicht eingefügt werden: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "An: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopie: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14791,67 +12772,56 @@ msgstr "Vorverarbeitungsbefehl von Vorlage kann nicht gestartet werden: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier können Sie Nachrichtenvorlagen erstellen, die Sie beim Schreiben neuer "
-"Nachrichten , beim Antworten oder beim Weiterleiten von Nachrichten benutzen "
-"können.</p>"
-"<p>Die Vorlagen unterstützen das automatische Ersetzen von Platzhaltern; sie "
-"können diese manuell eingeben oder aus dem Menü <i>Platzhalter einfügen</i> "
-"wählen.</p>"
-"<p>Vorlagen, die hier erstellt werden, gelten nur für diesen Ordner. Sie haben "
-"Priorität sowohl vor globalen Vorlagen als auch vor Vorlagen für diese "
-"Identität, falls solche existieren.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hier können Sie Nachrichtenvorlagen erstellen, die Sie beim Schreiben "
+"neuer Nachrichten , beim Antworten oder beim Weiterleiten von Nachrichten "
+"benutzen können.</p><p>Die Vorlagen unterstützen das automatische Ersetzen "
+"von Platzhaltern; sie können diese manuell eingeben oder aus dem Menü "
+"<i>Platzhalter einfügen</i> wählen.</p><p>Vorlagen, die hier erstellt "
+"werden, gelten nur für diesen Ordner. Sie haben Priorität sowohl vor "
+"globalen Vorlagen als auch vor Vorlagen für diese Identität, falls solche "
+"existieren.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier können Sie Nachrichtenvorlagen erstellen, die Sie beim Schreiben neuer "
-"Nachrichten , beim Antworten oder beim Weiterleiten von Nachrichten benutzen "
-"können.</p>"
-"<p>Die Vorlagen unterstützen das automatische Ersetzen von Platzhaltern; sie "
-"können diese manuell eingeben oder aus dem Menü <i>Platzhalter einfügen</i> "
-"wählen.</p>"
-"<p>Vorlagen, die hier erstellt werden, gelten für diese Identität. Sie haben "
-"Priorität vor globalen Vorlagen, werden aber ggf. von ordnerspezifischen "
-"Vorlagen überschrieben.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hier können Sie Nachrichtenvorlagen erstellen, die Sie beim Schreiben "
+"neuer Nachrichten , beim Antworten oder beim Weiterleiten von Nachrichten "
+"benutzen können.</p><p>Die Vorlagen unterstützen das automatische Ersetzen "
+"von Platzhaltern; sie können diese manuell eingeben oder aus dem Menü "
+"<i>Platzhalter einfügen</i> wählen.</p><p>Vorlagen, die hier erstellt "
+"werden, gelten für diese Identität. Sie haben Priorität vor globalen "
+"Vorlagen, werden aber ggf. von ordnerspezifischen Vorlagen überschrieben.</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier können Sie Nachrichtenvorlagen erstellen, die Sie beim Schreiben neuer "
-"Nachrichten , beim Antworten oder beim Weiterleiten von Nachrichten benutzen "
-"können.</p>"
-"<p>Die Vorlagen unterstützen das automatische Ersetzen von Platzhaltern; sie "
-"können diese manuell eingeben oder aus dem Menü <i>Platzhalter einfügen</i> "
-"wählen.</p>"
-"<p>Dies ist eine globale (Standard-) Vorlage. Sie kann sowohl von Vorlagen für "
-"eine Identität als auch von ordnerspezifischen Vorlagen überschrieben "
-"werden.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hier können Sie Nachrichtenvorlagen erstellen, die Sie beim Schreiben "
+"neuer Nachrichten , beim Antworten oder beim Weiterleiten von Nachrichten "
+"benutzen können.</p><p>Die Vorlagen unterstützen das automatische Ersetzen "
+"von Platzhaltern; sie können diese manuell eingeben oder aus dem Menü "
+"<i>Platzhalter einfügen</i> wählen.</p><p>Dies ist eine globale (Standard-) "
+"Vorlage. Sie kann sowohl von Vorlagen für eine Identität als auch von "
+"ordnerspezifischen Vorlagen überschrieben werden.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -15086,14 +13056,14 @@ msgstr "Ergebnis eines Befehls einfügen"
 #: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
-"Nachrichteninhalt der Originalnachricht durch Vorverarbeitungsprogramm laufen "
-"lassen und Ergebnis als Zitat einfügen"
+"Nachrichteninhalt der Originalnachricht durch Vorverarbeitungsprogramm "
+"laufen lassen und Ergebnis als Zitat einfügen"
 
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
-"Nachrichteninhalt der Originalnachricht durch Vorverarbeitungsprogramm laufen "
-"lassen und Ergebnis unverändert einfügen"
+"Nachrichteninhalt der Originalnachricht durch Vorverarbeitungsprogramm "
+"laufen lassen und Ergebnis unverändert einfügen"
 
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
@@ -15104,14 +13074,18 @@ msgstr ""
 #: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr ""
-"Nachrichteninhalt dieser Nachricht durch Vorverarbeitungsprogramm laufen lassen "
-"und Ergebnis einfügen"
+"Nachrichteninhalt dieser Nachricht durch Vorverarbeitungsprogramm laufen "
+"lassen und Ergebnis einfügen"
 
 #: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
-"Nachrichteninhalt dieser Nachricht durch Vorverarbeitungsprogramm laufen lassen "
-"und durch Ergebnis ersetzen"
+"Nachrichteninhalt dieser Nachricht durch Vorverarbeitungsprogramm laufen "
+"lassen und durch Ergebnis ersetzen"
+
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
 
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
@@ -15145,117 +13119,6 @@ msgstr "Fehlersuche einschalten"
 msgid "Turn Debug Off"
 msgstr "Fehlersuche ausschalten"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>... dass Sie mit Hilfe der Tasten \"Pfeil links\" und \"Pfeil rechts\" zur "
-"nächsten bzw.\n"
-"vorherigen Nachricht wechseln können?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>... dass Sie über <em>Werkzeuge-&gt;Filter&nbsp;erstellen</em> "
-"mit wenigen Schritten\n"
-" Filter für Absender, Empfänger, Betreff und Mailinglisten erzeugen können?</p>"
-"\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... dass Sie den bei einigen Mailinglisten automatisch zum Betreff\n"
-"hinzugefügten Teil &quot;[Mailinglistenname]&quot; mit Hilfe der \n"
-"Filteraktion <em>Vorspann umschreiben</em> entfernen können? Verwenden Sie\n"
-"<pre>Vorspann umschreiben &quot;Betreff&quot;\n"
-"   ersetzen &quot;\\s*\\[Mailinglistenname\\]\\s*&quot;\n"
-"   durch &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>... dass Sie im Dialog <em>Ordner-&gt;Verwaltung einer Mailingliste</em>\n"
-"eine Mailingliste mit einem Ordner verbinden können? Danach können Sie durch "
-"Rechtsklick auf den Ordner und dann "
-"<em>Neue&nbsp;Nachricht&nbsp;an&nbsp;Mailingliste ...</em> "
-"das Fenster \"Nachricht erstellen\"\n"
-"mit der Mailingliste als voreingestelltem Empfänger öffnen. Alternativ können "
-"Sie mit der mittleren Maustaste auf den Ordner klicken.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>... dass Sie über <em>Ordner-&gt;Eigenschaften ...</em> jedem Ordner \n"
-"ein individuelles Symbol zuordnen können?</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>... dass KMail einen Farbbalken darstellen kann, der den Typ der\n"
-"Nachricht (Text/HTML/OpenPGP) anzeigt?</p>\n"
-"<p>Das beugt Versuchen vor, erfolgreich überprüfte Signierungen durch "
-"HTML-Mails, die die Signierungsstatusanzeige von KMail nachbilden, zu "
-"fälschen.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>... dass Sie nach einem Vorspannfeld filtern können, indem Sie dessen Namen "
-"im ersten Eingabefeld einer Suchregel eintragen?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... dass Sie reine HTML-Nachrichten mit der Filterregel\n"
-"<pre>&quot;Content-type&quot; enthält &quot;text/html&quot;</pre>\n"
-"herausfiltern können?</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>... dass bei einer Antwort nur der markierte Nachrichtenteil zitiert "
-"wird?</p>\n"
-"<p>Falls nichts markiert ist, wird die gesamte Nachricht zitiert.</p>\n"
-"<p>Das funktioniert auch mit Texten in Anhängen, falls Sie die Einstellung\n"
-"<em>Ansicht-&gt;Anhänge-&gt;Im&nbsp;Text ...</em> ausgewählt haben.</p>\n"
-"<p>Diese Funktion ist für alle Antwortbefehle außer\n"
-"<em>Nachricht-&gt;Ohne&nbsp;Zitierung&nbsp;antworten</em> aktiv.</p>\n"
-"<p align=\"right\"><em>beigesteuert von David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Es kann nichts rückgängig gemacht werden."
@@ -15321,6 +13184,16 @@ msgstr "Anhang #%1 (unbenannt)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "GnuPG-Prüfprotokoll für diese Operation anzeigen"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Die Datei \"%1\" existiert bereits. Soll die Datei überschrieben werden?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Datei überschreiben?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15439,14 +13312,14 @@ msgstr "&Bild mit jeder Nachricht versenden"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Markieren Sie dieses Ankreuzfeld, falls KMail zu jeder Nachricht mit dieser "
 "Identität ein sogenanntes \"X-Face\"-Vorspannfeld hinzufügen soll. Dabei "
-"handelt es sich um ein kleines (48x48 Pixel) Schwarz-Weiß-Bild, das einige "
-"E-Mail-Programme anzeigen können."
+"handelt es sich um ein kleines (48x48 Pixel) Schwarz-Weiß-Bild, das einige E-"
+"Mail-Programme anzeigen können."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15474,13 +13347,13 @@ msgstr "Datei auswählen ..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Hiermit kann eine Bilddatei zur Erzeugung des Bildes ausgewählt werden. Die "
-"Datei sollte ein Bild mit hohem Kontrast und quadratischer Form enthalten. Ein "
-"heller Hintergrund verbessert das Resultat."
+"Datei sollte ein Bild mit hohem Kontrast und quadratischer Form enthalten. "
+"Ein heller Hintergrund verbessert das Resultat."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15488,21 +13361,22 @@ msgstr "Aus Adressbuch holen"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Sie können eine entsprechend skalierte Version ihres Bildes aus dem Adressbuch "
-"verwenden lassen."
+"Sie können eine entsprechend skalierte Version ihres Bildes aus dem "
+"Adressbuch verwenden lassen."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail kann mit jeder Nachricht ein kleines (48x48 Pixel) Schwarzweiß-Bild "
-"geringer Qualität versenden. Dabei kann es sich z. B. um ein Porträtphoto oder "
-"ein Symbol handeln. Einige E-Mail-Programme zeigen dieses Bild an."
+"<qt>KMail kann mit jeder Nachricht ein kleines (48x48 Pixel) Schwarzweiß-"
+"Bild geringer Qualität versenden. Dabei kann es sich z. B. um ein "
+"Porträtphoto oder ein Symbol handeln. Einige E-Mail-Programme zeigen dieses "
+"Bild an."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15511,11 +13385,11 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Beispiele finden Sie unter <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Beispiele finden Sie unter <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15531,133 +13405,1853 @@ msgid "You do not have your own contact defined in the address book."
 msgstr ""
 "Sie haben Ihre eigenen Kontaktdaten nicht in das Adressbuch eingetragen."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Gesamt: %2<br>Ungelesen: %3<br>Größe: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signieren"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Kontingent: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Nachrichten &automatisch signieren"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Betreff der Nachricht setzen"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Wenn diese Einstellung aktiviert ist, werden standardmäßig alle ausgehenden "
+"Nachrichten signiert. Natürlich können Sie die Signierung für jede Nachricht "
+"einzeln abschalten. "
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Kopie an \"Adresse\" senden"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Verschlüsseln"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Blindkopie (BCC) an \"Adresse\" senden"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Beim Verschlüsseln von E-Mails auch für den eigenen Schlüssel lesbar machen"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "\"Vorspannfeld\" zu Nachricht hinzufügen"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Wenn diese Option gewählt ist, wird die Nachricht nicht nur mit dem "
+"öffentlichen Schlüssel des Empfängers, sondern auch mit ihrem eigenen "
+"Schlüssel verschlüsselt. Nur so ist es ihnen möglich, die eigene Nachricht "
+"später wieder zu entschlüsseln. Diese Option sollte also eigentlich immer "
+"gewählt werden."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Nachrichtentext aus \"Datei\" lesen"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "S&ignierten/verschlüsselten Text nach der Erstellung anzeigen"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Text der Nachricht festlegen"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Wenn diese Option gewählt ist, wird der signierte/verschlüsselte Text in "
+"einem Extrafenster angezeigt. Damit können Sie überprüfen, wie die Nachricht "
+"beim Empfänger ankommt. Das ist eine gute Möglichkeit zur Überprüfung, ob "
+"das Verschlüsselungssystem einwandfrei arbeitet."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Versendete Nachrichten &verschlüsselt speichern"
+
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
 msgstr ""
-"Der E-Mail einen Anhang hinzufügen. Diese Funktion kann mehrfach ausgeführt "
-"werden"
+"Markieren Sie dieses Ankreuzfeld, um Nachrichten verschlüsselt zu speichern "
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Nur nach neuen Nachrichten schauen"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Nachrichten verschlüsselt speichern</h1>\n"
+"Wenn dieses Ankreuzfeld markiert ist, werden versendete Nachrichten "
+"verschlüsselt gespeichert so wie sie versendet wurden. Das wird nicht "
+"empfohlen, da Sie die Nachrichten nicht mehr lesen können, sobald eines der "
+"Zertifikate abgelaufen ist.\n"
+"<p>\n"
+"Möglicherweise gibt es lokale Richtlinien, die die Aktivierung dieser Option "
+"dennoch erforderlich machen. Sprechen Sie im Zweifelsfalls mit dem lokalen "
+"Systemverwalter.\n"
+"</qt>"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Nur Fenster für Nachrichtenerstellung öffnen"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Verschlüsselungsschlüssel immer &zur Bestätigung anzeigen"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Anzeige der angegebenen Nachrichtendatei"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Wenn diese Option gewählt ist, zeigt die Anwendung immer eine Liste "
+"öffentlicher Schlüssel zur Auswahl des Schlüssels, der zur Verschlüsselung "
+"verwendet werden soll. Falls sie deaktiviert ist, wird der Dialog nur dann "
+"angezeigt, wenn die Anwendung keinen passenden Schlüssel findet oder mehrere "
+"Schlüssel zur Auswahl stehen."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Nachrichten möglichst automatisch ver&schlüsseln"
+
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
-"Nachricht an \"Adresse\" senden und Datei anhängen, auf die die \"URL\" "
-"verweist"
+"Wenn diese Option aktiviert ist, werden alle ausgehenden Nachrichten "
+"verschlüsselt, sofern Verschlüsselung möglich und sinnvoll ist. Diese "
+"Einstellung kann für jede einzelne Nachricht geändert werden."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Gelesen"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
+"Nachrichten beim Speichern als Entwurf &niemals signieren/verschlüsseln"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Alt"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Wie funktioniert das?"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Gelöscht"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Allgemein"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Beantwortet"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Antwort an"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Weitergeleitet"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Allen antworten"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "In Postausgang"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Weiterleiten"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Versendet"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Kurzbefehl:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Überwacht"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Vorlagen&typ:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignoriert"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Vorlageninhalt"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Kurzbefehl für Vorlage"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Vorlagentyp"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Aufgabe"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Ordner-Eigenschaften"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Hat einen Anhang"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Ordner enthält &Mailingliste"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 von %2 %3 benutzt"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Listenadresse:"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Pfad"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "No&rmal:"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Ungelesen:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Löschen von alten Nachrichten"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Löschen &nach:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Ge&lesene Nachrichten löschen"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Löschen &nach:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Alte &ungelesene Nachrichten löschen"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Tag(e)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Woche(n)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Monat(e)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Absender-&Identität:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Speicherformat:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listenelemente:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Wartende Nachrichten beim Mailabruf versenden"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Die Datei \"%1\" existiert bereits. Soll die Datei überschrieben werden?"
+"<qt> <p>Wählen Sie, ob KMail die Nachrichten im Postausgang versenden soll, "
+"wenn ein manueller oder automatischer Mailabruf erfolgt oder ob überhaupt "
+"kein automatisches Versenden durchgeführt werden soll.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Datei überschreiben?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Nicht synchronisierte E-Mails aus Ordnern mit ungenügenden Zugriffsrechten "
+"automatisch verschieben."
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Befinden sich in einem Ordner neue Nachrichten, die noch nicht auf den "
+"Server hochgeladen wurden und für den Sie ungenügende Zugriffsrechte zum "
+"Hochladen haben, werden diese E-Mails automatisch in einen \"Verloren"
+"+Gefunden\"-Ordner verschoben."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Lokale Markierungen in nur lesbaren Ordnern zulassen"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Diese Einstellung erlaubt es Systemverwaltern, einen Mindestzeitraum "
+"zwischen zwei E-Mail-Überprüfungen festzulegen.\"\n"
+"           \"Der Benutzer kann keinen kleineren Zeitraum als den hier "
+"angegebenen auswählen."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Der zuletzt gewählte Ordner im Ordnerauswahldialog."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Umask-Einstellungen des Benutzers ignorieren und stattdessen Lese-/"
+"Schreibzugriff nur für den Benutzer gebrauchen"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Regelungen zur Anzeige des Kontrollleistensymbols"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Anwendung mit dem Schließen des Hauptfensters beenden, selbst wenn das "
+"Kontrollleistensymbol angezeigt wird."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Ausführliche Benachrichtigung bei neuen Nachrichten"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Falls diese Option ausgewählt ist, wird für jeden Ordner die Anzahl neu "
+"eingegangener Nachrichten bei der Benachrichtigung bei neuen Nachrichten "
+"angezeigt; andernfalls erscheint lediglich eine Nachricht \"Neue Nachrichten"
+"\"-Benachrichtigung."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "E&ditor angeben:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "E&xternen Editor verwenden"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"Dies ist der Schwellwert für die Warnmeldung, die erscheint, wenn ein Ordner "
+"die Kontingent-Grenze zu überschreiten droht."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Arbeitsgruppenfunktionen aktivieren"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Bei Antworten auf Antworten Von:/An:-Vorspannfelder mischen"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Das Programm Microsoft Outlook implementiert den iCalendar-Standard nicht "
+"vollständig korrekt. Diese Option korrigiert einen solchen Fehler. Falls "
+"Benutzer von Outlook ihre Antworten nicht erhalten, können Sie diese Option "
+"auswählen."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Arbeitsgruppeneinladungen im Nachrichtenhauptteil versenden"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Das Programm Microsoft Outlook implementiert den iCalendar-Standard nicht "
+"vollständig korrekt. Diese Option korrigiert einen solchen Fehler. Falls "
+"Benutzer von Outlook ihre Einladungen nicht erhalten, wählen Sie diese "
+"Option aus."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Exchange-kompatibles Einladungsformat"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Wenn Microsoft Outlook in Verbindung mit einem Microsoft Exchange Server "
+"verwendet wird, hat es Probleme, standardkonforme Groupware E-Mails zu "
+"verstehen. Aktivieren Sie diese Einstellung, um Groupware-Einladungen in "
+"einem Format zu senden, das Microsoft Exchange versteht."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Falls diese Option markiert ist, erscheint das Fenster zur "
+"Nachrichteneingabe nicht. Stattdessen werden alle Einladungen automatisch "
+"versendet. Falls Sie die Nachrichten vor dem Versand sehen möchten, müssen "
+"Sie diese Einstellung deaktivieren. Der Text der Einladung ist allerdings in "
+"der Syntax von iCalendar verfasst und sollte daher nicht von Hand verändert "
+"werden."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Einladungen löschen, nachdem eine Antwort versendet wurde"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Wenn diese Einstellung aktiviert ist, werden Einladungs-Nachrichten in den "
+"Mülleimer verschoben, nachdem die Antwort auf sie erfolgreich versendet "
+"wurde."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Durch Aktivierung dieser Option können die Einträge der Kontakt-"
+"Anwendungen (KOrganizer, KAdressbuch, und Knotes) gespeichert werden.</p> "
+"<p>Falls Sie diese Option aktivieren wollen, müssen Sie außerdem die "
+"Anwendungen zur Verwendung der IMAP-Ressource einrichten. Das wird im "
+"Kontrollzentrum durchgeführt.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalerweise gibt es keinen Grund, die Ordner mit den IMAP-Ressourcen "
+"anzeigen zu lassen. Falls es dennoch nötig sein sollte, können Sie die "
+"Einstellung hier vornehmen.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Wenn das benutzte Konto zur Speicherung von Informationen über "
+"Arbeitsgruppen \"\n"
+"          \"nicht zur Verwaltung normaler E-Mails genutzt wird, sollte diese "
+"Auswahl eingestellt sein, damit KMail nur \"\n"
+"          \"Ordner von Arbeitsgruppen anzeigt. Dies ist hilfreich, wenn "
+"ebenso normale E-Mails \"\n"
+"          \"durch ein zusätzliches IMAP-Konto online verarbeitet werden.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Speicherformat der Arbeitsgruppenordner wählen. <ul> <li>Standardmäßig "
+"wird \"ical\" (für Kalenderordner) und \"vcard\" (für Adressbuchordner) "
+"verwendet. In diesen Formaten stehen alle Funktionen von Kontact zur "
+"Verfügung.</li> <li>Das Kolab XML-Format ist ein benutzerdefiniertes Modell, "
+"das mehr der Darstellung von Outlook entspricht. Dieses Format verfügt über "
+"eine bessere Kompatibilität zu Outlook bei Verwendung eines Kolab-Servers "
+"oder einer ähnlichen Lösung.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Hier wird der Stammordner der IMAP-Ressourcenordner gewählt.</p> "
+"<p>Standardmäßig legt der Kolab-Server den IMAP-Posteingangsordner als "
+"Stammordner fest.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Dies ist die ID des Benutzerzugangs, der die IMAP-Ressourcenordner "
+"verwaltet.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Falls Sie die Ordnernamen des IMAP-Speichers in ihrer eigenen Sprache "
+"benannt haben wollen, wählen Sie zwischen den verfügbaren Sprachen die "
+"gewünschte aus.</p> <p>Bitte beachten Sie, dass der einzige Grund dazu die "
+"Kompatibilität zu Microsoft Outlook ist. Generell ist es eher ungünstig, da "
+"damit ein Sprachwechsel unmöglich gemacht wird.</p> <p>Wählen Sie diese "
+"Option also nur aus, wenn dies unbedingt notwendig ist.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+"Auch Nachrichten filtern, die in Arbeitsgruppen-Ordnern eingegangen sind."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Arbeitsgruppendaten in DIMAP-Ordnern unmittelbar abgleichen, falls der "
+"Status \"Online\" ist."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Dieser Wert legt fest, ob die Einführung zu KMail angezeigt wird."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maximale Anzahl von Verbindungen pro Rechner"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Hiermit kann die maximale Anzahl von Verbindungen pro Rechner beim Abruf "
+"neuer Nachrichten begrenzt werden. Standardmäßig ist die Anzahl der "
+"Verbindungen unbegrenzt (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Eingabefeld zur Schnellsuche anzeigen"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Mit dieser Option wird die Anzeige der Eingabefeld zur Schnellsuche oberhalb "
+"der Nachrichtenliste ein-/ausgeschaltet. Sie ermöglicht die schnelle Suche "
+"von Informationen in der Nachrichtenliste."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Lokalen Posteingang ausblenden, falls unbenutzt"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Standardmäßig \"Im Text\" weiterleiten"
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Das Semikolon als Trennzeichen zwischen Empfängeradressen im Editor zulassen."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Originalen Zeichensatz beim Beantworten oder Weiterleiten möglichst "
+"beibehalten"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Si&gnatur automatisch einfügen"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Diese Identität merken, damit sie bei späterer Verwendung des E-Mail-Editors "
+"erneut benutzt wird.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Diesen Ordner für Gesendete merken, damit er bei späterer Verwendung des E-"
+"Mail-Editors erneut benutzt wird."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Diese Versandart merken, damit sie bei späterer Verwendung des E-Mail-"
+"Editors erneut benutzt wird."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Diese Identität merken, damit sie bei späterer Verwendung des E-Mail-Editors "
+"erneut benutzt wird.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Zeilenu&mbruch bei Spalte:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Maximale Anzahl von Empfängerzeilen im Editor."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Schalten Sie diese Einstellung ein, damit Outlook &#8482; die Namen von "
+"Anhängen akzeptiert, die Sonderzeichen enthalten"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "A&utomatisch Empfangs- und Lesebestätigungen anfordern"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt> <p>Durch diese Option wird die Anforderung einer Empfangs- und "
+"Lesebestätigung (MDN) für jede versendete Nachricht aktiviert.</p><p>Diese "
+"Option gibt die Standardeinstellung vor. MDNs können immer noch auf "
+"Nachrichtenebene im Fenster Nachricht erstellen über das Menü "
+"<em>Einstellungen</em>-><em>Empfangs- und Lesebestätigung anfordern</em> "
+"eingestellt werden.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Zuletzt benutzte Adressen beim Autovervollständigen benutzen"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Schalten Sie diese Option aus, wenn Sie nicht wollen, dass kürzlich benutzte "
+"Adressen beim Autovervollständigen von Empfängeradressen vorgeschlagen "
+"werden."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Intervall für automatisches Speichern:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Der Text im Editor kann regelmäßig gesichert werden. Der Abstand zwischen "
+"den Speichervorgängen kann hier festgelegt werden. Sie können das "
+"automatische Speichern auch abschalten, indem Sie hier den Wert 0 angeben."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Signatur vor zitiertem Text einfügen."
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "&Erkannte Präfixe durch \"Re:\" ersetzen"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Erkannte Präfixe durch \"&Fwd:\" ersetzen"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "I&ntelligent zitieren"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Die Signatur ist abgelaufen."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Art der Empfängerauswahl"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Legt den Dialogtyp zur Auswahl der Empfänger in den Feldern \"An\",\n"
+"\"Kopie\" und \"Blindkopie\" fest."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Art des Empfängereditors"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Legt die Art des Editors zur Bearbeitung der Empfänger für die Felder \"An"
+"\",\n"
+"\"Kopie\" und \"Blindkopie\" fest."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maximale Anzahl von Empfängerzeilen im Editor."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Liste der Nachrichtenteile, die beim Weiterleiten von Nachrichten \"im Text"
+"\" entfernt werden sollen."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Die maximal zulässige Größe in MB für E-Mail-Anhänge."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Textbaustein-Werkzeugleiste im E-Mail-Editor anzeigen."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"GnuPG-Prüfprotokoll auch anzeigen, wenn Kryptographieoperationen erfolgreich "
+"abgeschlossen wurden."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Originalen Zeichensatz beim Beantworten oder Weiterleiten möglichst "
+"beibehalten"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"In einigen E-Mails, insbesondere automatisch erzeugten, fehlen Informationen "
+"zur verwendeten Kodierung. Diese ist aber zur korrekten Darstellung "
+"erforderlich. In diesen Fällen wird eine Standardkodierung verwendet, die "
+"hier eingestellt werden kann. Verwenden Sie die Kodierung, die in ihrem Teil "
+"der Welt die am häufigsten verwendete ist. Standardmäßig wird die für das "
+"Gesamtsystem verwendete Kodierung verwendet."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Wenn Sie die Einstellung \"Automatisch\" nicht verwenden, wird die "
+"eingestellte Kodierung für alle E-Mails verwendet, auch dann, wenn E-Mails "
+"andere Vorgaben enthalten."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Aktivieren Sie diese Einstellung, damit Smileys wie \":-)\" im "
+"Nachrichtentext durch Emoticons (kleine Bilder) ersetzt werden."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Schalten Sie diese Option ein, um Zitate verschiedener Ebenen gestaffelt "
+"anzuzeigen. Wenn Sie diese Option ausschalten, werden die verschiedenen "
+"Ebenen ohne Unterschied dargestellt."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Stufe für automatisches Zusammenfalten:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Schriftgröße bei Zitaten verkleinern"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Wenn diese Option eingeschaltet ist, wird zitierter Text kleiner angezeigt."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Versendete Nachrichten &verschlüsselt speichern"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "E-Mail-Programm im dekorativen Vorspann anzeigen"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Durch Aktivierung dieser Auswahl, werden Informationen über den User-Agent "
+"und X-Mailer im dekorativen Vorspann angezeigt."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Löschen von Anhängen aus vorhandenen E-Mails zulassen."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Bearbeiten von Anhängen in vorhandenen E-Mails zulassen."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Nachrechten beim Betrachten immer entschlüsseln, oder vorher fragen"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Empfangs- und Lesebenachrichtigungen mit leerem Absender senden."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Sendet Empfangs- und Lesebenachrichtigungen mit leerem Absender-Vorspann. "
+"Manche Server sind so eingerichtet, dass Sie solche Nachrichten "
+"zurückweisen. Falls Sie also Schwierigkeiten beim Versenden von MDNs haben, "
+"deaktivieren Sie diese Einstellung."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "\"Redewendungen\" wurde zu \"Vorlagen\" geändert"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Alte Redewendungen wurden in Vorlagen umgewandelt"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Nachrichtenvorlage für neue Nachricht"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Nachrichtenvorlage für Antwort"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Nachrichtenvorlage für Antwort an alle"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Nachrichtenvorlage für Weiterleitung"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Zitatzeichen"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+"Einstellungen zur Abwesenheits-Benachrichtigung dürfen vom Benutzer geändert "
+"werden."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Ermöglicht es Benutzern, Abwesenheits-Benachrichtigungen via Sieve "
+"hochzuladen, aber nicht, irgendwelche Einstellungen zu ändern (Domäne, Spam-"
+"Reaktion)."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Abwesenheits-Benachrichtigungen nur für E-Mails von dieser Domäne senden."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Abwesenheits-Benachrichtigung auch für E-Mails senden, die als Spam markiert "
+"sind."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Beim Start der Anwendung prüfen, ob Abwesenheits-Benachrichtigungen aktiv "
+"sind."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Datei bearbeiten"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Bearbeiten ..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Gehe zu"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Ordner"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Nach&richt"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Antworten (speziell)"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "W&eiterleiten"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Kurzinfos"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Einstellungen für Textbausteine"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-Werkzeugleiste"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Allgemeine Einstellungen"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-Werkzeugleiste"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Gültige Zertifikate unter Verwendung von CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Falls diese Option gewählt ist, werden S/MIME-Zertifikate mit Hilfe von "
+"Zertifikatsrückruflisten (CRLs) überprüft."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Zertifikate online überprüfen (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Falls diese Option gewählt ist, werden S/MIME-Zertifikate online über das "
+"\"Online Certificates Status Protocol\" (OCSP) überprüft. Tragen Sie die URL "
+"des OCSP-Antwortservers unten ein."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Online-Zertifikatsüberprüfung"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL des OCSP-Antwortservers:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Geben Sie hier die Adresse des Servers für die Online-Überprüfung von "
+"Zertifikaten ein (OCSP-Antwortserver). Die URL beginnt üblicherweise mit "
+"http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Signatur des OCSP-Antwortservers:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Service-URL von Zertifikaten ignorieren"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Zertifikatseinstellungen nicht überprüfen"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Standardmäßig verwendet GnuPG die Datei ~/.gnupg/policies.txt zur "
+"Überprüfung, ob ein bestimmter Umgang mit einem Zertifikat erlaubt ist. "
+"Falls diese Option gewählt ist, wird die Überprüfung nicht durchgeführt."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "CRLs niemals verwenden"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Falls diese Option gewählt ist, werden Zertifikatsrückruflisten (CRLs) "
+"niemals für die Überprüfung von S/MIME-Zertifikaten verwendet."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Fehlende Ausstellerzertifikate herunterladen"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Falls diese Option ausgewählt ist, werden fehlende Ausstellerzertifikate "
+"heruntergeladen (das gilt für beide Überprüfungsmethoden, CRLs und OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-Anfragen"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Es sollen keine HTTP-Anfragen durchgeführt werden"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Damit wird die Verwendung von HTTP für S/MIME vollständig deaktiviert."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Dieser Proxy soll für HTTP-Anfragen verwendet werden: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Der System HTTP-Proxy soll verwendet werden:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Falls diese Einstellung gewählt ist, wird der rechts angezeigte HTTP-"
+"Proxyserver (die Einstellung stammt aus der Umgebungsvariable \"http_proxy"
+"\") für alle HTTP-Anfragen verwendet."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Geben Sie die Adresse ihres HTTP-Proxyservers ein. Dieser Proxy wird für "
+"alle HTTP-Anfragen im Zusammenhang mit S/MIME verwendet. Ein Eintrag hat die "
+"Form \"Rechner:Port\", also z. B. \"meinproxy.nirgendwo.com:3128\"."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "HTTP CRL-Verteilungspunkt von Zertifikaten ignorieren"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Für die Suche der Adresse für eine CRL enthält das fragliche Zertifikat "
+"häufig die Angabe eines \"CRL-Verteilers (Distribution Point DP)\", der die "
+"Angabe von URLs zur Beschreibung des Zugriffs auf die URL enthält. Der erste "
+"DP-Eintrag wird verwendet. Bei dieser Einstellung werden alle HTTP-URLs auf "
+"der Suche nach einem DP-Eintrag ignoriert."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-Anfragen"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Keine LDAP-Anfragen durchführen"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Damit werden LDAP-Anfragen für S/MIME vollständig deaktiviert."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "LDAP CRL-Verteilungspunkt von Zertifikaten ignorieren"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Für die Suche der Adresse für eine CRL enthält das fragliche Zertifikat "
+"häufig die Angabe eines \"CRL-Verteilers (Distribution Point DP)\", der die "
+"Angabe von URLs zur Beschreibung des Zugriffs auf die URL enthält. Der erste "
+"DP-Eintrag wird verwendet. Bei dieser Einstellung werden alle LDAP-URLs auf "
+"der Suche nach einem DP-Eintrag ignoriert."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primärer Rechner für LDAP-Anfragen:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Ein hier eingetragener LDAP-Server erhält alle LDAP-Anfragen zuerst. Diese "
+"Einstellung überschreibt auch alle Rechner- und Port-Einstellungen, die als "
+"Teil einer LDAP-URL angegeben werden. Andere LDAP-Server werden erst dann "
+"kontaktiert, wenn die Verbindung zum \"Proxy\" fehlschlägt.\n"
+"Die Syntax des Eintrags lautet \"Rechner\" oder \"Rechner:Port\". Im ersten "
+"Fall wird der Standard-LDAP-Port 389 verwendet."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Textbaustein hinzufügen"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Hinzufügen"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Textbaustein:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Gruppe:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Einstellungen für Textbausteine"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Kurzinfos"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Inhalt der Textbausteine in der &Kurzinfo anzeigen"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Legt fest, ob eine Kurzinfo angezeigt wird, die Text der als Lesezeichen "
+"markierten Zeile enthält"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variablen"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Eingabemethode für Variablen"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Je ein Dialog für jede Variable eines Textbausteins"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "Zeigt ein Eingabefeld für jede Variable eines Textbausteines an."
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Ein Dialog für alle Variablen in einem Textbaustein."
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Zeigt ein einziges Eingabefeld für für Werte aller Variablen eines "
+"Textbausteines an."
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Trennzeichen:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Vorlagen einrichten"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Antwort an Absender:"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Allen antworten / der Liste antworten"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Nachricht weiterleiten"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Vor dem Versand &unsignierter Nachrichten warnen"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Markieren Sie dieses Ankreuzfeld, um vor dem Versand unsignierter "
+"Nachrichten gewarnt zu werden."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Vor dem Versand unsignierter Nachrichten warnen</h1>\n"
+"Falls diese Option aktiviert ist, werden Sie vor dem Versand von "
+"unsignierten Nachrichten oder Nachrichtenteilen gewarnt.\n"
+"<p>\n"
+"Für maximale Sicherheit sollte diese Option aktiviert sein.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Vor dem Versand von unverschlüsselten Nachrichten &warnen"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Markieren Sie diese Option, um vor dem Versand unverschlüsselter Nachrichten "
+"gewarnt zu werden."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Vor dem Versand von unverschlüsselten Nachrichten warnen</h1>\n"
+"Falls dieses Ankreuzfeld markiert ist, werden Sie gewarnt, falls Sie Teile "
+"eine Nachricht oder ganze Nachrichten unverschlüsselt versenden wollen.\n"
+"<p>\n"
+"Für maximale Sicherheit sollte diese Option markiert sein.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Warnung, falls die E-Mail-Adresse des Em&pfängers nicht im Zertifikat "
+"enthalten ist"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Markieren Sie dieses Ankreuzfeld, um gewarnt zu werden, falls die E-Mail-"
+"Adresse des Empfängers nicht Teil des Zertifikats ist"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warnung, falls die E-Mail-Adresse des Empfängers nicht im Zertifikat "
+"enthalten ist</h1>\n"
+"Ist dieses Ankreuzfeld markiert, wird gewarnt, falls die E-Mail-Adresse des "
+"Empfängers nicht in dem Zertifikat enthalten ist, das für die "
+"Verschlüsselung verwendet wird.\n"
+"<p>\n"
+"Für maximale Sicherheit sollte diese Option eingeschaltet sein.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Warnung, falls Zertifikate/Schlüssel in Kürze ablaufen (Zeitgrenzen werden "
+"weiter unten festgelegt)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Zur Signierung"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Zur Verschlüsselung"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Wählen Sie hier die Anzahl der Tage aus"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warnungszeitspanne vor dem Ablauf des Signierungszertifikats</h1>\n"
+"Hier können Sie die Zeitspanne in Tagen einstellen, die ein Zertifikat "
+"mindestens die Gültigkeit behalten muss, um ohne Warnung verwendet werden zu "
+"können.\n"
+"<p>\n"
+"Die für die SPHINX-Umgebung empfohlene Einstellung beträgt 14 Tage.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warnungszeitspanne bei drohendem Ablauf des Verschlüsselungszertifikats</"
+"h1>\n"
+"Wählen Sie die minimale Anzahl von Tagen, die das zur Verschlüsselung "
+"verwendete Zertifikat noch gültig sein muss, damit eine Warnung "
+"unterbleibt.\n"
+"<p>\n"
+"Für die SPHINX-Umgebung wird eine Einstellung von 14 Tagen empfohlen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warnung vor dem Ablauf eines Zertifikats in der Zertifikatskette</h1>\n"
+"Tragen Sie hier die Anzahl der Tage ein, die alle Zertifikate einer Kette "
+"mindestens noch Gültigkeit besitzen müssen, damit keine Warnung angezeigt "
+"wird.\n"
+"<p>\n"
+"Für die SPHINX-Umgebung wird eine Einstellung von 14 Tagen empfohlen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warnungszeitspanne vor dem Ablauf des Zertifikats der "
+"Zertifizierungsstelle (CA)</h1>\n"
+"Hier können Sie die minimale Zeitspanne in Tagen einstellen, die das "
+"Zertifikat der Zertifizierungsstelle mindestens noch gültig sein muss.\n"
+"<p>\n"
+"Für die SPHINX-Umgebung wird eine Einstellung von 14 Tagen empfohlen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warnungszeitspanne vor dem Ablauf des Wurzelzertifikats</h1>\n"
+"Hier können Sie die Zeitspanne in Tagen einstellen, die das Wurzelzertifikat "
+"mindestens die Gültigkeit behalten muss, um ohne Warnung verwendet werden zu "
+"können.\n"
+"<p>\n"
+"Die für die SPHINX-Umgebung empfohlene Einstellung beträgt 14 Tage.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Für Wurzelzertifikate:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Für intermediäre CA-Zertifikate:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Für Endbenutzerzertifikate/Schlüssel:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Alle \"Nicht wieder fragen\"-Warnungen reaktivieren"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>... dass Sie mit Hilfe der Tasten \"Pfeil links\" und \"Pfeil rechts\" "
+"zur nächsten bzw.\n"
+"vorherigen Nachricht wechseln können?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>... dass Sie über <em>Werkzeuge-&gt;Filter&nbsp;erstellen</em> mit "
+"wenigen Schritten\n"
+" Filter für Absender, Empfänger, Betreff und Mailinglisten erzeugen können?</"
+"p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... dass Sie den bei einigen Mailinglisten automatisch zum Betreff\n"
+"hinzugefügten Teil &quot;[Mailinglistenname]&quot; mit Hilfe der \n"
+"Filteraktion <em>Vorspann umschreiben</em> entfernen können? Verwenden Sie\n"
+"<pre>Vorspann umschreiben &quot;Betreff&quot;\n"
+"   ersetzen &quot;\\s*\\[Mailinglistenname\\]\\s*&quot;\n"
+"   durch &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>... dass Sie im Dialog <em>Ordner-&gt;Verwaltung einer Mailingliste</em>\n"
+"eine Mailingliste mit einem Ordner verbinden können? Danach können Sie durch "
+"Rechtsklick auf den Ordner und dann <em>Neue&nbsp;Nachricht&nbsp;an&nbsp;"
+"Mailingliste ...</em> das Fenster \"Nachricht erstellen\"\n"
+"mit der Mailingliste als voreingestelltem Empfänger öffnen. Alternativ "
+"können Sie mit der mittleren Maustaste auf den Ordner klicken.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>... dass Sie über <em>Ordner-&gt;Eigenschaften ...</em> jedem Ordner \n"
+"ein individuelles Symbol zuordnen können?</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>... dass KMail einen Farbbalken darstellen kann, der den Typ der\n"
+"Nachricht (Text/HTML/OpenPGP) anzeigt?</p>\n"
+"<p>Das beugt Versuchen vor, erfolgreich überprüfte Signierungen durch HTML-"
+"Mails, die die Signierungsstatusanzeige von KMail nachbilden, zu fälschen.</"
+"p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>... dass Sie nach einem Vorspannfeld filtern können, indem Sie dessen "
+"Namen im ersten Eingabefeld einer Suchregel eintragen?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... dass Sie reine HTML-Nachrichten mit der Filterregel\n"
+"<pre>&quot;Content-type&quot; enthält &quot;text/html&quot;</pre>\n"
+"herausfiltern können?</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>... dass bei einer Antwort nur der markierte Nachrichtenteil zitiert wird?"
+"</p>\n"
+"<p>Falls nichts markiert ist, wird die gesamte Nachricht zitiert.</p>\n"
+"<p>Das funktioniert auch mit Texten in Anhängen, falls Sie die Einstellung\n"
+"<em>Ansicht-&gt;Anhänge-&gt;Im&nbsp;Text ...</em> ausgewählt haben.</p>\n"
+"<p>Diese Funktion ist für alle Antwortbefehle außer\n"
+"<em>Nachricht-&gt;Ohne&nbsp;Zitierung&nbsp;antworten</em> aktiv.</p>\n"
+"<p align=\"right\"><em>beigesteuert von David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Eingabefeld zur Ordner-Schnellsuche anzeigen"
@@ -15680,7 +15274,9 @@ msgstr "Datei überschreiben?"
 #~ msgstr "Herunterladen neuer Nachrichten"
 
 #~ msgid "Only filter mails received in disconnected IMAP inbox."
-#~ msgstr "Nur Nachrichten filtern, die im Disconnected-IMAP-Posteingang eingegangen sind."
+#~ msgstr ""
+#~ "Nur Nachrichten filtern, die im Disconnected-IMAP-Posteingang eingegangen "
+#~ "sind."
 
 #~ msgid "Show folder quick search line edit"
 #~ msgstr "Eingabefeld zur Schnellsuche anzeigen"
diff --git a/tde-i18n-el/messages/tdepim/kmail.po b/tde-i18n-el/messages/tdepim/kmail.po
index b0c21245d26..eb98f7dc9ab 100644
--- a/tde-i18n-el/messages/tdepim/kmail.po
+++ b/tde-i18n-el/messages/tdepim/kmail.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-05-26 12:38+0300\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -24,15 +24,15 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"Στέργιος Δράμης,Δημήτρης Καμενόπουλος,Λουκάς Σταμέλλος,Αντώνιος "
-"Δημόπουλος,Σπύρος Γεωργαράς,Τούσης Μανώλης"
+"Στέργιος Δράμης,Δημήτρης Καμενόπουλος,Λουκάς Σταμέλλος,Αντώνιος Δημόπουλος,"
+"Σπύρος Γεωργαράς,Τούσης Μανώλης"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -182,6 +182,12 @@ msgstr "Τίπο&τα (χρήση με προσοχή)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Λογαριασμός για ημιαυτόματη διαχείριση πόρων"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Καθαρισμός προηγουμένων"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -199,8 +205,8 @@ msgstr "Καθαρισμός προηγουμένων"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Διαγραφή όλων των παρωχημένων κατανομών για τον πόρο που αντιπροσωπεύεται από "
-"αυτόν το λογαριασμό."
+"Διαγραφή όλων των παρωχημένων κατανομών για τον πόρο που αντιπροσωπεύεται "
+"από αυτόν το λογαριασμό."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -260,14 +266,14 @@ msgstr "&Όνομα χρήστη:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"O πάροχος υπηρεσιών διαδικτύου (ISP) σας, σας έδωσε ένα <em>όνομα χρήστη</em> "
-"που χρησιμοποιείται για την ταυτοποίησή σας στους διακομιστές του. Συνήθως "
-"είναι το πρώτο μέρος της ηλεκτρονικής σας διεύθυνσης (το τμήμα πριν το <em>"
-"@</em>)."
+"O πάροχος υπηρεσιών διαδικτύου (ISP) σας, σας έδωσε ένα <em>όνομα χρήστη</"
+"em> που χρησιμοποιείται για την ταυτοποίησή σας στους διακομιστές του. "
+"Συνήθως είναι το πρώτο μέρος της ηλεκτρονικής σας διεύθυνσης (το τμήμα πριν "
+"το <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -288,20 +294,20 @@ msgstr "Αποθήκευση κωδικού π&ρόσβασης POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Ενεργοποιήστε αυτή την επιλογή για να αποθηκεύσετε τον κωδικό σας.\n"
 "Αν το TDEWallet είναι διαθέσιμο, ο κωδικός θα αποθηκευτεί εκεί, το οποίο "
 "θεωρείται ασφαλές.\n"
-"Αν όμως το TDEWallet δεν είναι διαθέσιμο, ο κωδικός θα αποθηκευτεί στο αρχείο "
-"ρυθμίσεων του KMail. Ο κωδικός αποθηκεύεται καλυμμένος, αλλά δε θα πρέπει να "
-"θεωρείται ασφαλής από προσπάθειες αποκρυπτογράφησης, αν κάποιος αποκτήσει "
-"πρόσβαση στο αρχείο ρυθμίσεων."
+"Αν όμως το TDEWallet δεν είναι διαθέσιμο, ο κωδικός θα αποθηκευτεί στο "
+"αρχείο ρυθμίσεων του KMail. Ο κωδικός αποθηκεύεται καλυμμένος, αλλά δε θα "
+"πρέπει να θεωρείται ασφαλής από προσπάθειες αποκρυπτογράφησης, αν κάποιος "
+"αποκτήσει πρόσβαση στο αρχείο ρυθμίσεων."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -329,12 +335,13 @@ msgstr "&Φιλτράρισμα μηνυμάτων αν είναι μεγαλύ�
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Αν ενεργοποιήσετε αυτή την επιλογή, τα φίλτρα ΡΟΡ θα χρησιμοποιούνται για να "
-"αποφασίζεται τι θα γίνει με τα μηνύματα. Μπορείτε έπειτα να επιλέξετε τη λήψη, "
-"τη διαγραφή ή τη διατήρηση τους στο διακομιστή."
+"αποφασίζεται τι θα γίνει με τα μηνύματα. Μπορείτε έπειτα να επιλέξετε τη "
+"λήψη, τη διαγραφή ή τη διατήρηση τους στο διακομιστή."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -383,13 +390,15 @@ msgstr "&Απλό κείμενο"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -432,14 +441,14 @@ msgstr "Χώροι ονομάτων:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Εδώ βλέπετε τους διάφορους χώρους ονομάτων που υποστηρίζει ο διακομιστής IMAP. "
-"Κάθε χώρος ονομάτων αντιπροσωπεύει ένα πρόθεμα που διαχωρίζει ομάδες φακέλων. "
-"Για παράδειγμα, οι χώροι ονομάτων επιτρέπουν στο KMail να εμφανίζει τους "
-"προσωπικούς και κοινόχρηστους φακέλους ενός λογαριασμού."
+"Εδώ βλέπετε τους διάφορους χώρους ονομάτων που υποστηρίζει ο διακομιστής "
+"IMAP. Κάθε χώρος ονομάτων αντιπροσωπεύει ένα πρόθεμα που διαχωρίζει ομάδες "
+"φακέλων. Για παράδειγμα, οι χώροι ονομάτων επιτρέπουν στο KMail να εμφανίζει "
+"τους προσωπικούς και κοινόχρηστους φακέλους ενός λογαριασμού."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -498,13 +507,13 @@ msgstr "Φόρτωση συνη&μμένων κατ' απαίτηση"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή για να μη φορτώνετε τα συνημμένα αυτόματα με την "
-"επιλογή του μηνύματος, αλλά μόνον όταν κάνετε κλικ στο συνημμένο. Έτσι τα "
-"μεγάλα μηνύματα εμφανίζονται αμέσως."
+"Ενεργοποιήστε αυτή την επιλογή για να μη φορτώνετε τα συνημμένα αυτόματα με "
+"την επιλογή του μηνύματος, αλλά μόνον όταν κάνετε κλικ στο συνημμένο. Έτσι "
+"τα μεγάλα μηνύματα εμφανίζονται αμέσως."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -544,7 +553,7 @@ msgstr "<κανένα>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "εισερχόμενα"
 
@@ -552,8 +561,8 @@ msgstr "εισερχόμενα"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Ο διακομιστής δε φαίνεται να υποστηρίζει μοναδικούς αριθμούς μηνυμάτων, οι "
 "οποίοι όμως απαιτούνται για την παραμονή μηνυμάτων στο διακομιστή.\n"
@@ -564,8 +573,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Ο διακομιστής δε φαίνεται να υποστηρίζει τη λήψη κεφαλίδων των μηνυμάτων, το "
 "οποίο όμως είναι απαραίτητο για το φιλτράρισμα μηνυμάτων στο διακομιστή.\n"
@@ -574,24 +583,27 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Σημειώστε ότι αυτό το χαρακτηριστικό μπορεί να προξενήσει λήψη κατεστραμμένων "
-"μηνυμάτων από ορισμένους POP3 διακομιστές που δεν υποστηρίζουν διασωλήνωση.\n"
+"Σημειώστε ότι αυτό το χαρακτηριστικό μπορεί να προξενήσει λήψη "
+"κατεστραμμένων μηνυμάτων από ορισμένους POP3 διακομιστές που δεν "
+"υποστηρίζουν διασωλήνωση.\n"
 "Αυτό όμως μπορεί να ρυθμιστεί, επειδή κάποιοι διακομιστές που υποστηρίζουν "
-"διασωλήνωση δεν εμφανίζουν σαφώς τις δυνατότητές τους. Για να δείτε αν ο POP3 "
-"διακομιστής σας εμφανίζει υποστήριξη διασωλήνωσης, χρησιμοποιήστε το κουμπί "
-"\"Έλεγχος για το τί Υποστηρίζει ο Διακομιστής\" στο κάτω μέρος του διαλόγου.\n"
-"Αν ο διακομιστής σας δεν την εμφανίζει, αλλά θέλετε μεγαλύτερη ταχύτητα, τότε "
-"μπορείτε να πειραματιστείτε στέλνοντας στον εαυτό σας πολλά μηνύματα και "
-"λαμβάνοντάς τα."
+"διασωλήνωση δεν εμφανίζουν σαφώς τις δυνατότητές τους. Για να δείτε αν ο "
+"POP3 διακομιστής σας εμφανίζει υποστήριξη διασωλήνωσης, χρησιμοποιήστε το "
+"κουμπί \"Έλεγχος για το τί Υποστηρίζει ο Διακομιστής\" στο κάτω μέρος του "
+"διαλόγου.\n"
+"Αν ο διακομιστής σας δεν την εμφανίζει, αλλά θέλετε μεγαλύτερη ταχύτητα, "
+"τότε μπορείτε να πειραματιστείτε στέλνοντας στον εαυτό σας πολλά μηνύματα "
+"και λαμβάνοντάς τα."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -599,36 +611,36 @@ msgstr "Παρακαλώ ορίστε πρώτα ένα διακομιστή κ�
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Ο διακομιστής δε φαίνεται να υποστηρίζει διασωλήνωση. Γι' αυτό η επιλογή "
 "απενεργοποιήθηκε.\n"
-"Επειδή κάποιοι διακομιστές δεν εμφανίζουν σαφώς τις δυνατότητές τους, έχετε την "
-"πιθανότητα να ενεργοποιήσετε τη διασωλήνωση. Σημειώστε όμως ότι αυτό το "
+"Επειδή κάποιοι διακομιστές δεν εμφανίζουν σαφώς τις δυνατότητές τους, έχετε "
+"την πιθανότητα να ενεργοποιήσετε τη διασωλήνωση. Σημειώστε όμως ότι αυτό το "
 "χαρακτηριστικό μπορεί να προκαλέσει λήψη κατεστραμμένων μηνυμάτων από "
 "διακομιστές POP που δεν το υποστηρίζουν. Πριν χρησιμοποιήσετε αυτό το "
 "χαρακτηριστικό με σημαντικά μηνύματα, θα πρέπει να το δοκιμάσετε στέλνοντας "
-"στον εαυτό σας ένα μεγάλο αριθμό δοκιμαστικών μηνυμάτων, τα οποία θα κατεβάσετε "
-"σε μία λήψη από το διακομιστή POP."
+"στον εαυτό σας ένα μεγάλο αριθμό δοκιμαστικών μηνυμάτων, τα οποία θα "
+"κατεβάσετε σε μία λήψη από το διακομιστή POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Ο διακομιστής δε φαίνεται να υποστηρίζει μοναδικούς αριθμούς μηνυμάτων, οι "
-"οποίοι όμως απαιτούνται για την παραμονή μηνυμάτων στο διακομιστή. Γι' αυτό η "
-"επιλογή έχει απενεργοποιηθεί.\n"
+"οποίοι όμως απαιτούνται για την παραμονή μηνυμάτων στο διακομιστή. Γι' αυτό "
+"η επιλογή έχει απενεργοποιηθεί.\n"
 "Καθώς πολλοί διακομιστές δεν κάνουν σαφείς τις δυνατότητές τους, έχετε "
 "πιθανότητες να ενεργοποιήσετε την παραμονή μηνυμάτων στο διακομιστή."
 
@@ -637,8 +649,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Ο διακομιστής δε φαίνεται να υποστηρίζει τη λήψη κεφαλίδων των μηνυμάτων, το "
 "οποίο όμως είναι απαραίτητο για το φιλτράρισμα μηνυμάτων στο διακομιστή. Γι' "
@@ -724,8 +736,8 @@ msgstr "Λογαριασμός IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Πρέπει να προσθέσετε έναν λογαριασμό στο τμήμα δικτύου των ρυθμίσεων για να "
 "μπορέσετε να λαμβάνετε αλληλογραφία."
@@ -764,14 +776,14 @@ msgstr "Καλώς ήρθατε στο KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Φαίνεται ότι είναι η πρώτη φορά που χρησιμοποιείτε το KMail. Αυτός ο Μάγος "
-"θα σας βοηθήσει να ρυθμίσετε τους λογαριασμούς αλληλογραφίας σας. Συμπληρώστε "
-"απλώς τα στοιχεία της σύνδεσής σας, όπως τα λάβατε από τον πάροχό σας, στις "
-"επόμενες σελίδες.</qt>"
+"<qt>Φαίνεται ότι είναι η πρώτη φορά που χρησιμοποιείτε το KMail. Αυτός ο "
+"Μάγος θα σας βοηθήσει να ρυθμίσετε τους λογαριασμούς αλληλογραφίας σας. "
+"Συμπληρώστε απλώς τα στοιχεία της σύνδεσής σας, όπως τα λάβατε από τον "
+"πάροχό σας, στις επόμενες σελίδες.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -833,8 +845,7 @@ msgstr "Χρήση τοπικής παράδοσης"
 msgid "Server Information"
 msgstr "Πληροφορίες διακομιστή"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Καμία"
@@ -972,30 +983,29 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Εδώ μπορείτε να λάβετε βοήθεια ρυθμίζοντας τους κανόνες φίλτρων του kmail "
-"ώστε να χρησιμοποιούν γνωστά εργαλεία anti-virus.</p>"
-"<p>Ο οδηγός μπορεί να εντοπίσει τέτοια εργαλεία στον υπολογιστή σας, αλλά και "
-"να δημιουργήσει κανόνες φίλτρων για να ταξινομεί τα μηνύματα χρησιμοποιώντας "
-"αυτά τα εργαλεία και να διαχωρίζει μηνύματα που φέρουν ιούς. Ο οδηγός δε θα "
-"λάβει υπ' όψιν ήδη υπάρχοντες κανόνες. Πάντοτε θα προσθέτει τους νέους "
-"κανόνες.</p>"
-"<p><b>Προσοχή:</b> Επειδή το Kmail μοιάζει κολλημένο κατά τη σάρωση των "
-"μηνυμάτων για ιούς, πιθανόν να αντιμετωπίσετε προβλήματα απόκρισης με το Kmail, "
-"καθώς η λειτουργία των εργαλείων anti-virus είναι συνήθως χρονοβόρα. Σε τέτοια "
-"περίπτωση θα μπορούσατε να διαγράψετε τους κανόνες φίλτρων που δημιουργήθηκαν "
-"από τον οδηγό, ώστε να επιστρέψετε στην προηγουμένη συμπεριφορά."
+"ώστε να χρησιμοποιούν γνωστά εργαλεία anti-virus.</p><p>Ο οδηγός μπορεί να "
+"εντοπίσει τέτοια εργαλεία στον υπολογιστή σας, αλλά και να δημιουργήσει "
+"κανόνες φίλτρων για να ταξινομεί τα μηνύματα χρησιμοποιώντας αυτά τα "
+"εργαλεία και να διαχωρίζει μηνύματα που φέρουν ιούς. Ο οδηγός δε θα λάβει "
+"υπ' όψιν ήδη υπάρχοντες κανόνες. Πάντοτε θα προσθέτει τους νέους κανόνες.</"
+"p><p><b>Προσοχή:</b> Επειδή το Kmail μοιάζει κολλημένο κατά τη σάρωση των "
+"μηνυμάτων για ιούς, πιθανόν να αντιμετωπίσετε προβλήματα απόκρισης με το "
+"Kmail, καθώς η λειτουργία των εργαλείων anti-virus είναι συνήθως χρονοβόρα. "
+"Σε τέτοια περίπτωση θα μπορούσατε να διαγράψετε τους κανόνες φίλτρων που "
+"δημιουργήθηκαν από τον οδηγό, ώστε να επιστρέψετε στην προηγουμένη "
+"συμπεριφορά."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1031,16 +1041,14 @@ msgstr "Μετακίνηση &πιθανών μηνυμάτων spam σε:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Ο προκαθορισμένος φάκελος είναι ο φάκελος εισερχομένων, αλλά μπορείτε να τον "
-"αλλάξετε στην παρακάτω προβολή φακέλων. "
-"<p>Η κατάταξη μηνυμάτων ως αβέβαια δεν υποστηρίζεται από όλα τα εργαλεία. Αν το "
-"εργαλείο που έχετε επιλέξει δεν την υποστηρίζει, η δυνατότητα επιλογής φακέλου "
-"δε θα είναι διαθέσιμη."
+"αλλάξετε στην παρακάτω προβολή φακέλων. <p>Η κατάταξη μηνυμάτων ως αβέβαια "
+"δεν υποστηρίζεται από όλα τα εργαλεία. Αν το εργαλείο που έχετε επιλέξει δεν "
+"την υποστηρίζει, η δυνατότητα επιλογής φακέλου δε θα είναι διαθέσιμη."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1050,13 +1058,13 @@ msgstr "Έλεγχος μηνυμάτων με εργαλεία anti-virus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Επιτρέπει στα εργαλεία anti-virus να ελέγξουν τα μηνύματα σας. Ο μάγος θα "
 "δημιουργήσει κατάλληλα φίλτρα. Τα μηνύματα συνήθως σημειώνονται από τα "
-"εργαλεία, ώστε τα φίλτρα να τα αναγνωρίσουν και να μετακινήσουν, π.χ., μηνύματα "
-"με ιούς σε ειδικό φάκελο."
+"εργαλεία, ώστε τα φίλτρα να τα αναγνωρίσουν και να μετακινήσουν, π.χ., "
+"μηνύματα με ιούς σε ειδικό φάκελο."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1065,8 +1073,8 @@ msgstr "Μετακίνηση μηνυμάτων με ιούς στον επιλ�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Δημιουργείται ένα φίλτρο που ανιχνεύει μηνύματα ταξινομημένα ως ιοί και τα "
 "μετακινεί σε ένα ορισμένο φάκελο. Ο προκαθορισμένος φάκελος είναι τα "
@@ -1078,11 +1086,11 @@ msgstr "Επιπρόσθετα, σημείωση μηνυμάτων με ιού�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Σημείωση μηνυμάτων που θεωρήθηκαν μολυσμένα από ιό ως αναγνωσμένα, μαζί με την "
-"μετακίνησή τους στον επιλεγμένο φάκελο."
+"Σημείωση μηνυμάτων που θεωρήθηκαν μολυσμένα από ιό ως αναγνωσμένα, μαζί με "
+"την μετακίνησή τους στον επιλεγμένο φάκελο."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1277,8 +1285,8 @@ msgstr "Σφάλμα κατά την ανάγνωση του φακέλου %1 �
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1298,8 +1306,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1330,17 +1338,18 @@ msgstr "Διαγραμμένο"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Καμία από τις ταυτότητές σας δεν ταιριάζει με τον παραλήπτη του μηνύματος,"
-"<br>παρακαλώ επιλέξτε ποια από τις ακόλουθες διευθύνσεις σας ανήκει:"
+"<qt>Καμία από τις ταυτότητές σας δεν ταιριάζει με τον παραλήπτη του "
+"μηνύματος,<br>παρακαλώ επιλέξτε ποια από τις ακόλουθες διευθύνσεις σας "
+"ανήκει:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Αρκετές από τις ταυτότητές σας ταιριάζουν με τον παραλήπτη του μηνύματος,"
 "<br>παρακαλώ επιλέξτε ποια από τις ακόλουθες διευθύνσεις σας ανήκει:"
@@ -1372,18 +1381,21 @@ msgstr "Σφάλμα κατά τη συμπύκνωση του \"%1\". Η συμ
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Αυτή η ρύθμιση έγινε από το διαχειριστή σας.</p>"
-"<p>Αν νομίζετε ότι είναι λάθος, παρακαλώ επικοινωνήστε μαζί του.</p></qt>"
+"<qt><p>Αυτή η ρύθμιση έγινε από το διαχειριστή σας.</p><p>Αν νομίζετε ότι "
+"είναι λάθος, παρακαλώ επικοινωνήστε μαζί του.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Φόρτωση &προφίλ..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Ρύθμιση λογαριασμού"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Προσ&θήκη..."
@@ -1413,6 +1425,11 @@ msgstr "<qt>Επιθυμείτε πραγματικά την αφαίρεση τ
 msgid "Remove Identity"
 msgstr "Αφαίρεση ταυτότητας"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Αφαίρεση"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Προσθήκη..."
@@ -1421,6 +1438,11 @@ msgstr "Προσθήκη..."
 msgid "Modify..."
 msgstr "Τροποποίηση..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Αφαίρεση"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Ορισμός ως προκαθορισμένο"
@@ -1437,17 +1459,15 @@ msgstr "Α&ποστολή"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Λογαριασμοί εξερχομένων (προσθέστε τουλάχιστον ένα):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Όνομα"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Τύπος"
@@ -1469,8 +1489,7 @@ msgstr "Ορισμός ως προκαθορισμένο"
 msgid "Common Options"
 msgstr "Κοινές επιλογές"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Επι&βεβαίωση πριν την αποστολή"
@@ -1521,17 +1540,16 @@ msgstr "&Προκαθορισμένος τομέας:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ο προκαθορισμένος τομέας χρησιμεύει στη συμπλήρωση διευθύνσεων email που "
-"περιέχουν μόνο το όνομα χρήστη.</p></qt>"
+"<qt><p>Ο προκαθορισμένος τομέας χρησιμεύει στη συμπλήρωση διευθύνσεων email "
+"που περιέχουν μόνο το όνομα χρήστη.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1549,9 +1567,9 @@ msgstr "Προσθήκη μεταφορέα"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Προκαθορισμένο)"
 
@@ -1567,8 +1585,8 @@ msgid ""
 msgstr ""
 "Αυτή η ταυτότητα τροποποιήθηκε ώστε να χρησιμοποιεί τον τροποποιημένο "
 "μεταφορέα:\n"
-"Αυτές οι %n ταυτότητες τροποποιήθηκαν ώστε να χρησιμοποιούν τον τροποποιημένο "
-"μεταφορέα:"
+"Αυτές οι %n ταυτότητες τροποποιήθηκαν ώστε να χρησιμοποιούν τον "
+"τροποποιημένο μεταφορέα:"
 
 #: configuredialog.cpp:927
 #, c-format
@@ -1578,8 +1596,8 @@ msgid ""
 msgstr ""
 "Αυτή η ταυτότητα τροποποιήθηκε ώστε να χρησιμοποιεί τον προκαθορισμένο "
 "μεταφορέα:\n"
-"Αυτές οι %n ταυτότητες τροποποιήθηκαν ώστε να χρησιμοποιούν τον προκαθορισμένο "
-"μεταφορέα:"
+"Αυτές οι %n ταυτότητες τροποποιήθηκαν ώστε να χρησιμοποιούν τον "
+"προκαθορισμένο μεταφορέα:"
 
 #: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
@@ -1638,6 +1656,10 @@ msgstr "Τροποποίηση λογαριασμού"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Αδύνατος ο εντοπισμός του λογαριασμού <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Χρώματα"
@@ -1746,8 +1768,7 @@ msgstr "Χρησιμοποιημένος δεσμός"
 msgid "Misspelled Words"
 msgstr "Ανορθόγραφες λέξεις"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Νέο μήνυμα"
@@ -1937,8 +1958,8 @@ msgstr "Προκαθορισμένα, τα νήματα είναι κλειστ�
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Άνοιγμα νημά&των που περιέχουν νέα, μη αναγνωσμένα ή σημαντικά μηνύματα και "
 "νημάτων που παρακολουθούνται."
@@ -1949,75 +1970,57 @@ msgstr "Εμφάνιση ημερομηνίας"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Για την ημερομηνία μπορούν να χρησιμοποιηθούν οι εξής "
-"εκφράσεις:</strong></p>"
-"<ul>"
-"<li>d - η ημέρα ως αριθμός χωρίς το 0 μπροστά (1-31)</li>"
-"<li>dd - η ημέρα ως αριθμός με το 0 μπροστά (01-31)</li>"
-"<li>ddd - συντομευμένο όνομα ημέρας (Δευ - Κυρ)</li>"
-"<li>dddd - πλήρες όνομα ημέρας (Δευτέρα - Κυριακή)</li>"
-"<li>M - ο μήνας ως αριθμός χωρίς το 0 μπροστά (1-12)</li>"
-"<li>MM - ο μήνας ως αριθμός με το 0 μπροστά (01-12)</li>"
-"<li>MMM - συντομευμένο όνομα μήνα (Ιαν - Δεκ)</li>"
-"<li>MMMM - πλήρες όνομα μήνα (Ιανουάριος - Δεκέμβριος)</li>"
-"<li>yy - το έτος με δύο ψηφία (00-99)</li> "
-"<li>yyyy - το έτος με 4 ψηφία (0000-9999)</li></ul>"
-"<p><strong>Για την ώρα μπορούν να χρησιμοποιηθούν οι εξής εκφράσεις:</string>"
-"</p> "
-"<ul>"
-"<li>h - η ώρα ως αριθμός χωρίς το 0 μπροστά (0-23 ή 1-12 αν εμφανίζεται σαν "
-"πμ/μμ)</li>"
-"<li>hh - η ώρα με το 0 μπροστά (00-23 or 01-12 αν εμφανίζεται σαν πμ/μμ)</li>"
-"<li>m - τα λεπτά χωρίς το 0 μπροστά (0-59)</li>"
-"<li>mm - τα λεπτά με το 0 μπροστά (00-59)</li>"
-"<li>s - τα δευτερόλεπτα χωρίς το 0 μπροστά (0-59)</li>"
-"<li>ss - τα δευτερόλεπτα με το 0 μπροστά (00-59)</li>"
-"<li>z - τα χιλιοστά του δευτερολέπτου χωρίς το 0 μπροστά (0-999)</li>"
-"<li>zzz - τα χιλιοστά του δευτερολέπτου με το 0 μπροστά (000-999)</li>"
-"<li>AP - αλλαγή σε προβολή πμ/μμ. Το AP θα αντικαθίσταται με \"ΠΜ\" ή "
-"\"ΜΜ\".</li>"
-"<li>ap - αλλαγή σε προβολή πμ/μμ. Το ap θα αντικαθίσταται με \"πμ\" ή "
-"\"μμ\".</li>"
-"<li>Z - ζώνη ώρας σε αριθμητική μορφή (-0500)</li></ul>"
-"<p><strong>Όλοι οι άλλοι χαρακτήρες παραβλέπονται.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Για την ημερομηνία μπορούν να χρησιμοποιηθούν οι εξής "
+"εκφράσεις:</strong></p><ul><li>d - η ημέρα ως αριθμός χωρίς το 0 μπροστά "
+"(1-31)</li><li>dd - η ημέρα ως αριθμός με το 0 μπροστά (01-31)</li><li>ddd - "
+"συντομευμένο όνομα ημέρας (Δευ - Κυρ)</li><li>dddd - πλήρες όνομα ημέρας "
+"(Δευτέρα - Κυριακή)</li><li>M - ο μήνας ως αριθμός χωρίς το 0 μπροστά "
+"(1-12)</li><li>MM - ο μήνας ως αριθμός με το 0 μπροστά (01-12)</li><li>MMM - "
+"συντομευμένο όνομα μήνα (Ιαν - Δεκ)</li><li>MMMM - πλήρες όνομα μήνα "
+"(Ιανουάριος - Δεκέμβριος)</li><li>yy - το έτος με δύο ψηφία (00-99)</li> "
+"<li>yyyy - το έτος με 4 ψηφία (0000-9999)</li></ul><p><strong>Για την ώρα "
+"μπορούν να χρησιμοποιηθούν οι εξής εκφράσεις:</string></p> <ul><li>h - η ώρα "
+"ως αριθμός χωρίς το 0 μπροστά (0-23 ή 1-12 αν εμφανίζεται σαν πμ/μμ)</"
+"li><li>hh - η ώρα με το 0 μπροστά (00-23 or 01-12 αν εμφανίζεται σαν πμ/μμ)</"
+"li><li>m - τα λεπτά χωρίς το 0 μπροστά (0-59)</li><li>mm - τα λεπτά με το 0 "
+"μπροστά (00-59)</li><li>s - τα δευτερόλεπτα χωρίς το 0 μπροστά (0-59)</"
+"li><li>ss - τα δευτερόλεπτα με το 0 μπροστά (00-59)</li><li>z - τα χιλιοστά "
+"του δευτερολέπτου χωρίς το 0 μπροστά (0-999)</li><li>zzz - τα χιλιοστά του "
+"δευτερολέπτου με το 0 μπροστά (000-999)</li><li>AP - αλλαγή σε προβολή πμ/"
+"μμ. Το AP θα αντικαθίσταται με \"ΠΜ\" ή \"ΜΜ\".</li><li>ap - αλλαγή σε "
+"προβολή πμ/μμ. Το ap θα αντικαθίσταται με \"πμ\" ή \"μμ\".</li><li>Z - ζώνη "
+"ώρας σε αριθμητική μορφή (-0500)</li></ul><p><strong>Όλοι οι άλλοι "
+"χαρακτήρες παραβλέπονται.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Η αλλαγή της καθολικής ρύθμισης για τα νήματα θα υπερισχύσει όλων των τιμών που "
-"πιθανώς έχουν οριστεί για επιμέρους φακέλους."
+"Η αλλαγή της καθολικής ρύθμισης για τα νήματα θα υπερισχύσει όλων των τιμών "
+"που πιθανώς έχουν οριστεί για επιμέρους φακέλους."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2031,8 +2034,7 @@ msgstr "Εμφάνιση γραμμής &κατάστασης HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Εμφάνιση κατάστασης s&pam σε εντυπωσιακές κεφαλίδες"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Αντικατάσταση smileys με emoticons"
@@ -2041,8 +2043,7 @@ msgstr "Αντικατάσταση smileys με emoticons"
 msgid "Use smaller font for quoted text"
 msgstr "Χρήση μικρότερης γραμματοσειράς για κείμενο σε παράθεση"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Εμφάνιση σημείων ανάπτυξης/σύμπτυξης παράθεσης"
@@ -2068,8 +2069,7 @@ msgstr "Αυτόματη"
 msgid "&Override character encoding:"
 msgstr "&Υπερκάλυψη κωδικοποίησης χαρακτήρων:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Εικονίδιο στο πλαίσιο συστήματος"
@@ -2172,23 +2172,19 @@ msgstr "Το <b>%f</b> θα αντικατασταθεί με το όνομα α
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Οι παρακάτω αντικαταστάτες υποστηρίζονται στις φράσεις απάντησης:"
-"<br><b>%D</b>: ημερομηνία, <b>%S</b>: θέμα, "
-"<br><b>%e</b>: διεύθυνση αποστολέα, <b>%F</b>: όνομα αποστολέα, <b>%f</b>"
-": αρχικά αποστολέα,"
-"<br><b>%T</b>: όνομα παραλήπτη, <b>%t</b>: όνομα και διεύθυνση παραλήπτη,"
-"<br><b>%C</b>: ονόματα κοινοποίησης, <b>%c</b>: ονόματα και διευθύνσεις "
-"κοινοποίησης,"
-"<br><b>%%</b>: σύμβολο επί τις εκατό, <b>%_</b>: κενό, <b>%L</b>"
-": αλλαγή γραμμής</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Οι παρακάτω αντικαταστάτες υποστηρίζονται στις φράσεις απάντησης:<br><b>"
+"%D</b>: ημερομηνία, <b>%S</b>: θέμα, <br><b>%e</b>: διεύθυνση αποστολέα, <b>"
+"%F</b>: όνομα αποστολέα, <b>%f</b>: αρχικά αποστολέα,<br><b>%T</b>: όνομα "
+"παραλήπτη, <b>%t</b>: όνομα και διεύθυνση παραλήπτη,<br><b>%C</b>: ονόματα "
+"κοινοποίησης, <b>%c</b>: ονόματα και διευθύνσεις κοινοποίησης,<br><b>%%</b>: "
+"σύμβολο επί τις εκατό, <b>%_</b>: κενό, <b>%L</b>: αλλαγή γραμμής</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2211,21 +2207,20 @@ msgstr "Απάντηση σε ό&λους:"
 msgid "&Forward:"
 msgstr "Προώ&θηση:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Ένδειξ&η παράθεσης:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Στις %D, γράψατε:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Στις %D, ο/η %F έγραψε:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Προωθημένο μήνυμα"
 
@@ -2263,11 +2258,11 @@ msgstr "Εισάγετε νέο πρόθεμα προώθησης:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Αυτή η λίστα ελέγχεται για κάθε εξερχόμενο μήνυμα από πάνω προς τα κάτω για ένα "
-"σύνολο χαρακτήρων που να περιέχει όλους τους αναγκαίους χαρακτήρες."
+"Αυτή η λίστα ελέγχεται για κάθε εξερχόμενο μήνυμα από πάνω προς τα κάτω για "
+"ένα σύνολο χαρακτήρων που να περιέχει όλους τους αναγκαίους χαρακτήρες."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2276,8 +2271,8 @@ msgstr "Εισάγετε σύνολο χαρακτήρων:"
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"Διατήρηση αυθεντι&κού συνόλου χαρακτήρων σε απαντήσεις ή προωθήσεις (αν είναι "
-"δυνατό)"
+"Διατήρηση αυθεντι&κού συνόλου χαρακτήρων σε απαντήσεις ή προωθήσεις (αν "
+"είναι δυνατό)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2303,10 +2298,9 @@ msgstr "Τιμή"
 msgid "Ne&w"
 msgstr "&Νέο"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "Ό&νομα:"
@@ -2315,16 +2309,15 @@ msgstr "Ό&νομα:"
 msgid "&Value:"
 msgstr "&Τιμή:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Ονομασία συνημμένων συμβατή με το Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Ενεργοποιήστε αυτή την επιλογή για να κάνετε το Outlook(tm) να καταλαβαίνει "
 "ονόματα συνημμένων με μη αγγλικούς χαρακτήρες"
@@ -2355,21 +2348,21 @@ msgstr "επισύναψη"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Επιλέξατε να κωδικοποιήσετε τα ονόματα των συνημμένων που περιέχουν μη "
 "αγγλικούς χαρακτήρες έτσι ώστε να γίνονται αντιληπτά από το Outlook(tm) και "
 "άλλους πελάτες αλληλογραφίας που δεν υποστηρίζουν τα πρότυπα κωδικοποίησης "
 "ονομάτων συνημμένων.\n"
-"Σημειώστε ότι το KMail μπορεί να δημιουργήσει μηνύματα ασύμβατα με τα πρότυπα, "
-"και ακολούθως είναι πιθανό τα μηνύματά σας να μη διαβάζονται από πελάτες "
-"αλληλογραφίας συμβατούς με τα πρότυπα. Έτσι, εκτός αν δεν έχετε άλλη "
+"Σημειώστε ότι το KMail μπορεί να δημιουργήσει μηνύματα ασύμβατα με τα "
+"πρότυπα, και ακολούθως είναι πιθανό τα μηνύματά σας να μη διαβάζονται από "
+"πελάτες αλληλογραφίας συμβατούς με τα πρότυπα. Έτσι, εκτός αν δεν έχετε άλλη "
 "δυνατότητα, δε θα πρέπει να ενεργοποιήσετε αυτή την επιλογή."
 
 #: configuredialog.cpp:3682
@@ -2394,117 +2387,102 @@ msgstr "Συστήματα υποστήριξης &κρυπτογράφησης"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Τα μηνύματα πολλές φορές έρχονται και στις δύο μορφές. Αυτή η επιλογή "
-"καθορίζει αν θα εμφανίζεται το HTML τμήμα ή το τμήμα απλού κειμένου.</p>"
-"<p>Η εμφάνιση του HTML τμήματος κάνει το μήνυμα πιο ευπαρουσίαστο, αλλά την "
-"ίδια στιγμή ίσως υπάρξει πρόβλημα ασφαλείας του συστήματος.</p>"
-"<p>Η εμφάνιση του τμήματος απλού κειμένου χάνει τη μορφοποίηση του μηνύματος, "
-"αλλά καθιστά σχεδόν <em>αδύνατο</em> το να υπάρξει πρόβλημα ασφαλείας μέσω του "
-"αναγνώστη HTML (Konqueror).</p>"
-"<p>Η κατωτέρω επιλογή προφυλάσσει από μια γνωστή κατάχρηση των HTML μηνυμάτων, "
-"αλλά δεν μπορεί να προφυλάξει από θέματα ασφαλείας άγνωστα την στιγμή "
-"δημιουργίας αυτής της έκδοσης του kmail.</p>"
-"<p>Ως εκ τούτου προτείνεται να <em>μη</em> προτιμάται η HTML από το απλό "
-"κείμενο.</p>"
-"<p><b>Σημείωση:</b> Μπορείτε να ορίσετε αυτή την επιλογή ανά φάκελο, από το "
-"μενού <i>Φάκελος</i> του κεντρικού παραθύρου του kmail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Τα μηνύματα πολλές φορές έρχονται και στις δύο μορφές. Αυτή η επιλογή "
+"καθορίζει αν θα εμφανίζεται το HTML τμήμα ή το τμήμα απλού κειμένου.</p><p>Η "
+"εμφάνιση του HTML τμήματος κάνει το μήνυμα πιο ευπαρουσίαστο, αλλά την ίδια "
+"στιγμή ίσως υπάρξει πρόβλημα ασφαλείας του συστήματος.</p><p>Η εμφάνιση του "
+"τμήματος απλού κειμένου χάνει τη μορφοποίηση του μηνύματος, αλλά καθιστά "
+"σχεδόν <em>αδύνατο</em> το να υπάρξει πρόβλημα ασφαλείας μέσω του αναγνώστη "
+"HTML (Konqueror).</p><p>Η κατωτέρω επιλογή προφυλάσσει από μια γνωστή "
+"κατάχρηση των HTML μηνυμάτων, αλλά δεν μπορεί να προφυλάξει από θέματα "
+"ασφαλείας άγνωστα την στιγμή δημιουργίας αυτής της έκδοσης του kmail.</"
+"p><p>Ως εκ τούτου προτείνεται να <em>μη</em> προτιμάται η HTML από το απλό "
+"κείμενο.</p><p><b>Σημείωση:</b> Μπορείτε να ορίσετε αυτή την επιλογή ανά "
+"φάκελο, από το μενού <i>Φάκελος</i> του κεντρικού παραθύρου του kmail.</p></"
+"qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Κάποια διαφημιστικά μηνύματα είναι σε HTML και περιέχουν, για παράδειγμα, "
-"δεσμούς σε εικόνες που οι διαφημιστές χρησιμοποιούν για να διαπιστώσουν αν "
-"διαβάσατε το μήνυμα. (&quot;web bugs&quot;).</p>"
-"<p>Δεν υπάρχει σοβαρός λόγος να φορτώνονται εικόνες από το internet κατ` αυτόν "
-"τον τρόπο, καθώς ο αποστολέας μπορεί να συνάψει τις εικόνες κατευθείαν μέσα στο "
-"μήνυμα.</p>"
-"<p>Προς αποφυγή τέτοιας κατάχρησης της δυνατότητας του kmail να δείχνει HTML, "
-"αυτή η επιλογή είναι <em>απενεργοποιημένη</em> από προεπιλογή.</p>"
-"<p>Πάντως,αν επιθυμείτε, για παράδειγμα, να δείτε εικόνες που δεν ήταν "
-"συνημμένες στο μήνυμα, μπορείτε να την ενεργοποιήσετε, αλλά θα πρέπει να έχετε "
-"υπ` όψιν το πιθανό πρόβλημα.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Κάποια διαφημιστικά μηνύματα είναι σε HTML και περιέχουν, για "
+"παράδειγμα, δεσμούς σε εικόνες που οι διαφημιστές χρησιμοποιούν για να "
+"διαπιστώσουν αν διαβάσατε το μήνυμα. (&quot;web bugs&quot;).</p><p>Δεν "
+"υπάρχει σοβαρός λόγος να φορτώνονται εικόνες από το internet κατ` αυτόν τον "
+"τρόπο, καθώς ο αποστολέας μπορεί να συνάψει τις εικόνες κατευθείαν μέσα στο "
+"μήνυμα.</p><p>Προς αποφυγή τέτοιας κατάχρησης της δυνατότητας του kmail να "
+"δείχνει HTML, αυτή η επιλογή είναι <em>απενεργοποιημένη</em> από προεπιλογή."
+"</p><p>Πάντως,αν επιθυμείτε, για παράδειγμα, να δείτε εικόνες που δεν ήταν "
+"συνημμένες στο μήνυμα, μπορείτε να την ενεργοποιήσετε, αλλά θα πρέπει να "
+"έχετε υπ` όψιν το πιθανό πρόβλημα.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Πολιτική ειδοποιήσεων παράδοσης μηνύματος</h3>"
-"<p>Οι ειδοποιήσεις παράδοσης είναι μια γενίκευση αυτού που κοινώς λέγεται <b>"
-"αναφορά ανάγνωσης</b>. Ο συντάκτης του μηνύματος ζητά να του αποσταλεί μια "
-"ειδοποίηση παράδοσης και το πρόγραμμα email του παραλήπτη δημιουργεί μιαν "
-"απάντηση από την οποία ο συγγραφέας πληροφορείται τί απέγινε το μήνυμά του. Οι "
-"πιο συνηθισμένες ειδοποιήσεις αναφέρουν  <b>προβλήθηκε</b> "
-"(δηλ. διαβάστηκε), <b>διεγράφη</b> και <b>ανακατευθύνθηκε</b> "
-"(δηλ. προωθήθηκε).</p>"
-"<p>Οι ακόλουθες επιλογές είναι διαθέσιμες για να ρυθμίσετε την αποστολή "
-"ειδοποιήσεων ανάγνωσης του KMail:</p>"
-"<ul>"
-"<li><em>Παράβλεψη</em>: Οποιαδήποτε αίτηση για αποστολή ειδοποίησης αγνοείται. "
-"Καμία ειδοποίηση δε θα αποσταλεί αυτόματα. (προτείνεται).</li>"
-"<li><em>Ερώτηση</em>: Απαντάει στην αίτηση μόνο αφού ζητηθεί η άδεια του "
-"χρήστη. Με αυτόν τον τρόπο μπορείτε να στέλνετε ειδοποιήσεις για κάποια "
-"μηνύματα, και να αρνείστε ή να αγνοείτε άλλες.</li>"
-"<li><em>Άρνηση</em>: Αποστολή πάντα μιας <b>αρνητικής</b> "
-"ειδοποίησης. Αυτό είναι <em>λίγο</em> καλύτερο από την χωρίς όρους αποστολή. Ο "
-"συγγραφέας του μηνύματος θα ξέρει ότι το μήνυμα έχει φτάσει στον παραλήπτη, "
-"αλλά δε θα ξέρει αν έχει διαβαστεί, σβηστεί κλπ.</li>"
-"<li><em>Αποστολή πάντα</em>: Πάντα αποστέλλεται η ζητούμενη ειδοποίηση "
-"ανάγνωσης. Αυτό σημαίνει ότι ο συγγραφέας του μηνύματος γνωρίζει πότε λήφθηκε "
-"το μήνυμα, και τι έγινε με αυτό (εμφανίστηκε, διαγράφηκε κλπ.). Η χρήση αυτής "
-"της επιλογής δεν προτείνεται, αλλά υπάρχει γιατί σε κάποιες περιπτώσεις ίσως "
-"είναι επιθυμητή, όπως για παράδειγμα σε μια υπηρεσία εξυπηρέτησης πελατών.</li>"
-"</ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Πολιτική ειδοποιήσεων παράδοσης μηνύματος</h3><p>Οι ειδοποιήσεις "
+"παράδοσης είναι μια γενίκευση αυτού που κοινώς λέγεται <b>αναφορά ανάγνωσης</"
+"b>. Ο συντάκτης του μηνύματος ζητά να του αποσταλεί μια ειδοποίηση παράδοσης "
+"και το πρόγραμμα email του παραλήπτη δημιουργεί μιαν απάντηση από την οποία "
+"ο συγγραφέας πληροφορείται τί απέγινε το μήνυμά του. Οι πιο συνηθισμένες "
+"ειδοποιήσεις αναφέρουν  <b>προβλήθηκε</b> (δηλ. διαβάστηκε), <b>διεγράφη</b> "
+"και <b>ανακατευθύνθηκε</b> (δηλ. προωθήθηκε).</p><p>Οι ακόλουθες επιλογές "
+"είναι διαθέσιμες για να ρυθμίσετε την αποστολή ειδοποιήσεων ανάγνωσης του "
+"KMail:</p><ul><li><em>Παράβλεψη</em>: Οποιαδήποτε αίτηση για αποστολή "
+"ειδοποίησης αγνοείται. Καμία ειδοποίηση δε θα αποσταλεί αυτόματα. "
+"(προτείνεται).</li><li><em>Ερώτηση</em>: Απαντάει στην αίτηση μόνο αφού "
+"ζητηθεί η άδεια του χρήστη. Με αυτόν τον τρόπο μπορείτε να στέλνετε "
+"ειδοποιήσεις για κάποια μηνύματα, και να αρνείστε ή να αγνοείτε άλλες.</"
+"li><li><em>Άρνηση</em>: Αποστολή πάντα μιας <b>αρνητικής</b> ειδοποίησης. "
+"Αυτό είναι <em>λίγο</em> καλύτερο από την χωρίς όρους αποστολή. Ο συγγραφέας "
+"του μηνύματος θα ξέρει ότι το μήνυμα έχει φτάσει στον παραλήπτη, αλλά δε θα "
+"ξέρει αν έχει διαβαστεί, σβηστεί κλπ.</li><li><em>Αποστολή πάντα</em>: Πάντα "
+"αποστέλλεται η ζητούμενη ειδοποίηση ανάγνωσης. Αυτό σημαίνει ότι ο "
+"συγγραφέας του μηνύματος γνωρίζει πότε λήφθηκε το μήνυμα, και τι έγινε με "
+"αυτό (εμφανίστηκε, διαγράφηκε κλπ.). Η χρήση αυτής της επιλογής δεν "
+"προτείνεται, αλλά υπάρχει γιατί σε κάποιες περιπτώσεις ίσως είναι επιθυμητή, "
+"όπως για παράδειγμα σε μια υπηρεσία εξυπηρέτησης πελατών.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2522,15 +2500,16 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b> Η χρήση της HTML στο email μπορεί να αυξήσει το ρίσκο το "
-"σύστημά σας να γίνει λιγότερο ανθεκτικό απέναντι σε τωρινές και μελλοντικές "
-"επιθέσεις. <a href=\"whatsthis:%1\">Περισσότερα για τα HTML mails...</a> "
-"<a href=\"whatsthis:%2\">Περισσότερα για τις εξωτερικές αναφορές...</a>"
+"<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b> Η χρήση της HTML στο email μπορεί να αυξήσει το ρίσκο "
+"το σύστημά σας να γίνει λιγότερο ανθεκτικό απέναντι σε τωρινές και "
+"μελλοντικές επιθέσεις. <a href=\"whatsthis:%1\">Περισσότερα για τα HTML "
+"mails...</a> <a href=\"whatsthis:%2\">Περισσότερα για τις εξωτερικές "
+"αναφορές...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2590,8 +2569,9 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b> Η επιστροφή επιβεβαιώσεων χωρίς προϋποθέσεις υπονομεύει "
-"το προσωπικό απόρρητό σας. <a href=\"whatsthis:%1\">Περισσότερα...</a>"
+"<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b> Η επιστροφή επιβεβαιώσεων χωρίς προϋποθέσεις "
+"υπονομεύει το προσωπικό απόρρητό σας. <a href=\"whatsthis:%1\">Περισσότερα..."
+"</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2612,8 +2592,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Αυτή η επιλογή απαιτεί το dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "χωρίς διαμεσολαβητή"
@@ -2643,8 +2622,8 @@ msgstr "Να μη &λήγουν τα σημαντικά μηνύματα"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Κατά την προσπάθεια εύρεσης μη αναγνωσμένων μηνυμάτων:"
 
@@ -2668,8 +2647,8 @@ msgstr "Επανάληψη σε όλους τους φακέλους"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Κατά την είσοδο σε ένα φάκελο:"
 
@@ -2738,28 +2717,24 @@ msgstr "Κατάλογοι (μορφή \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Με αυτή την επιλογή, καθορίζετε τον τύπο θυρίδας που θα χρησιμοποιηθεί για "
-"τους τοπικούς φακέλους:</p>"
-"<p><b>mbox:</b> Ο κάθε φάκελος μηνυμάτων του KMail γράφεται σε ένα αρχείο. Τα "
-"μηνύματα ξεχωρίζονται με μία γραμμή που αρχίζει με το \"From \". Έτσι "
-"εξοικονομείται χώρος στο δίσκο, αλλά μειώνεται η ταχύτητα, π.χ. στην μετακίνηση "
-"μηνυμάτων μεταξύ φακέλων.</p>"
-"<p><b>maildir:</b> Οι φάκελοι μηνυμάτων του kmail αντιστοιχούν σε πραγματικούς "
-"φακέλους στο δίσκο. Το κάθε μήνυμα είναι ένα ξεχωριστό αρχείο. Μπορεί να "
-"χρησιμοποιείται περισσότερος χώρος αποθήκευσης, αλλά βελτιώνεται η ταχύτητα, "
-"π.χ. στην μετακίνηση μηνυμάτων μεταξύ φακέλων.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Με αυτή την επιλογή, καθορίζετε τον τύπο θυρίδας που θα "
+"χρησιμοποιηθεί για τους τοπικούς φακέλους:</p><p><b>mbox:</b> Ο κάθε φάκελος "
+"μηνυμάτων του KMail γράφεται σε ένα αρχείο. Τα μηνύματα ξεχωρίζονται με μία "
+"γραμμή που αρχίζει με το \"From \". Έτσι εξοικονομείται χώρος στο δίσκο, "
+"αλλά μειώνεται η ταχύτητα, π.χ. στην μετακίνηση μηνυμάτων μεταξύ φακέλων.</"
+"p><p><b>maildir:</b> Οι φάκελοι μηνυμάτων του kmail αντιστοιχούν σε "
+"πραγματικούς φακέλους στο δίσκο. Το κάθε μήνυμα είναι ένα ξεχωριστό αρχείο. "
+"Μπορεί να χρησιμοποιείται περισσότερος χώρος αποθήκευσης, αλλά βελτιώνεται η "
+"ταχύτητα, π.χ. στην μετακίνηση μηνυμάτων μεταξύ φακέλων.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2793,55 +2768,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Όταν μεταβαίνετε στο επόμενο αδιάβαστο μήνυμα, είναι πιθανό να μην υπάρχουν "
-"άλλα αδιάβαστα μηνύματα παρακάτω.</p>"
-"<p><b>Χωρίς επανάληψη:</b> Η αναζήτηση θα σταματήσει στο τελευταίο μήνυμα μέσα "
-"στο φάκελο.</p>"
-"<p><b>Επανάληψη στον τρέχοντα φάκελο:</b> Η αναζήτηση θα συνεχίσει από την αρχή "
-"των μηνυμάτων του τρέχοντος φακέλου αλλά δεν θα συνεχίσει σε άλλους "
-"φακέλους.</p>"
-"<p><b>Επανάληψη σε όλους τους φακέλους:</b> Η αναζήτηση θα συνεχίσει μετά τον "
-"τρέχοντα φάκελο και σε όλους τους άλλους.</p>"
-"<p>Παρομοίως, ψάχνοντας για το προηγούμενο αδιάβαστο μήνυμα, η αναζήτηση θα "
-"ξεκινήσει από το τέλος των μηνυμάτων και θα συνεχίσει στον προηγούμενο φάκελο, "
-"αναλόγως με την ρύθμιση που έχει επιλεχθεί.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Όταν μεταβαίνετε στο επόμενο αδιάβαστο μήνυμα, είναι πιθανό να μην "
+"υπάρχουν άλλα αδιάβαστα μηνύματα παρακάτω.</p><p><b>Χωρίς επανάληψη:</b> Η "
+"αναζήτηση θα σταματήσει στο τελευταίο μήνυμα μέσα στο φάκελο.</"
+"p><p><b>Επανάληψη στον τρέχοντα φάκελο:</b> Η αναζήτηση θα συνεχίσει από την "
+"αρχή των μηνυμάτων του τρέχοντος φακέλου αλλά δεν θα συνεχίσει σε άλλους "
+"φακέλους.</p><p><b>Επανάληψη σε όλους τους φακέλους:</b> Η αναζήτηση θα "
+"συνεχίσει μετά τον τρέχοντα φάκελο και σε όλους τους άλλους.</"
+"p><p>Παρομοίως, ψάχνοντας για το προηγούμενο αδιάβαστο μήνυμα, η αναζήτηση "
+"θα ξεκινήσει από το τέλος των μηνυμάτων και θα συνεχίσει στον προηγούμενο "
+"φάκελο, αναλόγως με την ρύθμιση που έχει επιλεχθεί.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Το ευρετήριο πλήρους κειμένου επιτρέπει πολύ γρήγορες αναζητήσεις στο σώμα "
-"των μηνυμάτων. Όταν είναι ενεργοποιημένη, ο διάλογος αναζήτησης λειτουργεί πολύ "
-"γρήγορα. Επίσης, η γραμμή εργαλείων αναζήτησης θα μπορεί να επιλέγει μηνύματα "
-"βάσει περιεχομένου.</p>"
-"<p>Χρειάζεται κάποιον χώρο στο δίσκο (περίπου το ήμισυ του χώρου για τα "
-"μηνύματα).</p>"
-"<p>Αφού ενεργοποιηθεί, θα χρειαστεί να δημιουργηθεί το ευρετήριο, αλλά μπορείτε "
-"να συνεχίσετε την εργασία σας με το kmail καθώς αυτό εκτελείται.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Το ευρετήριο πλήρους κειμένου επιτρέπει πολύ γρήγορες αναζητήσεις στο "
+"σώμα των μηνυμάτων. Όταν είναι ενεργοποιημένη, ο διάλογος αναζήτησης "
+"λειτουργεί πολύ γρήγορα. Επίσης, η γραμμή εργαλείων αναζήτησης θα μπορεί να "
+"επιλέγει μηνύματα βάσει περιεχομένου.</p><p>Χρειάζεται κάποιον χώρο στο "
+"δίσκο (περίπου το ήμισυ του χώρου για τα μηνύματα).</p><p>Αφού "
+"ενεργοποιηθεί, θα χρειαστεί να δημιουργηθεί το ευρετήριο, αλλά μπορείτε να "
+"συνεχίσετε την εργασία σας με το kmail καθώς αυτό εκτελείται.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2907,8 +2872,8 @@ msgstr "&Απόκρυψη φακέλων Groupware"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Όταν αυτό είναι ενεργοποιημένο, ο πόρος IMAP δε θα εμφανίζεται στη λίστα "
 "φακέλων."
@@ -2919,8 +2884,8 @@ msgstr "Εμφάνιση μόνο φακέλων groupware για αυτόν τ�
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Όταν αυτό είναι ενεργοποιημένο, οι κανονικοί φάκελοι δε θα εμφανίζονται στη "
 "λίστα φακέλων για λογαριασμούς που έχουν ρυθμιστεί για groupware."
@@ -2982,23 +2947,22 @@ msgid ""
 "compatible way."
 msgstr ""
 "Το Microsoft Outlook, όταν χρησιμοποιείται σε συνδυασμό με ένα διακομιστή "
-"Microsoft Exchange, έχει πρόβλημα με την ανάλυση τυπικών μηνυμάτων groupware. "
-"Ενεργοποιήστε αυτήν την επιλογή ώστε η αποστολή προσκλήσεων groupware να "
-"γίνεται σε συμβατή με το Microsoft Exchange μορφή."
+"Microsoft Exchange, έχει πρόβλημα με την ανάλυση τυπικών μηνυμάτων "
+"groupware. Ενεργοποιήστε αυτήν την επιλογή ώστε η αποστολή προσκλήσεων "
+"groupware να γίνεται σε συμβατή με το Microsoft Exchange μορφή."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Ονομασία συνημμένων συμβατή με το Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Αυτόματη αποστολή προσκλήσεων"
@@ -3013,25 +2977,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Οι προσκλήσεις στέλνονται κανονικά ως συνημμένα σε ένα μήνυμα. Αντιθέτως, "
-"αν ενεργοποιήσετε αυτή την επιλογή θα αποστέλλονται στο κείμενο του μηνύματος. "
-"Αυτό απαιτείται για να στέλνετε προσκλήσεις και απαντήσεις στο Microsoft "
-"Outlook."
-"<br>Όταν όμως το κάνετε, δεν θα δημιουργείται πλέον περιγραφικό κείμενο που "
-"διαβάζεται από τα προγράμματα αλληλογραφίας. Έτσι, σε χρήστες των οποίων τα "
-"προγράμματα δεν αντιλαμβάνονται τις προσκλήσεις, το μήνυμα θα φαίνεται πολύ "
-"περίεργο."
-"<br>Οι χρήστες προγραμμάτων αλληλογραφίας που αντιλαμβάνονται τις προσκλήσεις "
-"όμως, θα τις βλέπουν κανονικά.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Οι προσκλήσεις στέλνονται κανονικά ως συνημμένα σε ένα μήνυμα. "
+"Αντιθέτως, αν ενεργοποιήσετε αυτή την επιλογή θα αποστέλλονται στο κείμενο "
+"του μηνύματος. Αυτό απαιτείται για να στέλνετε προσκλήσεις και απαντήσεις "
+"στο Microsoft Outlook.<br>Όταν όμως το κάνετε, δεν θα δημιουργείται πλέον "
+"περιγραφικό κείμενο που διαβάζεται από τα προγράμματα αλληλογραφίας. Έτσι, "
+"σε χρήστες των οποίων τα προγράμματα δεν αντιλαμβάνονται τις προσκλήσεις, το "
+"μήνυμα θα φαίνεται πολύ περίεργο.<br>Οι χρήστες προγραμμάτων αλληλογραφίας "
+"που αντιλαμβάνονται τις προσκλήσεις όμως, θα τις βλέπουν κανονικά.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3096,8 +3058,8 @@ msgstr "Περιγραφή"
 #: configuredialog_p.cpp:302
 msgid "&Select a profile and click 'OK' to load its settings:"
 msgstr ""
-"Επιλέ&ξτε ένα προφίλ και κάντε κλικ στο 'Εντάξει' για να φορτωθούν οι ρυθμίσεις "
-"του:"
+"Επιλέ&ξτε ένα προφίλ και κάντε κλικ στο 'Εντάξει' για να φορτωθούν οι "
+"ρυθμίσεις του:"
 
 #: configuredialog_p.cpp:342
 msgid ""
@@ -3137,30 +3099,29 @@ msgstr "Προώθηση"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Εδώ μπορείτε να προσθέσετε, επεξεργαστείτε και να διαγράψετε προσαρμοσμένα "
-"πρότυπα για χρήση κατά τη σύνταξη ή απάντηση ενός προωθημένου μηνύματος. "
-"Δημιουργήστε το προσαρμοσμένο πρότυπο επιλέγοντάς το χρησιμοποιώντας το μενού "
-"του δεξιού κλικ ή το μενού της γραμμής εργαλείων. Μπορείτε επίσης να αναθέσετε "
-"ένα συνδυασμό πλήκτρων στο πρότυπο για πιο γρήγορη ενεργοποίησή του.</p>"
-"<p>Τα πρότυπα μηνύματος υποστηρίζουν εντολές αντικατάστασης με απλή "
-"πληκτρολόγησή τους ή με επιλογή τους από το μενού <i>Εισαγωγή εντολής</i>.</p>"
-"<p>Υπάρχουν τεσσάρων ειδών προσαρμοσμένων προτύπων, για χρήση στην <i>"
-"Απάντηση</i>, <i>Απάντηση σε όλους</i>, <i>Προώθηση</i>, και το <i>Γενικό</i> "
-"το οποίο μπορεί να χρησιμοποιηθεί σε όλες τις λειτουργίες. Στα <i>Γενικά</i> "
-"πρότυπα δεν μπορείτε να αναθέσετε συντομεύσεις πληκτρολογίου.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Εδώ μπορείτε να προσθέσετε, επεξεργαστείτε και να διαγράψετε "
+"προσαρμοσμένα πρότυπα για χρήση κατά τη σύνταξη ή απάντηση ενός προωθημένου "
+"μηνύματος. Δημιουργήστε το προσαρμοσμένο πρότυπο επιλέγοντάς το "
+"χρησιμοποιώντας το μενού του δεξιού κλικ ή το μενού της γραμμής εργαλείων. "
+"Μπορείτε επίσης να αναθέσετε ένα συνδυασμό πλήκτρων στο πρότυπο για πιο "
+"γρήγορη ενεργοποίησή του.</p><p>Τα πρότυπα μηνύματος υποστηρίζουν εντολές "
+"αντικατάστασης με απλή πληκτρολόγησή τους ή με επιλογή τους από το μενού "
+"<i>Εισαγωγή εντολής</i>.</p><p>Υπάρχουν τεσσάρων ειδών προσαρμοσμένων "
+"προτύπων, για χρήση στην <i>Απάντηση</i>, <i>Απάντηση σε όλους</i>, "
+"<i>Προώθηση</i>, και το <i>Γενικό</i> το οποίο μπορεί να χρησιμοποιηθεί σε "
+"όλες τις λειτουργίες. Στα <i>Γενικά</i> πρότυπα δεν μπορείτε να αναθέσετε "
+"συντομεύσεις πληκτρολογίου.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3177,15 +3138,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3250,8 +3211,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Υπάρχει ήδη μία λίστα διανομής με όνομα <b>%1</b>"
-". Παρακαλώ επιλέξτε ένα διαφορετικό όνομα.</qt>"
+"<qt>Υπάρχει ήδη μία λίστα διανομής με όνομα <b>%1</b>. Παρακαλώ επιλέξτε ένα "
+"διαφορετικό όνομα.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3260,8 +3221,8 @@ msgstr "Επεξεργασία με:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "Το KMail δεν μπορεί να καθορίσει πότε έκλεισε ο επιλεγμένος επεξεργαστής. Η "
 "επεξεργασία του συνημμένου απενεργοποιήθηκε, ώστε να μη χάσετε δεδομένα."
@@ -3519,6 +3480,11 @@ msgstr "Επιλογή φίλτρων"
 msgid "Filters"
 msgstr "Φίλτρα"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Επιλογή όλου του κειμένου"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3549,12 +3515,12 @@ msgstr "&Καταγραφή ενεργειών φίλτρου"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Εδώ μπορείτε να ενεργοποιήσετε/απενεργοποιήσετε την καταγραφή των ενεργειών του "
-"φίλτρου. Είναι προφανές ότι τα δεδομένα συλλέγονται και εμφανίζονται μόνο όταν "
-"είναι ενεργοποιημένη η καταγραφή. "
+"Εδώ μπορείτε να ενεργοποιήσετε/απενεργοποιήσετε την καταγραφή των ενεργειών "
+"του φίλτρου. Είναι προφανές ότι τα δεδομένα συλλέγονται και εμφανίζονται "
+"μόνο όταν είναι ενεργοποιημένη η καταγραφή. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3570,16 +3536,17 @@ msgstr "Εκτίμηση &κανόνων φίλτρου καταγραφής"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Μπορείτε να ελέγξετε το τί καταγράφεται σχετικά με την εκτίμηση των κανόνων των "
-"φίλτρων που εφαρμόζονται. Με την ενεργοποίηση αυτής της επιλογής, καταγράφονται "
-"λεπτομερείς πληροφορίες σχετικά με τον κάθε κανόνα του φίλτρου. Σε άλλη "
-"περίπτωση, θα καταγράφονται δεδομένα μόνο σχετικά με την εκτίμηση όλων μαζί των "
-"κανόνων ενός φίλτρου."
+"Μπορείτε να ελέγξετε το τί καταγράφεται σχετικά με την εκτίμηση των κανόνων "
+"των φίλτρων που εφαρμόζονται. Με την ενεργοποίηση αυτής της επιλογής, "
+"καταγράφονται λεπτομερείς πληροφορίες σχετικά με τον κάθε κανόνα του "
+"φίλτρου. Σε άλλη περίπτωση, θα καταγράφονται δεδομένα μόνο σχετικά με την "
+"εκτίμηση όλων μαζί των κανόνων ενός φίλτρου."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3599,16 +3566,16 @@ msgstr "απεριόριστο"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Η συλλογή δεδομένων καταγραφής χρησιμοποιεί μνήμη για την προσωρινή αποθήκευσή "
-"τους. Εδώ μπορείτε να περιορίσετε την μέγιστη ποσότητα μνήμης για αυτή την "
-"χρήση. Αν το μέγεθος των συλλεγομένων δεδομένων καταγραφής ξεπεράσει αυτό το "
-"όριο, τότε τα παλαιότερα δεδομένα θα απορρίπτονται έτσι ώστε να μη ξεπερνιέται "
-"το όριο. "
+"Η συλλογή δεδομένων καταγραφής χρησιμοποιεί μνήμη για την προσωρινή "
+"αποθήκευσή τους. Εδώ μπορείτε να περιορίσετε την μέγιστη ποσότητα μνήμης για "
+"αυτή την χρήση. Αν το μέγεθος των συλλεγομένων δεδομένων καταγραφής "
+"ξεπεράσει αυτό το όριο, τότε τα παλαιότερα δεδομένα θα απορρίπτονται έτσι "
+"ώστε να μη ξεπερνιέται το όριο. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3618,7 +3585,7 @@ msgstr ""
 "Αδύνατη η εγγραφή του αρχείου %1:\n"
 "Η λεπτομερής περιγραφή του σφάλματος είναι \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Σφάλμα του KMail"
@@ -3659,14 +3626,14 @@ msgstr "Αναγνωριστικό &χρήστη:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Το αναγνωριστικό χρήστη είναι το όνομα σύνδεσης του χρήστη στο διακομιστή IMAP. "
-"Μπορεί να είναι ένα απλό όνομα χρήστη ή η πλήρης διεύθυνση αλληλογραφίας του "
-"χρήστη. Αν κάνετε μόνος σας σύνδεση στον λογαριασμό σας, θα διαπιστώσετε ποιό "
-"είναι από τα δύο."
+"Το αναγνωριστικό χρήστη είναι το όνομα σύνδεσης του χρήστη στο διακομιστή "
+"IMAP. Μπορεί να είναι ένα απλό όνομα χρήστη ή η πλήρης διεύθυνση "
+"αλληλογραφίας του χρήστη. Αν κάνετε μόνος σας σύνδεση στον λογαριασμό σας, "
+"θα διαπιστώσετε ποιό είναι από τα δύο."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3717,8 +3684,8 @@ msgstr "Δεν έχετε άδεια εγγραφής/ανάγνωσης στο
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Οι πληροφορίες δεν έχουν ανακτηθεί ακόμα από το διακομιστή. Παρακαλώ "
 "χρησιμοποιήστε το \"Έλεγχος αλληλογραφίας\"."
@@ -3731,8 +3698,7 @@ msgstr "Σφάλμα: δεν έχει οριστεί λογαριασμός IMAP
 msgid "Connecting to server %1, please wait..."
 msgstr "Σύνδεση στο διακομιστή %1. Παρακαλώ περιμένετε..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Σφάλμα κατά τη σύνδεση στο διακομιστή %1"
@@ -3762,11 +3728,11 @@ msgstr "Προσθήκη αδειών"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Επιθυμείτε πραγματικά να αφαιρέσετε την άδεια πρόσβασής σας σε αυτόν το φάκελο; "
-"Δε θα μπορείτε να τον προσπελάσετε στη συνέχεια."
+"Επιθυμείτε πραγματικά να αφαιρέσετε την άδεια πρόσβασής σας σε αυτόν το "
+"φάκελο; Δε θα μπορείτε να τον προσπελάσετε στη συνέχεια."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3797,7 +3763,7 @@ msgstr "Χρήση:"
 msgid "Select Folder"
 msgstr "Επιλογή φακέλου"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Τοπικοί φάκελοι"
@@ -3821,13 +3787,13 @@ msgstr "Επιλογή συντόμευσης για το φάκελο"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Για να επιλέξετε ένα πλήκτρο ή ένα συνδυασμό πλήκτρων που θα επιλέγει τον "
-"τρέχοντα φάκελο, κάντε κλικ στο παρακάτω κουμπί και μετά πατήστε το πλήκτρο(α) "
-"που θέλετε να συσχετίσετε με αυτόν.</qt>"
+"<qt>Για να επιλέξετε ένα πλήκτρο ή ένα συνδυασμό πλήκτρων που θα επιλέγει "
+"τον τρέχοντα φάκελο, κάντε κλικ στο παρακάτω κουμπί και μετά πατήστε το "
+"πλήκτρο(α) που θέλετε να συσχετίσετε με αυτόν.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3848,14 +3814,23 @@ msgstr "&Ακύρωση"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Ο φάκελος που διαγράψατε είχε συσχετιστεί με το λογαριασμό <b>%1</b> "
-"ο οποίος τοποθετούσε τα εισερχόμενα μηνήματά του σε αυτόν. Από εδώ και πέρα, ο "
+"<qt>Ο φάκελος που διαγράψατε είχε συσχετιστεί με το λογαριασμό <b>%1</b> ο "
+"οποίος τοποθετούσε τα εισερχόμενα μηνήματά του σε αυτόν. Από εδώ και πέρα, ο "
 "λογαριασμός θα χρησιμοποιεί το φάκελο εισερχόμενα.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Σύνολο: %2<br>Μη αναγνωσμένα: %3<br>Μέγεθος: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Όριο: %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Άγνωστο"
@@ -3977,74 +3952,17 @@ msgstr "Κατάσταση Spam:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>Μ"
-"<br>ή"
-"<br>ν"
-"<br>υ"
-"<br>μ"
-"<br>α"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>Μ<br>ή<br>ν<br>υ<br>μ<br>α<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt> "
-"<br>Μ"
-"<br>ή"
-"<br>ν"
-"<br>υ"
-"<br>μ"
-"<br>α"
-"<br> "
-"<br>α"
-"<br>π"
-"<br>λ"
-"<br>ο"
-"<br>ύ"
-"<br> "
-"<br>κ"
-"<br>ε"
-"<br>ι"
-"<br>μ"
-"<br>έ"
-"<br>ν"
-"<br>ο"
-"<br>υ</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt> <br>Μ<br>ή<br>ν<br>υ<br>μ<br>α<br> <br>α<br>π<br>λ<br>ο<br>ύ<br> "
+"<br>κ<br>ε<br>ι<br>μ<br>έ<br>ν<br>ο<br>υ</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4056,19 +3974,14 @@ msgstr "&Το όνομα σας:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Το όνομά σας</h3>"
-"<p>Αυτό το πεδίο θα πρέπει να περιέχει το όνομά σας όπως θέλετε να εμφανίζεται "
-"στην κεφαλίδα του μηνύματος που θα αποσταλεί.</p>"
-"<p>Αν το αφήσετε κενό, θα εμφανίζεται μόνο η διεύθυνση αλληλογραφίας σας.</p>"
-"</qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
+msgstr ""
+"<qt><h3>Το όνομά σας</h3><p>Αυτό το πεδίο θα πρέπει να περιέχει το όνομά σας "
+"όπως θέλετε να εμφανίζεται στην κεφαλίδα του μηνύματος που θα αποσταλεί.</"
+"p><p>Αν το αφήσετε κενό, θα εμφανίζεται μόνο η διεύθυνση αλληλογραφίας σας.</"
+"p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4076,17 +3989,13 @@ msgstr "Ορ&γανισμός:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Οργανισμός</h3>"
-"<p>Αυτό το πεδίο θα πρέπει να περιέχει το ν οργανισμό σας όπως θέλετε να "
-"εμφανίζεται στην κεφαλίδα του μηνύματος που θα αποσταλεί.</p>"
-"<p>Είναι ασφαλές (και τυπικό) να το αφήσετε κενό.</p></qt>"
+"<qt><h3>Οργανισμός</h3><p>Αυτό το πεδίο θα πρέπει να περιέχει το ν οργανισμό "
+"σας όπως θέλετε να εμφανίζεται στην κεφαλίδα του μηνύματος που θα αποσταλεί."
+"</p><p>Είναι ασφαλές (και τυπικό) να το αφήσετε κενό.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4095,21 +4004,16 @@ msgstr "Διεύθυνση &αλληλογραφίας:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Διεύθυνση αλληλογραφίας</h3>"
-"<p>Αυτό το πεδίο θα πρέπει να περιέχει τη διεύθυνση αλληλογραφίας σας όπως "
-"θέλετε να εμφανίζεται στην κεφαλίδα του μηνύματος που θα αποσταλεί.</p>"
-"<p>Αν την αφήσετε κενή, ή τη γράψετε λάθος, οι παραλήπτες σας θα έχουν πρόβλημα "
-"να σας απαντήσουν.</p></qt>"
+"<qt><h3>Διεύθυνση αλληλογραφίας</h3><p>Αυτό το πεδίο θα πρέπει να περιέχει "
+"τη διεύθυνση αλληλογραφίας σας όπως θέλετε να εμφανίζεται στην κεφαλίδα του "
+"μηνύματος που θα αποσταλεί.</p><p>Αν την αφήσετε κενή, ή τη γράψετε λάθος, "
+"οι παραλήπτες σας θα έχουν πρόβλημα να σας απαντήσουν.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4118,21 +4022,12 @@ msgstr "Διεύθυνση &αλληλογραφίας:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4152,26 +4047,23 @@ msgstr "Το OpenPGP κλειδί υπογραφής σας"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Επιλέξτε το OpenPGP κλειδί που θα χρησιμοποιείται για την ψηφιακή υπογραφή των "
-"μηνυμάτων σας."
+"Επιλέξτε το OpenPGP κλειδί που θα χρησιμοποιείται για την ψηφιακή υπογραφή "
+"των μηνυμάτων σας."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Το κλειδί OpenPGP που θα επιλέξετε εδώ θα χρησιμοποιηθεί για την ψηφιακή "
-"υπογραφή των μηνυμάτων. Μπορείτε να χρησιμοποιήσετε επίσης κλειδιά GnuPG.</p>"
-"<p>Μπορείτε να το αφήσετε κενό, αλλά το KMail δεν θα μπορεί να επισυνάψει "
-"υπογραφή OpenPGP στα μηνύματα. Ωστόσο, οι συνήθεις λειτουργίες Email δεν θα "
-"επηρεαστούν.</p>"
-"<p>Μπορείτε να μάθετε περισσότερα για τα κλειδιά στο: <a>"
-"http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Το κλειδί OpenPGP που θα επιλέξετε εδώ θα χρησιμοποιηθεί για την "
+"ψηφιακή υπογραφή των μηνυμάτων. Μπορείτε να χρησιμοποιήσετε επίσης κλειδιά "
+"GnuPG.</p><p>Μπορείτε να το αφήσετε κενό, αλλά το KMail δεν θα μπορεί να "
+"επισυνάψει υπογραφή OpenPGP στα μηνύματα. Ωστόσο, οι συνήθεις λειτουργίες "
+"Email δεν θα επηρεαστούν.</p><p>Μπορείτε να μάθετε περισσότερα για τα "
+"κλειδιά στο: <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4183,8 +4075,8 @@ msgstr "Το κλειδί OpenPGP κρυπτογράφησης σας"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Επιλέξτε το κλειδί OpenPGP που θα χρησιμοποιείται όταν γίνεται κρυπτογράφηση "
 "στον εαυτό σας και για το χαρακτηριστικό \"Επισύναψη του δημοσίου κλειδιού "
@@ -4192,25 +4084,20 @@ msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Το κλειδί OpenPGP που επιλέγετε εδώ θα χρησιμοποιείται για την κρυπτογράφηση "
-"μηνυμάτων προς τον εαυτό σας και για το χαρακτηριστικό \"Επισύναψη του Δημοσίου "
-"κλειδιού μου\" του συντάκτη. Μπορείτε επίσης να χρησιμοποιήσετε κλειδιά GnuPG "
-"keys.</p> "
-"<p>Μπορείτε να το αφήσετε κενό, αλλά το KMail δεν θα μπορεί να επισυνάψει "
-"υπογραφή OpenPGP στα μηνύματα. Ωστόσο, οι συνήθεις λειτουργίες Email δεν θα "
-"επηρεαστούν.</p>"
-"<p>Μπορείτε να μάθετε περισσότερα για τα κλειδιά στο: <a>"
-"http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Το κλειδί OpenPGP που επιλέγετε εδώ θα χρησιμοποιείται για την "
+"κρυπτογράφηση μηνυμάτων προς τον εαυτό σας και για το χαρακτηριστικό "
+"\"Επισύναψη του Δημοσίου κλειδιού μου\" του συντάκτη. Μπορείτε επίσης να "
+"χρησιμοποιήσετε κλειδιά GnuPG keys.</p> <p>Μπορείτε να το αφήσετε κενό, αλλά "
+"το KMail δεν θα μπορεί να επισυνάψει υπογραφή OpenPGP στα μηνύματα. Ωστόσο, "
+"οι συνήθεις λειτουργίες Email δεν θα επηρεαστούν.</p><p>Μπορείτε να μάθετε "
+"περισσότερα για τα κλειδιά στο: <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4225,23 +4112,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Επιλέξτε το πιστοποιητικό S/MIME που θα χρησιμοποιηθεί για την ψηφιακή υπογραφή "
-"του μηνύματός σας."
+"Επιλέξτε το πιστοποιητικό S/MIME που θα χρησιμοποιηθεί για την ψηφιακή "
+"υπογραφή του μηνύματός σας."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Το πιστοποιητικό S/MIME (X.509) που επιλέγετε εδώ θα χρησιμοποιηθεί για την "
-"ψηφιακή υπογραφή μηνυμάτων.</p>"
-"<p>Μπορείτε να το αφήσετε κενό, αλλά το KMail δε θα είναι σε θέση να υπογράφει "
-"ψηφιακά τα μηνύματά σας με χρήση S/MIME. Οι κανονικές λειτουργίες αλληλογραφίας "
-"δε θα επηρεαστούν.</p></qt>"
+"<qt><p>Το πιστοποιητικό S/MIME (X.509) που επιλέγετε εδώ θα χρησιμοποιηθεί "
+"για την ψηφιακή υπογραφή μηνυμάτων.</p><p>Μπορείτε να το αφήσετε κενό, αλλά "
+"το KMail δε θα είναι σε θέση να υπογράφει ψηφιακά τα μηνύματά σας με χρήση S/"
+"MIME. Οι κανονικές λειτουργίες αλληλογραφίας δε θα επηρεαστούν.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4253,8 +4137,8 @@ msgstr "Το πιστοποιητικό κρυπτογράφησης S/MIME σα
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Επιλέξτε το πιστοποιητικό S/MIME που θα χρησιμοποιείται όταν γίνεται "
 "κρυπτογράφηση στον εαυτό σας και για το χαρακτηριστικό \"Επισύναψη του "
@@ -4262,20 +4146,18 @@ msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Το πιστοποιητικό S/MIME που θα επιλεγεί εδώ θα χρησιμοποιείται όταν γίνεται "
-"κρυπτογράφηση στον εαυτό σας και για το χαρακτηριστικό \"Επισύναψη του "
-"πιστοποιητικού μου\" στο παράθυρο σύνταξης μηνύματος.</p>"
-"<p>Μπορείτε να το αφήσετε κενό, αλλά τότε το KMail δε θα μπορεί να αποστείλει "
-"κρυπτογραφημένα αντίγραφα των εξερχομένων μηνυμάτων σας, με χρήση S/MIME, στον "
-"εαυτό σας. Οι υπόλοιπες λειτουργίες δε θα επηρεαστούν.</p></qt>"
+"<qt><p>Το πιστοποιητικό S/MIME που θα επιλεγεί εδώ θα χρησιμοποιείται όταν "
+"γίνεται κρυπτογράφηση στον εαυτό σας και για το χαρακτηριστικό \"Επισύναψη "
+"του πιστοποιητικού μου\" στο παράθυρο σύνταξης μηνύματος.</p><p>Μπορείτε να "
+"το αφήσετε κενό, αλλά τότε το KMail δε θα μπορεί να αποστείλει "
+"κρυπτογραφημένα αντίγραφα των εξερχομένων μηνυμάτων σας, με χρήση S/MIME, "
+"στον εαυτό σας. Οι υπόλοιπες λειτουργίες δε θα επηρεαστούν.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4295,25 +4177,20 @@ msgstr "Διεύθυνση απάντ&ησης:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Διεύθυνση απάντησης</h3>"
-"<p>Αυτό θέτει τα περιεχόμενα της κεφαλίδας <tt>Απάντηση σε:</tt> "
-"σε μία διαφορετική διεύθυνση αλληλογραφίας από την κανονική <tt>Από:</tt> "
-"διεύθυνση.</p>"
-"<p>Αυτό μπορεί να είναι χρήσιμο στην περίπτωση που ένα σύνολο ανθρώπων "
-"συνεργάζονται. Για παράδειγμα, μπορεί να θέλετε τα μηνύματα να έχουν τη "
-"διεύθυνση αλληλογραφίας σας  στο πεδίο <tt>Από:</tt>"
-", αλλά οι απαντήσεις να στέλνονται σε μία ομαδική διεύθυνση.</p>"
-"<p>Αν δεν είστε σίγουροι για τη χρήση της, αφήστε την κενή.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Διεύθυνση απάντησης</h3><p>Αυτό θέτει τα περιεχόμενα της κεφαλίδας "
+"<tt>Απάντηση σε:</tt> σε μία διαφορετική διεύθυνση αλληλογραφίας από την "
+"κανονική <tt>Από:</tt> διεύθυνση.</p><p>Αυτό μπορεί να είναι χρήσιμο στην "
+"περίπτωση που ένα σύνολο ανθρώπων συνεργάζονται. Για παράδειγμα, μπορεί να "
+"θέλετε τα μηνύματα να έχουν τη διεύθυνση αλληλογραφίας σας  στο πεδίο "
+"<tt>Από:</tt>, αλλά οι απαντήσεις να στέλνονται σε μία ομαδική διεύθυνση.</"
+"p><p>Αν δεν είστε σίγουροι για τη χρήση της, αφήστε την κενή.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4321,26 +4198,21 @@ msgstr "Διευθύνσεις &κρυφής κοινοποίησης:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Διευθύνσεις κρυφής κοινοποίησης (BCC)</h3>"
-"<p>Οι διευθύνσεις που εισάγετε εδώ θα προστίθενται σε κάθε εξερχόμενο μήνυμα "
-"που στέλνεται με αυτή την ταυτότητα. Δε θα είναι ορατές στους άλλους "
-"παραλήπτες.</p>"
-"<p>Συνήθως αυτή η δυνατότητα χρησιμοποιείται για να στέλνετε ένα αντίγραφο κάθε "
-"απεσταλμένου μηνύματος σε κάποιον άλλον λογαριασμό σας.</p> "
-"<p>Για να προσθέσετε περισσότερες διευθύνσεις, χρησιμοποιήστε κόμματα για να "
-"διαχωρίσετε τη λίστα παραληπτών BCC.</p>"
-"<p>Αν έχετε αμφιβολίες, αφήστε κενό αυτό το πεδίο.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Διευθύνσεις κρυφής κοινοποίησης (BCC)</h3><p>Οι διευθύνσεις που "
+"εισάγετε εδώ θα προστίθενται σε κάθε εξερχόμενο μήνυμα που στέλνεται με αυτή "
+"την ταυτότητα. Δε θα είναι ορατές στους άλλους παραλήπτες.</p><p>Συνήθως "
+"αυτή η δυνατότητα χρησιμοποιείται για να στέλνετε ένα αντίγραφο κάθε "
+"απεσταλμένου μηνύματος σε κάποιον άλλον λογαριασμό σας.</p> <p>Για να "
+"προσθέσετε περισσότερες διευθύνσεις, χρησιμοποιήστε κόμματα για να "
+"διαχωρίσετε τη λίστα παραληπτών BCC.</p><p>Αν έχετε αμφιβολίες, αφήστε κενό "
+"αυτό το πεδίο.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4378,7 +4250,7 @@ msgstr "&Υπογραφή"
 msgid "&Picture"
 msgstr "&Εικόνα"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Μη έγκυρη διεύθυνση email"
 
@@ -4394,18 +4266,19 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Ένα από τα ρυθμισμένα κλειδιά υπογραφής του OpenPGP δεν περιέχει ID χρήστη με "
-"τη ρυθμισμένη διεύθυνση email για αυτή την ταυτότητα (%1).\n"
-"Αυτό μπορεί να προκαλέσει την εμφάνιση προειδοποιητικών μηνυμάτων στη λήψη κατά "
-"την προσπάθεια επαλήθευσης υπογραφών που δημιουργήθηκαν με αυτές τις ρυθμίσεις."
+"Ένα από τα ρυθμισμένα κλειδιά υπογραφής του OpenPGP δεν περιέχει ID χρήστη "
+"με τη ρυθμισμένη διεύθυνση email για αυτή την ταυτότητα (%1).\n"
+"Αυτό μπορεί να προκαλέσει την εμφάνιση προειδοποιητικών μηνυμάτων στη λήψη "
+"κατά την προσπάθεια επαλήθευσης υπογραφών που δημιουργήθηκαν με αυτές τις "
+"ρυθμίσεις."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Ένα από τα ρυθμισμένα κλειδιά κρυπτογράφησης του OpenPGP δεν περιέχει ID χρήστη "
-"με τη ρυθμισμένη διεύθυνση email για αυτή την ταυτότητα (%1)."
+"Ένα από τα ρυθμισμένα κλειδιά κρυπτογράφησης του OpenPGP δεν περιέχει ID "
+"χρήστη με τη ρυθμισμένη διεύθυνση email για αυτή την ταυτότητα (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4416,8 +4289,9 @@ msgid ""
 msgstr ""
 "Ένα από τα ρυθμισμένα πιστοποιητικά υπογραφής του OpenPGP δεν περιέχει ID "
 "χρήστη με τη ρυθμισμένη διεύθυνση email για αυτή την ταυτότητα (%1).\n"
-"Αυτό μπορεί να προκαλέσει την εμφάνιση προειδοποιητικών μηνυμάτων στη λήψη κατά "
-"την προσπάθεια επαλήθευσης υπογραφών που δημιουργήθηκαν με αυτές τις ρυθμίσεις."
+"Αυτό μπορεί να προκαλέσει την εμφάνιση προειδοποιητικών μηνυμάτων στη λήψη "
+"κατά την προσπάθεια επαλήθευσης υπογραφών που δημιουργήθηκαν με αυτές τις "
+"ρυθμίσεις."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4453,21 +4327,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Ο προσαρμοσμένος φάκελος προσχεδίων για την ταυτότητα \"%1\" δεν υπάρχει (πια), "
-"και γι' αυτό θα χρησιμοποιηθεί ο προκαθορισμένος φάκελος προσχεδίων."
+"Ο προσαρμοσμένος φάκελος προσχεδίων για την ταυτότητα \"%1\" δεν υπάρχει "
+"(πια), και γι' αυτό θα χρησιμοποιηθεί ο προκαθορισμένος φάκελος προσχεδίων."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Ο φάκελος προσαρμοσμένων προτύπων για την ταυτότητα \"%1\" δεν υπάρχει (πια), "
-"και γι' αυτό θα χρησιμοποιηθεί ο προκαθορισμένος φάκελος προτύπων."
+"Ο φάκελος προσαρμοσμένων προτύπων για την ταυτότητα \"%1\" δεν υπάρχει "
+"(πια), και γι' αυτό θα χρησιμοποιηθεί ο προκαθορισμένος φάκελος προτύπων."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Προκαθορισμένη)"
 
@@ -4482,8 +4356,8 @@ msgstr "Διεύθυνση email"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Πρέπει να εισάγετε ένα όνομα χρήστη και έναν κωδικό πρόσβασης για να σας δοθεί "
-"πρόσβαση σε αυτήν τη θυρίδα."
+"Πρέπει να εισάγετε ένα όνομα χρήστη και έναν κωδικό πρόσβασης για να σας "
+"δοθεί πρόσβαση σε αυτήν τη θυρίδα."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4516,16 +4390,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Τα στοιχεία του λογαριασμού εισήχθησαν αυτόματα αλλά θα πρέπει να ελέγξετε τη "
-"διαμόρφωση του λογαριασμού."
+"Τα στοιχεία του λογαριασμού εισήχθησαν αυτόματα αλλά θα πρέπει να ελέγξετε "
+"τη διαμόρφωση του λογαριασμού."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Δεν είναι δυνατή η αυτόματη εισαγωγή των στοιχείων του λογαριασμού. Παρακαλώ "
 "ελέγξτε τη διαμόρφωση του λογαριασμού."
@@ -4565,17 +4439,22 @@ msgstr "Ο φάκελος βρίσκεται πολύ κοντά στο ανώτ
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "Αφού δεν έχετε άδεια εγγραφής σε αυτόν το φάκελο, παρακαλώ ζητήστε από τον "
 "ιδιοκτήτη του να ελευθερώσει χώρο σε αυτό."
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Σφάλμα: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Η σύνδεση με το διακομιστή %1 διακόπηκε απρόσμενα ή ξεπέρασε το χρονικό όριο "
 "σύνδεσης. Θα γίνει προσπάθεια αυτόματης επανασύνδεσης."
@@ -4728,8 +4607,8 @@ msgstr "Αρχείο λίστας"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 "Ένα ή περισσότερα από τα ρυθμισμένα σας OpenPGP κλειδιά κρυπτογράφησης ή "
 "πιστοποιητικά S/MIME δεν είναι πλήρως έμπιστα για κρυπτογράφηση."
@@ -4737,8 +4616,8 @@ msgstr ""
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 "Ένα ή περισσότερα από τα ρυθμισμένα σας OpenPGP κλειδιά κρυπτογράφησης ή "
 "πιστοποιητικά S/MIME δεν είναι πλήρως έμπιστα για κρυπτογράφηση."
@@ -4775,228 +4654,182 @@ msgstr "Μη πλήρως έμπιστα κλειδιά κρυπτογράφησ
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Το OpenPGP κλειδί κρυπτογράφησης σας</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το OpenPGP κλειδί κρυπτογράφησής σας</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το OpenPGP κλειδί κρυπτογράφησης σας</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το OpenPGP κλειδί κρυπτογράφησής σας</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Το πιστοποιητικό υπογραφής σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
 "<p>Το πιστοποιητικό υπογραφής σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Το πιστοποιητικό κρυπτογράφησης σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
 "<p>Το πιστοποιητικό κρυπτογράφησης σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5010,217 +4843,171 @@ msgstr "Το πιστοποιητικό S/MIME θα λήξει σύντομα"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το OpenPGP κλειδί υπογραφής σας</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Το OpenPGP κλειδί κρυπτογράφησης σας</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το OpenPGP κλειδί κρυπτογράφησής σας</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το OpenPGP κλειδί κρυπτογράφησης σας</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το OpenPGP κλειδί κρυπτογράφησής σας</p><p align=center><b>%1</b> (KeyID "
+"0x%2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το OpenPGP κλειδί για το</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό ρίζας</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό υπογραφής S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό κρυπτογράφησης S/MIME</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p>"
-"<p>για το πιστοποιητικό S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το ενδιάμεσο CA πιστοποιητικό</p><p align=center><b>%3</b></p><p>για το "
+"πιστοποιητικό S/MIME</p><p align=center><b>%1</b> (σειριακός αριθμός %2)</"
+"p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Το πιστοποιητικό υπογραφής σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
 "<p>Το πιστοποιητικό υπογραφής σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Το πιστοποιητικό κρυπτογράφησης σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
 "<p>Το πιστοποιητικό κρυπτογράφησης σας S/MIME</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"(σειριακός αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
-"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> "
-"(σειριακός αριθμός %2)</p>"
-"<p>λήγει σε λιγότερο από %n ημέρες.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από μία ημέρα.</p>\n"
+"<p>Το πιστοποιητικό S/MIME για το</p><p align=center><b>%1</b> (σειριακός "
+"αριθμός %2)</p><p>λήγει σε λιγότερο από %n ημέρες.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5232,18 +5019,19 @@ msgstr "Το πιστοποιητικό S/MIME θα λήξει σύντομα"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Ένα η περισσότερα από τα ρυθμισμένα OpenPGP κλειδιά κρυπτογράφησης ή "
-"πιστοποιητικά S/MIME δεν μπορεί να χρησιμοποιηθεί για κρυπτογράφηση. Παρακαλώ "
-"ρυθμίστε ξανά τα κλειδιά κρυπτογράφησης και πιστοποιητικά σας για αυτή την "
-"ταυτότητα στο διάλογο ρύθμισης ταυτότητας.\n"
-"Αν συνεχίσετε, και τα κλειδιά χρειαστούν αργότερα, θα σας ζητηθεί να καθορίσετε "
-"τα κλειδιά που θα χρησιμοποιηθούν."
+"πιστοποιητικά S/MIME δεν μπορεί να χρησιμοποιηθεί για κρυπτογράφηση. "
+"Παρακαλώ ρυθμίστε ξανά τα κλειδιά κρυπτογράφησης και πιστοποιητικά σας για "
+"αυτή την ταυτότητα στο διάλογο ρύθμισης ταυτότητας.\n"
+"Αν συνεχίσετε, και τα κλειδιά χρειαστούν αργότερα, θα σας ζητηθεί να "
+"καθορίσετε τα κλειδιά που θα χρησιμοποιηθούν."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5258,11 +5046,11 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Ένα ή περισσότερα από τα κλειδιά υπογραφής OpenPGP ή πιστοποιητικά υπογραφής "
-"S/MIME δεν μπορεί πλέον να χρησιμοποιηθεί. Παρακαλώ ξαναρυθμίστε τα κλειδιά ή "
-"πιστοποιητικά υπογραφής για αυτή την ταυτότητα, στο διάλογο ρύθμισης "
+"S/MIME δεν μπορεί πλέον να χρησιμοποιηθεί. Παρακαλώ ξαναρυθμίστε τα κλειδιά "
+"ή πιστοποιητικά υπογραφής για αυτή την ταυτότητα, στο διάλογο ρύθμισης "
 "ταυτοτήτων.\n"
-"Αν επιλέξετε να συνεχίσετε, και τα κλειδιά χρειαστούν αργότερα, θα σας ζητηθεί "
-"τότε να καθορίσετε τα κλειδιά που θα χρησιμοποιηθούν."
+"Αν επιλέξετε να συνεχίσετε, και τα κλειδιά χρειαστούν αργότερα, θα σας "
+"ζητηθεί τότε να καθορίσετε τα κλειδιά που θα χρησιμοποιηθούν."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5272,48 +5060,48 @@ msgstr "Μη έγκυρα κλειδιά υπογραφής"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα θα "
-"πρέπει να κρυπτογραφηθεί χρησιμοποιώντας OpenPGP, τουλάχιστον για κάποιους "
-"παραλήπτες.\n"
-"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα έμπιστα κλειδιά κρυπτογράφησης OpenPGP "
-"για αυτή την ταυτότητα.\n"
-"Μπορείτε να συνεχίσετε χωρίς χρήση κρυπτογράφησης στον εαυτό σας, διαφορετικά "
-"δε θα μπορείτε να διαβάσετε τα μηνύματά σας."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα "
+"θα πρέπει να κρυπτογραφηθεί χρησιμοποιώντας OpenPGP, τουλάχιστον για "
+"κάποιους παραλήπτες.\n"
+"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα έμπιστα κλειδιά κρυπτογράφησης "
+"OpenPGP για αυτή την ταυτότητα.\n"
+"Μπορείτε να συνεχίσετε χωρίς χρήση κρυπτογράφησης στον εαυτό σας, "
+"διαφορετικά δε θα μπορείτε να διαβάσετε τα μηνύματά σας."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα θα "
-"πρέπει να κρυπτογραφηθεί χρησιμοποιώντας S/MIME, τουλάχιστον για κάποιους "
+"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα "
+"θα πρέπει να κρυπτογραφηθεί χρησιμοποιώντας S/MIME, τουλάχιστον για κάποιους "
 "παραλήπτες.\n"
-"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα πιστοποιητικά κρυπτογράφησης S/MIME για "
-"αυτή την ταυτότητα.\n"
-"Μπορείτε να συνεχίσετε χωρίς χρήση κρυπτογράφησης στον εαυτό σας, διαφορετικά "
-"δε θα μπορείτε να διαβάσετε τα μηνύματά σας."
+"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα πιστοποιητικά κρυπτογράφησης S/MIME "
+"για αυτή την ταυτότητα.\n"
+"Μπορείτε να συνεχίσετε χωρίς χρήση κρυπτογράφησης στον εαυτό σας, "
+"διαφορετικά δε θα μπορείτε να διαβάσετε τα μηνύματά σας."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα θα "
-"πρέπει να κρυπτογραφηθεί χρησιμοποιώντας OpenPGP, τουλάχιστον για κάποιους "
-"παραλήπτες.\n"
-"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα έμπιστα κλειδιά κρυπτογράφησης OpenPGP "
-"για αυτή την ταυτότητα."
+"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα "
+"θα πρέπει να κρυπτογραφηθεί χρησιμοποιώντας OpenPGP, τουλάχιστον για "
+"κάποιους παραλήπτες.\n"
+"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα έμπιστα κλειδιά κρυπτογράφησης "
+"OpenPGP για αυτή την ταυτότητα."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5321,16 +5109,16 @@ msgstr "Να μη γίνει υπογραφή OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα θα "
-"πρέπει να κρυπτογραφηθεί χρησιμοποιώντας S/MIME, τουλάχιστον για κάποιους "
+"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι το μήνυμα "
+"θα πρέπει να κρυπτογραφηθεί χρησιμοποιώντας S/MIME, τουλάχιστον για κάποιους "
 "παραλήπτες.\n"
-"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα πιστοποιητικά κρυπτογράφησης S/MIME για "
-"αυτή την ταυτότητα."
+"Παρόλα αυτά, δεν έχετε ρυθμίσει έγκυρα πιστοποιητικά κρυπτογράφησης S/MIME "
+"για αυτή την ταυτότητα."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5342,8 +5130,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι δεν υπάρχει "
-"διαθέσιμη κοινή μέθοδος υπογραφής για τα κλειδιά σας.\n"
+"Η εξέταση των προτιμήσεων κρυπτογράφησης του παραλήπτη έδειξε ότι δεν "
+"υπάρχει διαθέσιμη κοινή μέθοδος υπογραφής για τα κλειδιά σας.\n"
 "Αποστολή του μηνύματος χωρίς υπογραφή;"
 
 #: keyresolver.cpp:1335
@@ -5352,8 +5140,8 @@ msgstr "Δεν είναι δυνατή η υπογραφή"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Δεν έχετε επιλέξει κλειδί κρυπτογράφησης στον εαυτό σας (κρυπτογράφηση στο "
 "ίδιο). Αν συνεχίσετε, δε θα μπορείτε να αποκρυπτογραφήσετε το ίδιο σας το "
@@ -5373,16 +5161,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για τον παραλήπτη αυτού του μηνύματος. "
-"Κατά συνέπεια το μήνυμα δε θα κρυπτογραφηθεί."
+"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για τον παραλήπτη αυτού του "
+"μηνύματος. Κατά συνέπεια το μήνυμα δε θα κρυπτογραφηθεί."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για κανέναν από τους παραλήπτες αυτού "
-"του μηνύματος. Κατά συνέπεια το μήνυμα δε θα κρυπτογραφηθεί."
+"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για κανέναν από τους παραλήπτες "
+"αυτού του μηνύματος. Κατά συνέπεια το μήνυμα δε θα κρυπτογραφηθεί."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5402,8 +5190,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Δεν έχετε επιλέξει κλειδιά κρυπτογράφησης για κάποιους από τους παραλήπτες. Αν "
-"κρυπτογραφήσετε το μήνυμα, αυτά τα άτομα δε θα μπορέσουν να το "
+"Δεν έχετε επιλέξει κλειδιά κρυπτογράφησης για κάποιους από τους παραλήπτες. "
+"Αν κρυπτογραφήσετε το μήνυμα, αυτά τα άτομα δε θα μπορέσουν να το "
 "αποκρυπτογραφήσουν."
 
 #: keyresolver.cpp:1585
@@ -5421,21 +5209,22 @@ msgid ""
 msgstr ""
 "Υπάρχει ένα πρόβλημα με το κλειδί(ά) κρυπτογράφησης για το \"%1\".\n"
 "\n"
-"Παρακαλώ επιλέξτε ξανά το κλειδί(ά) το οποίο πρέπει να χρησιμοποιηθεί γι' αυτόν "
-"τον παραλήπτη."
+"Παρακαλώ επιλέξτε ξανά το κλειδί(ά) το οποίο πρέπει να χρησιμοποιηθεί γι' "
+"αυτόν τον παραλήπτη."
 
 #: keyresolver.cpp:1678
 #, fuzzy
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
-msgstr ""
-"Δε βρέθηκε κανένα έγκυρο και έμπιστο κλειδί(ά) κρυπτογράφησης για τον \"%1\".\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
+msgstr ""
+"Δε βρέθηκε κανένα έγκυρο και έμπιστο κλειδί(ά) κρυπτογράφησης για τον "
+"\"%1\".\n"
 "\n"
 "Επιλέξτε το κλειδί(ά) που θα χρησιμοποιηθεί για αυτόν τον παραλήπτη."
 
@@ -5482,10 +5271,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Κρίσιμο σφάλμα: Αδύνατη η συλλογή αλληλογραφίας: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Αποτυχία προσθήκης μηνύματος:\n"
+msgid "Failed to add message:\n"
+msgstr "Αποτυχία προσθήκης μηνύματος:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5530,8 +5317,7 @@ msgstr "Μετακίνηση μηνύματος %3 από %2 από %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Αδύνατη η αφαίρεση αλληλογραφίας από τη θυρίδα <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Αδύνατη η αφαίρεση αλληλογραφίας από τη θυρίδα <b>%1</b>:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5577,6 +5363,52 @@ msgstr "Αποσυν&δεδεμένο IMAP"
 msgid "&Maildir mailbox"
 msgstr "Θυρίδα &maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Ορισμός θέματος του μηνύματος"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Αποστολή κοινοποίησης στη 'διεύθυνση'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Αποστολή κρυφής κοινοποίησης στη 'διεύθυνση'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Προσθήκη 'κεφαλίδας' στο μήνυμα"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Ανάγνωση του σώματος του μηνύματος από το 'αρχείο'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Καθορισμός σώματος του μηνύματος"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Προσθήκη ενός συνημμένου στο μήνυμα. Αυτό μπορεί να επαναληφθεί"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Έλεγχος μόνο για νέα αλληλογραφία"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Άνοιγμα μόνο του παραθύρου σύνταξης"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Προβολή του δοσμένου αρχείου μηνύματος"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Αποστολή μηνύματος στη 'διεύθυνση'. Επισύναψη του αρχείου στο οποίο "
+"υποδεικνύει το 'URL'"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Αλληλογραφία"
@@ -5633,14 +5465,13 @@ msgstr "%1: βρέθηκε ο φάκελος %2. Θα οριστεί ως ο κ�
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>Το KMail βρήκε τους ακόλουθος φακέλους groupware στο %1 και πρέπει να "
-"εκτελέσει τις ακόλουθες ενέργειες: %2"
-"<br>Αν δε θέλετε να γίνει αυτό, ακυρώστε τη λειτουργία και ο πόρος IMAP θα "
-"απενεργοποιηθεί"
+"εκτελέσει τις ακόλουθες ενέργειες: %2<br>Αν δε θέλετε να γίνει αυτό, "
+"ακυρώστε τη λειτουργία και ο πόρος IMAP θα απενεργοποιηθεί"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5687,14 +5518,13 @@ msgstr "Το URL αντιγράφηκε στο πρόχειρο."
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
-"<qt>Το αρχείο <b>%1</b> υπάρχει."
-"<br>Επιθυμείτε την αντικατάστασή του;</qt>"
+"<qt>Το αρχείο <b>%1</b> υπάρχει.<br>Επιθυμείτε την αντικατάστασή του;</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Αποθήκευση σε αρχείο"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Αντι&κατάσταση"
 
@@ -5712,7 +5542,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Το μήνυμα αφαιρέθηκε κατά την αποθήκευσή του. Δεν έχει αποθηκευτεί."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5732,11 +5562,11 @@ msgstr "Αυτό το αρχείο δεν περιέχει μήνυμα."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Αυτό το αρχείο περιέχει πολλαπλά μηνύματα. Μόνο το πρώτο εμφανίζεται."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5746,85 +5576,85 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Φιλτράρισμα μηνυμάτων"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Φιλτράρισμα μηνύματος %1 από %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Δεν υπάρχει ελεύθερος χώρος στο δίσκο;"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Μετακίνηση σε αυτόν το φάκελο"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Αντιγραφή σε αυτόν το φάκελο"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
-"Εντοπίστηκε κατεστραμμένη λανθάνουσα μνήμη IMAP στο φάκελο %1. Η αντιγραφή των "
-"μηνυμάτων σταμάτησε."
+"Εντοπίστηκε κατεστραμμένη λανθάνουσα μνήμη IMAP στο φάκελο %1. Η αντιγραφή "
+"των μηνυμάτων σταμάτησε."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Μετακίνηση μηνυμάτων"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Διαγραφή μηνυμάτων"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Άνοιγμα URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Επιθυμείτε πραγματικά την εκτέλεση του <b>%1</b>;</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Δε βρέθηκαν συνημμένα για αποθήκευση."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Αποθήκευση συνημμένων σε"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "συνημμένο.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "συνημμένο.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Ένα αρχείο με όνομα %1 υπάρχει ήδη. Επιθυμείτε την αντικατάστασή του;"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Το αρχείο υπάρχει ήδη"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Αντικατάσταση"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5832,19 +5662,19 @@ msgstr ""
 "Το τμήμα %1 του μηνύματος είναι κρυπτογραφημένο. Επιθυμείτε τη διατήρηση της "
 "κρυπτογράφησης κατά την αποθήκευση;"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Ερώτηση KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Διατήρηση κρυπτογράφησης"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Να μη διατηρηθεί"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5852,11 +5682,11 @@ msgstr ""
 "Το τμήμα %1 του μηνύματος είναι υπογεγραμμένο. Επιθυμείτε τη διατήρηση της "
 "υπογραφής κατά την αποθήκευση;"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Διατήρηση υπογραφής"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5865,79 +5695,79 @@ msgstr ""
 "Αδύνατη η εγγραφή του αρχείου %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Αδύνατη η εγγραφή του αρχείου %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Δεν υπάρχει καμία καταχώρηση στο βιβλίο διευθύνσεων για αυτήν τη διεύθυνση "
 "αλληλογραφίας. Προσθέστε τις στο βιβλίο διευθύνσεων και έπειτα προσθέστε "
 "διευθύνσεις στιγμιαίων μηνυμάτων χρησιμοποιώντας τον αγαπημένο σας πελάτη "
 "στιγμιαίων μηνυμάτων."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Περισσότερες από μία καταχωρήσεις του βιβλίου διευθύνσεων χρησιμοποιεί αυτή τη "
-"διεύθυνση αλληλογραφίας:\n"
+"Περισσότερες από μία καταχωρήσεις του βιβλίου διευθύνσεων χρησιμοποιεί αυτή "
+"τη διεύθυνση αλληλογραφίας:\n"
 " %1\n"
 " Δεν είναι δυνατόν να καθοριστεί με ποιον θα γίνει συζήτηση."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Το σύστημα υποστήριξης του Chiasmus δεν προσφέρει τη συνάρτηση "
-"\"x-obtain-keys\". Παρακαλώ αναφέρετε αυτό το σφάλμα."
+"Το σύστημα υποστήριξης του Chiasmus δεν προσφέρει τη συνάρτηση \"x-obtain-"
+"keys\". Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Σφάλμα συστήματος υποστήριξης του Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Μα αναμενόμενη επιστρεφόμενη τιμή από το σύστημα υποστήριξης του Chiasmus. Η "
 "συνάρτηση \"x-obtain-keys\" δεν επέστρεψε μία λίστα συμβολοσειρών. Παρακαλώ "
 "αναφέρετε αυτό το σφάλμα."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Δε βρέθηκαν κλειδιά. Παρακαλώ ελέγξτε ότι έχει οριστεί μία έγκυρη διαδρομή "
 "κλειδιών στη ρύθμιση του Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Επιλογή κλειδιού κρυπτογράφησης Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Το σύστημα υποστήριξης του Chiasmus δεν προσφέρει τη συνάρτηση \"x-decrypt\". "
-"Παρακαλώ αναφέρετε αυτό το σφάλμα."
+"Το σύστημα υποστήριξης του Chiasmus δεν προσφέρει τη συνάρτηση \"x-decrypt"
+"\". Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5945,20 +5775,20 @@ msgstr ""
 "Η συνάρτηση \"x-decrypt\" δε δέχεται τις αναμενόμενες παραμέτρους. Παρακαλώ "
 "αναφέρετε αυτό το σφάλμα."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Σφάλμα αποκρυπτογράφησης του Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Μα αναμενόμενη επιστρεφόμενη τιμή από το σύστημα υποστήριξης του Chiasmus. Η "
 "συνάρτηση \"x-decrypt\" δεν επέστρεψε ένα δυαδικό πίνακα. Παρακαλώ αναφέρετε "
 "αυτό το σφάλμα."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5968,7 +5798,7 @@ msgstr ""
 "Προς: %2\n"
 "Θέμα: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Μήνυμα: %1"
@@ -6067,7 +5897,7 @@ msgstr "Μέγεθος"
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Συμπίεση"
 
@@ -6079,7 +5909,7 @@ msgstr "Κρυπτογράφηση"
 msgid "Sign"
 msgstr "Υπογραφή"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Όνομα του συνημμένου:"
 
@@ -6101,10 +5931,11 @@ msgstr "Κύριοι παραλήπτες"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Οι διευθύνσεις email που θα δώσετε σε αυτό το πεδίο θα λάβουν ένα αντίγραφο "
-"του μηνύματος.</qt>"
+"<qt>Οι διευθύνσεις email που θα δώσετε σε αυτό το πεδίο θα λάβουν ένα "
+"αντίγραφο του μηνύματος.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6113,15 +5944,15 @@ msgstr "Πρόσθετοι παραλήπτες"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Οι διευθύνσεις email που θα δώσετε σε αυτό το πεδίο θα λάβουν ένα αντίγραφο "
-"του μηνύματος. Τεχνικά είναι το ίδιο σα να δίνατε όλες τις διευθύνσεις στο "
-"πεδίο  <b>Προς:</b>. Η διαφορά είναι ότι συνήθως δηλώνει ότι ο παραλήπτης του "
-"Αντιγράφου (CC) παρακολουθεί την επικοινωνία, και δεν είναι ο κύριος "
-"παραλήπτης.</qt>"
+"<qt>Οι διευθύνσεις email που θα δώσετε σε αυτό το πεδίο θα λάβουν ένα "
+"αντίγραφο του μηνύματος. Τεχνικά είναι το ίδιο σα να δίνατε όλες τις "
+"διευθύνσεις στο πεδίο  <b>Προς:</b>. Η διαφορά είναι ότι συνήθως δηλώνει ότι "
+"ο παραλήπτης του Αντιγράφου (CC) παρακολουθεί την επικοινωνία, και δεν είναι "
+"ο κύριος παραλήπτης.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6129,13 +5960,12 @@ msgstr "Κρυφοί παραλήπτες"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Είναι ουσιαστικά το ίδιο με το πεδίο <b>Αντίγραφο σε:</b>"
-". Η διαφορά είναι ότι οι υπόλοιποι παραλήπτες δε βλέπουν ποιος λαμβάνει το "
-"κρυφό αντίγραφο.</qt>"
+"<qt>Είναι ουσιαστικά το ίδιο με το πεδίο <b>Αντίγραφο σε:</b>. Η διαφορά "
+"είναι ότι οι υπόλοιποι παραλήπτες δε βλέπουν ποιος λαμβάνει το κρυφό "
+"αντίγραφο.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6145,7 +5975,7 @@ msgstr "&Αποστολή αλληλογραφίας"
 msgid "&Send Mail Via"
 msgstr "Α&ποστολή αλληλογραφίας μέσω"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Αποστολή αρ&γότερα"
@@ -6210,8 +6040,7 @@ msgstr "Αφαίρεση χαρακτήρων &παράθεσης"
 msgid "Cl&ean Spaces"
 msgstr "&Καθαρισμός κενών"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Χρήση γραμματοσειράς &σταθερού πλάτους"
@@ -6352,31 +6181,31 @@ msgstr "Μορφή &κρυπτογράφησης μηνύματος"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Τυπική"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Λίστα με κουκκίδες (Δίσκος)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Λίστα με κουκκίδες (Κύκλος)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Λίστα με κουκκίδες (Τετράγωνο)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Λίστα με ταξινόμηση (Δεκαδική)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Λίστα με ταξινόμηση (πεζά γράμματα)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Λίστα με ταξινόμηση (κεφαλαία γράμματα)"
 
@@ -6482,8 +6311,8 @@ msgstr "Κλείσιμο παραθύρου σύνταξης"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Το μήνυμα που έχετε συντάξει φαίνεται να αναφέρεται σε ένα συνημμένο αρχείο, "
@@ -6494,54 +6323,52 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Υπενθύμιση επισύναψης αρχείου"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Αποστολή όπως είναι"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Το KMail δεν μπόρεσε να εντοπίσει την τοποθεσία του συνημμένου (%1).</p>"
-"<p>Πρέπει να καθορίσετε την πλήρη διαδρομή αν θέλετε να επισυνάψετε ένα "
+"<qt><p>Το KMail δεν μπόρεσε να εντοπίσει την τοποθεσία του συνημμένου (%1).</"
+"p><p>Πρέπει να καθορίσετε την πλήρη διαδρομή αν θέλετε να επισυνάψετε ένα "
 "αρχείο.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Ο διαχειριστής συστήματος απαγορεύει συνημμένα αρχεία μεγαλύτερα από %1 "
-"MB.</p>"
+"<qt><p>Ο διαχειριστής συστήματος απαγορεύει συνημμένα αρχεία μεγαλύτερα από "
+"%1 MB.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Επισύναψη αρχείου"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Επισύναψη"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Εισαγωγή αρχείου"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Εισαγωγή αρχείου"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Παρουσιάστηκε ένα σφάλμα κατά την εξαγωγή του κλειδιού από το σύστημα "
-"υποστήριξης:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Παρουσιάστηκε ένα σφάλμα κατά την εξαγωγή του κλειδιού από το σύστημα "
+"υποστήριξης:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6580,191 +6407,200 @@ msgid ""
 "View"
 msgstr "Προβολή"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Επεξεργασία..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Επεξεργασία με..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Αποθήκευση &ως..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Ιδιότητες"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Προσθήκη συνημμένου..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Το KMail δεν μπόρεσε να συμπιέσει το αρχείο."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"Το συμπιεσμένο αρχείο είναι μεγαλύτερο του αρχικού. Επιθυμείτε τη διατήρηση του "
-"αρχικού;"
+"Το συμπιεσμένο αρχείο είναι μεγαλύτερο του αρχικού. Επιθυμείτε τη διατήρηση "
+"του αρχικού;"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Διατήρηση"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Το KMail δεν μπόρεσε να αποσυμπιέσει το αρχείο."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Αποθήκευση συνημμένου ως"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Προσθήκη σαν κείμενο"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Προσθήκη σαν συνημμένο"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Παρακαλώ επιλέξτε αν επιθυμείτε να εισάγετε το περιεχόμενο ως κείμενο στον "
 "επεξεργαστή, ή να προσθέσετε το σχετικό αρχείο ως συνημμένο."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Επικόλληση ως κείμενο ή συνημμένο;"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ανώνυμο"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Έχετε ζητήσει να γίνεται κρυπτογράφηση των μηνυμάτων στον εαυτό σας, αλλά η "
-"επιλεγμένη ταυτότητα δεν έχει καθορίσει ένα (OpenPGP ή S/MIME) κλειδί "
-"κρυπτογράφησης για χρήση.</p>"
-"<p>Παρακαλώ επιλέξτε το κλειδί(α) για χρήση στις ρυθμίσεις της ταυτότητας.</p>"
-"</qt>"
+"<qt><p>Έχετε ζητήσει να γίνεται κρυπτογράφηση των μηνυμάτων στον εαυτό σας, "
+"αλλά η επιλεγμένη ταυτότητα δεν έχει καθορίσει ένα (OpenPGP ή S/MIME) κλειδί "
+"κρυπτογράφησης για χρήση.</p><p>Παρακαλώ επιλέξτε το κλειδί(α) για χρήση "
+"στις ρυθμίσεις της ταυτότητας.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Μη ορισμένο κλειδί κρυπτογράφησης"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Για να είναι δυνατή η υπογραφή αυτού του μηνύματος πρέπει πρώτα να ορίσετε "
-"το κλειδί υπογραφής (OpenPGP ή S/MIME) που θα χρησιμοποιηθεί.</p>"
-"<p>Παρακαλώ επιλέξτε το κλειδί για χρήση στις ρυθμίσεις της ταυτότητας.</p></qt>"
+"<qt><p>Για να είναι δυνατή η υπογραφή αυτού του μηνύματος πρέπει πρώτα να "
+"ορίσετε το κλειδί υπογραφής (OpenPGP ή S/MIME) που θα χρησιμοποιηθεί.</"
+"p><p>Παρακαλώ επιλέξτε το κλειδί για χρήση στις ρυθμίσεις της ταυτότητας.</"
+"p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Μη ορισμένο κλειδί υπογραφής"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"Το KMail είναι σε λειτουργία χωρίς σύνδεση. Τα μηνύματά σας θα παραμείνουν στο "
-"φάκελο εξερχομένων μέχρι να συνδεθείτε."
+"Το KMail είναι σε λειτουργία χωρίς σύνδεση. Τα μηνύματά σας θα παραμείνουν "
+"στο φάκελο εξερχομένων μέχρι να συνδεθείτε."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Με σύνδεση/χωρίς σύνδεση"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Πρέπει να εισάγετε τη διεύθυνση αλληλογραφίας σας στο πεδίο 'Από:'. Επίσης θα "
-"πρέπει να ορίσετε τη διεύθυνσή για όλες τις ταυτότητες, ώστε να μη χρειάζεται "
-"να την εισάγετε σε κάθε μήνυμα."
+"Πρέπει να εισάγετε τη διεύθυνση αλληλογραφίας σας στο πεδίο 'Από:'. Επίσης "
+"θα πρέπει να ορίσετε τη διεύθυνσή για όλες τις ταυτότητες, ώστε να μη "
+"χρειάζεται να την εισάγετε σε κάθε μήνυμα."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Πρέπει να ορίσετε τουλάχιστον έναν παραλήπτη, είτε στο πεδίο 'Προς:' ή σαν "
 "κοινοποίηση ή σαν κρυφή κοινοποίηση."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Δεν καθορίσατε το πεδίο Προς:. Να σταλεί το μήνυμα έτσι κι αλλιώς;"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Δεν έχει καθορισθεί το πεδίο Προς:"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Δεν καθορίσατε κάποιο θέμα. Να σταλεί το μήνυμα έτσι κι αλλιώς;"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Δεν έχει καθορισθεί θέμα"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Αποστολή ό&πως είναι"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Καθορισμός του θέματος"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Διατήρηση της διαμόρφωσης, χωρίς υπογραφή/κρυπτογράφηση"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Διατήρηση της διαμόρφωσης, χωρίς κρυπτογράφηση"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Διατήρηση της διαμόρφωσης, χωρίς υπογραφή"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Κρυπτογράφηση/υπογραφή (διαγραφή της διαμόρφωσης)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Κρυπτογράφηση (διαγραφή της διαμόρφωσης)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Υπογραφή (διαγραφή της διαμόρφωσης)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Η ενσωματωμένη υπογραφή/κρυπτογράφηση μηνυμάτων HTML δεν είναι δυνατή.</p>"
-"<p>Επιθυμείτε τη διαγραφή της διαμόρφωσης του μηνύματος;</p></qt>"
+"<qt><p>Η ενσωματωμένη υπογραφή/κρυπτογράφηση μηνυμάτων HTML δεν είναι δυνατή."
+"</p><p>Επιθυμείτε τη διαγραφή της διαμόρφωσης του μηνύματος;</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Υπογραφή/κρυπτογράφηση μηνύματος;"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6773,107 +6609,107 @@ msgstr ""
 "υπάρχει (πια), και γι' αυτό θα χρησιμοποιηθεί ο προκαθορισμένος φάκελος "
 "προσχεδίων ή προτύπων."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Παρακαλώ δημιουργήστε ένα λογαριασμό για αποστολή και ξαναπροσπαθήστε."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Έτοιμο για αποστολή αλληλογραφίας..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Αποστολή επιβεβαίωσης"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Απο&στολή τώρα"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Κανένας παραλήπτης"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Πρόσθετοι παραλήπτες"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Έλεγχος ορθογραφίας: ενεργός"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Έλεγχος ορθογραφίας: ανενεργός"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Ο ορθογραφικός έλεγχος ακυρώθηκε."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Ο ορθογραφικός έλεγχος σταμάτησε."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Ο ορθογραφικός έλεγχος ολοκληρώθηκε."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Ελεγκτής ορθογραφίας"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
-"Παρακαλώ ρυθμίστε πρώτα ένα σύστημα υποστήριξης κρυπτογράφησης για χρήση με το "
-"Chiasmus.\n"
+"Παρακαλώ ρυθμίστε πρώτα ένα σύστημα υποστήριξης κρυπτογράφησης για χρήση με "
+"το Chiasmus.\n"
 "Αυτό μπορείτε να το κάνετε στην καρτέλα εργαλείων κρυπτογράφησης στη σελίδα "
 "ασφάλειας του διαλόγου ρυθμίσεων."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 "Φαίνεται ότι η βιβλιοθήκη libkleopatra χτίστηκε χωρίς υποστήριξη για το "
-"Chiasmus. Θα πρέπει να μεταγλωττίσετε ξανά την libkleopatra με την επιλογή "
-"--enable-chiasmus."
+"Chiasmus. Θα πρέπει να μεταγλωττίσετε ξανά την libkleopatra με την επιλογή --"
+"enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Δεν έχει ρυθμιστεί κανένα σύστημα υποστήριξης του Chiasmus"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Δε βρέθηκε κανένα κλειδί του Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Επιλογή κλειδιού κρυπτογράφησης του Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Το μήνυμα θα υπογραφεί"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Το μήνυμα δε θα υπογραφεί"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Το μήνυμα θα κρυπτογραφηθεί"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Το μήνυμα δε θα κρυπτογραφηθεί"
 
@@ -6923,11 +6759,11 @@ msgstr "Ορθογραφικός έλεγχος - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Αδύνατη η εκκίνηση του ISpell/Aspell. Παρακαλώ βεβαιωθείτε ότι το ISPell ή το "
-"Aspell είναι σωστά ρυθμισμένο και ότι είναι στο PATH σας."
+"Αδύνατη η εκκίνηση του ISpell/Aspell. Παρακαλώ βεβαιωθείτε ότι το ISPell ή "
+"το Aspell είναι σωστά ρυθμισμένο και ότι είναι στο PATH σας."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6960,12 +6796,10 @@ msgstr "<qt>Πάρα πολλές ενέργειες φίλτρου στον κ�
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Άγνωστη ενέργεια φίλτρου <b>%1</b>"
-"<br>στον κανόνα φίλτρου <b>%2</b>."
+"<qt>Άγνωστη ενέργεια φίλτρου <b>%1</b><br>στον κανόνα φίλτρου <b>%2</b>."
 "<br>Θα αγνοηθεί.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7186,166 +7020,137 @@ msgstr "Αναπαραγωγή ήχου"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Αυτή είναι η λίστα των καθορισμένων φίλτρων. Η εφαρμογή τους γίνεται από "
-"πάνω προς τα κάτω.</p>"
-"<p>Κάντε κλικ σε οποιοδήποτε φίλτρο για να το επεξεργαστείτε χρησιμοποιώντας τα "
-"χειριστήρια στο δεξί μισό του διαλόγου.</p></qt>"
+"<qt><p>Αυτή είναι η λίστα των καθορισμένων φίλτρων. Η εφαρμογή τους γίνεται "
+"από πάνω προς τα κάτω.</p><p>Κάντε κλικ σε οποιοδήποτε φίλτρο για να το "
+"επεξεργαστείτε χρησιμοποιώντας τα χειριστήρια στο δεξί μισό του διαλόγου.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να δημιουργήσετε ένα νέο φίλτρο.</p>"
-"<p>Το φίλτρο θα εισαχθεί ακριβώς πριν από το επιλεγμένο, αλλά μπορείτε να "
-"αλλάξετε τη θέση του αργότερα.</p>"
-"<p>Αν πατήσατε κατά λάθος αυτό το κουμπί, μπορείτε να ακυρώσετε την ενέργεια "
-"κάνοντας κλικ στο κουμπί <em>Διαγραφή</em>.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να δημιουργήσετε ένα νέο φίλτρο.</"
+"p><p>Το φίλτρο θα εισαχθεί ακριβώς πριν από το επιλεγμένο, αλλά μπορείτε να "
+"αλλάξετε τη θέση του αργότερα.</p><p>Αν πατήσατε κατά λάθος αυτό το κουμπί, "
+"μπορείτε να ακυρώσετε την ενέργεια κάνοντας κλικ στο κουμπί <em>Διαγραφή</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να αντιγράψετε το φίλτρο.</p>"
-"<p>Αν πατήσατε κατά λάθος αυτό το κουμπί, μπορείτε να ακυρώσετε την ενέργεια "
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να αντιγράψετε το φίλτρο.</p><p>Αν "
+"πατήσατε κατά λάθος αυτό το κουμπί, μπορείτε να ακυρώσετε την ενέργεια "
 "κάνοντας κλικ στο κουμπί <em>Διαγραφή</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να <em>διαγράψετε</em> "
-"το επιλεγμένο φίλτρο από την παραπάνω λίστα.</p>"
-"<p>Δεν υπάρχει τρόπος να επαναφέρετε το φίλτρο αφού έχει διαγραφεί, μπορείτε "
-"όμως να κλείσετε αυτό το διάλογο κάνοντας κλικ στο <em>Ακύρωση</em> "
-"για να απορρίψετε τις αλλαγές που έχουν γίνει.</p></qt>"
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να <em>διαγράψετε</em> το επιλεγμένο "
+"φίλτρο από την παραπάνω λίστα.</p><p>Δεν υπάρχει τρόπος να επαναφέρετε το "
+"φίλτρο αφού έχει διαγραφεί, μπορείτε όμως να κλείσετε αυτό το διάλογο "
+"κάνοντας κλικ στο <em>Ακύρωση</em> για να απορρίψετε τις αλλαγές που έχουν "
+"γίνει.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο προς "
-"τα <em>πάνω</em> στην παραπάνω λίστα.</p>"
-"<p>Αυτό είναι χρήσιμο αφού η σειρά των φίλτρων στη λίστα είναι και η σειρά με "
-"την οποία εφαρμόζονται στα μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται "
-"πρώτα.</p></qt>"
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο "
+"προς τα <em>πάνω</em> στην παραπάνω λίστα.</p><p>Αυτό είναι χρήσιμο αφού η "
+"σειρά των φίλτρων στη λίστα είναι και η σειρά με την οποία εφαρμόζονται στα "
+"μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται πρώτα.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο προς "
-"τα <em>πάνω</em> στην παραπάνω λίστα.</p>"
-"<p>Αυτό είναι χρήσιμο αφού η σειρά των φίλτρων στη λίστα είναι και η σειρά με "
-"την οποία εφαρμόζονται στα μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται "
-"πρώτα.</p>"
-"<p>Αν κάνατε κλικ σε αυτό το κουμπί κατά λάθος, μπορείτε να ακυρώσετε την "
-"ενέργεια κάνοντας κλικ στο κουμπί <em>Κάτω</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο "
+"προς τα <em>πάνω</em> στην παραπάνω λίστα.</p><p>Αυτό είναι χρήσιμο αφού η "
+"σειρά των φίλτρων στη λίστα είναι και η σειρά με την οποία εφαρμόζονται στα "
+"μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται πρώτα.</p><p>Αν κάνατε κλικ σε "
+"αυτό το κουμπί κατά λάθος, μπορείτε να ακυρώσετε την ενέργεια κάνοντας κλικ "
+"στο κουμπί <em>Κάτω</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο προς "
-"τα <em>κάτω</em> στην παραπάνω λίστα.</p>"
-"<p>Αυτό είναι χρήσιμο αφού η σειρά των φίλτρων στη λίστα είναι και η σειρά με "
-"την οποία εφαρμόζονται στα μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται "
-"πρώτα.</p>"
-"<p>Αν κάνατε κλικ σε αυτό το κουμπί κατά λάθος, μπορείτε να ακυρώσετε την "
-"ενέργεια κάνοντας κλικ στο κουμπί <em>Πάνω</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο "
+"προς τα <em>κάτω</em> στην παραπάνω λίστα.</p><p>Αυτό είναι χρήσιμο αφού η "
+"σειρά των φίλτρων στη λίστα είναι και η σειρά με την οποία εφαρμόζονται στα "
+"μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται πρώτα.</p><p>Αν κάνατε κλικ σε "
+"αυτό το κουμπί κατά λάθος, μπορείτε να ακυρώσετε την ενέργεια κάνοντας κλικ "
+"στο κουμπί <em>Πάνω</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο προς "
-"τα <em>κάτω</em> στην παραπάνω λίστα.</p>"
-"<p>Αυτό είναι χρήσιμο αφού η σειρά των φίλτρων στη λίστα είναι και η σειρά με "
-"την οποία εφαρμόζονται στα μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται "
-"πρώτα.</p></qt>"
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να μετακινήσετε το επιλεγμένο φίλτρο "
+"προς τα <em>κάτω</em> στην παραπάνω λίστα.</p><p>Αυτό είναι χρήσιμο αφού η "
+"σειρά των φίλτρων στη λίστα είναι και η σειρά με την οποία εφαρμόζονται στα "
+"μηνύματα. Τα πιο πάνω μηνύματα εφαρμόζονται πρώτα.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί για να μετονομάσετε το επιλεγμένο φίλτρο.</p>"
-"<p>Τα φίλτρα ονομάζονται αυτόματα, εφόσον αρχίζουν με \"&lt;\".</p>"
-"<p>Αν κάνατε τη μετονομασία κατά λάθος, και θέλετε να επανέλθετε στην αυτόματη "
-"ονομασία, κάντε κλικ σε αυτό το κουμπί και επιλέξτε <em>Καθαρισμός</em> και <em>"
-"Εντάξει</em> στο διάλογο που θα εμφανιστεί.</p></qt>"
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί για να μετονομάσετε το επιλεγμένο φίλτρο."
+"</p><p>Τα φίλτρα ονομάζονται αυτόματα, εφόσον αρχίζουν με \"&lt;\".</p><p>Αν "
+"κάνατε τη μετονομασία κατά λάθος, και θέλετε να επανέλθετε στην αυτόματη "
+"ονομασία, κάντε κλικ σε αυτό το κουμπί και επιλέξτε <em>Καθαρισμός</em> και "
+"<em>Εντάξει</em> στο διάλογο που θα εμφανιστεί.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Κάντε κλικ σε αυτό το κουμπί ώστε να εμφανιστεί ο διάλογος επιβεβαίωσης.</p>"
-"<p>Αυτό είναι χρήσιμο αν έχετε καθορίσει ένα σύνολο κανόνων που καθορίζει ότι "
-"κάποια μηνύματα θα ληφθούν αργότερα. Χωρίς τη δυνατότητα εμφάνισης του διαλόγου "
-"επιβεβαίωσης, αυτά τα μηνύματα δε θα λαμβάνονταν ποτέ, παρά μόνο αν δεν υπήρχαν "
-"άλλα μεγάλα μηνύματα στο διακομιστή, ή αν θέλατε να αλλάξετε το σύνολο κανόνων "
-"ώστε να σημειώνει τα μηνύματα διαφορετικά.</p></qt>"
+"<qt><p>Κάντε κλικ σε αυτό το κουμπί ώστε να εμφανιστεί ο διάλογος "
+"επιβεβαίωσης.</p><p>Αυτό είναι χρήσιμο αν έχετε καθορίσει ένα σύνολο κανόνων "
+"που καθορίζει ότι κάποια μηνύματα θα ληφθούν αργότερα. Χωρίς τη δυνατότητα "
+"εμφάνισης του διαλόγου επιβεβαίωσης, αυτά τα μηνύματα δε θα λαμβάνονταν "
+"ποτέ, παρά μόνο αν δεν υπήρχαν άλλα μεγάλα μηνύματα στο διακομιστή, ή αν "
+"θέλατε να αλλάξετε το σύνολο κανόνων ώστε να σημειώνει τα μηνύματα "
+"διαφορετικά.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7355,6 +7160,16 @@ msgstr "Κανόνες φίλτρου POP3"
 msgid "Filter Rules"
 msgstr "Κανόνες φίλτρου"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "Ε&ισαγωγή"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "Ε&ισαγωγή"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Διαθέσιμα φίλτρα"
@@ -7437,6 +7252,11 @@ msgstr "Προσθήκη του φίλτρου και στη γραμμή εργ
 msgid "Icon for this filter:"
 msgstr "Εικονίδιο για το φίλτρο αυτό:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Προς"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Πάνω"
@@ -7445,16 +7265,29 @@ msgstr "Πάνω"
 msgid "Down"
 msgstr "Κάτω"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Μετονομασία..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Νέο"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Αντιγραφή σε"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Διαγραμμένο"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7463,20 +7296,21 @@ msgstr "Επιλογή συντόμευσης για το φάκελο"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Τουλάχιστον ένα φίλτρο αναφέρεται σε ένα φάκελο ενός συνδεδεμένου λογαριασμού "
-"IMAP. Τέτοια φίλτρα θα εφαρμόζονται μόνο όταν γίνεται χειροκίνητο φιλτράρισμα "
-"και όταν γίνεται φιλτράρισμα εισερχομένων μηνυμάτων από κάποιο λογαριασμό IMAP."
+"Τουλάχιστον ένα φίλτρο αναφέρεται σε ένα φάκελο ενός συνδεδεμένου "
+"λογαριασμού IMAP. Τέτοια φίλτρα θα εφαρμόζονται μόνο όταν γίνεται "
+"χειροκίνητο φιλτράρισμα και όταν γίνεται φιλτράρισμα εισερχομένων μηνυμάτων "
+"από κάποιο λογαριασμό IMAP."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Τα παρακάτω φίλτρα δεν αποθηκεύτηκαν γιατί δεν ήταν έγκυρα (π.χ. δεν περιείχαν "
-"ενέργειες ή κανόνες αναζήτησης)."
+"Τα παρακάτω φίλτρα δεν αποθηκεύτηκαν γιατί δεν ήταν έγκυρα (π.χ. δεν "
+"περιείχαν ενέργειες ή κανόνες αναζήτησης)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7524,16 +7358,16 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Τα ονόματα φακέλων δεν πρέπει να περιέχουν τον χαρακτήρα / (κάθετος). Παρακαλώ "
-"επιλέξτε ένα άλλο όνομα φακέλου."
+"Τα ονόματα φακέλων δεν πρέπει να περιέχουν τον χαρακτήρα / (κάθετος). "
+"Παρακαλώ επιλέξτε ένα άλλο όνομα φακέλου."
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Τα ονόματα φακέλων δεν πρέπει να αρχίζουν με . (τελεία). Παρακαλώ επιλέξτε ένα "
-"άλλο όνομα φακέλου."
+"Τα ονόματα φακέλων δεν πρέπει να αρχίζουν με . (τελεία). Παρακαλώ επιλέξτε "
+"ένα άλλο όνομα φακέλου."
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7549,29 +7383,26 @@ msgstr "Αποσφαλμάτωση λανθάνουσας μνήμης IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Αντιμετώπιση προβλημάτων της λανθάνουσας μνήμης IMAP.</b></p>"
-"<p>Αν αντιμετωπίζετε προβλήματα κατά το συγχρονισμό ενός φακέλου IMAP, θα "
-"έπρεπε πρώτα να ξαναφτιάξετε το αρχείο ευρετηρίου. Αυτό θα πάρει κάποια ώρα, "
-"αλλά δε θα δημιουργήσει προβλήματα.</p>"
-"<p>Αν αυτό δεν είναι αρκετό, μπορείτε να δοκιμάσετε να ανανεώσετε τη λανθάνουσα "
-"μνήμη IMAP. Αν το κάντε, θα χάσετε όλες τις τοπικές αλλαγές που έχουν γίνει σε "
-"αυτόν το φάκελο και όλους του υποφακέλους του.</p>"
+"<p><b>Αντιμετώπιση προβλημάτων της λανθάνουσας μνήμης IMAP.</b></p><p>Αν "
+"αντιμετωπίζετε προβλήματα κατά το συγχρονισμό ενός φακέλου IMAP, θα έπρεπε "
+"πρώτα να ξαναφτιάξετε το αρχείο ευρετηρίου. Αυτό θα πάρει κάποια ώρα, αλλά "
+"δε θα δημιουργήσει προβλήματα.</p><p>Αν αυτό δεν είναι αρκετό, μπορείτε να "
+"δοκιμάσετε να ανανεώσετε τη λανθάνουσα μνήμη IMAP. Αν το κάντε, θα χάσετε "
+"όλες τις τοπικές αλλαγές που έχουν γίνει σε αυτόν το φάκελο και όλους του "
+"υποφακέλους του.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7602,14 +7433,14 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Το αρχείο λανθάνουσας μνήμης UID του φακέλου %1 δεν μπόρεσε να αναγνωστεί. Ίσως "
-"υπάρχει πρόβλημα με τις άδειες στο σύστημα αρχείων, ή το αρχείο έχει "
+"Το αρχείο λανθάνουσας μνήμης UID του φακέλου %1 δεν μπόρεσε να αναγνωστεί. "
+"Ίσως υπάρχει πρόβλημα με τις άδειες στο σύστημα αρχείων, ή το αρχείο έχει "
 "καταστραφεί."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Το αρχείο λανθάνουσας μνήμης UID του φακέλου %1 δεν μπόρεσε να γραφτεί. Ίσως "
 "υπάρχει πρόβλημα με το σύστημα αρχείων."
@@ -7617,7 +7448,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
-"Πρέπει να κάνετε συγχρονισμό με το διακομιστή πριν τη μετονομασία φακέλων IMAP."
+"Πρέπει να κάνετε συγχρονισμό με το διακομιστή πριν τη μετονομασία φακέλων "
+"IMAP."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7651,8 +7483,8 @@ msgstr "Το ευρετήριο του φακέλου δημιουργήθηκε
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Ο φάκελος %1 δεν είναι στην αρχική κατάσταση συγχρονισμού (η κατάσταση ήταν "
 "%2). Επιθυμείτε την επαναφορά του στην αρχική του κατάσταση και να κάνετε "
@@ -7761,8 +7593,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Τα δικαιώματα πρόσβασης στο φάκελο <b>%1</b> έχουν αλλάξει. Δεν μπορείτε πια "
-"να προσθέσετε μηνύματα σε αυτόν το φάκελο.</p>"
+"<p>Τα δικαιώματα πρόσβασης στο φάκελο <b>%1</b> έχουν αλλάξει. Δεν μπορείτε "
+"πια να προσθέσετε μηνύματα σε αυτόν το φάκελο.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7783,15 +7615,11 @@ msgstr "Δημιουργία υποφακέλων στο διακομιστή"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Τα μηνύματα στο φάκελο <b>%1</b> του εξυπηρετητή έχουν διαγραφεί. Επιθυμείτε "
-"τη διαγραφή τους και τοπικά; "
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Τα μηνύματα στο φάκελο <b>%1</b> του εξυπηρετητή έχουν διαγραφεί. "
+"Επιθυμείτε τη διαγραφή τους και τοπικά; <br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7812,13 +7640,11 @@ msgstr "Ανάκτηση φακέλων για το χώρο ονομάτων %1
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Από ότι φαίνεται ο φάκελος <b>%1</b> έχει διαγραφεί. Επιθυμείτε τη διαγραφή "
-"του από το διακομιστή;</p></qt>"
+"<qt><p>Από ότι φαίνεται ο φάκελος <b>%1</b> έχει διαγραφεί. Επιθυμείτε τη "
+"διαγραφή του από το διακομιστή;</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7826,21 +7652,21 @@ msgstr "Εγκαταλείφθηκε"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "Ο διακομιστής IMAP %1 δεν υποστηρίζει επισημάνσεις IMAP. Η αποθήκευση XML δε "
-"μπορεί να χρησιμοποιηθεί σε αυτόν το διακομιστή. Παρακαλώ αλλάξτε τις ρυθμίσεις "
-"του KMail."
+"μπορεί να χρησιμοποιηθεί σε αυτόν το διακομιστή. Παρακαλώ αλλάξτε τις "
+"ρυθμίσεις του KMail."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "Ο διακομιστής IMAP %1 δεν υποστηρίζει επισημάνσεις IMAP. Η αποθήκευση XML δε "
-"μπορεί να χρησιμοποιηθεί σε αυτόν το διακομιστή. Παρακαλώ αλλάξτε τις ρυθμίσεις "
-"του KMail."
+"μπορεί να χρησιμοποιηθεί σε αυτόν το διακομιστή. Παρακαλώ αλλάξτε τις "
+"ρυθμίσεις του KMail."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7852,17 +7678,17 @@ msgstr "Χάθηκαν+Βρέθηκαν"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Στο φάκελο <b>%1</b> υπάρχουν νέα μηνύματα, που δεν έχουν αποσταλεί ακόμα "
-"στο διακομιστή, αλλά ο φάκελος έχει διαγραφεί στο διακομιστή ή δεν έχετε επαρκή "
-"δικαιώματα στο φάκελο για να τα αποστείλετε.</p>"
-"<p>Για αυτό το λόγο όλα αυτά τα μηνύματα θα μετακινηθούν στο φάκελο <b>%2</b> "
-"για να αποφευχθεί απώλεια δεδομένων.</p>"
+"στο διακομιστή, αλλά ο φάκελος έχει διαγραφεί στο διακομιστή ή δεν έχετε "
+"επαρκή δικαιώματα στο φάκελο για να τα αποστείλετε.</p><p>Για αυτό το λόγο "
+"όλα αυτά τα μηνύματα θα μετακινηθούν στο φάκελο <b>%2</b> για να αποφευχθεί "
+"απώλεια δεδομένων.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7870,21 +7696,26 @@ msgstr "Μη επαρκή δικαιώματα πρόσβασης"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-msgstr ""
-"<p>Σε αυτό το φάκελο (%1) υπάρχουν νέα μηνύματα, που δεν έχουν αποσταλεί ακόμα "
-"στο διακομιστή, αλλά ο φάκελος έχει διαγραφεί στο διακομιστή ή δεν έχετε επαρκή "
-"δικαιώματα για να τα αποστείλετε τώρα. Παρακαλώ επικοινωνήστε με το διαχειριστή "
-"σας ώστε να σας επιτρέψει την αποστολή νέων μηνυμάτων, ή μετακινήστε τα από "
-"αυτόν το φάκελο.</p> "
-"<p>Επιθυμείτε τη μετακίνηση αυτών των μηνυμάτων σε έναν άλλο φάκελο τώρα;</p>"
-
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
+msgstr ""
+"<p>Σε αυτό το φάκελο (%1) υπάρχουν νέα μηνύματα, που δεν έχουν αποσταλεί "
+"ακόμα στο διακομιστή, αλλά ο φάκελος έχει διαγραφεί στο διακομιστή ή δεν "
+"έχετε επαρκή δικαιώματα για να τα αποστείλετε τώρα. Παρακαλώ επικοινωνήστε "
+"με το διαχειριστή σας ώστε να σας επιτρέψει την αποστολή νέων μηνυμάτων, ή "
+"μετακινήστε τα από αυτόν το φάκελο.</p> <p>Επιθυμείτε τη μετακίνηση αυτών "
+"των μηνυμάτων σε έναν άλλο φάκελο τώρα;</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Μετακίνηση σε:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Να μη μετακινηθούν"
 
@@ -7896,8 +7727,7 @@ msgstr "Μετακίνηση μηνυμάτων σε άλλο φάκελο"
 msgid "Permissions (ACL)"
 msgstr "Άδειες (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Γενικά"
@@ -7921,8 +7751,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Χρήση προσαρμοσμένων ε&ικονιδίων"
@@ -7941,25 +7770,22 @@ msgstr "Ενέργεια μόνο σε νέα/μη αναγνωσμένα μην
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Αν ενεργοποιηθεί αυτή η επιλογή, θα ειδοποιείστε όταν υπάρχουν νέα/μη "
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Αν ενεργοποιηθεί αυτή η επιλογή, θα ειδοποιείστε όταν υπάρχουν νέα/μη "
 "αναγνωσμένα μηνύματα σε αυτόν το φάκελο. Επιπροσθέτως, κατά η διαδικασία "
 "μετάβασης σε προηγούμενο/επόμενο φάκελο με μη αναγνωσμένα μηνύματα, θα "
-"σταματάει σε αυτόν το φάκελο.</p>"
-"<p>Απενεργοποιήστε αυτή την επιλογή αν δε θέλετε να ειδοποιείστε για νέα/μη "
-"αναγνωσμένα μηνύματα σε αυτόν το φάκελο και αν θέλετε να παραβλέπεται κατά τη "
-"μετάβαση σε προηγούμενο/επόμενο φάκελο με μη αναγνωσμένα μηνύματα. Αυτό είναι "
-"χρήσιμο για να παραβλέπονται τα νέα/μη αναγνωσμένα μηνύματα του κάδου "
-"απορριμμάτων ή του φακέλου spam.</p></qt>"
+"σταματάει σε αυτόν το φάκελο.</p><p>Απενεργοποιήστε αυτή την επιλογή αν δε "
+"θέλετε να ειδοποιείστε για νέα/μη αναγνωσμένα μηνύματα σε αυτόν το φάκελο "
+"και αν θέλετε να παραβλέπεται κατά τη μετάβαση σε προηγούμενο/επόμενο φάκελο "
+"με μη αναγνωσμένα μηνύματα. Αυτό είναι χρήσιμο για να παραβλέπονται τα νέα/"
+"μη αναγνωσμένα μηνύματα του κάδου απορριμμάτων ή του φακέλου spam.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7971,13 +7797,13 @@ msgstr "Διατήρηση των απαντήσεων σε αυτόν το φά
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή αν θέλετε οι απαντήσεις στα μηνύματα αυτού του "
-"φακέλου να τοποθετούνται στον ίδιο φάκελο μετά την αποστολή τους, αντί του "
-"φακέλου απεσταλμένων."
+"Ενεργοποιήστε αυτή την επιλογή αν θέλετε οι απαντήσεις στα μηνύματα αυτού "
+"του φακέλου να τοποθετούνται στον ίδιο φάκελο μετά την αποστολή τους, αντί "
+"του φακέλου απεσταλμένων."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7987,17 +7813,21 @@ msgstr "Εμφάνιση στήλης αποστολέα/παραλήπτη στ
 msgid "Sho&w column:"
 msgstr "Εμφάνιση &στήλης:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Ορισμός ως προκαθορισμένο"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Αποστολέας"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Παραλήπτης"
@@ -8008,18 +7838,19 @@ msgstr "&Ταυτότητα αποστολέα:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Επιλέξτε την ταυτότητα αποστολέα που θα χρησιμοποιείται στα νέα μηνύματα ή στις "
-"απαντήσεις σε μηνύματα αυτού του φακέλου. Αυτό σημαίνει ότι αν βρίσκεστε σε "
-"έναν από τους φακέλους εργασίας σας, μπορείτε να ορίσετε στο KMail να "
-"χρησιμοποιήσει αυτόματα τη διεύθυνση αλληλογραφίας, υπογραφή και κλειδιά "
-"υπογραφής και κρυπτογράφησης που αντιστοιχούν στην ταυτότητα.Οι ταυτότητες "
-"ρυθμίζονται στον κύριο διάλογο ρυθμίσεων. (Ρυθμίσεις -> Ρύθμιση του KMail)"
+"Επιλέξτε την ταυτότητα αποστολέα που θα χρησιμοποιείται στα νέα μηνύματα ή "
+"στις απαντήσεις σε μηνύματα αυτού του φακέλου. Αυτό σημαίνει ότι αν "
+"βρίσκεστε σε έναν από τους φακέλους εργασίας σας, μπορείτε να ορίσετε στο "
+"KMail να χρησιμοποιήσει αυτόματα τη διεύθυνση αλληλογραφίας, υπογραφή και "
+"κλειδιά υπογραφής και κρυπτογράφησης που αντιστοιχούν στην ταυτότητα.Οι "
+"ταυτότητες ρυθμίζονται στον κύριο διάλογο ρυθμίσεων. (Ρυθμίσεις -> Ρύθμιση "
+"του KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -8037,29 +7868,29 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Αυτή η ρύθμιση καθορίζει τους χρήστες που έχουν κοινόχρηστο αυτόν το φάκελο που "
-"θα ανακτούν περιόδους \"απασχόλησης\" στις λίστες freebusy και θα βλέπουν "
-"γεγονότα ή εργασίες του φακέλου αυτού. Η ρύθμιση αυτή έχει εφαρμογή μόνο στους "
-"φακέλους ημερολογίου και εργασιών (για εργασίες, η ρύθμιση αυτή χρησιμοποιείται "
-"μόνο στις ειδοποιήσεις).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Αυτή η ρύθμιση καθορίζει τους χρήστες που έχουν κοινόχρηστο αυτόν το φάκελο "
+"που θα ανακτούν περιόδους \"απασχόλησης\" στις λίστες freebusy και θα "
+"βλέπουν γεγονότα ή εργασίες του φακέλου αυτού. Η ρύθμιση αυτή έχει εφαρμογή "
+"μόνο στους φακέλους ημερολογίου και εργασιών (για εργασίες, η ρύθμιση αυτή "
+"χρησιμοποιείται μόνο στις ειδοποιήσεις).\n"
 "\n"
-"Παραδείγματα χρήσης: Αν το αφεντικό μοιράζεται ένα φάκελο με τη γραμματεία του, "
-"θα σημειωθεί μόνο το αφεντικό ως απασχολημένο για τις συναντήσεις του. Έτσι θα "
-"πρέπει να επιλέξει \"Διαχειριστές\" επειδή η γραμματεία δεν έχει δικαιώματα "
-"διαχείρισης στο φάκελο.\n"
-"Σε άλλη περίπτωση, αν μία ομάδα εργασίας μοιράζεται ένα ημερολόγιο για ομαδικές "
-"συναντήσεις, όλοι οι αναγνώστες του φακέλου θα πρέπει να σημειωθούν "
+"Παραδείγματα χρήσης: Αν το αφεντικό μοιράζεται ένα φάκελο με τη γραμματεία "
+"του, θα σημειωθεί μόνο το αφεντικό ως απασχολημένο για τις συναντήσεις του. "
+"Έτσι θα πρέπει να επιλέξει \"Διαχειριστές\" επειδή η γραμματεία δεν έχει "
+"δικαιώματα διαχείρισης στο φάκελο.\n"
+"Σε άλλη περίπτωση, αν μία ομάδα εργασίας μοιράζεται ένα ημερολόγιο για "
+"ομαδικές συναντήσεις, όλοι οι αναγνώστες του φακέλου θα πρέπει να σημειωθούν "
 "απασχολημένοι για τις συναντήσεις.\n"
-"Ένας εταιρικός φάκελος με τυχαία γεγονότα σε αυτόν θα πρέπει να χρησιμοποιήσει "
-"την επιλογή \"Κανένας\" επειδή δεν είναι γνωστό ποιος τελικά θα συμμετάσχει στα "
-"γεγονότα αυτά."
+"Ένας εταιρικός φάκελος με τυχαία γεγονότα σε αυτόν θα πρέπει να "
+"χρησιμοποιήσει την επιλογή \"Κανένας\" επειδή δεν είναι γνωστό ποιος τελικά "
+"θα συμμετάσχει στα γεγονότα αυτά."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8077,8 +7908,8 @@ msgstr "Όλοι όσοι διαβάζουν αυτό το φάκελο"
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
-"Αυτή η επιλογή σας επιτρέπει να απενεργοποιήσετε τις ειδοποιήσεις για φακέλους "
-"που μοιράζεστε με άλλους. "
+"Αυτή η επιλογή σας επιτρέπει να απενεργοποιήσετε τις ειδοποιήσεις για "
+"φακέλους που μοιράζεστε με άλλους. "
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -8092,23 +7923,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Έχετε δηλώσει ότι αυτός ο φάκελος περιέχει πληροφορίες groupware και έχετε "
-"ορίσει ότι οι φάκελοι groupware θα είναι κρυφοί. Αυτό σημαίνει ότι ο φάκελος θα "
-"εξαφανιστεί μόλις κλείσει ο διάλογος ρυθμίσεων. Αν κάποια στιγμή θελήσετε να "
-"διαγράψετε το φάκελο, θα πρέπει να απενεργοποιήσετε προσωρινά την απόκρυψη των "
-"φακέλων groupware."
+"ορίσει ότι οι φάκελοι groupware θα είναι κρυφοί. Αυτό σημαίνει ότι ο φάκελος "
+"θα εξαφανιστεί μόλις κλείσει ο διάλογος ρυθμίσεων. Αν κάποια στιγμή θελήσετε "
+"να διαγράψετε το φάκελο, θα πρέπει να απενεργοποιήσετε προσωρινά την "
+"απόκρυψη των φακέλων groupware."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8177,13 +8008,14 @@ msgstr "Σφάλμα κατά την ανάκτηση των πληροφορι�
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Το ευρετήριο αλληλογραφίας για το '%1' προέρχεται από μία άγνωστη έκδοση του "
 "KMail (%2).\n"
-"Το ευρετήριο μπορεί να επαναδημιουργηθεί από το φάκελο αλληλογραφίας σας, αλλά "
-"ίσως χαθούν κάποιες πληροφορίες, όπως σημαίες κατάστασης. Επιθυμείτε την "
-"υποβάθμιση του αρχείου ευρετηρίου;"
+"Το ευρετήριο μπορεί να επαναδημιουργηθεί από το φάκελο αλληλογραφίας σας, "
+"αλλά ίσως χαθούν κάποιες πληροφορίες, όπως σημαίες κατάστασης. Επιθυμείτε "
+"την υποβάθμιση του αρχείου ευρετηρίου;"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8209,11 +8041,11 @@ msgstr "Σφάλμα ανοίγματος του %1. Αυτός ο φάκελο�
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Σφάλμα ανοίγματος του %1. Ή αυτός δεν είναι ένας έγκυρος φάκελος maildir, ή δεν "
-"έχετε επαρκή άδεια πρόσβασης."
+"Σφάλμα ανοίγματος του %1. Ή αυτός δεν είναι ένας έγκυρος φάκελος maildir, ή "
+"δεν έχετε επαρκή άδεια πρόσβασης."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8226,8 +8058,8 @@ msgstr "Αδύνατος ο συγχρονισμός του φακέλου maild
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"Το μήνυμα δεν μπορεί να προστεθεί στο φάκελο, πιθανότατα λόγω χαμηλού χώρου στο "
-"δίσκο."
+"Το μήνυμα δεν μπορεί να προστεθεί στο φάκελο, πιθανότατα λόγω χαμηλού χώρου "
+"στο δίσκο."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -8258,22 +8090,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Το ευρετήριο του φακέλου '%2' φαίνεται να είναι πεπαλαιωμένο. Για να "
-"αποφευχθεί απώλεια ή καταστροφή μηνυμάτων, θα γίνει επαναδημιουργία του. Λόγω "
-"αυτού μπορεί να ξαναεμφανιστούν διαγραμμένα μηνύματα και να χαθούν οι σημαίες "
-"κατάστασης.</p>"
-"<p>Παρακαλώ διαβάστε τη σχετική καταχώρηση στο <a href=\"%1\">"
-"τμήμα FAQ του εγχειριδίου του KMail</a> για να μάθετε πως να αποτρέψετε την "
-"εμφάνιση αυτού του προβλήματος στο μέλλον.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Το ευρετήριο του φακέλου '%2' φαίνεται να είναι πεπαλαιωμένο. Για να "
+"αποφευχθεί απώλεια ή καταστροφή μηνυμάτων, θα γίνει επαναδημιουργία του. "
+"Λόγω αυτού μπορεί να ξαναεμφανιστούν διαγραμμένα μηνύματα και να χαθούν οι "
+"σημαίες κατάστασης.</p><p>Παρακαλώ διαβάστε τη σχετική καταχώρηση στο <a "
+"href=\"%1\">τμήμα FAQ του εγχειριδίου του KMail</a> για να μάθετε πως να "
+"αποτρέψετε την εμφάνιση αυτού του προβλήματος στο μέλλον.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8336,7 +8164,7 @@ msgstr ""
 "Το '%1' δε φαίνεται να είναι φάκελος.\n"
 "Παρακαλώ μετακινήστε το αρχείο από εκεί."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8345,7 +8173,7 @@ msgstr ""
 "Παρακαλώ βεβαιωθείτε ότι μπορείτε να προσπελάσετε και να τροποποιήσετε το "
 "περιεχόμενου αυτού του φακέλου."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8356,8 +8184,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 "Ένας φάκελος με το ίδιο όνομα διαγράφηκε από όταν έγινε ο τελευταίος έλεγχος "
 "αλληλογραφίας. Θα πρέπει να ελέγχεται τα μηνύματα πρώτα πριν τη δημιουργία "
@@ -8367,7 +8195,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Αδύνατη η δημιουργία φακέλου"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8465,13 +8293,14 @@ msgstr "&Αποσφαλμάτωση λανθάνουσας μνήμης IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Αδύνατη η δημιουργία του φακέλου <b>%1</b> λόγω μη επαρκών αδειών στο "
-"διακομιστή. Αν νομίζετε ότι θα έπρεπε να μπορείτε να δημιουργήσετε υποφακέλους "
-"εδώ, ζητήστε από το διαχειριστή σας να σας δώσει τα κατάλληλα διακαιώματα.</qt> "
+"διακομιστή. Αν νομίζετε ότι θα έπρεπε να μπορείτε να δημιουργήσετε "
+"υποφακέλους εδώ, ζητήστε από το διαχειριστή σας να σας δώσει τα κατάλληλα "
+"διακαιώματα.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8488,23 +8317,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Αδύνατη η μετακίνηση ή αντιγραφή του φακέλου <b>%1</b>"
-", επειδή ο φάκελος ήδη υπάρχει.</qt>"
+"<qt>Αδύνατη η μετακίνηση ή αντιγραφή του φακέλου <b>%1</b>, επειδή ο φάκελος "
+"ήδη υπάρχει.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Αδύνατη η μετακίνηση ή αντιγραφή του φακέλου <b>%1</b> "
-"γιατί δεν έχει ακόμη ολοκληρωθεί η αντιγραφή του.</qt>"
+"<qt>Αδύνατη η μετακίνηση ή αντιγραφή του φακέλου <b>%1</b> γιατί δεν έχει "
+"ακόμη ολοκληρωθεί η αντιγραφή του.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Αδύνατη η μετακίνηση ή αντιγραφή του φακέλου <b>%1</b> "
-"σε υποφάκελό του.</qt>"
+"<qt>Αδύνατη η μετακίνηση ή αντιγραφή του φακέλου <b>%1</b> σε υποφάκελό του."
+"</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8610,15 +8439,15 @@ msgstr "Ο φάκελος %1 είναι μόνο για ανάγνωση."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Επιθυμείτε πραγματικά τη διαγραφή του επιλεγμένου μηνύματος;"
-"<br>Μετά τη διαγραφή, δεν υπάρχει τρόπος να το ανακτήσετε.</qt>\n"
-"<qt>Επιθυμείτε πραγματικά τη διαγραφή των %n επιλεγμένων μηνυμάτων;"
-"<br>Μετά τη διαγραφή, δεν υπάρχει τρόπος να τα ανακτήσετε.</qt>"
+"<qt>Επιθυμείτε πραγματικά τη διαγραφή του επιλεγμένου μηνύματος;<br>Μετά τη "
+"διαγραφή, δεν υπάρχει τρόπος να το ανακτήσετε.</qt>\n"
+"<qt>Επιθυμείτε πραγματικά τη διαγραφή των %n επιλεγμένων μηνυμάτων;<br>Μετά "
+"τη διαγραφή, δεν υπάρχει τρόπος να τα ανακτήσετε.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8670,138 +8499,136 @@ msgstr ""
 "Αποτυχία τροποποίησης του %1\n"
 "(Δεν υπάρχει ελεύθερος χώρος στη συσκευή;)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Αίτηση υπογραφής πιστοποιητικού"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
-"Παρακαλώ δημιουργήστε ένα πιστοποιητικό από το συνημμένο και επιστρέψτε το στον "
-"αποστολέα."
+"Παρακαλώ δημιουργήστε ένα πιστοποιητικό από το συνημμένο και επιστρέψτε το "
+"στον αποστολέα."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "Το KMail λειτουργεί χωρίς σύνδεση. Όλες οι δικτυακές εργασίες έχουν ανασταλεί"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "Το KMail λειτουργεί με σύνδεση. Όλες οι δικτυακές εργασίες συνεχίζονται"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 "Το KMail είναι σε λειτουργία χωρίς σύνδεση. Πώς επιθυμείτε να συνεχίσετε;"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Εργασία με σύνδεση"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Εργασία χωρίς σύνδεση"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Δεν έχετε άδεια εγγραφής/ανάγνωσης στο φάκελο εισερχομένων σας."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "εξερχόμενα"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Δεν έχετε άδεια ανάγνωσης/εγγραφής στο φάκελο εξερχομένων σας."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "απεσταλμένα"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Δεν έχετε άδεια εγγραφής/ανάγνωσης στο φάκελο απεσταλμένων σας."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "απορρίμματα"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Δεν έχετε άδεια εγγραφής/ανάγνωσης στο φάκελο απορριμμάτων σας."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "προσχέδια"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Δεν έχετε άδεια εγγραφής/ανάγνωσης στο φάκελο προσχεδίων σας."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "πρότυπα"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Δεν έχετε άδεια εγγραφής/ανάγνωσης στο φάκελο προτύπων σας."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Τελευταία αναζήτηση"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Ο φάκελος <i>%4</i> υπάρχει. Το %1 χρησιμοποιεί τώρα το φάκελο <i>%5</i> "
-"για τα μηνύματά του."
-"<p>Το %2 μπορεί να μετακινήσει τα περιεχόμενα του <i>%6<i> "
-"σε αυτόν το φάκελο, παρότι μπορεί να αντικατασταθούν τα υπάρχοντα μηνύματα με "
-"ίδιο όνομα στο <i>%7</i>."
-"<p><strong>Επιθυμείτε το %3 να μετακινήσει τα μηνύματα τώρα;</strong></qt>"
+"για τα μηνύματά του.<p>Το %2 μπορεί να μετακινήσει τα περιεχόμενα του <i>"
+"%6<i> σε αυτόν το φάκελο, παρότι μπορεί να αντικατασταθούν τα υπάρχοντα "
+"μηνύματα με ίδιο όνομα στο <i>%7</i>.<p><strong>Επιθυμείτε το %3 να "
+"μετακινήσει τα μηνύματα τώρα;</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Ο φάκελος <i>%4</i> υπάρχει. Το %1 χρησιμοποιεί τώρα το φάκελο <i>%5</i> "
-"για τα μηνύματά του. Το %2 μπορεί να μετακινήσει τα περιεχόμενα του <i>%6</i> "
-"σε αυτόν το φάκελο."
-"<p><strong>Επιθυμείτε το %3 να μετακινήσει τα μηνύματα τώρα;</strong></qt>"
+"για τα μηνύματά του. Το %2 μπορεί να μετακινήσει τα περιεχόμενα του <i>%6</"
+"i> σε αυτόν το φάκελο.<p><strong>Επιθυμείτε το %3 να μετακινήσει τα μηνύματα "
+"τώρα;</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Μεταφορά μηνυμάτων αλληλογραφίας;"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Το KMail συνάντησε ένα κρίσιμο σφάλμα και θα τερματίσει τώρα"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8812,11 +8639,11 @@ msgstr ""
 "Το σφάλμα ήταν:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Επιθυμείτε πραγματικά να αδειάσετε τους φακέλους απορριμμάτων όλων των "
@@ -8893,8 +8720,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Έφτασε νέα αλληλογραφία</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8932,8 +8758,8 @@ msgstr "Επιθυμείτε πραγματικά να αδειάσετε το �
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Επιθυμείτε πραγματικά να μετακινήσετε όλα τα μηνύματα από το φάκελο <b>"
 "%1</b> στα απορρίμματα;</qt>"
@@ -8960,12 +8786,12 @@ msgstr "Διαγραφή αναζήτησης"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Επιθυμείτε σίγουρα τη διαγραφή της αναζήτησης <b>%1</b>;"
-"<br>Τα μηνύματα που εμφανίζονται σε αυτήν θα εξακολουθήσουν να είναι διαθέσιμα "
-"στον αρχικό τους φάκελο</qt>"
+"<qt>Επιθυμείτε σίγουρα τη διαγραφή της αναζήτησης <b>%1</b>;<br>Τα μηνύματα "
+"που εμφανίζονται σε αυτήν θα εξακολουθήσουν να είναι διαθέσιμα στον αρχικό "
+"τους φάκελο</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8978,41 +8804,43 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Είστε σίγουροι ότι επιθυμείτε τη διαγραφή του κενού φακέλου <b>%1</b> "
-"και όλων των υποφακέλων του; Οι υποφάκελοι αυτοί μπορεί να μην είναι κενοί και "
-"τα περιεχόμενά τους θα διαγραφούν επίσης. "
-"<p><b>Σημειώστε</b> ότι αυτά τα μηνύματα δε θα αποθηκευτούν στο φάκελο "
-"απορριμμάτων, αλλά θα διαγραφούν οριστικά.</qt>"
+"και όλων των υποφακέλων του; Οι υποφάκελοι αυτοί μπορεί να μην είναι κενοί "
+"και τα περιεχόμενά τους θα διαγραφούν επίσης. <p><b>Σημειώστε</b> ότι αυτά "
+"τα μηνύματα δε θα αποθηκευτούν στο φάκελο απορριμμάτων, αλλά θα διαγραφούν "
+"οριστικά.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Επιθυμείτε σίγουρα τη διαγραφή του φακέλου <b>%1</b> "
-", απορρίπτοντας τα περιεχόμενά του; "
-"<p><b>Σημειώστε</b> ότι αυτά τα μηνύματα δε θα αποθηκευτούν στο φάκελο "
-"απορριμμάτων, αλλά θα διαγραφούν οριστικά.</qt>"
+"<qt>Επιθυμείτε σίγουρα τη διαγραφή του φακέλου <b>%1</b> , απορρίπτοντας τα "
+"περιεχόμενά του; <p><b>Σημειώστε</b> ότι αυτά τα μηνύματα δε θα αποθηκευτούν "
+"στο φάκελο απορριμμάτων, αλλά θα διαγραφούν οριστικά.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Επιθυμείτε σίγουρα τη διαγραφή του φακέλου <b>%1</b> "
-"και όλους τους υποφακέλους του, απορρίπτοντας τα περιεχόμενά τους; "
-"<p><b>Σημειώστε</b> ότι αυτά τα μηνύματα δε θα αποθηκευτούν στο φάκελο "
-"απορριμμάτων, αλλά θα διαγραφούν οριστικά.</qt>"
+"<qt>Επιθυμείτε σίγουρα τη διαγραφή του φακέλου <b>%1</b> και όλους τους "
+"υποφακέλους του, απορρίπτοντας τα περιεχόμενά τους; <p><b>Σημειώστε</b> ότι "
+"αυτά τα μηνύματα δε θα αποθηκευτούν στο φάκελο απορριμμάτων, αλλά θα "
+"διαγραφούν οριστικά.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Διαγραμμένο"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -9020,8 +8848,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Επιθυμείτε σίγουρα την ανανέωση της λανθάνουσας μνήμης IMAP;\n"
-"Αυτό θα αφαιρέσει όλες τις τοπικές τροποποιήσεις που έχετε κάνει στους φακέλους "
-"IMAP."
+"Αυτό θα αφαιρέσει όλες τις τοπικές τροποποιήσεις που έχετε κάνει στους "
+"φακέλους IMAP."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -9029,13 +8857,13 @@ msgstr "Επιθυμείτε πραγματικά τη λήξη όλων των
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Η χρήση HTML στο email θα σας κάνει πιο ευάλωτους στο \"spam\" (διαφημιστικά "
-"κλπ) και ίσως αυξήσει την πιθανότητα άλωσης του συστήματός σας μέσω των τωρινών "
-"και μελλοντικών προβλημάτων ασφαλείας."
+"κλπ) και ίσως αυξήσει την πιθανότητα άλωσης του συστήματός σας μέσω των "
+"τωρινών και μελλοντικών προβλημάτων ασφαλείας."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -9048,12 +8876,12 @@ msgstr "Χρήση HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Η χρήση HTML στο email θα σας κάνει πιο ευάλωτους στο \"spam\" (διαφημιστικά "
-"κλπ) και ίσως αυξήσει την πιθανότητα άλωσης του συστήματός σας μέσω των τωρινών "
-"και μελλοντικών προβλημάτων ασφαλείας."
+"κλπ) και ίσως αυξήσει την πιθανότητα άλωσης του συστήματός σας μέσω των "
+"τωρινών και μελλοντικών προβλημάτων ασφαλείας."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -9069,14 +8897,15 @@ msgstr "Φίλτρο στη λίστα ταχυδρομείου %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Η λειτουργία απάντησης εκτός γραφείου του KMail βασίζεται στο φιλτράρισμα από "
-"μεριάς του διακομιστή. Εσείς δεν έχετε ρυθμίσει ένα διακομιστή IMAP γι' αυτό.\n"
-"Μπορείτε να το κάνετε στην καρτέλα \"Φιλτραρίσματος\" των ρυθμίσεων λογαριασμού "
-"IMAP."
+"Η λειτουργία απάντησης εκτός γραφείου του KMail βασίζεται στο φιλτράρισμα "
+"από μεριάς του διακομιστή. Εσείς δεν έχετε ρυθμίσει ένα διακομιστή IMAP γι' "
+"αυτό.\n"
+"Μπορείτε να το κάνετε στην καρτέλα \"Φιλτραρίσματος\" των ρυθμίσεων "
+"λογαριασμού IMAP."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -9093,7 +8922,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Αδύνατη η εκκίνηση του προβολέα καταγραφής GnuPG (kwatchgnupg). Παρακαλώ "
 "ελέγξτε την εγκατάστασή σας."
@@ -9415,8 +9245,7 @@ msgstr "Αποθήκευ&ση συνημμένων..."
 msgid "Appl&y All Filters"
 msgstr "&Εφαρμογή όλων των φίλτρων"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Εφαρμογή φίλτρου"
@@ -9453,8 +9282,8 @@ msgstr "Στήλης &συνόλου"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Εναλλαγή εμφάνισης της στήλης του αριθμού των συνολικών μηνυμάτων που υπάρχουν "
-"στους φακέλους."
+"Εναλλαγή εμφάνισης της στήλης του αριθμού των συνολικών μηνυμάτων που "
+"υπάρχουν στους φακέλους."
 
 #: kmmainwidget.cpp:3026
 msgid ""
@@ -9532,7 +9361,6 @@ msgstr "Επόμενο μη αναγνωσμένο μήν&υμα"
 msgid "Go to the next unread message"
 msgstr "Μετάβαση στο επόμενο μη αναγνωσμένο μήνυμα"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Προηγούμενο μήνυμα"
@@ -9580,8 +9408,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Κύλιση κειμένου στο τρέχον μήνυμα. Όταν φτάσει το τέλος, μετάβαση στο επόμενο "
-"μη αναγνωσμένο μήνυμα."
+"Κύλιση κειμένου στο τρέχον μήνυμα. Όταν φτάσει το τέλος, μετάβαση στο "
+"επόμενο μη αναγνωσμένο μήνυμα."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9671,8 +9499,8 @@ msgstr " Αρχικοποίηση..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9682,10 +9510,10 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Αυτό το μήνυμα περιέχει μια αίτηση αποστολής ειδοποίησης παράδοσης.\n"
@@ -9696,8 +9524,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9709,8 +9537,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9722,8 +9550,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9759,16 +9587,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Απόδειξη: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Συνημμένο: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Αυτό το συνημμένο διαγράφηκε."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Το συνημμένο '%1' διαγράφηκε."
 
@@ -9816,46 +9644,39 @@ msgstr "Ιδιότητες τμήματος μηνύματος"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ο <em>τύπος MIME</em> του αρχείου:</p>"
-"<p>κανονικά δε θα χρειαστεί να πειράξετε αυτή τη ρύθμιση, αφού ο τύπος του "
-"αρχείου θα ανιχνευθεί αυτόματα. Μερικές φορές όμως η ανίχνευση μπορεί να μη "
-"γίνει σωστά από το %1. Εδώ μπορείτε να το διορθώσετε.</p></qt>"
+"<qt><p>Ο <em>τύπος MIME</em> του αρχείου:</p><p>κανονικά δε θα χρειαστεί να "
+"πειράξετε αυτή τη ρύθμιση, αφού ο τύπος του αρχείου θα ανιχνευθεί αυτόματα. "
+"Μερικές φορές όμως η ανίχνευση μπορεί να μη γίνει σωστά από το %1. Εδώ "
+"μπορείτε να το διορθώσετε.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Το μέγεθος του μέρους του μηνύματος:</p>"
-"<p>μερικές φορές το %1 θα εμφανίσει το κατ' εκτίμηση μέγεθος, γιατί ο ακριβής "
-"υπολογισμός του θα απαιτούσε πολλή ώρα. Σε αυτή την περίπτωση θα σημειωθεί με "
-"την προσθήκη του \"(περίπου)\" στο εμφανιζόμενο μέγεθος.</p></qt>"
+"<qt><p>Το μέγεθος του μέρους του μηνύματος:</p><p>μερικές φορές το %1 θα "
+"εμφανίσει το κατ' εκτίμηση μέγεθος, γιατί ο ακριβής υπολογισμός του θα "
+"απαιτούσε πολλή ώρα. Σε αυτή την περίπτωση θα σημειωθεί με την προσθήκη του "
+"\"(περίπου)\" στο εμφανιζόμενο μέγεθος.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Το όνομα αρχείου του μέρους του μηνύματος:</p> "
-"<p>παρότι συνήθως είναι το όνομα του συνημμένου αρχείου, δεν καθορίζει το "
-"αρχείο που θα επισυναπτεί, αλλά υποδεικνύει το όνομα με το οποίο θα αποθηκευτεί "
-"το μέρος του μηνύματος στο δίσκο από τον πελάτη αλληλογραφίας του παραλήπτη.</p>"
-"</qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
+msgstr ""
+"<qt><p>Το όνομα αρχείου του μέρους του μηνύματος:</p> <p>παρότι συνήθως "
+"είναι το όνομα του συνημμένου αρχείου, δεν καθορίζει το αρχείο που θα "
+"επισυναπτεί, αλλά υποδεικνύει το όνομα με το οποίο θα αποθηκευτεί το μέρος "
+"του μηνύματος στο δίσκο από τον πελάτη αλληλογραφίας του παραλήπτη.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9863,17 +9684,15 @@ msgstr "&Περιγραφή:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Μία περιγραφή του μέρους του μηνύματος:</p>"
-"<p>είναι απλώς μία περιγραφή του μέρους του μηνύματος, όπως είναι το Θέμα για "
-"ολόκληρο το μήνυμα. Οι περισσότεροι πελάτες αλληλογραφίας θα την εμφανίσουν "
-"μαζί με το εικονίδιο επισύναψης κατά την προεπισκόπηση του μηνύματος.</p></qt>"
+"<qt><p>Μία περιγραφή του μέρους του μηνύματος:</p><p>είναι απλώς μία "
+"περιγραφή του μέρους του μηνύματος, όπως είναι το Θέμα για ολόκληρο το "
+"μήνυμα. Οι περισσότεροι πελάτες αλληλογραφίας θα την εμφανίσουν μαζί με το "
+"εικονίδιο επισύναψης κατά την προεπισκόπηση του μηνύματος.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9881,23 +9700,21 @@ msgstr "&Κωδικοποίηση:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Η κωδικοποίηση μεταφοράς αυτού του μέρους του μηνύματος:</p>"
-"<p>κανονικά, δε θα χρειαστεί να την αλλάξετε, αφού το %1 χρησιμοποιεί μια κοινά "
-"αποδεκτή κωδικοποίηση ανάλογα με τον τύπο MIME. Παρόλα αυτά, μερικές φορές "
-"είναι δυνατή η μείωση του μεγέθους του τελικού μηνύματος, αν π.χ. ένα αρχείο "
-"PostScript δεν περιέχει δυαδικά δεδομένα αλλά μόνο απλό κείμενο. Σε αυτή την "
-"περίπτωση, επιλέγοντας \"quoted-printable\"αντί του προεπιλεγμένου \"base64\" "
-"θα μειώσει το μέγεθος του μηνύματος ως και 25%.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Η κωδικοποίηση μεταφοράς αυτού του μέρους του μηνύματος:</"
+"p><p>κανονικά, δε θα χρειαστεί να την αλλάξετε, αφού το %1 χρησιμοποιεί μια "
+"κοινά αποδεκτή κωδικοποίηση ανάλογα με τον τύπο MIME. Παρόλα αυτά, μερικές "
+"φορές είναι δυνατή η μείωση του μεγέθους του τελικού μηνύματος, αν π.χ. ένα "
+"αρχείο PostScript δεν περιέχει δυαδικά δεδομένα αλλά μόνο απλό κείμενο. Σε "
+"αυτή την περίπτωση, επιλέγοντας \"quoted-printable\"αντί του προεπιλεγμένου "
+"\"base64\" θα μειώσει το μέγεθος του μηνύματος ως και 25%.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9905,21 +9722,17 @@ msgstr "Υπόδειξη &αυτόματης εμφάνισης"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ενεργοποιήστε αυτή την επιλογή για να υποδείξετε στον πελάτη αλληλογραφίας "
-"του παραλήπτη να εμφανίσει αυτόματα (εμβόλιμα) αυτό το μέρος του μηνύματος, "
-"αντί της χρήσης εικονιδίου.</p>"
-"<p>Τεχνικά, αυτό επιτυγχάνεται ορίζοντας το πεδίο κεφαλίδας <em>"
-"Content-Disposition</em> σε \"inline\" αντί του προκαθορισμένου "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Ενεργοποιήστε αυτή την επιλογή για να υποδείξετε στον πελάτη "
+"αλληλογραφίας του παραλήπτη να εμφανίσει αυτόματα (εμβόλιμα) αυτό το μέρος "
+"του μηνύματος, αντί της χρήσης εικονιδίου.</p><p>Τεχνικά, αυτό επιτυγχάνεται "
+"ορίζοντας το πεδίο κεφαλίδας <em>Content-Disposition</em> σε \"inline\" αντί "
+"του προκαθορισμένου \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9927,16 +9740,13 @@ msgstr "Υπογρα&φή αυτού του τμήματος"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ενεργοποιήστε αυτή την επιλογή αν θέλετε να υπογραφεί αυτό το τμήμα του "
-"μηνύματος.</p>"
-"<p>Η υπογραφή θα δημιουργηθεί με το κλειδί που έχει συσχετιστεί με την τρέχουσα "
-"ταυτότητα.</p></qt>"
+"<qt><p>Ενεργοποιήστε αυτή την επιλογή αν θέλετε να υπογραφεί αυτό το τμήμα "
+"του μηνύματος.</p><p>Η υπογραφή θα δημιουργηθεί με το κλειδί που έχει "
+"συσχετιστεί με την τρέχουσα ταυτότητα.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9944,14 +9754,12 @@ msgstr "Κρυπτογράφηση α&υτού του τμήματος"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ενεργοποιήστε αυτή την επιλογή αν θέλετε να κρυπτογραφηθεί αυτό το τμήμα του "
-"μηνύματος.</p>"
-"<p>Η κρυπτογράφηση θα γίνει για τους παραλήπτες του μηνύματος</p></qt>"
+"<qt><p>Ενεργοποιήστε αυτή την επιλογή αν θέλετε να κρυπτογραφηθεί αυτό το "
+"τμήμα του μηνύματος.</p><p>Η κρυπτογράφηση θα γίνει για τους παραλήπτες του "
+"μηνύματος</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9965,17 +9773,14 @@ msgstr "Φίλτρα POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Βρέθηκαν μηνύματα για φιλτράρισμα στο λογαριασμό POP: <b>%1</b>"
-"<p>Τα εμφανιζόμενα μηνύματα είναι μεγαλύτερα από το μέγιστο όριο που έχετε "
-"θέσει για αυτόν το λογαριασμό."
-"<br>Μπορείτε να διαλέξετε τι θέλετε να τα κάνετε επιλέγοντας το κατάλληλο "
-"κουμπί."
+"Βρέθηκαν μηνύματα για φιλτράρισμα στο λογαριασμό POP: <b>%1</b><p>Τα "
+"εμφανιζόμενα μηνύματα είναι μεγαλύτερα από το μέγιστο όριο που έχετε θέσει "
+"για αυτόν το λογαριασμό.<br>Μπορείτε να διαλέξετε τι θέλετε να τα κάνετε "
+"επιλέγοντας το κατάλληλο κουμπί."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10217,8 +10022,8 @@ msgstr "Φιλτράρισμα εισερχομένων μηνυμάτων γι�
 #: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr ""
-"Οι απομακρυσμένοι φάκελοι IMAP μπορούν να χρησιμοποιηθούν κατά το φιλτράρισμα "
-"σε φακέλους"
+"Οι απομακρυσμένοι φάκελοι IMAP μπορούν να χρησιμοποιηθούν κατά το "
+"φιλτράρισμα σε φακέλους"
 
 #: kmreaderwin.cpp:1264
 msgid "Automatically delete older mails on POP servers"
@@ -10231,40 +10036,39 @@ msgstr "Ο πελάτης αλληλογραφίας του K Desktop Environmen
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Ανάκτηση των περιεχομένων του φακέλου</h2>"
-"<p>Παρακαλώ περιμένετε . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Ανάκτηση των περιεχομένων του φακέλου</"
+"h2><p>Παρακαλώ περιμένετε . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Χωρίς σύνδεση</h2>"
-"<p>Το KMail βρίσκεται σε λειτουργία χωρίς σύνδεση. Κάντε κλικ <a "
-"href=\"kmail:goOnline\">εδώ</a> για να συνδεθείτε . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Χωρίς σύνδεση</h2><p>Το KMail βρίσκεται σε "
+"λειτουργία χωρίς σύνδεση. Κάντε κλικ <a href=\"kmail:goOnline\">εδώ</a> για "
+"να συνδεθείτε . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10272,16 +10076,14 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Καλώς ήλθατε στο KMail %1</h2>"
-"<p>Το KMail είναι το πρόγραμμα ηλεκτρονικού ταχυδρομείου για το K Desktop "
-"Environment. Έχει σχεδιασθεί για πλήρη συμβατότητα με τα πρότυπα ηλεκτρονικού "
-"ταχυδρομείου του διαδικτύου, συμπεριλαμβανομένων των ΜΙΜΕ, SMTP, POP3 και "
-"IMAP.</p>\n"
-"<ul>"
-"<li>Το KMail έχει πολλά δυνατά χαρακτηριστικά που περιγράφονται στην <a "
+"<h2 style='margin-top: 0px;'>Καλώς ήλθατε στο KMail %1</h2><p>Το KMail είναι "
+"το πρόγραμμα ηλεκτρονικού ταχυδρομείου για το K Desktop Environment. Έχει "
+"σχεδιασθεί για πλήρη συμβατότητα με τα πρότυπα ηλεκτρονικού ταχυδρομείου του "
+"διαδικτύου, συμπεριλαμβανομένων των ΜΙΜΕ, SMTP, POP3 και IMAP.</p>\n"
+"<ul><li>Το KMail έχει πολλά δυνατά χαρακτηριστικά που περιγράφονται στην <a "
 "href=\"%2\">τεκμηρίωση</a></li>\n"
-"<li>Η <a href=\"%3\">Αρχική σελίδα του KMail</A> παρέχει πληροφορίες για νέες "
-"εκδόσεις του προγράμματος</li></ul>\n"
+"<li>Η <a href=\"%3\">Αρχική σελίδα του KMail</A> παρέχει πληροφορίες για "
+"νέες εκδόσεις του προγράμματος</li></ul>\n"
 "%8\n"
 "<p>Μερικά από τα νέα χαρακτηριστικά σε αυτή την έκδοση του KMail είναι (σε "
 "σχέση με το KMail %4, που είναι τμήμα του TDE %5):</p>\n"
@@ -10293,20 +10095,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Η ομάδα του KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Παρακαλώ ασχοληθείτε ένα λεπτό με τη ρύθμιση του KMail στο "
-"Ρυθμίσεις-&gt;Ρύθμιση του KMail.\n"
+"<p>Παρακαλώ ασχοληθείτε ένα λεπτό με τη ρύθμιση του KMail στο Ρυθμίσεις-&gt;"
+"Ρύθμιση του KMail.\n"
 "Πρέπει να δημιουργήσετε τουλάχιστον μια προκαθορισμένη ταυτότητα και έναν "
 "λογαριασμό εξερχομένων.</p>\n"
 
@@ -10347,13 +10147,14 @@ msgstr "Προβολή συνημμένου: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
-"[KMail: To συνημμένο περιέχει δυαδικά δεδομένα. Προσπάθεια εμφάνισης του πρώτου "
-"χαρακτήρα.]\n"
-"[KMail: To συνημμένο περιέχει δυαδικά δεδομένα. Προσπάθεια εμφάνισης των πρώτων "
-"%n χαρακτήρων.]"
+"[KMail: To συνημμένο περιέχει δυαδικά δεδομένα. Προσπάθεια εμφάνισης του "
+"πρώτου χαρακτήρα.]\n"
+"[KMail: To συνημμένο περιέχει δυαδικά δεδομένα. Προσπάθεια εμφάνισης των "
+"πρώτων %n χαρακτήρων.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10369,8 +10170,8 @@ msgid ""
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 "Να ανοιχτεί το συνημμένο '%1';\n"
-"Σημειώστε ότι το άνοιγμα ενός συνημμένου μπορεί να περιορίσει την ασφάλεια του "
-"συστήματός σας!"
+"Σημειώστε ότι το άνοιγμα ενός συνημμένου μπορεί να περιορίσει την ασφάλεια "
+"του συστήματός σας!"
 
 #: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
@@ -10378,17 +10179,19 @@ msgstr "Άνοιγμα συνημμένου;"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Η διαγραφή ενός συνημμένου μπορεί να καταστήσει άκυρη την ψηφιακή υπογραφή "
 "αυτού του μηνύματος."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"Η τροποποίηση ενός συνημμένου μπορεί να καταστήσει άκυρη την ψηφιακή υπογραφή "
-"αυτού του μηνύματος."
+"Η τροποποίηση ενός συνημμένου μπορεί να καταστήσει άκυρη την ψηφιακή "
+"υπογραφή αυτού του μηνύματος."
 
 #: kmreaderwin.cpp:2956
 msgid "Attachments:"
@@ -10408,6 +10211,58 @@ msgstr "(ταιριάζει σε κάποιο από τα παρακάτω)"
 msgid "(match all of the following)"
 msgstr "(ταιριάζει με όλα τα παρακάτω)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Αναγνωσμένο"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Παλιό"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Διαγραμμένο"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Απαντημένο"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Προωθημένο"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Σε αναμονή"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Απεσταλμένο"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Παρακολουθούμενο"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Παραβλέφθηκε"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Προς υλοποίηση"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Έχει επισύναψη"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Πλήρες μήνυμα"
@@ -10485,25 +10340,25 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Η μετακίνηση του απεσταλμένου μηνύματος \"%1\" από τα \"εξερχόμενα\" στο φάκελο "
-"\"απεσταλμένα\" απέτυχε.\n"
+"Η μετακίνηση του απεσταλμένου μηνύματος \"%1\" από τα \"εξερχόμενα\" στο "
+"φάκελο \"απεσταλμένα\" απέτυχε.\n"
 "Πιθανή αιτία είναι η έλλειψη χώρου στο δίσκο ή η έλλειψη άδειας εγγραφής. "
 "Παρακαλώ διορθώστε το πρόβλημα και μετακινήστε το μήνυμα χειροκίνητα."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Δεν είναι δυνατή η αποστολή μηνυμάτων χωρίς διεύθυνση αποστολέα.\n"
-"Παρακαλώ ορίστε τη διεύθυνση email της ταυτότητας '%1' στο αντίστοιχο τμήμα του "
-"διαλόγου ρυθμίσεων και δοκιμάστε ξανά."
+"Παρακαλώ ορίστε τη διεύθυνση email της ταυτότητας '%1' στο αντίστοιχο τμήμα "
+"του διαλόγου ρυθμίσεων και δοκιμάστε ξανά."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10528,11 +10383,11 @@ msgstr "Αρχικοποίηση διαδικασίας αποστολής..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Επιλέξατε να αποστείλετε όλα τα μηνύματα που βρίσκονται σε αναμονή με τη χρήση "
-"ενός μεταφορέα που δε χρησιμοποιεί κρυπτογράφηση. Θέλετε να συνεχίσετε;"
+"Επιλέξατε να αποστείλετε όλα τα μηνύματα που βρίσκονται σε αναμονή με τη "
+"χρήση ενός μεταφορέα που δε χρησιμοποιεί κρυπτογράφηση. Θέλετε να συνεχίσετε;"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10556,16 +10411,17 @@ msgstr "Αποτυχία αποστολής (μερικών) μηνυμάτων
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Εγκατάλειψη της αποστολής:\n"
 "%1\n"
-"Το μήνυμα θα παραμείνει στο φάκελο 'εξερχόμενα' μέχρι να φτιάξετε το πρόβλημα "
-"(π.χ. μια κακοδιατυπωμένη διεύθυνση) ή να το αφαιρέσετε από το φάκελο "
-"'εξερχόμενα'.\n"
+"Το μήνυμα θα παραμείνει στο φάκελο 'εξερχόμενα' μέχρι να φτιάξετε το "
+"πρόβλημα (π.χ. μια κακοδιατυπωμένη διεύθυνση) ή να το αφαιρέσετε από το "
+"φάκελο 'εξερχόμενα'.\n"
 "\n"
 "Χρησιμοποιήθηκε το ακόλουθο πρωτόκολλο μεταφοράς:\n"
 "  %2"
@@ -10576,21 +10432,17 @@ msgstr "Εγκατάλειψη αποστολής."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Η αποστολή απέτυχε:</p>"
-"<p>%1</p>"
-"<p>Το μήνυμα θα παραμείνει στο φάκελο 'εξερχόμενα' μέχρι να φτιάξετε το "
-"πρόβλημα (π.χ. μια κακοδιατυπωμένη διεύθυνση) ή να το αφαιρέσετε από το φάκελο "
-"'εξερχόμενα'.</p>"
-"<p>Χρησιμοποιήθηκε το ακόλουθο πρωτόκολλο μεταφοράς:  %2</p>"
-"<p>Θέλετε να συνεχίσετε με την αποστολή των υπόλοιπων μηνυμάτων;</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Η αποστολή απέτυχε:</p><p>%1</p><p>Το μήνυμα θα παραμείνει στο φάκελο "
+"'εξερχόμενα' μέχρι να φτιάξετε το πρόβλημα (π.χ. μια κακοδιατυπωμένη "
+"διεύθυνση) ή να το αφαιρέσετε από το φάκελο 'εξερχόμενα'.</"
+"p><p>Χρησιμοποιήθηκε το ακόλουθο πρωτόκολλο μεταφοράς:  %2</p><p>Θέλετε να "
+"συνεχίσετε με την αποστολή των υπόλοιπων μηνυμάτων;</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10608,16 +10460,17 @@ msgstr "Εγκατάλειψη α&ποστολής"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Η αποστολή απέτυχε:\n"
 "%1\n"
-"Το μήνυμα θα παραμείνει στο φάκελο 'εξερχόμενα' μέχρι να φτιάξετε το πρόβλημα "
-"(π.χ. μια κακοδιατυπωμένη διεύθυνση) ή να το αφαιρέσετε από το φάκελο "
-"'εξερχόμενα'.\n"
+"Το μήνυμα θα παραμείνει στο φάκελο 'εξερχόμενα' μέχρι να φτιάξετε το "
+"πρόβλημα (π.χ. μια κακοδιατυπωμένη διεύθυνση) ή να το αφαιρέσετε από το "
+"φάκελο 'εξερχόμενα'.\n"
 "Χρησιμοποιήθηκε το ακόλουθο πρωτόκολλο μεταφοράς:\n"
 " %2"
 
@@ -10653,45 +10506,47 @@ msgstr "Το sendmail τερμάτισε αντικανονικά."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Πρέπει να δώσετε όνομα χρήστη και κωδικό πρόσβασης για να χρησιμοποιήσετε αυτόν "
-"το διακομιστή SMTP."
+"Πρέπει να δώσετε όνομα χρήστη και κωδικό πρόσβασης για να χρησιμοποιήσετε "
+"αυτόν το διακομιστή SMTP."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "Το %1 φαίνεται να εκτελείται σε κάποια άλλη οθόνη αυτού του μηχανήματος. Η "
-"εκτέλεση του %2 παραπάνω από μία φορά μπορεί να οδηγήσει σε απώλεια μηνυμάτων. "
-"Δεν πρέπει να εκτελέσετε το %1 εκτός κι αν είστε σίγουροι ότι δεν εκτελείται "
-"ήδη."
+"εκτέλεση του %2 παραπάνω από μία φορά μπορεί να οδηγήσει σε απώλεια "
+"μηνυμάτων. Δεν πρέπει να εκτελέσετε το %1 εκτός κι αν είστε σίγουροι ότι δεν "
+"εκτελείται ήδη."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "Το %1 φαίνεται να εκτελείται σε κάποια άλλη οθόνη αυτού του μηχανήματος. Η "
-"εκτέλεση των %1 και %2 ταυτόχρονα μπορεί να οδηγήσει σε απώλεια μηνυμάτων. Δεν "
-"πρέπει να εκτελέσετε το %2 εκτός κι αν είστε σίγουροι ότι το %1 δεν εκτελείται."
+"εκτέλεση των %1 και %2 ταυτόχρονα μπορεί να οδηγήσει σε απώλεια μηνυμάτων. "
+"Δεν πρέπει να εκτελέσετε το %2 εκτός κι αν είστε σίγουροι ότι το %1 δεν "
+"εκτελείται."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"Το %1 φαίνεται να εκτελείται στον %2. Η εκτέλεση του %1 παραπάνω από μία φορά "
-"μπορεί να οδηγήσει σε απώλεια μηνυμάτων. Δεν πρέπει να εκτελέσετε το %1 σε "
-"αυτόν τον υπολογιστή εκτός κι αν είστε σίγουροι ότι δεν εκτελείται ήδη στον %2."
+"Το %1 φαίνεται να εκτελείται στον %2. Η εκτέλεση του %1 παραπάνω από μία "
+"φορά μπορεί να οδηγήσει σε απώλεια μηνυμάτων. Δεν πρέπει να εκτελέσετε το %1 "
+"σε αυτόν τον υπολογιστή εκτός κι αν είστε σίγουροι ότι δεν εκτελείται ήδη "
+"στον %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "Το %1 φαίνεται να εκτελείται στον %3. Η εκτέλεση των %1 και %2 ταυτόχρονα "
 "μπορεί να οδηγήσει σε απώλεια μηνυμάτων. Δεν πρέπει να εκτελέσετε το %2 σε "
@@ -10707,6 +10562,10 @@ msgstr "Εκκίνηση του %1"
 msgid "Exit"
 msgstr "Έξοδος"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Νέα μηνύματα στο"
@@ -10733,16 +10592,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Το TDEWallet δεν είναι διαθέσιμο. Συνίσταται η χρήση του TDEWallet για τη "
 "διαχείριση των κωδικών πρόσβασής σας.\n"
 "Παρόλα αυτά, το KMail μπορεί να αποθηκεύσει τον κωδικό πρόσβασης στο αρχείο "
-"ρυθμίσεών του. Ο κωδικός πρόσβασης αποθηκεύεται σε καλυμμένη μορφή, αλλά αυτό "
-"σε θα πρέπει να θεωρηθεί ασφαλές σε περίπτωση που κάποιος αποκτήσει πρόσβαση "
-"στο αρχείο ρυθμίσεων.\n"
+"ρυθμίσεών του. Ο κωδικός πρόσβασης αποθηκεύεται σε καλυμμένη μορφή, αλλά "
+"αυτό σε θα πρέπει να θεωρηθεί ασφαλές σε περίπτωση που κάποιος αποκτήσει "
+"πρόσβαση στο αρχείο ρυθμίσεων.\n"
 "Θέλετε να αποθηκεύσετε τον κωδικό πρόσβασης του λογαριασμού '%1' στο αρχείο "
 "ρυθμίσεων;"
 
@@ -10816,9 +10676,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Μία εντολή που θα εκτελεστεί τοπικά, πριν την αποστολή της αλληλογραφίας. Αυτό, "
-"για παράδειγμα. μπορεί να χρησιμοποιηθεί για τη ρύθμιση του ssh. Αφήστε το κενό "
-"αν δε θέλετε να εκτελείται κάποια εντολή."
+"Μία εντολή που θα εκτελεστεί τοπικά, πριν την αποστολή της αλληλογραφίας. "
+"Αυτό, για παράδειγμα. μπορεί να χρησιμοποιηθεί για τη ρύθμιση του ssh. "
+"Αφήστε το κενό αν δε θέλετε να εκτελείται κάποια εντολή."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10826,12 +10686,12 @@ msgstr "Ο διακομιστής απαιτεί &ταυτοποίηση"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή αν ο διακομιστής SMTP σας, απαιτεί ταυτοποίηση "
-"πριν την αποδοχή της αλληλογραφίας. Αυτό είναι γνωστό ως 'Ταυτοποιημένο SMTP' ή "
-"απλά ASMTP."
+"Ενεργοποιήστε αυτή την επιλογή αν ο διακομιστής SMTP σας, απαιτεί "
+"ταυτοποίηση πριν την αποδοχή της αλληλογραφίας. Αυτό είναι γνωστό ως "
+"'Ταυτοποιημένο SMTP' ή απλά ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10851,15 +10711,14 @@ msgstr "&Αποστολή προσαρμοσμένου ονόματος υπολ
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Ενεργοποιήστε αυτή την επιλογή ώστε το KMail να χρησιμοποιήσει ένα "
-"προσαρμοσμένο όνομα υπολογιστή κατά τη δήλωσή του στο διακομιστή αλληλογραφίας."
-"<p>Αυτό είναι χρήσιμο αν το όνομα του υπολογιστή σας δεν είναι ορισμένο σωστά ή "
-"αν δε θέλετε να αποστείλετε το αληθινό του όνομα."
+"προσαρμοσμένο όνομα υπολογιστή κατά τη δήλωσή του στο διακομιστή "
+"αλληλογραφίας.<p>Αυτό είναι χρήσιμο αν το όνομα του υπολογιστή σας δεν είναι "
+"ορισμένο σωστά ή αν δε θέλετε να αποστείλετε το αληθινό του όνομα."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10869,8 +10728,8 @@ msgstr "Ό&νομα υπολογιστή:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Εισάγετε το όνομα υπολογιστή που θα χρησιμοποιεί το KMail κατά την αναγνώρισή "
-"του από το διακομιστή."
+"Εισάγετε το όνομα υπολογιστή που θα χρησιμοποιεί το KMail κατά την "
+"αναγνώρισή του από το διακομιστή."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10890,11 +10749,11 @@ msgstr "Επιτρέπονται μόνο τοπικά αρχεία."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Το πεδίο Διακομιστή δεν μπορεί να είναι κενό. Παρακαλώ εισάγετε το όνομα ή τη "
-"διεύθυνση IP του διακομιστή SMTP."
+"Το πεδίο Διακομιστή δεν μπορεί να είναι κενό. Παρακαλώ εισάγετε το όνομα ή "
+"τη διεύθυνση IP του διακομιστή SMTP."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10906,15 +10765,15 @@ msgstr "Σφάλμα κατά την εμφάνιση του φακέλου %1:
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"Η ακύρωση της εγγραφής τοπικά από φακέλους, σημαίνει ότι θα αφαιρεθούν όλες οι "
-"πληροφορίες που υπάρχουν τοπικά σε αυτούς. Οι φάκελοι δε θα αλλαχθούν στο "
-"διακομιστή. Πατήστε τώρα Ακύρωση αν θέλετε να γραφτούν όλες οι τοπικές αλλαγές "
-"στο διακομιστή, κάνοντας έλεγχο αλληλογραφίας."
+"Η ακύρωση της εγγραφής τοπικά από φακέλους, σημαίνει ότι θα αφαιρεθούν όλες "
+"οι πληροφορίες που υπάρχουν τοπικά σε αυτούς. Οι φάκελοι δε θα αλλαχθούν στο "
+"διακομιστή. Πατήστε τώρα Ακύρωση αν θέλετε να γραφτούν όλες οι τοπικές "
+"αλλαγές στο διακομιστή, κάνοντας έλεγχο αλληλογραφίας."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11134,35 +10993,28 @@ msgstr "&Επεξεργασία μηνύματος"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Οι πληροφορίες δομής που επεστράφησαν από το πρόσθετο κρυπτογράφησης δεν "
-"μπορούν να αναλυθούν σωστά. Το πρόσθετο ίσως είναι κατεστραμμένο.</p>"
-"<p>Παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματός σας.</p></qt>"
+"<qt><p>Οι πληροφορίες δομής που επεστράφησαν από το πρόσθετο κρυπτογράφησης "
+"δεν μπορούν να αναλυθούν σωστά. Το πρόσθετο ίσως είναι κατεστραμμένο.</"
+"p><p>Παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματός σας.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Δε βρέθηκε κανένα ενεργό πρόσθετο κρυπτογράφησης και ο ενσωματωμένος στο "
-"OpenPGP κώδικας δεν εκτελέστηκε επιτυχώς.</p>"
-"<p>Μπορείτε να κάνετε δύο πράγματα για να το διορθώσετε:</p>"
-"<ul>"
-"<li><em>είτε</em> ενεργοποιήστε ένα πρόσθετο χρησιμοποιώντας το διάλογο "
-"Ρυθμίσεις->Ρύθμιση του KMail->Πρόσθετα.</li>"
-"<li><em>ή</em> καθορίστε τις ρυθμίσεις του OpenPGP στην καρτέλα Ταυτότητα->"
-"Για προχωρημένους του ίδιου διαλόγου.</li></ul>"
+"OpenPGP κώδικας δεν εκτελέστηκε επιτυχώς.</p><p>Μπορείτε να κάνετε δύο "
+"πράγματα για να το διορθώσετε:</p><ul><li><em>είτε</em> ενεργοποιήστε ένα "
+"πρόσθετο χρησιμοποιώντας το διάλογο Ρυθμίσεις->Ρύθμιση του KMail->Πρόσθετα.</"
+"li><li><em>ή</em> καθορίστε τις ρυθμίσεις του OpenPGP στην καρτέλα Ταυτότητα-"
+">Για προχωρημένους του ίδιου διαλόγου.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11174,19 +11026,19 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Το σύστημα υποστήριξης του Chiasmus δεν υποστηρίζει τη συνάρτηση \"x-encrypt\". "
-"Παρακαλώ αναφέρετε αυτό το σφάλμα."
+"Το σύστημα υποστήριξης του Chiasmus δεν υποστηρίζει τη συνάρτηση \"x-encrypt"
+"\". Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
 #: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Η συνάρτηση \"x-encrypt\" δεν αποδέχεται τις αναμενόμενες παραμέτρους. Παρακαλώ "
-"αναφέρετε αυτό το σφάλμα."
+"Η συνάρτηση \"x-encrypt\" δεν αποδέχεται τις αναμενόμενες παραμέτρους. "
+"Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11194,8 +11046,8 @@ msgstr "Σφάλμα κρυπτογράφησης του Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Μη αναμενόμενη τιμή επιστροφής από το σύστημα υποστήριξης του Chiasmus: Η "
 "συνάρτηση \"x-encrypt\" δεν επέστρεψε ένα δυαδικό πίνακα. Παρακαλώ αναφέρετε "
@@ -11203,12 +11055,12 @@ msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Η εμβόλιμη μορφή κρυπτογράφησης μηνύματος του OpenPGP δεν υποστηρίζει υπογραφή "
-"ή κρυπτογράφηση συνημμένων.\n"
+"Η εμβόλιμη μορφή κρυπτογράφησης μηνύματος του OpenPGP δεν υποστηρίζει "
+"υπογραφή ή κρυπτογράφηση συνημμένων.\n"
 "Να χρησιμοποιηθεί η ξεπερασμένη εμβόλιμη μορφή;"
 
 #: messagecomposer.cpp:640
@@ -11252,7 +11104,8 @@ msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
 msgstr ""
-"Αυτές είναι οι συγκρουόμενες προτιμήσεις υπογραφής για αυτούς τους παραλήπτες.\n"
+"Αυτές είναι οι συγκρουόμενες προτιμήσεις υπογραφής για αυτούς τους "
+"παραλήπτες.\n"
 "Να υπογραφεί αυτό το μήνυμα;"
 
 #: messagecomposer.cpp:804
@@ -11260,8 +11113,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Ζητήσατε την υπογραφή του μηνύματος, αλλά δεν έχει οριστεί κανένα έγκυρο κλειδί "
-"υπογραφής για αυτή την ταυτότητα."
+"Ζητήσατε την υπογραφή του μηνύματος, αλλά δεν έχει οριστεί κανένα έγκυρο "
+"κλειδί υπογραφής για αυτή την ταυτότητα."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11278,8 +11131,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Κάποια τμήματα αυτού του μηνύματος δε θα υπογραφούν.\n"
-"Η αποστολή μερικώς υπογεγραμμένων μηνυμάτων μπορεί να έρχεται σε σύγκρουση με "
-"την πολιτική του δικτυακού τόπου.\n"
+"Η αποστολή μερικώς υπογεγραμμένων μηνυμάτων μπορεί να έρχεται σε σύγκρουση "
+"με την πολιτική του δικτυακού τόπου.\n"
 "Να υπογραφούν όλα τα τμήματα;"
 
 #: messagecomposer.cpp:827
@@ -11319,8 +11172,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Η εξέταση των προτιμήσεων υπογραφής του παραλήπτη έδειξε ότι θα πρέπει να "
@@ -11358,8 +11211,9 @@ msgstr "&Να μην κρυπτογραφηθεί"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Ζητήσατε την κρυπτογράφηση του μηνύματος, και να σας αποσταλεί ένα "
 "κρυπτογραφημένο αντίγραφο, αλλά δεν έχει οριστεί κανένα έγκυρο και έμπιστο "
@@ -11372,13 +11226,13 @@ msgstr "Αποστολή μη κρυπτογραφημένου;"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Κάποια τμήματα αυτού του μηνύματος δε θα κρυπτογραφηθούν.\n"
-"Η αποστολή μερικώς κρυπτογραφημένων μηνυμάτων μπορεί να έρχεται σε σύγκρουση με "
-"την πολιτική του δικτυακού τόπου και/ή να οδηγήσει στη διαρροή ευαίσθητων "
+"Η αποστολή μερικώς κρυπτογραφημένων μηνυμάτων μπορεί να έρχεται σε σύγκρουση "
+"με την πολιτική του δικτυακού τόπου και/ή να οδηγήσει στη διαρροή ευαίσθητων "
 "δεδομένων.\n"
 "Να κρυπτογραφηθούν όλα τα τμήματα;"
 
@@ -11390,8 +11244,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Αυτό το μήνυμα δε θα κρυπτογραφηθεί.\n"
-"Η αποστολή μερικώς κρυπτογραφημένων μηνυμάτων μπορεί να έρχεται σε σύγκρουση με "
-"την πολιτική του δικτυακού τόπου και/ή να οδηγήσει στη διαρροή ευαίσθητων "
+"Η αποστολή μερικώς κρυπτογραφημένων μηνυμάτων μπορεί να έρχεται σε σύγκρουση "
+"με την πολιτική του δικτυακού τόπου και/ή να οδηγήσει στη διαρροή ευαίσθητων "
 "δεδομένων.\n"
 "Να κρυπτογραφηθούν όλα τα τμήματα;"
 
@@ -11403,64 +11257,58 @@ msgstr "Κρυπτογράφηση όλων των τμ&ημάτων"
 msgid "Unencrypted Message Warning"
 msgstr "Προειδοποίηση μη κρυπτογραφημένου μηνύματος"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Σφάλμα: Το σύστημα υποστήριξης δεν επέστρεψε κρυπτογραφημένα δεδομένα.</p>"
-"<p>Παρακαλώ αναφέρετε αυτό το σφάλμα:"
-"<br>%2</p></qt>"
+"<qt><p>Σφάλμα: Το σύστημα υποστήριξης δεν επέστρεψε κρυπτογραφημένα δεδομένα."
+"</p><p>Παρακαλώ αναφέρετε αυτό το σφάλμα:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Δε υπάρχουν όλοι οι χαρακτήρες στην επιλεγμένη κωδικοποίηση."
-"<br>"
-"<br>Να σταλεί το μήνυμα όπως είναι;</qt>"
+"<qt>Δε υπάρχουν όλοι οι χαρακτήρες στην επιλεγμένη κωδικοποίηση.<br><br>Να "
+"σταλεί το μήνυμα όπως είναι;</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Κάποιοι χαρακτήρες θα χαθούν"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Απώλεια χαρακτήρων"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Τροποποίηση κωδικοποίησης"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Αυτό το μήνυμα δεν μπόρεσε να υπογραφεί, αφού το επιλεγμένο σύστημα υποστήριξης "
-"φαίνεται να μην υποστηρίζει την υπογραφή του. Αυτό δε θα έπρεπε να συμβεί. "
-"Παρακαλώ αναφέρετε αυτό το σφάλμα."
+"Αυτό το μήνυμα δεν μπόρεσε να υπογραφεί, αφού το επιλεγμένο σύστημα "
+"υποστήριξης φαίνεται να μην υποστηρίζει την υπογραφή του. Αυτό δε θα έπρεπε "
+"να συμβεί. Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Αυτό το μήνυμα δεν μπόρεσε να υπογραφεί, αφού το επιλεγμένο σύστημα υποστήριξης "
-"φαίνεται να μην υποστηρίζει την υπογραφή του. Αυτό δε θα έπρεπε να συμβεί. "
-"Παρακαλώ αναφέρετε αυτό το σφάλμα."
+"Αυτό το μήνυμα δεν μπόρεσε να υπογραφεί, αφού το επιλεγμένο σύστημα "
+"υποστήριξης φαίνεται να μην υποστηρίζει την υπογραφή του. Αυτό δε θα έπρεπε "
+"να συμβεί. Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Λειτουργία καταγραφής του GnuPG Audit για υπογραφή"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
@@ -11468,24 +11316,25 @@ msgstr ""
 "Η λειτουργία υπογραφής απέτυχε. Σιγουρευτείτε ότι το πρόγραμμα gpg-agent "
 "εκτελείται στο υπόβαθρο."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Αυτό το μήνυμα δεν μπόρεσε να κρυπτογραφηθεί, αφού το επιλεγμένο σύστημα "
 "υποστήριξης φαίνεται να μην υποστηρίζει την κρυπτογράφησή του. Αυτό δε θα "
 "έπρεπε να συμβεί. Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Λειτουργία καταγραφής του GnuPG Audit για κρυπτογράφηση"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Αυτό το μήνυμα δεν μπόρεσε να υπογραφεί και να κρυπτογραφηθεί, αφού το "
 "επιλεγμένο σύστημα υποστήριξης φαίνεται να μην υποστηρίζει τον συνδυασμό "
@@ -11511,13 +11360,13 @@ msgstr "Μορφή &θυρίδας αλληλογραφίας:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Επιλέξτε αν θέλετε να αποθηκεύονται τα μηνύματα αυτού του φακέλου σε ένα αρχείο "
-"ανά μήνυμα (maildir) ή όλα μαζί σε ένα μεγάλο αρχείο (mbox). Το KMail "
+"Επιλέξτε αν θέλετε να αποθηκεύονται τα μηνύματα αυτού του φακέλου σε ένα "
+"αρχείο ανά μήνυμα (maildir) ή όλα μαζί σε ένα μεγάλο αρχείο (mbox). Το KMail "
 "χρησιμοποιεί τη μορφή maildir εξ ορισμού και αυτή η επιλογή θα χρειαστεί να "
 "αλλαχθεί σε σπάνιες περιπτώσεις. Αν δεν είστε σίγουροι, αφήστε το όπως είναι."
 
@@ -11528,13 +11377,13 @@ msgstr "Ο φάκελος &περιέχει:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Επιλέξτε αν ο φάκελος θα χρησιμοποιηθεί για την αποθήκευση μηνυμάτων "
 "αλληλογραφίας ή αντικειμένων groupware, όπως εργασίες και σημειώσεις. Το "
-"προκαθορισμένο είναι χρήση για μηνύματα αλληλογραφίας. Αν δεν είστε σίγουροι, "
-"αφήστε το όπως είναι."
+"προκαθορισμένο είναι χρήση για μηνύματα αλληλογραφίας. Αν δεν είστε "
+"σίγουροι, αφήστε το όπως είναι."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11556,8 +11405,8 @@ msgstr "Δεν έχει καθορισθεί όνομα"
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
-"<qt>Αδύνατη η δημιουργία του φακέλου <b>%1</b>, επειδή ο φάκελος ήδη "
-"υπάρχει.</qt>"
+"<qt>Αδύνατη η δημιουργία του φακέλου <b>%1</b>, επειδή ο φάκελος ήδη υπάρχει."
+"</qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -11575,8 +11424,7 @@ msgstr "Διαφορετικά αποτελέσματα για τις υπογρ
 msgid "The crypto engine returned no cleartext data."
 msgstr "Η μηχανή κρυπτογράφησης δεν επέστρεψε δεδομένα απλού κειμένου."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Κατάσταση: "
 
@@ -11605,8 +11453,8 @@ msgstr "Δε βρέθηκε πρόσθετο %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Το μήνυμα είναι υπογεγραμμένο, αλλά η εγκυρότητα της υπογραφής δεν μπορεί να "
 "επαληθευτεί. <br />Αιτία: %1"
@@ -11631,7 +11479,8 @@ msgstr "Τα κρυπτογραφημένα δεδομένα δεν εμφανί
 #: objecttreeparser.cpp:889
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr ""
-"Το πρόσθετο κρυπτογράφησης \"%1\" δεν μπόρεσε να αποκρυπτογραφήσει τα δεδομένα."
+"Το πρόσθετο κρυπτογράφησης \"%1\" δεν μπόρεσε να αποκρυπτογραφήσει τα "
+"δεδομένα."
 
 #: objecttreeparser.cpp:892
 #, c-format
@@ -11645,27 +11494,27 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Σημείωση:</b> Αυτό το μήνυμα HTML μπορεί να περιέχει εξωτερικές αναφορές σε "
-"εικόνες κλπ. Για λόγους ασφαλείας οι εξωτερικές αναφορές δε φορτώνονται. Αν "
-"εμπιστεύεστε τον αποστολέα αυτού του μηνύματος μπορείτε να τις φορτώσετε, γι' "
-"αυτό το μήνυμα, <a href=\"kmail:loadExternal\"> κάνοντας κλικ εδώ</a>."
+"<b>Σημείωση:</b> Αυτό το μήνυμα HTML μπορεί να περιέχει εξωτερικές αναφορές "
+"σε εικόνες κλπ. Για λόγους ασφαλείας οι εξωτερικές αναφορές δε φορτώνονται. "
+"Αν εμπιστεύεστε τον αποστολέα αυτού του μηνύματος μπορείτε να τις φορτώσετε, "
+"γι' αυτό το μήνυμα, <a href=\"kmail:loadExternal\"> κάνοντας κλικ εδώ</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Σημείωση:</b> Αυτό είναι ένα μήνυμα HTML. Για λόγους ασφαλείας εμφανίζεται "
-"μόνο ο πηγαίος κώδικας HTML. Αν εμπιστεύεστε τον αποστολέα αυτού του μηνύματος "
-"μπορείτε να ενεργοποιήσετε την προβολή μορφοποιημένης HTML γι' αυτό το μήνυμα "
-"<a href=\"kmail:showHTML\"> κάνοντας κλικ εδώ</a>."
+"<b>Σημείωση:</b> Αυτό είναι ένα μήνυμα HTML. Για λόγους ασφαλείας "
+"εμφανίζεται μόνο ο πηγαίος κώδικας HTML. Αν εμπιστεύεστε τον αποστολέα αυτού "
+"του μηνύματος μπορείτε να ενεργοποιήσετε την προβολή μορφοποιημένης HTML γι' "
+"αυτό το μήνυμα <a href=\"kmail:showHTML\"> κάνοντας κλικ εδώ</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11918,8 +11767,8 @@ msgstr "αποθηκεύτηκε: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Η διεύθυνση αλληλογραφίας του αποστολέα δεν είναι αποθηκευμένη στο %1 που "
 "χρησιμοποιήθηκε για υπογραφή, οπότε δεν μπορεί να γίνει σύγκριση με τη "
@@ -12038,14 +11887,15 @@ msgstr "Μήνυμα σφάλματος του tdeioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Ο διακομιστής POP3 σας (Λογαριασμός: %1) δεν υποστηρίζει την εντολή UIDL. Αυτή "
-"η εντολή απαιτείται προκειμένου να καθορίζεται αξιόπιστα ποια από τα μηνύματα "
-"στο διακομιστή έχει ήδη δει το KMail.\n"
+"Ο διακομιστής POP3 σας (Λογαριασμός: %1) δεν υποστηρίζει την εντολή UIDL. "
+"Αυτή η εντολή απαιτείται προκειμένου να καθορίζεται αξιόπιστα ποια από τα "
+"μηνύματα στο διακομιστή έχει ήδη δει το KMail.\n"
 "Συνεπώς, η δυνατότητα διατήρησης των μηνυμάτων στο διακομιστή δε θα δουλεύει "
 "σωστά."
 
@@ -12067,7 +11917,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Ανάκτηση μηνύματος %1 από %2 (%3 από %4 KB) για %5 @%6 (%7 KB παραμένουν στο "
 "διακομιστή)."
@@ -12086,1949 +11937,15 @@ msgstr "Μη έγκυρη απάντηση από το διακομιστή"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Ο διακομιστής σας δεν υποστηρίζει την εντολή TOP. Συνεπώς δεν είναι δυνατή η "
 "λήψη των κεφαλίδων των μεγάλων μηνυμάτων πριν τη λήψη τους."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Μετάβαση"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Φάκελος"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Μήνυμα"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Ειδική απάντηση"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Προώ&θηση"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Γραμμή εργαλείων HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Υπογραφή"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Αυτόματη &υπογραφή μηνυμάτων"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Όταν αυτή η επιλογή είναι ενεργοποιημένη, όλα τα μηνύματα που στέλνετε θα "
-"υπογράφονται εξ ορισμού. Φυσικά θα είναι δυνατό να απενεργοποιήσετε την "
-"υπογραφή ανεξάρτητα για κάθε μήνυμα."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Κρυπτογράφηση"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Κατά την κρυπτογράφηση email, να γίνεται κρυ&πτογράφηση στο πιστοποιητικό της "
-"ταυτότητάς μου"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Όταν αυτή η επιλογή είναι ενεργοποιημένη, το μήνυμα/αρχείο δε θα κρυπτογραφηθεί "
-"μόνο με το δημόσιο κλειδί του παραλήπτη, αλλά και με το δικό σας. Αυτό θα σας "
-"δώσει τη δυνατότητα μπορείτε να αποκρυπτογραφήσετε το μήνυμα/αρχείο στο μέλλον, "
-"πράγμα που συνήθως είναι καλή ιδέα."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Εμφάνιση &υπογεγραμμένου/κρυπτογραφημένου κειμένου μετά τη σύνταξή του"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Όταν αυτή η επιλογή είναι ενεργοποιημένη, το υπογεγραμμένο/κρυπτογραφημένο "
-"κείμενου θα εμφανίζεται σε ένα ξεχωριστό παράθυρο, για να το ελέγξετε πριν την "
-"αποστολή του. Αυτό είναι χρήσιμο μόνο όταν ελέγχετε τη λειτουργία του "
-"συστήματος κρυπτογράφησής σας."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Αποθήκευση των απεσταλμένων μηνυμάτων &κρυπτογραφημένα"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-"Ενεργοποιήστε το για να αποθηκεύετε τα κρυπτογραφημένα μηνύματα ως έχουν"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Αποθήκευση κρυπτογραφημένων μηνυμάτων ως έχουν</h1>\n"
-"Όταν αυτή η επιλογή είναι ενεργοποιημένη, τα απεσταλμένα μηνύματα αποθηκεύονται "
-"κρυπτογραφημένα, όπως ακριβώς στάλθηκαν. Αυτό δεν προτείνεται, αφού αν κάποιο "
-"από τα απαραίτητα πιστοποιητικά λήξει, δε θα μπορείτε πλέον να τα διαβάσετε.\n"
-"<p>\n"
-"Παρόλα αυτά, ίσως ισχύουν τοπικοί κανόνες που απαιτούν την ενεργοποίηση αυτής "
-"της επιλογής. Αν δεν είστε σίγουροι, ρωτήστε το διαχειριστή σας.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Εμφάνιση των κλειδιών κρυπτογράφησης &για έγκριση"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Όταν αυτή η επιλογή είναι ενεργοποιημένη, η εφαρμογή θα σας εμφανίζει τη λίστα "
-"των δημοσίων κλειδιών από την οποία θα μπορείτε να επιλέξετε αυτό που θα "
-"χρησιμοποιηθεί για την κρυπτογράφηση. Αν είναι απενεργοποιημένη, ο διάλογος θα "
-"εμφανίζεται μόνο όταν η εφαρμογή δεν μπορεί να καθορίσει το σωστό κλειδί ή αν "
-"υπάρχουν περισσότερα του ενός που μπορούν να χρησιμοποιηθούν."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Αυτόματη κρυπτογράφηση μηνυμάτων &αν γίνεται"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Όταν αυτή η επιλογή είναι ενεργοποιημένη, κάθε μήνυμα που στέλνετε θα "
-"κρυπτογραφείται εφ' όσον η κρυπτογράφηση είναι δυνατή και επιθυμητή. Φυσικά θα "
-"είναι δυνατό να απενεργοποιήσετε την αυτόματη κρυπτογράφηση ανεξάρτητα για κάθε "
-"μήνυμα."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Να μη γίνεται υπογραφή/κρυπτογράφηση κατά την απο&θήκευση ως προσχέδιο"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Πώς λειτουργεί;"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Προς: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Κοινοποίηση: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Γενικό"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Απάντηση"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Απάντηση σε όλους"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Προώθηση"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Συντόμε&υση:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Τύπ&ος προτύπου:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Ιδιότητες φακέλου"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Ο φάκελος περιέχει μια &λίστα ταχυδρομείου"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Διεύθυνση λίστας:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Κανονικό:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Μη &αναγνωσμένο:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Λήξη μηνύματος"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Λήξη μετά από:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Λήξη &αναγνωσμένων μηνυμάτων"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Λήξη &μετά από:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Λήξη μη &αναγνωσμένων μηνυμάτων"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Ημέρα(ες)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Εβδομάδα(ες)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Μήνα(ες)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Για προχωρημένους"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Ταυτότητα αποστολέα:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Μορφή &αποθήκευσης:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Εμφανίσεις λίστας:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Επαλήθευση πιστοποιητικών με χρήση CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Αν είναι ενεργοποιημένη αυτή η επιλογή, για την επαλήθευση των πιστοποιητικών "
-"S/MIME θα χρησιμοποιούνται λίστες ανάκλησης πιστοποιητικών (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Δικτυακή επαλήθευση πιστοποιητικών (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Αν είναι ενεργοποιημένη αυτή η επιλογή, θα γίνεται δικτυακή επαλήθευση των "
-"πιστοποιητικών S/MIME με χρήση του δικτυακού πρωτοκόλλου κατάστασης "
-"πιστοποιητικών (OCSP). Συμπληρώστε το URL του εξυπηρετητή OCSP."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Δικτυακή επαλήθευση πιστοποιητικού"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL εξυπηρετητή OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Εισάγετε εδώ τη διεύθυνση του εξυπηρετητή για τη δικτυακή επαλήθευση "
-"πιστοποιητικών (εξυπηρετητής OCSP). Το URL συνήθως αρχίζει με http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Υπογραφή εξυπηρετητή OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Παράβλεψη του URL υπηρεσίας των πιστοποιητικών"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Να μην ελέγχονται οι πολιτικές πιστοποιητικών"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Εξ ορισμού το GnuPG χρησιμοποιεί το αρχείο ~/.gnupg/policies.txt για να ελέγχει "
-"αν μία πολιτική πιστοποιητικού είναι αποδεκτή. Αν ενεργοποιηθεί αυτή η επιλογή, "
-"αυτός ο έλεγχος δε θα γίνεται."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Να μη συμβουλεύεσαι ποτέ ένα CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Αν είναι ενεργοποιημένη αυτή η επιλογή, δεν χρησιμοποιούνται λίστες ανάκλησης "
-"πιστοποιητικών (CRL) για την επαλήθευση πιστοποιητικών S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Ανάκτηση πιστοποιητικών εκδότη που δεν υπάρχουν"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Αν είναι ενεργοποιημένη αυτή η επιλογή, γίνεται λήψη των πιστοποιητικών εκδότη "
-"που δεν υπάρχουν, όποτε αυτό απαιτείται (ισχύει και για τις δύο μεθόδους "
-"επαλήθευσης, CRLs και OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Αιτήσεις HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Να μη γίνονται αιτήσεις HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Πλήρη απενεργοποίηση της χρήσης του HTTP για S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Χρήση αυτού του διαμεσολαβητή για αιτήσεις HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Χρήση του διαμεσολαβητή HTTP του συστήματος:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Αν ενεργοποιηθεί αυτή η επιλογή, η τιμή του διαμεσολαβητή HTTP που εμφανίζεται "
-"στα δεξιά (η οποία προέρχεται από τη μεταβλητή περιβάλλοντος http_proxy) θα "
-"χρησιμοποιείται για όλες τις HTTP αιτήσεις."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Εισάγετε εδώ την τοποθεσία του διαμεσολαβητή HTTP, ο οποίος θα χρησιμοποιηθεί "
-"για όλες τις αιτήσεις που έχουν σχέση με S/MIME. Πρέπει να είναι της μορφής "
-"υπολογιστής:θύρα· για παράδειγμα myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Παράβλεψη σημείου διανομής HTTP CRL πιστοποιητικών"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Κατά την αναζήτηση της τοποθεσίας μιας CRL, το υπό έλεγχο πιστοποιητικό "
-"περιέχει καταχωρήσεις γνωστές ως \"Σημεία διανομής CRL\" (DP), τα οποία είναι "
-"URL περιγραφής της μεθόδου πρόσβασης του URL. Χρησιμοποιείται η πρώτη "
-"καταχώρηση DP. Με αυτή την επιλογή, όλες οι καταχωρήσεις που χρησιμοποιούν το "
-"HTTP παραβλέπονται κατά την αναζήτηση κατάλληλου σημείου διανομής (DP)."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Αιτήσεις LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Να μη γίνονται αιτήσεις LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Πλήρης απενεργοποίηση χρήσης του LDAP για S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Παράβλεψη σημείου διανομής LDAP CRL πιστοποιητικών"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Κατά την αναζήτηση της τοποθεσίας μιας CRL, το υπό έλεγχο πιστοποιητικό "
-"περιέχει καταχωρήσεις γνωστές ως \"Σημεία διανομής CRL\" (DP), τα οποία είναι "
-"URL περιγραφής της μεθόδου πρόσβασης του URL. Χρησιμοποιείται η πρώτη "
-"καταχώρηση DP. Με αυτή την επιλογή, όλες οι καταχωρήσεις που χρησιμοποιούν το "
-"LDAP παραβλέπονται κατά την αναζήτηση κατάλληλου σημείου διανομής (DP)."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Πρωτεύων εξυπηρετητής για αιτήσεις LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Εισάγοντας εδώ έναν εξυπηρετητή LDAP όλες τις αιτήσεις LDAP θα μεταβιβάζονται "
-"πρώτα σε αυτόν.Πιο συγκεκριμένα, αυτή η επιλογή παραβλέπει τον καθορισμένο "
-"εξυπηρετητή και θύρα ενός LDAP URL και θα χρησιμοποιηθεί αν αυτά δεν υπάρχουν "
-"στο URL. Άλλοι εξυπηρετητές LDAP θα χρησιμοποιηθούν αν η σύνδεση με το "
-"\"διαμεσολαβητή\" αποτύχει.\n"
-"Η σύνταξη είναι \"ΕΞΥΠΗΡΕΤΗΤΗΣ\" ή \"ΕΞΥΠΗΡΕΤΗΤΗΣ:ΘΥΡΑ\". Αν δεν οριστεί η "
-"ΘΥΡΑ, θα χρησιμοποιηθεί η 389 (η τυπική θύρα LDAP)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Προσθήκη δείγματος"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Προσθήκη"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Δείγμα:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Ομάδα:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Ρυθμίσεις δειγμάτων"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Συμβουλές εργαλείου"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Εμφάνιση κειμένου δείγμα&τος σε συμβουλή εργαλείου"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Ορίζει αν μια συμβουλή εργαλείου θα εμφανίζεται με το κείμενο από τη γραμμή με "
-"σελιδοδείκτη"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Μεταβλητές"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Μέθοδος εισαγωγής μεταβλητών"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Απλό παράθυρο διαλόγου για κάθε μεταβλητή μέσα στο δείγμα"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Ένα παράθυρο διαλόγου θα εμφανιστεί για κάθε μεταβλητή μέσα στο δείγμα"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Ένα παράθυρο διαλόγου για όλες τις μεταβλητές μέσα σε ένα δείγμα"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Ένα παράθυρο διαλόγου θα εμφανιστεί όπου θα μπορείτε να εισάγετε τιμές για όλες "
-"τις μεταβλητές μέσα σε ένα δείγμα"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Οριοθέτης:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Απάντηση στον αποστολέα"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Απάντηση σε όλους/ Απάντηση σε λίστα"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Προώθηση μηνύματος"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Προειδοποίηση κατά την προσπάθεια αποστολής αν&υπόγραφων μηνυμάτων"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή για να προειδοποιείστε κατά την αποστολή "
-"ανυπόγραφων μηνυμάτων."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση σε προσπάθεια αποστολής ανυπόγραφων μηνυμάτων</h1>\n"
-"Αν ενεργοποιήσετε αυτή την επιλογή, θα προειδοποιείστε όταν προσπαθείτε να "
-"στείλετε κάποιο τμήμα ή ολόκληρο το μήνυμα χωρίς υπογραφή.\n"
-"<p>\n"
-"Προτείνεται η ενεργοποίηση αυτής της επιλογής για τη μέγιστη ακεραιότητα των "
-"μηνυμάτων σας.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Προειδοποίηση σε προσπά&θεια αποστολής μη κρυπτογραφημένων μηνυμάτων"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή για να προειδοποιείστε κατά την αποστολή μη "
-"κρυπτογραφημένων μηνυμάτων."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση σε προσπάθεια αποστολής μη κρυπτογραφημένων μηνυμάτων</h1>\n"
-"Αν ενεργοποιήσετε αυτή την επιλογή, θα προειδοποιείστε όταν προσπαθείτε να "
-"στείλετε κάποιο τμήμα ή ολόκληρο το μήνυμα χωρίς κρυπτογράφηση.\n"
-"<p>\n"
-"Προτείνεται η ενεργοποίηση αυτής της επιλογής για τη μέγιστη ακεραιότητα των "
-"μηνυμάτων σας.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Προειδοποίηση αν η διεύθυνση email του παραλήπτη &δε βρίσκεται στο "
-"πιστοποιητικό"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή για να προειδοποιείστε αν η διεύθυνση δεν "
-"υπάρχει στο πιστοποιητικό"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση αν η διεύθυνση Email του παραλήπτη δεν υπάρχει στο "
-"πιστοποιητικό</h1>\n"
-"Αν ενεργοποιήσετε αυτήν επιλογή, θα λαμβάνετε μία προειδοποίηση αν η διεύθυνση "
-"email του παραλήπτη δεν περιέχεται στο πιστοποιητικό κρυπτογράφησης.\n"
-"<p>\n"
-"Προτείνεται η ενεργοποίηση αυτής της επιλογής για μέγιστη ασφάλεια.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Προειδοποίηση αν τα πιστοποιητικά/κλειδιά λήγουν σύντομα (ρύθμιση χρονικών "
-"ορίων παρακάτω)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Χρήση για υπογραφή"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Χρήση για κρυπτογράφηση"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " ημέρες"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Επιλέξτε εδώ τον αριθμό ημερών"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση λήξης πιστοποιητικού υπογραφής</h1>\n"
-"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό υπογραφής "
-"σας θα παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
-"<p>\n"
-"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση λήξης πιστοποιητικού κρυπτογράφησης</h1>\n"
-"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό "
-"κρυπτογράφησης θα παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
-"<p>\n"
-"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση αν ένα πιστοποιητικό της ακολουθίας λήξει</h1>\n"
-"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο όλα τα πιστοποιητικά της "
-"ακολουθίας θα παραμένουν έγκυρα και δε θα εμφανίζουν προειδοποιήσεις.\n"
-"<p>\n"
-"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση λήξης πιστοποιητικού CA</h1>\n"
-"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό CA θα "
-"παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
-"<p>\n"
-"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Προειδοποίηση λήξης πιστοποιητικού ρίζας</h1>\n"
-"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό ρίζας θα "
-"παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
-"<p>\n"
-"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Για πιστοποιητικά ρίζας:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Για ενδιάμεσα πιστοποιητικά CA:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Για πιστοποιητικά/κλειδιά χρήστη:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-"Ενεργοποίηση ξανά όλων των μηνυμάτων που έχουν απενεργοποιηθεί με την επιλογή "
-"\"Να μην ερωτηθώ ξανά\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Περιεχόμενα προτύπου"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Συντόμευση προτύπου"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Τύπος προτύπου"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Αποστολή μηνυμάτων σε αναμονή κατά τον έλεγχο αλληλογραφίας"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Επιλέξτε αν θέλετε το KMail να αποστέλλει πάντα τα μηνύματα που βρίσκονται "
-"στο φάκελο εξερχόμενα κατά το χειροκίνητο έλεγχο. Μπορείτε ακόμη να ορίσετε να "
-"μη γίνεται ποτέ αυτόματη αποστολή μηνυμάτων. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Αυτόματη μετακίνηση μη συγχρονισμένων μηνυμάτων από φακέλους με μη επαρκή "
-"δικαιώματα"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Αν υπάρχουν νέα μηνύματα σε ένα φάκελο, που δεν έχουν αποσταλεί ακόμα στο "
-"διακομιστή, και δεν έχετε επαρκή δικαιώματα στο φάκελο για να τα αποστείλετε "
-"τώρα, τα μηνύματα θα μετακινηθούν αυτομάτως σε ένα φάκελο \"Χάθηκαν+Βρέθηκαν\"."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Επιτρέπονται τοπικές σημαίες σε φακέλους μόνο ανάγνωσης"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Αυτή η ρύθμιση επιτρέπει στους διαχειριστές να ορίζουν μία ελάχιστη καθυστέρηση "
-"μεταξύ δύο ελέγχων αλληλογραφίας.\"\n"
-"           \"Ο χρήστης δε θα μπορεί να επιλέξει τιμή μικρότερη από αυτήν που θα "
-"τεθεί εδώ."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Ο πιο πρόσφατα επιλεγμένος φάκελος στο διάλογο επιλογής φακέλου."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Αγνόηση του umask του χρήστη και χρήση \"εγγραφή-ανάγνωση μόνο για το χρήστη\""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Πολιτική εμφάνισης του εικονιδίου πλαισίου συστήματος"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Κλείσιμο της εφαρμογής κατά το κλείσιμο του κύριου παραθύρου, ακόμη και αν "
-"υπάρχει ενεργό εικονίδιο στο πλαίσιο του συστήματος."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Λεπτομερής ειδοποίηση νέας αλληλογραφίας"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Αν είναι ενεργοποιημένη αυτή η επιλογή, στην ειδοποίηση νέας αλληλογραφίας θα "
-"εμφανίζεται κάθε φάκελος που περιέχει νέα μηνύματα. Διαφορετικά θα εμφανίζεται "
-"ένα απλό μήνυμα ειδοποίησης."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Ορισμός επεξεργαστή:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Χρήση εξωτερικού επεξεργαστή για τη σύνταξη μηνυμάτων"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"Το κατώφλι προειδοποίησης του χρήστη όταν ένας φάκελος πλησιάζει στο όριο "
-"μεγέθους του."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Ενεργοποίηση της λειτουργικότητας groupware"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Χωρισμός των κεφαλίδων Από:/Προς: στις απαντήσεις σε απαντήσεις"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Το Microsoft Outlook έχει κάποιες ελλείψεις στην υλοποίηση του προτύπου "
-"iCalendar και αυτή η επιλογή διορθώνει μία από αυτές. Αν παρουσιαστούν "
-"προβλήματα με χρήστες του Outlook οι οποίοι δεν μπορούν να λάβουν τις "
-"απαντήσεις σας, ενεργοποιήστε αυτή την επιλογή."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Αποστολή προσκλήσεων groupware στο κύριο σώμα"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Το Microsoft Outlook έχει κάποιες ελλείψεις στην υλοποίηση του προτύπου "
-"iCalendar και αυτή η επιλογή διορθώνει μία από αυτές. Αν παρουσιαστούν "
-"προβλήματα με χρήστες του Outlook οι οποίοι δεν μπορούν να λάβουν τις "
-"προσκλήσεις σας, ενεργοποιήστε αυτή την επιλογή."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Ανταλλαγή προσκλήσεων με συμβατή ονοματοδοσία"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Το Microsoft Outlook, όταν χρησιμοποιείται σε συνδυασμό με ένα διακομιστή "
-"Microsoft Exchange, έχει πρόβλημα με την ανάλυση τυπικών μηνυμάτων groupware. "
-"Ενεργοποιήστε αυτήν την επιλογή ώστε η αποστολή προσκλήσεων groupware να "
-"γίνεται σε συμβατή με το Microsoft Exchange μορφή."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Όταν αυτό είναι ενεργοποιημένο, δε θα βλέπετε το παράθυρο σύνταξης μηνυμάτων. "
-"Όλα τα μηνύματα προσκλήσεων θα αποστέλλονται αυτόματα. Αν θέλετε να βλέπετε το "
-"μήνυμα πριν την αποστολή του, απενεργοποιήστε αυτή την επιλογή. Πρέπει να "
-"ξέρετε ότι το κείμενο στο παράθυρο σύνταξης μηνύματος είναι σε μορφή iCalendar, "
-"και δε θα πρέπει να προσπαθήσετε να το τροποποιήσετε με το χέρι."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Διαγραφή email προσκλήσεων μετά την αποστολή απάντησης σε αυτές"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Αν ενεργοποιηθεί αυτή η επιλογή, τα λαμβανόμενα email πρόσκλησης που έχουν "
-"απαντηθεί θα μετακινούνται στο φάκελο απορριμάτων, μετά την επιτυχή αποστολή "
-"της απάντησης."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Η ενεργοποίηση αυτής της επιλογής σας δίνει τη δυνατότητα αποθήκευσης "
-"καταχωρήσεων από τις εφαρμογές Kontact (KOrganizer, KAddressBook, και "
-"KNotes.)</p>"
-"<p>Αν επιθυμείτε την ενεργοποίηση αυτής της επιλογής θα πρέπει επίσης να "
-"ορίσετε στις εφαρμογές της χρήση του πόρου IMAP. Αυτό γίνεται μέσω του κέντρου "
-"ελέγχου του TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Συνήθως δεν έχετε κανένα λόγο να δείτε τους φακέλους που διατηρούν πόρους "
-"IMAP. Αλλά αν επιθυμείτε να τους βλέπετε, μπορείτε να ενεργοποιήσετε αυτή την "
-"επιλογή.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Αν ο λογαριασμός που χρησιμοποιείται για αποθήκευση πληροφοριών groupware "
-"\"\n"
-"          \"δε χρησιμοποιείται για τη διαχείριση κανονικών μηνυμάτων, "
-"ενεργοποιείστε αυτήν την επιλογή ώστε το KMail \"\n"
-"          \"να εμφανίζει μόνο φακέλους groupware σε αυτόν. Αυτό είναι χρήσιμο "
-"αν διαχειρίζεστε \"\n"
-"          \"κανονικά μηνύματα μέσω ενός επιπρόσθετου συνδεδεμένου λογαριασμού "
-"IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Επιλογή της μορφής αποθήκευσης των φακέλων groupware. "
-"<ul>"
-"<li>Η προκαθορισμένη μορφή είναι η χρήση του ical (για φακέλους ημερολογίου) "
-"και του vcard (για φακέλους διευθύνσεων). Αυτή η μορφή καθιστά διαθέσιμες όλες "
-"τις λειτουργίες του Kontact.</li>"
-"<li>Η μορφή Kolab XML χρησιμοποιεί ένα προσαρμοσμένο μοντέλο που ταιριάζει "
-"περισσότερο με αυτό που χρησιμοποιεί το Outlook. Αυτή η μορφή προσφέρει "
-"καλύτερη συμβατότητα με το Outlook, όταν χρησιμοποιείται ένας διακομιστής Kolab "
-"ή κάποια άλλη συμβατή με αυτόν λύση.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Αυτό καθορίζει το γονικό φάκελο των φακέλων πόρων IMAP.</p>"
-"<p>Προκαθορισμένα, ο διακομιστής Kolab ορίζει τα κουτί εισερχομένων IMAP σαν το "
-"γονικό φάκελο.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Αυτό είναι το αναγνωριστικό του λογαριασμού που περιέχει τος φακέλους του "
-"πόρου IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Αν επιθυμείτε την εμφάνιση των ονομάτων των φακέλων IMAP στη γλώσσα σας, "
-"μπορείτε να επιλέξετε μεταξύ των ακόλουθων διαθέσιμων γλωσσών.</p>"
-"<p> Σημειώστε ότι, ο μόνος λόγος για να το κάνετε είναι για συμβατότητα με το "
-"Microsoft Outlook. Θεωρείται κακή πρακτική να το κάνετε, αφού είναι πλέον "
-"αδύνατη η αλλαγή γλώσσας. </p>"
-"<p>Έτσι μην το ενεργοποιήσετε παρά μόνο αν τα χρειάζεστε πραγματικά.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Φιλτράρισμα και των νέων μηνυμάτων που λήφθηκαν σε φακέλους groupware."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Συγχρονισμός τροποποιήσεων groupware σε φακέλους DIMAP άμεσα κατά τη σύνδεση."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Αυτή η τιμή χρησιμοποιείται για να καθορίσει αν θα εμφανίζεται η σελίδα "
-"εισαγωγής στο KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Μέγιστος αριθμός συνδέσεων ανά διακομιστή"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Αυτό μπορεί να χρησιμοποιηθεί για να περιορίσει τον αριθμό των συνδέσεων ανά "
-"υπολογιστή κατά τον έλεγχο για νέα αλληλογραφία. Ο προκαθορισμένος αριθμός "
-"συνδέσεων είναι απεριόριστος (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Εμφάνιση γραμμής γρήγορης αναζήτησης"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Αυτή η επιλογή ενεργοποιεί ή απενεργοποιεί τη γραμμή αναζήτησης πάνω από τη "
-"λίστα μηνυμάτων που μπορεί να χρησιμοποιηθεί για τη γρήγορη αναζήτηση στις "
-"πληροφορίες που εμφανίζονται στη λίστα μηνυμάτων."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Απόκρυψη τοπικών εισερχομένων αν δεν χρησιμοποιούνται"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Προκαθορισμένη η προώθηση ως εμβόλιμο."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Επιτρέπεται η χρήση του ερωτηματικού (;) ως διαχωριστικό στον συντάκτη του "
-"μηνύματος."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Διατήρηση αυθεντικού συνόλου χαρακτήρων σε απαντήσεις ή προωθήσεις αν αυτό "
-"είναι δυνατό"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Α&υτόματη προσθήκη υπογραφής"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Απομνημόνευση αυτής της ταυτότητας,  ώστε να ξαναχρησιμοποιηθεί σε μελλοντικά "
-"παράθυρα σύνταξης μηνύματος.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Απομνημόνευση του φακέλου για τα απεσταλμένα αντικείμενα, ώστε να "
-"χρησιμοποιηθεί ξανά σε μελλοντικά παράθυρα σύνταξης μηνύματος."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Απομνημόνευση του μεταφορέα mail, ώστε να χρησιμοποιηθεί ξανά σε μελλοντικά "
-"παράθυρα σύνταξης μηνύματος."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Απομνημόνευση αυτής της ταυτότητας,  ώστε να ξαναχρησιμοποιηθεί σε μελλοντικά "
-"παράθυρα σύνταξης μηνύματος.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Αναδίπλωση λέ&ξεων στη στήλη:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Μέγιστος αριθμός γραμμών παραληπτών."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή για να κάνετε το Outlook &#8482; να καταλαβαίνει "
-"ονόματα επισυνάψεων που περιέχουν μη αγγλικούς χαρακτήρες"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Αυτόματη αίτηση ειδοποιήσεων παράδοσης &μηνύματος"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ενεργοποιήστε αυτή την επιλογή αν επιθυμείτε το KMail να ζητάει ειδοποίηση "
-"παράδοσης μηνύματος (MDN) για κάθε εξερχόμενο μήνυμα.</p>"
-"<p>Αυτή η επιλογή είναι η προκαθορισμένη συμπεριφορά. Μπορείτε να ενεργοποιείτε "
-"ή να απενεργοποιείτε τις ειδοποιήσεις παράδοσης για κάθε μήνυμα ξεχωριστά από "
-"το μενού του παραθύρου σύνταξης <em>Επιλογές</em>-><em>"
-"Αίτηση ειδοποίησης παράδοσης</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Χρήση πρόσφατων διευθύνσεων για αυτόματη συμπλήρωση"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Απενεργοποιήστε αυτή την επιλογή αν δε θέλετε να χρησιμοποιούνται οι πρόσφατες "
-"διευθύνσεις στη λίστα αυτόματης συμπλήρωσης στα πεδία διευθύνσεων του παραθύρου "
-"σύνταξης."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Χρονικό διάστημα αυτόματης αποθήκευσης:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Ένα αντίγραφο ασφαλείας του κειμένου στο παράθυρο σύνταξης μπορεί να "
-"δημιουργείται σε τακτά διαστήματα. Το χρονικό διάστημα που θα χρησιμοποιηθεί "
-"για τη δημιουργία του αντιγράφου ασφαλείας καθορίζεται εδώ. Μπορείτε να "
-"απενεργοποιήσετε τη δημιουργία του θέτοντας εδώ την τιμή  0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Εισαγωγή υπογραφών πάνω από το κείμενο σε παράθεση"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Αντικατάσταση αναγνωρισμένου &προθέματος με \"Απ:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Αντικατάσταση αναγνωρισμένου προθέματος με \"&Προ:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Χρήσ&η έξυπνων παραθέσεων"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Η υπογραφή έχει λήξει."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Τύπος επιλογέα αποδέκτη"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Ορισμός του τύπου διαλόγου για την επιλογή αποδεκτών για τα πεδία Προς,\n"
-"        Κοιν. και Κρυφ.Κοιν."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Τύπος επεξεργαστή παραληπτών"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Ορισμός του τύπου επεξεργαστή για τα πεδία Προς,\n"
-"        Κοιν. και Κρυφ.Κοιν."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Μέγιστος αριθμός γραμμών παραληπτών."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Εμφάνιση τύπων τμημάτων μηνύματος για αφαίρεση από μηνύματα που προωθούνται "
-"εμβόλιμα."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Το μέγιστο μέγεθος σε MB που μπορούν να έχουν τα συνημμένα."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-"Εμφάνιση του διαχειριστή δειγμάτων και του πίνακα εισαγωγής στον επεξεργαστή."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Εμφάνιση της καταγραφής GnuPG Audit ακόμη και μετά την επιτυχή ολοκλήρωση των "
-"λειτουργιών κρυπτογράφησης."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Διατήρηση αυθεντικού συνόλου χαρακτήρων σε απαντήσεις ή προωθήσεις αν αυτό "
-"είναι δυνατό"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Μερικά μηνύματα, κυρίως αυτά που δημιουργούνται αυτόματα, δεν καθορίζουν την "
-"κωδικοποίηση χαρακτήρων που χρειάζεται για τη σωστή εμφάνισή τους. Σε τέτοιες "
-"περιπτώσεις θα χρησιμοποιηθεί μία κωδικοποίηση χαρακτήρων, που μπορείτε να "
-"καθορίσετε εδώ. Χρησιμοποιήστε την κωδικοποίηση χαρακτήρων που είναι σε χρήση "
-"στην περιοχή σας. Εξ ορισμού χρησιμοποιείται η κωδικοποίηση του συστήματός σας."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Αλλάζοντας αυτό από το προκαθορισμένο 'Αυτόματη' θα εξαναγκάσει τη χρήση της "
-"καθορισμένης κωδικοποίησης για όλα τα μηνύματα, ανεξάρτητα από τι αυτά "
-"καθορίζουν."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή αν θέλετε τα smileys, όπως το :-), που "
-"εμφανίζονται στο κείμενο του μηνύματος, να αντικαθίστανται με emoticons (μικρές "
-"εικόνες)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή για να εμφανίζονται διαφορετικά επίπεδα κειμένου "
-"σε παράθεση. Απενεργοποιήστε την για να αποκρύψετε τα επίπεδα κειμένου σε "
-"παράθεση."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Επίπεδο αυτόματης σύμπτυξης:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Μείωση μεγέθους γραμματοσειράς για κείμενο σε παράθεση"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Ενεργοποιήστε αυτή την επιλογή για να εμφανίζεται το κείμενο σε παράθεση με "
-"μικρότερη γραμματοσειρά."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Αποθήκευση των απεσταλμένων μηνυμάτων &κρυπτογραφημένα"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Εμφάνιση του  user agent σε εντυπωσιακές κεφαλίδες"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Απενεργοποιήστε αυτήν την επιλογή για να εμφανίζονται τα User-Agent και "
-"X-Mailer όταν χρησιμοποιείτε εντυπωσιακές κεφαλίδες."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Επιτρέπεται η διαγραφή συνημμένων σε υπάρχοντα μηνύματα."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Επιτρέπεται η επεξεργασία συνημμένων σε υπάρχοντα μηνύματα."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-"Αποκρυπτογράφηση μηνυμάτων κατά την προβολή ή ερώτηση πριν την αποκρυπτογράφηση"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Αποστολή ειδοποιήσεων παράδοσης μηνύματος χωρίς αποστολέα."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Αποστολή ειδοποιήσεων παράδοσης μηνύματος χωρίς αποστολέα. Κάποιοι διακομιστές "
-"μπορεί να απορρίπτουν αυτά τα μηνύματα, έτσι αν έχετε πρόβλημα με την αποστολή "
-"των ειδοποιήσεων παράδοσης, απενεργοποιήστε αυτή την επιλογή."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Οι φράσεις μετατράπηκαν σε πρότυπα"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Οι παλιές φράσεις μετατράπηκαν σε πρότυπα"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Πρότυπο μηνύματος για νέο μήνυμα"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Πρότυπο μηνύματος για απάντηση"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Πρότυπο μηνύματος για απάντηση σε όλους"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Πρότυπο μηνύματος για προώθηση"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Χαρακτήρες παράθεσης"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Επιτρέπεται η τροποποίηση ρυθμίσεων εκτός γραφείου από το χρήστη."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Επιτρέπεται η αποστολή εκτός γραφείου σεναρίων sieve σε χρήστες, αλλά "
-"απαγορεύεται η τροποποίηση οποιασδήποτε ρύθμισης, όπως ο τομέας δράσης και η "
-"εναλλαγή αντίδρασης σε spam."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Αποστολή απαντήσεων εκτός γραφείου σε μηνύματα προερχόμενα από αυτόν τον τομέα "
-"μόνο."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Επιτρέπονται οι απαντήσεις εκτός γραφείου σε μηνύματα που σημειώθηκαν ως SPAM."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Έλεγχος ύπαρξης ρυθμισμένης απάντησης 'εκτός γραφείου' κατά την εκκίνηση του "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 από %2 %3 σε χρήση"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14138,6 +12055,11 @@ msgstr "Προσθήκη σαν κοινοποίηση"
 msgid "Add as BCC"
 msgstr "Προσθήκη σαν κρυφή κοινοποίηση"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Ακύρωση"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14153,10 +12075,10 @@ msgstr "Επιλεγμένοι παραλήπτες"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Επιλέξατε 1 παραλήπτη. Ο μέγιστος αριθμός παραληπτών είναι %1. Παρακαλώ "
 "προσαρμόστε την επιλογή σας.\n"
@@ -14178,8 +12100,8 @@ msgstr "Χρήση του διαλόγου επιλογής διευθύνσεω
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Αυτό το κουμπί ανοίγει ένα ξεχωριστό διάλογο όπου μπορείτε να επιλέξετε "
 "παραλήπτες από όλες τις διαθέσιμες διευθύνσεις."
@@ -14187,7 +12109,8 @@ msgstr ""
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr ""
-"Δεν μπορείτε να κάνετε ανακατεύθυνση μηνύματος χωρίς να εισάγετε μια διεύθυνση."
+"Δεν μπορείτε να κάνετε ανακατεύθυνση μηνύματος χωρίς να εισάγετε μια "
+"διεύθυνση."
 
 #: redirectdialog.cpp:117
 msgid "Empty Redirection Address"
@@ -14285,14 +12208,23 @@ msgstr "είναι μεγαλύτερο ή ίσο από"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " ημέρες"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Για να εκτελεστεί η αναζήτηση θα πρέπει να ληφθούν όλα τα μηνύματα του φακέλου "
-"%1 από το διακομιστή. Αυτό μπορεί να πάρει κάποια ώρα. Επιθυμείτε να συνεχίσετε "
-"με την αναζήτηση;"
+"Για να εκτελεστεί η αναζήτηση θα πρέπει να ληφθούν όλα τα μηνύματα του "
+"φακέλου %1 από το διακομιστή. Αυτό μπορεί να πάρει κάποια ώρα. Επιθυμείτε να "
+"συνεχίσετε με την αναζήτηση;"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14440,16 +12372,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Συλλογή δεδομένων για το λογαριασμό '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Συλλογή δεδομένων για το λογαριασμό '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14468,10 +12396,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Περιεχόμενα του σεναρίου '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Περιεχόμενα του σεναρίου '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14494,20 +12420,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Δυνατότητες Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Δυνατότητες Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Δεν υπάρχουν ειδικές δυνατότητες)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Διαθέσιμα σενάρια scripts:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Διαθέσιμα σενάρια scripts:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14556,8 +12478,8 @@ msgstr ""
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
 msgstr ""
-"Κάντε κλικ στα παρακάτω γραφικά συστατικά για να πάρετε βοήθεια σχετικά με τις "
-"μεθόδους εισαγωγής."
+"Κάντε κλικ στα παρακάτω γραφικά συστατικά για να πάρετε βοήθεια σχετικά με "
+"τις μεθόδους εισαγωγής."
 
 #: signatureconfigurator.cpp:72
 msgid ""
@@ -14587,11 +12509,11 @@ msgstr "Χρησιμοποιήστε αυτό το πεδίο για να εισ
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Χρησιμοποιήστε αυτό για να καθορίσετε ένα αρχείο κειμένου το οποίο περιέχει την "
-"υπογραφή σας. Θα διαβάζεται κάθε φορά που δημιουργείτε ένα νέο μήνυμα ή "
+"Χρησιμοποιήστε αυτό για να καθορίσετε ένα αρχείο κειμένου το οποίο περιέχει "
+"την υπογραφή σας. Θα διαβάζεται κάθε φορά που δημιουργείτε ένα νέο μήνυμα ή "
 "προσθέτετε μία νέα υπογραφή."
 
 #: signatureconfigurator.cpp:126
@@ -14608,22 +12530,27 @@ msgstr "Ανοίγει το καθορισμένο αρχείο σε έναν ε
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Μπορείτε να χρησιμοποιήσετε οποιαδήποτε εντολή εδώ, συμπεριλαμβάνοντας και τη "
-"διαδρομή της αν αυτή δεν είναι στο Path σας. Σε κάθε νέο μήνυμα, το KMail θα "
-"εκτελεί την εντολή και θα χρησιμοποιεί την έξοδό της (στην τυπική έξοδο) σαν "
-"υπογραφή. Συνήθεις εντολές που χρησιμοποιούνται σε αυτό το μηχανισμό είναι η "
-"\"fortune\" ή η \"ksig -random\"."
+"Μπορείτε να χρησιμοποιήσετε οποιαδήποτε εντολή εδώ, συμπεριλαμβάνοντας και "
+"τη διαδρομή της αν αυτή δεν είναι στο Path σας. Σε κάθε νέο μήνυμα, το KMail "
+"θα εκτελεί την εντολή και θα χρησιμοποιεί την έξοδό της (στην τυπική έξοδο) "
+"σαν υπογραφή. Συνήθεις εντολές που χρησιμοποιούνται σε αυτό το μηχανισμό "
+"είναι η \"fortune\" ή η \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Καθορισμός εντο&λής:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Διαδρομή"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Νέα καταχώρηση:"
@@ -14658,6 +12585,11 @@ msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 "Θέλετε πραγματικά να αφαιρέσετε αυτή την ομάδα και όλα τα δείγματά της;"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Εφαρμογή &σε:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Επεξεργασία δείγματος"
@@ -14670,6 +12602,10 @@ msgstr "Επεξεργασία ομάδας"
 msgid "Edit &group..."
 msgstr "Επεξεργασία ο&μάδας..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Επεξεργασία..."
@@ -14708,9 +12644,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Αν ενεργοποιήσετε αυτή την επιλογή, η τιμή που εισάγατε στα δεξιά θα "
 "αποθηκευθεί. Αν χρησιμοποιήσετε την ίδια μεταβλητή αργότερα, ακόμη και σε "
@@ -14750,6 +12686,16 @@ msgstr "Να μην ενεργοποιηθεί"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Αδύνατη η εισαγωγή περιεχομένου από το αρχείο %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Προς: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Κοινοποίηση: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14779,61 +12725,54 @@ msgstr "Αδύνατη η εκκίνηση της εντολής διασωλή�
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Εδώ μπορείτε να δημιουργήσετε πρότυπα μηνύματος για χρήση κατά τη σύνταξη "
-"νέων μηνυμάτων ή απαντήσεων, ή κατά την προώθηση μηνυμάτων.</p> "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Εδώ μπορείτε να δημιουργήσετε πρότυπα μηνύματος για χρήση κατά τη "
+"σύνταξη νέων μηνυμάτων ή απαντήσεων, ή κατά την προώθηση μηνυμάτων.</p> "
 "<p>Τα πρότυπα μηνύματος υποστηρίζουν εντολές αντικατάστασης με απλή "
-"πληκτρολόγησή τους ή με επιλογή τους από το μενού <i>Εισαγωγή εντολής</i>.</p>"
-"<p>Τα πρότυπα που δημιουργούνται εδώ ισχύουν μόνο για ένα φάκελο. Υπερισχύουν "
-"τόσο των καθολικών προτύπων όσο και των προτύπων ταυτότητας, αν έχουν "
-"καθοριστεί</p></qt>"
+"πληκτρολόγησή τους ή με επιλογή τους από το μενού <i>Εισαγωγή εντολής</i>.</"
+"p><p>Τα πρότυπα που δημιουργούνται εδώ ισχύουν μόνο για ένα φάκελο. "
+"Υπερισχύουν τόσο των καθολικών προτύπων όσο και των προτύπων ταυτότητας, αν "
+"έχουν καθοριστεί</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Εδώ μπορείτε να δημιουργήσετε πρότυπα μηνύματος για χρήση κατά τη σύνταξη "
-"νέων μηνυμάτων ή απαντήσεων, ή κατά την προώθηση μηνυμάτων.</p> "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Εδώ μπορείτε να δημιουργήσετε πρότυπα μηνύματος για χρήση κατά τη "
+"σύνταξη νέων μηνυμάτων ή απαντήσεων, ή κατά την προώθηση μηνυμάτων.</p> "
 "<p>Τα πρότυπα μηνύματος υποστηρίζουν εντολές αντικατάστασης με απλή "
-"πληκτρολόγησή τους ή με επιλογή τους από το μενού <i>Εισαγωγή εντολής</i>.</p>"
-"<p>Τα πρότυπα που δημιουργούνται εδώ ισχύουν για όλες τις ταυτότητες. "
-"Υπερισχύουν τόσο των καθολικών προτύπων όσο και των προτύπων φακέλου, αν έχουν "
-"καθοριστεί</p></qt>"
+"πληκτρολόγησή τους ή με επιλογή τους από το μενού <i>Εισαγωγή εντολής</i>.</"
+"p><p>Τα πρότυπα που δημιουργούνται εδώ ισχύουν για όλες τις ταυτότητες. "
+"Υπερισχύουν τόσο των καθολικών προτύπων όσο και των προτύπων φακέλου, αν "
+"έχουν καθοριστεί</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Εδώ μπορείτε να δημιουργήσετε πρότυπα μηνύματος για χρήση κατά τη σύνταξη "
-"νέων μηνυμάτων ή απαντήσεων, ή κατά την προώθηση μηνυμάτων.</p> "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Εδώ μπορείτε να δημιουργήσετε πρότυπα μηνύματος για χρήση κατά τη "
+"σύνταξη νέων μηνυμάτων ή απαντήσεων, ή κατά την προώθηση μηνυμάτων.</p> "
 "<p>Τα πρότυπα μηνύματος υποστηρίζουν εντολές αντικατάστασης με απλή "
-"πληκτρολόγησή τους ή με επιλογή τους από το μενού <i>Εισαγωγή εντολής</i>.</p>"
-"<p>Τα πρότυπα που δημιουργούνται εδώ είναι καθολικά (προκαθορισμένα) πρότυπα. "
-"Μπορούν να υπερσκελιστούν από τα πρότυπα φακέλου και τα πρότυπα ταυτότητας, αν "
-"έχουν καθοριστεί</p></qt>"
+"πληκτρολόγησή τους ή με επιλογή τους από το μενού <i>Εισαγωγή εντολής</i>.</"
+"p><p>Τα πρότυπα που δημιουργούνται εδώ είναι καθολικά (προκαθορισμένα) "
+"πρότυπα. Μπορούν να υπερσκελιστούν από τα πρότυπα φακέλου και τα πρότυπα "
+"ταυτότητας, αν έχουν καθοριστεί</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -15070,14 +13009,14 @@ msgstr "Εισαγωγή αποτελέσματος εντολής"
 #: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
-"Διασωλήνωση του σώματος του αρχικού μηνύματος και παράθεση του αποτελέσματος ως "
-"κείμενο με παράθεση"
+"Διασωλήνωση του σώματος του αρχικού μηνύματος και παράθεση του αποτελέσματος "
+"ως κείμενο με παράθεση"
 
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
-"Διασωλήνωση του σώματος του αρχικού μηνύματος και εισαγωγή του αποτελέσματος ως "
-"έχει"
+"Διασωλήνωση του σώματος του αρχικού μηνύματος και εισαγωγή του αποτελέσματος "
+"ως έχει"
 
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
@@ -15088,8 +13027,8 @@ msgstr ""
 #: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr ""
-"Διασωλήνωση του σώματος του τρέχοντος μηνύματος και εισαγωγή του αποτελέσματος "
-"ως έχει"
+"Διασωλήνωση του σώματος του τρέχοντος μηνύματος και εισαγωγή του "
+"αποτελέσματος ως έχει"
 
 #: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
@@ -15097,6 +13036,10 @@ msgstr ""
 "Διασωλήνωση του σώματος του τρέχοντος μηνύματος και αντικατάσταση με το "
 "αποτέλεσμα"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Ορισμός θέσης δρομέα"
@@ -15129,118 +13072,6 @@ msgstr "Ενεργοποίηση αποσφαλμάτωσης"
 msgid "Turn Debug Off"
 msgstr "Απενεργοποίηση αποσφαλμάτωσης"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...ότι μπορείτε να μεταβείτε στο επόμενο και στο προηγούμενο μήνυμα "
-"χρησιμοποιώντας το δεξί και το αριστερό πλήκτρο βέλους αντίστοιχα;</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...ότι μπορείτε να δημιουργήσετε φίλτρα στον αποστολέα, \n"
-"το θέμα και τις λίστες ταχυδρομείου από το μενού <em>"
-"Μήνυμα-&gt;Δημιουργία&nbsp;φίλτρου</em>;</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ότι μπορείτε να απαλλαγείτε από το πεδίο &quot;[όνομα λίστας "
-"ταχυδρομείου]&quot;\n"
-"που προστίθεται στο θέμα κάποιων λιστών χρησιμοποιώντας την ενέργεια φίλτρου\n"
-"<em>Επανεγγραφή κεφαλίδας</em>; Απλώς χρησιμοποιήστε την επιλογή\n"
-"<pre>Επανεγγραφή κεφαλίδας &quot;Θέμα&quot;\n"
-"   αντικατάσταση &quot;\\s*\\[όνομα λίστας ταχυδρομείου\\]\\s*&quot;\n"
-"   με το &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...ότι μπορείτε να αντιστοιχίσετε φακέλους με λίστες ταχυδρομείου στο\n"
-"διάλογο <em>Φάκελος-&gt;Διαχείριση λίστας ταχυδρομείου</em>; Μπορείτε να \n"
-"χρησιμοποιήσετε την επιλογή "
-"<em>Μήνυμα-&gt;Νέο&nbsp;Μήνυμα&nbsp;Προς&nbsp;Λίστα&nbsp;ταχυδρομείου...</em>\n"
-"για να ανοίξετε το παράθυρο σύνταξης μηνύματος με προκαθορισμένη τη διεύθυνση "
-"της λίστας.\n"
-"Εναλλακτικά, μπορείτε να κάνετε μεσαίο κλικ στο φάκελο.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...ότι μπορείτε να αντιστοιχίσετε προσαρμοσμένα εικονίδια σε κάθε φάκελο "
-"ξεχωριστά;\n"
-"Δείτε την επιλογή <em>Φάκελος-&gt;Ιδιότητες</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...ότι το KMail μπορεί να εμφανίσει μια χρωματιστή γραμμή που δείχνει\n"
-"τον τύπο του μηνύματος (Απλό κείμενο/HTML/OpenPGP);</p>\n"
-"<p>Αυτό ματαιώνει προσπάθειες επιτυχούς μίμησης επαληθεύσεων υπογραφής\n"
-"με την αποστολή μηνυμάτων HTML που μιμούνται τα πλαίσια κατάστασης υπογραφής "
-"του KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...ότι μπορείτε να φιλτράρετε με βάση οποιαδήποτε κεφαλίδα απλά\n"
-"εισάγοντας το όνομά της στο πρώτο πεδίο ενός κανόνα αναζήτησης;</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ότι μπορείτε να φιλτράρετε μηνύματα HTML με τον κανόνα\n"
-"<pre>&quot;Τύπος περιεχομένου&quot; περιέχει &quot;κείμενο/html&quot;;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...ότι όταν απαντάτε, μόνο το επιλεγμένο τμήμα του μηνύματος μπαίνει σε "
-"παράθεση;</p>\n"
-"<p>Αν δεν έχει επιλεγεί τίποτα, μπαίνει σε παράθεση ολόκληρο το μήνυμα.</p>\n"
-"<p>Αυτό λειτουργεί και για το κείμενο των επισυνάψεων όταν\n"
-"έχει επιλεγεί το <em>Προβολή-&gt;Συνημμένα-&gt;Εμβόλιμα\t</em>.</p>\n"
-"<p>Αυτό το χαρακτηριστικό είναι διαθέσιμο με όλες τις εντολές απάντησης εκτός "
-"του\n"
-"<em>Μήνυμα-&gt;Απάντηση χωρίς παράθεση</em>.</p>\n"
-"<p align=\"right\"><em>Συνεισφορά του David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Δεν υπάρχει τίποτα για αναίρεση."
@@ -15306,6 +13137,16 @@ msgstr "Συνημμένο #%1 (χωρίς όνομα)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Εμφάνιση καταγραφής του GnuPG Audit για αυτή τη λειτουργία"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Ένα αρχείο με όνομα %1 υπάρχει ήδη. Επιθυμείτε σίγουρα την αντικατάστασή του;"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Αντικατάσταση αρχείου;"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15321,8 +13162,8 @@ msgid ""
 msgstr ""
 "Είμαι εκτός γραφείου μέχρι τις %1.\n"
 "\n"
-"Σε επείγουσες περιπτώσεις, παρακαλώ επικοινωνήστε με την Κυρία <αντικατάσταση "
-"διακοπών>\n"
+"Σε επείγουσες περιπτώσεις, παρακαλώ επικοινωνήστε με την Κυρία "
+"<αντικατάσταση διακοπών>\n"
 "\n"
 "email: <διεύθυνση email από αντικατάσταση διακοπών>\n"
 "τηλέφωνο: +49 711 1111 11\n"
@@ -15338,9 +13179,10 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Ο διακομιστής σας δεν περιλαμβάνει τις \"διακοπές\" στη λίστα υποστηριζόμενων "
-"επεκτάσεων Sieve.\n"
-"Χωρίς αυτήν το KMail δεν μπορεί να εγκαταστήσει τις εκτός γραφείου απαντήσεις.\n"
+"Ο διακομιστής σας δεν περιλαμβάνει τις \"διακοπές\" στη λίστα "
+"υποστηριζόμενων επεκτάσεων Sieve.\n"
+"Χωρίς αυτήν το KMail δεν μπορεί να εγκαταστήσει τις εκτός γραφείου "
+"απαντήσεις.\n"
 "Παρακαλώ επικοινωνήστε με το διαχειριστή του συστήματος."
 
 #: vacation.cpp:622
@@ -15424,14 +13266,14 @@ msgstr "Απο&στολή εικόνας με κάθε μήνυμα"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Επιλέξτε αυτό το πεδίο αν θέλετε το KMail να προσθέτει μία κεφαλίδα X-Face, σε "
-"μηνύματα που συντάσσονται με αυτή την ταυτότητα. Το X-Face είναι μία μικρή "
-"(48x48 εικονοστοιχεία) ασπρόμαυρη εικόνα που μερικοί πελάτες αλληλογραφίας "
-"είναι ικανοί να εμφανίσουν."
+"Επιλέξτε αυτό το πεδίο αν θέλετε το KMail να προσθέτει μία κεφαλίδα X-Face, "
+"σε μηνύματα που συντάσσονται με αυτή την ταυτότητα. Το X-Face είναι μία "
+"μικρή (48x48 εικονοστοιχεία) ασπρόμαυρη εικόνα που μερικοί πελάτες "
+"αλληλογραφίας είναι ικανοί να εμφανίσουν."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15460,13 +13302,14 @@ msgstr "Επιλογή αρχείου..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Χρησιμοποιήστε αυτό για την επιλογή ενός αρχείου γραφικών από το οποίο θα "
 "δημιουργηθεί η εικόνα. Το αρχείο θα πρέπει να έχει υψηλή αντίθεση και σχεδόν "
-"τετράγωνο σχήμα. Ένα ανοικτό φόντο θα βοηθήσει στη βελτίωση του αποτελέσματος."
+"τετράγωνο σχήμα. Ένα ανοικτό φόντο θα βοηθήσει στη βελτίωση του "
+"αποτελέσματος."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15474,22 +13317,22 @@ msgstr "Καθορισμός από το βιβλίο διευθύνσεων"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Μπορείτε να χρησιμοποιήσετε μία μικρότερου μεγέθους έκδοση της εικόνας που "
 "έχετε ορίσει στην καταχώριση του βιβλίου διευθύνσεών σας."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>Το KMail μπορεί να αποστέλλει μία μικρή (48x48 εικονοστοιχεία), χαμηλής "
 "ποιότητας, μονόχρωμη εικόνα με κάθε μήνυμα. Για παράδειγμα, θα μπορούσε να "
-"είναι μία φωτογραφία σας ή ένα σύμβολο. Εμφανίζεται στον πελάτη αλληλογραφίας "
-"του παραλήπτη (αν υποστηρίζεται)."
+"είναι μία φωτογραφία σας ή ένα σύμβολο. Εμφανίζεται στον πελάτη "
+"αλληλογραφίας του παραλήπτη (αν υποστηρίζεται)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15498,11 +13341,11 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Παραδείγματα υπάρχουν στο <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Παραδείγματα υπάρχουν στο <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15518,131 +13361,1863 @@ msgstr "Χωρίς εικόνα"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Δεν έχετε ορίσει τη δική σας επαφή στο βιβλίο διευθύνσεων."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Σύνολο: %2<br>Μη αναγνωσμένα: %3<br>Μέγεθος: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Υπογραφή"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Όριο: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Αυτόματη &υπογραφή μηνυμάτων"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Ορισμός θέματος του μηνύματος"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Όταν αυτή η επιλογή είναι ενεργοποιημένη, όλα τα μηνύματα που στέλνετε θα "
+"υπογράφονται εξ ορισμού. Φυσικά θα είναι δυνατό να απενεργοποιήσετε την "
+"υπογραφή ανεξάρτητα για κάθε μήνυμα."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Αποστολή κοινοποίησης στη 'διεύθυνση'"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Κρυπτογράφηση"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Αποστολή κρυφής κοινοποίησης στη 'διεύθυνση'"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Κατά την κρυπτογράφηση email, να γίνεται κρυ&πτογράφηση στο πιστοποιητικό "
+"της ταυτότητάς μου"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Προσθήκη 'κεφαλίδας' στο μήνυμα"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Όταν αυτή η επιλογή είναι ενεργοποιημένη, το μήνυμα/αρχείο δε θα "
+"κρυπτογραφηθεί μόνο με το δημόσιο κλειδί του παραλήπτη, αλλά και με το δικό "
+"σας. Αυτό θα σας δώσει τη δυνατότητα μπορείτε να αποκρυπτογραφήσετε το "
+"μήνυμα/αρχείο στο μέλλον, πράγμα που συνήθως είναι καλή ιδέα."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Ανάγνωση του σώματος του μηνύματος από το 'αρχείο'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Εμφάνιση &υπογεγραμμένου/κρυπτογραφημένου κειμένου μετά τη σύνταξή του"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Καθορισμός σώματος του μηνύματος"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Όταν αυτή η επιλογή είναι ενεργοποιημένη, το υπογεγραμμένο/κρυπτογραφημένο "
+"κείμενου θα εμφανίζεται σε ένα ξεχωριστό παράθυρο, για να το ελέγξετε πριν "
+"την αποστολή του. Αυτό είναι χρήσιμο μόνο όταν ελέγχετε τη λειτουργία του "
+"συστήματος κρυπτογράφησής σας."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Προσθήκη ενός συνημμένου στο μήνυμα. Αυτό μπορεί να επαναληφθεί"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Αποθήκευση των απεσταλμένων μηνυμάτων &κρυπτογραφημένα"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Έλεγχος μόνο για νέα αλληλογραφία"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
+"Ενεργοποιήστε το για να αποθηκεύετε τα κρυπτογραφημένα μηνύματα ως έχουν"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Άνοιγμα μόνο του παραθύρου σύνταξης"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Αποθήκευση κρυπτογραφημένων μηνυμάτων ως έχουν</h1>\n"
+"Όταν αυτή η επιλογή είναι ενεργοποιημένη, τα απεσταλμένα μηνύματα "
+"αποθηκεύονται κρυπτογραφημένα, όπως ακριβώς στάλθηκαν. Αυτό δεν προτείνεται, "
+"αφού αν κάποιο από τα απαραίτητα πιστοποιητικά λήξει, δε θα μπορείτε πλέον "
+"να τα διαβάσετε.\n"
+"<p>\n"
+"Παρόλα αυτά, ίσως ισχύουν τοπικοί κανόνες που απαιτούν την ενεργοποίηση "
+"αυτής της επιλογής. Αν δεν είστε σίγουροι, ρωτήστε το διαχειριστή σας.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Προβολή του δοσμένου αρχείου μηνύματος"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Εμφάνιση των κλειδιών κρυπτογράφησης &για έγκριση"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Αποστολή μηνύματος στη 'διεύθυνση'. Επισύναψη του αρχείου στο οποίο υποδεικνύει "
-"το 'URL'"
+"Όταν αυτή η επιλογή είναι ενεργοποιημένη, η εφαρμογή θα σας εμφανίζει τη "
+"λίστα των δημοσίων κλειδιών από την οποία θα μπορείτε να επιλέξετε αυτό που "
+"θα χρησιμοποιηθεί για την κρυπτογράφηση. Αν είναι απενεργοποιημένη, ο "
+"διάλογος θα εμφανίζεται μόνο όταν η εφαρμογή δεν μπορεί να καθορίσει το "
+"σωστό κλειδί ή αν υπάρχουν περισσότερα του ενός που μπορούν να "
+"χρησιμοποιηθούν."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Αναγνωσμένο"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Αυτόματη κρυπτογράφηση μηνυμάτων &αν γίνεται"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Παλιό"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Όταν αυτή η επιλογή είναι ενεργοποιημένη, κάθε μήνυμα που στέλνετε θα "
+"κρυπτογραφείται εφ' όσον η κρυπτογράφηση είναι δυνατή και επιθυμητή. Φυσικά "
+"θα είναι δυνατό να απενεργοποιήσετε την αυτόματη κρυπτογράφηση ανεξάρτητα "
+"για κάθε μήνυμα."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Διαγραμμένο"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Να μη γίνεται υπογραφή/κρυπτογράφηση κατά την απο&θήκευση ως προσχέδιο"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Απαντημένο"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Πώς λειτουργεί;"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Προωθημένο"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Γενικό"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Σε αναμονή"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Απάντηση"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Απεσταλμένο"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Απάντηση σε όλους"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Παρακολουθούμενο"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Προώθηση"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Παραβλέφθηκε"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Συντόμε&υση:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Τύπ&ος προτύπου:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Περιεχόμενα προτύπου"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Προς υλοποίηση"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Συντόμευση προτύπου"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Έχει επισύναψη"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Τύπος προτύπου"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 από %2 %3 σε χρήση"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Ιδιότητες φακέλου"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Διαδρομή"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Ο φάκελος περιέχει μια &λίστα ταχυδρομείου"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Διεύθυνση λίστας:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Κανονικό:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Μη &αναγνωσμένο:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Λήξη μηνύματος"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Λήξη μετά από:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Λήξη &αναγνωσμένων μηνυμάτων"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Λήξη &μετά από:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Λήξη μη &αναγνωσμένων μηνυμάτων"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Ημέρα(ες)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Εβδομάδα(ες)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Μήνα(ες)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Για προχωρημένους"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Ταυτότητα αποστολέα:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Μορφή &αποθήκευσης:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Εμφανίσεις λίστας:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Αποστολή μηνυμάτων σε αναμονή κατά τον έλεγχο αλληλογραφίας"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Ένα αρχείο με όνομα %1 υπάρχει ήδη. Επιθυμείτε σίγουρα την αντικατάστασή του;"
+"<qt><p>Επιλέξτε αν θέλετε το KMail να αποστέλλει πάντα τα μηνύματα που "
+"βρίσκονται στο φάκελο εξερχόμενα κατά το χειροκίνητο έλεγχο. Μπορείτε ακόμη "
+"να ορίσετε να μη γίνεται ποτέ αυτόματη αποστολή μηνυμάτων. </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Αντικατάσταση αρχείου;"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Αυτόματη μετακίνηση μη συγχρονισμένων μηνυμάτων από φακέλους με μη επαρκή "
+"δικαιώματα"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Αν υπάρχουν νέα μηνύματα σε ένα φάκελο, που δεν έχουν αποσταλεί ακόμα στο "
+"διακομιστή, και δεν έχετε επαρκή δικαιώματα στο φάκελο για να τα αποστείλετε "
+"τώρα, τα μηνύματα θα μετακινηθούν αυτομάτως σε ένα φάκελο \"Χάθηκαν+Βρέθηκαν"
+"\"."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Επιτρέπονται τοπικές σημαίες σε φακέλους μόνο ανάγνωσης"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Αυτή η ρύθμιση επιτρέπει στους διαχειριστές να ορίζουν μία ελάχιστη "
+"καθυστέρηση μεταξύ δύο ελέγχων αλληλογραφίας.\"\n"
+"           \"Ο χρήστης δε θα μπορεί να επιλέξει τιμή μικρότερη από αυτήν που "
+"θα τεθεί εδώ."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Ο πιο πρόσφατα επιλεγμένος φάκελος στο διάλογο επιλογής φακέλου."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Αγνόηση του umask του χρήστη και χρήση \"εγγραφή-ανάγνωση μόνο για το χρήστη"
+"\""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Πολιτική εμφάνισης του εικονιδίου πλαισίου συστήματος"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Κλείσιμο της εφαρμογής κατά το κλείσιμο του κύριου παραθύρου, ακόμη και αν "
+"υπάρχει ενεργό εικονίδιο στο πλαίσιο του συστήματος."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Λεπτομερής ειδοποίηση νέας αλληλογραφίας"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Αν είναι ενεργοποιημένη αυτή η επιλογή, στην ειδοποίηση νέας αλληλογραφίας "
+"θα εμφανίζεται κάθε φάκελος που περιέχει νέα μηνύματα. Διαφορετικά θα "
+"εμφανίζεται ένα απλό μήνυμα ειδοποίησης."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Ορισμός επεξεργαστή:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Χρήση εξωτερικού επεξεργαστή για τη σύνταξη μηνυμάτων"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"Το κατώφλι προειδοποίησης του χρήστη όταν ένας φάκελος πλησιάζει στο όριο "
+"μεγέθους του."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Ενεργοποίηση της λειτουργικότητας groupware"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Χωρισμός των κεφαλίδων Από:/Προς: στις απαντήσεις σε απαντήσεις"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Το Microsoft Outlook έχει κάποιες ελλείψεις στην υλοποίηση του προτύπου "
+"iCalendar και αυτή η επιλογή διορθώνει μία από αυτές. Αν παρουσιαστούν "
+"προβλήματα με χρήστες του Outlook οι οποίοι δεν μπορούν να λάβουν τις "
+"απαντήσεις σας, ενεργοποιήστε αυτή την επιλογή."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Αποστολή προσκλήσεων groupware στο κύριο σώμα"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Το Microsoft Outlook έχει κάποιες ελλείψεις στην υλοποίηση του προτύπου "
+"iCalendar και αυτή η επιλογή διορθώνει μία από αυτές. Αν παρουσιαστούν "
+"προβλήματα με χρήστες του Outlook οι οποίοι δεν μπορούν να λάβουν τις "
+"προσκλήσεις σας, ενεργοποιήστε αυτή την επιλογή."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Ανταλλαγή προσκλήσεων με συμβατή ονοματοδοσία"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Το Microsoft Outlook, όταν χρησιμοποιείται σε συνδυασμό με ένα διακομιστή "
+"Microsoft Exchange, έχει πρόβλημα με την ανάλυση τυπικών μηνυμάτων "
+"groupware. Ενεργοποιήστε αυτήν την επιλογή ώστε η αποστολή προσκλήσεων "
+"groupware να γίνεται σε συμβατή με το Microsoft Exchange μορφή."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Όταν αυτό είναι ενεργοποιημένο, δε θα βλέπετε το παράθυρο σύνταξης "
+"μηνυμάτων. Όλα τα μηνύματα προσκλήσεων θα αποστέλλονται αυτόματα. Αν θέλετε "
+"να βλέπετε το μήνυμα πριν την αποστολή του, απενεργοποιήστε αυτή την "
+"επιλογή. Πρέπει να ξέρετε ότι το κείμενο στο παράθυρο σύνταξης μηνύματος "
+"είναι σε μορφή iCalendar, και δε θα πρέπει να προσπαθήσετε να το "
+"τροποποιήσετε με το χέρι."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Διαγραφή email προσκλήσεων μετά την αποστολή απάντησης σε αυτές"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Αν ενεργοποιηθεί αυτή η επιλογή, τα λαμβανόμενα email πρόσκλησης που έχουν "
+"απαντηθεί θα μετακινούνται στο φάκελο απορριμάτων, μετά την επιτυχή αποστολή "
+"της απάντησης."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Η ενεργοποίηση αυτής της επιλογής σας δίνει τη δυνατότητα αποθήκευσης "
+"καταχωρήσεων από τις εφαρμογές Kontact (KOrganizer, KAddressBook, και "
+"KNotes.)</p><p>Αν επιθυμείτε την ενεργοποίηση αυτής της επιλογής θα πρέπει "
+"επίσης να ορίσετε στις εφαρμογές της χρήση του πόρου IMAP. Αυτό γίνεται μέσω "
+"του κέντρου ελέγχου του TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Συνήθως δεν έχετε κανένα λόγο να δείτε τους φακέλους που διατηρούν πόρους "
+"IMAP. Αλλά αν επιθυμείτε να τους βλέπετε, μπορείτε να ενεργοποιήσετε αυτή "
+"την επιλογή.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Αν ο λογαριασμός που χρησιμοποιείται για αποθήκευση πληροφοριών groupware "
+"\"\n"
+"          \"δε χρησιμοποιείται για τη διαχείριση κανονικών μηνυμάτων, "
+"ενεργοποιείστε αυτήν την επιλογή ώστε το KMail \"\n"
+"          \"να εμφανίζει μόνο φακέλους groupware σε αυτόν. Αυτό είναι "
+"χρήσιμο αν διαχειρίζεστε \"\n"
+"          \"κανονικά μηνύματα μέσω ενός επιπρόσθετου συνδεδεμένου "
+"λογαριασμού IMAP.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Επιλογή της μορφής αποθήκευσης των φακέλων groupware. <ul><li>Η "
+"προκαθορισμένη μορφή είναι η χρήση του ical (για φακέλους ημερολογίου) και "
+"του vcard (για φακέλους διευθύνσεων). Αυτή η μορφή καθιστά διαθέσιμες όλες "
+"τις λειτουργίες του Kontact.</li><li>Η μορφή Kolab XML χρησιμοποιεί ένα "
+"προσαρμοσμένο μοντέλο που ταιριάζει περισσότερο με αυτό που χρησιμοποιεί το "
+"Outlook. Αυτή η μορφή προσφέρει καλύτερη συμβατότητα με το Outlook, όταν "
+"χρησιμοποιείται ένας διακομιστής Kolab ή κάποια άλλη συμβατή με αυτόν λύση.</"
+"li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Αυτό καθορίζει το γονικό φάκελο των φακέλων πόρων IMAP.</"
+"p><p>Προκαθορισμένα, ο διακομιστής Kolab ορίζει τα κουτί εισερχομένων IMAP "
+"σαν το γονικό φάκελο.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Αυτό είναι το αναγνωριστικό του λογαριασμού που περιέχει τος φακέλους του "
+"πόρου IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Αν επιθυμείτε την εμφάνιση των ονομάτων των φακέλων IMAP στη γλώσσα σας, "
+"μπορείτε να επιλέξετε μεταξύ των ακόλουθων διαθέσιμων γλωσσών.</p><p> "
+"Σημειώστε ότι, ο μόνος λόγος για να το κάνετε είναι για συμβατότητα με το "
+"Microsoft Outlook. Θεωρείται κακή πρακτική να το κάνετε, αφού είναι πλέον "
+"αδύνατη η αλλαγή γλώσσας. </p><p>Έτσι μην το ενεργοποιήσετε παρά μόνο αν τα "
+"χρειάζεστε πραγματικά.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Φιλτράρισμα και των νέων μηνυμάτων που λήφθηκαν σε φακέλους groupware."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Συγχρονισμός τροποποιήσεων groupware σε φακέλους DIMAP άμεσα κατά τη σύνδεση."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Αυτή η τιμή χρησιμοποιείται για να καθορίσει αν θα εμφανίζεται η σελίδα "
+"εισαγωγής στο KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Μέγιστος αριθμός συνδέσεων ανά διακομιστή"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Αυτό μπορεί να χρησιμοποιηθεί για να περιορίσει τον αριθμό των συνδέσεων ανά "
+"υπολογιστή κατά τον έλεγχο για νέα αλληλογραφία. Ο προκαθορισμένος αριθμός "
+"συνδέσεων είναι απεριόριστος (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Εμφάνιση γραμμής γρήγορης αναζήτησης"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Αυτή η επιλογή ενεργοποιεί ή απενεργοποιεί τη γραμμή αναζήτησης πάνω από τη "
+"λίστα μηνυμάτων που μπορεί να χρησιμοποιηθεί για τη γρήγορη αναζήτηση στις "
+"πληροφορίες που εμφανίζονται στη λίστα μηνυμάτων."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Απόκρυψη τοπικών εισερχομένων αν δεν χρησιμοποιούνται"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Προκαθορισμένη η προώθηση ως εμβόλιμο."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Επιτρέπεται η χρήση του ερωτηματικού (;) ως διαχωριστικό στον συντάκτη του "
+"μηνύματος."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Διατήρηση αυθεντικού συνόλου χαρακτήρων σε απαντήσεις ή προωθήσεις αν αυτό "
+"είναι δυνατό"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Α&υτόματη προσθήκη υπογραφής"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Απομνημόνευση αυτής της ταυτότητας,  ώστε να ξαναχρησιμοποιηθεί σε "
+"μελλοντικά παράθυρα σύνταξης μηνύματος.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Απομνημόνευση του φακέλου για τα απεσταλμένα αντικείμενα, ώστε να "
+"χρησιμοποιηθεί ξανά σε μελλοντικά παράθυρα σύνταξης μηνύματος."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Απομνημόνευση του μεταφορέα mail, ώστε να χρησιμοποιηθεί ξανά σε μελλοντικά "
+"παράθυρα σύνταξης μηνύματος."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Απομνημόνευση αυτής της ταυτότητας,  ώστε να ξαναχρησιμοποιηθεί σε "
+"μελλοντικά παράθυρα σύνταξης μηνύματος.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Αναδίπλωση λέ&ξεων στη στήλη:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Μέγιστος αριθμός γραμμών παραληπτών."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να κάνετε το Outlook &#8482; να "
+"καταλαβαίνει ονόματα επισυνάψεων που περιέχουν μη αγγλικούς χαρακτήρες"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Αυτόματη αίτηση ειδοποιήσεων παράδοσης &μηνύματος"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Ενεργοποιήστε αυτή την επιλογή αν επιθυμείτε το KMail να ζητάει "
+"ειδοποίηση παράδοσης μηνύματος (MDN) για κάθε εξερχόμενο μήνυμα.</p><p>Αυτή "
+"η επιλογή είναι η προκαθορισμένη συμπεριφορά. Μπορείτε να ενεργοποιείτε ή να "
+"απενεργοποιείτε τις ειδοποιήσεις παράδοσης για κάθε μήνυμα ξεχωριστά από το "
+"μενού του παραθύρου σύνταξης <em>Επιλογές</em>-><em>Αίτηση ειδοποίησης "
+"παράδοσης</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Χρήση πρόσφατων διευθύνσεων για αυτόματη συμπλήρωση"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Απενεργοποιήστε αυτή την επιλογή αν δε θέλετε να χρησιμοποιούνται οι "
+"πρόσφατες διευθύνσεις στη λίστα αυτόματης συμπλήρωσης στα πεδία διευθύνσεων "
+"του παραθύρου σύνταξης."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Χρονικό διάστημα αυτόματης αποθήκευσης:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Ένα αντίγραφο ασφαλείας του κειμένου στο παράθυρο σύνταξης μπορεί να "
+"δημιουργείται σε τακτά διαστήματα. Το χρονικό διάστημα που θα χρησιμοποιηθεί "
+"για τη δημιουργία του αντιγράφου ασφαλείας καθορίζεται εδώ. Μπορείτε να "
+"απενεργοποιήσετε τη δημιουργία του θέτοντας εδώ την τιμή  0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Εισαγωγή υπογραφών πάνω από το κείμενο σε παράθεση"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Αντικατάσταση αναγνωρισμένου &προθέματος με \"Απ:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Αντικατάσταση αναγνωρισμένου προθέματος με \"&Προ:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Χρήσ&η έξυπνων παραθέσεων"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Η υπογραφή έχει λήξει."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Τύπος επιλογέα αποδέκτη"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Ορισμός του τύπου διαλόγου για την επιλογή αποδεκτών για τα πεδία Προς,\n"
+"        Κοιν. και Κρυφ.Κοιν."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Τύπος επεξεργαστή παραληπτών"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Ορισμός του τύπου επεξεργαστή για τα πεδία Προς,\n"
+"        Κοιν. και Κρυφ.Κοιν."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Μέγιστος αριθμός γραμμών παραληπτών."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Εμφάνιση τύπων τμημάτων μηνύματος για αφαίρεση από μηνύματα που προωθούνται "
+"εμβόλιμα."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Το μέγιστο μέγεθος σε MB που μπορούν να έχουν τα συνημμένα."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+"Εμφάνιση του διαχειριστή δειγμάτων και του πίνακα εισαγωγής στον επεξεργαστή."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Εμφάνιση της καταγραφής GnuPG Audit ακόμη και μετά την επιτυχή ολοκλήρωση "
+"των λειτουργιών κρυπτογράφησης."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Διατήρηση αυθεντικού συνόλου χαρακτήρων σε απαντήσεις ή προωθήσεις αν αυτό "
+"είναι δυνατό"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Μερικά μηνύματα, κυρίως αυτά που δημιουργούνται αυτόματα, δεν καθορίζουν την "
+"κωδικοποίηση χαρακτήρων που χρειάζεται για τη σωστή εμφάνισή τους. Σε "
+"τέτοιες περιπτώσεις θα χρησιμοποιηθεί μία κωδικοποίηση χαρακτήρων, που "
+"μπορείτε να καθορίσετε εδώ. Χρησιμοποιήστε την κωδικοποίηση χαρακτήρων που "
+"είναι σε χρήση στην περιοχή σας. Εξ ορισμού χρησιμοποιείται η κωδικοποίηση "
+"του συστήματός σας."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Αλλάζοντας αυτό από το προκαθορισμένο 'Αυτόματη' θα εξαναγκάσει τη χρήση της "
+"καθορισμένης κωδικοποίησης για όλα τα μηνύματα, ανεξάρτητα από τι αυτά "
+"καθορίζουν."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή αν θέλετε τα smileys, όπως το :-), που "
+"εμφανίζονται στο κείμενο του μηνύματος, να αντικαθίστανται με emoticons "
+"(μικρές εικόνες)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να εμφανίζονται διαφορετικά επίπεδα "
+"κειμένου σε παράθεση. Απενεργοποιήστε την για να αποκρύψετε τα επίπεδα "
+"κειμένου σε παράθεση."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Επίπεδο αυτόματης σύμπτυξης:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Μείωση μεγέθους γραμματοσειράς για κείμενο σε παράθεση"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να εμφανίζεται το κείμενο σε παράθεση με "
+"μικρότερη γραμματοσειρά."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Αποθήκευση των απεσταλμένων μηνυμάτων &κρυπτογραφημένα"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Εμφάνιση του  user agent σε εντυπωσιακές κεφαλίδες"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Απενεργοποιήστε αυτήν την επιλογή για να εμφανίζονται τα User-Agent και X-"
+"Mailer όταν χρησιμοποιείτε εντυπωσιακές κεφαλίδες."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Επιτρέπεται η διαγραφή συνημμένων σε υπάρχοντα μηνύματα."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Επιτρέπεται η επεξεργασία συνημμένων σε υπάρχοντα μηνύματα."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+"Αποκρυπτογράφηση μηνυμάτων κατά την προβολή ή ερώτηση πριν την "
+"αποκρυπτογράφηση"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Αποστολή ειδοποιήσεων παράδοσης μηνύματος χωρίς αποστολέα."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Αποστολή ειδοποιήσεων παράδοσης μηνύματος χωρίς αποστολέα. Κάποιοι "
+"διακομιστές μπορεί να απορρίπτουν αυτά τα μηνύματα, έτσι αν έχετε πρόβλημα "
+"με την αποστολή των ειδοποιήσεων παράδοσης, απενεργοποιήστε αυτή την επιλογή."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Οι φράσεις μετατράπηκαν σε πρότυπα"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Οι παλιές φράσεις μετατράπηκαν σε πρότυπα"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Πρότυπο μηνύματος για νέο μήνυμα"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Πρότυπο μηνύματος για απάντηση"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Πρότυπο μηνύματος για απάντηση σε όλους"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Πρότυπο μηνύματος για προώθηση"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Χαρακτήρες παράθεσης"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Επιτρέπεται η τροποποίηση ρυθμίσεων εκτός γραφείου από το χρήστη."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Επιτρέπεται η αποστολή εκτός γραφείου σεναρίων sieve σε χρήστες, αλλά "
+"απαγορεύεται η τροποποίηση οποιασδήποτε ρύθμισης, όπως ο τομέας δράσης και η "
+"εναλλαγή αντίδρασης σε spam."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Αποστολή απαντήσεων εκτός γραφείου σε μηνύματα προερχόμενα από αυτόν τον "
+"τομέα μόνο."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Επιτρέπονται οι απαντήσεις εκτός γραφείου σε μηνύματα που σημειώθηκαν ως "
+"SPAM."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Έλεγχος ύπαρξης ρυθμισμένης απάντησης 'εκτός γραφείου' κατά την εκκίνηση του "
+"KMail."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Επεξεργασία αρχείου"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Επεξεργασία..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Μετάβαση"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Φάκελος"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Μήνυμα"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Ειδική απάντηση"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Προώ&θηση"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Συμβουλές εργαλείου"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ρυθμίσεις δειγμάτων"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Γραμμή εργαλείων HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Κοινές επιλογές"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Γραμμή εργαλείων HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Επαλήθευση πιστοποιητικών με χρήση CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Αν είναι ενεργοποιημένη αυτή η επιλογή, για την επαλήθευση των "
+"πιστοποιητικών S/MIME θα χρησιμοποιούνται λίστες ανάκλησης πιστοποιητικών "
+"(CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Δικτυακή επαλήθευση πιστοποιητικών (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Αν είναι ενεργοποιημένη αυτή η επιλογή, θα γίνεται δικτυακή επαλήθευση των "
+"πιστοποιητικών S/MIME με χρήση του δικτυακού πρωτοκόλλου κατάστασης "
+"πιστοποιητικών (OCSP). Συμπληρώστε το URL του εξυπηρετητή OCSP."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Δικτυακή επαλήθευση πιστοποιητικού"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL εξυπηρετητή OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Εισάγετε εδώ τη διεύθυνση του εξυπηρετητή για τη δικτυακή επαλήθευση "
+"πιστοποιητικών (εξυπηρετητής OCSP). Το URL συνήθως αρχίζει με http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Υπογραφή εξυπηρετητή OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Παράβλεψη του URL υπηρεσίας των πιστοποιητικών"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Να μην ελέγχονται οι πολιτικές πιστοποιητικών"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Εξ ορισμού το GnuPG χρησιμοποιεί το αρχείο ~/.gnupg/policies.txt για να "
+"ελέγχει αν μία πολιτική πιστοποιητικού είναι αποδεκτή. Αν ενεργοποιηθεί αυτή "
+"η επιλογή, αυτός ο έλεγχος δε θα γίνεται."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Να μη συμβουλεύεσαι ποτέ ένα CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Αν είναι ενεργοποιημένη αυτή η επιλογή, δεν χρησιμοποιούνται λίστες "
+"ανάκλησης πιστοποιητικών (CRL) για την επαλήθευση πιστοποιητικών S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Ανάκτηση πιστοποιητικών εκδότη που δεν υπάρχουν"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Αν είναι ενεργοποιημένη αυτή η επιλογή, γίνεται λήψη των πιστοποιητικών "
+"εκδότη που δεν υπάρχουν, όποτε αυτό απαιτείται (ισχύει και για τις δύο "
+"μεθόδους επαλήθευσης, CRLs και OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Αιτήσεις HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Να μη γίνονται αιτήσεις HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Πλήρη απενεργοποίηση της χρήσης του HTTP για S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Χρήση αυτού του διαμεσολαβητή για αιτήσεις HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Χρήση του διαμεσολαβητή HTTP του συστήματος:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Αν ενεργοποιηθεί αυτή η επιλογή, η τιμή του διαμεσολαβητή HTTP που "
+"εμφανίζεται στα δεξιά (η οποία προέρχεται από τη μεταβλητή περιβάλλοντος "
+"http_proxy) θα χρησιμοποιείται για όλες τις HTTP αιτήσεις."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Εισάγετε εδώ την τοποθεσία του διαμεσολαβητή HTTP, ο οποίος θα "
+"χρησιμοποιηθεί για όλες τις αιτήσεις που έχουν σχέση με S/MIME. Πρέπει να "
+"είναι της μορφής υπολογιστής:θύρα· για παράδειγμα myproxy.nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Παράβλεψη σημείου διανομής HTTP CRL πιστοποιητικών"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Κατά την αναζήτηση της τοποθεσίας μιας CRL, το υπό έλεγχο πιστοποιητικό "
+"περιέχει καταχωρήσεις γνωστές ως \"Σημεία διανομής CRL\" (DP), τα οποία "
+"είναι URL περιγραφής της μεθόδου πρόσβασης του URL. Χρησιμοποιείται η πρώτη "
+"καταχώρηση DP. Με αυτή την επιλογή, όλες οι καταχωρήσεις που χρησιμοποιούν "
+"το HTTP παραβλέπονται κατά την αναζήτηση κατάλληλου σημείου διανομής (DP)."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Αιτήσεις LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Να μη γίνονται αιτήσεις LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Πλήρης απενεργοποίηση χρήσης του LDAP για S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Παράβλεψη σημείου διανομής LDAP CRL πιστοποιητικών"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Κατά την αναζήτηση της τοποθεσίας μιας CRL, το υπό έλεγχο πιστοποιητικό "
+"περιέχει καταχωρήσεις γνωστές ως \"Σημεία διανομής CRL\" (DP), τα οποία "
+"είναι URL περιγραφής της μεθόδου πρόσβασης του URL. Χρησιμοποιείται η πρώτη "
+"καταχώρηση DP. Με αυτή την επιλογή, όλες οι καταχωρήσεις που χρησιμοποιούν "
+"το LDAP παραβλέπονται κατά την αναζήτηση κατάλληλου σημείου διανομής (DP)."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Πρωτεύων εξυπηρετητής για αιτήσεις LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Εισάγοντας εδώ έναν εξυπηρετητή LDAP όλες τις αιτήσεις LDAP θα "
+"μεταβιβάζονται πρώτα σε αυτόν.Πιο συγκεκριμένα, αυτή η επιλογή παραβλέπει "
+"τον καθορισμένο εξυπηρετητή και θύρα ενός LDAP URL και θα χρησιμοποιηθεί αν "
+"αυτά δεν υπάρχουν στο URL. Άλλοι εξυπηρετητές LDAP θα χρησιμοποιηθούν αν η "
+"σύνδεση με το \"διαμεσολαβητή\" αποτύχει.\n"
+"Η σύνταξη είναι \"ΕΞΥΠΗΡΕΤΗΤΗΣ\" ή \"ΕΞΥΠΗΡΕΤΗΤΗΣ:ΘΥΡΑ\". Αν δεν οριστεί η "
+"ΘΥΡΑ, θα χρησιμοποιηθεί η 389 (η τυπική θύρα LDAP)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Προσθήκη δείγματος"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Προσθήκη"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Δείγμα:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Ομάδα:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Ρυθμίσεις δειγμάτων"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Συμβουλές εργαλείου"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Εμφάνιση κειμένου δείγμα&τος σε συμβουλή εργαλείου"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Ορίζει αν μια συμβουλή εργαλείου θα εμφανίζεται με το κείμενο από τη γραμμή "
+"με σελιδοδείκτη"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Μεταβλητές"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Μέθοδος εισαγωγής μεταβλητών"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Απλό παράθυρο διαλόγου για κάθε μεταβλητή μέσα στο δείγμα"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "Ένα παράθυρο διαλόγου θα εμφανιστεί για κάθε μεταβλητή μέσα στο δείγμα"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Ένα παράθυρο διαλόγου για όλες τις μεταβλητές μέσα σε ένα δείγμα"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Ένα παράθυρο διαλόγου θα εμφανιστεί όπου θα μπορείτε να εισάγετε τιμές για "
+"όλες τις μεταβλητές μέσα σε ένα δείγμα"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Οριοθέτης:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Απάντηση στον αποστολέα"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Απάντηση σε όλους/ Απάντηση σε λίστα"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Προώθηση μηνύματος"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Προειδοποίηση κατά την προσπάθεια αποστολής αν&υπόγραφων μηνυμάτων"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να προειδοποιείστε κατά την αποστολή "
+"ανυπόγραφων μηνυμάτων."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση σε προσπάθεια αποστολής ανυπόγραφων μηνυμάτων</h1>\n"
+"Αν ενεργοποιήσετε αυτή την επιλογή, θα προειδοποιείστε όταν προσπαθείτε να "
+"στείλετε κάποιο τμήμα ή ολόκληρο το μήνυμα χωρίς υπογραφή.\n"
+"<p>\n"
+"Προτείνεται η ενεργοποίηση αυτής της επιλογής για τη μέγιστη ακεραιότητα των "
+"μηνυμάτων σας.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Προειδοποίηση σε προσπά&θεια αποστολής μη κρυπτογραφημένων μηνυμάτων"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να προειδοποιείστε κατά την αποστολή μη "
+"κρυπτογραφημένων μηνυμάτων."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση σε προσπάθεια αποστολής μη κρυπτογραφημένων μηνυμάτων</"
+"h1>\n"
+"Αν ενεργοποιήσετε αυτή την επιλογή, θα προειδοποιείστε όταν προσπαθείτε να "
+"στείλετε κάποιο τμήμα ή ολόκληρο το μήνυμα χωρίς κρυπτογράφηση.\n"
+"<p>\n"
+"Προτείνεται η ενεργοποίηση αυτής της επιλογής για τη μέγιστη ακεραιότητα των "
+"μηνυμάτων σας.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Προειδοποίηση αν η διεύθυνση email του παραλήπτη &δε βρίσκεται στο "
+"πιστοποιητικό"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Ενεργοποιήστε αυτή την επιλογή για να προειδοποιείστε αν η διεύθυνση δεν "
+"υπάρχει στο πιστοποιητικό"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση αν η διεύθυνση Email του παραλήπτη δεν υπάρχει στο "
+"πιστοποιητικό</h1>\n"
+"Αν ενεργοποιήσετε αυτήν επιλογή, θα λαμβάνετε μία προειδοποίηση αν η "
+"διεύθυνση email του παραλήπτη δεν περιέχεται στο πιστοποιητικό "
+"κρυπτογράφησης.\n"
+"<p>\n"
+"Προτείνεται η ενεργοποίηση αυτής της επιλογής για μέγιστη ασφάλεια.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Προειδοποίηση αν τα πιστοποιητικά/κλειδιά λήγουν σύντομα (ρύθμιση χρονικών "
+"ορίων παρακάτω)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Χρήση για υπογραφή"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Χρήση για κρυπτογράφηση"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Επιλέξτε εδώ τον αριθμό ημερών"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση λήξης πιστοποιητικού υπογραφής</h1>\n"
+"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό υπογραφής "
+"σας θα παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
+"<p>\n"
+"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση λήξης πιστοποιητικού κρυπτογράφησης</h1>\n"
+"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό "
+"κρυπτογράφησης θα παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
+"<p>\n"
+"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση αν ένα πιστοποιητικό της ακολουθίας λήξει</h1>\n"
+"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο όλα τα πιστοποιητικά της "
+"ακολουθίας θα παραμένουν έγκυρα και δε θα εμφανίζουν προειδοποιήσεις.\n"
+"<p>\n"
+"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση λήξης πιστοποιητικού CA</h1>\n"
+"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό CA θα "
+"παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
+"<p>\n"
+"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Προειδοποίηση λήξης πιστοποιητικού ρίζας</h1>\n"
+"Επιλέξτε τον ελάχιστο αριθμό ημερών για τον οποίο το πιστοποιητικό ρίζας θα "
+"παραμένει έγκυρο και δε θα εμφανίζει προειδοποιήσεις.\n"
+"<p>\n"
+"Η προτεινόμενη ρύθμιση του SPHINX είναι 14 ημέρες.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Για πιστοποιητικά ρίζας:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Για ενδιάμεσα πιστοποιητικά CA:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Για πιστοποιητικά/κλειδιά χρήστη:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+"Ενεργοποίηση ξανά όλων των μηνυμάτων που έχουν απενεργοποιηθεί με την "
+"επιλογή \"Να μην ερωτηθώ ξανά\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...ότι μπορείτε να μεταβείτε στο επόμενο και στο προηγούμενο μήνυμα "
+"χρησιμοποιώντας το δεξί και το αριστερό πλήκτρο βέλους αντίστοιχα;</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...ότι μπορείτε να δημιουργήσετε φίλτρα στον αποστολέα, \n"
+"το θέμα και τις λίστες ταχυδρομείου από το μενού <em>Μήνυμα-&gt;"
+"Δημιουργία&nbsp;φίλτρου</em>;</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ότι μπορείτε να απαλλαγείτε από το πεδίο &quot;[όνομα λίστας "
+"ταχυδρομείου]&quot;\n"
+"που προστίθεται στο θέμα κάποιων λιστών χρησιμοποιώντας την ενέργεια "
+"φίλτρου\n"
+"<em>Επανεγγραφή κεφαλίδας</em>; Απλώς χρησιμοποιήστε την επιλογή\n"
+"<pre>Επανεγγραφή κεφαλίδας &quot;Θέμα&quot;\n"
+"   αντικατάσταση &quot;\\s*\\[όνομα λίστας ταχυδρομείου\\]\\s*&quot;\n"
+"   με το &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...ότι μπορείτε να αντιστοιχίσετε φακέλους με λίστες ταχυδρομείου στο\n"
+"διάλογο <em>Φάκελος-&gt;Διαχείριση λίστας ταχυδρομείου</em>; Μπορείτε να \n"
+"χρησιμοποιήσετε την επιλογή <em>Μήνυμα-&gt;Νέο&nbsp;Μήνυμα&nbsp;Προς&nbsp;"
+"Λίστα&nbsp;ταχυδρομείου...</em>\n"
+"για να ανοίξετε το παράθυρο σύνταξης μηνύματος με προκαθορισμένη τη "
+"διεύθυνση της λίστας.\n"
+"Εναλλακτικά, μπορείτε να κάνετε μεσαίο κλικ στο φάκελο.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...ότι μπορείτε να αντιστοιχίσετε προσαρμοσμένα εικονίδια σε κάθε φάκελο "
+"ξεχωριστά;\n"
+"Δείτε την επιλογή <em>Φάκελος-&gt;Ιδιότητες</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...ότι το KMail μπορεί να εμφανίσει μια χρωματιστή γραμμή που δείχνει\n"
+"τον τύπο του μηνύματος (Απλό κείμενο/HTML/OpenPGP);</p>\n"
+"<p>Αυτό ματαιώνει προσπάθειες επιτυχούς μίμησης επαληθεύσεων υπογραφής\n"
+"με την αποστολή μηνυμάτων HTML που μιμούνται τα πλαίσια κατάστασης υπογραφής "
+"του KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...ότι μπορείτε να φιλτράρετε με βάση οποιαδήποτε κεφαλίδα απλά\n"
+"εισάγοντας το όνομά της στο πρώτο πεδίο ενός κανόνα αναζήτησης;</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ότι μπορείτε να φιλτράρετε μηνύματα HTML με τον κανόνα\n"
+"<pre>&quot;Τύπος περιεχομένου&quot; περιέχει &quot;κείμενο/html&quot;;</"
+"pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...ότι όταν απαντάτε, μόνο το επιλεγμένο τμήμα του μηνύματος μπαίνει σε "
+"παράθεση;</p>\n"
+"<p>Αν δεν έχει επιλεγεί τίποτα, μπαίνει σε παράθεση ολόκληρο το μήνυμα.</p>\n"
+"<p>Αυτό λειτουργεί και για το κείμενο των επισυνάψεων όταν\n"
+"έχει επιλεγεί το <em>Προβολή-&gt;Συνημμένα-&gt;Εμβόλιμα\t</em>.</p>\n"
+"<p>Αυτό το χαρακτηριστικό είναι διαθέσιμο με όλες τις εντολές απάντησης "
+"εκτός του\n"
+"<em>Μήνυμα-&gt;Απάντηση χωρίς παράθεση</em>.</p>\n"
+"<p align=\"right\"><em>Συνεισφορά του David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Εμφάνιση γραμμής γρήγορης αναζήτησης φακέλων"
@@ -15665,7 +15240,9 @@ msgstr "Αντικατάσταση αρχείου;"
 #~ msgstr "Ανάκτηση νέων μηνυμάτων"
 
 #~ msgid "Only filter mails received in disconnected IMAP inbox."
-#~ msgstr "Φιλτράρισμα μόνο των μηνυμάτων που λήφθηκαν στα εισερχόμενα ενός αποσυνδεδεμένου IMAP."
+#~ msgstr ""
+#~ "Φιλτράρισμα μόνο των μηνυμάτων που λήφθηκαν στα εισερχόμενα ενός "
+#~ "αποσυνδεδεμένου IMAP."
 
 #~ msgid "Show folder quick search line edit"
 #~ msgstr "Εμφάνιση γραμμής γρήγορης αναζήτησης φακέλων"
diff --git a/tde-i18n-en_GB/messages/tdepim/kmail.po b/tde-i18n-en_GB/messages/tdepim/kmail.po
index 6eed31bec21..f5f610fbfa3 100644
--- a/tde-i18n-en_GB/messages/tdepim/kmail.po
+++ b/tde-i18n-en_GB/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2006-03-12 17:42+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Malcolm Hunter,Dwayne Bailey"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -170,6 +170,12 @@ msgstr "Non&e (use with care)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Account for semiautomatic resource handling"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Clear Past"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -246,13 +252,13 @@ msgstr "&Login:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -273,20 +279,20 @@ msgstr "Sto&re POP password"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Tick this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -314,11 +320,13 @@ msgstr "&Filter messages if they are greater than"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -367,13 +375,15 @@ msgstr "Clear te&xt"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -416,14 +426,14 @@ msgstr "Namespaces:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -481,13 +491,13 @@ msgstr "Load attach&ments on demand"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -527,7 +537,7 @@ msgstr "<none>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "inbox"
 
@@ -535,45 +545,47 @@ msgstr "inbox"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialogue;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -581,51 +593,51 @@ msgstr "Please specify a server and port on the General tab first."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -702,11 +714,11 @@ msgstr "IMAP Account"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -742,13 +754,13 @@ msgstr "Welcome to KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -810,8 +822,7 @@ msgstr "Use local delivery"
 msgid "Server Information"
 msgstr "Server Information"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "None"
@@ -949,29 +960,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behaviour."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behaviour."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -979,8 +988,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Please select the tools to be used for the spam detection and go to the next "
-"page.</p>"
+"<p>Please select the tools to be used for the spam detection and go to the "
+"next page.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -999,8 +1008,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"The default folder for spam messages is the wastebin folder, but you may change "
-"that in the folder view below."
+"The default folder for spam messages is the wastebin folder, but you may "
+"change that in the folder view below."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1008,15 +1017,13 @@ msgstr "Move &probable spam to:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1026,13 +1033,13 @@ msgstr "Check messages using the anti-virus tools"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1041,8 +1048,8 @@ msgstr "Move detected viral messages to the selected folder"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "A filter to detect messages classified as virus-infected and to move those "
 "messages into a predefined folder is created. The default folder is the "
@@ -1054,11 +1061,11 @@ msgstr "Additionally, mark detected viral messages as read"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1253,8 +1260,8 @@ msgstr "Error while reading folder %1 on the server: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1274,8 +1281,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1306,21 +1313,21 @@ msgstr "Deleted"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any:"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1349,18 +1356,21 @@ msgstr "Error occurred while compacting \"%1\". Compaction aborted."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Load Profile..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configure KMail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Add..."
@@ -1390,6 +1400,11 @@ msgstr "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Remove Identity"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "R&emove"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Add..."
@@ -1398,6 +1413,11 @@ msgstr "Add..."
 msgid "Modify..."
 msgstr "Modify..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "R&emove"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Set as Default"
@@ -1414,17 +1434,15 @@ msgstr "&Sending"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Outgoing accounts (add at least one):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Name"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1446,8 +1464,7 @@ msgstr "Set Default"
 msgid "Common Options"
 msgstr "Common Options"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Confirm &before send"
@@ -1498,17 +1515,16 @@ msgstr "Defaul&t domain:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1526,9 +1542,9 @@ msgstr "Add Transport"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Default)"
 
@@ -1611,6 +1627,10 @@ msgstr "Modify Account"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Unable to locate account <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Colou&rs"
@@ -1719,8 +1739,7 @@ msgstr "Followed Link"
 msgid "Misspelled Words"
 msgstr "Misspelt Words"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "New Message"
@@ -1909,11 +1928,11 @@ msgstr "Threads default to clo&sed"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1921,71 +1940,57 @@ msgstr "Date Display"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -1999,8 +2004,7 @@ msgstr "Show HTML stat&us bar"
 msgid "Show s&pam status in fancy headers"
 msgstr "Show s&pam status in fancy headers"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Replace smileys by emoticons"
@@ -2009,8 +2013,7 @@ msgstr "Replace smileys by emoticons"
 msgid "Use smaller font for quoted text"
 msgstr "Use smaller font for quoted text"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Show expand/collapse quote marks"
@@ -2036,8 +2039,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Override character encoding:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Enable system tray icon"
@@ -2141,21 +2143,19 @@ msgstr "<b>%f</b> will be replaced with the filename to edit."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2178,21 +2178,20 @@ msgstr "Repl&y to all:"
 msgid "&Forward:"
 msgstr "&Forward:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Quote indicator:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "On %D, you wrote:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "On %D, %F wrote:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Forwarded Message"
 
@@ -2230,11 +2229,11 @@ msgstr "Enter new forward prefix:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2268,10 +2267,9 @@ msgstr "Value"
 msgid "Ne&w"
 msgstr "Ne&w"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Name:"
@@ -2280,19 +2278,18 @@ msgstr "&Name:"
 msgid "&Value:"
 msgstr "&Value:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-compatible attachment naming"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2319,21 +2316,21 @@ msgstr "attached"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2357,111 +2354,99 @@ msgstr "Crypto Backe&nds"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalisation of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalisation of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2477,15 +2462,15 @@ msgstr "Allow messages to load e&xternal references from the Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2567,8 +2552,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "This option requires dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "no proxy"
@@ -2597,8 +2581,8 @@ msgstr "E&xclude important messages from expiry"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "When trying to find unread messages:"
 
@@ -2622,8 +2606,8 @@ msgstr "Loop in All Folders"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "When entering a folder:"
 
@@ -2692,27 +2676,23 @@ msgstr "Directories (\"maildir\" format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2747,54 +2727,44 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Full text indexing allows very fast searches on the content of your "
 "messages. When enabled, the search dialogue will work very fast. Also, the "
-"search tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2861,11 +2831,11 @@ msgstr "&Hide groupware folders"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"When this is ticked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is ticked, you will not see the IMAP resource folders in the "
+"folder tree."
 
 #: configuredialog.cpp:4909
 #, fuzzy
@@ -2875,11 +2845,11 @@ msgstr "&Resource folders are in account:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"When this is ticked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is ticked, you will not see the IMAP resource folders in the "
+"folder tree."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2936,19 +2906,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-compatible attachment naming"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatic invitation sending"
@@ -2963,23 +2932,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3087,17 +3056,16 @@ msgstr "&Forward"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3115,15 +3083,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3197,8 +3165,8 @@ msgstr "Edit Identity"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3457,6 +3425,11 @@ msgstr "Select Folder"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Select All Text"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3488,11 +3461,11 @@ msgstr "&Log filter activities"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3508,15 +3481,17 @@ msgstr "Log filter &rule evaluation"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option ticked will give detailed feedback "
-"for each single filter rule; alternatively, only feedback about the result of "
-"the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option ticked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3536,15 +3511,15 @@ msgstr "unlimited"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3554,7 +3529,7 @@ msgstr ""
 "Could not write the file %1:\n"
 "\"%2\" is the detailed error description."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail Error"
@@ -3595,13 +3570,13 @@ msgstr "&User identifier:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3652,8 +3627,8 @@ msgstr "You do not have read/write permission to your wastebin folder."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "Information not retrieved from server yet, please use \"Check Mail\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3664,8 +3639,7 @@ msgstr "Error: no IMAP account defined for this folder"
 msgid "Connecting to server %1, please wait..."
 msgstr "Connecting to server %1, please wait..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Error connecting to server %1"
@@ -3693,11 +3667,11 @@ msgstr "Add Permissions"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3728,7 +3702,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Local Folders"
@@ -3753,13 +3727,13 @@ msgstr "Select Shortcut for Folder"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3779,14 +3753,23 @@ msgstr "C&ancel"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Unknown"
@@ -3911,69 +3894,17 @@ msgstr "Spam Status:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3985,19 +3916,13 @@ msgstr "&Your name:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4005,17 +3930,13 @@ msgstr "&Organisation:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisation</h3>"
-"<p>This field should have the name of your organisation if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organisation</h3><p>This field should have the name of your "
+"organisation if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4024,20 +3945,15 @@ msgstr "&Email address:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address."
+"</p><p>If you leave this blank, or get it wrong, people will have trouble "
+"replying to you.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4046,21 +3962,12 @@ msgstr "&Email address:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4084,19 +3991,17 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4108,31 +4013,27 @@ msgstr "Your OpenPGP Encryption Key"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4152,17 +4053,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4174,27 +4073,25 @@ msgstr "Your S/MIME Encryption Certificate"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4214,23 +4111,19 @@ msgstr "&Reply-To address:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4238,25 +4131,19 @@ msgstr "&BCC addresses:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4296,7 +4183,7 @@ msgstr "&Signature"
 msgid "&Picture"
 msgstr "&Picture"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Invalid Email Address"
 
@@ -4319,11 +4206,11 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4384,8 +4271,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Default)"
 
@@ -4432,19 +4319,19 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4483,17 +4370,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Error: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4642,14 +4534,14 @@ msgstr "List Archives"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4678,222 +4570,182 @@ msgstr "Unusable Encryption Keys"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4907,211 +4759,171 @@ msgstr "S/MIME Certificate Expires Soon"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5123,15 +4935,17 @@ msgstr "S/MIME Certificate Expires Soon"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialogue.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialogue.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 
@@ -5161,43 +4975,43 @@ msgstr "Unusable Signing Keys"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 
@@ -5207,13 +5021,13 @@ msgstr "Do Not OpenPGP-Sign"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 
@@ -5237,11 +5051,11 @@ msgstr "No signing possible"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5262,11 +5076,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5310,11 +5124,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "No valid and trusted encryption key was found for \"%1\".\n"
 "\n"
@@ -5363,10 +5177,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Critical error: Unable to collect mail: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
+msgstr "Failed to add message:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5456,6 +5268,50 @@ msgstr "&Disconnected IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir mailbox"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Set subject of message"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Send CC: to 'address'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Send BCC: to 'address'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Add 'header' to message"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Read message body from 'file'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Set body of message"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Add an attachment to the mail. This can be repeated"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Only check for new mail"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Only open composer window"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "View the given message file"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Send message to 'address' resp. attach the file the 'URL' points to"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mail"
@@ -5512,13 +5368,13 @@ msgstr "%1: found folder %2. It will be set as the main groupware folder."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5567,11 +5423,11 @@ msgstr "URL copied to clipboard."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Save to File"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Replace"
 
@@ -5589,7 +5445,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5609,99 +5465,99 @@ msgstr "The file does not contain a message."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "The file contains multiple messages. Only the first message is shown."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Deleting messages"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Moving message %3 of %2 from %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Not enough free disk space?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Move to This Folder"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copy to This Folder"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Deleting messages"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Opening URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Do you really want to execute <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Execute"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Found no attachments to save."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Save Attachments To"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "attachment.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "attachment.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "A file named %1 already exists. Do you want to overwrite it?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "File Already Exists"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Overwrite"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5709,19 +5565,19 @@ msgstr ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail Question"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Keep Encryption"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Do Not Keep"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5729,11 +5585,11 @@ msgstr ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Keep Signature"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5742,22 +5598,22 @@ msgstr ""
 "Could not write the file %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Could not write the file %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5767,51 +5623,51 @@ msgstr ""
 " %1\n"
 " it is not possible to determine who to chat with."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus Backend Error"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus Decryption Key Selection"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5819,26 +5675,26 @@ msgstr ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus Decryption Error"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Mail"
@@ -5937,7 +5793,7 @@ msgstr "Size"
 msgid "Encoding"
 msgstr "Encoding"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Compress"
 
@@ -5949,7 +5805,7 @@ msgstr "Encrypt"
 msgid "Sign"
 msgstr "Sign"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Name of the attachment:"
 
@@ -5971,9 +5827,11 @@ msgstr "Primary Recipients"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5982,14 +5840,14 @@ msgstr "Additional Recipients"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5997,13 +5855,11 @@ msgstr "Hidden Recipients"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6013,7 +5869,7 @@ msgstr "&Send Mail"
 msgid "&Send Mail Via"
 msgstr "&Send Mail Via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Send &Later"
@@ -6080,8 +5936,7 @@ msgstr "Re&move Quote Characters"
 msgid "Cl&ean Spaces"
 msgstr "Cl&ean Spaces"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Use Fi&xed Font"
@@ -6223,31 +6078,31 @@ msgstr "&Cryptographic Message Format"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Bulleted List (Disc)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Bulleted List (Circle)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Bulleted List (Square)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Ordered List (Decimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Ordered List (Alpha lower)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Ordered List (Alpha upper)"
 
@@ -6356,61 +6211,61 @@ msgstr "Close Composer"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "File Attachment Reminder"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Send as Is"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail could not recognise the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognise the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Attach File"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Attach"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Insert File"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Insert File"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6449,20 +6304,35 @@ msgid ""
 "View"
 msgstr "View"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Edit..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Edit Script..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Save &As..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Properties"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Add Attachment..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail could not compress the file."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6470,77 +6340,73 @@ msgstr ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Keep"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail could not uncompress the file."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Save Attachment As"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Add as Text"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Add as Attachment"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Paste as Attac&hment"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "unnamed"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Undefined Encryption Key"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Undefined Signing Key"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6548,93 +6414,91 @@ msgstr ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "You did not specify a subject. Send message anyway?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "No Name Specified"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "You did not specify a subject. Send message anyway?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "No Subject Specified"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "S&end as Is"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Specify the Subject"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Keep markup, do not sign/encrypt"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Keep markup, do not encrypt"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Keep markup, do not sign"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Sign/Encrypt (delete markup)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Encrypt (delete markup)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Sign (delete markup)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Sign/Encrypt Message?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6643,75 +6507,75 @@ msgstr ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Please create an account for sending and try again."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "About to send email..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Send Confirmation"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Send Now"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "No recipients"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Additional Recipients"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Spellchecker"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Spellchecker"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Spell check cancelled."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Spell check stopped."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Spell check complete."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Spellchecker"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialogue's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialogue's "
+"Security page."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6719,34 +6583,34 @@ msgstr ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "No Chiasmus Backend Configured"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "No Chiasmus Keys Found"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus Encryption Key Selection"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Message was signed by %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Message was signed by %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP Message - Encrypted"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Message with subject: "
@@ -6796,11 +6660,11 @@ msgstr "Spellcheck - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6833,13 +6697,11 @@ msgstr "<qt>Too many filter actions in filter rule <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7058,170 +6920,138 @@ msgstr "Play Sound"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialogue.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialogue.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialogue by clicking <em>Cancel</em> "
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialogue by clicking <em>Cancel</em> "
 "to discard the changes made.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialogue.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialogue.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tick this button to force the confirmation dialogue to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Tick this button to force the confirmation dialogue to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialogue popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 
 #: kmfilterdlg.cpp:133
@@ -7232,6 +7062,16 @@ msgstr "POP3 Filter Rules"
 msgid "Filter Rules"
 msgstr "Filter Rules"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Import"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Import"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Available Filters"
@@ -7313,6 +7153,11 @@ msgstr "Additionally add this filter to the toolbar"
 msgid "Icon for this filter:"
 msgstr "Icon for this filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "To"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Up"
@@ -7321,16 +7166,29 @@ msgstr "Up"
 msgid "Down"
 msgstr "Down"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Rename..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "New"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copy To"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Deleted"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7339,12 +7197,12 @@ msgstr "Select Shortcut for Folder"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 
 #: kmfilterdlg.cpp:786
 msgid ""
@@ -7426,27 +7284,23 @@ msgstr "Troubleshooting IMAP Cache"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronising an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronising an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>"
 
@@ -7485,8 +7339,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7525,11 +7379,11 @@ msgstr "The index of this folder has been recreated."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7656,14 +7510,11 @@ msgstr "Creating subfolders on server"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7684,13 +7535,11 @@ msgstr "Retrieving folders for namespace %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7698,20 +7547,20 @@ msgstr "Aborted"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7724,17 +7573,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>There are new messages in this folder, which have not been uploaded to the "
-"server yet, but you do not seem to have sufficient access rights on the folder "
-"now to upload them. Please contact your administrator to allow upload of new "
-"messages to you, or move them out of this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder, which have not been uploaded to "
+"the server yet, but you do not seem to have sufficient access rights on the "
+"folder now to upload them. Please contact your administrator to allow upload "
+"of new messages to you, or move them out of this folder.</p> <p>Do you want "
+"to move these messages to another folder now?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7743,20 +7592,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>There are new messages in this folder, which have not been uploaded to the "
-"server yet, but you do not seem to have sufficient access rights on the folder "
-"now to upload them. Please contact your administrator to allow upload of new "
-"messages to you, or move them out of this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder, which have not been uploaded to "
+"the server yet, but you do not seem to have sufficient access rights on the "
+"folder now to upload them. Please contact your administrator to allow upload "
+"of new messages to you, or move them out of this folder.</p> <p>Do you want "
+"to move these messages to another folder now?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Move to:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Do Not Move"
 
@@ -7768,8 +7622,7 @@ msgstr "Move Messages to Folder"
 msgid "Permissions (ACL)"
 msgstr "Permissions (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "General"
@@ -7794,8 +7647,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Use custom &icons"
@@ -7814,23 +7666,21 @@ msgstr "Act on new/unread mail in this folder"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7842,13 +7692,13 @@ msgstr "Keep replies in this folder"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Tick this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7858,17 +7708,21 @@ msgstr "Show Sender/Receiver Column in List of Messages"
 msgid "Sho&w column:"
 msgstr "Sho&w column:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Set Default"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Sender"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Receiver"
@@ -7879,17 +7733,17 @@ msgstr "&Sender identity:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialogue. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialogue. (Settings -> Configure KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7907,12 +7761,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -7920,12 +7774,12 @@ msgstr ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7956,23 +7810,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialogue is closed. If you "
-"want to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialogue is closed. "
+"If you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8042,11 +7896,13 @@ msgstr "Error while getting folder information."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8064,7 +7920,8 @@ msgid ""
 msgstr ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8072,11 +7929,11 @@ msgstr "Error opening %1; this folder is missing."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8116,21 +7973,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8189,7 +8042,7 @@ msgstr ""
 "'%1' does not appear to be a folder.\n"
 "Please move the file out of the way."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8197,7 +8050,7 @@ msgstr ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8207,8 +8060,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8216,7 +8069,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Failed to create folder"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8317,13 +8170,13 @@ msgstr "&Troubleshoot IMAP Cache..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
-"server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on "
+"the server. If you think you should be able to create subfolders here, ask "
+"your administrator to grant you rights to do so.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8460,15 +8313,15 @@ msgstr "%1 Folder is read-only."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"<qt>Do you really want to delete the selected message?<br>Once deleted, it "
+"cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8520,134 +8373,131 @@ msgstr ""
 "Failure modifying %1\n"
 "(No space left on device?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Certificate Signature Request"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Please create a certificate from attachment and return to sender."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail is set to be offline; all network jobs are suspended"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail is set to be online; all network jobs resumed"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail is currently in offline mode. How do you want to proceed?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Work Online"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "You do not have read/write permission to your inbox folder."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "outbox"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "You do not have read/write permission to your outbox folder."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "sent-mail"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "You do not have read/write permission to your sent-mail folder."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "wastebin"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "You do not have read/write permission to your wastebin folder."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "drafts"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "You do not have read/write permission to your drafts folder."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Replace"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "You do not have read/write permission to your wastebin folder."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Last Search"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrate Mail Files?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail encountered a fatal error and will terminate now"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8658,11 +8508,11 @@ msgstr ""
 "The error was:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Empty Wastebin"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Are you sure you want to empty the wastebin folders of all accounts?"
 
@@ -8738,8 +8588,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>New mail arrived</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8777,11 +8626,11 @@ msgstr "Are you sure you want to empty the wastebin folder?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the wastebin?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"wastebin?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8805,11 +8654,11 @@ msgstr "Delete Search"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8822,43 +8671,44 @@ msgstr "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Wastebin "
-"folder and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Wastebin folder and are permanently deleted.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Wastebin "
-"folder and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Wastebin folder and are permanently deleted.</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Wastebin "
-"folder and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Wastebin folder and are permanently deleted."
+"</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Deleted"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8874,13 +8724,13 @@ msgstr "Are you sure you want to expire all old messages?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8893,12 +8743,12 @@ msgstr "Use HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8914,12 +8764,12 @@ msgstr "Filter on Mailing-List %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 
 #: kmmainwidget.cpp:1743
@@ -8935,9 +8785,11 @@ msgstr "Could not start certificate manager; please check your installation."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 
 #: kmmainwidget.cpp:2508
 #, fuzzy
@@ -9272,8 +9124,7 @@ msgstr "Save A&ttachments..."
 msgid "Appl&y All Filters"
 msgstr "Appl&y All Filters"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&pply Filter"
@@ -9389,7 +9240,6 @@ msgstr "Next &Unread Message"
 msgid "Go to the next unread message"
 msgstr "Go to the next unread message"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Previous Message"
@@ -9530,69 +9380,69 @@ msgstr " Initialising..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9622,17 +9472,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Receipt: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Attachment: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Show attachments as suggested by sender."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9682,45 +9532,39 @@ msgstr "Message Part Properties"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9728,17 +9572,15 @@ msgstr "&Description:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9746,23 +9588,21 @@ msgstr "&Encoding:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9770,21 +9610,17 @@ msgstr "Suggest &automatic display"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tick this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Tick this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9792,14 +9628,12 @@ msgstr "&Sign this part"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tick this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Tick this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9808,13 +9642,11 @@ msgstr "Encr&ypt this part"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tick this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Tick this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9828,17 +9660,13 @@ msgstr "POP Filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by ticking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by ticking the appropriate button."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10090,40 +9918,38 @@ msgstr "The email client for the K Desktop Environment."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10131,18 +9957,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the K Desktop Environment. It is designed to be fully compatible "
+"with Internet mailing standards including MIME, SMTP, POP3 and IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10151,20 +9975,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 
@@ -10205,7 +10027,8 @@ msgstr "View Attachment: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Attachment contains binary data. Trying to show first character.]\n"
@@ -10233,12 +10056,14 @@ msgstr "Open Attachment?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10260,6 +10085,58 @@ msgstr "(match any of the following)"
 msgid "(match all of the following)"
 msgstr "(match all of the following)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Read"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Old"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Deleted"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Replied"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Forwarded"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Queued"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sent"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Watched"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignored"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "To-do"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Has Attachment"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10344,25 +10221,25 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "It is not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialogue and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialogue and then try again."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10387,11 +10264,11 @@ msgstr "Initiating sender process..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10415,15 +10292,17 @@ msgstr "Failed to send (some) queued messages."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 
@@ -10433,21 +10312,17 @@ msgstr "Sending aborted."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10465,15 +10340,17 @@ msgstr "&Abort Sending"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 
@@ -10512,43 +10389,43 @@ msgstr "You need to supply a username and a password to use this SMTP server."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10559,6 +10436,10 @@ msgstr "Start %1"
 msgid "Exit"
 msgstr "Exit"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "New Messages In"
@@ -10585,15 +10466,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10672,11 +10555,11 @@ msgstr "Server &requires authentication"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Tick this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Tick this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10696,15 +10579,13 @@ msgstr "Sen&d custom hostname to server"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Tick this option to have KMail use a custom hostname when identifying itself to "
-"the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Tick this option to have KMail use a custom hostname when identifying itself "
+"to the mail server.<p>This is useful when your system's hostname may not be "
+"set correctly or to mask your system's true hostname."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10734,11 +10615,11 @@ msgstr "Only local files allowed."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10750,10 +10631,10 @@ msgstr "Error while listing folder %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10975,35 +10856,27 @@ msgstr "&Edit Message"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialogue.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialogue's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialogue.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialogue's Identity->Advanced tab.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11015,11 +10888,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11035,20 +10908,20 @@ msgstr "Chiasmus Encryption Error"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 
 #: messagecomposer.cpp:640
@@ -11157,12 +11030,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11195,11 +11068,13 @@ msgstr "Do &Not Encrypt"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11208,13 +11083,13 @@ msgstr "Send Unencrypted?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 
 #: messagecomposer.cpp:950
@@ -11237,50 +11112,44 @@ msgstr "&Encrypt All Parts"
 msgid "Unencrypted Message Warning"
 msgstr "Unencrypted Message Warning"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Some Characters Will Be Lost"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Lose Characters"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Change Encoding"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11288,37 +11157,39 @@ msgstr ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11339,15 +11210,15 @@ msgstr "Mailbox &format:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11356,12 +11227,12 @@ msgstr "Folder &contains:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11399,8 +11270,7 @@ msgstr "Different results for signatures"
 msgid "The crypto engine returned no cleartext data."
 msgstr "The crypto engine returned no cleartext data."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11429,11 +11299,11 @@ msgstr "No %1 plug-in was found."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11469,27 +11339,27 @@ msgstr "Crypto plug-in \"%1\" cannot decrypt messages."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11745,11 +11615,11 @@ msgstr "stored: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11865,15 +11735,17 @@ msgstr "Kioslave Error Message"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Your POP3 server does not support the UIDL command: this command is required to "
-"determine, in a reliable way, which of the mails on the server KMail has "
+"Your POP3 server does not support the UIDL command: this command is required "
+"to determine, in a reliable way, which of the mails on the server KMail has "
 "already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 
 #: popaccount.cpp:752
 msgid ""
@@ -11893,9 +11765,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11911,1856 +11785,14 @@ msgstr "Invalid Response From Server"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Go"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "F&older"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Message"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Reply Special"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Forward"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML Toolbar"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signing"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Automatically sign messages"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Encrypting"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Show s&igned/encrypted text after composing"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Store sent messages encry&pted"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Tick to store messages encrypted "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is ticked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Always show the encryption keys &for approval"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialogue if it cannot find the right "
-"key or if there are several which could be used."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automatically encrypt &messages whenever possible"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Never sign/encrypt when sa&ving as draft"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "To: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "General"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Reply To"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Reply to &All..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Forward"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Shortcut:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Replace"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Folder Properties"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Folder holds a &mailing list"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "List &address:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Unr&ead:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Message Expiring"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "E&xpire after:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Expire &read messages"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Expire a&fter:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Expire &unread messages"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Day(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Week(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Month(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Advanced"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Sender identit&y:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Storage format:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&List displays:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validate certificates using CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validate certificates online (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Online Certificate Validation"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP responder URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP responder signature:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignore service URL of certificates"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Do not check certificate policies"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Never consult a CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"If this option is ticked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Fetch missing issuer certificates"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"If this option is ticked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP Requests"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Do not perform any HTTP requests"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Entirely disables the use of HTTP for S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Use this proxy for HTTP requests: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Use system HTTP proxy:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignore HTTP CRL distribution point of certificates"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP Requests"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Do not perform any LDAP requests"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Entirely disables the use of LDAP for S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignore LDAP CRL distribution point of certificates"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primary host for LDAP requests:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Add..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Reset Font Settings"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "unlimited"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Signature Configuration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Reply to se&nder:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Reply to &All..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Forwarded Message"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Warn when trying to send &unsigned messages"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Tick to be warned when sending unsigned messages."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is ticked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Warn when trying to send unencrypted messages"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Tick to be warned when sending unencrypted messages."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is ticked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Warn if &Receiver's Email Address is Not in Certificate"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Tick to be warned if the address is not in the certificate"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is ticked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Warn if certificates/keys expire soon (configure thresholds below)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "For signing"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "For encryption"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " days"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Select the number of days here"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "For root certificates:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "For intermediate CA certificates:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "For end-user certificates/keys:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Re-enable All \"Don't Ask Again\" Warnings"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Folder contents:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Replace"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Replace"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Send queued mail on mail check"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>There are new messages in this folder, which have not been uploaded to the "
-"server yet, but you do not seem to have sufficient access rights on the folder "
-"now to upload them. Please contact your administrator to allow upload of new "
-"messages to you, or move them out of this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "The most recently selected folder in the folder selection dialogue."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Policy for showing the system tray icon"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Verbose new mail notification"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Specify e&ditor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Use e&xternal editor instead of composer"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Enable groupware functionality"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Mangle From:/To: headers in replies to replies"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Send groupware invitations in the mail body"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automatic invitation sending"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"When this is ticked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can untick this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook and KNotes).</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the TDE Control Centre.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>This is the ID of the account holding the IMAP resource folders.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maximal number of connections per host"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Show quick search line edit"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "Keep original charset when replying or forwarding if possible"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomatically append signature"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Word &wrap at column:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Warn if root certificate expires in &less than:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Automatically request &message disposition notifications"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Use recent addresses for autocompletion"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Autosave interval:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Replace recognised prefi&x with \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Replace recognised prefix with \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Use smart &quoting"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "The signature has expired."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Type of addressee selector"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Sets the type of the dialogue for selecting recipients for To,\n"
-"        CC and BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Type of recipients editor"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maximum number of recipient editor lines."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "Keep original charset when replying or forwarding if possible"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatic collapse level:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reduce font size for quoted text"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Enable this option to show quoted text with a smaller font."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Store sent messages encry&pted"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Show s&pam status in fancy headers"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Send Message Disposition Notifications with an empty sender."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, untick this option."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Message List - New Messages"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Add &Quote Characters"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13871,6 +11903,11 @@ msgstr "Add as CC"
 msgid "Add as BCC"
 msgstr "Add as BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "C&ancel"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13886,15 +11923,15 @@ msgstr "Selected Recipients"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "You selected 1 recipient. The maximum supported number of recipients is %1. "
 "Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13910,8 +11947,8 @@ msgstr "Use the Address-Selection Dialogue"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "This button opens a separate dialogue where you can select recipients out of "
 "all available addresses."
@@ -14016,13 +12053,23 @@ msgstr "is greater than or equal to"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " days"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14175,16 +12222,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Collecting data for account '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14203,10 +12246,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Contents of script '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14229,20 +12270,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve capabilities:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(No special capabilities available)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Available Sieve scripts:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14320,11 +12357,11 @@ msgstr "Use this field to enter an arbitrary static signature."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14340,22 +12377,27 @@ msgstr "Opens the specified file in a text editor."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "S&pecify command:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "New entry:"
@@ -14392,6 +12434,11 @@ msgstr "Add Account"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Apply &to:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14406,6 +12453,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Edit Script..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14445,9 +12496,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14487,6 +12538,16 @@ msgstr ""
 "Cannot open file \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "To: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14522,36 +12583,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14561,8 +12618,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14578,8 +12634,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14621,8 +12676,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -14792,6 +12846,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14828,110 +12886,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialogue? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...that KMail can show a colour bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "There is nothing to undo."
@@ -14999,6 +12953,16 @@ msgstr "Attachment %1 (unnamed)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Overwrite File?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15115,13 +13079,13 @@ msgstr "&Send picture with every message"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Tick this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"written with this identity. An X-Face is a small (48x48 pixels) black and "
+"white image that some mail clients are able to display."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15149,13 +13113,13 @@ msgstr "Select File..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15163,21 +13127,21 @@ msgstr "Set From Address Book"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15185,11 +13149,11 @@ msgstr "Use this field to enter an arbitrary X-Face string."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15204,129 +13168,1754 @@ msgstr "No Picture"
 msgid "You do not have your own contact defined in the address book."
 msgstr "You do not have your own contact defined in the address book."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signing"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Automatically sign messages"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Encrypting"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Set subject of message"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Show s&igned/encrypted text after composing"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Add 'header' to message"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Store sent messages encry&pted"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Read message body from 'file'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Tick to store messages encrypted "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Set body of message"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is ticked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Always show the encryption keys &for approval"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Only check for new mail"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialogue if it cannot find the "
+"right key or if there are several which could be used."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Only open composer window"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automatically encrypt &messages whenever possible"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "View the given message file"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Never sign/encrypt when sa&ving as draft"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Read"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Old"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "General"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Deleted"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Reply To"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Replied"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Reply to &All..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Forwarded"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Forward"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Queued"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Shortcut:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sent"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Replace"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Watched"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Folder contents:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignored"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Replace"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Replace"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Folder Properties"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "To-do"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Folder holds a &mailing list"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Has Attachment"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "List &address:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Unr&ead:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Message Expiring"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "E&xpire after:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Expire &read messages"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Expire a&fter:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Expire &unread messages"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Day(s)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Week(s)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Month(s)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Advanced"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Sender identit&y:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Storage format:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&List displays:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Send queued mail on mail check"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
 msgstr ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<p>There are new messages in this folder, which have not been uploaded to "
+"the server yet, but you do not seem to have sufficient access rights on the "
+"folder now to upload them. Please contact your administrator to allow upload "
+"of new messages to you, or move them out of this folder.</p> <p>Do you want "
+"to move these messages to another folder now?</p>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Overwrite File?"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "The most recently selected folder in the folder selection dialogue."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Policy for showing the system tray icon"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Verbose new mail notification"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Specify e&ditor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Use e&xternal editor instead of composer"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Enable groupware functionality"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Mangle From:/To: headers in replies to replies"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Send groupware invitations in the mail body"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automatic invitation sending"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"When this is ticked, you will not see the mail composer window. Instead, all "
+"invitation mails are sent automatically. If you want to see the mail before "
+"sending it, you can untick this option. However, be aware that the text in "
+"the composer window is in iCalendar syntax, and you should not try modifying "
+"it by hand."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook and KNotes).</p><p>If you want to set "
+"this option you must also set the applications to use the IMAP resource; "
+"this is done in the TDE Control Centre.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>This is the ID of the account holding the IMAP resource folders.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maximal number of connections per host"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Show quick search line edit"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "Keep original charset when replying or forwarding if possible"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomatically append signature"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Word &wrap at column:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Warn if root certificate expires in &less than:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Automatically request &message disposition notifications"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Use recent addresses for autocompletion"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Autosave interval:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Replace recognised prefi&x with \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Replace recognised prefix with \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Use smart &quoting"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "The signature has expired."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Type of addressee selector"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Sets the type of the dialogue for selecting recipients for To,\n"
+"        CC and BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Type of recipients editor"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maximum number of recipient editor lines."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "Keep original charset when replying or forwarding if possible"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatic collapse level:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reduce font size for quoted text"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Enable this option to show quoted text with a smaller font."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Store sent messages encry&pted"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Show s&pam status in fancy headers"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Send Message Disposition Notifications with an empty sender."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, untick this option."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Message List - New Messages"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Add &Quote Characters"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Edit &File"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Edit..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Go"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "F&older"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Message"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Reply Special"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Forward"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Reset Font Settings"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML Toolbar"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Common Options"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML Toolbar"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validate certificates using CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validate certificates online (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Online Certificate Validation"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP responder URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP responder signature:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignore service URL of certificates"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Do not check certificate policies"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Never consult a CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"If this option is ticked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Fetch missing issuer certificates"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"If this option is ticked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP Requests"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Do not perform any HTTP requests"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Entirely disables the use of HTTP for S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Use this proxy for HTTP requests: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Use system HTTP proxy:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignore HTTP CRL distribution point of certificates"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP Requests"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Do not perform any LDAP requests"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Entirely disables the use of LDAP for S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignore LDAP CRL distribution point of certificates"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primary host for LDAP requests:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Add..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Reset Font Settings"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "unlimited"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Signature Configuration"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Reply to se&nder:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Reply to &All..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Forwarded Message"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Warn when trying to send &unsigned messages"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Tick to be warned when sending unsigned messages."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is ticked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Warn when trying to send unencrypted messages"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Tick to be warned when sending unencrypted messages."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is ticked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Warn if &Receiver's Email Address is Not in Certificate"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Tick to be warned if the address is not in the certificate"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is ticked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Warn if certificates/keys expire soon (configure thresholds below)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "For signing"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "For encryption"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Select the number of days here"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "For root certificates:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "For intermediate CA certificates:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "For end-user certificates/keys:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Re-enable All \"Don't Ask Again\" Warnings"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialogue? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...that KMail can show a colour bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15421,16 +15010,20 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15442,12 +15035,16 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15461,14 +15058,16 @@ msgstr "Overwrite File?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15480,20 +15079,34 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15505,16 +15118,22 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is ticked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is ticked, the check of the certificate chain can end with "
+#~ "a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15526,12 +15145,16 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15543,16 +15166,20 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15564,16 +15191,28 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialogue for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialogue for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15585,12 +15224,14 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is ticked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is ticked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15599,14 +15240,16 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
@@ -15620,16 +15263,20 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is ticked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is ticked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15641,16 +15288,22 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is ticked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is ticked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15671,8 +15324,30 @@ msgstr "Overwrite File?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Selects which certificates to send"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Send &your own certificate"
@@ -15692,16 +15367,20 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15713,12 +15392,16 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15732,18 +15415,22 @@ msgstr "Overwrite File?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15754,20 +15441,34 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15782,12 +15483,16 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is ticked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is ticked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15802,12 +15507,18 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15819,12 +15530,16 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15836,8 +15551,22 @@ msgstr "Overwrite File?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Select how often the PIN must be entered"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Once per session"
@@ -15854,16 +15583,22 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is ticked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is ticked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15875,14 +15610,16 @@ msgstr "Overwrite File?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is ticked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is ticked, a warning is issued if the email address of the "
+#~ "signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
@@ -15899,9 +15636,6 @@ msgstr "Overwrite File?"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "Save in &Drafts Folder"
 
-#~ msgid "Configure KMail"
-#~ msgstr "Configure KMail"
-
 #, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Open With..."
diff --git a/tde-i18n-eo/messages/tdepim/kmail.po b/tde-i18n-eo/messages/tdepim/kmail.po
index f8e50419cff..296a99a68b5 100644
--- a/tde-i18n-eo/messages/tdepim/kmail.po
+++ b/tde-i18n-eo/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-11-17 19:41+0100\n"
 "Last-Translator: Oliver Kellogg <okellogg@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Wolfram Diestel,Steffen Pietsch,Matthias Peick,Oliver Kellogg"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -174,6 +174,12 @@ msgstr "&Neniu (uzu tre zorge)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto pro duonaŭtomata risorcuzo"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Forigi tekston"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -189,7 +195,8 @@ msgstr "Forigi tekston"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Forigu ĉiujn ne plu uzatajn asignadojn de la risurco reprezentata de tiu konto."
+"Forigu ĉiujn ne plu uzatajn asignadojn de la risurco reprezentata de tiu "
+"konto."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -250,13 +257,13 @@ msgstr "&Uzantonomo:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Via intereta provizisto donis al vi <em>uzantnomon</em>"
-", kun kiu vi povas aŭtentiĝi al la serviloj. Ofte ĝi estas la unua parto de via "
-"retpoŝtadreso (la parto antaŭ <em>@</em>)."
+"Via intereta provizisto donis al vi <em>uzantnomon</em>, kun kiu vi povas "
+"aŭtentiĝi al la serviloj. Ofte ĝi estas la unua parto de via retpoŝtadreso "
+"(la parto antaŭ <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -278,12 +285,12 @@ msgstr "&Konservi POP-pasvorton en la agordodosiero"
 #, fuzzy
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Marku la opcion, por ke KMail konservu la SMTPan pasvorton en ĝia agorda "
 "dosiero. Por la konservo estas uzata speciala formo. Sed ĝi ne estas sekura "
@@ -315,11 +322,13 @@ msgstr "&Filtri mesaĝojn, se ili estas pli granda ol"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Se vi elektas tiun opcion, POP-filtriloj estas uzataj por decido pri la ago de "
-"mesaĝoj. Tiam vi povas elekti ricevon, forigon aŭ reteno de ili en la servilo."
+"Se vi elektas tiun opcion, POP-filtriloj estas uzataj por decido pri la ago "
+"de mesaĝoj. Tiam vi povas elekti ricevon, forigon aŭ reteno de ili en la "
+"servilo."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -368,13 +377,15 @@ msgstr "Forigi &tekston"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -417,9 +428,9 @@ msgstr "Nomspacoj:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -477,9 +488,9 @@ msgstr "Ŝarĝi &kunsedaĵojn nur per postulo"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Aktivigu ĉi tiun por preni mane la kunsendaĵon anstataŭ aŭtomate, kiam vi "
 "elektas la retleteron. Ankaŭ grandaj leteroj estas montrataj tiamaniere."
@@ -522,7 +533,7 @@ msgstr "<neniu>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "ricevitaj"
 
@@ -530,8 +541,8 @@ msgstr "ricevitaj"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "La servilo ne ŝajnas subteni unikan mesaĝnumerojn, sed ĉi tiu estas postulon "
 "por lasi mesaĝojn en la servilo.\n"
@@ -542,8 +553,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "La servilo ne ŝajnas subteni prenon de la mesaĝajn kaplinilojn, sed ĉi tiu "
 "estas postulon por filtri mesaĝojn en la servilo.\n"
@@ -552,20 +563,21 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Bonvolu noti, ke tiu funkcio povas kaŭzi difektitajn mesaĝojn ĉe POP3-serviloj "
-"ne subtenantaj duktadon.\n"
+"Bonvolu noti, ke tiu funkcio povas kaŭzi difektitajn mesaĝojn ĉe POP3-"
+"serviloj ne subtenantaj duktadon.\n"
 "Tiu opcio ekzistas, ĉar kelkaj serviloj ja subtenas duktadon, se ne anoncas "
-"sian kapablon. Por kontroli, ĉu via POP3-servo anoncas subtenon de duktado, uzu "
-"la butonon malsupre en la dialogo.\n"
+"sian kapablon. Por kontroli, ĉu via POP3-servo anoncas subtenon de duktado, "
+"uzu la butonon malsupre en la dialogo.\n"
 "Se via servo ne anoncas subtenon, sed vi volas plirapidigi prenadon de la "
 "poŝto, vi prefere testu la funkciadon sendante al vi stakon da leteroj kaj "
 "prenante ĝin de la servilo."
@@ -576,29 +588,29 @@ msgstr "Bonvolu indiki servilon kaj pordon en la ·ĝenerala tabo antaŭ ĉio."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "La servilo ne ŝajnas subteni duktadon. Tial la opcio estas neebligita.\n"
-"Ĉar kelkaj serviloj ne korekte publikigi ilian kapablon, vi ja povas ŝalti la "
-"duktadon. Bonvole notu, ke tio povas kaŭzi la POP-servilojn, kiuj ne subtenas "
-"duktadon, ke ili sendas malkorektajn mesaĝojn. Tial vi testu ĝin per sendo de "
-"granda nombro da mesaĝoj al vi mem, kiujn ĉiujn vi ŝarĝas per unu prenado, "
-"antaŭ vi uzas ĝin por gravaj mesaĝoj."
+"Ĉar kelkaj serviloj ne korekte publikigi ilian kapablon, vi ja povas ŝalti "
+"la duktadon. Bonvole notu, ke tio povas kaŭzi la POP-servilojn, kiuj ne "
+"subtenas duktadon, ke ili sendas malkorektajn mesaĝojn. Tial vi testu ĝin "
+"per sendo de granda nombro da mesaĝoj al vi mem, kiujn ĉiujn vi ŝarĝas per "
+"unu prenado, antaŭ vi uzas ĝin por gravaj mesaĝoj."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "La servilo ne ŝajnas subteni unikan mesaĝnumerojn, sed ĉi tiu estas postulon "
 "por lasi mesaĝojn en la servilo. Tial la opcio ne estas ebligita.\n"
@@ -610,8 +622,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "La servilo ne ŝajnas subteni prenon de la mesaĝajn kaplinilojn, sed ĉi tiu "
 "estas postulon por filtri mesaĝojn en la servilo. Tial la opcio ne estas "
@@ -697,8 +709,8 @@ msgstr "IMAP-konto"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Necesas, ke vi aldonu konto en la alineo \"Reto\" de la agordaĵo por ricevi "
 "retpoŝton."
@@ -737,9 +749,9 @@ msgstr "Bonvenon al KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -802,8 +814,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Informoj pri Servilo"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Neniu"
@@ -941,27 +952,25 @@ msgstr ""
 #: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Ĉi tie vi haviĝas helpon pri agordo de Poŝtilaj filtroreguloj, por ke vi "
-"povu uzi konatajn virusilojn.</p> "
-"<p>La helpilo povas ekkoni tiujn ilojn en vi komputilo. Ankaŭ ĝi povas krei "
-"filtroregulojn uzante tiujn ilojn por klasifiki mesaĝojn kaj apartigi "
-"fimesaĝojn. La helpilo ne ŝanĝos ekzistajn regulojn, sed alpendos novajn.</p> "
-"<p><b>Averto:<b> Ĉar KMail estas blokata dum ekkono de fimesaĝoj, vi povas "
-"haviĝi problemojn pri la uzableco de KMail. Tio estas, ĉar la virusiloj necesas "
-"iom tempon. Estas eble forigi la regolujn, por ke vi haviĝu la antaŭan "
-"konduton.</p>"
+"povu uzi konatajn virusilojn.</p> <p>La helpilo povas ekkoni tiujn ilojn en "
+"vi komputilo. Ankaŭ ĝi povas krei filtroregulojn uzante tiujn ilojn por "
+"klasifiki mesaĝojn kaj apartigi fimesaĝojn. La helpilo ne ŝanĝos ekzistajn "
+"regulojn, sed alpendos novajn.</p> <p><b>Averto:<b> Ĉar KMail estas blokata "
+"dum ekkono de fimesaĝoj, vi povas haviĝi problemojn pri la uzableco de "
+"KMail. Tio estas, ĉar la virusiloj necesas iom tempon. Estas eble forigi la "
+"regolujn, por ke vi haviĝu la antaŭan konduton.</p>"
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -993,10 +1002,9 @@ msgstr "Movi &probablan disafiŝadon al:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1007,12 +1015,13 @@ msgstr "Klasifiki mesaĝojn per kontraŭvirusiloj"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Lasu la kontraŭvirusilojn klasifiki viajn mesaĝojn. La helpilo kreos taŭgajn "
 "filtrojn. La mesaĝoj normale estas markitaj de la iloj tiel, ke la sekvantaj "
-"filtroj povas reagi al tio kaj ekzemple movi la fimesaĝon al speciala leterujo."
+"filtroj povas reagi al tio kaj ekzemple movi la fimesaĝon al speciala "
+"leterujo."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1021,12 +1030,12 @@ msgstr "Movi ekkonitan virusmesaĝon al la elektita leterujo"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Estas kreita filtrilo pro ekkono de mesaĝoj klasifikitaj kiel virusaj kaj por "
-"movi tiujn mesaĝojn al difinita leterujo. La norma leterujo estas la rubujo, "
-"sed vi povas ŝanĝi tiun en la leteruja rigardo."
+"Estas kreita filtrilo pro ekkono de mesaĝoj klasifikitaj kiel virusaj kaj "
+"por movi tiujn mesaĝojn al difinita leterujo. La norma leterujo estas la "
+"rubujo, sed vi povas ŝanĝi tiun en la leteruja rigardo."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1034,11 +1043,11 @@ msgstr "Aldone marki ekkonitan fimesaĝon kiel legitan"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Kaj marku mesaĝojn, kiuj estas klasifikitaj kiel virusaj, legitaj kaj movu ilin "
-"al la elektita leterujo."
+"Kaj marku mesaĝojn, kiuj estas klasifikitaj kiel virusaj, legitaj kaj movu "
+"ilin al la elektita leterujo."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1218,8 +1227,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Tio estas ebla, ĉar vi ne havas la rajton por fari ĝin, aŭ ĉar la leterujo jam "
-"ekzistas en la servilo. La erarmesaĝon de la komunikado estas ĉi tie:"
+"Tio estas ebla, ĉar vi ne havas la rajton por fari ĝin, aŭ ĉar la leterujo "
+"jam ekzistas en la servilo. La erarmesaĝon de la komunikado estas ĉi tie:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1232,8 +1241,8 @@ msgstr "Eraro dum legado de la leterujo %1: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1253,8 +1262,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1285,20 +1294,20 @@ msgstr "Forigita"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Neniu de viaj identecoj korespondas al la mesaĝadresato. "
-"<br>Elektu vian adreson el la sekvantaj:"
+"<qt>Neniu de viaj identecoj korespondas al la mesaĝadresato. <br>Elektu vian "
+"adreson el la sekvantaj:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Iuj el viaj identecoj korespondas al la mesaĝadresato. "
-"<br>Elektu vian adreson el la sekvantaj:"
+"<qt>Iuj el viaj identecoj korespondas al la mesaĝadresato. <br>Elektu vian "
+"adreson el la sekvantaj:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1327,18 +1336,21 @@ msgstr "Eraro dum densigo de \"%1\". Densigo ĉesigita."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Tiu agordo estas fiksita de via administristo.</p> "
-"<p>Se vi pensas, ke ĉi tiu estas eraro, kontaktu lin.</p></qt>"
+"<qt> <p>Tiu agordo estas fiksita de via administristo.</p> <p>Se vi pensas, "
+"ke ĉi tiu estas eraro, kontaktu lin.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Ŝ&arĝi profilon..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Agordi konton"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Aldoni..."
@@ -1368,6 +1380,11 @@ msgstr "<qt>Ĉu vi vere volas forigi la identecon nomitan <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Forigi identecon"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Forigi"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Aldoni..."
@@ -1376,6 +1393,11 @@ msgstr "Aldoni..."
 msgid "Modify..."
 msgstr "Ŝanĝi..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Forigi"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Uzi kiel apriora"
@@ -1392,17 +1414,15 @@ msgstr "&Sendado"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Elirantaj Kontoj (aldonu almenaŭ unu):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nomo"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
@@ -1424,8 +1444,7 @@ msgstr "Uzi kiel apriora"
 msgid "Common Options"
 msgstr "Ĝeneralaj opcioj"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Konfirmi antaŭ sendo"
@@ -1476,17 +1495,16 @@ msgstr "Nor&ma domajno:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>La apriora domajno estas uzata por kompletigi la retpoŝtadresojn, kiuj nur "
-"konsistas de uzantulaj nomoj.</p></qt>"
+"<qt> <p>La apriora domajno estas uzata por kompletigi la retpoŝtadresojn, "
+"kiuj nur konsistas de uzantulaj nomoj.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1504,9 +1522,9 @@ msgstr "Aldoni transporton"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Apriora)"
 
@@ -1585,6 +1603,10 @@ msgstr "Ŝanĝi konton"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ne eblis trovi la konton <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Koloroj"
@@ -1693,8 +1715,7 @@ msgstr "Vizitita URL-ligo"
 msgid "Misspelled Words"
 msgstr "Malkorekte skribataj vortoj"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nova mesaĝo"
@@ -1883,8 +1904,8 @@ msgstr "Fadenoj apriore fermitaj"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "M&alfermu fadenojn, kiuj enhavas novajn, nelegitajn aŭ gravajn mesaĝojn kaj "
 "malfermu observatajn fadenojn."
@@ -1895,70 +1916,56 @@ msgstr "Montro de la dato"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Tiuj esprimoj estas uzeblaj pro la dato:</strong></p>"
-"<ul>"
-"<li>d - la tago kiel numero sen komenca nulo (1-31)</li>"
-"<li>dd - la tago kiel numero kun komenca nulo (01-31)</li>"
-"<li>ddd - la mallonga tagnomo (lun - dim)</li>"
-"<li>dddd - la longa tagnomo (lundo - dimanĉo)</li>"
-"<li>M - la monato kiel numero sen komenca nulo (1-12)</li>"
-"<li>MM - la monato kiel numero kun komenca nulo (01-12)</li>"
-"<li>MMM - la mallonga monatnomo (jan - dec)</li>"
-"<li>MMMM - la longa monatnomo (januaro - decembro</li>"
-"<li>yy - la jaro kun du ciferoj (00-99)</li>"
-"<li>yyyy - la jaro kun kvar ciferoj(0000-9999)</li></ul>"
-"<p><strong>Tiu esprimoj estas uzeblaj pro la tempo:</string></p> "
-"<ul>"
-"<li>h - la horo sen komenca nulo (0-23 aŭ 1-12 ĉe dekduhora montrilo)</li>"
-"<li>hh - la horo kun komenca nulo (0-23 aŭ 1-12 ĉe dekduhora montrilo)</li>"
-"<li>m - la minutoj sen komenca nulo (0-59)</li>"
-"<li>mm - la minutoj kun komenca nulo (00-59)</li>"
-"<li>s - la sekundoj sen komenca nulo (0-59)</li>"
-"<li>ss - la sekundoj kun komenca nulo (00-59)</li>"
-"<li>z - la milisekundoj sen komencaj nuloj (0-999)</li>"
-"<li>zzz - la milisekundoj kun komencaj nuloj (000-999)</li>"
-"<li>AP - ŝanĝo al dekduhora montrilo. \"AM\" aŭ \"PM\" anstataŭigas AP.</li>"
-"<li>ap - ŝanĝo al dekduhora montrilo. \"am\" aŭ \"pm\" anstataŭigas ap.</li>"
-"<li>Z - tempozono kiel numero (-0500)</li></ul>"
-"<p><strong>Ĉiuj aliaj literoj estas sen signifo.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Tiuj esprimoj estas uzeblaj pro la dato:</strong></"
+"p><ul><li>d - la tago kiel numero sen komenca nulo (1-31)</li><li>dd - la "
+"tago kiel numero kun komenca nulo (01-31)</li><li>ddd - la mallonga tagnomo "
+"(lun - dim)</li><li>dddd - la longa tagnomo (lundo - dimanĉo)</li><li>M - la "
+"monato kiel numero sen komenca nulo (1-12)</li><li>MM - la monato kiel "
+"numero kun komenca nulo (01-12)</li><li>MMM - la mallonga monatnomo (jan - "
+"dec)</li><li>MMMM - la longa monatnomo (januaro - decembro</li><li>yy - la "
+"jaro kun du ciferoj (00-99)</li><li>yyyy - la jaro kun kvar "
+"ciferoj(0000-9999)</li></ul><p><strong>Tiu esprimoj estas uzeblaj pro la "
+"tempo:</string></p> <ul><li>h - la horo sen komenca nulo (0-23 aŭ 1-12 ĉe "
+"dekduhora montrilo)</li><li>hh - la horo kun komenca nulo (0-23 aŭ 1-12 ĉe "
+"dekduhora montrilo)</li><li>m - la minutoj sen komenca nulo (0-59)</"
+"li><li>mm - la minutoj kun komenca nulo (00-59)</li><li>s - la sekundoj sen "
+"komenca nulo (0-59)</li><li>ss - la sekundoj kun komenca nulo (00-59)</"
+"li><li>z - la milisekundoj sen komencaj nuloj (0-999)</li><li>zzz - la "
+"milisekundoj kun komencaj nuloj (000-999)</li><li>AP - ŝanĝo al dekduhora "
+"montrilo. \"AM\" aŭ \"PM\" anstataŭigas AP.</li><li>ap - ŝanĝo al dekduhora "
+"montrilo. \"am\" aŭ \"pm\" anstataŭigas ap.</li><li>Z - tempozono kiel "
+"numero (-0500)</li></ul><p><strong>Ĉiuj aliaj literoj estas sen signifo.</"
+"strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Ŝanĝo de la malloka agordo pri fadenoj anstataŭigos ĉiujn agordojn faritajn por "
-"apartaj dosierujoj."
+"Ŝanĝo de la malloka agordo pri fadenoj anstataŭigos ĉiujn agordojn faritajn "
+"por apartaj dosierujoj."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -1972,8 +1979,7 @@ msgstr "Montr&i HTML-statlistelon"
 msgid "Show s&pam status in fancy headers"
 msgstr "Montri disafiŝadan statuson en detalaj kaplinioj"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1982,8 +1988,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2009,8 +2014,7 @@ msgstr "Aŭtomate"
 msgid "&Override character encoding:"
 msgstr "Ŝanĝi &signokodon"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Ebligi sistemlistelan piktogramon"
@@ -2112,21 +2116,19 @@ msgstr "<b>%f</b>estos anstataŭigata de la redaktenda dosiernomo."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>La sekvaj variabloj estas subtenataj en la respondofrazoj:"
-"<br><b>%D</b>: dato, <b>%S</b>: temo,"
-"<br><b>%e</b>: sendintoadreso, <b>%F</b>: sendintonomo, <b>%f</b>"
-": sendintomallongigo,"
-"<br><b>%T</b>: ricavanto, <b>%t</b>: ricevantulaj adreso kaj nomo,"
-"<br><b>%C</b>: kopiricevanto, <b>%c</b>: kopiricevantulaj adreso kaj nomo,"
-"<br><b>%%</b>: procentsigno, <b>%_</b>: spacsigno, <b>%L</b>: linirompo</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>La sekvaj variabloj estas subtenataj en la respondofrazoj:<br><b>%D</b>: "
+"dato, <b>%S</b>: temo,<br><b>%e</b>: sendintoadreso, <b>%F</b>: "
+"sendintonomo, <b>%f</b>: sendintomallongigo,<br><b>%T</b>: ricavanto, <b>%t</"
+"b>: ricevantulaj adreso kaj nomo,<br><b>%C</b>: kopiricevanto, <b>%c</b>: "
+"kopiricevantulaj adreso kaj nomo,<br><b>%%</b>: procentsigno, <b>%_</b>: "
+"spacsigno, <b>%L</b>: linirompo</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2149,21 +2151,20 @@ msgstr "Respondo al ĉ&iuj:"
 msgid "&Forward:"
 msgstr "&Plusendo:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Citado-prefikso:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Je %D, vi skribis:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Je %D, %F skribis:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Plusendita mesaĝo"
 
@@ -2199,8 +2200,8 @@ msgstr "Entajpi novan plusendo-prefikson:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Tiu listo estas kontrolata ĉe ĉiu sendata retletero de supre malsupren pri "
 "signaro, kiuj enhvas ĉiujn necesajn signojn."
@@ -2237,10 +2238,9 @@ msgstr "Valoro"
 msgid "Ne&w"
 msgstr "No&va"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nomo:"
@@ -2249,19 +2249,18 @@ msgstr "&Nomo:"
 msgid "&Value:"
 msgstr "&Valoro:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomigi kunsendaĵojn kompreneble por MS-Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Marku tiun opcion por certigi, ke MS-Outlook povas kompreni kunsendaĵnomoj kun "
-"neanglaj literoj"
+"Marku tiun opcion por certigi, ke MS-Outlook povas kompreni kunsendaĵnomoj "
+"kun neanglaj literoj"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2287,17 +2286,17 @@ msgstr "kunsendita"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Vi decidis kodigi kunsendaĵnomojn, kiuj havas neanglajn literojn per maniero, "
-"tdeio estas komprenebla de MS-Outlook kaj aliaj poŝtiloj, kiuj ne subtenas la "
-"norman kodigecon de kunsendaĵnomoj.\n"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Vi decidis kodigi kunsendaĵnomojn, kiuj havas neanglajn literojn per "
+"maniero, tdeio estas komprenebla de MS-Outlook kaj aliaj poŝtiloj, kiuj ne "
+"subtenas la norman kodigecon de kunsendaĵnomoj.\n"
 "Notu, ke KMail povas krei nenormajn mesaĝojn, kaj sekve estas eble, ke viaj "
 "mesaĝoj ne estas kompreneblaj de poŝtiloj, kiuj uzas la normon. Tial vi nur "
 "ebligu tiun opcion, se vi havas bonan kaŭzon."
@@ -2324,104 +2323,88 @@ msgstr "Ĉifro&kromaĵoj"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Retpoŝtoj foje venas en ambaŭ formoj. Tiu opcio difinas, ĉu vi volas vidi "
-"la tekstan aŭ la HTMLan formon.</p>"
-"<p>La HTMLa formo estas pli belaspekta, sed aliflanke pligrandigas la riskon ke "
-"iu eluzas sekurecotruon.</p>"
-"<p>La teksta formo estas malpli bela, sed faras ĝin preskaŭ <em>"
-"tute maleble</em>, eluzi sekurectruojn de la HTML-prezentilo (Konkeranto).</p>"
-"<p>La malsupra opcio gardas kontraŭ ofta misuzo de HTML-leteroj. Sed ĝi ne "
-"povas gardi kontraŭ sekurecproblemojn nekonatajn, kiam tiu versio de Retpoŝtilo "
-"fariĝis.</p>"
-"<p>Estas do saĝe <em>malpreferi</em> HTMLon anstataŭ nura teksto.</p> "
-"<p><b>Noto:</b> Vi povas ŝanĝi tion por ĉiu leterujo en la <i>Leterujo</i>"
-"-menuo de la Retpoŝtilo precipa fenestro.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p> Retpoŝtoj foje venas en ambaŭ formoj. Tiu opcio difinas, ĉu vi volas "
+"vidi la tekstan aŭ la HTMLan formon.</p><p>La HTMLa formo estas pli "
+"belaspekta, sed aliflanke pligrandigas la riskon ke iu eluzas sekurecotruon."
+"</p><p>La teksta formo estas malpli bela, sed faras ĝin preskaŭ <em>tute "
+"maleble</em>, eluzi sekurectruojn de la HTML-prezentilo (Konkeranto).</"
+"p><p>La malsupra opcio gardas kontraŭ ofta misuzo de HTML-leteroj. Sed ĝi ne "
+"povas gardi kontraŭ sekurecproblemojn nekonatajn, kiam tiu versio de "
+"Retpoŝtilo fariĝis.</p><p>Estas do saĝe <em>malpreferi</em> HTMLon anstataŭ "
+"nura teksto.</p> <p><b>Noto:</b> Vi povas ŝanĝi tion por ĉiu leterujo en la "
+"<i>Leterujo</i>-menuo de la Retpoŝtilo precipa fenestro.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kelkaj retpoŝtaj varbaĵoj estas skribitaj en HTML, enhavantajreferencojn al "
-"bildoj, kiujn uzas tiuj varbaĵoj por kontroli, ĉu vi legis ilian mesaĝon "
-"(&quot;ttt cimoj&quot;).</p> "
-"<p>Estas neniu severa uzo, ĉar la sendinto ĉiam povas aldoni la bildon aparte "
-"al la mesaĝo.</p>"
-"<p>Por protekti vin de tia misuzo de bildoj en HTML, ilia prezentado estas "
-"apriore <em>malŝaltita</em> en Retpoŝtilo.</p>"
-"<p>Se vi tamen deziras vidi bildojn en HTML, vi povas ŝalti tiun funkcion, sed "
-"estu avertita pri la implikaĵoj.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Kelkaj retpoŝtaj varbaĵoj estas skribitaj en HTML, "
+"enhavantajreferencojn al bildoj, kiujn uzas tiuj varbaĵoj por kontroli, ĉu "
+"vi legis ilian mesaĝon (&quot;ttt cimoj&quot;).</p> <p>Estas neniu severa "
+"uzo, ĉar la sendinto ĉiam povas aldoni la bildon aparte al la mesaĝo.</"
+"p><p>Por protekti vin de tia misuzo de bildoj en HTML, ilia prezentado estas "
+"apriore <em>malŝaltita</em> en Retpoŝtilo.</p><p>Se vi tamen deziras vidi "
+"bildojn en HTML, vi povas ŝalti tiun funkcion, sed estu avertita pri la "
+"implikaĵoj.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt> "
-"<h3>Ricevkonfirmaj reguloj</h3> "
-"<p>Ricevkonfirmoj estas ĝeneraligo de <b>legkonfirmoj.</b>"
-". La mesaĝskribanto postulas la sendon de konfirmo kaj la ricevantula poŝtilo "
-"kreas respondon, de kiu la skribinto ekkonas, tdeio okazis al lia mesaĝo. "
-"Ĝeneralaj konfirmtipoj estas <b>vidigita</b> (signifas: legita), <b>"
-"forĵetita</b> kaj <b>plusendita</b>.</p> "
-"<p>La sekvaj eblecoj estas uzeblaj por kontroli la agmanieron de la "
-"ricevkonfirma sendo:</p> "
-"<ul> "
-"<li><em>Ignoru</em>: Ignoras la ricevkonfirmajn postulojn. Nenia ricevkonfirmo "
-"estos sendata iam aŭtomate (rekomdendata).</li> "
-"<li><em>Demandu</em>: Nur respondas post demando de la uzanto pri permeso. Do "
-"vi povas sendi ricevkonfirmojn pro specialaj mesaĝoj kaj samtempe rifuzi aŭ "
-"ignori aliajn.</li> "
-"<li><em>Rifuzu</em>: Ĉiam sendas rifuzkonfirmon. Tio estas nur <em>iomete</em> "
-"pli bona ol sendo de konfirmoj. La skribinto ja scios, ke la mesaĝo estas "
-"agita. Li nur ne scios, tdeio okazis al ĝi.</li> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt> <h3>Ricevkonfirmaj reguloj</h3> <p>Ricevkonfirmoj estas ĝeneraligo de "
+"<b>legkonfirmoj.</b>. La mesaĝskribanto postulas la sendon de konfirmo kaj "
+"la ricevantula poŝtilo kreas respondon, de kiu la skribinto ekkonas, tdeio "
+"okazis al lia mesaĝo. Ĝeneralaj konfirmtipoj estas <b>vidigita</b> "
+"(signifas: legita), <b>forĵetita</b> kaj <b>plusendita</b>.</p> <p>La sekvaj "
+"eblecoj estas uzeblaj por kontroli la agmanieron de la ricevkonfirma sendo:</"
+"p> <ul> <li><em>Ignoru</em>: Ignoras la ricevkonfirmajn postulojn. Nenia "
+"ricevkonfirmo estos sendata iam aŭtomate (rekomdendata).</li> "
+"<li><em>Demandu</em>: Nur respondas post demando de la uzanto pri permeso. "
+"Do vi povas sendi ricevkonfirmojn pro specialaj mesaĝoj kaj samtempe rifuzi "
+"aŭ ignori aliajn.</li> <li><em>Rifuzu</em>: Ĉiam sendas rifuzkonfirmon. Tio "
+"estas nur <em>iomete</em> pli bona ol sendo de konfirmoj. La skribinto ja "
+"scios, ke la mesaĝo estas agita. Li nur ne scios, tdeio okazis al ĝi.</li> "
 "<li><em>Ĉiam sendu</em>: Ĉiam sendas la postulitan ricevkonfirmon. Tio "
 "signifas, ke la skribinto scios, tdeio okazis al la mesaĝo. Nur uzu tion "
 "ekzemple por klienta prizorgado.</li> </ul> </qt>"
@@ -2440,15 +2423,15 @@ msgstr "Permesi al mesaĝoj &ŝargadon de eksteraj refrencoj el la reto"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>Averto:</b> Uzo de HTML en retpoŝto povas altigi la riskon, ke iu trudiĝas "
-"en vian sistemon per malica kodo. <a href=\"whatsthis:%1\">"
-"Havigu detalojn pri HTML-leteroj...</a> <a href=\"whatsthis:%2\">"
-"Havigu detalojn pri eksteraj ligiloj...</a>"
+"<b>Averto:</b> Uzo de HTML en retpoŝto povas altigi la riskon, ke iu "
+"trudiĝas en vian sistemon per malica kodo. <a href=\"whatsthis:%1\">Havigu "
+"detalojn pri HTML-leteroj...</a> <a href=\"whatsthis:%2\">Havigu detalojn "
+"pri eksteraj ligiloj...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2531,8 +2514,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2561,8 +2543,8 @@ msgstr "E&scepti gravajn mesaĝojn el forigo post la limtago"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Provante trovi nelegitajn msaĝojn:"
 
@@ -2586,8 +2568,8 @@ msgstr "Relanĉi en ĉiuj leterujoj"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Enirante leterujon:"
 
@@ -2656,26 +2638,23 @@ msgstr "dosierujoj (\"maildir\"-formato)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Tio difino, kiun formaton havu la leterujoj apriore:</p>"
-"<p><b>mbox:</b> Ĉiu leterujo de KMail estas surdiske unuopa dosiero.La unuopaj "
-"retleteroj en la dosiero estas apartigitaj per linio komenciĝanta per la vorto "
-"\"From \". Tio ŝparas lokon sur la disko, sed povus esti malpli fortika, se "
-"ekz. okazos eraro dum movado de leteroj de unu leterujo al alia.</p>"
-"<p><b>maildir:</b> La leterujoj de KMail surdiske estas dosierujoj. La unuopaj "
-"leteroj troviĝas en apartaj dosieroj. Tio bezonas iom pli da spaco surdiske, "
-"sed estas pli fortika.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Tio difino, kiun formaton havu la leterujoj apriore:</p><p><b>mbox:</"
+"b> Ĉiu leterujo de KMail estas surdiske unuopa dosiero.La unuopaj retleteroj "
+"en la dosiero estas apartigitaj per linio komenciĝanta per la vorto \"From "
+"\". Tio ŝparas lokon sur la disko, sed povus esti malpli fortika, se ekz. "
+"okazos eraro dum movado de leteroj de unu leterujo al alia.</p><p><b>maildir:"
+"</b> La leterujoj de KMail surdiske estas dosierujoj. La unuopaj leteroj "
+"troviĝas en apartaj dosieroj. Tio bezonas iom pli da spaco surdiske, sed "
+"estas pli fortika.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2708,43 +2687,36 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kiam vi saltas al sekva nelegita mesaĝo, okazas, ke ne plu estas nelegita "
-"mesaĝo en la leterujo post la nuna.</p>"
-"<p> <b>Ne relanĉu:</b> La serĉado haltos ĉe la lasta mesaĝo en la leterujo.</p> "
-"<p><b>Relanĉu en la nuna leterujo:</b> La serĉado kontinuos ĉe la komenco la "
-"mesaĝlisto, sed ne ŝanĝos al alia leterujo.</p> "
-"<p><b>Relanĉu en ĉiuj leterujoj:</b> La serĉado kontinuos ĉe la komenco de la "
-"mesaĝlisto. Se neniu nelegita mesaĝo troviĝas, tio kontinuos en la sekvanta "
-"leterujo.</p>"
-"<p>Simile, se la opcio estas elektitaj kaj vi serĉas antaŭan nelegitan mesaĝon, "
-"la serĉo rekomenciĝos malsupre de la listo se supre neniu plu estas.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Kiam vi saltas al sekva nelegita mesaĝo, okazas, ke ne plu estas "
+"nelegita mesaĝo en la leterujo post la nuna.</p><p> <b>Ne relanĉu:</b> La "
+"serĉado haltos ĉe la lasta mesaĝo en la leterujo.</p> <p><b>Relanĉu en la "
+"nuna leterujo:</b> La serĉado kontinuos ĉe la komenco la mesaĝlisto, sed ne "
+"ŝanĝos al alia leterujo.</p> <p><b>Relanĉu en ĉiuj leterujoj:</b> La serĉado "
+"kontinuos ĉe la komenco de la mesaĝlisto. Se neniu nelegita mesaĝo troviĝas, "
+"tio kontinuos en la sekvanta leterujo.</p><p>Simile, se la opcio estas "
+"elektitaj kaj vi serĉas antaŭan nelegitan mesaĝon, la serĉo rekomenciĝos "
+"malsupre de la listo se supre neniu plu estas.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2813,11 +2785,11 @@ msgstr "&Kaŝi grupoprogramarajn leterujojn"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Kiam tiu estas markita, vi ne vidos la IMAP-risurcajn leterujojn en la leteruja "
-"arbo."
+"Kiam tiu estas markita, vi ne vidos la IMAP-risurcajn leterujojn en la "
+"leteruja arbo."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2825,11 +2797,11 @@ msgstr "Nur montri gruppr&ogramajn dosieruojojn por ĉi konto"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Kiam tiu estas markita, vi ne vidos la kutimajn leterujojn en la leteruja arbo "
-"de la konto agordita por grupprogramoj."
+"Kiam tiu estas markita, vi ne vidos la kutimajn leterujojn en la leteruja "
+"arbo de la konto agordita por grupprogramoj."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2885,19 +2857,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Nomigi kunsendaĵojn kompreneble por MS-Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Aŭtomata invitosendo"
@@ -2907,26 +2878,26 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Se tiu estas elektita, la uzanto ne vidos la leterredaktilon. Invitaj leteroj "
-"aŭtomate estos sendataj."
+"Se tiu estas elektita, la uzanto ne vidos la leterredaktilon. Invitaj "
+"leteroj aŭtomate estos sendataj."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Normale invitoj estas sendataj per kundsendaĵoj. Tiu ŝaltilo ŝanĝas la "
 "invitajn leterojn tiamaniere, ke tio estas sendata en la teksto. Tio necesas "
-"por sendo invitojn kan respondojn al MS-Outlook. "
-"<br>Sed farante tion vi ne plu ricevas legeblan tekston. Tial  al homoj, kiuj "
-"ne havas poŝtilojn, kiuj ne komprenas ĝin, ĝi montriĝas tre strange. "
-"<br>La aliaj homoj povas plulabori kun tio.</qt>"
+"por sendo invitojn kan respondojn al MS-Outlook. <br>Sed farante tion vi ne "
+"plu ricevas legeblan tekston. Tial  al homoj, kiuj ne havas poŝtilojn, kiuj "
+"ne komprenas ĝin, ĝi montriĝas tre strange. <br>La aliaj homoj povas "
+"plulabori kun tio.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3030,17 +3001,16 @@ msgstr "Plusendi"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3058,15 +3028,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3134,8 +3104,8 @@ msgstr "Redakti identecon"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3395,6 +3365,11 @@ msgstr "Elekti leterujon"
 msgid "Filters"
 msgstr "Filtrilo %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Elekti kompletan tekston"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3426,11 +3401,11 @@ msgstr "Protoko&li filtril-agojn"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Vi povas ebligi aŭ neebligi la filtran protokoladon ĉi tie. Fakto estas, ke ĝi "
-"nur kolektas kaj montras datojn, kiam protokolado funkcias."
+"Vi povas ebligi aŭ neebligi la filtran protokoladon ĉi tie. Fakto estas, ke "
+"ĝi nur kolektas kaj montras datojn, kiam protokolado funkcias."
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3446,14 +3421,15 @@ msgstr "Protokoli kalkulon de la filtraj &reguloj"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Vi povas observi en la protokolo la reagon pri la kalkulo de la filtraj reguloj "
-"uzataj. Tiu opcio donos detalajn informojn pri ĉiu filtra regulo. Alikaze vi "
-"nur ricevos la rezulton de ĉiuj regulojn po filtro."
+"Vi povas observi en la protokolo la reagon pri la kalkulo de la filtraj "
+"reguloj uzataj. Tiu opcio donos detalajn informojn pri ĉiu filtra regulo. "
+"Alikaze vi nur ricevos la rezulton de ĉiuj regulojn po filtro."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3473,14 +3449,14 @@ msgstr "nelima"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Protokolado necesas memoron; ĉi tie vi povas limigi la kvanton da ĝi. Kiam la "
-"kvanto atingas la limon, tiam la plej malnovaj datumoj estas forigitaj ĝis sub "
-"la limo."
+"Protokolado necesas memoron; ĉi tie vi povas limigi la kvanton da ĝi. Kiam "
+"la kvanto atingas la limon, tiam la plej malnovaj datumoj estas forigitaj "
+"ĝis sub la limo."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3490,7 +3466,7 @@ msgstr ""
 "Ne eblas skribi la dosieron %1:\n"
 "\"%2\" estas la detala eraropriskribo."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail eraro"
@@ -3531,13 +3507,13 @@ msgstr "&Uzantonomo:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"La uzantonomo estas l saluton de la uzanto en la IMAP-servilo. Tio povas esti "
-"simpla uzantonomo aŭ la tuta retpoŝtadreso de la uzanto. La saluton de via "
-"konto en la servilo informos pri tio."
+"La uzantonomo estas l saluton de la uzanto en la IMAP-servilo. Tio povas "
+"esti simpla uzantonomo aŭ la tuta retpoŝtadreso de la uzanto. La saluton de "
+"via konto en la servilo informos pri tio."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3588,8 +3564,8 @@ msgstr "Vi ne havas legan aŭ skriban permeson por la rubujo."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "Informoj ne prenitaj de la servilo, uzu \"Rigardi je nova poŝto\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3600,8 +3576,7 @@ msgstr "Eraro: neniu IMAP-konto difinita en tiu leterujo"
 msgid "Connecting to server %1, please wait..."
 msgstr "Konektante al servilo %1, bv. atendi.."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Eraro dum konekto al servilo %1"
@@ -3629,8 +3604,8 @@ msgstr "Aldoni rajtojn"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Ĉu vi vere volas forigi viajn proprajn rajtojn pri tiu leterujo? Poste vi ne "
 "povas atingi ĝin."
@@ -3664,7 +3639,7 @@ msgstr "Uzado:"
 msgid "Select Folder"
 msgstr "Elekti leterujon"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokaj mesaĝujoj"
@@ -3688,9 +3663,9 @@ msgstr "Elekti fulmoklavon por leterujo"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3711,11 +3686,20 @@ msgstr "Re&zigni"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Nekonata"
@@ -3835,70 +3819,17 @@ msgstr "Spamstato:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>m"
-"<br>e"
-"<br>s"
-"<br>a"
-"<br>ĝ"
-"<br>o</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br>-<br>m<br>e<br>s<br>a<br>ĝ<br>o</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>e"
-"<br>n"
-"<br>i"
-"<br>u"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>m"
-"<br>e"
-"<br>s"
-"<br>a"
-"<br>ĝ"
-"<br>o</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>e<br>n<br>i<br>u<br> <br>H<br>T<br>M<br>L<br>-"
+"<br>m<br>e<br>s<br>a<br>ĝ<br>o</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3910,19 +3841,14 @@ msgstr "&Nomo:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Via nomo</h3> "
-"<p> Tiu enigejo montras vian nomon per tia maniero, per tdeio vi volas montri "
-"ĝin en la kaplinio de la sendota letero.</p> "
-"<p>Se vi ne uzas tion, via nomo ne estos montrata, sed nur la retpoŝtadreso.</p>"
-"</qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
+msgstr ""
+"<qt> <h3>Via nomo</h3> <p> Tiu enigejo montras vian nomon per tia maniero, "
+"per tdeio vi volas montri ĝin en la kaplinio de la sendota letero.</p> <p>Se "
+"vi ne uzas tion, via nomo ne estos montrata, sed nur la retpoŝtadreso.</p></"
+"qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3930,17 +3856,13 @@ msgstr "&Organizaĵo:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organizaĵo</h3> "
-"<p> Tiu enigejo montras la nomon de via organzaĵo per tia maniero, per tdeio vi "
-"volas montri ĝin en la kaplinio de la sendota letero.</p> "
-"<p>Estas orde (kaj normale) ne uzi ĝin.</p></qt>"
+"<qt> <h3>Organizaĵo</h3> <p> Tiu enigejo montras la nomon de via organzaĵo "
+"per tia maniero, per tdeio vi volas montri ĝin en la kaplinio de la sendota "
+"letero.</p> <p>Estas orde (kaj normale) ne uzi ĝin.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3949,18 +3871,13 @@ msgstr "&Retpoŝta adreso:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organizaĵo</h3> "
-"<p> Tiu enigejo havu vian tutan retpoŝtadreson.</p> "
+"<qt> <h3>Organizaĵo</h3> <p> Tiu enigejo havu vian tutan retpoŝtadreson.</p> "
 "<p>Ne aŭ malkorete uzi ĝin signifas, ke la homoj havos problemojn resendi al "
 "vi.</p></qt>"
 
@@ -3971,21 +3888,12 @@ msgstr "&Retpoŝta adreso:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4008,19 +3916,17 @@ msgstr "Elektu la OpenPGP-ŝlosilon uzotan por subskribi viajn mesaĝojn."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt> "
-"<p>OpenPGP-ŝlosilon, kiun vi elektos ĉi tie, estos uzata por subskribi "
-"mesaĝojn. Vi ankaŭ povas uzi GnuPG-ŝlosilojn.</p> "
-"<p>Vi povas lasi tiun malplena, sed tiam KMail ne povos subskribi leterojn per "
-"OpenPGP. Normalaj leteraj funkcioj ne estas afekciataj.</p> "
-"<p>Vi trovos pli multa pri ŝlosiloj en <a>http://www.gnupg.org</a></p></qt>"
+"<qt> <p>OpenPGP-ŝlosilon, kiun vi elektos ĉi tie, estos uzata por subskribi "
+"mesaĝojn. Vi ankaŭ povas uzi GnuPG-ŝlosilojn.</p> <p>Vi povas lasi tiun "
+"malplena, sed tiam KMail ne povos subskribi leterojn per OpenPGP. Normalaj "
+"leteraj funkcioj ne estas afekciataj.</p> <p>Vi trovos pli multa pri "
+"ŝlosiloj en <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4032,30 +3938,27 @@ msgstr "Via OpenPGP-ĉifriga ŝlosilo"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Elektu la OpenPGP-ŝlosilon uzotan por ĉifri mesaĝojn, kiujn vi sendas al vi "
 "mem, kaj por la eco de kunsendo de la publika ŝlosilo en la redaktilo."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>LA OpenPGP-ŝlosilon, kiun vi elektos ĉi tie, vi uzos por ĉifrigi mesaĝojn al "
-"vi mem kaj por la eco de kunsendo de la publika ŝlosilo en la redaktilo. Vi "
-"ankaŭ povas uzi GnuPG-ŝlosilojn.</p> "
-"<p> Vi povas lasi ĝin malblanka, sed KMail ne povos ĉifrigi kopiojn de senditaj "
-"mesaĝojn por vi per OpenPGP. Normalaj leteraj funkcioj ne estos afekciataj.</p> "
-"<p>Vi povos trovi pli multan pri ŝlosilo en <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>LA OpenPGP-ŝlosilon, kiun vi elektos ĉi tie, vi uzos por ĉifrigi "
+"mesaĝojn al vi mem kaj por la eco de kunsendo de la publika ŝlosilo en la "
+"redaktilo. Vi ankaŭ povas uzi GnuPG-ŝlosilojn.</p> <p> Vi povas lasi ĝin "
+"malblanka, sed KMail ne povos ĉifrigi kopiojn de senditaj mesaĝojn por vi "
+"per OpenPGP. Normalaj leteraj funkcioj ne estos afekciataj.</p> <p>Vi povos "
+"trovi pli multan pri ŝlosilo en <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4075,17 +3978,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>La S/MIME-X.509-atestilon, kiun vi elektos ĉi tie, vi uzos por subskribi "
-"mesaĝojn.</p> "
-"<p> Vi povas lasi ĝin malblanka, sed KMail ne povos ĉifrigi kopiojn de senditaj "
-"mesaĝojn por vi per OpenPGP. Normalaj leteraj funkcioj ne estos afekciataj.</p> "
+"<qt> <p>La S/MIME-X.509-atestilon, kiun vi elektos ĉi tie, vi uzos por "
+"subskribi mesaĝojn.</p> <p> Vi povas lasi ĝin malblanka, sed KMail ne povos "
+"ĉifrigi kopiojn de senditaj mesaĝojn por vi per OpenPGP. Normalaj leteraj "
+"funkcioj ne estos afekciataj.</p> "
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4097,27 +3998,25 @@ msgstr "Via S/MIME-ĉifra atestilo"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Elektu la S/MIME-atestilon uzotan por ĉifri mesaĝojn, kiujn vi sendas al vi "
 "mem, kaj por la eco de kunsendo de la publika ŝlosilo en la redaktilo."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>LA S/MIME-atestilon, kiun vi elektos ĉi tie, vi uzos por ĉifrigi mesaĝojn al "
-"vi mem kaj por la eco de kunsendo de la publika ŝlosilo en la redaktilo.</p> "
-"<p> Vi povas lasi ĝin malblanka, sed KMail ne povos ĉifrigi kopiojn de senditaj "
-"mesaĝojn por vi per S/MIME. Normalaj leteraj funkcioj ne estos afekciataj.</p>"
-"</qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt> <p>LA S/MIME-atestilon, kiun vi elektos ĉi tie, vi uzos por ĉifrigi "
+"mesaĝojn al vi mem kaj por la eco de kunsendo de la publika ŝlosilo en la "
+"redaktilo.</p> <p> Vi povas lasi ĝin malblanka, sed KMail ne povos ĉifrigi "
+"kopiojn de senditaj mesaĝojn por vi per S/MIME. Normalaj leteraj funkcioj ne "
+"estos afekciataj.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4137,22 +4036,18 @@ msgstr "&Respondadreso:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Respondadresoj</h3> "
-"<p>Tio agordas la respondadresan kaplinion, do ĝi havas alian adreson kiel la "
-"normala adreso en <tt>De:</tt>. "
-"<p>Tio ovas esti avantaĝa, kiam vi laboras grupe. Ekzemple vi havas vian "
-"adreson en <tt>De:</tt>, sed la sepondoj adresas la tutan grupon.</p> "
-"<p>Se ĝi diras nenion al vi, lasu ĝin malplena.</p> </qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Respondadresoj</h3> <p>Tio agordas la respondadresan kaplinion, do "
+"ĝi havas alian adreson kiel la normala adreso en <tt>De:</tt>. <p>Tio ovas "
+"esti avantaĝa, kiam vi laboras grupe. Ekzemple vi havas vian adreson en "
+"<tt>De:</tt>, sed la sepondoj adresas la tutan grupon.</p> <p>Se ĝi diras "
+"nenion al vi, lasu ĝin malplena.</p> </qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4160,24 +4055,18 @@ msgstr "&Nevideblaj adresoj:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Nevideblaj adresoj (NVA)</h3> "
-"<p>La ĉiu sendota letero ankaŭ estos sendata al la adresoj de ĉi tie. La "
-"adresatoj ne estas videblaj al aliuloj.</p> "
-"<p>Normale vi uzas ĝin por aŭtomate kopii la sendaĵon al alia adreskonto de "
-"vi.</p> "
-"<p>Uzu komojn por krei liston de adresatoj.</p>"
-"<p>Se ĝi diras nenion al vi, lasu ĝin malplena.</p> </qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Nevideblaj adresoj (NVA)</h3> <p>La ĉiu sendota letero ankaŭ estos "
+"sendata al la adresoj de ĉi tie. La adresatoj ne estas videblaj al aliuloj.</"
+"p> <p>Normale vi uzas ĝin por aŭtomate kopii la sendaĵon al alia adreskonto "
+"de vi.</p> <p>Uzu komojn por krei liston de adresatoj.</p><p>Se ĝi diras "
+"nenion al vi, lasu ĝin malplena.</p> </qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4215,7 +4104,7 @@ msgstr "&Subskribo"
 msgid "&Picture"
 msgstr "&Bildo"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Nelaŭregula retpoŝtadreso"
 
@@ -4238,8 +4127,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Unu el la agorditaj OpenPGP-subskribaj ŝlosiloj ne havas iun uzantnomon, kiu "
 "konvenas al la retpoŝtadreson por tiu nomo (%1). "
@@ -4281,8 +4170,8 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"La senditaj-mesaĝoj-leterujo de la identeco \"%1\" (jam) ne ekzistas. Pro tio "
-"la apriora leterujo por senditaj mesaĝoj estos uzata."
+"La senditaj-mesaĝoj-leterujo de la identeco \"%1\" (jam) ne ekzistas. Pro "
+"tio la apriora leterujo por senditaj mesaĝoj estos uzata."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4297,13 +4186,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"La leterujo por propraj ŝablonoj de la identeco \"%1\" (jam) ne ekzistas; pro "
-"tio la apriora leterujo por propraj ŝablonoj estos uzata."
+"La leterujo por propraj ŝablonoj de la identeco \"%1\" (jam) ne ekzistas; "
+"pro tio la apriora leterujo por propraj ŝablonoj estos uzata."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Apriora)"
 
@@ -4348,14 +4237,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4394,14 +4283,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Eraro: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4551,14 +4445,14 @@ msgstr "Listarĥivoj"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4587,224 +4481,182 @@ msgstr "Neuzeblaj ĉifraj ŝlosiloj"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4818,213 +4670,171 @@ msgstr "S/MIME-atestilo baldaŭ nevalidiĝas"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-subskriba ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-ĉifra ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via OpenPGP-ŝlosilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La radikatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La radikatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-ĉifra "
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>La interatestilo</p><p align=center><b>%3</b></p>"
-"<p>por via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol unu tago.</p>\n"
+"<p>La interatestilo</p><p align=center><b>%3</b></p><p>por via S/MIME-"
+"atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p><p>nevalidiĝos "
+"en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-subskriba atestilo</p><p align=center><b>%1</b> (ŝlosilnumero "
+"0x%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> "
-"(ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-ĉifra atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x"
+"%2)</p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol unu tago.</p>\n"
-"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</p>"
-"<p>nevalidiĝos en malpli ol %n tago.</p>"
+"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol unu tago.</p>\n"
+"<p>Via S/MIME-atestilo</p><p align=center><b>%1</b> (ŝlosilnumero 0x%2)</"
+"p><p>nevalidiĝos en malpli ol %n tago.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5036,9 +4846,10 @@ msgstr "S/MIME-atestilo baldaŭ nevalidiĝas"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5060,8 +4871,8 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Unu aŭ pli da via subskribaj ŝlosiloj aŭ testiloj ne estas uzeblaj por "
-"subskribo. Reagordu viajn subskribajn ŝlosilojn kaj atestilojn por tiu nomo en "
-"la dialogo.\n"
+"subskribo. Reagordu viajn subskribajn ŝlosilojn kaj atestilojn por tiu nomo "
+"en la dialogo.\n"
 "Se vi pluigas kaj la ŝlosiloj estos necesaj poste, vi estos postulata pri "
 "elekto de la ŝlosiloj."
 
@@ -5073,10 +4884,10 @@ msgstr "Neuzeblaj subskribaj ŝlosiloj"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Ekzameno de la ĉifraj opcioj de adresatoj montris, ke la mesaĝo estu ĉifrata "
 "per OpenPGP, minimume por kelkaj adresatoj.\n"
@@ -5088,10 +4899,10 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Ekzameno de la ĉifraj opcioj de adresatoj montris, ke la mesaĝo estu ĉifrata "
 "per S/MIME, minimume por kelkaj adresatoj.\n"
@@ -5101,8 +4912,8 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5116,8 +4927,8 @@ msgstr "Ne subskribi per OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5145,8 +4956,8 @@ msgstr "Subskribado ne eblas"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Vi ne elektis ĉifroŝlosilon por vi mem (ĉifri por si). Vi ne eblas malĉifri "
 "viajn proprajn mesaĝojn, se vi ĉifri ilin."
@@ -5170,8 +4981,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Vi ne elektis ĉifroŝlosilon por iu el la mesaĝaj adresatoj. Do la mesaĝo ne "
 "estos ĉifrigata."
@@ -5193,8 +5004,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Vi ne elektis ĉifroŝlosilon por kelkaj el la mesaĝaj adresatoj: Tiuj personoj "
-"ne povos deĉifrigi la mesaĝon, se vi ĉifrigos ĝin."
+"Vi ne elektis ĉifroŝlosilon por kelkaj el la mesaĝaj adresatoj: Tiuj "
+"personoj ne povos deĉifrigi la mesaĝon, se vi ĉifrigos ĝin."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5218,11 +5029,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Nenia valida kaj fifata ŝlosilo estas trovita por \"%1\".\n"
 "\n"
@@ -5271,10 +5082,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Grava eraro: Ne eblas kolekti retpoŝtaĵojn: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Ne eblis aldoni mesaĝon:\n"
+msgid "Failed to add message:\n"
+msgstr "Ne eblis aldoni mesaĝon:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5364,6 +5173,52 @@ msgstr "&Nekonekta IMAPo"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-poŝtkesto"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Difini temon de la mesaĝo"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Sendi Kopion al 'adreso'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Sendi kaŝitan kopion al 'adreso'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Sendi 'kaplinion' al mesaĝo"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Legi mesaĝtekston de 'dosiero'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Difini tekston de la mesaĝo"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Aldoni kunsendaĵon al la mesaĝo. Tio eblas multfoje"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Nur rigardi je nova poŝto"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Nur malfermi la mesaĝredaktilon"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Movi la mesaĝan dosieron"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Sendu mesaĝon al 'adreso' respektive kunsendu la dosieron, al kiu la 'URLo' "
+"montras"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Poŝto"
@@ -5407,8 +5262,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail tuj kreos la necesajn grupprogramujojn kiel subujoj de %1; se vi ne volas "
-"tion, premu \"Ne\" kaj la IMAP-risurco estos malŝaltata"
+"KMail tuj kreos la necesajn grupprogramujojn kiel subujoj de %1; se vi ne "
+"volas tion, premu \"Ne\" kaj la IMAP-risurco estos malŝaltata"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5420,13 +5275,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail trovis la sekvontajn grupprogramujojn en %1 kaj bezonas plenumi la "
-"sekvajn operacojn: %2"
-"<br>Se vi ne volas tion, premu \"Ne\" kaj la IMAP-risurco estos malŝaltata"
+"sekvajn operacojn: %2<br>Se vi ne volas tion, premu \"Ne\" kaj la IMAP-"
+"risurco estos malŝaltata"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5474,14 +5329,13 @@ msgstr "URL kopiita al interdeponejo"
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
-"<qt>La dosiero <b>%1</b> ekzistas. "
-"<br>Ĉu vi volas anstataŭigi ĝin?</qt>"
+"<qt>La dosiero <b>%1</b> ekzistas. <br>Ĉu vi volas anstataŭigi ĝin?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Sekurigi al dosiero"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Anstataŭigi"
 
@@ -5499,7 +5353,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5519,11 +5373,11 @@ msgstr "La dosiero ne enhavas mesaĝon."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "La dosiero enhavas kelkajn mesaĝojn. Nur la unua estas montrata."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5533,83 +5387,83 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrante mesaĝojn"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrante mesaĝon %1 el %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Ne sufiĉe da spaco sur disko?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Ŝovi al tiu leterujo"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopii al tiu leterujo"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Movante mesaĝojn"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Forigante mesaĝojn"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Malfermante URLon..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ĉu vi vere volas lanĉi <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Lanĉi"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Neniuj kunsendaĵoj trovitaj por konservi."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Konservi kunsendaĵojn al"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "kunsendaĵo.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "kunsendaĵo.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "La dosiero %1 jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "La dosiero jam ekzistas"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Anstataŭigi"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5617,31 +5471,31 @@ msgstr ""
 "Tiu parto %1 de la mesaĝo estas ĉifrita. Ĉu vi volas lasi ĝin ĉifrita ĉe "
 "konservo?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-demando"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Konservi ĉifradon"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ne konservi"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"Tiu parto %1 de la mesaĝo estas subskribita. Ĉu vi volas lasi ĝin subskribita "
-"ĉe konservo?"
+"Tiu parto %1 de la mesaĝo estas subskribita. Ĉu vi volas lasi ĝin "
+"subskribita ĉe konservo?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Konservi subskribon"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5650,21 +5504,21 @@ msgstr ""
 "Ne eblis skribi la dosieron %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Ne eblis skribi la dosieron %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Por tiu retletera adreso ne ekzistas ero. Aldonu ĝin el la libron kaj tiam "
 "aldonu tujmesaĝajn adresojn per via preferata programo."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5674,66 +5528,66 @@ msgstr ""
 " %1\n"
 "Ne eblas determini, al kiu vi babilas."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Elekto de \"Chiasmus\"-malĉifroŝlosilo"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Poŝto"
@@ -5832,7 +5686,7 @@ msgstr "Grandeco"
 msgid "Encoding"
 msgstr "Kodprezento"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Kunpremi"
 
@@ -5844,7 +5698,7 @@ msgstr "Ĉifradi"
 msgid "Sign"
 msgstr "Subskribi"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nomo de la kunsendaĵo:"
 
@@ -5866,10 +5720,11 @@ msgstr "Ricevantoj"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>La retleteraj adresoj, kiujn vi skribas en tiun enigejon, haviĝos kopion de "
-"la letero.</qt>"
+"<qt>La retleteraj adresoj, kiujn vi skribas en tiun enigejon, haviĝos kopion "
+"de la letero.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5878,14 +5733,14 @@ msgstr "Pluaj ricevantoj"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>La retleteraj adresoj, kiujn vi skribas en tiun enigejon, haviĝos kopion de "
-"la letero. Teĥnike tio estas sama kiel skribi ĉiujn en <b>Al:</b>"
-", sed la adresato kiel ricevanto de kopio povas rimarki, ke li nur estas "
-"leganto kaj ne la ĉefa ricevanto.</qt>"
+"<qt>La retleteraj adresoj, kiujn vi skribas en tiun enigejon, haviĝos kopion "
+"de la letero. Teĥnike tio estas sama kiel skribi ĉiujn en <b>Al:</b>, sed la "
+"adresato kiel ricevanto de kopio povas rimarki, ke li nur estas leganto kaj "
+"ne la ĉefa ricevanto.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5893,9 +5748,8 @@ msgstr "Nevideblaj ricevantoj"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>Fakte ĝi estas la sama kiel <b>Kopio al:</b>, sed la aliaj ricevantoj ne "
 "povas vidi, kiuj haviĝis kopion.</qt>"
@@ -5908,7 +5762,7 @@ msgstr "&Sendi poŝton"
 msgid "&Send Mail Via"
 msgstr "&Sendi poŝton per"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Sendi p&oste"
@@ -5973,8 +5827,7 @@ msgstr "&Forigi citsignojn..."
 msgid "Cl&ean Spaces"
 msgstr "&Forigi troajn spacsignojn"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Uzi e&gallarĝan tiparon"
@@ -6117,31 +5970,31 @@ msgstr "%Ĉifromesaĝa formo"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Normo"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Neorda listo (plencirkla)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Neorda listo (cirkla)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Neorda listo (kvadrata)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Orda listo (nombre)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Orda listo (minuskle)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Orda listo (majuskle)"
 
@@ -6242,8 +6095,8 @@ msgstr "Fermi la redaktilon"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "La mesaĝo, kiun vi redaktis, ŝajnas aplikiĝas al kunsendaĵon, sed vi havas "
@@ -6254,48 +6107,48 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Admono de kunsendaĵoj"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Sendi tiel"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>KMail ne povis ekkoni la lokon de la kunsendaĵo (%1).</p> "
-"<p>Vi devas indiki la tutan vojon, se vi deziras kunsendi la dosieron.</p></qt>"
+"<qt> <p>KMail ne povis ekkoni la lokon de la kunsendaĵo (%1).</p> <p>Vi "
+"devas indiki la tutan vojon, se vi deziras kunsendi la dosieron.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Kunsendi dosieron"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Kunsendi"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Enmeti dosieron"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Enmeti dosieron"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt> "
-"<p>Eraro okazis, dum vi provis eksporti la ŝlosilon el la postejo:</p> "
+"<qt> <p>Eraro okazis, dum vi provis eksporti la ŝlosilon el la postejo:</p> "
 "<p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
@@ -6335,20 +6188,35 @@ msgid ""
 "View"
 msgstr "Vidigi"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Redakti..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Redakti skripton..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Konservi kiel..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Ecoj..."
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Kunsendi..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Ne eblis kunpremi la dosieron."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6356,269 +6224,263 @@ msgstr ""
 "La kunpremita dosiero estas pli granda ol la originalo. Ĉu vi volas uzi la "
 "originalon?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Konservi"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Ne eblis malkunpremi la dosieron."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Konservi kunsendaĵon kiel"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Aldoni kiel alpendaĵo"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Alglui kiel &kunsendaĵo"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "sennoma"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Vi postulis ĉifrigi tiujn mesaĝojn por vi mem, sed la nun elektita identeco "
-"ne difinas iajn ĉifroŝlosilojn por tiu uzo.</p> "
-"<p>Elektu la uzota(j)n ŝlosilo(j)n per la identeca agorda.</p></qt>"
+"<qt> <p>Vi postulis ĉifrigi tiujn mesaĝojn por vi mem, sed la nun elektita "
+"identeco ne difinas iajn ĉifroŝlosilojn por tiu uzo.</p> <p>Elektu la "
+"uzota(j)n ŝlosilo(j)n per la identeca agorda.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Nedifinita ĉifro-ŝlosilo"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Antaŭ vi povas subskribi la mesaĝon, vi devas difini la uzotan "
-"subskriboŝlosilon.</p> "
-"<p>Elektu la uzotan ŝlosilon en la identeca agordo.</p></qt>"
+"<qt> <p>Antaŭ vi povas subskribi la mesaĝon, vi devas difini la uzotan "
+"subskriboŝlosilon.</p> <p>Elektu la uzotan ŝlosilon en la identeca agordo.</"
+"p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nedifinita subskriboŝlosilo"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Vi devas enigi vian retpoŝtadreson en De:. Krome estas bone, ke vi ankaŭ "
 "agordas vian adreson por ĉiuj identecoj, por ke vi ne enigu ĝin por ĉiu nura "
 "mesaĝo."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Vi devas indiki almenaŭ unu ricevonton en Al aŭ Kopio aŭ Krome-al."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "\"Al:\"-kampo estas malplena. Ĉu tamen sendi la mesaĝon?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "\"Al:\" ne donita"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Vi ne donis temon. Ĉu tamen sendi la mesaĝon?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Temo ne donita"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "S&endi tiel"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "Doni la &temon"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Konservi markaĵon, ne subskribi/ĉifri"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Konservi markaĵon, ne ĉifri"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Konservi markaĵon, ne subskribi"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Subskribi/ĉifri mesaĝon (forigi markaĵon)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Ĉifru (forigi markaĵon)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Subskribi (forigi markaĵon)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Enteksta subskribo/ĉifro de HTMLaj mesaĝoj ne eblas.</p> "
-"<p>Ĉu vi volas foirigi vian markaĵon?</p></qt>"
+"<qt> <p>Enteksta subskribo/ĉifro de HTMLaj mesaĝoj ne eblas.</p> <p>Ĉu vi "
+"volas foirigi vian markaĵon?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Subskribi/ĉifri mesaĝon?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"La propra malnetaĵ- aŭ ŝablon-leterujo de la identeco \"%1\" (jam) ne ekzistas. "
-"Pro tio la apriora malnetaĵ/ŝablonujo estos uzata."
+"La propra malnetaĵ- aŭ ŝablon-leterujo de la identeco \"%1\" (jam) ne "
+"ekzistas. Pro tio la apriora malnetaĵ/ŝablonujo estos uzata."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Kreu konton pro sendo kaj reprovu."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Sendonta retpoŝton..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Sendi konfirmon"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Sendi tuj"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Neniuj ricevantoj"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Pluaj ricevantoj"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Literumilo: ŝaltita"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Literumilo: malŝaltita"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Literumado ĉesigita."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Literumado finita."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Literumado preta."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Literumilo"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Trovis neniun \"Chiasmus\"-ŝlosilon"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Elekto de \"Chiasmus\"-ĉifroŝlosilo"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Mesaĝo subskribita de %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Mesaĝo subskribita de %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "PGP-mesaĝo - ĉifrita"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Mesaĝo kun temo: "
@@ -6668,11 +6530,11 @@ msgstr "Literumilo - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Eraro dum lanĉo de ISpell/ASpell. Certigu, ke vi ĝuste agordis ISpell aŭ ASpell "
-"kaj ke ĝi troviĝas per la variablo PATH."
+"Eraro dum lanĉo de ISpell/ASpell. Certigu, ke vi ĝuste agordis ISpell aŭ "
+"ASpell kaj ke ĝi troviĝas per la variablo PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6705,13 +6567,11 @@ msgstr "<qt>Tro multaj filtrilagoj en filtroregulo <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Nekonata filtrilago <b>%1</b"
-"<br>en filtroregulo <b>%2</b> "
-"<br>Ignoras ĝin.</qt>"
+"<qt>Nekonata filtrilago <b>%1</b<br>en filtroregulo <b>%2</b> <br>Ignoras "
+"ĝin.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6931,162 +6791,135 @@ msgstr "Ludi sonon"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jen la listo de la difinitaj filtriloj. Ili estas traktataj de supre "
-"malsupren.</p>"
-"<p>Alklaku iun filtrilon por redakti ĝin uzante la dekstraflankajn "
-"elementojn.</p></qt>"
+"<qt><p>Jen la listo de la difinitaj filtriloj. Ili estas traktataj de supre "
+"malsupren.</p><p>Alklaku iun filtrilon por redakti ĝin uzante la "
+"dekstraflankajn elementojn.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por krei novan filtrilon.</p>"
-"<p>Ĝi estos enmetita antaŭ la elektita, sed vi povos poste ankoraŭ ŝanĝi la "
-"vicordon. </p>"
-"<p>Se vi akcidente premis la butonon, vi povas premi la butonon <em>Forigu</em> "
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Premu tiun butonon por krei novan filtrilon.</p><p>Ĝi estos enmetita "
+"antaŭ la elektita, sed vi povos poste ankoraŭ ŝanĝi la vicordon. </p><p>Se "
+"vi akcidente premis la butonon, vi povas premi la butonon <em>Forigu</em> "
 "por malfari.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por krei novan filtrilon.</p>"
-"<p>Se vi akcidente premis la butonon, vi povas premi la butonon <em>Forigu</em> "
-"por malfari.</p></qt>"
+"<qt><p>Premu tiun butonon por krei novan filtrilon.</p><p>Se vi akcidente "
+"premis la butonon, vi povas premi la butonon <em>Forigu</em> por malfari.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por forigi la elektitan filtrilon el la listo.</p>"
-"<p>Ne eblas rekrei la filtrilon post forigo. Sed vi povus forlasi la dialogon "
-"per la butonon <em>Rezignu</em> por rezigni pri ĉiuj faritaj ŝanĝoj.</p></qt>"
+"<qt><p>Premu tiun butonon por forigi la elektitan filtrilon el la listo.</"
+"p><p>Ne eblas rekrei la filtrilon post forigo. Sed vi povus forlasi la "
+"dialogon per la butonon <em>Rezignu</em> por rezigni pri ĉiuj faritaj ŝanĝoj."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por movi la elektitan filtrilon malsupren en la listo.</p>"
-"<p>Tio estas utila, ĉar la ordo de la filtriloj en la listo difinas la ordon, "
-"laŭ kiu ili estas aplikataj la la mesaĝoj: La unua filtrilo proviĝas unue.</p>"
-"<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
-"<em>Supren</em></p></qt>"
+"<qt><p>Premu tiun butonon por movi la elektitan filtrilon malsupren en la "
+"listo.</p><p>Tio estas utila, ĉar la ordo de la filtriloj en la listo "
+"difinas la ordon, laŭ kiu ili estas aplikataj la la mesaĝoj: La unua "
+"filtrilo proviĝas unue.</p><p>Se vi akcidente premis la butonon, vi povas "
+"malfari tion premante la butonon <em>Supren</em></p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por movi la elektitan filtrilon supren en la listo.</p>"
-"<p>Tio estas utila, ĉar la ordo de la filtriloj en la listo difinas la ordon, "
-"laŭ kiu ili estas aplikataj la la mesaĝoj: La unua filtrilo proviĝas unue.</p>"
-"<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
-"<em>Malsupren</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Premu tiun butonon por movi la elektitan filtrilon supren en la listo."
+"</p><p>Tio estas utila, ĉar la ordo de la filtriloj en la listo difinas la "
+"ordon, laŭ kiu ili estas aplikataj la la mesaĝoj: La unua filtrilo proviĝas "
+"unue.</p><p>Se vi akcidente premis la butonon, vi povas malfari tion "
+"premante la butonon <em>Malsupren</em></p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por movi la elektitan filtrilon malsupren en la listo.</p>"
-"<p>Tio estas utila, ĉar la ordo de la filtriloj en la listo difinas la ordon, "
-"laŭ kiu ili estas aplikataj la la mesaĝoj: La unua filtrilo proviĝas unue.</p>"
-"<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
-"<em>Supren</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Premu tiun butonon por movi la elektitan filtrilon malsupren en la "
+"listo.</p><p>Tio estas utila, ĉar la ordo de la filtriloj en la listo "
+"difinas la ordon, laŭ kiu ili estas aplikataj la la mesaĝoj: La unua "
+"filtrilo proviĝas unue.</p><p>Se vi akcidente premis la butonon, vi povas "
+"malfari tion premante la butonon <em>Supren</em></p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por movi la elektitan filtrilon malsupren en la listo.</p>"
-"<p>Tio estas utila, ĉar la ordo de la filtriloj en la listo difinas la ordon, "
-"laŭ kiu ili estas aplikataj la la mesaĝoj: La unua filtrilo proviĝas unue.</p>"
-"<p>Se vi akcidente premis la butonon, vi povas malfari tion premante la butonon "
-"<em>Supren</em></p></qt>"
+"<qt><p>Premu tiun butonon por movi la elektitan filtrilon malsupren en la "
+"listo.</p><p>Tio estas utila, ĉar la ordo de la filtriloj en la listo "
+"difinas la ordon, laŭ kiu ili estas aplikataj la la mesaĝoj: La unua "
+"filtrilo proviĝas unue.</p><p>Se vi akcidente premis la butonon, vi povas "
+"malfari tion premante la butonon <em>Supren</em></p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Premu tiun butonon por alinomi la elektitan filtrilon.</p>"
-"<p>Filtriloj estas aŭtomate nomataj, kiam ili komencas per la signoj \"<<\".</p>"
-"<p>Se vi akcidente alinomis filtrilon kaj volas redoni la aŭtomatan nomon premu "
-"tiun butonon kaj elektu <em>Forigu</em> kaj poste <em>Konfirmu</em> "
-"en la aperonta dialogo.</p></qt>"
+"<qt><p>Premu tiun butonon por alinomi la elektitan filtrilon.</"
+"p><p>Filtriloj estas aŭtomate nomataj, kiam ili komencas per la signoj \"<<"
+"\".</p><p>Se vi akcidente alinomis filtrilon kaj volas redoni la aŭtomatan "
+"nomon premu tiun butonon kaj elektu <em>Forigu</em> kaj poste <em>Konfirmu</"
+"em> en la aperonta dialogo.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Elektu tion por aperigi konfirmdialogon.</p>"
-"<p>Tio estas utila, se vi difinis regularon, kiu markas mesaĝojn por posta "
-"preno. Sen tiu konfirmdialogo, mesaĝoj ne povus esti prenataj, se neniu alia "
-"granda mesaĝo alvenis en la servilo, aŭ se vi volis ŝanĝi la regularon por "
-"marki la mesaĝojn alie.</p></qt>"
+"<qt><p>Elektu tion por aperigi konfirmdialogon.</p><p>Tio estas utila, se vi "
+"difinis regularon, kiu markas mesaĝojn por posta preno. Sen tiu "
+"konfirmdialogo, mesaĝoj ne povus esti prenataj, se neniu alia granda mesaĝo "
+"alvenis en la servilo, aŭ se vi volis ŝanĝi la regularon por marki la "
+"mesaĝojn alie.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7096,6 +6929,16 @@ msgstr "POP3 Filtroreguloj"
 msgid "Filter Rules"
 msgstr "Filtroreguloj"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importi"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importi"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Uzeblaj filtriloj"
@@ -7176,6 +7019,11 @@ msgstr "Ankaŭ aldonu la filtrilon al la illistelo"
 msgid "Icon for this filter:"
 msgstr "Piktogramo por la filtrilo:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Al"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Supren"
@@ -7184,16 +7032,29 @@ msgstr "Supren"
 msgid "Down"
 msgstr "Malsupren"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Alinomi..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nova"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopii al"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Forigita"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7202,8 +7063,8 @@ msgstr "Elekti fulmoklavon por leterujo"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7211,8 +7072,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"La postaj filtrilioj ne estas konservitaj, ĉar ili estas malkorektaj (ekzemple "
-"ili ne havas agojn aŭ rulojn)."
+"La postaj filtrilioj ne estas konservitaj, ĉar ili estas malkorektaj "
+"(ekzemple ili ne havas agojn aŭ rulojn)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7280,27 +7141,24 @@ msgstr "Korektigi IMAPan kaŝmemoron"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Korektigi la kaŝmemoron</b></p> "
-"<p>Se vi havas problemon kun samigo IMAPan leterujon, unue provu rekrei la "
-"indeksan dosieron. Ĝi bezonas iom tempon, sed ne kaŭzos pluan problemon.</p> "
-"<p>Se tio ne sufiĉas, vi povas refreŝigi la IMAPan kaŝmemoron. Tiukaze vi "
-"perdos ĉiujn lokalajn ŝanĝojn de tiu leterujo kaj ĝiaj subleterujoj.</p>"
+"<p><b>Korektigi la kaŝmemoron</b></p> <p>Se vi havas problemon kun samigo "
+"IMAPan leterujon, unue provu rekrei la indeksan dosieron. Ĝi bezonas iom "
+"tempon, sed ne kaŭzos pluan problemon.</p> <p>Se tio ne sufiĉas, vi povas "
+"refreŝigi la IMAPan kaŝmemoron. Tiukaze vi perdos ĉiujn lokalajn ŝanĝojn de "
+"tiu leterujo kaj ĝiaj subleterujoj.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7334,8 +7192,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7375,8 +7233,8 @@ msgstr "La leterujo estas reindeksita."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Leterujo %1 ne estas en komenca samigecostato (stato estas %2). Ĉu vi volas "
 "ŝangi al la komenca stato kaj denove samigi?"
@@ -7504,15 +7362,11 @@ msgstr "Kreante leterujon en servilo"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Leteroj en la servila leterujo <b>%1</b> estis forigitaj. Ĉu vi volas forigi "
-"ilin loke?</p></qt>"
-"<br>UID-oj: %2</p></qt>"
+"<qt> <p>Leteroj en la servila leterujo <b>%1</b> estis forigitaj. Ĉu vi "
+"volas forigi ilin loke?</p></qt><br>UID-oj: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7533,13 +7387,11 @@ msgstr "Ekprenante leterujojn por nomspaco %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Ŝajnas, ke la leterujo <b>%1</b> estas forigita. Ĉu vi volas forigi ĝin de "
-"la servilo?</p></qt>"
+"<qt> <p>Ŝajnas, ke la leterujo <b>%1</b> estas forigita. Ĉu vi volas forigi "
+"ĝin de la servilo?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7547,16 +7399,16 @@ msgstr "Interrompita"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "La IMAPa servilo %1 ne subtenas IMAPan notojn. La XML-memoro ne estas uzebla "
 "kun tiu servilo. Bonvole reagordu KMail-on alimaniere."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "La IMAPa servilo %1 ne subtenas IMAPan notojn. La XML-memoro ne estas uzebla "
 "kun tiu servilo. Bonvole reagordu KMail-on alimaniere."
@@ -7571,11 +7423,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7584,15 +7436,20 @@ msgstr "Nesufiĉaj alirpermesoj"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Movi al:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ne ŝovi"
 
@@ -7604,8 +7461,7 @@ msgstr "Ŝovi mesaĝojn al leterujo"
 msgid "Permissions (ACL)"
 msgstr "Rajtoj (AKL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Ĝenerale"
@@ -7629,8 +7485,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Uzi proprajn p&iktogramojn"
@@ -7649,14 +7504,13 @@ msgstr "Agi pri nova/nelegita poŝto en tiu leterujo"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7669,12 +7523,12 @@ msgstr "Konservi respondojn en ĉi leterujo"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Marku la opcion, se vi volas ĉi tie la respondojn, kiuj vi faris de leterojn en "
-"tiu leterujo, anstataŭ en la sendita-leterujo."
+"Marku la opcion, se vi volas ĉi tie la respondojn, kiuj vi faris de leterojn "
+"en tiu leterujo, anstataŭ en la sendita-leterujo."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7684,17 +7538,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Mon&tri kolumnon:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Uzi kiel apriora"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Sendinto"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Ricevonto"
@@ -7705,11 +7563,11 @@ msgstr "&Sendantula identeco:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7728,12 +7586,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7764,17 +7622,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7844,7 +7702,8 @@ msgstr "Eraro dum demando de leteruja informo."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "La leterindekso de '%1' estas el nekonata versio de Retpoŝtilo (%2).\n"
 "La indekso povus esti rekreata de via leterujo, sed kelkaj informoj, kiel la "
@@ -7874,11 +7733,11 @@ msgstr "Eraro dum malfermo de %1; la leterujo mankas."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Eraro dum malfermo de %1; aŭ ĝi estas malkorekta poŝtdosierujo aŭ vi ne havas "
-"sufiĉan permeson."
+"Eraro dum malfermo de %1; aŭ ĝi estas malkorekta poŝtdosierujo aŭ vi ne "
+"havas sufiĉan permeson."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -7905,7 +7764,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"Via leterujo \"sendotaj\" entenas mesagojn, ŝajne ne kreitajn de Retpoŝtilo.\n"
+"Via leterujo \"sendotaj\" entenas mesagojn, ŝajne ne kreitajn de "
+"Retpoŝtilo.\n"
 "Bonvolu forigi ilin de tie, por eviti, ke Retpoŝtilo sendos ilin."
 
 #: kmfoldermbox.cpp:112
@@ -7918,20 +7778,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>La leteruja indekso '%2' sajnas malaktuala. Por eviti mesaĝodetruon la "
-"indekso estos rekreata. Tial forigitaj mesaĝoj reaperos kaj statmarkoj povas "
-"manki.</p> "
-"<p>Legu la apartenan tekston en la<a href=\"%1\">ĉapitro de oftaj demandoj de "
-"Poŝtila priskribo</a> pri informoj pro evito de problema reapero.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>La leteruja indekso '%2' sajnas malaktuala. Por eviti mesaĝodetruon "
+"la indekso estos rekreata. Tial forigitaj mesaĝoj reaperos kaj statmarkoj "
+"povas manki.</p> <p>Legu la apartenan tekston en la<a href=\"%1\">ĉapitro de "
+"oftaj demandoj de Poŝtila priskribo</a> pri informoj pro evito de problema "
+"reapero.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7990,7 +7847,7 @@ msgstr ""
 "'%1' ŝajnas ne esti dosierujo.\n"
 "Forigu la dosieron."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7998,7 +7855,7 @@ msgstr ""
 "La permesoj ujaj (%1) estas malkorektaj.\n"
 "Certigu, ke vi povas legi kaj skribi la ujan enhavon."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8008,8 +7865,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8017,7 +7874,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Ne eblis krei dosierujon"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8115,9 +7972,9 @@ msgstr "&Korektigi kaŝmemoron..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8150,8 +8007,8 @@ msgstr ""
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Ne eblas ŝovi aŭ kopii leterujon <b>%1</b> en subleterujon malsupre de si "
-"mem.</qt>"
+"<qt>Ne eblas ŝovi aŭ kopii leterujon <b>%1</b> en subleterujon malsupre de "
+"si mem.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8258,15 +8115,15 @@ msgstr "%1 Leterujo estas nur-lega."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ĉu vi vere volas forigi la elektan mesaĝon? "
-"<br>Forigite ĝi ne estas rekrebla.</qt>\n"
-"<qt>Ĉu vi vere volas forigi la %n elektajn mesaĝojn? "
-"<br>Forigite ili ne estas rekreblaj.</qt>"
+"<qt>Ĉu vi vere volas forigi la elektan mesaĝon? <br>Forigite ĝi ne estas "
+"rekrebla.</qt>\n"
+"<qt>Ĉu vi vere volas forigi la %n elektajn mesaĝojn? <br>Forigite ili ne "
+"estas rekreblaj.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8318,123 +8175,122 @@ msgstr ""
 "Eraro dum ŝanĝo de %1\n"
 "(Eble mankas spaco sur disko?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Peto pri subskribo de atestilo"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Bonvolu krei atestilon de la kunsendaĵo kaj resendi al la sendinto."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Labori konektite"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Labori malkonektite"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la ricevitujo."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "sendotaj"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la sendotujo."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "senditaj"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la senditujo."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "rubo"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la rubujo."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "malnetaĵoj"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Vi ne havas legan aŭ skriban permeson por la netujo."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "ŝablonoj"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Vi ne havas legan/skriban permeson por via ŝablonujo."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Lasta serĉo"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Al KMail okazis grava eraro kaj ĝi do tuj finos"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8445,11 +8301,11 @@ msgstr ""
 "La eraro estis:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Malplenigi rubujon"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ĉu vi vere volas malplenigi la rubujon de ĉiuj kontoj?"
 
@@ -8524,8 +8380,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Nova poŝto</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8563,11 +8418,11 @@ msgstr "Ĉu vi vere volas malplenigi la rubujon?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Ĉu vi vere volas ŝovi ĉiujn mesaĝojn de leterujo <b>%1</b> "
-"al la rubujo?</qt>"
+"<qt>Ĉu vi vere volas ŝovi ĉiujn mesaĝojn de leterujo <b>%1</b> al la rubujo?"
+"</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8591,12 +8446,11 @@ msgstr "Forviŝi serĉon"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Ĉu vi vere volas forigi la serĉon <b>%1</b>?"
-"<br>Mesaĝoj kiujn ĝi elmontras plue estos disponeblaj en ilia origina "
-"leterujo.</qt>"
+"<qt>Ĉu vi vere volas forigi la serĉon <b>%1</b>?<br>Mesaĝoj kiujn ĝi "
+"elmontras plue estos disponeblaj en ilia origina leterujo.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8609,11 +8463,10 @@ msgstr "<qt>Ĉu vi vere volas forigi la malplenan leterujon <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Ĉu vi estas certa, ke vi volas forigi la malplenan leterujon <b>%1</b> "
 "kaj ĉiujn subleterujojn? La subleterujoj povus ne esti malplenaj kaj iliaj "
@@ -8622,24 +8475,28 @@ msgstr ""
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ĉu vi estas certa, ke vi volas forigi la leterujon <b>%1</b> "
-"kaj gian enhavon?</qt>"
+"<qt>Ĉu vi estas certa, ke vi volas forigi la leterujon <b>%1</b> kaj gian "
+"enhavon?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ĉu vi estas certa, ke vi volas forigi la leterujon <b>%1</b> "
-"kaj ĉiujn subleterujojn, perdonte ĉiujn enhavojn?</qt>"
+"<qt>Ĉu vi estas certa, ke vi volas forigi la leterujon <b>%1</b> kaj ĉiujn "
+"subleterujojn, perdonte ĉiujn enhavojn?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Forigita"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8655,12 +8512,12 @@ msgstr "Ĉu vi vere volas forigi ĉiujn malnovajn mesaĝojn?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Uzo de HTML en retpoŝto faras vin pli vundebla de varbmesaĝoj kaj povus altigi "
-"la verŝajnecon, ke via sistemo estos damaĝata de malica kodo."
+"Uzo de HTML en retpoŝto faras vin pli vundebla de varbmesaĝoj kaj povus "
+"altigi la verŝajnecon, ke via sistemo estos damaĝata de malica kodo."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8674,12 +8531,12 @@ msgstr "Uzi HTMLon"
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Ŝargo de eksteraj referencoj en HTML-retpoŝto faras vin pli vundebla de "
-"varbmesaĝoj kaj povus altigi la verŝajnecon, ke via sistemo estos damaĝata de "
-"aliaj nunaj aŭ estontaj malicaj koderoj."
+"varbmesaĝoj kaj povus altigi la verŝajnecon, ke via sistemo estos damaĝata "
+"de aliaj nunaj aŭ estontaj malicaj koderoj."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8695,12 +8552,12 @@ msgstr "Filtrilo pri dissendolisto %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"La funkcio \"ne en oficejo\" de KMail bezonas servilan filtron. Ĝis nun vi ne "
-"agordis IMAPan servilon por tio.\n"
+"La funkcio \"ne en oficejo\" de KMail bezonas servilan filtron. Ĝis nun vi "
+"ne agordis IMAPan servilon por tio.\n"
 "Vi povas fari tion en la \"Filtrilo\"-tabo de la IMAP-konta agordo."
 
 #: kmmainwidget.cpp:1743
@@ -8716,10 +8573,11 @@ msgstr "Ne eblis starti atestilo-manaĝeron. Bonvolu kontroli vian instaladon."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Ne eblis lanĉi GnuPGan protokolvidigilon (kwatchgnupg). Bonvolu kontroli vian "
-"instaladon."
+"Ne eblis lanĉi GnuPGan protokolvidigilon (kwatchgnupg). Bonvolu kontroli "
+"vian instaladon."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9041,8 +8899,7 @@ msgstr "&Konservi kunsendaĵon..."
 msgid "Appl&y All Filters"
 msgstr "Apliki ĉ&iujn filtrilojn"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&pliki filtrilon"
@@ -9158,7 +9015,6 @@ msgstr "Se&kva nelegita mesaĝo"
 msgid "Go to the next unread message"
 msgstr "Iri al la sekva nelegita mesaĝo"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "An&taŭa mesaĝo"
@@ -9299,8 +9155,8 @@ msgstr " Preparante..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9311,23 +9167,23 @@ msgstr ""
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "La mesaĝo enhavas postulon pri sendo de agnoto.\n"
-"Ĝi entenas komandon, kiu estas markita kiel \"necesa\", sed ĝi estas nekona al "
-"KMail.\n"
+"Ĝi entenas komandon, kiu estas markita kiel \"necesa\", sed ĝi estas nekona "
+"al KMail.\n"
 "Vi aŭ ignoras la postulon aŭ lasas sendi rifuzan aŭ normalan respondon de "
 "KMail."
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9340,8 +9196,8 @@ msgstr ""
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9354,15 +9210,16 @@ msgstr ""
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "La mesaĝo enhavas postulon pri sendo de agnoto,\n"
-"sed la returnvoja adreso diferencas de la adreso, al kiu la noto estu sendota.\n"
+"sed la returnvoja adreso diferencas de la adreso, al kiu la noto estu "
+"sendota.\n"
 "Vi aŭ ignoras la postulon aŭ lasas sendi rifuzan aŭ normalan respondon de "
 "KMail."
 
@@ -9383,24 +9240,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Kaplinio \"Disposition-Notification-Options\" enhavas postulata, sed nekonata "
-"parametro."
+"Kaplinio \"Disposition-Notification-Options\" enhavas postulata, sed "
+"nekonata parametro."
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Ricevonto: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Kunsendaĵo: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Montras la aldonaĵon kiel proponite de la sendinto."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9450,45 +9307,38 @@ msgstr "Ecoj de mesaĝa parto"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>La <em>MIME-tipo</em> de la dosiero:</p>"
-"<p>Normale vi ne bezonas ŝanĝi tiun agordon, ĉar la tipo de la dosiero aŭtomate "
-"eltroviĝos. Sed kelkfoje %1 ne rekonas la tipon ĝuste. Tie ĉi vi povas korekti "
-"tion.</p></qt>"
+"<qt><p>La <em>MIME-tipo</em> de la dosiero:</p><p>Normale vi ne bezonas "
+"ŝanĝi tiun agordon, ĉar la tipo de la dosiero aŭtomate eltroviĝos. Sed "
+"kelkfoje %1 ne rekonas la tipon ĝuste. Tie ĉi vi povas korekti tion.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>La grandeco de la parto:</p>"
-"<p>Kelkfoje %1 donos nur proksimuman grandecon tie ĉi, ĉar kalkulado de la "
-"ekzakta grandeco postulus tro multan tempon. En tiu okazo aperos \"(proks.)\" "
-"malantaŭ la taksita grandeco.</p></qt>"
+"<qt><p>La grandeco de la parto:</p><p>Kelkfoje %1 donos nur proksimuman "
+"grandecon tie ĉi, ĉar kalkulado de la ekzakta grandeco postulus tro multan "
+"tempon. En tiu okazo aperos \"(proks.)\" malantaŭ la taksita grandeco.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>La dosiernomo de la parto:</p>"
-"<p>Kvankam apriore tio estas la nomo de la kunsendita dosiero, ĝi ne identigas "
-"la sendotan dosieron. Pli ĝuste tio estas sugestas dosiernomon al la poŝtilo de "
-"la ricevonto, se tiu volas konservi la dosieron surdiske.</p></qt>"
+"<qt><p>La dosiernomo de la parto:</p><p>Kvankam apriore tio estas la nomo de "
+"la kunsendita dosiero, ĝi ne identigas la sendotan dosieron. Pli ĝuste tio "
+"estas sugestas dosiernomon al la poŝtilo de la ricevonto, se tiu volas "
+"konservi la dosieron surdiske.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9496,17 +9346,14 @@ msgstr "&Priskribo:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Priskribo de la parto:</p>"
-"<p>Tio estas informa priskribo de la parto, simile al la temlinio de la tuta "
-"mesaĝo. Plej multaj poŝtiloj montras tiun priskribon en la mesaĝo apud la "
-"piktogramo de la kunsendaĵo.</p></qt>"
+"<qt><p>Priskribo de la parto:</p><p>Tio estas informa priskribo de la parto, "
+"simile al la temlinio de la tuta mesaĝo. Plej multaj poŝtiloj montras tiun "
+"priskribon en la mesaĝo apud la piktogramo de la kunsendaĵo.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9514,22 +9361,20 @@ msgstr "&Kodo:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>La transportkodo de tiu parto:</p>"
-"<p>Normale vi ne bezonos ŝanĝi tion, ĉar %1 uzas taŭgan kodon depende de la "
-"MIME-tipo de la dosiero. Sed foje vi povas redukti la grandecon de la mesaĝo, "
-"ekz. se postskripta dosiero konsistas precipe el askiaj signoj. Vi povus elekti "
-"\"quoted-printable\" anstataŭ la apriora \"base64\", tdeio ŝparas eble 25% da "
-"da mesaĝgrandeco.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>La transportkodo de tiu parto:</p><p>Normale vi ne bezonos ŝanĝi "
+"tion, ĉar %1 uzas taŭgan kodon depende de la MIME-tipo de la dosiero. Sed "
+"foje vi povas redukti la grandecon de la mesaĝo, ekz. se postskripta dosiero "
+"konsistas precipe el askiaj signoj. Vi povus elekti \"quoted-printable\" "
+"anstataŭ la apriora \"base64\", tdeio ŝparas eble 25% da da mesaĝgrandeco.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9537,20 +9382,16 @@ msgstr "Sugesti &aŭtomatan montradon"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Elektu, se vi volas sugesti al la poŝtilo de la ricevonto aŭtomatan "
+"<qt><p>Elektu, se vi volas sugesti al la poŝtilo de la ricevonto aŭtomatan "
 "montradon de la kunsendaĵo, t.e. kadre de la mesaĝo anstataŭ nur piktograman "
-"ligon.</p>"
-"<p>Teknike tio okazos per difino de la kaplinio<em>Content-Disposition</em> "
-"kiel \"inline\" anstataŭ la apriora \"attachment\".</p></qt>"
+"ligon.</p><p>Teknike tio okazos per difino de la kaplinio<em>Content-"
+"Disposition</em> kiel \"inline\" anstataŭ la apriora \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9558,15 +9399,12 @@ msgstr "&Subskribi tiun parton"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Elektu tion, se vi volas subskribi tiun parton.</p>"
-"<p>La subskribo okazos per la ŝlosilo ligita al la elektita identeco via.</p>"
-"</qt>"
+"<qt><p>Elektu tion, se vi volas subskribi tiun parton.</p><p>La subskribo "
+"okazos per la ŝlosilo ligita al la elektita identeco via.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9574,13 +9412,11 @@ msgstr "Ĉi&fri la parton"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Elektu, se vi volas ĉifri la parton.</p>"
-"<p>La ĉifrado okazos per la ŝlosiloj de la ricevontoj de tiu ĉi mesaĝo.</p></qt>"
+"<qt><p>Elektu, se vi volas ĉifri la parton.</p><p>La ĉifrado okazos per la "
+"ŝlosiloj de la ricevontoj de tiu ĉi mesaĝo.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9594,15 +9430,13 @@ msgstr "POPa filtrilo"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Filtrendaj mesaĝoj troviĝantaj en via POP-konto: <b>%1</b>"
-"<p>La montrataj mesaĝoj estas pli grandaj ol la limo difinita por tiu konto."
-"<br>Vi nun povas elekti, kion fari pri ili."
+"Filtrendaj mesaĝoj troviĝantaj en via POP-konto: <b>%1</b><p>La montrataj "
+"mesaĝoj estas pli grandaj ol la limo difinita por tiu konto.<br>Vi nun povas "
+"elekti, kion fari pri ili."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9855,35 +9689,34 @@ msgstr "La poŝtilo por la K-labortabla medio (TDE)."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9891,14 +9724,13 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Bonvenon ĉe KMail %1</h2>"
-"<p>KMail estas kliento por retpoŝto apartenanta al TDE. Ĝi estas konstruita por "
-"esti kongrua al la interretaj retpoŝtonormoj MIME, SMTP, POP3 kaj IMAP.</p>\n"
-"<ul>"
-"<li>KMail havas multajn potencajn funkciojn priskribitajn en la <a href=\"%2\">"
-"dokumentaro</a></li>\n"
-"<li>La <a href=\"%3\">hejmpaĝo de KMail</a> ofertas informojn pri novaj versioj "
-"de KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Bonvenon ĉe KMail %1</h2><p>KMail estas kliento "
+"por retpoŝto apartenanta al TDE. Ĝi estas konstruita por esti kongrua al la "
+"interretaj retpoŝtonormoj MIME, SMTP, POP3 kaj IMAP.</p>\n"
+"<ul><li>KMail havas multajn potencajn funkciojn priskribitajn en la <a href="
+"\"%2\">dokumentaro</a></li>\n"
+"<li>La <a href=\"%3\">hejmpaĝo de KMail</a> ofertas informojn pri novaj "
+"versioj de KMail</li></ul>\n"
 "%8\n"
 "<p>Kelkaj el la novaj funkcioj en ĉi tiu versio (kompare al KMail %4, kiu "
 "apartenas al TDE %5):</p>\n"
@@ -9910,20 +9742,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; La KMail-Teamo</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Bonvolu uzi momenton por plenigi la necesajn informojn por la funkciado de "
-"Retpoŝtilo ĉe la menuo Agordo-&gt;Agordo.\n"
+"<p>Bonvolu uzi momenton por plenigi la necesajn informojn por la funkciado "
+"de Retpoŝtilo ĉe la menuo Agordo-&gt;Agordo.\n"
 "Vi devas krei almenaŭ aprioran identecon kaj enirtan kaj eliran retpoŝtan "
 "konton.</p>\n"
 
@@ -9962,10 +9792,12 @@ msgstr "Montri kunsendaĵoj: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
-"[KMail: Kunsendaĵo enhavas duumajn datumojn. Provas montri la unuan signon.]\n"
+"[KMail: Kunsendaĵo enhavas duumajn datumojn. Provas montri la unuan "
+"signon.]\n"
 "[KMail: Kunsendaĵo enhavas duumajn datumojn. Provas montri la unuajn %n "
 "signojn.]"
 
@@ -9991,12 +9823,14 @@ msgstr "Ĉu malfermi kunsendaĵon?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10018,6 +9852,58 @@ msgstr "(Konvenas al &iu el la sekvaj)"
 msgid "(match all of the following)"
 msgstr "(Konvenas &al ĉiuj el la sekvaj)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Legi"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Malnova"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Forigita"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Respondita"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Plusendita"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Atendvicigita"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sendita"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Observata"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorita"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Fimesaĝa"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Fimesaĝa"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Faronta"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Kun kunsendaĵo"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10102,20 +9988,20 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Ŝovo de la sendita mesaĝo \"%1\" el la sendotujo al la senditujo fiaskis.\n"
-"Ebla kaŭzo estas diskospaca manko aŭ srkibpermeso. Provu solvi la problemon kaj "
-"mane ŝovu la mesaĝon."
+"Ebla kaŭzo estas diskospaca manko aŭ srkibpermeso. Provu solvi la problemon "
+"kaj mane ŝovu la mesaĝon."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Ne eblas sendi mesaĝon sen sendatulan adreson.\n"
 "Agordu la la retpoŝtan adreson de la identeco '%1' en la identeca parto de "
@@ -10144,8 +10030,8 @@ msgstr "Initante sendprocedon..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10170,15 +10056,16 @@ msgstr "Ne eblis sendi kelkajn atendantajn mesaĝojn."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Sendado interrompita:\n"
 "%1\n"
-"La mesaĝo restos en la leterujo 'sendotaj' ĝis aŭ vi forigis la problemon (ekz. "
-"malĝusta adreso) aŭ forigis la mesaĝon el la leterujo 'sendotaj'.\n"
+"La mesaĝo restos en la leterujo 'sendotaj' ĝis aŭ vi forigis la problemon "
+"(ekz. malĝusta adreso) aŭ forigis la mesaĝon el la leterujo 'sendotaj'.\n"
 "La sekva transportprotokolo estis uzata:\n"
 "  %2"
 
@@ -10188,20 +10075,17 @@ msgstr "Sendado interrompita."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Sendado malsukesis:</p>"
-"<p>%1</p>"
-"<p>La mesaĝo restos en la leterujo 'sendotaj' ĝis aŭ vi forigis la problemon "
-"(ekz. malĝusta adreso) aŭ forigis la mesaĝon el la dosierujo 'sendotaj'.</p>"
-"<p>La sekva transportprotokolo estis uzata:</p>  %2 "
-"<p>Ĉu vi volas pluigi la sendadon de la restaj mesaĝoj?</p>"
+"<p>Sendado malsukesis:</p><p>%1</p><p>La mesaĝo restos en la leterujo "
+"'sendotaj' ĝis aŭ vi forigis la problemon (ekz. malĝusta adreso) aŭ forigis "
+"la mesaĝon el la dosierujo 'sendotaj'.</p><p>La sekva transportprotokolo "
+"estis uzata:</p>  %2 <p>Ĉu vi volas pluigi la sendadon de la restaj mesaĝoj?"
+"</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10219,15 +10103,16 @@ msgstr "&Interrompi sendadon"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Sendado malsukesis:\n"
 "%1\n"
-"La mesaĝo restos en la leterujo 'sendotaj' ĝis aŭ vi forigis la problemon (ekz. "
-"malĝusta adreso) aŭ forigis la mesaĝon el la dosierujo 'sendotaj'.\n"
+"La mesaĝo restos en la leterujo 'sendotaj' ĝis aŭ vi forigis la problemon "
+"(ekz. malĝusta adreso) aŭ forigis la mesaĝon el la dosierujo 'sendotaj'.\n"
 "La sekva transportprotokolo estis uzata:\n"
 " %2"
 
@@ -10267,28 +10152,29 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 ŝajnas ankoraŭ ruli en alia vidigejo en tiu maŝino. Lanĉi %2 pli multe ol "
-"unu foje povas kaŭzi poŝtperdon. Vi ne lanĉu %1, se vi ne estas certa, ke ĝi ne "
-"jam rulas."
+"unu foje povas kaŭzi poŝtperdon. Vi ne lanĉu %1, se vi ne estas certa, ke ĝi "
+"ne jam rulas."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 ŝajnas jam ruli en alia vidigejo en tiu maŝino. Ruli %1 kaj %2 samtempepovas "
-"kaŭzi poŝtperdon. Vi ne lanĉu %2, se vi ne estas certa, ke %1 ne jam rulas."
+"%1 ŝajnas jam ruli en alia vidigejo en tiu maŝino. Ruli %1 kaj %2 "
+"samtempepovas kaŭzi poŝtperdon. Vi ne lanĉu %2, se vi ne estas certa, ke %1 "
+"ne jam rulas."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 ŝajnas jam ruli en %2. Lanĉi %1 pli multe ol unufoje povas kaŭzi poŝtan "
 "perdon. Vi ne lanĉu %1 en tiu komputilo, se vi ne estas certa, ke ĝi ne jam "
@@ -10296,9 +10182,9 @@ msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 ŝajnas ruli en %3. Ruli %1 kaj %2 samtempe povas kaŭzi poŝtperdon. Vi ne "
 "lanĉu %2 en tiu komputilo, se vi ne estas certa, ke %1 ne rulas en %3."
@@ -10312,6 +10198,10 @@ msgstr "Lanĉi %1"
 msgid "Exit"
 msgstr "Eliri"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Novaj mesaĝoj en"
@@ -10339,8 +10229,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Marku la opcion, por ke KMail konservu la SMTPan pasvorton en ĝia agorda "
@@ -10423,8 +10314,8 @@ msgstr "La servilo &postulas aŭtorigadon"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Marku la opcion, se via SMTP-servilo postulas aŭtentigecon antaŭ akcepto de "
 "retpoŝto. Tio estas kona kiel 'Aŭtenta SMTPo' aŭ simple ASMTP."
@@ -10447,15 +10338,13 @@ msgstr "Sendi propran komputilnomon al la servilo"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"<p>Marku la opcion, por ke KMail uzu propran nomon, kiam ĝi identifigas al la "
-"retpoŝta servilo.</p>"
-"<p>Tio estas utila, kiam la sistema nomo ne estas korekta aŭ vi ne volas konigi "
-"la nomon.</p>"
+"<p>Marku la opcion, por ke KMail uzu propran nomon, kiam ĝi identifigas al "
+"la retpoŝta servilo.</p><p>Tio estas utila, kiam la sistema nomo ne estas "
+"korekta aŭ vi ne volas konigi la nomon.</p>"
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10486,8 +10375,8 @@ msgstr "Nur lokaj dosieroj permesitaj."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Servilonomo aux numera adreso de la SMTP-servilo."
 
 #: kmtransport.cpp:788
@@ -10500,10 +10389,10 @@ msgstr "Eraro dum listado de dosierujo %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10724,34 +10613,26 @@ msgstr "&Redakti mesaĝon"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Strukturinformoj returnitaj de la ĉifrokormaĵo ne povas prilaborataj; la "
-"kromaĵo povus esti damaĝa.</p> "
-"<p>Kontaktu vian sisteman administriston.</p> </qt>"
+"<qt> <p>Strukturinformoj returnitaj de la ĉifrokormaĵo ne povas "
+"prilaborataj; la kromaĵo povus esti damaĝa.</p> <p>Kontaktu vian sisteman "
+"administriston.</p> </qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Neniu aktiva ĉifrokromaĵo estas trovita kaj la ena OpenPGP-kodo ne "
-"sukcesis.</p> "
-"<p>Vi povas fari du agojn por ŝangi:</p> "
-"<ul> "
-"<li><em>aŭ</em>aktivigu kromaĵon per la Poŝtila agordodialogo,"
-"<li> "
-"<li><em>aŭ</em>elektu la malnova OpenPGP-agordo en la sama dialogo.</li> </ul>"
+"sukcesis.</p> <p>Vi povas fari du agojn por ŝangi:</p> <ul> <li><em>aŭ</"
+"em>aktivigu kromaĵon per la Poŝtila agordodialogo,<li> <li><em>aŭ</em>elektu "
+"la malnova OpenPGP-agordo en la sama dialogo.</li> </ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10763,8 +10644,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10779,14 +10660,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "La kadra formo de la OpenPGPa mesaĝformo ne subtenas ĉifro aŭ subskribo de "
@@ -10899,8 +10780,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Ekzameno de la adresatulaj ĉifropreferoj aperigis, ke vi estu demandata pri "
@@ -10937,8 +10818,9 @@ msgstr "&Ne ĉifri"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Vi postulis ĉifri la mesaĝon kaj ĉifri kopion por vi mem, sed neniu valida "
 "fidata ŝlosilo ekzistas por la identeco."
@@ -10950,13 +10832,13 @@ msgstr "Sendi neĉifre?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Kelkaj partoj de la mesaĝo ne estos ĉifrataj.\n"
-"Sendo de nur parte ĉifrataj mesaĝoj povas ofendi servilan direktivon aŭ tralasi "
-"sekretajn informojn.\n"
+"Sendo de nur parte ĉifrataj mesaĝoj povas ofendi servilan direktivon aŭ "
+"tralasi sekretajn informojn.\n"
 "Ĉu anstataŭe ĉifri ĉiujn partojn?"
 
 #: messagecomposer.cpp:950
@@ -10979,50 +10861,44 @@ msgstr "Ĉifri ĉiu&jn mesaĝopartojn"
 msgid "Unencrypted Message Warning"
 msgstr "Ĉifroaverto"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Eraro: La ĉifrejo ne redonis ĉifrajn datumojn.</p> "
-"<p>Raportu la malkoretaĵon: "
-"<br>%2</p></qt>"
+"<qt> <p>Eraro: La ĉifrejo ne redonis ĉifrajn datumojn.</p> <p>Raportu la "
+"malkoretaĵon: <br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Ne ĉiuj signoj estas prezenteblaj per la elektita kodo. "
-"<br>"
-"<br>Ĉu tamen sendi la mesaĝon?</qt>"
+"<qt>Ne ĉiuj signoj estas prezenteblaj per la elektita kodo. <br><br>Ĉu tamen "
+"sendi la mesaĝon?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Kelkaj signoj perdiĝos"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Perdi signojn"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Ŝanĝi &signokodon"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Ne eblas subskribi la mesaĝon, ĉar la elektita subskribejo ŝajnas ne subteni "
 "subskribon. Tio ĉi neniam okazu, tial raportu la malkorektaĵon."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11030,37 +10906,38 @@ msgstr ""
 "Ne eblas subskribi la mesaĝon, ĉar la elektita subskribejo ŝajnas ne subteni "
 "subskribon. Tio ĉi neniam okazu, tial raportu la malkorektaĵon."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Ne eblas ĉifri la mesaĝon, ĉar la elektita ĉifrejo ŝajnas ne subteni ĉifron. "
 "Tio ĉi neniam okazu, tial raportu la malkorektaĵon."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Ne eblas subskribi kaj ĉifri la mesaĝon, ĉar la elektita subskribejo ŝajnas ne "
-"subteni ambaŭfarajn subskribon kaj ĉifron. Tio ĉi neniam okazu, tial raportu la "
-"malkorektaĵon."
+"Ne eblas subskribi kaj ĉifri la mesaĝon, ĉar la elektita subskribejo ŝajnas "
+"ne subteni ambaŭfarajn subskribon kaj ĉifron. Tio ĉi neniam okazu, tial "
+"raportu la malkorektaĵon."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11081,10 +10958,10 @@ msgstr "Poŝtkesta &formato:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11094,8 +10971,8 @@ msgstr "Leterujo &enhavas:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11134,8 +11011,7 @@ msgstr "Diversaj rezultoj por subskriboj"
 msgid "The crypto engine returned no cleartext data."
 msgstr "La ĉifrilo ne redonis legeblan tekston."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stato: "
 
@@ -11164,8 +11040,8 @@ msgstr "Kromaĵo por %1 ne estas trovita."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "La mesaĝo estas subskribita, sed la valideco de la subskribo ne estis "
 "kontrolebla. <br />Kaŭzo: %1"
@@ -11205,27 +11081,27 @@ msgstr "Ĉifrokromaĵo \"%1\" ne povas deĉifri mesaĝojn."
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Noto:</b> Ĉi tio estas HTML-mesaĝo. Pro sekureco estas nur montrata la plena "
-"HTML kodo. Se vi fidas la sendinton de la mesaĝo, vi povas aktivigu la "
-"formatitan HTML-rigardon per premo de la <a href=\"kmail.showHTML\">HTML</a>"
-"-butono."
+"<b>Noto:</b> Ĉi tio estas HTML-mesaĝo. Pro sekureco estas nur montrata la "
+"plena HTML kodo. Se vi fidas la sendinton de la mesaĝo, vi povas aktivigu la "
+"formatitan HTML-rigardon per premo de la <a href=\"kmail.showHTML\">HTML</a>-"
+"butono."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Noto:</b> Ĉi tio estas HTML-mesaĝo. Pro sekureco estas nur montrata la plena "
-"HTML kodo. Se vi fidas la sendinton de la mesaĝo, vi povas aktivigu la "
-"formatitan HTML-rigardon per premo de la <a href=\"kmail.showHTML\">HTML</a>"
-"-butono."
+"<b>Noto:</b> Ĉi tio estas HTML-mesaĝo. Pro sekureco estas nur montrata la "
+"plena HTML kodo. Se vi fidas la sendinton de la mesaĝo, vi povas aktivigu la "
+"formatitan HTML-rigardon per premo de la <a href=\"kmail.showHTML\">HTML</a>-"
+"butono."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11482,11 +11358,11 @@ msgstr "konservita: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Neniu retpoŝtadreso estas konservita en  la %1 por subskribi. Tial ni ne povos "
-"kompari ĝin kun la sendintula adreso %2."
+"Neniu retpoŝtadreso estas konservita en  la %1 por subskribi. Tial ni ne "
+"povos kompari ĝin kun la sendintula adreso %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11603,14 +11479,15 @@ msgstr "Erarmesago de en-el-sklavo"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "La POP3-servilo uzita de vi ne subtenas la komandon UIDL. Tiu komando estas "
-"necesa por eltrovi fidinde, kiujn el la mesaĝoj en la servilo KMail jam vidis "
-"antaŭe.\n"
+"necesa por eltrovi fidinde, kiujn el la mesaĝoj en la servilo KMail jam "
+"vidis antaŭe.\n"
 "La funkcio, kiu lasas la retleterojn sur la servilo, do ne ĝuste funkcios."
 
 #: popaccount.cpp:752
@@ -11632,7 +11509,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Prenante mesaĝon %1 el %2 (%3 de %4 KB) de %5 (%6 KB ankoraŭ en la servilo)."
 
@@ -11651,1796 +11529,15 @@ msgstr "Nevalida respondo de la servilo"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Pardonu, la servilo ne subtenas la komandon TOP. Do ne eblas preni nur la "
 "kapojn de grandaj retpoŝtoj antaŭ preni ilin tute."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Iri"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Leterujo"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mesaĝo"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Plusendi"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTMLa illistelo"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signado"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Aŭtomate subskribi mesaĝojn"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Kiam la opcio estas markita, ĉiuj mesaĝoj, kiujn vi sendas, norme estos "
-"subskribataj. Sed eblas ankaŭ neebligi subskribon por ĉiu aparta mesaĝo."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Ĉifrado"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Kiam la opcio estas markita, la mesaĝo aŭ dosiero ne nur estos ĉifrata per la "
-"publikŝlosilon de la adresaton, sed ankaŭ per via ŝlosilo. Tio ebligas vin "
-"poste deĉifri la mesaĝon aŭ dosieron. Ĝenerale tio estas bona ideo."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Montri subskibitan aŭ ĉifritan tekston post redakto"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Kiam la opcio estas markita, la subskribita aŭ ĉifrita teksto estos montrata en "
-"aparta fenestro, por ke vi povas vidi la eksteraĵon antaŭ la sendo. Tio estas "
-"bona ideo, kiam vi kontrolas la funkcion de la ĉifrosistemo."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Konservi senditajn mesaĝojn ĉ&ifrite"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Marki por konservi la mesaĝojn ĉifrite "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Konservu mesaĝojn ĉifrite</h1> \n"
-"Kiam tio estas markita, senditaj mesaĝoj estas konservataj ĉifrite kiel "
-"senditaj. Tio ne estas rekomendata, ĉar vi ne eblos legi plue la mesaĝojn, se "
-"la necesa atestilo malvalidiĝas.\n"
-"<p>\n"
-"Sed ekzistus reguloj, kiuj postulas uzi la opcion. Se vi dubas, demandu vian "
-"administriston.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Ĉiam vidigi la ĉi&froŝlosilojn pro aprobo"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Kiam la opcio estas markita, la aplikaĵo ĉiam montros al vi publikŝlosilan "
-"liston, de kiu vi povas elekti la uzotan. Alikaze la aplikaĵo nur montros la "
-"dialogon, se ĝi ne trovas la ĝustan aŭ estas kelkaj, kiuj estas uzeblaj."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Aŭtomate &ĉifri mesaĝojn kiam eble"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Kiam la opcio estas markita, ĉiu mesaĝo, kiun vi sendos, estos ĉifrata, se tio "
-"estas ebla kaj dezirata. Tamen eblas neebligi la aŭtomatan ĉifron por ĉiu "
-"mesaĝo."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Neniam subskribi aŭ ĉifri malnetaĵon"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Al: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopio: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universale"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Respondi"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Respondi al ĉiuj"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Plusendi"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "F&ulmoklavo:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Ŝablon&tipo:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Leterujecoj"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Leterujo entenas dissendoliston"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "List&adreso:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormala:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "N&elegita:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Malnoviĝo de mesaĝo"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Malnovigi post:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Malnovigi &legitajn mesaĝojn"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Malnovigi &post:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Malnovigi &nelegitajn mesaĝojn"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Tago(j)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Semajno(j)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Monato(j)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Pliaj opcioj"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Sendantula &identeco"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Kon&servoformo:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listo vidigas:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validigi atestilojn per ANVLoj"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Se la opcio estas elektita, S/MIME-atestiloj estas validigataj per ANVLoj."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Kontroli rete atestilojn"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Se la opcio estas elektita, S/MIME-atestiloj estas validigataj per Reta "
-"Atestila StatProtokolo (RASP). Enigu malsupre la URLon de la RASPa respondilo."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Reta atestilkontrolo"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "RASPa respondila URLo:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Enigu la serviladreso por reta kontrolo de atestiloj (RASPa respondilo). La "
-"URLo normale komencas kun http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "RASPa resondilsubskribo:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Por radikaj atestiloj:"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Ne kontroli atestilajn direktivojn"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Norme GnuPGo uzas la dosieron ~/.gnupg/policies.txt por kontroli, ĉu atestila "
-"direktivo estas permesata. Se la opcio estas elektita, direktivoj ne estas "
-"kontrolataj-"
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Neniam konsideri ANVLon"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Se la opcio estas markita, atestilaj nevalidiglistoj neniam estas uzataj por "
-"kontroli S/MIME-atestilojn."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Preni mankajn donatulajn atestilojn"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Se la opcio estas markita, mankaj donatulaj atestiloj estas prenataj, kiam "
-"necesas (Tio funkcias kun ambaŭ kontrolmanieroj, ANVLo kaj RASPo.)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Por radikaj atestiloj:"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Por radikaj atestiloj:"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Aldoni..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Grupa programaro"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Remeti tipar-agordon"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "nelima"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "ŜablonAgordo"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Respondi al sendinto"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Respondi al ĉiuj / respondi al listo"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Plusendi mesaĝon"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Avert&i pro sendoprovo de neĉifritaj mesaĝoj"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Marko pro averto pri sendo de neĉifritaj mesaĝoj."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu pri senda provo de nesubskribitaj mesaĝoj</h1>\n"
-"Se la opcio estas markita, vi estos avertata, kiam vi provas sendi "
-"nesubskribitemesaĝon tute aŭ parte.\n"
-"<p>\n"
-"Estas rekomendata, ke vi lasas la opcion pro maksimuma nelaseco.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Averti kiam sendi ne-ĉifritajn mesaĝojn"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Marku pro averto pri sendo de neĉifraj mesaĝoj."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu dum sendprovo de neĉifraj mesaĝoj</h1>\n"
-"Se la opcio estas markita, vi estos avertata, kiam vi provas sendi tute aŭ "
-"parte neĉifre la mesaĝon.\n"
-"<p>\n"
-"Estas rekomendata lasi la opcion aktiva pro sendefekta maksimumeco\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Averti, kiam la adresatula retadreso ne estas en la atestilo"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Marku pro averto, se la adreso ne estas en la atestilo"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu, se la ricevantula retadreso ne estas en la atestilo</h1>\n"
-"Se la opcio estas markita, averto estas eldonata, se la ricevantula retadreso "
-"ne estas en la atestilo uzataj por ĉifri.\n"
-"<p>\n"
-"Estas rekomendita lasi la opcion aktivan pro maksimuma sekureco.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Avertu, kiam la atestiloj aŭ ŝlosiloj baldaŭ nevalidĝis (fiksu malsupre la "
-"limon)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Por subskribi"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Por ĉifri"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " tago(j)"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Elektu ĉi tie la tagnombron"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu, se la subskriba atestilo nevalidiĝas</h1>\n"
-"Elektu la minimuman tagnombron, antaŭ tdeio poŝtilo ne eldonas averton pri la "
-"nevalidiĝeco.\n"
-"<p>\n"
-"La rekomendata Sfinksa agordo estas 14 tagoj.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu, se ĉifra atestilo nevalidiĝas</h1>\n"
-"Elektu la minimuman tagnombron, kiujn ĉifraj atestiloj estu validaj sen eldono "
-"de averto.\n"
-"<p>\n"
-"La rekomendata Sfinksa valoro estas 14 tagoj.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu pri nevalidiĝo de iu ĉena atestilo</h1>\n"
-"Elektu la minimuman tagnombron de ĉiuj ĉenaj atestiloj estas validaj sen iu "
-"averto.\n"
-"<p>\n"
-"La rekomendata Sfinksa valoro estas 14 tagoj.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu, se la atestileja atestilo nevalidiĝas</h1>\n"
-"Elektu la minimuman tagnombron, antaŭ tdeio poŝtilo ne eldonas averton pri la "
-"nevalidiĝeco de la atestileja atestilo.\n"
-"<p>\n"
-"La rekomendata Sfinksa agordo estas 14 tagoj.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertu, se la radika atestilo nevalidiĝas</h1>\n"
-"Elektu la minimuman tagnombron, antaŭ tdeio poŝtilo ne eldonas averton pri la "
-"nevalidiĝeco de la radika atestilo.\n"
-"<p>\n"
-"La rekomendata Sfinksa agordo estas 14 tagoj.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Por radikaj atestiloj:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Por interaj atestilaj atestiloj:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Por uzantulaj atestiloj aŭ ŝlosiloj:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, fuzzy, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Reebligi ĉiujn \"Ne demandu refoje\" avertojn"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Ŝablonenhavo"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Ŝablon-fulmoklavo"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Ŝablontipo"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Sendi atendantajn leterojn al la leterkontrolo"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p>Elektu, ĉu vi volas, ke KMail mane sendas ĉiujn mesaĝojn en la sendotujo aŭ "
-"ĉiujn leterkontrolojn, aŭ ĉu vi ne volas, ke la mesaĝoj aŭtomate estas "
-"sendataj. </p> </qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "La laste elektita dosierujo en la dosieruja elektdialogo."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Direktivo por vidigi la sistemlistelan piktogramon"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Babilemigi la novpoŝtan noton"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Se la opcio estas ebligita, tiam por ĉiu leterujo la nombro de novajn mesaĝojn "
-"estas montrata per la novpoŝta noto. Alikaze vi nur ricevos simplan \"Nova "
-"poŝto\" mesaĝon."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Donu redaktilon:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Uzi alian redaktilon"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Ebligi grupprogramajn funkciojn"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Sanĝi De/Al-kaplinioj je respondoj de invitoj"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"MS-Outlook havas kelkajn nesufiĉaĵojn en sie realigaĵo de la iKalendra normo. "
-"la opcio provizore laboras pri unu de ili. Se vi havas problemojn kun uzantoj "
-"de MS-Outlook, provu uzi la opcion."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Sendi grupprogramarajn invitojn en la leterteksto"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"MS-Outlook havas kelkajn nesufiĉaĵojn en sie realigaĵo de la iKalendra normo. "
-"la opcio provizore laboras pri unu de ili. Se vi havas problemojn kun uzantoj "
-"de MS-Outlook, provu uzi la opcion."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Aŭtomata invitosendo"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, fuzzy, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Se ĉi tiu estas markita, vi ne vidos la retleteran \"\n"
-"          \"redaktilfenestron. Anstataŭe ĉiuj invitoj estas sendataj \"\n"
-"          \"mesaĝon aŭtomate. Se vi volas vidi la leteron antaŭsendate, \"\n"
-"          \"vi povas malmarki la opcion. Atentu, ke la redaktilfenestro enhavas "
-"\"\n"
-"          \"iKaldendran sintakson kaj vi ne ŝanĝu ĝin mane."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Ebligo de tio ebligas konservi la enaĵojn de la Kontaktaj aplikaĵoj.</p> "
-"<p>Se vi volas marki la opcion, vi ankaŭ devas agordi la aplikaĵon por uzi la "
-"IMAPajn risurcojn. Tio estas farata per la TDEa Stircentro.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normale vi havas nenian kaŭzon vidi la ujojn, kiuj havas la IMAPajn "
-"risurcojn. Sed se vi necesas ĝin, vi povas agordi ĝin ĉi tie.</p> "
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Elektu la konservformo de la grupprogramaraj ujoj. "
-"<ul> "
-"<li>La norma formo estas uzi la iKalan kaj vkartan normojn. Tiu formo ebligas "
-"ĉiujn eblecojn.</li> "
-"<li>La Kolaba XML-formo uzas datummodelon, kiu konvenas pli bone al tiu uzata "
-"en MS-Outlook. La formo pli bone kongruas la MS-Outlook, kiam vi uzas Kolaban "
-"servilon aŭ kongruan.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Tio elektas la superujon de la IMAPaj risurcujoj.</p> "
-"<p>Norme la Kolaba servilo agordas la IMAPan ricevataĵujon por tio.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Tio estas la identigilo de la konto, kiu havas la IMAPajn risurcujojn.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Se vi volas sanĝi la leterujajn nomojn de la IMAPa konservejo je via loka "
-"lingvo, vi povas elekti inter la uzeblaj lingvoj.</p> "
-"<p>Notu, ke la nura kaŭzo por tio estas la kongrueco al MS-Outlook. Estas "
-"malbona ideo, ĉar tio melebligas lingvan ŝanĝon.</p> "
-"<p>Sekve nur ŝanĝu la nomojn, se vi devas.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"La valoro estas uzata por decidi, ĉu la Poŝtila enkonduko estos vidigita."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Miaksimua nombro de konektoj po servilo"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Oni povas uzi tion por limigi la konektan nombron po servilo dum rigardo je "
-"nova retpoŝto. Norme la limo ne ekzistas (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Montri rapidserĉan liniredaktilon"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, fuzzy, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"La opcio ebligas aŭ neebligas la serĉan liniredaktilon super la mesaĝlisto, "
-"tdeio estas uzeblas por rapide serĉi la informojn montrataj en la lesaĝlisto."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Aŭtomate aldoni subskribon"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, fuzzy, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr "Teni la identecon, por ke ĝi estos uzata en redaktilaj fenestroj."
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Tenu la mesaĝujon por sendi mesaĝojn, por ke ĝi estos uzata en redaktilaj "
-"fenestroj."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Tenu la poŝtottransporton, por ke ĝi estos uzata en redaktilaj fenestroj."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr "Teni la identecon, por ke ĝi estos uzata en redaktilaj fenestroj."
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Linirompo ĉe kolumno:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Averti, se la radika atestilo nevalidiĝos post  pli malmulte ol"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Marku tiun opcion por certigi, ke MS-Outlook povas kompreni kunsendaĵnomoj kun "
-"neanglaj literoj"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Aŭto&mate postuli ricevkonfirmojn"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Ebligu tiun opcion, se vi volas, ke KMail postulas ricevkonfirmojn pri ĉiu "
-"sendata mesaĝo.</p> "
-"<p> Tiu opcio nur ŝanĝas nur la norman agmanieron. Ankaŭ nun vi povas ebligi aŭ "
-"neebligi la postulemon por ĉiu sola mesaĝo en la redaktilo, menuero <em>"
-"Opcioj</em>-&gt;<em>Postulu ricevkonfirmojn</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Uzi lastatempajn adresojn por aŭtokompletigo"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Aŭtomate konservi ĉiun:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Kopio de la teksto, kiu estas en la skribifenestro, regule estas kredebla. La "
-"uzata intervalo estas agordebla ĉi tie. Vi povas neebligi ĝin per nulo."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Anstataŭigi &rekonitan prefikson per \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "&Anstataŭigi rekonitan prefikson per \"Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Uzi inteligentan citadon"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "La subskribo malvalidiĝis."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, fuzzy, no-c-format
-msgid "Type of addressee selector"
-msgstr "Filtroago"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, fuzzy, no-c-format
-msgid "Type of recipients editor"
-msgstr "Filtroago"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Filtroago"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Konservi senditajn mesaĝojn ĉ&ifrite"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Montras ĉiujn kapliniojn"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Ricevkonfirmoj"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Mesaĝolisto - Dato"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Mesaĝoŝablono por plusendado"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Citsignoj"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 de %2 %3 uzata"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13550,6 +11647,11 @@ msgstr "Aldonu kiel CC"
 msgid "Add as BCC"
 msgstr "Aldoni kiel BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Re&zigni"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13565,10 +11667,10 @@ msgstr "Elektitaj ricevantoj"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13585,8 +11687,8 @@ msgstr "Uzi la adreselektan dialogon"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "La butono malfermas apartan dialogon, kie vi povas elekti adresatojn el ĉiuj "
 "uzeblaj adresoj."
@@ -13691,10 +11793,19 @@ msgstr "estas pli granda aŭ egalgranda al"
 msgid " bytes"
 msgstr " bitokoj"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " tago(j)"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13841,13 +11952,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13866,8 +11975,7 @@ msgid ""
 msgstr "Kontotipo: IMAP-konto"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13885,8 +11993,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13896,8 +12003,7 @@ msgstr "Ne havebla"
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Uzeblaj filtriloj"
 
 #: sievedebugdialog.cpp:358
@@ -13937,8 +12043,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Marku la opcion, se vi volas, ke KMail aldonas subskribon la leteroj skribitaj "
-"de tiu identeco."
+"Marku la opcion, se vi volas, ke KMail aldonas subskribon la leteroj "
+"skribitaj de tiu identeco."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -13972,11 +12078,11 @@ msgstr "Uzi la enigejon por enigi arbitran neŝanĝeman subskribon."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Uzu la postulilon por elekti tekstan dosieron, kiu enhavas vian subskribon. Ĝi "
-"estos legata ĉiam, kiam vi kreas novan leteron aŭ subskribi."
+"Uzu la postulilon por elekti tekstan dosieron, kiu enhavas vian subskribon. "
+"Ĝi estos legata ĉiam, kiam vi kreas novan leteron aŭ subskribi."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -13992,21 +12098,26 @@ msgstr "Malfermas la elektitan dosieron en tekstredaktilo."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Vi povas aldoni ĉi tie arbitran komandon aŭ kun aŭ sen vojo, tdeio dependas de "
-"tio, ke vi la komando estas en via vojo. Por ĉiu nova letero, KMail lanĉos la "
-"komandon kaj uzos ĝian eldonaĵon kiel subskribo. Kutimaj komandoj uzatajn estas "
-"\"fortune\" aŭ \"ksig-random\"."
+"Vi povas aldoni ĉi tie arbitran komandon aŭ kun aŭ sen vojo, tdeio dependas "
+"de tio, ke vi la komando estas en via vojo. Por ĉiu nova letero, KMail "
+"lanĉos la komandon kaj uzos ĝian eldonaĵon kiel subskribo. Kutimaj komandoj "
+"uzatajn estas \"fortune\" aŭ \"ksig-random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Donu &komandon:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nova ero:"
@@ -14043,6 +12154,11 @@ msgstr "Aldoni konton"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Ĉu vi vere volas forigi la identecon nomitan <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Apliki &al:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14057,6 +12173,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Redakti skripton..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14096,9 +12216,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14132,6 +12252,16 @@ msgstr "Ne ŝalti"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Ne eblis enmeti la enhavon de dosiero %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Al: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopio: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14161,36 +12291,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14402,6 +12528,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Meti kursilpozicion"
@@ -14434,110 +12564,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...ke vi povas iri al la postan aŭ antaŭan mesaĝon per uzo de la \n"
-"dekstra kaj maldekstra klavoj?</p>\n"
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...ke vi povas rapide krei filtrilojn pri sendinto, adresato,\n"
-"temo kaj dissendlisto per <em>Iloj-&gt;Kreu&nbsp;filtrilojn</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ke vi povas estiĝi libera de la &quot;[dissendlistnomo]&quot;,\n"
-"aldonita al la temo de kelkaj dissendlistoj, per la reskribmaniero? Nur uzu\n"
-"<pre>Reskribu kaplinion &quot;Temo&quot;\n"
-"   anstataŭigu &quot;\\s*\\[dissendlistnomo\\]\\s*&quot;\n"
-"   kun &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...ke vi povas ligi dissendlistojn al leterujoj en la\n"
-"<em>Leterujo-&gt;Ecoj</em>dialogo? Tiam vi povas uzi\n"
-"<em>Mesaĝo-&gt;Nova&nbsp;mesaĝo&nbsp;al&nbsp;dissendlisto...</em>\n"
-"por malfermi la redaktilon kun la dissendlistajn adresojn.\n"
-"Alikaze vi povas kliki per le meza musbutono la leterujon.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...ke vi povas ligi proprajn piktogramojn al ĉiu leterujo?\n"
-"Vidu al <em>Leterujo-&gt;Ecoj</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...ke KMail povas montri kolortrabon, kiu vidigas la nuna mesaĝtipon\n"
-"(Simpla teksto/HTML/OpenPGP)?</p>\n"
-"<p>Tio malhelpas provojn imiti sukcesan subskribokontrolon per HTMLaj "
-"retleteroj. Per tio ne eblas imiti la subskribostatan montrilon.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...ke vi povas filtri pri ĉiu kaplinio per simpla nomenigo\n"
-"en la unua enigejo de serĉregulo?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ke vi povas elfiltri nur-HTMLajn mesaĝojn kun la regulo\n"
-"<pre>&quot;Content-type&quot; enhavas &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...ke dum respondigo nur la elektita parto de la mesaĝo estas citata?</p>\n"
-"<p>Se nenio estas elektita, la tuta mesaĝo estas citita.</p>\n"
-"<p>Tio ankaŭ laboras al tekstoj den kunsedaĵoj, kiam\n"
-"<em>Rigardo-&gt;Aldonaĵoj-&gt;Entekste</em> estas elektita.</p>\n"
-"<p>La eco estas uzebla kun ĉiuj respondaj komandoj krom\n"
-"<em>Mesaĝo-&gt;Respondu sen citado</em>.</p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Estas nenio malfarebla."
@@ -14607,6 +12633,15 @@ msgstr "Kunsendaĵo n-ro %1 (nenoma)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Dosiero nomita \"%1\" jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Ĉu anstataŭigi dosieron?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14723,9 +12758,9 @@ msgstr "&Sendi bildon kun ĉiu mesaĝo"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14754,9 +12789,9 @@ msgstr "Elekti dosieron..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14765,15 +12800,15 @@ msgstr "Meti el adresaro"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14782,8 +12817,8 @@ msgstr "Uzu tiun enigejon por enigi arbitran \"X-Face\"-tekston."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14799,130 +12834,1690 @@ msgstr "Neniu bildo"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signado"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Aŭtomate subskribi mesaĝojn"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Kiam la opcio estas markita, ĉiuj mesaĝoj, kiujn vi sendas, norme estos "
+"subskribataj. Sed eblas ankaŭ neebligi subskribon por ĉiu aparta mesaĝo."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Ĉifrado"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Difini temon de la mesaĝo"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Kiam la opcio estas markita, la mesaĝo aŭ dosiero ne nur estos ĉifrata per "
+"la publikŝlosilon de la adresaton, sed ankaŭ per via ŝlosilo. Tio ebligas "
+"vin poste deĉifri la mesaĝon aŭ dosieron. Ĝenerale tio estas bona ideo."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Sendi Kopion al 'adreso'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Montri subskibitan aŭ ĉifritan tekston post redakto"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Sendi kaŝitan kopion al 'adreso'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Kiam la opcio estas markita, la subskribita aŭ ĉifrita teksto estos montrata "
+"en aparta fenestro, por ke vi povas vidi la eksteraĵon antaŭ la sendo. Tio "
+"estas bona ideo, kiam vi kontrolas la funkcion de la ĉifrosistemo."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Sendi 'kaplinion' al mesaĝo"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Konservi senditajn mesaĝojn ĉ&ifrite"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Legi mesaĝtekston de 'dosiero'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Marki por konservi la mesaĝojn ĉifrite "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Difini tekston de la mesaĝo"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Konservu mesaĝojn ĉifrite</h1> \n"
+"Kiam tio estas markita, senditaj mesaĝoj estas konservataj ĉifrite kiel "
+"senditaj. Tio ne estas rekomendata, ĉar vi ne eblos legi plue la mesaĝojn, "
+"se la necesa atestilo malvalidiĝas.\n"
+"<p>\n"
+"Sed ekzistus reguloj, kiuj postulas uzi la opcion. Se vi dubas, demandu vian "
+"administriston.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Aldoni kunsendaĵon al la mesaĝo. Tio eblas multfoje"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Ĉiam vidigi la ĉi&froŝlosilojn pro aprobo"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Nur rigardi je nova poŝto"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Kiam la opcio estas markita, la aplikaĵo ĉiam montros al vi publikŝlosilan "
+"liston, de kiu vi povas elekti la uzotan. Alikaze la aplikaĵo nur montros la "
+"dialogon, se ĝi ne trovas la ĝustan aŭ estas kelkaj, kiuj estas uzeblaj."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Nur malfermi la mesaĝredaktilon"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Aŭtomate &ĉifri mesaĝojn kiam eble"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Movi la mesaĝan dosieron"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Kiam la opcio estas markita, ĉiu mesaĝo, kiun vi sendos, estos ĉifrata, se "
+"tio estas ebla kaj dezirata. Tamen eblas neebligi la aŭtomatan ĉifron por "
+"ĉiu mesaĝo."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Neniam subskribi aŭ ĉifri malnetaĵon"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
-"Sendu mesaĝon al 'adreso' respektive kunsendu la dosieron, al kiu la 'URLo' "
-"montras"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Legi"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universale"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Malnova"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Respondi"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Forigita"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Respondi al ĉiuj"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Respondita"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Plusendi"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Plusendita"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "F&ulmoklavo:"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Atendvicigita"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Ŝablon&tipo:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sendita"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Ŝablonenhavo"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Observata"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Ŝablon-fulmoklavo"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorita"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Ŝablontipo"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Fimesaĝa"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Leterujecoj"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Fimesaĝa"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Leterujo entenas dissendoliston"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Faronta"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "List&adreso:"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Kun kunsendaĵo"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormala:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 de %2 %3 uzata"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "N&elegita:"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Malnoviĝo de mesaĝo"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Malnovigi post:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Malnovigi &legitajn mesaĝojn"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Malnovigi &post:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Malnovigi &nelegitajn mesaĝojn"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Tago(j)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Semajno(j)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Monato(j)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Pliaj opcioj"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Sendantula &identeco"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Kon&servoformo:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listo vidigas:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Sendi atendantajn leterojn al la leterkontrolo"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt> <p>Elektu, ĉu vi volas, ke KMail mane sendas ĉiujn mesaĝojn en la "
+"sendotujo aŭ ĉiujn leterkontrolojn, aŭ ĉu vi ne volas, ke la mesaĝoj "
+"aŭtomate estas sendataj. </p> </qt>"
 
-#: util.h:208
+#: kmail.kcfg:72
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Dosiero nomita \"%1\" jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Ĉu anstataŭigi dosieron?"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "La laste elektita dosierujo en la dosieruja elektdialogo."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Direktivo por vidigi la sistemlistelan piktogramon"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Babilemigi la novpoŝtan noton"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Se la opcio estas ebligita, tiam por ĉiu leterujo la nombro de novajn "
+"mesaĝojn estas montrata per la novpoŝta noto. Alikaze vi nur ricevos simplan "
+"\"Nova poŝto\" mesaĝon."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Donu redaktilon:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Uzi alian redaktilon"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Ebligi grupprogramajn funkciojn"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Sanĝi De/Al-kaplinioj je respondoj de invitoj"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"MS-Outlook havas kelkajn nesufiĉaĵojn en sie realigaĵo de la iKalendra "
+"normo. la opcio provizore laboras pri unu de ili. Se vi havas problemojn kun "
+"uzantoj de MS-Outlook, provu uzi la opcion."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Sendi grupprogramarajn invitojn en la leterteksto"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"MS-Outlook havas kelkajn nesufiĉaĵojn en sie realigaĵo de la iKalendra "
+"normo. la opcio provizore laboras pri unu de ili. Se vi havas problemojn kun "
+"uzantoj de MS-Outlook, provu uzi la opcion."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Aŭtomata invitosendo"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, fuzzy, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Se ĉi tiu estas markita, vi ne vidos la retleteran \"\n"
+"          \"redaktilfenestron. Anstataŭe ĉiuj invitoj estas sendataj \"\n"
+"          \"mesaĝon aŭtomate. Se vi volas vidi la leteron antaŭsendate, \"\n"
+"          \"vi povas malmarki la opcion. Atentu, ke la redaktilfenestro "
+"enhavas \"\n"
+"          \"iKaldendran sintakson kaj vi ne ŝanĝu ĝin mane."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Ebligo de tio ebligas konservi la enaĵojn de la Kontaktaj aplikaĵoj.</p> "
+"<p>Se vi volas marki la opcion, vi ankaŭ devas agordi la aplikaĵon por uzi "
+"la IMAPajn risurcojn. Tio estas farata per la TDEa Stircentro.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normale vi havas nenian kaŭzon vidi la ujojn, kiuj havas la IMAPajn "
+"risurcojn. Sed se vi necesas ĝin, vi povas agordi ĝin ĉi tie.</p> "
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Elektu la konservformo de la grupprogramaraj ujoj. <ul> <li>La norma "
+"formo estas uzi la iKalan kaj vkartan normojn. Tiu formo ebligas ĉiujn "
+"eblecojn.</li> <li>La Kolaba XML-formo uzas datummodelon, kiu konvenas pli "
+"bone al tiu uzata en MS-Outlook. La formo pli bone kongruas la MS-Outlook, "
+"kiam vi uzas Kolaban servilon aŭ kongruan.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Tio elektas la superujon de la IMAPaj risurcujoj.</p> <p>Norme la Kolaba "
+"servilo agordas la IMAPan ricevataĵujon por tio.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Tio estas la identigilo de la konto, kiu havas la IMAPajn risurcujojn.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Se vi volas sanĝi la leterujajn nomojn de la IMAPa konservejo je via loka "
+"lingvo, vi povas elekti inter la uzeblaj lingvoj.</p> <p>Notu, ke la nura "
+"kaŭzo por tio estas la kongrueco al MS-Outlook. Estas malbona ideo, ĉar tio "
+"melebligas lingvan ŝanĝon.</p> <p>Sekve nur ŝanĝu la nomojn, se vi devas.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"La valoro estas uzata por decidi, ĉu la Poŝtila enkonduko estos vidigita."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Miaksimua nombro de konektoj po servilo"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Oni povas uzi tion por limigi la konektan nombron po servilo dum rigardo je "
+"nova retpoŝto. Norme la limo ne ekzistas (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Montri rapidserĉan liniredaktilon"
+
+#: kmail.kcfg:309
+#, fuzzy, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"La opcio ebligas aŭ neebligas la serĉan liniredaktilon super la mesaĝlisto, "
+"tdeio estas uzeblas por rapide serĉi la informojn montrataj en la lesaĝlisto."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Aŭtomate aldoni subskribon"
+
+#: kmail.kcfg:336
+#, fuzzy, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "Teni la identecon, por ke ĝi estos uzata en redaktilaj fenestroj."
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Tenu la mesaĝujon por sendi mesaĝojn, por ke ĝi estos uzata en redaktilaj "
+"fenestroj."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Tenu la poŝtottransporton, por ke ĝi estos uzata en redaktilaj fenestroj."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "Teni la identecon, por ke ĝi estos uzata en redaktilaj fenestroj."
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Linirompo ĉe kolumno:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Averti, se la radika atestilo nevalidiĝos post  pli malmulte ol"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Marku tiun opcion por certigi, ke MS-Outlook povas kompreni kunsendaĵnomoj "
+"kun neanglaj literoj"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Aŭto&mate postuli ricevkonfirmojn"
+
+#: kmail.kcfg:417
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt> <p>Ebligu tiun opcion, se vi volas, ke KMail postulas ricevkonfirmojn "
+"pri ĉiu sendata mesaĝo.</p> <p> Tiu opcio nur ŝanĝas nur la norman "
+"agmanieron. Ankaŭ nun vi povas ebligi aŭ neebligi la postulemon por ĉiu sola "
+"mesaĝo en la redaktilo, menuero <em>Opcioj</em>-&gt;<em>Postulu "
+"ricevkonfirmojn</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Uzi lastatempajn adresojn por aŭtokompletigo"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Aŭtomate konservi ĉiun:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Kopio de la teksto, kiu estas en la skribifenestro, regule estas kredebla. "
+"La uzata intervalo estas agordebla ĉi tie. Vi povas neebligi ĝin per nulo."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Anstataŭigi &rekonitan prefikson per \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "&Anstataŭigi rekonitan prefikson per \"Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Uzi inteligentan citadon"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "La subskribo malvalidiĝis."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, fuzzy, no-c-format
+msgid "Type of addressee selector"
+msgstr "Filtroago"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, fuzzy, no-c-format
+msgid "Type of recipients editor"
+msgstr "Filtroago"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Filtroago"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Konservi senditajn mesaĝojn ĉ&ifrite"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Montras ĉiujn kapliniojn"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Ricevkonfirmoj"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Mesaĝolisto - Dato"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Mesaĝoŝablono por plusendado"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Citsignoj"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Redakti dosieron"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Redakti..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Iri"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Leterujo"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mesaĝo"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Plusendi"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Remeti tipar-agordon"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTMLa illistelo"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Ĝeneralaj opcioj"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTMLa illistelo"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validigi atestilojn per ANVLoj"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Se la opcio estas elektita, S/MIME-atestiloj estas validigataj per ANVLoj."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Kontroli rete atestilojn"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Se la opcio estas elektita, S/MIME-atestiloj estas validigataj per Reta "
+"Atestila StatProtokolo (RASP). Enigu malsupre la URLon de la RASPa "
+"respondilo."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Reta atestilkontrolo"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "RASPa respondila URLo:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Enigu la serviladreso por reta kontrolo de atestiloj (RASPa respondilo). La "
+"URLo normale komencas kun http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "RASPa resondilsubskribo:"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Por radikaj atestiloj:"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Ne kontroli atestilajn direktivojn"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Norme GnuPGo uzas la dosieron ~/.gnupg/policies.txt por kontroli, ĉu "
+"atestila direktivo estas permesata. Se la opcio estas elektita, direktivoj "
+"ne estas kontrolataj-"
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Neniam konsideri ANVLon"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Se la opcio estas markita, atestilaj nevalidiglistoj neniam estas uzataj por "
+"kontroli S/MIME-atestilojn."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Preni mankajn donatulajn atestilojn"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Se la opcio estas markita, mankaj donatulaj atestiloj estas prenataj, kiam "
+"necesas (Tio funkcias kun ambaŭ kontrolmanieroj, ANVLo kaj RASPo.)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Por radikaj atestiloj:"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Por radikaj atestiloj:"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Aldoni..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Grupa programaro"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Remeti tipar-agordon"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "nelima"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "ŜablonAgordo"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Respondi al sendinto"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Respondi al ĉiuj / respondi al listo"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Plusendi mesaĝon"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Avert&i pro sendoprovo de neĉifritaj mesaĝoj"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Marko pro averto pri sendo de neĉifritaj mesaĝoj."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu pri senda provo de nesubskribitaj mesaĝoj</h1>\n"
+"Se la opcio estas markita, vi estos avertata, kiam vi provas sendi "
+"nesubskribitemesaĝon tute aŭ parte.\n"
+"<p>\n"
+"Estas rekomendata, ke vi lasas la opcion pro maksimuma nelaseco.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Averti kiam sendi ne-ĉifritajn mesaĝojn"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Marku pro averto pri sendo de neĉifraj mesaĝoj."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu dum sendprovo de neĉifraj mesaĝoj</h1>\n"
+"Se la opcio estas markita, vi estos avertata, kiam vi provas sendi tute aŭ "
+"parte neĉifre la mesaĝon.\n"
+"<p>\n"
+"Estas rekomendata lasi la opcion aktiva pro sendefekta maksimumeco\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Averti, kiam la adresatula retadreso ne estas en la atestilo"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Marku pro averto, se la adreso ne estas en la atestilo"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu, se la ricevantula retadreso ne estas en la atestilo</h1>\n"
+"Se la opcio estas markita, averto estas eldonata, se la ricevantula "
+"retadreso ne estas en la atestilo uzataj por ĉifri.\n"
+"<p>\n"
+"Estas rekomendita lasi la opcion aktivan pro maksimuma sekureco.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Avertu, kiam la atestiloj aŭ ŝlosiloj baldaŭ nevalidĝis (fiksu malsupre la "
+"limon)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Por subskribi"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Por ĉifri"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Elektu ĉi tie la tagnombron"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu, se la subskriba atestilo nevalidiĝas</h1>\n"
+"Elektu la minimuman tagnombron, antaŭ tdeio poŝtilo ne eldonas averton pri "
+"la nevalidiĝeco.\n"
+"<p>\n"
+"La rekomendata Sfinksa agordo estas 14 tagoj.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu, se ĉifra atestilo nevalidiĝas</h1>\n"
+"Elektu la minimuman tagnombron, kiujn ĉifraj atestiloj estu validaj sen "
+"eldono de averto.\n"
+"<p>\n"
+"La rekomendata Sfinksa valoro estas 14 tagoj.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu pri nevalidiĝo de iu ĉena atestilo</h1>\n"
+"Elektu la minimuman tagnombron de ĉiuj ĉenaj atestiloj estas validaj sen iu "
+"averto.\n"
+"<p>\n"
+"La rekomendata Sfinksa valoro estas 14 tagoj.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu, se la atestileja atestilo nevalidiĝas</h1>\n"
+"Elektu la minimuman tagnombron, antaŭ tdeio poŝtilo ne eldonas averton pri "
+"la nevalidiĝeco de la atestileja atestilo.\n"
+"<p>\n"
+"La rekomendata Sfinksa agordo estas 14 tagoj.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertu, se la radika atestilo nevalidiĝas</h1>\n"
+"Elektu la minimuman tagnombron, antaŭ tdeio poŝtilo ne eldonas averton pri "
+"la nevalidiĝeco de la radika atestilo.\n"
+"<p>\n"
+"La rekomendata Sfinksa agordo estas 14 tagoj.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Por radikaj atestiloj:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Por interaj atestilaj atestiloj:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Por uzantulaj atestiloj aŭ ŝlosiloj:"
+
+#: warningconfiguration.ui:388
+#, fuzzy, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Reebligi ĉiujn \"Ne demandu refoje\" avertojn"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...ke vi povas iri al la postan aŭ antaŭan mesaĝon per uzo de la \n"
+"dekstra kaj maldekstra klavoj?</p>\n"
+
+#: tips:10
+#, fuzzy
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...ke vi povas rapide krei filtrilojn pri sendinto, adresato,\n"
+"temo kaj dissendlisto per <em>Iloj-&gt;Kreu&nbsp;filtrilojn</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ke vi povas estiĝi libera de la &quot;[dissendlistnomo]&quot;,\n"
+"aldonita al la temo de kelkaj dissendlistoj, per la reskribmaniero? Nur uzu\n"
+"<pre>Reskribu kaplinion &quot;Temo&quot;\n"
+"   anstataŭigu &quot;\\s*\\[dissendlistnomo\\]\\s*&quot;\n"
+"   kun &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+#, fuzzy
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...ke vi povas ligi dissendlistojn al leterujoj en la\n"
+"<em>Leterujo-&gt;Ecoj</em>dialogo? Tiam vi povas uzi\n"
+"<em>Mesaĝo-&gt;Nova&nbsp;mesaĝo&nbsp;al&nbsp;dissendlisto...</em>\n"
+"por malfermi la redaktilon kun la dissendlistajn adresojn.\n"
+"Alikaze vi povas kliki per le meza musbutono la leterujon.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...ke vi povas ligi proprajn piktogramojn al ĉiu leterujo?\n"
+"Vidu al <em>Leterujo-&gt;Ecoj</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...ke KMail povas montri kolortrabon, kiu vidigas la nuna mesaĝtipon\n"
+"(Simpla teksto/HTML/OpenPGP)?</p>\n"
+"<p>Tio malhelpas provojn imiti sukcesan subskribokontrolon per HTMLaj "
+"retleteroj. Per tio ne eblas imiti la subskribostatan montrilon.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...ke vi povas filtri pri ĉiu kaplinio per simpla nomenigo\n"
+"en la unua enigejo de serĉregulo?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ke vi povas elfiltri nur-HTMLajn mesaĝojn kun la regulo\n"
+"<pre>&quot;Content-type&quot; enhavas &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...ke dum respondigo nur la elektita parto de la mesaĝo estas citata?</"
+"p>\n"
+"<p>Se nenio estas elektita, la tuta mesaĝo estas citita.</p>\n"
+"<p>Tio ankaŭ laboras al tekstoj den kunsedaĵoj, kiam\n"
+"<em>Rigardo-&gt;Aldonaĵoj-&gt;Entekste</em> estas elektita.</p>\n"
+"<p>La eco estas uzebla kun ĉiuj respondaj komandoj krom\n"
+"<em>Mesaĝo-&gt;Respondu sen citado</em>.</p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15010,14 +14605,17 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Norme ĉifru ĉiujn mesaĝiajn partojn.</h1>\n"
-#~ "Se la opcio estas markita, ĉiujn partojn de mesaĝo (tio estas la ĉefa parto kaj ciuj kunsendaĵoj) estas ĉifrataj norme.\n"
+#~ "Se la opcio estas markita, ĉiujn partojn de mesaĝo (tio estas la ĉefa "
+#~ "parto kaj ciuj kunsendaĵoj) estas ĉifrataj norme.\n"
 #~ "<p>\n"
 #~ "Vi povas, se necesas, elekti nuran agmanieron por mesaĝo.\n"
 #~ "</qt>"
@@ -15031,12 +14629,16 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Demandu antaŭ ĉifro de ĉiuj partoj.</h1>\n"
-#~ "Kiam la opcio estas elektita, vi estos demandata je ciu parto de la mesaĝo (tio estas la ĉefa parto kaj ĉiuj kunsendaĵoj) sole, ĉu vi volas ĉifri la parton.\n"
+#~ "Kiam la opcio estas elektita, vi estos demandata je ciu parto de la "
+#~ "mesaĝo (tio estas la ĉefa parto kaj ĉiuj kunsendaĵoj) sole, ĉu vi volas "
+#~ "ĉifri la parton.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15050,7 +14652,8 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15069,18 +14672,30 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ĉifra algoritmo</h1>\n"
-#~ "Algoritmo estas priskribo por la komputilo, kiamaniere ĝi faros taskon. La ĉifra algoritmo priskribas, kiel la komputilo laboras la adresatulan ŝlosilon al via mesaĝo, por ne nur la adresato povas legi la mesaĝon.\n"
+#~ "Algoritmo estas priskribo por la komputilo, kiamaniere ĝi faros taskon. "
+#~ "La ĉifra algoritmo priskribas, kiel la komputilo laboras la adresatulan "
+#~ "ŝlosilon al via mesaĝo, por ne nur la adresato povas legi la mesaĝon.\n"
 #~ "<p>\n"
-#~ "La difino de ĉifra algoritmo fiksas la facilecon aŭ malfacilecon, kun kiu la mesaĝo estas kaptebla kaj legebla. Ĉiuj algortimoj, kiuj estas en la Sfinksaro, normale estas tre sekuraj. Ĝenerale la norma laboros tre bone.\n"
+#~ "La difino de ĉifra algoritmo fiksas la facilecon aŭ malfacilecon, kun kiu "
+#~ "la mesaĝo estas kaptebla kaj legebla. Ĉiuj algortimoj, kiuj estas en la "
+#~ "Sfinksaro, normale estas tre sekuraj. Ĝenerale la norma laboros tre "
+#~ "bone.\n"
 #~ "<p>\n"
 #~ "Vi povas, se necesas, elekti alian algoritmon por mesaĝo.\n"
 #~ "</qt>"
@@ -15094,16 +14709,21 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Atestila kontrolo povas fini kun loke konservita atestilo</h1>\n"
-#~ "Se la opcio estas markita, la kontrolo de la atestila ĉeno povas fini lun loke konservita atestilo.\n"
+#~ "Se la opcio estas markita, la kontrolo de la atestila ĉeno povas fini lun "
+#~ "loke konservita atestilo.\n"
 #~ "<p>\n"
-#~ "Loke konservitaj atestiloj estas viaj propraj atestiloj, atestiloj de komunikantoj kaj de atestilejoj.\n"
+#~ "Loke konservitaj atestiloj estas viaj propraj atestiloj, atestiloj de "
+#~ "komunikantoj kaj de atestilejoj.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15115,12 +14735,15 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ĉiam kontrolu la atestilan vojon je la radikatestilo</h1>\n"
-#~ "Se la opcio estas markita, la atestila vojo, kiu apartenas al la atestilo de la adresato, ĉiam estos kontrolata tutvoje al la radikatestilo.\n"
+#~ "Se la opcio estas markita, la atestila vojo, kiu apartenas al la atestilo "
+#~ "de la adresato, ĉiam estos kontrolata tutvoje al la radikatestilo.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15132,14 +14755,17 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kontrolu la atestilan vojon</h1>\n"
-#~ "Se la opcio estas markita, la tuta vojo de la adresatula atestilo al la radika atestilo estos kontrolata.\n"
+#~ "Se la opcio estas markita, la tuta vojo de la adresatula atestilo al la "
+#~ "radika atestilo estos kontrolata.\n"
 #~ "<p>\n"
 #~ "Notu, ke ne eblas, ke la adresatula atestilo mem ne estos kontrolata.\n"
 #~ "</qt>"
@@ -15153,33 +14779,45 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Uzu atestilajn nevalidiglistojn (ANVL)</h1>\n"
-#~ "Atestila listo enhavas atestilojn, kiuj estas nevalidigitaj kaj ne plu estu uzataj por ĉifraj aferoj. Uzantoj povas deziri la nevalidigecon, ĉar li kredas, ke la atestila nefalseco estas ofendata.\n"
+#~ "Atestila listo enhavas atestilojn, kiuj estas nevalidigitaj kaj ne plu "
+#~ "estu uzataj por ĉifraj aferoj. Uzantoj povas deziri la nevalidigecon, ĉar "
+#~ "li kredas, ke la atestila nefalseco estas ofendata.\n"
 #~ "<p>\n"
-#~ "Vi uzu ANVLojn pro plej bona sekureco. En la agorda dialogo pri atestilaj kaj ANVLa administro vi povas elekti, de kie vi prenas la ANVLojn.\n"
+#~ "Vi uzu ANVLojn pro plej bona sekureco. En la agorda dialogo pri atestilaj "
+#~ "kaj ANVLa administro vi povas elekti, de kie vi prenas la ANVLojn.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Averti, se CRL nevalidiĝos post malpli ol:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Marku pro averto, kiam la ANVLo nevalidiĝos dum malproksima estonteco"
+#~ msgstr ""
+#~ "Marku pro averto, kiam la ANVLo nevalidiĝos dum malproksima estonteco"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avertu, kiam la ANVLo nevalidiĝos dum la proksima estonteco</h1>\n"
-#~ "Se la opcio estas markita, vi estos averta, ke iu ANVLo uzataj de vi nevalidiĝos dum la proksima estonteco.\n"
+#~ "Se la opcio estas markita, vi estos averta, ke iu ANVLo uzataj de vi "
+#~ "nevalidiĝos dum la proksima estonteco.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15188,14 +14826,16 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avertu, kiam la ANVLo nevalidiĝos dum la proksima estonteco</h1>\n"
-#~ "En la enigejo vi povas fiksi la tempan kvanton, kiu estos uzata pri la antaŭaverto pro la nevalidiĝo.\n"
+#~ "En la enigejo vi povas fiksi la tempan kvanton, kiu estos uzata pri la "
+#~ "antaŭaverto pro la nevalidiĝo.\n"
 #~ "<p>\n"
 #~ "La rekomenda valoro por Sfinksaro estas 7 tagoj.\n"
 #~ "</qt>"
@@ -15204,21 +14844,26 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgstr "Ĉiam ĉifri al vi &mem"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Marku por haviĝi ĉifrajn mesaĝojn ankaŭ ĉifrajn per via propra ŝlosilo."
+#~ msgstr ""
+#~ "Marku por haviĝi ĉifrajn mesaĝojn ankaŭ ĉifrajn per via propra ŝlosilo."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ĉiam memĉifru</h1>\n"
-#~ "Se la opcio estas markita, ĉifraj mesaĝoj senditaj de vi ankaŭ estos ĉifrataj per via propran ŝlosilon.\n"
+#~ "Se la opcio estas markita, ĉifraj mesaĝoj senditaj de vi ankaŭ estos "
+#~ "ĉifrataj per via propran ŝlosilon.\n"
 #~ "<p>\n"
-#~ "Estas rekomendata lasi la opcion aktivan, por ke vi povu legi la senditajn mesaĝojn.\n"
+#~ "Estas rekomendata lasi la opcion aktivan, por ke vi povu legi la "
+#~ "senditajn mesaĝojn.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15230,16 +14875,21 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avertu, se atestilo nevalidiĝas</h1>\n"
-#~ "Se la opcio estas markita, tiam vi estos avertata, kiam vi provas uzi pro ĉifro atestilon, kiu nevalidiĝos post difinita tagnombro.\n"
+#~ "Se la opcio estas markita, tiam vi estos avertata, kiam vi provas uzi pro "
+#~ "ĉifro atestilon, kiu nevalidiĝos post difinita tagnombro.\n"
 #~ "<p>\n"
-#~ "Estas rekomendata lasi la opcion aktivan por eviti, ke vi uzos atestilojn, kiuj baldaŭ nevalidiĝos.\n"
+#~ "Estas rekomendata lasi la opcion aktivan por eviti, ke vi uzos "
+#~ "atestilojn, kiuj baldaŭ nevalidiĝos.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15260,8 +14910,28 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Elektas sendotajn atestilojn"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Sendi de atestiloj</h1> Sen via atestilo, la ricevanto ne eblos determini, ĉu reale estas vi, kiu sendis la mesaĝon aŭ ĉu la mesaĝo estas aliigita de tria grupo. <p>La ricevanto povas haviĝi vian atestilon de centra servilo, sed vi ankaŭ povas decidi, ke vi enhavigas vian atestilon en via mesaĝo. Vi povas elekti, ĉu vi ne volas enhavigi atestilon, nur vian propran atestilon aŭ la tutan atestilĉenon, kiu atestas vian propran atestilon, kun aŭ sen la radika atestilo. <p>Estas rekomendata enhavigi ĉiam minimume vian propran atestilon en la mesaĝø. <p>Tio estas norma, vi povas superigi ĝin por ĉiu mesaĝo.</qt> "
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Sendi de atestiloj</h1> Sen via atestilo, la ricevanto ne eblos "
+#~ "determini, ĉu reale estas vi, kiu sendis la mesaĝon aŭ ĉu la mesaĝo estas "
+#~ "aliigita de tria grupo. <p>La ricevanto povas haviĝi vian atestilon de "
+#~ "centra servilo, sed vi ankaŭ povas decidi, ke vi enhavigas vian atestilon "
+#~ "en via mesaĝo. Vi povas elekti, ĉu vi ne volas enhavigi atestilon, nur "
+#~ "vian propran atestilon aŭ la tutan atestilĉenon, kiu atestas vian propran "
+#~ "atestilon, kun aŭ sen la radika atestilo. <p>Estas rekomendata enhavigi "
+#~ "ĉiam minimume vian propran atestilon en la mesaĝø. <p>Tio estas norma, vi "
+#~ "povas superigi ĝin por ĉiu mesaĝo.</qt> "
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Sendi &vian propran atestilon"
@@ -15281,16 +14951,20 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Subskribu norme ĉiuj mesaĝpartojn</h1>\n"
-#~ "Se la opcio estas elektita, ĉiuj partoj de mesaĝo (k.e. la ĉefa mesaĝteksto kaj ĉiuj kunsendaĵoj) norme estas subskribataj.\n"
+#~ "Se la opcio estas elektita, ĉiuj partoj de mesaĝo (k.e. la ĉefa "
+#~ "mesaĝteksto kaj ĉiuj kunsendaĵoj) norme estas subskribataj.\n"
 #~ "<p>\n"
-#~ "Tio estas la norma agordo; tamen vi povas superigi ĝin por ĉiu sola mesaĝo.\n"
+#~ "Tio estas la norma agordo; tamen vi povas superigi ĝin por ĉiu sola "
+#~ "mesaĝo.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15302,12 +14976,16 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Demandu antaŭ subskribo de ĉiu parto</h1>\n"
-#~ "Se la opcio estas elektita, vi estos demandata pri ĉiu mesaĝa parto (k.e. la ĉefa mesaĝteksto kaj la kunsendaĵoj), ĉu vi volas subskribi la parton.\n"
+#~ "Se la opcio estas elektita, vi estos demandata pri ĉiu mesaĝa parto (k.e. "
+#~ "la ĉefa mesaĝteksto kaj la kunsendaĵoj), ĉu vi volas subskribi la "
+#~ "parton.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15321,7 +14999,8 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15331,8 +15010,10 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ "Tio estas la norma agordo; vi povas superigi ĝin por ĉiu sola mesaĝo.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "La subskriba atestilo estas agordata per la paĝo de <em>Atestiloj</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "La subskriba atestilo estas agordata per la paĝo de <em>Atestiloj</em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15343,18 +15024,30 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Subskriba algoritmo</h1>\n"
-#~ "Algoritmo estas priskribo por la komputilo, kiel ĝi faru taskon. La subskriba algoritmo priskribas, kiel la komputilo uzas vian subskriban ŝlosilon je via mesaĝo, por ke la ricevanto povas sciiĝi, ĉu la mesaĝo fakte estas de vi.\n"
+#~ "Algoritmo estas priskribo por la komputilo, kiel ĝi faru taskon. La "
+#~ "subskriba algoritmo priskribas, kiel la komputilo uzas vian subskriban "
+#~ "ŝlosilon je via mesaĝo, por ke la ricevanto povas sciiĝi, ĉu la mesaĝo "
+#~ "fakte estas de vi.\n"
 #~ "<p>\n"
-#~ "La elekto de sekura subskriba algoritmo difinas la facilecon aŭ malfacilecon de mesaĝa falso. Ĉiuj alogoritmoj tenitaj pretas en la Sfinksaro estas tre sekuraj. Ĝenerale la normo funkcios tre bone.\n"
+#~ "La elekto de sekura subskriba algoritmo difinas la facilecon aŭ "
+#~ "malfacilecon de mesaĝa falso. Ĉiuj alogoritmoj tenitaj pretas en la "
+#~ "Sfinksaro estas tre sekuraj. Ĝenerale la normo funkcios tre bone.\n"
 #~ "<p>\n"
 #~ "La agordo estas normo; vi popas superigi ĝin por ĉiu sola mesaĝo.\n"
 #~ "</qt>"
@@ -15371,12 +15064,16 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Konservu mesaĝojn kun subskribo</h1>\n"
-#~ "Se la opcio estas markita, senditaj mesaĝoj estas konservitaj kun la siaj subskriboj. Tio estas rekomendita, ĉar eblas por vi, ke vi povos kontroli poste, ĉu vi subskribis mesaĝon aŭ difinan parton de ĝi.\n"
+#~ "Se la opcio estas markita, senditaj mesaĝoj estas konservitaj kun la siaj "
+#~ "subskriboj. Tio estas rekomendita, ĉar eblas por vi, ke vi povos kontroli "
+#~ "poste, ĉu vi subskribis mesaĝon aŭ difinan parton de ĝi.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15391,12 +15088,18 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Disparta subskribo</h1>\n"
-#~ "Se la opcio estas elektita, la subskribo kaj la subskribotaj datumoj estos disaj partoj de multopartsubskribita mesagparto. Subskribitaj mesaĝdatumoj anakŭ estos legeblajper poŝtiloj, kiuj ne subtenas la subskriban algoritmon kaj la ASN.1-deĉifro.\n"
+#~ "Se la opcio estas elektita, la subskribo kaj la subskribotaj datumoj "
+#~ "estos disaj partoj de multopartsubskribita mesagparto. Subskribitaj "
+#~ "mesaĝdatumoj anakŭ estos legeblajper poŝtiloj, kiuj ne subtenas la "
+#~ "subskriban algoritmon kaj la ASN.1-deĉifro.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15408,12 +15111,16 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Opake subskribitaj mesaĝoj</h1>\n"
-#~ "Se la opcio estas elektita, la ambaŭ aĵoj, subskriboj kaj sunskribitaj datumoj, estos ĉifrataj en unu ASN.1-bloko. Mesaĝoj estos legeblaj nur de poŝtiloj, kiuj subtenas tion.\n"
+#~ "Se la opcio estas elektita, la ambaŭ aĵoj, subskriboj kaj sunskribitaj "
+#~ "datumoj, estos ĉifrataj en unu ASN.1-bloko. Mesaĝoj estos legeblaj nur de "
+#~ "poŝtiloj, kiuj subtenas tion.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15426,8 +15133,22 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgstr "Fiksu la nombron de la PIN-enigoj"
 
 #, fuzzy
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN-enigo</h1> Ĉi tie vi povas elekti la nombron de PIN-enigo, kion vi necesas por haviĝi vian personan sekuran ĉirkaŭaĵon (PSĈ), tdeio enhavas viajn atestilojn. <p>Ju pli ofte vi devas enigi vian PINon, des pli sekura estas vi kontraŭ retleteroj falsigotaj je via nomo, sed des pli malkomfortaj estos viaj agoj. <p>Se vi ne certas pri la elekto, ne ŝanĝu la opcion. <p> Notu, ke ne eblas neebligi la PIN-enigon tute pro sekurajn kaŭzojn.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN-enigo</h1> Ĉi tie vi povas elekti la nombron de PIN-enigo, "
+#~ "kion vi necesas por haviĝi vian personan sekuran ĉirkaŭaĵon (PSĈ), tdeio "
+#~ "enhavas viajn atestilojn. <p>Ju pli ofte vi devas enigi vian PINon, des "
+#~ "pli sekura estas vi kontraŭ retleteroj falsigotaj je via nomo, sed des "
+#~ "pli malkomfortaj estos viaj agoj. <p>Se vi ne certas pri la elekto, ne "
+#~ "ŝanĝu la opcion. <p> Notu, ke ne eblas neebligi la PIN-enigon tute pro "
+#~ "sekurajn kaŭzojn.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Unufoje po seanco"
@@ -15445,16 +15166,21 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avertu, se la atestilo nevalidiĝas</h1>\n"
-#~ "Se la opcio estas markita, tima vi estos avertata, kiam vi provas uzi pro subskribo atestilon, tdeio nevalidiĝos post difina tagnombroj.\n"
+#~ "Se la opcio estas markita, tima vi estos avertata, kiam vi provas uzi pro "
+#~ "subskribo atestilon, tdeio nevalidiĝos post difina tagnombroj.\n"
 #~ "<p>\n"
-#~ "Estas rekomendata ne ŝanĝi la opcion por eviti, ke atestilo estas uzata, tdeio baldaŭ nevalidiĝos.\n"
+#~ "Estas rekomendata ne ŝanĝi la opcion por eviti, ke atestilo estas uzata, "
+#~ "tdeio baldaŭ nevalidiĝos.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15467,14 +15193,16 @@ msgstr "Ĉu anstataŭigi dosieron?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avertu, se la subskribantula retadreso ne estas en la atestilo</h1>\n"
-#~ "Se la opcio ne estas markita, averto estas eldonata, se la retadreso de la subskribanto ne estas en la uzata atestilo.\n"
+#~ "Se la opcio ne estas markita, averto estas eldonata, se la retadreso de "
+#~ "la subskribanto ne estas en la uzata atestilo.\n"
 #~ "<p>\n"
 #~ "Estas rekomendata ne ŝanĝi la opcion pro la maksimuma nefalseco.\n"
 #~ "</qt>"
diff --git a/tde-i18n-es/messages/tdepim/kmail.po b/tde-i18n-es/messages/tdepim/kmail.po
index 0ced6b80125..8a89f1f17d6 100644
--- a/tde-i18n-es/messages/tdepim/kmail.po
+++ b/tde-i18n-es/messages/tdepim/kmail.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-03-10 13:44+0100\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
@@ -27,13 +27,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Juan Manuel García Molina,Jaime Robles,Pablo de Vicente"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -182,6 +182,12 @@ msgstr "&Ninguna (usar con cuidado)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Cuenta de manejo de recursos semi-automático"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Limpiar pasado"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -259,13 +265,14 @@ msgstr "&Usuario:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "Su proveedor de servicios de internet le dió un <em>nombre de usuario</em> "
-"que se usa para autenticarle contra sus servidores. Habitualmente es la primera "
-"parte de su dirección de correo electrónico (la parte antes de <em>@</em>)."
+"que se usa para autenticarle contra sus servidores. Habitualmente es la "
+"primera parte de su dirección de correo electrónico (la parte antes de "
+"<em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -286,18 +293,18 @@ msgstr "Almacena&r la contraseña POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Marcar esta opción hará que KMail almacene la contraseña.\n"
 "Si TDEWallet está disponible, se encargará de conservar la contraseña en un "
 "lugar seguro.\n"
-"Sin embargo, si no está disponible TDEWallet, la contraseña se almacenará en el "
-"archivo de configuración de KMail. La contraseña se guarda en un formato "
+"Sin embargo, si no está disponible TDEWallet, la contraseña se almacenará en "
+"el archivo de configuración de KMail. La contraseña se guarda en un formato "
 "ofuscado, pero no se debe considerar un seguro frente a los intentos para "
 "descifrar su contenido, si se consigue el archivo que contiene la contraseña."
 
@@ -327,12 +334,13 @@ msgstr "&Filtrar mensajes si son más grandes que"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Si selecciona esta opción, los filtros POP se usarán para decidir qué hacer con "
-"los mensajes. Podrá entonces elegir si descargarlos, eliminarlos o dejarlos en "
-"el servidor."
+"Si selecciona esta opción, los filtros POP se usarán para decidir qué hacer "
+"con los mensajes. Podrá entonces elegir si descargarlos, eliminarlos o "
+"dejarlos en el servidor."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -381,13 +389,15 @@ msgstr "Te&xto en claro"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -430,14 +440,14 @@ msgstr "Espacios de nombres:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Aquí puede ver los diversos espaciones de nombres que admite su servidor IMAP. "
-"Cada espacio de nombres representa un prefijo que separa los grupos de "
-"carpetas. Los espacios de nombres permiten que KMail, por ejemplo, muestre sus "
-"carpetas personales y sus carpetas compartidas en una cuenta."
+"Aquí puede ver los diversos espaciones de nombres que admite su servidor "
+"IMAP. Cada espacio de nombres representa un prefijo que separa los grupos de "
+"carpetas. Los espacios de nombres permiten que KMail, por ejemplo, muestre "
+"sus carpetas personales y sus carpetas compartidas en una cuenta."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -496,9 +506,9 @@ msgstr "Cargar adjuntos bajo de&manda"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Active esto para no cargar automáticamente los adjuntos cuando seleccione el "
 "correo-e, sino cuando haga clic sobre el adjunto. De esta forma, los correos "
@@ -513,8 +523,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Sólo se comprueban las subcarpetas de las carpetas del árbol que estén abiertas "
-"(expandidas). Úselo si hay muchas carpetas en el servidor."
+"Sólo se comprueban las subcarpetas de las carpetas del árbol que estén "
+"abiertas (expandidas). Úselo si hay muchas carpetas en el servidor."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -542,7 +552,7 @@ msgstr "<ninguno>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "entrante"
 
@@ -550,37 +560,38 @@ msgstr "entrante"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"El servidor no parece admitir números de mensaje únicos, pero es un requisito "
-"para dejar los mensajes en el servidor.\n"
-"Ya que algunos servidores no anuncian correctamente sus capacidades, aún puede "
-"tener la posibilidad de permitir dejar los mensajes en el servidor."
+"El servidor no parece admitir números de mensaje únicos, pero es un "
+"requisito para dejar los mensajes en el servidor.\n"
+"Ya que algunos servidores no anuncian correctamente sus capacidades, aún "
+"puede tener la posibilidad de permitir dejar los mensajes en el servidor."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"El servidor no parece admitir obtener las cabeceras de los mensajes, pero es un "
-"requisito para filtrar los mensajes en el servidor.\n"
-"Ya que algunos servidores no anuncian correctamente sus capacidades, aún puede "
-"tener la posibilidad de permitir activar el filtrado de mensajes en el "
+"El servidor no parece admitir obtener las cabeceras de los mensajes, pero es "
+"un requisito para filtrar los mensajes en el servidor.\n"
+"Ya que algunos servidores no anuncian correctamente sus capacidades, aún "
+"puede tener la posibilidad de permitir activar el filtrado de mensajes en el "
 "servidor."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Tenga en cuenta que esta función puede causar que servidores POP3 que no "
 "soporten paralelismo envíen mensajes dañados.\n"
@@ -597,52 +608,52 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "El servidor parece no admitir paralelismo. Por tanto, se ha desactivado esta "
 "opción.\n"
 "Ya que algunos servidores no anuncian correctamente sus capacidades, puede "
-"tener la posicilidad de activar el paralelismo. Pero tenga en cuenta que esta "
-"característica puede provocar que algunos servidores POP que no admitan "
-"paralelistmo envíen mensajes dañados. Así que antes de usar esta característica "
-"con correo importante primero debería probar a mandarse a sí mismo una gran "
-"cantidad de mensajes de prueba para que los pueda descargar todos de una vez "
-"desde el servidor POP."
+"tener la posicilidad de activar el paralelismo. Pero tenga en cuenta que "
+"esta característica puede provocar que algunos servidores POP que no admitan "
+"paralelistmo envíen mensajes dañados. Así que antes de usar esta "
+"característica con correo importante primero debería probar a mandarse a sí "
+"mismo una gran cantidad de mensajes de prueba para que los pueda descargar "
+"todos de una vez desde el servidor POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"El servidor no parece admitir números de mensaje únicos, pero es un requisito "
-"para dejar los mensajes en el servidor. Por tanto, se ha desactivado esta "
-"opción.\n"
-"Ya que algunos servidores no anuncian correctamente sus capacidades, aún puede "
-"tener la posibilidad de permitir dejar los mensajes en el servidor."
+"El servidor no parece admitir números de mensaje únicos, pero es un "
+"requisito para dejar los mensajes en el servidor. Por tanto, se ha "
+"desactivado esta opción.\n"
+"Ya que algunos servidores no anuncian correctamente sus capacidades, aún "
+"puede tener la posibilidad de permitir dejar los mensajes en el servidor."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"El servidor no parece admitir obtener las cabeceras de los mensajes, pero es un "
-"requisito para filtrar los mensajes en el servidor. Por tanto, se ha "
+"El servidor no parece admitir obtener las cabeceras de los mensajes, pero es "
+"un requisito para filtrar los mensajes en el servidor. Por tanto, se ha "
 "desactivado esta opción.\n"
-"Ya que algunos servidores no anuncian correctamente sus capacidades, aún puede "
-"tener la posibilidad de permitir activar el filtrado de mensajes en el "
+"Ya que algunos servidores no anuncian correctamente sus capacidades, aún "
+"puede tener la posibilidad de permitir activar el filtrado de mensajes en el "
 "servidor."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -723,8 +734,8 @@ msgstr "Cuenta IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Necesita añadir una cuenta en las opciones de red para poder recibir correo."
 
@@ -762,9 +773,9 @@ msgstr "Bienvenido a KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Parece que es la primera vez que inicia KMail. Puede usar este asistente "
 "para configurar sus cuentas de correo. Simplemente indique los datos de la "
@@ -831,8 +842,7 @@ msgstr "Usar entrega local"
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ninguno"
@@ -926,8 +936,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>No se han encontrado herramientas de detección de correo basura. Instale los "
-"programas de detección de correo basura y vuelva a hacer funcionar este "
+"<p>No se han encontrado herramientas de detección de correo basura. Instale "
+"los programas de detección de correo basura y vuelva a hacer funcionar este "
 "asistente.</p>"
 
 #: antispamwizard.cpp:536
@@ -976,31 +986,28 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Aquí puede obtener asistencia para configurar las reglas de filtrado de "
-"KMail para que use alguna de las herramientas que se conocen como anti "
-"virus.</p> "
-"<p>El asistente puede detectar las herramientas que tenga en su computador, así "
-"como crear reglas de filtrado para clasificar mensajes usando estas "
-"herramientas, para separar los mensajes que contengan virus. El asistente no "
-"tendrá en cuenta ninguna de las reglas de filtrado existentes, sino que añadirá "
-"reglas nuevas.</p> "
-"<p><b>Aviso:</b> Como KMail parece congelarse durante la búsqueda de virus, "
-"puede tener problemas con la capacidad de respuesta de KMail, ya que las "
-"operaciones anti virus suelen consumir bastante tiempo. Recuerde que eliminando "
-"las reglas de filtrado que crea el asistente, volverá a tener el comportamiento "
-"anterior."
+"KMail para que use alguna de las herramientas que se conocen como anti virus."
+"</p> <p>El asistente puede detectar las herramientas que tenga en su "
+"computador, así como crear reglas de filtrado para clasificar mensajes "
+"usando estas herramientas, para separar los mensajes que contengan virus. El "
+"asistente no tendrá en cuenta ninguna de las reglas de filtrado existentes, "
+"sino que añadirá reglas nuevas.</p> <p><b>Aviso:</b> Como KMail parece "
+"congelarse durante la búsqueda de virus, puede tener problemas con la "
+"capacidad de respuesta de KMail, ya que las operaciones anti virus suelen "
+"consumir bastante tiempo. Recuerde que eliminando las reglas de filtrado que "
+"crea el asistente, volverá a tener el comportamiento anterior."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1028,8 +1035,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"La carpeta predefinida para los mensajes de correo basura es la papelera, pero "
-"puede cambiarla abajo, en la vista de carpetas."
+"La carpeta predefinida para los mensajes de correo basura es la papelera, "
+"pero puede cambiarla abajo, en la vista de carpetas."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1037,16 +1044,14 @@ msgstr "Mover el correo basura &probable a:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"La carpeta predefinida es la de correo entrante, pero puede cambiarla debajo, "
-"en la vista de carpetas."
-"<p>No todas las herramientas admiten la clasificación como incierta. Si no ha "
-"seleccionado una herramienta capaz de hacer esto, no podrá seleccionar una "
-"carpeta."
+"La carpeta predefinida es la de correo entrante, pero puede cambiarla "
+"debajo, en la vista de carpetas.<p>No todas las herramientas admiten la "
+"clasificación como incierta. Si no ha seleccionado una herramienta capaz de "
+"hacer esto, no podrá seleccionar una carpeta."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1056,13 +1061,13 @@ msgstr "Comprobar los mensajes usando las herramientas anti virus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Permitir que las herramientas anti virus comprueben los mensajes. El asistente "
-"creará los filtros adecuados. Las herramientas suelen marcar los mensajes para "
-"que los siguientes filtros puedan reaccionar ante esto y, por ejemplo, muevan "
-"los mensajes con virus a una carpeta especial."
+"Permitir que las herramientas anti virus comprueben los mensajes. El "
+"asistente creará los filtros adecuados. Las herramientas suelen marcar los "
+"mensajes para que los siguientes filtros puedan reaccionar ante esto y, por "
+"ejemplo, muevan los mensajes con virus a una carpeta especial."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1071,12 +1076,13 @@ msgstr "Mover los mensajes detectados como víricos a la carpeta seleccionada"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Un filtro para detectar mensajes clasificados como infectados por virus y mover "
-"estos mensajes a una carpeta predefinda que se cree. La carpeta predefinida es "
-"la carpeta papelera, pero puede cambiarla en la vista de carpetas."
+"Un filtro para detectar mensajes clasificados como infectados por virus y "
+"mover estos mensajes a una carpeta predefinda que se cree. La carpeta "
+"predefinida es la carpeta papelera, pero puede cambiarla en la vista de "
+"carpetas."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1084,8 +1090,8 @@ msgstr "Marcar además como leídos los mensajes detectados como víricos"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Marca como leídos los mensajes que se han clasificado como infectados por "
 "virus, además de moverlos a la carpeta seleccionada."
@@ -1268,8 +1274,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Esto podría deberse a que no tenga permiso para hacerlo o porque la carpeta ya "
-"exista en el servidor. El mensaje de error de la comunicación del servidor es:"
+"Esto podría deberse a que no tenga permiso para hacerlo o porque la carpeta "
+"ya exista en el servidor. El mensaje de error de la comunicación del "
+"servidor es:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1282,8 +1289,8 @@ msgstr "Error al leer la carpeta %1 del servidor: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1303,8 +1310,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1335,21 +1342,22 @@ msgstr "Eliminado"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Ninguna de sus identidades coincide con el destinatario de este mensaje. "
-"<br>Haga el favor de seleccionar cuál de las siguientes direcciones es la suya, "
-"si es que es alguna:"
+"<br>Haga el favor de seleccionar cuál de las siguientes direcciones es la "
+"suya, si es que es alguna:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Algunas de sus identidades coincide con el destinatario de este mensaje. "
-"<br>Haga el favor de seleccionar cuál de las siguientes direcciones es la suya:"
+"<br>Haga el favor de seleccionar cuál de las siguientes direcciones es la "
+"suya:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1380,18 +1388,21 @@ msgstr "Ocurrió un error al compactar «%1». Compactación abortada."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Su administrador ha fijado esta preferencia.</p>"
-"<p>Si piensa que es un error, póngase en contacto con él.</p></qt>"
+"<qt><p>Su administrador ha fijado esta preferencia.</p><p>Si piensa que es "
+"un error, póngase en contacto con él.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Cargar perfi&l..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configurar cuenta"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Añadir..."
@@ -1421,6 +1432,11 @@ msgstr "<qt>¿Realmente quiere eliminar la identidad llamada <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Eliminar la identidad"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Eli&minar"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Añadir..."
@@ -1429,6 +1445,11 @@ msgstr "Añadir..."
 msgid "Modify..."
 msgstr "Modificar..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Eli&minar"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Poner como predeterminado"
@@ -1445,17 +1466,15 @@ msgstr "En&viando"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Cuentas de salida(añada al menos una):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nombre"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
@@ -1477,8 +1496,7 @@ msgstr "Predefinido"
 msgid "Common Options"
 msgstr "Opciones comunes"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Confirmar antes de enviar"
@@ -1529,17 +1547,16 @@ msgstr "Dominio prede&terminado:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El nombre de dominio predeterminado se usa para completar la dirección de "
-"correo-e que sólo consista en un nombre de usuario.</p></qt>"
+"<qt><p>El nombre de dominio predeterminado se usa para completar la "
+"dirección de correo-e que sólo consista en un nombre de usuario.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1557,9 +1574,9 @@ msgstr "Añadir servidor"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Predefinido)"
 
@@ -1643,6 +1660,10 @@ msgstr "Modificar cuenta"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>No se puede localizar la cuenta <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Colore&s"
@@ -1751,8 +1772,7 @@ msgstr "Enlace visitado"
 msgid "Misspelled Words"
 msgstr "Palabras incorrectas"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nuevo mensaje"
@@ -1940,11 +1960,11 @@ msgstr "Hilos de discusión cerrados por omisión"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Abrir hilos de discusión que contengan mensajes nue&vos, sin leer o importantes "
-"y abrir los hilos observados."
+"Abrir hilos de discusión que contengan mensajes nue&vos, sin leer o "
+"importantes y abrir los hilos observados."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1952,67 +1972,51 @@ msgstr "Visor de fecha"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Puede usar estas expresiones para la fecha:</strong></p>"
-"<ul>"
-"<li>d - el día como número sin cero (1-31)</li>"
-"<li>dd - el día como número con cero (01-31)</li>"
-"<li>ddd - nombre abreviado del día (Lun - Dom)</li>"
-"<li>dddd - nombre completo del día (Lunes - Domingo)</li>"
-"<li>M - el mes como número sin cero (1-12)</li>"
-"<li>MM - el mes como número con cero (01-12)</li>"
-"<li>MMM - nombre abreviado del mes (Ene - Dic)</li>"
-"<li>MMMM - nombre completo del mes (Enero - Diciembre)</li>"
-"<li>yy - el año en formato de dos dígitos (00-99)</li>"
-"<li>yyyy - el año con cuatr0 dígitos (0000-9999)</li></ul>"
-"<p><strong>Puede usar estas expresiones para la hora:</string></p> "
-"<ul>"
-"<li>h - la hora sin cero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - la hora con cero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - minutos sin cero (0-59)</li>"
-"<li>mm - minutos con cero (00-59)</li>"
-"<li>s - segundos sin cero (0-59)</li>"
-"<li>ss - segundos con cero (00-59)</li>"
-"<li>z - milisegundos sin ceros (0-999)</li>"
-"<li>zzz - milisegundos con ceros (000-999)</li>"
-"<li>AP - cambiar al formato AM/PM. AP será remplazado por «AM» o «PM».</li>"
-"<li>ap - cambiar a formato AM/PM. ap sera remplazado por «am» o «pm».</li>"
-"<li>Z - zona horaria en formato numérico (-0500)</li></ul>"
-"<p><strong>Cualquier otro caracter se ignorará.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Puede usar estas expresiones para la fecha:</strong></"
+"p><ul><li>d - el día como número sin cero (1-31)</li><li>dd - el día como "
+"número con cero (01-31)</li><li>ddd - nombre abreviado del día (Lun - Dom)</"
+"li><li>dddd - nombre completo del día (Lunes - Domingo)</li><li>M - el mes "
+"como número sin cero (1-12)</li><li>MM - el mes como número con cero "
+"(01-12)</li><li>MMM - nombre abreviado del mes (Ene - Dic)</li><li>MMMM - "
+"nombre completo del mes (Enero - Diciembre)</li><li>yy - el año en formato "
+"de dos dígitos (00-99)</li><li>yyyy - el año con cuatr0 dígitos (0000-9999)</"
+"li></ul><p><strong>Puede usar estas expresiones para la hora:</string></p> "
+"<ul><li>h - la hora sin cero (0-23 or 1-12 if AM/PM display)</li><li>hh - la "
+"hora con cero (00-23 or 01-12 if AM/PM display)</li><li>m - minutos sin cero "
+"(0-59)</li><li>mm - minutos con cero (00-59)</li><li>s - segundos sin cero "
+"(0-59)</li><li>ss - segundos con cero (00-59)</li><li>z - milisegundos sin "
+"ceros (0-999)</li><li>zzz - milisegundos con ceros (000-999)</li><li>AP - "
+"cambiar al formato AM/PM. AP será remplazado por «AM» o «PM».</li><li>ap - "
+"cambiar a formato AM/PM. ap sera remplazado por «am» o «pm».</li><li>Z - "
+"zona horaria en formato numérico (-0500)</li></ul><p><strong>Cualquier otro "
+"caracter se ignorará.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Cambiar la configuración global de los hilos de discusión afectará toda la "
 "configuración específica."
@@ -2029,8 +2033,7 @@ msgstr "Mostrar &barra de estado HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Mostrar el estado de correo &basura en las cabeceras adornadas"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Reemplazar smileys por emoticonos"
@@ -2039,8 +2042,7 @@ msgstr "Reemplazar smileys por emoticonos"
 msgid "Use smaller font for quoted text"
 msgstr "Usar tipografía más pequeña para el texto citado"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Mostrar marcas para expandir o contraer el citado"
@@ -2066,8 +2068,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "Prevalece s&obre la codificación de caracteres:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Activar el icono de la bandeja del sistema"
@@ -2169,24 +2170,20 @@ msgstr "Se reemplazará <b>%f</b> con el nombre del archivo que va a editar."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>En las plantillas de respuesta, se pueden usar las siguientes variables:"
-"<br><b>%D</b>: fecha, <b>%S</b>: asunto,"
-"<br><b>%e</b>: dirección del remitente, <b>%F</b>: nombre del remitente,<b>"
-"%f</b>: iniciales del remitente,"
-"<br><b>%T</b>: nombre del destinatario, <b>%t</b>: nombre y dirección del "
-"destinatario,"
-"<br><b>%C</b>: nombres con copia oculta, <b>%c</b>: nombres y direcciones con "
-"copia oculta,"
-"<br><b>%%</b>: símbolo de porcentaje, <b>%_</b>: espacio, <b>%L</b>"
-": salto de línea</qt>"
+"<br><b>%D</b>: fecha, <b>%S</b>: asunto,<br><b>%e</b>: dirección del "
+"remitente, <b>%F</b>: nombre del remitente,<b>%f</b>: iniciales del "
+"remitente,<br><b>%T</b>: nombre del destinatario, <b>%t</b>: nombre y "
+"dirección del destinatario,<br><b>%C</b>: nombres con copia oculta, <b>%c</"
+"b>: nombres y direcciones con copia oculta,<br><b>%%</b>: símbolo de "
+"porcentaje, <b>%_</b>: espacio, <b>%L</b>: salto de línea</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2209,21 +2206,20 @@ msgstr "Responder &a todos:"
 msgid "&Forward:"
 msgstr "Reen&viar:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Indicador de &cita:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "El %D, escribió:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "El %D, %F escribió:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
@@ -2261,8 +2257,8 @@ msgstr "Introducir nuevo prefijo de reenvío:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Esta lista se verifica comenzando por arriba hasta encontrar el juego de "
 "caracteres requerido por cada mensaje saliente."
@@ -2301,10 +2297,9 @@ msgstr "Valor"
 msgid "Ne&w"
 msgstr "Nue&vo"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nombre:"
@@ -2313,19 +2308,18 @@ msgstr "&Nombre:"
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nombrado de adjuntos compatible con Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Active esta opción para hacer que Outlook(tm) entienda los nombres de adjuntos "
-"que tengan caracteres no ingleses."
+"Active esta opción para hacer que Outlook(tm) entienda los nombres de "
+"adjuntos que tengan caracteres no ingleses."
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2334,8 +2328,8 @@ msgstr "Activar la detecció&n de adjuntos perdidos"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Reconocer cualquiera de las siguientes palabras como la intención de adjuntar "
-"un archivo:"
+"Reconocer cualquiera de las siguientes palabras como la intención de "
+"adjuntar un archivo:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2353,21 +2347,21 @@ msgstr "adjuntado"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Ha elegido codificar los nombres de los adjuntos que tengan caracteres no "
 "ingleses de forma que Outlook(tm) y otros clientes de correo que no admiten "
 "nombres de adjuntos según los estándares puedan entenderlos.\n"
 "Tenga en cuenta que KMail puede crear mensajes mensajes que no cumplan los "
 "estándares y, por consiguiente, es posible que sus mensajes no los entiendan "
-"los clientes de correo que cumplen los estándares. Por tanto, a no ser que no "
-"tenga otra opción, no debería activar esta opción."
+"los clientes de correo que cumplen los estándares. Por tanto, a no ser que "
+"no tenga otra opción, no debería activar esta opción."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2391,112 +2385,97 @@ msgstr "Mo&tores de cifrado"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Los mensajes de correo-e a veces llegan en ambos formatos. Esta opción "
-"controla si quiere ver la parte HTML o la parte de texto plano.</p>"
-"<p>Mostrar la parte HTML muestra el mensaje con mejor apariencia, pero a la "
-"vez, incrementa el riesgo de que se exploten agujeros de seguridad.</p>"
-"<p>Mostrar la parte de texto plano hace que se pierda gran parte del formato "
-"del mensaje pero hace casi <em>imposible</em> que se exploten agujeros de "
-"seguridad en el motor de HTML (Konqueror).</p>"
-"<p>La opción de abajo le protege contra malusos de mensajes HTML. Pero no puede "
-"protegerle contra otros fallos de seguridad que no fueran conocidos en el "
-"momento en el que se escribía esta versión de KMail.</p>"
-"<p>Es aconsejable <em>no</em> preferir HTML a texto plano.</p> "
-"<p><b>Nota:</b> Puede configurar esta opción para cada carpeta desde el menú <i>"
-"Carpeta</i> de la ventana principal de KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Los mensajes de correo-e a veces llegan en ambos formatos. Esta "
+"opción controla si quiere ver la parte HTML o la parte de texto plano.</"
+"p><p>Mostrar la parte HTML muestra el mensaje con mejor apariencia, pero a "
+"la vez, incrementa el riesgo de que se exploten agujeros de seguridad.</"
+"p><p>Mostrar la parte de texto plano hace que se pierda gran parte del "
+"formato del mensaje pero hace casi <em>imposible</em> que se exploten "
+"agujeros de seguridad en el motor de HTML (Konqueror).</p><p>La opción de "
+"abajo le protege contra malusos de mensajes HTML. Pero no puede protegerle "
+"contra otros fallos de seguridad que no fueran conocidos en el momento en el "
+"que se escribía esta versión de KMail.</p><p>Es aconsejable <em>no</em> "
+"preferir HTML a texto plano.</p> <p><b>Nota:</b> Puede configurar esta "
+"opción para cada carpeta desde el menú <i>Carpeta</i> de la ventana "
+"principal de KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Algunos mensajes de anuncios están en HTML y contienen referencias a "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Algunos mensajes de anuncios están en HTML y contienen referencias a "
 "imágenes que esos anuncios usan para saber si ha leído su correo («errores "
-"web»).</p>"
-"<p>No hay una razón válida para imágenes de la red así, porque el remitente "
-"siempre puede adjuntarlas directamente.</p>"
-"<p>Para protegerle de este mal uso del HTML, esta opción se <em>deshabilita</em> "
-"por omisión.</p>"
-"<p>Sin embargo, si no le importa ver imágenes en mensajes HTML que no están "
-"adjuntas, puede habilitar esta opción, pero debe de estar alerta con este "
-"posible problema.</p></qt>"
+"web»).</p><p>No hay una razón válida para imágenes de la red así, porque el "
+"remitente siempre puede adjuntarlas directamente.</p><p>Para protegerle de "
+"este mal uso del HTML, esta opción se <em>deshabilita</em> por omisión.</"
+"p><p>Sin embargo, si no le importa ver imágenes en mensajes HTML que no "
+"están adjuntas, puede habilitar esta opción, pero debe de estar alerta con "
+"este posible problema.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Política sobre los acuses de recibo (MDN)</h3>"
-"<p>La MDN es una generalización de lo que comúnmente llamamos «acuse de "
-"recibo». El autor del mensaje solicita una petición de acuse de recibo y el "
-"programa receptor de correo genera una respuesta en la que el autor puede "
-"averiguar qué ocurrió con su mensaje. Los tipos de notificación común incluyen "
-"«mostrado» (por ejemplo, leído), «borrado» y «despachado» (por ejemplo, "
-"reenviado).</p>"
-"<p>Están disponibles las siguientes opciones para controlar el envío de MDNs "
-"desde KMail:</p>"
-"<ul>"
-"<li><em>Ignorar</em>: Ignora todas las peticiones de acuse de recibo. Ningún "
-"MDN se enviará automáticamente (recomendado).</li>"
-"<li><em>Preguntar</em>: Responde a las peticiones después de pedir permiso al "
-"usuario. De esta forma, puede enviar MDNs para los mensajes seleccionados y "
-"denegar o ignorar otros.</li>"
-"<li><em>Denegar</em>: Siempre envía una notificación <b>denegada</b>"
-". Esto es <em>algo</em> mejor que enviar siempre MDNs. El autor sabrá que los "
-"mensajes se han recibido, pero no podrá decir si se han borrado o leído, "
-"etc.</li>"
-"<li><em>Enviar siempre</em>: Siempre envía el acuse de recibo solicitado. Esto "
-"significa que el autor del mensaje sabrá que el mensaje se ha recibido y qué "
-"ocurrió (se mostró, se borró, etc.). Esta opción no es muy recomendable, pero "
-"tiene sentido, por ejemplo en la gestión de relaciones con los clientes, por lo "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Política sobre los acuses de recibo (MDN)</h3><p>La MDN es una "
+"generalización de lo que comúnmente llamamos «acuse de recibo». El autor del "
+"mensaje solicita una petición de acuse de recibo y el programa receptor de "
+"correo genera una respuesta en la que el autor puede averiguar qué ocurrió "
+"con su mensaje. Los tipos de notificación común incluyen «mostrado» (por "
+"ejemplo, leído), «borrado» y «despachado» (por ejemplo, reenviado).</"
+"p><p>Están disponibles las siguientes opciones para controlar el envío de "
+"MDNs desde KMail:</p><ul><li><em>Ignorar</em>: Ignora todas las peticiones "
+"de acuse de recibo. Ningún MDN se enviará automáticamente (recomendado).</"
+"li><li><em>Preguntar</em>: Responde a las peticiones después de pedir "
+"permiso al usuario. De esta forma, puede enviar MDNs para los mensajes "
+"seleccionados y denegar o ignorar otros.</li><li><em>Denegar</em>: Siempre "
+"envía una notificación <b>denegada</b>. Esto es <em>algo</em> mejor que "
+"enviar siempre MDNs. El autor sabrá que los mensajes se han recibido, pero "
+"no podrá decir si se han borrado o leído, etc.</li><li><em>Enviar siempre</"
+"em>: Siempre envía el acuse de recibo solicitado. Esto significa que el "
+"autor del mensaje sabrá que el mensaje se ha recibido y qué ocurrió (se "
+"mostró, se borró, etc.). Esta opción no es muy recomendable, pero tiene "
+"sentido, por ejemplo en la gestión de relaciones con los clientes, por lo "
 "que está disponible.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
@@ -2513,15 +2492,15 @@ msgstr "Permitir cargar referencias e&xternas desde Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ATENCIÓN:</b> Permitir HTML en el correo puede incrementar el riesgo de que "
-"su sistema se vea comprometido por otros fallos de seguridad presentes y "
-"futuros. <a href=\"whatsthis:%1\">Más sobre mensajes HTML...</a> "
-"<a href=\"whatsthis:%2\">Más sobre referencias externas...</a>"
+"<b>ATENCIÓN:</b> Permitir HTML en el correo puede incrementar el riesgo de "
+"que su sistema se vea comprometido por otros fallos de seguridad presentes y "
+"futuros. <a href=\"whatsthis:%1\">Más sobre mensajes HTML...</a> <a href="
+"\"whatsthis:%2\">Más sobre referencias externas...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2603,8 +2582,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Esta opción precisa de dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "sin proxy"
@@ -2633,8 +2611,8 @@ msgstr "E&xcluir mensajes importantes de la caducidad"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Al intentar encontrar mensajes no leídos:"
 
@@ -2658,8 +2636,8 @@ msgstr "Recorrer todas las carpetas"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Cuando se entre en una carpeta:"
 
@@ -2729,28 +2707,23 @@ msgstr "Directorios (formato «maildir»)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Esto selecciona que formato de buzón será el usado en las carpetas "
-"locales:</p>"
-"<p><b>mbox:</b> Las carpetas de KMail se representan por un archivo cada una. "
-"Los mensajes se separan uno de otro por una linea que comienza por «From ». "
-"Esto ahorra espacio en disco pero es menos robusto, por ejemplo al mover correo "
-"entre carpetas.</p>"
-"<p><b>maildir:</b> Las carpetas de KMail se representan por carpetas reales en "
-"el disco. Los mensajes son archivos separados. Puede ser una pérdida de un poco "
-"de espacio en disco pero es más robusto al mover mensajes entre carpetas.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Esto selecciona que formato de buzón será el usado en las carpetas "
+"locales:</p><p><b>mbox:</b> Las carpetas de KMail se representan por un "
+"archivo cada una. Los mensajes se separan uno de otro por una linea que "
+"comienza por «From ». Esto ahorra espacio en disco pero es menos robusto, "
+"por ejemplo al mover correo entre carpetas.</p><p><b>maildir:</b> Las "
+"carpetas de KMail se representan por carpetas reales en el disco. Los "
+"mensajes son archivos separados. Puede ser una pérdida de un poco de espacio "
+"en disco pero es más robusto al mover mensajes entre carpetas.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2783,55 +2756,47 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cuando salta al siguiente mensaje sin leer, puede ocurrir que no haya más "
-"mensajes sin leer por debajo del mensaje actual.</p>"
-"<p><b>No recorrer al completo:</b> La búsqueda se detendrá en el último mensaje "
-"de la carpeta actual.</p>"
-"<p><b>Recorrer la carpeta actual:</b> La búsqueda seguirá por el principio de "
-"la lista de mensajes, pero no se tendrán en cuenta las demás carpetas.</p>"
-"<p><b>Recorrer todas las carpetas:</b> La búsqueda seguirá por el principio de "
-"la lista de mensajes. Si no hay mensajes por leer, se continuará por la "
-"siguiente carpeta.</p>"
-"<p>De forma similar, al buscar el mensaje anterior no leído, la búsqueda "
-"comenzará por el final de la lista de mensajes y seguirá por la carpeta "
-"anterior según la opción que haya seleccionado.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Cuando salta al siguiente mensaje sin leer, puede ocurrir que no haya "
+"más mensajes sin leer por debajo del mensaje actual.</p><p><b>No recorrer al "
+"completo:</b> La búsqueda se detendrá en el último mensaje de la carpeta "
+"actual.</p><p><b>Recorrer la carpeta actual:</b> La búsqueda seguirá por el "
+"principio de la lista de mensajes, pero no se tendrán en cuenta las demás "
+"carpetas.</p><p><b>Recorrer todas las carpetas:</b> La búsqueda seguirá por "
+"el principio de la lista de mensajes. Si no hay mensajes por leer, se "
+"continuará por la siguiente carpeta.</p><p>De forma similar, al buscar el "
+"mensaje anterior no leído, la búsqueda comenzará por el final de la lista de "
+"mensajes y seguirá por la carpeta anterior según la opción que haya "
+"seleccionado.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>La indexación de todo el texto permite que las búsquedas en el contenido de "
-"sus mensajes sean muy rápidas. Cuando se activa, el cuadro de diálogo de "
-"búsqueda funciona muy rápido. La barra de herramientas de búsqueda también "
-"selecciona los mensajes en función de su contenido.</p>"
-"<p>Consume bastante espacio de disco (sobre la mitad del espacio del disco para "
-"los mensajes).</p>"
-"<p>Después de activarlo, se tiene que construir el índice, pero puede seguir "
-"usando KMail mientras se está llevando a cabo esta operación.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>La indexación de todo el texto permite que las búsquedas en el "
+"contenido de sus mensajes sean muy rápidas. Cuando se activa, el cuadro de "
+"diálogo de búsqueda funciona muy rápido. La barra de herramientas de "
+"búsqueda también selecciona los mensajes en función de su contenido.</"
+"p><p>Consume bastante espacio de disco (sobre la mitad del espacio del disco "
+"para los mensajes).</p><p>Después de activarlo, se tiene que construir el "
+"índice, pero puede seguir usando KMail mientras se está llevando a cabo esta "
+"operación.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2853,8 +2818,8 @@ msgstr "&Formato usado en las carpetas de groupware:"
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
-"Seleccione el formato que va a usar para almacenar el contenido de las carpetas "
-"de groupware."
+"Seleccione el formato que va a usar para almacenar el contenido de las "
+"carpetas de groupware."
 
 #: configuredialog.cpp:4840
 msgid "Deprecated Kolab1 (iCal/vCard)"
@@ -2899,8 +2864,8 @@ msgstr "&Ocultar las carpetas de groupware"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Cuando está marcado, no verá las carpetas del recurso IMAP en el árbol de "
 "carpetas."
@@ -2911,8 +2876,8 @@ msgstr "M&ostrar sólo las carpetas de groupware para esta cuenta"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Cuando esté marcado, no verá las carpetas normales de correo en el árbol de "
 "carpetas para la cuenta configurada para groupware."
@@ -2972,24 +2937,23 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Microsoft Outlook, cuando se utiliza en combinación con un servidor Microsoft "
-"Exchange, tiene un problema para entender los correos de groupware que siguen "
-"los estándares. Active esta opción para enviar invitaciones de groupware que "
-"pueda entender Microsoft Exchange."
+"Microsoft Outlook, cuando se utiliza en combinación con un servidor "
+"Microsoft Exchange, tiene un problema para entender los correos de groupware "
+"que siguen los estándares. Active esta opción para enviar invitaciones de "
+"groupware que pueda entender Microsoft Exchange."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Nombrado de adjuntos compatible con Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Envío automático de invitaciones"
@@ -3004,24 +2968,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Las invitaciones se suelen enviar como adjuntos al correo. Esta opción le "
-"pemite enviar los correos de invitación en el texto del correo, necesario para "
-"enviar invitaciones y respuestas para Microsoft Outlook."
-"<br>Pero, si lo hace, el texto que producirá no lo podran leer los programas de "
-"correo así que la gente que tenga programas de correo electrónico que no "
-"entiendan las invitaciones, la apariencia del mensaje será bastante poco "
-"adecuada."
-"<br>Aún así, la gente que tenga programas de correo electrónico que no "
-"entiendan las invitaciones podrán trabajar.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Las invitaciones se suelen enviar como adjuntos al correo. Esta opción "
+"le pemite enviar los correos de invitación en el texto del correo, necesario "
+"para enviar invitaciones y respuestas para Microsoft Outlook.<br>Pero, si lo "
+"hace, el texto que producirá no lo podran leer los programas de correo así "
+"que la gente que tenga programas de correo electrónico que no entiendan las "
+"invitaciones, la apariencia del mensaje será bastante poco adecuada.<br>Aún "
+"así, la gente que tenga programas de correo electrónico que no entiendan las "
+"invitaciones podrán trabajar.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3125,30 +3088,28 @@ msgstr "Reenviar"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí puede añadir, editar y eliminar las plantillas personalizadas para "
-"mensajes al escribir una respuesta o al reenviar un mensaje. Cree la plantilla "
-"personalizada seleccionándola con el menú del botón derecho del ratón o con el "
-"menú de la barra de herramientas. También puede definir una combinación de "
-"teclas para acceder más rápido a las operaciones con la plantilla.</p>"
-"<p>Las  plantillas de mensaje admiten órdenes de sustitución. Puede teclearlas "
-"o seleccionarlas del menú <i>Insertar orden</i>.</p>"
-"<p>Hay cuatro tipos de plantillas personalizadas: se usan para <i>Responder</i>"
-", <i>Responder a todos</i>, <i>Reenviar</i> y <i>Universal</i>"
-", que se puede usar para toda clase de operaciones. No puede asignar un acceso "
-"rápido de teclado a las plantillas del tipo <i>Universal</i>.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Aquí puede añadir, editar y eliminar las plantillas personalizadas "
+"para mensajes al escribir una respuesta o al reenviar un mensaje. Cree la "
+"plantilla personalizada seleccionándola con el menú del botón derecho del "
+"ratón o con el menú de la barra de herramientas. También puede definir una "
+"combinación de teclas para acceder más rápido a las operaciones con la "
+"plantilla.</p><p>Las  plantillas de mensaje admiten órdenes de sustitución. "
+"Puede teclearlas o seleccionarlas del menú <i>Insertar orden</i>.</p><p>Hay "
+"cuatro tipos de plantillas personalizadas: se usan para <i>Responder</i>, "
+"<i>Responder a todos</i>, <i>Reenviar</i> y <i>Universal</i>, que se puede "
+"usar para toda clase de operaciones. No puede asignar un acceso rápido de "
+"teclado a las plantillas del tipo <i>Universal</i>.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3165,15 +3126,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3223,8 +3184,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"No hay destinatarios en su lista. Seleccione algunos destinatarios y vuelva a "
-"intentarlo."
+"No hay destinatarios en su lista. Seleccione algunos destinatarios y vuelva "
+"a intentarlo."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3239,8 +3200,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Ya existe una lista de distribución con el nombre <b>%1</b>"
-". Haga el favor de elegir un nombre distinto.</qt>"
+"<qt>Ya existe una lista de distribución con el nombre <b>%1</b>. Haga el "
+"favor de elegir un nombre distinto.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3248,8 +3209,8 @@ msgstr "Editar con:"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3393,7 +3354,8 @@ msgstr "Se canceló la eliminación de mensajes antiguos de la carpeta %1."
 #: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr ""
-"Se canceló el movimiento de mensajes antiguos de la carpeta %1 a la carpeta %2."
+"Se canceló el movimiento de mensajes antiguos de la carpeta %1 a la carpeta "
+"%2."
 
 #: expirypropertiesdialog.cpp:31
 msgid "Mail Expiry Properties"
@@ -3427,8 +3389,8 @@ msgstr "Eliminar permanentemente"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Aviso: La acción de caducidad se aplicará inmediatamente después de confirmar "
-"las opciones."
+"Aviso: La acción de caducidad se aplicará inmediatamente después de "
+"confirmar las opciones."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3503,6 +3465,11 @@ msgstr "Seleccionar filtros"
 msgid "Filters"
 msgstr "Filtros"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Seleccionar todo el texto"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3532,11 +3499,11 @@ msgstr "Registrar actividades de fi&ltrado"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Puede activar y desactivar el registro de las actividades de filtrado aquí. Por "
-"supuesto, el registro de los datos se recopila y se muestra sólo si está "
+"Puede activar y desactivar el registro de las actividades de filtrado aquí. "
+"Por supuesto, el registro de los datos se recopila y se muestra sólo si está "
 "activo."
 
 #: filterlogdlg.cpp:83
@@ -3553,16 +3520,17 @@ msgstr "Registrar evaluación de &reglas de filtrado"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Puede controlar la realimentación del registro relativa a la evaluación de las "
-"reglas de filtrado de los filtros que se aplican: si tiene esta opción marcada, "
-"se le dará realimentación detallada de cada regla de filtrado individual. Si "
-"no, sólo se le dará información sobre el resultado de la evaluación de todas "
-"las reglas de un solo filtro."
+"Puede controlar la realimentación del registro relativa a la evaluación de "
+"las reglas de filtrado de los filtros que se aplican: si tiene esta opción "
+"marcada, se le dará realimentación detallada de cada regla de filtrado "
+"individual. Si no, sólo se le dará información sobre el resultado de la "
+"evaluación de todas las reglas de un solo filtro."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3582,15 +3550,16 @@ msgstr "ilimitado"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "La recopilación de los datos del registro usa memoria para almacenar "
-"temporalmente los datos. Aquí puede limitar la cantidad máxima de memoria que "
-"se vaya a usar. Si el tamaño de los datos recopilados excede este límite, los "
-"datos más antiguos se descartarán hasta que no se supere el límite."
+"temporalmente los datos. Aquí puede limitar la cantidad máxima de memoria "
+"que se vaya a usar. Si el tamaño de los datos recopilados excede este "
+"límite, los datos más antiguos se descartarán hasta que no se supere el "
+"límite."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3600,7 +3569,7 @@ msgstr ""
 "No se pudo escribir en el archivo %1:\n"
 "«%2» es la descripción detallada del error."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Error de KMail"
@@ -3641,13 +3610,13 @@ msgstr "Identificador de &usuario:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"El identificador de usuario es el login del usuario en el servidor IMAP. Puede "
-"ser un simple nombre de usuario o la dirección de correo-e completa del "
-"servidor. El login de su propia cuenta del servidor le dirá cuál es."
+"El identificador de usuario es el login del usuario en el servidor IMAP. "
+"Puede ser un simple nombre de usuario o la dirección de correo-e completa "
+"del servidor. El login de su propia cuenta del servidor le dirá cuál es."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3698,10 +3667,11 @@ msgstr "No tiene permiso de lectura/escritura sobre su carpeta papelera."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Información aún no recuperada del servidor. Use «Comprobar correo», por favor."
+"Información aún no recuperada del servidor. Use «Comprobar correo», por "
+"favor."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3711,8 +3681,7 @@ msgstr "Error: cuenta IMAP no definida para esta carpeta"
 msgid "Connecting to server %1, please wait..."
 msgstr "Conectando al servidor %1. Espere, por favor ..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Error al conectar al servidor %1"
@@ -3740,8 +3709,8 @@ msgstr "Añadir permisos"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "¿Está seguro de que quiere eliminar sus propios permisos para esta carpeta? "
 "Tras esto, no se le permitirá acceder a ella."
@@ -3775,7 +3744,7 @@ msgstr "Uso:"
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Carpetas locales"
@@ -3799,19 +3768,19 @@ msgstr "Seleccionar un acceso rápido para la carpeta"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Para seleccionar una tecla o una combinación de teclas para seleccionar la "
-"carpeta actual, haga clic sobre el botón de abajo y luego pulse la tecla o las "
-"teclas que quiera asociar con esta carpeta.</qt>"
+"<qt>Para seleccionar una tecla o una combinación de teclas para seleccionar "
+"la carpeta actual, haga clic sobre el botón de abajo y luego pulse la tecla "
+"o las teclas que quiera asociar con esta carpeta.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr ""
-"El acceso rápido seleccionado ya se está usando. Seleccione uno distinto, por "
-"favor."
+"El acceso rápido seleccionado ya se está usando. Seleccione uno distinto, "
+"por favor."
 
 #: foldertreebase.cpp:85
 msgid "&Move Here"
@@ -3827,13 +3796,23 @@ msgstr "C&ancelar"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>La carpeta que ha eliminado estaba asociada con la cuenta <b>%1</b>"
-", que le entregaba el correo. La carpeta a la que la cuenta entrega el correo "
-"nuevo se ha vuelto a definir como la carpeta principal de correo entrante.</qt>"
+"<qt>La carpeta que ha eliminado estaba asociada con la cuenta <b>%1</b>, que "
+"le entregaba el correo. La carpeta a la que la cuenta entrega el correo "
+"nuevo se ha vuelto a definir como la carpeta principal de correo entrante.</"
+"qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Total: %2<br>Sin leer: %3<br>Tamaño: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Cuota: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3956,69 +3935,17 @@ msgstr "Estado de correo basura:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>j"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>M<br>e<br>n<br>s<br>a<br>j<br>e<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>j"
-"<br>e"
-"<br> "
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>M<br>e<br>n<br>s<br>a<br>j<br>e<br> <br>N<br>o<br> "
+"<br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4030,18 +3957,13 @@ msgstr "S&u nombre:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Su nombre</h3>"
-"<p>Este campo debería contener su nombre, tal y como le gustaría que apareciera "
-"en la cabecera del correo-e que envíe.</p>"
-"<p>Si lo deja en blanco, su nombre real no aparecerá. Sólo se mostrará su "
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
+msgstr ""
+"<qt><h3>Su nombre</h3><p>Este campo debería contener su nombre, tal y como "
+"le gustaría que apareciera en la cabecera del correo-e que envíe.</p><p>Si "
+"lo deja en blanco, su nombre real no aparecerá. Sólo se mostrará su "
 "dirección de correo-e.</p></qt>"
 
 #: identitydialog.cpp:135
@@ -4050,17 +3972,13 @@ msgstr "Organi&zación:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organización</h3>"
-"<p>Este campo debería contener el nombre de su organización si es que quiere "
-"que se muestre en la cabecera de cada correo-e que envíe.</p>"
-"<p>Es seguro (y habitual) dejar este campo vacío.</p></qt>"
+"<qt><h3>Organización</h3><p>Este campo debería contener el nombre de su "
+"organización si es que quiere que se muestre en la cabecera de cada correo-e "
+"que envíe.</p><p>Es seguro (y habitual) dejar este campo vacío.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4069,20 +3987,16 @@ msgstr "Dir&ección correo-e:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Dirección de correo-e</h3>"
-"<p>Este campo debería contener su dirección de correo-e completa.</p>"
-"<p>Si deja este campo en blanco, o lo rellena con información incorrecta, la "
-"gente tendrá problemas para responderle.</p></qt>"
+"<qt><h3>Dirección de correo-e</h3><p>Este campo debería contener su "
+"dirección de correo-e completa.</p><p>Si deja este campo en blanco, o lo "
+"rellena con información incorrecta, la gente tendrá problemas para "
+"responderle.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4091,21 +4005,12 @@ msgstr "Dir&ección correo-e:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4130,21 +4035,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>La clave OpenPGP que elija aquí se usará para firmar digitalmente los "
-"mensajes. También puede usar claves GnuPG.</p>"
-"<p>Puede dejar este campo vacío, pero entonces KMail no podrá firmar "
-"digitalmente los correos-e. Las funciones de correo más frecuentes no se verán "
-"afectadas.</p> "
-"<p>Puede obtener más información sobre las claves en <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>La clave OpenPGP que elija aquí se usará para firmar digitalmente los "
+"mensajes. También puede usar claves GnuPG.</p><p>Puede dejar este campo "
+"vacío, pero entonces KMail no podrá firmar digitalmente los correos-e. Las "
+"funciones de correo más frecuentes no se verán afectadas.</p> <p>Puede "
+"obtener más información sobre las claves en <a>http://www.gnupg.org</a></p></"
+"qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4156,32 +4058,28 @@ msgstr "Su clave de cifrado OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Seleccione la clave OpenPGP que se debe usar para cifrarse los mensajes y para "
-"la característica del editor «Adjuntar mi clave pública»."
+"Seleccione la clave OpenPGP que se debe usar para cifrarse los mensajes y "
+"para la característica del editor «Adjuntar mi clave pública»."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>La clave OpenPGP que elija aquí se usará para cifrar los mensajes para sí "
-"mismo y para la característica del editor «Adjuntar mi clave pública». También "
-"puede usar claves GnuPG.</p>"
-"<p>Puede dejar este campo vacío, pero entonces KMail no podrá cifrar las copias "
-"de los mensajes salientes que usen OpenPGP. Las funciones de correo más "
-"frecuentes no se verán afectadas.</p> "
-"<p>Puede obtener más información sobre las claves en <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>La clave OpenPGP que elija aquí se usará para cifrar los mensajes "
+"para sí mismo y para la característica del editor «Adjuntar mi clave "
+"pública». También puede usar claves GnuPG.</p><p>Puede dejar este campo "
+"vacío, pero entonces KMail no podrá cifrar las copias de los mensajes "
+"salientes que usen OpenPGP. Las funciones de correo más frecuentes no se "
+"verán afectadas.</p> <p>Puede obtener más información sobre las claves en "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4196,22 +4094,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Seleccione el certificado S/MIME que se debe usar para firmar digitalmente sus "
-"mensajes."
+"Seleccione el certificado S/MIME que se debe usar para firmar digitalmente "
+"sus mensajes."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El certificado S/MIME (X.509) que elija aquí se usará para firmar "
-"digitalmente sus mensajes.</p> Puede dejarlo vacío, pero KMail no podrá firmar "
-"digitalmente los correos electrónicos usando S/MIME.Las funciones de correo más "
-"frecuentes no se verán afectadas.</p></qt>"
+"<qt><p>El certificado S/MIME (X.509) que elija aquí se usará para firmar "
+"digitalmente sus mensajes.</p> Puede dejarlo vacío, pero KMail no podrá "
+"firmar digitalmente los correos electrónicos usando S/MIME.Las funciones de "
+"correo más frecuentes no se verán afectadas.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4223,29 +4119,27 @@ msgstr "Su certificado de cifrado S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Seleccione el certificado S/MIME que se debe usar para cifrarse los mensajes y "
-"para la característica del editor «Adjuntar mi certificado»."
+"Seleccione el certificado S/MIME que se debe usar para cifrarse los mensajes "
+"y para la característica del editor «Adjuntar mi certificado»."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>El certificado S/MIME que elija aquí se usará para cifrar los mensajes para "
-"sí mismo y para la característica del editor «Adjuntar mi certificado».</p> "
-"<p>Puede dejar este campo vacío, pero entonces KMail no podrá cifrar las copias "
-"de sus mensajes salientes usando S/MIME. Las funciones de correo más frecuentes "
-"no se verán afectadas.</p> "
-"<p>Puede obtener más información sobre las claves en <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>El certificado S/MIME que elija aquí se usará para cifrar los "
+"mensajes para sí mismo y para la característica del editor «Adjuntar mi "
+"certificado».</p> <p>Puede dejar este campo vacío, pero entonces KMail no "
+"podrá cifrar las copias de sus mensajes salientes usando S/MIME. Las "
+"funciones de correo más frecuentes no se verán afectadas.</p> <p>Puede "
+"obtener más información sobre las claves en <a>http://www.gnupg.org</a></p></"
+"qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4265,25 +4159,21 @@ msgstr "Dirección res&ponder-a:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Dirección de respuesta</h3>"
-"<p>Esto fija la cabecera <tt>Reply-to:</tt> (n.t. Responder a) para que tenga "
-"una dirección de correo-e distinta a la dirección habitual del <tt>From:</tt> "
-"(n.t. De).</p>"
-"<p>Puede ser útil cuando tenga un grupo de gente trabajando junta con funciones "
-"similares. Por ejemplo, podría querer que cualquier correo-e se enviara con su "
-"dirección en el campo <tt>From:</tt> (n.t. De), y que cualquier respuesta fuera "
-"a la dirección de un grupo.</p></p>En caso de duda, deje este campo vacío.</p>"
-"</qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Dirección de respuesta</h3><p>Esto fija la cabecera <tt>Reply-to:</"
+"tt> (n.t. Responder a) para que tenga una dirección de correo-e distinta a "
+"la dirección habitual del <tt>From:</tt> (n.t. De).</p><p>Puede ser útil "
+"cuando tenga un grupo de gente trabajando junta con funciones similares. Por "
+"ejemplo, podría querer que cualquier correo-e se enviara con su dirección en "
+"el campo <tt>From:</tt> (n.t. De), y que cualquier respuesta fuera a la "
+"dirección de un grupo.</p></p>En caso de duda, deje este campo vacío.</p></"
+"qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4291,26 +4181,20 @@ msgstr "Direcciones &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Direcciones BCC (Con Copia Oculta)</h3>"
-"<p> Las direcciones que introduzca aquí se añadiran a cada mensaje saliente "
-"cuando envíe correo con esta identidad. No serán visibles para otros "
-"destinatarios.</p>"
-"<p>Se suele usar para enviar una copia de cada mensajes a otra de sus "
-"cuentas.</p>"
-"<p>Para indicar más de una dirección, use una coma para separar la lista de "
-"destinatarios de BCC.</p>"
-"<p>En caso de duda, deje vacío este campo.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Direcciones BCC (Con Copia Oculta)</h3><p> Las direcciones que "
+"introduzca aquí se añadiran a cada mensaje saliente cuando envíe correo con "
+"esta identidad. No serán visibles para otros destinatarios.</p><p>Se suele "
+"usar para enviar una copia de cada mensajes a otra de sus cuentas.</"
+"p><p>Para indicar más de una dirección, use una coma para separar la lista "
+"de destinatarios de BCC.</p><p>En caso de duda, deje vacío este campo.</p></"
+"qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4348,7 +4232,7 @@ msgstr "&Firma"
 msgid "&Picture"
 msgstr "Ima&gen"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Dirección de correo-e no válida"
 
@@ -4364,18 +4248,20 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Una de las claves de firmado OpenPGP configurado no tiene ningún ID de usuario "
-"con la dirección de correo electrónico configurada para esta identidad (%1).\n"
+"Una de las claves de firmado OpenPGP configurado no tiene ningún ID de "
+"usuario con la dirección de correo electrónico configurada para esta "
+"identidad (%1).\n"
 "Esto podría dar como resultado mensajes de advertencia en el lado receptor "
 "cuando se intenten verificar las firmas hechas con esta configuración."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Una de las claves de firmado OpenPGP configurado no tiene ningún ID de usuario "
-"con la dirección de correo electrónico configurada para esta identidad (%1)."
+"Una de las claves de firmado OpenPGP configurado no tiene ningún ID de "
+"usuario con la dirección de correo electrónico configurada para esta "
+"identidad (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4385,8 +4271,8 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 "Uno de los certificados de firmado S/MIME configurado no tiene ningún ID de "
-"usuario con la dirección de correo electrónico configurada para esta identidad "
-"(%1).\n"
+"usuario con la dirección de correo electrónico configurada para esta "
+"identidad (%1).\n"
 "Esto podría dar como resultado mensajes de advertencia en el lado receptor "
 "cuando se intenten verificar las firmas hechas con esta configuración."
 
@@ -4396,8 +4282,8 @@ msgid ""
 "configured email address for this identity (%1)."
 msgstr ""
 "Uno de los certificados de cifrado S/MIME configurado no tiene ningún ID de "
-"usuario con la dirección de correo electrónico configurada para esta identidad "
-"(%1)."
+"usuario con la dirección de correo electrónico configurada para esta "
+"identidad (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4432,13 +4318,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Ya no existe la carpeta de plantillas predefinidas para la identidad «%1». Por "
-"tanto, se utilizará la carpeta predefinida para plantillas."
+"Ya no existe la carpeta de plantillas predefinidas para la identidad «%1». "
+"Por tanto, se utilizará la carpeta predefinida para plantillas."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Predeterminada)"
 
@@ -4485,16 +4371,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "La configuración se migró automáticamente, pero debería verificar la "
 "configuración de su cuenta."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "No fue posible migrar automáticamente su configuración. Haga el favor de "
 "verificar su configuración."
@@ -4535,17 +4421,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Error: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"La conexión al servidor %1 se cerró de forma inesperada o debido a un exceso de "
-"tiempo de inactividad. Se restablecerá automáticamente si es posible."
+"La conexión al servidor %1 se cerró de forma inesperada o debido a un exceso "
+"de tiempo de inactividad. Se restablecerá automáticamente si es posible."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4695,14 +4586,14 @@ msgstr "Archivos de la lista"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4731,227 +4622,182 @@ msgstr "Clave de cifrado no utilizable"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de firma S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de firma S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>del certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>del certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>del certificado S/"
+"MIME</p><p align=center><b>%1</b> (número de serie %2)</p><p>caduca antes de "
+"un día.</p>\n"
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>del certificado S/"
+"MIME</p><p align=center><b>%1</b> (número de serie %2)</p><p>caduca antes de "
+"%n días.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de firma S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de firma S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de un día.</p>\n"
-"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de un día.</p>\n"
+"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de un día.</p>\n"
-"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de un día.</p>\n"
+"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>El certificado S/MIME para</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de un día.</p>\n"
-"<p>El certificado S/MIME</p><p align=cente><b>%1</b> (número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>El certificado S/MIME para</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca en menos de un día.</p>\n"
+"<p>El certificado S/MIME</p><p align=cente><b>%1</b> (número de serie %2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4965,216 +4811,171 @@ msgstr "El certificado S/MIME caduca pronto"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>Su clave de firmado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> "
-"(id de clave 0x%2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>Su clave de cifrado OpenPGP</p><p align=center><b>%1</b> (id de clave 0x"
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</p>"
-"<p>caduca antes de %n días.</p>"
+"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>La clave OpenPGP</p><p align=center><b>%1</b> (id de clave 0x%2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de firma S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de firma S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>de su certificado "
+"de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>del certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>del certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>del certificado S/"
+"MIME</p><p align=center><b>%1</b> (número de serie %2)</p><p>caduca antes de "
+"un día.</p>\n"
+"<p>El certificado raíz</p><p align=center><b>%3</b></p><p>del certificado S/"
+"MIME</p><p align=center><b>%1</b> (número de serie %2)</p><p>caduca antes de "
+"%n días.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de firma S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de firma S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de un día.</p>\n"
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de un día.</p>\n"
-"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p>"
-"<p>de su certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca antes de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de un día.</p>\n"
+"<p>El certificado CA intermedio</p><p align=center><b>%3</b></p><p>de su "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca antes de %n días.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de un día.</p>\n"
-"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de un día.</p>\n"
+"<p>Su certificado de firma S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de un día.</p>\n"
-"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de un día.</p>\n"
+"<p>Su certificado de cifrado S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>El certificado S/MIME para</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de un día.</p>\n"
-"<p>El certificado S/MIME</p><p align=cente><b>%1</b> (número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>El certificado S/MIME para</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca en menos de un día.</p>\n"
+"<p>El certificado S/MIME</p><p align=cente><b>%1</b> (número de serie %2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5186,17 +4987,19 @@ msgstr "El certificado S/MIME caduca pronto"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Uno o más de sus claves de cifrado OpenPGP o los certificados S/MIME no se "
 "pueden usar para cifrado. Vuelva a configurar sus claves de cifrado y los "
-"certificados para esta identidad en el cuadro de diálogo de las identidades.\n"
-"Si elige continuar, y las claves se van a necesitar más adelante, se le pedirá "
-"que indique las claves que va a usar."
+"certificados para esta identidad en el cuadro de diálogo de las "
+"identidades.\n"
+"Si elige continuar, y las claves se van a necesitar más adelante, se le "
+"pedirá que indique las claves que va a usar."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5214,8 +5017,8 @@ msgstr ""
 "S/MIME no se pueden usar para firmado. Vuelva a configurar sus claves de "
 "cifrado y los certificados para esta identidad en el cuadro de diálogo de "
 "configuración de las identidades.\n"
-"Si elige continuar, y las claves se van a necesitar más adelante, se le pedirá "
-"que indique las claves que va a usar."
+"Si elige continuar, y las claves se van a necesitar más adelante, se le "
+"pedirá que indique las claves que va a usar."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5225,45 +5028,48 @@ msgstr "Claves de cifrado no utilizables"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "El examen de las preferencias de cifrado de los destinatarios indicó que el "
-"mensaje se debería cifrar usando OpenPGP, al menos para algunos destinatarios.\n"
-"Sin embargo, no ha configurado claves de cifrado OpenPGP fiables válidas para "
-"esta identidad.\n"
-"Puede continuar sin cifrar para usted mismo, pero tenga en cuenta que no podrá "
-"leer sus propios mensajes si así lo hace."
+"mensaje se debería cifrar usando OpenPGP, al menos para algunos "
+"destinatarios.\n"
+"Sin embargo, no ha configurado claves de cifrado OpenPGP fiables válidas "
+"para esta identidad.\n"
+"Puede continuar sin cifrar para usted mismo, pero tenga en cuenta que no "
+"podrá leer sus propios mensajes si así lo hace."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "El examen de las preferencias de cifrado de los destinatarios indicó que el "
-"mensaje se debería cifrar usando S/MIME, al menos para algunos destinatarios.\n"
+"mensaje se debería cifrar usando S/MIME, al menos para algunos "
+"destinatarios.\n"
 "Sin embargo, no ha configurado claves de cifrado S/MIME fiables válidas para "
 "esta identidad.\n"
-"Puede continuar sin cifrar para usted mismo, pero tenga en cuenta que no podrá "
-"leer sus propios mensajes si así lo hace."
+"Puede continuar sin cifrar para usted mismo, pero tenga en cuenta que no "
+"podrá leer sus propios mensajes si así lo hace."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
 "El examen de las preferencias de firmado de los destinatarios indicó que el "
-"mensaje se debería cifrar usando OpenPGP, al menos para algunos destinatarios.\n"
-"Sin embargo, no ha configurado claves de firmado OpenPGP fiables válidas para "
-"esta identidad."
+"mensaje se debería cifrar usando OpenPGP, al menos para algunos "
+"destinatarios.\n"
+"Sin embargo, no ha configurado claves de firmado OpenPGP fiables válidas "
+"para esta identidad."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5271,13 +5077,14 @@ msgstr "No firmar con OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "El examen de las preferencias de cifrado de los destinatarios indicó que el "
-"mensaje se debería cifrar usando S/MIME, al menos para algunos destinatarios.\n"
+"mensaje se debería cifrar usando S/MIME, al menos para algunos "
+"destinatarios.\n"
 "Sin embargo, no ha configurado claves de firmado S/MIME fiables válidas para "
 "esta identidad."
 
@@ -5291,8 +5098,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"El examen de las preferencias de firmado del destinatario no mostró ningún tipo "
-"de firma entre las claves de firmado que tiene a su disposición.\n"
+"El examen de las preferencias de firmado del destinatario no mostró ningún "
+"tipo de firma entre las claves de firmado que tiene a su disposición.\n"
 "¿Enviar el mensaje sin firmar?"
 
 #: keyresolver.cpp:1335
@@ -5301,11 +5108,11 @@ msgstr "No es posible firmar"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"No seleccionó una clave de cifrado para usted mismo (cifrar para uno mismo). No "
-"podrá descifrar sus propios mensajes si los cifra."
+"No seleccionó una clave de cifrado para usted mismo (cifrar para uno mismo). "
+"No podrá descifrar sus propios mensajes si los cifra."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5321,13 +5128,13 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"No seleccionó una clave de cifrado para el destinatario de este mensaje. Por lo "
-"tanto, el mensaje no se cifrará."
+"No seleccionó una clave de cifrado para el destinatario de este mensaje. Por "
+"lo tanto, el mensaje no se cifrará."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "No seleccionó una clave de cifrado para alguno de los destinatarios de este "
 "mensaje. Por lo tanto, el mensaje no se cifrará."
@@ -5374,11 +5181,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "No hay ninguna clave de cifrado válida y de confianza para «%1».\n"
 "\n"
@@ -5428,10 +5235,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Error crítico: No se puede recoger el correo: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Fallo al añadir mensaje:\n"
+msgid "Failed to add message:\n"
+msgstr "Fallo al añadir mensaje:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5521,6 +5326,51 @@ msgstr "IMAP &desconectado"
 msgid "&Maildir mailbox"
 msgstr "Dire&ctorio del buzón"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Poner el asunto del mensaje"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Enviar CC: a «dirección»"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Enviar BCC: a «dirección»"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Añadir «cabecera» al mensaje"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Leer el cuerpo-del-mensaje desde «archivo»"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Poner cuerpo del mensaje"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Añadir un adjunto al mensaje. Puede repetirse."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Comprobar sólo correo nuevo"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Abrir sólo la ventana del editor"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Ver el archivo de mensaje dado"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Enviar mensaje a «dir.» respuesta adjunto con el arch. al que apunta la «URL»"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Correo"
@@ -5563,8 +5413,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail va a crear ahora las carpetas necesarias para groupware como subcarpetas "
-"de %1. Si no lo quiere, cancele y se desactivará el recurso IMAP."
+"KMail va a crear ahora las carpetas necesarias para groupware como "
+"subcarpetas de %1. Si no lo quiere, cancele y se desactivará el recurso IMAP."
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5578,13 +5428,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail encontró las siguientes carpetas de groupware en %1, y necesita "
-"realizar las siguientes operaciones: %2"
-"<br>Si no lo quiere, cancele y se desactivará el recurso IMAP"
+"realizar las siguientes operaciones: %2<br>Si no lo quiere, cancele y se "
+"desactivará el recurso IMAP"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5632,11 +5482,11 @@ msgstr "URL copiada al portapapeles."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>El archivo <b>%1</b> existe. ¿Desea reemplazarlo?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Guardar en archivo"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Reemplazar..."
 
@@ -5655,7 +5505,7 @@ msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 "El mensaje se ha eliminado mientras se estaba guardando. No se ha guardado."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5675,130 +5525,131 @@ msgstr "El archivo no tiene un mensaje"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "El archivo tiene varios mensajes. Sólo se mostrará el primero."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Este es un paquete MIME reenviado .El contenido del mensaje se encuentra en los "
-"adjuntos.\n"
+"Este es un paquete MIME reenviado .El contenido del mensaje se encuentra en "
+"los adjuntos.\n"
 "\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrando los mensajes"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrando el mensaje %1 de %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "¿No hay suficiente espacio en el disco?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mover a esta carpeta"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copiar a esta carpeta"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
-"Se ha detectado una cache IMAP dañada en la carpeta «%1». Se ha interrumpido la "
-"copia de los mensajes."
+"Se ha detectado una cache IMAP dañada en la carpeta «%1». Se ha interrumpido "
+"la copia de los mensajes."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Eliminando mensajes"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Abriendo URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>¿Realmente quiere ejecutar <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "No se encuentran adjuntos para guardar."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Guardar adjuntos como"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "adjunto.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "adjunto.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Ya existe un archivo llamado «%1». ¿Desea reemplazarlo?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "El archivo ya existe"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "S&obreescribir"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"La parte %1 del mensaje está cifrada. ¿Quiere mantener el cifrado al guardarlo?"
+"La parte %1 del mensaje está cifrada. ¿Quiere mantener el cifrado al "
+"guardarlo?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Pregunta KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Mantener el cifrado"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "No mantener"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "La parte %1 del mensaje está firmada. ¿Quiere mantener la firma al guardar?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Mantener la firma"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5807,78 +5658,79 @@ msgstr ""
 "No se pudo escribir el archivo %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "No se pudo escribir el archivo %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "No hay ninguna entrada en la libreta de direcciones para esta dirección de "
 "correo electrónico. Añádala a la libreta de direcciones y luego podrá añadir "
-"direcciones de mensajería instantánea usando su cliente de mensajería favorito."
+"direcciones de mensajería instantánea usando su cliente de mensajería "
+"favorito."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Más de una entrada de la libreta de direcciones usa esta dirección de "
-"correo-e:\n"
+"Más de una entrada de la libreta de direcciones usa esta dirección de correo-"
+"e:\n"
 " %1\n"
 " No es posible determinar con quién va a charlar."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "La dorsal de Chiasmus no ofrece la función «x-obtain-keys». Haga el favor de "
 "informar sobre este error."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Error en la dorsal de Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Valor de retorno inesperado de la dorsal de Chiasmus: la función "
-"«x-obtain-keys» no devolvió una lista de cadenas. Haga el favor de informar "
-"sobre este error."
+"Valor de retorno inesperado de la dorsal de Chiasmus: la función «x-obtain-"
+"keys» no devolvió una lista de cadenas. Haga el favor de informar sobre este "
+"error."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "No se ha encontrado ninguna clave. Haga el favor de verificar que se ha "
 "definido una ruta válida a las claves en la configuración de Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Selección de clave de cifrado de Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "La dorsal de Chiasmus no ofrece la función «x-decrypt». Haga el favor de "
 "informar de este error."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5886,19 +5738,19 @@ msgstr ""
 "La función «x-decrypt» no acepta los parámetros esperados. Haga el favor de "
 "informar de este error."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Error de descifrado de Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Valor de retorno inesperado en la dorsal de Chiasmus: la función «x-decrypt» no "
-"devolvió un vector de bytes. Haga el favor de informar de este error."
+"Valor de retorno inesperado en la dorsal de Chiasmus: la función «x-decrypt» "
+"no devolvió un vector de bytes. Haga el favor de informar de este error."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5908,7 +5760,7 @@ msgstr ""
 "Para: %2\n"
 "Asunto: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Correo: %1"
@@ -6007,7 +5859,7 @@ msgstr "Tamaño"
 msgid "Encoding"
 msgstr "Codificando"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comprimir"
 
@@ -6019,7 +5871,7 @@ msgstr "Cifrar"
 msgid "Sign"
 msgstr "Firma"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nombre del adjunto:"
 
@@ -6041,10 +5893,11 @@ msgstr "Destinatarios principales"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Las direcciones de correo electrónico que ponga en este campo recibirán una "
-"copia del correo electrónico.</qt>"
+"<qt>Las direcciones de correo electrónico que ponga en este campo recibirán "
+"una copia del correo electrónico.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6053,14 +5906,14 @@ msgstr "Destinatarios adicionales"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Las direcciones de correo-e que ponga en este campo recibirán una copia del "
-"correo-e. Técnicamente, es lo mismo que poner todas las direcciones en el campo "
-"<b>Para:</b>, pero se diferencia en que normalmente el destinatario de la copia "
-"de carbón (CC) es un oyente, no el destinatario principal.</qt>"
+"<qt>Las direcciones de correo-e que ponga en este campo recibirán una copia "
+"del correo-e. Técnicamente, es lo mismo que poner todas las direcciones en "
+"el campo <b>Para:</b>, pero se diferencia en que normalmente el destinatario "
+"de la copia de carbón (CC) es un oyente, no el destinatario principal.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6068,13 +5921,12 @@ msgstr "Destinatarios ocultos"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>En esencia, lo mismo que el campo <b>Con copia:</b>"
-", pero se diferencia en que todos los demás destinatarios no ven quiénes son "
-"los receptores de una copia oculta.</qt>"
+"<qt>En esencia, lo mismo que el campo <b>Con copia:</b>, pero se diferencia "
+"en que todos los demás destinatarios no ven quiénes son los receptores de "
+"una copia oculta.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6084,7 +5936,7 @@ msgstr "En&viar correo"
 msgid "&Send Mail Via"
 msgstr "En&viar correo por"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Enviar d&espués"
@@ -6149,8 +6001,7 @@ msgstr "Elimina&r caracteres de citado"
 msgid "Cl&ean Spaces"
 msgstr "Quitar &espacios"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Tipogra&fía de ancho fijo"
@@ -6292,31 +6143,31 @@ msgstr "Formato de mensaje &cifrado"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Estándar"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Lista de viñetas (disco)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Lista de viñetas (círculo)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Lista de viñetas (cuadrado)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Lista ordenada (decimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Lista ordenada (letras minúsculas)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Lista ordenada (letras mayúsculas)"
 
@@ -6400,16 +6251,16 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Volver a guardar este mensaje en la carpeta Plantillas. En este caso, se puede "
-"utilizar más tarde."
+"Volver a guardar este mensaje en la carpeta Plantillas. En este caso, se "
+"puede utilizar más tarde."
 
 #: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Guarda este mensaje en la carpeta «Borradores». Posteriormente, se podrá editar "
-"y enviar."
+"Guarda este mensaje en la carpeta «Borradores». Posteriormente, se podrá "
+"editar y enviar."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6421,63 +6272,62 @@ msgstr "Cerrar el editor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"El mensaje que ha compuesto parece hacer referencia a un archivo adjunto, pero "
-"no ha adjuntado nada.\n"
+"El mensaje que ha compuesto parece hacer referencia a un archivo adjunto, "
+"pero no ha adjuntado nada.\n"
 "¿Quiere adjuntar un archivo a su mensaje?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Recordatorio de archivo adjunto"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Enviar &tal cual"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail no pudo reconocer la ubicación del adjunto (%1).</p>"
-"<p>Tiene que especificar la ruta completa si desea adjuntar un archivo.</p></qt>"
+"<qt><p>KMail no pudo reconocer la ubicación del adjunto (%1).</p><p>Tiene "
+"que especificar la ruta completa si desea adjuntar un archivo.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Su administrador no permite adjuntar archivos mayores de %1 MB.</p>"
+"<qt><p>Su administrador no permite adjuntar archivos mayores de %1 MB.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Adjuntar archivo"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Adjuntar"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Insertar archivo"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Insertar archivo"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ocurrió un error al intentar exportar la clave del motor:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Ocurrió un error al intentar exportar la clave del motor:</p><p><b>"
+"%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6516,96 +6366,106 @@ msgid ""
 "View"
 msgstr "Ver"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Editar..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Editar con..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Gu&ardar como..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Propiedades"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Adjuntar..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail no pudo comprimir el archivo."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "El archivo comprimido es mayor que el original. ¿Quiere mantener el original?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Mantener"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail no pudo descomprimir el archivo."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Guardar adjunto como"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Añadir como texto"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Añadir como adjunto"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "¿Pegar como texto o adjunto?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "sin nombre"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ha solicitado que se cifren los mensajes para sí mismo, pero la identidad "
-"seleccionada actualmente no tiene definida una clave de cifrado (OpenPGP o "
-"S/MIME) para que pueda usarla.</p>"
-"<p>Haga el favor de elegir las claves en la configuración de la identidad.</p>"
-"</qt>"
+"<qt><p>Ha solicitado que se cifren los mensajes para sí mismo, pero la "
+"identidad seleccionada actualmente no tiene definida una clave de cifrado "
+"(OpenPGP o S/MIME) para que pueda usarla.</p><p>Haga el favor de elegir las "
+"claves en la configuración de la identidad.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Clave de cifrado no definida"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Para poder firmar este mensaje, primero tiene que definir la clave de firma "
-"(OpenPGP o S/MIME) que se debe usar.</p>"
-"<p>Puede seleccionar la clave en la configuración de la identidad.</p></qt>"
+"<qt><p>Para poder firmar este mensaje, primero tiene que definir la clave de "
+"firma (OpenPGP o S/MIME) que se debe usar.</p><p>Puede seleccionar la clave "
+"en la configuración de la identidad.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Clave de firma no definida"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6613,165 +6473,163 @@ msgstr ""
 "KMail está en modo desconectado. Sus mensajes se mantendrán en la bandeja de "
 "salida hasta que se conecte."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Conectado/desconectado"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Debe introducir su dirección de correo electrónico en el campo De:. También "
 "debería configurar su dirección de correo electrónico para todas sus "
 "identidades, para que no tenga que indicarla para cada mensaje."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Debe especificar al menos un destinatario, bien en el campo Para: o bien como "
-"CC o BCC."
+"Debe especificar al menos un destinatario, bien en el campo Para: o bien "
+"como CC o BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Destinatario vacío. ¿Enviar el mensaje a pesar de ello?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "No se indicó destinatario"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "No escribió ningún asunto. ¿Enviamos el mensaje aun así?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "No se escribió asunto"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Enviar tal cual"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "E&specificar el asunto"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Man&tener el marcado, no firmar/cifrar"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Man&tener el marcado, no cifrar"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Man&tener el marcado, no firmar"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Firmar/Cifrar (eliminar el marcado)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Cifrar (eliminar el marcado)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Firmar (eliminar el marcado)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>No es posible el firmado/cifrado interno de mensajes HTML.</p>"
-"<p>¿quiere eliminar el marcado?</p></qt>"
+"<qt><p>No es posible el firmado/cifrado interno de mensajes HTML.</"
+"p><p>¿quiere eliminar el marcado?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "¿Firmar/cifrar el mensaje?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"No existe la carpeta de borradores o de plantillas para la identidad «%1». Se "
-"usará la carpeta de borradores o de plantillas predeterminada."
+"No existe la carpeta de borradores o de plantillas para la identidad «%1». "
+"Se usará la carpeta de borradores o de plantillas predeterminada."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Por favor, cree una cuenta para el envío y vuelva a intentarlo."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Acerca de mandar correo..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Enviar confirmación"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "En&viar ahora"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "No hay destinatarios"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinatarios adicionales"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Corrector ortográfico: activo"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Corrector ortográfico: inactivo"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Comprobación ortográfica cancelada."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Comprobación ortográfica parada."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Comprobación ortográfica completada."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Corrector ortográfico"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Haga el favor de configurar antes una dorsal para usar el cifrado Chiasmus.\n"
-"Puede hacerlo en la solapa de dorsales de cifrado de la página «Seguridad» en "
-"el cuadro de diálogo de configuración."
+"Puede hacerlo en la solapa de dorsales de cifrado de la página «Seguridad» "
+"en el cuadro de diálogo de configuración."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6779,31 +6637,31 @@ msgstr ""
 "Parece que se ha compilado libkleopatra sin soporte para Chiasmus. En este "
 "caso, podría querer recompilar libkleopatra con «--enable-chiasmus»."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "No hay configurada ninguna dorsal para Chiasmus"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "No se encontró ninguna clave de Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Selección de clave de cifrado para Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "El mensaje será firmado"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "El mensaje no será firmado"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "El mensaje será cifrado"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "El mensaje no será cifrado"
 
@@ -6852,8 +6710,8 @@ msgstr "Corrector ortográfico - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell no pudo arrancarse. Por favor asegúrese de que tiene ISpell o "
 "Aspell correctamente configurado y en su PATH."
@@ -6889,9 +6747,8 @@ msgstr "<qt>Demasiados filtros en la regla de filtrado <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 "<qt>Acción de filtro desconocida <b>%1</b> <b>en regla de filtrado <b>%2</b>."
 "<br>Se ignora.</qt>"
@@ -7114,160 +6971,132 @@ msgstr "Reproducir sonido"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Esta es la lista de filtros definidos. Se procesan de arriba a abajo.</p>"
-"<p>Pulse en cualquier filtro para editarlo usando los controles de la mitad "
-"derecha del cuadro.</p></qt>"
+"<qt><p>Esta es la lista de filtros definidos. Se procesan de arriba a abajo."
+"</p><p>Pulse en cualquier filtro para editarlo usando los controles de la "
+"mitad derecha del cuadro.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Haga clic en este botón para crear un filtro.</p>"
-"<p>Se insertará inmediatamente antes del que esté seleccionado en ese momento, "
-"pero puede cambiarlo más tarde.</p>"
-"<p>Si ha hecho clic accidentalmente sobre este botón, puede deshacer esta "
-"acción haciendo clic sobre el botón <em>Eliminar</em>.</p></qt>"
+"<qt><p>Haga clic en este botón para crear un filtro.</p><p>Se insertará "
+"inmediatamente antes del que esté seleccionado en ese momento, pero puede "
+"cambiarlo más tarde.</p><p>Si ha hecho clic accidentalmente sobre este "
+"botón, puede deshacer esta acción haciendo clic sobre el botón <em>Eliminar</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Haga clic en este botón para copiar un filtro.</p>"
-"<p>Si ha hecho clic accidentalmente sobre este botón, puede deshacer esta "
-"acción haciendo clic sobre el botón <em>Eliminar</em>.</p></qt>"
+"<qt><p>Haga clic en este botón para copiar un filtro.</p><p>Si ha hecho clic "
+"accidentalmente sobre este botón, puede deshacer esta acción haciendo clic "
+"sobre el botón <em>Eliminar</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pulse este botón para <em>eliminar</em> el filtro seleccionado de la "
-"lista.</p>"
-"<p>No hay forma de recuperar el filtro una vez eliminado, pero siemprepuede "
-"usted pulsar el botón <em>Cancelar</em> para deshacer los cambios.</p></qt>"
+"<qt><p>Pulse este botón para <em>eliminar</em> el filtro seleccionado de la "
+"lista.</p><p>No hay forma de recuperar el filtro una vez eliminado, pero "
+"siemprepuede usted pulsar el botón <em>Cancelar</em> para deshacer los "
+"cambios.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Haga clic en este botón para mover el filtro seleccionado hacia la zona <em>"
-"superior</em> de la lista de abajo.</p>"
-"<p>Es útil para determinar el orden en el que se aplican los filtros a los "
-"mensajes: El filtro de más arriba es el primero que se aplica.</p></qt>"
+"<qt><p>Haga clic en este botón para mover el filtro seleccionado hacia la "
+"zona <em>superior</em> de la lista de abajo.</p><p>Es útil para determinar "
+"el orden en el que se aplican los filtros a los mensajes: El filtro de más "
+"arriba es el primero que se aplica.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Haga clic sobre este botón para mover el filtro seleccionado en la lista "
-"superior hacia <em>arriba</em>.</p>"
-"<p>Esto es útil para determinar el orden en el que se filtran los mensajes: El "
-"filtro de más arriba se usa el primero.</p>"
-"<p>Si ha pulsado este botón accidentalmente, puede deshacer la acción pulsando "
-"en el botón <em>Abajo</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Haga clic sobre este botón para mover el filtro seleccionado en la "
+"lista superior hacia <em>arriba</em>.</p><p>Esto es útil para determinar el "
+"orden en el que se filtran los mensajes: El filtro de más arriba se usa el "
+"primero.</p><p>Si ha pulsado este botón accidentalmente, puede deshacer la "
+"acción pulsando en el botón <em>Abajo</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Haga clic sobre este botón para mover el filtro seleccionado en la lista "
-"superior hacia <em>abajo</em>.</p>"
-"<p>Esto es útil para determinar el orden en el que se filtran los mensajes: El "
-"filtro de más arriba se usa el primero.</p>"
-"<p>Si ha pulsado este botón accidentalmente, puede deshacer la acción pulsando "
-"en el botón <em>Arriba</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Haga clic sobre este botón para mover el filtro seleccionado en la "
+"lista superior hacia <em>abajo</em>.</p><p>Esto es útil para determinar el "
+"orden en el que se filtran los mensajes: El filtro de más arriba se usa el "
+"primero.</p><p>Si ha pulsado este botón accidentalmente, puede deshacer la "
+"acción pulsando en el botón <em>Arriba</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Haga clic en este botón para mover el filtro seleccionado hacia la zona <em>"
-"inferior</em> de la lista de abajo.</p>"
-"<p>Es útil para determinar el orden en el que se aplican los filtros a los "
-"mensajes: El filtro de más arriba es el primero que se aplica.</p></qt>"
+"<qt><p>Haga clic en este botón para mover el filtro seleccionado hacia la "
+"zona <em>inferior</em> de la lista de abajo.</p><p>Es útil para determinar "
+"el orden en el que se aplican los filtros a los mensajes: El filtro de más "
+"arriba es el primero que se aplica.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pulse este botón para renombrar el filtro seleccionado.</p>"
-"<p>Los filtros son nombrados automáticamente, al empezar con «&lt;».</p>"
-"<p> Si renombra un filtro accidentalmente y quiere volver a usar su nombre, "
-"pulsa este botón, seleccione<em>Limpiar</em> y luego <em>OK</em> "
-"en el cuadro que aparece.</p></qt>"
+"<qt><p>Pulse este botón para renombrar el filtro seleccionado.</p><p>Los "
+"filtros son nombrados automáticamente, al empezar con «&lt;».</p><p> Si "
+"renombra un filtro accidentalmente y quiere volver a usar su nombre, pulsa "
+"este botón, seleccione<em>Limpiar</em> y luego <em>OK</em> en el cuadro que "
+"aparece.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marque este botón para forzar que se muestre el cuadro de confirmación.</p>"
-"<p>Esto es útil si ha definido unas reglas para marcar los mensajes para que "
-"sean descargados después. Sin la posibilidad de forzar el cuadro de "
-"confirmación, esos mensajes nunca serían descargados si no hay otros mensajes "
-"esperando en el servidor, o si quisiera cambiar la regla para marcar los "
-"mensajes de otra forma.</p></qt>"
+"<qt><p>Marque este botón para forzar que se muestre el cuadro de "
+"confirmación.</p><p>Esto es útil si ha definido unas reglas para marcar los "
+"mensajes para que sean descargados después. Sin la posibilidad de forzar el "
+"cuadro de confirmación, esos mensajes nunca serían descargados si no hay "
+"otros mensajes esperando en el servidor, o si quisiera cambiar la regla para "
+"marcar los mensajes de otra forma.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7277,6 +7106,16 @@ msgstr "Reglas de filtrado POP3"
 msgid "Filter Rules"
 msgstr "Reglas de filtrado..."
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importar"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importar"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtros disponibles"
@@ -7359,6 +7198,11 @@ msgstr "Además, añade este filtro a la barra de herramientas"
 msgid "Icon for this filter:"
 msgstr "Icono para este filtro:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Para"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Arriba"
@@ -7367,16 +7211,29 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Renombrar..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nuevo"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copiar a"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Eliminado"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7385,12 +7242,12 @@ msgstr "Seleccionar un acceso rápido para la carpeta"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Al menos uno de los filtros tiene como destino una carpeta en una cuenta IMAP "
-"conectada. Esos filtros sólo se aplican cuando está filtrando manualmente y "
-"cuando se filtre el correo IMAP conectado."
+"Al menos uno de los filtros tiene como destino una carpeta en una cuenta "
+"IMAP conectada. Esos filtros sólo se aplican cuando está filtrando "
+"manualmente y cuando se filtre el correo IMAP conectado."
 
 #: kmfilterdlg.cpp:786
 msgid ""
@@ -7471,29 +7328,25 @@ msgstr "Solución de problemas del caché IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Resolución de problemas del caché IMAP.</b></p>"
-"<p>Si tiene problemas al sincronizar una carpeta IMAP, debería intentar primero "
-"reconstruir el archivo de índice. La reconstrucción del índice tardará algún "
-"tiempo, pero no debería provocar ningún problema.</p> "
-"<p>Si esto no es suficiente, puede intentar actualizar el caché IMAP. Si lo "
-"hace, perderá todos los cambios locales para esta carpeta y todas sus "
-"subcarpetas.</p>"
+"<p><b>Resolución de problemas del caché IMAP.</b></p><p>Si tiene problemas "
+"al sincronizar una carpeta IMAP, debería intentar primero reconstruir el "
+"archivo de índice. La reconstrucción del índice tardará algún tiempo, pero "
+"no debería provocar ningún problema.</p> <p>Si esto no es suficiente, puede "
+"intentar actualizar el caché IMAP. Si lo hace, perderá todos los cambios "
+"locales para esta carpeta y todas sus subcarpetas.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7524,13 +7377,14 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"No se puede leer el archivo de caché UID para la carpeta %1. Puede haber habido "
-"un problema con los permisos del sistema de archivos, o quizás esté dañado."
+"No se puede leer el archivo de caché UID para la carpeta %1. Puede haber "
+"habido un problema con los permisos del sistema de archivos, o quizás esté "
+"dañado."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "No se puede escribir el archivo de caché UID para la carpeta %1. Puede haber "
 "habido un problema con los permisos del sistema de archivos, o quizás esté "
@@ -7554,8 +7408,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"¿Está seguro de que quiere refrescar la caché de IMAP de la carpeta %1 y todas "
-"sus subcarpetas?\n"
+"¿Está seguro de que quiere refrescar la caché de IMAP de la carpeta %1 y "
+"todas sus subcarpetas?\n"
 "Esto eliminará todos los cambios que haya hecho localmente a sus carpetas,"
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7572,8 +7426,8 @@ msgstr "Se ha vuelto a crear el índice de esta carpeta."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "La carpeta %1 no está en un estado inicial de sincronización (el estado era "
 "%2). ¿Quiere volver al estado inicial y sincronizarlo de todos modos?"
@@ -7681,8 +7535,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Se han restringido los derechos de acceso a la carpeta <b>%1</b>"
-". Ya no es posible añadir mensajes a esta carpeta.</p>"
+"<p>Se han restringido los derechos de acceso a la carpeta <b>%1</b>. Ya no "
+"es posible añadir mensajes a esta carpeta.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7703,15 +7557,11 @@ msgstr "Crear subcarpeta en el servidor"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Se eliminaron los mensajes de la carpeta <b>%1</b> "
-"del servidor. ¿Quiere eliminarlos localmente?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Se eliminaron los mensajes de la carpeta <b>%1</b> del servidor. "
+"¿Quiere eliminarlos localmente?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7732,12 +7582,10 @@ msgstr "Recuperar carpetas para el espacio de nombres de %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Parece que se eliminó la carpeta <b>%1</b>. ¿Quiere eliminarla del "
+"<qt><p>Parece que se eliminó la carpeta <b>%1</b>. ¿Quiere eliminarla del "
 "servidor?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7746,8 +7594,8 @@ msgstr "Abortado"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "El servidor IMAP %1 no admite anotaciones IMAP. No puede utilizar el "
 "almacenimiento XML en este servidor. Haga el favor de configurar de forma "
@@ -7755,8 +7603,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "El servidor IMAP %1 no admite anotaciones imap. No se puede utilizar el "
 "almacenamiento XML en este servidor. Debe configurar KMail de otra forma"
@@ -7772,19 +7620,18 @@ msgstr "perdidos+encontrados"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Hay mensajes nuevos en esta carpeta <b>%1</b>, que no se han cargado aún en "
-"el servidor, pero no parece tener los permisos adecuados sobre la carpeta para "
-"efectuar la carga. Posiblemente deba ponerse en contacto con el administrador "
-"para que le permita cargar los mensajes nuevos, o para sacarlos de esta "
-"carpeta.</p> "
-"<p>¿Quiere mover todos los mensajes afectados a <b>%2</b> "
-"para evitar la pérdida de datos?</p>"
+"<p>Hay mensajes nuevos en esta carpeta <b>%1</b>, que no se han cargado aún "
+"en el servidor, pero no parece tener los permisos adecuados sobre la carpeta "
+"para efectuar la carga. Posiblemente deba ponerse en contacto con el "
+"administrador para que le permita cargar los mensajes nuevos, o para "
+"sacarlos de esta carpeta.</p> <p>¿Quiere mover todos los mensajes afectados "
+"a <b>%2</b> para evitar la pérdida de datos?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7793,21 +7640,26 @@ msgstr "Derechos de acceso insuficientes"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Hay mensajes nuevos en esta carpeta (%1), que no se han cargado aún en el "
 "servidor, pero no parece tener los permisos adecuados sobre la carpeta para "
-"efectuar la carga.  Posiblemente deba ponerse en contacto con el administrador "
-"para que le permita cargar los mensajes nuevos, o para sacarlos de esta "
-"carpeta.</p> "
-"<p>¿Quiere mover ahora estos mensajes a otra carpeta?</p>"
+"efectuar la carga.  Posiblemente deba ponerse en contacto con el "
+"administrador para que le permita cargar los mensajes nuevos, o para "
+"sacarlos de esta carpeta.</p> <p>¿Quiere mover ahora estos mensajes a otra "
+"carpeta?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Mover a:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "No mover"
 
@@ -7819,8 +7671,7 @@ msgstr "Mover los mensajes a la carpeta"
 msgid "Permissions (ACL)"
 msgstr "Permisos (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "General"
@@ -7844,8 +7695,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Usar &iconos personalizados"
@@ -7864,24 +7714,22 @@ msgstr "Actuar cuando haya correo nuevo o no leído en esta carpeta"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Si esta opción está activada, se le notificará cuando haya correo nuevo o no "
-"leído en esta carpeta. Además, al ir a la carpeta anterior o siguiente con "
-"carpetas no leídas, se detendrá en esta carpeta.</p>"
-"<p>Desmarque esta opción si no quiere que se le notifique cuando haya correo "
-"nuevo o no leído en esta carpeta y si quiere evitar esta carpeta cuando vaya a "
-"la carpeta siguiente o anterior con mensajes no leídos. Es útil para ignorar "
-"correo nuevo o no leído en la papelera y en la carpeta de correo basura.</p>"
-"</qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Si esta opción está activada, se le notificará cuando haya correo "
+"nuevo o no leído en esta carpeta. Además, al ir a la carpeta anterior o "
+"siguiente con carpetas no leídas, se detendrá en esta carpeta.</"
+"p><p>Desmarque esta opción si no quiere que se le notifique cuando haya "
+"correo nuevo o no leído en esta carpeta y si quiere evitar esta carpeta "
+"cuando vaya a la carpeta siguiente o anterior con mensajes no leídos. Es "
+"útil para ignorar correo nuevo o no leído en la papelera y en la carpeta de "
+"correo basura.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7893,13 +7741,13 @@ msgstr "Mantener las respuestas en esta carpeta"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Marque esta opción si quiere que las respuestas que escribe a los correos de "
-"esta carpeta se pongan en la misma carpeta una vez que se envían, en lugar de "
-"en la carpeta configurada para el correo enviado."
+"esta carpeta se pongan en la misma carpeta una vez que se envían, en lugar "
+"de en la carpeta configurada para el correo enviado."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7909,17 +7757,21 @@ msgstr "Mostrar columna de remitente y destinatario en la lista de mensajes"
 msgid "Sho&w column:"
 msgstr "Mostrar co&lumna:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Predefinido"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Remitente"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Receptor"
@@ -7930,18 +7782,18 @@ msgstr "Identidad del &remitente:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Seleccione la identidad del remitente que vaya a usar cuando escriba correo "
 "nuevo o responda al correo de esta carpeta. Eso significa que si se trata de "
-"una de sus carpetas de trabajo, puede hacer que KMail elija automáticamente la "
-"dirección de correo electrónico, la firma y las claves de cifrado que le "
-"correspondan. Se pueden configurar las identidades en el cuadro de diálogo de "
-"configuración principal (Preferencias -> Configurar KMail)."
+"una de sus carpetas de trabajo, puede hacer que KMail elija automáticamente "
+"la dirección de correo electrónico, la firma y las claves de cifrado que le "
+"correspondan. Se pueden configurar las identidades en el cuadro de diálogo "
+"de configuración principal (Preferencias -> Configurar KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7959,28 +7811,28 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Esta opción define qué usuarios de los que comparten esta carpeta debieran "
 "tener periodos en la lista de ocios y ocupaciones y debieran ver las alarmas "
 "para las tareas de esta carpeta. Esta opción se aplica sólo a las carpetas "
-"«Calendario» y «Tareas» (para las tareas, esta opción sólo se emplea para las "
-"alarmas).\n"
+"«Calendario» y «Tareas» (para las tareas, esta opción sólo se emplea para "
+"las alarmas).\n"
 "\n"
 "Ejemplos de utilización: si el jefe comparte una carpeta con su secretaria, "
 "sólo el jefe debería poder marcar como ocupado el tiempo para sus reuniones, "
-"por lo que debería seleccionar «Admins», mientras que la secretaria no debería "
-"tener permisos de administración sobre la carpeta.\n"
+"por lo que debería seleccionar «Admins», mientras que la secretaria no "
+"debería tener permisos de administración sobre la carpeta.\n"
 "Por otra parte, si un grupo de trabajo comparte un calendario de reuniones, "
 "todos los lectores de las carpetas se deberían marcar como ocupados en las "
 "reuniones.\n"
-"Una carpeta de la compañía con eventos opcionales debería usar «Cualquiera», ya "
-"que no se sabe quién irá a esos eventos."
+"Una carpeta de la compañía con eventos opcionales debería usar «Cualquiera», "
+"ya que no se sabe quién irá a esos eventos."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8011,24 +7863,24 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr ""
-"Ha configurado esta carpeta para que contenga información de groupware y en la "
-"configuración general está definida la opción para ocultar las carpetas de "
-"groupware. Esto significa que esta carpeta desaparecerá una vez que se cierre "
-"el cuadro de diálogo de configuración. Si quiere volver a eliminar la carpeta, "
-"tendrá que desactivar temporalmente la ocultación de las carpetas de groupware "
-"para poder verla."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"Ha configurado esta carpeta para que contenga información de groupware y en "
+"la configuración general está definida la opción para ocultar las carpetas "
+"de groupware. Esto significa que esta carpeta desaparecerá una vez que se "
+"cierre el cuadro de diálogo de configuración. Si quiere volver a eliminar la "
+"carpeta, tendrá que desactivar temporalmente la ocultación de las carpetas "
+"de groupware para poder verla."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8097,12 +7949,13 @@ msgstr "Error al obtener la información de la carpeta."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "El índice de correo de '%1' es de una versión desconocida de KMail (%2).\n"
 "Este índice puede ser regenerado desde la carpeta de correo, pero alguna\n"
-"información, incluyendo los estados, pueden perderse. ¿Quiere que desactualice "
-"su archivo de índice?"
+"información, incluyendo los estados, pueden perderse. ¿Quiere que "
+"desactualice su archivo de índice?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8127,8 +7980,8 @@ msgstr "Error al abrir %1. No se encuentra la carpeta."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Error al abrir %1. O no es una carpeta maildir válida o no tiene suficientes "
 "permisos de acceso."
@@ -8150,8 +8003,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: terminó de forma anormal para prevenir la pérdida de "
-"datos."
+"KMFolderMaildir::addMsg: terminó de forma anormal para prevenir la pérdida "
+"de datos."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8175,22 +8028,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>El índice de la carpeta '%2' parece desactualizado. Para evitar que se "
-"corrompan los mensajes se regenerará el índice. Como resultado de eso puede que "
-"reaparezcan mensajes previamente eliminados y se pueden perder los estados de "
-"los mensajes.</p>"
-"<p>Por favor lea la <a href=«%1»>sección correspondiente del PUF del manual de "
-"KMail</a> para encontrar información acerca de como prevenir que este problema "
-"se repita.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>El índice de la carpeta '%2' parece desactualizado. Para evitar que "
+"se corrompan los mensajes se regenerará el índice. Como resultado de eso "
+"puede que reaparezcan mensajes previamente eliminados y se pueden perder los "
+"estados de los mensajes.</p><p>Por favor lea la <a href=«%1»>sección "
+"correspondiente del PUF del manual de KMail</a> para encontrar información "
+"acerca de como prevenir que este problema se repita.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8252,7 +8101,7 @@ msgstr ""
 "«%1» no parece ser una carpeta.\n"
 "Ponga el archivo en en lugar adecuado."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8260,7 +8109,7 @@ msgstr ""
 "Los permisos de la carpeta «%1» son incorrectos.\n"
 "Asegúrese de que puede ver y modificar el contenido de esta carpeta."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8270,15 +8119,15 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "No se puede crear la carpeta"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8376,13 +8225,13 @@ msgstr "Solución de &problemas del caché IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>No se puede crear la carpeta <b>%1</b> porque no hay suficientes permisos "
-"sobre el servidor. Si piensa que debería poder crear subcarpetas aquí, pida a "
-"su administrador que le conceda los permisos oportunos.</qt> "
+"<qt>No se puede crear la carpeta <b>%1</b> porque no hay suficientes "
+"permisos sobre el servidor. Si piensa que debería poder crear subcarpetas "
+"aquí, pida a su administrador que le conceda los permisos oportunos.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8399,23 +8248,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>No se puede mover ni copiar la carpeta <b>%1</b> "
-"aquí, porque ya existe una carpeta con el mismo nombre.</qt>"
+"<qt>No se puede mover ni copiar la carpeta <b>%1</b> aquí, porque ya existe "
+"una carpeta con el mismo nombre.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>No se puede mover ni copiar la carpeta <b>%1</b> "
-"porque no se puede copiar completamente a sí mismo.</qt>"
+"<qt>No se puede mover ni copiar la carpeta <b>%1</b> porque no se puede "
+"copiar completamente a sí mismo.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>No se puede mover ni copiar la carpeta <b>%1</b> "
-"dentro de una subcarpeta de sí misma.</p>"
+"<qt>No se puede mover ni copiar la carpeta <b>%1</b> dentro de una "
+"subcarpeta de sí misma.</p>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8521,13 +8370,13 @@ msgstr "%1 La carpeta es de sólo lectura."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>¿Está seguro de que quiere eliminar el mensaje seleccionado?"
-"<br>Una vez que lo elimine, no podrá recuperarlo.</qt>\n"
+"<qt>¿Está seguro de que quiere eliminar el mensaje seleccionado?<br>Una vez "
+"que lo elimine, no podrá recuperarlo.</qt>\n"
 "<qt>¿Está seguro de que quiere eliminar los %n mensajes seleccionados?"
 "<br>Una vez que los elimine, no podrá recuperarlos.</qt>"
 
@@ -8581,139 +8430,136 @@ msgstr ""
 "Error al modificar %1\n"
 "(¿No hay espacio libre en el dispositivo?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Se necesita firma de certificado"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Por favor, cree un certificado desde el adjunto y devuélvalo al remitente."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail está en modo desconectado. Todas las tareas relacionadas con la red se "
 "han suspendido."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
-"KMail está en modo conectado. Todas las tareas relacionadas con la red se han "
-"reanudado."
+"KMail está en modo conectado. Todas las tareas relacionadas con la red se "
+"han reanudado."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail está ahora en modo desconectado. ¿Quiere seguir adelante?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Trabajar conectado"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "No tiene permiso de lectura/escritura sobre su carpeta de entrada."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "saliente"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "No tiene permiso de lectura/escritura sobre su carpeta de salida."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "enviado"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "No tiene permiso de lectura/escritura sobre su carpeta de enviados."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "papelera"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "No tiene permiso de lectura/escritura sobre su carpeta papelera."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "borrador"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "No tiene permiso de lectura/escritura sobre su carpeta de borrador."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "plantillas"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "No tiene permiso de lectura/escritura sobre su carpeta de plantillas."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Última búsqueda"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Ya existe la carpeta <i>%4</i>. %1 usa ahora la carpeta <i>%5</i> "
-"para sus mensajes."
-"<p>%2 puede mover el contenido de <i>%6<i> a esta carpeta, lo que puede "
-"conllevar el reemplazo de cualquier archivo existente con el mismo nombre de <i>"
-"%7</i>."
-"<p><strong>¿Le gustaría que %3 moviera ahora los archivos de correo?</strong>"
-"</qt>"
+"<qt>Ya existe la carpeta <i>%4</i>. %1 usa ahora la carpeta <i>%5</i> para "
+"sus mensajes.<p>%2 puede mover el contenido de <i>%6<i> a esta carpeta, lo "
+"que puede conllevar el reemplazo de cualquier archivo existente con el mismo "
+"nombre de <i>%7</i>.<p><strong>¿Le gustaría que %3 moviera ahora los "
+"archivos de correo?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Ya existe la carpeta <i>%4</i>. %1 usa ahora la carpeta <i>%5</i> "
-"para sus mensajes. %2 puede mover el contenido de <i>%6</i> a esta carpeta. "
-"<p><strong>¿Le gustaría que %3 moviese ahora los archivos de correo?</strong>"
-"</qt>"
+"<qt>Ya existe la carpeta <i>%4</i>. %1 usa ahora la carpeta <i>%5</i> para "
+"sus mensajes. %2 puede mover el contenido de <i>%6</i> a esta carpeta. "
+"<p><strong>¿Le gustaría que %3 moviese ahora los archivos de correo?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "¿Migrar los archivos de correo?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail encontró un error fatal y terminará ahora"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8724,11 +8570,11 @@ msgstr ""
 "El error fue:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Vaciar papelera"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "¿Está seguro de que quiere vaciar las carpetas de la papelera de todas las "
@@ -8805,8 +8651,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Ha llegado correo nuevo</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8844,11 +8689,11 @@ msgstr "¿Realmente quiere vaciar la papelera?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>¿Realmente quiere mover todos los mensajes de la carpeta <b>%1</b> "
-"a la papelera?</qt>"
+"<qt>¿Realmente quiere mover todos los mensajes de la carpeta <b>%1</b> a la "
+"papelera?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8872,11 +8717,11 @@ msgstr "Eliminar búsqueda"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>¿Está seguro de que quiere eliminar la búsqueda <b>%1</b>?"
-"<br>Los mensajes que muestre seguirán permaneciendo en la carpeta original.</qt>"
+"<qt>¿Está seguro de que quiere eliminar la búsqueda <b>%1</b>?<br>Los "
+"mensajes que muestre seguirán permaneciendo en la carpeta original.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8889,41 +8734,42 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>¿Está seguro de querer borrar la carpeta <b>%1</b> "
-"y todas sus subcarpetas? Estas subcarpetas no se pueden vaciar y su contenido "
-"se descartará. "
-"<p><b>Tenga cuidado</b>, porque los mensajes descartados no se guardan en la "
-"carpeta Papelera y se eliminan permanentemente.</qt>"
+"<qt>¿Está seguro de querer borrar la carpeta <b>%1</b> y todas sus "
+"subcarpetas? Estas subcarpetas no se pueden vaciar y su contenido se "
+"descartará. <p><b>Tenga cuidado</b>, porque los mensajes descartados no se "
+"guardan en la carpeta Papelera y se eliminan permanentemente.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>¿Está seguro de que quiere eliminar la carpeta <b>%1</b>"
-", eliminando así todo su contenido? "
-"<p><b>Tenga cuidado</b>, porque los mensajes descartados no se guardan en la "
-"carpeta Papelera y se eliminan permanentemente.</qt>"
+"<qt>¿Está seguro de que quiere eliminar la carpeta <b>%1</b>, eliminando así "
+"todo su contenido? <p><b>Tenga cuidado</b>, porque los mensajes descartados "
+"no se guardan en la carpeta Papelera y se eliminan permanentemente.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>¿Está seguro de querer borrar la carpeta <b>%1</b> "
-"y todas sus subcarpetas, eliminando su contenido? "
-"<p><b>Tenga cuidado</b>, porque los mensajes descartados no se guardan en la "
-"carpeta Papelera y se eliminan permanentemente.</qt>"
+"<qt>¿Está seguro de querer borrar la carpeta <b>%1</b> y todas sus "
+"subcarpetas, eliminando su contenido? <p><b>Tenga cuidado</b>, porque los "
+"mensajes descartados no se guardan en la carpeta Papelera y se eliminan "
+"permanentemente.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Eliminado"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8931,7 +8777,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "¿Está seguro de que quiere refrescar la caché de IMAP?\n"
-"Esto eliminará todos los cambios que haya hecho localmente a sus carpetas IMAP."
+"Esto eliminará todos los cambios que haya hecho localmente a sus carpetas "
+"IMAP."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8939,13 +8786,13 @@ msgstr "¿Realmente quiere caducar todos los mensajes antiguos ?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"<b>ATENCIÓN:</b> Usar HTML en el correo le hará más vulnerable al «spam» "
-"(correo basura) y puede incrementar la posibilidad de que su sistema se vea "
-"comprometido por otros fallos de seguridad presentes y futuros."
+"<b>ATENCIÓN:</b> Usar HTML en el correo le hará más vulnerable al "
+"«spam» (correo basura) y puede incrementar la posibilidad de que su sistema "
+"se vea comprometido por otros fallos de seguridad presentes y futuros."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8958,12 +8805,12 @@ msgstr "Usar HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Cargar referencias externas en el correo html le hará más vulnerable al «spam» "
-"(correo basura) y puede incrementar la posibilidad de que su sistema se vea "
-"comprometido por otros fallos de seguridad presentes y futuros."
+"Cargar referencias externas en el correo html le hará más vulnerable al "
+"«spam» (correo basura) y puede incrementar la posibilidad de que su sistema "
+"se vea comprometido por otros fallos de seguridad presentes y futuros."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8979,8 +8826,8 @@ msgstr "Filtrar en Lista de correo %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "La funcionalidad de respuesta «Ausente de la oficina» se basa en el filtrado "
@@ -9003,7 +8850,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "No se pudo arrancar el visor del registro de GnuPG (kwatchgnupg). Revise su "
 "instalación, por favor."
@@ -9327,8 +9175,7 @@ msgstr "Guardar ad&juntos..."
 msgid "Appl&y All Filters"
 msgstr "Apl&icar todos los filtros"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&plicar filtro"
@@ -9445,7 +9292,6 @@ msgstr "Mensaje sig&uiente por leer"
 msgid "Go to the next unread message"
 msgstr "Ir al siguiente mensaje por leer"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Mensa&je anterior"
@@ -9493,8 +9339,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Bajar en el mensaje actual. Si se llega al final del mensaje, ir al siguiente "
-"mensaje."
+"Bajar en el mensaje actual. Si se llega al final del mensaje, ir al "
+"siguiente mensaje."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9585,8 +9431,8 @@ msgstr " Iniciando..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9597,22 +9443,22 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Este mensaje contiene una petición para devolver un acuse de recibo del "
 "mensaje.\n"
-"Contiene una instrucción para procesamiento que está marcada como «requerido», "
-"pero que KMail no conoce.\n"
+"Contiene una instrucción para procesamiento que está marcada como "
+"«requerido», pero que KMail no conoce.\n"
 "Puede ignorar la petición o dejar que KMail envíe una respuesta «fallido»."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9625,8 +9471,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9639,8 +9485,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9677,16 +9523,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Acuse de recibo: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Adjunto: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Este adjunto ha sido borrado."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "El adjunto «%1» ha sido borrado."
 
@@ -9734,45 +9580,39 @@ msgstr "Propiedades integrantes de mensaje"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El <em>tipo MIME</em> del archivo.</p>"
-"<p>Normalmente no necesitará tocar esta opción ya que el tipo de archivo se "
-"comprueba automáticamente. Pero a veces, %1 puede no detectar el tipo de "
-"archivo correctamente. Aquí puede solucionarlo.</p></qt>"
+"<qt><p>El <em>tipo MIME</em> del archivo.</p><p>Normalmente no necesitará "
+"tocar esta opción ya que el tipo de archivo se comprueba automáticamente. "
+"Pero a veces, %1 puede no detectar el tipo de archivo correctamente. Aquí "
+"puede solucionarlo.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El tamaño de la parte.</p>"
-"<p>Algunas veces, %1 le dará únicamente un tamaño estimado porque calcular el "
-"tamaño exacto le llevaría demasiado tiempo. Cuando es el caso, será visible "
-"porque se añadirá «(est.)» al tamaño mostrado.</p></qt>"
+"<qt><p>El tamaño de la parte.</p><p>Algunas veces, %1 le dará únicamente un "
+"tamaño estimado porque calcular el tamaño exacto le llevaría demasiado "
+"tiempo. Cuando es el caso, será visible porque se añadirá «(est.)» al tamaño "
+"mostrado.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>El nombre de archivo de la parte.</p>"
-"<p>Aunque es por omisión el nombre del archivo adjunto, no especifica el "
-"archivo que se adjuntará. Sugiere un nombre para que el programa de correo del "
-"destinatario lo use al guardar esta parte en disco.</p></qt>"
+"<qt><p>El nombre de archivo de la parte.</p><p>Aunque es por omisión el "
+"nombre del archivo adjunto, no especifica el archivo que se adjuntará. "
+"Sugiere un nombre para que el programa de correo del destinatario lo use al "
+"guardar esta parte en disco.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9780,18 +9620,15 @@ msgstr "&Descripción:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Una descripción de la parte.</p>"
-"<p>Es únicamente una descripción informativa de la parte, como el Asunto lo es "
-"de todo el mensaje. La mayoría de los programas de correo mostrarán esta "
-"información en la previsualización del mensaje, al lado del icono del "
-"adjunto.</p></qt>"
+"<qt><p>Una descripción de la parte.</p><p>Es únicamente una descripción "
+"informativa de la parte, como el Asunto lo es de todo el mensaje. La mayoría "
+"de los programas de correo mostrarán esta información en la previsualización "
+"del mensaje, al lado del icono del adjunto.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9799,23 +9636,20 @@ msgstr "C&odificando"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>La codificación del transporte de esta parte</p>"
-"<p>Normalmente no necesitará cambiarlo, ya que %1 usará una codificación "
-"decente dependiendo del tipo MIME. Aun así, a veces podrá reducir de forma "
-"significativa el tamaño del mensaje, por ejemplo si un archivo PostScript no "
-"contiene datos binarios, sino sólo texto. En este caso, eligiendo «citado "
-"imprimible» en vez de «base64» ahorrará hasta el 25% del tamaño del mensaje.</p>"
-"</qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>La codificación del transporte de esta parte</p><p>Normalmente no "
+"necesitará cambiarlo, ya que %1 usará una codificación decente dependiendo "
+"del tipo MIME. Aun así, a veces podrá reducir de forma significativa el "
+"tamaño del mensaje, por ejemplo si un archivo PostScript no contiene datos "
+"binarios, sino sólo texto. En este caso, eligiendo «citado imprimible» en "
+"vez de «base64» ahorrará hasta el 25% del tamaño del mensaje.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9823,21 +9657,17 @@ msgstr "Sugerir mostrar &automáticamente"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Marque esta opción si quiere sugerir al destinatario que vea automáticamente "
-"esta parte del mensaje (dentro del mensaje) en vez de la vista predeterminada "
-"en icono.</p>"
-"<p>Técnicamente se lleva a cabo poniendo la cabecera <em>"
-"Content-Disposition</em> de esta parte como «inline» en vez de lo "
-"predeterminado como «attachment».</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Marque esta opción si quiere sugerir al destinatario que vea "
+"automáticamente esta parte del mensaje (dentro del mensaje) en vez de la "
+"vista predeterminada en icono.</p><p>Técnicamente se lleva a cabo poniendo "
+"la cabecera <em>Content-Disposition</em> de esta parte como «inline» en vez "
+"de lo predeterminado como «attachment».</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9845,15 +9675,13 @@ msgstr "Firmar e&sta parte"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marque esta opción si quiere que esta parte del mensaje sea firmada.</p>"
-"<p>La firma se hará con la clave que tenga asociada a la identidad actualmente "
-"seleccionada.</p></qt>"
+"<qt><p>Marque esta opción si quiere que esta parte del mensaje sea firmada.</"
+"p><p>La firma se hará con la clave que tenga asociada a la identidad "
+"actualmente seleccionada.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9861,13 +9689,11 @@ msgstr "Ci&frar esta parte"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marque esta opción si quiere que esta parte del mensaje sea cifrada.</p>"
-"<p>La parte será cifrada para los destinatarios del mensaje</p></qt>"
+"<qt><p>Marque esta opción si quiere que esta parte del mensaje sea cifrada.</"
+"p><p>La parte será cifrada para los destinatarios del mensaje</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9881,16 +9707,14 @@ msgstr "Filtros POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Los mensajes a filtrar encontrados en la cuenta POP:<b>%1</b> "
-"<p>Los mensajes mostrados exceden el tamaño máximo que definió para esta "
-"cuenta. "
-"<br> Puede seleccionar qué quiere hacer con ellos marcando el botón apropiado."
+"Los mensajes a filtrar encontrados en la cuenta POP:<b>%1</b> <p>Los "
+"mensajes mostrados exceden el tamaño máximo que definió para esta cuenta. "
+"<br> Puede seleccionar qué quiere hacer con ellos marcando el botón "
+"apropiado."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10146,40 +9970,39 @@ msgstr "El cliente de correo electrónico para el entorno de escritorio K."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Recuperando el contenido de la carpeta</h2>"
-"<p>Espere, por favor . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Recuperando el contenido de la carpeta</"
+"h2><p>Espere, por favor . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Desconectado</h2>"
-"<p>KMail se encuentra en modo desconectado. Haga clic <a "
-"href=\"kmail:goOnline\">aquí</a> para pasar al modo conectado . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Desconectado</h2><p>KMail se encuentra en modo "
+"desconectado. Haga clic <a href=\"kmail:goOnline\">aquí</a> para pasar al "
+"modo conectado . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10187,15 +10010,14 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Bienvenido a KMail %1</h2>"
-"<p>Kmail es el cliente de correo electrónico del entorno de escritorio TDE. "
-"Está diseñado para ser completamente compatible con los estándares de correo de "
-"Internet, incluidos MIME, SMTP, POP3 e IMAP.</p>\n"
-"<ul>"
-"<li>KMail tiene muchas características, descritas en la <a href=\"%2\">"
-"documentación</a></li>\n"
-"<li>La <a href=\"%3\">página web de KMail</a> ofrece información acerca de las "
-"nuevas versiones de KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Bienvenido a KMail %1</h2><p>Kmail es el "
+"cliente de correo electrónico del entorno de escritorio TDE. Está diseñado "
+"para ser completamente compatible con los estándares de correo de Internet, "
+"incluidos MIME, SMTP, POP3 e IMAP.</p>\n"
+"<ul><li>KMail tiene muchas características, descritas en la <a href="
+"\"%2\">documentación</a></li>\n"
+"<li>La <a href=\"%3\">página web de KMail</a> ofrece información acerca de "
+"las nuevas versiones de KMail</li></ul>\n"
 "%8\n"
 "<p>Entre las nuevas características de esta versión de KMail están (en "
 "comparación con KMail %4, que es parte de TDE %5):</p>\n"
@@ -10207,15 +10029,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; El equipo de KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10228,8 +10048,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Cambios importantes</span> "
-"(comparados con KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Cambios importantes</"
+"span> (comparados con KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10260,13 +10080,14 @@ msgstr "Ver adjuntos:  %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: El adjunto contiene datos binarios. Se intenta mostrar el primer "
 "carácter]\n"
-"[KMail: El adjunto contiene datos binarios. Se intentan mostrar los %n primeros "
-"caracteres"
+"[KMail: El adjunto contiene datos binarios. Se intentan mostrar los %n "
+"primeros caracteres"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10291,12 +10112,14 @@ msgstr "¿Abrir adjuntos?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10317,6 +10140,58 @@ msgstr "(coincide con cualquiera de los siguientes)"
 msgid "(match all of the following)"
 msgstr "(coincide con todos los siguientes)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Leer"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Antiguo"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Eliminado"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Respondido"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Reenviado"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "En cola"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Enviado"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Visto"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Correo basura"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Correo válido"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Tarea pendiente"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Tiene adjuntos"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Todo el mensaje"
@@ -10394,10 +10269,10 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "El mover el mensaje enviado «%1» desde la carpeta «saliente» a «enviado» "
 "falló.\n"
@@ -10407,13 +10282,13 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "No es posible enviar mensajes sin especificar la dirección del remitente.\n"
-"Haga el favor de configurar la dirección de correo electrónico de la identidad "
-"«%1» en la sección Identidades del cuadro de diálogo de configuración y vuelva "
-"a intentarlo."
+"Haga el favor de configurar la dirección de correo electrónico de la "
+"identidad «%1» en la sección Identidades del cuadro de diálogo de "
+"configuración y vuelva a intentarlo."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10438,11 +10313,11 @@ msgstr "Iniciando el proceso de envio..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Ha elegido enviar todos los mensajes que haya en la cola con un transporte sin "
-"cifrar. ¿Quiere continuar?"
+"Ha elegido enviar todos los mensajes que haya en la cola con un transporte "
+"sin cifrar. ¿Quiere continuar?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10466,15 +10341,17 @@ msgstr "Fallo al enviar (algún) mensaje de la cola."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Envío fallido:\n"
 "%1\n"
-"El mensaje permanecerá en la carpeta «saliente» hasta que arregle el problema "
-"(ej. dirección incorrecta) o elimine el mensaje de la carpeta «saliente».\n"
+"El mensaje permanecerá en la carpeta «saliente» hasta que arregle el "
+"problema (ej. dirección incorrecta) o elimine el mensaje de la carpeta "
+"«saliente».\n"
 "Se usó el siguiente protocolo de transporte:\n"
 "  %2"
 
@@ -10484,21 +10361,17 @@ msgstr "Envío detenido."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Envío fallido:</p>"
-"<p>%1</p>"
-"<p>El mensaje permanecerá en la carpeta «saliente» hasta que arregle el "
-"problema (ej. dirección incorrecta) o elimine el mensaje de la carpeta "
-"«saliente».</p>"
-"<p>Se usó el siguiente protocolo de transporte:  %2</p> "
-"<p>¿Quiere que se continúen enviando los mensajes restantes?</p>"
+"<p>Envío fallido:</p><p>%1</p><p>El mensaje permanecerá en la carpeta "
+"«saliente» hasta que arregle el problema (ej. dirección incorrecta) o "
+"elimine el mensaje de la carpeta «saliente».</p><p>Se usó el siguiente "
+"protocolo de transporte:  %2</p> <p>¿Quiere que se continúen enviando los "
+"mensajes restantes?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10516,15 +10389,17 @@ msgstr "&Abortar el envío"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Envío fallido:\n"
 "%1\n"
-"El mensaje permanecerá en la carpeta «saliente» hasta que arregle el problema "
-"(ej. dirección incorrecta) o elimine el mensaje de la carpeta «saliente».\n"
+"El mensaje permanecerá en la carpeta «saliente» hasta que arregle el "
+"problema (ej. dirección incorrecta) o elimine el mensaje de la carpeta "
+"«saliente».\n"
 "Se usó el siguiente protocolo de transporte:\n"
 " %2"
 
@@ -10560,48 +10435,48 @@ msgstr "Sendmail terminó de forma anómala."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Tiene que proporcionar el nombre de usuario y la contraseña para acceder a este "
-"servidor SMTP."
+"Tiene que proporcionar el nombre de usuario y la contraseña para acceder a "
+"este servidor SMTP."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 ya parece estar corriendo en otra pantalla de esta máquina. Lanzar %2 más de "
-"una vez puede causar la pérdida de correo. No debería iniciar %1 a no ser que "
-"esté seguro de que no está corriendo ya."
+"%1 ya parece estar corriendo en otra pantalla de esta máquina. Lanzar %2 más "
+"de una vez puede causar la pérdida de correo. No debería iniciar %1 a no ser "
+"que esté seguro de que no está corriendo ya."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 ya parece estar corriendo en otra pantalla de esta máquina. Lanzar %1 y %2 "
-"al mismo tiempo puede causar la pérdida de correo. No debería iniciar %2 a no "
-"ser que esté seguro de que %1 no está corriendo ya."
+"%1 ya parece estar corriendo en otra pantalla de esta máquina. Lanzar %1 y "
+"%2 al mismo tiempo puede causar la pérdida de correo. No debería iniciar %2 "
+"a no ser que esté seguro de que %1 no está corriendo ya."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 ya parece estar corriendo en %2. Lanzar %1 más de una vez puede causar la "
-"pérdida de correos. No debería iniciar %1 en este computador a no ser que esté "
-"seguro de que no está corriendo ya en %2."
+"pérdida de correos. No debería iniciar %1 en este computador a no ser que "
+"esté seguro de que no está corriendo ya en %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 ya parece estar corriendo en %3. Lanzar %1 y %2 al mismo tiempo puede causar "
-"la pérdida de correos. No debería iniciar %2 en este computador a no ser que "
-"esté seguro de que %1 no está corriendo ya en %3."
+"%1 ya parece estar corriendo en %3. Lanzar %1 y %2 al mismo tiempo puede "
+"causar la pérdida de correos. No debería iniciar %2 en este computador a no "
+"ser que esté seguro de que %1 no está corriendo ya en %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10612,6 +10487,10 @@ msgstr "Comenzar %1"
 msgid "Exit"
 msgstr "Salir"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Mensajes nuevos en"
@@ -10638,17 +10517,18 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet no está disponible. Se recomienda encarecidamente que utilice "
 "TDEWallet para gestionar sus contraseñas.\n"
 "Sin embargo, KMail puede almacenar la contraseña en el archivo de "
 "configuración. En este caso, la contraseña se almacenará en el archivo de "
-"configuración de KMail. La contraseña se guarda en un formato ofuscado, pero no "
-"se debe considerar un seguro frente a los intentos para descifrar su contenido, "
-"si se consigue el archivo que contiene la contraseña.\n"
+"configuración de KMail. La contraseña se guarda en un formato ofuscado, pero "
+"no se debe considerar un seguro frente a los intentos para descifrar su "
+"contenido, si se consigue el archivo que contiene la contraseña.\n"
 "¿Quiere almacenar la contraseña para la cuenta «%1» en el archivo de "
 "configuración?"
 
@@ -10720,8 +10600,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Una orden que se ejecutará antes de enviar correo. Puede usarse, por ejemplo, "
-"para configurar túneles. Déjelo vacío si no debe ejecutarse ninguna orden."
+"Una orden que se ejecutará antes de enviar correo. Puede usarse, por "
+"ejemplo, para configurar túneles. Déjelo vacío si no debe ejecutarse ninguna "
+"orden."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10729,8 +10610,8 @@ msgstr "El servido&r necesita autenticación"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Marque esta opción si su servidor de SMTP requiere autenticación antes de "
 "aceptar correo. Esto es conocido como 'SMTP autenticado' o simplemente como "
@@ -10754,15 +10635,14 @@ msgstr "Enviar nombre de la máquina personalizado al servi&dor"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Marque esta opción si quiere que KMail use un nombre de máquina personalizado "
-"cuando se identifique con el servidor de correo. "
-"<p>Es útil si el nombre de su sistema no está bien configurado o para "
-"enmascarar el nombre real de la máquina."
+"Marque esta opción si quiere que KMail use un nombre de máquina "
+"personalizado cuando se identifique con el servidor de correo. <p>Es útil si "
+"el nombre de su sistema no está bien configurado o para enmascarar el nombre "
+"real de la máquina."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10793,11 +10673,11 @@ msgstr "Sólo se permiten archivos locales."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"El campo «máquina» no puede estar vacío. Haga el favor de introducir el nombre "
-"o la dirección IP del servidor SMTP."
+"El campo «máquina» no puede estar vacío. Haga el favor de introducir el "
+"nombre o la dirección IP del servidor SMTP."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10809,15 +10689,16 @@ msgstr "Error al intentar listar la carpeta %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Anular localmente la suscripción de las carpetas elimina la información "
-"presente localmente acerca de esas carpetas. Las carpetas no se modifican en el "
-"servidor. Presione cancelar ahora si quiere asegurarse de que todos los cambios "
-"locales se hayan escrito en el servidor comprobando primero el correo."
+"presente localmente acerca de esas carpetas. Las carpetas no se modifican en "
+"el servidor. Presione cancelar ahora si quiere asegurarse de que todos los "
+"cambios locales se hayan escrito en el servidor comprobando primero el "
+"correo."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11038,35 +10919,27 @@ msgstr "&Editar mensaje"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>La información devuelta por la extensión de cifrado no puede procesarse "
-"correctamente, la extensión puede estar dañada.</p>"
-"<p>Por favor contacte con el administrador de sistemas.</p></qt>"
+"<qt> <p>La información devuelta por la extensión de cifrado no puede "
+"procesarse correctamente, la extensión puede estar dañada.</p><p>Por favor "
+"contacte con el administrador de sistemas.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>No se encontró ningún accesorio de cifrado y el código OpenPGP no funciona "
-"correctamente.</p>"
-"<p>Puede hacer dos cosas para cambiar esto:</p>"
-"<ul> "
-"<li><em>BIEN</em> activar el accesorio usando Preferencias/Configurar "
-"KMail/Accesorios.</li>"
-"<li><em>O BIEN</em> especificar la configuración tradicional de OpenPGP en la "
-"etiqueta Identidad/Avanzadas.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>No se encontró ningún accesorio de cifrado y el código OpenPGP no "
+"funciona correctamente.</p><p>Puede hacer dos cosas para cambiar esto:</"
+"p><ul> <li><em>BIEN</em> activar el accesorio usando Preferencias/Configurar "
+"KMail/Accesorios.</li><li><em>O BIEN</em> especificar la configuración "
+"tradicional de OpenPGP en la etiqueta Identidad/Avanzadas.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11078,8 +10951,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "La dorsal de Chiasmus no ofrece la función «x-encrypt». Haga el favor de "
 "informar de este error."
@@ -11098,20 +10971,20 @@ msgstr "Error en el cifrado de Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Valor devuelto inesperado de la dorsal de Chiasmus: la función «x-encrypt» no "
-"devolvió un vector de bytes. Haga el favor de informar de este error."
+"Valor devuelto inesperado de la dorsal de Chiasmus: la función «x-encrypt» "
+"no devolvió un vector de bytes. Haga el favor de informar de este error."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"El formato del mensaje de cifrado OpenPGP en línea no admite el cifrado ni el "
-"firmado de los adjuntos.\n"
+"El formato del mensaje de cifrado OpenPGP en línea no admite el cifrado ni "
+"el firmado de los adjuntos.\n"
 "¿Está seguro de que quiere usar el obsoleto formato OpenPGP en línea?"
 
 #: messagecomposer.cpp:640
@@ -11163,8 +11036,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Ha solicitado firmar este mensaje, pero no hay claves de firmado válidas para "
-"esta identidad."
+"Ha solicitado firmar este mensaje, pero no hay claves de firmado válidas "
+"para esta identidad."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11220,12 +11093,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"El examen de las preferencias de cifrado de los destinatarios indicó que se le "
-"debería preguntar sin se debe cifrar o no el mensaje.\n"
+"El examen de las preferencias de cifrado de los destinatarios indicó que se "
+"le debería preguntar sin se debe cifrar o no el mensaje.\n"
 "¿Cifrar el mensaje?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11258,11 +11131,12 @@ msgstr "&No cifrar"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Ha solicitado cifrar este mensaje, y cifrar una copia para sí mismo, pero no ha "
-"configurado claves de cifrado de confianza válidas para esta identidad."
+"Ha solicitado cifrar este mensaje, y cifrar una copia para sí mismo, pero no "
+"ha configurado claves de cifrado de confianza válidas para esta identidad."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11271,13 +11145,13 @@ msgstr "¿Enviar sin cifrar?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Algunas partes de este mensaje no se cifrarán.\n"
-"Enviar mensajes cifrados sólo parcialmente podría violar la política del sitio "
-"y/o hacer vulnerable información sensible.\n"
+"Enviar mensajes cifrados sólo parcialmente podría violar la política del "
+"sitio y/o hacer vulnerable información sensible.\n"
 "¿Cifrar todas las partes entonces?"
 
 #: messagecomposer.cpp:950
@@ -11300,64 +11174,58 @@ msgstr "Cifrar todas las part&es"
 msgid "Unencrypted Message Warning"
 msgstr "Aviso de mensaje sin cifrar"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Error: El motor no devolvió ningún dato codificado.</p>"
-"<p>Por favor, avise de este error:"
-"<br>%2</p></qt>"
+"<qt><p>Error: El motor no devolvió ningún dato codificado.</p><p>Por favor, "
+"avise de este error:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>No todos los caracteres están en el juego de caracteres elegido."
-"<br>"
-"<br>¿Envio el mensaje de todas formas?</qt>"
+"<br><br>¿Envio el mensaje de todas formas?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Se perderán algunos caracteres"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Caracteres perdidos"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Cambiar c&odificación"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Este mensaje no se pudo firmar, porque el motor elegido no parece admitir "
-"firmado. Este caso nunca se debería haber presentado. Haga el favor de informar "
-"de este fallo."
+"firmado. Este caso nunca se debería haber presentado. Haga el favor de "
+"informar de este fallo."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Este mensaje no se pudo firmar, porque el motor elegido no parece admitir "
-"firmado. Este caso nunca se debería haber presentado. Haga el favor de informar "
-"de este fallo."
+"firmado. Este caso nunca se debería haber presentado. Haga el favor de "
+"informar de este fallo."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
@@ -11365,24 +11233,25 @@ msgstr ""
 "Falló la operación de firma. Compruebe que el programa gpg-agent esté "
 "funcionando."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Este mensaje no se pudo cifrar, porque el motor elegido no parece admitir "
-"cifrado. Este caso nunca se debería haber presentado. Haga el favor de informar "
-"de este fallo."
+"cifrado. Este caso nunca se debería haber presentado. Haga el favor de "
+"informar de este fallo."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Este mensaje no se pudo firmar y cifrar, porque el motor elegido no parece "
 "admitir la combinación de firmado y cifrado.Este caso nunca se debería haber "
@@ -11407,13 +11276,13 @@ msgstr "&Formato del buzón:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Seleccione si quiere almacenar los mensajes en esta carpeta como un archivo por "
-"mensaje (maildir) o como un archivo grande (mbox). Kmail usa de forma "
+"Seleccione si quiere almacenar los mensajes en esta carpeta como un archivo "
+"por mensaje (maildir) o como un archivo grande (mbox). Kmail usa de forma "
 "predefinida maildir y solo debe cambiarlo en contadas circunstancias. Si no "
 "está seguro, deje esta opción así."
 
@@ -11424,12 +11293,12 @@ msgstr "&Contenido de la carpeta:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Seleccione si quiere que la carpeta nueva se use para almacenar correo o para "
-"almacenar elementos de groupware como tareas o notas. De forma predefinida, es "
-"para correo. Si no está seguro, deje esta opción así."
+"Seleccione si quiere que la carpeta nueva se use para almacenar correo o "
+"para almacenar elementos de groupware como tareas o notas. De forma "
+"predefinida, es para correo. Si no está seguro, deje esta opción así."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11468,8 +11337,7 @@ msgstr "Resultados diferentes para las firmas"
 msgid "The crypto engine returned no cleartext data."
 msgstr "El motor de cifrado no devolvió datos de texto en claro."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Estado:"
 
@@ -11498,11 +11366,11 @@ msgstr "No se encontró el accesorio %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"El mensaje está firmado, pero no se pudo verificar la validez de la firma.<br />"
-"Motivo: %1"
+"El mensaje está firmado, pero no se pudo verificar la validez de la firma."
+"<br />Motivo: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11536,26 +11404,28 @@ msgstr "El accesorio de cifrado «%1» no puede descifrar mensajes."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b> Este mensaje HTML puede contener referencias externas a imágenes, "
-"etc. Por motivos de seguridad y privacidad, no se cargan las referencias "
-"externas. Si confía en el remitente del mensaje, puede cargar las referencias "
-"externas de este mensaje <a href=\"kmail:loadExternal\">haciendo clic aquí</a>."
+"<b>Nota:</b> Este mensaje HTML puede contener referencias externas a "
+"imágenes, etc. Por motivos de seguridad y privacidad, no se cargan las "
+"referencias externas. Si confía en el remitente del mensaje, puede cargar "
+"las referencias externas de este mensaje <a href=\"kmail:loadExternal"
+"\">haciendo clic aquí</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b> Éste es un mensaje HTML. Por razones de seguridad sólo se muestra "
-"el código HTML. Si se fía del remitente puede activar la visualización de HTML "
-"para este  mensaje <a href=\"kmail:showHTML\">pulsando aquí</a>."
+"<b>Nota:</b> Éste es un mensaje HTML. Por razones de seguridad sólo se "
+"muestra el código HTML. Si se fía del remitente puede activar la "
+"visualización de HTML para este  mensaje <a href=\"kmail:showHTML\">pulsando "
+"aquí</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11811,11 +11681,11 @@ msgstr "guardado: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"No hay una dirección de correo-e almacenada en el %1 usada para firmar, por lo "
-"que no podemos compararla con la dirección del remitente %2."
+"No hay una dirección de correo-e almacenada en el %1 usada para firmar, por "
+"lo que no podemos compararla con la dirección del remitente %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11930,14 +11800,15 @@ msgstr "Mensaje de error de Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Su servidor POP3 (Cuenta: %1) no admite la orden UIDL: esta orden es necesaria "
-"para determinar, de forma fiable, cuáles de los mensajes del servidor ha visto "
-"ya KMail.\n"
+"Su servidor POP3 (Cuenta: %1) no admite la orden UIDL: esta orden es "
+"necesaria para determinar, de forma fiable, cuáles de los mensajes del "
+"servidor ha visto ya KMail.\n"
 "La opción de dejar los mensajes en el servidor tampoco funcionará bien."
 
 #: popaccount.cpp:752
@@ -11958,10 +11829,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Obteniendo el mensaje %1 de %2 (%3 de %4 KB) para %5@%6 (%7 KB permanecen en el "
-"servidor)."
+"Obteniendo el mensaje %1 de %2 (%3 de %4 KB) para %5@%6 (%7 KB permanecen en "
+"el servidor)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11977,1901 +11849,15 @@ msgstr "Respuesta no válida del servidor"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Lo siento su servidor no soporta la orden TOP. No es posible descargarse las "
 "cabeceras de los mensajes largos antes de descargarlos enteros."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Ir"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Car&peta"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mensaje"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Responder especial"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Reen&viar"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barra de herramientas HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Firmando"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Firmar los mensajes &automáticamente"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Cuando se habilite esta opción, se firmarán todos los mensajes que se escriban. "
-"Por supuesto, se puede deshabilitar esta opción para cada mensaje."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Cifrando"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Cuando se habilite esta opción, el mensaje/archivo no sólo se cifrará con la "
-"clave pública del destinatario, sino también con su propia clave. Esto hará "
-"posible que pueda descifrar el mensaje/archivo posteriormente. Suele ser una "
-"buena idea."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Mostrar el texto f&irmado/cifrado tras la edición"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Cuando habilite esta opción, el texto firmado/cifrado se mostrará en una "
-"ventana aparte, permitiéndole saber qué aspecto tendrá antes de enviarlo. Suele "
-"ser una buena idea cuando está verificando el correcto funcionamiento de su "
-"sistema de cifrado."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Almacenar mensajes ci&frados enviados"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Comprobar al guardar mensajes cifrados "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Almacenar mensajes cifrados</h1>\n"
-"Cuando se habilita esta opción, los mensajes enviados se almacenarán cifrados "
-"como fueron enviados. No se recomienda porque no será capaz de leer los "
-"mensajes una vez que los certificados hayan caducado.\n"
-"<p>\n"
-"Como siempre pueden existir reglas locales que requieran que habilite esta "
-"opción. En caso de duda consulte con su administrador.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Mostrar siempre las claves de cifrado para su a&probación"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Cuando esta opción está activada, la aplicación le mostrará siempre una lista "
-"de las claves públicas que tiene, de las que tiene que elegir la que se debe "
-"usar para el cifrado. Si no está activada, la aplicación sólo mostrará el "
-"cuadro de diálogo si no puede encontrar la clave adecuada o si hay varias que "
-"se podrían usar."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Cifrar mensajes automáticamente los &mensajes siempre que sea posible"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Cuando esté activada esta opción, se cifrarán todos los mensajes que envíen "
-"siempre que se pueda cifrar y así lo desee. Por supuesto, es posible desactivar "
-"individualmente para cada mensaje el cifrado automático."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "No firmar/cifrar nunca al guar&dar como borrador"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "¿Cómo funciona?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Para: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universal"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Responder"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Responder a todos"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Reenviar"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Acceso rá&pido:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Tipo de plan&tilla:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Propiedades de la carpeta"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "La carpeta &mantiene una lista de correo"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Dirección de la list&a:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "No l&eído:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Caducidad de mensajes"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Caducar t&ras:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Caducar mensajes &leídos"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Caducar tra&s:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Caducar mensajes &no leídos"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dia(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Semana(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mes(es)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avanzado"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identidad del &remitente:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Formato del almacenamien&to:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Visor de &lista:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validar los certificados usando CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Si está seleccionada esta opción, los certificados S/MIME se validarán usando "
-"Listas de Revocación de Certificados (CRLs)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validar certificados en línea (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Si esta opción está seleccionada, los certificados S/MIME se validarán en línea "
-"usando el Protocolo de Estado de Certificados En Línea (OCSP). Rellene abajo la "
-"URL del repetidor OCSP."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Validación de certificados en línea"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL del repetidor OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Introduzca aquí la dirección del servidor para la validación en línea de "
-"certificados (repetidor OCSP). La URL suele comenzar con http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Firma del repetidor OCSP."
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorar el URL del servicio de certificados"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "No comprobar las políticas del certificados"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"De forma predefinida, GnuPG usa el archivo ~/.gnupg/policies.txt para comprobar "
-"si se permite la política de un certificado. Si está seleccionada esta opción, "
-"no se comprueban las políticas."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "No consultar nunca una CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Si está marcada esta opción, nunca se usarán las Listas de Revocación de "
-"Certificados para validar certificados S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Descargar certificados de emisores no encontrados"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Si esta opción está marcada, los certificados de emisores no encontrados se "
-"descargarán cuando sea necesario (esto se aplica a ambos métodos de validación, "
-"CRLs y OCSP)."
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Peticiones HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "No realizar ninguna petición HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Desactiva por completo el uso de HTTP para S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Usar este proxy para las peticiones HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Usar el proxy HTTP del sistema:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Si esta opción está seleccionada, el valor del proxy HTTP que se muestra a la "
-"derecha (lo que venga de la variable de entorno http_proxy) se usará para las "
-"peticiones HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Indique aquí la ubicación de su proxy HTTP, que se usará para todas las "
-"peticiones HTTP relativas a S/MIME. La sintaxis es «máquina:puerto». Por "
-"ejemplo, «miproxy.ningundominio.com:3128»."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorar el punto de distribución de certificados CRL por HTTP"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Al buscar la ubicación de un CRL, el certificado que se va a probar suele "
-"contener entradas del tipo «punto de distribución CRL» (DP), que son URLs que "
-"describen la forma de acceder a las URLs. La primera entrada DP que se "
-"encuentre en la que se usará.  Con eta opción, todas las entradas que usen el "
-"esquema HTTP se ignorarán cuando se busque un DP adecuado."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Peticiones LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "No realizar ninguna petición LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Desactiva por completo el uso de LDAP para S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorar el punto de distribución de certificados CRL por LDAP"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Al buscar la ubicación de un CRL, el certificado que se va a probar suele "
-"contener entradas del tipo «punto de distribución CRL» (DP), que son URLs que "
-"describen la forma de acceder a las URLs. La primera entrada DP que se "
-"encuentre en la que se usará.  Con eta opción, todas las entradas que usen el "
-"esquema LDAP se ignorarán cuando se busque un DP adecuado."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Máquina principal para peticiones LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Al introducir aquí un servidor LDAP, hace que todas las peticiones LDAP se "
-"dirijan en primer lugar a ese servidor. De forma más precisa, esta opción es "
-"prioritaria con respecto a cualquier otra máquina y puerto que indique en una "
-"URL de LDAP y también se usará si es que omite la máquina y el puerto en la "
-"URL. Se usarán otros servidores LDAP sólo si fallase la conexión al proxy.\n"
-"La sintaxis es «máquina» o «máquina:puerto». Si se omite el puerto, se usa el "
-"389 (el puerto estándar para LDAP)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Añadir fragmento"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Añadir"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Fragmento:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Grupo:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Preferencias del fragmento"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variables"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "ilimitado"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Responder al remitente"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Responder a todos / Responder a la lista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Reenviar mensaje"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "A&visar si intenta enviar mensajes sin firmar"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Marque para que le avise cuando envíe mensajes sin firmar."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar al intentar enviar un mensaje sin firmar</h1>\n"
-"Si habilita esta opción se le avisará cuando intente enviar partes o un mensaje "
-"completo sin firmar.\n"
-"<p>\n"
-"Se recomienda mantener esta opción habilitada para la máxima seguridad de "
-"integridad.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "A&visar si intenta enviar mensajes sin cifrar"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Marcar para ser avisado cuando envíe mensajes sin cifrar."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar cuando se intente enviar un mensaje sin cifrar</h1>\n"
-"Si se marca esta opción, se le avisará si se intenta enviar un mensaje o parte "
-"de un mensaje sin cifrar.\n"
-"<p>\n"
-"Se recomienda el dejar esta opción habilitada para conseguir máxima "
-"integridad.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Avisar si la dirección de correo-e del destinata&rio no está en el certificado"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Marcar para ser avisado si la dirección no está en el certificado"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar si la dirección del destinatario no esta en el certificado</h1>\n"
-"Si se habilita esta opción, se le avisará si la dirección del destinatario no "
-"se encuentra en el certificado usado para cifrar.\n"
-"<p>\n"
-"Se recomienda dejar esta opción habilitada para conseguir una máxima "
-"seguridad.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Avisar si el certificado o las claves caducan pronto (el umbral se configura "
-"más abajo)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Para firmar"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Para cifrar"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dias"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Seleccione aquí el número de días"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar si el certificado de firma caduca</h1>\n"
-"Seleccione el mínimo número de dias que el certificado de firma debe ser válido "
-"para que no se le avise.\n"
-"<p>\n"
-"El valor recomendado de SPHINX es de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar si el certificado de cifrado caduca</h1>\n"
-"Seleccione el mínimo número de dias que el certificado de cifrado debe ser "
-"válido para que no se avise.\n"
-"<p>\n"
-"El valor recomendado por SPHINX es de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar si caduca un certificado de la cadena</h1>\n"
-"Seleccione el mínimo número de dias en el que todos los certificados de la "
-"cadena deberán ser válidos para que no se avise.\n"
-"<p>\n"
-"El valor recomendado por SPHINX es de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar si el certificado de la CA caduca</h1>\n"
-"Seleccione el mínimo número de dias que el certificado de la CA debe ser válido "
-"para que no se le avise.\n"
-"<p>\n"
-"El valor recomendado por SPHINX es de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar si el certificado raiz caduca</h1>\n"
-"Seleccione el mínimo número de dias que el certificado raiz debe ser válido sin "
-"que se avise.\n"
-"<p>\n"
-"La configuración SPHINX recomendada es de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Para certificados raíces:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Para certificados intermedios de CA:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Para certificados y claves de usuario final:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Reactivar todas las advertencias de «No volver a preguntar»."
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Contenido de la plantilla"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Acceso rápido a la plantilla"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Tipo de plantilla"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Enviar el correo en cola al comprobar el correo"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Seleccione si quiere que KMail envíe todos los mensajes de la bandeja de "
-"salida manualmente o todas las comprobaciones de correo, o si no quiere que se "
-"envíen automáticamente los mensajes. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Mueve automáticamente los correos no sincronizados de las carpetas que no "
-"tienen suficientes derechos de acceso"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Si hay mensajes nuevos en una carpeta, que no se ha publicado todavía en el "
-"servidor, pero no tiene suficientes derechos de acceso en el servidor al que va "
-"a publicarlos, se mueven automáticamente a una carpeta de perdidos y "
-"encontrados."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Estas opciones permiten que los administradores definan un retardo mínimo entre "
-"dos comprobaciones de correo.\"\n"
-"           \"El usuario no puede elegir un valor más pequeño que el valor aquí "
-"definido."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"La carpeta seleccionada más recientemente en el cuadro de diálogo de selección "
-"de carpetas."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Ignorar la configuración umask del usuario y usar en su lugar "
-"«escritura-lectura sólo para el usuario»."
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Política para mostrar el icono de la bandeja del sistema"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Notificación informativa de correo nuevo"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Si está activada esta opción, se mostrará el número de mensajes nuevos que han "
-"llegado a la carpeta en la notificación de correo nuevo. En otro caso, sólo se "
-"mostrará un mensaje «Ha llegado correo nuevo»."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "E&specificar editor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Usar editor externo en lugar del editor por omisión"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Activar la funcionalidad de groupware"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Gestionar encabezados De:/A: para respuestas a invitaciones"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook tiene varias limitaciones en su implementación del estándar "
-"iCalendar. Esta opción trabaja sobre una de ellas. Si tiene problemas con los "
-"usuarios de Outlook, que no pueden obtener sus respestas, intente configurar "
-"esta opción."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Enviar invitaciones de groupware en el cuerpo del correo"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook tiene varias limitaciones en su implementación del estándar "
-"iCalendar. Esta opción soluciona una de ellas. Si tiene problemas con los "
-"usuarios de Outlook, que no pueden obtener sus respestas, intente configurar "
-"esta opción."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Denominación de invitaciones compatible con Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook, cuando se utiliza en combinación con un servidor Microsoft "
-"Exchange, tiene un problema para entender los correos de groupware que siguen "
-"los estándares. Active esta opción para enviar invitaciones de groupware que "
-"pueda entender Microsoft Exchange."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Cuando está marcado, no verá la ventana de edición de correo, sino que todos "
-"los correos de las invitaciones se enviarán automáticamente. Si quiere ver el "
-"correo antes de enviarlo, puede quitar la marca de esta opción. Tenga en cuenta "
-"que el texto de la ventana de edición mantiene la sintaxis de iCalendar, por lo "
-"que no debería modificarlo manualmente."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Activándolo, es posible almacenar las entradas de las aplicaciones de "
-"Kontact (KOrganizer, KAddressBook y KNotes).</p>"
-"<p>Además de esto, debe configurar las aplicaciones para que usen el recurso "
-"IMAP. Esto se hace desde el centro de control de TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalmente no tendrá ningún motivo para ver las carpetas que mantienen los "
-"recursos IMAP. Pero si lo necesita, puede configurarlo aquí.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Si la cuenta que se usa para almacenar información de groupware \"\n"
-"          \"no se utiliza para gestionar el correo normal, puede definir esta "
-"opción para hacer que KMail sólo \"\n"
-"          \"muestre las carpetas de groupware que hay en ella. Es útil si "
-"quiere gestionar el correo normal \"\n"
-"          \"mediante una cuenta IMAP online.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Elija el formato de almacenamiento para las carpetas de groupware. "
-"<ul>"
-"<li>El formato predeterminado es usar los estándares ical (para carpetas de "
-"calendario) y vcard (para carpetas de libreta de direcciones). Estos formatos "
-"hacen que estén disponibles todas las opciones de Kontact.</li>"
-"<li>El formato Kolab XML usa un modelo personal que se parece más al que se usa "
-"en Outlook. Este formato permite una mejor compatibilidad con Outlook, cuando "
-"se está usando un servidor Kolab o una solución compatible.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Elige el padre de las carpetas del recurso IMAP.</p> "
-"<p>De forma predefinida, el servidor Kolab configura el buzón de entrada IMAP "
-"como el padre.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Es el id. de la cuenta que alberga las carpetas del recurso IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Si quiere configurar los nombres de las carpetas del almacenamiento IMAP en "
-"su idioma local, puede elegir entre estos idiomas disponibles.</p>"
-"<p>Tenga en cuenta que la única razón para hacerlo es por compatibilidad con "
-"Microsoft Outlook. Se considera una mala idea configurarlo, porque hace "
-"imposible el cambio de idioma.</p>"
-"<p>Así que no lo configure a no ser que tenga que hacerlo.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Este valor se usa para decir si se debe mostrar la introducción a KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Número máximo de conexiones por máquina"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Se puede usar para restringir el número de conexiones por máquina cuando se "
-"está comprobando si hay correo nuevo. De forma predeterminada, el número de "
-"conexiones es ilimitado (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Mostrar edición de línea en la búsqueda rápida"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Esta opción activa o desactiva la edición de la línea de búsqueda sobre la "
-"lista de mensajes, que se puede usar para buscar rápidamente la información que "
-"se muestra en la lista de mensajes."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"&Mantener la tabla de caracteres original al responder o reenviar, si es "
-"posible"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Añadir la firma automáticamente"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Recuerda esta identidad, para que se pueda usar también en futuras ventanas del "
-"editor.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Recuerda esta carpeta para enviar elementos, para que se pueda usar también en "
-"futuras ventanas del editor."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Recuerda este transporte de correo, para que se pueda usar también en futuras "
-"ventanas del editor."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Recuerda esta identidad, para que se pueda usar también en futuras ventanas del "
-"editor.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "A&juste de palabras en la columna:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Número máximo de líneas del editor para destinatarios."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Active esta opción para hacer que Outlook &#8482; entienda los nombres de "
-"adjuntos que tengan caracteres no ingleses."
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Solicitar auto&máticamente acuse de recibo"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Active esta opción si quiere que KMail solicite acuse de recibo para cada "
-"uno de los mensajes salientes.</p>"
-"<p>Esta opción sólo afecta al comportamiento predeterminado. Puede activar o "
-"desactivar las peticiones de acuse de recibo en el editor de cada mensaje "
-"saliente, con el elemento del menú <em>Opciones</em>-><em>"
-"Petición de acuse de recibo</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Usar direcciones recientes para la terminación automática"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Desactive esta opción si no quiere que las direcciones recientes de correo "
-"electrónico aparezcan en la lista de terminación automática en los campos de "
-"direcciones del editor."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Guardar automáticamente cada:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Se puede hacer regularmente una copia del texto que hay en la ventana del "
-"editor. El intervalo para crear las copias de seguridad se configura aquí. "
-"Puede desactivar la característica de guardado automático si pone el valor a 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Sustituir el &prefijo reconocido por «Re:»"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Sustituir prefijo reconocido con «&Fwd:»"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Usar citado inteligente"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "La firma ha caducado."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tipo de selector de direcciones"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Define el tipo del cuadro de diálogo para seleccionar destinatarios\n"
-"        en los campos «Para», «CC» y «BCC»."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Tipo de editor de los destinatarios"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Define el tipo de editor de los destinatarios\n"
-"        en los campos «Para», «CC» y «BCC»."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Número máximo de líneas del editor para destinatarios."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"&Mantener la tabla de caracteres original al responder o reenviar, si es "
-"posible"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Algunos mensajes, en especial los que se generan automáticamente, no "
-"especifican qué codificación de caracteres se debe usar para mostrarlos "
-"adecuadamente. En estos casos, se usará la codificación de caracteres "
-"predefinida, que es la que puede configurar aquí. Defina la codificación de "
-"caracteres que use con más frecuencia en su zona geográfica. por omisión, la "
-"codificación que está configurada es para el sistema que se utiliza en todo el "
-"mundo."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Si cambia esto de la opción predefinida a «Auto», obligará a que se use la "
-"codificación que indique para todos los mensajes, sin tener en cuenta lo que "
-"indiquen dichos mensajes."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Active esto si quiere que los smileys de texto tipo :-) que aparecen en los "
-"mensajes se reemplacen por emoticonos (pequeñas imágenes)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Active esta opción para mostrar diferentes niveles de cita del texto. "
-"Desactívelo para ocultar los niveles de citado del texto."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Nivel automático de contracción:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reducir el tamaño de la tipografía para el texto citado"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Active esta opción para mostrar el texto citado con una tipografía más pequeña."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Almacenar mensajes ci&frados enviados"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Mostrar agente de usuario en las cabeceras adornadas"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Activar esta opción para mostrar el agente de usuario y las líneas de cabecera "
-"con el cliente de correo gráfico al usar cabeceras adornadas."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Enviar acuse de recibo con un remitente vacío."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Enviar acuses de recibo con una cadena de remitente vacía. Algunos servidores "
-"pueden estar configurados para rechazar estos mensajes, de modo que si tiene "
-"problemas para enviar los acuses de recibo, desmarque esta opción."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Las frases se han convertido en plantillas"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Las frases antiguas se han convertido en plantillas"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Plantilla para mensajes nuevos"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Plantilla para responder"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Plantilla para responder a todos"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Plantilla para reenviar"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Caracteres de citado"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 de %2 %3 usado"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13981,6 +11967,11 @@ msgstr "Añadir como «CC»"
 msgid "Add as BCC"
 msgstr "Añadir como «BCC»"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "C&ancelar"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13996,15 +11987,15 @@ msgstr "Destinatarios seleccionados"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Seleccionó 1 destinatario. El número máximo de destinatarios que se admite es "
-"%1. Haga el favor de adaptar la selección.\n"
-"Seleccionó %n destinatarios. El número máximo de destinatarios que se admite es "
-"%1. Haga el favor de adaptar la selección."
+"Seleccionó 1 destinatario. El número máximo de destinatarios que se admite "
+"es %1. Haga el favor de adaptar la selección.\n"
+"Seleccionó %n destinatarios. El número máximo de destinatarios que se admite "
+"es %1. Haga el favor de adaptar la selección."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -14020,8 +12011,8 @@ msgstr "Usar el cuadro de diálogo de selección de direcciones"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Este botón abre un cuadro de diálogo aparte en el que puede seleccionar los "
 "destinatarios de entre todas las direcciones disponibles."
@@ -14126,14 +12117,23 @@ msgstr "es mayor o igual que"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dias"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Para ejecutar la búsqueda, se tienen que descargar todos los mensajes de la "
-"carpeta %1 del servidor. Esto puede llevar bastante tiempo. ¿Quiere seguir con "
-"la búsqueda?"
+"carpeta %1 del servidor. Esto puede llevar bastante tiempo. ¿Quiere seguir "
+"con la búsqueda?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14281,16 +12281,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Recopilando datos para la cuenta «%1»...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Recopilando datos para la cuenta «%1»...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14309,10 +12305,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Contenido del guión «%1»:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Contenido del guión «%1»:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14335,20 +12329,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Capacidades de Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Capacidades de Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(No hay disponible ninguna capacidad especial)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Guiones de Sieve disponibles:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Guiones de Sieve disponibles:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14428,11 +12418,11 @@ msgstr "Use este campo para introducir una firma estática arbitraria."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Use esta casilla para especificar un archivo de texto que contenga su firma. Se "
-"leerá cada vez que cree un correo nuevo o añada una firma nueva."
+"Use esta casilla para especificar un archivo de texto que contenga su firma. "
+"Se leerá cada vez que cree un correo nuevo o añada una firma nueva."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14448,14 +12438,14 @@ msgstr "Abre el archivo indicado en un editor de texto."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Puede añadir aquí una orden arbitraria, con o sin ruta, según esté la orden en "
-"su ruta estándar o no. Para cada correo nuevo, KMail ejecutará la orden y "
+"Puede añadir aquí una orden arbitraria, con o sin ruta, según esté la orden "
+"en su ruta estándar o no. Para cada correo nuevo, KMail ejecutará la orden y "
 "mostrará su salida estándar como firma. Las órdenes habituales para este "
 "mecanismo son «fortune» o «ksig -random»."
 
@@ -14463,6 +12453,11 @@ msgstr ""
 msgid "S&pecify command:"
 msgstr "Es&pecificar orden:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Ruta"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nueva entrada:"
@@ -14498,6 +12493,11 @@ msgstr "Añadir grupo"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>¿Realmente quiere eliminar la identidad llamada <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "A&plicar a:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Editar fragmento"
@@ -14510,6 +12510,10 @@ msgstr "Editar grupo"
 msgid "Edit &group..."
 msgstr "Editar &grupo..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Editar..."
@@ -14546,9 +12550,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14585,6 +12589,16 @@ msgstr "No activar"
 msgid "Cannot insert content from file %1: %2"
 msgstr "No se puede insertar el contenido del archivo %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Para: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14614,61 +12628,52 @@ msgstr "No se puede iniciar la tubería de órdenes de la plantilla: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí puede crear plantillas de mensajes para usarlas cuando escriba mensajes "
-"nuevos o respuestas, o cuando reenvíe mensajes.</p>"
-"<p>Las plantillas de mensajes admites órdenes de sustitución, bien tecleándolas "
-"o bien seleccionándolas en el menú <i>Insertar orden</i>.</p>"
-"<p>Las plantillas que se indican aquí son específicas de la carpeta. Suplantan "
-"a las plantillas globales y a las plantillas por identidad si se "
-"especifican.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aquí puede crear plantillas de mensajes para usarlas cuando escriba "
+"mensajes nuevos o respuestas, o cuando reenvíe mensajes.</p><p>Las "
+"plantillas de mensajes admites órdenes de sustitución, bien tecleándolas o "
+"bien seleccionándolas en el menú <i>Insertar orden</i>.</p><p>Las plantillas "
+"que se indican aquí son específicas de la carpeta. Suplantan a las "
+"plantillas globales y a las plantillas por identidad si se especifican.</p></"
+"qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí puede crear plantillas de mensajes para usarlas cuando escriba mensajes "
-"nuevos o respuestas, o cuando reenvíe mensajes.</p>"
-"<p>Las plantillas de mensajes admites órdenes de sustitución, bien tecleándolas "
-"o bien seleccionándolas en el menú <i>Insertar orden</i>.</p>"
-"<p>Las plantillas que se indican aquí son propias de la identidad. Suplantan a "
-"las plantillas globales y las suplantan las plantillas de carpeta, si se "
-"indican.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aquí puede crear plantillas de mensajes para usarlas cuando escriba "
+"mensajes nuevos o respuestas, o cuando reenvíe mensajes.</p><p>Las "
+"plantillas de mensajes admites órdenes de sustitución, bien tecleándolas o "
+"bien seleccionándolas en el menú <i>Insertar orden</i>.</p><p>Las plantillas "
+"que se indican aquí son propias de la identidad. Suplantan a las plantillas "
+"globales y las suplantan las plantillas de carpeta, si se indican.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aquí puede crear plantillas de mensajes para usarlas cuando escriba mensajes "
-"nuevos o respuestas, o cuando reenvíe mensajes.</p>"
-"<p>Las plantillas de mensajes admites órdenes de sustitución, bien tecleándolas "
-"o bien seleccionándolas en el menú <i>Insertar orden</i>.</p>"
-"<p>Esta es una plantilla global (predefinida). Las pueden suplantar las "
-"plantillas por identidad y las plantillas por carpeta si se especifican.</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aquí puede crear plantillas de mensajes para usarlas cuando escriba "
+"mensajes nuevos o respuestas, o cuando reenvíe mensajes.</p><p>Las "
+"plantillas de mensajes admites órdenes de sustitución, bien tecleándolas o "
+"bien seleccionándolas en el menú <i>Insertar orden</i>.</p><p>Esta es una "
+"plantilla global (predefinida). Las pueden suplantar las plantillas por "
+"identidad y las plantillas por carpeta si se especifican.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14924,6 +12929,10 @@ msgstr "Filtrar el cuerpo de mensaje actual e insertar el resultado tal cual"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Filtrar el cuerpo del mensaje actual y reemplazarlo con el resultado"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Definir la posición del cursor"
@@ -14956,111 +12965,6 @@ msgstr "Activar la depuración"
 msgid "Turn Debug Off"
 msgstr "Desactivar la depuración"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...que puede ir a los mensajes anterior y siguiente usando\n"
-"respectivamente las flechas derecha e izquierda del teclado?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...que puede crear filtros rápidamente para el remitente, destinatario,\n"
-"asunto y listas de correo con <em>Herramientas-&gt;Crear&nbsp;filtro</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que puede deshacerse del &quot;[nombre de la lista]&quot;\n"
-"añadido al asunto de algunos mensajes usando <em>reescribir\n"
-"cabecera</em> en la acción de filtrado? Simplemente use\n"
-"<pre>reescribir cabecera &quot;Asunto&quot;\n"
-"   reemplazar &quot;\\s*\\[nombre de la lista\\]\\s*&quot;\n"
-"   con &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...que puede asociar listas de correo con carpetas en el cuadro\n"
-"de diálogo <em>Carpeta-&gt;Gestión de listas de correo</em>? Puede usar\n"
-"<em>Mensaje-&gt;Enviar&nbsp;a&nbsp;lista&nbsp;de&nbsp;correo...</em>\n"
-"para abrir el editor con la dirección de lista de correo predefinida.\n"
-"También puede hacer clic con el botón central del ratón sobre la carpeta.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...que puede asignar iconos peronalizados a cada carpeta individualmente?\n"
-"Eche un vistazo a <em>Carpeta-&gt;Propiedades</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...que KMail puede utilizar una barra de color para indicar el tipo de "
-"mensaje (texto plano/HTML/OpenPGP) que se muestra?</p>\n"
-"<p>Puede intentarse el simular una firma correcta enviando un mensaje HTML que "
-"simule el aspecto de un mensaje firmado en KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...que puede filtrar por cualquier cabecera simplemente con su nombre en el "
-"primer campo de la regla de búsqueda?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que puede filtrar los mensajes HTML con la regla que contiene\n"
-"<pre>&quot;Content-type&quot;  &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...que al responder, sólo se citan las partes seleccionadas del mensaje?</p>"
-"\n"
-"<p>Si no hay nada seleccionado, se cita el mensaje entero.</p>\n"
-"<p>Esto funciona incluso con el texto de los adjuntos cuando ha seleccionado\n"
-"<em>Ver-&gt;Adjuntos-&gt;Incluídos</em>.</p>\n"
-"<p>Esta característica está disponible para todos las órdenes de responder\n"
-"salvo para <em>Mensaje-&gt;Responder sin citar</em>.</p>\n"
-"<p align=\"right\"><em>contribución de David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "No hay nada que deshacer."
@@ -15125,6 +13029,17 @@ msgstr "Adjunto nº %1 (sin nombre)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Ya existe un archivo llamado «%1». ¿Está seguro de que quiere "
+"sobreescribirlo?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "¿Sobreescribir el archivo?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15156,8 +13071,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Su servidor no proporciona «vacaciones» en su lista de extensiones admitidas de "
-"Sieve.\n"
+"Su servidor no proporciona «vacaciones» en su lista de extensiones admitidas "
+"de Sieve.\n"
 "Sin esto, KMail no puede instalar respuestas tipo «lejos de la oficina».\n"
 "Póngase en contacto con su administrador de sistemas, por favor."
 
@@ -15240,13 +13155,14 @@ msgstr "En&viar la imagen en cada mensaje"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Marque esta casilla si quiere que KMail añada el encabezado X-Face a los "
-"mensajes que escriba con esta identidad. Un X-Face es una imagen pequeña (48x48 "
-"píxeles) en blanco y negro que algunos clientes de correo pueden mostrar."
+"mensajes que escriba con esta identidad. Un X-Face es una imagen pequeña "
+"(48x48 píxeles) en blanco y negro que algunos clientes de correo pueden "
+"mostrar."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15275,13 +13191,13 @@ msgstr "Seleccionar archivo..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Úselo para seleccionar un archivo de imagen desde el que crear la fotografía. "
-"La imagen debe ser de alto contraste y con una forma casi cuadrática. Un fondo "
-"claro ayuda a mejorar el resultado."
+"Úselo para seleccionar un archivo de imagen desde el que crear la "
+"fotografía. La imagen debe ser de alto contraste y con una forma casi "
+"cuadrática. Un fondo claro ayuda a mejorar el resultado."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15289,21 +13205,22 @@ msgstr "Definir desde la libreta de direcciones"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Puede usar una versión reducida de la imagen que tiene configurada en la "
 "entrada de su libreta de direcciones."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail puede enviar una imagen pequeña (48x48 píxeles), de baja calidad y "
-"monocroma con cada mensaje. Por ejemplo, puede ser una fotografía o un símbolo. "
-"Si su cliente de correo electrónico lo admite, se muestra esa imagen."
+"monocroma con cada mensaje. Por ejemplo, puede ser una fotografía o un "
+"símbolo. Si su cliente de correo electrónico lo admite, se muestra esa "
+"imagen."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15311,11 +13228,11 @@ msgstr "Use este campo para introducir una cadena arbitraria para X-Face."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Hay ejemplos disponibles en <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Hay ejemplos disponibles en <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15331,130 +13248,1805 @@ msgstr "Sin imagen"
 msgid "You do not have your own contact defined in the address book."
 msgstr "No tiene su propio contacto definido en la libreta de direcciones."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Total: %2<br>Sin leer: %3<br>Tamaño: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Firmando"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Cuota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Firmar los mensajes &automáticamente"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Poner el asunto del mensaje"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Cuando se habilite esta opción, se firmarán todos los mensajes que se "
+"escriban. Por supuesto, se puede deshabilitar esta opción para cada mensaje."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Enviar CC: a «dirección»"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Cifrando"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Enviar BCC: a «dirección»"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Añadir «cabecera» al mensaje"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Cuando se habilite esta opción, el mensaje/archivo no sólo se cifrará con la "
+"clave pública del destinatario, sino también con su propia clave. Esto hará "
+"posible que pueda descifrar el mensaje/archivo posteriormente. Suele ser una "
+"buena idea."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Leer el cuerpo-del-mensaje desde «archivo»"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Mostrar el texto f&irmado/cifrado tras la edición"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Poner cuerpo del mensaje"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Cuando habilite esta opción, el texto firmado/cifrado se mostrará en una "
+"ventana aparte, permitiéndole saber qué aspecto tendrá antes de enviarlo. "
+"Suele ser una buena idea cuando está verificando el correcto funcionamiento "
+"de su sistema de cifrado."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Añadir un adjunto al mensaje. Puede repetirse."
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Almacenar mensajes ci&frados enviados"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Comprobar sólo correo nuevo"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Comprobar al guardar mensajes cifrados "
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Abrir sólo la ventana del editor"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Almacenar mensajes cifrados</h1>\n"
+"Cuando se habilita esta opción, los mensajes enviados se almacenarán "
+"cifrados como fueron enviados. No se recomienda porque no será capaz de leer "
+"los mensajes una vez que los certificados hayan caducado.\n"
+"<p>\n"
+"Como siempre pueden existir reglas locales que requieran que habilite esta "
+"opción. En caso de duda consulte con su administrador.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Ver el archivo de mensaje dado"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Mostrar siempre las claves de cifrado para su a&probación"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Enviar mensaje a «dir.» respuesta adjunto con el arch. al que apunta la «URL»"
+"Cuando esta opción está activada, la aplicación le mostrará siempre una "
+"lista de las claves públicas que tiene, de las que tiene que elegir la que "
+"se debe usar para el cifrado. Si no está activada, la aplicación sólo "
+"mostrará el cuadro de diálogo si no puede encontrar la clave adecuada o si "
+"hay varias que se podrían usar."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Leer"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Cifrar mensajes automáticamente los &mensajes siempre que sea posible"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Antiguo"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Cuando esté activada esta opción, se cifrarán todos los mensajes que envíen "
+"siempre que se pueda cifrar y así lo desee. Por supuesto, es posible "
+"desactivar individualmente para cada mensaje el cifrado automático."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Eliminado"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "No firmar/cifrar nunca al guar&dar como borrador"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Respondido"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "¿Cómo funciona?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Reenviado"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universal"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "En cola"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Responder"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Enviado"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Responder a todos"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Visto"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Reenviar"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorado"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Acceso rá&pido:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Correo basura"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Tipo de plan&tilla:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Correo válido"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Contenido de la plantilla"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Tarea pendiente"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Acceso rápido a la plantilla"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Tiene adjuntos"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Tipo de plantilla"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 de %2 %3 usado"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Propiedades de la carpeta"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Ruta"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "La carpeta &mantiene una lista de correo"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Dirección de la list&a:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "No l&eído:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Caducidad de mensajes"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Caducar t&ras:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Caducar mensajes &leídos"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Caducar tra&s:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Caducar mensajes &no leídos"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dia(s)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Semana(s)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mes(es)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identidad del &remitente:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Formato del almacenamien&to:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Visor de &lista:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Enviar el correo en cola al comprobar el correo"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Ya existe un archivo llamado «%1». ¿Está seguro de que quiere sobreescribirlo?"
+"<qt><p>Seleccione si quiere que KMail envíe todos los mensajes de la bandeja "
+"de salida manualmente o todas las comprobaciones de correo, o si no quiere "
+"que se envíen automáticamente los mensajes. </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "¿Sobreescribir el archivo?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Mueve automáticamente los correos no sincronizados de las carpetas que no "
+"tienen suficientes derechos de acceso"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Si hay mensajes nuevos en una carpeta, que no se ha publicado todavía en el "
+"servidor, pero no tiene suficientes derechos de acceso en el servidor al que "
+"va a publicarlos, se mueven automáticamente a una carpeta de perdidos y "
+"encontrados."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Estas opciones permiten que los administradores definan un retardo mínimo "
+"entre dos comprobaciones de correo.\"\n"
+"           \"El usuario no puede elegir un valor más pequeño que el valor "
+"aquí definido."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"La carpeta seleccionada más recientemente en el cuadro de diálogo de "
+"selección de carpetas."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Ignorar la configuración umask del usuario y usar en su lugar «escritura-"
+"lectura sólo para el usuario»."
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Política para mostrar el icono de la bandeja del sistema"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Notificación informativa de correo nuevo"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Si está activada esta opción, se mostrará el número de mensajes nuevos que "
+"han llegado a la carpeta en la notificación de correo nuevo. En otro caso, "
+"sólo se mostrará un mensaje «Ha llegado correo nuevo»."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "E&specificar editor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Usar editor externo en lugar del editor por omisión"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Activar la funcionalidad de groupware"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Gestionar encabezados De:/A: para respuestas a invitaciones"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook tiene varias limitaciones en su implementación del "
+"estándar iCalendar. Esta opción trabaja sobre una de ellas. Si tiene "
+"problemas con los usuarios de Outlook, que no pueden obtener sus respestas, "
+"intente configurar esta opción."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Enviar invitaciones de groupware en el cuerpo del correo"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook tiene varias limitaciones en su implementación del "
+"estándar iCalendar. Esta opción soluciona una de ellas. Si tiene problemas "
+"con los usuarios de Outlook, que no pueden obtener sus respestas, intente "
+"configurar esta opción."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Denominación de invitaciones compatible con Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook, cuando se utiliza en combinación con un servidor "
+"Microsoft Exchange, tiene un problema para entender los correos de groupware "
+"que siguen los estándares. Active esta opción para enviar invitaciones de "
+"groupware que pueda entender Microsoft Exchange."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Cuando está marcado, no verá la ventana de edición de correo, sino que todos "
+"los correos de las invitaciones se enviarán automáticamente. Si quiere ver "
+"el correo antes de enviarlo, puede quitar la marca de esta opción. Tenga en "
+"cuenta que el texto de la ventana de edición mantiene la sintaxis de "
+"iCalendar, por lo que no debería modificarlo manualmente."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Activándolo, es posible almacenar las entradas de las aplicaciones de "
+"Kontact (KOrganizer, KAddressBook y KNotes).</p><p>Además de esto, debe "
+"configurar las aplicaciones para que usen el recurso IMAP. Esto se hace "
+"desde el centro de control de TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalmente no tendrá ningún motivo para ver las carpetas que mantienen "
+"los recursos IMAP. Pero si lo necesita, puede configurarlo aquí.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Si la cuenta que se usa para almacenar información de groupware \"\n"
+"          \"no se utiliza para gestionar el correo normal, puede definir "
+"esta opción para hacer que KMail sólo \"\n"
+"          \"muestre las carpetas de groupware que hay en ella. Es útil si "
+"quiere gestionar el correo normal \"\n"
+"          \"mediante una cuenta IMAP online.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Elija el formato de almacenamiento para las carpetas de groupware. "
+"<ul><li>El formato predeterminado es usar los estándares ical (para carpetas "
+"de calendario) y vcard (para carpetas de libreta de direcciones). Estos "
+"formatos hacen que estén disponibles todas las opciones de Kontact.</"
+"li><li>El formato Kolab XML usa un modelo personal que se parece más al que "
+"se usa en Outlook. Este formato permite una mejor compatibilidad con "
+"Outlook, cuando se está usando un servidor Kolab o una solución compatible.</"
+"li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Elige el padre de las carpetas del recurso IMAP.</p> <p>De forma "
+"predefinida, el servidor Kolab configura el buzón de entrada IMAP como el "
+"padre.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Es el id. de la cuenta que alberga las carpetas del recurso IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Si quiere configurar los nombres de las carpetas del almacenamiento IMAP "
+"en su idioma local, puede elegir entre estos idiomas disponibles.</"
+"p><p>Tenga en cuenta que la única razón para hacerlo es por compatibilidad "
+"con Microsoft Outlook. Se considera una mala idea configurarlo, porque hace "
+"imposible el cambio de idioma.</p><p>Así que no lo configure a no ser que "
+"tenga que hacerlo.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Este valor se usa para decir si se debe mostrar la introducción a KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Número máximo de conexiones por máquina"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Se puede usar para restringir el número de conexiones por máquina cuando se "
+"está comprobando si hay correo nuevo. De forma predeterminada, el número de "
+"conexiones es ilimitado (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Mostrar edición de línea en la búsqueda rápida"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Esta opción activa o desactiva la edición de la línea de búsqueda sobre la "
+"lista de mensajes, que se puede usar para buscar rápidamente la información "
+"que se muestra en la lista de mensajes."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"&Mantener la tabla de caracteres original al responder o reenviar, si es "
+"posible"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Añadir la firma automáticamente"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Recuerda esta identidad, para que se pueda usar también en futuras ventanas "
+"del editor.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Recuerda esta carpeta para enviar elementos, para que se pueda usar también "
+"en futuras ventanas del editor."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Recuerda este transporte de correo, para que se pueda usar también en "
+"futuras ventanas del editor."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Recuerda esta identidad, para que se pueda usar también en futuras ventanas "
+"del editor.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "A&juste de palabras en la columna:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Número máximo de líneas del editor para destinatarios."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Active esta opción para hacer que Outlook &#8482; entienda los nombres de "
+"adjuntos que tengan caracteres no ingleses."
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Solicitar auto&máticamente acuse de recibo"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Active esta opción si quiere que KMail solicite acuse de recibo para "
+"cada uno de los mensajes salientes.</p><p>Esta opción sólo afecta al "
+"comportamiento predeterminado. Puede activar o desactivar las peticiones de "
+"acuse de recibo en el editor de cada mensaje saliente, con el elemento del "
+"menú <em>Opciones</em>-><em>Petición de acuse de recibo</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Usar direcciones recientes para la terminación automática"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Desactive esta opción si no quiere que las direcciones recientes de correo "
+"electrónico aparezcan en la lista de terminación automática en los campos de "
+"direcciones del editor."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Guardar automáticamente cada:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Se puede hacer regularmente una copia del texto que hay en la ventana del "
+"editor. El intervalo para crear las copias de seguridad se configura aquí. "
+"Puede desactivar la característica de guardado automático si pone el valor a "
+"0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Sustituir el &prefijo reconocido por «Re:»"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Sustituir prefijo reconocido con «&Fwd:»"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Usar citado inteligente"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "La firma ha caducado."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tipo de selector de direcciones"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Define el tipo del cuadro de diálogo para seleccionar destinatarios\n"
+"        en los campos «Para», «CC» y «BCC»."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Tipo de editor de los destinatarios"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Define el tipo de editor de los destinatarios\n"
+"        en los campos «Para», «CC» y «BCC»."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Número máximo de líneas del editor para destinatarios."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"&Mantener la tabla de caracteres original al responder o reenviar, si es "
+"posible"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Algunos mensajes, en especial los que se generan automáticamente, no "
+"especifican qué codificación de caracteres se debe usar para mostrarlos "
+"adecuadamente. En estos casos, se usará la codificación de caracteres "
+"predefinida, que es la que puede configurar aquí. Defina la codificación de "
+"caracteres que use con más frecuencia en su zona geográfica. por omisión, la "
+"codificación que está configurada es para el sistema que se utiliza en todo "
+"el mundo."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Si cambia esto de la opción predefinida a «Auto», obligará a que se use la "
+"codificación que indique para todos los mensajes, sin tener en cuenta lo que "
+"indiquen dichos mensajes."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Active esto si quiere que los smileys de texto tipo :-) que aparecen en los "
+"mensajes se reemplacen por emoticonos (pequeñas imágenes)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Active esta opción para mostrar diferentes niveles de cita del texto. "
+"Desactívelo para ocultar los niveles de citado del texto."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Nivel automático de contracción:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reducir el tamaño de la tipografía para el texto citado"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Active esta opción para mostrar el texto citado con una tipografía más "
+"pequeña."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Almacenar mensajes ci&frados enviados"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Mostrar agente de usuario en las cabeceras adornadas"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Activar esta opción para mostrar el agente de usuario y las líneas de "
+"cabecera con el cliente de correo gráfico al usar cabeceras adornadas."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Enviar acuse de recibo con un remitente vacío."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Enviar acuses de recibo con una cadena de remitente vacía. Algunos "
+"servidores pueden estar configurados para rechazar estos mensajes, de modo "
+"que si tiene problemas para enviar los acuses de recibo, desmarque esta "
+"opción."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Las frases se han convertido en plantillas"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Las frases antiguas se han convertido en plantillas"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Plantilla para mensajes nuevos"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Plantilla para responder"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Plantilla para responder a todos"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Plantilla para reenviar"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Caracteres de citado"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Ed&itar archivo"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Editar..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Ir"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Car&peta"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mensaje"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Responder especial"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Reen&viar"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Preferencias del fragmento"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra de herramientas HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opciones comunes"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barra de herramientas HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validar los certificados usando CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Si está seleccionada esta opción, los certificados S/MIME se validarán "
+"usando Listas de Revocación de Certificados (CRLs)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validar certificados en línea (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Si esta opción está seleccionada, los certificados S/MIME se validarán en "
+"línea usando el Protocolo de Estado de Certificados En Línea (OCSP). Rellene "
+"abajo la URL del repetidor OCSP."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Validación de certificados en línea"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL del repetidor OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Introduzca aquí la dirección del servidor para la validación en línea de "
+"certificados (repetidor OCSP). La URL suele comenzar con http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Firma del repetidor OCSP."
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorar el URL del servicio de certificados"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "No comprobar las políticas del certificados"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"De forma predefinida, GnuPG usa el archivo ~/.gnupg/policies.txt para "
+"comprobar si se permite la política de un certificado. Si está seleccionada "
+"esta opción, no se comprueban las políticas."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "No consultar nunca una CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Si está marcada esta opción, nunca se usarán las Listas de Revocación de "
+"Certificados para validar certificados S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Descargar certificados de emisores no encontrados"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Si esta opción está marcada, los certificados de emisores no encontrados se "
+"descargarán cuando sea necesario (esto se aplica a ambos métodos de "
+"validación, CRLs y OCSP)."
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Peticiones HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "No realizar ninguna petición HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Desactiva por completo el uso de HTTP para S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Usar este proxy para las peticiones HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Usar el proxy HTTP del sistema:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Si esta opción está seleccionada, el valor del proxy HTTP que se muestra a "
+"la derecha (lo que venga de la variable de entorno http_proxy) se usará para "
+"las peticiones HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Indique aquí la ubicación de su proxy HTTP, que se usará para todas las "
+"peticiones HTTP relativas a S/MIME. La sintaxis es «máquina:puerto». Por "
+"ejemplo, «miproxy.ningundominio.com:3128»."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorar el punto de distribución de certificados CRL por HTTP"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Al buscar la ubicación de un CRL, el certificado que se va a probar suele "
+"contener entradas del tipo «punto de distribución CRL» (DP), que son URLs "
+"que describen la forma de acceder a las URLs. La primera entrada DP que se "
+"encuentre en la que se usará.  Con eta opción, todas las entradas que usen "
+"el esquema HTTP se ignorarán cuando se busque un DP adecuado."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Peticiones LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "No realizar ninguna petición LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Desactiva por completo el uso de LDAP para S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorar el punto de distribución de certificados CRL por LDAP"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Al buscar la ubicación de un CRL, el certificado que se va a probar suele "
+"contener entradas del tipo «punto de distribución CRL» (DP), que son URLs "
+"que describen la forma de acceder a las URLs. La primera entrada DP que se "
+"encuentre en la que se usará.  Con eta opción, todas las entradas que usen "
+"el esquema LDAP se ignorarán cuando se busque un DP adecuado."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Máquina principal para peticiones LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Al introducir aquí un servidor LDAP, hace que todas las peticiones LDAP se "
+"dirijan en primer lugar a ese servidor. De forma más precisa, esta opción es "
+"prioritaria con respecto a cualquier otra máquina y puerto que indique en "
+"una URL de LDAP y también se usará si es que omite la máquina y el puerto en "
+"la URL. Se usarán otros servidores LDAP sólo si fallase la conexión al "
+"proxy.\n"
+"La sintaxis es «máquina» o «máquina:puerto». Si se omite el puerto, se usa "
+"el 389 (el puerto estándar para LDAP)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Añadir fragmento"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Añadir"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Fragmento:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Grupo:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Preferencias del fragmento"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variables"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "ilimitado"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Responder al remitente"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Responder a todos / Responder a la lista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Reenviar mensaje"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "A&visar si intenta enviar mensajes sin firmar"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Marque para que le avise cuando envíe mensajes sin firmar."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar al intentar enviar un mensaje sin firmar</h1>\n"
+"Si habilita esta opción se le avisará cuando intente enviar partes o un "
+"mensaje completo sin firmar.\n"
+"<p>\n"
+"Se recomienda mantener esta opción habilitada para la máxima seguridad de "
+"integridad.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "A&visar si intenta enviar mensajes sin cifrar"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Marcar para ser avisado cuando envíe mensajes sin cifrar."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar cuando se intente enviar un mensaje sin cifrar</h1>\n"
+"Si se marca esta opción, se le avisará si se intenta enviar un mensaje o "
+"parte de un mensaje sin cifrar.\n"
+"<p>\n"
+"Se recomienda el dejar esta opción habilitada para conseguir máxima "
+"integridad.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Avisar si la dirección de correo-e del destinata&rio no está en el "
+"certificado"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Marcar para ser avisado si la dirección no está en el certificado"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar si la dirección del destinatario no esta en el certificado</h1>\n"
+"Si se habilita esta opción, se le avisará si la dirección del destinatario "
+"no se encuentra en el certificado usado para cifrar.\n"
+"<p>\n"
+"Se recomienda dejar esta opción habilitada para conseguir una máxima "
+"seguridad.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Avisar si el certificado o las claves caducan pronto (el umbral se configura "
+"más abajo)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Para firmar"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Para cifrar"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Seleccione aquí el número de días"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar si el certificado de firma caduca</h1>\n"
+"Seleccione el mínimo número de dias que el certificado de firma debe ser "
+"válido para que no se le avise.\n"
+"<p>\n"
+"El valor recomendado de SPHINX es de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar si el certificado de cifrado caduca</h1>\n"
+"Seleccione el mínimo número de dias que el certificado de cifrado debe ser "
+"válido para que no se avise.\n"
+"<p>\n"
+"El valor recomendado por SPHINX es de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar si caduca un certificado de la cadena</h1>\n"
+"Seleccione el mínimo número de dias en el que todos los certificados de la "
+"cadena deberán ser válidos para que no se avise.\n"
+"<p>\n"
+"El valor recomendado por SPHINX es de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar si el certificado de la CA caduca</h1>\n"
+"Seleccione el mínimo número de dias que el certificado de la CA debe ser "
+"válido para que no se le avise.\n"
+"<p>\n"
+"El valor recomendado por SPHINX es de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar si el certificado raiz caduca</h1>\n"
+"Seleccione el mínimo número de dias que el certificado raiz debe ser válido "
+"sin que se avise.\n"
+"<p>\n"
+"La configuración SPHINX recomendada es de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Para certificados raíces:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Para certificados intermedios de CA:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Para certificados y claves de usuario final:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Reactivar todas las advertencias de «No volver a preguntar»."
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...que puede ir a los mensajes anterior y siguiente usando\n"
+"respectivamente las flechas derecha e izquierda del teclado?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...que puede crear filtros rápidamente para el remitente, destinatario,\n"
+"asunto y listas de correo con <em>Herramientas-&gt;Crear&nbsp;filtro</em>?</"
+"p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que puede deshacerse del &quot;[nombre de la lista]&quot;\n"
+"añadido al asunto de algunos mensajes usando <em>reescribir\n"
+"cabecera</em> en la acción de filtrado? Simplemente use\n"
+"<pre>reescribir cabecera &quot;Asunto&quot;\n"
+"   reemplazar &quot;\\s*\\[nombre de la lista\\]\\s*&quot;\n"
+"   con &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...que puede asociar listas de correo con carpetas en el cuadro\n"
+"de diálogo <em>Carpeta-&gt;Gestión de listas de correo</em>? Puede usar\n"
+"<em>Mensaje-&gt;Enviar&nbsp;a&nbsp;lista&nbsp;de&nbsp;correo...</em>\n"
+"para abrir el editor con la dirección de lista de correo predefinida.\n"
+"También puede hacer clic con el botón central del ratón sobre la carpeta.</"
+"p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...que puede asignar iconos peronalizados a cada carpeta "
+"individualmente?\n"
+"Eche un vistazo a <em>Carpeta-&gt;Propiedades</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...que KMail puede utilizar una barra de color para indicar el tipo de "
+"mensaje (texto plano/HTML/OpenPGP) que se muestra?</p>\n"
+"<p>Puede intentarse el simular una firma correcta enviando un mensaje HTML "
+"que simule el aspecto de un mensaje firmado en KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...que puede filtrar por cualquier cabecera simplemente con su nombre en "
+"el primer campo de la regla de búsqueda?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que puede filtrar los mensajes HTML con la regla que contiene\n"
+"<pre>&quot;Content-type&quot;  &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...que al responder, sólo se citan las partes seleccionadas del mensaje?</"
+"p>\n"
+"<p>Si no hay nada seleccionado, se cita el mensaje entero.</p>\n"
+"<p>Esto funciona incluso con el texto de los adjuntos cuando ha "
+"seleccionado\n"
+"<em>Ver-&gt;Adjuntos-&gt;Incluídos</em>.</p>\n"
+"<p>Esta característica está disponible para todos las órdenes de responder\n"
+"salvo para <em>Mensaje-&gt;Responder sin citar</em>.</p>\n"
+"<p align=\"right\"><em>contribución de David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Mostrar campo de búsqueda rápida en carpetas"
diff --git a/tde-i18n-et/messages/tdepim/kmail.po b/tde-i18n-et/messages/tdepim/kmail.po
index a14217060a8..53040a52f57 100644
--- a/tde-i18n-et/messages/tdepim/kmail.po
+++ b/tde-i18n-et/messages/tdepim/kmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-07-28 13:25+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Hasso Tepper"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -168,6 +168,12 @@ msgstr "Puudub (kasuta &ettevaatlikult)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto ressursside poolautomaatseks käitlemiseks"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Puhasta ajalugu"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -242,13 +248,13 @@ msgstr "&Kasutajanimi:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Internetiteenuse pakkuja on sulle andnud <em>kasutajanime</em>"
-", mida ta oma serveris sinu äratundmiseks kasutab. Tavaliselt on see e-posti "
-"aadressi esimene osa, see tähendab osa enne <em>@</em>-märki."
+"Internetiteenuse pakkuja on sulle andnud <em>kasutajanime</em>, mida ta oma "
+"serveris sinu äratundmiseks kasutab. Tavaliselt on see e-posti aadressi "
+"esimene osa, see tähendab osa enne <em>@</em>-märki."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -269,19 +275,19 @@ msgstr "POP pa&rool salvestatakse"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Märgi see, kui soovid, et KMail salvestaks parooli.\n"
 "Kui saadaval on TDEWallet, salvestatakse parool sinna. Seal peaks see olema "
 "päris turvalises kohas.\n"
 "Kui aga TDEWallet pole saadaval, salvestab KMail parooli oma "
-"konfiguratsioonifaili. Parool salvestatakse küll 'hägustatuna', kuid see ei ole "
-"siiski kaitstud lahtikrüptimise eest, kui keegi saab ligipääsu "
+"konfiguratsioonifaili. Parool salvestatakse küll 'hägustatuna', kuid see ei "
+"ole siiski kaitstud lahtikrüptimise eest, kui keegi saab ligipääsu "
 "konfiguratsioonifailile."
 
 #: accountdialog.cpp:640
@@ -310,11 +316,12 @@ msgstr "&Filtreeritakse kirjad, mis on suuremad kui"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Selle valiku korral kasutatakse sõnumite käitlemiseks POP filtreid. Valida võib "
-"võimaluste vahel sõnumid alla laadida, kustutada või jätta serverisse."
+"Selle valiku korral kasutatakse sõnumite käitlemiseks POP filtreid. Valida "
+"võib võimaluste vahel sõnumid alla laadida, kustutada või jätta serverisse."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -363,13 +370,15 @@ msgstr "Avatud te&kst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -412,13 +421,13 @@ msgstr "Nimeruumid:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Siin näeb erinevaid nimeruume, mida sinu IMAP server toetab. Iga nimeruum "
-"esindab prefiksit, mis eristab kaustade gruppe. Nimeruumid võimaldavad näiteks "
-"KMailil näidata ühes kontos sinu isiklikke kaustu ja jagatud kaustu."
+"esindab prefiksit, mis eristab kaustade gruppe. Nimeruumid võimaldavad "
+"näiteks KMailil näidata ühes kontos sinu isiklikke kaustu ja jagatud kaustu."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -475,12 +484,12 @@ msgstr "Kaasatud &failid laaditakse nõudmisel"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Sisselülitamisel ei laadita kaasatud faile automaatselt kirja valimisel, vaid "
-"alles siis, kui klõpsad kaasatud failil. Nii on võimalik ka suuri kirju "
+"Sisselülitamisel ei laadita kaasatud faile automaatselt kirja valimisel, "
+"vaid alles siis, kui klõpsad kaasatud failil. Nii on võimalik ka suuri kirju "
 "otsekohe näidata."
 
 #: accountdialog.cpp:1009
@@ -492,8 +501,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Alamkaustu kontrollitakse ainult neis kaustades, mis on kaustapuus avatud. See "
-"on mõttekas, kui sul on serveris palju kaustu."
+"Alamkaustu kontrollitakse ainult neis kaustades, mis on kaustapuus avatud. "
+"See on mõttekas, kui sul on serveris palju kaustu."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -521,7 +530,7 @@ msgstr "<puudub>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "sisenevad"
 
@@ -529,42 +538,43 @@ msgstr "sisenevad"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Server ei paista toetavat kirjade unikaalset numbrit, kuid kirja jätmiseks "
 "serverisse on see hädavajalik.\n"
-"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu võib "
-"tegelikult olla tõmmatud kirjade serverisse jätmine ometi võimalik."
+"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu "
+"võib tegelikult olla tõmmatud kirjade serverisse jätmine ometi võimalik."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Server ei paista toetavat kirja päiste tõmbamist, kuid see on hädavajalik "
 "kirjade filtreerimiseks serveris.\n"
-"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu võib "
-"tegelikult olla kirjade filtreerimine serveris ometi võimalik."
+"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu "
+"võib tegelikult olla kirjade filtreerimine serveris ometi võimalik."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Palun arvesta, et see võimalus võib panna mõne POP3 serveri, mis ei toeta "
 "konveiermeetodit, saatma vigaseid kirju.\n"
-"See on seadistatav, sest mõned serverid küll toetavad konveiermeetodit, kuid ei "
-"anna sellest teada. Kontrollimaks, kas sinu POP3 server toetab seda meetodit, "
-"kasuta dialoogi vastavat nuppu.\n"
+"See on seadistatav, sest mõned serverid küll toetavad konveiermeetodit, kuid "
+"ei anna sellest teada. Kontrollimaks, kas sinu POP3 server toetab seda "
+"meetodit, kasuta dialoogi vastavat nuppu.\n"
 "Kui server ei paista seda toetavat, aga sa siiski tahad saavutada suuremat "
 "kiirust, võid ette võtta testi, saates endale trobikonna kirju ja need siis "
 "alla laadida."
@@ -575,48 +585,48 @@ msgstr "Palun määra kõigepealt üldseadistustes server ja port."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Server ei paista toetavat konveierit (pipelining), seepärast on see ka välja "
 "lülitatud.\n"
-"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu võib "
-"tegelikult olla konveieri kasutamine ometi võimalik. Kuid palun arvesta, et see "
-"võimalus võib panna mõne POP3 serveri, mis ei toeta konveiermeetodit, saatma "
-"vigaseid kirju. Seepärast võiks eelnevalt ette võtta testi, saates endale "
-"trobikonna kirju ja need siis alla laadida."
+"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu "
+"võib tegelikult olla konveieri kasutamine ometi võimalik. Kuid palun "
+"arvesta, et see võimalus võib panna mõne POP3 serveri, mis ei toeta "
+"konveiermeetodit, saatma vigaseid kirju. Seepärast võiks eelnevalt ette "
+"võtta testi, saates endale trobikonna kirju ja need siis alla laadida."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Server ei paista toetavat kirjade unikaalset numbrit, kuid kirja jätmiseks "
 "serverisse on see hädavajalik. Seepärast on see ka välja lülitatud.\n"
-"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu võib "
-"tegelikult olla tõmmatud kirjade serverisse jätmine ometi võimalik."
+"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu "
+"võib tegelikult olla tõmmatud kirjade serverisse jätmine ometi võimalik."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Server ei paista toetavat kirja päiste tõmbamist, kuid see on hädavajalik "
 "kirjade filtreerimiseks serveris. Seepärast on see ka välja lülitatud.\n"
-"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu võib "
-"tegelikult olla kirjade filtreerimine serveris ometi võimalik."
+"Mõned serverid ei anna siiski oma võimalustest korrektselt teada, mistõttu "
+"võib tegelikult olla kirjade filtreerimine serveris ometi võimalik."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -696,8 +706,8 @@ msgstr "IMAP konto"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "Tekita posti saamiseks seadistuste võrgusektsioonis endale konto."
 
 #: accountwizard.cpp:87
@@ -734,14 +744,14 @@ msgstr "Tere tulemast kasutama KMaili!"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Paistab, et oled KMaili käivitanud esimest korda. Selle nõustaja abil saad "
-"luua endale e-posti kontod. Selleks kirjuta lihtsalt järgnevatele lehekülgedele "
-"ühenduse andmed, mida peaksid olema saanud oma e-posti teenuse pakkuja "
-"käest.</qt>"
+"<qt>Paistab, et oled KMaili käivitanud esimest korda. Selle nõustaja abil "
+"saad luua endale e-posti kontod. Selleks kirjuta lihtsalt järgnevatele "
+"lehekülgedele ühenduse andmed, mida peaksid olema saanud oma e-posti teenuse "
+"pakkuja käest.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -803,8 +813,7 @@ msgstr "Kohaliku kättetoimetamise kasutamine"
 msgid "Server Information"
 msgstr "Serveri info"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Puudub"
@@ -897,8 +906,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Vabandust, ühtegi rämpsposti tuvastamise tööriista ei leitud. Paigalda mõni "
-"selline tööriist ja käivita nõustaja uuesti.</p>"
+"<p>Vabandust, ühtegi rämpsposti tuvastamise tööriista ei leitud. Paigalda "
+"mõni selline tööriist ja käivita nõustaja uuesti.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -942,28 +951,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Siin aidatakse sul seadistada KMaili filtrireegleid, mida mõningad tuntumad "
-"viirustega võitlemise vahendid saavad kasutada.</p>"
-"<p>Nõustaja tuvastab need vahendid, samuti loob filtrireeglid, mis suunavad "
-"kirjad läbi nende vahendite ja eraldavad viirusi sisaldavaks märgitud kirjad. "
-"Nõustaja ei arvesta ühtegi olemasolevat reeglit, kuid kindlasti lisab neile "
-"uued reeglid.</p>"
-"<p><b>Hoiatus:</b> kuna KMail tundub kirjade uurimisel ja võimaliku viiruste "
-"tuvastamisel olevat hangunud, võib esineda tõrkeid KMaili töös, sest "
-"viirustevastased vahendid nõuavad tavaliselt tööks tublisti aega. Kui see sind "
-"häirib, võid nõustaja loodud filtrireeglid kustutada."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Siin aidatakse sul seadistada KMaili filtrireegleid, mida mõningad "
+"tuntumad viirustega võitlemise vahendid saavad kasutada.</p><p>Nõustaja "
+"tuvastab need vahendid, samuti loob filtrireeglid, mis suunavad kirjad läbi "
+"nende vahendite ja eraldavad viirusi sisaldavaks märgitud kirjad. Nõustaja "
+"ei arvesta ühtegi olemasolevat reeglit, kuid kindlasti lisab neile uued "
+"reeglid.</p><p><b>Hoiatus:</b> kuna KMail tundub kirjade uurimisel ja "
+"võimaliku viiruste tuvastamisel olevat hangunud, võib esineda tõrkeid KMaili "
+"töös, sest viirustevastased vahendid nõuavad tavaliselt tööks tublisti aega. "
+"Kui see sind häirib, võid nõustaja loodud filtrireeglid kustutada."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -990,8 +997,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Vaikimisi on rämpspostile mõeldud prügikast, kuid sa võid kaustavaates valida "
-"ka mõne muu kausta."
+"Vaikimisi on rämpspostile mõeldud prügikast, kuid sa võid kaustavaates "
+"valida ka mõne muu kausta."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -999,16 +1006,14 @@ msgstr "Arvatav rämps&post liigutatakse kausta:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"Vaikimisi on valitud sisenevate kirjade kaust, kuid sa võid kaustavaates valida "
-"ka mõne muu kausta."
-"<p>Mitte kõik tööriistad ei toeta kirjade klassifitseerimist arvatavaks "
-"rämpspostiks. Kui sa ei ole sellist tööriista valinud, ei saa sa siin ka kausta "
-"valida."
+"Vaikimisi on valitud sisenevate kirjade kaust, kuid sa võid kaustavaates "
+"valida ka mõne muu kausta.<p>Mitte kõik tööriistad ei toeta kirjade "
+"klassifitseerimist arvatavaks rämpspostiks. Kui sa ei ole sellist tööriista "
+"valinud, ei saa sa siin ka kausta valida."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1018,13 +1023,13 @@ msgstr "Kirjad märgitakse viirusi sisaldavaks vastavate vahenditega"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Selle valimisel märgivad sinu kirju vastavad viirustevastased vahendid. "
-"Nõustaja loob selleks vajalikud filtrid. Tavaliselt märgitakse kirjad nii, et "
-"järgmised filtrid saaks oma töö ära teha ja näiteks suunata viirusi sisaldavad "
-"kirjad mõnda spetsiaalsesse kausta."
+"Nõustaja loob selleks vajalikud filtrid. Tavaliselt märgitakse kirjad nii, "
+"et järgmised filtrid saaks oma töö ära teha ja näiteks suunata viirusi "
+"sisaldavad kirjad mõnda spetsiaalsesse kausta."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1033,12 +1038,12 @@ msgstr "Leitud viirusekirjad liigutatakse valitud kausta"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Luuakse filter, mis tuvastab viirusi sisaldavaks märgitud kirjad ja liigutab "
-"need eelnevalt määratud kausta. Vaikimisi on selleks prügikasti-kaust, kuid sa "
-"võid seda vastavalt vajadusele ja soovile muuta."
+"need eelnevalt määratud kausta. Vaikimisi on selleks prügikasti-kaust, kuid "
+"sa võid seda vastavalt vajadusele ja soovile muuta."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1046,8 +1051,8 @@ msgstr "Tuvastatud viirusi sisaldavad kirjad märgitakse loetuks"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Lisaks märgitakse viirusi sisaldavaks klassifitseeritud kirjade liigutamisel "
 "valitud kausta loetuks."
@@ -1230,8 +1235,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Põhjuseks võib olla, et sul pole selleks õigusi või on selline kaust serveris "
-"juba olemas. Server andis igatahes järgmise veateate:"
+"Põhjuseks võib olla, et sul pole selleks õigusi või on selline kaust "
+"serveris juba olemas. Server andis igatahes järgmise veateate:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1244,8 +1249,8 @@ msgstr "Viga kausta %1 lugemisel serveris: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1265,8 +1270,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1297,20 +1302,20 @@ msgstr "Kustutatud"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Ükski sinu identiteet ei sobi selle kirja saajaga,"
-"<br>palun vali, milline neist aadressidest on sinu oma:"
+"<qt>Ükski sinu identiteet ei sobi selle kirja saajaga,<br>palun vali, "
+"milline neist aadressidest on sinu oma:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Mitu sinu identiteeti sobivad selle kirja saajaga,"
-"<br>palun vali, milline neist aadressidest on sinu oma:"
+"<qt>Mitu sinu identiteeti sobivad selle kirja saajaga,<br>palun vali, "
+"milline neist aadressidest on sinu oma:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1339,18 +1344,21 @@ msgstr "Tekkis viga \"%1\" tihendamisel. Tihendamisest loobuti."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selle seadistuse muutis ära sinu administraator.</p>"
-"<p>Kui arvad, et see ei ole õige, võta temaga ühendust.</p></qt>"
+"<qt><p>Selle seadistuse muutis ära sinu administraator.</p><p>Kui arvad, et "
+"see ei ole õige, võta temaga ühendust.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Laadi &profiil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Konto seadistamine"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Lisa..."
@@ -1380,6 +1388,11 @@ msgstr "<qt>Kas tõesti eemaldada identiteet nimega <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Identiteedi eemaldamine"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Eemalda"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Lisa..."
@@ -1388,6 +1401,11 @@ msgstr "Lisa..."
 msgid "Modify..."
 msgstr "Muuda..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Eemalda"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Sea vaikeväärtuseks"
@@ -1404,17 +1422,15 @@ msgstr "&Saatmine"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Väljaminevate kirjade kontod (lisa vähemalt üks!):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nimi"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tüüp"
@@ -1436,8 +1452,7 @@ msgstr "Sea vaikeväärtuseks"
 msgid "Common Options"
 msgstr "Üldine häälestus"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Enne saatmist nõutakse kinnitust"
@@ -1488,17 +1503,16 @@ msgstr "&Vaikedomeen:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vaikedomeeni kasutatakse e-posti aadressi lõpetamiseks, mis koosneb ainult "
-"kasutajanimest.</p></qt>"
+"<qt><p>Vaikedomeeni kasutatakse e-posti aadressi lõpetamiseks, mis koosneb "
+"ainult kasutajanimest.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1516,9 +1530,9 @@ msgstr "Kirjade saatmise viisi lisamine"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (vaikimisi)"
 
@@ -1601,6 +1615,10 @@ msgstr "Konto muutmine"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Konto <b>%1</b> asukohta pole võimalik kindlaks määrata.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Vä&rvid"
@@ -1709,8 +1727,7 @@ msgstr "Külastatud viit"
 msgid "Misspelled Words"
 msgstr "Valesti kirjutatud sõnad"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Uus kiri"
@@ -1898,8 +1915,8 @@ msgstr "Vaikimisi hoitakse lõimed suletuna"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Uusi, &lugemata või tähtsaid kirju sisaldavad ning jälgitavad lõimed avatakse"
 
@@ -1909,69 +1926,53 @@ msgstr "Kuupäeva esitus"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Kuupäeva puhul saab kasutada järgmisi võtmeid:</strong></p>"
-"<ul>"
-"<li>d - päev numbrina ilma ettelisatava nullita (1-31)</li>"
-"<li>dd - päev numbrina ettelisatava nulliga (01-31)</li>"
-"<li>ddd - päeva lühend (E - P)</li>"
-"<li>dddd - päeva täisnimi (Esmaspäev - Pühapäev)</li>"
-"<li>M - kuu numbrina ilma ettelisatava nullita (1-12)</li>"
-"<li>MM - kuu numbrina ettelisatava nulliga (01-12)</li>"
-"<li>MMM - kuu lühend (Jaan - Dets)</li>"
-"<li>MMMM - kuu täisnimi (Jaanuar - Detsember)</li>"
-"<li>yy - aasta kahekohalise numbrina (00-99)</li>"
-"<li>yyyy - aasta neljakohalise numbrina (0000-9999)</li></ul>"
-"<p><strong>Aja puhul saab kasutada järgmisi võtmeid:</string></p> "
-"<ul>"
-"<li>h - tund ilma ettelisatava nullita (0-23 või 1-12, kui kasutatakse esitust "
-"EL/PL)</li>"
-"<li>hh - tund ettelisatava nulliga (00-23 või 01-12, kui kasutatakse esitust "
-"EL/PL)</li>"
-"<li>m - minutid ilma ettelisatava nullita (0-59)</li>"
-"<li>mm - minutid ettelisatava nulliga (00-59)</li>"
-"<li>s - sekundid ilma ettelisatava nullita (0-59)</li>"
-"<li>ss - sekundid ettelisatava nulliga (00-59)</li>"
-"<li>z - millisekundid ilma ettelisatava nullita (0-999)</li>"
-"<li>zzz - millisekundid ettelisatava nulliga (000-999)</li>"
-"<li>AP - lülitumine esitusele EL/PL. AP asemel ilmub \"EL\" või \"PL\".</li>"
-"<li>ap - lülitumine esitusele EL/PL. ap asemel ilmub \"el\" või \"pl\".</li>"
-"<li>Z - ajavöönd numbrilisel kujul (-0500)</li></ul>"
-"<p><strong>Kõiki muid võtmeid ignoreeritakse.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Kuupäeva puhul saab kasutada järgmisi võtmeid:</strong></"
+"p><ul><li>d - päev numbrina ilma ettelisatava nullita (1-31)</li><li>dd - "
+"päev numbrina ettelisatava nulliga (01-31)</li><li>ddd - päeva lühend (E - "
+"P)</li><li>dddd - päeva täisnimi (Esmaspäev - Pühapäev)</li><li>M - kuu "
+"numbrina ilma ettelisatava nullita (1-12)</li><li>MM - kuu numbrina "
+"ettelisatava nulliga (01-12)</li><li>MMM - kuu lühend (Jaan - Dets)</"
+"li><li>MMMM - kuu täisnimi (Jaanuar - Detsember)</li><li>yy - aasta "
+"kahekohalise numbrina (00-99)</li><li>yyyy - aasta neljakohalise numbrina "
+"(0000-9999)</li></ul><p><strong>Aja puhul saab kasutada järgmisi võtmeid:</"
+"string></p> <ul><li>h - tund ilma ettelisatava nullita (0-23 või 1-12, kui "
+"kasutatakse esitust EL/PL)</li><li>hh - tund ettelisatava nulliga (00-23 või "
+"01-12, kui kasutatakse esitust EL/PL)</li><li>m - minutid ilma ettelisatava "
+"nullita (0-59)</li><li>mm - minutid ettelisatava nulliga (00-59)</li><li>s - "
+"sekundid ilma ettelisatava nullita (0-59)</li><li>ss - sekundid ettelisatava "
+"nulliga (00-59)</li><li>z - millisekundid ilma ettelisatava nullita (0-999)</"
+"li><li>zzz - millisekundid ettelisatava nulliga (000-999)</li><li>AP - "
+"lülitumine esitusele EL/PL. AP asemel ilmub \"EL\" või \"PL\".</li><li>ap - "
+"lülitumine esitusele EL/PL. ap asemel ilmub \"el\" või \"pl\".</li><li>Z - "
+"ajavöönd numbrilisel kujul (-0500)</li></ul><p><strong>Kõiki muid võtmeid "
+"ignoreeritakse.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Globaalsete lõimeseadete muutmine tühistab kõik konkreetsetele kaustadele "
 "rakendatud seaded."
@@ -1988,8 +1989,7 @@ msgstr "HTML olekuri&ba näitamine"
 msgid "Show s&pam status in fancy headers"
 msgstr "Räm&psposti staatust näidatakse uhketes päistes"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Smiley'd asendatakse emotikonidega"
@@ -1998,8 +1998,7 @@ msgstr "Smiley'd asendatakse emotikonidega"
 msgid "Use smaller font for quoted text"
 msgstr "Väiksema fondi kasutamine tsiteeritavale tekstile"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Avatavate/suletavate tsitaadimärkide näitamine"
@@ -2025,8 +2024,7 @@ msgstr "Automaatne"
 msgid "&Override character encoding:"
 msgstr "Tü&histav kodeering:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Ikoon süsteemses salves"
@@ -2128,22 +2126,19 @@ msgstr "<b>%f</b> asendatakse redigeeritava faili nimega."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Vastamise fraasides võib kasutada järgmiseid kohatäitjaid:"
-"<br><b>%D</b>: kuupäev, <b>%S</b>: subjekt,"
-"<br><b>%e</b>: saatja aadress, <b>%F</b>: saatja nimi, <b>%f</b>"
-": saatja initsiaalid,"
-"<br><b>%T</b>: saaja nimi, <b>%t</b>: saaja nimi ja aadress,"
-"<br><b>%C</b>: koopiasaajate nimed, <b>%c</b>: koopiasaajate nimed ja "
-"aadressid,"
-"<br><b>%%</b>: protsendimärk, <b>%_</b>: tühik, <b>%L</b>: reavahetus</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Vastamise fraasides võib kasutada järgmiseid kohatäitjaid:<br><b>%D</b>: "
+"kuupäev, <b>%S</b>: subjekt,<br><b>%e</b>: saatja aadress, <b>%F</b>: saatja "
+"nimi, <b>%f</b>: saatja initsiaalid,<br><b>%T</b>: saaja nimi, <b>%t</b>: "
+"saaja nimi ja aadress,<br><b>%C</b>: koopiasaajate nimed, <b>%c</b>: "
+"koopiasaajate nimed ja aadressid,<br><b>%%</b>: protsendimärk, <b>%_</b>: "
+"tühik, <b>%L</b>: reavahetus</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2166,21 +2161,20 @@ msgstr "Kõigile v&astamine:"
 msgid "&Forward:"
 msgstr "&Edasisaatmine:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Tsiteerimise tähis:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Ühel kenal päeval (%D) kirjutasid sa:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Ühel kenal päeval (%D) kirjutas %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Edasi saadetud kiri"
 
@@ -2216,8 +2210,8 @@ msgstr "Uus edasisaatmise prefiks"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Seda nimekirja kontrollitakse iga väljuva kirja puhul ülalt alla, leidmaks "
 "kooditabelit, mis sisaldab kõiki vajalikke märke."
@@ -2256,10 +2250,9 @@ msgstr "Väärtus"
 msgid "Ne&w"
 msgstr "&Uus"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nimi:"
@@ -2268,16 +2261,15 @@ msgstr "&Nimi:"
 msgid "&Value:"
 msgstr "&Väärtus:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlookiga ühilduvad kaasatud failide nimed"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Sisselülitamisel mõistab Outlook(tm) erisümboleid (näiteks täpitähti) "
 "sisaldavaid lisatud failide nimesid (loodetavasti...)"
@@ -2306,21 +2298,22 @@ msgstr "kaasatud"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Oled valinud erisümboleid (näiteks täpitähti) sisaldavate kaasatud failide nime "
-"kodeerimise moel, et neid mõistaks Outlook(tm) ja muud e-posti kliendid, mis ei "
-"toeta standardile vastava kodeeringuga kaasatud failide nimesid.\n"
-"Pane tähele, et KMail võib luua standardiga mitteühilduvaid kirju, pärast mida "
-"ei pruugi standardeid järgivad e-posti kliendid sinu kirjadest aru saada. "
-"Seepärast ei tasuks seda võimalust sisse lülitada, kui see just hädavajalik ei "
-"ole."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Oled valinud erisümboleid (näiteks täpitähti) sisaldavate kaasatud failide "
+"nime kodeerimise moel, et neid mõistaks Outlook(tm) ja muud e-posti "
+"kliendid, mis ei toeta standardile vastava kodeeringuga kaasatud failide "
+"nimesid.\n"
+"Pane tähele, et KMail võib luua standardiga mitteühilduvaid kirju, pärast "
+"mida ei pruugi standardeid järgivad e-posti kliendid sinu kirjadest aru "
+"saada. Seepärast ei tasuks seda võimalust sisse lülitada, kui see just "
+"hädavajalik ei ole."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2344,107 +2337,93 @@ msgstr "Krüptorakenduse&d"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Kirjad saadetakse mõnikord mõlemas vormingus. Selle valikuga saad "
-"kontrollida, kas näidatakse tekstivormingus või HTML-vormingus osa.</p>"
-"<p> HTML teeb kirja välimuse paremaks, kuid suurendab riski, et kasutatakse ära "
-"mõnd turvaauku.</p>"
-"<p>Tavalises tekstivormingus kiri kaotab palju oma välimuses, kuid teeb <em>"
-"võimatuks</em> turvaaukude ärakasutamise HTML-teisendajas (Konqueror).</p>"
-"<p>Selle all olev valik kaitseb tavalise HTML-kirjade väärkasutamise vastu. "
-"Kuid see pole võimeline sind kaitsma turvariskide eest, mis KMaili kirjutamise "
-"ajal polnud veel teada.</p>"
-"<p>Seetõttu <em>ei ole</em> soovitav eelistada HTML-vormingut "
-"tekstivormingule.</p> "
-"<p><b>Märkus:</b> Seda valikut saab seada ka kausthaaval KMaili peaakna menüüs "
-"<i>Kaustad</i>.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p> Kirjad saadetakse mõnikord mõlemas vormingus. Selle valikuga saad "
+"kontrollida, kas näidatakse tekstivormingus või HTML-vormingus osa.</p><p> "
+"HTML teeb kirja välimuse paremaks, kuid suurendab riski, et kasutatakse ära "
+"mõnd turvaauku.</p><p>Tavalises tekstivormingus kiri kaotab palju oma "
+"välimuses, kuid teeb <em>võimatuks</em> turvaaukude ärakasutamise HTML-"
+"teisendajas (Konqueror).</p><p>Selle all olev valik kaitseb tavalise HTML-"
+"kirjade väärkasutamise vastu. Kuid see pole võimeline sind kaitsma "
+"turvariskide eest, mis KMaili kirjutamise ajal polnud veel teada.</"
+"p><p>Seetõttu <em>ei ole</em> soovitav eelistada HTML-vormingut "
+"tekstivormingule.</p> <p><b>Märkus:</b> Seda valikut saab seada ka "
+"kausthaaval KMaili peaakna menüüs <i>Kaustad</i>.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mõned e-postiga saadetavatest reklaamidest on HTML-vormingus ning sisaldavad "
-"viiteid piltidele, mida reklaamijad kasutavad info saamiseks, et sa oled nende "
-"kirja lugenud (&quot;veebiputukad&quot;).</p>"
-"<p>Pole mitte ühtegi mõistliku põhjust, miks sa peaksid selliseid pilte võrgust "
-"alla laadima, kuna saatja saab alati vajalikud pildid kirjaga kaasa panna.</p>"
-"<p>Et kaitsta sind sellise HTML-kirjade väärkasutamise vastu, on see valik "
-"vaikimisi <em>keelatud</em>.</p>"
-"<p>Kui sa soovid siiski vaadata näiteks pilte HTML-kirjades, mida kirjaga "
-"kaasas pole, saad sa selle valiku sisse lülitada, kuid sa peaksid probleemist "
-"teadlik olema.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Mõned e-postiga saadetavatest reklaamidest on HTML-vormingus ning "
+"sisaldavad viiteid piltidele, mida reklaamijad kasutavad info saamiseks, et "
+"sa oled nende kirja lugenud (&quot;veebiputukad&quot;).</p><p>Pole mitte "
+"ühtegi mõistliku põhjust, miks sa peaksid selliseid pilte võrgust alla "
+"laadima, kuna saatja saab alati vajalikud pildid kirjaga kaasa panna.</"
+"p><p>Et kaitsta sind sellise HTML-kirjade väärkasutamise vastu, on see valik "
+"vaikimisi <em>keelatud</em>.</p><p>Kui sa soovid siiski vaadata näiteks "
+"pilte HTML-kirjades, mida kirjaga kaasas pole, saad sa selle valiku sisse "
+"lülitada, kuid sa peaksid probleemist teadlik olema.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Kirja kättesaamise/lugemise kinnituse reeglid</h3>"
-"<p>Tavaliselt <b>lugemiskinnituseks</b> kutsutava käitumise korral soovib kirja "
-"autor saada vastavat teadet, mille peale saaja e-posti rakendus tekitab "
-"vastuse, mis annab autorile teada tema kirja saatuse. Tavaliselt on vastusteks "
-"<b>displayed</b> (vaadatud ehk siis loetud), <b>deleted</b> (kustutatud) ja <b>"
-"dispatched</b> (nt. edastatud).</p>"
-"<p>KMail võimaldab kasutada kinnituste puhul järgmisi võimalusi.</p>"
-"<ul>"
-"<li><em>Ignoreeritakse</em>: kõiki kinnituse soove ignoreeritakse ja ühtegi "
-"kinnitust automaatselt ei saadeta (soovitatav).</li>"
-"<li><em>Küsitakse</em>: soovile vastatakse alles pärast kasutajalt loa "
-"küsimist. Nii saab saata kinnituse ainult neile kirjadele, millele soovid seda "
-"saata, teiste puhul aga soovi tagasi lükata või seda ignoreerida.</li>"
-"<li><em>Lükatakse tagasi</em>: alati saadetakse vastus <b>tagasi lükatud</b>"
-". See on ainult <em>natuke</em> parem kui alati kinnituse saatmine. Autor saab "
-"teada, et tema kirjaga on midagi ette võetud, ta ei saa teada ainult seda, kas "
-"seda loeti või kustutati kohe jne.</li>"
-"<li><em>Saadetakse alati</em>: soovitud kinnitus saadetakse alati. See "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Kirja kättesaamise/lugemise kinnituse reeglid</h3><p>Tavaliselt "
+"<b>lugemiskinnituseks</b> kutsutava käitumise korral soovib kirja autor "
+"saada vastavat teadet, mille peale saaja e-posti rakendus tekitab vastuse, "
+"mis annab autorile teada tema kirja saatuse. Tavaliselt on vastusteks "
+"<b>displayed</b> (vaadatud ehk siis loetud), <b>deleted</b> (kustutatud) ja "
+"<b>dispatched</b> (nt. edastatud).</p><p>KMail võimaldab kasutada kinnituste "
+"puhul järgmisi võimalusi.</p><ul><li><em>Ignoreeritakse</em>: kõiki "
+"kinnituse soove ignoreeritakse ja ühtegi kinnitust automaatselt ei saadeta "
+"(soovitatav).</li><li><em>Küsitakse</em>: soovile vastatakse alles pärast "
+"kasutajalt loa küsimist. Nii saab saata kinnituse ainult neile kirjadele, "
+"millele soovid seda saata, teiste puhul aga soovi tagasi lükata või seda "
+"ignoreerida.</li><li><em>Lükatakse tagasi</em>: alati saadetakse vastus "
+"<b>tagasi lükatud</b>. See on ainult <em>natuke</em> parem kui alati "
+"kinnituse saatmine. Autor saab teada, et tema kirjaga on midagi ette võetud, "
+"ta ei saa teada ainult seda, kas seda loeti või kustutati kohe jne.</"
+"li><li><em>Saadetakse alati</em>: soovitud kinnitus saadetakse alati. See "
 "tähendab, et kirja autor saab teada, et tema kiri on pärale jõudnud, samuti "
 "saab ta teada, mis sellega ette võeti (vaadati, kustutati jne.). See ei ole "
 "üldse kohe soovitatav, aga kuivõrd sellel võib olla oma mõte näiteks "
@@ -2464,15 +2443,15 @@ msgstr "Võrgust vä&liste viidete laadimine"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>HOIATUS:</b> HTML-i kasutamine kirjades suurendab ohtu, et sinu süsteemi "
-"võivad kahjustada praegused ja tulevased ohud. <a href=\"whatsthis:%1\">"
-"Rohkem HTML-kirjade kohta...</a> <a href=\"whatsthis:%2\">"
-"Rohkem väliste viidete kohta...</a>"
+"võivad kahjustada praegused ja tulevased ohud. <a href=\"whatsthis:"
+"%1\">Rohkem HTML-kirjade kohta...</a> <a href=\"whatsthis:%2\">Rohkem "
+"väliste viidete kohta...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2531,8 +2510,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>HOIATUS:</b> Vastuvõtu kinnituse tingimusteta tagasisaatmine kahjustab sinu "
-"privaatsust. <a href=\"whatsthis:%1\">Rohkem...</a>"
+"<b>HOIATUS:</b> Vastuvõtu kinnituse tingimusteta tagasisaatmine kahjustab "
+"sinu privaatsust. <a href=\"whatsthis:%1\">Rohkem...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2546,15 +2525,14 @@ msgstr "Võtmed ja sertifikaadid imporditakse automaatselt"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Globaalsete HTML-seadete muutmine tühistab konkreetsetele kaustadele rakendatud "
-"seaded."
+"Globaalsete HTML-seadete muutmine tühistab konkreetsetele kaustadele "
+"rakendatud seaded."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Selle valiku korral on vajalik dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "proxy puudub"
@@ -2583,8 +2561,8 @@ msgstr "Tähtsaid kir&ju ei kustutata"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Lugemata kirjade otsimisel:"
 
@@ -2608,8 +2586,8 @@ msgstr "hüpatakse tagasi kõigis kaustades"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Sisenemisel kausta:"
 
@@ -2678,27 +2656,23 @@ msgstr "kataloogid (\"maildir\" vorming)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Siin saab valida, millises vormingus peaksid kirjade kaustad vaikimisi "
-"olema:</p>"
-"<p><b>mbox:</b> KMaili kirjade kaustad on üksikud failid. Kirju eraldavad faili "
-"sees read alates päisereast \"Kellelt\". Nii on võimalik kettaruumi kokku "
-"hoida, kuid see ei ole nii töökindel, näiteks kui soovid kirju kaustast kausta "
-"liigutada.</p>"
-"<p><b>maildir:</b> KMaili kirjade kaustad on kaustadena ka kõvakettal. Iga kiri "
-"on omaette fail. See võtab suhteliselt rohkem ruumi, kuid peaks olema palju "
-"töökindlam, näiteks kui soovid kirju kaustast kausta liigutada.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Siin saab valida, millises vormingus peaksid kirjade kaustad "
+"vaikimisi olema:</p><p><b>mbox:</b> KMaili kirjade kaustad on üksikud "
+"failid. Kirju eraldavad faili sees read alates päisereast \"Kellelt\". Nii "
+"on võimalik kettaruumi kokku hoida, kuid see ei ole nii töökindel, näiteks "
+"kui soovid kirju kaustast kausta liigutada.</p><p><b>maildir:</b> KMaili "
+"kirjade kaustad on kaustadena ka kõvakettal. Iga kiri on omaette fail. See "
+"võtab suhteliselt rohkem ruumi, kuid peaks olema palju töökindlam, näiteks "
+"kui soovid kirju kaustast kausta liigutada.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2731,54 +2705,44 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Hüpates järgmisele lugemata kirjale, võib juhtuda, et allpool ei ole enam "
-"ühtegi lugemata kirja.</p> "
-"<p><b>Ei hüpata tagasi:</b> otsing peatatakse aktiivse kausta viimase kirja "
-"juures.</p>"
-"<p><b>Hüpatakse tagasi aktiivses kaustas:</b> pärast kausta viimase kirjani "
-"jõudmist jätkub otsing kausta alguses, kuid muusse kausta ei siseneta.</p>"
-"<p><b>Hüpatakse tagasi kõigis kaustades:</b> pärast kausta viimase kirjani "
-"jõudmist jätkatakse kausta alguses. Kui lugemata kirju ei leita, jätkatakse "
-"otsingut järgmises kaustas.</p>"
-"<p>Samamoodi on siis, kui otsid eelmist lugemata kirja: valiku korral algab "
-"otsing uuesti lõpust ja vastavalt valitud võimalusele võib jätkuda eelmises "
-"kaustas.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt> <p>Hüpates järgmisele lugemata kirjale, võib juhtuda, et allpool ei ole "
+"enam ühtegi lugemata kirja.</p> <p><b>Ei hüpata tagasi:</b> otsing "
+"peatatakse aktiivse kausta viimase kirja juures.</p><p><b>Hüpatakse tagasi "
+"aktiivses kaustas:</b> pärast kausta viimase kirjani jõudmist jätkub otsing "
+"kausta alguses, kuid muusse kausta ei siseneta.</p><p><b>Hüpatakse tagasi "
+"kõigis kaustades:</b> pärast kausta viimase kirjani jõudmist jätkatakse "
+"kausta alguses. Kui lugemata kirju ei leita, jätkatakse otsingut järgmises "
+"kaustas.</p><p>Samamoodi on siis, kui otsid eelmist lugemata kirja: valiku "
+"korral algab otsing uuesti lõpust ja vastavalt valitud võimalusele võib "
+"jätkuda eelmises kaustas.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Täielik teksti indekseerimine võimaldab väga kiiret otsingut kirjadest. Kui "
-"see on sisse lülitatud, töötab otsingudialoog väga kiiresti. Samuti saab "
-"otsinguriba abil otsida ka kirjade sisust.</p> "
-"<p>Samas suurendab see umbes poole võrra kirjade hoidmiseks vajalikku "
-"kettaruumi.</p> "
-"<p>Pärast sisselülitamist luuakse indeks. See võtab pisut aega, kuid samal ajal "
-"saab siiski KMaili edasi kasutada.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt> <p>Täielik teksti indekseerimine võimaldab väga kiiret otsingut "
+"kirjadest. Kui see on sisse lülitatud, töötab otsingudialoog väga kiiresti. "
+"Samuti saab otsinguriba abil otsida ka kirjade sisust.</p> <p>Samas "
+"suurendab see umbes poole võrra kirjade hoidmiseks vajalikku kettaruumi.</p> "
+"<p>Pärast sisselülitamist luuakse indeks. See võtab pisut aega, kuid samal "
+"ajal saab siiski KMaili edasi kasutada.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2844,8 +2808,8 @@ msgstr "&Grupitöö kaustad peidetakse"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "Sisselülitamisel ei näidata IMAP ressursikaustu kaustapuus."
 
 #: configuredialog.cpp:4909
@@ -2854,11 +2818,11 @@ msgstr "&Ainult konto grupitöökaustade näitamine"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Sisselülitamisel ei näidata grupitööks määratud konto puhul kaustapuus tavalisi "
-"kaustu."
+"Sisselülitamisel ei näidata grupitööks määratud konto puhul kaustapuus "
+"tavalisi kaustu."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2914,24 +2878,23 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Microsoft Outlookil, kui seda kasutatakse koos Microsoft Exchange'i serveriga, "
-"on raskusi standarditele vastavate grupitöö kirjade mõistmisega. Selle valiku "
-"sisselülitamisel saadetakse grupitöö kutsed sellisena, et neid mõistab ka "
-"Microsoft Exchange."
+"Microsoft Outlookil, kui seda kasutatakse koos Microsoft Exchange'i "
+"serveriga, on raskusi standarditele vastavate grupitöö kirjade mõistmisega. "
+"Selle valiku sisselülitamisel saadetakse grupitöö kutsed sellisena, et neid "
+"mõistab ka Microsoft Exchange."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlookiga ühilduvad kaasatud failide nimed"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Kutse automaatne saatmine"
@@ -2941,28 +2904,28 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Sisselülitamisel ei näe kasutaja kirja koostamise akent. Kutsekirjad saadetakse "
-"automaatselt."
+"Sisselülitamisel ei näe kasutaja kirja koostamise akent. Kutsekirjad "
+"saadetakse automaatselt."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Kutsed saadetakse tavaliselt kirjale lisatud failina. Siinne võimalus lubab "
-"kutsed saata kirja enda tekstis. See on vajalik kutsete ja nende vastuse "
-"saatmiseks Microsoft Outlooki süsteemi."
-"<br>Kui sa selle aga valid, ei saa sa enam kirjeldusteksti, mida e-posti "
-"programmid suudaksid lugeda. See tähendab, et neile, kes kasutavad e-posti "
-"programme, mis ei suuda kutseid lugeda, paistab kiri päris veider."
-"<br>Need, kelle e-posti programmid suudavad kutseid lugeda, võivad siiski ka "
-"sellise kirjaga üht-teist peale hakata.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Kutsed saadetakse tavaliselt kirjale lisatud failina. Siinne võimalus "
+"lubab kutsed saata kirja enda tekstis. See on vajalik kutsete ja nende "
+"vastuse saatmiseks Microsoft Outlooki süsteemi.<br>Kui sa selle aga valid, "
+"ei saa sa enam kirjeldusteksti, mida e-posti programmid suudaksid lugeda. "
+"See tähendab, et neile, kes kasutavad e-posti programme, mis ei suuda "
+"kutseid lugeda, paistab kiri päris veider.<br>Need, kelle e-posti programmid "
+"suudavad kutseid lugeda, võivad siiski ka sellise kirjaga üht-teist peale "
+"hakata.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3066,28 +3029,26 @@ msgstr "Edastamine"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Siin saab lisada, muuta ja kustutada kirjale vastamisel või selle "
-"edastamisel kasutatavaid kohandatud kirjamalle. Kohandatud malli loomiseks vali "
-"see hiire parema nupu kontekstimenüüst või tööriistaribalt. Malli kiiremaks "
-"kasutamiseks võib sellele omistada kiirklahvi.</p>"
-"<p>Kirjamallid toetavad asendatavaid kohatäitjaid, mida saab malli sisestada "
-"kas kirjutades või siis valides menüüst <i>Käsu lisamine</i>.</p>"
-"<p>Kohandatud malle on neli tüüpi: <i>vastus</i>, <i>vastus kõigile</i>, <i>"
-"edastamine</i> ja <i>universaalne</i>, mida sobib kasutada igat laadi "
-"toimingutes. <i>Universaalsele</i> mallile ei saa kiirklahvi omistada.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Siin saab lisada, muuta ja kustutada kirjale vastamisel või selle "
+"edastamisel kasutatavaid kohandatud kirjamalle. Kohandatud malli loomiseks "
+"vali see hiire parema nupu kontekstimenüüst või tööriistaribalt. Malli "
+"kiiremaks kasutamiseks võib sellele omistada kiirklahvi.</p><p>Kirjamallid "
+"toetavad asendatavaid kohatäitjaid, mida saab malli sisestada kas kirjutades "
+"või siis valides menüüst <i>Käsu lisamine</i>.</p><p>Kohandatud malle on "
+"neli tüüpi: <i>vastus</i>, <i>vastus kõigile</i>, <i>edastamine</i> ja "
+"<i>universaalne</i>, mida sobib kasutada igat laadi toimingutes. "
+"<i>Universaalsele</i> mallile ei saa kiirklahvi omistada.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3104,15 +3065,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3160,8 +3121,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"Postiloendis pole ühtki saajat. Vali kõigepealt mõned kirjade saajad ja proovi "
-"siis uuesti."
+"Postiloendis pole ühtki saajat. Vali kõigepealt mõned kirjade saajad ja "
+"proovi siis uuesti."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3176,7 +3137,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Postiloend nimega <b>%1</b> on juba olemas. Palun vali mõni muu nimi.</qt>"
+"<qt>Postiloend nimega <b>%1</b> on juba olemas. Palun vali mõni muu nimi.</"
+"qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3185,8 +3147,8 @@ msgstr "Redaktor:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "KMail ei suuda tuvastada, millal valitud redaktor suletakse. Andmekao "
 "vältimiseks loobutakse kaasatud faili muutmise võimalusest."
@@ -3364,8 +3326,8 @@ msgstr "Lõplik kustutamine"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Märkus: aegumisjärgseid toiminguid hakatakse sooritama kohe pärast seadistuste "
-"rakendamist."
+"Märkus: aegumisjärgseid toiminguid hakatakse sooritama kohe pärast "
+"seadistuste rakendamist."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3440,6 +3402,11 @@ msgstr "Filtrite valik"
 msgid "Filters"
 msgstr "Filtrid"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Vali kogu tekst"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3470,11 +3437,12 @@ msgstr "Filtri tegevuste &logimine"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Siin saab filtri tegevuste logimise sisse ja välja lülitada. Logiandmeid "
-"kogutakse ja näidatakse mõistagi ainult siis, kui logimine on sisse lülitatud."
+"kogutakse ja näidatakse mõistagi ainult siis, kui logimine on sisse "
+"lülitatud."
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3490,14 +3458,16 @@ msgstr "Filtri &reegli hindamise logimine"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Võimalik on kontrollida logi tagasisidet rakendatud filtrite reeglite hindamise "
-"osas. Kui see on sisse lülitatud, antakse põhjalik tagasiside iga filtrireegli "
-"kohta, vastasel juhul aga ainult iga filtri kõigi reeglite hindamise tulemus."
+"Võimalik on kontrollida logi tagasisidet rakendatud filtrite reeglite "
+"hindamise osas. Kui see on sisse lülitatud, antakse põhjalik tagasiside iga "
+"filtrireegli kohta, vastasel juhul aga ainult iga filtri kõigi reeglite "
+"hindamise tulemus."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3517,14 +3487,15 @@ msgstr "piiramatu"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Logiandmete kogumisel kasutatakse nende ajutiseks salvestamiseks omajagu mälu. "
-"Siin saab määrata kasutatava mälu maksimumi. Kui kogutud logiandmete suurus "
-"ületab limiidi, kustutatakse vanemad andmed, et taas jõuda allapoole limiiti."
+"Logiandmete kogumisel kasutatakse nende ajutiseks salvestamiseks omajagu "
+"mälu. Siin saab määrata kasutatava mälu maksimumi. Kui kogutud logiandmete "
+"suurus ületab limiidi, kustutatakse vanemad andmed, et taas jõuda allapoole "
+"limiiti."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3534,7 +3505,7 @@ msgstr ""
 "Ei õnnestunud kirjutada faili %1:\n"
 "\"%2\" on üksikasjalik veakirjeldus."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Kmaili viga"
@@ -3575,9 +3546,9 @@ msgstr "Kas&utaja identifikaator:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Kasutaja identifikaator on IMAP serveri kasutajatunnus. See võib olla lihtne "
 "kasutajanimi või ka kasutaja täielik e-posti aadress. Milline see on, annab "
@@ -3632,8 +3603,8 @@ msgstr "Sul ei ole prügikastikausta lugemise ega kirjutamise õigusi."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Serverist ei ole infot veel saadud, palun kasuta käsku \"Kontrolli posti\"."
 
@@ -3645,8 +3616,7 @@ msgstr "Viga: selle kaustaga pole seotud ühtki IMAP kontot"
 msgid "Connecting to server %1, please wait..."
 msgstr "Ühendumine serveriga %1, palun oota..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Viga ühendumisel serveriga %1"
@@ -3674,8 +3644,8 @@ msgstr "Õiguste lisamine"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Kas tõesti eemaldada sinu õigused sellele kaustale? Sellisel juhul ei saa sa "
 "hiljem seda kausta kasutada."
@@ -3709,7 +3679,7 @@ msgstr "Kasutamine:"
 msgid "Select Folder"
 msgstr "Kausta valik"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
@@ -3733,13 +3703,13 @@ msgstr "Kausta kiirklahvi valik"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Klahvi või klahvikombinatsiooni määramiseks, millega valida aktiivset "
-"kausta, klõpsa allolevale nupule ning vajuta seejärel klahvi või klahve, mida "
-"soovid kausta valimiseks kasutada.</qt>"
+"kausta, klõpsa allolevale nupule ning vajuta seejärel klahvi või klahve, "
+"mida soovid kausta valimiseks kasutada.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3759,13 +3729,22 @@ msgstr "Ka&tkesta"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Kaust, mille kustutasid, oli seotud kontoga <b>%1</b>"
-", mille kirjad suunati sellesse kausta. Nüüd määrati kaustaks, kuhu uued kirjad "
-"saabuvad, peamine sisenevate kirjade kaust.</qt>"
+"<qt>Kaust, mille kustutasid, oli seotud kontoga <b>%1</b>, mille kirjad "
+"suunati sellesse kausta. Nüüd määrati kaustaks, kuhu uued kirjad saabuvad, "
+"peamine sisenevate kirjade kaust.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Kokku: %2<br>Lugemata: %3<br>Suurus: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Kvoot: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3889,56 +3868,16 @@ msgstr "Rämpsposti staatus: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>k<br>i<br>r<br>i</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>P"
-"<br>o"
-"<br>l"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>k"
-"<br>i"
-"<br>r"
-"<br>i"
-"<br></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>P<br>o<br>l<br>e<br> <br>H<br>T<br>M<br>L<br> "
+"<br>k<br>i<br>r<br>i<br></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3950,19 +3889,13 @@ msgstr "&Sinu nimi:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Sinu nimi</h3>"
-"<p>Sellel väljal peaks seisma sinu nimi kujul, nagu see peab esinema saadetava "
-"e-kirja päises.</p>"
-"<p>Kui jätad selle tühjaks, ei näidata sinu nime, vaid ainult e-posti "
-"aadressi.</p></qt>"
+"<qt><h3>Sinu nimi</h3><p>Sellel väljal peaks seisma sinu nimi kujul, nagu "
+"see peab esinema saadetava e-kirja päises.</p><p>Kui jätad selle tühjaks, ei "
+"näidata sinu nime, vaid ainult e-posti aadressi.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3970,17 +3903,14 @@ msgstr "&Organisatsioon:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisatsioon</h3>"
-"<p>Sellel väljal peaks seisma sinu organisatsiooni nimi kujul, nagu see peab "
-"esinema saadetava e-kirja päises.</p>"
-"<p>Täiesti turvaline (ja igati normaalne) on see väli tühjaks jätta.</p></qt>"
+"<qt><h3>Organisatsioon</h3><p>Sellel väljal peaks seisma sinu "
+"organisatsiooni nimi kujul, nagu see peab esinema saadetava e-kirja päises.</"
+"p><p>Täiesti turvaline (ja igati normaalne) on see väli tühjaks jätta.</p></"
+"qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3989,20 +3919,15 @@ msgstr "&E-posti aadress:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-posti aadress</h3>"
-"<p>Sellel väljal peaks seisma sinu täielik e-posti aadress.</p>"
-"<p>Kui jätad selle tühjaks või sisestad valesti, on teistel lausa võimatu sulle "
-"vastata.</p></qt>"
+"<qt><h3>E-posti aadress</h3><p>Sellel väljal peaks seisma sinu täielik e-"
+"posti aadress.</p><p>Kui jätad selle tühjaks või sisestad valesti, on "
+"teistel lausa võimatu sulle vastata.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4011,21 +3936,12 @@ msgstr "&E-posti aadress:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4048,21 +3964,17 @@ msgstr "Vali OpenPGP võti, mida peaks kasutama kirjade signeerimiseks."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Siinvalitavat OpenPGP võtit kasutatakse kirjade signeerimiseks. Kasutada "
-"võib ka GnuPG võtmeid.</p>"
-"<p>Selle välja võib jätta tühjaks, kuid KMail ei suuda sellisel juhul kirju "
-"OpenPGP-ga digitaalselt signeerida. Tavalisi e-kirja võimalusi see valik ei "
-"puuduta.</p>"
-"<p>Rohkem infot võtmete kohta leiab internetis aadressilt <a>"
-"http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Siinvalitavat OpenPGP võtit kasutatakse kirjade signeerimiseks. "
+"Kasutada võib ka GnuPG võtmeid.</p><p>Selle välja võib jätta tühjaks, kuid "
+"KMail ei suuda sellisel juhul kirju OpenPGP-ga digitaalselt signeerida. "
+"Tavalisi e-kirja võimalusi see valik ei puuduta.</p><p>Rohkem infot võtmete "
+"kohta leiab internetis aadressilt <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4074,31 +3986,27 @@ msgstr "Sinu OpenPGP krüptovõti"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Vali OpenPGP võti, mida peaks kasutama iseendale saadetava kirja krüptimiseks "
-"ja redaktoris võimaluse \"Lisa minu avalik võti\" pruukimiseks."
+"Vali OpenPGP võti, mida peaks kasutama iseendale saadetava kirja "
+"krüptimiseks ja redaktoris võimaluse \"Lisa minu avalik võti\" pruukimiseks."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Siinvalitavat OpenPGP võtit kasutatakse iseendale saadetava kirja "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Siinvalitavat OpenPGP võtit kasutatakse iseendale saadetava kirja "
 "krüptimiseks ja redaktoris võimaluse \"Lisa minu avalik võti\" pruukimiseks. "
-"Kasutada võib ka GnuPG võtmeid.</p>"
-"<p>Selle välja võib jätta tühjaks, kuid KMail ei suuda sellisel juhul kirju "
-"OpenPGP-ga krüptida. Tavalisi e-kirja võimalusi see valik ei puuduta.</p>"
-"<p>Rohkem infot võtmete kohta leiab internetis aadressilt <a>"
-"http://www.gnupg.org</a></p></qt>"
+"Kasutada võib ka GnuPG võtmeid.</p><p>Selle välja võib jätta tühjaks, kuid "
+"KMail ei suuda sellisel juhul kirju OpenPGP-ga krüptida. Tavalisi e-kirja "
+"võimalusi see valik ei puuduta.</p><p>Rohkem infot võtmete kohta leiab "
+"internetis aadressilt <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4116,17 +4024,15 @@ msgstr "Vali S/MIME sertifikaat, mida peaks kasutama kirjade signeerimiseks."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Siinvalitavat S/MIME (X.509) sertifikaati kasutatakse kirjade "
-"signeerimiseks.</p>"
-"<p>Selle välja võib jätta tühjaks, kuid KMail ei suuda sellisel juhul kirju "
-"S/MIME-ga signeerida. Tavalisi e-kirja võimalusi see valik ei puuduta.</p></qt>"
+"<qt><p>Siinvalitavat S/MIME (X.509) sertifikaati kasutatakse kirjade "
+"signeerimiseks.</p><p>Selle välja võib jätta tühjaks, kuid KMail ei suuda "
+"sellisel juhul kirju S/MIME-ga signeerida. Tavalisi e-kirja võimalusi see "
+"valik ei puuduta.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4138,26 +4044,25 @@ msgstr "Sinu S/MIME krüptosertifikaat"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Vali S/MIME sertifikaat, mida peaks kasutama iseendale saadetava kirja "
 "krüptimiseks ja redaktoris võimaluse \"Lisa minu avalik võti\" pruukimiseks."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Siinvalitavat S/MIME sertifikaati kasutatakse iseendale saadetava kirja "
-"krüptimiseks ja redaktoris võimaluse \"Lisa minu avalik võti\" pruukimiseks.</p>"
-"<p>Selle välja võib jätta tühjaks, kuid KMail ei suuda sellisel juhul kirju "
-"S/MIME-ga krüptida. Tavalisi e-kirja võimalusi see valik ei puuduta.</p></qt>"
+"<qt><p>Siinvalitavat S/MIME sertifikaati kasutatakse iseendale saadetava "
+"kirja krüptimiseks ja redaktoris võimaluse \"Lisa minu avalik võti\" "
+"pruukimiseks.</p><p>Selle välja võib jätta tühjaks, kuid KMail ei suuda "
+"sellisel juhul kirju S/MIME-ga krüptida. Tavalisi e-kirja võimalusi see "
+"valik ei puuduta.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4177,24 +4082,20 @@ msgstr "&Vastamise aadress:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Vastamise aadressid</h3>"
-"<p>Sellega saab määra kirja päise real 'Vastamise aadress (<tt>Reply-to:</tt>"
-")  teistsuguse aadressi kui see, mis seisab väljal 'Kellelt' (<tt>From:</tt>"
-").</p>"
-"<p>Sellest võib olla abi, kui tegemist on näiteks ühesuguse ülesande kallal "
-"tegutsevate inimestega. Sellisel juhul seisab sinu kirjade väljal <tt>"
-"Kellelt:</tt> küll sinu e-posti aadress, aga vastused lähevad grupi "
-"aadressile.</p></p>Kui kahtled, jäta see väli tühjaks.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Vastamise aadressid</h3><p>Sellega saab määra kirja päise real "
+"'Vastamise aadress (<tt>Reply-to:</tt>)  teistsuguse aadressi kui see, mis "
+"seisab väljal 'Kellelt' (<tt>From:</tt>).</p><p>Sellest võib olla abi, kui "
+"tegemist on näiteks ühesuguse ülesande kallal tegutsevate inimestega. "
+"Sellisel juhul seisab sinu kirjade väljal <tt>Kellelt:</tt> küll sinu e-"
+"posti aadress, aga vastused lähevad grupi aadressile.</p></p>Kui kahtled, "
+"jäta see väli tühjaks.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4202,24 +4103,19 @@ msgstr "Sala&koopia aadressid:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Salakoopia (BCC) aadressid</h3> "
-"<p>Aadressid, mida sa siia sisestad, lisatakse iga selle identiteediga "
-"saadetavale kirjale. Teised saajad neid ei näe.</p> "
-"<p>Tavaliselt kasutatakse seda koopia saatmiseks iseenda mõnele muule "
-"kontole.</p>"
-"<p>Rohkem kui ühe aadressi määramiseks eralda need komadega.</p>"
-"<p>Kui sa ei ole kindel, mida teha, jäta see väli tühjaks.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Salakoopia (BCC) aadressid</h3> <p>Aadressid, mida sa siia "
+"sisestad, lisatakse iga selle identiteediga saadetavale kirjale. Teised "
+"saajad neid ei näe.</p> <p>Tavaliselt kasutatakse seda koopia saatmiseks "
+"iseenda mõnele muule kontole.</p><p>Rohkem kui ühe aadressi määramiseks "
+"eralda need komadega.</p><p>Kui sa ei ole kindel, mida teha, jäta see väli "
+"tühjaks.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4257,7 +4153,7 @@ msgstr "&Signatuur"
 msgid "&Picture"
 msgstr "&Pilt"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Sobimatu e-posti aadress"
 
@@ -4280,8 +4176,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Üks seadistatud OpenPGP krüptovõtmeid ei sisalda ühtki määratud e-posti "
 "aadressiga kasutaja ID-d sellele identiteedile (%1)."
@@ -4293,8 +4189,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Üks seadistatud S/MIME signeerimissertifikaate ei sisalda ühtki määratud "
-"e-posti aadressiga kasutaja ID-d sellele identiteedile (%1).\n"
+"Üks seadistatud S/MIME signeerimissertifikaate ei sisalda ühtki määratud e-"
+"posti aadressiga kasutaja ID-d sellele identiteedile (%1).\n"
 "Selle tulemuseks võivad olla hoiatusteated saaja poolel, kui ta püüab selle "
 "seadistusega loodud signatuuri kontrollida."
 
@@ -4331,21 +4227,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Identiteedile \"%1\" määratud mustandite kausta ei ole (enam) olemas. Seepärast "
-"kasutatakse tavalist mustandite kausta."
+"Identiteedile \"%1\" määratud mustandite kausta ei ole (enam) olemas. "
+"Seepärast kasutatakse tavalist mustandite kausta."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Identiteedile \"%1\" määratud kohandatud mallide kausta ei ole (enam) olemas. "
-"Seepärast kasutatakse tavalist mallide kausta."
+"Identiteedile \"%1\" määratud kohandatud mallide kausta ei ole (enam) "
+"olemas. Seepärast kasutatakse tavalist mallide kausta."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (vaikimisi)"
 
@@ -4387,21 +4283,21 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail avastas konto \"%1\" seadistuses prefiksikirje, mis on IMAP nimeruumide "
-"toetuse tõttu iganenud."
+"KMail avastas konto \"%1\" seadistuses prefiksikirje, mis on IMAP "
+"nimeruumide toetuse tõttu iganenud."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Seadistus teisendati automaatselt, kuid mõistlik oleks konto seadistus siiski "
-"üle kontrollida."
+"Seadistus teisendati automaatselt, kuid mõistlik oleks konto seadistus "
+"siiski üle kontrollida."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Seadistust ei olnud võimalik automaatselt teisendada, mispärast tuleks "
 "kontrollida oma konto seadistust."
@@ -4441,17 +4337,22 @@ msgstr "Kausta kvoot on peaaegu täis. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Et sul pole õigust sellesse kausta kirjutada, palu kausta omanikul selle veidi "
-"ruumi vabastada."
+"Et sul pole õigust sellesse kausta kirjutada, palu kausta omanikul selle "
+"veidi ruumi vabastada."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Viga: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Ühendus serveriga %1 suleti ootamatult või aegus. Kui võimalik, luuakse see "
 "automaatselt uuesti."
@@ -4603,20 +4504,20 @@ msgstr "Listi arhiivid"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Üks või enam seadistatud OpenPGP krüptovõtmetest või S/MIME sertifikaatidest ei "
-"ole krüptimiseks täielikult usaldatud."
+"Üks või enam seadistatud OpenPGP krüptovõtmetest või S/MIME sertifikaatidest "
+"ei ole krüptimiseks täielikult usaldatud."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Üks või enam seadistatud OpenPGP krüptovõtmetest või S/MIME sertifikaatidest ei "
-"ole krüptimiseks täielikult usaldatud."
+"Üks või enam seadistatud OpenPGP krüptovõtmetest või S/MIME sertifikaatidest "
+"ei ole krüptimiseks täielikult usaldatud."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4650,220 +4551,182 @@ msgstr "Krüptovõtmed ei ole täielikult usaldatavad"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p><p>aegub "
+"vähem kui päeva pärast.</p>\n"
+"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p><p>aegub "
+"vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
+"(seerianumber %2)<p>juursertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"(seerianumber %2)<p>juursertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"päeva pärast.</p>\n"
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"%n päeva pärast.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"päeva pärast.</p>\n"
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"%n päeva pärast.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
+"(seerianumber %2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"(seerianumber %2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"päeva pärast.</p>\n"
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"%n päeva pärast.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)<p>SK "
+"sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui päeva "
+"pärast.</p>\n"
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)<p>SK "
+"sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui %n päeva "
+"pärast.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Sinu S/MIME signeerimissertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
+"(seerianumber %2)</p><p>aegub vähem kui päeva pärast.</p>\n"
 "<p>Sinu S/MIME signeerimissertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"(seerianumber %2)</p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> (seerianumber "
+"%2)</p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> (seerianumber "
+"%2)</p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4877,209 +4740,171 @@ msgstr "S/MIME sertifikaat aegub varsti"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>Sinu OpenPGP signeerimisvõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>Sinu OpenPGP krüptovõti</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p><p>aegub "
+"vähem kui päeva pärast.</p>\n"
+"<p>OpenPGP võti</p><p align=center><b>%1</b> jaoks (KeyID 0x%2)</p><p>aegub "
+"vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
+"(seerianumber %2)<p>juursertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"(seerianumber %2)<p>juursertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"päeva pärast.</p>\n"
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"%n päeva pärast.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>juursertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"päeva pärast.</p>\n"
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>juursertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"%n päeva pärast.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
+"(seerianumber %2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
 "<p>Sinu S/MIME signeerimissertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"(seerianumber %2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> "
-"(seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"päeva pärast.</p>\n"
+"<p>Sinu S/MIME krüptosertifikaadi</p><p align=center><b>%1</b> (seerianumber "
+"%2)<p>SK sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui "
+"%n päeva pärast.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)"
-"<p>SK sertifikaat</p><p align=center><b>%3</b></p></p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)<p>SK "
+"sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui päeva "
+"pärast.</p>\n"
+"<p>S/MIME sertifikaadi</p><p align=center><b>%1</b> (seerianumber %2)<p>SK "
+"sertifikaat</p><p align=center><b>%3</b></p></p><p>aegub vähem kui %n päeva "
+"pärast.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Sinu S/MIME signeerimissertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
+"(seerianumber %2)</p><p>aegub vähem kui päeva pärast.</p>\n"
 "<p>Sinu S/MIME signeerimissertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"(seerianumber %2)</p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> "
-"(seerianumber %2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> (seerianumber "
+"%2)</p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>Sinu S/MIME krüptosertifikaat</p><p align=center><b>%1</b> (seerianumber "
+"%2)</p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</p>"
-"<p>aegub vähem kui päeva pärast.</p>\n"
-"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</p>"
-"<p>aegub vähem kui %n päeva pärast.</p>"
+"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</"
+"p><p>aegub vähem kui päeva pärast.</p>\n"
+"<p>S/MIME sertifikaat </p><p align=center><b>%1</b> jaoks (seerianumber %2)</"
+"p><p>aegub vähem kui %n päeva pärast.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5091,16 +4916,17 @@ msgstr "S/MIME sertifikaat aegub varsti"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Vähemalt üht sinu seadistatud OpenPGP krüptovõtmetest või S/MIME "
-"sertifikaatidest ei saa krüptimiseks kasutada. Palun seadista oma krüptovõtmed "
-"ja sertifikaadid antud identiteedile uuesti identiteedi seadistamise "
-"dialoogis.\n"
+"sertifikaatidest ei saa krüptimiseks kasutada. Palun seadista oma "
+"krüptovõtmed ja sertifikaadid antud identiteedile uuesti identiteedi "
+"seadistamise dialoogis.\n"
 "Kui jätkad ja vajad hiljem võtmeid, palutakse sul määrata, millist võtit "
 "kasutada."
 
@@ -5131,13 +4957,13 @@ msgstr "Kasutamatud signeerimisvõtmed"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Saaja krüptoeelistuste uurimine paljastas, et kiri tuleks vähemalt mõne saaja "
-"jaoks krüptida OpenPGP-d kasutades.\n"
+"Saaja krüptoeelistuste uurimine paljastas, et kiri tuleks vähemalt mõne "
+"saaja jaoks krüptida OpenPGP-d kasutades.\n"
 "Paraku ei ole sul seadistatud antud identiteedile kehtivaid usaldusväärseid "
 "OpenPGP krüptovõtmeid.\n"
 "Võid küll jätkata ilma endale krüptimist võimaldamata, kuid arvesta, et "
@@ -5147,13 +4973,13 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Saaja krüptoeelistuste uurimine paljastas, et kiri tuleks vähemalt mõne saaja "
-"jaoks krüptida S/MIME-t kasutades.\n"
+"Saaja krüptoeelistuste uurimine paljastas, et kiri tuleks vähemalt mõne "
+"saaja jaoks krüptida S/MIME-t kasutades.\n"
 "Paraku ei ole sul seadistatud antud identiteedile kehtivaid usaldusväärseid "
 "S/MIME krüptosertifikaate.\n"
 "Võid küll jätkata ilma endale krüptimist võimaldamata, kuid arvesta, et "
@@ -5161,8 +4987,8 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5177,8 +5003,8 @@ msgstr "Ära kasuta OpenPGP signatuuri"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5207,11 +5033,11 @@ msgstr "Signeerimine pole võimalik"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Sa ei ole valinud krüptovõtit endale krüptimiseks. Kui nüüd kirja krüptid, ei "
-"saa sa seda enam ise lahti krüptida."
+"Sa ei ole valinud krüptovõtit endale krüptimiseks. Kui nüüd kirja krüptid, "
+"ei saa sa seda enam ise lahti krüptida."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5232,11 +5058,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Sa ei ole valinud ühelegi selle kirja saajale krüptovõtit. Seepärast kirja ka "
-"ei krüptita."
+"Sa ei ole valinud ühelegi selle kirja saajale krüptovõtit. Seepärast kirja "
+"ka ei krüptita."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5280,11 +5106,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "\"%1\" jaoks ei leitud kehtivat ja usaldusväärset krüptovõtit.\n"
 "\n"
@@ -5333,10 +5159,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kriitiline viga: kirjade tirimine ebaõnnestus: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Kirja lisamine ebaõnnestus:\n"
+msgid "Failed to add message:\n"
+msgstr "Kirja lisamine ebaõnnestus:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5426,6 +5250,50 @@ msgstr "La&hutatud IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir postkast"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Kirja subjekti määramine"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Koopia saatmine 'aadressile'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Pimekoopia saatmine 'aadressile'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Kirjale lisatakse 'päis'"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Kirja tekst võetakse 'failist'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Kirja teksti määramine"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Kirjale lisatakse kaasatud fail. Seda tegevust võib korrata"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Kontrollitakse ainult uusi kirju"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Avatakse ainult redaktori aken"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Näitab antud kirja faili"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Kiri saadetakse 'aadressile' või lisatakse fail, millele osutab 'URL'"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Kiri"
@@ -5468,8 +5336,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail loob nüüd soovitud grupitöökaustad alamkaustadena kaustas %1. Kui sa seda "
-"ei soovi, loobu ning IMAP ressursse ei kasutata."
+"KMail loob nüüd soovitud grupitöökaustad alamkaustadena kaustas %1. Kui sa "
+"seda ei soovi, loobu ning IMAP ressursse ei kasutata."
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5481,13 +5349,13 @@ msgstr "%1: leiti kaust %2, seda kasutatakse grupitöö peakaustana."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail leidis kaustas %1 järgmised grupitöökaustad ja peab nüüd ette võtma "
-"järgmised toimingud: %2"
-"<br>Kui sa seda ei soovi, loobu ning IMAP ressursse ei kasutata."
+"<qt>KMail leidis kaustas %1 järgmised grupitöökaustad ja peab nüüd ette "
+"võtma järgmised toimingud: %2<br>Kui sa seda ei soovi, loobu ning IMAP "
+"ressursse ei kasutata."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5535,11 +5403,11 @@ msgstr "URL kopeeritud lõikepuhvrisse."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Fail <b>%1</b> on olemas.<br>Kas asendada see?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Salvesta faili"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Asenda"
 
@@ -5557,7 +5425,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Kiri eemaldati salvestamise ajal. Kirja ei salvestatud."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5577,11 +5445,11 @@ msgstr "Fail ei sisalda kirja."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fail sisaldab mitu kirja, näidatakse ainult esimest."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5590,111 +5458,111 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Kirjade filtreerimine"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "%1. kirja filtreerimine (kokku %2)"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Kettaruumi napib?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Liiguta sellesse kausta"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopeeri sellesse kausta"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr "Kaustas %1 leiti vigane IMAP puhver. Kirjade kopeerimine katkestati."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Kirjade liigutamine"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Kirjade kustutamine"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URLi avamine..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Kas tõesti käivitada <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Käivita"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Ei leitud ühtki kaasatud faili, mida salvestada."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Kaasatud failide salvestamine"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "attachment.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "attachment.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Fail nimega %1 on juba olemas. Kas kirjutada see üle?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fail on juba olemas"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Kirjuta üle"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "Kirja osa %1 on krüptitud. Kas säilitada krüpteering salvestamisel?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMaili küsimus"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Säilita krüpteering"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ära säilita"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "Kirja osa %1 on signeeritud. Kas säilitada signatuur salvestamisel?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Säilita signatuur"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5703,22 +5571,22 @@ msgstr ""
 "Faili %1 kirjutamine ebaõnnestus:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Faili %1 kirjutamine ebaõnnestus."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Sellel e-posti aadressil pole aadressiraamatus kirjet. Lisa see "
 "aadresiraamatusse ja seejärel lisa eelistatud kiirsuhtluskliendis "
 "kiirsuhtlusaadressid."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5728,51 +5596,51 @@ msgstr ""
 " %1\n"
 " Pole võimalik määrata, kellega vestlust alustada."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmuse taustaprogramm ei paku funktsiooni \"x-obtain-keys\". Palun anna "
 "veast teada."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmuse taustaprogrammi viga"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Chiasmuse taustaprogramm tagastas ootamatu väärtuse: funktsioon "
-"\"x-obtain-keys\" ei tagastanud stringinimekirja. Palun anna veast teada."
+"Chiasmuse taustaprogramm tagastas ootamatu väärtuse: funktsioon \"x-obtain-"
+"keys\" ei tagastanud stringinimekirja. Palun anna veast teada."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Ühtegi võtit ei leitud. Palun kontrolli, et Chiasmuse seadistuses on määratud "
-"korrektne võtmete asukoht."
+"Ühtegi võtit ei leitud. Palun kontrolli, et Chiasmuse seadistuses on "
+"määratud korrektne võtmete asukoht."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmuse lahtikrüptimise võtme valik"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmuse taustaprogramm ei paku funktsiooni \"x-decrypt\". Palun anna veast "
 "teada."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5780,19 +5648,19 @@ msgstr ""
 "Funktsioon \"x-decrypt\" ei tunnusta oodatud parameetreid. Palun anna veast "
 "teada."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmuse lahtikrüptimise viga"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Chiasmuse taustaprogramm tagastas ootamatu väärtuse: funktsioon \"x-decrypt\" "
-"ei tagastanud baidimassiivi. Palun anna veast teada."
+"Chiasmuse taustaprogramm tagastas ootamatu väärtuse: funktsioon \"x-decrypt"
+"\" ei tagastanud baidimassiivi. Palun anna veast teada."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5802,7 +5670,7 @@ msgstr ""
 "Kellele: %2\n"
 "Teema: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Kiri: %1"
@@ -5901,7 +5769,7 @@ msgstr "Suurus"
 msgid "Encoding"
 msgstr "Kodeering"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Tihendus"
 
@@ -5913,7 +5781,7 @@ msgstr "Krüptimine"
 msgid "Sign"
 msgstr "Signeerimine"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Kaasatud faili nimi:"
 
@@ -5935,7 +5803,8 @@ msgstr "Esmased kirja saajad"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>Sellele väljale kirjutatud aadressidele saadetakse kirja koopia.</qt>"
 
@@ -5946,9 +5815,9 @@ msgstr "Täiendavad kirja saajad"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Sellele väljale kirjutatud e-posti aadressile saadetakse kirja koopia. "
 "Tehniliselt ei ole vahet, kas kirjutada aadressid väljale <b>Kellele:</b> "
@@ -5961,12 +5830,11 @@ msgstr "Peidetud kirja saajad"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Põhimõtteliselt sama, mis <b>Koopia:</b>, kuid teised kirja saajad ei näe "
-"pimekoopia saajat.</qt>"
+"<qt>Põhimõtteliselt sama, mis <b>Koopia:</b>, kuid teised kirja saajad ei "
+"näe pimekoopia saajat.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -5976,7 +5844,7 @@ msgstr "&Saada kiri"
 msgid "&Send Mail Via"
 msgstr "&Saada kiri kasutades"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Saada &hiljem"
@@ -6041,8 +5909,7 @@ msgstr "&Eemalda tsitaadimärgid"
 msgid "Cl&ean Spaces"
 msgstr "Pu&hasta tühikutest"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Kasuta fikseeritud fo&nti"
@@ -6183,31 +6050,31 @@ msgstr "Krüptitud kir&ja vorming"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standardne"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Täpploend (täpid)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Täpploend (ringid)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Täpploend (ruudud)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Järjekord-loend (numbrid)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Järjekord-loend (väiketähed)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Järjekord-loend (suurtähed)"
 
@@ -6298,13 +6165,14 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Salvestab kirja mustandite kausta. Nii saab seda edasi redigeerida ning soovi "
-"korral hiljem ära saata."
+"Salvestab kirja mustandite kausta. Nii saab seda edasi redigeerida ning "
+"soovi korral hiljem ära saata."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
-"Kas salvestada kiri mustandite kausta hilisemaks kasutamiseks või unustada see?"
+"Kas salvestada kiri mustandite kausta hilisemaks kasutamiseks või unustada "
+"see?"
 
 #: kmcomposewin.cpp:2262
 msgid "Close Composer"
@@ -6312,8 +6180,8 @@ msgstr "Redaktori sulgemine"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Loodud kiri paistab viitavat kaasatud failile, aga sa ei ole kirjale midagi "
@@ -6324,51 +6192,51 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Kaasatud faili meeldetuletus"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Saada nagu on"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail ei suutnud tuvastada kaasatud faili (%1) asukohta.</p>"
-"<p>Faili kaasamiseks tuleb anda selle täielik otsingutee.</p></qt>"
+"<qt><p>KMail ei suutnud tuvastada kaasatud faili (%1) asukohta.</p><p>Faili "
+"kaasamiseks tuleb anda selle täielik otsingutee.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Sinu administraator on keelanud suuremate failide kui %1 MB kaasamise.</p>"
+"<qt><p>Sinu administraator on keelanud suuremate failide kui %1 MB kaasamise."
+"</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Faili kaasamine"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "K&aasamine"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Faili lisamine"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Faili lisamine"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tekkis viga võtme eksportimisel taustarakenduselt:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Tekkis viga võtme eksportimisel taustarakenduselt:</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6407,19 +6275,34 @@ msgid ""
 "View"
 msgstr "Vaata"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Muuda..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Muuda rakendusega..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Salvesta kui..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "O&madused"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Lisa kaasatud fail..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail ei suutnud faili tihendada."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6427,77 +6310,74 @@ msgstr ""
 "Tihendatud fail on suurem kui originaalfail. Kas soovid säilitada "
 "originaalfaili?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Säilita"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail ei suutnud faili lahti pakkida."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Kaasatud faili salvestamine"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Lisa tekstina"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Lisa kaasatud failina"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Palun vali, kas lisada valitud faili sisu tekstina redaktorisse või see "
 "tervikuna kirjale lisatud failina."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Kas asetada tekstina või kaasatud failina?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nimetu"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Soovisid, et kirjad endale krüptitaks, kuid parajasti valitud identiteedile "
-"ei ole selleks määratud ühtki (OpenPGP või S/MIME) krüptovõtit.\n"
+"<qt><p>Soovisid, et kirjad endale krüptitaks, kuid parajasti valitud "
+"identiteedile ei ole selleks määratud ühtki (OpenPGP või S/MIME) "
+"krüptovõtit.\n"
 "<p>Palun vali kasutatavad võtmed identiteedi seadistuses.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Määramata krüptovõti"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Selle kirja signeerimiseks tuleb esmalt määrata selleks kasutatav OpenPGP "
-"või S/MIME signeerimisvõti.</p> "
-"<p>Palun vali kasutatav võti identiteedi seadistustes.</p</qt>"
+"<qt> <p>Selle kirja signeerimiseks tuleb esmalt määrata selleks kasutatav "
+"OpenPGP või S/MIME signeerimisvõti.</p> <p>Palun vali kasutatav võti "
+"identiteedi seadistustes.</p</qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Määramata signeerimisvõti"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6505,197 +6385,196 @@ msgstr ""
 "KMail on parajasti võrguühendusega režiimis, sinu kirjad hoitakse väljuvate "
 "kirjade kaustas, kuni taas võrku lähed."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Võrgus/Võrgust ära"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Sul tuleb sisestada väljale Kellelt: oma e-posti aadress. Samuti võiks oma "
-"e-posti aadressi kehtestada kõigile identiteetidele, et sa ei peaks seda iga "
+"Sul tuleb sisestada väljale Kellelt: oma e-posti aadress. Samuti võiks oma e-"
+"posti aadressi kehtestada kõigile identiteetidele, et sa ei peaks seda iga "
 "kirja korral aina uuesti sisestama."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Vaja on sisestada vähemalt üks saaja kas väljale Kellele: või koopia või "
 "pimekoopia väljale."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Saaja väli on tühi. Kas saata kiri ikkagi teele?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Saaja on määramata"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Sa ei määranud teemat. Kas saata kiri ilma subjektita?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Teema määramata"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "S&aada nagu on"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Ei, ma sisestan subjekti"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Säilita märkekeel, ära signeeri/krüpti"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Säilita märkekeel, ära krüpti"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Säilita märkekeel, ära signeeri"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Signeeri/krüpti (kustutab märkekeele)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Krüpti (kustutab märkekeele)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Signeeri (kustutab märkekeele)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>HTML-kirjade sisene signeerimine/krüptimine ei ole võimalik.</p>"
-"<p>Kas soovid märkekeele kustutada?</p></qt>"
+"<qt><p>HTML-kirjade sisene signeerimine/krüptimine ei ole võimalik.</"
+"p><p>Kas soovid märkekeele kustutada?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Kas signeerida/krüptida kiri?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Identiteedile \"%1\" määratud kohandatud mustandite või mallide kausta ei ole "
-"(enam) olemas. Seepärast kasutatakse tavalist mustandite või mallide kausta."
+"Identiteedile \"%1\" määratud kohandatud mustandite või mallide kausta ei "
+"ole (enam) olemas. Seepärast kasutatakse tavalist mustandite või mallide "
+"kausta."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Palun loo saatmiseks konto ja proovi uuesti."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Kirja saatmine..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Saada kinnitus"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Saada k&ohe"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Saajad puuduvad"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Täiendavad kirja saajad"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Õigekirja kontroll: sees"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Õigekirja kontroll: väljas"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Õigekirja kontrollist loobuti."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Õigekirja kontroll peatati."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Õigekirja kontroll läbitud."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Õigekirja kontroll"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Palun seadista kõigepealt Chiasmuse krüptimiseks kasutatav taustaprogramm.\n"
 "Seda saab teha seadistustedialoogi turvalisuse kaardi alamkaardil "
 "'Krüptorakendused'."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Paistab, et libkleopatra on kompileeritud Chiasmuse toeta. Libkleopatra võiks "
-"uuesti kompileerida võtmega --enable-chiasmus."
+"Paistab, et libkleopatra on kompileeritud Chiasmuse toeta. Libkleopatra "
+"võiks uuesti kompileerida võtmega --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Ühtegi Chiasmuse taustaprogrammi pole seadistatud"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Ühtegi Chiasmuse võtit ei leitud"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmuse krüptovõtme valik"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Kiri allkirjastatakse"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Kirja ei allkirjastata"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Kiri krüptitakse"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Kirja ei krüptita"
 
@@ -6744,11 +6623,11 @@ msgstr "Õigekirja kontroll - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpelli/Aspelli käivitamine ebaõnnestus. Palun kontrolli, et ISpell või Aspell "
-"oleks korrektselt seadistatud ja asuks sinu otsinguteel."
+"ISpelli/Aspelli käivitamine ebaõnnestus. Palun kontrolli, et ISpell või "
+"Aspell oleks korrektselt seadistatud ja asuks sinu otsinguteel."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6781,13 +6660,11 @@ msgstr "<qt>Filtri reeglis <b>%1</b> on liiga palju toiminguid.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Tundmatu toiming <b>%1</b>"
-"<br>filtri reeglis <b>%2</b>."
-"<br>Seda ignoreeritakse.</qt>"
+"<qt>Tundmatu toiming <b>%1</b><br>filtri reeglis <b>%2</b>.<br>Seda "
+"ignoreeritakse.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7007,162 +6884,129 @@ msgstr "Mängi heli"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>See on juba kirjeldatud filtrite nimekiri. Filtreid läbitakse ülevalt alla "
-"järjekorras.</p> "
-"<p>Filtri muutmiseks paremal pool asuvate vahendite abil klõpsa soovitud "
-"filtril.</p></qt>"
+"<qt><p>See on juba kirjeldatud filtrite nimekiri. Filtreid läbitakse ülevalt "
+"alla järjekorras.</p> <p>Filtri muutmiseks paremal pool asuvate vahendite "
+"abil klõpsa soovitud filtril.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul uue filtri loomiseks.</p> "
-"<p>Uus filter lisatakse hetkel valitud filtri ette, kuid sa saad asukohta alati "
-"muuta.</p> "
-"<p>Kui klõpsasid seda nuppu kogemata, saad eemaldada tekkinud filtri klõpsuga "
-"nupul <em>Kustuta</em>.</p></qt>"
+"<qt><p>Klõpsa sellel nupul uue filtri loomiseks.</p> <p>Uus filter lisatakse "
+"hetkel valitud filtri ette, kuid sa saad asukohta alati muuta.</p> <p>Kui "
+"klõpsasid seda nuppu kogemata, saad eemaldada tekkinud filtri klõpsuga nupul "
+"<em>Kustuta</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul filtri kopeerimiseks.</p> "
-"<p>Kui klõpsasid seda nuppu kogemata, saad eemaldada tekkinud filtri klõpsuga "
-"nupul <em>Kustuta</em>.</p></qt>"
+"<qt><p>Klõpsa sellel nupul filtri kopeerimiseks.</p> <p>Kui klõpsasid seda "
+"nuppu kogemata, saad eemaldada tekkinud filtri klõpsuga nupul <em>Kustuta</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul valitud filtri nimekirjast <em>kustutamiseks</em>.</p>"
-"<p>Kustutatud filtrit enam taastada ei saa, küll aga saad sa vajutada dialoogi "
-"nupule <em>Katkesta</em> kõigi tehtud muudatuste tühistamiseks.</p></qt>"
+"<qt><p>Klõpsa sellel nupul valitud filtri nimekirjast <em>kustutamiseks</em>."
+"</p><p>Kustutatud filtrit enam taastada ei saa, küll aga saad sa vajutada "
+"dialoogi nupule <em>Katkesta</em> kõigi tehtud muudatuste tühistamiseks.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul valitud filtri liigutamiseks nimekirjas <em>"
-"esimeseks</em>.</p> "
-"<p>See on kasulik, sest filtrite järjekord nimekirjas määrab ära ka nende "
-"kirjadele kehtestamise järjekorra. Kõige ülemine filter läbitakse kõige "
-"esimesena.</p></qt>"
+"<qt><p>Klõpsa sellel nupul valitud filtri liigutamiseks nimekirjas "
+"<em>esimeseks</em>.</p> <p>See on kasulik, sest filtrite järjekord "
+"nimekirjas määrab ära ka nende kirjadele kehtestamise järjekorra. Kõige "
+"ülemine filter läbitakse kõige esimesena.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul valitud filtri ühe sammu võrra <em>üles</em> "
-"liigutamiseks.</p> "
-"<p>See on kasulik, sest filtrite järjekord nimekirjas määrab ära ka nende "
-"kirjadele kehtestamise järjekorra. Kõige ülemine filter läbitakse kõige "
-"esimesena.</p> "
-"<p>Kui klõpsasid seda nuppu kogemata, siis saad taastada varasema olukorra "
-"klõpsuga nupul <em>Alla</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klõpsa sellel nupul valitud filtri ühe sammu võrra <em>üles</em> "
+"liigutamiseks.</p> <p>See on kasulik, sest filtrite järjekord nimekirjas "
+"määrab ära ka nende kirjadele kehtestamise järjekorra. Kõige ülemine filter "
+"läbitakse kõige esimesena.</p> <p>Kui klõpsasid seda nuppu kogemata, siis "
+"saad taastada varasema olukorra klõpsuga nupul <em>Alla</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul valitud filtri ühe sammu võrra <em>alla</em> "
-"liigutamiseks.</p> "
-"<p>See on kasulik, sest filtrite järjekord nimekirjas määrab ära ka nende "
-"kirjadele kehtestamise järjekorra. Kõige ülemine filter läbitakse kõige "
-"esimesena.</p> "
-"<p>Kui klõpsasid seda nuppu kogemata, siis saad taastada varasema olukorra "
-"klõpsuga nupul <em>Üles</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klõpsa sellel nupul valitud filtri ühe sammu võrra <em>alla</em> "
+"liigutamiseks.</p> <p>See on kasulik, sest filtrite järjekord nimekirjas "
+"määrab ära ka nende kirjadele kehtestamise järjekorra. Kõige ülemine filter "
+"läbitakse kõige esimesena.</p> <p>Kui klõpsasid seda nuppu kogemata, siis "
+"saad taastada varasema olukorra klõpsuga nupul <em>Üles</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul valitud filtri liigutamiseks nimekirjas <em>"
-"viimaseks</em>.</p> "
-"<p>See on kasulik, sest filtrite järjekord nimekirjas määrab ära ka nende "
-"kirjadele kehtestamise järjekorra. Kõige ülemine filter läbitakse kõige "
-"esimesena.</p></qt>"
+"<qt><p>Klõpsa sellel nupul valitud filtri liigutamiseks nimekirjas "
+"<em>viimaseks</em>.</p> <p>See on kasulik, sest filtrite järjekord "
+"nimekirjas määrab ära ka nende kirjadele kehtestamise järjekorra. Kõige "
+"ülemine filter läbitakse kõige esimesena.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klõpsa sellel nupul valitud filtri ümbernimetamiseks.</p> "
-"<p>Automaatselt nimetatud filtrid algavad märgiga \"&lt;\"</p> "
-"<p> Kui klõpsasid seda nuppu kogemata ja soovid automaatset nimetust tagasi, "
-"siis klõpsa sellel nupul, vali <em>Puhasta</em> ja seejärel ilmuvas dialoogis "
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Klõpsa sellel nupul valitud filtri ümbernimetamiseks.</p> "
+"<p>Automaatselt nimetatud filtrid algavad märgiga \"&lt;\"</p> <p> Kui "
+"klõpsasid seda nuppu kogemata ja soovid automaatset nimetust tagasi, siis "
+"klõpsa sellel nupul, vali <em>Puhasta</em> ja seejärel ilmuvas dialoogis "
 "<em>OK</em>. </p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Märgi see, sundimaks kinnituste dialoogi esile hüppama.</p> "
-"<p>See võib olla kasulik, kui oled kehtestanud reegli, mis paneb kirju hiljem "
-"alla laadima. Ilma dialoogi esilekutsumiseta jäävadki need kirjad tõmbamata, "
-"kui serveris ei ole ootamas teisi mahukaid kirju või kui sa soovid kehtestada "
+"<qt> <p>Märgi see, sundimaks kinnituste dialoogi esile hüppama.</p> <p>See "
+"võib olla kasulik, kui oled kehtestanud reegli, mis paneb kirju hiljem alla "
+"laadima. Ilma dialoogi esilekutsumiseta jäävadki need kirjad tõmbamata, kui "
+"serveris ei ole ootamas teisi mahukaid kirju või kui sa soovid kehtestada "
 "uue sõnumite märgistamise reegli.</p></qt>"
 
 #: kmfilterdlg.cpp:133
@@ -7173,6 +7017,16 @@ msgstr "POP3 filtri reeglid"
 msgid "Filter Rules"
 msgstr "Filtri reeglid"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Impordi"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Impordi"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Kehtivad filtrid"
@@ -7255,6 +7109,11 @@ msgstr "Filter lisatakse ka tööriistaribale"
 msgid "Icon for this filter:"
 msgstr "Selle filtri ikoon:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Kellele"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Üles"
@@ -7263,16 +7122,29 @@ msgstr "Üles"
 msgid "Down"
 msgstr "Alla"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Nimeta ümber..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Uus"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopeeri kausta"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Kustutatud"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7281,8 +7153,8 @@ msgstr "Kausta kiirklahvi valik"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Vähemalt üks filtritest kasutab sihtkohana IMAP konto kausta. Selliseid "
 "filtreid saab kasutada ainult käsitsi või sissetulevate IMAP konto kirjade "
@@ -7293,8 +7165,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Järgmisi filtreid ei olnud võimalik salvestada, sest nad olid vigased (näiteks "
-"ei sisaldanud toimingut või otsingureeglit)."
+"Järgmisi filtreid ei olnud võimalik salvestada, sest nad olid vigased "
+"(näiteks ei sisaldanud toimingut või otsingureeglit)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7363,35 +7235,29 @@ msgstr "IMAP puhvri probleemid"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>IMAP puhvri probleemid.</b></p>"
-"<p>Kui sul on raskusi IMAP kausta sünkroniseerimisel, tasuks esmalt uuesti luua "
-"indeksifail. See võtab veidi aega, aga ei tohiks küll mingeid probleeme "
-"tekitada.</p>"
-"<p>Kui sellest ei piisa, võiks uuendada IMAP puhvrit. See tähendab aga ka kõigi "
-"antud kausta ja kõigi selle alamkaustade kohalike muudatuste kaotsiminekut.</p>"
-"\n"
-"<p><b>IMAP puhvri probleem.</b></p>"
-"<p>Kui sul on raskusi IMAP kausta sünkroniseerimisel, tasuks esmalt uuesti luua "
-"indeksifail. See võtab veidi aega, aga ei tohiks küll mingeid probleeme "
-"tekitada.</p>"
-"<p>Kui sellest ei piisa, võiks uuendada IMAP puhvrit. See tähendab aga ka kõigi "
-"antud kausta ja kõigi selle alamkaustade kohalike muudatuste kaotsiminekut.</p>"
+"<p><b>IMAP puhvri probleemid.</b></p><p>Kui sul on raskusi IMAP kausta "
+"sünkroniseerimisel, tasuks esmalt uuesti luua indeksifail. See võtab veidi "
+"aega, aga ei tohiks küll mingeid probleeme tekitada.</p><p>Kui sellest ei "
+"piisa, võiks uuendada IMAP puhvrit. See tähendab aga ka kõigi antud kausta "
+"ja kõigi selle alamkaustade kohalike muudatuste kaotsiminekut.</p>\n"
+"<p><b>IMAP puhvri probleem.</b></p><p>Kui sul on raskusi IMAP kausta "
+"sünkroniseerimisel, tasuks esmalt uuesti luua indeksifail. See võtab veidi "
+"aega, aga ei tohiks küll mingeid probleeme tekitada.</p><p>Kui sellest ei "
+"piisa, võiks uuendada IMAP puhvrit. See tähendab aga ka kõigi antud kausta "
+"ja kõigi selle alamkaustade kohalike muudatuste kaotsiminekut.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7427,8 +7293,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Kausta %1 UID puhvri faili kirjutamine ebaõnnestus. Probleem võib peituda "
 "failisüsteemi õigustes ."
@@ -7469,11 +7335,11 @@ msgstr "Selle kausta indeks loodi uuesti."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Kaust %1 ei ole mitte esialgses sünkroolekus (see oli %2). Kas lähtestada see "
-"esialgsesse sünkroolekusse ja seejärel sünkroniseerida?"
+"Kaust %1 ei ole mitte esialgses sünkroolekus (see oli %2). Kas lähtestada "
+"see esialgsesse sünkroolekusse ja seejärel sünkroniseerida?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7578,8 +7444,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Sinu õigusi kaustas <b>%1</b> on piiratud: enam ei ole võimalik kausta kirju "
-"lisada.</p>"
+"<p>Sinu õigusi kaustas <b>%1</b> on piiratud: enam ei ole võimalik kausta "
+"kirju lisada.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7600,15 +7466,11 @@ msgstr "Alamkaustade loomine serveris"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kirjad serveri kaustas <b>%1</b> on kustutatud. Kas soovid kustutada need ka "
-"kohalikult?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Kirjad serveri kaustas <b>%1</b> on kustutatud. Kas soovid kustutada "
+"need ka kohalikult?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7629,9 +7491,8 @@ msgstr "Nimeruumi %1 kaustade tõmbamine"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 "Paistab, et kaust <b>%1</b> on kustutatud. Kas soovid kustutada selle "
 "serverist?</p></qt>"
@@ -7642,16 +7503,16 @@ msgstr "Loobutud"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP-server %1 ei toeta IMAP-annotatsioone. XML-salvestust ei saa antud "
 "serveris kasutada. Palun muuda oma KMaili seadistusi."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP-server %1 ei toeta IMAP-annotatsioone. XML-salvestust ei saa antud "
 "serveris kasutada. Palun muuda oma KMaili seadistusi."
@@ -7666,17 +7527,16 @@ msgstr "lost+found"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Kaustas <b>%1</b> on uusi kirju, mida ei ole veel serverisse laaditud, kuid "
-"see kaust on serverist kustutatud või ei ole sul piisavalt õigusi nende "
-"üleslaadimiseks antud kausta.</p>"
-"<p>Seepärast liigutatakse kõik asjakohased kirjad andmekao vältimiseks kausta "
-"<b>%2</b>.</p>"
+"<p>Kaustas <b>%1</b> on uusi kirju, mida ei ole veel serverisse laaditud, "
+"kuid see kaust on serverist kustutatud või ei ole sul piisavalt õigusi nende "
+"üleslaadimiseks antud kausta.</p><p>Seepärast liigutatakse kõik asjakohased "
+"kirjad andmekao vältimiseks kausta <b>%2</b>.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7684,21 +7544,26 @@ msgstr "Ebapiisavad kasutamisõigused"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Selles kaustas (%1) on uusi kirju, mida ei ole veel serverisse laaditud, "
 "kuid see kaust on serverist kustutatud või ei ole sul piisavalt õigusi nende "
-"üleslaadimiseks antud kausta. Palun võta ühendust administraatoriga, et saaksid "
-"õiguse uued kirjad serverisse liigutada, või liiguta need käesolevast kaustast "
-"kuhugi mujale.</p>"
-"<p>Kas soovid liigutada kirjad kohe mõnda teise kausta?</p>"
+"üleslaadimiseks antud kausta. Palun võta ühendust administraatoriga, et "
+"saaksid õiguse uued kirjad serverisse liigutada, või liiguta need "
+"käesolevast kaustast kuhugi mujale.</p><p>Kas soovid liigutada kirjad kohe "
+"mõnda teise kausta?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Liigutamine kausta:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ära liiguta"
 
@@ -7710,8 +7575,7 @@ msgstr "Liiguta kirjad kausta"
 msgid "Permissions (ACL)"
 msgstr "Õigused (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Üldine"
@@ -7735,8 +7599,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Kasutatakse kohandatud ikoone"
@@ -7755,23 +7618,21 @@ msgstr "Tegutsemine uue/lugemata kirja saabumisel kausta"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Sisselülitamisel antakse märku, kui kausta saab uus/lugemata kiri. Samuti "
-"peatutakse selle sisselülitamisel käesolevas kaustas, kui liigud "
-"eelmisse/järgmisse lugemata kirjadega kausta.</p>"
-"<p>Kui see on märkimata, ei anta sulle uute/lugemata kirjade saabumisest kausta "
-"teada, samuti jäetakse see kaust vahele, kui liigud eelmisse/järgmisse lugemata "
-"kirjadega kausta. See on mõttekas näiteks uute/lugemata kirjade ignoreerimiseks "
-"prügikastis ja rämpsposti kaustas.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Sisselülitamisel antakse märku, kui kausta saab uus/lugemata kiri. "
+"Samuti peatutakse selle sisselülitamisel käesolevas kaustas, kui liigud "
+"eelmisse/järgmisse lugemata kirjadega kausta.</p><p>Kui see on märkimata, ei "
+"anta sulle uute/lugemata kirjade saabumisest kausta teada, samuti jäetakse "
+"see kaust vahele, kui liigud eelmisse/järgmisse lugemata kirjadega kausta. "
+"See on mõttekas näiteks uute/lugemata kirjade ignoreerimiseks prügikastis ja "
+"rämpsposti kaustas.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7783,12 +7644,12 @@ msgstr "Vastused jäetakse sellesse kausta"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Sisselülitamisel suunatakse vastused selles kaustas olevatele kirjadele pärast "
-"saatmist samasse kausta, mitte vaikimisi saadetud kirjade kausta."
+"Sisselülitamisel suunatakse vastused selles kaustas olevatele kirjadele "
+"pärast saatmist samasse kausta, mitte vaikimisi saadetud kirjade kausta."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7798,17 +7659,21 @@ msgstr "Saatja/saaja veeru näitamine kirjade nimekirjas"
 msgid "Sho&w column:"
 msgstr "&Näidatakse veergu:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Sea vaikeväärtuseks"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Saatja"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Saaja"
@@ -7819,17 +7684,18 @@ msgstr "&Saatja identiteet:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Vali saatja identiteet, mida kasutatakse uue kirja kirjutamisel võio vastamisel "
-"selles kaustas olevale kirjale. See tähendab, et kui asub mõnes oma töökaustas, "
-"võid panna KMaili automaatselt kasutama vajalikku saatja e-posti aadressi, "
-"signatuuri ning signeerimis- või krüptovõtmeid. Identiteete saab määrata KMaili "
-"seadistustedialoogis (Seadistused -> KMaili seadistamine)."
+"Vali saatja identiteet, mida kasutatakse uue kirja kirjutamisel võio "
+"vastamisel selles kaustas olevale kirjale. See tähendab, et kui asub mõnes "
+"oma töökaustas, võid panna KMaili automaatselt kasutama vajalikku saatja e-"
+"posti aadressi, signatuuri ning signeerimis- või krüptovõtmeid. Identiteete "
+"saab määrata KMaili seadistustedialoogis (Seadistused -> KMaili "
+"seadistamine)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7847,26 +7713,26 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Siin saab määrata, millised antud kausta tarbivad kasutajad peavad saama oma "
 "vaba/hõivatud nimekirja \"hõivatuse\" teateid ja nägema kausta sündmuste või "
-"ülesannete korral häiret. Määratlus kehtib ainult kalendri ja ülesannete kausta "
-"kohta (ülesannete korral ainult häirete kohta).\n"
+"ülesannete korral häiret. Määratlus kehtib ainult kalendri ja ülesannete "
+"kausta kohta (ülesannete korral ainult häirete kohta).\n"
 "\n"
-"Kasutamisnäited: kui ülemus kasutab seda kausta koos sekretäriga, saab ainult "
-"ülemus määrata end kohtumiste ajaks hõivatuks, milleks ta peab valida "
+"Kasutamisnäited: kui ülemus kasutab seda kausta koos sekretäriga, saab "
+"ainult ülemus määrata end kohtumiste ajaks hõivatuks, milleks ta peab valida "
 "\"administraatorid\", sest sekretäril pole antud kaustas administraatori "
 "õigusi.\n"
 "Kui aga töögrupp kasutab ühiselt kalendrit grupi kohtumiste tarbeks, peaks "
 "kõigil kausta lugejatel olema õigus märkida end kohtumiste ajaks hõivatuks.\n"
-"Kogu firmat hõlmav kaust lisasündmuste jaoks peaks aga saama määratluse \"Mitte "
-"keegi\", sest pole ju teada, kes sellistele sündmustele lähevad."
+"Kogu firmat hõlmav kaust lisasündmuste jaoks peaks aga saama määratluse "
+"\"Mitte keegi\", sest pole ju teada, kes sellistele sündmustele lähevad."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7897,22 +7763,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Sa oled seadistanud selle kausta sisaldama grupitöö infot ja sisse on lülitatud "
-"ka grupitöö kaustade peitmise valik. See tähendab seda, et see kaust kaob peale "
-"seadistuste dialoogi sulgemist. Kui soovid kausta uuesti eemaldada, pead "
-"ajutiselt grupitöö kataloogide peitmise keelama, et seda kausta näha."
+"Sa oled seadistanud selle kausta sisaldama grupitöö infot ja sisse on "
+"lülitatud ka grupitöö kaustade peitmise valik. See tähendab seda, et see "
+"kaust kaob peale seadistuste dialoogi sulgemist. Kui soovid kausta uuesti "
+"eemaldada, pead ajutiselt grupitöö kataloogide peitmise keelama, et seda "
+"kausta näha."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7981,7 +7848,8 @@ msgstr "Viga kaustainfo hankimisel."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Postkasti '%1' indeks on loodud tundmatu KMaili versiooniga (%2).\n"
 "Selle postkasti indeksifaili saab uuesti genereerida, kuid mõningane info, "
@@ -8001,8 +7869,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"Postkasti '%1' indeks on vigane. Selle saab uuesti genereerida, kuid mõningane "
-"info, näiteks olekulipud, võib kaduma minna."
+"Postkasti '%1' indeks on vigane. Selle saab uuesti genereerida, kuid "
+"mõningane info, näiteks olekulipud, võib kaduma minna."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8010,8 +7878,8 @@ msgstr "Viga %1 avamisel: see kaust puudub."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "%1 avamine ebaõnnestus. See kas pole kehtiv maildir kaust või ei ole sul "
 "piisavalt õigusi sellele ligipääsuks."
@@ -8057,18 +7925,15 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Kausta '%2' indeks paistab olevat ajast ja arust. Kirjade kahjustumise "
-"vältimiseks genereeritakse indeks uuesti. Selle tulemusena võivad taasilmuda "
-"kustutatud kirjad ja olekulipud võivad kaduma minna.</p> "
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>Kausta '%2' indeks paistab olevat ajast ja arust. Kirjade "
+"kahjustumise vältimiseks genereeritakse indeks uuesti. Selle tulemusena "
+"võivad taasilmuda kustutatud kirjad ja olekulipud võivad kaduma minna.</p> "
 "<p>Palun tutvu vastava kirjeldusega <a href=\"%1\">KMaili käsiraamatu KKK "
 "sektsioonis</a>, kus räägitakse, kuidas sellise probleemide taasteket "
 "vältida.</p></qt>"
@@ -8130,7 +7995,7 @@ msgstr ""
 "'%1' ei paista olevat kaust.\n"
 "Palun liiguta fail eest ära."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8138,7 +8003,7 @@ msgstr ""
 "Kausta '%1' õigused pole korrektsed.\n"
 "Palun kontrolli, et sa ikka tohid selle kausta sisu vaadata ja muuta."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8148,17 +8013,17 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"Selle nimega kaust on kustutatud pärast viimast kirjade kontrollimist. Enne kui "
-"saad luua sama nimega uue kausta, tuleb kirju kontrollida."
+"Selle nimega kaust on kustutatud pärast viimast kirjade kontrollimist. Enne "
+"kui saad luua sama nimega uue kausta, tuleb kirju kontrollida."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Kausta loomine ebaõnnestus"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8255,13 +8120,13 @@ msgstr "IMAP &puhvri probleem..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Kausta <b>%1</b> loomine ebaõnnestus ebapiisavate õiguste tõttu. Kui arvad, "
-"et sul peaks siiski olema õigus serveris alamkaustu luua, palu administraatoril "
-"endale selline õigus anda.</qt>"
+"<qt>Kausta <b>%1</b> loomine ebaõnnestus ebapiisavate õiguste tõttu. Kui "
+"arvad, et sul peaks siiski olema õigus serveris alamkaustu luua, palu "
+"administraatoril endale selline õigus anda.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8278,8 +8143,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Kausta <b>%1</b> liigutamine või kopeerimine nurjus, sest sama nimega kaust "
-"on juba olemas.</qt>"
+"<qt>Kausta <b>%1</b> liigutamine või kopeerimine nurjus, sest sama nimega "
+"kaust on juba olemas.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -8400,15 +8265,15 @@ msgstr "%1 kaust on ainult lugemisõigusega."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Kas tõesti kustutada valitud kiri?"
-"<br>Kustutamise korral pole võimalik seda taastada.</qt>\n"
-"<qt>Kas tõesti kustutada valitud %n kirja?"
-"<br>Kustutamise korral pole võimalik neid taastada.</qt>"
+"<qt>Kas tõesti kustutada valitud kiri?<br>Kustutamise korral pole võimalik "
+"seda taastada.</qt>\n"
+"<qt>Kas tõesti kustutada valitud %n kirja?<br>Kustutamise korral pole "
+"võimalik neid taastada.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8460,132 +8325,131 @@ msgstr ""
 "%1 muutmine ebaõnnestus\n"
 "(Kettal pole enam ruumi?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Sertifikaadi signatuuri nõue"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Palun loo lisatud faili põhjal sertifikaat ja tagasta saatjale."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail töötab võrguühenduseta, kõik võrguga seotud toimingud lükatakse edasi"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail töötab võrgus, sooritatakse kõik võrguga seotud toimingud"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail on praegu võrguühenduseta režiimis. Mida soovid ette võtta?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Minna võrku"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Jätkata võrguühenduseta"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Sul ei ole sisenevate kirjade kausta lugemise ega kirjutamise õigusi."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "väljuvad"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Sul ei ole väljuvate kirjade kausta lugemise ega kirjutamise õigusi."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "saadetud"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Sul ei ole saadetud kirjade kausta lugemise ega kirjutamise õigusi."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "prügikast"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Sul ei ole prügikastikausta lugemise ega kirjutamise õigusi."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "mustandid"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Sul ei ole mustandite kausta lugemise ega kirjutamise õigusi."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "mallid"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Sul ei ole mallide kausta lugemise ega kirjutamise õigusi."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Viimane otsing"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Kaust <i>%4</i> on juba olemas. %1 kasutab nüüd kirjade jaoks kausta <i>"
-"%5</i>."
-"<p>%2 võib liigutada kausta <i>%6<i> sellesse kausta, kuid arvesta, et selle "
-"käigus võidakse asendada kõik sama nimega failid kaustas <i>%7</i>."
-"<p><strong>Kas soovid, et %3 liigutaks nüüd su kirjad uude kausta?</strong></qt>"
+"%5</i>.<p>%2 võib liigutada kausta <i>%6<i> sellesse kausta, kuid arvesta, "
+"et selle käigus võidakse asendada kõik sama nimega failid kaustas <i>%7</i>."
+"<p><strong>Kas soovid, et %3 liigutaks nüüd su kirjad uude kausta?</strong></"
+"qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Kaust <i>%4</i> on juba olemas. %1 kasutab nüüd kirjade jaoks kausta <i>"
-"%5</i>. %2 võib liigutada kausta <i>%6<i> sellesse kausta."
-"<p><strong>Kas soovid, et %3 liigutaks nüüd su kirjad uude kausta?</strong></qt>"
+"%5</i>. %2 võib liigutada kausta <i>%6<i> sellesse kausta.<p><strong>Kas "
+"soovid, et %3 liigutaks nüüd su kirjad uude kausta?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Kas liigutada kirjad uude kausta?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail sattus silmitsi saatusliku veaga ja lõpetab nüüd töö."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8596,11 +8460,11 @@ msgstr ""
 "Viga oli:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Tühjenda"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Kas tõesti tühjendada kõigi kontode prügikastid?"
 
@@ -8675,8 +8539,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Saabus uus kiri</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8714,8 +8577,8 @@ msgstr "Kas tõesti tühjendada prügikast?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Kas tõesti liigutada kõik kirjad kaustast <b>%1</b> prügikasti?</qt>"
 
@@ -8741,12 +8604,11 @@ msgstr "Otsingu kustutamine"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Kas tõesti kustutada otsing <b>%1</b>?"
-"<br>Selles leiduvaid kirju tegelikult ei kustutata, sest nad on ju salvestatud "
-"muudes kaustades.</qt>"
+"<qt>Kas tõesti kustutada otsing <b>%1</b>?<br>Selles leiduvaid kirju "
+"tegelikult ei kustutata, sest nad on ju salvestatud muudes kaustades.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8758,40 +8620,41 @@ msgstr "<qt>Kas tõesti kustutada tühi kaust <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Kas tõesti kustutada tühi kaust <b>%1</b> ja kõik selle alamkaustad? "
 "Alamkaustad ei pruugi olla tühjad, aga sellisel juhul kustutatakse ka nende "
-"sisu. "
-"<p><b>Pane tähele</b>, et kustutatud kirju ei salvestata prügikasti, vaid "
-"hävitatakse tõesti lõplikult.</qt>"
+"sisu. <p><b>Pane tähele</b>, et kustutatud kirju ei salvestata prügikasti, "
+"vaid hävitatakse tõesti lõplikult.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Kas tõesti kustutada kaust <b>%1</b> ja kogu selle sisu? "
-"<p><b>Pane tähele</b>, et kustutatud kirju ei salvestata prügikasti, vaid "
-"hävitatakse tõesti lõplikult.</qt>"
+"<qt>Kas tõesti kustutada kaust <b>%1</b> ja kogu selle sisu? <p><b>Pane "
+"tähele</b>, et kustutatud kirju ei salvestata prügikasti, vaid hävitatakse "
+"tõesti lõplikult.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Kas tõesti kustutada kaust <b>%1</b> ja kõik selle alamkaustad koos nende "
-"sisuga? "
-"<p><b>Pane tähele</b>, et kustutatud kirju ei salvestata prügikasti, vaid "
-"hävitatakse tõesti lõplikult.</qt>"
+"<qt>Kas tõesti kustutada kaust <b>%1</b> ja kõik selle alamkaustad koos "
+"nende sisuga? <p><b>Pane tähele</b>, et kustutatud kirju ei salvestata "
+"prügikasti, vaid hävitatakse tõesti lõplikult.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Kustutatud"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8807,13 +8670,13 @@ msgstr "Kas tõesti kustutada kõik aegunud kirjad?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"HTMLi kasutamine kirjades teeb sind \"rämpsposti\" suhtes haavatamaks ja võib "
-"suurendada tõenäosust, et sinu süsteemile võivad kahju tekitada nii praegused "
-"kui tulevased turvaohud."
+"HTMLi kasutamine kirjades teeb sind \"rämpsposti\" suhtes haavatamaks ja "
+"võib suurendada tõenäosust, et sinu süsteemile võivad kahju tekitada nii "
+"praegused kui tulevased turvaohud."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8826,8 +8689,8 @@ msgstr "HTML-i kasutamine"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Väliste viidete kasutamine HTML-kirjades teeb sind \"rämpsposti\" suhtes "
 "haavatamaks ja võib suurendada tõenäosust, et sinu süsteemile võivad kahju "
@@ -8847,12 +8710,12 @@ msgstr "Meililisti %1 järgi..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMaili puhkusevastuste võimalused sõltuvad serveripoolsest filtreerimisest. Sa "
-"ei ole IMAP serverit selleks veel seadistanud.\n"
+"KMaili puhkusevastuste võimalused sõltuvad serveripoolsest filtreerimisest. "
+"Sa ei ole IMAP serverit selleks veel seadistanud.\n"
 "Seda saab teha IMAP konto seadistuste kaardil \"Filtreerimine\"."
 
 #: kmmainwidget.cpp:1743
@@ -8869,7 +8732,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "GnuPG loginäitaja (kwatchgnupg) käivitamine ebaõnnestus. Palun kontrolli "
 "paigaldust."
@@ -9191,8 +9055,7 @@ msgstr "&Salvesta kaasatud failid..."
 msgid "Appl&y All Filters"
 msgstr "Rakenda kõik &filtrid"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Rakenda f&ilter"
@@ -9304,7 +9167,6 @@ msgstr "Jä&rgmine lugemata kiri"
 msgid "Go to the next unread message"
 msgstr "Liigu järgmisele lugemata kirjale"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Eelmine kiri"
@@ -9352,8 +9214,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Kerib aktiivset kirja. Aktiivse kirja lõppu jõudes liigub järgmisele lugemata "
-"kirjale."
+"Kerib aktiivset kirja. Aktiivse kirja lõppu jõudes liigub järgmisele "
+"lugemata kirjale."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9443,8 +9305,8 @@ msgstr " Initsialiseerimine..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9454,21 +9316,21 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "See kiri sisaldab soovi saada kättesaamise/lugemise kinnitus.\n"
-"Selles on töötlemisjuhis, mis on märgitud kui \"soovitud\", aga mida KMail ei "
-"tunne.\n"
+"Selles on töötlemisjuhis, mis on märgitud kui \"soovitud\", aga mida KMail "
+"ei tunne.\n"
 "Sa võid soovi ignoreerida või lasta KMailil saata vastuse \"ebaõnnestunud\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9480,8 +9342,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9493,15 +9355,16 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "See kiri sisaldab soovi saada kättesaamise/lugemise kinnitus,\n"
-"kuid vastamise aadress erineb aadressist, millele soovitakse saada kinnitus.\n"
+"kuid vastamise aadress erineb aadressist, millele soovitakse saada "
+"kinnitus.\n"
 "Sa võid soovi ignoreerida või lasta KMailil saata \"tagasi lükatud\" või "
 "tavalise vastuse."
 
@@ -9529,16 +9392,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Vastuvõtmine: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Kaasatud fail: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "See kaasatud fail on kustutatud."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Kaasatud fail '%1' on kustutatud."
 
@@ -9586,45 +9449,36 @@ msgstr "Kirja osa omadused"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Faili <em>MIME tüüp</em>.</p> "
-"<p>Tavaliselt pole vajadust seda muuta, sest failitüüp valitakse automaatselt. "
-"Kuid vahel ei pruugi %1 tüüpi korrektselt ära tunda. Siin saab viga "
-"parandada.</p></qt>"
+"<qt> <p>Faili <em>MIME tüüp</em>.</p> <p>Tavaliselt pole vajadust seda "
+"muuta, sest failitüüp valitakse automaatselt. Kuid vahel ei pruugi %1 tüüpi "
+"korrektselt ära tunda. Siin saab viga parandada.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Osa suurus.</p> "
-"<p>Vahel näitab %1 siin ainult hinnangulist suurust, sest täpse suuruse "
-"arvutamine võtaks liiga palju aega. Kui see on nii, siis võib seda näha "
-"suurusele lisatud märkuse \"(hinnang)\" järgi.</p></qt>"
+"<qt> <p>Osa suurus.</p> <p>Vahel näitab %1 siin ainult hinnangulist suurust, "
+"sest täpse suuruse arvutamine võtaks liiga palju aega. Kui see on nii, siis "
+"võib seda näha suurusele lisatud märkuse \"(hinnang)\" järgi.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Osa failinimi.</p>"
-"<p>Kuigi see käib vaikimisi kaasatud faili kohta, ei määra see veel antud faili "
-"kaasatuks. See näitab pigem soovitatavat nime, mille alla kirja saaja võiks "
-"selle salvestada.</p></qt>"
+"<qt> <p>Osa failinimi.</p><p>Kuigi see käib vaikimisi kaasatud faili kohta, "
+"ei määra see veel antud faili kaasatuks. See näitab pigem soovitatavat nime, "
+"mille alla kirja saaja võiks selle salvestada.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9632,17 +9486,14 @@ msgstr "&Kirjeldus:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Osa kirjeldus</p> "
-"<p>See sisaldab vaid osa kirjeldust, umbes nagu kogu kirja kohta rida "
-"'Subjekt'. Enamik e-posti rakendusi näitab seda infot lugemispaneelis kaasatud "
-"faili ikooni kõrval.</p></qt>"
+"<qt> <p>Osa kirjeldus</p> <p>See sisaldab vaid osa kirjeldust, umbes nagu "
+"kogu kirja kohta rida 'Subjekt'. Enamik e-posti rakendusi näitab seda infot "
+"lugemispaneelis kaasatud faili ikooni kõrval.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9650,23 +9501,20 @@ msgstr "&Kodeering:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Selle osa kodeering.</p>"
-"<p>Üldiselt ei pruugiks siin midagi muuta, sest %1 kasutab korralikku, MIME "
-"tüübist sõltuvat vaikekodeeringut. Kuid mõnikord on võimalik kirja mahtu "
-"oluliselt vähendada, nt. juhul, kui PostScript fail ei sisalda binaarandmeid, "
-"vaid ainult puhast teksti. Sellisel juhul võib vaikimisi antud \"Base64\" "
-"asemel \"Quoted-printable\" valimine tuua kaasa kirja suuruse kahanemise kuni "
-"veerandi võrra.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt> <p>Selle osa kodeering.</p><p>Üldiselt ei pruugiks siin midagi muuta, "
+"sest %1 kasutab korralikku, MIME tüübist sõltuvat vaikekodeeringut. Kuid "
+"mõnikord on võimalik kirja mahtu oluliselt vähendada, nt. juhul, kui "
+"PostScript fail ei sisalda binaarandmeid, vaid ainult puhast teksti. "
+"Sellisel juhul võib vaikimisi antud \"Base64\" asemel \"Quoted-printable\" "
+"valimine tuua kaasa kirja suuruse kahanemise kuni veerandi võrra.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9674,19 +9522,17 @@ msgstr "Paku &automaatne esitusviis"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Märgi see valik, kui soovid pakkuda saajale selle osa automaatset (kirja "
-"sees) esitust eelvaatlusel tavapärase ikoonivaate asemel.</p> "
-"<p>Tehniliselt tähendab see antud osa päise väljal <em>Content-Disposition</em> "
-"vaikimisi määratud kirje \"attachment\" asendamist \"inline\"-iga.</p></qt>"
+"<qt> <p>Märgi see valik, kui soovid pakkuda saajale selle osa automaatset "
+"(kirja sees) esitust eelvaatlusel tavapärase ikoonivaate asemel.</p> "
+"<p>Tehniliselt tähendab see antud osa päise väljal <em>Content-Disposition</"
+"em> vaikimisi määratud kirje \"attachment\" asendamist \"inline\"-iga.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9694,15 +9540,13 @@ msgstr "&Signeeri see osa"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Märgi see valik, kui soovid signeerida seda kirja osa.</p> "
-"<p>Signatuur antakse võtmega, mille sa oled sidunud aktiivse identiteediga.</p>"
-"</qt>"
+"<qt> <p>Märgi see valik, kui soovid signeerida seda kirja osa.</p> "
+"<p>Signatuur antakse võtmega, mille sa oled sidunud aktiivse identiteediga.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9710,13 +9554,11 @@ msgstr "K&rüpti see osa"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Märgi see valik, kui soovid krüptida selle kirja osa.</p> "
-"<p>See osa krüptitakse kirja saajate jaoks.</p></qt>"
+"<qt> <p>Märgi see valik, kui soovid krüptida selle kirja osa.</p> <p>See osa "
+"krüptitakse kirja saajate jaoks.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9730,16 +9572,13 @@ msgstr "POP filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Filtreeritavad kirjad, mis leiduvad POP kontol:<b>%1</b> "
-"<p>Näidatavad sõnumid ületavad maksimumsuuruse limiiti, mille sa oled antud "
-"kontole määranud. "
-"<br> Vastava nupu abil võid määrata, mida nendega ette võtta."
+"Filtreeritavad kirjad, mis leiduvad POP kontol:<b>%1</b> <p>Näidatavad "
+"sõnumid ületavad maksimumsuuruse limiiti, mille sa oled antud kontole "
+"määranud. <br> Vastava nupu abil võid määrata, mida nendega ette võtta."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9991,40 +9830,39 @@ msgstr "TDE töökeskkonna e-posti klient."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Kausta sisu hankimine</h2>"
-"<p>Palun oota . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Kausta sisu hankimine</h2><p>Palun oota . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Võrguühenduseta</h2>"
-"<p>KMail töötab praegu võrguühenduseta režiimis. Võrguühenduse loomiseks klõpsa "
-"<a href=\"kmail:goOnline\">siia</a> . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Võrguühenduseta</h2><p>KMail töötab praegu "
+"võrguühenduseta režiimis. Võrguühenduse loomiseks klõpsa <a href=\"kmail:"
+"goOnline\">siia</a> . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10034,16 +9872,15 @@ msgid ""
 msgstr ""
 "<h2 style='margin-top: 0px;'>Tere tulemast kasutama KMaili versiooni %1</h2> "
 "<p>KMail on K Töölaua Keskkonna e-posti klient, mis on algusest peale "
-"disainitud toetama selliseid elektroonilise posti standardeid, nagu MIME, SMTP, "
-"POP3 ja IMAP.</p>\n"
-"<ul>"
-"<li>KMaili arvukaid võimalusi kirjeldab täpsemalt selle <a href=\"%2\">"
-"käsiraamat</a></li>\n"
+"disainitud toetama selliseid elektroonilise posti standardeid, nagu MIME, "
+"SMTP, POP3 ja IMAP.</p>\n"
+"<ul><li>KMaili arvukaid võimalusi kirjeldab täpsemalt selle <a href="
+"\"%2\">käsiraamat</a></li>\n"
 "<li><a href=\"%3\">KMaili koduleheküljelt</a> leiab infot KMaili uute "
 "versioonide kohta</li></ul>\n"
 "%8\n"
-"Mõningad KMaili praeguse versiooni uued omadused (võrreldes versiooniga KMail "
-"%4, mis kuulub TDE %5 koosseisu):</p>\n"
+"Mõningad KMaili praeguse versiooni uued omadused (võrreldes versiooniga "
+"KMail %4, mis kuulub TDE %5 koosseisu):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10052,29 +9889,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMaili meeskond</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
 "<p>Palun leia hetk aega KMail korralikult ära seadistada, valides "
 "Seadistused-&gt;KMaili seadistamine.\n"
-"Tekita vähemalt üks identiteet ning sisenevate ja väljuvate kirjade konto.</p>\n"
+"Tekita vähemalt üks identiteet ning sisenevate ja väljuvate kirjade konto.</"
+"p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Olulised muudatused</span> "
-"(võrreldes KMaili versiooniga %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Olulised muudatused</"
+"span> (võrreldes KMaili versiooniga %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10105,11 +9941,12 @@ msgstr "Kaasatud faili vaatamine: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
-"[KMail: kaasatud fail sisaldab binaarvormis andmeid. Püütakse näidata esimest "
-"sümbolit.]\n"
+"[KMail: kaasatud fail sisaldab binaarvormis andmeid. Püütakse näidata "
+"esimest sümbolit.]\n"
 "[KMail: kaasatud fail sisaldab binaarvormis andmeid. Püütakse näidata %n "
 "esimest sümbolit.]"
 
@@ -10127,7 +9964,8 @@ msgid ""
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 "Kas avada kaasatud fail '%1'?\n"
-"Ära unusta, et kaasatud faili avamine võib ohustada sinu süsteemi turvalisust!"
+"Ära unusta, et kaasatud faili avamine võib ohustada sinu süsteemi "
+"turvalisust!"
 
 #: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
@@ -10135,12 +9973,14 @@ msgstr "Kas avada kaasatud fail?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Kaasatud faili kustutamine võib rikkuda kirja digiallkirja."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Kaasatud faili muutmine võib rikkuda kirja digiallkirja."
 
 #: kmreaderwin.cpp:2956
@@ -10161,6 +10001,58 @@ msgstr "(mõni järgnevatest sobib)"
 msgid "(match all of the following)"
 msgstr "(kõik järgnevad sobivad)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Loetud"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Vana"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Kustutatud"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Vastatud"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Edastatud"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Järjekorras"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Saadetud"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Jälgitav"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignoreeritav"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Rämpspost"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Väärtpost"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Ülesanne"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Kaasatud failiga"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Kogu kiri"
@@ -10238,21 +10130,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Kirja \"%1\" liigutamine kaustast \"väljuvad\" kausta \"saadetud\" "
 "ebaõnnestus.\n"
-"Põhjuseks võib olla kettaruumi nappus või kirjutamisloa puudumine. Palun ürita "
-"probleem lahendada ja liigutada kiri ümber käsitsi."
+"Põhjuseks võib olla kettaruumi nappus või kirjutamisloa puudumine. Palun "
+"ürita probleem lahendada ja liigutada kiri ümber käsitsi."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Kirja ei ole võimalik saata, kui saatja aadressi pole antud.\n"
 "Palun määra identiteedile '%1' e-posti aadress seadistustedialoogi "
@@ -10281,11 +10173,11 @@ msgstr "Saatmisprotsessi initsialiseerimine..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Valisid kõigi järjekorras olevate kirjade saatmise krüptimata kujul. Kas soovid "
-"jätkata?"
+"Valisid kõigi järjekorras olevate kirjade saatmise krüptimata kujul. Kas "
+"soovid jätkata?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10309,8 +10201,9 @@ msgstr "Järjekorras olnud kirjade saatmine ebaõnnestus."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10327,20 +10220,16 @@ msgstr "Saatmine katkestati."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Saatmine ebaõnnestus:</p>"
-"<p>%1</p>"
-"<p>Kiri jääb 'väljuvate' kirjade kausta, kuni sa kõrvaldad probleemi (nt. "
-"vigane aadress) või eemaldad kirja kaustast 'väljuvad'.</p>"
-"<p>Kasutati järgnevat transpordiprotokolli:  %2</p>"
-"<p>Kas jätkata ülejäänud kirjade saatmisega?</p>"
+"<p>Saatmine ebaõnnestus:</p><p>%1</p><p>Kiri jääb 'väljuvate' kirjade "
+"kausta, kuni sa kõrvaldad probleemi (nt. vigane aadress) või eemaldad kirja "
+"kaustast 'väljuvad'.</p><p>Kasutati järgnevat transpordiprotokolli:  %2</"
+"p><p>Kas jätkata ülejäänud kirjade saatmisega?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10358,8 +10247,9 @@ msgstr "Loo&bu"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10406,43 +10296,43 @@ msgstr "Selle SMTP serveri kasutamiseks on vaja kasutajanime ja parooli."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 paistab juba töötavat sama masina teisel ekraanil. %2 käivitamine mitu korda "
-"võib kaasa tuua kirjade kao. %1 tuleks jätta käivitamata, kui sa pole just "
-"päris kindel, et see tegelikult juba ei tööta."
+"%1 paistab juba töötavat sama masina teisel ekraanil. %2 käivitamine mitu "
+"korda võib kaasa tuua kirjade kao. %1 tuleks jätta käivitamata, kui sa pole "
+"just päris kindel, et see tegelikult juba ei tööta."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "%1 paistab juba töötavat sama masina teisel ekraanil. %1 ja %2 käivitamine "
-"korraga võib kaasa tuua kirjade kao. %2 tuleks jätta käivitamata, kui sa pole "
-"just päris kindel, et %1 tegelikult juba ei tööta."
+"korraga võib kaasa tuua kirjade kao. %2 tuleks jätta käivitamata, kui sa "
+"pole just päris kindel, et %1 tegelikult juba ei tööta."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 paistab juba töötavat masinas %2. %1 käivitamine mitu korda võib kaasa tuua "
-"kirjade kao. %1 tuleks jätta käivitamata, kui sa pole just päris kindel, et see "
-"tegelikult juba masinas %2 ei tööta."
+"%1 paistab juba töötavat masinas %2. %1 käivitamine mitu korda võib kaasa "
+"tuua kirjade kao. %1 tuleks jätta käivitamata, kui sa pole just päris "
+"kindel, et see tegelikult juba masinas %2 ei tööta."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 paistab juba töötavat masinas %3. %1 ja %2 käivitamine korraga võib kaasa "
-"tuua kirjade kao. %2 tuleks jätta käivitamata, kui sa pole just päris kindel, "
-"et %1 tegelikult juba masinas %3 ei tööta."
+"tuua kirjade kao. %2 tuleks jätta käivitamata, kui sa pole just päris "
+"kindel, et %1 tegelikult juba masinas %3 ei tööta."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10453,6 +10343,10 @@ msgstr "Käivita %1"
 msgid "Exit"
 msgstr "Välju"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Uued kirjad kaustas"
@@ -10479,12 +10373,13 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWalletit ei leitud. Paroolide haldamiseks on äärmiselt soovitatav kasutada "
-"just TDEWalletit.\n"
+"TDEWalletit ei leitud. Paroolide haldamiseks on äärmiselt soovitatav "
+"kasutada just TDEWalletit.\n"
 "Siiski võib KMail salvestada parooli ka oma konfiguratsioonifaili. Parool "
 "salvestatakse küll 'hägustatuna', kuid see ei ole siiski kaitstud "
 "lahtikrüptimise eest, kui keegi saab ligipääsu konfiguratsioonifailile.\n"
@@ -10556,8 +10451,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Käsk, mis käivitatakse lokaalselt enne e-posti saatmist. Seda võib kasutada nt. "
-"ssh tunneli rajamiseks. Jäta tühjaks, kui ühtegi käsku pole vaja käivitada."
+"Käsk, mis käivitatakse lokaalselt enne e-posti saatmist. Seda võib kasutada "
+"nt. ssh tunneli rajamiseks. Jäta tühjaks, kui ühtegi käsku pole vaja "
+"käivitada."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10565,8 +10461,8 @@ msgstr "Se&rver nõuab autentimist"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Märgi see, kui sinu SMTP server nõuab enne kirjade vastuvõtmist autentimist. "
 "Seda nimetatakse 'autoriseeritud SMTP-ks' ehk lihtsalt ASMTP."
@@ -10589,15 +10485,13 @@ msgstr "Serverile saa&detakse kohandatud masinanimi"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Märgi see, kui soovid, et KMail kasutaks end serverile tuvastades sinu valitud "
-"masinanime. "
-"<p> See on kasulik, kui sinu süsteemi masinanime ei saa korrektselt seada või "
-"kui soovid varjata oma süsteemi tegelikku masinanime."
+"Märgi see, kui soovid, et KMail kasutaks end serverile tuvastades sinu "
+"valitud masinanime. <p> See on kasulik, kui sinu süsteemi masinanime ei saa "
+"korrektselt seada või kui soovid varjata oma süsteemi tegelikku masinanime."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10627,8 +10521,8 @@ msgstr "Lubatud on ainult kohalikud failid."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Masina väli ei saa olla tühi. Palun sisesta SMTP serveri nimi või IP-aadress."
 
@@ -10642,10 +10536,10 @@ msgstr "Viga kausta %1 uurimisel: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Kaustade kohaliku tellimise tühistamisel kaob kogu nende kaustade kohta "
 "kohalikult kättesaadav info. Serveris kaustad ei muutu. Klõpsa 'Loobu', kui "
@@ -10869,35 +10763,28 @@ msgstr "&Redigeeri kirja"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Krüptoplugina tagastatud struktureerivat infot pole võimalik korrektselt "
-"töödelda; plugin võib olla vigane.</p> "
-"<p>Palun võta ühendust oma süsteemi administraatoriga.</p></qt>"
+"<qt> <p>Krüptoplugina tagastatud struktureerivat infot pole võimalik "
+"korrektselt töödelda; plugin võib olla vigane.</p> <p>Palun võta ühendust "
+"oma süsteemi administraatoriga.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Ei leitud ühtegi aktiivset krüptopluginat ning sisseehitatud OpenPGP koodi "
-"ei suudetud edukalt käivitada.</p> "
-"<p>Asja parandamiseks võid teha kaht asja:</p> "
-"<ul> "
-"<li><em>kas</em> aktiveerida plugina dialoogis Seadistused->"
-"KMaili seadistamine->Pluginad</li> "
-"<li><em>või</em> määrata tavapärased OpenPGP seadistused sama dialoogi kaardil "
-"Identiteet->Täpsemad valikud.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Ei leitud ühtegi aktiivset krüptopluginat ning sisseehitatud OpenPGP "
+"koodi ei suudetud edukalt käivitada.</p> <p>Asja parandamiseks võid teha "
+"kaht asja:</p> <ul> <li><em>kas</em> aktiveerida plugina dialoogis "
+"Seadistused->KMaili seadistamine->Pluginad</li> <li><em>või</em> määrata "
+"tavapärased OpenPGP seadistused sama dialoogi kaardil Identiteet->Täpsemad "
+"valikud.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10909,8 +10796,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmuse taustaprogramm ei paku funktsiooni \"x-encrypt\". Palun anna veast "
 "teada."
@@ -10929,20 +10816,20 @@ msgstr "Chiasmuse krüptimise viga"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Chiasmuse taustaprogramm tagastas ootamatu väärtuse: funktsioon \"x-encrypt\" "
-"ei tagastanud baidimassiivi. Palun anna veast teada."
+"Chiasmuse taustaprogramm tagastas ootamatu väärtuse: funktsioon \"x-encrypt"
+"\" ei tagastanud baidimassiivi. Palun anna veast teada."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"OpenPGP kirja sees krüptitud kirja vorming ei toeta kaasatud failide krüptimist "
-"ega signeerimist.\n"
+"OpenPGP kirja sees krüptitud kirja vorming ei toeta kaasatud failide "
+"krüptimist ega signeerimist.\n"
 "Kas tõesti kasutada iganenud OpenPGP-d kirja sees?"
 
 #: messagecomposer.cpp:640
@@ -11051,8 +10938,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Saaja krüptoeelistuste uurimine paljastas, et sinu käest päritakse, kas kiri "
@@ -11089,11 +10976,12 @@ msgstr "Ä&ra krüpti"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Soovisid krüptida kirja ja selle koopiat iseendale, kuid antud identiteedile ei "
-"ole seadistatud ühtki kehtivat usaldusväärset krüptovõtit."
+"Soovisid krüptida kirja ja selle koopiat iseendale, kuid antud identiteedile "
+"ei ole seadistatud ühtki kehtivat usaldusväärset krüptovõtit."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11102,8 +10990,8 @@ msgstr "Kas saata krüptimata?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Kirja mõningaid osi ei krüptita.\n"
@@ -11119,8 +11007,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Kirja ei krüptita.\n"
-"Krüptimata kirja saatmine võib rikkuda reegleid ja/või tuua kaasa tundliku info "
-"lekkimise.\n"
+"Krüptimata kirja saatmine võib rikkuda reegleid ja/või tuua kaasa tundliku "
+"info lekkimise.\n"
 "Kas krüptida kiri?"
 
 #: messagecomposer.cpp:955
@@ -11131,50 +11019,44 @@ msgstr "Krüpt&i kõik osad"
 msgid "Unencrypted Message Warning"
 msgstr "Krüptimata kirja hoiatus"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Viga: taustarakendus ei tagastanud mingeid kodeeritud andmeid.</p>"
-"<p>Palun anna sellest veast teada:"
-"<br>%2</p></qt>"
+"<qt> <p>Viga: taustarakendus ei tagastanud mingeid kodeeritud andmeid.</"
+"p><p>Palun anna sellest veast teada:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Mõned kirjas esinevad märgid ei sobi valitud kodeeringuga."
-"<br>"
-"<br>Kas saata kiri vaatamata sellele?</qt>"
+"<qt>Mõned kirjas esinevad märgid ei sobi valitud kodeeringuga.<br><br>Kas "
+"saata kiri vaatamata sellele?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Mõned märgid lähevad kaduma"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Märgid võivad kaduma minna"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Muuda kodeeringut"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Kirja ei saa signeerida, sest valitud taustarakendus ei paista signeerimist "
 "toetavat. Seda ei tohiks tegelikult juhtuda, palun anna veast teada."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11182,38 +11064,39 @@ msgstr ""
 "Kirja ei saa signeerida, sest valitud taustarakendus ei paista signeerimist "
 "toetavat. Seda ei tohiks tegelikult juhtuda, palun anna veast teada."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Signeerimise GnuPG auditi logi"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "Signeerimine ebaõnnestus. Palun konrolli, kas programm gpg-agent töötab."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Kirja ei saa krüptida, sest valitud taustarakendus ei paista krüptimist "
 "toetavat. Seda ei tohiks tegelikult juhtuda, palun anna veast teada."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Krüptimise GnuPG auditi logi"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Kirja ei saa signeerida ega krüptida, sest valitud taustarakendus ei paista "
-"toetavat signeerimise ja krüptimise kombinatsiooni. Seda ei tohiks tegelikult "
-"juhtuda, palun anna veast teada."
+"toetavat signeerimise ja krüptimise kombinatsiooni. Seda ei tohiks "
+"tegelikult juhtuda, palun anna veast teada."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11234,15 +11117,15 @@ msgstr "&Postkasti vorming:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Vali, kas kirjad tuleb kaustas salvestada omaette failidena (maildir) või kõik "
-"koos ühte suurde faili (mbox). KMailis on vaikimisi kasutusel maildir ning seda "
-"on mõtet muuta ainult väga üksikutel juhtudel. Kui sa ei ole kindel, jäta "
-"kehtima vaikeväärtus."
+"Vali, kas kirjad tuleb kaustas salvestada omaette failidena (maildir) või "
+"kõik koos ühte suurde faili (mbox). KMailis on vaikimisi kasutusel maildir "
+"ning seda on mõtet muuta ainult väga üksikutel juhtudel. Kui sa ei ole "
+"kindel, jäta kehtima vaikeväärtus."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11251,8 +11134,8 @@ msgstr "&Kausta sisu:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Vali, kas uus kaust sisaldab kirju või selliseid grupitööelemente, nagu "
 "ülesanded ja märkused. Vaikeväärtuseks on kirjad. Kui sa ei ole kindel, jäta "
@@ -11294,8 +11177,7 @@ msgstr "Erinevad tulemused signatuuride puhul"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Krüptoseade ei tagastanud mingeid klaarteksti andmeid."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Olek: "
 
@@ -11324,11 +11206,11 @@ msgstr "%1 pluginat ei leitud."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Kiri on signeeritud, kuid signatuuri kehtivust pole võimalik kontrollida.<br />"
-"Põhjus: %1"
+"Kiri on signeeritud, kuid signatuuri kehtivust pole võimalik kontrollida."
+"<br />Põhjus: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11362,22 +11244,22 @@ msgstr "Krüptoplugin \"%1\" ei suuda kirju lahti krüptida."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Märkus:</b> See HTML-kiri võib sisaldada väliseid viiteid piltidele jms. "
 "Turva- ja privaatsuskaalutlustel väliseid viiteid ei laadita. Kui sa usaldad "
-"selle kirja saatjat, võid laadida kirja välised viited <a "
-"href=\"kmail:loadExternal\">siia klõpsates</a>."
+"selle kirja saatjat, võid laadida kirja välised viited <a href=\"kmail:"
+"loadExternal\">siia klõpsates</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Märkus:</b> See on HTML-kiri. Turvakaalutlustel näidatakse ainult puhast "
 "HTML-koodi. Kui sa usaldad selle kirja saatjat, võid aktiveerida vormindatud "
@@ -11632,11 +11514,11 @@ msgstr "salvestatud: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Ükski e-posti aadress pole salvestatud failis %1, mida kasutati signeerimiseks, "
-"mistõttu seda ei saa võrrelda saatja aadressiga %2."
+"Ükski e-posti aadress pole salvestatud failis %1, mida kasutati "
+"signeerimiseks, mistõttu seda ei saa võrrelda saatja aadressiga %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11751,13 +11633,15 @@ msgstr "TDEIO mooduli veateade"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Sinu POP3 server (konto %1) ei toeta UIDL käsku. See on aga nõutav, et määrata "
-"täpselt kindlaks, milliseid serveris paiknevaid kirju on KMail juba näinud.\n"
+"Sinu POP3 server (konto %1) ei toeta UIDL käsku. See on aga nõutav, et "
+"määrata täpselt kindlaks, milliseid serveris paiknevaid kirju on KMail juba "
+"näinud.\n"
 "Seepärast ei toimi korralikult ka kirjade serverisse jätmise võimalus."
 
 #: popaccount.cpp:752
@@ -11778,10 +11662,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Tõmmatakse kirja %1 kokku %2 kirjast (%3 KB kokku %4 KB-st) serverist %5@%6 (%7 "
-"KB jäi serverisse)."
+"Tõmmatakse kirja %1 kokku %2 kirjast (%3 KB kokku %4 KB-st) serverist %5@%6 "
+"(%7 KB jäi serverisse)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11798,1884 +11683,15 @@ msgstr "Vigane vastus serverilt"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Server ei toeta TOP käsku. Seepärast ei ole võimalik tõmmata esmalt suurte "
 "kirjade päised ja alles seejärel nad ise alla laadida."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Liikumine"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Ka&ust"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Kiri"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Vasta eriliselt"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Edasisaatmine"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-riba"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signeerimine"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Kirjad signeeritakse automaatselt"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Kui see valik on sees, signeeritakse vaikimisi kõik kirjad, mida sa saadad. "
-"Mõistagi on võimalik iga kirja puhul eraldi signeerimine välja lülitada."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Krüptimine"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Kir&ja krüptimisel krüptitakse alati ka enda identiteedi sertifikaadiga"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Selle sisselülitamisel ei krüptita kirja/faili mitte ainult saaja avaliku "
-"võtmega, vaid ka sinu võtmega. See võimaldab sul kirja/faili ka hiljem lahti "
-"krüptida. Üldiselt on see mõttekas sisse lülitada."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "S&igneeritud/krüptitud teksti näidatakse pärast koostamist"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Selle sisselülitamisel näidatakse signeeritud/krüptitud teksti eraldi aknas, "
-"kus saab näha, kuidas see saatmisel välja näeb. See on enamasti mõttekas, kui "
-"soovid kontrollida, kas krüptimine ikka korralikult toimib."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Saadetud kirjad salv&estatakse krüptitult"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Märgi, kui soovid salvestada krüptitud kirju"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Kirjad salvestatakse krüptitult</h1>\n"
-"Selle valiku korral salvestatakse saadetud kirjad krüptitult, nagu nad olid "
-"saadetud. See ei ole soovitatav, sest sa ei suuda neid sõnumeid enam lugeda, "
-"kui vajalik sertifikaat aegub.\n"
-"<p>\n"
-"Siiski võivad olla kohalikud reeglid, mis sunnivad sind selle valiku sisse "
-"lülitama. Kui sa ei ole kindel, küsi järgi oma süsteemi administraatorilt.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Alati palutakse valida va&jalik krüptovõti"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Selle sisselülitamisel näitab rakendus alati avalike võtmete nimekirja, millest "
-"saad valida selle, mida soovid krüptimiseks kasutada. Kui see ei ole sisse "
-"lülitatud, näitab rakendus dialoogi ainult siis, kui ei suudeta leida õiget "
-"võtit või kui kasutamiskõlblikke võtmeid on mitu."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Kirjad k&rüptitakse automaatselt, kui vähegi võimalik"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Kui see valik on sees, krüptitakse iga sinu saadetud kiri, kui see on vähegi "
-"võimalik ja soovitav. Mõistagi on võimalik iga kirja puhul eraldi automaatne "
-"krüptimine välja lülitada."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Ei signeerita/krüptita s&alvestamisel mustandina"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Kuidas see töötab?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Kellele: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universaalne"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Vastus"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Vastus kõigile"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Edasisaatmine"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "K&iirklahv:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Malli &tüüp"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Kausta omadused"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "K&austas hoitakse meililisti"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Meililisti aadress:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormaalne:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Lugemata:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Vanade kirjade kustutamine"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Kustutatakse &pärast:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Lo&etud vanade kirjade kustutamine"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "&Kustutakse pärast:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Lu&gemata vanade kirjade kustutamine"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "päeva"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "nädalat"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "kuud"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Täpsemad valikud"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Saatja &identiteet:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Salvestamise vorming:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Nimekiri näitab:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Sertifikaatide kontroll CRL-ide vahendusel"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Selle sisselülitamisel kontrollitakse S/MIME sertifikaate sertifikaatide "
-"tühistamise nimekirju (CRL) kasutades."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Sertifikaatide kontroll võrgus (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Selle sisselülitamisel kontrollitakse S/MIME sertifikaate võrgus interneti "
-"sertifikaatide staatuse protokolli (OCSP) kasutades. Anna allpool OCSP serveri "
-"URL."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Sertifikaadi kontroll võrgus"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP serveri URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Anna siin sertifikaatide kontrollimise serveri aadress. URL-i alguses seisab "
-"tavaliselt http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP serveri signatuur:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Sertifikaatide teenuse URL-i ignoreerimine"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Sertifikaadi reegleid ei kontrollita"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Vaikimisi kasutab GnuPG faili ~/.gnupg/policies.txt kontrollimaks, kas "
-"sertifikaadi reegel on lubatud. Selle sisselülitamisel reegleid ei kontrollita."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "CRL-i ei kontrollita kunagi"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Selle sisselülitamisel ei kasutata S/MIME sertifikaatide kontrollimiseks kunagi "
-"sertifikaatide tühistusnimekirju (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Tõmmatakse puuduvad väljaandja sertifikaadid"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Selle sisselülitamisel tõmmatakse vajadusel puuduvad väljaandja sertifikaadid "
-"(kasutusel nii CRL-ide kui OCSP korral)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP päringud"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "HTTP päringuid ei sooritata"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "HTTP täielik keelamine S/MIME korral."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP päringuteks kasutatakse järgmist proxyt:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Kasutatakse süsteemi HTTP proxyt:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Selle valimisel kasutatakse paremal asuvat HTTP proxy väärtust (mille määrab "
-"keskkonnamuutuja http_proxy) kõigi HTTP päringute korral."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Kirjuta siia HTTP proxy asukoht, mida kasutatakse kõigi HTTP päringute jaoks "
-"S/MIME puhul. Süntaks on masin:port, näiteks minuproxy.kuskil.ee:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "HTTP sertifikaatide CRL jagamispunkte ignoreeritakse"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL-i asukoha otsimisel sisaldab testitav sertifikaat tavaliselt niinimetatud "
-"\"CRL jagamispunkti\" (DP) kirjet, mis kujutab endast vajalikule URL-ile viivat "
-"URL-ide rida. Kasutatakse esimesena leitud jagamispunkti. Selle valikuga "
-"jäetakse sobiva DP otsimisel kõrvale kõik HTTP-skeemi kasutavad kirjed."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP päringud"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "LDAP päringuid ei sooritata"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "LDAP-i täielik keelamine S/MIME puhul."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "LDAP sertifikaatide CRL jagamispunkte ignoreeritakse"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL-i asukoha otsimisel sisaldab testitav sertifikaat tavaliselt niinimetatud "
-"\"CRL jagamispunkti\" (DP) kirjet, mis kujutab endast vajalikule URL-ile viivat "
-"URL-ide rida. Kasutatakse esimesena leitud jagamispunkti. Selle valikuga "
-"jäetakse sobiva DP otsimisel kõrvale kõik LDAP-skeemi kasutavad kirjed."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP päringute primaarne masin:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Kirjuta siia LDAP-server, millele suunatakse kõik LDAP-päringud. See tühistab "
-"kõik LDAP URL-is määratud masina ja pordi seadistused ning seda kasutatakse ka "
-"siis, kui URL-is ei olegi masinat ja porti määratud. Muid LDAP-servereid "
-"kasutatakse ainult siis, kui ühendus \"proxyga\" ebaõnnestub.\n"
-"Süntaks on \"MASIN\" või \"MASIN:PORT\". Kui PORT ära jätta, kasutatakse porti "
-"389 (standardne LDAP port)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Tekstijupi lisamine"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Lisa"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Tekstijupp:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "&Grupp:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Tekstijupi seadistused"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Kohtspikrid"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "&Tekstijupi teksti näitamine kohtspikris"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "Määrab, kas kohtspikker sisaldab ka märgitud rea teksti"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Muutujad"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Muutujate sisestamisviis"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Eraldi dialoog igale tekstijupi muutujale"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Sisestamisdialoogi näidatakse iga tekstijupi muutuja puhul"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Üks dialoog kõigile tekstijupi muutujatele"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Avatakse üks dialoog, kus saab sisestada kõigi tekstijupi muutujate väärtused"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Piiraja:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Saatjale vastamine"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Kõigile / Postiloendisse vastamine"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Edasi saadetud kiri"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "H&oiatus signeerimata kirja saatmise korral"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Märgi, kui soovid hoiatust enne signeerimata kirja saatmist"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus signeerimata kirjade saatmise korral</h1>\n"
-"Selle valiku korral näidatakse sulle hoiatust, kui püüad saata signeerimata "
-"kirja või selle mõnda osa.\n"
-"<p>\n"
-"Soovitatav on see valik maksimaalse ühtluse nimel sisse lülitada.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Hoiatus krüptimata kirjade saatmise puhul"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Märgi, kui soovid, et krüptimata kirjade saatmise puhul sind hoiatataks."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus krüptimata kirjade saatmise puhul</h1>\n"
-"Selle valiku korral hoiatatakse sind, kui proovid saata kirja tervikuna või "
-"selle mõnda osa krüptimata.\n"
-"<p>\n"
-"Maksimaalse ühtluse huvides on soovitatav see sisse lülitada.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "H&oiatus, kui saaja e-posti aadressi ei ole sertifikaadis"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Märgi, kui soovid hoiatust juhul, kui sertifikaadis puudub aadress"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus, kui saaja e-posti aadress ei ole sertifikaadis</h1>\n"
-"Selle valiku korral ilmub hoiatus, kui saaja e-posti aadressi ei leidu "
-"krüptimiseks kasutatavas sertifikaadis.\n"
-"<p>\n"
-"Maksimaalse turvalisuse huvides on soovitatav see sisse lülitada.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Hoiatus, kui sertifikaat/võti peagi aegub (täpsusta lävi allpool)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Signeerimisel"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Krüptimisel"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " päeva"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Vali siin päevade arv"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus, kui signatuuri sertifikaat aegub</h1>\n"
-"Vali minimaalne päevade arv, mille kestel signatuuri sertifikaat peab veel "
-"kehtima, enne kui näidatakse hoiatust.\n"
-"<p>\n"
-"SPHINX soovitab väärtuseks määrata 14 päeva.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus, kui krüptimissertifikaat aegub</h1>\n"
-"Vali minimaalne päevade arv, mille kestel krüptimissertifikaat peab veel "
-"kehtima, ilma et hoiatust näidataks.\n"
-"<p>\n"
-"SPHINX soovitab määrata väärtuseks 14 päeva.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus, kui ahela mõni sertifikaat aegub</h1>\n"
-"Vali minimaalne päevade arv, mille kestel kõik ahelasse kuuluvad sertifikaadid "
-"peavad veel kehtima enne hoiatuse näitamist.\n"
-"<p>\n"
-"SPHINX soovitab väärtuseks määrata 14 päeva.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus, kui SK sertifikaat aegub</h1>\n"
-"Vali minimaalne päevade arv, mille kestel SK sertifikaat peab veel kehtima, "
-"enne kui näidatakse hoiatust.\n"
-"<p>\n"
-"SPHINX soovitab määrata väärtuseks 14 päeva.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Hoiatus, kui juursertifikaat aegub</h1>\n"
-"Vali minimaalne päevade arv, mille kestel juursertifikaat peab veel kehtima, "
-"enne kui näidatakse hoiatust.\n"
-"<p>\n"
-"SPHINX soovitab väärtuseks määrata 14 päeva.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Juursertifikaatidel:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "SK sertifikaatidel:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Lõppkasutaja sertifikaatidel/võtmetel:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Kõigi \"Rohkem ei pärita\" hoiatuste taaslubamine"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Malli sisu"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Malli kiirklahv"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Malli tüüp"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Järjekorras kirjad saadetakse uute kirjade kontrollimisel"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vali, kas soovid, et KMail saadaks kõik kaustas 'väljuvad' olevad kirjad "
-"uute kirjade käsitsi kontrollimisel, igal uute kirjade kontrollimisel või ei "
-"saadeta neid üldse automaatselt. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Sünkroniseerimata kirjade automaatne eemaldamine ebapiisavate õigustega "
-"kaustadest"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Kui kaustas on uusi kirju, mida ei ole veel serverisse laaditud, aga sul ei ole "
-"selleks antud kausta korral piisavalt õigusi, liigutatakse need kirjad "
-"automaatselt kausta 'lost+found'."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Kohalike lippude lubamine kirjutuskaitstud kaustadel"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"See võimaldab administraatoril määrata kirjade kontrollimise intervalli "
-"minimaalse väärtuse.\"\n"
-"           \"Kasutaja ei saa valida siinmääratust väiksemat väärtust."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Viimati valitud kaust kaustade valimise dialoogis."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Kasutajate umaski seadistute eiramine ning kasutajapõhiste "
-"lugemis/kirjutamisõiguste kasutamine"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Süsteemse salve ikooni näitamise reegel"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Rakenduse sulgemine peaakna sulgemisel, isegi kui süsteemse salve ikoon on "
-"aktiivne."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Üksikasjalik uutest kirjadest teatamine"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Sisselülitamisel näidatakse uutest kirjadest teatamisel iga kausta kohta uute "
-"kirjade arvu. Vastasel juhul näidatakse ainult lihtsat teadet 'Saabus uus "
-"kiri'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Määratud redaktor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Sisemise redaktori asemel kasutatakse välist"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr "Lävi, mille korral kasutajad hoiatatakse, et kvoot hakkab täis saama."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Grupitöö kasutamise lubamine"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Päiseväljade Kellelt:/Kellele: muutmine kutsetele vastates"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook ei tule eriti hästi toime iCalendari standardiga. Selle "
-"võimalusega saab osadest hädadest üle. Kui sul on probleeme Outlooki "
-"kasutajatega, kes ei suuda sinu vastuseid kätte saada, võiksid proovida selle "
-"sisse lülitada."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Grupitöö kutsed saadetakse kirja põhiosas"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook ei tule eriti hästi toime iCalendari standardiga. Selle "
-"võimalusega saab osadest hädadest üle. Kui sul on probleeme Outlooki "
-"kasutajatega, kes ei suuda sinu kutseid kätte saada, võiksid proovida selle "
-"sisse lülitada."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Exchange'iga ühilduvad kutsed"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlookil, kui seda kasutatakse koos Microsoft Exchange'i serveriga, "
-"on raskusi standarditele vastavate grupitöö kirjade mõistmisega. Selle valiku "
-"sisselülitamisel saadetakse grupitöö kutsed sellisena, et neid mõistab ka "
-"Microsoft Exchange."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Selle sisselülitamisel ei avata kirja koostamise akent, vaid kõik kutsekirjad "
-"saadetakse ära automaatselt. Kui soovid kirja enne saatmist siiski näha, lülita "
-"see võimalus välja. Kuid arvesta, et redaktoriaknas nähtav tekst on iCalendari "
-"süntaksiga, mida ei peaks mitte käsitsi muutma hakkama."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Kutsekirjade kustutamine pärast vastuse saatmist"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Märkimise korral liigutatakse kutsekirjad, millele on saadetud vastu, pärast "
-"vastuse edukat saatmist prügikastikausta."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Selle lubamisega on võimalik salvestada kirjeid Kontacti rakendustest "
-"KOrganizer, TDE aadressiraamat ja KNotes.</p>"
-"<p>Lisaks sellele tuleb määrata rakendused, mis kasutavad IMAP ressursse. Seda "
-"saab teha TDE juhtimiskeskuses.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Tavaliselt ei ole vajadust näha IMAP ressurssidega kaustu. Kui sul on seda "
-"aga mingil põhjusel siiski vaja, saad selle siin lubada.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Kui grupitöö teabe salvestamiseks kasutatavat kontot \"\n"
-"          \"ei kasutata tavaliste kirjade haldamiseks, sunnib see valik KMaili "
-"\"\n"
-"          \"näitama ainult konto grupitöökaustu. See on abiks, kui haldad "
-"tavalisi \"\n"
-"          \"kirju täiendava IMAP konto abil.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Grupitöö kaustade salvestamisvormingu valimine "
-"<ul>"
-"<li>Vaikevorminguks on ical (kalendrikaustad) ja vcard (aadressiraamatu "
-"kaustad). Selle vormingu korral saab kasutada kõiki Kontacti võimalusi.</li>"
-"<li>Kolabi XML vorming on kohandatav mudel, mis sarnaneb tugevasti Outlookil "
-"kasutatavaga. See tagab parema ühilduvuse Outlookiga, kui kasutad Kolabi või "
-"sellega ühilduvat serverit.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>See võimaldab valida IMAP ressursikaustade asukoha.</p>"
-"<p>Kolabi serveris on selleks tavaliselt IMAP sissetulevate kirjade kaust "
-"(inbox).</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>See on konto ID, millel asuvad IMAP ressursside kaustad.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Kui soovid muuta IMAP ressursside kaustanimed emakeelseks, saad siin valida "
-"sobiva keele.</p>"
-"<p>Palun arvesta, et ainus põhjus, miks seda vaja läheb, on ühilduvus Microsoft "
-"Outlookiga. Üldiselt ei ole keele määramine eriti hea mõte, sest nii muutub "
-"võimatuks keelt vahetada.</p>"
-"<p>Seepärast ära seda võimalust kasuta, kui sul seda just vaja ei ole.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Filtreeritakse ka grupitöö kaustadesse saabunud kirju."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Grupitöö muudatused DIMAP-i kaustades sünkroniseeritakse kohe võrku minnes."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Selle väärtusega saab määrata, kas näidata KMaili sissejuhatavat teksti või "
-"mitte."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimaalne ühenduste arv masina kohta"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Sellega saab piirata ühenduste arvu masina kohta uute kirjade kontrollimisel. "
-"Vaikimisi on ühenduste arv määratud piiramatuks (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Kiirotsingu sisendrea näitamine"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"See valik lubab või keelab otsingurea ülalpool kirjade nimekirja, mis võimaldab "
-"kiiresti otsida infot kirjade nimekirjas."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Kohaliku sisenevate kirjade kausta peitmine, kui seda ei kasutata"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Vaikimisi edastatakse tekstina."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "Semikooloni (;) lubamine eraldajana kirjakoostajas."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Vastamisel või edasisaatmisel kasutatakse originaali kooditabelit (kui "
-"võimalik)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Allkirja automaatne lisamine"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"See identiteet jäetakse meelde, et seda saaks redaktoris ka edaspidi kasutada.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"See kaust jäetakse saadetud kirjade jaoks meelde, et seda saaks redaktoris ka "
-"edaspidi kasutada."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"See kirjade transpordi meetod jäetakse meelde, et seda saaks redaktoris ka "
-"edaspidi kasutada."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"See identiteet jäetakse meelde, et seda saaks redaktoris ka edaspidi kasutada.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Reamurdmine veerust:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Hoiatus, kui &juursertifikaat aegub enne"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Sisselülitamisel mõistab Outlook(tm) erisümboleid (näiteks täpitähti) "
-"sisaldavaid lisatud failide nimesid (loodetavasti...)"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "&Vastuvõtu ja lugemise kinnitus saadetakse automaatselt"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Sisselülitamisel annab KMail iga väljuva kirjaga kaasa kirja "
-"kättesaamise/lugemise kinnituse soovi.</p>"
-"<p>See on vaikeväärtus: kinnituse küsimise saab konkreetse kirja puhul lubada "
-"või keelata redaktoris (<em>Eelistused</em>-><em>Kättesaamise/lugemise "
-"kinnituse küsimine</em>).</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Viimati kasutatud aadresside kasutamine automaatsel lõpetamisel"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Jäta märkimata, kui sa ei soovi, et kirja koostamise akna aadressiväljadel "
-"näidataks automaatse lõpetamise nimekirjas viimati kasutatud aadresse."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Automaatsalvestuse intervall:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Võimalik on lasta regulaarselt varundada redaktoriaknas olev tekst. Siin saab "
-"määrata automaatse salvestamise intervalli. Kui anda väärtuseks 0, automaatset "
-"salvestamist ei kasutata."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Allkirja lisamine tsiteeritud teksti ette"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Tuntud &prefiksid, mis asendatakse prefiksiga \"Re\":"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Tuntud p&refiksid, mis asendatakse prefiksiga \"Fwd\":"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Tark tsiteerimine"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Signatuur on aegunud."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Adressaadi valimise tüüp"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Määrab \"Kellele\", \"Koopia\" ja \"Pimekoopia\" adressaadi valimise\n"
-"        dialoogi tüübi."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Saajate redaktori tüüp"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Määrab \"Kellele\", \"Koopia\" ja \"Pimekoopia\" saajate\n"
-"        redaktori tüübi."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Saajate redaktori ridade maksimaalne arv."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Kirjaosade tüüpide nimekiri, mis eemaldatakse kirja edastamisel tekstina."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Kaasatud failide lubatud maksimumsuurus MB-des."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Tekstijuppide haldamise ja lisamise paneeli näitamine kirjakoostajas."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr "GnuPG auditi logi näitamine ka pärast edukat krüptimistoimingut."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Vastamisel või edasisaatmisel kasutatakse originaali kooditabelit (kui "
-"võimalik)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Mõned kirjad, eriti automaatselt genereeritud, ei määra kodeeringut, mida on "
-"vaja nende korrektseks näitamiseks. Sellisel juhul kasutatakse "
-"tagavarakodeeringut, mida saabki siin määrata. Selleks tasub määrata kodeering, "
-"mida sinu piirkonnas kõige enam tarvitatakse. Vaikimisi kasutatakse süsteemis "
-"määratud kodeeringut."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Kui määrata vaikeväärtuseks \"Automaatne\", kasutatakse määratud kodeeringut "
-"kõigi kirjade puhul sellele vaatamata, mida nad ise välja pakuvad."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Sisselülitamisel näidatakse smiley'sid (näiteks :-) ) kirja tekstis "
-"emotikonidena (tillukeste piltidena)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Sisselülitamisel näidatakse tsiteeritava teksti erinevaid tasemeid. "
-"Märkimatajätmisel tsiteeritava teksti tasemed peidetakse."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automaatse kokkukerimise tase:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Tsiteeritava teksti fondi suuruse vähendamine"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Sisselülitamisel näidatakse tsiteeritavat teksti väiksema fondiga."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Saadetud kirjad salv&estatakse krüptitult"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Saatva rakenduse näitamine uhketes päistes"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Sisselülitamisel näidatakse uhketes päistes saatvat rakendust (päiseread "
-"User-Agent ja X-Mailer)."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Olemasolevate kirjade kaasatud failide kustutamise lubamine."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Olemasolevate kirjade kaasatud failide muutmise lubamine."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-"Kirjad krüptitakse vaatamisel alati lahti või küsitakse enne lahtikrüptimist"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Kirja kättesaamise/lugemise kinnituste saatmine puuduva saatjaga"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Kirja kättesaamise/lugemise kinnituste saatmine puuduva saatjaga. Mõned "
-"serverid võivad selliseid kinnitusi tagasi lükata, nii et kui sul tekib nende "
-"saatmisega probleeme, lülita see valik välja."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Fraasid on teisendatud mallideks"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Senised fraasid on teisendatud mallideks"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Uue kirja kirjamall"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Vastuse kirjamall"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Kõigile vastamise kirjamall"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Edasisaatmise kirjamall"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Tsitaadimärgid"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Kasutajatel lubatakse muuta äraolekuseadistusi."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Kasutajatel lubatakse üles laadida äraoleku Sieve skripte, aga keelatakse muuta "
-"mis tahes seadistusi, näiteks kindlale domeenile ja rämpspostile vastamise "
-"sätteid."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "Äraolekuvastused saadetakse ainult sellest domeenist tulnud kirjadele."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "Äraolekuvastuste saatmise lubamine rämpspostiks määratud kirjadele."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"KMaili käivitamisel kontrollitakse, kas mõni äraolekuvastus on endiselt "
-"aktiivne."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 kasutatud (kokku %2 %3)"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13784,6 +11800,11 @@ msgstr "Lisa kui \"Koopia\""
 msgid "Add as BCC"
 msgstr "Lisa kui \"Pimekoopia\""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Ka&tkesta"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13799,10 +11820,10 @@ msgstr "Valitud saajad"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Valisid 1 saaja. Kõige rohkem võib saajaid olla %1. Palun vaata valik üle.\n"
 "Valisid %n saajat. Kõige rohkem võib saajaid olla %1. Palun vaata valik üle."
@@ -13821,8 +11842,8 @@ msgstr "Aadressi valimise dialoogi kasutamine"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Selle nupuga saab avada dialoogi, kus on võimalik valida olemasolevate "
 "aadresside seast vajalikud saajad."
@@ -13927,10 +11948,19 @@ msgstr "on suurem või võrdne"
 msgid " bytes"
 msgstr " baiti"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " päeva"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Otsingu teostamiseks tuleb serverist tõmmata kõik kausta %1 kirjad. Selleks "
 "võib kuluda omajagu aega. Kas soovid otsingut jätkata?"
@@ -14079,16 +12109,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Konto '%1' andmete kogumine...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Konto '%1' andmete kogumine...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14107,10 +12133,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Skripti '%1' sisu:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Skripti '%1' sisu:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14133,20 +12157,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve võimalused:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve võimalused:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Pole ühtki erilist võimalust)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Saadaolevad Sieve skriptid:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Saadaolevad Sieve skriptid:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14225,8 +12245,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Selle abil saab määrata sinu signatuuri sisaldava tekstifaili. Seda faili "
 "loetakse iga kord, kui lood uue kirja või lisad uue signatuuri."
@@ -14245,22 +12265,27 @@ msgstr "Avab määratud faili tekstiredaktoris."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Siia saab sisestada mis tahes käsu koos konkreetse asukohaga või ka ilma "
 "sõltuvalt sellest, kas käsk asub sinu otsinguteel (PATH) või mitte. Iga uue "
 "kirja korral käivitab KMail käsu ja saadab selle väljundi signatuurina "
-"standardväljundisse. Väga tavaline on siin määrata näiteks käsk \"fortune\" või "
-"\"ksig -random\"."
+"standardväljundisse. Väga tavaline on siin määrata näiteks käsk \"fortune\" "
+"või \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Käsk:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Asukoht"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Uus kirje:"
@@ -14294,6 +12319,11 @@ msgstr "Grupi lisamine"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Kas tõesti eemaldada see grupp ja kõik selle tekstijupid?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Rakenda: "
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Tekstijupi muutmine"
@@ -14306,6 +12336,10 @@ msgstr "Grupi muutmine"
 msgid "Edit &group..."
 msgstr "Muuda &gruppi..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Muuda..."
@@ -14344,9 +12378,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Sisselülitamisel salvestatakse paremale sisestatud väärtus. Kui kasutad sama "
 "muutujat hiljem kas või mõnes teises tekstijupis, kasutatakse paremale "
@@ -14385,6 +12419,16 @@ msgstr "Ära luba"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Sisu lisamine failist %1 ei ole võimalik: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Kellele: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14414,59 +12458,51 @@ msgstr "Toru käsu käivitamine mallist ei ole võimalik: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Siin saab luua kirjamalle uute kirjade või vastuste koostamiseks või kirjade "
-"edastamiseks.</p>"
-"<p>Kirjamallides võib kasutada asendatavaid kohatäitjaid, pannes need lihtsalt "
-"kirja või valides menüüst <i>Käsu lisamine</i>.</p>"
-"<p>Siin määratud mallid on kaustapõhised. Need tühistavad nii globaalsed mallid "
-"kui ka identiteedipõhised mallid, kui sellised on olemas.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Siin saab luua kirjamalle uute kirjade või vastuste koostamiseks või "
+"kirjade edastamiseks.</p><p>Kirjamallides võib kasutada asendatavaid "
+"kohatäitjaid, pannes need lihtsalt kirja või valides menüüst <i>Käsu "
+"lisamine</i>.</p><p>Siin määratud mallid on kaustapõhised. Need tühistavad "
+"nii globaalsed mallid kui ka identiteedipõhised mallid, kui sellised on "
+"olemas.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Siin saab luua kirjamalle uute kirjade või vastuste koostamiseks või kirjade "
-"edastamiseks.</p>"
-"<p>Kirjamallides võib kasutada asendatavaid kohatäitjaid, pannes need lihtsalt "
-"kirja või valides menüüst <i>Käsu lisamine</i>.</p>"
-"<p>Siin määratud mallid on identiteedipõhised. Need tühistavad globaalsed "
-"mallid, kuid neid omakorda tühistavad kaustapõhised mallid, kui sellised on "
-"olemas.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Siin saab luua kirjamalle uute kirjade või vastuste koostamiseks või "
+"kirjade edastamiseks.</p><p>Kirjamallides võib kasutada asendatavaid "
+"kohatäitjaid, pannes need lihtsalt kirja või valides menüüst <i>Käsu "
+"lisamine</i>.</p><p>Siin määratud mallid on identiteedipõhised. Need "
+"tühistavad globaalsed mallid, kuid neid omakorda tühistavad kaustapõhised "
+"mallid, kui sellised on olemas.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Siin saab luua kirjamalle uute kirjade või vastuste koostamiseks või kirjade "
-"edastamiseks.</p>"
-"<p>Kirjamallides võib kasutada asendatavaid kohatäitjaid, pannes need lihtsalt "
-"kirja või valides menüüst <i>Käsu lisamine</i>.</p>"
-"<p>Siin määratud mallid on globaalsed vaikemallid. Need tühistavad nii "
-"identiteedi- kui ka kaustapõhised mallid, kui sellised on olemas.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Siin saab luua kirjamalle uute kirjade või vastuste koostamiseks või "
+"kirjade edastamiseks.</p><p>Kirjamallides võib kasutada asendatavaid "
+"kohatäitjaid, pannes need lihtsalt kirja või valides menüüst <i>Käsu "
+"lisamine</i>.</p><p>Siin määratud mallid on globaalsed vaikemallid. Need "
+"tühistavad nii identiteedi- kui ka kaustapõhised mallid, kui sellised on "
+"olemas.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14718,6 +12754,10 @@ msgstr "Aktiivse kirja põhiteksti lisamine toru kaudu algkujul"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Aktiivse kirja põhiteksti asendamine toru kaudu tulemusega"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Kursori positsiooni määramine"
@@ -14750,111 +12790,6 @@ msgstr "Silumise sisselülitamine"
 msgid "Turn Debug Off"
 msgstr "Silumise väljalülitamine"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...et järgmisele või eelmisele kirjale saab liikuda vastavalt\n"
-"noolt paremale või vasakule kasutades?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...et sa võid kiiresti luua filtreid saatjale, saajale, subjektile\n"
-"ja meililistile, kasutades valikut <em>Tööriistad-&gt;Tekita&nbsp;Filter</em>"
-"?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...et mõne meililisti subjektireale lisatavast\n"
-"&quot;[meililisti nimest]&quot; saab lahti filtri tegevusega\n"
-"<em>muuda päiseid</em>? See käib nii:\n"
-"<pre>muuda päiseid &quot;Subject&quot;\n"
-"   asemel &quot;\\s*\\[meililisti nimi\\]\\s*&quot;\n"
-"   olgu &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...et sa võid seostada meililistid kaustadega dialoogis\n"
-"<em>Kaustad-&gt;Meililistide haldamine</em>? Seejärel võid kasutada\n"
-"valikut <em>Kirjad-&gt;Uus&nbsp;kiri&nbsp;meililisti...</em>, mis avab\n"
-"redaktori juba etteantud aadresside nimekirjaga.</p>\n"
-"Teine võimalus on klõpsata kaustale hiire keskmise nupuga.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...et sa võid igale kaustale eraldi omistada meelepärased ikoonid?\n"
-"Vaata <em>Kaust-&gt;Omadused</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...et KMail võib näidata värviriba, mis osutab parajasti aktiivse\n"
-"kirja tüübile (tavaline tekst/HTML/OpenPGP)?</p>\n"
-"<p>See tõrjub katsed näidata, nagu oleks signatuur edukalt kontrolli\n"
-"läbinud, saates KMaili signatuuri olekuraame jäljendava HTML-kirja.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...et suvalist päist saab filtreerida, kui sisestada selle\n"
-"nimi otsingureegli esimesele väljale?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...et puhtad HTML-kirjad saab välja filtreerida reegliga\n"
-"<pre>&quot;Content-type&quot; sisaldab &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...et vastates tsiteeritakse ainult kirja valitud osa?</p>\n"
-"<p>Kui midagi ei ole valitud, tsiteeritakse kogu kirja.</p>\n"
-"<p>See toimib isegi kaasatud failide teksti, kui oled valinud\n"
-"<em>Vaade-&gt;Kaasatud&nbsp;failid-&gt;Kirja&nbsp;sees</em>.</p>\n"
-"<p>Seda võimalust saab kasutada kõigi vastamiskäskudega, välja arvatud\n"
-"<em>Kirjad-&gt;Vasta&nbsp;ilma&nbsp;tsiteerimata</em>.</p>\n"
-"<p align=\"right\"><em>Kirjapanija: David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Siin ei ole midagi tagasi võtta."
@@ -14919,6 +12854,15 @@ msgstr "Kaasatud fail #%1 (nimetu)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "GnuPG auditi logi näitamine"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Fail nimega \"%1\" on juba olemas. Kas kirjutada see üle?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Kas kirjutada fail üle?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14950,8 +12894,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Sinu serveris ei ole toetatud Sieve laienduste seas laiendit \"vacation\" (ehk "
-"\"puhkus\").\n"
+"Sinu serveris ei ole toetatud Sieve laienduste seas laiendit \"vacation"
+"\" (ehk \"puhkus\").\n"
 "Ilma selleta ei saa KMail sinu eest puhkuse ajal vastuseid saata.\n"
 "Võta palun ühendust oma süsteemi administraatoriga."
 
@@ -15035,13 +12979,13 @@ msgstr "Pildi &saatmine iga kirjaga"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Selle märkimisel lisab KMail niinimetatud X-face'i päise antud identiteediga "
-"saadetavatele kirjadele. X-Face on väike (48x48 pikslit) mustvalge pilt, mida "
-"mõned e-posti kliendid suudavad näidata."
+"saadetavatele kirjadele. X-Face on väike (48x48 pikslit) mustvalge pilt, "
+"mida mõned e-posti kliendid suudavad näidata."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15069,13 +13013,13 @@ msgstr "Vali fail..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Sellega saab valida pildifaili, mille põhjal pilt luua. Pilt peab olema suure "
-"kontrastsusega ja enam-vähem ruudukujuline. Veel parem oleks, kui pildil oleks "
-"hele taust."
+"Sellega saab valida pildifaili, mille põhjal pilt luua. Pilt peab olema "
+"suure kontrastsusega ja enam-vähem ruudukujuline. Veel parem oleks, kui "
+"pildil oleks hele taust."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15083,20 +13027,21 @@ msgstr "Määra aadressiraamatu põhjal"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Kasutada võib aadressiraamatu kirjes määratud pildi skaleeritud versiooni."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail võib lisada igale kirjale väikese (48x48 pikslit), kesise "
-"kvaliteediga mustvalge pildi. See võib olla näiteks sinu enda pilt või mistahes "
-"muu asi. Saaja näeb seda, kui tema e-posti klient antud võimalust toetab."
+"kvaliteediga mustvalge pildi. See võib olla näiteks sinu enda pilt või "
+"mistahes muu asi. Saaja näeb seda, kui tema e-posti klient antud võimalust "
+"toetab."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15105,11 +13050,11 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Näited saab näha aadressil <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Näited saab näha aadressil <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15124,128 +13069,1784 @@ msgstr "Pilt puudub"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Sa ei ole määranud aadressiraamatus omaenda kontakti."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Kokku: %2<br>Lugemata: %3<br>Suurus: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signeerimine"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Kvoot: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Kirjad signeeritakse automaatselt"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Kirja subjekti määramine"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Kui see valik on sees, signeeritakse vaikimisi kõik kirjad, mida sa saadad. "
+"Mõistagi on võimalik iga kirja puhul eraldi signeerimine välja lülitada."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Koopia saatmine 'aadressile'"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Krüptimine"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Pimekoopia saatmine 'aadressile'"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Kir&ja krüptimisel krüptitakse alati ka enda identiteedi sertifikaadiga"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Kirjale lisatakse 'päis'"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Selle sisselülitamisel ei krüptita kirja/faili mitte ainult saaja avaliku "
+"võtmega, vaid ka sinu võtmega. See võimaldab sul kirja/faili ka hiljem lahti "
+"krüptida. Üldiselt on see mõttekas sisse lülitada."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Kirja tekst võetakse 'failist'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "S&igneeritud/krüptitud teksti näidatakse pärast koostamist"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Kirja teksti määramine"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Selle sisselülitamisel näidatakse signeeritud/krüptitud teksti eraldi aknas, "
+"kus saab näha, kuidas see saatmisel välja näeb. See on enamasti mõttekas, "
+"kui soovid kontrollida, kas krüptimine ikka korralikult toimib."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Kirjale lisatakse kaasatud fail. Seda tegevust võib korrata"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Saadetud kirjad salv&estatakse krüptitult"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Kontrollitakse ainult uusi kirju"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Märgi, kui soovid salvestada krüptitud kirju"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Avatakse ainult redaktori aken"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Kirjad salvestatakse krüptitult</h1>\n"
+"Selle valiku korral salvestatakse saadetud kirjad krüptitult, nagu nad olid "
+"saadetud. See ei ole soovitatav, sest sa ei suuda neid sõnumeid enam lugeda, "
+"kui vajalik sertifikaat aegub.\n"
+"<p>\n"
+"Siiski võivad olla kohalikud reeglid, mis sunnivad sind selle valiku sisse "
+"lülitama. Kui sa ei ole kindel, küsi järgi oma süsteemi administraatorilt.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Näitab antud kirja faili"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Alati palutakse valida va&jalik krüptovõti"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Kiri saadetakse 'aadressile' või lisatakse fail, millele osutab 'URL'"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Selle sisselülitamisel näitab rakendus alati avalike võtmete nimekirja, "
+"millest saad valida selle, mida soovid krüptimiseks kasutada. Kui see ei ole "
+"sisse lülitatud, näitab rakendus dialoogi ainult siis, kui ei suudeta leida "
+"õiget võtit või kui kasutamiskõlblikke võtmeid on mitu."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Loetud"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Kirjad k&rüptitakse automaatselt, kui vähegi võimalik"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Vana"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Kui see valik on sees, krüptitakse iga sinu saadetud kiri, kui see on vähegi "
+"võimalik ja soovitav. Mõistagi on võimalik iga kirja puhul eraldi automaatne "
+"krüptimine välja lülitada."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Kustutatud"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Ei signeerita/krüptita s&alvestamisel mustandina"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Vastatud"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Kuidas see töötab?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Edastatud"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universaalne"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Järjekorras"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Vastus"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Saadetud"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Vastus kõigile"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Jälgitav"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Edasisaatmine"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignoreeritav"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "K&iirklahv:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Rämpspost"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Malli &tüüp"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Väärtpost"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Malli sisu"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Ülesanne"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Malli kiirklahv"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Kaasatud failiga"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Malli tüüp"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 kasutatud (kokku %2 %3)"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Kausta omadused"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Asukoht"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "K&austas hoitakse meililisti"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Meililisti aadress:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormaalne:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Lugemata:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Vanade kirjade kustutamine"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Kustutatakse &pärast:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Lo&etud vanade kirjade kustutamine"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "&Kustutakse pärast:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Lu&gemata vanade kirjade kustutamine"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "päeva"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "nädalat"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "kuud"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Täpsemad valikud"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Saatja &identiteet:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Salvestamise vorming:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Nimekiri näitab:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Järjekorras kirjad saadetakse uute kirjade kontrollimisel"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Fail nimega \"%1\" on juba olemas. Kas kirjutada see üle?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Vali, kas soovid, et KMail saadaks kõik kaustas 'väljuvad' olevad "
+"kirjad uute kirjade käsitsi kontrollimisel, igal uute kirjade kontrollimisel "
+"või ei saadeta neid üldse automaatselt. </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Kas kirjutada fail üle?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Sünkroniseerimata kirjade automaatne eemaldamine ebapiisavate õigustega "
+"kaustadest"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Kui kaustas on uusi kirju, mida ei ole veel serverisse laaditud, aga sul ei "
+"ole selleks antud kausta korral piisavalt õigusi, liigutatakse need kirjad "
+"automaatselt kausta 'lost+found'."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Kohalike lippude lubamine kirjutuskaitstud kaustadel"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"See võimaldab administraatoril määrata kirjade kontrollimise intervalli "
+"minimaalse väärtuse.\"\n"
+"           \"Kasutaja ei saa valida siinmääratust väiksemat väärtust."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Viimati valitud kaust kaustade valimise dialoogis."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Kasutajate umaski seadistute eiramine ning kasutajapõhiste lugemis/"
+"kirjutamisõiguste kasutamine"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Süsteemse salve ikooni näitamise reegel"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Rakenduse sulgemine peaakna sulgemisel, isegi kui süsteemse salve ikoon on "
+"aktiivne."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Üksikasjalik uutest kirjadest teatamine"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Sisselülitamisel näidatakse uutest kirjadest teatamisel iga kausta kohta "
+"uute kirjade arvu. Vastasel juhul näidatakse ainult lihtsat teadet 'Saabus "
+"uus kiri'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Määratud redaktor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Sisemise redaktori asemel kasutatakse välist"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "Lävi, mille korral kasutajad hoiatatakse, et kvoot hakkab täis saama."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Grupitöö kasutamise lubamine"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Päiseväljade Kellelt:/Kellele: muutmine kutsetele vastates"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook ei tule eriti hästi toime iCalendari standardiga. Selle "
+"võimalusega saab osadest hädadest üle. Kui sul on probleeme Outlooki "
+"kasutajatega, kes ei suuda sinu vastuseid kätte saada, võiksid proovida "
+"selle sisse lülitada."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Grupitöö kutsed saadetakse kirja põhiosas"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook ei tule eriti hästi toime iCalendari standardiga. Selle "
+"võimalusega saab osadest hädadest üle. Kui sul on probleeme Outlooki "
+"kasutajatega, kes ei suuda sinu kutseid kätte saada, võiksid proovida selle "
+"sisse lülitada."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Exchange'iga ühilduvad kutsed"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlookil, kui seda kasutatakse koos Microsoft Exchange'i "
+"serveriga, on raskusi standarditele vastavate grupitöö kirjade mõistmisega. "
+"Selle valiku sisselülitamisel saadetakse grupitöö kutsed sellisena, et neid "
+"mõistab ka Microsoft Exchange."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Selle sisselülitamisel ei avata kirja koostamise akent, vaid kõik "
+"kutsekirjad saadetakse ära automaatselt. Kui soovid kirja enne saatmist "
+"siiski näha, lülita see võimalus välja. Kuid arvesta, et redaktoriaknas "
+"nähtav tekst on iCalendari süntaksiga, mida ei peaks mitte käsitsi muutma "
+"hakkama."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Kutsekirjade kustutamine pärast vastuse saatmist"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Märkimise korral liigutatakse kutsekirjad, millele on saadetud vastu, pärast "
+"vastuse edukat saatmist prügikastikausta."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Selle lubamisega on võimalik salvestada kirjeid Kontacti rakendustest "
+"KOrganizer, TDE aadressiraamat ja KNotes.</p><p>Lisaks sellele tuleb määrata "
+"rakendused, mis kasutavad IMAP ressursse. Seda saab teha TDE "
+"juhtimiskeskuses.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Tavaliselt ei ole vajadust näha IMAP ressurssidega kaustu. Kui sul on "
+"seda aga mingil põhjusel siiski vaja, saad selle siin lubada.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Kui grupitöö teabe salvestamiseks kasutatavat kontot \"\n"
+"          \"ei kasutata tavaliste kirjade haldamiseks, sunnib see valik "
+"KMaili \"\n"
+"          \"näitama ainult konto grupitöökaustu. See on abiks, kui haldad "
+"tavalisi \"\n"
+"          \"kirju täiendava IMAP konto abil.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Grupitöö kaustade salvestamisvormingu valimine <ul><li>Vaikevorminguks on "
+"ical (kalendrikaustad) ja vcard (aadressiraamatu kaustad). Selle vormingu "
+"korral saab kasutada kõiki Kontacti võimalusi.</li><li>Kolabi XML vorming on "
+"kohandatav mudel, mis sarnaneb tugevasti Outlookil kasutatavaga. See tagab "
+"parema ühilduvuse Outlookiga, kui kasutad Kolabi või sellega ühilduvat "
+"serverit.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>See võimaldab valida IMAP ressursikaustade asukoha.</p><p>Kolabi serveris "
+"on selleks tavaliselt IMAP sissetulevate kirjade kaust (inbox).</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>See on konto ID, millel asuvad IMAP ressursside kaustad.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Kui soovid muuta IMAP ressursside kaustanimed emakeelseks, saad siin "
+"valida sobiva keele.</p><p>Palun arvesta, et ainus põhjus, miks seda vaja "
+"läheb, on ühilduvus Microsoft Outlookiga. Üldiselt ei ole keele määramine "
+"eriti hea mõte, sest nii muutub võimatuks keelt vahetada.</p><p>Seepärast "
+"ära seda võimalust kasuta, kui sul seda just vaja ei ole.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Filtreeritakse ka grupitöö kaustadesse saabunud kirju."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Grupitöö muudatused DIMAP-i kaustades sünkroniseeritakse kohe võrku minnes."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Selle väärtusega saab määrata, kas näidata KMaili sissejuhatavat teksti või "
+"mitte."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimaalne ühenduste arv masina kohta"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Sellega saab piirata ühenduste arvu masina kohta uute kirjade "
+"kontrollimisel. Vaikimisi on ühenduste arv määratud piiramatuks (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Kiirotsingu sisendrea näitamine"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"See valik lubab või keelab otsingurea ülalpool kirjade nimekirja, mis "
+"võimaldab kiiresti otsida infot kirjade nimekirjas."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Kohaliku sisenevate kirjade kausta peitmine, kui seda ei kasutata"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Vaikimisi edastatakse tekstina."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "Semikooloni (;) lubamine eraldajana kirjakoostajas."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Vastamisel või edasisaatmisel kasutatakse originaali kooditabelit (kui "
+"võimalik)"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Allkirja automaatne lisamine"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"See identiteet jäetakse meelde, et seda saaks redaktoris ka edaspidi "
+"kasutada.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"See kaust jäetakse saadetud kirjade jaoks meelde, et seda saaks redaktoris "
+"ka edaspidi kasutada."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"See kirjade transpordi meetod jäetakse meelde, et seda saaks redaktoris ka "
+"edaspidi kasutada."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"See identiteet jäetakse meelde, et seda saaks redaktoris ka edaspidi "
+"kasutada.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Reamurdmine veerust:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Hoiatus, kui &juursertifikaat aegub enne"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Sisselülitamisel mõistab Outlook(tm) erisümboleid (näiteks täpitähti) "
+"sisaldavaid lisatud failide nimesid (loodetavasti...)"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "&Vastuvõtu ja lugemise kinnitus saadetakse automaatselt"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Sisselülitamisel annab KMail iga väljuva kirjaga kaasa kirja "
+"kättesaamise/lugemise kinnituse soovi.</p><p>See on vaikeväärtus: kinnituse "
+"küsimise saab konkreetse kirja puhul lubada või keelata redaktoris "
+"(<em>Eelistused</em>-><em>Kättesaamise/lugemise kinnituse küsimine</em>).</"
+"p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Viimati kasutatud aadresside kasutamine automaatsel lõpetamisel"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Jäta märkimata, kui sa ei soovi, et kirja koostamise akna aadressiväljadel "
+"näidataks automaatse lõpetamise nimekirjas viimati kasutatud aadresse."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Automaatsalvestuse intervall:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Võimalik on lasta regulaarselt varundada redaktoriaknas olev tekst. Siin "
+"saab määrata automaatse salvestamise intervalli. Kui anda väärtuseks 0, "
+"automaatset salvestamist ei kasutata."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Allkirja lisamine tsiteeritud teksti ette"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Tuntud &prefiksid, mis asendatakse prefiksiga \"Re\":"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Tuntud p&refiksid, mis asendatakse prefiksiga \"Fwd\":"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Tark tsiteerimine"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Signatuur on aegunud."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Adressaadi valimise tüüp"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Määrab \"Kellele\", \"Koopia\" ja \"Pimekoopia\" adressaadi valimise\n"
+"        dialoogi tüübi."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Saajate redaktori tüüp"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Määrab \"Kellele\", \"Koopia\" ja \"Pimekoopia\" saajate\n"
+"        redaktori tüübi."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Saajate redaktori ridade maksimaalne arv."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Kirjaosade tüüpide nimekiri, mis eemaldatakse kirja edastamisel tekstina."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Kaasatud failide lubatud maksimumsuurus MB-des."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Tekstijuppide haldamise ja lisamise paneeli näitamine kirjakoostajas."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr "GnuPG auditi logi näitamine ka pärast edukat krüptimistoimingut."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Vastamisel või edasisaatmisel kasutatakse originaali kooditabelit (kui "
+"võimalik)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Mõned kirjad, eriti automaatselt genereeritud, ei määra kodeeringut, mida on "
+"vaja nende korrektseks näitamiseks. Sellisel juhul kasutatakse "
+"tagavarakodeeringut, mida saabki siin määrata. Selleks tasub määrata "
+"kodeering, mida sinu piirkonnas kõige enam tarvitatakse. Vaikimisi "
+"kasutatakse süsteemis määratud kodeeringut."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Kui määrata vaikeväärtuseks \"Automaatne\", kasutatakse määratud kodeeringut "
+"kõigi kirjade puhul sellele vaatamata, mida nad ise välja pakuvad."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Sisselülitamisel näidatakse smiley'sid (näiteks :-) ) kirja tekstis "
+"emotikonidena (tillukeste piltidena)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Sisselülitamisel näidatakse tsiteeritava teksti erinevaid tasemeid. "
+"Märkimatajätmisel tsiteeritava teksti tasemed peidetakse."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automaatse kokkukerimise tase:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Tsiteeritava teksti fondi suuruse vähendamine"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Sisselülitamisel näidatakse tsiteeritavat teksti väiksema fondiga."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Saadetud kirjad salv&estatakse krüptitult"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Saatva rakenduse näitamine uhketes päistes"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Sisselülitamisel näidatakse uhketes päistes saatvat rakendust (päiseread "
+"User-Agent ja X-Mailer)."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Olemasolevate kirjade kaasatud failide kustutamise lubamine."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Olemasolevate kirjade kaasatud failide muutmise lubamine."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+"Kirjad krüptitakse vaatamisel alati lahti või küsitakse enne lahtikrüptimist"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Kirja kättesaamise/lugemise kinnituste saatmine puuduva saatjaga"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Kirja kättesaamise/lugemise kinnituste saatmine puuduva saatjaga. Mõned "
+"serverid võivad selliseid kinnitusi tagasi lükata, nii et kui sul tekib "
+"nende saatmisega probleeme, lülita see valik välja."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Fraasid on teisendatud mallideks"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Senised fraasid on teisendatud mallideks"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Uue kirja kirjamall"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Vastuse kirjamall"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Kõigile vastamise kirjamall"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Edasisaatmise kirjamall"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Tsitaadimärgid"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Kasutajatel lubatakse muuta äraolekuseadistusi."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Kasutajatel lubatakse üles laadida äraoleku Sieve skripte, aga keelatakse "
+"muuta mis tahes seadistusi, näiteks kindlale domeenile ja rämpspostile "
+"vastamise sätteid."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "Äraolekuvastused saadetakse ainult sellest domeenist tulnud kirjadele."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "Äraolekuvastuste saatmise lubamine rämpspostiks määratud kirjadele."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"KMaili käivitamisel kontrollitakse, kas mõni äraolekuvastus on endiselt "
+"aktiivne."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Muuda &faili"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Muuda..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Liikumine"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Ka&ust"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Kiri"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Vasta eriliselt"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Edasisaatmine"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Kohtspikrid"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Tekstijupi seadistused"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-riba"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Üldine häälestus"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-riba"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Sertifikaatide kontroll CRL-ide vahendusel"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Selle sisselülitamisel kontrollitakse S/MIME sertifikaate sertifikaatide "
+"tühistamise nimekirju (CRL) kasutades."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Sertifikaatide kontroll võrgus (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Selle sisselülitamisel kontrollitakse S/MIME sertifikaate võrgus interneti "
+"sertifikaatide staatuse protokolli (OCSP) kasutades. Anna allpool OCSP "
+"serveri URL."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Sertifikaadi kontroll võrgus"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP serveri URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Anna siin sertifikaatide kontrollimise serveri aadress. URL-i alguses seisab "
+"tavaliselt http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP serveri signatuur:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Sertifikaatide teenuse URL-i ignoreerimine"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Sertifikaadi reegleid ei kontrollita"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Vaikimisi kasutab GnuPG faili ~/.gnupg/policies.txt kontrollimaks, kas "
+"sertifikaadi reegel on lubatud. Selle sisselülitamisel reegleid ei "
+"kontrollita."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "CRL-i ei kontrollita kunagi"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Selle sisselülitamisel ei kasutata S/MIME sertifikaatide kontrollimiseks "
+"kunagi sertifikaatide tühistusnimekirju (CRL)."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Tõmmatakse puuduvad väljaandja sertifikaadid"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Selle sisselülitamisel tõmmatakse vajadusel puuduvad väljaandja "
+"sertifikaadid (kasutusel nii CRL-ide kui OCSP korral)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP päringud"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "HTTP päringuid ei sooritata"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "HTTP täielik keelamine S/MIME korral."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP päringuteks kasutatakse järgmist proxyt:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Kasutatakse süsteemi HTTP proxyt:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Selle valimisel kasutatakse paremal asuvat HTTP proxy väärtust (mille määrab "
+"keskkonnamuutuja http_proxy) kõigi HTTP päringute korral."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Kirjuta siia HTTP proxy asukoht, mida kasutatakse kõigi HTTP päringute jaoks "
+"S/MIME puhul. Süntaks on masin:port, näiteks minuproxy.kuskil.ee:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "HTTP sertifikaatide CRL jagamispunkte ignoreeritakse"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL-i asukoha otsimisel sisaldab testitav sertifikaat tavaliselt "
+"niinimetatud \"CRL jagamispunkti\" (DP) kirjet, mis kujutab endast "
+"vajalikule URL-ile viivat URL-ide rida. Kasutatakse esimesena leitud "
+"jagamispunkti. Selle valikuga jäetakse sobiva DP otsimisel kõrvale kõik HTTP-"
+"skeemi kasutavad kirjed."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP päringud"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "LDAP päringuid ei sooritata"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "LDAP-i täielik keelamine S/MIME puhul."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "LDAP sertifikaatide CRL jagamispunkte ignoreeritakse"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL-i asukoha otsimisel sisaldab testitav sertifikaat tavaliselt "
+"niinimetatud \"CRL jagamispunkti\" (DP) kirjet, mis kujutab endast "
+"vajalikule URL-ile viivat URL-ide rida. Kasutatakse esimesena leitud "
+"jagamispunkti. Selle valikuga jäetakse sobiva DP otsimisel kõrvale kõik LDAP-"
+"skeemi kasutavad kirjed."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP päringute primaarne masin:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Kirjuta siia LDAP-server, millele suunatakse kõik LDAP-päringud. See "
+"tühistab kõik LDAP URL-is määratud masina ja pordi seadistused ning seda "
+"kasutatakse ka siis, kui URL-is ei olegi masinat ja porti määratud. Muid "
+"LDAP-servereid kasutatakse ainult siis, kui ühendus \"proxyga\" "
+"ebaõnnestub.\n"
+"Süntaks on \"MASIN\" või \"MASIN:PORT\". Kui PORT ära jätta, kasutatakse "
+"porti 389 (standardne LDAP port)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Tekstijupi lisamine"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Lisa"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Tekstijupp:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "&Grupp:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Tekstijupi seadistused"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Kohtspikrid"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "&Tekstijupi teksti näitamine kohtspikris"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "Määrab, kas kohtspikker sisaldab ka märgitud rea teksti"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Muutujad"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Muutujate sisestamisviis"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Eraldi dialoog igale tekstijupi muutujale"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "Sisestamisdialoogi näidatakse iga tekstijupi muutuja puhul"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Üks dialoog kõigile tekstijupi muutujatele"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Avatakse üks dialoog, kus saab sisestada kõigi tekstijupi muutujate väärtused"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Piiraja:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Saatjale vastamine"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Kõigile / Postiloendisse vastamine"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Edasi saadetud kiri"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "H&oiatus signeerimata kirja saatmise korral"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Märgi, kui soovid hoiatust enne signeerimata kirja saatmist"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus signeerimata kirjade saatmise korral</h1>\n"
+"Selle valiku korral näidatakse sulle hoiatust, kui püüad saata signeerimata "
+"kirja või selle mõnda osa.\n"
+"<p>\n"
+"Soovitatav on see valik maksimaalse ühtluse nimel sisse lülitada.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Hoiatus krüptimata kirjade saatmise puhul"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Märgi, kui soovid, et krüptimata kirjade saatmise puhul sind hoiatataks."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus krüptimata kirjade saatmise puhul</h1>\n"
+"Selle valiku korral hoiatatakse sind, kui proovid saata kirja tervikuna või "
+"selle mõnda osa krüptimata.\n"
+"<p>\n"
+"Maksimaalse ühtluse huvides on soovitatav see sisse lülitada.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "H&oiatus, kui saaja e-posti aadressi ei ole sertifikaadis"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Märgi, kui soovid hoiatust juhul, kui sertifikaadis puudub aadress"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus, kui saaja e-posti aadress ei ole sertifikaadis</h1>\n"
+"Selle valiku korral ilmub hoiatus, kui saaja e-posti aadressi ei leidu "
+"krüptimiseks kasutatavas sertifikaadis.\n"
+"<p>\n"
+"Maksimaalse turvalisuse huvides on soovitatav see sisse lülitada.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Hoiatus, kui sertifikaat/võti peagi aegub (täpsusta lävi allpool)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Signeerimisel"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Krüptimisel"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Vali siin päevade arv"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus, kui signatuuri sertifikaat aegub</h1>\n"
+"Vali minimaalne päevade arv, mille kestel signatuuri sertifikaat peab veel "
+"kehtima, enne kui näidatakse hoiatust.\n"
+"<p>\n"
+"SPHINX soovitab väärtuseks määrata 14 päeva.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus, kui krüptimissertifikaat aegub</h1>\n"
+"Vali minimaalne päevade arv, mille kestel krüptimissertifikaat peab veel "
+"kehtima, ilma et hoiatust näidataks.\n"
+"<p>\n"
+"SPHINX soovitab määrata väärtuseks 14 päeva.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus, kui ahela mõni sertifikaat aegub</h1>\n"
+"Vali minimaalne päevade arv, mille kestel kõik ahelasse kuuluvad "
+"sertifikaadid peavad veel kehtima enne hoiatuse näitamist.\n"
+"<p>\n"
+"SPHINX soovitab väärtuseks määrata 14 päeva.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus, kui SK sertifikaat aegub</h1>\n"
+"Vali minimaalne päevade arv, mille kestel SK sertifikaat peab veel kehtima, "
+"enne kui näidatakse hoiatust.\n"
+"<p>\n"
+"SPHINX soovitab määrata väärtuseks 14 päeva.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Hoiatus, kui juursertifikaat aegub</h1>\n"
+"Vali minimaalne päevade arv, mille kestel juursertifikaat peab veel kehtima, "
+"enne kui näidatakse hoiatust.\n"
+"<p>\n"
+"SPHINX soovitab väärtuseks määrata 14 päeva.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Juursertifikaatidel:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "SK sertifikaatidel:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Lõppkasutaja sertifikaatidel/võtmetel:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Kõigi \"Rohkem ei pärita\" hoiatuste taaslubamine"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...et järgmisele või eelmisele kirjale saab liikuda vastavalt\n"
+"noolt paremale või vasakule kasutades?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...et sa võid kiiresti luua filtreid saatjale, saajale, subjektile\n"
+"ja meililistile, kasutades valikut <em>Tööriistad-&gt;Tekita&nbsp;Filter</"
+"em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...et mõne meililisti subjektireale lisatavast\n"
+"&quot;[meililisti nimest]&quot; saab lahti filtri tegevusega\n"
+"<em>muuda päiseid</em>? See käib nii:\n"
+"<pre>muuda päiseid &quot;Subject&quot;\n"
+"   asemel &quot;\\s*\\[meililisti nimi\\]\\s*&quot;\n"
+"   olgu &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...et sa võid seostada meililistid kaustadega dialoogis\n"
+"<em>Kaustad-&gt;Meililistide haldamine</em>? Seejärel võid kasutada\n"
+"valikut <em>Kirjad-&gt;Uus&nbsp;kiri&nbsp;meililisti...</em>, mis avab\n"
+"redaktori juba etteantud aadresside nimekirjaga.</p>\n"
+"Teine võimalus on klõpsata kaustale hiire keskmise nupuga.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...et sa võid igale kaustale eraldi omistada meelepärased ikoonid?\n"
+"Vaata <em>Kaust-&gt;Omadused</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...et KMail võib näidata värviriba, mis osutab parajasti aktiivse\n"
+"kirja tüübile (tavaline tekst/HTML/OpenPGP)?</p>\n"
+"<p>See tõrjub katsed näidata, nagu oleks signatuur edukalt kontrolli\n"
+"läbinud, saates KMaili signatuuri olekuraame jäljendava HTML-kirja.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...et suvalist päist saab filtreerida, kui sisestada selle\n"
+"nimi otsingureegli esimesele väljale?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...et puhtad HTML-kirjad saab välja filtreerida reegliga\n"
+"<pre>&quot;Content-type&quot; sisaldab &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...et vastates tsiteeritakse ainult kirja valitud osa?</p>\n"
+"<p>Kui midagi ei ole valitud, tsiteeritakse kogu kirja.</p>\n"
+"<p>See toimib isegi kaasatud failide teksti, kui oled valinud\n"
+"<em>Vaade-&gt;Kaasatud&nbsp;failid-&gt;Kirja&nbsp;sees</em>.</p>\n"
+"<p>Seda võimalust saab kasutada kõigi vastamiskäskudega, välja arvatud\n"
+"<em>Kirjad-&gt;Vasta&nbsp;ilma&nbsp;tsiteerimata</em>.</p>\n"
+"<p align=\"right\"><em>Kirjapanija: David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Kausta kiirotsingu välja näitamine"
@@ -15268,7 +14869,9 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgstr "Uute kirjade tõmbamine"
 
 #~ msgid "Only filter mails received in disconnected IMAP inbox."
-#~ msgstr "Filtreeritakse ainult lahutatud IMAP-i sisenevate kirjade kausta saabunud kirju."
+#~ msgstr ""
+#~ "Filtreeritakse ainult lahutatud IMAP-i sisenevate kirjade kausta saabunud "
+#~ "kirju."
 
 #~ msgid "Show folder quick search line edit"
 #~ msgstr "Kausta kiirotsingu välja näitamine"
@@ -15318,16 +14921,20 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kirja kõik osad krüptitakse vaikimisi</h1>\n"
-#~ "Selle valiku korral krüptitakse vaikimisi kirja kõik osad (so tekstiosa ja kõik kaasatud failid).\n"
+#~ "Selle valiku korral krüptitakse vaikimisi kirja kõik osad (so tekstiosa "
+#~ "ja kõik kaasatud failid).\n"
 #~ "<p>\n"
-#~ "See on vaikeseadistus, mida on iga konkreetse kirja puhul võimalik muuta.\n"
+#~ "See on vaikeseadistus, mida on iga konkreetse kirja puhul võimalik "
+#~ "muuta.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15339,12 +14946,15 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Enne iga osa krüptimist küsitakse kinnitust</h1>\n"
-#~ "Selle valiku korral küsitakse sinu käest kirja iga osa (so põhiteksti kui ka kõigi kaasatud failide) puhul, kas see krüptida või mitte.\n"
+#~ "Selle valiku korral küsitakse sinu käest kirja iga osa (so põhiteksti kui "
+#~ "ka kõigi kaasatud failide) puhul, kas see krüptida või mitte.\n"
 #~ "</qt> "
 
 #~ msgid "&Do not encrypt messages"
@@ -15358,14 +14968,16 @@ msgstr "Kas kirjutada fail üle?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kirju ei krüptita</h1>\n"
 #~ "Selle valiku korral kirju vaikimisi ei krüptita.\n"
 #~ "<p>\n"
-#~ "See on vaikeseadistus, mida on iga konkreetse kirja puhul võimalik muuta.\n"
+#~ "See on vaikeseadistus, mida on iga konkreetse kirja puhul võimalik "
+#~ "muuta.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15377,18 +14989,30 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Krüptimisalgoritm</h1>\n"
-#~ "Algoritm on kirjeldus, mis ütleb arvutile, kuidas mingit ülesannet täita. Krüptimisalgoritm kirjeldab, kuidas arvuti lisab kirjale saaja võtme, et kirja saaks lugeda vaid ettenähtud kirja saaja.\n"
+#~ "Algoritm on kirjeldus, mis ütleb arvutile, kuidas mingit ülesannet täita. "
+#~ "Krüptimisalgoritm kirjeldab, kuidas arvuti lisab kirjale saaja võtme, et "
+#~ "kirja saaks lugeda vaid ettenähtud kirja saaja.\n"
 #~ "<p>\n"
-#~ "Teatud krüptimisalgoritmi valik määrab, kui lihtne või raske on kirja vahelt lõigata ja läbi lugeda. Siiski peetakse kõiki keskkonna SPHINX pakutavaid algoritme väga turvaliseks. Enamasti toimib siin vaikeväärtus päris hästi.\n"
+#~ "Teatud krüptimisalgoritmi valik määrab, kui lihtne või raske on kirja "
+#~ "vahelt lõigata ja läbi lugeda. Siiski peetakse kõiki keskkonna SPHINX "
+#~ "pakutavaid algoritme väga turvaliseks. Enamasti toimib siin vaikeväärtus "
+#~ "päris hästi.\n"
 #~ "<p>\n"
 #~ "See on vaikeseadistus, mida iga konkreetse kirja puhul saab muuta.\n"
 #~ "</qt>"
@@ -15400,21 +15024,28 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgstr "Kontroll &võib lõppeda kohalikult salvestatud sertifikaadiga"
 
 #~ msgid "Check to end with locally saved certificate."
-#~ msgstr "Märgi, kui kontroll võib lõppeda kohalikult salvestatud sertifikaadiga."
+#~ msgstr ""
+#~ "Märgi, kui kontroll võib lõppeda kohalikult salvestatud sertifikaadiga."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Sertifikaadi rada võib lõppeda kohalikult salvestatud sertifikaadiga</h1>\n"
-#~ "Kui see on valitud, võib sertifikaadiahela kontroll lõppeda ka kohalikult salvestatud sertifikaadiga.\n"
+#~ "<h1>Sertifikaadi rada võib lõppeda kohalikult salvestatud sertifikaadiga</"
+#~ "h1>\n"
+#~ "Kui see on valitud, võib sertifikaadiahela kontroll lõppeda ka kohalikult "
+#~ "salvestatud sertifikaadiga.\n"
 #~ "<p>\n"
-#~ "Kohalikult salvestatud sertifikaadid on sinu enda sertifikaadid, samuti sinu suhtluspartnerite ja sertifitseerimiskeskuste (SK) sertifikaadid.\n"
+#~ "Kohalikult salvestatud sertifikaadid on sinu enda sertifikaadid, samuti "
+#~ "sinu suhtluspartnerite ja sertifitseerimiskeskuste (SK) sertifikaadid.\n"
 #~ "</qt>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15426,12 +15057,15 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sertifikaadi rada kontrollitakse alati juursertifikaadini</h1>\n"
-#~ "Kui see on valitud, kontrollitakse saaja sertifikaadi rada alati kuni juursertifikaadini välja.\n"
+#~ "Kui see on valitud, kontrollitakse saaja sertifikaadi rada alati kuni "
+#~ "juursertifikaadini välja.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15443,16 +15077,20 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sertifikaadi raja kontroll</h1>\n"
-#~ "Kui see on valitud, kontrollitakse kogu saaja sertifikaadi rada kuni juursertifikaadini välja.\n"
+#~ "Kui see on valitud, kontrollitakse kogu saaja sertifikaadi rada kuni "
+#~ "juursertifikaadini välja.\n"
 #~ "<p>\n"
-#~ "Arvesta, et saaja sertifikaadi enda kontrolli ei ole võimalik välja lülitada.\n"
+#~ "Arvesta, et saaja sertifikaadi enda kontrolli ei ole võimalik välja "
+#~ "lülitada.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15464,16 +15102,27 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kasutatakse sertifikaatide tühistamise nimekirju (CRL)</h1>\n"
-#~ "Sertifikaatide tühistamise nimekiri sisaldab tühistatud sertifikaate, mida ei peaks enam kasutama krüptimiseks. Kasutaja võib soovida lasta oma sertifikaadi tühistada, kui ta näiteks kahtlustab, et see on ohus (nt. et keegi on PINi ära arvanud).\n"
+#~ "Sertifikaatide tühistamise nimekiri sisaldab tühistatud sertifikaate, "
+#~ "mida ei peaks enam kasutama krüptimiseks. Kasutaja võib soovida lasta oma "
+#~ "sertifikaadi tühistada, kui ta näiteks kahtlustab, et see on ohus (nt. et "
+#~ "keegi on PINi ära arvanud).\n"
 #~ "<p>\n"
-#~ "Maksimaalse turvalisuse huvides on soovitatav kasutada CRLe. Sertifikaatide ja CRLide halduse dialoogis saad määrata, kust CRLid hankida.\n"
+#~ "Maksimaalse turvalisuse huvides on soovitatav kasutada CRLe. "
+#~ "Sertifikaatide ja CRLide halduse dialoogis saad määrata, kust CRLid "
+#~ "hankida.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15485,12 +15134,14 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h>Hoiatus, kui CRL aegub lähitulevikus</h1>\n"
-#~ "Selle valiku korral näidatakse sulle hoiatust, kui üks CRLidest, mida sa kasutad, aegub lähitulevikus.\n"
+#~ "Selle valiku korral näidatakse sulle hoiatust, kui üks CRLidest, mida sa "
+#~ "kasutad, aegub lähitulevikus.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15499,14 +15150,16 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Hoiatus, kui CRL aegub lähitulevikus.</h1>\n"
-#~ "Sellel väljal saad määrata, millal enne CRLi aegumist sulle vastavat hoiatust näidatakse.\n"
+#~ "Sellel väljal saad määrata, millal enne CRLi aegumist sulle vastavat "
+#~ "hoiatust näidatakse.\n"
 #~ "<p>\n"
 #~ "SPHINX soovitab määrata väärtuseks 7 päeva.\n"
 #~ "</qt>"
@@ -15515,19 +15168,23 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgstr "Iseendale krü&ptitakse alati"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Märgi, kui soovid, et krüptitud kirjad oleks krüptitud ka sinu eravõtmega."
+#~ msgstr ""
+#~ "Märgi, kui soovid, et krüptitud kirjad oleks krüptitud ka sinu eravõtmega."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Iseendale krüptitakse alati</h1>\n"
-#~ "Selle valiku korral saadetakse krüptitud kiri alati krüptituna ka sinu eravõtmega.\n"
+#~ "Selle valiku korral saadetakse krüptitud kiri alati krüptituna ka sinu "
+#~ "eravõtmega.\n"
 #~ "<p>\n"
 #~ "On soovitatav see lubatuks jätta, kui soovid lugeda enda saadetud kirju.\n"
 #~ "</qt>"
@@ -15541,16 +15198,21 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Hoiatus, kui sertifikaat aegub</h1>\n"
-#~ "Selle valiku korral näidatakse sulle hoiatust, kui püüad kasutada krüptimiseks sertifikaati, mis aegub määratud päeva(de) pärast.\n"
+#~ "Selle valiku korral näidatakse sulle hoiatust, kui püüad kasutada "
+#~ "krüptimiseks sertifikaati, mis aegub määratud päeva(de) pärast.\n"
 #~ "<p>\n"
-#~ "Soovitatav on see valik sisse lülitada, et mitte kasutada sertifikaate, mis juba lähitulevikus aeguvad.\n"
+#~ "Soovitatav on see valik sisse lülitada, et mitte kasutada sertifikaate, "
+#~ "mis juba lähitulevikus aeguvad.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15571,8 +15233,28 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Valib, kas saata sertifikaate või mitte"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Sertifikaatide saatmine</h1> Ilma sinu sertifikaadita ei suuda saaja kindlaks määrata, kas see olid tõesti sina, kes kirja saatis, ja ega seda ei ole muutnud keegi kolmas. <p> Saaja võib hankida sinu sertifikaadi keskserverist, kuid sa võid valida oma sertifikaadi kaasamise kirjaga. Sa võid valida, kas sertifikaati üldse kaasa panna, kaasata ainult enda sertifikaat või kogu sertifikaadiahel, mis sinu sertifikaati sertifitseerib, kaasa või välja arvatud juursertifikaat. <p> Soovitatav on alati kaasata kirjale vähemalt oma sertifikaat. <p> See on vaikeseadistus, mida võib iga konkreetse kirja puhul muuta. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Sertifikaatide saatmine</h1> Ilma sinu sertifikaadita ei suuda "
+#~ "saaja kindlaks määrata, kas see olid tõesti sina, kes kirja saatis, ja "
+#~ "ega seda ei ole muutnud keegi kolmas. <p> Saaja võib hankida sinu "
+#~ "sertifikaadi keskserverist, kuid sa võid valida oma sertifikaadi "
+#~ "kaasamise kirjaga. Sa võid valida, kas sertifikaati üldse kaasa panna, "
+#~ "kaasata ainult enda sertifikaat või kogu sertifikaadiahel, mis sinu "
+#~ "sertifikaati sertifitseerib, kaasa või välja arvatud juursertifikaat. <p> "
+#~ "Soovitatav on alati kaasata kirjale vähemalt oma sertifikaat. <p> See on "
+#~ "vaikeseadistus, mida võib iga konkreetse kirja puhul muuta. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Oma serti&fikaadi saatmine"
@@ -15592,14 +15274,17 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Signeeritakse vaikimisi kirja kõik osad</h1>\n"
-#~ "Selle valiku korral signeeritakse vaikimisi kirja kõik osad (so põhitekst ja kõik kaasatud failid).\n"
+#~ "Selle valiku korral signeeritakse vaikimisi kirja kõik osad (so põhitekst "
+#~ "ja kõik kaasatud failid).\n"
 #~ "<p>\n"
 #~ "See on vaikeseadistus, mida võib iga konkreetse kirja puhul muuta.\n"
 #~ "</qt>"
@@ -15608,17 +15293,21 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgstr "Enne kir&ja iga osa signeerimist küsitakse kinnitust"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Märgi, kui soovid kinnituse küsimist enne kirja iga osa signeerimist"
+#~ msgstr ""
+#~ "Märgi, kui soovid kinnituse küsimist enne kirja iga osa signeerimist"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Enne kirja iga osa signeerimist küsitakse kinnitust</h1>\n"
-#~ "Selle valiku korral küsitakse sinu käest kinnitust iga kirja osa (s.o. põhiteksti ja iga kaasatud faili) puhul, enne kui see signeerida.\n"
+#~ "Selle valiku korral küsitakse sinu käest kinnitust iga kirja osa (s.o. "
+#~ "põhiteksti ja iga kaasatud faili) puhul, enne kui see signeerida.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15632,7 +15321,8 @@ msgstr "Kas kirjutada fail üle?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15642,8 +15332,10 @@ msgstr "Kas kirjutada fail üle?"
 #~ "See on vaikeseadistus, mida saab iga konkreetse kirja puhul muuta.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Signatuuri sertifikaat seadistatakse leheküljel <em>Sertifikaadid</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Signatuuri sertifikaat seadistatakse leheküljel <em>Sertifikaadid</em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15654,20 +15346,33 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Signatuuri algoritm</h1>\n"
-#~ "Algoritm on kirjeldus, mille abil arvuti teab, kuidas mingit ülesannet täita. Signatuuri algoritm kirjeldab, kuidas arvuti lisab sinu signatuurivõtme kirjale, et saaja võiks kindlaks määrata, kas kiri on tõepoolest sinult tulnud.\n"
+#~ "Algoritm on kirjeldus, mille abil arvuti teab, kuidas mingit ülesannet "
+#~ "täita. Signatuuri algoritm kirjeldab, kuidas arvuti lisab sinu "
+#~ "signatuurivõtme kirjale, et saaja võiks kindlaks määrata, kas kiri on "
+#~ "tõepoolest sinult tulnud.\n"
 #~ "<p>\n"
-#~ "Teatud signatuuri algoritmi valik määrab, kui lihtne või raske on kirja võltsida. Siiski peetakse kõiki SPHINX keskkonna pakutavaid algoritme väga turvaliseks. Üldiselt peaks vaikeväärtus siin hästi toimima.\n"
+#~ "Teatud signatuuri algoritmi valik määrab, kui lihtne või raske on kirja "
+#~ "võltsida. Siiski peetakse kõiki SPHINX keskkonna pakutavaid algoritme "
+#~ "väga turvaliseks. Üldiselt peaks vaikeväärtus siin hästi toimima.\n"
 #~ "<p>\n"
-#~ "See on vaikeseadistus, mida on võimalik iga konkreetse kirja puhul muuta.\n"
+#~ "See on vaikeseadistus, mida on võimalik iga konkreetse kirja puhul "
+#~ "muuta.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15682,12 +15387,16 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kirjad salvestatakse signatuuriga</h1>\n"
-#~ "Selle valiku korral salvestatakse saadetud kirjad koos neile kaasatud signatuuriga. See on soovitatav, sest nii saad hiljem kontrollida, kas signeerisid kogu kirja või ainult selle mõne osa.\n"
+#~ "Selle valiku korral salvestatakse saadetud kirjad koos neile kaasatud "
+#~ "signatuuriga. See on soovitatav, sest nii saad hiljem kontrollida, kas "
+#~ "signeerisid kogu kirja või ainult selle mõne osa.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15702,12 +15411,17 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "qt>\n"
 #~ "<h1>Mitmeosaline (Multipart) lahutatud signatuur</h1>\n"
-#~ "Kui see on valitud, on signatuur ja signeeritud andmed Multipart/Signed kirjaosa eraldi osad. Signeeritud kiri on loetav isegi e-posti rakendustega, mis ei toeta signatuuri algoritmi ega ASN.1 dekodeeringut.\n"
+#~ "Kui see on valitud, on signatuur ja signeeritud andmed Multipart/Signed "
+#~ "kirjaosa eraldi osad. Signeeritud kiri on loetav isegi e-posti "
+#~ "rakendustega, mis ei toeta signatuuri algoritmi ega ASN.1 dekodeeringut.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15719,12 +15433,16 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varjatuks signeeritud kirjad</h1>\n"
-#~ "Kui see on valitud, kodeeritakse nii signatuur kui signeeritud andmed ühte ASN.1 blokki. Kirja saab lugeda ainult e-posti rakendusega, mis toetab ASN.1 dekodeeringut.\n"
+#~ "Kui see on valitud, kodeeritakse nii signatuur kui signeeritud andmed "
+#~ "ühte ASN.1 blokki. Kirja saab lugeda ainult e-posti rakendusega, mis "
+#~ "toetab ASN.1 dekodeeringut.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15736,8 +15454,22 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Vali, kui sageli tuleks PIN sisestada"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN-kirje</h1> Siin saab valida, kui tihti tuleb PIN sisestada ligipääsuks sinu isiklikule turvakeskkonnale (PSE), mis sisaldab ka sinu sertifikaate. <p> Mida sagedamini sa PIN-i sisestama pead, seda kaitstum oled kirjade vastu, milles võltsitakse sinu nime, kuid seda ebamugavam on tegutseda. <p> Kui sa ei ole kindel, jäta valik muutmata. <p> Märkus: turvakaalutlustel ei ole PIN-i sisestamist võimalik täiesti välja lülitada. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN-kirje</h1> Siin saab valida, kui tihti tuleb PIN sisestada "
+#~ "ligipääsuks sinu isiklikule turvakeskkonnale (PSE), mis sisaldab ka sinu "
+#~ "sertifikaate. <p> Mida sagedamini sa PIN-i sisestama pead, seda kaitstum "
+#~ "oled kirjade vastu, milles võltsitakse sinu nime, kuid seda ebamugavam on "
+#~ "tegutseda. <p> Kui sa ei ole kindel, jäta valik muutmata. <p> Märkus: "
+#~ "turvakaalutlustel ei ole PIN-i sisestamist võimalik täiesti välja "
+#~ "lülitada. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Üks kord seansi ajal"
@@ -15754,16 +15486,21 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Hoiatus, kui sertifikaat aegub</h1>\n"
-#~ "Selle valiku korral näidatakse sulle hoiatust, kui püüad signeerimiseks kasutada sertifikaati, mis aegub määratud päevade pärast.\n"
+#~ "Selle valiku korral näidatakse sulle hoiatust, kui püüad signeerimiseks "
+#~ "kasutada sertifikaati, mis aegub määratud päevade pärast.\n"
 #~ "<p>\n"
-#~ "Soovitatav on see valik sisse lülitada, et vältida lähitulevikus aeguvate sertifikaatide kasutamist.\n"
+#~ "Soovitatav on see valik sisse lülitada, et vältida lähitulevikus aeguvate "
+#~ "sertifikaatide kasutamist.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15775,14 +15512,16 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Hoiatus, kui signeerija e-posti aadressi ei ole sertifikaadis</h1>\n"
-#~ "Selle valiku korral näidatakse hoiatust, kui signeerimiseks kasutatavas sertifikaadis puudub signeerija e-posti aadress.\n"
+#~ "Selle valiku korral näidatakse hoiatust, kui signeerimiseks kasutatavas "
+#~ "sertifikaadis puudub signeerija e-posti aadress.\n"
 #~ "<p>\n"
 #~ "Maksimaalse ühtluse huvides on soovitatav see valik sisse lülitada.\n"
 #~ "</qt>"
@@ -15821,22 +15560,38 @@ msgstr "Kas kirjutada fail üle?"
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "In a few easy steps, this wizard will help you with the creation of a certificate. You use your certificates in order to sign messages, to encrypt messages and to decrypt messages that other people send to you in encrypted form.\n"
+#~ "In a few easy steps, this wizard will help you with the creation of a "
+#~ "certificate. You use your certificates in order to sign messages, to "
+#~ "encrypt messages and to decrypt messages that other people send to you in "
+#~ "encrypted form.\n"
 #~ "<p>\n"
-#~ "The certificates can either be generated in a centralized or a decentralized manner. Please contact your local help desk if you are unsure how to create a certificate in your organization."
+#~ "The certificates can either be generated in a centralized or a "
+#~ "decentralized manner. Please contact your local help desk if you are "
+#~ "unsure how to create a certificate in your organization."
 #~ msgstr ""
 #~ "<b>Tere tulemast sertifikaadinõustajasse!</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "Mõne lihtsa sammuga aitab nõustaja sul luua sertifikaadi. Sertifikaati saab kasutada kirjade signeerimiseks, krüptimiseks ja nende kirjade lahtikrüptimiseks, mida teised inimesed on sulle krüptitud kujul saatnud.\n"
+#~ "Mõne lihtsa sammuga aitab nõustaja sul luua sertifikaadi. Sertifikaati "
+#~ "saab kasutada kirjade signeerimiseks, krüptimiseks ja nende kirjade "
+#~ "lahtikrüptimiseks, mida teised inimesed on sulle krüptitud kujul "
+#~ "saatnud.\n"
 #~ "<p>\n"
-#~ "Sertifikaate saab genereerida tsentraliseeritud või detsentraliseeritud moel. Palun võta ühendust oma organisatsiooni vastavate isikutega, kui sa ei ole kindel, kuidas sinu organisatsioonis sertifikaate luuakse."
+#~ "Sertifikaate saab genereerida tsentraliseeritud või detsentraliseeritud "
+#~ "moel. Palun võta ühendust oma organisatsiooni vastavate isikutega, kui sa "
+#~ "ei ole kindel, kuidas sinu organisatsioonis sertifikaate luuakse."
 
 #~ msgid "Your Personal Data"
 #~ msgstr "Isiklikud andmed"
 
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "Sellel leheküljel tuleb sisestada mõned isikuandmed, mis salvestatakse sertifikaati ja aitavad teistel inimestel kindlaks teha, et see oled just sina, kes on kirja saatnud."
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "Sellel leheküljel tuleb sisestada mõned isikuandmed, mis salvestatakse "
+#~ "sertifikaati ja aitavad teistel inimestel kindlaks teha, et see oled just "
+#~ "sina, kes on kirja saatnud."
 
 #~ msgid "Enter your name here"
 #~ msgstr "Sisesta siia oma nimi"
@@ -15847,8 +15602,12 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid "Enter your organization here"
 #~ msgstr "Sisesta siia oma organisatsioon"
 
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
-#~ msgstr "Sisesta siia oma organisatsioon (nt firma, osakond või amet) sellisel kujul, nagu see peab esinema sertifikaadis."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
+#~ msgstr ""
+#~ "Sisesta siia oma organisatsioon (nt firma, osakond või amet) sellisel "
+#~ "kujul, nagu see peab esinema sertifikaadis."
 
 #~ msgid "&Department:"
 #~ msgstr "&Allüksus:"
@@ -15859,8 +15618,14 @@ msgstr "Kas kirjutada fail üle?"
 #~ msgid "Certificate Generation"
 #~ msgstr "Sertifikaadi genereerimine"
 
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "Sellel leheküljel saab valida, kas sertifikaat genereerida tsentraliseeritult või detsentraliseeritult. Kui sa ei ole kindel, konsulteeri palun oma organisatsiooni vastavate isikutega."
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "Sellel leheküljel saab valida, kas sertifikaat genereerida "
+#~ "tsentraliseeritult või detsentraliseeritult. Kui sa ei ole kindel, "
+#~ "konsulteeri palun oma organisatsiooni vastavate isikutega."
 
 #~ msgid "Certificate &Generation"
 #~ msgstr "Sertifikaadi &genereerimine"
@@ -15876,13 +15641,23 @@ msgstr "Kas kirjutada fail üle?"
 
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "Sinu signatuuri võtmepaar on nüüd valmis saatmiseks SK-le (sertifitseerimiskeskusele), mis genereerib sinu jaoks sertifikaadi ja saadab selle e-postiga tagasi. Palun vaata allpool olev sertifikaat veel üle. Sa võid ka kirja panna kontrollsumma, mis lubab SK-lt tagasi saadud sertifikaati kontrollida.\n"
+#~ "Sinu signatuuri võtmepaar on nüüd valmis saatmiseks SK-le "
+#~ "(sertifitseerimiskeskusele), mis genereerib sinu jaoks sertifikaadi ja "
+#~ "saadab selle e-postiga tagasi. Palun vaata allpool olev sertifikaat veel "
+#~ "üle. Sa võid ka kirja panna kontrollsumma, mis lubab SK-lt tagasi saadud "
+#~ "sertifikaati kontrollida.\n"
 #~ "<p>\n"
-#~ "Kui soovid midagi muuta, vajuta 'Tagasi' ja soorita vajalikud muutused. Vastasel juhul vajuta 'Lõpeta', et saata signatuuri võtmepaar SK-le.\n"
+#~ "Kui soovid midagi muuta, vajuta 'Tagasi' ja soorita vajalikud muutused. "
+#~ "Vastasel juhul vajuta 'Lõpeta', et saata signatuuri võtmepaar SK-le.\n"
 #~ "</qt>"
diff --git a/tde-i18n-eu/messages/tdepim/kmail.po b/tde-i18n-eu/messages/tdepim/kmail.po
index 6c2a7c9e185..c0333e18e20 100644
--- a/tde-i18n-eu/messages/tdepim/kmail.po
+++ b/tde-i18n-eu/messages/tdepim/kmail.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-01-23 00:46+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -30,7 +30,7 @@ msgstr ""
 "Ion Gaztañaga\n"
 "Iñaki Larrañaga Murgoitio"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -180,6 +180,12 @@ msgstr "Ba&t ere ez (kontuz erabili)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Baliabide-kudeaketa semiautomatikoaren kontua"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Garbitu iragana"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -255,12 +261,12 @@ msgstr "&Erabiltzaile-izena:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Zure interneteko zerbitzuen hornitzaileak <em>erabiltzaile-izena</em> "
-"eman dizu bere zerbitzariekin autentifikatzeko. Zure helbide elektronikoaren "
+"Zure interneteko zerbitzuen hornitzaileak <em>erabiltzaile-izena</em> eman "
+"dizu bere zerbitzariekin autentifikatzeko. Zure helbide elektronikoaren "
 "aurrenekoa zatia izan ohi da (<em>@</em> ikurraren aurrekoa)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -282,19 +288,18 @@ msgstr "Gord&e POP pasahitza"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Gaitu aukera hau KMail-ek pasahitza gordetzeko.\n"
 "TDEWallet eskuragarri badago han gordeko da, segurutzat jotzen baita.\n"
-"Hala ere, TDEWallet eskuragarri ez badago, pasahitza KMail-en "
-"konfigurazio-fitxategian gordeko da. Pasahitza nahastutako formatu batean "
-"gordeko da baina ez da segurutzat hartu behar norbaitek fitxategia eskuratzen "
-"badu."
+"Hala ere, TDEWallet eskuragarri ez badago, pasahitza KMail-en konfigurazio-"
+"fitxategian gordeko da. Pasahitza nahastutako formatu batean gordeko da "
+"baina ez da segurutzat hartu behar norbaitek fitxategia eskuratzen badu."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -322,11 +327,12 @@ msgstr "&Iragazi mezuak hau baino handiagoak badira"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Hau hautatzen baduzu, POP iragazkiak erabiliko dira mezuekin zer egin behar den "
-"erabakitzeko. Deskargatu, ezabatu edo zerbitzarian mantendu ditzakezu."
+"Hau hautatzen baduzu, POP iragazkiak erabiliko dira mezuekin zer egin behar "
+"den erabakitzeko. Deskargatu, ezabatu edo zerbitzarian mantendu ditzakezu."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -375,13 +381,15 @@ msgstr "Testu &garbia"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -424,9 +432,9 @@ msgstr "Izen-lekuak:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Hemen IMAP zerbitzariak onartzen dituen izen-leku ezberdinak ikus ditzakezu. "
 "Izen-leku bakoitzak karpeta-taldeak bereizten dituen aurrizki bat adierazten "
@@ -490,9 +498,9 @@ msgstr "Kargatu era&nskinak eskatzean"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Aktibatu hau posta hautatzean eranskinak automatikoki ez kargatzeko, "
 "eranskinetan klik egitean baizik. Honela, posta handiak berehala bistaratuko "
@@ -507,8 +515,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Karpeta-zuhaitzean zabalduta dauden karpeten azpikarpetak bakarrik egiaztatzen "
-"dira. Erabili hau zerbitzarian karpeta asko badaude."
+"Karpeta-zuhaitzean zabalduta dauden karpeten azpikarpetak bakarrik "
+"egiaztatzen dira. Erabili hau zerbitzarian karpeta asko badaude."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -536,7 +544,7 @@ msgstr "<bat ere ez>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "sarrerako ontzia"
 
@@ -544,36 +552,37 @@ msgstr "sarrerako ontzia"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Badirudi zerbitzariak ez dituela mezu-zenbaki bakarrak onartzen baina hau "
 "mezuak zerbitzarian uzteko beharrezkoa da.\n"
-"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik mezuak "
-"zerbitzarian uztea aktiba dezakezu zorterik duzun ikusteko."
+"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik "
+"mezuak zerbitzarian uztea aktiba dezakezu zorterik duzun ikusteko."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Badirudi zerbitzariak ez duela mezuen goiburuak bakarrik eskuratzea onartzen "
 "baina hau zerbitzarian mezuak iragazteko beharrezkoa da.\n"
-"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik mezuak "
-"zerbitzarian iragaztea aktiba dezakezu zorterik duzun ikusteko."
+"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik "
+"mezuak zerbitzarian iragaztea aktiba dezakezu zorterik duzun ikusteko."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Kontuan izan funtzionalitate honek paralelismoa onartzen ez duten POP3 "
 "zerbitzariek mezu hondatuak bidaltzea sor dezakeela.\n"
@@ -591,14 +600,14 @@ msgstr "Aurrenik fitxa orokorrean zehaztu zerbitzaria eta ataka."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Badirudi zerbitzariak ez duela paralelismoa onartzen, beraz, aukera hau "
 "desgaitu da.\n"
@@ -610,29 +619,30 @@ msgstr ""
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Badirudi zerbitzariak ez dituela mezu-zenbaki bakarrak onartzen baina hau "
 "mezuak zerbitzarian uzteko beharrezkoa da. Beraz, aukera hau desgaitu da.\n"
-"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik mezuak "
-"zerbitzarian uztea aktiba dezakezu zorterik duzun ikusteko."
+"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik "
+"mezuak zerbitzarian uztea aktiba dezakezu zorterik duzun ikusteko."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Badirudi zerbitzariak ez duela mezuen goiburuak bakarrik eskuratzea onartzen "
 "baina hau zerbitzarian mezuak iragazteko beharrezkoa da. Beraz, aukera hau "
 "desgaitu da.\n"
-"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik mezuak "
-"zerbitzarian iragaztea aktibatzeko aukera duzu zorterik duzun ikusteko."
+"Zerbitzari batzuk bere funtzioak gaizki kaleratzen dituztenez oraindik "
+"mezuak zerbitzarian iragaztea aktibatzeko aukera duzu zorterik duzun "
+"ikusteko."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -712,8 +722,8 @@ msgstr "IMAP kontua"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "Gehitu kontu bat ezarpenen sareko atalean postak jasotzeko."
 
 #: accountwizard.cpp:87
@@ -750,13 +760,13 @@ msgstr "Ongi etorri KMail-era"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Badirudi KMail lehen aldiz abiatu duzula. Morroi hau erabil dezakezu zure "
-"posta-kontuak konfiguratzeko. Hornitzaileak emandako konexio-datuak idatzi "
-"ondoko orrietan.</qt>"
+"<qt>Badirudi KMail lehen aldiz abiatu duzula. Morroi hau erabil dezakezu "
+"zure posta-kontuak konfiguratzeko. Hornitzaileak emandako konexio-datuak "
+"idatzi ondoko orrietan.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -818,8 +828,7 @@ msgstr "Erabili banaketa lokala"
 msgid "Server Information"
 msgstr "Zerbitzariaren informazioa"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Bat ere ez"
@@ -940,8 +949,8 @@ msgstr "<br>Mezu baztergarriak ez dira karpeta zehatz batera mugituko.<i>"
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>Zalantzazkoak (ziurrenik baztergarriak direnak) bezala sailkatutako mezuen "
-"karpeta hau da: <i>"
+"<p>Zalantzazkoak (ziurrenik baztergarriak direnak) bezala sailkatutako "
+"mezuen karpeta hau da: <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -961,26 +970,24 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p> Hemen laguntza lor dezakezu KMail-en iragazki-arauak konfiguratu eta "
-"antibirus tresna ezagunenak erabiltzeko.</p>"
-"<p>Morroiak tresna hauek detekta ditzake ordenagailuan eta mezuak iragazteko "
-"arauak sor ditzake. Morroiak ez ditu ezarrita dauden iragazki-arauak kontuan "
-"hartuko: beti arau berriak gehituko ditu.</p>"
-"<p><b>Abisua:</b> KMail blokeatu egiten bada birusen bila, anti-birus tresnen "
-"eragiketak oso pisutsuak direlako da. Morroiak sortutako iragazki-arauak ezaba "
-"itzazu aurreko portaera errekuperatzeko."
+"antibirus tresna ezagunenak erabiltzeko.</p><p>Morroiak tresna hauek detekta "
+"ditzake ordenagailuan eta mezuak iragazteko arauak sor ditzake. Morroiak ez "
+"ditu ezarrita dauden iragazki-arauak kontuan hartuko: beti arau berriak "
+"gehituko ditu.</p><p><b>Abisua:</b> KMail blokeatu egiten bada birusen bila, "
+"anti-birus tresnen eragiketak oso pisutsuak direlako da. Morroiak sortutako "
+"iragazki-arauak ezaba itzazu aurreko portaera errekuperatzeko."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -988,7 +995,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Hautatu tresnak mezu baztergarriak detektatzeko eta joan hurrengo orrira.</p>"
+"<p>Hautatu tresnak mezu baztergarriak detektatzeko eta joan hurrengo orrira."
+"</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1016,15 +1024,13 @@ msgstr "Eraman &zalantzazko baztergarriak hona:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"Karpeta lehenetsia sarrerako karpeta da, baina beheko karpeten ikuspegian alda "
-"dezakezu. "
-"<p>Tresna guztiek ez dute zalantzako sailkapena onartzen. Hau onartzen ez duen "
-"tresna hautatu baduzu, ezingo duzu karpeta hautatu."
+"Karpeta lehenetsia sarrerako karpeta da, baina beheko karpeten ikuspegian "
+"alda dezakezu. <p>Tresna guztiek ez dute zalantzako sailkapena onartzen. Hau "
+"onartzen ez duen tresna hautatu baduzu, ezingo duzu karpeta hautatu."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1034,13 +1040,13 @@ msgstr "Egiaztatu mezuak antibirusen tresnak erabiliz"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Baimendu antibirus tresnei mezuak klasifikatzea. Morroiak iragazki egokiak "
-"sortuko ditu. Normalean tresnek markatuko dituzte mezuak, ondorengo iragazkiek "
-"neurriak hartu eta, adibidez, birusdun mezuak karpeta berezi batera mugi "
-"ditzaten."
+"sortuko ditu. Normalean tresnek markatuko dituzte mezuak, ondorengo "
+"iragazkiek neurriak hartu eta, adibidez, birusdun mezuak karpeta berezi "
+"batera mugi ditzaten."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1049,8 +1055,8 @@ msgstr "Eraman kutsatutako mezuak hautatutako karpetara"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Iragazkia sortu da birusak duten mezuak detektatzeko eta mezu horiek aurrez "
 "definitutako karpetara eramateko. Karpeta lehenetsia zakarrontzia den arren, "
@@ -1062,8 +1068,8 @@ msgstr "Gainera, markatu detektatutako birusdun mezuak irakurrita gisa"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Birusdun gisa sailkatutako mezuak markatu irakurrita bezala eta eraman "
 "hautatutako karpetara."
@@ -1260,8 +1266,8 @@ msgstr "Errorea zerbitzariko %1 karpeta irakurtzean: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1281,8 +1287,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1313,21 +1319,20 @@ msgstr "Ezabatuta"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Zure identitatetariko bat ere ez dator bat mezuko hartzailearekin."
 "<br>Aukeratu honako helbideetarikoetatik zein den zurea:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Zure identitateetariko bat baino gehiago dator bat mezuaren "
-"hartzailearekin."
-"<br>Aukeratu honako helbideetarikoetatik zein den zurea:"
+"hartzailearekin.<br>Aukeratu honako helbideetarikoetatik zein den zurea:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1356,18 +1361,21 @@ msgstr "Errorea \"%1\" trinkotzean. Trinkotzea abortatuta."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ezapen hau administratzaileak konpondu du.</p>"
-"<p>Errorea dela pentsatzen baduzu, jar zaitez berarekin harremanetan.</p></qt>"
+"<qt><p>Ezapen hau administratzaileak konpondu du.</p><p>Errorea dela "
+"pentsatzen baduzu, jar zaitez berarekin harremanetan.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Kargatu profila..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Konfiguratu KMail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Gehitu..."
@@ -1397,6 +1405,11 @@ msgstr "<qt>Benetan ezabatu nahi duzu <b>%1</b> identitatea?</qt>"
 msgid "Remove Identity"
 msgstr "Kendu identitatea"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Kendu"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Gehitu..."
@@ -1405,6 +1418,11 @@ msgstr "Gehitu..."
 msgid "Modify..."
 msgstr "Aldatu..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Kendu"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Ezarri lehenetsi gisa"
@@ -1421,17 +1439,15 @@ msgstr "&Bidali"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Irteerako kontuak (gehitu bat bederen):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Izena"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Mota"
@@ -1453,8 +1469,7 @@ msgstr "Ezarri lehenetsia"
 msgid "Common Options"
 msgstr "Aukera komunak"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Baieztatu bidali &aurretik"
@@ -1505,17 +1520,16 @@ msgstr "Domeinu le&henetsia:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Domeinu lehenetsia erabiliko da erabiltzailearen izena bakarrik duten "
+"<qt><p>Domeinu lehenetsia erabiliko da erabiltzailearen izena bakarrik duten "
 "helbide elektronikoak osatzeko.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1533,9 +1547,9 @@ msgstr "Gehitu garraioa"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Lehenetsia)"
 
@@ -1618,6 +1632,10 @@ msgstr "Aldatu kontua"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ezin da <b>%1</b> kontua aurkitu.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "K&oloreak"
@@ -1726,8 +1744,7 @@ msgstr "Jarraitutako esteka"
 msgid "Misspelled Words"
 msgstr "Gaizki idatzitako hitzak"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Mezu berria"
@@ -1916,8 +1933,8 @@ msgstr "Lehenetsiz itxi hariak"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Mezu &berriak, irakurri gabekoak edo garrantzitsuak dituen hariak ireki eta "
 "irakurritako hariak."
@@ -1928,67 +1945,54 @@ msgstr "Data bistaratzea"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Honako adierazpenak erabil daitezke datarentzat:</strong></p>"
-"<ul>"
-"<li>d - eguna zenbaki bezala hasierako  gabe (1-31)</li>"
-"<li>dd - eguna zenbaki bezala hasierako zeroa duela (01-31)</li>"
-"<li>ddd - laburtutako egunaren izena (Al - Ig)</li>"
-"<li>dddd - egunaren izen luzea (Astelehena - Igandea)</li>"
-"<li>M - hilabetea hasierako zerorik gabe (1-12)</li>"
-"<li>MM - hilabetea hasierako zeroa duela (01-12)</li>"
-"<li>MMM - laburtutako hilabetearen izena (Urt - Abe)</li>"
-"<li>MMMM - hilabetearen izen luzea (Urtarrila - Abendua)</li>"
-"<li>yy - urtea bi digituko zenbaki bezala (00-99)</li>"
-"<li>yyyy - urtea lau digituko zenbaki bezala (0000-9999)</li></ul>"
-"<p><strong>Honako adierazpenak erabili daitezke orduarentzat:</string></p> "
-"<ul>"
-"<li>h - ordua hasierako zerorik gabe (0-23 edo 1-12 AM/PM bistaratzean)</li>"
-"<li>hh - ordua hasierako zeroarekin (00-23 edo 01-12 AM/PM bistaratzean)</li>"
-"<li>m - minutuak hasierako zeroarekin (0-59)</li>"
-"<li>mm - minutuak hasierako zeroarekin (00-59)</li>"
-"<li>s - segunduak hasierako zerorik gabe (0-59)</li>"
-"<li>ss - segunduak hasierako zeroarekin (00-59)</li>"
-"<li>z - milisegunduak hasierako zerorik gabe (0-999)</li>"
-"<li>zzz - milisegunduak hasierako zeroekin (000-999)</li>"
-"<li>AP - aldatu AM/PM modura. AP \"AM\" edo \"PM\"-rekin ordezkatuko da.</li>"
-"<li>ap - aldatu AM/PM modura. ap \"am\" edo \"pm\"-rekin ordezkatuko da.</li>"
-"<li>Z - ordu-zona era numerikoan (-0500)</li></ul>"
-"<p><strong>Beste sarrerako karaktereei ez ikusia egingo zaie.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Honako adierazpenak erabil daitezke datarentzat:</strong></"
+"p><ul><li>d - eguna zenbaki bezala hasierako  gabe (1-31)</li><li>dd - eguna "
+"zenbaki bezala hasierako zeroa duela (01-31)</li><li>ddd - laburtutako "
+"egunaren izena (Al - Ig)</li><li>dddd - egunaren izen luzea (Astelehena - "
+"Igandea)</li><li>M - hilabetea hasierako zerorik gabe (1-12)</li><li>MM - "
+"hilabetea hasierako zeroa duela (01-12)</li><li>MMM - laburtutako "
+"hilabetearen izena (Urt - Abe)</li><li>MMMM - hilabetearen izen luzea "
+"(Urtarrila - Abendua)</li><li>yy - urtea bi digituko zenbaki bezala (00-99)</"
+"li><li>yyyy - urtea lau digituko zenbaki bezala (0000-9999)</li></"
+"ul><p><strong>Honako adierazpenak erabili daitezke orduarentzat:</string></"
+"p> <ul><li>h - ordua hasierako zerorik gabe (0-23 edo 1-12 AM/PM "
+"bistaratzean)</li><li>hh - ordua hasierako zeroarekin (00-23 edo 01-12 AM/PM "
+"bistaratzean)</li><li>m - minutuak hasierako zeroarekin (0-59)</li><li>mm - "
+"minutuak hasierako zeroarekin (00-59)</li><li>s - segunduak hasierako "
+"zerorik gabe (0-59)</li><li>ss - segunduak hasierako zeroarekin (00-59)</"
+"li><li>z - milisegunduak hasierako zerorik gabe (0-999)</li><li>zzz - "
+"milisegunduak hasierako zeroekin (000-999)</li><li>AP - aldatu AM/PM modura. "
+"AP \"AM\" edo \"PM\"-rekin ordezkatuko da.</li><li>ap - aldatu AM/PM modura. "
+"ap \"am\" edo \"pm\"-rekin ordezkatuko da.</li><li>Z - ordu-zona era "
+"numerikoan (-0500)</li></ul><p><strong>Beste sarrerako karaktereei ez ikusia "
+"egingo zaie.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Karpeten balio zehatzak gainidatzi egingo dira ezarpen globalak aldatzean."
 
@@ -2004,8 +2008,7 @@ msgstr "Erakutsi HTMLren e&goera-barra"
 msgid "Show s&pam status in fancy headers"
 msgstr "Erakutsi &baztergarrien egoera goiburu dotoreetan"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Ordeztu aurpegierak emotikonoekin"
@@ -2014,8 +2017,7 @@ msgstr "Ordeztu aurpegierak emotikonoekin"
 msgid "Use smaller font for quoted text"
 msgstr "Erabili letra-tipo txikiagoa aipamenetan"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Erakutsi zabaldu/tolestu aipamen-markak"
@@ -2041,8 +2043,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Gainezarri karaktereen kodeketa:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Gaitu sistema-erretiluaren ikonoa"
@@ -2146,23 +2147,19 @@ msgstr "<b>%f</b> editatzeko ordeztuko da fitxategi-izenarekin."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Ondorengo leku-markak onartzen dira erantzuneko esaldietan:"
-"<br><b>%D</b>: data, <b>%S</b>: gaia,"
-"<br><b>%e</b>: bildatzailearen helbidea, <b>%F</b>: bidaltzailearen izena, <b>"
-"%f</b>: bidaltzailearen inizialak,"
-"<br><b>%T</b>: hartzailearen izena, <b>%t</b>: hartzailearen izena eta "
-"helbidea,"
-"<br><b>%C</b>: kopien izenak, <b>%c</b>: kopien izenak eta helbideak,"
-"<br><b>%%</b>: portzentaiaren zeinua, <b>%_</b>: tartea, <b>%L</b>"
-": lerro-jauziak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Ondorengo leku-markak onartzen dira erantzuneko esaldietan:<br><b>%D</"
+"b>: data, <b>%S</b>: gaia,<br><b>%e</b>: bildatzailearen helbidea, <b>%F</"
+"b>: bidaltzailearen izena, <b>%f</b>: bidaltzailearen inizialak,<br><b>%T</"
+"b>: hartzailearen izena, <b>%t</b>: hartzailearen izena eta helbidea,<br><b>"
+"%C</b>: kopien izenak, <b>%c</b>: kopien izenak eta helbideak,<br><b>%%</b>: "
+"portzentaiaren zeinua, <b>%_</b>: tartea, <b>%L</b>: lerro-jauziak</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2185,21 +2182,20 @@ msgstr "Erantzun &denei:"
 msgid "&Forward:"
 msgstr "&Birbidali:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Aipamen-adierazlea:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D(e)an, idatzi zenuen:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D(e)an, %F(e)k idatzi zuen:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Birbidalitako mezua"
 
@@ -2237,8 +2233,8 @@ msgstr "Sartu birbidalitako mezuen aurrizki berria:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Zerrenda hau irteerako mezu bakoitzarentzat egiaztatuko da goitik behera "
 "beharrezko karaktere guztiak dituen karaktere-multzo baten bila."
@@ -2250,8 +2246,8 @@ msgstr "Sartu karaktere-multzoa:"
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"&Mantendu jatorrizko karaktere-multzoa erantzutean edo birbidaltzean (posiblea "
-"bada)"
+"&Mantendu jatorrizko karaktere-multzoa erantzutean edo birbidaltzean "
+"(posiblea bada)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2277,10 +2273,9 @@ msgstr "Balioa"
 msgid "Ne&w"
 msgstr "Berr&ia"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Izena:"
@@ -2289,16 +2284,15 @@ msgstr "&Izena:"
 msgid "&Value:"
 msgstr "&Balioa:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-ekin bateragarria den eranskin izendapena"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Aktibatu aukera hau eranskinen izenek dituzten ingelesekoak ez diren "
 "karaktereak Outlook(tm)-ek uler ditzan"
@@ -2327,16 +2321,16 @@ msgstr "erantsita"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"Ingeleseko karaktereak ez dituzten eraskin-izenak Outlook(tm)-ek ulertzen duen "
-"eta beste bezeroek onartzen ez duten moduan kodetuko dira.\n"
+"Ingeleseko karaktereak ez dituzten eraskin-izenak Outlook(tm)-ek ulertzen "
+"duen eta beste bezeroek onartzen ez duten moduan kodetuko dira.\n"
 "KMail-ek mezu ez-estandarrak sor ditzakeen arren  aukera hau ez erabiltzea "
 "gomendatzen da."
 
@@ -2362,110 +2356,96 @@ msgstr "Kriptografia eu&skarriak"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mezuak batzutan bi formatutan etor daitezke. Aukera honek HTML edo testu "
-"soileko zatia bistaratuko den kontrolatzen du.</p>"
-"<p>HTML zatia bistaratzean mezuak itxura dotoreagoa du, baina segurtasun zuloen "
-"probabilitatea handiagotzen da.</p>"
-"<p>Testu soila bistaratzean mezuaren formatua asko galtzen da baina ia <em>"
-"ezinezkoa</em> da HTML errendatzailearen  (Konqueror-en) segurtasun zuloak "
-"erabiltzea.</p>"
-"<p>Beheko aukerak HTML mezuen erabilera txarraren aurka babesten duen arren, "
-"ezin du KMail-en bertsio hau garatu zenetik gaur egunera dauden segurtasun "
-"zuloen aurka babestu.</p>"
-"<p>Beraz gomendagarriena testu arrunta erabiltzea da.</p>"
-"<p><b>Oharra:</b> aukera hau karpeta bakoitzean hauta dezakezu KMail-en lehio "
-"nagusiko <i>Karpeta</i> menuan.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Mezuak batzutan bi formatutan etor daitezke. Aukera honek HTML edo "
+"testu soileko zatia bistaratuko den kontrolatzen du.</p><p>HTML zatia "
+"bistaratzean mezuak itxura dotoreagoa du, baina segurtasun zuloen "
+"probabilitatea handiagotzen da.</p><p>Testu soila bistaratzean mezuaren "
+"formatua asko galtzen da baina ia <em>ezinezkoa</em> da HTML "
+"errendatzailearen  (Konqueror-en) segurtasun zuloak erabiltzea.</p><p>Beheko "
+"aukerak HTML mezuen erabilera txarraren aurka babesten duen arren, ezin du "
+"KMail-en bertsio hau garatu zenetik gaur egunera dauden segurtasun zuloen "
+"aurka babestu.</p><p>Beraz gomendagarriena testu arrunta erabiltzea da.</"
+"p><p><b>Oharra:</b> aukera hau karpeta bakoitzean hauta dezakezu KMail-en "
+"lehio nagusiko <i>Karpeta</i> menuan.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Zenbait iragarki HTML-n daude eta kanpoko irudi batzuen erreferentziak izan "
-"ditzake. Hau iragarkia irakurri duzun jakiteko erabil dezakete.</p>"
-"<p>Ez dago arrazoirik hau bezalako irudiak kargatzeko, bidaltzaileak irudiak "
-"mezuarekin batera bidal ditzakeelako.</p>"
-"<p>KMail-en hau ekiditeko, aukera hau <em>desgaituta</em> dago lehenespenez.</p>"
-"<p>Hala ere, HTML mezuetan erantsi gabeko  irudiak ikusi nahi badituzu, gaitu "
-"aukera hau, baina kontuz ibili aipatutako arazoekin.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Zenbait iragarki HTML-n daude eta kanpoko irudi batzuen "
+"erreferentziak izan ditzake. Hau iragarkia irakurri duzun jakiteko erabil "
+"dezakete.</p><p>Ez dago arrazoirik hau bezalako irudiak kargatzeko, "
+"bidaltzaileak irudiak mezuarekin batera bidal ditzakeelako.</p><p>KMail-en "
+"hau ekiditeko, aukera hau <em>desgaituta</em> dago lehenespenez.</p><p>Hala "
+"ere, HTML mezuetan erantsi gabeko  irudiak ikusi nahi badituzu, gaitu aukera "
+"hau, baina kontuz ibili aipatutako arazoekin.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Mezuak eskuratzearen jakinarazpenaren politika</h3>"
-"<p><b>Irakurragiri</b> bezala ezagutzen denaren orokortzeak dira \"Mezuak "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Mezuak eskuratzearen jakinarazpenaren politika</"
+"h3><p><b>Irakurragiri</b> bezala ezagutzen denaren orokortzeak dira \"Mezuak "
 "eskuratzearen jakinarazpenak\". Mezuaren egileak eskuratzearen jakinarazpena "
 "bidaltzea eskatzen du eta hartzailearen posta-programak erantzuna sortzen du "
-"egileak bere mezuarekin zer gertatu den jakin dezan. Eskuratze-motak hauek izan "
-"daitezke: <b>bistaratua</b> (hau da, irakurria), <b>ezabatua</b> eta <b>"
-"banatua</b> (adibidez birbidalia).</p>"
-"<p>Ondorengo aukerak daude eskuragarri KMail-en eskuratzearen jakinarazpenak "
-"bidaltzean:</p>"
-"<ul>"
-"<li><em>Ez ikusi egin</em>: ez ikusia egiten die eskuratzearen jakinarazpenei. "
-"Ez dira jakinarazpenak automatikoki bidaliko (gomendatua).</li>"
-"<li><em>Galdetu</em>: erabiltzaileari baimena eskatu ondoren jakinarazpenak "
-"bidaltzen ditu. Honela, hautatutako mezuen jakinarazpenak bidal ditzakezu, "
-"beste batzuei ez ikusia eginez.</li>"
-"<li><em>Ukatu</em>: beti <b>ukatua</b> jakinarazpena bidaltzen du. Hau "
-"jakinarazpenak beti bidaltzea baina <em>apur bat</em> "
-"hobeagoa da. Egileak mezua iritsi dela jakingo du, baina ezin du jakin mezua "
-"ezabatu edo irakurri den.</li>"
-"<li><em>Bidali beti</em>: eskatutako eskuratzearen jakinarazpena beti bidaltzen "
-"du. Honek mezuaren egileak mezua noiz iritsi den eta mezuarekin zer gertatu den "
-"jakin dezake (bistaratua, ezabatua, etb.). Aukera hau ez da gomendatzen, baina "
-"zentzua du erlazio komertzialen kudeaketan, eta beraz, eskuragarri dago.</li>"
-"</ul></qt> "
+"egileak bere mezuarekin zer gertatu den jakin dezan. Eskuratze-motak hauek "
+"izan daitezke: <b>bistaratua</b> (hau da, irakurria), <b>ezabatua</b> eta "
+"<b>banatua</b> (adibidez birbidalia).</p><p>Ondorengo aukerak daude "
+"eskuragarri KMail-en eskuratzearen jakinarazpenak bidaltzean:</"
+"p><ul><li><em>Ez ikusi egin</em>: ez ikusia egiten die eskuratzearen "
+"jakinarazpenei. Ez dira jakinarazpenak automatikoki bidaliko (gomendatua).</"
+"li><li><em>Galdetu</em>: erabiltzaileari baimena eskatu ondoren "
+"jakinarazpenak bidaltzen ditu. Honela, hautatutako mezuen jakinarazpenak "
+"bidal ditzakezu, beste batzuei ez ikusia eginez.</li><li><em>Ukatu</em>: "
+"beti <b>ukatua</b> jakinarazpena bidaltzen du. Hau jakinarazpenak beti "
+"bidaltzea baina <em>apur bat</em> hobeagoa da. Egileak mezua iritsi dela "
+"jakingo du, baina ezin du jakin mezua ezabatu edo irakurri den.</"
+"li><li><em>Bidali beti</em>: eskatutako eskuratzearen jakinarazpena beti "
+"bidaltzen du. Honek mezuaren egileak mezua noiz iritsi den eta mezuarekin "
+"zer gertatu den jakin dezake (bistaratua, ezabatua, etb.). Aukera hau ez da "
+"gomendatzen, baina zentzua du erlazio komertzialen kudeaketan, eta beraz, "
+"eskuragarri dago.</li></ul></qt> "
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2481,14 +2461,14 @@ msgstr "Internetetik &kanpoko erreferentziak kargatzen dituzten mezuak gaitu"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ABISUA:</b> mezuan HTML baimentzean sistemaren segurtasuna murriztuko duzu. "
-"<a href=\"whatsthis:%1\">HTML postei buruz...</a> <a href=\"whatsthis:%2\">"
-"Kanpoko erreferentziei buruz...</a>"
+"<b>ABISUA:</b> mezuan HTML baimentzean sistemaren segurtasuna murriztuko "
+"duzu. <a href=\"whatsthis:%1\">HTML postei buruz...</a> <a href=\"whatsthis:"
+"%2\">Kanpoko erreferentziei buruz...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2571,8 +2551,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Aukera honek dirmngr >= 0.9.0 behar du"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "proxyrik ez"
@@ -2601,8 +2580,8 @@ msgstr "Ez &iraungitu mezu garrantzitsuak"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Irakurri gabeko mezuak bilatzean:"
 
@@ -2626,8 +2605,8 @@ msgstr "Begiztatu karpeta denetan"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Karpeta batean sartzean:"
 
@@ -2696,27 +2675,23 @@ msgstr "Direktorioak (\"maildir\" formatua)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Honek karpeta lokaletan zein postontzi-formatu lehenetsi erabiliko den "
-"hautatzen du:</p>"
-"<p><b>mbox:</b>KMail-en posta-karpetak fitxategi batekin adierazten dira. Mezu "
-"bakoitza beste batetik \"Nork\" (From) hitzarekin hasten den lerro batekin "
-"bereizten dira. Honek lekua aurrezten du diskoan baina ez da segurua, adibidez, "
-"mezuak karpeten artean eramatean.</p>"
-"<p><b>maildir:</b>KMail-en karpetak karpeta errealekin adierazten dira diskoan, "
-"Mezua bakoitza fitxategi batean gordetzen da. Honek leku gehiago behar du, "
-"baina seguruagoa da.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Honek karpeta lokaletan zein postontzi-formatu lehenetsi erabiliko "
+"den hautatzen du:</p><p><b>mbox:</b>KMail-en posta-karpetak fitxategi "
+"batekin adierazten dira. Mezu bakoitza beste batetik \"Nork\" (From) "
+"hitzarekin hasten den lerro batekin bereizten dira. Honek lekua aurrezten du "
+"diskoan baina ez da segurua, adibidez, mezuak karpeten artean eramatean.</"
+"p><p><b>maildir:</b>KMail-en karpetak karpeta errealekin adierazten dira "
+"diskoan, Mezua bakoitza fitxategi batean gordetzen da. Honek leku gehiago "
+"behar du, baina seguruagoa da.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2751,53 +2726,44 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hurrengo irakurri gabeko mezura joatean, uneko mezuaren azpian irakurri "
-"gabeko mezurik ez egotea gerta daiteke.</p>"
-"<p><b>Begiztarik ez:</b> bilaketa uneko karpetako azken mezuan geldituko da "
-".</p>"
-"<p><b>Begizta uneko karpetan:</b> bilaketak mezu-zerrendaren goiko aldean "
-"jarraituko du baina ez da beste karpeta baten bilatuko.</p>"
-"<p><b>Begizta karpeta guztietan:</b> bilaketak jarraitu egingo du "
-"mezu-zerrendaren goiko aldean. Irakurri gabeko mezurik aurkitzen ez bada "
-"hurrengo karpetan jarraituko du.</p>"
-"<p>Honen antzera aurreko irakurri gabeko mezua bilatzean, bilaketa "
-"mezu-zerrendaren azpiko aldean hasiko da eta aurreko karpetan jarraituko du "
-"hautatutako aukeraren arabera.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Hurrengo irakurri gabeko mezura joatean, uneko mezuaren azpian "
+"irakurri gabeko mezurik ez egotea gerta daiteke.</p><p><b>Begiztarik ez:</b> "
+"bilaketa uneko karpetako azken mezuan geldituko da .</p><p><b>Begizta uneko "
+"karpetan:</b> bilaketak mezu-zerrendaren goiko aldean jarraituko du baina ez "
+"da beste karpeta baten bilatuko.</p><p><b>Begizta karpeta guztietan:</b> "
+"bilaketak jarraitu egingo du mezu-zerrendaren goiko aldean. Irakurri gabeko "
+"mezurik aurkitzen ez bada hurrengo karpetan jarraituko du.</p><p>Honen "
+"antzera aurreko irakurri gabeko mezua bilatzean, bilaketa mezu-zerrendaren "
+"azpiko aldean hasiko da eta aurreko karpetan jarraituko du hautatutako "
+"aukeraren arabera.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Testuaren indexazio osoak mezuen bilaketa azkarra gaitzen du. Aktibatzean, "
-"bilaketarako elkarrizketak oso azkar funtzionatuko du. Gainera, bilaketarako "
-"tresna-barrak edukinetan oinarritutako mezuak hautatuko ditu.</p>"
-"<p>Diskoan lekua behar du honek (mezuen tamainaren erdia, gutxi-gorabehera).</p>"
-"<p>Gaitu ondoren, indizea eraiki behar da, baina KMail erabiltzen jarraitu "
-"dezakezu eragiketa hau martxan dagoen bitartean.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Testuaren indexazio osoak mezuen bilaketa azkarra gaitzen du. "
+"Aktibatzean, bilaketarako elkarrizketak oso azkar funtzionatuko du. Gainera, "
+"bilaketarako tresna-barrak edukinetan oinarritutako mezuak hautatuko ditu.</"
+"p><p>Diskoan lekua behar du honek (mezuen tamainaren erdia, gutxi-"
+"gorabehera).</p><p>Gaitu ondoren, indizea eraiki behar da, baina KMail "
+"erabiltzen jarraitu dezakezu eragiketa hau martxan dagoen bitartean.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2863,8 +2829,8 @@ msgstr "&Ezkutatu talde-lanen karpetak"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Hautatzean, ez da IMAP baliabide-karpetarik ikusiko karpeta-zuhaitzean."
 
@@ -2876,8 +2842,8 @@ msgstr "&Baliabide-karpetak kontu honetan daude:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Hautatzean, ez da IMAP baliabide-karpetarik ikusiko karpeta-zuhaitzean."
 
@@ -2935,19 +2901,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-ekin bateragarria den eranskin izendapena"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Gonbidapenen bidalketa automatikoa"
@@ -2962,23 +2927,22 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Gonbidapenak normalean postaren eranskin gisa bidaltzen dira. Aldaketa "
 "honek gonbidapen-postak mezuaren gorputzean bidaltzen du. Hau beharrezkoa da "
-"Microsoft Outlook-i gonbidapenak eta erantzunak bidaltzeko. "
-"<br>Hau egitean ordea, ez da posta-bezeroak irakur dezakeen testu-azalpenik "
-"gehiago lortuko. Ondorioz, gonbidapenak ulertzen ez dituzten programetan mezu "
-"arraroak agertuko dira."
-"<br>Gonbidapenak uler ditzaketen posta-programek honekin lan egin ahal izango "
-"dute.</qt>"
+"Microsoft Outlook-i gonbidapenak eta erantzunak bidaltzeko. <br>Hau egitean "
+"ordea, ez da posta-bezeroak irakur dezakeen testu-azalpenik gehiago lortuko. "
+"Ondorioz, gonbidapenak ulertzen ez dituzten programetan mezu arraroak "
+"agertuko dira.<br>Gonbidapenak uler ditzaketen posta-programek honekin lan "
+"egin ahal izango dute.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3086,17 +3050,16 @@ msgstr "B&irbidali"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3114,15 +3077,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3196,8 +3159,8 @@ msgstr "Editatu identitatea"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3456,6 +3419,11 @@ msgstr "Hautatu karpeta"
 msgid "Filters"
 msgstr "%1 iragazkia"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Hautatu testu guztia"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3487,11 +3455,12 @@ msgstr "&Erregistratu iragazki ekintzak egunkarian"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Iragazkien iharduera egunkarian erregistratzea gaitu edo desaitu dezakezu "
-"hemen. Noski, egunkariko datuak hau gaitzean bakarrik egongo dira eskuragarri. "
+"hemen. Noski, egunkariko datuak hau gaitzean bakarrik egongo dira "
+"eskuragarri. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3507,14 +3476,16 @@ msgstr "Erregistratu iragazkien &arauen ebaluazioa"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Aplikatutako iragazkmien arauen ebaluaketen egunkaria kontrola dezakezu. Aukera "
-"hau gaituz iragazki-arau bakoitzaren erantzun xehea emango du, bestela iragazki "
-"baten arau guztien ebaluazioaren erantzuna bakarrik emango du."
+"Aplikatutako iragazkmien arauen ebaluaketen egunkaria kontrola dezakezu. "
+"Aukera hau gaituz iragazki-arau bakoitzaren erantzun xehea emango du, "
+"bestela iragazki baten arau guztien ebaluazioaren erantzuna bakarrik emango "
+"du."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3534,14 +3505,14 @@ msgstr "mugagabea"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Egunkari-datuak biltzean egunkari-datuak aldi batean gordetzeko memoria "
-"erabiltzen da. Hemen gehienezko memoria muga dezakezu: bildutako "
-"egunkari-datuak muga hau gainditzen badute, datu zaharrak ezabatuko dira lekua "
+"erabiltzen da. Hemen gehienezko memoria muga dezakezu: bildutako egunkari-"
+"datuak muga hau gainditzen badute, datu zaharrak ezabatuko dira lekua "
 "egiteko. "
 
 #: filterlogdlg.cpp:258
@@ -3552,7 +3523,7 @@ msgstr ""
 "Ezin izan da %1 iragazkian idatzi:\n"
 "\"%2\" da errorearen azalpena."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail errorea"
@@ -3593,9 +3564,9 @@ msgstr "&Erabiltzaile-identifikatzailea:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Erabiltzaileak IMAP zerbitzarian saioa hasteko izena da erabiltzailearen "
 "identifikatzailea. Hau erabiltzaile-izen sinple bat edo erabiltzailearen "
@@ -3651,8 +3622,8 @@ msgstr "Ez duzu irakurtzeko/idazteko baimenik zure zakarrontzian."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Informazioa ez da berreskuratu oraindik, erabili \"Begiratu mezurik dagoen\"."
 
@@ -3664,8 +3635,7 @@ msgstr "Errorea: ez dago IMAP konturik definituta karpeta honentzat"
 msgid "Connecting to server %1, please wait..."
 msgstr "%1 zerbitzariarekin konektatzen, itxaron..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Errorea %1 zerbitzariarekin konektatzean"
@@ -3693,8 +3663,8 @@ msgstr "Gehitu baimenak"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Benetan aldatu nahi dituzu karpetako zure baimenak? Gero ezin izango duzu "
 "sarbidetu."
@@ -3728,7 +3698,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
@@ -3752,9 +3722,9 @@ msgstr "Hautatu karpetaren lasterbidea"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Uneko karpeta hautatzen duten tekla edo tekla-konbinazio bat hautatzeko, "
 "egin klik beheko botoian eta sakatu karpetarekin lotu nahi d(it)uzun "
@@ -3778,13 +3748,22 @@ msgstr "&Utzi"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Ezabatu duzun karpeta <b>%1</b> kontuarekin erlazionatuta zegoen, eta honek "
-"posta bertara bidaltzen zuen. Kontuaren posta berria Sarrerako karpetara "
-"bidaliko da.</qt>"
+"<qt>Ezabatu duzun karpeta <b>%1</b> kontuarekin erlazionatuta zegoen, eta "
+"honek posta bertara bidaltzen zuen. Kontuaren posta berria Sarrerako "
+"karpetara bidaliko da.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3910,56 +3889,16 @@ msgstr "Baztergarri-egoera:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>z<br>u<br>a</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>z"
-"<br>u"
-"<br>r"
-"<br>i"
-"<br>k"
-"<br>"
-"<br>e"
-"<br>z</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>z<br>u<br>r<br>i<br>k<br><br>e<br>z</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3971,19 +3910,14 @@ msgstr "&Zure izena:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Zure izena</h3>"
-"<p>Eremu honek zure izena eduki beharko luke, bidaltzea nahi duzun mezuaren "
-"goiburukoan agertuko zatekeen bezalakoa.</p>"
-"<p>Eremu hau hutsik uzten baduzu ez da zure benetako izena agertuko, helbide "
-"elektronikoa baizik.</p></qt>"
+"<qt><h3>Zure izena</h3><p>Eremu honek zure izena eduki beharko luke, "
+"bidaltzea nahi duzun mezuaren goiburukoan agertuko zatekeen bezalakoa.</"
+"p><p>Eremu hau hutsik uzten baduzu ez da zure benetako izena agertuko, "
+"helbide elektronikoa baizik.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3991,17 +3925,13 @@ msgstr "Erak&undea:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Erakundea</h3>"
-"<p>Eremu honek zure erakundearen izena eduki beharko luke, mezuaren goiburukoan "
-"azaltzea nahi izanez gero bederen.</p>"
-"<p>Normala da hau utsik uztea.</p></qt>"
+"<qt><h3>Erakundea</h3><p>Eremu honek zure erakundearen izena eduki beharko "
+"luke, mezuaren goiburukoan azaltzea nahi izanez gero bederen.</p><p>Normala "
+"da hau utsik uztea.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4010,19 +3940,15 @@ msgstr "&Helbide elektronikoa:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Helbide elektronikoa</h3>"
-"<p>Eremu honek zure helbide elektroniko osoa izan beharko luke.</p>"
-"<p>Hau hutsik uzten baduzu, jendeak ezin izango dizu erantzun.</p></qt>"
+"<qt><h3>Helbide elektronikoa</h3><p>Eremu honek zure helbide elektroniko "
+"osoa izan beharko luke.</p><p>Hau hutsik uzten baduzu, jendeak ezin izango "
+"dizu erantzun.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4031,21 +3957,12 @@ msgstr "&Helbide elektronikoa:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4068,20 +3985,17 @@ msgstr "Hautatu OpenGPG gakoa zure mezuak digitalki sinatzeko."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hemen aukeratutako OpenPGP gakoa zure mezuak digitalki sinatzeko erabiliko "
-"da. GnuPG ere erabil dezakezu.</p>"
-"<p>Hau hutsik utz dezakezu, baina KMail-ek ezin izango ditu mezuak OpenPGP "
-"erabiliz sinatu. Ez du posta-funtzio arruntetan eraginik izango.</p>"
-"<p>Gakoei buruzko informazio gehiago honako gunean: <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Hemen aukeratutako OpenPGP gakoa zure mezuak digitalki sinatzeko "
+"erabiliko da. GnuPG ere erabil dezakezu.</p><p>Hau hutsik utz dezakezu, "
+"baina KMail-ek ezin izango ditu mezuak OpenPGP erabiliz sinatu. Ez du posta-"
+"funtzio arruntetan eraginik izango.</p><p>Gakoei buruzko informazio gehiago "
+"honako gunean: <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4093,30 +4007,27 @@ msgstr "OpenPGP enkriptazio gakoa"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Hautatu OpenPGP gakoa zure burua enkriptatzeko eta editoreko \"Erantsi nire "
 "gako publikoa\" funtzionalitatean erabitzeko."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Hemen hautatzen duzun OpenPGP gakoa zure burua enkriptatzeko eta editoreko "
-"\"Erantsi nire gako publikoa\" funtzionalitatean erabiliko da.</p>"
-"<p>Hau hutsik utz dezakezu, baina KMail-ek ezin izango ditu irteerako mezuen "
-"kopiak enkriptatu OpenPGP erabiliz. Ez du posta-funtzio arruntetan eraginik "
-"izango.</p>"
-"<p>Gakoei buruzko informazio gehiago: <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Hemen hautatzen duzun OpenPGP gakoa zure burua enkriptatzeko eta "
+"editoreko \"Erantsi nire gako publikoa\" funtzionalitatean erabiliko da.</"
+"p><p>Hau hutsik utz dezakezu, baina KMail-ek ezin izango ditu irteerako "
+"mezuen kopiak enkriptatu OpenPGP erabiliz. Ez du posta-funtzio arruntetan "
+"eraginik izango.</p><p>Gakoei buruzko informazio gehiago: <a>http://www."
+"gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4134,18 +4045,15 @@ msgstr "Hautatu S/MIME ziurtagiria zure mezuak digitalki sinatzeko."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hemen hautatutako S/MIME (X.509) ziurtagairiak mezuak digitalki sinatzeko "
-"erabiliko da.</p> "
-"<p>Hau hutsik utz dezakezu, baina KMail-ek ezin izango ditu postak S/MIME "
-"erabiliz digitalki sinatu. Ez du posta-funtzio arruntetan eraginik izango.</p>"
-"</qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Hemen hautatutako S/MIME (X.509) ziurtagairiak mezuak digitalki "
+"sinatzeko erabiliko da.</p> <p>Hau hutsik utz dezakezu, baina KMail-ek ezin "
+"izango ditu postak S/MIME erabiliz digitalki sinatu. Ez du posta-funtzio "
+"arruntetan eraginik izango.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4157,27 +4065,24 @@ msgstr "S/MIME enkriptazio ziurtagiria"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Hautatu S/MIME ziurtagiria zure burua enkriptatzeko eta editoreko \"Erantsi "
 "nire ziurtagiria\" funtzionalitatean erabitzeko."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hautatu S/MIME ziurtagiria zure burua enkriptatzeko eta editoreko \"Erantsi "
-"nire ziurtagiria\" funtzionalitatean erabiltzeko.</p> "
-"<p>Hau hutsik utz dezakezu, baina KMail-ek ezin izango ditu postak S/MIME "
-"erabiliz digitalki sinatu. Ez du posta-funtzio arruntetan eraginik izango.</p>"
-"</qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Hautatu S/MIME ziurtagiria zure burua enkriptatzeko eta editoreko "
+"\"Erantsi nire ziurtagiria\" funtzionalitatean erabiltzeko.</p> <p>Hau "
+"hutsik utz dezakezu, baina KMail-ek ezin izango ditu postak S/MIME erabiliz "
+"digitalki sinatu. Ez du posta-funtzio arruntetan eraginik izango.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4197,24 +4102,20 @@ msgstr "E&rantzun-honi helbidea:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Erantzun-honi helbideak</h3>"
-"<p>Honek <tt>Erantzun-honi:</tt> goiburua ezartzen du <tt>Nork:</tt> "
-"helbidearenbalio desberdin batekin.</p>"
-"<p>Erabilgarria izan ohi da erabitzaile-talde bat antzeko zereginetan batera "
-"lanean ari direnean. Adibidez, bidaltzen dituzun mezu guztiek zure helbidea "
-"edukitzea nahiko duzu <tt>Nork:</tt> eremuan, eta norbaitek mezuari erantzutean "
-"taldearen helbidera bidaltzea.</p>"
-"<p>Zalatzak badituzu, utzi hau hutsik.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Erantzun-honi helbideak</h3><p>Honek <tt>Erantzun-honi:</tt> "
+"goiburua ezartzen du <tt>Nork:</tt> helbidearenbalio desberdin batekin.</"
+"p><p>Erabilgarria izan ohi da erabitzaile-talde bat antzeko zereginetan "
+"batera lanean ari direnean. Adibidez, bidaltzen dituzun mezu guztiek zure "
+"helbidea edukitzea nahiko duzu <tt>Nork:</tt> eremuan, eta norbaitek mezuari "
+"erantzutean taldearen helbidera bidaltzea.</p><p>Zalatzak badituzu, utzi hau "
+"hutsik.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4222,25 +4123,19 @@ msgstr "B&CC helbideak:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Ezkutuko kopiako (BCC) helbideak</h3>"
-"<p>Hemen sartutako helbideak identitate honekin bidalitako irteerako mezu "
-"bakoitzari gehituko zaizkio. Beste hartzaileek ez dituzte helbide hauek "
-"ezagutuko.</p>"
-"<p>Hau mezu bakoitzaren kopia bat zure beste kontu batera bidaltzeko erabiltzen "
-"da.</p>"
-"<p>Erabili komak hainbat helbide idazteko BCCko eremuan.</p>"
-"<p>Zalantzarik baduzu, utzi eremua hutsik.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Ezkutuko kopiako (BCC) helbideak</h3><p>Hemen sartutako helbideak "
+"identitate honekin bidalitako irteerako mezu bakoitzari gehituko zaizkio. "
+"Beste hartzaileek ez dituzte helbide hauek ezagutuko.</p><p>Hau mezu "
+"bakoitzaren kopia bat zure beste kontu batera bidaltzeko erabiltzen da.</"
+"p><p>Erabili komak hainbat helbide idazteko BCCko eremuan.</p><p>Zalantzarik "
+"baduzu, utzi eremua hutsik.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4280,7 +4175,7 @@ msgstr "&Sinadura"
 msgid "&Picture"
 msgstr "&Irudia"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Helbide elektroniko baliogabea"
 
@@ -4303,8 +4198,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Konfiguratutako OpenPGP sinadura-gako batek ez du erabiltzailearen IDrik "
 "identitate honentzako (%1) konfiguratutako helbide elektronikoarekin."
@@ -4316,8 +4211,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Konfiguratutako S/MIME sinadura-ziurtagiri batek ez du erabiltzailearen IDrik "
-"identitate honentzako (%1) konfiguratutako helbide elektronikoarekin.\n"
+"Konfiguratutako S/MIME sinadura-ziurtagiri batek ez du erabiltzailearen "
+"IDrik identitate honentzako (%1) konfiguratutako helbide elektronikoarekin.\n"
 "Honek abisu-mezuak sor ditzake hartzailearen aldean sinadurak konfigurazio "
 "honekin egiaztatzean."
 
@@ -4326,8 +4221,8 @@ msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Konfiguratutako S/MIME sinadura-ziurtagiri batek ez du erabiltzailearen IDrik "
-"identitate honentzako (%1) konfiguratutako helbide elektronikoarekin."
+"Konfiguratutako S/MIME sinadura-ziurtagiri batek ez du erabiltzailearen "
+"IDrik identitate honentzako (%1) konfiguratutako helbide elektronikoarekin."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4368,8 +4263,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (lehenetsia)"
 
@@ -4417,16 +4312,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Konfigurazioa automatikoki migratu arren, zure kontuaren konfigurazioa "
 "egiaztatu beharko zenuke."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Ezin izan da zure konfigurazioa automatikoki migratu. Beraz, egiaztatu zure "
 "kontuaren informazioa."
@@ -4467,14 +4362,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Errorea: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "%1 zerbitzariaren konexioa itxi edo iraungi egin da. Ahal bada, automatikoki "
 "berrezarriko da."
@@ -4626,14 +4526,14 @@ msgstr "Zerrendaren artxiboak"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4662,228 +4562,182 @@ msgstr "Enkriptazio-gako erabilgaitzak"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Zure OpenPGP gako hau:</p><p align=center><b>%1</b> (gakoa: 0x%2)</p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure OpenPGP gako hau:</p> <p align=center><b>%1</b> (gakoa: 0x%2)</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure OpenPGP gako hau:</p><p align=center><b>%1</b> (gakoa: 0x%2)</"
+"p><p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure OpenPGP gako hau:</p> <p align=center><b>%1</b> (gakoa: 0x%2)</p><p>"
+"%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>"
-"%3</b></p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren erro-ziurtagiria:</p><p align=center><b>%3</b>"
-"</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p><p>egun "
+"bat baino lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren erro-ziurtagiria:</p><p align=center><b>%3</b></p><p>%n egun "
+"baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME enkriptazio-ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>"
-"%3</b></p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME enkriptazio-ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>"
-"%3</b></p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME enkriptazio-"
+"ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>egun "
+"bat baino lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME enkriptazio-"
+"ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n "
+"egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>egun bat baino "
+"lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n egun baino "
+"lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center>"
-"<b>%3</b></p> "
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> "
 "<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center>"
-"<b>%3</b></p> "
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> "
 "<p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME enkriptazio-ziurtagiriaren bitarteko ZE ziurtagiria:</p> "
-"<p align=center><b>%3</b></p> "
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME enkriptazio-"
+"ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> "
 "<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p>"
-"<p>S/MIME enkriptazio-ziurtagiriaren ZE ziurtagiria:</p> <p align=center><b>"
-"%3</b></p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p><p>S/MIME enkriptazio-"
+"ziurtagiriaren ZE ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n egun "
+"baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b>"
-"</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b>"
-"</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> <p>egun bat "
+"baino lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n egun baino "
+"lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Zure S/MIME enkriptazio-ziurtagiri hau:</p>  <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
+"(serie-zenbakia: %2)</p> <p>egun bat baino lehenago iraungiko da.</p>\n"
 "<p>Zure S/MIME enkriptazio-ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"(serie-zenbakia: %2)</p> <p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Zure S/MIME ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure S/MIME enkriptazio-hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure S/MIME ziurtagiri hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure S/MIME enkriptazio-hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4897,217 +4751,171 @@ msgstr "S/MIME ziurtagiria laster iraungiko da"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure OpenPGP sinadura-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> "
-"(gakoa: 0x%2)</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure OpenPGP enkriptazio-gako hau:</p><p align=center><b>%1</b> (gakoa: 0x"
+"%2)</p><p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Zure OpenPGP gako hau:</p><p align=center><b>%1</b> (gakoa: 0x%2)</p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure OpenPGP gako hau:</p> <p align=center><b>%1</b> (gakoa: 0x%2)</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure OpenPGP gako hau:</p><p align=center><b>%1</b> (gakoa: 0x%2)</"
+"p><p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure OpenPGP gako hau:</p> <p align=center><b>%1</b> (gakoa: 0x%2)</p><p>"
+"%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>"
-"%3</b></p>"
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren erro-ziurtagiria:</p><p align=center><b>%3</b>"
-"</p>"
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p><p>egun "
+"bat baino lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren erro-ziurtagiria:</p><p align=center><b>%3</b></p><p>%n egun "
+"baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME enkriptazio-ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>"
-"%3</b></p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME enkriptazio-ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>"
-"%3</b></p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME enkriptazio-"
+"ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>egun "
+"bat baino lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME enkriptazio-"
+"ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n "
+"egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren erro-ziurtagiria:</p> <p align=center><b>%3</b></p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>egun bat baino "
+"lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"erro-ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n egun baino "
+"lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center>"
-"<b>%3</b></p> "
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> "
 "<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME sinadura-ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center>"
-"<b>%3</b></p> "
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME sinadura-"
+"ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> "
 "<p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME enkriptazio-ziurtagiriaren bitarteko ZE ziurtagiria:</p> "
-"<p align=center><b>%3</b></p> "
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME enkriptazio-"
+"ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> "
 "<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p>"
-"<p>S/MIME enkriptazio-ziurtagiriaren ZE ziurtagiria:</p> <p align=center><b>"
-"%3</b></p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p><p>S/MIME enkriptazio-"
+"ziurtagiriaren ZE ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n egun "
+"baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b>"
-"</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> "
-"<p>S/MIME ziurtagiriaren bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b>"
-"</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> <p>egun bat "
+"baino lehenago iraungiko da.</p>\n"
+"<p align=center><b>%1</b> (serie-zenbakia: %2)</p> <p>S/MIME ziurtagiriaren "
+"bitarteko ZE ziurtagiria:</p> <p align=center><b>%3</b></p> <p>%n egun baino "
+"lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure S/MIME sinadura-ziurtagiri hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Zure S/MIME enkriptazio-ziurtagiri hau:</p>  <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
+"(serie-zenbakia: %2)</p> <p>egun bat baino lehenago iraungiko da.</p>\n"
 "<p>Zure S/MIME enkriptazio-ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"(serie-zenbakia: %2)</p> <p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Zure S/MIME ziurtagiri hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>egun bat baino lehenago iraungiko da.</p>\n"
-"<p>Zure S/MIME enkriptazio-hau:</p> <p align=center><b>%1</b> "
-"(serie-zenbakia: %2)</p> "
-"<p>%n egun baino lehenago iraungiko da.</p>"
+"<p>Zure S/MIME ziurtagiri hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>egun bat baino lehenago iraungiko da.</p>\n"
+"<p>Zure S/MIME enkriptazio-hau:</p> <p align=center><b>%1</b> (serie-"
+"zenbakia: %2)</p> <p>%n egun baino lehenago iraungiko da.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5119,14 +4927,15 @@ msgstr "S/MIME ziurtagiria laster iraungiko da"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Konfiguratutako OpenPGP enkriptazio-gako edo edo S/MIME ziurtagirietako bat ez "
-"da enkriptatzeko erabilgarria. Birkonfiguratu identitate honen "
+"Konfiguratutako OpenPGP enkriptazio-gako edo edo S/MIME ziurtagirietako bat "
+"ez da enkriptatzeko erabilgarria. Birkonfiguratu identitate honen "
 "enkriptazio-gakoak eta ziurtagiriak identitatearen konfigurazioko "
 "elkarrizketa-koadroan.\n"
 "Jarraitzea hautatzen baduzu, eta gakoak beranduago behar badituzu, erabili "
@@ -5144,9 +4953,9 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Konfiguratutako OpenPGP sinadura-gako edo edo S/MIME sinadura-ziurtagirietako "
-"bat ez da sinatzeko erabilgarria. Birkonfiguratu identitate honen "
-"sinadura-gakoak eta ziurtagiriak identitatearen konfigurazioko "
+"Konfiguratutako OpenPGP sinadura-gako edo edo S/MIME sinadura-"
+"ziurtagirietako bat ez da sinatzeko erabilgarria. Birkonfiguratu identitate "
+"honen sinadura-gakoak eta ziurtagiriak identitatearen konfigurazioko "
 "elkarrizketa-koadroan.\n"
 "Jarraitzea hautatzen baduzu, eta gakoak beranduago behar badituzu, erabili "
 "beharreko gakoak galdetuko zaizkizu."
@@ -5159,13 +4968,13 @@ msgstr "Sinadura-gako erabilgaitza"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Hartzailearen enkriptatze-hobespenen azterketak mezua OpenPGP-rekin enkriptatu "
-"behar dela erabaki du, gutxienez hartzaile batzuentzat.\n"
+"Hartzailearen enkriptatze-hobespenen azterketak mezua OpenPGP-rekin "
+"enkriptatu behar dela erabaki du, gutxienez hartzaile batzuentzat.\n"
 "Hala ere, ez duzu baliozko eta konfiantzazko OpenPGP enkriptatze-gakorik "
 "konfiguratu identitate honentzat.\n"
 "Zure burua enkriptatu gabe jarri dezakezu, baina kontuan izan ezin izango "
@@ -5175,13 +4984,13 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Hartzailearen enkriptatze-hobespenen azterketak mezua S/MIME-rekin enkriptatu "
-"behar dela erabaki du, gutxienez hartzaile batzuentzat.\n"
+"Hartzailearen enkriptatze-hobespenen azterketak mezua S/MIME-rekin "
+"enkriptatu behar dela erabaki du, gutxienez hartzaile batzuentzat.\n"
 "Hala ere, ez duzu baliozko eta konfiantzazko S/MIME enkriptatze-gakorik "
 "konfiguratu identitate honentzat.\n"
 "Zure burua enkriptatu gabe jarri dezakezu, baina kontuan izan ezin izango "
@@ -5189,15 +4998,15 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
 "Hartzailearen sinatze-hobespenen azterketak mezua OpenPGP-rekin sinatu behar "
 "dela erabaki du, gutxienez hartzaile batzuentzat.\n"
-"Hala ere, ez duzu baliozko OpenPGP sinatze-ziurtagiririk konfiguratu identitate "
-"honentzat."
+"Hala ere, ez duzu baliozko OpenPGP sinatze-ziurtagiririk konfiguratu "
+"identitate honentzat."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5205,8 +5014,8 @@ msgstr "Ez ireki OpenPGP sinadura"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5235,11 +5044,11 @@ msgstr "Ezin da sinatu"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Ez duzu enkriptatze-gakorik hautatu zuretzat (zure burua enkriptatzeko). ezin "
-"izango dituzu zure mezuak desenkriptatu enkriptatzen badituzu."
+"Ez duzu enkriptatze-gakorik hautatu zuretzat (zure burua enkriptatzeko). "
+"ezin izango dituzu zure mezuak desenkriptatu enkriptatzen badituzu."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5255,16 +5064,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Ez duzu enkriptatze-gakorik hautatu mezuaren hartzailearentzat. Beraz, mezua ez "
-"da enkriptatuko."
+"Ez duzu enkriptatze-gakorik hautatu mezuaren hartzailearentzat. Beraz, mezua "
+"ez da enkriptatuko."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Ez duzu enkriptatze-gakorik hautatu mezuaren hartzaileentzat. Beraz, mezua ez "
-"da enkriptatuko."
+"Ez duzu enkriptatze-gakorik hautatu mezuaren hartzaileentzat. Beraz, mezua "
+"ez da enkriptatuko."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5275,8 +5084,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Ez duzu enkriptatze-gakorik hautatu mezuaren hartzaileetako batentzat. Pertsona "
-"honek ezin izango du mezua desenkriptatu."
+"Ez duzu enkriptatze-gakorik hautatu mezuaren hartzaileetako batentzat. "
+"Pertsona honek ezin izango du mezua desenkriptatu."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5308,11 +5117,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Ez da baliozko enkriptazio-gakorik aurkitu \"%1\"(r)entzat.\n"
 "\n"
@@ -5361,10 +5170,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Errore kritikoa: ezin da posta bildu"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Ezin izan da mezua gehitu:\n"
+msgid "Failed to add message:\n"
+msgstr "Ezin izan da mezua gehitu:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5454,6 +5261,50 @@ msgstr "IMAP &deskonektatuta"
 msgid "&Maildir mailbox"
 msgstr "&Maildir postontzia"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr " Ezarri mezuaren gaia"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Bidali CC: 'helbide'ra"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Bidali BCC: 'helbide'ra"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Gehigu goiburua mezuan"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Irakurri mezuaren gorputza 'fitxategi'tik"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Ezarri mezuaren gorputza"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Gehitu eranskina mezuan: hau errepika daiteke"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Begiratu mezu berririk dagoen bakarrik"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Ireki mezu-prestatzailearen leihoa bakarrik"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Ikusi emandako mezu-fitxategia"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Bidali mezua nahi duzun helbidera URL-ak erakusten duen eranskinarekin"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Posta"
@@ -5497,8 +5348,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail-ek beharrezko groupware karpetak sortuko ditu %1(r)en azpi-karpeta gisa. "
-"Hau nahi ez baduzu, bertan behera utzi eta IMAP baliabideak desgaituko dira"
+"KMail-ek beharrezko groupware karpetak sortuko ditu %1(r)en azpi-karpeta "
+"gisa. Hau nahi ez baduzu, bertan behera utzi eta IMAP baliabideak desgaituko "
+"dira"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5511,13 +5363,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail-ek ondorengo groupware karpetak aurkitu ditu %1(e)n eta ondorengo "
-"eragiketa burutu behar ditu: %2"
-"<br>Hau nahi ez baduzu, bertan behera utzi eta IMAP baliabidea desgaituko da"
+"eragiketa burutu behar ditu: %2<br>Hau nahi ez baduzu, bertan behera utzi "
+"eta IMAP baliabidea desgaituko da"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5566,11 +5418,11 @@ msgstr "URLa arbelean kopiatuta."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt><b>%1</b> fitxategia badago lehendik. <br> Ordeztu nahi duzu?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Gorde fitxategian"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Ordeztu"
 
@@ -5588,7 +5440,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Mezua kendu egin da gordetzean. Ez da gorde."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5610,11 +5462,11 @@ msgstr ""
 "Fitxategiak mezu bat baino gehiago ditu. Lehenengo mezua erakutsiko da "
 "bakarrik."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5623,85 +5475,85 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Mezuak ezabatzen"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "%3/%2 mezuak %1(e)tik iragatzen"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Diskoan leku libre nahikorik ez?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Eraman karpeta honetara"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiatu karpeta honetan"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Mezuak lekuz aldatzen"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Mezuak ezabatzen"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URLa irekitzen..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Benetan <b>%1</b> exekutatu nahi duzu?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Exekutatu"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Ez da gordetzeko eranskinik aurkitu."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Gorde eranskinak hona"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "1. eranskina"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "%1. eranskina"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "%1 izeneko fitxategia badago lehendik. Gainidatzi nahi duzu?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fitxategia badago lehendik"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Gainidatzi"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5709,30 +5561,30 @@ msgstr ""
 "Mezu honetako %1 zatia enkriptatuta dago. Enkriptazioa mantendu nahi duzu "
 "gordetzean?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail galdera"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Mantendu enkriptazioa"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ez mantendu"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Mezu honetako %1 zatia sinatuta dago. Sinadura mantendu nahi duzu gordetzean?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Mantendu sinadura"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5741,77 +5593,78 @@ msgstr ""
 "Ezin izan da %1 fitxategia idatzi:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Ezin izan da %1 fitxategian idatzi."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Ez dago helbide elektronikoaren sarrerarik helbide-liburuan. Gehitu hauek "
 "helbide-liburuan eta gero gehitu berehalako mezularitzaren helbidea "
 "mezularitzako bezero hobetsiena erabiliz."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Helbide-liburu bat baino gehiagok honako helbide elektronikoa erabiltzen dute:\n"
+"Helbide-liburu bat baino gehiagok honako helbide elektronikoa erabiltzen "
+"dute:\n"
 "%1\n"
 "Ezin da norekin berriketan hasi behar den ebatzi."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus motorrak ez du \"x-obtain-keys\" funtzioa eskeintzen. Eskertuko "
 "genizuke errore honi buruz berri emango bazenuke."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus motorrean errorea"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Espero ez zen balio bat itzuli du Chiasmus motorrak: \"x-obtain-keys\" "
-"funtzioak ez du kate-zerrenda bat itzuli. Eskertuko genizuke errore honi buruz "
-"berri emango bazenuke."
+"funtzioak ez du kate-zerrenda bat itzuli. Eskertuko genizuke errore honi "
+"buruz berri emango bazenuke."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Ez da gakorik aurkitu. Egiaztatu gakoen baliozko bide-izena ezarri  dela "
 "Chiasmus-en konfigurazioan."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus-en desenkriptazio-gakoaren hautapena"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus motorrak ez du \"x-decrypt\" funtzioa eskeintzen. Eskertuko genizuke "
-"errore honi buruz berri emango bazenuke."
+"Chiasmus motorrak ez du \"x-decrypt\" funtzioa eskeintzen. Eskertuko "
+"genizuke errore honi buruz berri emango bazenuke."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5819,27 +5672,27 @@ msgstr ""
 "\"x-decrypt\" funtzioak ez ditu esperotako parametroak onartzen. Eskertuko "
 "genizuke errore honi buruz berri emango bazenuke."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus-en desenkriptazio-errorea"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Espero ez zen balio bat itzuli du Chiasmus motorrak. \"x-decrypt\" funtzioak ez "
-"du zortzikotu array bat itzuli. Eskertuko genizuke errore honi buruz berri "
-"emango bazenuke."
+"Espero ez zen balio bat itzuli du Chiasmus motorrak. \"x-decrypt\" funtzioak "
+"ez du zortzikotu array bat itzuli. Eskertuko genizuke errore honi buruz "
+"berri emango bazenuke."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Posta"
@@ -5938,7 +5791,7 @@ msgstr "Tamaina"
 msgid "Encoding"
 msgstr "Kodeketa"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Konprimitu"
 
@@ -5950,7 +5803,7 @@ msgstr "Enkriptatu"
 msgid "Sign"
 msgstr "Sinatu"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Eranskinaren izena:"
 
@@ -5972,7 +5825,8 @@ msgstr "Hartzaile nagusiak"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>Eremu honetan jartzen dituzun helbideek mezuaren kopia jasoko dute.</qt>"
 
@@ -5983,9 +5837,9 @@ msgstr "Hartzaile gehiago"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Eremu honetan jarritako helbideak mezuaren kopia jasoko dute. Teknikoki "
 "helbide guztiak <b>Nori:</b> eremuan jartzearen berdina da, baina hartzailea "
@@ -5997,12 +5851,11 @@ msgstr "Ezkutuko hartzaileak"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt><b>Kopiatu honi:</b> eremuan jartzearen antzekoa da baina hartzaile guztiak "
-"ez dute ikusiko ezkutuko kopia (BCC) nork jasoten duen.</qt>"
+"<qt><b>Kopiatu honi:</b> eremuan jartzearen antzekoa da baina hartzaile "
+"guztiak ez dute ikusiko ezkutuko kopia (BCC) nork jasoten duen.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6012,7 +5865,7 @@ msgstr "&Bidali posta"
 msgid "&Send Mail Via"
 msgstr "&Bidali posta honela"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Bidali &geroago"
@@ -6079,8 +5932,7 @@ msgstr "Ken&du aipamen karaktereak"
 msgid "Cl&ean Spaces"
 msgstr "&Garbitu zuriuneak"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Erabili zabalera &finkoko letra-tipoak"
@@ -6222,31 +6074,31 @@ msgstr "En&kriptatutako mezuaren formatua"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Estandarra"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Buletadun zerrenda (diskoa)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Buletadun zerrenda (zirkulua)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Buletadun zerrenda (karratua)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Zerrenda ordenatua (hamartarra)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Zerrenda ordenatua (minuskulak)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Zerrenda ordenatua (maiuskulak)"
 
@@ -6350,61 +6202,61 @@ msgstr "Itxi mezu-prestatzailea"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Prestatu duzun mezuak badirudi fitxategi eranskin batekin zerikusia duela baina "
-"ez duzu fitxategirik erantsi.\n"
+"Prestatu duzun mezuak badirudi fitxategi eranskin batekin zerikusia duela "
+"baina ez duzu fitxategirik erantsi.\n"
 "Fitxategi bat erantsi nahi diozu mezuari?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Eranskinen oroitapena"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Bidali dagoen bezala"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail-ek ezin du eranskinaren (%1) kokalekua ezagutu.</p>"
-"<p>Fitxategi bat eransteko bide-izen osoa zehaztu behar duzu.</p></qt>"
+"<qt><p>KMail-ek ezin du eranskinaren (%1) kokalekua ezagutu.</p><p>Fitxategi "
+"bat eransteko bide-izen osoa zehaztu behar duzu.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Erantsi fitxategia"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Erantsi"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Txertatu fitxategia"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Txertatu fitxategia"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Errorea gertatu da motorretik gakoa esportatzean:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Errorea gertatu da motorretik gakoa esportatzean:</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6443,20 +6295,35 @@ msgid ""
 "View"
 msgstr "Ikusi"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Editatu..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Editatu script-a..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Gorde &honela..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Propietateak"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Gehitu eranskina..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail-ek ezin izan du fitxategia konprimatu."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6464,76 +6331,72 @@ msgstr ""
 "Konprimitutako fitxategia jatorrizkoa baina handiagoa da. Jatorrizkoa gorde "
 "nahi duzu?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Mantendu"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail-ek ezin izan du fitxategia deskonprimitu."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Gorde eranskina honela"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Gehitu testu gisa"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Gehitu eranskin gisa"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Itsatsi erans&kin bezala"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "Izengabea"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mezuak zure buruari enkriptatzea eskatu duzu baina unean hautatutako "
-"identitateak ez du (OpenPGP edo S/MIME) enkriptazio-gakorik definitzen.</p>"
-"<p>Hautatu identitatearen konfigurazioaren erabiltzeko gakoak.</p></qt>"
+"<qt><p>Mezuak zure buruari enkriptatzea eskatu duzu baina unean hautatutako "
+"identitateak ez du (OpenPGP edo S/MIME) enkriptazio-gakorik definitzen.</"
+"p><p>Hautatu identitatearen konfigurazioaren erabiltzeko gakoak.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Definitu gabeko enkriptazio-gakoa"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mezu hau sinatzeko erabiltzeko (OpenPGP edo S/MIME) sinadura-gakoa definitu "
-"behar duzu.</p>"
-"<p>Hautatu identitatearen konfigurazioan erabiltzeko gakoa.</p></qt>"
+"<qt><p>Mezu hau sinatzeko erabiltzeko (OpenPGP edo S/MIME) sinadura-gakoa "
+"definitu behar duzu.</p><p>Hautatu identitatearen konfigurazioan erabiltzeko "
+"gakoa.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Definitu gabeko sinatzeko gakoa"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6541,91 +6404,89 @@ msgstr ""
 "KMail une honetan lineaz kanpoko moduan dago, zure mezuak irteerako ontzian "
 "gordeko dira lineako egoerara itzultzen zaren arte."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Linean/Lineaz kanpo"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "\"Nork:\" eremuan zure helbide elektronikoa sartu behar duzu. Identitate "
-"guztietan zure helbide elektronikoa ere ezarri beharko zenuke, mezu bakoitzean "
-"sartu ez dezazun."
+"guztietan zure helbide elektronikoa ere ezarri beharko zenuke, mezu "
+"bakoitzean sartu ez dezazun."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Gutxienez hartzaile bat eman behar duzu Nori, CC edo BCC eremuan."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Ez duzu gairik sartu. Bidali mezua hala ere?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Ez da izenik zehaztu"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Ez duzu gairik sartu. Bidali mezua hala ere?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ez da gairik zehaztu"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Bidali dagoen bezala"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Zehaztu gaia"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Mantendu markaketak, ez sinatu/enkriptatu"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Mantendu markaketa, ez enkriptatu"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Mantendu markaketa, ez sinatu"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Sinatu/enkriptatu (ezabatu markaketa)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Enkriptatu (ezabatu markaketa)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Sinatu (ezabatu markaketa)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>HTML mezuen barneratutako sinadura/enkriptatzea ez da posible.</p>"
-"<p>Zure markaketa ezabatu nahi duzu?</p></qt>"
+"<qt><p>HTML mezuen barneratutako sinadura/enkriptatzea ez da posible.</"
+"p><p>Zure markaketa ezabatu nahi duzu?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Sinatu/enkriptatu mezua?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6634,107 +6495,107 @@ msgstr ""
 "\"%1\" identitatearen zirriborroen karpeta pertsonalizatua ez da existitzen. "
 "Beraz zirriborroen karpeta lehenetsia erabiliko da."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Sortu kontu bat bidaltzeko eta saiatu berriro."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Posta bidaltzeko zorian..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Bidali berrespena"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Bidali orain"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Hartzailerik ez"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Hartzaile gehiago"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Zuzentzailea: aktibatuta"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Zuzentzailea: desaktibatua"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Ortografia zuzenketa bertan behear utzita."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Ortografia zuzenketa geldituta."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Ortografia zuzenketa osatuta."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Ortografia zuzentzailea"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Konfiguratu Chiasmus-en enkriptaziorako Crypto motorra aurrenik.\n"
 "Hau konfigurazioko elkarrizketaren Crypto motorren fitxan egin dezakezu."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Badirudi libkleopatra Chiasmus motorrik gabe konpilatu dela. Agian libkleopatra "
-"--enable-chiasmus-ekin birkonpilatu nahiko zenuke."
+"Badirudi libkleopatra Chiasmus motorrik gabe konpilatu dela. Agian "
+"libkleopatra --enable-chiasmus-ekin birkonpilatu nahiko zenuke."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Ez da Chiasmus motorrik konfiguratu"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Ez da Chiasmus-en gakorik aurkitu"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus-en enkriptazio-gako hautapena"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Mezua %1(e)k sinatu du."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Mezua %1(e)k sinatu du."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP mezua - enkriptatuta"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Gai hau duten mezuak: "
@@ -6785,11 +6646,11 @@ msgstr "Ortografia zuzentzailea - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Ezin da ISpell/Aspell abiatu. Ziurtatu ISpell edo Aspell ongi konfiguratuta eta "
-"zure PATH aldagaian dagoela."
+"Ezin da ISpell/Aspell abiatu. Ziurtatu ISpell edo Aspell ongi konfiguratuta "
+"eta zure PATH aldagaian dagoela."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6822,12 +6683,10 @@ msgstr "<qt>Iragazki ekintza gehiegi <b> %1</b> iragazki arauan.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt><b> %1</b> Iragazki ekintza ezezaguna"
-"<br><b>%2</b> iragazki arauan. "
+"<qt><b> %1</b> Iragazki ekintza ezezaguna<br><b>%2</b> iragazki arauan. "
 "<br>Ez zaio jaramonik egingo.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7045,164 +6904,132 @@ msgstr "Erreproduzitu soinua"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hau definitutako iragazkien zerrenda da. Goitik behera prozesatzen dira.</p>"
-"<p>Egin klik edozein iragazkitan ediatzeko (elkarrizketa-koadroko eskuin-erdiko "
-"kontroleak erabiliz)</p></qt>"
+"<qt><p>Hau definitutako iragazkien zerrenda da. Goitik behera prozesatzen "
+"dira.</p><p>Egin klik edozein iragazkitan ediatzeko (elkarrizketa-koadroko "
+"eskuin-erdiko kontroleak erabiliz)</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan iragazki berria sortzeko.</p>"
-"<p>Unean hautatutakoaren aurretik txertatuko de iragazkia, hala ere hau "
-"beranduago alda dezakezu.</p>"
-"<p>Nahi gabe botoian klik egitan baduzu, <em>Ezabatu</em> "
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Egin klik botoi honetan iragazki berria sortzeko.</p><p>Unean "
+"hautatutakoaren aurretik txertatuko de iragazkia, hala ere hau beranduago "
+"alda dezakezu.</p><p>Nahi gabe botoian klik egitan baduzu, <em>Ezabatu</em> "
 "botoian klik eginez desegin dezakezu.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan iragazki bat kopiatzeko.</p>"
-"<p>Nahi gabe botoian klik egitan baduzu, <em>Ezabatu</em> "
-"botoian klik eginez desegin dezakezu.</p></qt>"
+"<qt><p>Egin klik botoi honetan iragazki bat kopiatzeko.</p><p>Nahi gabe "
+"botoian klik egitan baduzu, <em>Ezabatu</em> botoian klik eginez desegin "
+"dezakezu.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan unean hautatutako iragazkia goiko zerrendatik <em>"
-"ezabatzeko</em>.</p>"
-"<p>Ezabatu ondoren ez dago iragazkia berreskuratzeko aukerarik, baina "
-"elkarrizketa-koadroa itxi dezakezu egindako aldaketak desegiteko <em>Utzi</em> "
-"botoia erabiliz.</p></qt>"
+"<qt><p>Egin klik botoi honetan unean hautatutako iragazkia goiko zerrendatik "
+"<em>ezabatzeko</em>.</p><p>Ezabatu ondoren ez dago iragazkia berreskuratzeko "
+"aukerarik, baina elkarrizketa-koadroa itxi dezakezu egindako aldaketak "
+"desegiteko <em>Utzi</em> botoia erabiliz.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan <em>"
-"goraino</em> eramateko.</p>"
-"<p>Hau oso erabilgarria da, zerrendako iragazkien ordenak mezuak aplikatzen "
-"direneko ordena definitzen duelako: Goiko iragazkia aplikatzen da lehenengo.</p>"
+"<qt><p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan "
+"<em>goraino</em> eramateko.</p><p>Hau oso erabilgarria da, zerrendako "
+"iragazkien ordenak mezuak aplikatzen direneko ordena definitzen duelako: "
+"Goiko iragazkia aplikatzen da lehenengo.</p>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan maila bat <em>"
-"gora</em> eramateko.</p> "
-"<p>Hau oso erabilgarria da, zerrendako iragazkien ordenak mezuak aplikatzen "
-"direneko ordena definitzen duelako: Goiko iragazkia aplikatzen da lehenengo.</p>"
-"<p>Botoi honetan nahi gabe klik egiten bada, <em>Behera</em> "
-"botoian klik eginez desegin dezakezu.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan maila "
+"bat <em>gora</em> eramateko.</p> <p>Hau oso erabilgarria da, zerrendako "
+"iragazkien ordenak mezuak aplikatzen direneko ordena definitzen duelako: "
+"Goiko iragazkia aplikatzen da lehenengo.</p><p>Botoi honetan nahi gabe klik "
+"egiten bada, <em>Behera</em> botoian klik eginez desegin dezakezu.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan maila bat <em>"
-"behera</em> eramateko.</p> "
-"<p>Hau oso erabilgarria da, zerrendako iragazkien ordenak mezuak aplikatzen "
-"direneko ordena definitzen duelako: Goiko iragazkia aplikatzen da lehenengo.</p>"
-"<p>Botoi honetan nahi gabe klik egiten bada, <em>Gora</em> "
-"botoian klik eginez desegin dezakezu.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan maila "
+"bat <em>behera</em> eramateko.</p> <p>Hau oso erabilgarria da, zerrendako "
+"iragazkien ordenak mezuak aplikatzen direneko ordena definitzen duelako: "
+"Goiko iragazkia aplikatzen da lehenengo.</p><p>Botoi honetan nahi gabe klik "
+"egiten bada, <em>Gora</em> botoian klik eginez desegin dezakezu.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan <em>"
-"beheraino</em> eramateko.</p> "
-"<p>Hau oso erabilgarria da, zerrendako iragazkien ordenak mezuak aplikatzen "
-"direneko ordena definitzen duelako: Goiko iragazkia aplikatzen da lehenengo.</p>"
-"</qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
+msgstr ""
+"<qt><p>Egin klik botoi honetan unean hautatutako iragazkia zerrendan "
+"<em>beheraino</em> eramateko.</p> <p>Hau oso erabilgarria da, zerrendako "
+"iragazkien ordenak mezuak aplikatzen direneko ordena definitzen duelako: "
+"Goiko iragazkia aplikatzen da lehenengo.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Egin klik botoi honetan unean hautatutako iragazkia izenez aldatzeko.</p>"
-"<p>Iragazkiak automatikoki izendatzen dira,  \"&lt;\" hizkiarekin hasten "
-"badira.</p>"
-"<p>Nahi gabe Iragazki bat izenez aldatu baduzu eta izendapen automatikoa "
-"berreskuratzea nahi baduzu, egin klik botoi honetan eta hautatu <em>Garbitu</em> "
-"eta <em>Ados</em> agertzen den elkarrizketa-koadroan.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Egin klik botoi honetan unean hautatutako iragazkia izenez aldatzeko."
+"</p><p>Iragazkiak automatikoki izendatzen dira,  \"&lt;\" hizkiarekin hasten "
+"badira.</p><p>Nahi gabe Iragazki bat izenez aldatu baduzu eta izendapen "
+"automatikoa berreskuratzea nahi baduzu, egin klik botoi honetan eta hautatu "
+"<em>Garbitu</em> eta <em>Ados</em> agertzen den elkarrizketa-koadroan.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hautatu botoi hau berrespenerako elkarrizketa-koadroa derrigorrez "
-"bistaratzeko.</p>"
-"<p> Erabilgarria da arau-multzo bat definituta bada mezuak etiketatu eta "
-"beranduago deskargatzeko. Elkarrizketa-koadroa bistaratzea derrigortu gabe mezu "
-"hauek ez lirateke deskargatuko zerbitzarian beste mezurik itxaroten ez balego, "
-"edo mezuak modu desberdinean etiketatzeko arau-multzoa aldatzea nahiko "
-"bazenu.</p></qt>"
+"<qt><p>Hautatu botoi hau berrespenerako elkarrizketa-koadroa derrigorrez "
+"bistaratzeko.</p><p> Erabilgarria da arau-multzo bat definituta bada mezuak "
+"etiketatu eta beranduago deskargatzeko. Elkarrizketa-koadroa bistaratzea "
+"derrigortu gabe mezu hauek ez lirateke deskargatuko zerbitzarian beste "
+"mezurik itxaroten ez balego, edo mezuak modu desberdinean etiketatzeko arau-"
+"multzoa aldatzea nahiko bazenu.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7212,6 +7039,16 @@ msgstr "POP3 iragazteko arauak"
 msgid "Filter Rules"
 msgstr "Iragazteko arauak"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Inportatu"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Inportatu"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Iragazki erabilgarriak"
@@ -7294,6 +7131,11 @@ msgstr "Gehitu iragazki hau tresna-barrari"
 msgid "Icon for this filter:"
 msgstr "Iragazki honen ikonoa:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Nori"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Gora"
@@ -7302,16 +7144,29 @@ msgstr "Gora"
 msgid "Down"
 msgstr "Behera"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Berrizendatu..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Berria"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopiatu hemen"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Ezabatuta"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7320,12 +7175,12 @@ msgstr "Hautatu karpetaren lasterbidea"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Gutxienez iragazki batek lineako IMAP kontu bat helburu bezala du. Iragazki "
-"hauek eskuz iragaztean eta lineako sarrerako IMAP posta iragaztean aplikatuko "
-"dira bakarrik."
+"hauek eskuz iragaztean eta lineako sarrerako IMAP posta iragaztean "
+"aplikatuko dira bakarrik."
 
 #: kmfilterdlg.cpp:786
 msgid ""
@@ -7405,28 +7260,24 @@ msgstr "IMAP cache-aren arazo-konponketak"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>IMAP cache-aren arazo-konponketak.</b></p>"
-"<p>Arazoak badituzu IMAP karpeta batekin sinkronizatzeko, lehenengo "
-"indize-fitxategia berreraikitzen saiatu beharko zenuke. Honek denbora beharko "
-"du baina ez du arazorik sortuko.</p>"
-"<p>Hau nahikoa ez bada, IMAP cache-a freska dezakezu. Hau egiten baduzu, zure "
-"karpeta honen eta bere azpikarpeten aldaketa lokalak galduko dituzu.</p>"
+"<p><b>IMAP cache-aren arazo-konponketak.</b></p><p>Arazoak badituzu IMAP "
+"karpeta batekin sinkronizatzeko, lehenengo indize-fitxategia berreraikitzen "
+"saiatu beharko zenuke. Honek denbora beharko du baina ez du arazorik sortuko."
+"</p><p>Hau nahikoa ez bada, IMAP cache-a freska dezakezu. Hau egiten baduzu, "
+"zure karpeta honen eta bere azpikarpeten aldaketa lokalak galduko dituzu.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7465,8 +7316,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Ezin izan da %1 karpetako UID cache-fitxategia irakurri. Fitxategi-sistemako "
 "baimenekin arazoa egon daiteke."
@@ -7509,8 +7360,8 @@ msgstr "Karpeta honen indizea birsortu da."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "%1 karpeta ez dago hasierako sinkronizazio-egoeran (egoera \"%2\" da). "
 "Hasierako sinkronizazio-egoerara berrezarri eta sinkronizatu nahi duzu?"
@@ -7640,14 +7491,11 @@ msgstr "Azpikarpetak zerbitzarian sortzen"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Badirudi zerbitzariko <b>%1</b> karpetako mezuak ezabatu direla. Lokalean "
-"ezabatzea nahi duzu?</p></qt>"
+"<qt><p>Badirudi zerbitzariko <b>%1</b> karpetako mezuak ezabatu direla. "
+"Lokalean ezabatzea nahi duzu?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7668,13 +7516,11 @@ msgstr "%1 izen-lekuaren karpetak eskuratzen"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Badirudi <b>%1</b> karpeta ezabatu dela. Zerbitzaritik ezabatu nahi duzu?</p>"
-"</qt>"
+"<qt><p>Badirudi <b>%1</b> karpeta ezabatu dela. Zerbitzaritik ezabatu nahi "
+"duzu?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7682,8 +7528,8 @@ msgstr "Abortatuta"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "%1 IMAP zerbitzariak ez ditu IMAP oharrak onartzen. XML biltegia ezin da "
 "zerbitzari honetan erabili, birkonfiguratu KMail beste modu batean."
@@ -7691,8 +7537,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "%1 IMAP zerbitzariak ez ditu IMAP oharrak onartzen. XML biltegia ezin da "
 "zerbitzari honetan erabili, birkonfiguratu KMail beste modu batean."
@@ -7708,17 +7554,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Mezu berriak daude karpeta honetan (%1), eta hauek ez dira oraindik "
 "zerbitzarira igo, hala ere badirudi kargatzeko karpetan nahikoa baimen ez "
 "duzula. Jarri administratzailearekin harremanetan mezu berriak kargatu ahal "
-"izateko, edo kendu itzazu karpeta honetatik.</p> "
-"<p>Mezu hauek beste karpeta batera eramatea nahi dituzu?</p>"
+"izateko, edo kendu itzazu karpeta honetatik.</p> <p>Mezu hauek beste karpeta "
+"batera eramatea nahi dituzu?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7727,20 +7573,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Mezu berriak daude karpeta honetan (%1), eta hauek ez dira oraindik "
 "zerbitzarira igo, hala ere badirudi kargatzeko karpetan nahikoa baimen ez "
 "duzula. Jarri administratzailearekin harremanetan mezu berriak kargatu ahal "
-"izateko, edo kendu itzazu karpeta honetatik.</p> "
-"<p>Mezu hauek beste karpeta batera eramatea nahi dituzu?</p>"
+"izateko, edo kendu itzazu karpeta honetatik.</p> <p>Mezu hauek beste karpeta "
+"batera eramatea nahi dituzu?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Mugitu hona:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ez eraman"
 
@@ -7752,8 +7603,7 @@ msgstr "Eraman mezuak karpetara"
 msgid "Permissions (ACL)"
 msgstr "Baimenak (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Orokorra"
@@ -7778,8 +7628,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Erabili &ikono pertsonalizatuak"
@@ -7798,23 +7647,21 @@ msgstr "Jakinarazi karpetan posta berria edo irakurri gabea dagoenean"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aukera hau gaitzen baduzu karpeta honetako posta berri edo irakurri gabeei "
-"buruzko jakinarazpena jasoko duzu. Gainera, hurrengo/aurreko karpetara irakurri "
-"gabeko mezuekin joaten bazara karpeta honetan geldituko zara.</p>"
-"<p>Desautatu aukera hau jakinarazpenak jaso nahi ez badituzu eta "
-"hurrengo/aurreko karpetara irakurri gabeko mezuekin joatean karpeta hau ekidin "
-"nahi baduzu. Hau erabilgarria da zakarrontizko eta baztergarrien karpetako mezu "
-"berriak edo irakurri gabeei ez ikusia egiteko.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Aukera hau gaitzen baduzu karpeta honetako posta berri edo irakurri "
+"gabeei buruzko jakinarazpena jasoko duzu. Gainera, hurrengo/aurreko "
+"karpetara irakurri gabeko mezuekin joaten bazara karpeta honetan geldituko "
+"zara.</p><p>Desautatu aukera hau jakinarazpenak jaso nahi ez badituzu eta "
+"hurrengo/aurreko karpetara irakurri gabeko mezuekin joatean karpeta hau "
+"ekidin nahi baduzu. Hau erabilgarria da zakarrontizko eta baztergarrien "
+"karpetako mezu berriak edo irakurri gabeei ez ikusia egiteko.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7826,12 +7673,13 @@ msgstr "Mantendu erantzunak karpeta honetan"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Hautatu aukera hau karpetan honetan zuk idazten dituzun erantzunak bidaltzean "
-"karpeta berdinean jartzeko, konfiguratutako bidalitako mezuen karpetaren ordez."
+"Hautatu aukera hau karpetan honetan zuk idazten dituzun erantzunak "
+"bidaltzean karpeta berdinean jartzeko, konfiguratutako bidalitako mezuen "
+"karpetaren ordez."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7841,17 +7689,21 @@ msgstr "Erakutsi bidaltzailea/hartzailea zutabea mezu-zerrendan"
 msgid "Sho&w column:"
 msgstr "Erakut&si zutabea:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Ezarri lehenetsia"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Hartzailea"
@@ -7862,15 +7714,15 @@ msgstr "&Bidaltzailearen identitatea:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Hautatu bidaltzailearen identitatea mezu berria idaztean edo karpeta honetako "
-"posta erantzutean erabiltzeko. Zure laneko karpeta batean bazaude, KMail-ek "
-"dagokion bidaltzailearen helbide elektronikoa, sinadura eta "
+"Hautatu bidaltzailearen identitatea mezu berria idaztean edo karpeta "
+"honetako posta erantzutean erabiltzeko. Zure laneko karpeta batean bazaude, "
+"KMail-ek dagokion bidaltzailearen helbide elektronikoa, sinadura eta "
 "sinadura-/enkriptatze-gakoa automatikoki erabiltzea gaitzen du. Identitateak "
 "konfigurazioko elkarrizketa-koadro nagusian ezar daitezke (Ezarpenak -> "
 "Konfiguratu KMail)"
@@ -7891,19 +7743,19 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Ezarpen honek honakoa definitzen du: karpeta hau partekatzen duten zein "
 "erabiltzailek eskuratu behar dituzten \"lanpetuta\" denbora-tarteak beren "
-"libre/lanpetuta zerrendetan eta zein erabiltzailek ikusi behar dituzten karpeta "
-"honetako zeregin eta gertaeren alarmak. Ezarpen hau Egutegia eta Zeregina "
-"karpetetan du eragina (zereginentzat, ezarpen hau alarmentzat bakarrik "
-"erabiltzen da).\n"
+"libre/lanpetuta zerrendetan eta zein erabiltzailek ikusi behar dituzten "
+"karpeta honetako zeregin eta gertaeren alarmak. Ezarpen hau Egutegia eta "
+"Zeregina karpetetan du eragina (zereginentzat, ezarpen hau alarmentzat "
+"bakarrik erabiltzen da).\n"
 "\n"
 "Erabilerak: buruzagiak karpeta bat bere idazkariarekin partekatzen badu, "
 "buruzagia bakarrik markatu behar da lanpetuta bezala bere bileretan, beraz "
@@ -7943,23 +7795,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Karpeta hau lan-taldearen informaziorako konfiguratu da eta lan-taldeen "
 "karpetak ezkutatzeko konfigurazio orokorreko aukera ezarri da. Honek "
-"konfigurazioko elkarrizketa-koadroa ixtean karpeta desagertuko dela esan nahi "
-"du. Karpeta berriro kendu nahi baduzu, aldi baterako lan-taldeen karpeten "
-"ezkutatzea desgaitu beharko duzu karpeta berriro ikusteko."
+"konfigurazioko elkarrizketa-koadroa ixtean karpeta desagertuko dela esan "
+"nahi du. Karpeta berriro kendu nahi baduzu, aldi baterako lan-taldeen "
+"karpeten ezkutatzea desgaitu beharko duzu karpeta berriro ikusteko."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8028,7 +7880,8 @@ msgstr "Errorea karpetaren informazioa eskuratzean."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "\"%1\"(r)en posta indizea KMail-en bertsio ezezagun batekoa (%2) da.\n"
 "Indize hau posta-karpetatik sor daiteke berriro baina datu batzuk galduko "
@@ -8058,8 +7911,8 @@ msgstr "Errorea %1 irekitzean, karpeta falta da."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Errorea %1 irekitzean, ez da baliozko maildir karpeta edo ez duzu nahikoa "
 "baimenik."
@@ -8104,20 +7957,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>\"%2\" karpetaren indizea zaharkituta dago. Mezuak hondatu ez daitezen, "
-"indizea birsortuko da. Hau dela eta, ezabatutako mezuak berriro ager daitezke "
-"eta egoera-banderak gal daitezke.</p>"
-"<p>Irakurri dagokion sarrera <a href=\"%1\">KMail-en eskuliburuaren MEG "
-"atalean</a> arazo hau ekiditzeko informazioa aurkitzeko.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>\"%2\" karpetaren indizea zaharkituta dago. Mezuak hondatu ez "
+"daitezen, indizea birsortuko da. Hau dela eta, ezabatutako mezuak berriro "
+"ager daitezke eta egoera-banderak gal daitezke.</p><p>Irakurri dagokion "
+"sarrera <a href=\"%1\">KMail-en eskuliburuaren MEG atalean</a> arazo hau "
+"ekiditzeko informazioa aurkitzeko.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8177,7 +8027,7 @@ msgstr ""
 "'%1' ez dirudi karpeta denik.\n"
 "Kendu fitxategia handik."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8185,7 +8035,7 @@ msgstr ""
 "'%1' karpetaren baimenak gaizki daude,\n"
 "egiaztatu karpetaren edukia ikusi eta aldatu ditzakezula."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8195,8 +8045,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8204,7 +8054,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Huts egin du karpeta sortzean"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8305,9 +8155,9 @@ msgstr "IMAP cache-aren &arazo-konponketak..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Ezin da <b>%1</b> karpeta sortu zerbitzarian beharrezko baimenik ez "
 "duzulako. Azpikarpetak sortu behar baduzu, eskatu administratzaileari "
@@ -8337,14 +8187,16 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Ezin da <b>%1</b> karpeta bere azpian dagoen azpikarpeta batera eraman.</qt>"
+"<qt>Ezin da <b>%1</b> karpeta bere azpian dagoen azpikarpeta batera eraman.</"
+"qt>"
 
 #: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Ezin da <b>%1</b> karpeta bere azpian dagoen azpikarpeta batera eraman.</qt>"
+"<qt>Ezin da <b>%1</b> karpeta bere azpian dagoen azpikarpeta batera eraman.</"
+"qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8451,15 +8303,15 @@ msgstr "%1 karpeta irakurtzeko soilik da."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Benetan ezabatu nahi duzu hautatutako mezua? "
-"<br>Behin ezabatuta, ezin da berreskuratu</qt>\n"
-"<qt>Benetan ezabatu nahi dituzu hautatutako %n mezuak?"
-"<br>Behin ezabatuta, ezin dira berreskuratu</qt>"
+"<qt>Benetan ezabatu nahi duzu hautatutako mezua? <br>Behin ezabatuta, ezin "
+"da berreskuratu</qt>\n"
+"<qt>Benetan ezabatu nahi dituzu hautatutako %n mezuak?<br>Behin ezabatuta, "
+"ezin dira berreskuratu</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8511,133 +8363,132 @@ msgstr ""
 "Huts egin du %1 aldatzean\n"
 "(gailuan leku librerik ez?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Sinaduraren ziurtagiriaren eskaera"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Sortu ziurtagiri bat eranskinetik eta itzuli bidaltzaileari."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail lineaz kanpoko egoeran dago. Sareko lan guztiak geldituko dira"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail lineako egoeran dago. Sareko lan guztiak jarraituko dira"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "Unean KMail lineaz kanpoko moduan dago. Nola jarraitu nahi duzu?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Linean lan egin"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Lineaz kanpo lan egin"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Ez duzu irakurtzeko/idazteko baimenik zure sarrerako ontzian."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "irteerako ontzia"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Ez duzu irakurtzeko/idazteko baimenik zure irterako ontzian."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Bidalitakoak"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Ez duzu irakurtzeko/idazteko baimenik zure bidalitakoen ontzian."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "zakarrontzia"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Ez duzu irakurtzeko/idazteko baimenik zure zakarrontzian."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "zirriborroak"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Ez duzu irakurtzeko/idazteko baimenik zure zirriborroen ontzian."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Ez duzu irakurtzeko/idazteko baimenik zure zakarrontzian."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Azkeneko bilaketa"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i> karpeta badago lehendik. %1(e)k orain <i>%5</i> "
-"karpeta erabiltzen du bere mezuentzat."
-"<p>%2(e)k <i>%6<i>(r)en edukia karpeta honetara eraman dezake, baina honek <i>"
-"%7</i>(e)ko izen bereko lehengo fitxategiak ordeztu ditzake."
-"<p><strong>%3(e)k posta fitxategiak lekuz aldatzea nahi duzu?</strong></qt>"
+"<qt><i>%4</i> karpeta badago lehendik. %1(e)k orain <i>%5</i> karpeta "
+"erabiltzen du bere mezuentzat.<p>%2(e)k <i>%6<i>(r)en edukia karpeta "
+"honetara eraman dezake, baina honek <i>%7</i>(e)ko izen bereko lehengo "
+"fitxategiak ordeztu ditzake.<p><strong>%3(e)k posta fitxategiak lekuz "
+"aldatzea nahi duzu?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i> karpeta badago lehendik. %1(e)k orain <i>%5</i> "
-"karpeta erabiltzen du bere mezuentzat. %2(e)k <i>%6<i>"
-"(r)en edukia karpeta honetara eraman dezake."
-"<p><strong>%3(e)k posta fitxategiak lekuz aldatzea nahi duzu?</strong></qt>"
+"<qt><i>%4</i> karpeta badago lehendik. %1(e)k orain <i>%5</i> karpeta "
+"erabiltzen du bere mezuentzat. %2(e)k <i>%6<i>(r)en edukia karpeta honetara "
+"eraman dezake.<p><strong>%3(e)k posta fitxategiak lekuz aldatzea nahi duzu?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migratu posta fitxategiak?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail-ek errore larri bat aurkitu du eta itxi egingo da"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8648,11 +8499,11 @@ msgstr ""
 "Errorea hau zen:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Hustu zakarrontzia"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ziur zaude kontu guztien zakarrontziko karpetak hustu nahi dituzula?"
 
@@ -8727,8 +8578,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Mezu berriak dituzu</b> <br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8766,8 +8616,8 @@ msgstr "Ziur zaude zakarrontziko karpeta hustu nahi duzula?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Ziur zaude <b>%1</b> karpetako mezu guztiak zakarrontzira botatzea nahi "
 "dituzula?</qt>"
@@ -8794,12 +8644,11 @@ msgstr "Ezabatu bilaketa"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Ziur zaude <b>%1</b> bilaketa ezabatu nahi duzula? "
-"<br>Bertan bistaratutako mezuak jatorrizko karpetan egongo dira "
-"eskuragarri.</qt>"
+"<qt>Ziur zaude <b>%1</b> bilaketa ezabatu nahi duzula? <br>Bertan "
+"bistaratutako mezuak jatorrizko karpetan egongo dira eskuragarri.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8812,40 +8661,41 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Ziur zaude <b>%1</b> karpeta hutsa eta bere azpikarpetak ezabatu nahi "
 "dituzula? Azpikarpeta hauek agian ez daude hutsik eta bere edukiak ere galdu "
-"egingo dira. "
-"<p><b>Jakin ezazu</b> baztertutako mezuak ez direla zakarrontzian gordetzen eta "
-"betirako ezabatzen direla.</qt>"
+"egingo dira. <p><b>Jakin ezazu</b> baztertutako mezuak ez direla "
+"zakarrontzian gordetzen eta betirako ezabatzen direla.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Ziur zaude <b>%1</b> karpeta eta bere edukia ezabatu nahi dituzula?"
-"<p><b>Jakin ezazu</b> baztertutako mezuak ez direla zakarrontzian gordetzen eta "
-"betirako ezabatzen direla.</qt>"
+"<p><b>Jakin ezazu</b> baztertutako mezuak ez direla zakarrontzian gordetzen "
+"eta betirako ezabatzen direla.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ziur zaude <b>%1</b> karpeta, bere azpikarpetak eta hauen edukiak ezabatu "
-"nahi dituzula?"
-"<p><b>Jakin ezazu</b> baztertutako mezuak ez direla zakarrontzian gordetzen eta "
-"betirako ezabatzen direla.</qt>"
+"<qt>Ziur zaude <b>%1</b> karpeta, bere azpikarpetak eta hauen edukiak "
+"ezabatu nahi dituzula?<p><b>Jakin ezazu</b> baztertutako mezuak ez direla "
+"zakarrontzian gordetzen eta betirako ezabatzen direla.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Ezabatuta"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8861,9 +8711,9 @@ msgstr "Ziur zaude mezu zahar guztiak iraungitzea nahi dituzula?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Mmezuak HTML formatuan erabiltzean \"baztergarrien\" aurrean arrisku gehiago "
 "izateko aukera gehiago dago, eta sistema arriskuan jar dezakezu."
@@ -8879,8 +8729,8 @@ msgstr "Erabili HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Kanpoko html erreferentziak kargatzean sistema arriskuan jar dezakezu "
 "\"baztergarrien\" aurrean."
@@ -8899,12 +8749,13 @@ msgstr "Iragazi %1 posta-zerrendan..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMail-en bulegotik kanpoko erantzunaren funtzionaltasuna zerbitzariaren aldeko "
-"iragazketan datza. Oraindik ez duzu IMAP zerbitzaririk konfiguratu honentat.\n"
+"KMail-en bulegotik kanpoko erantzunaren funtzionaltasuna zerbitzariaren "
+"aldeko iragazketan datza. Oraindik ez duzu IMAP zerbitzaririk konfiguratu "
+"honentat.\n"
 "Hau IMAP kontuaren konfigurazioaren \"Iragazketa\" fitxan egin dezakezu."
 
 #: kmmainwidget.cpp:1743
@@ -8920,7 +8771,8 @@ msgstr "Ezin izan da ziurtagiri kudeatzailea abiarazi; egiaztatu instalazioa."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Ezin izan da GnuPG-ren egunkari-ikustailea abiarazi, egiaztatu instalazioa."
 
@@ -9253,8 +9105,7 @@ msgstr "Gorde &eranskinak..."
 msgid "Appl&y All Filters"
 msgstr "A&plikatu iragazki guztiak"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&plikatu iragazkia"
@@ -9368,7 +9219,6 @@ msgstr "Hurrengo &irakurri gabeko mezua"
 msgid "Go to the next unread message"
 msgstr "Joan irakurri gabeko hurrengo mezura"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Aurreko mezua"
@@ -9416,8 +9266,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Korritu behera uneko mezua. Uneko mezuaren bukaera bada, joan irakurri gabeko "
-"hurrengo mezura."
+"Korritu behera uneko mezua. Uneko mezuaren bukaera bada, joan irakurri "
+"gabeko hurrengo mezura."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9509,21 +9359,21 @@ msgstr " Hasieratzen..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mezu honek eskuratze-jakinarazpen bat bidaltzeko eskaera du.\n"
-"Ez ikusia egin dezaiokezu edo utzi KMail-i \"ukatuta\" erantzuna edo erantzun "
-"normal bat bidaltzen."
+"Ez ikusia egin dezaiokezu edo utzi KMail-i \"ukatuta\" erantzuna edo "
+"erantzun normal bat bidaltzen."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Mezu honek eskuratze-jakinarazpen bat bidaltzeko eskaera du.\n"
@@ -9533,43 +9383,44 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mezu honek eskuratze-jakinarazpen bat bidaltzeko eskaera du,\n"
 "baina jakinarazpena hainbat helbidetara bidaltzea eskatzen da.\n"
-"Ez ikusia egin dezaiokezu edo utzi KMail-ek \"ukatuta\" erantzuna edo erantzun "
-"normala bidaltzen."
+"Ez ikusia egin dezaiokezu edo utzi KMail-ek \"ukatuta\" erantzuna edo "
+"erantzun normala bidaltzen."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mezu honek eskuratze-jakinarazpen bat bidaltzeko eskaera du,\n"
 "baina ez da itzulera-biderik ezarri.\n"
-"Ez ikusia egin dezaiokezu edo utzi KMail-i \"ukatuta\" erantzuna edo erantzun "
-"normala bidaltzen."
+"Ez ikusia egin dezaiokezu edo utzi KMail-i \"ukatuta\" erantzuna edo "
+"erantzun normala bidaltzen."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mezu honek eskuratze-jakinarazpen bat bidaltzeko eskaera du,\n"
-"baina itzulera-bidearen helbidea ez dator bat jakinarazpenaren helbidearekin.\n"
-"Ez ikusia egin dezaiokezu edo utzi KMail-i \"ukatuta\" erantzuna edo erantzun "
-"normala bidaltzen."
+"baina itzulera-bidearen helbidea ez dator bat jakinarazpenaren "
+"helbidearekin.\n"
+"Ez ikusia egin dezaiokezu edo utzi KMail-i \"ukatuta\" erantzuna edo "
+"erantzun normala bidaltzen."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9595,17 +9446,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Irakurragiria: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Eranskina: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Erakutsi eranskinak bidaltzaileak dioen bezala."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9655,45 +9506,37 @@ msgstr "Mezu zatiaren propietateak"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fitxategiaren <em>MIME-mota</em>:</p>"
-"<p>normalean, ez da ezarpen hau ukitu behar, mota automatikoki egiaztatzen "
-"delako, hala ere batzutan %1(e)k ez du mota ongi detektatzen eta hemen zuzen "
-"dezakezu.</p></qt>"
+"<qt><p>Fitxategiaren <em>MIME-mota</em>:</p><p>normalean, ez da ezarpen hau "
+"ukitu behar, mota automatikoki egiaztatzen delako, hala ere batzutan %1(e)k "
+"ez du mota ongi detektatzen eta hemen zuzen dezakezu.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zatiaren tamaina:</p>"
-"<p>batzutan, %1(e)k estimatutako tamaina bat ematen du, tamaina zehatzaren "
-"kalkuluak asko iraun dezakeelako. Hau gertatzen denean, \"(est.)\" gehituko "
-"zaio bistaratutako tamainari.</p></qt>"
+"<qt><p>Zatiaren tamaina:</p><p>batzutan, %1(e)k estimatutako tamaina bat "
+"ematen du, tamaina zehatzaren kalkuluak asko iraun dezakeelako. Hau "
+"gertatzen denean, \"(est.)\" gehituko zaio bistaratutako tamainari.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zatiaren fitxategi-izena:</p>"
-"<p>nahiz eta hau lehenespenez erantsitako fitxategiaren izena den, ez du "
-"erantsitako fitxategia zehazten, posta-bezeroak zatia diskoan gordetzean "
-"erabili dezakeen izenaren iradokizun bat da.</p></qt>"
+"<qt><p>Zatiaren fitxategi-izena:</p><p>nahiz eta hau lehenespenez "
+"erantsitako fitxategiaren izena den, ez du erantsitako fitxategia zehazten, "
+"posta-bezeroak zatia diskoan gordetzean erabili dezakeen izenaren iradokizun "
+"bat da.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9701,17 +9544,14 @@ msgstr "&Azalpena:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zatiaren azalpena:</p>"
-"<p>hau zatiaren azalpena da, mezu osoaren \"Gaia\" eremuaren antzekoa. "
-"Posta-bezero gehienek informazio hau beren aurrebistetan erakutsiko dute "
-"eranskinaren ikonoarekin batera.</p></qt>"
+"<qt><p>Zatiaren azalpena:</p><p>hau zatiaren azalpena da, mezu osoaren \"Gaia"
+"\" eremuaren antzekoa. Posta-bezero gehienek informazio hau beren "
+"aurrebistetan erakutsiko dute eranskinaren ikonoarekin batera.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9719,22 +9559,19 @@ msgstr "&Kodeketa:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Zatiaren garraio-kodeketa:</p>"
-"<p>normalean ez duzu hau aldatu behar, %1(e)k kodeketa on bat erabiliko duelako "
-"MIME motaren arabera. Hala ere, batzutan, mezuaren tamaina murriztu dezakezu, "
-"adibidez, datu bitarrak ez dituen PostScript fitxategi batekin \"AIpu "
-"inprimagarria\" hautatuz \"64 oinarria\"-ren ordez, % 25 aurreztu dezakezu "
-"mezuaren tamainan.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Zatiaren garraio-kodeketa:</p><p>normalean ez duzu hau aldatu behar, "
+"%1(e)k kodeketa on bat erabiliko duelako MIME motaren arabera. Hala ere, "
+"batzutan, mezuaren tamaina murriztu dezakezu, adibidez, datu bitarrak ez "
+"dituen PostScript fitxategi batekin \"AIpu inprimagarria\" hautatuz \"64 "
+"oinarria\"-ren ordez, % 25 aurreztu dezakezu mezuaren tamainan.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9742,20 +9579,17 @@ msgstr "Proposatu &automatikoki erakusteko"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hautatu aukera hau hartzaileak zati hau mezuaren aurrebistan automatikoki "
-"(barneratuta) bistaratzea iradokitzeko, ikono ikuspegi lehenetsiaren ordez.</p>"
-"<p>Teknikoki, hau zati honen <em>Content-Disposition</em> "
-"goiburuko eremua \"inline\" balioara ezartzean lortzen da,\"attachment\" "
-"balioaren ordez.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Hautatu aukera hau hartzaileak zati hau mezuaren aurrebistan "
+"automatikoki (barneratuta) bistaratzea iradokitzeko, ikono ikuspegi "
+"lehenetsiaren ordez.</p><p>Teknikoki, hau zati honen <em>Content-"
+"Disposition</em> goiburuko eremua \"inline\" balioara ezartzean lortzen da,"
+"\"attachment\" balioaren ordez.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9763,14 +9597,12 @@ msgstr "&Sinatu zati hau"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hautatu aukera hau mezu zatia hau sinatu nahi baduzu.</p>"
-"<p>Sinadura unean hautatutako identitatearen gakoarekin egingo da.</p></qt>"
+"<qt><p>Hautatu aukera hau mezu zatia hau sinatu nahi baduzu.</p><p>Sinadura "
+"unean hautatutako identitatearen gakoarekin egingo da.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9778,13 +9610,11 @@ msgstr "&Enkriptatu zati hau"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hautatu aukera hau mezu zatia hau enkriptatu nahi baduzu.</p>"
-"<p>Zati hau mezu honen hartzaileentzat enkriptatuko da.</p></qt>"
+"<qt><p>Hautatu aukera hau mezu zatia hau enkriptatu nahi baduzu.</p><p>Zati "
+"hau mezu honen hartzaileentzat enkriptatuko da.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9798,16 +9628,13 @@ msgstr "POP iragazkia"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Iragazteko mezuak aurkitu dira POP kontuan: <b>%1</b>"
-"<p>Erakutsitako mezuek kontu honentzat definitutako tamaina maximoa gainditzen "
-"dute."
-"<br>Mezu hauekin zer egin nahi duzun hautatzeko, hautatu botoi egokia."
+"Iragazteko mezuak aurkitu dira POP kontuan: <b>%1</b><p>Erakutsitako mezuek "
+"kontu honentzat definitutako tamaina maximoa gainditzen dute.<br>Mezu "
+"hauekin zer egin nahi duzun hautatzeko, hautatu botoi egokia."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10061,40 +9888,39 @@ msgstr "K Mahaigaineko Ingurunearen (TDE) posta-bezeroa."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Karpetaren edukia eskuratzen</h2>"
-"<p>Itxaron . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Karpetaren edukia eskuratzen</"
+"h2><p>Itxaron . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Lineaz kanpo</h2>"
-"<p>KMail une honetan lineaz kanpoko moduan dago. Egin klik <a "
-"href=\"kmail:goOnline\">hemen</a> lineako egoerara joateko . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Lineaz kanpo</h2><p>KMail une honetan lineaz "
+"kanpoko moduan dago. Egin klik <a href=\"kmail:goOnline\">hemen</a> lineako "
+"egoerara joateko . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10102,12 +9928,12 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Ongi etorri KMail %1 bertsiora</h2>"
-"<p>KMail K Mahaingaineko Ingurunearen (TDE) posta-bezeroa da. Interneteko posta "
-"estandarrekin bateragarria izateko diseinatua: adibidez, MIME, SMTP, POP3 eta "
-"IMAP.</p>\n"
-"<ul>"
-"<li>KMail-en gaitasunak <a href=\"%2\">dokumentazioan</a> azaltzen dira</li>\n"
+"<h2 style='margin-top: 0px;'>Ongi etorri KMail %1 bertsiora</h2><p>KMail K "
+"Mahaingaineko Ingurunearen (TDE) posta-bezeroa da. Interneteko posta "
+"estandarrekin bateragarria izateko diseinatua: adibidez, MIME, SMTP, POP3 "
+"eta IMAP.</p>\n"
+"<ul><li>KMail-en gaitasunak <a href=\"%2\">dokumentazioan</a> azaltzen dira</"
+"li>\n"
 "<li><a href=\"%3\">KMail-en orri nagusiak</A> KMail-en bertsioei buruzko "
 "informazioa eskeintzen dute</li></ul>\n"
 "%8\n"
@@ -10121,15 +9947,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail-en taldea</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10143,8 +9967,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Aldaketa "
-"garrantzitsuak</span> (KMail %1 bertsioarekin konparatuta):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Aldaketa garrantzitsuak</"
+"span> (KMail %1 bertsioarekin konparatuta):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10175,7 +9999,8 @@ msgstr "Ikusi eranskina: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: eranskinak datu bitarrak ditu. Lehenengo karakterea erakusten "
@@ -10197,7 +10022,8 @@ msgid ""
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 "Ireki \"%1\" eranskina?\n"
-"Kontutan hartu eranskin bat irekitzeak sistemaren segurtasuna hauts dezakeela."
+"Kontutan hartu eranskin bat irekitzeak sistemaren segurtasuna hauts "
+"dezakeela."
 
 #: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
@@ -10205,12 +10031,14 @@ msgstr "Ireki eranskina?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10232,6 +10060,58 @@ msgstr "(bat etorri honako edozeinekin)"
 msgid "(match all of the following)"
 msgstr "(bat etorri honako guztiekin)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Irakurrita"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Zaharra"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Ezabatuta"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Erantzunda"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Birbidalita"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Ilaran"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Bidalita"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Begiratuta"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ez ikusia"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Baztergarria"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Arrunta"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Zeregina"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Eranskina du"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10311,30 +10191,30 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Errore kritikoa: ezin daq bidalitako mezua prozesatu (leku librerik ez?) Huts "
-"egin du mezua \"bidalitakoak\" karpetara eramatean."
+"Errore kritikoa: ezin daq bidalitako mezua prozesatu (leku librerik ez?) "
+"Huts egin du mezua \"bidalitakoak\" karpetara eramatean."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Huts egin du bidalitako \"%1\" mezua \"irteerako ontzitik\" \"bidalitakoak\" "
 "karpetara eramatean.\n"
-"Arrazoi posibleak: diskoan lekurik librerik ez egotea, edo idazteko baimenik ez "
-"izatea. Saiatu arazoa konpontzen eta eskuz aldatu mezua lekuz."
+"Arrazoi posibleak: diskoan lekurik librerik ez egotea, edo idazteko baimenik "
+"ez izatea. Saiatu arazoa konpontzen eta eskuz aldatu mezua lekuz."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Ezin dira bidaltzailearen helbidea zehaztu gabe mezuak bidali.\n"
-"Ezarri %1 identitatearen helbide elektronikoa konfigurazioko "
-"elkarrizketa-koadroko Identitateak atalean eta saiatu berriro."
+"Ezarri %1 identitatearen helbide elektronikoa konfigurazioko elkarrizketa-"
+"koadroko Identitateak atalean eta saiatu berriro."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10359,8 +10239,8 @@ msgstr "Abiarazten bidaltzeko prozesua..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Ilarako mezu guztiak enkriptaziorik gabeko garraio bidez bidaltzea hautatu "
 "duzu, jarraitu nahi al duzu? "
@@ -10387,8 +10267,9 @@ msgstr "Huts egin du ilaran gordetako mezua(k) bidaltzean."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10405,20 +10286,16 @@ msgstr "Bidaltzea bertan behera utzi da."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Errorea bidaltzean:</p>"
-"<p>%1</p>"
-"<p>Mezua \"Irteerako ontzian\" geldituko da arazoa konpondu arte (adibidez, "
-"helbide okerra) edo kendu mezua \"Irteerako ontzitik\".</p>"
-"<p>Erabilitako garraio-protokoloa: %2</p>"
-"<p>Gelditzen diren mezuak bidaltzen jarraitu nahi duzu?</p>"
+"<p>Errorea bidaltzean:</p><p>%1</p><p>Mezua \"Irteerako ontzian\" geldituko "
+"da arazoa konpondu arte (adibidez, helbide okerra) edo kendu mezua "
+"\"Irteerako ontzitik\".</p><p>Erabilitako garraio-protokoloa: %2</"
+"p><p>Gelditzen diren mezuak bidaltzen jarraitu nahi duzu?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10436,8 +10313,9 @@ msgstr "&Abortatu bidaltzea"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10463,8 +10341,8 @@ msgid ""
 msgstr ""
 "Errorea bidaltzean:\n"
 "%1\n"
-"Mezua \"Irteerako ontzian\" geldituko da eta berriro bidaliko da. Kendu hortik "
-"mezua berriro bidaltzea nahi ez baduzu.\n"
+"Mezua \"Irteerako ontzian\" geldituko da eta berriro bidaliko da. Kendu "
+"hortik mezua berriro bidaltzea nahi ez baduzu.\n"
 "<p>Erabilitako garraio-protokoloa:\n"
 "%2"
 
@@ -10480,14 +10358,14 @@ msgstr "Sendmail ustegabean irten da."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Erabiltzaile-izena eta pasahitza eman behar duzu SMTP zerbitzaria erabili ahal "
-"izateko."
+"Erabiltzaile-izena eta pasahitza eman behar duzu SMTP zerbitzaria erabili "
+"ahal izateko."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 abioan dagoela dirudi ordenagailuko beste laneko area batean. %2 hainbat "
 "aldiz exekutatzen baduzu, posta gal dezakezu. Ez zenuke %1 abiatu behar "
@@ -10495,29 +10373,29 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 abioan dagoela dirudi ordenagailuko beste laneko area batean. %1 eta %2 aldi "
-"berean exekutatzen badituzu posta gal dezakezu. Ez zenuke %2 abiatu behar %1 "
-"martxan dagoela ez badakizu."
+"%1 abioan dagoela dirudi ordenagailuko beste laneko area batean. %1 eta %2 "
+"aldi berean exekutatzen badituzu posta gal dezakezu. Ez zenuke %2 abiatu "
+"behar %1 martxan dagoela ez badakizu."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 dagoeneko %2(e)n exekutatzen ari da. %1 hainbat aldiz exekutatzean posta gal "
-"dezakezu. Ez zenuke %1 abiatu behar dagoeneko %2(e)n martxan dagoela ez "
+"%1 dagoeneko %2(e)n exekutatzen ari da. %1 hainbat aldiz exekutatzean posta "
+"gal dezakezu. Ez zenuke %1 abiatu behar dagoeneko %2(e)n martxan dagoela ez "
 "badakizu."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 dagoeneko %3(e)n exekutatzen ari da. %1 eta %2 aldi berean exekutatzen "
 "badituzu posta gal dezakezu. Ez zenuke %2 abiatu behar dagoeneko %1 %3-(e)n "
@@ -10532,6 +10410,10 @@ msgstr "Abiatu %1"
 msgid "Exit"
 msgstr "Irten"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Mezu berria hemen"
@@ -10558,15 +10440,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet ez dago eskuragarri. Pasahitzak kudeatzeko TDEWallet erabiltzea "
 "gomendatzen da.\n"
-"Hala ere, KMail-ek pasahitzak konfigurazio-fitxategian gorde ditzake. Pasahitza "
-"nahastutako formatu batean gordeko da baina ez da segurua bezala kontsideratu "
-"behar norbaiteko fitxategia eskuratzen badu.\n"
+"Hala ere, KMail-ek pasahitzak konfigurazio-fitxategian gorde ditzake. "
+"Pasahitza nahastutako formatu batean gordeko da baina ez da segurua bezala "
+"kontsideratu behar norbaiteko fitxategia eskuratzen badu.\n"
 "\"%1\" kontuaren pasahitza konfigurazio-fitxategian gorde nahi duzu?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10645,11 +10528,11 @@ msgstr "Zerbitzariak a&utentifikazioa behar du"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Hautatu hau SMTP zerbitzariak autentifikazioa behar badu posta onartzeko. Hau "
-"\"SMTP autentifikatua\" edo ASMTP bezala ezagutzen da."
+"Hautatu hau SMTP zerbitzariak autentifikazioa behar badu posta onartzeko. "
+"Hau \"SMTP autentifikatua\" edo ASMTP bezala ezagutzen da."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10669,13 +10552,12 @@ msgstr "&Bidali ostalari-izen pertsonalizatua zerbitzariari"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Hautatu hau zerbitzarian identifikatzean KMail-ek ostalari-izen pertsonalizatua "
-"erabiltzeko.\n"
+"Hautatu hau zerbitzarian identifikatzean KMail-ek ostalari-izen "
+"pertsonalizatua erabiltzeko.\n"
 "<p>Hau erabilgarria da sistemaren ostalari-izena ongi ezarri ez bada edo "
 "sistemaren ostalari-izena mozorrotzeko."
 
@@ -10708,11 +10590,11 @@ msgstr "Fitxategi lokalak soilik baimenduta."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Ezin da ostalariaren eremua hutsik utzi. Sartu SMTP zerbitzariaren IP helbidea "
-"edo izena."
+"Ezin da ostalariaren eremua hutsik utzi. Sartu SMTP zerbitzariaren IP "
+"helbidea edo izena."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10724,10 +10606,10 @@ msgstr "Errorea %1 karpeta zerrendatzean: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10949,35 +10831,28 @@ msgstr "E&ditatu mezua"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kriptografiako plugin-ak itzulitako egitura-informazioa ezin izan da ongi "
-"prozesatu. Plugin-a hondatuta egon daiteke.</p>"
-"<p>Jar zaitez sistemako administratzailearekin harremanetan.</p></qt>"
+"<qt><p>Kriptografiako plugin-ak itzulitako egitura-informazioa ezin izan da "
+"ongi prozesatu. Plugin-a hondatuta egon daiteke.</p><p>Jar zaitez sistemako "
+"administratzailearekin harremanetan.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Ez da kriptografia lantzeko plugin aktiborik aurkitu eta barneko OpenPGP "
-"kodea ez da ongi exekutatu.</p>"
-"<p>Bi gauza egin ditzakezu hau aldatzeko:</p>"
-"<ul>"
-"<li><em>edo</em> aktibatu plugin-a Ezarpenak->Konfiguratu KMail->"
-"Plugin-a elkarrizketa-koadroa erabiliz.</li>"
-"<li><em>edo</em> zehaztu OpenPGP ezarpen tradizionalak elkarrizketa-koadro "
-"horren Identitatea->Aurreratua fitxan.</li></ul>"
+"kodea ez da ongi exekutatu.</p><p>Bi gauza egin ditzakezu hau aldatzeko:</"
+"p><ul><li><em>edo</em> aktibatu plugin-a Ezarpenak->Konfiguratu KMail-"
+">Plugin-a elkarrizketa-koadroa erabiliz.</li><li><em>edo</em> zehaztu "
+"OpenPGP ezarpen tradizionalak elkarrizketa-koadro horren Identitatea-"
+">Aurreratua fitxan.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10989,11 +10864,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus motorrak ez du \"x-encrypt\" funtziorik eskeintzen. Eskertuko genizuke "
-"errore honi buruz berri emango bazenu."
+"Chiasmus motorrak ez du \"x-encrypt\" funtziorik eskeintzen. Eskertuko "
+"genizuke errore honi buruz berri emango bazenu."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11009,20 +10884,21 @@ msgstr "Chiasmus-en enkriptazioko errorea"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Chiasmus motorrak espero ez zen balio bat itzuli du. \"x-encrypt\" funtzioak ez "
-"du byte array-rik itzuli. Eskertuko genizuke errore honen berri emango bazenu."
+"Chiasmus motorrak espero ez zen balio bat itzuli du. \"x-encrypt\" funtzioak "
+"ez du byte array-rik itzuli. Eskertuko genizuke errore honen berri emango "
+"bazenu."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Barneko OpenPGP mezu-kriptografia formatuak ez du eranskinen enkriptazioa edo "
-"sinadura onartzen.\n"
+"Barneko OpenPGP mezu-kriptografia formatuak ez du eranskinen enkriptazioa "
+"edo sinadura onartzen.\n"
 "Zaharkitutako barneko OpenPGP erabiltzea nahi duzu?"
 
 #: messagecomposer.cpp:640
@@ -11126,13 +11002,14 @@ msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"Baliozko konfidantzazko enkriptatze-gakoak aurkitu dira hartzaile guztientzat.\n"
+"Baliozko konfidantzazko enkriptatze-gakoak aurkitu dira hartzaile "
+"guztientzat.\n"
 "Mezu hau enkriptatu?"
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Hartzaileen enkriptatze-hobespenen azterketak mezu hau enkriptatu nahi duzun "
@@ -11169,8 +11046,9 @@ msgstr "E&z enkriptatu"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Mezu hau enkriptatzea eskatu duzu eta zure buruari kopia bat enkriptatzea, "
 "baina ez duzu baliozko konfidantzazko enkriptatze-gakorik konfiguratu "
@@ -11183,12 +11061,13 @@ msgstr "Bidali enkriptatu gabe?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Mezu honen zati batzuk ez dira enkriptatuko.\n"
-"Agian partzialki enkriptatutako mezuek ez dute gunearen politika jarraituko.\n"
+"Agian partzialki enkriptatutako mezuek ez dute gunearen politika "
+"jarraituko.\n"
 "Zati guztiak enkriptatzea nahi?"
 
 #: messagecomposer.cpp:950
@@ -11199,8 +11078,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Mezu hau ez da enkriptatuko.\n"
-"Enkriptatu gabeko mezuak bidaltzeak gunearen politikaren aurka joan daiteke edo "
-"informazio sentibera erakutsi dezake.\n"
+"Enkriptatu gabeko mezuak bidaltzeak gunearen politikaren aurka joan daiteke "
+"edo informazio sentibera erakutsi dezake.\n"
 "Horren ordez mezua enkriptatu nahi duzu?"
 
 #: messagecomposer.cpp:955
@@ -11211,92 +11090,88 @@ msgstr "&Enkriptatu zati denak"
 msgid "Unencrypted Message Warning"
 msgstr "Enkriptatu gabeko mezuen abisua"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Errorea: motorrak ez du kodetutako daturik itzuli.</p>"
-"<p>Eskertuko genizuke honako errorearen berri emango bazenu:"
-"<br>%2</p></qt>"
+"<qt><p>Errorea: motorrak ez du kodetutako daturik itzuli.</p><p>Eskertuko "
+"genizuke honako errorearen berri emango bazenu:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Karaktere guztiak ez dira hautatutako kodeketan sartzen."
-"<br>"
-"<br>Bidali mezua dena den?</qt>"
+"<qt>Karaktere guztiak ez dira hautatutako kodeketan sartzen.<br><br>Bidali "
+"mezua dena den?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Karaktere batzuk galduko dira"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Galdu karaktereak"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Aldatu kodeketa"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Ezin izan da mezu hau sinatu, badirudi motorrak ez duela onartzen sinatzea. Hau "
-"ez litzateke inoiz gertatu behar. Eskertuko genizuke errore honen berri emango "
-"bazenu."
+"Ezin izan da mezu hau sinatu, badirudi motorrak ez duela onartzen sinatzea. "
+"Hau ez litzateke inoiz gertatu behar. Eskertuko genizuke errore honen berri "
+"emango bazenu."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Ezin izan da mezu hau sinatu, badirudi motorrak ez duela onartzen sinatzea. Hau "
-"ez litzateke inoiz gertatu behar. Eskertuko genizuke errore honen berri emango "
-"bazenu."
+"Ezin izan da mezu hau sinatu, badirudi motorrak ez duela onartzen sinatzea. "
+"Hau ez litzateke inoiz gertatu behar. Eskertuko genizuke errore honen berri "
+"emango bazenu."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"Huts egin du sinatzeko eragiketak. Ziurtatu gpg programa exekutatzen ari dela."
+"Huts egin du sinatzeko eragiketak. Ziurtatu gpg programa exekutatzen ari "
+"dela."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Mezu hau ezin izan da enkriptatu, badirudi hautatutako motorrak ez duela "
-"enkriptazioa onartzen. Hau ez litzateke inoiz gertatu behar. Eskertuko genizuke "
-"errore honen berri emango bazenu."
+"enkriptazioa onartzen. Hau ez litzateke inoiz gertatu behar. Eskertuko "
+"genizuke errore honen berri emango bazenu."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Mezu hau ezin izan da enkriptatu eta sinatu, badirudi hautatutako motorrak ez "
-"duela enkriptatzea eta sinatzea onartzen. Hau ez litzateke inoiz gertatu behar. "
-"Eskertuko genizuke errore honen berri emango bazenu."
+"Mezu hau ezin izan da enkriptatu eta sinatu, badirudi hautatutako motorrak "
+"ez duela enkriptatzea eta sinatzea onartzen. Hau ez litzateke inoiz gertatu "
+"behar. Eskertuko genizuke errore honen berri emango bazenu."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11317,15 +11192,15 @@ msgstr "Postontziaren &formatua:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Hautatu mezuak gordetzeko metodoa: karpeta bateko mezu guztiak fitxategi handi "
-"batean (mbox);  edo fitxategi bat mezuko (maildir). KMail-ek maildir erabiltzen "
-"du lehenespenez eta normalean ez duzu hau aldatu beharrik. Ziur ez bazaude, "
-"utzi aukera dagoen bezala."
+"Hautatu mezuak gordetzeko metodoa: karpeta bateko mezu guztiak fitxategi "
+"handi batean (mbox);  edo fitxategi bat mezuko (maildir). KMail-ek maildir "
+"erabiltzen du lehenespenez eta normalean ez duzu hau aldatu beharrik. Ziur "
+"ez bazaude, utzi aukera dagoen bezala."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11334,12 +11209,12 @@ msgstr "&Karpetaren edukia:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Hautatu karpeta berria posta gordetzeko edo talde-lanaren elementuak "
-"(zereginak, oharrak...) gordetzeko erabiliko den. Lehenetsia posta da. Ziur ez "
-"bazaude, utzi aukera dagoen bezala."
+"(zereginak, oharrak...) gordetzeko erabiliko den. Lehenetsia posta da. Ziur "
+"ez bazaude, utzi aukera dagoen bezala."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11378,8 +11253,7 @@ msgstr "Sinaduren emaitza desberdinak"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Kriptografia-motorrak ez du testu argian daturik itzuli."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Egoera: "
 
@@ -11408,11 +11282,11 @@ msgstr "Ez da %1 plugin-a aurkitu."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Mezua sinatuta dago, baina sinaduraren baliozkotasuna ezin da egiaztatu."
-"<br/>Arrazoia: %1"
+"Mezua sinatuta dago, baina sinaduraren baliozkotasuna ezin da egiaztatu.<br/"
+">Arrazoia: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11448,23 +11322,23 @@ msgstr "\"%1\" crypto pluginak ezin ditu mezuak desenkriptatu"
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Oharra:</b>HTML formatuko mezu honek kanpoko irudien erreferentziak izan "
-"ditzake. Segurtasun/pribatutasun arrazoiak direla eta, kanpoko erreferentziak "
-"ez dira kargatzen. Mezu honen bidaltzailean konfidantza baduzu, kanpoko "
-"erreferentziak <a href=\"kmail:loadExternal\">hemen klikatuz</a> "
-"karga ditzakezu."
+"ditzake. Segurtasun/pribatutasun arrazoiak direla eta, kanpoko "
+"erreferentziak ez dira kargatzen. Mezu honen bidaltzailean konfidantza "
+"baduzu, kanpoko erreferentziak <a href=\"kmail:loadExternal\">hemen "
+"klikatuz</a> karga ditzakezu."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Oharra:</b>HTML formatuko mezua da. Segurtasun arrazoiengatik HTML kode "
 "gordina erakusten da. Mezu honen bidaltzailean konfidantza baduzu, HTML "
@@ -11714,7 +11588,8 @@ msgstr "Abisua:"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"Bidaltzailearen helbide elektronikoa ez da sinatzeko erabilitako %1(e)an gorde."
+"Bidaltzailearen helbide elektronikoa ez da sinatzeko erabilitako %1(e)an "
+"gorde."
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11726,8 +11601,8 @@ msgstr "gordeta: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Ezin da helbide elektronikoa bidaltzailearen %2 helbidearekin konparatu, ez "
 "baita sinatzeko erabiltzen den %1(a)n gorde."
@@ -11846,13 +11721,14 @@ msgstr "Kioslave errore mezua"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"POP3 zerbitzariak ez du UIDL komandoa onartzen: komando hau modu seguru batean "
-"KMail-ek zerbitzariko zein mezu dagoeneko ikusi dituen zehazteko da.\n"
+"POP3 zerbitzariak ez du UIDL komandoa onartzen: komando hau modu seguru "
+"batean KMail-ek zerbitzariko zein mezu dagoeneko ikusi dituen zehazteko da.\n"
 "Beraz, postak-zerbitzarian uzteko funtzionalitateak ez du funtzionatuko."
 
 #: popaccount.cpp:752
@@ -11873,7 +11749,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Mezua eskuratzen: %1/%2 (%3/%4 KB), helbidea: %5@%6 (%7 KB gelditzen dira "
 "zerbitzarian)."
@@ -11892,1858 +11769,14 @@ msgstr "Erantzun baliogabea zerbitzaritik"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Zerbitzariak ez du TOP komandoa onartzen. Horregatik ezin dira bildu mezu "
 "luzeen goiburuak lehenago, jaitsi baino lehen."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Joan"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Karpeta"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mezua"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Erantzun berezia"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Birb&idali"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML tresna-barra"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Sinadura"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Automatikoki sinatu mezuak"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Aukera hau gaitzen denean, bidalitako mezu guztiak lehenespenez sinatuko dira. "
-"Noski, mezu bakoitzaren sinadura desgaitu dezakezu."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Enkriptazioa"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Aukera hau hautatzen denean, mezua/fitxategia ez da hartzailearen gako "
-"publikoarekin bakarrik sinatuko, baita zure gakoarekin ere. Honek "
-"mezua/fitxategia beranduago desenkriptatzeko aukera emango dizu. Hau orokorrean "
-"ideia ona da."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Erakutsi s&inatutako/enkriptatutako testua editatu ondoren"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Aukera hau hautatzean, sinatutako/enkriptatutako testua lehio bereizi batean "
-"erakutsiko da, bidali aurretik zer itxura izango duen ikusteko. Ideia ona da "
-"enkriptazio-sistemak ondo funtzionatzen duen jakiteko."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Gorde bidalitako mezuak en&kriptatuta"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Hautatu mezuak enkriptatuta gordetzeko "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gorde mezuak enkriptatuta</h1>\n"
-"Hau hautatzean, bidalitako mezuak bidali diren bezala enkriptatuta gordeko "
-"dira. Hau ez da gomendagarria, ezin izango duzu mezurik irakurri beharrezko "
-"ziurtagiria iraungitzen bada.\n"
-"<p>\n"
-"Hala ere, aukera hau gaitzea eskatzen dizuten arau lokalak izan ditzakezu. "
-"Zalatzarik baduzu, hitz egin administratzailearekin.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Beti erakutsi enkriptatze-gakoak &berresteko"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Aukera hau gaitzen denean, aplikazioak beti gako publikoen zerrenda bat "
-"erakutsiko du enkriptatzeko bat hauta dezazun. Hau desgaitzen bada, aplikazioak "
-"gako zuzenik aurkitu ezin badu edo bat baino gehiago badaude bakarrik "
-"erakutsiko du elkarrizketa-koadro hau."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automatikoki enkriptatu mezuak &ahal denean"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Aukera hau gaitzean, mezu bakoitza enkriptatuta bidaliko da enkriptazioa "
-"posiblea bada eta nahi bada, noski. Enkriptatze-automatikoa desgaitu daiteke "
-"mezu bakoitzean."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Ez inoiz sinatu/enkriptatu zirriborroa &gordetzean"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Nori: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Orokorra"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Erantzun honi"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Erantzun &denei..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "Birb&idali"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Lasterbidea:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Karpetaren propietateak"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Karpetak &posta-zerrenda bat du"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Zerrendaren &helbidea:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormala:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Irakurri &gabea:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Mezuaren iraungitzea"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "I&raungitu honen ondoren:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Iraungitu i&rakurritako mezuak"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Iraungitu honen &ondoren:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Iraungitu irakurri &gabekoak"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Egun"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Aste"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Hilabete"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Aurreratua"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Bidaltzailearen &identitatea:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Biltegiaren formatua:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Ikuspegien-&zerrenda:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Balidatu ziurtagiriak CRL-ak erabiliz"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Aukera hau hautatzen bada, S/MIME ziurtagiriak Ziurtagirien Errebokatze "
-"Zerrendak (CRL-ak) erabiliz balidatzen dira."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Egiaztatu ziurtagiriak linean (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Aukera hau hautatzen bada, S/MIME ziurtagiriak linean balidatuko dira Lineako "
-"Ziurtagirien Egoeraren Protokoloa (OCSP) erabiliz. Bete OCSP erantzulearen URLa "
-"behean."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Lineako ziurtagiriaren egiaztapena"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP erantzulearen URLa:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Sartu hemen ziurtagiriak linean balidatzeko zerbitzariaren helbidea (OCSP "
-"erantzulea). URLak http://-rekin hasi ohi dira."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP erantzungailearen sinadura:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ez ikusia egin ziurtagirien URL zerbitzuei"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "&Ez egiaztatu ziurtagirien arauak"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Lehenespenez GnuPG-ek ~/.gnupg/policies.txt fitxategia erabiltzen du "
-"ziurtagiri-arau bat baimenduta dagoela egiaztatzeko. Aukera hau hautatzen bada, "
-"arauak ez dira egiaztatzen."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Ez kontsultatu inoiz CRL bat"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Aukera hau hautatzean, ziurtagirien errebokatze zerrendak (CRL-ak) ez dira "
-"inoiz S/MIME ziurtagiriak balidatzeko erabiltzen."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Eskuratu falta diren jaulkitzailearen ziurtagiriak"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Aukera hau hautatzen bada, falta diren jaulkitzailearen ziurtagiriak behar "
-"direnean eskuratzen dira (hau balidazio metodoetan , CRL eta OCSP-etan "
-"aplikatzen da)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP eskaerak"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Ez burutu HTTP eskaerarik"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Guztiz desgaitzen du HTTPren erabilera S/MIME-n."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Erabili proxy hau HTTP eskaeretan: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Erabili sistemaren HTTP proxya:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Aukera hau hautatzen bada, eskuinean erakusten den HTTP proxy-aren balioa "
-"(http_proxy inguruneko aldagaietik datorrena) erabiliko da HTTP eskaeretan."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Sartu hemen HTTP proxy-aren helbidea, S/MIME-rekin lotutako HTTP eskaera "
-"guztietan erabiliko dena. Sintaxia ostalaria:ataka da, adibidez "
-"nire_proxya.inon_ez.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ez ikusia egin HTTP bidezko CRL ziurtagirien banaketa-puntuei"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL baten kokalekua bilatzean, egiaztatzeko ziurtagiriak normalean \"CRL "
-"banaketa-puntuak\" sarrerak bezala ezagutzen direnak ditu. Hauek URLra iristeko "
-"sarbidea azaltzen dituzten URLak dira. Aurkitutako lehen puntua erabiltzen da. "
-"Aukera honekin HTTP eskema erabiltzen duten sarrera guztiei ez ikusia egingo "
-"zaie banaketa-puntu egokia bilatzean."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP eskaerak"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Ez egin LDAP eskaerarik"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Guztiz desgaitzen du LDAP-en erabilera S/MIME-rentzat."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ez ikusia egin LDAP bidezko CRL ziurtagirien banaketa-puntuei"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL baten kokalekua bilatzean, egiaztatzeko ziurtagiriak normalean \"CRL "
-"banaketa-puntuak\" sarrerak bezala ezagutzen direnak ditu. Hauek URLra iristeko "
-"sarbidea deskribatzen dituzten URLak dira. Aurkitutako lehen puntua erabiltzen "
-"da. Aukera honekin LDAP eskema erabiltzen duten sarrera guztiei ez ikusia "
-"egingo zaie banaketa-puntu egokia bilatzean."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP eskaeren ostalari nagusia:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"LDAP zerbitzari bat hemen sartzean LDAP eskaerak zerbitzarira joango dira "
-"lehenengo. Ezarpen honek LDAP URL batean zehaztutako ostalari eta ataka zatiak "
-"gainezartzen ditu, eta ostalaria eta ataka zehazten ez badira ere erabiliko "
-"dira. Beste LDAP erabiliko dira \"proxy\" zerbitzariaren konexioak huts egiten "
-"badu.\n"
-"Sintaxia hau da: \"OSTALARIA\" edo \"OSTALARIA:ATAKA\". ATAKA zehazten ez bada, "
-"389 ataka (LDAP ataka estandarra) erabiliko da."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Gehitu..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Talde-lana"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Garbitu letra-tipo ezarpenak"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "mugagabea"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Sinaduraren konfigurazioa"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Erantzun bidaltzaileari:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Birbidalitako mezua"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Abisatu sinatu &gabeko mezuak bidaltzean"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Hautatu sinatu gabeko mezuak bidaltzean abisatzea nahi baduzu."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu sinatu gabeko mezuak bidaltzean</h1>\n"
-"Hau hautatzean, sinatu gabeko mezu oso bat edo zatiak bidaltzean abisu bat "
-"jasoko duzu.\n"
-"<p>\n"
-"Gomendagarria da aukera hau gaitzea integritate maximoa lortzeko.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Abisatu enkriptatu gabeko mezuak bidaltzean"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Hautatu enkriptatu gabeko mezuak bidaltzean abisua eskuratzeko."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu enkriptatu gabeko mezuak bidaltzean</h1>\n"
-"Hau hautatzean, enkriptatu gabeko mezu osoak edo zatia bidaltzean abisu bat "
-"eskuratuko duzu.\n"
-"<p>\n"
-"Aukera hau gaitzea gomendagarria da integritatea mantentzeko.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Abisatu &hartzailearen helbide elektronikoa ziurtagirian ez badago"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Hautatu hau abisua emateko helbidea ziurtagirian ez bada agertzen"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu hartzailearen helbide elektronikoa ziurtagirian ez badago</h1>\n"
-"Hau hautatzean, abisu bat igorriko da hartzailearen helbide elektronikoa "
-"ziurtagirian ez badago enkriptazioan erabiltzeko.\n"
-"<p>\n"
-"Aukera hau gaitzea gomendagarria da segurtasun maximoa lortzeko.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Abisatu ziurtagiri/gakoak iraungitzear badaude (konfiguratu beheko mugak)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Sinatzeko"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Enkriptatzeko"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " egun"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Hautatu egun-kopurua hemen"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu sinadura-ziurtagiria iraungitzear badago</h1>\n"
-"Hautatu abisua eskuratu gabe sinadura-ziurtagiria baliozkoa izateko egun kopuru "
-"minimoa.\n"
-"<p>\n"
-"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu enkriptazio-ziurtagiria iraungitzen bada</h1>\n"
-"Hautatu egun-kopuru minimoa abisurik eman gabe enkriptazio-ziurtagiria "
-"baliozkoa izateko.\n"
-"<p>\n"
-"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu kateko ziurtagiri bat iraungitzean</h1>\n"
-"Hautatu abisurik igorri gabe kateko ziurtagiri bat baliozko bezala mantentzen "
-"den egun kopuru minimoa.\n"
-"<p>\n"
-"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu ZE ziurtagiria iraungitzen bada</h1>\n"
-"Hautatu ZE ziurtagiria abisurik igorri gabe baliozkoa izaten jarraituko duen "
-"egun kopuru minimoa.\n"
-"<p>\n"
-"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Abisatu erroko ziurtagiria iraungitzen bada</h1>\n"
-"Hautatu erroko ziurtagiria abisurik igorri gabe baliozkoa izaten jarraituko "
-"duen egun kopuru minimoa.\n"
-"<p>\n"
-"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Erroko ziurtagirietarako:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Bitarteko ZE ziurtagiriak:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Amaierako erabiltzailearen ziurtagiriak/gakoak:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Gaitu berriro \"Ez galdetu berriro\" abisu guztiak"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Karpetaren edukia:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Bidali ilarako mezuak posta egiaztatzean"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hautatu KMail-ek eskuzko eta posta egiaztatze guztietan irteerako ontziko "
-"mezu guztiak bidaltzea nahi baduzu, edo mezuak automatikoki bidaltzea nahi ez "
-"baduzu.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Mezu berriak daude karpeta honetan (%1), eta hauek ez dira oraindik "
-"zerbitzarira igo, hala ere badirudi kargatzeko karpetan nahikoa baimen ez "
-"duzula. Jarri administratzailearekin harremanetan mezu berriak kargatu ahal "
-"izateko, edo kendu itzazu karpeta honetatik.</p> "
-"<p>Mezu hauek beste karpeta batera eramatea nahi dituzu?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Hautatutako azken karpeta (karpetak hautatzeko elkarrizketa-koadroan)."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Sistemaren erretilua erakusteko araua"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Posta berriaren jakinarazpen xehatua"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Aukera hau gaitzen bada, karpeta bakoitzean iritsi berri diren mezuen kopurua "
-"erakutsiko da posta berriaren jakinarazpenean. Bestela, \"Posta berria dago\" "
-"mezua bakarrik jasoko duzu."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Zehaztu e&ditorea:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Erabili &kanpoko editorea mezu-prestatzailea erabili ordez"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Gaitu talde-lan funtzionaltasuna"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Moldatu Nork:/Nori: goiburuak erantzunen erantzunetan"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook-ek ez du iCalendar estandarra betetzen eta aukera batzuk "
-"dituzu hau konpontzeko. Arazorik baduzu Outlook-en erabiltzaileekin saiatu "
-"aukera hau gaitzen."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Bidali lan-taldearen gonbidapenak postaren gorputzean"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook-ek ez du iCalendar estandarra betetzen eta aukera batzuk "
-"dituzu hau konpontzeko. Arazorik baduzu Outlook-en erabiltzaileekin saiatu "
-"aukera hau gaitzen."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Gonbidapenen bidalketa automatikoa"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Hau hautatzean ez duzu posta-editorea ikusiko. Honen ordez gonbidapen mezu "
-"guztiak automatikoki bidaliko dira. Bidali aurretik posta ikusi nahi baduzu, "
-"aukera hau desautatu ezazu. Hala ere, kontuan izan editore-lehioko testuak "
-"iCalendar sintaxia duela eta ez zenukeela eskuz aldatu behar."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Hau gaitzean Kontact aplikazioen (KOrganizer, KAddressBook, eta KNotes) "
-"sarrerak gordetzea posiblea izango da.</p>"
-"<p>Aukera hau ezarri nahi baduzu aplikazioek konfiguratu behar dituzu IMAP "
-"baliabideak erabiltzeko eta hau TDEren kontrol-zentruan egiten da.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalean IMAP baliabideak dituzten karpetak ikusteko beharrik ez da egoten. "
-"Ikustea nahi izanez gero, hemen ezar daiteke..</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Aukeratu lan-taldearen karpeten biltegi formatua. "
-"<ul>"
-"<li>Formatu lehenetsiak iCal (egutegi-karpetentzat) eta Vcard (helbide-liburu "
-"karpetentzat) estandarrak dira. Formatu honek Kontact-en funtzionalitate "
-"guztiak erabilgarri jartzen ditu.</li>"
-"<li>Kolab XML formatuak Outlook-en eredua jarraitzen du. Formatu honek "
-"bateragarritasuna eskeintzen du Outlook-ekin, Kolab zerbitzari edo soluzio "
-"bateragarri bat erabiltzean.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Honek IMAP baliabide-karpeten gurasoa hautatzen du.</p>"
-"<p>Lehenespenez, Kolab zerbitzariak IMAP sarrerako ontzia guraso bezala "
-"ezartzen du.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Hau IMAP baliabide-karpetak dituen kontuaren ID-a da.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>IMAP biltegien karpeten izenak zure hizkuntzan ezarri nahi badituzu, "
-"ondorengo hizkuntzen artean hauta dezakezu.</p>"
-"<p>Kontuan izan, hau egiteko arrazoi bakarra Microsoft Outlook-ekin "
-"bateragarritasuna lortzeko dela. Ez da batere gomendagarria hau ezartzea, "
-"hizkuntzak aldatzea eragozten duelako.</p>"
-"<p>Ez ezarri beharrezkoa ez bada.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Balio honek KMail-en Sarrera bistaratuko den erabakiko du."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Ostalari bakoitzeko konexio-kopuru maximoa"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ostalariko konexio-kopurua mugatzeko erabili daiteke posta egiaztatzean. "
-"Lehenespenez konexio-kopurua mugagabea da (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Erakutsi bilaketa bizkorraren edizio lerroa"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Aukera honek mezu-zerrenden gaineko bilaketako lerro-edizioa gaitzen edo "
-"desgaitzen du. Hau mezu-zerrendan bistaratutako informazioa bilatzeko erabili "
-"daiteke."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Mantendu jatorrizko karaktere-multzoa erantzutean edo birbidaltzean ahal bada"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomatikoki erantsi sinadura"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Gogoratu identitate hau, etorkizuneko editore-lehioetan erabilgarri egon "
-"dadin.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Gogoratu karpeta hau bidalitako elementuentzat, etorkizunean editore-lehioan "
-"ere erabiltzeko."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "Gogoratu mezu-garraio hau, etorkizunean editore-lehioan erabiltzeko."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Gogoratu identitate hau, etorkizuneko editore-lehioetan erabilgarri egon "
-"dadin.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "It&zulbiratu zutabe honetan:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Abisatu erro-ziurtagiria hau baino &lehen iraungitzear badago:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Gaitu aukera hau Outlook &#8482;-ek eranskinen izenek dituzten ingelesekoak ez "
-"diren karaktereak ulertzeko"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Automatikoki eskatu &mezu-eskuratzeen jakinarazpenak"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Gaitu hau KMail-ek mezu-eskuratzeen jakinarazpenak (MDN) eskatzea nahi "
-"baduzu bidaltzen dituzun mezuentzako.</p> "
-"<p>Aukera honek lehenetsian du eragina, eta mezu bakoitzeko MDN eskaera gaitu "
-"edo desgaitu dezakezu editorean, <em>Aukerak</em>-><em>"
-"Eskatu eskuratzeen jakinarazpena</em> menuko aukeran.</p></qt>"
-"<p> "
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Erabili azken helbideak auto-osatzean"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Desgaitu aukera hau editorearen helbidearen eremuetako auto-osatze zerrendetan  "
-"erabilitako azken helbideak agertzerik nahi ez baduzu."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Autogorde t&artea:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Editore-lehioko testuaren babes-kopia bat sortu daiteke aldizka. Babeskopiak "
-"sortzeko denbora-tartea hemen ezartzen da. Hau desgaitzeko ezarri ezazu 0 "
-"baliora."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Ordeztu a&urrizki ezaguna \"Re:\"-rekin"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Ordeztu a&urrizki ezaguna \"Fwd:\"-rekin"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Erabili &aipamen azkarra"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Sinadura iraungi da."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Hartzaile-hautatzaile mota"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Ezarri elkarrizketa-koadro mota Nork, Kopia eta \n"
-"Ezkutuko kopia hartzaileak hautatzeko"
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Hartzaileen editore-mota"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Ezarri hartzaileen editore-mota Nork, Kopia eta \n"
-"Ezkutuko kopia editatzeko"
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Hartzaileen editoreko lerro-kopuru maximoa."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Mantendu jatorrizko karaktere-multzoa erantzutean edo birbidaltzean ahal bada"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Mezu batzuk, automatikoki sortutakoak batiz bat, ez dute karaktere-kodeketa "
-"zehazten ongi bistaratzeko. Kasu hauetan hemen konfiguratutako atzerapen "
-"karaktere-kodeketa hau erabiliko da. Ezarri ezazu zure herrialdean erabiltzen "
-"den karaktere-kodeketa erabiliena. Lehenespenez konfiguratutako kodeketa mundu "
-"guztian erabiltzen dena da."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Hau bere  \"Auto\" baliotik aldatzean zehaztutako kodeketa posta guztietan "
-"erabiltzera bultzatzen du, nahiz eta postek bere kodeketa zehaztu."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Gaitu hau :-) bezalako aurpegitxoak emotikonoekin ordeztea nahi baduzu (irudi "
-"txikiak)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Gaitu aukera hau aipatutako testuaren maila ezberdinak erakusteko. Desgaitu "
-"aipatutako testuaren mailak ezkutatzeko."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatikoki tolestu maila:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Txikiagotu aipatutako testuaren letra-tamaina"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Gaitu aukera hau aipatutako testua letra-tamaina txikiago batekin erakusteko."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Gorde bidalitako mezuak en&kriptatuta"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Erakutsi &baztergarrien egoera goiburu dotoreetan"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-"Bidali mezu-eskuratzeen jakinarazpenak hutsik dagoen bidaltzaile batekin."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Bidali mezu-eskuratzeen jakinarazpenak hutsik dagoen bidaltzailearen kate "
-"batekin. Zerbitzari batzuk mezu hauek uka ditzaketenez, MDN-ak bidaltzean "
-"arazoak badituzu, desautatu aukera hau."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Mezu-zerrenda - Mezu berriak"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Gehitu &aipamen karaktereak"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13854,6 +11887,11 @@ msgstr "Gehitu \"Kopia\" bezala"
 msgid "Add as BCC"
 msgstr "Gehitu \"Ezkutuko kopia\" bezala"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Utzi"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13869,15 +11907,15 @@ msgstr "Hautatutako hartzaileak"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Hartzaile bat hautatu duzu. Onartzen den hartzaile-kopuru maximoa %1 da. Doitu "
-"hautapena.\n"
-"%n hartzaile hautatu dituzu. Onartzen den hartzaile-kopuru maximoa %1 da. Doitu "
-"hautapena."
+"Hartzaile bat hautatu duzu. Onartzen den hartzaile-kopuru maximoa %1 da. "
+"Doitu hautapena.\n"
+"%n hartzaile hautatu dituzu. Onartzen den hartzaile-kopuru maximoa %1 da. "
+"Doitu hautapena."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13893,8 +11931,8 @@ msgstr "Erabili helbide-hautapenerako elkarrizketa-koadroa"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Botoi honek elkarrizketa-koadro bereizia irekitzen du, erabilgarri dauden "
 "helbide guztietatik hartzaileak hautatzeko."
@@ -13999,10 +12037,19 @@ msgstr "hau baino handiagoa edo berdina"
 msgid " bytes"
 msgstr " byte"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " egun"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Zure bilaketa exekutatzeko %1 karpeako mezu guztiak zerbitzaritik deskargatu "
 "behar dira. Honek denbora behar dezake. Bilaketa jarraitu nahi duzu?"
@@ -14153,16 +12200,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"\"%1\" kontuari buruzko datuak biltzen...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "\"%1\" kontuari buruzko datuak biltzen...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14181,10 +12224,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"\"%1\" script-aren edukia:\n"
+msgid "Contents of script '%1':\n"
+msgstr "\"%1\" script-aren edukia:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14207,20 +12248,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-en ahalmenak:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-en ahalmenak:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Ez dago ahalmen berezirik eskuragarri)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Sieve-en script erabilgarriak:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Sieve-en script erabilgarriak:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14263,8 +12300,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Hautatu hau KMail-ek identitate honekin idatzitako mezuei sinadura bat gehitzea "
-"nahi baduzu."
+"Hautatu hau KMail-ek identitate honekin idatzitako mezuei sinadura bat "
+"gehitzea nahi baduzu."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14299,8 +12336,8 @@ msgstr "Erabili eremu hau sinadura estatiko pertsonalizatua sartzeko."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Erabili eremu hau zure sinadura duen fitxategia zehazteko. Posta berri bat "
 "sortzean edo sinadura berri bat gehitzean irakurriko da."
@@ -14319,21 +12356,27 @@ msgstr "Zehaztutako fitxategia testu editorean irekitzen du."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Komando pertsonalizatu bat gehitu dezakezu hemen, bide-izen osoarekin edo gabe, "
-"komandoa zure PATH aldagaian dagoen arabera. Posta berri bakoitzak komandoa "
-"exekutatuko du eta honen irteera (irteera estandarra) sinadura bezala erabiliko "
-"du. Komando erabiliak \"fortune\" edo \"ksig -random\" izan ohi dira."
+"Komando pertsonalizatu bat gehitu dezakezu hemen, bide-izen osoarekin edo "
+"gabe, komandoa zure PATH aldagaian dagoen arabera. Posta berri bakoitzak "
+"komandoa exekutatuko du eta honen irteera (irteera estandarra) sinadura "
+"bezala erabiliko du. Komando erabiliak \"fortune\" edo \"ksig -random\" izan "
+"ohi dira."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Ze&haztu komandoa:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Bide-izena"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Sarrera berria:"
@@ -14370,6 +12413,11 @@ msgstr "Gehitu kontua"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Benetan ezabatu nahi duzu <b>%1</b> identitatea?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Honi aplikatu:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14384,6 +12432,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Editatu script-a..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14423,9 +12475,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14465,6 +12517,16 @@ msgstr ""
 "Ezin da \"%1\" fitxategia ireki:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Nori: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14497,36 +12559,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14536,8 +12594,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14553,8 +12610,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14596,8 +12652,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -14767,6 +12822,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14803,112 +12862,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...hurrengo eta aurreko mezura joan zaitezkeela eskuin eta\n"
-"ezker geziak erabiliz?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...bidaltzaileari, hartzaileari, gaiari eta posta-zerrendari\n"
-"buruzko iragazkiak erraz sor ditzakezula, "
-"<em>Tresnak-&gt;Sortu&nbsp;Iragazkia</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...zenbait posta-zerrenda batzuetako gaietako\n"
-"&quot;[posta-zerrendaren izena]&quot; aurrizkia kendu dezakezula\n"
-"<em>berridatzi goiburua</em> iragazkia erabiliz? Erabili\n"
-"<pre>berridatzi goiburua&quot;Gaia&quot;\n"
-"   ordeztu &quot;\\s*\\[posta-zerrendaren izena\\]\\s*&quot;\n"
-"   honekin: &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...posta-zerrendak karpetekin erlazionatu ditzakezula\n"
-"<em>Karpeta-&gt;Posta-zerrenden kudeaketa</em> elkarrizketa-koadroan?\n"
-"<em>Mezua-&gt;Mezu&nbsp;berria&nbsp;posta-zerrendari...</em>\n"
-"erabil dezakezu editorea posta-zerrendaren helbidearekin\n"
-"aurre-ezarrita irekitzeko. Gainera saguaren erdiko botoiarekin klik egin\n"
-"dezakezu karpetan.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...ikono pertsonalizatuak esleitu ditzakezula karpeta bakoitzarentzat?\n"
-"Ikusi <em>Karpeta-&gt;Propietateak</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...KMail-ek kolore-barra bat bistara dezakeeela uneko hautatutako\n"
-"mezuaren mota (Testu arrunta/HTML/OpenPGP) adieraziz?</p>\n"
-"<p>hau KMail-en sinadura-egoeraren markoen antzeko HTML postak\n"
-"erabiliz jaso ditzakezun posta faltsuak ekiditeko erabilgarria da.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...edozein goiburu iragazi dezakezula bere izena bilaketa arau baten "
-"lehenengo edizio eremuan idatziz?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...HTML mezuak bakarrik iragazi ditzakezula honako arauarekin\n"
-"<pre>&quot;Content-type&quot; hau du &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...erantzutean mezuaren hautatutako zatia bakarrik aipatuko dela?</p>\n"
-"<p>Ezer hautatzen ez bada, mezu osoa aipatuko da.</p>\n"
-"<p>Honek eranskinen testuarekin ere balioko du\n"
-"<em>Ikusi-&gt;Eranskinak-&gt;Barnean</em> hautatuta dagoenean.</p>\n"
-"<p>Funtzionalitate hau erabilgarri dago erantzun komando guztiekin\n"
-"<em>Mezua-&gt;Erantzun aipatu gabe</em>.</p>\n"
-"<p align=\"right\"><em>Egilea: David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Ez dago ezer desegiteko."
@@ -14976,6 +12929,15 @@ msgstr "%1. eranskina (izen gabea)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "\"%1\" izeneko fitxategia badago lehendik. Gainidatzi nahi duzu?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Gainidatzi fitxategia?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15091,13 +13053,13 @@ msgstr "&Bidali irudia mezu bakoitzarekin"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Hautatu hau KMail-ek identitate honekin idatzitako mezuei X-Face izeneko "
-"goiburua gehitzeko. X-Face zuri-beltzeko irudi txikia bat da (48x48 pixel) eta "
-"posta-bezero batzuk bistaratu egin dezakete."
+"goiburua gehitzeko. X-Face zuri-beltzeko irudi txikia bat da (48x48 pixel) "
+"eta posta-bezero batzuk bistaratu egin dezakete."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15125,13 +13087,13 @@ msgstr "Hautatu fitxategia..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Erabili hau irudi-fitxategia hautatzeko irudia bertatik sortzeko. Irudiak "
-"kontraste altua eta ia karratua izan behar du. Atzeko plano argi batek emaitzak "
-"onartzen ditu."
+"kontraste altua eta ia karratua izan behar du. Atzeko plano argi batek "
+"emaitzak onartzen ditu."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15139,21 +13101,21 @@ msgstr "Ezarri helbide-liburutik"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Helbide-liburuko sarreran ezarritako irudiaren bertsio eskalatua erabil "
 "dezakezu."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail-ek kalitate baxuko, irudi monokromo txiki bat  (48x48 pixel) bidali "
-"dezake. Adibidez, irudia hau zure argazki bat edo sinbolo bat izan daiteke. "
-"Hartzailearen posta-bezeroak erakutsiko du (onartzen badu)."
+"<qt>KMail-ek kalitate baxuko, irudi monokromo txiki bat  (48x48 pixel) "
+"bidali dezake. Adibidez, irudia hau zure argazki bat edo sinbolo bat izan "
+"daiteke. Hartzailearen posta-bezeroak erakutsiko du (onartzen badu)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15161,11 +13123,11 @@ msgstr "Erabili eremu hau X-Face kate pertsonalizatu bat sartzeko."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Adibideak hemen dituzu: <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Adibideak hemen dituzu: <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15180,128 +13142,1751 @@ msgstr "Irudirik ez"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Ez duzu zure kontaktua definituta helbide-liburuan."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Sinadura"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Automatikoki sinatu mezuak"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Aukera hau gaitzen denean, bidalitako mezu guztiak lehenespenez sinatuko "
+"dira. Noski, mezu bakoitzaren sinadura desgaitu dezakezu."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Enkriptazioa"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr " Ezarri mezuaren gaia"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Aukera hau hautatzen denean, mezua/fitxategia ez da hartzailearen gako "
+"publikoarekin bakarrik sinatuko, baita zure gakoarekin ere. Honek mezua/"
+"fitxategia beranduago desenkriptatzeko aukera emango dizu. Hau orokorrean "
+"ideia ona da."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Bidali CC: 'helbide'ra"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Erakutsi s&inatutako/enkriptatutako testua editatu ondoren"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Bidali BCC: 'helbide'ra"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Aukera hau hautatzean, sinatutako/enkriptatutako testua lehio bereizi batean "
+"erakutsiko da, bidali aurretik zer itxura izango duen ikusteko. Ideia ona da "
+"enkriptazio-sistemak ondo funtzionatzen duen jakiteko."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Gehigu goiburua mezuan"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Gorde bidalitako mezuak en&kriptatuta"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Irakurri mezuaren gorputza 'fitxategi'tik"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Hautatu mezuak enkriptatuta gordetzeko "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Ezarri mezuaren gorputza"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gorde mezuak enkriptatuta</h1>\n"
+"Hau hautatzean, bidalitako mezuak bidali diren bezala enkriptatuta gordeko "
+"dira. Hau ez da gomendagarria, ezin izango duzu mezurik irakurri beharrezko "
+"ziurtagiria iraungitzen bada.\n"
+"<p>\n"
+"Hala ere, aukera hau gaitzea eskatzen dizuten arau lokalak izan ditzakezu. "
+"Zalatzarik baduzu, hitz egin administratzailearekin.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Gehitu eranskina mezuan: hau errepika daiteke"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Beti erakutsi enkriptatze-gakoak &berresteko"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Begiratu mezu berririk dagoen bakarrik"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Aukera hau gaitzen denean, aplikazioak beti gako publikoen zerrenda bat "
+"erakutsiko du enkriptatzeko bat hauta dezazun. Hau desgaitzen bada, "
+"aplikazioak gako zuzenik aurkitu ezin badu edo bat baino gehiago badaude "
+"bakarrik erakutsiko du elkarrizketa-koadro hau."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Ireki mezu-prestatzailearen leihoa bakarrik"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automatikoki enkriptatu mezuak &ahal denean"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Ikusi emandako mezu-fitxategia"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Aukera hau gaitzean, mezu bakoitza enkriptatuta bidaliko da enkriptazioa "
+"posiblea bada eta nahi bada, noski. Enkriptatze-automatikoa desgaitu daiteke "
+"mezu bakoitzean."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Bidali mezua nahi duzun helbidera URL-ak erakusten duen eranskinarekin"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Ez inoiz sinatu/enkriptatu zirriborroa &gordetzean"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Irakurrita"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Zaharra"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Orokorra"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Ezabatuta"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Erantzun honi"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Erantzunda"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Erantzun &denei..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Birbidalita"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "Birb&idali"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Ilaran"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Lasterbidea:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Bidalita"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Begiratuta"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Karpetaren edukia:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ez ikusia"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Baztergarria"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Arrunta"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Karpetaren propietateak"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Zeregina"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Karpetak &posta-zerrenda bat du"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Eranskina du"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Zerrendaren &helbidea:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormala:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Irakurri &gabea:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Mezuaren iraungitzea"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "I&raungitu honen ondoren:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Iraungitu i&rakurritako mezuak"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Iraungitu honen &ondoren:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Iraungitu irakurri &gabekoak"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Egun"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Aste"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Hilabete"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Bidaltzailearen &identitatea:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Biltegiaren formatua:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Ikuspegien-&zerrenda:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Bidali ilarako mezuak posta egiaztatzean"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Hautatu KMail-ek eskuzko eta posta egiaztatze guztietan irteerako "
+"ontziko mezu guztiak bidaltzea nahi baduzu, edo mezuak automatikoki "
+"bidaltzea nahi ez baduzu.</p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Bide-izena"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "\"%1\" izeneko fitxategia badago lehendik. Gainidatzi nahi duzu?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Mezu berriak daude karpeta honetan (%1), eta hauek ez dira oraindik "
+"zerbitzarira igo, hala ere badirudi kargatzeko karpetan nahikoa baimen ez "
+"duzula. Jarri administratzailearekin harremanetan mezu berriak kargatu ahal "
+"izateko, edo kendu itzazu karpeta honetatik.</p> <p>Mezu hauek beste karpeta "
+"batera eramatea nahi dituzu?</p>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Gainidatzi fitxategia?"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Hautatutako azken karpeta (karpetak hautatzeko elkarrizketa-koadroan)."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Sistemaren erretilua erakusteko araua"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Posta berriaren jakinarazpen xehatua"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Aukera hau gaitzen bada, karpeta bakoitzean iritsi berri diren mezuen "
+"kopurua erakutsiko da posta berriaren jakinarazpenean. Bestela, \"Posta "
+"berria dago\" mezua bakarrik jasoko duzu."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Zehaztu e&ditorea:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Erabili &kanpoko editorea mezu-prestatzailea erabili ordez"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Gaitu talde-lan funtzionaltasuna"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Moldatu Nork:/Nori: goiburuak erantzunen erantzunetan"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook-ek ez du iCalendar estandarra betetzen eta aukera batzuk "
+"dituzu hau konpontzeko. Arazorik baduzu Outlook-en erabiltzaileekin saiatu "
+"aukera hau gaitzen."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Bidali lan-taldearen gonbidapenak postaren gorputzean"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook-ek ez du iCalendar estandarra betetzen eta aukera batzuk "
+"dituzu hau konpontzeko. Arazorik baduzu Outlook-en erabiltzaileekin saiatu "
+"aukera hau gaitzen."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Gonbidapenen bidalketa automatikoa"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Hau hautatzean ez duzu posta-editorea ikusiko. Honen ordez gonbidapen mezu "
+"guztiak automatikoki bidaliko dira. Bidali aurretik posta ikusi nahi baduzu, "
+"aukera hau desautatu ezazu. Hala ere, kontuan izan editore-lehioko testuak "
+"iCalendar sintaxia duela eta ez zenukeela eskuz aldatu behar."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Hau gaitzean Kontact aplikazioen (KOrganizer, KAddressBook, eta KNotes) "
+"sarrerak gordetzea posiblea izango da.</p><p>Aukera hau ezarri nahi baduzu "
+"aplikazioek konfiguratu behar dituzu IMAP baliabideak erabiltzeko eta hau "
+"TDEren kontrol-zentruan egiten da.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalean IMAP baliabideak dituzten karpetak ikusteko beharrik ez da "
+"egoten. Ikustea nahi izanez gero, hemen ezar daiteke..</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Aukeratu lan-taldearen karpeten biltegi formatua. <ul><li>Formatu "
+"lehenetsiak iCal (egutegi-karpetentzat) eta Vcard (helbide-liburu "
+"karpetentzat) estandarrak dira. Formatu honek Kontact-en funtzionalitate "
+"guztiak erabilgarri jartzen ditu.</li><li>Kolab XML formatuak Outlook-en "
+"eredua jarraitzen du. Formatu honek bateragarritasuna eskeintzen du Outlook-"
+"ekin, Kolab zerbitzari edo soluzio bateragarri bat erabiltzean.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Honek IMAP baliabide-karpeten gurasoa hautatzen du.</p><p>Lehenespenez, "
+"Kolab zerbitzariak IMAP sarrerako ontzia guraso bezala ezartzen du.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Hau IMAP baliabide-karpetak dituen kontuaren ID-a da.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>IMAP biltegien karpeten izenak zure hizkuntzan ezarri nahi badituzu, "
+"ondorengo hizkuntzen artean hauta dezakezu.</p><p>Kontuan izan, hau egiteko "
+"arrazoi bakarra Microsoft Outlook-ekin bateragarritasuna lortzeko dela. Ez "
+"da batere gomendagarria hau ezartzea, hizkuntzak aldatzea eragozten duelako."
+"</p><p>Ez ezarri beharrezkoa ez bada.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Balio honek KMail-en Sarrera bistaratuko den erabakiko du."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Ostalari bakoitzeko konexio-kopuru maximoa"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ostalariko konexio-kopurua mugatzeko erabili daiteke posta egiaztatzean. "
+"Lehenespenez konexio-kopurua mugagabea da (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Erakutsi bilaketa bizkorraren edizio lerroa"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Aukera honek mezu-zerrenden gaineko bilaketako lerro-edizioa gaitzen edo "
+"desgaitzen du. Hau mezu-zerrendan bistaratutako informazioa bilatzeko "
+"erabili daiteke."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Mantendu jatorrizko karaktere-multzoa erantzutean edo birbidaltzean ahal bada"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomatikoki erantsi sinadura"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Gogoratu identitate hau, etorkizuneko editore-lehioetan erabilgarri egon "
+"dadin.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Gogoratu karpeta hau bidalitako elementuentzat, etorkizunean editore-lehioan "
+"ere erabiltzeko."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "Gogoratu mezu-garraio hau, etorkizunean editore-lehioan erabiltzeko."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Gogoratu identitate hau, etorkizuneko editore-lehioetan erabilgarri egon "
+"dadin.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "It&zulbiratu zutabe honetan:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Abisatu erro-ziurtagiria hau baino &lehen iraungitzear badago:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Gaitu aukera hau Outlook &#8482;-ek eranskinen izenek dituzten ingelesekoak "
+"ez diren karaktereak ulertzeko"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Automatikoki eskatu &mezu-eskuratzeen jakinarazpenak"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt> <p>Gaitu hau KMail-ek mezu-eskuratzeen jakinarazpenak (MDN) eskatzea "
+"nahi baduzu bidaltzen dituzun mezuentzako.</p> <p>Aukera honek lehenetsian "
+"du eragina, eta mezu bakoitzeko MDN eskaera gaitu edo desgaitu dezakezu "
+"editorean, <em>Aukerak</em>-><em>Eskatu eskuratzeen jakinarazpena</em> "
+"menuko aukeran.</p></qt><p> "
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Erabili azken helbideak auto-osatzean"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Desgaitu aukera hau editorearen helbidearen eremuetako auto-osatze "
+"zerrendetan  erabilitako azken helbideak agertzerik nahi ez baduzu."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Autogorde t&artea:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Editore-lehioko testuaren babes-kopia bat sortu daiteke aldizka. Babeskopiak "
+"sortzeko denbora-tartea hemen ezartzen da. Hau desgaitzeko ezarri ezazu 0 "
+"baliora."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Ordeztu a&urrizki ezaguna \"Re:\"-rekin"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Ordeztu a&urrizki ezaguna \"Fwd:\"-rekin"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Erabili &aipamen azkarra"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Sinadura iraungi da."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Hartzaile-hautatzaile mota"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Ezarri elkarrizketa-koadro mota Nork, Kopia eta \n"
+"Ezkutuko kopia hartzaileak hautatzeko"
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Hartzaileen editore-mota"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Ezarri hartzaileen editore-mota Nork, Kopia eta \n"
+"Ezkutuko kopia editatzeko"
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Hartzaileen editoreko lerro-kopuru maximoa."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Mantendu jatorrizko karaktere-multzoa erantzutean edo birbidaltzean ahal bada"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Mezu batzuk, automatikoki sortutakoak batiz bat, ez dute karaktere-kodeketa "
+"zehazten ongi bistaratzeko. Kasu hauetan hemen konfiguratutako atzerapen "
+"karaktere-kodeketa hau erabiliko da. Ezarri ezazu zure herrialdean "
+"erabiltzen den karaktere-kodeketa erabiliena. Lehenespenez konfiguratutako "
+"kodeketa mundu guztian erabiltzen dena da."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Hau bere  \"Auto\" baliotik aldatzean zehaztutako kodeketa posta guztietan "
+"erabiltzera bultzatzen du, nahiz eta postek bere kodeketa zehaztu."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Gaitu hau :-) bezalako aurpegitxoak emotikonoekin ordeztea nahi baduzu "
+"(irudi txikiak)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Gaitu aukera hau aipatutako testuaren maila ezberdinak erakusteko. Desgaitu "
+"aipatutako testuaren mailak ezkutatzeko."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatikoki tolestu maila:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Txikiagotu aipatutako testuaren letra-tamaina"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Gaitu aukera hau aipatutako testua letra-tamaina txikiago batekin erakusteko."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Gorde bidalitako mezuak en&kriptatuta"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Erakutsi &baztergarrien egoera goiburu dotoreetan"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+"Bidali mezu-eskuratzeen jakinarazpenak hutsik dagoen bidaltzaile batekin."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Bidali mezu-eskuratzeen jakinarazpenak hutsik dagoen bidaltzailearen kate "
+"batekin. Zerbitzari batzuk mezu hauek uka ditzaketenez, MDN-ak bidaltzean "
+"arazoak badituzu, desautatu aukera hau."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Mezu-zerrenda - Mezu berriak"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Gehitu &aipamen karaktereak"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Editatu &fitxategia"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Editatu..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Joan"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Karpeta"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mezua"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Erantzun berezia"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Birb&idali"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Garbitu letra-tipo ezarpenak"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML tresna-barra"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Aukera komunak"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML tresna-barra"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Balidatu ziurtagiriak CRL-ak erabiliz"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Aukera hau hautatzen bada, S/MIME ziurtagiriak Ziurtagirien Errebokatze "
+"Zerrendak (CRL-ak) erabiliz balidatzen dira."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Egiaztatu ziurtagiriak linean (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Aukera hau hautatzen bada, S/MIME ziurtagiriak linean balidatuko dira "
+"Lineako Ziurtagirien Egoeraren Protokoloa (OCSP) erabiliz. Bete OCSP "
+"erantzulearen URLa behean."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Lineako ziurtagiriaren egiaztapena"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP erantzulearen URLa:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Sartu hemen ziurtagiriak linean balidatzeko zerbitzariaren helbidea (OCSP "
+"erantzulea). URLak http://-rekin hasi ohi dira."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP erantzungailearen sinadura:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ez ikusia egin ziurtagirien URL zerbitzuei"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "&Ez egiaztatu ziurtagirien arauak"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Lehenespenez GnuPG-ek ~/.gnupg/policies.txt fitxategia erabiltzen du "
+"ziurtagiri-arau bat baimenduta dagoela egiaztatzeko. Aukera hau hautatzen "
+"bada, arauak ez dira egiaztatzen."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Ez kontsultatu inoiz CRL bat"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Aukera hau hautatzean, ziurtagirien errebokatze zerrendak (CRL-ak) ez dira "
+"inoiz S/MIME ziurtagiriak balidatzeko erabiltzen."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Eskuratu falta diren jaulkitzailearen ziurtagiriak"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Aukera hau hautatzen bada, falta diren jaulkitzailearen ziurtagiriak behar "
+"direnean eskuratzen dira (hau balidazio metodoetan , CRL eta OCSP-etan "
+"aplikatzen da)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP eskaerak"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Ez burutu HTTP eskaerarik"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Guztiz desgaitzen du HTTPren erabilera S/MIME-n."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Erabili proxy hau HTTP eskaeretan: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Erabili sistemaren HTTP proxya:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Aukera hau hautatzen bada, eskuinean erakusten den HTTP proxy-aren balioa "
+"(http_proxy inguruneko aldagaietik datorrena) erabiliko da HTTP eskaeretan."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Sartu hemen HTTP proxy-aren helbidea, S/MIME-rekin lotutako HTTP eskaera "
+"guztietan erabiliko dena. Sintaxia ostalaria:ataka da, adibidez nire_proxya."
+"inon_ez.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ez ikusia egin HTTP bidezko CRL ziurtagirien banaketa-puntuei"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL baten kokalekua bilatzean, egiaztatzeko ziurtagiriak normalean \"CRL "
+"banaketa-puntuak\" sarrerak bezala ezagutzen direnak ditu. Hauek URLra "
+"iristeko sarbidea azaltzen dituzten URLak dira. Aurkitutako lehen puntua "
+"erabiltzen da. Aukera honekin HTTP eskema erabiltzen duten sarrera guztiei "
+"ez ikusia egingo zaie banaketa-puntu egokia bilatzean."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP eskaerak"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Ez egin LDAP eskaerarik"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Guztiz desgaitzen du LDAP-en erabilera S/MIME-rentzat."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ez ikusia egin LDAP bidezko CRL ziurtagirien banaketa-puntuei"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL baten kokalekua bilatzean, egiaztatzeko ziurtagiriak normalean \"CRL "
+"banaketa-puntuak\" sarrerak bezala ezagutzen direnak ditu. Hauek URLra "
+"iristeko sarbidea deskribatzen dituzten URLak dira. Aurkitutako lehen puntua "
+"erabiltzen da. Aukera honekin LDAP eskema erabiltzen duten sarrera guztiei "
+"ez ikusia egingo zaie banaketa-puntu egokia bilatzean."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP eskaeren ostalari nagusia:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"LDAP zerbitzari bat hemen sartzean LDAP eskaerak zerbitzarira joango dira "
+"lehenengo. Ezarpen honek LDAP URL batean zehaztutako ostalari eta ataka "
+"zatiak gainezartzen ditu, eta ostalaria eta ataka zehazten ez badira ere "
+"erabiliko dira. Beste LDAP erabiliko dira \"proxy\" zerbitzariaren konexioak "
+"huts egiten badu.\n"
+"Sintaxia hau da: \"OSTALARIA\" edo \"OSTALARIA:ATAKA\". ATAKA zehazten ez "
+"bada, 389 ataka (LDAP ataka estandarra) erabiliko da."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Gehitu..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Talde-lana"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Garbitu letra-tipo ezarpenak"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "mugagabea"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Sinaduraren konfigurazioa"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Erantzun bidaltzaileari:"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Birbidalitako mezua"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Abisatu sinatu &gabeko mezuak bidaltzean"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Hautatu sinatu gabeko mezuak bidaltzean abisatzea nahi baduzu."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu sinatu gabeko mezuak bidaltzean</h1>\n"
+"Hau hautatzean, sinatu gabeko mezu oso bat edo zatiak bidaltzean abisu bat "
+"jasoko duzu.\n"
+"<p>\n"
+"Gomendagarria da aukera hau gaitzea integritate maximoa lortzeko.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Abisatu enkriptatu gabeko mezuak bidaltzean"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Hautatu enkriptatu gabeko mezuak bidaltzean abisua eskuratzeko."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu enkriptatu gabeko mezuak bidaltzean</h1>\n"
+"Hau hautatzean, enkriptatu gabeko mezu osoak edo zatia bidaltzean abisu bat "
+"eskuratuko duzu.\n"
+"<p>\n"
+"Aukera hau gaitzea gomendagarria da integritatea mantentzeko.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Abisatu &hartzailearen helbide elektronikoa ziurtagirian ez badago"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Hautatu hau abisua emateko helbidea ziurtagirian ez bada agertzen"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu hartzailearen helbide elektronikoa ziurtagirian ez badago</h1>\n"
+"Hau hautatzean, abisu bat igorriko da hartzailearen helbide elektronikoa "
+"ziurtagirian ez badago enkriptazioan erabiltzeko.\n"
+"<p>\n"
+"Aukera hau gaitzea gomendagarria da segurtasun maximoa lortzeko.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Abisatu ziurtagiri/gakoak iraungitzear badaude (konfiguratu beheko mugak)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Sinatzeko"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Enkriptatzeko"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Hautatu egun-kopurua hemen"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu sinadura-ziurtagiria iraungitzear badago</h1>\n"
+"Hautatu abisua eskuratu gabe sinadura-ziurtagiria baliozkoa izateko egun "
+"kopuru minimoa.\n"
+"<p>\n"
+"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu enkriptazio-ziurtagiria iraungitzen bada</h1>\n"
+"Hautatu egun-kopuru minimoa abisurik eman gabe enkriptazio-ziurtagiria "
+"baliozkoa izateko.\n"
+"<p>\n"
+"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu kateko ziurtagiri bat iraungitzean</h1>\n"
+"Hautatu abisurik igorri gabe kateko ziurtagiri bat baliozko bezala "
+"mantentzen den egun kopuru minimoa.\n"
+"<p>\n"
+"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu ZE ziurtagiria iraungitzen bada</h1>\n"
+"Hautatu ZE ziurtagiria abisurik igorri gabe baliozkoa izaten jarraituko duen "
+"egun kopuru minimoa.\n"
+"<p>\n"
+"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Abisatu erroko ziurtagiria iraungitzen bada</h1>\n"
+"Hautatu erroko ziurtagiria abisurik igorri gabe baliozkoa izaten jarraituko "
+"duen egun kopuru minimoa.\n"
+"<p>\n"
+"SPHINX-en ezarpen gomendatua 14 egun dira.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Erroko ziurtagirietarako:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Bitarteko ZE ziurtagiriak:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Amaierako erabiltzailearen ziurtagiriak/gakoak:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Gaitu berriro \"Ez galdetu berriro\" abisu guztiak"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...hurrengo eta aurreko mezura joan zaitezkeela eskuin eta\n"
+"ezker geziak erabiliz?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...bidaltzaileari, hartzaileari, gaiari eta posta-zerrendari\n"
+"buruzko iragazkiak erraz sor ditzakezula, <em>Tresnak-&gt;Sortu&nbsp;"
+"Iragazkia</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...zenbait posta-zerrenda batzuetako gaietako\n"
+"&quot;[posta-zerrendaren izena]&quot; aurrizkia kendu dezakezula\n"
+"<em>berridatzi goiburua</em> iragazkia erabiliz? Erabili\n"
+"<pre>berridatzi goiburua&quot;Gaia&quot;\n"
+"   ordeztu &quot;\\s*\\[posta-zerrendaren izena\\]\\s*&quot;\n"
+"   honekin: &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...posta-zerrendak karpetekin erlazionatu ditzakezula\n"
+"<em>Karpeta-&gt;Posta-zerrenden kudeaketa</em> elkarrizketa-koadroan?\n"
+"<em>Mezua-&gt;Mezu&nbsp;berria&nbsp;posta-zerrendari...</em>\n"
+"erabil dezakezu editorea posta-zerrendaren helbidearekin\n"
+"aurre-ezarrita irekitzeko. Gainera saguaren erdiko botoiarekin klik egin\n"
+"dezakezu karpetan.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...ikono pertsonalizatuak esleitu ditzakezula karpeta bakoitzarentzat?\n"
+"Ikusi <em>Karpeta-&gt;Propietateak</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...KMail-ek kolore-barra bat bistara dezakeeela uneko hautatutako\n"
+"mezuaren mota (Testu arrunta/HTML/OpenPGP) adieraziz?</p>\n"
+"<p>hau KMail-en sinadura-egoeraren markoen antzeko HTML postak\n"
+"erabiliz jaso ditzakezun posta faltsuak ekiditeko erabilgarria da.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...edozein goiburu iragazi dezakezula bere izena bilaketa arau baten "
+"lehenengo edizio eremuan idatziz?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...HTML mezuak bakarrik iragazi ditzakezula honako arauarekin\n"
+"<pre>&quot;Content-type&quot; hau du &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...erantzutean mezuaren hautatutako zatia bakarrik aipatuko dela?</p>\n"
+"<p>Ezer hautatzen ez bada, mezu osoa aipatuko da.</p>\n"
+"<p>Honek eranskinen testuarekin ere balioko du\n"
+"<em>Ikusi-&gt;Eranskinak-&gt;Barnean</em> hautatuta dagoenean.</p>\n"
+"<p>Funtzionalitate hau erabilgarri dago erantzun komando guztiekin\n"
+"<em>Mezua-&gt;Erantzun aipatu gabe</em>.</p>\n"
+"<p align=\"right\"><em>Egilea: David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15394,16 +14979,20 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Enkriptatu mezuaren zati guztiak lehenespenez</h1>\n"
-#~ "Hau hautatzean, mezuaren zati guztiak (hau da, mezu nagusiaren gorputza eta eranskin guztiak) enkriptatuko dira lehenespenez.\n"
+#~ "Hau hautatzean, mezuaren zati guztiak (hau da, mezu nagusiaren gorputza "
+#~ "eta eranskin guztiak) enkriptatuko dira lehenespenez.\n"
 #~ "<p>\n"
-#~ "Hau ezarpen lehenetsia da, baina mezu bakoitzean aukera hau gainezarri dezakezu.\n"
+#~ "Hau ezarpen lehenetsia da, baina mezu bakoitzean aukera hau gainezarri "
+#~ "dezakezu.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15415,12 +15004,15 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Galdetu zati bakoitza enkriptatu aurretik</h1>\n"
-#~ "Aukera hau hautatzean, mezuaren zati bakoitza (hau da, mezu nagusiaren gorputz eta eranskin guztietan) enkriptatu nahi duzun galdetuko da.\n"
+#~ "Aukera hau hautatzean, mezuaren zati bakoitza (hau da, mezu nagusiaren "
+#~ "gorputz eta eranskin guztietan) enkriptatu nahi duzun galdetuko da.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15434,14 +15026,16 @@ msgstr "Gainidatzi fitxategia?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ez enkriptatu mezuak</h1>\n"
 #~ "Aukera hau hautatzean, mezuak ez dira lehenespenez enkriptatuko.\n"
 #~ "<p>\n"
-#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri dezakezu.\n"
+#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri "
+#~ "dezakezu.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15453,20 +15047,32 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Enkriptazio-algoritmoa</h1>\n"
-#~ "Algoritmo bat ordenagailu baten lanaren azalpena da. Enkriptazioko algoritmoak zera azaltzen du: ordenagailuak zure hartzaileen gakoak zure mezuari nola aplikatuko dizkion hartzaileak bakarrik mezua irakurtzeko.\n"
+#~ "Algoritmo bat ordenagailu baten lanaren azalpena da. Enkriptazioko "
+#~ "algoritmoak zera azaltzen du: ordenagailuak zure hartzaileen gakoak zure "
+#~ "mezuari nola aplikatuko dizkion hartzaileak bakarrik mezua irakurtzeko.\n"
 #~ "<p>\n"
-#~ "Enkriptazio-algoritmoaren hautapenak harrapatutako mezu bat irakurtzeko zailtasuna zehazten du. Hala ere, SPHINX inguruneak emandako algoritmoak seguruak dira. Orokorrean ez dira lehenetsitako aukerak aldatu behar.\n"
+#~ "Enkriptazio-algoritmoaren hautapenak harrapatutako mezu bat irakurtzeko "
+#~ "zailtasuna zehazten du. Hala ere, SPHINX inguruneak emandako algoritmoak "
+#~ "seguruak dira. Orokorrean ez dira lehenetsitako aukerak aldatu behar.\n"
 #~ "<p>\n"
-#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri dezakezu.\n"
+#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri "
+#~ "dezakezu.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15478,16 +15084,22 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Ziurtagiriaren egiaztapena lokalki gordetako ziurtagiri batekin amaitu daiteke.</h1>\n"
-#~ "Aukera hau hautatzean, ziurtagiriaren egiaztapena lokalki gordetako ziurtagiri batekin amaitu daiteke.\n"
+#~ "<h1>Ziurtagiriaren egiaztapena lokalki gordetako ziurtagiri batekin "
+#~ "amaitu daiteke.</h1>\n"
+#~ "Aukera hau hautatzean, ziurtagiriaren egiaztapena lokalki gordetako "
+#~ "ziurtagiri batekin amaitu daiteke.\n"
 #~ "<p>\n"
-#~ "Lokalki gordetako ziurtagiriak zure ziurtagiriak eta komunikazioaren partaideen eta ziutagiri-emaleen (ZE) ziurtagiriak dira.\n"
+#~ "Lokalki gordetako ziurtagiriak zure ziurtagiriak eta komunikazioaren "
+#~ "partaideen eta ziutagiri-emaleen (ZE) ziurtagiriak dira.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15499,12 +15111,15 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Beti egiaztatu erroko ziurtagiriaren ziurtagiri-bidea</h1>\n"
-#~ "Aukera hau gaitzen bada, hartzailearen ziurtagiriari dagokion ziurtagiri-bidea egiaztatuko da erroko ziurtagiriraino.\n"
+#~ "Aukera hau gaitzen bada, hartzailearen ziurtagiriari dagokion ziurtagiri-"
+#~ "bidea egiaztatuko da erroko ziurtagiriraino.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15516,16 +15131,20 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1> Egiaztatu ziurtagiri-bidea</h1>\n"
-#~ "Aukera hau gaitzen bada, errorainoko hartzailearen ziurtagiriaren bidea egiaztatuko da.\n"
+#~ "Aukera hau gaitzen bada, errorainoko hartzailearen ziurtagiriaren bidea "
+#~ "egiaztatuko da.\n"
 #~ "<p>\n"
-#~ "Kontuan izan ezin dela hartzailearen ziurtagiri beraren egiaztapena desgaitu.\n"
+#~ "Kontuan izan ezin dela hartzailearen ziurtagiri beraren egiaztapena "
+#~ "desgaitu.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15537,16 +15156,27 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Erabili ziurtagirien errebokatze-zerrendak (CRLak)</h1>\n"
-#~ "Ziurtagirien errebokatze-zerrendak baliogabetutako ziurtagiriak dira eta ez lirateke enkriptatzeko gehiago ibili behar. Erabiltzaile batek bere ziurtagiria erreboka dezake ziurtagiriaren baliozkotasuna galdu dela uste badu (adib., norbaitek PIN-a asmatu badu).\n"
+#~ "Ziurtagirien errebokatze-zerrendak baliogabetutako ziurtagiriak dira eta "
+#~ "ez lirateke enkriptatzeko gehiago ibili behar. Erabiltzaile batek bere "
+#~ "ziurtagiria erreboka dezake ziurtagiriaren baliozkotasuna galdu dela uste "
+#~ "badu (adib., norbaitek PIN-a asmatu badu).\n"
 #~ "<p>\n"
-#~ "Gomendagarria da CRL-ak erabiltzea segurtasun maximoa lortzeko. Ziurtagiri eta CRL-en kudeaketarako konfigurazioko elkarrizketa-koadroan CRL-ak non eskuratuko dituzun hauta dezakezu.\n"
+#~ "Gomendagarria da CRL-ak erabiltzea segurtasun maximoa lortzeko. "
+#~ "Ziurtagiri eta CRL-en kudeaketarako konfigurazioko elkarrizketa-koadroan "
+#~ "CRL-ak non eskuratuko dituzun hauta dezakezu.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15558,12 +15188,14 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Abisatu CRL-a laster iraungitzen bada</h1>\n"
-#~ "Hau hautatzen bada, erabiltzen ari zaren CRL-tako bat laster iraungitzean abisua eskuratuko duzu.\n"
+#~ "Hau hautatzen bada, erabiltzen ari zaren CRL-tako bat laster iraungitzean "
+#~ "abisua eskuratuko duzu.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15572,14 +15204,16 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Abisatu CRL-a laster iraungitzen bada</h1>\n"
-#~ "Eremu honetan abisu bat eskuratzeko CRL-aren iraungipen-dataren hurbilera zehatz dezakezu.\n"
+#~ "Eremu honetan abisu bat eskuratzeko CRL-aren iraungipen-dataren hurbilera "
+#~ "zehatz dezakezu.\n"
 #~ "<p>\n"
 #~ "SPHINX ingurunearen ezarpen gomendagarria 7 egun dira.\n"
 #~ "</qt>"
@@ -15593,44 +15227,56 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Beti enkriptatu zure burua</h1>\n"
-#~ "Hau hautatzen bada, zuk bidalitako enkriptatutako mezuak ere zure gakoa erabiliz enkriptatuko dira.\n"
+#~ "Hau hautatzen bada, zuk bidalitako enkriptatutako mezuak ere zure gakoa "
+#~ "erabiliz enkriptatuko dira.\n"
 #~ "<p>\n"
-#~ "Aukera hau gaitzea gomendagarria da zuk bidalitako mezuak irakurri ahal izateko.\n"
+#~ "Aukera hau gaitzea gomendagarria da zuk bidalitako mezuak irakurri ahal "
+#~ "izateko.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
 #~ msgstr "Abisatu kateko ziurtagiri bat &hau baino lehenago iraungitzen bada:"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Hautatu hau ziurtagiria laster iraungituko bada abisu bat eskuratzeko"
+#~ msgstr ""
+#~ "Hautatu hau ziurtagiria laster iraungituko bada abisu bat eskuratzeko"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Abisatu ziurtagiria iraungitzen bada</h1>\n"
-#~ "Aukera hau hautatzen bada, zehaztutako egunak baino lehen iraungituko den ziurtagiri bat erabiltzen baduzu, abisu bat agertuko da.\n"
+#~ "Aukera hau hautatzen bada, zehaztutako egunak baino lehen iraungituko den "
+#~ "ziurtagiri bat erabiltzen baduzu, abisu bat agertuko da.\n"
 #~ "<p>\n"
-#~ "Aukera hau gaitzea gomendagarria da laster iraungituko diren ziurtagiriak erabiltzea sahiesteko.\n"
+#~ "Aukera hau gaitzea gomendagarria da laster iraungituko diren ziurtagiriak "
+#~ "erabiltzea sahiesteko.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
-#~ msgstr "Abisatu &hartzailearen ziurtagiria hau baino lehen iraungitzen bada:"
+#~ msgstr ""
+#~ "Abisatu &hartzailearen ziurtagiria hau baino lehen iraungitzen bada:"
 
 #~ msgid "Warn if receiver's email address is &not in certificate"
-#~ msgstr "Abisatu hartzailearen helbide elektronikoa ez bada &ziurtagirian agertzen"
+#~ msgstr ""
+#~ "Abisatu hartzailearen helbide elektronikoa ez bada &ziurtagirian agertzen"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Sinaduraren konfigurazioa"
@@ -15644,8 +15290,28 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Zein ziurtagiri bidaliko diren hautatzen du"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Ziurtagiriak bidaltzen</h1> Ziurtagiririk gabe, hartzaileak ezin izango du ebatzi mezua zuk bidali duzun ala ez. <p>Hartzaileak ziurtagiria zerbitzari zentral batetik har dezake, baina zuk ere zure ziurtagiria zure mezuarekin bidaltzea hauta dezakezu. Ziurtagiria ez txertatzea, zure ziurtagiria edo zure ziurtagiria egiaztatzen duen ziurtagiri-kate osoa txertatzea hauta dezakezu, erroko ziurtagiria sartzea ere hautatuz. <p> Gomendagarria da gutxienez zure ziurtagiria sartzea. <p> Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri dezakezu. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Ziurtagiriak bidaltzen</h1> Ziurtagiririk gabe, hartzaileak ezin "
+#~ "izango du ebatzi mezua zuk bidali duzun ala ez. <p>Hartzaileak "
+#~ "ziurtagiria zerbitzari zentral batetik har dezake, baina zuk ere zure "
+#~ "ziurtagiria zure mezuarekin bidaltzea hauta dezakezu. Ziurtagiria ez "
+#~ "txertatzea, zure ziurtagiria edo zure ziurtagiria egiaztatzen duen "
+#~ "ziurtagiri-kate osoa txertatzea hauta dezakezu, erroko ziurtagiria "
+#~ "sartzea ere hautatuz. <p> Gomendagarria da gutxienez zure ziurtagiria "
+#~ "sartzea. <p> Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau "
+#~ "gainezarri dezakezu. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Bidali &zure ziutagiria"
@@ -15665,16 +15331,20 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sinatu mezuaren zati guztiak lehenespenez</h1>\n"
-#~ "Aukera hau hautatzean, mezuaren zati guztiak (hau da, mezuaren gorputz nagusia eta eranskin guztiak) lehenespenez sinatuko dira.\n"
+#~ "Aukera hau hautatzean, mezuaren zati guztiak (hau da, mezuaren gorputz "
+#~ "nagusia eta eranskin guztiak) lehenespenez sinatuko dira.\n"
 #~ "<p>\n"
-#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri dezakezu.\n"
+#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri "
+#~ "dezakezu.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15686,12 +15356,15 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Galdetu zati bakoitza sinatu baina lehen</h1>\n"
-#~ "Aukera hau hautatzean, mezuaren zati bakoitza (hau da, mezuaren gorputz nagusia eta eranskin guztiak) banaka sinatu nahi duzun galdetuko da.\n"
+#~ "Aukera hau hautatzean, mezuaren zati bakoitza (hau da, mezuaren gorputz "
+#~ "nagusia eta eranskin guztiak) banaka sinatu nahi duzun galdetuko da.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15705,18 +15378,22 @@ msgstr "Gainidatzi fitxategia?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ez sinatu mezurik</h1>\n"
 #~ "Aukera hau hautatzen bada, mezuak ez dira lehenespenez sinatuko.\n"
 #~ "<p>\n"
-#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri dezakezu.\n"
+#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri "
+#~ "dezakezu.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Sinaduraren ziurtagiria konfiguratuta dago <em>Ziurtagiriak</em> orrian."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Sinaduraren ziurtagiria konfiguratuta dago <em>Ziurtagiriak</em> orrian."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15727,20 +15404,32 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sinaduraren algoritmoa</h1>\n"
-#~ "Algoritmo bat ordenagailu baten lanaren azalpena da. Sinadura-algoritmoak ordenagailuak zure sinadura-gakoa zure mezuari nola aplikatzen dion azaltzen du hartzaileak mezua benetan zurea dela jakiteko.\n"
+#~ "Algoritmo bat ordenagailu baten lanaren azalpena da. Sinadura-algoritmoak "
+#~ "ordenagailuak zure sinadura-gakoa zure mezuari nola aplikatzen dion "
+#~ "azaltzen du hartzaileak mezua benetan zurea dela jakiteko.\n"
 #~ "<p>\n"
-#~ "Sinadura-algoritmo baten hautapenak mezu bat fabrikatzeko erraztasuna zehazten du. Hala ere, SPHINX inguruneak emandako algoritmoak seguruak dira. Orokorrean ez dira lehenetsitako aukerak aldatu behar.\n"
+#~ "Sinadura-algoritmo baten hautapenak mezu bat fabrikatzeko erraztasuna "
+#~ "zehazten du. Hala ere, SPHINX inguruneak emandako algoritmoak seguruak "
+#~ "dira. Orokorrean ez dira lehenetsitako aukerak aldatu behar.\n"
 #~ "<p>\n"
-#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri dezakezu.\n"
+#~ "Ezarpen hau lehenetsia da, baina mezu bakoitzean aukera hau gainezarri "
+#~ "dezakezu.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15755,12 +15444,15 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gorde mezuak bere sinadurekin</h1>\n"
-#~ "Hau hautatzean, bidalitako mezuak bere sinadurekin gordeko dira. Hau gomendagarri da, sinatutako mezu edo zati bat geroago egiazta dezakezu.\n"
+#~ "Hau hautatzean, bidalitako mezuak bere sinadurekin gordeko dira. Hau "
+#~ "gomendagarri da, sinatutako mezu edo zati bat geroago egiazta dezakezu.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15770,17 +15462,24 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgstr "MIME estanda&rra"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Sinadura eta sinatutako datuak dituen zati aniztun/sinaduradun mezua."
+#~ msgstr ""
+#~ "Sinadura eta sinatutako datuak dituen zati aniztun/sinaduradun mezua."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Zati aniztun sinadura</h1>\n"
-#~ "Aukera hau hautatzean, sinadura eta sinatutako datuak zati aniztun/sinatutako mezu baten zati ezberdinak izango dira. Sinatutako mezuaren datuak irakurgarriak izango dira sinadura-algoritmoa eta ASN.1 kodeketa onartzen ez duten posta bezeroak erabiliz.\n"
+#~ "Aukera hau hautatzean, sinadura eta sinatutako datuak zati aniztun/"
+#~ "sinatutako mezu baten zati ezberdinak izango dira. Sinatutako mezuaren "
+#~ "datuak irakurgarriak izango dira sinadura-algoritmoa eta ASN.1 kodeketa "
+#~ "onartzen ez duten posta bezeroak erabiliz.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15792,12 +15491,16 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sinadura opakodun mezuak</h1>\n"
-#~ "Aukera hau hautatzean, sinadura eta sinatutako datuak ASN.1 bloke batean kodetuko dira. Mezuak ASN.1 dekodifikazioa onartzen duten posta bezeroek bakarrik irakurriko dituzte.\n"
+#~ "Aukera hau hautatzean, sinadura eta sinatutako datuak ASN.1 bloke batean "
+#~ "kodetuko dira. Mezuak ASN.1 dekodifikazioa onartzen duten posta bezeroek "
+#~ "bakarrik irakurriko dituzte.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15809,8 +15512,22 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Hautatu PIN-a sartu beharreko maiztasuna"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN sarrera</h1> Hemen, zure ziurtagiriak dituen zure segurtasun pertsonalaren ingurunera (PSE ingelesez) sarbidea izateko PIN-a sartu beharreko maiztasuna zehaztu dezakezu.<p>Geroz eta sarriago sartzen baduzu PIN-a, hare eta babestuagoa egongo zara zure izenean mezuak sortu nahi dituztenen aurka, baina deserosoagoa izango da. <p> Zalantzak badituzu, utzi aukera dagoen bezala. <p> Kontuan izan ezin dela PIN-aren sarrera desgaitu segurtasun arrazoiak direla eta. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN sarrera</h1> Hemen, zure ziurtagiriak dituen zure segurtasun "
+#~ "pertsonalaren ingurunera (PSE ingelesez) sarbidea izateko PIN-a sartu "
+#~ "beharreko maiztasuna zehaztu dezakezu.<p>Geroz eta sarriago sartzen "
+#~ "baduzu PIN-a, hare eta babestuagoa egongo zara zure izenean mezuak sortu "
+#~ "nahi dituztenen aurka, baina deserosoagoa izango da. <p> Zalantzak "
+#~ "badituzu, utzi aukera dagoen bezala. <p> Kontuan izan ezin dela PIN-aren "
+#~ "sarrera desgaitu segurtasun arrazoiak direla eta. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Saio bakoitzeko"
@@ -15827,16 +15544,21 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Abisatu ziurtagiria iraungitzear badago</h1>\n"
-#~ "Aukera hau hautatzean, zehaztutako denbora epean iraungitzear dagoen ziurtagiri bat erabiltzean abisu bat jasoko duzu.\n"
+#~ "Aukera hau hautatzean, zehaztutako denbora epean iraungitzear dagoen "
+#~ "ziurtagiri bat erabiltzean abisu bat jasoko duzu.\n"
 #~ "<p>\n"
-#~ "Gomendagarria da aukera hau gaitzea laster iraungituko diren ziurtagiriak erabiltzea ekiditeko.\n"
+#~ "Gomendagarria da aukera hau gaitzea laster iraungituko diren ziurtagiriak "
+#~ "erabiltzea ekiditeko.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15848,14 +15570,17 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Abisatu sinatzailearen helbide elektronikoa ziurtagirian ez badago</h1>\n"
-#~ "Aukera hau hautatzen bada, abisu bat eskuratuko duzu sinatzailearen helbide elektronikoa sinatzeko erabilitako ziurtagirian ez badago.\n"
+#~ "<h1>Abisatu sinatzailearen helbide elektronikoa ziurtagirian ez badago</"
+#~ "h1>\n"
+#~ "Aukera hau hautatzen bada, abisu bat eskuratuko duzu sinatzailearen "
+#~ "helbide elektronikoa sinatzeko erabilitako ziurtagirian ez badago.\n"
 #~ "<p>\n"
 #~ "Gomendagarria da aukera hau gaitzea integritate maximoa lortzeko.\n"
 #~ "</qt>"
@@ -15875,9 +15600,6 @@ msgstr "Gainidatzi fitxategia?"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "Gorde &zirriborroen karpetan"
 
-#~ msgid "Configure KMail"
-#~ msgstr "Konfiguratu KMail"
-
 #~ msgid "Open with..."
 #~ msgstr "Ireki honekin..."
 
diff --git a/tde-i18n-fa/messages/tdepim/kmail.po b/tde-i18n-fa/messages/tdepim/kmail.po
index c35c8a0b8f6..a4e219e1009 100644
--- a/tde-i18n-fa/messages/tdepim/kmail.po
+++ b/tde-i18n-fa/messages/tdepim/kmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-02-19 11:35+0330\n"
 "Last-Translator: MaryamSadat Razavi <razavi@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "مریم سادات رضوی، نسیم دانیارزاده"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -176,6 +176,12 @@ msgstr "&هیچ‌کدام )با احتیاط استفاده کنید(‌"
 msgid "Account for semiautomatic resource handling"
 msgstr "حساب برای گرداندن منبع نیمه خودکار"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "پاک کردن گذشته"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -251,9 +257,9 @@ msgstr "&ورود:‌"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "فراهم‌‌کنندۀ خدمات اینترنتیتان <em>نام کاربری</em> به شما می‌دهد که برای احراز "
 "هویتتان به کارسازهایشان استفاده می‌شود. معمولاً، اولین جزء نشانی رایانامه‌تان "
@@ -278,18 +284,18 @@ msgstr "&ذخیرۀ اسم رمز قرارداد دفتر پست‌"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "برای این که KMail را مجبور به ذخیرۀ اسم رمز کنید، این گزینه را علامت بزنید.\n"
 "اگر TDEWallet  در دسترس باشد، اسم رمز در جایی که ایمن به نظر برسد، ذخیره "
 "می‌شود.\n"
-"به هر حال، اگر TDEWallet در دسترس نباشد، اسم رمز در پروندۀ پیکربندی KMail ذخیره "
-"می‌گردد. اسم‌‌ رمز در یک قالب مبهم ذخیره می‌شود، اما اگر دستیابی به پروندۀ "
+"به هر حال، اگر TDEWallet در دسترس نباشد، اسم رمز در پروندۀ پیکربندی KMail "
+"ذخیره می‌گردد. اسم‌‌ رمز در یک قالب مبهم ذخیره می‌شود، اما اگر دستیابی به پروندۀ "
 "پیکربندی فراهم شود، نباید به خاطر تلاشهای سرگشایی، امن در نظر گرفته شود."
 
 #: accountdialog.cpp:640
@@ -318,8 +324,9 @@ msgstr "&پالایش پیامها در صورتی که بزرگ‌تر باشن
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "اگر این گزینه را برگزینید، پالایه‌های قرارداد دفتر پست برای تصمیم در مورد این "
 "که با پیامها چه باید کرد، استفاده می‌شوند. بنابراین، می‌توانید آنها را بارگیری "
@@ -372,13 +379,15 @@ msgstr "پاک کردن &متن‌"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&ورود‌"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&ساده‌"
 
@@ -421,9 +430,9 @@ msgstr "فضاهای نام:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "در اینجا می‌توانید فضاهای نام متفاوتی که کارساز IMAP شما پشتیبانی می‌کند را "
 "ببینید. هر فضای نام، پیشوندی را باز‌نمایی می‌کند که گروهها را از پوشه‌ها جدا می "
@@ -486,13 +495,13 @@ msgstr "بار کردن &پیوستها بر اساس تقاضا‌"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"برای بارگذاری پیوستها، نه زمانی که رایانامه را  به طور خودکار برمی‌گزینید، بلکه "
-"زمانی که روی پیوست فشار می‌دهید، این را فعال کنید. با این روش، رایانامه‌های "
-"بزرگ هم بلافاصله نمایش داده می‌شوند."
+"برای بارگذاری پیوستها، نه زمانی که رایانامه را  به طور خودکار برمی‌گزینید، "
+"بلکه زمانی که روی پیوست فشار می‌دهید، این را فعال کنید. با این روش، "
+"رایانامه‌های بزرگ هم بلافاصله نمایش داده می‌شوند."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -532,7 +541,7 @@ msgstr ""
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "دریافتی"
 
@@ -540,43 +549,44 @@ msgstr "دریافتی"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "به نظر نمی‌رسد که کارساز، تعداد پیامهای یکتا را پشتیبانی کند، اما این نیازی "
 "برای رها کردن پیامها در کارساز است.\n"
-" از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان رها "
-"کردن پیامهای واکشی‌شده در کارساز را دارید."
+" از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان "
+"رها کردن پیامهای واکشی‌شده در کارساز را دارید."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "به نظر نمی‌رسد که کارساز از واکشی سرآیند پیامها پشتیبانی کند، اما این نیازی "
 "برای پالایش پیامها در کارساز است.\n"
-" از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان رها "
-"کردن پیامهای واکشی‌شده در کارساز را دارید."
+" از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان "
+"رها کردن پیامهای واکشی‌شده در کارساز را دارید."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "لطفاً، توجه داشته باشید که این ویژگی می‌تواند باعث شود برخی کارسازهای POP3 که "
 "از خط لوله پشتیبانی نمی‌کنند، نامۀ خراب‌شده ارسال نمایند؛\n"
-"به هر حال، این قابل پیکربندی است، زیرا برخی کارسازان از خط لوله پشتیبانی کرده "
-"اما قابلیتهایشان را اعلان نمی‌کنند. برای بررسی این که آیا کارساز POP3 شما، "
-"پشتیبانی خط لوله را اعلان می‌کند، از دکمۀ »بررسی آنچه کارساز پشتیبانی می‌کند« "
-"در پایین محاوره استفاده کنید؛\n"
+"به هر حال، این قابل پیکربندی است، زیرا برخی کارسازان از خط لوله پشتیبانی "
+"کرده اما قابلیتهایشان را اعلان نمی‌کنند. برای بررسی این که آیا کارساز POP3 "
+"شما، پشتیبانی خط لوله را اعلان می‌کند، از دکمۀ »بررسی آنچه کارساز پشتیبانی "
+"می‌کند« در پایین محاوره استفاده کنید؛\n"
 "اگر کارسازتان آن را اعلان نکند، اما سرعت بیشتری بخواهید، ابتدا باید با ارسال "
 "دسته‌ای نامه برای خودتان و بارگیری آن، مقداری از آزمون را انجام دهید."
 
@@ -586,20 +596,20 @@ msgstr "لطفاً، یک کارساز را مشخص کنید و ابتدا به
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "به نظر نمی‌رسد که کارساز از خط لوله پشتیبانی کند؛ بنابراین، این گزینه غیرفعال "
 "شده است.\n"
-"از آن جایی که برخی کارسازان، قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان رها "
-"کردن پیامهای واکشی‌شده در کارساز را دارید. اما، لطفاً توجه داشته باشید که این "
-"ویژگی می‌تواند باعث شود که برخی کارسازان قرارداد دفتر پست که از خط لوله "
+"از آن جایی که برخی کارسازان، قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان "
+"رها کردن پیامهای واکشی‌شده در کارساز را دارید. اما، لطفاً توجه داشته باشید که "
+"این ویژگی می‌تواند باعث شود که برخی کارسازان قرارداد دفتر پست که از خط لوله "
 "پشتیبانی نمی‌کنند، پیامهای خراب ارسال کنند. بنابراین، قبل از استفاده از این "
 "ویژگی همراه با نامۀ مهم، ابتدا باید آن را با ارسال تعداد بیشتری از پیامهای "
 "آزمون برای خودتان که تمام آن را با یک دفعه رفتن از کارساز قرارداد دفتر پست "
@@ -608,28 +618,28 @@ msgstr ""
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"به نظر نمی‌رسد که کارساز از تعداد پیامهای یکتا پشتیبانی کند، اما این نیازی برای "
-"رها کردن پیامها در کارساز است؛ بنابراین، این گزینه غیرفعال شده است.\n"
-"از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان رها "
-"کردن پیامهای واکشی‌شده در کارساز را دارید."
+"به نظر نمی‌رسد که کارساز از تعداد پیامهای یکتا پشتیبانی کند، اما این نیازی "
+"برای رها کردن پیامها در کارساز است؛ بنابراین، این گزینه غیرفعال شده است.\n"
+"از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان "
+"رها کردن پیامهای واکشی‌شده در کارساز را دارید."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "به نظر نمی‌رسد که کارساز از واکشی سرآیند پیامها پشتیبانی کند، اما این نیازی "
 "برای پالایش پیامها در کارساز است؛ بنابراین، این گزینه غیرفعال شده است.\n"
-"از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان رها "
-"کردن پیامهای واکشی‌شده در کارساز را دارید."
+"از آن جایی که برخی کارسازان قابلیتهایشان را درست اعلان می‌کنند، هنوز امکان "
+"رها کردن پیامهای واکشی‌شده در کارساز را دارید."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -703,8 +713,8 @@ msgstr "حساب IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "لازم است برای دریافت نامه، حسابی در بخش شبکۀ تنظیمات اضافه کنید."
 
 #: accountwizard.cpp:87
@@ -741,9 +751,9 @@ msgstr "به KMail خوش آمدید"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>به نظر می‌رسد برای اولین بار، KMail را آغاز کرده‌اید. از این جادوگر برای "
 "برپایی حساب نامه‌هایتان می‌توانید استفاده کنید. فقط داده‌های اتصال را که از "
@@ -809,8 +819,7 @@ msgstr "استفاده از تحویل محلی"
 msgid "Server Information"
 msgstr "اطلاعات کارساز"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "هیچ‌کدام"
@@ -954,28 +963,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>در اینجا می‌توانید برای کمک گرفتن در برپایی قواعد پالایۀ KMail از برخی "
-"ابزارهای معمولاً مشهور ضد ویروس استفاده کنید.</p>"
-"<p>جادوگر می‌تواند آن ابزارها را در رایانه‌تان آشکار کند، و هم برای دسته‌بندی "
-"پیامها با استفاده از این ابزارها، قواعد پالایه را ایجاد کرده و پیامهای حاوی "
-"ویروس را جدا کند. جادوگر به قواعد موجود پالایه توجهی نمی‌کند: همیشه به قواعد "
-"جدید می‌پیوندد.</p>"
-"<p><b>اخطار:</b> چون به نظر می‌رسد که KMail طی پویش پیامها برای ویروس متوقف "
-"شود، ممکن است با مسائلی در رابطه با حساسیت متقابل KMail روبرو شوید، زیرا عملیات "
-"ابزار ضد ویروس معمولاً وقت‌گیر است؛ لطفاً، حذف قواعد پالایه که توسط جادوگر برای "
-"برگشتن به رفتار قبلی ایجاد‌شده را در نظر بگیرید."
+"ابزارهای معمولاً مشهور ضد ویروس استفاده کنید.</p><p>جادوگر می‌تواند آن ابزارها "
+"را در رایانه‌تان آشکار کند، و هم برای دسته‌بندی پیامها با استفاده از این "
+"ابزارها، قواعد پالایه را ایجاد کرده و پیامهای حاوی ویروس را جدا کند. جادوگر "
+"به قواعد موجود پالایه توجهی نمی‌کند: همیشه به قواعد جدید می‌پیوندد.</"
+"p><p><b>اخطار:</b> چون به نظر می‌رسد که KMail طی پویش پیامها برای ویروس متوقف "
+"شود، ممکن است با مسائلی در رابطه با حساسیت متقابل KMail روبرو شوید، زیرا "
+"عملیات ابزار ضد ویروس معمولاً وقت‌گیر است؛ لطفاً، حذف قواعد پالایه که توسط "
+"جادوگر برای برگشتن به رفتار قبلی ایجاد‌شده را در نظر بگیرید."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -983,8 +990,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>لطفاً، ابزارهایی که باید برای آشکارسازی هرزنامه استفاده شود را برگزینید و به "
-"صفحۀ بعدی بروید.</p>"
+"<p>لطفاً، ابزارهایی که باید برای آشکارسازی هرزنامه استفاده شود را برگزینید و "
+"به صفحۀ بعدی بروید.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1014,14 +1021,13 @@ msgstr "حرکت هرزنامۀ &احتمالی به:‌"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"پوشۀ پیش‌فرض، پوشۀ دریافتی است؛ اما ممکن است آن را در نمای پوشۀ زیر تغییر دهید."
-"<p>تمام ابزارها از یک دسته‌بندی به عنوان نامطمئن پشتیبانی نمی‌کنند. اگر یک "
-"ابزار توانا انتخاب نکرده‌اید، نمی‌توانید پوشه‌ای هم برگزینید."
+"پوشۀ پیش‌فرض، پوشۀ دریافتی است؛ اما ممکن است آن را در نمای پوشۀ زیر تغییر "
+"دهید.<p>تمام ابزارها از یک دسته‌بندی به عنوان نامطمئن پشتیبانی نمی‌کنند. اگر "
+"یک ابزار توانا انتخاب نکرده‌اید، نمی‌توانید پوشه‌ای هم برگزینید."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1031,8 +1037,8 @@ msgstr "بررسی پیامها با استفاده از ابزارهای ضد �
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "اجازه دهید ابزارهای ضد ویروس، پیامهایتان را بررسی کنند. جادوگر، پالایه‌های "
 "مناسب را ایجاد می‌کند. پیامها معمولاً توسط ابزارها نشان‌دار می‌شوند، به طوری که "
@@ -1046,8 +1052,8 @@ msgstr "حرکت دادن پیامهای ویروسی آشکار‌شده به �
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "پالایه‌ای برای آشکار کردن پیامهایی که به عنوان آلوده به ویروس دسته‌بندی "
 "شده‌اند، و حرکت دادن آنها به پوشۀ از پیش تعریف‌شده‌ای که ایجاد می‌شود. پوشۀ "
@@ -1059,8 +1065,8 @@ msgstr "به علاوه، پیامهای نشان‌دار ویروسی آشکا
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "پیامهای نشان‌داری که به اندازۀ پیامهای خوانده‌شدۀ آلوده به ویروس دسته‌بندی "
 "شده‌اند، و نیز حرکت دادن آنها به پوشۀ برگزیده."
@@ -1241,8 +1247,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"این می‌توانست باشد، زیرا برای انجامش مجوز ندارید یا به خاطر این که پوشه از قبل "
-"در کارساز حضور دارد؛ در اینجا پیام خطا از ارتباط کارساز وجود دارد."
+"این می‌توانست باشد، زیرا برای انجامش مجوز ندارید یا به خاطر این که پوشه از "
+"قبل در کارساز حضور دارد؛ در اینجا پیام خطا از ارتباط کارساز وجود دارد."
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1255,8 +1261,8 @@ msgstr "خطا هنگام خواندن پوشۀ %1 در کارساز:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1276,8 +1282,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1308,21 +1314,20 @@ msgstr "حذف‌شده"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>هیچ‌کدام از هویتهایتان با گیرندۀ این پیام تطابق ندارند،"
-"<br>اگر نشانی وجود دارد، لطفاً، انتخاب کنید که کدام یک از نشانیهای زیر نشانی "
-"شماست:"
+"<qt>هیچ‌کدام از هویتهایتان با گیرندۀ این پیام تطابق ندارند،<br>اگر نشانی وجود "
+"دارد، لطفاً، انتخاب کنید که کدام یک از نشانیهای زیر نشانی شماست:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>چندین هویت از هویتهایتان با گیرندۀ این پیام تطابق دارد،"
-"<br> لطفاً، انتخاب کنید که کدام یک از نشانیهای زیر نشانی شماست:"
+"<qt>چندین هویت از هویتهایتان با گیرندۀ این پیام تطابق دارد،<br> لطفاً، انتخاب "
+"کنید که کدام یک از نشانیهای زیر نشانی شماست:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1351,18 +1356,21 @@ msgstr "هنگام فشرده‌سازی »%1« خطایی رخ داد. فشرد
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>این تنظیم توسط سرپرستتان ثابت شده است.</p>"
-"<p>اگر فکر می‌کنید این یک خطا است، لطفاً با او تماس بگیرید.</p></qt>"
+"<qt><p>این تنظیم توسط سرپرستتان ثابت شده است.</p><p>اگر فکر می‌کنید این یک "
+"خطا است، لطفاً با او تماس بگیرید.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&بار کردن Profile...‌"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "پیکربندی حساب"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&افزودن...‌"
@@ -1392,6 +1400,11 @@ msgstr "<qt>واقعاً می‌خواهید هویت با نام <b>%1</b> را
 msgid "Remove Identity"
 msgstr "حذف هویت"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&حذف‌"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "افزودن..."
@@ -1400,6 +1413,11 @@ msgstr "افزودن..."
 msgid "Modify..."
 msgstr "تغییر..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&حذف‌"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "تنظیم به عنوان پیش‌فرض"
@@ -1416,17 +1434,15 @@ msgstr "&ارسال‌"
 msgid "Outgoing accounts (add at least one):"
 msgstr "حسابهای خارج‌شونده )افزودن حداقل یک مورد(:"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "نام"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "نوع"
@@ -1448,8 +1464,7 @@ msgstr "تنظیم پیش‌فرض"
 msgid "Common Options"
 msgstr "گزینه‌های مشترک"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "تأیید &پیش از ارسال‌"
@@ -1500,17 +1515,16 @@ msgstr "دامنۀ &پیش‌فرض:‌"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>دامنۀ پیش‌فرض، برای کامل کردن نشانیهای رایانامه‌ای که فقط متشکل از نام کاربر "
-"هستند، استفاده می‌شود.</p></qt>"
+"<qt><p>دامنۀ پیش‌فرض، برای کامل کردن نشانیهای رایانامه‌ای که فقط متشکل از نام "
+"کاربر هستند، استفاده می‌شود.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1528,9 +1542,9 @@ msgstr "افزودن انتقال"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 )پیش‌فرض("
 
@@ -1609,6 +1623,10 @@ msgstr "تغییر حساب"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>قادر به محل‌یابی حساب <b>%1</b> نیست.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&رنگها‌"
@@ -1717,8 +1735,7 @@ msgstr "پیوند دنبال‌شده"
 msgid "Misspelled Words"
 msgstr "واژه‌های نادرست"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "پیام جدید"
@@ -1907,8 +1924,8 @@ msgstr "بستن رشته‌های پیش‌فرض"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "باز کردن رشته‌هایی که حاوی پیامهای &جدید، خوانده‌نشده یا مهم است، و باز کردن "
 "رشته‌های پایش‌شده.‌"
@@ -1919,69 +1936,51 @@ msgstr "نمایش تاریخ"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>ممکن است این عبارتها برای تاریخ استفاده شوند:</strong></p>"
-"<ul>"
-"<li>d - روز به عنوان عددی بدون صفر جلو )۳۱-۱)</li>"
-"<li>dd - روز به عنوان عددی با صفر جلو )۳۱-۰۱(</li>"
-"<li>ddd - نام مختصر روز (Mon - Sun)</li>"
-"<li>dddd - نام طولانی روز (Monday - Sunday)</li>"
-"<li>M - ماه به عنوان عددی بدون صفر جلو )۱۲-۱)</li>"
-"<li>MM - ماه به عنوان عددی با صفر جلو )۱۲-۰۱)</li>"
-"<li>MMM - نام مختصر ماه (Jan - Dec)</li>"
-"<li>MMMM - نام طولانی ماه (January - December)</li>"
-"<li>yy - سال به عنوان عددی دو رقمی )۹۹-۰۰(</li>"
-"<li>yyyy - سال به عنوان عددی چهار رقمی )۹۹۹۹-۰۰۰۰(</li></ul>"
-"<p><strong>ممکن است این عبارتها برای زمان استفاده شوند:</string></p> "
-"<ul>"
-"<li>h - ساعت بدون صفر جلو )۲۳-۰یا ۱۲-۱ اگر قبل از ظهر/بعد از ظهر نمایش داده "
-"شود(</li>"
-"<li>hh - ساعت با صفر جلو )۲۳-۰۰ یا ۱۲-۰۱ اگر قبل از ظهر/بعد از ظهر نمایش داده "
-"شود(</li>"
-"<li>m - دقیقه بدون صفر جلو )۵۹-۰(</li>"
-"<li>mm - دقیقه با صفر جلو )۵۹-۰۰(</li>"
-"<li>s - ثانیه بدون صفر جلو )۵۹-۰)</li>"
-"<li>ss - ثانیه با صفر جلو)۵۹-۰۰)</li>"
-"<li>z - میلی‌ثانیه بدون صفرهای جلو )۹۹۹-۰(</li>"
-"<li>zzz - میلی‌ثانیه با صفرهای جلو )۹۹۹-۰۰۰)</li>"
-"<li>AP -  سودهی به نمایش AM/PM. «AM» یا»PM« جایگزین AP می‌شود.</li>"
-"<li>ap - سودهی به نمایش AM/PM.«am» یا «pm» جایگزین ap می‌شود.</li>"
-"<li>Z - ناحیۀ زمانی به شکل عددی )۰۵۰۰-(</li></ul>"
-"<p><strong>از تمام نویسه‌های ورودی دیگر چشم‌پوشی می‌شود."
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>ممکن است این عبارتها برای تاریخ استفاده شوند:</strong></"
+"p><ul><li>d - روز به عنوان عددی بدون صفر جلو )۳۱-۱)</li><li>dd - روز به "
+"عنوان عددی با صفر جلو )۳۱-۰۱(</li><li>ddd - نام مختصر روز (Mon - Sun)</"
+"li><li>dddd - نام طولانی روز (Monday - Sunday)</li><li>M - ماه به عنوان عددی "
+"بدون صفر جلو )۱۲-۱)</li><li>MM - ماه به عنوان عددی با صفر جلو )۱۲-۰۱)</"
+"li><li>MMM - نام مختصر ماه (Jan - Dec)</li><li>MMMM - نام طولانی ماه "
+"(January - December)</li><li>yy - سال به عنوان عددی دو رقمی )۹۹-۰۰(</"
+"li><li>yyyy - سال به عنوان عددی چهار رقمی )۹۹۹۹-۰۰۰۰(</li></"
+"ul><p><strong>ممکن است این عبارتها برای زمان استفاده شوند:</string></p> "
+"<ul><li>h - ساعت بدون صفر جلو )۲۳-۰یا ۱۲-۱ اگر قبل از ظهر/بعد از ظهر نمایش "
+"داده شود(</li><li>hh - ساعت با صفر جلو )۲۳-۰۰ یا ۱۲-۰۱ اگر قبل از ظهر/بعد از "
+"ظهر نمایش داده شود(</li><li>m - دقیقه بدون صفر جلو )۵۹-۰(</li><li>mm - دقیقه "
+"با صفر جلو )۵۹-۰۰(</li><li>s - ثانیه بدون صفر جلو )۵۹-۰)</li><li>ss - ثانیه "
+"با صفر جلو)۵۹-۰۰)</li><li>z - میلی‌ثانیه بدون صفرهای جلو )۹۹۹-۰(</li><li>zzz "
+"- میلی‌ثانیه با صفرهای جلو )۹۹۹-۰۰۰)</li><li>AP -  سودهی به نمایش AM/PM. «AM» "
+"یا»PM« جایگزین AP می‌شود.</li><li>ap - سودهی به نمایش AM/PM.«am» یا «pm» "
+"جایگزین ap می‌شود.</li><li>Z - ناحیۀ زمانی به شکل عددی )۰۵۰۰-(</li></"
+"ul><p><strong>از تمام نویسه‌های ورودی دیگر چشم‌پوشی می‌شود."
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "تغییر تنظیم سراسری نخ‌کشی، تمام مقادیر مشخص پوشه را لغو می‌کند."
 
 #: configuredialog.cpp:2221
@@ -1996,8 +1995,7 @@ msgstr "نمایش میله &وضعیت زنگام‌"
 msgid "Show s&pam status in fancy headers"
 msgstr "نمایش وضعیت &هرزنامه در سرآیندهای تزئینی‌"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "جایگزینی لبخندک با احساس‌نماها"
@@ -2006,8 +2004,7 @@ msgstr "جایگزینی لبخندک با احساس‌نماها"
 msgid "Use smaller font for quoted text"
 msgstr "استفاده از قلم کوچک‌تر برای متن نقل قول‌شده"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "نمایش نشانهای نقل قول گسترده/فشرده"
@@ -2033,8 +2030,7 @@ msgstr "خودکار"
 msgid "&Override character encoding:"
 msgstr "&ابطال کدبندی نویسه:‌"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "فعال‌سازی شمایل سینی سیستم"
@@ -2137,20 +2133,17 @@ msgstr "برای ویرایش نام پرونده، جایگزین <b>%f</b> م�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>جاگیرنده‌های زیر در عبارتهای پاسخ، پشتیبانی می‌شوند:"
-"<br><b>%D</b>: تاریخ، <b>%S</b>: موضوع،"
-"<br><b>%e</b>: نشانی فرستنده، <b>%F</b>: نام فرستنده، <b>%f</b>"
-": آغازینهای فرستنده،"
-"<br><b>%T</b>: نام گیرنده،<b>%t</b>: نام و نشانی گیرنده،"
-"<br><b>%C</b>: نامهای رونوشت،<b>%c</b>: نامها و نشانیهای رونوشت،"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>جاگیرنده‌های زیر در عبارتهای پاسخ، پشتیبانی می‌شوند:<br><b>%D</b>: تاریخ، "
+"<b>%S</b>: موضوع،<br><b>%e</b>: نشانی فرستنده، <b>%F</b>: نام فرستنده، <b>"
+"%f</b>: آغازینهای فرستنده،<br><b>%T</b>: نام گیرنده،<b>%t</b>: نام و نشانی "
+"گیرنده،<br><b>%C</b>: نامهای رونوشت،<b>%c</b>: نامها و نشانیهای رونوشت،"
 "<br><b>%%</b>: علامت درصد، <b>%_</b>: فاصله، <b>%L</b>: شکست خط</qt>"
 
 #: configuredialog.cpp:2943
@@ -2174,21 +2167,20 @@ msgstr "&پاسخ به همه:‌"
 msgid "&Forward:"
 msgstr "&پیش‌سو:‌"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "شاخص &نقل قول:‌"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "در %D، نوشتید:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "در %D، %F نوشت:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "پیام پیش‌سو شده"
 
@@ -2226,8 +2218,8 @@ msgstr "وارد کردن پیشوند پیش‌سوی جدید:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "این فهرست برای هر پیام خارج‌شونده از بالا به پایین، در مورد مجموعه نویسه‌‌ای که "
 "حاوی تمام نویسه‌های مورد نیاز است، بررسی می‌شود."
@@ -2264,10 +2256,9 @@ msgstr "مقدار"
 msgid "Ne&w"
 msgstr "&جدید‌"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&نام:‌"
@@ -2276,19 +2267,18 @@ msgstr "&نام:‌"
 msgid "&Value:"
 msgstr "&مقدار:‌"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "نام‌گذاری پیوست همساز Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"برای این که Outlook(tm) را مجبور کنید که نامهای پیوستی را که حاوی نویسه‌های غیر "
-"انگلیسی می‌باشد، بفهمد، این گزینه را فعال کنید"
+"برای این که Outlook(tm) را مجبور کنید که نامهای پیوستی را که حاوی نویسه‌های "
+"غیر انگلیسی می‌باشد، بفهمد، این گزینه را فعال کنید"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2314,21 +2304,21 @@ msgstr "پیوست‌شده"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "کد‌بندی نامهای پیوست حاوی نویسه‌های غیر انگلیسی را به روشی انتخاب کرده‌اید، که "
 "توسط Outlook(tm) و دیگر کارخواهان نامه که از نامهای کد‌بندی‌شدۀ پیوست "
 "Outlook(tm)  پیرو استاندارد پشتیبانی نمی‌کنند، فهمیده شوند.\n"
-"توجه داشته باشید که، ممکن است KMail پیامهای پیرو غیر استاندارد را ایجاد کند؛ و "
-"در نتیجه، این امکان وجود دارد که کارخواهان نامه پیرو استاندارد، پیامهایتان را "
-"بفهمند، مگر این که انتخاب دیگری نداشته باشید، بنابراین، نباید این گزینه را فعال "
-"کنید."
+"توجه داشته باشید که، ممکن است KMail پیامهای پیرو غیر استاندارد را ایجاد کند؛ "
+"و در نتیجه، این امکان وجود دارد که کارخواهان نامه پیرو استاندارد، پیامهایتان "
+"را بفهمند، مگر این که انتخاب دیگری نداشته باشید، بنابراین، نباید این گزینه "
+"را فعال کنید."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2352,111 +2342,96 @@ msgstr "&پایانه‌های پشتیبانی رمز‌"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>گاهی اوقات پیامها در هر دو قالب می‌آیند. این گزینه این را کنترل می‌کند، که "
-"آیا جزء زنگام را می‌خواهید یا جزء متن ساده‌ای که باید نمایش داده شود.</p>"
-"<p>نمایش جزء زنگام باعث می‌شود که پیام بهتر به نظر برسد، اما در همین زمان خطر "
-"حفره‌های امنیتی که استثمار می‌شوند افزایش می‌یابند.</p>"
-"<p>نمایش جزء متن ساده، مقدار زیادی از قالب پیام را از دست می‌دهد، اما استثمار "
-"حفره‌های امنیتی را در پرداخت‌کنندۀ زنگام (Konqueror) تقریباً<em>غیر ممکن</em>"
-"می‌کند.</p>"
-"<p>گزینۀ زیر در برابر بد رفتاری مشترک پیامهای زنگام محافظت می‌کند، اما "
-"نمی‌تواند در برابر برآمدهای امنیتی که زمانی که این نسخه نوشته شد، شناخته نشدند؛ "
-"محافظت کند.</p>"
-"<p>بنابراین، توصیه می‌شود که زنگام را به متن ساده<em>ترجیح ندهید</em>.</p>"
-"<p><b>توجه:</b>می‌توانید این گزینه را بر اساس یک پیش‌پوشه از گزینگان<i>پوشۀ</i> "
-"پنجرۀ اصلی KMail تنظیم کنید.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>گاهی اوقات پیامها در هر دو قالب می‌آیند. این گزینه این را کنترل می‌کند، "
+"که آیا جزء زنگام را می‌خواهید یا جزء متن ساده‌ای که باید نمایش داده شود.</"
+"p><p>نمایش جزء زنگام باعث می‌شود که پیام بهتر به نظر برسد، اما در همین زمان "
+"خطر حفره‌های امنیتی که استثمار می‌شوند افزایش می‌یابند.</p><p>نمایش جزء متن "
+"ساده، مقدار زیادی از قالب پیام را از دست می‌دهد، اما استثمار حفره‌های امنیتی "
+"را در پرداخت‌کنندۀ زنگام (Konqueror) تقریباً<em>غیر ممکن</em>می‌کند.</"
+"p><p>گزینۀ زیر در برابر بد رفتاری مشترک پیامهای زنگام محافظت می‌کند، اما "
+"نمی‌تواند در برابر برآمدهای امنیتی که زمانی که این نسخه نوشته شد، شناخته "
+"نشدند؛ محافظت کند.</p><p>بنابراین، توصیه می‌شود که زنگام را به متن "
+"ساده<em>ترجیح ندهید</em>.</p><p><b>توجه:</b>می‌توانید این گزینه را بر اساس یک "
+"پیش‌پوشه از گزینگان<i>پوشۀ</i> پنجرۀ اصلی KMail تنظیم کنید.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>برخی آگهیهای نامه در زنگام هستند و برای مثال، حاوی مرجعهایی به تصاویری هستند "
-"که آگهی‌‌دهنده‌ها برای فهمیدن این که آنها پیامهایشان را خوانده‌اند به کار "
-"می‌گیرند («اشکالهای وب»).</p>"
-"<p>دلیل معتبری برای بارگذاری تصاویر از اینترنت نظیر این نیست، چون فرستنده همیشه "
-"می‌تواند تصاویر مورد نیاز را مستقیماً در پیام پیوست کند.</p>"
-"<p>برای محافظت از چنین رفتار ویژگی نمایش زنگام KMail، این گزینه با پیش‌فرض <em>"
-"غیرفعال می‌شود</em>.</p>"
-"<p>با این وجود، برای مثال، اگر می‌خواهید تصاویر را در پیامهای زنگام که به آن "
-"پیوست نشدند، مشاهده کنید؛ می‌توانید این گزینه را فعال کنید، اما باید از مسئلۀ "
-"احتمالی آگاه باشید.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>برخی آگهیهای نامه در زنگام هستند و برای مثال، حاوی مرجعهایی به "
+"تصاویری هستند که آگهی‌‌دهنده‌ها برای فهمیدن این که آنها پیامهایشان را خوانده‌اند "
+"به کار می‌گیرند («اشکالهای وب»).</p><p>دلیل معتبری برای بارگذاری تصاویر از "
+"اینترنت نظیر این نیست، چون فرستنده همیشه می‌تواند تصاویر مورد نیاز را مستقیماً "
+"در پیام پیوست کند.</p><p>برای محافظت از چنین رفتار ویژگی نمایش زنگام KMail، "
+"این گزینه با پیش‌فرض <em>غیرفعال می‌شود</em>.</p><p>با این وجود، برای مثال، "
+"اگر می‌خواهید تصاویر را در پیامهای زنگام که به آن پیوست نشدند، مشاهده کنید؛ "
+"می‌توانید این گزینه را فعال کنید، اما باید از مسئلۀ احتمالی آگاه باشید.</p></"
+"qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>سیاست اخطار ترتیب پیام</h3>"
-"<p>MDNs، تعمیم آنچه معمولاً <b>رسید قرمز</b> نامیده می‌شود، می‌باشند. نویسندۀ "
-"پیام درخواست می‌کند که اخطار ترتیبی ارسال شود و گیرندۀ برنامۀ نامه پاسخی ایجاد "
-"کند که نویسنده از طریق آن بتواند آنچه در مورد پیامش رخ می‌دهد را بفهمد. انواع "
-"متداول ترتیب شامل موارد زیر می‌باشند<b>نمایش داده‌شده</b> (یعنی خوانده‌شده)، <b>"
-"حذف‌شده</b> و <b>ارسال‌شده</b> (برای مثال، پیش‌سو‌شده).</p>"
-"<p>گزینه‌های زیر برای کنترل ارسال MDNs KMail موجود می‌باشند:</p>"
-"<ul>"
-"<li><em>چشم‌پوشی کردن</em>: از هر درخواستی برای اخطارهای ترتیب چشم‌پوشی می‌کند. "
-"هیچ MDN به طور خودکار ارسال نمی‌شود )توصیه می‌شود(.</li>"
-"<li><em>پرسیدن</em>: به درخواستها فقط بعد از این که از کاربر در مورد مجوز "
-"می‌پرسد، پاسخ می‌دهد. با این روش، می‌توانید MDNs را هنگام رد کردن یا نادیده "
-"گرفتن آنها برای دیگران، جهت پیامهای برگزیده ارسال کنید.</li>"
-"<li><em>رد کردن</em>: همیشه اخطاری<b>رد‌شده</b> را ارسال می‌کند. این کار فقط<em>"
-"تا اندازه‌ای</em> بهتر از این است که همیشه MDNs را ارسال کرد. نویسنده هنوز "
-"می‌داند که پیامها مؤثر واقع شده‌اند، فقط نمی‌تواند بگوید که آیا آن حذف شد یا "
-"خوانده شد و غیره.</li>"
-"<li><em>همیشه ارسال کردن</em>: همیشه اخطار ترتیب درخواست‌شده را ارسال می‌کند. "
-"یعنی نویسندۀ پیام می‌داند چه زمانی پیام مؤثر واقع شده و به علاوه، می‌داند چه در "
-"مورد آن رخ داده است )نمایش داده‌شده، حذف‌شده و غیره(. این گزینه شدیداً منع "
-"می‌شود، اما از آن جایی که آن برای مثال، برای مدیریت رابطۀ مشتری منطقی‌تر است، "
-"در دسترس قرار گرفته است.</li></ul></qt>t>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>سیاست اخطار ترتیب پیام</h3><p>MDNs، تعمیم آنچه معمولاً <b>رسید قرمز</"
+"b> نامیده می‌شود، می‌باشند. نویسندۀ پیام درخواست می‌کند که اخطار ترتیبی ارسال "
+"شود و گیرندۀ برنامۀ نامه پاسخی ایجاد کند که نویسنده از طریق آن بتواند آنچه "
+"در مورد پیامش رخ می‌دهد را بفهمد. انواع متداول ترتیب شامل موارد زیر "
+"می‌باشند<b>نمایش داده‌شده</b> (یعنی خوانده‌شده)، <b>حذف‌شده</b> و <b>ارسال‌شده</"
+"b> (برای مثال، پیش‌سو‌شده).</p><p>گزینه‌های زیر برای کنترل ارسال MDNs KMail "
+"موجود می‌باشند:</p><ul><li><em>چشم‌پوشی کردن</em>: از هر درخواستی برای "
+"اخطارهای ترتیب چشم‌پوشی می‌کند. هیچ MDN به طور خودکار ارسال نمی‌شود )توصیه "
+"می‌شود(.</li><li><em>پرسیدن</em>: به درخواستها فقط بعد از این که از کاربر در "
+"مورد مجوز می‌پرسد، پاسخ می‌دهد. با این روش، می‌توانید MDNs را هنگام رد کردن یا "
+"نادیده گرفتن آنها برای دیگران، جهت پیامهای برگزیده ارسال کنید.</"
+"li><li><em>رد کردن</em>: همیشه اخطاری<b>رد‌شده</b> را ارسال می‌کند. این کار "
+"فقط<em>تا اندازه‌ای</em> بهتر از این است که همیشه MDNs را ارسال کرد. نویسنده "
+"هنوز می‌داند که پیامها مؤثر واقع شده‌اند، فقط نمی‌تواند بگوید که آیا آن حذف شد "
+"یا خوانده شد و غیره.</li><li><em>همیشه ارسال کردن</em>: همیشه اخطار ترتیب "
+"درخواست‌شده را ارسال می‌کند. یعنی نویسندۀ پیام می‌داند چه زمانی پیام مؤثر واقع "
+"شده و به علاوه، می‌داند چه در مورد آن رخ داده است )نمایش داده‌شده، حذف‌شده و "
+"غیره(. این گزینه شدیداً منع می‌شود، اما از آن جایی که آن برای مثال، برای "
+"مدیریت رابطۀ مشتری منطقی‌تر است، در دسترس قرار گرفته است.</li></ul></qt>t>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2472,15 +2447,15 @@ msgstr "اجازه دادن به پیامها برای بارگذاری مرجع
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>اخطار:</b> اجازه دادن به زنگام در رایانامه ممکن است خطر این که سیستمتان توسط "
-"اعمال امنیتی کنونی و پیش‌بینی شده به خطر بیفتد را افزایش دهد.<a "
-"href=\"whatsthis:%1\">اطلاعات بیشتر در مورد نامه‌های زنگام...</a> "
-"<a href=\"whatsthis:%2\">اطلاعات بیشتر در مورد مرجعهای خارجی...</a>"
+"<b>اخطار:</b> اجازه دادن به زنگام در رایانامه ممکن است خطر این که سیستمتان "
+"توسط اعمال امنیتی کنونی و پیش‌بینی شده به خطر بیفتد را افزایش دهد.<a href="
+"\"whatsthis:%1\">اطلاعات بیشتر در مورد نامه‌های زنگام...</a> <a href="
+"\"whatsthis:%2\">اطلاعات بیشتر در مورد مرجعهای خارجی...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2561,8 +2536,7 @@ msgstr "تغییر تنظیم سراسری زنگام، تمام مقادیر م
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "این گزینه به dirmngr >= ۰.۹.۰ نیاز دارد"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "بدون پیشکار"
@@ -2591,8 +2565,8 @@ msgstr "&استخراج پیامهای مهم از انقضا‌"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "هنگام سعی برای یافتن پیامهای خوانده‌نشده:"
 
@@ -2616,8 +2590,8 @@ msgstr "حلقه کردن در همۀ پوشه‌ها"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "هنگام وارد کردن یک پوشه:"
 
@@ -2686,28 +2660,23 @@ msgstr "فهرستهای راهنما )قالب »maildir«("
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p> انتخاب می‌کند که کدام قالب نامه‌دان، پیش‌فرض برای پوشه‌های محلی "
-"می‌‌باشد:</p>"
-"<p><b>mbox:</b> پوشه‌های نامۀ KMail، هر کدام توسط یک تک پرونده بازنمایی "
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p> انتخاب می‌کند که کدام قالب نامه‌دان، پیش‌فرض برای پوشه‌های محلی می‌‌باشد:</"
+"p><p><b>mbox:</b> پوشه‌های نامۀ KMail، هر کدام توسط یک تک پرونده بازنمایی "
 "می‌شوند. پیامهای شخصی توسط خطی که با »از« آغاز می‌شود از یکدیگر جدا می‌شوند. "
-"این کار باعث صرفه‌جویی در فضای دیسک می‌شود، اما ممکن است زیاد مقاوم نباشد، برای "
-"مثال، هنگام حرکت دادن پیامها بین پوشه‌ها.</p>"
-"<p><b>maildir:</b> پوشه‌های نامۀ KMail توسط پوشه‌های حقیقی روی دیسک بازنمایی "
-"می‌شوند. پیامهای شخصی، پوشه‌های جداگانه هستند. ممکن است ذره‌ای از فضای دیسک هدر "
-"برود، اما باید مقاوم‌تر باشد، برای مثال، هنگام حرکت دادن پیامها بین پوشه‌ها.</p>"
-"</qt>"
+"این کار باعث صرفه‌جویی در فضای دیسک می‌شود، اما ممکن است زیاد مقاوم نباشد، "
+"برای مثال، هنگام حرکت دادن پیامها بین پوشه‌ها.</p><p><b>maildir:</b> پوشه‌های "
+"نامۀ KMail توسط پوشه‌های حقیقی روی دیسک بازنمایی می‌شوند. پیامهای شخصی، "
+"پوشه‌های جداگانه هستند. ممکن است ذره‌ای از فضای دیسک هدر برود، اما باید "
+"مقاوم‌تر باشد، برای مثال، هنگام حرکت دادن پیامها بین پوشه‌ها.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2741,52 +2710,42 @@ msgstr "گیگابایت"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>هنگام پرش به پیام خوانده‌نشدۀ بعدی، ممکن است پیامهای خوانده‌نشدۀ زیادی زیر "
-"پیام جاری نباشد.</p>"
-"<p><b>حلقه نکردن:</b> جستجو در آخرین پیام موجود در پوشۀ جاری متوقف می‌شود.</p>"
-"<p><b>حلقه کردن در پوشۀ جاری:</b> جستجو در بالای فهرست پیام ادامه می‌یابد، اما "
-"به پوشۀ دیگر نمی‌رود.</p>"
-"<p><b>حلقه کردن در تمام پوشه‌ها:</b> جستجو در بالای فهرست پیام ادامه می‌یابد. "
-"اگر پیام خوانده‌‌نشده‌ای یافت نشود، سپس در پوشۀ بعدی ادامه می‌یابد.</p>"
-"<p>به همان ترتیب، هنگام جستجو برای پیام خوانده‌نشدۀ قبلی، جستجو از پایین فهرست "
-"پیام آغاز می‌شود و بسته به این که کدام گزینه انتخاب شود تا پوشۀ قبلی ادامه "
-"می‌یابد.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>هنگام پرش به پیام خوانده‌نشدۀ بعدی، ممکن است پیامهای خوانده‌نشدۀ زیادی "
+"زیر پیام جاری نباشد.</p><p><b>حلقه نکردن:</b> جستجو در آخرین پیام موجود در "
+"پوشۀ جاری متوقف می‌شود.</p><p><b>حلقه کردن در پوشۀ جاری:</b> جستجو در بالای "
+"فهرست پیام ادامه می‌یابد، اما به پوشۀ دیگر نمی‌رود.</p><p><b>حلقه کردن در تمام "
+"پوشه‌ها:</b> جستجو در بالای فهرست پیام ادامه می‌یابد. اگر پیام خوانده‌‌نشده‌ای "
+"یافت نشود، سپس در پوشۀ بعدی ادامه می‌یابد.</p><p>به همان ترتیب، هنگام جستجو "
+"برای پیام خوانده‌نشدۀ قبلی، جستجو از پایین فهرست پیام آغاز می‌شود و بسته به "
+"این که کدام گزینه انتخاب شود تا پوشۀ قبلی ادامه می‌یابد.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>نمایه‌گذاری کامل متن، امکان جستجوهای بسیار سریع در مورد محتوای پیامهایتان را "
-"میسر می‌کند. هنگامی که فعال شود، محاورۀ جستجو خیلی سریع کار می‌کند. همچنین، "
-"میله ابزار جستجو، پیامها را بر اساس محتوا انتخاب می‌کند.</p>"
-"<p>مقدار معینی از فضای دیسک را اشغال می‌کند )حدود نیمی از فضای دیسک برای "
-"پیامها(.</p>"
-"<p>بعد از فعال کردن، لازم است که نمایه ساخته شود، اما می‌توانید هنگامی که این "
-"عمل اجرا می‌شود به استفاده از KMail ادامه دهید.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>نمایه‌گذاری کامل متن، امکان جستجوهای بسیار سریع در مورد محتوای "
+"پیامهایتان را میسر می‌کند. هنگامی که فعال شود، محاورۀ جستجو خیلی سریع کار "
+"می‌کند. همچنین، میله ابزار جستجو، پیامها را بر اساس محتوا انتخاب می‌کند.</"
+"p><p>مقدار معینی از فضای دیسک را اشغال می‌کند )حدود نیمی از فضای دیسک برای "
+"پیامها(.</p><p>بعد از فعال کردن، لازم است که نمایه ساخته شود، اما می‌توانید "
+"هنگامی که این عمل اجرا می‌شود به استفاده از KMail ادامه دهید.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2851,8 +2810,8 @@ msgstr "&مخفی کردن پوشه‌های گروه‌افزار‌"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "هنگامی که این علامت زده می‌شود، پوشه‌های منبع IMAP را در درخت پوشه نمی‌بینید."
 
@@ -2864,8 +2823,8 @@ msgstr "پوشه‌های &منبع، در این حساب می‌باشند:‌
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "هنگامی که این علامت زده می‌شود، پوشه‌های منبع IMAP را در درخت پوشه نمی‌بینید."
 
@@ -2896,8 +2855,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"این گزینه را برای این که Outlook(tm) را مجبور کنید پاسخهایتان به جوابهای دعوت "
-"را بفهمد، فعال کنید"
+"این گزینه را برای این که Outlook(tm) را مجبور کنید پاسخهایتان به جوابهای "
+"دعوت را بفهمد، فعال کنید"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2924,19 +2883,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "نام‌گذاری پیوست همساز Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "ارسال دعوت‌نامه به طور خودکار"
@@ -2951,23 +2909,22 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>دعوت‌نامه‌ها به طور عادی به عنوان پیوستهایی به یک نامه ارسال می‌شوند. در "
 "عوض، این سودهی نامه‌های دعوتی که در متن نامه باید ارسال شوند را تغییر می‌دهد؛ "
-"لازم است که دعوت‌نامه‌ها و پاسخها به میکروسافت آوت‌لوک ارسال شوند. "
-"<br> اما، هنگامی که این کار را انجام می‌دهید، بیشتر متن توصیفی که برنامه‌های "
-"نامه را بتوانند بخوانند را به دست نمی‌آورید؛ بنابراین، برای افرادی که "
-"برنامه‌های رایانامه‌ای دارند و دعوت‌نامه‌ها را درک نمی‌کنند، پیامهای منتج خیلی "
-"عجیب به نظر می‌آیند."
-"<br>افرادی که برنامه‌های رایانامه‌ای دارند و مسلماً دعوت‌نامه‌ها را درک "
+"لازم است که دعوت‌نامه‌ها و پاسخها به میکروسافت آوت‌لوک ارسال شوند. <br> اما، "
+"هنگامی که این کار را انجام می‌دهید، بیشتر متن توصیفی که برنامه‌های نامه را "
+"بتوانند بخوانند را به دست نمی‌آورید؛ بنابراین، برای افرادی که برنامه‌های "
+"رایانامه‌ای دارند و دعوت‌نامه‌ها را درک نمی‌کنند، پیامهای منتج خیلی عجیب به نظر "
+"می‌آیند.<br>افرادی که برنامه‌های رایانامه‌ای دارند و مسلماً دعوت‌نامه‌ها را درک "
 "می‌کنند، هنوز قادر به کار کردن با این هستند.</qt>"
 
 #: configuredialog.cpp:5048
@@ -3072,29 +3029,26 @@ msgstr "پیش‌سو"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>در اینجا می‌توانید قالبهای پیام سفارشی را اضافه، ویرایش و حذف کنید تا هنگامی "
-"که یک پاسخ تألیف می‌کنید یا پیام پیش‌سو می‌کنید استفاده شود. با برگزیدن آن با "
-"استفاده از گزینگان دکمۀ راست موشی یا گزینگان میله ابزار قالب سفارشی ایجاد کنید. "
-"همچنین، برای عملیات سریعتر می‌توانید یک ادغام صفحه کلید به قالب مقید کنید.</p>"
-"<p>قالبهای پیام فرمانهای جانشینی را با تحریر آنها یا برگزیدن آنها از گزینگان <i>"
-"درج فرمان</i> پشتیبانی می‌کنند.</p>"
-"<p>چهار نوع قالب سفارشی وجود دارد: مورد استفاده برای <i>پاسخ</i>، <i>"
-"پاسخ به همه</i>، <i>پیش‌سو</i>، و <i>عمومی</i> که می‌توانند برای کل انواع "
-"عملیاتها استفاده شوند. نمی‌توانید میان‌بر صفحه کلید را به قالبهای <i>عمومی</i> "
-"مقید کنید.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>در اینجا می‌توانید قالبهای پیام سفارشی را اضافه، ویرایش و حذف کنید تا "
+"هنگامی که یک پاسخ تألیف می‌کنید یا پیام پیش‌سو می‌کنید استفاده شود. با برگزیدن "
+"آن با استفاده از گزینگان دکمۀ راست موشی یا گزینگان میله ابزار قالب سفارشی "
+"ایجاد کنید. همچنین، برای عملیات سریعتر می‌توانید یک ادغام صفحه کلید به قالب "
+"مقید کنید.</p><p>قالبهای پیام فرمانهای جانشینی را با تحریر آنها یا برگزیدن "
+"آنها از گزینگان <i>درج فرمان</i> پشتیبانی می‌کنند.</p><p>چهار نوع قالب سفارشی "
+"وجود دارد: مورد استفاده برای <i>پاسخ</i>، <i>پاسخ به همه</i>، <i>پیش‌سو</i>، "
+"و <i>عمومی</i> که می‌توانند برای کل انواع عملیاتها استفاده شوند. نمی‌توانید "
+"میان‌بر صفحه کلید را به قالبهای <i>عمومی</i> مقید کنید.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3111,15 +3065,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3145,8 +3099,7 @@ msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
-"میان‌بر برگزیده در حال حاضر استفاده می‌شود، هنوز می‌خواهید با انتساب ادامه "
-"دهید؟"
+"میان‌بر برگزیده در حال حاضر استفاده می‌شود، هنوز می‌خواهید با انتساب ادامه دهید؟"
 
 #: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
@@ -3169,8 +3122,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"گیرنده‌ای در فهرستتان وجود ندارد. ابتدا تعدادی گیرنده برگزینید، سپس دوباره سعی "
-"کنید."
+"گیرنده‌ای در فهرستتان وجود ندارد. ابتدا تعدادی گیرنده برگزینید، سپس دوباره "
+"سعی کنید."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3195,8 +3148,8 @@ msgstr "ویرایش هویت"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3446,6 +3399,11 @@ msgstr "برگزیدن پوشه"
 msgid "Filters"
 msgstr "پالایۀ %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "برگزیدن کل متن"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3477,8 +3435,8 @@ msgstr "&ثبت فعالیتهای پالایه‌"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "در اینجا می‌توانید ثبت فعالیتهای پالایه را فعال یا غیرفعال کنید. البته، "
 "داده‌های ثبت لغو می‌شود و فقط هنگامی که ثبت فعال است، نمایش داده می‌شود."
@@ -3497,10 +3455,11 @@ msgstr "ثبت ارزیابی &قاعدۀ پالایه‌"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "می‌توانید بازخورد در ثبت را در رابطه با ارزیابی قواعد پالایش پالایه‌های "
 "اِعمال‌شده کنترل کنید: علامت زدن این گزینه، بازخورد مفصلی برای هر قاعدۀ تک "
@@ -3525,10 +3484,10 @@ msgstr "نامحدود"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "جمع‌آوری داده‌های ثبت، از حافظه برای ذخیرۀ موقت داده‌های ثبت استفاده می‌کند؛ در "
 "اینجا می‌توانید مقدار بیشینۀ حافظه‌ای که باید استفاده شود را محدود کنید: اگر "
@@ -3543,7 +3502,7 @@ msgstr ""
 "پروندۀ  %1 را نمی‌توان نوشت:\n"
 "»%2« توصیف مفصل خطا است."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "خطای KMail"
@@ -3584,9 +3543,9 @@ msgstr "شناسۀ &کاربر:‌"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "شناسۀ کاربر، ورود کاربر در کارساز IMAP است. این شناسه می‌تواند نام سادۀ کاربر "
 "یا نشانی کامل رایانامۀ کاربر باشد؛ ورود برای حساب خودتان در کارساز به شما "
@@ -3641,8 +3600,8 @@ msgstr "مجوز خواندن/نوشتن در پوشۀ زباله‌تان را
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "اطلاعات هنوز از کارساز بازیابی‌ نشده است، لطفاً، از »بررسی نامه« استفاده کنید."
 
@@ -3654,8 +3613,7 @@ msgstr "خطا: حساب IMAP برای این پوشه تعریف نشده اس�
 msgid "Connecting to server %1, please wait..."
 msgstr "در حال اتصال به کارساز %1، لطفاً، منتظر بمانید..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "خطای اتصال به کارساز %1"
@@ -3683,8 +3641,8 @@ msgstr "افزودن مجوزها"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "واقعاً می‌خواهید مجوزهای خودتان را برای این پوشه حذف کنید؟ بعد از آن قادر به "
 "دستیابی به آن نیستید."
@@ -3718,7 +3676,7 @@ msgstr "کاربرد:"
 msgid "Select Folder"
 msgstr "برگزیدن پوشه"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "پوشه‌های محلی"
@@ -3742,13 +3700,13 @@ msgstr "برگزیدن میان‌بر برای پوشه"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>برای انتخاب یک کلید یا ترکیبی از کلیدهایی که پوشۀ جاری را انتخاب می‌کنند، "
-"دکمۀ زیر را فشار دهید و سپس، کلید)هایی( که می‌خواهید به این پوشه مربوط شوند را "
-"فشار دهید.</qt>"
+"دکمۀ زیر را فشار دهید و سپس، کلید)هایی( که می‌خواهید به این پوشه مربوط شوند "
+"را فشار دهید.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3769,13 +3727,22 @@ msgstr "&لغو‌"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>پوشه‌ای که حذف کردید به حساب <b>%1</b> مربوط بود که نامه به آن انتقال داده "
-"شد. پوشۀ حسابی که نامۀ جدید به آن انتقال می‌یابد در پوشۀ اصلی دریافتی بازنشانی "
-"شد.</qt>"
+"<qt>پوشه‌ای که حذف کردید به حساب <b>%1</b> مربوط بود که نامه به آن انتقال "
+"داده شد. پوشۀ حسابی که نامۀ جدید به آن انتقال می‌یابد در پوشۀ اصلی دریافتی "
+"بازنشانی شد.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3901,39 +3868,13 @@ msgstr "وضعیت هرزنامه:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr ""
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr ""
 
 #: identitydialog.cpp:93
@@ -3946,19 +3887,14 @@ msgstr "نام &شما:‌"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>نامتان</h3>"
-"<p>از آن جایی که می‌خواهید نامتان در سرآیند رایانامه‌ای که ارسال می‌شود، ظاهر "
-"شود؛ این حوزه باید حاوی نامتان باشد؛</p>"
-"<p>اگر جای نامتان را سفید بگذارید، نام حقیقیتان ظاهر نمی‌شود؛ فقط نشانی "
-"رایانامه ظاهر می‌شود.</p></qt>"
+"<qt><h3>نامتان</h3><p>از آن جایی که می‌خواهید نامتان در سرآیند رایانامه‌ای که "
+"ارسال می‌شود، ظاهر شود؛ این حوزه باید حاوی نامتان باشد؛</p><p>اگر جای نامتان "
+"را سفید بگذارید، نام حقیقیتان ظاهر نمی‌شود؛ فقط نشانی رایانامه ظاهر می‌شود.</"
+"p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3966,17 +3902,13 @@ msgstr "&سازمان:‌"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>سازمان</h3>"
-"<p>اگر می‌خواهید نام سازمانتان در سرآیند رایانامه‌ای که ارسال می‌شود، نمایش "
-"داده شود، این حوزه باید نام سازمانتان را داشته باشد.</p>"
-"<p>سفید گذاشتن این، ایمن )و عادی( است.</p></qt>"
+"<qt><h3>سازمان</h3><p>اگر می‌خواهید نام سازمانتان در سرآیند رایانامه‌ای که "
+"ارسال می‌شود، نمایش داده شود، این حوزه باید نام سازمانتان را داشته باشد.</"
+"p><p>سفید گذاشتن این، ایمن )و عادی( است.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3985,20 +3917,15 @@ msgstr "نشانی &رایانامه:‌"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>نشانی رایانامه</h3>"
-"<p>این حوزه باید نشانی کامل رایانامه‌تان را داشته باشد.</p>"
-"<p>اگر این را سفید بگذارید، یا آن را اشتباه بنویسید، افراد در پاسخ دادن به شما "
-"دچار مشکل می‌شوند.</p></qt>"
+"<qt><h3>نشانی رایانامه</h3><p>این حوزه باید نشانی کامل رایانامه‌تان را داشته "
+"باشد.</p><p>اگر این را سفید بگذارید، یا آن را اشتباه بنویسید، افراد در پاسخ "
+"دادن به شما دچار مشکل می‌شوند.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4007,21 +3934,12 @@ msgstr "نشانی &رایانامه:‌"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4044,20 +3962,18 @@ msgstr "گزینش کلید OpenPGP که باید برای  امضای رقمی
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>کلید OpenPGP که در اینجا انتخاب می‌کنید، برای امضای رقمی پیامهایتان استفاده "
-"می‌شود. همچنین می‌توانید از کلیدهای GnuPG استفاده کنید.</p>"
-"<p>می‌توانید این را خالی بگذارید، اما KMail با استفاده از OpenPGP قادر به امضای "
-"رقمی رایانامه‌ها نمی‌باشد؛ کارهای عادی نامه تحت تأثیر واقع نمی‌شود.</p>"
-"<p> اطلاعات بیشتر در مورد کلیدها را می‌توانید در <a>http://www.gnupg.org</a> "
-"بیابید</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>کلید OpenPGP که در اینجا انتخاب می‌کنید، برای امضای رقمی پیامهایتان "
+"استفاده می‌شود. همچنین می‌توانید از کلیدهای GnuPG استفاده کنید.</p><p>می‌توانید "
+"این را خالی بگذارید، اما KMail با استفاده از OpenPGP قادر به امضای رقمی "
+"رایانامه‌ها نمی‌باشد؛ کارهای عادی نامه تحت تأثیر واقع نمی‌شود.</p><p> اطلاعات "
+"بیشتر در مورد کلیدها را می‌توانید در <a>http://www.gnupg.org</a> بیابید</p></"
+"qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4069,32 +3985,27 @@ msgstr "کلید رمزبندی OpenPGP شما"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "گزینش کلید OpenPGP که هنگام رمز‌بندی برای خودتان و برای ویژگی »پیوستن به کلید "
 "عمومی من« در مؤلف باید استفاده شود."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>کلید OpenPGP که در اینجا انتخاب می‌کنید، برای رمز‌بندی پیامها برای خودتان و "
-"برای ویژگی »پیوستن کلید عمومی من« در مؤلف استفاده می‌شود. همچنین می‌توانید از "
-"کلیدهای GnuPG استفاده کنید.</p>"
-"<p>می‌توانید این را خالی بگذارید، اما، KMail قادر به رمز‌بندی رونوشتهای پیامهای "
-"خروجی که از OpenPGP استفاده می‌کنید، نمی‌باشد؛ کارهای عادی نامه تحت تأثیر واقع "
-"نمی‌شوند.</p>"
-"<p>مطالب بیشتر در مورد کلیدها را می‌توانید در <a>http://www.gnupg.org</a> "
-"بیابید</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>کلید OpenPGP که در اینجا انتخاب می‌کنید، برای رمز‌بندی پیامها برای "
+"خودتان و برای ویژگی »پیوستن کلید عمومی من« در مؤلف استفاده می‌شود. همچنین "
+"می‌توانید از کلیدهای GnuPG استفاده کنید.</p><p>می‌توانید این را خالی بگذارید، "
+"اما، KMail قادر به رمز‌بندی رونوشتهای پیامهای خروجی که از OpenPGP استفاده "
+"می‌کنید، نمی‌باشد؛ کارهای عادی نامه تحت تأثیر واقع نمی‌شوند.</p><p>مطالب بیشتر "
+"در مورد کلیدها را می‌توانید در <a>http://www.gnupg.org</a> بیابید</qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4113,17 +4024,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> گواهی‌نامۀ S/مایم (X.509) که در اینجا انتخاب می‌کنید، برای رقمی امضا کردن "
-"پیامهایتان استفاده می‌شود.</p>"
-"<p>می‌توانید این را خالی بگذارید، اما، KMail قادر به رقمی نوشتن رایانامه‌ها با "
-"استفاده از S/مایم نمی‌باشد؛ کارهای عادی نامه تحت تأثیر واقع نمی‌شود.</p></qt>"
+"<qt><p> گواهی‌نامۀ S/مایم (X.509) که در اینجا انتخاب می‌کنید، برای رقمی امضا "
+"کردن پیامهایتان استفاده می‌شود.</p><p>می‌توانید این را خالی بگذارید، اما، "
+"KMail قادر به رقمی نوشتن رایانامه‌ها با استفاده از S/مایم نمی‌باشد؛ کارهای "
+"عادی نامه تحت تأثیر واقع نمی‌شود.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4135,27 +4044,25 @@ msgstr "گواهی‌نامۀ رمزبندی S/مایم شما"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "برگزیدن گواهی‌نامۀ S/مایم که هنگام رمز‌بندی برای خودتان و برای ویژگی »پیوستن "
 "گواهی‌نامۀ من« در مؤلف باید استفاده شود."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> گواهینا­مۀ S/مایم که در اینجا انتخاب می‌کنید، برای رمز‌بندی پیامها برای "
-"خودتان و برای ویژگی »پیوستن گواهی‌نامۀ من« در مؤلف باید استفاده شود.</p>"
-"<p> می‌توانید این را خالی بگذارید، اما، KMail قادر به رمز‌بندی رونوشتهای "
-"پیامهای خروجی برای این که از S/مایم استفاده می‌کنید، نمی‌باشد؛کارهای عادی نامه "
-"تحت تأثیر واقع نمی‌شود.</p></qt>"
+"<qt><p> گواهینا­مۀ S/مایم که در اینجا انتخاب می‌کنید، برای رمز‌بندی پیامها برای "
+"خودتان و برای ویژگی »پیوستن گواهی‌نامۀ من« در مؤلف باید استفاده شود.</p><p> "
+"می‌توانید این را خالی بگذارید، اما، KMail قادر به رمز‌بندی رونوشتهای پیامهای "
+"خروجی برای این که از S/مایم استفاده می‌کنید، نمی‌باشد؛کارهای عادی نامه تحت "
+"تأثیر واقع نمی‌شود.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4175,24 +4082,20 @@ msgstr "&پاسخ به نشانی:‌"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>پاسخ به نشانیها</h3>"
-"<p>این <tt>پاسخ به:</tt> سرآیندی که حاوی یک نشانی رایانامه‌ای متفاوت نسبت به "
-"نشانی عادی <tt>از:</tt> است، را تنظیم می‌کند.</p>"
-"<p>هنگامی که گروهی از افرادی که در نقشهای یکسان با هم کار می‌کنند را داشته "
-"باشید، این می‌تواند مفید باشد. برای مثال، ممکن است بخواهید هر رایانامه‌ای که "
-"ارسال می‌شود، رایانامه‌تان را در حوزۀ <tt>از:</tt> داشته باشد، اما هر کدام برای "
-"رفتن به نشانی یک گروه پاسخ می‌دهد.</p>"
-"<p>اگر شک دارید، این حوزه را خالی بگذارید.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>پاسخ به نشانیها</h3><p>این <tt>پاسخ به:</tt> سرآیندی که حاوی یک "
+"نشانی رایانامه‌ای متفاوت نسبت به نشانی عادی <tt>از:</tt> است، را تنظیم می‌کند."
+"</p><p>هنگامی که گروهی از افرادی که در نقشهای یکسان با هم کار می‌کنند را "
+"داشته باشید، این می‌تواند مفید باشد. برای مثال، ممکن است بخواهید هر "
+"رایانامه‌ای که ارسال می‌شود، رایانامه‌تان را در حوزۀ <tt>از:</tt> داشته باشد، "
+"اما هر کدام برای رفتن به نشانی یک گروه پاسخ می‌دهد.</p><p>اگر شک دارید، این "
+"حوزه را خالی بگذارید.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4200,25 +4103,19 @@ msgstr "نشانیهای &ر.ن.م:‌"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>نشانی ر.ن.م )رونوشت محرمانه(</h3>"
-"<p>نشانیهایی که در اینجا وارد می‌کنید، به هر نامۀ خروجی که با این هویت ارسال "
-"شود، اضافه می‌شود. آن نشانیها برای گیرنده‌های دیگر مرئی نیستند.</p>"
-"<p>این معمولاً برای ارسال رونوشتی از هر پیام ارسال‌شده به حسابهای دیگرتان "
-"استفاده می‌شود.</p>"
-"<p>برای مشخص کردن بیش از یک نشانی، از کاما برای جدا کردن فهرست گیرنده‌های ر.ن.م "
-"استفاده کنید.</p>"
-"<p>اگر شک دارید، این حوزه را خالی بگذارید.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>نشانی ر.ن.م )رونوشت محرمانه(</h3><p>نشانیهایی که در اینجا وارد "
+"می‌کنید، به هر نامۀ خروجی که با این هویت ارسال شود، اضافه می‌شود. آن نشانیها "
+"برای گیرنده‌های دیگر مرئی نیستند.</p><p>این معمولاً برای ارسال رونوشتی از هر "
+"پیام ارسال‌شده به حسابهای دیگرتان استفاده می‌شود.</p><p>برای مشخص کردن بیش از "
+"یک نشانی، از کاما برای جدا کردن فهرست گیرنده‌های ر.ن.م استفاده کنید.</"
+"p><p>اگر شک دارید، این حوزه را خالی بگذارید.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4256,7 +4153,7 @@ msgstr "&امضا‌"
 msgid "&Picture"
 msgstr "&عکس‌"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "نشانی رایانامه‌ای نامعتبر"
 
@@ -4272,15 +4169,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"یکی از کلیدهای پیکربندی‌شدۀ امضای OpenPGP، حاوی شناسۀ کاربری با نشانی رایانامۀ "
-"پیکربندی‌شده برای این هویت )%1( نیست.\n"
+"یکی از کلیدهای پیکربندی‌شدۀ امضای OpenPGP، حاوی شناسۀ کاربری با نشانی "
+"رایانامۀ پیکربندی‌شده برای این هویت )%1( نیست.\n"
 "هنگامی که سعی می‌کنید امضاهایی که با این پیکربندی ساخته‌شده‌اند را تغییر دهید، "
 "ممکن است منجر به پیامهای خطا در سمت دریافت بشود."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "یکی از کلیدهای پیکربندی‌شدۀ رمز‌بندی OpenPGP، حاوی شناسۀ کاربر دارای نشانی "
 "رایانامۀ پیکربندی‌شده برای این هویت )%1( نیست."
@@ -4343,8 +4240,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 )پیش‌فرض("
 
@@ -4392,15 +4289,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"پیکربندی به طور خودکار تغییر مکان داد، اما باید پیکربندی حسابتان را بررسی کنید."
+"پیکربندی به طور خودکار تغییر مکان داد، اما باید پیکربندی حسابتان را بررسی "
+"کنید."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "حرکت دادن خودکار پیکربندیتان امکان‌پذیر نبود، پس لطفاً، پیکربندی حسابتان را "
 "بررسی کنید."
@@ -4441,14 +4339,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "خطا: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "ارتباط با کارساز %1به طور غیرقابل پیش‌بینی بسته شد یا وقتش تمام شد.در صورت "
 "امکان، به طور خودکار مجدداً برقرار می‌شود."
@@ -4598,14 +4501,14 @@ msgstr "فهرست بایگانیها"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4634,184 +4537,152 @@ msgstr "کلیدهای غیرقابل استفادۀ رمز‌بندی"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>کلید امضای OpenPGP شما</p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>کلید امضای OpenPGP شما</p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p> کلید رمز‌بندی OpenPGP شما</p><p align=center><b>%1</b> "
-"(شناسۀ کلید %2 0x)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p> کلید رمز‌بندی OpenPGP شما</p><p align=center><b>%1</b> (شناسۀ کلید %2 "
+"0x)</p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p> کلید OpenPGP برای </p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</p>"
-"<p>در کمتر از  %n روز خاتمه می‌یابد.</p>"
+"<p> کلید OpenPGP برای </p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</"
+"p><p>در کمتر از  %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b>"
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم امضایتان</p><p align=center><b>%1</b>(عدد متوالی %2)</p><p>در کمتر از "
+"%n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم رمز‌بندیتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر "
+"از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر از %n روز "
+"خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ واسطۀ CA </p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ واسطۀ CA </p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم امضایتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر از "
+"%n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم رمز‌بندیتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر "
+"از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ "
+"مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر از %n روز "
+"خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b> (عدد متوالی %2)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> (عدد متوالی %2)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ S/مایم برای</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ S/مایم برای</p><p align=center><b>%1</b> (عدد متوالی %2)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4825,173 +4696,141 @@ msgstr "گواهی‌نامۀ S/مایم به زودی خاتمه می‌یاب�
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>کلید امضای OpenPGP شما</p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>کلید امضای OpenPGP شما</p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p> کلید رمز‌بندی OpenPGP شما</p><p align=center><b>%1</b> "
-"(شناسۀ کلید %2 0x)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p> کلید رمز‌بندی OpenPGP شما</p><p align=center><b>%1</b> (شناسۀ کلید %2 "
+"0x)</p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p> کلید OpenPGP برای </p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</p>"
-"<p>در کمتر از  %n روز خاتمه می‌یابد.</p>"
+"<p> کلید OpenPGP برای </p><p align=center><b>%1</b> (شناسۀ کلید %2 0x)</"
+"p><p>در کمتر از  %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b>"
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم امضایتان</p><p align=center><b>%1</b>(عدد متوالی %2)</p><p>در کمتر از "
+"%n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم رمز‌بندیتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر "
+"از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ کاربر ارشد</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر از %n روز "
+"خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>گواهی‌نامۀ واسطۀ CA </p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>گواهی‌نامۀ واسطۀ CA </p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم امضایتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر از "
+"%n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ S/"
+"مایم رمز‌بندیتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر "
+"از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p>"
-"<p>برای گواهی‌نامۀ مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ واسطۀ CA</p><p align=center><b>%3</b></p><p>برای گواهی‌نامۀ "
+"مایم</p><p align=center><b>%1</b> (عدد متوالی %2)</p><p>در کمتر از %n روز "
+"خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ S/مایم امضایتان</p><p align=center><b>%1</b> (عدد متوالی %2)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> "
-"(عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ S/مایم رمز‌بندیتان</p><p align=center><b>%1</b> (عدد متوالی %2)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>گواهی‌نامۀ S/مایم برای</p><p align=center><b>%1</b> (عدد متوالی %2)</p>"
-"<p>در کمتر از %n روز خاتمه می‌یابد.</p>"
+"<p>گواهی‌نامۀ S/مایم برای</p><p align=center><b>%1</b> (عدد متوالی %2)</"
+"p><p>در کمتر از %n روز خاتمه می‌یابد.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5003,17 +4842,18 @@ msgstr "گواهی‌نامۀ S/مایم به زودی خاتمه می‌یاب�
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"یک یا چند کلید از کلیدهای پیکربندی‌شدۀ رمز‌بندی OpenPGP یا گواهی‌نامه‌های "
-"S/مایم برای رمز‌بندی قابل استفاده نمی‌باشد. لطفاً، کلیدها و گواهی‌نامه‌های "
-"رمز‌بندیتان را برای این هویت در محاورۀ پیکربندی هویت مجدداً پیکربندی کنید.\n"
-"اگر ادامه دادن را انتخاب می‌کنید، و لازم است که کلیدها بعداً فعال باشند، به شما "
-"اعلان می‌شود که کلیدهای مورد استفاده را مشخص کنید."
+"یک یا چند کلید از کلیدهای پیکربندی‌شدۀ رمز‌بندی OpenPGP یا گواهی‌نامه‌های S/مایم "
+"برای رمز‌بندی قابل استفاده نمی‌باشد. لطفاً، کلیدها و گواهی‌نامه‌های رمز‌بندیتان را "
+"برای این هویت در محاورۀ پیکربندی هویت مجدداً پیکربندی کنید.\n"
+"اگر ادامه دادن را انتخاب می‌کنید، و لازم است که کلیدها بعداً فعال باشند، به "
+"شما اعلان می‌شود که کلیدهای مورد استفاده را مشخص کنید."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5027,12 +4867,11 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"یک یا چند کلید از کلیدهای پیکربندی‌شدۀ OpenPGP امضایتان یا گواهی‌نامه‌های "
-"S/مایم امضا برای امضا کردن قابل استفاده نمی‌باشد. لطفاً، کلیدها و "
-"گواهی‌نامه‌های امضا برای این هویت در محاورۀ پیکربندی هویت را مجدداً پیکربندی "
-"کنید.\n"
-"اگر ادامه را انتخاب می‌کنید، و لازم است که کلیدها بعداً فعال شوند، به شما اعلان "
-"می‌شود که کلیدهای مورد استفاده را مشخص کنید."
+"یک یا چند کلید از کلیدهای پیکربندی‌شدۀ OpenPGP امضایتان یا گواهی‌نامه‌های S/"
+"مایم امضا برای امضا کردن قابل استفاده نمی‌باشد. لطفاً، کلیدها و گواهی‌نامه‌های "
+"امضا برای این هویت در محاورۀ پیکربندی هویت را مجدداً پیکربندی کنید.\n"
+"اگر ادامه را انتخاب می‌کنید، و لازم است که کلیدها بعداً فعال شوند، به شما "
+"اعلان می‌شود که کلیدهای مورد استفاده را مشخص کنید."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5042,26 +4881,26 @@ msgstr "کلیدهای غیرقابل استفادۀ امضا"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "آزمایش تنظیمات رمز‌بندی گیرنده این نتیجه را داد که حداقل در مورد برخی "
 "گیرنده‌ها، پیام باید با استفاده از OpenPGP رمز‌بندی شود؛\n"
 "با این وجود، کلیدهای رمز‌بندی OpenPGP معتبری  را برای این هویت پیکربندی "
 "نکرده‌اید.\n"
-"ممکن است بدون رمز‌بندی برای خودتان ادامه دهید، اما آگاه باشید که اگر این کار را "
-"بکنید، قادر به خواندن پیامهای خود نیستید."
+"ممکن است بدون رمز‌بندی برای خودتان ادامه دهید، اما آگاه باشید که اگر این کار "
+"را بکنید، قادر به خواندن پیامهای خود نیستید."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "آزمایش تنظیمات رمز‌بندی گیرنده این نتیجه را داد که حداقل در مورد برخی "
 "گیرنده‌ها، پیام باید با استفاده از S/مایم رمز‌بندی شود؛\n"
@@ -5072,8 +4911,8 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5088,8 +4927,8 @@ msgstr "OpenPGP امضا نشود"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5118,11 +4957,11 @@ msgstr "امضا کردن امکان‌پذیر نیست"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"یک کلید رمزبندی برای خودتان انتخاب نکردید )رمزبندی برای خود(. اگر پیام خودتان "
-"را رمزبندی کنید، قادر به سرگشایی آن نمی‌باشید."
+"یک کلید رمزبندی برای خودتان انتخاب نکردید )رمزبندی برای خود(. اگر پیام "
+"خودتان را رمزبندی کنید، قادر به سرگشایی آن نمی‌باشید."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5143,8 +4982,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "یک کلید رمز برای هر کدام از گیرنده‌های این پیام انتخاب نکردید؛ بنابراین، پیام "
 "رمزبندی نمی‌شود."
@@ -5191,11 +5030,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "کلید رمزبندی معتبر و مورد اعتمادی برای »%1« یافت نشد.\n"
 "\n"
@@ -5244,10 +5083,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "خطای بحرانی: قادر به جمع‌آوری نامه نیست:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"خرابی در افزودن پیام:\n"
+msgid "Failed to add message:\n"
+msgstr "خرابی در افزودن پیام:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5333,6 +5170,50 @@ msgstr "IMAP &قطع‌شده‌"
 msgid "&Maildir mailbox"
 msgstr "نامه‌دان &Maildir‌"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "تنظیم موضوع پیام"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "ارسال ر.ن: به »نشانی«"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "ارسال ر.ن.م: به »پیام«"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "افزودن »سرآیند« به پیام"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "خواندن بدنۀ پیام از »پرونده«"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "تنظیم بدنۀ پیام"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "افزودن یک پیوست به نامه. این را می‌توان تکرار کرد"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "فقط بررسی نامۀ جدید"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "فقط باز کردن پنجرۀ مؤلف"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "مشاهدۀ پروندۀ پیام داده‌شده"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "نامه"
@@ -5389,13 +5270,12 @@ msgstr "%1: پوشۀ %2 یافت شد. به عنوان پوشۀ اصلی گرو�
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail، پوشه‌های گروه‌افزار زیر را در %1 پیدا کرد و لازم است که عملیات زیر "
-"را انجام دهد: %2"
-"<br>اگر این را نمی‌خواهید، لغو کنید و منبع IMAP غیرفعال می‌شود"
+"را انجام دهد: %2<br>اگر این را نمی‌خواهید، لغو کنید و منبع IMAP غیرفعال می‌شود"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5442,11 +5322,11 @@ msgstr "نشانی وب رونوشت‌شده در تخته یادداشت."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>پروندۀ <b>%1</b> موجود است.<br>می‌خواهید آن را جایگزین کنید؟</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "ذخیره در پرونده"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&جایگزینی‌"
 
@@ -5464,7 +5344,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "پیام هنگام ذخیره حذف شد. ذخیره نشده است."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5484,11 +5364,11 @@ msgstr "پرونده حاوی پیام نمی‌باشد."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "پرونده حاوی پیامهای چندگانه است. فقط اولین پیام نمایش داده می‌شود."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5497,114 +5377,112 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "حذف پیامها"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "پالایش پیام %1 از %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "فضای آزاد دیسک، کافی نیست؟"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "حرکت به این پوشه"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "رونوشت در این پوشه"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "حرکت دادن پیامها"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "حذف پیامها"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "در حال باز کردن نشانی وب..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>واقعاً می‌خواهید <b>%1</b> را اجرا کنید؟</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "اجرا کردن"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "برای ذخیره، پیوستی یافت نشد."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "ذخیرۀ پیوستها در"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "پیوست۱"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "پیوست%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
-msgstr ""
-"پرونده‌ای با نام %1 در حال حاضر موجود است. می‌خواهید آن را جای‌نوشت کنید؟"
+msgstr "پرونده‌ای با نام %1 در حال حاضر موجود است. می‌خواهید آن را جای‌نوشت کنید؟"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "در حال حاضر پرونده موجود است"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&جای‌نوشت‌"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "جزء %1 پیام رمزبندی می‌شود. می‌خواهید هنگام ذخیره‌سازی، رمزبندی را نگه دارید؟"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "پرسش KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "نگه داشتن رمزبندی"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "نگه داشته نشود"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
-msgstr ""
-"جزء %1 پیام امضا می‌شود. می‌خواهید هنگام ذخیره‌سازی، امضا را نگه دارید؟"
+msgstr "جزء %1 پیام امضا می‌شود. می‌خواهید هنگام ذخیره‌سازی، امضا را نگه دارید؟"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "حفظ امضا"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5613,22 +5491,22 @@ msgstr ""
 "نتوانست پروندۀ %1 را بنویسد:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "نتوانست پروندۀ %1 را بنویسد."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"مدخل کتاب نشانی برای این نشانی رایانامه وجود ندارد. آنها را به کتاب نشانی اضافه "
-"کنید و سپس با استفاده از کارخواه ارجح پیامتان، نشانیهای پیام فوری را اضافه "
-"کنید."
+"مدخل کتاب نشانی برای این نشانی رایانامه وجود ندارد. آنها را به کتاب نشانی "
+"اضافه کنید و سپس با استفاده از کارخواه ارجح پیامتان، نشانیهای پیام فوری را "
+"اضافه کنید."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5638,51 +5516,51 @@ msgstr ""
 "%1\n"
 "تعیین این که چه کسی گپ می‌زند امکان‌پذیر نیست."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "پشتیبان Chiasmus، تابع »x-obtain-keys« را پیشنهاد نمی‌کند. لطفاً، این اشکال را "
 "گزارش دهید."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "خطای پشتیبان Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "مقدار پیش‌بینی نشدۀ بازگشتی از پشتیبان Chiasmus: تابع »x-obtain-keys«، فهرست "
 "رشته را بازنگرداند. لطفاً، این اشکال را گزارش دهید."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"کلیدی یافت نشده است. لطفاً، بررسی کنید که مسیر معتبر کلید در پیکربندی Chiasmus "
-"ارسال شده باشد."
+"کلیدی یافت نشده است. لطفاً، بررسی کنید که مسیر معتبر کلید در پیکربندی "
+"Chiasmus ارسال شده باشد."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "گزینش کلید سرگشایی Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "پشتیبان Chiasmus، تابع »x-decrypt« را پیشنهاد نمی‌کند. لطفاً، این اشکال را "
 "گزارش دهید."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5690,26 +5568,26 @@ msgstr ""
 "تابع »x-decrypt«، پارامترهای پیش‌بینی شده را نمی‌پذیرد. لطفاً، این اشکال را "
 "گزارش دهید."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "خطای سرگشایی Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "مقدار پیش‌بینی نشدۀ بازگشتی از پشتیبان Chiasmus: تابع »x-decrypt«، آرایۀ بایت "
 "را بازنگرداند. لطفاً، این اشکال را گزارش دهید."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "نامه"
@@ -5808,7 +5686,7 @@ msgstr "اندازه"
 msgid "Encoding"
 msgstr "کدبندی"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "فشرده کردن"
 
@@ -5820,7 +5698,7 @@ msgstr "رمز‌بندی"
 msgid "Sign"
 msgstr "امضا کردن"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "نام پیوست:"
 
@@ -5842,7 +5720,8 @@ msgstr "گیرنده‌های اولیه"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>نشانیهای رایانامه‌ای که در این حوزه می‌گذارید، رونوشتی از رایانامه دریافت "
 "می‌کنند.</qt>"
@@ -5854,9 +5733,9 @@ msgstr "گیرنده‌های اضافی"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>نشانیهای رایانامه‌ای که در این حوزه می‌گذارید، رونوشتی از نامه دریافت "
 "می‌کنند. از نظر فنی، این نظیر زمانی است که تمام نشانیها را در حوزۀ <b>به:</b> "
@@ -5869,9 +5748,8 @@ msgstr "گیرنده‌های مخفی"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>در اصل چیزی مشابه نظیر حوزۀ<b>رونوشت به:</b> اما با این تفاوت که تمام "
 "گیرنده‌های دیگر نمی‌بینند چه کسی رونوشت محرمانه را دریافت می‌کند.</qt>"
@@ -5884,7 +5762,7 @@ msgstr "&ارسال نامه‌"
 msgid "&Send Mail Via"
 msgstr "&ارسال نامه از طریق‌"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&بعداً ارسال شود‌"
@@ -5949,8 +5827,7 @@ msgstr "&حذف نویسه‌های نقل قول‌"
 msgid "Cl&ean Spaces"
 msgstr "&پاک کردن فاصله‌ها‌"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "استفاده از قلم &ثابت‌"
@@ -6093,31 +5970,31 @@ msgstr "قالب پیام &نهفته‌"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "استاندارد"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "فهرست گلوله‌ای )دیسک("
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "فهرست گلوله‌ای )دایره("
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "فهرست گلوله‌ای )مربع("
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "فهرست منظم )ده دهی("
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "فهرست منظم )آلفای پایینی("
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "فهرست منظم )آلفای بالایی("
 
@@ -6201,16 +6078,16 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"ذخیرۀ این پیام در پوشۀ پیش‌نویسها. سپس، می‌توان آن را ویرایش کرد و یک زمان دیگر "
-"ارسال کرد."
+"ذخیرۀ این پیام در پوشۀ پیش‌نویسها. سپس، می‌توان آن را ویرایش کرد و یک زمان "
+"دیگر ارسال کرد."
 
 #: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"ذخیرۀ این پیام در پوشۀ پیش‌نویسها. سپس، می‌توان آن را ویرایش کرد و یک زمان دیگر "
-"ارسال کرد."
+"ذخیرۀ این پیام در پوشۀ پیش‌نویسها. سپس، می‌توان آن را ویرایش کرد و یک زمان "
+"دیگر ارسال کرد."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6222,8 +6099,8 @@ msgstr "بستن مؤلف"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "به نظر می‌رسد پیامی که نوشته‌اید به یک پروندۀ پیوست اطلاق می‌شود اما، چیزی "
@@ -6234,49 +6111,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "یادآوری پیوست پرونده"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&ارسال همان‌طور که هست‌"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail، محل پیوست )%1( را نتوانست تشخیص دهد؛</p>"
-"<p>اگر می‌خواهید یک پرونده را پیوست کنید، باید مسیر کامل را مشخص کنید.</p></qt>"
+"<qt><p>KMail، محل پیوست )%1( را نتوانست تشخیص دهد؛</p><p>اگر می‌خواهید یک "
+"پرونده را پیوست کنید، باید مسیر کامل را مشخص کنید.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "پیوستن پرونده"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&پیوستن‌"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "درج پرونده"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "درج پرونده"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>هنگام سعی برای صادرات کلید از پشتیبان، خطایی رخ داد:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>هنگام سعی برای صادرات کلید از پشتیبان، خطایی رخ داد:</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6315,97 +6192,108 @@ msgid ""
 "View"
 msgstr "مشاهده کردن"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "ویرایش..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "ویرایش دست‌نوشته..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "ذخیره &به عنوان...‌"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&ویژگیها‌"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "افزودن پیوست..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail نتوانست پرونده را فشرده کند."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "پروندۀ فشرده بزرگ‌تر از پروندۀ اصلی است. می‌خواهید پروندۀ اصلی را نگه دارید؟"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "نگه داشتن"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail نتوانست پرونده را از حالت فشرده خارج کند."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "ذخیرۀ پیوست به عنوان"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "افزودن به عنوان متن"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "افزودن به عنوان پیوست"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "چسباندن به عنوان &پیوست‌"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "بدون نام"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>درخواست کرده‌اید که پیامها برای خودتان رمزبندی شوند، اما هویتی که در حال "
-"حاضر انتخاب‌شده، کلید رمزبندی(OpenPGP یا S/مایم) مورد استفادۀ این را تعریف "
-"نمی‌کند.</p>"
-"<p>لطفاً، کلید)های( مورد استفاده در پیکربندی هویت را برگزینید.</p></qt>"
+"<qt><p>درخواست کرده‌اید که پیامها برای خودتان رمزبندی شوند، اما هویتی که در "
+"حال حاضر انتخاب‌شده، کلید رمزبندی(OpenPGP یا S/مایم) مورد استفادۀ این را "
+"تعریف نمی‌کند.</p><p>لطفاً، کلید)های( مورد استفاده در پیکربندی هویت را "
+"برگزینید.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "کلید تعریف‌‌‌نشدۀ رمزبندی"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>برای این که قادر به امضا کردن این پیام باشید، ابتدا باید کلید امضای (OpenPGP "
-"یا S/مایم) مورد استفاده را تعریف کنید.</p>"
-"<p>لطفاً، کلید مورد استفاده در پیکربندی هویت را برگزینید.</p></qt>"
+"<qt><p>برای این که قادر به امضا کردن این پیام باشید، ابتدا باید کلید امضای "
+"(OpenPGP یا S/مایم) مورد استفاده را تعریف کنید.</p><p>لطفاً، کلید مورد "
+"استفاده در پیکربندی هویت را برگزینید.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "کلید تعریف‌نشدۀ امضا"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6413,93 +6301,91 @@ msgstr ""
 "در حال حاضر KMail در حالت برون‌خط است، پیامهایتان تا زمانی که بر‌خط شوید در "
 "ارسالی نگه داشته می‌شود."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "بر‌خط/برون‌خط"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "نشانی رایانامه‌تان را باید در حوزۀ از: وارد کنید. همچنین باید نشانی "
-"رایانامه‌تان را برای تمام هویتها تنظیم کنید، به طوری که مجبور نباشید آن را برای "
-"هر پیام وارد کنید."
+"رایانامه‌تان را برای تمام هویتها تنظیم کنید، به طوری که مجبور نباشید آن را "
+"برای هر پیام وارد کنید."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"حداقل باید یک گیرنده را یا در حوزۀ به: یا به عنوان ر.ن یا به عنوان ر.ن.م مشخص "
-"کنید."
+"حداقل باید یک گیرنده را یا در حوزۀ به: یا به عنوان ر.ن یا به عنوان ر.ن.م "
+"مشخص کنید."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "موضوعی را مشخص نکردید. به هر حال پیام را ارسال می‌کنید؟"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "نامی مشخص نشده است"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "موضوعی را مشخص نکردید. به هر حال پیام را ارسال می‌کنید؟"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "موضوعی مشخص نشده است"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&ارسال همان‌طور که هست‌"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&مشخص کردن موضوع‌"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&نگه داشتن علامت‌گذاری، امضا/رمزبندی نشود‌"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&نگه داشتن علامت‌گذاری، رمزبندی نشود‌"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&نگه داشتن علامت‌گذاری، امضا نشود‌"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "امضا/رمزبندی )حذف علامت‌گذاری("
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "رمزبندی )حذف علامت‌گذاری("
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "امضا کردن )حذف علامت‌گذاری("
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>امضا/رمزبندی درون‌برنامه‌ای پیامهای زنگام امکان‌‌پذیر نیست؛</p>"
-"<p>می‌خواهید علامت‌گذاریتان را حذف کنید؟</p></qt>"
+"<qt><p>امضا/رمزبندی درون‌برنامه‌ای پیامهای زنگام امکان‌‌پذیر نیست؛</"
+"p><p>می‌خواهید علامت‌گذاریتان را حذف کنید؟</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "پیام، امضا/رمزبندی شود؟"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6507,73 +6393,74 @@ msgstr ""
 "پوشۀ سفارشی پیش‌نویسها برای هویت »%1« )دیگر( موجود نیست؛ بنابراین، از پوشۀ "
 "پیش‌فرض پیش‌نویسها استفاده می‌شود."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "لطفاً، برای ارسال، حسابی ایجاد کرده و دوباره امتحان کنید."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "در مورد ارسال رایانامه..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "ارسال تأیید"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "هم اکنون &ارسال شود‌"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "گیرنده‌ای وجود ندارد"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "گیرنده‌های اضافی"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "غلط‌یاب: روشن"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "غلط‌یاب: خاموش"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "غلط‌گیری لغو شد."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "غلط‌گیری متوقف می‌شود."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "غلط‌گیری کامل می‌شود."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "غلط‌گیر"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
-"لطفاً، ابتدا پشتیبان رمزی مورد استفاده برای رمزبندی Chiasmus را پیکربندی کنید.\n"
+"لطفاً، ابتدا پشتیبان رمزی مورد استفاده برای رمزبندی Chiasmus را پیکربندی "
+"کنید.\n"
 "این کار را در تب پشتیبانهای رمزی صفحۀ امنیتی محاورۀ پیکربندی می‌توانید انجام "
 "دهید."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6581,34 +6468,34 @@ msgstr ""
 "به نظر می‌‌‌رسد که گویی، libkleopatra بدون پشتیبان Chiasmus ترجمه شد. ممکن است "
 "بخواهید libkleopatra را با --فعال کردن- chiasmus مجدداً ترجمه کنید."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "پشتیبان Chiasmus پیکربندی نشده است"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "کلید Chiasmus یافت نشد"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "گزینش کلید رمزبندی Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "پیام، توسط %1 امضا شد."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "پیام، توسط %1 امضا شد."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "پیام OpenPGP - رمزبندی شده"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "پیام با موضوع:"
@@ -6658,8 +6545,8 @@ msgstr "غلط‌گیری - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell نتوانستند اجرا شوند. لطفاً، مطمئن شوید که ISpell یا Aspell را "
 "درست پیکربندی کرده‌اید و در مسیرتان هستند."
@@ -6695,13 +6582,11 @@ msgstr "<qt>تعداد بسیار زیادی کنشهای پالایه در قا
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>کنش ناشناختۀ پالایۀ <b>%1</b>"
-"<br>در قاعدۀ پالایش <b>%2</b>."
-"<br>با چشم‌‌پوشی از آن.</qt>"
+"<qt>کنش ناشناختۀ پالایۀ <b>%1</b><br>در قاعدۀ پالایش <b>%2</b>.<br>با "
+"چشم‌‌پوشی از آن.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6921,166 +6806,133 @@ msgstr "پخش صدا"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>این فهرست پالایه‌های تعریف‌شده است. از بالا به پایین پردازش می‌شوند.</p>"
-"<p>برای ویرایش آن، با استفاده از کنترلهای موجود در نیمۀ سمت راست محاوره، روی هر "
-"پالایه فشار دهید.</p></qt>"
+"<qt><p>این فهرست پالایه‌های تعریف‌شده است. از بالا به پایین پردازش می‌شوند.</"
+"p><p>برای ویرایش آن، با استفاده از کنترلهای موجود در نیمۀ سمت راست محاوره، "
+"روی هر پالایه فشار دهید.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>برای ایجاد یک پالایۀ جدید، این دکمه را فشار دهید.</p>"
-"<p>پالایه درست قبل از پالایه‌ای که در حال حاضر انتخاب‌شده درج می‌شود، اما همیشه "
-"ممی‌توانی بعداًد آن را تغییر دهید.</p>"
-"<p>اگر اتفاقی این دکمه را فشار داده‌اید، می‌توانید با فشار دکمۀ <em>حذف</em> "
-"این را واگرد کنید.</p></qt>"
+"<qt><p>برای ایجاد یک پالایۀ جدید، این دکمه را فشار دهید.</p><p>پالایه درست "
+"قبل از پالایه‌ای که در حال حاضر انتخاب‌شده درج می‌شود، اما همیشه ممی‌توانی بعداًد "
+"آن را تغییر دهید.</p><p>اگر اتفاقی این دکمه را فشار داده‌اید، می‌توانید با "
+"فشار دکمۀ <em>حذف</em> این را واگرد کنید.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>برای رونوشت یک پالایه، این دکمه را فشار دهید.</p>"
-"<p>اگر این دکمه را اتفاقی فشار داده‌اید، می‌توانید با فشار دکمۀ <em>حذف</em> "
-"این را واگرد کنید.</p></qt>"
+"<qt><p>برای رونوشت یک پالایه، این دکمه را فشار دهید.</p><p>اگر این دکمه را "
+"اتفاقی فشار داده‌اید، می‌توانید با فشار دکمۀ <em>حذف</em> این را واگرد کنید.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>برای <em>حذف</em> پالایه‌ای که در حال حاضر از فهرست بالا انتخاب‌شده، این "
-"دکمه را فشار دهید.</p>"
-"<p>به محض این که پالایه حذف می‌شود هیچ راهی برای برگرداندن آن نیست، اما همیشه "
-"می‌توانید با فشار <em>لغو</em> برای دور انداختن تغییراتی که ایجاد کردید، محاوره "
-"را ترک کنید.</p></qt>"
+"<qt><p>برای <em>حذف</em> پالایه‌ای که در حال حاضر از فهرست بالا انتخاب‌شده، "
+"این دکمه را فشار دهید.</p><p>به محض این که پالایه حذف می‌شود هیچ راهی برای "
+"برگرداندن آن نیست، اما همیشه می‌توانید با فشار <em>لغو</em> برای دور انداختن "
+"تغییراتی که ایجاد کردید، محاوره را ترک کنید.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>این دکمه را فشار دهید تا پالایه‌ای که در حال حاضر برگزیده شده، به  <em>"
-"بالای</em> فهرست بالا حرکت کند.</p>"
-"<p>تا زمانی مفید است که ترتیب پالایه‌ها در فهرست، ترتیبی که بر اساس آن پیامها "
-"را امتحان می‌کنند را تعیین کند: پالایۀ بالاتر، ابتدا امتحان می‌شود.</p></qt>"
+"<qt><p>این دکمه را فشار دهید تا پالایه‌ای که در حال حاضر برگزیده شده، به  "
+"<em>بالای</em> فهرست بالا حرکت کند.</p><p>تا زمانی مفید است که ترتیب "
+"پالایه‌ها در فهرست، ترتیبی که بر اساس آن پیامها را امتحان می‌کنند را تعیین "
+"کند: پالایۀ بالاتر، ابتدا امتحان می‌شود.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>این دکمه را برای حرکت دادن پالایه‌ای که در حال حاضر برگزیده شده، <em>"
-"به بالای</em> یک پالایه در فهرست بالا، فشار دهید.</p>"
-"<p>از آن جایی که ترتیب پالایه‌ها در فهرست، به ترتیبی که طبق آن پیامها آزمایش "
-"می‌شوند، تعیین می‌شود: این کار مفید است. ابتدا بالاترین پالایه آزمایش "
-"می‌شود.</p>"
-"<p>اگر اتفاقی این دکمه را فشار داده‌اید، می‌توانید با فشار دکمۀ <em>پایین</em> "
-"این را واگرد کنید.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>این دکمه را برای حرکت دادن پالایه‌ای که در حال حاضر برگزیده شده، "
+"<em>به بالای</em> یک پالایه در فهرست بالا، فشار دهید.</p><p>از آن جایی که "
+"ترتیب پالایه‌ها در فهرست، به ترتیبی که طبق آن پیامها آزمایش می‌شوند، تعیین "
+"می‌شود: این کار مفید است. ابتدا بالاترین پالایه آزمایش می‌شود.</p><p>اگر "
+"اتفاقی این دکمه را فشار داده‌اید، می‌توانید با فشار دکمۀ <em>پایین</em> این را "
+"واگرد کنید.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>این دکمه را برای حرکت پالایه‌ای که در حال حاضر برگزیده شده، <em>به پایین</em> "
-"یک پالایه در فهرست بالا، فشار دهید.</p>"
-"<p>از آن جایی که ترتیب پالایه‌ها در فهرست، به ترتیبی که طبق آن پیامها آزمایش "
-"می‌شوند، تعیین می‌شود، این کار مفید است: ابتدا بالاترین پالایه آزمایش "
-"می‌شود.</p>"
-"<p>اگر اتفاقی این دکمه را فشار داده‌اید، می‌توانید با فشار دکمۀ <em>بالا</em> "
-"این را واگرد کنید.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>این دکمه را برای حرکت پالایه‌ای که در حال حاضر برگزیده شده، <em>به "
+"پایین</em> یک پالایه در فهرست بالا، فشار دهید.</p><p>از آن جایی که ترتیب "
+"پالایه‌ها در فهرست، به ترتیبی که طبق آن پیامها آزمایش می‌شوند، تعیین می‌شود، "
+"این کار مفید است: ابتدا بالاترین پالایه آزمایش می‌شود.</p><p>اگر اتفاقی این "
+"دکمه را فشار داده‌اید، می‌توانید با فشار دکمۀ <em>بالا</em> این را واگرد کنید."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>این دکمه را فشار دهید تا پالایه‌ای که در حال حاضر، به  <em>پایین</em> "
-"فهرست بالا حرکت کند.</p>"
-"<p>تا زمانی مفید است که ترتیب پالایه‌ها در فهرست، ترتیبی که بر اساس آن پیامها "
-"را امتحان می‌کنند را تعیین کند:  ابتدا پالایۀ بالاتر، امتحان می‌شود.</p></qt>"
+"<qt><p>این دکمه را فشار دهید تا پالایه‌ای که در حال حاضر، به  <em>پایین</em> "
+"فهرست بالا حرکت کند.</p><p>تا زمانی مفید است که ترتیب پالایه‌ها در فهرست، "
+"ترتیبی که بر اساس آن پیامها را امتحان می‌کنند را تعیین کند:  ابتدا پالایۀ "
+"بالاتر، امتحان می‌شود.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>برای تغییر نام پالایه‌ای که در حال حاضر انتخاب‌شده، این دکمه را فشار "
-"دهید.</p>"
-"<p>با این شرط که پالایه‌ها با »<« آغاز شوند، به طور خودکار نام‌گذاری "
-"می‌شوند.</p>"
-"<p>اگر اتفاقی نام یک پالایه را تغییر داده‌اید و می‌خواهید به طور خودکار نامش "
-"برگردد، این دکمه را فشار دهید و در محاوره‌ای که ظاهر می‌شود، <em>پاک کردن</em> "
-"را که به دنبال <em>تأیید</em> آمده، برگزینید.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>برای تغییر نام پالایه‌ای که در حال حاضر انتخاب‌شده، این دکمه را فشار "
+"دهید.</p><p>با این شرط که پالایه‌ها با »<« آغاز شوند، به طور خودکار نام‌گذاری "
+"می‌شوند.</p><p>اگر اتفاقی نام یک پالایه را تغییر داده‌اید و می‌خواهید به طور "
+"خودکار نامش برگردد، این دکمه را فشار دهید و در محاوره‌ای که ظاهر می‌شود، "
+"<em>پاک کردن</em> را که به دنبال <em>تأیید</em> آمده، برگزینید.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>برای این که محاورۀ تأیید را مجبور کنید که نمایش داده شود، این دکمه را علامت "
-"بزنید.</p>"
-"<p>اگر مجموعه  قواعدی را تعریف کرده‌اید که پیامهای برچسبها بعداً بارگیری شوند، "
-"این کار مفید است. اگر پیامهای بزرگ دیگری در کارساز منتظر بودند، یا اگر "
-"می‌خواستید برای برچسب زدن پیامها به طور متفاوت، مجموعه قواعد را تغییر دهید؛ "
-"بدون این امکان که محاوره را مجبور کنید که بالا بپرد، این پیامها هرگز بارگیری "
-"نمی‌‌‌‌‌شدند.</p></qt>"
+"<qt><p>برای این که محاورۀ تأیید را مجبور کنید که نمایش داده شود، این دکمه را "
+"علامت بزنید.</p><p>اگر مجموعه  قواعدی را تعریف کرده‌اید که پیامهای برچسبها "
+"بعداً بارگیری شوند، این کار مفید است. اگر پیامهای بزرگ دیگری در کارساز منتظر "
+"بودند، یا اگر می‌خواستید برای برچسب زدن پیامها به طور متفاوت، مجموعه قواعد را "
+"تغییر دهید؛ بدون این امکان که محاوره را مجبور کنید که بالا بپرد، این پیامها "
+"هرگز بارگیری نمی‌‌‌‌‌شدند.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7090,6 +6942,16 @@ msgstr "قواعد پالایۀ POP3"
 msgid "Filter Rules"
 msgstr "قواعد پالایه"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&واردات‌"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&واردات‌"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "پالایه‌های موجود"
@@ -7171,6 +7033,11 @@ msgstr "علاوه بر این، این پالایه را به میله ابزا
 msgid "Icon for this filter:"
 msgstr "شمایل برای این پالایه:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "به"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "بالا"
@@ -7179,16 +7046,29 @@ msgstr "بالا"
 msgid "Down"
 msgstr "پایین"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "تغییر نام..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "جدید"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&رونوشت در‌"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "حذف‌شده"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7197,8 +7077,8 @@ msgstr "برگزیدن میان‌بر برای پوشه"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "حداقل یک پالایه، پوشه‌ای را در یک حساب برخط IMAP هدف قرار می‌دهد. چنین "
 "پالایه‌هایی، فقط هنگام پالایش دستی و هنگام پالایش نامۀ وارد‌شوندۀ برخط IMAP "
@@ -7284,29 +7164,24 @@ msgstr "عیب‌یابی نهانگاه IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>عیب‌یابی نهانگاه IMAP.</b></p>"
-"<p>اگر با همگام‌سازی یک پوشۀ IMAP مسئله دارید، ابتدا باید سعی کنید که پروندۀ "
-"نمایه را بازسازی کنید. بازسازی مقداری وقت‌گیر است، اما مسئله‌ای ایجاد "
-"نمی‌کند.</p>"
-"<p>اگر این کار کافی نیست، می‌توانید سعی کنید که نهانگاه  IMAP را بازآوری کنید. "
-"اگر این کار را انجام دهید، تمام تغییرات محلیتان در مورد این پوشه و تمام زیر "
-"پوشه‌هایش را از دست می‌دهید.</p>"
+"<p><b>عیب‌یابی نهانگاه IMAP.</b></p><p>اگر با همگام‌سازی یک پوشۀ IMAP مسئله "
+"دارید، ابتدا باید سعی کنید که پروندۀ نمایه را بازسازی کنید. بازسازی مقداری "
+"وقت‌گیر است، اما مسئله‌ای ایجاد نمی‌کند.</p><p>اگر این کار کافی نیست، می‌توانید "
+"سعی کنید که نهانگاه  IMAP را بازآوری کنید. اگر این کار را انجام دهید، تمام "
+"تغییرات محلیتان در مورد این پوشه و تمام زیر پوشه‌هایش را از دست می‌دهید.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7340,16 +7215,16 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"پروندۀ نهانگاه شناسۀ کاربر را برای پوشۀ %1 نتوانست بخواند. در مورد مجوز سیستم "
-"پرونده مسئله‌ای وجود دارد یا خراب است."
+"پروندۀ نهانگاه شناسۀ کاربر را برای پوشۀ %1 نتوانست بخواند. در مورد مجوز "
+"سیستم پرونده مسئله‌ای وجود دارد یا خراب است."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"پروندۀ نهانگاه شناسۀ کاربر را برای پوشۀ %1 نتوانست بنویسد. در مورد مجوز سیستم "
-"پرونده مسئله‌ای وجود دارد."
+"پروندۀ نهانگاه شناسۀ کاربر را برای پوشۀ %1 نتوانست بنویسد. در مورد مجوز "
+"سیستم پرونده مسئله‌ای وجود دارد."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7388,8 +7263,8 @@ msgstr "نمایۀ این پوشه مجدداً ایجاد شده است."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "پوشۀ %1 در وضعیت آغازین همگام‌سازی نیست )وضعیت، %2 بود(. می‌خواهید آن را به "
 "وضعیت آغازین همگام‌سازی و به هر حال همگام‌سازی بازنشانی کنید؟"
@@ -7515,15 +7390,11 @@ msgstr "ایجاد زیرپوشه‌ها در کارساز"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>نامه‌های روی کارساز در پوشۀ <b>%1</b> حذف شدند. می‌خواهید آنها را به صورت "
-"محلی حذف کنید؟ "
-"<br>شناسه‌های کاربر: %2</p></qt>"
+"<qt><p>نامه‌های روی کارساز در پوشۀ <b>%1</b> حذف شدند. می‌خواهید آنها را به "
+"صورت محلی حذف کنید؟ <br>شناسه‌های کاربر: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7544,12 +7415,10 @@ msgstr "بازیابی پوشه‌ها برای فضای نام %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>به نظر می‌رسد که پوشۀ <b>%1</b> حذف شد. می‌خواهید آن را از کارساز حذف "
+"<qt><p>به نظر می‌رسد که پوشۀ <b>%1</b> حذف شد. می‌خواهید آن را از کارساز حذف "
 "کنید؟</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7558,8 +7427,8 @@ msgstr "ساقط‌ شد"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "کارساز IMAP %1، برای حاشیه‌نویسیهای IMAP پشتیبان ندارد. ذخیره‌گاه  XML را "
 "نمی‌توان در مورد این کارساز استفاده کرد؛ لطفاً، KMail را به طور متفاوتی مجدداً "
@@ -7568,8 +7437,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "کارساز IMAP %1، برای حاشیه‌نویسیهای IMAP پشتیبان ندارد. ذخیره‌گاه  XML را "
 "نمی‌توان در مورد این کارساز استفاده کرد؛ لطفاً، KMail را به طور متفاوتی مجدداً "
@@ -7586,17 +7455,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>در این پوشه )%1(، پیامهای جدیدی وجود دارد که هنوز در کارساز بارگذاری "
 "نشده‌اند، اما به نظر نمی‌رسد که بتوانید آنها را هم اکنون بارگذاری کنید. لطفاً، "
-"با سرپرست خود تماس بگیرید تا اجازه دهد که پیامهای جدید برایتان بارگذاری شوند، "
-"یا آنها را به خارج از این پوشه حرکت دهد.</p> "
-"<p>می‌خواهید همین حالا این پیامها را به پوشۀ دیگر حرکت دهید؟</p>"
+"با سرپرست خود تماس بگیرید تا اجازه دهد که پیامهای جدید برایتان بارگذاری "
+"شوند، یا آنها را به خارج از این پوشه حرکت دهد.</p> <p>می‌خواهید همین حالا این "
+"پیامها را به پوشۀ دیگر حرکت دهید؟</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7605,20 +7474,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>در این پوشه )%1(، پیامهای جدیدی وجود دارد که هنوز در کارساز بارگذاری "
 "نشده‌اند، اما به نظر نمی‌رسد که بتوانید آنها را هم اکنون بارگذاری کنید. لطفاً، "
-"با سرپرست خود تماس بگیرید تا اجازه دهد که پیامهای جدید برایتان بارگذاری شوند، "
-"یا آنها را به خارج از این پوشه حرکت دهد.</p> "
-"<p>می‌خواهید همین حالا این پیامها را به پوشۀ دیگر حرکت دهید؟</p>"
+"با سرپرست خود تماس بگیرید تا اجازه دهد که پیامهای جدید برایتان بارگذاری "
+"شوند، یا آنها را به خارج از این پوشه حرکت دهد.</p> <p>می‌خواهید همین حالا این "
+"پیامها را به پوشۀ دیگر حرکت دهید؟</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "حرکت به:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "حرکت داده نشود"
 
@@ -7630,8 +7504,7 @@ msgstr "حرکت دادن پیامها به پوشه"
 msgid "Permissions (ACL)"
 msgstr "مجوزها )ACL("
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "عمومی"
@@ -7655,8 +7528,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "استفاده از &شمایلهای سفارشی‌"
@@ -7675,23 +7547,21 @@ msgstr "کنش روی نامۀ جدید/خوانده‌نشده در این پو
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>اگر این گزینه فعال شود، بنابراین، در مورد نامۀ جدید/خوانده‌نشده به شما اخطار "
-"داده می‌شود. علاوه بر این، رفتن به پوشۀ بعدی/قبلی با پیامهای خوانده‌نشده در این "
-"پوشه می‌ایستد.</p>"
-"<p>اگر نمی‌خواهید در این پوشه در مورد نامۀ جدید/خوانده‌نشده، به شما اخطار داده "
-"شود و اگر می‌خواهید این پوشه هنگام رفتن به پوشۀ بعدی/قبلی با پیامهای "
-"خوانده‌نشده بپرد، این گزینه را علامت نزنید. این کار برای چشم‌پوشی از هر نامۀ "
-"جدید/خوانده‌نشده در پوشۀ زباله و هرزنامه‌تان مفید است.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>اگر این گزینه فعال شود، بنابراین، در مورد نامۀ جدید/خوانده‌نشده به شما "
+"اخطار داده می‌شود. علاوه بر این، رفتن به پوشۀ بعدی/قبلی با پیامهای خوانده‌نشده "
+"در این پوشه می‌ایستد.</p><p>اگر نمی‌خواهید در این پوشه در مورد نامۀ جدید/"
+"خوانده‌نشده، به شما اخطار داده شود و اگر می‌خواهید این پوشه هنگام رفتن به پوشۀ "
+"بعدی/قبلی با پیامهای خوانده‌نشده بپرد، این گزینه را علامت نزنید. این کار برای "
+"چشم‌پوشی از هر نامۀ جدید/خوانده‌نشده در پوشۀ زباله و هرزنامه‌تان مفید است.</p></"
+"qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7703,9 +7573,9 @@ msgstr "حفظ پاسخها در این پوشه"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "اگر می‌خواهید پاسخهایی که در این پوشه به نامه‌ها می‌دهید بعد از ارسال به جای "
 "پوشۀ پیکربندی‌شدۀ نامۀ ارسالی، در همین پوشه قرار بگیرد، این گزینه را علامت "
@@ -7719,17 +7589,21 @@ msgstr "نمایش ستون فرستنده/گیرنده در فهرست پیام
 msgid "Sho&w column:"
 msgstr "&نمایش ستون:‌"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "تنظیم پیش‌فرض"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "فرستنده"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "گیرنده"
@@ -7740,11 +7614,11 @@ msgstr "هویت &فرستنده:‌"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "برگزیدن هویت فرستنده که هنگام نوشتن نامۀ جدید یا پاسخ به نامه، در این پوشه "
 "استفاده می‌شود. یعنی اگر در یکی از پوشه‌های کارتان هستید، می‌توانید KMail، را "
@@ -7768,23 +7642,24 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"این تنظیم، تعریف می‌کند که کاربرانی که در این پوشه شریکند باید دوره‌های »اشغال« "
-"را در فهرستهای آزاد اشغالشان به دست بیاورند و باید هشدارهای موجود در این پوشه "
-"را برای رویدادها یا تکلیفها ببینند. این تنظیم فقط برای پوشه‌های تقویم و تکلیف "
-"اِعمال می‌شود )در مورد تکلیفها، این تنظیم فقط برای هشدارها استفاده می‌شود(.\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"این تنظیم، تعریف می‌کند که کاربرانی که در این پوشه شریکند باید دوره‌های "
+"»اشغال« را در فهرستهای آزاد اشغالشان به دست بیاورند و باید هشدارهای موجود در "
+"این پوشه را برای رویدادها یا تکلیفها ببینند. این تنظیم فقط برای پوشه‌های "
+"تقویم و تکلیف اِعمال می‌شود )در مورد تکلیفها، این تنظیم فقط برای هشدارها "
+"استفاده می‌شود(.\n"
 "\n"
 "مثال موارد استفاده: اگر رئیس با منشی وی در یک پوشه مشترک هستند، فقط رئیس به "
 "خاطر ملاقاتهایش به صورت اشغال نشان‌گذاری می‌شود، پس او باید »سرپرستی« را "
 "برگزیند، چون منشی حقوق سرپرستی در مورد پوشه را ندارد.\n"
-"از طرف دیگر، اگر یک گروه کاری در یک تقویم برای ملاقاتهای گروه مشترک باشند، برای "
-"ملاقاتهای تمام خوانندگان پوشه‌ها، اشغال نشان‌گذاری می‌شود.\n"
+"از طرف دیگر، اگر یک گروه کاری در یک تقویم برای ملاقاتهای گروه مشترک باشند، "
+"برای ملاقاتهای تمام خوانندگان پوشه‌ها، اشغال نشان‌گذاری می‌شود.\n"
 "یک پوشۀ سراسری شرکت که دارای رویدادهای اختیاری است برای »هیچ کس« استفاده "
 "نمی‌شود زیرا مشخص نمی‌شود که چه کسی به سراغ این رویدادها می‌رود."
 
@@ -7817,23 +7692,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"این پوشه را برای داشتن اطلاعات گروه‌افزاری و گزینۀ پیکربندی عمومی جهت مخفی کردن "
-"پوشه‌های گروه‌افزاری که تنظیم می‌شود، پیکربندی کرده‌اید. یعنی این پوشه به محض "
-"این که محاورۀ پیکربندی بسته شود، ناپدید می‌شود. اگر می‌خواهید دوباره پوشه را "
-"حذف کنید، لازم است مخفی کردن پوشه‌های گروه‌افزاری که قادر به دیدن آن هستید را "
-"موقتاً غیرفعال کنید."
+"این پوشه را برای داشتن اطلاعات گروه‌افزاری و گزینۀ پیکربندی عمومی جهت مخفی "
+"کردن پوشه‌های گروه‌افزاری که تنظیم می‌شود، پیکربندی کرده‌اید. یعنی این پوشه به "
+"محض این که محاورۀ پیکربندی بسته شود، ناپدید می‌شود. اگر می‌خواهید دوباره پوشه "
+"را حذف کنید، لازم است مخفی کردن پوشه‌های گروه‌افزاری که قادر به دیدن آن هستید "
+"را موقتاً غیرفعال کنید."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7902,7 +7777,8 @@ msgstr "خطا هنگام به دست آوردن اطلاعات پوشه."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "نمایۀ نامه برای »%1« از یک نسخۀ ناشناختۀ KMail) %2( است.\n"
 "این نمایه را می‌توان از پوشۀ نامه‌تان مجدداً به وجود آورد، اما برخی اطلاعات، که "
@@ -7934,11 +7810,11 @@ msgstr "خطای باز کردن %1؛ این پوشه از دست می‌رود.
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"خطای باز کردن %1؛ یا این یک پوشۀ معتبر  maildir است، یا شما مجوزهای کافی برای "
-"دستیابی ندارید."
+"خطای باز کردن %1؛ یا این یک پوشۀ معتبر  maildir است، یا شما مجوزهای کافی "
+"برای دستیابی ندارید."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -7980,21 +7856,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>به نظر می‌رسد نمایۀ پوشۀ »%2« قدیمی باشد. برای پیشگیری از خرابی پیام، نمایه "
-"مجدداً ایجاد می‌شود. در نتیجه، ممکن است پیامهای حذف‌شده مجدداً ظاهر شوند و ممکن "
-"است پرچمهای وضعیت از بین بروند.</p>"
-"<p>لطفاً، مدخل متناظر در بخش <a href=\"%1\">بخش FAQ از راهنمای KMail</a> "
-"را برای اطلاعات در مورد این که چطور از رخ دادن مجدد این مسئله جلوگیری شود، "
-"بخوانید.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>به نظر می‌رسد نمایۀ پوشۀ »%2« قدیمی باشد. برای پیشگیری از خرابی پیام، "
+"نمایه مجدداً ایجاد می‌شود. در نتیجه، ممکن است پیامهای حذف‌شده مجدداً ظاهر شوند و "
+"ممکن است پرچمهای وضعیت از بین بروند.</p><p>لطفاً، مدخل متناظر در بخش <a href="
+"\"%1\">بخش FAQ از راهنمای KMail</a> را برای اطلاعات در مورد این که چطور از "
+"رخ دادن مجدد این مسئله جلوگیری شود، بخوانید.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8051,7 +7923,7 @@ msgstr ""
 "»%1« برای این که یک پوشه باشد، ظاهر نمی‌‌شود.\n"
 "لطفاً، پرونده را به طور غیر عادی حرکت دهید."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8059,7 +7931,7 @@ msgstr ""
 "مجوزهای پوشۀ »%1« نادرست هستند؛\n"
 "لطفاً، مطمئن شوید که می‌توانید محتوای این پوشه را مشاهده کنید و تغییر دهید."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8069,8 +7941,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8078,7 +7950,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "خرابی در ایجاد پوشه"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8179,13 +8051,13 @@ msgstr "&عیب‌یابی نهانگاه IMAP...‌"
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>پوشۀ <b>%1</b> را به خاطر مجوزهای ناکافی در کارساز نمی‌توان ایجاد کرد. اگر "
-"فکر می‌کنید قادر به ایجاد زیرپوشه‌ها در اینجا هستید، از سرپرستتان برای تضمین "
-"این که حقوق انجام این کار را دارید بپرسید.</qt>"
+"<qt>پوشۀ <b>%1</b> را به خاطر مجوزهای ناکافی در کارساز نمی‌توان ایجاد کرد. "
+"اگر فکر می‌کنید قادر به ایجاد زیرپوشه‌ها در اینجا هستید، از سرپرستتان برای "
+"تضمین این که حقوق انجام این کار را دارید بپرسید.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8209,15 +8081,13 @@ msgstr "<qt>خرابی در ایجاد پوشۀ <b>%1</b>، پوشه از قبل
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
-msgstr ""
-"<qt>پوشۀ <b>%1</b> را نمی‌توان به زیرپوشه‌ای در زیر خودش حرکت داد.</qt>"
+msgstr "<qt>پوشۀ <b>%1</b> را نمی‌توان به زیرپوشه‌ای در زیر خودش حرکت داد.</qt>"
 
 #: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
-msgstr ""
-"<qt>پوشۀ <b>%1</b> را نمی‌توان به زیرپوشه‌ای در زیر خودش حرکت داد.</qt>"
+msgstr "<qt>پوشۀ <b>%1</b> را نمی‌توان به زیرپوشه‌ای در زیر خودش حرکت داد.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8318,13 +8188,13 @@ msgstr "%1 پوشه فقط خواندنی است."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>واقعاً می‌خواهید %n پیام برگزیده را حذف کنید؟"
-"<br>به محض این که حذف می‌‌شوند، آنها را نمی‌توان بازگرداند.</qt>"
+"<qt>واقعاً می‌خواهید %n پیام برگزیده را حذف کنید؟<br>به محض این که حذف می‌‌شوند، "
+"آنها را نمی‌توان بازگرداند.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8376,132 +8246,129 @@ msgstr ""
 "خرابی در تغییر %1\n"
 ")فضایی در دستگاه باقی نماند؟("
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "درخواست امضای گواهی‌نامه"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "لطفاً، گواهی‌نامه‌ای از پیوست ایجاد کنید و برای فرستنده بازگشت دهید."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail، برای برون‌خط شدن تنظیم می‌شود؛ تمام کارهای شبکه معلق می‌شوند"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
-msgstr ""
-"KMail، برای برخط شدن تنظیم می‌شود؛ تمام کارهای شبکه از سر گرفته می‌شوند"
+msgstr "KMail، برای برخط شدن تنظیم می‌شود؛ تمام کارهای شبکه از سر گرفته می‌شوند"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "در حال حاضر KMail در حالت برون‌خط است. چقدر می‌خواهید پیش بروید؟"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "کار کردن برخط"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "کار کردن برون‌‌خط"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "مجوز خواندن/نوشتن در پوشۀ دریافتی ندارید."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "ارسالی"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "مجوز خواندن/نوشتن در پوشۀ ارسالیتان را ندارید."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "نامۀ ارسالی"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "مجوز خواندن/نوشتن در پوشۀ نامۀ ارسالیتان را ندارید."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "زباله"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "مجوز خواندن/نوشتن در پوشۀ زباله‌تان را ندارید."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "پیش‌نویسها"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "مجوز خواندن/نوشتن در پوشۀ پیش‌نویسهایتان را ندارید."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "قالبها"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "مجوز خواندن/نوشتن در پوشۀ زباله‌تان را ندارید."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "آخرین جستجو"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i>پوشه موجود است. الان، %1 از <i>%5</i> پوشه برای پیامهایش استفاده "
-"می‌کند."
-"<p>%2 می‌تواند محتویات <i>%6<i> را برای شما به این پوشه حرکت دهد، گرچه ممکن است "
-"این هر پروندۀ موجود را با همین نام در <i>%7</i> جایگزین کند."
-"<p><strong> می‌خواهید %3، پرونده‌های نامه را الان حرکت دهد؟</strong></qt>"
+"<qt><i>%4</i>پوشه موجود است. الان، %1 از <i>%5</i> پوشه برای پیامهایش "
+"استفاده می‌کند.<p>%2 می‌تواند محتویات <i>%6<i> را برای شما به این پوشه حرکت "
+"دهد، گرچه ممکن است این هر پروندۀ موجود را با همین نام در <i>%7</i> جایگزین "
+"کند.<p><strong> می‌خواهید %3، پرونده‌های نامه را الان حرکت دهد؟</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i>پوشه موجود است. الان %1 از <i>%5</i> برای پیامهایش استفاده می‌کند. "
-"%2 می‌تواند محتویات <i>%6</i> را برای شما به این پوشه حرکت دهد. "
+"<qt><i>%4</i>پوشه موجود است. الان %1 از <i>%5</i> برای پیامهایش استفاده "
+"می‌کند. %2 می‌تواند محتویات <i>%6</i> را برای شما به این پوشه حرکت دهد. "
 "<p><strong>می‌خواهید %3، پرونده‌های نامه را الان حرکت دهد؟</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "پروندۀ نامه‌ها جا به جا شود؟"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail، با یک خطای مهلک مواجه شد و الان پایان می‌‌یابد"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8512,11 +8379,11 @@ msgstr ""
 "خطا این بود:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "خالی کردن زباله"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "مطمئن هستید که می‌خواهید پوشه‌های زبالۀ تمام حسابها را خالی کنید؟"
 
@@ -8589,8 +8456,7 @@ msgstr "%n پیامهای جدید در %1"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>نامۀ جدید رسیده</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8628,11 +8494,11 @@ msgstr "مطمئن هستید که می‌خواهید پوشۀ زباله را
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>مطمئن هستید که می‌خواهید تمام پیامها را از پوشۀ <b>%1</b> "
-"به زباله حرکت دهید؟</qt>"
+"<qt>مطمئن هستید که می‌خواهید تمام پیامها را از پوشۀ <b>%1</b> به زباله حرکت "
+"دهید؟</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8656,11 +8522,11 @@ msgstr "حذف جستجو"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>مطمئن هستید که می‌خواهید جستجوی <b>%1</b> را حذف کنید؟"
-"<br>هر پیامی که آن نمایش می‌دهد باز هم در پوشۀ اصلیشان موجود می‌باشند.</qt>"
+"<qt>مطمئن هستید که می‌خواهید جستجوی <b>%1</b> را حذف کنید؟<br>هر پیامی که آن "
+"نمایش می‌دهد باز هم در پوشۀ اصلیشان موجود می‌باشند.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8672,40 +8538,41 @@ msgstr "<qt>مطمئن هستید که می‌خواهید پوشۀ خالی <b>
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>مطمئن هستید که می‌خواهید پوشۀ خالی <b>%1</b> و تمام زیرپوشه‌هایش را حذف "
-"کنید؟ ممکن است آن زیرپوشه‌ها و محتویاتشان هم دور انداخته شوند. "
-"<p><b>آگاه باشید</b> که پیامهای دور انداخته‌شده در پوشۀ زباله‌تان ذخیره "
-"نمی‌شوند و برای همیشه حذف می‌شوند.</qt>"
+"کنید؟ ممکن است آن زیرپوشه‌ها و محتویاتشان هم دور انداخته شوند. <p><b>آگاه "
+"باشید</b> که پیامهای دور انداخته‌شده در پوشۀ زباله‌تان ذخیره نمی‌شوند و برای "
+"همیشه حذف می‌شوند.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>مطمئن هستید که می‌خواهید پوشۀ <b>%1</b> را حذف کنید، و محتویاتش را دور "
-"بیندازید؟ "
-"<p><b>آگاه باشید</b> که پیامهای دور انداخته‌شده در پوشۀ زباله‌تان ذخیره "
-"نمی‌شوند و برای همیشه حذف می‌شوند.</qt>"
+"بیندازید؟ <p><b>آگاه باشید</b> که پیامهای دور انداخته‌شده در پوشۀ زباله‌تان "
+"ذخیره نمی‌شوند و برای همیشه حذف می‌شوند.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>مطمئن هستید که می‌خواهید پوشۀ <b>%1</b> و تمام زیرپوشه‌هایش را حذف کنید، "
-"محتویاتشان را دور بیندازید؟"
-"<p><b>آگاه باشید</b> که پیامهای دور انداخته‌شده در پوشۀ زباله‌تان ذخیره "
-"نمی‌شوند و برای همیشه حذف می‌شوند.</qt>"
+"محتویاتشان را دور بیندازید؟<p><b>آگاه باشید</b> که پیامهای دور انداخته‌شده در "
+"پوشۀ زباله‌تان ذخیره نمی‌شوند و برای همیشه حذف می‌شوند.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "حذف‌شده"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8713,8 +8580,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "مطمئن هستید که می‌خواهید نهانگاه IMAP را بازآوری کنید؟\n"
-"این کار تمام تغییراتی که به طور محلی در پوشه‌های IMAP خود ایجاد کرده‌اید را حذف "
-"می‌کند."
+"این کار تمام تغییراتی که به طور محلی در پوشه‌های IMAP خود ایجاد کرده‌اید را "
+"حذف می‌کند."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8722,9 +8589,9 @@ msgstr "مطمئن هستید که می‌خواهید تمام پیامهای �
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "استفاده از زنگام در نامه، شما را برای »هرزنامه« آسیب‌پذیرتر می‌کند و ممکن است "
 "احتمال این که سیستمتان با اعمال امنیتی کنونی و پیش‌بینی شده سازش یابد، افزایش "
@@ -8741,8 +8608,8 @@ msgstr "استفاده از زنگام"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "بارگذاری مرجعهای خارجی در نامۀ زنگام، شما را نسبت به »هرزنامه« آسیب‌پذیر‌تر "
 "می‌کند و  ممکن است احتمال این که سیستمتان با اعمال امنیتی کنونی و پیش‌بینی شده "
@@ -8762,12 +8629,12 @@ msgstr "پالایش در فهرست نامۀ %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"کارآمدی پاسخ خارج از دفتر KMail، بر پالایش سمت کارساز تکیه دارد. هنوز یک کارساز "
-"IMAPرا برای این پیکربندی نکرده‌اید.\n"
+"کارآمدی پاسخ خارج از دفتر KMail، بر پالایش سمت کارساز تکیه دارد. هنوز یک "
+"کارساز IMAPرا برای این پیکربندی نکرده‌اید.\n"
 "این کار را در تب »پالایش« پیکربندی حساب IMAP می‌توانید انجام دهید."
 
 #: kmmainwidget.cpp:1743
@@ -8783,7 +8650,8 @@ msgstr "مدیر گواهی‌نامه را نتوانست آغاز کند، ل�
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "مشاهده‌گر GnuPG Log )kwatchgnupg( را نتوانست آغاز کند؛ لطفاً، نصبتان را بررسی "
 "کنید."
@@ -9117,8 +8985,7 @@ msgstr "ذخیرۀ &پیوستها...‌"
 msgid "Appl&y All Filters"
 msgstr "&اعمال همۀ پالایه‌ها‌"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&اعمال پالایه‌"
@@ -9232,7 +9099,6 @@ msgstr "پیام &خوانده‌نشدۀ بعدی‌"
 msgid "Go to the next unread message"
 msgstr "رفتن به پیام خوانده‌نشدۀ بعدی"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "پیام &قبلی‌"
@@ -9280,8 +9146,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"لغزاندن به پایین پیام جاری. اگر به پایان پیام جاری رسیدید، به پیام خوانده‌نشدۀ "
-"بعدی بروید."
+"لغزاندن به پایین پیام جاری. اگر به پایان پیام جاری رسیدید، به پیام "
+"خوانده‌نشدۀ بعدی بروید."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9371,8 +9237,8 @@ msgstr " مقداردهی اولیه..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9382,10 +9248,10 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "این پیام، شامل درخواست ارسال یک اخطار دربارۀ دریافت پیام شما می‌باشد،\n"
@@ -9396,8 +9262,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9409,8 +9275,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9422,15 +9288,17 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"این پیام، حاوی درخواست جهت ارسال اخطار در مورد دریافت پیام از سوی شما می‌باشد،\n"
-"اما نشانی مسیر بازگشت، با نشانی که جهت ارسال اخطار درخواست شده بود، فرق دارد.\n"
+"این پیام، حاوی درخواست جهت ارسال اخطار در مورد دریافت پیام از سوی شما "
+"می‌باشد،\n"
+"اما نشانی مسیر بازگشت، با نشانی که جهت ارسال اخطار درخواست شده بود، فرق "
+"دارد.\n"
 "یا می‌توانید درخواست را نادیده بگیرید، یا به KMail اجازه بدهید که یک پاسخ "
 "»ردشده« یا عادی ارسال کند."
 
@@ -9457,17 +9325,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "دریافت:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "پیوست: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "نمایش پیوستها به عنوان پیشنهادشده توسط فرستنده."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9517,45 +9385,38 @@ msgstr "ویژگیهای جزء پیام"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>نوع مایم</em> پرونده:</p>"
-"<p>معمولاً، لازم نیست که به این تنظیم دست بزنید، زیرا نوع پرونده به طور خودکار "
-"علامت زده شده است؛ اما، گاهی اوقات، ممکن است %1 نوع را درست آشکار کند -- در "
-"اینجا می‌توانید آن را تعیین کنید.</p></qt>"
+"<qt><p><em>نوع مایم</em> پرونده:</p><p>معمولاً، لازم نیست که به این تنظیم دست "
+"بزنید، زیرا نوع پرونده به طور خودکار علامت زده شده است؛ اما، گاهی اوقات، "
+"ممکن است %1 نوع را درست آشکار کند -- در اینجا می‌توانید آن را تعیین کنید.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>اندازۀ جزء</p>"
-"<p>گاهی اوقات، %1 در اینجا فقط یک اندازۀ تخمینی می‌دهد، زیرا محاسبۀ اندازۀ دقیق "
-"بسیار طول می‌کشد؛ وقتی مورد این گونه باشد، با افزودن »)est.(« به اندازۀ نمایش "
-"داده‌شده، مرئی می‌شود.</p></qt>"
+"<qt><p>اندازۀ جزء</p><p>گاهی اوقات، %1 در اینجا فقط یک اندازۀ تخمینی می‌دهد، "
+"زیرا محاسبۀ اندازۀ دقیق بسیار طول می‌کشد؛ وقتی مورد این گونه باشد، با افزودن "
+"»)est.(« به اندازۀ نمایش داده‌شده، مرئی می‌شود.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>نام پروندۀ جزء</p>"
-"<p>هر چند، این پیش‌فرض نام پروندۀ پیوست‌شده می‌باشد، اما پرونده‌ای که باید "
-"پیوست شود را مشخص نمی‌کند؛ به علاوه، نام پرونده‌ای را پیشنهاد می‌کند که هنگام "
-"ذخیرۀ بخش دیسک، به وسیلۀ عامل نامۀ گیرنده استفاده می‌شود.</p></qt>"
+"<qt><p>نام پروندۀ جزء</p><p>هر چند، این پیش‌فرض نام پروندۀ پیوست‌شده می‌باشد، "
+"اما پرونده‌ای که باید پیوست شود را مشخص نمی‌کند؛ به علاوه، نام پرونده‌ای را "
+"پیشنهاد می‌کند که هنگام ذخیرۀ بخش دیسک، به وسیلۀ عامل نامۀ گیرنده استفاده "
+"می‌شود.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9563,17 +9424,14 @@ msgstr "&توصیف:‌"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>توصیفی از جزء:</p>"
-"<p>تنها توصیف اطلاع‌رسان از بخش می‌باشد که بسیار شبیه موضوع کل پیام می‌باشد؛ "
-"اغلب عاملهای نامه، این اطلاعات را در پیش‌نمایشهای پیام به موازات شمایل پیوستها "
-"نشان می‌دهند.</p></qt>"
+"<qt><p>توصیفی از جزء:</p><p>تنها توصیف اطلاع‌رسان از بخش می‌باشد که بسیار شبیه "
+"موضوع کل پیام می‌باشد؛ اغلب عاملهای نامه، این اطلاعات را در پیش‌نمایشهای پیام "
+"به موازات شمایل پیوستها نشان می‌دهند.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9581,23 +9439,20 @@ msgstr "&کدبندی:‌"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>کدبندی انتقال این بخش:</p>"
-"<p>معمولاً، لازم نیست که این را تغییر دهید، زیرا %1  از یک کدبندی پیش‌فرض "
-"آراسته استفاده می‌کندکه به نوع مایم بستگی دارد؛ هر چند، گاهی اوقات می‌توانید "
-"اندازۀ پیام حاصل را به طور قابل ملاحظه‌ای کم کنید، مثلاً اگر پروندۀ پست‌اسکریپت "
-"دادۀ دوگانی نداشته باشد، اما حاوی متن ساده باشد -- در این مورد، با انتخاب »قابل "
-"چاپ نقل قول‌شده« بر روی »پایۀ ۶۴« پیش‌فرض، اندازۀ پیام حاصل بیش از ۲۵٪  ذخیره "
-"می‌شود.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>کدبندی انتقال این بخش:</p><p>معمولاً، لازم نیست که این را تغییر دهید، "
+"زیرا %1  از یک کدبندی پیش‌فرض آراسته استفاده می‌کندکه به نوع مایم بستگی دارد؛ "
+"هر چند، گاهی اوقات می‌توانید اندازۀ پیام حاصل را به طور قابل ملاحظه‌ای کم "
+"کنید، مثلاً اگر پروندۀ پست‌اسکریپت دادۀ دوگانی نداشته باشد، اما حاوی متن ساده "
+"باشد -- در این مورد، با انتخاب »قابل چاپ نقل قول‌شده« بر روی »پایۀ ۶۴« "
+"پیش‌فرض، اندازۀ پیام حاصل بیش از ۲۵٪  ذخیره می‌شود.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9605,20 +9460,16 @@ msgstr "پیشنهاد نمایش &به طور خودکار‌"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>اگر می‌خواهید به گیرنده پیشنهاد کنید که به جای نمای شمایل پیش‌فرض، این بخش "
-"از پیش‌نمایش پیام را به صورت خودکار )درون‌برنامه‌ای( نمایش دهد، این گزینه را "
-"علامت بزنید؛</p>"
-"<p>با تنظیم حوزۀ سرآیند <em>وضعیت محتوای</em> این بخش به صورت »درون‌برنامه‌ای« "
-"به جای »پیوست« پیش‌فرض، به طور فنی انجام می‌شود.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>اگر می‌خواهید به گیرنده پیشنهاد کنید که به جای نمای شمایل پیش‌فرض، این "
+"بخش از پیش‌نمایش پیام را به صورت خودکار )درون‌برنامه‌ای( نمایش دهد، این گزینه "
+"را علامت بزنید؛</p><p>با تنظیم حوزۀ سرآیند <em>وضعیت محتوای</em> این بخش به "
+"صورت »درون‌برنامه‌ای« به جای »پیوست« پیش‌فرض، به طور فنی انجام می‌شود.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9626,15 +9477,13 @@ msgstr "&امضای این بخش‌"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>اگر می‌خواهید که این بخش از پیام امضا شود، این گزینه را علامت بزنید؛</p>"
-"<p>امضا، با کلیدی که با هویت برگزیدۀ جاری ارتباط داده‌اید، ایجاد می‌شود.</p>"
-"</qt>"
+"<qt><p>اگر می‌خواهید که این بخش از پیام امضا شود، این گزینه را علامت بزنید؛</"
+"p><p>امضا، با کلیدی که با هویت برگزیدۀ جاری ارتباط داده‌اید، ایجاد می‌شود.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9642,13 +9491,11 @@ msgstr "&رمزبندی این بخش‌"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>اگر می‌خواهید که این بخش از پیام رمزبندی شود، این گزینه را علامت بزنید؛</p>"
-"<p>این بخش، برای گیرنده‌های این پیام رمزبندی می‌شود</p></qt>"
+"<qt><p>اگر می‌خواهید که این بخش از پیام رمزبندی شود، این گزینه را علامت بزنید؛"
+"</p><p>این بخش، برای گیرنده‌های این پیام رمزبندی می‌شود</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9662,16 +9509,13 @@ msgstr "پالایۀ دفتر پست"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"پالایش پیامهای یافت‌شده روی حساب قرارداد دفتر پست: <b>%1</b>"
-"<p>پیامهای نشان داده‌شده، بیش از حد اندازۀ بیشینه‌ای است که برای این حساب تعریف "
-"کرده‌اید."
-"<br>با فشار دکمۀ مناسب می‌توانید انتخاب کنید که می‌خواهید با آنها چه کنید."
+"پالایش پیامهای یافت‌شده روی حساب قرارداد دفتر پست: <b>%1</b><p>پیامهای نشان "
+"داده‌شده، بیش از حد اندازۀ بیشینه‌ای است که برای این حساب تعریف کرده‌اید.<br>با "
+"فشار دکمۀ مناسب می‌توانید انتخاب کنید که می‌خواهید با آنها چه کنید."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9924,40 +9768,38 @@ msgstr "کارخواه رایانامه برای محیط رومیزی K."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>بازیابی محتویات پوشه</h2>"
-"<p>لطفاً منتظر بمانید . . .</p> "
+"<h2 style='margin-top: 0px;'>بازیابی محتویات پوشه</h2><p>لطفاً منتظر "
+"بمانید . . .</p> "
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>برون‌خط</h2>"
-"<p>در حال حاضر، KMail در حالت برون‌خط است. <a href=\"kmail:goOnline\">اینجا</a> "
-"را فشار دهید تا برخط شود . . .</p> "
+"<h2 style='margin-top: 0px;'>برون‌خط</h2><p>در حال حاضر، KMail در حالت برون‌خط "
+"است. <a href=\"kmail:goOnline\">اینجا</a> را فشار دهید تا برخط شود . . .</p> "
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9965,18 +9807,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>به KMail %1 خوش آمدید</h2>"
-"<p>KMail، یک کارخواه رایانامه برای محیط K Desktop می‌باشد. این به گونه‌ای طراحی "
-"شده است که با استانداردهای نامه‌ نویسی اینترنت شامل مایم، SMTP، POP3 و IMAP "
-"سازگاری زیادی داشته باشد.</p>\n"
-"<ul>"
-"<li>KMail، ویژگیهای توانمند زیادی دارد که در <a href=\"%2\">مستندات</a> "
+"<h2 style='margin-top: 0px;'>به KMail %1 خوش آمدید</h2><p>KMail، یک کارخواه "
+"رایانامه برای محیط K Desktop می‌باشد. این به گونه‌ای طراحی شده است که با "
+"استانداردهای نامه‌ نویسی اینترنت شامل مایم، SMTP، POP3 و IMAP سازگاری زیادی "
+"داشته باشد.</p>\n"
+"<ul><li>KMail، ویژگیهای توانمند زیادی دارد که در <a href=\"%2\">مستندات</a> "
 "توصیف می‌شوند</li>\n"
 "<li><a href=\"%3\">آغازۀ KMail</A> دربارۀ نسخه‌های جدید KMail، اطلاع‌رسانی "
 "می‌کند</li></ul>\n"
 "%8\n"
-"<p>برخی از ویژگیهای جدید در این نشر  KMail شامل )در مقایسه با KMail %4، که بخشی "
-"از TDE %5 است(:</p>\n"
+"<p>برخی از ویژگیهای جدید در این نشر  KMail شامل )در مقایسه با KMail %4، که "
+"بخشی از TDE %5 است(:</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9985,14 +9826,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>    تیم KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr ""
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10006,8 +9846,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>تغییرات مهم</span> "
-")در مقایسه با KMail %1(:</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>تغییرات مهم</span> )در "
+"مقایسه با KMail %1(:</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10038,7 +9878,8 @@ msgstr "نمای پیوست: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr "[KMail: پیوست، شامل دادۀ دوگانی است. تلاش برای نمایش %n نویسۀ اول.]"
 
@@ -10064,12 +9905,14 @@ msgstr " پیوست باز شود؟"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10091,6 +9934,58 @@ msgstr ")تطبیق هر کدام از موارد زیر("
 msgid "(match all of the following)"
 msgstr ")تطبیق همۀ موارد زیر("
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "خوانده‌شده"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "قدیمی"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "حذف‌شده"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "پاسخ داده‌شده"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "پیش‌سو‌شده"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "صف‌شده"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "ارسال‌شده"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "پایش‌شده"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "چشم‌پوشی‌شده"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "هرزنامه"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "کار انجامی"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr " پیوست دارد"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10170,25 +10065,25 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"خطای بحرانی: قادر به پردازش نامۀ ارسالی نیست )خارج از فضا؟( حرکت پیام خراب به "
-"پوشۀ »نامۀ ارسال‌شده«."
+"خطای بحرانی: قادر به پردازش نامۀ ارسالی نیست )خارج از فضا؟( حرکت پیام خراب "
+"به پوشۀ »نامۀ ارسال‌شده«."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "خرابی در حرکت پیام ارسال‌شدۀ »%1« از »ارسالی« به پوشۀ »نامۀ ارسال‌شده«.\n"
-"دلایل ممکن، فقدان فضای دیسک یا نوشتن مجوز می‌باشد. لطفاً، سعی کنید که رفع اشکال "
-"کرده و پیام را به صورت دستی حرکت دهید."
+"دلایل ممکن، فقدان فضای دیسک یا نوشتن مجوز می‌باشد. لطفاً، سعی کنید که رفع "
+"اشکال کرده و پیام را به صورت دستی حرکت دهید."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "پیامها را نمی‌توان بدون مشخص کردن یک نشانی فرستنده ارسال کرد.\n"
 "لطفاً، از بخش هویتهای محاورۀ پیکربندی، نشانی رایانامه‌ای هویت »%1« را تنظیم "
@@ -10215,8 +10110,8 @@ msgstr "آغاز فرایند فرستنده..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "انتخاب کرده‌اید که همۀ رایانامه‌های صف‌شده را با استفاده از یک انتقال "
 "رمزبندی‌نشده ارسال کنید، می‌خواهید ادامه بدهید؟"
@@ -10243,8 +10138,9 @@ msgstr "خرابی در ارسال )چند( پیام صف‌شده."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10261,20 +10157,16 @@ msgstr "ارسال ساقط شد."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>خرابی در ارسال:</p>"
-"<p>%1</p>"
-"<p>پیام در پوشۀ »ارسالی« می‌ماند، تا اینکه یا رفع اشکال نمایید ) مثلاً، یک "
-"نشانی شکسته(، یا پیام را از پوشۀ »ارسالی« حذف کنید.</p>"
-"<p>قرارداد انتقال زیر استفاده شد:  %2</p>"
-"<p>می‌خواهید ارسال پیام باقی‌مانده را ادامه دهم؟</p>"
+"<p>خرابی در ارسال:</p><p>%1</p><p>پیام در پوشۀ »ارسالی« می‌ماند، تا اینکه یا "
+"رفع اشکال نمایید ) مثلاً، یک نشانی شکسته(، یا پیام را از پوشۀ »ارسالی« حذف "
+"کنید.</p><p>قرارداد انتقال زیر استفاده شد:  %2</p><p>می‌خواهید ارسال پیام "
+"باقی‌مانده را ادامه دهم؟</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10292,8 +10184,9 @@ msgstr "&ساقط کردن ارسال‌"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10340,19 +10233,19 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "به نظر می‌رسد که در حال حاضر %1 ، روی نمایش دیگر در این ماشین اجرا می‌شود. "
-"اجرای بیش از یک بار  %2 می‌تواند منجر به از دست رفتن نامه شود. نباید %1 را آغاز "
-"کنید، مگر این‌ که مطمئن باشید که در حال اجرا نمی‌باشد."
+"اجرای بیش از یک بار  %2 می‌تواند منجر به از دست رفتن نامه شود. نباید %1 را "
+"آغاز کنید، مگر این‌ که مطمئن باشید که در حال اجرا نمی‌باشد."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "به نظر می‌رسد که %1 در حال اجرا روی نمایش دیگر روی این ماشین می‌باشد. اجرای "
 "همزمان %1 و %2 می‌تواند منجر به از دست رفتن نامه شود. نباید %2 را آغاز کنید، "
@@ -10360,23 +10253,23 @@ msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "به نظر می‌رسد که %1 در حال اجرا روی %2 می‌باشد. اجرای بیش از یک بار %1 می‌تواند "
-"منجر به از دست رفتن نامه شود. نباید %1 را روی این رایانه آغاز کنید، مگر این ‌که "
-"مطمئن باشید که در حال اجرا روی %2 نیست."
+"منجر به از دست رفتن نامه شود. نباید %1 را روی این رایانه آغاز کنید، مگر این ‌"
+"که مطمئن باشید که در حال اجرا روی %2 نیست."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "به نظر می‌رسد که %1 در حال اجرا روی %3 می‌باشد. اجرای همزمان %1 و %2 ممکن است "
-"منجر به از دست رفتن نامه شود. نباید %2 را روی این رایانه آغاز کنید، مگر این ‌که "
-"مطمئن باشید که %1 روی %3 اجرا نمی‌شود."
+"منجر به از دست رفتن نامه شود. نباید %2 را روی این رایانه آغاز کنید، مگر این ‌"
+"که مطمئن باشید که %1 روی %3 اجرا نمی‌شود."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10387,6 +10280,10 @@ msgstr "آغاز %1"
 msgid "Exit"
 msgstr "خروج"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "پیامهای جدید در"
@@ -10411,16 +10308,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet وجود ندارد. اکیداً توصیه می‌شود که برای مدیریت اسم رمزهای خود از "
 "TDEWallet استفاده کنید.\n"
-"هر چند، در عوض KMail می‌تواند اسم رمز را در پروندۀ پیکربندی خود ذخیره کند. اسم "
-"رمز در یک قالب به هم ریخته ذخیره می‌شود، اما در صورتی که امکان دستیابی به "
-"پروندۀ پیکربندی وجود داشته باشد، نباید تصور شود که برای تلاش جهت سرگشایی ایمن "
-"است.\n"
+"هر چند، در عوض KMail می‌تواند اسم رمز را در پروندۀ پیکربندی خود ذخیره کند. "
+"اسم رمز در یک قالب به هم ریخته ذخیره می‌شود، اما در صورتی که امکان دستیابی به "
+"پروندۀ پیکربندی وجود داشته باشد، نباید تصور شود که برای تلاش جهت سرگشایی "
+"ایمن است.\n"
 "می‌خواهید برای حساب »%1« در پروندۀ پیکربندی، اسم رمز ذخیره کنید؟"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10478,8 +10376,7 @@ msgstr "نام دامنه یا نشانی عددی کارساز SMTP."
 #: kmtransport.cpp:406
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
-msgstr ""
-"عدد درگاهی که کارساز SMTP بر اساس آن فهرست می‌شود. درگاه پیش‌فرض ۲۵ است."
+msgstr "عدد درگاهی که کارساز SMTP بر اساس آن فهرست می‌شود. درگاه پیش‌فرض ۲۵ است."
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10490,8 +10387,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"فرمانی جهت اجرا به صورت محلی، پیش از ارسال رایانامه. مثلاً برای برپایی تونلهای "
-"ssh مورد استفاده قرار می‌گیرد. اگر فرمانی نباید اجرا شود، آن را خالی بگذارید."
+"فرمانی جهت اجرا به صورت محلی، پیش از ارسال رایانامه. مثلاً برای برپایی "
+"تونلهای ssh مورد استفاده قرار می‌گیرد. اگر فرمانی نباید اجرا شود، آن را خالی "
+"بگذارید."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10499,11 +10397,12 @@ msgstr "کارساز به احراز هویت &نیاز دارد‌"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"اگر کارساز SMTP شما پیش از پذیرش نامه، به اجازه احتیاج دارد، این گزینه را علامت "
-"بزنید. به عنوان »SMTP احراز هویت‌شده« یا به عبارت ساده‌تر ASMTP شناخته می‌شود."
+"اگر کارساز SMTP شما پیش از پذیرش نامه، به اجازه احتیاج دارد، این گزینه را "
+"علامت بزنید. به عنوان »SMTP احراز هویت‌شده« یا به عبارت ساده‌تر ASMTP شناخته "
+"می‌شود."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10523,15 +10422,13 @@ msgstr "&ارسال نام میزبان سفارشی به کارساز‌"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"این گزینه را علامت بزنید، تا KMail هنگام شناساندن خود به کارساز نامه از یک نام "
-"میزبان سفارشی استفاده کند."
-"<p> این زمانی مفید است که نام میزبان سیستم شما درست تنظیم نشده باشد، یا بخواهید "
-"نام میزبان صحیح سیستم خود را نقاب‌گذاری کنید."
+"این گزینه را علامت بزنید، تا KMail هنگام شناساندن خود به کارساز نامه از یک "
+"نام میزبان سفارشی استفاده کند.<p> این زمانی مفید است که نام میزبان سیستم شما "
+"درست تنظیم نشده باشد، یا بخواهید نام میزبان صحیح سیستم خود را نقاب‌گذاری کنید."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10541,8 +10438,8 @@ msgstr "&نام میزبان:‌"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"نام میزبانی که KMail باید به هنگام شناساندن خود به کارساز استفاده کند را وارد "
-"کنید."
+"نام میزبانی که KMail باید به هنگام شناساندن خود به کارساز استفاده کند را "
+"وارد کنید."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10562,8 +10459,8 @@ msgstr "فقط پرونده‌های محلی مجاز می‌باشند."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "حوزۀ میزبان نباید خالی باشد. لطفاً، نام یا نشانی اینترنتی کارساز SMTP را وارد "
 "کنید."
@@ -10578,10 +10475,10 @@ msgstr "خطا هنگام فهرست کردن پوشۀ %1:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10653,8 +10550,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail نتوانست فهرست نامۀ این پوشه را حذف کند. لطفاً، نشانیها را به طور دستی پر "
-"کنید."
+"KMail نتوانست فهرست نامۀ این پوشه را حذف کند. لطفاً، نشانیها را به طور دستی "
+"پر کنید."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10803,34 +10700,26 @@ msgstr "&ویرایش پیام‌"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ساختاربندی اطلاعات بازگشتی توسط وصلۀ رمز را نمی‌توان درست پردازش کرد؛ ممکن "
-"است وصله آسیب دیده باشد.</p>"
-"<p>لطفاً، با سرپرست سیستم خود تماس بگیرید.</p></qt>"
+"<qt><p>ساختاربندی اطلاعات بازگشتی توسط وصلۀ رمز را نمی‌توان درست پردازش کرد؛ "
+"ممکن است وصله آسیب دیده باشد.</p><p>لطفاً، با سرپرست سیستم خود تماس بگیرید.</"
+"p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>وصلۀ رمز فعالی یافت نشد، و کد OpenPGP پیش‌ساخته با موفقیت اجرا نشد.</p>"
-"<p>برای تغییر این، دو راه دارید:</p>"
-"<ul>"
-"<li><em>یا</em> با استفاده از محاورۀ تنظیمات-<پیکربندی KMail-<وصله، یک وصله "
-"فعال کنید.</li>"
-"<li><em>یا</em> روی تب پیشرفته-<هویت محاورۀ مشابه، تنظیمات OpenPGP سنتی مشخص "
-"کنید.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>وصلۀ رمز فعالی یافت نشد، و کد OpenPGP پیش‌ساخته با موفقیت اجرا نشد.</"
+"p><p>برای تغییر این، دو راه دارید:</p><ul><li><em>یا</em> با استفاده از "
+"محاورۀ تنظیمات-<پیکربندی KMail-<وصله، یک وصله فعال کنید.</li><li><em>یا</em> "
+"روی تب پیشرفته-<هویت محاورۀ مشابه، تنظیمات OpenPGP سنتی مشخص کنید.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10842,8 +10731,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "پشتیبان Chiasmus، تابع »x-encrypt« را پیشنهاد نمی‌کند. لطفاً، این اشکال را "
 "گزارش کنید."
@@ -10862,16 +10751,16 @@ msgstr "خطای رمزبندی Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"مقدار بازگشت غیرمنتظره از پشتیبان Chiasmus: تابع »x-encrypt«، آرایۀ بایت را باز "
-"نمی‌گرداند. لطفاً، این اشکال را گزارش کنید."
+"مقدار بازگشت غیرمنتظره از پشتیبان Chiasmus: تابع »x-encrypt«، آرایۀ بایت را "
+"باز نمی‌گرداند. لطفاً، این اشکال را گزارش کنید."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "قالب پیام رمز OpenPGP درون‌خط، رمزبندی یا امضای پیوستها را پشتیبانی نمی‌کند.\n"
@@ -10944,8 +10833,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "برخی از اجزای این پیام امضا نمی‌شوند.\n"
-"با ارسال پیامهایی که فقط بخشی از آنها امضا شده است، ممکن است سیاست پایگاه نقض "
-"شود.\n"
+"با ارسال پیامهایی که فقط بخشی از آنها امضا شده است، ممکن است سیاست پایگاه "
+"نقض شود.\n"
 "در عوض، کل اجزا امضا شوند؟"
 
 #: messagecomposer.cpp:827
@@ -10984,12 +10873,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"پیامد آزمایش تنظیمات رمزبندی گیرنده این است که از شما سؤال می‌شود، آیا این پیام "
-"رمزبندی شود یا خیر.\n"
+"پیامد آزمایش تنظیمات رمزبندی گیرنده این است که از شما سؤال می‌شود، آیا این "
+"پیام رمزبندی شود یا خیر.\n"
 " این پیام رمزبندی شود؟"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11022,11 +10911,12 @@ msgstr "رمزبندی &نشود‌"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"درخواست کرده‌اید که این پیام رمزبندی شده، و یک رونوشت برای خودتان رمزبندی شود، "
-"اما برای این هویت، کلید رمزبندی معتبری پیکربندی نشده است."
+"درخواست کرده‌اید که این پیام رمزبندی شده، و یک رونوشت برای خودتان رمزبندی "
+"شود، اما برای این هویت، کلید رمزبندی معتبری پیکربندی نشده است."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11035,8 +10925,8 @@ msgstr "رمزبندی‌نشده ارسال شود؟"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "بعضی از اجزای این پیام، رمزبندی نمی‌شوند.\n"
@@ -11052,8 +10942,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "این پیام رمزبندی نمی‌شود.\n"
-"با ارسال پیامهای رمزبندی‌نشده، ممکن است سیاست پایگاه نقض شده و/یا اطلاعات حساس "
-"فاش شوند.\n"
+"با ارسال پیامهای رمزبندی‌نشده، ممکن است سیاست پایگاه نقض شده و/یا اطلاعات "
+"حساس فاش شوند.\n"
 "در عوض، پیامها رمزبندی شوند؟"
 
 #: messagecomposer.cpp:955
@@ -11064,51 +10954,45 @@ msgstr "&رمزبندی همۀ اجزا‌"
 msgid "Unencrypted Message Warning"
 msgstr "اخطار پیام رمزبندی‌نشده"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>خطا: پایانۀ پشتیبانی، هر دادۀ کدبندی‌شده‌ای را باز نگرداند.</p>"
-"<p>لطفاً، این اشکال را گزارش کنید:"
-"<br>%2</p></qt>"
+"<qt><p>خطا: پایانۀ پشتیبانی، هر دادۀ کدبندی‌شده‌ای را باز نگرداند.</p><p>لطفاً، "
+"این اشکال را گزارش کنید:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>همۀ نویسه‌ها مناسب کدبندی انتخاب‌شده نیستند."
-"<br>"
-"<br>در هر صورت، پیام ارسال شود؟</qt>"
+"<qt>همۀ نویسه‌ها مناسب کدبندی انتخاب‌شده نیستند.<br><br>در هر صورت، پیام ارسال "
+"شود؟</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "برخی نویسه‌ها از دست می‌روند"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "از دست رفتن نویسه‌ها"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "تغییر کدبندی"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "این پیام را نمی‌توان امضا کرد، زیرا به نظر نمی‌رسد که پایانۀ پشتیبانی "
 "انتخاب‌شده، امضا را پشتیبانی کند؛ در واقع، این هرگز نباید رخ دهد، لطفاً، این "
 "اشکال را گزارش کنید."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11117,35 +11001,35 @@ msgstr ""
 "انتخاب‌شده، امضا را پشتیبانی کند؛ در واقع، این هرگز نباید رخ دهد، لطفاً، این "
 "اشکال را گزارش کنید."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
-msgstr ""
-"خرابی در عملیات امضا. لطفاً، مطمئن شوید که برنامۀ gpg-agent اجرا می‌شود."
+msgstr "خرابی در عملیات امضا. لطفاً، مطمئن شوید که برنامۀ gpg-agent اجرا می‌شود."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "این پیام را نمی‌توان رمزبندی کرد، زیرا به نظر نمی‌رسد که پایانۀ پشتیبانی "
 "انتخاب‌شده، رمزبندی را پشتیبانی کند؛ در واقع این هرگز نباید رخ دهد، لطفاً، این "
 "اشکال را گزارش کنید."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "این پیام را نمی‌توان امضا یا رمزبندی کرد، زیرا به نظر نمی‌رسد که پشتیبان "
 "انتخاب‌شده، امضا و رمزبندی توأم را پشتیبانی کند؛ در واقع هرگز نباید رخ دهد، "
@@ -11170,15 +11054,15 @@ msgstr "&قالب نامه‌دان:‌"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"انتخاب کنید که آیا می‌خواهید پیامها را به عنوان یک پرونده برای هر پیام "
-")maildir( یا به عنوان یک پروندۀ بزرگ )mbox(، در این پوشه ذخیره کنید. KMail از "
-"maildir  به عنوان پیش‌فرض استفاده می‌کند و فقط باید در شرایط استثنایی تغییر "
-"کند. اگر مطمئن نیستید، این گزینه را همان‌طور که هست رها کنید."
+"انتخاب کنید که آیا می‌خواهید پیامها را به عنوان یک پرونده برای هر "
+"پیام )maildir( یا به عنوان یک پروندۀ بزرگ )mbox(، در این پوشه ذخیره کنید. "
+"KMail از maildir  به عنوان پیش‌فرض استفاده می‌کند و فقط باید در شرایط استثنایی "
+"تغییر کند. اگر مطمئن نیستید، این گزینه را همان‌طور که هست رها کنید."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11187,8 +11071,8 @@ msgstr "&محتویات پوشه:‌"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "انتخاب کنید که آیا می‌خواهید پوشۀ جدیدی داشته باشید، که برای ذخیرۀ نامه جهت "
 "ذخیرۀ فقره‌های گروه‌افزار، مانند تکالیف یا یادداشتها استفاده شود. پیش‌فرض، نامه "
@@ -11230,8 +11114,7 @@ msgstr "نتایج متفاوت برای امضاها"
 msgid "The crypto engine returned no cleartext data."
 msgstr "موتور رمز، بدون دادۀ cleartext شد."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "وضعیت:"
 
@@ -11260,8 +11143,8 @@ msgstr "وصلۀ %1 یافت نشد."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "پیام امضا نشده است، اما اعتبار امضا را نمی‌توان وارسی کرد. <br />دلیل: %1"
 
@@ -11299,27 +11182,26 @@ msgstr "وصلۀ رمز »%1« نمی‌تواند پیامها را سرگشا�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>نکته:</b> ممکن است که این پیام زنگام، مراجع خارجی مربوط به تصاویر و غیره "
 "داشته باشد. به دلایل امنیتی/محرمانه، مراجع خارجی بار نمی‌شوند. اگر به "
-"ارسال‌کنندۀ این پیام اعتماد دارید،<a href=\"kmail:loadExternal\">"
-"با فشار اینجا</a> می‌توانید مراجع خارجی را برای این پیام بار کنید."
+"ارسال‌کنندۀ این پیام اعتماد دارید،<a href=\"kmail:loadExternal\">با فشار "
+"اینجا</a> می‌توانید مراجع خارجی را برای این پیام بار کنید."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>نکته:</b> این پیام زنگام است. به دلایل امنیتی، فقط کد خام زنگام نشان داده "
-"می‌شود. اگر به ارسال‌کنندۀ این پیام اعتماد دارید،<a href=\"kmail:showHTML\">"
-"با فشار اینجا</a> می‌توانید نمایش قالب‌بندی‌شدۀ زنگام را برای این پیام فعال "
-"کنید."
+"می‌شود. اگر به ارسال‌کنندۀ این پیام اعتماد دارید،<a href=\"kmail:showHTML\">با "
+"فشار اینجا</a> می‌توانید نمایش قالب‌بندی‌شدۀ زنگام را برای این پیام فعال کنید."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11567,8 +11449,8 @@ msgstr "ذخیره‌شده:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "نشانی نامه‌ای در %1 استفاده‌شده برای امضا، ذخیره نمی‌شود. بنابراین، نمی‌توانیم "
 "آن را با نشانی فرستندۀ %2 مقایسه کنیم."
@@ -11686,13 +11568,15 @@ msgstr "پیام خطای Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"کارساز POP3 شما  )حساب: %1(، فرمان UIDLرا پشتیبانی نمی‌کند: لازم است این فرمان "
-"به صورت منطقی تعیین کند که کدام نامه‌های روی کارساز KMail، قبلاً دیده شده‌اند؛\n"
+"کارساز POP3 شما  )حساب: %1(، فرمان UIDLرا پشتیبانی نمی‌کند: لازم است این "
+"فرمان به صورت منطقی تعیین کند که کدام نامه‌های روی کارساز KMail، قبلاً دیده "
+"شده‌اند؛\n"
 "بنابراین، ویژگی رها کردن نامه‌ها روی کارساز، درست کار نمی‌کند."
 
 #: popaccount.cpp:752
@@ -11709,7 +11593,8 @@ msgstr "%n پیام واکشی‌شده از %1. پایان دادن به انت
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "واکشی پیام %1 از %2 )%3 از %4 کیلوبایت( برای %5@%6 )%7 روی کارساز باقی مانده "
 "است(."
@@ -11728,1857 +11613,15 @@ msgstr "پاسخ نامعتبر از کارساز"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "کارساز شما، فرمان TOP را پشتیبانی نمی‌کند. بنابراین، سرآیندهای رایانامه‌های "
 "بلند را نمی‌توان، ابتدا پیش از بارگیری آنها واکشی کرد."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&برو‌"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&پوشه‌"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&پیام‌"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "پاسخ ویژه"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&پیش‌سو‌"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "میله ابزار زنگام"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "امضا"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "امضای &خودکار پیامها‌"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"در صورت فعال بودن این گزینه، همۀ پیامهایی که ارسال می‌کنید، به صورت پیش‌فرض "
-"امضا می‌شوند؛ البته، ممکن است امضای مجزای هر پیام غیرفعال باشد."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "رمزبندی"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"در صورت فعال بودن این گزینه، پیام/پرونده، نه تنها با کلید عمومی گیرنده، بلکه با "
-"کلید شما رمزبندی می‌شود. می‌توانید پیام/پرونده را بعداً سرگشایی کنید. معمولاً، "
-"ایدۀ خوبی است."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "نمایش متن &امضاشده/رمزبندی‌شده پس از تألیف‌"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"در صورت فعال بودن این گزینه، متن امضاشده/رمزبندی‌شده در یک پنجرۀ مجزا نشان داده "
-"می‌شود، و شما می‌توانید ببینید که پیش از ارسال چگونه است. زمانی مفید است که "
-"می‌خواهید وارسی کنید که آیا سیستم رمزبندی کار می‌کند یا خیر."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "ذخیرۀ پیامهای &رمزبندی‌شدۀ ارسالی‌"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "علامت زدن جهت ذخیرۀ پیامهای رمزبندی‌شده"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ذخیرۀ پیامهای رمزبندی‌شده</h1>\n"
-"هنگامی که این جعبه علامت زده می‌شود، پیامهای ارسالی، همان‌طور که ارسال شده‌اند "
-"به صورت رمزبندی‌شده ذخیره می‌شوند. این کار توصیه نمی‌شود، چرا که اگر گواهی‌نامۀ "
-"ضروری انقضا یابد، پیامها را دیگر نمی‌توانید بخوانید.\n"
-"<p>\n"
-"هر چند، ممکن است به علت وجود قواعد محلی ناچار باشید که این گزینه را روشن کنید. "
-"اگر شک دارید، با سرپرست محلی خود بررسی کنید.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "نمایش همیشگی کلیدهای رمزبندی &برای تصویب‌"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"در صورت فعال بودن این گزینه، همیشه کاربرد، فهرستی از کلیدهای عمومی را به شما "
-"نشان می‌دهد، که می‌توانید از میان آنها کلیدی که برای رمزبندی استفاده می‌شود را "
-"برگزینید. اگر خاموش باشد، اگر کاربرد نتواند کلید درست را بیابد، یا اگر چندین "
-"کلید مورد استفاده وجود داشته باشد، فقط محاوره را نشان می‌دهد."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "رمزبندی &پیامها به طور خودکار، در صورت امکان‌"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"هنگامی که این گزینه فعال است، هر پیامی که ارسال می‌کنید، در هر جایی که ممکن "
-"باشد و بخواهد رمزبندی می‌شود؛ البته، هنوز می‌توان رمزبندی خودکار را برای هر "
-"پیام به طور مجزا غیرفعال کرد."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "هنگام &ذخیره به عنوان پیش‌نویس، هرگز امضا/رمزبندی نکنید‌"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "این چطور کار می‌کند؟"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "به: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "ر.ن: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "عمومی"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "پاسخ"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "پاسخ به همه"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "پیش‌سو"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&میان‌بر:‌"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "نوع &قالب:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "ویژگیهای پوشه"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "پوشه، یک فهرست &نامه دارد‌"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "فهرست کردن &نشانی:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&عادی:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&خوانده‌نشده‌:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "انقضای پیام"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&انقضا پس از:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "انقضای پیامهای &خوانده‌شده‌"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "انقضا &پس از:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "انقضای پیامهای &خوانده‌نشده‌"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "روز"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "هفته"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "ماه"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "پیشرفته"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&هویت ارسال‌کننده:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "قالب &ذخیره:‌"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&فهرست نمایش می‌دهد:‌"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "اعتبارسنجی گواهی‌نامه‌ها با استفاده از CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"اگر این گزینه انتخاب شود، گواهی‌نامه‌های S/مایم با استفاده از فهرستهای فسخ "
-"گواهی‌نامه )CRLs( اعتبارسنجی می‌شوند."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "اعتبارسنجی گواهی‌نامه‌های برخط )OCSP("
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"اگر این گزینه انتخاب شود، گواهی‌نامه‌های S/مایم با استفاده از قرارداد وضعیت "
-"گواهی‌نامه‌های برخط )OCSP(، به صورت برخط اعتبارسنجی می‌شوند. نشانی وب پاسخگوی "
-"OCSP زیر را پر کنید."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "اعتبارسنجی گواهی‌نامۀ برخط"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "نشانی وب پاسخگوی OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"در اینجا، نشانی کارساز را برای اعتبارسنجی برخط گواهی‌نامه‌ها )پاسخگوی OCSP( را "
-"وارد کنید. نشانی وب معمولاً با http:// آغاز می‌شود."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "امضای پاسخگوی OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "نادیده گرفتن نشانی وب خدمت گواهی‌نامه‌ها"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "عدم بررسی سیاستهای گواهی‌نامه"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"به صورت پیش‌فرض، GnuPG از file ~/.gnupg/policies.txt برای بررسی این که آیا "
-"سیاست گواهی‌نامه مجاز می‌باشد، استفاده می‌کند. اگر این گزینه انتخاب شود، "
-"سیاستها بررسی نمی‌شوند."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "هرگز به CRL مراجعه نکنید"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"اگر این گزینه علامت زده شود، هرگز از فهرستهای فسخ گواهی‌نامه برای اعتبارسنجی "
-"گواهی‌نامه‌های  S/مایم استفاده نمی‌شود."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "واکشی گواهی‌نامه‌های از دست رفتۀ ناشر"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"اگر این گزینه علامت زده شود، گواهی‌نامه‌های از دست رفتۀ ناشر، در صورت لزوم "
-"واکشی می‌شوند )هم برای روشهای اعتبارسنجی و هم  CRLها و OCSP اعمال می‌شود("
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "درخواستهای قام"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr " هرگونه درخواست قام‌ انجام نشود"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "استفاده از قام برای S/مایم را غیرفعال می‌کند."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "استفاده از این پیشکار برای درخواستهای قام:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "استفاده از پیشکار قام سیستم:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"اگر این گزینه انتخاب شود، مقدار پیشکار قام نشان داده شده در سمت راست )که از "
-"محیط متغیر http_proxy می‌آید(، برای هر درخواست قام استفاده می‌شود."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"در اینجا، محل پیشکار قام خود که برای همۀ درخواستهای قام مربوط به S/مایم استفاده "
-"می‌شود را وارد کنید. نحو، میزبان:درگاه است، مثلاً،  myproxy.nowhere.com:۳۱۲۸."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "نادیده گرفتن نقطۀ توزیع قام CRL گواهی‌نامه‌ها"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"هنگام جستجوی محل CRL، گواهی‌نامه‌ای که باید آزمایش شود، معمولاً حاوی مدخلهای "
-"»نقطۀ توزیع CRL« )DP( می‌باشد، که نشانیهای وبی است که روش دستیابی به نشانی وب "
-"را توصیف می‌کنند. اولین مدخل DP که یافت شود، استفاده می‌شود. با این گزینه، "
-"هنگام جستجو برای یک DP  مناسب، همۀ مدخلهایی که از طرحوارۀ قام استفاده می‌کنند "
-"نادیده گرفته می‌شوند."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "درخواستهای LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr " هرگونه درخواست LDAP انجام نشود"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "استفاده از LDAP برای S/مایم را به طور کامل غیرفعال می‌کند."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "نادیده گرفتن نقطۀ توزیع LDAP CRL گواهی‌نامه‌ها"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"هنگام جستجوی محل CRL، گواهی‌نامه‌ای که باید آزمایش شود، معمولاً حاوی مدخلهای "
-"»نقطۀ توزیع CRL« )DP( می‌باشد، که نشانیهای وبی است که روش دستیابی به نشانی وب "
-"را توصیف می‌کنند. اولین مدخل DP که یافت شود، استفاده می‌شود. با این گزینه، "
-"هنگام جستجو برای یک DP مناسب، همۀ مدخلهایی که از طرحوارۀ LDAP استفاده می‌کنند "
-"نادیده گرفته می‌شوند."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "میزبان اولیه برای درخواستهای LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"با وارد کردن یک کارساز LDAP در اینجا، همۀ درخواستهای LDAP ابتدا به آن کارساز "
-"می‌روند. خلاصه این که این تنظیم، هر میزبان مشخص و بخش درگاه در نشانی وب LDAP را "
-" لغو می‌کند، و اگر میزبان و درگاه از نشانی وب حذف شوند هم استفاده می‌شود. "
-"کارسازهای LDAP دیگر، فقط در صورتی استفاده می‌شوند که اتصال به »پیشکار« خراب "
-"شود.\n"
-"نحو، »میزبان« یا »میزبان:درگاه« است. اگر درگاه حذف شود، درگاه ۳۸۹ )درگاه LDAP "
-"استاندارد( استفاده می‌شود."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&افزودن...‌"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&گروه‌افزار‌"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "بازنشانی تنظیمات قلم"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "نامحدود"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "پیکربندی امضا"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "پاسخ به ارسال‌کننده"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "پاسخ به همه/ پاسخ به فهرست"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "پیش‌سو کردن پیام"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "اخطار، هنگام سعی برای ارسال پیامهای &بدون امضا‌"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "علامت بزنید تا هنگام ارسال پیامهای بدون امضا، اخطار داده شود."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار هنگام سعی برای ارسال پیامهای بدون امضا</h1>\n"
-"اگر این جعبه علامت داشته باشد، هنگامی که می‌خواهید تمام یا بخشی از پیام بدون "
-"امضا را ارسال کنید، اخطار داده می‌شود.\n"
-" "
-"<p>\n"
-"توصیه می‌شود که برای انسجام بیشینه، این گزینه را روشن بگذارید.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&اخطار، هنگام تلاش برای ارسال پیامهای رمزبندی‌نشده‌"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "علامت زدن جهت اخطار، به هنگام ارسال پیامهای رمزبندی‌نشده."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار، هنگام تلاش برای ارسال پیامهای رمزبندی‌نشده</h1>\n"
-"اگر این جعبه علامت زده شود، هنگامی که تلاش می‌کنید کل یا بخشهایی از پیام بدون "
-"رمزبندی را ارسال کنید، به شما اخطار داده می‌شود.\n"
-" "
-"<p>\n"
-"توصیه می‌شود که برای انسجام بیشینه، این گزینه را روشن بگذارید.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "اخطار، در صورتی که نشانی رایانامه‌ای &گیرنده در گواهی‌نامه نباشد‌"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "علامت زدن جهت دادن اخطار، در صورتی که نشانی در گواهی‌نامه نباشد"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار، در صورتی که نشانی رایانامه‌ای گیرنده در گواهی‌نامه نباشد</h1>\n"
-"اگر این گزینه علامت زده شود، اگر نشانی رایانامه‌ای گیرنده در گواهی‌نامه‌ای که "
-"برای رمزبندی استفاده می‌شود وجود نداشته باشد، یک اخطار انتشار می‌یابد.\n"
-"<p>\n"
-"توصیه می‌شود که برای امنیت بیشینه، این گزینه را روشن بگذارید.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"اخطار، در صورتی که گواهی‌نامه‌ها/کلیدها به زودی منقضی شوند )پیکربندی آستانه در "
-"زیر("
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "برای امضا"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "برای رمزبندی"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " روز"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "در اینجا، تعداد روزها را برگزینید"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار، در صورتی که گواهی‌نامۀ امضا انقضا یابد </h1>\n"
-"تعداد کمینۀ روزهایی که گواهی‌نامۀ امضا باید بدون انتشار اخطار، اعتبار داشته "
-"باشد را برگزینید.\n"
-"<p>\n"
-"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار، در صورت انقضای گواهی‌نامۀ رمزبندی</h1>\n"
-"تعداد کمینۀ روزهایی که گواهی‌نامۀ رمزبندی باید در آن بدون انتشار اخطار معتبر "
-"باشد.\n"
-"<p>\n"
-"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار، در صورت انقضای گواهی‌نامۀ درون زنجیر</h1>\n"
-"تعداد کمینۀ روزهایی که همۀ گواهی‌نامه‌های درون زنجیر باید بدون انتشار اخطار "
-"اعتبار داشته باشند را برگزینید.\n"
-"<p>\n"
-"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار، در صورتی که گواهی‌نامۀ CA انقضا یابد </h1>\n"
-"تعداد کمینۀ روزهایی که گواهی‌نامۀ CA باید بدون انتشار اخطار، اعتبار داشته باشد "
-"را برگزینید.\n"
-"<p>\n"
-"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>اخطار، در صورتی که گواهی‌نامۀ کاربر ارشد انقضا یابد</h1>\n"
-"تعداد کمینۀ روزهایی که گواهی‌نامۀ کاربر ارشد باید بدون انتشار اخطار، اعتبار "
-"داشته باشد را برگزینید.\n"
-"<p>\n"
-"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "برای گواهی‌نامه‌های کاربر ارشد:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "برای گواهی‌نامه‌های CA متوسط:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "برای کلیدها/گواهی‌نامه‌های کاربر:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "فعال‌سازی مجدد همۀ اخطارهای »دوباره نپرس«"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "محتوای قالب"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "میان‌بر قالب"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "نوع قالب"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "ارسال نامۀ صف‌شده در بررسی نامه"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>انتخاب کنید که آیا می‌خواهید KMail، همۀ پیامهای ارسالی یا همۀ بررسیهای نامه "
-"را به صورت دستی ارسال کند، یا اصلاً نمی‌خواهید که پیامها به طور خودکار ارسال "
-"شوند. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>در این پوشه )%1(، پیامهای جدیدی وجود دارد که هنوز در کارساز بارگذاری "
-"نشده‌اند، اما به نظر نمی‌رسد که بتوانید آنها را هم اکنون بارگذاری کنید. لطفاً، "
-"با سرپرست خود تماس بگیرید تا اجازه دهد که پیامهای جدید برایتان بارگذاری شوند، "
-"یا آنها را به خارج از این پوشه حرکت دهد.</p> "
-"<p>می‌خواهید همین حالا این پیامها را به پوشۀ دیگر حرکت دهید؟</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "جدیدترین پوشۀ برگزیده در محاورۀ گزینش پوشه."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "سیاست نمایش شمایل سینی سیستم"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "اخطارنامۀ جدید دراز"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"اگر این گزینه فعال باشد، برای هر پوشه، تعداد پیامهایی که جدیداً رسیده‌اند در "
-"اخطارنامۀ جدید نشان داده می‌شود؛ در غیر این صورت، فقط یک پیام »نامۀ جدید رسید« "
-"دریافت می‌کنید."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "مشخص کردن &ویرایشگر:‌"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "استفاده از ویرایشگر &خارجی به جای مؤلف‌"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "فعال‌سازی کارکرد گروه‌افزار"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "ناقص از:/به: سرآیندها در پاسخها به پاسخها"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"میکروسافت آوت‌لوک، در پیاده‌سازی استاندارد iCalendar تعدادی نقص دارد؛ این گزینه "
-"پیرامون یکی از آنها کار می‌کند. اگر با کاربران آوت‌لوک مسائلی دارید که "
-"نمی‌توانید پاسخهای خود را بگیرید، سعی کنید که این گزینه را تنظیم کنید."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "ارسال دعوت‌نامه‌های گروه‌افزار در بدنۀ نامه"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"میکروسافت آوت‌لوک، در پیاده‌سازی استاندارد iCalendar تعدادی نقص دارد؛ این گزینه "
-"پیرامون یکی از آنها کار می‌کند. اگر با کاربران آوت‌لوک مسائلی دارید که "
-"نمی‌توانید دعوت‌نامه‌های خود را بگیرید، سعی کنید که این گزینه را تنظیم کنید."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "ارسال دعوت‌نامه به طور خودکار"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"وقتی علامت زده می‌شود، پنجرۀ مؤلف نامه را نمی‌بینید. در عوض، همۀ نامه‌های "
-"دعوت‌نامه به طور خودکار ارسال می‌شوند. اگر می‌خواهید نامه را پیش از ارسال آن "
-"ببینید، می‌توانید این گزینه را بی‌علامت کنید. هر چند، آگاه باشید که متن در "
-"پنجرۀ مؤلف در نحو  iCalendar می‌باشد، نباید سعی کنید که آن را با دست تغییر "
-"دهید."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>با فعال‌سازی این، می‌توان مدخلها را از کاربردهای Kontact (KOrganizer، "
-"KAddressBook، و KNotes.) ذخیره کرد</p>"
-"<p>اگر می‌خواهید این گزینه را تنظیم کنید، باید کاربردهای استفاده از منبع IMAP "
-"را هم تنظیم کنید؛ این کار در مرکز کنترل TDE انجام می‌شود.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>معمولاً، برای دیدن پوشه‌هایی که منابع IMAP را نگه می‌دارند، دلیلی ندارید. "
-"اما اگر می‌خواهید آنها را ببینید، می‌توانید آن را در اینجا تنظیم کنید.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>انتخاب قالب ذخیرۀ پوشه‌های گروه‌افزار. "
-"<ul>"
-"<li>قالب پیش‌فرض این است که استانداردهای ical )برای پوشه‌های تقویم( و vcard "
-")برای پوشه‌های کتاب نشانی( استفاده می‌شود. این قالب، همۀ ویژگیهای Kontact را "
-"موجود می‌سازد.</li>"
-"<li>قالب اکس ام ال Kolab، از مدل سفارشی استفاده می‌کند، که با مدلی که در "
-"آوت‌لوک استفاده می‌شود تطابق بیشتری دارد. این قالب، در هنگام استفاده از یک "
-"کارساز Kolab یا یک راه حل همساز، با آوت‌لوک همسازی بیشتری دارد.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>پدر پوشه‌های منبع IMAP را انتخاب می‌کند.</p>"
-"<p>به صورت پیش‌فرض، کارساز Kolab دریافتی IMAP را به گونه‌ای تنظیم می‌کند که پدر "
-"باشد.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>این، شناسۀ حساب است که پوشه‌های منبع IMAP را دربر می‌گیرد.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>اگر می‌خواهید نامهای پوشۀ ذخیره‌گاه IMAP را به زبان محلی خود تنظیم کنید، "
-"می‌توانید از بین این زبانهای موجود انتخاب کنید.</p>"
-"<p>لطفاً، توجه داشته باشید که تنها دلیل این کار، همسازی با میکروسافت آوت‌لوک "
-"می‌باشد. زیاد مناسب نیست که این تنظیم شود، زیرا تغییر زبانها را غیرممکن "
-"می‌سازد. </p>"
-"<p>بنابراین، تا مجبور نیستید، این را تنظیم نکنید.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"این مقدار برای تصمیم‌گیری در این مورد به کار می‌رود، که آیا مقدمۀ KMail باید "
-"نمایش داده شود."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "تعداد بیشینۀ تماسهای هر میزبان"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"این، برای محدود نمودن تعداد تماسهای هر میزبان به هنگام بررسی نامۀ جدید، قابل "
-"استفاده می‌باشد. تعداد تماسها به صورت پیش‌فرض نامحدود )۰( می‌باشد."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "نمایش ویرایش خط جستجوی سریع"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"این گزینه، ویرایش خط جستجو در بالای فهرست پیام، که برای جستجوی سریع اطلاعات "
-"نشان داده‌شده در فهرست پیام استفاده می‌شود را فعال یا غیرفعال می‌کند."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "حفظ نویسه‌گان اصلی هنگام پاسخ یا پیش‌سو در صورت امکان"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "پیوست امضا &به طور خودکار‌"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"این هویت را به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده هم استفاده شود.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"این پوشه را برای ارسال فقره‌ها به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده هم "
-"استفاده می‌شود."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"این انتقال نامه را به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده هم استفاده "
-"می‌شود."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"این هویت را به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده هم استفاده شود.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&سطربندی واژه در ستون:‌"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "اخطار، در صورت انقضای گواهی‌نامۀ کاربر ارشد در &کمتر از:‌"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"این گزینه را روشن کنید تا Outlook &#8482؛ نامهای پیوست حاوی نویسه‌های غیر "
-"انگلیسی را درک کند"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "درخواست خودکار اخطارهای وضع &پیام‌"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>اگر می‌خواهید KMail اخطارهای وضع پیام )MDNها( را برای هر کدام از پیامهای "
-"خروجی شما درخواست کند، این گزینه را فعال کنید.</p>"
-"<p>این گزینه، فقط بر پیش‌فرض تأثیر دارد؛ هنوز می‌توانید درخواست MDN بر اساس هر "
-"پیام در مؤلف، فقرۀ گزینگان <em>گزینگان</em>-<<em>درخواست اخطار وضع</em> "
-"را فعال یا غیرفعال کنید.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "استفاده از نشانیهای اخیر برای تکمیل خودکار"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"اگر نمی‌خواهید نشانیهایی که اخیراً استفاده شده‌اند، در فهرست تکمیل خودکار در "
-"حوزه‌های نشانی مؤلف ظاهر شوند، این گزینه را غیرفعال کنید."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "فاصلۀ ذخیرۀ خودکار:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"یک رونوشت پشتیبان از متن در پنجرۀ مؤلف را می‌توان به صورت مرتب ایجاد کرد. "
-"فاصله‌ای که برای ایجاد پشتیبان استفاده می‌شوند، در اینجا تنظیم می‌شود. با تنظیم "
-"مقدار ۰ برای این، می‌توانید ذخیرۀ خودکار را غیرفعال کنید."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "جایگزینی &پیشوند شناخته‌شده با »Re:«‌"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "جایگزینی پیشوند شناخته‌شده با »&Fwd:«‌"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "استفاده از &نقل قول هوشمند‌"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "امضا انقضا یافت."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "نوع گزینندۀ گیرنده"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"نوع محاوره را برای گزینش گیرنده‌ها برای به،\n"
-"        ر.ن و ر.ن.م تنظیم می‌کند."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "نوع ویرایشگر گیرنده‌ها"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"نوع ویرایشگر گیرنده‌ها را برای ویرایش به،\n"
-"        ر.ن و ر.ن.م تنظیم می‌کند."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "تعداد بیشینۀ خطوط ویرایشگر گیرنده."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "حفظ نویسه‌گان اصلی هنگام پاسخ یا پیش‌سو در صورت امکان"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"برخی از رایانامه‌ها، خصوصاً آنهایی که به طور خودکار ایجاد شده‌اند، کدبندی نویسه "
-"که لازم است به طور کامل نمایش داده شوند را مشخص نمی‌کنند. در این موارد، از یک "
-"کدبندی نویسۀ اصلاح حالت عمل استفاده می‌شود، که می‌توانید در اینجا پیکربندی "
-"کنید. برای کدبندی نویسه‌ای که اغلب در بخشی از جهان که شما هستید استفاده می‌شود، "
-"این را تنظیم کنید. به عنوان پیش‌فرض، کدبندی پیکربندی‌شده برای کل سیستم استفاده "
-"می‌شود."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"با تغییر این از »خودکار« پیش‌فرض آن، ناگزیر به استفاده از رمزبندی مشخص‌شده برای "
-"همۀ رایانامه‌ها، صرف‌نظر از‌ این که چه چیز را مشخص می‌کنند، می‌باشید."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"اگر می‌خواهید لبخندکهای شبیه :-( که در متن پیام ظاهر می‌شوند، با احساس‌نماها "
-")تصاویر کوچک( جایگزین شوند، این را فعال کنید."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"برای نمایش سطوح مختلف متن نقل قول‌شده، این گزینه را فعال سازید. برای مخفی کردن "
-"سطوح نقل قول‌شده، غیرفعال کنید."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "سطح فشرده‌سازی خودکار:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "کاهش اندازۀ قلم برای متن نقل قول‌شده"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "برای نمایش متن نقل قول‌شده با یک قلم کوچک‌تر، این گزینه را فعال سازید."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "ذخیرۀ پیامهای &رمزبندی‌شدۀ ارسالی‌"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "نمایش وضعیت &هرزنامه در سرآیندهای تزئینی‌"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "ارسال اخطارهای وضع پیام با یک ارسال‌کنندۀ خالی."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"ارسال اخطارهای وضع پیام با یک رشتۀ ارسال‌کنندۀ خالی. ممکن است برخی کارسازها "
-"پیکربندی شوند تا چنین پیامهایی را رد کنند، پس اگر با مسائل ارسال  MDNها مواجه "
-"هستید، این گزینه را علامت نزنید."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "عبارتها به قالبها تبدیل شده است"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "عبارتهای قدیمی به قالبها تبدیل شده است"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "قالب پیام برای پیام جدید"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "قالب پیام برای پاسخ"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "قالب پیام برای پاسخ به همه"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "قالب پیام برای پیش‌سو کردن"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "نویسه‌های نقل قول"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 از %2 %3 مورد استفاده"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13684,6 +11727,11 @@ msgstr "افزودن به عنوان ر.ن"
 msgid "Add as BCC"
 msgstr "افزودن به عنوان ر.ن.م"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&لغو‌"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13699,10 +11747,10 @@ msgstr "گیرنده‌های برگزیده"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "%n گیرنده برگزیدید. تعداد بیشینۀ گیرنده‌های پشتیبانی شده، %1 است. لطفاً، گزینش "
 "را سازگار کنید."
@@ -13721,8 +11769,8 @@ msgstr "استفاده از محاورۀ گزینش نشانی"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "این دکمه، محاورۀ جدایی باز می‌کند که می‌توانید گیرنده‌های خارج از همۀ نشانیهای "
 "موجود را در آن برگزینید."
@@ -13827,10 +11875,19 @@ msgstr "بیشتر یا مساوی است با"
 msgid " bytes"
 msgstr " بایت"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " روز"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "برای اجرای جستجوی خود، همۀ پیامهای پوشۀ %1 باید از کارساز بارگیری شوند. ممکن "
 "است کمی زمان ببرد. می‌خواهید به جستجو ادامه بدهید؟"
@@ -13971,14 +12028,11 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"جمع‌آوری داده برای حساب »%1«...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "جمع‌آوری داده برای حساب »%1«...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13998,10 +12052,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"محتوای دست‌نوشتۀ »%1«:\n"
+msgid "Contents of script '%1':\n"
+msgstr "محتوای دست‌نوشتۀ »%1«:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14020,20 +12072,16 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"قابلیتهای غربالی:\n"
+msgid "Sieve capabilities:\n"
+msgstr "قابلیتهای غربالی:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr ")قابلیت ویژه‌ای وجود ندارد("
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"دست‌نوشته‌های غربالی موجود:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "دست‌نوشته‌های غربالی موجود:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14111,8 +12159,8 @@ msgstr "برای وارد کردن امضای ایستای اختیاری، از
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "برای مشخص کردن پروندۀ متنی که حاوی امضای شماست، از این درخواست‌کننده استفاده "
 "کنید. هر بار که نامه‌ای جدید ایجاد می‌کنید یا امضای جدیدی پیوست می‌کنید، خوانده "
@@ -14132,22 +12180,27 @@ msgstr "پروندۀ مشخص‌شده را در یک ویرایشگر متن ب
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "در اینجا می‌توانید فرمانی اختیاری را، با یا بدون مسیر، وابسته به این که آیا "
-"فرمان در مسیر شما هست یا خیر اضافه کنید. برای هر نامۀ جدید، KMail فرمان را اجرا "
-"می‌کند و از خروجی آن )به خروجی استاندارد( به عنوان یک امضا استفاده می‌نماید. "
-"فرمانهای معمول برای استفاده با این سازوکار، »fortune« یا »ksig -random« "
-"می‌باشند."
+"فرمان در مسیر شما هست یا خیر اضافه کنید. برای هر نامۀ جدید، KMail فرمان را "
+"اجرا می‌کند و از خروجی آن )به خروجی استاندارد( به عنوان یک امضا استفاده "
+"می‌نماید. فرمانهای معمول برای استفاده با این سازوکار، »fortune« یا »ksig -"
+"random« می‌باشند."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&مشخص کردن فرمان:‌"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "مسیر"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "مدخل جدید:"
@@ -14184,6 +12237,11 @@ msgstr "افزودن حساب"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>واقعاً می‌خواهید هویت با نام <b>%1</b> را حذف کنید؟</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "اعمال &به:‌"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14198,6 +12256,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "ویرایش دست‌نوشته..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14237,9 +12299,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14276,6 +12338,16 @@ msgstr "فعال نشود"
 msgid "Cannot insert content from file %1: %2"
 msgstr "محتوا را از پروندۀ %1 نمی‌توان درج کرد: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "به: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "ر.ن: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14305,59 +12377,51 @@ msgstr "فرمان لوله را از قالب نمی‌توان آغاز کرد
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>هنگامی که پیامها یا پاسخهای جدید تألیف می‌کنید، یا هنگامی که پیامها را "
-"پیش‌سو می‌کنید؛ می‌توانید قالب پیامهای مورد استفاده را در اینجا ایجاد کنید.</p> "
-"<p>قالب پیامها از فرمانهای جانشینی با تحریر سادۀ آنها یا با برگزیدن آنها از "
-"گزینگان <i>درج فرمان </i> پشتیبانی می‌کند.</p>"
-"<p> قالبهایی که در اینجا مشخص شده‌اند، مخصوص پوشه هستند. اگر مشخص شوند، هم "
-"قالبهای سراسری و هم قالبهای هر هویت را باطل می‌کنند.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>هنگامی که پیامها یا پاسخهای جدید تألیف می‌کنید، یا هنگامی که پیامها "
+"را پیش‌سو می‌کنید؛ می‌توانید قالب پیامهای مورد استفاده را در اینجا ایجاد کنید.</"
+"p> <p>قالب پیامها از فرمانهای جانشینی با تحریر سادۀ آنها یا با برگزیدن آنها "
+"از گزینگان <i>درج فرمان </i> پشتیبانی می‌کند.</p><p> قالبهایی که در اینجا "
+"مشخص شده‌اند، مخصوص پوشه هستند. اگر مشخص شوند، هم قالبهای سراسری و هم قالبهای "
+"هر هویت را باطل می‌کنند.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>هنگامی که پیامها یا پاسخهای جدید تألیف می‌کنید، یا هنگامی که پیامها را "
-"پیش‌سو می‌کنید؛ می‌توانید قالب پیامهای مورد استفاده را در اینجا ایجاد کنید.</p> "
-"<p>قالب پیامها از فرمانهای جانشینی با تحریر سادۀ آنها یا با برگزیدن آنها از "
-"گزینگان <i>درج فرمان </i> پشتیبانی می‌کند.</p>"
-"<p> قالبهایی که در اینجا مشخص شده‌اند، قالبهای در سطح هویت نامه هستند. اگر مشخص "
-"شوند، قالبهای سراسری را باطل می‌کنند و توسط قالبهای هر پوشه باطل می‌شوند</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>هنگامی که پیامها یا پاسخهای جدید تألیف می‌کنید، یا هنگامی که پیامها "
+"را پیش‌سو می‌کنید؛ می‌توانید قالب پیامهای مورد استفاده را در اینجا ایجاد کنید.</"
+"p> <p>قالب پیامها از فرمانهای جانشینی با تحریر سادۀ آنها یا با برگزیدن آنها "
+"از گزینگان <i>درج فرمان </i> پشتیبانی می‌کند.</p><p> قالبهایی که در اینجا "
+"مشخص شده‌اند، قالبهای در سطح هویت نامه هستند. اگر مشخص شوند، قالبهای سراسری "
+"را باطل می‌کنند و توسط قالبهای هر پوشه باطل می‌شوند</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>هنگامی که پیامها یا پاسخهای جدید تألیف می‌کنید، یا هنگامی که پیامها را "
-"پیش‌سو می‌کنید؛ می‌توانید قالب پیامهای مورد استفاده را در اینجا ایجاد کنید.</p> "
-"<p>قالب پیامها از فرمانهای جانشینی با تحریر سادۀ آنها یا با برگزیدن آنها از "
-"گزینگان <i>درج فرمان </i> پشتیبانی می‌کند.</p>"
-"<p> این یک قالب سراسری )پیش‌فرض( است. اگر مشخص شوند، می‌توان آنها را با قالبهای "
-"هر هویت یا با قالبهای هر پوشه باطل کرد.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>هنگامی که پیامها یا پاسخهای جدید تألیف می‌کنید، یا هنگامی که پیامها "
+"را پیش‌سو می‌کنید؛ می‌توانید قالب پیامهای مورد استفاده را در اینجا ایجاد کنید.</"
+"p> <p>قالب پیامها از فرمانهای جانشینی با تحریر سادۀ آنها یا با برگزیدن آنها "
+"از گزینگان <i>درج فرمان </i> پشتیبانی می‌کند.</p><p> این یک قالب "
+"سراسری )پیش‌فرض( است. اگر مشخص شوند، می‌توان آنها را با قالبهای هر هویت یا با "
+"قالبهای هر پوشه باطل کرد.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14602,6 +12666,10 @@ msgstr "لوله کردن بدنۀ پیام جاری و درج نتیجه هما
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "لوله کردن بدنۀ پیام جاری و جایگزینی با نتیجه"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -14641,113 +12709,6 @@ msgstr "روشن کردن اشکال‌زدایی"
 msgid "Turn Debug Off"
 msgstr "خاموش کردن اشکال‌زدایی"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...که می‌توانید به ترتیب با استفاده از کلیدهای جهت راست و چپ،\n"
-" به پیام بعدی و قبلی بروید؟</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...که می‌توانید با <em>ابزارها-<ایجاد-<پالایه</em>"
-"، پالایه‌ها را سریعاً روی فرستنده، گیرنده،\n"
-"موضوع و فهرستهای نامه ایجاد کنید؟</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...که می‌توانید با استفاده از کنش پالایۀ <em>بازنویسی\n"
-"سرآیند</em> از شر »]نام فهرست نامه[«\n"
-"خلاص شوید؟ کافی است که از\n"
-"<pre>بازنویسی سرآیند »موضوع«\n"
-"   جایگزینی»\\s*\\]نام فهرست نامه\\[\\s*\n"
-"«   با »«</pre>\n"
-"استفاده کنید.</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...که می‌توانید فهرستهای نامه را با پوشه‌های درون\n"
-"محاورۀ <em>پوشه-<مدیریت فهرست نامه</em> ارتباط دهید؟ سپس، می‌توانید از\n"
-"<em>پیام-<جدید-<پیام به فهرست نامه...</em>\n"
-"را برای باز کردن مؤلف با پیش‌تنظیم نشانی فهرست نامه استفاده کنید.\n"
-"وگرنه، می‌توانید با دکمۀ میانی موشی، روی پوشه فشار دهید.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...که می‌توانید برای هر پوشه، به طور مجزا شمایلهای سفارشی انتساب کنید؟\n"
-"به <em> پوشه-<ویژگیها</em> مراجعه کنید.</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...که KMail می‌تواند میلۀ رنگی را نشان دهد، که نوع پیام\n"
-")متن ساده/زنگام/OpenPGP( که در حال حاضر نمایش داده می‌شود را آشکار می‌سازد؟</p>"
-"\n"
-"<p>این موانع تلاش می‌کنند که با\n"
-"ارسال رایانامه‌های زنگامی که قابکهای وضعیت امضای KMail  را تقلید می‌کنند، با "
-"موفقیت وارسی امضا را تقلید کنند.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...که می‌توانید هر سرآیندی را با وارد کردن نام آن\n"
-"در اولین حوزۀ ویرایش یک قاعدۀ جستجو پالایش کنید؟</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...که می‌توانید پیامها را فقط با قاعدۀ\n"
-"<pre>»نوع محتوا« حاوی »text/html« از زنگام پالایش کنید؟\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...که هنگام پاسخ، فقط بخش برگزیدۀ پیام نقل قول می‌شود؟</p>\n"
-"<p>اگر چیزی انتخاب نشود، پیام کامل نقل قول می‌شود.</p>\n"
-"<p>حتی با متن پیوستها هنگامی که\n"
-"<em>نمای-<پیوستها-<درون‌برنامه‌ای</em> برگزیده می‌شود، کار می‌کند.</p>\n"
-"<p>این ویژگی، با همۀ فرمانهای پاسخ به جز\n"
-"<em>پیام-<پاسخ بدون نقل قول</em>قابل دسترس است.</p>\n"
-"<p align=\"right\"><em>با مشارکت دیوید اف نیومن</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "برای واگرد، چیزی وجود ندارد."
@@ -14815,6 +12776,17 @@ msgstr "پیوست #%1 )بدون نام("
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"پرونده‌ای با نام »%1« در حال حاضر موجود است. مطمئن هستید می‌خواهید آن را "
+"جای‌نوشت کنید؟"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "پرونده جای‌نوشت شود؟"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14931,13 +12903,14 @@ msgstr "&ارسال عکس با هر پیام‌"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"اگر می‌خواهید KMail یک سرآیند به اصطلاح X-Face به پیامهای نوشته‌شده با این هویت "
-"اضافه کند، این جعبه را علامت بزنید. یک X-Face، تصویر کوچک )۴۸×۴۸ تصویردانه( و "
-"سیاه و سفید است که برخی از کارخواههای نامه می‌توانند آن را نمایش دهند."
+"اگر می‌خواهید KMail یک سرآیند به اصطلاح X-Face به پیامهای نوشته‌شده با این "
+"هویت اضافه کند، این جعبه را علامت بزنید. یک X-Face، تصویر کوچک )۴۸×۴۸ "
+"تصویردانه( و سیاه و سفید است که برخی از کارخواههای نامه می‌توانند آن را نمایش "
+"دهند."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -14965,13 +12938,13 @@ msgstr "برگزیدن پرونده..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "برای برگزیدن یک پروندۀ تصویر جهت ایجاد عکس از آن، این را استفاده کنید. تصویر "
-"باید سایه روشن زیاد داشته و شکلی شبیه به منشور قائم داشته باشد. زمینۀ روشن به "
-"بهبود نتیجه کمک می‌کند."
+"باید سایه روشن زیاد داشته و شکلی شبیه به منشور قائم داشته باشد. زمینۀ روشن "
+"به بهبود نتیجه کمک می‌کند."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14979,17 +12952,17 @@ msgstr "تنظیم از کتاب نشانی"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "می‌توانید از نسخۀ کوچک‌شدۀ عکسی که در مدخل کتاب نشانی خود تنظیم کرده‌اید، "
 "استفاده کنید."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail می‌تواند یک عکس کوچک )۴۸×۴۸ تصویردانه(، با کیفیت پایین، تک‌رنگ را با "
 "هر پیامی ارسال کند. مثلاً، می‌تواند عکس شما یا یک نشان حجاری‌شده باشد. در "
@@ -15001,11 +12974,11 @@ msgstr "برای وارد کردن یک رشتۀ X-Face اختیاری، از ا
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"نمونه‌ها در  <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a> وجود دارند."
+"نمونه‌ها در  <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all."
+"nl/~ace/X-Faces/</a> وجود دارند."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15020,130 +12993,1750 @@ msgstr "بدون عکس"
 msgid "You do not have your own contact defined in the address book."
 msgstr "تماس شخصی خود را در کتاب نشانی تعریف نکرده‌اید."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "امضا"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "امضای &خودکار پیامها‌"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"در صورت فعال بودن این گزینه، همۀ پیامهایی که ارسال می‌کنید، به صورت پیش‌فرض "
+"امضا می‌شوند؛ البته، ممکن است امضای مجزای هر پیام غیرفعال باشد."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "رمزبندی"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "تنظیم موضوع پیام"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"در صورت فعال بودن این گزینه، پیام/پرونده، نه تنها با کلید عمومی گیرنده، بلکه "
+"با کلید شما رمزبندی می‌شود. می‌توانید پیام/پرونده را بعداً سرگشایی کنید. "
+"معمولاً، ایدۀ خوبی است."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "ارسال ر.ن: به »نشانی«"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "نمایش متن &امضاشده/رمزبندی‌شده پس از تألیف‌"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "ارسال ر.ن.م: به »پیام«"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"در صورت فعال بودن این گزینه، متن امضاشده/رمزبندی‌شده در یک پنجرۀ مجزا نشان "
+"داده می‌شود، و شما می‌توانید ببینید که پیش از ارسال چگونه است. زمانی مفید است "
+"که می‌خواهید وارسی کنید که آیا سیستم رمزبندی کار می‌کند یا خیر."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "افزودن »سرآیند« به پیام"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "ذخیرۀ پیامهای &رمزبندی‌شدۀ ارسالی‌"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "خواندن بدنۀ پیام از »پرونده«"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "علامت زدن جهت ذخیرۀ پیامهای رمزبندی‌شده"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "تنظیم بدنۀ پیام"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ذخیرۀ پیامهای رمزبندی‌شده</h1>\n"
+"هنگامی که این جعبه علامت زده می‌شود، پیامهای ارسالی، همان‌طور که ارسال شده‌اند "
+"به صورت رمزبندی‌شده ذخیره می‌شوند. این کار توصیه نمی‌شود، چرا که اگر گواهی‌نامۀ "
+"ضروری انقضا یابد، پیامها را دیگر نمی‌توانید بخوانید.\n"
+"<p>\n"
+"هر چند، ممکن است به علت وجود قواعد محلی ناچار باشید که این گزینه را روشن "
+"کنید. اگر شک دارید، با سرپرست محلی خود بررسی کنید.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "افزودن یک پیوست به نامه. این را می‌توان تکرار کرد"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "نمایش همیشگی کلیدهای رمزبندی &برای تصویب‌"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "فقط بررسی نامۀ جدید"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"در صورت فعال بودن این گزینه، همیشه کاربرد، فهرستی از کلیدهای عمومی را به شما "
+"نشان می‌دهد، که می‌توانید از میان آنها کلیدی که برای رمزبندی استفاده می‌شود را "
+"برگزینید. اگر خاموش باشد، اگر کاربرد نتواند کلید درست را بیابد، یا اگر چندین "
+"کلید مورد استفاده وجود داشته باشد، فقط محاوره را نشان می‌دهد."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "فقط باز کردن پنجرۀ مؤلف"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "رمزبندی &پیامها به طور خودکار، در صورت امکان‌"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "مشاهدۀ پروندۀ پیام داده‌شده"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"هنگامی که این گزینه فعال است، هر پیامی که ارسال می‌کنید، در هر جایی که ممکن "
+"باشد و بخواهد رمزبندی می‌شود؛ البته، هنوز می‌توان رمزبندی خودکار را برای هر "
+"پیام به طور مجزا غیرفعال کرد."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "هنگام &ذخیره به عنوان پیش‌نویس، هرگز امضا/رمزبندی نکنید‌"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "این چطور کار می‌کند؟"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "عمومی"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "پاسخ"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "پاسخ به همه"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "پیش‌سو"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&میان‌بر:‌"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "نوع &قالب:‌"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "محتوای قالب"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "میان‌بر قالب"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "نوع قالب"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "ویژگیهای پوشه"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "پوشه، یک فهرست &نامه دارد‌"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "فهرست کردن &نشانی:‌"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&عادی:‌"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&خوانده‌نشده‌:‌"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "انقضای پیام"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&انقضا پس از:‌"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "انقضای پیامهای &خوانده‌شده‌"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "انقضا &پس از:‌"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "انقضای پیامهای &خوانده‌نشده‌"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "روز"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "هفته"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "ماه"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "پیشرفته"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&هویت ارسال‌کننده:‌"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "قالب &ذخیره:‌"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&فهرست نمایش می‌دهد:‌"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "ارسال نامۀ صف‌شده در بررسی نامه"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>انتخاب کنید که آیا می‌خواهید KMail، همۀ پیامهای ارسالی یا همۀ بررسیهای "
+"نامه را به صورت دستی ارسال کند، یا اصلاً نمی‌خواهید که پیامها به طور خودکار "
+"ارسال شوند. </p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "خوانده‌شده"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "قدیمی"
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>در این پوشه )%1(، پیامهای جدیدی وجود دارد که هنوز در کارساز بارگذاری "
+"نشده‌اند، اما به نظر نمی‌رسد که بتوانید آنها را هم اکنون بارگذاری کنید. لطفاً، "
+"با سرپرست خود تماس بگیرید تا اجازه دهد که پیامهای جدید برایتان بارگذاری "
+"شوند، یا آنها را به خارج از این پوشه حرکت دهد.</p> <p>می‌خواهید همین حالا این "
+"پیامها را به پوشۀ دیگر حرکت دهید؟</p>"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "حذف‌شده"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "پاسخ داده‌شده"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "پیش‌سو‌شده"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "جدیدترین پوشۀ برگزیده در محاورۀ گزینش پوشه."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "صف‌شده"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "ارسال‌شده"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "سیاست نمایش شمایل سینی سیستم"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "پایش‌شده"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "چشم‌پوشی‌شده"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "اخطارنامۀ جدید دراز"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "هرزنامه"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"اگر این گزینه فعال باشد، برای هر پوشه، تعداد پیامهایی که جدیداً رسیده‌اند در "
+"اخطارنامۀ جدید نشان داده می‌شود؛ در غیر این صورت، فقط یک پیام »نامۀ جدید "
+"رسید« دریافت می‌کنید."
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "مشخص کردن &ویرایشگر:‌"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "استفاده از ویرایشگر &خارجی به جای مؤلف‌"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
 msgstr ""
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "کار انجامی"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "فعال‌سازی کارکرد گروه‌افزار"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr " پیوست دارد"
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "ناقص از:/به: سرآیندها در پاسخها به پاسخها"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 از %2 %3 مورد استفاده"
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"میکروسافت آوت‌لوک، در پیاده‌سازی استاندارد iCalendar تعدادی نقص دارد؛ این "
+"گزینه پیرامون یکی از آنها کار می‌کند. اگر با کاربران آوت‌لوک مسائلی دارید که "
+"نمی‌توانید پاسخهای خود را بگیرید، سعی کنید که این گزینه را تنظیم کنید."
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "مسیر"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "ارسال دعوت‌نامه‌های گروه‌افزار در بدنۀ نامه"
 
-#: util.h:208
+#: kmail.kcfg:179
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
 msgstr ""
-"پرونده‌ای با نام »%1« در حال حاضر موجود است. مطمئن هستید می‌خواهید آن را "
-"جای‌نوشت کنید؟"
+"میکروسافت آوت‌لوک، در پیاده‌سازی استاندارد iCalendar تعدادی نقص دارد؛ این "
+"گزینه پیرامون یکی از آنها کار می‌کند. اگر با کاربران آوت‌لوک مسائلی دارید که "
+"نمی‌توانید دعوت‌نامه‌های خود را بگیرید، سعی کنید که این گزینه را تنظیم کنید."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "پرونده جای‌نوشت شود؟"
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "ارسال دعوت‌نامه به طور خودکار"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"وقتی علامت زده می‌شود، پنجرۀ مؤلف نامه را نمی‌بینید. در عوض، همۀ نامه‌های "
+"دعوت‌نامه به طور خودکار ارسال می‌شوند. اگر می‌خواهید نامه را پیش از ارسال آن "
+"ببینید، می‌توانید این گزینه را بی‌علامت کنید. هر چند، آگاه باشید که متن در "
+"پنجرۀ مؤلف در نحو  iCalendar می‌باشد، نباید سعی کنید که آن را با دست تغییر "
+"دهید."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>با فعال‌سازی این، می‌توان مدخلها را از کاربردهای Kontact (KOrganizer، "
+"KAddressBook، و KNotes.) ذخیره کرد</p><p>اگر می‌خواهید این گزینه را تنظیم "
+"کنید، باید کاربردهای استفاده از منبع IMAP را هم تنظیم کنید؛ این کار در مرکز "
+"کنترل TDE انجام می‌شود.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>معمولاً، برای دیدن پوشه‌هایی که منابع IMAP را نگه می‌دارند، دلیلی ندارید. "
+"اما اگر می‌خواهید آنها را ببینید، می‌توانید آن را در اینجا تنظیم کنید.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>انتخاب قالب ذخیرۀ پوشه‌های گروه‌افزار. <ul><li>قالب پیش‌فرض این است که "
+"استانداردهای ical )برای پوشه‌های تقویم( و vcard )برای پوشه‌های کتاب "
+"نشانی( استفاده می‌شود. این قالب، همۀ ویژگیهای Kontact را موجود می‌سازد.</"
+"li><li>قالب اکس ام ال Kolab، از مدل سفارشی استفاده می‌کند، که با مدلی که در "
+"آوت‌لوک استفاده می‌شود تطابق بیشتری دارد. این قالب، در هنگام استفاده از یک "
+"کارساز Kolab یا یک راه حل همساز، با آوت‌لوک همسازی بیشتری دارد.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>پدر پوشه‌های منبع IMAP را انتخاب می‌کند.</p><p>به صورت پیش‌فرض، کارساز Kolab "
+"دریافتی IMAP را به گونه‌ای تنظیم می‌کند که پدر باشد.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>این، شناسۀ حساب است که پوشه‌های منبع IMAP را دربر می‌گیرد.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>اگر می‌خواهید نامهای پوشۀ ذخیره‌گاه IMAP را به زبان محلی خود تنظیم کنید، "
+"می‌توانید از بین این زبانهای موجود انتخاب کنید.</p><p>لطفاً، توجه داشته باشید "
+"که تنها دلیل این کار، همسازی با میکروسافت آوت‌لوک می‌باشد. زیاد مناسب نیست که "
+"این تنظیم شود، زیرا تغییر زبانها را غیرممکن می‌سازد. </p><p>بنابراین، تا "
+"مجبور نیستید، این را تنظیم نکنید.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"این مقدار برای تصمیم‌گیری در این مورد به کار می‌رود، که آیا مقدمۀ KMail باید "
+"نمایش داده شود."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "تعداد بیشینۀ تماسهای هر میزبان"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"این، برای محدود نمودن تعداد تماسهای هر میزبان به هنگام بررسی نامۀ جدید، قابل "
+"استفاده می‌باشد. تعداد تماسها به صورت پیش‌فرض نامحدود )۰( می‌باشد."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "نمایش ویرایش خط جستجوی سریع"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"این گزینه، ویرایش خط جستجو در بالای فهرست پیام، که برای جستجوی سریع اطلاعات "
+"نشان داده‌شده در فهرست پیام استفاده می‌شود را فعال یا غیرفعال می‌کند."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "حفظ نویسه‌گان اصلی هنگام پاسخ یا پیش‌سو در صورت امکان"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "پیوست امضا &به طور خودکار‌"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"این هویت را به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده هم استفاده شود.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"این پوشه را برای ارسال فقره‌ها به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده "
+"هم استفاده می‌شود."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"این انتقال نامه را به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده هم استفاده "
+"می‌شود."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"این هویت را به خاطر بسپارید، زیرا در پنجره‌های مؤلف آینده هم استفاده شود.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&سطربندی واژه در ستون:‌"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "اخطار، در صورت انقضای گواهی‌نامۀ کاربر ارشد در &کمتر از:‌"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"این گزینه را روشن کنید تا Outlook &#8482؛ نامهای پیوست حاوی نویسه‌های غیر "
+"انگلیسی را درک کند"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "درخواست خودکار اخطارهای وضع &پیام‌"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>اگر می‌خواهید KMail اخطارهای وضع پیام )MDNها( را برای هر کدام از "
+"پیامهای خروجی شما درخواست کند، این گزینه را فعال کنید.</p><p>این گزینه، فقط "
+"بر پیش‌فرض تأثیر دارد؛ هنوز می‌توانید درخواست MDN بر اساس هر پیام در مؤلف، "
+"فقرۀ گزینگان <em>گزینگان</em>-<<em>درخواست اخطار وضع</em> را فعال یا غیرفعال "
+"کنید.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "استفاده از نشانیهای اخیر برای تکمیل خودکار"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"اگر نمی‌خواهید نشانیهایی که اخیراً استفاده شده‌اند، در فهرست تکمیل خودکار در "
+"حوزه‌های نشانی مؤلف ظاهر شوند، این گزینه را غیرفعال کنید."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "فاصلۀ ذخیرۀ خودکار:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"یک رونوشت پشتیبان از متن در پنجرۀ مؤلف را می‌توان به صورت مرتب ایجاد کرد. "
+"فاصله‌ای که برای ایجاد پشتیبان استفاده می‌شوند، در اینجا تنظیم می‌شود. با تنظیم "
+"مقدار ۰ برای این، می‌توانید ذخیرۀ خودکار را غیرفعال کنید."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "جایگزینی &پیشوند شناخته‌شده با »Re:«‌"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "جایگزینی پیشوند شناخته‌شده با »&Fwd:«‌"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "استفاده از &نقل قول هوشمند‌"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "امضا انقضا یافت."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "نوع گزینندۀ گیرنده"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"نوع محاوره را برای گزینش گیرنده‌ها برای به،\n"
+"        ر.ن و ر.ن.م تنظیم می‌کند."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "نوع ویرایشگر گیرنده‌ها"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"نوع ویرایشگر گیرنده‌ها را برای ویرایش به،\n"
+"        ر.ن و ر.ن.م تنظیم می‌کند."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "تعداد بیشینۀ خطوط ویرایشگر گیرنده."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "حفظ نویسه‌گان اصلی هنگام پاسخ یا پیش‌سو در صورت امکان"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"برخی از رایانامه‌ها، خصوصاً آنهایی که به طور خودکار ایجاد شده‌اند، کدبندی نویسه "
+"که لازم است به طور کامل نمایش داده شوند را مشخص نمی‌کنند. در این موارد، از یک "
+"کدبندی نویسۀ اصلاح حالت عمل استفاده می‌شود، که می‌توانید در اینجا پیکربندی "
+"کنید. برای کدبندی نویسه‌ای که اغلب در بخشی از جهان که شما هستید استفاده "
+"می‌شود، این را تنظیم کنید. به عنوان پیش‌فرض، کدبندی پیکربندی‌شده برای کل سیستم "
+"استفاده می‌شود."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"با تغییر این از »خودکار« پیش‌فرض آن، ناگزیر به استفاده از رمزبندی مشخص‌شده "
+"برای همۀ رایانامه‌ها، صرف‌نظر از‌ این که چه چیز را مشخص می‌کنند، می‌باشید."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"اگر می‌خواهید لبخندکهای شبیه :-( که در متن پیام ظاهر می‌شوند، با "
+"احساس‌نماها )تصاویر کوچک( جایگزین شوند، این را فعال کنید."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"برای نمایش سطوح مختلف متن نقل قول‌شده، این گزینه را فعال سازید. برای مخفی "
+"کردن سطوح نقل قول‌شده، غیرفعال کنید."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "سطح فشرده‌سازی خودکار:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "کاهش اندازۀ قلم برای متن نقل قول‌شده"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "برای نمایش متن نقل قول‌شده با یک قلم کوچک‌تر، این گزینه را فعال سازید."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "ذخیرۀ پیامهای &رمزبندی‌شدۀ ارسالی‌"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "نمایش وضعیت &هرزنامه در سرآیندهای تزئینی‌"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "ارسال اخطارهای وضع پیام با یک ارسال‌کنندۀ خالی."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"ارسال اخطارهای وضع پیام با یک رشتۀ ارسال‌کنندۀ خالی. ممکن است برخی کارسازها "
+"پیکربندی شوند تا چنین پیامهایی را رد کنند، پس اگر با مسائل ارسال  MDNها "
+"مواجه هستید، این گزینه را علامت نزنید."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "عبارتها به قالبها تبدیل شده است"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "عبارتهای قدیمی به قالبها تبدیل شده است"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "قالب پیام برای پیام جدید"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "قالب پیام برای پاسخ"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "قالب پیام برای پاسخ به همه"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "قالب پیام برای پیش‌سو کردن"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "نویسه‌های نقل قول"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "ویرایش &پرونده‌"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "ویرایش..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&برو‌"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&پوشه‌"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&پیام‌"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "پاسخ ویژه"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&پیش‌سو‌"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "بازنشانی تنظیمات قلم"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "میله ابزار زنگام"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "گزینه‌های مشترک"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "میله ابزار زنگام"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "اعتبارسنجی گواهی‌نامه‌ها با استفاده از CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"اگر این گزینه انتخاب شود، گواهی‌نامه‌های S/مایم با استفاده از فهرستهای فسخ "
+"گواهی‌نامه )CRLs( اعتبارسنجی می‌شوند."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "اعتبارسنجی گواهی‌نامه‌های برخط )OCSP("
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"اگر این گزینه انتخاب شود، گواهی‌نامه‌های S/مایم با استفاده از قرارداد وضعیت "
+"گواهی‌نامه‌های برخط )OCSP(، به صورت برخط اعتبارسنجی می‌شوند. نشانی وب پاسخگوی "
+"OCSP زیر را پر کنید."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "اعتبارسنجی گواهی‌نامۀ برخط"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "نشانی وب پاسخگوی OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"در اینجا، نشانی کارساز را برای اعتبارسنجی برخط گواهی‌نامه‌ها )پاسخگوی OCSP( را "
+"وارد کنید. نشانی وب معمولاً با http:// آغاز می‌شود."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "امضای پاسخگوی OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "نادیده گرفتن نشانی وب خدمت گواهی‌نامه‌ها"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "عدم بررسی سیاستهای گواهی‌نامه"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"به صورت پیش‌فرض، GnuPG از file ~/.gnupg/policies.txt برای بررسی این که آیا "
+"سیاست گواهی‌نامه مجاز می‌باشد، استفاده می‌کند. اگر این گزینه انتخاب شود، "
+"سیاستها بررسی نمی‌شوند."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "هرگز به CRL مراجعه نکنید"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"اگر این گزینه علامت زده شود، هرگز از فهرستهای فسخ گواهی‌نامه برای اعتبارسنجی "
+"گواهی‌نامه‌های  S/مایم استفاده نمی‌شود."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "واکشی گواهی‌نامه‌های از دست رفتۀ ناشر"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"اگر این گزینه علامت زده شود، گواهی‌نامه‌های از دست رفتۀ ناشر، در صورت لزوم "
+"واکشی می‌شوند )هم برای روشهای اعتبارسنجی و هم  CRLها و OCSP اعمال می‌شود("
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "درخواستهای قام"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr " هرگونه درخواست قام‌ انجام نشود"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "استفاده از قام برای S/مایم را غیرفعال می‌کند."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "استفاده از این پیشکار برای درخواستهای قام:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "استفاده از پیشکار قام سیستم:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"اگر این گزینه انتخاب شود، مقدار پیشکار قام نشان داده شده در سمت راست )که از "
+"محیط متغیر http_proxy می‌آید(، برای هر درخواست قام استفاده می‌شود."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"در اینجا، محل پیشکار قام خود که برای همۀ درخواستهای قام مربوط به S/مایم "
+"استفاده می‌شود را وارد کنید. نحو، میزبان:درگاه است، مثلاً،  myproxy.nowhere."
+"com:۳۱۲۸."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "نادیده گرفتن نقطۀ توزیع قام CRL گواهی‌نامه‌ها"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"هنگام جستجوی محل CRL، گواهی‌نامه‌ای که باید آزمایش شود، معمولاً حاوی مدخلهای "
+"»نقطۀ توزیع CRL« )DP( می‌باشد، که نشانیهای وبی است که روش دستیابی به نشانی وب "
+"را توصیف می‌کنند. اولین مدخل DP که یافت شود، استفاده می‌شود. با این گزینه، "
+"هنگام جستجو برای یک DP  مناسب، همۀ مدخلهایی که از طرحوارۀ قام استفاده می‌کنند "
+"نادیده گرفته می‌شوند."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "درخواستهای LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr " هرگونه درخواست LDAP انجام نشود"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "استفاده از LDAP برای S/مایم را به طور کامل غیرفعال می‌کند."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "نادیده گرفتن نقطۀ توزیع LDAP CRL گواهی‌نامه‌ها"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"هنگام جستجوی محل CRL، گواهی‌نامه‌ای که باید آزمایش شود، معمولاً حاوی مدخلهای "
+"»نقطۀ توزیع CRL« )DP( می‌باشد، که نشانیهای وبی است که روش دستیابی به نشانی وب "
+"را توصیف می‌کنند. اولین مدخل DP که یافت شود، استفاده می‌شود. با این گزینه، "
+"هنگام جستجو برای یک DP مناسب، همۀ مدخلهایی که از طرحوارۀ LDAP استفاده می‌کنند "
+"نادیده گرفته می‌شوند."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "میزبان اولیه برای درخواستهای LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"با وارد کردن یک کارساز LDAP در اینجا، همۀ درخواستهای LDAP ابتدا به آن کارساز "
+"می‌روند. خلاصه این که این تنظیم، هر میزبان مشخص و بخش درگاه در نشانی وب LDAP "
+"را  لغو می‌کند، و اگر میزبان و درگاه از نشانی وب حذف شوند هم استفاده می‌شود. "
+"کارسازهای LDAP دیگر، فقط در صورتی استفاده می‌شوند که اتصال به »پیشکار« خراب "
+"شود.\n"
+"نحو، »میزبان« یا »میزبان:درگاه« است. اگر درگاه حذف شود، درگاه ۳۸۹ )درگاه "
+"LDAP استاندارد( استفاده می‌شود."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&افزودن...‌"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&گروه‌افزار‌"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "بازنشانی تنظیمات قلم"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "نامحدود"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "پیکربندی امضا"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "پاسخ به ارسال‌کننده"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "پاسخ به همه/ پاسخ به فهرست"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "پیش‌سو کردن پیام"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "اخطار، هنگام سعی برای ارسال پیامهای &بدون امضا‌"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "علامت بزنید تا هنگام ارسال پیامهای بدون امضا، اخطار داده شود."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار هنگام سعی برای ارسال پیامهای بدون امضا</h1>\n"
+"اگر این جعبه علامت داشته باشد، هنگامی که می‌خواهید تمام یا بخشی از پیام بدون "
+"امضا را ارسال کنید، اخطار داده می‌شود.\n"
+" <p>\n"
+"توصیه می‌شود که برای انسجام بیشینه، این گزینه را روشن بگذارید.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&اخطار، هنگام تلاش برای ارسال پیامهای رمزبندی‌نشده‌"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "علامت زدن جهت اخطار، به هنگام ارسال پیامهای رمزبندی‌نشده."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار، هنگام تلاش برای ارسال پیامهای رمزبندی‌نشده</h1>\n"
+"اگر این جعبه علامت زده شود، هنگامی که تلاش می‌کنید کل یا بخشهایی از پیام بدون "
+"رمزبندی را ارسال کنید، به شما اخطار داده می‌شود.\n"
+" <p>\n"
+"توصیه می‌شود که برای انسجام بیشینه، این گزینه را روشن بگذارید.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "اخطار، در صورتی که نشانی رایانامه‌ای &گیرنده در گواهی‌نامه نباشد‌"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "علامت زدن جهت دادن اخطار، در صورتی که نشانی در گواهی‌نامه نباشد"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار، در صورتی که نشانی رایانامه‌ای گیرنده در گواهی‌نامه نباشد</h1>\n"
+"اگر این گزینه علامت زده شود، اگر نشانی رایانامه‌ای گیرنده در گواهی‌نامه‌ای که "
+"برای رمزبندی استفاده می‌شود وجود نداشته باشد، یک اخطار انتشار می‌یابد.\n"
+"<p>\n"
+"توصیه می‌شود که برای امنیت بیشینه، این گزینه را روشن بگذارید.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"اخطار، در صورتی که گواهی‌نامه‌ها/کلیدها به زودی منقضی شوند )پیکربندی آستانه در "
+"زیر("
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "برای امضا"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "برای رمزبندی"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "در اینجا، تعداد روزها را برگزینید"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار، در صورتی که گواهی‌نامۀ امضا انقضا یابد </h1>\n"
+"تعداد کمینۀ روزهایی که گواهی‌نامۀ امضا باید بدون انتشار اخطار، اعتبار داشته "
+"باشد را برگزینید.\n"
+"<p>\n"
+"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار، در صورت انقضای گواهی‌نامۀ رمزبندی</h1>\n"
+"تعداد کمینۀ روزهایی که گواهی‌نامۀ رمزبندی باید در آن بدون انتشار اخطار معتبر "
+"باشد.\n"
+"<p>\n"
+"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار، در صورت انقضای گواهی‌نامۀ درون زنجیر</h1>\n"
+"تعداد کمینۀ روزهایی که همۀ گواهی‌نامه‌های درون زنجیر باید بدون انتشار اخطار "
+"اعتبار داشته باشند را برگزینید.\n"
+"<p>\n"
+"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار، در صورتی که گواهی‌نامۀ CA انقضا یابد </h1>\n"
+"تعداد کمینۀ روزهایی که گواهی‌نامۀ CA باید بدون انتشار اخطار، اعتبار داشته "
+"باشد را برگزینید.\n"
+"<p>\n"
+"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>اخطار، در صورتی که گواهی‌نامۀ کاربر ارشد انقضا یابد</h1>\n"
+"تعداد کمینۀ روزهایی که گواهی‌نامۀ کاربر ارشد باید بدون انتشار اخطار، اعتبار "
+"داشته باشد را برگزینید.\n"
+"<p>\n"
+"تنظیم SPHINX توصیه‌شده، ۱۴ روز است.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "برای گواهی‌نامه‌های کاربر ارشد:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "برای گواهی‌نامه‌های CA متوسط:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "برای کلیدها/گواهی‌نامه‌های کاربر:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "فعال‌سازی مجدد همۀ اخطارهای »دوباره نپرس«"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...که می‌توانید به ترتیب با استفاده از کلیدهای جهت راست و چپ،\n"
+" به پیام بعدی و قبلی بروید؟</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...که می‌توانید با <em>ابزارها-<ایجاد-<پالایه</em>، پالایه‌ها را سریعاً روی "
+"فرستنده، گیرنده،\n"
+"موضوع و فهرستهای نامه ایجاد کنید؟</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...که می‌توانید با استفاده از کنش پالایۀ <em>بازنویسی\n"
+"سرآیند</em> از شر »]نام فهرست نامه[«\n"
+"خلاص شوید؟ کافی است که از\n"
+"<pre>بازنویسی سرآیند »موضوع«\n"
+"   جایگزینی»\\s*\\]نام فهرست نامه\\[\\s*\n"
+"«   با »«</pre>\n"
+"استفاده کنید.</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...که می‌توانید فهرستهای نامه را با پوشه‌های درون\n"
+"محاورۀ <em>پوشه-<مدیریت فهرست نامه</em> ارتباط دهید؟ سپس، می‌توانید از\n"
+"<em>پیام-<جدید-<پیام به فهرست نامه...</em>\n"
+"را برای باز کردن مؤلف با پیش‌تنظیم نشانی فهرست نامه استفاده کنید.\n"
+"وگرنه، می‌توانید با دکمۀ میانی موشی، روی پوشه فشار دهید.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...که می‌توانید برای هر پوشه، به طور مجزا شمایلهای سفارشی انتساب کنید؟\n"
+"به <em> پوشه-<ویژگیها</em> مراجعه کنید.</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...که KMail می‌تواند میلۀ رنگی را نشان دهد، که نوع پیام\n"
+")متن ساده/زنگام/OpenPGP( که در حال حاضر نمایش داده می‌شود را آشکار می‌سازد؟</"
+"p>\n"
+"<p>این موانع تلاش می‌کنند که با\n"
+"ارسال رایانامه‌های زنگامی که قابکهای وضعیت امضای KMail  را تقلید می‌کنند، با "
+"موفقیت وارسی امضا را تقلید کنند.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...که می‌توانید هر سرآیندی را با وارد کردن نام آن\n"
+"در اولین حوزۀ ویرایش یک قاعدۀ جستجو پالایش کنید؟</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...که می‌توانید پیامها را فقط با قاعدۀ\n"
+"<pre>»نوع محتوا« حاوی »text/html« از زنگام پالایش کنید؟\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...که هنگام پاسخ، فقط بخش برگزیدۀ پیام نقل قول می‌شود؟</p>\n"
+"<p>اگر چیزی انتخاب نشود، پیام کامل نقل قول می‌شود.</p>\n"
+"<p>حتی با متن پیوستها هنگامی که\n"
+"<em>نمای-<پیوستها-<درون‌برنامه‌ای</em> برگزیده می‌شود، کار می‌کند.</p>\n"
+"<p>این ویژگی، با همۀ فرمانهای پاسخ به جز\n"
+"<em>پیام-<پاسخ بدون نقل قول</em>قابل دسترس است.</p>\n"
+"<p align=\"right\"><em>با مشارکت دیوید اف نیومن</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15224,16 +14817,20 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>رمزبندی همۀ بخشهای پیام به صورت پیش‌فرض</h1>\n"
-#~ "در صورت انتخاب این گزینه، کل بخشهای یک پیام )یعنی بدنۀ اصلی پیام به علاوۀ پیوستها(، به صورت پیش‌فرض رمزبندی می‌شوند. \n"
+#~ "در صورت انتخاب این گزینه، کل بخشهای یک پیام )یعنی بدنۀ اصلی پیام به علاوۀ "
+#~ "پیوستها(، به صورت پیش‌فرض رمزبندی می‌شوند. \n"
 #~ "<p>\n"
-#~ "این یک تنظیم پیش‌فرض است، که هنوز می‌توانید آن را برای هر پیام مجزایی باطل کنید.\n"
+#~ "این یک تنظیم پیش‌فرض است، که هنوز می‌توانید آن را برای هر پیام مجزایی باطل "
+#~ "کنید.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15245,12 +14842,16 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>سؤال پیش از رمزبندی هر بخش</h1>\n"
-#~ "هنگامی که این گزینه انتخاب می‌شود، هنگامی که می‌خواهید هر بخشی را رمزبندی کنید، برای هر بخش پیام )یعنی بدنۀ اصلی پیام به علاوۀ همۀ پیوستها( به طور مجزا از شما سؤال می‌شود.\n"
+#~ "هنگامی که این گزینه انتخاب می‌شود، هنگامی که می‌خواهید هر بخشی را رمزبندی "
+#~ "کنید، برای هر بخش پیام )یعنی بدنۀ اصلی پیام به علاوۀ همۀ پیوستها( به طور "
+#~ "مجزا از شما سؤال می‌شود.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15264,14 +14865,16 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>عدم رمزبندی پیامها</h1>\n"
 #~ "اگر این گزینه انتخاب شود، به صورت پیش‌فرض پیامها رمزبندی نمی‌شوند.\n"
 #~ "<p>\n"
-#~ "این یک تنظیم پیش‌فرض است، که هنوز می‌توانید آن را برای هر تنظیم مجزایی لغو کنید.\n"
+#~ "این یک تنظیم پیش‌فرض است، که هنوز می‌توانید آن را برای هر تنظیم مجزایی لغو "
+#~ "کنید.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15283,18 +14886,30 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>الگوریتم رمزبندی</h1>\n"
-#~ "الگوریتم، توصیفی برای رایانه پیرامون چگونگی انجام یک تکلیف مشخص می‌باشد. الگوریتم رمزبندی توصیف می‌کند که رایانه چگونه کلید گیرندۀ شما را به پیامتان اعمال می‌کند، به نحوی که فقط گیرندۀ مورد نظر می‌تواند پیام را بخواند.\n"
+#~ "الگوریتم، توصیفی برای رایانه پیرامون چگونگی انجام یک تکلیف مشخص می‌باشد. "
+#~ "الگوریتم رمزبندی توصیف می‌کند که رایانه چگونه کلید گیرندۀ شما را به "
+#~ "پیامتان اعمال می‌کند، به نحوی که فقط گیرندۀ مورد نظر می‌تواند پیام را "
+#~ "بخواند.\n"
 #~ "<p>\n"
-#~ "گزینش یک الگوریتم رمزبندی مشخص، سختی یا آسانی افتراق و خواندن پیام را تعیین می‌کند. گرچه، فرض بر این است که همۀ الگوریتمهای موجود در محیط SPHINX ایمن هستند. عموماً، پیش‌فرض در اینجا خوب کار می‌کند.\n"
+#~ "گزینش یک الگوریتم رمزبندی مشخص، سختی یا آسانی افتراق و خواندن پیام را "
+#~ "تعیین می‌کند. گرچه، فرض بر این است که همۀ الگوریتمهای موجود در محیط SPHINX "
+#~ "ایمن هستند. عموماً، پیش‌فرض در اینجا خوب کار می‌کند.\n"
 #~ "<p>\n"
 #~ "این تنظیم، یک پیش‌فرض است که می‌توانید آن را برای هر پیام مجزایی لغو کنید.\n"
 #~ "</qt>"
@@ -15308,16 +14923,22 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>ممکن است، بررسی گواهی‌نامه به گواهی‌نامه‌ای ختم شود که به صورت محلی ذخیره شده است</h1>\n"
-#~ "اگر این گزینه علامت زده شود، ممکن است بررسی زنجیر گواهی‌نامه به گواهی‌نامه‌ای ختم شود که به صورت محلی ذخیره شده است.\n"
+#~ "<h1>ممکن است، بررسی گواهی‌نامه به گواهی‌نامه‌ای ختم شود که به صورت محلی "
+#~ "ذخیره شده است</h1>\n"
+#~ "اگر این گزینه علامت زده شود، ممکن است بررسی زنجیر گواهی‌نامه به "
+#~ "گواهی‌نامه‌ای ختم شود که به صورت محلی ذخیره شده است.\n"
 #~ "<p>\n"
-#~ "گواهی‌نامه‌های ذخیره‌شده به صورت محلی، گواهی‌نامه‌های شخصی شما، به علاوۀ گواهی‌نامه‌های شرکای ارتباط و اختیارات گواهی‌نامه )CAs( می‌باشند.\n"
+#~ "گواهی‌نامه‌های ذخیره‌شده به صورت محلی، گواهی‌نامه‌های شخصی شما، به علاوۀ "
+#~ "گواهی‌نامه‌های شرکای ارتباط و اختیارات گواهی‌نامه )CAs( می‌باشند.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15329,12 +14950,15 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>بررسی همیشگی مسیر گواهی‌نامه به گواهی‌نامۀ کاربر ارشد</h1>\n"
-#~ "در صورت روشن بودن این گزینه، کل مسیر گواهی‌نامۀ متعلق به گواهی‌نامۀ گیرنده که به گواهی‌نامۀ کاربر ارشد می‌رسد، بررسی می‌شود.\n"
+#~ "در صورت روشن بودن این گزینه، کل مسیر گواهی‌نامۀ متعلق به گواهی‌نامۀ گیرنده "
+#~ "که به گواهی‌نامۀ کاربر ارشد می‌رسد، بررسی می‌شود.\n"
 #~ " </qt>"
 
 #~ msgid "Check certificate &path"
@@ -15346,14 +14970,17 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>بررسی مسیر گواهی‌نامه</h1>\n"
-#~ "در صورت روشن بودن این گزینه، کل مسیر گواهی‌نامۀ گیرندۀ بالاتر از کاربر ارشد بررسی می‌شود.\n"
+#~ "در صورت روشن بودن این گزینه، کل مسیر گواهی‌نامۀ گیرندۀ بالاتر از کاربر "
+#~ "ارشد بررسی می‌شود.\n"
 #~ "<p>\n"
 #~ "توجه کنید که بررسی گواهی‌نامۀ گیرنده را نمی‌توان شخصاً خاموش کرد.\n"
 #~ "</qt>"
@@ -15367,16 +14994,27 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>استفاده از فهرستهای فسخ گواهی‌نامه (CRLs)</h1>\n"
-#~ "یک فهرست فسخ گواهی‌نامه، حاوی گواهی‌نامه‌هایی است که خارج شده‌اند و نباید برای اهداف رمزبندی طولانی‌تر استفاده شوند. ممکن است یک کاربر بخواهد گواهی‌نامۀ خود را فسخ کند، زیرا گمان می‌کند که انسجام گواهی‌نامه توافقی است )مثلاً کسی شمارۀ شناسایی شخصی را حدس زده است(.\n"
+#~ "یک فهرست فسخ گواهی‌نامه، حاوی گواهی‌نامه‌هایی است که خارج شده‌اند و نباید "
+#~ "برای اهداف رمزبندی طولانی‌تر استفاده شوند. ممکن است یک کاربر بخواهد "
+#~ "گواهی‌نامۀ خود را فسخ کند، زیرا گمان می‌کند که انسجام گواهی‌نامه توافقی "
+#~ "است )مثلاً کسی شمارۀ شناسایی شخصی را حدس زده است(.\n"
 #~ " <p>\n"
-#~ "توصیه می‌شود که برای امنیت بیشینه، از CRLها استفاده کنید. در پیکربندی محاوره برای مدیریت CRL و گواهی‌نامه، می‌توانید محلی که CRLها از آنجا بازیابی می‌شوند را برگزینید.\n"
+#~ "توصیه می‌شود که برای امنیت بیشینه، از CRLها استفاده کنید. در پیکربندی "
+#~ "محاوره برای مدیریت CRL و گواهی‌نامه، می‌توانید محلی که CRLها از آنجا "
+#~ "بازیابی می‌شوند را برگزینید.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15388,12 +15026,14 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>اخطار، در صورت انقضای CRL در آیندۀ نزدیک</h1>\n"
-#~ "در صورت علامت زدن این جعبه، اگر یکی از CRLهایی که استفاده می‌کنید، در حال انقضا در آیندۀ نزدیک باشد، به شما اخطار داده می‌شود.\n"
+#~ "در صورت علامت زدن این جعبه، اگر یکی از CRLهایی که استفاده می‌کنید، در حال "
+#~ "انقضا در آیندۀ نزدیک باشد، به شما اخطار داده می‌شود.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15402,14 +15042,16 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>اخطار، در صورت انقضای CRL در آیندۀ نزدیک</h1>\n"
-#~ "در این حوزه، می‌توانید مشخص کنید که چه مدت پیش از انقضای CRL، در مورد این انقضا به شما اخطار داده می‌شود.\n"
+#~ "در این حوزه، می‌توانید مشخص کنید که چه مدت پیش از انقضای CRL، در مورد این "
+#~ "انقضا به شما اخطار داده می‌شود.\n"
 #~ "<p>\n"
 #~ "تنظیم توصیه‌شده برای محیط SPHINX، ۷ روز است.\n"
 #~ "</qt>"
@@ -15418,21 +15060,27 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgstr "رمزبندی همیشگی &برای خود‌"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "علامت بزنید تا پیامهایی که با استفاده از کلید شخصی شما رمزبندی شده‌اند را هم داشته باشید."
+#~ msgstr ""
+#~ "علامت بزنید تا پیامهایی که با استفاده از کلید شخصی شما رمزبندی شده‌اند را "
+#~ "هم داشته باشید."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>رمزبندی همیشگی برای خود</h1>\n"
-#~ "اگر این جعبه علامت زده شود، پیامهای رمزبندی‌شدۀ ارسالی توسط شما هم با استفاده از کلید شخصی شما رمزبندی می‌شود.\n"
+#~ "اگر این جعبه علامت زده شود، پیامهای رمزبندی‌شدۀ ارسالی توسط شما هم با "
+#~ "استفاده از کلید شخصی شما رمزبندی می‌شود.\n"
 #~ "<p>\n"
-#~ "توصیه می‌شود که این گزینه را روشن بگذارید، تا بتوانید پیامهایی که ارسال کرده‌اید را بخوانید.\n"
+#~ "توصیه می‌شود که این گزینه را روشن بگذارید، تا بتوانید پیامهایی که ارسال "
+#~ "کرده‌اید را بخوانید.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15444,16 +15092,21 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>اخطار، در صورت انقضای گواهی‌نامه</h1>\n"
-#~ "اگر این گزینه علامت زده شود، هنگام تلاش برای استفاده از یک گواهی‌نامه برای رمزبندی که در تعداد روز مشخص‌شده انقضا می‌یابد، به شما اخطار داده می‌شود.\n"
+#~ "اگر این گزینه علامت زده شود، هنگام تلاش برای استفاده از یک گواهی‌نامه برای "
+#~ "رمزبندی که در تعداد روز مشخص‌شده انقضا می‌یابد، به شما اخطار داده می‌شود.\n"
 #~ "<p>\n"
-#~ "توصیه می‌شود که این گزینه را روشن بگذارید، تا از استفادۀ گواهی‌نامه‌هایی که در آیندۀ نزدیک انقضا می‌یابند، جلوگیری شود.\n"
+#~ "توصیه می‌شود که این گزینه را روشن بگذارید، تا از استفادۀ گواهی‌نامه‌هایی که "
+#~ "در آیندۀ نزدیک انقضا می‌یابند، جلوگیری شود.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15474,8 +15127,29 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "انتخاب می‌کند که کدام گواهی‌نامه‌ها ارسال شوند"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>ارسال گواهی‌نامه‌ها</h1> بدون گواهی‌نامۀ شما، گیرنده نمی‌تواند تعیین کند که آیا واقعاً شما هستید که پیام را ارسال کردید، یا پیام به وسیلۀ شخص سومی تغییر کرده است. <p> گیرنده می‌تواند گواهی‌نامۀ شما را از یک کارساز مرکزی بگیرد، اما شما می‌توانید تصمیم بگیرید که گواهی‌نامۀ خود را با پیام خود در میان بگذارید. می‌توانید تصمیم بگیرید که آیا اصلاً نمی‌خواهید گواهی‌نامه‌ای قرار دهید، فقط گواهی‌نامۀ خود یا کل زنجیر گواهی‌نامه‌هایی که گواهی‌نامۀ شخصی شما را گواهی می‌کند، شامل یا به استثنای گواهی‌نامۀ کاربر ارشد را قرار می‌دهید. <p> توصیه می‌شود که همیشه، حداقل گواهی‌نامۀ شخصی خود را به همراه پیام قرار دهید. <p> این تنظیم، پیش‌فرض است، می‌توانید برای هر پیام مجزا، آن را لغو کنید. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>ارسال گواهی‌نامه‌ها</h1> بدون گواهی‌نامۀ شما، گیرنده نمی‌تواند تعیین "
+#~ "کند که آیا واقعاً شما هستید که پیام را ارسال کردید، یا پیام به وسیلۀ شخص "
+#~ "سومی تغییر کرده است. <p> گیرنده می‌تواند گواهی‌نامۀ شما را از یک کارساز "
+#~ "مرکزی بگیرد، اما شما می‌توانید تصمیم بگیرید که گواهی‌نامۀ خود را با پیام "
+#~ "خود در میان بگذارید. می‌توانید تصمیم بگیرید که آیا اصلاً نمی‌خواهید "
+#~ "گواهی‌نامه‌ای قرار دهید، فقط گواهی‌نامۀ خود یا کل زنجیر گواهی‌نامه‌هایی که "
+#~ "گواهی‌نامۀ شخصی شما را گواهی می‌کند، شامل یا به استثنای گواهی‌نامۀ کاربر "
+#~ "ارشد را قرار می‌دهید. <p> توصیه می‌شود که همیشه، حداقل گواهی‌نامۀ شخصی خود "
+#~ "را به همراه پیام قرار دهید. <p> این تنظیم، پیش‌فرض است، می‌توانید برای هر "
+#~ "پیام مجزا، آن را لغو کنید. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "ارسال گواهی‌نامۀ شخصی &شما‌"
@@ -15495,14 +15169,17 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>امضای همۀ بخشهای پیام به صورت پیش‌فرض</h1>\n"
-#~ "اگر  این گزینه انتخاب شود، کل بخشهای پیام )یعنی بدنۀ اصلی پیام و همۀ پیوستها(، به صورت پیش‌فرض امضا می‌شوند.\n"
+#~ "اگر  این گزینه انتخاب شود، کل بخشهای پیام )یعنی بدنۀ اصلی پیام و همۀ "
+#~ "پیوستها(، به صورت پیش‌فرض امضا می‌شوند.\n"
 #~ "<p>\n"
 #~ "این تنظیم، پیش‌فرض است، هنوز می‌توانید برای هر پیام مجزا آن را لغو کنید.\n"
 #~ "</qt>"
@@ -15516,12 +15193,16 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>سؤال پیش از امضای هر بخش</h1>\n"
-#~ "هنگامی که این گزینه انتخاب می‌شود، برای هر بخش از پیام )یعنی بدنۀ اصلی پیام به علاوۀ پیوستها(، به طور مجزا سؤال می‌شود که می‌خواهید این بخش امضا شود یا خیر.\n"
+#~ "هنگامی که این گزینه انتخاب می‌شود، برای هر بخش از پیام )یعنی بدنۀ اصلی "
+#~ "پیام به علاوۀ پیوستها(، به طور مجزا سؤال می‌شود که می‌خواهید این بخش امضا "
+#~ "شود یا خیر.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15535,17 +15216,20 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>عدم امضای پیامها</h1>\n"
 #~ "در صورت گزینش این گزینه، پیامها به صورت پیش‌فرض امضا نمی‌شوند.\n"
 #~ "<p>\n"
-#~ "این تنظیم، پیش‌فرض است، که هنوز می‌توانید آن را برای هر تنظیم مجزا لغو کنید.\n"
+#~ "این تنظیم، پیش‌فرض است، که هنوز می‌توانید آن را برای هر تنظیم مجزا لغو "
+#~ "کنید.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "گواهی‌نامۀ امضا، در صفحۀ <em>گواهی‌نامه‌ها</em> پیکربندی می‌شود."
 
 #~ msgid "Selects the signature algorithm"
@@ -15554,18 +15238,30 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>الگوریتم امضا</h1>\n"
-#~ "الگوریتم، توصیفی برای رایانه در مورد چگونگی اجرای تکلیف مشخص می‌باشد. الگوریتم امضا توصیف می‌کند که رایانه، چگونه کلید امضای شما را به پیام شما اعمال می‌کند، به نحوی که گیرنده می‌تواند تعیین کند که پیام واقعاً از طرف شماست.\n"
+#~ "الگوریتم، توصیفی برای رایانه در مورد چگونگی اجرای تکلیف مشخص می‌باشد. "
+#~ "الگوریتم امضا توصیف می‌کند که رایانه، چگونه کلید امضای شما را به پیام شما "
+#~ "اعمال می‌کند، به نحوی که گیرنده می‌تواند تعیین کند که پیام واقعاً از طرف "
+#~ "شماست.\n"
 #~ " <p>\n"
-#~ "گزینش الگوریتم امضای مشخص، سختی یا آسانی forge  کردن پیام را تعیین می‌کند. هر چند، به نظر می‌رسد که همۀ الگوریتمای فراهم‌شده در محیط SPHINX بسیار ایمن باشند. معمولاً، پیش‌فرض فقط در اینجا خوب کار می‌کند.\n"
+#~ "گزینش الگوریتم امضای مشخص، سختی یا آسانی forge  کردن پیام را تعیین می‌کند. "
+#~ "هر چند، به نظر می‌رسد که همۀ الگوریتمای فراهم‌شده در محیط SPHINX بسیار ایمن "
+#~ "باشند. معمولاً، پیش‌فرض فقط در اینجا خوب کار می‌کند.\n"
 #~ "<p>\n"
 #~ "این تنظیم، پیش‌فرض است، که می‌توانید آن را برای هر پیام مجزا لغو کنید.\n"
 #~ "</qt>"
@@ -15582,12 +15278,17 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>ذخیرۀ پیامها با امضاها</h1>\n"
-#~ "هنگامی که این جعبه علامت زده می‌شود، پیامهای ارسالی به همراه امضاهایی که برای آنها اعمال می‌شوند، ذخیره می‌گردند. چون شما را بر آن می‌دارد که بعداً بررسی کنید که آیا پیام را امضا کرده‌اید، یا بخش مشخصی از آن را توصیه می‌شود.\n"
+#~ "هنگامی که این جعبه علامت زده می‌شود، پیامهای ارسالی به همراه امضاهایی که "
+#~ "برای آنها اعمال می‌شوند، ذخیره می‌گردند. چون شما را بر آن می‌دارد که بعداً "
+#~ "بررسی کنید که آیا پیام را امضا کرده‌اید، یا بخش مشخصی از آن را توصیه "
+#~ "می‌شود.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15602,12 +15303,18 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>امضای جداشدۀ چند بخشی</h1>\n"
-#~ "هنگامی که این گزینه انتخاب می‌شود، امضا و دادۀ امضاشده به چند بخش پیام امضاشده/چند بخشی جدا می‌شوند. دادۀ پیام امضاشده، حتی با عاملان کاربران نامه که نه الگوریتم امضا و نه کدگشایی ASN.1 را پشتیبانی نمی‌کنند هم خوانده می‌شود.\n"
+#~ "هنگامی که این گزینه انتخاب می‌شود، امضا و دادۀ امضاشده به چند بخش پیام "
+#~ "امضاشده/چند بخشی جدا می‌شوند. دادۀ پیام امضاشده، حتی با عاملان کاربران "
+#~ "نامه که نه الگوریتم امضا و نه کدگشایی ASN.1 را پشتیبانی نمی‌کنند هم خوانده "
+#~ "می‌شود.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15619,12 +15326,16 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>پیامهای امضا‌شدۀ مات</h1>\n"
-#~ "وقتی این گزینه انتخاب می‌شود، هم امضا و هم دادۀ امضاشده در بلوک ASN.1 کدبندی می‌شوند. پیامها، با عاملان کاربر نامه که کدگشایی ASN.1  را پشتیبانی می‌کنند، فقط خواندنی می‌شوند.\n"
+#~ "وقتی این گزینه انتخاب می‌شود، هم امضا و هم دادۀ امضاشده در بلوک ASN.1 "
+#~ "کدبندی می‌شوند. پیامها، با عاملان کاربر نامه که کدگشایی ASN.1  را پشتیبانی "
+#~ "می‌کنند، فقط خواندنی می‌شوند.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15636,8 +15347,23 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "گزینش این که هر چند وقت یک بار، شمارۀ شناسایی شخصی باید وارد شود"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>مدخل شمارۀ شناسایی شخصی</h1> در اینجا، می‌توانید انتخاب کنید که چند وقت یک بار لازم است که شمارۀ شناسایی شخصی وارد شود تا به محیط امنیتی شخصی (PSE) که حاوی گواهی‌نامه‌های شماست دستیابید. <p> هرچه بیشتر لازم باشد که شمارۀ شناسایی شخصی خود را وارد کنید، در مقابل پیامهای رایانامه‌ای  که در نام شما forge شده‌اند، محافظت می‌شوید، اما به عملیاتهای نامناسب بیشتری احتیاج است. <p> اگر مطمئن نیستید که در اینجا چه چیزی انتخاب کنید، این گزینه را همان‌طور که هست رها کنید. <p> توجه داشته باشید که، به دلایل امنیتی مدخل شمارۀ شناسایی شخصی را نمی‌توان کاملاً‌ خاموش کرد. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>مدخل شمارۀ شناسایی شخصی</h1> در اینجا، می‌توانید انتخاب کنید که "
+#~ "چند وقت یک بار لازم است که شمارۀ شناسایی شخصی وارد شود تا به محیط امنیتی "
+#~ "شخصی (PSE) که حاوی گواهی‌نامه‌های شماست دستیابید. <p> هرچه بیشتر لازم باشد "
+#~ "که شمارۀ شناسایی شخصی خود را وارد کنید، در مقابل پیامهای رایانامه‌ای  که "
+#~ "در نام شما forge شده‌اند، محافظت می‌شوید، اما به عملیاتهای نامناسب بیشتری "
+#~ "احتیاج است. <p> اگر مطمئن نیستید که در اینجا چه چیزی انتخاب کنید، این "
+#~ "گزینه را همان‌طور که هست رها کنید. <p> توجه داشته باشید که، به دلایل "
+#~ "امنیتی مدخل شمارۀ شناسایی شخصی را نمی‌توان کاملاً‌ خاموش کرد. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "یک بار در هر نشست"
@@ -15654,16 +15380,21 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>اخطار، در صورتی که گواهی‌نامه انقضا یابد </h1>\n"
-#~ "در صورت علامت زدن این گزینه، هنگام سعی برای استفاده از گواهی‌نامه برای امضای آن منقضی در تعداد روز مشخص‌شده، به شما اخطار داده می‌شود.\n"
+#~ "در صورت علامت زدن این گزینه، هنگام سعی برای استفاده از گواهی‌نامه برای "
+#~ "امضای آن منقضی در تعداد روز مشخص‌شده، به شما اخطار داده می‌شود.\n"
 #~ "<p>\n"
-#~ "توصیه می‌شود که این گزینه را روشن نگه دارید تا از استفادۀ گواهی‌نامه‌هایی که در آیندۀ نزدیک انقضا می‌یابند، جلوگیری شود.\n"
+#~ "توصیه می‌شود که این گزینه را روشن نگه دارید تا از استفادۀ گواهی‌نامه‌هایی که "
+#~ "در آیندۀ نزدیک انقضا می‌یابند، جلوگیری شود.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15675,14 +15406,17 @@ msgstr "پرونده جای‌نوشت شود؟"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>اخطار، در صورتی که نشانی رایانامه‌ای امضاکننده در گواهی‌نامه نباشد </h1>\n"
-#~ "اگر این گزینه علامت نداشته باشد، در صورتی که نشانی رایانامه‌ای امضاکننده حاوی گواهی‌نامۀ مورد استفاده برای امضا نباشد، اخطاری منتشر می‌شود.\n"
+#~ "<h1>اخطار، در صورتی که نشانی رایانامه‌ای امضاکننده در گواهی‌نامه نباشد </"
+#~ "h1>\n"
+#~ "اگر این گزینه علامت نداشته باشد، در صورتی که نشانی رایانامه‌ای امضاکننده "
+#~ "حاوی گواهی‌نامۀ مورد استفاده برای امضا نباشد، اخطاری منتشر می‌شود.\n"
 #~ "<p>\n"
 #~ "توصیه می‌شود که، این گزینه را برای انسجام بیشینه روشن بگذارید.\n"
 #~ "</qt>"
diff --git a/tde-i18n-fi/messages/tdepim/kmail.po b/tde-i18n-fi/messages/tdepim/kmail.po
index c00927854a6..49f94ed76dc 100644
--- a/tde-i18n-fi/messages/tdepim/kmail.po
+++ b/tde-i18n-fi/messages/tdepim/kmail.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-10-30 21:58+0200\n"
 "Last-Translator: Mikko Piippo <piippo@cc.helsinki.fi>\n"
 "Language-Team:  <fi@li.org>\n"
@@ -23,21 +23,21 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"Tapio Kautto,Kim Enkovaara,Teemu Rytilahti,Eero Häkkinen,Ilpo Kantonen,Santtu "
-"Pajukanta,Ville-Pekka Vainio"
+"Tapio Kautto,Kim Enkovaara,Teemu Rytilahti,Eero Häkkinen,Ilpo Kantonen,"
+"Santtu Pajukanta,Ville-Pekka Vainio"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"eleknader@phnet.fi,kim.enkovaara@iki.fi,teemu.rytilahti@kde-fi.org,"
-"eero.hakkinen@iki.fi,,santtu@pajukanta.fi,vpivaini@cs.helsinki.fi"
+"eleknader@phnet.fi,kim.enkovaara@iki.fi,teemu.rytilahti@kde-fi.org,eero."
+"hakkinen@iki.fi,,santtu@pajukanta.fi,vpivaini@cs.helsinki.fi"
 
 #: aboutdata.cpp:53
 msgid "Maintainer"
@@ -180,6 +180,12 @@ msgstr "&Ei mikään (käytä varoen)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Puoliautomaattisen resurssienhallinnan tili"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Tyhjennä vanhat"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -255,12 +261,12 @@ msgstr "&Käyttäjätunnus:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Internet-palveluntarjoajasi antoi sinulle <em>käyttäjätunnuksen</em>"
-", jota käytetään tunnistamaan sinut palveluntarjoajan palvelimille. Tunnus on "
+"Internet-palveluntarjoajasi antoi sinulle <em>käyttäjätunnuksen</em>, jota "
+"käytetään tunnistamaan sinut palveluntarjoajan palvelimille. Tunnus on "
 "yleensä sähköpostiosoitteesi alkuosa (osa ennen <em>@</em> -merkkiä)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -282,12 +288,12 @@ msgstr "&Tallenna POP-salasana asetustiedostoon"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Valitse tämä asetus, jos haluat, että KMail tallentaa SMTP-salasanan "
 "asetustiedostoonsa. Jos TDEWallet-lompakko on käytössä, salasana talletetaan "
@@ -322,8 +328,9 @@ msgstr "&Suodata viestit jos ne ovat suurempia kuin"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Jos valitsit tämän kohdan, voit valita mitä viesteille tehdään. Voit "
 "halutessasi hakea viestin, poistaa sen tai säilyttää palvelimella."
@@ -375,13 +382,15 @@ msgstr "Paljas &teksti"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -424,9 +433,9 @@ msgstr "Nimiavaruudet:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Tässä näet IMAP-palvelimesi tukemat eri nimiavaruudet. Kukin nimiavaruus "
 "esittää etuliitettä, joka yksilöi joukon kansioita. Nimiavaruuksien avulla "
@@ -488,9 +497,9 @@ msgstr "Lataa liitteet vain pyy&dettäessä"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Jos valitset tämän kohdan, liitteitä ei ladata automaattisesti viestiä "
 "valitessasi, vaan vasta kun napsautat liitettä. Tällöin myös suuret viestit "
@@ -534,7 +543,7 @@ msgstr "<ei mitään>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "saapuneet"
 
@@ -542,41 +551,42 @@ msgstr "saapuneet"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Palvelin ei tue viestien tunnistenumeroita, jotka tarvitaan jotta viestejä voi "
-"jättää palvelimelle.\n"
-"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten voit "
-"yrittää jättää viestit palvelimelle tästä huolimatta."
+"Palvelin ei tue viestien tunnistenumeroita, jotka tarvitaan jotta viestejä "
+"voi jättää palvelimelle.\n"
+"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten "
+"voit yrittää jättää viestit palvelimelle tästä huolimatta."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Palvelin ei näytä tukevan viestiotsikoiden noutamista. Tämä ominaisuus on "
 "välttämätön, jos halutaan suodattaa palvelimella.\n"
-"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten voit "
-"yrittää suodattaa viestejä palvelimella tästä huolimatta."
+"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten "
+"voit yrittää suodattaa viestejä palvelimella tästä huolimatta."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Ota huomioon, että tämä asetus saattaa aiheuttaa virheellistä postinlukua "
 "palvelimilta, jotka eivät tue putkitusta.\n"
-"Tämä asetus on muokattavissa, koska jotkin palvelimet tukevat putkitusta, mutta "
-"eivät ilmoita tästä ominaisuudesta. Jos haluat tarkistaa, tukeeko POP3 "
+"Tämä asetus on muokattavissa, koska jotkin palvelimet tukevat putkitusta, "
+"mutta eivät ilmoita tästä ominaisuudesta. Jos haluat tarkistaa, tukeeko POP3 "
 "-palvelimesi putkitusta, käytä ikkunan alareunassa olevaa painiketta.\n"
 "Jos palvelin ei ilmoita siitä, mutta haluat lisää nopeutta, voit kokeilla "
 "lähettää postia itsellesi, ja tarkistaa toimiiko tämä."
@@ -587,49 +597,49 @@ msgstr "Määritä palvelin ja portti Yleiset-välilehdeltä ensiksi."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Palvelin ei näytä tukevan putkitusta. Tästä syystä tämä ominaisuus ei ole "
 "käytössä.\n"
 "Koska jotkut palvelimet eivät osaa ilmoittaa ominaisuuksistaan oikein, voit "
-"kytkeä putkituksen käyttöön. Jos otat putkituksen käyttöön, kannattaa huomata "
-"että jotkut POP-palvelimet, jotka eivät tue putkitusta, saattavat lähettää "
-"vioittuneita viestejä. Ennen kuin käytät tätä ominaisuutta tärkeiden viestien "
-"vastaanottamiseen, toiminta kannattaa testata lähettämällä runsaasti "
-"testiviestejä jotka lataat kerralla POP-palvelimelta."
+"kytkeä putkituksen käyttöön. Jos otat putkituksen käyttöön, kannattaa "
+"huomata että jotkut POP-palvelimet, jotka eivät tue putkitusta, saattavat "
+"lähettää vioittuneita viestejä. Ennen kuin käytät tätä ominaisuutta "
+"tärkeiden viestien vastaanottamiseen, toiminta kannattaa testata "
+"lähettämällä runsaasti testiviestejä jotka lataat kerralla POP-palvelimelta."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Palvelin ei tue viestien tunnistenumeroita, jotka tarvitaan jotta viestejä voi "
-"jättää palvelimelle.\n"
-"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten voit "
-"jättää viestit palvelimelle tästä huolimatta."
+"Palvelin ei tue viestien tunnistenumeroita, jotka tarvitaan jotta viestejä "
+"voi jättää palvelimelle.\n"
+"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten "
+"voit jättää viestit palvelimelle tästä huolimatta."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Palvelin ei näytä tukevan viestiotsikoiden noutamista. Tämä ominaisuus on "
 "välttämätön, jos halutaan suodattaa palvelimella.\n"
-"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten voit "
-"yrittää suodattaa viestejä palvelimella tästä huolimatta."
+"Jotkut palvelimet eivät osaa ilmoittaa tästä ominaisuudesta oikein, joten "
+"voit yrittää suodattaa viestejä palvelimella tästä huolimatta."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -709,8 +719,8 @@ msgstr "IMAP-käyttäjätunnus"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Sinun täytyy määritellä sähköpostitili asetusten verkko-osiossa, jotta voit "
 "vastaanottaa sähköpostia."
@@ -749,13 +759,14 @@ msgstr "Tervetuloa KMailiin"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Näyttää siltä, että käynnistit KMailin ensimmäistä kertaa. Voit käyttää "
 "tätä ohjattua toimintoa sähköpostitiliesi asettamiseen. Syötä vain "
-"sähköpostipalveluntarjoajaltasi saamasi yhteystiedot seuraaville sivuille.</qt>"
+"sähköpostipalveluntarjoajaltasi saamasi yhteystiedot seuraaville sivuille.</"
+"qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -817,8 +828,7 @@ msgstr "Käytä paikallista toimitusta"
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ei mitään"
@@ -912,7 +922,8 @@ msgid ""
 "software and re-run this wizard.</p>"
 msgstr ""
 "<p>Roskapostin torjuntaohjelmia ei löytynyt. Asenna jokin roskapostin "
-"torjuntaohjelma (esim. SpamAssassin) ja aja tämä ohjattu toiminto uudelleen.</p>"
+"torjuntaohjelma (esim. SpamAssassin) ja aja tämä ohjattu toiminto uudelleen."
+"</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -938,8 +949,8 @@ msgstr "<br>Roskapostiviestejä ei siirretä mihinkään tiettyyn kansioon.</p>"
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>Kansio viesteille, joista roskapostin tunnistus on epävarma (todennäköisesti "
-"roskapostia), on <i>"
+"<p>Kansio viesteille, joista roskapostin tunnistus on epävarma "
+"(todennäköisesti roskapostia), on <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -959,27 +970,24 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Tämän ohjatun toiminnon avulla voit määritellä KMailin käyttämään yleisimpiä "
-"virustorjuntaohjelmia.</p> "
-"<p>Ohjattu toiminto tunnistaa koneellasi olevat virustorjuntaohjelmat, ja luo "
-"suodinsäännöt joiden avulla viruksia sisältävät viestit erotetaan puhtaista "
-"viesteistä. Ohjattu toiminto ei käytä olemassaolevia suotimia, vaan luo uudet "
-"säännöt.</p> "
-"<p><b>Varoitus:</b> KMailin toiminta hidastuu virusten etsinnän ajaksi. Jos "
-"tämä aiheuttaa ongelmia, voit poistaa suodinsäännöt ja palata aiempaan "
-"toimintatapaan."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Tämän ohjatun toiminnon avulla voit määritellä KMailin käyttämään "
+"yleisimpiä virustorjuntaohjelmia.</p> <p>Ohjattu toiminto tunnistaa "
+"koneellasi olevat virustorjuntaohjelmat, ja luo suodinsäännöt joiden avulla "
+"viruksia sisältävät viestit erotetaan puhtaista viesteistä. Ohjattu toiminto "
+"ei käytä olemassaolevia suotimia, vaan luo uudet säännöt.</p> <p><b>Varoitus:"
+"</b> KMailin toiminta hidastuu virusten etsinnän ajaksi. Jos tämä aiheuttaa "
+"ongelmia, voit poistaa suodinsäännöt ja palata aiempaan toimintatapaan."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -1007,8 +1015,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Oletuskansio roskapostiviesteille on roskakori, mutta voit vaihtaa käytettävää "
-"kansiota alla."
+"Oletuskansio roskapostiviesteille on roskakori, mutta voit vaihtaa "
+"käytettävää kansiota alla."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1016,10 +1024,9 @@ msgstr "Siirrä todennäköiset roska&postiviestit kansioon"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Oletuskansio on saapuneet-kansio, mutta voit vaihtaa kansiota alla. "
 "<p>Kaikki roskapostintorjuntaohjelmat eivät tue viestin merkitsemistä "
@@ -1034,12 +1041,13 @@ msgstr "Tarkista viestit virustorjuntaohjelmien avulla"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Tarkistuta viestisi virustorjuntaohjelmalla. Ohjattu toiminto luo tarpeelliset "
-"suotimet. Viruksia sisältävät viestit merkitään siten, että myöhemmät suotimet "
-"voivat käsitellä niitä ja esimerkiksi siirtää virusviestit tiettyyn kansioon."
+"Tarkistuta viestisi virustorjuntaohjelmalla. Ohjattu toiminto luo "
+"tarpeelliset suotimet. Viruksia sisältävät viestit merkitään siten, että "
+"myöhemmät suotimet voivat käsitellä niitä ja esimerkiksi siirtää "
+"virusviestit tiettyyn kansioon."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1048,12 +1056,12 @@ msgstr "Siirrä viruksia sisältävät viestit valittuun kansioon"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Luodaan viruksia sisältävät viestit luokitteleva suodin ja siirretään "
-"virusviestit määriteltyyn kansioon. Kohdekansio on oletuksena roskakori, mutta "
-"voit muuttaa tätä asetusta kansionäkymässä."
+"virusviestit määriteltyyn kansioon. Kohdekansio on oletuksena roskakori, "
+"mutta voit muuttaa tätä asetusta kansionäkymässä."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1061,10 +1069,11 @@ msgstr "Merkitse viruksia sisältävät viestit myös luetuiksi"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Merkitse viruksia sisältävät viestit luetuiksi ja siirrä ne valittuun kansioon."
+"Merkitse viruksia sisältävät viestit luetuiksi ja siirrä ne valittuun "
+"kansioon."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1258,8 +1267,8 @@ msgstr "Virhe luettaessa kansiota %1: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1279,8 +1288,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1311,17 +1320,17 @@ msgstr "Poistettu"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Mikään henkilöllisyytesi ei vastaa tämän viestin vastaanottajaa."
 "<br>Valitse seuraavista osoitteesi:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Useampi henkilöllisyytesi vastaa tämän viestin vastaanottajaa."
 "<br>Valitse seuraavista osoitteesi:"
@@ -1353,18 +1362,21 @@ msgstr "Virhe pakattaessa kansiota ”%1”. Pakkaaminen keskeytetty."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Ylläpitäjä on korjannut tämän asetuksen.</p> "
-"<p>Jos kyseessä on virhe, ota yhteyttä ylläpitäjään.</p></qt>"
+"<qt> <p>Ylläpitäjä on korjannut tämän asetuksen.</p> <p>Jos kyseessä on "
+"virhe, ota yhteyttä ylläpitäjään.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Lataa profiili..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Tilin asetukset"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Lisää..."
@@ -1394,6 +1406,11 @@ msgstr "<qt>Haluatko todella poistaa henkilöllisyyden <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Poista henkilöllisyys"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Poista"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Lisää..."
@@ -1402,6 +1419,11 @@ msgstr "Lisää..."
 msgid "Modify..."
 msgstr "Muokkaa..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Poista"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Aseta oletukseksi"
@@ -1418,17 +1440,15 @@ msgstr "&Lähettäminen"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Lähtevien viestien tilit (lisää ainakin yksi):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nimi"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tyyppi"
@@ -1450,8 +1470,7 @@ msgstr "Aseta oletukseksi"
 msgid "Common Options"
 msgstr "Yleiset asetukset"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Pyydä varmistus ennen lähettämistä"
@@ -1502,17 +1521,16 @@ msgstr "&Oletustoimialue:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Oletustoimialueen avulla voidaan täydentää sähköpostiosoitteita, joissa on "
-"pelkästään käyttäjän nimi.</p></qt>"
+"<qt><p>Oletustoimialueen avulla voidaan täydentää sähköpostiosoitteita, "
+"joissa on pelkästään käyttäjän nimi.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1530,9 +1548,9 @@ msgstr "Lisää lähetystapa"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Oletus)"
 
@@ -1615,6 +1633,10 @@ msgstr "Muokkaa tiliä"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Tiliä <b>%1</b> ei löytynyt.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Värit"
@@ -1723,8 +1745,7 @@ msgstr "Seurattu linkki"
 msgid "Misspelled Words"
 msgstr "Väärin kirjoitetut sanat"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Uusi viesti"
@@ -1913,8 +1934,8 @@ msgstr "Säikeet oletuksena suljettu"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Avaa säikeet, jotka sisältävät uusia, lukemattomia, &tärkeitä tai seurattuja "
 "viestejä."
@@ -1925,69 +1946,55 @@ msgstr "Päivämäärän muoto"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Päivämäärän muoto voidaan määritellä seuraavasti:</strong></p>"
-"<ul>"
-"<li>d - päivän järjestysnumero ilman edessä olevaa nollaa (1-31)</li>"
-"<li>dd - päivän järjestysnumero edessä olevan nollan kanssa (01-31)</li>"
-"<li>ddd - päivän nimen lyhenne (Ma - Su)</li>"
-"<li>dddd - päivän nimi täydellisenä (maanantai - sunnuntai)</li>"
-"<li>M - kuukauden järjestysnumero ilman edessä olevaa nollaa (1-12)</li>"
-"<li>MM - kuukauden järjestysnumero edessä olevan nollan kanssa (01-12)</li>"
-"<li>MMM - kuukauden nimen lyhenne (tammi - joulu)</li>"
-"<li>MMMM - kuukauden nimi täydellisenä (tammikuu - joulukuu)</li>"
-"<li>yy - vuosiluku kahdella numerolla (00-99)</li>"
-"<li>yyyy - vuosiluku nelinumeroisena (0000-9999)</li></ul>"
-"<p><strong>Kellonajan muoto voidaan määritellä seuraavasti:</string></p> "
-"<ul>"
-"<li>h - tunti ilman edessä olevaa nollaa (0-23 tai 1-12, jos AP/IP-näyttö)</li>"
-"<li>hh - tunti edessä olevan nollan kanssa (00-23 tai 01-12, jos "
-"AP/IP-näyttö)</li>"
-"<li>m - minuutit ilman edessä olevaa nollaa (0-59)</li>"
-"<li>mm - minuutit edessä olevan nollan kanssa (00-59)</li>"
-"<li>s - sekunnit ilman edessä olevaa nollaa (0-59)</li>"
-"<li>ss - sekunnit edessä olevan nollan kanssa (00-59)</li>"
-"<li>z - millisekunnit ilman edessä olevaa nollaa (0-999)</li>"
-"<li>zzz - millisekunnit edessä olevan nollan kanssa (000-999)</li>"
-"<li>AP - näytä AM/PM. AP:n tilalla näytetään joko ”AM” tai ”PM”.</li>"
-"<li>ap - näytä AM/PM. ap:n tilalla näytetään joko ”am” tai ”pm”.</li>"
-"<li>Z - aikavyöhyke lukumuodossa (-0500)</li></ul>"
-"<p><strong>Kaikki muut merkit näkyvät päivämäärässä normaalisti.</strong></p>"
-"</qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Päivämäärän muoto voidaan määritellä seuraavasti:</strong></"
+"p><ul><li>d - päivän järjestysnumero ilman edessä olevaa nollaa (1-31)</"
+"li><li>dd - päivän järjestysnumero edessä olevan nollan kanssa (01-31)</"
+"li><li>ddd - päivän nimen lyhenne (Ma - Su)</li><li>dddd - päivän nimi "
+"täydellisenä (maanantai - sunnuntai)</li><li>M - kuukauden järjestysnumero "
+"ilman edessä olevaa nollaa (1-12)</li><li>MM - kuukauden järjestysnumero "
+"edessä olevan nollan kanssa (01-12)</li><li>MMM - kuukauden nimen lyhenne "
+"(tammi - joulu)</li><li>MMMM - kuukauden nimi täydellisenä (tammikuu - "
+"joulukuu)</li><li>yy - vuosiluku kahdella numerolla (00-99)</li><li>yyyy - "
+"vuosiluku nelinumeroisena (0000-9999)</li></ul><p><strong>Kellonajan muoto "
+"voidaan määritellä seuraavasti:</string></p> <ul><li>h - tunti ilman edessä "
+"olevaa nollaa (0-23 tai 1-12, jos AP/IP-näyttö)</li><li>hh - tunti edessä "
+"olevan nollan kanssa (00-23 tai 01-12, jos AP/IP-näyttö)</li><li>m - "
+"minuutit ilman edessä olevaa nollaa (0-59)</li><li>mm - minuutit edessä "
+"olevan nollan kanssa (00-59)</li><li>s - sekunnit ilman edessä olevaa nollaa "
+"(0-59)</li><li>ss - sekunnit edessä olevan nollan kanssa (00-59)</li><li>z - "
+"millisekunnit ilman edessä olevaa nollaa (0-999)</li><li>zzz - millisekunnit "
+"edessä olevan nollan kanssa (000-999)</li><li>AP - näytä AM/PM. AP:n tilalla "
+"näytetään joko ”AM” tai ”PM”.</li><li>ap - näytä AM/PM. ap:n tilalla "
+"näytetään joko ”am” tai ”pm”.</li><li>Z - aikavyöhyke lukumuodossa (-0500)</"
+"li></ul><p><strong>Kaikki muut merkit näkyvät päivämäärässä normaalisti.</"
+"strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Yleisten säikeistysasetusten muuttaminen korvaa kaikki kansiokohtaiset "
 "asetukset."
@@ -2004,8 +2011,7 @@ msgstr "Näytä HTML-tila&palkki"
 msgid "Show s&pam status in fancy headers"
 msgstr "Näytä roskapostin tila otsikkotiedoissa"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Korvaa hymiöt kuvahymiöillä"
@@ -2014,8 +2020,7 @@ msgstr "Korvaa hymiöt kuvahymiöillä"
 msgid "Use smaller font for quoted text"
 msgstr "Käytä lainatussa tekstissä pienempää kirjasinta"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Näytä lainauksen laajentamis- ja piilottamismerkit"
@@ -2041,8 +2046,7 @@ msgstr "Automaattinen"
 msgid "&Override character encoding:"
 msgstr "Pak&ota merkkien k&oodaus:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Näytä kuvake ilmoitusalueella"
@@ -2058,7 +2062,8 @@ msgstr "Näytä KMailin kuvake aina ilmoitusalueella"
 #: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr ""
-"Näytä KMailin kuvake ilmoitusalueella vain, jos kaikkia viestejä ei ole luettu"
+"Näytä KMailin kuvake ilmoitusalueella vain, jos kaikkia viestejä ei ole "
+"luettu"
 
 #: configuredialog.cpp:2563 identitydialog.cpp:408
 msgid "&Templates"
@@ -2145,23 +2150,20 @@ msgstr "<b>%f</b> korvataan muokattavan tiedoston nimellä."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Seuraavat muuttujat ovat tuettuina vastausfraaseissa:"
-"<br><b>%D</b>: päiväys, <b>%S</b>: aihe,"
-"<br><b>%e</b>: lähettäjän sähköpostiosoite, <b>%F</b>: lähettäjän nimi, <b>"
-"%f</b>: lähettäjän nimikirjaimet,"
-"<br><b>%T</b>: vastaanottajan nimi, <b>%t</b>: vastaanottajan nimi ja osoite,"
-"<br><b>%C</b>: kopion vastaanottajien nimet, <b>%c</b>"
-": kopion vastaanottajien nimet ja sähköpostiosoitteet,"
-"<br><b>%%</b>: prosenttimerkki, <b>%_</b>: välilyönti, <b>%L</b>"
-": rivinvaihto</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Seuraavat muuttujat ovat tuettuina vastausfraaseissa:<br><b>%D</b>: "
+"päiväys, <b>%S</b>: aihe,<br><b>%e</b>: lähettäjän sähköpostiosoite, <b>%F</"
+"b>: lähettäjän nimi, <b>%f</b>: lähettäjän nimikirjaimet,<br><b>%T</b>: "
+"vastaanottajan nimi, <b>%t</b>: vastaanottajan nimi ja osoite,<br><b>%C</b>: "
+"kopion vastaanottajien nimet, <b>%c</b>: kopion vastaanottajien nimet ja "
+"sähköpostiosoitteet,<br><b>%%</b>: prosenttimerkki, <b>%_</b>: välilyönti, "
+"<b>%L</b>: rivinvaihto</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2184,21 +2186,20 @@ msgstr "Vastaa &kaikille:"
 msgid "&Forward:"
 msgstr "&Välitä:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Lainausmerkit:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Kirjoitit viestissäsi (lähetysaika %D):"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%F kirjoitti viestissään (lähetysaika %D):"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Välitetty viesti"
 
@@ -2236,12 +2237,12 @@ msgstr "Anna uusi välitysetuliite"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Tämä luettelo käydään läpi jokaista lähtevää viestiä käsiteltäessä. Viesti "
-"käydään läpi alusta loppuun, jotta löydetään merkistö josta kaikki tarvittavat "
-"merkit löytyvät."
+"käydään läpi alusta loppuun, jotta löydetään merkistö josta kaikki "
+"tarvittavat merkit löytyvät."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2276,10 +2277,9 @@ msgstr "Arvo"
 msgid "Ne&w"
 msgstr "&Uusi"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nimi:"
@@ -2288,19 +2288,18 @@ msgstr "&Nimi:"
 msgid "&Value:"
 msgstr "Ar&vo:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-yhteensopiva liitteiden nimeäminen"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Käytä tätä asetusta jos haluat Outlookin(tm) ymmärtävän liitteet joiden nimissä "
-"on muita kuin englannin kielen merkkejä."
+"Käytä tätä asetusta jos haluat Outlookin(tm) ymmärtävän liitteet joiden "
+"nimissä on muita kuin englannin kielen merkkejä."
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2328,23 +2327,23 @@ msgstr "liitetty"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Muita kuin englannin kielen merkkejä sisältävien tiedostoliitteiden nimet "
 "koodataan tavalla, joka on yhteensopiva Outlookin(tm) ja muiden sellaisten "
 "sähköpostiohjelmien kanssa, jotka eivät tue standardin mukaista "
 "liitetiedostojen nimien koodausta.\n"
-"Huomaa, että tällöin KMail saattaa luoda viestejä, jotka eivät ole standardin "
-"mukaisia, ja seurauksena saattaa käydä niin, että standardia noudattavat "
-"sähköpostiohjelmat eivät pysty avaamaan sähköpostiviestiäsi. Näinollen tätä "
-"asetusta ei tulisi käyttää muuten kuin siinä tapauksessa, että muita "
-"mahdollisuuksia ei ole."
+"Huomaa, että tällöin KMail saattaa luoda viestejä, jotka eivät ole "
+"standardin mukaisia, ja seurauksena saattaa käydä niin, että standardia "
+"noudattavat sähköpostiohjelmat eivät pysty avaamaan sähköpostiviestiäsi. "
+"Näinollen tätä asetusta ei tulisi käyttää muuten kuin siinä tapauksessa, "
+"että muita mahdollisuuksia ei ole."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2368,115 +2367,100 @@ msgstr "Salauslaaje&nnukset"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Viestit tulevat joskus molemmissa muodoissa. Tämän kohdan avulla voit "
-"valita, näytetäänkö tällaisessa tapauksessa HTML- vai tekstimuotoinen "
-"viesti.</p>"
-"<p>HTML-osan näyttäminen saattaa näyttää hienommalta, mutta nostaa "
-"tietoturvariskin mahdollisuutta.</p>"
-"<p>Tekstimuotoisen viestin näyttäminen ei tuo esiin viestin asettelun "
-"hienouksia, mutta tekstimuotoisen viestin avulla on <em>melkein mahdotonta</em> "
-"yrittää hyödyntää HTML-esikatselijan (Konqueror) tietoturva-aukkoja.</p>"
-"<p>Alla oleva valinta suojaa yhtä yleistä HTML -viestien tietoturva-aukkoa "
-"vastaan, mutta se ei voi suojata ongelmilta, joista ei tiedetty kun tämä "
-"KMail-ohjelman versio tehtiin.</p>"
-"<p>HTML -viestejä <em>ei</em> kannata suosia.</p>"
-"<p><b>Huom:</b> Voit määritellä tämän asetuksen kansiokohtaisesti KMailin <i>"
-"Kansio</i>-valikosta.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Viestit tulevat joskus molemmissa muodoissa. Tämän kohdan avulla voit "
+"valita, näytetäänkö tällaisessa tapauksessa HTML- vai tekstimuotoinen viesti."
+"</p><p>HTML-osan näyttäminen saattaa näyttää hienommalta, mutta nostaa "
+"tietoturvariskin mahdollisuutta.</p><p>Tekstimuotoisen viestin näyttäminen "
+"ei tuo esiin viestin asettelun hienouksia, mutta tekstimuotoisen viestin "
+"avulla on <em>melkein mahdotonta</em> yrittää hyödyntää HTML-esikatselijan "
+"(Konqueror) tietoturva-aukkoja.</p><p>Alla oleva valinta suojaa yhtä yleistä "
+"HTML -viestien tietoturva-aukkoa vastaan, mutta se ei voi suojata "
+"ongelmilta, joista ei tiedetty kun tämä KMail-ohjelman versio tehtiin.</"
+"p><p>HTML -viestejä <em>ei</em> kannata suosia.</p><p><b>Huom:</b> Voit "
+"määritellä tämän asetuksen kansiokohtaisesti KMailin <i>Kansio</i>-valikosta."
+"</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Jotkut sähköpostimainokset ovat HTML-muodossa ja sisältävät viittauksia "
-"esimerkiksi mainoskuviin, joiden avulla nähdään, että olet lukenut viestin (nk. "
-"”web bug”-tekniikka).</p>"
-"<p>Kuvien lataamiseen internetistä ei ole mitään erityistä syytä, koska "
-"lähettäjä voi liittää kuvat suoraan viestiin.</p>"
-"<p>KMail suojautuu tällaiselta HTML-esikatselun väärinkäytöltä <em>"
-"estämällä</em> toiminnon oletuksena.</p>"
-"<p>Jos haluat tästä huolimatta katsella kuvia, joita ei ole liitetty viestiin, "
-"voit ottaa tämän asetuksen käyttöön, mutta tällöin kannattaa tiedostaa "
-"asetuksen käyttöön liittyvät ongelmat.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Jotkut sähköpostimainokset ovat HTML-muodossa ja sisältävät "
+"viittauksia esimerkiksi mainoskuviin, joiden avulla nähdään, että olet "
+"lukenut viestin (nk. ”web bug”-tekniikka).</p><p>Kuvien lataamiseen "
+"internetistä ei ole mitään erityistä syytä, koska lähettäjä voi liittää "
+"kuvat suoraan viestiin.</p><p>KMail suojautuu tällaiselta HTML-esikatselun "
+"väärinkäytöltä <em>estämällä</em> toiminnon oletuksena.</p><p>Jos haluat "
+"tästä huolimatta katsella kuvia, joita ei ole liitetty viestiin, voit ottaa "
+"tämän asetuksen käyttöön, mutta tällöin kannattaa tiedostaa asetuksen "
+"käyttöön liittyvät ongelmat.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt> "
-"<h3>Tilailmoituskäytäntö</h3> "
-"<p>Viestin tilailmoitukset (MDN, Message Disposition Notification) tarkoittavat "
-"yksinkertaistaen "
-"<p>viestin automaattista kuittaamista</p>. Lähettäjä pyytäessä tällaista "
-"ilmoitusta luo vastaanottajan sähköpostiohjelma automaattisesti vastausviestin, "
-"josta lähettäjälle selviää mitä hänen viestilleen tapahtuu. Yleisimpiin "
-"tilailmoitustyyppeihin kuuluvat <b>luettu</b>, <b>poistettu</b> ja <b>"
-"välitetty</b>.</p> "
-"<p>KMail tarjoaa seuraavat vaihtoehdot tilailmoituspyyntöjen käsittelyyn:</p> "
-"<ul> "
-"<li><em>Hylkää</em>: Jättää huomiotta kaikki tilailmoituspyynnöt. "
-"Tilailmoituksia ei lähetetä (suositeltu).</li> "
-"<li><em>Kysy</em>: Kysyy käyttäjän lupaa tilailmoituspyyntöihin vastaamiseen. "
-"Tällöin voidaan vastata vain valittuihin tilailmoituspyyntöihin jättäen muut "
-"huomiotta.</li> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt> <h3>Tilailmoituskäytäntö</h3> <p>Viestin tilailmoitukset (MDN, Message "
+"Disposition Notification) tarkoittavat yksinkertaistaen <p>viestin "
+"automaattista kuittaamista</p>. Lähettäjä pyytäessä tällaista ilmoitusta luo "
+"vastaanottajan sähköpostiohjelma automaattisesti vastausviestin, josta "
+"lähettäjälle selviää mitä hänen viestilleen tapahtuu. Yleisimpiin "
+"tilailmoitustyyppeihin kuuluvat <b>luettu</b>, <b>poistettu</b> ja "
+"<b>välitetty</b>.</p> <p>KMail tarjoaa seuraavat vaihtoehdot "
+"tilailmoituspyyntöjen käsittelyyn:</p> <ul> <li><em>Hylkää</em>: Jättää "
+"huomiotta kaikki tilailmoituspyynnöt. Tilailmoituksia ei lähetetä "
+"(suositeltu).</li> <li><em>Kysy</em>: Kysyy käyttäjän lupaa "
+"tilailmoituspyyntöihin vastaamiseen. Tällöin voidaan vastata vain "
+"valittuihin tilailmoituspyyntöihin jättäen muut huomiotta.</li> "
 "<li><em>Evää</em>: Lähettää aina <b>evätty</b>-tilailmoituksen. Tämä on vain "
 "<em>hieman</em> parempi vaihtoehto kuin tilailmoitusten lähettäminen aina. "
-"Viestin lähettäjä saa tällöinkin tietää, että hänen viestinsä on vastaanotettu, "
-"mutta hänelle ei selviä, mitä viestille on tapahtunut (luettiinko se, "
-"poistettiinko se jne.)</li> "
-"<li><em>Lähetä aina</em>: Lähettää aina pyydetyt tilailmoitukset. Tämä "
-"tarkoittaa, että lähettäjä saa tietää milloin hänen viestiään käsiteltiin ja "
-"mitä sille tapahtui (luettiin, poistettiin jne.). Tätä vaihtoehtoa ei "
-"suositella, mutta se on valittavissa koska siitä voi olla hyötyä esimerkiksi "
-"asiakassuhteiden hallinnassa.</li></ul></qt>"
+"Viestin lähettäjä saa tällöinkin tietää, että hänen viestinsä on "
+"vastaanotettu, mutta hänelle ei selviä, mitä viestille on tapahtunut "
+"(luettiinko se, poistettiinko se jne.)</li> <li><em>Lähetä aina</em>: "
+"Lähettää aina pyydetyt tilailmoitukset. Tämä tarkoittaa, että lähettäjä saa "
+"tietää milloin hänen viestiään käsiteltiin ja mitä sille tapahtui (luettiin, "
+"poistettiin jne.). Tätä vaihtoehtoa ei suositella, mutta se on valittavissa "
+"koska siitä voi olla hyötyä esimerkiksi asiakassuhteiden hallinnassa.</li></"
+"ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2492,15 +2476,15 @@ msgstr "&Anna viestien hakea kohteita Internetistä"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>VAROITUS:</b> HTML-sähköpostin salliminen tekee sinusta helpomman uhrin "
-"järjestelmämurroille ja turvallisuusrei'ille. <a href=\"whatsthis:%1\">"
-"Lisätietoja HTML-sähköposteista...</a> <a href=\"whatsthis:%2\">"
-"Lisätietoja ulkoisista viitteistä...</a>"
+"järjestelmämurroille ja turvallisuusrei'ille. <a href=\"whatsthis:"
+"%1\">Lisätietoja HTML-sähköposteista...</a> <a href=\"whatsthis:"
+"%2\">Lisätietoja ulkoisista viitteistä...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2582,8 +2566,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Tämä optio tarvitsee dirmngr 0.9.0 tai uudemman"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "ei välityspalvelinta"
@@ -2612,8 +2595,8 @@ msgstr "&Älä muuta tärkeitä viestejä vanhentuneiksi"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Kun etsitään lukemattomia viestejä:"
 
@@ -2637,8 +2620,8 @@ msgstr "Kierrä kaikissa kansioissa"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Kun siirrytään kansioon:"
 
@@ -2707,28 +2690,25 @@ msgstr "Hakemistoja (”maildir”)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Tämän kohdan avulla voit valita, millaista sähköpostilaatikon muotoa "
-"käytetään oletuksena paikallisille kansioille:</p>"
-"<p><b>mbox:</b> KMailin sähköpostikansiot tallennetaan yhteen tiedostoon, jossa "
-"kukin viesti erotetaan rivillä, joka alkaa tekstillä ”From ”. Tämä vaihtoehto "
-"säästää levytilaa, mutta saattaa toimia hitaammin esimerkiksi silloin, kun "
-"viestejä siirretään kansiosta toiseen.</p>"
-"<p><b>maildir:</b> KMailin sähköpostikansiot tallennetaan hakemistoon, jossa "
-"kukin viesti on oma tiedostonsa. Tämä vaihtoehto vie hieman enemmän levytilaa, "
-"mutta saattaa toimia nopeammin esim. silloin, kun viestejä siirretään kansiosta "
-"toiseen.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Tämän kohdan avulla voit valita, millaista sähköpostilaatikon muotoa "
+"käytetään oletuksena paikallisille kansioille:</p><p><b>mbox:</b> KMailin "
+"sähköpostikansiot tallennetaan yhteen tiedostoon, jossa kukin viesti "
+"erotetaan rivillä, joka alkaa tekstillä ”From ”. Tämä vaihtoehto säästää "
+"levytilaa, mutta saattaa toimia hitaammin esimerkiksi silloin, kun viestejä "
+"siirretään kansiosta toiseen.</p><p><b>maildir:</b> KMailin "
+"sähköpostikansiot tallennetaan hakemistoon, jossa kukin viesti on oma "
+"tiedostonsa. Tämä vaihtoehto vie hieman enemmän levytilaa, mutta saattaa "
+"toimia nopeammin esim. silloin, kun viestejä siirretään kansiosta toiseen.</"
+"p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2761,55 +2741,45 @@ msgstr "Gt"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Yritettäessä siirtyä seuraavaan lukemattomaan viestiin voi käydä niin, "
-"ettänykyisen viestin jälkeen ei ole enää lukemattomia viestejä.</p> "
-"<ul>"
-"<li><b>Älä kierrä:</b> Haku pysähtyy nykyisen kansion viimeiseen viestiin.</li> "
-"<li><b>Kierrä samassa kansiossa:</b> Haku jatkuu viestiluettelon alusta, mutta "
-"ei siirry toiseen kansioon.</li> "
-"<li><b>Kierrä kaikissa kansioissa:</b> Haku jatkuu viestiluettelon alusta. "
-"Mikäli lukemattomia viestejä ei ole, haku siirtyy seuraavaan kansioon.</li> "
-"</ul>"
-"<p>Vastaavasti etsittäessä edellistä lukematonta viestiä haku alkaa "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Yritettäessä siirtyä seuraavaan lukemattomaan viestiin voi käydä "
+"niin, ettänykyisen viestin jälkeen ei ole enää lukemattomia viestejä.</p> "
+"<ul><li><b>Älä kierrä:</b> Haku pysähtyy nykyisen kansion viimeiseen "
+"viestiin.</li> <li><b>Kierrä samassa kansiossa:</b> Haku jatkuu "
+"viestiluettelon alusta, mutta ei siirry toiseen kansioon.</li> <li><b>Kierrä "
+"kaikissa kansioissa:</b> Haku jatkuu viestiluettelon alusta. Mikäli "
+"lukemattomia viestejä ei ole, haku siirtyy seuraavaan kansioon.</li> </"
+"ul><p>Vastaavasti etsittäessä edellistä lukematonta viestiä haku alkaa "
 "viestiluettelon lopusta ja jatkuu edelliseen kansioon riippuen siitä, mikä "
 "vaihtoehto on valittuna.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Kokotekstihakutietokanta mahdollistaa erittäin nopeat haut "
-"sähköpostiviestien sisällöstä. Kun se on kytketty päälle, hakutoiminto toimii "
-"erittäin nopeasti ja hakutyökalurivi valitsee viestejä myös niiden sisällön "
-"perusteella.</p> "
-"<p>Kokotekstihakutietokanta varaa jonkin verran kiintolevytilaa (noin puolet "
-"viestien todellisesta koosta).</p> "
-"<p>Kun kokotekstihakutietokanta otetaan käyttöön on tietokanta vielä luotava, "
-"mutta voit jatkaa KMailin käyttöä tätä toimintoa suoritettaessa.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt> <p>Kokotekstihakutietokanta mahdollistaa erittäin nopeat haut "
+"sähköpostiviestien sisällöstä. Kun se on kytketty päälle, hakutoiminto "
+"toimii erittäin nopeasti ja hakutyökalurivi valitsee viestejä myös niiden "
+"sisällön perusteella.</p> <p>Kokotekstihakutietokanta varaa jonkin verran "
+"kiintolevytilaa (noin puolet viestien todellisesta koosta).</p> <p>Kun "
+"kokotekstihakutietokanta otetaan käyttöön on tietokanta vielä luotava, mutta "
+"voit jatkaa KMailin käyttöä tätä toimintoa suoritettaessa.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2822,8 +2792,8 @@ msgstr "&Käytä IMAP-resurssikansioita"
 #: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr ""
-"Tämä mahdollistaa IMAP-kansioiden käytön tiedon tallennukseen "
-"Kontact-sovelluksissa."
+"Tämä mahdollistaa IMAP-kansioiden käytön tiedon tallennukseen Kontact-"
+"sovelluksissa."
 
 #: configuredialog.cpp:4829
 msgid "&Format used for the groupware folders:"
@@ -2877,8 +2847,8 @@ msgstr "&Piilota työryhmäkansiot"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Tämän valinnan ollessa käytössä IMAP-resurssikansiot eivät näy kansiopuussa. "
 
@@ -2888,8 +2858,8 @@ msgstr "Näytä tälle tilille vain &Ryhmätyökansiot"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Tällä valinnalla tavalliset sähköpostikansiot eivät näy ryhmätyölle asetetun "
 "tunnuksen kansiopuussa."
@@ -2947,23 +2917,22 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Kun Microsoftin Outlookilla on ongelmia ymmärtää standardia "
-"groupware-sähköpostia Microsoft Exchange -palvelimen kanssa. Aseta tämä valinta "
+"Kun Microsoftin Outlookilla on ongelmia ymmärtää standardia groupware-"
+"sähköpostia Microsoft Exchange -palvelimen kanssa. Aseta tämä valinta "
 "lähettääksesi groupware-kutsut Microsoft Exchangen ymmärtämässä muodossa."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-yhteensopiva liitteiden nimeäminen"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automaattinen kutsuviestien lähetys"
@@ -2978,24 +2947,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>"
-"<p>Kutsut lähetetään normaalisti sähköpostin liitteinä. Tämän valinnan ollessa "
-"käytössä ne lähetetään sähköpostiviestin rungossa; tämä on välttämätöntä, "
-"mikäli edellytetään yhteensopivuutta Microsoft Outlookin(tm) kanssa.</p> "
-"<p>Tämä asetus estää kuvaavan, sähköpostiohjelmassa näkyvän tekstin käytön, "
-"joten kutsuviestejä ymmärtämättömien sähköpostiohjelmien käyttäjille viestit "
-"näyttävät hyvin erikoisilta. </p>"
-"<p>Kutsuviestejä ymmärtävien sähköpostiohjelmien käyttäjät pystyvät edelleen "
-"lukemaan näitä viestejä.</p></qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt><p>Kutsut lähetetään normaalisti sähköpostin liitteinä. Tämän valinnan "
+"ollessa käytössä ne lähetetään sähköpostiviestin rungossa; tämä on "
+"välttämätöntä, mikäli edellytetään yhteensopivuutta Microsoft Outlookin(tm) "
+"kanssa.</p> <p>Tämä asetus estää kuvaavan, sähköpostiohjelmassa näkyvän "
+"tekstin käytön, joten kutsuviestejä ymmärtämättömien sähköpostiohjelmien "
+"käyttäjille viestit näyttävät hyvin erikoisilta. </p><p>Kutsuviestejä "
+"ymmärtävien sähköpostiohjelmien käyttäjät pystyvät edelleen lukemaan näitä "
+"viestejä.</p></qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3099,28 +3067,26 @@ msgstr "Välitä"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 "<qt>Täällä voi lisätä, muokata ja poistaa mukautettuja viestipohjia, joita "
 "käytetään vastausta tai välitettävää viestiä kirjoitettaessa. Luo mukautettu "
 "pohja hiiren toisen painikkeen valikosta tai työkalupalkista. Viestipohjaan "
-"voidaan myös liittää näppäinoikotie nopeuttamaan käyttöä.</p>"
-"<p>Viestipohjat tukevat korvauskomentoja, jotka voi joko kirjoittaa tai valita "
-"valikosta <i>Lisää komento</i>.</p>"
-"<p>Mukautettuja viestipohjia on neljää tyyppiä, käyttökohteiden mukaan: <i>"
-"Vastaa</i>, <i>Vastaa kaikille</i>, <i>Välitä</i> ja <i>Yleinen</i>"
-", jota voidaan käyttää kaikkiin toimintoihin. Näppäinoikotietä ei voi liittää "
-"<i>Yleisiin</i> viestipohjiin.</p></qt>"
+"voidaan myös liittää näppäinoikotie nopeuttamaan käyttöä.</p><p>Viestipohjat "
+"tukevat korvauskomentoja, jotka voi joko kirjoittaa tai valita valikosta "
+"<i>Lisää komento</i>.</p><p>Mukautettuja viestipohjia on neljää tyyppiä, "
+"käyttökohteiden mukaan: <i>Vastaa</i>, <i>Vastaa kaikille</i>, <i>Välitä</i> "
+"ja <i>Yleinen</i>, jota voidaan käyttää kaikkiin toimintoihin. "
+"Näppäinoikotietä ei voi liittää <i>Yleisiin</i> viestipohjiin.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3137,15 +3103,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3163,8 +3129,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Valittua pikavalintaa käyttää jo toinen mukautettu viestipohja, haluatko silti "
-"tehdä liitoksen?"
+"Valittua pikavalintaa käyttää jo toinen mukautettu viestipohja, haluatko "
+"silti tehdä liitoksen?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3219,8 +3185,8 @@ msgstr "Muokkaa henkilöllisyyttä"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3323,7 +3289,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Viestejä kansiosta %1 ei voi merkitä vanhentuneiksi: kohdekansiota %2 ei löydy"
+"Viestejä kansiosta %1 ei voi merkitä vanhentuneiksi: kohdekansiota %2 ei "
+"löydy"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3481,6 +3448,11 @@ msgstr "Valitse kansio"
 msgid "Filters"
 msgstr "Suodin %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Valitse kaikki tekstit"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3512,8 +3484,8 @@ msgstr "Kirjaa suodintoiminnot &lokiin"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Suodatustoimenpiteiden kirjaaminen lokiin kytketään päälle ja pois tästä. "
 "Lokitietoa kerätään ja näytetään tietysti vain toiminnon ollessa käytössä."
@@ -3532,14 +3504,15 @@ msgstr "Kirjoita suodinsääntöjen käyttö lokiin"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Lokiin kirjattavia tietoja suotimien käytöstä hallitaan tästä: tämän valinnan "
-"ollessa käytössä lokiin kirjataan tarkat tiedot jokaisen suodinsäännön "
-"käytöstä. Muutoin vain koko suotimen antama tulos kirjataan."
+"Lokiin kirjattavia tietoja suotimien käytöstä hallitaan tästä: tämän "
+"valinnan ollessa käytössä lokiin kirjataan tarkat tiedot jokaisen "
+"suodinsäännön käytöstä. Muutoin vain koko suotimen antama tulos kirjataan."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3559,15 +3532,15 @@ msgstr "rajoittamaton"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Lokitiedon käyttämänen käyttää keskusmuistia tiedon väliaikaiseen "
 "tallentamiseen. Tällä asetuksella rajoitetaan käytettävän muistin määrää. "
-"Mikäli kerätyn lokitiedon koko ylittää tämän rajan, vanhimpia tietoja hylätään "
-"kunnes käytetty muistin määrä on jälleen rajan alapuolella."
+"Mikäli kerätyn lokitiedon koko ylittää tämän rajan, vanhimpia tietoja "
+"hylätään kunnes käytetty muistin määrä on jälleen rajan alapuolella."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3577,7 +3550,7 @@ msgstr ""
 "Tiedostoon %1 ei voitu kirjoittaa.\n"
 "Yksityiskohtainen virhekuvaus: ”%2”"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail-virhe"
@@ -3618,13 +3591,14 @@ msgstr "&Käyttäjän tunniste:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Käyttäjän tunniste on IMAP-palvelimelle kirjautumiseen käytettävä tunnus. Tämä "
-"voi olla yksinkertainen käyttäjänimi tai käyttäjän koko sähköpostiosoite. "
-"Käyttäjätunnus selviää palveluntarjoajan toimittamista tiedoista."
+"Käyttäjän tunniste on IMAP-palvelimelle kirjautumiseen käytettävä tunnus. "
+"Tämä voi olla yksinkertainen käyttäjänimi tai käyttäjän koko "
+"sähköpostiosoite. Käyttäjätunnus selviää palveluntarjoajan toimittamista "
+"tiedoista."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3675,8 +3649,8 @@ msgstr "Sinulla ei ole luku/kirjoitus-oikeuksia poistetut-kansioon."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Tietoja ei ole vielä haettu palvelimelta. Käytä ”Tarkista viestit”-toimintoa."
 
@@ -3688,8 +3662,7 @@ msgstr "Virhe: Tälle kansiolle ei ole määritelty IMAP-tunnusta"
 msgid "Connecting to server %1, please wait..."
 msgstr "Yhdistetään palvelimelle %1. Odota hetki..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Tapahtui virhe yhdistettäessä palvelimelle %1"
@@ -3717,11 +3690,11 @@ msgstr "Lisää oikeuksia"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Haluatko todella poistaa oikeutesi tähän kansioon? Tämän jälkeen et pysty enää "
-"käyttämään kansiota."
+"Haluatko todella poistaa oikeutesi tähän kansioon? Tämän jälkeen et pysty "
+"enää käyttämään kansiota."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3752,7 +3725,7 @@ msgstr "Käyttö:"
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
@@ -3776,12 +3749,12 @@ msgstr "Valitse pikanäppäin kansiolle"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Määrittääksesi tälle kansiolle pikanäppäimen tai näppäinyhdistelmän, paina "
-"allaolevaa painiketta ja syötä haluamasi näppäinyhdistelmä.</qt>"
+"<qt>Määrittääksesi tälle kansiolle pikanäppäimen tai näppäinyhdistelmän, "
+"paina allaolevaa painiketta ja syötä haluamasi näppäinyhdistelmä.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3801,13 +3774,22 @@ msgstr "&Peruuta"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Poistettu kansio liittyi tiliin <b>%1</b>, joka toimitti postia sinne. Nyt "
-"kansio tämä tili on uudelleenasetettu toimittamaan posti "
-"Saapuneet-kansioon.</qt>"
+"<qt>Poistettu kansio liittyi tiliin <b>%1</b>, joka toimitti postia sinne. "
+"Nyt kansio tämä tili on uudelleenasetettu toimittamaan posti Saapuneet-"
+"kansioon.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3932,67 +3914,17 @@ msgstr "Roskapostin tila:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>v"
-"<br>i"
-"<br>e"
-"<br>s"
-"<br>t"
-"<br>i</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br>-<br>v<br>i<br>e<br>s<br>t<br>i</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt> "
-"<br>E "
-"<br>i"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>v"
-"<br>i"
-"<br>e"
-"<br>s"
-"<br>t"
-"<br>i</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt> <br>E <br>i<br> <br>H<br>T<br>M<br>L<br>-"
+"<br>v<br>i<br>e<br>s<br>t<br>i</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4004,19 +3936,13 @@ msgstr "&Nimi:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Nimi</h3>"
-"<p>Tässä kentässä pitäisi olla nimesi, jonka haluat näkyvän lähetetyisä "
-"viesteissä.</p>"
-"<p>Jos jätät tämän tyhjäksi, vain sähköpostiosoite näytetään "
-"vastaanottajalle.</p></qt>"
+"<qt><h3>Nimi</h3><p>Tässä kentässä pitäisi olla nimesi, jonka haluat näkyvän "
+"lähetetyisä viesteissä.</p><p>Jos jätät tämän tyhjäksi, vain "
+"sähköpostiosoite näytetään vastaanottajalle.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4024,16 +3950,12 @@ msgstr "Organi&saatio:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organisaatio</h3> "
-"<p>Tähän kenttään määritellään organisaatio, mikäli haluat sen "
-"näkyvänlähetettävien viestien otsikkotiedoissa.</p> "
+"<qt> <h3>Organisaatio</h3> <p>Tähän kenttään määritellään organisaatio, "
+"mikäli haluat sen näkyvänlähetettävien viestien otsikkotiedoissa.</p> "
 "<p>Kohdan voi jättää tyhjäksi.</p></qt>"
 
 #: identitydialog.cpp:149
@@ -4043,20 +3965,16 @@ msgstr "&Sähköpostiosoite:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Sähköpostiosoite</h3>"
-"<p>Syötä tähän kenttään täydellinen sähköpostiosoitteesi.</p> "
-"<p>Mikäli jätät tämän kohdan tyhjäksi tai asetat siihen virheellisen osoitteen, "
-"muut eivät pysty vastaamaan viesteihisi.</p></qt>"
+"<qt><h3>Sähköpostiosoite</h3><p>Syötä tähän kenttään täydellinen "
+"sähköpostiosoitteesi.</p> <p>Mikäli jätät tämän kohdan tyhjäksi tai asetat "
+"siihen virheellisen osoitteen, muut eivät pysty vastaamaan viesteihisi.</p></"
+"qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4065,21 +3983,12 @@ msgstr "&Sähköpostiosoite:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4103,21 +4012,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tässä asetettavaa OpenPGP-avainta käytetään sähköpostiviestien sähköiseen "
-"allekirjoittamiseen. Voit käyttää myös GnuPG-avaimia.</p> "
-"<p>Voit jättää tämän kohdan tyhjäksi, mutta tällöin KMail ei pysty "
-"allekirjoittamaan viestejä sähköisesti OpenPGP:llä. Tavallisiin "
-"sähköpostitoimintoihin asetuksella ei ole vaikutusta.</p> "
-"<p>Lisätietoa salausavaimista löytyy osoitteesta <a>http://www.gnupg.org</a></p>"
-"</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Tässä asetettavaa OpenPGP-avainta käytetään sähköpostiviestien "
+"sähköiseen allekirjoittamiseen. Voit käyttää myös GnuPG-avaimia.</p> <p>Voit "
+"jättää tämän kohdan tyhjäksi, mutta tällöin KMail ei pysty allekirjoittamaan "
+"viestejä sähköisesti OpenPGP:llä. Tavallisiin sähköpostitoimintoihin "
+"asetuksella ei ole vaikutusta.</p> <p>Lisätietoa salausavaimista löytyy "
+"osoitteesta <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4129,31 +4035,27 @@ msgstr "OpenPGP-salausavaimesi"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Valitse OpenPGP-avain, jota tulisi käyttää lähetettävänä julkisena avaimena "
 "sekä salattaessa viestejä itsellesi."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>Tässä asetettua OpenPGP-avainta käytetään lähetettävänä julkisena avaimena "
-"sekä salattaessa viestejä itsellesi. Voit käyttää myös GnuPG-avaimia.</p>"
-"<p>Kentän voi jättää tyhjäksi, mutta tällöin lähetettävistä "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>Tässä asetettua OpenPGP-avainta käytetään lähetettävänä julkisena "
+"avaimena sekä salattaessa viestejä itsellesi. Voit käyttää myös GnuPG-"
+"avaimia.</p><p>Kentän voi jättää tyhjäksi, mutta tällöin lähetettävistä "
 "sähköpostiviesteistä ei pystytä salaamaan kopiota itsellesi. Tavallisiin "
-"sähköpostitoimintoihin tällä ei ole vaikutusta.</p> "
-"<p>Lisätietoa salausavaimista löytyy osoitteesta <a>http://www.gnupg.org</a>"
-". </p></qt>"
+"sähköpostitoimintoihin tällä ei ole vaikutusta.</p> <p>Lisätietoa "
+"salausavaimista löytyy osoitteesta <a>http://www.gnupg.org</a>. </p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4171,18 +4073,15 @@ msgstr "Valitse viestien allekirjoittamiseen käytettävä S/MIME-varmenne."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Tässä asetettavaa S/MIME-varmennetta (X.509) käytetään viestien sähköiseen "
-"allekirjoittamiseen.</p> "
-"<p>Kentän voi jättää tyhjäksi, mutta sähköpostiviestejä ei tällöin pystytä "
-"allekirjoittamaan S/MIMEllä. Tavallisiin sähköpostitoimintoihin tällä ei ole "
-"vaikutusta.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
+msgstr ""
+"<qt> <p>Tässä asetettavaa S/MIME-varmennetta (X.509) käytetään viestien "
+"sähköiseen allekirjoittamiseen.</p> <p>Kentän voi jättää tyhjäksi, mutta "
+"sähköpostiviestejä ei tällöin pystytä allekirjoittamaan S/MIMEllä. "
+"Tavallisiin sähköpostitoimintoihin tällä ei ole vaikutusta.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4194,27 +4093,25 @@ msgstr "S/MIME-salausvarmenne"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Valitse S/MIME-varmenne, jota tulisi käyttää lähetettävänä varmenteena sekä "
 "salattaessa viestejä itsellesi."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tässä asetettavaa S/MIME-varmennetta käytetään lähetettävänä varmenteena "
-"sekä viestien salaamiseen itsellesi.</p>"
-"<p>Kentän voi jättää tyhjäksi, mutta tällöin lähetettävistä "
-"sähköpostiviesteistä ei pystytä salaamaan kopiota itsellesi. Tavallisiin "
-"sähköpostitoimintoihin tällä ei ole vaikutusta.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Tässä asetettavaa S/MIME-varmennetta käytetään lähetettävänä "
+"varmenteena sekä viestien salaamiseen itsellesi.</p><p>Kentän voi jättää "
+"tyhjäksi, mutta tällöin lähetettävistä sähköpostiviesteistä ei pystytä "
+"salaamaan kopiota itsellesi. Tavallisiin sähköpostitoimintoihin tällä ei ole "
+"vaikutusta.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4234,23 +4131,20 @@ msgstr "&Vastausosoite:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Vastausosoite</h3>"
-"<p>Tämä asettaa <tt>Reply-to:</tt>-otsikkotiedon sisältämään jonkun toisen "
-"sähköpostiosoitteen kuin <tt>Keneltä:</tt> kentässä on.</p>"
-"<p>Tämä voi olla hyödyllistä, jos sinulla on ryhmä ihmisiä, jotka toimivat "
-"samoissa rooleissa. Haluat esimerkiksi, että lähtevissä sähköposteissa on <tt>"
-"Keneltä:</tt> kentässä nimesi, mutta vastaukset menevät ryhmäosoitteeseen.</p> "
-"<p>Jos et ole varma, mitä tähän tulisi lisätä, jätä kohta tyhjäksi.</p></qt> "
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Vastausosoite</h3><p>Tämä asettaa <tt>Reply-to:</tt>-otsikkotiedon "
+"sisältämään jonkun toisen sähköpostiosoitteen kuin <tt>Keneltä:</tt> "
+"kentässä on.</p><p>Tämä voi olla hyödyllistä, jos sinulla on ryhmä ihmisiä, "
+"jotka toimivat samoissa rooleissa. Haluat esimerkiksi, että lähtevissä "
+"sähköposteissa on <tt>Keneltä:</tt> kentässä nimesi, mutta vastaukset "
+"menevät ryhmäosoitteeseen.</p> <p>Jos et ole varma, mitä tähän tulisi "
+"lisätä, jätä kohta tyhjäksi.</p></qt> "
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4258,24 +4152,20 @@ msgstr "&Piilokopio-osoitteet:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (piilokopio) -osoitteet</h3>"
-"<p>Jos määrittelet tähän kohtaan osoitteita, jokaisesta tällä sähköpostitilillä "
-"lähetetystä viestistä lähetetään piilokopio k.o. osoitteisiin. Osoitteet eivät "
-"näy muiden vastaanottajien viesteissä.</p>"
-"<p>Tämän toiminnon avulla voit lähettää automaattisesti kopion lähettämistäsi "
-"viesteistä muille käyttämillesi sähköpostitileille.</p>"
-"<p>Jos et ole varma, mitä tähän tulisi lisätä, jätä kohta tyhjäksi.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (piilokopio) -osoitteet</h3><p>Jos määrittelet tähän kohtaan "
+"osoitteita, jokaisesta tällä sähköpostitilillä lähetetystä viestistä "
+"lähetetään piilokopio k.o. osoitteisiin. Osoitteet eivät näy muiden "
+"vastaanottajien viesteissä.</p><p>Tämän toiminnon avulla voit lähettää "
+"automaattisesti kopion lähettämistäsi viesteistä muille käyttämillesi "
+"sähköpostitileille.</p><p>Jos et ole varma, mitä tähän tulisi lisätä, jätä "
+"kohta tyhjäksi.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4313,7 +4203,7 @@ msgstr "&Allekirjoitus"
 msgid "&Picture"
 msgstr "&Kuva"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Virheellinen sähköpostiosoite"
 
@@ -4336,11 +4226,11 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Jokin valituista OpenPGP-salausavaimista ei sisällä yhtään käyttäjätunnistetta "
-"asetetulla sähköpostiosoitteella (%1)."
+"Jokin valituista OpenPGP-salausavaimista ei sisällä yhtään "
+"käyttäjätunnistetta asetetulla sähköpostiosoitteella (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4401,8 +4291,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (oletus)"
 
@@ -4449,14 +4339,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr "Asetukset siirrettiin automaattisesti, mutta ne kannattaa tarkistaa."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Asetustesi automaattinen muokkaus ei onnistunut. Tarkista tilin asetukset."
 
@@ -4498,17 +4388,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Virhe: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Yhteys palvelimelle %1 katkesi. Yhteys avataan uudelleen automaattisesti, jos "
-"vain mahdollista."
+"Yhteys palvelimelle %1 katkesi. Yhteys avataan uudelleen automaattisesti, "
+"jos vain mahdollista."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4657,14 +4552,14 @@ msgstr "Lista-arkistot"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4693,25 +4588,23 @@ msgstr "Käyttökelvottomia salausavaimia"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</"
+"p> <p>vanhenee alle päivässä.</p>\n"
+"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</"
+"p> <p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>OpenPGP-salausavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
 "<p>vanhenee alle päivässä.</p>\n"
@@ -4721,181 +4614,151 @@ msgstr ""
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> <p>vanhenee "
+"alle päivässä.</p>\n"
+"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> <p>vanhenee "
+"%n päivässä.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee alle "
+"päivässä.</p>\n"
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee %n "
+"päivässä.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee alle "
+"päivässä.</p>\n"
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee %n "
+"päivässä.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
+"<p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee alle päivässä."
+"</p>\n"
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee %n päivässä.</"
+"p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
+"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee "
+"alle päivässä.</p>\n"
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee "
+"%n päivässä.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>vanhenee alle päivässä.</p>\n"
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>vanhenee alle päivässä.</p>\n"
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>S/MIME-varmenne</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
 "<p>vanhenee alle päivässä.</p>\n"
@@ -4914,24 +4777,22 @@ msgstr "S/MIME-varmenne vanhenee kohta"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</"
+"p> <p>vanhenee alle päivässä.</p>\n"
+"<p>OpenPGP-allekirjoitusavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</"
+"p> <p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>OpenPGP-salausavaimesi</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
 "<p>vanhenee alle päivässä.</p>\n"
@@ -4940,172 +4801,142 @@ msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> <p>vanhenee "
+"alle päivässä.</p>\n"
+"<p>OpenPGP-avain</p> <p align=center><b>%1</b> (KeyID 0x%2)</p> <p>vanhenee "
+"%n päivässä.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee alle "
+"päivässä.</p>\n"
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee %n "
+"päivässä.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee alle "
+"päivässä.</p>\n"
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee %n "
+"päivässä.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
+"<p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee alle päivässä."
+"</p>\n"
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>juurivarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>juurivarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee %n päivässä.</"
+"p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
 "<p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee alle päivässä.</p>\n"
+"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee "
+"alle päivässä.</p>\n"
 "<p>S/MIME-varmenteen</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>välillinen takausvarmenne</p> <p align=center><b>%3</b></p> <p>vanhenee "
+"%n päivässä.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> "
-"(sarjanumero%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>vanhenee alle päivässä.</p>\n"
+"<p>S/MIME-allekirjoitusvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero"
+"%2)</p> <p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>vanhenee alle päivässä.</p>\n"
-"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
-"<p>vanhenee %n päivässä.</p>"
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>vanhenee alle päivässä.</p>\n"
+"<p>S/MIME-salausvarmenteesi</p> <p align=center><b>%1</b> (sarjanumero%2)</"
+"p> <p>vanhenee %n päivässä.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>S/MIME-varmenne</p> <p align=center><b>%1</b> (sarjanumero%2)</p> "
 "<p>vanhenee alle päivässä.</p>\n"
@@ -5122,15 +4953,16 @@ msgstr "S/MIME-varmenne vanhenee kohta"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Yhtä tai usempaa asettamistasi OpenPGP-avaimista tai S/MIME-varmenteista ei voi "
-"käyttää salaukseen. Tarkista salausavaimesi ja varmenteesi henkilöllisyyden "
-"asetusikkunassa.\n"
+"Yhtä tai usempaa asettamistasi OpenPGP-avaimista tai S/MIME-varmenteista ei "
+"voi käyttää salaukseen. Tarkista salausavaimesi ja varmenteesi "
+"henkilöllisyyden asetusikkunassa.\n"
 "Jos jatkat nyt, ja avaimia tarvitaan myöhemmin, käytettäviä avaimia kysytään "
 "tarvittaessa."
 
@@ -5146,8 +4978,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Yhtä tai usempaa asettamistasi OpenPGP-avaimista tai S/MIME-varmenteista ei voi "
-"käyttää allekirjoittamiseen. Tarkista salausavaimesi ja varmenteesi "
+"Yhtä tai usempaa asettamistasi OpenPGP-avaimista tai S/MIME-varmenteista ei "
+"voi käyttää allekirjoittamiseen. Tarkista salausavaimesi ja varmenteesi "
 "henkilöllisyyden asetusikkunassa.\n"
 "Jos jatkat nyt, ja avaimia tarvitaan myöhemmin, käytettäviä avaimia kysytään "
 "tarvittaessa."
@@ -5160,10 +4992,10 @@ msgstr "Käyttökelvottomia allekirjoitusavaimia"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Vastaanottajan salausasetusten mukaan sähköposti tulisi salata OpenPGP:llä, "
 "mutta luotettuja OpenPGP-avaimia ei ole asetettu tälle henkilöllisyydelle.\n"
@@ -5174,26 +5006,27 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Vastaanottajan salausasetusten mukaan sähköposti tulisi salata OpenPGP:llä, "
-"mutta kelvollisia S/MIME-varmenteita ei ole asetettu tälle henkilöllisyydelle.\n"
+"mutta kelvollisia S/MIME-varmenteita ei ole asetettu tälle "
+"henkilöllisyydelle.\n"
 "On mahdollista jatkaa salaamatta sähköpostiviestejä itsellesi, mutta huomaa, "
 "että tällöin et pysty lukemaan lähettämiäsi viestejä myöhemmin."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Vastaanottajan allekirjoitusasetusten mukaan sähköposti tulisi allekirjoittaa "
-"OpenPGP:llä, mutta kelvollisia OpenPGP-allekirjoitusavaimia ei ole asetettu "
-"tälle henkilöllisyydelle."
+"Vastaanottajan allekirjoitusasetusten mukaan sähköposti tulisi "
+"allekirjoittaa OpenPGP:llä, mutta kelvollisia OpenPGP-allekirjoitusavaimia "
+"ei ole asetettu tälle henkilöllisyydelle."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5201,14 +5034,14 @@ msgstr "Älä allekirjoita OpenPGP:llä"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Vastaanottajan allekirjoitusasetusten mukaan sähköposti tulisi allekirjoittaa "
-"S/MIMEllä, mutta kelvollisia S/MIME-allekirjoitusvarmenteita ei ole asetettu "
-"tälle henkilöllisyydelle."
+"Vastaanottajan allekirjoitusasetusten mukaan sähköposti tulisi "
+"allekirjoittaa S/MIMEllä, mutta kelvollisia S/MIME-allekirjoitusvarmenteita "
+"ei ole asetettu tälle henkilöllisyydelle."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5231,8 +5064,8 @@ msgstr "Allekirjoittaminen ei ole mahdollista"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Omaa salausavainta ei ole asetettu. Mikäli sähköpostiviesti lähetetään "
 "salattuna, et pysty itse avaamaan sitä myöhemmin."
@@ -5255,10 +5088,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Viestin minkään vastaanottajan salausavainta ei ole valittu. Viestiä ei salata."
+"Viestin minkään vastaanottajan salausavainta ei ole valittu. Viestiä ei "
+"salata."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5302,11 +5136,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Seuraaville vastaanottajille ei löytynyt kelvollisia ja luotettuja "
 "salausavaimia: %1\n"
@@ -5356,10 +5190,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kriittinen virhe: Ei voitu kerätä sähköpostia: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Viestin lisäys epäonnistui:\n"
+msgid "Failed to add message:\n"
+msgstr "Viestin lisäys epäonnistui:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5449,6 +5281,50 @@ msgstr "&Katkaistava IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir -postilaatikko"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Aseta viestin aihe"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Lähetä kopio osoitteeseen."
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Lähetä piilokopio osoitteeseen."
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Lisää viestiin otsikko."
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Lue viestirunko tiedostosta."
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Aseta viestin runko"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Lisää viestiin liite. Tätä voi toistaa."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Tarkista vain saapuneet viestit"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Avaa vain kirjoitusikkuna."
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Näytä annettu viestitiedosto"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Viesti"
@@ -5505,14 +5381,13 @@ msgstr "%1: löytyi kansio %2. Se asetetaan pääryhmätyökansioksi."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>Kmail löysi seuraavat ryhmätyökansiot kohteesta %1 ja haluaa tehdä "
-"seuraavat operaatiot: %2"
-"<br>Jos et halua tehdä tätä, paina ”Ei”, ja IMAP-resurssit otetaan pois "
-"käytöstä."
+"seuraavat operaatiot: %2<br>Jos et halua tehdä tätä, paina ”Ei”, ja IMAP-"
+"resurssit otetaan pois käytöstä."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5561,11 +5436,11 @@ msgstr "URL kopioitu leikepöydälle."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Tiedosto <b>%1</b> on jo olemassa.<br>Haluatko korvata sen?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Tallenna tiedostoon"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Korvaa"
 
@@ -5583,7 +5458,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Viesti poistettiin talletuksen aikana. Sitä ei ole talletettu."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5604,11 +5479,11 @@ msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Tiedosto sisältää useita viestejä, mutta vain ensimmäinen viesti näytetään."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5617,101 +5492,101 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Suodatetaan viestejä"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Suodatetaan %2:n viestiä %1"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Levytilaa ei ehkä ole tarpeeksi vapaana."
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Siirrä tähän kansioon"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopioi tähän kansioon"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Siirretään viestejä"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Poistetaan viestejä"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Avataan URL:ää..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Haluatko todella suorittaa komennon <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Suorita"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Tallennettavia liitteitä ei löytynyt."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Tallenna liiteet kansioon"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "liite.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "liite.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Tiedosto nimellä %1 on jo olemassa. Haluatko, että se korvataan?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "K&orvaa"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "Viestin %1 on salattu. Haluatko säilyttää salauksen tallennettaessa?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-kysymys"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Pidä salaus"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Älä pidä salausta"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5719,11 +5594,11 @@ msgstr ""
 "Viestin %1 on allekirjoitettu. Haluatko säilyttää allekirjoituksen "
 "tallennettaessa?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Pidä allekirjoitus"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5732,21 +5607,22 @@ msgstr ""
 "Ei voitu kirjoittaa tiedostoa %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "En voitu kirjoittaa tiedostoa %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Tätä sähköpostiosoitetta ei löytynyt osoitekirjasta. Lisää osoite osoitekirjaan "
-"ja ja lisää pikaviestiohjelman osoitteet käyttämällä pikaviestiohjelmaa."
+"Tätä sähköpostiosoitetta ei löytynyt osoitekirjasta. Lisää osoite "
+"osoitekirjaan ja ja lisää pikaviestiohjelman osoitteet käyttämällä "
+"pikaviestiohjelmaa."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5756,74 +5632,74 @@ msgstr ""
 "%1\n"
 " en voi tietää, kenen kanssa haluat keskustella."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus-ajuri ei tarjoa ”x-obtain-keys”-funktiota. Raportoi tämä bugi."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus-ajurin virhe"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Odottamaton paluuarvo Chiasmus-ajurilta: ”x-obtain-keys”-funktio ei palauttanut "
-"merkkijonolistaa. Raportoi tämä bugi."
+"Odottamaton paluuarvo Chiasmus-ajurilta: ”x-obtain-keys”-funktio ei "
+"palauttanut merkkijonolistaa. Raportoi tämä bugi."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Avaimia ei löytynyt. Tarkista, että oikea avainpolku on asetettu Chiasmuksen "
 "asetuksiin."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus-salauksenpurkuavaimen valinta"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus-ajuri ei tarjoa ”x-decrypt”-funktiota. Raportoi tämä bugi."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 "”x-decrypt”-funktio ei hyväksy odotettuja parametreja. Raportoi tämä bugi."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus-salauksenpurkuvirhe"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Odottamaton paluuarvo Chiasmus-ajurilta: ”x-decrypt”-funktio ei palauttanut "
 "tavutaulukkoa. Raportoi tämä bugi."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Viesti"
@@ -5922,7 +5798,7 @@ msgstr "Koko"
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Tiivistä"
 
@@ -5934,7 +5810,7 @@ msgstr "Salaus"
 msgid "Sign"
 msgstr "Allekirjoitus"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Liitteen nimi:"
 
@@ -5956,7 +5832,8 @@ msgstr "Ensisijaiset vastaanottajat"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>Sähköpostiviestistäsi lähtee kopio tähän osoitteeseen.</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -5966,13 +5843,13 @@ msgstr "Muut vastaanottajat"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Tähän antamaasi osoitteeseen tulee kopio sähköpostista. Teknisesti se on "
-"sama asia kuin laittaa kaikki osoitteet <b>Vastaanottajan</b>"
-"-kenttään, mutta eroaa siinä, että se tavallisesti symbolisoi kopion (CC) "
+"sama asia kuin laittaa kaikki osoitteet <b>Vastaanottajan</b>-kenttään, "
+"mutta eroaa siinä, että se tavallisesti symbolisoi kopion (CC) "
 "vastaanottajan kuuntelijaksi, ei varsinaiseksi vastaanottajaksi.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -5981,12 +5858,11 @@ msgstr "Piilotetut vastaanottajat"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Lähes sama asia kuin <b>Kopioi osoitteeseen:</b> "
-"-kenttä, mutta muut vastaanottajat eivät näe kuka vastaanottaa kopioita.</qt>"
+"<qt>Lähes sama asia kuin <b>Kopioi osoitteeseen:</b> -kenttä, mutta muut "
+"vastaanottajat eivät näe kuka vastaanottaa kopioita.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -5996,7 +5872,7 @@ msgstr "&Lähetä sähköposti"
 msgid "&Send Mail Via"
 msgstr "&Lähetä sähköposti käyttäen"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Lähetä &myöhemmin"
@@ -6061,8 +5937,7 @@ msgstr "P&oista lainausmerkit"
 msgid "Cl&ean Spaces"
 msgstr "P&uhdista välilyönnit"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "K&äytä tasavälistä kirjasinta"
@@ -6205,31 +6080,31 @@ msgstr "&Viestien salausmuoto"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Vakio"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Luettelo (kiekko)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Luettelo (ympyrä)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Luettelo (neliö)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Numeroitu luettelo (desimaalit)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Aakkosluettelo (pienet kirjaimet)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Aakkosluettelo (suuret kirjaimet)"
 
@@ -6334,60 +6209,61 @@ msgstr "Sulje viestin kirjoitus"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Kirjoittamasi viesti viittaa liitetiedostoon, mutta et ole liittänyt mitään.\n"
+"Kirjoittamasi viesti viittaa liitetiedostoon, mutta et ole liittänyt "
+"mitään.\n"
 "Haluatko lisätä liitetiedoston viestiisi?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Liitetiedoston muistutus"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Lähetä sellaisenaan"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail ei tunnistanut liitteen (%1) sijaintia.</p>"
-"<p>Liitteen koko polku on määriteltävä.</p></qt>"
+"<qt><p>KMail ei tunnistanut liitteen (%1) sijaintia.</p><p>Liitteen koko "
+"polku on määriteltävä.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Liitä tiedosto"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Liitä"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Lisää tiedosto"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Lisää tiedosto"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tapahtui virhe yritettäessä viedä avainta ajurilta:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Tapahtui virhe yritettäessä viedä avainta ajurilta:</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6426,20 +6302,35 @@ msgid ""
 "View"
 msgstr "Näytä"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Muokkaa..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Muokkaa komentosarjaa..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Tallenna &nimellä..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Ominaisuudet"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Lisää liite..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail ei voinut tiivistää tiedostoa."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6447,76 +6338,73 @@ msgstr ""
 "Tiivistetty tiedosto on suurempi kuin alkuperäinen. Haluatko säilyttää "
 "alkuperäisen?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Pidä"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail ei pystynyt purkamaan tiedostoa."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Tallenna liite nimellä"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Lisää tekstinä"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Lisää liitteenä"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Liitä liit&teeksi"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nimetön"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Haluat salata itsellesi lähetettävät viestit, mutta nykyiselle "
-"henkilöllisyydellesi ei ole määritelty salausavainta (OpenPG tai S/MIME).</p>"
-"<p>Valitse käytettävä avain tai avaimet henkilöllisyyden asetuksissa.</p></qt>"
+"<qt><p>Haluat salata itsellesi lähetettävät viestit, mutta nykyiselle "
+"henkilöllisyydellesi ei ole määritelty salausavainta (OpenPG tai S/MIME).</"
+"p><p>Valitse käytettävä avain tai avaimet henkilöllisyyden asetuksissa.</p></"
+"qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Määrittelemätön salausavain"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Voidaksesi allekirjoittaa viestejä sinun täytyy ensin määritellä tähän "
-"tarkoitukseen käytettävä salausavain (OpenPGP tai S/MIME).</p>"
-"<p>Valitse käytettävä avain henkilöllisyysasetuksissa.</p></qt>"
+"<qt> <p>Voidaksesi allekirjoittaa viestejä sinun täytyy ensin määritellä "
+"tähän tarkoitukseen käytettävä salausavain (OpenPGP tai S/MIME).</"
+"p><p>Valitse käytettävä avain henkilöllisyysasetuksissa.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Määrittelemätön allekirjoitusavain"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6524,201 +6412,199 @@ msgstr ""
 "Kmail on parhaillaan yhteydettömässä tilassa, viestisi pidetään lähtevät "
 "postilaatikossa, kunnes otat yhteyden verkkoon."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Yhteydellinen/Yhteydetön"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Sinun tulee kirjoittaa sähköpostiosoitteesi Keneltä-kenttään. Sinun tulisi "
-"asettaa sähköpostiosoitteesi henkilötietoihin, jottei sinun tarvitse kirjoittaa "
-"sitä jokaiseen sähköpostiviestiin erikseen."
+"asettaa sähköpostiosoitteesi henkilötietoihin, jottei sinun tarvitse "
+"kirjoittaa sitä jokaiseen sähköpostiviestiin erikseen."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Sinun pitää määritellä ainakin yksi vastaanottaja Kenelle-kenttään, CC-kenttään "
-"tai BCC-kenttään."
+"Sinun pitää määritellä ainakin yksi vastaanottaja Kenelle-kenttään, CC-"
+"kenttään tai BCC-kenttään."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Vastaanottaja-kenttä on tyhjä. Lähetäänkö viesti kuitenkin?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Vastaanottaja puuttuu"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Et määritellyt otsikkoa. Lähetäänkö viesti kuitenkin?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ei otsikkoa"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Lähetä sellaisenaan"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Määrittele otsikko"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Säilytä muotoilu, älä allekirjoita/salaa"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Säilytä muotoilu, älä salaa"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Säilytä muotoilu, älä allekirjoita"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Allekirjoita/salaa (poista muotoilu)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Salaa (poista muotoilu)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Allekirjoita (poista muotoilu)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>HTML-viestejä ei voi allekirjoittaa / salata;</p>"
-"<p>haluatko poistaa HTML-muotoilun?</p></qt>"
+"<qt><p>HTML-viestejä ei voi allekirjoittaa / salata;</p><p>haluatko poistaa "
+"HTML-muotoilun?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Allekirjoita/salaa viesti?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Henkilöllisyyden ”%1” luonnos- tai viestipohjakansiota ei ole (enää) olemassa; "
-"siksi käytetään oletuskansiota luonnoksille ja viestipohjille."
+"Henkilöllisyyden ”%1” luonnos- tai viestipohjakansiota ei ole (enää) "
+"olemassa; siksi käytetään oletuskansiota luonnoksille ja viestipohjille."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Luo lähetystili ja yritä uudestaan."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Lähetetään sähköpostia..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Lähettämisen varmistus"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Lähetä heti"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Ei vastaanottajia"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Muut vastaanottajat"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Oikoluku: käytössä"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Oikoluku: ei käytössä"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Oikoluku peruutettiin."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Oikoluku pysäytettiin."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Oikoluku valmis."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Oikoluku"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Aseta salauslaajennus käyttämään Chiasmus-salausta ensin.\n"
-"Voit tehdä tämän salauslaajennukset-välilehdellä asetusten "
-"Turvallisuus-ikkunassa."
+"Voit tehdä tämän salauslaajennukset-välilehdellä asetusten Turvallisuus-"
+"ikkunassa."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Näyttää siltä, että libkleopatra on käännetty ilman Chiasmus-tukea. Voit haluta "
-"kääntää libkleopatran --enable-chiasmus optiolla."
+"Näyttää siltä, että libkleopatra on käännetty ilman Chiasmus-tukea. Voit "
+"haluta kääntää libkleopatran --enable-chiasmus optiolla."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Chiasmus-ajuria ei ole asetettu"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Chiasmus-avaimia ei löytynyt"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus-salausavaimen valinta"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Viestin allekirjoitti %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Viestin allekirjoitti %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP-viesti - Salattu"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Viesti otsikolla: "
@@ -6768,8 +6654,8 @@ msgstr "Oikoluku - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell- tai Aspell-ohjelmaa ei voitu käynnistää. Tarkista, että ISpell tai "
 "Aspell on asennettu oikein, ja löytyy PATH -polkumäärityksestä."
@@ -6805,13 +6691,11 @@ msgstr "<qt>Liian monta suodatintoimintoa säännössä <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Tuntematon suodatustoiminto <b>%1</b>"
-"<br>säännössä <b>%2</b>."
-"<br>Ohitan sen.</qt>"
+"<qt>Tuntematon suodatustoiminto <b>%1</b><br>säännössä <b>%2</b>.<br>Ohitan "
+"sen.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7031,167 +6915,139 @@ msgstr "Soita ääni"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tämä on määriteltyjen suotimien lista. Suotimet käsitellään ylhäältä "
-"alas.</p>"
-"<p>Napsauta mitä tahansa suodinta muokataksesi sitä oikean puoliskon "
-"kontrolleilla.</p></qt>"
+"<qt><p>Tämä on määriteltyjen suotimien lista. Suotimet käsitellään ylhäältä "
+"alas.</p><p>Napsauta mitä tahansa suodinta muokataksesi sitä oikean "
+"puoliskon kontrolleilla.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta luodaksesi uuden suotimen.</p> "
-"<p>Uusi suodin luodaan valitun suotimen yläpuolelle, mutta voit aina "
-"jälkeenpäin muuttaa järjestystä.</p> "
-"<p>Jos painoit tätä painiketta vahingossa, voi kumota tapahtuman painamalla <em>"
-"Poista</em>-painiketta (vieressä oikealla).</p></qt>"
+"<qt> <p>Napsauta tätä painiketta luodaksesi uuden suotimen.</p> <p>Uusi "
+"suodin luodaan valitun suotimen yläpuolelle, mutta voit aina jälkeenpäin "
+"muuttaa järjestystä.</p> <p>Jos painoit tätä painiketta vahingossa, voi "
+"kumota tapahtuman painamalla <em>Poista</em>-painiketta (vieressä oikealla)."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta luodaksesi uuden suotimen.</p> "
-"<p>Uusi suodin luodaan valitun suotimen yläpuolelle, mutta voit aina "
-"jälkeenpäin muuttaa järjestystä.</p> "
-"<p>Jos painoit tätä painiketta vahingossa, voi kumota tapahtuman painamalla <em>"
-"Poista</em>-painiketta (vieressä oikealla).</p></qt>"
+"<qt> <p>Napsauta tätä painiketta luodaksesi uuden suotimen.</p> <p>Uusi "
+"suodin luodaan valitun suotimen yläpuolelle, mutta voit aina jälkeenpäin "
+"muuttaa järjestystä.</p> <p>Jos painoit tätä painiketta vahingossa, voi "
+"kumota tapahtuman painamalla <em>Poista</em>-painiketta (vieressä oikealla)."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta <em>poistaaksesi</em> valittu suodin yllä olevasta "
-"listasta.</p> "
-"<p>Kerran poistettua suodinta ei enää saa takaisin, mutta voit aina poistua "
-"dialogista painamalla <em>Peruuta</em>-painiketta, jolloin kaikki tehdyt "
-"muutoksen hylätään.</p></qt>"
+"<qt> <p>Napsauta tätä painiketta <em>poistaaksesi</em> valittu suodin yllä "
+"olevasta listasta.</p> <p>Kerran poistettua suodinta ei enää saa takaisin, "
+"mutta voit aina poistua dialogista painamalla <em>Peruuta</em>-painiketta, "
+"jolloin kaikki tehdyt muutoksen hylätään.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta siirtääksesi valitun suotimen <em>"
-"päällimmäiseksi</em> yllä olevassa listassa.</p> "
-"<p>Tämä on hyödyllistä, sillä suotimien järjestys listalla määrää järjestyksen, "
-"jolla suotimia sovitetaan viesteihin: ylimmäistä käytetään ensin.</p></qt>"
+"<qt> <p>Napsauta tätä painiketta siirtääksesi valitun suotimen "
+"<em>päällimmäiseksi</em> yllä olevassa listassa.</p> <p>Tämä on hyödyllistä, "
+"sillä suotimien järjestys listalla määrää järjestyksen, jolla suotimia "
+"sovitetaan viesteihin: ylimmäistä käytetään ensin.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta siirtääksesi valittu suodin yksi askel <em>"
-"ylemmäs</em> yllä olevassa listassa.</p> "
-"<p>Tämä on hyödyllistä, sillä suotimien järjestys listalla määrää järjestyksen, "
-"jolla suotimia sovitetaan viesteihin: ylimmäistä käytetään ensin.</p> "
-"<p>Jos painoit tätä painiketta vahingossa, voi kumota tapahtuneen painamalla "
-"<em>alemmas</em>-painiketta (vieressä oikealla).</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt> <p>Napsauta tätä painiketta siirtääksesi valittu suodin yksi askel "
+"<em>ylemmäs</em> yllä olevassa listassa.</p> <p>Tämä on hyödyllistä, sillä "
+"suotimien järjestys listalla määrää järjestyksen, jolla suotimia sovitetaan "
+"viesteihin: ylimmäistä käytetään ensin.</p> <p>Jos painoit tätä painiketta "
+"vahingossa, voi kumota tapahtuneen painamalla <em>alemmas</em>-painiketta "
+"(vieressä oikealla).</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta siirtääksesi valittu suodin yksi askel <em>"
-"alemmas</em> yllä olevassa listassa.</p> "
-"<p>Tämä on hyödyllistä, sillä suotimien järjestys listalla määrää järjestyksen, "
-"jolla suotimia sovitetaan viesteihin: ylimmäistä käytetään ensin.</p> "
-"<p>Jos painoit tätä painiketta vahingossa, voi kumota tapahtuneen painamalla "
-"<em>ylemmäs</em>-painiketta (vieressä vasemmalla).</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt> <p>Napsauta tätä painiketta siirtääksesi valittu suodin yksi askel "
+"<em>alemmas</em> yllä olevassa listassa.</p> <p>Tämä on hyödyllistä, sillä "
+"suotimien järjestys listalla määrää järjestyksen, jolla suotimia sovitetaan "
+"viesteihin: ylimmäistä käytetään ensin.</p> <p>Jos painoit tätä painiketta "
+"vahingossa, voi kumota tapahtuneen painamalla <em>ylemmäs</em>-painiketta "
+"(vieressä vasemmalla).</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta siirtääksesi valittu suodin yksi askel <em>"
-"alemmas</em> yllä olevassa listassa.</p> "
-"<p>Tämä on hyödyllistä, sillä suotimien järjestys listalla määrää järjestyksen, "
-"jolla suotimia sovitetaan viesteihin: ylimmäistä käytetään ensin.</p> "
-"<p>Jos painoit tätä painiketta vahingossa, voi kumota tapahtuneen painamalla "
-"<em>ylemmäs</em>-painiketta (vieressä vasemmalla).</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
+msgstr ""
+"<qt> <p>Napsauta tätä painiketta siirtääksesi valittu suodin yksi askel "
+"<em>alemmas</em> yllä olevassa listassa.</p> <p>Tämä on hyödyllistä, sillä "
+"suotimien järjestys listalla määrää järjestyksen, jolla suotimia sovitetaan "
+"viesteihin: ylimmäistä käytetään ensin.</p> <p>Jos painoit tätä painiketta "
+"vahingossa, voi kumota tapahtuneen painamalla <em>ylemmäs</em>-painiketta "
+"(vieressä vasemmalla).</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Napsauta tätä painiketta nimetäksesi valittu suodin uudelleen.</p> "
+"<qt> <p>Napsauta tätä painiketta nimetäksesi valittu suodin uudelleen.</p> "
 "<p>Suotimet nimetään automaattisesti, jos niiden nimet alkavat etuliitteellä "
-"”&lt;”.</p> "
-"<p> Jos uudelleennimesit suotimen vahingossa ja jos haluat automaattisen "
-"nimeämisen takaisin, paina tätä painiketta, ja valitse <em>Tyhjennä</em> "
-"ja sen jälkeen <em>OK</em> esiin tulevasta dialogista.</p></qt>"
+"”&lt;”.</p> <p> Jos uudelleennimesit suotimen vahingossa ja jos haluat "
+"automaattisen nimeämisen takaisin, paina tätä painiketta, ja valitse "
+"<em>Tyhjennä</em> ja sen jälkeen <em>OK</em> esiin tulevasta dialogista.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Valitse tämä valintaruutu pakottaaksesi vahvistusikkunan näyttämisen.</p>"
-"<p>Tämä on hyödyllistä, jos olet määritellyt sääntöjoukon, joka merkitsee "
-"viestit ladattavaksi myöhemmin. Ilman mahdollisuutta pakotettuun "
-"vahvistusikkunaan tällaisia viestejä ei ladattaisi, jos palvelimella ole muita "
-"isoja viestejä odottamassa tai jos haluat vaihtaa sääntöjoukkoja merkitsemään "
-"viestit eri tavalla.</p></qt>"
+"<qt> <p>Valitse tämä valintaruutu pakottaaksesi vahvistusikkunan näyttämisen."
+"</p><p>Tämä on hyödyllistä, jos olet määritellyt sääntöjoukon, joka "
+"merkitsee viestit ladattavaksi myöhemmin. Ilman mahdollisuutta pakotettuun "
+"vahvistusikkunaan tällaisia viestejä ei ladattaisi, jos palvelimella ole "
+"muita isoja viestejä odottamassa tai jos haluat vaihtaa sääntöjoukkoja "
+"merkitsemään viestit eri tavalla.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7201,6 +7057,16 @@ msgstr "POP3-suodinsäännöt"
 msgid "Filter Rules"
 msgstr "Suodinsäännöt"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Tuo"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Tuo"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Olemassa olevat suotimet"
@@ -7281,6 +7147,11 @@ msgstr "Lisää tämä suodin työkalupalkkiin"
 msgid "Icon for this filter:"
 msgstr "Kuva suotimelle:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Vastaanottaja"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Ylös"
@@ -7289,16 +7160,29 @@ msgstr "Ylös"
 msgid "Down"
 msgstr "Alas"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Uudelleennimeä..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Uusi"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopioi kohteeseen"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Poistettu"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7307,8 +7191,8 @@ msgstr "Valitse pikanäppäin kansiolle"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Ainakin yksi suodin osoittaa kansiota yhteydellisen tilan IMAP-tilillä. "
 "Tällaisia suotimia käytetään vain kun suodatetaan käsin ja kun suodatetaan "
@@ -7319,8 +7203,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Seuraavia suotimia ei tallennettu, koska ne olivat virheellisiä (niistä puuttui "
-"esim. toimenpiteet tai hakuehdot)."
+"Seuraavia suotimia ei tallennettu, koska ne olivat virheellisiä (niistä "
+"puuttui esim. toimenpiteet tai hakuehdot)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7368,7 +7252,8 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Kansionnimet eivät voi sisältää kauttaviivoja (/). Valitse toinen kansionnimi."
+"Kansionnimet eivät voi sisältää kauttaviivoja (/). Valitse toinen "
+"kansionnimi."
 
 #: kmfolder.cpp:913
 msgid ""
@@ -7390,29 +7275,25 @@ msgstr "Etsitään vikaa IMAP-välimuistista"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>IMAP-välimuistin vianetsintä.</b></p>"
-"<p>Jos sinulla on ongelmia IMAP-kansion synkronoinnissa, sinun tulee ensin "
-"kokeilla indeksitiedoston uudelleenjärjestämistä. Uudelleenjärjestäminen vie "
-"jonkin aikaa, mutta ei aiheuta ongelmia.</p>"
-"<p>Jos se ei riitä, voit yrittää päivittää IMAP-välimuistin. Jos teet "
-"päivityksen, menetät kaikki tekemäsi paikalliset muutoksesi tälle kansiolla ja "
-"kaikille sen alikansioille.</p>"
+"<p><b>IMAP-välimuistin vianetsintä.</b></p><p>Jos sinulla on ongelmia IMAP-"
+"kansion synkronoinnissa, sinun tulee ensin kokeilla indeksitiedoston "
+"uudelleenjärjestämistä. Uudelleenjärjestäminen vie jonkin aikaa, mutta ei "
+"aiheuta ongelmia.</p><p>Jos se ei riitä, voit yrittää päivittää IMAP-"
+"välimuistin. Jos teet päivityksen, menetät kaikki tekemäsi paikalliset "
+"muutoksesi tälle kansiolla ja kaikille sen alikansioille.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7449,8 +7330,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "UID-välimuistitiedostoa kansiolle %1 ei voida kirjoittaa. Järjestelmän "
 "oikeustasoissa on ongelmia tai välimuistitiedosto on vioittunut."
@@ -7493,8 +7374,8 @@ msgstr "Tämän kansion hakemisto on luotu uudelleen."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Kansio %1 ei ole alkusynkronoinnin tilassa (tila oli %2). Haluatko palauttaa "
 "sen alkuperäiseen synkronointitilaan ja synkronoida joka tapauksessa?"
@@ -7602,8 +7483,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Sinulla ei ole käyttöoikeuksia kansioon <b>%1</b> "
-"on rajoitettu. Tähän kansioon ei voi enää lisätä viestejä.</p>"
+"<p>Sinulla ei ole käyttöoikeuksia kansioon <b>%1</b> on rajoitettu. Tähän "
+"kansioon ei voi enää lisätä viestejä.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7624,15 +7505,11 @@ msgstr "Luo alikansioita palvelimelle"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Sähköpostit palvelimen kansiossa <b>%1</b> on poistettu. Haluatko poistaa ne "
-"myös paikallisesti?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Sähköpostit palvelimen kansiossa <b>%1</b> on poistettu. Haluatko "
+"poistaa ne myös paikallisesti?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7653,12 +7530,10 @@ msgstr "Haetaan kansioita nimiavaruudelle %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Näyttää että kansio <b>%1</b> tuhottiin. Haluatko tuhota sen "
+"<qt><p>Näyttää että kansio <b>%1</b> tuhottiin. Haluatko tuhota sen "
 "palvelimelta?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7667,19 +7542,19 @@ msgstr "Keskeytetty"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"IMAP-palvelin %1 ei tue IMAP-kommentteja. XML-varastoa ei voida käyttää tämän "
-"palvelimen kanssa; säädä KMailin asetukset toisella tavalla."
+"IMAP-palvelin %1 ei tue IMAP-kommentteja. XML-varastoa ei voida käyttää "
+"tämän palvelimen kanssa; säädä KMailin asetukset toisella tavalla."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"IMAP-palvelin %1 ei tue IMAP-kommentteja. XML-varastoa ei voida käyttää tämän "
-"palvelimen kanssa; säädä KMailin asetukset toisella tavalla."
+"IMAP-palvelin %1 ei tue IMAP-kommentteja. XML-varastoa ei voida käyttää "
+"tämän palvelimen kanssa; säädä KMailin asetukset toisella tavalla."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7692,17 +7567,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Kansiossa (%1) on uusia viestejä, joita ei ole lähetetty palvelimelle vielä, "
-"mutta sinulla ei näytä olevan tarpeellisia oikeuksia kansioon lähettääksesi "
-"niitä nyt. Ota yhteys järjestelmän ylläpitäjään saadaksesi oikeudet lähettää "
-"uudet viestit kansiosta tai poistaa ne.</p> "
-"<p>Haluatko siirtää nuo viestit toiseen kansioon nyt?</p>"
+"<p>Kansiossa (%1) on uusia viestejä, joita ei ole lähetetty palvelimelle "
+"vielä, mutta sinulla ei näytä olevan tarpeellisia oikeuksia kansioon "
+"lähettääksesi niitä nyt. Ota yhteys järjestelmän ylläpitäjään saadaksesi "
+"oikeudet lähettää uudet viestit kansiosta tai poistaa ne.</p> <p>Haluatko "
+"siirtää nuo viestit toiseen kansioon nyt?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7711,20 +7586,25 @@ msgstr "Oikeustasot eivät riitä"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Kansiossa (%1) on uusia viestejä, joita ei ole lähetetty palvelimelle vielä, "
-"mutta sinulla ei näytä olevan tarpeellisia oikeuksia kansioon lähettääksesi "
-"niitä nyt. Ota yhteys järjestelmän ylläpitäjään saadaksesi oikeudet lähettää "
-"uudet viestit kansiosta tai poistaa ne.</p> "
-"<p>Haluatko siirtää nuo viestit toiseen kansioon nyt?</p>"
+"<p>Kansiossa (%1) on uusia viestejä, joita ei ole lähetetty palvelimelle "
+"vielä, mutta sinulla ei näytä olevan tarpeellisia oikeuksia kansioon "
+"lähettääksesi niitä nyt. Ota yhteys järjestelmän ylläpitäjään saadaksesi "
+"oikeudet lähettää uudet viestit kansiosta tai poistaa ne.</p> <p>Haluatko "
+"siirtää nuo viestit toiseen kansioon nyt?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Siirrä kohteeseen:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Älä siirrä"
 
@@ -7736,8 +7616,7 @@ msgstr "Siirrä viestit kansioon"
 msgid "Permissions (ACL)"
 msgstr "Oikeudet (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Yleiset"
@@ -7761,8 +7640,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Käytä omia &kuvakkeita"
@@ -7781,23 +7659,21 @@ msgstr "Ilmoita uudesta/lukemattomasta sähköpostista tässä kansiossa"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tällä valinnalla saat ilmoituksen uusista/lukemattomista sähköposteista "
-"tässä kansiossa. Lisäksi siirtyminen seuraavaan/edelliseen kansioon pysähtyy "
-"tähän kansioon kun tässä on lukemattomia sähköposteja.</p>"
-"<p>Poista tämä valinta, jos et halua ilmoituksia uusista/lukemattomista "
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Tällä valinnalla saat ilmoituksen uusista/lukemattomista "
+"sähköposteista tässä kansiossa. Lisäksi siirtyminen seuraavaan/edelliseen "
+"kansioon pysähtyy tähän kansioon kun tässä on lukemattomia sähköposteja.</"
+"p><p>Poista tämä valinta, jos et halua ilmoituksia uusista/lukemattomista "
 "sähköposteista tässä kansiossa ja jos haluat ohittaa tämän kansion "
-"lukemattomine sähköposteineen kun selaat seuraavia/edellisiä kansioita. Tämä on "
-"käytätnnöllinen tapa jättää huomiotta uudet ja lukemattomat viestit "
+"lukemattomine sähköposteineen kun selaat seuraavia/edellisiä kansioita. Tämä "
+"on käytätnnöllinen tapa jättää huomiotta uudet ja lukemattomat viestit "
 "poistettujen kansiosta ja spam-kansiosta.</p></qt>"
 
 #: kmfolderdia.cpp:431
@@ -7810,9 +7686,9 @@ msgstr "Pidä vastaukset tässä kansiossa"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Valitse tämä asetus, jos haluat tämän kansion viesteihin kirjoitettujen "
 "vastauksien tallentuvan tähän samaan kansioon, sen sijaan että ne "
@@ -7826,17 +7702,21 @@ msgstr "Näytä Lähettäjä/Vastaanottaja -sarake viestiluettelossa"
 msgid "Sho&w column:"
 msgstr "&Näytä sarake:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Aseta oletukseksi"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Vastaanottaja"
@@ -7847,18 +7727,18 @@ msgstr "&Lähettäjän henkilöllisyys"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Valitse lähettäjätiedot, joita käytetään kun kirjoitetaan uutta postia tai "
-"vastataan postiin tässä kansiossa. Tämä tarkoittaa sitä, että jos olet työhön "
-"liittyvässä kansiossa, voit asettaa KMailin käyttämään vastaavaa "
+"vastataan postiin tässä kansiossa. Tämä tarkoittaa sitä, että jos olet "
+"työhön liittyvässä kansiossa, voit asettaa KMailin käyttämään vastaavaa "
 "sähköpostiosoitetta, allekirjoitusta ja salausavaimia automaattisesti. "
-"Lähettäjätiedot voidaan asettaa pääasetusikkunassa. (Asetukset ->"
-"Kmailin asetukset)"
+"Lähettäjätiedot voidaan asettaa pääasetusikkunassa. (Asetukset ->Kmailin "
+"asetukset)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7876,12 +7756,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7913,17 +7793,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Tämä kansio on asetettu sisältämään työryhmätietoja ja yleinen asetus "
 "työryhmäkansioiden piilottamisesta on päällä. Tämä tarkoittaa sitä, että "
@@ -7998,7 +7878,8 @@ msgstr "Virhe kansiotietojen haussa."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Kansion ”%1” posti-indeksi on tuntemattoman KMailin version (%2) luoma .\n"
 "Tämä indeksi voidaan luoda uudestaan postikansiosi perusteella, mutta osa "
@@ -8030,11 +7911,11 @@ msgstr "Virhe avattaessa %1; tätä kansiota ei ole."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Virhe avattaessa kansiota %1. Joko tämä ei ole kelvollinen maildir-kansio tai "
-"sinulla ei ole tarvittavia pääsyoikeuksia."
+"Virhe avattaessa kansiota %1. Joko tämä ei ole kelvollinen maildir-kansio "
+"tai sinulla ei ole tarvittavia pääsyoikeuksia."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8077,20 +7958,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Kansion '%2' indeksi vaikuttaa olevan vanhentunut. Viestien korruptoitumisen "
-"estämiseksi indeksi luodaan uudestaan. Tämän tuloksena poistetut viestit "
-"saattavat ilmestyä näkyviin ja tilaliput saattavat kadota.</p> "
-"<p>Ole hyvä ja lue vastaava kohta <a href=\"%1\">KMailin ohjeen VUKK-osiosta</a> "
-"saadaksesi tietoja, kuinka välttyä tältä ongelmalta jatkossa.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>Kansion '%2' indeksi vaikuttaa olevan vanhentunut. Viestien "
+"korruptoitumisen estämiseksi indeksi luodaan uudestaan. Tämän tuloksena "
+"poistetut viestit saattavat ilmestyä näkyviin ja tilaliput saattavat kadota."
+"</p> <p>Ole hyvä ja lue vastaava kohta <a href=\"%1\">KMailin ohjeen VUKK-"
+"osiosta</a> saadaksesi tietoja, kuinka välttyä tältä ongelmalta jatkossa.</"
+"p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8149,7 +8028,7 @@ msgstr ""
 "'%1' ei ole kansio.\n"
 "Siirrä tiedosto pois tieltä."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8157,7 +8036,7 @@ msgstr ""
 "Kansion '%1' oikeustasot ovat väärät;\n"
 "Varmistu, että voit lukea ja muokata kansion sisältöä."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8167,8 +8046,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8176,7 +8055,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Kansion luonti epäonnistui"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8275,9 +8154,9 @@ msgstr "IMAP-välimuis&tin vianetsintä..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Ei voi luoda kansiota <b>%1</b>, koska oikeudet eivät riitä. Jos sinun "
 "pitäisi pystyä luomaan alikansioita tänne, pyydä ylläpitoa antamaan sinulle "
@@ -8298,23 +8177,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Ei voitu siirtää tai kopioida kansiota <b>%1</b> "
-"tähän, koska samanniminen kansio on jo olemassa.</qt>"
+"<qt>Ei voitu siirtää tai kopioida kansiota <b>%1</b> tähän, koska "
+"samanniminen kansio on jo olemassa.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Ei voitu siirtää tai kopioida kansiota <b>%1</b>"
-", koska se ei ole kopioitunut kokonaisuudessaan itse.</qt>"
+"<qt>Ei voitu siirtää tai kopioida kansiota <b>%1</b>, koska se ei ole "
+"kopioitunut kokonaisuudessaan itse.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Ei voitu siirtää tai kopioida kansiota <b>%1</b> "
-"kansion omaan alakansioon.</qt>"
+"<qt>Ei voitu siirtää tai kopioida kansiota <b>%1</b> kansion omaan "
+"alakansioon.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8421,15 +8300,15 @@ msgstr "%1 Kansiota voi vain lukea."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Haluatko varmasti poistaa valitun viestin?"
-"<br>Jos poistat viestin, sitä ei voida palauttaa enää.</qt>\n"
-"<qt>Haluatko varmasti poistaa valitut %n viestiä?"
-"<br>Jos poistat viestit, niitä ei voida palauttaa enää.</qt>"
+"<qt>Haluatko varmasti poistaa valitun viestin?<br>Jos poistat viestin, sitä "
+"ei voida palauttaa enää.</qt>\n"
+"<qt>Haluatko varmasti poistaa valitut %n viestiä?<br>Jos poistat viestit, "
+"niitä ei voida palauttaa enää.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8481,137 +8360,136 @@ msgstr ""
 "Virhe muokattaessa kohdetta %1\n"
 "(Levytila loppu?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Varmenteen allekirjoituspyyntö"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Luo varmenne liitteestä ja palauta lähettäjälle."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail on asetettu paikalliseen tilaan. Kaikki verkkotoimenpiteet asetettu "
 "odottamaan"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
-"KMail on asetettu yhteydelliseen tilaan. Kaikkia verkkotoimenpiteitä jatketaan"
+"KMail on asetettu yhteydelliseen tilaan. Kaikkia verkkotoimenpiteitä "
+"jatketaan"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 "KMail on nyt paikallisessa tilassa. Kuinka haluat käsitellä sähköpostit?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Työskentele yhteydellisessä tilassa"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Työskentele yhteydettömässä tilassa"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Sinulla ei ole luku-/kirjoitusoikeuksia saapuneet-kansioon."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "lähtevät"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Sinulla ei ole luku-/kirjoitusoikeuksia lähtevät-kansioosi."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "lähetetyt"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Sinulla ei ole luku/kirjoitus-oikeuksia lähetetyt-kansioosi."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "poistetut"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Sinulla ei ole luku/kirjoitus-oikeuksia poistetut-kansioon."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "luonnokset"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Sinulla ei ole luku/kirjoitus-oikeuksia luonnokset-kansioosi."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "viestipohjat"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Sinulla ei ole luku/kirjoitus-oikeuksia viestipohjakansioosi."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Edellinen haku"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Kansio <i>%4</i> on olemassa. %1 käyttää nyt kansiota <i>%5</i> "
-"viesteilleen."
-"<p>%2 voi siirtää kansion <i>%6<i> sisällön tähän kansioon, mutta se voi "
-"korvata samannimisiä olemassa olevia tiedostoja kansiossa <i>%7</i>."
-"<p><strong>Haluatko sovelluksen %3 siirtävän sähköpostitiedostot nyt?</strong>"
-"</qt>"
+"viesteilleen.<p>%2 voi siirtää kansion <i>%6<i> sisällön tähän kansioon, "
+"mutta se voi korvata samannimisiä olemassa olevia tiedostoja kansiossa <i>"
+"%7</i>.<p><strong>Haluatko sovelluksen %3 siirtävän sähköpostitiedostot nyt?"
+"</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Kansio <i>%4</i> on olemassa. %1 käyttää nyt kansiota <i>%5</i> "
 "viesteilleen. %2 voi siirtää kansion <i>%6</i> sisällön tähän hakemistoon."
-"<p><strong>Haluatko sovelluksen %3 siirtävän sähköpostitiedostot nyt?</strong>"
-"</qt>"
+"<p><strong>Haluatko sovelluksen %3 siirtävän sähköpostitiedostot nyt?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Siirrä sähköpostitiedostot?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail kohtasi kohtalokkaan virheen ja lopettaa itsensä nyt"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8622,11 +8500,11 @@ msgstr ""
 "Virhe oli:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Tyhjennä poistetut-kansio"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Oletko varma, että haluat tyhjentää poistettujen kansiot jokaiselta "
@@ -8703,8 +8581,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Uusi viesti saapui</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8742,8 +8619,8 @@ msgstr "Oletko varma, että haluat tyhjentää poistettujen kansion?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Oletko varma, että haluat siirtää kaikki viestit kansiosta <b>%1</b> "
 "poistettuihin?</qt>"
@@ -8770,12 +8647,11 @@ msgstr "Poista haku"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Haluatko varmasti poistaa haun <b>%1</b>?"
-"<br>Kaikki sen näyttämät viestit ovat saatavilla niiden alkuperäisestä "
-"kansiosta.</qt>"
+"<qt>Haluatko varmasti poistaa haun <b>%1</b>?<br>Kaikki sen näyttämät "
+"viestit ovat saatavilla niiden alkuperäisestä kansiosta.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8787,41 +8663,42 @@ msgstr "<qt>Haluatko varmasti poistaa tyhjän kansion <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Haluatko varmasti poistaa tyhjän kansion <b>%1</b> "
-"ja kaikki sen alikansiot? Nuo alikansiot eivät ole välttämättä tyhjiä ja niiden "
-"sisältö tuhoutuu poistossa. "
-"<p><b>Varmistu</b>, että poistettuja viestejä ei ole talletettu "
-"roskakorikansioosi vaan ovat lopullisesti poistettu.</qt>"
+"<qt>Haluatko varmasti poistaa tyhjän kansion <b>%1</b> ja kaikki sen "
+"alikansiot? Nuo alikansiot eivät ole välttämättä tyhjiä ja niiden sisältö "
+"tuhoutuu poistossa. <p><b>Varmistu</b>, että poistettuja viestejä ei ole "
+"talletettu roskakorikansioosi vaan ovat lopullisesti poistettu.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Oletko varma, että haluat poistaa kansion <b>%1</b> "
-"välittämättä sen sisältämistä viesteistä? "
-"<p><b>Huomaa</b> että poistettuja viestejä ei tallenneta Roskakoriin vaan ne "
-"poistetaan lopullisesti./qt>"
+"<qt>Oletko varma, että haluat poistaa kansion <b>%1</b> välittämättä sen "
+"sisältämistä viesteistä? <p><b>Huomaa</b> että poistettuja viestejä ei "
+"tallenneta Roskakoriin vaan ne poistetaan lopullisesti./qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Oletko varma, että haluat poistaa kansion <b>%1</b> "
-"ja kaikki sen alikansiot välittämättä niiden sisältämistä viesteistä? "
-"<p><b>Huomaa</b> että poistettuja viestejä ei tallenneta Roskakoriin vaan ne "
-"poistetaan lopullisesti./qt>"
+"<qt>Oletko varma, että haluat poistaa kansion <b>%1</b> ja kaikki sen "
+"alikansiot välittämättä niiden sisältämistä viesteistä? <p><b>Huomaa</b> "
+"että poistettuja viestejä ei tallenneta Roskakoriin vaan ne poistetaan "
+"lopullisesti./qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Poistettu"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8837,9 +8714,9 @@ msgstr "Oletko varma, että haluat siivota kaikki vanhat viestit?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "HTML:än käyttö sähköpostissa tekee sinut alttiimmaksi ”roskapostille” ja "
 "saattaa kasvattaa todennäköisyyttä, että järjestelmäsi vaarantuu "
@@ -8856,12 +8733,13 @@ msgstr "Käytä HTML:ää"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Ulkoisten viittausten lataaminen HTML-sähköposteista tekee sinut alttiimmaksi "
-"”roskapostille” ja saattaa kasvattaa todennäköisyyttä, että järjestelmäsi "
-"vaarantuu olemassaoleville ja ei-toivotuille tietoturva-aukoille."
+"Ulkoisten viittausten lataaminen HTML-sähköposteista tekee sinut "
+"alttiimmaksi ”roskapostille” ja saattaa kasvattaa todennäköisyyttä, että "
+"järjestelmäsi vaarantuu olemassaoleville ja ei-toivotuille tietoturva-"
+"aukoille."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8877,8 +8755,8 @@ msgstr "Suodata postituslistalla %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMailin poissaoloviestien toiminnallisuus riippuu palvelinpuolen suotimista. "
@@ -8898,7 +8776,8 @@ msgstr "Varmenteiden hallintaohjelmaa ei voitu käynnistää. Tarkista asennus."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "GnuPG-lokikatselijaa (kwatchgnupg) ei voitu käynnistää. Tarkista ohjelman "
 "asennus."
@@ -9223,8 +9102,7 @@ msgstr "Tallenna &liitteet..."
 msgid "Appl&y All Filters"
 msgstr "Kä&ytä kaikkia suotimia"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Käy&tä suodinta"
@@ -9338,7 +9216,6 @@ msgstr "Seuraava luke&maton viesti"
 msgid "Go to the next unread message"
 msgstr "Siirtyy seuraavaan lukemattomaan viestiin"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Edellinen viesti"
@@ -9478,59 +9355,59 @@ msgstr " Alustan..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Tämä viesti sisältää pyynnön palauttaa ilmoitus viestin saapumisesta.\n"
-"Voit jättää pyynnön huomiotta tai antaa KMailin lähettää ”kielletty”-vastauksen "
-"tai normaalin vastauksen."
+"Voit jättää pyynnön huomiotta tai antaa KMailin lähettää ”kielletty”-"
+"vastauksen tai normaalin vastauksen."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Tämä viesti sisältää pyynnön palauttaa ilmoitus viestin saapumisesta.\n"
-"Se sisältää käsittelypyynnön, joka on merkitty pakolliseksi, mutta jota KMail "
-"ei tunnista.\n"
+"Se sisältää käsittelypyynnön, joka on merkitty pakolliseksi, mutta jota "
+"KMail ei tunnista.\n"
 "Voit joko jättää pyynnön huomiotta tai antaa KMailin lähettää vastauksen "
 "”epäonnistui”."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Tämä viesti sisältää pyynnön palauttaa ilmoitus viestin saapumisesta,\n"
 "mutta ilmoitus on pyydetty lähettämään useampaan kuin yhteen osoitteeseen.\n"
-"Voit joko jättää pyynnön huomiotta tai antaa KMailin lähettää "
-"”kielletty”-vastauksen tai normaalin vastauksen."
+"Voit joko jättää pyynnön huomiotta tai antaa KMailin lähettää ”kielletty”-"
+"vastauksen tai normaalin vastauksen."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Tämä viesti sisältää pyynnön palauttaa ilmoitus viestin saapumisesta,\n"
 "mutta return-pathia ei ole asetettu.\n"
-"Voit joko jättää pyynnön huomiotta tai antaa KMailin lähettää "
-"”kielletty”-vastauksen tai normaalin vastauksen."
+"Voit joko jättää pyynnön huomiotta tai antaa KMailin lähettää ”kielletty”-"
+"vastauksen tai normaalin vastauksen."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9539,8 +9416,8 @@ msgstr ""
 "Tämä viesti sisältää pyynnön palauttaa ilmoitus viestin saapumisesta,\n"
 "mutta return-path-osoite on eri kuin se osoite, johon ilmoitus pyydettiin "
 "lähettämään.\n"
-"Voit joko jättää pyynnön huomiotta tai antaa KMailin lähettää "
-"”kielletty”-vastauksen tai normaalin vastauksen."
+"Voit joko jättää pyynnön huomiotta tai antaa KMailin lähettää ”kielletty”-"
+"vastauksen tai normaalin vastauksen."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9566,17 +9443,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Kuittaus: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Liite: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Näytä liitteet lähettäjän ehdottamalla tavalla."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9626,46 +9503,38 @@ msgstr "Viestin osan ominaisuudet"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tiedoston <em>MIME-tyyppi</em>.</p> "
-"<p>Tavallisesti sinun ei tarvitse koskea tähän asetukseen, koska tiedoston "
-"tyyppi tunnistetaan automaattisesti. Kuitenkin joskus %1 ei pysty tunnistamaan "
-"tyyppiä oikein. Tässä voit korjata sen.</p></qt>"
+"<qt><p>Tiedoston <em>MIME-tyyppi</em>.</p> <p>Tavallisesti sinun ei tarvitse "
+"koskea tähän asetukseen, koska tiedoston tyyppi tunnistetaan "
+"automaattisesti. Kuitenkin joskus %1 ei pysty tunnistamaan tyyppiä oikein. "
+"Tässä voit korjata sen.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Osan koko:</p> "
-"<p>Joskus %1 ilmoittaa arvioidun koon, koska todellisen koon laskeminen veisi "
-"liikaa aikaa. Tällaisissa tapauksissa koon loppuun tulee teksti ”(arvio)”.</p>"
-"</qt>"
+"<qt> <p>Osan koko:</p> <p>Joskus %1 ilmoittaa arvioidun koon, koska "
+"todellisen koon laskeminen veisi liikaa aikaa. Tällaisissa tapauksissa koon "
+"loppuun tulee teksti ”(arvio)”.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Osan tiedostonimi:</p> "
-"<p>Vaikka oletusarvo on liitetyn tiedoston nimi, tämä kenttä ei määrittele "
-"liitettävää tiedostoa. Pikemminkin se on tiedostonimiehdotus, jota "
-"vastaanottajan sähköpostiohjelma voi käyttää tallennettaessa liitettä "
-"tiedostoon.</p></qt>"
+"<qt><p>Osan tiedostonimi:</p> <p>Vaikka oletusarvo on liitetyn tiedoston "
+"nimi, tämä kenttä ei määrittele liitettävää tiedostoa. Pikemminkin se on "
+"tiedostonimiehdotus, jota vastaanottajan sähköpostiohjelma voi käyttää "
+"tallennettaessa liitettä tiedostoon.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9673,17 +9542,14 @@ msgstr "&Kuvaus:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Osan kuvaus:</p>"
-"<p>Tämä on vain osan sanallinen kuvaus - hyvin samankaltainen kuin koko viestin "
-"aihe. Useimmat sähköpostiohjelmat näyttävät tämän tiedon viestinäkymässään "
-"liitteen kuvakkeen yhteydessä.</p></qt>"
+"<qt><p>Osan kuvaus:</p><p>Tämä on vain osan sanallinen kuvaus - hyvin "
+"samankaltainen kuin koko viestin aihe. Useimmat sähköpostiohjelmat näyttävät "
+"tämän tiedon viestinäkymässään liitteen kuvakkeen yhteydessä.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9691,23 +9557,21 @@ msgstr "&Koodaus:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tämän osan siirtokoodaus:</p>"
-"<p> Tavallisesti sinun ei tarvitse muuttaa tätä, koska %1 käyttää MIME-tyypistä "
-"riippuvaa sopivaa oletuskoodausta. Tosin joskus voit pienentää merkittävästi "
-"syntyvän viestin kokoa, esim. PostScript-tiedosto ei sisällä binääridataa vaan "
-"ainoastaan puhdasta tekstiä. Tällaisessa tapauksessa ”quoted-printable” "
-"-koodauksen valitseminen oletuksena olevan ”base64” -koodauksen asemesta "
-"pienentää jopa 25% syntyvän viestin kokoa.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Tämän osan siirtokoodaus:</p><p> Tavallisesti sinun ei tarvitse "
+"muuttaa tätä, koska %1 käyttää MIME-tyypistä riippuvaa sopivaa "
+"oletuskoodausta. Tosin joskus voit pienentää merkittävästi syntyvän viestin "
+"kokoa, esim. PostScript-tiedosto ei sisällä binääridataa vaan ainoastaan "
+"puhdasta tekstiä. Tällaisessa tapauksessa ”quoted-printable” -koodauksen "
+"valitseminen oletuksena olevan ”base64” -koodauksen asemesta pienentää jopa "
+"25% syntyvän viestin kokoa.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9715,20 +9579,17 @@ msgstr "Ehdota &automaattista näyttämistä"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Valitse tämä asetus, jos haluat ehdottaa vastaanottajalle tämän osan "
+"<qt><p>Valitse tämä asetus, jos haluat ehdottaa vastaanottajalle tämän osan "
 "automaattista (sisällytettyä) näyttämistä viestinäkymässä oletuksena olevan "
-"kuvakemuodon asemesta.</p "
-"<p>Teknisesti tämä toteutetaan asettamalla osan <em>Content-Disposition</em> "
-"-otsikkokenttä arvoon ”inline” oletusarvon ”attachment” sijaan.</p></qt>"
+"kuvakemuodon asemesta.</p <p>Teknisesti tämä toteutetaan asettamalla osan "
+"<em>Content-Disposition</em> -otsikkokenttä arvoon ”inline” oletusarvon "
+"”attachment” sijaan.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9736,15 +9597,13 @@ msgstr "&Allekirjoita tämä osa"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Valitse tämä asetus, jos haluat, että tämä viestin osa allekirjoitetaan.</p>"
-"<p>Allekirjoitus tehdään avaimella, jonka olet liittänyt tällä hetkellä "
-"käyttämääsi henkilöllisyyteen.</p></qt>"
+"<qt><p>Valitse tämä asetus, jos haluat, että tämä viestin osa "
+"allekirjoitetaan.</p><p>Allekirjoitus tehdään avaimella, jonka olet "
+"liittänyt tällä hetkellä käyttämääsi henkilöllisyyteen.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9752,13 +9611,11 @@ msgstr "Salaa &tämä osa"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Valitse tämä asetus, jos haluat, että tämä viestin osa salataan.</p>"
-"<p>Osa salataan viestin vastaanottajien avaimilla.</p></qt>"
+"<qt><p>Valitse tämä asetus, jos haluat, että tämä viestin osa salataan.</"
+"p><p>Osa salataan viestin vastaanottajien avaimilla.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9772,15 +9629,13 @@ msgstr "POP-suodin"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Suodatettavia viestejä löytyi POP-tililtä: <b>%1</b> "
-"<p>Näytetyt viestit ylittävät enimmäiskoon, jonka asetit tälle tilille. "
-"<br> Voit valita, mitä niille tehdään, valitsemalla sopivan painikkeen."
+"Suodatettavia viestejä löytyi POP-tililtä: <b>%1</b> <p>Näytetyt viestit "
+"ylittävät enimmäiskoon, jonka asetit tälle tilille. <br> Voit valita, mitä "
+"niille tehdään, valitsemalla sopivan painikkeen."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10034,41 +9889,39 @@ msgstr "Sähköpostiohjelma TDE-työpöytäympäristöön."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Haetaan kansion sisältö</h2>"
-"<p>Odota . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Haetaan kansion sisältö</h2><p>Odota . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Yhteydetön tila</h2>"
-"<p>KMail on tällä hetkellä yhteydettömässä tilassa. Napsauta <a "
-"href=\"kmail:goOnline\">tästä</a> siirtyäksesi yhteydelliseen tilaan . . .</p>"
-"&nbsp;"
+"<h2 style='margin-top: 0px;'>Yhteydetön tila</h2><p>KMail on tällä hetkellä "
+"yhteydettömässä tilassa. Napsauta <a href=\"kmail:goOnline\">tästä</a> "
+"siirtyäksesi yhteydelliseen tilaan . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10076,18 +9929,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Tervetuloa KMailiin (versio  %1)</h2>"
-"<p>KMail on sähköpostiohjelma TDE-työpöytäympäristölle. Se on suunniteltu "
-"olemaan täysin yhteensopiva Internetin standardien, kuten MIME-, SMTP-, POP3- "
-"ja IMAP-protokollien kanssa.</p>\n"
-"<ul>"
-"<li>KMailissa on monia tehokkaita ominaisuuksia, jotka on kuvattu <a "
+"<h2 style='margin-top: 0px;'>Tervetuloa KMailiin (versio  %1)</h2><p>KMail "
+"on sähköpostiohjelma TDE-työpöytäympäristölle. Se on suunniteltu olemaan "
+"täysin yhteensopiva Internetin standardien, kuten MIME-, SMTP-, POP3- ja "
+"IMAP-protokollien kanssa.</p>\n"
+"<ul><li>KMailissa on monia tehokkaita ominaisuuksia, jotka on kuvattu <a "
 "href=\"%2\">käyttöohjeessa</a></li>\n"
 "<li><a href=\"%3\">KMailin kotisivu</A> tarjoavat tietoa KMailin uusista "
 "versioista</li></ul>\n"
 "%8\n"
-"<p>Muutamia uusia ominaisuuksia tässä KMailin julkaisussa (verrattuna KMailin "
-"versioon %4, joka on osa TDE:n versiota %5):</p>\n"
+"<p>Muutamia uusia ominaisuuksia tässä KMailin julkaisussa (verrattuna "
+"KMailin versioon %4, joka on osa TDE:n versiota %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10096,22 +9948,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail-työryhmä</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Käytäthän hetken täyttääksesi KMailin asetuspaneelin valikossa "
-"Asetukset-&gt;Aseta KMail.\n"
-"Sinun pitää ainakin oletushenkilöllisyys ja tulevan ja lähtevän postin "
-"tilit.</p>\n"
+"<p>Käytäthän hetken täyttääksesi KMailin asetuspaneelin valikossa Asetukset-"
+"&gt;Aseta KMail.\n"
+"Sinun pitää ainakin oletushenkilöllisyys ja tulevan ja lähtevän postin tilit."
+"</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10150,7 +10000,8 @@ msgstr "Näytä liite: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Liite sisältää binääridataa. Yritän näyttää ensimmäisen merkin.]\n"
@@ -10178,12 +10029,14 @@ msgstr "Avaa liite?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10205,6 +10058,58 @@ msgstr "(jokin seuraavista löytyy)"
 msgid "(match all of the following)"
 msgstr "(kaikki seuraavat löytyvät)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Luettu"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Vanha"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Poistettu"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Vastattu"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Välitetty"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Jonossa"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Lähetetyt"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Seurattu"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ohitettu"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Roskaposti"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Tehtävää"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Sisältää liitteen"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10289,25 +10194,26 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Lähetetyn viestin ”%1” siirto ”lähtevät”-kansiosta ”lähetetyt”-kansioon "
 "epäonnistui.\n"
-"Mahdollisia syitä ovat levytilan loppuminen ja kirjoitusoikeuksien puute. Yritä "
-"korjata ongelman, ja siirrä viesti käsin."
+"Mahdollisia syitä ovat levytilan loppuminen ja kirjoitusoikeuksien puute. "
+"Yritä korjata ongelman, ja siirrä viesti käsin."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
-"Viestien lähettäminen ei ole mahdollista määrittelemättä lähettäjän osoitetta.\n"
-"Aseta henkilöllisyyden ”%1” sähköpostiosoite asetusikkunan "
-"Henkilöllisyydet-osassa ja yritä uudelleen."
+"Viestien lähettäminen ei ole mahdollista määrittelemättä lähettäjän "
+"osoitetta.\n"
+"Aseta henkilöllisyyden ”%1” sähköpostiosoite asetusikkunan Henkilöllisyydet-"
+"osassa ja yritä uudelleen."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10332,11 +10238,11 @@ msgstr "Käynnistän lähettävää prosessia..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Olet valinnut lähetysjonossa olevien sähköpostien lähetystavaksi salaamattoman "
-"siirron. Haluatko jatkaa?"
+"Olet valinnut lähetysjonossa olevien sähköpostien lähetystavaksi "
+"salaamattoman siirron. Haluatko jatkaa?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10360,8 +10266,9 @@ msgstr "Joidenkin jonossa olleiden viestien lähetys epäonnistui."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10380,20 +10287,17 @@ msgstr "Lähetys keskeytyi."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Lähetys epäonnistui:</p>"
-"<p>%1</p>"
-"<p>Viesti säilytetään ”lähtevät”-kansiossa kunnes joko korjaat ongelmat (esim. "
-"virheellisen osoitteen) tai poistat viestin ”lähtevät”-kansiosta.</p>"
-"<p>Käytettiin seuraavaa siirtoprotokollaa:  %2</p>"
-"<p>Haluatko, että jäljelläolevien viestien lähettämistä jatketaan?</p>"
+"<p>Lähetys epäonnistui:</p><p>%1</p><p>Viesti säilytetään ”lähtevät”-"
+"kansiossa kunnes joko korjaat ongelmat (esim. virheellisen osoitteen) tai "
+"poistat viestin ”lähtevät”-kansiosta.</p><p>Käytettiin seuraavaa "
+"siirtoprotokollaa:  %2</p><p>Haluatko, että jäljelläolevien viestien "
+"lähettämistä jatketaan?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10411,8 +10315,9 @@ msgstr "&Keskeytä lähettäminen"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10455,14 +10360,14 @@ msgstr "Sendmail lopetti epänormaalisti."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Sinun täytyy antaa käyttäjätunnus ja salasana käyttääksesi tätä "
-"SMTP-palvelinta."
+"Sinun täytyy antaa käyttäjätunnus ja salasana käyttääksesi tätä SMTP-"
+"palvelinta."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 näyttää jo olevan käynnissä tällä koneella. Ohjelman %2 ajaminen useammin "
 "kuin kerran voi aiheuttaa sähköpostin katoamista. Ohjelmaa %1 ei pitäisi "
@@ -10470,33 +10375,33 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 näyttää olevan käynnissä tämän koneen toisella näytöllä. Ohjelmien %1 ja %2 "
-"ajaminen yhtä aikaa voi aiheuttaa sähköpostin katoamista. Ohjelmaa %2 ei "
+"%1 näyttää olevan käynnissä tämän koneen toisella näytöllä. Ohjelmien %1 ja "
+"%2 ajaminen yhtä aikaa voi aiheuttaa sähköpostin katoamista. Ohjelmaa %2 ei "
 "pitäisi käynnistää, jos %1 on jo käynnissä."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 näyttää olevan käynnissä koneella %2. Ohjelman %1 ajaminen useammin kuin "
-"kerran voi aiheuttaa sähköpostin katoamista. Ohjelmaa %1 ei pitäisi käynnistää "
-"tällä koneella, jos se on jo käynnissä koneella %2."
+"kerran voi aiheuttaa sähköpostin katoamista. Ohjelmaa %1 ei pitäisi "
+"käynnistää tällä koneella, jos se on jo käynnissä koneella %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 näyttää olevan käynnissä koneella %3. Ohjelmien %1 ja %2 ajaminen yhtä aikaa "
-"voi aiheuttaa sähköpostin katoamista. Ohjelmaa %2 ei pitäisi käynnistää tällä "
-"koneella, jos %1 on jo käynnissä koneella %3."
+"%1 näyttää olevan käynnissä koneella %3. Ohjelmien %1 ja %2 ajaminen yhtä "
+"aikaa voi aiheuttaa sähköpostin katoamista. Ohjelmaa %2 ei pitäisi "
+"käynnistää tällä koneella, jos %1 on jo käynnissä koneella %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10507,6 +10412,10 @@ msgstr "Käynnistä %1"
 msgid "Exit"
 msgstr "Lopeta"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Uusia viestejä kansiossa"
@@ -10533,8 +10442,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet-lompakkoa ei ole saatavilla. Lompakkoa suositellaan vahvasti "
@@ -10620,8 +10530,8 @@ msgstr "Palvelin &vaatii tunnistautumista"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Valitse tämä asetus, jos SMTP-palvelimesi vaatii tunnistautumista ennen kuin "
 "hyväksyy postia. Tämä tunnetaan nimellä ”Authenticated SMTP” tai lyhyesti "
@@ -10645,15 +10555,14 @@ msgstr "&Lähetä muokattu konenimi palvelimelle"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Valitse tämä asetus saadaksesi KMail käyttämään muokattua konenimeä "
-"tunnistautuessaan postipalvelimelle. "
-"<p> Tämä on hyödyllistä, jos järjestelmäsi konenimi ei välttämättä ole asetettu "
-"oikein tai jos haluat peittää järjestelmäsi todellisen konenimen."
+"tunnistautuessaan postipalvelimelle. <p> Tämä on hyödyllistä, jos "
+"järjestelmäsi konenimi ei välttämättä ole asetettu oikein tai jos haluat "
+"peittää järjestelmäsi todellisen konenimen."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10683,8 +10592,8 @@ msgstr "Vain paikallisia tiedostoja tuetaan."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Palvelinkenttä ei voi olla tyhjä. Syötä SMTP-palvelimen nimi tai IP-osoite."
 
@@ -10698,10 +10607,10 @@ msgstr "Virhe kansion %1 sisällön listauksessa:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10922,35 +10831,28 @@ msgstr "&Muokkaa viestiä"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Salauslaajennuksen palauttamaa rakennetietoa ei voitu käsitellä oikein, "
-"laajennus saattaa olla rikkoutunut.</p>"
-"<p>Ota yhteyttä järjestelmän ylläpitäjään.</p></qt>"
+"<qt><p>Salauslaajennuksen palauttamaa rakennetietoa ei voitu käsitellä "
+"oikein, laajennus saattaa olla rikkoutunut.</p><p>Ota yhteyttä järjestelmän "
+"ylläpitäjään.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Aktiivista salauslaajennusta ei löytynyt, ja sisäänrakennettu OpenPGP koodi "
-"ei toiminut oikein.</p>"
-"<p>Tämän ongelman voi korjata kahdella tavalla:</p>"
-"<ul>"
-"<li><em>joko</em> otat laajennuksen käyttöön kohdassa Asetukset / KMail "
-"asetukset / Laajennukset</li>"
-"<li><em>tai</em> määrittele OpenPGP:n asetukset saman ikkunan Henkilöllisyys / "
-"Lisäasetukset-välilehdellä.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Aktiivista salauslaajennusta ei löytynyt, ja sisäänrakennettu OpenPGP "
+"koodi ei toiminut oikein.</p><p>Tämän ongelman voi korjata kahdella tavalla:"
+"</p><ul><li><em>joko</em> otat laajennuksen käyttöön kohdassa Asetukset / "
+"KMail asetukset / Laajennukset</li><li><em>tai</em> määrittele OpenPGP:n "
+"asetukset saman ikkunan Henkilöllisyys / Lisäasetukset-välilehdellä.</li></"
+"ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10962,8 +10864,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus-ajuri ei tarjoa ”x-decrypt”-funktiota. Raportoi tämä bugi."
 
 #: messagecomposer.cpp:565
@@ -10979,16 +10881,16 @@ msgstr "Chiasmus-salausvirhe"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Odottamaton paluuarvo Chiasmus-ajurilta: ”x-decrypt”-funktio ei palauttanut "
 "tavutaulukkoa. Raportoi tämä bugi."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Upotettu OpenPGP-salausviestimuoto ei tue liitteiden salaamista tai "
@@ -11102,12 +11004,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Vastaanottajan salausasetusten tutkiminen osoitti, että täytyy kysyä salataanko "
-"viesti vai ei.\n"
+"Vastaanottajan salausasetusten tutkiminen osoitti, että täytyy kysyä "
+"salataanko viesti vai ei.\n"
 "Salataanko tämä viesti?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11140,8 +11042,9 @@ msgstr "&Älä salaa"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Olet pyytänyt tämän viestin salausta ja kopion salaamista itsellesi, mutta "
 "kelpaavia luotettuja salausavaimia ei ole asetettu tälle henkilöllisyydelle."
@@ -11153,13 +11056,13 @@ msgstr "Lähetä salaamattomana?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Joitakin tämän viestin osia ei salata.\n"
-"Vain osittain salattujen viestien lähettäminen saattaa rikkoa menettelytapoja "
-"ja/tai vuotaa arkaluonteista tietoa.\n"
+"Vain osittain salattujen viestien lähettäminen saattaa rikkoa "
+"menettelytapoja ja/tai vuotaa arkaluonteista tietoa.\n"
 "Salataanko kaikki osat?"
 
 #: messagecomposer.cpp:950
@@ -11182,51 +11085,45 @@ msgstr "&Salaa kaikki osat"
 msgid "Unencrypted Message Warning"
 msgstr "Salaamaton viesti -varoitus"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Virhe: taustaosa ei palauttanut koodattua dataa.</p>"
-"<p>Raportoi tämä ohjelmavirhe:"
-"<br>%2</p></qt>"
+"<qt><p>Virhe: taustaosa ei palauttanut koodattua dataa.</p><p>Raportoi tämä "
+"ohjelmavirhe:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Kaikki merkit eivät sovi valittuun koodaukseen."
-"<br>"
-"<br>Lähetä viesti kuitenkin?</qt>"
+"<qt>Kaikki merkit eivät sovi valittuun koodaukseen.<br><br>Lähetä viesti "
+"kuitenkin?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Joitakin merkkejä menetetään"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Hävitä merkkejä"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Muuta koodausta"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Viestiä ei voitu allekirjoittaa, koska valittu taustaosa ei näytä tukevan "
 "allekirjoitusta; tätä ei pitäisi koskaan tapahtua, raportoi tästä "
 "ohjelmavirheestä."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11235,33 +11132,34 @@ msgstr ""
 "allekirjoitusta; tätä ei pitäisi koskaan tapahtua, raportoi tästä "
 "ohjelmavirheestä."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "Allekirjoittaminen epäonnistui. Varmista, että gpg-agent on käynnissä."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Viestiä ei voitu salata, koska valittu taustaosa ei näytä tukevan salausta; "
 "tätä ei pitäisi koskaan tapahtua, raportoi tästä ohjelmavirheestä."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Viestiä ei voitu allekirjoittaa ja salata, koska valittu taustaosa ei näytä "
 "tukevan yhdostettyä allekirjoittamista ja salausta; tätä ei pitäisi koskaan "
@@ -11286,15 +11184,15 @@ msgstr "Postilaatikon &formaatti:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Valitse, haluatko tallentaa tämän kansion viestit eri tiedostoihin (maildir) "
-"vai yhteen suureen tiedostoon (mbox). KMail käyttää maildir-muotoa oletuksena "
-"ja sitä täytyy muuttaa vain harvoin. Jos olet epävarma, jätä tämä asetus "
-"sellaiseksi kuin se on."
+"vai yhteen suureen tiedostoon (mbox). KMail käyttää maildir-muotoa "
+"oletuksena ja sitä täytyy muuttaa vain harvoin. Jos olet epävarma, jätä tämä "
+"asetus sellaiseksi kuin se on."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11303,12 +11201,12 @@ msgstr "Kansio &sisältää:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Valitse, haluatko uutta kansiota käytettävän sähköpostin vai työryhmäasioiden "
-"(kuten tehtävät ja muistiinpanot) tallentamiseen. Oletus on sähköposti. Jos "
-"olet epävarma, jätä tämä kohta sellaiseksi kuin se on."
+"Valitse, haluatko uutta kansiota käytettävän sähköpostin vai "
+"työryhmäasioiden (kuten tehtävät ja muistiinpanot) tallentamiseen. Oletus on "
+"sähköposti. Jos olet epävarma, jätä tämä kohta sellaiseksi kuin se on."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11346,8 +11244,7 @@ msgstr "Erilaiset tulokset allekirjoituksille "
 msgid "The crypto engine returned no cleartext data."
 msgstr "Salausmoottori ei palauttanut selvätekstistä dataa."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Tila:"
 
@@ -11376,8 +11273,8 @@ msgstr "%1-laajennusta ei löytynyt."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Viesti on allekirjoitettu, mutta allekirjoituksen aitoutta ei voitu "
 "varmistaa.<br />Syy: %1"
@@ -11416,26 +11313,26 @@ msgstr "Salauslaajennus ”%1” ei osaa purkaa viestejä."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Huomautus:</b> Tämä HTML-viesti voi sisältää ulkoisia viitteitä kuviin jne. "
-"Turvallisuus- ja yksityisyyssyistä ulkoisia viitteitä ei näytetä. Jos luotat "
-"viestin lähettäjään, voit ladata ulkoiset viitteet tälle viestille "
+"<b>Huomautus:</b> Tämä HTML-viesti voi sisältää ulkoisia viitteitä kuviin "
+"jne. Turvallisuus- ja yksityisyyssyistä ulkoisia viitteitä ei näytetä. Jos "
+"luotat viestin lähettäjään, voit ladata ulkoiset viitteet tälle viestille "
 "napsauttamalla <a href=\"kmail:loadExternal\">tästä</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Huomautus:</b> Tämä on HTML-viesti. Turvallisuussyistä vain raaka HTML-koodi "
-"näytetään. Jos luotat viestin lähettäjään, voit aktivoida HTML-näkymän tälle "
-"viestille napsauttamalla <a href=\"kmail:showHTML\">tästä</a>."
+"<b>Huomautus:</b> Tämä on HTML-viesti. Turvallisuussyistä vain raaka HTML-"
+"koodi näytetään. Jos luotat viestin lähettäjään, voit aktivoida HTML-näkymän "
+"tälle viestille napsauttamalla <a href=\"kmail:showHTML\">tästä</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11680,8 +11577,8 @@ msgstr "Varoitus:"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"Lähettäjän sähköpostiosoitetta ei ole tallennettu allekirjoitukseen käytettyyn "
-"varmenteeseen %1."
+"Lähettäjän sähköpostiosoitetta ei ole tallennettu allekirjoitukseen "
+"käytettyyn varmenteeseen %1."
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11693,8 +11590,8 @@ msgstr "tallennettu:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Allekirjoitukseen käytettyyn varmenteeseen %1 ei ole liitetty yhtäkään "
 "sähköpostiosoitetta, joten emme voi verrata sitä lähettäjän osoitteeseen %2."
@@ -11812,10 +11709,11 @@ msgstr "TDEIO-palvelun virheviesti"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "POP3 -palvelimesi (tili %1) ei tue UIDL -komentoa. Tämän komennon avulla "
 "voidaan tarkistaa luotettavasti, mitkä sähköpostit KMail on nähnyt aiemmin.\n"
@@ -11839,7 +11737,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Haetaan viestiä %1 / %2 (%3 / %4 Kt), %5@%6 (%7 Kt jätetään palvelimelle)."
 
@@ -11857,1845 +11756,15 @@ msgstr "Virheellinen vastaus palvelimelta"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Palvelimesi ei tue TOP -komentoa. Viestien otsikkotietoja ei voida hakea ennen "
-"viestien koon tarkistamista."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Sii&rry"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Kansio"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Viesti"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Vastaa"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Välitä"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-työkalurivi"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Allekirjoittaminen"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Allekirjoita viestit automaattisesti"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Jos tämä asetus on valittuna, kaikki lähettämäsi viestit allekirjoitetaan "
-"oletuksena. Voit tietenkin estää yksittäisten viestien allekirjoittamisen."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Salaa"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Jos tämä kohta on valittuna, viestiä tai tiedostoa ei salata vain "
-"vastaanottajan avaimella vaan myös omalla avaimellasi. Tällöin pystyt "
-"halutessasi avaamaan viestin itse myöhemmin. Tämä on yleensä hyvä idea."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Näytä &allekirjoitettu/salattu teksti laatimisen jälkeen"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Tällä valinnalla allekirjoitettu/salattu teksti näytetään erillisessä "
-"ikkunassa. Voit nähdä, miltä se näyttää ennen lähetystä. Tämä on hyvä idea kun "
-"varmistat, että salaus toimii järjestelmässäsi."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Tallenna lähetetyt viestit &salattuina"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Valitse, jos haluat, että viestit tallennetaan salattuina"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Tallenna lähetetyt viestit salattuina</h1>\n"
-"Kun tämä asetus on valittu, lähetetyt viestit tallennetaan tallennetaan "
-"salattuina kuten ne lähetettiin. Tämä ei ole suositeltavaa, koska et voi lukea "
-"viestejä, jos tarvittava varmenne vanhenee.\n"
-"<p>\n"
-"Toisaalta, paikallisten sääntöjen takia saatat joutua käyttämään tätä asetusta. "
-"Jos et ole varma, kysy lisätietoja järjestelmän ylläpitäjältä.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "&Näytä aina salausavaimet arviointia varten"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Tällä valinnalla sovellus näyttää aina luettelon julkisista avaimista, joista "
-"voit valita jonkun käytettäväksi salauksessa.  Jos tämä ei ole valittuna, "
-"sovellus näyttää vain valintaikkunan, jos se ei löydä oikeaa avainta tai jos on "
-"useita käytettäviä avaimia."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Salaa &viestit automaattisesti aina kun salaus on mahdollista"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Jos tämä kohta on valittuna, kaikki lähettämäsi viestit salataan, jos "
-"salaaminen on mahdollista. Voit silti estää yksittäisten viestien salaamisen."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Älä koskaan allekirjoita/salaa, kun &tallennetaan luonnoksena"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Kuinka tämä toimii?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopio: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Yleinen"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Vastaa"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Vastaa kaikille"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Välitä"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Pikanäppäin:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Viestipohjan tyyppi:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Kansion ominaisuudet"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Kansiossa on postituslista"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Luetteloi &osoitteet:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Normaaleita:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Lukemattomia:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Viesti erääntyy"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Erääntyy jälkeen:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Eräännytä &luetut viestit"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Erääntyy &jälkeen:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Eräännytä &lukemattomat viestit"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Päivässä"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Viikossa"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Kuukaudessa"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Lisäasetukset"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Lähettäjän &henkilöllisyys:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Tallennusmuoto:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Luettelo näyttää:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Vahvista varmenteet käyttäen CRL:iä"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Jos tämä asetus on valittuna, S/MIME-varmenteet vahvistetaan käyttäen "
-"varmenteiden hylkäysluetteloita (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ohita sertifikaattien palvelu-URL"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Älä tarkista varmennekäytäntöjä"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Älä koskaan käytä CRL:ää"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Jos tämä asetus on valittuna, varmenteiden hylkäysluetteloita (CRL) ei koskaan "
-"käytetä vahvistamaan S/MIME-varmenteita."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Nouda puuttuvat jakajan varmenteet"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Jos tämä asetus on valittuna, puuttuvat jakajan varmenteet haetaan, kun niitä "
-"tarvitaan (tämä pätee molempiin vahvistustapoihin, CRL ja OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-pyynnöt"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Älä tee HTTP-pyyntöjä"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Kytkee HTTP:n käytön S/MIMEn yhteydessä pois."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Käytä tätä välityspalvelinta HTTP-pyynnöille:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Käytä järjestelmän HTTP-välityspalvelinta:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Jos tämä asetus on valittuna, oikealla näytettyä HTTP-välityspalvelinta (joka "
-"tulee ympäristömuuttujasta http_proxy) käytetään kaikissa HTTP-pyynnöissä."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Syötä tähän kaikissa S/MIMEen liittyvissä HTTP-pyynnöissä käytettävän "
-"HTTP-välityspalvelimen sijainti. Syntaksi on kone:portti, esimerkiksi "
-"minunproxyni.eimissaan.fi:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Jätä huomiotta varmenteiden HTTP CRL -jakelupiste"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-pyynnöt"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Älä tee LDAP-pyyntöjä"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Kytkee LDAP:n käytön S/MIMElle pois päältä"
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Jätä huomiotta varmenteiden LDAP CRL -jakelupiste"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Ensisijainen palvelin LDAP-pyynnöille:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"LDAP-palvelimen syöttäminen tähän ohjaa kaikki LDAP-pyynnöt ensin sille "
-"palvelimelle. Tarkemmin, tämä asetus korvaa kaikki LDAP-osoitteessa olevat "
-"palvelin-portti-osat ja tätä palvelinta käytetään myös, jos palvelin ja portti "
-"puuttuvat osoitteesta. Muita LDAP-palvelimia käytetään vain jos yhteys "
-"”välityspalvelimeen” ei toimi.\n"
-"Syntaksi on ”PALVELIN” tai ”PALVELIN:PORTTI”. Jos PORTTI puuttuu, käytetään "
-"porttia 389 (oletus-LDAP-portti)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Lisää..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Työryhmätuki"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Alusta kirjasinasetukset"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "rajoittamaton"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Viestipohjien asetukset"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Vastaa lähettäjälle"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Vastaa kaikille / Vastaa postituslistalle"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Välitä viesti"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Varoita, jos allekirjoitta&mattomia viestejä lähetetään"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Valitse tämä kohta, jos haluat että allekirjoittamattomien viestin "
-"lähettämisestä varoitetaan."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoita, jos allekirjoittamattomia viestejä lähetetään</h1>\n"
-"Jos tämä asetus on valittu, sinua varoitetaan, jos yrität lähettää osan "
-"viestistä tai koko viestin allekirjoittamattomana.\n"
-"<p>\n"
-"On suositeltavaa pitää tämä asetus valittuna maksimaalisen koskemattomuuden "
-"takaamiseksi.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Varoita, jos salaamattomia viestejä lähetetään"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Valitse tämä kohta, jos haluat että salaamattomien viestin lähettämisestä "
-"varoitetaan."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoita, jos salaamattomia viestejä lähetetään</h1>\n"
-"Jos tämä asetus on valittu, sinua varoitetaan, kun yrität lähettää osan "
-"viestistä tai koko viestin salaamattomana.\n"
-"<p>\n"
-"On suositeltavaa jättää tämä asetus valituksi maksimaalisen koskemattomuuden "
-"takaamiseksi.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Varoita, jos &vastaanottajan sähköpostiosoite &ei ole varmenteessa"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Valitse saadaksesi varoitus, jos lähettäjän sähköpostiosoite ei ole "
-"varmenteessa"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoitus, jos lähettäjän sähköpostiosoite ei ole varmenteessa</h1>\n"
-"Jos tämä asetus on valittu, näytetään varoitus, jos lähettäjän sähköpostiosoite "
-"ei sisälly salaukseen käytettyyn varmenteeseen.\n"
-"<p>\n"
-"On suositeltavaa jättää tämä asetus valituksi maksimaalisen turvallisuuden "
-"takaamiseksi.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Varoita, jos varmenteet/avaimet vanhentuvat pian (aseta kynnysarvot alla)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Allekirjoitusta varten"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Salausta varten"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " päiväksi"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Valitse päivien lukumäärä tässä"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoita, jos allekirjoitusvarmenne vanhenee</h1>\n"
-"Valitse vähimmäismäärä päiviä, jonka ajan allekirjoitusvarmenteen pitää olla "
-"voimassa, jotta varoitusta ei näytettäisi.\n"
-"<p>\n"
-"Suositeltava SPHINX-asetus on 14 päivää.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoita, jos salausvarmenne vanhenee</h1>\n"
-"Valitse vähimmäismäärä päiviä, jonka ajan salausvarmenteen pitää olla voimassa, "
-"jotta varoitusta ei näytettäisi.\n"
-"<p>\n"
-"Suositeltava SPHINX-asetus on 14 päivää.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoita, jos varmenneketjun varmenne vanhenee</h1>\n"
-"Valitse vähimmäismäärä päiviä, jonka ajan kaikkien ketjun varmenteiden pitää "
-"olla voimassa, jotta varoitusta ei näytettäisi.\n"
-"<p>\n"
-"Suositeltava SPHINX-asetus on 14 päivää.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoita, jos CA-varmenne vanhenee</h1>\n"
-"Valitse vähimmäismäärä päiviä, jonka ajan CA-varmenteen pitää olla voimassa, "
-"jotta varoitusta ei näytettäisi.\n"
-"<p>\n"
-"Suositeltava SPHINX-asetus on 14 päivää.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varoita, jos juurivarmenne vanhenee</h1>\n"
-"Valitse vähimmäismäärä päiviä, jonka ajan juurivarmenteen pitää olla voimassa, "
-"jotta varoitusta ei näytettäisi.\n"
-"<p>\n"
-"Suositeltava SPHINX-asetus on 14 päivää.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Juurivarmenteita varten:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Välissä olevia CA-varmenteita varten:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Peruskäyttäjien varmenteille/avaimille:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Ota käyttöön kaikki ”Älä kysy uudelleen” -varoitukset"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Viestipohjan sisältö"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Viestipohjan pikanäppäin"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Viestipohjan tyyppi"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Lähetä lähtevät viestit tarkistettaessa postia"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Valitse haluatko KMailin lähettävän kaikki viestit lähtevät-kansiossa "
-"manuaalisilla vai kaikilla sähköpostitarkastuksilla, vai haluatko, että "
-"viestejä ei lähetetä ollenkaan automaattisesti. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Kansiossa (%1) on uusia viestejä, joita ei ole lähetetty palvelimelle vielä, "
-"mutta sinulla ei näytä olevan tarpeellisia oikeuksia kansioon lähettääksesi "
-"niitä nyt. Ota yhteys järjestelmän ylläpitäjään saadaksesi oikeudet lähettää "
-"uudet viestit kansiosta tai poistaa ne.</p> "
-"<p>Haluatko siirtää nuo viestit toiseen kansioon nyt?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Viimeisimmäksi valittu hakemisto hakemistovalintaikkunassa."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Paneelin ilmoitusalueen kuvakkeen näyttäminen"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Yksityiskohtainen saapuneen postin ilmoitus"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Jos tämä asetus on valittuna, uusien viestien määrä jokaisessa kansiossa "
-"näytetään uudesta postista ilmoitettaessa; muuten näytetään vain yksinkertainen "
-"”Uutta sähköpostia on saapunut” -ilmoitus."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Määrittele editori:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Käytä ulkoista editoria"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Ota työryhmätuki käyttöön"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-"Muokkaa lähettäjä/vastaanottaja-otsikkotietoja vastausviestien vastauksissa"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlookin iCalendar-standardin toteutuksessa on useita puutteita; "
-"tämä asetus kiertää yhden niistä. Jos Outlook-käyttäjät eivät saa vastauksiasi, "
-"yritä laittamalla tämä asetus päälle."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Lähetä työryhmäkutsut viestirungossa"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlookin iCalendar-standardin toteutuksessa on useita puutteita; "
-"tämä asetus kiertää yhden niistä. Jos Outlook-käyttäjät eivät saa kutsujiasi, "
-"yritä laittamalla tämä asetus päälle."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Exchange-yhteensopiva kutsuviestien nimeäminen"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Kun Microsoftin Outlookilla on ongelmia ymmärtää standardia "
-"groupware-sähköpostia Microsoft Exchange -palvelimen kanssa. Aseta tämä valinta "
-"lähettääksesi groupware-kutsut Microsoft Exchangen ymmärtämässä muodossa."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Kun tämä asetus on valittuna, sähköpostin kirjoitusikkunaa ei näytetä. Sen "
-"sijaan kaikki kutsupostit lähetetään automaattisesti. Jos haluat nähdä postin "
-"ennen sen lähetystä, voit ottaa tämän asetuksen pois päältä. Huomaa kuitenkin, "
-"että kirjoitusikkunassa oleva teksti on iCalendar-muotoista ja sitä ei pitäisi "
-"muokata käsin."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Tämän asetuksen käyttäminen mahdollistaa merkintöjen tallentamisen "
-"Kontact-sovelluksista (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>Jos haluat kytkeä tämän asetuksen päälle, myös muut sovellukset on "
-"asetettava käyttämään IMAP-resurssia; sen saa tehtyä TDE:n "
-"Ohjauskeskuksesta.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Yleensä ei ole mitään syytä nähdä kansioita, jotka sisältävät "
-"IMAP-resurssit. Mutta jos haluat nähdä ne, voit käyttää tätä asetusta.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Valitse ryhmätyökansioiden tallennusmuoto. "
-"<ul>"
-"<li>Oletusmuoto on ical (kalenterikansioille) ja vcard (osoitekirjakansioille). "
-"Tällä muodolla saa käyttöön kaikki Kontactin ominaisuudet.</li>"
-"<li>Kolab XML -muoto käyttää mukautettua mallia, joka vastaa tarkemmin "
-"Outlookissa käytettyä tapaa. Tämä muoto antaa paremman Outlook-yhteensopivuuden "
-"käytettäessä Kolab-palvelinta tai yhteensopivaa ratkaisua.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Tämä valitsee IMAP-resurssikansioiden vanhemman.</p>"
-"<p>Oletuksena Kolab-palvelin asettaa IMAP-saapuneet-kansion vanhemmaksi.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Tämä on IMAP-resurssikansiot sisältävän tilin tunniste.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Jos halutaan asettaa IMAP-tilan kansioiden nimet paikalliselle kielelle, "
-"voidaan valita näistä kielistä.</p>"
-"<p> Huomaa, että ainoa syy tämän tekemiseen on Microsoft Outlook "
-"-yhteensopivuus. Tämän asettaminen on yleensä huono ajatus, koska sitten kielen "
-"vaihtaminen on mahdotonta. </p>"
-"<p>Eli älä käytä tätä, ellei ole pakko.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Tämä arvo määrää, näytetäänkö KMail-esittely."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Palvelinkohtainen yhteyksien maksimimäärä"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Tätä voidaan käyttää rajoittamaan yhteyksien määrää per palvelin "
-"tarkastettaessa uutta sähköpostia. Oletuksena yhteyksien määrä on rajoittamaton "
-"(0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Näytä pikahaun rivi"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Tämä asetus ottaa käyttöön tai poistaa käytöstä hakukentän viestiluettelon "
-"yläpuolella. Sitä voidaan käyttää nopeaan hakuun viestiluettelon tiedoista."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Säilytä alkuperäinen merkistö kun vastataan tai välitetään, jos mahdollista"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Lisää allekirjoitus automaattisesti"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Käytä tätä henkilöllisyyttä myöhemminkin kirjoittaessasi viestejä.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Muista tämä kansio lähetetyille viesteille, jotta sitä käytetään myös tulevissa "
-"kirjoitusikkunoissa."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Muista tämä lähestystapa, jotta sitä käytetään myös tulevissa "
-"kirjoitusikkunoissa."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Käytä tätä henkilöllisyyttä myöhemminkin kirjoittaessasi viestejä.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Rivinvaihto sarakkeessa:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Varoita, jos juurivarmenne vanhentuu &alle:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Käytä tätä asetusta jos haluat Outlookin &#8482; ymmärtävän liitteet, joiden "
-"nimissä on muita kuin englannin kielen merkkejä"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "&Pyydä viestin tilailmoitukset automaattisesti"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Käytä tätä asetusta, jos haluat KMailin pyytävän viestin tilailmoituksia "
-"(MDN) jokaiselle lähtevälle viestille.</p>"
-"<p>Tämä asetus vaikuttaa vain oletustoimintaan; voit silti kytkeä MDN:n päälle "
-"tai pois viestikohtaisesti kirjoitusikkunassa, valikkokohdasta <em>"
-"Asetukset</em>-><em>Pyydä viestin tilailmoitus</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Käytä edellisiä osoitteita automaattitäydennyksessä"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Kytke tämä asetus pois päältä, jos et halua äskettäin käytettyjen osoitteiden "
-"täydentyvän automaattisesti kirjoitusikkunan osoitekenttiin."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "&Automaattitallennusväli:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Viestin kirjoittaminen voidaan varmuuskopioida säännöllisesti. Varmuuskopion "
-"tallennusväli voidaan määritellä tässä. Voit ottaa varmuuskopioinnin pois "
-"käytöstä määrittelemällä tallennusväliksi 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "&Korvaa tunnistettu etuliite 'Re:'-etuliitteellä"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "&Korvaa tunnistettu etuliite 'Fwd:'-etuliitteellä"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Käytä älykästä lainausta"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Allekirjoitus on vanhentunut."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"Palvelimesi ei tue TOP -komentoa. Viestien otsikkotietoja ei voida hakea "
+"ennen viestien koon tarkistamista."
 
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Vastaanottajan valitsimen tyyppi"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Vastaanottajan muokkaimen tyyppi"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Vastaanottajamuokkaimen rivien maksimimäärä."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Säilytä alkuperäinen merkistö kun vastataan tai välitetään, jos mahdollista"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Jotkin sähköpostit, erityisesti automaattisesti generoidut, eivät määrittele "
-"merkistökoodausta, jota on käytettävä jotta ne näkyisivät oikein. Sellaisessa "
-"tapauksessa käytetään varamerkistöä, jonka voi asettaa tästä. Aseta se "
-"merkistöksi, jota useimmiten käytetään lähiympäristössäsi. Oletuksena käytetään "
-"koko järjestelmään asetettua koodausta."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Tämän muuttaminen oletuksesta ”Automaattinen” joksikin muuksi pakottaa annetun "
-"koodauksen kaikille posteille, huolimatta siitä mitä ne itse määrittelevät."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Tällä valinnalla hymiöt kuten :-) näkyvät viestitekstissä pieninä kuvina."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Tämän asetuksen käyttö näyttää lainatun tekstin eri tasoilla. Kytke pois päältä "
-"piilottaaksesi lainatun tekstin tasot."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automaattinen kokoontaittotaso:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Pienennä lainatun tekstin kirjasimen kokoa"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Tämä asetus näyttää lainatun tekstin pienemmällä fontilla."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Tallenna lähetetyt viestit &salattuina"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Näytä käyttäjän sähköpostiohjelma muotoilluissa otsikkotiedoissa"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Tällä valinnalla käyttäjän sähköpostiohjelman ja postinvälitysohjelman tiedot "
-"näkyvät otsikkoteidsoissa kun käytetään muotoiltuja otsikkotietoja."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Lähetä viestin tilailmoitukset tyhjällä lähettäjäkentällä."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Lähetä viestin tilailmoitukset tyhjällä lähettäjätiedolla. Jotkin palvelimet "
-"voi olla asetettu hylkäämään tällaiset viestit, joten jos MDN:ien "
-"lähettämisessä on ongelmia, kytke tämä asetus pois päältä."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Fraasit on muutettu viestipohjiksi"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Vanhat fraasit on muutettu viestipohjiksi"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Uuden viestin viestipohja"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Vastausviestin viestipohja"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Vastaa kaikille -viestin viestipohja"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Välitysviestin viestipohja"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Lainausmerkit"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 %2 %3:sta käytössä"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13805,6 +11874,11 @@ msgstr "Lisää kopiona"
 msgid "Add as BCC"
 msgstr "Lisää piilokopiona"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Peruuta"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13820,13 +11894,13 @@ msgstr "Valitut vastaanottajat"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Valitsit yhden vastaanottajan. Vastaanottajien tuettu maksimimäärä on %1. Muuta "
-"valintaa.\n"
+"Valitsit yhden vastaanottajan. Vastaanottajien tuettu maksimimäärä on %1. "
+"Muuta valintaa.\n"
 "Valitsit %n vastaanottajaa. Vastaanottajien tuettu maksimimäärä on %1. Muuta "
 "valintaa.You selected %n recipients."
 
@@ -13844,11 +11918,11 @@ msgstr "Käytä osoitteenvalintaikkunaa"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Tämä painike avaa erillisen ikkunan, josta voit valita vastaanottajat kaikista "
-"olemassaolevista osoitteista."
+"Tämä painike avaa erillisen ikkunan, josta voit valita vastaanottajat "
+"kaikista olemassaolevista osoitteista."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -13950,13 +12024,22 @@ msgstr "on suurempi tai yhtäsuuri kuin"
 msgid " bytes"
 msgstr " tavua"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " päiväksi"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Haun suorittamiseksi kansion %1 kaikki viestit on ladattava palvelimelta. Tämä "
-"voi viedä jonkin aikaa. Jatketaanko hakua?"
+"Haun suorittamiseksi kansion %1 kaikki viestit on ladattava palvelimelta. "
+"Tämä voi viedä jonkin aikaa. Jatketaanko hakua?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14104,16 +12187,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Kerää tietoa tiliä '%1' varten...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Kerää tietoa tiliä '%1' varten...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14132,10 +12211,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Komentosarjan ”%1” sisältö:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Komentosarjan ”%1” sisältö:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14158,20 +12235,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-ominaisuudet:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-ominaisuudet:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Ei erikoisominaisuuksia saatavilla)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Saatavilla olevat Sieve-komentosarjat:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Saatavilla olevat Sieve-komentosarjat:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14249,8 +12322,8 @@ msgstr "Anna tähän kenttään mielivaltainen muuttumaton allekirjoitus."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Käytä tätä hakijaa määrätäksesi tekstitiedoston, joka sisältää "
 "allekirjoituksesi. Se luetaan aina kun luot uuden viestin tai lisäät uuden "
@@ -14270,22 +12343,27 @@ msgstr "Avaa valitun tiedoston tekstieditorissa."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Voit lisätä tähän mielivaltaisen komennon, joko polun kanssa tai ilman riippuen "
-"siitä, onko komento Path-ympäristömuuttujassa. Jokaista uutta viestiä varten "
-"KMail suorittaa komennon ja käyttää sen tulostetta (oletussyötteeseen) "
-"allekirjoituksena. Tyypillisesti tämän toiminnon yhteydessä käytettävät "
-"komennot ovat ”fortune” tai ”ksig-random”."
+"Voit lisätä tähän mielivaltaisen komennon, joko polun kanssa tai ilman "
+"riippuen siitä, onko komento Path-ympäristömuuttujassa. Jokaista uutta "
+"viestiä varten KMail suorittaa komennon ja käyttää sen tulostetta "
+"(oletussyötteeseen) allekirjoituksena. Tyypillisesti tämän toiminnon "
+"yhteydessä käytettävät komennot ovat ”fortune” tai ”ksig-random”."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Määrittele komento:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Polku"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Uusi tietue:"
@@ -14322,6 +12400,11 @@ msgstr "Lisää tili"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Haluatko todella poistaa henkilöllisyyden <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Käytä kohteessa:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14336,6 +12419,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Muokkaa komentosarjaa..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14375,9 +12462,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14414,6 +12501,16 @@ msgstr "Älä käytä"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Ei voi sijoittaa sisältöä tiedostosta %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Vastaanottaja:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopio: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14443,60 +12540,52 @@ msgstr "Ei voi käynnistää putkikomentoa viestipohjasta: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tässä voi luoda viestipohjia, joita käytetään uusia viestejä tai vastauksia "
-"kirjoitettaessa tai viestejä välitettäessä.</p>"
-"<p>Viestipohjat tukevat korvauskomentoja, jotka voi kirjoittaa tai valita <i>"
-"Lisää komento</i>-valikosta.</p>"
-"<p>Tässä määritellyt viestipohjat ovat kansiokohtaisia. Jos niitä on "
-"määritelty, ne korvaavat yleiset ja henkilöllisyyskohtaiset viestipohjat.</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tässä voi luoda viestipohjia, joita käytetään uusia viestejä tai "
+"vastauksia kirjoitettaessa tai viestejä välitettäessä.</p><p>Viestipohjat "
+"tukevat korvauskomentoja, jotka voi kirjoittaa tai valita <i>Lisää komento</"
+"i>-valikosta.</p><p>Tässä määritellyt viestipohjat ovat kansiokohtaisia. Jos "
+"niitä on määritelty, ne korvaavat yleiset ja henkilöllisyyskohtaiset "
+"viestipohjat.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tässä voi luoda viestipohjia, joita käytetään uusia viestejä tai vastauksia "
-"kirjoitettaessa tai viestejä välitettäessä.</p>"
-"<p>Viestipohjat tukevat korvauskomentoja, jotka voi kirjoittaa tai valita <i>"
-"Lisää komento</i>-valikosta.</p>"
-"<p>Tässä määritellyt viestipohjat ovat henkilöllisyyskohtaisia. Jos niitä on "
-"määritelty, ne korvaavat yleiset viestipohjat. Jos kansiokohtaisia viestipohjia "
-"on määritelty, ne korvaavat nämä viestipohjat.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tässä voi luoda viestipohjia, joita käytetään uusia viestejä tai "
+"vastauksia kirjoitettaessa tai viestejä välitettäessä.</p><p>Viestipohjat "
+"tukevat korvauskomentoja, jotka voi kirjoittaa tai valita <i>Lisää komento</"
+"i>-valikosta.</p><p>Tässä määritellyt viestipohjat ovat "
+"henkilöllisyyskohtaisia. Jos niitä on määritelty, ne korvaavat yleiset "
+"viestipohjat. Jos kansiokohtaisia viestipohjia on määritelty, ne korvaavat "
+"nämä viestipohjat.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tässä voi luoda viestipohjia, joita käytetään uusia viestejä tai vastauksia "
-"kirjoitettaessa tai viestejä välitettäessä.</p>"
-"<p>Viestipohjat tukevat korvauskomentoja, jotka voi kirjoittaa tai valita <i>"
-"Lisää komento</i>-valikosta.</p>"
-"<p>Tämä on yleinen (oletus)viestipohja. Henkilöllisyys- ja kansiokohtaiset "
-"viestipohjat voivat korvata tämä, jos niitä on määritelty.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tässä voi luoda viestipohjia, joita käytetään uusia viestejä tai "
+"vastauksia kirjoitettaessa tai viestejä välitettäessä.</p><p>Viestipohjat "
+"tukevat korvauskomentoja, jotka voi kirjoittaa tai valita <i>Lisää komento</"
+"i>-valikosta.</p><p>Tämä on yleinen (oletus)viestipohja. Henkilöllisyys- ja "
+"kansiokohtaiset viestipohjat voivat korvata tämä, jos niitä on määritelty.</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14749,6 +12838,10 @@ msgstr "Putkita nykyinen viestin runko ja lisää tulos sellaisenaan"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Putkita nykyinen viestin runko ja korvaa tuloksella"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Aseta kohdistimen paikka"
@@ -14781,115 +12874,6 @@ msgstr "Aseta vianjäljitys käyttöön"
 msgid "Turn Debug Off"
 msgstr "Poista vianjäljitys käytöstä"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...että voit siirtyä edelliseen ja seuraavaan viestiin käyttämällä\n"
-"nuolinäppäimiä oikealle ja vasemmalle?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p> ...että voit luoda nopeasti suodattimia lähettäjälle, vastaanottajalle,\n"
-"aiheelle ja postituslistoille dialogilla <em>Työkalut&gt;Luo&nbsp;suodin</em>"
-"?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p> ...että voit päästä eroon joidenkin postituslistojen viestien aiheisiin\n"
-"lisäämistä &quot;[postituslistan nimi]&quot;-osista käyttämällä\n"
-"<em>uudelleenkirjoita otsikko</em> -suodintoimintoa? Käytä vain toimintoa\n"
-"<pre>uudelleenkirjoita otsikko &quot;Aihe&quot;\n"
-"   korvaa &quot;\\s*\\[postituslistan nimi\\]\\s*&quot;\n"
-"   arvolla &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...että voi liittää postituslistan kansioon\n"
-"<em>Kansio-&gt;Postituslistojen hallinta</em> -ikkunassa? Voit sen jälkeen "
-"valita\n"
-"<em>Viesti-&gt;Uusi posti postituslistalle</em>, jolloin viestin "
-"kirjoitusikkuna\n"
-"aukeaa ja vastaanottajaksi tulee postituslistaosoite.\n"
-"Vaihtoehtoisesti voit napsauttaa kansiota hiiren keskimmäisellä napilla</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...että voit asettaa mukautetun kuvakkeen jokaiselle kansiolle?\n"
-"Katso <em>Kansio->Ominaisuudet...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...että KMail osaa näyttää valitun viestin tyyppiä\n"
-"(puhdas teksti/HTML/OpenPGP) kuvaavan väripalkin?</p>\n"
-"<p>Tämä estää yritykset väärentää onnistunut allekirjoitustarkistus\n"
-"lähettämällä HTML-viesti, joka matkii KMailin allekirjoituksen tilan\n"
-"kertovia kehyksiä.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...että voi suodattaa minkä hyvänsä otsikkokentän perusteella\n"
-"yksinkertaisesti syöttämällä otsikkokentän nimen etsintäsäännön\n"
-"ensimmäiseen muokkausruutuun?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...että voit suodattaa vain HTML:ää sisältävät viestit säännöllä\n"
-"<pre>&quot;Content-type&quot; sisältää &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...että vastattaessa lainataan valittu osa viestistä?</p>\n"
-"<p>Jos mitään ei ole valittuna, koko viesti lainataan.</p>\n"
-"<p>Tämä toimii myös liitetiedostoilla, jos valitset kohdan\n"
-"<em>Näytä-&gt;Liitteet-&gt;Sisällytettyinä</em>.</p>\n"
-"<p>Tämä ominaisuus toimii kaikilla muilla vastauskomennoilla\n"
-"paitsi valitsemalla <em>Viesti-&gt;Vastaa lainaamatta</em>.</p>\n"
-"<p align=\"right\"><em>Lähettänyt David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Ei ole mitään kumottavaa."
@@ -14957,6 +12941,16 @@ msgstr "Liite #%1 (nimetön)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Tiedosto nimellä ”%1” on jo olemassa. Haluatko, että se ylikirjoitetaan?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Ylikirjoita tiedosto?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15072,13 +13066,13 @@ msgstr "&Lähetä kuva jokaisessa viestissä"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Tällä valinnalla KMail lisää ns. X-Face otsikon tällä henkilöllisyydelläsi "
-"kirjoittamiisi sähköposteihisi. X-Face on pieni (48x48 pikseliä) mustavalkoinen "
-"kuva, jonka jotkut sähköpostiohjelmat pystyvät näyttämään."
+"kirjoittamiisi sähköposteihisi. X-Face on pieni (48x48 pikseliä) "
+"mustavalkoinen kuva, jonka jotkut sähköpostiohjelmat pystyvät näyttämään."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15106,9 +13100,9 @@ msgstr "Valitse tiedosto..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Käytä tätä valitaksesi kuvatiedoston, josta kuva luodaan. Kuvan tulisi olla "
 "voimakaskontrastinen ja lähes neliömäinen. Vaalea tausta parantaa tulosta."
@@ -15119,22 +13113,22 @@ msgstr "Aseta osoitekirjasta"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Voit käyttää pienemmäksi skaalattua kuvaa, jonka olet asettanut "
 "yhteystietoihin."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail voi lähettää pienen (48x48 pikseliä), matalatasoisen, yksivärisen "
-"kuvan jokaiseen sähköpostiin. Se voi olla esimerkiksi kuva sinusta tai glyyfi. "
-"Se näytetään vastaanottajan sähköpostiohjelmassa (jos ominaisuus on tuettu "
-"siinä ohjelmassa)."
+"kuvan jokaiseen sähköpostiin. Se voi olla esimerkiksi kuva sinusta tai "
+"glyyfi. Se näytetään vastaanottajan sähköpostiohjelmassa (jos ominaisuus on "
+"tuettu siinä ohjelmassa)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15142,12 +13136,11 @@ msgstr "Anna tähän kenttään mielivaltainen X-Face merkkijono."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Esimerkkejä saatavana osoitteessa <a "
-"href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</"
-"a>."
+"Esimerkkejä saatavana osoitteessa <a href=\"http://www.xs4all.nl/~ace/X-"
+"Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15162,129 +13155,1744 @@ msgstr "Ei kuvaa"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Et ole määritellyt omaa kontaktitietoa osoitekirjaan."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Allekirjoittaminen"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Allekirjoita viestit automaattisesti"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Jos tämä asetus on valittuna, kaikki lähettämäsi viestit allekirjoitetaan "
+"oletuksena. Voit tietenkin estää yksittäisten viestien allekirjoittamisen."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Salaa"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Aseta viestin aihe"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Jos tämä kohta on valittuna, viestiä tai tiedostoa ei salata vain "
+"vastaanottajan avaimella vaan myös omalla avaimellasi. Tällöin pystyt "
+"halutessasi avaamaan viestin itse myöhemmin. Tämä on yleensä hyvä idea."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Lähetä kopio osoitteeseen."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Näytä &allekirjoitettu/salattu teksti laatimisen jälkeen"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Lähetä piilokopio osoitteeseen."
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Tällä valinnalla allekirjoitettu/salattu teksti näytetään erillisessä "
+"ikkunassa. Voit nähdä, miltä se näyttää ennen lähetystä. Tämä on hyvä idea "
+"kun varmistat, että salaus toimii järjestelmässäsi."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Lisää viestiin otsikko."
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Tallenna lähetetyt viestit &salattuina"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Lue viestirunko tiedostosta."
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Valitse, jos haluat, että viestit tallennetaan salattuina"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Aseta viestin runko"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Tallenna lähetetyt viestit salattuina</h1>\n"
+"Kun tämä asetus on valittu, lähetetyt viestit tallennetaan tallennetaan "
+"salattuina kuten ne lähetettiin. Tämä ei ole suositeltavaa, koska et voi "
+"lukea viestejä, jos tarvittava varmenne vanhenee.\n"
+"<p>\n"
+"Toisaalta, paikallisten sääntöjen takia saatat joutua käyttämään tätä "
+"asetusta. Jos et ole varma, kysy lisätietoja järjestelmän ylläpitäjältä.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Lisää viestiin liite. Tätä voi toistaa."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "&Näytä aina salausavaimet arviointia varten"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Tarkista vain saapuneet viestit"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Tällä valinnalla sovellus näyttää aina luettelon julkisista avaimista, "
+"joista voit valita jonkun käytettäväksi salauksessa.  Jos tämä ei ole "
+"valittuna, sovellus näyttää vain valintaikkunan, jos se ei löydä oikeaa "
+"avainta tai jos on useita käytettäviä avaimia."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Avaa vain kirjoitusikkuna."
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Salaa &viestit automaattisesti aina kun salaus on mahdollista"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Näytä annettu viestitiedosto"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Jos tämä kohta on valittuna, kaikki lähettämäsi viestit salataan, jos "
+"salaaminen on mahdollista. Voit silti estää yksittäisten viestien salaamisen."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Älä koskaan allekirjoita/salaa, kun &tallennetaan luonnoksena"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Kuinka tämä toimii?"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Yleinen"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Vastaa"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Vastaa kaikille"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Välitä"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Pikanäppäin:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Viestipohjan tyyppi:"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Viestipohjan sisältö"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Viestipohjan pikanäppäin"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Viestipohjan tyyppi"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Kansion ominaisuudet"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Kansiossa on postituslista"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Luetteloi &osoitteet:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Normaaleita:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Lukemattomia:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Viesti erääntyy"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Erääntyy jälkeen:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Eräännytä &luetut viestit"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Erääntyy &jälkeen:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Eräännytä &lukemattomat viestit"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Päivässä"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Viikossa"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Kuukaudessa"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Lähettäjän &henkilöllisyys:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Tallennusmuoto:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Luettelo näyttää:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Lähetä lähtevät viestit tarkistettaessa postia"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Valitse haluatko KMailin lähettävän kaikki viestit lähtevät-kansiossa "
+"manuaalisilla vai kaikilla sähköpostitarkastuksilla, vai haluatko, että "
+"viestejä ei lähetetä ollenkaan automaattisesti. </p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Luettu"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Vanha"
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Kansiossa (%1) on uusia viestejä, joita ei ole lähetetty palvelimelle "
+"vielä, mutta sinulla ei näytä olevan tarpeellisia oikeuksia kansioon "
+"lähettääksesi niitä nyt. Ota yhteys järjestelmän ylläpitäjään saadaksesi "
+"oikeudet lähettää uudet viestit kansiosta tai poistaa ne.</p> <p>Haluatko "
+"siirtää nuo viestit toiseen kansioon nyt?</p>"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Poistettu"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Vastattu"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Välitetty"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Viimeisimmäksi valittu hakemisto hakemistovalintaikkunassa."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Jonossa"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Lähetetyt"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Paneelin ilmoitusalueen kuvakkeen näyttäminen"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Seurattu"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ohitettu"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Yksityiskohtainen saapuneen postin ilmoitus"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Roskaposti"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Jos tämä asetus on valittuna, uusien viestien määrä jokaisessa kansiossa "
+"näytetään uudesta postista ilmoitettaessa; muuten näytetään vain "
+"yksinkertainen ”Uutta sähköpostia on saapunut” -ilmoitus."
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Määrittele editori:"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Tehtävää"
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Käytä ulkoista editoria"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Sisältää liitteen"
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 %2 %3:sta käytössä"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Ota työryhmätuki käyttöön"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Polku"
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+"Muokkaa lähettäjä/vastaanottaja-otsikkotietoja vastausviestien vastauksissa"
 
-#: util.h:208
+#: kmail.kcfg:173
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
 msgstr ""
-"Tiedosto nimellä ”%1” on jo olemassa. Haluatko, että se ylikirjoitetaan?"
+"Microsoft Outlookin iCalendar-standardin toteutuksessa on useita puutteita; "
+"tämä asetus kiertää yhden niistä. Jos Outlook-käyttäjät eivät saa "
+"vastauksiasi, yritä laittamalla tämä asetus päälle."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Ylikirjoita tiedosto?"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Lähetä työryhmäkutsut viestirungossa"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlookin iCalendar-standardin toteutuksessa on useita puutteita; "
+"tämä asetus kiertää yhden niistä. Jos Outlook-käyttäjät eivät saa "
+"kutsujiasi, yritä laittamalla tämä asetus päälle."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Exchange-yhteensopiva kutsuviestien nimeäminen"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Kun Microsoftin Outlookilla on ongelmia ymmärtää standardia groupware-"
+"sähköpostia Microsoft Exchange -palvelimen kanssa. Aseta tämä valinta "
+"lähettääksesi groupware-kutsut Microsoft Exchangen ymmärtämässä muodossa."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Kun tämä asetus on valittuna, sähköpostin kirjoitusikkunaa ei näytetä. Sen "
+"sijaan kaikki kutsupostit lähetetään automaattisesti. Jos haluat nähdä "
+"postin ennen sen lähetystä, voit ottaa tämän asetuksen pois päältä. Huomaa "
+"kuitenkin, että kirjoitusikkunassa oleva teksti on iCalendar-muotoista ja "
+"sitä ei pitäisi muokata käsin."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Tämän asetuksen käyttäminen mahdollistaa merkintöjen tallentamisen "
+"Kontact-sovelluksista (KOrganizer, KAddressBook, and KNotes.)</p><p>Jos "
+"haluat kytkeä tämän asetuksen päälle, myös muut sovellukset on asetettava "
+"käyttämään IMAP-resurssia; sen saa tehtyä TDE:n Ohjauskeskuksesta.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Yleensä ei ole mitään syytä nähdä kansioita, jotka sisältävät IMAP-"
+"resurssit. Mutta jos haluat nähdä ne, voit käyttää tätä asetusta.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Valitse ryhmätyökansioiden tallennusmuoto. <ul><li>Oletusmuoto on ical "
+"(kalenterikansioille) ja vcard (osoitekirjakansioille). Tällä muodolla saa "
+"käyttöön kaikki Kontactin ominaisuudet.</li><li>Kolab XML -muoto käyttää "
+"mukautettua mallia, joka vastaa tarkemmin Outlookissa käytettyä tapaa. Tämä "
+"muoto antaa paremman Outlook-yhteensopivuuden käytettäessä Kolab-palvelinta "
+"tai yhteensopivaa ratkaisua.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Tämä valitsee IMAP-resurssikansioiden vanhemman.</p><p>Oletuksena Kolab-"
+"palvelin asettaa IMAP-saapuneet-kansion vanhemmaksi.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Tämä on IMAP-resurssikansiot sisältävän tilin tunniste.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Jos halutaan asettaa IMAP-tilan kansioiden nimet paikalliselle kielelle, "
+"voidaan valita näistä kielistä.</p><p> Huomaa, että ainoa syy tämän "
+"tekemiseen on Microsoft Outlook -yhteensopivuus. Tämän asettaminen on "
+"yleensä huono ajatus, koska sitten kielen vaihtaminen on mahdotonta. </"
+"p><p>Eli älä käytä tätä, ellei ole pakko.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Tämä arvo määrää, näytetäänkö KMail-esittely."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Palvelinkohtainen yhteyksien maksimimäärä"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Tätä voidaan käyttää rajoittamaan yhteyksien määrää per palvelin "
+"tarkastettaessa uutta sähköpostia. Oletuksena yhteyksien määrä on "
+"rajoittamaton (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Näytä pikahaun rivi"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Tämä asetus ottaa käyttöön tai poistaa käytöstä hakukentän viestiluettelon "
+"yläpuolella. Sitä voidaan käyttää nopeaan hakuun viestiluettelon tiedoista."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Säilytä alkuperäinen merkistö kun vastataan tai välitetään, jos mahdollista"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Lisää allekirjoitus automaattisesti"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Käytä tätä henkilöllisyyttä myöhemminkin kirjoittaessasi viestejä.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Muista tämä kansio lähetetyille viesteille, jotta sitä käytetään myös "
+"tulevissa kirjoitusikkunoissa."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Muista tämä lähestystapa, jotta sitä käytetään myös tulevissa "
+"kirjoitusikkunoissa."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Käytä tätä henkilöllisyyttä myöhemminkin kirjoittaessasi viestejä.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Rivinvaihto sarakkeessa:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Varoita, jos juurivarmenne vanhentuu &alle:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Käytä tätä asetusta jos haluat Outlookin &#8482; ymmärtävän liitteet, joiden "
+"nimissä on muita kuin englannin kielen merkkejä"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "&Pyydä viestin tilailmoitukset automaattisesti"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Käytä tätä asetusta, jos haluat KMailin pyytävän viestin "
+"tilailmoituksia (MDN) jokaiselle lähtevälle viestille.</p><p>Tämä asetus "
+"vaikuttaa vain oletustoimintaan; voit silti kytkeä MDN:n päälle tai pois "
+"viestikohtaisesti kirjoitusikkunassa, valikkokohdasta <em>Asetukset</em>-"
+"><em>Pyydä viestin tilailmoitus</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Käytä edellisiä osoitteita automaattitäydennyksessä"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Kytke tämä asetus pois päältä, jos et halua äskettäin käytettyjen "
+"osoitteiden täydentyvän automaattisesti kirjoitusikkunan osoitekenttiin."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "&Automaattitallennusväli:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Viestin kirjoittaminen voidaan varmuuskopioida säännöllisesti. Varmuuskopion "
+"tallennusväli voidaan määritellä tässä. Voit ottaa varmuuskopioinnin pois "
+"käytöstä määrittelemällä tallennusväliksi 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "&Korvaa tunnistettu etuliite 'Re:'-etuliitteellä"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "&Korvaa tunnistettu etuliite 'Fwd:'-etuliitteellä"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Käytä älykästä lainausta"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Allekirjoitus on vanhentunut."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Vastaanottajan valitsimen tyyppi"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Vastaanottajan muokkaimen tyyppi"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Vastaanottajamuokkaimen rivien maksimimäärä."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Säilytä alkuperäinen merkistö kun vastataan tai välitetään, jos mahdollista"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Jotkin sähköpostit, erityisesti automaattisesti generoidut, eivät määrittele "
+"merkistökoodausta, jota on käytettävä jotta ne näkyisivät oikein. "
+"Sellaisessa tapauksessa käytetään varamerkistöä, jonka voi asettaa tästä. "
+"Aseta se merkistöksi, jota useimmiten käytetään lähiympäristössäsi. "
+"Oletuksena käytetään koko järjestelmään asetettua koodausta."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Tämän muuttaminen oletuksesta ”Automaattinen” joksikin muuksi pakottaa "
+"annetun koodauksen kaikille posteille, huolimatta siitä mitä ne itse "
+"määrittelevät."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Tällä valinnalla hymiöt kuten :-) näkyvät viestitekstissä pieninä kuvina."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Tämän asetuksen käyttö näyttää lainatun tekstin eri tasoilla. Kytke pois "
+"päältä piilottaaksesi lainatun tekstin tasot."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automaattinen kokoontaittotaso:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Pienennä lainatun tekstin kirjasimen kokoa"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Tämä asetus näyttää lainatun tekstin pienemmällä fontilla."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Tallenna lähetetyt viestit &salattuina"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Näytä käyttäjän sähköpostiohjelma muotoilluissa otsikkotiedoissa"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Tällä valinnalla käyttäjän sähköpostiohjelman ja postinvälitysohjelman "
+"tiedot näkyvät otsikkoteidsoissa kun käytetään muotoiltuja otsikkotietoja."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Lähetä viestin tilailmoitukset tyhjällä lähettäjäkentällä."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Lähetä viestin tilailmoitukset tyhjällä lähettäjätiedolla. Jotkin palvelimet "
+"voi olla asetettu hylkäämään tällaiset viestit, joten jos MDN:ien "
+"lähettämisessä on ongelmia, kytke tämä asetus pois päältä."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Fraasit on muutettu viestipohjiksi"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Vanhat fraasit on muutettu viestipohjiksi"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Uuden viestin viestipohja"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Vastausviestin viestipohja"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Vastaa kaikille -viestin viestipohja"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Välitysviestin viestipohja"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Lainausmerkit"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Muokkaa tiedostoa"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Muokkaa..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Sii&rry"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Kansio"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Viesti"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Vastaa"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Välitä"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Alusta kirjasinasetukset"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-työkalurivi"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Yleiset asetukset"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-työkalurivi"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Vahvista varmenteet käyttäen CRL:iä"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Jos tämä asetus on valittuna, S/MIME-varmenteet vahvistetaan käyttäen "
+"varmenteiden hylkäysluetteloita (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ohita sertifikaattien palvelu-URL"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Älä tarkista varmennekäytäntöjä"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Älä koskaan käytä CRL:ää"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Jos tämä asetus on valittuna, varmenteiden hylkäysluetteloita (CRL) ei "
+"koskaan käytetä vahvistamaan S/MIME-varmenteita."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Nouda puuttuvat jakajan varmenteet"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Jos tämä asetus on valittuna, puuttuvat jakajan varmenteet haetaan, kun "
+"niitä tarvitaan (tämä pätee molempiin vahvistustapoihin, CRL ja OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-pyynnöt"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Älä tee HTTP-pyyntöjä"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Kytkee HTTP:n käytön S/MIMEn yhteydessä pois."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Käytä tätä välityspalvelinta HTTP-pyynnöille:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Käytä järjestelmän HTTP-välityspalvelinta:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Jos tämä asetus on valittuna, oikealla näytettyä HTTP-välityspalvelinta "
+"(joka tulee ympäristömuuttujasta http_proxy) käytetään kaikissa HTTP-"
+"pyynnöissä."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Syötä tähän kaikissa S/MIMEen liittyvissä HTTP-pyynnöissä käytettävän HTTP-"
+"välityspalvelimen sijainti. Syntaksi on kone:portti, esimerkiksi "
+"minunproxyni.eimissaan.fi:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Jätä huomiotta varmenteiden HTTP CRL -jakelupiste"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-pyynnöt"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Älä tee LDAP-pyyntöjä"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Kytkee LDAP:n käytön S/MIMElle pois päältä"
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Jätä huomiotta varmenteiden LDAP CRL -jakelupiste"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Ensisijainen palvelin LDAP-pyynnöille:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"LDAP-palvelimen syöttäminen tähän ohjaa kaikki LDAP-pyynnöt ensin sille "
+"palvelimelle. Tarkemmin, tämä asetus korvaa kaikki LDAP-osoitteessa olevat "
+"palvelin-portti-osat ja tätä palvelinta käytetään myös, jos palvelin ja "
+"portti puuttuvat osoitteesta. Muita LDAP-palvelimia käytetään vain jos "
+"yhteys ”välityspalvelimeen” ei toimi.\n"
+"Syntaksi on ”PALVELIN” tai ”PALVELIN:PORTTI”. Jos PORTTI puuttuu, käytetään "
+"porttia 389 (oletus-LDAP-portti)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Lisää..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Työryhmätuki"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Alusta kirjasinasetukset"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "rajoittamaton"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Viestipohjien asetukset"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Vastaa lähettäjälle"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Vastaa kaikille / Vastaa postituslistalle"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Välitä viesti"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Varoita, jos allekirjoitta&mattomia viestejä lähetetään"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Valitse tämä kohta, jos haluat että allekirjoittamattomien viestin "
+"lähettämisestä varoitetaan."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoita, jos allekirjoittamattomia viestejä lähetetään</h1>\n"
+"Jos tämä asetus on valittu, sinua varoitetaan, jos yrität lähettää osan "
+"viestistä tai koko viestin allekirjoittamattomana.\n"
+"<p>\n"
+"On suositeltavaa pitää tämä asetus valittuna maksimaalisen koskemattomuuden "
+"takaamiseksi.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Varoita, jos salaamattomia viestejä lähetetään"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Valitse tämä kohta, jos haluat että salaamattomien viestin lähettämisestä "
+"varoitetaan."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoita, jos salaamattomia viestejä lähetetään</h1>\n"
+"Jos tämä asetus on valittu, sinua varoitetaan, kun yrität lähettää osan "
+"viestistä tai koko viestin salaamattomana.\n"
+"<p>\n"
+"On suositeltavaa jättää tämä asetus valituksi maksimaalisen koskemattomuuden "
+"takaamiseksi.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Varoita, jos &vastaanottajan sähköpostiosoite &ei ole varmenteessa"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Valitse saadaksesi varoitus, jos lähettäjän sähköpostiosoite ei ole "
+"varmenteessa"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoitus, jos lähettäjän sähköpostiosoite ei ole varmenteessa</h1>\n"
+"Jos tämä asetus on valittu, näytetään varoitus, jos lähettäjän "
+"sähköpostiosoite ei sisälly salaukseen käytettyyn varmenteeseen.\n"
+"<p>\n"
+"On suositeltavaa jättää tämä asetus valituksi maksimaalisen turvallisuuden "
+"takaamiseksi.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Varoita, jos varmenteet/avaimet vanhentuvat pian (aseta kynnysarvot alla)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Allekirjoitusta varten"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Salausta varten"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Valitse päivien lukumäärä tässä"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoita, jos allekirjoitusvarmenne vanhenee</h1>\n"
+"Valitse vähimmäismäärä päiviä, jonka ajan allekirjoitusvarmenteen pitää olla "
+"voimassa, jotta varoitusta ei näytettäisi.\n"
+"<p>\n"
+"Suositeltava SPHINX-asetus on 14 päivää.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoita, jos salausvarmenne vanhenee</h1>\n"
+"Valitse vähimmäismäärä päiviä, jonka ajan salausvarmenteen pitää olla "
+"voimassa, jotta varoitusta ei näytettäisi.\n"
+"<p>\n"
+"Suositeltava SPHINX-asetus on 14 päivää.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoita, jos varmenneketjun varmenne vanhenee</h1>\n"
+"Valitse vähimmäismäärä päiviä, jonka ajan kaikkien ketjun varmenteiden pitää "
+"olla voimassa, jotta varoitusta ei näytettäisi.\n"
+"<p>\n"
+"Suositeltava SPHINX-asetus on 14 päivää.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoita, jos CA-varmenne vanhenee</h1>\n"
+"Valitse vähimmäismäärä päiviä, jonka ajan CA-varmenteen pitää olla voimassa, "
+"jotta varoitusta ei näytettäisi.\n"
+"<p>\n"
+"Suositeltava SPHINX-asetus on 14 päivää.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varoita, jos juurivarmenne vanhenee</h1>\n"
+"Valitse vähimmäismäärä päiviä, jonka ajan juurivarmenteen pitää olla "
+"voimassa, jotta varoitusta ei näytettäisi.\n"
+"<p>\n"
+"Suositeltava SPHINX-asetus on 14 päivää.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Juurivarmenteita varten:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Välissä olevia CA-varmenteita varten:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Peruskäyttäjien varmenteille/avaimille:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Ota käyttöön kaikki ”Älä kysy uudelleen” -varoitukset"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...että voit siirtyä edelliseen ja seuraavaan viestiin käyttämällä\n"
+"nuolinäppäimiä oikealle ja vasemmalle?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p> ...että voit luoda nopeasti suodattimia lähettäjälle, vastaanottajalle,\n"
+"aiheelle ja postituslistoille dialogilla <em>Työkalut&gt;Luo&nbsp;suodin</"
+"em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p> ...että voit päästä eroon joidenkin postituslistojen viestien aiheisiin\n"
+"lisäämistä &quot;[postituslistan nimi]&quot;-osista käyttämällä\n"
+"<em>uudelleenkirjoita otsikko</em> -suodintoimintoa? Käytä vain toimintoa\n"
+"<pre>uudelleenkirjoita otsikko &quot;Aihe&quot;\n"
+"   korvaa &quot;\\s*\\[postituslistan nimi\\]\\s*&quot;\n"
+"   arvolla &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...että voi liittää postituslistan kansioon\n"
+"<em>Kansio-&gt;Postituslistojen hallinta</em> -ikkunassa? Voit sen jälkeen "
+"valita\n"
+"<em>Viesti-&gt;Uusi posti postituslistalle</em>, jolloin viestin "
+"kirjoitusikkuna\n"
+"aukeaa ja vastaanottajaksi tulee postituslistaosoite.\n"
+"Vaihtoehtoisesti voit napsauttaa kansiota hiiren keskimmäisellä napilla</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...että voit asettaa mukautetun kuvakkeen jokaiselle kansiolle?\n"
+"Katso <em>Kansio->Ominaisuudet...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...että KMail osaa näyttää valitun viestin tyyppiä\n"
+"(puhdas teksti/HTML/OpenPGP) kuvaavan väripalkin?</p>\n"
+"<p>Tämä estää yritykset väärentää onnistunut allekirjoitustarkistus\n"
+"lähettämällä HTML-viesti, joka matkii KMailin allekirjoituksen tilan\n"
+"kertovia kehyksiä.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...että voi suodattaa minkä hyvänsä otsikkokentän perusteella\n"
+"yksinkertaisesti syöttämällä otsikkokentän nimen etsintäsäännön\n"
+"ensimmäiseen muokkausruutuun?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...että voit suodattaa vain HTML:ää sisältävät viestit säännöllä\n"
+"<pre>&quot;Content-type&quot; sisältää &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...että vastattaessa lainataan valittu osa viestistä?</p>\n"
+"<p>Jos mitään ei ole valittuna, koko viesti lainataan.</p>\n"
+"<p>Tämä toimii myös liitetiedostoilla, jos valitset kohdan\n"
+"<em>Näytä-&gt;Liitteet-&gt;Sisällytettyinä</em>.</p>\n"
+"<p>Tämä ominaisuus toimii kaikilla muilla vastauskomennoilla\n"
+"paitsi valitsemalla <em>Viesti-&gt;Vastaa lainaamatta</em>.</p>\n"
+"<p align=\"right\"><em>Lähettänyt David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15377,14 +14985,17 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Salaa kaikki viestin osat oletuksena</h1>\n"
-#~ "Jos tämä asetus on valittuna, kaikki viestin osat (siis viestin runko ja kaikki liitetiedostot) salataan oletusarvoisesti.\n"
+#~ "Jos tämä asetus on valittuna, kaikki viestin osat (siis viestin runko ja "
+#~ "kaikki liitetiedostot) salataan oletusarvoisesti.\n"
 #~ "<p>\n"
 #~ "Tämä on oletusasetus, voit silti kumota sen yksittäisille viesteille.\n"
 #~ "</qt>"
@@ -15398,12 +15009,15 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kysy ennen jokaisen osan salausta</h1>\n"
-#~ "Kun tämä asetus on valittuna, jokaisesta viestin osasta (viestin runko sekä kaikki liitetiedostot) kysytään erikseen, halutaanko se salata.\n"
+#~ "Kun tämä asetus on valittuna, jokaisesta viestin osasta (viestin runko "
+#~ "sekä kaikki liitetiedostot) kysytään erikseen, halutaanko se salata.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15417,14 +15031,16 @@ msgstr "Ylikirjoita tiedosto?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Älä salaa viestejä</h1>\n"
 #~ "Jos tämä asetus on valittuna, viestejä ei salata oletusarvoisesti.\n"
 #~ "<p>\n"
-#~ "Tämä on oletusasetus, voit silti kumota sen jokaiselle yksittäiselle viestille.\n"
+#~ "Tämä on oletusasetus, voit silti kumota sen jokaiselle yksittäiselle "
+#~ "viestille.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15436,18 +15052,30 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Salausalgoritmi</h1>\n"
-#~ "Algoritmi on tietokoneelle tarkoitettu kuvaus siitä, kuinka sen pitäisi suorittaa tietty tehtävä. Salausalgoritmi kuvaa kuinka tietokone käyttää vastaanottajan avainta viestiisi, jotta vain tarkoitettu vastaanottaja voi lukea viestin.\n"
+#~ "Algoritmi on tietokoneelle tarkoitettu kuvaus siitä, kuinka sen pitäisi "
+#~ "suorittaa tietty tehtävä. Salausalgoritmi kuvaa kuinka tietokone käyttää "
+#~ "vastaanottajan avainta viestiisi, jotta vain tarkoitettu vastaanottaja "
+#~ "voi lukea viestin.\n"
 #~ "<p>\n"
-#~ "Salausalgoritmin valinta määrittelee sen, kuinka helppoa tai vaikeaa on siepata ja lukea viesti. Kaikkia SPHINX-ympäristön tarjoamia algoritmeja pidetään hyvin turvallisina. Yleensä oletusarvo toimii hyvin tässä.\n"
+#~ "Salausalgoritmin valinta määrittelee sen, kuinka helppoa tai vaikeaa on "
+#~ "siepata ja lukea viesti. Kaikkia SPHINX-ympäristön tarjoamia algoritmeja "
+#~ "pidetään hyvin turvallisina. Yleensä oletusarvo toimii hyvin tässä.\n"
 #~ "<p>\n"
 #~ "Tämä on oletusasetus, sen voi korvata jokaiselle viestille erikseen.\n"
 #~ "</qt>"
@@ -15461,16 +15089,22 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Varmennetarkastus voi päättyä paikallisesti tallennettuun varmenteeseen</h1>\n"
-#~ "Jos tämä asetus on valittuna, varmenneketjun tarkastus voi päättyä paikallisesti tallennettuun varmenteeseen.\n"
+#~ "<h1>Varmennetarkastus voi päättyä paikallisesti tallennettuun "
+#~ "varmenteeseen</h1>\n"
+#~ "Jos tämä asetus on valittuna, varmenneketjun tarkastus voi päättyä "
+#~ "paikallisesti tallennettuun varmenteeseen.\n"
 #~ "<p>\n"
-#~ "Paikallisesti tallennetut varmenteen voivat olla omiasi, yhteyskumppaneiden tai varmenteiden myöntäjän (CA).\n"
+#~ "Paikallisesti tallennetut varmenteen voivat olla omiasi, "
+#~ "yhteyskumppaneiden tai varmenteiden myöntäjän (CA).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15482,11 +15116,14 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt><h1>Tarkasta aina varmennepolku juurivarmenteeseen asti</h1>\n"
-#~ "Jos tämä asetus on päällä, vastaanottajan varmenteeseen kuuluva varmennepolku tarkastetaan aina juurivarmenteeseen asti.\n"
+#~ "Jos tämä asetus on päällä, vastaanottajan varmenteeseen kuuluva "
+#~ "varmennepolku tarkastetaan aina juurivarmenteeseen asti.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15498,16 +15135,20 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tarkasta varmennepolku</h1>\n"
-#~ "Jos tämä asetus on päällä, vastaanottajan varmenteen koko polku juureen asti tarkastetaan.\n"
+#~ "Jos tämä asetus on päällä, vastaanottajan varmenteen koko polku juureen "
+#~ "asti tarkastetaan.\n"
 #~ "<p>\n"
-#~ "Huomaa, että itse vastaanottajan varmenteen tarkastusta ei ole mahdollista kytkeä pois päältä.\n"
+#~ "Huomaa, että itse vastaanottajan varmenteen tarkastusta ei ole "
+#~ "mahdollista kytkeä pois päältä.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15519,16 +15160,27 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Käytä varmenteiden hylkäyslistoja (CRL)</h1>\n"
-#~ "Varmenteiden hylkäyslista sisältää varmenteitaa, jotka on otettu pois käytöstä ja joita ei enää pitäisi käyttää salaukseen. Käyttäjä voi hylätä varmenteensa, jos hän uskoo, että sen koskemattomuus on vaarantunut (esim. joku on arvannut PIN-numeron)\n"
+#~ "Varmenteiden hylkäyslista sisältää varmenteitaa, jotka on otettu pois "
+#~ "käytöstä ja joita ei enää pitäisi käyttää salaukseen. Käyttäjä voi hylätä "
+#~ "varmenteensa, jos hän uskoo, että sen koskemattomuus on vaarantunut "
+#~ "(esim. joku on arvannut PIN-numeron)\n"
 #~ "<p>\n"
-#~ "On suositeltua käyttää CRL:iä suurimman mahdollisen turvallisuuden saavuttamiseksi. Varmenne- ja CRL-hallinnan asetusikkunassa voi valita mistä CRL:t haetaan.\n"
+#~ "On suositeltua käyttää CRL:iä suurimman mahdollisen turvallisuuden "
+#~ "saavuttamiseksi. Varmenne- ja CRL-hallinnan asetusikkunassa voi valita "
+#~ "mistä CRL:t haetaan.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15540,12 +15192,14 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varoita, jos CRL vanhenee lähiaikoina</h1>\n"
-#~ "Jos tämä asetus on valittuna, saat varoituksen jos joku käyttämistäsi CLR:istä on vanhenemassa lähiaikoina.\n"
+#~ "Jos tämä asetus on valittuna, saat varoituksen jos joku käyttämistäsi CLR:"
+#~ "istä on vanhenemassa lähiaikoina.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15554,14 +15208,16 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varoita, jos CRL vanhentuu lähiaikoina</h1>\n"
-#~ "Tässä kentässä voidaan määritellä kuinka kauan ennen CRL:n vanhentumista annetaan varoitus.\n"
+#~ "Tässä kentässä voidaan määritellä kuinka kauan ennen CRL:n vanhentumista "
+#~ "annetaan varoitus.\n"
 #~ "<p>\n"
 #~ "Suositeltava asetus SPHINX-ympäristössä on 7 päivää.\n"
 #~ "</qt>"
@@ -15570,21 +15226,27 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgstr "&Salaa aina myös oma kopio"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Valitse, jos haluat, että myös salatut viestit salataan omalla avaimellasi."
+#~ msgstr ""
+#~ "Valitse, jos haluat, että myös salatut viestit salataan omalla "
+#~ "avaimellasi."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Salaa aina myös oma kopio</h1>\n"
-#~ "Jos tämä asetus on valittu, lähettämäsi salatut viestit salataan myös käyttäen omaa avaintasi.\n"
+#~ "Jos tämä asetus on valittu, lähettämäsi salatut viestit salataan myös "
+#~ "käyttäen omaa avaintasi.\n"
 #~ "<p>\n"
-#~ "On suositeltavaa jättää tämä asetus valituksi, jotta voit lukea lähettämäsi viestit.\n"
+#~ "On suositeltavaa jättää tämä asetus valituksi, jotta voit lukea "
+#~ "lähettämäsi viestit.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15596,16 +15258,21 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varoita, jos varmenne vanhentuu</h1>\n"
-#~ "Jos tämä asetus on valittu, sinua varoitetaan, kun yrität käyttää salaukseen varmennetta, joka vanhentuu annetun päivien määrän aikana.\n"
+#~ "Jos tämä asetus on valittu, sinua varoitetaan, kun yrität käyttää "
+#~ "salaukseen varmennetta, joka vanhentuu annetun päivien määrän aikana.\n"
 #~ "<p>\n"
-#~ "On suositeltavaa jättää tämä asetus valituksi. Silloin vältytään käyttämästä varmenteita, jotka vanhentuvat pian.\n"
+#~ "On suositeltavaa jättää tämä asetus valituksi. Silloin vältytään "
+#~ "käyttämästä varmenteita, jotka vanhentuvat pian.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15626,8 +15293,28 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Valitse lähetettävät varmenteet"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Varmenteiden lähettäminen</h1> Ilman varmennettasi vastaanottaja ei pysty määrittämään, tuliko viesti todella sinulta vai muuttiko sitä joku kolmas taho. <p> Vastaanottaja voi hankkia varmenteesi keskuspalvelimelta, mutta voit myös liittää varmenteen viestiisi. Voit valita, haluatko liittää varmennetta ollenkaan, vain oman varmenteesi vai koko varmenneketjun - mukaan lukien tai pois jättäen juurivarmenne - joka varmentaa oman varmenteesi. <p> On suositeltavaa liittää viestin mukaan ainakin oma varmenteesi. <p> Tämä on oletusasetus, voit kumota sen jokaiselle yksittäiselle viestille. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Varmenteiden lähettäminen</h1> Ilman varmennettasi vastaanottaja "
+#~ "ei pysty määrittämään, tuliko viesti todella sinulta vai muuttiko sitä "
+#~ "joku kolmas taho. <p> Vastaanottaja voi hankkia varmenteesi "
+#~ "keskuspalvelimelta, mutta voit myös liittää varmenteen viestiisi. Voit "
+#~ "valita, haluatko liittää varmennetta ollenkaan, vain oman varmenteesi vai "
+#~ "koko varmenneketjun - mukaan lukien tai pois jättäen juurivarmenne - joka "
+#~ "varmentaa oman varmenteesi. <p> On suositeltavaa liittää viestin mukaan "
+#~ "ainakin oma varmenteesi. <p> Tämä on oletusasetus, voit kumota sen "
+#~ "jokaiselle yksittäiselle viestille. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Lähetä &oma varmenteesi"
@@ -15642,62 +15329,76 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgstr "Allekirjoita kaikki viestin &osat"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Tämä asetus valittuna kaikki viestin osat allekirjoitetaan oletuksena"
+#~ msgstr ""
+#~ "Tämä asetus valittuna kaikki viestin osat allekirjoitetaan oletuksena"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Allekirjoita kaikki viestin osat oletuksena</h1>\n"
-#~ "Jos tämä asetus on valittuna, viestin kaikki osat (viestin runko ja kaikki liitetiedostot) allekirjoitetaan oletuksena.\n"
+#~ "Jos tämä asetus on valittuna, viestin kaikki osat (viestin runko ja "
+#~ "kaikki liitetiedostot) allekirjoitetaan oletuksena.\n"
 #~ "<p>\n"
-#~ "Tämä on oletusasetus, voit silti korvata sen jokaiselle viestille erikseen.\n"
+#~ "Tämä on oletusasetus, voit silti korvata sen jokaiselle viestille "
+#~ "erikseen.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Kysy &ennen jokaisen osan allekirjoittamista"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Jos tämä on valittuna, jokaisen osan allekirjoittamisesta kysytään erikseen."
+#~ msgstr ""
+#~ "Jos tämä on valittuna, jokaisen osan allekirjoittamisesta kysytään "
+#~ "erikseen."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kysy ennen jokaisen osan allekirjoittamista</h1>\n"
-#~ "Kun tämä asetus on valittuna, jokaisen viestin osan (viestin runko ja liitetiedostot) allekirjoittamisesta kysytään erikseen.\n"
+#~ "Kun tämä asetus on valittuna, jokaisen viestin osan (viestin runko ja "
+#~ "liitetiedostot) allekirjoittamisesta kysytään erikseen.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
 #~ msgstr "&Älä allekirjoita viestejä"
 
 #~ msgid "Check for not signing a message by default"
-#~ msgstr "Valitse tämä asetus, kun et halua viestiä allekirjoitettavan oletuksena"
+#~ msgstr ""
+#~ "Valitse tämä asetus, kun et halua viestiä allekirjoitettavan oletuksena"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Älä allekirjoita viestejä</h1>\n"
 #~ "Jos tämä asetus on valittuna, viestejä ei allekirjoiteta oletuksena.\n"
 #~ "<p>\n"
-#~ "Tämä on oletusasetus, voit silti korvata sen jokaiselle yksittäiselle asetukselle.\n"
+#~ "Tämä on oletusasetus, voit silti korvata sen jokaiselle yksittäiselle "
+#~ "asetukselle.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Allekirjoitusvarmenne asetetaan <em>Varmenteet</em>-sivulla."
 
 #~ msgid "RSA + SHA-1"
@@ -15709,18 +15410,31 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Allekirjoitusalgoritmi</h1>\n"
-#~ "Algoritmi on tietokoneelle tarkoitettu kuvaus siitä, kuinka sen pitäisi suorittaa tietty tehtävä. Allekirjoitusalgoritmi kuvaa, kuinka tietokone käyttää allekirjoitusavainta viestiisi, jotta vain tarkoitettu vastaanottaja voi päätellä, tuliko viesti todella sinulta.\n"
+#~ "Algoritmi on tietokoneelle tarkoitettu kuvaus siitä, kuinka sen pitäisi "
+#~ "suorittaa tietty tehtävä. Allekirjoitusalgoritmi kuvaa, kuinka tietokone "
+#~ "käyttää allekirjoitusavainta viestiisi, jotta vain tarkoitettu "
+#~ "vastaanottaja voi päätellä, tuliko viesti todella sinulta.\n"
 #~ "<p>\n"
-#~ "Allekirjoitusalgoritmin valinta määrittelee sen, kuinka helppoa tai vaikeaa on väärentää viesti. Kaikkia SPHINX-ympäristön tarjoamia algoritmeja pidetään hyvin turvallisina. Yleensä oletusarvo toimii hyvin tässä.\n"
+#~ "Allekirjoitusalgoritmin valinta määrittelee sen, kuinka helppoa tai "
+#~ "vaikeaa on väärentää viesti. Kaikkia SPHINX-ympäristön tarjoamia "
+#~ "algoritmeja pidetään hyvin turvallisina. Yleensä oletusarvo toimii hyvin "
+#~ "tässä.\n"
 #~ "<p>\n"
 #~ "Tämä on oletusasetus, sen voi korvata jokaiselle viestille erikseen.\n"
 #~ "</qt>"
@@ -15732,17 +15446,22 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgstr "&Tallenna viestit allekirjoitusten kanssa"
 
 #~ msgid "Check to store messages with their signatures"
-#~ msgstr "Valitse, jos haluat, että viestit tallennetaan allekirjoitusten kanssa"
+#~ msgstr ""
+#~ "Valitse, jos haluat, että viestit tallennetaan allekirjoitusten kanssa"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tallenna viestit allekirjoituksen kanssa</h1>\n"
-#~ "Kun tämä asetus on käytössä, lähetetyt viestit tallennetaan yhdessä niissä käytettyjen allekirjoitusten kanssa. Tämä on suositeltavaa, koska voit myöhemmin tarkastaa, allekirjoitettiinko viesti tai tietty sen osa.\n"
+#~ "Kun tämä asetus on käytössä, lähetetyt viestit tallennetaan yhdessä "
+#~ "niissä käytettyjen allekirjoitusten kanssa. Tämä on suositeltavaa, koska "
+#~ "voit myöhemmin tarkastaa, allekirjoitettiinko viesti tai tietty sen osa.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15752,7 +15471,9 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgstr "&Normaali MIME"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Multipart/Signed -osa sisältäen allekirjoituksen ja allekirjoitettua dataa."
+#~ msgstr ""
+#~ "Multipart/Signed -osa sisältäen allekirjoituksen ja allekirjoitettua "
+#~ "dataa."
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
 #~ msgstr "Läpi&kuultavuus (suositellaan vain SPHINX:ille)"
@@ -15766,8 +15487,22 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Valitse kuinka usein PIN täytyy syöttää"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN:n syöttäminen</h1> Tässä voidaan valita, kuinka usein PIN on syötettävä, jotta päästään henkilökohtaiseen turvaympäristöön (PSE), joka sisältää varmenteet. <p> Mitä useammin PIN on annettava, sitä suuremmassa turvassa sähköpostit ovat väärentämiseltä, mutta toiminnot ovat vastaavasti hankalampia. <p> Jos olet epävarma, mitä valita, jätä tämä asetus kuten se on. <p> Huomaa, että turvallisuussyistä ei ole mahdollista kytkeä PIN:n syöttöä kokonaan pois. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN:n syöttäminen</h1> Tässä voidaan valita, kuinka usein PIN on "
+#~ "syötettävä, jotta päästään henkilökohtaiseen turvaympäristöön (PSE), joka "
+#~ "sisältää varmenteet. <p> Mitä useammin PIN on annettava, sitä suuremmassa "
+#~ "turvassa sähköpostit ovat väärentämiseltä, mutta toiminnot ovat "
+#~ "vastaavasti hankalampia. <p> Jos olet epävarma, mitä valita, jätä tämä "
+#~ "asetus kuten se on. <p> Huomaa, että turvallisuussyistä ei ole "
+#~ "mahdollista kytkeä PIN:n syöttöä kokonaan pois. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Kerran istunnossa"
@@ -15784,35 +15519,47 @@ msgstr "Ylikirjoita tiedosto?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varoita, jos &CA-varmenne vanhentuu</h1>\n"
-#~ "Jos tämä asetus on valittu, sinua varoitetaan, kun yrität käyttää allekirjoittamiseen varmennetta, joka vanhentuu annetun päivien määrän aikana.\n"
+#~ "Jos tämä asetus on valittu, sinua varoitetaan, kun yrität käyttää "
+#~ "allekirjoittamiseen varmennetta, joka vanhentuu annetun päivien määrän "
+#~ "aikana.\n"
 #~ "<p>\n"
-#~ "On suositeltavaa jättää tämä asetus valituksi maksimaalisen koskemattomuuden takaamiseksi. Silloin vältytään käyttämästä varmenteita, jotka vanhentuvat pian.\n"
+#~ "On suositeltavaa jättää tämä asetus valituksi maksimaalisen "
+#~ "koskemattomuuden takaamiseksi. Silloin vältytään käyttämästä varmenteita, "
+#~ "jotka vanhentuvat pian.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Varoitus, jos allekirjoitus vanhentuu alle:"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Varoitus, jos allekirjoittajan sähköpostiosoite &ei ole varmenteessa"
+#~ msgstr ""
+#~ "Varoitus, jos allekirjoittajan sähköpostiosoite &ei ole varmenteessa"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Varoita, jos allekirjoittajan sähköpostiosoite ei ole varmenteessa</h1>\n"
-#~ "Jos tämä asetus on valittu, näytetään varoitus, jos allekirjoittajan sähköpostiosoite ei sisälly salaukseen käytettyyn varmenteeseen.\n"
+#~ "<h1>Varoita, jos allekirjoittajan sähköpostiosoite ei ole varmenteessa</"
+#~ "h1>\n"
+#~ "Jos tämä asetus on valittu, näytetään varoitus, jos allekirjoittajan "
+#~ "sähköpostiosoite ei sisälly salaukseen käytettyyn varmenteeseen.\n"
 #~ "<p>\n"
-#~ "On suositeltavaa jättää tämä asetus valituksi maksimaalisen turvallisuuden takaamiseksi.\n"
+#~ "On suositeltavaa jättää tämä asetus valituksi maksimaalisen "
+#~ "turvallisuuden takaamiseksi.\n"
 #~ "</qt>"
diff --git a/tde-i18n-fr/messages/tdepim/kmail.po b/tde-i18n-fr/messages/tdepim/kmail.po
index 5e22e93b974..04a0f0615d3 100644
--- a/tde-i18n-fr/messages/tdepim/kmail.po
+++ b/tde-i18n-fr/messages/tdepim/kmail.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-15 23:16+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -30,22 +30,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"Matthieu Robin,Gilles Caulier,Joëlle Cornavin,Thibaut Cousin,Gérard "
-"Delafond,François-Xavier Duranceau,Jean-Marc Duval,Nicolas Ternisien"
+"Matthieu Robin,Gilles Caulier,Joëlle Cornavin,Thibaut Cousin,Gérard Delafond,"
+"François-Xavier Duranceau,Jean-Marc Duval,Nicolas Ternisien"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
 "kde@macolu.org,caulier.gilles@free.fr,jcornavi@kde-france.org,cousin@kde.org,"
-"gerard@delafond.org,duranceau@kde.org,shadowcatcher@free.fr,"
-"nicolas.ternisien@gmail.com"
+"gerard@delafond.org,duranceau@kde.org,shadowcatcher@free.fr,nicolas."
+"ternisien@gmail.com"
 
 #: aboutdata.cpp:53
 msgid "Maintainer"
@@ -78,8 +78,8 @@ msgstr "Notifier l'arrivée de nouveaux messages dans la boîte à miniatures"
 #: aboutdata.cpp:93
 msgid "PGP 6 support and further enhancements of the encryption support"
 msgstr ""
-"Gestion de PGP version 6 et autres perfectionnements pour la prise en charge du "
-"chiffrement"
+"Gestion de PGP version 6 et autres perfectionnements pour la prise en charge "
+"du chiffrement"
 
 #: aboutdata.cpp:103
 msgid ""
@@ -116,7 +116,8 @@ msgstr "Bêta testeur de la gestion de PGP 6"
 #: aboutdata.cpp:200
 msgid "timestamp for 'Transmission completed' status messages"
 msgstr ""
-"Estampille temporelle pour les messages ayant l'état « transmission terminée »"
+"Estampille temporelle pour les messages ayant l'état « transmission "
+"terminée »"
 
 #: aboutdata.cpp:204
 msgid "multiple encryption keys per address"
@@ -190,6 +191,12 @@ msgstr "Auc&un (utiliser avec prudence)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Compte pour le basculement automatique des ressources"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Effacer l'opération de collage"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -206,8 +213,8 @@ msgstr "Effacer l'opération de collage"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Supprimer toutes les allocations périmées qui ont été allouées par la ressource "
-"de ce compte."
+"Supprimer toutes les allocations périmées qui ont été allouées par la "
+"ressource de ce compte."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -267,14 +274,14 @@ msgstr "&Utilisateur :"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Votre fournisseur d'accès à Internet vous a donné un <em>nom d'utilisateur</em> "
-"nécessaire pour vous authentifier sur leurs serveurs. C'est habituellement la "
-"première partie de votre adresse de courrier électronique (la partie avant <em>"
-"@</em>)."
+"Votre fournisseur d'accès à Internet vous a donné un <em>nom d'utilisateur</"
+"em> nécessaire pour vous authentifier sur leurs serveurs. C'est "
+"habituellement la première partie de votre adresse de courrier électronique "
+"(la partie avant <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -295,12 +302,12 @@ msgstr "Conse&rver le mot de passe POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Cochez cette option pour que KMail conserve le mot de passe.\n"
 "Si TDEWallet est disponible, le mot de passe conservé sera en sécurité.\n"
@@ -335,12 +342,13 @@ msgstr "&Filtrer les messages s'ils sont plus grands que"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Si vous choisissez cette option, les filtres POP seront utilisés pour décider "
-"quoi faire des messages. Vous pouvez alors choisir de les télécharger, de les "
-"supprimer ou de les laisser sur le serveur."
+"Si vous choisissez cette option, les filtres POP seront utilisés pour "
+"décider quoi faire des messages. Vous pouvez alors choisir de les "
+"télécharger, de les supprimer ou de les laisser sur le serveur."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -389,13 +397,15 @@ msgstr "Te&xte en clair"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -439,21 +449,21 @@ msgstr "Espaces de noms :"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Vous pouvez apercevoir ici les différents espaces de noms gérés par votre "
-"serveur IMAP. Chaque serveur de nom représente un préfixe séparant les groupes "
-"de dossiers. Les espaces de noms permettent ainsi, par exemple, à KMail "
-"d'afficher vos dossiers personnels et vos dossiers partagés au sein d'un même "
-"compte."
+"serveur IMAP. Chaque serveur de nom représente un préfixe séparant les "
+"groupes de dossiers. Les espaces de noms permettent ainsi, par exemple, à "
+"KMail d'afficher vos dossiers personnels et vos dossiers partagés au sein "
+"d'un même compte."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
 msgstr ""
-"Recharger les espaces de noms depuis le serveur. Cette action écrasera toutes "
-"les modifications effectuées."
+"Recharger les espaces de noms depuis le serveur. Cette action écrasera "
+"toutes les modifications effectuées."
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -486,7 +496,8 @@ msgstr "Conse&rver le mot de passe IMAP"
 #: accountdialog.cpp:976
 msgid "Automaticall&y compact folders (expunges deleted messages)"
 msgstr ""
-"Purger automat&iquement les dossiers (efface réellement les messages supprimés)"
+"Purger automat&iquement les dossiers (efface réellement les messages "
+"supprimés)"
 
 #: accountdialog.cpp:981
 msgid "Sho&w hidden folders"
@@ -507,14 +518,14 @@ msgstr "Charger les pièces jointes à la de&mande"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Activez cette option pour charger les pièces jointes de façon non automatique "
-"quand vous sélectionnez le courrier électronique, mais seulement au moment de "
-"cliquer sur la pièce jointe. Ainsi, même les courriels volumineux s'afficheront "
-"instantanément."
+"Activez cette option pour charger les pièces jointes de façon non "
+"automatique quand vous sélectionnez le courrier électronique, mais seulement "
+"au moment de cliquer sur la pièce jointe. Ainsi, même les courriels "
+"volumineux s'afficheront instantanément."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -555,7 +566,7 @@ msgstr "<aucun>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Boîte de réception"
 
@@ -563,48 +574,49 @@ msgstr "Boîte de réception"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Le serveur ne semble pas gérer les numéros de messages uniques, mais c'est une "
-"exigence pour laisser les messages sur le serveur.\n"
-"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous avez "
-"encore la possibilité d'activer la fonction prévue pour laisser les messages "
-"reçus sur le serveur."
+"Le serveur ne semble pas gérer les numéros de messages uniques, mais c'est "
+"une exigence pour laisser les messages sur le serveur.\n"
+"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous "
+"avez encore la possibilité d'activer la fonction prévue pour laisser les "
+"messages reçus sur le serveur."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Le serveur ne semble pas gérer la réception des en-têtes de messages, mais "
 "c'est une exigence pour filtrer les messages sur le serveur.\n"
-"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous avez "
-"encore la possibilité d'activer le filtrage des messages sur le serveur."
+"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous "
+"avez encore la possibilité d'activer le filtrage des messages sur le serveur."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Veuillez noter que cette fonctionnalité peut perturber certains serveurs POP3 "
-"ne gérant pas les canaux de communication et leur faire envoyer des messages "
-"endommagés.\n"
-"Ceci est configurable car certains serveurs gèrent les canaux de communication "
-"sans l'annoncer. Pour savoir si votre serveur POP3 l'annonce, cliquez sur le "
-"bouton « Vérifier ce que le serveur peut gérer » situé en bas de cette "
-"fenêtre.\n"
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Veuillez noter que cette fonctionnalité peut perturber certains serveurs "
+"POP3 ne gérant pas les canaux de communication et leur faire envoyer des "
+"messages endommagés.\n"
+"Ceci est configurable car certains serveurs gèrent les canaux de "
+"communication sans l'annoncer. Pour savoir si votre serveur POP3 l'annonce, "
+"cliquez sur le bouton « Vérifier ce que le serveur peut gérer » situé en bas "
+"de cette fenêtre.\n"
 "Si votre serveur ne prétend pas le gérer, mais que vous voulez plus de "
-"rapidité, vous devrez faire vous-même des tests en vous envoyant des courriers "
-"électroniques groupés et en les réceptionnant."
+"rapidité, vous devrez faire vous-même des tests en vous envoyant des "
+"courriers électroniques groupés et en les réceptionnant."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -613,53 +625,53 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Le serveur ne semble pas gérer le mécanisme de pipeline ; par conséquent, cette "
-"option a été désactivée.\n"
-"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous avez "
-"la possibilité d'activer le mécanisme de pipeline. Veuillez noter cependant que "
-"cette fonctionnalité peut amener certains serveurs POP ne prenant pas en charge "
-"le mécanisme de pipeline à envoyer des messages corrompus. Donc, avant "
-"d'utiliser cette fonctionnalité avec un courriel important, testez-la d'abord "
-"en vous envoyant un grand nombre de messages tests que vous téléchargerez tous "
-"en une fois depuis le serveur POP."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Le serveur ne semble pas gérer le mécanisme de pipeline ; par conséquent, "
+"cette option a été désactivée.\n"
+"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous "
+"avez la possibilité d'activer le mécanisme de pipeline. Veuillez noter "
+"cependant que cette fonctionnalité peut amener certains serveurs POP ne "
+"prenant pas en charge le mécanisme de pipeline à envoyer des messages "
+"corrompus. Donc, avant d'utiliser cette fonctionnalité avec un courriel "
+"important, testez-la d'abord en vous envoyant un grand nombre de messages "
+"tests que vous téléchargerez tous en une fois depuis le serveur POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
-msgstr ""
-"Le serveur ne semble pas gérer les numéros de messages uniques, mais c'est une "
-"exigence pour laisser les messages sur le serveur ; par conséquent, cette "
-"option a été désactivée.\n"
-"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous avez "
-"encore la possibilité d'activer la fonction prévue pour laisser les messages "
-"reçus sur le serveur."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
+msgstr ""
+"Le serveur ne semble pas gérer les numéros de messages uniques, mais c'est "
+"une exigence pour laisser les messages sur le serveur ; par conséquent, "
+"cette option a été désactivée.\n"
+"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous "
+"avez encore la possibilité d'activer la fonction prévue pour laisser les "
+"messages reçus sur le serveur."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Le serveur ne semble pas gérer la réception des en-têtes de messages, mais "
-"c'est une exigence pour filtrer les messages sur le serveur ; par conséquent, "
-"cette option a été désactivée.\n"
-"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous avez "
-"encore la possibilité d'activer le filtrage des messages sur le serveur."
+"c'est une exigence pour filtrer les messages sur le serveur ; par "
+"conséquent, cette option a été désactivée.\n"
+"Comme certains serveurs n'annoncent pas correctement leurs capacités, vous "
+"avez encore la possibilité d'activer le filtrage des messages sur le serveur."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -739,8 +751,8 @@ msgstr "Compte IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Vous devez ajouter un compte dans la partie réseau de la configuration pour "
 "pouvoir recevoir des messages."
@@ -779,14 +791,14 @@ msgstr "Bienvenue sur KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Il semble que vous démarrez KMail pour la première fois. Vous pouvez "
 "utiliser cet assistant pour configurer simplement vos comptes. Saisissez "
-"simplement les données de connexion fournies par votre fournisseur de courriers "
-"électroniques dans les pages suivantes.</qt>"
+"simplement les données de connexion fournies par votre fournisseur de "
+"courriers électroniques dans les pages suivantes.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -848,8 +860,7 @@ msgstr "Utiliser la réception locale"
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Aucun"
@@ -965,7 +976,8 @@ msgstr ""
 #: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr ""
-"<br>Les messages non sollicités ne sont pas déplacés dans un dossier précis.</p>"
+"<br>Les messages non sollicités ne sont pas déplacés dans un dossier précis."
+"</p>"
 
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
@@ -991,32 +1003,30 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Vous trouverez ici de l'aide pour configurer les règles de filtrage de KMail "
-"afin d'utiliser quelques outils courants pour éliminer les messages non "
-"sollicités.</p> "
-"<p>L'assistant peut détecter les outils installés sur votre ordinateur et créer "
-"les règles de filtrage pour classer les messages à l'aide de ces outils et pour "
-"séparer ceux qui sont considérés comme des virus. Dans tous les cas, "
-"l'assistant ne prend en compte aucune règle de filtrage existante : il ajoute "
-"toujours les nouvelles règles.</p>"
-"<p><b>Avertissement : </b>Comme KMail est bloqué pendant l'analyse permettant "
-"de détecter les messages avec des virus, vous risquez d'être confronté à des "
-"problèmes de réceptivité avec KMail car les opérations visant à supprimer les "
-"virus prennent, en principe, beaucoup de temps ; vous devrez peut-être "
-"envisager de supprimer les règles de filtrage créées par l'assistant pour "
-"revenir au comportement antérieur."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Vous trouverez ici de l'aide pour configurer les règles de filtrage de "
+"KMail afin d'utiliser quelques outils courants pour éliminer les messages "
+"non sollicités.</p> <p>L'assistant peut détecter les outils installés sur "
+"votre ordinateur et créer les règles de filtrage pour classer les messages à "
+"l'aide de ces outils et pour séparer ceux qui sont considérés comme des "
+"virus. Dans tous les cas, l'assistant ne prend en compte aucune règle de "
+"filtrage existante : il ajoute toujours les nouvelles règles.</"
+"p><p><b>Avertissement : </b>Comme KMail est bloqué pendant l'analyse "
+"permettant de détecter les messages avec des virus, vous risquez d'être "
+"confronté à des problèmes de réceptivité avec KMail car les opérations "
+"visant à supprimer les virus prennent, en principe, beaucoup de temps ; vous "
+"devrez peut-être envisager de supprimer les règles de filtrage créées par "
+"l'assistant pour revenir au comportement antérieur."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1052,16 +1062,15 @@ msgstr "Déplacer le courriel &probablement non sollicité vers :"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Le dossier par défaut du courriel probablement non sollicité est la boîte de "
 "réception, mais vous pouvez cependant modifier cela dans la vue ci-dessous. "
-"<p>Remarquez que l'ensemble des outils ne gèrent pas le classement du courriel "
-"non sûr. Si vous n'avez pas sélectionné d'outil en mesure d'effectuer ce "
-"traitement, la sélection du dossier est facultative."
+"<p>Remarquez que l'ensemble des outils ne gèrent pas le classement du "
+"courriel non sûr. Si vous n'avez pas sélectionné d'outil en mesure "
+"d'effectuer ce traitement, la sélection du dossier est facultative."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1071,13 +1080,13 @@ msgstr "Vérifier les messages à l'aide des outils antivirus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Laissez les outils antivirus vérifier vos messages. L'assistant créera les "
 "outils appropriés. Les messages sont habituellement marqués par les outils, "
-"afin que les filtres suivants puissent y réagir et, par exemple, déplacer les "
-"messages infectés par un virus dans un dossier spécial."
+"afin que les filtres suivants puissent y réagir et, par exemple, déplacer "
+"les messages infectés par un virus dans un dossier spécial."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1086,13 +1095,13 @@ msgstr "Déplacer les messages détectés comme infectés vers le dossier indiqu
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Un filtre pour détecter les messages classés comme étant infectés par un virus "
-"et pour déplacer ces messages dans un dossier prédéfini est créé. Le dossier "
-"par défaut est le dossier Corbeille, mais vous pouvez changer ce comportement "
-"dans l'affichage des dossiers."
+"Un filtre pour détecter les messages classés comme étant infectés par un "
+"virus et pour déplacer ces messages dans un dossier prédéfini est créé. Le "
+"dossier par défaut est le dossier Corbeille, mais vous pouvez changer ce "
+"comportement dans l'affichage des dossiers."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1100,11 +1109,11 @@ msgstr "Marquer également les messages détectés en tant qu'infectés comme lu
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Marquez les messages qui ont été classés en tant qu'infectés par un virus comme "
-"lus, et déplacez-les dans le dossier indiqué."
+"Marquez les messages qui ont été classés en tant qu'infectés par un virus "
+"comme lus, et déplacez-les dans le dossier indiqué."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1299,8 +1308,8 @@ msgstr "Impossible de lire le dossier « %1 » sur le serveur : "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1320,8 +1329,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1352,17 +1361,17 @@ msgstr "Supprimé"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Aucune de vos identités ne correspond au destinataire de ce message."
 "<br>Veuillez choisir votre adresse dans la liste suivante :"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Plusieurs de vos identités correspondent au destinataire de ce message. "
 "<br>Veuillez choisir votre adresse dans la liste suivante :"
@@ -1394,18 +1403,21 @@ msgstr "Erreur lors de la purge de « %1 ». Purge annulée."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ce paramètre doit être fourni par l'administrateur de votre système.</p>"
-"<p>Si vous estimez qu'il y a une erreur, veuillez le contacter.</p></qt>"
+"<qt><p>Ce paramètre doit être fourni par l'administrateur de votre système.</"
+"p><p>Si vous estimez qu'il y a une erreur, veuillez le contacter.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Chargement du profil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configuration du compte"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "A&jouter..."
@@ -1435,6 +1447,11 @@ msgstr "<qt>Voulez-vous vraiment supprimer l'identité nommée <b>%1</b> ?</qt>
 msgid "Remove Identity"
 msgstr "Supprimer l'identité"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Su&pprimer"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ajouter..."
@@ -1443,6 +1460,11 @@ msgstr "Ajouter..."
 msgid "Modify..."
 msgstr "Modifier..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Su&pprimer"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Paramétrer comme valeur par défaut"
@@ -1459,17 +1481,15 @@ msgstr "Envoi des messa&ges"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Comptes d'envoi (ajoutez au moins un compte !) :"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nom"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1491,8 +1511,7 @@ msgstr "Paramétrer par défaut"
 msgid "Common Options"
 msgstr "Options communes"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Confirmer avant l'envoi"
@@ -1543,17 +1562,17 @@ msgstr "Domaine par défau&t :"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Le domaine par défaut est utilisé pour compléter l'adresse de courrier "
-"électronique qui consiste seulement en le nom de l'utilisateur.</p></qt>"
+"<qt><p>Le domaine par défaut est utilisé pour compléter l'adresse de "
+"courrier électronique qui consiste seulement en le nom de l'utilisateur.</"
+"p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1571,9 +1590,9 @@ msgstr "Ajouter un transport"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (par défaut)"
 
@@ -1588,7 +1607,8 @@ msgid ""
 "These %n identities have been changed to use the modified transport:"
 msgstr ""
 "Cette identité a été modifiée afin qu'elle utilise le transport édité :\n"
-"Ces %n identités ont été modifiées afin qu'elles utilisent le transport édité :"
+"Ces %n identités ont été modifiées afin qu'elles utilisent le transport "
+"édité :"
 
 #: configuredialog.cpp:927
 #, c-format
@@ -1596,7 +1616,8 @@ msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
 msgstr ""
-"Cette identité a été modifiée afin qu'elle utilise le transport par défaut :\n"
+"Cette identité a été modifiée afin qu'elle utilise le transport par "
+"défaut :\n"
 "Ces %n identités ont été modifiées afin qu'elles utilisent le transport par "
 "défaut :"
 
@@ -1657,6 +1678,10 @@ msgstr "Modifier le compte"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Impossible de trouver le compte <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Couleur&s"
@@ -1765,8 +1790,7 @@ msgstr "Lien visité"
 msgid "Misspelled Words"
 msgstr "Mots mal orthographiés"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nouveau message"
@@ -1954,11 +1978,11 @@ msgstr "Laisser fermés par défaut les fils de discussion"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Développer les fils de discussion contenant des &messages nouveaux, non lus ou "
-"importants et ouvrir les fils de discussion lus."
+"Développer les fils de discussion contenant des &messages nouveaux, non lus "
+"ou importants et ouvrir les fils de discussion lus."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1966,71 +1990,54 @@ msgstr "Afficher la date"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Ces expressions peuvent être utilisées pour la date :</strong></p>"
-"<ul>"
-"<li>d : le jour sans zéro au début (1-31)</li>"
-"<li>dd : le jour avec un zéro au début (01-31)</li>"
-"<li>ddd : le nom abrégé du jour (Lun - Dim)</li>"
-"<li>dddd : le nom long du jour (Lundi - Dimanche)</li>"
-"<li>M : le mois sans zéro au début (1-12)</li>"
-"<li>MM : le mois avec un zéro au début (01-12)</li>"
-"<li>MMM : le nom abrégé du mois (Jan - Déc)</li>"
-"<li>MMMM : le nom long du mois (Janvier - Décembre)</li>"
-"<li>yy : l'année sur deux chiffres (00-99)</li>"
-"<li>yyyy : l'année sur quatre chiffres (0000-9999)</li></ul>"
-"<p><strong>Ces expressions peuvent être utilisées pour l'heure :</string></p> "
-"<ul>"
-"<li>h : l'heure sans zéro au début (0-23 ou 1-12 en cas d'affichage "
-"AM / PM)</li>"
-"<li>hh : l'heure avec un zéro au début (00-23 ou 01-12 en cas d'affichage "
-"AM / PM)</li>"
-"<li>m : les minutes sans zéro au début (0-59)</li>"
-"<li>mm : les minutes avec un zéro au début (00-59)</li>"
-"<li>s : les secondes sans zéro au début (0-59)</li>"
-"<li>ss : les secondes avec un zéro au début (00-59)</li>"
-"<li>z : les millisecondes sans zéro au début (0-999)</li>"
-"<li>zzz : les millisecondes avec un zéro au début (000-999)</li>"
-"<li>AP : inverse l'affichage en AM / PM. AP sera remplacé soit par « AM » soit "
-"par « PM »</li>"
-"<li>ap : inverse l'affichage en AM / PM. ap sera remplacé soit par « am » soit "
-"par « pm »</li>"
-"<li>Z : la zone horaire en format numérique (-0500)</li></ul>"
-"<p><strong>Tous les autres caractères d'entrée seront ignorés.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Ces expressions peuvent être utilisées pour la date :</"
+"strong></p><ul><li>d : le jour sans zéro au début (1-31)</li><li>dd : le "
+"jour avec un zéro au début (01-31)</li><li>ddd : le nom abrégé du jour (Lun "
+"- Dim)</li><li>dddd : le nom long du jour (Lundi - Dimanche)</li><li>M : le "
+"mois sans zéro au début (1-12)</li><li>MM : le mois avec un zéro au début "
+"(01-12)</li><li>MMM : le nom abrégé du mois (Jan - Déc)</li><li>MMMM : le "
+"nom long du mois (Janvier - Décembre)</li><li>yy : l'année sur deux chiffres "
+"(00-99)</li><li>yyyy : l'année sur quatre chiffres (0000-9999)</li></"
+"ul><p><strong>Ces expressions peuvent être utilisées pour l'heure :</"
+"string></p> <ul><li>h : l'heure sans zéro au début (0-23 ou 1-12 en cas "
+"d'affichage AM / PM)</li><li>hh : l'heure avec un zéro au début (00-23 ou "
+"01-12 en cas d'affichage AM / PM)</li><li>m : les minutes sans zéro au début "
+"(0-59)</li><li>mm : les minutes avec un zéro au début (00-59)</li><li>s : "
+"les secondes sans zéro au début (0-59)</li><li>ss : les secondes avec un "
+"zéro au début (00-59)</li><li>z : les millisecondes sans zéro au début "
+"(0-999)</li><li>zzz : les millisecondes avec un zéro au début (000-999)</"
+"li><li>AP : inverse l'affichage en AM / PM. AP sera remplacé soit par « AM » "
+"soit par « PM »</li><li>ap : inverse l'affichage en AM / PM. ap sera "
+"remplacé soit par « am » soit par « pm »</li><li>Z : la zone horaire en "
+"format numérique (-0500)</li></ul><p><strong>Tous les autres caractères "
+"d'entrée seront ignorés.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Le fait de modifier la configuration globale des fils de discussion écrasera "
 "toutes les valeurs spécifiques à un dossier."
@@ -2047,8 +2054,7 @@ msgstr "Afficher la barre d'état pour les messages &HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Afficher l'état &pourriel dans les en-têtes décoratifs"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Remplacer les caractères par des émoticônes"
@@ -2057,8 +2063,7 @@ msgstr "Remplacer les caractères par des émoticônes"
 msgid "Use smaller font for quoted text"
 msgstr "Utiliser une police plus petite pour les citations"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Afficher les marques de citation « Développer / Réduire »"
@@ -2084,8 +2089,7 @@ msgstr "Automatique"
 msgid "&Override character encoding:"
 msgstr "&Surcharger par l'encodage de caractères :"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Activer l'icône de la boîte à miniatures"
@@ -2188,24 +2192,20 @@ msgstr "<b>%f</b> sera remplacé par le nom du fichier à modifier."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Les séquences suivantes sont autorisées dans les réponses :"
-"<br><b>%D</b> : date, <b>%S</b> : sujet,"
-"<br><b>%e</b> : adresse de l'expéditeur, <b>%F</b> : nom de l'expéditeur, <b>"
-"%f</b> : premier expéditeur,"
-"<br><b>%T</b> : nom du destinataire, <b>%t</b> : nom et adresse du "
-"destinataire,"
-"<br><b>%C</b> : noms des destinataires en copie, <b>%c</b>"
-" : noms et adresses des destinataires en copie,"
-"<br><b>%%</b> : signe de pourcentage, <b>%_</b> : espace, <b>%L</b>"
-" : saut de ligne</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Les séquences suivantes sont autorisées dans les réponses :<br><b>%D</"
+"b> : date, <b>%S</b> : sujet,<br><b>%e</b> : adresse de l'expéditeur, <b>%F</"
+"b> : nom de l'expéditeur, <b>%f</b> : premier expéditeur,<br><b>%T</b> : nom "
+"du destinataire, <b>%t</b> : nom et adresse du destinataire,<br><b>%C</b> : "
+"noms des destinataires en copie, <b>%c</b> : noms et adresses des "
+"destinataires en copie,<br><b>%%</b> : signe de pourcentage, <b>%_</b> : "
+"espace, <b>%L</b> : saut de ligne</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2228,21 +2228,20 @@ msgstr "Répondre à &tous :"
 msgid "&Forward:"
 msgstr "&Transmettre :"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Mar&que de citation :"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Le %D, vous avez écrit :"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Le %D, %F a écrit :"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Message transmis"
 
@@ -2280,11 +2279,11 @@ msgstr "Saisissez un nouveau préfixe de transmission :"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Cette liste est parcourue du haut vers le bas pour chaque message envoyé pour y "
-"trouver un jeu de caractères contenant tous les caractères du message."
+"Cette liste est parcourue du haut vers le bas pour chaque message envoyé "
+"pour y trouver un jeu de caractères contenant tous les caractères du message."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2320,10 +2319,9 @@ msgstr "Valeur"
 msgid "Ne&w"
 msgstr "&Nouveau"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "No&m :"
@@ -2332,19 +2330,18 @@ msgstr "No&m :"
 msgid "&Value:"
 msgstr "Valeu&r :"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nommage de la pièce jointe compatible avec Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Activez cette option pour rendre compréhensibles au programme Outlook(tm) les "
-"noms des pièces jointes contenant des caractères non anglais"
+"Activez cette option pour rendre compréhensibles au programme Outlook(tm) "
+"les noms des pièces jointes contenant des caractères non anglais"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2353,8 +2350,8 @@ msgstr "Acti&ver la détection des pièces jointes manquantes"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Reconnaître n'importe lequel des mots clés suivants comme intention d'attacher "
-"un fichier :"
+"Reconnaître n'importe lequel des mots clés suivants comme intention "
+"d'attacher un fichier :"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2372,22 +2369,22 @@ msgstr "Jointe"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Vous avez choisi d'encoder les noms des pièces jointes contenant des caractères "
-"non anglais d'une manière qui est comprise par Outlook(tm) et d'autres clients "
-"de messagerie qui ne gèrent pas les noms de pièces jointes encodées "
-"conformément au standard.\n"
-"Notez que KMail est susceptible de créer des messages ne se conformant pas au "
-"standard, mais il est possible que vos messages ne soient ultérieurement pas "
-"compris par les clients de messagerie conformes au standard ; donc, à moins de "
-"n'avoir pas d'autre choix, vous ne devriez pas cocher cette option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Vous avez choisi d'encoder les noms des pièces jointes contenant des "
+"caractères non anglais d'une manière qui est comprise par Outlook(tm) et "
+"d'autres clients de messagerie qui ne gèrent pas les noms de pièces jointes "
+"encodées conformément au standard.\n"
+"Notez que KMail est susceptible de créer des messages ne se conformant pas "
+"au standard, mais il est possible que vos messages ne soient ultérieurement "
+"pas compris par les clients de messagerie conformes au standard ; donc, à "
+"moins de n'avoir pas d'autre choix, vous ne devriez pas cocher cette option."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2411,119 +2408,104 @@ msgstr "Modu&les de cryptographie"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Les messages sont parfois envoyés sous deux formats. Cette option vous "
-"permet de décider lequel vous souhaitez afficher par défaut : la version HTML "
-"ou la version texte brut.</p>"
-"<p> L'affichage de la version HTML améliore le rendu du message mais pose des "
-"problèmes de sécurité.</p>"
-"<p> L'affichage de la version texte brut fait perdre une bonne partie de la "
-"mise en page mais rend <em>impossible</em> l'exploitation des défauts de "
-"sécurité de l'afficheur HTML (Konqueror).</p>"
-"<p> L'option ci-dessous protège d'une mauvaise utilisation (courante) des "
-"messages écrits en HTML, mais elle ne peut pas protéger contre des problèmes "
-"inconnus au moment de la conception de cette version de KMail.</p>"
-"<p> Il est donc recommandé de ne <em>pas</em> préférer le HTML au texte "
-"brut/</p> "
-"<p><b>Remarque :</b> vous pouvez régler ce paramètre indépendamment pour chaque "
-"dossier depuis le menu <i>Dossier</i> dans la fenêtre principale de KMail.</p>"
-"</qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Les messages sont parfois envoyés sous deux formats. Cette option "
+"vous permet de décider lequel vous souhaitez afficher par défaut : la "
+"version HTML ou la version texte brut.</p><p> L'affichage de la version HTML "
+"améliore le rendu du message mais pose des problèmes de sécurité.</p><p> "
+"L'affichage de la version texte brut fait perdre une bonne partie de la mise "
+"en page mais rend <em>impossible</em> l'exploitation des défauts de sécurité "
+"de l'afficheur HTML (Konqueror).</p><p> L'option ci-dessous protège d'une "
+"mauvaise utilisation (courante) des messages écrits en HTML, mais elle ne "
+"peut pas protéger contre des problèmes inconnus au moment de la conception "
+"de cette version de KMail.</p><p> Il est donc recommandé de ne <em>pas</em> "
+"préférer le HTML au texte brut/</p> <p><b>Remarque :</b> vous pouvez régler "
+"ce paramètre indépendamment pour chaque dossier depuis le menu <i>Dossier</"
+"i> dans la fenêtre principale de KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Certaines publicités envoyées par courrier électronique sont écrites en HTML "
-"et contiennent par exemple des liens vers des images permettant aux expéditeurs "
-"de savoir si vous avez lu leurs publicités (« web bugs »).</p>"
-"<p> Il n'y aucune bonne raison de télécharger des images depuis le web de cette "
-"façon, puisque l'expéditeur peut toujours attacher les images en pièces jointes "
-"directement dans le message.</p>"
-"<p>Afin de vous protéger contre cet abus, cette option n'est pas <em>"
-"activée</em> par défaut.</p>"
-"<p>Cependant, si vous voulez par exemple afficher les images non incluses en "
-"pièces jointes dans les messages écrits en HTML, vous pouvez cocher cette "
-"option, mais vous devez être conscient des problèmes que cela peut poser.</p>"
-"</qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Certaines publicités envoyées par courrier électronique sont écrites "
+"en HTML et contiennent par exemple des liens vers des images permettant aux "
+"expéditeurs de savoir si vous avez lu leurs publicités (« web bugs »).</"
+"p><p> Il n'y aucune bonne raison de télécharger des images depuis le web de "
+"cette façon, puisque l'expéditeur peut toujours attacher les images en "
+"pièces jointes directement dans le message.</p><p>Afin de vous protéger "
+"contre cet abus, cette option n'est pas <em>activée</em> par défaut.</"
+"p><p>Cependant, si vous voulez par exemple afficher les images non incluses "
+"en pièces jointes dans les messages écrits en HTML, vous pouvez cocher cette "
+"option, mais vous devez être conscient des problèmes que cela peut poser.</"
+"p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Politique de gestion des accusés de réception</h3>"
-"<p>Les accusés de réception sont généralement appelés des <b>"
-"notifications de lecture</b>. L'auteur du message demande un accusé de "
-"réception au destinataire. Celui-ci génère une réponse qu'il renvoie à "
-"l'expéditeur pour lui dire qu'il a lu le message. Les principaux types "
-"d'accusés de réception sont <b>affiché</b> (tel que lorsque le message est lu), "
-"<b>supprimé</b> et <b>diffusé</b> (comme lorsque le message est redirigé).</p>"
-"<p>Les options suivantes sont disponibles pour contrôler l'envoi des accusés de "
-"réception dans KMail :</p>"
-"<ul>"
-"<li><em>Ignorer</em> : ignore toutes les demande d'accusés de réception. Aucun "
-"accusé ne sera envoyé automatiquement (option recommandée) ;</li>"
-"<li><em>Demander</em> : envoie un accusé de réception seulement après avoir "
-"demandé la permission à l'utilisateur. Ainsi, vous pouvez envoyer des accusés "
-"de réception uniquement pour les messages que vous avez sélectionnés dans un "
-"dossier ;</li>"
-"<li><em>Refuser</em> : toujours envoyer une notification du type <b>refusé</b>"
-". Ceci <em>n'est pas</em> le meilleur choix. L'auteur du message saura que vous "
-"avez reçu son courriel, mais ne pourra pas savoir ce que vous avez exactement "
-"fait avec, c'est-à-dire l'avoir lu ou l'avoir supprimé ;</li>"
-"<li><em>Toujours envoyer</em> : toujours envoyer un accusé de réception. Cela "
-"permet à l'auteur du message de savoir que vous avez reçu son courriel, et que "
-"vous l'avez lu ou supprimé. Cette option n'est pas recommandable, mais elle "
-"peut avoir un sens lorsque vous travaillez en relation avec de la clientèle ou "
-"des partenaires dans votre travail.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Politique de gestion des accusés de réception</h3><p>Les accusés de "
+"réception sont généralement appelés des <b>notifications de lecture</b>. "
+"L'auteur du message demande un accusé de réception au destinataire. Celui-ci "
+"génère une réponse qu'il renvoie à l'expéditeur pour lui dire qu'il a lu le "
+"message. Les principaux types d'accusés de réception sont <b>affiché</b> "
+"(tel que lorsque le message est lu), <b>supprimé</b> et <b>diffusé</b> "
+"(comme lorsque le message est redirigé).</p><p>Les options suivantes sont "
+"disponibles pour contrôler l'envoi des accusés de réception dans KMail :</"
+"p><ul><li><em>Ignorer</em> : ignore toutes les demande d'accusés de "
+"réception. Aucun accusé ne sera envoyé automatiquement (option recommandée) ;"
+"</li><li><em>Demander</em> : envoie un accusé de réception seulement après "
+"avoir demandé la permission à l'utilisateur. Ainsi, vous pouvez envoyer des "
+"accusés de réception uniquement pour les messages que vous avez sélectionnés "
+"dans un dossier ;</li><li><em>Refuser</em> : toujours envoyer une "
+"notification du type <b>refusé</b>. Ceci <em>n'est pas</em> le meilleur "
+"choix. L'auteur du message saura que vous avez reçu son courriel, mais ne "
+"pourra pas savoir ce que vous avez exactement fait avec, c'est-à-dire "
+"l'avoir lu ou l'avoir supprimé ;</li><li><em>Toujours envoyer</em> : "
+"toujours envoyer un accusé de réception. Cela permet à l'auteur du message "
+"de savoir que vous avez reçu son courriel, et que vous l'avez lu ou "
+"supprimé. Cette option n'est pas recommandable, mais elle peut avoir un sens "
+"lorsque vous travaillez en relation avec de la clientèle ou des partenaires "
+"dans votre travail.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2539,16 +2521,16 @@ msgstr "Permettre le &téléchargement des références externes depuis Internet
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>AVERTISSEMENT :</b> l'utilisation du HTML dans les messages rend votre "
 "système plus vulnérable aux problèmes de sécurité présents et à venir. Pour "
 "obtenir plus d'informations, veuillez consulter les rubriques d'aides <a "
-"href=\"whatsthis:%1\">Qu'est-ce que le code HTML dans les messages...</a> "
-"et <a href=\"whatsthis:%2\">Qu'est-ce que les références externes...</a>"
+"href=\"whatsthis:%1\">Qu'est-ce que le code HTML dans les messages...</a> et "
+"<a href=\"whatsthis:%2\">Qu'est-ce que les références externes...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2610,8 +2592,8 @@ msgid ""
 msgstr ""
 "<b>AVERTISSEMENT :</b> vous pouvez trouver indiscret que les reçus soient "
 "systématiquement envoyés de manière automatique. Pour obtenir plus "
-"d'informations, veuillez consulter la rubrique d'aide contextuelle <a "
-"href=\"whatsthis:%1\">Qu'est-ce que c'est...</a>"
+"d'informations, veuillez consulter la rubrique d'aide contextuelle <a href="
+"\"whatsthis:%1\">Qu'est-ce que c'est...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2625,15 +2607,14 @@ msgstr "Importer automatiquement les clés et certificats"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Le fait de modifier la configuration HTML globale écrasera toutes les valeurs "
-"propres à un dossier."
+"Le fait de modifier la configuration HTML globale écrasera toutes les "
+"valeurs propres à un dossier."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Cette option nécessite une version de « dirmngr » supérieure à 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "aucun serveur mandataire"
@@ -2663,8 +2644,8 @@ msgstr "Ne pas faire e&xpirer les messages importants"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Lors de la recherche de messages non lus :"
 
@@ -2688,8 +2669,8 @@ msgstr "Boucler dans tous les dossiers"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Lors de l'entrée dans un dossier :"
 
@@ -2759,27 +2740,23 @@ msgstr "des dossiers (format « maildir »)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Ceci permet de choisir le format par défaut des boîtes à lettres "
-"locales :</p> "
-"<p><b>mbox :</b> les dossiers de messages de KMail sont représentés chacun par "
-"un seul fichier. Les messages sont séparés les uns des autres dans un tel "
-"fichier par une ligne commençant par « From ». Cela économise l'espace disque "
-"mais peut s'avérer plus fragile, en particulier lorsque vous déplacez des "
-"messages d'un dossier à un autre.</p> "
-"<p><b>maildir :</b> les dossiers de messages de KMail sont représentés par de "
-"vrais dossiers sur le disque. Chaque message est stocké dans un fichier "
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Ceci permet de choisir le format par défaut des boîtes à lettres "
+"locales :</p> <p><b>mbox :</b> les dossiers de messages de KMail sont "
+"représentés chacun par un seul fichier. Les messages sont séparés les uns "
+"des autres dans un tel fichier par une ligne commençant par « From ». Cela "
+"économise l'espace disque mais peut s'avérer plus fragile, en particulier "
+"lorsque vous déplacez des messages d'un dossier à un autre.</p> "
+"<p><b>maildir :</b> les dossiers de messages de KMail sont représentés par "
+"de vrais dossiers sur le disque. Chaque message est stocké dans un fichier "
 "indépendant. Ce n'est pas très économique en espace disque mais est plus "
 "fiable, par exemple lorsque vous déplacez des messages d'un dossier à un "
 "autre.</p> </qt>"
@@ -2815,55 +2792,47 @@ msgstr "Go"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Lorsque vous allez directement au prochain message non lu, il se peut qu'il "
-"n'y ait aucun message non lu après celui que vous venez de lire.</p>"
-"<p><b>Ne pas chercher :</b> la recherche de messages non lus se limitera au "
-"dernier message dans le dossier actuel.</p>"
-"<p><b>Chercher dans le dossier actuel :</b> la recherche continuera au début de "
-"la liste des messages, mais se limitera au dossier actuel.</p>"
-"<p><b>Chercher dans tous les dossiers :</b> la recherche continuera au début de "
-"la liste des messages. Si aucun message non lu n'est trouvé, la recherche se "
-"poursuivra dans le dossier suivant.</p>"
-"<p>De la même manière, une recherche du message non lu précédent commencera par "
-"le bas de la liste des messages si cette option est cochée.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Lorsque vous allez directement au prochain message non lu, il se peut "
+"qu'il n'y ait aucun message non lu après celui que vous venez de lire.</"
+"p><p><b>Ne pas chercher :</b> la recherche de messages non lus se limitera "
+"au dernier message dans le dossier actuel.</p><p><b>Chercher dans le dossier "
+"actuel :</b> la recherche continuera au début de la liste des messages, mais "
+"se limitera au dossier actuel.</p><p><b>Chercher dans tous les dossiers :</"
+"b> la recherche continuera au début de la liste des messages. Si aucun "
+"message non lu n'est trouvé, la recherche se poursuivra dans le dossier "
+"suivant.</p><p>De la même manière, une recherche du message non lu précédent "
+"commencera par le bas de la liste des messages si cette option est cochée.</"
+"p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>L'indexation complète du texte permet d'effectuer des recherches très "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>L'indexation complète du texte permet d'effectuer des recherches très "
 "rapides dans le contenu des messages. Lorsque cette option est activée, la "
-"fenêtre de recherche effectuera ses tâches beaucoup plus rapidement. De même, "
-"la barre de recherche sélectionnera également les messages en fonction de leur "
-"contenu.</p>"
-"<p>En contrepartie, cette option utilisera une quantité importante du disque "
-"(environ la moitié de l'espace réservé pour les messages).</p> "
-"<p>Après activation, l'index devra être construit, mais vous pourrez continuer "
-"à utiliser KMail au cours de cette opération.</p></qt>"
+"fenêtre de recherche effectuera ses tâches beaucoup plus rapidement. De "
+"même, la barre de recherche sélectionnera également les messages en fonction "
+"de leur contenu.</p><p>En contrepartie, cette option utilisera une quantité "
+"importante du disque (environ la moitié de l'espace réservé pour les "
+"messages).</p> <p>Après activation, l'index devra être construit, mais vous "
+"pourrez continuer à utiliser KMail au cours de cette opération.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2931,8 +2900,8 @@ msgstr "Cac&her les dossiers du travail en groupe"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Lorsque cette option est cochée, les dossiers de ressources IMAP ne sont pas "
 "visibles."
@@ -2943,11 +2912,12 @@ msgstr "Afficher &uniquement les dossiers de ressources de ce compte"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Lorsque cette option est cochée, vous ne verrez pas les dossiers de courriels "
-"normaux dans l'arborescence du compte configuré en travail en groupe."
+"Lorsque cette option est cochée, vous ne verrez pas les dossiers de "
+"courriels normaux dans l'arborescence du compte configuré en travail en "
+"groupe."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2958,8 +2928,8 @@ msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
-"Synchroniser les changements de groupe de travail des dossiers IMAP déconnectés "
-"immédiatement à la mise en ligne."
+"Synchroniser les changements de groupe de travail des dossiers IMAP "
+"déconnectés immédiatement à la mise en ligne."
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -3010,19 +2980,18 @@ msgstr ""
 "avec les standards de messagerie. Activer cette option pour envoyer des "
 "invitations que Microsoft Exchange pourra interpréter."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Nommage de la pièce jointe compatible avec Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Envoi d'invitation automatique"
@@ -3032,30 +3001,31 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Lorsque ceci est activé, l'utilisateur ne voit pas la fenêtre de rédaction de "
-"courrier. Les courriers électroniques d'invitation sont envoyés automatiquement"
+"Lorsque ceci est activé, l'utilisateur ne voit pas la fenêtre de rédaction "
+"de courrier. Les courriers électroniques d'invitation sont envoyés "
+"automatiquement"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Les invitations sont normalement envoyées sous forme de pièce jointe à un "
-"message. Ce commutateur change les messages d'invitation à envoyer dans le "
-"texte du message, à la place ; il est nécessaire pour envoyer des invitations "
-"et des réponses à Microsoft Outlook."
-"<br>Mais lorsque vous le faites, vous ne disposez plus du texte descriptif que "
-"les programmes de courriel peuvent lire ; donc, pour les utilisateurs des "
-"programmes de messagerie qui ne comprennent pas les invitations, les messages "
-"obtenus ont une apparence très étrange."
-"<br>Les personnes ayant des programmes de messagerie qui ne comprennent pas les "
-"invitation seront encore en mesure de travailler avec.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Les invitations sont normalement envoyées sous forme de pièce jointe à "
+"un message. Ce commutateur change les messages d'invitation à envoyer dans "
+"le texte du message, à la place ; il est nécessaire pour envoyer des "
+"invitations et des réponses à Microsoft Outlook.<br>Mais lorsque vous le "
+"faites, vous ne disposez plus du texte descriptif que les programmes de "
+"courriel peuvent lire ; donc, pour les utilisateurs des programmes de "
+"messagerie qui ne comprennent pas les invitations, les messages obtenus ont "
+"une apparence très étrange.<br>Les personnes ayant des programmes de "
+"messagerie qui ne comprennent pas les invitation seront encore en mesure de "
+"travailler avec.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3160,30 +3130,28 @@ msgstr "Transmettre"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vous pouvez ajouter, modifier et supprimer ici des modèles de messages "
-"personnalisés à utiliser lors de la rédaction d'un message de réponse ou à "
-"transmettre. Créez le modèle personnalisé en utilisant le menu contextuel de la "
-"souris ou la barre d'outils. Vous pouvez également affecter un raccourci "
-"clavier à un modèle pour accélérer le traitement.</p>"
-"<p>Les modèles de messages gèrent les commandes de substitutions en les "
-"saisissant ou en cliquant sur le menu <i>Insérer une commande</i>.</p>"
-"<p>Il existe quatre types de modèles personnalisés utilisés pour : <i>"
-"Répondre</i>, <i>Répondre à tous</i>, <i>Transmettre</i>, et <i>Universel</i> "
-"pour toutes ces opérations. Vous ne pouvez cependant pas affecter de raccourci "
-"clavier aux modèles <i>Universels</i>.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Vous pouvez ajouter, modifier et supprimer ici des modèles de "
+"messages personnalisés à utiliser lors de la rédaction d'un message de "
+"réponse ou à transmettre. Créez le modèle personnalisé en utilisant le menu "
+"contextuel de la souris ou la barre d'outils. Vous pouvez également affecter "
+"un raccourci clavier à un modèle pour accélérer le traitement.</p><p>Les "
+"modèles de messages gèrent les commandes de substitutions en les saisissant "
+"ou en cliquant sur le menu <i>Insérer une commande</i>.</p><p>Il existe "
+"quatre types de modèles personnalisés utilisés pour : <i>Répondre</i>, "
+"<i>Répondre à tous</i>, <i>Transmettre</i>, et <i>Universel</i> pour toutes "
+"ces opérations. Vous ne pouvez cependant pas affecter de raccourci clavier "
+"aux modèles <i>Universels</i>.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3200,15 +3168,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3234,8 +3202,8 @@ msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
-"Le raccourci clavier sélectionné est déjà utilisé, voulez-vous conserver cette "
-"assignation ?"
+"Le raccourci clavier sélectionné est déjà utilisé, voulez-vous conserver "
+"cette assignation ?"
 
 #: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
@@ -3284,11 +3252,12 @@ msgstr "Modifier avec :"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
-"Impossible pour KMail de détecter lorsque l'éditeur sélectionné est fermé. Pour "
-"éviter la perte de données, la modification de la pièce jointe est annulée."
+"Impossible pour KMail de détecter lorsque l'éditeur sélectionné est fermé. "
+"Pour éviter la perte de données, la modification de la pièce jointe est "
+"annulée."
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3545,6 +3514,11 @@ msgstr "Sélectionner les filtres"
 msgid "Filters"
 msgstr "Filtres"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Sélectionner tout le texte"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3576,8 +3550,8 @@ msgstr "Journaliser les activités de fi&ltrage"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Vous pouvez (dés)activer la journalisation des activités de filtrage ici. "
 "Naturellement, les données du journal sont collectées et ne s'affichent que "
@@ -3597,14 +3571,15 @@ msgstr "&Journaliser l'évaluation des règles de filtrage"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Vous pouvez contrôler les réactions dans le journal concernant l'évaluation des "
-"règles de filtrage des filtres appliqués : le fait d'avoir coché cette option "
-"fournira les réactions détaillées de chaque règle de filtrage "
+"Vous pouvez contrôler les réactions dans le journal concernant l'évaluation "
+"des règles de filtrage des filtres appliqués : le fait d'avoir coché cette "
+"option fournira les réactions détaillées de chaque règle de filtrage "
 "individuellement ; en revanche, seules les réactions sur le résultat de "
 "l'évaluation de toutes les règles d'un seul filtre seront indiquées."
 
@@ -3626,10 +3601,10 @@ msgstr "illimitée"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "La collecte des données du journal utilise de la mémoire pour enregistrer "
 "temporairement les données du journal ; ici, vous pouvez limiter la quantité "
@@ -3645,7 +3620,7 @@ msgstr ""
 "Impossible d'écrire sur le fichier %1 :\n"
 "\"%2\" est la description détaillée des erreurs."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Erreur de KMail"
@@ -3686,14 +3661,14 @@ msgstr "Identifiant &utilisateur :"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"L'identifiant utilisateur est le nom d'utilisateur (« login ») sur le serveur "
-"IMAP. Il peut s'agir d'un simple nom d'utilisateur ou de l'adresse électronique "
-"complète de l'utilisateur ; le « login » de votre propre compte sur le serveur "
-"vous indiquera duquel il est question."
+"L'identifiant utilisateur est le nom d'utilisateur (« login ») sur le "
+"serveur IMAP. Il peut s'agir d'un simple nom d'utilisateur ou de l'adresse "
+"électronique complète de l'utilisateur ; le « login » de votre propre compte "
+"sur le serveur vous indiquera duquel il est question."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3746,11 +3721,11 @@ msgstr ""
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Informations non reçues du serveur pour le moment, veuillez utiliser « Relever "
-"le courriel »."
+"Informations non reçues du serveur pour le moment, veuillez utiliser "
+"« Relever le courriel »."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3760,8 +3735,7 @@ msgstr "Erreur : aucun compte IMAP défini pour ce dossier"
 msgid "Connecting to server %1, please wait..."
 msgstr "Connexion au serveur %1, veuillez patienter..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Erreur lors de la connexion au serveur %1"
@@ -3792,11 +3766,11 @@ msgstr "Ajouter des permissions"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Voulez-vous vraiment supprimer vos propres permissions pour ce dossier ? Vous "
-"ne pourrez plus y accéder par la suite."
+"Voulez-vous vraiment supprimer vos propres permissions pour ce dossier ? "
+"Vous ne pourrez plus y accéder par la suite."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3827,7 +3801,7 @@ msgstr "Utilisation :"
 msgid "Select Folder"
 msgstr "Sélection du dossier"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Dossiers locaux"
@@ -3851,9 +3825,9 @@ msgstr "Sélectionnez le raccourci clavier de ce dossier"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Pour choisir une touche ou une combinaison de touches qui sélectionne le "
 "dossier courant, cliquez sur le bouton ci-dessous, puis pressez la ou les "
@@ -3879,14 +3853,23 @@ msgstr "&Annuler"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Le dossier que vous avez supprimé était associé au compte <b>%1</b>"
-", son courriel y était placé. Les messages de ce compte sont maintenant déposés "
+"<qt>Le dossier que vous avez supprimé était associé au compte <b>%1</b>, son "
+"courriel y était placé. Les messages de ce compte sont maintenant déposés "
 "dans la boîte de réception.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Total : %2<br>Non lus : %3<br>Taille : %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Quota : %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Inconnu"
@@ -3907,8 +3890,8 @@ msgid ""
 "Resets the quick search so that all messages are shown again."
 msgstr ""
 "Réinitialiser la recherche rapide\n"
-"Réinitialise la recherche rapide afin que tous les messages soient de nouveau "
-"affichés."
+"Réinitialise la recherche rapide afin que tous les messages soient de "
+"nouveau affichés."
 
 #: headerlistquicksearch.cpp:69
 msgid "Stat&us:"
@@ -4009,70 +3992,17 @@ msgstr "Niveau de pourriel :"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>M<br>e<br>s<br>s<br>a<br>g<br>e<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e"
-"<br> "
-"<br>n"
-"<br>o"
-"<br>n"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>M<br>e<br>s<br>s<br>a<br>g<br>e<br> <br>n<br>o<br>n<br> "
+"<br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4084,19 +4014,14 @@ msgstr "&Votre nom :"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Votre nom</h3>"
-"<p>Ce champ doit comporter votre nom, comme vous voulez qu'il apparaisse dans "
-"l'en-tête du courriel qui sera envoyé.</p>"
-"<p>Si vous le laissez vide, votre vrai nom n'apparaîtra pas, seulement "
-"l'adresse électronique.</p></qt>"
+"<qt><h3>Votre nom</h3><p>Ce champ doit comporter votre nom, comme vous "
+"voulez qu'il apparaisse dans l'en-tête du courriel qui sera envoyé.</p><p>Si "
+"vous le laissez vide, votre vrai nom n'apparaîtra pas, seulement l'adresse "
+"électronique.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4104,17 +4029,14 @@ msgstr "O&rganisation :"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organisation</h3> "
-"<p>Ce champ doit comporter le nom de votre organisation si vous voulez qu'il "
-"soit indiqué dans l'en-tête du courrier électronique qui sera envoyé.</p> "
-"<p>C'est sécurisant (et normal) de le laisser vide.</p></qt>"
+"<qt> <h3>Organisation</h3> <p>Ce champ doit comporter le nom de votre "
+"organisation si vous voulez qu'il soit indiqué dans l'en-tête du courrier "
+"électronique qui sera envoyé.</p> <p>C'est sécurisant (et normal) de le "
+"laisser vide.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4123,20 +4045,16 @@ msgstr "Adress&e électronique :"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Adresse de courrier électronique</h3>"
-"<p>Ce champ doit comporter votre adresse électronique complète.</p>"
-"<p>Si vous le laissez vide, ou fournissez une mauvaise adresse, les gens ne "
-"pourront pas vous répondre.</p></qt>"
+"<qt><h3>Adresse de courrier électronique</h3><p>Ce champ doit comporter "
+"votre adresse électronique complète.</p><p>Si vous le laissez vide, ou "
+"fournissez une mauvaise adresse, les gens ne pourront pas vous répondre.</"
+"p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4145,21 +4063,12 @@ msgstr "Adress&e électronique :"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4183,21 +4092,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>La clé OpenPGP que vous choisissez ici sera utilisée pour signer "
-"numériquement vos messages. Vous pouvez aussi utiliser des clés GnuPG.</p>"
-"<p>Vous pouvez laisser cette option vide, mais KMail ne sera pas en mesure de "
-"chiffrer les courriels à l'aide d'OpenPGP. Les fonctions normales de messagerie "
-"n'en seront pas affectées.</p>"
-"<p> Vous trouverez davantage d'informations sur les clés ici : <a>"
-"http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>La clé OpenPGP que vous choisissez ici sera utilisée pour signer "
+"numériquement vos messages. Vous pouvez aussi utiliser des clés GnuPG.</"
+"p><p>Vous pouvez laisser cette option vide, mais KMail ne sera pas en mesure "
+"de chiffrer les courriels à l'aide d'OpenPGP. Les fonctions normales de "
+"messagerie n'en seront pas affectées.</p><p> Vous trouverez davantage "
+"d'informations sur les clés ici : <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4209,32 +4115,28 @@ msgstr "Votre clé de chiffrement OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Choisissez la clé OpenPGP utilisée pour chiffrer les messages vers vous-même et "
-"pour l'option « Attacher ma clé publique » dans la fenêtre de rédaction."
+"Choisissez la clé OpenPGP utilisée pour chiffrer les messages vers vous-même "
+"et pour l'option « Attacher ma clé publique » dans la fenêtre de rédaction."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>La clé OpenPGP que vous choisissez ici sera utilisée pour chiffrer les "
-"messages vers vous-même et pour la fonctionnalité « Attacher ma clé publique » "
-"dans la fenêtre de rédaction. Vous pouvez aussi utiliser des clés GnuPG .</p>"
-"<p>Vous pouvez laisser cette case vide, mais KMail ne sera pas en mesure de "
-"chiffrer avec OpenPGP vos copies de messages. Les fonctions de base n'en seront "
-"pas affectées.</p>"
-"<p>Vous trouverez davantage d'informations sur les clés ici : <a>"
-"http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>La clé OpenPGP que vous choisissez ici sera utilisée pour chiffrer "
+"les messages vers vous-même et pour la fonctionnalité « Attacher ma clé "
+"publique » dans la fenêtre de rédaction. Vous pouvez aussi utiliser des clés "
+"GnuPG .</p><p>Vous pouvez laisser cette case vide, mais KMail ne sera pas en "
+"mesure de chiffrer avec OpenPGP vos copies de messages. Les fonctions de "
+"base n'en seront pas affectées.</p><p>Vous trouverez davantage "
+"d'informations sur les clés ici : <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4254,18 +4156,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Le certificat S/MIME (X 509) que vous choisissez ici sera utilisé pour "
-"signer numériquement les messages.</p>"
-"<p>Vous pouvez laisser cette case vide, mais KMail ne sera pas en mesure de "
-"signer les courriels avec S/MIME ; les fonctions de base n'en seront pas "
-"affectées.</p></qt>"
+"<qt><p>Le certificat S/MIME (X 509) que vous choisissez ici sera utilisé "
+"pour signer numériquement les messages.</p><p>Vous pouvez laisser cette case "
+"vide, mais KMail ne sera pas en mesure de signer les courriels avec S/MIME ; "
+"les fonctions de base n'en seront pas affectées.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4277,8 +4176,8 @@ msgstr "Votre certificat de chiffrement S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Sélectionnez le certificat S/MIME qui doit être utilisé lors du chiffrement "
 "vers vous-même et pour la fonctionnalité « Attacher mon certificat » dans "
@@ -4286,20 +4185,18 @@ msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Le certificat S/MIME que vous choisissez ici sera utilisé afin de chiffrer "
-"les messages envoyés à vous-même et pour la fonctionnalité « Attacher mon "
-"certificat » dans l'éditeur.</p> "
-"<p>Vous pouvez laisser ceci vide, mais KMail ne sera pas capable de chiffrer "
-"les copies des courriels sortants en utilisant S/MIME. Les fonctions de base ne "
-"seront pas affectées.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Le certificat S/MIME que vous choisissez ici sera utilisé afin de "
+"chiffrer les messages envoyés à vous-même et pour la fonctionnalité "
+"« Attacher mon certificat » dans l'éditeur.</p> <p>Vous pouvez laisser ceci "
+"vide, mais KMail ne sera pas capable de chiffrer les copies des courriels "
+"sortants en utilisant S/MIME. Les fonctions de base ne seront pas affectées."
+"</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4319,25 +4216,21 @@ msgstr "Adresse de &réponse :"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Répondre à cette adresse électronique</h3>"
-"<p>Cela fixe l'en-tête <tt>Répondre à :</tt> avec une adresse électronique "
-"différente de celle fixée par <tt>De :</tt>.</p>"
-"<p>Ceci peut être utile si vous avez un groupe de personne travaillant ensemble "
-"avec des rôles similaires. Par exemple, vous voulez que tous les courriers "
-"électronique envoyés contiennent votre adresse de courrier électronique dans le "
-"champ <tt>De :</tt>, mais toutes les réponses soient dirigées vers une adresse "
-"électronique du groupe.</p>"
-"<p>Dans le doute, laissez ce champ vide.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Répondre à cette adresse électronique</h3><p>Cela fixe l'en-tête "
+"<tt>Répondre à :</tt> avec une adresse électronique différente de celle "
+"fixée par <tt>De :</tt>.</p><p>Ceci peut être utile si vous avez un groupe "
+"de personne travaillant ensemble avec des rôles similaires. Par exemple, "
+"vous voulez que tous les courriers électronique envoyés contiennent votre "
+"adresse de courrier électronique dans le champ <tt>De :</tt>, mais toutes "
+"les réponses soient dirigées vers une adresse électronique du groupe.</"
+"p><p>Dans le doute, laissez ce champ vide.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4345,26 +4238,20 @@ msgstr "Adresses d'en&voi en copie :"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Adresses d'envoi en copie (Blind Carbon Copy - BCC) </h3> "
-"<p>Les adresses que vous donnez ici seront ajoutées à chaque courriel sortant "
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Adresses d'envoi en copie (Blind Carbon Copy - BCC) </h3> <p>Les "
+"adresses que vous donnez ici seront ajoutées à chaque courriel sortant "
 "envoyé avec cette identité. Elles ne seront pas visibles par les autres "
-"destinataires.</p> "
-"<p>Ceci sert habituellement à envoyer une copie de chaque message envoyé à un "
-"autre de vos comptes.</p> "
-"<p>Pour spécifier plus d'une adresse, utilisez des virgules pour séparer la "
-"liste des destinataires en BCC.</p>"
-"<p>En cas de doute, laissez ce champ vide.</p></qt>"
+"destinataires.</p> <p>Ceci sert habituellement à envoyer une copie de chaque "
+"message envoyé à un autre de vos comptes.</p> <p>Pour spécifier plus d'une "
+"adresse, utilisez des virgules pour séparer la liste des destinataires en "
+"BCC.</p><p>En cas de doute, laissez ce champ vide.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4402,7 +4289,7 @@ msgstr "&Signature"
 msgid "&Picture"
 msgstr "&Image"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Adresse électronique non valable"
 
@@ -4419,17 +4306,19 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 "Une des clés de signature OpenPGP configurées ne contient pas d'identifiant "
-"d'utilisateur avec l'adresse électronique configurée pour cette identité (%1).\n"
+"d'utilisateur avec l'adresse électronique configurée pour cette identité "
+"(%1).\n"
 "Ceci peut occasionner des messages d'avertissement du côté destinataire en "
 "essayant de vérifier les signatures effectuées avec cette configuration."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Une des clés de chiffrement OpenPGP ne contient pas d'identifiant d'utilisateur "
-"avec l'adresse électronique configurée pour cette identité (%1)."
+"Une des clés de chiffrement OpenPGP ne contient pas d'identifiant "
+"d'utilisateur avec l'adresse électronique configurée pour cette identité "
+"(%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4469,8 +4358,8 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"Le dossier personnalisé des courriels envoyés pour l'identité « %1 » n'existe "
-"pas (ou plus). De ce fait, le dossier par défaut sera utilisé."
+"Le dossier personnalisé des courriels envoyés pour l'identité « %1 » "
+"n'existe pas (ou plus). De ce fait, le dossier par défaut sera utilisé."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4485,13 +4374,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Le dossier personnalisé des modèles pour l'identité « %1 » n'existe pas (plus). "
-"De ce fait, le dossier par défaut sera utilisé."
+"Le dossier personnalisé des modèles pour l'identité « %1 » n'existe pas "
+"(plus). De ce fait, le dossier par défaut sera utilisé."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (par défaut)"
 
@@ -4506,8 +4395,8 @@ msgstr "Adresse électronique"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Vous devez saisir un nom d'utilisateur et un mot de passe pour accéder à cette "
-"boîte aux lettres."
+"Vous devez saisir un nom d'utilisateur et un mot de passe pour accéder à "
+"cette boîte aux lettres."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4540,16 +4429,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "La configuration de votre compte a été convertie automatiquement, mais vous "
 "devriez cependant la vérifier."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Impossible de convertir la configuration de votre compte automatiquement, "
 "veuillez la vérifier."
@@ -4567,8 +4456,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Impossible d'envoyer le message daté du %1 de <i>%2</i> avec le sujet <i>%3</i> "
-"sur le serveur."
+"Impossible d'envoyer le message daté du %1 de <i>%2</i> avec le sujet <i>%3</"
+"i> sur le serveur."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4589,17 +4478,22 @@ msgstr "Le dossier est trop proche de son quota limite. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Comme vous n'avez pas les droits d'écriture sur ce dossier, veuillez demander à "
-"son propriétaire de libérer un peu d'espace."
+"Comme vous n'avez pas les droits d'écriture sur ce dossier, veuillez "
+"demander à son propriétaire de libérer un peu d'espace."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Erreur : %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "La connexion au serveur « %1 » a été fermée ou le délai d'attente a été "
 "atteint. Elle sera de nouveau établie automatiquement si possible."
@@ -4753,20 +4647,20 @@ msgstr "Archives de la liste"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Un ou plusieurs certificats S/MIME ou clés OpenPGP ne sont pas absolument sûrs "
-"pour le chiffrement."
+"Un ou plusieurs certificats S/MIME ou clés OpenPGP ne sont pas absolument "
+"sûrs pour le chiffrement."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Un ou plusieurs certificats S/MIME ou clés OpenPGP ne sont pas absolument sûrs "
-"pour le chiffrement."
+"Un ou plusieurs certificats S/MIME ou clés OpenPGP ne sont pas absolument "
+"sûrs pour le chiffrement."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4800,228 +4694,182 @@ msgstr "Clés de chiffrement non totalement sûres"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins d'un jour.</p>\n"
+"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins d'un jour.</p>\n"
+"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de chiffrement S/MIME</p><p align=center><b>%1</b> (numéro de "
+"série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de chiffrement S/MIME</p><p align=center><b>%1</b> (numéro de "
+"série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour le "
+"certificat S/MIME</p><p align=center><b>%1</b> (numéro de série %2)</"
+"p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour le "
+"certificat S/MIME</p><p align=center><b>%1</b> (numéro de série %2)</"
+"p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
+"(numéro de série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
+"(numéro de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</"
+"b> (numéro de série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</"
+"b> (numéro de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour le certificat S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour le certificat S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro "
+"de série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro "
+"de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
+"(numéro de série %2)</p><p>expire dans moins d'un jour.</p>\n"
 "<p>Votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"(numéro de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5035,217 +4883,171 @@ msgstr "Le certificat S/MIME expire bientôt"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins d'un jour.</p>\n"
+"<p>Votre clé de signature OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Votre clé de chiffrement OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins d'un jour.</p>\n"
+"<p>La clé OpenPGP pour</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de chiffrement S/MIME</p><p align=center><b>%1</b> (numéro de "
+"série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour votre "
+"certificat de chiffrement S/MIME</p><p align=center><b>%1</b> (numéro de "
+"série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat racine</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour le "
+"certificat S/MIME</p><p align=center><b>%1</b> (numéro de série %2)</"
+"p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat racine</p><p align=center><b>%3</b></p><p>pour le "
+"certificat S/MIME</p><p align=center><b>%1</b> (numéro de série %2)</"
+"p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
+"(numéro de série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
+"(numéro de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</"
+"b> (numéro de série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour votre certificat de chiffrement S/MIME</p><p align=center><b>%1</"
+"b> (numéro de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></p>"
-"<p>pour le certificat S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour le certificat S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat du tiers de confiance</p><p align=center><b>%3</b></"
+"p><p>pour le certificat S/MIME</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro "
+"de série %2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Votre certificat de signature S/MIME</p><p align=center><b>%1</b> (numéro "
+"de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
+"(numéro de série %2)</p><p>expire dans moins d'un jour.</p>\n"
 "<p>Votre certificat de chiffrement S/MIME</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"(numéro de série %2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins d'un jour.</p>\n"
-"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> "
-"(numéro de série %2)</p>"
-"<p>expire dans moins de %n jours.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins d'un jour.</p>\n"
+"<p>Le certificat S/MIME pour</p><p align=center><b>%1</b> (numéro de série "
+"%2)</p><p>expire dans moins de %n jours.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5257,9 +5059,10 @@ msgstr "Le certificat S/MIME expire bientôt"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5267,8 +5070,8 @@ msgstr ""
 "certificats S/MIME n'est pas utilisable pour le chiffrement. Veuillez "
 "reconfigurer vos clés de chiffrement et les certificats pour cette identité "
 "dans la fenêtre de configuration.\n"
-"Si vous choisissez de continuer, et que les clés sont nécessaires plus tard, on "
-"vous demandera de spécifier les clés à utiliser."
+"Si vous choisissez de continuer, et que les clés sont nécessaires plus tard, "
+"on vous demandera de spécifier les clés à utiliser."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5282,12 +5085,12 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Une ou plus de vos clés de signature OpenPGP configurées ou de vos certificats "
-"S/MIME n'est pas utilisable pour la signature. Veuillez reconfigurer vos clés "
-"de signature et les certificats pour cette identité dans la fenêtre de "
-"configuration.\n"
-"Si vous choisissez de continuer, et que les clés sont nécessaires plus tard, on "
-"vous demandera de spécifier les clés à utiliser."
+"Une ou plus de vos clés de signature OpenPGP configurées ou de vos "
+"certificats S/MIME n'est pas utilisable pour la signature. Veuillez "
+"reconfigurer vos clés de signature et les certificats pour cette identité "
+"dans la fenêtre de configuration.\n"
+"Si vous choisissez de continuer, et que les clés sont nécessaires plus tard, "
+"on vous demandera de spécifier les clés à utiliser."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5297,16 +5100,16 @@ msgstr "Clés de signature inutilisables"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Après examen des préférences de chiffrement du ou des destinataires, il s'avère "
-"que le message doit être chiffré en utilisant OpenPGP, au moins pour certains "
-"destinataires.\n"
-"Cependant, aucune clé de chiffrement OpenPGP valable et sûre n'a été configurée "
-"pour cette identité.\n"
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Après examen des préférences de chiffrement du ou des destinataires, il "
+"s'avère que le message doit être chiffré en utilisant OpenPGP, au moins pour "
+"certains destinataires.\n"
+"Cependant, aucune clé de chiffrement OpenPGP valable et sûre n'a été "
+"configurée pour cette identité.\n"
 "Vous pouvez continuer sans chiffrer pour vous-même, mais vous ne pourrez pas "
 "relire votre propre message par la suite."
 
@@ -5314,14 +5117,14 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Après examen des préférences de chiffrement du ou des destinataires, il s'avère "
-"que le message doit être chiffré en utilisant S/MIME, au moins pour certains "
-"destinataires.\n"
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Après examen des préférences de chiffrement du ou des destinataires, il "
+"s'avère que le message doit être chiffré en utilisant S/MIME, au moins pour "
+"certains destinataires.\n"
 "Cependant, aucun certificat de chiffrement S/MIME valable n'a été configuré "
 "pour cette identité.\n"
 "Vous pouvez continuer sans chiffrer pour vous-même, mais vous ne pourrez pas "
@@ -5329,16 +5132,16 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Après examen des préférences de signature du ou des destinataires, il s'avère "
-"que le message doit être signé en utilisant OpenPGP, au moins pour certains "
-"destinataires.\n"
-"Cependant, aucun certificat de signature OpenPGP valable n'a été configuré pour "
-"cette identité."
+"Après examen des préférences de signature du ou des destinataires, il "
+"s'avère que le message doit être signé en utilisant OpenPGP, au moins pour "
+"certains destinataires.\n"
+"Cependant, aucun certificat de signature OpenPGP valable n'a été configuré "
+"pour cette identité."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5346,16 +5149,16 @@ msgstr "Ne pas signer en OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Après examen des préférences de signature du ou des destinataires, il s'avère "
-"que le message doit être signé en utilisant S/MIME, au moins pour certains "
-"destinataires.\n"
-"Cependant, aucun certificat de signature S/MIME valable n'a été configuré pour "
-"cette identité."
+"Après examen des préférences de signature du ou des destinataires, il "
+"s'avère que le message doit être signé en utilisant S/MIME, au moins pour "
+"certains destinataires.\n"
+"Cependant, aucun certificat de signature S/MIME valable n'a été configuré "
+"pour cette identité."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5377,8 +5180,8 @@ msgstr "Aucune signature possible"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Vous n'avez pas sélectionné de clé de chiffrement pour vous-même. Vous ne "
 "pourrez pas déchiffrer vos propres messages si vous les chiffrez."
@@ -5402,11 +5205,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Vous n'avez sélectionné de clé de chiffrement pour aucun des destinataires de "
-"ce message. Par conséquent, le message ne sera pas chiffré."
+"Vous n'avez sélectionné de clé de chiffrement pour aucun des destinataires "
+"de ce message. Par conséquent, le message ne sera pas chiffré."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5417,9 +5220,9 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Vous n'avez pas sélectionné de clé de chiffrement pour un des destinataires de "
-"ce message. Cette personne ne pourra pas déchiffrer le message, si vous le "
-"chiffrez."
+"Vous n'avez pas sélectionné de clé de chiffrement pour un des destinataires "
+"de ce message. Cette personne ne pourra pas déchiffrer le message, si vous "
+"le chiffrez."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5453,11 +5256,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Aucune clé de chiffrement valable et sûre n'a été trouvée pour « %1 ».\n"
 "\n"
@@ -5506,10 +5309,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Erreur critique : impossible de collecter les messages : "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Impossible d'ajouter le message :\n"
+msgid "Failed to add message:\n"
+msgstr "Impossible d'ajouter le message :\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5601,6 +5402,54 @@ msgstr "IMAP &déconnecté"
 msgid "&Maildir mailbox"
 msgstr "Boîte aux lettres « &maildir »"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Définir le sujet du message"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Envoyer une copie carbone à « adresse »"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Envoyer une copie carbone cachée à « adresse »"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Ajouter un « en-tête » au message"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Lire le corps du message dans « fichier »."
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Définir le corps du message"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+"Ajouter une pièce jointe au message. Cette opération peut être effectuée "
+"plusieurs fois."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Ne vérifier que les nouveaux messages"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "N'ouvrir qu'une fenêtre d'édition"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Afficher le message indiqué."
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Envoyer le message à l'adresse désirée avec le fichier pointé par l'URL "
+"comme pièce jointe"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Courriel"
@@ -5643,8 +5492,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail va maintenant créer les dossiers de travail en groupe nécessaires comme "
-"sous-dossiers de « %1 » ; si vous ne souhaitez pas obtenir cette "
+"KMail va maintenant créer les dossiers de travail en groupe nécessaires "
+"comme sous-dossiers de « %1 » ; si vous ne souhaitez pas obtenir cette "
 "fonctionnalité, annulez simplement cette action et la ressource IMAP sera "
 "désactivée."
 
@@ -5655,19 +5504,19 @@ msgstr "%1 : aucun dossier trouvé. Il sera créé."
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
-"%1 : dossier « %2 » trouvé. Il sera défini comme dossier de travail en groupe "
-"principal"
+"%1 : dossier « %2 » trouvé. Il sera défini comme dossier de travail en "
+"groupe principal"
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail a trouvé les dossiers de travail en groupe suivants dans « %1 » et "
-"doit effectuer les opérations suivantes : %2 "
-"<br>Si vous ne souhaitez pas effectuer cela, annulez simplement cette "
-"opération, et la ressource IMAP sera désactivée."
+"doit effectuer les opérations suivantes : %2 <br>Si vous ne souhaitez pas "
+"effectuer cela, annulez simplement cette opération, et la ressource IMAP "
+"sera désactivée."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5716,11 +5565,11 @@ msgstr "URL copiée dans le presse-papiers."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Le fichier <b>%1</b> existe.<br>Voulez-vous le remplacer ?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Enregistrer dans un fichier"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Remplacer"
 
@@ -5740,7 +5589,7 @@ msgstr ""
 "Le message a été supprimé lors de son enregistrement. Il ne sera pas "
 "sauvegardé."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5760,119 +5609,119 @@ msgstr "Le fichier ne contient pas de message."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Le fichier contient plusieurs messages. Seul le premier est affiché."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Ceci est un condensé MIME retransmis. Le contenu du message est dans les pièces "
-"jointes.\n"
+"Ceci est un condensé MIME retransmis. Le contenu du message est dans les "
+"pièces jointes.\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrage des messages"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrage du message %1 sur %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Espace disque libre insuffisant ?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mettre dans ce dossier"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copier dans ce dossier"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Corruption du cache IMAP détectée dans le dossier %1. Annulation de la copie "
 "des messages."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Déplacement des messages"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Suppression des messages"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Ouverture de l'URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Voulez-vous vraiment exécuter la commande <b>%1</b> ?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Exécuter"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Aucune pièce jointe à enregistrer n'a été trouvée."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Enregistrer les pièces jointes sous"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "pièce_jointe.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "pièce_jointe.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Un fichier nommé « %1 » existe déjà. Voulez-vous l'écraser ?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Le fichier existe déjà."
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "É&craser"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"La partie %1 du message est chiffrée. Voulez-vous conserver le chiffrage lors "
-"de l'enregistrement ?"
+"La partie %1 du message est chiffrée. Voulez-vous conserver le chiffrage "
+"lors de l'enregistrement ?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail - Question"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Conserver le chiffrement"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ne pas conserver"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5880,11 +5729,11 @@ msgstr ""
 "La partie %1 du message est signée. Voulez-vous conserver la signature en "
 "enregistrant ?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Conserver la signature"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5893,77 +5742,78 @@ msgstr ""
 "Impossible d'écrire le fichier %1 :\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Impossible d'écrire le fichier %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Il n'y a pas d'entrée de carnet d'adresses pour cette adresse électronique. "
 "Ajoutez-les au carnet d'adresses et ajoutez des adresses de messagerie "
 "instantanée en utilisant votre client de messagerie préféré."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Plusieurs entrées du carnet d'adresses utilisent cette adresse électronique :\n"
+"Plusieurs entrées du carnet d'adresses utilisent cette adresse "
+"électronique :\n"
 "%1\n"
 "Il n'est pas possible de déterminer avec laquelle parler."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Le module Chiasmus ne propose pas la fonction « x-obtain-keys ». Veuillez "
 "rapporter ce bogue."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Erreur du module Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Valeur de retour non attendue du module Chiasmus : la fonction "
-"« x-obtain-keys » n'a pas retourné de liste de chaînes de caractères. Veuillez "
+"Valeur de retour non attendue du module Chiasmus : la fonction « x-obtain-"
+"keys » n'a pas retourné de liste de chaînes de caractères. Veuillez "
 "rapporter ce bogue."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Aucune clé trouvée. Veuillez vous assurer qu'un emplacement vers une clé "
 "valable a été défini dans la configuration de Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Sélection de la clé de chiffrement Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Le module Chiasmus ne propose pas la fonction « x-decrypt ». Veuillez rapporter "
-"ce bogue."
+"Le module Chiasmus ne propose pas la fonction « x-decrypt ». Veuillez "
+"rapporter ce bogue."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5971,19 +5821,19 @@ msgstr ""
 "La fonction « x-decrypt » n'accepte pas les paramètres attendus. Veuillez "
 "rapporter ce bogue."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Erreur de déchiffrement Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Valeur de retour non attendue du module Chiasmus : la fonction « x-decrypt » "
 "n'a pas retourné de tableau d'octets. Veuillez rapporter ce bogue."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5993,7 +5843,7 @@ msgstr ""
 "Pour : %2\n"
 "Sujet : %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Courriel : %1"
@@ -6092,7 +5942,7 @@ msgstr "Taille"
 msgid "Encoding"
 msgstr "Encodage"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Compresser"
 
@@ -6104,7 +5954,7 @@ msgstr "Chiffrer"
 msgid "Sign"
 msgstr "Signature"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nom de la pièce jointe :"
 
@@ -6126,10 +5976,11 @@ msgstr "Destinataires primaires"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Les adresses électroniques que vous avez mises dans ce champ reçoivent une "
-"copie du courriel.</qt>"
+"<qt>Les adresses électroniques que vous avez mises dans ce champ reçoivent "
+"une copie du courriel.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6138,14 +5989,15 @@ msgstr "Destinataires supplémentaires"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Les adresses électroniques que vous avez mises dans ce champ reçoivent une "
-"copie du courriel. Techniquement, c'est la même chose que de mettre toutes les "
-"adresses dans la champ <b>À :</b>, mais cela diffère en ce que le destinataire "
-"de la copie carbone (CC) est un auditeur, pas le destinataire principal.</qt>"
+"<qt>Les adresses électroniques que vous avez mises dans ce champ reçoivent "
+"une copie du courriel. Techniquement, c'est la même chose que de mettre "
+"toutes les adresses dans la champ <b>À :</b>, mais cela diffère en ce que le "
+"destinataire de la copie carbone (CC) est un auditeur, pas le destinataire "
+"principal.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6153,13 +6005,12 @@ msgstr "Destinataires cachés"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Essentiellement la même chose que le champ <b>Copie à :</b>"
-", mais diffère en ce que tous les autres destinataires ne voient pas qui reçoit "
-"une copie cachée.</qt>"
+"<qt>Essentiellement la même chose que le champ <b>Copie à :</b>, mais "
+"diffère en ce que tous les autres destinataires ne voient pas qui reçoit une "
+"copie cachée.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6169,7 +6020,7 @@ msgstr "&Envoyer le courriel"
 msgid "&Send Mail Via"
 msgstr "Env&oyer le courriel via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Envoyer plus &tard"
@@ -6234,8 +6085,7 @@ msgstr "Suppri&mer les marques de citation"
 msgid "Cl&ean Spaces"
 msgstr "Supprim&er les retours à la ligne"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Utiliser une police à espacement fi&xe"
@@ -6376,31 +6226,31 @@ msgstr "&Format de message chiffré"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Liste à puce (disque)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Liste à puce (cercle)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Liste à puce (carré)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Liste ordonnée (décimale)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Liste ordonnée (Alpha minuscule)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Liste ordonnée (Alpha majuscule)"
 
@@ -6484,8 +6334,8 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Enregistrer de nouveau ce message dans le dossier des modèles. Il pourra alors "
-"être utilisé plus tard."
+"Enregistrer de nouveau ce message dans le dossier des modèles. Il pourra "
+"alors être utilisé plus tard."
 
 #: kmcomposewin.cpp:2257
 msgid ""
@@ -6505,66 +6355,64 @@ msgstr "Fermer l'éditeur"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Le message que vous avez composé fait référence à un fichier joint, mais vous "
-"n'avez rien joint.\n"
+"Le message que vous avez composé fait référence à un fichier joint, mais "
+"vous n'avez rien joint.\n"
 "Voulez-vous joindre un fichier à votre message ?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Rappel de fichier joint"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Envo&yer tel quel"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail ne peut pas trouver l'emplacement de la pièce jointe (%1).</p>"
-"<p>Vous devez spécifier un emplacement complet pour ajouter un fichier comme "
-"pièce jointe.</p></qt>"
+"<qt><p>KMail ne peut pas trouver l'emplacement de la pièce jointe (%1).</"
+"p><p>Vous devez spécifier un emplacement complet pour ajouter un fichier "
+"comme pièce jointe.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Votre administrateur a désactivé les pièces jointes plus grosses que %1 "
-"Mo.</p>"
+"<qt><p>Votre administrateur a désactivé les pièces jointes plus grosses que "
+"%1 Mo.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Joindre un fichier"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Joindre"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Insérer un fichier"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Insérer un fichier"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Une erreur est survenue lors de l'exportation de la clé depuis le module : "
-"</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Une erreur est survenue lors de l'exportation de la clé depuis le "
+"module : </p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6603,19 +6451,34 @@ msgid ""
 "View"
 msgstr "Afficher"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Modifier..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Modifier avec..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Enregistrer &sous..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Propriétés"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Ajouter une pièce jointe..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Impossible pour KMail de compresser le fichier."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6623,176 +6486,168 @@ msgstr ""
 "Le fichier compressé possède une taille plus importante que l'original. "
 "Voulez-vous conserver le fichier original ?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Conserver"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Impossible pour KMail de décompresser le fichier."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Enregistrer la pièce jointe sous"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Ajouter comme texte"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Ajouter comme pièce jointe"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Veuillez sélectionner si vous souhaitez insérer ce contenu comme texte dans "
 "l'éditeur, ou comme fichier référencé comme pièce jointe."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Coller comme texte ou pièce jointe ?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "sans nom"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Vous avez demandé à ce que les messages soient chiffrés pour vous-même, mais "
-"l'identité sélectionnée ne possède pas de clé de chiffrement (OpenPGP ou "
-"S/MIME).</p> "
-"<p>Veuillez sélectionner la ou les clés à utiliser dans la configuration de "
-"l'identité.</p></qt>"
+"<qt> <p>Vous avez demandé à ce que les messages soient chiffrés pour vous-"
+"même, mais l'identité sélectionnée ne possède pas de clé de chiffrement "
+"(OpenPGP ou S/MIME).</p> <p>Veuillez sélectionner la ou les clés à utiliser "
+"dans la configuration de l'identité.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Clé de chiffrement non définie"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pour pouvoir signer ce message, vous devez d'abord définir la clé (OpenPGP "
-"ou S/MIME) à utiliser. </p>"
-"<p>Vous pouvez la définir pour l'identité actuelle dans la configuration des "
-"identités.</p></qt>"
+"<qt><p>Pour pouvoir signer ce message, vous devez d'abord définir la clé "
+"(OpenPGP ou S/MIME) à utiliser. </p><p>Vous pouvez la définir pour "
+"l'identité actuelle dans la configuration des identités.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Clé de signature non définie"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"KMail est pour le moment en mode hors ligne, votre message sera donc conservé "
-"dans la boîte d'envoi en attendant d'être à nouveau en ligne."
+"KMail est pour le moment en mode hors ligne, votre message sera donc "
+"conservé dans la boîte d'envoi en attendant d'être à nouveau en ligne."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "En ligne / Hors ligne"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Vous devez saisir votre adresse électronique dans le champ From:. Définissez "
 "également votre adresse de courrier électronique pour pour les identités, de "
 "façon à ne plus avoir à le faire pour chaque message."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Vous devez spécifier au moins un destinataire, soit dans le champ À :, soit en "
-"CC, soit en BCC."
+"Vous devez spécifier au moins un destinataire, soit dans le champ À :, soit "
+"en CC, soit en BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 "Vous n'avez pas indiqué de destinataire. Voulez-vous tout de même envoyer le "
 "message ?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Aucun destinataire indiqué"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
-"Vous n'avez pas indiqué de sujet. Voulez-vous tout de même envoyer le message ?"
+"Vous n'avez pas indiqué de sujet. Voulez-vous tout de même envoyer le "
+"message ?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Aucun sujet indiqué"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Envoyer tel quel"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Spécifier le sujet"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Conserver le marquage, ne pas signer / chiffrer"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Conser&ver le marquage, ne pas chiffrer"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Conserver le marquage, ne pas signer"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Signer / Chiffrer le message ?"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Chiffrer (supprimer le marquage)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Signer (supprimer le marquage)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>La signature et/ou le chiffrement intégré des messages HTML n'est pas "
-"possible ;</p>"
-"<p>voulez-vous supprimer votre marquage ?</p></qt>"
+"<qt><p>La signature et/ou le chiffrement intégré des messages HTML n'est pas "
+"possible ;</p><p>voulez-vous supprimer votre marquage ?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Signer / Chiffrer le message ?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6800,106 +6655,106 @@ msgstr ""
 "Le dossier des brouillons et modèles personnalisés pour l'identité « %1 » "
 "n'existe pas (plus). De ce fait, les dossiers par défaut seront utilisés."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Veuillez créer un compte pour les envois puis recommencez."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Envoi du message..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Envoyer la confirmation"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Envoyer &maintenant"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Aucun destinataire"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinataires supplémentaires"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Vérification de l'orthographe activée"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Vérification de l'orthographe désactivée"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Correction orthographique annulée."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Correction orthographique arrêtée."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Correction orthographique terminée."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Vérificateur orthographique"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Veuillez tout d'abord configurer un module de cryptographie pour utiliser le "
 "chiffrement Chiasmus.\n"
 "Vous pouvez effectuer ceci dans l'onglet « Modules de cryptographie » de la "
 "fenêtre « Sécurité » dans la configuration."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Il semble que « libkleopatra » a été compilée sans la gestion de Chiasmus. Vous "
-"devriez recompiler « libkleopatra » avec l'option « --enable-chiasmus »."
+"Il semble que « libkleopatra » a été compilée sans la gestion de Chiasmus. "
+"Vous devriez recompiler « libkleopatra » avec l'option « --enable-chiasmus »."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Aucun module Chiasmus configuré"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Aucune clé Chiasmus trouvée"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Sélection de la clé de chiffrement Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Le message sera signé"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Le message ne sera pas signé"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Le message sera chiffré"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Le message ne sera pas chiffré"
 
@@ -6950,8 +6805,8 @@ msgstr "Correction orthographique - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Impossible de lancer ISpell ou Aspell. Assurez-vous qu'ISpell ou Aspell est "
 "correctement configuré et accessible en suivant votre variable PATH."
@@ -6987,12 +6842,10 @@ msgstr "<qt>Trop d'actions de filtrage dans la règle <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Action de filtrage <b>%1</b> inconnue"
-"<br>dans la règle <b>%2</b>."
+"<qt>Action de filtrage <b>%1</b> inconnue<br>dans la règle <b>%2</b>."
 "<br>Elle sera ignorée.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7213,167 +7066,138 @@ msgstr "Jouer un son"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Voici la liste des filtres existants. Ils sont traités de haut en bas. </p>"
-"<p>Cliquez sur n'importe lequel d'entre eux pour le modifier à l'aide des "
-"boutons situés dans moitié droite de la boîte de dialogue.</p></qt>"
+"<qt><p>Voici la liste des filtres existants. Ils sont traités de haut en "
+"bas. </p><p>Cliquez sur n'importe lequel d'entre eux pour le modifier à "
+"l'aide des boutons situés dans moitié droite de la boîte de dialogue.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour créer un nouveau filtre.</p>"
-"<p>Le filtre sera inséré juste avant celui qui est sélectionné, mais cela peut "
-"être modifié après coup.</p>"
-"<p>Si vous avez cliqué sur ce bouton accidentellement, vous pouvez annuler "
-"cette action en cliquant sur le bouton <em>Supprimer</em>.</p></qt>"
+"<qt><p>Cliquez sur ce bouton pour créer un nouveau filtre.</p><p>Le filtre "
+"sera inséré juste avant celui qui est sélectionné, mais cela peut être "
+"modifié après coup.</p><p>Si vous avez cliqué sur ce bouton "
+"accidentellement, vous pouvez annuler cette action en cliquant sur le bouton "
+"<em>Supprimer</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour copier un filtre.</p>"
-"<p>Si vous avez cliqué sur ce bouton accidentellement, vous pouvez annuler "
-"cette action en cliquant sur le bouton <em>Supprimer</em>.</p></qt>"
+"<qt><p>Cliquez sur ce bouton pour copier un filtre.</p><p>Si vous avez "
+"cliqué sur ce bouton accidentellement, vous pouvez annuler cette action en "
+"cliquant sur le bouton <em>Supprimer</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour <em>supprimer</em> le filtre sélectionné dans la "
-"liste ci-dessus.</p>"
-"<p>Il est impossible de retrouver un filtre après l'avoir supprimé, mais si "
-"vous quittez cette boîte de dialogue en cliquant sur <em>Annuler</em> "
-"toutes les actions que vous venez de faire ne seront pas prises en compte.</p>"
-"</qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Cliquez sur ce bouton pour <em>supprimer</em> le filtre sélectionné "
+"dans la liste ci-dessus.</p><p>Il est impossible de retrouver un filtre "
+"après l'avoir supprimé, mais si vous quittez cette boîte de dialogue en "
+"cliquant sur <em>Annuler</em> toutes les actions que vous venez de faire ne "
+"seront pas prises en compte.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour monter le filtre sélectionné <em>tout en haut</em> "
-"la liste.</p>"
-"<p>Cela est souvent utile, car l'ordre dans lequel les filtres sont affichés "
-"est aussi celui dans lequel ils sont appliqués : celui tout en haut en premier, "
-"et ainsi de suite.</p></qt>"
+"<qt><p>Cliquez sur ce bouton pour monter le filtre sélectionné <em>tout en "
+"haut</em> la liste.</p><p>Cela est souvent utile, car l'ordre dans lequel "
+"les filtres sont affichés est aussi celui dans lequel ils sont appliqués : "
+"celui tout en haut en premier, et ainsi de suite.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour <em>monter</em> le filtre sélectionné d'un cran "
-"dans la liste.</p>"
-"<p>Cela est souvent utile, car l'ordre dans lequel les filtres sont affichés "
-"est aussi celui dans lequel ils sont appliqués : celui tout en haut en premier, "
-"et ainsi de suite.</p>"
-"<p>Si vous avez cliqué sur ce bouton par erreur, vous pouvez revenir à la "
-"situation précédente en cliquant sur le bouton <em>Descendre</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Cliquez sur ce bouton pour <em>monter</em> le filtre sélectionné d'un "
+"cran dans la liste.</p><p>Cela est souvent utile, car l'ordre dans lequel "
+"les filtres sont affichés est aussi celui dans lequel ils sont appliqués : "
+"celui tout en haut en premier, et ainsi de suite.</p><p>Si vous avez cliqué "
+"sur ce bouton par erreur, vous pouvez revenir à la situation précédente en "
+"cliquant sur le bouton <em>Descendre</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour <em>descendre</em> le filtre sélectionné d'un "
-"cran dans la liste.</p>"
-"<p>Cela est souvent utile, car l'ordre dans lequel les filtres sont affichés "
-"est aussi celui dans lequel ils sont appliqués : celui tout en haut en premier, "
-"et ainsi de suite.</p>"
-"<p>Si vous avez cliqué sur ce bouton par erreur, vous pouvez revenir à la "
-"situation précédente en cliquant sur le bouton <em>Monter</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Cliquez sur ce bouton pour <em>descendre</em> le filtre sélectionné "
+"d'un cran dans la liste.</p><p>Cela est souvent utile, car l'ordre dans "
+"lequel les filtres sont affichés est aussi celui dans lequel ils sont "
+"appliqués : celui tout en haut en premier, et ainsi de suite.</p><p>Si vous "
+"avez cliqué sur ce bouton par erreur, vous pouvez revenir à la situation "
+"précédente en cliquant sur le bouton <em>Monter</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour descendre le filtre sélectionné <em>"
-"tout en bas</em> de la liste.</p>"
-"<p>Cela est souvent utile, car l'ordre dans lequel les filtres sont affichés "
-"est aussi celui dans lequel ils sont appliqués : celui tout en haut en premier, "
-"et ainsi de suite.</p></qt>"
+"<qt><p>Cliquez sur ce bouton pour descendre le filtre sélectionné <em>tout "
+"en bas</em> de la liste.</p><p>Cela est souvent utile, car l'ordre dans "
+"lequel les filtres sont affichés est aussi celui dans lequel ils sont "
+"appliqués : celui tout en haut en premier, et ainsi de suite.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cliquez sur ce bouton pour renommer le filtre actuellement sélectionné.</p>"
-"<p>Les filtres sont nommés automatiquement s'ils commencent par « &lt; ».</p>"
-"<p> Si vous avez renommé un filtre par erreur et souhaitez une attribution de "
-"nom automatique, cliquez sur ce bouton, puis appuyez sur <em>Effacer</em> "
-"et enfin sur <em>Valider</em> dans la boîte de dialogue apparaissant.</p></qt>"
+"<qt><p>Cliquez sur ce bouton pour renommer le filtre actuellement "
+"sélectionné.</p><p>Les filtres sont nommés automatiquement s'ils commencent "
+"par « &lt; ».</p><p> Si vous avez renommé un filtre par erreur et souhaitez "
+"une attribution de nom automatique, cliquez sur ce bouton, puis appuyez sur "
+"<em>Effacer</em> et enfin sur <em>Valider</em> dans la boîte de dialogue "
+"apparaissant.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cochez cette option pour forcer la fenêtre de confirmation à apparaître.</p> "
-"<p>Cela est utile si vous avez défini des règles qui marquent des messages pour "
-"qu'ils soient téléchargés « plus tard ». Sans la possibilité de forcer la "
-"fenêtre de confirmation à apparaître, ces messages ne pourraient plus jamais "
-"être téléchargés si aucun autre message volumineux n'est en attente sur le "
-"serveur, ou si vous vouliez modifier les règles de marquage des messages.</p>"
-"</qt>"
+"<qt><p>Cochez cette option pour forcer la fenêtre de confirmation à "
+"apparaître.</p> <p>Cela est utile si vous avez défini des règles qui "
+"marquent des messages pour qu'ils soient téléchargés « plus tard ». Sans la "
+"possibilité de forcer la fenêtre de confirmation à apparaître, ces messages "
+"ne pourraient plus jamais être téléchargés si aucun autre message volumineux "
+"n'est en attente sur le serveur, ou si vous vouliez modifier les règles de "
+"marquage des messages.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7383,6 +7207,16 @@ msgstr "Règles de filtrage POP3"
 msgid "Filter Rules"
 msgstr "Règles de filtrage"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importer"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importer"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtres disponibles"
@@ -7406,8 +7240,8 @@ msgstr "Options globales"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"Tou&jours afficher les messages « à télécharger plus tard » dans la fenêtre de "
-"confirmation"
+"Tou&jours afficher les messages « à télécharger plus tard » dans la fenêtre "
+"de confirmation"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7465,6 +7299,11 @@ msgstr "Ajouter en plus ce filtre à la barre d'outils"
 msgid "Icon for this filter:"
 msgstr "Icône pour ce filtre :"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "À"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Monter"
@@ -7473,16 +7312,29 @@ msgstr "Monter"
 msgid "Down"
 msgstr "Descendre"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Renommer..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nouveau"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Copier &dans"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Supprimé"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7491,11 +7343,11 @@ msgstr "Sélectionnez le raccourci clavier de ce dossier"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Au moins un filtre pointe vers un dossier situé sur un compte IMAP en ligne. Le "
-"ou les filtres concernés ne seront appliqués que manuellement et lors du "
+"Au moins un filtre pointe vers un dossier situé sur un compte IMAP en ligne. "
+"Le ou les filtres concernés ne seront appliqués que manuellement et lors du "
 "filtrage des nouveaux messages arrivant sur les comptes IMAP."
 
 #: kmfilterdlg.cpp:786
@@ -7577,29 +7429,25 @@ msgstr "Dépannage du cache IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Dépannage du cache IMAP.</b></p>"
-"<p>Si vous avez des problèmes en synchronisant un dossier IMAP, vous devez "
-"d'abord essayer de reconstruire le fichier index. Cela peut prendre un certain "
-"temps mais ne causera aucun problème.</p>"
-"<p>Si cela n'est pas suffisant vous pouvez essayer de rafraîchir le cache IMAP. "
-"Si vous faites cela vous perdrez tous vos changements locaux sur ce dossier et "
-"ses sous-dossiers.</p>"
+"<p><b>Dépannage du cache IMAP.</b></p><p>Si vous avez des problèmes en "
+"synchronisant un dossier IMAP, vous devez d'abord essayer de reconstruire le "
+"fichier index. Cela peut prendre un certain temps mais ne causera aucun "
+"problème.</p><p>Si cela n'est pas suffisant vous pouvez essayer de "
+"rafraîchir le cache IMAP. Si vous faites cela vous perdrez tous vos "
+"changements locaux sur ce dossier et ses sous-dossiers.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7631,16 +7479,16 @@ msgid ""
 "with file system permission, or it is corrupted."
 msgstr ""
 "Impossible de lire le fichier du cache d'identifiants du dossier « %1 ». Il "
-"doit y avoir un problème de permissions sur ce fichier, à moins qu'il ne soit "
-"corrompu."
+"doit y avoir un problème de permissions sur ce fichier, à moins qu'il ne "
+"soit corrompu."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"Impossible d'écrire sur le fichier du cache d'identifiants du dossier « %1 ». "
-"Il doit y avoir un problème de permissions sur ce fichier."
+"Impossible d'écrire sur le fichier du cache d'identifiants du dossier "
+"« %1 ». Il doit y avoir un problème de permissions sur ce fichier."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7662,8 +7510,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Voulez-vous vraiment rafraîchir le cache IMAP du dossier %1 et tous ses "
-"sous-dossiers ?\n"
+"Voulez-vous vraiment rafraîchir le cache IMAP du dossier %1 et tous ses sous-"
+"dossiers ?\n"
 "Cette opération supprimera toutes le modifications que vous avez faites en "
 "local aux dossiers."
 
@@ -7681,8 +7529,8 @@ msgstr "L'index de ce dossier a été recréé."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Le dossier « %1 » n'était pas prêt pour une synchronisation (état : « %2 »). "
 "Voulez-vous réinitialiser l'état de dossier et relancer une synchronisation ?"
@@ -7812,13 +7660,10 @@ msgstr "Création des sous-dossiers sur le serveur"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Les courriels présents dans le dossier <b>%1</b> du serveur ont été "
+"<qt> <p>Les courriels présents dans le dossier <b>%1</b> du serveur ont été "
 "supprimés. Voulez-vous le supprimer localement ? <br />UID : %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
@@ -7840,13 +7685,11 @@ msgstr "Réception des dossiers de l'espace de noms « %1 »"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Il semble que le dossier <b>%1</b> a été supprimé. Voulez-vous le supprimer "
-"du serveur ?</p></qt>"
+"<qt> <p>Il semble que le dossier <b>%1</b> a été supprimé. Voulez-vous le "
+"supprimer du serveur ?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7854,8 +7697,8 @@ msgstr "Annulé"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "Le serveur IMAP « %1 » ne gère pas les annotations IMAP. Le stockage XML ne "
 "peut donc pas être utilisé sur ce serveur ; veuillez configurer KMail "
@@ -7863,8 +7706,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "Le serveur IMAP « %1 » ne gère pas les annotations IMAP. Le stockage XML ne "
 "peut donc pas être utilisé sur ce serveur ; veuillez configurer KMail "
@@ -7880,18 +7723,17 @@ msgstr "Perdus et trouvés"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Il existe de nouveaux messages dans le dossier <b>%1</b> "
-"n'ayant pas encore été envoyés au serveur, mais soit ce dossier a déjà été "
-"supprimé du serveur, soit vous n'avez pas les droits d'accès suffisants "
-"permettant d'envoyer ces messages.</p> "
-"<p>Les messages affectés vont maintenant être déplacés vers <b>%2</b> "
-"pour éviter des pertes de données.</p>"
+"<p>Il existe de nouveaux messages dans le dossier <b>%1</b> n'ayant pas "
+"encore été envoyés au serveur, mais soit ce dossier a déjà été supprimé du "
+"serveur, soit vous n'avez pas les droits d'accès suffisants permettant "
+"d'envoyer ces messages.</p> <p>Les messages affectés vont maintenant être "
+"déplacés vers <b>%2</b> pour éviter des pertes de données.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7899,21 +7741,26 @@ msgstr "Droits d'accès insuffisants"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-msgstr ""
-"<p>Il existe, dans ce dossier (%1), de nouveaux messages n'ayant pas encore été "
-"envoyés au serveur, mais il semble que vous n'ayez pas les droits suffisants "
-"pour les envoyer. Veuillez contacter votre administrateur pour qu'il autorise "
-"votre compte à envoyer de nouveaux messages, ou déplacez-les hors de ce "
-"dossier.</p>"
-"<p>Voulez-vous déplacer ces messages dans un autre dossier maintenant ?</p>"
-
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
+msgstr ""
+"<p>Il existe, dans ce dossier (%1), de nouveaux messages n'ayant pas encore "
+"été envoyés au serveur, mais il semble que vous n'ayez pas les droits "
+"suffisants pour les envoyer. Veuillez contacter votre administrateur pour "
+"qu'il autorise votre compte à envoyer de nouveaux messages, ou déplacez-les "
+"hors de ce dossier.</p><p>Voulez-vous déplacer ces messages dans un autre "
+"dossier maintenant ?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Déplacer vers :"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ne pas déplacer"
 
@@ -7925,8 +7772,7 @@ msgstr "Déplacer les messages vers le dossier"
 msgid "Permissions (ACL)"
 msgstr "Permissions (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Général"
@@ -7950,8 +7796,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Utiliser des icônes personnal&isées"
@@ -7970,23 +7815,21 @@ msgstr "Notifier la présence de courriel non lu ou nouveau dans ce dossier"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Si cette option est activée, vous serez alors prévenu de la présence de "
-"courriel non lu ou nouveau dans ce dossier. De plus, le déplacement entre "
-"dossiers contenant du courriel non lu s'arrêtera à celui-ci.</p> "
-"<p>Décochez cette option si vous ne souhaitez pas être notifié de la présence "
-"de courriel non lu ou nouveau, et que ce dossier soit passé automatiquement "
-"dans la navigation des messages non lus. Cette option est notamment utile pour "
-"ignorer le dossier du courriel indésirable.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt> <p>Si cette option est activée, vous serez alors prévenu de la présence "
+"de courriel non lu ou nouveau dans ce dossier. De plus, le déplacement entre "
+"dossiers contenant du courriel non lu s'arrêtera à celui-ci.</p> <p>Décochez "
+"cette option si vous ne souhaitez pas être notifié de la présence de "
+"courriel non lu ou nouveau, et que ce dossier soit passé automatiquement "
+"dans la navigation des messages non lus. Cette option est notamment utile "
+"pour ignorer le dossier du courriel indésirable.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7998,9 +7841,9 @@ msgstr "Conserver les réponses dans ce dossier"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Cochez cette option si vous voulez que les réponses que vous écrivez aux "
 "courriels dans ce dossier soient mises dans le même dossier après envoi, au "
@@ -8015,17 +7858,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Affic&her la colonne :"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Paramétrer par défaut"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Expéditeur"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Destinataire"
@@ -8036,18 +7883,19 @@ msgstr "Identité de l'expédi&teur :"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Sélectionnez l'identité à utiliser lors de l'écriture d'un courriel ou d'une "
-"réponse depuis ce dossier. Cela signifie que si vous êtes par exemple dans un "
-"de vos dossiers de travail, KMail vous permet d'utiliser automatiquement une "
-"adresse électronique, une signature et des clés de chiffrement et de signature "
-"correspondantes. Les identités peuvent être configurées dans la fenêtre de "
-"configuration principale (« Configuration » / « Configurer KMail »)."
+"réponse depuis ce dossier. Cela signifie que si vous êtes par exemple dans "
+"un de vos dossiers de travail, KMail vous permet d'utiliser automatiquement "
+"une adresse électronique, une signature et des clés de chiffrement et de "
+"signature correspondantes. Les identités peuvent être configurées dans la "
+"fenêtre de configuration principale (« Configuration » / « Configurer "
+"KMail »)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -8065,23 +7913,24 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Ce paramètre définit où les utilisateurs partageant ce dossier devrait obtenir "
-"les périodes « occupé » dans leur listes de « libre / occupé » et devrait voir "
-"les alarmes pour les évènements ou tâches dans ce dossier. Ce paramètre "
-"s'applique pour les dossiers de calendrier et de tâches uniquement. (pour les "
-"tâches, ce paramètre est uniquement utilisé pour les alarmes).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Ce paramètre définit où les utilisateurs partageant ce dossier devrait "
+"obtenir les périodes « occupé » dans leur listes de « libre / occupé » et "
+"devrait voir les alarmes pour les évènements ou tâches dans ce dossier. Ce "
+"paramètre s'applique pour les dossiers de calendrier et de tâches "
+"uniquement. (pour les tâches, ce paramètre est uniquement utilisé pour les "
+"alarmes).\n"
 "\n"
 "Exemple de cas d'utilisation : si le chef partage un dossier avec sa "
-"secrétaire, seul le chef devrait être marqué comme occupé pour ces rendez-vous, "
-"donc il doit choisir « Administrateurs », alors que sa secrétaire n'a aucun "
-"droit d'administration sur le dossier.\n"
+"secrétaire, seul le chef devrait être marqué comme occupé pour ces rendez-"
+"vous, donc il doit choisir « Administrateurs », alors que sa secrétaire n'a "
+"aucun droit d'administration sur le dossier.\n"
 "D'un autre côté, si un groupe de travail partage un calendrier pour les "
 "rendez-vous du groupe, tous les lecteurs des dossiers devraient être marqué "
 "comme occupé pendant les rendez-vous.\n"
@@ -8119,24 +7968,24 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Vous avez configurer ce dossier pour contenir les informations de travail en "
 "groupe et l'option de configuration générale pour cacher les dossiers de "
-"travail en groupe est activée. Cela signifie que ce dossier va disparaître une "
-"fois la fenêtre de configuration fermée. Si vous souhaitez supprimer le dossier "
-"à nouveau, vous devrez alors désactiver temporairement le masquage des dossiers "
-"de travail en groupe afin de le voir."
+"travail en groupe est activée. Cela signifie que ce dossier va disparaître "
+"une fois la fenêtre de configuration fermée. Si vous souhaitez supprimer le "
+"dossier à nouveau, vous devrez alors désactiver temporairement le masquage "
+"des dossiers de travail en groupe afin de le voir."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8205,7 +8054,8 @@ msgstr "Erreur lors de la réception des informations du dossier."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "L'index de la boîte « %1 » correspond à une version inconnue de KMail (%2).\n"
 "Il est possible de le recréer à partir de votre boîte aux lettres, mais "
@@ -8235,11 +8085,12 @@ msgstr "Erreur lors de l'ouverture du dossier « %1 ». Ce dossier est manquan
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Erreur lors de l'ouverture du dossier « %1 ». Soit ce n'est pas un dossier au "
-"format « maildir » valable, soit vous n'avez pas les droits d'accès suffisants."
+"Erreur lors de l'ouverture du dossier « %1 ». Soit ce n'est pas un dossier "
+"au format « maildir » valable, soit vous n'avez pas les droits d'accès "
+"suffisants."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8284,21 +8135,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>L'index du dossier « %2 » semble périmé. Pour empêcher la corruption des "
-"messages, l'index sera régénéré. Il en résultera que les messages supprimés "
-"peuvent réapparaître et les drapeaux d'état être perdus.</p> "
-"<p>Veuillez lire l'entrée correspondante de la <a href=\"%1\">"
-"section FAQ du manuel de KMail</a> pour des informations sur la manière "
-"d'empêcher ce problème de survenir à nouveau.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>L'index du dossier « %2 » semble périmé. Pour empêcher la corruption "
+"des messages, l'index sera régénéré. Il en résultera que les messages "
+"supprimés peuvent réapparaître et les drapeaux d'état être perdus.</p> "
+"<p>Veuillez lire l'entrée correspondante de la <a href=\"%1\">section FAQ du "
+"manuel de KMail</a> pour des informations sur la manière d'empêcher ce "
+"problème de survenir à nouveau.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8359,7 +8207,7 @@ msgstr ""
 "« %1 » ne semble pas être un dossier.\n"
 "Veuillez déplacer le fichier de cet emplacement."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8368,7 +8216,7 @@ msgstr ""
 "Veuillez vérifier que vous pouvez afficher et modifier le contenu de ce "
 "dossier."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8379,8 +8227,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 "Un dossier du même nom a été supprimé depuis la dernière vérification du "
 "courriel. Vous devez tout d'abord le vérifier à nouveau avant de recréer un "
@@ -8390,7 +8238,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Impossible de créer le dossier"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8487,14 +8335,14 @@ msgstr "Dé&panner le cache IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Impossible de créer le dossier <b>%1</b> pour cause de permissions "
-"insuffisantes sur le serveur. Si vous pensez que vous devriez être en mesure de "
-"créer des sous-dossiers ici, demandez à votre administrateur de vous fournir "
-"les droits de le faire.</qt> "
+"insuffisantes sur le serveur. Si vous pensez que vous devriez être en mesure "
+"de créer des sous-dossiers ici, demandez à votre administrateur de vous "
+"fournir les droits de le faire.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8511,23 +8359,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Impossible de déplacer ou copier le dossier <b>%1</b>"
-", un dossier du même nom existe déjà.</qt>"
+"<qt>Impossible de déplacer ou copier le dossier <b>%1</b>, un dossier du "
+"même nom existe déjà.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Impossible de déplacer ou copier le dossier <b>%1</b> "
-"car il n'a pas été complètement copié.</qt>"
+"<qt>Impossible de déplacer ou copier le dossier <b>%1</b> car il n'a pas été "
+"complètement copié.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Impossible de déplacer ou copier le dossier <b>%1</b> "
-"dans un de ses sous-dossiers.</qt>"
+"<qt>Impossible de déplacer ou copier le dossier <b>%1</b> dans un de ses "
+"sous-dossiers.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8633,15 +8481,15 @@ msgstr "%1 Le dossier est en lecture seule."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Voulez-vous vraiment supprimer le message sélectionné ?"
-"<br>Une fois supprimé, il ne pourra pas être récupéré.</qt>\n"
-"<qt>Voulez-vous vraiment supprimer les %n messages sélectionnés ?"
-"<br>Une fois supprimés, ils ne pourront pas être récupérés.</qt>"
+"<qt>Voulez-vous vraiment supprimer le message sélectionné ?<br>Une fois "
+"supprimé, il ne pourra pas être récupéré.</qt>\n"
+"<qt>Voulez-vous vraiment supprimer les %n messages sélectionnés ?<br>Une "
+"fois supprimés, ils ne pourront pas être récupérés.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8693,148 +8541,146 @@ msgstr ""
 "Impossible de modifier « %1 »\n"
 "(pas d'espace disque libre restant ?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Demande de certificat de signature"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Veuillez créer un certificat à partir de la pièce jointe et le renvoyer à "
 "l'expéditeur."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail est maintenant en mode déconnecté, les tâches réseaux sont suspendues"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail est maintenant en mode connecté, les tâches réseaux reprennent"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail est actuellement en mode hors ligne. Que voulez-vous faire ?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Travailler en ligne"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Travailler hors ligne"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
-"Vous n'avez pas la permission de lire ou d'écrire dans votre dossier « Boîte de "
-"réception »."
+"Vous n'avez pas la permission de lire ou d'écrire dans votre dossier « Boîte "
+"de réception »."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Boîte d'envoi"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "Vous n'avez pas la permission de lire ou d'écrire dans votre dossier « À "
 "envoyer »."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Messages envoyés"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Vous n'avez pas la permission de lire ou d'écrire dans votre dossier "
 "« Envoyés »."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Corbeille"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 "Vous n'avez pas la permission de lire ou d'écrire dans votre dossier "
 "« Corbeille »."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Brouillons"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 "Vous n'avez pas la permission de lire ou d'écrire dans votre dossier "
 "« Brouillons »."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "Modèles"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
-"Vous n'avez pas la permission de lire ou d'écrire dans le dossier des modèles."
+"Vous n'avez pas la permission de lire ou d'écrire dans le dossier des "
+"modèles."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Dernière recherche"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Le dossier <i>%4</i> existe. %1 utilise maintenant <i>%5</i> "
-"pour ses messages."
-"<p>%2 peut déplacer le contenu de <i>%6<i> dans ce dossier à votre place, bien "
-"que cela remplacera les fichiers ayant le même nom dans <i>%7</i>."
-"<p><strong>Voulez-vous que %3 déplace les fichiers de courriel "
+"<qt>Le dossier <i>%4</i> existe. %1 utilise maintenant <i>%5</i> pour ses "
+"messages.<p>%2 peut déplacer le contenu de <i>%6<i> dans ce dossier à votre "
+"place, bien que cela remplacera les fichiers ayant le même nom dans <i>%7</"
+"i>.<p><strong>Voulez-vous que %3 déplace les fichiers de courriel "
 "maintenant ?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Le dossier <i>%4</i> existe. %1 utilise maintenant <i>%5</i> "
-"pour ses messages."
-"<p>%2 peut déplacer le contenu de <i>%6<i> dans ce dossier à votre place."
-"<p><strong>Voulez-vous que %3 déplace les fichiers de courriel "
+"<qt>Le dossier <i>%4</i> existe. %1 utilise maintenant <i>%5</i> pour ses "
+"messages.<p>%2 peut déplacer le contenu de <i>%6<i> dans ce dossier à votre "
+"place.<p><strong>Voulez-vous que %3 déplace les fichiers de courriel "
 "maintenant ?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrer les fichiers de courriel ?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail a rencontré une erreur fatale et va se terminer maintenant"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8845,11 +8691,11 @@ msgstr ""
 "Le problème est :\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Vider la corbeille"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Voulez-vous vraiment vider les corbeilles de tous les comptes ?"
 
@@ -8924,8 +8770,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Nouveau message arrivé</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8944,8 +8789,8 @@ msgstr "Ce dossier n'a aucune option d'expiration activée"
 #: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Voulez-vous vraiment faire expirer les anciens messages du dossier <b>%1</b>"
-" ?</qt>"
+"<qt>Voulez-vous vraiment faire expirer les anciens messages du dossier <b>"
+"%1</b> ?</qt>"
 
 #: kmmainwidget.cpp:1133
 msgid "Expire Folder"
@@ -8965,8 +8810,8 @@ msgstr "Voulez-vous vraiment vider la corbeille ?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Voulez-vous vraiment déplacer tous les messages du dossier <b>%1</b> "
 "dans la corbeille ?</qt>"
@@ -8993,12 +8838,12 @@ msgstr "Supprimer la recherche"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Voulez-vous vraiment supprimer la recherche <b>%1</b> ? "
-"<br>Les messages y apparaissant seront toujours disponibles dans leurs dossiers "
-"originaux.</qt>"
+"<qt>Voulez-vous vraiment supprimer la recherche <b>%1</b> ? <br>Les messages "
+"y apparaissant seront toujours disponibles dans leurs dossiers originaux.</"
+"qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -9010,41 +8855,42 @@ msgstr "<qt>Voulez-vous vraiment effacer le dossier vide <b>%1</b> ?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Voulez-vous vraiment supprimer le dossier <b>%1</b> "
-"ainsi que les sous-dossiers qu'il contient ? Les sous-dossiers peuvent ne pas "
-"être vides et leurs données seront perdues. "
-"<p><b>Attention :</b> les messages supprimés ne sont pas placés dans la "
-"corbeille et sont donc définitivement perdus.</qt>"
+"<qt>Voulez-vous vraiment supprimer le dossier <b>%1</b> ainsi que les sous-"
+"dossiers qu'il contient ? Les sous-dossiers peuvent ne pas être vides et "
+"leurs données seront perdues. <p><b>Attention :</b> les messages supprimés "
+"ne sont pas placés dans la corbeille et sont donc définitivement perdus.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Voulez-vous vraiment supprimer le dossier <b>%1</b> "
-"et effacer son contenu ? "
-"<p><b>Attention :</b> les messages supprimés ne sont pas placés dans la "
-"corbeille et sont donc définitivement perdus.</qt>"
+"<qt>Voulez-vous vraiment supprimer le dossier <b>%1</b> et effacer son "
+"contenu ? <p><b>Attention :</b> les messages supprimés ne sont pas placés "
+"dans la corbeille et sont donc définitivement perdus.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Voulez-vous vraiment supprimer le dossier <b>%1</b>"
-", tous ses sous-dossiers, ainsi que leur contenu ?"
-"<p><b>Attention :</b> les messages supprimés ne sont pas placés dans la "
-"corbeille et sont donc définitivement perdus.</qt>"
+"<qt>Voulez-vous vraiment supprimer le dossier <b>%1</b>, tous ses sous-"
+"dossiers, ainsi que leur contenu ?<p><b>Attention :</b> les messages "
+"supprimés ne sont pas placés dans la corbeille et sont donc définitivement "
+"perdus.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Supprimé"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -9052,8 +8898,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Voulez-vous vraiment rafraîchir le cache IMAP ?\n"
-"Ceci supprimera toutes les modifications que vous avez faites en local dans vos "
-"dossiers IMAP."
+"Ceci supprimera toutes les modifications que vous avez faites en local dans "
+"vos dossiers IMAP."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -9061,13 +8907,13 @@ msgstr "Voulez-vous vraiment faire expirer tous les anciens messages ?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"L'utilisation du HTML dans les messages vous rend plus vulnérable au « spam » "
-"et peut augmenter les risques de vulnérabilité et d'intrusion dans votre "
-"système."
+"L'utilisation du HTML dans les messages vous rend plus vulnérable au "
+"« spam » et peut augmenter les risques de vulnérabilité et d'intrusion dans "
+"votre système."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -9080,8 +8926,8 @@ msgstr "Utiliser le HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Le chargement des références externes dans les courriels HTML vous rend plus "
 "vulnérable au courriel indésirable et peut augmenter les risques de "
@@ -9101,8 +8947,8 @@ msgstr "Filtrer sur la liste de diffusion « %1 »..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "Les fonctionnalités de KMail pour répondre lors des absences utilisent un "
@@ -9126,7 +8972,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Impossible de démarrer l'afficheur des journaux GnuPG (« kwatchgnupg »). "
 "Veuillez vérifier votre installation."
@@ -9448,8 +9295,7 @@ msgstr "&Enregistrer les pièces jointes..."
 msgid "Appl&y All Filters"
 msgstr "Appli&quer tous les filtres"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&ppliquer les filtres"
@@ -9498,8 +9344,8 @@ msgstr "Colonne « &taille »"
 #: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Inverser l'ordre d'une colonne affichant la taille total des messages dans les "
-"dossiers."
+"Inverser l'ordre d'une colonne affichant la taille total des messages dans "
+"les dossiers."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9565,7 +9411,6 @@ msgstr "Message suivant non l&u"
 msgid "Go to the next unread message"
 msgstr "Aller au prochain message non lu"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Message &précédent"
@@ -9613,8 +9458,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Faire défiler le message courant vers le bas. À la fin du document, passer au "
-"message non lu suivant."
+"Faire défiler le message courant vers le bas. À la fin du document, passer "
+"au message non lu suivant."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9704,21 +9549,21 @@ msgstr " Initialisation..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ce message contient une demande d'accusé de réception.\n"
-"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse normale "
-"ou une autre indiquant que l'accusé de réception est « refusé »."
+"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse "
+"normale ou une autre indiquant que l'accusé de réception est « refusé »."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Ce message contient une demande d'accusé de réception.\n"
@@ -9729,8 +9574,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9738,26 +9583,26 @@ msgstr ""
 "Ce message contient une demande d'accusé de réception,\n"
 "mais cette demande concerne l'envoi de l'accusé de réception à plusieurs "
 "adresses électroniques.\n"
-"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse normale "
-"ou une autre indiquant que l'accusé de réception est « refusé »."
+"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse "
+"normale ou une autre indiquant que l'accusé de réception est « refusé »."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ce message contient une demande d'accusé de réception,\n"
 "mais aucune adresse de réponse n'a été trouvé.\n"
-"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse normale "
-"ou une autre indiquant que l'accusé de réception est « refusé »."
+"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse "
+"normale ou une autre indiquant que l'accusé de réception est « refusé »."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9766,8 +9611,8 @@ msgstr ""
 "Ce message contient une demande d'accusé de réception,\n"
 "mais les adresses de réponse sont différentes des adresses spécifiés par "
 "l'expéditeur.\n"
-"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse normale "
-"ou une autre indiquant que l'accusé de réception est « refusé »."
+"Vous pouvez ignorer cette demande ou laisser KMail envoyer une réponse "
+"normale ou une autre indiquant que l'accusé de réception est « refusé »."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9793,16 +9638,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Reçu : "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Pièce jointe : %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Cette pièce jointe a été supprimée."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "La pièce jointe « %1 » a été supprimée."
 
@@ -9850,46 +9695,39 @@ msgstr "Propriétés de la pièce jointe"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Le <em>type MIME</em> du fichier.</p> "
-"<p>Vous n'avez normalement pas à modifier ce réglage, car le type MIME du "
-"fichier est détecté automatiquement. Mais il peut arriver que « %1 » n'arrive "
-"pas à déterminer automatiquement le type. C'est ici que vous pouvez y "
-"remédier.</p></qt>"
+"<qt> <p>Le <em>type MIME</em> du fichier.</p> <p>Vous n'avez normalement pas "
+"à modifier ce réglage, car le type MIME du fichier est détecté "
+"automatiquement. Mais il peut arriver que « %1 » n'arrive pas à déterminer "
+"automatiquement le type. C'est ici que vous pouvez y remédier.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>La taille de l'élément :</p>"
-"<p>parfois « %1 » ne peut fournir qu'une estimation de la taille, car le calcul "
-"exact prendrait trop de temps. Lorsque c'est le cas, cela sera mis en évidence "
-"par l'ajout de « (estimée) » à la suite de la taille affichée.</p></qt>"
+"<qt> <p>La taille de l'élément :</p><p>parfois « %1 » ne peut fournir qu'une "
+"estimation de la taille, car le calcul exact prendrait trop de temps. "
+"Lorsque c'est le cas, cela sera mis en évidence par l'ajout de « (estimée) » "
+"à la suite de la taille affichée.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Le nom de fichier de l'élément.</p> "
-"<p>Il s'agit par défaut du nom du fichier que vous mettez en pièce jointe, mais "
-"ce n'est pas une obligation. Ce nom est utilisé par le logiciel de messagerie "
-"du destinataire lors de l'enregistrement sur disque de la pièce jointe.</p></qt>"
+"<qt> <p>Le nom de fichier de l'élément.</p> <p>Il s'agit par défaut du nom "
+"du fichier que vous mettez en pièce jointe, mais ce n'est pas une "
+"obligation. Ce nom est utilisé par le logiciel de messagerie du destinataire "
+"lors de l'enregistrement sur disque de la pièce jointe.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9897,18 +9735,15 @@ msgstr "&Description :"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Une description de l'élément.</p> "
-"<p>Il s'agit seulement d'une description informelle, un peu comme le sujet du "
-"message lui-même. La plupart des logiciels de messagerie afficheront cette "
-"description dans l'aperçu du message, à côté de l'icône de la pièce jointe.</p>"
-"</qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
+msgstr ""
+"<qt> <p>Une description de l'élément.</p> <p>Il s'agit seulement d'une "
+"description informelle, un peu comme le sujet du message lui-même. La "
+"plupart des logiciels de messagerie afficheront cette description dans "
+"l'aperçu du message, à côté de l'icône de la pièce jointe.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9916,23 +9751,21 @@ msgstr "Encoda&ge :"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>L'encodage pour l'envoi de l'élément.</p>"
-"<p>Vous n'avez normalement pas à modifier ce réglage, car « %1 » utilisera par "
-"défaut un encodage correct, dépendant du type MIME. Mais parfois, vous pourrez "
-"réduire significativement la taille du message résultant, par exemple si un "
-"document PostScript ne contient aucune donnée binaire. Dans ce cas, choisir "
-"« quoted-printable » plutôt que « base64 » pourra économiser jusqu'à 25 % sur "
-"la taille du message.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt> <p>L'encodage pour l'envoi de l'élément.</p><p>Vous n'avez normalement "
+"pas à modifier ce réglage, car « %1 » utilisera par défaut un encodage "
+"correct, dépendant du type MIME. Mais parfois, vous pourrez réduire "
+"significativement la taille du message résultant, par exemple si un document "
+"PostScript ne contient aucune donnée binaire. Dans ce cas, choisir « quoted-"
+"printable » plutôt que « base64 » pourra économiser jusqu'à 25 % sur la "
+"taille du message.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9940,20 +9773,17 @@ msgstr "Su&ggérer un affichage automatique"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cochez cette option si vous voulez suggérer au logiciel de courrier "
-"électronique de votre destinataire d'afficher l'élément automatiquement au lieu "
-"de le laisser l'afficher par icône.</p> "
-"<p>Techniquement cela est réalisé en définissant l'en-tête <em>"
-"Content-Disposition</em> comme « inline » plutôt que « attachment ». </p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Cochez cette option si vous voulez suggérer au logiciel de courrier "
+"électronique de votre destinataire d'afficher l'élément automatiquement au "
+"lieu de le laisser l'afficher par icône.</p> <p>Techniquement cela est "
+"réalisé en définissant l'en-tête <em>Content-Disposition</em> comme "
+"« inline » plutôt que « attachment ». </p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9961,16 +9791,13 @@ msgstr "&Signer cet élément"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cochez cette option si vous souhaitez que cet élément du message soit "
-"signé :</p>"
-"<p>la signature sera générée avec la clé que vous avez associée à l'identité "
-"actuellement sélectionnée.</p></qt>"
+"<qt><p>Cochez cette option si vous souhaitez que cet élément du message soit "
+"signé :</p><p>la signature sera générée avec la clé que vous avez associée à "
+"l'identité actuellement sélectionnée.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9978,13 +9805,11 @@ msgstr "C&hiffrer cet élément"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Si vous cochez cette option, l'élément sera chiffré.</p> "
-"<p>Il sera chiffré pour le destinataire de ce message.</p></qt>"
+"<qt><p>Si vous cochez cette option, l'élément sera chiffré.</p> <p>Il sera "
+"chiffré pour le destinataire de ce message.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9998,16 +9823,13 @@ msgstr "Filtre POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Messages à filtrer trouvés sur le compte POP : <b>%1</b>"
-"<p>La taille des messages affichés dépasse la taille maximale que vous avez "
-"définie pour ce compte."
-"<br>Vous pouvez décider de leur utilisation en cliquant sur le bouton "
+"Messages à filtrer trouvés sur le compte POP : <b>%1</b><p>La taille des "
+"messages affichés dépasse la taille maximale que vous avez définie pour ce "
+"compte.<br>Vous pouvez décider de leur utilisation en cliquant sur le bouton "
 "approprié."
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -10021,8 +9843,8 @@ msgstr "Messages filtrés : aucun"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Afficher les messages susceptibles d'être filtrés et marqués « à télécharger » "
-"ou « à supprimer »"
+"Afficher les messages susceptibles d'être filtrés et marqués « à "
+"télécharger » ou « à supprimer »"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10262,40 +10084,39 @@ msgstr "Le client de courrier électronique pour le bureau TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Réception du contenu du dossier</h2>"
-"<p>Veuillez patienter . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Réception du contenu du dossier</h2><p>Veuillez "
+"patienter . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Hors ligne</h2>"
-"<p>KMail est actuellement en mode hors ligne. Cliquez <a "
-"href=\"kmail:goOnline\">ici</a> pour être à nouveau en ligne . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Hors ligne</h2><p>KMail est actuellement en "
+"mode hors ligne. Cliquez <a href=\"kmail:goOnline\">ici</a> pour être à "
+"nouveau en ligne . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10303,13 +10124,12 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Bienvenue dans KMail %1</h2>"
-"<p>KMail est le client de messagerie électronique du bureau TDE. Il est conçu "
-"pour respecter les standards de messagerie d'Internet, comme « MIME », "
-"« SMTP », « POP3 » et « IMAP ».</p>\n"
-"<ul>"
-"<li>KMail dispose de nombreuses fonctionnalités décrites dans sa <a href=\"%2\">"
-"documentation</a></li>\n"
+"<h2 style='margin-top: 0px;'>Bienvenue dans KMail %1</h2><p>KMail est le "
+"client de messagerie électronique du bureau TDE. Il est conçu pour respecter "
+"les standards de messagerie d'Internet, comme « MIME », « SMTP », « POP3 » "
+"et « IMAP ».</p>\n"
+"<ul><li>KMail dispose de nombreuses fonctionnalités décrites dans sa <a href="
+"\"%2\">documentation</a></li>\n"
 "<li>Son <a href=\"%3\">site Internet</a> fournit des informations "
 "complémentaires sur les nouvelles versions</li></ul>\n"
 "%8\n"
@@ -10323,20 +10143,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; L'équipe de KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Prenez un moment pour configurer KMail dans le menu « Configuration » -&gt; "
-"« Configurer KMail ».\n"
+"<p>Prenez un moment pour configurer KMail dans le menu « Configuration » -"
+"&gt; « Configurer KMail ».\n"
 "Vous devez créer au moins une identité principale et une boîte à lettres "
 "(constituée d'un compte d'envoi et d'un compte de réception).</p>\n"
 
@@ -10345,8 +10163,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Changements importants</span> "
-"(par rapport à KMail %1) :</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Changements importants</"
+"span> (par rapport à KMail %1) :</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10377,13 +10195,14 @@ msgstr "Afficher les pièces jointes : %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail : la pièce jointe contient des données binaires. Essai d'affichage du "
 "premier caractère.]\n"
-"[KMail : la pièce jointe contient des données binaires. Essai d'affichage des "
-"%n premiers caractères.]"
+"[KMail : la pièce jointe contient des données binaires. Essai d'affichage "
+"des %n premiers caractères.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10408,14 +10227,16 @@ msgstr "Ouvrir la pièce jointe ?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "La suppression de cette pièce jointe peut rendre non valable la signature "
 "numérique de ce message."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "La modification de cette pièce jointe peut rendre non valable la signature "
 "numérique de ce message."
@@ -10438,6 +10259,58 @@ msgstr "(correspond à au moins un des critères suivants)"
 msgid "(match all of the following)"
 msgstr "(correspond à tous les critères suivants)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lecture"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Ancien"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Supprimé"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Répondu"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Transmis"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Mise en file"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Envoyés"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Vu"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignoré"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Courriel indésirable"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Courriel normal"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "À effectuer"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Possède une pièce jointe"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Message complet"
@@ -10510,15 +10383,16 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Problème critique : impossible de traiter les messages (plus d'espace libre ?). "
-"Le message problématique a été placé dans la boîte des messages envoyés."
+"Problème critique : impossible de traiter les messages (plus d'espace "
+"libre ?). Le message problématique a été placé dans la boîte des messages "
+"envoyés."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Le déplacement du message envoyé « %1 » de « À envoyer » vers « Messages "
 "envoyés » a échoué.\n"
@@ -10528,12 +10402,12 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Il n'est pas possible d'envoyer des messages sans spécifier d'adresse "
-"d'expéditeur. Veuillez définir l'adresse électronique de l'identité « %1 » dans "
-"la section « Identités » de la fenêtre de configuration et réessayer."
+"d'expéditeur. Veuillez définir l'adresse électronique de l'identité « %1 » "
+"dans la section « Identités » de la fenêtre de configuration et réessayer."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10558,11 +10432,11 @@ msgstr "Initialisation du processus d'émission..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Vous souhaitez envoyer tous les messages de la file en utilisant un transport "
-"non sécurisé, voulez-vous continuer ?"
+"Vous souhaitez envoyer tous les messages de la file en utilisant un "
+"transport non sécurisé, voulez-vous continuer ?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10586,16 +10460,17 @@ msgstr "Échec de l'envoi de (certains) messages en attente."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Impossible d'envoyer le message :\n"
 "%1\n"
-"Le message restera dans votre dossier « À envoyer » jusqu'à ce que le problème "
-"soit corrigé (par exemple une adresse non valable) ou que vous le déplaciez "
-"dans un autre dossier.\n"
+"Le message restera dans votre dossier « À envoyer » jusqu'à ce que le "
+"problème soit corrigé (par exemple une adresse non valable) ou que vous le "
+"déplaciez dans un autre dossier.\n"
 "Le protocole de transport suivant a été utilisé :\n"
 "  %2"
 
@@ -10605,21 +10480,17 @@ msgstr "Envoi des messages annulé."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Impossible d'envoyer le message :</p>"
-"<p>%1</p>"
-"<p>Le message restera dans votre dossier « À envoyer » jusqu'à ce que le "
-"problème soit corrigé (par exemple une adresse non valable) ou que vous le "
-"déplaciez dans un autre dossier.</p>"
-"<p>Le protocole de transport suivant a été utilisé : %2</p>"
-"<p>Voulez-vous continuer à envoyer les messages restants ?</p>"
+"<p>Impossible d'envoyer le message :</p><p>%1</p><p>Le message restera dans "
+"votre dossier « À envoyer » jusqu'à ce que le problème soit corrigé (par "
+"exemple une adresse non valable) ou que vous le déplaciez dans un autre "
+"dossier.</p><p>Le protocole de transport suivant a été utilisé : %2</"
+"p><p>Voulez-vous continuer à envoyer les messages restants ?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10637,16 +10508,17 @@ msgstr "&Annuler l'envoi"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Impossible d'envoyer le message :\n"
 "%1\n"
-"Le message restera dans votre dossier « À envoyer » jusqu'à ce que le problème "
-"soit corrigé (par exemple une adresse non valable) ou que vous le déplaciez "
-"dans un autre dossier.\n"
+"Le message restera dans votre dossier « À envoyer » jusqu'à ce que le "
+"problème soit corrigé (par exemple une adresse non valable) ou que vous le "
+"déplaciez dans un autre dossier.\n"
 "Le protocole de transport suivant a été utilisé :\n"
 " %2"
 
@@ -10666,8 +10538,10 @@ msgid ""
 msgstr ""
 "Impossible d'envoyer le message :\n"
 "%1\n"
-"Le message restera dans votre dossier « À envoyer » et sera envoyé à nouveau.\n"
-"Veuillez le supprimer de ce dossier si vous ne voulez pas qu'il soit renvoyé.\n"
+"Le message restera dans votre dossier « À envoyer » et sera envoyé à "
+"nouveau.\n"
+"Veuillez le supprimer de ce dossier si vous ne voulez pas qu'il soit "
+"renvoyé.\n"
 "Le protocole de transport suivant a été utilisé :\n"
 "  %2"
 
@@ -10688,46 +10562,46 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"Il semble que %1 est déjà en cours d'exécution sur un autre affichage de cette "
-"machine. L'exécution simultanée de plusieurs instances de %2 peut provoquer la "
-"perte de messages. Vous ne devriez pas démarrer %1 sans vous assurer qu'il "
-"n'est pas déjà en cours d'exécution."
+"Il semble que %1 est déjà en cours d'exécution sur un autre affichage de "
+"cette machine. L'exécution simultanée de plusieurs instances de %2 peut "
+"provoquer la perte de messages. Vous ne devriez pas démarrer %1 sans vous "
+"assurer qu'il n'est pas déjà en cours d'exécution."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "Il semble que %1 est en cours d'exécution sur un autre affichage de cette "
-"machine. L'exécution simultanée de %1 et%2 peut provoquer la perte de messages. "
-"Vous ne devriez pas démarrer %2 sans vous assurer que %1 n'est pas en cours "
-"d'exécution."
+"machine. L'exécution simultanée de %1 et%2 peut provoquer la perte de "
+"messages. Vous ne devriez pas démarrer %2 sans vous assurer que %1 n'est pas "
+"en cours d'exécution."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"Il semble que %1 est déjà en cours d'exécution sur %2. L'exécution simultanée "
-"de plusieurs instances de %1 peut provoquer la perte de messages. Vous ne "
-"devriez pas démarrer %1 sur cet ordinateur sans vous assurer qu'il n'est pas "
-"déjà en cours d'exécution sur %2."
+"Il semble que %1 est déjà en cours d'exécution sur %2. L'exécution "
+"simultanée de plusieurs instances de %1 peut provoquer la perte de messages. "
+"Vous ne devriez pas démarrer %1 sur cet ordinateur sans vous assurer qu'il "
+"n'est pas déjà en cours d'exécution sur %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"Il semble que %1 est en cours d'exécution sur un %3. L'exécution simultanée de "
-"%1 et%2 peut provoquer la perte de messages. Vous ne devriez pas démarrer %2 "
-"sans vous assurer que %1 n'est pas en cours d'exécution sur %3."
+"Il semble que %1 est en cours d'exécution sur un %3. L'exécution simultanée "
+"de %1 et%2 peut provoquer la perte de messages. Vous ne devriez pas démarrer "
+"%2 sans vous assurer que %1 n'est pas en cours d'exécution sur %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10738,6 +10612,10 @@ msgstr "Démarrer %1"
 msgid "Exit"
 msgstr "Quitter"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nouveaux messages dans"
@@ -10764,8 +10642,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet n'est pas disponible. Il est pourtant fortement recommandé de "
@@ -10833,8 +10712,8 @@ msgstr "Le nom de domaine ou l'adresse numérique du serveur SMTP."
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
 msgstr ""
-"Le numéro de port sur lequel le serveur SMTP écoute. Le port par défaut est le "
-"25."
+"Le numéro de port sur lequel le serveur SMTP écoute. Le port par défaut est "
+"le 25."
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10845,9 +10724,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Une commande à lancer localement, avant d'envoyer le courriel. Ceci peut servir "
-"à mettre en place les tunnels SSH par exemple. Laissez vide si aucune commande "
-"ne doit être lancée."
+"Une commande à lancer localement, avant d'envoyer le courriel. Ceci peut "
+"servir à mettre en place les tunnels SSH par exemple. Laissez vide si aucune "
+"commande ne doit être lancée."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10855,11 +10734,11 @@ msgstr "Le serveur exi&ge une identification"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Cochez cette option si votre serveur SMTP nécessite une authentification avant "
-"d'accepter un courriel. Ceci est connu comme « Authenticated SMTP » ou "
+"Cochez cette option si votre serveur SMTP nécessite une authentification "
+"avant d'accepter un courriel. Ceci est connu comme « Authenticated SMTP » ou "
 "simplement ASMTP."
 
 #: kmtransport.cpp:442
@@ -10880,15 +10759,14 @@ msgstr "Envo&yer un nom d'hôte personnalisé au serveur"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Cochez cette option pour que KMail utilise un nom d'hôte personnalisé en "
-"s'identifiant au serveur de courriel."
-"<p>Ceci est utile lorsque le nom d'hôte de votre système ne peut être réglé "
-"correctement ou pour masquer votre vrai nom d'hôte."
+"s'identifiant au serveur de courriel.<p>Ceci est utile lorsque le nom d'hôte "
+"de votre système ne peut être réglé correctement ou pour masquer votre vrai "
+"nom d'hôte."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10898,7 +10776,8 @@ msgstr "N&om d'hôte :"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Donner le nom d'hôte que KMail doit utiliser pour s'identifier sur le serveur."
+"Donner le nom d'hôte que KMail doit utiliser pour s'identifier sur le "
+"serveur."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10918,11 +10797,11 @@ msgstr "Seuls les fichiers locaux sont autorisés."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"L'hôte ne peut pas être vide. Veuillez saisir le nom ou l'adresse IP du serveur "
-"SMTP."
+"L'hôte ne peut pas être vide. Veuillez saisir le nom ou l'adresse IP du "
+"serveur SMTP."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10934,10 +10813,10 @@ msgstr "Erreur lors du listage du dossier %1 : "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "La désinscription locale de dossiers supprimera toutes les informations "
 "présentes localement sur ceux-ci. Ces dossiers ne seront pas modifiés sur le "
@@ -11162,36 +11041,30 @@ msgstr "Modifi&er le message"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> La structure des informations qui a été retournée par le module externe de "
-"cryptographie n'a pas été correctement calculée. Le module externe est "
-"peut-être endommagé.</p>"
-"<p>Veuillez contacter l'administrateur de votre système.</p></qt>"
+"<qt><p> La structure des informations qui a été retournée par le module "
+"externe de cryptographie n'a pas été correctement calculée. Le module "
+"externe est peut-être endommagé.</p><p>Veuillez contacter l'administrateur "
+"de votre système.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Aucun module externe de cryptographie n'a été trouvé, et le code OpenPGP "
-"incorporé n'a pas pu fonctionner correctement.</p> "
-"<p>Vous pouvez faire deux choses pour y remédier :</p> "
-"<ul>"
-"<li><em>soit</em> activer un module en utilisant la boîte de dialogue "
-"« Configuration / Configurer KMail / Modules externes de cryptographie »</li> "
-"<li><em>soit</em> spécifier les réglages traditionnels OpenPGP dans le même "
-"onglet de la boîte de dialogue « Identité / Options avancées »</li></ul>"
+"incorporé n'a pas pu fonctionner correctement.</p> <p>Vous pouvez faire deux "
+"choses pour y remédier :</p> <ul><li><em>soit</em> activer un module en "
+"utilisant la boîte de dialogue « Configuration / Configurer KMail / Modules "
+"externes de cryptographie »</li> <li><em>soit</em> spécifier les réglages "
+"traditionnels OpenPGP dans le même onglet de la boîte de dialogue "
+"« Identité / Options avancées »</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11203,11 +11076,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Le module Chiasmus ne propose pas la fonction « x-encrypt ». Veuillez rapporter "
-"ce bogue."
+"Le module Chiasmus ne propose pas la fonction « x-encrypt ». Veuillez "
+"rapporter ce bogue."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11223,16 +11096,16 @@ msgstr "Erreur de chiffrement Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Valeur de retour non attendue du module Chiasmus : la fonction « x-encrypt » "
 "n'a pas retourné de tableau d'octets. Veuillez rapporter ce bogue."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Le format de chiffrement OpenPGP dans le corps du message ne permet pas de "
@@ -11257,8 +11130,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Après examen des préférences de signature, il s'avère que vous avez demandé à "
-"être averti lors de l'envoi de messages à ce destinataire.\n"
+"Après examen des préférences de signature, il s'avère que vous avez demandé "
+"à être averti lors de l'envoi de messages à ce destinataire.\n"
 "Faut-il signer ce message ?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11288,8 +11161,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Vous avez demandé à ce que le message soit signé, mais aucune clé de signature "
-"valable n'a été configurée pour cette identité."
+"Vous avez demandé à ce que le message soit signé, mais aucune clé de "
+"signature valable n'a été configurée pour cette identité."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11306,7 +11179,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Certaines parties de ce message ne seront pas signées.\n"
-"L'envoi de messages partiellement signés peut enfreindre la politique du site.\n"
+"L'envoi de messages partiellement signés peut enfreindre la politique du "
+"site.\n"
 "Signer toutes les parties du message ?"
 
 #: messagecomposer.cpp:827
@@ -11346,12 +11220,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Après examen des préférences de chiffrement, il s'avère que vous avez demandé à "
-"être averti lors de l'envoi de messages à ce destinataire.\n"
+"Après examen des préférences de chiffrement, il s'avère que vous avez "
+"demandé à être averti lors de l'envoi de messages à ce destinataire.\n"
 "Faut-il chiffrer ce message ?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11375,9 +11249,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"<qt>"
-"<p>Il y a des conflits de préférences pour le chiffrement.</p>"
-"<p>Ce message doit-il être chiffré ?</p></qt>"
+"<qt><p>Il y a des conflits de préférences pour le chiffrement.</p><p>Ce "
+"message doit-il être chiffré ?</p></qt>"
 
 #: messagecomposer.cpp:909
 msgid "Do &Not Encrypt"
@@ -11385,8 +11258,9 @@ msgstr "Ne &pas chiffrer"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Vous avez demandé le chiffrement de ce message et le chiffrement d'une copie "
 "pour vous-même, mais aucune clé de chiffrement valable et sûre n'a été "
@@ -11399,13 +11273,13 @@ msgstr "Envoyer n&on chiffré ?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Certaines parties de ce message ne seront pas chiffrées.\n"
-"L'envoi de messages partiellement chiffrés peut enfreindre la politique du site "
-"et / ou compromettre certaines informations sensibles.\n"
+"L'envoi de messages partiellement chiffrés peut enfreindre la politique du "
+"site et / ou compromettre certaines informations sensibles.\n"
 "Faut-il chiffrer toutes les parties ?"
 
 #: messagecomposer.cpp:950
@@ -11416,8 +11290,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Ce message ne sera pas chiffré.\n"
-"L'envoi de messages non chiffrés peut enfreindre la politique du site et / ou "
-"compromettre certaines informations sensibles.\n"
+"L'envoi de messages non chiffrés peut enfreindre la politique du site "
+"et / ou compromettre certaines informations sensibles.\n"
 "Faut-il chiffrer le message ?"
 
 #: messagecomposer.cpp:955
@@ -11428,86 +11302,82 @@ msgstr "Chiffrer &toutes les parties"
 msgid "Unencrypted Message Warning"
 msgstr "Message chiffré"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Erreur : le module de cryptographie n'a pas retourné de données encodées.</p>"
-"<p>Veuillez rapporter ce bogue : "
-"<br>%2</p></qt>"
+"<qt><p>Erreur : le module de cryptographie n'a pas retourné de données "
+"encodées.</p><p>Veuillez rapporter ce bogue : <br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Certains caractères ne sont pas disponibles dans l'encodage choisi."
-"<br>"
-"<br>Voulez-vous envoyer le message ?</qt>"
+"<br><br>Voulez-vous envoyer le message ?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Certains caractères seront perdus"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Perdre les caractères"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Modifier l'encodage"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Impossible de signer ce message, car l'interface choisie ne semble pas gérer la "
-"signature. Ceci ne devrait pas se produire, veuillez signaler ce bogue."
+"Impossible de signer ce message, car l'interface choisie ne semble pas gérer "
+"la signature. Ceci ne devrait pas se produire, veuillez signaler ce bogue."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Impossible de signer ce message, car l'interface choisie ne semble pas gérer la "
-"signature. Ceci ne devrait pas se produire, veuillez signaler ce bogue."
+"Impossible de signer ce message, car l'interface choisie ne semble pas gérer "
+"la signature. Ceci ne devrait pas se produire, veuillez signaler ce bogue."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Journal détaillé de GnuPG pour cette opération de signature"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"Échec de la signature. Veuillez vérifier que le programme « gpg-agent » est en "
-"cours d'exécution."
+"Échec de la signature. Veuillez vérifier que le programme « gpg-agent » est "
+"en cours d'exécution."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Impossible de chiffrer ce message, car l'interface choisie ne semble pas gérer "
-"le chiffrement. Ceci ne devrait pas se produire, veuillez signaler ce bogue."
+"Impossible de chiffrer ce message, car l'interface choisie ne semble pas "
+"gérer le chiffrement. Ceci ne devrait pas se produire, veuillez signaler ce "
+"bogue."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Journal détaillé de GnuPG pour cette opération de chiffrement"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Impossible de chiffrer et de signer ce message, car l'interface choisie ne "
 "semble pas pouvoir combiner chiffrement et signature. Ceci ne devrait pas se "
@@ -11532,10 +11402,10 @@ msgstr "&Format de la boîte aux lettres :"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Sélectionnez si vous souhaitez stocker les messages dans un dossier avec un "
 "fichier par message (« maildir ») ou dans un seul gros fichier (« mbox »). "
@@ -11550,13 +11420,13 @@ msgstr "Le dossier &contient :"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Sélectionnez cette option si vous souhaitez que le nouveau dossier stock du "
-"courriel ou qu'il contienne des éléments de travail en groupe, comme des tâches "
-"ou des notes. Le choix par défaut est de contenir du courrier. Si vous n'êtes "
-"pas sûr, laissez cette option comme telle."
+"courriel ou qu'il contienne des éléments de travail en groupe, comme des "
+"tâches ou des notes. Le choix par défaut est de contenir du courrier. Si "
+"vous n'êtes pas sûr, laissez cette option comme telle."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11594,8 +11464,7 @@ msgstr "Résultats différents pour les signatures"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Le moteur de cryptographie n'a pas retourné de données en texte clair."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "État : "
 
@@ -11610,7 +11479,8 @@ msgstr "Le module externe de cryptographie « %1 » n'est pas initialisé."
 #: objecttreeparser.cpp:692
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr ""
-"Le module externe de cryptographie « %1 » ne peut pas vérifier les signatures."
+"Le module externe de cryptographie « %1 » ne peut pas vérifier les "
+"signatures."
 
 #: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 msgid "No appropriate crypto plug-in was found."
@@ -11625,8 +11495,8 @@ msgstr "Aucun module externe « %1 » n'a été trouvé."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Le message est signé, mais il est impossible de vérifier la validité de la "
 "signature. <br />La raison est : %1"
@@ -11665,28 +11535,28 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Remarque :</b> ce message HTML peut contenir des références externes à des "
-"images, etc. Pour des raisons de sécurité / confidentialité, les références "
-"externes ne sont pas chargées. Si vous avez confiance en l'expéditeur de ce "
-"message, vous pouvez alors charger ses références externes en cliquant <a "
-"href=\"kmail:loadExternal\">ici</a>."
+"<b>Remarque :</b> ce message HTML peut contenir des références externes à "
+"des images, etc. Pour des raisons de sécurité / confidentialité, les "
+"références externes ne sont pas chargées. Si vous avez confiance en "
+"l'expéditeur de ce message, vous pouvez alors charger ses références "
+"externes en cliquant <a href=\"kmail:loadExternal\">ici</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Nota :</b> ceci est un message HTML. Pour des raisons de sécurité, seul le "
-"code brut HTML est affiché. Si vous avez confiance dans l'expéditeur de ce "
-"message, vous pouvez activer l'affichage formaté du code HTML pour ce message "
-"en cliquant <a href=\"kmail:showHTML\">ici</a>."
+"<b>Nota :</b> ceci est un message HTML. Pour des raisons de sécurité, seul "
+"le code brut HTML est affiché. Si vous avez confiance dans l'expéditeur de "
+"ce message, vous pouvez activer l'affichage formaté du code HTML pour ce "
+"message en cliquant <a href=\"kmail:showHTML\">ici</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11703,8 +11573,7 @@ msgstr "Message transmis"
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr ""
-"Désolé, les certificats ne peuvent pas être importés."
-"<br>La raison est : %1"
+"Désolé, les certificats ne peuvent pas être importés.<br>La raison est : %1"
 
 #: objecttreeparser.cpp:1668
 msgid "Sorry, no certificates were found in this message."
@@ -11938,12 +11807,12 @@ msgstr "stocké : "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Aucune adresse électronique n'est stockée dans le « %1 » utilisé pour signer. "
-"De ce fait, il est impossible de la comparer avec l'adresse de l'expéditeur "
-"« %2 »."
+"Aucune adresse électronique n'est stockée dans le « %1 » utilisé pour "
+"signer. De ce fait, il est impossible de la comparer avec l'adresse de "
+"l'expéditeur « %2 »."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11998,8 +11867,8 @@ msgstr "Le message a été signé par « %2 » (clé numéro : %1)."
 #: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr ""
-"La signature est valable, mais il est impossible de déterminer la validité de "
-"la clé."
+"La signature est valable, mais il est impossible de déterminer la validité "
+"de la clé."
 
 #: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
@@ -12060,24 +11929,27 @@ msgstr "Message d'erreur du module d'entrée / sortie"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Votre serveur POP3 (compte : %1) ne gère pas la commande « UIDL ». Cette "
-"commande est nécessaire pour déterminer de façon fiable quels messages situés "
-"sur le serveur ont déjà été lus.\n"
-"L'option permettant de laisser des messages sur le serveur ne fonctionnera donc "
-"pas correctement."
+"commande est nécessaire pour déterminer de façon fiable quels messages "
+"situés sur le serveur ont déjà été lus.\n"
+"L'option permettant de laisser des messages sur le serveur ne fonctionnera "
+"donc pas correctement."
 
 #: popaccount.cpp:752
 msgid ""
 "_n: Fetched 1 message from %1. Deleting messages from server...\n"
 "Fetched %n messages from %1. Deleting messages from server..."
 msgstr ""
-"Récupération de %n message dans %1. Suppression du message sur le serveur...\n"
-"Récupération de %n messages dans %1. Suppression des messages sur le serveur..."
+"Récupération de %n message dans %1. Suppression du message sur le "
+"serveur...\n"
+"Récupération de %n messages dans %1. Suppression des messages sur le "
+"serveur..."
 
 #: popaccount.cpp:762 popaccount.cpp:782
 msgid ""
@@ -12089,10 +11961,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Réception du message %1 sur %2 (%3 sur %4 ko) pour « %5@%6 » (%7 ko restent sur "
-"le serveur)."
+"Réception du message %1 sur %2 (%3 sur %4 ko) pour « %5@%6 » (%7 ko restent "
+"sur le serveur)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -12108,1946 +11981,16 @@ msgstr "Réponse du serveur non valable"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Votre serveur ne gère pas la commande TOP. Il n'est pas donc pas possible de "
 "recevoir uniquement les en-têtes des messages volumineux avant de les "
 "télécharger."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Aller"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "D&ossier"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Message"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Réponse spéciale"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Transmettre"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barre d'outils HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signature"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Signer &automatiquement les messages"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Quand cette option est activée, tous les messages que vous enverrez seront "
-"signés par défaut. Bien sûr, il est toujours possible de désactiver la "
-"signature individuellement pour chaque message."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Chiffrement"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Lors du chiffrement des courriels, toujours utiliser le &certificat de ma "
-"propre identité"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Lorsque cette option est activée, le message / fichier n'est pas seulement "
-"chiffré avec la clé publique du destinataire, mais également avec votre clé. "
-"Ceci vous permet de déchiffrer le message / fichier par la suite. Il s'agit "
-"généralement d'une bonne idée."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Afficher le texte s&igné / chiffré après l'édition"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Lorsque cette option est activée, le texte signé / chiffré est affiché dans une "
-"fenêtre séparée, ce qui vous permet de savoir à quoi il ressemble avant de "
-"l'envoyer. Cela vous permet de vérifier que votre système de chiffrement "
-"fonctionne."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Enregistrer l&es messages envoyés chiffrés"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Vérifier les messages chiffrés qui sont enregistrés"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Enregistrer les messages chiffrés</h1>\n"
-"Quand cette case est cochée, les messages envoyés sont enregistrés chiffrés "
-"comme ils ont été envoyés. Ce n'est pas recommandé, car vous ne pourrez plus "
-"lire les messages si le certificat expire.\n"
-"<p>\n"
-"Cependant, il peut y avoir des politiques de sécurité dans votre société qui "
-"nécessitent d'activer cette option. En cas de doute, vérifiez avec "
-"l'administrateur de votre système.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Toujours afficher les clés de chi&ffrement"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Si cette option est activée, l'application vous montrera toujours la liste des "
-"clés publiques, vous permettant de choisir celle que vous voulez utiliser pour "
-"le chiffrement. Si l'option est désactivée, la fenêtre ne sera affichée que "
-"lorsque plusieurs clés peuvent être utilisées ou, au contraire, qu'aucune clé "
-"n'a été trouvée."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "C&hiffrer automatiquement les messages si possible"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Quand cette option est activée, tout message que vous enverrez sera chiffré si "
-"cela est possible et désiré. Bien sûr, il est toujours possible de désactiver "
-"le chiffrement automatique pour chaque message individuellement."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Ne &jamais signer / chiffrer lors de l'enregistrement d'un brouillon"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Comment cela fonctionne ?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "À : "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC : "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universel"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Répondre"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Répondre à tous"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Transmettre"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Racco&urci clavier :"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Type de modèle :"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Propriétés du dossier"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Le dossier gère une liste de di&ffusion"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "L&iste d'adresses :"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal :"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Non &lu :"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Expiration des messages"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Faire e&xpirer les messages après le :"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Faire expirer les messa&ges lus "
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Faire expirer a&près le :"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Faire expirer les messages n&on lus"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "jour(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "semaine(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "mois"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Options avancées"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Identité de l'émetteur :"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Format de stockage :"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Liste des vues :"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-"Valider les certificats à l'aide des listes de révocation de certificats"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Si cette option est sélectionnée, les certificats S/MIME sont validés à l'aide "
-"des listes de révocation de certificats (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Valider les certificats en ligne (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Si cette option est sélectionnée, les certificats S/MIME sont validés en ligne "
-"en utilisant le protocole de vérification en ligne de l'état des certificats "
-"(OCSP). Saisissez ci-dessous l'URL du serveur OCSP."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Validation des certificats en ligne"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL du serveur OCSP :"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Saisissez ici l'adresse du serveur pour la validation en ligne des certificats "
-"(OCSP). Elle commence habituellement par « http:// »."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Signature du serveur OCSP :"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorer les URL de services de certificats"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Ne pas vérifier les politiques des certificats"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Par défaut, GnuPG utilise le fichier « ~/.gnupg/policies.txt » pour vérifier si "
-"une politique de certificat est autorisée. Si cette option est cochée, les "
-"politiques ne sont pas vérifiées."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Ne jamais consulter de liste de révocation de certificats"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"SI cette option est cochée, les listes de révocation de certificats ne sont "
-"jamais utilisées pour valider les certificats S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Télécharger les certificats émetteurs manquants"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Si cette option est cochée, les certificats émetteurs manquants sont "
-"téléchargés lorsque c'est nécessaire (ceci s'applique aux deux méthodes de "
-"validation, CRL et OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Requêtes HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Ne jamais effectuer de requêtes HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Désactiver complétement l'utilisation du protocole HTTP pour S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Utiliser ce serveur mandataire (proxy) pour les requêtes HTTP : "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Utiliser le serveur mandataire HTTP du système :"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Si cette option est sélectionnée, le serveur mandataire HTTP affiché à droite "
-"(provenant de la variable d'environnement « http_proxy) sera utilisé pour "
-"toutes les requêtes HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Saisissez ici l'emplacement de votre serveur mandataire HTTP, qui sera utilisé "
-"pour toutes les requêtes HTTP relatives à S/MIME. La syntaxe est "
-"« machine:port », comme par exemple « monproxy.nulpart.com:3128 »."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-"Ignorer les points HTTP de distribution de liste de révocation de certificats"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Lors de la recherche de l'emplacement d'une liste de révocation de certificats "
-"(« CRL »), le certificat à tester contient toujours des points de distribution "
-"de CRL (« DP »), qui représentent des URL permettant d'accéder à l'adresse. La "
-"première entrée « DP » trouvée est utilisée. Avec cette option, l'ensemble des "
-"entrées utilisant un modèle HTTP est ignoré lors de la recherche d'un « DP » "
-"convenable."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Requêtes LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Ne jamais effectuer de requêtes LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Désactiver complétement l'utilisation du protocole LDAP pour S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-"Ignorer les points LDAP de distribution de liste de révocation de certificats"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Lors de la recherche de l'emplacement d'une liste de révocation de certificats "
-"(« CRL »), le certificat à tester contient toujours des points de distribution "
-"de CRL (« DP »), qui représentent des URL permettant d'accéder à l'adresse. La "
-"première entrée « DP » trouvée est utilisée. Avec cette option, l'ensemble des "
-"entrées utilisant un modèle LDAP est ignoré lors de la recherche d'un « DP » "
-"convenable."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Hôte primaire pour les requêtes LDAP :"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"La saisie d'un serveur LDAP ici permettra de lui envoyer toutes les requêtes "
-"LDAP en premier. En effet, ce paramètre est prioritaire à tout nom de machine "
-"ou numéro de port d'une URL LDAP, et il sera également utilisé si ces "
-"informations sont absentes de l'URL. Les autres serveurs LDAP seront uniquement "
-"utilisés dans le cas où la connexion au serveur mandataire (proxy) échoue.\n"
-"La syntaxe est « machine » ou « machine:port ». Si le port est omis, le 389 "
-"(port LDAP par défaut) sera utilisé."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Ajouter un fragment"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "A&jouter"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Fragment :"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Groupe :"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Configuration des fragments"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Infobulles"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Afficher les fragments de texte dans une infobulle"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Décide s'il faut afficher une infobulle contenant le texte d'une ligne marquée"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variables"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Mode de saisie pour les variables"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Une seule boîte de dialogue pour chaque variable d'un fragment"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-"Une boîte de saisi s'affichera pour chacune des variables d'un fragment"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Une boîte de dialogue pour toutes les variables d'un fragment"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Une seule boîte de dialogue s'affichera, dans laquelle vous pourrez saisir les "
-"valeurs de toutes les variables d'un fragment"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Délimiteur :"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Configuration des modèles"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Répondre à l'expéditeur"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Répondre à tous / Répondre à la liste"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Message transmis"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "A&vertir lorsqu'on essaye d'envoyer des messages non signés"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Cocher pour être averti lors des tentatives d'envoi de messages non signés."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir lors d'une tentative d'envoi de messages non signés</h1>\n"
-"Si cette case est cochée, vous serez averti quand vous essayerez d'envoyer des "
-"parties ou le message complet non signé.\n"
-"<p>\n"
-"Il est recommandé de laisser cette option activée pour une intégrité maximale.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "A&vertir lorsqu'on essaye d'envoyer des messages non chiffrés"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Avertir quand vous essayez d'envoyer des messages non chiffrés."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir quand vous essayez d'envoyer des messages non chiffrés</h1>\n"
-"Si cette case est cochée, vous serez averti quand vous essayerez d'envoyer des "
-"parties ou des messages entiers non chiffrés.\n"
-"<p>\n"
-"Il est recommandé de laisser cette option activée pour une sécurité maximale.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Avertir si l'adresse électronique du des&tinataire n'est pas dans le certificat"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Cochez pour être averti si l'adresse n'est pas dans le certificat"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir si l'adresse électronique du destinataire n'est pas dans le "
-"certificat</h1>\n"
-"Si cette option est activée, un avertissement est lancé si l'adresse "
-"électronique du destinataire n'est pas contenue dans le certificat utilisé pour "
-"le chiffrement.\n"
-"<p>\n"
-"Il est recommandé de laisser cette option activée pour une sécurité maximale.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Avertir lorsqu'un certificat ou une clé est sur le point d'expirer (configurez "
-"les seuils ci-dessous)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Pour la signature"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Pour le chiffrement"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " jours"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Déterminer le nombre de jours ici"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir si le certificat de signature expire</h1>\n"
-"Cette option vous permet de choisir le nombre minimal de jours pendant lesquels "
-"le certificat de signature doit être valable sans lancer d'avertissement.\n"
-"<p> Le réglage recommandé pour SPHINX est 14 jours.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir si le certificat de chiffrement expire</h1>\n"
-"Avec cette option, vous pouvez choisir le nombre minimal de jours pendant "
-"lequel le certificat de chiffrement doit être valable sans lancer "
-"d'avertissement.\n"
-"<p>\n"
-"Le réglage SPHINX recommandé est 14 jours.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir si un certificat dans la chaîne expire</h1>\n"
-"Sélectionner le nombre minimum de jours pendant lesquels tous les certificats "
-"dans la chaîne de certificats doivent être valables sans lancer "
-"d'avertissement.\n"
-"<p>\n"
-"Le réglage recommandé par SPHINX est 14 jours.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir si le certificat issu d'une autorité de certification expire</h1>\n"
-"Choisir le nombre minimum de jours pendant lequel le certificat d'une autorité "
-"de certification doit être valable sans lancer d'avertissement.\n"
-"<p>\n"
-"Le réglage SPHINX recommandé est 14 jours.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avertir si le certificat racine expire</h1>\n"
-"Cette option vous permet de choisir le nombre minimum de jours pendant lesquels "
-"le certificat racine doit être valable sans lancer d'avertissement.\n"
-"<p>\n"
-"Le réglage SPHINX recommandé est 14 jours.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Pour les certificats racines :"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Pour les certificats du tiers de confiance :"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Pour les certificats et clés de l'utilisateur final :"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Réactiver tous les avertissements « Ne plus demander »"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Contenu du modèle"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Raccourci clavier du modèle"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Type de modèle"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Envoyer les messages en attente lors de la vérification du courriel"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Sélectionnez si vous souhaitez que KMail envoie les messages de la boîte "
-"d'envoi lors de toutes les vérifications de nouveaux messages, uniquement lors "
-"des vérifications manuelles, ou si vous ne voulez pas qu'ils soient envoyés "
-"automatiquement.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Déplacer automatiquement les courriels non synchronisés des dossiers sur "
-"lesquels les droits d'accès ne sont pas suffisants"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Il existe de nouveaux messages dans ce dossier n'ayant pas encore été envoyés "
-"au serveur, mais il semble que vous n'avez pas les droits suffisants pour les "
-"expédier. Ces messages seront déplacés automatiquement dans un dossier « perdus "
-"et trouvés »."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Autoriser les drapeaux locaux dans les dossiers en lecture seule"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Cette option permet aux administrateurs de définir un délai minimum entre deux "
-"vérifications de courriels. L'utilisateur ne pourra pas choisir de valeur "
-"inférieure à la valeur définie ici."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"Le dernier dossier sélectionné dans la fenêtre de sélection des dossiers."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Ne pas utiliser le paramètre « umask » de l'utilisateur et le remplacer par un "
-"lecture / écriture pour l'utilisateur uniquement"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politique d'affichage de l'icône dans la boîte à miniatures"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Fermer l'application lorsque la fenêtre principale est fermée, même si l'icône "
-"dans la boîte à miniatures est active."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Détailler la notification d'arrivée de nouveaux messages"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Si cette option est cochée, la notification affiche le nombre de nouveaux "
-"messages pour chaque dossier. Sinon, elle vous indique simplement que du "
-"courriel est arrivé."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Nom de l'éditeur :"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Utiliser un éditeur de message e&xterne"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"Le seuil d'avertissement utilisateur d'un dossier proche de la limite de son "
-"quota."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Activer les fonctionnalités pour le travail en groupe"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-"Inverser les champs expéditeur et destinataire lors des réponses aux réponses"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"L'implantation du standard iCalendar dans Microsoft Outlook souffre "
-"d'imperfections auxquelles cette option tente de pallier. Si certains "
-"utilisateurs de ce logiciel ne peuvent pas lire vos réponses, essayez d'activer "
-"cette option."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Envoyer les invitations dans le corps du message"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"L'implantation du standard iCalendar dans Microsoft Outlook souffre "
-"d'imperfections auxquelles cette option tente de pallier. Si certains "
-"utilisateurs de ce logiciel ne peuvent pas lire vos invitations, essayez "
-"d'activer cette option."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Nommage des invitations compatible avec Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook, utilisé avec un serveur Microsoft Exchange, a un problème "
-"avec les standards de messagerie. Activer cette option pour envoyer des "
-"invitations que Microsoft Exchange pourra interpréter."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Lorsque cette option est cochée, vous ne verrez plus la fenêtre de rédaction du "
-"courriel. À la place, tous les courriers électroniques d'invitations sont "
-"envoyés automatiquement. Si vous souhaitez consulter le courriel avant de "
-"l'envoyer, vous pouvez décocher cette option. Cependant, soyez conscient que le "
-"texte dans la fenêtre de rédaction utilise la syntaxe iCalendar, et que vous ne "
-"devriez pas essayer de le retoucher à la main."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-"Supprimer les courriels d'invitations après qu'une réponse ait été envoyée"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Lorsque cette option est activée, les courriels d'invitations auxquels vous "
-"avez répondus seront déplacés dans le dossier corbeille, une fois la réponse "
-"envoyée correctement."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>L'activation de cette option permet d'enregistrer les entrées des "
-"applications Kontact (KOrganizer, KAddressBook et KNotes).</p>"
-"<p>Si vous activez cette fonction, il faut également que les applications "
-"utilisent la ressource IMAP. Cela se configure dans le Centre de Configuration "
-"de TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>L'affichage des dossiers contenant les ressources IMAP est souvent sans "
-"intérêt. Si vous souhaitez tout de même les voir, vous pouvez le définir "
-"ici.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Si le compte utilisé pour stocker les informations du travail en groupe "
-"n'est pas utilisé pour gérer du courriel normal, activez cette option pour "
-"n'afficher que les dossiers inclus dans celui-ci. Ceci est utile lorsque vous "
-"gérez des courriers normaux via un compte IMAP connecté additionnel.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Choisissez le format de stockage des dossiers de travail en groupe. "
-"<ul> "
-"<li>Le format par défaut est d'utiliser les standards ical (pour les dossiers "
-"de calendrier) et vcard (pour les dossiers de carnet d'adresses). Ce format "
-"permet de rendre disponibles toutes les possibilités de Kontact.</li>"
-"<li>Le format XML de Kolab utilise un schéma personnalisé qui correspond plus "
-"précisément à celui utilisé dans Outlook. Ce format permet une compatibilité "
-"accrue avec Outlook, lors de l'utilisation d'un serveur Kolab ou d'une solution "
-"compatible.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Ceci permet de choisir le dossier parent des dossiers des ressources "
-"IMAP.</p>"
-"<p>Par défaut, le serveur Kolab choisit la boîte de réception IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>L'identifiant du compte contenant les dossiers des ressources IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Si vous voulez définir le nom des dossiers IMAP dans votre langue, vous "
-"pouvez choisir parmi les langues disponibles.</p> "
-"<p>Notez que seule la compatibilité avec Microsoft Outlook justifie cette "
-"option. Cependant, c'est une mauvaise idée de l'activer, car il sera alors "
-"impossible de changer la langue.</p> "
-"<p>N'utilisez donc cette option que si vous n'avez pas le choix.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-"Filtrer également les nouveaux courriels reçus dans les dossier de travail "
-"collaboratif."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Synchroniser les changements de travail en groupe dans les dossiers DIMAP "
-"immédiatement après la mise en ligne."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Ceci permet d'afficher ou non l'introduction de KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Nombre de connexions maximales par serveur"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ceci peut être utilisé pour limiter le nombre de connexions par serveur lors de "
-"la vérification de nouveaux messages. Par défaut, le nombre de connexions est "
-"illimité (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Afficher le champ de recherche rapide"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Cette option active ou désactive le champ de recherche rapide au-dessus de la "
-"liste des messages, qui permet d'effectuer une recherche rapidement parmi les "
-"informations contenues dans la liste des messages."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Masquer la boîte locale si elle est inutilisée"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Transmission intégrée par défaut."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Autoriser l'usage du point-virgule (« ; ») comme séparateur dans l'éditeur."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Utiliser le jeu de caractères du message d'origine pour, si possible, répondre "
-"ou transmettre."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Ajout&er automatiquement la signature"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Se souvenir de cette identité, de telle manière qu'elle sera utilisée également "
-"dans les futures fenêtres de rédaction.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Se souvenir de ce dossier pour les éléments envoyés, de façon à ce qu'il soit "
-"également utilisé dans les futures fenêtres de rédaction."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Se souvenir de cet agent de transport de courrier, de telle manière qu'il sera "
-"utilisé également dans les futures fenêtres d'édition."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Se souvenir de cette identité, de telle manière qu'elle sera utilisée également "
-"dans les futures fenêtres de rédaction.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Césure auto&matique à la colonne :"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Nombre maximal de lignes dans l'éditeur de destinataires."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Activez cette option pour rendre compréhensibles à Outlook(tm) les noms des "
-"pièces jointes contenant des caractères non anglais."
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Notifications de réponse automatique au &message"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Activez cette option si vous voulez que KMail demande un accusé de réception "
-"(MDN) pour chaque message que vous envoyez.</p>"
-"<p>Le choix de cette option affecte tous les messages. Vous pouvez activer ou "
-"désactiver individuellement les accusés de réception dans la fenêtre de "
-"rédaction en utilisant le menu « <em>Options</em> / <em>"
-"Accusés de réception</em> ».</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Utiliser les adresses récentes pour l'auto-complètement"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Désactivez cette option si vous ne souhaitez pas que les adresses récentes "
-"apparaissent dans la liste d'adresses suggérées dans le composeur."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Intervalle d'enregistrement automatique :"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Une copie de sauvegarde du texte présent dans la fenêtre de rédaction peut être "
-"créée à intervalles réguliers. L'intervalle utilisé pour créer les sauvegardes "
-"est défini ici. Vous pouvez désactiver l'enregistrement automatique en lui "
-"affectant la valeur 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Insérer la signature au-dessus de la citation"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Remplacer les préfi&xes reconnus par « Re : »"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Remplacer les préfixes reconnus par « &Fwd : »"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Utiliser les citations élégantes"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "La signature est expirée."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Type de sélecteur de destinataire"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Définit le type de boîte de dialogue permettant de sélectionner\n"
-"les destinataires pour les champs « À », « CC » et « BCC »."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Type de sélecteur de destinataires"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Définit le type d'éditeur de destinataires pour les champs \n"
-"« À », « CC » et « BCC »."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Nombre maximal de lignes dans l'éditeur de destinataires."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Liste des types de parties de messages permettant d'enlever les courriels "
-"transmis dans le contenu d'un autre message."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "La taille maximale en Mo que les pièces jointes peuvent avoir."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-"Afficher le gestionnaire de fragments de texte et le panneau d'insertion dans "
-"l'éditeur."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Afficher le journal détaillé de GnuPG même après les opérations de chiffrement "
-"qui se sont déroulées correctement."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Utiliser le jeu de caractères du message d'origine pour, si possible, répondre "
-"ou transmettre."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Certains courriers électroniques, et plus particulièrement ceux générés "
-"automatiquement, ne précisent pas l'encodage de caractères permettant de les "
-"afficher convenablement. Dans ce cas, un encodage de caractères spécifique sera "
-"utilisé, et vous pouvez le configurer ici. Choisissez l'encodage de caractères "
-"généralement utilisé dans votre partie du monde. L'encodage du système sera "
-"utilisé par défaut."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Le changement de ce champ à l'option « Auto » forcera l'utilisation de "
-"l'encodage précisé pour tous les courriels, quel que soit celui qu'ils "
-"préconisent."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Activez cette option si vous souhaitez que les caractères telles que :-) "
-"apparaissent dans les messages comme des émoticônes (de petites images)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Activer cette option pour afficher les différents niveaux de citations. "
-"Désactivez-la pour les cacher."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Niveau de réduction automatique :"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Réduire la taille de la police pour les citations"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Activer cette option pour afficher les citations dans une police plus petite."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Enregistrer l&es messages envoyés chiffrés"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Afficher le client dans les en-têtes décoratifs"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Activer cette option pour afficher le client et la balise « X-Mailer » dans les "
-"en-têtes décoratifs."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Autoriser la suppression des pièces jointes des courriels existants."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Autoriser la modification des pièces jointes des courriels existants."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-"Toujours déchiffrer les messages à l'affichage, ou demander avant chaque "
-"déchiffrage"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Envoyer les accusés de réception avec un expéditeur vide"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Envoyer les accusés de réception avec un expéditeur vide. Certains serveurs "
-"peuvent être configurés pour refuser ce genre de messages. Si vous avez des "
-"problèmes pour envoyer les accusés de réception, décochez cette option."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Les expressions ont été converties en modèles"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Les anciennes expressions ont été converties en modèles"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Modèle pour les nouveaux messages"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Modèle de message pour la réponse"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Modèle de message pour la réponse à tous"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Modèle de message pour la transmission"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Marques de citation"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-"Autoriser la modification de la configuration des réponses « Pas au bureau » "
-"par l'utilisateur."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Autoriser les utilisateurs à envoyer des scripts Sieve « Pas au bureau », mais "
-"leur interdire le changement de la configuration, comme le domaine demandant "
-"une réaction et le sélecteur de réaction contre les courriels indésirables."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Autoriser l'envoi des réponses « Pas au bureau » aux courriels de ce domaine "
-"uniquement."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Autoriser l'envoi des réponses « Pas au bureau » aux courriels indésirables."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Vérifier s'il existe toujours une réponse « Pas au bureau » active au démarrage "
-"de KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 sur %2 %3 utilisé"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14157,6 +12100,11 @@ msgstr "Ajouter en tant que « CC »"
 msgid "Add as BCC"
 msgstr "Ajouter en tant que « BCC »"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Annuler"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14172,15 +12120,15 @@ msgstr "Destinataires sélectionnés"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Vous avez sélectionné %n destinataire. Le nombre maximal géré est %1. Veuillez "
-"adapter votre sélection.\n"
-"Vous avez sélectionné %n destinataires. Le nombre maximal géré est %1. Veuillez "
-"adapter votre sélection."
+"Vous avez sélectionné %n destinataire. Le nombre maximal géré est %1. "
+"Veuillez adapter votre sélection.\n"
+"Vous avez sélectionné %n destinataires. Le nombre maximal géré est %1. "
+"Veuillez adapter votre sélection."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -14196,11 +12144,11 @@ msgstr "Utiliser la fenêtre de sélection d'adresses"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Ce bouton ouvre une fenêtre séparée dans laquelle vous pouvez sélectionner les "
-"destinataires de toutes les adresses disponibles."
+"Ce bouton ouvre une fenêtre séparée dans laquelle vous pouvez sélectionner "
+"les destinataires de toutes les adresses disponibles."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14302,10 +12250,19 @@ msgstr "est supérieur ou égal à"
 msgid " bytes"
 msgstr " octets"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " jours"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Pour exécuter votre recherche, tous les messages du dossier %1 doivent être "
 "téléchargés depuis le serveur. Cela risque de prendre un certain temps. "
@@ -14455,16 +12412,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Collection des données du compte « %1 »...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Collection des données du compte « %1 »...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14483,10 +12436,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Contenu du script « %1 » :\n"
+msgid "Contents of script '%1':\n"
+msgstr "Contenu du script « %1 » :\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14509,20 +12460,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Capacités Sieve :\n"
+msgid "Sieve capabilities:\n"
+msgstr "Capacités Sieve :\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Aucune capacité spécifique disponible)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Scripts Sieve disponibles :\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Scripts Sieve disponibles :\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14571,8 +12518,8 @@ msgstr ""
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
 msgstr ""
-"Cliquez avec le bouton droit sur les éléments ci-dessous pour obtenir de l'aide "
-"sur les méthodes de saisie."
+"Cliquez avec le bouton droit sur les éléments ci-dessous pour obtenir de "
+"l'aide sur les méthodes de saisie."
 
 #: signatureconfigurator.cpp:72
 msgid ""
@@ -14602,12 +12549,12 @@ msgstr "Utilisez ce champ pour saisir une signature statique arbitraire."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Utilisez ce champ pour indiquer le fichier texte contenant votre signature. Il "
-"sera lu chaque fois que vous créerez un nouveau message ou que vous ajouterez "
-"une nouvelle signature."
+"Utilisez ce champ pour indiquer le fichier texte contenant votre signature. "
+"Il sera lu chaque fois que vous créerez un nouveau message ou que vous "
+"ajouterez une nouvelle signature."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14623,22 +12570,27 @@ msgstr "Ouvre le fichier spécifié dans un éditeur de texte."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Vous pouvez saisir une commande ici, en incluant l'emplacement complet si elle "
-"ne se trouve pas dans un dossier de votre variable d'environnement « PATH ». "
-"Pour chaque nouveau message, KMail exécutera la commande et utilisera les "
-"messages de la sortie standard comme signature. Les commandes habituellement "
-"utilisées sont « fortune » et « ksig -random »."
+"Vous pouvez saisir une commande ici, en incluant l'emplacement complet si "
+"elle ne se trouve pas dans un dossier de votre variable d'environnement "
+"« PATH ». Pour chaque nouveau message, KMail exécutera la commande et "
+"utilisera les messages de la sortie standard comme signature. Les commandes "
+"habituellement utilisées sont « fortune » et « ksig -random »."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "S&pécifier la commande :"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Emplacement"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nouvelle entrée :"
@@ -14672,6 +12624,11 @@ msgstr "Ajouter un groupe"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Voulez-vous vraiment supprimer ce groupe et tous ses fragments ?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Appl&iquer à :"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Modifier le fragment"
@@ -14684,6 +12641,10 @@ msgstr "Modifier le groupe"
 msgid "Edit &group..."
 msgstr "Modifier le &groupe..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Modifier..."
@@ -14717,14 +12678,14 @@ msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
 msgstr ""
-"Activer cette option pour définir la valeur saisie ici comme valeur par défaut "
-"pour cette variable"
+"Activer cette option pour définir la valeur saisie ici comme valeur par "
+"défaut pour cette variable"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Si vous activez cette option, la valeur saisie ici sera enregistrée. Si vous "
 "utilisez la même variable ultérieurement, y compris dans un autre fragment, "
@@ -14763,6 +12724,16 @@ msgstr "Ne pas activer"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Impossible d'insérer le contenu du fichier « %1 » : %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "À : "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC : "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14792,60 +12763,52 @@ msgstr "Impossible de faire suivre la commande du modèle : %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vous pouvez créer ici des modèles à utiliser lors de la rédaction de "
-"nouveaux messages, de réponses ou de transmissions.</p>"
-"<p>Les modèles de messages gèrent les commandes de substitutions en les "
-"saisissant ou en cliquant sur le menu <i>Insérer une commande</i>.</p>"
-"<p>Les modèles spécifiés ici sont spécifiques au dossier. Ils seront utilisés "
-"en priorité par rapport aux modèles globaux et à ceux de l'identité "
-"actuelle.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Vous pouvez créer ici des modèles à utiliser lors de la rédaction de "
+"nouveaux messages, de réponses ou de transmissions.</p><p>Les modèles de "
+"messages gèrent les commandes de substitutions en les saisissant ou en "
+"cliquant sur le menu <i>Insérer une commande</i>.</p><p>Les modèles "
+"spécifiés ici sont spécifiques au dossier. Ils seront utilisés en priorité "
+"par rapport aux modèles globaux et à ceux de l'identité actuelle.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vous pouvez créer ici des modèles à utiliser lors de la rédaction de "
-"nouveaux messages, de réponses ou de transmissions.</p>"
-"<p>Les modèles de messages gèrent les commandes de substitutions en les "
-"saisissant ou en cliquant sur le menu <i>Insérer une commande</i>.</p>"
-"<p>Les modèles spécifiés ici sont globaux à l'identité. Ils seront utilisés en "
-"priorité par rapport aux modèles globaux mais seront supplantés par ceux "
-"définis au niveau d'un dossier.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Vous pouvez créer ici des modèles à utiliser lors de la rédaction de "
+"nouveaux messages, de réponses ou de transmissions.</p><p>Les modèles de "
+"messages gèrent les commandes de substitutions en les saisissant ou en "
+"cliquant sur le menu <i>Insérer une commande</i>.</p><p>Les modèles "
+"spécifiés ici sont globaux à l'identité. Ils seront utilisés en priorité par "
+"rapport aux modèles globaux mais seront supplantés par ceux définis au "
+"niveau d'un dossier.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vous pouvez créer ici des modèles à utiliser lors de la rédaction de "
-"nouveaux messages, de réponses ou de transmissions.</p>"
-"<p>Les modèles de messages gèrent les commandes de substitutions en les "
-"saisissant ou en cliquant sur le menu <i>Insérer une commande</i>.</p>"
-"<p>Ceux-ci sont des modèles par défaut. Ils pourront être supplantés par les "
-"modèles de l'identité actuelle et ceux définis au niveau d'un dossier.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Vous pouvez créer ici des modèles à utiliser lors de la rédaction de "
+"nouveaux messages, de réponses ou de transmissions.</p><p>Les modèles de "
+"messages gèrent les commandes de substitutions en les saisissant ou en "
+"cliquant sur le menu <i>Insérer une commande</i>.</p><p>Ceux-ci sont des "
+"modèles par défaut. Ils pourront être supplantés par les modèles de "
+"l'identité actuelle et ceux définis au niveau d'un dossier.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -15080,7 +13043,8 @@ msgstr "Insérer le résultat de la commande"
 #: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
-"Transmettre le corps du message original et insérer le résultat comme citation"
+"Transmettre le corps du message original et insérer le résultat comme "
+"citation"
 
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
@@ -15090,7 +13054,8 @@ msgstr ""
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
-"Transmettre le message original et ses en-têtes et insérer le résultat tel que"
+"Transmettre le message original et ses en-têtes et insérer le résultat tel "
+"que"
 
 #: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
@@ -15100,6 +13065,10 @@ msgstr "Transmettre le corps du message actuel et insérer le résultat tel que"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Transmettre le corps du message actuel et remplacer par le résultat"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Définir la position du curseur"
@@ -15132,120 +13101,6 @@ msgstr "Activer le débogage"
 msgid "Turn Debug Off"
 msgstr "Désactiver le débogage"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>Vous pouvez afficher les messages précédents ou suivants en utilisant\n"
-"les flèches de gauche et de droite.</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>Vous pouvez créer rapidement des filtres sur l'expéditeur, le destinataire, "
-"le sujet et les listes de diffusions avec <em>Outils / Créer un filtre</em>"
-" ?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>Vous pouvez vous débarrasser du « [nom de liste de diffusion] »\n"
-"ajouté au sujet de certaines listes en utilisant l'action de filtrage\n"
-"<em>Réécrire l'en-tête</em>. Utilisez simplement\n"
-"<pre>Réécrire l'en-tête « Sujet »\n"
-"   remplacer « \\s*[nom de la liste\\]\\s* »\n"
-"...par « »</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>Vous pouvez associer des listes de diffusion avec des dossiers dans la "
-"fenêtre <em>Dossier / Gestion des listes de diffusion...</em>"
-". Vous pouvez alors utiliser\n"
-"<em>Message / Nouveau message à la liste de diffusion...</em> "
-"pour ouvrir l'éditeur avec\n"
-"l'adresse de la liste de diffusion prédéfinie.\n"
-"Vous pouvez également cliquer avec le bouton central de la souris sur le "
-"dossier.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>Vous pouvez assigner des icônes personnalisées à chaque dossier "
-"individuellement.\n"
-"Pour plus d'informations, consultez le menu <em>Dossier / Propriétés...</em></p>"
-"\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>KMail peut afficher une barre colorée indiquant le type de message\n"
-"(texte simple, HTML, OpenPGP) actuellement affiché.</p>\n"
-"<p>Cela contre les tentatives d'imiter une vérification réussie de signature "
-"en\n"
-"envoyant un mail HTML imitant le cadre d'état de signature de KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>Vous pouvez filtrer sur n'importe quel en-tête simplement en\n"
-"donnant son nom dans le premier champ d'édition d'une règle de recherche.</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>Vous pouvez filtrer les messages HTML seulement avec la règle\n"
-"<pre>« Type de contenu » contient « text/html ».</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>Lorsque vous répondez a un message, l'ensemble du texte que vous avez "
-"sélectionné dans celui-ci est utilisé pour la réponse.</p>\n"
-"<p>Si rien n'est sélectionné, le message complet est utilisé.</p>\n"
-"<p>Cette fonctionnalité fonctionne avec le texte des pièces jointes "
-"lorsqu'elles sont\n"
-"affichées <em>dans le corps du message</em>.</p>\n"
-"<p>Cette fonctionnalité est disponible avec toutes les options permettant de "
-"répondre\n"
-"aux messages sauf l'option <em>Répondre sans citer le texte</em>.</p>\n"
-"<p align=\"right\"><em>Contributeur : David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Il n'y a rien à annuler."
@@ -15311,6 +13166,15 @@ msgstr "Pièce jointe : %1 (non nommé)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Afficher le journal détaillé de GnuPG pour cette opération"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Un fichier nommé « %1 » existe déjà. Voulez-vous l'écraser ?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Écraser le fichier ?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15360,8 +13224,8 @@ msgid ""
 msgstr ""
 "Une personne (probablement vous) a changé le script de traitement des congés "
 "sur le serveur.\n"
-"KMail ne peut pas déterminer les paramètres pour les réponses automatiques aux "
-"messages.\n"
+"KMail ne peut pas déterminer les paramètres pour les réponses automatiques "
+"aux messages.\n"
 "Les valeurs par défaut seront utilisés."
 
 #: vacation.cpp:657
@@ -15430,14 +13294,14 @@ msgstr "&Envoyer l'image avec tous les messages"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Cochez cette case si vous souhaitez que KMail ajoute une en-tête « X-Face » aux "
-"messages écrits avec cette identité. Une « X-Face » est une petite image (48x48 "
-"pixels) en noir et blanc que certains logiciels de courriers électroniques sont "
-"capables d'afficher."
+"Cochez cette case si vous souhaitez que KMail ajoute une en-tête « X-Face » "
+"aux messages écrits avec cette identité. Une « X-Face » est une petite image "
+"(48x48 pixels) en noir et blanc que certains logiciels de courriers "
+"électroniques sont capables d'afficher."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15465,9 +13329,9 @@ msgstr "Sélectionner le fichier..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Utilisez cela pour sélectionnez un fichier afin d'y créer l'image. L'image "
 "devra posséder un grand contraste et devra avoir la forme d'un carré. Un "
@@ -15479,22 +13343,22 @@ msgstr "Définir depuis le carnet d'adresses"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Vous pouvez également utiliser une version à l'échelle de l'image que vous avez "
-"définis dans votre entrée du carnet d'adresses."
+"Vous pouvez également utiliser une version à l'échelle de l'image que vous "
+"avez définis dans votre entrée du carnet d'adresses."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail peut envoyer une petite image (48x48 pixels), de faible qualité et "
-"monochrome avec chaque message. Cela peut par exemple être une image de votre "
-"signature. Elle est affichée dans l'adresse du destinataire du logiciel de "
-"courrier électronique (s'il la gère)."
+"monochrome avec chaque message. Cela peut par exemple être une image de "
+"votre signature. Elle est affichée dans l'adresse du destinataire du "
+"logiciel de courrier électronique (s'il la gère)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15502,12 +13366,11 @@ msgstr "Utilisez ce champ pour saisir une chaîne « X-Face » arbitraire."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Des exemples sont disponibles sur <a "
-"href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</"
-"a>."
+"Des exemples sont disponibles sur <a href=\"http://www.xs4all.nl/~ace/X-"
+"Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15522,132 +13385,1858 @@ msgstr "Aucune image"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Votre contact propre n'est pas défini dans le carnet d'adresses."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Total : %2<br>Non lus : %3<br>Taille : %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signature"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Quota : %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Signer &automatiquement les messages"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Définir le sujet du message"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Quand cette option est activée, tous les messages que vous enverrez seront "
+"signés par défaut. Bien sûr, il est toujours possible de désactiver la "
+"signature individuellement pour chaque message."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Envoyer une copie carbone à « adresse »"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Chiffrement"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Envoyer une copie carbone cachée à « adresse »"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Lors du chiffrement des courriels, toujours utiliser le &certificat de ma "
+"propre identité"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Ajouter un « en-tête » au message"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Lorsque cette option est activée, le message / fichier n'est pas seulement "
+"chiffré avec la clé publique du destinataire, mais également avec votre clé. "
+"Ceci vous permet de déchiffrer le message / fichier par la suite. Il s'agit "
+"généralement d'une bonne idée."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Lire le corps du message dans « fichier »."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Afficher le texte s&igné / chiffré après l'édition"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Définir le corps du message"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Lorsque cette option est activée, le texte signé / chiffré est affiché dans "
+"une fenêtre séparée, ce qui vous permet de savoir à quoi il ressemble avant "
+"de l'envoyer. Cela vous permet de vérifier que votre système de chiffrement "
+"fonctionne."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Enregistrer l&es messages envoyés chiffrés"
+
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Vérifier les messages chiffrés qui sont enregistrés"
+
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
-"Ajouter une pièce jointe au message. Cette opération peut être effectuée "
-"plusieurs fois."
+"<qt>\n"
+"<h1>Enregistrer les messages chiffrés</h1>\n"
+"Quand cette case est cochée, les messages envoyés sont enregistrés chiffrés "
+"comme ils ont été envoyés. Ce n'est pas recommandé, car vous ne pourrez plus "
+"lire les messages si le certificat expire.\n"
+"<p>\n"
+"Cependant, il peut y avoir des politiques de sécurité dans votre société qui "
+"nécessitent d'activer cette option. En cas de doute, vérifiez avec "
+"l'administrateur de votre système.\n"
+"</qt>"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Ne vérifier que les nouveaux messages"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Toujours afficher les clés de chi&ffrement"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "N'ouvrir qu'une fenêtre d'édition"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Si cette option est activée, l'application vous montrera toujours la liste "
+"des clés publiques, vous permettant de choisir celle que vous voulez "
+"utiliser pour le chiffrement. Si l'option est désactivée, la fenêtre ne sera "
+"affichée que lorsque plusieurs clés peuvent être utilisées ou, au contraire, "
+"qu'aucune clé n'a été trouvée."
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Afficher le message indiqué."
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "C&hiffrer automatiquement les messages si possible"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
-"Envoyer le message à l'adresse désirée avec le fichier pointé par l'URL comme "
-"pièce jointe"
+"Quand cette option est activée, tout message que vous enverrez sera chiffré "
+"si cela est possible et désiré. Bien sûr, il est toujours possible de "
+"désactiver le chiffrement automatique pour chaque message individuellement."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lecture"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Ne &jamais signer / chiffrer lors de l'enregistrement d'un brouillon"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Ancien"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Comment cela fonctionne ?"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Supprimé"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universel"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Répondu"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Répondre"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Transmis"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Répondre à tous"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Mise en file"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Transmettre"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Envoyés"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Racco&urci clavier :"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Vu"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Type de modèle :"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignoré"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Contenu du modèle"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Courriel indésirable"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Raccourci clavier du modèle"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Courriel normal"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Type de modèle"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "À effectuer"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Propriétés du dossier"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Possède une pièce jointe"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Le dossier gère une liste de di&ffusion"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 sur %2 %3 utilisé"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "L&iste d'adresses :"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Emplacement"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal :"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Non &lu :"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Expiration des messages"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Faire e&xpirer les messages après le :"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Faire expirer les messa&ges lus "
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Faire expirer a&près le :"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Faire expirer les messages n&on lus"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "jour(s)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "semaine(s)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "mois"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Options avancées"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Identité de l'émetteur :"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Format de stockage :"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Liste des vues :"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Envoyer les messages en attente lors de la vérification du courriel"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Un fichier nommé « %1 » existe déjà. Voulez-vous l'écraser ?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Sélectionnez si vous souhaitez que KMail envoie les messages de la "
+"boîte d'envoi lors de toutes les vérifications de nouveaux messages, "
+"uniquement lors des vérifications manuelles, ou si vous ne voulez pas qu'ils "
+"soient envoyés automatiquement.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Écraser le fichier ?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Déplacer automatiquement les courriels non synchronisés des dossiers sur "
+"lesquels les droits d'accès ne sont pas suffisants"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Il existe de nouveaux messages dans ce dossier n'ayant pas encore été "
+"envoyés au serveur, mais il semble que vous n'avez pas les droits suffisants "
+"pour les expédier. Ces messages seront déplacés automatiquement dans un "
+"dossier « perdus et trouvés »."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Autoriser les drapeaux locaux dans les dossiers en lecture seule"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Cette option permet aux administrateurs de définir un délai minimum entre "
+"deux vérifications de courriels. L'utilisateur ne pourra pas choisir de "
+"valeur inférieure à la valeur définie ici."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"Le dernier dossier sélectionné dans la fenêtre de sélection des dossiers."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Ne pas utiliser le paramètre « umask » de l'utilisateur et le remplacer par "
+"un lecture / écriture pour l'utilisateur uniquement"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politique d'affichage de l'icône dans la boîte à miniatures"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Fermer l'application lorsque la fenêtre principale est fermée, même si "
+"l'icône dans la boîte à miniatures est active."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Détailler la notification d'arrivée de nouveaux messages"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Si cette option est cochée, la notification affiche le nombre de nouveaux "
+"messages pour chaque dossier. Sinon, elle vous indique simplement que du "
+"courriel est arrivé."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Nom de l'éditeur :"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Utiliser un éditeur de message e&xterne"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"Le seuil d'avertissement utilisateur d'un dossier proche de la limite de son "
+"quota."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Activer les fonctionnalités pour le travail en groupe"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+"Inverser les champs expéditeur et destinataire lors des réponses aux réponses"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"L'implantation du standard iCalendar dans Microsoft Outlook souffre "
+"d'imperfections auxquelles cette option tente de pallier. Si certains "
+"utilisateurs de ce logiciel ne peuvent pas lire vos réponses, essayez "
+"d'activer cette option."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Envoyer les invitations dans le corps du message"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"L'implantation du standard iCalendar dans Microsoft Outlook souffre "
+"d'imperfections auxquelles cette option tente de pallier. Si certains "
+"utilisateurs de ce logiciel ne peuvent pas lire vos invitations, essayez "
+"d'activer cette option."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Nommage des invitations compatible avec Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook, utilisé avec un serveur Microsoft Exchange, a un problème "
+"avec les standards de messagerie. Activer cette option pour envoyer des "
+"invitations que Microsoft Exchange pourra interpréter."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Lorsque cette option est cochée, vous ne verrez plus la fenêtre de rédaction "
+"du courriel. À la place, tous les courriers électroniques d'invitations sont "
+"envoyés automatiquement. Si vous souhaitez consulter le courriel avant de "
+"l'envoyer, vous pouvez décocher cette option. Cependant, soyez conscient que "
+"le texte dans la fenêtre de rédaction utilise la syntaxe iCalendar, et que "
+"vous ne devriez pas essayer de le retoucher à la main."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+"Supprimer les courriels d'invitations après qu'une réponse ait été envoyée"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Lorsque cette option est activée, les courriels d'invitations auxquels vous "
+"avez répondus seront déplacés dans le dossier corbeille, une fois la réponse "
+"envoyée correctement."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>L'activation de cette option permet d'enregistrer les entrées des "
+"applications Kontact (KOrganizer, KAddressBook et KNotes).</p><p>Si vous "
+"activez cette fonction, il faut également que les applications utilisent la "
+"ressource IMAP. Cela se configure dans le Centre de Configuration de TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>L'affichage des dossiers contenant les ressources IMAP est souvent sans "
+"intérêt. Si vous souhaitez tout de même les voir, vous pouvez le définir ici."
+"</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Si le compte utilisé pour stocker les informations du travail en groupe "
+"n'est pas utilisé pour gérer du courriel normal, activez cette option pour "
+"n'afficher que les dossiers inclus dans celui-ci. Ceci est utile lorsque "
+"vous gérez des courriers normaux via un compte IMAP connecté additionnel.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Choisissez le format de stockage des dossiers de travail en groupe. <ul> "
+"<li>Le format par défaut est d'utiliser les standards ical (pour les "
+"dossiers de calendrier) et vcard (pour les dossiers de carnet d'adresses). "
+"Ce format permet de rendre disponibles toutes les possibilités de Kontact.</"
+"li><li>Le format XML de Kolab utilise un schéma personnalisé qui correspond "
+"plus précisément à celui utilisé dans Outlook. Ce format permet une "
+"compatibilité accrue avec Outlook, lors de l'utilisation d'un serveur Kolab "
+"ou d'une solution compatible.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Ceci permet de choisir le dossier parent des dossiers des ressources IMAP."
+"</p><p>Par défaut, le serveur Kolab choisit la boîte de réception IMAP.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>L'identifiant du compte contenant les dossiers des ressources IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Si vous voulez définir le nom des dossiers IMAP dans votre langue, vous "
+"pouvez choisir parmi les langues disponibles.</p> <p>Notez que seule la "
+"compatibilité avec Microsoft Outlook justifie cette option. Cependant, c'est "
+"une mauvaise idée de l'activer, car il sera alors impossible de changer la "
+"langue.</p> <p>N'utilisez donc cette option que si vous n'avez pas le choix."
+"</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+"Filtrer également les nouveaux courriels reçus dans les dossier de travail "
+"collaboratif."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Synchroniser les changements de travail en groupe dans les dossiers DIMAP "
+"immédiatement après la mise en ligne."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Ceci permet d'afficher ou non l'introduction de KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Nombre de connexions maximales par serveur"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ceci peut être utilisé pour limiter le nombre de connexions par serveur lors "
+"de la vérification de nouveaux messages. Par défaut, le nombre de connexions "
+"est illimité (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Afficher le champ de recherche rapide"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Cette option active ou désactive le champ de recherche rapide au-dessus de "
+"la liste des messages, qui permet d'effectuer une recherche rapidement parmi "
+"les informations contenues dans la liste des messages."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Masquer la boîte locale si elle est inutilisée"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Transmission intégrée par défaut."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Autoriser l'usage du point-virgule (« ; ») comme séparateur dans l'éditeur."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Utiliser le jeu de caractères du message d'origine pour, si possible, "
+"répondre ou transmettre."
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Ajout&er automatiquement la signature"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Se souvenir de cette identité, de telle manière qu'elle sera utilisée "
+"également dans les futures fenêtres de rédaction.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Se souvenir de ce dossier pour les éléments envoyés, de façon à ce qu'il "
+"soit également utilisé dans les futures fenêtres de rédaction."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Se souvenir de cet agent de transport de courrier, de telle manière qu'il "
+"sera utilisé également dans les futures fenêtres d'édition."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Se souvenir de cette identité, de telle manière qu'elle sera utilisée "
+"également dans les futures fenêtres de rédaction.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Césure auto&matique à la colonne :"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Nombre maximal de lignes dans l'éditeur de destinataires."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Activez cette option pour rendre compréhensibles à Outlook(tm) les noms des "
+"pièces jointes contenant des caractères non anglais."
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Notifications de réponse automatique au &message"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Activez cette option si vous voulez que KMail demande un accusé de "
+"réception (MDN) pour chaque message que vous envoyez.</p><p>Le choix de "
+"cette option affecte tous les messages. Vous pouvez activer ou désactiver "
+"individuellement les accusés de réception dans la fenêtre de rédaction en "
+"utilisant le menu « <em>Options</em> / <em>Accusés de réception</em> ».</p></"
+"qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Utiliser les adresses récentes pour l'auto-complètement"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Désactivez cette option si vous ne souhaitez pas que les adresses récentes "
+"apparaissent dans la liste d'adresses suggérées dans le composeur."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Intervalle d'enregistrement automatique :"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Une copie de sauvegarde du texte présent dans la fenêtre de rédaction peut "
+"être créée à intervalles réguliers. L'intervalle utilisé pour créer les "
+"sauvegardes est défini ici. Vous pouvez désactiver l'enregistrement "
+"automatique en lui affectant la valeur 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Insérer la signature au-dessus de la citation"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Remplacer les préfi&xes reconnus par « Re : »"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Remplacer les préfixes reconnus par « &Fwd : »"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Utiliser les citations élégantes"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "La signature est expirée."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Type de sélecteur de destinataire"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Définit le type de boîte de dialogue permettant de sélectionner\n"
+"les destinataires pour les champs « À », « CC » et « BCC »."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Type de sélecteur de destinataires"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Définit le type d'éditeur de destinataires pour les champs \n"
+"« À », « CC » et « BCC »."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Nombre maximal de lignes dans l'éditeur de destinataires."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Liste des types de parties de messages permettant d'enlever les courriels "
+"transmis dans le contenu d'un autre message."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "La taille maximale en Mo que les pièces jointes peuvent avoir."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+"Afficher le gestionnaire de fragments de texte et le panneau d'insertion "
+"dans l'éditeur."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Afficher le journal détaillé de GnuPG même après les opérations de "
+"chiffrement qui se sont déroulées correctement."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Utiliser le jeu de caractères du message d'origine pour, si possible, "
+"répondre ou transmettre."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Certains courriers électroniques, et plus particulièrement ceux générés "
+"automatiquement, ne précisent pas l'encodage de caractères permettant de les "
+"afficher convenablement. Dans ce cas, un encodage de caractères spécifique "
+"sera utilisé, et vous pouvez le configurer ici. Choisissez l'encodage de "
+"caractères généralement utilisé dans votre partie du monde. L'encodage du "
+"système sera utilisé par défaut."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Le changement de ce champ à l'option « Auto » forcera l'utilisation de "
+"l'encodage précisé pour tous les courriels, quel que soit celui qu'ils "
+"préconisent."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Activez cette option si vous souhaitez que les caractères telles que :-) "
+"apparaissent dans les messages comme des émoticônes (de petites images)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Activer cette option pour afficher les différents niveaux de citations. "
+"Désactivez-la pour les cacher."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Niveau de réduction automatique :"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Réduire la taille de la police pour les citations"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Activer cette option pour afficher les citations dans une police plus petite."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Enregistrer l&es messages envoyés chiffrés"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Afficher le client dans les en-têtes décoratifs"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Activer cette option pour afficher le client et la balise « X-Mailer » dans "
+"les en-têtes décoratifs."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Autoriser la suppression des pièces jointes des courriels existants."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Autoriser la modification des pièces jointes des courriels existants."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+"Toujours déchiffrer les messages à l'affichage, ou demander avant chaque "
+"déchiffrage"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Envoyer les accusés de réception avec un expéditeur vide"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Envoyer les accusés de réception avec un expéditeur vide. Certains serveurs "
+"peuvent être configurés pour refuser ce genre de messages. Si vous avez des "
+"problèmes pour envoyer les accusés de réception, décochez cette option."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Les expressions ont été converties en modèles"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Les anciennes expressions ont été converties en modèles"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Modèle pour les nouveaux messages"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Modèle de message pour la réponse"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Modèle de message pour la réponse à tous"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Modèle de message pour la transmission"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Marques de citation"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+"Autoriser la modification de la configuration des réponses « Pas au bureau » "
+"par l'utilisateur."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Autoriser les utilisateurs à envoyer des scripts Sieve « Pas au bureau », "
+"mais leur interdire le changement de la configuration, comme le domaine "
+"demandant une réaction et le sélecteur de réaction contre les courriels "
+"indésirables."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Autoriser l'envoi des réponses « Pas au bureau » aux courriels de ce domaine "
+"uniquement."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Autoriser l'envoi des réponses « Pas au bureau » aux courriels indésirables."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Vérifier s'il existe toujours une réponse « Pas au bureau » active au "
+"démarrage de KMail."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Modifier le fichier"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Modifier..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Aller"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "D&ossier"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Message"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Réponse spéciale"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Transmettre"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Infobulles"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Configuration des fragments"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barre d'outils HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Options communes"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barre d'outils HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+"Valider les certificats à l'aide des listes de révocation de certificats"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Si cette option est sélectionnée, les certificats S/MIME sont validés à "
+"l'aide des listes de révocation de certificats (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Valider les certificats en ligne (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Si cette option est sélectionnée, les certificats S/MIME sont validés en "
+"ligne en utilisant le protocole de vérification en ligne de l'état des "
+"certificats (OCSP). Saisissez ci-dessous l'URL du serveur OCSP."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Validation des certificats en ligne"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL du serveur OCSP :"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Saisissez ici l'adresse du serveur pour la validation en ligne des "
+"certificats (OCSP). Elle commence habituellement par « http:// »."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Signature du serveur OCSP :"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorer les URL de services de certificats"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Ne pas vérifier les politiques des certificats"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Par défaut, GnuPG utilise le fichier « ~/.gnupg/policies.txt » pour vérifier "
+"si une politique de certificat est autorisée. Si cette option est cochée, "
+"les politiques ne sont pas vérifiées."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Ne jamais consulter de liste de révocation de certificats"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"SI cette option est cochée, les listes de révocation de certificats ne sont "
+"jamais utilisées pour valider les certificats S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Télécharger les certificats émetteurs manquants"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Si cette option est cochée, les certificats émetteurs manquants sont "
+"téléchargés lorsque c'est nécessaire (ceci s'applique aux deux méthodes de "
+"validation, CRL et OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Requêtes HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Ne jamais effectuer de requêtes HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Désactiver complétement l'utilisation du protocole HTTP pour S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Utiliser ce serveur mandataire (proxy) pour les requêtes HTTP : "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Utiliser le serveur mandataire HTTP du système :"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Si cette option est sélectionnée, le serveur mandataire HTTP affiché à "
+"droite (provenant de la variable d'environnement « http_proxy) sera utilisé "
+"pour toutes les requêtes HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Saisissez ici l'emplacement de votre serveur mandataire HTTP, qui sera "
+"utilisé pour toutes les requêtes HTTP relatives à S/MIME. La syntaxe est "
+"« machine:port », comme par exemple « monproxy.nulpart.com:3128 »."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+"Ignorer les points HTTP de distribution de liste de révocation de certificats"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Lors de la recherche de l'emplacement d'une liste de révocation de "
+"certificats (« CRL »), le certificat à tester contient toujours des points "
+"de distribution de CRL (« DP »), qui représentent des URL permettant "
+"d'accéder à l'adresse. La première entrée « DP » trouvée est utilisée. Avec "
+"cette option, l'ensemble des entrées utilisant un modèle HTTP est ignoré "
+"lors de la recherche d'un « DP » convenable."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Requêtes LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Ne jamais effectuer de requêtes LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Désactiver complétement l'utilisation du protocole LDAP pour S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+"Ignorer les points LDAP de distribution de liste de révocation de certificats"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Lors de la recherche de l'emplacement d'une liste de révocation de "
+"certificats (« CRL »), le certificat à tester contient toujours des points "
+"de distribution de CRL (« DP »), qui représentent des URL permettant "
+"d'accéder à l'adresse. La première entrée « DP » trouvée est utilisée. Avec "
+"cette option, l'ensemble des entrées utilisant un modèle LDAP est ignoré "
+"lors de la recherche d'un « DP » convenable."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Hôte primaire pour les requêtes LDAP :"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"La saisie d'un serveur LDAP ici permettra de lui envoyer toutes les requêtes "
+"LDAP en premier. En effet, ce paramètre est prioritaire à tout nom de "
+"machine ou numéro de port d'une URL LDAP, et il sera également utilisé si "
+"ces informations sont absentes de l'URL. Les autres serveurs LDAP seront "
+"uniquement utilisés dans le cas où la connexion au serveur mandataire "
+"(proxy) échoue.\n"
+"La syntaxe est « machine » ou « machine:port ». Si le port est omis, le 389 "
+"(port LDAP par défaut) sera utilisé."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Ajouter un fragment"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "A&jouter"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Fragment :"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Groupe :"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Configuration des fragments"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Infobulles"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Afficher les fragments de texte dans une infobulle"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Décide s'il faut afficher une infobulle contenant le texte d'une ligne "
+"marquée"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variables"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Mode de saisie pour les variables"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Une seule boîte de dialogue pour chaque variable d'un fragment"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+"Une boîte de saisi s'affichera pour chacune des variables d'un fragment"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Une boîte de dialogue pour toutes les variables d'un fragment"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Une seule boîte de dialogue s'affichera, dans laquelle vous pourrez saisir "
+"les valeurs de toutes les variables d'un fragment"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Délimiteur :"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Configuration des modèles"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Répondre à l'expéditeur"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Répondre à tous / Répondre à la liste"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Message transmis"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "A&vertir lorsqu'on essaye d'envoyer des messages non signés"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Cocher pour être averti lors des tentatives d'envoi de messages non signés."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir lors d'une tentative d'envoi de messages non signés</h1>\n"
+"Si cette case est cochée, vous serez averti quand vous essayerez d'envoyer "
+"des parties ou le message complet non signé.\n"
+"<p>\n"
+"Il est recommandé de laisser cette option activée pour une intégrité "
+"maximale.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "A&vertir lorsqu'on essaye d'envoyer des messages non chiffrés"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Avertir quand vous essayez d'envoyer des messages non chiffrés."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir quand vous essayez d'envoyer des messages non chiffrés</h1>\n"
+"Si cette case est cochée, vous serez averti quand vous essayerez d'envoyer "
+"des parties ou des messages entiers non chiffrés.\n"
+"<p>\n"
+"Il est recommandé de laisser cette option activée pour une sécurité "
+"maximale.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Avertir si l'adresse électronique du des&tinataire n'est pas dans le "
+"certificat"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Cochez pour être averti si l'adresse n'est pas dans le certificat"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir si l'adresse électronique du destinataire n'est pas dans le "
+"certificat</h1>\n"
+"Si cette option est activée, un avertissement est lancé si l'adresse "
+"électronique du destinataire n'est pas contenue dans le certificat utilisé "
+"pour le chiffrement.\n"
+"<p>\n"
+"Il est recommandé de laisser cette option activée pour une sécurité "
+"maximale.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Avertir lorsqu'un certificat ou une clé est sur le point d'expirer "
+"(configurez les seuils ci-dessous)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Pour la signature"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Pour le chiffrement"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Déterminer le nombre de jours ici"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir si le certificat de signature expire</h1>\n"
+"Cette option vous permet de choisir le nombre minimal de jours pendant "
+"lesquels le certificat de signature doit être valable sans lancer "
+"d'avertissement.\n"
+"<p> Le réglage recommandé pour SPHINX est 14 jours.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir si le certificat de chiffrement expire</h1>\n"
+"Avec cette option, vous pouvez choisir le nombre minimal de jours pendant "
+"lequel le certificat de chiffrement doit être valable sans lancer "
+"d'avertissement.\n"
+"<p>\n"
+"Le réglage SPHINX recommandé est 14 jours.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir si un certificat dans la chaîne expire</h1>\n"
+"Sélectionner le nombre minimum de jours pendant lesquels tous les "
+"certificats dans la chaîne de certificats doivent être valables sans lancer "
+"d'avertissement.\n"
+"<p>\n"
+"Le réglage recommandé par SPHINX est 14 jours.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir si le certificat issu d'une autorité de certification expire</"
+"h1>\n"
+"Choisir le nombre minimum de jours pendant lequel le certificat d'une "
+"autorité de certification doit être valable sans lancer d'avertissement.\n"
+"<p>\n"
+"Le réglage SPHINX recommandé est 14 jours.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avertir si le certificat racine expire</h1>\n"
+"Cette option vous permet de choisir le nombre minimum de jours pendant "
+"lesquels le certificat racine doit être valable sans lancer "
+"d'avertissement.\n"
+"<p>\n"
+"Le réglage SPHINX recommandé est 14 jours.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Pour les certificats racines :"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Pour les certificats du tiers de confiance :"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Pour les certificats et clés de l'utilisateur final :"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Réactiver tous les avertissements « Ne plus demander »"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>Vous pouvez afficher les messages précédents ou suivants en utilisant\n"
+"les flèches de gauche et de droite.</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>Vous pouvez créer rapidement des filtres sur l'expéditeur, le "
+"destinataire, le sujet et les listes de diffusions avec <em>Outils / Créer "
+"un filtre</em> ?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>Vous pouvez vous débarrasser du « [nom de liste de diffusion] »\n"
+"ajouté au sujet de certaines listes en utilisant l'action de filtrage\n"
+"<em>Réécrire l'en-tête</em>. Utilisez simplement\n"
+"<pre>Réécrire l'en-tête « Sujet »\n"
+"   remplacer « \\s*[nom de la liste\\]\\s* »\n"
+"...par « »</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>Vous pouvez associer des listes de diffusion avec des dossiers dans la "
+"fenêtre <em>Dossier / Gestion des listes de diffusion...</em>. Vous pouvez "
+"alors utiliser\n"
+"<em>Message / Nouveau message à la liste de diffusion...</em> pour ouvrir "
+"l'éditeur avec\n"
+"l'adresse de la liste de diffusion prédéfinie.\n"
+"Vous pouvez également cliquer avec le bouton central de la souris sur le "
+"dossier.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>Vous pouvez assigner des icônes personnalisées à chaque dossier "
+"individuellement.\n"
+"Pour plus d'informations, consultez le menu <em>Dossier / Propriétés...</"
+"em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>KMail peut afficher une barre colorée indiquant le type de message\n"
+"(texte simple, HTML, OpenPGP) actuellement affiché.</p>\n"
+"<p>Cela contre les tentatives d'imiter une vérification réussie de signature "
+"en\n"
+"envoyant un mail HTML imitant le cadre d'état de signature de KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>Vous pouvez filtrer sur n'importe quel en-tête simplement en\n"
+"donnant son nom dans le premier champ d'édition d'une règle de recherche.</"
+"p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>Vous pouvez filtrer les messages HTML seulement avec la règle\n"
+"<pre>« Type de contenu » contient « text/html ».</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>Lorsque vous répondez a un message, l'ensemble du texte que vous avez "
+"sélectionné dans celui-ci est utilisé pour la réponse.</p>\n"
+"<p>Si rien n'est sélectionné, le message complet est utilisé.</p>\n"
+"<p>Cette fonctionnalité fonctionne avec le texte des pièces jointes "
+"lorsqu'elles sont\n"
+"affichées <em>dans le corps du message</em>.</p>\n"
+"<p>Cette fonctionnalité est disponible avec toutes les options permettant de "
+"répondre\n"
+"aux messages sauf l'option <em>Répondre sans citer le texte</em>.</p>\n"
+"<p align=\"right\"><em>Contributeur : David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Afficher le champ de recherche rapide"
@@ -15670,7 +15259,9 @@ msgstr "Écraser le fichier ?"
 #~ msgstr "Réception des nouveaux messages"
 
 #~ msgid "Only filter mails received in disconnected IMAP inbox."
-#~ msgstr "Filtrer uniquement les courriels reçus dans des boîtes de réception IMAP déconnectées."
+#~ msgstr ""
+#~ "Filtrer uniquement les courriels reçus dans des boîtes de réception IMAP "
+#~ "déconnectées."
 
 #~ msgid "Show folder quick search line edit"
 #~ msgstr "Afficher le champ de recherche rapide"
diff --git a/tde-i18n-fy/messages/tdepim/kmail.po b/tde-i18n-fy/messages/tdepim/kmail.po
index ca99e4fb63f..f96940194b3 100644
--- a/tde-i18n-fy/messages/tdepim/kmail.po
+++ b/tde-i18n-fy/messages/tdepim/kmail.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-04-27 11:01+0100\n"
 "Last-Translator: Berend Ytsma <berendy@gmail.com>\n"
 "Language-Team: Frysk <kde-i18n-fry@kde.org>\n"
@@ -23,13 +23,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Berend Ytsma,Rinse de Vries"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -176,6 +176,12 @@ msgstr "Gjin&t (mei soarch brûke)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Akkount foar semi-automatyske databoarneôfhanneling"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Ferleden leegje"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -193,8 +199,8 @@ msgstr "Ferleden leegje"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Alle ferâldere reservearrings foar de databoarne dy’t presintearre wurdt troch "
-"dit akkount wiskje."
+"Alle ferâldere reservearrings foar de databoarne dy’t presintearre wurdt "
+"troch dit akkount wiskje."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -255,13 +261,13 @@ msgstr "Oanme&ldnamme:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "Jo kedizer hat jo in <em>brûkersname</em> jûn. Dizze wurdt brûkt foar it "
-"oanmelden op har tsjinners. Dit is faaks it earste diel fan jo e-postadres (it "
-"diel foar de <em>@</em>)."
+"oanmelden op har tsjinners. Dit is faaks it earste diel fan jo e-postadres "
+"(it diel foar de <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -282,12 +288,12 @@ msgstr "POP wachtwurd bewarje"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Selektearje dizze opsje wannear Kmail it wachtwurd bewarje moat.\n"
 "Wannear TDEWallet beskikber is sil it wachtwurd dêryn bewarre wurde.\n"
@@ -322,12 +328,13 @@ msgstr "Berjochten &filterje as se grutter binne dan"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "As jo dizze opsje selektearje, dan sille de POP-filters brûkt wurde om te "
-"beskieden wat der mei jo e-postberjocht bard. Jo kinne de seleksje meitsje foar "
-"ophelje, wiskje of op de tsjinner efterlitte."
+"beskieden wat der mei jo e-postberjocht bard. Jo kinne de seleksje meitsje "
+"foar ophelje, wiskje of op de tsjinner efterlitte."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -376,13 +383,15 @@ msgstr "Te&kst opskjinje"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -425,13 +434,13 @@ msgstr "Nammerromten:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Hjir sjogge jo de nammeromten dy't jo IMAP-tsjinner stipet. In nammeromte is in "
-"foarheaksel dy't groepen út elkoar hâld. Hjirmei kine jo yn KMAIL bygelyks jo "
-"persoanlike mappen en dielde mappen yn ien akkount sjen litte."
+"Hjir sjogge jo de nammeromten dy't jo IMAP-tsjinner stipet. In nammeromte is "
+"in foarheaksel dy't groepen út elkoar hâld. Hjirmei kine jo yn KMAIL "
+"bygelyks jo persoanlike mappen en dielde mappen yn ien akkount sjen litte."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -489,13 +498,13 @@ msgstr "Taheaksels op fersyk &lade"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Wannear jo dizze opsje ynskeakelje sille taheaksels net automatysk laden wurde, "
-"mar allinne wannear jo se oanklikke. Sa kinne grutte e-postberjochten daliks "
-"werjûn wurde."
+"Wannear jo dizze opsje ynskeakelje sille taheaksels net automatysk laden "
+"wurde, mar allinne wannear jo se oanklikke. Sa kinne grutte e-postberjochten "
+"daliks werjûn wurde."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -506,8 +515,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Allinne útklapte mappen wurde kontrolearre op submappen. Brûk dit as jo folle "
-"mappen op de tsjinner te stean hawwe."
+"Allinne útklapte mappen wurde kontrolearre op submappen. Brûk dit as jo "
+"folle mappen op de tsjinner te stean hawwe."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -535,7 +544,7 @@ msgstr "<gjint>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "ynfak"
 
@@ -543,45 +552,47 @@ msgstr "ynfak"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Dizze tsjinner stipet gjin unike berjochtnûmers, mar dit is in fereaske by it "
-"efterlitten fan berjochten op de tsjinner.\n"
-"Omdat guon tsjinner har mooglikheden net goed oanjouwe kin it wêze dat jo dizze "
-"opsje dochs oansette kinne."
+"Dizze tsjinner stipet gjin unike berjochtnûmers, mar dit is in fereaske by "
+"it efterlitten fan berjochten op de tsjinner.\n"
+"Omdat guon tsjinner har mooglikheden net goed oanjouwe kin it wêze dat jo "
+"dizze opsje dochs oansette kinne."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Mei dizze tsjinner kinne jo gjin berjochtkoppen ophelje, wat wol in fereaske is "
-"om berjochten op de tsjinner te filterjen.\n"
-"Omdat guon tsjinner har mooglikheden net goed oanjouwe kin it wêze dat jo dizze "
-"opsje dochs oansette kinne."
+"Mei dizze tsjinner kinne jo gjin berjochtkoppen ophelje, wat wol in fereaske "
+"is om berjochten op de tsjinner te filterjen.\n"
+"Omdat guon tsjinner har mooglikheden net goed oanjouwe kin it wêze dat jo "
+"dizze opsje dochs oansette kinne."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Hâld der rekken mei dat dizze funksje der ta liede kin dat guon POP3-tsjinners "
-"dy't gjin pipelining stypje beskeadige e-postberjochten ferstjoere.\n"
-"Dizze ynstelling is oanwêzich omdat guon tsjinners pipelining wol stypje, mar "
-"dit net oanjouwe. Om te kontrolearjen of jo POP3-tsjinner pipelining-stipe "
-"oanjout, druk op de knop ûnderoan dit dialooch.\n"
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Hâld der rekken mei dat dizze funksje der ta liede kin dat guon POP3-"
+"tsjinners dy't gjin pipelining stypje beskeadige e-postberjochten "
+"ferstjoere.\n"
+"Dizze ynstelling is oanwêzich omdat guon tsjinners pipelining wol stypje, "
+"mar dit net oanjouwe. Om te kontrolearjen of jo POP3-tsjinner pipelining-"
+"stipe oanjout, druk op de knop ûnderoan dit dialooch.\n"
 "As jo tsjinner dit net oanjout, mar jo wolle wol mear fluggens, dan kinne jo "
-"dit earst teste troch josels in pakket fan berjochten te stjoeren en dêrnei op "
-"te heljen."
+"dit earst teste troch josels in pakket fan berjochten te stjoeren en dêrnei "
+"op te heljen."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -589,31 +600,31 @@ msgstr "Graach earst in tsjinner en poarte op de ljepper Algemien oantsjutte."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Dizze tsjinner stipet gjin pipelining. Dêrom is dizze opsje útskeakele.\n"
-"Omdat guon tsjinners har mooglikheden net goed oanjaan kin it wêze dat jo dizze "
-"opsje wol oansette kinne. Hâld der rekken mei dat dizze funksje der ta liede "
-"kin dat guon POP3-tsjinners dy't gjin pipelining stypje beskeadige "
-"e-postberjochten ferstjoere. Dêrom moatte jo dizze funksje earst útteste "
+"Omdat guon tsjinners har mooglikheden net goed oanjaan kin it wêze dat jo "
+"dizze opsje wol oansette kinne. Hâld der rekken mei dat dizze funksje der ta "
+"liede kin dat guon POP3-tsjinners dy't gjin pipelining stypje beskeadige e-"
+"postberjochten ferstjoere. Dêrom moatte jo dizze funksje earst útteste "
 "foardat jo wichtige berjochten ferlieze. Jo kinne dit dwaan troch in grut "
-"oantal berjochten nei josels te stjoeren en se yn ien kear fan de POP-tsjinner "
-"yn te laden."
+"oantal berjochten nei josels te stjoeren en se yn ien kear fan de POP-"
+"tsjinner yn te laden."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Dizze tsjinner stipet gjin unike berjochtnûmers, dit is in fereaske by it "
 "efterlitten fan berjochten op de tsjinner. Dizze opsje is dêrom útskeakele.\n"
@@ -625,11 +636,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Mei dizze tsjinner kinne jo gjin berjochtkoppen ophelje, wat wol in fereaske is "
-"om berjochten op de tsjinner te filterjen. Dizze opsje is dêrom útskeakele.\n"
+"Mei dizze tsjinner kinne jo gjin berjochtkoppen ophelje, wat wol in fereaske "
+"is om berjochten op de tsjinner te filterjen. Dizze opsje is dêrom "
+"útskeakele.\n"
 "Omdat guon tsjinners har mooglikheden net goed oanjouwe kin it wêze dat jo "
 "dizze opsje dochs oansette kinne."
 
@@ -711,8 +723,8 @@ msgstr "IMAP-akkount"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Jo moatte yn it netwurkdiel fan KMail's ynsttelings earst in akkount ynjaan "
 "foardat jo, jo e-post ophelje kinne."
@@ -751,13 +763,13 @@ msgstr "Wolkom by KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Jo binne foar in earste kear mei KMail begon. Jo kinne mei help fan dizze "
-"assistint fluch jo e-postakkounts ynstelle. Folje de ferbiningsdata yn op de "
-"folgende siden. De nedige data moat troch jo kedizer útrikt wêze.</qt>"
+"<qt>Jo binne foar in earste kear mei KMail begon. Jo kinne mei help fan "
+"dizze assistint fluch jo e-postakkounts ynstelle. Folje de ferbiningsdata yn "
+"op de folgende siden. De nedige data moat troch jo kedizer útrikt wêze.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -819,8 +831,7 @@ msgstr "Lokale besoarging oanhâlde"
 msgid "Server Information"
 msgstr "Tsjinnerynformaasje"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Gjin"
@@ -914,8 +925,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Der is gjin ark foar it ûntdekken fan ûnpost fûn. Ynstallearje san programma "
-"en begjin opnij mei dizze assistint.</p>"
+"<p>Der is gjin ark foar it ûntdekken fan ûnpost fûn. Ynstallearje san "
+"programma en begjin opnij mei dizze assistint.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -959,27 +970,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Dizze assistint help jo by it opsetten fan filters sadat KMail brûk meitsje "
-"kin fan folle brûkte antyfirus-programma's.</p> "
-"<p>Dizze programma's besjogge jo e-postberjochten en kinne efterhelje of it "
-"berjocht wol of net in firus befettet. De assistint sil neat dwaan mei jo "
-"besteande filters, der wurde inkel nije filter taheakke.</p> "
-"<p><b>Warskôging:</b> KMail kin ûnder it skennen om berjochten mei ûnpost "
-"beferzen lykje, It kin dan wêze dat Kmail net wurket lykas oars omdat dizze "
-"hanneling folle tiid opeasket. Jo kinne der oernei tinke om de filterregels te "
-"wiskjen om de âlde belibbing werom te krijen."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Dizze assistint help jo by it opsetten fan filters sadat KMail brûk "
+"meitsje kin fan folle brûkte antyfirus-programma's.</p> <p>Dizze programma's "
+"besjogge jo e-postberjochten en kinne efterhelje of it berjocht wol of net "
+"in firus befettet. De assistint sil neat dwaan mei jo besteande filters, der "
+"wurde inkel nije filter taheakke.</p> <p><b>Warskôging:</b> KMail kin ûnder "
+"it skennen om berjochten mei ûnpost beferzen lykje, It kin dan wêze dat "
+"Kmail net wurket lykas oars omdat dizze hanneling folle tiid opeasket. Jo "
+"kinne der oernei tinke om de filterregels te wiskjen om de âlde belibbing "
+"werom te krijen."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -987,8 +997,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Selektearje de programma's dy't jo brûke wolle foar it werkennen fan ûnpost "
-"en gean nei de neikommende side.</p>"
+"<p>Selektearje de programma's dy't jo brûke wolle foar it werkennen fan "
+"ûnpost en gean nei de neikommende side.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1016,15 +1026,13 @@ msgstr "Mooglike ûn&post ferpleatse nei:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "De standert map is it ynfak, mar jo kinne dit yn de ûndersteande mappenlist "
-"wizigje. "
-"<p>Net alle programma's kinne ûnpost as net-wis oantsjutte. Wannear jo gjin "
-"geskikt programma hawwe kinne jo ek gjin map selektearje."
+"wizigje. <p>Net alle programma's kinne ûnpost as net-wis oantsjutte. Wannear "
+"jo gjin geskikt programma hawwe kinne jo ek gjin map selektearje."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1034,13 +1042,13 @@ msgstr "Berjochten kontrolearje mei help fan antyfirusprogramma's"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Lit de antyfirusprogramma's jo berjochten kontrolearje. De assistint sil "
-"dêrfoar de nedige filters oanmeitsje. De besmette berjochten wurde meastentiids "
-"troch it antyfirusprogramma markearre sadat jo se mei help fan in oar filter "
-"nei in beskate map ferpleatse kinne."
+"dêrfoar de nedige filters oanmeitsje. De besmette berjochten wurde "
+"meastentiids troch it antyfirusprogramma markearre sadat jo se mei help fan "
+"in oar filter nei in beskate map ferpleatse kinne."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1049,12 +1057,12 @@ msgstr "Ferpleats de ûntdutsen ynfektearre berjochten nei de selektearre map"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"In filter om ynfektearre berjochten te ûntdekken en se dan nei in beskate map "
-"te pleatsen. De standert map is it jiskefet, mar dat kinne jo yn de mapwerjefte "
-"wizigje."
+"In filter om ynfektearre berjochten te ûntdekken en se dan nei in beskate "
+"map te pleatsen. De standert map is it jiskefet, mar dat kinne jo yn de "
+"mapwerjefte wizigje."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1062,8 +1070,8 @@ msgstr "Markearret troffen ynfektearre berjochten as lêzen"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Markearret troffen ynfektearre berjochten as lêzen en pleatst dizzen yn de "
 "selektearre map."
@@ -1247,8 +1255,8 @@ msgid ""
 "communication is here:"
 msgstr ""
 "Dit kin komme omdat jo gjin tagongsrjochten hawwe om dizze hanneling út te "
-"fieren, of omdat de map al op de tsjinner stiet. Hjir is de flatermeldng fan de "
-"tsjinner."
+"fieren, of omdat de map al op de tsjinner stiet. Hjir is de flatermeldng fan "
+"de tsjinner."
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1261,8 +1269,8 @@ msgstr "Flater by it lêzen fan map %1 fan de tsjinner:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1282,8 +1290,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1314,21 +1322,20 @@ msgstr "Wiske"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Gjin fan jo identiteiten komme oerien mei de ûntfanger fan dit berjocht. "
 "<br>Meitsje de kar foar hokker jowes is (as oanwêzich):"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Meardere fan jo identiteiten komme oerien mei de ûntfanger fan dit "
-"berjocht."
-"<br>Meitsje de kar foar hokker jowes is:"
+"berjocht.<br>Meitsje de kar foar hokker jowes is:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1359,18 +1366,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dizze ynstelling is reparearre troch jo systeembehearder.</p> "
-"<p>As jo it dêrmei net iens binne, nim dan kontakt op mei him of har.</p></qt>"
+"<qt><p>Dizze ynstelling is reparearre troch jo systeembehearder.</p> <p>As "
+"jo it dêrmei net iens binne, nim dan kontakt op mei him of har.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Profyl &lade..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Akkount ynstelle"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Taheakje..."
@@ -1400,6 +1410,11 @@ msgstr "<qt>Wolle jo wier de identiteit neamd <b>\"%1\"</b> fuortsmite?</qt>"
 msgid "Remove Identity"
 msgstr "Identiteit fuortsmite"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Fuortsmit&e"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Taheakje..."
@@ -1408,6 +1423,11 @@ msgstr "Taheakje..."
 msgid "Modify..."
 msgstr "Wizigje..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Fuortsmit&e"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Ynstelle as standert"
@@ -1424,17 +1444,15 @@ msgstr "Fer&stjoere"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Utgeande akkounts (Foegje yn elts gefal ien akkount ta):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Namme"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1456,8 +1474,7 @@ msgstr "Ynstelle as standert"
 msgid "Common Options"
 msgstr "Algemiene opsjes"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Fer&stjoere befêstigje"
@@ -1508,17 +1525,16 @@ msgstr "S&tandertdomein:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>It standert domein wurdt brûkt om e-postadressen dy allinne bestean út in "
-"brûkersnamme oan te foljen.</p></qt>"
+"<qt> <p>It standert domein wurdt brûkt om e-postadressen dy allinne bestean "
+"út in brûkersnamme oan te foljen.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1536,9 +1552,9 @@ msgstr "Transport taheakje"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (standert)"
 
@@ -1621,6 +1637,10 @@ msgstr "Akkount bewurkje"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>It akkount <b>%1</b> is net fûn.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Kle&uren"
@@ -1729,8 +1749,7 @@ msgstr "Folge keppeling"
 msgid "Misspelled Words"
 msgstr "Wurdflaters"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nij berjocht"
@@ -1920,11 +1939,11 @@ msgstr "Diskusjes binne stan&dert sluten"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Diskusjes iepenje as se nije, &net-lêzen of wichtige berjochten befetsje of at "
-"se observearre wurde."
+"Diskusjes iepenje as se nije, &net-lêzen of wichtige berjochten befetsje of "
+"at se observearre wurde."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1932,73 +1951,58 @@ msgstr "Datumwerjefte"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Dizze ekspresjes kinne brûkt wurde foar de datum:</strong></p>"
-"<ul>"
-"<li>d - de dei as getal sûnder nul oan it begjin (1-31)</li>"
-"<li>dd - de dei as getal mei in nul oan it begjin (01-31)</li>"
-"<li>ddd - de ôfkoarting fan de dei (mo - sn)</li>"
-"<li>dddd - de folsleine namme fan de dei (moandei - snein)</li>"
-"<li>M - de moanne as getal sûnder nul oan it begjin (1-12)</li>"
-"<li>MM - de moanne as getal mei in nul oan it begjin (01-12)</li>"
-"<li>MMM - de ôfkoarting fan de namme (jan - des)</li>"
-"<li>MMMM - de folsleine namme fan de moanne (jannewaris - desimber)</li>"
-"<li>yy - it jier yn twa sifers (00-99)</li>"
-"<li>yyyy - it jier yn fjouwer sifers (0000-9999)</li></ul>"
-"<p><strong>Dizze ekspresjes mei brûkt wurde foar de tiid:</string></p> "
-"<ul>"
-"<li>h - it oere sûnder nul oan it begjin (0-23 of 1-12 by AM/PM-werjefte)</li>"
-"<li>hh - it oere mei in nul oan it begjin (00-23 of 01-12 by "
-"AM/PM-werjefte)</li>"
-"<li>m - de minuten sûnder nul oan it begjin (0-59)</li>"
-"<li>mm - de minuten mei in nul oan it begjin (00-59)</li>"
-"<li>s - de sekonden sûnder nul oan it begjin (0-59)</li>"
-"<li>ss - de sekonden mei in nul oan it begjin (00-59)</li>"
-"<li>z - de milisekonden sûnder nullen oan it begjin (0-999)</li>"
-"<li>zzz - de milisekonden mei nullen oan it begjin (000-999)</li>"
-"<li>AP - skealel oer op AM/PM-werjefte. AP sil ferfongen wurde troch \"AM\" of "
-"\"PM\".</li>"
-"<li>ap - skeakel oer op AM/PM-werjefte. ap sil ferfongen wurde troch \"am\" of "
-"\"pm\".</li>"
-"<li>Z - tiidsône yn numerike foarm (-0500)</li></ul>"
-"<p><strong>Alle oare ynfiertekens sille negearre wurde.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Dizze ekspresjes kinne brûkt wurde foar de datum:</strong></"
+"p><ul><li>d - de dei as getal sûnder nul oan it begjin (1-31)</li><li>dd - "
+"de dei as getal mei in nul oan it begjin (01-31)</li><li>ddd - de ôfkoarting "
+"fan de dei (mo - sn)</li><li>dddd - de folsleine namme fan de dei (moandei - "
+"snein)</li><li>M - de moanne as getal sûnder nul oan it begjin (1-12)</"
+"li><li>MM - de moanne as getal mei in nul oan it begjin (01-12)</li><li>MMM "
+"- de ôfkoarting fan de namme (jan - des)</li><li>MMMM - de folsleine namme "
+"fan de moanne (jannewaris - desimber)</li><li>yy - it jier yn twa sifers "
+"(00-99)</li><li>yyyy - it jier yn fjouwer sifers (0000-9999)</li></"
+"ul><p><strong>Dizze ekspresjes mei brûkt wurde foar de tiid:</string></p> "
+"<ul><li>h - it oere sûnder nul oan it begjin (0-23 of 1-12 by AM/PM-"
+"werjefte)</li><li>hh - it oere mei in nul oan it begjin (00-23 of 01-12 by "
+"AM/PM-werjefte)</li><li>m - de minuten sûnder nul oan it begjin (0-59)</"
+"li><li>mm - de minuten mei in nul oan it begjin (00-59)</li><li>s - de "
+"sekonden sûnder nul oan it begjin (0-59)</li><li>ss - de sekonden mei in nul "
+"oan it begjin (00-59)</li><li>z - de milisekonden sûnder nullen oan it "
+"begjin (0-999)</li><li>zzz - de milisekonden mei nullen oan it begjin "
+"(000-999)</li><li>AP - skealel oer op AM/PM-werjefte. AP sil ferfongen wurde "
+"troch \"AM\" of \"PM\".</li><li>ap - skeakel oer op AM/PM-werjefte. ap sil "
+"ferfongen wurde troch \"am\" of \"pm\".</li><li>Z - tiidsône yn numerike "
+"foarm (-0500)</li></ul><p><strong>Alle oare ynfiertekens sille negearre "
+"wurde.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"It wizigjen fan globale ynstellings foar diskusjes sil alle spesifike wearden "
-"fan mappen oerskriuwe."
+"It wizigjen fan globale ynstellings foar diskusjes sil alle spesifike "
+"wearden fan mappen oerskriuwe."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2012,8 +2016,7 @@ msgstr "HTML-tastâ&nbalke sjen litte"
 msgid "Show s&pam status in fancy headers"
 msgstr "Un&posttastân yn elegante koppen sjen litte"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Glimkes ferfange troch emoglimkes"
@@ -2022,8 +2025,7 @@ msgstr "Glimkes ferfange troch emoglimkes"
 msgid "Use smaller font for quoted text"
 msgstr "Lytser lettertype foar sitearre tekst brûke"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "markearrings foar it út- of ynfâldzjen fan sitearings sjen litte"
@@ -2049,8 +2051,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "Primêre tekensetk&odearring:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Systeemfakbyldkaike ynskeakelje"
@@ -2153,23 +2154,21 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>De neikommende plakhâlders wurde stipe yn de antwurdútdrukkings: "
-"<br><b>%D</b>: datum, <b>%S</b>: ûnderwerp, "
-"<br><b>%e</b>: adres fan stjoerder, <b>%F</b>: namme fan de stjoerder, <b>%f</b>"
-": inisjalen fan de stjoerder, "
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>De neikommende plakhâlders wurde stipe yn de antwurdútdrukkings: <br><b>"
+"%D</b>: datum, <b>%S</b>: ûnderwerp, <br><b>%e</b>: adres fan stjoerder, <b>"
+"%F</b>: namme fan de stjoerder, <b>%f</b>: inisjalen fan de stjoerder, "
 "<br><b>%T</b>: namme fan de ûntfanger, <b>%t</b>: namme en adres fan de "
 "ûntfanger\n"
-"<br><b>%C</b>: nammen foar de kopy (CC), <b>%c</b>: nammen foar de bline kopy "
-"(BCC), "
-"<br><b>%%</b>: prosintteken, <b>%_</b>: spaasje, <b>%L</b>: rigelein</qt>"
+"<br><b>%C</b>: nammen foar de kopy (CC), <b>%c</b>: nammen foar de bline "
+"kopy (BCC), <br><b>%%</b>: prosintteken, <b>%_</b>: spaasje, <b>%L</b>: "
+"rigelein</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2192,21 +2191,20 @@ msgstr "Eltsenien &beäntwurdzje:"
 msgid "&Forward:"
 msgstr "&Trochstjoere:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Sitearoantsjutting:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Op %D, haw jo skreaun:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Op %D, hat %F skreaun:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Trochstjoerd berjocht"
 
@@ -2244,11 +2242,11 @@ msgstr "Nij trochstjoer-foarheaksel ynfiere:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Dizze list wurdt fan boppe nei ûnder kontrolearre op elts útgeand berjocht foar "
-"in tekenset dy't alle nedige tekens befettet."
+"Dizze list wurdt fan boppe nei ûnder kontrolearre op elts útgeand berjocht "
+"foar in tekenset dy't alle nedige tekens befettet."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2283,10 +2281,9 @@ msgstr "Wearde"
 msgid "Ne&w"
 msgstr "&Nij"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Namme:"
@@ -2295,19 +2292,18 @@ msgstr "&Namme:"
 msgid "&Value:"
 msgstr "&Wearde:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Taheakselnammejouwing kompetibel mei Outlook(tm)"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Set dizze opsje oan om der foar te soargjen dat Outlook(tm) de taheakselnammen "
-"begrypt dy't gjin Westeuropeeske tekens befetsje"
+"Set dizze opsje oan om der foar te soargjen dat Outlook(tm) de "
+"taheakselnammen begrypt dy't gjin Westeuropeeske tekens befetsje"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2335,21 +2331,22 @@ msgstr "taheakke"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Jo hawwe der foar keazen om de taheakselnammen te kodearjen dy't net-Ingelske "
-"tekens befetsje. Outlook(tm) en oare e-postprogramma's dy't gjin stipe foar "
-"dizze taheakselnammen hawwe sille dizze nammen net ferwurkje kinne.\n"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Jo hawwe der foar keazen om de taheakselnammen te kodearjen dy't net-"
+"Ingelske tekens befetsje. Outlook(tm) en oare e-postprogramma's dy't gjin "
+"stipe foar dizze taheakselnammen hawwe sille dizze nammen net ferwurkje "
+"kinne.\n"
 "Hâld der rekken mei dat KMail by it opstellen fan berjochten fan de standert "
 "ôfwikke kin, sa dat programma's dy har wol oan de standert hâlde it net goed "
-"ferwurkje kinne. Jo moatte dizze opsje dus net oansette, of jo moatte it wier "
-"nedich ha."
+"ferwurkje kinne. Jo moatte dizze opsje dus net oansette, of jo moatte it "
+"wier nedich ha."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2373,115 +2370,102 @@ msgstr "Krypto efterei&n"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>E-berjochten wurde soms yn beide formaten ferstjoerd. Mei dizze opsje "
-"beskiede jo of jo it HTML- of platte tekstdiel sjen litte wol.</p>"
-"<p> It werjaan fan it HTML-diel soarget foar in moaiere úterlik, mar ferheget "
-"ek it risiko op misbrûk fan eventuele befeiligingsgatten.</p>"
-"<p>By it werjaan fan platte tekst ferlieze jo folle fan de opmaak fan it "
-"berjocht, mar it is dan hast <em>ûnmooglik</em> om misbrûk te meitsjen fan "
-"eventuele befeiligingsgatten yn it HTML-werjefteprogramma (Konqueror).</p>"
-"<p>De opsje hjirûnder beskermet jo tsjin in algemien gebrûk fan  "
-"HTML-berjochten. Mar se kin jo net beskermje tsjin befeiligingsrisiko's dy't "
-"ûnbekend wienen op it momint dat dizze ferzje fan KMail skreaun wurde. </p>"
-"<p>Dêrom is it oan te rieden om<em>gjin</em> HTML ynstee fan platte tekst as "
-"foarkar te hawwen.</p>"
-"<p><b>Taljochting: Jo kinne dizze opsje de map ynstelle mei help fan it menu <i>"
-"Map</i> fan KMail's haadfinster.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>E-berjochten wurde soms yn beide formaten ferstjoerd. Mei dizze opsje "
+"beskiede jo of jo it HTML- of platte tekstdiel sjen litte wol.</p><p> It "
+"werjaan fan it HTML-diel soarget foar in moaiere úterlik, mar ferheget ek it "
+"risiko op misbrûk fan eventuele befeiligingsgatten.</p><p>By it werjaan fan "
+"platte tekst ferlieze jo folle fan de opmaak fan it berjocht, mar it is dan "
+"hast <em>ûnmooglik</em> om misbrûk te meitsjen fan eventuele "
+"befeiligingsgatten yn it HTML-werjefteprogramma (Konqueror).</p><p>De opsje "
+"hjirûnder beskermet jo tsjin in algemien gebrûk fan  HTML-berjochten. Mar se "
+"kin jo net beskermje tsjin befeiligingsrisiko's dy't ûnbekend wienen op it "
+"momint dat dizze ferzje fan KMail skreaun wurde. </p><p>Dêrom is it oan te "
+"rieden om<em>gjin</em> HTML ynstee fan platte tekst as foarkar te hawwen.</"
+"p><p><b>Taljochting: Jo kinne dizze opsje de map ynstelle mei help fan it "
+"menu <i>Map</i> fan KMail's haadfinster.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>By guon e-postreklame wurde ôfbyldings dy't yn it berjocht te sjen binne net "
-"mei it berjocht meistjoerd, mar fia it ynternet ophelle fan de tsjinner fan de "
-"stjoerder. Hjirtroch kin de advertearder neigean of jo har reklame iepene ha "
-"(&quot;web bugs&quot;).</p>"
-"<p>Dit kinne jo sjen as in ynbrekking op jo privacy, en soarget by net-winske "
-"reklame faak foar noch mear reklame berjochten fan dyselde advertearder. Der is "
-"gjin inkele reden om ôfbyldings fia it ynternet yn te laden, ôfbyldings kinne "
-"ommers sa yn it berjocht pleatst wurde.</p>"
-"<p>Om jo te beskerjen tsjin dizze foarm fan misbrûk fan de html-werjefte yn "
-"KMail is dizze opsje standert <em>útskeakele</em>.</p>"
-"<p>As jo dochs de ôfbyldings werjaan wolle yn e-berjochten, dan kinne jo dizze "
-"opsje aktivearje. Hâld dan wol rekken mei dizze mooglike swierrichheid.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>By guon e-postreklame wurde ôfbyldings dy't yn it berjocht te sjen "
+"binne net mei it berjocht meistjoerd, mar fia it ynternet ophelle fan de "
+"tsjinner fan de stjoerder. Hjirtroch kin de advertearder neigean of jo har "
+"reklame iepene ha (&quot;web bugs&quot;).</p><p>Dit kinne jo sjen as in "
+"ynbrekking op jo privacy, en soarget by net-winske reklame faak foar noch "
+"mear reklame berjochten fan dyselde advertearder. Der is gjin inkele reden "
+"om ôfbyldings fia it ynternet yn te laden, ôfbyldings kinne ommers sa yn it "
+"berjocht pleatst wurde.</p><p>Om jo te beskerjen tsjin dizze foarm fan "
+"misbrûk fan de html-werjefte yn KMail is dizze opsje standert "
+"<em>útskeakele</em>.</p><p>As jo dochs de ôfbyldings werjaan wolle yn e-"
+"berjochten, dan kinne jo dizze opsje aktivearje. Hâld dan wol rekken mei "
+"dizze mooglike swierrichheid.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt> "
-"<h3>Belied foar ûntfangst- en lêzenbefêstigingsnotifikaasjes</h3> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt> <h3>Belied foar ûntfangst- en lêzenbefêstigingsnotifikaasjes</h3> "
 "<p>MDN is in algemiene namme foar sa neamde <b>ûntfangst- en "
-"lêzenbefêstigings</b>. De skriuwer fan it berjocht freget om befêstiging foar "
-"ûntfangst en lêzen en it e-postprogramma fan de ûntfanger ferstjoerd in antwurd "
-"wêrút de skriuwer kin efterhelje wat der mei syn berjocht dien is. Bekende "
-"types binne: <b>werjûn</b> (dus lêzen), <b>wiske</b> en <b>trochstjoerd</b>"
-". Foar it ferstjoeren fan befêstigings hat KMail de neikommende "
-"ynstelmooglikheden: </p> "
-"<p> </p>"
-"<ul>"
-"<li><em>Negearje</em>: freegjen om befêstiging negearje. Der wurdt yn gjin "
-"gefal automatysk in befêstiging stjoerd. (rekommandearre)</li> "
-"<li><em>Freegje</em>:Befêstigings wurde ferstjoerd as jo der tastimming foar "
-"jûn hawwe.</li> "
-"<li><em>Wegerje</em>:Der wurdt altyd mei in <b>wegermeidieling</b> "
-"beäntwurde. Dit is <em>wat</em> better dan altyd MDN's ferstjoere. De skriuwer "
-"wit ommers dat der wat mei it berjocht dien is, hy/sy kin net neigean wat der "
-"mei dien is (lêzen, wiske, enzfh.). </li>"
-"<li><em>Altyd ferstjoere</em>: Altyd in befêstiging ferstjoere. Dit jout oan da "
-"t de brûker altyd in befêstiging krijt dat der wat mei it berjocht dien is, en "
-"dêr boppe op ek wat der mei dien is (werjûn, wiske, enzfh.). Dizze opsje is "
-"hanich foar e-postbehear yn grutte organisaasjes, mar wurdt y.f.m.mooglike "
-"ynbrek op jo privacy net oanret foar normaal e-postgebrûk. </li></ul></qt>"
+"lêzenbefêstigings</b>. De skriuwer fan it berjocht freget om befêstiging "
+"foar ûntfangst en lêzen en it e-postprogramma fan de ûntfanger ferstjoerd in "
+"antwurd wêrút de skriuwer kin efterhelje wat der mei syn berjocht dien is. "
+"Bekende types binne: <b>werjûn</b> (dus lêzen), <b>wiske</b> en "
+"<b>trochstjoerd</b>. Foar it ferstjoeren fan befêstigings hat KMail de "
+"neikommende ynstelmooglikheden: </p> <p> </p><ul><li><em>Negearje</em>: "
+"freegjen om befêstiging negearje. Der wurdt yn gjin gefal automatysk in "
+"befêstiging stjoerd. (rekommandearre)</li> <li><em>Freegje</em>:Befêstigings "
+"wurde ferstjoerd as jo der tastimming foar jûn hawwe.</li> <li><em>Wegerje</"
+"em>:Der wurdt altyd mei in <b>wegermeidieling</b> beäntwurde. Dit is "
+"<em>wat</em> better dan altyd MDN's ferstjoere. De skriuwer wit ommers dat "
+"der wat mei it berjocht dien is, hy/sy kin net neigean wat der mei dien is "
+"(lêzen, wiske, enzfh.). </li><li><em>Altyd ferstjoere</em>: Altyd in "
+"befêstiging ferstjoere. Dit jout oan da t de brûker altyd in befêstiging "
+"krijt dat der wat mei it berjocht dien is, en dêr boppe op ek wat der mei "
+"dien is (werjûn, wiske, enzfh.). Dizze opsje is hanich foar e-postbehear yn "
+"grutte organisaasjes, mar wurdt y.f.m.mooglike ynbrek op jo privacy net "
+"oanret foar normaal e-postgebrûk. </li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2497,15 +2481,15 @@ msgstr "E-berjochten tastean om e&ksterne ferwizings fan it ynternet te laden"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<qt><b>WARSKOGING:</b> it brûken fan HTML yn e-post kin de kâns fergrutsje dat "
-"jo systeem gefoelich wurdt foar ynbrekkings fia befeiligingsgatten. <a "
-"href=\"whatsthis:%1\">Mear ynformaasje oer HTML-berjochten..</a> "
-"<a href=\"whatsthis:%2\">Mear ynformaasje oer eksterne ferwizings...</a>"
+"<qt><b>WARSKOGING:</b> it brûken fan HTML yn e-post kin de kâns fergrutsje "
+"dat jo systeem gefoelich wurdt foar ynbrekkings fia befeiligingsgatten. <a "
+"href=\"whatsthis:%1\">Mear ynformaasje oer HTML-berjochten..</a> <a href="
+"\"whatsthis:%2\">Mear ynformaasje oer eksterne ferwizings...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2566,9 +2550,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<qt>"
-"<p><b>WARSKOGING:</b> Blynwei befêstigings  retournearje ûnderstekt jo privacy. "
-"<a href=\"whatsthis:%1\">Mear...</a>"
+"<qt><p><b>WARSKOGING:</b> Blynwei befêstigings  retournearje ûnderstekt jo "
+"privacy. <a href=\"whatsthis:%1\">Mear...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2582,15 +2565,14 @@ msgstr "Kaaien en sertifikaten automatysk importearje"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"It wizigjen fan de globale HTML-ynstellings sil alle mapspesifike ynstellings "
-"oerskriuwe."
+"It wizigjen fan de globale HTML-ynstellings sil alle mapspesifike "
+"ynstellings oerskriuwe."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Dizze opsje fereasket dirmngr 0.9.0 of nijer"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "gjin proxy"
@@ -2620,8 +2602,8 @@ msgstr "Berjocht markearre as wicht&ich net ferrinne litte"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "By it sykjen nei net-lêzen berjochten:"
 
@@ -2645,8 +2627,8 @@ msgstr "Alle mappen trochrinne"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "By it binnengean fan in map:"
 
@@ -2715,27 +2697,24 @@ msgstr "Triemtafels (fan it type \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Hjirmei selektearje jo de standert postfakopmaak foar lokale mappen:</p>"
-"<p><b>mbox:</b> KMail makket foar eltse e-postmap in triem oan. yndividuele "
-"berjochten wurde yn dizze triem fan elkoar skieden troch in rigel dy begjint "
-"mei \"From:\". Dit besparret skiifromte, mar kin mooglik minder robúst wêze, "
-"bgl. by it ferpleatsen fan berjochten tusken e-postmappen.</p>"
-"<p><b>maildir:</b> KMail makket foar eltse e-postmap in echte map op de skiif "
-"oan. Yndividuele berjochten binne aparte triemmen yn dizze mappen. Dit nimt wat "
-"mear skiifromte yn, mar it is robúster, seker by it ferpleatsen fan berjochten "
-"tusken mappen.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Hjirmei selektearje jo de standert postfakopmaak foar lokale mappen:</"
+"p><p><b>mbox:</b> KMail makket foar eltse e-postmap in triem oan. "
+"yndividuele berjochten wurde yn dizze triem fan elkoar skieden troch in "
+"rigel dy begjint mei \"From:\". Dit besparret skiifromte, mar kin mooglik "
+"minder robúst wêze, bgl. by it ferpleatsen fan berjochten tusken e-"
+"postmappen.</p><p><b>maildir:</b> KMail makket foar eltse e-postmap in echte "
+"map op de skiif oan. Yndividuele berjochten binne aparte triemmen yn dizze "
+"mappen. Dit nimt wat mear skiifromte yn, mar it is robúster, seker by it "
+"ferpleatsen fan berjochten tusken mappen.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2768,53 +2747,44 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>As jo mei it neikommende berjocht ljeppe, dan kin it barre dat der gjin "
-"net-lêzen berjochten ûnder it aktive berjocht steane.</p> "
-"<p><b>Net trochrinne:</b> de sykopdracht stoppet by it lêste berjocht yn de "
-"aktive map.</p> "
-"<p><b>Aktive map trochrinne:</b> de sykopdracht sil fierdergean mei it earste "
-"berjocht yn de map, mar net nei in oare map gean.</p> "
-"<p><b>Alle mappen trochrinne:</b> de sykopdracht sil trochgean by it earste "
-"berjocht yn de neikommende map.</p> "
-"<p>By it sykjen om it foarige net-lêzen sil de sykopdracht, ôfhinklik fan de "
-"keazen ynstelling, begjinne by it lêste berjocht yn de map en fierder sykje yn "
-"de foarige map.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>As jo mei it neikommende berjocht ljeppe, dan kin it barre dat der "
+"gjin net-lêzen berjochten ûnder it aktive berjocht steane.</p> <p><b>Net "
+"trochrinne:</b> de sykopdracht stoppet by it lêste berjocht yn de aktive map."
+"</p> <p><b>Aktive map trochrinne:</b> de sykopdracht sil fierdergean mei it "
+"earste berjocht yn de map, mar net nei in oare map gean.</p> <p><b>Alle "
+"mappen trochrinne:</b> de sykopdracht sil trochgean by it earste berjocht yn "
+"de neikommende map.</p> <p>By it sykjen om it foarige net-lêzen sil de "
+"sykopdracht, ôfhinklik fan de keazen ynstelling, begjinne by it lêste "
+"berjocht yn de map en fierder sykje yn de foarige map.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>It yndeksearjen fan folsleine teksten makket it mooglik om fluch de ynhâld "
-"fan jo berjochten troch te sykjen. Wannear jo hjir brûk fan meitsje, sille jo "
-"sjen dat it sykfinster in stik flugger wurket. Ek sil de sykbalke jo berjochten "
-"selektearje basearre op har ynhâld.</p> "
-"<p>San yndeks nimt mear romte yn op jo hurde skiif.</p> "
-"<p>Nei dat jo dit oanset hawwe wurdt de yndeks oanmakke, mar jo kinne yn de "
-"tuskentiid noch gewoan mei KMail wurkjel.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>It yndeksearjen fan folsleine teksten makket it mooglik om fluch de "
+"ynhâld fan jo berjochten troch te sykjen. Wannear jo hjir brûk fan meitsje, "
+"sille jo sjen dat it sykfinster in stik flugger wurket. Ek sil de sykbalke "
+"jo berjochten selektearje basearre op har ynhâld.</p> <p>San yndeks nimt "
+"mear romte yn op jo hurde skiif.</p> <p>Nei dat jo dit oanset hawwe wurdt de "
+"yndeks oanmakke, mar jo kinne yn de tuskentiid noch gewoan mei KMail wurkjel."
+"</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2881,11 +2851,11 @@ msgstr "Groupwaremappen &ferstopje"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Wannear dizze opsje selektearre is sjogge jo gjin IMAP databoarnemappen mear yn "
-"jo mappenstruktuer."
+"Wannear dizze opsje selektearre is sjogge jo gjin IMAP databoarnemappen mear "
+"yn jo mappenstruktuer."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2893,11 +2863,11 @@ msgstr "Allinne groupware-mappen foar dit akk&ount sjen litte"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Wannear dizze opsje selektearre is, sjogge jo gjin IMAP databoarnemappen mear "
-"yn de mappenstruktuer."
+"Wannear dizze opsje selektearre is, sjogge jo gjin IMAP databoarnemappen "
+"mear yn de mappenstruktuer."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2954,19 +2924,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Taheakselnammejouwing kompetibel mei Outlook(tm)"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatysk útnoegings ferstjoere"
@@ -2976,28 +2945,27 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Wannear dit oan stiet sil der gjin berjochtopsteller yn byld komme. "
-"E-berjochten mei útnoegings wurde automatysk ferstjoerd."
+"Wannear dit oan stiet sil der gjin berjochtopsteller yn byld komme. E-"
+"berjochten mei útnoegings wurde automatysk ferstjoerd."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Utnoegings wurde normaal sprutsen as taheaksels ferstjoerd. Dizze opsje sil "
-"fersoarje dat útnoegingsberjochten as tekst yn it e-berjocht pleatst wurde; dit "
-"is nedich om útnoegings en antwurden te ferstjoeren nei Microsoft Outlook. "
-"<br>It is wol sa dat der gjin ferstannige tekst oerbliuwt yn e-postprogramma's "
-"dy hjirmei net om kinne gean. Dat sil derta liede dat de berjochten yn dy "
-"programma's der frjemd út sille sjen. "
-"<br>Dit sil noch wol wurkje foar dyjinge dy e-postprogramma's brûke dy dit wol "
-"stypje.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Utnoegings wurde normaal sprutsen as taheaksels ferstjoerd. Dizze opsje "
+"sil fersoarje dat útnoegingsberjochten as tekst yn it e-berjocht pleatst "
+"wurde; dit is nedich om útnoegings en antwurden te ferstjoeren nei Microsoft "
+"Outlook. <br>It is wol sa dat der gjin ferstannige tekst oerbliuwt yn e-"
+"postprogramma's dy hjirmei net om kinne gean. Dat sil derta liede dat de "
+"berjochten yn dy programma's der frjemd út sille sjen. <br>Dit sil noch wol "
+"wurkje foar dyjinge dy e-postprogramma's brûke dy dit wol stypje.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3102,29 +3070,27 @@ msgstr "Trochstjoere"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hjir kinne jo eigen berjochtsjabloanen taheakje, bewurkje en wiskje foar it "
-"beäntwurdzjen en trochstjoeren fan in berjocht. Om in oanpaste sjabloan te "
-"meitsjen moatte jo mei it rjochtermûsknop of it arkbalkemanu it sjabloan "
-"selektearje. Jo kinn ek in fluchtoets oan it sjabloan takenne.</p>"
-"<p>Berjochtsjabloanen kinne plakhâlders befetsje troch se gewoan te typen of "
-"har te kiezen út it menu <i>Kommando ynfoegje</i>.</p>"
-"<p>Der binne fjouwer ferskillende sjabloanen: foar <i>Beäntwurdzje</i>, <i>"
-"Eltsenien beäntwurdzje</i>, <i>Trochstjoere</i>, en <i>Algemien</i> "
-"hokker foar ferskillende aksjes te brûken is. Jo kinne gjin fluchtoets takenne "
-"oan algemiene sjabloanen.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Hjir kinne jo eigen berjochtsjabloanen taheakje, bewurkje en wiskje "
+"foar it beäntwurdzjen en trochstjoeren fan in berjocht. Om in oanpaste "
+"sjabloan te meitsjen moatte jo mei it rjochtermûsknop of it arkbalkemanu it "
+"sjabloan selektearje. Jo kinn ek in fluchtoets oan it sjabloan takenne.</"
+"p><p>Berjochtsjabloanen kinne plakhâlders befetsje troch se gewoan te typen "
+"of har te kiezen út it menu <i>Kommando ynfoegje</i>.</p><p>Der binne "
+"fjouwer ferskillende sjabloanen: foar <i>Beäntwurdzje</i>, <i>Eltsenien "
+"beäntwurdzje</i>, <i>Trochstjoere</i>, en <i>Algemien</i> hokker foar "
+"ferskillende aksjes te brûken is. Jo kinne gjin fluchtoets takenne oan "
+"algemiene sjabloanen.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3141,15 +3107,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3225,8 +3191,8 @@ msgstr "Identiteit bewurkje"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3329,8 +3295,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Kin gjin berjochten ferrinne litte fan de map %1: de bestimmingsmap %2 is net "
-"fûn"
+"Kin gjin berjochten ferrinne litte fan de map %1: de bestimmingsmap %2 is "
+"net fûn"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3488,6 +3454,11 @@ msgstr "Map selektearje"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Alle tekst selektearje"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3519,8 +3490,8 @@ msgstr "&Filteraktiviteiten fêstlizze"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Hjir kinne jo it fêstlizzen fan filteraktiviteiten oan- of útsette. Der wurd "
 "allinne data fersammele en sjen litten as dizze opsje oanstiet."
@@ -3539,15 +3510,16 @@ msgstr "Filterevaluaasje fêstlizze"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Jo kinne it tal data ynstelle by it evaluearjen fan de filterregels: troch "
-"dizze opsje te selektearjen krije jo detaillearre data oer eltse filterregel. "
-"Jo kinne ek ynstelle dat allinne it resultaat fan de filters fêstlein moat "
-"wurde."
+"dizze opsje te selektearjen krije jo detaillearre data oer eltse "
+"filterregel. Jo kinne ek ynstelle dat allinne it resultaat fan de filters "
+"fêstlein moat wurde."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3567,15 +3539,15 @@ msgstr "Unbeheind"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "It sammeljen fan data kostet ûnhâld sadat it tydlik bewarre wurde kin. Hjir "
-"kinne jo ynstelle hoefolle ûnthâld dêrfoar maksimaal brûkt mei wurde: wannear "
-"oer dizze grins hinne gean wurdt sille it âldste data wiske wurde oant de "
-"grutte ûnder de grins leit."
+"kinne jo ynstelle hoefolle ûnthâld dêrfoar maksimaal brûkt mei wurde: "
+"wannear oer dizze grins hinne gean wurdt sille it âldste data wiske wurde "
+"oant de grutte ûnder de grins leit."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3585,7 +3557,7 @@ msgstr ""
 "Koe de triem %1 net skriuwe:\n"
 "\"%2\" is de detaillearre flatermelding."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail - flatermelding"
@@ -3626,12 +3598,12 @@ msgstr "&Brûkers-id:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"De brûkers-id is de oanmeldnamme fan de brûker op de IMAP-tsjinner. Dit kin in "
-"ynfâldige brûkersnamme wêze of it folsleine e-postadres fan de brûker. Jo "
+"De brûkers-id is de oanmeldnamme fan de brûker op de IMAP-tsjinner. Dit kin "
+"in ynfâldige brûkersnamme wêze of it folsleine e-postadres fan de brûker. Jo "
 "oanmelddata fan jo akkount sille wol melde hokker jo moat ynfolje."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3683,8 +3655,8 @@ msgstr "Jo hawwe gjin lês- of skriuwrjochten foar jo jiskefet."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Ynformaasje noch net fan de tsjinner helle, brûk \"Berjochten ophelje\"."
 
@@ -3696,8 +3668,7 @@ msgstr "Flater: Gjin IMAP-akkount foar dizze map oanmakke"
 msgid "Connecting to server %1, please wait..."
 msgstr "Dwaande mei it ferbinen mei tsjinner %1, In amerijke..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Flater by it ferbinen mei tsjinner %1"
@@ -3725,11 +3696,11 @@ msgstr "Tagongsrjochten taheakje"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Wolle jo wier jo tagongsrjochten fan dizze map fuortsmite? It is dan net mear "
-"mooglik om tagong ta dizze map te krijen."
+"Wolle jo wier jo tagongsrjochten fan dizze map fuortsmite? It is dan net "
+"mear mooglik om tagong ta dizze map te krijen."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3758,7 +3729,7 @@ msgstr "Gebrûk"
 msgid "Select Folder"
 msgstr "Map selektearje"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale mappen"
@@ -3782,13 +3753,13 @@ msgstr "Selektearje in fluchtoets foar de map"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Om in toets of in kombinaasje dêrfan te kiezen selektearje jo de aktive "
-"map, klikke jo op de ûndersteande knop en drukke jo op de toetsen dy jo foar dy "
-"map brûke wolle.</qt>"
+"map, klikke jo op de ûndersteande knop en drukke jo op de toetsen dy jo foar "
+"dy map brûke wolle.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3808,13 +3779,22 @@ msgstr "&Ofbrekke"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>De map dy jo wiske hawwe hearde by it akkount <b>%1</b>"
-", dy dêr berjochten yn pleatst. Berjochten dy op dat akkount binnenkomme sille "
-"yn it algemiene postfak terjochte komme.</qt>"
+"<qt>De map dy jo wiske hawwe hearde by it akkount <b>%1</b>, dy dêr "
+"berjochten yn pleatst. Berjochten dy op dat akkount binnenkomme sille yn it "
+"algemiene postfak terjochte komme.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3939,71 +3919,17 @@ msgstr "Unposttastân:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>b"
-"<br>e"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br>-<br>b<br>e<br>r<br>i<br>c<br>h<br>t</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>G"
-"<br>e"
-"<br>e"
-"<br>n"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>b"
-"<br>e"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>G<br>e<br>e<br>n<br><br>H<br>T<br>M<br>L<br>-"
+"<br>b<br>e<br>r<br>i<br>c<br>h<br>t</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4015,19 +3941,14 @@ msgstr "N&amme:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Jo namme</h3> "
-"<p> Dit fjild befettet de namme dy jo graach te sjen ha wolle yn de kop fan "
-"berjochten dy jo ferstjoere.</p> "
-"<p>As jo dit fjild leech litte, dan sil jo echte namme bet ferskine, mar "
-"allinne it e-postadres.</p></qt>"
+"<qt> <h3>Jo namme</h3> <p> Dit fjild befettet de namme dy jo graach te sjen "
+"ha wolle yn de kop fan berjochten dy jo ferstjoere.</p> <p>As jo dit fjild "
+"leech litte, dan sil jo echte namme bet ferskine, mar allinne it e-postadres."
+"</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4035,17 +3956,13 @@ msgstr "Organisaa&sje"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organisaasje</h3> "
-"<p>Dit fjild befettet de namme fan de organisaasje dy jo graach te sjen ha "
-"wolle yn de kop fan berjochten dy jo ferstjoere.</p> "
-"<p>Normaal litte jo dit fjild leech.</p></qt>"
+"<qt> <h3>Organisaasje</h3> <p>Dit fjild befettet de namme fan de "
+"organisaasje dy jo graach te sjen ha wolle yn de kop fan berjochten dy jo "
+"ferstjoere.</p> <p>Normaal litte jo dit fjild leech.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4054,20 +3971,16 @@ msgstr "&E-postadres:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>E-postadres</h3> "
-"<p>Dit fjild befettet allinne jo e-postadres.</p> "
+"<qt> <h3>E-postadres</h3> <p>Dit fjild befettet allinne jo e-postadres.</p> "
 "<p>As jo dit fjild leech litte, of der in net-just e-postadres ynsette, dan "
-"kinne de persoanen oan wa jo in e-post stjoere dizze net beäntwurdzje.</p></qt>"
+"kinne de persoanen oan wa jo in e-post stjoere dizze net beäntwurdzje.</p></"
+"qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4076,21 +3989,12 @@ msgstr "&E-postadres:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4113,21 +4017,18 @@ msgstr "Kies in OpenPGP-kaai wêrmei jo berjochten ûndertekenje wolle."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt> "
-"<p>De OpenPGP-kaai dy jo hjir kieze sil brûkt wurde om berjochten te "
+"<qt> <p>De OpenPGP-kaai dy jo hjir kieze sil brûkt wurde om berjochten te "
 "ûndertekenje en om dizzen mei jo eigen kaai te fersiferjen. Jo kinne ek brûk "
-"meitsje fan GnuPG-kaaien.</p>"
-"<p>Jo kinne dit fjild leech litte, mar KMail sil dan gjin berjochten digitaal "
-"ûndertekenje mei OpenPGP. Normale e-postfunksjes sille hjir gjin beheining fan "
-"hawwe.</p>"
-"<p>Jo fine mear ynformaasje oer kaaien op<a>http://www.gnupg.org</a></p></qt>"
+"meitsje fan GnuPG-kaaien.</p><p>Jo kinne dit fjild leech litte, mar KMail "
+"sil dan gjin berjochten digitaal ûndertekenje mei OpenPGP. Normale e-"
+"postfunksjes sille hjir gjin beheining fan hawwe.</p><p>Jo fine mear "
+"ynformaasje oer kaaien op<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4139,32 +4040,28 @@ msgstr "Jo OpenPGP-kaai foar fersifering"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Selektearje de OpenPGP-kaai wêrmei jo foar josels fersiferje en foar de opsje "
-"\"Myn publike kaai taheakje\" ûnder it opstellen fan in berjocht."
+"Selektearje de OpenPGP-kaai wêrmei jo foar josels fersiferje en foar de "
+"opsje \"Myn publike kaai taheakje\" ûnder it opstellen fan in berjocht."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>De OpenPGP-kaai dy jo hjir kieze sil brûkt wurde om berjochten te "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>De OpenPGP-kaai dy jo hjir kieze sil brûkt wurde om berjochten te "
 "fersiferjen foar josels en de opsje \"Myn publike kaai taheakje\" ûnder it "
-"opstellen fan in berjocht. Jo kinne ek brûk meitsje fan GnuPG-kaaien.</p>"
-"<p>Jo kinne dit fjild leech litte, mar  KMail sil dan gjin berjochten nei "
+"opstellen fan in berjocht. Jo kinne ek brûk meitsje fan GnuPG-kaaien.</"
+"p><p>Jo kinne dit fjild leech litte, mar  KMail sil dan gjin berjochten nei "
 "josels digitaal ûndertekenje mei OpenPGP. Normale e-postfunksjes sille hjir "
-"gjin beheining fan ûnderfine.</p>"
-"<p>Jo kinne mear ynformaasje oer de kaaien fine op <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"gjin beheining fan ûnderfine.</p><p>Jo kinne mear ynformaasje oer de kaaien "
+"fine op <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4184,18 +4081,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>It S/MIME-sertifikaat (X.509) dat jo hjir kieze sil brûkt wurde om jo "
-"berjochten digitaal te ûndertekenjen.</p>"
-"<p>Jo kinne dit fjild leech litte, mar KMail sil dan jo berjochten net digitaal "
-"ûndertekenje. Normale e-postfunksjes sille hjir gjin beheining fan "
-"ûnderfine.</p></qt>"
+"<qt> <p>It S/MIME-sertifikaat (X.509) dat jo hjir kieze sil brûkt wurde om "
+"jo berjochten digitaal te ûndertekenjen.</p><p>Jo kinne dit fjild leech "
+"litte, mar KMail sil dan jo berjochten net digitaal ûndertekenje. Normale e-"
+"postfunksjes sille hjir gjin beheining fan ûnderfine.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4207,28 +4101,26 @@ msgstr "Jo S/MIME-fersiferingsertifikaat"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Selektearje it S/MIME-sertifikaat wêrmei jo, jo berjocht foar josels en foar de "
-"opsje \"Myn sertifikaat taheakje\" ûnder it opstellen fan in berjocht."
+"Selektearje it S/MIME-sertifikaat wêrmei jo, jo berjocht foar josels en foar "
+"de opsje \"Myn sertifikaat taheakje\" ûnder it opstellen fan in berjocht."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>It S/MIME-sertifikaat dat jo hjir kieze sil brûkt wurde om berjochten foar "
-"josels te fersiferjen en foar de opsje \"Myn sertifikaat taheakje\" ûnder it "
-"opstellen fan in berjocht.</p> "
-"<p>Jo kinne dit leech litte, mar KMail sil dan net by steat wêze om kopyen fan "
-"de útgeande berjochten nei josels mei S/MIME te fersiferjen. Dit hat gjin "
-"ynfloed op de oare e-postfunksjes.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>It S/MIME-sertifikaat dat jo hjir kieze sil brûkt wurde om berjochten "
+"foar josels te fersiferjen en foar de opsje \"Myn sertifikaat taheakje\" "
+"ûnder it opstellen fan in berjocht.</p> <p>Jo kinne dit leech litte, mar "
+"KMail sil dan net by steat wêze om kopyen fan de útgeande berjochten nei "
+"josels mei S/MIME te fersiferjen. Dit hat gjin ynfloed op de oare e-"
+"postfunksjes.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4248,24 +4140,19 @@ msgstr "Antwu&rdadres:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Antwurdadres</h3> "
-"<p>Folje dit fjild yn sa jo wolle dat antwurde op berjochten nei in oar "
-"e-postadres ferstjoert wurde. "
-"<p>Dit wurdt meastal brûkt foar groepen dy oan in bepaald projekt wurkje. Jo "
-"kinne der dan mei dizze ynstelling foar soargje dat de adressearre kin sjen dat "
-"it berjocht fan jo ôfkomstich is, wylst de beäntwurding nei in "
-"groeps-e-postadres stjoerd wurdt.</p> "
-"<p>As jo twivelje, lit dit fjild dan mar leech.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Antwurdadres</h3> <p>Folje dit fjild yn sa jo wolle dat antwurde op "
+"berjochten nei in oar e-postadres ferstjoert wurde. <p>Dit wurdt meastal "
+"brûkt foar groepen dy oan in bepaald projekt wurkje. Jo kinne der dan mei "
+"dizze ynstelling foar soargje dat de adressearre kin sjen dat it berjocht "
+"fan jo ôfkomstich is, wylst de beäntwurding nei in groeps-e-postadres "
+"stjoerd wurdt.</p> <p>As jo twivelje, lit dit fjild dan mar leech.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4273,26 +4160,20 @@ msgstr "&BCC-adres:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC-adressen (bline kopy)</h3>"
-"<p>De adressen dy jo hjir ynfiere sille taheakke wurde oan elts útgeand "
-"e-berjocht dat ûnder dizze identiteit ferstjoerd wurdt, se sille sichtber wêze "
-"foar oare adressearen.</p> "
-"<p>Dit wurdt meastal brûkt foar it ferstjoeren fan in kopy fan elts berjocht "
-"nei in oar akkount fan jo.</p> "
-"<p>Om mear dan ien adres op te jaan, meitsje in list fan BCC-ûntfangers skieden "
-"troch in komma.</p>"
-"<p>As jo twifelje lit dan dit fjild leech.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC-adressen (bline kopy)</h3><p>De adressen dy jo hjir ynfiere "
+"sille taheakke wurde oan elts útgeand e-berjocht dat ûnder dizze identiteit "
+"ferstjoerd wurdt, se sille sichtber wêze foar oare adressearen.</p> <p>Dit "
+"wurdt meastal brûkt foar it ferstjoeren fan in kopy fan elts berjocht nei in "
+"oar akkount fan jo.</p> <p>Om mear dan ien adres op te jaan, meitsje in list "
+"fan BCC-ûntfangers skieden troch in komma.</p><p>As jo twifelje lit dan dit "
+"fjild leech.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4330,7 +4211,7 @@ msgstr "&Hantekening:"
 msgid "&Picture"
 msgstr "O&fbylding:"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Unjildich e-postadres"
 
@@ -4346,15 +4227,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Ien fan de ynstelde OpenPGP-kaaien foar ûndertekening befettet gjin brûkers-id "
-"mei in e-postadres foar dizze identiteit (%1).\n"
-"Dit kin liede ta warskôgings wannear jo besykje om hântekenings te ferifiearjen "
-"mei dizze ynstellings."
+"Ien fan de ynstelde OpenPGP-kaaien foar ûndertekening befettet gjin brûkers-"
+"id mei in e-postadres foar dizze identiteit (%1).\n"
+"Dit kin liede ta warskôgings wannear jo besykje om hântekenings te "
+"ferifiearjen mei dizze ynstellings."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Ien fan de ynstelde OpenPGP-kaaien foar fersifering befettet gjin brûkers-id "
 "mei in e-postadres foar dizze identiteit (%1)."
@@ -4368,16 +4249,16 @@ msgid ""
 msgstr ""
 "Ien fan de ynstelde  S/MIME-sertifikaten foar ûndertekening befettet gjin "
 "brûkers-id mei in e-postadres foar dizze identiteit (%1).\n"
-"Dit kin liede ta warskôgings wannear jo besykje om hântekenings te ferifiearjen "
-"mei dizze ynstellings."
+"Dit kin liede ta warskôgings wannear jo besykje om hântekenings te "
+"ferifiearjen mei dizze ynstellings."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Ien fan de ynstelde S/MIME-fersiferingsertifikaten befettet gjin brûkers-id mei "
-"in e-postadres foar dizze identiteit (%1)."
+"Ien fan de ynstelde S/MIME-fersiferingsertifikaten befettet gjin brûkers-id "
+"mei in e-postadres foar dizze identiteit (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4396,30 +4277,30 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"De oanpaste map mei ferstjoerde berjochten foar identiteit \"%1\" bestiet net "
-"(mear). ynstee dêrfan sil de standertmap foar ferstjoerde berjochten brûkt "
-"wurde."
+"De oanpaste map mei ferstjoerde berjochten foar identiteit \"%1\" bestiet "
+"net (mear). ynstee dêrfan sil de standertmap foar ferstjoerde berjochten "
+"brûkt wurde."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"De oanpaste ûntwerpmap foar identiteit \"%1\" bestiet net (mear). Ynstee dêrfan "
-"sil de standert ûntwerpmap brûkt wurde."
+"De oanpaste ûntwerpmap foar identiteit \"%1\" bestiet net (mear). Ynstee "
+"dêrfan sil de standert ûntwerpmap brûkt wurde."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"De oanpaste sjabloanmap foar identiteit \"%1\" bestiet net (mear). Ynstee sil "
-"de standert sjabloanmap brûkt wurde."
+"De oanpaste sjabloanmap foar identiteit \"%1\" bestiet net (mear). Ynstee "
+"sil de standert sjabloanmap brûkt wurde."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (standert)"
 
@@ -4462,24 +4343,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail hat in foarheaksel fûn yn de ynstellings fan akkount \"%1\". Dit is net "
-"nedich mei de stipe foar IMAP-nammeromten."
+"KMail hat in foarheaksel fûn yn de ynstellings fan akkount \"%1\". Dit is "
+"net nedich mei de stipe foar IMAP-nammeromten."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "De ynstellings binne automatysk oerset mar jo moatte jo akkount ynstellings "
 "noch wol kontrolearje."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"It wie net mooglik om jo ynstellings automatysk oer te setten, dus kontrolearje "
-"jo akkountynstellings."
+"It wie net mooglik om jo ynstellings automatysk oer te setten, dus "
+"kontrolearje jo akkountynstellings."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4495,8 +4376,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Koe it berjocht fan %2 mei de datum %1 en it ûnderwerp %3 net ferstjoere nei de "
-"tsjinner."
+"Koe it berjocht fan %2 mei de datum %1 en it ûnderwerp %3 net ferstjoere nei "
+"de tsjinner."
 
 #: imapaccountbase.cpp:888
 #, fuzzy
@@ -4519,14 +4400,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Flater: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "De ferbining mei de tsjinner %1 wie ûnferwachts ferbrutsen. Dit sil as it "
 "mooglik is automatysk opnij opset wurde."
@@ -4542,7 +4428,8 @@ msgstr "De ferbining mei akkount %1 is ferrûn."
 #: imapaccountbase.cpp:1253
 msgid "Error while uploading status of messages to server: "
 msgstr ""
-"Der barde in flater ûnder it ferstjoeren fan de berjochttastân nei de tsjinner:"
+"Der barde in flater ûnder it ferstjoeren fan de berjochttastân nei de "
+"tsjinner:"
 
 #: imapaccountbase.cpp:1298 listjob.cpp:118
 msgid "retrieving folders"
@@ -4575,7 +4462,8 @@ msgstr "Flater by it opheljen fan berjochten fan de tsjinner."
 #: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr ""
-"Der barde in flater ûnder it opheljen fan de berjochtstruktuer fan it berjocht."
+"Der barde in flater ûnder it opheljen fan de berjochtstruktuer fan it "
+"berjocht."
 
 #: imapjob.cpp:543
 msgid "Uploading message data failed."
@@ -4680,14 +4568,14 @@ msgstr "Listargyf"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4716,216 +4604,182 @@ msgstr "Unbrûkbere kaaien foar fersifering"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar ûndertekening ferrint yn ien dei.</p>\n"
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar ûndertekening ferrint yn %n dagen.</p>"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"ûndertekening ferrint yn ien dei.</p>\n"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"ûndertekening ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar fersifering ferrint yn ien dei.</p>\n"
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar fersifering ferrint yn %n dagen.</p>"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"fersifering ferrint yn ien dei.</p>\n"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"fersifering ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> ferrint yn ien dei.</p>\n"
-"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> ferrint yn %n dagen.</p>"
+"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> "
+"ferrint yn ien dei.</p>\n"
+"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> "
+"ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-ûndertekeningssertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-ûndertekeningssertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"ûndertekeningssertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn ien dei.</p>\n"
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"ûndertekeningssertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn ien dei.</p>\n"
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint yn "
+"ien dei.</p>\n"
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint yn "
+"%n dagen.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
+"(searjenûmer %2)</p><p>ferrint yn ien dei.</p>\n"
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
+"(searjenûmer %2)</p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn ien dei.</p>\n"
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint "
+"yn ien dei.</p>\n"
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint "
+"yn %n dagen.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar ûndertekening ferrint yn ien dei.</p>\n"
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar ûndertekening ferrint yn %n dagen.</p>"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar ûndertekening ferrint yn ien dei.</p>\n"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar ûndertekening ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar fersifering ferrint yn ien dei.</p>\n"
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar fersifering ferrint yn %n dagen.</p>"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar fersifering ferrint yn ien dei.</p>\n"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar fersifering ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> ferrint yn ien dei.</p>\n"
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> ferrint yn %n dagen.</p>"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> ferrint yn ien dei.</p>\n"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4939,205 +4793,171 @@ msgstr "S/MIME-sertifikaat ferrint ynkoarten"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar ûndertekening ferrint yn ien dei.</p>\n"
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar ûndertekening ferrint yn %n dagen.</p>"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"ûndertekening ferrint yn ien dei.</p>\n"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"ûndertekening ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar fersifering ferrint yn ien dei.</p>\n"
-"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> foar fersifering ferrint yn %n dagen.</p>"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"fersifering ferrint yn ien dei.</p>\n"
+"<p>Jo OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> foar "
+"fersifering ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> ferrint yn ien dei.</p>\n"
-"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p>"
-"<p> ferrint yn %n dagen.</p>"
+"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> "
+"ferrint yn ien dei.</p>\n"
+"<p>De OpenPGP-kaai </p><p align=center><b>%1</b> (kaai-id 0x%2)</p><p> "
+"ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-ûndertekeningssertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-ûndertekeningssertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"ûndertekeningssertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn ien dei.</p>\n"
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"ûndertekeningssertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn ien dei.</p>\n"
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint yn "
+"ien dei.</p>\n"
+"<p>It haadsertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/MIME-"
+"sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint yn "
+"%n dagen.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
+"(searjenûmer %2)</p><p>ferrint yn ien dei.</p>\n"
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat foar ûndertekening</p><p align=center><b>%1</b> "
+"(searjenûmer %2)</p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> "
-"(searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn ien dei.</p>\n"
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-fersiferingsertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p>ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn ien dei.</p>\n"
-"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> "
-"<p>foar jo S/MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p>ferrint yn %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint "
+"yn ien dei.</p>\n"
+"<p>It tydlike CA-sertifikaat</p><p align=center><b>%3</b></p> <p>foar jo S/"
+"MIME-sertifikaat</p><p align=center><b>%1</b> (searjenûmer %2)</p><p>ferrint "
+"yn %n dagen.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar ûndertekening ferrint yn ien dei.</p>\n"
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar ûndertekening ferrint yn %n dagen.</p>"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar ûndertekening ferrint yn ien dei.</p>\n"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar ûndertekening ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar fersifering ferrint yn ien dei.</p>\n"
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> foar fersifering ferrint yn %n dagen.</p>"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar fersifering ferrint yn ien dei.</p>\n"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> foar fersifering ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> ferrint yn ien dei.</p>\n"
-"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</p>"
-"<p> ferrint yn %n dagen.</p>"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> ferrint yn ien dei.</p>\n"
+"<p>Jo S/MIME-sertifikaat </p><p align=center><b>%1</b> (searjenûmer %2)</"
+"p><p> ferrint yn %n dagen.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5149,17 +4969,18 @@ msgstr "S/MIME-sertifikaat ferrint ynkoarten"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Ien of mear ynstelde OpenPGP-kaaien of S/MIME-sertifikaten is net mear brûkber "
-"foar fersifering. Stel jo kaaien foar fersifering opnij yn foar dizze "
-"identiteit yn it konfiguraasjedialooch fan de Identiteiten.\n"
-"Wannear jo kieze om troch te gean en jo de kaaien letter noch nedich hawwe, sil "
-"jo frege wurde om in kaai te kiezen."
+"Ien of mear ynstelde OpenPGP-kaaien of S/MIME-sertifikaten is net mear "
+"brûkber foar fersifering. Stel jo kaaien foar fersifering opnij yn foar "
+"dizze identiteit yn it konfiguraasjedialooch fan de Identiteiten.\n"
+"Wannear jo kieze om troch te gean en jo de kaaien letter noch nedich hawwe, "
+"sil jo frege wurde om in kaai te kiezen."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5173,11 +4994,11 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Ien of mear ynstelde OpenPGP-kaaien of S/MIME-sertifikaten is net mear brûkber "
-"foar ûndertekening. Stel jo kaaien foar ûndertekening opnij yn foar dizze "
-"identiteit yn it konfiguraasjedialooch fan de Identiteiten.\n"
-"Wannear jo kieze om troch te gean en jo de kaaien letter noch nedich hawwe, sil "
-"jo frege wurde om in kaai te kiezen."
+"Ien of mear ynstelde OpenPGP-kaaien of S/MIME-sertifikaten is net mear "
+"brûkber foar ûndertekening. Stel jo kaaien foar ûndertekening opnij yn foar "
+"dizze identiteit yn it konfiguraasjedialooch fan de Identiteiten.\n"
+"Wannear jo kieze om troch te gean en jo de kaaien letter noch nedich hawwe, "
+"sil jo frege wurde om in kaai te kiezen."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5187,10 +5008,10 @@ msgstr "Net brûkbere ûndertekeningskaaien"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Neffens de fersiferingseigenskippen fan de ûntfangers moat it berjocht mei "
 "OpenPGP fersifere wurde, Yn elts gefal foar inkele ûntfangers.\n"
@@ -5203,22 +5024,22 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Neffens de fersiferingseigenskippen fan de ûntfangers moat it berjocht mei "
-"S/MIME fersifere wurde, Yn elts gefal foar inkele ûntfangers.\n"
-"Jo hawwe allinne gjin inkele jildige en fertroude  "
-"S/MIME-fersiferingssertifikaat foar dit identiteit.\n"
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Neffens de fersiferingseigenskippen fan de ûntfangers moat it berjocht mei S/"
+"MIME fersifere wurde, Yn elts gefal foar inkele ûntfangers.\n"
+"Jo hawwe allinne gjin inkele jildige en fertroude  S/MIME-"
+"fersiferingssertifikaat foar dit identiteit.\n"
 "Jo kinne trochgean sûnder dat jo foar josels fersiferje, mar hâld der rekken "
 "mei dat jo dan jo eigen berjochten net mear lêzen kinne."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5233,15 +5054,15 @@ msgstr "Net OpenPGP-ûndertekenje"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Neffens de fersiferingseigenskippen fan de ûntfangers moat it berjocht mei "
-"S/MIME fersifere wurde, yn elts gefal foar inkele ûntfangers.\n"
-"Jo hawwe allinne gjin inkele jildige en fertroude  "
-"S/MIME-fersiferingssertifikaat foar dit identiteit."
+"Neffens de fersiferingseigenskippen fan de ûntfangers moat it berjocht mei S/"
+"MIME fersifere wurde, yn elts gefal foar inkele ûntfangers.\n"
+"Jo hawwe allinne gjin inkele jildige en fertroude  S/MIME-"
+"fersiferingssertifikaat foar dit identiteit."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5253,9 +5074,9 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Neffens de ûndertekeningsfoarkar fan de ûntfangers hawwe jo gjin mienskiplike "
-"type ûndertekening foar de beskikbere kaaien. Berjocht ferstjoere sûnder "
-"ûndertekening?"
+"Neffens de ûndertekeningsfoarkar fan de ûntfangers hawwe jo gjin "
+"mienskiplike type ûndertekening foar de beskikbere kaaien. Berjocht "
+"ferstjoere sûnder ûndertekening?"
 
 #: keyresolver.cpp:1335
 msgid "No signing possible"
@@ -5263,12 +5084,12 @@ msgstr "gjin ûndertekening mooglik"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Jo hawwe gjin kaai foar fersifering foar josels keazen (fersiferje foar "
-"mysels). It is net mooglik om jo eigen berjochten te ûntsiferjen wannear jo it "
-"fersiferje."
+"mysels). It is net mooglik om jo eigen berjochten te ûntsiferjen wannear jo "
+"it fersiferje."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5284,16 +5105,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Jo hawwe gjin kaai foar de ûntfanger fan dit berjocht keazen. It berjocht sil "
-"dêrom net fersifere wurde."
+"Jo hawwe gjin kaai foar de ûntfanger fan dit berjocht keazen. It berjocht "
+"sil dêrom net fersifere wurde."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Jo hawwe gjin kaai foar ien fan de ûntfabgers keazen. It berjocht sil dêrom net "
-"fersifere wurde."
+"Jo hawwe gjin kaai foar ien fan de ûntfabgers keazen. It berjocht sil dêrom "
+"net fersifere wurde."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5337,11 +5158,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Der wie gjin jildige en fertroude kaai fûn foar \"%1\".\n"
 "\n"
@@ -5390,10 +5211,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritike flater, de berjochten koenen net ophelle wurde:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"It taheakjen fan it berjocht is mislearre:\n"
+msgid "Failed to add message:\n"
+msgstr "It taheakjen fan it berjocht is mislearre:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5483,6 +5302,51 @@ msgstr "IMAP sûn&der ferbining"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-postfak"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Berjocht fan ûnderwerp fersjen"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "CC: nei 'adres' stjoere"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "BCC: nei 'adres' stjoere"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "'koptekst' oan berjocht taheakje"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Berjochtynhâld fan 'triem' lêze"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Berjochtenynhâld fan berjocht ynstelle"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Heakje in taheaksel ta oan it berjocht, dit kin werhelle wurde"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Allinne kontrolearje op nije berjochten"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Allinne in opstelfinster foar nije berjochten iepenje"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "It oerdroegen berjochttriem besjen"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Berjocht stjoere nei 'adres' resp. taheaksel taheakje wêr 'URL' nei ferwiisd"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Post"
@@ -5526,8 +5390,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail sil de fereaske groupwaremappen en submappen oanmeitsje fan %1. As jo dit "
-"net wolle moatte jo dit ôfbrekke en de IMAP-databoarne sil útskeakele wurde"
+"KMail sil de fereaske groupwaremappen en submappen oanmeitsje fan %1. As jo "
+"dit net wolle moatte jo dit ôfbrekke en de IMAP-databoarne sil útskeakele "
+"wurde"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5539,14 +5404,13 @@ msgstr "%1: map %2 fûn, dizze sil ynsteld wurde as haadmap groupware."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail hat de neikommende groupwaremappen yn %1 fûn en wol de neikommende "
-"aksjes útfiere: %2 "
-"<br>Wannear jo dit net wolle moatte jo dit ôfbrekke en sil de IMAP-databoarne "
-"útskeakele wurde"
+"aksjes útfiere: %2 <br>Wannear jo dit net wolle moatte jo dit ôfbrekke en "
+"sil de IMAP-databoarne útskeakele wurde"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5595,11 +5459,11 @@ msgstr "URL-adres is kopiearre."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Triem <b>%1</b> bestiet al.<br>Wolle jo it ferfange?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Nei triem bewarje"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Fe&rfange"
 
@@ -5617,7 +5481,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "It berjocht is ûnder it bewarjen, fuortsmiten. It dan ek net bewarre."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5638,11 +5502,11 @@ msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Dizze triem befettet meardere berjochten. It earste berjocht wurdt werjûn."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5652,115 +5516,115 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Berjochten wurde filtere"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Berjochte %1 oant %2 wurde filtere"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Net genôch frije skiifromte?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Nei dizze map ferpleatse"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Nei dizze map kopiearje"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Berjochten wurde ferpleatst"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Berjochten wurde wiske"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL-adres wurdt iepene..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Wolle jo wier <b>%1</b> útfiere?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Utfiere"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Der binne gjin taheaksel fûn om te bewarjen."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Taheaksels bewarje yn"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "taheaksel.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "taheaksel.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "In triem neamd %1 bestiet al. Wolle jo it oerskriuwe?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Triem bestiet al"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Oerskriuwe"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"It diel %1 fan it berjocht is fersifere. Wolle jo de fersifering by it bewarjen "
-"behâlde?"
+"It diel %1 fan it berjocht is fersifere. Wolle jo de fersifering by it "
+"bewarjen behâlde?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail - fraach"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Fersifering behâlde"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Net hâlde"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"It diel %1 fan it berjocht is ûndertekene. Wolle jo de ûndertekening behâlde by "
-"it bewarjen?"
+"It diel %1 fan it berjocht is ûndertekene. Wolle jo de ûndertekening behâlde "
+"by it bewarjen?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Hântekening behâlde"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5769,21 +5633,22 @@ msgstr ""
 "Koe de triem %1 net bewarje:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Koe de triem %1 net bewarje."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Der bestiet gjin adresboekyngong foar dit e-postadres. Heakje dizze ta oan it "
-"adresboek en de direkte berjochter-adressen oan jo IM-programma fan jo foarkar."
+"Der bestiet gjin adresboekyngong foar dit e-postadres. Heakje dizze ta oan "
+"it adresboek en de direkte berjochter-adressen oan jo IM-programma fan jo "
+"foarkar."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5793,78 +5658,79 @@ msgstr ""
 "%1\n"
 " it is net mooglik om te beskiede mei wa jo petear hawwe wolle."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"It Chiasmus-backend had gjin funksje \"x-obtain-keys\". Rapportearje dizze as "
-"brek."
+"It Chiasmus-backend had gjin funksje \"x-obtain-keys\". Rapportearje dizze "
+"as brek."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus-backendflater"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"It Chiasmus-backend kaam werom mei in ûnferwachtse wearde. De funksje "
-"\"x-obtain-keys\" brocht net as resultaat in list mei strings. Rapportearje "
+"It Chiasmus-backend kaam werom mei in ûnferwachtse wearde. De funksje \"x-"
+"obtain-keys\" brocht net as resultaat in list mei strings. Rapportearje "
 "dizze as brek."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Der binne gjin kaaien fûn. Kontrolearje of jo in jildige kaaipaad opjûn hawwe "
-"yn de ynstellings fan Chiasmus."
+"Der binne gjin kaaien fûn. Kontrolearje of jo in jildige kaaipaad opjûn "
+"hawwe yn de ynstellings fan Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Kaaiseleksje ûntsifering Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"It Chiasmus-backend hat gjin funksje \"x-decrypt\". Rapportearje dizze as brek."
+"It Chiasmus-backend hat gjin funksje \"x-decrypt\". Rapportearje dizze as "
+"brek."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"De funksje \"x-decrypt\" akseptearen net de ferwachte parameters. Rapportearje "
-"dizze brek."
+"De funksje \"x-decrypt\" akseptearen net de ferwachte parameters. "
+"Rapportearje dizze brek."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Untsiferingsflater yn Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Unferwachtse wearde fan it Chiasmus-backend. De funksje \"x-decrypt\" brocht "
 "net as resultaat in byte array. Rapportearje dizze brek."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Post"
@@ -5963,7 +5829,7 @@ msgstr "Grutte"
 msgid "Encoding"
 msgstr "Kodearring"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimearje"
 
@@ -5975,7 +5841,7 @@ msgstr "Fersiferje"
 msgid "Sign"
 msgstr "Undertekenje"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Namme fan it taheaksel"
 
@@ -5997,7 +5863,8 @@ msgstr "Haadadressearre:"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>De e-postadressen dy yn dit fjlid ynfolle wurde, ûntfange in kopy fan it "
 "berjocht.</qt>"
@@ -6009,13 +5876,13 @@ msgstr "Ekstra adressearre:"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>De e-postadressen dy jo yn dit fjild ynfolle hawwe, ûntfange in kopy fan it "
-"berjocht. Technysk sjoen is dit itselde as it pleatsen fan it adres yn it fjild "
-"<b>Aan:</b>. It ferskil is dat ien yn de Karbon Kopy (CC) allinne mar "
+"<qt>De e-postadressen dy jo yn dit fjild ynfolle hawwe, ûntfange in kopy fan "
+"it berjocht. Technysk sjoen is dit itselde as it pleatsen fan it adres yn it "
+"fjild <b>Aan:</b>. It ferskil is dat ien yn de Karbon Kopy (CC) allinne mar "
 "meilústert en net de echte ûntfanger fan it berjocht is.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6024,12 +5891,11 @@ msgstr "Ferstoppe adressearde"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Einliks itselde as it fjild <b>Kopiearje nei</b> "
-"(CC), allinne sjogge de oare ûntfangers net wa in kopy ûntfongen hawwe."
+"<qt>Einliks itselde as it fjild <b>Kopiearje nei</b> (CC), allinne sjogge de "
+"oare ûntfangers net wa in kopy ûntfongen hawwe."
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6039,7 +5905,7 @@ msgstr "E-&post ferstjoere"
 msgid "&Send Mail Via"
 msgstr "E-&post ferstjoere &fia"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&Letter ferstjoere"
@@ -6104,8 +5970,7 @@ msgstr "Skra&pes fuortsmite"
 msgid "Cl&ean Spaces"
 msgstr "Spaasjes &opskjinje"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Fêst lettert&ype brûke"
@@ -6248,31 +6113,31 @@ msgstr "&Kryptografyske berjochtopmaak"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standert"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Opsomlist (bolsje)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Opsomlist  (rûnsje)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Opsomlist  (fjouwerkant)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Oardere list (desimaal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Oardere list (lytse letters)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Oardere list (haadletters)"
 
@@ -6364,8 +6229,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Bewarje dit berjocht yn de map ûntwerpen. Dizze kinne noch  bewurke wurde en op "
-"in letter momint ferstjoerd wurde."
+"Bewarje dit berjocht yn de map ûntwerpen. Dizze kinne noch  bewurke wurde en "
+"op in letter momint ferstjoerd wurde."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6377,8 +6242,8 @@ msgstr "Opsteller slute"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "It berjocht dat jo opmakke hawwe ferwiisd nei in taheaksel, mar jo hawwe der "
@@ -6389,49 +6254,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Omtinken oan in triem taheaksel"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Sa &ferstjoere"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail hat de lokaasje fan it taheaksel  (%1) net werkend.</p>"
-"<p>Jou in folslein paad op as jo in taheaksel taheakje.</p></qt>"
+"<qt><p>KMail hat de lokaasje fan it taheaksel  (%1) net werkend.</p><p>Jou "
+"in folslein paad op as jo in taheaksel taheakje.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Triem taheakje"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "T&aheakje"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Triem ynfoegje"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Triem ynfoegje"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Der barde in flater ûnder it eksportearjen fan de kaai fanút it backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Der barde in flater ûnder it eksportearjen fan de kaai fanút it "
+"backend:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6470,20 +6335,35 @@ msgid ""
 "View"
 msgstr "Sjen litte"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Bewurkje..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Skript bewurkje..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Bewarje &as..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Eigenski&ppen"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Taheaksel taheakje..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail koe de triem net komprimearje."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6491,77 +6371,73 @@ msgstr ""
 "De komprimearre triem is grutter dan de oarspronklike triem. Wolle jo de "
 "oarspronklike triem behâlde?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Hâlde"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail koe de triem net útpakke."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Taheaksel bewarje as"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "As tekst taheakje"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "As taheaksel taheakje"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Plakke as ta&heaksel"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "Nammeleas"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jo hawwe oanjûn dat jo berjocht foar josels wolle fersiferje, mar de aktive "
-"indentiteit befettet hjirfoar gjin kaai foar fersifering (OpenPGP of "
-"S/MIME).</p> "
-"<p>Selektearje de te brûken kaai(en) yn de identiteitsynstellings.</p></qt>"
+"<qt><p>Jo hawwe oanjûn dat jo berjocht foar josels wolle fersiferje, mar de "
+"aktive indentiteit befettet hjirfoar gjin kaai foar fersifering (OpenPGP of "
+"S/MIME).</p> <p>Selektearje de te brûken kaai(en) yn de "
+"identiteitsynstellings.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Net oantsjutte fersifertype"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Om dit berjocht ûndertekenje te kinnen, moatte jo earst in OpenPGP- of "
-"S/MIME-kaai oantsjutte dy hjirfoar brûkt sil wurde.</p> "
-"<p>Selektearje de te brûken kaai(en) yn de identiteitsynstellings.</p></qt>"
+"<qt><p>Om dit berjocht ûndertekenje te kinnen, moatte jo earst in OpenPGP- "
+"of S/MIME-kaai oantsjutte dy hjirfoar brûkt sil wurde.</p> <p>Selektearje de "
+"te brûken kaai(en) yn de identiteitsynstellings.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Net oantsjutte ûndertekingskaai"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6569,201 +6445,200 @@ msgstr ""
 "KMail is op it stuit sûnder ferbining.Jo berjochten sille yn it postfak út "
 "bewarre bliuwe oant jo wer ferbining hawwe."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Ferbining/Sûnder ferbining"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Jo moatte jo e-postadres yn it Fan:-fjild ynfiere. Jo moatte ek jo e-postadres "
-"foar al jo identiteiten ynstelle, sadat jo it net foar elts berjocht hoege te "
-"dwaan."
+"Jo moatte jo e-postadres yn it Fan:-fjild ynfiere. Jo moatte ek jo e-"
+"postadres foar al jo identiteiten ynstelle, sadat jo it net foar elts "
+"berjocht hoege te dwaan."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Jo moatte yn elts gefal ien ûntfanger opjaan yn it fjild Oan, CC of BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "To-fjild is leech. Berjocht dochs stjoere?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Gjin To: oantsjutte"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Jo hawwe gjin ûnderwerp oantsjutte. It berjocht dôchs ferstjoere?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Gjin ûnderwerp oantsjutte"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Sa f&erstjoere"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Underwerp oantsjutte"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Opmaak behâlde, net ûndertekenje of fersiferje"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Opmaak behâlde, net fersiferje"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Opmaak behâlde, net ûndertekenje"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Undertekenje/fersiferje (opmaak wiskje)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Fersiferje (Opmaak wiskje)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Undertekenje (opmaak wiskje)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 "<qt> It is net mooglik om in HTML-berjocht te ûndertekenjen of te "
-"fersiferjen;</p> "
-"<p>Wolle jo de opmaak wiskje?</p></qt>"
+"fersiferjen;</p> <p>Wolle jo de opmaak wiskje?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Berjocht ûndertekenje/fersiferje?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"De oanpaste ûntwerp of sjabloanmap foar identiteit \"%1\" bestiet net (mear). "
-"Ynstee dêrfan sil de standert ûntwerp of sjabloanmap brûkt wurde."
+"De oanpaste ûntwerp of sjabloanmap foar identiteit \"%1\" bestiet net "
+"(mear). Ynstee dêrfan sil de standert ûntwerp of sjabloanmap brûkt wurde."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "In akkount foar it ferstjoeren oanmeitsjen en besykje opnij."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Stiet op it punt om in berjocht te ferstjoeren..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Stjoer befêstiging"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "No fer&stjoere"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Gjin ûntfangers"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Ekstra adressearre:"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Staveringshifker: oan"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Staveringshifker: út"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Staveringshifker ôfbrutsen."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Staveringshifker stoppe."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Staveringshifker foltôge."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Staveringshifker"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Stel earst in kryptografiske backend yn sadat jo Chiasmus-fersifering brûke "
 "kinne.\n"
 "Jo kinne dit dwaan yn de ljepper Krypto-backends yn it ûnderdiel Befeiliging "
 "fan it konfiguraasjefinster fan KMail."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"It liket derop dat libkleopatra is kompilearre sûnder Chiasmus-stipe. Miskien "
-"wolle jo libkleopatra opnij kompilearje mei de flag --enable-chiasmus."
+"It liket derop dat libkleopatra is kompilearre sûnder Chiasmus-stipe. "
+"Miskien wolle jo libkleopatra opnij kompilearje mei de flag --enable-"
+"chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Gjin Chiasmus-backend ynsteld"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Gjin Chiasmus-kaaien fûn"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Kaaiseleksje Chiasmus-fersifering"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Berjocht is ûndertekene troch %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Berjocht is ûndertekene troch %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP-berjocht - fersifere"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Berjocht mei ûnderwerp:"
@@ -6813,11 +6688,11 @@ msgstr "Staveringshifker - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/ASpell koe net opstart wurde. Soargje derfoar dat ISpell of ASpell goed "
-"konfigurearre is en yn jo paad  (PATH) stiet."
+"ISpell/ASpell koe net opstart wurde. Soargje derfoar dat ISpell of ASpell "
+"goed konfigurearre is en yn jo paad  (PATH) stiet."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6850,13 +6725,11 @@ msgstr "<qt>Tefolle filteraksjes yn filterregel <b>%1'</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Unbekende filteraksje <b>%1</b>"
-"<br> yn filterregel <b>%2</b>."
-"<br>Dizze wurdt negearre.</qt>"
+"<qt>Unbekende filteraksje <b>%1</b><br> yn filterregel <b>%2</b>.<br>Dizze "
+"wurdt negearre.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7076,165 +6949,132 @@ msgstr "Lûd ôfspylje"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dit is de list mei definearre filters. Se binne fan boppe nei ûnder "
-"opsteld.</p>"
-"<p>Klik op in filter om dizze te bewurkjen mei de knoppen yn de rjochterhelte "
-"fan  it dianloochfinster.</p></qt>"
+"<qt><p>Dit is de list mei definearre filters. Se binne fan boppe nei ûnder "
+"opsteld.</p><p>Klik op in filter om dizze te bewurkjen mei de knoppen yn de "
+"rjochterhelte fan  it dianloochfinster.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om in nij filter te meitsjen.</p>"
-"<p>Dizze wurdt boppe de no selektearre filter ynfoege. Dit kinne jo letter noch "
-"oanpasse.</p>"
-"<p>As jo dizze knop by ûngelok yndrukt hawwe, dan kinne jo it weromdraaie troch "
-"rjochts op de knop <em>wiskje</em> te klikken.</p></qt>"
+"<qt><p>Klik op dizze knop om in nij filter te meitsjen.</p><p>Dizze wurdt "
+"boppe de no selektearre filter ynfoege. Dit kinne jo letter noch oanpasse.</"
+"p><p>As jo dizze knop by ûngelok yndrukt hawwe, dan kinne jo it weromdraaie "
+"troch rjochts op de knop <em>wiskje</em> te klikken.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om in filter te kopiearjen.</p>"
-"<p>As jo dizze knop by ûngelok yndrukt hawwe, dan kinne jo dit ûngedien meitsje "
-"troch rjochts op de knop <em>wiskje</em> te klikken.</p></qt>"
+"<qt><p>Klik op dizze knop om in filter te kopiearjen.</p><p>As jo dizze knop "
+"by ûngelok yndrukt hawwe, dan kinne jo dit ûngedien meitsje troch rjochts op "
+"de knop <em>wiskje</em> te klikken.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om it selektearre filter te <em>wiskjen</em> "
-"uit bovenstaande lijst.</p>"
-"<p>As jo it filter wiske hawwe kinne jo it net mear weromhelje. Mar jo kinne "
-"altyd út dit dialochfinster gean sûnder dat de wizigings útfierd wurde. Dit "
-"dogge jo troch op <em>Ofbrekke</em> te klikken.</p></qt>"
+"<qt><p>Klik op dizze knop om it selektearre filter te <em>wiskjen</em> uit "
+"bovenstaande lijst.</p><p>As jo it filter wiske hawwe kinne jo it net mear "
+"weromhelje. Mar jo kinne altyd út dit dialochfinster gean sûnder dat de "
+"wizigings útfierd wurde. Dit dogge jo troch op <em>Ofbrekke</em> te klikken."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om it no selektearre filter <em>boppe-oan</em> "
-"yn de list te setten.</p>"
-"<p>It oanpassen hjirfan is hannich om't it programma de filter op folchoarder "
-"ôfhannelet. It earste filter wurdt earst dien."
-"<p></qt>"
+"<qt><p>Klik op dizze knop om it no selektearre filter <em>boppe-oan</em> yn "
+"de list te setten.</p><p>It oanpassen hjirfan is hannich om't it programma "
+"de filter op folchoarder ôfhannelet. It earste filter wurdt earst dien.<p></"
+"qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om it selektearre filter in plak <em>omheech</em> "
-"te setten.</p>"
-"<p>It oanpassen hjirfan is hannich om't it programma de filter om folchoarder "
-"ôfhannelet. Jo kinne berjochten op ferskillende kritearia's filterje.</p>"
-"<p>As jo by ûngelok op dizze knop klikt hawwe, dan kinne jo it weromdraaie "
-"troch de knop <em>omleech</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klik op dizze knop om it selektearre filter in plak <em>omheech</em> "
+"te setten.</p><p>It oanpassen hjirfan is hannich om't it programma de filter "
+"om folchoarder ôfhannelet. Jo kinne berjochten op ferskillende kritearia's "
+"filterje.</p><p>As jo by ûngelok op dizze knop klikt hawwe, dan kinne jo it "
+"weromdraaie troch de knop <em>omleech</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om it no selektearre filter in plak <em>omleech</em> "
-"yn de list te setten.</p>"
-"<p>It oanpassen hjirfan is hannich om't it programma de filter om folchoarder "
-"ôfhannelet. It earste filter wurdt earst dien."
-"<p>As jo by ûngelok op dizze knop klikt hawwe, dan kinne jo it weromdraaie "
-"troch de knop  <em>omheech</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klik op dizze knop om it no selektearre filter in plak <em>omleech</"
+"em> yn de list te setten.</p><p>It oanpassen hjirfan is hannich om't it "
+"programma de filter om folchoarder ôfhannelet. It earste filter wurdt earst "
+"dien.<p>As jo by ûngelok op dizze knop klikt hawwe, dan kinne jo it "
+"weromdraaie troch de knop  <em>omheech</em></p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om it no selektearre filter <em>ûnderoan</em> "
-"yn de list te setten.</p>"
-"<p>It oanpassen hjirfan is hannich om't it programma de filter op folchoarder "
-"ôfhannelet. It earste filter wurdt earst dien."
-"<p></qt>"
+"<qt><p>Klik op dizze knop om it no selektearre filter <em>ûnderoan</em> yn "
+"de list te setten.</p><p>It oanpassen hjirfan is hannich om't it programma "
+"de filter op folchoarder ôfhannelet. It earste filter wurdt earst dien.<p></"
+"qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik op dizze knop om it selektearre filter om te neamen.</p>"
-"<p>Filters krije automatysk in namme, salang se mar begjinne mei \"&lt;\".</p>"
-"<p>As jo by ûngelok in filter omneamd hawwe, en jo wolle de automatyske namme "
-"werom, klik dan op dizze knop en selektearje <em>Begjinwearde</em> "
-"en dan op <em>Wiskje</em> yn it neikommend dialoochfinter.</p></qt>"
+"<qt><p>Klik op dizze knop om it selektearre filter om te neamen.</"
+"p><p>Filters krije automatysk in namme, salang se mar begjinne mei \"&lt;\"."
+"</p><p>As jo by ûngelok in filter omneamd hawwe, en jo wolle de automatyske "
+"namme werom, klik dan op dizze knop en selektearje <em>Begjinwearde</em> en "
+"dan op <em>Wiskje</em> yn it neikommend dialoochfinter.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Selektearje dizze opsje om it sjen litten fan de befêstigingsdialooch te "
-"forsearjen.</p>"
-"<p>Dit is brûkber as jo in filterynstellings oantsjutte hawwe dy't berjochten "
-"markearret om letter op te heljen. Sûnder dizze mooglikheid kinne berjochten "
-"nea ophelle wurde as der gjin oare grutte berjochten op de tsjinner wachtsje, "
-"of as jo de filterynstelling foar it markearjen fan  de berjochten feroarje "
-"woe.</p></qt>"
+"<qt> <p>Selektearje dizze opsje om it sjen litten fan de "
+"befêstigingsdialooch te forsearjen.</p><p>Dit is brûkber as jo in "
+"filterynstellings oantsjutte hawwe dy't berjochten markearret om letter op "
+"te heljen. Sûnder dizze mooglikheid kinne berjochten nea ophelle wurde as "
+"der gjin oare grutte berjochten op de tsjinner wachtsje, of as jo de "
+"filterynstelling foar it markearjen fan  de berjochten feroarje woe.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7244,6 +7084,16 @@ msgstr "POP3-filterregels"
 msgid "Filter Rules"
 msgstr "Filterregels"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Ymportearje"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Ymportearje"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Beskikbere filters"
@@ -7267,8 +7117,8 @@ msgstr "Globale opsjes"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"Oerienkommende berjo&chten dy markearre binne as \"Letter ophelje\" altyd sjen "
-"litte yn it bef^stigingsdialooch"
+"Oerienkommende berjo&chten dy markearre binne as \"Letter ophelje\" altyd "
+"sjen litte yn it bef^stigingsdialooch"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7326,6 +7176,11 @@ msgstr "Dit filter ek taheakje oan arkbalke"
 msgid "Icon for this filter:"
 msgstr "Byldkaike doar dit filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Oan:"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Omheech"
@@ -7334,16 +7189,29 @@ msgstr "Omheech"
 msgid "Down"
 msgstr "Omlaag"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Omneame..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nij"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Ko&piearje nei"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Wiske"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7352,21 +7220,21 @@ msgstr "Selektearje in fluchtoets foar de map"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Der is yn elts gefal ien filter dat as bestimmingsmap in map op in online "
 "IMAP-akkount hat. Dizze filters wurde allinne tapst wannear der mei de hân "
-"filtere wurdt of wannear jo binnenkommende berjochten fan jo online "
-"IMAP-akkount ophelje."
+"filtere wurdt of wannear jo binnenkommende berjochten fan jo online IMAP-"
+"akkount ophelje."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"De neikommende filters binne net bewarre om't se ûnjildich binne (bgl. om't se "
-"gjin handelings of sykregels befetsje)."
+"De neikommende filters binne net bewarre om't se ûnjildich binne (bgl. om't "
+"se gjin handelings of sykregels befetsje)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7434,29 +7302,25 @@ msgstr "Tsjinnichheden foar de IMAP-lytsûnthâld"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Swierricheden oplossings foar de IMAP-lytsûnthâld.</b></p> "
-"<p>As jo swierrichheid tsjinkomme by it syngronisearjen fan in IMAP-map, "
-"besykje dan earst de yndekstriem opnij oan te meitsje. It opnij oanmeitsjen kin "
-"efkes duorje, mar jout gjin swierrichheid.</p> "
-"<p>As dat net helpt, dan kinne jo besykje IMAP-lytsûnthâld te ferfarskjen. As "
-"jo dat dogge sille jo alle lokale wizigings yn dizze map en byhearrende "
-"submappen  ferliezen.</p>"
+"<p><b>Swierricheden oplossings foar de IMAP-lytsûnthâld.</b></p> <p>As jo "
+"swierrichheid tsjinkomme by it syngronisearjen fan in IMAP-map, besykje dan "
+"earst de yndekstriem opnij oan te meitsje. It opnij oanmeitsjen kin efkes "
+"duorje, mar jout gjin swierrichheid.</p> <p>As dat net helpt, dan kinne jo "
+"besykje IMAP-lytsûnthâld te ferfarskjen. As jo dat dogge sille jo alle "
+"lokale wizigings yn dizze map en byhearrende submappen  ferliezen.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7493,8 +7357,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "De UID lytsûnthâld triem foar map %1 koe net skreaun wurde. Der kin wat "
 "swierrichheid wêze mei de tagongsrjochten fan de triem"
@@ -7535,12 +7399,12 @@ msgstr "De yndeks fan dizze map is opnij oanmakke."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "De map %1 sit net yn de oarspronklike syngronisaasjestastân (tastân wie %2)\n"
-"Wolle jo dizze weromsette nei de oarspronklike syngronisaasjestastân en dôchs "
-"syngronisearje?"
+"Wolle jo dizze weromsette nei de oarspronklike syngronisaasjestastân en "
+"dôchs syngronisearje?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7645,8 +7509,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Jo tagongsrjochten foar de map <b>%1</b> binne beheind. Jo kinne net langer "
-"berjochten oan dizze map taheakje.</p>"
+"<p>Jo tagongsrjochten foar de map <b>%1</b> binne beheind. Jo kinne net "
+"langer berjochten oan dizze map taheakje.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7667,15 +7531,11 @@ msgstr "De submappen wurde op de tsjinner oanmakke"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Berjochten op de tsjinner yn map <b>%1</b> binne wiske. Wolle jo se ek "
-"lokaal wiskje?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Berjochten op de tsjinner yn map <b>%1</b> binne wiske. Wolle jo se "
+"ek lokaal wiskje?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7696,12 +7556,10 @@ msgstr "Mappen foar nammeromte %1 wurde ophelle"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>It liket of de map <b>%1</b> wiske is. Wolle jo it wiskje fan de "
+"<qt><p>It liket of de map <b>%1</b> wiske is. Wolle jo it wiskje fan de "
 "tsjinner?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7710,20 +7568,20 @@ msgstr "Ofbrutsen"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"De IMAP-tsjinner %1 hat gjin stipe foar mappen mei spesjale ynhâld. De "
-"XML-opslach koe net brûkt wurde foar dizze tsjinner, pas de ynstellings fan "
+"De IMAP-tsjinner %1 hat gjin stipe foar mappen mei spesjale ynhâld. De XML-"
+"opslach koe net brûkt wurde foar dizze tsjinner, pas de ynstellings fan "
 "KMail dêrom oan."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"De IMAP-tsjinner %1 hat gjin stipe foar mappen mei spesjale ynhâld. De "
-"XML-opslach kin net brûkt wurde foar dizze tsjinner, pas de ynstellings fan "
+"De IMAP-tsjinner %1 hat gjin stipe foar mappen mei spesjale ynhâld. De XML-"
+"opslach kin net brûkt wurde foar dizze tsjinner, pas de ynstellings fan "
 "Kmail dêrom oan."
 
 #: kmfoldercachedimap.cpp:2951
@@ -7737,17 +7595,16 @@ msgstr "lost+found"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Der binne nije berjochten yn de map (%1) dy't noch net nei de tsjinner "
 "ferstjoerd binne, mar jo hawwe net genôch tagongsrjochten om se nei de map "
-"oplade te kinnen. </p>"
-"<p>Alle omfette berjochten sille dêrom ferpleatse wurde nei <b>%2</b>"
-"om dataferlies foar te kommen.</p>"
+"oplade te kinnen. </p><p>Alle omfette berjochten sille dêrom ferpleatse "
+"wurde nei <b>%2</b>om dataferlies foar te kommen.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7756,20 +7613,25 @@ msgstr "Net genôch tagongsrjochten"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Der binne nije berjochten yn dizze map (%1) dy 't noch net nei de tsjinner "
-"ferstjoerd binne, mar jo hawwe net genôch tagongsrjochten op dizze map om har "
-"oplade te kinnen. Nim kontakt op mei jo systeembehearder om it opladen nei "
-"dizze map ta te stean, of ferpleats de berjochten út dizze map.</p> "
-"<p>Wolle jo de berjochten nei in oare map ferpleatse?</p>"
+"<p>Der binne nije berjochten yn dizze map (%1) dy 't noch net nei de "
+"tsjinner ferstjoerd binne, mar jo hawwe net genôch tagongsrjochten op dizze "
+"map om har oplade te kinnen. Nim kontakt op mei jo systeembehearder om it "
+"opladen nei dizze map ta te stean, of ferpleats de berjochten út dizze map.</"
+"p> <p>Wolle jo de berjochten nei in oare map ferpleatse?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Ferpleatse nei:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Net ferpleatse"
 
@@ -7781,8 +7643,7 @@ msgstr "Berjochten nei map ferpleatse"
 msgid "Permissions (ACL)"
 msgstr "Tagongsrjochten (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Algemien"
@@ -7806,8 +7667,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Oanpaste b&yldkaikes brûke"
@@ -7826,20 +7686,18 @@ msgstr "Notifikaasje fan nije of net-lêzen berjochten yn dizze map"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Wannear dizze opsje ynskeakele is sille alle nije/net-lêzen berjochten yn "
-"dizze map fermeld wurde. Dat jout ek oan dat dizze map iepene wurdt by it "
-"iepenjen fan de fierdere/foarige map mei net-lêzen berjochten.</p>"
-"<p>Skeakel dizze opsje út as jo net wolle dat nije/net-lêzen berjochten yn "
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt> <p>Wannear dizze opsje ynskeakele is sille alle nije/net-lêzen "
+"berjochten yn dizze map fermeld wurde. Dat jout ek oan dat dizze map iepene "
+"wurdt by it iepenjen fan de fierdere/foarige map mei net-lêzen berjochten.</"
+"p><p>Skeakel dizze opsje út as jo net wolle dat nije/net-lêzen berjochten yn "
 "dizze map fermeld wurde. Ek sil dizze map oerslein wurde wannear jo nei de "
 "fierdere/foarige map giet mei net-lêzen berjochten. Dit is hannich om mappen "
 "mei troep te negearjen.</p></qt>"
@@ -7854,9 +7712,9 @@ msgstr "Antwurden yn dizze map hâlde"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Aktivearje dizze opsje wannear jo, jo antwurden op berjochten yn dizze map "
 "bewarje wolle ynstee fan de map Ferstjoerd."
@@ -7869,17 +7727,21 @@ msgstr "Stjoerder/ûntfanger yn berjochtenlist sjen litte"
 msgid "Sho&w column:"
 msgstr "Kolo&m sjen litte:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Ynstelle as standert"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Stjoerder"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Untfanger"
@@ -7890,16 +7752,16 @@ msgstr "Identiteit fan &stjoerder:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Selektearje de identiteit fan de stjoerder fan de berjochten dy jo opstelt "
 "hawwe yn dizze map. Dit betekend dat wannear dizze map bygelyks foar jo wurk "
-"is, dat jo automatysk oan dizze map it byhearrende e-postadres, hântekening en "
-"kaaien keppelje kinne. Jo kinne de identiteiten ynstelle yn it "
+"is, dat jo automatysk oan dizze map it byhearrende e-postadres, hântekening "
+"en kaaien keppelje kinne. Jo kinne de identiteiten ynstelle yn it "
 "konfiguraasjefinster (Ynstellings->KMail ynstelle)."
 
 #: kmfolderdia.cpp:500
@@ -7918,25 +7780,25 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Dizze ynstelling beskaat hokker brûkers dy dizze map diele "
-"\"beset\"-ynformaasje en oantinkens ûntfange kinne foar it barren en taken yn "
-"dizze map. Dizze ynstelling is allinne fan tapassing op in map foar barren en "
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Dizze ynstelling beskaat hokker brûkers dy dizze map diele \"beset\"-"
+"ynformaasje en oantinkens ûntfange kinne foar it barren en taken yn dizze "
+"map. Dizze ynstelling is allinne fan tapassing op in map foar barren en "
 "taken (en wannear der inkel taken binne sille de oantinkens ophele wurde).\n"
 "\n"
-"Foarbyld: Wannear de direkteur in map dielt mei syn sekretaresse, moat allinne "
-"de baas op \"beset\" komme te stean duorjende it barren. Hy moat dan de "
-"behearsrjochten te kiezen omdat de sekretaresse dy net hat.\n"
-"Oan de oare kant, wannear in wurkgroep in aginda mei groepsmoetings hat, moat "
-"elts lid op  \"beset\" komme te stean duorjende de moetings.\n"
-"In bedriuw dy in aginda hat foar it hiele bedriuw moat dit op \"Gjinien\" sette "
-"om't it net bekend is wa wêr nei in beskaat barren ta giet."
+"Foarbyld: Wannear de direkteur in map dielt mei syn sekretaresse, moat "
+"allinne de baas op \"beset\" komme te stean duorjende it barren. Hy moat dan "
+"de behearsrjochten te kiezen omdat de sekretaresse dy net hat.\n"
+"Oan de oare kant, wannear in wurkgroep in aginda mei groepsmoetings hat, "
+"moat elts lid op  \"beset\" komme te stean duorjende de moetings.\n"
+"In bedriuw dy in aginda hat foar it hiele bedriuw moat dit op \"Gjinien\" "
+"sette om't it net bekend is wa wêr nei in beskaat barren ta giet."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7967,23 +7829,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Jo hawwe dizze map sa ynsteld dat se groupware-ynformaasje befettet en de "
 "algemiene opsje om groupwaremappen is oanset. Dit jout oan dat dizze map "
 "ferdwine sil op it momint dat jo dit dialooch slute. As jo dizze map letter "
-"fuortsmite wolle, moatte jo tydlik it ferstopjen fan groupwaremappen útsette om "
-"de map sichtber te meitsjen."
+"fuortsmite wolle, moatte jo tydlik it ferstopjen fan groupwaremappen útsette "
+"om de map sichtber te meitsjen."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8052,7 +7914,8 @@ msgstr "Flater by it opheljen fan de mapynformaasje."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "De berjochtyndeks foar '%1' is fan in ûnbekende KMail-ferzje (%2).\n"
 "De yndeks kin opnij negearre wurde, mar bepaalde ynformaasje lykas "
@@ -8084,11 +7947,11 @@ msgstr "Flater by it iepenjen fan %1, dizze map ûntbrekt."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Flater by it iepenjen fan %1. Of dit is gjin jildige maildir-map, of jo hawwe "
-"net genôch tagongsrjochten."
+"Flater by it iepenjen fan %1. Of dit is gjin jildige maildir-map, of jo "
+"hawwe net genôch tagongsrjochten."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8132,20 +7995,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> De yndeks fan map '%2' is net aktueel. Om berjochtbeskeadiging te "
+"<qt> <p> De yndeks fan map '%2' is net aktueel. Om berjochtbeskeadiging te "
 "foarkommen sil de yndeks opnij oanmakke. It kin foarkomme dat al fuortsmiten "
-"berjochten wer ferkine, en tastânmarkearrings ferlern gean.</p> "
-"<p>Lês de <a href=\"%1\">FAQ yn de hânlieding fan KMail</a> "
-"troch foar ynformaasje oer hoe jo dizze swierrichheid foarkomme kinne.</p></qt>"
+"berjochten wer ferkine, en tastânmarkearrings ferlern gean.</p> <p>Lês de <a "
+"href=\"%1\">FAQ yn de hânlieding fan KMail</a> troch foar ynformaasje oer "
+"hoe jo dizze swierrichheid foarkomme kinne.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8204,7 +8064,7 @@ msgstr ""
 "'%1' blykt gjin map te wêzen.\n"
 "Graach de triem der wei helje."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8212,7 +8072,7 @@ msgstr ""
 "De tagongsrjochten fan map '%1' binne net just.\n"
 "Soargje derfoar dat jo de ynhâld fan dizze map iepenje en bewurkje kinne."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8222,8 +8082,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8231,7 +8091,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "De map koe net oanmakke wurde"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8331,14 +8191,14 @@ msgstr "Swierrichheid yn IMAP-l&ytsûnthâld opslosse..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Koe de map <b>%1</b> net oanmeitsje omdat der net genôch tagongsrjochten "
-"binne op de tsjinner. Wannear it mooglik moat wêze om submappen oanmeitsje te "
-"kinnen, nim dan kontakt op mei jo systeembehearderr of pas de rjochten sels "
-"oan.</qt>"
+"binne op de tsjinner. Wannear it mooglik moat wêze om submappen oanmeitsje "
+"te kinnen, nim dan kontakt op mei jo systeembehearderr of pas de rjochten "
+"sels oan.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8355,8 +8215,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Kin de map <b>%1</b> net hjirhinne kopiearje of ferpleatse, omdat der al in "
-"map mei deselde namme bestiet .</qt>"
+"<qt>Kin de map <b>%1</b> net hjirhinne kopiearje of ferpleatse, omdat der al "
+"in map mei deselde namme bestiet .</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -8370,8 +8230,8 @@ msgstr ""
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Kin de map <b>%1</b> net kopiearje of ferpleatse yn in eigen ûnderlizzende "
-"map.</qt>"
+"<qt>Kin de map <b>%1</b> net kopiearje of ferpleatse yn in eigen "
+"ûnderlizzende map.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8478,15 +8338,15 @@ msgstr "%1 mappen binne allinne-lêzen."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Wolle jo it selektearre berjocht wiskje?"
-"<br>As it ien kear wiske is kinne jo it net mear weromhelje.</qt>\n"
-"<qt>Wolle jo de %n selektearre berjochten wiskje?"
-"<br>As se ien kear wiske binne kinne jo se net mear weromhelje.</qt>"
+"<qt>Wolle jo it selektearre berjocht wiskje?<br>As it ien kear wiske is "
+"kinne jo it net mear weromhelje.</qt>\n"
+"<qt>Wolle jo de %n selektearre berjochten wiskje?<br>As se ien kear wiske "
+"binne kinne jo se net mear weromhelje.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8538,132 +8398,130 @@ msgstr ""
 "Flater by it wizigjen fan %1\n"
 "(Net genôch skiifromte?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Sertifikaat-ûndertekening-oanfraach"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Graach ûndertekenje en werom stjoere."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail is sûnder ferbining setten. Alle netwurktaken binne útstelt"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail is op ferbining setten. Alle netwurktaken wurde ferfette."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail hat no gjin ferbining. Hoe wolle jo fierdergean?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Mei ferbining wurkje"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Sûnder ferbining wurkje"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Jo hawwe gjin lês- of skriuwrjochten foar jo postfak yn."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "postfak út"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Jo hawwe gjin lês- of skriuwrjochten foar jo postfak út."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "ferstjoerd"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Jo hawwe gjin lês- of skriuwrjochten foar jo map mei ferstjoerde berjochten."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "jiskefet"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Jo hawwe gjin lês- of skriuwrjochten foar jo jiskefet."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "ûntwerpen"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Jo hawwe gjin lês- of skriuwrjochten foar jo map mei ûntwerpen."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "sjabloanen"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Jo hawwe gjin lês- of skriuwrjochten foar jo sjabloanmap."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Lêste sykopjefte"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>De map <i>%4</i> bestiet al. %1 brûkt de map <i>%5</i> "
-"foar syn berjochten. "
-"<p>%2 kin de ynhâld fan <i>%6<i> nei dizze map ferpleatse, ek al kin dit "
-"triemmen mei deselde namme yn <i>%7</i> oerskriuwe kin. "
+"<qt>De map <i>%4</i> bestiet al. %1 brûkt de map <i>%5</i> foar syn "
+"berjochten. <p>%2 kin de ynhâld fan <i>%6<i> nei dizze map ferpleatse, ek al "
+"kin dit triemmen mei deselde namme yn <i>%7</i> oerskriuwe kin. "
 "<p><strong>Wolle jo dat %3 de berjochttriemmen no ferpleatst?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>De map <i>%4</i> bestiet al. %1 brûkt no de map <i>%5</i> "
-"foar syn berjochten. %2 kin de ynhâld fan <i>%6</i> yn dizze map ferpleatse. "
+"<qt>De map <i>%4</i> bestiet al. %1 brûkt no de map <i>%5</i> foar syn "
+"berjochten. %2 kin de ynhâld fan <i>%6</i> yn dizze map ferpleatse. "
 "<p><strong>Wolle jo dat %3 de berjochttriemmen no ferpleatst?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Berjochttriemmen oerpleatse?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail kaam in fatale flater tsjin en sil ôfsluten wurde."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8674,11 +8532,11 @@ msgstr ""
 "De flater wie:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Jiskefet leegje"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Wolle it jiskefet fan alle akkounts leegje?"
 
@@ -8753,8 +8611,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Nij berjocht ûntfongen</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8794,11 +8651,11 @@ msgstr "Wolle jo it jiskefet leegje?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Wolle jo alle berjochten út de map <b>%1</b> nei it jiskefet "
-"ferpleatse?</qt>"
+"<qt>Wolle jo alle berjochten út de map <b>%1</b> nei it jiskefet ferpleatse?"
+"</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8822,11 +8679,11 @@ msgstr "Sykopjefte wiskje"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Wolle wier de sykmap <b>%1</b> wiskje? "
-"<br>De  berjochten sille yn har orizjinele map stean bliuwe.</qt>"
+"<qt>Wolle wier de sykmap <b>%1</b> wiskje? <br>De  berjochten sille yn har "
+"orizjinele map stean bliuwe.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8838,11 +8695,10 @@ msgstr "<qt>Wolle jo de map <b>%1</b> wiskje?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Wolle jo de map <b>%1</b> en alle ûnderlizzende mappen wiskje? De "
 "ûnderlizzende mappen befetsje mooglik noch berjochten dy't ek wiske wurde. "
@@ -8851,34 +8707,37 @@ msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Wolle jo de map <b>%1</b> wiskje, ûnacht de ynhâld? "
-"<p><b>Tink derom</b>: de wiske berjochten komme net yn it jiskefet mar wurde "
-"permanint wiske.</qt>"
+"<qt>Wolle jo de map <b>%1</b> wiskje, ûnacht de ynhâld? <p><b>Tink derom</"
+"b>: de wiske berjochten komme net yn it jiskefet mar wurde permanint wiske.</"
+"qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Wolle jo de map <b>%1</b> en alle ûnderlizzende mappen wiskje, ûnacht de "
-"ynhâld? "
-"<p><b>Tink derom</b>: de wiske berjochten komme net yn it jiskefet mar wurde "
-"permanint wiske.</qt>"
+"ynhâld? <p><b>Tink derom</b>: de wiske berjochten komme net yn it jiskefet "
+"mar wurde permanint wiske.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Wiske"
 
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
-"Wolle jo it IMAP-lytsûnthâld ferfarskje ? Alle wizigings dy't jo yn jo lokale "
-"IMAP-mappen makke ha sille ferlern gean."
+"Wolle jo it IMAP-lytsûnthâld ferfarskje ? Alle wizigings dy't jo yn jo "
+"lokale IMAP-mappen makke ha sille ferlern gean."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8886,13 +8745,13 @@ msgstr "Wolle jo alle âlde berjochten, wêrfan de bewartiid ferrûn is, wiskje
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"It brûken fan HTML yn in e-berjocht makket it mear kwetsber foar \"ûnpost\" "
-"(ûnwinske e-postreklame) en fergruttet de kâns dat jo systeem gefoelich wurdt "
-"foar oare typen fan feiligensrisiko's.\n"
+"It brûken fan HTML yn in e-berjocht makket it mear kwetsber foar \"ûnpost"
+"\" (ûnwinske e-postreklame) en fergruttet de kâns dat jo systeem gefoelich "
+"wurdt foar oare typen fan feiligensrisiko's.\n"
 "Dôchs trochgean?"
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8906,12 +8765,12 @@ msgstr "HTML brûke"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"It opheljen fan eksterne referinsjes yn HTML-berjochten makket jo mear kwetsber "
-"foar \"ûnpost\" (ûnwinske e-postreklame) en fergruttet de kâns dat jo systeem "
-"gefoelich wurdt foar oare typen fan feiligensrisiko's"
+"It opheljen fan eksterne referinsjes yn HTML-berjochten makket jo mear "
+"kwetsber foar \"ûnpost\" (ûnwinske e-postreklame) en fergruttet de kâns dat "
+"jo systeem gefoelich wurdt foar oare typen fan feiligensrisiko's"
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8927,14 +8786,14 @@ msgstr "Filterje op diskusjegroep %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"De funksje \"Ofwêzichheidantwurd\" is ôfhinkelik fan filtering op de tsjinner. "
-"Jo hawwe hjir foar noch gjin IMAP-tsjinner foar ynsteld.\n"
-"Jo kinne dit regelje by de ljepper \"Filterje\" yn de "
-"IMAP-akkountkonfiguraasje."
+"De funksje \"Ofwêzichheidantwurd\" is ôfhinkelik fan filtering op de "
+"tsjinner. Jo hawwe hjir foar noch gjin IMAP-tsjinner foar ynsteld.\n"
+"Jo kinne dit regelje by de ljepper \"Filterje\" yn de IMAP-"
+"akkountkonfiguraasje."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -8950,7 +8809,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "De GnuPG lochwerjefte kin net begûn wurde. Kontrolearje jo ynstallaasje."
 
@@ -9274,8 +9134,7 @@ msgstr "Taheaksel&s bewarje..."
 msgid "Appl&y All Filters"
 msgstr "Alle filters ta&passe"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "F&ilter tapasse"
@@ -9312,7 +9171,8 @@ msgstr "&Totaalkolom"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Wikselt de werjefte de kolom, hokker it oantal berjochten yn de mappen sjen lit"
+"Wikselt de werjefte de kolom, hokker it oantal berjochten yn de mappen sjen "
+"lit"
 
 #: kmmainwidget.cpp:3026
 #, fuzzy
@@ -9325,7 +9185,8 @@ msgstr "&Totaalkolom"
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Wikselt de werjefte de kolom, hokker it oantal berjochten yn de mappen sjen lit"
+"Wikselt de werjefte de kolom, hokker it oantal berjochten yn de mappen sjen "
+"lit"
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9391,7 +9252,6 @@ msgstr "Neikommende &net-lêzen berjocht"
 msgid "Go to the next unread message"
 msgstr "Nei it neikommende net-lêzen berjocht gean"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Foari&ch berjocht"
@@ -9531,8 +9391,8 @@ msgstr "Inisjonalisearje..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9542,22 +9402,22 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Dit berjocht befettet in fersyk foar in ûntfangst- en lêzen befêstiging.\n"
-"It befettet in ynstruksje dy markearre is as \"fereaske\", mar net bekend is by "
-"KMail.\n"
-"Jo kinne dit fersyk negearje of KMail in antwurd yn de foarm fan  \"mislearre\" "
-"stjoere te litten."
+"It befettet in ynstruksje dy markearre is as \"fereaske\", mar net bekend is "
+"by KMail.\n"
+"Jo kinne dit fersyk negearje of KMail in antwurd yn de foarm fan  \"mislearre"
+"\" stjoere te litten."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9570,8 +9430,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9584,8 +9444,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9621,17 +9481,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Untvangst:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Taheaksel: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "De taheaksesl sjen litte lykas oanrieden wurdt troch de stjoerder."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9681,46 +9541,40 @@ msgstr "Eigenschippen fan taheaksels"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>It <em>MIME-triemtype</em>.</p> "
-"<p>Yn it algemien hoege jo dizze ynstelling net te wizigjen, oansjoen it "
-"MIME-triemtype automatysk kontrolearre wurdt. Mar soms ûntdekt %1 it type net "
-"just. Hjir kinne jo it dan reparearje.</p></qt>"
+"<qt> <p>It <em>MIME-triemtype</em>.</p> <p>Yn it algemien hoege jo dizze "
+"ynstelling net te wizigjen, oansjoen it MIME-triemtype automatysk "
+"kontrolearre wurdt. Mar soms ûntdekt %1 it type net just. Hjir kinne jo it "
+"dan reparearje.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>De grutte fan it taheaksel.</p> "
-"<p>soms sil %1 allinne in skatte grutte jaan, omdat it berekkenjen fan de "
-"eksakte grutte tefolle tiid nimt. As dat it gefal is, dan kinne jo dit sichtber "
-"meitsje troch \"(ca.)\" ta te heakjen oan de werjûne grutte.</p></qt>"
+"<qt><p>De grutte fan it taheaksel.</p> <p>soms sil %1 allinne in skatte "
+"grutte jaan, omdat it berekkenjen fan de eksakte grutte tefolle tiid nimt. "
+"As dat it gefal is, dan kinne jo dit sichtber meitsje troch \"(ca.)\" ta te "
+"heakjen oan de werjûne grutte.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>De triemnamme fan it taheaksel.</p> "
-"<p>ek al is dit standert de namme fan de taheakke triem, wurdt de triem dat "
-"taheakke moat wurde hjirmei net oantsjutte. It suggerearret in triemnamme dat "
-"brûkt moat wurde troch it e-postprogramma fan de ûntfanger as dizze it "
-"taheaksel op de skiif bewarret.</p></qt>"
+"<qt> <p>De triemnamme fan it taheaksel.</p> <p>ek al is dit standert de "
+"namme fan de taheakke triem, wurdt de triem dat taheakke moat wurde hjirmei "
+"net oantsjutte. It suggerearret in triemnamme dat brûkt moat wurde troch it "
+"e-postprogramma fan de ûntfanger as dizze it taheaksel op de skiif bewarret."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9728,17 +9582,15 @@ msgstr "&Beskriuwing:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>In beskriuwing fan it taheaksel.</p> "
-"<p>Dit is gewoan in ynformele beskriuwing fan it taheaksel, likernôch as it "
-"ûnderwerp fan it berjocht. De measte e-postprogramma's sille dizze ynformaasje "
-"yn har berjochtfoarbylden werjaan, neist it byldkaike fan it taheaksel.</p></qt>"
+"<qt> <p>In beskriuwing fan it taheaksel.</p> <p>Dit is gewoan in ynformele "
+"beskriuwing fan it taheaksel, likernôch as it ûnderwerp fan it berjocht. De "
+"measte e-postprogramma's sille dizze ynformaasje yn har berjochtfoarbylden "
+"werjaan, neist it byldkaike fan it taheaksel.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9746,23 +9598,21 @@ msgstr "Kod&earing:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>De transportkodearring foar dit taheaksel.</p> "
-"<p>Yn it algemien hoege jo dit net te wizigjen, oansjoen %1 in kreaze "
-"standertkodearring brûkt, basearre op it mime triemtype. Mar soms kinne jo de "
-"grutte fan it úteinlike berjocht noch goed ferlytsje. Bygelyks as "
-"PostSkript-triem gjin binêre data befettet, mar allinne suver út tekst bestiet. "
-"Yn dat gefal besparje jo oant 25% op de triemgrutte troch de standertkodearring "
-" \"base64\" te ferfangen troch \"quoted-printable\".</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>De transportkodearring foar dit taheaksel.</p> <p>Yn it algemien "
+"hoege jo dit net te wizigjen, oansjoen %1 in kreaze standertkodearring "
+"brûkt, basearre op it mime triemtype. Mar soms kinne jo de grutte fan it "
+"úteinlike berjocht noch goed ferlytsje. Bygelyks as PostSkript-triem gjin "
+"binêre data befettet, mar allinne suver út tekst bestiet. Yn dat gefal "
+"besparje jo oant 25% op de triemgrutte troch de standertkodearring  "
+"\"base64\" te ferfangen troch \"quoted-printable\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9770,21 +9620,17 @@ msgstr "&Automatyske werjefte foarstelle"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Selektearje dizze opsje as jo de ûntfanger foarstelle wolle om it taheaksel "
-"automatysk(ynsletten) wer te jaan yn it foarbyldskerm, ynstee fan it standert "
-"byldkaike. </p>"
-"<p> Technysk sjoen wurdt dit dien troch it kopskriftfjild <em>"
-"Content-Disposition</em> fan dit taheaksel op \"inline\" te setten ynstee fan "
-"it standert brûkte \"taheaksel\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt> <p>Selektearje dizze opsje as jo de ûntfanger foarstelle wolle om it "
+"taheaksel automatysk(ynsletten) wer te jaan yn it foarbyldskerm, ynstee fan "
+"it standert byldkaike. </p><p> Technysk sjoen wurdt dit dien troch it "
+"kopskriftfjild <em>Content-Disposition</em> fan dit taheaksel op \"inline\" "
+"te setten ynstee fan it standert brûkte \"taheaksel\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9792,15 +9638,13 @@ msgstr "Di&t taheaksel ûndertekenje"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Selektearje dizze opsje as jo wolle dat dit taheaksel wurdt ûndertekene.</p> "
-"<p>De ûndertekening wurdt makke meide kaai dy jo ferbûn hawwe mei de no "
-"selektearre identiteit.</p></qt>"
+"<qt> <p>Selektearje dizze opsje as jo wolle dat dit taheaksel wurdt "
+"ûndertekene.</p> <p>De ûndertekening wurdt makke meide kaai dy jo ferbûn "
+"hawwe mei de no selektearre identiteit.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9808,14 +9652,12 @@ msgstr "Dit ta&heaksel fersiferje"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Selektearje dizze opsje as jo dit taheaksel wolle fersiferje.</p> "
-"<p>It taheaksel sil wurde fersifere foar de adressearre fan dit berjocht.</p>"
-"</qt>"
+"<qt> <p>Selektearje dizze opsje as jo dit taheaksel wolle fersiferje.</p> "
+"<p>It taheaksel sil wurde fersifere foar de adressearre fan dit berjocht.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9829,17 +9671,14 @@ msgstr "POP-filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Berjochten om te filterje fûn op POP-akkount: <b>%1</b> "
-"<p>De werjûne berjochten geane oer de maksimum grutte hinne dy't jo opjûn hawwe "
-"for dit akkount. "
-"<br> Jo kinne opjaan wat jo mei harren dwaan wolle troch de geskikte kar te "
-"meitsjen."
+"Berjochten om te filterje fûn op POP-akkount: <b>%1</b> <p>De werjûne "
+"berjochten geane oer de maksimum grutte hinne dy't jo opjûn hawwe for dit "
+"akkount. <br> Jo kinne opjaan wat jo mei harren dwaan wolle troch de "
+"geskikte kar te meitsjen."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10083,7 +9922,8 @@ msgstr "It filterje fan ynkommende berjochten fan online IMAP-akkounts"
 #: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr ""
-"Online IMAP-mappen kinne brûkt wurde wannear jo berjochten nei mappen filterje."
+"Online IMAP-mappen kinne brûkt wurde wannear jo berjochten nei mappen "
+"filterje."
 
 #: kmreaderwin.cpp:1264
 msgid "Automatically delete older mails on POP servers"
@@ -10096,40 +9936,39 @@ msgstr "It e-postprogramma fan de K Desktop Environment."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Mapynhâld wurdt ophelle</h2> "
-"<p>In amerijke. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Mapynhâld wurdt ophelle</h2> <p>In amerijke. . ."
+"</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2> "
-"<p>KMail is op it stuit sûnder ferbining. Klik <a href=\"kmail:goOnline\">"
-"hier</a> om ferbining te meitsjen. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2> <p>KMail is op it stuit sûnder "
+"ferbining. Klik <a href=\"kmail:goOnline\">hier</a> om ferbining te "
+"meitsjen. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10137,18 +9976,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Wolkom by KMail %1</h2>"
-"<p>KMail is it e-postprogramma fan de K Desktop Environment. it is ûntwurpen om "
-"de ynternet-poststanderts, wêrûnder MIME, SMTP, POP3 en IMAP folslein te "
-"stypjen.</p>\n"
-"<ul>"
-"<li>KMail hat in soad krachtige funksjes, hokker omskreaun stean yn de <a "
-"href=\"%2\">dokumintaasje</a></li>\n"
+"<h2 style='margin-top: 0px;'>Wolkom by KMail %1</h2><p>KMail is it e-"
+"postprogramma fan de K Desktop Environment. it is ûntwurpen om de ynternet-"
+"poststanderts, wêrûnder MIME, SMTP, POP3 en IMAP folslein te stypjen.</p>\n"
+"<ul><li>KMail hat in soad krachtige funksjes, hokker omskreaun stean yn de "
+"<a href=\"%2\">dokumintaasje</a></li>\n"
 "<li><a href=\"%3\">KMail's webside</a> jout ynformaasje oer nije ferzjes fan "
 "KMail.</li></ul>\n"
 "%8\n"
-"<p>Wichtige wizigings (Sjoen nei KMail %4, hokker diel útmakket fan TDE %5):</p>"
-"\n"
+"<p>Wichtige wizigings (Sjoen nei KMail %4, hokker diel útmakket fan TDE %5):"
+"</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10157,22 +9994,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; it team fan KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
 "<p>Nim efkes de tiid om KMail's konfiguraasjeskerm yn te foljen fia it menu "
 "ynstellings ->&gt;KMail ynstelle...\n"
-"Jo moatte yn elts gefal ien identiteit en in ynkommend en útgeand e-postakkount "
-"oanmeitsje.</p>\n"
+"Jo moatte yn elts gefal ien identiteit en in ynkommend en útgeand e-"
+"postakkount oanmeitsje.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10211,11 +10046,12 @@ msgstr "Taheaksel sjen litte: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
-"[KMail: It taheaksel befettet binêre data. Der wurdt no besocht it earste teken "
-"wer te jaan.]\n"
+"[KMail: It taheaksel befettet binêre data. Der wurdt no besocht it earste "
+"teken wer te jaan.]\n"
 "[KMail: It taheaksel befettet binêre data. Der wurdt no besocht de earste %n "
 "tekens wer te jaan.]"
 
@@ -10242,12 +10078,14 @@ msgstr "Taheaksel iepenje?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10269,6 +10107,58 @@ msgstr "(komt oerien mei inkele fan de neikommende)"
 msgid "(match all of the following)"
 msgstr "(komt oerien mei eltse neikommende)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lêzen"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Ald"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Wiske"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Beäntwurde"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Trochstjoerd"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Yn wachtrige"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Stjoerd"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Observearre"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Negearre"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Unpost"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Reklame"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Taak"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Hat taheaksel"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10349,25 +10239,26 @@ msgid ""
 "message to \"sent-mail\" folder."
 msgstr ""
 "Kritieke flater: de ferstjoerde post koe net ferwurke wurde (net genôch "
-"skiifromte?). It mislearre berjocht wurdt nei de map \"Ferstjoerd\" ferpleatst."
+"skiifromte?). It mislearre berjocht wurdt nei de map \"Ferstjoerd\" "
+"ferpleatst."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"It ferpleatsen fan it ferstjoerde berjocht \"%1\" fanút \"postfak út\" nei de "
-"map mei ferstjoerde berjochten is mislearre.\n"
+"It ferpleatsen fan it ferstjoerde berjocht \"%1\" fanút \"postfak út\" nei "
+"de map mei ferstjoerde berjochten is mislearre.\n"
 "In reden kin wêze: net genôch skiifromte, of net genôch tagongsrjochten. "
 "Besykje dizze swierrichheid te herstellen en it berjocht sels te ferpleatsen."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "It is net mooglik om in berjocht te ferstjoeren sûnder in ôfstjoerder.\n"
 "Jou in e-postadres op foar jo identiteit %1 yn de seksje Identiteiten fan it "
@@ -10396,8 +10287,8 @@ msgstr "Ferstjoerdproses wurdt ïnitsjonalisearre..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Jo ha der foar keazen om jo berjochten út de wachtrige te ferstjoeren fia in "
 "net fersifere trochgong. Wolle jo trochgean?"
@@ -10424,8 +10315,9 @@ msgstr "It ferstjoeren fan (guon) berjochten fanút de wachtrige is mislearre."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10442,20 +10334,17 @@ msgstr "Ferstjoeren ôfbrutsen."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>It ferstjoeren is mislearre:</p>"
-"<p>%1</p>"
-"<p>It berjocht bliuwt yn de map 'postfak út' oant jo de swierrichheid oplosse, "
-"of it berjocht fuortsmiten wurdt út it postfak-út.</p>"
-"<p>It neikommende transportprotokol wurdt brûkt:  %2</p> "
-"<p>Wolle jo trochgean mei it ferstjoeren fan de oerbleaune berjochten?</p>"
+"<p>It ferstjoeren is mislearre:</p><p>%1</p><p>It berjocht bliuwt yn de map "
+"'postfak út' oant jo de swierrichheid oplosse, of it berjocht fuortsmiten "
+"wurdt út it postfak-út.</p><p>It neikommende transportprotokol wurdt brûkt:  "
+"%2</p> <p>Wolle jo trochgean mei it ferstjoeren fan de oerbleaune berjochten?"
+"</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10473,15 +10362,16 @@ msgstr "Ferstjoeren ôf&brekke"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "It ferstjoeren is mislearre:\n"
 "%1\n"
-"It berjocht bliuwt yn de map 'postfak út' oant jo de swierrichheid opslosse, of "
-"it berjocht fuortsmite út it postfak-út.\n"
+"It berjocht bliuwt yn de map 'postfak út' oant jo de swierrichheid opslosse, "
+"of it berjocht fuortsmite út it postfak-út.\n"
 "It neikommende transportprotokol wurde brûkt:\n"
 " %2"
 
@@ -10522,40 +10412,41 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 blykt al de rinnen op in oar skerm op dizze kompjûter. Wannear jo %2 "
 "meardere kearen tagelyk útfiere kin dat ta berjochtenferlies liede. It wurdt "
-"net oanrieden om %1 te starten, of jo moatte der wis fan wêze dat it programma "
-"net aktyf is."
+"net oanrieden om %1 te starten, of jo moatte der wis fan wêze dat it "
+"programma net aktyf is."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 blykt al te rinnen op in oar skerm op dizze kompjûter. It tagelyk útfieren "
-"fan %1 en %2 kin ta berjochtenferlies liede. It wurdt net oanrieden om %2 te "
-"begjinnen, of jo moatte der wis fan wêze dat %1 net aktyf is."
+"%1 blykt al te rinnen op in oar skerm op dizze kompjûter. It tagelyk "
+"útfieren fan %1 en %2 kin ta berjochtenferlies liede. It wurdt net oanrieden "
+"om %2 te begjinnen, of jo moatte der wis fan wêze dat %1 net aktyf is."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 blykt al te rinnen %2. Wannear jo %1 meardere kearen tagelyk útfiere kin dat "
-"ta berjochtenferlies liede. It wurdt net oanrieden om %1 op dizze kompjûter te "
-"begjinnen, of jo moatte der wis fan wêze dat it programma net aktyf is op %2."
+"%1 blykt al te rinnen %2. Wannear jo %1 meardere kearen tagelyk útfiere kin "
+"dat ta berjochtenferlies liede. It wurdt net oanrieden om %1 op dizze "
+"kompjûter te begjinnen, of jo moatte der wis fan wêze dat it programma net "
+"aktyf is op %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 blykt al te rinnen op %3. It tagelyk útfieren fan %1 en %2 kin ta "
 "berjochtenferlies liede. It wurdt net oanrieden om %2 op dizze kompjûter te "
@@ -10570,6 +10461,10 @@ msgstr "%1 begjinne"
 msgid "Exit"
 msgstr "Ofslute"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nije berjochten yn"
@@ -10596,15 +10491,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet is net beskikber. It wurdt tige rekomandearre om TDEWallet te brûken "
-"foar it behear fan wachtwurden.\n"
-"Jo kinne der ek foar kieze om in wachtwurd yn it konfiguraasjetriem fan KMail "
-"te bewarjen. Ek al komt it wachtwurd fersifere yn de triem te stean, it is gjin "
-"garânsje dat it hielal feilich is, as ien tagong krijt ta dizze triem.\n"
+"TDEWallet is net beskikber. It wurdt tige rekomandearre om TDEWallet te "
+"brûken foar it behear fan wachtwurden.\n"
+"Jo kinne der ek foar kieze om in wachtwurd yn it konfiguraasjetriem fan "
+"KMail te bewarjen. Ek al komt it wachtwurd fersifere yn de triem te stean, "
+"it is gjin garânsje dat it hielal feilich is, as ien tagong krijt ta dizze "
+"triem.\n"
 "Wolle jo it wachtwurd foar akkount '%1' yn it konfiguraasjetriem bewarje?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10674,9 +10571,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"In kommando om lokaal út te fieren foardat berjochten ferstjoerd wurde. Dit kin "
-"ûnderoaren brûkt wurde foar it opsetten fan ssh-tunnels. Lit it leech as jo "
-"gjin kommando útfiere wolle."
+"In kommando om lokaal út te fieren foardat berjochten ferstjoerd wurde. Dit "
+"kin ûnderoaren brûkt wurde foar it opsetten fan ssh-tunnels. Lit it leech as "
+"jo gjin kommando útfiere wolle."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10684,12 +10581,12 @@ msgstr "Tsjinner fe&reasket ferifikaasje"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Selektearje dizze opsje as jo SMTP-tsjinner in ferifikaasje fereasket foardat "
-"berjochten ferstjoerd kinne wurde. Dit wurdt ek wol 'Authenticated SMTP' of "
-"ienfâldichwei 'ASMTP' neamd."
+"Selektearje dizze opsje as jo SMTP-tsjinner in ferifikaasje fereasket "
+"foardat berjochten ferstjoerd kinne wurde. Dit wurdt ek wol 'Authenticated "
+"SMTP' of ienfâldichwei 'ASMTP' neamd."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10709,15 +10606,13 @@ msgstr "Oanpaste hostnamme nei de tsjinner stjoe&re"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Selektearje dizze opsje as jo wolle dat KMail in oanpaste hostnamme brûkt by "
-"syn identifikaasje by de tsjinner. "
-"<p>Dit is hannich as de hostnamme fan jo systeem ynsteld is om de wiere "
-"hostnamme fan jo systeem te ferstopjen."
+"syn identifikaasje by de tsjinner. <p>Dit is hannich as de hostnamme fan jo "
+"systeem ynsteld is om de wiere hostnamme fan jo systeem te ferstopjen."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10748,8 +10643,8 @@ msgstr "Allinne lokale triemmen binne tastien."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "It ynfieren fan in tsjinnernamme yn it fjild Tsjinner is fereaske. Fier de "
 "namme of it IP-adres yn fan de SMTP-tsjinner."
@@ -10764,15 +10659,15 @@ msgstr "Flater by it útdraaien fan de map %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"It lokaal útskriuwe sil alle ynformaasje dy't op it stuit lokaal bewarre wurdt "
-"wiskje. De mappen op de tsjinner sille net wizige wurde. Klik no op ôfbrekke as "
-"jo wis wêze wolle dat alle lokale wizigings nei de tsjinner taskreaun binne "
-"troch earst op nije berjochten te kontrolearjen."
+"It lokaal útskriuwe sil alle ynformaasje dy't op it stuit lokaal bewarre "
+"wurdt wiskje. De mappen op de tsjinner sille net wizige wurde. Klik no op "
+"ôfbrekke as jo wis wêze wolle dat alle lokale wizigings nei de tsjinner "
+"taskreaun binne troch earst op nije berjochten te kontrolearjen."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10993,36 +10888,28 @@ msgstr "Berjocht b&ewurkje"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>De struktuereringsynformaasje dy troch de Crypto-plugin wurdt weromjûn koe "
-"net op de juste wize ferwurke wurde. Mooglik is de plugin beskeadige.</p>"
-"<p>Nim kontakt op mei jo systeembehearder.</p>"
-"<p>"
+"<qt><p>De struktuereringsynformaasje dy troch de Crypto-plugin wurdt "
+"weromjûn koe net op de juste wize ferwurke wurde. Mooglik is de plugin "
+"beskeadige.</p><p>Nim kontakt op mei jo systeembehearder.</p><p>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Der is gjin aktive Krypto-plugin fûn en de ynboude OpenPGP-koade draaide "
-"sûnder sukses.</p> "
-"<p>Jo kine twa dingen dwaan om dit te ferhelpen</p> "
-"<ul> "
-"<li><em>of</em> in plugin aktivearje mei de menuopsje \"Ynstellings->"
-"KMail ynstelle->Plugin\".</li> "
-"<li><em>of</em> jouw tradisjnele OpenPGP-ynstellings op by de ljepper "
-"\"Identiteit->Avansearre\" ûnder deselde menuopsje.</li></ul>"
+"sûnder sukses.</p> <p>Jo kine twa dingen dwaan om dit te ferhelpen</p> <ul> "
+"<li><em>of</em> in plugin aktivearje mei de menuopsje \"Ynstellings->KMail "
+"ynstelle->Plugin\".</li> <li><em>of</em> jouw tradisjnele OpenPGP-"
+"ynstellings op by de ljepper \"Identiteit->Avansearre\" ûnder deselde "
+"menuopsje.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11034,8 +10921,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "It Chiasmus-backend hat gjin funksje \"x-encrypt\". Rapportearje dit as brek."
 
@@ -11044,8 +10931,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"De funksje \"x-encrypt\" akseptearret net de ferwachte parameters. Rapportearje "
-"dizze brek."
+"De funksje \"x-encrypt\" akseptearret net de ferwachte parameters. "
+"Rapportearje dizze brek."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11053,16 +10940,16 @@ msgstr "Fersiferingsflater mei Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"De Chiasmus-backend kaam werom mei in ûnferwachte wearde. De funksje "
-"\"x-encrypt\" brocht net in byte array. Dizze brek graach efkes rapportearje."
+"De Chiasmus-backend kaam werom mei in ûnferwachte wearde. De funksje \"x-"
+"encrypt\" brocht net in byte array. Dizze brek graach efkes rapportearje."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "It ynslettten OpenPGP fersiferingsopmaak stipet gjin fersifering of "
@@ -11110,7 +10997,8 @@ msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
 msgstr ""
-"Der is in konflikt tusken de ûndertekeningynstellings foar dizze ûntfangers.\n"
+"Der is in konflikt tusken de ûndertekeningynstellings foar dizze "
+"ûntfangers.\n"
 "Wolle jo dit berjocht ûndertekenje?"
 
 #: messagecomposer.cpp:804
@@ -11176,12 +11064,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Neffens de fersiferingsfoarkar fan de ûntfangers moat der jo frege wurde om dit "
-"berjocht te ûndertekenjen of net.\n"
+"Neffens de fersiferingsfoarkar fan de ûntfangers moat der jo frege wurde om "
+"dit berjocht te ûndertekenjen of net.\n"
 "Wolle jo dit berjocht ûndertekenje?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11205,7 +11093,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"Der is in konflikt tusken de fersiferingsynstellings foar dizze ûntfangers..\n"
+"Der is in konflikt tusken de fersiferingsynstellings foar dizze "
+"ûntfangers..\n"
 "Dit berjocht fersiferje?"
 
 #: messagecomposer.cpp:909
@@ -11214,8 +11103,9 @@ msgstr "&Net fersiferje"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Jo hawwe frege om dit berjocht te fersiferjen, en om in kopy foar josels te "
 "fersiferjen, mar jo hawwe gjin jildige fertroude kaai ynsteld foar dit "
@@ -11228,8 +11118,8 @@ msgstr "Net fersifere ferstjoere?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Guon taheaksels fan dit berjocht sille net fersifere wurde.\n"
@@ -11256,87 +11146,83 @@ msgstr "Alle berjochtûnderdielen fersiferj&e"
 msgid "Unencrypted Message Warning"
 msgstr "Warskôging net fersifere berjocht"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Flater: It backend joech gjin fersifere data werom.</p>"
-"<p>Stjoer in brekrapport yn oer dizze programmaflater:"
-"<br>%2</p></qt>"
+"<qt><p>Flater: It backend joech gjin fersifere data werom.</p><p>Stjoer in "
+"brekrapport yn oer dizze programmaflater:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Net alle tekens passe yn de keazen kodearring."
-"<br>"
-"<br>Wolle jo it berjocht dochs ferstjoere?</qt>"
+"<qt>Net alle tekens passe yn de keazen kodearring.<br><br>Wolle jo it "
+"berjocht dochs ferstjoere?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Guon tekens sill ferlern gean"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Lettertekens ferlieze"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Kodearring feroarje"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Dit berjocht kin net ûndertekene wurde, om't it keazen backend gjin "
-"ûndertekening stipet. Dit soe wol wêze moatte. Jo wurde fersocht dizze brek te "
-"rapportearjen."
+"ûndertekening stipet. Dit soe wol wêze moatte. Jo wurde fersocht dizze brek "
+"te rapportearjen."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Dit berjocht kin net ûndertekene wurde, om't it keazen backend gjin "
-"ûndertekening stipet. Dit soe wol wêze moatte. Jo wurde fersocht dizze brek te "
-"rapportearjen."
+"ûndertekening stipet. Dit soe wol wêze moatte. Jo wurde fersocht dizze brek "
+"te rapportearjen."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "It ûndertekenjen is mislearre. Kontrolearje of it gpg-agent programma rint."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Dit berjocht koe net fersifere wurde, om't it keazen backend gjin fersifering "
-"stipet. Dit soe wol wêze moatte. Jo wurde fersocht dizze brek te rapportearjen."
+"Dit berjocht koe net fersifere wurde, om't it keazen backend gjin "
+"fersifering stipet. Dit soe wol wêze moatte. Jo wurde fersocht dizze brek te "
+"rapportearjen."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Dit berjocht koe net fersifere en ûndertekene wurde, om't it keazen backend "
 "gjin fersifering en ûndertekening stipet. Dit soe wol wêze moatte. Jo wurde "
@@ -11361,15 +11247,15 @@ msgstr "Postbus&formaat:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Kies of jo de berjochten yn dizze map yn ien triem bewarje wolle (mbox). KMail "
-"brûkt standert maildir. It feroarjen fan it opslachtype hoecht allinne yn "
-"bysûndere omstannichheden te barren. Wannear jo net  goed witte wat jo hjir "
-"dwaan moatte, lit it dan sa stean."
+"Kies of jo de berjochten yn dizze map yn ien triem bewarje wolle (mbox). "
+"KMail brûkt standert maildir. It feroarjen fan it opslachtype hoecht allinne "
+"yn bysûndere omstannichheden te barren. Wannear jo net  goed witte wat jo "
+"hjir dwaan moatte, lit it dan sa stean."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11378,12 +11264,13 @@ msgstr "Map be&fettet:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Kies of jo de nije map brûke wolle foar e-postadressen of foar groupware-items "
-"lykas taken en notysjes . It standert type is foar e-postadressen. Wannear jo "
-"net witte wat jo dwaan moatte, kinne jo dizze opsje sa stean litte."
+"Kies of jo de nije map brûke wolle foar e-postadressen of foar groupware-"
+"items lykas taken en notysjes . It standert type is foar e-postadressen. "
+"Wannear jo net witte wat jo dwaan moatte, kinne jo dizze opsje sa stean "
+"litte."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11405,7 +11292,8 @@ msgstr "Gjin namme oantsjutte"
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
-"<qt>It oanmeitsjen fan de map <b>%1</b> is mislearre. Dizze map bestiet al.</qt>"
+"<qt>It oanmeitsjen fan de map <b>%1</b> is mislearre. Dizze map bestiet al.</"
+"qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -11423,8 +11311,7 @@ msgstr "Oare resultaten foar hântekenings"
 msgid "The crypto engine returned no cleartext data."
 msgstr "De krypto-motor brocht gjin lêsbere tekst werom."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Tastân:"
 
@@ -11453,8 +11340,8 @@ msgstr "Gjin %1-plugin fûn."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "It berjocht is ûndertekene, mar de jildigens fan de ûndertekening kin net "
 "kontrolearre wurde.<br />Reden: %1"
@@ -11493,28 +11380,28 @@ msgstr "De Krypto-plugin \"%1\" kin hjin berjochten ûntsiferje."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Taljochting:</b> dit HTML-berjocht kin eksterne referinsjes nei ôfbyldings "
-"befetsje. Om Feiligensredenen wurdt allinne de rûge HTML-koade sjen litten. As "
-"jo de stjoerder fan dit berjocht fertrouwe dan kinne jo de eksterne referinsjes "
-"foar dit berjocht ophelje troch <a href=\"kmail:loadExternal\">"
-"hjir te klikken</a>."
+"<b>Taljochting:</b> dit HTML-berjocht kin eksterne referinsjes nei "
+"ôfbyldings befetsje. Om Feiligensredenen wurdt allinne de rûge HTML-koade "
+"sjen litten. As jo de stjoerder fan dit berjocht fertrouwe dan kinne jo de "
+"eksterne referinsjes foar dit berjocht ophelje troch <a href=\"kmail:"
+"loadExternal\">hjir te klikken</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Taljochting:</b> dit is in HTML-berjocht. Om Feiligensredenen wurdt allinne "
-"de rûge HTML-koade sjen litten. As jo de stjoerder fan dit berjocht fertrouwe "
-"dan kinne jo de eksterne referinsjes foar dit berjocht ophelje troch <a "
-"href=\"kmail:showHTML\">hjir te klikken</a>."
+"<b>Taljochting:</b> dit is in HTML-berjocht. Om Feiligensredenen wurdt "
+"allinne de rûge HTML-koade sjen litten. As jo de stjoerder fan dit berjocht "
+"fertrouwe dan kinne jo de eksterne referinsjes foar dit berjocht ophelje "
+"troch <a href=\"kmail:showHTML\">hjir te klikken</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11772,8 +11659,8 @@ msgstr "bewarre: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Der is gjin e-postadres bewarre yn de %1, hokker brûkt wurd foar it "
 "ûndertekenjen. Hjirtroch kinne wy dy net ferlykje mei it stjoerdersadres %2."
@@ -11891,16 +11778,17 @@ msgstr "Kioslave flater berjocht"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Jo POP3-tsjinner (Akkount: %1) stipet it kommando UIDL net. Dit kommando is "
-"nedich om op in betroude wei te hifkjen hokker berjochten op de tsjinner, KMail "
-"al sjoen hat.\n"
-"De funksje om berjochten op de tsjinner efter te litten sil hjirtroch net goed "
-"wurkje."
+"nedich om op in betroude wei te hifkjen hokker berjochten op de tsjinner, "
+"KMail al sjoen hat.\n"
+"De funksje om berjochten op de tsjinner efter te litten sil hjirtroch net "
+"goed wurkje."
 
 #: popaccount.cpp:752
 msgid ""
@@ -11920,10 +11808,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Berjocht %1 fan %2 (%3 fan %4 KB) foarr %5@%6 wurdt ophelle (%7 KB bliuwt op de "
-"tsjinner stean)."
+"Berjocht %1 fan %2 (%3 fan %4 KB) foarr %5@%6 wurdt ophelle (%7 KB bliuwt op "
+"de tsjinner stean)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11939,1889 +11828,16 @@ msgstr "Unjildich antwurd fan de tsjinner"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Jo tsjinner stipet it kommando TOP net. Hjirtroch is it net mooglik om de "
 "kopteksten fan grutte e-postadressen earst op te heljen foardat se ynladen "
 "wurde."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Gean nei"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Ma&p"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Berjo&cht"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Spesjaal beäntwurdzje"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Trochstjoere"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML arkbalke"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Undertekening"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automatysk berjochten tekenje"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"As dizze opsje selektearre is, sille alle berjochten dyt jo ferstjoere standert "
-"ûndertekenen wurde. It is wol sa dat it noch mooglik is om it ûndertekenjen fan "
-"in berjocht út te setten is."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Fersifering"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Wannear dizze opsje oanstiet, sil it berjocht/triem net allinne fersifere wurde "
-"mei de kaai fan de ûntfanger, mar ek mei jo eiegen kaai. Dit makket it mooglik "
-"om it berjocht/triem op in letter tiidsstip te ûntsiferjen. It is oan te rieden "
-"om dit te dwaan."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Undertekene/fersifere tekst sjen litte nei it opstellen"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Wannear dizze opsje oanstiet, sil de ûndertekene/fersifere tekst yn in apart "
-"finster te sjen wêzen, sadat jo it besjen kinne foar dat it ferstjoerd wurdt. "
-"It wurdt oanrieden om dit te dwaan sadat jo wis binne dat de fersifering "
-"wurket."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Ferstjoerde berjochten f&ersifere bewarje"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Selektearje dit om berjjochten fersifere te bewarjen"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Berjochten fersifere bewarje</h1>\n"
-"As dizze opsje selektearre is, dan wurde ferstjoerde berjochten mei deselde "
-"fersifering bewarre. Dit is net oan te rieden, omdat jo de berjochten net mear "
-"lêze kinne as it nedige sertifikaat ferrint.\n"
-"<p>\n"
-"Mar der kinne lokale regels wêze dy't fereaskje dat jo dizze opsje ynskeakelje. "
-"By twifel, nim kontakt op mei jo lokale systeembehearder.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Altyd de kaaien foar &goedkarring sjen litte"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Wannear dizze opsje selektearre is, sil de tapassing altyd in list sjen litte "
-"fan alle beskikbere publike kaaien dy jo brûke kinne foar fersifering. Wannear "
-"dit útstiet, sil de tapassing inkel in dialoochskerm sjen litte wannear de "
-"juste kaai net te finnen is of wannear meardere kaaien te brûken binne."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Berjochten automatysk fersiferje, &wannear mooglik"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"As dizze opsje selektearre is, dan wurdt elts berjocht dat jo ferstjoere "
-"fersifere, as fersifering mooglik en winske is. It is noch stees wol mooglik om "
-"it fersiferjen fan in berjocht út te skeakeljen."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nea fersiferje by it berwarjen fan in ûn&twerp"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Hoe wurket dit?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Oan:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Algemien"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Beäntwurdzje"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Eltsenien beäntwurdzje"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Trochstjoere"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Fluchtoets"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Sjabloantype:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Mapeigenschippen"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Map befettet in diskusjegroep"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Listadres:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormaal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Net-&lêzen:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Berjocht ferrint"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Fer&rint nei:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Lêzen berjochten ferrine litte"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Ferrint nei:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Net-lêzen berjochten ferrine litte"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dei/dagen"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Wike(n)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Moanne(n)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avansearre"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identiteit fan &stjoerder:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Opmaa&k fan bewarjen:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listwerjeften:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Sertifikaten mei CRL's falidearje"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Wannear dizze opsje selektearre is, sille S/MIME-sertifikaten falidearre wurde "
-"mei Certificate Revocation Lists (CRL's)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Sertifikaten online falidearje (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Wannear dizze opsje selektearre is, sille S/MIME-sertifikaten online falidearre "
-"wurde mei it Online Certificates Status Protocol (OCSP). Fier hjirûnder it "
-"URL-adres yn fan de OCSP-tsjinst."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Online sertifikaatfalidaasje"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL-adres OCSP-tsjinst::"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Fier hjir it adres yn fan de tsjinner dy de sertifikaten online falidearret "
-"(OCSP-tsjinst). It URL-adres begjint normaal sprutsen mei http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Hântekening OCSP-tsjinst:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Tsjinst-URL fan sertifikaten negearje"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Sertifikaatbelied net kontrolearje"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Standert brûkt GnuPG de triem ~/.gnupg/policies.txt om te kontrolearjen of in "
-"sertifikaatbelied tastean is. Wannear dizze opsje selektearre is wurdt it "
-"belied net kontrolearre."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nea in CRL rieplachtsje"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Wannear dizze opsje selektearre is sil de Certificate Revocation List nea brûkt "
-"wurde om S/MIME-sertifikaten te falidearjen."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Untbrekkende útjouwer sertifikaten ophelje"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Wannear dizze opsje selektearre is, sille de ûntbrekkende útjouwers foar dit "
-"sertifikaat as nedich ophelle wurde (dit is fan tapassing op beide metoaden, "
-"CRL's en OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-fersyk"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Gjin HTTP-fersiken oanmeitsje"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Skeakelt it brûken fan HTTP foar S/MIME folslein út."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Brûk dizze proksy foar HTTP-fersiken:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Brûk systeem HTTP proksy:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Wannear dizze opsje selektearre is sil de HTTP-proxy dy't rjochts te sjen is "
-"brûkt wurde by in HTTP-fersyk. (De wearde hjirfan komt út de omjouwingsfariable "
-"http_proxy.)"
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Fier de lokaasje yn fan jo HTTP-proxy dy't wurde sil foar alle HTTP-fersiken "
-"ferlykber oan S/MIME. De syntaksis is hostnamme:poarte, bygelyks "
-"mynproxy.neat.nl:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "HTTP CRL-distribúsjepunt fan sertifikaten negearje"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Wannear jo de lokaasje fan in CRL oan it sykjen binne, sil it te testen "
-"sertifikaat yngongen befetsje ûnder de namme \"CRL Distribution Point\" (DP). "
-"Dizze befetsje URL-adressen dy it adres fan de CRL beskriuwe. It earste "
-"tsjinkommende DP wurdt brûkt. Mei dizze opsje wurde alle yngongen neffens it "
-"HTTP-skema negearre wannear der socht wurdt nei in geskikte DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-fersiken"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Gjin LDAP-fersiken útfiere"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Skeakelt it brûken fan LDAP foar S/MIME folslein út."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "LDAP CRL-distribúsjepunt fan sertifikaat negearje"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Wannear jo de lokaasje fan in CRL oan it sykjen binne, sil it te testen "
-"sertifikaat yngongen befetsje ûnder de namme \"CRL Distribution Point\" (DP). "
-"Dizze befetsje URL-adressen dy it adres fan de CRL beskriuwe. It earste "
-"tsjinkommende DP wurdt brûkt. Mei dizze opsje wurde alle yngongen neffens it "
-"LDAP-skema negearre wannear der socht wurdt nei in geskikte DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primêre host foar LDAP-fersiken:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"It ynfieren fan in LDAP-tsjinner sil derfoar soargje dat elts LDAP-fersyk earst "
-"nei dy tsjinner gean sil. Om krekt te wêzen sil dizze ynstelling foarrang krije "
-"op elts oare hostnamme en poarte fan in LDAP-URL-adres. Ek wurdt dizze "
-"ynstelling brûkt as der gjin hostnamme ne poarte opjûn is yn it URL-adres. Oare "
-"LDAP-tsjinners sille pas besocht wurde as de ferbining mei de  \"proxy\" "
-"mislearre.\n"
-"De syntaksis is \"HOST\" of \"HOST:POORT\". Wannear de POORT fuortlitten wurdt "
-"sil standert poarte  389 brûkt wurde (de standert LDAP-poarte)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Taheakje..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Lettertype-ynstellingen herstelle"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "Unbeheind"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "SjabloanYnstellings"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Stjoerder beäntwurdzje"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Eltsenien beändwurdzje / Ferstjoerlist beäntwurdzje"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Berjocht trochstjoere"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Warsjô&gje foar it ferstjoeren fan net-ûndertekene berjochten"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Selektearje dizze opsje as jo wolle dat jo warskôge wurde by it ferstjoeren fan "
-"net-ûndertekene berjochten."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje foar it ferstjoeren fan net-ûndertekene berjochten</h1>\n"
-"As dizze opsje selektearre is wurde jo warskôge wannear jo in berjocht "
-"ferstjoere wolle dy't (foar in diel) net ûndertekene is.\n"
-"<p>\n"
-"Foar maksimale feilichheid is it oan te rieden om dizze opsje te selektearjen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Warskôgje as der ûnfersifere berjochten ferstjoerd sille wurde"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Selektearje dit as jo warskôge wurde wolle foar it ferstjoeren fan net "
-"fersifere berjochten."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje foar it ferstjoeren fan ûnfersifere berjochten</h1>\n"
-"As dizze opsje selektearre is, dan sil jo warskôge wurde as jo besykje "
-"berjochdielen of hiele berjochten sûnder fersifering te ferstjoeren.\n"
-"<p>\n"
-"Foar maksimale sekerheid is it oan te rieden dize opsje te selektearjen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Warskôgje as e-postad&res fan ûntfanger net yn sertifikaat stiet"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Selektearje dit as jo warskôge wurde wolle as it adres net yn it sertifikaat "
-"stiet"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje as e-postadres fan de ûntfanger net yn sertifikaat stiet</h1>\n"
-"As dizze opsje selektearre is, dan wurde jo warskôge as it e-postadres fan de "
-"ûntfanger net oanwêzich is yn it sertifikaat dat foar fersifering brûkt wurdt.\n"
-"<p>\n"
-"Foar maksimale wissigens wurdt der oanrieden om dizze opsje yn te skeakeljen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Warskôgje as in sertifikaat/kaai ynkoarten ferrinne sil (spesifike ynstellings "
-"hjirûnder)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Foar ûndertekening"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Foar fersifering"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "Dagen"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Selektearje hjir it tal dagen"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje as in ûndertekeningsertifikaat ferrint</h1>\n"
-"Selektearje it minimum oantal dagen dat in ûndertekeningsertifikaat noch "
-"jildich wêze moat foardat der warskôge wurdt.\n"
-"<p>\n"
-"De oan te rieden ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje as it fersiferingsertifikaat ferrint</h1>\n"
-"Selektearje it minimum tal dagen dat in fersiferingsertifikaat noch jildich "
-"wêze moat oant jo warskôge wurde.\n"
-"<p>\n"
-"De oan te rieden ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje as in sertifikaat yn de sertifikaatstring ferrint</h1>\n"
-"Selektearje it minimum tal dagen dat alle sertifikaten yn de string noch "
-"jildich moatte wêze foardat der warskôge wurdt.\n"
-"<p>\n"
-"De oan te rieden ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje as in CA-sertifikaat ferrint</h1>\n"
-"Selektearje it minimum oantal dagen dat in CA-sertifikaat jildich moat wêze "
-"foardat der warskôge wurdt.\n"
-"<p>\n"
-"De rekommandearre ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Warskôgje as ithaadsertifikaat ferrint</h1>\n"
-"Selektearje it minimum oantal dagen dat ion haadsertifikaatcteer noch jildich "
-"wêze moat foardat der warskôge wurdt..\n"
-"<p>\n"
-"De aan te rieden ynstelling doar de SPHINX-omjouwing is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Foar root sertifikaten"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Foar tydlike CA-sertifikaten:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Foar sertifikaten/kaaien foar einbrûkers:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Alle \"Dizze fraach net wer stelle\"-warskôgings opnij ynskeakelje"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Sjabloan ynhâld"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Sjabloan fluchtoets"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Sjabloantype"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Fêsthâlden e-post nei kontrôle op e-post ferstjoere"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p>Beskiede of jo wolle dat KMail alle berjochten yn postfak-út ferstjoerd by "
-"berjocht kontrôles, of dat jo net wolle dat berjochten automatysk ferstjoerd "
-"wurde.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Automatisch niet-gesynchroniseerde berichten verplaatsen uit mappen met "
-"onvoldoende toegangsrechten"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"As der nije berjochten yn in map binne, hokker noch net opladen binne nei de "
-"tsjinner, en jo hawwe gjin genôch tagongsrjochten op harren no op te laden, dan "
-"sille dizze berjochten automatysk ferpleatst wurde nei in ferlern en fûn map."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Met deze instellingen kunnen systeembeheerders een minimale vertraging tussen "
-"twee berichtencontroles instellen.\"\n"
-"\"De gebruiker kan geen kleinere dan de hier ingestelde waarde kiezen."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "De meast resint selektearre map yn it mappenseleksjedialooch."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"De umask ynstelling fan de brûker negearje en de triem lês- en skriuwber "
-"meitsje foar de brûker"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Belied foar it werjaan fan it systeemfakbyldkaike"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Detailearre notifikaasje by nije e-berjochten"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Wannear dizze opsje selektearre is sil der foar eltse map it oantal nije "
-"berjochten te sjen wêze yn de notifikaasje foar nije berjochten, oars krije jo "
-"in ienfâldige meidieling 'Nije berjochten ûntfongen'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Be&wurker oantsjutte"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Eksterne bewurker brû&ke ynstee fan ûntwerper"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Groupware-funksjonaliteit aktivearje"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "De kopteksten Fan:/Oan: oanpasse by antwurden op útnoegings"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook hat in oantal tekoarten yn de ymplemintaasje fan de "
-"iCalendar-standert. Dizze opsje spilet dêr op yn. Wannear jo swierrichheid "
-"hawwe mei Outlook brûkers dy't jo antwurden net ûntfange kinne, kinne jo dizze "
-"opsje besykje."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Groupware-útnoegings yn de berjochttekst ferstjoere"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook hat in oantal tekoarten yn de ymplemintaasje fan de "
-"iCalendar-standert. Dizze opsje spilet dêr op yn. Wannear jo swierrichheid "
-"hawwe mei Outlook brûkers dy jo útnoegings net ûntfange kinne, kinne jo dizze "
-"opsje besykje."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automatysk útnoegings ferstjoere"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Wannear dit selektearre is krije jo net de opsteller te sjen, mar alle "
-"útnoegingsberjochten dy automatysk ferstjoerd binne fersjoerd. Wannear jo it "
-"e-berjocht wolle sjen foardat jo it ferstjoere, moatte jo dizze opsje útsette. "
-"Wês der wis fan dat de tekst yn de opstellel iCalendar-syntaksis is, en it "
-"wurdt net oanrieden om dit sels te wizigjen."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Wannear jo dit ynskeakelje is it mooglik om items fan de Kontakt-applikaasje "
-"(KOrganizer, KAddressbook en KNotes) te bewarjen.</p></p>"
-"As jo dit oansette moatte jo ek de applikaasjes ynstelle om brûk te meitsjen "
-"fan de IMAP-databoarne. Dit kinne jo dwaan yn it TDE Konfiguraasjesintrum.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Der is normaal gjin reden om de mappe te sjen dy't IMAP-databoarne befetsje. "
-"Mar wannear jo se dochs sjen wolle kinne jo dat hjir ynstelle.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Als het account gebruikt wordt voor het opslaan van groupware-informatie\"\n"
-"\"wordt niet gebruikt om normale berichten te beheren. Stel deze optie in om "
-"KMail alleen\"\n"
-"\"groupwaremappen te laten weergeven. Dit is bruikbaar voor als u reguliere \"\n"
-"\"berichten via een aanvullend online IMAP-account afhandelt.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Kies it te bewarjen formaat fan de groupwaremappen. "
-"<ul> "
-"<li>It standert formaat is iCal (foar agindamappen) en vCard (foar "
-"adresboekmappen). Dit formaat makket alle mooglikheden fan Kontact "
-"beskikber.</li> "
-"<li>It XML-formaat fan Kolab makket brûk fan in eigen odel dat mear oerienkomt "
-"mei. Dit formaat jout bettere Outlook-kompabiliteit as jo brûk meitsje fan in "
-"Kolab-tsjinner of iet wat dêr kompatibel mei is.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Dit kiest de haadmap fan de IMAP-databoarnemappen.</p>"
-"<p>De Kolab-tsjinner stelt standert de IMAP-ynfak yn as haadmap.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Dit is de ID fan it akkount dat de IMAP-databoarnemappen befettet.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Wannear jo de mapnammen fan de IMAP-opslach yn jo eiegen taal wolle ha, dan "
-"kinne jo kieze út de beskikbere talen.</p> "
-"<p>De inichste reden wêrom dat dien wurdt is om komptabel te wêzen mei "
-"Microsoft Outlook. It is gjin goed idee om dit te dwaan omdat it dan ûnmooglik "
-"is om fan taal te feroarjen.</p>"
-"<p>Jo moatte dizze opsje allinne mar oansette as it wier nedich is.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Dizze wearde wurdt brûkt om te beskieden of de ynlieding fan KMail te sjen moat "
-"wêze."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimale ferbinings de host"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Dit kin brûkt wurde om it oantal ferbinings de host te beheinen by it "
-"kontrolearjen op nije berjochten. Standert is it oantal ferbinings ûnbeheind "
-"(0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Fluch sykjen sjen litte"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Mei dizze opsje kinne jo de sykrigel boppe de berjochtlist oan- of útsette. Jo "
-"kinne mei dizze sykrigel fluch bepaalde data sykje út de berjochtenlist."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Orizjinele te&kenset behâlde by beäntwurdzje en trochstjoere (as mooglik)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Hântekening automatysk tafoegje"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Dizze identiteit ûnthâlde, sadat dizze yn de takomst automatytsk brûkt wurdt "
-"wannear jo de neikommende kear in berjocht gean opstelle.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Unthâld dizze map foar ferstjoerde items, sadat dizze yn de takomst automatysk "
-"brûkt wurdt wannear jo de neikommende kear in berjocht gean opstelle."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Unthâld dit berjochttransport, sadat dizze yn de takomst automatysk brûkt wurdt "
-"wannear jo de neikommende kear in berjocht gean opstelle."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Dizze identiteit ûnthâlde, sadat dizze yn de takomst automatytsk brûkt wurdt "
-"wannear jo de neikommende kear in berjocht gean opstelle.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Wurdôfbrekking by kolom:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Warskôgje as haadsertifikaat fer&rint yn minder dan:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Set dizze opsje oan om der foar te soargjen dat Outlook(tm) de taheakselnammen "
-"begrypt dy't gjin Westeuropeeske tekens befetsje"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Auto&matysk befêstigje foar ûntfangst en lêzen fersiken"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Selektearje dizze opsje as jo wolle dat KMail befêstigings foar ûntfangst en "
-"lêzen (MDNs) fersykje foar alle berjochten dy jo ferstjoere.</p> "
-"<p> Dizze opsje hat allinne effekt op de standertynstelling, jo kinne it "
-"MDN-fersyk de berjocht regelje yn de opsteller fia de menuopsje<em>Opsjes</em>"
-"&gt;<em>Untfangst en lêzen befêstiging fersiken</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Koartlyn brûkte adressen brûke foar automatyske oanfolling"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Skeakel dizze opsje út wannear jo gjin koartlyn brûkte adressen sjen wolle yn "
-"de automatyske oanfolling fan de adresfjilden."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Automatysk bewarje eltse:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Der kin automatysk in reservekopy makke wurde fan de tekst yn de opsteller. Jo "
-"kinne hjir in tiidsskoft kieze om in nije reservekopy te meitsjen. Jo kinne it "
-"automatysk bewarjen útskeakelje troch hjir in wearde fan 0 yn te foljen."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Werkend foarheaksel ferfange &troch \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Werkend foarheaksel ferfange troch \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Tû&ke oanhellings brûke"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "De hântekening is ferrûn."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Seleksjetype adresearren"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Bepaalt it type dialoochfinster foar it selektearjen fan\n"
-"            adressearren."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Untfangerstype bewurker"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Stelt yn hokker dialoochfinter te sjen is foar it selektearjen fan adressearren "
-"(Oan, CC en BCC)."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maksimaal oantal fan adressearre bewurker rigels."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Orizjinele te&kenset behâlde by beäntwurdzje en trochstjoere (as mooglik)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Guon berjochten jouwe net op hokker tekensetkodearring der brûkt wurdt. Dit is "
-"neadich om san berjocht goed wer te jaan. Yn san gefal kinne jo hjir in "
-"reservekodearring ynstelle. Stel de kodearring yn dat it measte brûkt wurdt yn "
-"jo part fan de wrâld. As standert wearde wurdt de systeemwearde brûkt."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Wannear jo dizze opsje op iets oars set dan 'Auto' dan sil it brûk meitsje fan "
-"tekensetkodearring fan alle e-berjochten forsearre wurde, ûnacht wat it "
-"berjocht sels opjout."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Skeakel dizze opsje yn op glimkes :-) yn de tekst ferfange te litten troch "
-"emoikoanen (lytse piktogramkes)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Skeakel dizze opsje yn om ferskillende nivo's fan oanhelle tekst sjen te "
-"kinnen. Skeakel dizze opsje út om de ferskillende nivo's te ferstopjen."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatysk nivo ynfâldzje:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Lettergrutte ferlytsje by oanhelle tekst"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Skeakel dizze opsje yn om oanhelle tekst sjen te litten yn in lytser "
-"lettertype."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Ferstjoerde berjochten f&ersifere bewarje"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Brûker-agint yn elegante koppen sjen litte"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Dizze opsje ynskeakelje om de brûker-agint en X-Mailer sjen te litten yn de "
-"elegante berjochtkoppen"
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Lêsbefêstiging ferstjoere mei lege stjoerder."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Lêsbefêstigings ferstjoere mei in lege stjoerder. guon tsjinners kinne dizze "
-"berjochten wegerje. Wannear jo swierrichheid ûnderfine mei it ferstjoere fan "
-"lêsbefêstigings moatte jo dizze opsje útsette."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Utdrukkings binne oerset nei sjabloanen"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Alde útdrukkings binne oerset nei sjabloanen"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Berjochtsjabloan foar nij berjocht"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Berjochtsjabloan foar beántwurdzje"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Berjochtsjabloan foar eltsenien beändwurdzje"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Berjochtsjabloan foar trochstjoere"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Skrapkes"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 fan %2 %3 wurdt brûkt"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13931,6 +11947,11 @@ msgstr "As CC taheakje"
 msgid "Add as BCC"
 msgstr "As BCC taheakje"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Ofbrekke"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13946,15 +11967,15 @@ msgstr "Selektearre ûntfangers:"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Jo hawwe 1 adressearre selektearre. It maksimum oantal is %1. Pas de seleksje "
-"oan.\n"
-"Jo hawwe %n adressearren selektearre. It maksimum oantal stipe adressearren is "
-"%1. Pas de seleksje oan."
+"Jo hawwe 1 adressearre selektearre. It maksimum oantal is %1. Pas de "
+"seleksje oan.\n"
+"Jo hawwe %n adressearren selektearre. It maksimum oantal stipe adressearren "
+"is %1. Pas de seleksje oan."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13970,8 +11991,8 @@ msgstr "Brûk it adres seleksje dialooch"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Dizze knop iepenet in apart dialoochfinster wêryn jo de ûntfangers út de "
 "beskikbere adressen selektearre kinne."
@@ -14076,10 +12097,19 @@ msgstr "is grutter of lyk oan"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "Dagen"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Om jo sykopjefte út te fieren yn de map %1 moatte dizze ynladen wurde fan de "
 "tsjinner. Dit kin efkes duorje. Wolle jo trochgean mei jo sykopdracht?"
@@ -14230,16 +12260,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Data foar akkount '%1' fersammelje...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Data foar akkount '%1' fersammelje...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14258,10 +12284,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Ynhâld fan skript '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Ynhâld fan skript '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14284,20 +12308,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve mooglikheden:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve mooglikheden:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Gjin spesjale mooglikheden beskikber)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Beskikbere &Sieve-skripts:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Beskikbere &Sieve-skripts:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14340,8 +12360,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Selektearje dit fakje wannear jo wolle dat KMail in hântekening taheakket oan "
-"e-berjochten dy't mei dizze identiteit oanmakke binne."
+"Selektearje dit fakje wannear jo wolle dat KMail in hântekening taheakket "
+"oan e-berjochten dy't mei dizze identiteit oanmakke binne."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14376,12 +12396,12 @@ msgstr "Brûk dit fjild om in willekeurich statyske hântekening yn te fieren."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Brûk dit fjild om in teksttriem te kiezen dy't jo hântekening befettet, It sil "
-"eltse kear lêzen wurde wannear jo in nij berjocht opstelle of wannear jo in "
-"nije hântekening ynfiere wolle."
+"Brûk dit fjild om in teksttriem te kiezen dy't jo hântekening befettet, It "
+"sil eltse kear lêzen wurde wannear jo in nij berjocht opstelle of wannear jo "
+"in nije hântekening ynfiere wolle."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14397,21 +12417,26 @@ msgstr "Iepenet de oantsjutte triem yn in tekstprogramma."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Jo kinne hjir in willekeurich kommando ynfiere, mei of sûnder paad ôfhinklik of "
-"it kommando him befynt yn $PATH. By elts nij berjocht sil KMail it kommando "
-"útfiere en de (standert) útfier brûke sa hântekening. Normaal wurde kommando's "
-"brûkt as \"fortune\" of \"ksig-random\"."
+"Jo kinne hjir in willekeurich kommando ynfiere, mei of sûnder paad ôfhinklik "
+"of it kommando him befynt yn $PATH. By elts nij berjocht sil KMail it "
+"kommando útfiere en de (standert) útfier brûke sa hântekening. Normaal wurde "
+"kommando's brûkt as \"fortune\" of \"ksig-random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Kommando oan&tsjutte:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Paad"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nije yngong:"
@@ -14448,6 +12473,11 @@ msgstr "Akkount taheakje"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Wolle jo wier de identiteit neamd <b>\"%1\"</b> fuortsmite?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Tapasse op:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14462,6 +12492,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Skript bewurkje..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14501,9 +12535,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14540,6 +12574,16 @@ msgstr "Net ynskeakelje"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Kin ynhâld fan triem %1 net ynfoegje: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Oan:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14569,58 +12613,51 @@ msgstr "Kin net trochslús kommando begjinne fanút sjabloan: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hjir kinne jo berjochtsjabloanen meitsje om te brûken as jo in nij berjocht "
-"skriuwe of beäntwurdzje, of as jo it trochstjoere.</p>"
-"<p>De berjochtsjabloanen stipet ferfangende kommando's troch se te typen of te "
-"selektearjen út it menu <i>Kommando ynfoegje</i>.</p>"
-"<p>De hjir oantsjutte sjabloanen binne spesifyk foar in map. Se ha foarrang op "
-"globale en identiteitsjabloanen as se besteane.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hjir kinne jo berjochtsjabloanen meitsje om te brûken as jo in nij "
+"berjocht skriuwe of beäntwurdzje, of as jo it trochstjoere.</p><p>De "
+"berjochtsjabloanen stipet ferfangende kommando's troch se te typen of te "
+"selektearjen út it menu <i>Kommando ynfoegje</i>.</p><p>De hjir oantsjutte "
+"sjabloanen binne spesifyk foar in map. Se ha foarrang op globale en "
+"identiteitsjabloanen as se besteane.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hjir kinne jo berjochtsjabloanen meitsje om te brûken as jo in nij berjocht "
-"skriuwe of beäntwurdzje, of as jo it trochstjoere.</p>"
-"<p>De berjochtsjabloanen stipet ferfangende kommando's troch se te typen of te "
-"selektearjen út it menu <i>Kommando ynfoegje</i>.</p>"
-"<p>De hjir oantsjutte sjabloanen binne spesifyk foar in identiteit. Se ha "
-"foarrang op globale en mapsjabloanen as se besteane.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hjir kinne jo berjochtsjabloanen meitsje om te brûken as jo in nij "
+"berjocht skriuwe of beäntwurdzje, of as jo it trochstjoere.</p><p>De "
+"berjochtsjabloanen stipet ferfangende kommando's troch se te typen of te "
+"selektearjen út it menu <i>Kommando ynfoegje</i>.</p><p>De hjir oantsjutte "
+"sjabloanen binne spesifyk foar in identiteit. Se ha foarrang op globale en "
+"mapsjabloanen as se besteane.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hjir kinne jo berjochtsjabloanen meitsje om te brûken as jo in nij berjocht "
-"skriuwe of beäntwurdzje, of as jo it trochstjoere.</p>"
-"<p>De berjochtsjabloanen stipet ferfangende kommando's troch se te typen of te "
-"selektearjen út it menu <i>Kommando ynfoegje</i>.</p>"
-"<p>Dit is in globale (standert) sjabloan. Map- en identiteitsjabloanen krije "
-"foarrang boppe globale sjabloanen.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hjir kinne jo berjochtsjabloanen meitsje om te brûken as jo in nij "
+"berjocht skriuwe of beäntwurdzje, of as jo it trochstjoere.</p><p>De "
+"berjochtsjabloanen stipet ferfangende kommando's troch se te typen of te "
+"selektearjen út it menu <i>Kommando ynfoegje</i>.</p><p>Dit is in globale "
+"(standert) sjabloan. Map- en identiteitsjabloanen krije foarrang boppe "
+"globale sjabloanen.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14876,6 +12913,10 @@ msgstr "Aktyf berjochtynhâld trochslúzje en resultaat ynfoegje lykas it is"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Aktyf berjochtynhâld trochslúzje en ferfange troch resultaat"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Posysje fan rinnerke ynstelle"
@@ -14908,116 +12949,6 @@ msgstr "Neirinnen ynskeakelje"
 msgid "Turn Debug Off"
 msgstr "Neirinnen útskeakelje"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...jo nei it foarige en in berjocht fierder gean kinne mei de pykjetoetsen "
-"loft en rjochts?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...jo fluch filters oanmeitsje kinnne op stjoerder, ûntfanger, ûnderwerp\n"
-"en diskusjegroep fia de menuopsje <em>Ark->Filter&nbsp;oanmeitsje</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...jo fan de troch guon diskusjegroepen automatysk ynfoege referinsje "
-"&quot;[diskusjegroepnamme]&quot; ôf komme kinne mei help fan de filterhanneling "
-"<em>berjochtkop werskriuwe</em>?\n"
-"Brûk hjirfoar de filterynstelling "
-"<pre>berjochtkop werskriuwe&quot;\n"
-"Underwerp   ferfange&quot;\\s*\\[diskusjegroepnamme\\]\\s*&quot;\n"
-"   door &quot;&quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...jo diskusjegroepen keppelje kinne oan mappen fia it dialoochfinster\n"
-"<em>Map-&gt;Eigenskippen...</em>? Jo kinne dan brûk meitsje fan de menuopsje \n"
-"<em>Berkochten-&gt;Nij&nbsp;berjocht&nbsp;oan.&nbsp;diskusjegroep...</em>\n"
-"om in nij e-berjocht te iepenjen mei de diskusjegroep as adressearre.\n"
-"Jo kinne ek mei de middelste mûsknop op de map klikke.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...jo eigen byldkaikes tawize kinne oan elts seslstannige map?\n"
-"Sjoch by de menuopsje <em>Map-&gt;Eigenskippen...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...KMail in kleurenbalke brûke kin foar it markearjen fan it berjochttype "
-"(platte tekst/html/OpenPGP) fan it no aktive berjocht?</p>\n"
-"<p>Dit om ferfalsking fan de ûndertekingsferifikasje foar te kommen\n"
-"troch HTML-e-berjochten te ferstjoeren dy't KMail's ûndertekeningstastânframes "
-"neidocht.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...jo op elts berjochtkop filterje kinne troch ynfâldich de namme\n"
-"ferfan yn it earste tekstynfierfjild fan in sykrigel yn te foljen?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...jo berjochten dy't allinne yn HTML opsteld binne derút filterje kinne\n"
-"mei de filterregel "
-"<pre>&quot;Content-type&quot; befettet &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...by it beäntwurdzjen allinne it selektearre diel fan it berjocht oanhelle "
-"wurdt?</p>\n"
-"As der neat selektearre is, dan wurdt it hiele berjocht oanhelle."
-"<p>\n"
-"</p>Dit wurket ek by tekst út taheaksels as jo taheaksels ynsletten hawwe sjen "
-"lit.</p>\n"
-"<p>As jo net wolle dat it foarige berjocht oanhelle wurdt yn jo antwurd,\n"
-"kies dan foar de menuopsje <em>Berjocht-&gt;Beäntwurdzje sûnder skrapkes</em>"
-".</p>\n"
-"<p align=\"right\"><em>Bydroegen troch David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Der is neat om ûngedien te meitsjen."
@@ -15086,6 +13017,15 @@ msgstr "Taheaksel  #%1 (net neamd)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "In triem mei de namme \"%1\" bestiet al. Wolle jo it oerskriuwe?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Triem oerskriuwe?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15117,8 +13057,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Jo tsjinner hat \"vacation\" (fakânsje) net yn de list mei stipe "
-"Sieve-útwreidings stean.\n"
+"Jo tsjinner hat \"vacation\" (fakânsje) net yn de list mei stipe Sieve-"
+"útwreidings stean.\n"
 "Sûnder dizzen kin KMail gjin ôfwêzigensantwurden foar jo ynstallearje.\n"
 "Nim kontakt op mei jo systeembeheerder."
 
@@ -15202,14 +13142,14 @@ msgstr "Ofbylding fer&stjoere mei elts berjocht"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Selektearje dizze opsje om KMail in saneamde X-Face kop taheakje te litten oan "
-"de berjochten dy't jo ûnder dizze identiteit skriuwe. In X-Face is in lyts "
-"swartwyt ôfbylding (48x48 piksels). Guon e-postprogramma's hawwe de mooglikheid "
-"om san ôfbylding sjen te litten."
+"Selektearje dizze opsje om KMail in saneamde X-Face kop taheakje te litten "
+"oan de berjochten dy't jo ûnder dizze identiteit skriuwe. In X-Face is in "
+"lyts swartwyt ôfbylding (48x48 piksels). Guon e-postprogramma's hawwe de "
+"mooglikheid om san ôfbylding sjen te litten."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15237,9 +13177,9 @@ msgstr "Triem selektearje..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Selektearje dizze opsje om in ôfbyldingtriem te selektearjen sadat jo in "
 "ôfbylding selektearje kinne. De ôfbylding moat folle kontrasten, in (hast) "
@@ -15252,21 +13192,21 @@ msgstr "Ut adresboek helje"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Jo kinne in ferlytste ferzje brûke fan de ôfbylding dy't jo foar josels ynsteld "
-"hawwe yn it adresboek."
+"Jo kinne in ferlytste ferzje brûke fan de ôfbylding dy't jo foar josels "
+"ynsteld hawwe yn it adresboek."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail kin in lytse swartwyt ôfbylding (48x48 piksels) mei elts berjocht "
-"meistjoere. Dit kin bygelyks in logo wêze. Dizze ôfbylding wurdt yn it "
-"e-postprogramma fan de ûntfanger werjûn (as it stipe wurdt)."
+"meistjoere. Dit kin bygelyks in logo wêze. Dizze ôfbylding wurdt yn it e-"
+"postprogramma fan de ûntfanger werjûn (as it stipe wurdt)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15274,11 +13214,11 @@ msgstr "Brûk dit fjild om samar in X-Face-tekst yn te fieren."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Foarbylden binnen beskikber op <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Foarbylden binnen beskikber op <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15293,129 +13233,1794 @@ msgstr "Gjin ôfbylding"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Jo hawwe josels net yn it adresboek stean."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Undertekening"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automatysk berjochten tekenje"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"As dizze opsje selektearre is, sille alle berjochten dyt jo ferstjoere "
+"standert ûndertekenen wurde. It is wol sa dat it noch mooglik is om it "
+"ûndertekenjen fan in berjocht út te setten is."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Fersifering"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Berjocht fan ûnderwerp fersjen"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Wannear dizze opsje oanstiet, sil it berjocht/triem net allinne fersifere "
+"wurde mei de kaai fan de ûntfanger, mar ek mei jo eiegen kaai. Dit makket it "
+"mooglik om it berjocht/triem op in letter tiidsstip te ûntsiferjen. It is "
+"oan te rieden om dit te dwaan."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "CC: nei 'adres' stjoere"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Undertekene/fersifere tekst sjen litte nei it opstellen"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "BCC: nei 'adres' stjoere"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Wannear dizze opsje oanstiet, sil de ûndertekene/fersifere tekst yn in apart "
+"finster te sjen wêzen, sadat jo it besjen kinne foar dat it ferstjoerd "
+"wurdt. It wurdt oanrieden om dit te dwaan sadat jo wis binne dat de "
+"fersifering wurket."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "'koptekst' oan berjocht taheakje"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Ferstjoerde berjochten f&ersifere bewarje"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Berjochtynhâld fan 'triem' lêze"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Selektearje dit om berjjochten fersifere te bewarjen"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Berjochtenynhâld fan berjocht ynstelle"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Berjochten fersifere bewarje</h1>\n"
+"As dizze opsje selektearre is, dan wurde ferstjoerde berjochten mei deselde "
+"fersifering bewarre. Dit is net oan te rieden, omdat jo de berjochten net "
+"mear lêze kinne as it nedige sertifikaat ferrint.\n"
+"<p>\n"
+"Mar der kinne lokale regels wêze dy't fereaskje dat jo dizze opsje "
+"ynskeakelje. By twifel, nim kontakt op mei jo lokale systeembehearder.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Heakje in taheaksel ta oan it berjocht, dit kin werhelle wurde"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Altyd de kaaien foar &goedkarring sjen litte"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Allinne kontrolearje op nije berjochten"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Wannear dizze opsje selektearre is, sil de tapassing altyd in list sjen "
+"litte fan alle beskikbere publike kaaien dy jo brûke kinne foar fersifering. "
+"Wannear dit útstiet, sil de tapassing inkel in dialoochskerm sjen litte "
+"wannear de juste kaai net te finnen is of wannear meardere kaaien te brûken "
+"binne."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Allinne in opstelfinster foar nije berjochten iepenje"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Berjochten automatysk fersiferje, &wannear mooglik"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "It oerdroegen berjochttriem besjen"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"As dizze opsje selektearre is, dan wurdt elts berjocht dat jo ferstjoere "
+"fersifere, as fersifering mooglik en winske is. It is noch stees wol mooglik "
+"om it fersiferjen fan in berjocht út te skeakeljen."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nea fersiferje by it berwarjen fan in ûn&twerp"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Hoe wurket dit?"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Algemien"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Beäntwurdzje"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Eltsenien beäntwurdzje"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Trochstjoere"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Fluchtoets"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Sjabloantype:"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Sjabloan ynhâld"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Sjabloan fluchtoets"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Sjabloantype"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Mapeigenschippen"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Map befettet in diskusjegroep"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Listadres:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormaal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Net-&lêzen:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Berjocht ferrint"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Fer&rint nei:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Lêzen berjochten ferrine litte"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Ferrint nei:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Net-lêzen berjochten ferrine litte"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dei/dagen"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Wike(n)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Moanne(n)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avansearre"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identiteit fan &stjoerder:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Opmaa&k fan bewarjen:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listwerjeften:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Fêsthâlden e-post nei kontrôle op e-post ferstjoere"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Berjocht stjoere nei 'adres' resp. taheaksel taheakje wêr 'URL' nei ferwiisd"
+"<qt> <p>Beskiede of jo wolle dat KMail alle berjochten yn postfak-út "
+"ferstjoerd by berjocht kontrôles, of dat jo net wolle dat berjochten "
+"automatysk ferstjoerd wurde.</p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lêzen"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Automatisch niet-gesynchroniseerde berichten verplaatsen uit mappen met "
+"onvoldoende toegangsrechten"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Ald"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"As der nije berjochten yn in map binne, hokker noch net opladen binne nei de "
+"tsjinner, en jo hawwe gjin genôch tagongsrjochten op harren no op te laden, "
+"dan sille dizze berjochten automatysk ferpleatst wurde nei in ferlern en fûn "
+"map."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Wiske"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Beäntwurde"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Met deze instellingen kunnen systeembeheerders een minimale vertraging "
+"tussen twee berichtencontroles instellen.\"\n"
+"\"De gebruiker kan geen kleinere dan de hier ingestelde waarde kiezen."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Trochstjoerd"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "De meast resint selektearre map yn it mappenseleksjedialooch."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Yn wachtrige"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"De umask ynstelling fan de brûker negearje en de triem lês- en skriuwber "
+"meitsje foar de brûker"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Stjoerd"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Belied foar it werjaan fan it systeemfakbyldkaike"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Observearre"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Negearre"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Detailearre notifikaasje by nije e-berjochten"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Unpost"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Wannear dizze opsje selektearre is sil der foar eltse map it oantal nije "
+"berjochten te sjen wêze yn de notifikaasje foar nije berjochten, oars krije "
+"jo in ienfâldige meidieling 'Nije berjochten ûntfongen'."
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Reklame"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Be&wurker oantsjutte"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Taak"
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Eksterne bewurker brû&ke ynstee fan ûntwerper"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Hat taheaksel"
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 fan %2 %3 wurdt brûkt"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Groupware-funksjonaliteit aktivearje"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Paad"
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "De kopteksten Fan:/Oan: oanpasse by antwurden op útnoegings"
 
-#: util.h:208
+#: kmail.kcfg:173
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "In triem mei de namme \"%1\" bestiet al. Wolle jo it oerskriuwe?"
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook hat in oantal tekoarten yn de ymplemintaasje fan de "
+"iCalendar-standert. Dizze opsje spilet dêr op yn. Wannear jo swierrichheid "
+"hawwe mei Outlook brûkers dy't jo antwurden net ûntfange kinne, kinne jo "
+"dizze opsje besykje."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Triem oerskriuwe?"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Groupware-útnoegings yn de berjochttekst ferstjoere"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook hat in oantal tekoarten yn de ymplemintaasje fan de "
+"iCalendar-standert. Dizze opsje spilet dêr op yn. Wannear jo swierrichheid "
+"hawwe mei Outlook brûkers dy jo útnoegings net ûntfange kinne, kinne jo "
+"dizze opsje besykje."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automatysk útnoegings ferstjoere"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Wannear dit selektearre is krije jo net de opsteller te sjen, mar alle "
+"útnoegingsberjochten dy automatysk ferstjoerd binne fersjoerd. Wannear jo it "
+"e-berjocht wolle sjen foardat jo it ferstjoere, moatte jo dizze opsje "
+"útsette. Wês der wis fan dat de tekst yn de opstellel iCalendar-syntaksis "
+"is, en it wurdt net oanrieden om dit sels te wizigjen."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Wannear jo dit ynskeakelje is it mooglik om items fan de Kontakt-"
+"applikaasje (KOrganizer, KAddressbook en KNotes) te bewarjen.</p></p>As jo "
+"dit oansette moatte jo ek de applikaasjes ynstelle om brûk te meitsjen fan "
+"de IMAP-databoarne. Dit kinne jo dwaan yn it TDE Konfiguraasjesintrum.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Der is normaal gjin reden om de mappe te sjen dy't IMAP-databoarne "
+"befetsje. Mar wannear jo se dochs sjen wolle kinne jo dat hjir ynstelle.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Als het account gebruikt wordt voor het opslaan van groupware-informatie"
+"\"\n"
+"\"wordt niet gebruikt om normale berichten te beheren. Stel deze optie in om "
+"KMail alleen\"\n"
+"\"groupwaremappen te laten weergeven. Dit is bruikbaar voor als u reguliere "
+"\"\n"
+"\"berichten via een aanvullend online IMAP-account afhandelt.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Kies it te bewarjen formaat fan de groupwaremappen. <ul> <li>It standert "
+"formaat is iCal (foar agindamappen) en vCard (foar adresboekmappen). Dit "
+"formaat makket alle mooglikheden fan Kontact beskikber.</li> <li>It XML-"
+"formaat fan Kolab makket brûk fan in eigen odel dat mear oerienkomt mei. Dit "
+"formaat jout bettere Outlook-kompabiliteit as jo brûk meitsje fan in Kolab-"
+"tsjinner of iet wat dêr kompatibel mei is.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Dit kiest de haadmap fan de IMAP-databoarnemappen.</p><p>De Kolab-"
+"tsjinner stelt standert de IMAP-ynfak yn as haadmap.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Dit is de ID fan it akkount dat de IMAP-databoarnemappen befettet.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Wannear jo de mapnammen fan de IMAP-opslach yn jo eiegen taal wolle ha, "
+"dan kinne jo kieze út de beskikbere talen.</p> <p>De inichste reden wêrom "
+"dat dien wurdt is om komptabel te wêzen mei Microsoft Outlook. It is gjin "
+"goed idee om dit te dwaan omdat it dan ûnmooglik is om fan taal te feroarjen."
+"</p><p>Jo moatte dizze opsje allinne mar oansette as it wier nedich is.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Dizze wearde wurdt brûkt om te beskieden of de ynlieding fan KMail te sjen "
+"moat wêze."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimale ferbinings de host"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Dit kin brûkt wurde om it oantal ferbinings de host te beheinen by it "
+"kontrolearjen op nije berjochten. Standert is it oantal ferbinings ûnbeheind "
+"(0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Fluch sykjen sjen litte"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Mei dizze opsje kinne jo de sykrigel boppe de berjochtlist oan- of útsette. "
+"Jo kinne mei dizze sykrigel fluch bepaalde data sykje út de berjochtenlist."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Orizjinele te&kenset behâlde by beäntwurdzje en trochstjoere (as mooglik)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Hântekening automatysk tafoegje"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Dizze identiteit ûnthâlde, sadat dizze yn de takomst automatytsk brûkt wurdt "
+"wannear jo de neikommende kear in berjocht gean opstelle.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Unthâld dizze map foar ferstjoerde items, sadat dizze yn de takomst "
+"automatysk brûkt wurdt wannear jo de neikommende kear in berjocht gean "
+"opstelle."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Unthâld dit berjochttransport, sadat dizze yn de takomst automatysk brûkt "
+"wurdt wannear jo de neikommende kear in berjocht gean opstelle."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Dizze identiteit ûnthâlde, sadat dizze yn de takomst automatytsk brûkt wurdt "
+"wannear jo de neikommende kear in berjocht gean opstelle.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Wurdôfbrekking by kolom:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Warskôgje as haadsertifikaat fer&rint yn minder dan:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Set dizze opsje oan om der foar te soargjen dat Outlook(tm) de "
+"taheakselnammen begrypt dy't gjin Westeuropeeske tekens befetsje"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Auto&matysk befêstigje foar ûntfangst en lêzen fersiken"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Selektearje dizze opsje as jo wolle dat KMail befêstigings foar "
+"ûntfangst en lêzen (MDNs) fersykje foar alle berjochten dy jo ferstjoere.</"
+"p> <p> Dizze opsje hat allinne effekt op de standertynstelling, jo kinne it "
+"MDN-fersyk de berjocht regelje yn de opsteller fia de menuopsje<em>Opsjes</"
+"em>&gt;<em>Untfangst en lêzen befêstiging fersiken</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Koartlyn brûkte adressen brûke foar automatyske oanfolling"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Skeakel dizze opsje út wannear jo gjin koartlyn brûkte adressen sjen wolle "
+"yn de automatyske oanfolling fan de adresfjilden."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Automatysk bewarje eltse:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Der kin automatysk in reservekopy makke wurde fan de tekst yn de opsteller. "
+"Jo kinne hjir in tiidsskoft kieze om in nije reservekopy te meitsjen. Jo "
+"kinne it automatysk bewarjen útskeakelje troch hjir in wearde fan 0 yn te "
+"foljen."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Werkend foarheaksel ferfange &troch \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Werkend foarheaksel ferfange troch \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Tû&ke oanhellings brûke"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "De hântekening is ferrûn."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Seleksjetype adresearren"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Bepaalt it type dialoochfinster foar it selektearjen fan\n"
+"            adressearren."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Untfangerstype bewurker"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Stelt yn hokker dialoochfinter te sjen is foar it selektearjen fan "
+"adressearren (Oan, CC en BCC)."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maksimaal oantal fan adressearre bewurker rigels."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Orizjinele te&kenset behâlde by beäntwurdzje en trochstjoere (as mooglik)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Guon berjochten jouwe net op hokker tekensetkodearring der brûkt wurdt. Dit "
+"is neadich om san berjocht goed wer te jaan. Yn san gefal kinne jo hjir in "
+"reservekodearring ynstelle. Stel de kodearring yn dat it measte brûkt wurdt "
+"yn jo part fan de wrâld. As standert wearde wurdt de systeemwearde brûkt."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Wannear jo dizze opsje op iets oars set dan 'Auto' dan sil it brûk meitsje "
+"fan tekensetkodearring fan alle e-berjochten forsearre wurde, ûnacht wat it "
+"berjocht sels opjout."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Skeakel dizze opsje yn op glimkes :-) yn de tekst ferfange te litten troch "
+"emoikoanen (lytse piktogramkes)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Skeakel dizze opsje yn om ferskillende nivo's fan oanhelle tekst sjen te "
+"kinnen. Skeakel dizze opsje út om de ferskillende nivo's te ferstopjen."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatysk nivo ynfâldzje:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Lettergrutte ferlytsje by oanhelle tekst"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Skeakel dizze opsje yn om oanhelle tekst sjen te litten yn in lytser "
+"lettertype."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Ferstjoerde berjochten f&ersifere bewarje"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Brûker-agint yn elegante koppen sjen litte"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Dizze opsje ynskeakelje om de brûker-agint en X-Mailer sjen te litten yn de "
+"elegante berjochtkoppen"
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Lêsbefêstiging ferstjoere mei lege stjoerder."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Lêsbefêstigings ferstjoere mei in lege stjoerder. guon tsjinners kinne dizze "
+"berjochten wegerje. Wannear jo swierrichheid ûnderfine mei it ferstjoere fan "
+"lêsbefêstigings moatte jo dizze opsje útsette."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Utdrukkings binne oerset nei sjabloanen"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Alde útdrukkings binne oerset nei sjabloanen"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Berjochtsjabloan foar nij berjocht"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Berjochtsjabloan foar beántwurdzje"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Berjochtsjabloan foar eltsenien beändwurdzje"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Berjochtsjabloan foar trochstjoere"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Skrapkes"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Triem be&wurkje"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Bewurkje..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Gean nei"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Ma&p"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Berjo&cht"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Spesjaal beäntwurdzje"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Trochstjoere"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Lettertype-ynstellingen herstelle"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML arkbalke"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Algemiene opsjes"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML arkbalke"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Sertifikaten mei CRL's falidearje"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Wannear dizze opsje selektearre is, sille S/MIME-sertifikaten falidearre "
+"wurde mei Certificate Revocation Lists (CRL's)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Sertifikaten online falidearje (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Wannear dizze opsje selektearre is, sille S/MIME-sertifikaten online "
+"falidearre wurde mei it Online Certificates Status Protocol (OCSP). Fier "
+"hjirûnder it URL-adres yn fan de OCSP-tsjinst."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Online sertifikaatfalidaasje"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL-adres OCSP-tsjinst::"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Fier hjir it adres yn fan de tsjinner dy de sertifikaten online falidearret "
+"(OCSP-tsjinst). It URL-adres begjint normaal sprutsen mei http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Hântekening OCSP-tsjinst:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Tsjinst-URL fan sertifikaten negearje"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Sertifikaatbelied net kontrolearje"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Standert brûkt GnuPG de triem ~/.gnupg/policies.txt om te kontrolearjen of "
+"in sertifikaatbelied tastean is. Wannear dizze opsje selektearre is wurdt it "
+"belied net kontrolearre."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nea in CRL rieplachtsje"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Wannear dizze opsje selektearre is sil de Certificate Revocation List nea "
+"brûkt wurde om S/MIME-sertifikaten te falidearjen."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Untbrekkende útjouwer sertifikaten ophelje"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Wannear dizze opsje selektearre is, sille de ûntbrekkende útjouwers foar dit "
+"sertifikaat as nedich ophelle wurde (dit is fan tapassing op beide metoaden, "
+"CRL's en OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-fersyk"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Gjin HTTP-fersiken oanmeitsje"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Skeakelt it brûken fan HTTP foar S/MIME folslein út."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Brûk dizze proksy foar HTTP-fersiken:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Brûk systeem HTTP proksy:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Wannear dizze opsje selektearre is sil de HTTP-proxy dy't rjochts te sjen is "
+"brûkt wurde by in HTTP-fersyk. (De wearde hjirfan komt út de "
+"omjouwingsfariable http_proxy.)"
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Fier de lokaasje yn fan jo HTTP-proxy dy't wurde sil foar alle HTTP-fersiken "
+"ferlykber oan S/MIME. De syntaksis is hostnamme:poarte, bygelyks mynproxy."
+"neat.nl:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "HTTP CRL-distribúsjepunt fan sertifikaten negearje"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Wannear jo de lokaasje fan in CRL oan it sykjen binne, sil it te testen "
+"sertifikaat yngongen befetsje ûnder de namme \"CRL Distribution Point"
+"\" (DP). Dizze befetsje URL-adressen dy it adres fan de CRL beskriuwe. It "
+"earste tsjinkommende DP wurdt brûkt. Mei dizze opsje wurde alle yngongen "
+"neffens it HTTP-skema negearre wannear der socht wurdt nei in geskikte DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-fersiken"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Gjin LDAP-fersiken útfiere"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Skeakelt it brûken fan LDAP foar S/MIME folslein út."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "LDAP CRL-distribúsjepunt fan sertifikaat negearje"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Wannear jo de lokaasje fan in CRL oan it sykjen binne, sil it te testen "
+"sertifikaat yngongen befetsje ûnder de namme \"CRL Distribution Point"
+"\" (DP). Dizze befetsje URL-adressen dy it adres fan de CRL beskriuwe. It "
+"earste tsjinkommende DP wurdt brûkt. Mei dizze opsje wurde alle yngongen "
+"neffens it LDAP-skema negearre wannear der socht wurdt nei in geskikte DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primêre host foar LDAP-fersiken:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"It ynfieren fan in LDAP-tsjinner sil derfoar soargje dat elts LDAP-fersyk "
+"earst nei dy tsjinner gean sil. Om krekt te wêzen sil dizze ynstelling "
+"foarrang krije op elts oare hostnamme en poarte fan in LDAP-URL-adres. Ek "
+"wurdt dizze ynstelling brûkt as der gjin hostnamme ne poarte opjûn is yn it "
+"URL-adres. Oare LDAP-tsjinners sille pas besocht wurde as de ferbining mei "
+"de  \"proxy\" mislearre.\n"
+"De syntaksis is \"HOST\" of \"HOST:POORT\". Wannear de POORT fuortlitten "
+"wurdt sil standert poarte  389 brûkt wurde (de standert LDAP-poarte)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Taheakje..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Lettertype-ynstellingen herstelle"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "Unbeheind"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "SjabloanYnstellings"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Stjoerder beäntwurdzje"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Eltsenien beändwurdzje / Ferstjoerlist beäntwurdzje"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Berjocht trochstjoere"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Warsjô&gje foar it ferstjoeren fan net-ûndertekene berjochten"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Selektearje dizze opsje as jo wolle dat jo warskôge wurde by it ferstjoeren "
+"fan net-ûndertekene berjochten."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje foar it ferstjoeren fan net-ûndertekene berjochten</h1>\n"
+"As dizze opsje selektearre is wurde jo warskôge wannear jo in berjocht "
+"ferstjoere wolle dy't (foar in diel) net ûndertekene is.\n"
+"<p>\n"
+"Foar maksimale feilichheid is it oan te rieden om dizze opsje te "
+"selektearjen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Warskôgje as der ûnfersifere berjochten ferstjoerd sille wurde"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Selektearje dit as jo warskôge wurde wolle foar it ferstjoeren fan net "
+"fersifere berjochten."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje foar it ferstjoeren fan ûnfersifere berjochten</h1>\n"
+"As dizze opsje selektearre is, dan sil jo warskôge wurde as jo besykje "
+"berjochdielen of hiele berjochten sûnder fersifering te ferstjoeren.\n"
+"<p>\n"
+"Foar maksimale sekerheid is it oan te rieden dize opsje te selektearjen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Warskôgje as e-postad&res fan ûntfanger net yn sertifikaat stiet"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Selektearje dit as jo warskôge wurde wolle as it adres net yn it sertifikaat "
+"stiet"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje as e-postadres fan de ûntfanger net yn sertifikaat stiet</h1>\n"
+"As dizze opsje selektearre is, dan wurde jo warskôge as it e-postadres fan "
+"de ûntfanger net oanwêzich is yn it sertifikaat dat foar fersifering brûkt "
+"wurdt.\n"
+"<p>\n"
+"Foar maksimale wissigens wurdt der oanrieden om dizze opsje yn te "
+"skeakeljen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Warskôgje as in sertifikaat/kaai ynkoarten ferrinne sil (spesifike "
+"ynstellings hjirûnder)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Foar ûndertekening"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Foar fersifering"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Selektearje hjir it tal dagen"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje as in ûndertekeningsertifikaat ferrint</h1>\n"
+"Selektearje it minimum oantal dagen dat in ûndertekeningsertifikaat noch "
+"jildich wêze moat foardat der warskôge wurdt.\n"
+"<p>\n"
+"De oan te rieden ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje as it fersiferingsertifikaat ferrint</h1>\n"
+"Selektearje it minimum tal dagen dat in fersiferingsertifikaat noch jildich "
+"wêze moat oant jo warskôge wurde.\n"
+"<p>\n"
+"De oan te rieden ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje as in sertifikaat yn de sertifikaatstring ferrint</h1>\n"
+"Selektearje it minimum tal dagen dat alle sertifikaten yn de string noch "
+"jildich moatte wêze foardat der warskôge wurdt.\n"
+"<p>\n"
+"De oan te rieden ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje as in CA-sertifikaat ferrint</h1>\n"
+"Selektearje it minimum oantal dagen dat in CA-sertifikaat jildich moat wêze "
+"foardat der warskôge wurdt.\n"
+"<p>\n"
+"De rekommandearre ynstelling foar de SPHINX-omjouwing is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Warskôgje as ithaadsertifikaat ferrint</h1>\n"
+"Selektearje it minimum oantal dagen dat ion haadsertifikaatcteer noch "
+"jildich wêze moat foardat der warskôge wurdt..\n"
+"<p>\n"
+"De aan te rieden ynstelling doar de SPHINX-omjouwing is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Foar root sertifikaten"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Foar tydlike CA-sertifikaten:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Foar sertifikaten/kaaien foar einbrûkers:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Alle \"Dizze fraach net wer stelle\"-warskôgings opnij ynskeakelje"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...jo nei it foarige en in berjocht fierder gean kinne mei de "
+"pykjetoetsen loft en rjochts?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...jo fluch filters oanmeitsje kinnne op stjoerder, ûntfanger, ûnderwerp\n"
+"en diskusjegroep fia de menuopsje <em>Ark->Filter&nbsp;oanmeitsje</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...jo fan de troch guon diskusjegroepen automatysk ynfoege referinsje "
+"&quot;[diskusjegroepnamme]&quot; ôf komme kinne mei help fan de "
+"filterhanneling <em>berjochtkop werskriuwe</em>?\n"
+"Brûk hjirfoar de filterynstelling <pre>berjochtkop werskriuwe&quot;\n"
+"Underwerp   ferfange&quot;\\s*\\[diskusjegroepnamme\\]\\s*&quot;\n"
+"   door &quot;&quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...jo diskusjegroepen keppelje kinne oan mappen fia it dialoochfinster\n"
+"<em>Map-&gt;Eigenskippen...</em>? Jo kinne dan brûk meitsje fan de "
+"menuopsje \n"
+"<em>Berkochten-&gt;Nij&nbsp;berjocht&nbsp;oan.&nbsp;diskusjegroep...</em>\n"
+"om in nij e-berjocht te iepenjen mei de diskusjegroep as adressearre.\n"
+"Jo kinne ek mei de middelste mûsknop op de map klikke.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...jo eigen byldkaikes tawize kinne oan elts seslstannige map?\n"
+"Sjoch by de menuopsje <em>Map-&gt;Eigenskippen...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...KMail in kleurenbalke brûke kin foar it markearjen fan it berjochttype "
+"(platte tekst/html/OpenPGP) fan it no aktive berjocht?</p>\n"
+"<p>Dit om ferfalsking fan de ûndertekingsferifikasje foar te kommen\n"
+"troch HTML-e-berjochten te ferstjoeren dy't KMail's "
+"ûndertekeningstastânframes neidocht.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...jo op elts berjochtkop filterje kinne troch ynfâldich de namme\n"
+"ferfan yn it earste tekstynfierfjild fan in sykrigel yn te foljen?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...jo berjochten dy't allinne yn HTML opsteld binne derút filterje kinne\n"
+"mei de filterregel <pre>&quot;Content-type&quot; befettet &quot;text/"
+"html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...by it beäntwurdzjen allinne it selektearre diel fan it berjocht "
+"oanhelle wurdt?</p>\n"
+"As der neat selektearre is, dan wurdt it hiele berjocht oanhelle.<p>\n"
+"</p>Dit wurket ek by tekst út taheaksels as jo taheaksels ynsletten hawwe "
+"sjen lit.</p>\n"
+"<p>As jo net wolle dat it foarige berjocht oanhelle wurdt yn jo antwurd,\n"
+"kies dan foar de menuopsje <em>Berjocht-&gt;Beäntwurdzje sûnder skrapkes</"
+"em>.</p>\n"
+"<p align=\"right\"><em>Bydroegen troch David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15503,38 +15108,50 @@ msgstr "Triem oerskriuwe?"
 #~ msgstr "Alle berjochtûnderdielen fersi&ferje"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Kontrolearje of alle berjochtûnderdielen standert fersifere moat wurde."
+#~ msgstr ""
+#~ "Kontrolearje of alle berjochtûnderdielen standert fersifere moat wurde."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Alle berjochtûnderdielen automatysk fersiferjeautomatisch versleutelen</h1>\n"
-#~ "Wanneer deze optie aan staat worden alle berichtonderdelen (zoals het bericht en alle bijlagen) standaard versleuteld.\n"
+#~ "<h1>Alle berjochtûnderdielen automatysk fersiferjeautomatisch "
+#~ "versleutelen</h1>\n"
+#~ "Wanneer deze optie aan staat worden alle berichtonderdelen (zoals het "
+#~ "bericht en alle bijlagen) standaard versleuteld.\n"
 #~ "<p>\n"
-#~ "Dit is een standaard instelling, u kunt dit voor ieder apart bericht alsnog veranderen.\n"
+#~ "Dit is een standaard instelling, u kunt dit voor ieder apart bericht "
+#~ "alsnog veranderen.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "Foarôf&*geand it fersiferjen fan elts part efkes freegje"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Selektearje dit wannear jo foar elts berjochtdiel frege wurde wolle foar fersifering"
+#~ msgstr ""
+#~ "Selektearje dit wannear jo foar elts berjochtdiel frege wurde wolle foar "
+#~ "fersifering"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Freegje foardat elts diel fersifere wurdt</h1>\n"
-#~ "Wannear jo dizze opsje selektearre ha, wurdt jo frege of jo elts berjochtdiel (sawol de berjochttekst as de taheaksels) apart fersiferje wolle.\n"
+#~ "Wannear jo dizze opsje selektearre ha, wurdt jo frege of jo elts "
+#~ "berjochtdiel (sawol de berjochttekst as de taheaksels) apart fersiferje "
+#~ "wolle.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15548,14 +15165,17 @@ msgstr "Triem oerskriuwe?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Berjochten net fersiferje</h1>\n"
-#~ "Wannear dizze opsje selektearre is sille berjochten net standert fersifere wurde.\n"
+#~ "Wannear dizze opsje selektearre is sille berjochten net standert "
+#~ "fersifere wurde.\n"
 #~ "<p>\n"
-#~ "Dit is in standert ynstelling, jo kinne dit noch wol foar elts gefal apart ynstelle.\n"
+#~ "Dit is in standert ynstelling, jo kinne dit noch wol foar elts gefal "
+#~ "apart ynstelle.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15567,79 +15187,110 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Fersiferingsalgoritme</h1>\n"
-#~ "In algoritme is in manier wêrop in kompjûter in beskate taak útfiere kin. It fersiferingsalgoritme beskriuwt hoe de kompjûter de ûntfangerskaai moat tapasse op jo berjocht sadat it allinne te lêzen is foar de bedoelde ûntfanger.\n"
+#~ "In algoritme is in manier wêrop in kompjûter in beskate taak útfiere kin. "
+#~ "It fersiferingsalgoritme beskriuwt hoe de kompjûter de ûntfangerskaai "
+#~ "moat tapasse op jo berjocht sadat it allinne te lêzen is foar de bedoelde "
+#~ "ûntfanger.\n"
 #~ "<p>\n"
-#~ "It kiezen fan in fersiferingsalgoritme beskriuwt hoe maklik of hoe dreech it is om in berjocht te ûnderskeppen en te ûntsiferjen. It is wol sa dat alle algoritmen dy't him yn de SPHINX-omjouwing befine beskôge kinne wurde as hiel feilich. Oer it algemien foldocht de standert ynstelling prima.\n"
+#~ "It kiezen fan in fersiferingsalgoritme beskriuwt hoe maklik of hoe dreech "
+#~ "it is om in berjocht te ûnderskeppen en te ûntsiferjen. It is wol sa dat "
+#~ "alle algoritmen dy't him yn de SPHINX-omjouwing befine beskôge kinne "
+#~ "wurde as hiel feilich. Oer it algemien foldocht de standert ynstelling "
+#~ "prima.\n"
 #~ "<p>\n"
-#~ "Dize ynstelling is in standert, jo kinne noch wol foar elts apart berjocht oars ynstelle.\n"
+#~ "Dize ynstelling is in standert, jo kinne noch wol foar elts apart "
+#~ "berjocht oars ynstelle.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
 #~ msgstr "Kontrôle kin einigje mei lokaal bewarre serti&fikaat"
 
 #~ msgid "Check to end with locally saved certificate."
-#~ msgstr "Selektearje dit om einigje te kinnen mei in lokaal bewarre sertifikaat."
+#~ msgstr ""
+#~ "Selektearje dit om einigje te kinnen mei in lokaal bewarre sertifikaat."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kontrôle kin einigje mei lokaal bewarre sertifikaat</h1>\n"
-#~ "Wannear dizze opsje selektearre is kin it barre dat in kontrôle fan it sertifikaatstring einigje kin mei in lokaal bewarre sertifikaat.\n"
+#~ "Wannear dizze opsje selektearre is kin it barre dat in kontrôle fan it "
+#~ "sertifikaatstring einigje kin mei in lokaal bewarre sertifikaat.\n"
 #~ "<p>\n"
-#~ "Lokaal bewarre sertifikaten binne jo eigen sertifikaten, mar ek sertifikaten fan petearpartners en sertifikaatynstânsjes (CA).\n"
+#~ "Lokaal bewarre sertifikaten binne jo eigen sertifikaten, mar ek "
+#~ "sertifikaten fan petearpartners en sertifikaatynstânsjes (CA).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
 #~ msgstr "Altyd it haad sertifikaat kontrolearje."
 
 #~ msgid "Check here to check up to the root certificate"
-#~ msgstr "Selektearje dit wannear jo oan it haadsertifikaat ta kontrolearje wolle"
+#~ msgstr ""
+#~ "Selektearje dit wannear jo oan it haadsertifikaat ta kontrolearje wolle"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Altyd oan it haadsertifikaat ta kontrolearje</h1>\n"
-#~ "Wannear dizze opsje oanstiet sille sertifikaten dy hearre by it sertifikaat fan de ûntfanger hielendal kontrolearre wurde oan it haadsertifikaat ta.\n"
+#~ "Wannear dizze opsje oanstiet sille sertifikaten dy hearre by it "
+#~ "sertifikaat fan de ûntfanger hielendal kontrolearre wurde oan it "
+#~ "haadsertifikaat ta.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
 #~ msgstr "Sertifikaat&paad kontrolearje"
 
 #~ msgid "Check here to have the whole certificate path checked"
-#~ msgstr "Selektearje dizze opsje om it hiele sertifikaatpaad te kontrolearjen"
+#~ msgstr ""
+#~ "Selektearje dizze opsje om it hiele sertifikaatpaad te kontrolearjen"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sertifikaatpaad kontrolearje</h1>\n"
-#~ "Wannear dizze opsje oanstiet, sil it hiele paad fan it sertifikaat fan de ûntfanger oan it haadsertifikaat ta kontrolearre wurde.\n"
+#~ "Wannear dizze opsje oanstiet, sil it hiele paad fan it sertifikaat fan de "
+#~ "ûntfanger oan it haadsertifikaat ta kontrolearre wurde.\n"
 #~ "<p>\n"
-#~ "Taljochting: It is net mooglik om de kontrôle fan it sertifikaat sels út te skeakeljen.\n"
+#~ "Taljochting: It is net mooglik om de kontrôle fan it sertifikaat sels út "
+#~ "te skeakeljen.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15651,33 +15302,48 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>List fan ynlutsen sertifikaten brûke (CRLs)</h1>\n"
-#~ "In list fan ynlutsen sertifikaten befetsje sertifikaten dy net mear foar fersiferingdoeleinenen brûkt meie wurde. In brûker kin sertifikaten ynlûke omdat hy/sy tinkt dat it sertifikaat net mear folslein te betrouwen is (trochdat ien de Pinkoade hat efterhelle).\n"
+#~ "In list fan ynlutsen sertifikaten befetsje sertifikaten dy net mear foar "
+#~ "fersiferingdoeleinenen brûkt meie wurde. In brûker kin sertifikaten "
+#~ "ynlûke omdat hy/sy tinkt dat it sertifikaat net mear folslein te "
+#~ "betrouwen is (trochdat ien de Pinkoade hat efterhelle).\n"
 #~ "<p>\n"
-#~ "It wurdt oanrieden om CRLs te brûken foar in maksimale feilichheid. Yn it konfiguraasjedialooch foar sertifikaat- en  CRL-behear kinne jo selektearje wêr wei jo de  CRL ophelje wolle.\n"
+#~ "It wurdt oanrieden om CRLs te brûken foar in maksimale feilichheid. Yn it "
+#~ "konfiguraasjedialooch foar sertifikaat- en  CRL-behear kinne jo "
+#~ "selektearje wêr wei jo de  CRL ophelje wolle.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "&Warskôgje wannear CRL ferrint yn minder dan:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Selektearje dit wannear jo warskôge wolle wurde wannear in CRL yn de deunbije takomst ferrinne sil"
+#~ msgstr ""
+#~ "Selektearje dit wannear jo warskôge wolle wurde wannear in CRL yn de "
+#~ "deunbije takomst ferrinne sil"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warskôgje wannear CRL yn de deunbije takomst  ferrinne sil</h1>\n"
-#~ "Wannear dizze opsje selektearre is krije jo in warskôging as ien fan de CRLs der oernei tinkt om yn de deunbije takomst te ferrinne.\n"
+#~ "Wannear dizze opsje selektearre is krije jo in warskôging as ien fan de "
+#~ "CRLs der oernei tinkt om yn de deunbije takomst te ferrinne.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15686,14 +15352,16 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warskôgje wannear CRL yn de deunbije takomst ferrint</h1>\n"
-#~ "Yn dit fjild kinne jo opjaan wannear der in warskôging as in CRL ferrinne giet barre moat.\n"
+#~ "Yn dit fjild kinne jo opjaan wannear der in warskôging as in CRL ferrinne "
+#~ "giet barre moat.\n"
 #~ "<p>\n"
 #~ "In oan te rieden ynstelling foar SPHINX-omjouwings is 7 dagen.\n"
 #~ "</qt>"
@@ -15707,44 +15375,57 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Altyd foar josels fersiferje</h1>\n"
-#~ "Wannear jo dizze opsje selektearre ha sille fersifere berjochten dy't troch jo ferstjoerd binne ek fersifere wurde mei jo eigen kaai.\n"
+#~ "Wannear jo dizze opsje selektearre ha sille fersifere berjochten dy't "
+#~ "troch jo ferstjoerd binne ek fersifere wurde mei jo eigen kaai.\n"
 #~ "<p>\n"
-#~ "It is oan te rieden om dizze opsje oanstean te litten sadat jo, jo ferstjoerde berjochten nochris werom.\n"
+#~ "It is oan te rieden om dizze opsje oanstean te litten sadat jo, jo "
+#~ "ferstjoerde berjochten nochris werom.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
-#~ msgstr "Warskôgje wannear in sertifikaat yn in string ferrint yn minder dan:"
+#~ msgstr ""
+#~ "Warskôgje wannear in sertifikaat yn in string ferrint yn minder dan:"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Selektearje dizze opsje wannear jo in warskôging wolle as in sertifikaat ynkoarten ferrinne sil"
+#~ msgstr ""
+#~ "Selektearje dizze opsje wannear jo in warskôging wolle as in sertifikaat "
+#~ "ynkoarten ferrinne sil"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warskôgje by sertifikaten dy ynkoarten ferrinne sille</h1>\n"
-#~ "Wannear dizze opsje selektearre is sille jo in warskôging krije foar in sertifikaat dy't yn de oantal opjûne dagen ferrinnen sil.\n"
+#~ "Wannear dizze opsje selektearre is sille jo in warskôging krije foar in "
+#~ "sertifikaat dy't yn de oantal opjûne dagen ferrinnen sil.\n"
 #~ "<p>\n"
-#~ "It wurdt oanrieden om dizze opsje oanstean te litten sadat jo net mei ferrûne sertifikaten te meitsje krije.\n"
+#~ "It wurdt oanrieden om dizze opsje oanstean te litten sadat jo net mei "
+#~ "ferrûne sertifikaten te meitsje krije.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
 #~ msgstr "Warskôgje as it sertifikaat fan de ûnt&fanger ferrint yn:"
 
 #~ msgid "Warn if receiver's email address is &not in certificate"
-#~ msgstr "Warskôgje as it e-postadres fan de ûntfanger &net in sertifikaat stiet"
+#~ msgstr ""
+#~ "Warskôgje as it e-postadres fan de ûntfanger &net in sertifikaat stiet"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Hântekening ynstellings"
@@ -15758,8 +15439,28 @@ msgstr "Triem oerskriuwe?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Selektearje hokker sertifikaat moat ferstjoerd wurde"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Sertifikaten ferstjoere</h1> Sûnder sertifikaat is de ûntfanger net by steat om nei te gean of jo wier dat berjocht skreaun hawwe, en net is feroare troch in oar. <p>De ûntfanger kin jo sertifikaat fan in publike tsjinner helje, mar jo kinne it ek beslute by jo berjocht. Jo kinne der foar kieze om dan jo eigen sertifikaat ta te heakjen , of de hiele sertifikaatstring (mei of sûnder haadsertifikaat). <p>It is oan te rieden om yn elts gefal jo eigen sertifikaat by in berjocht ta te heakjen. <p>Dit is in standert ynstelling, jo kinne it gedrach foar elts berjocht apart ynstelle..</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Sertifikaten ferstjoere</h1> Sûnder sertifikaat is de ûntfanger "
+#~ "net by steat om nei te gean of jo wier dat berjocht skreaun hawwe, en net "
+#~ "is feroare troch in oar. <p>De ûntfanger kin jo sertifikaat fan in "
+#~ "publike tsjinner helje, mar jo kinne it ek beslute by jo berjocht. Jo "
+#~ "kinne der foar kieze om dan jo eigen sertifikaat ta te heakjen , of de "
+#~ "hiele sertifikaatstring (mei of sûnder haadsertifikaat). <p>It is oan te "
+#~ "rieden om yn elts gefal jo eigen sertifikaat by in berjocht ta te "
+#~ "heakjen. <p>Dit is in standert ynstelling, jo kinne it gedrach foar elts "
+#~ "berjocht apart ynstelle..</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Jo ei&gen sertifikaten ferstjoere"
@@ -15779,33 +15480,42 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Alle berjochtdielen standert ûndertekenje</h1>\n"
-#~ "Wannear dizze opsje oanstiet sille alle ûnderdielen fan in berjocht (dus de tekst en alle taheaksels) standert fersifere wurde.\n"
+#~ "Wannear dizze opsje oanstiet sille alle ûnderdielen fan in berjocht (dus "
+#~ "de tekst en alle taheaksels) standert fersifere wurde.\n"
 #~ "<p>\n"
-#~ "Dit is in standert ynstellings, jo kinne dit foar elts berjocht noch wol apart ynstelle.\n"
+#~ "Dit is in standert ynstellings, jo kinne dit foar elts berjocht noch wol "
+#~ "apart ynstelle.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Foarôfgeand it tekenjen fan elts part efkes freegje"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Selektearje dit wannear jo in befêstiging wolle om elts berjocht te ûndertekenje "
+#~ msgstr ""
+#~ "Selektearje dit wannear jo in befêstiging wolle om elts berjocht te "
+#~ "ûndertekenje "
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Freegje foardat elts ûnderdiel ûndertekene wurdt</h1>\n"
-#~ "As dizze opsje oanstiet wurdt der jo foar elts berjochtûnderdiel (berjochttekst en taheaksel) frege of jo it ûndertekenje wolle.\n"
+#~ "As dizze opsje oanstiet wurdt der jo foar elts berjochtûnderdiel "
+#~ "(berjochttekst en taheaksel) frege of jo it ûndertekenje wolle.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15819,18 +15529,24 @@ msgstr "Triem oerskriuwe?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Berjochten net ûndertekenje</h1>\n"
-#~ "Wannear dizze opsje selektearre is sille berjochten nte standert ûndertekene wurde.\n"
+#~ "Wannear dizze opsje selektearre is sille berjochten nte standert "
+#~ "ûndertekene wurde.\n"
 #~ "<p>\n"
-#~ "Dit is in standert ynstelling, jo kinne dit foar elts berjocht noch wol apart ynstelle.\n"
+#~ "Dit is in standert ynstelling, jo kinne dit foar elts berjocht noch wol "
+#~ "apart ynstelle.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "It ûndertekeningsertifikaat kin ynsteld wurde yn de seksje <em>Sertifikaten</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "It ûndertekeningsertifikaat kin ynsteld wurde yn de seksje "
+#~ "<em>Sertifikaten</em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15841,20 +15557,33 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Undertekeningsalgoritme</h1>\n"
-#~ "In algoritme is in beskriuwing foar de kompjûter oer hoe in taak útfierd moat wurde. It ûndertekeningsalgoritme beskriuwt hoe de kompjûter jo ûndertekening tapast op jo berjocht, sadat de ûntfanger nei gean kin of jo it berjocht ek echt ferstjoerd hawwe.\n"
+#~ "In algoritme is in beskriuwing foar de kompjûter oer hoe in taak útfierd "
+#~ "moat wurde. It ûndertekeningsalgoritme beskriuwt hoe de kompjûter jo "
+#~ "ûndertekening tapast op jo berjocht, sadat de ûntfanger nei gean kin of "
+#~ "jo it berjocht ek echt ferstjoerd hawwe.\n"
 #~ "<p>\n"
-#~ "It selektearjen fan san algoritme bepaald de moeilikheid fan it opstellen fan in falsk berjocht. De algoritmen yn de SPHINX-omjouwing wurde beskôge as hiel feilich. Oer it algemien is de standert ynstelling genôch.\n"
+#~ "It selektearjen fan san algoritme bepaald de moeilikheid fan it opstellen "
+#~ "fan in falsk berjocht. De algoritmen yn de SPHINX-omjouwing wurde beskôge "
+#~ "as hiel feilich. Oer it algemien is de standert ynstelling genôch.\n"
 #~ "<p>\n"
-#~ "Dit is in standert ynstelling, jo kinne dit foar elts berjocht apart ynstelle\n"
+#~ "Dit is in standert ynstelling, jo kinne dit foar elts berjocht apart "
+#~ "ynstelle\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15869,12 +15598,16 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Berjochten mei ûndertekening bewarje</h1>\n"
-#~ "Wannear jo dit selektearje wurde berjochten tegearre mei de ûndertekening bewarre. Dit wurd oanrieden ,sadat jo letter kontrolearje kinne of jo (in ûnderdiele fan) in berjocht ûndertekene hawwe.\n"
+#~ "Wannear jo dit selektearje wurde berjochten tegearre mei de ûndertekening "
+#~ "bewarre. Dit wurd oanrieden ,sadat jo letter kontrolearje kinne of jo (in "
+#~ "ûnderdiele fan) in berjocht ûndertekene hawwe.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15884,17 +15617,24 @@ msgstr "Triem oerskriuwe?"
 #~ msgstr "Stande&rt MIME"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "In multipart/signed dat in ûndertekening en ûndertekene data befettet"
+#~ msgstr ""
+#~ "In multipart/signed dat in ûndertekening en ûndertekene data befettet"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Undertekening as multipart ynfoegje</h1>\n"
-#~ "Wannear dize opsje selektearre is wurd de hântekening en de ûndertekene data as aparte ûnderdielen fan it berjocht taheakke. Undertekende data kinne sels lêzen wurde troch e-postprogramma's dy't gjin ûndertekeningsalgoritmen of ASN.1-ûntsifering stypje\n"
+#~ "Wannear dize opsje selektearre is wurd de hântekening en de ûndertekene "
+#~ "data as aparte ûnderdielen fan it berjocht taheakke. Undertekende data "
+#~ "kinne sels lêzen wurde troch e-postprogramma's dy't gjin "
+#~ "ûndertekeningsalgoritmen of ASN.1-ûntsifering stypje\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15906,12 +15646,17 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Berjochten opaque ûndertekenje</h1>\n"
-#~ "Wanneer deze optie is geselecteerd worden zowel de handtekening als de ondertekende gegevens in één ASN.1-blok gecodeerd. Berichten zullen alleen leesbaar zijn voor degenen die een e-mailprogramma gebruiken dat ASN.1-ontcijfering ondersteunt.\n"
+#~ "Wanneer deze optie is geselecteerd worden zowel de handtekening als de "
+#~ "ondertekende gegevens in één ASN.1-blok gecodeerd. Berichten zullen "
+#~ "alleen leesbaar zijn voor degenen die een e-mailprogramma gebruiken dat "
+#~ "ASN.1-ontcijfering ondersteunt.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15923,8 +15668,23 @@ msgstr "Triem oerskriuwe?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Selektearje hoe faak de Pinkoade ynfierd mei wurde"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Pinkoade</h1> Hjir kinne jo opjaan hoe faaks jo de Pinkoade ynfiere moatte foardat jo tagong krije ta jo persoanlike feilige sône (PSE) wêryn jo sertifikaten har befine. <p>Hoe faker jo dizze opjaan moatte, hoe muoiliker it wurdt om falske berjochten ûnder jo namme te meitsjen. In te hege wearde kin it gemak ûnder út helje. <p>Wannear jo net wis binne wat jo hjir ynfiere moatte dan is it better om de standert wearde te brûken. <p>It is om feiligensredenen net mooglik om de Pinkoade út te setten.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Pinkoade</h1> Hjir kinne jo opjaan hoe faaks jo de Pinkoade "
+#~ "ynfiere moatte foardat jo tagong krije ta jo persoanlike feilige sône "
+#~ "(PSE) wêryn jo sertifikaten har befine. <p>Hoe faker jo dizze opjaan "
+#~ "moatte, hoe muoiliker it wurdt om falske berjochten ûnder jo namme te "
+#~ "meitsjen. In te hege wearde kin it gemak ûnder út helje. <p>Wannear jo "
+#~ "net wis binne wat jo hjir ynfiere moatte dan is it better om de standert "
+#~ "wearde te brûken. <p>It is om feiligensredenen net mooglik om de Pinkoade "
+#~ "út te setten.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Ien de sesje"
@@ -15941,16 +15701,21 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warskôgje as sertifikaat ferrint</h1>\n"
-#~ "Wannear dizze opsje selektearre is krije jo in warskôging as jo in sertifikaat brûke wolle dat yn it oantal opjûne dagen ferrinne sil.\n"
+#~ "Wannear dizze opsje selektearre is krije jo in warskôging as jo in "
+#~ "sertifikaat brûke wolle dat yn it oantal opjûne dagen ferrinne sil.\n"
 #~ "<p>\n"
-#~ "It wurdt oanrieden om dizze opsje oanstean te litten om te foarkommen dat jo sertifikaten brûke dy yn de deunbije takomst ferrinne sille.\n"
+#~ "It wurdt oanrieden om dizze opsje oanstean te litten om te foarkommen dat "
+#~ "jo sertifikaten brûke dy yn de deunbije takomst ferrinne sille.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15962,14 +15727,18 @@ msgstr "Triem oerskriuwe?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Warskôgje as e-postadres fan ûntfanger net yn sertifikaat stiet</h1>\n"
-#~ "As dizze opsje selektearre is, dan wurde jo warskôge as it e-postadres fan de ûntfanger net oanwêzich is yn it sertifikaat dat foar ûndertekening brûkt wurdt.\n"
+#~ "As dizze opsje selektearre is, dan wurde jo warskôge as it e-postadres "
+#~ "fan de ûntfanger net oanwêzich is yn it sertifikaat dat foar "
+#~ "ûndertekening brûkt wurdt.\n"
 #~ "<p>\n"
-#~ "It is oan te rieden om dizze opsje oanstean te litten foar maksimale wisigens.\n"
+#~ "It is oan te rieden om dizze opsje oanstean te litten foar maksimale "
+#~ "wisigens.\n"
 #~ "</qt>"
diff --git a/tde-i18n-ga/messages/tdepim/kmail.po b/tde-i18n-ga/messages/tdepim/kmail.po
index 13bd1a7a6b9..eed71309f64 100644
--- a/tde-i18n-ga/messages/tdepim/kmail.po
+++ b/tde-i18n-ga/messages/tdepim/kmail.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kmail.po\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -163,6 +163,12 @@ msgstr "N&eamhní (bí cúramach)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Cuntas do láimhseáil leath-uathoibríoch na n-acmhainní"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Glan téacs"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -238,9 +244,9 @@ msgstr "&Logáil isteach:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -262,12 +268,12 @@ msgstr "Sábháil focal fai&re POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -296,8 +302,9 @@ msgstr "Scag &teachtaireachtaí má tá siad níos mó ná"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -347,13 +354,15 @@ msgstr "Glan téacs"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -396,9 +405,9 @@ msgstr "Ainmspásanna:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -437,7 +446,8 @@ msgstr "Sábháil an focal fai&re IMAP"
 #: accountdialog.cpp:976
 msgid "Automaticall&y compact folders (expunges deleted messages)"
 msgstr ""
-"&Dlúthaigh fillteáin go huathoibríoch (léirscriosfar teachtaireachtaí scriosta)"
+"&Dlúthaigh fillteáin go huathoibríoch (léirscriosfar teachtaireachtaí "
+"scriosta)"
 
 #: accountdialog.cpp:981
 msgid "Sho&w hidden folders"
@@ -459,9 +469,9 @@ msgstr "Luchtaigh iatáin ar éilea&mh"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -500,7 +510,7 @@ msgstr "<neamhní>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "post isteach"
 
@@ -508,28 +518,29 @@ msgstr "post isteach"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -538,23 +549,23 @@ msgstr "Roghnaigh freastalaí agus port ar an gcluaisín `Ginearálta' ar dtús.
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -562,8 +573,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -640,8 +651,8 @@ msgstr "Cuntas IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -678,9 +689,9 @@ msgstr "Fáilte go KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -743,8 +754,7 @@ msgstr "Úsáid seachadadh logánta"
 msgid "Server Information"
 msgstr "Eolas faoin bhfreastalaí"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Neamhní"
@@ -878,17 +888,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -921,10 +930,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -935,8 +943,8 @@ msgstr "Seiceáil teachtaireachtaí leis na huirlisí frithvíris"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -946,8 +954,8 @@ msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -956,8 +964,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1145,8 +1153,8 @@ msgstr "Earráid agus fillteán %1 á léamh ón fhreastalaí: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1166,8 +1174,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1197,15 +1205,15 @@ msgstr "Scriosta"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1235,15 +1243,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Luchtaigh Próifíl..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Cumraigh KMail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Cuir Leis..."
@@ -1273,6 +1285,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Bain Aitheantas"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Bain"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Cuir Leis..."
@@ -1281,6 +1298,11 @@ msgstr "Cuir Leis..."
 msgid "Modify..."
 msgstr "Athraigh..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Bain"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Socraigh mar Réamhshocrú"
@@ -1299,17 +1321,15 @@ msgstr "&Seoladh"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Cuntais amach (cuir ceann leis ar a laghad):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Ainm"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Cineál"
@@ -1331,8 +1351,7 @@ msgstr "Socraigh mar Réamhshocrú"
 msgid "Common Options"
 msgstr "Roghanna Coitianta"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr ""
@@ -1383,14 +1402,14 @@ msgstr "Fearann réamhshocrai&the:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1408,9 +1427,9 @@ msgstr ""
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Réamhshocrú)"
 
@@ -1489,6 +1508,10 @@ msgstr "Athraigh Cuntas"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ní féidir an cuntas <b>%1</b> a aimsiú.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Datha&nna"
@@ -1597,8 +1620,7 @@ msgstr "Nasc Leanta"
 msgid "Misspelled Words"
 msgstr "Focail Mílitrithe"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Teachtaireacht Nua"
@@ -1787,8 +1809,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1797,40 +1819,33 @@ msgstr "Taispeáint an Dáta"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1845,8 +1860,7 @@ msgstr "Taispeáin an &barra stádais HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Úsáid straoiseoga grafacha"
@@ -1855,8 +1869,7 @@ msgstr "Úsáid straoiseoga grafacha"
 msgid "Use smaller font for quoted text"
 msgstr "Taispeáin téacs athluaite le cló beag"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1882,8 +1895,7 @@ msgstr "Uathoibríoch"
 msgid "&Override character encoding:"
 msgstr "&Sáraigh ionchódú na gcarachtar:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Cumasaigh deilbhín i dtráidire an chórais"
@@ -1985,13 +1997,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2015,21 +2026,20 @@ msgstr ""
 msgid "&Forward:"
 msgstr "Ar A&ghaidh"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Ar %D, scríobh tú:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Ar %D, scríobh %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Teachtaireacht Curtha Ar Aghaidh"
 
@@ -2065,8 +2075,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2101,10 +2111,9 @@ msgstr "Luach"
 msgid "Ne&w"
 msgstr "N&ua"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "Ai&nm:"
@@ -2113,16 +2122,15 @@ msgstr "Ai&nm:"
 msgid "&Value:"
 msgstr "&Luach:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2149,13 +2157,13 @@ msgstr "ceangailte"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2180,62 +2188,56 @@ msgstr "I&nnill Chriptithe"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2252,10 +2254,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2334,8 +2336,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "gan seachfhreastalaí"
@@ -2364,8 +2365,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2389,8 +2390,8 @@ msgstr "Lúb i nGach Fillteán"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2459,16 +2460,14 @@ msgstr "Comhadlanna (formáid \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2502,32 +2501,27 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2594,8 +2588,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2604,8 +2598,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2658,19 +2652,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2683,14 +2676,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2795,17 +2788,16 @@ msgstr ""
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2822,15 +2814,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2898,8 +2890,8 @@ msgstr "Cuir Aitheantas in Eagar"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3147,6 +3139,11 @@ msgstr "Roghnaigh Fillteán"
 msgid "Filters"
 msgstr "Scagaire %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Roghnaigh Téacs Uile"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3178,8 +3175,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3196,10 +3193,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3220,10 +3218,10 @@ msgstr "gan teorainn"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3232,7 +3230,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Earráid KMail"
@@ -3273,9 +3271,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3326,8 +3324,8 @@ msgstr "Níl cead léamh/scríofa agat ar do chomhadlann %1."
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3338,8 +3336,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr "Ag nascadh le freastalaí %1, fan go fóill..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3365,8 +3362,8 @@ msgstr "Cuir Ceadanna Leis"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3396,7 +3393,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Comhaid Logánta"
@@ -3420,9 +3417,9 @@ msgstr ""
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3443,11 +3440,20 @@ msgstr "C&ealaigh"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Anaithnid"
@@ -3566,54 +3572,15 @@ msgstr "Stádas Spam:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>T<br>c<br>h<br>t<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>T"
-"<br>c"
-"<br>h"
-"<br>t"
-"<br> "
-"<br>g"
-"<br>a"
-"<br>n"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>T<br>c<br>h<br>t<br> <br>g<br>a<br>n<br> <br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3625,12 +3592,9 @@ msgstr "&D'ainm:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3639,11 +3603,9 @@ msgstr "Eagras&:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3652,14 +3614,11 @@ msgstr "S&eoladh Ríomhphoist:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3669,21 +3628,12 @@ msgstr "S&eoladh Ríomhphoist:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3706,12 +3656,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3724,20 +3673,18 @@ msgstr "D'Eochair chriptithe OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3756,11 +3703,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3773,18 +3719,17 @@ msgstr "Do theastas criptiúcháin S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3805,14 +3750,12 @@ msgstr ""
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3821,15 +3764,12 @@ msgstr "Seoltaí &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3868,7 +3808,7 @@ msgstr "&Síniú"
 msgid "&Picture"
 msgstr "&Pictiúr"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ríomhsheoladh neamhbhailí"
 
@@ -3887,8 +3827,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -3937,8 +3877,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Réamhshocrú)"
 
@@ -3953,8 +3893,8 @@ msgstr "Seoladh Ríomhphoist"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Is gá ainm úsáideora agus focal faire a sholáthar chun an bosca ríomhphoist seo "
-"a rochtain."
+"Is gá ainm úsáideora agus focal faire a sholáthar chun an bosca ríomhphoist "
+"seo a rochtain."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -3985,14 +3925,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4030,14 +3970,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Earráid: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4189,14 +4134,14 @@ msgstr "Cartlanna an Liosta"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4224,136 +4169,110 @@ msgstr "D'Eochair chriptithe OpenPGP"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4368,136 +4287,110 @@ msgstr "Treoraí na dTeastas"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4510,9 +4403,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4538,26 +4432,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4568,8 +4462,8 @@ msgstr "Ná Sínigh le OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4591,8 +4485,8 @@ msgstr "Ní féidir síniú"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4612,8 +4506,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4649,11 +4543,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4693,8 +4587,7 @@ msgid "Critical error: Unable to collect mail: "
 msgstr ""
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
 msgstr ""
 
 #: kmacctimap.cpp:300
@@ -4781,6 +4674,50 @@ msgstr "&IMAP dínasctha"
 msgid "&Maildir mailbox"
 msgstr "&Bosca poist maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr ""
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr ""
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr ""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr ""
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr ""
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr ""
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Ríomhphost"
@@ -4835,9 +4772,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4890,11 +4827,11 @@ msgstr "Cóipeáladh an URL go dtí an gearrthaisce."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Sábháil go Comhad"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Ionadaigh"
 
@@ -4912,7 +4849,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4932,207 +4869,207 @@ msgstr "Níl aon teachtaireacht sa chomhad."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr ""
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr ""
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "B'fhéidir nach bhfuil go leor spás diosca saor?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr ""
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr ""
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Teachtaireachtaí á mbogadh"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Teachtaireachtaí á scriosadh"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL á Oscailt..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Rith"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr ""
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr ""
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "iatán.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "iatán.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "Tá comhad ainmnithe %1 ann cheana. An bhfuil tú cinnte gur mian leat scríobh "
 "air?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Tá an comhad ann cheana"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "F&orscríobh"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Ceist KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Coimeád Criptiú"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Coimeád"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr ""
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr ""
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Ríomhphost"
@@ -5229,7 +5166,7 @@ msgstr "Méid"
 msgid "Encoding"
 msgstr "Ionchódú"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comhbhrúigh"
 
@@ -5241,7 +5178,7 @@ msgstr "Criptigh"
 msgid "Sign"
 msgstr "Sínigh"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr ""
 
@@ -5261,7 +5198,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5271,9 +5209,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5282,9 +5220,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5295,7 +5232,7 @@ msgstr "&Seol Post"
 msgid "&Send Mail Via"
 msgstr ""
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Seo&l Níos Déanaí"
@@ -5360,8 +5297,7 @@ msgstr ""
 msgid "Cl&ean Spaces"
 msgstr "G&lan Spásanna"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Ú&sáid Cló Aonleithid"
@@ -5503,31 +5439,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Caighdeánach"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5628,8 +5564,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5637,42 +5573,44 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr ""
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Seol mar atá"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Cuir Comhad Leis"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Ce&angail"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Ionsáigh Comhad"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Ionsáigh Comhad"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5712,272 +5650,284 @@ msgid ""
 "View"
 msgstr "Amharc"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Eagar..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Cuir Script in Eagar..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Sábháil M&ar..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Airíonna"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Cuir Iatán Leis..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Coinnigh"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr ""
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr ""
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "nach bhfuil iatán aige"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "gan ainm"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Eochair shínithe neamhshainithe"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Níor Sonraíodh Ainm"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Níor sonraíodh ábhar"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "S&eol mar atá"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr ""
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr ""
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Seol Deimhniú"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Seol Anois"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<faighteoirí>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Roghnaigh Faighteoir"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr ""
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr ""
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr ""
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr ""
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr ""
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Litreoir"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Níor Aimsíodh Aon Eochair Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Bhí an teachtaireacht sínithe ag %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Bhí an teachtaireacht sínithe ag %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Teachtaireacht OpenPGP - Criptithe"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Teachtaireacht le hábhar: "
@@ -6025,8 +5975,8 @@ msgstr "Litreoir - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6060,9 +6010,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6280,102 +6229,86 @@ msgstr "Seinn Fuaim"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6387,6 +6320,16 @@ msgstr "Rialacha Scagtha POP3"
 msgid "Filter Rules"
 msgstr "Rialacha Scagtha"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Iompórtáil"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Iompórtáil"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Scagairí atá ar fáil"
@@ -6467,6 +6410,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr ""
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Chuig"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Suas"
@@ -6475,16 +6423,29 @@ msgstr "Suas"
 msgid "Down"
 msgstr "Síos"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Athainmnigh..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nua"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Cóipeáil Go"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Scriosta"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6493,8 +6454,8 @@ msgstr "Roghnaigh Fillteán"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6566,19 +6527,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6616,8 +6574,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6651,8 +6609,8 @@ msgstr "Cruthaíodh innéacs an fhillteáin seo."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6781,10 +6739,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -6806,9 +6762,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -6817,14 +6772,14 @@ msgstr "Tobscortha"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6837,11 +6792,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6850,15 +6805,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Bog go:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ná Bog É"
 
@@ -6870,8 +6830,7 @@ msgstr "Bog Teachtaireachtaí go Fillteán"
 msgid "Permissions (ACL)"
 msgstr "Ceadanna (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Ginearálta"
@@ -6895,8 +6854,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Úsáid deilbhíní sa&incheaptha"
@@ -6915,14 +6873,13 @@ msgstr ""
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -6935,9 +6892,9 @@ msgstr ""
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -6948,17 +6905,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Tai&speáin colún:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Socraigh mar Réamhshocrú"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Seoltóir"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Glacadóir"
@@ -6969,11 +6930,11 @@ msgstr "A&itheantas an tseoltóra:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -6992,12 +6953,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7028,17 +6989,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7108,7 +7069,8 @@ msgstr ""
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7131,8 +7093,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7171,13 +7133,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7233,13 +7193,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7247,8 +7207,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7256,7 +7216,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Theip ar chruthú na comhadlainne."
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7352,9 +7312,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7483,10 +7443,10 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7537,124 +7497,123 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "post amach"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
 # don't change - see kalarm.po
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "seolta"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "bruscar"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "dréachtanna"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Cuardach Is Déanaí"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7662,11 +7621,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Folmhaigh an Bosca Bruscair"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
@@ -7739,8 +7698,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -7778,8 +7736,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1173
@@ -7804,8 +7762,8 @@ msgstr "Scrios Cuardach"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7815,34 +7773,37 @@ msgstr "Scrios Fillteán"
 #: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>An bhfuil tú cinnte gur mian leat an chomhadlann fholamh <b>'%1'</b> "
-"a scriosadh?</qt>"
+"<qt>An bhfuil tú cinnte gur mian leat an chomhadlann fholamh <b>'%1'</b> a "
+"scriosadh?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Scriosta"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -7855,9 +7816,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -7871,8 +7832,8 @@ msgstr "Úsáid HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -7889,8 +7850,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -7906,7 +7867,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8233,8 +8195,7 @@ msgstr "Sábháil Ia&táin..."
 msgid "Appl&y All Filters"
 msgstr ""
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Cuir Scagaire i bh&Feidhm"
@@ -8347,7 +8308,6 @@ msgstr "An Chéad Teachtaireacht &Neamhléite Eile"
 msgid "Go to the next unread message"
 msgstr ""
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Teachtaireacht &Roimhe Seo"
@@ -8484,25 +8444,25 @@ msgstr " Tús á chur..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8510,8 +8470,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8519,8 +8479,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8549,17 +8509,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Fáltas: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Iatán: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Luchtaigh iatáin ar éilea&mh"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8609,29 +8569,26 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8640,11 +8597,10 @@ msgstr "&Cur Síos:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8653,14 +8609,13 @@ msgstr "&Ionchódú:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8669,13 +8624,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8684,9 +8637,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8696,9 +8648,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8713,11 +8664,9 @@ msgstr "Scagaire POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -8968,15 +8917,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -8985,18 +8933,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9006,15 +8953,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9054,7 +8999,8 @@ msgstr "Amharc ar Iatán: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9078,12 +9024,14 @@ msgstr "Oscail an tIatán?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9105,6 +9053,58 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Léigh"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Sean"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Scriosta"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Freagartha"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr ""
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Curtha ar Chiú"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Seolta"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr ""
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Neamhaird tugtha air"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Le Déanamh"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Le hIatán"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9184,17 +9184,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9218,8 +9218,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9244,8 +9244,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9256,13 +9257,11 @@ msgstr ""
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9281,8 +9280,9 @@ msgstr ""
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9313,35 +9313,35 @@ msgstr "Stad sendmail go mínormálta."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Is gá ainm úsáideora agus focal faire a sholáthar chun an freastalaí SMTP seo a "
-"rochtain."
+"Is gá ainm úsáideora agus focal faire a sholáthar chun an freastalaí SMTP "
+"seo a rochtain."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9353,6 +9353,10 @@ msgstr "Tosaigh %1"
 msgid "Exit"
 msgstr "Scoir"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Teachtaireachtaí Nua I"
@@ -9382,8 +9386,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9460,8 +9465,8 @@ msgstr ""
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9482,10 +9487,9 @@ msgstr "Seol óstainm saincheaptha go &dtí an freastalaí"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9515,8 +9519,8 @@ msgstr "Ní cheadaítear ach comhaid logánta."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9529,10 +9533,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9752,22 +9756,18 @@ msgstr "Cuir an Teachtaireacht in &Eagar"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9778,8 +9778,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9794,14 +9794,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -9896,8 +9896,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -9929,8 +9929,9 @@ msgstr "&Ná Criptigh"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -9940,8 +9941,8 @@ msgstr "Seol Gan Criptiú?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -9961,70 +9962,68 @@ msgstr "&Criptigh Gach Páirt"
 msgid "Unencrypted Message Warning"
 msgstr ""
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Caill Carachtair"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Athraigh Ionchódú"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10046,10 +10045,10 @@ msgstr ""
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10059,8 +10058,8 @@ msgstr ""
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10099,8 +10098,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stádas:"
 
@@ -10129,8 +10127,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10166,18 +10164,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10445,8 +10443,8 @@ msgstr "stóráilte: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10562,10 +10560,11 @@ msgstr "Teachtaireacht Earráide Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10581,7 +10580,8 @@ msgstr ""
 "fhreastalaí...\n"
 "Fuarthas %n dteachtaireacht ó %1. Teachtaireachtaí á scriosadh ón "
 "fhreastalaí...\n"
-"Fuarthas %n teachtaireacht ó %1. Teachtaireachtaí á scriosadh ón fhreastalaí..."
+"Fuarthas %n teachtaireacht ó %1. Teachtaireachtaí á scriosadh ón "
+"fhreastalaí..."
 
 #: popaccount.cpp:762 popaccount.cpp:782
 msgid ""
@@ -10591,10 +10591,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Teachtaireacht %1 as %2 (%3 as %4 kB) á fáil le haghaidh %5@%6 (%7 kB fágtha ar "
-"an bhfreastalaí)."
+"Teachtaireacht %1 as %2 (%3 as %4 kB) á fáil le haghaidh %5@%6 (%7 kB fágtha "
+"ar an bhfreastalaí)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -10610,1643 +10611,12 @@ msgstr "Freagra Neamhbhailí Ón Fhreastalaí"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Téigh"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "F&illteán"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Teachtaireacht"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Freagra Speisialta"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Ar A&ghaidh"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barra Uirlisí HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Á Shíniú"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Sínigh te&achtaireachtaí go huathoibríoch"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Criptiú"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Taispeáin na heochracha criptithe i gcónaí lena g&ceadú"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Chuig: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Uilíoch"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Freagair"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Seol&adh an liosta:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Gnách:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Gan léamh:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Lá"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Seachtain"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mí"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Casta"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Aitheantas an tseoltóra:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Cuir Leis..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Grúpearraí"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "gan teorainn"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " lá"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Sonraigh eagarthóir:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Sínigh te&achtaireachtaí go huathoibríoch"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Timfhilleadh focal ag colún:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Tá an síniú as dáta."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Taispeáin ceanntásca uile na dteachtaireachtaí"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Taispeáin ceanntásca uile na dteachtaireachtaí"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12358,6 +10728,11 @@ msgstr "Cuir Leis mar CC"
 msgid "Add as BCC"
 msgstr ""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "C&ealaigh"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12373,10 +10748,10 @@ msgstr ""
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12393,8 +10768,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12498,10 +10873,19 @@ msgstr ""
 msgid " bytes"
 msgstr " beart"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " lá"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12638,15 +11022,12 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -12661,8 +11042,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -12686,8 +11066,7 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -12695,10 +11074,8 @@ msgid "(No special capabilities available)"
 msgstr ""
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Scripteanna Sieve atá ar fáil:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Scripteanna Sieve atá ar fáil:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -12768,8 +11145,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12786,17 +11163,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Son&raigh ordú:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Conair"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Iontráil Nua:"
@@ -12832,6 +11214,11 @@ msgstr "Cuir Cuntas Leis"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Cuir i bhfeidhm &ar:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -12846,6 +11233,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Cuir Script in Eagar..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -12885,9 +11276,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -12921,6 +11312,16 @@ msgstr "Ná Cumasaigh"
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Chuig: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -12950,36 +11351,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13202,6 +11599,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13238,76 +11639,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13375,6 +11706,17 @@ msgstr ""
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Tá comhad ainmnithe \"%1\" ann cheana. An bhfuil tú cinnte gur mian leat "
+"scríobh air?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Forscríobh an Comhad?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13474,9 +11816,9 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13505,9 +11847,9 @@ msgstr "Roghnaigh Comhad..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13516,15 +11858,15 @@ msgstr "Socraigh ón Leabhar Seoltaí"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13533,8 +11875,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13550,130 +11892,1509 @@ msgstr "Gan Pictiúr"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Á Shíniú"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Sínigh te&achtaireachtaí go huathoibríoch"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Criptiú"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
 msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
 msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Taispeáin na heochracha criptithe i gcónaí lena g&ceadú"
+
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
 msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Léigh"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Uilíoch"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Sean"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Freagair"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Scriosta"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Freagartha"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
 msgstr ""
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Curtha ar Chiú"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Seolta"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
 msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Neamhaird tugtha air"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
 msgstr ""
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Le Déanamh"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Seol&adh an liosta:"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Le hIatán"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Gnách:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Gan léamh:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Conair"
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr ""
 
-#: util.h:208
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Lá"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Seachtain"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mí"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Casta"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Aitheantas an tseoltóra:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Tá comhad ainmnithe \"%1\" ann cheana. An bhfuil tú cinnte gur mian leat "
-"scríobh air?"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Forscríobh an Comhad?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Sonraigh eagarthóir:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Sínigh te&achtaireachtaí go huathoibríoch"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Timfhilleadh focal ag colún:"
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr ""
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Tá an síniú as dáta."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Taispeáin ceanntásca uile na dteachtaireachtaí"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Taispeáin ceanntásca uile na dteachtaireachtaí"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr ""
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Cuir &Comhad in Eagar"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Eagar..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Téigh"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "F&illteán"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Teachtaireacht"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Freagra Speisialta"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Ar A&ghaidh"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "&Socraigh Ionchódú"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra Uirlisí HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Roghanna Coitianta"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barra Uirlisí HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr ""
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Cuir Leis..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Grúpearraí"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr ""
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "gan teorainn"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr ""
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr ""
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr ""
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr ""
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -13768,9 +13489,6 @@ msgstr "Forscríobh an Comhad?"
 #~ msgid "Send"
 #~ msgstr "Seol"
 
-#~ msgid "Configure KMail"
-#~ msgstr "Cumraigh KMail"
-
 #~ msgid "Go Offline"
 #~ msgstr "Téigh As Líne"
 
diff --git a/tde-i18n-gl/messages/tdepim/kmail.po b/tde-i18n-gl/messages/tdepim/kmail.po
index 1197394ecd7..9e15fd999e6 100644
--- a/tde-i18n-gl/messages/tdepim/kmail.po
+++ b/tde-i18n-gl/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-01-14 18:36+0100\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Xabi García"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -170,6 +170,12 @@ msgstr "Ningún (&empregar con coidado)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Conta para manexo semiautomático de recurso"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Borrar Pasado"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,13 +254,13 @@ msgstr "N&ome:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"O seu fornecedor de internet tívolle que outorgar un <em>nome de usuario</em> "
-"preciso para a autentificación cos servidores. Xeralmente soe ser a primeira "
-"parte do seu enderezo de correo (a parte anterior a <em>@</em>)."
+"O seu fornecedor de internet tívolle que outorgar un <em>nome de usuario</"
+"em> preciso para a autentificación cos servidores. Xeralmente soe ser a "
+"primeira parte do seu enderezo de correo (a parte anterior a <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -275,20 +281,20 @@ msgstr "Ga&rdar o contrasinal POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Active esta opción para que KMail garde o contrasinal.\n"
 "Se está dispoñíbel TDEWallet o contrasinal gravarase alí, o que se considera "
 "seguro.\n"
-"Porén se TDEWallet non está dispoñíbel, o contrasinal gravarase no ficheiro de "
-"configuración de KMail. O contrasinal grávase nun formato oculto, pero non se "
-"pode considerar seguro de ser descifrado unha vez se teña acceso a dito "
-"ficheiro."
+"Porén se TDEWallet non está dispoñíbel, o contrasinal gravarase no ficheiro "
+"de configuración de KMail. O contrasinal grávase nun formato oculto, pero "
+"non se pode considerar seguro de ser descifrado unha vez se teña acceso a "
+"dito ficheiro."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -316,8 +322,9 @@ msgstr "&Filtrar mensaxes se son maiores de"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Se vostede activa esta opción, os filtros POP empregaranse para decidir qué "
 "facer coas mensaxes. Vostede pode entón entre descargar, borrar ou manter no "
@@ -370,13 +377,15 @@ msgstr "Te&xto en claro"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -419,9 +428,9 @@ msgstr "Espacios:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Aquí pode ver os diferentes espacios que atura o seu servidor IMAP. Cada "
 "espacio representa un prefixo que separa grupos de cartafoles. Os espacios "
@@ -484,13 +493,13 @@ msgstr "Carga-los ane&xos segundo a demanda"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Active isto para non cargar os anexos automáticamente cando se selecciona o "
-"corre-e, senón cando prema no ficheiro anexo. Deste xeito, os correos-e grandes "
-"amósanse instantáneamente."
+"corre-e, senón cando prema no ficheiro anexo. Deste xeito, os correos-e "
+"grandes amósanse instantáneamente."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -501,8 +510,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Só explorar os subcartafoles dos cartafoles que están abertos (expandidos) na "
-"árbore de cartafoles. Empregue isto se hai moitos cartafoles no servidor."
+"Só explorar os subcartafoles dos cartafoles que están abertos (expandidos) "
+"na árbore de cartafoles. Empregue isto se hai moitos cartafoles no servidor."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -530,7 +539,7 @@ msgstr "<nada>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "entrante"
 
@@ -538,8 +547,8 @@ msgstr "entrante"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "O servidor non semella aturar números de mensaxes únicos, pero isto é un "
 "requeremento para deixar as mensaxes no servidor.\n"
@@ -550,34 +559,35 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "O servidor non semella aturar a obtención das cabeceiras das mensaxes, pero "
 "isto é un requisiño para filtrar as mensaxes no servidor.\n"
-"Xa que algúns servidores non anuncian correctamente as súas capacidades aínda "
-"ten a posibilidade de activar a filtraxe de mensaxes no servidor."
+"Xa que algúns servidores non anuncian correctamente as súas capacidades "
+"aínda ten a posibilidade de activar a filtraxe de mensaxes no servidor."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Nótese que esta característica pode causar que determinados servidores POP3 que "
-"non aturan paralelismo envíen mensaxes corruptas.\n"
+"Nótese que esta característica pode causar que determinados servidores POP3 "
+"que non aturan paralelismo envíen mensaxes corruptas.\n"
 "Isto é configurábel, porque algúns servidores soportan paralelismo pero non "
 "avisan da súa posibilidade de emprego. Para comprobar se o seu servidor POP3 "
 "atura o paralelismo, empregue o botón \"Comprobar qué atura o servidor\" no "
 "baixo do diálogo.\n"
-"Se o seu servidor non o especifica, pero vostede precisa máis velocidade, entón "
-"debería facer algunhas probas enviándose a vostede mesmo un paquete de correos "
-"e baixalos."
+"Se o seu servidor non o especifica, pero vostede precisa máis velocidade, "
+"entón debería facer algunhas probas enviándose a vostede mesmo un paquete de "
+"correos e baixalos."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -586,31 +596,31 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "O servidor non semella aturar o paralelismo; polo tanto, deshabilitouse esta "
 "opción.\n"
-"Xa que algúns servidores non anuncian axeitadamente as súas capacidades aínda "
-"ten a posibilidade de activar o paralelismo. Pero por favor, note que esta "
-"característica pode causar que algúns servidores que non aturen o paralelismo "
-"envíen mensaxes corruptas.  Así que antes de empregar esta característica con "
-"correos importantes próbea primeiro consigo mesmo enviándose mensaxes de proba "
-"que logo descargará á vez dende o servidor POP."
+"Xa que algúns servidores non anuncian axeitadamente as súas capacidades "
+"aínda ten a posibilidade de activar o paralelismo. Pero por favor, note que "
+"esta característica pode causar que algúns servidores que non aturen o "
+"paralelismo envíen mensaxes corruptas.  Así que antes de empregar esta "
+"característica con correos importantes próbea primeiro consigo mesmo "
+"enviándose mensaxes de proba que logo descargará á vez dende o servidor POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "O servidor non semella aturar números únicos de mensaxe, pero isto é "
 "imprescindábel para deixar as mensaxes no servidor; polo tanto, esta opción "
@@ -623,12 +633,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"O servidor non semella aturar a descarga das cabeceiras das mensaxes, pero isto "
-"é un requisiño para filtrar as mensaxes no servidor; polo tanto, esta opción "
-"tivo que deshabilitarse.\n"
+"O servidor non semella aturar a descarga das cabeceiras das mensaxes, pero "
+"isto é un requisiño para filtrar as mensaxes no servidor; polo tanto, esta "
+"opción tivo que deshabilitarse.\n"
 "Xa que algúns servidores non anuncian axeitadamente as súas características, "
 "aínda ten a posibilidade de activar a filtraxe de mensaxes no servidor."
 
@@ -710,11 +720,11 @@ msgstr "Conta IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Precísase engadir unha conta na sección de rede das opcións para poder recibir "
-"correo."
+"Precísase engadir unha conta na sección de rede das opcións para poder "
+"recibir correo."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -750,13 +760,13 @@ msgstr "Benvido/a a KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt> Semella que iniciou KMail por primeira vez. Pode empregar este asistente "
-"para configurar as súas contas de correo. Só introduza os datos da conexión que "
-"obtivo do seu fornecedor de correo-e nas vindeiras páxinas.</qt>"
+"<qt> Semella que iniciou KMail por primeira vez. Pode empregar este "
+"asistente para configurar as súas contas de correo. Só introduza os datos da "
+"conexión que obtivo do seu fornecedor de correo-e nas vindeiras páxinas.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -818,8 +828,7 @@ msgstr "Empregar reparto local"
 msgid "Server Information"
 msgstr "Información do Servidor"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ningún"
@@ -939,8 +948,8 @@ msgstr ""
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>O cartafol para mensaxes clasificadas sen seguridade (probábelmente correo "
-"lixo) é <i>"
+"<p>O cartafol para mensaxes clasificadas sen seguridade (probábelmente "
+"correo lixo) é <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -960,28 +969,28 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Aquí pode obter algunha axuda para estabelecer as regrlas de filtraxe de "
-"KMail para empregar algunhas das ferramentas máis coñecidas contra os virus.</p> "
-"<p>O asistente pode detectar estas ferramentas no seu ordenador así como crear "
-"reglas de filtraxe para clasificar as mensaxes empregando estas ferramentas e "
-"para separar as mensaxes que conteñan virus. O asistente non terá en conta "
-"ningunha regla de filtraxe xa existente: sempre engadirá as novas reglas.</p> "
-"<p><b>Coidado:</b> Xa que KMail está bloqueado durante o escaneado de mensaxes, "
-"pode que atope problemas coa respostabilidade de KMail, xa que estas operacións "
-"contra os virus consumen normalmente algo de tempo; por favor, considere borrar "
-"as reglas de filtraxe se quere voltar ao comportamento anterior."
+"KMail para empregar algunhas das ferramentas máis coñecidas contra os virus."
+"</p> <p>O asistente pode detectar estas ferramentas no seu ordenador así "
+"como crear reglas de filtraxe para clasificar as mensaxes empregando estas "
+"ferramentas e para separar as mensaxes que conteñan virus. O asistente non "
+"terá en conta ningunha regla de filtraxe xa existente: sempre engadirá as "
+"novas reglas.</p> <p><b>Coidado:</b> Xa que KMail está bloqueado durante o "
+"escaneado de mensaxes, pode que atope problemas coa respostabilidade de "
+"KMail, xa que estas operacións contra os virus consumen normalmente algo de "
+"tempo; por favor, considere borrar as reglas de filtraxe se quere voltar ao "
+"comportamento anterior."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -989,8 +998,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Por favor, escolla as ferramentas a se empregar para a detección de correo "
-"non desexado e vaia á vindeira páxina.</p>"
+"<p>Por favor, escolla as ferramentas a se empregar para a detección de "
+"correo non desexado e vaia á vindeira páxina.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1018,16 +1027,14 @@ msgstr "Mover lixo &probábel a:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"O cartafol por defecto é o cartafol de Entrada, porén pode mudar isto na vista "
-"de cartafoles de embaixo. "
-"<p>Non todas as ferramentas aturan a clasficación sen seguridade total. Se non "
-"escolleu unha ferramenta con esta capacidade, non poderá seleccionar un "
-"cartafol."
+"O cartafol por defecto é o cartafol de Entrada, porén pode mudar isto na "
+"vista de cartafoles de embaixo. <p>Non todas as ferramentas aturan a "
+"clasficación sen seguridade total. Se non escolleu unha ferramenta con esta "
+"capacidade, non poderá seleccionar un cartafol."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1037,13 +1044,13 @@ msgstr "Comprobar as mensaxes empregando as ferramentas de anti-virus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Permitir que as ferramentas anti-virus comproben as súas mensaxes. O asistente "
-"creará os filtros axeitados. As mensaxes márcanse normlamente polas ferramentas "
-"de xeito que os seguintes filtros poden reacionar ante isto e, por exemplo, "
-"mover as mensaxes con virus a un cartafol especial."
+"Permitir que as ferramentas anti-virus comproben as súas mensaxes. O "
+"asistente creará os filtros axeitados. As mensaxes márcanse normlamente "
+"polas ferramentas de xeito que os seguintes filtros poden reacionar ante "
+"isto e, por exemplo, mover as mensaxes con virus a un cartafol especial."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1053,12 +1060,12 @@ msgstr ""
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Un filtro pode detectar as mensaxes clasificadas coma infectadas por virus e "
-"movelas a un cartafol predefinido. O cartafol por defecto é o do lixo, per pode "
-"cambiar isto na vista de cartafoles."
+"movelas a un cartafol predefinido. O cartafol por defecto é o do lixo, per "
+"pode cambiar isto na vista de cartafoles."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1066,11 +1073,11 @@ msgstr "Adicional, marcar as mensaxes detectadas coma con virus coma lidas"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Marcar as mensaxes que fosen clasificadas coma infectadas por virus coma lidas, "
-"así coma movelas ao cartafol seleccionado."
+"Marcar as mensaxes que fosen clasificadas coma infectadas por virus coma "
+"lidas, así coma movelas ao cartafol seleccionado."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1266,8 +1273,8 @@ msgstr "Erro namentres se lía o cartafol %1 no servidor: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1287,8 +1294,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1319,17 +1326,17 @@ msgstr "Borrada"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Ningunha das súas identidades coincide co destinatario desta mensaxe,"
 "<br>por favor, escolla cal dos seguintes enderezos é seu, se o é:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Varias das súas identidades coincide co destinatario desta mensaxe,"
 "<br>por favor, escolla cal dos seguintes enderezos é seu:"
@@ -1361,18 +1368,21 @@ msgstr "Ocorreu un erro mentres se compactaba \"%1\". Compactamento abortado."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Esta opción foi arranxada polo seu administrador.</p> "
-"<p>Se pensa que é un erro, por favor, contacte con el.</p></qt>"
+"<qt> <p>Esta opción foi arranxada polo seu administrador.</p> <p>Se pensa "
+"que é un erro, por favor, contacte con el.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Cargar Perfil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configurar Conta"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Eng&adir..."
@@ -1403,6 +1413,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Bo&rrar Identidade"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Bo&rrar"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Engadir..."
@@ -1411,6 +1426,11 @@ msgstr "Engadir..."
 msgid "Modify..."
 msgstr "Modificar..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Bo&rrar"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Por coma Predeterminada"
@@ -1427,17 +1447,15 @@ msgstr "&Envío"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contas de envío (engada alomenos unha)"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
@@ -1459,8 +1477,7 @@ msgstr "Estabelecer coma predeterminado"
 msgid "Common Options"
 msgstr "Opcións Comúns"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Confirmar &previamente ao envío"
@@ -1511,17 +1528,16 @@ msgstr "Dominio por &defecto:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O dominio por defecto emprégase para completar os enderezos de correo que só "
-"consisten no nome de usuario.</p></qt>"
+"<qt><p>O dominio por defecto emprégase para completar os enderezos de correo "
+"que só consisten no nome de usuario.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1539,9 +1555,9 @@ msgstr "Engadir Transporte"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Predeterminado)"
 
@@ -1624,6 +1640,10 @@ msgstr "Modificar Conta"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Impsíbel localizar a conta <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Co&res"
@@ -1732,8 +1752,7 @@ msgstr "Ligazón visitada"
 msgid "Misspelled Words"
 msgstr "Palabras incorrectas"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nova mensaxe"
@@ -1924,8 +1943,8 @@ msgstr "Fíos de discusión pechados por defecto"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Abrir fíos que conteñan &mensaxes novas, non lidas ou importantes e abrilos "
 "fíos ollados."
@@ -1936,70 +1955,55 @@ msgstr "Visualización de Datas"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Estas expresións poderían empregarse para a data:</strong> </p>"
-"<ul>"
-"<li>d - o día en número sen cero inicial(1-31)</li>"
-"<li>dd - o día en número con cero inicial (01-31)</li>"
-"<li>ddd - a abreviatura do nome do día (lun - dom)</li> "
-"<li> dddd - o nome completo do día (Luns-Domingo)</li>"
-"<li>M - o mes en número sen cero incial (1-12)</li>"
-"<li>MM - o mes en número con cero inicial (01-12)</li>"
-"<li>MMM - o nome abreviado do mes (Xan - Dec)</li>"
-"<li>MMMM - o nome completo do mes (Xaneiro - Decembro)</li>"
-"<li>yy - o ano en números de dous díxitos (00-99)</li>"
-"<li> yyyy - o ano en números de catro díxitos (0000-9999)</li></ul>"
-"<p><strong>Estas expresións poden empregarse para a hora:</string></p> "
-"<ul>"
-"<li>h - a hora sen cero inicial (0-23 ou 1-12 con formato AM/PM)</li>"
-"<li>hh - a hora con cero inicial (00-23 ou 01-12 con formato AM/PM)</li>"
-"<li>m - os minutos sen cero inicial (0-59)</li>"
-"<li>mm - os minutos con cero inicial (00-59)</li>"
-"<li>s - os segundos sen cero inicial (0-59)</li>"
-"<li>ss - os segundos con cero inicial (00-59)</li>"
-"<li>z - as milésimas sen cero inicial (0-999)</li>"
-"<li>zzz-as milésimas con ceros iniciais (000-999)</li>"
-"<li>AP - cambia a formato AM/PM (AP cambiarase por \"AM\" ou \"PM\".</li>"
-"<li>ap - cambia a formato AM/PM (ap cambiarase por \"am\" ou \"ap\"). </li>"
-"<li>Z - o tempo da zona en forma numérica (-0500)</li></ul>"
-"<p><strong>Tódolos demais caracterese ignoraranse.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Estas expresións poderían empregarse para a data:</strong> </"
+"p><ul><li>d - o día en número sen cero inicial(1-31)</li><li>dd - o día en "
+"número con cero inicial (01-31)</li><li>ddd - a abreviatura do nome do día "
+"(lun - dom)</li> <li> dddd - o nome completo do día (Luns-Domingo)</li><li>M "
+"- o mes en número sen cero incial (1-12)</li><li>MM - o mes en número con "
+"cero inicial (01-12)</li><li>MMM - o nome abreviado do mes (Xan - Dec)</"
+"li><li>MMMM - o nome completo do mes (Xaneiro - Decembro)</li><li>yy - o ano "
+"en números de dous díxitos (00-99)</li><li> yyyy - o ano en números de catro "
+"díxitos (0000-9999)</li></ul><p><strong>Estas expresións poden empregarse "
+"para a hora:</string></p> <ul><li>h - a hora sen cero inicial (0-23 ou 1-12 "
+"con formato AM/PM)</li><li>hh - a hora con cero inicial (00-23 ou 01-12 con "
+"formato AM/PM)</li><li>m - os minutos sen cero inicial (0-59)</li><li>mm - "
+"os minutos con cero inicial (00-59)</li><li>s - os segundos sen cero inicial "
+"(0-59)</li><li>ss - os segundos con cero inicial (00-59)</li><li>z - as "
+"milésimas sen cero inicial (0-999)</li><li>zzz-as milésimas con ceros "
+"iniciais (000-999)</li><li>AP - cambia a formato AM/PM (AP cambiarase por "
+"\"AM\" ou \"PM\".</li><li>ap - cambia a formato AM/PM (ap cambiarase por \"am"
+"\" ou \"ap\"). </li><li>Z - o tempo da zona en forma numérica (-0500)</li></"
+"ul><p><strong>Tódolos demais caracterese ignoraranse.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"O feito de cambiar a configuración global dos fíos de discusión sobrescribirá "
-"tódolos valores específicos de cada cartafol."
+"O feito de cambiar a configuración global dos fíos de discusión "
+"sobrescribirá tódolos valores específicos de cada cartafol."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2013,8 +2017,7 @@ msgstr "Amosar &barra de estado HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Amosar se é correo &lixo ou non en cabeceiras decorativas"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Remprazar sorrisos por emoticonas"
@@ -2023,8 +2026,7 @@ msgstr "Remprazar sorrisos por emoticonas"
 msgid "Use smaller font for quoted text"
 msgstr "Empregar fonte máis pequena para o texto citado"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Amosar marcas para desplegar/contraer citas de texto"
@@ -2050,8 +2052,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "S&obrescribir codificación de caracteres:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Habilitar icona na bandexa do sistema"
@@ -2153,23 +2154,19 @@ msgstr "<b>%f</b> substituirase co nome do ficheiro a editar.íbel"
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>As seguintes variabeis son aturadas nas frases das réplicas: "
-"<br><b>%D</b>:data, <b>%S</b>: asunto, "
-"<br><b>%e</b>:enderezo do remitente, <b>%F</b>:nome do remitente, <b>%f</b>"
-":iniciais do remitente"
-"<br><b>%T</b>:nome do destinatario, <b>%t</b>:nome e enderezo do destinatario"
-"<br><b>%C</b>:nomes de copia carbón, <b>%c</b>:nomes e enderezos de copias "
-"carbón"
-"<br><b>%%</b>:signo de porcentaxe, <b>%_</b>:espacio, <b>%L</b>"
-":salto de liña</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>As seguintes variabeis son aturadas nas frases das réplicas: <br><b>%D</"
+"b>:data, <b>%S</b>: asunto, <br><b>%e</b>:enderezo do remitente, <b>%F</b>:"
+"nome do remitente, <b>%f</b>:iniciais do remitente<br><b>%T</b>:nome do "
+"destinatario, <b>%t</b>:nome e enderezo do destinatario<br><b>%C</b>:nomes "
+"de copia carbón, <b>%c</b>:nomes e enderezos de copias carbón<br><b>%%</b>:"
+"signo de porcentaxe, <b>%_</b>:espacio, <b>%L</b>:salto de liña</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2192,21 +2189,20 @@ msgstr "Respostar a &todos:"
 msgid "&Forward:"
 msgstr "&Reenviar:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Indicador de cita:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "O %D, vostede escribiu:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "O %D, %F escribiu:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Mensaxe Reenviada"
 
@@ -2244,8 +2240,8 @@ msgstr "Estabeleza un novo prefixo de reenvío:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Esta lista compróbase para cada mensaxe saínte, dende arriba cara abaixo, na "
 "procura dunha codificación que conteña tódolos caracteres requeridos."
@@ -2257,7 +2253,8 @@ msgstr "Estabelecer codificación:"
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"&Manter a codificación orixinal cando se resposte ou se reenvíe (se é posíbel)"
+"&Manter a codificación orixinal cando se resposte ou se reenvíe (se é "
+"posíbel)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2283,10 +2280,9 @@ msgstr "Valor"
 msgid "Ne&w"
 msgstr "No&vo"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nome:"
@@ -2295,16 +2291,15 @@ msgstr "&Nome:"
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomeamento de anexoss compatíbel con Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Acenda esta opción para facer que Outlook(tm) comprenda nomes de anexoss que "
 "conteñan caracteres non inglesesíbel"
@@ -2316,8 +2311,8 @@ msgstr "&Activar a detección de ficheiros anexoss perdidos"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Rexoñecer calquera das seguintes palabras chave coma intencións de anexionar un "
-"ficheiro:"
+"Rexoñecer calquera das seguintes palabras chave coma intencións de anexionar "
+"un ficheiro:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2335,21 +2330,21 @@ msgstr "adxuntado"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Escolleu a codificación dos nomes dos anexoss que conteñen caracteres non "
-"ingleses dun xeito entendido por Outlook(tm) e outros clientes de correo-e que "
-"non aturan codificacións estándar dos nomes dos anexos.\n"
+"ingleses dun xeito entendido por Outlook(tm) e outros clientes de correo-e "
+"que non aturan codificacións estándar dos nomes dos anexos.\n"
 "Note que KMail podería crear mensaxes que non cumplen co estándar e, "
 "consecuentemente é posíbel que as súas mensaxes non sexan entendidas por "
-"clientes de correo-e baseados no estándar; de xeito que, a menos que non teña "
-"outra opción, non debería habilitar esta característica."
+"clientes de correo-e baseados no estándar; de xeito que, a menos que non "
+"teña outra opción, non debería habilitar esta característica."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2373,111 +2368,96 @@ msgstr "Ferrament&as de Cifraxe"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>As mensaxes ás veces poden chegar en dous formatos. Esta opción controla se "
-"vostede quere visualizar a parte HTML ou o texto en plano.</p>"
-"<p>Mostra-la parte HTML mellora a apariencia da mensaxe, pero ó mesmo tempo "
-"incrementa o risco de ataques por erros.</p>"
-"<p>Amosar o texto en plano perde en calidade, porén convirte en <em>"
-"imposíbel</em> a tarefa de explotar erros de seguridade do motor HTML "
-"(Konqueror).</p>"
-"<p>A opción de embaixo protéxeo dos ataques máis frecuentes por HTML, pero non "
-"o protexe contra outros fallos aínda non descubertos.</p>"
-"<p>É polo tanto recomendábel <em>non</em> preferir HTML a texto plano.</p>"
-"<p><b>Nota:</b>pódese estabelecer esta opción en cada unn dos cartafoles dende "
-"o menú <i>Cartafol</i> da fiestra de KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>As mensaxes ás veces poden chegar en dous formatos. Esta opción "
+"controla se vostede quere visualizar a parte HTML ou o texto en plano.</"
+"p><p>Mostra-la parte HTML mellora a apariencia da mensaxe, pero ó mesmo "
+"tempo incrementa o risco de ataques por erros.</p><p>Amosar o texto en plano "
+"perde en calidade, porén convirte en <em>imposíbel</em> a tarefa de explotar "
+"erros de seguridade do motor HTML (Konqueror).</p><p>A opción de embaixo "
+"protéxeo dos ataques máis frecuentes por HTML, pero non o protexe contra "
+"outros fallos aínda non descubertos.</p><p>É polo tanto recomendábel "
+"<em>non</em> preferir HTML a texto plano.</p><p><b>Nota:</b>pódese "
+"estabelecer esta opción en cada unn dos cartafoles dende o menú <i>Cartafol</"
+"i> da fiestra de KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Algunha publicidade está en HTML e contén referencias a, por exemplo, imaxes "
-"que os anunciantes empregan para saber se vostede leu a mensaxe  (&quot;buracos "
-"web&quot;).</p>"
-"<p> Non hai unha razón válida para cargar imaxes dende Internet, xa que o "
-"remitente pode sempre adxuntalas á propia mensaxe.</p>"
-"<p> Para previr estes riscos, KMail <em>deshabilita</em> "
-"esta opción por defecto.</p>"
-"<p>Porén, se se queren ver imaxes en mensaxes HTML que non están adxuntadas ós "
-"mesmos pódese activar esta opción, pero débese ser consciente dos posibeis "
-"problemas.</p></qt>."
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Algunha publicidade está en HTML e contén referencias a, por exemplo, "
+"imaxes que os anunciantes empregan para saber se vostede leu a mensaxe  "
+"(&quot;buracos web&quot;).</p><p> Non hai unha razón válida para cargar "
+"imaxes dende Internet, xa que o remitente pode sempre adxuntalas á propia "
+"mensaxe.</p><p> Para previr estes riscos, KMail <em>deshabilita</em> esta "
+"opción por defecto.</p><p>Porén, se se queren ver imaxes en mensaxes HTML "
+"que non están adxuntadas ós mesmos pódese activar esta opción, pero débese "
+"ser consciente dos posibeis problemas.</p></qt>."
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Política de Notificación da Disposición das Mensaxes</h3>"
-"<p>As MDN son unha xeralización do que comunmente se chama <b>"
-"ler/coñecer a recepción</b>. O autor da mensaxe pide unha notificación da "
-"disposición da mensaxe, xerada e enviada polo programa de correo do receptor, "
-"mediante a cal se pode coñecer o acontecido á mensaxe. Os tipos de disposicións "
-"máis comúns son <b>amosada</b> (e.g. lida), <b>borrada</b> e <b>operada</b> "
-"(e.g. reenviada).</p>"
-"<p> As seguintes opcións están dispoñibeis para controlar o envío de MDNs por "
-"parte de KMail:</p>"
-"<ul>"
-"<li><em>Ignorar:</em> Ignora calquera petición de notificación. Non se enviará "
-"ningún MDN automaticamente (recomendado).</li>"
-"<li><em> Preguntar</em>: Envía as notificacións baixo permiso de vostede. Deste "
-"modo vostede pode enviar MDNs para mensaxes en particular.</li>"
-"<li><em>Prohibir</em>: Sempre envía unha notificación <b>denegada</b>"
-". Isto é só <em>lixeiramente</em> mellor que enviar sempre as MDNs. O autor "
-"seaberá aínda que se actuou fronte á mensaxe, pero non saberá se se leu, borrou "
-"...</li>"
-"<li><em>Enviar sempre</em>: Envía sempre a notificación de disposición da "
-"mensaxe. Isto quere dicir que o autor da mensaxe saberá que se actuo fronte á "
-"mensaxe e o tipo de actuación por parte do destinatario (amosado, borrado, "
-"etc.). Esta opción está moi desacreditada, pero xa que pode resultar de "
-"interese p.e. para relacións comerciais, fíxose dispoñíbel.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Política de Notificación da Disposición das Mensaxes</h3><p>As MDN "
+"son unha xeralización do que comunmente se chama <b>ler/coñecer a recepción</"
+"b>. O autor da mensaxe pide unha notificación da disposición da mensaxe, "
+"xerada e enviada polo programa de correo do receptor, mediante a cal se pode "
+"coñecer o acontecido á mensaxe. Os tipos de disposicións máis comúns son "
+"<b>amosada</b> (e.g. lida), <b>borrada</b> e <b>operada</b> (e.g. reenviada)."
+"</p><p> As seguintes opcións están dispoñibeis para controlar o envío de "
+"MDNs por parte de KMail:</p><ul><li><em>Ignorar:</em> Ignora calquera "
+"petición de notificación. Non se enviará ningún MDN automaticamente "
+"(recomendado).</li><li><em> Preguntar</em>: Envía as notificacións baixo "
+"permiso de vostede. Deste modo vostede pode enviar MDNs para mensaxes en "
+"particular.</li><li><em>Prohibir</em>: Sempre envía unha notificación "
+"<b>denegada</b>. Isto é só <em>lixeiramente</em> mellor que enviar sempre as "
+"MDNs. O autor seaberá aínda que se actuou fronte á mensaxe, pero non saberá "
+"se se leu, borrou ...</li><li><em>Enviar sempre</em>: Envía sempre a "
+"notificación de disposición da mensaxe. Isto quere dicir que o autor da "
+"mensaxe saberá que se actuo fronte á mensaxe e o tipo de actuación por parte "
+"do destinatario (amosado, borrado, etc.). Esta opción está moi "
+"desacreditada, pero xa que pode resultar de interese p.e. para relacións "
+"comerciais, fíxose dispoñíbel.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2493,15 +2473,15 @@ msgstr "Permitir que as mensaxes carguen contidos e&xternos dende Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<qt><b>COIDADO:</b>Permitir o HTML nos correos podería incrementa-lo risco de "
-"que o seu sistema se vise comprometido por erros de seguridade actuais ou "
-"futuros. <a href=\"whatsthis:%1\">More about HTML mails...</a> "
-"<a href=\"whatsthis:%2\">More about external references...</a>"
+"<qt><b>COIDADO:</b>Permitir o HTML nos correos podería incrementa-lo risco "
+"de que o seu sistema se vise comprometido por erros de seguridade actuais ou "
+"futuros. <a href=\"whatsthis:%1\">More about HTML mails...</a> <a href="
+"\"whatsthis:%2\">More about external references...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2584,8 +2564,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Esta opción require dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "sen proxy"
@@ -2614,8 +2593,8 @@ msgstr "E&xcluir mensaxes importantes da caducidade"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Cando se tente procurar as mensaxes non lidas:"
 
@@ -2639,8 +2618,8 @@ msgstr "Circular por Tódolos Cartafoles"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Cando se entre nun cartafol:"
 
@@ -2710,28 +2689,24 @@ msgstr "Cartafoles (formato \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Isto determina cál será o formato das caixas de correo por defecto nos "
-"cartafoles locais:</p>"
-"<p><b>mbox:</b>Os cartafoles de KMail represéntanse por un só ficheiro. Cada "
-"mensaxe distínguese das demáis por unha liña que comeza por \"From:\". Isto "
-"aforra espacio no disco, pero podería resultar menos robusto, p.e. cando se "
-"moven mensaxes entre cartafoles.</p>"
-"<p><b>maildir:</b> os cartafoles de KMail represéntanse por cartafoles reais no "
-"disco. Cada mensaxe é un ficheiro por separado. Podería gastar máis espacio no "
-"disco pero resulta máis útil, p.e. cando se moven mensaxes entre cartafoles.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Isto determina cál será o formato das caixas de correo por defecto "
+"nos cartafoles locais:</p><p><b>mbox:</b>Os cartafoles de KMail "
+"represéntanse por un só ficheiro. Cada mensaxe distínguese das demáis por "
+"unha liña que comeza por \"From:\". Isto aforra espacio no disco, pero "
+"podería resultar menos robusto, p.e. cando se moven mensaxes entre "
+"cartafoles.</p><p><b>maildir:</b> os cartafoles de KMail represéntanse por "
+"cartafoles reais no disco. Cada mensaxe é un ficheiro por separado. Podería "
+"gastar máis espacio no disco pero resulta máis útil, p.e. cando se moven "
+"mensaxes entre cartafoles.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2766,30 +2741,24 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Cando se salta á seguinte mensaxe non lida, podería ocorrer que non houbese "
-"máis mensaxes non lidas embaixo da actual.</p>"
-"<p><b>Non circular:</b> A procura parará na derradeira mensaxe no cartafol "
-"actual.</p> "
-"<p><b>Circular no cartafol actual:</b> A procura continuará no inicio da lista "
-"de mensaxes, pero non se sairá do cartafol actual.</p> "
-"<p><b>Circular por tódolos cartafoles:</b> A procura continuará no inicio da "
-"lista de mensaxes. Se non hai máis mensaxes sen ler, irase ó vindeiro "
-"cartafol.</p> "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p> Cando se salta á seguinte mensaxe non lida, podería ocorrer que non "
+"houbese máis mensaxes non lidas embaixo da actual.</p><p><b>Non circular:</"
+"b> A procura parará na derradeira mensaxe no cartafol actual.</p> "
+"<p><b>Circular no cartafol actual:</b> A procura continuará no inicio da "
+"lista de mensaxes, pero non se sairá do cartafol actual.</p> <p><b>Circular "
+"por tódolos cartafoles:</b> A procura continuará no inicio da lista de "
+"mensaxes. Se non hai máis mensaxes sen ler, irase ó vindeiro cartafol.</p> "
 "<p>Do mesmo xeito, cando se procura pola mensaxe previa sen ler, a procura "
 "comezará dende o baixo da lista de mensaxes e continuará ao cartafol previo "
 "dependendo da opción escollida.</p></qt>"
@@ -2797,23 +2766,19 @@ msgstr ""
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A indexación completa de texto permite procuras rápidas no contido das súas "
-"mensaxes. Cando se habilita, o diálogo de procura funcionará moi rápido. Tamén "
-"a barra de ferramentas de procura seleccionará as mensaxes axiña baseándose no "
-"contido.</p>"
-"<p>Leva unha certa cantidade de espacio en disco (sobre a metade do espacio en "
-"disco que xa ocupan as mensaxes).</p>"
-"<p>Despois de habilitar isto, o índice precisará ser construído, pero pode "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>A indexación completa de texto permite procuras rápidas no contido "
+"das súas mensaxes. Cando se habilita, o diálogo de procura funcionará moi "
+"rápido. Tamén a barra de ferramentas de procura seleccionará as mensaxes "
+"axiña baseándose no contido.</p><p>Leva unha certa cantidade de espacio en "
+"disco (sobre a metade do espacio en disco que xa ocupan as mensaxes).</"
+"p><p>Despois de habilitar isto, o índice precisará ser construído, pero pode "
 "continuar a usar KMail mentres se executa esta operación.</p></qt>"
 
 #: configuredialog.cpp:4811
@@ -2882,8 +2847,8 @@ msgstr "&Agochar cartafoles groupware"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Cando se activa isto, non verá os cartafoles de recursos IMAP na árbore de "
 "cartafoles."
@@ -2896,8 +2861,8 @@ msgstr "Os cartafoles de recursos están na conta:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Cando se activa isto, non verá os cartafoles de recursos IMAP na árbore de "
 "cartafoles."
@@ -2957,19 +2922,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Nomeamento de anexoss compatíbel con Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Envio automático de invitacións"
@@ -2979,29 +2943,28 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Cando se active isto, o usuario non verá a fiestra de edición dos correos. Os "
-"correos de invitación enviaranse automaticamente."
+"Cando se active isto, o usuario non verá a fiestra de edición dos correos. "
+"Os correos de invitación enviaranse automaticamente."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>As invitacións envíanse normalmente coma anexos ao correo-e. Isto troca o "
-"proceso a enviar as mensaxes de invitación no texto do correo-e, no seu canto; "
-"isto é preciso para enviar invitacións e respostas a Microsof Outlook. "
-"<br>Pero, cando fai isto, non terá un texto descritivo que poidan ler os "
-"programas de correo-e; de xeito que, para as persoas que teñan programas de "
-"correo-e que non entendan as invitacións, o resultado das mensaxes semellará un "
-"desastre. "
-"<br>A xente que teña programas de correo-e que non entendan as invitacións "
-"serán quen de traballar con isto.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>As invitacións envíanse normalmente coma anexos ao correo-e. Isto troca "
+"o proceso a enviar as mensaxes de invitación no texto do correo-e, no seu "
+"canto; isto é preciso para enviar invitacións e respostas a Microsof "
+"Outlook. <br>Pero, cando fai isto, non terá un texto descritivo que poidan "
+"ler os programas de correo-e; de xeito que, para as persoas que teñan "
+"programas de correo-e que non entendan as invitacións, o resultado das "
+"mensaxes semellará un desastre. <br>A xente que teña programas de correo-e "
+"que non entendan as invitacións serán quen de traballar con isto.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3105,17 +3068,16 @@ msgstr "Reenviar"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3133,15 +3095,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3206,8 +3168,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>A lista de distribución co nome fornecido <b>%1</b> "
-"xa existe. Por favor, escolla un nome diferente.</qt>"
+"<qt>A lista de distribución co nome fornecido <b>%1</b> xa existe. Por "
+"favor, escolla un nome diferente.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3216,8 +3178,8 @@ msgstr "Editar Identidade"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3320,8 +3282,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Non se pode caducar as mensaxes do cartafol %1: o cartafol de destino %2 non se "
-"atopou"
+"Non se pode caducar as mensaxes do cartafol %1: o cartafol de destino %2 non "
+"se atopou"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3395,8 +3357,8 @@ msgstr "Borrar permanentemente"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Nota: A acción de caducidade aplicarase inmediatamente despois de confirmar as "
-"opcións."
+"Nota: A acción de caducidade aplicarase inmediatamente despois de confirmar "
+"as opcións."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3479,6 +3441,11 @@ msgstr "Seleccionar Cartafol..."
 msgid "Filters"
 msgstr "Filtro %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Seleccionar Todo o Texto"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3510,8 +3477,8 @@ msgstr "&Rexistrar actividade de filtraxe"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Pode activar aquí o rexistro das actividades de filtraxe. De feito, os datos "
 "rexistrados colecciónanse e amósanse só cando se activa o rexistro. "
@@ -3530,15 +3497,16 @@ msgstr "Evaluación do rexistro da &regla de filtraxe"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Pode controlar no rexistro o rendemento concernente á aplicación das reglas de "
-"filtraxe: se activa esta opción terá un informe detallado de cada regla de "
-"filtraxe; doutro xeito só terá información do resultado da evaluación completa "
-"de todas as reglas de cada filtro,"
+"Pode controlar no rexistro o rendemento concernente á aplicación das reglas "
+"de filtraxe: se activa esta opción terá un informe detallado de cada regla "
+"de filtraxe; doutro xeito só terá información do resultado da evaluación "
+"completa de todas as reglas de cada filtro,"
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3558,15 +3526,16 @@ msgstr "sen límite"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"A colección de datos de rexistro emprega memoria para almacear temporalmente os "
-"datos rexistrados; aquí pode limitar a cantidade máxima de memoria a empregar: "
-"se o tamaño dos datos rexistrados excede este límite entón os datos máis "
-"antigos descartaranse ata que o límite non sexa outra vez separado. "
+"A colección de datos de rexistro emprega memoria para almacear temporalmente "
+"os datos rexistrados; aquí pode limitar a cantidade máxima de memoria a "
+"empregar: se o tamaño dos datos rexistrados excede este límite entón os "
+"datos máis antigos descartaranse ata que o límite non sexa outra vez "
+"separado. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3576,7 +3545,7 @@ msgstr ""
 "Non se puido escribir no ficheiro %1:\n"
 "\"%2\" é a descrición detallada do erro."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Erro de KMail"
@@ -3617,13 +3586,13 @@ msgstr "&Identificador de usuario:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"O Identificador de Usuario é o login do usuario no servidor IMAP. Isto pode ser "
-"un nome de usuario sinxelo ou o enderezo de correo-e enteiro do usuario; a "
-"identificación para a súa conta no servidor diralle cál é."
+"O Identificador de Usuario é o login do usuario no servidor IMAP. Isto pode "
+"ser un nome de usuario sinxelo ou o enderezo de correo-e enteiro do usuario; "
+"a identificación para a súa conta no servidor diralle cál é."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3674,8 +3643,8 @@ msgstr "Non posúe permisos de escritura/lectura no seu cartafol do lixo."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Información non obtida do servidor aínda, por favor empregue \"Comprobar "
 "Correo-e\"."
@@ -3688,8 +3657,7 @@ msgstr "Erro: non se definiu unha conta IMAP para este cartafol"
 msgid "Connecting to server %1, please wait..."
 msgstr "Conectando co servidor %1, por favor, agarde..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Erro conectando co servidor %1"
@@ -3718,8 +3686,8 @@ msgstr "Engadir Permisos"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Quere realmente borrar os seus propios permisos para este cartafol? Non será "
 "quén de acceder despois disto."
@@ -3753,7 +3721,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol..."
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
@@ -3777,9 +3745,9 @@ msgstr "Escolla Atallo para o Cartafol"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt> para escoller unha tecla ou combinación de teclas que seleccionen o "
 "cartafol actual, prema no botón de embaixo e logo prema a(s) tecla(s) que "
@@ -3804,13 +3772,22 @@ msgstr "C&ancelar"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>O cartafol que borrou estaba asociada coa conta <b>%1</b> "
-"que deixaba mensaxes nel. O cartafol no que se deixan agora as mensaxes desta "
-"conta é o cartafol de entrada principal.</qt>"
+"<qt>O cartafol que borrou estaba asociada coa conta <b>%1</b> que deixaba "
+"mensaxes nel. O cartafol no que se deixan agora as mensaxes desta conta é o "
+"cartafol de entrada principal.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3832,7 +3809,8 @@ msgid ""
 "Resets the quick search so that all messages are shown again."
 msgstr ""
 "Restabelecer Procura Rápida\n"
-"Restabelece a procura rápida de xeito que se amosan todas as mensaxes de novo."
+"Restabelece a procura rápida de xeito que se amosan todas as mensaxes de "
+"novo."
 
 #: headerlistquicksearch.cpp:69
 msgid "Stat&us:"
@@ -3936,70 +3914,17 @@ msgstr "Estado do Correo Lixo:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>x"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>M<br>e<br>n<br>s<br>a<br>x<br>e<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>x"
-"<br>e"
-"<br> "
-"<br>n"
-"<br>o"
-"<br>n"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>M<br>e<br>n<br>s<br>a<br>x<br>e<br> <br>n<br>o<br>n<br> "
+"<br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4011,19 +3936,14 @@ msgstr "O seu &nome:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>O seu nome</h3> "
-"<p> Este campo debería ter o seu nome tal e como quere amosarse na cabeceira de "
-"calquera correo-e que se envíe.</p> "
-"<p>Se o deixa en branco, o seu nome real non aparecerá, senón só o seu enderezo "
-"de correo-e.</p></qt>"
+"<qt> <h3>O seu nome</h3> <p> Este campo debería ter o seu nome tal e como "
+"quere amosarse na cabeceira de calquera correo-e que se envíe.</p> <p>Se o "
+"deixa en branco, o seu nome real non aparecerá, senón só o seu enderezo de "
+"correo-e.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4031,17 +3951,14 @@ msgstr "Organi&zación:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organización</h3> "
-"<p>Este compo debería ter o nome da súa organización se quere que se "
-"especifique na cabeceira de calquera correo enviado por vostede.</p> "
-"<p>É seguro (e normal) deixar isto en branco.</p></qt>"
+"<qt> <h3>Organización</h3> <p>Este compo debería ter o nome da súa "
+"organización se quere que se especifique na cabeceira de calquera correo "
+"enviado por vostede.</p> <p>É seguro (e normal) deixar isto en branco.</p></"
+"qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4050,20 +3967,15 @@ msgstr "&Enderezo de correo:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Enderezo de Correo</h3> "
-"<p>Este campo debería ter o seu enderezo de correo-e completo.</p> "
-"<p>Se o deixa en vranco, ou o especifica mal, a xente terá problemas para "
-"responderlle.</p></qt>"
+"<qt> <h3>Enderezo de Correo</h3> <p>Este campo debería ter o seu enderezo de "
+"correo-e completo.</p> <p>Se o deixa en vranco, ou o especifica mal, a xente "
+"terá problemas para responderlle.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4072,21 +3984,12 @@ msgstr "&Enderezo de correo:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4106,26 +4009,23 @@ msgstr "A súa chave de sinatura OpenPGP"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Escolla a chave OpenPGP que debería empregarse para asinar dixitalmente as súas "
-"mensaxes."
+"Escolla a chave OpenPGP que debería empregarse para asinar dixitalmente as "
+"súas mensaxes."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt> "
-"<p>A chave OpenPGP que escolla aquí empregarase para asinar dixitalmente as "
-"mensaxes. Pode tamén empregar chaves GnuPG.</p> "
-"<p>Pode deixar isto en branco, pero KMail non será quén de asinar dixitalmente "
-"os correos-e empregando OpenPGP; as funcións de correo-e normais non se verán "
-"afectadas.</p> "
-"<p>Pode atopar máis información sobre as chaves en <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt> <p>A chave OpenPGP que escolla aquí empregarase para asinar "
+"dixitalmente as mensaxes. Pode tamén empregar chaves GnuPG.</p> <p>Pode "
+"deixar isto en branco, pero KMail non será quén de asinar dixitalmente os "
+"correos-e empregando OpenPGP; as funcións de correo-e normais non se verán "
+"afectadas.</p> <p>Pode atopar máis información sobre as chaves en <a>http://"
+"www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4137,31 +4037,28 @@ msgstr "A súa chave de cifraxe OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Escolla a chave OpenPGP que deberá empregarse cando se cifre a si mesmo e para "
-"a característica \"Anexionar a Miña Chave Pública\" no editor."
+"Escolla a chave OpenPGP que deberá empregarse cando se cifre a si mesmo e "
+"para a característica \"Anexionar a Miña Chave Pública\" no editor."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>A chave de cifrado OpenPGP que escolla aquí empregarase para sinar e cifrar "
-"as mensaxes para vostede mesmo ou para a acción \"Anexionar a Miña Chave "
-"Pública\" no editor. Pode tamén empregar chaves GnuPG.</p>"
-"<p>Pode deixar isto en branco, pero KMail non será quén de acifrar copias das "
-"mensaxes saíntes para vostede mesmo empregando o OpenPGP; as funcións de correo "
-"usuais non se verán afectadas.</p>"
-"<p>Pode atopar máis acerca das chaves en <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>A chave de cifrado OpenPGP que escolla aquí empregarase para sinar e "
+"cifrar as mensaxes para vostede mesmo ou para a acción \"Anexionar a Miña "
+"Chave Pública\" no editor. Pode tamén empregar chaves GnuPG.</p><p>Pode "
+"deixar isto en branco, pero KMail non será quén de acifrar copias das "
+"mensaxes saíntes para vostede mesmo empregando o OpenPGP; as funcións de "
+"correo usuais non se verán afectadas.</p><p>Pode atopar máis acerca das "
+"chaves en <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4176,22 +4073,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Escolla o certificado S/MIME que debería empregarse para asinar dixitalmente as "
-"súas mensaxes."
+"Escolla o certificado S/MIME que debería empregarse para asinar dixitalmente "
+"as súas mensaxes."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>O certificado S/MIME (X.509) que escolleu aquí empregarase para asinar "
-"dixitalmente as mensaxes.</p>Pode deixar isto en branco, pero KMail non será "
-"quen de asinar os correos-e usando S/MIME; as funcións de correo usuais non se "
-"verán afectadas.</p></qt>"
+"<qt> <p>O certificado S/MIME (X.509) que escolleu aquí empregarase para "
+"asinar dixitalmente as mensaxes.</p>Pode deixar isto en branco, pero KMail "
+"non será quen de asinar os correos-e usando S/MIME; as funcións de correo "
+"usuais non se verán afectadas.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4203,27 +4098,25 @@ msgstr "O seu Certificado S/MIME de Cifraxe"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Escolla o certificado S/MIME que debería empregarse cando se cifre a si mesmo e "
-"para a característica do editor \"Anexionar o Meu Certificado\"."
+"Escolla o certificado S/MIME que debería empregarse cando se cifre a si "
+"mesmo e para a característica do editor \"Anexionar o Meu Certificado\"."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>O certificado S/MIME que escolleu aquí empregarase para cifrar as mensaxesa "
-"si mesmo e para a función \"Anexionar o meu Certificado\" do editor de "
-"mensaxes.</p>Pode deixar isto en branco, pero KMail non será quen de asinar os "
-"correos-e usando S/MIME; as funcións de correo usuais non se verán "
-"afectadas.</p></qt>"
+"<qt> <p>O certificado S/MIME que escolleu aquí empregarase para cifrar as "
+"mensaxesa si mesmo e para a función \"Anexionar o meu Certificado\" do "
+"editor de mensaxes.</p>Pode deixar isto en branco, pero KMail non será quen "
+"de asinar os correos-e usando S/MIME; as funcións de correo usuais non se "
+"verán afectadas.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4243,24 +4136,20 @@ msgstr "&Respostar a este enderezo:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Respostar Ó Enderezo</h3> "
-"<p>Isto estabelece a cabeceira <tt>Respostar A:<tt> que contén un enderezo de "
-"correo-e diferente do enderezo normal <tt>De:</tt>.</p> <P>"
-"Isto pode ser útil cando ten un grupo de xente traballando conxuntamente coas "
-"mesmas regras. Por exemplo, podería querer que calquera correo-e enviado teña o "
-"seu enderezo no campo <tt>De:</tt>, pero que calquera resposta que se produza "
-"se dirixa ao enderezo dun grupo.</p></p>En caso de dúbida, deixe este campo en "
-"branco.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Respostar Ó Enderezo</h3> <p>Isto estabelece a cabeceira "
+"<tt>Respostar A:<tt> que contén un enderezo de correo-e diferente do "
+"enderezo normal <tt>De:</tt>.</p> <P>Isto pode ser útil cando ten un grupo "
+"de xente traballando conxuntamente coas mesmas regras. Por exemplo, podería "
+"querer que calquera correo-e enviado teña o seu enderezo no campo <tt>De:</"
+"tt>, pero que calquera resposta que se produza se dirixa ao enderezo dun "
+"grupo.</p></p>En caso de dúbida, deixe este campo en branco.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4268,25 +4157,20 @@ msgstr "Enderezo &BBC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Enderezos BCC (Blind Carbon Copy)</h3>"
-"<p>Os enderezos que introdiciu aquí engadiranse a cada correo de saínte que se "
-"envíe con esta identidade. Non serán visibeis para os outros destinatarios.</p>"
-"<p>Isto úsase normalmente para enviar unha copia de cada mensaxe enviada a "
-"outra conta súa.</p>"
-"<p>Para especificar máis dun enderezo, use comas para separar a lista de "
-"destinatarios BCC.</p>"
-"<p>En caso de dúbida, deixe este campo en branco.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Enderezos BCC (Blind Carbon Copy)</h3><p>Os enderezos que introdiciu "
+"aquí engadiranse a cada correo de saínte que se envíe con esta identidade. "
+"Non serán visibeis para os outros destinatarios.</p><p>Isto úsase "
+"normalmente para enviar unha copia de cada mensaxe enviada a outra conta súa."
+"</p><p>Para especificar máis dun enderezo, use comas para separar a lista de "
+"destinatarios BCC.</p><p>En caso de dúbida, deixe este campo en branco.</p></"
+"qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4324,7 +4208,7 @@ msgstr "&Sinatura"
 msgid "&Picture"
 msgstr "&Imaxe"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Enderezo de Correo Inválido"
 
@@ -4342,16 +4226,16 @@ msgid ""
 msgstr ""
 "Unha das chaves de OpenPGP configuradas non conteń ningunha ID de usuario co "
 "enderezo de correo-e configurado para esta identidade (%1).\n"
-"Isto pode resultar en mensaxes de aviso por parte do destinatario cando ela/el "
-"tente verificar as sinaturas feitas con esta configuración."
+"Isto pode resultar en mensaxes de aviso por parte do destinatario cando ela/"
+"el tente verificar as sinaturas feitas con esta configuración."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Unha das chaves de cifraxe OpenPGP configuradas non contén ningún ID de usuario "
-"co enderezo de correo-e configurado para esta identidade (%1)."
+"Unha das chaves de cifraxe OpenPGP configuradas non contén ningún ID de "
+"usuario co enderezo de correo-e configurado para esta identidade (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4362,8 +4246,8 @@ msgid ""
 msgstr ""
 "Un dos certificados S/MIME configurados para asinar non contén o enderezo de "
 "correo-e configurado para esta identidade (%1).\n"
-"Isto podería resultar en mensaxes de aviso no lado do destinatario cando tente "
-"verificar a sinatura feita con esta configuración."
+"Isto podería resultar en mensaxes de aviso no lado do destinatario cando "
+"tente verificar a sinatura feita con esta configuración."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4412,8 +4296,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Predeterminada)"
 
@@ -4457,24 +4341,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail detectou unha entrada de prefixos na configuración da conta \"%1\" que é "
-"obsoleta co soporte de espacios IMAP."
+"KMail detectou unha entrada de prefixos na configuración da conta \"%1\" que "
+"é obsoleta co soporte de espacios IMAP."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "A configuración foi automaticamente migrada pero debería comprobar a "
 "configuración da súa conta."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Non foi posíbel migrar automaticamente a súa configuración, así qye comprobe a "
-"configuración da súa conta."
+"Non foi posíbel migrar automaticamente a súa configuración, así qye comprobe "
+"a configuración da súa conta."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4513,14 +4397,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Erro: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Pechouse ou superouse o tempo de agarda na conexión co servidor %1. "
 "Reestabelecerase automaticamente se é posíbel."
@@ -4672,14 +4561,14 @@ msgstr "Arquivos da lista"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4708,226 +4597,182 @@ msgstr "Chaves de cifraxe inutlizábeis"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de serier "
+"%2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serier %2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME</p><p align=center><b>%1</b> (número de serier %2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>O seu certificado S/MIME de asinamento</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
+"(número de serie %2)</p><p>caduca en menos dun día.</p>\n"
 "<p>O seu certificado S/MIME de asinamento</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"(número de serier %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> (número "
+"de serie %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> (número "
+"de serier %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4941,215 +4786,171 @@ msgstr "O certificado S/MIME caduca cedo"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>A súa chave de asinado OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>A súa chave de cifraxe OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>A súa chave OpenPGP para</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de serier "
+"%2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de serie "
+"%2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado raíz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serier %2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado raíz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de asinamento S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado de cifraxe S/MIME</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME</p><p align=center><b>%1</b> (número de serier %2)</"
+"p><p>caduca en menos dun día.</p>\n"
+"<p>O certificado intermediario CA</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME</p><p align=center><b>%1</b> (número de serie %2)</"
+"p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>O seu certificado S/MIME de asinamento</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
+"(número de serie %2)</p><p>caduca en menos dun día.</p>\n"
 "<p>O seu certificado S/MIME de asinamento</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"(número de serier %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> (número "
+"de serie %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O seu certificado S/MIME de cifraxe</p><p align=center><b>%1</b> (número "
+"de serier %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> "
-"(número de serie %2)</p>"
-"<p>caduca en menos dun día.</p>\n"
-"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> "
-"(número de serier %2)</p>"
-"<p>caduca en menos de %n días.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> (número de "
+"serie %2)</p><p>caduca en menos dun día.</p>\n"
+"<p>O seu certificado S/MIME para</p><p align=center><b>%1</b> (número de "
+"serier %2)</p><p>caduca en menos de %n días.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5161,15 +4962,16 @@ msgstr "O certificado S/MIME caduca cedo"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Unha ou máis das súas chaves de cifraxe OpenPGP ou dos seus certificados S/MIME "
-"configurados están inutilizabeis para a cifraxe. Por favor, reconfigure as súas "
-"chaves e certificados de cifraxe para esta identidade no diálogo de "
+"Unha ou máis das súas chaves de cifraxe OpenPGP ou dos seus certificados S/"
+"MIME configurados están inutilizabeis para a cifraxe. Por favor, reconfigure "
+"as súas chaves e certificados de cifraxe para esta identidade no diálogo de "
 "configuración de identidades.\n"
 "Se escolle continuar, e as chaves se precisan máis adiante, preguntaráselle "
 "polas chaves a empregar."
@@ -5186,8 +4988,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Unha ou máis das súas chaves de asinado OpenPGP ou dos seus certificados S/MIME "
-"de asinado configurados están inutilizabeis para a cifraxe. Por favor, "
+"Unha ou máis das súas chaves de asinado OpenPGP ou dos seus certificados S/"
+"MIME de asinado configurados están inutilizabeis para a cifraxe. Por favor, "
 "reconfigure as súas chaves e certificados de cifraxe para esta identidade no "
 "diálogo de configuración de identidades.\n"
 "Se escolle continuar, e as chaves se precisan máis adiante, preguntaráselle "
@@ -5201,10 +5003,10 @@ msgstr "Chaves de asinado inutilizábeis"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "O exame das preferencias de cifraxe do destinatario concluiu que a mensaxes "
 "debería ser cifrada empregando OpenPGP, alomenos para algúns destinatarios;\n"
@@ -5217,10 +5019,10 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "O exame das preferencias de cifraxe do destinatario concluiu que a mensaxes "
 "debería ser cifrada empregando S/MIME, alomenos para algúns destinatarios;\n"
@@ -5231,8 +5033,8 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5247,15 +5049,15 @@ msgstr "Non Asinar con OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "O exame das preferencias de asinado dos destinatarios revelou que a mensaxe "
 "debería asinarse empregando S/MIME, alomenos para algúns dos destinatarios;\n"
-"nembragantes, non ten configurado certificados S/MIME válidos para asinar nesta "
-"identidade."
+"nembragantes, non ten configurado certificados S/MIME válidos para asinar "
+"nesta identidade."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5267,8 +5069,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Un exame das preferencias de asinamento do seu destinatario revela que non ten "
-"un tipo común de sinatura que coincida coas súas chaves de asinamento.\n"
+"Un exame das preferencias de asinamento do seu destinatario revela que non "
+"ten un tipo común de sinatura que coincida coas súas chaves de asinamento.\n"
 "Quere enviar a mensaxe sen asinar?"
 
 #: keyresolver.cpp:1335
@@ -5277,11 +5079,11 @@ msgstr "Non foi posíbel asinar"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Non seleccionou unha chave de cifraxe para si mesmo (cifrarse a si mesmo). Non "
-"será quen de descifrar as súas propias mensaxes se as cifra."
+"Non seleccionou unha chave de cifraxe para si mesmo (cifrarse a si mesmo). "
+"Non será quen de descifrar as súas propias mensaxes se as cifra."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5297,16 +5099,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Non escolleu unha chave de cifraxe para o receptor desta mensaxe; polo tanto, a "
-"mensaxe non se cifrará."
+"Non escolleu unha chave de cifraxe para o receptor desta mensaxe; polo "
+"tanto, a mensaxe non se cifrará."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Non seleccionou unha chave de cifraxe para ningún dos receptores desta mensaxe; "
-"polo tanto, a mensaxe non se cifrará."
+"Non seleccionou unha chave de cifraxe para ningún dos receptores desta "
+"mensaxe; polo tanto, a mensaxe non se cifrará."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5317,16 +5119,16 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Non seleccionou unha chave de cifraxe para un dos receptores: esta persoa non "
-"será quén de descifrar a mensaxe se vostede a cifra."
+"Non seleccionou unha chave de cifraxe para un dos receptores: esta persoa "
+"non será quén de descifrar a mensaxe se vostede a cifra."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Non seleccionou as chaves de cifrado dalgúns dos receptores: estas persoas non "
-"serán quén de descifrar a mensaxe se vostede a cifra."
+"Non seleccionou as chaves de cifrado dalgúns dos receptores: estas persoas "
+"non serán quén de descifrar a mensaxe se vostede a cifra."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5351,11 +5153,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Non se atopou unha chave de cifraxe autentificada para \"%1\".\n"
 "\n"
@@ -5404,10 +5206,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Erro crítico: Imposibilidade de recoller o correo: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Fallo ao engadir a mensaxe:\n"
+msgid "Failed to add message:\n"
+msgstr "Fallo ao engadir a mensaxe:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5497,6 +5297,51 @@ msgstr "IMAP &Desconectado"
 msgid "&Maildir mailbox"
 msgstr "Caixa &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Estabelecer asunto da mensaxe"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Enviar CC: a 'enderezo'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Enviar BCC: a 'enderezo'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Engadir 'cabeceira' á mensaxe"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Ler corpo da mensaxe dende o 'ficheiro'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Estabelecer corpo da mensaxe"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Engadir un ficheiro anexo ao correo. Isto pode repetirse"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Só comprobar o correo novo"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Só abrir a fiestra de edición"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Ver o ficheiro de mensaxe dado"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Envia-la mensaxe ao enderezo de resposta anexo co arquivo ao que apunta a URL"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Correo"
@@ -5541,8 +5386,8 @@ msgid ""
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
 "KMail non creará os cartafoles requeridos para o recurso IMAP coma "
-"subcartafoles de %1. Se vostede non quere isto, prema \"Non\" e o recurso IMAP "
-"deshabilitarase."
+"subcartafoles de %1. Se vostede non quere isto, prema \"Non\" e o recurso "
+"IMAP deshabilitarase."
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5551,17 +5396,18 @@ msgstr "%1: non se atopou o cartafol. Crearase un."
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
-"%1: cartafol %2 atopado. Estabelecerase coma o cartafol de groupware principal."
+"%1: cartafol %2 atopado. Estabelecerase coma o cartafol de groupware "
+"principal."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail atopou os seguintes cartafoles de traballo en grupo en %1 e precisa "
-"levar a cabo as vindeiras operacións: %2 "
-"<br>Se non quere isto, cancéleo e o recurso IMAP deshabilitarase"
+"<qt>KMail atopou os seguintes cartafoles de traballo en grupo en %1 e "
+"precisa levar a cabo as vindeiras operacións: %2 <br>Se non quere isto, "
+"cancéleo e o recurso IMAP deshabilitarase"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5610,11 +5456,11 @@ msgstr "URL copiada ao portapapeis."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>O Ficheiro <b>%1</b> existe. <br>¿Quere reemprazalo?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Gravar coma Ficheiro"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Reemprazar"
 
@@ -5632,7 +5478,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Borrouse a mensaxe mentres se gravaba. Non se gravou."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5652,97 +5498,97 @@ msgstr "O ficheiro non contén ningunha mensaxe."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "O ficheiro contén múltiples mensaxes. Só a primeira se amosa."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Isto é un reenvío en formato MIME. O contida da mensaxe está no(s)ficheiro(s) "
-"anexo(s).\n"
+"Isto é un reenvío en formato MIME. O contida da mensaxe está "
+"no(s)ficheiro(s) anexo(s).\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrando mensaxes"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrando a mensaxe %1 de %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Non hai espacio en disco de abondo?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mover a Este Cartafol"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copiar a Este Cartafol"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Movendo mensaxes"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Borrando mensaxes"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Abrindo URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>¿Quere realmente exectuar <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Executar"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Non se atoparon arquivos anexos a gardar."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Gravar Anexos A"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "anexo.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "anexo.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Xa existe un ficheiro chamado %1. ¿Quere sobrescribilo?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "O ficheiro xa existe"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Sobrescribir"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5750,30 +5596,30 @@ msgstr ""
 "A parte %1 da mensaxe está cifrada. ¿Quere salvagardar o cifrado cando se "
 "garde?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Pregunta de KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Manter Cifraxe"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Non Manter"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "A parte %1 de mensaxe está asinada. ¿Quere manter a sinatura cando se garde?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Manter Sinatura"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5782,104 +5628,105 @@ msgstr ""
 "Non se puido escribir o ficheiro %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Non se puido escribir o ficheiro %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Non hai unha entrada no Caderno de Enderezos para este enderezo de correo-e. "
 "Engádaa ao Caderno de Enderezos e logo engada un enderezo de mensaxería "
 "instantánea empregando o seu cliente de mensaxería favorito."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Máis dunha entrada do Caderno de Enderezos emprega este enderezo de correo-e:\n"
+"Máis dunha entrada do Caderno de Enderezos emprega este enderezo de correo-"
+"e:\n"
 " %1\n"
 " non é posíbel determinar con quén conversar."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "O manexador de Chiasmus non ofrece a función \"x-obtain-keys\". Por favor, "
 "informe deste erro."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Erro do Manexador de Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Valor de retorno non agardado dende o manexador de Chiasmus. A función "
-"\"x-obtain-keys\" non devolveu unha lista de cadeas. Por favor, informe deste "
+"Valor de retorno non agardado dende o manexador de Chiasmus. A función \"x-"
+"obtain-keys\" non devolveu unha lista de cadeas. Por favor, informe deste "
 "erro."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Non se atoparon chaves. Por favor, comprobe que se especificou un camiño ás "
 "chaves correcto na configuración de Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Selección de Chave de Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"O manexador de Chiasmus non ofrece a función \"x-decrypt\". Por favor, informe "
-"deste erro."
+"O manexador de Chiasmus non ofrece a función \"x-decrypt\". Por favor, "
+"informe deste erro."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"A función \"x-decrypt\" non acepta os parámetros agardados. Por favor, informe "
-"deste erro."
+"A función \"x-decrypt\" non acepta os parámetros agardados. Por favor, "
+"informe deste erro."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Erro de Descifraxe de Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Valor de retorno non agardado dende o manexador de Chiasmus: A función "
-"\"x-decrypt\" non devolveu unha cadea de bites. Por favor, informe deste erro."
+"Valor de retorno non agardado dende o manexador de Chiasmus: A función \"x-"
+"decrypt\" non devolveu unha cadea de bites. Por favor, informe deste erro."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Correo"
@@ -5978,7 +5825,7 @@ msgstr "Tamaño"
 msgid "Encoding"
 msgstr "Codificación"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comprimir"
 
@@ -5990,7 +5837,7 @@ msgstr "Cifrar"
 msgid "Sign"
 msgstr "Asinar"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nome do anexo:"
 
@@ -6012,10 +5859,11 @@ msgstr "Destinatarios primarios"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Os enderezos de correo-e que introduza neste campo recibirán unha copia do "
-"correo-e.</qt>"
+"<qt>Os enderezos de correo-e que introduza neste campo recibirán unha copia "
+"do correo-e.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6024,14 +5872,14 @@ msgstr "Destinatarios Adicionais"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Os enderezos de correo-e que poña neste campo recibirán unha copia do "
-"correo-e. Técnicamente é o mesmo que poñer tódolos enderezos no campo <b>"
-"Para:</b> pero difire en que normalmente simboliza que o destinatario da Copia "
-"Carbón (CC) é un receptor pasivo, non o destinatario principal.</qt>"
+"correo-e. Técnicamente é o mesmo que poñer tódolos enderezos no campo "
+"<b>Para:</b> pero difire en que normalmente simboliza que o destinatario da "
+"Copia Carbón (CC) é un receptor pasivo, non o destinatario principal.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6039,12 +5887,11 @@ msgstr "Destinatarios Agochados"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Esencialmente a mesma cousa que <b>Copia a:</b> pero difire en que tódolos "
-"destinatarios non ven quen recibe ademáis a copia carbón.</qt>"
+"<qt>Esencialmente a mesma cousa que <b>Copia a:</b> pero difire en que "
+"tódolos destinatarios non ven quen recibe ademáis a copia carbón.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6054,7 +5901,7 @@ msgstr "&Enviar Correo"
 msgid "&Send Mail Via"
 msgstr "&Enviar Correo Vía"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Enviar &Despois"
@@ -6119,8 +5966,7 @@ msgstr "Bo&rrar Caracteres de Citación"
 msgid "Cl&ean Spaces"
 msgstr "Borrar &Espacios"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Empregar Fonte \"Fi&xed\""
@@ -6263,31 +6109,31 @@ msgstr "&Formato Criptográfico da Mensaxe"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Estándar"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Lista de viñetas (Disco)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Lista de viñetas (Círculo)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Lista de viñetas (Cadrado)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Lista Ordeada (Decimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Lista Ordeada (letras minúsculas)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Lista Ordeada (letras maiúsculas)"
 
@@ -6391,61 +6237,61 @@ msgstr "Pechar o editor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"A mensaxe que compuxo semella referirse a un ficheiro anexo pero non ten nada "
-"adxuntado.\n"
+"A mensaxe que compuxo semella referirse a un ficheiro anexo pero non ten "
+"nada adxuntado.\n"
 "¿Quere anexionar un ficheiro á súa mensaxe?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Lembranza de Arquivo Anexo"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Envi&ar coma está"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail non puido recoñece-la ubicación do arquivo anexo (%1).</p>"
-"<p> Debe especificar o camiño completi se desexa anexionar un ficheiro.</p></qt>"
+"<qt><p>KMail non puido recoñece-la ubicación do arquivo anexo (%1).</p><p> "
+"Debe especificar o camiño completi se desexa anexionar un ficheiro.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Anexionar Ficheiro"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Anexionar"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Inserir Ficheiro"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Inserir Ficheiro"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt> "
-"<p>Ocorreu un erro namentres se tentaba exportar a chave dende o backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt> <p>Ocorreu un erro namentres se tentaba exportar a chave dende o "
+"backend:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6484,192 +6330,200 @@ msgid ""
 "View"
 msgstr "Vista"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Editar..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Editar Guión..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Gravar &Como..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Propiedades"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Engadir Ficheiro Anexo..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail non puido  comprimir o ficheiro."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "O ficheiro comprimido é máis longo que o orixinal. Quere manter o orixinal?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Manter"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail non puido descomprimir o ficheiro."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Gravar Ficheiro Anexo Coma"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Engadir coma Texto"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Engadir coma Anexo"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Pegar coma Ane&xo"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "sen nome"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Solicitou que as mensaxes sexan cifradas a sí mesmo, pero a identidade "
-"actualmente escollida non define unha chave de cifraxe para empregar para isto "
-"(OpenPGP ou S/MIME).</p> "
-"<p>Por favor, escolla a(s) chave(s) a empregar na configuración de "
-"identidade.</p></qt>"
+"<qt> <p>Solicitou que as mensaxes sexan cifradas a sí mesmo, pero a "
+"identidade actualmente escollida non define unha chave de cifraxe para "
+"empregar para isto (OpenPGP ou S/MIME).</p> <p>Por favor, escolla a(s) "
+"chave(s) a empregar na configuración de identidade.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Chave de Cifraxe non Definida"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Para ser quén de asinar esta mensaxe primeiro débese definir a chave "
-"(OpenPGP ou S/MIME) a seren empregada.</p>"
-"<p>Por favor, defina a chave a se usar na configuración de identidade.</p></qt>"
+"<qt><p>Para ser quén de asinar esta mensaxe primeiro débese definir a chave "
+"(OpenPGP ou S/MIME) a seren empregada.</p><p>Por favor, defina a chave a se "
+"usar na configuración de identidade.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Chave de Asinar Non Definida"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"KMail está actualmente fóra de liña, as súas mensaxes manteranse no cartafol de "
-"saída ate que se poña en liña."
+"KMail está actualmente fóra de liña, as súas mensaxes manteranse no cartafol "
+"de saída ate que se poña en liña."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "En liña/Fóra de liña"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Debe introducir un enderezo de correo-e no campo Dende: . Debería tamén "
-"estabelecer o seu enderezo de correo-e para tódalas identidades, de xeito que "
-"non teá que introducilo para cada mensaxe."
+"estabelecer o seu enderezo de correo-e para tódalas identidades, de xeito "
+"que non teá que introducilo para cada mensaxe."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Debe especificar como mínimo un destinatario, xa sexa no campo Para: coma en CC "
-"ou BCC."
+"Debe especificar como mínimo un destinatario, xa sexa no campo Para: coma en "
+"CC ou BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Non especificou o asunto. ¿Envia-la mensaxe de todos modos?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Non se Especificou un Nome"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Non especificou o asunto. ¿Envia-la mensaxe de todos modos?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Asunto Non Especificado"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Envi&ar deste Xeito"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "E&specificar o Asunto"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Manter o marcado, non asinar/cifrar"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Manter o marcado, non cifrar"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Manter o marcado, non asinar"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Asinar/Cifrar (borrar o marcado)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "&Cifrar (borrar o marcado)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Asinar (borrar o marcado)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Non é posíbel asinar/cifrar mensaxes HTML internamente;</p>"
-"<p>quere borrar o marcado?</p></qt>"
+"<qt><p>Non é posíbel asinar/cifrar mensaxes HTML internamente;</p><p>quere "
+"borrar o marcado?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Cifrar/Asinar a Mensaxe?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6678,74 +6532,74 @@ msgstr ""
 "O cartafol persoalizado para os borradores da identidade \"%1\" non existe. "
 "Polo tanto, empregarase o cartafol de borradores por defecto."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Por favor, cree unha conta para enviar e inténteo de novo."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "A punto de enviar o correo..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Enviar Confirmación"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Env&iar Agora"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Sen destinatarios"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinatarios Adicionais"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Corrección Ortográfica: activada"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Corrección Ortográfica: desactivada"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Corrección Ortográfica cancelada."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Corrección Ortográfica detida."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Corrección Ortográfica completa."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Corrector Ortográfico"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Por favor, configure un Manexador de Criptografía para poder usar a cifraxe "
 "Chiasmus.\n"
 "Pode facer isto na pestana de Manexadores Criptográficos do diálogo de "
 "configuración Páxina de Seguridade."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6753,34 +6607,34 @@ msgstr ""
 "Semella que libkleopatra foi compilada sen soporte para Chiasmus. Precisará "
 "recompilar libkleopatra coa opción --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Non se Configurou un Manexador de Chiasmus"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Non se Atoparon Chaves Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Selección de Chave de Cifraxe Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "A mensaxe asinouse por %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "A mensaxe asinouse por %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Mensaxe OpenPGP - Cifrada"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Mensaxe co asunto: "
@@ -6830,8 +6684,8 @@ msgstr "Corrección Ortográfica - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell non se puido iniciar. Por favor, cerciórese de que ambos están "
 "axeitadamente configurados e se atopan no seu camiñ."
@@ -6867,13 +6721,11 @@ msgstr "<qt>Demasiadas accións de filtro na regra de filtrado <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Acción de filtrado descoñecida <b>%1</b>"
-"<br>na regra de filtrado <b>%2</b>."
-"<br>Ignorándoa.</qt>"
+"<qt>Acción de filtrado descoñecida <b>%1</b><br>na regra de filtrado <b>%2</"
+"b>.<br>Ignorándoa.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7093,168 +6945,137 @@ msgstr "Reproducir son"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ésta é a lista dos filtros definidos. Éstos son procesados de arriba a "
-"abaixo.</p>"
-"<p>Prema sobre calquera filtro para editalo mediante os controis da metade "
-"dereita do diálogo.</p></qt>"
+"<qt><p>Ésta é a lista dos filtros definidos. Éstos son procesados de arriba "
+"a abaixo.</p><p>Prema sobre calquera filtro para editalo mediante os "
+"controis da metade dereita do diálogo.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Prema neste botón para crear un novo filtro.</p>"
-"<p>O filtro inserirrase xusto despois do filtro actualmente seleccionado, pero "
-"poderá sempre cambiar isto despois.</p>"
-"<p>Se accionou este botón accidentalmente, pode desfacer a cousa premendo no "
-"botón <em>Borrar</em>.</p></qt>"
+"<qt><p>Prema neste botón para crear un novo filtro.</p><p>O filtro "
+"inserirrase xusto despois do filtro actualmente seleccionado, pero poderá "
+"sempre cambiar isto despois.</p><p>Se accionou este botón accidentalmente, "
+"pode desfacer a cousa premendo no botón <em>Borrar</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Prema este botón para copiar un filtro.</p>"
-"<p>Se accionou este botón accidentalmente, pode desfacer a cousa premendo no "
-"botón <em>Borrar</em>.</p></qt>"
+"<qt><p>Prema este botón para copiar un filtro.</p><p>Se accionou este botón "
+"accidentalmente, pode desfacer a cousa premendo no botón <em>Borrar</em>.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Prema este botón para <em>borrar</em> o filtro seleccionado da lista de "
-"enriba.</p>"
-"<p>Non hai modo de recuperar o filtro despois de borrado, pero pode saír do "
-"diálogo premendo en <em>Cancelar</em> para descartar as mudanzas feitas.</p>"
-"</qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Prema este botón para <em>borrar</em> o filtro seleccionado da lista "
+"de enriba.</p><p>Non hai modo de recuperar o filtro despois de borrado, pero "
+"pode saír do diálogo premendo en <em>Cancelar</em> para descartar as "
+"mudanzas feitas.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Prema esta botón para mover o filtro seleccionado cara <em>Enriba</em> "
-"na lista de enriba.</p>"
-"<p>Isto é útil xa que a orde dos filtros na lista determina a orde en que se "
-"van empregando nas mensaxes. O primeiro en probarse é o de enriba de todo.</p>"
-"<p>Se premeu este botón accidentalmente pode desfacer a acción premendo no "
-"botón <em>Baixar</em> (na dereita).</p></qt>"
+"<qt><p>Prema esta botón para mover o filtro seleccionado cara <em>Enriba</"
+"em> na lista de enriba.</p><p>Isto é útil xa que a orde dos filtros na lista "
+"determina a orde en que se van empregando nas mensaxes. O primeiro en "
+"probarse é o de enriba de todo.</p><p>Se premeu este botón accidentalmente "
+"pode desfacer a acción premendo no botón <em>Baixar</em> (na dereita).</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Prema esta botón para mover o filtro seleccionado cara <em>Enriba</em> "
-"na lista de enriba.</p>"
-"<p>Isto é útil xa que a orde dos filtros na lista determina a orde en que se "
-"van empregando nas mensaxes. O primeiro en probarse é o de enriba de todo.</p>"
-"<p>Se premeu este botón accidentalmente pode desfacer a acción premendo no "
-"botón <em>Baixar</em> (na dereita).</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Prema esta botón para mover o filtro seleccionado cara <em>Enriba</"
+"em> na lista de enriba.</p><p>Isto é útil xa que a orde dos filtros na lista "
+"determina a orde en que se van empregando nas mensaxes. O primeiro en "
+"probarse é o de enriba de todo.</p><p>Se premeu este botón accidentalmente "
+"pode desfacer a acción premendo no botón <em>Baixar</em> (na dereita).</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Prema este botón para mover o filtro seleccionada unha posición cara <em>"
-"Embaixo</em> na lista de enriba.</p>"
-"<p>Isto é útil xa que a orde dos filtros determina a orde en que se empregan "
-"nas mensaxes. O filtro de enriba de todo é o primeiro en empregarse.</p>"
-"<p>Se premeu este botón por accidente, pode desfacer a acción premendo no botón "
-"<em>Subir</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Prema este botón para mover o filtro seleccionada unha posición cara "
+"<em>Embaixo</em> na lista de enriba.</p><p>Isto é útil xa que a orde dos "
+"filtros determina a orde en que se empregan nas mensaxes. O filtro de enriba "
+"de todo é o primeiro en empregarse.</p><p>Se premeu este botón por "
+"accidente, pode desfacer a acción premendo no botón <em>Subir</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Prema este botón para mover o filtro seleccionada unha posición cara <em>"
-"Embaixo</em> na lista de enriba.</p>"
-"<p>Isto é útil xa que a orde dos filtros determina a orde en que se empregan "
-"nas mensaxes. O filtro de enriba de todo é o primeiro en empregarse.</p>"
-"<p>Se premeu este botón por accidente, pode desfacer a acción premendo no botón "
-"<em>Subir</em>.</p></qt>"
+"<qt><p>Prema este botón para mover o filtro seleccionada unha posición cara "
+"<em>Embaixo</em> na lista de enriba.</p><p>Isto é útil xa que a orde dos "
+"filtros determina a orde en que se empregan nas mensaxes. O filtro de enriba "
+"de todo é o primeiro en empregarse.</p><p>Se premeu este botón por "
+"accidente, pode desfacer a acción premendo no botón <em>Subir</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Prema este botón para renomear o filtro escollido.</p>"
-"<p>Os filtros noméanse automaticamente, comezando por \"&lt;\".</p>"
-"<p> Se renomeou un filtro accidentalmente e quere automaticamente deixalo coma "
-"estaba, prema este botón e seleccione <em>Limpar</em> seguido de <em>"
-"Aceptar</em> no diálogo emerxente.</p></qt>"
+"<qt><p>Prema este botón para renomear o filtro escollido.</p><p>Os filtros "
+"noméanse automaticamente, comezando por \"&lt;\".</p><p> Se renomeou un "
+"filtro accidentalmente e quere automaticamente deixalo coma estaba, prema "
+"este botón e seleccione <em>Limpar</em> seguido de <em>Aceptar</em> no "
+"diálogo emerxente.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marque este botón para forzar a mostra do diálogo de confirmación.</p>"
-"<p> Isto é útil se definiu unha regra na que as mensaxes se marcan para ser "
-"baixadas con posterioridade. Sen a posibilidade de que se mostre o diálogo, "
-"estas mensaxes non poderían ser nunca baixadas se non hai outras mensaxes de "
-"gran tamaño agardando no servidor, ou se vostede non cambia a regra para "
-"etiquetar as mensaxes doutro xeito.</p></qt>"
+"<qt><p>Marque este botón para forzar a mostra do diálogo de confirmación.</"
+"p><p> Isto é útil se definiu unha regra na que as mensaxes se marcan para "
+"ser baixadas con posterioridade. Sen a posibilidade de que se mostre o "
+"diálogo, estas mensaxes non poderían ser nunca baixadas se non hai outras "
+"mensaxes de gran tamaño agardando no servidor, ou se vostede non cambia a "
+"regra para etiquetar as mensaxes doutro xeito.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7264,6 +7085,16 @@ msgstr "Regras de Filtrado POP3"
 msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importar"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importar"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtros Dispoñibeis"
@@ -7346,6 +7177,11 @@ msgstr "Engadir tamén este filtro á barra de ferramentas"
 msgid "Icon for this filter:"
 msgstr "Icona para esta filtro:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Para"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Enriba"
@@ -7354,16 +7190,29 @@ msgstr "Enriba"
 msgid "Down"
 msgstr "Embaixo"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Renomear..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Novo"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copiar A"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Borrada"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7372,8 +7221,8 @@ msgstr "Escolla Atallo para o Cartafol"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Polo menos un dos filtros ten como destiño un cartafol dunha conta IMAP en "
 "liña. Tales ficheiros só se aplicarán cando se filtre manualmente e cando se "
@@ -7384,8 +7233,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Os seguintes filtros non se gardaron porque eran inválidos (p.e. non contiñan "
-"accións ou regras de procura)."
+"Os seguintes filtros non se gardaron porque eran inválidos (p.e. non "
+"contiñan accións ou regras de procura)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7433,8 +7282,8 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Os nomes de cartafol non poden conter o caracter / (barra); por favor, escolla "
-"outro nome para o cartafol."
+"Os nomes de cartafol non poden conter o caracter / (barra); por favor, "
+"escolla outro nome para o cartafol."
 
 #: kmfolder.cpp:913
 msgid ""
@@ -7459,29 +7308,25 @@ msgstr "Resolución de problemas da caché IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Resolución dos problemas da caché IMAP.</b></p> "
-"<p>Se ten problemas coa sincronización dun cartafol IMAP, debería primeiro "
-"rexenerar o ficheiro índice. Levará algún tempo rexenera-lo ficheiro, pero non "
-"causará ningún problema.</p> "
-"<p>Se isto non é abondo, pode tentar refrescar a caché IMAP. Se fai isto, "
-"perdererá tódolos seus cambios locais para este cartafol e tódolos seus "
-"subcartafoles.</p>"
+"<p><b>Resolución dos problemas da caché IMAP.</b></p> <p>Se ten problemas "
+"coa sincronización dun cartafol IMAP, debería primeiro rexenerar o ficheiro "
+"índice. Levará algún tempo rexenera-lo ficheiro, pero non causará ningún "
+"problema.</p> <p>Se isto non é abondo, pode tentar refrescar a caché IMAP. "
+"Se fai isto, perdererá tódolos seus cambios locais para este cartafol e "
+"tódolos seus subcartafoles.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7515,16 +7360,16 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Non se puido ler o ficheiro de caché UID para o cartafol %1. Podería haber un "
-"problema cos permisos do sistema de ficheiros, ou está corrupto."
+"Non se puido ler o ficheiro de caché UID para o cartafol %1. Podería haber "
+"un problema cos permisos do sistema de ficheiros, ou está corrupto."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"Non se puido escribir o ficheiro de caché UID para o cartafol %1. Podería haber "
-"un problema cos permisos do sistema de ficheiros."
+"Non se puido escribir o ficheiro de caché UID para o cartafol %1. Podería "
+"haber un problema cos permisos do sistema de ficheiros."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7562,8 +7407,8 @@ msgstr "Recreouse o ficheiro índice deste cartafol."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "O cartafol %1 non se atopa no estado de sincronización incial (o estado era "
 "%2). ¿Quere reinicialo para estabelecelo no estado inicial e sincronizalo?"
@@ -7693,14 +7538,11 @@ msgstr "Creando subcartafoles no servidor"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Semella que o cartafol <b>%1</b> foi borrado. Quere borralo do servidor?</p>"
-"</qt>"
+"<qt> <p>Semella que o cartafol <b>%1</b> foi borrado. Quere borralo do "
+"servidor?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7721,13 +7563,11 @@ msgstr "Obtendo cartafols para o espacio %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Semella que o cartafol <b>%1</b> foi borrado. Quere borralo do servidor?</p>"
-"</qt>"
+"<qt> <p>Semella que o cartafol <b>%1</b> foi borrado. Quere borralo do "
+"servidor?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7735,8 +7575,8 @@ msgstr "Interrompido"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "O servidor IMAP %1 non atura as anotacións IMAP. O almacenamento XML non se "
 "pode empregar neste servidor, por favor, reconfigure KMail doutro xeito."
@@ -7744,8 +7584,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "O servidor IMAP %1 non atura as anotacións IMAP. O almacenamento XML non se "
 "pode empregar neste servidor, por favor, reconfigure KMail doutro xeito."
@@ -7761,17 +7601,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Hai novas mensaxes neste cartafol, que non se subiron ao servidor aínda, "
-"mais semella que non ten permisos de acceso suficientes no cartafol aos que os "
-"quere subir. Por favor, contacte co seu administrador para lle aturar a subida "
-"destas novas mensaxes, ou móvaas fóra deste cartafol.</p> "
-"<p>Quere mover agora estas mensaxes a outro cartafol?</p>"
+"mais semella que non ten permisos de acceso suficientes no cartafol aos que "
+"os quere subir. Por favor, contacte co seu administrador para lle aturar a "
+"subida destas novas mensaxes, ou móvaas fóra deste cartafol.</p> <p>Quere "
+"mover agora estas mensaxes a outro cartafol?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7780,20 +7620,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Hai novas mensaxes neste cartafol, que non se subiron ao servidor aínda, "
-"mais semella que non ten permisos de acceso suficientes no cartafol aos que os "
-"quere subir. Por favor, contacte co seu administrador para lle aturar a subida "
-"destas novas mensaxes, ou móvaas fóra deste cartafol.</p> "
-"<p>Quere mover agora estas mensaxes a outro cartafol?</p>"
+"mais semella que non ten permisos de acceso suficientes no cartafol aos que "
+"os quere subir. Por favor, contacte co seu administrador para lle aturar a "
+"subida destas novas mensaxes, ou móvaas fóra deste cartafol.</p> <p>Quere "
+"mover agora estas mensaxes a outro cartafol?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Mover a:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Non Mover"
 
@@ -7805,8 +7650,7 @@ msgstr "Mover Mensaxes ao Cartafol"
 msgid "Permissions (ACL)"
 msgstr "Permisos (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Xeral"
@@ -7831,8 +7675,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Empregar &iconos persoalizados"
@@ -7851,24 +7694,21 @@ msgstr "Actuar sobre correos novos/sen ler neste cartafol"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Se se habilita esta opción seralle notificado sobre correos novos e sen ler "
-"neste cartafol. Asemade, se vai a vindeiro/anterior cartafol con mensaxes sen "
-"ler, parará neste carafol.</p>"
-"<p>Desactive esta opción se non quere que se lle notifique sobre mensaxes "
-"novas/sen ler neste cartafol e se quere que este cartafol se omita cando se "
-"vaia ao vindeiro/anterior cartafol con mensaxes sen ler. Isto é útli para "
-"ignorar canlquera mensaxe nova/sen ler no lixo e no cartafol de correo lixo.</p>"
-"</qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Se se habilita esta opción seralle notificado sobre correos novos e "
+"sen ler neste cartafol. Asemade, se vai a vindeiro/anterior cartafol con "
+"mensaxes sen ler, parará neste carafol.</p><p>Desactive esta opción se non "
+"quere que se lle notifique sobre mensaxes novas/sen ler neste cartafol e se "
+"quere que este cartafol se omita cando se vaia ao vindeiro/anterior cartafol "
+"con mensaxes sen ler. Isto é útli para ignorar canlquera mensaxe nova/sen "
+"ler no lixo e no cartafol de correo lixo.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7880,9 +7720,9 @@ msgstr "Manter respostas neste cartafol"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Active esta opción se quere que as respostas que escriba a correos neste "
 "cartafol sexan postas no mesmo cartafol despois de envialas, no canto de "
@@ -7896,17 +7736,21 @@ msgstr "Amosar Columna de Remitente/Destinatario na Lista de Mensaxes"
 msgid "Sho&w column:"
 msgstr "Amo&sar columna:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Estabelecer coma predeterminado"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Remitente"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Destinatario"
@@ -7917,18 +7761,18 @@ msgstr "Identidade do &remitente:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Escolla a identidade do remitente a se empregar cando se escriba novo correo ou "
-"se resposte ao correo neste cartafol. Isto ven a significar que se está nun dos "
-"seus cartafoles de traballo, pode facer que KMail empregue o correspondente "
-"enderezo do remitente de correo, da sinatura e das chaves de cifraxe e "
-"asinamento automaticamente. As identidades pódense estabelecer no diálogo de "
-"configuración principal. (Opcións -> Configurar KMail)"
+"Escolla a identidade do remitente a se empregar cando se escriba novo correo "
+"ou se resposte ao correo neste cartafol. Isto ven a significar que se está "
+"nun dos seus cartafoles de traballo, pode facer que KMail empregue o "
+"correspondente enderezo do remitente de correo, da sinatura e das chaves de "
+"cifraxe e asinamento automaticamente. As identidades pódense estabelecer no "
+"diálogo de configuración principal. (Opcións -> Configurar KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7946,23 +7790,23 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Esta opción define qué usuarios compartindo este cartafol deben obter periodos "
-"de \"ocupación\" nas súas lista de ocupación-desocupación e deberían ver as "
-"alarmas para os eventos ou as tarefas deste cartafol. A opción surxe efecto só "
-"nos cartafoles de Calendario e Tarefas (para as tarefas, esta opción só se usa "
-"para as alarmas).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Esta opción define qué usuarios compartindo este cartafol deben obter "
+"periodos de \"ocupación\" nas súas lista de ocupación-desocupación e "
+"deberían ver as alarmas para os eventos ou as tarefas deste cartafol. A "
+"opción surxe efecto só nos cartafoles de Calendario e Tarefas (para as "
+"tarefas, esta opción só se usa para as alarmas).\n"
 "\n"
-"Exemplo de casos de uso: se o xefe comparte un cartafol coa súa secretaria, só "
-"o xefe debería estar marcado como ocupado para as úas reunións, de xeito que "
-"non debería seleccionar \"Administradores\" xa que a secretario non ten que "
-"administras os dereitos no cartafol.\n"
+"Exemplo de casos de uso: se o xefe comparte un cartafol coa súa secretaria, "
+"só o xefe debería estar marcado como ocupado para as úas reunións, de xeito "
+"que non debería seleccionar \"Administradores\" xa que a secretario non ten "
+"que administras os dereitos no cartafol.\n"
 "Pola outra banda, se un grupo de traballo comparte un Calendario para as "
 "reunións do propio grupo, todos os lectore dos cartafoles deberían marcarse "
 "como ocupados para estas reunións.\n"
@@ -7998,17 +7842,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr "<"
 
 #: kmfolderdir.cpp:209
@@ -8078,7 +7922,8 @@ msgstr "Erro namentres se obtía a información do cartafol."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "O índice de correo para '%1' pertence a unha versión descoñecida de KMail "
 "(%2).\n"
@@ -8110,11 +7955,11 @@ msgstr "Erro ao abriren %1; non se atopa este cartafol."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Erro abrindo %1. Ou non é un cartafol de correo válido ou non ten os permisos "
-"precisos para o acceso ao mesmo."
+"Erro abrindo %1. Ou non é un cartafol de correo válido ou non ten os "
+"permisos precisos para o acceso ao mesmo."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8157,22 +8002,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O índice de cartafoles '%2' asemella estar caducado. Para previr a "
+"<qt><p>O índice de cartafoles '%2' asemella estar caducado. Para previr a "
 "corrupción das mensaxes rexenerarase o índice. Coma resultado as mensaxes "
-"borradas poderían reaparecer.</p>"
-"<p>Por favor, lea a entrada correspondente na sección de <a href=\"%1\">"
-"Preguntas e Respostas Frecuentes do manual de KMail</a> "
-"para obter información sobre cómo previr este problema noutras ocasións.</p>"
-"</qt>"
+"borradas poderían reaparecer.</p><p>Por favor, lea a entrada correspondente "
+"na sección de <a href=\"%1\">Preguntas e Respostas Frecuentes do manual de "
+"KMail</a> para obter información sobre cómo previr este problema noutras "
+"ocasións.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8233,7 +8074,7 @@ msgstr ""
 "'%1' non semella ser un cartafol.\n"
 "Por favor, mova o ficheiro noutra parte."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8241,7 +8082,7 @@ msgstr ""
 "Os permisos do cartafol '%1' son incorrectos.\n"
 "Cerciórese de que pode ver e modifica-lo contido deste cartafol."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8251,8 +8092,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8260,7 +8101,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Erro ao crear o cartafol"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8361,13 +8202,14 @@ msgstr "&Resolver Probelmas na Caché IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Non se pode crear o cartafol <b>%1</b> porque non ten permisos suficientes "
-"no servidor. Se cre que debería ser quén de crear subcartafoles aquí, pídalle "
-"ao seu administrador que lle forneza os permisos axeitados para facelo.</qt>"
+"<qt>Non se pode crear o cartafol <b>%1</b> porque non ten permisos "
+"suficientes no servidor. Se cre que debería ser quén de crear subcartafoles "
+"aquí, pídalle ao seu administrador que lle forneza os permisos axeitados "
+"para facelo.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8506,15 +8348,15 @@ msgstr "%1 Cartafol está en só lectura."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Quere realmente borrar a mensaxe seleccionada?"
-"<br>Unha vez borrada, non se poderá recuperar.</qt>\n"
-"<qt>¿Desexa realmente borrar as %n mensaxes seleccionadas?"
-"<br>Unha vez borradas, non poderán ser recuperadas.</qt>"
+"<qt>Quere realmente borrar a mensaxe seleccionada?<br>Unha vez borrada, non "
+"se poderá recuperar.</qt>\n"
+"<qt>¿Desexa realmente borrar as %n mensaxes seleccionadas?<br>Unha vez "
+"borradas, non poderán ser recuperadas.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8566,134 +8408,132 @@ msgstr ""
 "Fallo modificando %1\n"
 "(¿Hai espacio ceibe no dispositivo?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Petición de Sinatura de Certificado"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Por favor, cree un certificado dende o anexo e devólvao ao remitente."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail está posto fóra de liña; todos os traballos en rede están suspensos"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail está posto en liña; todos os traballos en rede son retomados"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail está actualmente fóra de lila. Como quere proceder?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Traballar En Liña"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Traballar Fóra de Liña"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Non posúe permisos de escritura/lectura no seu cartafol de entrada."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "saída"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Non posúe permisos de escritura/lectura no seu cartafol de saída."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "correo enviado"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Non posúe permisos de escritura/lectura no seu cartafol de mensaxes enviadas."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Lixo"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Non posúe permisos de escritura/lectura no seu cartafol do lixo."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "borradores"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Non posúe permisos de escritura/lectura no seu cartafol de borradores."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "planteis"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Non posúe permisos de escritura/lectura no seu cartafol de planteis."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Derradeira Procura"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>O cartafol <i>%4</i> existe. %1 usa agora o cartafol <i>%5</i> "
-"para as súas mensaxes."
-"<p>%2 pode mover os contidos de <i>%6<i> neste cartafol por vostede, anque isto "
-"sobrescribirá calquera ficheiro existente co mesmo nome en <i>%7</i>."
-"<p><strong>Quere que %3 mova agora os ficheiros de correo?</strong></qt>"
+"<qt>O cartafol <i>%4</i> existe. %1 usa agora o cartafol <i>%5</i> para as "
+"súas mensaxes.<p>%2 pode mover os contidos de <i>%6<i> neste cartafol por "
+"vostede, anque isto sobrescribirá calquera ficheiro existente co mesmo nome "
+"en <i>%7</i>.<p><strong>Quere que %3 mova agora os ficheiros de correo?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>O cartafol <i>%4</i> existe. %1 usa agora o cartafol <i>%5</i> "
-"para as súas mensaxes. %2 pode mover  por vostede os contidos de <i>%6</i> "
-"neste cartafol."
-"<p><strong>Quere que %3 agora os ficheiros de correo?</strong></qt>"
+"<qt>O cartafol <i>%4</i> existe. %1 usa agora o cartafol <i>%5</i> para as "
+"súas mensaxes. %2 pode mover  por vostede os contidos de <i>%6</i> neste "
+"cartafol.<p><strong>Quere que %3 agora os ficheiros de correo?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrar Ficheiros de Correo?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail atopou un erro fatal e deterase agora."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8704,11 +8544,11 @@ msgstr ""
 "O erro foi:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Baleira-lo Lixo"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Está segura/o de que quere baleirar os cartafoles do lixo de todas as contas?"
@@ -8784,8 +8624,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Chegou novo correo</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8823,8 +8662,8 @@ msgstr "¿Está segura/o de que quere vacia-lo cartafol do lixo?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>¿Está segura/o de que quere mover todas as mensaxes dende o cartafol <b>"
 "%1</b> ao lixo?</qt>"
@@ -8851,12 +8690,11 @@ msgstr "Borrar Procura"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>¿Está segura/o de que quere borrar a procura <b>%1</b>? "
-"<br>As mensaxes amosadas nela ficarán dispoñibeis aínda no seu cartafol "
-"orixinal.</qt>"
+"<qt>¿Está segura/o de que quere borrar a procura <b>%1</b>? <br>As mensaxes "
+"amosadas nela ficarán dispoñibeis aínda no seu cartafol orixinal.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8869,37 +8707,39 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>¿Está segura/o de que quere borrar o cartafol baleiro <b>%1</b> "
-"e todos os seus subcartafoles? Estes subcartafoles podería non estar baleiros e "
-"os seus contidos eliminaranse tamén.</qt>"
+"<qt>¿Está segura/o de que quere borrar o cartafol baleiro <b>%1</b> e todos "
+"os seus subcartafoles? Estes subcartafoles podería non estar baleiros e os "
+"seus contidos eliminaranse tamén.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>¿Está segura/o de que quere borrar o cartafol <b>%1</b>"
-", descartando os seus contidos? "
-"<p><b>Sexa consciente</b> de que as mensaxes descartadas non se gravan no seu "
-"cartafol do Lixo e se borran permanentemente.</qt>"
+"<qt>¿Está segura/o de que quere borrar o cartafol <b>%1</b>, descartando os "
+"seus contidos? <p><b>Sexa consciente</b> de que as mensaxes descartadas non "
+"se gravan no seu cartafol do Lixo e se borran permanentemente.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>¿Está segura/o de que quere borrar o cartafol <b>%1</b> "
-"e todos os seus subcartafoles, descartando os seus contidos?</qt>"
+"<qt>¿Está segura/o de que quere borrar o cartafol <b>%1</b> e todos os seus "
+"subcartafoles, descartando os seus contidos?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Borrada"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8916,9 +8756,9 @@ msgstr "¿Está segura/o de que quere caducar todas as mensaxes antigas?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "O emprego de HTML no correo faralle a vostede más vulnerábel ao \"spam\" e "
 "podería incrementar o risco de que o seu sistema se vise comprometido por "
@@ -8935,8 +8775,8 @@ msgstr "Empregar HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "O emprego de referencias externas no correo HTML faralle a vostede más "
 "vulnerábel ao \"spam\" e podería incrementar o risco de que o seu sistema se "
@@ -8956,12 +8796,12 @@ msgstr "Filtrar na Lista de Correo %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"A funcionalidade de KMail Resposta En Ausencia confía no filtrado por parte do "
-"servidor. Vostede non configurou aínda o servidor IMAP para isto.\n"
+"A funcionalidade de KMail Resposta En Ausencia confía no filtrado por parte "
+"do servidor. Vostede non configurou aínda o servidor IMAP para isto.\n"
 "Pode facelo na pestana \"Filtrado\" da configuración de conta IMAP."
 
 #: kmmainwidget.cpp:1743
@@ -8979,7 +8819,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Non se puido iniciar o visor de rexistro GnuPG (kwatchgnupg); por favor, "
 "comprobe a súa instalación."
@@ -9314,8 +9155,7 @@ msgstr "Gravar Arquivos Ane&xos..."
 msgid "Appl&y All Filters"
 msgstr "Apl&icar todos os Filtros"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Apl&icar Filtro"
@@ -9352,7 +9192,8 @@ msgstr "Columna &Total"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Trocar a mostra de columnas amosando o número total de mensaxes nos cartafoles."
+"Trocar a mostra de columnas amosando o número total de mensaxes nos "
+"cartafoles."
 
 #: kmmainwidget.cpp:3026
 #, fuzzy
@@ -9365,7 +9206,8 @@ msgstr "Columna &Total"
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Trocar a mostra de columnas amosando o número total de mensaxes nos cartafoles."
+"Trocar a mostra de columnas amosando o número total de mensaxes nos "
+"cartafoles."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9431,7 +9273,6 @@ msgstr "Seguinte Mensaxe &Non Lida"
 msgid "Go to the next unread message"
 msgstr "Ir á seguinte mensaxe non lida"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Mensaxe &Previa"
@@ -9572,70 +9413,70 @@ msgstr " Iniciando..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensaxe contén unha solicitude para que se devolva unha notificación sobre "
-"a recepción da mensaxe.\n"
-"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"denegada\" "
-"ou normal."
+"Esta mensaxe contén unha solicitude para que se devolva unha notificación "
+"sobre a recepción da mensaxe.\n"
+"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"denegada"
+"\" ou normal."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Esta mensaxe contén unha solicitude para que se devolva unha notificación sobre "
-"a recepción da mensaxe.\n"
-"Contén unha instrución de procesado que se marca coma \"requerida\", pero que "
-"resulta descoñecida para KMail.\n"
-"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"fallida\" "
-"ou normal."
+"Esta mensaxe contén unha solicitude para que se devolva unha notificación "
+"sobre a recepción da mensaxe.\n"
+"Contén unha instrución de procesado que se marca coma \"requerida\", pero "
+"que resulta descoñecida para KMail.\n"
+"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"fallida"
+"\" ou normal."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensaxe contén unha solicitude para que se devolva unha notificación sobre "
-"a recepción da mensaxe,\n"
+"Esta mensaxe contén unha solicitude para que se devolva unha notificación "
+"sobre a recepción da mensaxe,\n"
 "pero solicítase enviar a notificación a máis dun enderezo.\n"
-"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"denegada\" "
-"ou normal."
+"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"denegada"
+"\" ou normal."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensaxe contén unha solicitude para que se devolva unha notificación sobre "
-"a recepción da mensaxe,\n"
+"Esta mensaxe contén unha solicitude para que se devolva unha notificación "
+"sobre a recepción da mensaxe,\n"
 "pero non hai un camiño de devolución estabelecido.\n"
-"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"denegada\" "
-"ou normal."
+"Pode ignorar a petición ou permitir que KMail envíe unha resposta \"denegada"
+"\" ou normal."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensaxe contén unha solicitude para que se devolva unha notificación sobre "
-"a recepción da mensaxe,\n"
+"Esta mensaxe contén unha solicitude para que se devolva unha notificación "
+"sobre a recepción da mensaxe,\n"
 "pero o enderezo do camiño de devolución non coincide co enderezo ao que se "
 "solicitou ser enviada a solicitude.Pode ignorar a petición ou permitir que "
 "KMail envíe unha resposta \"denegada\" ou normal."
@@ -9657,24 +9498,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"A cabeceira \"Opcións-Notificación-Disposición\" contén parámetros requeridos "
-"descoñecidos"
+"A cabeceira \"Opcións-Notificación-Disposición\" contén parámetros "
+"requeridos descoñecidos"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Receptor: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Arquivo Anexo: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Amosar anexos coma o suxira o remitente"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9724,46 +9565,39 @@ msgstr "Propiedades de Parte de Mensaxe"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O <em>tipo MIME</em> do ficheiro:</p>"
-"<p>Xeralmente non se precisa tocar esta opción, xa que o tipo de ficheiro "
-"compróbase automaticamente. Pero ás veces, %1 podería non detectar o tipo "
-"correctamente - aquí é onde pode resolver a cuestión.</p></qt>"
+"<qt><p>O <em>tipo MIME</em> do ficheiro:</p><p>Xeralmente non se precisa "
+"tocar esta opción, xa que o tipo de ficheiro compróbase automaticamente. "
+"Pero ás veces, %1 podería non detectar o tipo correctamente - aquí é onde "
+"pode resolver a cuestión.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O tamaño da parte.</p>"
-"<p>Ás veces, %1 só fornecerá un tamaño estimado aquí, xa que calcular o tamaño "
-"exacto podería levar moito tempo. Nestes casos, amosarase unha etiqueta "
-"\"(aprox.)\" a carón do tamaño obtido.</p></qt>"
+"<qt><p>O tamaño da parte.</p><p>Ás veces, %1 só fornecerá un tamaño estimado "
+"aquí, xa que calcular o tamaño exacto podería levar moito tempo. Nestes "
+"casos, amosarase unha etiqueta \"(aprox.)\" a carón do tamaño obtido.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>O nome de ficheiro da parte:</p>"
-"<p>anque é por defecto o nome do ficheiro adxuntado, non especifica o ficheiro "
-"a ser adxuntado. Pola contra, se suxire un nome de ficheiro para se empregar no "
-"axente de correo do destinatario cando se queira gardar a parte no disco.</p>"
-"</qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
+msgstr ""
+"<qt><p>O nome de ficheiro da parte:</p><p>anque é por defecto o nome do "
+"ficheiro adxuntado, non especifica o ficheiro a ser adxuntado. Pola contra, "
+"se suxire un nome de ficheiro para se empregar no axente de correo do "
+"destinatario cando se queira gardar a parte no disco.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9771,18 +9605,15 @@ msgstr "&Descricción:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Unha descricción da parte.</p>"
-"<p>Isto é só unha descricción informativa da parte, coma o Asunto é para a "
-"mensaxe enteira. A maioría dos xestores de correos amosarán esta información "
-"nas previsualizacións das mensaxes, ao longo dos iconos dos arquivos anexos.</p>"
-"</qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
+msgstr ""
+"<qt><p>Unha descricción da parte.</p><p>Isto é só unha descricción "
+"informativa da parte, coma o Asunto é para a mensaxe enteira. A maioría dos "
+"xestores de correos amosarán esta información nas previsualizacións das "
+"mensaxes, ao longo dos iconos dos arquivos anexos.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9790,24 +9621,21 @@ msgstr "Codi&ficación:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A codificación de transporte desta parte.</p>"
-"<p>Normalmente, non se precisa cambiar isto, xa que %1 empregará a codificación "
-"por defecto, dependendo do tipo MIME. Aínda así, un pode reducir "
-"significativamente o tamaño da mensaxe resultante, p.e. se un ficheiro "
-"PostScript non contén datos binarios, senón que consiste en texto puro. Nestes "
-"casos, escoller \"citas imprimibels\" no canto do predeterminado \"base64\" "
-"reducirá nun 25% o tamaño da mensaxe."
-"<p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>A codificación de transporte desta parte.</p><p>Normalmente, non se "
+"precisa cambiar isto, xa que %1 empregará a codificación por defecto, "
+"dependendo do tipo MIME. Aínda así, un pode reducir significativamente o "
+"tamaño da mensaxe resultante, p.e. se un ficheiro PostScript non contén "
+"datos binarios, senón que consiste en texto puro. Nestes casos, escoller "
+"\"citas imprimibels\" no canto do predeterminado \"base64\" reducirá nun 25% "
+"o tamaño da mensaxe.<p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9815,21 +9643,18 @@ msgstr "Suxerir mostra &automática"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Active esta opción se vostede quere suxerir ao destinatario a mostra "
-"automática (inserida) desta parte na previsualización da mensaxe, no canto da "
-"vista predeterminada en iconas.</p>"
-"<p>Técnicamente, isto lévase a cabo estabelecendo unha etiqueta <em>"
-"Disposición-Contido</em> co valor \"inserido\" e non co valor por defecto "
-"\"anexo\", na parte da mensaxe en cuestión.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Active esta opción se vostede quere suxerir ao destinatario a mostra "
+"automática (inserida) desta parte na previsualización da mensaxe, no canto "
+"da vista predeterminada en iconas.</p><p>Técnicamente, isto lévase a cabo "
+"estabelecendo unha etiqueta <em>Disposición-Contido</em> co valor \"inserido"
+"\" e non co valor por defecto \"anexo\", na parte da mensaxe en cuestión.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9837,14 +9662,12 @@ msgstr "A&sinar esta parte"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Active esta opción se quere que se asine esta parte da mensaxe.</p>"
-"<p> A sinatura farase coa chave que asociou á identidade actualmente "
+"<qt><p>Active esta opción se quere que se asine esta parte da mensaxe.</"
+"p><p> A sinatura farase coa chave que asociou á identidade actualmente "
 "seleccionada.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9853,13 +9676,11 @@ msgstr "&Cifrar esta parte"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Active esta opción se quere que se cifre esta parte da mensaxe.</p>"
-"<p> A parte cifrarase para os destinatarios desta mensaxe</p></qt>"
+"<qt><p>Active esta opción se quere que se cifre esta parte da mensaxe.</"
+"p><p> A parte cifrarase para os destinatarios desta mensaxe</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9873,15 +9694,13 @@ msgstr "Filtro POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Atopáronse mensaxes para filtrar na conta POP:<b>%1</b>"
-"<p>As mensaxes amosadas superan o tamaño máximo que se definiu para esta conta."
-"<br>Pode escoller qué facer con elas activando o botón axeitado."
+"Atopáronse mensaxes para filtrar na conta POP:<b>%1</b><p>As mensaxes "
+"amosadas superan o tamaño máximo que se definiu para esta conta.<br>Pode "
+"escoller qué facer con elas activando o botón axeitado."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9894,8 +9713,8 @@ msgstr "Mensaxes Filtradas segundo a Regra: ningunha"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Amosar as mensaxes coincidentes cunha regra de filtrado e etiquetadas coma para "
-"'Descargar' ou 'Borrar'"
+"Amosar as mensaxes coincidentes cunha regra de filtrado e etiquetadas coma "
+"para 'Descargar' ou 'Borrar'"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10136,40 +9955,39 @@ msgstr "O cliente de correo-e para o Entorno de Escritorio K."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Obtendo Contidos dos Cartafoles</h2>"
-"<p>Por favor, agarde . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Obtendo Contidos dos Cartafoles</h2><p>Por "
+"favor, agarde . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Fóra de Liña</h2>"
-"<p>KMail está agora fóra de liña. Prema <a href=\"kmail:goOnline\">aquí</a> "
-"para se pór en liña . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Fóra de Liña</h2><p>KMail está agora fóra de "
+"liña. Prema <a href=\"kmail:goOnline\">aquí</a> para se pór en liña . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10177,18 +9995,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Benvido/a a KMail %1</h2>"
-"<p>KMail é o cliente de correo-e do Ambiente de Escritorio K. O seu deseño é "
-"totalmente compatíbel cos estándarse de correo de internet, incluindo MIME, "
-"SMTP, POP3 e IMAP.</p>\n"
-"<ul>"
-"<li>KMail ten moitas funcións pontentes descritas na <a href=\"%2\">"
-"documentación</a></li>\n"
+"<h2 style='margin-top: 0px;'>Benvido/a a KMail %1</h2><p>KMail é o cliente "
+"de correo-e do Ambiente de Escritorio K. O seu deseño é totalmente "
+"compatíbel cos estándarse de correo de internet, incluindo MIME, SMTP, POP3 "
+"e IMAP.</p>\n"
+"<ul><li>KMail ten moitas funcións pontentes descritas na <a href="
+"\"%2\">documentación</a></li>\n"
 "<li>A <a href=\"%3\">páxina de KMail</A> ofrece información sobre as novas "
 "versións de KMail</li></ul>\n"
 "%8\n"
-"<p>Algunhas das novas funcións nesta versión de KMail inclúen (comparadas con "
-"KMail %4, parte de TDE %5):</p>\n"
+"<p>Algunhas das novas funcións nesta versión de KMail inclúen (comparadas "
+"con KMail %4, parte de TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10197,30 +10014,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; O Equipo de KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
 "<p>Por favor, adique un momento para encher o panel de configuración en "
 "Opcións-&gt;Configurar KMail.\n"
-"Precisa crear ao menos unha identidade predeterminada e unha conta entrante así "
-"coma tamén saínte.</p>\n"
+"Precisa crear ao menos unha identidade predeterminada e unha conta entrante "
+"así coma tamén saínte.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Mudanzas importantes</span> "
-"(comparadas con KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Mudanzas importantes</"
+"span> (comparadas con KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10251,13 +10066,14 @@ msgstr "Ver Ficheiro Anexo: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: O ficheiro anexo contén datos binarios. Tentando amosar o primeiro "
 "carácter.]\n"
-"[KMail: O ficheiro anexo contén datos binarios. Tentando amosar os primeiros %n "
-"caracteres.]"
+"[KMail: O ficheiro anexo contén datos binarios. Tentando amosar os primeiros "
+"%n caracteres.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10282,12 +10098,14 @@ msgstr "¿Abrir Anexo?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10309,6 +10127,58 @@ msgstr "(coincida con calquera do seguinte)"
 msgid "(match all of the following)"
 msgstr "(coincida con todo o seguinte)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lida"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Vella"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Borrada"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Respostada"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Reenviada"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Na Fila"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Enviada"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Ollada"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Correo Lixo"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "A Se Facer"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Ten Anexo"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10388,26 +10258,26 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Erro crítico: Imposíbel procesar o correo enviado (¿carente de espacio?)Fallo "
-"ao mover a mensaxe ao cartafol de \"enviado\"."
+"Erro crítico: Imposíbel procesar o correo enviado (¿carente de "
+"espacio?)Fallo ao mover a mensaxe ao cartafol de \"enviado\"."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Movendo a mensaxe enviada \"%1\" dende o cartafol de \"saída\" ó de \"enviado\" "
-"fallou.\n"
-"As posibeis racións son a carencia de espacio ou os permisos de escritura. Por "
-"favor, tente arranxar o problema e mova a mensaxe manualmente."
+"Movendo a mensaxe enviada \"%1\" dende o cartafol de \"saída\" ó de \"enviado"
+"\" fallou.\n"
+"As posibeis racións son a carencia de espacio ou os permisos de escritura. "
+"Por favor, tente arranxar o problema e mova a mensaxe manualmente."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Non é posíbel enviar as mensaxes sen especificar o enderezo dun remitente.\n"
 "Por favor, estabeleza o enderezo de correo da identidade %1 na sección de "
@@ -10436,8 +10306,8 @@ msgstr "Iniciando o proceso de evío..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Escolleu que se enviara todo o correo na fila empregando o transporte sen "
 "cifrar, ¿quere continuar?"
@@ -10464,15 +10334,16 @@ msgstr "Fallo ao enviar (algunhas) mensaxes en agarde."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Envío detido:\n"
 "%1\n"
-"A mensaxe agardará no cartafol de 'saída' ata que se arranxe o problema (p.e. o "
-"enderezo incorrecto) ou se borre a mensaxe do cartafol de 'saída'.\n"
+"A mensaxe agardará no cartafol de 'saída' ata que se arranxe o problema (p."
+"e. o enderezo incorrecto) ou se borre a mensaxe do cartafol de 'saída'.\n"
 "Empregouse o seguinte protocolo de transporte:\n"
 "  %2"
 
@@ -10482,20 +10353,16 @@ msgstr "Envío abortado."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Fallou o envío:</p>"
-"<p>%1</p>"
-"<p>A mensaxe agardará en 'saída' ata que se arranxe o problema (p.e. un "
-"enderezo incorrecto) ou se borre a mensaxe do cartafol de 'saída'.</p>"
-"<p>Empregouse o seguinte protocolo de transporte: %2</p>"
-"<p> ¿Quere continuar a enviar as mensaxes que quedan?</p>"
+"<p>Fallou o envío:</p><p>%1</p><p>A mensaxe agardará en 'saída' ata que se "
+"arranxe o problema (p.e. un enderezo incorrecto) ou se borre a mensaxe do "
+"cartafol de 'saída'.</p><p>Empregouse o seguinte protocolo de transporte: "
+"%2</p><p> ¿Quere continuar a enviar as mensaxes que quedan?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10513,15 +10380,16 @@ msgstr "&Abortar o Envío"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Envío fallido:\n"
 "%1\n"
-"A mensaxe agardará no cartafol de 'saída' ata que se arranxe o problema (p.e. o "
-"enderezo incorrecto) ou se borre a mensaxe do cartafol de 'saída'.\n"
+"A mensaxe agardará no cartafol de 'saída' ata que se arranxe o problema (p."
+"e. o enderezo incorrecto) ou se borre a mensaxe do cartafol de 'saída'.\n"
 "Empregouse o seguinte protocolo de transporte:\n"
 "  %2"
 
@@ -10562,43 +10430,43 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 aínda semella estarse a executar en outra pantalla desta máquina. Executar "
-"%2 máis dunha vez pode causar a perda de correo. Debería non iniciar %1 "
-"alomenos que estea segura/o de que non se está xa a se executar."
+"%1 aínda semella estarse a executar en outra pantalla desta máquina. "
+"Executar %2 máis dunha vez pode causar a perda de correo. Debería non "
+"iniciar %1 alomenos que estea segura/o de que non se está xa a se executar."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 semella estarse a executar noutra pantalla desta máquina. Executar %1 e %2 "
-"ao mesmo tempo pode causar a perda de correo. Debería non iniciar %2 alomenos "
-"que esta segura/o de que %1 non se está a executar."
+"%1 semella estarse a executar noutra pantalla desta máquina. Executar %1 e "
+"%2 ao mesmo tempo pode causar a perda de correo. Debería non iniciar %2 "
+"alomenos que esta segura/o de que %1 non se está a executar."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 semella a estarse a executar en %2. Executar %1 máis dunha vez pode causar a "
-"perda de correo. Debería non iniciar %1 neste ordenador alomenos que esta "
-"segura/o de que non se está a executar en %2."
+"%1 semella a estarse a executar en %2. Executar %1 máis dunha vez pode "
+"causar a perda de correo. Debería non iniciar %1 neste ordenador alomenos "
+"que esta segura/o de que non se está a executar en %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 semellla estarse a executar en %3. Executar %1 e %2 ao mesmo tempo pode "
-"causar a perda de correo. Non debería iniciar %2 neste ordenador alomenos que "
-"estea segura/o de que %1 non se está a executar en %3."
+"causar a perda de correo. Non debería iniciar %2 neste ordenador alomenos "
+"que estea segura/o de que %1 non se está a executar en %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10609,6 +10477,10 @@ msgstr "Iniciar %1"
 msgid "Exit"
 msgstr "Saír"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Novas Mensaxes En"
@@ -10635,12 +10507,13 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"Non está dispoñíbel TDEWallet. Recoméndase empregar TDEWallet para xestionar os "
-"contrasinais.\n"
+"Non está dispoñíbel TDEWallet. Recoméndase empregar TDEWallet para xestionar "
+"os contrasinais.\n"
 "Porén, KMail pode gravar o contrasinal no seu ficheiro de configuración. O "
 "contrasinal gárdase nun formato oculto, pero non se debería considerar "
 "totalmente seguro de non ser descifrado unha vez alguén teña acceso a dito "
@@ -10703,8 +10576,8 @@ msgstr "O nome de dominio ou o enderezo numérico do servidor SMTP."
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
 msgstr ""
-"O número de porto no que está a escoitar o servidor SMTP. O porto por defecto é "
-"25."
+"O número de porto no que está a escoitar o servidor SMTP. O porto por "
+"defecto é 25."
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10716,8 +10589,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "Un comando para executar localemente, previo ao envío de correo. Isto pode "
-"empregarse para estabelecer túneles ssh, por exemplo. Déixeo en branco se non "
-"quere que se executo ningún programa."
+"empregarse para estabelecer túneles ssh, por exemplo. Déixeo en branco se "
+"non quere que se executo ningún programa."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10725,8 +10598,8 @@ msgstr "O servidor &require autenticación"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Active esta opción se o seu servidor SMTP require autentificación antes de "
 "aceptar o correo. Isto coñécese coma 'SMTP Autenticado' ou simplemente ASMTP."
@@ -10749,15 +10622,14 @@ msgstr "En&viar nome de máquina personalizado ao servidor"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Active esta opción para que KMail empregue un nome de máquina personalizado "
-"cando se identifique a si mesmo co servidor de correo."
-"<p>Isto é útil cando o nome de máquina do seu sistema pode non estar posto "
-"correctamente ou cando se quere enmascarar o nome verdadeiro."
+"cando se identifique a si mesmo co servidor de correo.<p>Isto é útil cando o "
+"nome de máquina do seu sistema pode non estar posto correctamente ou cando "
+"se quere enmascarar o nome verdadeiro."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10767,8 +10639,8 @@ msgstr "N&ome do Servidor:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Entre o nome de máquina que KMail debe empregar cando se identifique a simesmo "
-"no servidor."
+"Entre o nome de máquina que KMail debe empregar cando se identifique a "
+"simesmo no servidor."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10788,8 +10660,8 @@ msgstr "Só se permiten ficheiros locais."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "O campo Servidor non pode estar baleiro. Por favor, introduza o nome ou o "
 "enderezo IP do servidor SMTP."
@@ -10804,10 +10676,10 @@ msgstr "Erro mentres se listaba o cartafol %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10879,8 +10751,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail non foi quen de detectar unha lista de correo neste cartafol. Por favor, "
-"encha os enderezos manualmente."
+"KMail non foi quen de detectar unha lista de correo neste cartafol. Por "
+"favor, encha os enderezos manualmente."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -11029,35 +10901,27 @@ msgstr "&Editar Mensaxe"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A información devolta polo plugin Crypto non puido ser procesada "
-"correctamente; o plug-in podería estar danado.</p>"
-"<p>Por favor, contacte co administrador do seu sistema.</p></qt>"
+"<qt><p>A información devolta polo plugin Crypto non puido ser procesada "
+"correctamente; o plug-in podería estar danado.</p><p>Por favor, contacte co "
+"administrador do seu sistema.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Non se atopou un Plug-In Crypto activo e o programa OpenPGP non se executou "
-"satisfactoriamente.</p>"
-"<p>Vostede pode facer dúas cousas para remedialo:</p>"
-"<ul>"
-"<li><em> Ou</em>activa o Plug-In mediante Opcións->Configurar KMail->"
-"Diálogo Plug-In.</li>"
-"<li><em> Ou</em>especifica as opcións tradicionais de OpenPGP no diálogo de "
-"Identidade->Avanzado.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Non se atopou un Plug-In Crypto activo e o programa OpenPGP non se "
+"executou satisfactoriamente.</p><p>Vostede pode facer dúas cousas para "
+"remedialo:</p><ul><li><em> Ou</em>activa o Plug-In mediante Opcións-"
+">Configurar KMail->Diálogo Plug-In.</li><li><em> Ou</em>especifica as "
+"opcións tradicionais de OpenPGP no diálogo de Identidade->Avanzado.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11069,19 +10933,19 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"O manexador de chiasmus non ofrece a función \"x-encrypt\". Por favor, informe "
-"deste erro."
+"O manexador de chiasmus non ofrece a función \"x-encrypt\". Por favor, "
+"informe deste erro."
 
 #: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"A opción \"x-encrypt\" non aceptou os parámetros que se agardaban. Por favor, "
-"informe deste erro."
+"A opción \"x-encrypt\" non aceptou os parámetros que se agardaban. Por "
+"favor, informe deste erro."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11089,20 +10953,20 @@ msgstr "Erro de Cifraxe de Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Valor de retorno non agardado dende o manexador de Chiasmus. A función "
-"\"x-encrypt\" non devolveu unha cadea de bites. Por favor, informe deste erro."
+"Valor de retorno non agardado dende o manexador de Chiasmus. A función \"x-"
+"encrypt\" non devolveu unha cadea de bites. Por favor, informe deste erro."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"O formato de mensaxe cifrada internamente de OpenPGP non atura a cifraxe ou o "
-"asinamento de anexos.\n"
+"O formato de mensaxe cifrada internamente de OpenPGP non atura a cifraxe ou "
+"o asinamento de anexos.\n"
 "Quere realmente usar o OpenPGP desaprobado?"
 
 #: messagecomposer.cpp:640
@@ -11123,8 +10987,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"O exame das preferencias de asinamento do destinatario resultaron en que se lle "
-"pregunte se quere ou non asinar esta mensaxe.\n"
+"O exame das preferencias de asinamento do destinatario resultaron en que se "
+"lle pregunte se quere ou non asinar esta mensaxe.\n"
 "Asinar esta mensaxe?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11154,8 +11018,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Solicitou asinar a mensaxe, pero non se configuraron chaves de asinado válidas "
-"para esta identidade."
+"Solicitou asinar a mensaxe, pero non se configuraron chaves de asinado "
+"válidas para esta identidade."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11172,7 +11036,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Algunhas partes desta mensaxe non se asinarán.\n"
-"Enviar mensaxes só parcialmente asinadas podería violar a política do sitio.\n"
+"Enviar mensaxes só parcialmente asinadas podería violar a política do "
+"sitio.\n"
 "Asinar tódalas partes no seu canto?"
 
 #: messagecomposer.cpp:827
@@ -11212,8 +11077,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "O exame das preferencias de cifraxe do/a destinatario/a concluiu que debería "
@@ -11250,12 +11115,13 @@ msgstr "&Non Cifrar"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Solicitou a cifraxe desta mensaxe, e cifrar unha copia para si mesmo, pero non "
-"se configuraron unhas chaves de cifrado válidas e autentificadas para esta "
-"identidade."
+"Solicitou a cifraxe desta mensaxe, e cifrar unha copia para si mesmo, pero "
+"non se configuraron unhas chaves de cifrado válidas e autentificadas para "
+"esta identidade."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11264,8 +11130,8 @@ msgstr "Enviar Sen Cifrar?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Algunhas partes desta mensaxe non se cifrarán.\n"
@@ -11281,8 +11147,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Esta mensaxe non se cifrará.\n"
-"O envío de mensaxes sen cifrar podería violar a política do sitio e/ou deixar "
-"ao descuberto información sensíbel.\n"
+"O envío de mensaxes sen cifrar podería violar a política do sitio e/ou "
+"deixar ao descuberto información sensíbel.\n"
 "Cifrar as mensaxes no seu canto?"
 
 #: messagecomposer.cpp:955
@@ -11293,62 +11159,58 @@ msgstr "&Cifrar Tódalas Partes"
 msgid "Unencrypted Message Warning"
 msgstr "Advertencia de Ausencia de Cifraxe"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Erro: o manexador non devolveu ningún dato codificado.</p>"
-"<p>Por favor, informe deste erro:"
-"<br>%2</p></qt>"
+"<qt><p>Erro: o manexador non devolveu ningún dato codificado.</p><p>Por "
+"favor, informe deste erro:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Non tódolos caracteres tiveron cabida na codificación escollida."
-"<br>"
-"<br>¿Enviar esta mensaxe de calquera modo?</qt>"
+"<br><br>¿Enviar esta mensaxe de calquera modo?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Perderanse algúns caracteres"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Perder caracteres"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Mudar Codificación"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Esta mensaxe non se puido asinar, xa que o mecanismo escollido non semella "
-"aturar o asinado; isto non debería pasar realmente, por favor, informe do erro."
+"aturar o asinado; isto non debería pasar realmente, por favor, informe do "
+"erro."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Esta mensaxe non se puido asinar, xa que o mecanismo escollido non semella "
-"aturar o asinado; isto non debería pasar realmente, por favor, informe do erro."
+"aturar o asinado; isto non debería pasar realmente, por favor, informe do "
+"erro."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
@@ -11356,28 +11218,29 @@ msgstr ""
 "Fallou a operación de asinamento. Por favor, cerciórese de que o programa "
 "gpg-agent está executándose."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Esta mensaxe non se puido cifrar, xa que o mecanismo escollido non semellla "
 "aturar a cifraxe; isto non debería pasar, realmente; por favor, informe do "
 "erro."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Esta mensaxe non se puido asinar ou cifrar, xa que escoller un mecanismo que "
-"non semella aturar o cifraxe e asinamento combinados; isto non debería pasar, "
-"por favor, informe deste erro."
+"non semella aturar o cifraxe e asinamento combinados; isto non debería "
+"pasar, por favor, informe deste erro."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11398,15 +11261,15 @@ msgstr "Formato do &Mailbox:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Escolla se quere gravar as mensaxes neste cartafol coma un ficheiro por mensaxe "
-"(maildir) ou coma un único grande ficheiro (mbox). KMail emprega maildir por "
-"defecto e só precisa mudar isto en circunstancias excepcionais. Se non está "
-"seguro/a, deixe isto como está."
+"Escolla se quere gravar as mensaxes neste cartafol coma un ficheiro por "
+"mensaxe (maildir) ou coma un único grande ficheiro (mbox). KMail emprega "
+"maildir por defecto e só precisa mudar isto en circunstancias excepcionais. "
+"Se non está seguro/a, deixe isto como está."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11415,13 +11278,13 @@ msgstr "O cartafol &contén:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Escolla se quere que o novo cartafol sexa empregado para o almaceamento de "
-"correo ou para o almaceamento de elementos de traballo en grupo coma tarefas e "
-"notas. A opción por defecto é para correo. Se non está segura/o, deixe esta "
-"opción coma está."
+"correo ou para o almaceamento de elementos de traballo en grupo coma tarefas "
+"e notas. A opción por defecto é para correo. Se non está segura/o, deixe "
+"esta opción coma está."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11459,8 +11322,7 @@ msgstr "Diferentes resultados para as sinaturas"
 msgid "The crypto engine returned no cleartext data."
 msgstr "O mecanismo de cifraxe non devolveu os datos en claro."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Estado: "
 
@@ -11489,11 +11351,11 @@ msgstr "Non se atopou o plug-in %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"A mensaxe está asinada, pero a validez da sinatura non se pode verificar. <br />"
-"Razón: %1"
+"A mensaxe está asinada, pero a validez da sinatura non se pode verificar. "
+"<br />Razón: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11529,27 +11391,28 @@ msgstr "O plug-in de cifraxe \"%1\" non pode descifrar mensaxes."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b> Esta mensaxe HTML podería conter referencias externas a imaxes e "
-"outras cousas. Por racións de seguridade/intimidade non se han de cargar as "
-"referencias externas. Se confía no remitente da mensaxes pode entón cargar as "
-"referencias externas desta mensaxes premendo <a href=\"kmail:loadExternal\">"
-"aquí</a>."
+"<b>Nota:</b> Esta mensaxe HTML podería conter referencias externas a imaxes "
+"e outras cousas. Por racións de seguridade/intimidade non se han de cargar "
+"as referencias externas. Se confía no remitente da mensaxes pode entón "
+"cargar as referencias externas desta mensaxes premendo <a href=\"kmail:"
+"loadExternal\">aquí</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b> Ésta é unha mensaxe HTML. Por racións de seguridade, só se amosa o "
-"código HTML. Se confía no remitente da mensaxe, pode activar o formato real "
-"HTML para esta mensaxe <a href=\"kmail:showHTML\">premendo aquí</a>."
+"<b>Nota:</b> Ésta é unha mensaxe HTML. Por racións de seguridade, só se "
+"amosa o código HTML. Se confía no remitente da mensaxe, pode activar o "
+"formato real HTML para esta mensaxe <a href=\"kmail:showHTML\">premendo "
+"aquí</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11805,11 +11668,11 @@ msgstr "gardado: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Non se garda ningún enderezo no %1 empregado para asinar, así que non se pode "
-"comparar co enderezo do remitente %2."
+"Non se garda ningún enderezo no %1 empregado para asinar, así que non se "
+"pode comparar co enderezo do remitente %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11925,13 +11788,15 @@ msgstr "Mensaxe de Erro de Kioslave"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "A seu servidor POP3 non atura o comando UIDL; este comando requírese para "
-"determinar cales dos correos no servidor KMail xa ten visto noutro  momento.\n"
+"determinar cales dos correos no servidor KMail xa ten visto noutro  "
+"momento.\n"
 "A posibilidade de deixa-los correos no servidor,polo tanto,  non funcionará "
 "axeitadamente."
 
@@ -11953,7 +11818,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Descargando mensaxe %1 de %2 (%3 de %4 KB) para %5@%6 (perduran %7 KB no "
 "servidor)."
@@ -11972,1878 +11838,14 @@ msgstr "Resposta inválida dende o servidor"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"O seu servidor non soporta o comando TOP. Polo tanto non se pode descarga-las "
-"cabeceiras de correos grandes antes de baixalos completamente."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Ir"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Cartaf&ol"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mensaxe"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Resposta especial"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Reenviar"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barra de Ferramentas HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Asinado"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Asinar automáticamente as mensa&xes"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Cando se habilita esta opción, todas as mensaxes que se envían asínanse por "
-"defecto. Non obstante, sempre pode deshabilita-la firma individualmente en cada "
-"mensaxe."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Cifraxe"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Cando se habilita esta opción, o ficheiro/mensaxe non se cifrará só coa chave "
-"pública do destinatario, senón que tamén coa súa chave propia. Isto "
-"posibilitará que vostede poida descifrar a mensaxe/ficheiro na posterioridade. "
-"É xeralmente unha boa idea."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Amosar texto a&sinado/cifrado despois da edición"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Cando se habilita esta opción, o texto asinado/cifrado amosarase nunha fiestra "
-"separada, posibilitando que poida saber o resultado antes do envío. Isto é unha "
-"boa idea cando se quere verificar que o sistema de cifrado funciona."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Gravar as mensaxes enviadas ci&fradas"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Active isto para gardar as mensaxes de modo cifrado "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gravar as Mensaxes Cifradas</h1>\n"
-"Cando se activa esta caixa, as mensaxes se gardan dun modo cifrado tal e como "
-"se mandan. Non se recomenda, xa que non será quen de ler as mensaxes "
-"posteriormente se un certificado preciso caduca.\n"
-"<p>\n"
-"Porén, podería haber motivacións para activar esta opción. En caso de dúbida, "
-"fáleo co seu administrador local.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Amosar sempre as chaves de cifrado &para a aprobación"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Cando se habilita esta opción, a aplicación amosará sempre unha lista das "
-"chaves públicas que pode escoller para a cifraxe. Se non se activa isto, a "
-"aplicación só amosará o diálogo se non se pode atopar a chave correcta ou se "
-"hai varias que se poden empregar."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Cifrar automáticamente tódalas mensaxes &sempre que se poida"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Cando se habilita esta opción, todas as mensaxes que se envían encríptanse por "
-"defecto se é posíbel desexábel. Non obstante, sempre pode deshabilitar a firma "
-"individualmente para cada mensaxe."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nunca asinar/cifar cando se &garde coma borrador"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Como funciona isto?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Para: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universal"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Respostar"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Respostar a Todos"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Reenviar"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Ata&llo:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Tipo de &plantel:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Propiedades do Cartafol"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "O cartafol alberga unha lista de &correo"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Endere&zo da lista:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Non L&idas:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Caducidade das Mensaxes"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Caducar despois de:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Caducar mens&axes lidas"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Caducar despois d&e:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Caducar mensa&xes non lidas"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Día(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Semana(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mes(es)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avanzado"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identidade do &Remitente:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Formato de Almacenamento:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Visor de lista:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validar certificados empregando CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Se se escolle esta opción, os certificados S/MIME valídanse empregando as "
-"Listas de Revocación de Certificados (CRLs)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validar os certificados en liña (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Se se selecciona esta opción, os certificados S/MIME valídanse en liña "
-"empregand o Protocolo de Estado Enliña de Certificados (OCSP). Encha a URL do "
-"OCSP embaixo."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Validación do Certificado En Liña"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL do OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Introduza o enderezo do servidor para a validación en liña de certificados "
-"(OCSP). A URL comeza a cotío con http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "URL do repetidor OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorar URL do servicio de certificados"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Non comprobar política dos certificados"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Por defecto, GnuPG emprega o ficheiro ~/.gnupg/policies.txt para comprobar se "
-"unha politica de certificados está aturada. Se se selecciona esta opción, non "
-"se comprobarán as políticas."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nunha consultar un CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Se se activa esta opción, as Listas de Revocación de Certificados non se "
-"empregarán nunca para validar certificados S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Obter certificados de expendedores non atopados"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Se se activa esta opción, os certificados de expendedores non atopados se "
-"obteñen cando sexa preciso (isto se aplica tamén aos méotodos de validación, "
-"CRLs e OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Solicitudes HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Non efectuar ningunha solicitude HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Deshabilita comletamente o uso de HTTP ou S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Empregar este proxy para solicitudes HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Empregar o proxy HTTP do sistema:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Se se selecciona esta opción, o valor do proxy HTTP amosado na dereita (que "
-"provén da variábel de ambiente http_proxy) se empregará para calquera "
-"solicitude HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Insira aquí a localización do seu proxy HTTP, que se empregará para todas as "
-"solicitudes HTTP relativas a S/MIME. A sintaxe é servidor:porto, por exemplo "
-"meuproxy.sitio.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorar punto de distribución de certificados HTTP CRL"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Cando se procura pola localización dun CRL, o certificado a ser comprobado "
-"contén normalmente o que se coñecen como entradas \"Punto de Distribución CRL\" "
-"(DP), que son URLs que describen o xeito de acceder á URL. Úsase a primeira "
-"entrada DP atopada.  Con esta opción, todas as entradas que usen o esquema HTTP "
-"ignóranse cando se procure por un DP axeitado."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Solicitudes LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Non efectuar ningunha solicitude LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Deshabilita completamente o uso de LDAP para S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorar punto de distribución CRL de LDAP dos certificads"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Cando se procura pola localización dun CRL, o certificado a ser comprobado "
-"contén normalmente o que se coñecen como entradas \"Punto de Distribución CRL\" "
-"(DP), que son URLs que describen o xeito de acceder á URL. Úsase a primeira "
-"entrada DP atopada.  Con esta opción, todas as entradas que usen o esquema LDAP "
-"ignóranse cando se procure por un DP axeitado."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Servidor primario para solicitudes LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Se insire aquí un servidor LDAP todas as solicitudes LDAP van primeiro a este "
-"servidor. Máis precisamente, a opción sobrescribe calquera servidor e porto "
-"especificado na parte da URL LDAP e tamén empregarase se o servidor e porto se "
-"omiten da URL. Os outros servidores LDAP usaranse só se a conexión ao \"proxy\" "
-"falla.\n"
-"A sintaxe é \"SERVIDOR\" ou \"SERVIDOR:PORTO\". Se se omite o porto, úsase o "
-"porto 389 (porto LDAP estándar)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "Eng&adir..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Restabelecer Opcións da Tipografía"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"O seu servidor non soporta o comando TOP. Polo tanto non se pode descarga-"
+"las cabeceiras de correos grandes antes de baixalos completamente."
 
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "sen límite"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Configuración de Planteis"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Respostar ao Remitente"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Respostar a Todos / Respostar á Lista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Mensaxe Reenviada"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Advertir cando se tente enviar mensaxes &non asinadas"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Activar para ser advertido cando se envien mensaxes non asinadas."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir Cando Se Envien Mensaxes Non Asinadas</h1>\n"
-"Se se activa esta caixa, será advertido cando tente enviar partes ou mensaxes "
-"enteiras sen asinar.\n"
-"<p>\n"
-"Recoméndase deixar esta opción activada para unha integridade máxima.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Ad&vertir cando se tente enviar unha mensaxe non cifrada"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Activar para ser advertido cando se tente enviar mensaxes non encriptadas."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir Cando se Tente Enviar Mensaxes Non Cifradas</h1>\n"
-"Se se activa esta caixa, advertiráselle cando tente enviar partes ou mensaxes "
-"completas non encriptadas.\n"
-"<p>\n"
-"Recoméndase deixar esta opción activada para unha integridade máxima.\n"
-"</q>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Advertir se o Enderezo de Correo-e do Destinatario &Non se Atopa no Certificado"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Activar para ser advertido se o enderezo non se atopa no certificado"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir se o Enderezo de Correo do Destinatario Non Está no "
-"Certificado</h1>\n"
-"Se se activa esta opción, amosarase unha advertencia cando o enderezo do "
-"receptor non se atopa no certificado empregado para o cifrado.\n"
-"<p>\n"
-"Recoméndase deixar esta opción activada para unha seguridade máxima.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Advertir se un certificado/chave caduca cedo (configurar o umbral embaixo)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Para asinar"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Para a cifraxe"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " días"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Escolla o número de días aquí"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir Se Certificado de Sinatura Caduca</h1>\n"
-"Escolla o número mínimo de días nose que o certificado de asinar debe ser "
-"válido sen amosar unha advertencia.\n"
-"<p>\n"
-"A opción SPHINX recomendada é de 14 días.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir se Certificado de Cifraxe Caduca</h1>\n"
-"Escolla o número mínimo de días nos cales o certificado de cifraxe debería ser "
-"apto sen necesidade de advertir.\n"
-"<p>\n"
-"A opción SPHINX recomendada é de 14 días.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir se un Certificado na Cadea Caduca</h1>\n"
-"Escolla o número mínimo de días nos que tódolos certificados na cadea deberían "
-"ser válidos sen dar unha advertencia.\n"
-"<p>\n"
-"A opción SPHINX recomendada é de 14 días.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir Se Certificado CA Caduca</h1>n Escolla o número mínimo de días nos "
-"que o certificado CA debe ser válido osen que se produza unha advertencia.\n"
-"<p>\n"
-"A opción recomendada SPHINX é de 14 días.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Advertir Se Certificado Raíz Expira</h1>\n"
-"Escolla o número mínimo de días nos que o certificado raíz é válido sen que se "
-"produza unha advertencia.\n"
-"<p>\n"
-"A opción recomendada SPHINX é de 14 días.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Para certificados raíz:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Para certificados intermediario de CA:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Para certificados/chaves do usuario final:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Rehabilitar Todas as Advertencias \"Non Preguntar de Novo\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Contido do plantel"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Atallo do plantel"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Tipo de plantel"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Enviar correo na lista cando se comprobe o correo"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Escolla se quere que KMail envíe todas as mensaxes do bución de saída nas "
-"comprobacións manuais de correo ou en todas as comprobacións, ou doutro xeito, "
-"se non quere que as mensaxes se envíen automaticamente. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Hai novas mensaxes neste cartafol, que non se subiron ao servidor aínda, "
-"mais semella que non ten permisos de acceso suficientes no cartafol aos que os "
-"quere subir. Por favor, contacte co seu administrador para lle aturar a subida "
-"destas novas mensaxes, ou móvaas fóra deste cartafol.</p> "
-"<p>Quere mover agora estas mensaxes a outro cartafol?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"O cartafol usado máis recentemente no diálogo de selección de cartafoles."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Política para amosar a icona na bandexa do sistema"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Notificación informativa de correo novo"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Se se habilita esta opción, amósase na notificación de correo novo o número de "
-"novas mensaxes en cada cartafol; doutro xeito, só terá unha mensaxe sinxela "
-"dicindo 'Chegou novo correo'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Estabelecer e&ditor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Empregar editor e&xterno no canto do editor propio"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Habilitar a funcionalidade groupware"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Xestionar cabeceiras De:/Para: nas respostas a respostas"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook ten un número de defectos na súa implementación do estándar "
-"iCalendar; esta opción traballa sobre un deles. Se ten problemas cos usuarios "
-"de Outlook que non son quen de obter as súas respostas, tente activar esta "
-"opción."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-"Microsoft Outlook ten un número de defectos na súa implementación do estándar "
-"iCalendar; esta opción traballa sobre un deles. Se ten problemas cos usuarios "
-"de Outlook que non son quen de obter as súas respostas, tente activar esta "
-"opción.Enviar"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook ten un número de defectos na súa implementación do estándar "
-"iCalendar; esta opción traballa sobre un deles. Se ten problemas cos usuarios "
-"de Outlook que non son quen de obter as súas invitacións, tente activar esta "
-"opción."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Envio automático de invitacións"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Cando se activa, non verá a fiestra de edición da mensaxe. No seu lugar, "
-"envíanse automaticamente todos os correos de invitación. Se quere ver o correo "
-"antes de envalo, pode desactivar esta opción. Porén, sexa consciente de que o "
-"texto na fiestra de edición da mensaxe está en sintaxe iCalendar, e non debería "
-"polo tanto tentar modificalo manualmente."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Habilitar isto fai posíbel almacenar as entradas das aplicacións de Kpntact "
-"(KOrganizer, KAddressBook e KNotes.).</p>"
-"<p>Se quere activar esta opción deberá tamén facer que as aplicacións empregue "
-"o recurso IMAP; isto faise no Centro de Control de TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalmente non terá ningunha razón para ver os cartafoles que conteñen os "
-"recursos IMAP. Pero se precisa velos, pode poñer iso aquí.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Escolla o formato de almacenamento dos cartafoles de traballo en grupo. "
-"<ul>"
-"<li>O formato por defecto é empregar os estándares ical (para cartafoles de "
-"calendario) e vcard (para cartafoles de cadernos de enderezos). Este formato "
-"pon dispoñibeis todas as funcións de Kontact.</li>"
-"<li>O formato XML de Kolab usa un modelo personalizado que semella máis a o "
-"empregado en Outlook. este formato fornece unha mellor compatibilidade con "
-"Outlook, cando se use un servidor Kolab ou unha solución compatíbel.</li></ul>"
-"</p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Iso escolle o cartafol pai dos cartafoles de recursos IMAP.</p>"
-"<p>Por defecto o servidor Kolab define a Entrada IMAP como o pai.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Ésta é a identificación da conta que posúe os cartafoles de recursos "
-"IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Se quere configurar os nomes dos cartafoles do almacenamento IMAP á súa "
-"lingua preferida, pode escoller entre estas linguas dispoñibeis.</p>"
-"<p> Por favor, note que a única razón para facer isto é para a compatibilidade "
-"con Microsoft Outlook. Considérase unha mala idea configurar isto, xa que "
-"prohíbese así a mudanza da lingua. </p>"
-"<p>Así que non poña isto a menos que o teña que facer.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Este valor emprégase para decidir se se debe amosar a Introdución a KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Número máximo de conexións por servidor"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Isto se pode empregar para restrinxir o número de conexións por servidor "
-"mentres se comproba por correo novo. Por defecto, o número de conexións está "
-"sen limitar (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Amosar a liña de procura rápida"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Esta opción habilita ou deshabilita a liña de procura rápida enriba da lista de "
-"mensaxes que se pode empregar para procurar axiña por información amosada na "
-"lista de mensaxes."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"&Manter se é posíbel a codificación orixinal cando se resposte ou se reenvíe"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Asinar a&utomáticamente"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Lembrar esta identidade, de xeito que se empregue no futuro nas fiestras de "
-"edición.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Lembrar este cartafol para elementos enviados, de xeito que se empregue nas "
-"futuras fiestras de edición."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Lembrar este transporte de correo, de xeito que se empregue nas futuras "
-"fiestras de edición."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Lembrar esta identidade, de xeito que se empregue no futuro nas fiestras de "
-"edición.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Axuste de pala&bras na columna:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Advertir se un certificado raíz caduca en &menos de:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Acenda esta opción para facer que Outlook(tm) comprenda nomes de anexos que "
-"conteñan caracteres non ingleses"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Pedir automáticamen&te notificacións de disposición das mensaxes"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Habilite esta opción se quere que KMail pida Notificacións da Disposición "
-"das Mensaxes (MDNs) para cada unha das mensaxes saíntes. "
-"<p>"
-"<p>Esta opción só afecta ao predeterminado; sempre pode habilitala ou "
-"deshabilitala no editor, no elemento do menú <em>Opcións</em>-><em> "
-"Pedir Notificación de Disposición</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Empregar enderezos recentes para autocompletado"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Deshabilite esta opción se non quere que se amosen os enderezos recentemente "
-"usados na lista de autocompletado dos campos de enderezo da fiestra de edición "
-"de mensaxes."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Intervalo de autogravado:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Pódese crear regularmente unha copia de seguridade do texto da fiestra de "
-"edición. O intervelo empregado para crear as copias de seguridade estabelécese "
-"aquí. pode deshabilitar o auto-gravado estabelecendo o valor a 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Substituir o prefi&xo recoñecido por \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Substituir o prefixo recoñecido con \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Empregar citado inteli&xente"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "A sinatura caducou."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tipo de selector de enderezos"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Define o tipo de diálogo para seleccionar destinatarios,\n"
-"        CC e BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Editor de tipos de destinatarios"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Estabelece o tipo de diálogo de selección de destinatarios,\n"
-"        CC e BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Número máximo de liñas de destinatario no editor."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"&Manter se é posíbel a codificación orixinal cando se resposte ou se reenvíe"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Algúns correos-e, especialmente aqueles xerados automaticamente, non "
-"especifican a codificación de caracteres que precisan usar para amosarse "
-"axeitadamente. Neses casos emprégase a codificación de caracteres predefinida, "
-"que se pode configurar aquí. Póñao na codificación de caracteres máis empregada "
-"na súa rexión. Empréguase por defecto a configuración xeral do sistema."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Se muda o valor orixinal 'Automático' forzarase o emprego da codificación "
-"específica para todos os correos-e, omitindo o que eles mesmos especifiquen."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Habilite isto se quere que os sorrisos coma :-) se amosen no texto de mensaxe "
-"sendo remprazados por emoticonas (pequeniñas imaxes)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Habilite esta opción para amosar os diferentes niveis de citas textuais. "
-"Deshabilítea para agochar os niveis de citas texuais."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Colapsar automaticamente o nivel:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reducir o tamaño da fonte para o texto citado"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Habilite esta opción para amosar as citas textuais cunha tipografía máis "
-"pequena"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Gravar as mensaxes enviadas ci&fradas"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Amosar se é correo &lixo ou non en cabeceiras decorativas"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Enviar Notificacións da Disposición da Mensaxe cun remitente baleiro."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Enviar Notificacións de Disposición das Mensaxes cunha cadea de remitente "
-"baleira. Algúns servidores poden estaren configurados para rexeitar este tipo "
-"de mensaxes, así que se está a experimentar problemas enviando MDNs, desactive "
-"esta opción."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Convertíronse as frases a planteis"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "As frases vellas convertíronse a planteis"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Lista de Mensaxes - Novas Mensaxes"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Plantel de mensaxe para as respostas"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Plantel de mensaxe para as respostas a todos"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Plantel de mensaxe para os reenvíos"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Engadir Caracteres de &Cita"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13954,6 +11956,11 @@ msgstr "Engadir como CC"
 msgid "Add as BCC"
 msgstr "Engadir como BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "C&ancelar"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13969,13 +11976,13 @@ msgstr "Destinatarios Seleccionados"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Seleccionou 1 receptor. O número máximo de receptores é %1. Por favor, adapte a "
-"selección.\n"
+"Seleccionou 1 receptor. O número máximo de receptores é %1. Por favor, "
+"adapte a selección.\n"
 "Seleccionou %n receptores. O número máximo de receptores é %1. Por favor, "
 "adapte a selección."
 
@@ -13993,11 +12000,11 @@ msgstr "Empregar o Diálogo de Selección de Enderezos"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Este botón abre un diálogo separado onde pode seleccionar os destinatarios de "
-"entre tódolos enderezos dispoñibeis."
+"Este botón abre un diálogo separado onde pode seleccionar os destinatarios "
+"de entre tódolos enderezos dispoñibeis."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14099,10 +12106,19 @@ msgstr "é maior que ou igual a"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " días"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Para executar a procura precísase descargar do servidor todas as mensaxes do "
 "cartafol %1. Isto podería levar algún tempo. Quere continuar a súa procura?"
@@ -14258,16 +12274,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Recopilando datos para a conta '%1' ...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Recopilando datos para a conta '%1' ...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14286,10 +12298,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Contidos do script '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Contidos do script '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14312,20 +12322,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Capacidades de Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Capacidades de Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Non hai capacidades espciais dispoñibeis)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Guións de Sieve Dispoñibeis:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Guións de Sieve Dispoñibeis:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14368,8 +12374,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Active esta caixa se quere que KMail engada unha sinatura aos correos escritos "
-"con esta identidade."
+"Active esta caixa se quere que KMail engada unha sinatura aos correos "
+"escritos con esta identidade."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14404,8 +12410,8 @@ msgstr "Emrpegue este campo para introducir unha sinatura arbitraria estática."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Empregue esta solicitude para especificar un ficheiro de texto que conteña a "
 "súa sinatura. Lerase cada vez que cree un novo correo ou engada unha nova "
@@ -14425,21 +12431,27 @@ msgstr "Abre o ficheiro especificado nun editor de texto."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Pode engadir unha orde arbitraria aquí, con ou sen o camiño dependendo de se o "
-"comando está ou non está no seu camiño. Para cada novo correo, KMail executará "
-"o comand e empregará a súa saída (á saída estándar) como sinatura. As ordes "
-"usuais para usar con este mecanismo son \"fortune\" ou \"ksig-random\"."
+"Pode engadir unha orde arbitraria aquí, con ou sen o camiño dependendo de se "
+"o comando está ou non está no seu camiño. Para cada novo correo, KMail "
+"executará o comand e empregará a súa saída (á saída estándar) como sinatura. "
+"As ordes usuais para usar con este mecanismo son \"fortune\" ou \"ksig-random"
+"\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Es&pecificar comando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Camiño"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nova entrada:"
@@ -14477,6 +12489,11 @@ msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 "<qt>¿Quere vostede realmente borrar a identidade chamada <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Aplicar &a:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14491,6 +12508,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Editar Guión..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14530,9 +12551,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14572,6 +12593,16 @@ msgstr ""
 "Non se puido abrir o ficheiro \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Para: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14607,36 +12638,32 @@ msgstr "Non se pode iniciar o comando redirixido dende plantel: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14925,6 +12952,10 @@ msgstr "Redirixir corpo da mensaxe actual e inserir resultado coma está"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Redirixir corpo da mensaxe actual e remprazalo co resultado"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -14964,113 +12995,6 @@ msgstr "Activar depuración"
 msgid "Turn Debug Off"
 msgstr "Desactivar depuración"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...que pode ir á vindeira e anterior mensaxe empregando\n"
-"as teclas dereita e esquerda respectivamente?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...que pode crear rapidamente filtros sobre o remitente, destinatario,\n"
-"asunto e lista de correo con <em>Ferramentas-&gt;Crear&nbsp;Filtro</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que pode facer caso omiso do &quot;[nome da lista de correo]&quot;\n"
-"engadido ó asunto dalgunhas listas de correo, empregando a acción de filtro \n"
-"<em>rescritura da cabeceira</em>?. Só empregue\n"
-"<pre>rescribir cabeceira &quot;Asunto&quot;\n"
-"   remprazar &quot;\\s*\\[nome da lista de correo\\]\\s*&quot;\n"
-"   con &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...que pode asociar as listas de correo cos cartafoles no diálogo\n"
-"<em>Cartafol-&gt;Xestión de Lista de Correo.</em>) Pode empregar despois \n"
-"<em>Mensaxe-&gt;Nova&nbsp;Mensaxe&nbsp;á&nbsp;Lista&nbsp;de&nbsp;Correo...<em>\n"
-"para abrir o editor co enderezo da lista de correo preestabelecido.\n"
-"Doutro xeito, pode premer co botón central do ratón sobre o cartafol.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...que pode asignar iconas personalizadas para cada cartafol "
-"individualmente?\n"
-"Vexa <em>Cartafol-&gt;Propiedades...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...que KMail pode amosar unha barra de cor para indicar o tipo de mensaxe\n"
-"(Texto en limpo/HTML/OpenPGP) actualmente amosado?</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...que pode filtrar calquera cabeceira simplemente porporcionando o seu "
-"nome\n"
-"no primeiro campo da regra de procura?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que pode só filtrar mensaxes HTML coa regra\n"
-"<pre>&quot;Contido-tipo&quot; contén &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...que cando se resposte, só a parte seleccionada da mensaxe se amosará "
-"entre comiñas?</p>\n"
-"<p>Se non hai nada seleccionado, a mensaxe enteira amosarase entre comiñas.</p>"
-"\n"
-"<p>Isto mesmo funciona co texto dos arquivos anexos cando vostede seleccione\n"
-"<em>Ver-&gt;Anexos-&gt;Integrados</em>.</p>\n"
-"<p>Esta característica está dispoñíbel con tódolos comandos de resposta "
-"excepto\n"
-"con <em>Mensaxe-&gt;Resposta Sen Comiñas</em>.</p>\n"
-"<p align=\"right\"><em>Por David F.Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Non hai nada que desfacer."
@@ -15140,6 +13064,17 @@ msgstr "Arquivo Aenxo #%1 (sen nome)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Xa existe un ficheiro co nome \"%1\". ¿Está segura/o de que o quere "
+"sobrescribir?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Sobrescribir Ficheiro?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15155,7 +13090,8 @@ msgid ""
 msgstr ""
 "Estarei fóra do traballo ata as %1.\n"
 "\n"
-"Se se trata dunha urxencia, por favor contacte con <substituto de vacacións>\n"
+"Se se trata dunha urxencia, por favor contacte con <substituto de "
+"vacacións>\n"
 "\n"
 "correo-e:<enderezo de correo-e do substituto por vacións>\n"
 "teléfono: +49 711 1111 11\n"
@@ -15256,14 +13192,14 @@ msgstr "&Enviar imaxe con cada mensaxe"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Active esta caixiña se quere que KMail engada as chamadas cabeceiras X-Face ás "
-"mensaxes escritas con esta identidade. Unha X-Face é unha pequena imaxe en "
-"branco e negro (48x48 pixeles) que certos clientes de correo-e son quén de "
-"amosar."
+"Active esta caixiña se quere que KMail engada as chamadas cabeceiras X-Face "
+"ás mensaxes escritas con esta identidade. Unha X-Face é unha pequena imaxe "
+"en branco e negro (48x48 pixeles) que certos clientes de correo-e son quén "
+"de amosar."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15292,13 +13228,13 @@ msgstr "Escoller Ficheiro..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Empregue isto para seleccionar un ficheiro de imaxe do que extrear o debuxo. A "
-"imaxe debería ser de alto contraste e ter forma cadrada. Un fondo claro axuda a "
-"mellorar o resultado."
+"Empregue isto para seleccionar un ficheiro de imaxe do que extrear o debuxo. "
+"A imaxe debería ser de alto contraste e ter forma cadrada. Un fondo claro "
+"axuda a mellorar o resultado."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15306,22 +13242,22 @@ msgstr "Pór Dende o Caderno de Enderezos"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Pode empregar unha versión reducida da imaxe que escolleu na entrada do caderno "
-"de enderezos"
+"Pode empregar unha versión reducida da imaxe que escolleu na entrada do "
+"caderno de enderezos"
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt> KMail pode enviar unha pequena imaxe (48x48 pixeles), de baixa calidade e "
-"monocromática en canda mensaxe. Por exemplo, pode ser unha imaxe de vostede ou "
-"unha firma ou logotipo. Amosarase no cliente de correo-e do destinatario (se o "
-"atura)."
+"<qt> KMail pode enviar unha pequena imaxe (48x48 pixeles), de baixa calidade "
+"e monocromática en canda mensaxe. Por exemplo, pode ser unha imaxe de "
+"vostede ou unha firma ou logotipo. Amosarase no cliente de correo-e do "
+"destinatario (se o atura)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15329,11 +13265,11 @@ msgstr "Empregue este campo para introducir unha cadea arbitraria X-Face."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Exemplos dispoñibeis en <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Exemplos dispoñibeis en <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15348,131 +13284,1784 @@ msgstr "Sen Imaxe"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Non ten o seu propio contacto definido no caderno de enderezos."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Asinado"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Asinar automáticamente as mensa&xes"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Cando se habilita esta opción, todas as mensaxes que se envían asínanse por "
+"defecto. Non obstante, sempre pode deshabilita-la firma individualmente en "
+"cada mensaxe."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Cifraxe"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Estabelecer asunto da mensaxe"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Cando se habilita esta opción, o ficheiro/mensaxe non se cifrará só coa "
+"chave pública do destinatario, senón que tamén coa súa chave propia. Isto "
+"posibilitará que vostede poida descifrar a mensaxe/ficheiro na "
+"posterioridade. É xeralmente unha boa idea."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Enviar CC: a 'enderezo'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Amosar texto a&sinado/cifrado despois da edición"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Enviar BCC: a 'enderezo'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Cando se habilita esta opción, o texto asinado/cifrado amosarase nunha "
+"fiestra separada, posibilitando que poida saber o resultado antes do envío. "
+"Isto é unha boa idea cando se quere verificar que o sistema de cifrado "
+"funciona."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Engadir 'cabeceira' á mensaxe"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Gravar as mensaxes enviadas ci&fradas"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Ler corpo da mensaxe dende o 'ficheiro'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Active isto para gardar as mensaxes de modo cifrado "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Estabelecer corpo da mensaxe"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gravar as Mensaxes Cifradas</h1>\n"
+"Cando se activa esta caixa, as mensaxes se gardan dun modo cifrado tal e "
+"como se mandan. Non se recomenda, xa que non será quen de ler as mensaxes "
+"posteriormente se un certificado preciso caduca.\n"
+"<p>\n"
+"Porén, podería haber motivacións para activar esta opción. En caso de "
+"dúbida, fáleo co seu administrador local.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Engadir un ficheiro anexo ao correo. Isto pode repetirse"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Amosar sempre as chaves de cifrado &para a aprobación"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Só comprobar o correo novo"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Cando se habilita esta opción, a aplicación amosará sempre unha lista das "
+"chaves públicas que pode escoller para a cifraxe. Se non se activa isto, a "
+"aplicación só amosará o diálogo se non se pode atopar a chave correcta ou se "
+"hai varias que se poden empregar."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Só abrir a fiestra de edición"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Cifrar automáticamente tódalas mensaxes &sempre que se poida"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Ver o ficheiro de mensaxe dado"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Cando se habilita esta opción, todas as mensaxes que se envían encríptanse "
+"por defecto se é posíbel desexábel. Non obstante, sempre pode deshabilitar a "
+"firma individualmente para cada mensaxe."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nunca asinar/cifar cando se &garde coma borrador"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Como funciona isto?"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universal"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Respostar"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Respostar a Todos"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Reenviar"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Ata&llo:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Tipo de &plantel:"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Contido do plantel"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Atallo do plantel"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Tipo de plantel"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Propiedades do Cartafol"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "O cartafol alberga unha lista de &correo"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Endere&zo da lista:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Non L&idas:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Caducidade das Mensaxes"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Caducar despois de:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Caducar mens&axes lidas"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Caducar despois d&e:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Caducar mensa&xes non lidas"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Día(s)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Semana(s)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mes(es)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identidade do &Remitente:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Formato de Almacenamento:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Visor de lista:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Enviar correo na lista cando se comprobe o correo"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Envia-la mensaxe ao enderezo de resposta anexo co arquivo ao que apunta a URL"
+"<qt><p>Escolla se quere que KMail envíe todas as mensaxes do bución de saída "
+"nas comprobacións manuais de correo ou en todas as comprobacións, ou doutro "
+"xeito, se non quere que as mensaxes se envíen automaticamente. </p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lida"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Vella"
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Hai novas mensaxes neste cartafol, que non se subiron ao servidor aínda, "
+"mais semella que non ten permisos de acceso suficientes no cartafol aos que "
+"os quere subir. Por favor, contacte co seu administrador para lle aturar a "
+"subida destas novas mensaxes, ou móvaas fóra deste cartafol.</p> <p>Quere "
+"mover agora estas mensaxes a outro cartafol?</p>"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Borrada"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Respostada"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Reenviada"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"O cartafol usado máis recentemente no diálogo de selección de cartafoles."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Na Fila"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Enviada"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Política para amosar a icona na bandexa do sistema"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Ollada"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorado"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Notificación informativa de correo novo"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Correo Lixo"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Se se habilita esta opción, amósase na notificación de correo novo o número "
+"de novas mensaxes en cada cartafol; doutro xeito, só terá unha mensaxe "
+"sinxela dicindo 'Chegou novo correo'."
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Estabelecer e&ditor:"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "A Se Facer"
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Empregar editor e&xterno no canto do editor propio"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Ten Anexo"
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Habilitar a funcionalidade groupware"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Xestionar cabeceiras De:/Para: nas respostas a respostas"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
 msgstr ""
+"Microsoft Outlook ten un número de defectos na súa implementación do "
+"estándar iCalendar; esta opción traballa sobre un deles. Se ten problemas "
+"cos usuarios de Outlook que non son quen de obter as súas respostas, tente "
+"activar esta opción."
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Camiño"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+"Microsoft Outlook ten un número de defectos na súa implementación do "
+"estándar iCalendar; esta opción traballa sobre un deles. Se ten problemas "
+"cos usuarios de Outlook que non son quen de obter as súas respostas, tente "
+"activar esta opción.Enviar"
 
-#: util.h:208
+#: kmail.kcfg:179
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
 msgstr ""
-"Xa existe un ficheiro co nome \"%1\". ¿Está segura/o de que o quere "
-"sobrescribir?"
+"Microsoft Outlook ten un número de defectos na súa implementación do "
+"estándar iCalendar; esta opción traballa sobre un deles. Se ten problemas "
+"cos usuarios de Outlook que non son quen de obter as súas invitacións, tente "
+"activar esta opción."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Sobrescribir Ficheiro?"
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Envio automático de invitacións"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Cando se activa, non verá a fiestra de edición da mensaxe. No seu lugar, "
+"envíanse automaticamente todos os correos de invitación. Se quere ver o "
+"correo antes de envalo, pode desactivar esta opción. Porén, sexa consciente "
+"de que o texto na fiestra de edición da mensaxe está en sintaxe iCalendar, e "
+"non debería polo tanto tentar modificalo manualmente."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Habilitar isto fai posíbel almacenar as entradas das aplicacións de "
+"Kpntact (KOrganizer, KAddressBook e KNotes.).</p><p>Se quere activar esta "
+"opción deberá tamén facer que as aplicacións empregue o recurso IMAP; isto "
+"faise no Centro de Control de TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalmente non terá ningunha razón para ver os cartafoles que conteñen "
+"os recursos IMAP. Pero se precisa velos, pode poñer iso aquí.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Escolla o formato de almacenamento dos cartafoles de traballo en grupo. "
+"<ul><li>O formato por defecto é empregar os estándares ical (para cartafoles "
+"de calendario) e vcard (para cartafoles de cadernos de enderezos). Este "
+"formato pon dispoñibeis todas as funcións de Kontact.</li><li>O formato XML "
+"de Kolab usa un modelo personalizado que semella máis a o empregado en "
+"Outlook. este formato fornece unha mellor compatibilidade con Outlook, cando "
+"se use un servidor Kolab ou unha solución compatíbel.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Iso escolle o cartafol pai dos cartafoles de recursos IMAP.</p><p>Por "
+"defecto o servidor Kolab define a Entrada IMAP como o pai.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Ésta é a identificación da conta que posúe os cartafoles de recursos IMAP."
+"</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Se quere configurar os nomes dos cartafoles do almacenamento IMAP á súa "
+"lingua preferida, pode escoller entre estas linguas dispoñibeis.</p><p> Por "
+"favor, note que a única razón para facer isto é para a compatibilidade con "
+"Microsoft Outlook. Considérase unha mala idea configurar isto, xa que "
+"prohíbese así a mudanza da lingua. </p><p>Así que non poña isto a menos que "
+"o teña que facer.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Este valor emprégase para decidir se se debe amosar a Introdución a KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Número máximo de conexións por servidor"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Isto se pode empregar para restrinxir o número de conexións por servidor "
+"mentres se comproba por correo novo. Por defecto, o número de conexións está "
+"sen limitar (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Amosar a liña de procura rápida"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Esta opción habilita ou deshabilita a liña de procura rápida enriba da lista "
+"de mensaxes que se pode empregar para procurar axiña por información amosada "
+"na lista de mensaxes."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"&Manter se é posíbel a codificación orixinal cando se resposte ou se reenvíe"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Asinar a&utomáticamente"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Lembrar esta identidade, de xeito que se empregue no futuro nas fiestras de "
+"edición.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Lembrar este cartafol para elementos enviados, de xeito que se empregue nas "
+"futuras fiestras de edición."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Lembrar este transporte de correo, de xeito que se empregue nas futuras "
+"fiestras de edición."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Lembrar esta identidade, de xeito que se empregue no futuro nas fiestras de "
+"edición.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Axuste de pala&bras na columna:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Advertir se un certificado raíz caduca en &menos de:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Acenda esta opción para facer que Outlook(tm) comprenda nomes de anexos que "
+"conteñan caracteres non ingleses"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Pedir automáticamen&te notificacións de disposición das mensaxes"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Habilite esta opción se quere que KMail pida Notificacións da "
+"Disposición das Mensaxes (MDNs) para cada unha das mensaxes saíntes. "
+"<p><p>Esta opción só afecta ao predeterminado; sempre pode habilitala ou "
+"deshabilitala no editor, no elemento do menú <em>Opcións</em>-><em> Pedir "
+"Notificación de Disposición</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Empregar enderezos recentes para autocompletado"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Deshabilite esta opción se non quere que se amosen os enderezos recentemente "
+"usados na lista de autocompletado dos campos de enderezo da fiestra de "
+"edición de mensaxes."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Intervalo de autogravado:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Pódese crear regularmente unha copia de seguridade do texto da fiestra de "
+"edición. O intervelo empregado para crear as copias de seguridade "
+"estabelécese aquí. pode deshabilitar o auto-gravado estabelecendo o valor a "
+"0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Substituir o prefi&xo recoñecido por \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Substituir o prefixo recoñecido con \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Empregar citado inteli&xente"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "A sinatura caducou."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tipo de selector de enderezos"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Define o tipo de diálogo para seleccionar destinatarios,\n"
+"        CC e BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Editor de tipos de destinatarios"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Estabelece o tipo de diálogo de selección de destinatarios,\n"
+"        CC e BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Número máximo de liñas de destinatario no editor."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"&Manter se é posíbel a codificación orixinal cando se resposte ou se reenvíe"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Algúns correos-e, especialmente aqueles xerados automaticamente, non "
+"especifican a codificación de caracteres que precisan usar para amosarse "
+"axeitadamente. Neses casos emprégase a codificación de caracteres "
+"predefinida, que se pode configurar aquí. Póñao na codificación de "
+"caracteres máis empregada na súa rexión. Empréguase por defecto a "
+"configuración xeral do sistema."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Se muda o valor orixinal 'Automático' forzarase o emprego da codificación "
+"específica para todos os correos-e, omitindo o que eles mesmos especifiquen."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Habilite isto se quere que os sorrisos coma :-) se amosen no texto de "
+"mensaxe sendo remprazados por emoticonas (pequeniñas imaxes)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Habilite esta opción para amosar os diferentes niveis de citas textuais. "
+"Deshabilítea para agochar os niveis de citas texuais."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Colapsar automaticamente o nivel:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reducir o tamaño da fonte para o texto citado"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Habilite esta opción para amosar as citas textuais cunha tipografía máis "
+"pequena"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Gravar as mensaxes enviadas ci&fradas"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Amosar se é correo &lixo ou non en cabeceiras decorativas"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Enviar Notificacións da Disposición da Mensaxe cun remitente baleiro."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Enviar Notificacións de Disposición das Mensaxes cunha cadea de remitente "
+"baleira. Algúns servidores poden estaren configurados para rexeitar este "
+"tipo de mensaxes, así que se está a experimentar problemas enviando MDNs, "
+"desactive esta opción."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Convertíronse as frases a planteis"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "As frases vellas convertíronse a planteis"
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Lista de Mensaxes - Novas Mensaxes"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Plantel de mensaxe para as respostas"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Plantel de mensaxe para as respostas a todos"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Plantel de mensaxe para os reenvíos"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Engadir Caracteres de &Cita"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Editar &Ficheiro"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Editar..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Ir"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Cartaf&ol"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mensaxe"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Resposta especial"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Reenviar"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Restabelecer Opcións da Tipografía"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra de Ferramentas HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opcións Comúns"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barra de Ferramentas HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validar certificados empregando CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Se se escolle esta opción, os certificados S/MIME valídanse empregando as "
+"Listas de Revocación de Certificados (CRLs)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validar os certificados en liña (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Se se selecciona esta opción, os certificados S/MIME valídanse en liña "
+"empregand o Protocolo de Estado Enliña de Certificados (OCSP). Encha a URL "
+"do OCSP embaixo."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Validación do Certificado En Liña"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL do OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Introduza o enderezo do servidor para a validación en liña de certificados "
+"(OCSP). A URL comeza a cotío con http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "URL do repetidor OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorar URL do servicio de certificados"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Non comprobar política dos certificados"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Por defecto, GnuPG emprega o ficheiro ~/.gnupg/policies.txt para comprobar "
+"se unha politica de certificados está aturada. Se se selecciona esta opción, "
+"non se comprobarán as políticas."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nunha consultar un CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Se se activa esta opción, as Listas de Revocación de Certificados non se "
+"empregarán nunca para validar certificados S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Obter certificados de expendedores non atopados"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Se se activa esta opción, os certificados de expendedores non atopados se "
+"obteñen cando sexa preciso (isto se aplica tamén aos méotodos de validación, "
+"CRLs e OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Solicitudes HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Non efectuar ningunha solicitude HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Deshabilita comletamente o uso de HTTP ou S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Empregar este proxy para solicitudes HTTP:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Empregar o proxy HTTP do sistema:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Se se selecciona esta opción, o valor do proxy HTTP amosado na dereita (que "
+"provén da variábel de ambiente http_proxy) se empregará para calquera "
+"solicitude HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Insira aquí a localización do seu proxy HTTP, que se empregará para todas as "
+"solicitudes HTTP relativas a S/MIME. A sintaxe é servidor:porto, por exemplo "
+"meuproxy.sitio.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorar punto de distribución de certificados HTTP CRL"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Cando se procura pola localización dun CRL, o certificado a ser comprobado "
+"contén normalmente o que se coñecen como entradas \"Punto de Distribución CRL"
+"\" (DP), que son URLs que describen o xeito de acceder á URL. Úsase a "
+"primeira entrada DP atopada.  Con esta opción, todas as entradas que usen o "
+"esquema HTTP ignóranse cando se procure por un DP axeitado."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Solicitudes LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Non efectuar ningunha solicitude LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Deshabilita completamente o uso de LDAP para S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorar punto de distribución CRL de LDAP dos certificads"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Cando se procura pola localización dun CRL, o certificado a ser comprobado "
+"contén normalmente o que se coñecen como entradas \"Punto de Distribución CRL"
+"\" (DP), que son URLs que describen o xeito de acceder á URL. Úsase a "
+"primeira entrada DP atopada.  Con esta opción, todas as entradas que usen o "
+"esquema LDAP ignóranse cando se procure por un DP axeitado."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Servidor primario para solicitudes LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Se insire aquí un servidor LDAP todas as solicitudes LDAP van primeiro a "
+"este servidor. Máis precisamente, a opción sobrescribe calquera servidor e "
+"porto especificado na parte da URL LDAP e tamén empregarase se o servidor e "
+"porto se omiten da URL. Os outros servidores LDAP usaranse só se a conexión "
+"ao \"proxy\" falla.\n"
+"A sintaxe é \"SERVIDOR\" ou \"SERVIDOR:PORTO\". Se se omite o porto, úsase o "
+"porto 389 (porto LDAP estándar)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "Eng&adir..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Restabelecer Opcións da Tipografía"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "sen límite"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Configuración de Planteis"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Respostar ao Remitente"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Respostar a Todos / Respostar á Lista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Mensaxe Reenviada"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Advertir cando se tente enviar mensaxes &non asinadas"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Activar para ser advertido cando se envien mensaxes non asinadas."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir Cando Se Envien Mensaxes Non Asinadas</h1>\n"
+"Se se activa esta caixa, será advertido cando tente enviar partes ou "
+"mensaxes enteiras sen asinar.\n"
+"<p>\n"
+"Recoméndase deixar esta opción activada para unha integridade máxima.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Ad&vertir cando se tente enviar unha mensaxe non cifrada"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Activar para ser advertido cando se tente enviar mensaxes non encriptadas."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir Cando se Tente Enviar Mensaxes Non Cifradas</h1>\n"
+"Se se activa esta caixa, advertiráselle cando tente enviar partes ou "
+"mensaxes completas non encriptadas.\n"
+"<p>\n"
+"Recoméndase deixar esta opción activada para unha integridade máxima.\n"
+"</q>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Advertir se o Enderezo de Correo-e do Destinatario &Non se Atopa no "
+"Certificado"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Activar para ser advertido se o enderezo non se atopa no certificado"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir se o Enderezo de Correo do Destinatario Non Está no "
+"Certificado</h1>\n"
+"Se se activa esta opción, amosarase unha advertencia cando o enderezo do "
+"receptor non se atopa no certificado empregado para o cifrado.\n"
+"<p>\n"
+"Recoméndase deixar esta opción activada para unha seguridade máxima.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Advertir se un certificado/chave caduca cedo (configurar o umbral embaixo)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Para asinar"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Para a cifraxe"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Escolla o número de días aquí"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir Se Certificado de Sinatura Caduca</h1>\n"
+"Escolla o número mínimo de días nose que o certificado de asinar debe ser "
+"válido sen amosar unha advertencia.\n"
+"<p>\n"
+"A opción SPHINX recomendada é de 14 días.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir se Certificado de Cifraxe Caduca</h1>\n"
+"Escolla o número mínimo de días nos cales o certificado de cifraxe debería "
+"ser apto sen necesidade de advertir.\n"
+"<p>\n"
+"A opción SPHINX recomendada é de 14 días.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir se un Certificado na Cadea Caduca</h1>\n"
+"Escolla o número mínimo de días nos que tódolos certificados na cadea "
+"deberían ser válidos sen dar unha advertencia.\n"
+"<p>\n"
+"A opción SPHINX recomendada é de 14 días.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir Se Certificado CA Caduca</h1>n Escolla o número mínimo de días "
+"nos que o certificado CA debe ser válido osen que se produza unha "
+"advertencia.\n"
+"<p>\n"
+"A opción recomendada SPHINX é de 14 días.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Advertir Se Certificado Raíz Expira</h1>\n"
+"Escolla o número mínimo de días nos que o certificado raíz é válido sen que "
+"se produza unha advertencia.\n"
+"<p>\n"
+"A opción recomendada SPHINX é de 14 días.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Para certificados raíz:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Para certificados intermediario de CA:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Para certificados/chaves do usuario final:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Rehabilitar Todas as Advertencias \"Non Preguntar de Novo\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...que pode ir á vindeira e anterior mensaxe empregando\n"
+"as teclas dereita e esquerda respectivamente?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...que pode crear rapidamente filtros sobre o remitente, destinatario,\n"
+"asunto e lista de correo con <em>Ferramentas-&gt;Crear&nbsp;Filtro</em>?</"
+"p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que pode facer caso omiso do &quot;[nome da lista de correo]&quot;\n"
+"engadido ó asunto dalgunhas listas de correo, empregando a acción de "
+"filtro \n"
+"<em>rescritura da cabeceira</em>?. Só empregue\n"
+"<pre>rescribir cabeceira &quot;Asunto&quot;\n"
+"   remprazar &quot;\\s*\\[nome da lista de correo\\]\\s*&quot;\n"
+"   con &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...que pode asociar as listas de correo cos cartafoles no diálogo\n"
+"<em>Cartafol-&gt;Xestión de Lista de Correo.</em>) Pode empregar despois \n"
+"<em>Mensaxe-&gt;Nova&nbsp;Mensaxe&nbsp;á&nbsp;Lista&nbsp;de&nbsp;Correo..."
+"<em>\n"
+"para abrir o editor co enderezo da lista de correo preestabelecido.\n"
+"Doutro xeito, pode premer co botón central do ratón sobre o cartafol.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...que pode asignar iconas personalizadas para cada cartafol "
+"individualmente?\n"
+"Vexa <em>Cartafol-&gt;Propiedades...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...que KMail pode amosar unha barra de cor para indicar o tipo de "
+"mensaxe\n"
+"(Texto en limpo/HTML/OpenPGP) actualmente amosado?</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...que pode filtrar calquera cabeceira simplemente porporcionando o seu "
+"nome\n"
+"no primeiro campo da regra de procura?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que pode só filtrar mensaxes HTML coa regra\n"
+"<pre>&quot;Contido-tipo&quot; contén &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...que cando se resposte, só a parte seleccionada da mensaxe se amosará "
+"entre comiñas?</p>\n"
+"<p>Se non hai nada seleccionado, a mensaxe enteira amosarase entre comiñas.</"
+"p>\n"
+"<p>Isto mesmo funciona co texto dos arquivos anexos cando vostede "
+"seleccione\n"
+"<em>Ver-&gt;Anexos-&gt;Integrados</em>.</p>\n"
+"<p>Esta característica está dispoñíbel con tódolos comandos de resposta "
+"excepto\n"
+"con <em>Mensaxe-&gt;Resposta Sen Comiñas</em>.</p>\n"
+"<p align=\"right\"><em>Por David F.Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15560,21 +15149,26 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgstr "C&ifrar todas as partes da mensaxe"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Active isto para ter todas as partes da mensaxe cifradas por defecto"
+#~ msgstr ""
+#~ "Active isto para ter todas as partes da mensaxe cifradas por defecto"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cifrar Por Defecto Todas as Partes da Mensaxe</h1>\n"
-#~ "Se se escolle esta opción, todas as partes dunha mensaxe (i.e. o corpo da mensaxe e todos os anexos) cífranse por defecto.\n"
+#~ "Se se escolle esta opción, todas as partes dunha mensaxe (i.e. o corpo da "
+#~ "mensaxe e todos os anexos) cífranse por defecto.\n"
 #~ "<p>\n"
-#~ "Ésta é unha opción por defecto, pode aínda así omitila para cada mensaxe individualmente.\n"
+#~ "Ésta é unha opción por defecto, pode aínda así omitila para cada mensaxe "
+#~ "individualmente.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15586,12 +15180,16 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Preguntar Antes de Cifrar Cada Parte</h1>\n"
-#~ "Cando se escolle esta opción, preguntaráselle, para cada parte da mensaxe (i.e. o corpo principal da mensaxe o todos os ficheiros anexos) se quere que se cifre.\n"
+#~ "Cando se escolle esta opción, preguntaráselle, para cada parte da mensaxe "
+#~ "(i.e. o corpo principal da mensaxe o todos os ficheiros anexos) se quere "
+#~ "que se cifre.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15605,14 +15203,16 @@ msgstr "Sobrescribir Ficheiro?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Non Cifrar as Mensaxes</h1>\n"
 #~ "Se se escolle esta opción, as mensaxes non se cifrarán por defecto.\n"
 #~ "<p>\n"
-#~ "Ésta é a opción por defecto, así que se quere omitila pode facelo individualmente para cada mensaxe.\n"
+#~ "Ésta é a opción por defecto, así que se quere omitila pode facelo "
+#~ "individualmente para cada mensaxe.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15624,18 +15224,31 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo de Cifraxe</h1>\n"
-#~ "Un algoritmo é unha descrición para que o ordenador execute dun xeito determinado unha tarefa concreta. O algoritmo de cifraxe describe cómo o ordenador aplica a chave de cifraxe do destinatario á súa mensaxe de xeito que o destinatario poida ler a mensaxe.\n"
+#~ "Un algoritmo é unha descrición para que o ordenador execute dun xeito "
+#~ "determinado unha tarefa concreta. O algoritmo de cifraxe describe cómo o "
+#~ "ordenador aplica a chave de cifraxe do destinatario á súa mensaxe de "
+#~ "xeito que o destinatario poida ler a mensaxe.\n"
 #~ "<p>\n"
-#~ "A selección dun algoritmo de cifraxe concreto determina a facilidade ou dificultada de interceptar e ler a mensaxe. Porén, todos os algoritmos fornecidos no entorno SPHINX considéranse moi seguros. Xeralmente pode traballar co algoritmo por defecto.\n"
+#~ "A selección dun algoritmo de cifraxe concreto determina a facilidade ou "
+#~ "dificultada de interceptar e ler a mensaxe. Porén, todos os algoritmos "
+#~ "fornecidos no entorno SPHINX considéranse moi seguros. Xeralmente pode "
+#~ "traballar co algoritmo por defecto.\n"
 #~ "<p>\n"
 #~ "Ésta é a opción por defecto, pode omitila para cada mensaxe individual.\n"
 #~ "</qt>"
@@ -15649,16 +15262,23 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>A comprobación de certificado rematou con certificado gardado localmente</h1>\n"
-#~ "Se se activa esta opción, a comprobación da cadea de certificados pode rematar cun certificado gravado localmente.\n"
+#~ "<h1>A comprobación de certificado rematou con certificado gardado "
+#~ "localmente</h1>\n"
+#~ "Se se activa esta opción, a comprobación da cadea de certificados pode "
+#~ "rematar cun certificado gravado localmente.\n"
 #~ "<p>\n"
-#~ "Os certificados gravados localmente son os seus propios certificados así como os certificados dos compañeiros de comunicación e as autoridades de certificación (CAs).\n"
+#~ "Os certificados gravados localmente son os seus propios certificados así "
+#~ "como os certificados dos compañeiros de comunicación e as autoridades de "
+#~ "certificación (CAs).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15670,12 +15290,16 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Comprobar Sempre o Camiño ao Certificado Raiz</h1>\n"
-#~ "Se se activa esta opción, o camiño ao certificado pertencente ao destinatario comprobarase sempre por todo ata chegar ao certificado raiz.\n"
+#~ "Se se activa esta opción, o camiño ao certificado pertencente ao "
+#~ "destinatario comprobarase sempre por todo ata chegar ao certificado "
+#~ "raiz.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15687,16 +15311,20 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Comprobar o Camiño ao Certificado</h1>\n"
-#~ "Se se activa esta opción, comprobarase o camiño completo do certificado do destinatario ata o certificado raiz.\n"
+#~ "Se se activa esta opción, comprobarase o camiño completo do certificado "
+#~ "do destinatario ata o certificado raiz.\n"
 #~ "<p>\n"
-#~ "Note que non é posíbel desactivar a comprobación do propio certificado do destinatario.\n"
+#~ "Note que non é posíbel desactivar a comprobación do propio certificado do "
+#~ "destinatario.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15708,16 +15336,28 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Usar Lista de Revocación de Certificados (CRLs)</h1>\n"
-#~ "Unha lista de revocación de certificados contén os certificados que foron desaprobados e non se deberían empregar para propósitos de cifraxe nunca máis. Un usuario podería querer revocar o seu certificado porque sospeita que se puido comprometer a integridade do mesmo (e.g. alguén adiviñou o PIN).\n"
+#~ "Unha lista de revocación de certificados contén os certificados que foron "
+#~ "desaprobados e non se deberían empregar para propósitos de cifraxe nunca "
+#~ "máis. Un usuario podería querer revocar o seu certificado porque sospeita "
+#~ "que se puido comprometer a integridade do mesmo (e.g. alguén adiviñou o "
+#~ "PIN).\n"
 #~ "<p>\n"
-#~ "Recoméndase usar as CRLs para unha seguridade máxima. No diálogo de configuración para a xestión de certificados e CRL pode seleccionara de onde obter as CRLs.\n"
+#~ "Recoméndase usar as CRLs para unha seguridade máxima. No diálogo de "
+#~ "configuración para a xestión de certificados e CRL pode seleccionara de "
+#~ "onde obter as CRLs.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15729,12 +15369,14 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Averter se o CRL Caduca Cedo</h1>\n"
-#~ "Se se activa esta caixiña, advertiráselle se un dos CRLs que está a usar está a piques de caducar.\n"
+#~ "Se se activa esta caixiña, advertiráselle se un dos CRLs que está a usar "
+#~ "está a piques de caducar.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15743,14 +15385,16 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Advertir se o CRL Caduca Cedo</h1>\n"
-#~ "Neste campo pode especificar con que previsión antes da caducidade dun CRL se lle advertirá sobre ésta.\n"
+#~ "Neste campo pode especificar con que previsión antes da caducidade dun "
+#~ "CRL se lle advertirá sobre ésta.\n"
 #~ "<p>\n"
 #~ "A opción recomendada para os ambientes SPHINX é de 7 días.\n"
 #~ "</qt>"
@@ -15764,16 +15408,20 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cifrar sempre a si mesmo</h1>\n"
-#~ "Se se activa esta caixa, as mensaxes cifradas que envíe serán tamén cifradas coa súa propia chave.\n"
+#~ "Se se activa esta caixa, as mensaxes cifradas que envíe serán tamén "
+#~ "cifradas coa súa propia chave.\n"
 #~ "<p>\n"
-#~ "Recoméndase deixar esta opción activada que poida ler as mensaxes enviadas.\n"
+#~ "Recoméndase deixar esta opción activada que poida ler as mensaxes "
+#~ "enviadas.\n"
 #~ "</q>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15785,23 +15433,30 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Advertir se o Certificado Caduca</h1>\n"
-#~ "Se se activa esta opción, adevertiráselle cando tente usar un certificado para cifrar que caduque no intervalo de tempo especificado.\n"
+#~ "Se se activa esta opción, adevertiráselle cando tente usar un certificado "
+#~ "para cifrar que caduque no intervalo de tempo especificado.\n"
 #~ "<p>\n"
-#~ "Recoméndase deixar esta opción activada para evitar o uso de certificados que poidan caducar cedo.\n"
+#~ "Recoméndase deixar esta opción activada para evitar o uso de certificados "
+#~ "que poidan caducar cedo.\n"
 #~ "</q>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
 #~ msgstr "Advertir se o ce&rtificado do destinatario caduca en menos de:"
 
 #~ msgid "Warn if receiver's email address is &not in certificate"
-#~ msgstr "Advertir se o enderezo de correo do destinatario &non se atopa no certificado"
+#~ msgstr ""
+#~ "Advertir se o enderezo de correo do destinatario &non se atopa no "
+#~ "certificado"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Configuración de Sinatura"
@@ -15815,8 +15470,29 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Escolle os certificados a seren enviados"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Envío de Certificados</h1> Sen o seu certificado, o destinatario non será quen de determinar se foir realmente vostede o que enviou a mensaxe ou se a mensaxe foi alteradas por un terceiro. <p> O destinatario pode obter o seu certificado dun servidor central, pero pode tamén optar a obter o seu certificado dentro dunha mensaxe súa. Pode seleccionar se quere ou non incluir un certificado, só o certificado propio ou a cadea completa de certificados que certifican o seu propio certificado, incluindo ou excluindo o certificado raiz.<p> Recoméndase sempre incluir polo menos o seu propio certificado coa mensaxe.<p> Esta opción é a predefinida, pode sobrescribila para cada mensaxe individual. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Envío de Certificados</h1> Sen o seu certificado, o destinatario "
+#~ "non será quen de determinar se foir realmente vostede o que enviou a "
+#~ "mensaxe ou se a mensaxe foi alteradas por un terceiro. <p> O destinatario "
+#~ "pode obter o seu certificado dun servidor central, pero pode tamén optar "
+#~ "a obter o seu certificado dentro dunha mensaxe súa. Pode seleccionar se "
+#~ "quere ou non incluir un certificado, só o certificado propio ou a cadea "
+#~ "completa de certificados que certifican o seu propio certificado, "
+#~ "incluindo ou excluindo o certificado raiz.<p> Recoméndase sempre incluir "
+#~ "polo menos o seu propio certificado coa mensaxe.<p> Esta opción é a "
+#~ "predefinida, pode sobrescribila para cada mensaxe individual. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Enviar &o seu propio certificado"
@@ -15836,16 +15512,20 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Asinar Todas as Partes da Mensaxe Por Defecto</h1>\n"
-#~ "Asínanse todas as partes da mensaxe (i.e. o corpo principal da mensaxe e todos os anexos) se se escolle esta opción.\n"
+#~ "Asínanse todas as partes da mensaxe (i.e. o corpo principal da mensaxe e "
+#~ "todos os anexos) se se escolle esta opción.\n"
 #~ "<p>\n"
-#~ "Ésta é unha opción predefinida, pode aínda así sobrecribila para cada mensaxe individual.\n"
+#~ "Ésta é unha opción predefinida, pode aínda así sobrecribila para cada "
+#~ "mensaxe individual.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15857,12 +15537,16 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Preguntar Antes de Asinar Cada Parte</h1>\n"
-#~ "Cando se selecciona esta opción, preguntaráselle por cada parte da mensaxe individualmente (i.e. o corpo principal da mensaxe así como os anexos) para saber se a quere asinar ou non.\n"
+#~ "Cando se selecciona esta opción, preguntaráselle por cada parte da "
+#~ "mensaxe individualmente (i.e. o corpo principal da mensaxe así como os "
+#~ "anexos) para saber se a quere asinar ou non.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15876,18 +15560,23 @@ msgstr "Sobrescribir Ficheiro?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Non Asinar Mensaxes</h1>\n"
 #~ "Se se escolle esta opción, as mensaxe non se asinará por defecto.\n"
 #~ "<p>\n"
-#~ "Ésta é a opción predefinida, pode aínda así sobrescribila para cada opción individual.\n"
+#~ "Ésta é a opción predefinida, pode aínda así sobrescribila para cada "
+#~ "opción individual.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "O certificado de sinatura está configurado na páxina de <em>Certificados</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "O certificado de sinatura está configurado na páxina de <em>Certificados</"
+#~ "em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15898,20 +15587,34 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo de Sinatura</h1>\n"
-#~ "Un algoritmo é unha descrición para o ordenador de como debe levar a cabo certa tarefa.O algoritmo de sinatura describe como o ordenador aplica a súa chave de sinatura á súa mensaxe de xeito que o destinatario da mesma poida determinar se a mensaxe provén certamente de vostede.\n"
+#~ "Un algoritmo é unha descrición para o ordenador de como debe levar a cabo "
+#~ "certa tarefa.O algoritmo de sinatura describe como o ordenador aplica a "
+#~ "súa chave de sinatura á súa mensaxe de xeito que o destinatario da mesma "
+#~ "poida determinar se a mensaxe provén certamente de vostede.\n"
 #~ "<p>\n"
-#~ "A selección dun certo algoritmo de sinatura determina a facilidade ou dificultade de falseala. Porén, todos os algoritmos fornecidos co ambien SPHINX considéranse moi seguros. Xeralmente o algoritmo por defecto funcionará ben aquí.\n"
+#~ "A selección dun certo algoritmo de sinatura determina a facilidade ou "
+#~ "dificultade de falseala. Porén, todos os algoritmos fornecidos co ambien "
+#~ "SPHINX considéranse moi seguros. Xeralmente o algoritmo por defecto "
+#~ "funcionará ben aquí.\n"
 #~ "<p>\n"
-#~ "Esta opción é a predefinida, pode sobrescribila para cada mensaxe individual.\n"
+#~ "Esta opción é a predefinida, pode sobrescribila para cada mensaxe "
+#~ "individual.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15926,12 +15629,16 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gravar as Mensaxes coas Sinaturas</h1>\n"
-#~ "Cando se activa esta opción, as mensaxes enviadas almacénanse xunto coas súas sinaturas. Recoméndase isto porque deste xeito posibilítase que comprobe con posterioridade se asinou unha mensaxe ou certa parte dela.\n"
+#~ "Cando se activa esta opción, as mensaxes enviadas almacénanse xunto coas "
+#~ "súas sinaturas. Recoméndase isto porque deste xeito posibilítase que "
+#~ "comprobe con posterioridade se asinou unha mensaxe ou certa parte dela.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15941,17 +15648,26 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgstr "MIME E&stándar"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Unha mensaxe multiparte e asinada que contén a sinatura e os datos asinados."
+#~ msgstr ""
+#~ "Unha mensaxe multiparte e asinada que contén a sinatura e os datos "
+#~ "asinados."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sinatura con múltiples partes</h1>\n"
-#~ "Cando se activa esta opción, a sinatura e os datos asinados separaranse en partes dunha mensaxe multiparte e asinada. Os datos da mensaxe asinada será lexibeis mesmo por Axentes de Correo de Usuario que non aturen o algoritmo de sinatura e que non aturen tampouco a decodificacións de ASN.1.\n"
+#~ "Cando se activa esta opción, a sinatura e os datos asinados separaranse "
+#~ "en partes dunha mensaxe multiparte e asinada. Os datos da mensaxe asinada "
+#~ "será lexibeis mesmo por Axentes de Correo de Usuario que non aturen o "
+#~ "algoritmo de sinatura e que non aturen tampouco a decodificacións de "
+#~ "ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15963,12 +15679,16 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Mensaxes asinadas opacamente</h1>\n"
-#~ "Cando se selecciona esta opción, tanto a sinatura como os datos asinados codificaranse nun bloque ASN.1. As mensaxes serán lexibeis só por Axentes de Correo de Usuario que aturen a decodificación ASN.1.\n"
+#~ "Cando se selecciona esta opción, tanto a sinatura como os datos asinados "
+#~ "codificaranse nun bloque ASN.1. As mensaxes serán lexibeis só por Axentes "
+#~ "de Correo de Usuario que aturen a decodificación ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15980,8 +15700,23 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Escolla cómo de a miúdo se debe introducir o PIN"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Inserción do PIN</h1> Aquí pode seleccionar a frecuencia coa que precisará inserir o PIN para ter acceso ao seu ambiente de seguridade persoal (PSE) que contén os seus certificados. <p> Canto máis a miúdo precise inserir o seu PINT, máis protexido estará contra as mensaxes de correo-e enviadas no seu nome, pero as operacións serán máis incómodas. <p> Se non está seguro/a de que seleccionar aquí, deixe esta opción como está. <p> Note que non é posíbel desactivar completamente a inserción do PIN por racións de seguridade. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Inserción do PIN</h1> Aquí pode seleccionar a frecuencia coa que "
+#~ "precisará inserir o PIN para ter acceso ao seu ambiente de seguridade "
+#~ "persoal (PSE) que contén os seus certificados. <p> Canto máis a miúdo "
+#~ "precise inserir o seu PINT, máis protexido estará contra as mensaxes de "
+#~ "correo-e enviadas no seu nome, pero as operacións serán máis incómodas. "
+#~ "<p> Se non está seguro/a de que seleccionar aquí, deixe esta opción como "
+#~ "está. <p> Note que non é posíbel desactivar completamente a inserción do "
+#~ "PIN por racións de seguridade. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Unha vez por sesión"
@@ -15998,35 +15733,44 @@ msgstr "Sobrescribir Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Advertir Cando o Certificado Caduque</h1>\n"
-#~ "Se se activa esta opción, advertiráselle cando tente usar un certificado para asinar que caduque no intervalo de tempo especificado.\n"
+#~ "Se se activa esta opción, advertiráselle cando tente usar un certificado "
+#~ "para asinar que caduque no intervalo de tempo especificado.\n"
 #~ "<p>\n"
-#~ "Recoméndase deixar esta opción activada para evitar o uso de certificados que poidan caducar cedo.\n"
+#~ "Recoméndase deixar esta opción activada para evitar o uso de certificados "
+#~ "que poidan caducar cedo.\n"
 #~ "</q>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Advertir se o certificado de s&inatura caduca en menos de:"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Advertir se o enderezo de correo do asinante &non se atopa no certificado"
+#~ msgstr ""
+#~ "Advertir se o enderezo de correo do asinante &non se atopa no certificado"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Advertir se o Enderezo de Correo do Destinatario Non Está no Certificado</h1>\n"
-#~ "Se se activa esta opción, amosarase unha advertencia cando o enderezo do receptor non se atopa no certificado empregado para o asinado.\n"
+#~ "<h1>Advertir se o Enderezo de Correo do Destinatario Non Está no "
+#~ "Certificado</h1>\n"
+#~ "Se se activa esta opción, amosarase unha advertencia cando o enderezo do "
+#~ "receptor non se atopa no certificado empregado para o asinado.\n"
 #~ "<p>\n"
 #~ "Recoméndase deixar esta opción activada para unha seguridade máxima.\n"
 #~ "</qt>"
diff --git a/tde-i18n-he/messages/tdepim/kmail.po b/tde-i18n-he/messages/tdepim/kmail.po
index e4b00cf03cf..2b4250d5d2f 100644
--- a/tde-i18n-he/messages/tdepim/kmail.po
+++ b/tde-i18n-he/messages/tdepim/kmail.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-01-24 20:05+0200\n"
 "Last-Translator: Diego Iastrubni <elcuco@kde.org>\n"
 "Language-Team:  <he@li.org>\n"
@@ -27,13 +27,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "צוות התרגום של TDE ישראל"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -180,6 +180,12 @@ msgstr "&ללא (השתמש בזהירות)"
 msgid "Account for semiautomatic resource handling"
 msgstr "חשבון לניהול חצי אוטומטי של משאבים"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "&טקסט פשוט"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -255,12 +261,13 @@ msgstr "שם &משתמש:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"ספק האינטרנט שלך נתן לך <em>שם משתמש</em>, אשר משמש לאימות שלך אצל השרתים שלו. "
-"בדרך כלל, זהו החלק הראשון של כתובת הדוא\"ל שלך (החלק שלפני ה־<em>@</em>)."
+"ספק האינטרנט שלך נתן לך <em>שם משתמש</em>, אשר משמש לאימות שלך אצל השרתים "
+"שלו. בדרך כלל, זהו החלק הראשון של כתובת הדוא\"ל שלך (החלק שלפני ה־<em>@</"
+"em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -281,18 +288,18 @@ msgstr "&שמור את ססמת חשבון ה־POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "בחר באפשרות זו אם ברצונך ש-KMail ישמור את הססמה.\n"
 "אם TDEWallet זמין הססמה השמורה שם נחשבת בטוחה.\n"
-"אך, אם TDEWallet לא זמינה, הסיסמה אמנם מאוחסנת בתבנית מעורבלת בקובץ התצורה של "
-"KMail, אך אין להניח שהיא חסינה מפני ניסיונות פענוח אם מישהו משיג גישה לקובץ "
-"ההגדרות."
+"אך, אם TDEWallet לא זמינה, הסיסמה אמנם מאוחסנת בתבנית מעורבלת בקובץ התצורה "
+"של KMail, אך אין להניח שהיא חסינה מפני ניסיונות פענוח אם מישהו משיג גישה "
+"לקובץ ההגדרות."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -320,8 +327,9 @@ msgstr "ס&נן הודעות אם גודלן עולה על"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "אם תבחר באפשרות זו, ייעשה שימוש במסנני POP כדי לקבוע מה לעשות עם הודעות, ואז "
 "תוכל לבחור להוריד, למחוק או לשמור אותן על השרת."
@@ -373,13 +381,15 @@ msgstr "&טקסט פשוט"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -422,9 +432,9 @@ msgstr "מתחמים:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -483,12 +493,12 @@ msgstr "טען מצורפים לפי דרישה"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"הפעל את זה בכדי לא לטעון את המצורפים בעת קריאת הדוא\"ל אלא בעת לחיצה על המצורף. "
-"בצורה כזאת, גם דוא\"ל גדול במיוחד, יוצג מיידת."
+"הפעל את זה בכדי לא לטעון את המצורפים בעת קריאת הדוא\"ל אלא בעת לחיצה על "
+"המצורף. בצורה כזאת, גם דוא\"ל גדול במיוחד, יוצג מיידת."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -499,8 +509,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"רק תיקיות פתוחות (פרושות) בעץ התיקיות נבדקות עבור תתי־תיקיות. השתמש באפשרות זו, "
-"אם ישנן הרבה תיקיות בשרת."
+"רק תיקיות פתוחות (פרושות) בעץ התיקיות נבדקות עבור תתי־תיקיות. השתמש באפשרות "
+"זו, אם ישנן הרבה תיקיות בשרת."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -528,7 +538,7 @@ msgstr "<ללא>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "דואר נכנס"
 
@@ -536,31 +546,32 @@ msgstr "דואר נכנס"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"שים לב כי אפשרות זו עלולה לגרום לשרתי POP3 מסויימים שאינם תומכים בעיבוד במקביל "
-"לשלוח הודעות משובשות.\n"
+"שים לב כי אפשרות זו עלולה לגרום לשרתי POP3 מסויימים שאינם תומכים בעיבוד "
+"במקביל לשלוח הודעות משובשות.\n"
 "אפשרות זו ניתנת להגדרה מכיוון ששרתים מסויימים תומכים בעיבוד במקביל אך לא "
 "מודיעים על היכולות שלהם. כדי לבדוק אם שרת ה־POP3 שלך מודיע על תמיכה בעיבוד "
 "במקביל, השתמש בכפתור \"בדוק במה השרת תומך\" שבתחתית דו-שיח זה.\n"
@@ -573,23 +584,23 @@ msgstr "קודם ציין שרת ויצאה בכרטיסייה הכללית."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -597,8 +608,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -676,8 +687,8 @@ msgstr "חשבון IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "עליך להוסיף חשבון בסעיף הרשת של ההגדרות על מנת לקבל דואר."
 
 #: accountwizard.cpp:87
@@ -714,13 +725,13 @@ msgstr "ברוך בואך אל KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt> נראה שהפעלת את KMail לראשונה. באפשרותך להשתמש באשף זה כדי לקבוע את חשבונות "
-"הדואר שלך. בדפים הבאים עליך לספק מידע אשר קיבלת מספק האינטרנט שלך אודות החיבור "
-"לתיבות הבאות. </qt>"
+"<qt> נראה שהפעלת את KMail לראשונה. באפשרותך להשתמש באשף זה כדי לקבוע את "
+"חשבונות הדואר שלך. בדפים הבאים עליך לספק מידע אשר קיבלת מספק האינטרנט שלך "
+"אודות החיבור לתיבות הבאות. </qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -782,8 +793,7 @@ msgstr "שליחה מקומית"
 msgid "Server Information"
 msgstr "מידע אודות השרת"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "ללא"
@@ -917,17 +927,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -960,10 +969,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -974,8 +982,8 @@ msgstr "בדוק הודעות באמצעות כלי האנטי־וירוס"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -985,8 +993,8 @@ msgstr ""
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -995,8 +1003,8 @@ msgstr "בנוסף, סמן הודעות נגועות כנקרא"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1188,8 +1196,8 @@ msgstr "שגיאה בעת קריאת התיקייה %1 על השרת:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1209,8 +1217,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1240,15 +1248,15 @@ msgstr "נמחק"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1278,15 +1286,19 @@ msgstr "ארעה שגיאה בעת כיווץ \"%1\". הכיווץ בוטל."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "טען &פרופיל..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "הגדרות החשבון"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "ה&וספה..."
@@ -1316,6 +1328,11 @@ msgstr "<qt>האם אתה בטוח שברצונך להסיר את הזהות ש�
 msgid "Remove Identity"
 msgstr "הסר זהות"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "ה&סר"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "הוספה..."
@@ -1324,6 +1341,11 @@ msgstr "הוספה..."
 msgid "Modify..."
 msgstr "שינוי..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "ה&סר"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "קבע כברירת מחדל"
@@ -1340,17 +1362,15 @@ msgstr "&שליחה"
 msgid "Outgoing accounts (add at least one):"
 msgstr "חשבונות דואר יוצא (הוסף לפחות חשבון אחד):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "שם"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "סוג"
@@ -1372,8 +1392,7 @@ msgstr "קבע כברירת מחדל"
 msgid "Common Options"
 msgstr "אפשרויות נפוצות"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "שא&ל לפני שליחה"
@@ -1424,16 +1443,16 @@ msgstr "תחום &ברירת מחדל:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>תחום ברירת המחדל משמש להשלמת כתובות דוא\"ל שמורכבות משם משתמש בלבד.</p></qt>"
+"<qt><p>תחום ברירת המחדל משמש להשלמת כתובות דוא\"ל שמורכבות משם משתמש בלבד.</"
+"p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1451,9 +1470,9 @@ msgstr "הוספת מעביר"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (ברירת מחדל)"
 
@@ -1532,6 +1551,10 @@ msgstr "שינוי חשבון"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>אין אפשרות למצוא את החשבון <b>%1</b<.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&צבעים"
@@ -1640,8 +1663,7 @@ msgstr "קישור שביקרו בו"
 msgid "Misspelled Words"
 msgstr "מילים עם שגיאות כתיב"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "הודעה חדשה"
@@ -1830,8 +1852,8 @@ msgstr "אשכולות סגורים כברירת מחדל"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr "פת&ח אשכולות המכילים הודעות חדשות, הודעות שלא נקראו או הודעות חשובות"
 
 #: configuredialog.cpp:2055
@@ -1840,65 +1862,53 @@ msgstr "הצגת תאריכים"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>ניתן להשתמש בצירופים הבאים עבור תאריכים:</strong></p>"
-"<ul><li dir=\"rtl\">d - היום כמספר בלי אפס מוביל (1-31)</li><li dir=\"rtl\">"
-"dd - היום כמספר עם אפס מוביל (01-31)</li><li dir=\"rtl\">"
-"ddd - קיצור השם של היום (יום א' - שבת)</li><li dir=\"rtl\">"
-"dddd - השם המלא של היום (יום ראשון - שבת</li><li dir=\"rtl\">"
-"M - החודש כמספר בלי אפס מוביל (1-12)</li><li dir=\"rtl\">"
-"MM - החודש כמספר עם אפס מוביל (01-12)</li><li dir=\"rtl\">"
-"MMM - קיצור השם של החודש (ינו - דצמ)</li><li dir=\"rtl\">"
-"MMMM - השם המלא של החודש (ינואר - דצמבר)</li><li dir=\"rtl\">"
-"yy - השנה כמספר בן שתי ספרות (00-99)</li><li dir=\"rtl\">"
-"yyyy - השנה כמספר בן ארבע ספרות (0000-9999)</li></ul>"
-"<p><strong>ניתן להשתמש בצירופים הבאים עבור שעות:</string></p>"
-"<ul><li dir=\"rtl\">h - השעה בלי אפס מוביל (0-23 או 1-12 עם AM/PM)</li>"
-"<li dir=\"rtl\">hh - השעה עם אפס מוביל (00-23 או 01-12 עם AM/PM)</li>"
-"<li dir=\"rtl\">m - הדקות בלי אפס מוביל (0-59)</li><li dir=\"rtl\">"
-"mm - הדקות עם אפס מוביל (00-59)</li><li dir=\"rtl\">"
-"s - השניות בלי אפס מוביל (0-59)</li><li dir=\"rtl\">"
-"ss - השניות עם אפס מוביל (00-59)</li><li dir=\"rtl\">"
-"z - אלפיות השנייה בלי אפס מוביל (0-999)</li><li dir=\"rtl\">"
-"zzz - אלפיות השנייה עם אפס מוביל (000-999)</li><li dir=\"rtl\">"
-"AP - מעבר לתצוגת AM/PM. הצירוף יוחלף ב־\"AM\" או \"PM\".</li><li dir=\"rtl\">"
-"ap - מעבר לתצוגת AM/PM. הצירוף יוחלף ב־\"am\" או \"pm\".</li><li dir=\"rtl\">"
-"Z - איזור הזמן בצורת מספר (+0200)</li></ul>"
-"<p><strong>התוכנית תתעלם מכל שאר התווים.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>ניתן להשתמש בצירופים הבאים עבור תאריכים:</strong></p><ul><li "
+"dir=\"rtl\">d - היום כמספר בלי אפס מוביל (1-31)</li><li dir=\"rtl\">dd - "
+"היום כמספר עם אפס מוביל (01-31)</li><li dir=\"rtl\">ddd - קיצור השם של היום "
+"(יום א' - שבת)</li><li dir=\"rtl\">dddd - השם המלא של היום (יום ראשון - שבת</"
+"li><li dir=\"rtl\">M - החודש כמספר בלי אפס מוביל (1-12)</li><li dir=\"rtl"
+"\">MM - החודש כמספר עם אפס מוביל (01-12)</li><li dir=\"rtl\">MMM - קיצור השם "
+"של החודש (ינו - דצמ)</li><li dir=\"rtl\">MMMM - השם המלא של החודש (ינואר - "
+"דצמבר)</li><li dir=\"rtl\">yy - השנה כמספר בן שתי ספרות (00-99)</li><li dir="
+"\"rtl\">yyyy - השנה כמספר בן ארבע ספרות (0000-9999)</li></ul><p><strong>ניתן "
+"להשתמש בצירופים הבאים עבור שעות:</string></p><ul><li dir=\"rtl\">h - השעה "
+"בלי אפס מוביל (0-23 או 1-12 עם AM/PM)</li><li dir=\"rtl\">hh - השעה עם אפס "
+"מוביל (00-23 או 01-12 עם AM/PM)</li><li dir=\"rtl\">m - הדקות בלי אפס מוביל "
+"(0-59)</li><li dir=\"rtl\">mm - הדקות עם אפס מוביל (00-59)</li><li dir=\"rtl"
+"\">s - השניות בלי אפס מוביל (0-59)</li><li dir=\"rtl\">ss - השניות עם אפס "
+"מוביל (00-59)</li><li dir=\"rtl\">z - אלפיות השנייה בלי אפס מוביל (0-999)</"
+"li><li dir=\"rtl\">zzz - אלפיות השנייה עם אפס מוביל (000-999)</li><li dir="
+"\"rtl\">AP - מעבר לתצוגת AM/PM. הצירוף יוחלף ב־\"AM\" או \"PM\".</li><li dir="
+"\"rtl\">ap - מעבר לתצוגת AM/PM. הצירוף יוחלף ב־\"am\" או \"pm\".</li><li dir="
+"\"rtl\">Z - איזור הזמן בצורת מספר (+0200)</li></ul><p><strong>התוכנית תתעלם "
+"מכל שאר התווים.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "שינוי הגדרת השרשור הגלובלית יביא לעקיפה של כל הערכים הייחודיים לתיקיות."
 
@@ -1914,8 +1924,7 @@ msgstr "הצג פס &מצב HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "הצב מצב דוא\"ל זבל בתצוגות מהודרת"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "החלף סמיילים בתמונות"
@@ -1924,8 +1933,7 @@ msgstr "החלף סמיילים בתמונות"
 msgid "Use smaller font for quoted text"
 msgstr "השתמש בגופן קטן יותר עבור ציטוטים"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1951,8 +1959,7 @@ msgstr "אוטומטי"
 msgid "&Override character encoding:"
 msgstr "&אכוף קידוד:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "אפשר סמל במגש מערכת"
@@ -2057,20 +2064,18 @@ msgstr "הצירוף <b>%f</b> יוחלף עם שם הקובץ לעריכה."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>הצירופים הבאים נתמכים בביטויי תשובה:"
-"<br><b>%D</b>=תאריך, <b>%S</b>=נושא,"
-"<br><b>%e</b>=כתובת השולח, <b>%F</b>=שם השולח, <b>%f</b>=ראשי התיבות של השולח, "
-"<br><b>%T</b>=שם הנמען, <b>%t</b>=שם הנמען וכתובתו "
-"<br><b>%C</b>=שמות האנשים בעתק,<b>%c</b>: שמות האנשים בהעתק והכתובות שלהם "
-"<br><b>%%</b>: סימן אחוז,<b>%_</b>: רווח, <b>%L</b>:מעבר שורה </qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>הצירופים הבאים נתמכים בביטויי תשובה:<br><b>%D</b>=תאריך, <b>%S</b>=נושא,"
+"<br><b>%e</b>=כתובת השולח, <b>%F</b>=שם השולח, <b>%f</b>=ראשי התיבות של "
+"השולח, <br><b>%T</b>=שם הנמען, <b>%t</b>=שם הנמען וכתובתו <br><b>%C</b>=שמות "
+"האנשים בעתק,<b>%c</b>: שמות האנשים בהעתק והכתובות שלהם <br><b>%%</b>: סימן "
+"אחוז,<b>%_</b>: רווח, <b>%L</b>:מעבר שורה </qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2093,21 +2098,20 @@ msgstr "תשובה לכול&ם:"
 msgid "&Forward:"
 msgstr "ה&עברה:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "ציון צי&טוט:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "ב%D, כתבת:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "ב%D, נכתב על ידי %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "הודעה מועברת"
 
@@ -2145,8 +2149,8 @@ msgstr "הזן קידומת העברה חדשה:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "רשימה זו נבדקת עבור כל מכתב יוצא מתחילתה ועד סופה ומתבצע בה חיפוש אחר מערך "
 "תווים המכיל את כל התווים הנדרשים."
@@ -2183,10 +2187,9 @@ msgstr "ערך"
 msgid "Ne&w"
 msgstr "&חדש"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&שם:"
@@ -2195,16 +2198,15 @@ msgstr "&שם:"
 msgid "&Value:"
 msgstr "&ערך:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2231,13 +2233,13 @@ msgstr "צירוף"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2262,86 +2264,74 @@ msgstr "&תוספי הצפנה"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> לעתים באות הודעות דוא&quot;ל בשתי התבניות. אפשרויות אלה קובעות האם ברצונך "
-"להציג את החלק של ה־HTML או את החלק של הטקסט הרגיל.</p>"
-"<p> הצגת החלק של ה־HTML משפרת את המראה של ההודעה, אך בה בעת היא מגדילה את "
-"הסיכון לניצול של פרצות אבטחה.</p>"
-"<p> הצגת החלק הרגיל גורמת לאבדן של מרבית העיצוב של ההודעה, אך היא גם הופכת את "
-"הניצול של פרצות אבטחה במציג ה־Konqueror) HTML) לדבר כמעט <em>בלתי אפשרי</em>"
-".</p>"
-"<p>האפשרות הבאה מגינה מפני סוג אחד של שימוש לרעה בהודעות HTML, אך היא אינה "
-"יכולה להגן מפני סוגיות אבטחה שלא היו ידועות בעת כתיבת גירסה זו של KMail.</p>"
-"<p>לפיכך, מומלץ <em>לא</em> להעדיף HTML על פני טקסט רגיל.</p>"
-"<p><b>שים לב:</p> באפשרותך להגדיר אפשרות זו לכל תיקייה בנפרד דרך התפריט <i>"
-"תיקייה</i> בחלון הראשי של KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p> לעתים באות הודעות דוא&quot;ל בשתי התבניות. אפשרויות אלה קובעות האם "
+"ברצונך להציג את החלק של ה־HTML או את החלק של הטקסט הרגיל.</p><p> הצגת החלק "
+"של ה־HTML משפרת את המראה של ההודעה, אך בה בעת היא מגדילה את הסיכון לניצול של "
+"פרצות אבטחה.</p><p> הצגת החלק הרגיל גורמת לאבדן של מרבית העיצוב של ההודעה, "
+"אך היא גם הופכת את הניצול של פרצות אבטחה במציג ה־Konqueror) HTML) לדבר כמעט "
+"<em>בלתי אפשרי</em>.</p><p>האפשרות הבאה מגינה מפני סוג אחד של שימוש לרעה "
+"בהודעות HTML, אך היא אינה יכולה להגן מפני סוגיות אבטחה שלא היו ידועות בעת "
+"כתיבת גירסה זו של KMail.</p><p>לפיכך, מומלץ <em>לא</em> להעדיף HTML על פני "
+"טקסט רגיל.</p><p><b>שים לב:</p> באפשרותך להגדיר אפשרות זו לכל תיקייה בנפרד "
+"דרך התפריט <i>תיקייה</i> בחלון הראשי של KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> חלק מפרסומות הדואר באות בתבנית HTML ומכילות הפניות לפריטים כגון תמונות, בהן "
-"משתמשות פרסומות אלה כדי לברר האם קראת את ההודעה שלהן (&quot;ציתותים "
-"אינטרנטיים&quot;). </p> "
-"<p> אין כל סיבה ברת הצדקה לטעון תמונות מהאינטרנט בצורה כזו, וזאת מכיוון שהשולח "
-"יכול תמיד לצרף ישירות להודעה את התמונות הדרושות.</p> "
-"<p> כדי להישמר מפני סוג כזה של שימוש לרעה בתכונת ההצגה של HTML של KMail, אפשרות "
-"זו <em>כבויה</em> כברירת מחדל.</p> "
-"<p> אם למרות זאת ברצונך, למשל, לצפות בתוך הודעות HTML בתמונות שלא צורפו אל "
-"ההודעה, באפשרותך לאפשר אפשרות זו, אך עליך להיות מודע לבעייתיות האפשרית. </p> "
-"</qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p> חלק מפרסומות הדואר באות בתבנית HTML ומכילות הפניות לפריטים כגון "
+"תמונות, בהן משתמשות פרסומות אלה כדי לברר האם קראת את ההודעה שלהן (&quot;"
+"ציתותים אינטרנטיים&quot;). </p> <p> אין כל סיבה ברת הצדקה לטעון תמונות "
+"מהאינטרנט בצורה כזו, וזאת מכיוון שהשולח יכול תמיד לצרף ישירות להודעה את "
+"התמונות הדרושות.</p> <p> כדי להישמר מפני סוג כזה של שימוש לרעה בתכונת ההצגה "
+"של HTML של KMail, אפשרות זו <em>כבויה</em> כברירת מחדל.</p> <p> אם למרות זאת "
+"ברצונך, למשל, לצפות בתוך הודעות HTML בתמונות שלא צורפו אל ההודעה, באפשרותך "
+"לאפשר אפשרות זו, אך עליך להיות מודע לבעייתיות האפשרית. </p> </qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2358,15 +2348,15 @@ msgstr "א&פשר להודעות לטעון הפניות חיצוניות מהא
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<qt><b>אזהרה:</b> התרת שימוש ב־HTML בדוא\"ל עלולה להגדיל את הסיכון שהמערכת שלך "
-"תהיה פגיעה לניצולי אבטחה קיימים ועתידיים. <a href=\"whatsthis:%1\">"
-"עוד אודות דוא&quot;ל HTML...</a> <a href=\"whatsthis:%2\">"
-"עוד אודות קישורים חיצוניים.... </a>"
+"<qt><b>אזהרה:</b> התרת שימוש ב־HTML בדוא\"ל עלולה להגדיל את הסיכון שהמערכת "
+"שלך תהיה פגיעה לניצולי אבטחה קיימים ועתידיים. <a href=\"whatsthis:%1\">עוד "
+"אודות דוא&quot;ל HTML...</a> <a href=\"whatsthis:%2\">עוד אודות קישורים "
+"חיצוניים.... </a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2427,8 +2417,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>אזהרה:</b> החזרת אישורים ללא הבחנה פוגעת בפרטיותך. <a href=\"whatsthis:%1\">"
-"עוד...</a>"
+"<b>אזהרה:</b> החזרת אישורים ללא הבחנה פוגעת בפרטיותך. <a href=\"whatsthis:"
+"%1\">עוד...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2448,8 +2438,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2478,8 +2467,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "בעת חיפוש אחרי הודעות שלא ניקראו:"
 
@@ -2503,8 +2492,8 @@ msgstr "גלוש בכל התיקיות"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2573,25 +2562,22 @@ msgstr "ספריות (תבנית \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>בחירת תבנית תיבת הדואר שתשמש כברירת מחדל עבור התיקיות המקומיות:</p>"
-"<p dir=rtl><b>mbox:</b> כל תיקיית דואר ב־KMail מיוצגת על ידי קובץ נפרד. ההודעות "
-"מופרדות זו מזו באמצעות שורה הנפתחת ב־\"From \". דרך זו חוסכת מקום בדיסק, אך היא "
-"עשויה להיות פחות גמישה, למשל בעת העברה של הודעות בין תיקיות.</p><p dir=rtl><b>"
-"maildir:</b> תיקיות דואר ב־KMail מיוצגות על ידי תיקיות אמיתיות על גבי הדיסק. כל "
-"הודעה נמצאת בקובץ נפרד. דרך זה עשויה לבזבז מעט מקום בדיסק, אך היא אמורה להיות "
-"יותר גמישה, למשל בעת העברה של הודעות בין תיקיות.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>בחירת תבנית תיבת הדואר שתשמש כברירת מחדל עבור התיקיות המקומיות:</p><p "
+"dir=rtl><b>mbox:</b> כל תיקיית דואר ב־KMail מיוצגת על ידי קובץ נפרד. ההודעות "
+"מופרדות זו מזו באמצעות שורה הנפתחת ב־\"From \". דרך זו חוסכת מקום בדיסק, אך "
+"היא עשויה להיות פחות גמישה, למשל בעת העברה של הודעות בין תיקיות.</p><p "
+"dir=rtl><b>maildir:</b> תיקיות דואר ב־KMail מיוצגות על ידי תיקיות אמיתיות על "
+"גבי הדיסק. כל הודעה נמצאת בקובץ נפרד. דרך זה עשויה לבזבז מעט מקום בדיסק, אך "
+"היא אמורה להיות יותר גמישה, למשל בעת העברה של הודעות בין תיקיות.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2626,32 +2612,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2717,8 +2698,8 @@ msgstr "&הסתר תיקיות groupware "
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2727,8 +2708,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2781,19 +2762,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2806,14 +2786,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2922,17 +2902,16 @@ msgstr "&העבר"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2950,15 +2929,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3028,8 +3007,8 @@ msgstr "עריכת זהות"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3285,6 +3264,11 @@ msgstr "בחר תיקייה"
 msgid "Filters"
 msgstr "סנן %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "בחר את כל הטקסט"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3316,8 +3300,8 @@ msgstr "&פעילויות רישום המסננים"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3334,10 +3318,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3358,10 +3343,10 @@ msgstr "ללא הגבלה"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3370,7 +3355,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "שגיאה של KMail"
@@ -3411,9 +3396,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3465,8 +3450,8 @@ msgstr "אין לך הרשאת קריאה\\כתיבה לתיקיית האשפה
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3477,8 +3462,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "ארעה שגיאה בעת התחברות אל שרת %1"
@@ -3504,8 +3488,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3535,7 +3519,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "בחר תיקייה"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "תיקיות מקומיות"
@@ -3560,9 +3544,9 @@ msgstr "בחר קיצור עבור התיקייה"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3583,11 +3567,20 @@ msgstr "&בטל"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "לא ידוע"
@@ -3706,54 +3699,15 @@ msgstr "מצב דוא\"ל זבל"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b> <br>ה<br>ו<br>ד<br>ע<br>ת<br>  <br>H<br>T<br>M<br>L </b> </qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>א"
-"<br>י"
-"<br>ן"
-"<br>ה"
-"<br>ו"
-"<br>ד"
-"<br>ע"
-"<br>ת"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L </qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>א<br>י<br>ן<br>ה<br>ו<br>ד<br>ע<br>ת<br><br>H<br>T<br>M<br>L </qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3765,12 +3719,9 @@ msgstr "ה&שם שלך:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3779,11 +3730,9 @@ msgstr "אי&רגון:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3792,14 +3741,11 @@ msgstr "כתובת &דוא\"ל:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3809,21 +3755,12 @@ msgstr "כתובת &דוא\"ל:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3847,12 +3784,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3865,22 +3801,20 @@ msgstr "מפתח ההפצה של OpenPGP שלך"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "בחר את המפתח של OpenPGP שישמש לצורך שימוש אישי, וגם לצורך האפשרות \"צרף את "
 "המפתח הציבורי שלי\" בעורך."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3901,11 +3835,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3918,18 +3851,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3950,14 +3882,12 @@ msgstr "כתובת &תשובה:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3966,22 +3896,17 @@ msgstr "כתובות עותק &סמוי:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>כתובות עותק סמוי</h3>"
-"<p> הכתובות שתזין כאן יתווספו לכל הודעה יוצאת שתישלח על ידי זהות זו. כתובות אלה "
-"לא   יהיו גלויות לנמענים אחרים.</p>"
-"<p> דבר זה משמש בדרך כלל כדי לשלוח עותק מכל הודעה לחשבון נוסף ששייך לך.</p>"
-"<p> אם אינך בטוח מה לעשות, השאר שדה זה ריק.</p> </qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>כתובות עותק סמוי</h3><p> הכתובות שתזין כאן יתווספו לכל הודעה יוצאת "
+"שתישלח על ידי זהות זו. כתובות אלה לא   יהיו גלויות לנמענים אחרים.</p><p> דבר "
+"זה משמש בדרך כלל כדי לשלוח עותק מכל הודעה לחשבון נוסף ששייך לך.</p><p> אם "
+"אינך בטוח מה לעשות, השאר שדה זה ריק.</p> </qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4021,7 +3946,7 @@ msgstr "&חתימה"
 msgid "&Picture"
 msgstr "&תמונה"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "כתובת דוא\"ל לא תקפה"
 
@@ -4040,8 +3965,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4075,8 +4000,8 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"תיקיית הדואר הנשלח המותאמת אישית עבור הזהות \"%1\" אינה קיימת (עוד). לכן, ייעשה "
-"שימוש בתיקיית הדואר הנשלח המוגדרת כברירת מחדל."
+"תיקיית הדואר הנשלח המותאמת אישית עבור הזהות \"%1\" אינה קיימת (עוד). לכן, "
+"ייעשה שימוש בתיקיית הדואר הנשלח המוגדרת כברירת מחדל."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4097,8 +4022,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (ברירת מחדל)"
 
@@ -4143,14 +4068,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4188,14 +4113,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "שגיאה: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4344,14 +4274,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4379,136 +4309,110 @@ msgstr "מפתחות הצפנה לא שמיש"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4522,136 +4426,110 @@ msgstr ""
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4664,9 +4542,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4692,26 +4571,26 @@ msgstr "מפתחות חתימה לא שמישים"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4722,8 +4601,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4745,8 +4624,8 @@ msgstr "אין אפשרות לחתום"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4766,8 +4645,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4806,11 +4685,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4855,10 +4734,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "שגיאה קריטית: אין אפשרות לאסוף את הדואר."
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"כישלון בהוספת הודעה:\n"
+msgid "Failed to add message:\n"
+msgstr "כישלון בהוספת הודעה:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -4948,6 +4825,51 @@ msgstr "IMAP מנותק"
 msgid "&Maildir mailbox"
 msgstr "תיבת &ספריית־דואר (maildir)"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "                 קבע את נושא ההודעה"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "          \"address\" שלח עותק לכתובת"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "     \"address\" שלח עותק סמוי לכתובת"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "     להודעה \"header\" הוסף את הכותרת"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "\"file\" קרא את גוף ההודעה מתוך הקובץ"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "                  קבע את גוף ההודעה"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "הוסף מצורף למכתב. ניתן לחזור על זאת"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "                 בדוק דואר חדש בלבד"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "                   פתח רק חלון כתבן"
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "מעביר את הודעה %3 מתוך %2 מ-%1."
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "דואר"
@@ -5002,9 +4924,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5054,11 +4976,11 @@ msgstr "הכתובת הועתקה ללוח העריכה."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>הקובץ <b>%1</b> קיים.<br>האם ברצונך להחליפו? </qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "שמור לקובץ"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "הח&לף"
 
@@ -5076,7 +4998,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5096,11 +5018,11 @@ msgstr "הקובץ הזה לא מכיל הודעה."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5109,113 +5031,113 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "מוחק הודעות"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "מעביר את הודעה %3 מתוך %2 מ-%1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "אין מספיק מקום פנוי?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "העבר לתיקייה זו"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "העתק לתיקייה זו"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "מעביר הודעות"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "מוחק הודעות"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "פותח כתובת..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt> האם אתה בטוח שברצונך ללהפעיל <b>%1</b>? </qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "הפעל פקודה"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "לא נמצאו מצורפים לשמירה"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "שמירת מצורף בשם"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "attachment.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "attachment.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "כבר קיים קובץ תחת שם %1. האם ברצונך לכתוב אותו?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "הקובץ כבר קיים"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&שכתב"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "חלק %1 של ההודעה מוצפן. האם ברצונך להשאיר את ההצפנה בעת השמירה?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "שאלה מ־KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "שמור הצפנה"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "אל תשמור"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "חלק %1 של ההודעה חתום. האם ברצונך להשאיר את החתימה בעת השמירה?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "שמור חתימה"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 #, fuzzy
 msgid ""
 "_: %2 is detailed error description\n"
@@ -5225,85 +5147,85 @@ msgstr ""
 "אין אפשרות לכתוב את הקובץ %1:\n"
 "%1"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "אין אפשרות לכתוב את הקובץ %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "דואר"
@@ -5402,7 +5324,7 @@ msgstr "גודל"
 msgid "Encoding"
 msgstr "קידוד"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "כווץ"
 
@@ -5414,7 +5336,7 @@ msgstr "הצפן"
 msgid "Sign"
 msgstr "חתום"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "שם המצורף:"
 
@@ -5436,7 +5358,8 @@ msgstr "נמענים ראשיים"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt> כתובות הדוא\"ל שתכתוב בשדה זה יקבלו עותק של הדוא\"ל. </qt>"
 
 #: kmcomposewin.cpp:1052
@@ -5446,9 +5369,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5457,9 +5380,8 @@ msgstr "נמענים מוסתרים"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5470,7 +5392,7 @@ msgstr "&שלח דואר"
 msgid "&Send Mail Via"
 msgstr "&שלח דואר באמצעות"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "שלח &אחר-כך"
@@ -5537,8 +5459,7 @@ msgstr "ה&סר מרכאות ציטוט:"
 msgid "Cl&ean Spaces"
 msgstr "&נקה רווחים"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "השתמש ב&גופן ברוחב קבוע"
@@ -5680,31 +5601,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "סט&נדרטי"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5808,8 +5729,8 @@ msgstr "סגור כתבן"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5817,42 +5738,44 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "תזכורת מצורף"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&שלח ללא שינוי"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "צירוף קובץ"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&צירוף"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "הוספת קובץ"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "הוספת קובץ"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5892,176 +5815,186 @@ msgid ""
 "View"
 msgstr "הצג"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "עריכה..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "עריכה..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "שמירה &בשם..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&מאפיינים"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "הוסף מצורף..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "אין אפשרות לכווץ את הקובץ."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "הקובץ המכווץ יותר גדול מהמקורי. באם ברצונך לשמור את המקורי?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "השאר"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "אין אפשרות לפרוס את הקובץ."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "שמירת מצורף בשם"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "הוסף בתור טקסט"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "הוסף בתור מצורף"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "הדבק בתור &מצורף"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ללא שם"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "מפתח הצפנה לא מוגדר"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> על מנת שניתן יהיה לחתום על הודעה זו, יש להגדיר תחילה מפתח של (OpenPGP או "
-"S/MIME) שישמש לשם כך. </p>"
-"<p> באפשרותך להגדיר את המפתח שייעשה בו שימוש עם הזהות הנוכחית בדו-שיח הגדרות "
-"הזהות. </p></qt>"
+"<qt><p> על מנת שניתן יהיה לחתום על הודעה זו, יש להגדיר תחילה מפתח של "
+"(OpenPGP או S/MIME) שישמש לשם כך. </p><p> באפשרותך להגדיר את המפתח שייעשה בו "
+"שימוש עם הזהות הנוכחית בדו-שיח הגדרות הזהות. </p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "מפתח חתימה לא מוגדר"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "עליך לציין לפחות נמען אחד בשדה, או בשדה \"נמען\" או \"עותק סמוי\"."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "לא ציינת נושא. האם לשלוח את ההודעה בכל זאת?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "לא צויין נושא"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "לא ציינת נושא. האם לשלוח את ההודעה בכל זאת?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "לא צויין נושא"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&שלח ללא שינוי"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&תן לי לציין את הנושא"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "האם להצפין או לתחום על ההודעה?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6070,105 +6003,105 @@ msgstr ""
 "תיקיית הטיוטות המותאמת אישית עבור הזהות \"%1\" אינה קיימת (עוד). לכן, ייעשה "
 "שימוש בתיקיית הטיוטות המוגדרת כברירת מחדל."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "צור חשבון לשליחת דואר ונסה שנית."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "עומד לשלוח דואר..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "וידוא שליחה"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "שלח &עכשיו"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<נמענים>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "<נמענים>"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "בודק איות"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "בודק איות"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " בדיקת האיות בוטלה."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " בדיקת האיות הופסקה."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " בדיקת האיות הושלמה."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "בודק איות"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "בחירת מפתח הפצנת Chiasmus "
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "ההודעה נחתמה על ידי %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "ההודעה נחתמה על ידי %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "הודעה של OpenPGP - מוצפנת"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "הודעה עם נושא:"
@@ -6218,8 +6151,8 @@ msgstr "בדיקת איות - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "אין אפשרות להפעיל את ISpell/Aspell. ודא ש-ISpell או Aspell מוגדרים כהלכה "
 "ונמצאים בנתיב שלך."
@@ -6255,13 +6188,11 @@ msgstr "<qt>יש יותר מדיי פעולות סינון בכלל הסינון
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>פעולת סינון לא מוכרת <b>%1</b>"
-"<br>בכלל הסינון <b>%2</b>."
-"<br>התוכנית תתעלם ממנה. </qt>"
+"<qt>פעולת סינון לא מוכרת <b>%1</b><br>בכלל הסינון <b>%2</b>.<br>התוכנית "
+"תתעלם ממנה. </qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6480,165 +6411,127 @@ msgstr "השמע צליל"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>זוהי רשימת המסננים המוגדרים. הם מעובדים לפי סדר מלמעלה למטה.</p>"
-"<p>לחץ על מסנן כלשהו על מנת לערוך אותו באמצעות האפשרויות שבחלק השמאלי של דו-שיח "
-"זה.</p></qt>"
+"<qt><p>זוהי רשימת המסננים המוגדרים. הם מעובדים לפי סדר מלמעלה למטה.</"
+"p><p>לחץ על מסנן כלשהו על מנת לערוך אותו באמצעות האפשרויות שבחלק השמאלי של "
+"דו-שיח זה.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>לחץ על כפתור זה כדי ליצור מסנן חדש.</p>"
-"<p> המסנן יתווסף מיקום אחד לפני המסנן הנבחר, אך בכל מקרה באפשרותך תמיד לשנות "
-"זאת בהמשך. </p>"
-"<p> אם לחצת על כפתור זה בטעות, באפשרותך לבטל זאת באמצעות כפתור ה<em>מחיקה</em>"
-".</p> </qt>"
+"<qt><p>לחץ על כפתור זה כדי ליצור מסנן חדש.</p><p> המסנן יתווסף מיקום אחד "
+"לפני המסנן הנבחר, אך בכל מקרה באפשרותך תמיד לשנות זאת בהמשך. </p><p> אם לחצת "
+"על כפתור זה בטעות, באפשרותך לבטל זאת באמצעות כפתור ה<em>מחיקה</em>.</p> </qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>לחץ על כפתור זה כדי להעתיק מסנן .</p>"
-"<p> המסנן יתווסף מיקום אחד לפני המסנן הנבחר, אך בכל מקרה באפשרותך תמיד לשנות "
-"זאת בהמשך. </p>"
-"<p> אם לחצת על כפתור זה בטעות, באפשרותך לבטל זאת באמצעות כפתור ה<em>מחיקה</em>"
-". </p></qt>"
+"<qt><p>לחץ על כפתור זה כדי להעתיק מסנן .</p><p> המסנן יתווסף מיקום אחד לפני "
+"המסנן הנבחר, אך בכל מקרה באפשרותך תמיד לשנות זאת בהמשך. </p><p> אם לחצת על "
+"כפתור זה בטעות, באפשרותך לבטל זאת באמצעות כפתור ה<em>מחיקה</em>. </p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> לחץ על כפתור זה כדי <em>למחוק</em> את המסנן הנבחר מהרשימה שלעיל. </p>"
-"<p> אין כל דרך להחזיר את המסנן ברגע שהוא נמחק, אך בכל מקרה באפשרותך תמיד לעזוב "
-"את הדו-שיח באמצעות לחיצה על הכפתור <em>ביטול</em> על מנת להתעלם מהשינויים "
-"שנעשו. </p></qt>"
+"<qt><p> לחץ על כפתור זה כדי <em>למחוק</em> את המסנן הנבחר מהרשימה שלעיל. </"
+"p><p> אין כל דרך להחזיר את המסנן ברגע שהוא נמחק, אך בכל מקרה באפשרותך תמיד "
+"לעזוב את הדו-שיח באמצעות לחיצה על הכפתור <em>ביטול</em> על מנת להתעלם "
+"מהשינויים שנעשו. </p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למטה</em> "
-"ברשימה שלעיל. </p>"
-"<p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר שבו הם ינוסו על "
-"ההודעות: המסנן העליון מנוסה ראשון. </p>"
-"<p> אם לחצת על כפתור זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>"
-"למעלה</em>. </p></qt>"
+"<qt><p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למטה</em> "
+"ברשימה שלעיל. </p><p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר "
+"שבו הם ינוסו על ההודעות: המסנן העליון מנוסה ראשון. </p><p> אם לחצת על כפתור "
+"זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>למעלה</em>. </p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למעלה</em> "
-"ברשימה שלעיל. </p>"
-"<p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר שבו הם ינוסו על "
-"ההודעות: המסנן העליון מנוסה ראשון. </p>"
-"<p> אם לחצת על כפתור זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>"
-"למטה</em>. </p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למעלה</em> "
+"ברשימה שלעיל. </p><p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר "
+"שבו הם ינוסו על ההודעות: המסנן העליון מנוסה ראשון. </p><p> אם לחצת על כפתור "
+"זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>למטה</em>. </p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למטה</em> "
-"ברשימה שלעיל. </p>"
-"<p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר שבו הם ינוסו על "
-"ההודעות: המסנן העליון מנוסה ראשון. </p>"
-"<p> אם לחצת על כפתור זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>"
-"למעלה</em>. </p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למטה</em> "
+"ברשימה שלעיל. </p><p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר "
+"שבו הם ינוסו על ההודעות: המסנן העליון מנוסה ראשון. </p><p> אם לחצת על כפתור "
+"זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>למעלה</em>. </p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למטה</em> "
-"ברשימה שלעיל. </p>"
-"<p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר שבו הם ינוסו על "
-"ההודעות: המסנן העליון מנוסה ראשון. </p>"
-"<p> אם לחצת על כפתור זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>"
-"למעלה</em>. </p></qt>"
+"<qt><p> לחץ על כפתור זה כדי להזיז את המסנן הנבחר מיקום אחד <em>למטה</em> "
+"ברשימה שלעיל. </p><p> דבר זה שימושי מכיוון שסדר המסננים ברשימה קובע את הסדר "
+"שבו הם ינוסו על ההודעות: המסנן העליון מנוסה ראשון. </p><p> אם לחצת על כפתור "
+"זה בטעות, באפשרותך לבטל זאת באמצעות לחיצה על הכפתור <em>למעלה</em>. </p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>לחץ על כפתור זה כדי לשנות את השם של המסנן הנבחר.</p>"
-"<p> המסננים מקבלים שם באופן אוטומטי, כל עוד הם מתחילים ב־\"&lt;\". </p>"
-"<p> אם שינית שם של מסנן בטעות ואתה רוצה שוב את השם האוטומטי, לחץ על כפתור זה "
-"ובחר בדו-שיח שיופיע ב<em>מחק</em> ולאחר מכן ב<em>אישור</em>. </p></qt>"
+"<qt><p>לחץ על כפתור זה כדי לשנות את השם של המסנן הנבחר.</p><p> המסננים "
+"מקבלים שם באופן אוטומטי, כל עוד הם מתחילים ב־\"&lt;\". </p><p> אם שינית שם "
+"של מסנן בטעות ואתה רוצה שוב את השם האוטומטי, לחץ על כפתור זה ובחר בדו-שיח "
+"שיופיע ב<em>מחק</em> ולאחר מכן ב<em>אישור</em>. </p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>בחר באפשרות זו כדי לאלץ הצגה של דו-שיח האישור.</p>"
-"<p> דבר זה שימושי אם הגדרת קבוצת כללים המסמנת הודעות שיש להוריד מאוחר יותר. ללא "
-"האפשרות לאלץ את הצגת הדו-שיח, אף פעם לא ניתן יהיה להוריד את ההודעות האלה אם אין "
-"עוד הודעות גדולות הממתינות על השרת, או אם ברצונך לשנות את קבוצת הכללים כדי לסמן "
+"<qt><p>בחר באפשרות זו כדי לאלץ הצגה של דו-שיח האישור.</p><p> דבר זה שימושי "
+"אם הגדרת קבוצת כללים המסמנת הודעות שיש להוריד מאוחר יותר. ללא האפשרות לאלץ "
+"את הצגת הדו-שיח, אף פעם לא ניתן יהיה להוריד את ההודעות האלה אם אין עוד "
+"הודעות גדולות הממתינות על השרת, או אם ברצונך לשנות את קבוצת הכללים כדי לסמן "
 "את ההודעות באופן אחר. </p></qt>"
 
 #: kmfilterdlg.cpp:133
@@ -6649,6 +6542,16 @@ msgstr "כללי סינון של POP3"
 msgid "Filter Rules"
 msgstr "כללי סינון"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&ייבוא..."
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&ייבוא..."
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "מסננים זמינים"
@@ -6729,6 +6632,11 @@ msgstr "בסנוף הוסף את המסנן הזה אל הסרגל"
 msgid "Icon for this filter:"
 msgstr "סמל עבור מסנן זה:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "א&ל"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "למעלה"
@@ -6737,16 +6645,29 @@ msgstr "למעלה"
 msgid "Down"
 msgstr "למטה"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "שינוי שם..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "חדש"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "הע&תק אל"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "נמחק"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6755,8 +6676,8 @@ msgstr "בחר קיצור עבור התיקייה"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6764,8 +6685,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"המסננים הבאים לא נשמרו מאחר שהם אינם תקפים (למשל, לא מכילים אף פעולה או אף כלל "
-"חיפוש)."
+"המסננים הבאים לא נשמרו מאחר שהם אינם תקפים (למשל, לא מכילים אף פעולה או אף "
+"כלל חיפוש)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -6834,19 +6755,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6885,8 +6803,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6905,7 +6823,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"האם אתה בטוח שברצונך לרענן את מטמון ה־IMAP של תיקייה %1 וכל תתי התיקיות שלה?\n"
+"האם אתה בטוח שברצונך לרענן את מטמון ה־IMAP של תיקייה %1 וכל תתי התיקיות "
+"שלה?\n"
 "זה יסיר את כל השינויים שנעשו באופן מקומי לתיקיות שלך."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -6922,8 +6841,8 @@ msgstr "האינדקס של תיקייה זו נבנה מחדש."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7050,10 +6969,8 @@ msgstr "יוצר תיקיית משנה בשרת"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7075,9 +6992,8 @@ msgstr "מאחזר תיקיות עבור שם מתחם %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7086,14 +7002,14 @@ msgstr "בוטל"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7107,11 +7023,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7120,15 +7036,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "העבר אל:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -7140,8 +7061,7 @@ msgstr "העברת הודעות לתיקייה"
 msgid "Permissions (ACL)"
 msgstr "הרשאות (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "כללי"
@@ -7166,8 +7086,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "השתמש ב&סמלים מותאמים אישית"
@@ -7186,14 +7105,13 @@ msgstr "פעולה בעת קבלת דואר חדש, או לא ניקרא בתי�
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7206,9 +7124,9 @@ msgstr "שמור הודעות בתיקייה זו"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7219,17 +7137,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "&הצג טור:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "קבע כברירת מחדל"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "השולח"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "הנמען"
@@ -7240,11 +7162,11 @@ msgstr "&זהות חדשה:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7263,12 +7185,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7299,17 +7221,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7380,11 +7302,12 @@ msgstr "ארעה שגיאה בעת קבלת מידע אודות התיקייה."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "אינדקס הדואר של \"%1\" הוא מגרסה לא ידועה של KMail (%2).\n"
-"ניתן ליצור אינדקס זה מחדש מתוך תיקיית הדואר שלך, אך מידע מסוים, כולל סימני מצב, "
-"עלול ללכת לאיבוד. האם ברצונך להחזיר את קובץ האינדקס שלך לגירסה הנוכחית?"
+"ניתן ליצור אינדקס זה מחדש מתוך תיקיית הדואר שלך, אך מידע מסוים, כולל סימני "
+"מצב, עלול ללכת לאיבוד. האם ברצונך להחזיר את קובץ האינדקס שלך לגירסה הנוכחית?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -7401,8 +7324,8 @@ msgid ""
 "information, like status flags, might get lost."
 msgstr ""
 "אינדקס הדואר של \"%1\" הוא מגרסה לא ידועה של KMail (%2).\n"
-"ניתן ליצור אינדקס זה מחדש מתוך תיקיית הדואר שלך, אך מידע מסוים, כולל סימני מצב, "
-"עלול ללכת לאיבוד. האם ברצונך להחזיר את קובץ האינדקס שלך לגירסה הנוכחית?"
+"ניתן ליצור אינדקס זה מחדש מתוך תיקיית הדואר שלך, אך מידע מסוים, כולל סימני "
+"מצב, עלול ללכת לאיבוד. האם ברצונך להחזיר את קובץ האינדקס שלך לגירסה הנוכחית?"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -7410,8 +7333,8 @@ msgstr "ארעה שגיאה בעת פתיחה של %1, תיקייה זו חסר�
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "שגיאת בפתיחת %1. או שזו לא תיקיית ספריית־דואר תקפה, או שאין לך הרשאות גישה "
 "מספיקות."
@@ -7456,20 +7379,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>עושה רושם שהאינדקס של התיקייה \"%2\" אינו עדכני. על מנת להימנע מנזק להודעות, "
-"האינדקס ייווצר מחדש. כתוצאה מכך, הודעות שנמחקו עשויות להופיע מחדש ודגלי מצב "
-"עלולים להיאבד.</p>"
-"<p>קרא את הסעיף הרלבנטי ב<a href=\"%1\">פרק השאלות הנפוצות של ספר ההדרכה של "
-"KMail</a> לקבלת מידע לגבי כיצד יש להימנע מהישנות של בעיה כזו בעתיד.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>עושה רושם שהאינדקס של התיקייה \"%2\" אינו עדכני. על מנת להימנע מנזק "
+"להודעות, האינדקס ייווצר מחדש. כתוצאה מכך, הודעות שנמחקו עשויות להופיע מחדש "
+"ודגלי מצב עלולים להיאבד.</p><p>קרא את הסעיף הרלבנטי ב<a href=\"%1\">פרק "
+"השאלות הנפוצות של ספר ההדרכה של KMail</a> לקבלת מידע לגבי כיצד יש להימנע "
+"מהישנות של בעיה כזו בעתיד.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7526,13 +7446,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7540,8 +7460,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7549,7 +7469,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "נכשל בעת יצירת התיקייה"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7649,9 +7569,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7787,15 +7707,15 @@ msgstr "%1 התיקייה היא לקריאה בלבד."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>האם אתה בטוח שברצונך למחוק את ההודעה הנבחרת?"
-"<br>מרגע שהיא תימחק, לא ניתן יהיה לשחזר אותה.</qt>\n"
-"<qt>האם אתה בטוח שברצונך למחוק את %n ההודעות הנבחרות?"
-"<br>מרגע שהן יימחקו, לא ניתן יהיה לשחזר אותן.</qt>"
+"<qt>האם אתה בטוח שברצונך למחוק את ההודעה הנבחרת?<br>מרגע שהיא תימחק, לא ניתן "
+"יהיה לשחזר אותה.</qt>\n"
+"<qt>האם אתה בטוח שברצונך למחוק את %n ההודעות הנבחרות?<br>מרגע שהן יימחקו, לא "
+"ניתן יהיה לשחזר אותן.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -7847,125 +7767,124 @@ msgstr ""
 "כשל בשינוי %1\n"
 "(לא נשאר עוד מקום על ההתקן?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "בקשה לחתימה על תעודה"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "כרגע, KMail רצה במצב לא מקוון. איך ברצונך להמשיך?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "עבוד באופן מקוון"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "עבוד באופן לא מקוון"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "אין לך הרשאת קריאה\\כתיבה לתיקיית הדואר הנכנס שלך."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "דואר יוצא"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "אין לך הרשאת קריאה\\כתיבה לתיקיית הדואר היוצא שלך."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "דואר שנשלח"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "אין לך הרשאת קריאה\\כתיבה לתיקיית הדואר שנשלח שלך."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "אשפה"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "אין לך הרשאת קריאה\\כתיבה לתיקיית האשפה שלך."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "טיוטות"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "אין לך הרשאת קריאה\\כתיבה לתיקיית הטיוטות שלך."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "הח&לף"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "אין לך הרשאת קריאה\\כתיבה לתיקיית האשפה שלך."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "חיפוש אחרון"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "היישום KMail נתקל בשגיאה חמורה ויסתיים ברגע זה "
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7976,11 +7895,11 @@ msgstr ""
 "השגיאה הייתה:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "רוקן אשפה"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "האם אתה בטוח שברצונך לרוקן את תיקיית האשפה בכל החשבונות?"
 
@@ -8055,8 +7974,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>הגיע דוא\"ל חדש</b> <br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8094,11 +8012,11 @@ msgstr "האם אתה בטוח שברצונך לרוקן את תיקיית הא�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt> האם אתה בטוח שברצונך להעביר את כל ההודעות מהתיקייה <b>%1</b> "
-"אל האשפה?  </qt>"
+"<qt> האם אתה בטוח שברצונך להעביר את כל ההודעות מהתיקייה <b>%1</b> אל האשפה?  "
+"</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8122,11 +8040,11 @@ msgstr "מחיקת חיפוש"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>האם אתה בטוח שברצונך למחוק את החיפוש <b>%1</b> "
-"<br> כל ההודעות המוצגות בו, עדיין יהיו זמינות בתיקיות המקוריות שלהן. </qt>"
+"<qt>האם אתה בטוח שברצונך למחוק את החיפוש <b>%1</b> <br> כל ההודעות המוצגות "
+"בו, עדיין יהיו זמינות בתיקיות המקוריות שלהן. </qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8139,37 +8057,40 @@ msgstr "<qt> האם אתה בטוח שברצונך להסיר תיקייה הר�
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>האם אתה בטוח שברצונך למחוק את התיקייה הריקה <b>%1</b> "
-"וכל תתי התיקיות שלה? ייתכן כי תתי תיקיות אלו לא ריקות, והתוכן שלהן ילך לאיבוד "
-"גם כן. </qt>"
+"<qt>האם אתה בטוח שברצונך למחוק את התיקייה הריקה <b>%1</b> וכל תתי התיקיות "
+"שלה? ייתכן כי תתי תיקיות אלו לא ריקות, והתוכן שלהן ילך לאיבוד גם כן. </qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>האם אתה בטוח שברצונך למחוק את התיקייה <b>%1</b>  תוך אובדן התכולה שלה? </qt>"
+"<qt>האם אתה בטוח שברצונך למחוק את התיקייה <b>%1</b>  תוך אובדן התכולה שלה? </"
+"qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>האם אתה בטוח שברצונך למחוק את התיקייה <b>%1</b> ואת כל תיקיות המשנה שלה, "
 "תוך אובדן התכולה שלהן? </qt>"
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "נמחק"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8182,12 +8103,13 @@ msgstr "האם אתה בטוח שברצונך להפיג את כל ההודעו�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"שימוש ב־HTML בדואר הופך אותך ליותר פגיע ל\"דואר זבל\" ועלול להגדיל את הסבירות "
-"לכך שהמערכת שלך תהיה נתונה לסיכונים מצד ניצולי אבטחה קיימים או עתידיים אחרים."
+"שימוש ב־HTML בדואר הופך אותך ליותר פגיע ל\"דואר זבל\" ועלול להגדיל את "
+"הסבירות לכך שהמערכת שלך תהיה נתונה לסיכונים מצד ניצולי אבטחה קיימים או "
+"עתידיים אחרים."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8200,11 +8122,12 @@ msgstr ""
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"שימוש ב־HTML בדואר הופך אותך ליותר פגיע ל\"דואר זבל\" ועלול להגדיל את הסבירות "
-"לכך שהמערכת שלך תהיה נתונה לסיכונים מצד ניצולי אבטחה קיימים או עתידיים אחרים."
+"שימוש ב־HTML בדואר הופך אותך ליותר פגיע ל\"דואר זבל\" ועלול להגדיל את "
+"הסבירות לכך שהמערכת שלך תהיה נתונה לסיכונים מצד ניצולי אבטחה קיימים או "
+"עתידיים אחרים."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8220,8 +8143,8 @@ msgstr "סינון לפי רשימת־הדיוור %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8239,7 +8162,8 @@ msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק את ההתקנה שלך."
 
 #: kmmainwidget.cpp:2508
@@ -8577,8 +8501,7 @@ msgstr "שמירת &מצורפים..."
 msgid "Appl&y All Filters"
 msgstr "ה&חל את כל מסננים"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "החל מס&נן"
@@ -8692,7 +8615,6 @@ msgstr "ההודעה ה&באה שלא נקראה"
 msgid "Go to the next unread message"
 msgstr "מעבר להודעה הבאה שלא נקראה"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "ההודעה ה&קודמת"
@@ -8740,8 +8662,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"גלילה כלפי מטה של ההודעה הנוכחית. אם זהו סוף ההודעה הנוכחית, מעבר להודעה הבאה "
-"שלא נקראה."
+"גלילה כלפי מטה של ההודעה הנוכחית. אם זהו סוף ההודעה הנוכחית, מעבר להודעה "
+"הבאה שלא נקראה."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -8833,25 +8755,25 @@ msgstr " מאתחל..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8859,8 +8781,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8868,8 +8790,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8898,17 +8820,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "קבלה: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "מצורף:  %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "הצגת המצורפים לפי המלצת השולח."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8958,45 +8880,36 @@ msgstr "מאפייני חלק של ההודעה"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em> טיפוס ה־MIME</em> של הקובץ:</p>"
-"<p> בדרך כלל, אין צורך לגעת בהגדרה זו, וזאת מכיוון שסוג הקובץ נבדק באופן "
-"אוטומטי, אולם לפעמים עלול %1 שלא לזהות את הסוג כהלכה. כאן באפשרותך לתקן זאת. "
-"</p></qt>"
+"<qt><p><em> טיפוס ה־MIME</em> של הקובץ:</p><p> בדרך כלל, אין צורך לגעת "
+"בהגדרה זו, וזאת מכיוון שסוג הקובץ נבדק באופן אוטומטי, אולם לפעמים עלול %1 "
+"שלא לזהות את הסוג כהלכה. כאן באפשרותך לתקן זאת. </p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>גודל החלק:</p>"
-"<p> לפעמים ייתן כאן %1 גודל מוערך בלבד, וזאת מכיוון שחישוב הגודל המדוייק ייקח "
-"זמן רב מדיי. במקרה כזה יצויין הדבר על ידי הוספה של \"(מוערך)\" לגודל המוצג. </p>"
-"</qt>"
+"<qt><p>גודל החלק:</p><p> לפעמים ייתן כאן %1 גודל מוערך בלבד, וזאת מכיוון "
+"שחישוב הגודל המדוייק ייקח זמן רב מדיי. במקרה כזה יצויין הדבר על ידי הוספה של "
+"\"(מוערך)\" לגודל המוצג. </p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>שם הקובץ של החלק:</p>"
-"<p> למרות שכברירת מחדל זהו השם של הקובץ המצורף, הוא אינו מציין את הקובץ שיצורף. "
-"במקום זאת, הוא מציע שם קובץ שתשתמש בו תוכנית הדואר של הנמען בעת שמירת החלק אל "
-"הדיסק. </p></qt>"
+"<qt><p>שם הקובץ של החלק:</p><p> למרות שכברירת מחדל זהו השם של הקובץ המצורף, "
+"הוא אינו מציין את הקובץ שיצורף. במקום זאת, הוא מציע שם קובץ שתשתמש בו תוכנית "
+"הדואר של הנמען בעת שמירת החלק אל הדיסק. </p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9004,17 +8917,14 @@ msgstr "&תיאור:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>תיאור החלק:</p>"
-"<p> זהו תיאור של החלק, בדיוק כמו שהנושא הוא תיאור של ההודעה כולה. רוב תוכניות "
-"הדואר מציגות מידע זה בתצוגה המקדימה של ההודעות שלהן, ביחד עם הסמל של המצורף. "
-"</p> </qt>"
+"<qt><p>תיאור החלק:</p><p> זהו תיאור של החלק, בדיוק כמו שהנושא הוא תיאור של "
+"ההודעה כולה. רוב תוכניות הדואר מציגות מידע זה בתצוגה המקדימה של ההודעות "
+"שלהן, ביחד עם הסמל של המצורף. </p> </qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9022,22 +8932,20 @@ msgstr "&קידוד:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>קידוד ההעברה של חלק זה:</p>"
-"<p> בדרך כלל אין צורך לשנות זאת, וזאת מכיוון ש-%1 ישתמש בקידוד ברירת מחדל סביר "
-"בהתאם לטיפוס ה־Mime. אולם, לפעמים באפשרותך להקטין באופן משמעותי את גודל ההודעה "
-"הסופית, למשל אם קובץ PostScript אינו מכיל נתונים בינריים, אלא מורכב מטקסט רגיל. "
-"במקרה כזה, בחירה ב־\"quoted-printable\" במקום ברירת המחדל, \"base64\", תחסוך עד "
-"ל25%- מגודל ההודעה הסופית. </p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>קידוד ההעברה של חלק זה:</p><p> בדרך כלל אין צורך לשנות זאת, וזאת "
+"מכיוון ש-%1 ישתמש בקידוד ברירת מחדל סביר בהתאם לטיפוס ה־Mime. אולם, לפעמים "
+"באפשרותך להקטין באופן משמעותי את גודל ההודעה הסופית, למשל אם קובץ PostScript "
+"אינו מכיל נתונים בינריים, אלא מורכב מטקסט רגיל. במקרה כזה, בחירה ב־\"quoted-"
+"printable\" במקום ברירת המחדל, \"base64\", תחסוך עד ל25%- מגודל ההודעה "
+"הסופית. </p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9045,19 +8953,16 @@ msgstr "&המלץ על הצגה אוטומטית"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p> בחר באפשרות זו אם ברצונך להמליץ לנמען להציג חלק זה באופן אוטומטי (מוטבע) "
-"בתצוגה המקדימה של ההודעה, וזאת במקום להציג סמל באופן המוגדר כברירת מחדל. </p>"
-"<p> מבחינה טכנית מתבצע דבר זה על ידי הגדרה של שדה הכותרת <em>"
-"Content-Disposition</em> של חלק זה ל־\"inline\" במקום ברירת המחדל "
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p> בחר באפשרות זו אם ברצונך להמליץ לנמען להציג חלק זה באופן אוטומטי "
+"(מוטבע) בתצוגה המקדימה של ההודעה, וזאת במקום להציג סמל באופן המוגדר כברירת "
+"מחדל. </p><p> מבחינה טכנית מתבצע דבר זה על ידי הגדרה של שדה הכותרת "
+"<em>Content-Disposition</em> של חלק זה ל־\"inline\" במקום ברירת המחדל "
 "\"attachment\". </p></qt>"
 
 #: kmmsgpartdlg.cpp:168
@@ -9066,14 +8971,12 @@ msgstr "&חתום על חלק זה"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>בחר באפשרות זו אם ברצונך שחלק זה של ההודעה ייחתם.</p>"
-"<p>החתימה תתבצע עם המפתח ששייכת לזהות הנבחרת.</p></qt>"
+"<qt><p>בחר באפשרות זו אם ברצונך שחלק זה של ההודעה ייחתם.</p><p>החתימה תתבצע "
+"עם המפתח ששייכת לזהות הנבחרת.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9081,13 +8984,11 @@ msgstr "ה&צפן חלק זה"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>בחר באפשרות זו אם ברצונך שחלק זה של ההודעה יוצפן.</p>"
-"<p>החלק יוצפן עבור נמעני הודעה זו</p></qt>"
+"<qt><p>בחר באפשרות זו אם ברצונך שחלק זה של ההודעה יוצפן.</p><p>החלק יוצפן "
+"עבור נמעני הודעה זו</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9101,15 +9002,13 @@ msgstr "מסנני POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"נמצאו הודעות לסינון בחשבון ה־POP: <b>%1</b>"
-"<p>ההודעות המוצגות חורגות מהגבלת הגודל שהגדרת לחשבון זה."
-"<br>באפשרותך לבחור מה יש לעשות איתן על ידי בחירה באפשרות המתאימה."
+"נמצאו הודעות לסינון בחשבון ה־POP: <b>%1</b><p>ההודעות המוצגות חורגות מהגבלת "
+"הגודל שהגדרת לחשבון זה.<br>באפשרותך לבחור מה יש לעשות איתן על ידי בחירה "
+"באפשרות המתאימה."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9361,40 +9260,38 @@ msgstr "תוכנת הדוא\"ל של סביבת העבודה של TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style=\"margin-top: 0px;\"> מוריד את תכני התיקייה </h2>"
-"<p>אנא המתן . . .</p>&nbsp;"
+"<h2 style=\"margin-top: 0px;\"> מוריד את תכני התיקייה </h2><p>אנא המתן . . ."
+"</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>לא מקוון</h2>"
-"<p> KMail כרגע במצב לא מקוון. לחץ <a href=\"kmail:goOnline\">כאן</a> "
-"כדי לעבור למצב מקוון . . . </p> &nbsp;"
+"<h2 style='margin-top: 0px;'>לא מקוון</h2><p> KMail כרגע במצב לא מקוון. לחץ "
+"<a href=\"kmail:goOnline\">כאן</a> כדי לעבור למצב מקוון . . . </p> &nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9402,14 +9299,13 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>ברוך בואך אל KMail %1</h2>"
-"<p> KMail היא לקוח הדוא\"ל של סביבת שולחן העבודה TDE. היא מיועדת להיות תואמת "
-"בצורה מלאה לתקני הדואר של האינטרנט, כולל POP3 ,SMTP, MIME ו־IMAP. </p>\n"
-"<ul>"
-"<li>KMail כוללת תכונות רבות־עוצמה רבות המתוארות ב<a href=\"%2\">תיעוד</a> </li>"
-"\n"
-"<li><a href=\"%3\">האתר של KMail</a> מציע מידע לגבי גרסאות חדשות של KMail </li>"
-"</ul>\n"
+"<h2 style='margin-top: 0px;'>ברוך בואך אל KMail %1</h2><p> KMail היא לקוח "
+"הדוא\"ל של סביבת שולחן העבודה TDE. היא מיועדת להיות תואמת בצורה מלאה לתקני "
+"הדואר של האינטרנט, כולל POP3 ,SMTP, MIME ו־IMAP. </p>\n"
+"<ul><li>KMail כוללת תכונות רבות־עוצמה רבות המתוארות ב<a href=\"%2\">תיעוד</"
+"a> </li>\n"
+"<li><a href=\"%3\">האתר של KMail</a> מציע מידע לגבי גרסאות חדשות של KMail </"
+"li></ul>\n"
 "%8\n"
 "חלק מהתכונות החדשות בהוצאה זו של KMail כוללות (בהשוואה ל־KMail %4, אשר היווה "
 "חלק מ-TDE %5): </p>\n"
@@ -9421,22 +9317,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; הצוות של  KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
 "<p> אנא הקדש רגע מזמנך כדי למלא את לוח ההגדרות של KMail, אליו ניתן לגשת דרך "
 "הגדרות-&gt;הגדרות KMail.\n"
-"עליך ליצור לפחות זהות וחשבון דואר שישמשו כברירת מחדל, וכן חשבון דואר יוצא. </p>"
-"\n"
+"עליך ליצור לפחות זהות וחשבון דואר שישמשו כברירת מחדל, וכן חשבון דואר יוצא. </"
+"p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -9475,7 +9369,8 @@ msgstr "הצגת מצורף: %1"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[המצורף מכיל נתונים בינריים. מנסה להציג את התווים הראשון.]\n"
@@ -9502,12 +9397,14 @@ msgstr "האם לפתוח מצורף?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9529,6 +9426,58 @@ msgstr "(התאם לאחד מהתנאים הבאים)"
 msgid "(match all of the following)"
 msgstr "(התאם לכל התנאים הבאים)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "נקרא"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "ישן"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "נמחק"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "הושב"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "הועבר"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "בתור"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "נשלח"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "בתצפית"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "בהתעלמות"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "מטלה"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "מכיל מצורף"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9615,21 +9564,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"העברת ההודעה שנשלחה \"%1\" מהתיקייה \"דואר יוצא\" אל התיקייה \"דואר שנשלח\" לא "
-"הצליחה.\n"
-"סיבות אפשריות לכך הן מחסור במקום על גבי הדיסק או היעדר הרשאת כתיבה. נסה לתקן את "
-"הבעיה והעבר את ההודעה באופן ידני."
+"העברת ההודעה שנשלחה \"%1\" מהתיקייה \"דואר יוצא\" אל התיקייה \"דואר שנשלח\" "
+"לא הצליחה.\n"
+"סיבות אפשריות לכך הן מחסור במקום על גבי הדיסק או היעדר הרשאת כתיבה. נסה לתקן "
+"את הבעיה והעבר את ההודעה באופן ידני."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9655,8 +9604,8 @@ msgstr "מאתחל תהליך שליחה..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "בחרת לשלוח את כל הדוא\"ל שבתור באמצעות מעביר לא מוצפן, האם ברצונך להמשיך?"
 
@@ -9682,17 +9631,18 @@ msgstr "כישלון בשליחת (חלק) מההודעות שבתור."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "השליחה בוטלה:\n"
 "%1\n"
-"ההודעה תישאר בתיקייה \"דואר יוצא\" עד שתתקן את הבעיה (למשל כתובת שגויה) או עד "
-"שתסיר את ההודעה מהתיקייה \"דואר יוצא\".\n"
-"שים לב: כל עוד ההודעה הזו נמצאת בתיקייה \"דואר יוצא\", ייחסמו על ידיה גם הודעות "
-"אחרות.\n"
+"ההודעה תישאר בתיקייה \"דואר יוצא\" עד שתתקן את הבעיה (למשל כתובת שגויה) או "
+"עד שתסיר את ההודעה מהתיקייה \"דואר יוצא\".\n"
+"שים לב: כל עוד ההודעה הזו נמצאת בתיקייה \"דואר יוצא\", ייחסמו על ידיה גם "
+"הודעות אחרות.\n"
 "נעשה שימוש בפרוטוקול ההעברה הבא:\n"
 "  %2"
 
@@ -9702,21 +9652,16 @@ msgstr "השליחה בוטלה."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>השליחה נכשלה:</p>"
-"<p>%1</p> "
-"<p>ההודעה תישאר בתיקייה \"דואר יוצא\" עד שתתקן את הבעיה (למשל כתובת שגויה) או "
-"עד שתסיר את ההודעה מהתיקייה \"דואר יוצא\".\n"
-"שים לב: כל עוד ההודעה הזו נמצאת בתיקייה \"דואר יוצא\", ייחסמו על ידיה גם הודעות "
-"אחרות. </p> "
-"<p>שה שימוש בפרוטוקול ההעברה הבא: %2 /p>"
+"<p>השליחה נכשלה:</p><p>%1</p> <p>ההודעה תישאר בתיקייה \"דואר יוצא\" עד שתתקן "
+"את הבעיה (למשל כתובת שגויה) או עד שתסיר את ההודעה מהתיקייה \"דואר יוצא\".\n"
+"שים לב: כל עוד ההודעה הזו נמצאת בתיקייה \"דואר יוצא\", ייחסמו על ידיה גם "
+"הודעות אחרות. </p> <p>שה שימוש בפרוטוקול ההעברה הבא: %2 /p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -9734,17 +9679,18 @@ msgstr "&בטל שליחה"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "השליחה נכשלה:\n"
 "%1\n"
-"ההודעה תישאר בתיקייה \"דואר יוצא\" עד שתתקן את הבעיה (למשל כתובת שגויה) או עד "
-"שתסיר את ההודעה מהתיקייה \"דואר יוצא\".\n"
-"שים לב: כל עוד ההודעה הזו נמצאת בתיקייה \"דואר יוצא\", ייחסמו על ידיה גם הודעות "
-"אחרות.\n"
+"ההודעה תישאר בתיקייה \"דואר יוצא\" עד שתתקן את הבעיה (למשל כתובת שגויה) או "
+"עד שתסיר את ההודעה מהתיקייה \"דואר יוצא\".\n"
+"שים לב: כל עוד ההודעה הזו נמצאת בתיקייה \"דואר יוצא\", ייחסמו על ידיה גם "
+"הודעות אחרות.\n"
 "נעשה שימוש בפרוטוקול ההעברה הבא:\n"
 "  %2"
 
@@ -9783,30 +9729,30 @@ msgstr "עליך לספק שם משתמש וסיסמה על מנת להשתמש
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9818,6 +9764,10 @@ msgstr "הפעל את %1"
 msgid "Exit"
 msgstr "יציאה"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "הודעות חדשות ב"
@@ -9843,8 +9793,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "בחר באפשרות זו אם ברצונך ש-KMail ישמור את סיסמת ה־SMTP בקובץ ההגדרות שלו. "
@@ -9926,11 +9877,11 @@ msgstr "השרת &דורש אימות"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"בחר באפשרות זו אם שרת ה־SMTP שלך דורש לבצע אימות לפני שהוא מסכים לקבל את הדואר. "
-"דבר זה מוכר בתור \"SMTP מאומת\" או פשוט ASTMP."
+"בחר באפשרות זו אם שרת ה־SMTP שלך דורש לבצע אימות לפני שהוא מסכים לקבל את "
+"הדואר. דבר זה מוכר בתור \"SMTP מאומת\" או פשוט ASTMP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -9950,15 +9901,13 @@ msgstr "ש&לח לשרת שם מארח מותאם אישית"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"בחר באפשרות זו אם ברצונך ש-KMail ישתמש בשם מארח מותאם אישית כאשר הוא מזדהה בפני "
-"שרת הדואר."
-"<p> דבר זה יכול להיות שימושי כאשר שם המארח של המערכת שלך לא מוגדר כהלכה, או "
-"במטרה להסוות את שם המארח האמיתי של המערכת שלך."
+"בחר באפשרות זו אם ברצונך ש-KMail ישתמש בשם מארח מותאם אישית כאשר הוא מזדהה "
+"בפני שרת הדואר.<p> דבר זה יכול להיות שימושי כאשר שם המארח של המערכת שלך לא "
+"מוגדר כהלכה, או במטרה להסוות את שם המארח האמיתי של המערכת שלך."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -9988,8 +9937,8 @@ msgstr "רק קבצים מקומיים מותרים."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "שם התחום או הכתובת המספרית של שרת ה־SMTP."
 
 #: kmtransport.cpp:788
@@ -10006,10 +9955,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10083,7 +10032,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"לא הייתה באפשרות KMail לזהות רשימת־דיוור בתיקייה זו. אנא מלא את הכתובות ידנית."
+"לא הייתה באפשרות KMail לזהות רשימת־דיוור בתיקייה זו. אנא מלא את הכתובות "
+"ידנית."
 
 #: mailinglistpropertiesdialog.cpp:228
 #, fuzzy
@@ -10240,33 +10190,25 @@ msgstr "&ערוך הודעה"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>אין אפשרות לעבד כהלכה את מידע הבנייה שהוחזר על ידי תוסף ההצפנה; ייתכן שהתוסף "
-"פגום.</p>"
-"<p>צור קשר עם מנהל המערכת שלך.</p></qt>"
+"<qt><p>אין אפשרות לעבד כהלכה את מידע הבנייה שהוחזר על ידי תוסף ההצפנה; ייתכן "
+"שהתוסף פגום.</p><p>צור קשר עם מנהל המערכת שלך.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p> לא נמצא אף תוסף הצפנה פעיל, וקוד ה־OpenPGP המובנה לא פעל בהצלחה. </p>"
-"<p>יש שני דברים שבאפשרותך לעשות:</p>"
-"<ul>"
-"<li>הפעל תוסף באמצעות הדו-שיח הגדרות->הגדרות KMail->אבטחה.</li>"
-"<li><em>או</em> ציין הגדרות OpenPGP באותו דו-שיח, בכרטיסיה זהות->מתקדם.</li>"
-"</ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p> לא נמצא אף תוסף הצפנה פעיל, וקוד ה־OpenPGP המובנה לא פעל בהצלחה. </"
+"p><p>יש שני דברים שבאפשרותך לעשות:</p><ul><li>הפעל תוסף באמצעות הדו-שיח "
+"הגדרות->הגדרות KMail->אבטחה.</li><li><em>או</em> ציין הגדרות OpenPGP באותו "
+"דו-שיח, בכרטיסיה זהות->מתקדם.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10278,8 +10220,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10294,14 +10236,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10402,8 +10344,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10431,9 +10373,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"<qt>"
-"<p>יש התנגשות בין הגדרות הצפנה מסויימות.</p>"
-"<p>האם להצפין הודעה זו?</p></qt>"
+"<qt><p>יש התנגשות בין הגדרות הצפנה מסויימות.</p><p>האם להצפין הודעה זו?</p></"
+"qt>"
 
 #: messagecomposer.cpp:909
 #, fuzzy
@@ -10442,8 +10383,9 @@ msgstr "&אל תצפין"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10454,8 +10396,8 @@ msgstr "שלח &ללא הצפנה"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10476,80 +10418,75 @@ msgstr "&הצפן את כל החלקים"
 msgid "Unencrypted Message Warning"
 msgstr "הודעה מוצפנת"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>שגיאה: תוסף ההצפנה \"%1\" לא החזיר נתונים מקודדים.</p>"
-"<p>נא דווח על באג זה:"
-"<br>%2</p></qt>"
+"<qt><p>שגיאה: תוסף ההצפנה \"%1\" לא החזיר נתונים מקודדים.</p><p>נא דווח על "
+"באג זה:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>לא כל התווים מתאימים לקידוד הנבחר."
-"<br>"
-"<br>האם לשלוח את ההודעה בכל זאת?</qt>"
+"<qt>לא כל התווים מתאימים לקידוד הנבחר.<br><br>האם לשלוח את ההודעה בכל זאת?</"
+"qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "תווים מסויימים יאבדו"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "קבע קיד&וד"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10572,10 +10509,10 @@ msgstr "&תבנית תיבת דואר:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10585,8 +10522,8 @@ msgstr "תיקייה &מכילה:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10627,8 +10564,7 @@ msgstr "תוצאות שונות לחתימות"
 msgid "The crypto engine returned no cleartext data."
 msgstr "מנוע ההצפנה לא החזיר נתוני cleartext."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "מצב: "
 
@@ -10660,8 +10596,8 @@ msgstr "לא נמצא תוסף %1."
 #: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "אין אפשרות לוודא את תוקף החתימה."
 
 #: objecttreeparser.cpp:737
@@ -10701,28 +10637,28 @@ msgstr "תוסף ההצפנה %1 לא יכול לפענח אף הודעות."
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<p dir=\"rtl\" align=\"right\"><b>שים לב:</b> זוהי הודעת HTML. מטעמי אבטחה, "
 "מוצג רק קוד ה־HTML הגולמי. אם אתה בוטח בשולח של הודעה זו, באפשרותך להפעיל את "
-"תצוגת ה־HTML המעוצבת עבור הודעה זו על ידי לחיצה <a href=\"kmail:showHTML\">"
-"כאן</a>."
+"תצוגת ה־HTML המעוצבת עבור הודעה זו על ידי לחיצה <a href=\"kmail:showHTML"
+"\">כאן</a>."
 
 #: objecttreeparser.cpp:1010
 #, fuzzy
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<p dir=\"rtl\" align=\"right\"><b>שים לב:</b> זוהי הודעת HTML. מטעמי אבטחה, "
 "מוצג רק קוד ה־HTML הגולמי. אם אתה בוטח בשולח של הודעה זו, באפשרותך להפעיל את "
-"תצוגת ה־HTML המעוצבת עבור הודעה זו על ידי לחיצה <a href=\"kmail:showHTML\">"
-"כאן</a>."
+"תצוגת ה־HTML המעוצבת עבור הודעה זו על ידי לחיצה <a href=\"kmail:showHTML"
+"\">כאן</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -10974,8 +10910,8 @@ msgstr "הכתובת המאוחסנת: "
 #: objecttreeparser.cpp:2513
 #, fuzzy
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "אין אף כתובת דואר שמאוחסנת ב%1 המשמשת לשליחה, כך שאין אפשרות להשוות אותה עם "
 "כתובת השולח, &lt;%2&gt;."
@@ -11097,10 +11033,11 @@ msgstr "הודעת שגיאה של פרוטוקול"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "שרת ה־POP3 שלך לא תומך בפקודה UIDL. פקודה זו נדרשת על מנת לקבוע באופן מהימן "
 "אילו הודעות דואר על גבי השרת כבר נראו על ידי KMail בעבר.\n"
@@ -11121,7 +11058,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr "מוריד הודעה %1 מתוך %2 (%3 מתוך %4 KB) מ-%5 (%6 KB נותרו על הרשת)."
 
 #: popaccount.cpp:912
@@ -11140,1711 +11078,14 @@ msgstr "תגובה לא תקפה מהשרת"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"השרת שלך לא תומך בפקודה TOP, ולכן אין אפשרות להוריד את הכותרות של הודעות גדולות "
-"טרם הורדתן."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "&Go"
-msgstr "א&ל"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "ת&יקייה"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "הו&דעה"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "ה&עברה"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "חתום"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&חתום על הודעות באמצעות OpenPGP באופן אוטומטי"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"<qt>"
-"<p>אם אפשרות זו נבחרת, כל ההודעות שתשלח ייחתמו כברירת מחדל. כמובן שעדיין ניתן "
-"יהיה לבטל את החתימה עבור כל הודעה בנפרד.</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "הצפנה"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "שמור הודעות בצורה מוצ&פנת"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "בחר באפשרות זו כדי לשמור את ההודעות בצורה מוצפנת "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>שמור הודעות בצורה מוצפנת</h1>\n"
-"אם אפשרות זו נבחרת, הודעות שנשלחו יישמרו בצורתן המוצפנת, כפי שהן נשלחו. דבר זה "
-"אינו מומלץ, מכיוון שלא תוכל עוד לקרוא את ההודעות במקרה שתוקף תעודה דרושה כלשהי "
-"יפוג.\n"
-"<p>\n"
-"עם זאת, ייתכן שישנם כללים מקומיים שדורשים שתפעיל אפשרות זו. אם אינך בטוח מה "
-"לעשות, שאל את המנהל המקומי שלך."
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "הצ&פן הודעות באופן אוטומטי בכל עת שהדבר אפשרי"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"<qt>"
-"<p>אם אפשרות זו נבחרת, כל הודעה שתשלח תוצפן בכל עת שההצפנה אפשרית ורצויה. כמובן "
-"שעדיין ניתן יהיה לבטל את ההצפנה האוטומטית עבור כל הודעה בנפרד.</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"השרת שלך לא תומך בפקודה TOP, ולכן אין אפשרות להוריד את הכותרות של הודעות "
+"גדולות טרם הורדתן."
 
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "אל: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "עותק: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "כללי"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "ה&שב אל"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "השב ל&כולם..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "ה&עברה"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "קיצור:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "הח&לף"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "מאפייני התיקייה"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "התיקייה מכילה רשימת־&דיוור"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "List &address:"
-msgstr "&כתובת לפירסום:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, fuzzy, no-c-format
-msgid "N&ormal:"
-msgstr "&רגיל:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, fuzzy, no-c-format
-msgid "Unr&ead:"
-msgstr "פרי&טים שלא נקראו:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "תפוגה של הודעות ישנות"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, fuzzy, no-c-format
-msgid "E&xpire after:"
-msgstr "הפגת תיקייה"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "הפגת הודעות ישנות"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, fuzzy, no-c-format
-msgid "Expire a&fter:"
-msgstr "הפגת תיקייה"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "הפגת הודעות ישנות"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "ימים"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "שבועות"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "חודשים"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Advanced"
-msgstr "&מתקדם"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "זהות חדשה"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "תבנית תאריכים מותאמת אישית"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "הצגת תאריכים"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "יצירת תעודה"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "חתימה תקינה"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "אל תשלח תעו&דות"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "אל תשלח תעו&דות"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "בעת הוספת תעודות"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "אל תשלח תעו&דות"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "אל תשלח תעו&דות"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "ה&וספה..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "אפס הגדרות גופנים"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "ללא הגבלה"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "הגדרות חתימה"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "תשובה &לשולח:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "השב ל&כולם..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "הודעה מועברת"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "הצג אזהרה בעת ניסיון לשלוח הודעות &לא חתומות"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "בחר באפשרות זו כדי לקבל אזהרה בעת שליחת הודעות לא חתומות."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה בעת ניסיון לשלוח הודעות לא חתומות</h1>\n"
-"אם אפשרות זו נבחרת, תוצג אזהרה אם תנסה לשלוח חלקים מהודעה כלשהי או את ההודעה "
-"כולה בצורה לא חתומה.\n"
-"<p>\n"
-"מומלץ להשאיר אפשרות זו פועלת לשם השגת אמינות מירבית.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "הצג אזהרה בעת ניסיון לשלוח הודעות &לא מוצפנות"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "בחר באפשרות זו כדי לקבל אזהרה בעת שליחת הודעות לא מוצפנות."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה בעת ניסיון לשלוח הודעות לא מוצפנות</h1>\n"
-"אם אפשרות זו נבחרת, תוצג אזהרה אם תנסה לשלוח חלקים מהודעה כלשהי או את ההודעה "
-"כולה בצורה לא מוצפנת.\n"
-"<p>\n"
-"מומלץ להשאיר אפשרות זו פועלת לשם השגת אמינות מירבית.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "ה&צג אזהרה אם כתובת הדוא\"ל של הנמען אינה בתעודה"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "בחר באפשרות זו כדי לקבל אזהרה אם הכתובת אינה בתעודה"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה אם כתובת הדוא\"ל של הנמען אינה בתעודה</h1>\n"
-"אם אפשרות זו נבחרת, תוצג אזהרה אם כתובת הדוא\"ל של הנמען אינה כלולה בתעודה "
-"המשמשת להצפנה.\n"
-"<p>\n"
-"מומלץ להשאיר אפשרות זו פועלת על מנת להשיג אבטחה מירבית.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "הצג אזהרה אם תעודת &רשות התעודות פגה תוך פחות מ:"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "השתמש ל&חתימה"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "הצפנה"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " ימים"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "בחר כאן את מספר הימים"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה אם תעודת החתימה פגה</h1>\n"
-"בחר את מספר הימים המינימלי בו תעודת החתימה תהיה תקפה מבלי להוציא אזהרה.\n"
-"<p>\n"
-"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה אם תעודת ההצפנה פגה</h1>\n"
-"בחר את מספר הימים המינימלי בו תעודת ההצפנה תהיה תקפה מבלי להוציא אזהרה.\n"
-"<p>\n"
-"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה אם תעודה בשרשרת פגה</h1>\n"
-"בחר את מספר הימים המינימלי בו כל התעודות בשרשרת יהיו תקפות מבלי להוציא אזהרה.\n"
-"<p>\n"
-"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה אם התעודה של רשות התעודות פגה</h1>\n"
-"בחר את מספר הימים המינימלי בו התעודה של רשות התעודות תהיה תקפה מבלי להוציא "
-"אזהרה.\n"
-"<p>\n"
-"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>הצג אזהרה אם תעודת השורש פגה</h1>\n"
-"בחר את מספר הימים המינימלי בו תעודת השורש תהיה תקפה מבלי להוציא אזהרה.\n"
-"<p>\n"
-"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "אל תשלח תעו&דות"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "אל תשלח תעו&דות"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "אל תשלח תעו&דות"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&תוכן התיקייה:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "הח&לף"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "הח&לף"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "שלח דואל\" שבתור בעת בדיקת דוא\"ל"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "הודעה לגבי דואר חדש"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "צ&יין עורך:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "ה&שתמש בעורך חיצוני במקום הכתבן"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "שמור על מערך התווי&ם המקורי בעת תשובה או העברה (אם הדבר אפשרי)."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "צ&רף חתימה באופן אוטומטי"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&גלישת שורות בטור:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "הצג אזהרה אם תעודת השורש &פגה תוך פחות מ:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "שירה אוטומטית כל:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "הח&לף קידומת מזוהה ב־\":Re\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "החל&ף קידומת מזוהה ב־\":Fwd\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "השתמש בצי&טוט חכם"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "פג תוקף החתימה."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "שמור על מערך התווי&ם המקורי בעת תשובה או העברה (אם הדבר אפשרי)."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "שמור הודעות בצורה מוצ&פנת"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "הצב מצב דוא\"ל זבל בתצוגות מהודרת"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "רשימת ההודעות - הודעות חדשות"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "הוסף &מרכאות ציטוט:"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12965,6 +11206,11 @@ msgstr "הוספת חשבון"
 msgid "Add as BCC"
 msgstr "הוסף בתור עותק סמוי"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&בטל"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12982,10 +11228,10 @@ msgstr "<נמענים>"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13003,8 +11249,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13120,10 +11366,19 @@ msgstr "גדול או שווה"
 msgid " bytes"
 msgstr " בתים"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " ימים"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13276,13 +11531,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13300,8 +11553,7 @@ msgid ""
 msgstr "סוג החשבון: חשבון IMAP"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13321,8 +11573,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13331,8 +11582,7 @@ msgstr "(לא נמצאו תכונות מיוחדות)"
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "מסננים זמינים"
 
 #: sievedebugdialog.cpp:358
@@ -13401,8 +11651,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13419,17 +11669,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&ציין פקודה:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "רשומה חדשה:"
@@ -13467,6 +11722,11 @@ msgstr "הוספת חשבון"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>האם אתה בטוח שברצונך להסיר את הזהות ששמה <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "ה&חל על:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13481,6 +11741,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "עריכה..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13520,9 +11784,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13561,6 +11825,16 @@ msgstr ""
 "אין אפשרות לפתוח את הקובץ \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "אל: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "עותק: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13596,36 +11870,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13859,6 +12129,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13895,105 +12169,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...שבאפשרותך ליצור במהירות מסננים לפי השולח, הנמען,\n"
-"הנושא או רשימות הדיוור דרך <em>כלים->צור&nbsp;מסנן</em>?</p>\n"
-
-#: tips.cpp:15
-#, fuzzy
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p> ...שבאפשרותך להיפטר מהכיתוב של &quot;[שם רשימת הדיוור]&quot;,\n"
-"אשר מתווסף לנושא ההודעות של רשימות דיוור מסויימות, על ידי שימוש בפעולת\n"
-"הסינון <em>שנה כותרת</em>? השתמש\n"
-"ב:"
-"<pre> שנה כותרת &quot;Subject&quot;\n"
-"   החלף &quot;\\s*\\[שם רשימת הדיוור\\]\\s*&quot;\n"
-"   עם &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p> ...שבאפשרותך לשייך־רשימות דיוור לתיקיות דרך\n"
-"הדו-שיח <em>תיקייה־>מאפיינים...</em>? בדרך זו תוכל להשתמש\n"
-"ב<em>הודעה־>הודעה חדשה לרשימת הדיוור...</em> כדי לפתוח את הכתבן כאשר\n"
-"כתובת רשימת הדיוור כבר מוגדרת שם. </p>\n"
-
-#: tips.cpp:35
-#, fuzzy
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...שבאפשרותך להקצות סמלים מותאמים אישית לכל תיקייה בנפרד?\n"
-"עיין ב<em>תיקייה־>מאפיינים...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...ש-KMail יכול להציג פס צבעוני שמציין את סוג ההודעה\n"
-"(טקסט רגיל\\HTML\\OpenPGP) המוצגת כרגע?</p>\n"
-"<p>דבר זה מסכל ניסיונות לזייף וידוא מוצלח של חתימות, ניסיונות אשר מתבצעים "
-"באמצעות שליחה\n"
-"של הודעות דואר מבוססות HTML אשר מחקות את מסגרות מצב החתימה של KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...שבאפשרותך לסנן לפי כל כותרת שהיא על ידי הזנת שם\n"
-"הכותרת בשדה העריכה הראשון של כלל חיפוש?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...שבאפשרותך לסנן הודעות של HTML בלבד בעזרת הכלל\n"
-"<pre>&quot;Content-type&quot; מכיל &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 #, fuzzy
 msgid "There is nothing to undo."
@@ -14064,6 +12239,15 @@ msgstr "מצורף: "
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "כבר קיים קובץ תחת שם \"%1\". האם ברצונך לכתוב אותו?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "לשכתב את הקובץ?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14171,9 +12355,9 @@ msgstr "&שלח תמונה עם כל הודעה"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14202,9 +12386,9 @@ msgstr "בחר קובץ..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14213,15 +12397,15 @@ msgstr "קבע מספר הכתובות"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14230,8 +12414,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 "קיימות מספר דוגמאות בכתובת <a href=\"http://www.xs4all.nl/~ace/X-Faces/\"> "
 "http://www.xs4all.nl/~ace/X-Faces/</a>."
@@ -14249,129 +12433,1603 @@ msgstr "אין תמונה"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "חתום"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&חתום על הודעות באמצעות OpenPGP באופן אוטומטי"
+
+#: composercryptoconfiguration.ui:38
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"<qt><p>אם אפשרות זו נבחרת, כל ההודעות שתשלח ייחתמו כברירת מחדל. כמובן שעדיין "
+"ניתן יהיה לבטל את החתימה עבור כל הודעה בנפרד.</p></qt>"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "הצפנה"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "                 קבע את נושא ההודעה"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "          \"address\" שלח עותק לכתובת"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "     \"address\" שלח עותק סמוי לכתובת"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "     להודעה \"header\" הוסף את הכותרת"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "שמור הודעות בצורה מוצ&פנת"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "\"file\" קרא את גוף ההודעה מתוך הקובץ"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "בחר באפשרות זו כדי לשמור את ההודעות בצורה מוצפנת "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "                  קבע את גוף ההודעה"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>שמור הודעות בצורה מוצפנת</h1>\n"
+"אם אפשרות זו נבחרת, הודעות שנשלחו יישמרו בצורתן המוצפנת, כפי שהן נשלחו. דבר "
+"זה אינו מומלץ, מכיוון שלא תוכל עוד לקרוא את ההודעות במקרה שתוקף תעודה דרושה "
+"כלשהי יפוג.\n"
+"<p>\n"
+"עם זאת, ייתכן שישנם כללים מקומיים שדורשים שתפעיל אפשרות זו. אם אינך בטוח מה "
+"לעשות, שאל את המנהל המקומי שלך."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "הוסף מצורף למכתב. ניתן לחזור על זאת"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "                 בדוק דואר חדש בלבד"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "                   פתח רק חלון כתבן"
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "הצ&פן הודעות באופן אוטומטי בכל עת שהדבר אפשרי"
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "מעביר את הודעה %3 מתוך %2 מ-%1."
+#: composercryptoconfiguration.ui:117
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"<qt><p>אם אפשרות זו נבחרת, כל הודעה שתשלח תוצפן בכל עת שההצפנה אפשרית "
+"ורצויה. כמובן שעדיין ניתן יהיה לבטל את ההצפנה האוטומטית עבור כל הודעה בנפרד."
+"</p></qt>"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "נקרא"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "ישן"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "כללי"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "נמחק"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "ה&שב אל"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "הושב"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "השב ל&כולם..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "הועבר"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "ה&עברה"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "בתור"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "קיצור:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "נשלח"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "הח&לף"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "בתצפית"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&תוכן התיקייה:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "בהתעלמות"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "הח&לף"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "הח&לף"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "מאפייני התיקייה"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "התיקייה מכילה רשימת־&דיוור"
+
+#: folderpropertiesdialog.ui:91
+#, fuzzy, no-c-format
+msgid "List &address:"
+msgstr "&כתובת לפירסום:"
+
+#: folderpropertiesdialog.ui:122
+#, fuzzy, no-c-format
+msgid "N&ormal:"
+msgstr "&רגיל:"
+
+#: folderpropertiesdialog.ui:215
+#, fuzzy, no-c-format
+msgid "Unr&ead:"
+msgstr "פרי&טים שלא נקראו:"
+
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "תפוגה של הודעות ישנות"
+
+#: folderpropertiesdialog.ui:283
+#, fuzzy, no-c-format
+msgid "E&xpire after:"
+msgstr "הפגת תיקייה"
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "הפגת הודעות ישנות"
+
+#: folderpropertiesdialog.ui:339
+#, fuzzy, no-c-format
+msgid "Expire a&fter:"
+msgstr "הפגת תיקייה"
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "הפגת הודעות ישנות"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "ימים"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "שבועות"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "חודשים"
+
+#: folderpropertiesdialog.ui:451
+#, fuzzy, no-c-format
+msgid "Advanced"
+msgstr "&מתקדם"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "זהות חדשה"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "תבנית תאריכים מותאמת אישית"
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "הצגת תאריכים"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "שלח דואל\" שבתור בעת בדיקת דוא\"ל"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "מטלה"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "מכיל מצורף"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:101
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "כבר קיים קובץ תחת שם \"%1\". האם ברצונך לכתוב אותו?"
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "לשכתב את הקובץ?"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "הודעה לגבי דואר חדש"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "צ&יין עורך:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "ה&שתמש בעורך חיצוני במקום הכתבן"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "שמור על מערך התווי&ם המקורי בעת תשובה או העברה (אם הדבר אפשרי)."
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "צ&רף חתימה באופן אוטומטי"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&גלישת שורות בטור:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "הצג אזהרה אם תעודת השורש &פגה תוך פחות מ:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "שירה אוטומטית כל:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "הח&לף קידומת מזוהה ב־\":Re\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "החל&ף קידומת מזוהה ב־\":Fwd\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "השתמש בצי&טוט חכם"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "פג תוקף החתימה."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "שמור על מערך התווי&ם המקורי בעת תשובה או העברה (אם הדבר אפשרי)."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "שמור הודעות בצורה מוצ&פנת"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "הצב מצב דוא\"ל זבל בתצוגות מהודרת"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "רשימת ההודעות - הודעות חדשות"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "הוסף &מרכאות ציטוט:"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&ערוך קובץ"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "עריכה..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, fuzzy, no-c-format
+msgid "&Go"
+msgstr "א&ל"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "ת&יקייה"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "הו&דעה"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "ה&עברה"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "אפס הגדרות גופנים"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "אפשרויות נפוצות"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "יצירת תעודה"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "חתימה תקינה"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "אל תשלח תעו&דות"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "אל תשלח תעו&דות"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "בעת הוספת תעודות"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "אל תשלח תעו&דות"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "אל תשלח תעו&דות"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "ה&וספה..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "אפס הגדרות גופנים"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "ללא הגבלה"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "הגדרות חתימה"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "תשובה &לשולח:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "השב ל&כולם..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "הודעה מועברת"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "הצג אזהרה בעת ניסיון לשלוח הודעות &לא חתומות"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "בחר באפשרות זו כדי לקבל אזהרה בעת שליחת הודעות לא חתומות."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה בעת ניסיון לשלוח הודעות לא חתומות</h1>\n"
+"אם אפשרות זו נבחרת, תוצג אזהרה אם תנסה לשלוח חלקים מהודעה כלשהי או את ההודעה "
+"כולה בצורה לא חתומה.\n"
+"<p>\n"
+"מומלץ להשאיר אפשרות זו פועלת לשם השגת אמינות מירבית.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "הצג אזהרה בעת ניסיון לשלוח הודעות &לא מוצפנות"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "בחר באפשרות זו כדי לקבל אזהרה בעת שליחת הודעות לא מוצפנות."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה בעת ניסיון לשלוח הודעות לא מוצפנות</h1>\n"
+"אם אפשרות זו נבחרת, תוצג אזהרה אם תנסה לשלוח חלקים מהודעה כלשהי או את ההודעה "
+"כולה בצורה לא מוצפנת.\n"
+"<p>\n"
+"מומלץ להשאיר אפשרות זו פועלת לשם השגת אמינות מירבית.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "ה&צג אזהרה אם כתובת הדוא\"ל של הנמען אינה בתעודה"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "בחר באפשרות זו כדי לקבל אזהרה אם הכתובת אינה בתעודה"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה אם כתובת הדוא\"ל של הנמען אינה בתעודה</h1>\n"
+"אם אפשרות זו נבחרת, תוצג אזהרה אם כתובת הדוא\"ל של הנמען אינה כלולה בתעודה "
+"המשמשת להצפנה.\n"
+"<p>\n"
+"מומלץ להשאיר אפשרות זו פועלת על מנת להשיג אבטחה מירבית.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "הצג אזהרה אם תעודת &רשות התעודות פגה תוך פחות מ:"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "השתמש ל&חתימה"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "הצפנה"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "בחר כאן את מספר הימים"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה אם תעודת החתימה פגה</h1>\n"
+"בחר את מספר הימים המינימלי בו תעודת החתימה תהיה תקפה מבלי להוציא אזהרה.\n"
+"<p>\n"
+"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה אם תעודת ההצפנה פגה</h1>\n"
+"בחר את מספר הימים המינימלי בו תעודת ההצפנה תהיה תקפה מבלי להוציא אזהרה.\n"
+"<p>\n"
+"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה אם תעודה בשרשרת פגה</h1>\n"
+"בחר את מספר הימים המינימלי בו כל התעודות בשרשרת יהיו תקפות מבלי להוציא "
+"אזהרה.\n"
+"<p>\n"
+"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה אם התעודה של רשות התעודות פגה</h1>\n"
+"בחר את מספר הימים המינימלי בו התעודה של רשות התעודות תהיה תקפה מבלי להוציא "
+"אזהרה.\n"
+"<p>\n"
+"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>הצג אזהרה אם תעודת השורש פגה</h1>\n"
+"בחר את מספר הימים המינימלי בו תעודת השורש תהיה תקפה מבלי להוציא אזהרה.\n"
+"<p>\n"
+"ההגדרה המומלצת של SPHINX היא 14 יום.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "אל תשלח תעו&דות"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "אל תשלח תעו&דות"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "אל תשלח תעו&דות"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...שבאפשרותך ליצור במהירות מסננים לפי השולח, הנמען,\n"
+"הנושא או רשימות הדיוור דרך <em>כלים->צור&nbsp;מסנן</em>?</p>\n"
+
+#: tips:17
+#, fuzzy
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p> ...שבאפשרותך להיפטר מהכיתוב של &quot;[שם רשימת הדיוור]&quot;,\n"
+"אשר מתווסף לנושא ההודעות של רשימות דיוור מסויימות, על ידי שימוש בפעולת\n"
+"הסינון <em>שנה כותרת</em>? השתמש\n"
+"ב:<pre> שנה כותרת &quot;Subject&quot;\n"
+"   החלף &quot;\\s*\\[שם רשימת הדיוור\\]\\s*&quot;\n"
+"   עם &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+#, fuzzy
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p> ...שבאפשרותך לשייך־רשימות דיוור לתיקיות דרך\n"
+"הדו-שיח <em>תיקייה־>מאפיינים...</em>? בדרך זו תוכל להשתמש\n"
+"ב<em>הודעה־>הודעה חדשה לרשימת הדיוור...</em> כדי לפתוח את הכתבן כאשר\n"
+"כתובת רשימת הדיוור כבר מוגדרת שם. </p>\n"
+
+#: tips:39
+#, fuzzy
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...שבאפשרותך להקצות סמלים מותאמים אישית לכל תיקייה בנפרד?\n"
+"עיין ב<em>תיקייה־>מאפיינים...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...ש-KMail יכול להציג פס צבעוני שמציין את סוג ההודעה\n"
+"(טקסט רגיל\\HTML\\OpenPGP) המוצגת כרגע?</p>\n"
+"<p>דבר זה מסכל ניסיונות לזייף וידוא מוצלח של חתימות, ניסיונות אשר מתבצעים "
+"באמצעות שליחה\n"
+"של הודעות דואר מבוססות HTML אשר מחקות את מסגרות מצב החתימה של KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...שבאפשרותך לסנן לפי כל כותרת שהיא על ידי הזנת שם\n"
+"הכותרת בשדה העריכה הראשון של כלל חיפוש?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...שבאפשרותך לסנן הודעות של HTML בלבד בעזרת הכלל\n"
+"<pre>&quot;Content-type&quot; מכיל &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -14458,14 +14116,17 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הצפן את כל חלקי ההודעה כברירת מחדל</h1>\n"
-#~ "אם אפשרות זו נבחרת, כל חלקי ההודעה (גוף ההודעה וכל המצורפים) יוצפנו כברירת מחדל.\n"
+#~ "אם אפשרות זו נבחרת, כל חלקי ההודעה (גוף ההודעה וכל המצורפים) יוצפנו "
+#~ "כברירת מחדל.\n"
 #~ "<p>\n"
 #~ "זוהי הגדרת ברירת מחדל. באפשרותך תמיד לעקוף אותה עבור כל הודעה בנפרד.\n"
 #~ "</qt>"
@@ -14479,12 +14140,15 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>שאל לפני הצפנת כל חלק</h1>\n"
-#~ "כאשר אפשרות זו נבחרת, אתה תישאל עבור כל חלק של ההודעה (גוף ההודעה וכל המצורפים) בנפרד האם ברצונך להצפינו.\n"
+#~ "כאשר אפשרות זו נבחרת, אתה תישאל עבור כל חלק של ההודעה (גוף ההודעה וכל "
+#~ "המצורפים) בנפרד האם ברצונך להצפינו.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14500,7 +14164,8 @@ msgstr "לשכתב את הקובץ?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14519,18 +14184,29 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>אלגוריתם הצפנה</h1>\n"
-#~ "אלגוריתם הינו תיאור עבור המחשב כיצד לבצע מטלה מסויימת. אלגוריתם ההצפנה מתאר כיצד המחשב יחיל את המפתח של הנמען שלך על ההודעה שלך, כך שרק הנמען המיועד יוכל לקרוא את ההודעה.\n"
+#~ "אלגוריתם הינו תיאור עבור המחשב כיצד לבצע מטלה מסויימת. אלגוריתם ההצפנה "
+#~ "מתאר כיצד המחשב יחיל את המפתח של הנמען שלך על ההודעה שלך, כך שרק הנמען "
+#~ "המיועד יוכל לקרוא את ההודעה.\n"
 #~ "<p>\n"
-#~ "בחירה באלגוריתם הצפנה מסויים קובעת כמה קל או קשה יהיה ליירט ולקרוא הודעה כלשהי. ראוי לציין כי כל האלגוריתמים המסופקים בסביבת SPHINX נחשבים לבטוחים ביותר. ככלל, ברירת המחדל אמורה לעבוד כאן בסדר גמור.\n"
+#~ "בחירה באלגוריתם הצפנה מסויים קובעת כמה קל או קשה יהיה ליירט ולקרוא הודעה "
+#~ "כלשהי. ראוי לציין כי כל האלגוריתמים המסופקים בסביבת SPHINX נחשבים לבטוחים "
+#~ "ביותר. ככלל, ברירת המחדל אמורה לעבוד כאן בסדר גמור.\n"
 #~ "<p>\n"
 #~ "זוהי הגדרת ברירת מחדל. באפשרותך לעקוף אותה עבור כל הודעה בנפרד.\n"
 #~ "</qt>"
@@ -14546,16 +14222,21 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>בדיקת התעודות יכולה להסתיים בתעודה השמורה באופן מקומי</h1>\n"
-#~ "אם אפשרות זו נבחרת, בדיקת שרשרת התעודות יכולה להסתיים בתעודה השמורה באופן מקומי.\n"
+#~ "אם אפשרות זו נבחרת, בדיקת שרשרת התעודות יכולה להסתיים בתעודה השמורה באופן "
+#~ "מקומי.\n"
 #~ "<p>\n"
-#~ "תעודות השמורות באופן מקומי הן התעודות שלך, ותעודות של אנשים איתם אתה בקשר ורשויות תעודות (CA).\n"
+#~ "תעודות השמורות באופן מקומי הן התעודות שלך, ותעודות של אנשים איתם אתה בקשר "
+#~ "ורשויות תעודות (CA).\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14568,12 +14249,15 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>בדוק תמיד את נתיב התעודות עד לתעודת השורש</h1>\n"
-#~ "אם אפשרות זו נבחרת, התוכנית תבדוק תמיד את נתיב התעודה של תעודת הנמען, עד לתעודת השורש.\n"
+#~ "אם אפשרות זו נבחרת, התוכנית תבדוק תמיד את נתיב התעודה של תעודת הנמען, עד "
+#~ "לתעודת השורש.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -14585,9 +14269,11 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14606,16 +14292,26 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>השתמש ברשימות ביטול תעודות (CRL)</h1>\n"
-#~ "רשימת ביטול תעודות מכילה תעודות שבוטלו ושאין להשתמש בהן עוד לצרכי הצפנה. משתמש עשוי לרצות לבטל את התעודה שלו אם הוא חושד שאמינות התעודה נפגעה (לדוגמה אם מישהו ניחש את המספר האישי).\n"
+#~ "רשימת ביטול תעודות מכילה תעודות שבוטלו ושאין להשתמש בהן עוד לצרכי הצפנה. "
+#~ "משתמש עשוי לרצות לבטל את התעודה שלו אם הוא חושד שאמינות התעודה נפגעה "
+#~ "(לדוגמה אם מישהו ניחש את המספר האישי).\n"
 #~ "<p>\n"
-#~ "מומלץ להשתמש ברשימות ביטול תעודות על מנת להשיג אבטחה מירבית. באפשרותך לבחור מהיכן רשימות ביטול התעודות יאוחזרו בדו-שיח ההגדרות של ניהול התעודות ורשימות ביטול התעודות.\n"
+#~ "מומלץ להשתמש ברשימות ביטול תעודות על מנת להשיג אבטחה מירבית. באפשרותך "
+#~ "לבחור מהיכן רשימות ביטול התעודות יאוחזרו בדו-שיח ההגדרות של ניהול התעודות "
+#~ "ורשימות ביטול התעודות.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14623,17 +14319,21 @@ msgstr "לשכתב את הקובץ?"
 #~ msgstr "הצג אזהרה א&ם רשימת ביטול תעודות פגה תוך פחות מ:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "בחר באפשרות זו כדי לקבל אזהרה אם תוקף רשימת ביטול תעודות עומד לפוג בעתיד הקרוב."
+#~ msgstr ""
+#~ "בחר באפשרות זו כדי לקבל אזהרה אם תוקף רשימת ביטול תעודות עומד לפוג בעתיד "
+#~ "הקרוב."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הצג אזהרה אם רשימת ביטול תעודות פגה בעתיד הקרוב</h1>\n"
-#~ "אם אפשרות זו נבחרת, תוצג אזהרה אם התוקף של אחת מרשימות ביטול התעודות בהן אתה משתמש עומד לפוג בעתיד הקרוב.\n"
+#~ "אם אפשרות זו נבחרת, תוצג אזהרה אם התוקף של אחת מרשימות ביטול התעודות בהן "
+#~ "אתה משתמש עומד לפוג בעתיד הקרוב.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -14642,14 +14342,16 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הצג אזהרה אם רשימת ביטול תעודות פגה בעתיד הקרוב</h1>\n"
-#~ "בשדה זה באפשרותך לציין כמה זמן לפני שתוקף רשימת ביטול תעודות פג אתה תקבל אזהרה לגבי התפוגה הזו.\n"
+#~ "בשדה זה באפשרותך לציין כמה זמן לפני שתוקף רשימת ביטול תעודות פג אתה תקבל "
+#~ "אזהרה לגבי התפוגה הזו.\n"
 #~ "<p>\n"
 #~ "ההגדרה המומלצת לסביבת SPHINX היא 7 ימים.\n"
 #~ "</qt>"
@@ -14663,14 +14365,17 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הצפן תמיד גם עבורך</h1>\n"
-#~ "אם אפשרות זו נבחרת, הודעות מוצפנות שנשלחות על ידיך יוצפנו גם עם המפתח שלך.\n"
+#~ "אם אפשרות זו נבחרת, הודעות מוצפנות שנשלחות על ידיך יוצפנו גם עם המפתח "
+#~ "שלך.\n"
 #~ "<p>\n"
 #~ "מומלץ להשאיר אפשרות זו פועלת, על מנת שתוכל לקרוא את ההודעות שאתה שולח.\n"
 #~ "</qt>"
@@ -14685,16 +14390,21 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הצג אזהרה אם תעודה פגה</h1>\n"
-#~ "אם אפשרות זו נבחרת, אתה תקבל אזהרה אם תנסה להשתמש בתעודה להצפנה שפגה בתוך מספר הימים המצויין.\n"
+#~ "אם אפשרות זו נבחרת, אתה תקבל אזהרה אם תנסה להשתמש בתעודה להצפנה שפגה בתוך "
+#~ "מספר הימים המצויין.\n"
 #~ "<p>\n"
-#~ "מומלץ להשאיר אפשרות זו פועלת כדי להימנע משימוש בתעודות שפגות בעתיד הקרוב.\n"
+#~ "מומלץ להשאיר אפשרות זו פועלת כדי להימנע משימוש בתעודות שפגות בעתיד "
+#~ "הקרוב.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14717,8 +14427,26 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "בחירה אילו תעודות יש לשלוח"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>שליחת תעודות</h1> בלי התעודה שלך, הנמען לא יוכל לדעת אם באמת אתה זה ששלח את ההודעה, או שההודעה שונתה על ידי צד שלישי. <p> הנמען יכול להשיג את התעודה שלך משרת מרכזי, אבל אתה יכול גם לבחור לכלול את התעודה שלך עם ההודעה שלך. באפשרותך לבחור אם אינך רוצה לכלול תעודה כלל, אם ברצונך לכלול רק את התעודה שלך, או את כל שרשרת התעודות שמאשרות את התעודה שלך, כולל או לא כולל את תעודת השורש. <p> מומלץ תמיד לכלול לפחות את התעודה שלך בהודעה. <p>זוהי הגדרת ברירת מחדל. באפשרותך לעקוף אותה עבור כל הודעה בנפרד. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>שליחת תעודות</h1> בלי התעודה שלך, הנמען לא יוכל לדעת אם באמת אתה "
+#~ "זה ששלח את ההודעה, או שההודעה שונתה על ידי צד שלישי. <p> הנמען יכול להשיג "
+#~ "את התעודה שלך משרת מרכזי, אבל אתה יכול גם לבחור לכלול את התעודה שלך עם "
+#~ "ההודעה שלך. באפשרותך לבחור אם אינך רוצה לכלול תעודה כלל, אם ברצונך לכלול "
+#~ "רק את התעודה שלך, או את כל שרשרת התעודות שמאשרות את התעודה שלך, כולל או "
+#~ "לא כולל את תעודת השורש. <p> מומלץ תמיד לכלול לפחות את התעודה שלך בהודעה. "
+#~ "<p>זוהי הגדרת ברירת מחדל. באפשרותך לעקוף אותה עבור כל הודעה בנפרד. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "של&ח את התעודה שלך"
@@ -14738,14 +14466,17 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>חתום על כל חלקי ההודעה כברירת מחדל</h1>\n"
-#~ "אם אפשרות זו נבחרת, כל חלקי ההודעה (גוף ההודעה וכל המצורפים) ייחתמו כברירת מחדל.\n"
+#~ "אם אפשרות זו נבחרת, כל חלקי ההודעה (גוף ההודעה וכל המצורפים) ייחתמו "
+#~ "כברירת מחדל.\n"
 #~ "<p>\n"
 #~ "זוהי הגדרת ברירת מחדל. באפשרותך תמיד לעקוף אותה עבור כל הודעה בנפרד.\n"
 #~ "</qt>"
@@ -14759,12 +14490,15 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>שאל לפני חתימה על כל חלק</h1>\n"
-#~ "כאשר אפשרות זו נבחרת, אתה תישאל עבור כל חלק של ההודעה (גוף ההודעה וכל המצורפים) בנפרד האם ברצונך לחתום עליו.\n"
+#~ "כאשר אפשרות זו נבחרת, אתה תישאל עבור כל חלק של ההודעה (גוף ההודעה וכל "
+#~ "המצורפים) בנפרד האם ברצונך לחתום עליו.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14780,7 +14514,8 @@ msgstr "לשכתב את הקובץ?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14791,7 +14526,8 @@ msgstr "לשכתב את הקובץ?"
 #~ "</qt>"
 
 #, fuzzy
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "התעודה של החתימה מוגדרת בדף <em>תעודות</em>."
 
 #~ msgid "RSA + SHA-1"
@@ -14803,18 +14539,29 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>אלגוריתם חתימה</h1>\n"
-#~ "אלגוריתם הינו תיאור עבור המחשב כיצד לבצע מטלה מסויימת. אלגוריתם החתימה מתאר כיצד המחשב יחיל את מפתח החתימה שלך על ההודעה שלך, כך שהנמען יוכל לקבוע אם ההודעה באמת הגיעה ממך.\n"
+#~ "אלגוריתם הינו תיאור עבור המחשב כיצד לבצע מטלה מסויימת. אלגוריתם החתימה "
+#~ "מתאר כיצד המחשב יחיל את מפתח החתימה שלך על ההודעה שלך, כך שהנמען יוכל "
+#~ "לקבוע אם ההודעה באמת הגיעה ממך.\n"
 #~ "<p>\n"
-#~ "בחירה באלגוריתם חתימה מסויים קובעת כמה קל או קשה יהיה לזייף הודעה כלשהי. ראוי לציין כי כל האלגוריתמים המסופקים בסביבת SPHINX נחשבים לבטוחים ביותר. ככלל, ברירת המחדל אמורה לעבוד כאן בסדר גמור.\n"
+#~ "בחירה באלגוריתם חתימה מסויים קובעת כמה קל או קשה יהיה לזייף הודעה כלשהי. "
+#~ "ראוי לציין כי כל האלגוריתמים המסופקים בסביבת SPHINX נחשבים לבטוחים ביותר. "
+#~ "ככלל, ברירת המחדל אמורה לעבוד כאן בסדר גמור.\n"
 #~ "<p>\n"
 #~ "זוהי הגדרת ברירת מחדל. באפשרותך לעקוף אותה עבור כל הודעה בנפרד.\n"
 #~ "</qt>"
@@ -14831,12 +14578,16 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>אחסן הודעות עם חתימות</h1>\n"
-#~ "כאשר אפשרות זו נבחרת, הודעות שנשלחו יישמרו ביחד עם החתימות שהוחלו עליהן. דבר זה מומלץ, כיוון שהוא מאפשר לך לבדוק בשלב מאוחר יותר אם חתמת על הודעה או על חלק מסויים ממנה.\n"
+#~ "כאשר אפשרות זו נבחרת, הודעות שנשלחו יישמרו ביחד עם החתימות שהוחלו עליהן. "
+#~ "דבר זה מומלץ, כיוון שהוא מאפשר לך לבדוק בשלב מאוחר יותר אם חתמת על הודעה "
+#~ "או על חלק מסויים ממנה.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14852,12 +14603,17 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>חתימה מרובת חלקים מנותקת</h1>\n"
-#~ "כאשר אפשרות זו נבחרת, החתימה והנתונים החתומים יהוו חלקים נפרדים של חלק של הודעת Multipart/Signed. נתוני ההודעה החתומים יהיו ניתנים לקריאה אפילו על ידי תוכניות דואר שאינן תומכות באלגוריתם החתימה ובפיענוח ASN.1.\n"
+#~ "כאשר אפשרות זו נבחרת, החתימה והנתונים החתומים יהוו חלקים נפרדים של חלק של "
+#~ "הודעת Multipart/Signed. נתוני ההודעה החתומים יהיו ניתנים לקריאה אפילו על "
+#~ "ידי תוכניות דואר שאינן תומכות באלגוריתם החתימה ובפיענוח ASN.1.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14870,12 +14626,15 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הודעות חתומות אטומות</h1>\n"
-#~ "כאשר אפשרות זו נבחרת, החתימה והנתונים החתומים יקודדו לתוך קטע ASN.1 אחד. ההודעות יהיו ניתנות לקריאה רק על ידי תוכניות דואר התומכות בפיענוח ASN.1.\n"
+#~ "כאשר אפשרות זו נבחרת, החתימה והנתונים החתומים יקודדו לתוך קטע ASN.1 אחד. "
+#~ "ההודעות יהיו ניתנות לקריאה רק על ידי תוכניות דואר התומכות בפיענוח ASN.1.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14889,8 +14648,22 @@ msgstr "לשכתב את הקובץ?"
 #~ msgstr "בחר באיזו תדירות יש להזין את המספר האישי"
 
 #, fuzzy
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>הזנת המספר האישי</h1> כאן באפשרותך לבחור באיזו תדירות אתה תידרש להזין את המספר האישי שלך כדי לגשת אל סביבת האבטחה האישית (PSE) שלך, אשר מכילה את התעודות שלך. <p> ככל שתידרש להזין את המספר האישי שלך לעתים קרובות יותר, כך אתה תהיה מוגן יותר מפני הודעות דוא\"ל מזוייפות הנשלחות תחת השם שלך, אך בה בעת יהיה לך גם פחות נוח לעבוד. <p> אם אינך בטוח מה לבחור כאן, השאר אפשרות זו ללא שינוי. <p> שים לב כי אין אפשרות לכבות לחלוטין את הזנת המספר האישי, וזאת מטעמי אבטחה. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>הזנת המספר האישי</h1> כאן באפשרותך לבחור באיזו תדירות אתה תידרש "
+#~ "להזין את המספר האישי שלך כדי לגשת אל סביבת האבטחה האישית (PSE) שלך, אשר "
+#~ "מכילה את התעודות שלך. <p> ככל שתידרש להזין את המספר האישי שלך לעתים "
+#~ "קרובות יותר, כך אתה תהיה מוגן יותר מפני הודעות דוא\"ל מזוייפות הנשלחות "
+#~ "תחת השם שלך, אך בה בעת יהיה לך גם פחות נוח לעבוד. <p> אם אינך בטוח מה "
+#~ "לבחור כאן, השאר אפשרות זו ללא שינוי. <p> שים לב כי אין אפשרות לכבות "
+#~ "לחלוטין את הזנת המספר האישי, וזאת מטעמי אבטחה. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "אחת להפעלה"
@@ -14908,16 +14681,21 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הצג אזהרה אם תעודה פגה</h1>\n"
-#~ "אם אפשרות זו נבחרת, אתה תקבל אזהרה אם תנסה להשתמש בתעודה לחתימה שפגה בתוך מספר הימים המצויין.\n"
+#~ "אם אפשרות זו נבחרת, אתה תקבל אזהרה אם תנסה להשתמש בתעודה לחתימה שפגה בתוך "
+#~ "מספר הימים המצויין.\n"
 #~ "<p>\n"
-#~ "מומלץ להשאיר אפשרות זו פועלת כדי להימנע משימוש בתעודות שפגות בעתיד הקרוב.\n"
+#~ "מומלץ להשאיר אפשרות זו פועלת כדי להימנע משימוש בתעודות שפגות בעתיד "
+#~ "הקרוב.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14930,14 +14708,16 @@ msgstr "לשכתב את הקובץ?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>הצג אזהרה אם כתובת הדוא\"ל של החותם אינה בתעודה</h1>\n"
-#~ "אם אפשרות זו נבחרת, תוצג הודעה אם כתובת הדוא\"ל של החותם אינה כלולה בתעודה המשמשת לחתימה.\n"
+#~ "אם אפשרות זו נבחרת, תוצג הודעה אם כתובת הדוא\"ל של החותם אינה כלולה "
+#~ "בתעודה המשמשת לחתימה.\n"
 #~ "<p>\n"
 #~ "מומלץ להשאיר אפשרות זו פועלת לשם השגת אמינות מירבית.\n"
 #~ "</qt>"
diff --git a/tde-i18n-hi/messages/tdepim/kmail.po b/tde-i18n-hi/messages/tdepim/kmail.po
index 158c242f7b8..802e41fcfa2 100644
--- a/tde-i18n-hi/messages/tdepim/kmail.po
+++ b/tde-i18n-hi/messages/tdepim/kmail.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-08-24 13:36+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "रविशंकर श्रीवास्तव "
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -172,6 +172,12 @@ msgstr "कोई नहीं (ध्यान पूर्वक इस्त�
 msgid "Account for semiautomatic resource handling"
 msgstr "सेमीऑटोमेटिक रीसोर्स हैंडलिंग के लिए खाता"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "पिछला साफ करें"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -252,9 +258,9 @@ msgstr "लॉगइनः (&L)"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -277,12 +283,12 @@ msgstr "पॉप पासवर्ड कॉन्फ़िगरेशन फ
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -314,8 +320,9 @@ msgstr "यदि वे इससे बड़े हों तो संदे
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -367,13 +374,15 @@ msgstr "साफ पाठ (&x)"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -420,9 +429,9 @@ msgstr "बदलें (&R)"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -485,9 +494,9 @@ msgstr "मांग पर संलग्नक लोड करें (&m)"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -527,7 +536,7 @@ msgstr "कुछ नहीं"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "आई-डाक"
 
@@ -535,28 +544,29 @@ msgstr "आई-डाक"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -566,23 +576,23 @@ msgstr "विन्यास में मेलर प्रोग्राम
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -590,8 +600,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -672,8 +682,8 @@ msgstr "खाता जोड़ें"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -717,9 +727,9 @@ msgstr "वर्तनी जाँच - के-मेल"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -791,8 +801,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "सुपुर्दगी पुष्टिकरण"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "कुछ नहीं (&N)"
@@ -928,17 +937,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -975,10 +983,9 @@ msgstr "सभी संदेश रद्दी में डालें (&M)
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -989,8 +996,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -1001,8 +1008,8 @@ msgstr "सभी संदेशों को रद्दी में डा�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -1012,8 +1019,8 @@ msgstr "चुने गए संदेशों को पढ़ा चिह�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1217,8 +1224,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1240,8 +1247,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1271,15 +1278,15 @@ msgstr "मिटा दिया"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1309,15 +1316,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "प्रोफ़ाइल लोड करें... (&L)"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "कॉन्फ़िगर करें... (&g)"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "जोड़ें...(&A)"
@@ -1348,6 +1359,11 @@ msgstr "<qt>क्या आप सचमुच उपयोक्ता ना�
 msgid "Remove Identity"
 msgstr "नया उपयोक्ता"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "मिटाएँ (&e)"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "जोड़ें..."
@@ -1356,6 +1372,11 @@ msgstr "जोड़ें..."
 msgid "Modify..."
 msgstr "सुधारें..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "मिटाएँ (&e)"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "डिफ़ॉल्ट रूप में नियत करें"
@@ -1372,17 +1393,15 @@ msgstr "भेज रहे (&S)"
 msgid "Outgoing accounts (add at least one):"
 msgstr "आउटगोइंग ख़ाता (कम से कम एक जोड़ें):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "नाम"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "क़िस्म"
@@ -1405,8 +1424,7 @@ msgstr "डिफ़ॉल्ट रूप में नियत करें"
 msgid "Common Options"
 msgstr "सामान्य विकल्प"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "भेजने से पहले पुष्टि करें (&b)"
@@ -1458,14 +1476,14 @@ msgstr "डिफ़ॉल्ट डोमेनः (&t)"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1486,9 +1504,9 @@ msgstr "हस्तांतरण जोड़ें"
 #: configuredialog.cpp:832
 #, fuzzy
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (डिफ़ॉल्ट)"
 
@@ -1569,6 +1587,10 @@ msgstr "खाते में बदलाव करें"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>खाता निर्धारित करने में अक्षम<b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 #, fuzzy
 msgid "Color&s"
@@ -1690,8 +1712,7 @@ msgstr "फालोड लिंक"
 msgid "Misspelled Words"
 msgstr "गलत हिज्जे वाले शब्द"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "नया संदेश"
@@ -1900,8 +1921,8 @@ msgstr "लड़ियाँ डिफ़ॉल्ट पर बन्द र�
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1910,40 +1931,33 @@ msgstr "दिनांक दर्शाएँ"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1959,8 +1973,7 @@ msgstr "एचटीएमएल स्थिति पट्टी दिखा
 msgid "Show s&pam status in fancy headers"
 msgstr "सभी संदेश शीर्षों को दिखाएँ"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1969,8 +1982,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1998,8 +2010,7 @@ msgstr "स्वतः "
 msgid "&Override character encoding:"
 msgstr "एनकोडिंग नियत करें (&t)"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "तंत्र तश्तरी जानकारी"
@@ -2106,13 +2117,12 @@ msgstr "<b>%f</b> संपादन के लिए फ़ाइल-नाम
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2136,21 +2146,20 @@ msgstr "सब को जवाब भेजें: (&y)"
 msgid "&Forward:"
 msgstr "आगे-भेजें: (&F)"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "उद्धरण सूचकः (&Q)"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D को, आपने लिखा था:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D को, %F ने लिखा था:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "आगे भेजे गए संदेश"
 
@@ -2186,8 +2195,8 @@ msgstr "नया आगे भेजने का उपसर्ग भरे�
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2197,8 +2206,7 @@ msgstr "अक्षरसेट: भरें"
 #: configuredialog.cpp:3284
 #, fuzzy
 msgid "&Keep original charset when replying or forwarding (if possible)"
-msgstr ""
-"जब जवाब भेजें या आगे भेजें तो मूल अक्षरसेट को बनाए रखें (यदि संभव हो). (&K)"
+msgstr "जब जवाब भेजें या आगे भेजें तो मूल अक्षरसेट को बनाए रखें (यदि संभव हो). (&K)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2224,10 +2232,9 @@ msgstr "मान"
 msgid "Ne&w"
 msgstr "नया (&w)"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "नाम: (&N)"
@@ -2236,16 +2243,15 @@ msgstr "नाम: (&N)"
 msgid "&Value:"
 msgstr "मान: (&V)"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2272,13 +2278,13 @@ msgstr "संलग्न है"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2306,62 +2312,56 @@ msgstr "क्रिप्टो प्लगइन्स (&n)"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2378,10 +2378,10 @@ msgstr "संदेशों में इंटरनेट से बाह�
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2459,15 +2459,13 @@ msgstr "अंत में स्वचलित रूप से हस्त�
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"वैश्विक एचटीएमएल विन्यास को परिवर्तित करने पर सारे फ़ोल्डर विशिष्ट मान ओवरराइड "
-"होंगे."
+"वैश्विक एचटीएमएल विन्यास को परिवर्तित करने पर सारे फ़ोल्डर विशिष्ट मान ओवरराइड होंगे."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2497,8 +2495,8 @@ msgstr ""
 #: configuredialog.cpp:4580
 #, fuzzy
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "जब बिनपढ़े संदेश प्राप्त करने की कोशिश किया जा रहा है हों:"
 
@@ -2523,8 +2521,8 @@ msgstr "सारे फ़ोल्डरों में लूप करे�
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2573,8 +2571,7 @@ msgstr "सेक."
 
 #: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
-msgstr ""
-"संदेशों को अन्य फ़ोल्डर पर खींच ले जाने के बाद की क्रिया के लिए पूछें (&d)"
+msgstr "संदेशों को अन्य फ़ोल्डर पर खींच ले जाने के बाद की क्रिया के लिए पूछें (&d)"
 
 #: configuredialog.cpp:4646
 msgid ""
@@ -2597,16 +2594,14 @@ msgstr "डिरेक्ट्रीज़ (\"maildir\" फ़ॉर्मे�
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2642,32 +2637,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2736,8 +2726,8 @@ msgstr "ग्रुपवेयर फ़ोल्डरों के लिए
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2747,8 +2737,8 @@ msgstr "रीसोर्स फ़ोल्डर इनके सब-फ़�
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2801,19 +2791,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2826,14 +2815,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2901,8 +2890,7 @@ msgstr "वर्णन"
 
 #: configuredialog_p.cpp:302
 msgid "&Select a profile and click 'OK' to load its settings:"
-msgstr ""
-"एक प्रोफ़ाइल चुनें तथा इसका विन्यास लोड करने के लिए 'ठीक' पर क्लिक करें: (&S)"
+msgstr "एक प्रोफ़ाइल चुनें तथा इसका विन्यास लोड करने के लिए 'ठीक' पर क्लिक करें: (&S)"
 
 #: configuredialog_p.cpp:342
 msgid ""
@@ -2946,17 +2934,16 @@ msgstr "आगे भेजें (&F)"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2974,15 +2961,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3056,8 +3043,8 @@ msgstr "उपयोक्ता का संपादन करें"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3320,6 +3307,11 @@ msgstr "फ़ोल्डर मिटाएँ"
 msgid "Filters"
 msgstr "फ़िल्टर क्रिया %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "सभी संदेश चुनें (&A)"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3352,8 +3344,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3370,10 +3362,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3396,10 +3389,10 @@ msgstr "बेनाम"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3408,7 +3401,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "के-मेल त्रुटि"
@@ -3451,9 +3444,9 @@ msgstr "प्रमाणपत्र इस्तेमाल करें (&U
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3508,8 +3501,8 @@ msgstr "रद्दी फ़ोल्डर पर पढ़ने/लिख�
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3520,8 +3513,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3547,8 +3539,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3579,7 +3571,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "फ़ोल्डर मिटाएँ"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "स्थानीय फ़ोल्डर"
@@ -3606,9 +3598,9 @@ msgstr "फ़ोल्डर छोटी सूची (&t)"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3629,11 +3621,20 @@ msgstr "नहीं (&a)"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "अज्ञात"
@@ -3756,69 +3757,17 @@ msgstr "स्थितिः"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3830,12 +3779,9 @@ msgstr "आपका नामः (&Y)"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3844,11 +3790,9 @@ msgstr "संगठनः (&z)"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3857,14 +3801,11 @@ msgstr "ई-मेल पताः (&E)"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3874,21 +3815,12 @@ msgstr "ई-मेल पताः (&E)"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3913,12 +3845,11 @@ msgstr "पब्लिक कुंजी चुनें जो संलग�
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3933,20 +3864,18 @@ msgstr "आपकी ओपन-पीजीपी कुंजी"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3967,11 +3896,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3985,18 +3913,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -4018,14 +3945,12 @@ msgstr "जवाब भेजने का पताः (&R)"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -4034,15 +3959,12 @@ msgstr "बेनामी नक़ल पताः (&B)"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -4084,7 +4006,7 @@ msgstr "हस्ताक्षर (&S)"
 msgid "&Picture"
 msgstr "हस्ताक्षर (&S)"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "अवैध ई-मेल पता"
 
@@ -4103,8 +4025,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4155,8 +4077,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (डिफ़ॉल्ट)"
 
@@ -4205,14 +4127,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4252,14 +4174,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "त्रुटि: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4418,14 +4345,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4453,136 +4380,110 @@ msgstr "अपारिभाषित एनक्रिप्शन कुं�
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4597,136 +4498,110 @@ msgstr "प्रमाणपत्र विजार्ड"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4740,9 +4615,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4770,26 +4646,26 @@ msgstr "अपारिभाषित साइनिंग कुंजी"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4800,8 +4676,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4824,8 +4700,8 @@ msgstr "हस्ताक्षरित करने के लिए इस�
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4846,8 +4722,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4885,11 +4761,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4933,10 +4809,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "गंभीर त्रुटिः डाक संकलित कर पाने में अक्षमः"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"संदेश जोड़ना असफल: \n"
+msgid "Failed to add message:\n"
+msgstr "संदेश जोड़ना असफल: \n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5029,6 +4903,60 @@ msgstr "डिस्कनेक्टेड आईमैप (&D)"
 msgid "&Maildir mailbox"
 msgstr "मेल-डिर डाक-डब्बा (&M)"
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "संदेश का विषय नियत करें."
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr "प्रतिलिप भेजें: 'पता' पर."
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "बेनामी नक़ल भेजें: 'पता' पर."
+
+#: kmail_options.h:17
+#, fuzzy
+msgid "Add 'header' to message"
+msgstr "संदेश में शीर्षक जोड़ें."
+
+#: kmail_options.h:18
+#, fuzzy
+msgid "Read message body from 'file'"
+msgstr "'फ़ाइल' से संदेश का मुख्य भाग पढ़ें."
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "संदेश का मुख्य भाग नियत करें."
+
+#: kmail_options.h:20
+#, fuzzy
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "डाक में एक संलग्नक जोड़ें. इसे दोहराया जा सकता है."
+
+#: kmail_options.h:21
+#, fuzzy
+msgid "Only check for new mail"
+msgstr "सिर्फ नई डाक के लिए चेक करें."
+
+#: kmail_options.h:22
+#, fuzzy
+msgid "Only open composer window"
+msgstr "सिर्फ कम्पोज़र विंडो खोलें."
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "संदेश फलक के नीचे (&B)"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 #, fuzzy
 msgid "Mail"
@@ -5087,9 +5015,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5140,11 +5068,11 @@ msgstr "क्लिपबोर्ड पर यूआरएल की प्�
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>फ़ाइल <b>%1</b> उपलब्ध है.<br> क्या आप इसे बदलना चाहते हैं?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "फ़ाइल में सहेजें"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "बदलें (&R)"
 
@@ -5162,7 +5090,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5184,224 +5112,221 @@ msgstr "रखे हुए नहीं"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "संदेश मिटाएँ"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "संदेश %2 का %3 , %1 से खिसका रहे हैं"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "डिस्क में पर्याप्त जगह नहीं?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "इस फ़ोल्डर पर खिसकाएँ"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "इस फ़ोल्डर में नक़ल करें"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "संदेश खिसकाना असफल."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "संदेश मिटाएँ"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "यूआरएल खोला जा रहा है..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr ""
 "<qt>क्या आप सचमुच में चलाना चाहते हैं इसे-\n"
 " <b>'%1'</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "कमांड चलाएँ"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "सहेजने के लिए कोई संलग्नक नहीं मिला."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "संलग्नक ऐसे सहेजें"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
-msgstr ""
-"फ़ाइल नाम %1 पहले से ही अस्तित्व में है. क्या आप इसके ऊपर ही लिखना चाहेंगे?"
+msgstr "फ़ाइल नाम %1 पहले से ही अस्तित्व में है. क्या आप इसके ऊपर ही लिखना चाहेंगे?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"संदेश का यह भाग हस्ताक्षरित है. सहेजा जाने पर क्या आप हस्ताक्षर को बनाए रखना "
-"चाहते हैं?"
+"संदेश का यह भाग हस्ताक्षरित है. सहेजा जाने पर क्या आप हस्ताक्षर को बनाए रखना चाहते हैं?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "के-मेल प्रश्न"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "एनक्रिप्शन"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "एनक्रिप्ट नहीं करें (&D)"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"संदेश का यह भाग हस्ताक्षरित है. सहेजा जाने पर क्या आप हस्ताक्षर को बनाए रखना "
-"चाहते हैं?"
+"संदेश का यह भाग हस्ताक्षरित है. सहेजा जाने पर क्या आप हस्ताक्षर को बनाए रखना चाहते हैं?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "हस्ताक्षर"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "फ़ाइल पर लिख नहीं सका."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "एनक्रिप्शन कॉन्फ़िगरेशन"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "के-मेल"
@@ -5502,7 +5427,7 @@ msgstr "आकार"
 msgid "Encoding"
 msgstr "एनकोडिंग"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "कम्पोज़र"
@@ -5515,7 +5440,7 @@ msgstr "एनक्रिप्ट"
 msgid "Sign"
 msgstr "हस्ताक्षर"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "संलग्नक"
@@ -5539,7 +5464,8 @@ msgstr "प्राप्तकर्ता"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5549,9 +5475,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5561,9 +5487,8 @@ msgstr "प्राप्तकर्ता"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5576,7 +5501,7 @@ msgstr "सेंडमेल (&S)"
 msgid "&Send Mail Via"
 msgstr "सेंडमेल (&S)"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "बाद में भेजें (&L)"
@@ -5648,8 +5573,7 @@ msgstr "उद्धरण पहचान मिटाएँ (&m)"
 msgid "Cl&ean Spaces"
 msgstr "फ़ालतू फ़ासले हटाएँ (&e)"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "तय फ़ॉन्ट इस्तेमाल करें (&x)"
@@ -5798,32 +5722,32 @@ msgstr "भंडारण फॉर्मेटः (&S)"
 msgid "Select a cryptographic format for this message"
 msgstr "इस संदेश के सभी भाग को एनक्रिप्ट करें?"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 #, fuzzy
 msgid "Standard"
 msgstr "मानक माइम (&r)"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5932,8 +5856,8 @@ msgstr "नया कम्पोज़र (&N)"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5941,43 +5865,45 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "फ़ाइल संलग्नक स्मरण"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Send as Is"
 msgstr "जैसा है वैसा ही भेजें (&S)"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "फ़ाइल संलग्न करें"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "संलग्न (&A)"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "फ़ाइल प्रविष्ट करें"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "फ़ाइल प्रविष्ट करें"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -6019,291 +5945,301 @@ msgid ""
 "View"
 msgstr "दृश्य"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "संपादन... "
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "संपादन... "
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "ऐसे सहेजें... (&A)"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "गुण (&P)"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "संलग्नक जोड़ें..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "फ़ाइल पर लिख नहीं सका."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"संदेश का यह भाग हस्ताक्षरित है. सहेजा जाने पर क्या आप हस्ताक्षर को बनाए रखना "
-"चाहते हैं?"
+"संदेश का यह भाग हस्ताक्षरित है. सहेजा जाने पर क्या आप हस्ताक्षर को बनाए रखना चाहते हैं?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "बीप (&B)"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "फ़ाइल पर लिख नहीं सका."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "संलग्नक ऐसे सहेजें"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "संलग्नक जोड़ें..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "संलग्नक"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "बेनाम"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "अपारिभाषित एनक्रिप्शन कुंजी"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "अपारिभाषित साइनिंग कुंजी"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
-msgstr ""
-"आपको मिलेः फ़ील्ड में कम से कम एक प्राप्तकर्ता को उल्लेखित करना आवश्यक होगा."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
+msgstr "आपको मिलेः फ़ील्ड में कम से कम एक प्राप्तकर्ता को उल्लेखित करना आवश्यक होगा."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "आपने कोई विषय अंकित नहीं किया है. जैसा भी हो, संदेश भेज दें?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "कोई विषय उल्लेखित नहीं है."
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "आपने कोई विषय अंकित नहीं किया है. जैसा भी हो, संदेश भेज दें?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "कोई विषय उल्लेखित नहीं है."
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "S&end as Is"
 msgstr "जैसा है वैसा ही भेजें (&S)"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "नहीं, मुझे विषय उल्लेखित करने दें (&N)"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "हस्ताक्षर/एनक्रिप्ट"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "संदेश एनक्रिप्ट करें?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "कृपया भेजने के लिए एक ख़ाता बनाएँ तथा फिर कोशिश करें."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "ई-मेल भेजने में..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 #, fuzzy
 msgid "Send Confirmation"
 msgstr "भेजना पुष्टिकरण"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "अभी भेजें (&S)"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "प्राप्तकर्ता"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "प्राप्तकर्ता"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "वर्तनी शोधक"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "वर्तनी शोधक"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "वर्तनी जांच रद्द."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "वर्तनी जांच रोका."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "मात्रा की जांच पूरी हो गई."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "वर्तनी शोधक"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "कोई प्रमाणपत्र नहीं मिला"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "एनक्रिप्शन कॉन्फ़िगरेशन"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "संदेश %1 के द्वारा हस्ताक्षरित है."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "संदेश %1 के द्वारा हस्ताक्षरित है."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "ओपन-पीजीपी संदेश - एनक्रिप्टेड"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "संदेश सूची"
@@ -6353,8 +6289,8 @@ msgstr "वर्तनी जाँच - के-मेल"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6388,9 +6324,8 @@ msgstr "<qt>फ़िल्टर नियम में बहुत सार�
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6630,102 +6565,86 @@ msgstr "एक ध्वनि दें"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6737,6 +6656,16 @@ msgstr "पॉप3 फ़िल्टर नियम"
 msgid "Filter Rules"
 msgstr "फ़िल्टर नियम"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "आयात (&I)"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "आयात (&I)"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "उपलब्ध फ़िल्टर्स"
@@ -6825,6 +6754,11 @@ msgstr "इस फ़िल्टर को फ़िल्टर लागू �
 msgid "Icon for this filter:"
 msgstr "इस फ़िल्टर के लिए प्रतीकः"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "प्रति: (&T)"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "ऊपर"
@@ -6833,16 +6767,29 @@ msgstr "ऊपर"
 msgid "Down"
 msgstr "नीचे"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "नाम बदलें..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "नया"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "नक़ल यहाँ रखें (&C)"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "मिटा दिया"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6851,8 +6798,8 @@ msgstr "फ़ोल्डर छोटी सूची (&t)"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6925,19 +6872,16 @@ msgstr "आईमैप कैश ट्रबलशूट किया जा �
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6977,14 +6921,13 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
-msgstr ""
-"आईमैप फ़ोल्डरों का नाम बदलने से पहले आपको सर्वर से सिंक्रोनाइज़ होना होगा."
+msgstr "आईमैप फ़ोल्डरों का नाम बदलने से पहले आपको सर्वर से सिंक्रोनाइज़ होना होगा."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7015,8 +6958,8 @@ msgstr "इस फ़ोल्डर की निर्देशिका फ�
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7150,10 +7093,8 @@ msgstr "सर्वर पर सब-फ़ोल्डर बनाया ज�
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7175,9 +7116,8 @@ msgstr "फ़ोल्डर सूची फिर से प्राप्�
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7187,14 +7127,14 @@ msgstr "भेजना छोड़ें (&A)"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7208,11 +7148,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7221,15 +7161,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "यहाँ खिसकाएँ (&M)"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -7243,8 +7188,7 @@ msgstr "संदेश इस फ़ोल्डर पर खिसकाए�
 msgid "Permissions (ACL)"
 msgstr "पढ़ चुके"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "साधारण"
@@ -7269,8 +7213,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "मनपसंद प्रतीक इस्तेमाल करें (&i)"
@@ -7290,14 +7233,13 @@ msgstr "इस फ़ोल्डर में डाक देखें"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7312,9 +7254,9 @@ msgstr "इस फ़ोल्डर के पुराने संदेश�
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7326,17 +7268,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "स्तम्भ आकार"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "डिफ़ॉल्ट रूप में नियत करें"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "भेजने वाला"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "पाने वाला"
@@ -7348,11 +7294,11 @@ msgstr "भेजने वाले की आइडेंटिटीः (&y)"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7372,12 +7318,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7411,17 +7357,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7500,7 +7446,8 @@ msgstr "फ़ोल्डर अपलोड करते समय त्र�
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7524,8 +7471,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7566,13 +7513,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7632,13 +7577,13 @@ msgstr ""
 "'%1' प्रतीत होता है कि फ़ोल्डर नहीं है.\n"
 "कृपया फ़ाइल को रास्ते से बाहर खिसकाएँ."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7646,8 +7591,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7655,7 +7600,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "फ़ोल्डर बनाने में असफल"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7760,9 +7705,9 @@ msgstr "आईमैप कैश ट्रबलशूट करें... (&T)"
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7911,13 +7856,13 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>क्या आप सचमुच चुने गए संदेशों को मिटाना चाहते हैं?"
-"<br>एक बार मिटाने के बाद इन्हें वापस नहीं लाया जा सकेगा!</qt>"
+"<qt>क्या आप सचमुच चुने गए संदेशों को मिटाना चाहते हैं?<br>एक बार मिटाने के बाद इन्हें वापस "
+"नहीं लाया जा सकेगा!</qt>"
 
 #: kmheaders.cpp:1600
 #, fuzzy
@@ -7976,126 +7921,125 @@ msgstr ""
 " %1 को परिवर्धित करना असफल\n"
 "(उपकरण में कोई जगह नहीं बची?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "प्रमाणपत्र हस्ताक्षर निवेदन"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "कृपया इस प्रमाणपत्र पर हस्ताक्षर कर भेजने वाले को वापस भेजें."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "आई-डाक फ़ोल्डर पर पढ़ने/लिखने की अनुमति आपके पास नहीं है."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "गई-डाक"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "गई-डाक फ़ोल्डर पर पढ़ने/लिखने की अनुमति आपके पास नहीं है."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "भेजी -डाक"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "आपके पास आपकी भेजी-डाक फ़ोल्डर पर पढ़ने/लिखने की अनुमतियाँ नहीं है."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "रद्दी"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "रद्दी फ़ोल्डर पर पढ़ने/लिखने की अनुमति आपके पास नहीं है."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "मसौदा"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "मसौदा फ़ोल्डर पर पढ़ने/लिखने की अनुमति आपके पास नहीं है."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "बदलें (&R)"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "रद्दी फ़ोल्डर पर पढ़ने/लिखने की अनुमति आपके पास नहीं है."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "पिछला खोज"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "के-मेल में एक गंभीर त्रुटि हुई और यह अब बन्द होगा"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8106,11 +8050,11 @@ msgstr ""
 "त्रुटि थी:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "रद्दी खाली करें"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "क्या आप वाक़ई रद्दी का फ़ोल्डर खाली करना चाहते हैं?"
@@ -8194,8 +8138,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -8233,8 +8176,8 @@ msgstr "क्या आप वाक़ई रद्दी का फ़ोल�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1173
@@ -8260,8 +8203,8 @@ msgstr "प्राप्तकर्ता"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -8274,29 +8217,32 @@ msgstr "<qt>क्या आप वाक़ई खाली फ़ोल्ड�
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "मिटा दिया"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8309,9 +8255,9 @@ msgstr "क्या आप वाक़ई सभी पुराने सं�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8325,8 +8271,8 @@ msgstr ""
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8343,8 +8289,8 @@ msgstr "डाक-सूची %1 पर फ़िल्टर..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8362,7 +8308,8 @@ msgstr "प्रमाणपत्र प्रबंधक प्रारं�
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "प्रमाणपत्र प्रबंधक प्रारंभ नहीं कर सका. कृपया अपना संस्थापन जांचें."
 
 #: kmmainwidget.cpp:2508
@@ -8710,8 +8657,7 @@ msgstr "संलग्नक सहेजें... (&t)"
 msgid "Appl&y All Filters"
 msgstr "फ़िल्टर्स लागू करें (&y)"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "फ़िल्टर्स लागू करें (&y)"
@@ -8825,7 +8771,6 @@ msgstr "अगला बिनपढ़ा संदेश (&U)"
 msgid "Go to the next unread message"
 msgstr "अगले बिना-पढ़े संदेश पर जाएँ"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "पिछला संदेश (&P)"
@@ -8967,25 +8912,25 @@ msgstr "प्रारंभ किया जा रहा है..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8993,8 +8938,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9002,8 +8947,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9032,17 +8977,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "पावतीः"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "संलग्नक: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "भेजने वाला द्वारा सुझाई गई विधि से संलग्नक दिखाएँ."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 #, fuzzy
 msgid "The attachment '%1' has been deleted."
 msgstr "घटना %1 रद्द की गई"
@@ -9094,29 +9039,26 @@ msgstr "संदेश भाग विशेषताएं"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9125,11 +9067,10 @@ msgstr "वर्णनः (&D)"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9138,14 +9079,13 @@ msgstr "एनकोडिंग: (&E)"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9154,13 +9094,11 @@ msgstr "स्वचलित प्रदर्शन सुझाएँ (&a)"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9169,9 +9107,8 @@ msgstr "इस हिस्से में हस्ताक्षर कर�
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -9181,9 +9118,8 @@ msgstr "इस हिस्से को एनक्रिप्ट करे�
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -9199,11 +9135,9 @@ msgstr "पॉप फ़िल्टर्स"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9329,8 +9263,7 @@ msgstr "प्रतीक की तरह (&A)"
 
 #: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
-msgstr ""
-"सभी संलग्नकों को प्रतीक रूप में दिखाएँ. उन्हें देखने के लिए क्लिक करें."
+msgstr "सभी संलग्नकों को प्रतीक रूप में दिखाएँ. उन्हें देखने के लिए क्लिक करें."
 
 #: kmreaderwin.cpp:551
 msgid ""
@@ -9373,8 +9306,7 @@ msgstr "छुपाएँ (&H)"
 #: kmreaderwin.cpp:575
 #, fuzzy
 msgid "Show Attachments only in the header of the mail"
-msgstr ""
-"सभी संलग्नकों को प्रतीक रूप में दिखाएँ. उन्हें देखने के लिए क्लिक करें."
+msgstr "सभी संलग्नकों को प्रतीक रूप में दिखाएँ. उन्हें देखने के लिए क्लिक करें."
 
 #: kmreaderwin.cpp:580
 msgid "&Set Encoding"
@@ -9462,15 +9394,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9480,18 +9411,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9499,21 +9429,19 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2>के-मेल %1 में आपका स्वागत है</h2>"
-"<p>के-मेल के डेस्कटॉप माहौल का ई-मेल क्लाएँट है. यह पूरी तरह से इंटरनेट मेलिंग "
-"मानकों जिसमें सम्मिलित हैं माइम, एसएमटीपी, पॉप3 तथा आईमैप से पूरी तरह "
-"काम्पेटिबल के लिए डिज़ाइन किया गया है.</p>\n"
-"<ul>"
-"<li>के-मेल के पास बहुत सी शक्तिशाली विशेषताएँ हैं जिसका विवरण दिया गया है <a "
-"href=\"%2\">दस्तावेज़</a></li> में\n"
-"<li> <a href=\"%3\">के-मेल घर-पृष्ठ</A> में आपको के-मेल के नए संस्करणों के बारे "
-"में जानकारी मिलेगी</li></ul>\n"
-"<p><span style='font-size:125%; font-weight:bold;'>महत्वपूर्ण परिवर्तन</span> "
-"(के-मेल  %8 से तुलनात्मक रुप में):</p>\n"
+"<h2>के-मेल %1 में आपका स्वागत है</h2><p>के-मेल के डेस्कटॉप माहौल का ई-मेल क्लाएँट है. यह "
+"पूरी तरह से इंटरनेट मेलिंग मानकों जिसमें सम्मिलित हैं माइम, एसएमटीपी, पॉप3 तथा आईमैप से "
+"पूरी तरह काम्पेटिबल के लिए डिज़ाइन किया गया है.</p>\n"
+"<ul><li>के-मेल के पास बहुत सी शक्तिशाली विशेषताएँ हैं जिसका विवरण दिया गया है <a href="
+"\"%2\">दस्तावेज़</a></li> में\n"
+"<li> <a href=\"%3\">के-मेल घर-पृष्ठ</A> में आपको के-मेल के नए संस्करणों के बारे में जानकारी "
+"मिलेगी</li></ul>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>महत्वपूर्ण परिवर्तन</span> (के-"
+"मेल  %8 से तुलनात्मक रुप में):</p>\n"
 "<ul>\n"
 "%9</ul>\n"
-"<p>के-मेल के इस संस्करण की कुछ नई विशेषताओं में सम्मिलित हैं  (के-मेल %4 की "
-"तुलना में, जो कि केडीई %5 का भाग है):</p>\n"
+"<p>के-मेल के इस संस्करण की कुछ नई विशेषताओं में सम्मिलित हैं  (के-मेल %4 की तुलना में, जो कि "
+"केडीई %5 का भाग है):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9522,15 +9450,13 @@ msgstr ""
 "<p>&nbsp; &nbsp; के-मेल टोली</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9571,13 +9497,12 @@ msgstr "संलग्नक देखें: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
-"[के-मेल: संलग्नक में बाइनरी डाटा हैं. प्रथम अक्षर दिखाने की कोशिश किया जा रहा "
-"है.]\n"
-"[के-मेल: संलग्नक में बाइनरी डाटा हैं. प्रथम %n अक्षर दिखाने की कोशिश किया जा "
-"रहा है.]"
+"[के-मेल: संलग्नक में बाइनरी डाटा हैं. प्रथम अक्षर दिखाने की कोशिश किया जा रहा है.]\n"
+"[के-मेल: संलग्नक में बाइनरी डाटा हैं. प्रथम %n अक्षर दिखाने की कोशिश किया जा रहा है.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -9595,8 +9520,7 @@ msgid ""
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 "संलग्नक खोलें '%1'?\n"
-"टीप लें कि किसी संलग्नक को खोलने से आपके तंत्र की सुरक्षा में खतरा पैदा हो सकता "
-"है!"
+"टीप लें कि किसी संलग्नक को खोलने से आपके तंत्र की सुरक्षा में खतरा पैदा हो सकता है!"
 
 #: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
@@ -9604,12 +9528,14 @@ msgstr "संलग्नक खोलें?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9633,6 +9559,71 @@ msgstr "निम्न में से कोई भी जोड़ मिल
 msgid "(match all of the following)"
 msgstr "निम्न में से सभी जोड़ मिलाएँ (&l)"
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "तैयार."
+
+#: kmsearchpattern.h:222
+#, fuzzy
+msgid "Old"
+msgstr "पुराना"
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "मिटा दिया"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "जवाब दे दिया"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "आगे भेजा गया"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "क़तार में लगाएँ (&Q)"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "भेजी डाक"
+
+#: kmsearchpattern.h:228
+#, fuzzy
+msgid "Watched"
+msgstr "निगाह रखी"
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "उपेक्षित"
+
+#: kmsearchpattern.h:230
+#, fuzzy
+msgid "Spam"
+msgstr "बेकार डाक"
+
+#: kmsearchpattern.h:231
+#, fuzzy
+msgid "Ham"
+msgstr "हैम"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "मिलेः"
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "संलग्नक"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9717,17 +9708,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9754,8 +9745,8 @@ msgstr "भेजने की प्रक्रिया प्रारंभ
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9781,8 +9772,9 @@ msgstr "क़तार में लगे (कुछ) संदेशों �
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9793,13 +9785,11 @@ msgstr "भेजना छोड़ा गया."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9821,8 +9811,9 @@ msgstr "भेजना छोड़ें (&A)"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9853,35 +9844,34 @@ msgstr "सेंडमेल असाधारण रूप से बाह�
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"इस एसएमटीपी सर्वर का उपयोग करने के लिए आपको एक उपयोक्ता नाम तथा पासवर्ड देना "
-"होगा."
+"इस एसएमटीपी सर्वर का उपयोग करने के लिए आपको एक उपयोक्ता नाम तथा पासवर्ड देना होगा."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9894,6 +9884,10 @@ msgstr "स्थितिः"
 msgid "Exit"
 msgstr "हाँ"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -9922,8 +9916,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -10002,8 +9997,8 @@ msgstr "सर्वर को प्रमाणीकरण की आवश�
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -10025,10 +10020,9 @@ msgstr "सर्वर को मनपसंद होस्टनाम भ�
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -10059,8 +10053,8 @@ msgstr "सिर्फ स्थानीय फ़ाइलें ही स�
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "डोमेन नाम या एसएमटीपी सर्वर का संख्यात्मक पता."
 
 #: kmtransport.cpp:788
@@ -10075,10 +10069,10 @@ msgstr "फ़ोल्डर अपलोड करते समय त्र�
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10316,22 +10310,18 @@ msgstr "संदेश संपादन (&E)"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10342,8 +10332,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10358,14 +10348,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10467,8 +10457,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10502,8 +10492,9 @@ msgstr "एनक्रिप्ट नहीं करें (&D)"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10514,8 +10505,8 @@ msgstr "अनएनक्रिप्टेड सहेजें (&U)"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10536,73 +10527,71 @@ msgstr "सभी भाग को एनक्रिप्ट करें (&E)
 msgid "Unencrypted Message Warning"
 msgstr "एनक्रिप्टेड संदेश"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "कुछ अक्षर गुम हो सकती हैं"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Lose Characters"
 msgstr "उद्धरण पहचान जोड़ें (&Q)"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "एनकोडिंग नियत करें (&t)"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10626,10 +10615,10 @@ msgstr "डाक-डब्बा फॉर्मेटः (&M)"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10640,8 +10629,8 @@ msgstr "फ़ोल्डर प्रतीक"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10686,8 +10675,7 @@ msgstr "हस्ताक्षर के लिए भिन्न परि�
 msgid "The crypto engine returned no cleartext data."
 msgstr "क्रिप्टो इंजिन ने नो क्लीयरटेक्स्ट डाटा लौटाया!"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "स्थितिः"
 
@@ -10717,8 +10705,8 @@ msgstr "कोई %1 प्लग-इन नहीं मिला."
 #: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "हस्ताक्षर की वैधता सत्यापित नहीं की जा सकी."
 
 #: objecttreeparser.cpp:737
@@ -10757,18 +10745,18 @@ msgstr "क्रिप्टो प्लग-इन \"%1\" संदेशो�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -11018,8 +11006,8 @@ msgstr "भंडारितः"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -11138,10 +11126,11 @@ msgstr "के-आईओ-स्लेव त्रुटि संदेश"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11159,9 +11148,9 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
-msgstr ""
-"संदेश %2 का %1 (%4 का %3 केबी) %5 से (%6 केबी सर्वर पर बचा है) निकाल रहे."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
+msgstr "संदेश %2 का %1 (%4 का %3 केबी) %5 से (%6 केबी सर्वर पर बचा है) निकाल रहे."
 
 #: popaccount.cpp:912
 #, fuzzy
@@ -11179,1647 +11168,12 @@ msgstr "सर्वर से अवैध प्रतिक्रिया"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "जाएँ (&G)"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "फ़ोल्डर (&o)"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "संदेश (&M)"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "आगे-भेजें (&F)"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "हस्ताक्षर"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "ओपन-पीजीपी के उपयोग से संदेश स्वचलित हस्ताक्षरित करें (&i)"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "एनक्रिप्शन"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "भेजे गए संदेशों को एनक्रिप्टेड भंडारित करें (&e)"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "संदेशों को एनक्रिप्टेड भंडारित करने के लिए क्लिक करें"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "जहाँ संभव हो स्वचलित रूप से संदेश एनक्रिप्ट करें (&w)"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, no-c-format
-msgid "To:"
-msgstr "मिलेः"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "नक़ल: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "साधारण"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "को जवाब भेजें (&R)"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "सब को जवाब भेजें... (&A)"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "आगे-भेजें (&F)"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "दिखाएँ: (&w)"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "बदलें (&R)"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "फ़ोल्डर विशेषताएं"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "फ़ोल्डर में एक मेलिंग सूची है (&m)"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "पता सूचीः (&a)"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "सामान्यः (&o)"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "बिनपढ़ाः (&e)"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "संदेश की मियाद ख़त्म"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "के बाद मियाद ख़त्मः (&x)"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "पढ़े संदेशों की मियाद ख़त्म करें (&r)"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "के बाद मियाद ख़त्मः (&f)"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "बिनपढ़े संदेशों की मियाद ख़त्म करें (&u)"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "दिन"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "सप्ताह"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "माह"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "विस्तृत"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "भेजने वाले की आइडेंटिटीः (&y)"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "भंडारण फॉर्मेटः (&S)"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "प्रदर्शित सूची: (&L)"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "प्रमाणपत्र बनाना"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "अच्छा हस्ताक्षर"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "प्रमाणपत्र न भेजें (&D)"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "जब प्रमाणपत्र जोड़ रहे हों"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "जोड़ें...(&A)"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "ग्रुपवेयर (&G)"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "मौज़ूदा उपयोक्ताः (&E)"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "बेनाम"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "हस्ताक्षर कॉन्फ़िगरेशन"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "भेजने वाले को जवाब भेजें: (&n)"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "सब को जवाब भेजें... (&A)"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "आगे भेजे गए संदेश"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "जब अहस्ताक्षरित संदेश भेजे जाने की कोशिश हो तो चेतावनी दें (&u)"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"जब अहस्ताक्षरित संदेश भेजे जाने की कोशिश हो तो चेतावनी देने के लिए चेक करें"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "जब अनएनक्रिप्टेड संदेश भेजा जाने की कोशिश हो तो चेतावनी दें (&W)"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"जब अनएनक्रिप्टेड संदेश भेजा जाने की कोशिश हो तो चेतावनी देने के लिए चेक करें"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "चेतावनी दें यदि प्रमाणपत्र में प्राप्तकर्ता का ई-मेल पता नहीं हो (&n)"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "यदि प्रमाणपत्र में पता नहीं हो तो चेतावनी देने के लिए चेक करें"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "चेतावनी दें यदि सीए प्रमाणपत्र की मियाद इससे कम में ख़त्म हो (&x)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "हस्ताक्षरित करने के लिए इस्तेमाल करें (&S)"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "एनक्रिप्शन"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "दिन"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "दिनों की संख्या यहाँ चुनें"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "अन्य प्रमाणपत्रों के लिए देखें"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "प्रमाणपत्र न भेजें (&D)"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "फ़ोल्डर प्रतीक"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "बदलें (&R)"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "बदलें (&R)"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, fuzzy, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "हमेशा तंत्र तश्तरी दिखाएँ (&y)"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "नई डाक की सूचना"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "संपादक उल्लेखित करें: (&d)"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "कम्पोज़र के बदले बाहरी सम्पादक इस्तेमाल करें (&x)"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, fuzzy, no-c-format
-msgid "Enable groupware functionality"
-msgstr "ग्रुपवेयर फंक्शनलिटी सक्षम करें (&E)"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"जब जवाब भेजें या आगे भेजें तो मूल अक्षरसेट को बनाए रखें (यदि संभव हो). (&K)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "अंत में स्वचलित रूप से हस्ताक्षर लिखें (&u)"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "स्तम्भ पर शब्द व्रैपः (&w)"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "चेतावनी दें यदि रूट प्रमाणपत्र की मियाद इससे कम में ख़त्म हो (&l)"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "संदेश डिस्पॉज़िशन सूचना स्वचलित निवेदित करें (&m)"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "देखने का अंतरालः (&v)"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "पहचाने उपसर्ग को बदलें \"जवाब:\" से (&x)"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "पहचाने उपसर्ग को बदलें \"आगे:\" से (&F)"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "स्मार्ट उद्धरण इस्तेमाल करें (&q)"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "हस्ताक्षर की मियाद ख़त्म हो चुकी है."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"जब जवाब भेजें या आगे भेजें तो मूल अक्षरसेट को बनाए रखें (यदि संभव हो). (&K)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "भेजे गए संदेशों को एनक्रिप्टेड भंडारित करें (&e)"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "सभी संदेश शीर्षों को दिखाएँ"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "संदेश डिस्पोज़ीशन सूचनाएँ"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "संदेश सूची - तारीख़ फील्ड"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "संदेश को आगे भेजा चिह्नित करें (&F)"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "उद्धरण पहचान जोड़ें (&Q)"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12942,6 +11296,11 @@ msgstr "खाता जोड़ें"
 msgid "Add as BCC"
 msgstr "खाता जोड़ें"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "नहीं (&a)"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12959,10 +11318,10 @@ msgstr "प्राप्तकर्ता"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12980,8 +11339,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13098,10 +11457,19 @@ msgstr "से बड़ा है या समान है"
 msgid " bytes"
 msgstr "बाइट"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "दिन"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13257,13 +11625,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13281,8 +11647,7 @@ msgid ""
 msgstr "खाता क़िस्मः पॉप खाता"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13300,8 +11665,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13310,8 +11674,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "उपलब्ध फ़िल्टर्स"
 
 #: sievedebugdialog.cpp:358
@@ -13380,8 +11743,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13401,17 +11764,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "कमांड उल्लेखित करें: (&p)"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "नई प्रविष्टिः"
@@ -13448,6 +11816,11 @@ msgstr "खाता जोड़ें"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>क्या आप सचमुच उपयोक्ता नाम <b>%1</b> मिटाना चाहेंगे?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "यहाँ लागू करें: (&t)"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13462,6 +11835,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "संपादन... "
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13501,9 +11878,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13542,6 +11919,16 @@ msgstr ""
 "फ़ाइल खोल नहीं सका \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr "मिलेः"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "नक़ल: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13579,36 +11966,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13842,6 +12225,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -13879,76 +12266,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 #, fuzzy
 msgid "There is nothing to undo."
@@ -14017,6 +12334,17 @@ msgstr "संलग्नक #%1 (बेनाम)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "फ़ाइल नाम %1 पहले से ही अस्तित्व में है. क्या आप इसके ऊपर ही लिखना चाहेंगे?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "फ़ाइल प्रविष्ट करें"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14122,9 +12450,9 @@ msgstr "संदेश मिटाएँ"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14157,9 +12485,9 @@ msgstr "फ़ोल्डर मिटाएँ"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14169,15 +12497,15 @@ msgstr "पता पुस्तिका में जोड़ें"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14186,8 +12514,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14204,154 +12532,1509 @@ msgstr "हस्ताक्षर (&S)"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "हस्ताक्षर"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "ओपन-पीजीपी के उपयोग से संदेश स्वचलित हस्ताक्षरित करें (&i)"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "एनक्रिप्शन"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
-msgstr "संदेश का विषय नियत करें."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr "प्रतिलिप भेजें: 'पता' पर."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr "बेनामी नक़ल भेजें: 'पता' पर."
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-#, fuzzy
-msgid "Add 'header' to message"
-msgstr "संदेश में शीर्षक जोड़ें."
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "भेजे गए संदेशों को एनक्रिप्टेड भंडारित करें (&e)"
 
-#: kmail_options.h:18
-#, fuzzy
-msgid "Read message body from 'file'"
-msgstr "'फ़ाइल' से संदेश का मुख्य भाग पढ़ें."
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "संदेशों को एनक्रिप्टेड भंडारित करने के लिए क्लिक करें"
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "संदेश का मुख्य भाग नियत करें."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:20
-#, fuzzy
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "डाक में एक संलग्नक जोड़ें. इसे दोहराया जा सकता है."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:21
-#, fuzzy
-msgid "Only check for new mail"
-msgstr "सिर्फ नई डाक के लिए चेक करें."
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-#, fuzzy
-msgid "Only open composer window"
-msgstr "सिर्फ कम्पोज़र विंडो खोलें."
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "जहाँ संभव हो स्वचलित रूप से संदेश एनक्रिप्ट करें (&w)"
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "संदेश फलक के नीचे (&B)"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "तैयार."
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-#, fuzzy
-msgid "Old"
-msgstr "पुराना"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "साधारण"
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "मिटा दिया"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "को जवाब भेजें (&R)"
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
-msgstr "जवाब दे दिया"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "सब को जवाब भेजें... (&A)"
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
-msgstr "आगे भेजा गया"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "आगे-भेजें (&F)"
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "क़तार में लगाएँ (&Q)"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "दिखाएँ: (&w)"
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "भेजी डाक"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "बदलें (&R)"
 
-#: kmsearchpattern.h:228
-#, fuzzy
-msgid "Watched"
-msgstr "निगाह रखी"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "फ़ोल्डर प्रतीक"
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "उपेक्षित"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "बदलें (&R)"
 
-#: kmsearchpattern.h:230
-#, fuzzy
-msgid "Spam"
-msgstr "बेकार डाक"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "बदलें (&R)"
 
-#: kmsearchpattern.h:231
-#, fuzzy
-msgid "Ham"
-msgstr "हैम"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "फ़ोल्डर विशेषताएं"
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "मिलेः"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "फ़ोल्डर में एक मेलिंग सूची है (&m)"
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "संलग्नक"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "पता सूचीः (&a)"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "सामान्यः (&o)"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "बिनपढ़ाः (&e)"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "संदेश की मियाद ख़त्म"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "के बाद मियाद ख़त्मः (&x)"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "पढ़े संदेशों की मियाद ख़त्म करें (&r)"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "के बाद मियाद ख़त्मः (&f)"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "बिनपढ़े संदेशों की मियाद ख़त्म करें (&u)"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "दिन"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "सप्ताह"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "माह"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "विस्तृत"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "भेजने वाले की आइडेंटिटीः (&y)"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "भंडारण फॉर्मेटः (&S)"
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "प्रदर्शित सूची: (&L)"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: util.h:208
-#, fuzzy
+#: kmail.kcfg:72
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
-"फ़ाइल नाम %1 पहले से ही अस्तित्व में है. क्या आप इसके ऊपर ही लिखना चाहेंगे?"
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "फ़ाइल प्रविष्ट करें"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, fuzzy, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "हमेशा तंत्र तश्तरी दिखाएँ (&y)"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "नई डाक की सूचना"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "संपादक उल्लेखित करें: (&d)"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "कम्पोज़र के बदले बाहरी सम्पादक इस्तेमाल करें (&x)"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, fuzzy, no-c-format
+msgid "Enable groupware functionality"
+msgstr "ग्रुपवेयर फंक्शनलिटी सक्षम करें (&E)"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "जब जवाब भेजें या आगे भेजें तो मूल अक्षरसेट को बनाए रखें (यदि संभव हो). (&K)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "अंत में स्वचलित रूप से हस्ताक्षर लिखें (&u)"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "स्तम्भ पर शब्द व्रैपः (&w)"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "चेतावनी दें यदि रूट प्रमाणपत्र की मियाद इससे कम में ख़त्म हो (&l)"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "संदेश डिस्पॉज़िशन सूचना स्वचलित निवेदित करें (&m)"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "देखने का अंतरालः (&v)"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "पहचाने उपसर्ग को बदलें \"जवाब:\" से (&x)"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "पहचाने उपसर्ग को बदलें \"आगे:\" से (&F)"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "स्मार्ट उद्धरण इस्तेमाल करें (&q)"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "हस्ताक्षर की मियाद ख़त्म हो चुकी है."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "जब जवाब भेजें या आगे भेजें तो मूल अक्षरसेट को बनाए रखें (यदि संभव हो). (&K)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "भेजे गए संदेशों को एनक्रिप्टेड भंडारित करें (&e)"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "सभी संदेश शीर्षों को दिखाएँ"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "संदेश डिस्पोज़ीशन सूचनाएँ"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "संदेश सूची - तारीख़ फील्ड"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "संदेश को आगे भेजा चिह्नित करें (&F)"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "उद्धरण पहचान जोड़ें (&Q)"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "फ़ाइल का संपादन करें (&F)"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "संपादन... "
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, fuzzy, no-c-format
+msgid "&View"
+msgstr "दर्शन..."
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "जाएँ (&G)"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "फ़ोल्डर (&o)"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "संदेश (&M)"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "आगे-भेजें (&F)"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "मौज़ूदा उपयोक्ताः (&E)"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "सामान्य विकल्प"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "प्रमाणपत्र बनाना"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "अच्छा हस्ताक्षर"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "प्रमाणपत्र न भेजें (&D)"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "जब प्रमाणपत्र जोड़ रहे हों"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "जोड़ें...(&A)"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "ग्रुपवेयर (&G)"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "मौज़ूदा उपयोक्ताः (&E)"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "बेनाम"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "हस्ताक्षर कॉन्फ़िगरेशन"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "भेजने वाले को जवाब भेजें: (&n)"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "सब को जवाब भेजें... (&A)"
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "आगे भेजे गए संदेश"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "जब अहस्ताक्षरित संदेश भेजे जाने की कोशिश हो तो चेतावनी दें (&u)"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "जब अहस्ताक्षरित संदेश भेजे जाने की कोशिश हो तो चेतावनी देने के लिए चेक करें"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "जब अनएनक्रिप्टेड संदेश भेजा जाने की कोशिश हो तो चेतावनी दें (&W)"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "जब अनएनक्रिप्टेड संदेश भेजा जाने की कोशिश हो तो चेतावनी देने के लिए चेक करें"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "चेतावनी दें यदि प्रमाणपत्र में प्राप्तकर्ता का ई-मेल पता नहीं हो (&n)"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "यदि प्रमाणपत्र में पता नहीं हो तो चेतावनी देने के लिए चेक करें"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "चेतावनी दें यदि सीए प्रमाणपत्र की मियाद इससे कम में ख़त्म हो (&x)"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "हस्ताक्षरित करने के लिए इस्तेमाल करें (&S)"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "एनक्रिप्शन"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "दिनों की संख्या यहाँ चुनें"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "अपने स्वयं के प्रमाणपत्र भेजें (&y)"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "अन्य प्रमाणपत्रों के लिए देखें"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "प्रमाणपत्र न भेजें (&D)"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "&Copy to (CC):"
@@ -14474,7 +14157,8 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgstr "जब सीआरएलएस की मियाद इससे कम में ख़त्म होती हो तो चेतावनी दें (&x)"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "यदि निकट भविष्य में सीआरएलएस की मियाद ख़त्म होती हो तो चेतावनी देने के लिए चेक करें"
+#~ msgstr ""
+#~ "यदि निकट भविष्य में सीआरएलएस की मियाद ख़त्म होती हो तो चेतावनी देने के लिए चेक करें"
 
 #~ msgid "Number of days before warning"
 #~ msgstr "चेतावनी देने से पूर्व दिनों की संख्या"
@@ -14487,7 +14171,8 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgstr "चेतावनी दें यदि कड़ी में प्रमाणपत्र की मियाद इससे कम में ख़त्म हो (&t)"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "यदि निकट भविष्य में प्रमाणपत्र की मियाद ख़त्म होती हो तो चेतावनी देने के लिए चेक करें"
+#~ msgstr ""
+#~ "यदि निकट भविष्य में प्रमाणपत्र की मियाद ख़त्म होती हो तो चेतावनी देने के लिए चेक करें"
 
 #, fuzzy
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -14788,8 +14473,10 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgstr "[%1] %2"
 
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
 #~ "हस्तांतरण पूर्ण. %n नया संदेश %1 के.बी. में (%2 के.बी. सर्वर में बाकी है).\n"
 #~ "हस्तांतरण पूर्ण. %n नए संदेश %1 के.बी. में (%2 के.बी. सर्वर में बाकी है)."
@@ -14812,10 +14499,13 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgstr "हस्तांतरण सम्पन्न. कोई नए संदेश नहीं."
 
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "खाता %3 के लिए हस्तांतरण पूर्ण. %n नया संदेश %1 के.बी. में (%2 के.बी. सर्वर में बाकी है).\n"
+#~ "खाता %3 के लिए हस्तांतरण पूर्ण. %n नया संदेश %1 के.बी. में (%2 के.बी. सर्वर में बाकी "
+#~ "है).\n"
 #~ "खाता %3 के लिए हस्तांतरण पूर्ण. %n नए संदेश %1 के.बी. में (%2 के.बी. सर्वर में बाकी है)."
 
 #~ msgid ""
@@ -15219,9 +14909,6 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgid "&New"
 #~ msgstr "नया (&N)"
 
-#~ msgid "Confi&gure..."
-#~ msgstr "कॉन्फ़िगर करें... (&g)"
-
 #~ msgid "Deac&tivate"
 #~ msgstr "अक्रिय करें (&t)"
 
@@ -15383,7 +15070,8 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgstr "प्रमाणपत्र चुनें [%1]"
 
 #~ msgid "<qt><p>%1</p><p>Do you still want to use this certificate?</p></qt>"
-#~ msgstr "<qt><p>%1</p><p>क्या आप अब भी इस प्रमाणपत्र का उपयोग करना चाहते हैं?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>%1</p><p>क्या आप अब भी इस प्रमाणपत्र का उपयोग करना चाहते हैं?</p></qt>"
 
 #~ msgid "Certificate Warning"
 #~ msgstr "प्रमाणपत्र चेतावनी"
@@ -15394,8 +15082,12 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgid "[unknown error]"
 #~ msgstr "[अज्ञात त्रुटि]"
 
-#~ msgid "Enter different address for recipient %1 or enter \" * \" to see all certificates:"
-#~ msgstr "विभिन्न प्राप्तकर्ता %1 के लिए पता भरें या प्रविष्ट करें \" * \" सभी प्रमाणपत्रों को देखने के लिए:"
+#~ msgid ""
+#~ "Enter different address for recipient %1 or enter \" * \" to see all "
+#~ "certificates:"
+#~ msgstr ""
+#~ "विभिन्न प्राप्तकर्ता %1 के लिए पता भरें या प्रविष्ट करें \" * \" सभी प्रमाणपत्रों को "
+#~ "देखने के लिए:"
 
 #~ msgid "Select Certificate for Encryption [%1]"
 #~ msgstr "एनक्रिप्शन [%1] के लिए प्रमाणपत्र चुनें"
@@ -15499,7 +15191,8 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgid "Sender <b>tentatively accepts</b> the task <b>%1</b>."
 #~ msgstr "भेजने वाला <b>अंतरिम रूप से स्वीकारता है</b> कार्य <b>%1</b> को."
 
-#~ msgid "Sender <b>declines</b> the invitation to meet in %1<br>from %2 to %3."
+#~ msgid ""
+#~ "Sender <b>declines</b> the invitation to meet in %1<br>from %2 to %3."
 #~ msgstr "भेजने वाले ने <b>नकारा</b>  %1 पर <br> %2 से %3 तक मिलने के निमंत्रण को."
 
 #~ msgid "Sender <b>declines</b> the task %1."
@@ -15538,8 +15231,12 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgid "Folder is read-only."
 #~ msgstr "फ़ोल्डर सिर्फ-पढ़ने-योग्य है"
 
-#~ msgid "<qt>Do you really want to delete the selected message?<br>Once deleted, it cannot be restored!</qt>"
-#~ msgstr "<qt>क्या आप सचमुच चुने गए संदेश को मिटाना चाहते हैं?<br>एक बार मिटाने के बाद इसे वापस नहीं लाया जा सकेगा!</qt>"
+#~ msgid ""
+#~ "<qt>Do you really want to delete the selected message?<br>Once deleted, "
+#~ "it cannot be restored!</qt>"
+#~ msgstr ""
+#~ "<qt>क्या आप सचमुच चुने गए संदेश को मिटाना चाहते हैं?<br>एक बार मिटाने के बाद इसे वापस "
+#~ "नहीं लाया जा सकेगा!</qt>"
 
 #~ msgid "<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>"
 #~ msgstr "<qt>हस्ताक्षर स्क्रिप्ट निष्पादित करने में असफल<br><b>%1</b>:<br>%2</qt>"
@@ -15610,9 +15307,6 @@ msgstr "फ़ाइल प्रविष्ट करें"
 #~ msgid "Messages can have more than one status."
 #~ msgstr "संदेशों में एक से ज्यादा स्थितियाँ हो सकती हैं."
 
-#~ msgid "View..."
-#~ msgstr "दर्शन..."
-
 #~ msgid "Properties..."
 #~ msgstr "गुण..."
 
diff --git a/tde-i18n-hr/messages/tdepim/kmail.po b/tde-i18n-hr/messages/tdepim/kmail.po
index 1b51648409f..ec4edc4bf54 100644
--- a/tde-i18n-hr/messages/tdepim/kmail.po
+++ b/tde-i18n-hr/messages/tdepim/kmail.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 0\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2004-04-20 13:25+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -12,20 +12,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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"
+"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"
 "X-Generator: TransDict server\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"Andrija Piličić, Darko Bednjanec, Denis Lackovic, Hrvoje Spoljar, Igor Jagec, "
-"Jerko Škifić, Nikola Planinac, Robert Pezer, Sasa Poznanovic, sime essert, "
-"Vedran Vyroubal, Vjekoslav Matausic"
+"Andrija Piličić, Darko Bednjanec, Denis Lackovic, Hrvoje Spoljar, Igor "
+"Jagec, Jerko Škifić, Nikola Planinac, Robert Pezer, Sasa Poznanovic, sime "
+"essert, Vedran Vyroubal, Vjekoslav Matausic"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -179,6 +179,12 @@ msgstr "Nij&edan (koristiti uz oprez)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Nalog za poluatomatsko rukovanje resursima"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Obriši povijest"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -263,13 +269,13 @@ msgstr "&Korisničko ime:"
 #: accountdialog.cpp:596 accountdialog.cpp:866
 #, fuzzy
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Vaš internet provajder vam je dao <em>korisničko ime</em> "
-"koje se koristi za vaše prijavljivanje na njihove poslužitelje. To je obično "
-"dio e-adrese (dio prije <em>@</em>)."
+"Vaš internet provajder vam je dao <em>korisničko ime</em> koje se koristi za "
+"vaše prijavljivanje na njihove poslužitelje. To je obično dio e-adrese (dio "
+"prije <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -292,17 +298,17 @@ msgstr "&Spremi POP lozinku u postavnu datoteku"
 #, fuzzy
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Uključite ovu opciju ako želite da KMail pohrani vašu SMTP lozinku u svoju "
-"datoteku s podešavanjima. Lozinka će biti pohranjena u nečitljivom formatu, ali "
-"ga ne treba smatrati sigurnim od pokušaja dekriptiranja ako dođe do pristupa "
-"datoteci s podešavanjima."
+"datoteku s podešavanjima. Lozinka će biti pohranjena u nečitljivom formatu, "
+"ali ga ne treba smatrati sigurnim od pokušaja dekriptiranja ako dođe do "
+"pristupa datoteci s podešavanjima."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -332,12 +338,13 @@ msgstr "&Filtriraj poruke ako su veće od"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ako odaberete ovu opciju, POP filtri će biti korišteni za odlučivanje što treba "
-"raditi s porukama. Možete ih tada označiti za preuzimanje, brisanje ili držanje "
-"na poslužitelju."
+"Ako odaberete ovu opciju, POP filtri će biti korišteni za odlučivanje što "
+"treba raditi s porukama. Možete ih tada označiti za preuzimanje, brisanje "
+"ili držanje na poslužitelju."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -388,13 +395,15 @@ msgstr "Očisti te&kst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "Č&isti tekst"
 
@@ -442,9 +451,9 @@ msgstr "&Zamijeni"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -508,9 +517,9 @@ msgstr "Učitaj pri&loge na zahtjev"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -551,7 +560,7 @@ msgstr "<nijedno>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Dolazna pošta"
 
@@ -559,28 +568,29 @@ msgstr "Dolazna pošta"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -589,23 +599,23 @@ msgstr "Prvo odredite poslužitelj i port na tabu s općim postavkama."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -613,8 +623,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -697,8 +707,8 @@ msgstr "Dodaj korisnički račun"
 #: accountmanager.cpp:343
 #, fuzzy
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Morate dodati korisnički račun u mrežnom odjeljku postavki da biste primali "
 "poštu."
@@ -744,9 +754,9 @@ msgstr "Provjera pisanja - KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -818,8 +828,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Potvrde o prijemu"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "&Nijedan"
@@ -959,23 +968,22 @@ msgstr ""
 #: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Ovdje vam je pružena podrška pri postavljanju KMail-ovih filter pravila za "
-"upotrebu nekih poznatijih alata protiv neželjene pošte (spam). </p>"
-"<p> Čarobnjak može detektirati instalirane alate na računalu kao što može i "
-"kreirati filter pravila kako bi raspoznao i odvojio neželjenu poštu. Čarobnjak "
-"neće razmatrati već definirana pravila već će dodati nova.</p>"
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Ovdje vam je pružena podrška pri postavljanju KMail-ovih filter pravila "
+"za upotrebu nekih poznatijih alata protiv neželjene pošte (spam). </p><p> "
+"Čarobnjak može detektirati instalirane alate na računalu kao što može i "
+"kreirati filter pravila kako bi raspoznao i odvojio neželjenu poštu. "
+"Čarobnjak neće razmatrati već definirana pravila već će dodati nova.</p>"
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1011,10 +1019,9 @@ msgstr "Premjesti poruku u smeće"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1026,13 +1033,13 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Neka alati protiv neželjene pošte (spam) klasificiraju vaše poruke. Čarobnjak "
-"će stvoriti odgovarajuće filtere. Poruke će obično biti označene tako da "
-"sljedeći filteri mogu na njih reagirati i, npr., maknuti neželjenu poruku u "
-"posebnu mapu."
+"Neka alati protiv neželjene pošte (spam) klasificiraju vaše poruke. "
+"Čarobnjak će stvoriti odgovarajuće filtere. Poruke će obično biti označene "
+"tako da sljedeći filteri mogu na njih reagirati i, npr., maknuti neželjenu "
+"poruku u posebnu mapu."
 
 #: antispamwizard.cpp:1076
 #, fuzzy
@@ -1042,8 +1049,8 @@ msgstr "Premjesti pronađene neželjene poruke u odabranu mapu"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -1053,8 +1060,8 @@ msgstr "Označi odabrane poruke kao pročitane"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1259,8 +1266,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1282,8 +1289,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1314,17 +1321,17 @@ msgstr "izbrisano"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "Da bi vas Outlook prepoznao kao primatelja, morate označiti koja je od "
 "sljedećih vaša email adresa:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1356,15 +1363,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Učitaj Profil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "&Namjesti KMail..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Dodaj..."
@@ -1395,6 +1406,11 @@ msgstr "<qt>Želite li zaista uklonite identitet s imenom <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "&Ukloni"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "U&kloni"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Dodaj..."
@@ -1403,6 +1419,11 @@ msgstr "Dodaj..."
 msgid "Modify..."
 msgstr "Izmijeni..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "U&kloni"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Postavi kao uobičajeno"
@@ -1419,17 +1440,15 @@ msgstr "&Slanje"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Izlazeći korisnički računi (dodajte barem jedan):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tip"
@@ -1452,8 +1471,7 @@ msgstr "Postavi kao uobičajeno"
 msgid "Common Options"
 msgstr "Opće opcije"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Potvrdi prije slanja"
@@ -1507,14 +1525,14 @@ msgstr "Podra&zumijevana domena:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1535,9 +1553,9 @@ msgstr "Dodaj transport"
 #: configuredialog.cpp:832
 #, fuzzy
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (uobičajen)"
 
@@ -1618,6 +1636,10 @@ msgstr "Promijeni korisnički račun"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ne mogu da naći korisnički račun <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Boje"
@@ -1738,8 +1760,7 @@ msgstr "Praćena veza"
 msgid "Misspelled Words"
 msgstr "Pogrešno napisane riječi"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "Nova poruka"
@@ -1955,11 +1976,11 @@ msgstr "Niti su standardno zatvore&ne"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Otvori niti koje sadrže nove, nepročitane ili važne &poruke i otvori niti koje "
-"se prate."
+"Otvori niti koje sadrže nove, nepročitane ili važne &poruke i otvori niti "
+"koje se prate."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1967,40 +1988,33 @@ msgstr "Prikaz datuma"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Mijenjanje globalnih postavki threadanja  pregaziti će sve vrijednosti "
 "specifične za mape."
@@ -2019,8 +2033,7 @@ msgstr "Pokaži HTML statusnu trak&u"
 msgid "Show s&pam status in fancy headers"
 msgstr "Pokaži sva zaglavlja poruka"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -2029,8 +2042,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2058,8 +2070,7 @@ msgstr "Automatski"
 msgid "&Override character encoding:"
 msgstr "Podesi &kodiranje.."
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "obavijest u sustavskoj kaseti"
@@ -2167,13 +2178,12 @@ msgstr "<b>%f</b> će biti zamijenjeno imenom datoteke za uređivanje."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2197,21 +2207,20 @@ msgstr "&Odgovori svima:"
 msgid "&Forward:"
 msgstr "&Naprijed:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Znak &citata:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Dana %D napisali ste:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Dana %D, %F je napisao/la:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Proslijeđena poruka"
 
@@ -2250,8 +2259,8 @@ msgstr "Unesite novi prefiks za prosijleđivanje:"
 #: configuredialog.cpp:3269
 #, fuzzy
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Ova lista se provjerava odozgo na dole za svaku odlaznu poruku, radi "
 "pronalaženja skupa znakova koji sadrži sve zahtjevane znake."
@@ -2264,8 +2273,8 @@ msgstr "Unesite znakovni skup:"
 #, fuzzy
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja (ako "
-"je moguće)."
+"&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja "
+"(ako je moguće)."
 
 #: configuredialog.cpp:3318
 #, fuzzy
@@ -2293,10 +2302,9 @@ msgstr "Vrijednost"
 msgid "Ne&w"
 msgstr "&Novi"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Ime:"
@@ -2305,8 +2313,7 @@ msgstr "&Ime:"
 msgid "&Value:"
 msgstr "&Vrijednost:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
@@ -2314,8 +2321,8 @@ msgstr ""
 #: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
 "pozivnice"
@@ -2346,13 +2353,13 @@ msgstr "odan"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2379,62 +2386,56 @@ msgstr "Pozadine za kriptiranje"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2452,10 +2453,10 @@ msgstr "Dozvoli porukama da učitaju &vanjske reference sa Interneta"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2519,8 +2520,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>UPOZORENjE:</b> Bezuvjetno slanje potvrda podriva vašu privatnost <a "
-"href=\"whatsthis:%1\">Više o ovome...</a>"
+"<b>UPOZORENjE:</b> Bezuvjetno slanje potvrda podriva vašu privatnost <a href="
+"\"whatsthis:%1\">Više o ovome...</a>"
 
 #: configuredialog.cpp:3899
 #, fuzzy
@@ -2543,8 +2544,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2573,8 +2573,8 @@ msgstr "Isključi važne poruke od isteka"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2598,8 +2598,8 @@ msgstr "Kruži po svim mapama"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2672,16 +2672,14 @@ msgstr "direktoriji („maildir“ formata)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2717,32 +2715,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2810,8 +2803,8 @@ msgstr "Isključi groupware funkcije"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2821,8 +2814,8 @@ msgstr "Mape re&sursa su podmape:"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2883,19 +2876,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2908,14 +2900,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -3027,17 +3019,16 @@ msgstr "&Proslijedi"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3055,15 +3046,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3137,8 +3128,8 @@ msgstr "Uredi identitet"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3419,6 +3410,11 @@ msgstr "Obriši Mapu"
 msgid "Filters"
 msgstr "Filtar %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Od&aberi sve poruke..."
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3450,8 +3446,8 @@ msgstr "&Logiraj aktivnost filtera"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3468,10 +3464,11 @@ msgstr "Logiraj evaluaciju filtera pravila"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3492,10 +3489,10 @@ msgstr "neograničeno"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3506,7 +3503,7 @@ msgstr ""
 "Pisanje u datoteku %1 nije uspjelo:\n"
 "\"%2\" je detaljni opis greške."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail greška"
@@ -3553,9 +3550,9 @@ msgstr "&Koristi certifikat"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3610,8 +3607,8 @@ msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za smeće."
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3622,8 +3619,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3649,8 +3645,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3681,7 +3677,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Obriši Mapu"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Direktoriji"
@@ -3708,9 +3704,9 @@ msgstr "&Kratka lista mapi"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3731,11 +3727,20 @@ msgstr "O&tkaži"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Napoznato"
@@ -3855,51 +3860,14 @@ msgstr "Status: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>p"
-"<br>o"
-"<br>r"
-"<br>u"
-"<br>k"
-"<br>a</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>p<br>o<br>r<br>u<br>k<br>a</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr ""
 
 #: identitydialog.cpp:93
@@ -3912,12 +3880,9 @@ msgstr "&Vaše ime:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3926,11 +3891,9 @@ msgstr "Or&ganizacija:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3939,14 +3902,11 @@ msgstr "Email adresa:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3956,21 +3916,12 @@ msgstr "Email adresa:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3997,12 +3948,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -4018,22 +3968,20 @@ msgstr "Vaš OpenPGP ključ"
 #: identitydialog.cpp:218
 #, fuzzy
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Odaberite OpenPGP ključ koji će biti korišten za potpisivanje vaših poruka i "
 "pri šifriranju za sebe. "
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -4057,11 +4005,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -4075,18 +4022,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -4108,14 +4054,12 @@ msgstr "Ad&resa za odgovor (Reply-To):"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -4124,15 +4068,12 @@ msgstr "BCC a&drese:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -4176,7 +4117,7 @@ msgstr "&Potpis"
 msgid "&Picture"
 msgstr "&Potpis"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Neispravna adresa e-pošte"
 
@@ -4195,8 +4136,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4247,8 +4188,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (uobičajeni)"
 
@@ -4300,14 +4241,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4347,14 +4288,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Greška: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4517,14 +4463,14 @@ msgstr "Arhive liste"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4552,136 +4498,110 @@ msgstr "Nedefiniran ključ za kriptiranje"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4696,136 +4616,110 @@ msgstr "Čarobnjak za certifikate"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4839,9 +4733,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4869,26 +4764,26 @@ msgstr "Nedefiniran ključ za potpisivanje"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4899,8 +4794,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4923,8 +4818,8 @@ msgstr "Koristi za &potpisivanje"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4945,8 +4840,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4984,11 +4879,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -5032,10 +4927,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritična greška: Ne mogu skupiti poštu:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Ne mogu dodati poruku:\n"
+msgid "Failed to add message:\n"
+msgstr "Ne mogu dodati poruku:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5133,6 +5026,61 @@ msgstr "&Odspojeno IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir sandučić"
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "Postavi temu poruke."
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr "Pošalji kopiju na 'addresu'."
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "Pošalji BCC: na „adresu“."
+
+#: kmail_options.h:17
+#, fuzzy
+msgid "Add 'header' to message"
+msgstr "Dodaj 'zaglavlje' poruci. '"
+
+#: kmail_options.h:18
+#, fuzzy
+msgid "Read message body from 'file'"
+msgstr "Čitaj tijelo poruke iz „datoteke“."
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Postavi telo poruke."
+
+#: kmail_options.h:20
+#, fuzzy
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Dodaj prilog poruci. Ovo se može ponavljati."
+
+#: kmail_options.h:21
+#, fuzzy
+msgid "Only check for new mail"
+msgstr "Samo provjeri da li ima nove pošte."
+
+#: kmail_options.h:22
+#, fuzzy
+msgid "Only open composer window"
+msgstr "Samo otvori prozor uređivača."
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "Premještanje poruka nije uspjelo."
+
+#: kmail_options.h:24
+#, fuzzy
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Pošalji poruku na „adresu“ i priloži datoteka na koji „URL“ ukazuje."
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 #, fuzzy
 msgid "Mail"
@@ -5190,9 +5138,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5245,11 +5193,11 @@ msgstr "URL iskopiran na odlagalište (clipboard)."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Datoteka <b>%1</b> postoji.<br>Želite li je zamijeniti?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Spremi u datoteku"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Zamijeni"
 
@@ -5267,7 +5215,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5288,102 +5236,103 @@ msgstr "Izbaci &nepročitane poruke"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Ovo je proslijeđivanje MIME sažetka. Sadržaj ove poruke se nalazi u prilogu.\n"
+"Ovo je proslijeđivanje MIME sažetka. Sadržaj ove poruke se nalazi u "
+"prilogu.\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Obriši poruke"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Premještam poruku %3 od %2 iz %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Nema dovoljno slobodnog prostora na disku?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Premjesti u ovu mapu"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiraj u ovu mapu"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "Obriši poruke"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Otvaram URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Da li zaista želite izvršiti <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "izvrši naredbu"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nema priloga za spremanje."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Snimi prilog kao"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Fajl sa imenom %1 već postoji. Želite li da ga prebrišete?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
@@ -5392,21 +5341,21 @@ msgstr ""
 "Ovaj dio poruke je kriptiran. Želite li da ga zadržite takvim prilikom "
 "spremanja?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail pitanje"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Ši&firiraj"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "&Kriptiraj"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -5414,100 +5363,100 @@ msgid ""
 msgstr ""
 "Ovaj dio poruke je potpisan. Želite li da zadržite potpis prilikom spremanja?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Signatures"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr ""
 "Ne mogu pisati u datoteku:\n"
 "%1"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Podešavanja kriptiranja"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "KMail"
@@ -5609,7 +5558,7 @@ msgstr "Veličina"
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "Composer"
@@ -5622,7 +5571,7 @@ msgstr "Kriptiraj"
 msgid "Sign"
 msgstr "Znak"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "prilog"
@@ -5646,7 +5595,8 @@ msgstr "<primatelji>"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5656,9 +5606,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5668,9 +5618,8 @@ msgstr "<primatelji>"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5683,7 +5632,7 @@ msgstr "Sendmail"
 msgid "&Send Mail Via"
 msgstr "Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Poša&lji kasnije"
@@ -5755,8 +5704,7 @@ msgstr "Ukloni znakove za citi&ranje"
 msgid "Cl&ean Spaces"
 msgstr "&Očisti razmake"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, fuzzy, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Koristi pismo fiksne širine"
@@ -5908,31 +5856,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr "Kriptirati sve dijelove poruke?"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr ""
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -6043,55 +5991,57 @@ msgstr "&Novi uređivač"
 #: kmcomposewin.cpp:2333
 #, fuzzy
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Čini se da poruka koju ste sastavili ukazuje na priloženi datoteka, ali ništa "
-"niste priložili.\n"
+"Čini se da poruka koju ste sastavili ukazuje na priloženi datoteka, ali "
+"ništa niste priložili.\n"
 "Želite li da priložite datoteka uz vašu poruku?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Podsjetnik za prilaganje datoteka"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Send as Is"
 msgstr "Pošalji &kako jest"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Priloži datoteku"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Prikvači"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Umetni datoteku"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Umetni datoteku"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -6135,23 +6085,38 @@ msgid ""
 "View"
 msgstr "Pokaži"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Uredi..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Uredi..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Spremi pod &drugim imenom..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Svojstva"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Dodaj Privitak..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr ""
 "Ne mogu pisati u datoteku:\n"
 "%1"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -6159,272 +6124,269 @@ msgid ""
 msgstr ""
 "Ovaj dio poruke je potpisan. Želite li da zadržite potpis prilikom spremanja?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "&Beep"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr ""
 "Ne mogu pisati u datoteku:\n"
 "%1"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 #, fuzzy
 msgid "Save Attachment As"
 msgstr "Snimi prilog kao"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Dodaj Privitak..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "prilog"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "neimenovan"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 #, fuzzy
 msgid "Undefined Encryption Key"
 msgstr "Nedefiniran ključ za kriptiranje"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 #, fuzzy
 msgid "Undefined Signing Key"
 msgstr "Nedefiniran ključ za potpisivanje"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Morate odreditti bar jednog primatelja u polju „Za:“."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Nije naznačen naslov"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nije naznačen naslov"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "S&end as Is"
 msgstr "Pošalji ponovo..."
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "Ne, želim upisati temu"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Potpiši/kriptiraj"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Napravite korisnički račun za slanje pa pokušajte ponovo."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Spremam se poslati email..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 #, fuzzy
 msgid "Send Confirmation"
 msgstr "Potvrda slanja poruke"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Pošalji &odmah"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<primatelji>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "<primatelji>"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Provjera pisanja"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Provjera pisanja"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 #, fuzzy
 msgid " Spell check canceled."
 msgstr " Provjera pravopisa je otkazana."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Zaustavljena provjera pravopisa."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Završena provjera pravopisa."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Provjera pisanja"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Nisu nađeni certifikati"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Podešavanja kriptiranja"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Poruku je potpisao"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Poruku je potpisao"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP poruka — kriptirano"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Popisa poruka"
@@ -6476,8 +6438,8 @@ msgstr "Provjera pisanja - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell se ne može pokrenuti.Provjerite da li je ISpell ili Aspell "
 "ispravno podešen i da li se nalazi u vašoj putanji."
@@ -6513,9 +6475,8 @@ msgstr "<qt>Previše filterskih akcija u filterskom pravilu <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6755,102 +6716,86 @@ msgstr "pusti zvuk"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6862,6 +6807,16 @@ msgstr "Pravila POP3 filtra"
 msgid "Filter Rules"
 msgstr "Filter pravila"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Uvezi"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Uvezi"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Postojeći Filteri"
@@ -6949,6 +6904,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "Sličica za ovaj filtar:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "&Za:"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Gore"
@@ -6957,16 +6917,29 @@ msgstr "Gore"
 msgid "Down"
 msgstr "Dolje"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Promijeni ime..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Novi"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopiraj u"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "izbrisano"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6975,8 +6948,8 @@ msgstr "&Kratka lista mapi"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6985,8 +6958,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Sljedeći filteri nisu snimljeni zato jer su neispravni (npr. ne sadrže ni jednu "
-"akciju ili pravila za pretragu)."
+"Sljedeći filteri nisu snimljeni zato jer su neispravni (npr. ne sadrže ni "
+"jednu akciju ili pravila za pretragu)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7052,19 +7025,16 @@ msgstr "Otklanjanje problema u IMAP kešu"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -7104,8 +7074,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7129,8 +7099,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Jeste li sigurni da želite da osviježite IMAP međuspremničke mape %1 i njenih "
-"pod mape?\n"
+"Jeste li sigurni da želite da osviježite IMAP međuspremničke mape %1 i "
+"njenih pod mape?\n"
 "Ovo će ukloniti sve izmjene koje ste napravili lokalno u vašim mapama."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7149,8 +7119,8 @@ msgstr "Indeks ove mape je ponovo napravljen."
 #: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Mapa %1 nije u početnom sinhronizacijskom stanju (stanje je %2). Želite li\n"
 "da vratite stanje na početno ili da ipak napravite sinhronizaciju?"
@@ -7291,10 +7261,8 @@ msgstr "Stvaram podmape na poslužitelju"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7316,9 +7284,8 @@ msgstr "Dobavljam popis mapi"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7328,14 +7295,14 @@ msgstr "&Prekini slanje"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7349,11 +7316,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7362,15 +7329,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "&Premjesti u"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -7384,8 +7356,7 @@ msgstr "Premjesti poruku u mapu"
 msgid "Permissions (ACL)"
 msgstr "Dozvole"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Općenito"
@@ -7410,8 +7381,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, fuzzy, no-c-format
 msgid "Use custom &icons"
 msgstr "Koristi posebne &sličice"
@@ -7431,14 +7401,13 @@ msgstr "Provjeri poštu u ovoj mapi"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7453,9 +7422,9 @@ msgstr "I&zbaci stare poruke iz ove mape"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7467,17 +7436,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr " Stupac"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Postavi kao uobičajeno"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Primatelj"
@@ -7489,11 +7462,11 @@ msgstr "Identitet pošiljao&ca:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7513,12 +7486,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7552,17 +7525,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7644,12 +7617,13 @@ msgstr "Greška prilikom slanja mape"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Indeks pošte za %1 je od nepoznate inačice KMail-a (%2).\n"
 "Ovaj indeks može biti ponovno napravljen iz vaše poštanske mape, ali neke "
-"informacije, uključujući i oznake statusa, mogu biti izgubljene. Želite li da "
-"osiromašite vaš indeksni datoteka?"
+"informacije, uključujući i oznake statusa, mogu biti izgubljene. Želite li "
+"da osiromašite vaš indeksni datoteka?"
 
 #: kmfolderindex.cpp:372
 #, fuzzy
@@ -7668,8 +7642,8 @@ msgid ""
 msgstr ""
 "Indeks pošte za %1 je od nepoznate inačice KMail-a (%2).\n"
 "Ovaj indeks može biti ponovno napravljen iz vaše poštanske mape, ali neke "
-"informacije, uključujući i oznake statusa, mogu biti izgubljene. Želite li da "
-"osiromašite vaš indeksni datoteka?"
+"informacije, uključujući i oznake statusa, mogu biti izgubljene. Želite li "
+"da osiromašite vaš indeksni datoteka?"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -7677,8 +7651,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7696,8 +7670,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: je nenormalno prekinuo rad da bi se sprječio gubitak "
-"podataka."
+"KMFolderMaildir::addMsg: je nenormalno prekinuo rad da bi se sprječio "
+"gubitak podataka."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -7719,13 +7693,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7786,13 +7758,13 @@ msgstr ""
 "'%1' izgleda da nije mapa.\n"
 "Uklonite datoteku."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7800,8 +7772,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7809,7 +7781,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Neuspjelo stvaranje direktorija"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7918,9 +7890,9 @@ msgstr "&Otkloni probleme u IMAP kešu..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8070,10 +8042,10 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -8133,130 +8105,129 @@ msgstr ""
 "Greška pri promijeni %1\n"
 "(Nema više prostora na uređaju?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Zahtjev za potpis Certifikata"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Stvorite certifikat iz privitka i vratite ga pošiljatelju."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 #, fuzzy
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za pristiglu poštu."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Dolazna pošta"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 #, fuzzy
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za odlaznu poštu."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "poslana-pošta"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 #, fuzzy
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za poslanu poštu."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "smeće"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 #, fuzzy
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za smeće."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "skice"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 #, fuzzy
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za nedovršenu poštu."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Zamijeni"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nemate dozvole za čitanje i(ili) upis u mapu za smeće."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Posljednja pretraga"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail je naišao na fatalnu grešku i odmah će završiti sa radom."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8267,11 +8238,11 @@ msgstr ""
 "Greška je:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
@@ -8355,8 +8326,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -8396,11 +8366,11 @@ msgstr "Jeste li sigurni da želite ispraznitimapu za smeće?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Jeste li sigurni da želite premjestiti sve poruke iz mape <b>%1</b> "
-"u smeće?</qt>"
+"<qt>Jeste li sigurni da želite premjestiti sve poruke iz mape <b>%1</b> u "
+"smeće?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8426,11 +8396,11 @@ msgstr "<primatelji>"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Jeste li sigurni da želite obrisati mapu za pretraživanje <b>%1</b>"
-"? Poruke prikazane unutar nje neće biti obrisane jer su pohranjene u drugoj "
+"<qt>Jeste li sigurni da želite obrisati mapu za pretraživanje <b>%1</b>? "
+"Poruke prikazane unutar nje neće biti obrisane jer su pohranjene u drugoj "
 "mapi.</qt>"
 
 #: kmmainwidget.cpp:1214
@@ -8444,37 +8414,40 @@ msgstr "<qt>Jeste li sigurni da želite da obrisati praznu mapu <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Jeste li sigurni da želite da obrisati praznu mapu <b>%1</b> "
-"i sve njene podmape? Ove podmape možda nisu prazne i njihov sadržaj će također "
-"biti obrisan.</qt>"
+"<qt>Jeste li sigurni da želite da obrisati praznu mapu <b>%1</b> i sve njene "
+"podmape? Ove podmape možda nisu prazne i njihov sadržaj će također biti "
+"obrisan.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Jeste li sigurni da želite obrisati mapu <b>%1</b>"
-", odbacujući njen sadržaj?</qt>"
+"<qt>Jeste li sigurni da želite obrisati mapu <b>%1</b>, odbacujući njen "
+"sadržaj?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Jeste li sigurni da želite obrisati mapu <b>%1</b> "
-"i sve njene podmape, odbacujući njihov sadržaj?</qt>"
+"<qt>Jeste li sigurni da želite obrisati mapu <b>%1</b> i sve njene podmape, "
+"odbacujući njihov sadržaj?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "izbrisano"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8482,7 +8455,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Jeste li sigurni da želite da osviježite IMAP međuspremnik?\n"
-"Ovo će ukloniti sve izmjene koje ste radili nad vašim IMAP fasciklama u lokalu."
+"Ovo će ukloniti sve izmjene koje ste radili nad vašim IMAP fasciklama u "
+"lokalu."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8491,13 +8465,13 @@ msgstr "Jeste li sigurni da želite da isteknu sve stare poruke?"
 #: kmmainwidget.cpp:1353
 #, fuzzy
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Korištenje HTML-a u pošti će vas učiniti ranjivijim na „spam“ i može povećati "
-"vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i očekivanim "
-"bezbedonosnim zloupotrebama."
+"Korištenje HTML-a u pošti će vas učiniti ranjivijim na „spam“ i može "
+"povećati vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i "
+"očekivanim bezbedonosnim zloupotrebama."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8511,12 +8485,12 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Korištenje HTML-a u pošti će vas učiniti ranjivijim na „spam“ i može povećati "
-"vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i očekivanim "
-"bezbedonosnim zloupotrebama."
+"Korištenje HTML-a u pošti će vas učiniti ranjivijim na „spam“ i može "
+"povećati vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i "
+"očekivanim bezbedonosnim zloupotrebama."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8532,12 +8506,13 @@ msgstr "Filtriraj po listi za raspravu %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMail-ova funkcionalnost da odgovara van ureda zavisi od filtriranja na strani "
-"poslužitelja. Vi još uvijek niste podesili IMAP poslužitelj za tako nešto.\n"
+"KMail-ova funkcionalnost da odgovara van ureda zavisi od filtriranja na "
+"strani poslužitelja. Vi još uvijek niste podesili IMAP poslužitelj za tako "
+"nešto.\n"
 "Ovo možete učiniti u tabu „Filtriranje“ dijaloga za podešavanje IMAP "
 "korisničkog računa."
 
@@ -8555,7 +8530,8 @@ msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
 #: kmmainwidget.cpp:2508
@@ -8904,8 +8880,7 @@ msgstr "&Spremi privitke..."
 msgid "Appl&y All Filters"
 msgstr "Primij&eni izbornik filter-e"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Primijeni filter"
@@ -9031,7 +9006,6 @@ msgstr "&Sljedeća nepročitana poruka"
 msgid "Go to the next unread message"
 msgstr "Idi na sljedeću nepročitanu poruku"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Prethodna poruka"
@@ -9177,22 +9151,22 @@ msgstr " Inicijalizacija..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ova poruka sadrži zahtjev za izvještajem o raspoređivanju.\n"
-"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Ova poruka sadrži zahtjev za izvještajem o raspoređivanju.\n"
@@ -9203,36 +9177,36 @@ msgstr ""
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ova poruka sadrži zahtjev za izvještajem o raspoređivanju,\n"
 "ali je zahtjevano da se izvještaj pošalje na više od jedne adrese.\n"
-"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ova poruka sadrži zahtjev za izvještajem o raspoređivanju,\n"
 "ali nema postavljenu povratnu putanju.\n"
-"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9241,8 +9215,8 @@ msgstr ""
 "Ova poruka sadrži zahtjev za izvještajem o raspoređivanju,\n"
 "ali povratna putanja se razlikuje od adrese na koju je zahtjevano slanje "
 "izvještaja.\n"
-"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorirati zahtjev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9262,24 +9236,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Zaglavlje \"Disposition-Notification-Options\" sadrži zahtjevani, ali nepoznat "
-"parametar."
+"Zaglavlje \"Disposition-Notification-Options\" sadrži zahtjevani, ali "
+"nepoznat parametar."
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Potvrda: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Prilog: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Pokaži priloge kako je predložio pošiljatelj."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9331,29 +9305,26 @@ msgstr "Svojstva dijela poruke"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9362,11 +9333,10 @@ msgstr "&Opis:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9375,14 +9345,13 @@ msgstr "&Kodiranje:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9392,13 +9361,11 @@ msgstr "Predloži &automatski prikaz"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9407,9 +9374,8 @@ msgstr "&Potpis ovog dijela"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -9419,9 +9385,8 @@ msgstr "Kriptiraj &ovaj dio"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -9436,11 +9401,9 @@ msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9721,15 +9684,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9738,18 +9700,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9759,15 +9720,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9807,7 +9766,8 @@ msgstr "Pogledaj prilog: %1"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Prilog sadrži binarne podatke. Pokušaj prikaza prvog znaka.]\n"
@@ -9835,12 +9795,14 @@ msgstr "Otvori prilog?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9862,6 +9824,71 @@ msgstr "(nađi bilo što od sljedećeg)"
 msgid "(match all of the following)"
 msgstr "(nađi sve od sljedećeg)"
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "Spreman."
+
+#: kmsearchpattern.h:222
+#, fuzzy
+msgid "Old"
+msgstr "stara"
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "izbrisano"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "odgovoreno"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "proslijeđeno"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "&Niz"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "poslane"
+
+#: kmsearchpattern.h:228
+#, fuzzy
+msgid "Watched"
+msgstr "&Prikvači"
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "zanemareno"
+
+#: kmsearchpattern.h:230
+#, fuzzy
+msgid "Spam"
+msgstr "neželjena pošta"
+
+#: kmsearchpattern.h:231
+#, fuzzy
+msgid "Ham"
+msgstr "pršut"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Za: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "prilog"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9948,20 +9975,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Premještanje poslane poruke „%1“ iz odlazene u mapu poslane poštenije uspjelo.\n"
+"Premještanje poslane poruke „%1“ iz odlazene u mapu poslane poštenije "
+"uspjelo.\n"
 "Mogući razlozi su nedostatak prostora na disku ili pravo pisanja. Pokušajte "
 "pronaći problem i premjestiti poruku ručno."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9989,8 +10017,8 @@ msgstr "Počinjem sa slanjem..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10018,8 +10046,9 @@ msgstr "Nisam mogao poslati (neke) od poredanih poruka."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10037,13 +10066,11 @@ msgstr "Slanje je otkazano."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -10063,8 +10090,9 @@ msgstr "&Prekini slanje"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10115,30 +10143,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -10150,6 +10178,10 @@ msgstr ""
 msgid "Exit"
 msgstr ""
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -10180,14 +10212,15 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Uključite ovu opciju ako želite da KMail pohrani vašu SMTP lozinku u svoju "
-"datoteku s podešavanjima. Lozinka će biti pohranjena u nečitljivom formatu, ali "
-"ga ne treba smatrati sigurnim od pokušaja dekriptiranja ako dođe do pristupa "
-"datoteci s podešavanjima."
+"datoteku s podešavanjima. Lozinka će biti pohranjena u nečitljivom formatu, "
+"ali ga ne treba smatrati sigurnim od pokušaja dekriptiranja ako dođe do "
+"pristupa datoteci s podešavanjima."
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
 #, fuzzy
@@ -10263,8 +10296,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "Naredba za lokalno izvršavanje, prije slanja pošte. Ona se može koristiti za "
-"otvaranje ssh tunela na primjer. Ostavite ovo polje praznim ako ništa ne treba "
-"izvršiti."
+"otvaranje ssh tunela na primjer. Ostavite ovo polje praznim ako ništa ne "
+"treba izvršiti."
 
 #: kmtransport.cpp:427
 #, fuzzy
@@ -10273,8 +10306,8 @@ msgstr "Se&rver zahtjeva prijavljivanje"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Uključite ovu opciju ako vaš SMTP poslužitelj zahtjeva da se prijavite prije "
 "nego što prihvati poštu. Ovo je poznato pod imenom „Authenticated SMTP“ ili "
@@ -10302,10 +10335,9 @@ msgstr "Poš&alji posebno ime računala poslužitelju"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -10339,8 +10371,8 @@ msgstr "Samo su lokalne datoteke dozvoljene."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Ime domena ili brojčana adresa SMTP poslužitelja."
 
 #: kmtransport.cpp:788
@@ -10355,10 +10387,10 @@ msgstr "Greška prilikom slanja mape"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10597,22 +10629,18 @@ msgstr "&Uredi poruku"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10625,8 +10653,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10641,14 +10669,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10751,8 +10779,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10787,8 +10815,9 @@ msgstr "&Kriptiraj"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10799,8 +10828,8 @@ msgstr "Snimi &nekriptirano"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10821,71 +10850,69 @@ msgstr "K&riptiraj sve dijelove"
 msgid "Unencrypted Message Warning"
 msgstr "Šifriraj poruku"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Neki znaci mogu biti izgubljeni"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Podesi &kodiranje.."
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10909,10 +10936,10 @@ msgstr "Mailbox for&mat:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10923,8 +10950,8 @@ msgstr "Sličice mapa"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10967,8 +10994,7 @@ msgstr "Različiti rezultati za potpise"
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -10997,8 +11023,8 @@ msgstr "Nijedan %1 umetak nije pronađen."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -11036,18 +11062,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -11314,11 +11340,11 @@ msgstr "pohranjen: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Nema poštanskih adresa pohranjenih u %1 kojo se koristi za potpisivanje, tako "
-"da uspoređivanje s adresom pošiljaoca %2; nije moguće."
+"Nema poštanskih adresa pohranjenih u %1 kojo se koristi za potpisivanje, "
+"tako da uspoređivanje s adresom pošiljaoca %2; nije moguće."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11438,10 +11464,11 @@ msgstr "Kioslave greška"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11459,7 +11486,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Dohvaćam poruku %1 od %2 (%3 od %4 kB) s %5 (%6 kB ostalo na poslužitelju)."
 
@@ -11480,1721 +11508,14 @@ msgstr "Neispravan odgovor od poslužitelja"
 #: popaccount.cpp:1026
 #, fuzzy
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Vaš poslužitelj ne podržava naredbu TOP. Zbog toga nije moguće dohvatiti "
 "zaglavlja velikih poruka prije njihovog preuzimanja."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Idi"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Mapa"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Poru&ka"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Naprijed"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "Znak"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automatski potp&isuj poruke koristeći OpenPGP"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Ši&firiraj"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Pohrani poslane poruke u ši&frovanom obliku"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Kliknite ovdje da biste pohranjivali poruke u kriptiranom obliku "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Pohranjivanje poruka u kriptiranom obliku</h1>\n"
-"Kada je ova opcija uključena, poslane poruke se pohranjuju kao kriptirane. Ovo "
-"nije preporučljivo pošto nećete moći čitati poruke kada potrebni certifikat "
-"istekne.\n"
-"<p>\n"
-"Ipak, možda postoje lokalna pravila koja zahtjevaju da uključite ovu opciju. "
-"Ako niste sigurni, pitajte vašeg lokalnog administratora.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automatski kriptiraj poruke &kad god je to moguće"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, fuzzy, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nemoj enkriptirati kada se sprema kao nacrt"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, no-c-format
-msgid "To:"
-msgstr "Za:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Općenito"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Odgovori na"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Odgovori &svima..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Naprijed"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Pokaži:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Zamijeni"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Svojstva mape"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Mapa sadrži &listu za raspravu"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Adresa liste:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Obično:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Nepročitano:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Zastarijevanje poruka"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "I&zbaci poslije:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Izbaci p&ročitane poruke"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Izbaci po&slije:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Izbaci &nepročitane poruke"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dan(a)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, fuzzy, no-c-format
-msgid "Week(s)"
-msgstr "Sedmica"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mjesec(i)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "&Napredno"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identitet pošiljao&ca:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "&Format pohranjivanja:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "Prikaz &lista:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Pravljenje certifikata"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Datoteka s potpisom:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Pošalji &moj osobni certifikat"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Provjeri &putanju certifikata"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Prilikom dodavanja novih certifikata"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Pošalji &moj osobni certifikat"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Pošalji &moj osobni certifikat"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Dodaj..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "&Postojeći identiteti:"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "neograničeno"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Podešavanje potpisa"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Odgovori pošiljaocu:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Odgovori &svima..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Proslijeđena poruka"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, fuzzy, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Upozori pri pokušaju slanja &nepotpisanih poruka"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Uključite ovo ako želite biti upozoreni pri slanju nepotpisanih poruka."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje pri pokušaju slanja nepotpisanih poruka</h1>\n"
-"Ako je ova opcija uključena, biti ćete upozoreni kada pokušate da pošaljete "
-"dijelove ili celu poruku nepotpisanu.\n"
-"<p>\n"
-"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, fuzzy, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Upozori pri pokušaju slanja nekriptiranih poruka"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Uključite ovu opciju ako želite biti upozoreni pri slanju nektriptiranih "
-"poruka."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje pri slanju nekriptiranih poruka</h1>\n"
-"Ako je ova opcija uključena, biti ćete upozoreni kada pokušate da pošaljete "
-"dijelove ili celu poruku nekriptiranu.\n"
-"<p>\n"
-"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Upozori ako primaočeva e-adresa &nije u certifikatu"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Uključite ovu opciju ako želite biti  upozoreni ako adresa nije u certifikatu"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako primaočeva e-adresa nije u certifikatu</h1>\n"
-"Ako je ova opcija uključena, biti ćete upozoreni ako e-adresa primatelja nije "
-"sadržana u certifikatu koji se koristi za kriptiranje.\n"
-"<p>\n"
-"Radi maksimalne sigurnosti preporučuje se da ovu opciju držite uključenom.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Upozori ako CA certifikat &ističe za manje od"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "Koristi za &potpisivanje"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Ši&firiraj"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dana"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, fuzzy, no-c-format
-msgid "Select the number of days here"
-msgstr "Ovdje odaberite broj dana"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako certifikat za potpisivanje ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi certifikat za potpisivanje trebalo da "
-"bude važeći prije davanja obavijesti.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako certifikat za kriptiranje ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi certifikat za kriptiranje trebalo biti "
-"važeći prije davanja obavijesti.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako certifikat u lancu ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi svi certifikati u lancu trebalo da budu "
-"važeći prije davanja upozorenja.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako CA certifikat ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi CA certifikat trebalo biti važeći prije "
-"davanja obavijesti.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako koreni certifikat ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi koreni certifikat trebalo biti važeći "
-"prije davanja obavijesti.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Pošalji &moj osobni certifikat"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Potražite druge certifikate"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Sličice mapa"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Zamijeni"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Zamijeni"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, fuzzy, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "&Uvijek prikazuj sustemska traka"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "&Obavijest o novim porukama"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Navedite uređivač:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Koristi vanjski uređivač umjesto sastavljača"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, fuzzy, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-"S&tari način rada: Odsjeci „Od:/Za:“ zaglavlja iz odgovora na pozivnice"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja (ako "
-"je moguće)."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Automatski dodaj potpis"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Prelomi riječ na stupcu:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Upozori ako koreni certifikat ističe za &manje od"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
-"pozivnice"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Auto&matski zahtjevaj obavijest o raspoređivanju poruke"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "Pe&riod provjere:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Promijeni prepoznati prefiks za \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Zamijeni prepoznati prefiks sa \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Upotrijebi pametno citiranje"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Potpis je istekao."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja (ako "
-"je moguće)."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Pohrani poslane poruke u ši&frovanom obliku"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Pokaži sva zaglavlja poruka"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Obavijesti o raspoređivanju poruka"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Lista poruka — polje za datum"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "Označi trenutnu poruku kao p&roslijeđenu"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Dodaj znake za &citiranje"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13318,6 +11639,11 @@ msgstr "Dodaj korisnički račun"
 msgid "Add as BCC"
 msgstr "Dodaj korisnički račun"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "O&tkaži"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13335,10 +11661,10 @@ msgstr "<primatelji>"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13356,8 +11682,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13464,10 +11790,19 @@ msgstr "veće ili jednako"
 msgid " bytes"
 msgstr " bajtova"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dana"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13634,13 +11969,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13658,8 +11991,7 @@ msgid ""
 msgstr "Vrsta naloga: POP nalog"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13677,8 +12009,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13688,8 +12019,7 @@ msgstr "Nije dostupno"
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Postojeći Filteri"
 
 #: sievedebugdialog.cpp:358
@@ -13758,8 +12088,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13780,17 +12110,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Navedite naredbu:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nov unos:"
@@ -13827,6 +12162,11 @@ msgstr "Dodaj račun"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Želite li zaista uklonite identitet s imenom <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Primijeni na:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13841,6 +12181,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Uredi..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13880,9 +12224,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13921,6 +12265,16 @@ msgstr ""
 "Ne mogu otvoriti datoteku „%1“:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr "Za:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13958,36 +12312,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14221,6 +12571,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -14258,102 +12612,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"\n"
-"<p>...da možete brzo napraviti filtere po pošiljatelju,\n"
-"primatelju, temi i diskusionoj listi koristeći "
-"<em>Alati-&gt;Napravi&nbsp;filter</em>?</p>\n"
-
-#: tips.cpp:15
-#, fuzzy
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...da se možete otarasiti „[imena diskusione liste]“\n"
-"koje se dodaje temi u nekim litama koristeći filtersku\n"
-"akciju <em>prepiši zaglavlje</em>? Samo iskoristite\n"
-"<pre>rewrite header &quot;Tema&quot;\n"
-"   replace &quot;\\s*\\[ime diskusione liste\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-#, fuzzy
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...da možete dodelite posebne sličice svakoj mapi?\n"
-"Pogledajte <em>Mapa-&gt;Svojstva...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...da KMail može da prikazati traku s bojom koja označava vrstu\n"
-"poruke (običan tekst/HTML/OpenPGP) koja je trenutno prikazana?</p>\n"
-"<p>Ovo osujećuje pokušaje da se lažira uspješna provjera potpisa\n"
-"slanjem HTML poruka koje glume KMail-ove statusne okvire.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...da možete filtrirati po bilo kojem zaglavlju jednostavno\n"
-"unoseći njegovo ime u prvo polje za uređivanje pravila pretrage?</p>\n"
-
-#: tips.cpp:55
-#, fuzzy
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...da možete isfiltrirati samo-HTML poruke pravilom\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nema nikakve akcije za poništiti"
@@ -14422,6 +12680,17 @@ msgstr "Prilog: #%1 (bez imena)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Fajl sa imenom %1 već postoji. Želite li da ga prebrišete?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "Umetni datoteku"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14538,9 +12807,9 @@ msgstr "Obriši poruke"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14573,9 +12842,9 @@ msgstr "Obriši Mapu"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14585,15 +12854,15 @@ msgstr "Dodaj u adresar"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14602,8 +12871,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14620,154 +12889,1611 @@ msgstr "&Potpis"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "Znak"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automatski potp&isuj poruke koristeći OpenPGP"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Ši&firiraj"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
-msgstr "Postavi temu poruke."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr "Pošalji kopiju na 'addresu'."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr "Pošalji BCC: na „adresu“."
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-#, fuzzy
-msgid "Add 'header' to message"
-msgstr "Dodaj 'zaglavlje' poruci. '"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Pohrani poslane poruke u ši&frovanom obliku"
 
-#: kmail_options.h:18
-#, fuzzy
-msgid "Read message body from 'file'"
-msgstr "Čitaj tijelo poruke iz „datoteke“."
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Kliknite ovdje da biste pohranjivali poruke u kriptiranom obliku "
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Postavi telo poruke."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Pohranjivanje poruka u kriptiranom obliku</h1>\n"
+"Kada je ova opcija uključena, poslane poruke se pohranjuju kao kriptirane. "
+"Ovo nije preporučljivo pošto nećete moći čitati poruke kada potrebni "
+"certifikat istekne.\n"
+"<p>\n"
+"Ipak, možda postoje lokalna pravila koja zahtjevaju da uključite ovu opciju. "
+"Ako niste sigurni, pitajte vašeg lokalnog administratora.\n"
+"</qt>"
 
-#: kmail_options.h:20
-#, fuzzy
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Dodaj prilog poruci. Ovo se može ponavljati."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:21
-#, fuzzy
-msgid "Only check for new mail"
-msgstr "Samo provjeri da li ima nove pošte."
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-#, fuzzy
-msgid "Only open composer window"
-msgstr "Samo otvori prozor uređivača."
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automatski kriptiraj poruke &kad god je to moguće"
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "Premještanje poruka nije uspjelo."
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmail_options.h:24
-#, fuzzy
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Pošalji poruku na „adresu“ i priloži datoteka na koji „URL“ ukazuje."
+#: composercryptoconfiguration.ui:125
+#, fuzzy, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nemoj enkriptirati kada se sprema kao nacrt"
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "Spreman."
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-#, fuzzy
-msgid "Old"
-msgstr "stara"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Općenito"
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "izbrisano"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Odgovori na"
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
-msgstr "odgovoreno"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Odgovori &svima..."
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
-msgstr "proslijeđeno"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Naprijed"
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "&Niz"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Pokaži:"
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "poslane"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Zamijeni"
 
-#: kmsearchpattern.h:228
-#, fuzzy
-msgid "Watched"
-msgstr "&Prikvači"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Sličice mapa"
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "zanemareno"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Zamijeni"
 
-#: kmsearchpattern.h:230
-#, fuzzy
-msgid "Spam"
-msgstr "neželjena pošta"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Zamijeni"
 
-#: kmsearchpattern.h:231
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Svojstva mape"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Mapa sadrži &listu za raspravu"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Adresa liste:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Obično:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Nepročitano:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Zastarijevanje poruka"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "I&zbaci poslije:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Izbaci p&ročitane poruke"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Izbaci po&slije:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Izbaci &nepročitane poruke"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dan(a)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, fuzzy, no-c-format
+msgid "Week(s)"
+msgstr "Sedmica"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mjesec(i)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "&Napredno"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identitet pošiljao&ca:"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "&Format pohranjivanja:"
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "Prikaz &lista:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, fuzzy, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "&Uvijek prikazuj sustemska traka"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "&Obavijest o novim porukama"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Navedite uređivač:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Koristi vanjski uređivač umjesto sastavljača"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, fuzzy, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+"S&tari način rada: Odsjeci „Od:/Za:“ zaglavlja iz odgovora na pozivnice"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja "
+"(ako je moguće)."
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Automatski dodaj potpis"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Prelomi riječ na stupcu:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Upozori ako koreni certifikat ističe za &manje od"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
+"pozivnice"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Auto&matski zahtjevaj obavijest o raspoređivanju poruke"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "Pe&riod provjere:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Promijeni prepoznati prefiks za \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Zamijeni prepoznati prefiks sa \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Upotrijebi pametno citiranje"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Potpis je istekao."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja "
+"(ako je moguće)."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Pohrani poslane poruke u ši&frovanom obliku"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Pokaži sva zaglavlja poruka"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Obavijesti o raspoređivanju poruka"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Lista poruka — polje za datum"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "Označi trenutnu poruku kao p&roslijeđenu"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Dodaj znake za &citiranje"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Uređivanje datoteke"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Uredi..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Idi"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Mapa"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Poru&ka"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Naprijed"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "&Postojeći identiteti:"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opće opcije"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Pravljenje certifikata"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Datoteka s potpisom:"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Pošalji &moj osobni certifikat"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Provjeri &putanju certifikata"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Prilikom dodavanja novih certifikata"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Pošalji &moj osobni certifikat"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Pošalji &moj osobni certifikat"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Dodaj..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "&Postojeći identiteti:"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "neograničeno"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Podešavanje potpisa"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Odgovori pošiljaocu:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Odgovori &svima..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Proslijeđena poruka"
+
+#: warningconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Upozori pri pokušaju slanja &nepotpisanih poruka"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Uključite ovo ako želite biti upozoreni pri slanju nepotpisanih poruka."
+
+#: warningconfiguration.ui:33
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje pri pokušaju slanja nepotpisanih poruka</h1>\n"
+"Ako je ova opcija uključena, biti ćete upozoreni kada pokušate da pošaljete "
+"dijelove ili celu poruku nepotpisanu.\n"
+"<p>\n"
+"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, fuzzy, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Upozori pri pokušaju slanja nekriptiranih poruka"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Uključite ovu opciju ako želite biti upozoreni pri slanju nektriptiranih "
+"poruka."
+
+#: warningconfiguration.ui:55
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje pri slanju nekriptiranih poruka</h1>\n"
+"Ako je ova opcija uključena, biti ćete upozoreni kada pokušate da pošaljete "
+"dijelove ili celu poruku nekriptiranu.\n"
+"<p>\n"
+"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Upozori ako primaočeva e-adresa &nije u certifikatu"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Uključite ovu opciju ako želite biti  upozoreni ako adresa nije u certifikatu"
+
+#: warningconfiguration.ui:77
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako primaočeva e-adresa nije u certifikatu</h1>\n"
+"Ako je ova opcija uključena, biti ćete upozoreni ako e-adresa primatelja "
+"nije sadržana u certifikatu koji se koristi za kriptiranje.\n"
+"<p>\n"
+"Radi maksimalne sigurnosti preporučuje se da ovu opciju držite uključenom.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Upozori ako CA certifikat &ističe za manje od"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "Koristi za &potpisivanje"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Ši&firiraj"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, fuzzy, no-c-format
+msgid "Select the number of days here"
+msgstr "Ovdje odaberite broj dana"
+
+#: warningconfiguration.ui:141
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako certifikat za potpisivanje ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi certifikat za potpisivanje trebalo "
+"da bude važeći prije davanja obavijesti.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako certifikat za kriptiranje ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi certifikat za kriptiranje trebalo "
+"biti važeći prije davanja obavijesti.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako certifikat u lancu ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi svi certifikati u lancu trebalo da "
+"budu važeći prije davanja upozorenja.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako CA certifikat ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi CA certifikat trebalo biti važeći "
+"prije davanja obavijesti.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako koreni certifikat ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi koreni certifikat trebalo biti "
+"važeći prije davanja obavijesti.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Pošalji &moj osobni certifikat"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Potražite druge certifikate"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
 #, fuzzy
-msgid "Ham"
-msgstr "pršut"
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"\n"
+"<p>...da možete brzo napraviti filtere po pošiljatelju,\n"
+"primatelju, temi i diskusionoj listi koristeći <em>Alati-&gt;Napravi&nbsp;"
+"filter</em>?</p>\n"
 
-#: kmsearchpattern.h:232
+#: tips:17
 #, fuzzy
-msgid "To Do"
-msgstr "Za: "
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...da se možete otarasiti „[imena diskusione liste]“\n"
+"koje se dodaje temi u nekim litama koristeći filtersku\n"
+"akciju <em>prepiši zaglavlje</em>? Samo iskoristite\n"
+"<pre>rewrite header &quot;Tema&quot;\n"
+"   replace &quot;\\s*\\[ime diskusione liste\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
 
-#: kmsearchpattern.h:234
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
 #, fuzzy
-msgid "Has Attachment"
-msgstr "prilog"
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...da možete dodelite posebne sličice svakoj mapi?\n"
+"Pogledajte <em>Mapa-&gt;Svojstva...</em></p>\n"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
 msgstr ""
+"<p>...da KMail može da prikazati traku s bojom koja označava vrstu\n"
+"poruke (običan tekst/HTML/OpenPGP) koja je trenutno prikazana?</p>\n"
+"<p>Ovo osujećuje pokušaje da se lažira uspješna provjera potpisa\n"
+"slanjem HTML poruka koje glume KMail-ove statusne okvire.</p>\n"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
 msgstr ""
+"<p>...da možete filtrirati po bilo kojem zaglavlju jednostavno\n"
+"unoseći njegovo ime u prvo polje za uređivanje pravila pretrage?</p>\n"
 
-#: util.h:208
+#: tips:62
 #, fuzzy
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Fajl sa imenom %1 već postoji. Želite li da ga prebrišete?"
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...da možete isfiltrirati samo-HTML poruke pravilom\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "Umetni datoteku"
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Retrieving new messages"
@@ -14782,7 +14508,8 @@ msgstr "Umetni datoteku"
 
 #, fuzzy
 #~ msgid "The error message from the server communication is here:"
-#~ msgstr "Korisničko ime koje treba poslani poslužitelju prilikom prijavljivanja"
+#~ msgstr ""
+#~ "Korisničko ime koje treba poslani poslužitelju prilikom prijavljivanja"
 
 #, fuzzy
 #~ msgid "Todo"
@@ -14842,16 +14569,20 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kriptiranje svih dijelova poruke</h1>\n"
-#~ "Ako je ova opcija uključena, svi dijelovi poruke (npr. tijelo i svi prilozi) biti će uobičajeno kriptirani.\n"
+#~ "Ako je ova opcija uključena, svi dijelovi poruke (npr. tijelo i svi "
+#~ "prilozi) biti će uobičajeno kriptirani.\n"
 #~ "<p>\n"
-#~ "Ovo je uobičajena postavka, koju možete pregaziti individualno za svaku poruku.\n"
+#~ "Ovo je uobičajena postavka, koju možete pregaziti individualno za svaku "
+#~ "poruku.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -14863,12 +14594,16 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Pitanje prije kriptiranja svakog dijela</h1>\n"
-#~ "Ako je ova opcija uključena, biti ćete upitani posebno za svaki dio poruke (npr. tijelo kao i svi prilozi) da li treba biti kriptiran ili ne.\n"
+#~ "Ako je ova opcija uključena, biti ćete upitani posebno za svaki dio "
+#~ "poruke (npr. tijelo kao i svi prilozi) da li treba biti kriptiran ili "
+#~ "ne.\n"
 #~ "</qt>"
 
 #~ msgid "Check for not encrypting a message by default"
@@ -14885,20 +14620,32 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritam kriptiranja</h1>\n"
-#~ "Algoritam je opis računalu kako treba izvesti  neki zadatak. Algoritam kriptiranja opisuje kako će računalo primjeniti ključ vašeg primatelja na vašu poruku koju smije  pročitati samo primatelj.\n"
+#~ "Algoritam je opis računalu kako treba izvesti  neki zadatak. Algoritam "
+#~ "kriptiranja opisuje kako će računalo primjeniti ključ vašeg primatelja na "
+#~ "vašu poruku koju smije  pročitati samo primatelj.\n"
 #~ "<p>\n"
-#~ "Odabir određenog algoritma određuje koliko je lako ili teško presresti i pročitati poruku. Svi algoritmi koje pruža okruženje SPHINX se smatraju vrlo sigurnim. U principu, uobičajene vrijednosti će raditi kako treba.\n"
+#~ "Odabir određenog algoritma određuje koliko je lako ili teško presresti i "
+#~ "pročitati poruku. Svi algoritmi koje pruža okruženje SPHINX se smatraju "
+#~ "vrlo sigurnim. U principu, uobičajene vrijednosti će raditi kako treba.\n"
 #~ "<p>\n"
-#~ "Ova postavka je uobičajena, ali je možete pregaziti za svaku poruku pojedinačno.\n"
+#~ "Ova postavka je uobičajena, ali je možete pregaziti za svaku poruku "
+#~ "pojedinačno.\n"
 #~ "</qt>"
 
 #~ msgid "Certificates"
@@ -14913,16 +14660,22 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Provjera se može završiti s lokalno spremljenim certifikatima</h1>\n"
-#~ "Ako je ova opcija uključena, provjera lanca certifikata može biti završena s lokalno spremljenim certifikatima.\n"
+#~ "Ako je ova opcija uključena, provjera lanca certifikata može biti "
+#~ "završena s lokalno spremljenim certifikatima.\n"
 #~ "<p>\n"
-#~ "Lokalno spremljeni certifikati su vaši osobni certifikati kao i certifikati osoba s kojima komunicirate i certifikacijskih autoriteta (CA).\n"
+#~ "Lokalno spremljeni certifikati su vaši osobni certifikati kao i "
+#~ "certifikati osoba s kojima komunicirate i certifikacijskih autoriteta "
+#~ "(CA).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -14934,12 +14687,15 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Uvijek provjeri putanju certifikata do korijenskog certifikata</h1>\n"
-#~ "Ako je ova opcija uključena, putanja certifikata koja pripada primaočevom certifikatu će uvijek biti provjeravana do korijenskog certifikata.\n"
+#~ "Ako je ova opcija uključena, putanja certifikata koja pripada primaočevom "
+#~ "certifikatu će uvijek biti provjeravana do korijenskog certifikata.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -14951,14 +14707,17 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Provjera putanje certifikata</h1>\n"
-#~ "Ako je ova opcija uključena, cijela putanja primateljevog certifikata sve do korijenskog certifikata biti će provjerena.\n"
+#~ "Ako je ova opcija uključena, cijela putanja primateljevog certifikata sve "
+#~ "do korijenskog certifikata biti će provjerena.\n"
 #~ "<p>\n"
 #~ "Primjetite da nije moguće isključiti provjeru primateljevog certifikata.\n"
 #~ "</qt>"
@@ -14974,16 +14733,27 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Korištenje liste opozivanja certifikata (CRL-ovi)</h1>\n"
-#~ "Lista opozivanja certifikata sadrži certifikate koji su povučeni i ne bi trebalo više da budu korišteni za kriptiranje. Korisnik može želeti da opozove svoj certifikat ako smatra da je integritet certifikata kompromitovan (npr. neko je pogodio PIN).\n"
+#~ "Lista opozivanja certifikata sadrži certifikate koji su povučeni i ne bi "
+#~ "trebalo više da budu korišteni za kriptiranje. Korisnik može želeti da "
+#~ "opozove svoj certifikat ako smatra da je integritet certifikata "
+#~ "kompromitovan (npr. neko je pogodio PIN).\n"
 #~ "<p>\n"
-#~ "Za maksimalnu sigurnost preporučuje se korištenje CRL-ova. U dijalogu za podešavanje certifikata i upravljanje CRL-ovima, možete odabrati odakle se CRL-ovi dobavljaju.\n"
+#~ "Za maksimalnu sigurnost preporučuje se korištenje CRL-ova. U dijalogu za "
+#~ "podešavanje certifikata i upravljanje CRL-ovima, možete odabrati odakle "
+#~ "se CRL-ovi dobavljaju.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -14991,18 +14761,22 @@ msgstr "Umetni datoteku"
 #~ msgstr "Upozori ako CRL &ističe za manje od"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Uključite ovu opciju ako želite biti upozoreni ako CRL istječe u bliskojbudućnosti"
+#~ msgstr ""
+#~ "Uključite ovu opciju ako želite biti upozoreni ako CRL istječe u "
+#~ "bliskojbudućnosti"
 
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozorenje ako CRL ističe u bliskoj budućnosti</h1>\n"
-#~ "Ako je ova opcija uključena, biti ćete upozoreni ako jedan od CRL-ova koje koristite ističe u bliskoj budućnosti.\n"
+#~ "Ako je ova opcija uključena, biti ćete upozoreni ako jedan od CRL-ova "
+#~ "koje koristite ističe u bliskoj budućnosti.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15012,14 +14786,16 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozorenje ako CRL ističe u bliskoj budućnosti</h1>\n"
-#~ "U ovom polju možete odreditti period kada želite da budete upozoreni prije nego što CRL istekne.\n"
+#~ "U ovom polju možete odreditti period kada želite da budete upozoreni "
+#~ "prije nego što CRL istekne.\n"
 #~ "<p>\n"
 #~ "Preporučena postavka za okruženje SPHINX je sedam dana.\n"
 #~ "</qt>"
@@ -15028,21 +14804,27 @@ msgstr "Umetni datoteku"
 #~ msgstr "&Uvijek šifiriraj za sebe"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Uključite ovu opciju ako želite da kriptirane poruke budu također kriptirane i korištenjem vašeg ključa."
+#~ msgstr ""
+#~ "Uključite ovu opciju ako želite da kriptirane poruke budu također "
+#~ "kriptirane i korištenjem vašeg ključa."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Uvijek kriptiraj sebi</h1>\n"
-#~ "Ako je ova opcija uključena, kriptirane poruke koje ste vi poslali će također biti kriptirane i vašim ključem.\n"
+#~ "Ako je ova opcija uključena, kriptirane poruke koje ste vi poslali će "
+#~ "također biti kriptirane i vašim ključem.\n"
 #~ "<p>\n"
-#~ "Preporučljivo je uključiti ovu opciju kako biste mogli čitati poruke koje ste poslali.\n"
+#~ "Preporučljivo je uključiti ovu opciju kako biste mogli čitati poruke koje "
+#~ "ste poslali.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15050,22 +14832,29 @@ msgstr "Umetni datoteku"
 #~ msgstr "Upozori ako certifikat u &lancu ističe za manje od"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Uključite ovu opciju ako želite biti  upozoreni ako certifikat uskoro istječe"
+#~ msgstr ""
+#~ "Uključite ovu opciju ako želite biti  upozoreni ako certifikat uskoro "
+#~ "istječe"
 
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozorenje ako certifikat ističe</h1>\n"
-#~ "Ako je ova opcija uključena, onda ćete biti upozoreni ako pokušate da koristite certifikat za kriptiranje koji ističe za naznačeni broj dana.\n"
+#~ "Ako je ova opcija uključena, onda ćete biti upozoreni ako pokušate da "
+#~ "koristite certifikat za kriptiranje koji ističe za naznačeni broj dana.\n"
 #~ "<p>\n"
-#~ "Preporučljivo je držati ovu opciju uključenom da bi se izbeglo korištenje certifikata koji ističu u bliskoj budućnosti.\n"
+#~ "Preporučljivo je držati ovu opciju uključenom da bi se izbeglo korištenje "
+#~ "certifikata koji ističu u bliskoj budućnosti.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15105,45 +14894,60 @@ msgstr "Umetni datoteku"
 #~ msgstr "Potpiši sve dijelove &poruke"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Uključite ovu opciju ako želite  uobičajeno potpisivati sve dijelove poruke"
+#~ msgstr ""
+#~ "Uključite ovu opciju ako želite  uobičajeno potpisivati sve dijelove "
+#~ "poruke"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Uobičajeno potpisivanje svih dijelova poruke</h1>\n"
-#~ "Ako je ova opcija odabrana, svi dijelovi poruke (npr. glavno tijelo poruke i svi prilozi) će biti uobičajeno potpisani.\n"
+#~ "Ako je ova opcija odabrana, svi dijelovi poruke (npr. glavno tijelo "
+#~ "poruke i svi prilozi) će biti uobičajeno potpisani.\n"
 #~ "<p>\n"
-#~ "Ovo je uobičajena postavka koju možete pregazite za svaku poruku pojedinačno.\n"
+#~ "Ovo je uobičajena postavka koju možete pregazite za svaku poruku "
+#~ "pojedinačno.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "&Pitaj prije potpisivanja svakog dijela"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Uključite ovu opciju ako želite biti upitani želite li potpisati svaki dio poruke"
+#~ msgstr ""
+#~ "Uključite ovu opciju ako želite biti upitani želite li potpisati svaki "
+#~ "dio poruke"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Pitanje prije potpisivanja svakog dijela</h1>\n"
-#~ "Ako je ova opcija odabrana, biti ćete pitani za svaki dio poruke (npr. glavno tijelo poruke kao i svi prilozi) pojedinačno, da li treba biti potpisan ili ne.\n"
+#~ "Ako je ova opcija odabrana, biti ćete pitani za svaki dio poruke (npr. "
+#~ "glavno tijelo poruke kao i svi prilozi) pojedinačno, da li treba biti "
+#~ "potpisan ili ne.\n"
 #~ "</qt>"
 
 #~ msgid "Check for not signing a message by default"
-#~ msgstr "Uključite ovu opciju ako ne želite da se poruke uobičajeno potpisuju"
+#~ msgstr ""
+#~ "Uključite ovu opciju ako ne želite da se poruke uobičajeno potpisuju"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Potpisni certifikat je konfiguriran na stranici <em>Certifikati</em>"
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Potpisni certifikat je konfiguriran na stranici <em>Certifikati</em>"
 
 #, fuzzy
 #~ msgid "RSA + SHA-1"
@@ -15156,20 +14960,34 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritam potpisivanja</h1>\n"
-#~ "Algoritam je opis računalu kako treba  izvesti neki zadatak. Algoritam potpisivanja opisuje kako će računalo primjeniti vaš ključ za potpisivanje  poruke kako bi primatelj mogao odrediti  je li poruka stvarno vaša.\n"
+#~ "Algoritam je opis računalu kako treba  izvesti neki zadatak. Algoritam "
+#~ "potpisivanja opisuje kako će računalo primjeniti vaš ključ za "
+#~ "potpisivanje  poruke kako bi primatelj mogao odrediti  je li poruka "
+#~ "stvarno vaša.\n"
 #~ "<p>\n"
-#~ "Odabir određenog algoritma određuje koliko je lako ili teško falsificirati poruku. Svi algoritmi koje pruža okruženje SPHINX se smatraju vrlo sigurnim. U principu, uobičajene vrijednosti će raditi kako treba.\n"
+#~ "Odabir određenog algoritma određuje koliko je lako ili teško "
+#~ "falsificirati poruku. Svi algoritmi koje pruža okruženje SPHINX se "
+#~ "smatraju vrlo sigurnim. U principu, uobičajene vrijednosti će raditi kako "
+#~ "treba.\n"
 #~ "<p>\n"
-#~ "Ova postavka je uobičajena, ali je možete pregaziti za svaku poruku pojedinačno.\n"
+#~ "Ova postavka je uobičajena, ali je možete pregaziti za svaku poruku "
+#~ "pojedinačno.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15181,17 +14999,24 @@ msgstr "Umetni datoteku"
 #~ msgstr "&Pohrani poruke sa potpisima"
 
 #~ msgid "Check to store messages with their signatures"
-#~ msgstr "Uključite ovu opciju ako želite da se poruke pohranjuju sa svojim potpisima"
+#~ msgstr ""
+#~ "Uključite ovu opciju ako želite da se poruke pohranjuju sa svojim "
+#~ "potpisima"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Pohranjivanje poruka s potpisima</h1>\n"
-#~ "Ako je ova opcija uključena, poslane poruke se pohranjuju zajedno s potpisima koji su primjenjeni nad njima. Ovo je preporučljivo, pošto vam omogućava da kasnije provjerite jeste li potpisali poruku ili neki njen dio.\n"
+#~ "Ako je ova opcija uključena, poslane poruke se pohranjuju zajedno s "
+#~ "potpisima koji su primjenjeni nad njima. Ovo je preporučljivo, pošto vam "
+#~ "omogućava da kasnije provjerite jeste li potpisali poruku ili neki njen "
+#~ "dio.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15207,12 +15032,18 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Višedjelni odvojeni potpis</h1>\n"
-#~ "Ako je ova opcija odabrana, potpis i potpisani podaci će biti odvojeni dijelovi višedjelnog/potpisanog dijela poruke. Potpisani podaci će biti čitljivi čak i za poštanske agente koji ne podržavaju korišteni algoritam potpisivanja i ne podržavaju ASN.1 dekodiranje.\n"
+#~ "Ako je ova opcija odabrana, potpis i potpisani podaci će biti odvojeni "
+#~ "dijelovi višedjelnog/potpisanog dijela poruke. Potpisani podaci će biti "
+#~ "čitljivi čak i za poštanske agente koji ne podržavaju korišteni algoritam "
+#~ "potpisivanja i ne podržavaju ASN.1 dekodiranje.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15225,12 +15056,16 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Neprozirno potpisane poruke</h1>\n"
-#~ "Kada je ova opcija odabrana, i potpis i potpisani podaci će biti kodirani u jedan ASN.1 blok. Poruke će biti čitljive samo za poštanske agente koji podržavaju ASN.1 dekodiranje.\n"
+#~ "Kada je ova opcija odabrana, i potpis i potpisani podaci će biti kodirani "
+#~ "u jedan ASN.1 blok. Poruke će biti čitljive samo za poštanske agente koji "
+#~ "podržavaju ASN.1 dekodiranje.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15261,16 +15096,21 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozorenje ako certifikat ističe</h1>\n"
-#~ "Ako je ova opcija uključena, onda ćete biti upozoreni ako pokušate da koristite certifikat za potpisivanje koji ističe za naznačeni broj dana.\n"
+#~ "Ako je ova opcija uključena, onda ćete biti upozoreni ako pokušate da "
+#~ "koristite certifikat za potpisivanje koji ističe za naznačeni broj dana.\n"
 #~ "<p>\n"
-#~ "Preporučljivo je držati ovu opciju uključenom da bi se izbeglo korištenje certifikata koji ističu u bliskoj budućnosti.\n"
+#~ "Preporučljivo je držati ovu opciju uključenom da bi se izbeglo korištenje "
+#~ "certifikata koji ističu u bliskoj budućnosti.\n"
 #~ "</qt></qt>"
 
 #, fuzzy
@@ -15285,14 +15125,16 @@ msgstr "Umetni datoteku"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Upozorenje ako potpisnikova e-adresa nije u certifikatu</h1>\n"
-#~ "Ako je ova opcija uključena, biti ćete obaviješteni ako e-adresa potpisnika nije sadržana u certifikatu korištenom za potpisivanje.\n"
+#~ "Ako je ova opcija uključena, biti ćete obaviješteni ako e-adresa "
+#~ "potpisnika nije sadržana u certifikatu korištenom za potpisivanje.\n"
 #~ "<p>\n"
 #~ "Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
 #~ "</qt>"
@@ -15310,10 +15152,6 @@ msgstr "Umetni datoteku"
 #~ msgstr "Snimi u mapu ne&dovršenih"
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "&Namjesti KMail..."
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Otvori sa..."
 
@@ -15392,26 +15230,41 @@ msgstr "Umetni datoteku"
 #~ msgid "Your Personal Data"
 #~ msgstr "Vaši osobni podaci"
 
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "Na ovoj stranici unesite neke osobne podatke koji će biti pohranjeni u vašem certifikatu i koji će pomoći ljudima da odrede jeste li vi stvarno osoba koja je poslala poruku."
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "Na ovoj stranici unesite neke osobne podatke koji će biti pohranjeni u "
+#~ "vašem certifikatu i koji će pomoći ljudima da odrede jeste li vi stvarno "
+#~ "osoba koja je poslala poruku."
 
 #~ msgid "Enter your name here"
 #~ msgstr "Ovdje unesite vaše ime"
 
 #~ msgid "Enter your name here as it should be shown in the certificate."
-#~ msgstr "Ovdje unesite vaše ime onako kako bi se trebalo prikazati u certifikatu."
+#~ msgstr ""
+#~ "Ovdje unesite vaše ime onako kako bi se trebalo prikazati u certifikatu."
 
 #~ msgid "Enter your organization here"
 #~ msgstr "Ovdje unesite ime vaše organizacije"
 
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
-#~ msgstr "Ovdje unesite ime vaše organizacije (npr. vaše kompanije, odjela...) onako kako bi se trebalo prikazati u certifikatu."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
+#~ msgstr ""
+#~ "Ovdje unesite ime vaše organizacije (npr. vaše kompanije, odjela...) "
+#~ "onako kako bi se trebalo prikazati u certifikatu."
 
 #~ msgid "Enter your email address here"
 #~ msgstr "Dodaj email adresu"
 
-#~ msgid "Enter the email address here which you want to use in connection with the certificate."
-#~ msgstr "Ovdje unesite adresu e-pošte koju želite  koristiti za povezivanje s certifikatom."
+#~ msgid ""
+#~ "Enter the email address here which you want to use in connection with the "
+#~ "certificate."
+#~ msgstr ""
+#~ "Ovdje unesite adresu e-pošte koju želite  koristiti za povezivanje s "
+#~ "certifikatom."
 
 #~ msgid "&Department:"
 #~ msgstr "&Odjel:"
@@ -15422,8 +15275,14 @@ msgstr "Umetni datoteku"
 #~ msgid "Certificate Generation"
 #~ msgstr "Pravljenje certifikata"
 
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "Na ovoj stranici odaberite da li će se pravljenje certifikata obaviti centralizirano ili ne. Provjerite kod vaše lokalne podrške ako niste sigurni što odabrati."
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "Na ovoj stranici odaberite da li će se pravljenje certifikata obaviti "
+#~ "centralizirano ili ne. Provjerite kod vaše lokalne podrške ako niste "
+#~ "sigurni što odabrati."
 
 #~ msgid "Certificate &Generation"
 #~ msgstr "&Pravljenje Certifikata"
@@ -15444,15 +15303,26 @@ msgstr "Umetni datoteku"
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "Vaš par ključeva za potpisivanje je sada spreman za slanje na CA (autoritet za certifikate) koji će napraviti certifikat za vas i poslani vam ga natrag putem e-pošte. Za svaki slučaj, pregledajte još jednom certifikat koji je prikazan ispod. Također bi trebalo da zapišete kontrolnu sumu tako da možete da provjerite certifikat koji vam je CA poslao natrag.\n"
+#~ "Vaš par ključeva za potpisivanje je sada spreman za slanje na CA "
+#~ "(autoritet za certifikate) koji će napraviti certifikat za vas i poslani "
+#~ "vam ga natrag putem e-pošte. Za svaki slučaj, pregledajte još jednom "
+#~ "certifikat koji je prikazan ispod. Također bi trebalo da zapišete "
+#~ "kontrolnu sumu tako da možete da provjerite certifikat koji vam je CA "
+#~ "poslao natrag.\n"
 #~ "<p>\n"
-#~ "Ako nešto želite da promijenite pritisnite gumb „Nazad“ i napravite izmjene, inače pritisnite „Kraj“ za slanje para ključeva CA-u.\n"
+#~ "Ako nešto želite da promijenite pritisnite gumb „Nazad“ i napravite "
+#~ "izmjene, inače pritisnite „Kraj“ za slanje para ključeva CA-u.\n"
 #~ "</qt>"
 
 #~ msgid "Extension"
@@ -15538,12 +15408,17 @@ msgstr "Umetni datoteku"
 #~ msgstr "[%1] %2"
 
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
-#~ "Prijenos je završen. %n nova poruka, veličine %1 kB (%2 kB ostalo na poslužitelju).\n"
-#~ "Prijenos je završen. %n nove poruke, veličine %1 kB (%2 kB ostalo na poslužitelju).\n"
-#~ "Prijenos je završen. %n novih poruka, veličine %1 kB (%2 kB ostalo na poslužitelju)."
+#~ "Prijenos je završen. %n nova poruka, veličine %1 kB (%2 kB ostalo na "
+#~ "poslužitelju).\n"
+#~ "Prijenos je završen. %n nove poruke, veličine %1 kB (%2 kB ostalo na "
+#~ "poslužitelju).\n"
+#~ "Prijenos je završen. %n novih poruka, veličine %1 kB (%2 kB ostalo na "
+#~ "poslužitelju)."
 
 #~ msgid ""
 #~ "_n: Transmission complete. %n message in %1 KB.\n"
@@ -15566,20 +15441,28 @@ msgstr "Umetni datoteku"
 #~ msgstr "Prenos je završen. Nema novih poruka."
 
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "Prijenos za korisnički račun %3 je završen. %n nova poruka u %1 kB (%2 KB ostalo je na poslužitelju).\n"
-#~ "Prijenos za korisnički račun %3 je završen. %n nove poruke u %1 kB (%2 KB ostalo je na poslužitelju).\n"
-#~ "Prijenos za korisnički račun %3 je završen. %n novih poruka u %1 kB (%2 KB ostalo je na poslužitelju)."
+#~ "Prijenos za korisnički račun %3 je završen. %n nova poruka u %1 kB (%2 KB "
+#~ "ostalo je na poslužitelju).\n"
+#~ "Prijenos za korisnički račun %3 je završen. %n nove poruke u %1 kB (%2 KB "
+#~ "ostalo je na poslužitelju).\n"
+#~ "Prijenos za korisnički račun %3 je završen. %n novih poruka u %1 kB (%2 "
+#~ "KB ostalo je na poslužitelju)."
 
 #~ msgid ""
 #~ "_n: Transmission for account %2 complete. %n message in %1 KB.\n"
 #~ "Transmission for account %2 complete. %n messages in %1 KB."
 #~ msgstr ""
-#~ "Prijenos za korisnički račun %2 je završen. %n nova poruka, veličine %1 kB.\n"
-#~ "Prijenos za korisnički račun %2 je završen. %n nove poruke, veličine %1 kB.\n"
-#~ "Prijenos za korisnički račun %2 je završen. %n novih poruka, veličine %1 kB."
+#~ "Prijenos za korisnički račun %2 je završen. %n nova poruka, veličine %1 "
+#~ "kB.\n"
+#~ "Prijenos za korisnički račun %2 je završen. %n nove poruke, veličine %1 "
+#~ "kB.\n"
+#~ "Prijenos za korisnički račun %2 je završen. %n novih poruka, veličine %1 "
+#~ "kB."
 
 #~ msgid ""
 #~ "_n: Transmission for account %1 complete. %n new message.\n"
@@ -15609,12 +15492,32 @@ msgstr "Umetni datoteku"
 #~ msgid "Mark Thread as &Ham"
 #~ msgstr "Označi nit kao &ham"
 
-#~ msgid "<qt>The destination folder of the account <b>%1</b> was restored to the inbox.</qt>"
-#~ msgstr "<qt>Odredišna mapa za korisnički račun <b>%1</b> je obnovljena mapi ulazne pošte.</qt>"
+#~ msgid ""
+#~ "<qt>The destination folder of the account <b>%1</b> was restored to the "
+#~ "inbox.</qt>"
+#~ msgstr ""
+#~ "<qt>Odredišna mapa za korisnički račun <b>%1</b> je obnovljena mapi "
+#~ "ulazne pošte.</qt>"
 
 #, fuzzy
-#~ msgid "<p>Here you can get some assistance in setting up KMail's filter rules to use some commonly-known anti-spam tools.</p><p>The wizard can detect those tools on your computer as well as create filter rules to classify messages using these tools and to separate messages classified as spam. The wizard will not take any existing filter rules into consideration: it will always append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen during the scan of the messages for spam, you may encounter problems with the responsiveness of KMail because anti-spam tool operations are usually time consuming; please consider deleting the filter rules created by the wizard to get back to the former behavior."
-#~ msgstr "<p>Ovdje vam je pružena podrška pri postavljanju KMail-ovih filter pravila za upotrebu nekih poznatijih alata protiv neželjene pošte (spam). </p><p> Čarobnjak može detektirati instalirane alate na računalu kao što može i kreirati filter pravila kako bi raspoznao i odvojio neželjenu poštu. Čarobnjak neće razmatrati već definirana pravila već će dodati nova.</p>"
+#~ msgid ""
+#~ "<p>Here you can get some assistance in setting up KMail's filter rules to "
+#~ "use some commonly-known anti-spam tools.</p><p>The wizard can detect "
+#~ "those tools on your computer as well as create filter rules to classify "
+#~ "messages using these tools and to separate messages classified as spam. "
+#~ "The wizard will not take any existing filter rules into consideration: it "
+#~ "will always append the new rules.</p><p><b>Warning:</b> As KMail appears "
+#~ "to be frozen during the scan of the messages for spam, you may encounter "
+#~ "problems with the responsiveness of KMail because anti-spam tool "
+#~ "operations are usually time consuming; please consider deleting the "
+#~ "filter rules created by the wizard to get back to the former behavior."
+#~ msgstr ""
+#~ "<p>Ovdje vam je pružena podrška pri postavljanju KMail-ovih filter "
+#~ "pravila za upotrebu nekih poznatijih alata protiv neželjene pošte (spam). "
+#~ "</p><p> Čarobnjak može detektirati instalirane alate na računalu kao što "
+#~ "može i kreirati filter pravila kako bi raspoznao i odvojio neželjenu "
+#~ "poštu. Čarobnjak neće razmatrati već definirana pravila već će dodati "
+#~ "nova.</p>"
 
 #~ msgid "(found on this system)"
 #~ msgstr "(nađeno na ovom sistemu)"
@@ -15623,8 +15526,16 @@ msgstr "Umetni datoteku"
 #~ msgstr "(nije nađeno na ovom sistemu)"
 
 #, fuzzy
-#~ msgid "Let the anti-spam tools classify your messages. The wizard will create appropriate filters. The messages are usually marked by the tools so that following filters can react on this and, for example, move spam messages to a special folder."
-#~ msgstr "Neka alati protiv neželjene pošte (spam) klasificiraju vaše poruke. Čarobnjak će stvoriti odgovarajuće filtere. Poruke će obično biti označene tako da sljedeći filteri mogu na njih reagirati i, npr., maknuti neželjenu poruku u posebnu mapu."
+#~ msgid ""
+#~ "Let the anti-spam tools classify your messages. The wizard will create "
+#~ "appropriate filters. The messages are usually marked by the tools so that "
+#~ "following filters can react on this and, for example, move spam messages "
+#~ "to a special folder."
+#~ msgstr ""
+#~ "Neka alati protiv neželjene pošte (spam) klasificiraju vaše poruke. "
+#~ "Čarobnjak će stvoriti odgovarajuće filtere. Poruke će obično biti "
+#~ "označene tako da sljedeći filteri mogu na njih reagirati i, npr., maknuti "
+#~ "neželjenu poruku u posebnu mapu."
 
 #, fuzzy
 #~ msgid "Target folder for spam:"
@@ -15715,12 +15626,17 @@ msgstr "Umetni datoteku"
 
 #, fuzzy
 #~ msgid ""
-#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/Mail for its messages.\n"
-#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but this will replace existing files with the same name in the directory ~/Mail (e.g. inbox).\n"
+#~ "The directory ~/KMail exists. From now on, KMail uses the directory ~/"
+#~ "Mail for its messages.\n"
+#~ "KMail can move the contents of the directory ~/KMail into ~/Mail, but "
+#~ "this will replace existing files with the same name in the directory ~/"
+#~ "Mail (e.g. inbox).\n"
 #~ "Should KMail move the mail folders now?"
 #~ msgstr ""
-#~ "Direktorij ~/KMail postoji. Od sada pa nadalje, KMail će koristiti direktorij ~/Mail za svoje poruke.\n"
-#~ "KMail može da premjesti sadržaj direktorija ~/KMail u ~/Mail, ali bi ovo zaizborniklo postojeće datotekaove sa istim imenom (npr. pristigle).\n"
+#~ "Direktorij ~/KMail postoji. Od sada pa nadalje, KMail će koristiti "
+#~ "direktorij ~/Mail za svoje poruke.\n"
+#~ "KMail može da premjesti sadržaj direktorija ~/KMail u ~/Mail, ali bi ovo "
+#~ "zaizborniklo postojeće datotekaove sa istim imenom (npr. pristigle).\n"
 #~ "Da li da KMail premjesti mape za poštu sada?"
 
 #~ msgid "&Compact"
@@ -15776,7 +15692,8 @@ msgstr "Umetni datoteku"
 #~ "This will only work if the email address of the sender, %1, is valid.\n"
 #~ "The failing address will be reported to be %2."
 #~ msgstr ""
-#~ "Da vratim poruku pošiljatelju kao neisporučivu? Ovo će raditi samo ako je e-adresa pošiljatelja, %1, ispravna.\n"
+#~ "Da vratim poruku pošiljatelju kao neisporučivu? Ovo će raditi samo ako je "
+#~ "e-adresa pošiljatelja, %1, ispravna.\n"
 #~ "%2 će biti prijavljena kao nepostojeća adresa."
 
 #~ msgid "&Thread list of message headers"
@@ -15904,21 +15821,36 @@ msgstr "Umetni datoteku"
 #~ msgid "Please set at least your name and email address."
 #~ msgstr "Postavite barem vaše ime i adresu e-pošte"
 
-#~ msgid "If the groupware server is a kolab server with default settings, you only need to set these settings."
-#~ msgstr "Ako je groupware poslužitelj kolab poslužitelj s uobičajenim postavkama, trebate  postavite samo ove postavke."
+#~ msgid ""
+#~ "If the groupware server is a kolab server with default settings, you only "
+#~ "need to set these settings."
+#~ msgstr ""
+#~ "Ako je groupware poslužitelj kolab poslužitelj s uobičajenim postavkama, "
+#~ "trebate  postavite samo ove postavke."
 
-#~ msgid "If you want, you can create new accounts before going on with groupware configuration."
-#~ msgstr "Ako želite, možete napraviti nove korisničke račune prije prelaska na groupware podešavanja."
+#~ msgid ""
+#~ "If you want, you can create new accounts before going on with groupware "
+#~ "configuration."
+#~ msgstr ""
+#~ "Ako želite, možete napraviti nove korisničke račune prije prelaska na "
+#~ "groupware podešavanja."
 
 #~ msgid "<unnamed>"
 #~ msgstr "bezimen"
 
 #, fuzzy
-#~ msgid "You have chosen the folder <b>%1</b> as parent of the groupware folders. When pressing the Finish button, those folders will be created if they do not already exist"
-#~ msgstr "Odabrali ste mapu <b>%1</b> za roditeljsku groupware mapama. Kada pritisnite gumb „Kraj“, te mape će biti napravljene ako već ne postoje."
+#~ msgid ""
+#~ "You have chosen the folder <b>%1</b> as parent of the groupware folders. "
+#~ "When pressing the Finish button, those folders will be created if they do "
+#~ "not already exist"
+#~ msgstr ""
+#~ "Odabrali ste mapu <b>%1</b> za roditeljsku groupware mapama. Kada "
+#~ "pritisnite gumb „Kraj“, te mape će biti napravljene ako već ne postoje."
 
 #, fuzzy
-#~ msgid "The folders present indicates that you want to use the selected folder language"
+#~ msgid ""
+#~ "The folders present indicates that you want to use the selected folder "
+#~ "language"
 #~ msgstr "Prisutne mape napominju da želite da koristite odabrani jezik mape."
 
 #, fuzzy
@@ -15974,8 +15906,11 @@ msgstr "Umetni datoteku"
 #~ msgstr "proslijedi na"
 
 #, fuzzy
-#~ msgid "You need to supply a user name and a password to access this mailbox."
-#~ msgstr "Morate navesti korisničko ime i lozinku da biste pristupili ovom poštanskom sandučetu."
+#~ msgid ""
+#~ "You need to supply a user name and a password to access this mailbox."
+#~ msgstr ""
+#~ "Morate navesti korisničko ime i lozinku da biste pristupili ovom "
+#~ "poštanskom sandučetu."
 
 #~ msgid "On Program Exit, Perform Following Tasks"
 #~ msgstr "Pri izlasku iz programa, uradi sljedeće zadatke"
@@ -16070,7 +16005,8 @@ msgstr "Umetni datoteku"
 
 #, fuzzy
 #~ msgid "Could not start certificate manager. Please check your installation!"
-#~ msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
+#~ msgstr ""
+#~ "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
 #~ msgid " "
 #~ msgstr " "
@@ -16140,11 +16076,19 @@ msgstr "Umetni datoteku"
 #~ msgid "Warning: Your S/MIME Plug-in configuration is unsafe."
 #~ msgstr "Upozorenje: Vaše podešavanje S/MIME dodatka nije bezbedno."
 
-#~ msgid "Encrypted messages should be stored in unencrypted form; saving locally in encrypted form is not allowed."
-#~ msgstr "Kriptirane poruke bi trebale bitipohranjene u nekriptiranom obliku. Spremanje lokalno kriptiranih formulara nije dozvoljeno."
+#~ msgid ""
+#~ "Encrypted messages should be stored in unencrypted form; saving locally "
+#~ "in encrypted form is not allowed."
+#~ msgstr ""
+#~ "Kriptirane poruke bi trebale bitipohranjene u nekriptiranom obliku. "
+#~ "Spremanje lokalno kriptiranih formulara nije dozvoljeno."
 
-#~ msgid "Please correct the wrong settings in KMail's Plug-in configuration pages as soon as possible."
-#~ msgstr "Ispravite pogrešne postavke u stranicama za podešavanje KMail umetaka što je prije moguće."
+#~ msgid ""
+#~ "Please correct the wrong settings in KMail's Plug-in configuration pages "
+#~ "as soon as possible."
+#~ msgstr ""
+#~ "Ispravite pogrešne postavke u stranicama za podešavanje KMail umetaka što "
+#~ "je prije moguće."
 
 #, fuzzy
 #~ msgid "Store message in the recommended way?"
@@ -16177,7 +16121,9 @@ msgstr "Umetni datoteku"
 
 #, fuzzy
 #~ msgid "<qt><p>%1</p><p>Do you still want to use this certificate?</p></qt>"
-#~ msgstr "<qt><p>%1</p><p>Da li još uvijek želite da koristite ovaj certifikat?</p></qt>"
+#~ msgstr ""
+#~ "<qt><p>%1</p><p>Da li još uvijek želite da koristite ovaj certifikat?</"
+#~ "p></qt>"
 
 #~ msgid "Certificate Warning"
 #~ msgstr "Upozorenje o certifikatu"
@@ -16188,8 +16134,12 @@ msgstr "Umetni datoteku"
 #~ msgid "Look for Other Certificates"
 #~ msgstr "Potražite druge certifikate"
 
-#~ msgid "Enter different address for recipient %1 or enter \" * \" to see all certificates:"
-#~ msgstr "Unesite različite adrese za primatelja %1 ili unesite „ * “ da biste vidjeli sve certifikate:"
+#~ msgid ""
+#~ "Enter different address for recipient %1 or enter \" * \" to see all "
+#~ "certificates:"
+#~ msgstr ""
+#~ "Unesite različite adrese za primatelja %1 ili unesite „ * “ da biste "
+#~ "vidjeli sve certifikate:"
 
 #, fuzzy
 #~ msgid "Select Certificate for Encryption [%1]"
@@ -16199,8 +16149,12 @@ msgstr "Umetni datoteku"
 #~ msgid "&Select certificate for recipient %1:"
 #~ msgstr "&Odaberite certifikat za primatelja %1:"
 
-#~ msgid "(Certificates matching address \"%1\", press [Cancel] to use different address for recipient %2.)"
-#~ msgstr "(Certifikati čija se adresa poklapa sa \"%1\", pritisnite [Otkaži] da biste koristili drugu adresu za primaoca %2.)"
+#~ msgid ""
+#~ "(Certificates matching address \"%1\", press [Cancel] to use different "
+#~ "address for recipient %2.)"
+#~ msgstr ""
+#~ "(Certifikati čija se adresa poklapa sa \"%1\", pritisnite [Otkaži] da "
+#~ "biste koristili drugu adresu za primaoca %2.)"
 
 #~ msgid "Certificate Warning [%1]"
 #~ msgstr "Upozorenje o certifikatu [%1]"
@@ -16344,7 +16298,8 @@ msgstr "Umetni datoteku"
 #~ msgstr "Uspio sam zapisati %1 bajtova od %2."
 
 #~ msgid "<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>"
-#~ msgstr "<qt>Nisam uspio izvršiti skriptu za potpisivanje<br><b>%1</b>:<br>%2</qt>"
+#~ msgstr ""
+#~ "<qt>Nisam uspio izvršiti skriptu za potpisivanje<br><b>%1</b>:<br>%2</qt>"
 
 #, fuzzy
 #~ msgid "&Warn before expiring messages"
@@ -16356,8 +16311,12 @@ msgstr "Umetni datoteku"
 #~ msgid "Expiring old messages..."
 #~ msgstr "Izbacujem stare poruke..."
 
-#~ msgid "Expire old messages from all folders? Expired messages are permanently deleted."
-#~ msgstr "Treba li izbaciti iz mapa sve stare poruke? Izbačene poruke su trajno obrisane."
+#~ msgid ""
+#~ "Expire old messages from all folders? Expired messages are permanently "
+#~ "deleted."
+#~ msgstr ""
+#~ "Treba li izbaciti iz mapa sve stare poruke? Izbačene poruke su trajno "
+#~ "obrisane."
 
 #~ msgid "No folders to delete from server"
 #~ msgstr "Na poslužitelju nema mapi za brisanje"
diff --git a/tde-i18n-hu/messages/tdepim/kmail.po b/tde-i18n-hu/messages/tdepim/kmail.po
index de56a4fdbb3..ccc841c7400 100644
--- a/tde-i18n-hu/messages/tdepim/kmail.po
+++ b/tde-i18n-hu/messages/tdepim/kmail.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-01-13 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -12,13 +12,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Szántó Tamás"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -165,6 +165,12 @@ msgstr "n&incs (problémákat okozhat!)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Azonosító félig automatikus erőforrás-kezeléshez"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "A múlt törlése"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -242,12 +248,12 @@ msgstr "Né&v:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Az internetszolgáltatótól bizonyára kapott egy <em>felhasználónevet</em>"
-", melyet a szolgáltatás elérésekor kell megadni. Ez a név általában megegyezik "
+"Az internetszolgáltatótól bizonyára kapott egy <em>felhasználónevet</em>, "
+"melyet a szolgáltatás elérésekor kell megadni. Ez a név általában megegyezik "
 "a kapott e-mail-cím első részével (a <em>@</em> előtti résszel)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -269,19 +275,19 @@ msgstr "A &POP-jelszó elmentése"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Ha bejelöli ezt az opciót, akkor a KMail elmenti a konfigurációs fájlba a "
 "megadott jelszót.\n"
 "Ha a TDE digitális notesze (TDEWallet) be van kapcsolva, akkor a jelszó oda "
 "lesz elmentve (ez egy biztonságos módszer).\n"
-"Ha nincs, akkor a jelszó elmentése a KMail konfigurációs fájljába történik. A "
-"tárolás egyszerűsített titkosítással történik, ezért a jelszó könnyen "
+"Ha nincs, akkor a jelszó elmentése a KMail konfigurációs fájljába történik. "
+"A tárolás egyszerűsített titkosítással történik, ezért a jelszó könnyen "
 "visszafejthető, ha a konfigurációs fájl illetéktelen kezekbe kerül."
 
 #: accountdialog.cpp:640
@@ -310,11 +316,13 @@ msgstr "Szűrés az&oknál az üzeneteknél, melyek mérete nagyobb, mint"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ha bejelöli ezt az opciót, akkor a POP-szűrők határozzák meg, hogy mi a teendő "
-"az üzenetekkel. Lehetséges műveletek: letöltés, törlés, a kiszolgálón hagyás."
+"Ha bejelöli ezt az opciót, akkor a POP-szűrők határozzák meg, hogy mi a "
+"teendő az üzenetekkel. Lehetséges műveletek: letöltés, törlés, a kiszolgálón "
+"hagyás."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -363,13 +371,15 @@ msgstr "egyszerű &szöveg"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -412,12 +422,12 @@ msgstr "Névterek:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Itt láthatók az IMAP-kiszolgáló által támogatott névterek. Mindegyik névtér egy "
-"előtagnak felel meg, mely elválasztja a mappacsoportokat. A névterek "
+"Itt láthatók az IMAP-kiszolgáló által támogatott névterek. Mindegyik névtér "
+"egy előtagnak felel meg, mely elválasztja a mappacsoportokat. A névterek "
 "segítségével például lehetővé válik, hogy a KMailben a személyes és a "
 "megosztott mappák egy azonosító alatt jelenjenek meg."
 
@@ -479,12 +489,12 @@ msgstr "A csatolások &igény szerinti letöltése"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Jelölje be ezt az opciót, ha elég Önnek, ha a program csak a csatolásokra való "
-"rákattintáskor tölti le azokat a kiszolgálóról. Így a nagy csatolásokat "
+"Jelölje be ezt az opciót, ha elég Önnek, ha a program csak a csatolásokra "
+"való rákattintáskor tölti le azokat a kiszolgálóról. Így a nagy csatolásokat "
 "tartalmazó üzenetek is gyorsan megjelennek."
 
 #: accountdialog.cpp:1009
@@ -526,7 +536,7 @@ msgstr "<üres>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Bejövő üzenetek"
 
@@ -534,11 +544,11 @@ msgstr "Bejövő üzenetek"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"A kiszolgáló feltehetően nem támogatja üzenetazonosítók használatát, de enélkül "
-"nem lehet üzeneteket hagyni a kiszolgálón.\n"
+"A kiszolgáló feltehetően nem támogatja üzenetazonosítók használatát, de "
+"enélkül nem lehet üzeneteket hagyni a kiszolgálón.\n"
 "Néhány kiszolgálótípus nem jelzi pontosan, milyen képességekkel rendelkezik, "
 "ezért ezzel az opcióval ilyen esetben is a kiszolgálón hagyhatók az üzenetek."
 
@@ -546,8 +556,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "A kiszolgáló feltehetően nem támogatja üzenetfejlécek letöltését, de enélkül "
 "nem lehet üzeneteket hagyni a kiszolgálón.\n"
@@ -556,23 +566,25 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Ha bejelöli ezt az opciót, akkor olyan POP3-kiszolgálók használata esetén, "
-"amelyek nem támogatják a sorkezelést, az elküldött üzenetek hibásak lehetnek.\n"
+"amelyek nem támogatják a sorkezelést, az elküldött üzenetek hibásak "
+"lehetnek.\n"
 "Ez az lehetőség letiltható, mert olyan kiszolgálók is előfordulnak, amelyek "
 "támogatják a sorkezelést, de ezt nem jelzik a kliens felé. Ha le szeretné "
 "kérdezni, támogatja-e a sorkezelést a kiszolgáló, nyomja meg \"A kiszolgáló "
 "képességeinek lekérdezése\" gombot.\n"
-"Ha a kiszolgáló nem jelzi, hogy támogatja a sorkezelést, próbálja bejelölni az "
-"opciót és töltsön le ellenőrzésképpen egy nagyobb adag üzenetet."
+"Ha a kiszolgáló nem jelzi, hogy támogatja a sorkezelést, próbálja bejelölni "
+"az opciót és töltsön le ellenőrzésképpen egy nagyobb adag üzenetet."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -580,14 +592,14 @@ msgstr "Előbb adjon meg egy gépnevet és egy portot az Általános lapon."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "A kiszolgáló feltehetően nem támogat sorkezelést (pipelining), ezért ez a "
 "lehetőség ki lett kapcsolva.\n"
@@ -601,14 +613,14 @@ msgstr ""
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"A kiszolgáló feltehetően nem támogatja üzenetazonosítók használatát, de enélkül "
-"nem lehet üzeneteket hagyni a kiszolgálón. Ezért ez a lehetőség ki lett "
-"kapcsolva.\n"
+"A kiszolgáló feltehetően nem támogatja üzenetazonosítók használatát, de "
+"enélkül nem lehet üzeneteket hagyni a kiszolgálón. Ezért ez a lehetőség ki "
+"lett kapcsolva.\n"
 "Néhány kiszolgálótípus nem jelzi pontosan, milyen képességekkel rendelkezik, "
 "ezért ezzel az opcióval ilyen esetben is a kiszolgálón hagyhatók az üzenetek."
 
@@ -617,8 +629,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "A kiszolgáló feltehetően nem támogatja üzenetfejlécek letöltését, de enélkül "
 "nem lehet üzeneteket hagyni a kiszolgálón. Ezért ez a lehetőség ki lett "
@@ -699,11 +711,11 @@ msgstr "IMAP-azonosító"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Meg kell adni egy postafiókot a beállítások hálózati részénél, hogy üzeneteket "
-"fogadhasson."
+"Meg kell adni egy postafiókot a beállítások hálózati részénél, hogy "
+"üzeneteket fogadhasson."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -739,13 +751,14 @@ msgstr "Üdvözöljük a KMailben!"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Most indult el első alkalommal a KMail. Ez a varázsló a postafiókok "
-"beállításához nyújt segítséget. Az e-mail használatához szükséges adatokat adja "
-"meg a következő oldalakon (ezeket a szolgáltatótól lehet megkérdezni).</qt>"
+"beállításához nyújt segítséget. Az e-mail használatához szükséges adatokat "
+"adja meg a következő oldalakon (ezeket a szolgáltatótól lehet megkérdezni).</"
+"qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -807,8 +820,7 @@ msgstr "Helyi kézbesítés"
 msgid "Server Information"
 msgstr "A kiszolgáló jellemzői"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nincs"
@@ -902,8 +914,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Nem található kéretlen üzenetek szűrésére alkalmas program. Előbb telepítsen "
-"egy ilyen programot, majd futtassa újra ezt a varázslót.</p>"
+"<p>Nem található kéretlen üzenetek szűrésére alkalmas program. Előbb "
+"telepítsen egy ilyen programot, majd futtassa újra ezt a varázslót.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -928,8 +940,8 @@ msgstr "<br>A kéretlen üzenetek nem lesznek átmozgatva ebbe a mappába: <i>"
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>A feltehetően (de nem biztosan) kéretlen üzenetek ebbe a mappába kerülnek: "
-"<i>"
+"<p>A feltehetően (de nem biztosan) kéretlen üzenetek ebbe a mappába "
+"kerülnek: <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -949,29 +961,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Ha a KMail üzenetszűrésébe be szeretné integrálni valamelyik elterjedt "
-"vírusirtó programot, ez a varázsló végigvezetheti Önt a szükséges lépéseken.</p>"
-"<p>A varázsló fel tudja ismerni a gépre telepített vírusirtó eszközöket, és "
-"ezek segítségével be tudja állítani a nem fertőzött és vírusos üzenetek "
+"vírusirtó programot, ez a varázsló végigvezetheti Önt a szükséges lépéseken."
+"</p><p>A varázsló fel tudja ismerni a gépre telepített vírusirtó eszközöket, "
+"és ezek segítségével be tudja állítani a nem fertőzött és vírusos üzenetek "
 "elkülönítéséhez szükséges szűrőket. A varázsló nem veszi figyelembe a már "
-"beállított szabályokat, az új szabályokat egyszerűen hozzáfűzi a "
-"meglevőkhöz.</p>"
-"<p><b>Figyelem:</b> A KMail az ellenőrzés alatt teljesen átadja a vezérlést a "
-"vírusirtónak. A KMail reagálási gyorsasága lecsökkenhet, mert a vírusszűrési "
-"műveletek sokáig eltarthatnak. Ha nem tartja megfelelőnek a kapott szűrőket, "
-"törölje ki őket a korábbi állapot visszaállításához."
+"beállított szabályokat, az új szabályokat egyszerűen hozzáfűzi a meglevőkhöz."
+"</p><p><b>Figyelem:</b> A KMail az ellenőrzés alatt teljesen átadja a "
+"vezérlést a vírusirtónak. A KMail reagálási gyorsasága lecsökkenhet, mert a "
+"vírusszűrési műveletek sokáig eltarthatnak. Ha nem tartja megfelelőnek a "
+"kapott szűrőket, törölje ki őket a korábbi állapot visszaállításához."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1007,15 +1017,13 @@ msgstr "A feltehetően ké&retlen üzenetek áthelyezése ide:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Az alapértelmezett mappa a Bejövő üzenetek, de ez megváltoztatható az alábbi "
-"mappanézetben."
-"<p>Nem minden program tud feltehetően kéretlen üzeneteket kezelni. Ha ilyen "
-"programot választott ki, nem választhat hozzá mappát."
+"mappanézetben.<p>Nem minden program tud feltehetően kéretlen üzeneteket "
+"kezelni. Ha ilyen programot választott ki, nem választhat hozzá mappát."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1025,8 +1033,8 @@ msgstr "Az üzenetek ellenőrzése vírusirtóval"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "A vírusirtó működésének engedélyezése. A varázsló létrehozza a szükséges "
 "szűrőket. Az eszközök általában megjelölik valahogy az üzeneteket, így a "
@@ -1040,8 +1048,8 @@ msgstr "A vírusos üzenetek áthelyezése a megadott mappába"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Ez a szűrő áthelyezi a felismert vírusos üzeneteket az erre a célra előre "
 "kijelölt mappába. Ez alapértelmezés szerint a Törölt üzenetek mappa, de a "
@@ -1054,8 +1062,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Ez a szűrő áthelyezi a felismert vírusos üzeneteket az erre a célra kijelölt "
 "mappába, és megjelöli őket olvasottnak."
@@ -1236,8 +1244,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Lehet, hogy nincs jogosultsága a művelet elvégzéséhez, vagy a mappa már létezik "
-"a kiszolgálón. A kiszolgáló hibaüzenete a következő:"
+"Lehet, hogy nincs jogosultsága a művelet elvégzéséhez, vagy a mappa már "
+"létezik a kiszolgálón. A kiszolgáló hibaüzenete a következő:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1250,8 +1258,8 @@ msgstr "Hiba történt a(z) %1 mappa olvasása közben a kiszolgálón: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1271,8 +1279,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1303,20 +1311,20 @@ msgstr "Törölt"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Egyik azonosító sem megfelelő az üzenet címzettjének,"
-"<br>válassza ki, melyik az alábbiak közül az Ön címe (ha van olyan):"
+"<qt>Egyik azonosító sem megfelelő az üzenet címzettjének,<br>válassza ki, "
+"melyik az alábbiak közül az Ön címe (ha van olyan):"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Több azonosító is megfelelő lehet az üzenet címzettjének,"
-"<br>válassza ki, melyik az alábbiak közül az Ön címe:"
+"<qt>Több azonosító is megfelelő lehet az üzenet címzettjének,<br>válassza "
+"ki, melyik az alábbiak közül az Ön címe:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1346,19 +1354,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ezt a beállítást a rendszergazda kijavította.</p>"
-"<p>Ha Ön szerint a módosítás hibás, vegye fel a rendszergazdával a "
-"kapcsolatot.</p></qt>"
+"<qt><p>Ezt a beállítást a rendszergazda kijavította.</p><p>Ha Ön szerint a "
+"módosítás hibás, vegye fel a rendszergazdával a kapcsolatot.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Profil betöltése..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Postafiók beállítása"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Hozzáadás..."
@@ -1388,6 +1398,11 @@ msgstr "<qt>Biztosan törölni szeretné a(z) <b>%1</b> azonosítót?</qt>"
 msgid "Remove Identity"
 msgstr "Azonosító eltávolítása"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Eltá&volítás"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Hozzáadás..."
@@ -1396,6 +1411,11 @@ msgstr "Hozzáadás..."
 msgid "Modify..."
 msgstr "Módosítás..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Eltá&volítás"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Beállítás alapértelmezésként"
@@ -1412,17 +1432,15 @@ msgstr "Kü&ldés"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Üzenetküldési azonosítók (legalább egyet hozzon létre):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Név"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Típus"
@@ -1444,8 +1462,7 @@ msgstr "Beállítás alapértelmezésként"
 msgid "Common Options"
 msgstr "Általános beállítások"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Megerősítés kérése kül&dés előtt"
@@ -1496,17 +1513,16 @@ msgstr "Az ala&pértelmezett tartomány:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Az alapértelmezett tartománynévvel lesznek kiegészítve azok a címek, melyek "
-"csak a felhasználónévből állnak.</p></qt>"
+"<qt><p>Az alapértelmezett tartománynévvel lesznek kiegészítve azok a címek, "
+"melyek csak a felhasználónévből állnak.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1524,9 +1540,9 @@ msgstr "Továbbító hozzáadása"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (alapértelmezés)"
 
@@ -1606,6 +1622,10 @@ msgstr "Postafiók módosítása"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Nem található ez az azonosító: <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Színe&k"
@@ -1714,8 +1734,7 @@ msgstr "Már használt link"
 msgid "Misspelled Words"
 msgstr "Hibásan írt szavak"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Új üzenet"
@@ -1906,8 +1925,8 @@ msgstr "A szálak alapértelmezés szerint legyenek összecsukva"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Az új, ol&vasatlan vagy fontos üzeneteket tartalmazó és megfigyelt szálak "
 "legyenek kibontva."
@@ -1918,70 +1937,52 @@ msgstr "Dátumkijelzés"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Ezeket a kifejezéseket lehet használni a dátumnál:</strong></p>"
-"<ul>"
-"<li>d - a nap (1-31)</li>"
-"<li>dd - a nap, nullával kiegészítve (01-31)</li>"
-"<li>ddd - a nap rövidített neve (H - V)</li>"
-"<li>dddd - a nap teljes neve (hétfő - vasárnap)</li>"
-"<li>M - a hónap (1-12)</li>"
-"<li>MM - a hónap, nullával kiegészítve (01-12)</li>"
-"<li>MMM - a hónap rövidített neve (jan - dec)</li>"
-"<li>MMMM - a hónap teljes neve (január - december)</li>"
-"<li>yy - az év kétjegyű számmal (00-99)</li>"
-"<li>yyyy - az év négyjegyű számmal (0000-9999)</li></ul>"
-"<p><strong>Ezeket a kifejezéseket lehet használni az időnél:</string></p> "
-"<ul>"
-"<li>h - az óra (0-23 vagy 1-12, ha de./du. formájú a megjelenítés)</li>"
-"<li>hh - az óra, nullával kiegészítve (00-23 vagy 01-12, ha de./du. formájú a "
-"megjelenítés)</li>"
-"<li>m - a perc (0-59)</li>"
-"<li>mm - a perc, nullával kiegészítve (00-59)</li>"
-"<li>s - a másodperc (0-59)</li>"
-"<li>ss - a másodperc, nullával kiegészítve (00-59)</li>"
-"<li>z - az ezredmásodperc (0-999)</li>"
-"<li>zzz - az ezredmásodperc, nullával kiegészítve (000-999)</li>"
-"<li>AP - de./du. formájú megjelenítés. AP helyére \"DE.\" vagy \"DU.\" "
-"kerül.</li>"
-"<li>ap - de./du. formájú megjelenítés. AP helyére \"de.\" vagy \"du.\" "
-"kerül.</li>"
-"<li>Z - az időzóna számkódja (pl. +0100 vagy -0500)</li></ul>"
-"<p><strong>Minden más karakter figyelmen kívül lesz hagyva.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Ezeket a kifejezéseket lehet használni a dátumnál:</strong></"
+"p><ul><li>d - a nap (1-31)</li><li>dd - a nap, nullával kiegészítve (01-31)</"
+"li><li>ddd - a nap rövidített neve (H - V)</li><li>dddd - a nap teljes neve "
+"(hétfő - vasárnap)</li><li>M - a hónap (1-12)</li><li>MM - a hónap, nullával "
+"kiegészítve (01-12)</li><li>MMM - a hónap rövidített neve (jan - dec)</"
+"li><li>MMMM - a hónap teljes neve (január - december)</li><li>yy - az év "
+"kétjegyű számmal (00-99)</li><li>yyyy - az év négyjegyű számmal (0000-9999)</"
+"li></ul><p><strong>Ezeket a kifejezéseket lehet használni az időnél:</"
+"string></p> <ul><li>h - az óra (0-23 vagy 1-12, ha de./du. formájú a "
+"megjelenítés)</li><li>hh - az óra, nullával kiegészítve (00-23 vagy 01-12, "
+"ha de./du. formájú a megjelenítés)</li><li>m - a perc (0-59)</li><li>mm - a "
+"perc, nullával kiegészítve (00-59)</li><li>s - a másodperc (0-59)</li><li>ss "
+"- a másodperc, nullával kiegészítve (00-59)</li><li>z - az ezredmásodperc "
+"(0-999)</li><li>zzz - az ezredmásodperc, nullával kiegészítve (000-999)</"
+"li><li>AP - de./du. formájú megjelenítés. AP helyére \"DE.\" vagy \"DU.\" "
+"kerül.</li><li>ap - de./du. formájú megjelenítés. AP helyére \"de.\" vagy "
+"\"du.\" kerül.</li><li>Z - az időzóna számkódja (pl. +0100 vagy -0500)</li></"
+"ul><p><strong>Minden más karakter figyelmen kívül lesz hagyva.</strong></p></"
+"qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Ha megváltoztatja a globális szálbeállítást, az felül fogja bírálni az egyes "
 "mappáknál megadott értékeket."
@@ -1998,8 +1999,7 @@ msgstr "HTML-es álla&potsor megjelenítése"
 msgid "Show s&pam status in fancy headers"
 msgstr "A részletes fejlécben jelenjen meg a &kéretlenségi állapot is"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "A smiley-k helyettesíthetők emotikonokkal"
@@ -2008,8 +2008,7 @@ msgstr "A smiley-k helyettesíthetők emotikonokkal"
 msgid "Use smaller font for quoted text"
 msgstr "Kisebb betűméret használata idézett szövegnél"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Kibontható-összecsukható idézőjelek mutatása"
@@ -2035,8 +2034,7 @@ msgstr "automatikus"
 msgid "&Override character encoding:"
 msgstr "A karakterkódolás fe&lülbírálása:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Ikon megjelenítése a paneltálcán"
@@ -2140,22 +2138,19 @@ msgstr "<b>%f</b> a szerkesztendő fájl nevével lesz helyettesítve."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>A következő helyettesítési szimbólumok használhatók válaszszövegben:"
-"<br><b>%D</b>: dátum, <b>%S</b>: tárgy,"
-"<br><b>%e</b>: a feladó címe, <b>%F</b>: a feladó neve, <b>%f</b>"
-": a feladó monogramja,"
-"<br><b>%T</b>: a címzett neve, <b>%t</b>: a címzett neve és címe,"
-"<br><b>%C</b>: a másolatok címei, <b>%c</b>: a másolatok címzettei (név és "
-"cím),"
-"<br><b>%%</b>: százalékjel, <b>%_</b>: szóköz, <b>%L</b>: sortörés</qt>"
+"<br><b>%D</b>: dátum, <b>%S</b>: tárgy,<br><b>%e</b>: a feladó címe, <b>%F</"
+"b>: a feladó neve, <b>%f</b>: a feladó monogramja,<br><b>%T</b>: a címzett "
+"neve, <b>%t</b>: a címzett neve és címe,<br><b>%C</b>: a másolatok címei, <b>"
+"%c</b>: a másolatok címzettei (név és cím),<br><b>%%</b>: százalékjel, <b>"
+"%_</b>: szóköz, <b>%L</b>: sortörés</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2178,21 +2173,20 @@ msgstr "Vál&asz mindenkinek:"
 msgid "&Forward:"
 msgstr "Tová&bbítás:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Idézésjelző:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D dátummal ezt írta:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D dátummal %F ezt írta:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Továbbított üzenet"
 
@@ -2230,8 +2224,8 @@ msgstr "Adja meg az új továbbítási előtagot:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "A program minden üzenetküldésnél fentről lefelé végignézi ezt a listát olyan "
 "karakterkészletet keresve, amely tartalmazza az üzenet összes karakterét."
@@ -2270,10 +2264,9 @@ msgstr "Érték"
 msgid "Ne&w"
 msgstr "Ú&j"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Név:"
@@ -2282,19 +2275,19 @@ msgstr "&Név:"
 msgid "&Value:"
 msgstr "É&rték:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-kompatibilis csatolásnevek"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook(tm) levelezőprogram "
-"fel tudja dolgozni a csatolásnevekben a nem angol karaktereket"
+"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook(tm) "
+"levelezőprogram fel tudja dolgozni a csatolásnevekben a nem angol "
+"karaktereket"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2320,20 +2313,21 @@ msgstr "csatolva"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Azt kérte, hogy a nemzetközi (például magyar ékezetes) karaktereket tartalmazó "
-"csatolásnevek kódolása az Outlook(tm)-ban használt eljárással történjen. Ez a "
-"módszer eltér a csatolásnevek szabványos kódolásától.\n"
-"Az opció használatakor a KMail olyan, nem szabványos üzeneteket is készíthet, "
-"melyeket a szabványos e-mail-kliensek esetleg nem tudnak értelmezni. Ezért ezt "
-"az opciót csak akkor ajánlott bekapcsolni, ha nincs jobb megoldás."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Azt kérte, hogy a nemzetközi (például magyar ékezetes) karaktereket "
+"tartalmazó csatolásnevek kódolása az Outlook(tm)-ban használt eljárással "
+"történjen. Ez a módszer eltér a csatolásnevek szabványos kódolásától.\n"
+"Az opció használatakor a KMail olyan, nem szabványos üzeneteket is "
+"készíthet, melyeket a szabványos e-mail-kliensek esetleg nem tudnak "
+"értelmezni. Ezért ezt az opciót csak akkor ajánlott bekapcsolni, ha nincs "
+"jobb megoldás."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2357,117 +2351,102 @@ msgstr "Titk&osítási motorok"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Az üzenetek érkezhetnek egyszerre mindkét formátumban is. Itt lehet megadni, "
-"hogy a HTML-formátumú részt vagy az egyszerű szöveges részt szeretné-e "
-"megjeleníteni, ha mindkettő létezik.</p>"
-"<p>A HTML-formátum gazdagabb megjelenítési lehetőséget biztosít, de nagyobb "
-"támadási felületet nyújt a levélben terjedő vírusoknak.</p>"
-"<p>Az egyszerű szöveges megjelenítés választása esetén a formázás egy része "
-"elveszhet, de szinte <em>lehetetlenné</em> teszi, hogy a HTML-megjelenítő "
-"komponens esetleges hibáit vírusok kihasználhassák.</p>"
-"<p>Az alatta levő opcióval a HTML-formátum egyik gyakran zavaró felhasználási "
-"lehetőségét szünteti meg. Ennek kikapcsolása azonban nem nyújt automatikusan "
-"védettséget a hibák ellen.</p>"
-"<p>Ha az adatbiztonság elsődleges szempont, akkor <em>ne</em> "
-"engedélyezze a HTML-formátumú megjelenítést.</p>"
-"<p><b>Megjegyzés:</b> ez az opció minden mappánál külön beállítható a program "
-"<i>Mappa</i> menüjében.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Az üzenetek érkezhetnek egyszerre mindkét formátumban is. Itt lehet "
+"megadni, hogy a HTML-formátumú részt vagy az egyszerű szöveges részt "
+"szeretné-e megjeleníteni, ha mindkettő létezik.</p><p>A HTML-formátum "
+"gazdagabb megjelenítési lehetőséget biztosít, de nagyobb támadási felületet "
+"nyújt a levélben terjedő vírusoknak.</p><p>Az egyszerű szöveges megjelenítés "
+"választása esetén a formázás egy része elveszhet, de szinte "
+"<em>lehetetlenné</em> teszi, hogy a HTML-megjelenítő komponens esetleges "
+"hibáit vírusok kihasználhassák.</p><p>Az alatta levő opcióval a HTML-"
+"formátum egyik gyakran zavaró felhasználási lehetőségét szünteti meg. Ennek "
+"kikapcsolása azonban nem nyújt automatikusan védettséget a hibák ellen.</"
+"p><p>Ha az adatbiztonság elsődleges szempont, akkor <em>ne</em> engedélyezze "
+"a HTML-formátumú megjelenítést.</p><p><b>Megjegyzés:</b> ez az opció minden "
+"mappánál külön beállítható a program <i>Mappa</i> menüjében.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Gyakran lehet találkozni olyan internetes reklámlevelekkel, melyeknél a HTML "
-"kódba távoli képekre mutató hivatkozásokat ágyaztak, hogy a hirdető meg tudja "
-"állapítani, a címzettek elolvasták-e a hirdetést vagy sem.</p>"
-"<p>Általában nincs sok értelme külső hivatkozásokat használni üzenetekben, mert "
-"a hivatkozott elemeket, képeket az üzenetbe is be lehet ágyazni.</p>"
-"<p>Az ilyen visszaélések elkerülése érdekében alapértelmezés szerint ez az "
-"opció <em>le van tiltva</em>.</p>"
-"<p>Ha meg szeretné tekinteni az üzenetek által hivatkozott külső képeket, "
-"jelölje be ezt az opciót, de ne felejtse el, hogy a lehetőség az említett módon "
-"kihasználható.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Gyakran lehet találkozni olyan internetes reklámlevelekkel, melyeknél "
+"a HTML kódba távoli képekre mutató hivatkozásokat ágyaztak, hogy a hirdető "
+"meg tudja állapítani, a címzettek elolvasták-e a hirdetést vagy sem.</"
+"p><p>Általában nincs sok értelme külső hivatkozásokat használni üzenetekben, "
+"mert a hivatkozott elemeket, képeket az üzenetbe is be lehet ágyazni.</"
+"p><p>Az ilyen visszaélések elkerülése érdekében alapértelmezés szerint ez az "
+"opció <em>le van tiltva</em>.</p><p>Ha meg szeretné tekinteni az üzenetek "
+"által hivatkozott külső képeket, jelölje be ezt az opciót, de ne felejtse "
+"el, hogy a lehetőség az említett módon kihasználható.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>A feldolgozási visszajelzések küldésének házirendje</h3>"
-"<p>A visszajelzések (MDN-ek) az <b>elolvasási visszajelzések</b> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>A feldolgozási visszajelzések küldésének házirendje</h3><p>A "
+"visszajelzések (MDN-ek) az <b>elolvasási visszajelzések</b> "
 "általánosításaként jöttek létre. Az üzenet küldője megadja, milyen "
 "visszajelzéseket szeretne kapni, az üzenetet fogadó levelezőprogram pedig a "
-"kért eseményekről visszajelzéseket küld. Ilyen esemény lehet például: <b>"
-"megjelenítve</b> (pl. elolvasva), <b>törölve</b> és <b>feldolgozva</b> "
-"(pl. továbbítva).</p>"
-"<p>A következő opciókkal lehet szabályozni a visszajelzési üzenetek "
-"küldését:</p>"
-"<ul>"
-"<li><em>Figyelmen kívül hagyás</em>: a program nem fog visszajelzéseket küldeni "
-"(biztonsági okokból ez a javasolt beállítás).</li>"
-"<li><em>Rákérdezés</em>: a program minden visszajelzés előtt engedélyt kér a "
-"felhasználótól az elküldésre. Így Ön dönti el, hogy melyik üzenet esetén legyen "
-"visszajelzés, és melyik esetén nem.</li>"
-"<li><em>Megtagadási üzenet</em>: a program mindig <b>megtagadva</b> "
-"visszajelzést fog küldeni. Ez csak egy <em>kicsit</em> "
-"jobb annál, mintha mindig küldene visszajelzést, mert az üzenet küldője tudni "
-"fogja, hogy mely üzenetekkel foglalkozott a címzett, csak azt nem tudja majd "
-"pontosan, hogy az üzenettel mit történt (el lett-e olvasva vagy törölve lett "
-"stb.).</li>"
-"<li><em>Engedélyezés</em>: a levelezőprogram elküldi a kért visszajelzéseket. "
-"Ez azt jelenti, hogy a feladó pontosan tudni fogja, mi történt az üzenettel "
-"(megnézték, törölték stb.). Ez a beállítás általában nem javasolt, csak olyan "
-"esetben, ha például olyan ügyfelekkel foglalkozik, akik számára jelezni "
-"szeretné, hogy az üzenet feldolgozása elkezdődött.</li></ul></qt>"
+"kért eseményekről visszajelzéseket küld. Ilyen esemény lehet például: "
+"<b>megjelenítve</b> (pl. elolvasva), <b>törölve</b> és <b>feldolgozva</b> "
+"(pl. továbbítva).</p><p>A következő opciókkal lehet szabályozni a "
+"visszajelzési üzenetek küldését:</p><ul><li><em>Figyelmen kívül hagyás</em>: "
+"a program nem fog visszajelzéseket küldeni (biztonsági okokból ez a javasolt "
+"beállítás).</li><li><em>Rákérdezés</em>: a program minden visszajelzés előtt "
+"engedélyt kér a felhasználótól az elküldésre. Így Ön dönti el, hogy melyik "
+"üzenet esetén legyen visszajelzés, és melyik esetén nem.</"
+"li><li><em>Megtagadási üzenet</em>: a program mindig <b>megtagadva</b> "
+"visszajelzést fog küldeni. Ez csak egy <em>kicsit</em> jobb annál, mintha "
+"mindig küldene visszajelzést, mert az üzenet küldője tudni fogja, hogy mely "
+"üzenetekkel foglalkozott a címzett, csak azt nem tudja majd pontosan, hogy "
+"az üzenettel mit történt (el lett-e olvasva vagy törölve lett stb.).</"
+"li><li><em>Engedélyezés</em>: a levelezőprogram elküldi a kért "
+"visszajelzéseket. Ez azt jelenti, hogy a feladó pontosan tudni fogja, mi "
+"történt az üzenettel (megnézték, törölték stb.). Ez a beállítás általában "
+"nem javasolt, csak olyan esetben, ha például olyan ügyfelekkel foglalkozik, "
+"akik számára jelezni szeretné, hogy az üzenet feldolgozása elkezdődött.</"
+"li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2483,16 +2462,17 @@ msgstr "Külső internetes hivatkozások enge&délyezése"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>Figyelmeztetés:</b> a HTML üzenetformátum engedélyezése bizonyos kockázattal "
-"jár, mert a megjelenítő komponens bonyolultsága miatt nagyobb valószínűséggel "
-"fordulhat elő benne biztonsági rés, mint az egyszerű szöveges megjelenítőben. "
-"<a href=\"whatsthis:%1\">További információ a HTML-es üzenetekről...</a> "
-"<a href=\"whatsthis:%2\">További információ a külső hivatkozásokról...</a>"
+"<b>Figyelmeztetés:</b> a HTML üzenetformátum engedélyezése bizonyos "
+"kockázattal jár, mert a megjelenítő komponens bonyolultsága miatt nagyobb "
+"valószínűséggel fordulhat elő benne biztonsági rés, mint az egyszerű "
+"szöveges megjelenítőben. <a href=\"whatsthis:%1\">További információ a HTML-"
+"es üzenetekről...</a> <a href=\"whatsthis:%2\">További információ a külső "
+"hivatkozásokról...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2554,8 +2534,8 @@ msgid ""
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
 "<b>Figyelem:</b> biztonsági kockázatot jelent az üzenetek automatikus "
-"visszajelzésének engedélyezése. <a href=\"whatsthis:%1\">"
-"További információ...</a>"
+"visszajelzésének engedélyezése. <a href=\"whatsthis:%1\">További "
+"információ...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2569,15 +2549,14 @@ msgstr "A kulcsok és tanúsítványok automatikus beimportálása"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Ha megváltoztatja a globális HTML-beállítást, akkor az felül fogja bírálni az "
-"egyes mappáknál megadott értékeket."
+"Ha megváltoztatja a globális HTML-beállítást, akkor az felül fogja bírálni "
+"az egyes mappáknál megadott értékeket."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Ez az opció a dirmngr 0.9.0 vagy újabb verzióját igényli"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "nincs proxy"
@@ -2607,8 +2586,8 @@ msgstr "A fontosnak jelzett üzenetek nem é&vülhetnek el"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Még nem olvasott üzenetek keresése:"
 
@@ -2632,8 +2611,8 @@ msgstr "körkörös legyen (az összes mappában)"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Mappába való belépéskor:"
 
@@ -2702,27 +2681,23 @@ msgstr "könyvtárak (\"maildir\" formátum)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Itt lehet megadni, hogy melyik postafiók-formátum legyen az alapértelmezés "
-"helyi mappáknál:</p>"
-"<p><b>mbox:</b> minden KMail üzenetmappa külön fájlba kerül. Az üzeneteket egy "
-"\"From \" kezdetű sor választja el egymástól. Ez egy helytakarékos megoldás, de "
-"megnehezíti az üzenetek mappák közötti mozgatását.</p>"
-"<p><b>maildir:</b> minden KMail üzenetmappához egy könyvtár tartozik a lemezen. "
-"Az üzenetek külön fájlba kerülnek. Ezt a tárolási módot választva a "
-"lemezfelhasználás nagyobb lesz, de könnyebben kezelhető az üzenetek mappák "
-"közötti mozgatása.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Itt lehet megadni, hogy melyik postafiók-formátum legyen az "
+"alapértelmezés helyi mappáknál:</p><p><b>mbox:</b> minden KMail üzenetmappa "
+"külön fájlba kerül. Az üzeneteket egy \"From \" kezdetű sor választja el "
+"egymástól. Ez egy helytakarékos megoldás, de megnehezíti az üzenetek mappák "
+"közötti mozgatását.</p><p><b>maildir:</b> minden KMail üzenetmappához egy "
+"könyvtár tartozik a lemezen. Az üzenetek külön fájlba kerülnek. Ezt a "
+"tárolási módot választva a lemezfelhasználás nagyobb lesz, de könnyebben "
+"kezelhető az üzenetek mappák közötti mozgatása.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2755,54 +2730,46 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A következő olvasatlan üzenetre való lépéskor előfordulhat, hogy a kijelölt "
-"után már nincs több olvasatlan üzenet.</p>"
-"<p><b>Ne legyen ciklikus a keresés:</b> a keresés le fog állni az utolsó "
-"olvasatlan üzenetnél (az aktuális mappában).</p>"
-"<p><b>Ciklikus keresés (az aktuális mappában):</b> a keresés az üzenetlista "
-"elejétől fog folytatódni, de nem vált át más mappára.</p>"
-"<p><b>Ciklikus keresés (az összes mappában):</b> a keresés az üzenetlista "
-"elejétől fog folytatódni. Ha nincs több olvasatlan üzenet, a keresés a "
-"következő mappában fog folytatódni.</p>"
-"<p>Ehhez hasonló módon, az előző olvasatlan üzenet keresésekor a művelet az "
-"üzenetlista végétől fog folytatódni vagy egy másik mappára fog ugrani az opció "
-"értékétől függően.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>A következő olvasatlan üzenetre való lépéskor előfordulhat, hogy a "
+"kijelölt után már nincs több olvasatlan üzenet.</p><p><b>Ne legyen ciklikus "
+"a keresés:</b> a keresés le fog állni az utolsó olvasatlan üzenetnél (az "
+"aktuális mappában).</p><p><b>Ciklikus keresés (az aktuális mappában):</b> a "
+"keresés az üzenetlista elejétől fog folytatódni, de nem vált át más mappára."
+"</p><p><b>Ciklikus keresés (az összes mappában):</b> a keresés az "
+"üzenetlista elejétől fog folytatódni. Ha nincs több olvasatlan üzenet, a "
+"keresés a következő mappában fog folytatódni.</p><p>Ehhez hasonló módon, az "
+"előző olvasatlan üzenet keresésekor a művelet az üzenetlista végétől fog "
+"folytatódni vagy egy másik mappára fog ugrani az opció értékétől függően.</"
+"p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A teljes szöveges indexelés gyors szövegkeresést tesz lehetővé az üzenetek "
-"szövegében. Ha be van kapcsolva, a keresési ablak működése nagyon gyors lesz és "
-"a keresési eszköztár a tartalom alapján választja ki az üzeneteket.</p>"
-"<p>Az index igényel egy bizonyos lemezterületet (körülbelül az üzenetmennyiség "
-"felének megfelelőt).</p>"
-"<p>Bekapcsolás után az indexet újra kell építeni, de az újraépítés közben a "
-"KMail a szokott módon használható.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>A teljes szöveges indexelés gyors szövegkeresést tesz lehetővé az "
+"üzenetek szövegében. Ha be van kapcsolva, a keresési ablak működése nagyon "
+"gyors lesz és a keresési eszköztár a tartalom alapján választja ki az "
+"üzeneteket.</p><p>Az index igényel egy bizonyos lemezterületet (körülbelül "
+"az üzenetmennyiség felének megfelelőt).</p><p>Bekapcsolás után az indexet "
+"újra kell építeni, de az újraépítés közben a KMail a szokott módon "
+"használható.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2868,8 +2835,8 @@ msgstr "A csoportmunka-mappák el&rejtése"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Ha ez be van jelölve, az IMAP-os erőforrásmappák nem jelennek meg a "
 "mappastruktúrában."
@@ -2880,11 +2847,11 @@ msgstr "Csak a cso&portmunkamappák jelenjenek meg ennél az azonosítónál"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Ha ez be van jelölve, a normál levelezési mappák nem lesznek láthatóak ennél az "
-"azonosítónál, csak a csoportmunkamappák."
+"Ha ez be van jelölve, a normál levelezési mappák nem lesznek láthatóak ennél "
+"az azonosítónál, csak a csoportmunkamappák."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2913,8 +2880,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook(tm) levelezőprogram "
-"fel tudja dolgozni a meghívókra adott válaszokat"
+"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook(tm) "
+"levelezőprogram fel tudja dolgozni a meghívókra adott válaszokat"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2925,8 +2892,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook(tm) levelezőprogram "
-"fel tudja dolgozni a meghívókra adott válaszokat"
+"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook(tm) "
+"levelezőprogram fel tudja dolgozni a meghívókra adott válaszokat"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2940,24 +2907,23 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"A Microsoft Outlook, ha Microsoft Exchange kiszolgálóhoz van kapcsolódva, nem "
-"tudja kezelni a szabványos csoportmunka-üzeneteket. Jelölje be ezt, ha a "
+"A Microsoft Outlook, ha Microsoft Exchange kiszolgálóhoz van kapcsolódva, "
+"nem tudja kezelni a szabványos csoportmunka-üzeneteket. Jelölje be ezt, ha a "
 "meghívókat a Microsoft Exchange számára értelmezhető formátumban szeretné "
 "küldeni."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-kompatibilis csatolásnevek"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatikus meghívóküldés"
@@ -2972,24 +2938,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>A meghívók általában e-mailes csatolásként továbbítódnak. Ezzel az opcióval "
-"azt lehet elérni, hogy a meghívók a levél szövegtörzsében legyenek továbbítva. "
-"Ez ahhoz szükséges, hogy a Microsoft Outlooknak megfelelő formában lehessen "
-"meghívókat küldeni és fogadni."
-"<br>Ebben az esetben azonban a meghívók szövege nem lesz olvasható szöveg, így "
-"az ilyen formátumú meghívókat kezelni nem tudó programokat használó címzettek "
-"'furcsa' szövegű üzeneteket fognak kapni."
-"<br>A szabványos meghívókat kezelni tudó programok az opció bejelölésekor is "
-"használhatók maradnak.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>A meghívók általában e-mailes csatolásként továbbítódnak. Ezzel az "
+"opcióval azt lehet elérni, hogy a meghívók a levél szövegtörzsében legyenek "
+"továbbítva. Ez ahhoz szükséges, hogy a Microsoft Outlooknak megfelelő "
+"formában lehessen meghívókat küldeni és fogadni.<br>Ebben az esetben azonban "
+"a meghívók szövege nem lesz olvasható szöveg, így az ilyen formátumú "
+"meghívókat kezelni nem tudó programokat használó címzettek 'furcsa' szövegű "
+"üzeneteket fognak kapni.<br>A szabványos meghívókat kezelni tudó programok "
+"az opció bejelölésekor is használhatók maradnak.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3093,29 +3058,26 @@ msgstr "Továbbítás"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Itt lehet válasznál és továbbításnál felhasználható sablonokat létrehozni, "
-"módosítani és törölni. Létrehozáshoz a jobb egérgombbal előhívható felbukkanó "
-"menüt vagy az eszköztár menüjét lehet használni. A sablonokhoz a gyors elérés "
-"érdekében billentyűparancsot lehet rendelni.</p>"
-"<p>A sablonok támogatnak behelyettesítési parancsokat a <i>Parancs beszúrása</i> "
-"menüből.</p>"
-"<p>Négyféle egyéni sablon létezik: a <i>Válasz</i>, <i>Válasz mindenkinek</i>"
-", <i>Továbbítás</i> és <i>Univerzális</i>, ezek tetszés szerint "
-"felhasználhatók. Az <i>Univerzális</i> sablonhoz nem lehet billentyűparancsot "
-"rendelni.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Itt lehet válasznál és továbbításnál felhasználható sablonokat "
+"létrehozni, módosítani és törölni. Létrehozáshoz a jobb egérgombbal "
+"előhívható felbukkanó menüt vagy az eszköztár menüjét lehet használni. A "
+"sablonokhoz a gyors elérés érdekében billentyűparancsot lehet rendelni.</"
+"p><p>A sablonok támogatnak behelyettesítési parancsokat a <i>Parancs "
+"beszúrása</i> menüből.</p><p>Négyféle egyéni sablon létezik: a <i>Válasz</"
+"i>, <i>Válasz mindenkinek</i>, <i>Továbbítás</i> és <i>Univerzális</i>, ezek "
+"tetszés szerint felhasználhatók. Az <i>Univerzális</i> sablonhoz nem lehet "
+"billentyűparancsot rendelni.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3132,15 +3094,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3166,7 +3128,8 @@ msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
-"A választott billentyűkombináció már foglalt, biztosan ezt szeretné használni?"
+"A választott billentyűkombináció már foglalt, biztosan ezt szeretné "
+"használni?"
 
 #: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
@@ -3213,8 +3176,8 @@ msgstr "Az azonosító módosítása"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3471,6 +3434,11 @@ msgstr "Mappa kiválasztása"
 msgid "Filters"
 msgstr "%1. szűrő"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Az összes szöveg kijelölése"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3502,8 +3470,8 @@ msgstr "A szűrési műveletek napló&zása"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Itt lehet ki-be kapcsolni a szűrési műveletek naplózását. Naplózási adatok "
 "természetesen csak akkor keletkeznek, ha a naplózás be van kapcsolva. "
@@ -3522,15 +3490,16 @@ msgstr "A szűrési szabá&lyok kiértékelésének naplózása"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Ezzel az opcióval lehet a szűrési szabályok naplózásának részletességét "
 "beállítani. Ha az opció be van jelölve, akkor minden kiértékelési fázis "
-"naplózva lesz, máskülönben csak a szűrési szabályok kiértékelési eredménye fog "
-"bekerülni a naplóba."
+"naplózva lesz, máskülönben csak a szűrési szabályok kiértékelési eredménye "
+"fog bekerülni a naplóba."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3550,15 +3519,15 @@ msgstr "korlátlan"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Naplózáskor az adatok egy ideig a memóriában tárolódnak. Az erre a célra "
-"felhasznált memória mennyiségét lehet itt beállítani. Ha az összegyűlt adatok "
-"mennyisége túllépte a megadott korlátot, a program eldobja a legrégebbi "
-"adatokat olyan mértékben, hogy a méret a korlát alá kerüljön. "
+"felhasznált memória mennyiségét lehet itt beállítani. Ha az összegyűlt "
+"adatok mennyisége túllépte a megadott korlátot, a program eldobja a "
+"legrégebbi adatokat olyan mértékben, hogy a méret a korlát alá kerüljön. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3568,7 +3537,7 @@ msgstr ""
 "Nem sikerült írni a(z) %1 fájlba:\n"
 "A részletes hibaüzenet a következő: \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Hiba - KMail"
@@ -3609,9 +3578,9 @@ msgstr "&Felhasználóazonosító:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Itt kell megadni az IMAP-kiszolgáló eléréséhez szükséges nevet. Ez lehet "
 "egyszerű felhasználónév, de akár a felhasználó teljes e-mail címe is. Ha meg "
@@ -3666,8 +3635,8 @@ msgstr "Nincs írási-olvasási joga a törölt üzenetek mappájához."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Még nincs letöltve információ a kiszolgálóról, használja \"Az új üzenetek "
 "ellenőrzése\" menüpontot."
@@ -3680,8 +3649,7 @@ msgstr "Hiba: nincs IMAP-azonosító rendelve ehhez a mappához"
 msgid "Connecting to server %1, please wait..."
 msgstr "Csatlakozás a(z) %1 kiszolgálóhoz, egy kis türelmet kérek..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Nem sikerült csatlakozni a(z) %1 kiszolgálóhoz"
@@ -3710,11 +3678,11 @@ msgstr "Jogosultságok hozzáadása"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Biztosan el szeretné távolítani a saját jogosultságait a mappából? Így később "
-"nem fogja tudni elérni a mappát."
+"Biztosan el szeretné távolítani a saját jogosultságait a mappából? Így "
+"később nem fogja tudni elérni a mappát."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3745,7 +3713,7 @@ msgstr "Használat:"
 msgid "Select Folder"
 msgstr "Mappa kiválasztása"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Helyi mappák"
@@ -3769,9 +3737,9 @@ msgstr "Hangfájl kiválasztása"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Az aktuális mappához rendelt billentyűparancs megadásához kattintson az "
 "alábbi gombra és nyomja le a kívánt billentyűkombinációt.</qt>"
@@ -3794,13 +3762,22 @@ msgstr "&Mégsem"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>A letörölt mappa a(z) <b>%1</b> azonosítóhoz tartozott, mely ide helyezte "
-"az új üzeneteket. Az új üzenetek mappája ezért vissza lett állítva a Beérkezett "
-"üzenetek mappára.</qt>"
+"<qt>A letörölt mappa a(z) <b>%1</b> azonosítóhoz tartozott, mely ide "
+"helyezte az új üzeneteket. Az új üzenetek mappája ezért vissza lett állítva "
+"a Beérkezett üzenetek mappára.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3925,70 +3902,17 @@ msgstr "Kéretlenségi vizsgálat:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>ü"
-"<br>z"
-"<br>e"
-"<br>n"
-"<br>e"
-"<br>t"
-"<br> </b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>ü<br>z<br>e<br>n<br>e<br>t<br> </b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>e"
-"<br>m"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>ü"
-"<br>z"
-"<br>e"
-"<br>n"
-"<br>e"
-"<br>t"
-"<br></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>e<br>m<br> <br>H<br>T<br>M<br>L<br> "
+"<br>ü<br>z<br>e<br>n<br>e<br>t<br></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4000,18 +3924,13 @@ msgstr "&Név:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Az Ön neve</h3>"
-"<p>Ide írja be a nevét - ez a sztring jelenik meg a címzettnél az e-mail cím "
-"mellett.</p>"
-"<p>Ha üresen hagyja, csak az e-mail cím fog megjelenni a címzettnél.</p></qt>"
+"<qt><h3>Az Ön neve</h3><p>Ide írja be a nevét - ez a sztring jelenik meg a "
+"címzettnél az e-mail cím mellett.</p><p>Ha üresen hagyja, csak az e-mail cím "
+"fog megjelenni a címzettnél.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4019,16 +3938,13 @@ msgstr "Szerve&zet:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Szervezet</h3>"
-"<p>Ide lehet beírni annak a szervezetnek a nevét, amelyhez Ön tartozik.</p>"
-"<p>Általában üresen lehet hagyni ezt a mezőt.</p></qt>"
+"<qt><h3>Szervezet</h3><p>Ide lehet beírni annak a szervezetnek a nevét, "
+"amelyhez Ön tartozik.</p><p>Általában üresen lehet hagyni ezt a mezőt.</p></"
+"qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4037,19 +3953,14 @@ msgstr "E-m&ail cím:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-mail cím</h3>"
-"<p>Ide kell beírni az Ön e-mail címét.</p>"
-"<p>Ha üresen hagyja ezt a mezőt, vagy hibás címet ad meg, a címzett esetleg nem "
+"<qt><h3>E-mail cím</h3><p>Ide kell beírni az Ön e-mail címét.</p><p>Ha "
+"üresen hagyja ezt a mezőt, vagy hibás címet ad meg, a címzett esetleg nem "
 "fog tudni válaszolni Önnek.</p></qt>"
 
 #: identitydialog.cpp:165
@@ -4059,21 +3970,12 @@ msgstr "E-m&ail cím:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4098,20 +4000,17 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Az itt kiválasztott OpenPGP-kulcsot használja majd a program az üzenetek "
-"elektronikus aláírásához. GnuPG-kulcsok is használhatók.</p>"
-"<p>A mező üresen hagyható, de akkor nem lehet elektronikusan aláírt üzeneteket "
-"küldeni. A normál levélküldési funkciót ez nem érinti.</p>"
-"<p>A kulcsokról részletes leírás található itt: <a>http://www.gnupg.org</a></p>"
-"</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Az itt kiválasztott OpenPGP-kulcsot használja majd a program az "
+"üzenetek elektronikus aláírásához. GnuPG-kulcsok is használhatók.</p><p>A "
+"mező üresen hagyható, de akkor nem lehet elektronikusan aláírt üzeneteket "
+"küldeni. A normál levélküldési funkciót ez nem érinti.</p><p>A kulcsokról "
+"részletes leírás található itt: <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4123,31 +4022,28 @@ msgstr "Az Ön OpenPGP-s titkosítási kulcsa"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Az itt kiválasztott OpenPGP-kulcsot használja majd a program az üzenetek saját "
-"magának való titkosításakor és \"A publikus kulcs csatolása\" funkció "
+"Az itt kiválasztott OpenPGP-kulcsot használja majd a program az üzenetek "
+"saját magának való titkosításakor és \"A publikus kulcs csatolása\" funkció "
 "használatakor."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>A kiválasztott OpenPGP-kulcsot használja majd a program az üzenetek saját "
-"magának való titkosításakor és \"A publikus kulcs csatolása\" funkció "
-"használatakor. GnuPG-kulcsok is használhatók.</p>"
-"<p>A mező üresen hagyható, de akkor az elküldött üzenetek saját másolatát nem "
-"lehet OpenPGP-vel titkosítani. A normál levélküldési funkciót ez nem érinti.</p>"
-"<p>A kulcsokról részletes leírás található itt: <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>A kiválasztott OpenPGP-kulcsot használja majd a program az üzenetek "
+"saját magának való titkosításakor és \"A publikus kulcs csatolása\" funkció "
+"használatakor. GnuPG-kulcsok is használhatók.</p><p>A mező üresen hagyható, "
+"de akkor az elküldött üzenetek saját másolatát nem lehet OpenPGP-vel "
+"titkosítani. A normál levélküldési funkciót ez nem érinti.</p><p>A "
+"kulcsokról részletes leírás található itt: <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4162,22 +4058,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Az itt kiválasztott S/MIME-os tanúsítványt használja majd a program az üzenetek "
-"elektronikus aláírásához."
+"Az itt kiválasztott S/MIME-os tanúsítványt használja majd a program az "
+"üzenetek elektronikus aláírásához."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Az itt kiválasztott S/MIME-os (X.509) tanúsítványt használja majd a program "
-"az üzenetek aláírásához.</p>"
-"<p>A mező üresen hagyható, de akkor nem lehet S/MIME-mal elektronikusan aláírt "
-"üzeneteket küldeni. A normál levélküldési funkciót ez nem érinti.</p></qt>"
+"<qt><p>Az itt kiválasztott S/MIME-os (X.509) tanúsítványt használja majd a "
+"program az üzenetek aláírásához.</p><p>A mező üresen hagyható, de akkor nem "
+"lehet S/MIME-mal elektronikusan aláírt üzeneteket küldeni. A normál "
+"levélküldési funkciót ez nem érinti.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4189,8 +4083,8 @@ msgstr "Az Ön S/MIME-os titkosítási tanúsítványa"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Válassza ki, melyik S/MIME-os tanúsítványt szeretné használni saját célú "
 "titkosításhoz és a szerkesztőből elérhető, \"A saját tanúsítvány csatolása\" "
@@ -4198,17 +4092,15 @@ msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A kiválasztott S/MIME-tanúsítványt használja majd a program a saját célra "
-"való titkosításhoz és \"A saját tanúsítvány csatolása\" művelethez.</p>"
-"<p>A mező üresen hagyható, de akkor a KMail nem fogja tudni S/MIME-mal "
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>A kiválasztott S/MIME-tanúsítványt használja majd a program a saját "
+"célra való titkosításhoz és \"A saját tanúsítvány csatolása\" művelethez.</"
+"p><p>A mező üresen hagyható, de akkor a KMail nem fogja tudni S/MIME-mal "
 "titkosítani a kimenő üzeneteknek az Elküldött üzenetek közé helyezett "
 "másolatát. A többi levélküldési funkciót ez nem érinti.</p></qt>"
 
@@ -4230,22 +4122,18 @@ msgstr "&Válaszcím:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Válaszcím</h3>"
-"<p>Beállítja a <tt>Reply-to:</tt> fejlécmezőbe kerülő alternatív e-mail címet, "
-"melynek értéke eltérhet a <tt>From:</tt> mezőétől.</p>"
-"<p>Például akkor használható, ha többen dolgoznak hasonló szerepkörben. "
-"Beállítható, hogy az üzenetek az Ön nevében menjenek ki, de a válaszokat mindig "
-"az egész csoport kapja meg.</p></p>Általában üresen hagyható.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Válaszcím</h3><p>Beállítja a <tt>Reply-to:</tt> fejlécmezőbe kerülő "
+"alternatív e-mail címet, melynek értéke eltérhet a <tt>From:</tt> mezőétől.</"
+"p><p>Például akkor használható, ha többen dolgoznak hasonló szerepkörben. "
+"Beállítható, hogy az üzenetek az Ön nevében menjenek ki, de a válaszokat "
+"mindig az egész csoport kapja meg.</p></p>Általában üresen hagyható.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4253,26 +4141,20 @@ msgstr "Rejtett &címzettek (BCC):"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Titkos másolatok - BCC (Blind Carbon Copy) címek</h3>"
-"<p>Az itt megadott címek minden kimenő üzenethez hozzá lesznek adva címzettként "
-"(ennél az azonosítónál), de úgy, hogy a többi címzett számára nem lesznek "
-"láthatóak.</p>"
-"<p>Így például az elküldött üzenetek másolatai összegyűjthetők egy másik "
-"postafiókban.</p>"
-"<p>Ha egynél több címet szeretne megadni, vesszővel elválasztva adja meg a "
-"címeket.</p>"
-"<p>Ha nincs szüksége erre a funkcióra, hagyja üresen a mezőt.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Titkos másolatok - BCC (Blind Carbon Copy) címek</h3><p>Az itt "
+"megadott címek minden kimenő üzenethez hozzá lesznek adva címzettként (ennél "
+"az azonosítónál), de úgy, hogy a többi címzett számára nem lesznek láthatóak."
+"</p><p>Így például az elküldött üzenetek másolatai összegyűjthetők egy másik "
+"postafiókban.</p><p>Ha egynél több címet szeretne megadni, vesszővel "
+"elválasztva adja meg a címeket.</p><p>Ha nincs szüksége erre a funkcióra, "
+"hagyja üresen a mezőt.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4310,7 +4192,7 @@ msgstr "&Aláírás"
 msgid "&Picture"
 msgstr "&Kép"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Érvénytelen e-mail cím"
 
@@ -4333,8 +4215,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Az egyik beállított OpenPGP-s titkosítási kulcs nem tartalmazza a "
 "felhasználóazonosítót az azonosítóhoz (%1) beállított e-mail címmel."
@@ -4376,8 +4258,9 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"A(z) \"%1\" azonosítóhoz megadott Elküldött üzenetek mappa nem érhető el, ezért "
-"helyette az alapértelmezett Elküldött üzenetek mappát használja a program."
+"A(z) \"%1\" azonosítóhoz megadott Elküldött üzenetek mappa nem érhető el, "
+"ezért helyette az alapértelmezett Elküldött üzenetek mappát használja a "
+"program."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4392,13 +4275,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"A(z) \"%1\" azonosítóhoz tartozó egyéni sablonok mappája nem létezik. Helyette "
-"az alapértelmezett sablonmappát használja a program."
+"A(z) \"%1\" azonosítóhoz tartozó egyéni sablonok mappája nem létezik. "
+"Helyette az alapértelmezett sablonmappát használja a program."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (ez az alapértelmezés)"
 
@@ -4446,16 +4329,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "A beállítások átvétele megtörtént, de azért érdemes ellenőrizni a "
 "beállításokat."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Nem sikerült automatikusan átvenni a beállításokat, ellenőrizze az azonosító "
 "beállításait."
@@ -4498,14 +4381,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Hiba: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "A(z) %1 kiszolgálóval váratlanul bezáródott a kapcsolat (lehet, hogy "
 "időtúllépési hiba miatt). Ha lehetséges, automatikusan helyre lesz állítva."
@@ -4655,14 +4543,14 @@ msgstr "Listaarchívum"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4691,188 +4579,152 @@ msgstr "Nem használható titkosítási kulcsok"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Az Ön OpenPGP-s aláírási kulcsa</p><p align=center><b>%1</b> "
-"(Azonosító: 0x%2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>Az Ön OpenPGP-s aláírási kulcsa</p><p align=center><b>%1</b> (Azonosító: "
+"0x%2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Az Ön OpenPGP-s titkosítási kulcsa</p><p align=center><b>%1</b> "
-"(Azonosító: 0x%2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"(Azonosító: 0x%2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Az Ön OpenPGP-s kulcsa - </p><p align=center><b>%1</b> (Azonosító: 0x%2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>Az Ön OpenPGP-s kulcsa - </p><p align=center><b>%1</b> (Azonosító: 0x%2)</"
+"p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os aláírási tanúsítványához tartozik</p><p align=center>"
-"<b>%1</b> (sorozatszám: number %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os aláírási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: number %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os titkosítási tanúsítványához tartozik</p>"
-"<p align=center><b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os titkosítási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>az S/MIME-os tanúsítványhoz</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p><p>az S/MIME-os "
+"tanúsítványhoz</p><p align=center><b>%1</b> (sorozatszám: %2)</p><p>%n nap "
+"múlva lejár.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os aláírási tanúsítványához tartozik</p><p align=center>"
-"<b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os aláírási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os titkosítási tanúsítványához tartozik</p>"
-"<p align=center><b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os titkosítási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az S/MIME-tanúsítványhoz tartozik</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p><p>, mely az S/"
+"MIME-tanúsítványhoz tartozik</p><p align=center><b>%1</b> (sorozatszám: %2)</"
+"p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Az Ön S/MIME-os aláírási tanúsítványa</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Az Ön S/MIME-os titkosítási tanúsítványa</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Az S/MIME-os tanúsítvány -</p><p align=center><b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>Az S/MIME-os tanúsítvány -</p><p align=center><b>%1</b> (sorozatszám: "
+"%2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4886,177 +4738,141 @@ msgstr "Egy S/MIME-os tanúsítvány rövidesen le fog járni"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Az Ön OpenPGP-s aláírási kulcsa</p><p align=center><b>%1</b> "
-"(Azonosító: 0x%2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>Az Ön OpenPGP-s aláírási kulcsa</p><p align=center><b>%1</b> (Azonosító: "
+"0x%2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Az Ön OpenPGP-s titkosítási kulcsa</p><p align=center><b>%1</b> "
-"(Azonosító: 0x%2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"(Azonosító: 0x%2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Az Ön OpenPGP-s kulcsa - </p><p align=center><b>%1</b> (Azonosító: 0x%2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>Az Ön OpenPGP-s kulcsa - </p><p align=center><b>%1</b> (Azonosító: 0x%2)</"
+"p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os aláírási tanúsítványához tartozik</p><p align=center>"
-"<b>%1</b> (sorozatszám: number %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os aláírási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: number %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os titkosítási tanúsítványához tartozik</p>"
-"<p align=center><b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os titkosítási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>az S/MIME-os tanúsítványhoz</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A gyökértanúsítvány</p><p align=center><b>%3</b></p><p>az S/MIME-os "
+"tanúsítványhoz</p><p align=center><b>%1</b> (sorozatszám: %2)</p><p>%n nap "
+"múlva lejár.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os aláírási tanúsítványához tartozik</p><p align=center>"
-"<b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os aláírási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az Ön S/MIME-os titkosítási tanúsítványához tartozik</p>"
-"<p align=center><b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p><p>, mely az Ön S/"
+"MIME-os titkosítási tanúsítványához tartozik</p><p align=center><b>%1</b> "
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p>"
-"<p>, mely az S/MIME-tanúsítványhoz tartozik</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>A köztes CA-tanúsítvány</p><p align=center><b>%3</b></p><p>, mely az S/"
+"MIME-tanúsítványhoz tartozik</p><p align=center><b>%1</b> (sorozatszám: %2)</"
+"p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Az Ön S/MIME-os aláírási tanúsítványa</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Az Ön S/MIME-os titkosítási tanúsítványa</p><p align=center><b>%1</b> "
-"(sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"(sorozatszám: %2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Az S/MIME-os tanúsítvány -</p><p align=center><b>%1</b> (sorozatszám: %2)</p>"
-"<p>%n nap múlva lejár.</p>"
+"<p>Az S/MIME-os tanúsítvány -</p><p align=center><b>%1</b> (sorozatszám: "
+"%2)</p><p>%n nap múlva lejár.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5068,15 +4884,17 @@ msgstr "Egy S/MIME-os tanúsítvány rövidesen le fog járni"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Legalább egy beállított OpenPGP-s titkosítási kulcs vagy S/MIME-os tanúsítvány "
-"nem használható titkosításra. Ellenőrizze az azonosítóhoz beállított "
-"titkosítási kulcsokat és tanúsítványokat az azonosító beállítóablakában.\n"
+"Legalább egy beállított OpenPGP-s titkosítási kulcs vagy S/MIME-os "
+"tanúsítvány nem használható titkosításra. Ellenőrizze az azonosítóhoz "
+"beállított titkosítási kulcsokat és tanúsítványokat az azonosító "
+"beállítóablakában.\n"
 "Ha kívánja, továbbléphet - ebben az esetben, ha szükség van a kulcsok "
 "használatára, a program meg fogja kérdezni, melyik kulcsokat szeretné "
 "kiválasztani."
@@ -5093,8 +4911,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Legalább egy beállított OpenPGP-s aláírási kulcs vagy S/MIME-os tanúsítvány nem "
-"használható aláírásra. Ellenőrizze az azonosítóhoz beállított aláírási "
+"Legalább egy beállított OpenPGP-s aláírási kulcs vagy S/MIME-os tanúsítvány "
+"nem használható aláírásra. Ellenőrizze az azonosítóhoz beállított aláírási "
 "kulcsokat és tanúsítványokat az azonosító beállítóablakában.\n"
 "Ha kívánja, továbbléphet - ebben az esetben, ha szükség van a kulcsok "
 "használatára, a program meg fogja kérdezni, melyik kulcsokat szeretné "
@@ -5108,10 +4926,10 @@ msgstr "Nem használható aláírási kulcsok"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "A címzetthez beállított titkosítási értékek alapján úgy tűnik, hogy legalább "
 "egy címzettnél a titkosítást OpenPGP-vel kell elvégezni,\n"
@@ -5124,27 +4942,28 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "A címzetthez beállított titkosítási értékek alapján úgy tűnik, hogy legalább "
 "egy címzettnél a titkosítást S/MIME-mal kell elvégezni,\n"
-"azonban nincs beállítva megbízható S/MIME-os titkosítási tanúsítvány ehhez az "
-"azonosítóhoz.\n"
-"Nem kötelező saját tanúsítvánnyal titkosított másolatot készíteni az üzenetből, "
-"de ebben az esetben Ön nem fogja tudni elolvasni a saját elküldött üzeneteit."
+"azonban nincs beállítva megbízható S/MIME-os titkosítási tanúsítvány ehhez "
+"az azonosítóhoz.\n"
+"Nem kötelező saját tanúsítvánnyal titkosított másolatot készíteni az "
+"üzenetből, de ebben az esetben Ön nem fogja tudni elolvasni a saját "
+"elküldött üzeneteit."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"A címzetthez beállított aláírási értékek alapján úgy tűnik, hogy legalább egy "
-"címzettnél az aláírást OpenPGP-vel kell elvégezni,\n"
+"A címzetthez beállított aláírási értékek alapján úgy tűnik, hogy legalább "
+"egy címzettnél az aláírást OpenPGP-vel kell elvégezni,\n"
 "azonban nincs beállítva megbízható OpenPGP-s aláírási tanúsítvány ehhez az "
 "azonosítóhoz."
 
@@ -5154,13 +4973,13 @@ msgstr "Nem kell OpenPGP-s aláírás"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"A címzetthez beállított aláírási értékek alapján úgy tűnik, hogy legalább egy "
-"címzettnél az aláírást S/MIME-mal kell elvégezni,\n"
+"A címzetthez beállított aláírási értékek alapján úgy tűnik, hogy legalább "
+"egy címzettnél az aláírást S/MIME-mal kell elvégezni,\n"
 "azonban nincs beállítva érvényes S/MIME-os aláírási tanúsítvány ehhez az "
 "azonosítóhoz."
 
@@ -5184,11 +5003,11 @@ msgstr "Nem lehet aláírni"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Nem választott ki titkosítási kulcsot a saját célra való titkosításhoz. A saját "
-"titkosított üzeneteinek másolatát nem fogja tudni dekódolni."
+"Nem választott ki titkosítási kulcsot a saját célra való titkosításhoz. A "
+"saját titkosított üzeneteinek másolatát nem fogja tudni dekódolni."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5204,16 +5023,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Nem választott ki titkosítási kulcsot az üzenet címzettjének, ezért az üzenet "
-"nem lesz titkosítva."
+"Nem választott ki titkosítási kulcsot az üzenet címzettjének, ezért az "
+"üzenet nem lesz titkosítva."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Egy címzetthez sem választott ki titkosítási kulcsot, ezért az üzenet nem lesz "
-"titkosítva."
+"Egy címzetthez sem választott ki titkosítási kulcsot, ezért az üzenet nem "
+"lesz titkosítva."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5224,16 +5043,16 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Az egyik címzetthez nem választott ki titkosítási kulcsot, ezért ha az üzenetet "
-"titkosítva küldi el, ez a címzett nem fogja tudni azt elolvasni."
+"Az egyik címzetthez nem választott ki titkosítási kulcsot, ezért ha az "
+"üzenetet titkosítva küldi el, ez a címzett nem fogja tudni azt elolvasni."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nem választott ki titkosítási kulcsot néhány címzetthez: ezek a személyek nem "
-"fogják tudni elolvasni az üzenetet, ha azt titkosítva küldi el."
+"Nem választott ki titkosítási kulcsot néhány címzetthez: ezek a személyek "
+"nem fogják tudni elolvasni az üzenetet, ha azt titkosítva küldi el."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5248,7 +5067,8 @@ msgid ""
 "\n"
 "Please re-select the certificate(s) which should be used for this recipient."
 msgstr ""
-"Valamilyen hiba történt a(z) \"%1\" címzetthez rendelt titkosítási kulcsokkal.\n"
+"Valamilyen hiba történt a(z) \"%1\" címzetthez rendelt titkosítási "
+"kulcsokkal.\n"
 "\n"
 "Válassza ki újból a címzettnél használni kívánt kulcso(ka)t."
 
@@ -5257,11 +5077,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Nem található érvényes és megbízható kulcs ehhez a címzetthez: \"%1\".\n"
 "\n"
@@ -5310,10 +5130,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritikus hiba: nem sikerült begyűjteni az üzeneteket: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Az üzenet hozzáadása nem sikerült:\n"
+msgid "Failed to add message:\n"
+msgstr "Az üzenet hozzáadása nem sikerült:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5358,8 +5176,8 @@ msgstr "Üzenetmozgatás - %3/%2 innen: %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Nem sikerült eltávolítani egy üzenetet a(z) <b>%1</b> postafiókból:"
-"<br>%2</qt>"
+"<qt>Nem sikerült eltávolítani egy üzenetet a(z) <b>%1</b> postafiókból:<br>"
+"%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5401,6 +5219,50 @@ msgstr "Kap&csolat nélküli IMAP"
 msgid "&Maildir mailbox"
 msgstr "Mail&dir-postafiók"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Az üzenet tárgyának beállítása"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Másolat küldése a megadott 'cím'-re"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Rejtett másolat küldése a 'cím'-re"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "A 'fejlécmező' hozzáadása az üzenethez"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Az üzenettörzs beolvasása 'fájl'-ból"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Az üzenet törzsének megadása"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Csatolás hozzáadása az üzenethez (a művelet megismételhető)"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Csak az új üzenetek ellenőrzése"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Csak az üzenetszerkesztő ablak megnyitása"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "A megadott üzenetfájl megtekintése"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Üzenet küldése az 'address' címre, az 'URL' című fájl csatolásával"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Levelek"
@@ -5444,9 +5306,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"A program létrehozza a szükséges csoportmunka-mappákat a(z) %1 mappa alatt. Ha "
-"ezt a lépést ki szeretné hagyni, kattintson a \"Nem\" gombra. Ebben az esetben "
-"az IMAP-os erőforrás le lesz tiltva."
+"A program létrehozza a szükséges csoportmunka-mappákat a(z) %1 mappa alatt. "
+"Ha ezt a lépést ki szeretné hagyni, kattintson a \"Nem\" gombra. Ebben az "
+"esetben az IMAP-os erőforrás le lesz tiltva."
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5459,14 +5321,14 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>A program az alábbi csoportmunka-mappákat találta itt: %1. A következő "
-"műveleteket kell rajtuk elvégezni: %2"
-"<br>Ha ki szeretné hagyni ezt a lépést, kattintson a \"Nem\" gombra. Ebben az "
-"esetben az IMAP-os erőforrás le lesz tiltva."
+"műveleteket kell rajtuk elvégezni: %2<br>Ha ki szeretné hagyni ezt a lépést, "
+"kattintson a \"Nem\" gombra. Ebben az esetben az IMAP-os erőforrás le lesz "
+"tiltva."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5513,11 +5375,11 @@ msgstr "Az URL-t a vágólapra másoltam."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt><b>%1</b> nevű fájl már létezik.<br>Felül szeretné írni?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Mentés fájlba"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Cse&re"
 
@@ -5534,9 +5396,10 @@ msgstr ""
 #: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
-"Az üzenet törlődött a mentési folyamat közben, a mentés ezért nem történt meg."
+"Az üzenet törlődött a mentési folyamat közben, a mentés ezért nem történt "
+"meg."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5556,11 +5419,11 @@ msgstr "A fájl nem tartalmaz üzenetet."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "A fájl több üzenetet tartalmaz. Csak az első lesz megjelenítve."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5570,102 +5433,102 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Üzenetszűrés"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Üzenetszűrés - %2 / %1"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Valószínűleg nincs elég szabad lemezterület."
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mozgatás ebbe a mappába"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Másolás ebbe a mappába"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr "Megsérült az IMAP-gyorsítótár a(z) %1 mappában. A másolás megszakad."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Üzenetek áthelyezése"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Üzenetek törlése"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL megnyitása..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Biztosan futtatni szeretné ezt: <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Végrehajtás"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nincs lementhető csatolás."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "A csatolások mentése"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "csatolas.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "csatolas.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Már létezik %1 nevű fájl. Felül szeretné írni?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Már létezik ilyen nevű fájl"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Felülírás"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Az üzenet %1 része titkosított. Meg szeretné tartani a titkosítást mentéskor?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Kérdés - KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "A titkosítás megőrzése"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Nem kell megőrizni"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5673,11 +5536,11 @@ msgstr ""
 "Az üzenet %1 része elektronikusan alá van írva. Meg szeretné tartani az "
 "aláírást mentéskor?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Az aláírás megőrzése"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5686,22 +5549,22 @@ msgstr ""
 "Nem sikerült írni a(z) %1 fájlba:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Nem sikerült írni a(z) %1 fájlba."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Ez az e-mail cím még nem szerepel a címjegyzékben. Először vegyen fel egy új "
 "bejegyzést a címjegyzékben, majd vegye fel a szükséges IM-címet (azonnali "
 "üzenetküldési címet) az üzenetküldő programjában."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5711,78 +5574,78 @@ msgstr ""
 " %1\n"
 ", ezért nem lehet meghatározni, ki legyen a csevegési partner."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"A Chiasmus modul nem támogatja az \"x-obtain-keys\" függvényt. Kérjük jelentse "
-"be ezt a hibát."
+"A Chiasmus modul nem támogatja az \"x-obtain-keys\" függvényt. Kérjük "
+"jelentse be ezt a hibát."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Hiba a Chiasmus modulban"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Nem várt visszatérési érték a Chiasmus modulban: az \"x-obtain-keys\" függvény "
-"nem adott vissza sztringlistát. Kérjük jelentse be ezt a hibát."
+"Nem várt visszatérési érték a Chiasmus modulban: az \"x-obtain-keys\" "
+"függvény nem adott vissza sztringlistát. Kérjük jelentse be ezt a hibát."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Nem található kulcs. Ellenőrizze, helyes-e a Chiasmus beállításainál megadott "
-"kulcsútvonal."
+"Nem található kulcs. Ellenőrizze, helyes-e a Chiasmus beállításainál "
+"megadott kulcsútvonal."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus-féle dekódolási kulcs kiválasztása"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"A Chiasmus modul nem tartalmaz \"x-decrypt\" függvényt. Kérjük jelentse be ezt "
-"a hibát."
+"A Chiasmus modul nem tartalmaz \"x-decrypt\" függvényt. Kérjük jelentse be "
+"ezt a hibát."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Az \"x-decrypt\" függvény nem fogadja el a várt paramétereket. Kérjük jelentse "
-"be ezt a hibát."
+"Az \"x-decrypt\" függvény nem fogadja el a várt paramétereket. Kérjük "
+"jelentse be ezt a hibát."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus-féle dekódolási hiba"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Nem várt visszaadott érték a Chiasmus modulban: az \"x-decrypt\" függvény nem "
-"bájttömböt adott vissza. Kérjük jelentse be a hibát."
+"Nem várt visszaadott érték a Chiasmus modulban: az \"x-decrypt\" függvény "
+"nem bájttömböt adott vissza. Kérjük jelentse be a hibát."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Levelek"
@@ -5881,7 +5744,7 @@ msgstr "Méret"
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Tömörítés"
 
@@ -5893,7 +5756,7 @@ msgstr "Titkosítás"
 msgid "Sign"
 msgstr "Elektronikus aláírás"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "A csatolás neve:"
 
@@ -5915,7 +5778,8 @@ msgstr "Elsődleges címzettek"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>Az itt beírt címzettek mindegyike kap egy példányt az üzenetből.</qt>"
 
@@ -5926,15 +5790,15 @@ msgstr "További címzettek"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Az ide beírt e-mail címek mindegyikére küld a program másolatot az "
 "üzenetből. Technikailag egyformán kapják meg a címzettek és a másolati "
 "címzettek az üzenetet, a másolati címzéssel azonban a küldő azt jelzi a "
-"címzetteknek, hogy ők csak tájékoztatási célból kapják az üzenetet, nem ők a fő "
-"címzettek.</qt>"
+"címzetteknek, hogy ők csak tájékoztatási célból kapják az üzenetet, nem ők a "
+"fő címzettek.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5942,12 +5806,11 @@ msgstr "Rejtett címzettek"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Hasonló a <b>Másolat (CC):</b> mezőhöz, de a többi címzett nem fogja tudni, "
-"ki kapott rejtett másolatot.</qt>"
+"<qt>Hasonló a <b>Másolat (CC):</b> mezőhöz, de a többi címzett nem fogja "
+"tudni, ki kapott rejtett másolatot.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -5957,7 +5820,7 @@ msgstr "&Levél küldése"
 msgid "&Send Mail Via"
 msgstr "&Levél küldése ezzel"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Kül&dés később"
@@ -6022,8 +5885,7 @@ msgstr "Idézésjelző eltá&volítása"
 msgid "Cl&ean Spaces"
 msgstr "A s&zóközök normalizálása"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Állandó szé&lességű betűtípus"
@@ -6166,31 +6028,31 @@ msgstr "Tit&kosítási üzenetformátum"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Felsorolás (ponttal)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Felsorolás (körrel)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Felsorolás (négyzettel)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Rendezett felsorolás (számmal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Rendezett felsorolás (kisbetűvel)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Rendezett felsorolás (nagybetűvel)"
 
@@ -6293,8 +6155,8 @@ msgstr "A szerkesztő bezárása"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Az üzenetben hivatkozás található egy csatolt fájlra, de valójában egy fájl "
@@ -6305,49 +6167,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Emlékeztető a csatolásokra"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Elküldés a m&ostani állapotban"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Nem ismerhető fel a csatolás helye (%1).</p>"
-"<p>Fájl csatolásakor meg kell adni a teljes elérési utat.</p></qt>"
+"<qt><p>Nem ismerhető fel a csatolás helye (%1).</p><p>Fájl csatolásakor meg "
+"kell adni a teljes elérési utat.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Fájl csatolása"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Cs&atolás"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Fájl beszúrása"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Fájl beszúrása"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hiba történt a kulcs (kezelőmodulból történő) exportálása közben: </p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Hiba történt a kulcs (kezelőmodulból történő) exportálása közben: </"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6386,20 +6248,35 @@ msgid ""
 "View"
 msgstr "Megtekintés"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Szerkesztés..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Szerkesztés..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Mentés m&int..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Tulajdonságok"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Csatolás hozzáadása..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Nem sikerült betömöríteni a fájlt."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6407,77 +6284,74 @@ msgstr ""
 "A tömörített üzenet nagyobb, mint az eredeti. Inkább az eredetit szeretné "
 "megtartani?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Megtartás"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Nem sikerült kitömöríteni a fájlt."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "A csatolás mentése mint"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Hozzáadás szövegként"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Hozzáadás csatolásként"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Be&illesztés csatolásként"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "névtelen"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Azt kérte, hogy a saját kulccsal történjen a saját célú másolatok készítése, "
-"azonban a kiválasztott azonosítóban nincs kijelölve erre alkalmas OpenPGP-s "
-"vagy S/MIME-os titkosítási kulcs.</p>"
-"<p>Az azonosító beállításainál válassza ki a kívánt kulcsokat.</p></qt>"
+"<qt><p>Azt kérte, hogy a saját kulccsal történjen a saját célú másolatok "
+"készítése, azonban a kiválasztott azonosítóban nincs kijelölve erre alkalmas "
+"OpenPGP-s vagy S/MIME-os titkosítási kulcs.</p><p>Az azonosító "
+"beállításainál válassza ki a kívánt kulcsokat.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Nem definiált titkosítási kulcs"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ha az üzenetet elektronikus aláírással szeretné ellátni, először meg kell "
-"adni egy OpenPGP- vagy S/MIME-kulcsot, mellyel az aláírás elvégezhető.</p>"
-"<p>Az azonosító beállításainál lehet kiválasztani a kívánt kulcsot.</p></qt>"
+"<qt><p>Ha az üzenetet elektronikus aláírással szeretné ellátni, először meg "
+"kell adni egy OpenPGP- vagy S/MIME-kulcsot, mellyel az aláírás elvégezhető.</"
+"p><p>Az azonosító beállításainál lehet kiválasztani a kívánt kulcsot.</p></"
+"qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nem definiált aláírási kulcs"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6485,169 +6359,166 @@ msgstr ""
 "A KMail jelenleg offline módban van, az üzenetek a Kimenő üzenetek mappában "
 "várakoznak, amíg online állapotú nem lesz."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Kötelező beírni a saját e-mail címet a Feladó: mezőbe. Erősen ajánlott minden "
-"azonosítónál beírni a saját e-mail címet, hogy ne kelljen minden üzenetnél "
-"egyesével beírni."
+"Kötelező beírni a saját e-mail címet a Feladó: mezőbe. Erősen ajánlott "
+"minden azonosítónál beírni a saját e-mail címet, hogy ne kelljen minden "
+"üzenetnél egyesével beírni."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Legalább egy címzettet meg kell adni, vagy a Címzett, vagy a Másolat (CC), vagy "
-"a Rejtett másolat (BCC) mezőben."
+"Legalább egy címzettet meg kell adni, vagy a Címzett, vagy a Másolat (CC), "
+"vagy a Rejtett másolat (BCC) mezőben."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Nincs megadva címzett. El szeretné így küldeni az üzenetet?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Nincs megadva címzett"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nem adott meg tárgyat. El szeretné így küldeni az üzenetet?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nincs megadva tárgy"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Elküldés í&gy"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "I&nkább megadom a tárgyat"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "A HTML-kód meg&tartása, aláírás és titkosítás nélkül"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "A HTML-kód megtartása, titk&osítás nélkül"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "A HTML-kód megta&rtása, a&láírás nélkül"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Aláírás és titkosítás (a HTML-kód törlése)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Titkosítás (a HTML-kód törlése)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Aláírás (a HTML-kód törlése)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>HTML-es üzeneteket nem lehet közvetlenül, beágyazva aláírni vagy "
-"titkosítani.</p>"
-"<p>El szeretné távolítani a HTML-kódok?</p></qt>"
+"<qt><p>HTML-es üzeneteket nem lehet közvetlenül, beágyazva aláírni vagy "
+"titkosítani.</p><p>El szeretné távolítani a HTML-kódok?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Az üzenet aláírása és titkosítása?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"A(z) \"%1\" azonosítóhoz tartozó egyéni piszkozatok vagy sablonok mappája nem "
-"létezik. Helyette az alapértelmezett piszkozatok vagy sablonok mappát használja "
-"a program."
+"A(z) \"%1\" azonosítóhoz tartozó egyéni piszkozatok vagy sablonok mappája "
+"nem létezik. Helyette az alapértelmezett piszkozatok vagy sablonok mappát "
+"használja a program."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 "Adja meg a kívánt küldési módot a beállításoknál, majd próbálkozzon újra."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Üzenet küldése..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Megerősítés küldése"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Kül&dés most"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Nincsenek címzettek"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "További címzettek"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Helyesírás-ellenőrzés: bekapcsolva"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Helyesírás-ellenőrzés: kikapcsolva"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " A helyesírás-ellenőrzés félbeszakadt."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " A helyesírás-ellenőrzés leállt."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " A helyesírás-ellenőrzés befejeződött."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Helyesírás-ellenőrző"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Először állítson be egy titkosítási modult a Chiasmushoz.\n"
 "A beállítóablak Adatbiztonság oldalán állítható be, a Titkosítási modulok "
 "lapon."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6655,34 +6526,34 @@ msgstr ""
 "A libkleopatra Chiasmus-támogatás nélkül lett lefordítva. Célszerű "
 "újrafordítani a libkleopatrát a --enable-chiasmus argumentummal."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Nincs beállítva Chiasmus-modul"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nem találhatók Chiasmus-kulcsok"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus-féle titkosítási kulcs kiválasztása"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Az üzenet aláírója: %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Az üzenet aláírója: %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP-s üzenet - titkosítva"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Üzenet - a tárgy: "
@@ -6732,11 +6603,12 @@ msgstr "Helyesírás-ellenőrzés - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Az Ispell/Aspell indítása nem sikerült.\n"
-"Ellenőrizze az Ispell/Aspell beállításait, és hogy szerepel-e az elérési útban."
+"Ellenőrizze az Ispell/Aspell beállításait, és hogy szerepel-e az elérési "
+"útban."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6770,13 +6642,11 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Ismeretlen szűrési parancs (<b>%1</b>)"
-"<br>a(z) <b>%2</b> szűrési szabályban."
-"<br>Figyelmen kívül lesz hagyva.</qt>"
+"<qt>Ismeretlen szűrési parancs (<b>%1</b>)<br>a(z) <b>%2</b> szűrési "
+"szabályban.<br>Figyelmen kívül lesz hagyva.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6996,165 +6866,134 @@ msgstr "Hanglejátszás"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Itt láthatók a létrehozott szűrők (a feldolgozásuk fentről lefelé haladva "
-"történik).</p>"
-"<p>Egy szűrő módosításához kattintson rá a szűrő nevére, majd használja a jobb "
-"oldali vezérlőelemeket.</p></qt>"
+"<qt><p>Itt láthatók a létrehozott szűrők (a feldolgozásuk fentről lefelé "
+"haladva történik).</p><p>Egy szűrő módosításához kattintson rá a szűrő "
+"nevére, majd használja a jobb oldali vezérlőelemeket.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Új szűrő létrehozásához kattintson erre a gombra.</p>"
-"<p>Az új szűrő a most kijelölt elé fog kerülni, de a sorrend utólag "
-"megváltoztatható.</p>"
-"<p>Ha véletlenül nyomta meg ezt a gombot, akkor a létrehozott üres szűrőt "
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Új szűrő létrehozásához kattintson erre a gombra.</p><p>Az új szűrő a "
+"most kijelölt elé fog kerülni, de a sorrend utólag megváltoztatható.</"
+"p><p>Ha véletlenül nyomta meg ezt a gombot, akkor a létrehozott üres szűrőt "
 "távolítsa el a jobb oldali <em>Törlés</em> gomb megnyomásával.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Szűrő másolásához kattintson erre a gombra.</p>"
-"<p>Ha véletlenül nyomta meg ezt a gombot, akkor a létrehozott üres szűrőt "
-"távolítsa el a jobb oldali <em>Törlés</em> gomb megnyomásával.</p></qt>"
+"<qt><p>Szűrő másolásához kattintson erre a gombra.</p><p>Ha véletlenül "
+"nyomta meg ezt a gombot, akkor a létrehozott üres szűrőt távolítsa el a jobb "
+"oldali <em>Törlés</em> gomb megnyomásával.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kattintson erre a gombra a fenti listában kijelölt szűrő <em>törléséhez</em>"
-".</p>"
-"<p>A törölt szűrők véglegesen elvesznek (nem nyerhetők vissza). Ha félbe "
-"szeretné szakítani a műveletet, a <em>Mégsem</em> gomb megnyomásával lépjen ki "
-"a párbeszédablakból.</p></qt>"
+"<qt><p>Kattintson erre a gombra a fenti listában kijelölt szűrő "
+"<em>törléséhez</em>.</p><p>A törölt szűrők véglegesen elvesznek (nem "
+"nyerhetők vissza). Ha félbe szeretné szakítani a műveletet, a <em>Mégsem</"
+"em> gomb megnyomásával lépjen ki a párbeszédablakból.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>felfelé</em> "
-"szeretné mozgatni a listában.</p>"
-"<p>A szűrők sorrendje nem közömbös, mert a megadott sorrendben dolgozza fel "
-"őket a program, először a legelsővel próbálkozik, utána sorban a többivel.</p>"
-"</qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
+msgstr ""
+"<qt><p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>felfelé</em> "
+"szeretné mozgatni a listában.</p><p>A szűrők sorrendje nem közömbös, mert a "
+"megadott sorrendben dolgozza fel őket a program, először a legelsővel "
+"próbálkozik, utána sorban a többivel.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>felfelé</em> "
-"szeretné mozgatni a listában.</p>"
-"<p>A szűrők sorrendje nem közömbös, mert a megadott sorrendben dolgozza fel "
-"őket a program, először a legelsővel próbálkozik, utána sorban a többivel.</p>"
-"<p>Ha véletlenül nyomta meg ezt a gombot, akkor a művelet visszavonásához "
-"kattintson a <em>Lefelé</em> gombra.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>felfelé</em> "
+"szeretné mozgatni a listában.</p><p>A szűrők sorrendje nem közömbös, mert a "
+"megadott sorrendben dolgozza fel őket a program, először a legelsővel "
+"próbálkozik, utána sorban a többivel.</p><p>Ha véletlenül nyomta meg ezt a "
+"gombot, akkor a művelet visszavonásához kattintson a <em>Lefelé</em> gombra."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>lefelé</em> "
-"szeretné mozgatni a listában.</p>"
-"<p>A szűrők sorrendje nem közömbös, mert a megadott sorrendben dolgozza fel "
-"őket a program, először a legelsővel próbálkozik, utána sorban a többivel.</p>"
-"<p>Ha véletlenül nyomta meg ezt a gombot, akkor a művelet visszavonásához "
-"kattintson a <em>Felfelé</em> gombra.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>lefelé</em> "
+"szeretné mozgatni a listában.</p><p>A szűrők sorrendje nem közömbös, mert a "
+"megadott sorrendben dolgozza fel őket a program, először a legelsővel "
+"próbálkozik, utána sorban a többivel.</p><p>Ha véletlenül nyomta meg ezt a "
+"gombot, akkor a művelet visszavonásához kattintson a <em>Felfelé</em> gombra."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>lefelé</em> "
-"szeretné mozgatni a listában.</p>"
-"<p>A szűrők sorrendje nem közömbös, mert a megadott sorrendben dolgozza fel "
-"őket a program, először a legelsővel próbálkozik, utána sorban a többivel.</p>"
-"</qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
+msgstr ""
+"<qt><p>Kattintson erre a gombra, ha a kijelölt szűrőt <em>lefelé</em> "
+"szeretné mozgatni a listában.</p><p>A szűrők sorrendje nem közömbös, mert a "
+"megadott sorrendben dolgozza fel őket a program, először a legelsővel "
+"próbálkozik, utána sorban a többivel.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kattintson erre a gombra a kijelölt szűrő átnevezéséhez.</p>"
-"<p>A szűrők elnevezése automatikusan megtörténik, ha a \"&lt;\" jellel "
-"kezdődnek.</p>"
-"<p>Ha véletlenül átnevezett egy szűrőt, és vissza szeretné kapni az eredeti "
-"(automatikus) elnevezést, kattintson erre a gombra, és nyomja meg a <em>"
-"Törlés</em>, majd az <em>OK</em> gombot a megjelenő párbeszédablakban.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Kattintson erre a gombra a kijelölt szűrő átnevezéséhez.</p><p>A "
+"szűrők elnevezése automatikusan megtörténik, ha a \"&lt;\" jellel kezdődnek."
+"</p><p>Ha véletlenül átnevezett egy szűrőt, és vissza szeretné kapni az "
+"eredeti (automatikus) elnevezést, kattintson erre a gombra, és nyomja meg a "
+"<em>Törlés</em>, majd az <em>OK</em> gombot a megjelenő párbeszédablakban.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jelölje be ezt az opciót, ha azt szeretné, hogy a megerősítést kérő ablakok "
-"mindig jelenjenek meg.</p>"
-"<p>Ez például akkor hasznos, ha az egyik szabálycsoporttal későbbi letöltésre "
-"jelölt ki üzeneteket. Ha nem lenne ez az opció, akkor ezek az üzenetek csak "
-"akkor töltődnének le, ha más, nagyméretű üzenetek is várakoznának letöltésre, "
-"vagy ha megváltoztatná a szabálycsoportban a kijelölési szabályt.</p></qt>"
+"<qt><p>Jelölje be ezt az opciót, ha azt szeretné, hogy a megerősítést kérő "
+"ablakok mindig jelenjenek meg.</p><p>Ez például akkor hasznos, ha az egyik "
+"szabálycsoporttal későbbi letöltésre jelölt ki üzeneteket. Ha nem lenne ez "
+"az opció, akkor ezek az üzenetek csak akkor töltődnének le, ha más, "
+"nagyméretű üzenetek is várakoznának letöltésre, vagy ha megváltoztatná a "
+"szabálycsoportban a kijelölési szabályt.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7164,6 +7003,16 @@ msgstr "POP3-szűrési szabályok"
 msgid "Filter Rules"
 msgstr "Szűrési szabályok"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importálás"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importálás"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "A rendelkezésre álló szűrők"
@@ -7246,6 +7095,11 @@ msgstr "A szűrő hozzáadása az eszköztárhoz"
 msgid "Icon for this filter:"
 msgstr "A szűrő ikonja:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Cím"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Fel"
@@ -7254,16 +7108,29 @@ msgstr "Fel"
 msgid "Down"
 msgstr "Le"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Átnevezés..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Új"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Más&olás ide"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Törölt"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7272,8 +7139,8 @@ msgstr "Hangfájl kiválasztása"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Legalább egy szűrő online IMAP-os postafiókban levő mappára hivatkozik. Az "
 "ilyen szűrők csak kézi szűrésnél és bejövő online IMAP-os üzenetekre lesznek "
@@ -7355,28 +7222,25 @@ msgstr "Hibakeresés az IMAP-gyorstárban"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Gyakori hibák az IMAP-gyorsítótárban.</b></p>"
-"<p>Ha nem sikerül szinkronizálni egy IMAP-os mappa tartalmát, először próbálja "
-"újraépíteni az indexfájlt. Ez eltarthat egy darabig, de így gyakran "
-"megszüntethetők a problémák.</p>"
-"<p>Ha ez nem segít, próbálja felfrissíteni az IMAP-os gyorsítótárat. Ilyenkor "
-"azonban elvesznek a mappa helyi módosításai (az almappáké is).</p>"
+"<p><b>Gyakori hibák az IMAP-gyorsítótárban.</b></p><p>Ha nem sikerül "
+"szinkronizálni egy IMAP-os mappa tartalmát, először próbálja újraépíteni az "
+"indexfájlt. Ez eltarthat egy darabig, de így gyakran megszüntethetők a "
+"problémák.</p><p>Ha ez nem segít, próbálja felfrissíteni az IMAP-os "
+"gyorsítótárat. Ilyenkor azonban elvesznek a mappa helyi módosításai (az "
+"almappáké is).</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7407,13 +7271,13 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Nem sikerült beolvasni a(z) %1 mappa üzenetazonosítóit tartalmazó fájlt. A fájl "
-"hiibás, vagy a jogosultság nem megfelelő."
+"Nem sikerült beolvasni a(z) %1 mappa üzenetazonosítóit tartalmazó fájlt. A "
+"fájl hiibás, vagy a jogosultság nem megfelelő."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Nem sikerült írni a(z) %1 mappa üzenetazonosítóit tartalmazó fájlba. "
 "Valószínűleg nem megfelelő a jogosultság."
@@ -7437,8 +7301,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Biztosan fel szeretné frissíteni a(z) %1 mappa IMAP-gyorstárat (az almappákkal "
-"együtt)?\n"
+"Biztosan fel szeretné frissíteni a(z) %1 mappa IMAP-gyorstárat (az "
+"almappákkal együtt)?\n"
 "Ennek hatására a mappa helyi példányában tett módosítások elvesznek."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7455,8 +7319,8 @@ msgstr "A mappához tartozó index újra lett építve."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "A(z) %1 mappa nem szinkronizálási alapállapotban van (az állapot: %2). "
 "Alapállapotba szeretné hozni, majd végre szeretné hajtani a szinkronizálást?"
@@ -7584,15 +7448,11 @@ msgstr "Almappák létrehozása a kiszolgálón"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A(z) <b>%1</b> mappában található üzenetek törlődtek a kiszolgálóról. "
-"Törölni szeretné a helyi másolatokat is?"
-"<br>Az üzenetazonosítók: %2</p></qt>"
+"<qt><p>A(z) <b>%1</b> mappában található üzenetek törlődtek a kiszolgálóról. "
+"Törölni szeretné a helyi másolatokat is?<br>Az üzenetazonosítók: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7613,12 +7473,10 @@ msgstr "Mappák letöltése a(z) %1 névtérhez"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Úgy tűnik, hogy a(z) <b>%1</b> mappa törölve lett. Törölni szeretné a "
+"<qt><p>Úgy tűnik, hogy a(z) <b>%1</b> mappa törölve lett. Törölni szeretné a "
 "kiszolgálón is?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7627,8 +7485,8 @@ msgstr "A művelet félbeszakadt"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "A(z) %1 IMAP-kiszolgáló nem támogatja IMAP-os megjegyzések használatát. Az "
 "XML-es tároló nem használható ezen a kiszolgálón. Kérem módosítsa a KMail "
@@ -7636,8 +7494,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "A(z) %1 IMAP-kiszolgáló nem támogatja IMAP-os megjegyzések használatát. Az "
 "XML-es tároló nem használható ezen a kiszolgálón. Kérem módosítsa a KMail "
@@ -7654,16 +7512,15 @@ msgstr "Helyreállított elemek"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Új üzenetek vannak a mappában (<b>%1</b>), melyek még nincsenek feltöltve a "
-"kiszolgálóra. Nincs megfelelő jogosultsága a mappákhoz a feltöltés "
-"elvégzéséhez.</p>"
-"<p>Ezek az üzenetek át lesznek mozgatva a(z) <b>%2</b> "
+"<p>Új üzenetek vannak a mappában (<b>%1</b>), melyek még nincsenek feltöltve "
+"a kiszolgálóra. Nincs megfelelő jogosultsága a mappákhoz a feltöltés "
+"elvégzéséhez.</p><p>Ezek az üzenetek át lesznek mozgatva a(z) <b>%2</b> "
 "mappába az adatvesztés elkerülése érdekében.</p>"
 
 #: kmfoldercachedimap.cpp:3123
@@ -7673,20 +7530,25 @@ msgstr "Nincs megfelelő hozzáférési jogosultság"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Új üzenetek vannak a mappában (%1), melyek még nincsenek feltöltve a "
 "kiszolgálóra, de úgy tűnik, nincs megfelelő jogosultsága a mappákhoz a "
 "feltöltés elvégzéséhez. Kérje meg a rendszergazdát, hogy engedélyezze az új "
-"üzenetek feltöltését vagy mozgassa el őket a mappából.</p> "
-"<p>Át szeretné most mozgatni az üzeneteket egy másik mappába?</p>"
+"üzenetek feltöltését vagy mozgassa el őket a mappából.</p> <p>Át szeretné "
+"most mozgatni az üzeneteket egy másik mappába?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Áthelyezés ide:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Nem kell elmozgatni"
 
@@ -7698,8 +7560,7 @@ msgstr "Üzenetek átmozgatása egy mappába"
 msgid "Permissions (ACL)"
 msgstr "Jogosultságok (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Általános"
@@ -7723,8 +7584,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Egyéni ikonok &használata"
@@ -7743,24 +7603,21 @@ msgstr "Értesítés, ha új vagy olvasatlan üzenet van a mappában"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ha ez az opció be van jelölve, értesítést kap a mappába érkező új és "
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Ha ez az opció be van jelölve, értesítést kap a mappába érkező új és "
 "olvasatlan üzenetekről. Továbbá, ha a következő/előző, olvasatlan üzenteket "
-"tartalmazó mappára lép, ide fog jutni.</p>"
-"<p>Ne jelölje be az opciót, ha nem kér értesítést a mappa új és olvasatlan "
-"üzeneteiről és ha át szeretné ugrani a mappát a következő/előző, olvasatlan "
-"üzeneteket tartalmazó mappa keresésekor. Így például ki lehet hagyni az új és "
-"olvasatlan üzeneteket a törölt és kéretlen üzeneteket tartalmazó mappákban.</p>"
-"</qt>"
+"tartalmazó mappára lép, ide fog jutni.</p><p>Ne jelölje be az opciót, ha nem "
+"kér értesítést a mappa új és olvasatlan üzeneteiről és ha át szeretné ugrani "
+"a mappát a következő/előző, olvasatlan üzeneteket tartalmazó mappa "
+"keresésekor. Így például ki lehet hagyni az új és olvasatlan üzeneteket a "
+"törölt és kéretlen üzeneteket tartalmazó mappákban.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7772,9 +7629,9 @@ msgstr "A válaszok megőrzése ebben a mappában"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Jelölje be ezt az opciót, ha azt szeretné, hogy az ebbe a mappába érkező "
 "üzenetekre adott válaszok másolata ne az alapértelmezett Elküldött üzenetek "
@@ -7788,17 +7645,21 @@ msgstr "Feladó/címzett oszlop megjelenítése az üzenetlistában"
 msgid "Sho&w column:"
 msgstr "Oszlo&p megjelenítése:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Beállítás alapértelmezésként"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Feladó"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Címzett"
@@ -7809,16 +7670,16 @@ msgstr "A feladó a&zonosítója:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Válassza ki, mely azonosítót kell használni ebben a mappában új levél írásakor "
-"vagy válasz írásakor. Tehát ha valamelyik munkamappában van, akkor a KMail a "
-"megfelelő e-mail címet, aláírást és aláírási/titkosítási kulcsot tudja "
-"automatikusan használni. Az azonosítókat a fő beállítóablakban lehet "
+"Válassza ki, mely azonosítót kell használni ebben a mappában új levél "
+"írásakor vagy válasz írásakor. Tehát ha valamelyik munkamappában van, akkor "
+"a KMail a megfelelő e-mail címet, aláírást és aláírási/titkosítási kulcsot "
+"tudja automatikusan használni. Az azonosítókat a fő beállítóablakban lehet "
 "beállítani. (Beállítások -> A KMail beállításai)"
 
 #: kmfolderdia.cpp:500
@@ -7837,25 +7698,26 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Ez határozza meg, hogy a mappához hozzáférő felhasználók közül ki kapjon "
-"\"foglaltsági\" jelzéseket ki kapja meg a eseményekre és feladatokra vonatkozó "
-"emlékeztetőket. Ez a beállítás csak naptár- és feladatmappákra érvényes "
-"(feladatoknál csak az emlékeztetőkre).\n"
+"\"foglaltsági\" jelzéseket ki kapja meg a eseményekre és feladatokra "
+"vonatkozó emlékeztetőket. Ez a beállítás csak naptár- és feladatmappákra "
+"érvényes (feladatoknál csak az emlékeztetőkre).\n"
 "\n"
 "Egy példa: ha egy főnök és a titkárnője közösen ér el egy mappát, akkor a "
-"foglaltságoknak csak a főnöknél kell megjelenniük, ezért \"Adminisztrátorok\" "
-"beállítás megfelel, mert a titkárnőnek nincs ilyen joga.\n"
-"Másrészt ha egy munkacsoport közös naptármappát használ a közös megbeszélések "
-"követésére, akkor minden résztvevőnél kezelni kell a foglaltsági listákat.\n"
-"Vállalati szintű eseményeket bejelentő mappánál \"Senki\" beállítás kell, mert "
-"nem tudni, ki fog résztvenni az eseményeken."
+"foglaltságoknak csak a főnöknél kell megjelenniük, ezért \"Adminisztrátorok"
+"\" beállítás megfelel, mert a titkárnőnek nincs ilyen joga.\n"
+"Másrészt ha egy munkacsoport közös naptármappát használ a közös "
+"megbeszélések követésére, akkor minden résztvevőnél kezelni kell a "
+"foglaltsági listákat.\n"
+"Vállalati szintű eseményeket bejelentő mappánál \"Senki\" beállítás kell, "
+"mert nem tudni, ki fog résztvenni az eseményeken."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7886,23 +7748,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Ezt a mappát állította be a csoportmunka-funkciók alapmappájának, és azt is "
 "kérte, hogy a csoportmunka-mappák maradjanak rejtve. Ennek következtében a "
 "mappa el fog tűnni, miután bezárta ezt a beállítóablakot. Ha el szeretné "
-"távolítani a mappát, először kapcsolja ki a csoportmunka-mappák rejtettségét, "
-"hogy a mappák láthatóvá váljanak."
+"távolítani a mappát, először kapcsolja ki a csoportmunka-mappák "
+"rejtettségét, hogy a mappák láthatóvá váljanak."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7971,7 +7833,8 @@ msgstr "Hiba történt a mappajellemzők letöltésekor."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "A(z) '%1' üzenetindexet a KMail egy ismeretlen verziója (%2) készítette.\n"
 "Az index újragenerálható a mappa tartalma alapján, de néhány állapotjelző "
@@ -8000,11 +7863,11 @@ msgstr "Hiba történt %1 megnyitásakor: a mappa nem található."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Hiba történt %1 megnyitásakor. A mappa nem egy érvényes maildir mappa vagy nem "
-"rendelkezik a szükséges jogosultságokkal."
+"Hiba történt %1 megnyitásakor. A mappa nem egy érvényes maildir mappa vagy "
+"nem rendelkezik a szükséges jogosultságokkal."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8023,8 +7886,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: a program váratlanul kilépett, hogy megakadályozza az "
-"adatvesztést."
+"KMFolderMaildir::addMsg: a program váratlanul kilépett, hogy megakadályozza "
+"az adatvesztést."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8049,22 +7912,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A(z) '%2' mappa indexe valószínűleg nincs szinkronban az adatokkal. Az index "
-"újra lesz generálva, hogy biztosan ne történhessen adatvesztés. Néhány korábban "
-"már törölt üzenet újból megjelenhet és az üzenetjellemzők legutóbbi változásai "
-"is elveszhetnek.</p>"
-"<p>Olvassa el az erre vonatkozó szakaszt a <a href=\"%1\">"
-"KMail kézikönyv GYIK részében</a>, ha tudni szeretné, hogyan lehet ezt a "
-"mostani hibajelenséget megelőzni.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>A(z) '%2' mappa indexe valószínűleg nincs szinkronban az adatokkal. "
+"Az index újra lesz generálva, hogy biztosan ne történhessen adatvesztés. "
+"Néhány korábban már törölt üzenet újból megjelenhet és az üzenetjellemzők "
+"legutóbbi változásai is elveszhetnek.</p><p>Olvassa el az erre vonatkozó "
+"szakaszt a <a href=\"%1\">KMail kézikönyv GYIK részében</a>, ha tudni "
+"szeretné, hogyan lehet ezt a mostani hibajelenséget megelőzni.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8125,7 +7984,7 @@ msgstr ""
 "'%1' valószínűleg nem könyvtár.\n"
 "Kérem távolítsa el a fájlt."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8133,7 +7992,7 @@ msgstr ""
 "A(z) '%1' mappa jogosultságai nem megfelelőek.\n"
 "Ellenőrizze, hogy a mappa tartalma valóban olvasható és módosítható-e."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8144,8 +8003,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8153,7 +8012,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Nem sikerült létrehozni a mappát"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8254,13 +8113,13 @@ msgstr "&Hibakeresés az IMAP-gyorstárban..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Nem sikerült létrehozni a(z) <b>%1</b> mappát a kiszolgálón, mert nincs "
-"hozzá jogosultság. Kérje meg a kiszolgáló üzemeltetőjét, hogy biztosítsa Önnek "
-"a megfelelő jogosultságot.</qt> "
+"hozzá jogosultság. Kérje meg a kiszolgáló üzemeltetőjét, hogy biztosítsa "
+"Önnek a megfelelő jogosultságot.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8277,8 +8136,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Nem sikerült átmásolni vagy átmozgatni ide a(z) <b>%1</b> "
-"mappát, mert már létezik ilyen nevű mappa.</qt>"
+"<qt>Nem sikerült átmásolni vagy átmozgatni ide a(z) <b>%1</b> mappát, mert "
+"már létezik ilyen nevű mappa.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -8394,13 +8253,13 @@ msgstr "A(z) %1 mappa csak olvasható."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Biztosan törölni szeretné a kijelölt %n üzenetet?"
-"<br>A törölt üzeneteket nem lehet később visszanyerni!</qt>"
+"<qt>Biztosan törölni szeretné a kijelölt %n üzenetet?<br>A törölt üzeneteket "
+"nem lehet később visszanyerni!</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8452,134 +8311,132 @@ msgstr ""
 "Nem sikerült módosítani: %1\n"
 "(Talán nincs elég hely az eszközön?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Tanúsítványaláírási kérés"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
-"Kérjük hozzon létre egy tanúsítványt a csatolt fájlból és küldje azt vissza a "
-"feladónak."
+"Kérjük hozzon létre egy tanúsítványt a csatolt fájlból és küldje azt vissza "
+"a feladónak."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "A KMail offline módba vált, minden hálózati adatátvitel fel lesz függesztve"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "A KMail online módba vált, a hálózati adatátvitel folytatódhat"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "A KMail jelenleg offline módban van, mit szeretne tenni?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Online módba váltás"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Offline módban maradjon"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nincs írási/olvasási jogosultsága a beérkezett üzenetek mappához."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Kimenő üzenetek"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nincs írási/olvasási jogosultsága a kimenő üzenetek mappához."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Elküldött üzenetek"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Nincs írási-olvasási jogosultsága az elküldött üzenetek mappához."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Törölt üzenetek"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nincs írási-olvasási joga a törölt üzenetek mappájához."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Piszkozatok"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nincs írási-olvasási jogosultsága a piszkozatok mappájához."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "sablonok"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nincs írási-olvasási joga a sablonok mappájához."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Utolsó keresés"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Már létezik ez a mappa: <i>%4</i>. A(z) %1 most itt tárolja az üzeneteket: "
-"<i>%5</i>. "
-"<p>A(z) %2 át tudja mozgatni <i>%6<i> tartalmát ebbe a mappába, de így az "
-"azonos nevű fájlok felülíródhatnak itt: <i>%7</i>."
+"<qt>Már létezik ez a mappa: <i>%4</i>. A(z) %1 most itt tárolja az "
+"üzeneteket: <i>%5</i>. <p>A(z) %2 át tudja mozgatni <i>%6<i> tartalmát ebbe "
+"a mappába, de így az azonos nevű fájlok felülíródhatnak itt: <i>%7</i>."
 "<p><strong>A(z) %3 átmozgassa most az üzenetfájlokat?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Már létezik ez a mappa: <i>%4</i>. A(z) %1 most itt tárolja az üzeneteket: "
-"<i>%5</i>. A(z) %2 át tudja mozgatni <i>%6</i> tartalmát ebbe a mappába."
-"<p><strong>A(z) %3 átmozgassa most az üzenetfájlokat?</strong></qt>"
+"<qt>Már létezik ez a mappa: <i>%4</i>. A(z) %1 most itt tárolja az "
+"üzeneteket: <i>%5</i>. A(z) %2 át tudja mozgatni <i>%6</i> tartalmát ebbe a "
+"mappába.<p><strong>A(z) %3 átmozgassa most az üzenetfájlokat?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Az üzenetfájlok migrálása?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "A programban végzetes hiba lépett fel, a futás befejeződik"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8590,11 +8447,11 @@ msgstr ""
 "A hibaüzenet:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "A törölt üzenetek eltávolítása"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Biztosan ki szeretné üríteni a törölt üzenetek mappáit minden azonosítónál?"
@@ -8668,8 +8525,7 @@ msgstr "%n új üzenet: %1"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Új üzenet érkezett</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8688,8 +8544,8 @@ msgstr "Erre a mappára nincsenek beállítva eltávolítási szabályok"
 #: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Biztosan azt szeretné, hogy el legyen távolítva a(z) <b>%1</b> "
-"mappa tartalma?</qt>"
+"<qt>Biztosan azt szeretné, hogy el legyen távolítva a(z) <b>%1</b> mappa "
+"tartalma?</qt>"
 
 #: kmmainwidget.cpp:1133
 msgid "Expire Folder"
@@ -8709,11 +8565,11 @@ msgstr "Biztosan ki szeretné üríteni a törölt üzenetek mappáját?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Biztosan át szeretné mozgatni az összes üzenetet a(z) <b>%1</b> "
-"mappából a törölt üzenetek közé?</qt>"
+"<qt>Biztosan át szeretné mozgatni az összes üzenetet a(z) <b>%1</b> mappából "
+"a törölt üzenetek közé?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8737,11 +8593,11 @@ msgstr "Keresőmappa törlése"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Biztosan törölni szeretné a(z) <b>%1</b> keresőmappát?"
-"<br>A mappában látható üzenetek az eredeti helyükről nem törlődnek.</qt>"
+"<qt>Biztosan törölni szeretné a(z) <b>%1</b> keresőmappát?<br>A mappában "
+"látható üzenetek az eredeti helyükről nem törlődnek.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8753,40 +8609,42 @@ msgstr "<qt>Biztosan törölni szeretné a(z) <b>%1</b> üres mappát?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Biztosan törölni szeretné a(z) <b>%1</b> nevű üres mappát az almappáival "
-"együtt? Az almappákban található üzenetek is törölve lesznek! "
-"<p><b>Figyelem!</b> A törlés során az üzenetek nem kerülnek át a Törölt "
-"üzenetek mappába, hanem véglegesen törlődnek!</qt>"
+"együtt? Az almappákban található üzenetek is törölve lesznek! <p><b>Figyelem!"
+"</b> A törlés során az üzenetek nem kerülnek át a Törölt üzenetek mappába, "
+"hanem véglegesen törlődnek!</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Biztosan törölni szeretné a(z) <b>%1</b> mappát? A mappa tartalma el fog "
-"veszni! "
-"<p><b>Figyelem!</b> A törlés során az üzenetek nem kerülnek át a Törölt "
-"üzenetek mappába, hanem véglegesen törlődnek!</qt>"
+"veszni! <p><b>Figyelem!</b> A törlés során az üzenetek nem kerülnek át a "
+"Törölt üzenetek mappába, hanem véglegesen törlődnek!</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Biztosan törölni szeretné a(z) <b>%1</b> mappát az almappáival együtt? A "
-"mappák tartalma el fog veszni! "
-"<p><b>Figyelem!</b> A törlés során az üzenetek nem kerülnek át a Törölt "
-"üzenetek mappába, hanem véglegesen törlődnek!</qt>"
+"mappák tartalma el fog veszni! <p><b>Figyelem!</b> A törlés során az "
+"üzenetek nem kerülnek át a Törölt üzenetek mappába, hanem véglegesen "
+"törlődnek!</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Törölt"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8802,14 +8660,14 @@ msgstr "Biztosan azt szeretné, hogy az összes régi üzenet el legyen távolí
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Ha engedélyezi az üzenetek HTML-tartalmának feldolgozását, akkor a kéretlen "
 "(\"spam\") levelek még több kellemetlenséget okozhatnak, és megnő annak a "
-"kockázata, hogy adatvesztés következhet be most még nem ismert biztonsági rések "
-"kihasználása révén."
+"kockázata, hogy adatvesztés következhet be most még nem ismert biztonsági "
+"rések kihasználása révén."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8822,13 +8680,13 @@ msgstr "HTML használata"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Ha engedélyezi a külső hivatkozások betöltését HTML-üzenetekben, akkor a "
-"kéretlen (\"spam\") levelek több kellemetlenséget okozhatnak, és megnő annak a "
-"kockázata, hogy adatvesztés következhet be most még nem ismert biztonsági rések "
-"kihasználása révén."
+"kéretlen (\"spam\") levelek több kellemetlenséget okozhatnak, és megnő annak "
+"a kockázata, hogy adatvesztés következhet be most még nem ismert biztonsági "
+"rések kihasználása révén."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8844,12 +8702,12 @@ msgstr "A(z) %1 levelezőlistára..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"A KMail 'Házon kívül vagyok' funkciója kiszolgálóoldali szűrésre alapul, de az "
-"IMAP-kiszolgálón ez még nincs beállítva.\n"
+"A KMail 'Házon kívül vagyok' funkciója kiszolgálóoldali szűrésre alapul, de "
+"az IMAP-kiszolgálón ez még nincs beállítva.\n"
 "Ez megtehető a \"Szűrés\" lapon, az IMAP-azonosító beállításainál."
 
 #: kmmainwidget.cpp:1743
@@ -8867,7 +8725,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "A GnuPG naplónézegető programot (kwatchgnupg) nem sikerült elindítani. "
 "Ellenőrizze, rendben telepítve van-e minden."
@@ -9192,8 +9051,7 @@ msgstr "A csatolások men&tése..."
 msgid "Appl&y All Filters"
 msgstr "Az összes szűrő al&kalmazása"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Szűrő a&lkalmazása"
@@ -9307,7 +9165,6 @@ msgstr "Következő &olvasatlan üzenet"
 msgid "Go to the next unread message"
 msgstr "Ugrás a következő olvasatlan üzenetre"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Előző üzenet"
@@ -9355,8 +9212,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Az aktuális üzenet lefelé görgetése. Az üzenet végére érve ugrás a következő, "
-"még nem olvasott szövegre."
+"Az aktuális üzenet lefelé görgetése. Az üzenet végére érve ugrás a "
+"következő, még nem olvasott szövegre."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9445,21 +9302,21 @@ msgstr " Inicializálás..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Az üzenet küldője visszajelzést kért az üzenet feldolgozásáról.\n"
-"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy normál "
-"visszajelzés küldhető."
+"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy "
+"normál visszajelzés küldhető."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Az üzenet küldője visszajelzést kért az üzenet feldolgozásáról.\n"
@@ -9470,34 +9327,34 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Az üzenet küldője visszajelzést kér az üzenet feldolgozásáról.\n"
 "A kérés szerint egynél több címre kell visszajelzést küldeni.\n"
-"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy normál "
-"visszajelzés küldhető."
+"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy "
+"normál visszajelzés küldhető."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Az üzenet küldője visszajelzést kért az üzenet feldolgozásáról,\n"
 "de nincs megadva a visszaküldési cím.\n"
-"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy normál "
-"visszajelzés küldhető."
+"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy "
+"normál visszajelzés küldhető."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9506,8 +9363,8 @@ msgstr ""
 "Az üzenet küldője visszajelzést kér az üzenet feldolgozásáról,\n"
 "de a visszaküldési cím nem egyezik meg azzal a címmel, ahová a visszajelzést "
 "kell küldeni.\n"
-"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy normál "
-"visszajelzés küldhető."
+"A kérést figyelmen kívül lehet hagyni, ill. \"megtagadva\" tartalmú vagy "
+"normál visszajelzés küldhető."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9533,17 +9390,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Címzett: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Csatolás: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "A csatolások a feladó által javasolt módon jelenjenek meg."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9593,45 +9450,37 @@ msgstr "Az üzenetrész tulajdonságai"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A fájl <em>MIME-típusa</em>:</p>"
-"<p>Ezt a beállítást általában nem kell megváltoztatni, mert a program "
-"automatikusan ellenőrzi a fájltípust. Néha azonban a(z) %1 hibásan ismeri fel a "
-"fájltípust, ilyen esetben itt lehet a javítást elvégezni.</p></qt>"
+"<qt><p>A fájl <em>MIME-típusa</em>:</p><p>Ezt a beállítást általában nem "
+"kell megváltoztatni, mert a program automatikusan ellenőrzi a fájltípust. "
+"Néha azonban a(z) %1 hibásan ismeri fel a fájltípust, ilyen esetben itt "
+"lehet a javítást elvégezni.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A rész mérete:</p>"
-"<p>Előfordulhat, hogy a(z) %1 csak a körülbelüli méretet írja ki, mert a pontos "
-"érték kiszámítása túl sok időt venne igénybe. Ilyen esetben a méret értéke elé "
-"a \"(kb.)\" előtag kerül.</p></qt>"
+"<qt><p>A rész mérete:</p><p>Előfordulhat, hogy a(z) %1 csak a körülbelüli "
+"méretet írja ki, mert a pontos érték kiszámítása túl sok időt venne igénybe. "
+"Ilyen esetben a méret értéke elé a \"(kb.)\" előtag kerül.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A rész fájlneve:</p>"
-"<p>Ez a név általában megegyezik a csatolt fájl nevével, de nem kell "
-"feltétlenül azonosnak lennie a fájl eredeti nevével, csak egy javasolt név a "
-"kliens számára a fájl elmentéséhez.</p></qt>"
+"<qt><p>A rész fájlneve:</p><p>Ez a név általában megegyezik a csatolt fájl "
+"nevével, de nem kell feltétlenül azonosnak lennie a fájl eredeti nevével, "
+"csak egy javasolt név a kliens számára a fájl elmentéséhez.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9639,17 +9488,14 @@ msgstr "&Leírás:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A rész leírása:</p>"
-"<p>Ez egy szabadon kitölthető tájékoztató jellegű szövegmező, hasonló az egész "
-"üzenet Tárgy sorához. A legtöbb levelezőprogram megjeleníti ezt a nevet "
-"előnézeti módban a csatolás ikonja mellett.</p></qt>"
+"<qt><p>A rész leírása:</p><p>Ez egy szabadon kitölthető tájékoztató jellegű "
+"szövegmező, hasonló az egész üzenet Tárgy sorához. A legtöbb levelezőprogram "
+"megjeleníti ezt a nevet előnézeti módban a csatolás ikonja mellett.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9657,23 +9503,21 @@ msgstr "Kó&dolás:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A rész továbbításánálhasznált kódolási mód:</p>"
-"<p>Ezt az értéket ritkán kell megváltoztatni, mert a(z) %1 ki tud választani "
-"egy elfogadható alapértelmezett kódolást a MIME-típus alapján. Bizonyos "
-"esetekben azonban jelentős méretcsökkenést lehet a megfelelő kódolás "
-"választásával elérni, pl. ha egy PostScript-fájl csak szöveges információt "
-"tartalmaz, binárisat nem. Ebben az esetben válassza a \"quoted-printable\" "
-"kódolást a \"base64\" helyett - a méretcsökkenés akár 25%-os is lehet.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>A rész továbbításánálhasznált kódolási mód:</p><p>Ezt az értéket "
+"ritkán kell megváltoztatni, mert a(z) %1 ki tud választani egy elfogadható "
+"alapértelmezett kódolást a MIME-típus alapján. Bizonyos esetekben azonban "
+"jelentős méretcsökkenést lehet a megfelelő kódolás választásával elérni, pl. "
+"ha egy PostScript-fájl csak szöveges információt tartalmaz, binárisat nem. "
+"Ebben az esetben válassza a \"quoted-printable\" kódolást a \"base64\" "
+"helyett - a méretcsökkenés akár 25%-os is lehet.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9681,21 +9525,18 @@ msgstr "Javaslat az a&utomatikus megjelenítésre"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ha bejelöli ezt az opciót, akkor a levelezőprogramok arra vonatkozó kérésnek "
-"fogják értelmezni, hogy a csatolást a hagyományos ikonos megjelenítés helyett "
-"az üzenet szövegébe beágyazva kell megjeleníteni.</p>"
-"<p>Technikailag ez mindössze annyit jelent, hogy a csatoláshoz tartozó <em>"
-"Content-Disposition</em> fejlécmező értéke \"inline\" lesz az alapértelmezett "
-"\"attachment\" helyett.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Ha bejelöli ezt az opciót, akkor a levelezőprogramok arra vonatkozó "
+"kérésnek fogják értelmezni, hogy a csatolást a hagyományos ikonos "
+"megjelenítés helyett az üzenet szövegébe beágyazva kell megjeleníteni.</"
+"p><p>Technikailag ez mindössze annyit jelent, hogy a csatoláshoz tartozó "
+"<em>Content-Disposition</em> fejlécmező értéke \"inline\" lesz az "
+"alapértelmezett \"attachment\" helyett.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9703,16 +9544,13 @@ msgstr "A csatolás &elektronikus aláírása"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Akkor jelölje be ezt az opciót, ha elektronikus aláírással szeretne ellátni "
-"a csatolást.</p>"
-"<p>Az aláírás azzal a kulccsal fog megtörténni, amely az aktuális azonosítóhoz "
-"ki van választva.</p></qt>"
+"<qt><p>Akkor jelölje be ezt az opciót, ha elektronikus aláírással szeretne "
+"ellátni a csatolást.</p><p>Az aláírás azzal a kulccsal fog megtörténni, "
+"amely az aktuális azonosítóhoz ki van választva.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9720,14 +9558,12 @@ msgstr "A csatolás &titkosítása"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Akkor jelölje be ezt az opciót, ha ezt az üzenetrészt titkosítani "
-"szeretné.</p>"
-"<p>Az üzenetrész titkosítva fog eljutni az összes címzetthez.</p></qt>"
+"<qt><p>Akkor jelölje be ezt az opciót, ha ezt az üzenetrészt titkosítani "
+"szeretné.</p><p>Az üzenetrész titkosítva fog eljutni az összes címzetthez.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9741,16 +9577,13 @@ msgstr "POP-szűrő"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"A POP-azonosítóhoz tartozó szűrendő üzenetek: <b>%1</b>"
-"<p>Ezek az üzenetek túllépik az azonosítónál engedélyezett maximális méretet."
-"<br>A megfelelő gombokkal lehet megadni, hogy milyen műveletet szeretne rajtuk "
-"elvégezni."
+"A POP-azonosítóhoz tartozó szűrendő üzenetek: <b>%1</b><p>Ezek az üzenetek "
+"túllépik az azonosítónál engedélyezett maximális méretet.<br>A megfelelő "
+"gombokkal lehet megadni, hogy milyen műveletet szeretne rajtuk elvégezni."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9763,8 +9596,8 @@ msgstr "A szűrőcsoportnak eleget tevő üzenet: nincs"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Egy megadott szűrőcsoportnak eleget tevő és 'Letöltés' ill. 'Törlés' jelölést "
-"kapott üzenetek"
+"Egy megadott szűrőcsoportnak eleget tevő és 'Letöltés' ill. 'Törlés' "
+"jelölést kapott üzenetek"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10005,40 +9838,39 @@ msgstr "A TDE grafikus környezet levelezőprogramja."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Mappatartalom letöltése</h2>"
-"<p>Egy kis türelmet kérek. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Mappatartalom letöltése</h2><p>Egy kis türelmet "
+"kérek. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>A KMail jelenleg offline módban van. <a href=\"kmail:goOnline\">"
-"Kattintson ide</a>, ha online módba szeretne váltani . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>A KMail jelenleg offline módban "
+"van. <a href=\"kmail:goOnline\">Kattintson ide</a>, ha online módba szeretne "
+"váltani . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10046,18 +9878,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Üdvözöljük a KMail %1 levelezőprogramban!</h2>"
-"<p>A KMail a a TDE grafikus környezet alapértelmezett levelezőprogramja. "
+"<h2 style='margin-top: 0px;'>Üdvözöljük a KMail %1 levelezőprogramban!</"
+"h2><p>A KMail a a TDE grafikus környezet alapértelmezett levelezőprogramja. "
 "Támogatja az internetes levelezés szabványait, például a MIME-ot, az SMTP, a "
 "POP3 és az IMAP protokollt.</p>\n"
-"<ul>"
-"<li>A KMail szolgáltatásainak részletes leírása megtalálható a program <a "
-"href=\"%2\">dokumentációjában</a></li>\n"
+"<ul><li>A KMail szolgáltatásainak részletes leírása megtalálható a program "
+"<a href=\"%2\">dokumentációjában</a></li>\n"
 "<li><a href=\"%3\">A KMail honlapján</A> további információk találhatók a "
 "program új verzióiról</li></ul>\n"
 "%8\n"
-"<p>A KMail néhány fontosabb új funkciója (a TDE %5 környezethez tartozó KMail "
-"%4 verzióhoz képest):</p>\n"
+"<p>A KMail néhány fontosabb új funkciója (a TDE %5 környezethez tartozó "
+"KMail %4 verzióhoz képest):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10066,22 +9897,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; A KMail fejlesztői</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Mindenképpen ajánlott a beállítópanel pontos kitöltése a "
-"Beállítások-&gt;Beállítás menüpontban.\n"
-"Legalább egy azonosítót létre kell hozni, megadva a bejövő és a kimenő üzenetek "
-"kiszolgálóinak kért jellemzőit.</p>\n"
+"<p>Mindenképpen ajánlott a beállítópanel pontos kitöltése a Beállítások-&gt;"
+"Beállítás menüpontban.\n"
+"Legalább egy azonosítót létre kell hozni, megadva a bejövő és a kimenő "
+"üzenetek kiszolgálóinak kért jellemzőit.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10120,7 +9949,8 @@ msgstr "Csatolás megtekintése: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: a csatolás bináris adatokat tartalmaz. Megpróbálom megjeleníteni az "
@@ -10149,12 +9979,14 @@ msgstr "Meg szeretné nyitni a csatolást?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10176,6 +10008,58 @@ msgstr "(legalább egy feltétel teljesítése)"
 msgid "(match all of the following)"
 msgstr "(az összes feltétel teljesítése)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Olvasott"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Régi"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Törölt"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Megválaszolt"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Továbbított"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Elküldési sorba állított"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Elküldött"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Figyelt"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Figyelmen kívül hagyott"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Kéretlen"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ál-kéretlen"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Feladat"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Van csatolása"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10260,21 +10144,22 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Nem sikerült áthelyezni a(z) \"%1\" elküldött üzenetet a \"kimenő üzenetek\" "
 "mappából az \"elküldött üzenetek\" mappába.\n"
-"A hiba oka lehet például a kevés szabad lemezterület vagy az írási jogosultság "
-"hiánya. Próbálja megszüntetni a hiba okát és helyezze át kézzel az üzenetet."
+"A hiba oka lehet például a kevés szabad lemezterület vagy az írási "
+"jogosultság hiánya. Próbálja megszüntetni a hiba okát és helyezze át kézzel "
+"az üzenetet."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Nem lehet üzenetet küldeni a feladó e-mail címének megadása nélkül.\n"
 "Állítsa be a(z) '%1' azonosítóhoz tartozó e-mail címet a beállítások "
@@ -10301,11 +10186,11 @@ msgstr "A küldési folyamat elindítása..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Titkosítás nélküli továbbítót választott a sorban álló üzenetek elküldéséhez, "
-"biztosan ezt szeretné? "
+"Titkosítás nélküli továbbítót választott a sorban álló üzenetek "
+"elküldéséhez, biztosan ezt szeretné? "
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10329,15 +10214,16 @@ msgstr "Nem sikerült elküldeni a későbbre halasztott üzeneteket."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Az üzenet elküldése nem sikerült:\n"
 "%1\n"
-"Az üzenet a 'Kimenő üzenetek' mappában marad, amíg ki nem javítja a hibát (pl. "
-"a hibás címet) vagy ki nem törli az üzenetet a mappából.\n"
+"Az üzenet a 'Kimenő üzenetek' mappában marad, amíg ki nem javítja a hibát "
+"(pl. a hibás címet) vagy ki nem törli az üzenetet a mappából.\n"
 "A használt adatátviteli protokoll:\n"
 "  %2"
 
@@ -10347,20 +10233,16 @@ msgstr "A küldés megszakadt."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Az üzenet elküldése nem sikerült:</p>"
-"<p>%1</p>"
-"<p>Az üzenet a 'Kimenő üzenetek' mappában marad, amíg ki nem javítja a hibát "
-"(pl. a hibás címet) vagy ki nem törli az üzenetet a mappából.</p>"
-"<p>A használt adatátviteli protokoll:  %2</p>"
-"<p>A többi üzenet továbbítása folytatódhat?</p>"
+"<p>Az üzenet elküldése nem sikerült:</p><p>%1</p><p>Az üzenet a 'Kimenő "
+"üzenetek' mappában marad, amíg ki nem javítja a hibát (pl. a hibás címet) "
+"vagy ki nem törli az üzenetet a mappából.</p><p>A használt adatátviteli "
+"protokoll:  %2</p><p>A többi üzenet továbbítása folytatódhat?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10378,15 +10260,16 @@ msgstr "A küldés &félbeszakítása"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Az üzenet elküldése nem sikerült:\n"
 "%1\n"
-"Az üzenet a 'Kimenő üzenetek' mappában marad, amíg ki nem javítja a hibát (pl. "
-"a hibás címet) vagy ki nem törli az üzenetet a mappából.\n"
+"Az üzenet a 'Kimenő üzenetek' mappában marad, amíg ki nem javítja a hibát "
+"(pl. a hibás címet) vagy ki nem törli az üzenetet a mappából.\n"
 "A használt adatátviteli protokoll:\n"
 " %2"
 
@@ -10429,9 +10312,9 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "Úgy tűnik, %1 már fut egy másik képernyőn. Ha a(z) %2 programból egynél több "
 "példány fut, bizonyos üzenetek elveszhetnek. Csak akkor indítsa el a(z) %1 "
@@ -10439,19 +10322,19 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"Úgy tűnik, %1 már fut egy másik képernyőn. Ha egyszerre futtatja a(z) %1 és %2 "
-"programot, adatvesztés lehet a következmény. Csak akkor indítsa el a(z) %2 "
-"programot, ha biztos benne, hogy %1 nem fut."
+"Úgy tűnik, %1 már fut egy másik képernyőn. Ha egyszerre futtatja a(z) %1 és "
+"%2 programot, adatvesztés lehet a következmény. Csak akkor indítsa el a(z) "
+"%2 programot, ha biztos benne, hogy %1 nem fut."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "Úgy tűnik, %1 már fut itt: %2. Ha a(z) %1 programot egynél több példányban "
 "futtatja, adatvesztés lehet a következmény. Csak akkor indítsa el a(z) %1 "
@@ -10459,12 +10342,12 @@ msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"Úgy tűnik, %1 egy példánya már fut itt: %3. Ha egyszerre futtatja a(z) %1 és %2 "
-"programot, adatvesztés lehet az eredmény. Csak akkor indítsa el a(z) %2 "
+"Úgy tűnik, %1 egy példánya már fut itt: %3. Ha egyszerre futtatja a(z) %1 és "
+"%2 programot, adatvesztés lehet az eredmény. Csak akkor indítsa el a(z) %2 "
 "programot ezen a gépen, ha biztos benne, hogy %1 még nem fut itt: %3."
 
 #: kmstartup.cpp:232
@@ -10476,6 +10359,10 @@ msgstr "Indítás - %1"
 msgid "Exit"
 msgstr "Kilépés"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Új üzenetek -"
@@ -10500,16 +10387,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"A TDEWallet nem érhető el. A jelszavak kezeléséhez erősen ajánljuk a TDEWallet "
-"használatát.\n"
+"A TDEWallet nem érhető el. A jelszavak kezeléséhez erősen ajánljuk a "
+"TDEWallet használatát.\n"
 "A KMail el tudja menteni a jelszavakat a saját konfigurációs fájljába is. A "
-"jelszavak olyan formában lesznek tárolva, hogy ne lehessen ránézésre megtudni "
-"az értéket, de ez a módszer nem nyújt elegendő védelmet, ha a fájl illetéktelen "
-"kezekbe kerül.\n"
+"jelszavak olyan formában lesznek tárolva, hogy ne lehessen ránézésre "
+"megtudni az értéket, de ez a módszer nem nyújt elegendő védelmet, ha a fájl "
+"illetéktelen kezekbe kerül.\n"
 "El szeretné menteni a jelszót a beállítófájlba ennél a postafióknál: '%1'?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10579,8 +10467,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Egy helyben végrehajtandó parancs az üzenet elküldése előtt. Így lehet például "
-"SSH-csatornákat definiálni. Általában üresen lehet hagyni."
+"Egy helyben végrehajtandó parancs az üzenet elküldése előtt. Így lehet "
+"például SSH-csatornákat definiálni. Általában üresen lehet hagyni."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10588,8 +10476,8 @@ msgstr "A kiszolgáló né&v és jelszó megadását igényli"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Jelölje be, ha az SMTP-kiszolgálóhoz való csatlakozáshoz meg kell adni egy "
 "felhasználónevet és egy jelszót. Ezt a lehetőséget 'Authenticated SMTP'-nek "
@@ -10613,15 +10501,14 @@ msgstr "Egyéni &gépnév küldése a kiszolgálónak"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Ha ez az opció be van jelölve, akkor a KMail a megadott gépnévvel azonosítja "
-"magát a levelezési kiszolgáló felé."
-"<p>Erre akkor lehet szükség, ha a gépnév nem megfelelően van beállítva, vagy "
-"biztonsági okokból nem szeretné elküldeni a valódi gépnevet."
+"magát a levelezési kiszolgáló felé.<p>Erre akkor lehet szükség, ha a gépnév "
+"nem megfelelően van beállítva, vagy biztonsági okokból nem szeretné "
+"elküldeni a valódi gépnevet."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10651,10 +10538,11 @@ msgstr "Csak helyi fájlokat lehet használni."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"A Gépnév mező nem lehet üres. Adja meg az SMTP-kiszolgáló nevét vagy IP-címét."
+"A Gépnév mező nem lehet üres. Adja meg az SMTP-kiszolgáló nevét vagy IP-"
+"címét."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10666,15 +10554,16 @@ msgstr "Hiba történt a(z) %1 mappa kilistázása közben: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Az előfizetés helyi lemondásakor elvesznek az érintett mappák egyéb, helyben "
-"tárolt jellemzői. A mappák adattartalma a kiszolgálón változatlan marad. Nyomja "
-"meg a Mégsem gombot, ha először az új üzenetek ellenőrzésével biztosítani "
-"szeretné, hogy a helyi módosítások már biztosan a kiszolgálón vannak."
+"tárolt jellemzői. A mappák adattartalma a kiszolgálón változatlan marad. "
+"Nyomja meg a Mégsem gombot, ha először az új üzenetek ellenőrzésével "
+"biztosítani szeretné, hogy a helyi módosítások már biztosan a kiszolgálón "
+"vannak."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10895,35 +10784,28 @@ msgstr "Az üzenet s&zerkesztése"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A titkosítási bővítőmodulból kapott adatokat nem sikerült értelmezni - "
-"lehet, hogy a modul megsérült.</p>"
-"<p>Kérjen segítséget a rendszergazdától.</p></qt>"
+"<qt><p>A titkosítási bővítőmodulból kapott adatokat nem sikerült értelmezni "
+"- lehet, hogy a modul megsérült.</p><p>Kérjen segítséget a rendszergazdától."
+"</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Nem sikerült használható titkosítási modult találni, és a beépített OpenPGP "
-"programrész is hibát jelzett.</p>"
-"<p>Két lehetőség kínálkozik a hiba elhárítására:</p>"
-"<ul>"
-"<li><em>vagy</em> aktivál egy titkosítási modult a Beállítások->"
-"A KMail beállításai->Bővítőmodulok ablakában</li>"
-"<li><em>vagy</em> megadja a beépített OpenPGP kód használatához szükséges "
-"beállításokat ugyanott, az Azonosító->Speciális lapon.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Nem sikerült használható titkosítási modult találni, és a beépített "
+"OpenPGP programrész is hibát jelzett.</p><p>Két lehetőség kínálkozik a hiba "
+"elhárítására:</p><ul><li><em>vagy</em> aktivál egy titkosítási modult a "
+"Beállítások->A KMail beállításai->Bővítőmodulok ablakában</li><li><em>vagy</"
+"em> megadja a beépített OpenPGP kód használatához szükséges beállításokat "
+"ugyanott, az Azonosító->Speciális lapon.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10935,19 +10817,19 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"A Chiasmus modul nem tartalmazza az \"x-encrypt\" függvényt. Kérjük jelentse be "
-"a hibát."
+"A Chiasmus modul nem tartalmazza az \"x-encrypt\" függvényt. Kérjük jelentse "
+"be a hibát."
 
 #: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Az \"x-encrypt\" függvény nem fogadja el a várt paramétereket. Kérjük jelentse "
-"be a hibát."
+"Az \"x-encrypt\" függvény nem fogadja el a várt paramétereket. Kérjük "
+"jelentse be a hibát."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -10955,16 +10837,16 @@ msgstr "Chiasmus - Titkosítási hiba"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Nem várt visszaadott érték a Chiasmus modulban: az \"x-encrypt\" függvény nem "
-"adott vissza bájttömböt. Kérjük jelentse be a hibát."
+"Nem várt visszaadott érték a Chiasmus modulban: az \"x-encrypt\" függvény "
+"nem adott vissza bájttömböt. Kérjük jelentse be a hibát."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "A beágyazott OpenPGP-s titkosítási üzenetformátum nem támogatja csatolások "
@@ -10989,8 +10871,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"A címzetthez beállított aláírási értékek szerint Ön azt kérte, hogy a program "
-"kérdezzen rá, alá szeretné-e írni az üzenetet.\n"
+"A címzetthez beállított aláírási értékek szerint Ön azt kérte, hogy a "
+"program kérdezzen rá, alá szeretné-e írni az üzenetet.\n"
 "Alá szeretné írni az üzenetet?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11020,8 +10902,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Az üzenet aláírását kérte, de nincs beállítva érvényes aláírási kulcs ehhez az "
-"azonosítóhoz."
+"Az üzenet aláírását kérte, de nincs beállítva érvényes aláírási kulcs ehhez "
+"az azonosítóhoz."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11077,8 +10959,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "A címzetthez beállított titkosítási értékek szerint Ön azt kérte, hogy a "
@@ -11106,8 +10988,7 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"<qt>"
-"<p>Ezeknél a címzetteknél nem egyértelműek a titkosítási beállítások.\n"
+"<qt><p>Ezeknél a címzetteknél nem egyértelműek a titkosítási beállítások.\n"
 "Titkosítani szeretné az üzenetet?"
 
 #: messagecomposer.cpp:909
@@ -11116,11 +10997,13 @@ msgstr "T&itkosítás nélkül"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Az üzenet titkosítását és saját kulccsal titkosított másolatot is kért, de nem "
-"található az azonosítóhoz beállított érvényes, megbízható titkosítási kulcs."
+"Az üzenet titkosítását és saját kulccsal titkosított másolatot is kért, de "
+"nem található az azonosítóhoz beállított érvényes, megbízható titkosítási "
+"kulcs."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11129,8 +11012,8 @@ msgstr "Elküldés titkosítás nélkül?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Az üzenet egyes részei nem lesznek titkosítva.\n"
@@ -11158,64 +11041,58 @@ msgstr "Az összes üzenetrész &titkosítása"
 msgid "Unencrypted Message Warning"
 msgstr "Figyelmeztetés nem titkosított üzenetre"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hiba: a titkosítási keretrendszer nem adott vissza kódolt adatot.</p>"
-"<p>Kérjük jelentse be ezt a hibát:"
-"<br>%2</p></qt>"
+"<qt><p>Hiba: a titkosítási keretrendszer nem adott vissza kódolt adatot.</"
+"p><p>Kérjük jelentse be ezt a hibát:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Nem minden karakter található meg a kiválasztott kódolásban."
-"<br>"
-"<br>Ennek ellenére el szeretné küldeni az üzenetet?</qt>"
+"<br><br>Ennek ellenére el szeretné küldeni az üzenetet?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Néhány karakter el fog veszni a szövegből"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "A nem megfelelő karakterek eldobása"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "A kódolás megváltoztatása"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Az üzenetet nem sikerült aláírni, mert a kiválasztott kriptográfiai modul nem "
-"támogatja az elektronikus aláírást. Ez normál körülmények között nem történhet "
-"meg, kérjük jelentse be mint hibát."
+"Az üzenetet nem sikerült aláírni, mert a kiválasztott kriptográfiai modul "
+"nem támogatja az elektronikus aláírást. Ez normál körülmények között nem "
+"történhet meg, kérjük jelentse be mint hibát."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Az üzenetet nem sikerült aláírni, mert a kiválasztott kriptográfiai modul nem "
-"támogatja az elektronikus aláírást. Ez normál körülmények között nem történhet "
-"meg, kérjük jelentse be mint hibát."
+"Az üzenetet nem sikerült aláírni, mert a kiválasztott kriptográfiai modul "
+"nem támogatja az elektronikus aláírást. Ez normál körülmények között nem "
+"történhet meg, kérjük jelentse be mint hibát."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
@@ -11223,24 +11100,25 @@ msgstr ""
 "Az aláírást nem sikerült elvégezni. Ellenőrizze, hogy fut-e a gpg-agent "
 "program."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Az üzenetet nem sikerült titkosítani, mert a kiválasztott kriptográfiai modul "
-"nem támogatja a titkosítást. Ez normál körülmények között nem történhet meg, "
-"kérjük jelentse be mint hibát."
+"Az üzenetet nem sikerült titkosítani, mert a kiválasztott kriptográfiai "
+"modul nem támogatja a titkosítást. Ez normál körülmények között nem "
+"történhet meg, kérjük jelentse be mint hibát."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Az üzenetet nem sikerült aláírni és titkosítani, mert a kiválasztott "
 "kriptográfiai modul nem támogatja egyszerre a titkosítást és az aláírást. Ez "
@@ -11265,15 +11143,15 @@ msgstr "Postaláda-&formátum:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Válassza ki, hogy a mappa üzenetei maildir (minden üzenet külön fájlban) vagy "
-"mbox formátumban (minden üzenet egy nagy fájlban) legyenek-e tárolva. A KMail "
-"alapértelmezése a maildir, ezt csak ritkán érdemes megváltoztatni. Ha nem "
-"biztos benne, hagyja így."
+"Válassza ki, hogy a mappa üzenetei maildir (minden üzenet külön fájlban) "
+"vagy mbox formátumban (minden üzenet egy nagy fájlban) legyenek-e tárolva. A "
+"KMail alapértelmezése a maildir, ezt csak ritkán érdemes megváltoztatni. Ha "
+"nem biztos benne, hagyja így."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11282,12 +11160,12 @@ msgstr "Ma&ppatartalom:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Válassza ki, hogy a mappát e-mail üzenetek vagy csoportmunkaelemek, például "
-"feladatok vagy feljegyzések tárolására szeretné-e használni. Az alapértelmezés: "
-"e-mail üzenetek. Hagyja így, ha nem biztos benne."
+"feladatok vagy feljegyzések tárolására szeretné-e használni. Az "
+"alapértelmezés: e-mail üzenetek. Hagyja így, ha nem biztos benne."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11308,8 +11186,8 @@ msgstr "Nincs megadva név"
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
-"<qt>Nem sikerült létrehozni a(z) <b>%1</b> mappát, mert már létezik ilyen nevű "
-"mappa.</qt>"
+"<qt>Nem sikerült létrehozni a(z) <b>%1</b> mappát, mert már létezik ilyen "
+"nevű mappa.</qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -11327,8 +11205,7 @@ msgstr "Az aláírások ellenőrzési eredményei"
 msgid "The crypto engine returned no cleartext data."
 msgstr "A titkosítási bővítőmodul nem adott vissza szöveges adatokat."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Állapot: "
 
@@ -11359,8 +11236,8 @@ msgstr "Nem található %1 bővítőmodul."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Az üzenet elektronikusan alá van írva, de az aláírás hitelessége nem "
 "ellenőrizhető.<br />A hiba oka: %1"
@@ -11399,27 +11276,27 @@ msgstr "A(z) \"%1\" titkosítási bővítőmodul nem tud üzeneteket dekódolni.
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Megjegyzés:</b> Ez a HTML formátumú üzenet külső, például képekre vonatkozó "
-"hivatkozásokat tartalmazhat. Biztonsági okokból ezeket nem tölti be a program. "
-"Ha a feladót megbízhatónak tartja és be szeretné tölteni a külső "
-"hivatkozásokat, <a href=\"kmail:loadExternal\">kattintson ide</a>."
+"<b>Megjegyzés:</b> Ez a HTML formátumú üzenet külső, például képekre "
+"vonatkozó hivatkozásokat tartalmazhat. Biztonsági okokból ezeket nem tölti "
+"be a program. Ha a feladót megbízhatónak tartja és be szeretné tölteni a "
+"külső hivatkozásokat, <a href=\"kmail:loadExternal\">kattintson ide</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Megjegyzés:</b> ez egy HTML-formátumú üzenet. Biztonsági okokból egyszerű "
-"szövegként jelenik meg a HTML forráskód. Ha a feladót megbízhatónak tartja és "
-"meg szeretné tekinteni a HTML tartalmat, <a href=\"kmail:showHTML\">"
-"kattintson ide</a>."
+"szövegként jelenik meg a HTML forráskód. Ha a feladót megbízhatónak tartja "
+"és meg szeretné tekinteni a HTML tartalmat, <a href=\"kmail:showHTML"
+"\">kattintson ide</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11669,8 +11546,8 @@ msgstr "eltárolva: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Nem található e-mail cím az elektronikus aláíráshoz használt %1 objektumban, "
 "ezért nem lehet ellenőrizni, hogy az üzenet valóban a feladó e-mail címéről "
@@ -11793,14 +11670,15 @@ msgstr "Kioslave hibaüzenet"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "A POP3-kiszolgáló (azonosító: %1) nem támogatja a UIDL parancsot. Csak ezzel "
-"lehet megbízhatóan lekérdezni, hogy a postafiókból hány üzenetet dolgozott fel "
-"korábban a KMail.\n"
+"lehet megbízhatóan lekérdezni, hogy a postafiókból hány üzenetet dolgozott "
+"fel korábban a KMail.\n"
 "Emiatt az a művelet, amely eldönti, hogy mely üzenetek maradjanak a "
 "kiszolgálón, nem tud megfelelően végrehajtódni."
 
@@ -11809,7 +11687,8 @@ msgid ""
 "_n: Fetched 1 message from %1. Deleting messages from server...\n"
 "Fetched %n messages from %1. Deleting messages from server..."
 msgstr ""
-"%n üzenet letöltve (összesen: %1). Az üzenetek törlése folyik a kiszolgálón..."
+"%n üzenet letöltve (összesen: %1). Az üzenetek törlése folyik a "
+"kiszolgálón..."
 
 #: popaccount.cpp:762 popaccount.cpp:782
 msgid ""
@@ -11819,7 +11698,8 @@ msgstr "%n üzenet letöltve (összesen: %1). A letöltés befejeződik..."
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Üzenetletöltés - %1/%2 (%3/%4 KB) innen: %5@%6 (%7 KB marad a kiszolgálón)."
 
@@ -11837,1897 +11717,15 @@ msgstr "Érvénytelen válasz érkezett a kiszolgálótól"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "A kiszolgáló nem támogatja a TOP parancsot, ezért nem lehet a nagyméretű "
 "üzeneteknél csak a fejlécet letölteni."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Navigá&ció"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Mappa"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Üzene&t"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Speciális válasz"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Tová&bbítás"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML eszköztár"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Elektronikus aláírás"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Az üzenetek a&utomatikus aláírása"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Ha ez az opció be van jelölve, alapértelmezés szerint minden elküldött üzenet "
-"alá lesz írva elektronikusan. Ez az alapértelmezés minden üzenetnél "
-"felülbírálható."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Titkosítás"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Ha ez az opció be van jelölve, az üzenet vagy fájl nem csak a címzett publikus "
-"kulcsával, hanem az Ön kulcsával is titkosítva lesz. Így Ön később is dekódolni "
-"tudja az elküldött üzeneteit. Ez gyakran fontos lehet."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Az aláírt/&titkosított szöveg megjelenítése a szerkesztés után"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Ha ez az opció be van jelölve, az aláírt és/vagy titkosított szöveg megjelenik "
-"egy külön ablakban, lehetővé téve az adatok megtekintését elküldés előtt. Ez "
-"hasznos lehet a titkosítási alrendszer működésének ellenőrzéséhez."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Az elküldött üzenetek titk&osítva legyenek tárolva"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Jelölje be, ha titkosított tárolást szeretne "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Az üzenetek titkosítva legyenek tárolva</h1>\n"
-"Ha ez az opció be van jelölve, akkor az elküldött titkosított üzenetek "
-"titkosítva lesznek eltárolva. Ez általában nem ajánlott, mert az üzeneteket nem "
-"lehet majd elolvasni, ha a szükséges tanúsítványok már lejártak.\n"
-"<p>\n"
-"Bizonyos körülmények esetén szükség lehet erre a beállításra. Ha nem biztos "
-"benne, kérjen segítséget a rendszergazdától.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Mindig jelenjenek meg a titk&osítási kulcsok (megerősítés)"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Ha ez az opció be van jelölve, a program mindig felkínálja a rendelkezésre álló "
-"publikus kulcsok listáját, Válassza ki az egyiket a titkosítás elvégzéséhez. Ha "
-"nincs bejelölve az opció, az alkalmazás csak akkor hozza fel a "
-"párbeszédablakot, ha nem található a megfelelő kulcs vagy több kulcs közül "
-"lehet választani."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Az üzenetek titkosítása min&dig, amikor csak lehetséges"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Ha ez az opció be van jelölve, minden elküldött üzenet titkosítva lesz, amikor "
-"ez lehetséges. Ez az alapértelmezés minden üzenetnél felülbírálható."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Piszkozat mentésénél n&em kell aláírás és titkosítás"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Hogyan működik ez?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Címzett: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Másolat: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Univerzális"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Válasz"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Válasz mindenkinek"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Továbbítás"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Billentyű&parancs:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Sablontíp&us:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "A mappa tulajdonságai"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "A ma&ppa levelezőlistát tartalmaz"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "A lista &címe:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormál:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Ol&vasatlan:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Régi üzenetek eltávolítása"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Le&járási idő:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Az &olvasott üzenetek eltávolítása"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Lejárás&i idő:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "A nem olvasott üzenetek e&ltávolítása"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "nap"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "hét"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "hónap"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Speciális"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "A feladó személya&zonossága:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Tárolási formátum:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Listakij&elzés:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "A tanúsítványok ellenőrzése CRL-ekkel"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Ha ez az opció be van jelölve, a program ellenőrzi az S/MIME-os tanúsítványokat "
-"CRL-ek (visszavonási listák, Certificate Revocation Lists) segítségével."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "A tanúsítványok online ellenőrzése (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Ha ez az opció be van jelölve, a program ellenőrzi az S/MIME-os tanúsítványokat "
-"az interneten keresztül, OCSP-vel (Online Certificates Status Protocol). Adja "
-"meg alább az OCSP-kezelő URL-jét."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Online tanúsítványellenőrzés"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Az OCSP-kezelő URL-je:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Adja meg a tanúsítványokat ellenőrző OCSP-kezelő URL-jét. Az URL általában "
-"http://-vel kezdődik."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Az OCSP-kezelő aláírása:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "A tanúsítványok szolgáltatási URL-jének figyelmen kívül hagyása"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "A tanúsítvány-házirendeket nem kell ellenőrizni"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Alapértelmezés szerint a GnuPG a ~/.gnupg/policies.txt fájl alapján ellenőrzi, "
-"hogy egy tanúsítványkezelési házirend engedélyezett-e. Ha bejelöli ezt az "
-"opciót, a házirendek nem lesznek ellenőrizve."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "A CRL-eket nem kell ellenőrizni"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ha ez az opció be van jelölve, a visszavonási listákat (CRL-eket) nem ellenőrzi "
-"a program S/MIME-tanúsítványok ellenőrzésekor."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "A hiányzó kibocsátói tanúsítványok letöltése"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Ha ez az opció be van jelölve, a program letölti a hiányzó kiadói "
-"tanúsítványokat (ez mindkét ellenőrzési módszerre, a CRL-ekre és az OCSP-re is "
-"vonatkozik)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP kérések"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "A HTTP kérések letiltása"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Teljesen kikapcsolja a HTTP használatát S/MIME-kezelésnél."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "A HTTP-kérésekhez használandó proxy: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "A rendszer HTTP proxy-jának használata:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Ha ez be van jelölve, a bal oldalon látható HTTP proxy cím (mely a http_proxy "
-"környezeti változóból származik) lesz felhasználva HTTP kérésekhez."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Itt kell megadni a HTTP proxy címét, ezt használja a program az S/MIME-os HTTP "
-"kérésekhez. A várt szintaxis: gépnév:port, például: proxy.valahol.hu:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-"A HTTP visszavonási listák disztribúciós pontjának figyelmen kívül hagyása"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Visszavonási lista keresésekor az ellenőrzendő tanúsítvány általában tartalmaz "
-"\"CRL disztribúciós pont\" (DP) bejegyzéseket, melyek az URL elérését leíró "
-"URL-ek. Az első alkalmas disztribúciós pontot használja a program. used. Ha ez "
-"be van jelölve, akkor kereséskor a HTTP-sémát használó bejegyzések figyelmen "
-"kívül lesznek hagyva."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-kérések"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Nem kell LDAP-lekérdezést végezni"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Letiltja az LDAP és az S/MIME használatát."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-"Az LDAP visszavonási listák disztribúciós pontjának figyelmen kívül hagyása"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Visszavonási lista keresésekor az ellenőrzendő tanúsítvány általában tartalmaz "
-"\"CRL disztribúciós pont\" (DP) bejegyzéseket, melyek az URL elérését leíró "
-"URL-ek. Az első alkalmas disztribúciós pontot használja a program. used. Ha ez "
-"be van jelölve, akkor kereséskor az LDAP-sémát használó bejegyzések figyelmen "
-"kívül lesznek hagyva."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Elsődleges LDAP-kiszolgáló:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Az itt megadott LDAP-kiszolgálóhoz lesznek elküldve először az LDAP-kérések. Az "
-"itt megadott érték felülbírálja az LDAP URL-ben megadott gépnevet és portot "
-"(akkor is, ha azok nincsenek megadva). Más LDA-kiszolgálókhoz csak akkor fordul "
-"a program, ha a \"proxy\"-kapcsolat nem működik.\n"
-"A várt szintaxis: \"GÉPNÉV\" vagy \"GÉPNÉV:PORT\". A port alapértelmezett "
-"értéke (389, a standard LDAP port) lesz érvényes, ha nincs megadva port érték."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Hozzáadás..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Csoportmunka"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "A betűtípusok alapértelmezésének visszaállítása"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "korlátlan"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Sablonbeállítások"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Válasz a feladónak"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Válasz mindenkinek / válasz listára"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Üzenet továbbítása"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Figyelmeztetés aláírás &nélküli üzenetek elküldése előtt"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Jelölje be, ha figyelmeztetést szeretne kapni az aláírás nélküli üzenetek "
-"elküldése előtt."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés aláírás nélküli üzenetek elküldése előtt</h1>\n"
-"Ha ez az opció be van jelölve, a program figyelmeztetést fog adni olyan üzenet "
-"küldése előtt, mely elektronikus aláírás nélküli részeket tartalmaz.\n"
-"<p>\n"
-"A maximális adatbiztonság érdekében célszerű bekapcsolva hagyni ezt az opciót.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Figyelmeztetés, ha titkosítás nélkül készül üzenetet küldeni"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Ha bejelöli, a program figyelmeztetést fog adni titkosítás nélküli üzenet "
-"elküldése előtt."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés titkosítás nélküli üzenet elküldése előtt</h1>\n"
-"Ha ez az opció be van jelölve, akkor a program figyelmeztetni fog, ha az "
-"elküldendő üzenet vagy annak egy része nincs titkosítva.\n"
-"<p>\n"
-"A maximális adatbiztonság érdekében célszerű bekapcsolva hagyni ezt az opciót.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Figyelmeztetés, ha a &címzett e-mail címe nem szerepel a tanúsítványban"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Ha ezt bejelöli, akkor a program figyelmeztetni fog, ha a cím nem szerepel a "
-"tanúsítványban"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés, ha a címzett e-mail címe nem szerepel a tanúsítványban</h1>"
-"\n"
-"Ha ez az opció be van jelölve, akkor figyelmeztetni fog a program, ha a címzett "
-"e-mail címe nem szerepel a titkosításhoz használt tanúsítványban.\n"
-"<p>\n"
-"A maximális adatbiztonság érdekében célszerű bekapcsolva hagyni ezt az opciót.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Figyelmeztetés, ha egy tanúsítvány vagy kulcs rövidesen lejár (az időérték "
-"beállítása alább)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Aláíráshoz"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Titkosításhoz"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " napig"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Itt lehet kiválasztani a napok számát"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés, ha egy aláírási tanúsítvány lejár</h1>\n"
-"Legalább az itt megadott számú napig még érvényesnek kell lennie az aláírási "
-"tanúsítványoknak ahhoz, hogy a program ne adjon figyelmeztetést.\n"
-"<p>\n"
-"Az ajánlott érték: 14 nap.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés, ha egy titkosítási tanúsítvány lejár</h1>\n"
-"Itt lehet megadni, hogy egy titkosítási tanúsítványnak még legalább hány napig "
-"kell érvényesnek lennie ahhoz, hogy a program ne adjon figyelmeztetést.\n"
-"<p>\n"
-"Az ajánlott beállítás 14 nap.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés, ha a láncban az egyik tanúsítvány lejár</h1>\n"
-"Itt lehet megadni, hogy az elküldéskor még legalább hány napig érvényesnek kell "
-"lennie a láncban található összes tanúsítványnak, hogy ne adjon figyelmeztetést "
-"a program.\n"
-"<p>\n"
-"A javasolt beállítás: 14 nap.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés, ha a tanúsítványkiadó (CA) tanúsítványa lejár</h1>\n"
-"Legalább az itt megadott számú napig még érvényesnek kell lennie a "
-"tanúsítványkiadó tanúsítványának ahhoz, hogy a program ne adjon "
-"figyelmeztetést.\n"
-"<p>\n"
-"Az ajánlott érték: 14 nap.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Figyelmeztetés, ha a gyökértanúsítvány lejár</h1>\n"
-"Legalább az itt megadott számú napig még érvényesnek kell lennie a "
-"gyökértanúsítványnak ahhoz, hogy a program ne adjon figyelmeztetést.\n"
-"<p>\n"
-"Az ajánlott érték: 14 nap.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Gyökértanúsítványokhoz:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Köztes CA-tanúsítványokhoz:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Végfelhasználói tanúsítványokhoz és kulcsokhoz:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-"Az \"Ez a kérdés ne jelenjen meg ezután\" beállítások alapállapotba hozása"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Sablontartalom"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "A sablonhoz rendelt billentyűparancs"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Sablontípus"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Az elküldésre várakozó üzenetek elküldése új üzenetek ellenőrzésekor"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Jelölje be, hogy a KMail kiküldje-e a Kimenő üzenetek mappában várakozó "
-"üzeneteket kézi vagy automatikus ellenőrzéskor, vagy egyáltalán ne legyen "
-"engedélyezve az automatikusüzenetküldés. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Még nem szinkronizált üzenetek automatikus átmozgatása, ha a mappákhoz nincs "
-"megfelelő hozzáférési jogosultság."
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Ha olyan új üzenetek vannak egy mappában, melyek még nincsenek feltöltve a "
-"kiszolgálóra, de nincs megfelelő jogosultsága a mappákhoz a feltöltés "
-"elvégzéséhez, akkor ezek az üzenetek automatikusan át lesznek helyezve ebbe a "
-"mappába."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Ez a beállítás lehetővé teszi a rendszergazdák számára, hogy előírjanak egy "
-"minimális ellenőrzési időközt.\"\n"
-"           \"A felhasználó nem fog tudni ennél kisebb időközt megadni az új "
-"üzenetek ellenőrzésére."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "A mappaválasztó párbeszédablakban legutoljára kiválasztott mappa."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"A felhasználó umask értékének figyelmen kívül hagyása, olvasási-írási "
-"hozzáférés csak a felhasználó számára"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "A paneltálca-ikon megjelenítési szabálya"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Részletes tájékoztató új üzenet érkezéséről"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Ha ez az opció be van jelölve, akkor értesítéskor minden mappánál megjelenik az "
-"érkezett új üzenetek száma. Ha nincs, akkor csak egy egyszerű 'Új üzenet "
-"érkezett' üzenet fog megjelenni."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "A külső szövegszerkesztő elérési út&ja:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Külső üzenetszerkesztő program használata a beépített &helyett"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "A csoportmunka-funkciók engedélyezése"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "A From:/To: fejlécek átalakítása válaszra adott válaszban"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"A Microsoft Outlookban sajnos nem teljesaz iCalendar szabvány támogatása. Ez az "
-"opció az egyik fogyatékosságon próbál segíteni. Ha azt tapasztalja, hogy az "
-"Outlookot használó partnerek nem kapják meg az Önválaszüzeneteit, próbálja "
-"bejelölni ezt az opciót."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "A csoportmunka-meghívók szövege az üzenettörzsbe kerüljön"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"A Microsoft Outlookban sajnos nem teljes az iCalendar szabvány támogatása. Ez "
-"az opció az egyik fogyatékosságon próbál segíteni. Ha azt tapasztalja, hogy az "
-"Outlookot használó partnerek nem kapják meg az Ön meghívóit, próbálja bejelölni "
-"ezt az opciót."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Exchange-kompatibilis meghívóelnevezés"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"A Microsoft Outlook, ha Microsoft Exchange kiszolgálóhoz van kapcsolódva, nem "
-"tudja kezelni a szabványos csoportmunka-üzeneteket. Jelölje be ezt, ha a "
-"meghívókat a Microsoft Exchange számára értelmezhető formátumban szeretné "
-"küldeni."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Ha ez be van jelölve, nem lesz látható az üzenetszerkesztő ablak, hanem "
-"automatikusan el lesznek küldve a meghívók. Ha elküldés előtt meg szeretné "
-"tekinteni az üzenetet, ne jelölje be ezt az opciót. Ne felejtse el, hogy a "
-"szerkesztőablakban látható szöveg iCalendar-formátumú, ezért inkább ne "
-"szerkessze kézzel."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Ha bejelöli ezt az opciót, akkor a különféle\"\n"
-"Kontactos alkalmazások (KOrganizer, KAddressBook, KNotes) el tudják tárolni az "
-"adataikat.</p>"
-"<p>Ha be szeretné jelölni ezt az opciót, az alkalmazásokban is be kell "
-"állítania, hogy az IMAP-os erőforrást használják. Ezt a TDE Vezérlőpultban "
-"lehet megtenni.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Általában nincs szükség az IMAP-os erőforrásmappákmegjelenítésére. Ha ez "
-"valami miatt mégis szükséges, itt lehet beállítani.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Ha egy azonosítót nem használ normál levelezéshez, \"\n"
-"          \"hanem csak csoportmunkai funkciókra, jelölje be ezt, hogy csak a "
-"csoportmunkamappák \"\n"
-"          \"látszódjanak. Akkor célszerű bejelölni, ha külön azonosítót használ "
-"levelezéshez \"\n"
-"          \"és csoportmunkai feladatokhoz.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Válassza ki a csoportmunka-mappák formátumát. "
-"<ul>"
-"<li>Az Ical az alapértelmezés naptármappáknál és a Vcard névjegymappáknál. "
-"Ezekkel a Kontact összes lehetősége használható.</li>"
-"<li>A Kolab XML nevű formátum egy nem standard adatmodellt használ, mely "
-"nagyjából az Outlookban használt formátumot követi. Így jobb "
-"Outlook-kompatibilitást lehet elérni Kolab-kiszolgáló vagy más hasonló program "
-"használata esetén.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Itt lehet kiválasztani az IMAP-os erőforrásmappák alapmappáját "
-"(szülőmappáját).</p>"
-"<p>Pl. a Kolab alapértelmezés szerint az IMAP-postafiók Bejövő üzenetek "
-"mappáját veszi alapmappának.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Ez az erőforrásmappákat tartalmazó IMAP-os postafiók azonosítója.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Ha az IMAP-os erőforrásmappák nyelvét be szeretné állítani, válasszon egyet "
-"a rendelkezésre álló nyelvek közül.</p>"
-"<p> Ennek a beállításnak az egyetlen célja a Microsoft Outlookkal való "
-"kompatibilitás. Csak indokolt esetben érdemes megtenni, mert lehetetlenné teszi "
-"a nyelvváltást. </p>"
-"<p>Ezért csak indokolt esetben ajánlott használni.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Ez az érték dönti el, hogy a KMail bemutatkozó oldala megjelenjen-e."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "A kapcsolatok maximális száma gépenként"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Itt lehet korlátozni a kapcsolatok számát gépenként, új üzenetek ellenőrzése "
-"esetén. Alapértelmezés szerint a kapcsolatok száma nincs korlátozva (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Gyorskereső mező megjelenítése"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ezzel az opcióval lehet ki-be kapcsolni az üzenetlista feletti gyorskereső "
-"mezőt, melynek segítségével gyorsan lehet keresni az üzenetlista elemei között."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Az eredeti karakterkészlet megőrzése válasznál és továbbításnál (ha lehetséges)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomatikus aláírás"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Az azonosító megjegyzése, hogy később is felhasználható legyen üzenet "
-"szerkesztésekor.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"A mappa megjegyzése az elküldött üzenetekhez, hogy később is felhasználható "
-"legyen üzenet szerkesztésekor."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Az átviteli mód megjegyzése, hogy később is felhasználható legyen üzenet "
-"szerkesztésekor."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Az azonosító megjegyzése, hogy később is felhasználható legyen üzenet "
-"szerkesztésekor.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "A sortördelés oszlo&pa:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Figyelmeztetés a gyökértanúsítvány &lejárása előtt ennyivel:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook &#8482; "
-"levelezőprogram fel tudja dolgozni a csatolásnevekben a nem angol karaktereket"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "M&indig visszajelzést szeretnék kérni az üzenet feldolgozásáról"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Jelölje be ezt az opciót, ha feldolgozási (MDN, Message Disposition "
-"Notification) visszajelzést szeretne kérni minden elküldött üzenetnél.</p>"
-"<p>Ez az opció csak az alapértelmezést állítja be, a visszajelzési kérés minden "
-"üzenetnél ki-be kapcsolható az üzenetszerkesztőben, a <em>Jellemzők</em>-><em>"
-"Feldolgozási visszajelzés kérése</em> menüponttal.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "A nemrég használt címek automatikus kiegészítése"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Kapcsolja ki ezt az opciót, ha nem szeretné, hogy a nemrég használt címek "
-"megjelenjenek az üzenetszerkesztő címmezőinél (a kiegészítési listában)."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Az automatikus mentés időköze:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Rendszeres időközönként biztonsági másolat készíthető a szerkesztőablakban "
-"található szövegről. A mentések időközét itt lehet beállítani. Ha 0-t ad meg, "
-"nem lesz automatikus mentés."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "A felismert e&lőtagok helyettesítése \"Re:\"-vel"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "A felismert előtagok helyettesítése \"F&wd:\"-vel"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Intelli&gens idézés használata"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Az elektronikus aláírás lejárt."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "A címválasztó típusa"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Beállítja a Címzett, Másolat és Rejtett másolat címek\n"
-"kiválasztási párbeszédablakának típusát."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "A címszerkesztő típusa"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Beállítja a Címzett,\n"
-"Másolat és Rejtett másolat mezők szerkesztőjét."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "A címzettszerkesztő mezők maximális száma."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Az eredeti karakterkészlet megőrzése válasznál és továbbításnál (ha lehetséges)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Néhány üzenet, elsősorban az automatikusan generáltak, nem adják meg az üzenet "
-"megfelelő megjelenítéséhez szükséges kódolást. Ilyen esetekben a program az itt "
-"megadott kódolásokat fogja alkalmazni. Állítsa be az Ön nyelvterületén "
-"leggyakrabban használtra (Magyarországon: ISO 8859-2 vagy UTF-8). "
-"Alapértelmezés szerint a rendszerben beállított kódolás lesz érvényes."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Ha ez nem 'Automatikus'-ra van állítva, akkor minden üzenet a megadott kódolást "
-"fogja használni, függetlenül attól, hogy az egyes üzenetekben mi van előírva."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Jelölje be ezt az opciót, ha az üzenetekben levő smiley jeleket (mint például "
-":-)) automatikusan emotikonokra szeretné cserélni (kis képekre)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Jelölje be ezt az opciót, ha többszintű idézést szeretne. Kapcsolja ki, ha el "
-"szeretné rejteni az idézett szöveg szintjeit."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatikus összecsukási szint:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Az idézett szöveg betűméretének lecsökkentése"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Jelölje be ezt az opciót, ha az idézett szöveget kisebb betűmérettel szeretné "
-"megjeleníteni."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Az elküldött üzenetek titk&osítva legyenek tárolva"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "A részletes fejlécben jelenjen meg a kliensazonosító"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Jelölje be ezt, ha ki szeretné írni a kliensazonosítót és az X-Mailer mezőt "
-"részletes fejléc használata esetén."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Az üzenetfeldolgozási visszajelzések küldése üres feladóval történjen."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Az üzenetfeldolgozási visszajelzések kiküldése üres feladóval törénjen. Néhány "
-"kiszolgáló visszadobja az ilyen üzeneteket, ezért ha a visszajelzés nem "
-"működik, kapcsolja ki ezt az opciót."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "A kifejezések sablonná lettek alakítva"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "A régi kifejezések sablonná lettek alakítva"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Az új üzenet sablonja"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "A válasz sablonja"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "A válasz mindenkinek sablonja"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "A továbbítás sablonja"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Idézésjelzők"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 / %2 %3 felhasználva"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13833,6 +11831,11 @@ msgstr "Hozzáadás másolatként"
 msgid "Add as BCC"
 msgstr "Hozzáadás rejtett másolatként"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Mégsem"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13848,13 +11851,13 @@ msgstr "A kiválasztott címzetteket"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"%n címzettet választott ki. A megengedett maximális szám azonban %1. Módosítsa "
-"a kijelölést."
+"%n címzettet választott ki. A megengedett maximális szám azonban %1. "
+"Módosítsa a kijelölést."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13870,11 +11873,11 @@ msgstr "A címválasztó ablak használata"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Ezzel a gombbal megnyitható egy új ablak, amelyben kiválaszthatók a címzettek "
-"az ismert címek közül."
+"Ezzel a gombbal megnyitható egy új ablak, amelyben kiválaszthatók a "
+"címzettek az ismert címek közül."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -13976,10 +11979,19 @@ msgstr "nagyobb vagy egyenlő"
 msgid " bytes"
 msgstr " bájt"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " napig"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "A keresés elvégzéséhez a(z) %1 mappa összes üzenetét le kell tölteni a "
 "kiszolgálóról. Ez eltarthat egy darabig. Folytatni szeretné a keresést?"
@@ -14120,16 +12132,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Adatgyűjtés - azonosító: '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Adatgyűjtés - azonosító: '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14148,10 +12156,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"A(z) '%1' szkript tartalma:\n"
+msgid "Contents of script '%1':\n"
+msgstr "A(z) '%1' szkript tartalma:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14174,20 +12180,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"A Sieve speciális jellemzői:\n"
+msgid "Sieve capabilities:\n"
+msgstr "A Sieve speciális jellemzői:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Nincs speciális jellemző)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"A rendelkezésre álló Sieve-szkriptek:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "A rendelkezésre álló Sieve-szkriptek:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14267,11 +12269,11 @@ msgstr "Ebbe a mezőbe lehet bevinni a levelekhez fűzendő aláírását."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Itt lehet kiválasztani az aláírást tartalmazó fájlt. A program minden új levél "
-"létrehozásakor és az aláírás hozzáfűzésekor újból beolvassa a fájlt."
+"Itt lehet kiválasztani az aláírást tartalmazó fájlt. A program minden új "
+"levél létrehozásakor és az aláírás hozzáfűzésekor újból beolvassa a fájlt."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14287,22 +12289,27 @@ msgstr "Megnyitja a megadott fájlt szövegszerkesztőben."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Itt lehet beírni egy tetszőleges parancsot, elérési út nem szükséges, ha a "
 "szükséges program szerepel az elérési útban. Új levél írásakor a KMail "
 "lefuttatja a parancsot és annak kimenetét illeszti be a levélbe aláírásként. "
-"Gyakran használják például a \"fortune\" és \"ksig -random\" parancsot erre a "
-"célra."
+"Gyakran használják például a \"fortune\" és \"ksig -random\" parancsot erre "
+"a célra."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Parancs:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Elérési út"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Új bejegyzés:"
@@ -14339,6 +12346,11 @@ msgstr "Postafiók hozzáadása"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Biztosan törölni szeretné a(z) <b>%1</b> azonosítót?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Alkalm&azás erre:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14353,6 +12365,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Szerkesztés..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14392,9 +12408,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14431,6 +12447,16 @@ msgstr "Nem kell engedélyezni"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Nem lehet beszűrni a(z) %1 fájl tartalmát: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Címzett: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Másolat: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14460,58 +12486,50 @@ msgstr "Nem indítható előtétparancs sablonból: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Itt lehet új üzenetek, válaszok, továbbított üzenetek készítésénél "
-"felhasználható sablonokat létrehozni.</p>"
-"<p>A sablonok támogatják helyettesítő parancsok beírását vagy a <i>"
-"Parancs beszúrása</i> menüből történő kiválasztását.</p>"
-"<p>Ezek a sablonok egy adott mappához vannak kötve, felülbírálják mind a "
-"globális sablonokat, mind az azonosítóhoz rendelt sablonokat.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Itt lehet új üzenetek, válaszok, továbbított üzenetek készítésénél "
+"felhasználható sablonokat létrehozni.</p><p>A sablonok támogatják "
+"helyettesítő parancsok beírását vagy a <i>Parancs beszúrása</i> menüből "
+"történő kiválasztását.</p><p>Ezek a sablonok egy adott mappához vannak "
+"kötve, felülbírálják mind a globális sablonokat, mind az azonosítóhoz "
+"rendelt sablonokat.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Itt lehet új üzenetek, válaszok, továbbított üzenetek készítésénél "
-"felhasználható sablonokat létrehozni.</p>"
-"<p>A sablonok támogatják helyettesítő parancsok beírását vagy a <i>"
-"Parancs beszúrása</i> menüből történő kiválasztását.</p>"
-"<p>Ezek a sablonok egy adott adott azonosítóhoz vannak kötve, felülbírálják a "
-"globális sablonokat, de a mappához kötött sablonok felülbíráhatják.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Itt lehet új üzenetek, válaszok, továbbított üzenetek készítésénél "
+"felhasználható sablonokat létrehozni.</p><p>A sablonok támogatják "
+"helyettesítő parancsok beírását vagy a <i>Parancs beszúrása</i> menüből "
+"történő kiválasztását.</p><p>Ezek a sablonok egy adott adott azonosítóhoz "
+"vannak kötve, felülbírálják a globális sablonokat, de a mappához kötött "
+"sablonok felülbíráhatják.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Itt lehet új üzenetek, válaszok, továbbított üzenetek készítésénél "
-"felhasználható sablonokat létrehozni.</p>"
-"<p>A sablonok támogatják helyettesítő parancsok beírását vagy a <i>"
-"Parancs beszúrása</i> menüből történő kiválasztását.</p>"
-"<p>Ezek a sablonok globálisak, mind a globális sablonok, mind az azonosítóhoz "
-"rendelt sablonok felülbírálhatják.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Itt lehet új üzenetek, válaszok, továbbított üzenetek készítésénél "
+"felhasználható sablonokat létrehozni.</p><p>A sablonok támogatják "
+"helyettesítő parancsok beírását vagy a <i>Parancs beszúrása</i> menüből "
+"történő kiválasztását.</p><p>Ezek a sablonok globálisak, mind a globális "
+"sablonok, mind az azonosítóhoz rendelt sablonok felülbírálhatják.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14755,8 +12773,8 @@ msgstr "Az eredeti üzenettörzs elküldése csövön, a kapott eredmény beszú
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
-"Az eredeti üzenet elküldése csövön a fejlécmezőkkel együtt, a kapott eredmény "
-"beszúrása"
+"Az eredeti üzenet elküldése csövön a fejlécmezőkkel együtt, a kapott "
+"eredmény beszúrása"
 
 #: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
@@ -14766,6 +12784,10 @@ msgstr "Az eredeti üzenettörzs elküldése csövön, a kapott eredmény beszú
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Az eredeti üzenettörzs elküldése, majd felülírása a kapott eredménnyel"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "A kurzorpozíció beállítása"
@@ -14798,114 +12820,6 @@ msgstr "Nyomkövetés be"
 msgid "Turn Debug Off"
 msgstr "Nyomkövetés ki"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...a jobbra és balra nyíllal a következő ill. előző\n"
-"üzenetre lehet lépni?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...könnyen létre lehet hozni szűrési feltételt feladóra, címzettre, "
-"tárgysorra\n"
-"vagy levelezőlistára az <em>Eszközök-&gt;Szűrő&nbsp;létrehozása</em> "
-"menüpontban?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...könnyen el lehet távolítani a levelezőlistákról érkező üzenetek\n"
-"tárgysorához fűzött &quot;[levelezőlistanév]&quot; sztringeket\n"
-"a <em>fejléc újraírása</em> szűrőművelettel? Elég kiadni az alábbi parancsot:\n"
-"<pre>fejléc újraírása &quot;Subject&quot;\n"
-"   Erről: &quot;\\s*\\[levelezőlistanév\\]\\s*&quot;\n"
-"   Erre: &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...a levelezőlistákat mappához lehet rendelni a\n"
-"<em>Mappa-&gt;Levelezőlista-kezelés</em> párbeszédablakban? Ezután az\n"
-"<em>Üzenet-&gt;Új&nbsp;üzenet&nbsp;a&nbsp;levelezőlistára...</em>\n"
-"menüponttal megnyitható egy új üzenet a levelezőlista címével mint címzettel\n"
-"A művelet úgy is végrehajtható, hogy a középső egérgombbal rákattint a "
-"mappára.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...minden mappához saját ikon rendelhető?\n"
-"Lásd a <em>Mappa-&gt;Tulajdonságok</em></p> menüpontot.\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...a KMail színes csíkkal is jelezni tudja az aktuális\n"
-"üzenet típusát (egyszerű szöveg/HTML/OpenPGP)?</p>\n"
-"<p>Ezzel meg lehet akadályozni, hogy egy támadó olyan hamisított HTML üzenetet\n"
-"tudjon küldeni, mely a KMail sikeres dekódolást jelző keretét imitálja.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...bármelyik fejléc szerint szűrni lehet? Elég beírni a fejléc nevét\n"
-"a keresési szabály első szövegmezőjébe.</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...a tisztán HTML-formátumú üzenetek kiszűréséhez használható a következő "
-"szabály:\n"
-"<pre>&quot;Content-type&quot; tartalmazza &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...válasz küldésekor csak a kijelölt részt fogja idézni a program?</p>\n"
-"<p>Ha semmit sem jelöl ki, akkor az egész üzenet lesz az idézett szöveg.</p>\n"
-"<p>Ez még a csatolt szöveges fájlokkal is így működik a\n"
-"<em>Nézet-&gt;Csatolások-&gt;Beszúrva</em> menüpont használatakor.</p>\n"
-"<p>Ez a működési mód az összes válaszküldési funkcióra igaz, kivéve\n"
-"az <em>Üzenet-&gt;Válasz idézés nélkül</em> menüpontot.</p>\n"
-"<p align=\"right\"><em>Ezt a tippet David F. Newman küldte be</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nincs mit visszavonni."
@@ -14975,6 +12889,15 @@ msgstr "Csatolás: %1 (névtelen)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Már létezik \"%1\" nevű fájl. Felül szeretné írni?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Felülírás?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15093,13 +13016,13 @@ msgstr "Kép kül&dése minden üzenettel"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Jelölje be ezt az opciót, ha azt szeretné, hogy a KMail adjon egy ún. X-Face "
-"fejlécet az azonosítóval készített üzenetekhez. Az X-Face egy kis méretű (48x48 "
-"képpontos) fekete-fehér kép, melyet sok levelezőprogram kezelni tud."
+"fejlécet az azonosítóval készített üzenetekhez. Az X-Face egy kis méretű "
+"(48x48 képpontos) fekete-fehér kép, melyet sok levelezőprogram kezelni tud."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15127,12 +13050,13 @@ msgstr "Fájlválasztás..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Itt lehet kiválasztani a képfájlt. A kép lehetőleg erősen kontrasztos legyen és "
-"megközelítőleg négyzet alakú. Általában célszerű világos hátteret választani."
+"Itt lehet kiválasztani a képfájlt. A kép lehetőleg erősen kontrasztos legyen "
+"és megközelítőleg négyzet alakú. Általában célszerű világos hátteret "
+"választani."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15140,20 +13064,20 @@ msgstr "Beállítás címjegyzékből"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr "A címbejegyzésnél megadott kép kicsinyített változata használható."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>A KMail automatikusan mellékelni tud minden üzenethez egy kis méretű (48x48 "
-"képpontos) fekete-fehér képet. Például ez lehet az Ön fényképe vagy valamilyen "
-"embléma. A kép megjelenik a címzett kliensében (ha a programja támogatja ezt a "
-"lehetőséget)."
+"<qt>A KMail automatikusan mellékelni tud minden üzenethez egy kis méretű "
+"(48x48 képpontos) fekete-fehér képet. Például ez lehet az Ön fényképe vagy "
+"valamilyen embléma. A kép megjelenik a címzett kliensében (ha a programja "
+"támogatja ezt a lehetőséget)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15161,11 +13085,11 @@ msgstr "Ebbe a mezőbe lehet bevinni a kívánt X-Face sztringet."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Néhány példa található itt: <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Néhány példa található itt: <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15180,128 +13104,1810 @@ msgstr "Nincs kép"
 msgid "You do not have your own contact defined in the address book."
 msgstr "A saját névjegy nincs benne a címjegyzékben."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Elektronikus aláírás"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Az üzenetek a&utomatikus aláírása"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Ha ez az opció be van jelölve, alapértelmezés szerint minden elküldött "
+"üzenet alá lesz írva elektronikusan. Ez az alapértelmezés minden üzenetnél "
+"felülbírálható."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Titkosítás"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Az üzenet tárgyának beállítása"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Ha ez az opció be van jelölve, az üzenet vagy fájl nem csak a címzett "
+"publikus kulcsával, hanem az Ön kulcsával is titkosítva lesz. Így Ön később "
+"is dekódolni tudja az elküldött üzeneteit. Ez gyakran fontos lehet."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Másolat küldése a megadott 'cím'-re"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Az aláírt/&titkosított szöveg megjelenítése a szerkesztés után"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Rejtett másolat küldése a 'cím'-re"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Ha ez az opció be van jelölve, az aláírt és/vagy titkosított szöveg "
+"megjelenik egy külön ablakban, lehetővé téve az adatok megtekintését "
+"elküldés előtt. Ez hasznos lehet a titkosítási alrendszer működésének "
+"ellenőrzéséhez."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "A 'fejlécmező' hozzáadása az üzenethez"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Az elküldött üzenetek titk&osítva legyenek tárolva"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Az üzenettörzs beolvasása 'fájl'-ból"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Jelölje be, ha titkosított tárolást szeretne "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Az üzenet törzsének megadása"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Az üzenetek titkosítva legyenek tárolva</h1>\n"
+"Ha ez az opció be van jelölve, akkor az elküldött titkosított üzenetek "
+"titkosítva lesznek eltárolva. Ez általában nem ajánlott, mert az üzeneteket "
+"nem lehet majd elolvasni, ha a szükséges tanúsítványok már lejártak.\n"
+"<p>\n"
+"Bizonyos körülmények esetén szükség lehet erre a beállításra. Ha nem biztos "
+"benne, kérjen segítséget a rendszergazdától.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Csatolás hozzáadása az üzenethez (a művelet megismételhető)"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Mindig jelenjenek meg a titk&osítási kulcsok (megerősítés)"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Csak az új üzenetek ellenőrzése"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Ha ez az opció be van jelölve, a program mindig felkínálja a rendelkezésre "
+"álló publikus kulcsok listáját, Válassza ki az egyiket a titkosítás "
+"elvégzéséhez. Ha nincs bejelölve az opció, az alkalmazás csak akkor hozza "
+"fel a párbeszédablakot, ha nem található a megfelelő kulcs vagy több kulcs "
+"közül lehet választani."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Csak az üzenetszerkesztő ablak megnyitása"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Az üzenetek titkosítása min&dig, amikor csak lehetséges"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "A megadott üzenetfájl megtekintése"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Ha ez az opció be van jelölve, minden elküldött üzenet titkosítva lesz, "
+"amikor ez lehetséges. Ez az alapértelmezés minden üzenetnél felülbírálható."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Üzenet küldése az 'address' címre, az 'URL' című fájl csatolásával"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Piszkozat mentésénél n&em kell aláírás és titkosítás"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Olvasott"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Hogyan működik ez?"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Régi"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Univerzális"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Törölt"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Válasz"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Megválaszolt"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Válasz mindenkinek"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Továbbított"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Továbbítás"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Elküldési sorba állított"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Billentyű&parancs:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Elküldött"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Sablontíp&us:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Figyelt"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Sablontartalom"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Figyelmen kívül hagyott"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "A sablonhoz rendelt billentyűparancs"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Kéretlen"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Sablontípus"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ál-kéretlen"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "A mappa tulajdonságai"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Feladat"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "A ma&ppa levelezőlistát tartalmaz"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Van csatolása"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "A lista &címe:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 / %2 %3 felhasználva"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormál:"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Elérési út"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Ol&vasatlan:"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Régi üzenetek eltávolítása"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Le&járási idő:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Az &olvasott üzenetek eltávolítása"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Lejárás&i idő:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "A nem olvasott üzenetek e&ltávolítása"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "nap"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "hét"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "hónap"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Speciális"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "A feladó személya&zonossága:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Tárolási formátum:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Listakij&elzés:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Az elküldésre várakozó üzenetek elküldése új üzenetek ellenőrzésekor"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Már létezik \"%1\" nevű fájl. Felül szeretné írni?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Jelölje be, hogy a KMail kiküldje-e a Kimenő üzenetek mappában "
+"várakozó üzeneteket kézi vagy automatikus ellenőrzéskor, vagy egyáltalán ne "
+"legyen engedélyezve az automatikusüzenetküldés. </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Felülírás?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Még nem szinkronizált üzenetek automatikus átmozgatása, ha a mappákhoz nincs "
+"megfelelő hozzáférési jogosultság."
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Ha olyan új üzenetek vannak egy mappában, melyek még nincsenek feltöltve a "
+"kiszolgálóra, de nincs megfelelő jogosultsága a mappákhoz a feltöltés "
+"elvégzéséhez, akkor ezek az üzenetek automatikusan át lesznek helyezve ebbe "
+"a mappába."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Ez a beállítás lehetővé teszi a rendszergazdák számára, hogy előírjanak egy "
+"minimális ellenőrzési időközt.\"\n"
+"           \"A felhasználó nem fog tudni ennél kisebb időközt megadni az új "
+"üzenetek ellenőrzésére."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "A mappaválasztó párbeszédablakban legutoljára kiválasztott mappa."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"A felhasználó umask értékének figyelmen kívül hagyása, olvasási-írási "
+"hozzáférés csak a felhasználó számára"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "A paneltálca-ikon megjelenítési szabálya"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Részletes tájékoztató új üzenet érkezéséről"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Ha ez az opció be van jelölve, akkor értesítéskor minden mappánál megjelenik "
+"az érkezett új üzenetek száma. Ha nincs, akkor csak egy egyszerű 'Új üzenet "
+"érkezett' üzenet fog megjelenni."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "A külső szövegszerkesztő elérési út&ja:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Külső üzenetszerkesztő program használata a beépített &helyett"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "A csoportmunka-funkciók engedélyezése"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "A From:/To: fejlécek átalakítása válaszra adott válaszban"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"A Microsoft Outlookban sajnos nem teljesaz iCalendar szabvány támogatása. Ez "
+"az opció az egyik fogyatékosságon próbál segíteni. Ha azt tapasztalja, hogy "
+"az Outlookot használó partnerek nem kapják meg az Önválaszüzeneteit, "
+"próbálja bejelölni ezt az opciót."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "A csoportmunka-meghívók szövege az üzenettörzsbe kerüljön"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"A Microsoft Outlookban sajnos nem teljes az iCalendar szabvány támogatása. "
+"Ez az opció az egyik fogyatékosságon próbál segíteni. Ha azt tapasztalja, "
+"hogy az Outlookot használó partnerek nem kapják meg az Ön meghívóit, "
+"próbálja bejelölni ezt az opciót."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Exchange-kompatibilis meghívóelnevezés"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"A Microsoft Outlook, ha Microsoft Exchange kiszolgálóhoz van kapcsolódva, "
+"nem tudja kezelni a szabványos csoportmunka-üzeneteket. Jelölje be ezt, ha a "
+"meghívókat a Microsoft Exchange számára értelmezhető formátumban szeretné "
+"küldeni."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Ha ez be van jelölve, nem lesz látható az üzenetszerkesztő ablak, hanem "
+"automatikusan el lesznek küldve a meghívók. Ha elküldés előtt meg szeretné "
+"tekinteni az üzenetet, ne jelölje be ezt az opciót. Ne felejtse el, hogy a "
+"szerkesztőablakban látható szöveg iCalendar-formátumú, ezért inkább ne "
+"szerkessze kézzel."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Ha bejelöli ezt az opciót, akkor a különféle\"\n"
+"Kontactos alkalmazások (KOrganizer, KAddressBook, KNotes) el tudják tárolni "
+"az adataikat.</p><p>Ha be szeretné jelölni ezt az opciót, az alkalmazásokban "
+"is be kell állítania, hogy az IMAP-os erőforrást használják. Ezt a TDE "
+"Vezérlőpultban lehet megtenni.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Általában nincs szükség az IMAP-os erőforrásmappákmegjelenítésére. Ha ez "
+"valami miatt mégis szükséges, itt lehet beállítani.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Ha egy azonosítót nem használ normál levelezéshez, \"\n"
+"          \"hanem csak csoportmunkai funkciókra, jelölje be ezt, hogy csak a "
+"csoportmunkamappák \"\n"
+"          \"látszódjanak. Akkor célszerű bejelölni, ha külön azonosítót "
+"használ levelezéshez \"\n"
+"          \"és csoportmunkai feladatokhoz.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Válassza ki a csoportmunka-mappák formátumát. <ul><li>Az Ical az "
+"alapértelmezés naptármappáknál és a Vcard névjegymappáknál. Ezekkel a "
+"Kontact összes lehetősége használható.</li><li>A Kolab XML nevű formátum egy "
+"nem standard adatmodellt használ, mely nagyjából az Outlookban használt "
+"formátumot követi. Így jobb Outlook-kompatibilitást lehet elérni Kolab-"
+"kiszolgáló vagy más hasonló program használata esetén.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Itt lehet kiválasztani az IMAP-os erőforrásmappák alapmappáját "
+"(szülőmappáját).</p><p>Pl. a Kolab alapértelmezés szerint az IMAP-postafiók "
+"Bejövő üzenetek mappáját veszi alapmappának.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Ez az erőforrásmappákat tartalmazó IMAP-os postafiók azonosítója.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Ha az IMAP-os erőforrásmappák nyelvét be szeretné állítani, válasszon "
+"egyet a rendelkezésre álló nyelvek közül.</p><p> Ennek a beállításnak az "
+"egyetlen célja a Microsoft Outlookkal való kompatibilitás. Csak indokolt "
+"esetben érdemes megtenni, mert lehetetlenné teszi a nyelvváltást. </"
+"p><p>Ezért csak indokolt esetben ajánlott használni.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Ez az érték dönti el, hogy a KMail bemutatkozó oldala megjelenjen-e."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "A kapcsolatok maximális száma gépenként"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Itt lehet korlátozni a kapcsolatok számát gépenként, új üzenetek ellenőrzése "
+"esetén. Alapértelmezés szerint a kapcsolatok száma nincs korlátozva (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Gyorskereső mező megjelenítése"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ezzel az opcióval lehet ki-be kapcsolni az üzenetlista feletti gyorskereső "
+"mezőt, melynek segítségével gyorsan lehet keresni az üzenetlista elemei "
+"között."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Az eredeti karakterkészlet megőrzése válasznál és továbbításnál (ha "
+"lehetséges)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomatikus aláírás"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Az azonosító megjegyzése, hogy később is felhasználható legyen üzenet "
+"szerkesztésekor.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"A mappa megjegyzése az elküldött üzenetekhez, hogy később is felhasználható "
+"legyen üzenet szerkesztésekor."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Az átviteli mód megjegyzése, hogy később is felhasználható legyen üzenet "
+"szerkesztésekor."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Az azonosító megjegyzése, hogy később is felhasználható legyen üzenet "
+"szerkesztésekor.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "A sortördelés oszlo&pa:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Figyelmeztetés a gyökértanúsítvány &lejárása előtt ennyivel:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Jelölje be ezt az opciót, ha azt szeretné, hogy az Outlook &#8482; "
+"levelezőprogram fel tudja dolgozni a csatolásnevekben a nem angol "
+"karaktereket"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "M&indig visszajelzést szeretnék kérni az üzenet feldolgozásáról"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Jelölje be ezt az opciót, ha feldolgozási (MDN, Message Disposition "
+"Notification) visszajelzést szeretne kérni minden elküldött üzenetnél.</"
+"p><p>Ez az opció csak az alapértelmezést állítja be, a visszajelzési kérés "
+"minden üzenetnél ki-be kapcsolható az üzenetszerkesztőben, a <em>Jellemzők</"
+"em>-><em>Feldolgozási visszajelzés kérése</em> menüponttal.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "A nemrég használt címek automatikus kiegészítése"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Kapcsolja ki ezt az opciót, ha nem szeretné, hogy a nemrég használt címek "
+"megjelenjenek az üzenetszerkesztő címmezőinél (a kiegészítési listában)."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Az automatikus mentés időköze:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Rendszeres időközönként biztonsági másolat készíthető a szerkesztőablakban "
+"található szövegről. A mentések időközét itt lehet beállítani. Ha 0-t ad "
+"meg, nem lesz automatikus mentés."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "A felismert e&lőtagok helyettesítése \"Re:\"-vel"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "A felismert előtagok helyettesítése \"F&wd:\"-vel"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Intelli&gens idézés használata"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Az elektronikus aláírás lejárt."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "A címválasztó típusa"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Beállítja a Címzett, Másolat és Rejtett másolat címek\n"
+"kiválasztási párbeszédablakának típusát."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "A címszerkesztő típusa"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Beállítja a Címzett,\n"
+"Másolat és Rejtett másolat mezők szerkesztőjét."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "A címzettszerkesztő mezők maximális száma."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Az eredeti karakterkészlet megőrzése válasznál és továbbításnál (ha "
+"lehetséges)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Néhány üzenet, elsősorban az automatikusan generáltak, nem adják meg az "
+"üzenet megfelelő megjelenítéséhez szükséges kódolást. Ilyen esetekben a "
+"program az itt megadott kódolásokat fogja alkalmazni. Állítsa be az Ön "
+"nyelvterületén leggyakrabban használtra (Magyarországon: ISO 8859-2 vagy "
+"UTF-8). Alapértelmezés szerint a rendszerben beállított kódolás lesz "
+"érvényes."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Ha ez nem 'Automatikus'-ra van állítva, akkor minden üzenet a megadott "
+"kódolást fogja használni, függetlenül attól, hogy az egyes üzenetekben mi "
+"van előírva."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Jelölje be ezt az opciót, ha az üzenetekben levő smiley jeleket (mint "
+"például :-)) automatikusan emotikonokra szeretné cserélni (kis képekre)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Jelölje be ezt az opciót, ha többszintű idézést szeretne. Kapcsolja ki, ha "
+"el szeretné rejteni az idézett szöveg szintjeit."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatikus összecsukási szint:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Az idézett szöveg betűméretének lecsökkentése"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Jelölje be ezt az opciót, ha az idézett szöveget kisebb betűmérettel "
+"szeretné megjeleníteni."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Az elküldött üzenetek titk&osítva legyenek tárolva"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "A részletes fejlécben jelenjen meg a kliensazonosító"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Jelölje be ezt, ha ki szeretné írni a kliensazonosítót és az X-Mailer mezőt "
+"részletes fejléc használata esetén."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Az üzenetfeldolgozási visszajelzések küldése üres feladóval történjen."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Az üzenetfeldolgozási visszajelzések kiküldése üres feladóval törénjen. "
+"Néhány kiszolgáló visszadobja az ilyen üzeneteket, ezért ha a visszajelzés "
+"nem működik, kapcsolja ki ezt az opciót."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "A kifejezések sablonná lettek alakítva"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "A régi kifejezések sablonná lettek alakítva"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Az új üzenet sablonja"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "A válasz sablonja"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "A válasz mindenkinek sablonja"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "A továbbítás sablonja"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Idézésjelzők"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "A fájl módo&sítása"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Szerkesztés..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Navigá&ció"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Mappa"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Üzene&t"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Speciális válasz"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Tová&bbítás"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "A betűtípusok alapértelmezésének visszaállítása"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML eszköztár"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Általános beállítások"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML eszköztár"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "A tanúsítványok ellenőrzése CRL-ekkel"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Ha ez az opció be van jelölve, a program ellenőrzi az S/MIME-os "
+"tanúsítványokat CRL-ek (visszavonási listák, Certificate Revocation Lists) "
+"segítségével."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "A tanúsítványok online ellenőrzése (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Ha ez az opció be van jelölve, a program ellenőrzi az S/MIME-os "
+"tanúsítványokat az interneten keresztül, OCSP-vel (Online Certificates "
+"Status Protocol). Adja meg alább az OCSP-kezelő URL-jét."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Online tanúsítványellenőrzés"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Az OCSP-kezelő URL-je:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Adja meg a tanúsítványokat ellenőrző OCSP-kezelő URL-jét. Az URL általában "
+"http://-vel kezdődik."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Az OCSP-kezelő aláírása:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "A tanúsítványok szolgáltatási URL-jének figyelmen kívül hagyása"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "A tanúsítvány-házirendeket nem kell ellenőrizni"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Alapértelmezés szerint a GnuPG a ~/.gnupg/policies.txt fájl alapján "
+"ellenőrzi, hogy egy tanúsítványkezelési házirend engedélyezett-e. Ha "
+"bejelöli ezt az opciót, a házirendek nem lesznek ellenőrizve."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "A CRL-eket nem kell ellenőrizni"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ha ez az opció be van jelölve, a visszavonási listákat (CRL-eket) nem "
+"ellenőrzi a program S/MIME-tanúsítványok ellenőrzésekor."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "A hiányzó kibocsátói tanúsítványok letöltése"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Ha ez az opció be van jelölve, a program letölti a hiányzó kiadói "
+"tanúsítványokat (ez mindkét ellenőrzési módszerre, a CRL-ekre és az OCSP-re "
+"is vonatkozik)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP kérések"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "A HTTP kérések letiltása"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Teljesen kikapcsolja a HTTP használatát S/MIME-kezelésnél."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "A HTTP-kérésekhez használandó proxy: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "A rendszer HTTP proxy-jának használata:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Ha ez be van jelölve, a bal oldalon látható HTTP proxy cím (mely a "
+"http_proxy környezeti változóból származik) lesz felhasználva HTTP "
+"kérésekhez."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Itt kell megadni a HTTP proxy címét, ezt használja a program az S/MIME-os "
+"HTTP kérésekhez. A várt szintaxis: gépnév:port, például: proxy.valahol."
+"hu:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+"A HTTP visszavonási listák disztribúciós pontjának figyelmen kívül hagyása"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Visszavonási lista keresésekor az ellenőrzendő tanúsítvány általában "
+"tartalmaz \"CRL disztribúciós pont\" (DP) bejegyzéseket, melyek az URL "
+"elérését leíró URL-ek. Az első alkalmas disztribúciós pontot használja a "
+"program. used. Ha ez be van jelölve, akkor kereséskor a HTTP-sémát használó "
+"bejegyzések figyelmen kívül lesznek hagyva."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-kérések"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Nem kell LDAP-lekérdezést végezni"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Letiltja az LDAP és az S/MIME használatát."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+"Az LDAP visszavonási listák disztribúciós pontjának figyelmen kívül hagyása"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Visszavonási lista keresésekor az ellenőrzendő tanúsítvány általában "
+"tartalmaz \"CRL disztribúciós pont\" (DP) bejegyzéseket, melyek az URL "
+"elérését leíró URL-ek. Az első alkalmas disztribúciós pontot használja a "
+"program. used. Ha ez be van jelölve, akkor kereséskor az LDAP-sémát használó "
+"bejegyzések figyelmen kívül lesznek hagyva."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Elsődleges LDAP-kiszolgáló:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Az itt megadott LDAP-kiszolgálóhoz lesznek elküldve először az LDAP-kérések. "
+"Az itt megadott érték felülbírálja az LDAP URL-ben megadott gépnevet és "
+"portot (akkor is, ha azok nincsenek megadva). Más LDA-kiszolgálókhoz csak "
+"akkor fordul a program, ha a \"proxy\"-kapcsolat nem működik.\n"
+"A várt szintaxis: \"GÉPNÉV\" vagy \"GÉPNÉV:PORT\". A port alapértelmezett "
+"értéke (389, a standard LDAP port) lesz érvényes, ha nincs megadva port "
+"érték."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Hozzáadás..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Csoportmunka"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "A betűtípusok alapértelmezésének visszaállítása"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "korlátlan"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Sablonbeállítások"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Válasz a feladónak"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Válasz mindenkinek / válasz listára"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Üzenet továbbítása"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Figyelmeztetés aláírás &nélküli üzenetek elküldése előtt"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Jelölje be, ha figyelmeztetést szeretne kapni az aláírás nélküli üzenetek "
+"elküldése előtt."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés aláírás nélküli üzenetek elküldése előtt</h1>\n"
+"Ha ez az opció be van jelölve, a program figyelmeztetést fog adni olyan "
+"üzenet küldése előtt, mely elektronikus aláírás nélküli részeket tartalmaz.\n"
+"<p>\n"
+"A maximális adatbiztonság érdekében célszerű bekapcsolva hagyni ezt az "
+"opciót.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Figyelmeztetés, ha titkosítás nélkül készül üzenetet küldeni"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Ha bejelöli, a program figyelmeztetést fog adni titkosítás nélküli üzenet "
+"elküldése előtt."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés titkosítás nélküli üzenet elküldése előtt</h1>\n"
+"Ha ez az opció be van jelölve, akkor a program figyelmeztetni fog, ha az "
+"elküldendő üzenet vagy annak egy része nincs titkosítva.\n"
+"<p>\n"
+"A maximális adatbiztonság érdekében célszerű bekapcsolva hagyni ezt az "
+"opciót.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Figyelmeztetés, ha a &címzett e-mail címe nem szerepel a tanúsítványban"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Ha ezt bejelöli, akkor a program figyelmeztetni fog, ha a cím nem szerepel a "
+"tanúsítványban"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés, ha a címzett e-mail címe nem szerepel a tanúsítványban</"
+"h1>\n"
+"Ha ez az opció be van jelölve, akkor figyelmeztetni fog a program, ha a "
+"címzett e-mail címe nem szerepel a titkosításhoz használt tanúsítványban.\n"
+"<p>\n"
+"A maximális adatbiztonság érdekében célszerű bekapcsolva hagyni ezt az "
+"opciót.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Figyelmeztetés, ha egy tanúsítvány vagy kulcs rövidesen lejár (az időérték "
+"beállítása alább)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Aláíráshoz"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Titkosításhoz"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Itt lehet kiválasztani a napok számát"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés, ha egy aláírási tanúsítvány lejár</h1>\n"
+"Legalább az itt megadott számú napig még érvényesnek kell lennie az aláírási "
+"tanúsítványoknak ahhoz, hogy a program ne adjon figyelmeztetést.\n"
+"<p>\n"
+"Az ajánlott érték: 14 nap.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés, ha egy titkosítási tanúsítvány lejár</h1>\n"
+"Itt lehet megadni, hogy egy titkosítási tanúsítványnak még legalább hány "
+"napig kell érvényesnek lennie ahhoz, hogy a program ne adjon "
+"figyelmeztetést.\n"
+"<p>\n"
+"Az ajánlott beállítás 14 nap.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés, ha a láncban az egyik tanúsítvány lejár</h1>\n"
+"Itt lehet megadni, hogy az elküldéskor még legalább hány napig érvényesnek "
+"kell lennie a láncban található összes tanúsítványnak, hogy ne adjon "
+"figyelmeztetést a program.\n"
+"<p>\n"
+"A javasolt beállítás: 14 nap.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés, ha a tanúsítványkiadó (CA) tanúsítványa lejár</h1>\n"
+"Legalább az itt megadott számú napig még érvényesnek kell lennie a "
+"tanúsítványkiadó tanúsítványának ahhoz, hogy a program ne adjon "
+"figyelmeztetést.\n"
+"<p>\n"
+"Az ajánlott érték: 14 nap.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Figyelmeztetés, ha a gyökértanúsítvány lejár</h1>\n"
+"Legalább az itt megadott számú napig még érvényesnek kell lennie a "
+"gyökértanúsítványnak ahhoz, hogy a program ne adjon figyelmeztetést.\n"
+"<p>\n"
+"Az ajánlott érték: 14 nap.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Gyökértanúsítványokhoz:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Köztes CA-tanúsítványokhoz:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Végfelhasználói tanúsítványokhoz és kulcsokhoz:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+"Az \"Ez a kérdés ne jelenjen meg ezután\" beállítások alapállapotba hozása"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...a jobbra és balra nyíllal a következő ill. előző\n"
+"üzenetre lehet lépni?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...könnyen létre lehet hozni szűrési feltételt feladóra, címzettre, "
+"tárgysorra\n"
+"vagy levelezőlistára az <em>Eszközök-&gt;Szűrő&nbsp;létrehozása</em> "
+"menüpontban?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...könnyen el lehet távolítani a levelezőlistákról érkező üzenetek\n"
+"tárgysorához fűzött &quot;[levelezőlistanév]&quot; sztringeket\n"
+"a <em>fejléc újraírása</em> szűrőművelettel? Elég kiadni az alábbi "
+"parancsot:\n"
+"<pre>fejléc újraírása &quot;Subject&quot;\n"
+"   Erről: &quot;\\s*\\[levelezőlistanév\\]\\s*&quot;\n"
+"   Erre: &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...a levelezőlistákat mappához lehet rendelni a\n"
+"<em>Mappa-&gt;Levelezőlista-kezelés</em> párbeszédablakban? Ezután az\n"
+"<em>Üzenet-&gt;Új&nbsp;üzenet&nbsp;a&nbsp;levelezőlistára...</em>\n"
+"menüponttal megnyitható egy új üzenet a levelezőlista címével mint "
+"címzettel\n"
+"A művelet úgy is végrehajtható, hogy a középső egérgombbal rákattint a "
+"mappára.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...minden mappához saját ikon rendelhető?\n"
+"Lásd a <em>Mappa-&gt;Tulajdonságok</em></p> menüpontot.\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...a KMail színes csíkkal is jelezni tudja az aktuális\n"
+"üzenet típusát (egyszerű szöveg/HTML/OpenPGP)?</p>\n"
+"<p>Ezzel meg lehet akadályozni, hogy egy támadó olyan hamisított HTML "
+"üzenetet\n"
+"tudjon küldeni, mely a KMail sikeres dekódolást jelző keretét imitálja.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...bármelyik fejléc szerint szűrni lehet? Elég beírni a fejléc nevét\n"
+"a keresési szabály első szövegmezőjébe.</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...a tisztán HTML-formátumú üzenetek kiszűréséhez használható a következő "
+"szabály:\n"
+"<pre>&quot;Content-type&quot; tartalmazza &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...válasz küldésekor csak a kijelölt részt fogja idézni a program?</p>\n"
+"<p>Ha semmit sem jelöl ki, akkor az egész üzenet lesz az idézett szöveg.</"
+"p>\n"
+"<p>Ez még a csatolt szöveges fájlokkal is így működik a\n"
+"<em>Nézet-&gt;Csatolások-&gt;Beszúrva</em> menüpont használatakor.</p>\n"
+"<p>Ez a működési mód az összes válaszküldési funkcióra igaz, kivéve\n"
+"az <em>Üzenet-&gt;Válasz idézés nélkül</em> menüpontot.</p>\n"
+"<p align=\"right\"><em>Ezt a tippet David F. Newman küldte be</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15389,19 +14995,25 @@ msgstr "Felülírás?"
 #~ msgstr "Az üzenet összes részét &titkosítani kell"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Jelölje be, ha alapértelmezés szerint az összes üzenetrészt titkosítani szeretné"
+#~ msgstr ""
+#~ "Jelölje be, ha alapértelmezés szerint az összes üzenetrészt titkosítani "
+#~ "szeretné"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Alapértelmezés szerint az összes üzenetrész titkosított legyen</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor az üzenet összes darabja (a fő üzenet és az összes csatolt fájl) alapértelmezés szerint titkosítva lesz.\n"
+#~ "Ha ez az opció be van jelölve, akkor az üzenet összes darabja (a fő "
+#~ "üzenet és az összes csatolt fájl) alapértelmezés szerint titkosítva "
+#~ "lesz.\n"
 #~ "<p>\n"
 #~ "Ezt a beállítást minden üzenetnél felül lehet bírálni.\n"
 #~ "</qt>"
@@ -15410,36 +15022,45 @@ msgstr "Felülírás?"
 #~ msgstr "&Rákérdezés az üzenetrészek titkosítására"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Ha ez be van jelöve, akkor a program minden üzenetrésznél megkérdezi, hogy titkosítani kell-e"
+#~ msgstr ""
+#~ "Ha ez be van jelöve, akkor a program minden üzenetrésznél megkérdezi, "
+#~ "hogy titkosítani kell-e"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>A program kérdezze meg, mely üzenetrészeket kell titkosítani</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor a program minden üzenetrésznél (a fő üzenetnél és az összes csatolt fájlnál) megkérdezi, hogy titkosítani szeretné-e vagy sem.\n"
+#~ "Ha ez az opció be van jelölve, akkor a program minden üzenetrésznél (a fő "
+#~ "üzenetnél és az összes csatolt fájlnál) megkérdezi, hogy titkosítani "
+#~ "szeretné-e vagy sem.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
 #~ msgstr "Az üzenetek ne legyenek t&itkosítva"
 
 #~ msgid "Check for not encrypting a message by default"
-#~ msgstr "Jelölje be, ha alapértelmezésben nem szeretné titkosítani az üzeneteket"
+#~ msgstr ""
+#~ "Jelölje be, ha alapértelmezésben nem szeretné titkosítani az üzeneteket"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Az üzenetek ne legyenek titkosítva</h1>\n"
-#~ "Ha ez az opció van bejelölve, akkor az üzenetek alapértelmezés szerint nem lesznek titkosítva.\n"
+#~ "Ha ez az opció van bejelölve, akkor az üzenetek alapértelmezés szerint "
+#~ "nem lesznek titkosítva.\n"
 #~ "<p>\n"
 #~ "Ezt az alapértelmezést minden üzenetnél felül lehet bírálni.\n"
 #~ "</qt>"
@@ -15453,18 +15074,31 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Titkosítási algoritmus</h1>\n"
-#~ "Az algoritmus egy számítási eljárás a számítógép nyelvén megfogalmazva. A titkosítási algoritmus azt írja le, hogy mit kell tenni egy üzenettel, hogy csak azok a címzettek tudják elolvasni, akik rendelkeznek a szükséges kulccsal.\n"
+#~ "Az algoritmus egy számítási eljárás a számítógép nyelvén megfogalmazva. A "
+#~ "titkosítási algoritmus azt írja le, hogy mit kell tenni egy üzenettel, "
+#~ "hogy csak azok a címzettek tudják elolvasni, akik rendelkeznek a "
+#~ "szükséges kulccsal.\n"
 #~ "<p>\n"
-#~ "A titkosítási algoritmus kiválasztása eleve meghatározza, hogy milyen nehéz illetékteleneknek dekódolni az üzenetet. Az itt rendelkezésre álló összes titkosítási algoritmus nagyon biztonságosnak tekinthető, az alapértelmezést általában el lehet fogadni.\n"
+#~ "A titkosítási algoritmus kiválasztása eleve meghatározza, hogy milyen "
+#~ "nehéz illetékteleneknek dekódolni az üzenetet. Az itt rendelkezésre álló "
+#~ "összes titkosítási algoritmus nagyon biztonságosnak tekinthető, az "
+#~ "alapértelmezést általában el lehet fogadni.\n"
 #~ "<p>\n"
 #~ "Ezt a beállítást minden üzenetnél felül lehet bírálni.\n"
 #~ "</qt>"
@@ -15473,38 +15107,51 @@ msgstr "Felülírás?"
 #~ msgstr "Ellenőrzésnél &helyi tanúsítvány is elfogadható a lánc végén"
 
 #~ msgid "Check to end with locally saved certificate."
-#~ msgstr "Ha ez be van jelölve, akkor a tanúsítványlánc ellenőrzésénél helyi tanúsítvány is elfogadható a lánc végén"
+#~ msgstr ""
+#~ "Ha ez be van jelölve, akkor a tanúsítványlánc ellenőrzésénél helyi "
+#~ "tanúsítvány is elfogadható a lánc végén"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ellenőrzésnél helyi tanúsítvány is elfogadható a lánc végén</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor a tanúsítványlánc ellenőrzése során elért utolsó tanúsítvány a helyi fájlrendszerben is lehet.\n"
+#~ "Ha ez az opció be van jelölve, akkor a tanúsítványlánc ellenőrzése során "
+#~ "elért utolsó tanúsítvány a helyi fájlrendszerben is lehet.\n"
 #~ "<p>\n"
-#~ "A saját tanúsítványokon kívül a levelezési partnerek és a tanúsítványkiadók tanúsítványai is tárolhatók helyben.\n"
+#~ "A saját tanúsítványokon kívül a levelezési partnerek és a "
+#~ "tanúsítványkiadók tanúsítványai is tárolhatók helyben.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
-#~ msgstr "Az egész tanúsítványlánc ellenőrzése (e&gészen a gyökértanúsítványig)"
+#~ msgstr ""
+#~ "Az egész tanúsítványlánc ellenőrzése (e&gészen a gyökértanúsítványig)"
 
 #~ msgid "Check here to check up to the root certificate"
-#~ msgstr "Jelölje be, ha a tanúsítványokat egészen a gyökérig ellenőrizni szeretné"
+#~ msgstr ""
+#~ "Jelölje be, ha a tanúsítványokat egészen a gyökérig ellenőrizni szeretné"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Az egész tanúsítványlánc ellenőrzése (egészen a gyökértanúsítványig)</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor a tanúsítványok hitelességi láncát egészen a gyökértanúsítványig ellenőrizni fogja a program.\n"
+#~ "<h1>Az egész tanúsítványlánc ellenőrzése (egészen a gyökértanúsítványig)</"
+#~ "h1>\n"
+#~ "Ha ez az opció be van jelölve, akkor a tanúsítványok hitelességi láncát "
+#~ "egészen a gyökértanúsítványig ellenőrizni fogja a program.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15516,14 +15163,17 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>A tanúsítványok láncát végig ellenőrizni kell</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor a címzett tanúsítványláncát egészen a gyökértanúsítványig ellenőrizni fogja a program.\n"
+#~ "Ha ez az opció be van jelölve, akkor a címzett tanúsítványláncát egészen "
+#~ "a gyökértanúsítványig ellenőrizni fogja a program.\n"
 #~ "<p>\n"
 #~ "A címzett tanúsítványának ellenőrzését nem lehet kikapcsolni!\n"
 #~ "</qt>"
@@ -15537,33 +15187,49 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tanúsítványvisszavonási listák (CRL-ek) használata</h1>\n"
-#~ "A tanúsítványvisszavonási listák olyan tanúsítványokat tartalmaznak, melyeket a kibocsátójuk már visszavont, ezért titkosítási célra nem használhatók. A kibocsátó például abban az esetben vonhatja vissza a tanúsítványát, ha gyanú merül fel a tanúsítvány megbízhatóságát illetően (pl. valaki kitalálta a jelszót).\n"
+#~ "A tanúsítványvisszavonási listák olyan tanúsítványokat tartalmaznak, "
+#~ "melyeket a kibocsátójuk már visszavont, ezért titkosítási célra nem "
+#~ "használhatók. A kibocsátó például abban az esetben vonhatja vissza a "
+#~ "tanúsítványát, ha gyanú merül fel a tanúsítvány megbízhatóságát illetően "
+#~ "(pl. valaki kitalálta a jelszót).\n"
 #~ "<p>\n"
-#~ "A maximális adatbiztonság érdekében érdemes bekapcsolva hagyni. A tanúsítványkezelés beállításainál megadható, hogy a visszavonási listákat honnan kell letölteni.\n"
+#~ "A maximális adatbiztonság érdekében érdemes bekapcsolva hagyni. A "
+#~ "tanúsítványkezelés beállításainál megadható, hogy a visszavonási listákat "
+#~ "honnan kell letölteni.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Figyelmeztetés, ha a visszavonási &lista ennyi napon belül lejár:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Ha bejelöli, akkor a program figyelmeztetni fog a rövidesen lejáró visszavonási listákra"
+#~ msgstr ""
+#~ "Ha bejelöli, akkor a program figyelmeztetni fog a rövidesen lejáró "
+#~ "visszavonási listákra"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Figyelmeztetés, ha egy visszavonási lista rövidesen lejár</h1>\n"
-#~ "Ha ez az opció be van jelölve, a program figyelmeztetést ad, ha az egyik visszavonási lista rövidesen lejár.\n"
+#~ "Ha ez az opció be van jelölve, a program figyelmeztetést ad, ha az egyik "
+#~ "visszavonási lista rövidesen lejár.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15572,14 +15238,16 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Figyelmeztetés, ha egy visszavonási lista rövidesen lejár</h1>\n"
-#~ "Itt lehet megadni, hogy a visszavonási listának még legalább hány napig kell érvényesnek lennie ahhoz, hogy a program ne adjon figyelmeztetést.\n"
+#~ "Itt lehet megadni, hogy a visszavonási listának még legalább hány napig "
+#~ "kell érvényesnek lennie ahhoz, hogy a program ne adjon figyelmeztetést.\n"
 #~ "<p>\n"
 #~ "A javasolt érték 7 nap.\n"
 #~ "</qt>"
@@ -15588,49 +15256,65 @@ msgstr "Felülírás?"
 #~ msgstr "Titkosítás a &saját kulccsal is"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Akkor jelölje be, ha a titkosított üzeneteket a saját kulcsával is titkosítani szeretné."
+#~ msgstr ""
+#~ "Akkor jelölje be, ha a titkosított üzeneteket a saját kulcsával is "
+#~ "titkosítani szeretné."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Mindig titkosítás a saját kulccsal is</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor az elküldött üzenetek a saját kulccsal is le lesznek titkosítva.\n"
+#~ "Ha ez az opció be van jelölve, akkor az elküldött üzenetek a saját "
+#~ "kulccsal is le lesznek titkosítva.\n"
 #~ "<p>\n"
-#~ "Érdemes ezt bekapcsolva hagyni, hogy utólag el lehessen olvasni az elküldött üzeneteket.\n"
+#~ "Érdemes ezt bekapcsolva hagyni, hogy utólag el lehessen olvasni az "
+#~ "elküldött üzeneteket.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
-#~ msgstr "Figyelmeztetés, ha a b&iztonsági láncban egy tanúsítvány ennyi napon belül lejár:"
+#~ msgstr ""
+#~ "Figyelmeztetés, ha a b&iztonsági láncban egy tanúsítvány ennyi napon "
+#~ "belül lejár:"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Ha bejelöli, akkor a program figyelmeztetni fog a rövidesen lejáró tanúsítványokra"
+#~ msgstr ""
+#~ "Ha bejelöli, akkor a program figyelmeztetni fog a rövidesen lejáró "
+#~ "tanúsítványokra"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Figyelmeztetés, ha egy tanúsítvány lejár</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor a program figyelmeztetni fog, ha a titkosításnál használt egyik tanúsítvány a megadott idő múlva lejár.\n"
+#~ "Ha ez az opció be van jelölve, akkor a program figyelmeztetni fog, ha a "
+#~ "titkosításnál használt egyik tanúsítvány a megadott idő múlva lejár.\n"
 #~ "<p>\n"
-#~ "Érdemes ezt az opciót bejelölve hagyni, hogy el lehessen kerülni a rövidesen lejáró tanúsítványok által okozott problémákat.\n"
+#~ "Érdemes ezt az opciót bejelölve hagyni, hogy el lehessen kerülni a "
+#~ "rövidesen lejáró tanúsítványok által okozott problémákat.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
 #~ msgstr "Figyelmeztetés, ha a &címzett tanúsítvány ennyi napon belül lejár:"
 
 #~ msgid "Warn if receiver's email address is &not in certificate"
-#~ msgstr "Figyelmeztetés, ha a &címzett e-mail-címe nem szerepel a tanúsítványban"
+#~ msgstr ""
+#~ "Figyelmeztetés, ha a &címzett e-mail-címe nem szerepel a tanúsítványban"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Az elektronikus aláírás beállításai"
@@ -15644,8 +15328,30 @@ msgstr "Felülírás?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Az elküldhető tanúsítványok kiválasztása"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Tanúsítványok küldése</h1> A tanúsítvány nélkül a címzettek nem tudják meghatározni, hogy az üzenet a valódi feladótól érkezett, vagy egy illetéktelen személytől, esetleg megváltoztatva. <p> A címzettek valamelyik nyilvános címtáron keresztül is megkaphatják a tanúsítványt, de az akár az üzenettel együtt is elküldhető. Meg lehet adni, hogy egy tanúsítvány se legyen elküldve, csak a saját tanúsítványok vagy a saját tanúsítvány használatához szükséges egész tanúsítványlánc el legyen-e küldve, akár a gyökértanúsítvánnyal együtt is. <p> Általában érdemes legalább a saját tanúsítványt mellékelni az üzenethez. <p> Ez az alapértelmezés, de a beállítás egyedileg minden üzenetnél felülbírálható. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Tanúsítványok küldése</h1> A tanúsítvány nélkül a címzettek nem "
+#~ "tudják meghatározni, hogy az üzenet a valódi feladótól érkezett, vagy egy "
+#~ "illetéktelen személytől, esetleg megváltoztatva. <p> A címzettek "
+#~ "valamelyik nyilvános címtáron keresztül is megkaphatják a tanúsítványt, "
+#~ "de az akár az üzenettel együtt is elküldhető. Meg lehet adni, hogy egy "
+#~ "tanúsítvány se legyen elküldve, csak a saját tanúsítványok vagy a saját "
+#~ "tanúsítvány használatához szükséges egész tanúsítványlánc el legyen-e "
+#~ "küldve, akár a gyökértanúsítvánnyal együtt is. <p> Általában érdemes "
+#~ "legalább a saját tanúsítványt mellékelni az üzenethez. <p> Ez az "
+#~ "alapértelmezés, de a beállítás egyedileg minden üzenetnél felülbírálható. "
+#~ "</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "A sa&ját tanúsítvány elküldése"
@@ -15660,63 +15366,82 @@ msgstr "Felülírás?"
 #~ msgstr "Az üzenet összes részét &alá kell írni"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Ha bejelöli, akkor az összes üzenetrész alá le lesz írva elektronikusan"
+#~ msgstr ""
+#~ "Ha bejelöli, akkor az összes üzenetrész alá le lesz írva elektronikusan"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Alapértelmezés szerint az összes üzenetrészt alá kell írni elektronikusan</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor az üzenet összes része (az üzenet szövege és az összes csatolt fájl) el lesz látva elektronikus aláírással alapértelmezés szerint.\n"
+#~ "<h1>Alapértelmezés szerint az összes üzenetrészt alá kell írni "
+#~ "elektronikusan</h1>\n"
+#~ "Ha ez az opció be van jelölve, akkor az üzenet összes része (az üzenet "
+#~ "szövege és az összes csatolt fájl) el lesz látva elektronikus aláírással "
+#~ "alapértelmezés szerint.\n"
 #~ "<p>\n"
-#~ "Ez lesz az alapértelmezés, de a beállítás üzenetküldéskor felülbírálható marad.\n"
+#~ "Ez lesz az alapértelmezés, de a beállítás üzenetküldéskor felülbírálható "
+#~ "marad.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Rákérdezés az ü&zenetrészek aláírására"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Ha ez be van jelölve, akkor a program bekéri, hogy mely üzenetrészeket kell titkosítani"
+#~ msgstr ""
+#~ "Ha ez be van jelölve, akkor a program bekéri, hogy mely üzenetrészeket "
+#~ "kell titkosítani"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Rákérdezés az egyes üzenetrészek aláírására</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor az üzenet minden egyes részénél (az üzenetszövegnél és az összes csatolt fájlnál) megkérdezi a program, hogy el kell-e látni elektronikus aláírással.\n"
+#~ "Ha ez az opció be van jelölve, akkor az üzenet minden egyes részénél (az "
+#~ "üzenetszövegnél és az összes csatolt fájlnál) megkérdezi a program, hogy "
+#~ "el kell-e látni elektronikus aláírással.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
 #~ msgstr "Az üzenetek ne legyenek a&láírva"
 
 #~ msgid "Check for not signing a message by default"
-#~ msgstr "Ha ez be van jelölve, akkor alapértelmezés szerint az üzenetek nem lesznek elektronikusan aláírva"
+#~ msgstr ""
+#~ "Ha ez be van jelölve, akkor alapértelmezés szerint az üzenetek nem "
+#~ "lesznek elektronikusan aláírva"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Az üzenetek ne legyenek aláírva</h1>\n"
-#~ "Ha ez az opció be van jelölve, az üzenetek alapértelmezés szerint nem lesznek aláírva elektronikusan.\n"
+#~ "Ha ez az opció be van jelölve, az üzenetek alapértelmezés szerint nem "
+#~ "lesznek aláírva elektronikusan.\n"
 #~ "<p>\n"
 #~ "Ez az alapértelmezés minden üzenetnél felülbírálható.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Az aláírási tanúsítványt a <em>Tanúsítványok</em> lapon lehet beállítani."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Az aláírási tanúsítványt a <em>Tanúsítványok</em> lapon lehet beállítani."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15727,20 +15452,35 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Az elektronikus aláírás algoritmusa</h1>\n"
-#~ "Az algoritmus egy olyan számítási utasítássorozat, mely a számítógép nyelvén van megfogalmazva. Az elektronikus aláírás algoritmusa azt határozza meg, hogy az aláírási kulccsal milyen műveleteket kell az üzeneten elvégezni, hogy a címzett ellenőrizni tudja, kitől származik a levél.\n"
+#~ "Az algoritmus egy olyan számítási utasítássorozat, mely a számítógép "
+#~ "nyelvén van megfogalmazva. Az elektronikus aláírás algoritmusa azt "
+#~ "határozza meg, hogy az aláírási kulccsal milyen műveleteket kell az "
+#~ "üzeneten elvégezni, hogy a címzett ellenőrizni tudja, kitől származik a "
+#~ "levél.\n"
 #~ "<p>\n"
-#~ "Az aláírási algoritmus kiválasztása meghatározza, milyen nehéz egy kódolt üzenetet úgy meghamisítani, hogy eredetinek látsszon. Az alapértelmezés szerint rendelkezésre álló összes algoritmus igen biztonságosnak tekinthető, általában el lehet őket fogadni.\n"
+#~ "Az aláírási algoritmus kiválasztása meghatározza, milyen nehéz egy kódolt "
+#~ "üzenetet úgy meghamisítani, hogy eredetinek látsszon. Az alapértelmezés "
+#~ "szerint rendelkezésre álló összes algoritmus igen biztonságosnak "
+#~ "tekinthető, általában el lehet őket fogadni.\n"
 #~ "<p>\n"
-#~ "Ez az alapértelmezés, de a beállítás minden üzenetnél felülbírálható marad.\n"
+#~ "Ez az alapértelmezés, de a beállítás minden üzenetnél felülbírálható "
+#~ "marad.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15755,12 +15495,17 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Az üzenetek az elektronikus aláírással együtt legyenek tárolva</h1>\n"
-#~ "Ha ez az opció be van jelölve, az elküldött üzenetekkel együtt lesznek eltárolva az elektronikus aláírások. Ez azért ajánlott, mert így később könnyen ellenőrizni lehet, hogy egy üzenet vagy üzenetrész aláírása valóban megtörtént-e.\n"
+#~ "Ha ez az opció be van jelölve, az elküldött üzenetekkel együtt lesznek "
+#~ "eltárolva az elektronikus aláírások. Ez azért ajánlott, mert így később "
+#~ "könnyen ellenőrizni lehet, hogy egy üzenet vagy üzenetrész aláírása "
+#~ "valóban megtörtént-e.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15770,17 +15515,26 @@ msgstr "Felülírás?"
 #~ msgstr "standa&rd MIME"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Multipart/Signed részbe kerüljön külön az aláírás és az aláírt adatokat tartalmazó blokk."
+#~ msgstr ""
+#~ "Multipart/Signed részbe kerüljön külön az aláírás és az aláírt adatokat "
+#~ "tartalmazó blokk."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Külön aláírási rész használata</h1>\n"
-#~ "Ha ez az opció be van jelölve, az aláírás és az aláírt adatok egy Multipart/Signed üzenetszakasz két részébe kerülnek. Az aláírt üzenetrészt azok a kliensek is el tudják majd olvasni, amelyek nem ismerik az aláírási algoritmust és nem támogatják az ASN.1 típusú dekódolást.\n"
+#~ "Ha ez az opció be van jelölve, az aláírás és az aláírt adatok egy "
+#~ "Multipart/Signed üzenetszakasz két részébe kerülnek. Az aláírt "
+#~ "üzenetrészt azok a kliensek is el tudják majd olvasni, amelyek nem "
+#~ "ismerik az aláírási algoritmust és nem támogatják az ASN.1 típusú "
+#~ "dekódolást.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15792,12 +15546,17 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Átlátható aláírt üzenetek</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor mind az aláírást, mind az aláírt adatokat tartalmazó blokk egy ASN.1 blokkba kerül. Az üzeneteket csak olyan levelezőprogramokkal lehet majd elolvasni, melyek támogatják az ASN.1 típusú dekódolást.\n"
+#~ "Ha ez az opció be van jelölve, akkor mind az aláírást, mind az aláírt "
+#~ "adatokat tartalmazó blokk egy ASN.1 blokkba kerül. Az üzeneteket csak "
+#~ "olyan levelezőprogramokkal lehet majd elolvasni, melyek támogatják az "
+#~ "ASN.1 típusú dekódolást.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15809,8 +15568,23 @@ msgstr "Felülírás?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "A PIN bekérési gyakoriságának kiválasztása"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>A PIN kód bekérése</h1> Itt lehet megadni, hogy a program milyen gyakran kérje be a PIN kódot a személyes biztonsági környezet (PSE) eléréséhez, mely a saját tanúsítványokat tartalmazza. <p> Minél gyakrabban kell megadni a PIN kódot, annál nagyobb lesz a védettség a hamisított üzenetek ellen, de annál kényelmetlenebb lesz a program kezelése. <p> Általában meg lehet hagyni az alapértelmezett beállítást. <p> Biztonsági okokból a PIN kód bekérését nem lehet teljesen letiltani. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>A PIN kód bekérése</h1> Itt lehet megadni, hogy a program milyen "
+#~ "gyakran kérje be a PIN kódot a személyes biztonsági környezet (PSE) "
+#~ "eléréséhez, mely a saját tanúsítványokat tartalmazza. <p> Minél "
+#~ "gyakrabban kell megadni a PIN kódot, annál nagyobb lesz a védettség a "
+#~ "hamisított üzenetek ellen, de annál kényelmetlenebb lesz a program "
+#~ "kezelése. <p> Általában meg lehet hagyni az alapértelmezett beállítást. "
+#~ "<p> Biztonsági okokból a PIN kód bekérését nem lehet teljesen letiltani. "
+#~ "</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Munkafolyamatonként egyszer"
@@ -15827,35 +15601,45 @@ msgstr "Felülírás?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Figyelmeztetés, ha egy tanúsítvány lejár</h1>\n"
-#~ "Ha ez az opció be van jelölve, akkor olyan aláírási tanúsítvány használatakor, mely a megadott számú napon belül lejár, a program figyelmeztetést fog adni.\n"
+#~ "Ha ez az opció be van jelölve, akkor olyan aláírási tanúsítvány "
+#~ "használatakor, mely a megadott számú napon belül lejár, a program "
+#~ "figyelmeztetést fog adni.\n"
 #~ "<p>\n"
-#~ "Általában érdemes bekapcsolva hagyni ezt az opciót, hogy a hamar lejáró tanúsítványok okozta problémákat el lehessen kerülni.\n"
+#~ "Általában érdemes bekapcsolva hagyni ezt az opciót, hogy a hamar lejáró "
+#~ "tanúsítványok okozta problémákat el lehessen kerülni.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Figyelmeztetés az a&láírási tanúsítvány lejárása előtt ennyivel:"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Figyelme&ztetés, ha az aláíró e-mail-címe nem szerepel a tanúsítványban"
+#~ msgstr ""
+#~ "Figyelme&ztetés, ha az aláíró e-mail-címe nem szerepel a tanúsítványban"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Figyelmeztetés, ha az aláíró e-mail címe nem szerepel a tanúsítványban</h1>\n"
-#~ "Ha ez az opció be van jelölve, a program figyelmeztetést fog adni, ha az aláíró e-mail címe nem szerepel az aláíráshoz használt tanúsítványban.\n"
+#~ "<h1>Figyelmeztetés, ha az aláíró e-mail címe nem szerepel a "
+#~ "tanúsítványban</h1>\n"
+#~ "Ha ez az opció be van jelölve, a program figyelmeztetést fog adni, ha az "
+#~ "aláíró e-mail címe nem szerepel az aláíráshoz használt tanúsítványban.\n"
 #~ "<p>\n"
 #~ "A maximális adatbiztonság érdekében hagyja bekapcsolva ezt az opciót.\n"
 #~ "</qt>"
diff --git a/tde-i18n-is/messages/tdepim/kmail.po b/tde-i18n-is/messages/tdepim/kmail.po
index fe00188db6d..141a2b9309d 100644
--- a/tde-i18n-is/messages/tdepim/kmail.po
+++ b/tde-i18n-is/messages/tdepim/kmail.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-04-22 11:55+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki@nett.is>\n"
 "Language-Team: icelandic <kde-isl@molar.is>\n"
@@ -24,16 +24,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"Þórarinn R. Einarsson,Richard Allen,Logi Ragnarsson,Ingimar "
-"Róbertsson,Þórhallur Hálfdánarson,Þröstur Svanbergsson,Pjetur G. "
-"Hjaltason,Svanur Pálsson,Arnar Leósson"
+"Þórarinn R. Einarsson,Richard Allen,Logi Ragnarsson,Ingimar Róbertsson,"
+"Þórhallur Hálfdánarson,Þröstur Svanbergsson,Pjetur G. Hjaltason,Svanur "
+"Pálsson,Arnar Leósson"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -183,6 +183,12 @@ msgstr "&Engin (þarf að passa sig)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Reikningur fyrir hálfsjálfvirka meðhöndlun auðlinda"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Hreinsa sögu"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -260,13 +266,13 @@ msgstr "&Notandanafn:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "Netþjónustuaðili gaf þér upp <em>notandanafn</em> sem er þitt auðkenni hjá "
-"þeirra póstþjónum. Venjulega er þetta fyrsti hluti netfangsins þíns (það sem er "
-"á undan <em>@</em>)."
+"þeirra póstþjónum. Venjulega er þetta fyrsti hluti netfangsins þíns (það sem "
+"er á undan <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -287,18 +293,18 @@ msgstr "Vista POP lykilo&rðið"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Hakaðu við hér ef þú vilt láta KMail vista lykilorðið.\n"
 "Ef TDEWallet er tiltækt er lykilorðið geymt þar, sem er nokkuð öruggt.\n"
 "Hinsvegar ef TDEWallet er ekki tiltækt er lykilorðið vistað í stillingarskrá "
-"KMail. Lykilorðið er geymt ruglað, en ætti ekki að teljast öruggt gegn afkóðun "
-"ef aðgangur fæst að uppsetningarskránni."
+"KMail. Lykilorðið er geymt ruglað, en ætti ekki að teljast öruggt gegn "
+"afkóðun ef aðgangur fæst að uppsetningarskránni."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -326,12 +332,13 @@ msgstr "Sleppa bréfum e&f þau eru stærri en"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ef þú krossar við hér þá munu POP-síur verða notaðar við að ákvarða hvað á að "
-"gera við póstinn.  Þú getur þá ákveðið að sækja póstinn, eyða eða geyma hann á "
-"þjóninum."
+"Ef þú krossar við hér þá munu POP-síur verða notaðar við að ákvarða hvað á "
+"að gera við póstinn.  Þú getur þá ákveðið að sækja póstinn, eyða eða geyma "
+"hann á þjóninum."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -380,13 +387,15 @@ msgstr "Hreinn te&xti"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -429,9 +438,9 @@ msgstr "Nafnsvið:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Hér sérðu mismunandi nafnsvið sem IMAP þjónninn þinn styður. Hvert nafnsvið "
 "stendur fyrir forskeyti sem aðgreinir hópa af möppum. Nafnsvið gera meðal "
@@ -494,12 +503,13 @@ msgstr "Op&na viðhengi við beiðni"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Virktu þetta til að opna ekki viðhengi sjálfkrafa þegar þú velur bréfið, heldur "
-"aðeins þegar þú smellir á viðhengið. Á þennan máta eru stór bréf birt strax."
+"Virktu þetta til að opna ekki viðhengi sjálfkrafa þegar þú velur bréfið, "
+"heldur aðeins þegar þú smellir á viðhengið. Á þennan máta eru stór bréf birt "
+"strax."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -539,7 +549,7 @@ msgstr "<engin>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Innhólf"
 
@@ -547,36 +557,37 @@ msgstr "Innhólf"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Þjónninn virðist ekki styðja einkvæm bréfanúmer, sem er krafa þess að hægt sé "
-"að skilja bréf eftir á þjóninum.\n"
-"Þar sem sumir þjónar auglýsa ekki getu sína gætir þú samt mögulega skilið sótt "
-"bréf eftir á þjóninum."
+"Þjónninn virðist ekki styðja einkvæm bréfanúmer, sem er krafa þess að hægt "
+"sé að skilja bréf eftir á þjóninum.\n"
+"Þar sem sumir þjónar auglýsa ekki getu sína gætir þú samt mögulega skilið "
+"sótt bréf eftir á þjóninum."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Þjónninn virðist ekki geta sent aðeins bréfhausa, sem er krafa þess að hægt sé "
-"að sía bréf á þjóninum.\n"
-"Þar sem sumir þjónar auglýsa ekki getu sína gætir þú samt mögulega skilið síað "
-"bréf á þjóninum."
+"Þjónninn virðist ekki geta sent aðeins bréfhausa, sem er krafa þess að hægt "
+"sé að sía bréf á þjóninum.\n"
+"Þar sem sumir þjónar auglýsa ekki getu sína gætir þú samt mögulega skilið "
+"síað bréf á þjóninum."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Athugið að þessi aðferð við póstflutninga getur ruglað suma POP3 þjóna sem "
 "styðja ekki samhliða flutning, og valdið því að þeir senda eyðilagðan póst.\n"
@@ -584,9 +595,9 @@ msgstr ""
 "auglýsa ekki þessa getu sína. Til að athuga hvort POP3 þjónninn auglýsir "
 "samhliða flutning smelltu á hnappinn \"Athuga hvað þjónninn styður\" neðst í "
 "glugganum.\n"
-"Ef póstþjónninn auglýsir ekki getu sína, en þú vilt meiri hraða, þá ættir þú að "
-"gera tilraunir fyrst með því að senda sjálfum þér slatta af pósti og sækja hann "
-"síðan."
+"Ef póstþjónninn auglýsir ekki getu sína, en þú vilt meiri hraða, þá ættir þú "
+"að gera tilraunir fyrst með því að senda sjálfum þér slatta af pósti og "
+"sækja hann síðan."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -594,51 +605,53 @@ msgstr "Vinsamlega skilgreindu þjón og gátt í almennt flipanum fyrst."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Miðlarinn virðist ekki styðja samhliða vinnslu; þar af leiðandi er þessi "
 "valkostur gerður óvirkur.\n"
-"Þar sem ekki allir þjónar segja rétt frá um hvaða valkostir eru studdir, getur "
-"þú eftir sem áður prófað að setja samhliða vinnslu á. En athugaðu að þetta gæti "
-"valdið því að sumir POP þjónar, sem skilja ekki þennan valkost, sendi eyðilögð "
-"skilaboð. Svo áður en þú notar þennan valkost á mikilvæg skeyti, ættir þú að "
-"prófa að senda fullt af prófunarskeytum til þín sem þú hleður niður öll í einu "
-"frá POP þjóninum."
+"Þar sem ekki allir þjónar segja rétt frá um hvaða valkostir eru studdir, "
+"getur þú eftir sem áður prófað að setja samhliða vinnslu á. En athugaðu að "
+"þetta gæti valdið því að sumir POP þjónar, sem skilja ekki þennan valkost, "
+"sendi eyðilögð skilaboð. Svo áður en þú notar þennan valkost á mikilvæg "
+"skeyti, ættir þú að prófa að senda fullt af prófunarskeytum til þín sem þú "
+"hleður niður öll í einu frá POP þjóninum."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Miðlarinn virðist ekki styðja sérstæð skilaboðanúmer, en það er nauðsynlegt til "
-"að geta geymt skilaboð á þjóninum. Valkosturinn er þar af leiðandi aftengdur.\n"
-"En þar sem ekki allir miðlarar segja rétt frá um hvaða valkosti er hægt að nota "
-"á þá, getur þú eftir sem áður prófað að haka við að það eigi að geyma sótt bréf "
-"á þjóninum."
+"Miðlarinn virðist ekki styðja sérstæð skilaboðanúmer, en það er nauðsynlegt "
+"til að geta geymt skilaboð á þjóninum. Valkosturinn er þar af leiðandi "
+"aftengdur.\n"
+"En þar sem ekki allir miðlarar segja rétt frá um hvaða valkosti er hægt að "
+"nota á þá, getur þú eftir sem áður prófað að haka við að það eigi að geyma "
+"sótt bréf á þjóninum."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Miðlarinn virðist ekki styðja að sækja einungis skilaboðahausa, en það er "
 "nauðsynlegt til að geta síað bréf á þjóninum. Valkosturinn hefur þar af "
 "leiðandi verið aftengdur.\n"
-"En þar sem ekki allir þjónar segja rétt frá um hvaða valkosti er hægt að nota á "
-"þá, getur þú eftir sem áður valið að hafa kveikt á síun af bréfum á þjóninum."
+"En þar sem ekki allir þjónar segja rétt frá um hvaða valkosti er hægt að "
+"nota á þá, getur þú eftir sem áður valið að hafa kveikt á síun af bréfum á "
+"þjóninum."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -718,11 +731,11 @@ msgstr "IMAP tenging"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Þú þarft að bæta við tengingu í nethlutann í stillingunum til að geta tekið á "
-"móti tölvupósti."
+"Þú þarft að bæta við tengingu í nethlutann í stillingunum til að geta tekið "
+"á móti tölvupósti."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -758,13 +771,14 @@ msgstr "Velkomin(n) í KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Þú virðist vera að keyra KMail í fyrsta skipti. Þú getur notað þennan álf "
-"til að aðstoða þig við að setja upp póstaðganginn þinn. Sláðu inn "
-"upplýsingarnar sem þú fékkst frá þjónustuaðila þínum í gluggana sem koma.</qt>"
+"<qt>Þú virðist vera að keyra KMail í fyrsta skipti. Þú getur notað þennan "
+"álf til að aðstoða þig við að setja upp póstaðganginn þinn. Sláðu inn "
+"upplýsingarnar sem þú fékkst frá þjónustuaðila þínum í gluggana sem koma.</"
+"qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -826,8 +840,7 @@ msgstr "Nota staðværa sendingu"
 msgid "Server Information"
 msgstr "Miðlari"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Engin"
@@ -920,8 +933,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Engin ruslpóststól fundust. Settu inn ruslpóst forrit og keyrðu svo álfinn "
-"aftur.</p>"
+"<p>Engin ruslpóststól fundust. Settu inn ruslpóst forrit og keyrðu svo "
+"álfinn aftur.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -966,28 +979,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Hér færðu aðstoð við að setja upp KMail síur fyrir nokkur þekkt "
-"vírusvarnartól.</p>"
-"<p>Álfurinn getur sjálfvirkt fundið tólin sem eru á kerfinu þínu, ásamt að búa "
-"til síureglur sem flokka skeyti sem innihalda vírus frá venjulegum pósti. "
-"Álfurinn hunsar aðrar síureglur sem gætu fundist fyrir. Hann mun alltaf gera "
-"nýju síurnar virkar.</p>"
-"<p><b>Athugaðu:</b> Þar sem KMail getur virkað frosið meðan skönnun á sér stað, "
-"þar sem hún tekur oft smá tíma, gætir þú fengið erfiðleika með virkni "
-"póstforritsins á meðan vírusvarnartólin keyra. Einfaldast er þá bara að eyða "
-"síureglunum sem álfurinn býr til, og muntu þá fá sömu virkni og í upphafi."
+"vírusvarnartól.</p><p>Álfurinn getur sjálfvirkt fundið tólin sem eru á "
+"kerfinu þínu, ásamt að búa til síureglur sem flokka skeyti sem innihalda "
+"vírus frá venjulegum pósti. Álfurinn hunsar aðrar síureglur sem gætu fundist "
+"fyrir. Hann mun alltaf gera nýju síurnar virkar.</p><p><b>Athugaðu:</b> Þar "
+"sem KMail getur virkað frosið meðan skönnun á sér stað, þar sem hún tekur "
+"oft smá tíma, gætir þú fengið erfiðleika með virkni póstforritsins á meðan "
+"vírusvarnartólin keyra. Einfaldast er þá bara að eyða síureglunum sem "
+"álfurinn býr til, og muntu þá fá sömu virkni og í upphafi."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -1014,8 +1025,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Ruslið er sjálfgefin mappa fyrir ruslpóst, en þú getur hinsvegar breytt því að "
-"neðan."
+"Ruslið er sjálfgefin mappa fyrir ruslpóst, en þú getur hinsvegar breytt því "
+"að neðan."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1023,14 +1034,13 @@ msgstr "Færa mögulegan ruslpóst í:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"Innhólfið er sjálfgefin mappa, en þú getur breytt því að neðan. "
-"<p>Ekki öll tól styðja flokkun sem mögulegt rusl. Ef tólið styður ekki slíka "
-"flokkun munt þú ekki geta valið möppu heldur."
+"Innhólfið er sjálfgefin mappa, en þú getur breytt því að neðan. <p>Ekki öll "
+"tól styðja flokkun sem mögulegt rusl. Ef tólið styður ekki slíka flokkun "
+"munt þú ekki geta valið möppu heldur."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1040,12 +1050,12 @@ msgstr "Skoða bréf með vírusvarnartólunum"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Láta vírusvarnartólin skoða póstinn þinn. Álfurinn mun þá útbúa viðeigandi "
-"síur. Bréfin eru vanalega merkt af tólunum svo eftirfarandi síur geti unnið á "
-"þeim, og t.d. flutt smituð bréf í sérstaka möppu."
+"síur. Bréfin eru vanalega merkt af tólunum svo eftirfarandi síur geti unnið "
+"á þeim, og t.d. flutt smituð bréf í sérstaka möppu."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1054,12 +1064,12 @@ msgstr "Færa sýkt bréf í valda möppu"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Sía sem finnur bréf merkt sem smituð og flytur þau í ákveðna möppu hefur verið "
-"útbúin. Sjálfgefið er að setja bréfin í ruslið, en þú getur breytt því í "
-"möppusýninni."
+"Sía sem finnur bréf merkt sem smituð og flytur þau í ákveðna möppu hefur "
+"verið útbúin. Sjálfgefið er að setja bréfin í ruslið, en þú getur breytt því "
+"í möppusýninni."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1067,8 +1077,8 @@ msgstr "Merkja sýkt bréf sem lesin að auki"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Merkja smituð bréf sem lesinn ásamt að flytja þau yfir í völdu möppuna."
 
@@ -1265,8 +1275,8 @@ msgstr "Villa við lestur möppunnar %1 á þjóninum: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1286,8 +1296,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1318,20 +1328,20 @@ msgstr "Eytt"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Ekkert af auðkennum þínum passar við móttakanda þessa bréfs,"
-"<br> vinsamlegast veldu hvert netfanganna er þitt:"
+"<qt>Ekkert af auðkennum þínum passar við móttakanda þessa bréfs,<br> "
+"vinsamlegast veldu hvert netfanganna er þitt:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Fleiri af auðkennum þínum passa við móttakanda þessa bréfs,"
-"<br> vinsamlegast veldu hvert netfanganna er þitt:"
+"<qt>Fleiri af auðkennum þínum passa við móttakanda þessa bréfs,<br> "
+"vinsamlegast veldu hvert netfanganna er þitt:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1360,18 +1370,21 @@ msgstr "Villa kom upp við þjöppun möppunnar \"%1\". Hætt við þjöppun."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Þessum stillingum hefur verið breytt af kerfisstjóranum.</p>"
-"<p>Ef þú telur þetta vera villu, hafðu þá samband við hann.</p></qt>"
+"<qt><p>Þessum stillingum hefur verið breytt af kerfisstjóranum.</p><p>Ef þú "
+"telur þetta vera villu, hafðu þá samband við hann.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Opna snið..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Stilla KMail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "B&æta við..."
@@ -1401,6 +1414,11 @@ msgstr "<qt>Viltu örugglega fjarlægja auðkennið <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Fjarlægja auðkenni"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "E&yða"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Bæta við..."
@@ -1409,6 +1427,11 @@ msgstr "Bæta við..."
 msgid "Modify..."
 msgstr "Breyta..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "E&yða"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Setja sem sjálfgefið"
@@ -1425,17 +1448,15 @@ msgstr "&Sending"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Flutningsleiðir (þú þarft minnst eina tengingu):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Heiti"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tegund"
@@ -1457,8 +1478,7 @@ msgstr "Setja sem sjálfgefið"
 msgid "Common Options"
 msgstr "Almennar stillingar"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Sta&ðfesta áður en sent er"
@@ -1509,17 +1529,16 @@ msgstr "Sjálf&gefið lén:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Sjálfgefið lén er notað til að klára netföng sem innihalda aðeins "
+"<qt> <p>Sjálfgefið lén er notað til að klára netföng sem innihalda aðeins "
 "notandanafn.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1537,9 +1556,9 @@ msgstr "Bæta við flutningsleið"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (sjálfgefin)"
 
@@ -1554,7 +1573,8 @@ msgid ""
 "These %n identities have been changed to use the modified transport:"
 msgstr ""
 "Auðkenninu hefur verið breytt til að nota sjálfgefnu flutningsleiðina:\n"
-"Þessum %n auðkennum hefur verið breytt til að nota sjálfgefnu flutningsleiðina:"
+"Þessum %n auðkennum hefur verið breytt til að nota sjálfgefnu "
+"flutningsleiðina:"
 
 #: configuredialog.cpp:927
 #, c-format
@@ -1563,7 +1583,8 @@ msgid ""
 "These %n identities have been changed to use the default transport:"
 msgstr ""
 "Auðkenninu hefur verið breytt til að nota sjálfgefnu flutningsleiðina:\n"
-"Þessum %n auðkennum hefur verið breytt til að nota sjálfgefnu flutningsleiðina:"
+"Þessum %n auðkennum hefur verið breytt til að nota sjálfgefnu "
+"flutningsleiðina:"
 
 #: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
@@ -1622,6 +1643,10 @@ msgstr "Breyta tengingu"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Fann ekki tenginguna <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Li&tir"
@@ -1730,8 +1755,7 @@ msgstr "Heimsóttur tengill"
 msgid "Misspelled Words"
 msgstr "Rangt stafsett orð"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nýtt bréf"
@@ -1920,11 +1944,11 @@ msgstr "Þræðir sjálfgefið lokaðir"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"O&pna þræði sem hafa ný, ólesin eða mikilvæg bréf og opna þræði sem fylgst er "
-"með."
+"O&pna þræði sem hafa ný, ólesin eða mikilvæg bréf og opna þræði sem fylgst "
+"er með."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1932,67 +1956,52 @@ msgstr "Birting dagsetninga"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Þessi tákn má nota til að skilgreina dagsetningu:</strong></p>"
-"<ul>"
-"<li>d - dagurinn sem tala án '0' forskeytis (1-31)</li>"
-"<li>dd - dagurinn með '0' forskeyti (01-31)</li>"
-"<li>ddd - stutt form dags (Mon - Sun)</li>"
-"<li>dddd - langt form dags (Mánudagur - Sunnudagur)</li>"
-"<li>M - mánuðurinn án '0' forskeytis (1-12)</li>"
-"<li>MM - mánuðurinn með '0' forskeyti (01-12)</li>"
-"<li>MMM - stutt form mánaðar (Jan - Des)</li>"
-"<li>MMMM - langt form mánaðar (Janúar - Desember)</li>"
-"<li>yy - árið sem tveggja stafa tala (00-99)</li>"
-"<li>yyyy - árið sem fjögurra stafa tala (0000-9999)</li></ul>"
-"<p><strong>Þessi tákn má nota til að skilgreina tíma:</string></p> "
-"<ul>"
-"<li>h - klukkustund án '0' forskeytis (0-23 eða 1-12 ef AM/PM)</li>"
-"<li>hh - klukkustund með '0' forskeyti (00-23 eða 01-12 if AM/PM)</li>"
-"<li>m - mínútur án '0' forskeytis (0-59)</li>"
-"<li>mm - mínútur með '0' forskeyti (00-59)</li>"
-"<li>s - sekúndur án '0' forskeytis (0-59)</li>"
-"<li>ss - sekúndur með '0' forskeyti (00-59)</li>"
-"<li>z - millisekúndur án '0' forskeytis (0-999)</li>"
-"<li>zzz - millisekúndur með '0' forskeyti (000-999)</li>"
-"<li>AP - sýna AM/PM. AP verður skipt út með \"AM\" eða \"PM\".</li>"
-"<li>ap - sýna ap/pm. ap verður skipt út með \"am\" eða \"pm\".</li>"
-"<li>Z - tímabelti á töluformi (-0500)</li></ul>"
-"<p><strong>Allir aðrir stafir hunsaðir.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Þessi tákn má nota til að skilgreina dagsetningu:</strong></"
+"p><ul><li>d - dagurinn sem tala án '0' forskeytis (1-31)</li><li>dd - "
+"dagurinn með '0' forskeyti (01-31)</li><li>ddd - stutt form dags (Mon - "
+"Sun)</li><li>dddd - langt form dags (Mánudagur - Sunnudagur)</li><li>M - "
+"mánuðurinn án '0' forskeytis (1-12)</li><li>MM - mánuðurinn með '0' "
+"forskeyti (01-12)</li><li>MMM - stutt form mánaðar (Jan - Des)</li><li>MMMM "
+"- langt form mánaðar (Janúar - Desember)</li><li>yy - árið sem tveggja stafa "
+"tala (00-99)</li><li>yyyy - árið sem fjögurra stafa tala (0000-9999)</li></"
+"ul><p><strong>Þessi tákn má nota til að skilgreina tíma:</string></p> "
+"<ul><li>h - klukkustund án '0' forskeytis (0-23 eða 1-12 ef AM/PM)</"
+"li><li>hh - klukkustund með '0' forskeyti (00-23 eða 01-12 if AM/PM)</"
+"li><li>m - mínútur án '0' forskeytis (0-59)</li><li>mm - mínútur með '0' "
+"forskeyti (00-59)</li><li>s - sekúndur án '0' forskeytis (0-59)</li><li>ss - "
+"sekúndur með '0' forskeyti (00-59)</li><li>z - millisekúndur án '0' "
+"forskeytis (0-999)</li><li>zzz - millisekúndur með '0' forskeyti (000-999)</"
+"li><li>AP - sýna AM/PM. AP verður skipt út með \"AM\" eða \"PM\".</li><li>ap "
+"- sýna ap/pm. ap verður skipt út með \"am\" eða \"pm\".</li><li>Z - "
+"tímabelti á töluformi (-0500)</li></ul><p><strong>Allir aðrir stafir "
+"hunsaðir.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Víðværar stillingar á þráðum yfirtaka allar sértækar stillingar á möppum."
 
@@ -2008,8 +2017,7 @@ msgstr "Sýna HTML stöð&uslá"
 msgid "Show s&pam status in fancy headers"
 msgstr "Sýna rusl&póstsstöðu í glyshausum"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Skipta brostáknum út með brosköllum"
@@ -2018,8 +2026,7 @@ msgstr "Skipta brostáknum út með brosköllum"
 msgid "Use smaller font for quoted text"
 msgstr "Nota minna letur fyrir tilvitnaðan texta"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Sýna opna/loka tilvitnunartákn"
@@ -2045,8 +2052,7 @@ msgstr "Sjálfvirkt"
 msgid "&Override character encoding:"
 msgstr "Hunsa stafat&öflu:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Virkja táknmynd í kerfisbakkanum"
@@ -2149,21 +2155,19 @@ msgstr "<b>%f</b> verður skipt út fyrir skráarnafnið sem á að breyta."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Eftirfarandi tákn eru studd í svarbréfum:"
-"<br><b>%D</b>: dagsetning, <b>%S</b>: viðfangsefni,"
-"<br><b>%e</b>: póstfang sendanda, <b>%F</b>: nafn sendanda, <b>%f</b>"
-": upphafsstafir sendanda,"
-"<br><b>%T</b>: nafn móttakanda, <b>%t</b>: nafn og póstfang móttakanda,"
-"<br><b>%C</b>: nöfn í cc, <b>%c</b>: nöfn og póstföng í cc,"
-"<br><b>%%</b>: prósentumerkið, <b>%_</b>: orðabil, <b>%L</b>: ný lína</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Eftirfarandi tákn eru studd í svarbréfum:<br><b>%D</b>: dagsetning, <b>"
+"%S</b>: viðfangsefni,<br><b>%e</b>: póstfang sendanda, <b>%F</b>: nafn "
+"sendanda, <b>%f</b>: upphafsstafir sendanda,<br><b>%T</b>: nafn móttakanda, "
+"<b>%t</b>: nafn og póstfang móttakanda,<br><b>%C</b>: nöfn í cc, <b>%c</b>: "
+"nöfn og póstföng í cc,<br><b>%%</b>: prósentumerkið, <b>%_</b>: orðabil, <b>"
+"%L</b>: ný lína</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2186,21 +2190,20 @@ msgstr "Svara &öllum:"
 msgid "&Forward:"
 msgstr "Á&framsenda:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Merki um &tilvitnun:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Þann %D skrifaðir þú:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Þann %D skrifaði %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Áframsent bréf"
 
@@ -2238,11 +2241,11 @@ msgstr "Sláðu inn nýtt áframsendi-forskeyti:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Þessi listi er athugaður fyrir öll bréf á leið út, frá upphafi til enda, hvort "
-"stafatafla inniheldur alla nauðsynlega stafi."
+"Þessi listi er athugaður fyrir öll bréf á leið út, frá upphafi til enda, "
+"hvort stafatafla inniheldur alla nauðsynlega stafi."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2277,10 +2280,9 @@ msgstr "Gildi"
 msgid "Ne&w"
 msgstr "&Nýtt"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nafn:"
@@ -2289,19 +2291,18 @@ msgstr "&Nafn:"
 msgid "&Value:"
 msgstr "&Gildi:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nota samræmingu við Outlook í nöfnum viðhengja"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Veldu þetta til að Outlook(tm) skilji nöfn viðhengja sem innihalda ekki-enska "
-"stafi"
+"Veldu þetta til að Outlook(tm) skilji nöfn viðhengja sem innihalda ekki-"
+"enska stafi"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2327,20 +2328,20 @@ msgstr "viðhengt"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Þú hefur valið að kóða viðhengisnöfn sem innihalda ekki-enska stafi á máta sem "
-"er skilinn af Outlook(tm) og öðrum póstforritum sem styða ekki stöðluð kóðunar "
-"viðhengisnöfn.\n"
-"Athugaðu að KMail getur þá búið til bréf sem eru ekki lesanleg af póstforritum "
-"sem skilja ekki óstudda staðla, svo ekki velja þetta nema það sé algerlega "
-"nauðsynlegt."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Þú hefur valið að kóða viðhengisnöfn sem innihalda ekki-enska stafi á máta "
+"sem er skilinn af Outlook(tm) og öðrum póstforritum sem styða ekki stöðluð "
+"kóðunar viðhengisnöfn.\n"
+"Athugaðu að KMail getur þá búið til bréf sem eru ekki lesanleg af "
+"póstforritum sem skilja ekki óstudda staðla, svo ekki velja þetta nema það "
+"sé algerlega nauðsynlegt."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2364,111 +2365,95 @@ msgstr "Dulritu&nar bakendar"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Stundum kemur tölvupóstur í báðum sniðunum. Þessi valkostur stýrir hvort þú "
-"vilt frekar láta birta HTML hlutann eða textahlutann.</p>"
-"<p>HTML hlutinn lítur betur út en getur verið varasamur ef það leynast holur í "
-"öryggi tölvunnar.</p>"
-"<p>Textahlutinn skilar aðeins að litlu leyti útlitssniði textans, en gerir "
-"næstum <em>ómögulegt</em> að virkja galla í öryggi HTML teiknarans "
-"(Konqueror).</p>"
-"<p>Möguleikinn ver þig gegn algengri misnotkun á HTML kóða en getur hins vegar "
-"ekki varist öryggisholum sem voru óþekktar þegar þessi útgáfa KMail kom út.</p>"
-"<p>Það er <em>ekki</em> ráðlagt að haka við frekar HTML en texta.</p>"
-"<p><b>Athugaðu:</b> Þú getur breytt þessu fyrir hverja möppu í <i>Möppu</i> "
-"hluta KMail aðalgluggans.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Stundum kemur tölvupóstur í báðum sniðunum. Þessi valkostur stýrir "
+"hvort þú vilt frekar láta birta HTML hlutann eða textahlutann.</p><p>HTML "
+"hlutinn lítur betur út en getur verið varasamur ef það leynast holur í "
+"öryggi tölvunnar.</p><p>Textahlutinn skilar aðeins að litlu leyti "
+"útlitssniði textans, en gerir næstum <em>ómögulegt</em> að virkja galla í "
+"öryggi HTML teiknarans (Konqueror).</p><p>Möguleikinn ver þig gegn algengri "
+"misnotkun á HTML kóða en getur hins vegar ekki varist öryggisholum sem voru "
+"óþekktar þegar þessi útgáfa KMail kom út.</p><p>Það er <em>ekki</em> ráðlagt "
+"að haka við frekar HTML en texta.</p><p><b>Athugaðu:</b> Þú getur breytt "
+"þessu fyrir hverja möppu í <i>Möppu</i> hluta KMail aðalgluggans.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Sumar auglýsingar eru á HTML formi og innihalda tilvísanir í t.d. myndir sem "
-"hægt er að nota til að staðfesta að þú hafir lesið póstinn "
-"(&quot;vefpöddur&quot;).</p> "
-"<p>Það er engin gild ástæða fyrir því að hlaða svona inn myndir af Netinu, þar "
-"sem sendandinn getur alveg eins hengt þær beint við bréfið.</p> "
-"<p>Til að verjast svona misnotkun á HTML sýn tölvupóstsins þá er <em>ekki</em> "
-"hakað hér við í sjálfgefnu uppsetningunni.</p> "
-"<p>Engu að síður, ef þú vilt t.d. skoða myndir í HTML skilaboðum, sem voru ekki "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Sumar auglýsingar eru á HTML formi og innihalda tilvísanir í t.d. "
+"myndir sem hægt er að nota til að staðfesta að þú hafir lesið póstinn (&quot;"
+"vefpöddur&quot;).</p> <p>Það er engin gild ástæða fyrir því að hlaða svona "
+"inn myndir af Netinu, þar sem sendandinn getur alveg eins hengt þær beint "
+"við bréfið.</p> <p>Til að verjast svona misnotkun á HTML sýn tölvupóstsins "
+"þá er <em>ekki</em> hakað hér við í sjálfgefnu uppsetningunni.</p> <p>Engu "
+"að síður, ef þú vilt t.d. skoða myndir í HTML skilaboðum, sem voru ekki "
 "settar sem viðhengi, getur þú virkjað þennan valkost. En þú ættir að vera "
 "vakandi fyrir þessu hugsanlega vandamáli.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Tilkynningar um afdrif bréfa</h3>"
-"<p>Tilkynningar um afdrif bréfa er það sem vanalega er kallað <b>"
-"lestrarkvittun</b>. Höfundur bréfs biður um að fá afdrifstilkynningu senda og "
-"póstforrit móttakanda býr til svarsendingu sem gefur sendana vitneskju um "
-"afdrif bréfsins.  Algeng afdrif eru til dæmis <b>birt</b> (þ.e. lesið), <b>"
-"eytt</b> og <b>áframsent</b>.</p>"
-"<p>Eftirfarandi valmöguleikar standa til boða í KMail við sendingu "
-"afdrifstilkynninga:</p>"
-"<ul>"
-"<li><em>Hunsa</em>: Hunsar allr beiðnir um afdrifstilkynningar. Engar "
-"tilkynningar eru sendar sjálfkrafa (mælt með).</li>"
-"<li><em>Spyrja</em>: Svarar beiðni aðeins eftir að hafa spurt notandann áður. Á "
-"þennan hátt geturðu sent tilkynningar aðeins fyrir valin bréf og neitað að "
-"senda fyrir önnur.</li>"
-"<li><em>Neita</em>: Senda alltaf tilkynningu með <b>neitað</b>"
-". Þetta er þó aðeins <em>örlítið</em> skárra en að senda alltaf "
-"afdrifstilkynningar. Höfundurinn mun alltaf vita að tekið hefur verið á móti "
-"bréfinu, en hann veit bara ekki hvort það var lesið eða því eytt o.s.frv.</li>"
-"<li><em>Senda alltaf</em>: Sendir alltaf tilkynningar um afdrif bréfa.  Það "
-"þýðir að sendandinn mun alltaf vita þegar bréfið var móttekið, og einnig "
-"hvernig það var meðhöndlað (lesið, eytt o.s.frv).  Sterklega er mælt á móti "
-"þessu, en þar sem þetta gæti nýst vel t.d. í samskiptun við viðskiptavini, er "
-"þessi möguleiki fyrir hendi.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Tilkynningar um afdrif bréfa</h3><p>Tilkynningar um afdrif bréfa er "
+"það sem vanalega er kallað <b>lestrarkvittun</b>. Höfundur bréfs biður um að "
+"fá afdrifstilkynningu senda og póstforrit móttakanda býr til svarsendingu "
+"sem gefur sendana vitneskju um afdrif bréfsins.  Algeng afdrif eru til dæmis "
+"<b>birt</b> (þ.e. lesið), <b>eytt</b> og <b>áframsent</b>.</"
+"p><p>Eftirfarandi valmöguleikar standa til boða í KMail við sendingu "
+"afdrifstilkynninga:</p><ul><li><em>Hunsa</em>: Hunsar allr beiðnir um "
+"afdrifstilkynningar. Engar tilkynningar eru sendar sjálfkrafa (mælt með).</"
+"li><li><em>Spyrja</em>: Svarar beiðni aðeins eftir að hafa spurt notandann "
+"áður. Á þennan hátt geturðu sent tilkynningar aðeins fyrir valin bréf og "
+"neitað að senda fyrir önnur.</li><li><em>Neita</em>: Senda alltaf "
+"tilkynningu með <b>neitað</b>. Þetta er þó aðeins <em>örlítið</em> skárra en "
+"að senda alltaf afdrifstilkynningar. Höfundurinn mun alltaf vita að tekið "
+"hefur verið á móti bréfinu, en hann veit bara ekki hvort það var lesið eða "
+"því eytt o.s.frv.</li><li><em>Senda alltaf</em>: Sendir alltaf tilkynningar "
+"um afdrif bréfa.  Það þýðir að sendandinn mun alltaf vita þegar bréfið var "
+"móttekið, og einnig hvernig það var meðhöndlað (lesið, eytt o.s.frv).  "
+"Sterklega er mælt á móti þessu, en þar sem þetta gæti nýst vel t.d. í "
+"samskiptun við viðskiptavini, er þessi möguleiki fyrir hendi.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2484,15 +2469,15 @@ msgstr "Leyfa bréfum að hlaða inn utanaðkomandi &tilvísunum af Netinu"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ATHUGIÐ:</b> Að leyfa HTML í pósti getur aukið líkurnar á því að kerfið þitt "
-"verði viðkvæmt fyrir ýmsum öryggisholum. <a href=\"whatsthis:%1\">"
-"Meira um HTML póst...</a> <a href=\"whatsthis:%2\">Meira um utanaðkomandi "
-"efni...</a>"
+"<b>ATHUGIÐ:</b> Að leyfa HTML í pósti getur aukið líkurnar á því að kerfið "
+"þitt verði viðkvæmt fyrir ýmsum öryggisholum. <a href=\"whatsthis:%1\">Meira "
+"um HTML póst...</a> <a href=\"whatsthis:%2\">Meira um utanaðkomandi efni...</"
+"a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2573,8 +2558,7 @@ msgstr "Breyting á víðværum stillingum HTML mun hunsa sérstillingar á möp
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Þessi valkostur krefst dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "enginn milliþjónn"
@@ -2603,8 +2587,8 @@ msgstr "&Undanskilja mikilvæg bréf frá úreldingu"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Þegar leitað er að ólesnum pósti:"
 
@@ -2628,8 +2612,8 @@ msgstr "Endurtaka í öllum möppum"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Þegar farið er í möppu:"
 
@@ -2698,25 +2682,22 @@ msgstr "Möppur (\"maildir\" snið)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Þetta er val á sjálfgefnu möppusniði fyrir póstmöppur á þessari vél:</p>"
-"<p><b>mbox:</b> KMail póstmöppur eru geymdar sem skrá þar sem bréf eru aðskilin "
-"með línu sem byrjar á \"From\". Þetta sparar diskpláss en er kannski ekki eins "
-"öruggt, t.d. þegar bréf eru færð milli mappa.</p>"
-"<p><b>maildir:</b> KMail póstmöppur eru geymdar í raunverulegum möppum sem "
-"innihalda bréf sem sérstakar skrár. Þetta eyðir svolitlu plássi á diski en ætti "
-"að vera traustara, t.d. þegar bréf eru færð milli mappa.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Þetta er val á sjálfgefnu möppusniði fyrir póstmöppur á þessari vél:</"
+"p><p><b>mbox:</b> KMail póstmöppur eru geymdar sem skrá þar sem bréf eru "
+"aðskilin með línu sem byrjar á \"From\". Þetta sparar diskpláss en er "
+"kannski ekki eins öruggt, t.d. þegar bréf eru færð milli mappa.</"
+"p><p><b>maildir:</b> KMail póstmöppur eru geymdar í raunverulegum möppum sem "
+"innihalda bréf sem sérstakar skrár. Þetta eyðir svolitlu plássi á diski en "
+"ætti að vera traustara, t.d. þegar bréf eru færð milli mappa.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2751,51 +2732,43 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Þegar stokkið er á næsta ólesna bréf, getur verið að það sé ekkert bréf "
-"neðan við núverandi bréf.</p> "
-"<p><b>Ekki endurtaka:</b> Leitin hættir við síðasta bréf í virkri möppu.</p> "
-"<p><b>Endurtaka í virkri möppu:</p> Leitin heldur áfram að fyrsta bréfi en fer "
-"ekki í aðra möppu.</p> "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Þegar stokkið er á næsta ólesna bréf, getur verið að það sé ekkert "
+"bréf neðan við núverandi bréf.</p> <p><b>Ekki endurtaka:</b> Leitin hættir "
+"við síðasta bréf í virkri möppu.</p> <p><b>Endurtaka í virkri möppu:</p> "
+"Leitin heldur áfram að fyrsta bréfi en fer ekki í aðra möppu.</p> "
 "<p><b>Endurtaka í öllum möppum:</b> Leitin heldur áfram að fyrsta bréfi. Ef "
-"enginn ólesinn póstur finnst, heldur leitin áfram í næstu möppu.</p>"
-"<p>Á svipaðan hátt, þegar leitað er að fyrra ólesna pósti, byrjar leitin frá "
-"botni póstlistans og heldur áfram í fyrri möppu eftir því hvað valið er.</p>"
-"</qt>"
+"enginn ólesinn póstur finnst, heldur leitin áfram í næstu möppu.</p><p>Á "
+"svipaðan hátt, þegar leitað er að fyrra ólesna pósti, byrjar leitin frá "
+"botni póstlistans og heldur áfram í fyrri möppu eftir því hvað valið er.</"
+"p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Full textaflokkun gerir þér kleyft að leyta á hraðan hátt í innihaldi "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Full textaflokkun gerir þér kleyft að leyta á hraðan hátt í innihaldi "
 "bréfana. Þegar virkt mun leitarglugginn vera mjög hraðvirkur. Einnig mun "
-"leitarsláin velja bréf eftir innihaldi þeirra.</p>"
-"<p>Það þarf visst diskpláss fyrir þetta.</p>"
-"<p>Það þarf að byggja yfirlitsskrá þegar þetta er virkjað, en þú munt eftir sem "
-"áður geta notað KMail meðan aðgerðin á sér stað.</p></qt>"
+"leitarsláin velja bréf eftir innihaldi þeirra.</p><p>Það þarf visst "
+"diskpláss fyrir þetta.</p><p>Það þarf að byggja yfirlitsskrá þegar þetta er "
+"virkjað, en þú munt eftir sem áður geta notað KMail meðan aðgerðin á sér "
+"stað.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2862,8 +2835,8 @@ msgstr "&Fela möppur hópvinnukerfis"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Þegar hakað er við hér, muntu ekki sjá IMAP auðlindamöppur í möpputrénu."
 
@@ -2875,8 +2848,8 @@ msgstr "Auðlindamöppu&r eru í tengingu:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Þegar hakað er við hér, muntu ekki sjá IMAP auðlindamöppur í möpputrénu."
 
@@ -2931,19 +2904,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Nota samræmingu við Outlook í nöfnum viðhengja"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Sjálfvirk sending af boðum"
@@ -2953,28 +2925,27 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Þegar þetta er virkt, mun notandinn ekki sjá póstritilinn. Boðskeyti verða send "
-"sjálfvirkt"
+"Þegar þetta er virkt, mun notandinn ekki sjá póstritilinn. Boðskeyti verða "
+"send sjálfvirkt"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Boð eru vanalega send sem viðhengi við skeyti. Þessi valkostur gerir að "
-"verkum að boðin verða send í meginhluta bréfsins í staðinn; er það nauðsynlegt "
-"til að senda boð og svör til Microsoft Outlook."
-"<br>Hinsvegar muntu ekki lengur fá lýsandi texta sem póstforrit geta lesið; þar "
-"af leiðandi gætu skeytin komið furðulega út hjá fólki sem er ekki með "
-"póstforrit sem skilur þau. "
-"<br>Fólk með samhæfð póstforrit munu eftir sem áður geta unnið eðlilega með "
-"þau.</qt>"
+"verkum að boðin verða send í meginhluta bréfsins í staðinn; er það "
+"nauðsynlegt til að senda boð og svör til Microsoft Outlook.<br>Hinsvegar "
+"muntu ekki lengur fá lýsandi texta sem póstforrit geta lesið; þar af "
+"leiðandi gætu skeytin komið furðulega út hjá fólki sem er ekki með "
+"póstforrit sem skilur þau. <br>Fólk með samhæfð póstforrit munu eftir sem "
+"áður geta unnið eðlilega með þau.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3082,17 +3053,16 @@ msgstr "Á&framsenda"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3110,15 +3080,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3182,8 +3152,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Póstlisti með nafnið <b>%1</b> finnst þegar fyrir. Vinsamlega veldu annað "
-"nafn.</qt>"
+"<qt>Póstlisti með nafnið <b>%1</b> finnst þegar fyrir. Vinsamlega veldu "
+"annað nafn.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3192,8 +3162,8 @@ msgstr "Sýsla með auðkenni"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3369,7 +3339,8 @@ msgstr "Eyða óendurkvæmt"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Athugið: Úreldisaðgerðir verða virkjaðar um leið og stillingar eru staðfestar."
+"Athugið: Úreldisaðgerðir verða virkjaðar um leið og stillingar eru "
+"staðfestar."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3452,6 +3423,11 @@ msgstr "Veldu möppu"
 msgid "Filters"
 msgstr "%1 sía"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Velja allan texta"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3483,8 +3459,8 @@ msgstr "Skrá &virkni sía"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Þú getur kveikt og slökkt á síuannálum hér. Að sjálfsögðu eru annálagögnum "
 "einungis safnað og sýnd hér þegar kveikt er á þessum valkosti."
@@ -3503,14 +3479,16 @@ msgstr "Skoðun af athugun á síu&reglum"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Þú getur stjórnað magni upplýsinga þú vilt sjá af athugun af síureglunum þegar "
-"þær eru virkjaðar. Ef þú hakar við hér muntu fá ýtarlegar upplýsingar um hverja "
-"síureglu, annars er einungis niðurstaða athugunar af öllum síureglunum birt."
+"Þú getur stjórnað magni upplýsinga þú vilt sjá af athugun af síureglunum "
+"þegar þær eru virkjaðar. Ef þú hakar við hér muntu fá ýtarlegar upplýsingar "
+"um hverja síureglu, annars er einungis niðurstaða athugunar af öllum "
+"síureglunum birt."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3530,10 +3508,10 @@ msgstr "ótakmarkað"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Söfnun annalágagna tekur upp tímabundið minni. Hér getur þú skilgreint "
 "hámarksmagn minnis sem má nota. Ef stærð safnaðra gagna nær þessum mörkum "
@@ -3547,7 +3525,7 @@ msgstr ""
 "Gat ekki skrifað í skrána %1:\n"
 "\"%2\" er nánari lýsing á villunni."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail villuboð"
@@ -3588,9 +3566,9 @@ msgstr "Notandaa&uðkenning:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Notandaauðkennið er það sem er notað við innskráninguna á IMAP þjóninn. Það "
 "getur verið einfalt notandanafn eða fullt tölvupóstfang notanda. Innskráning "
@@ -3645,10 +3623,11 @@ msgstr "Þú hefur ekki les/skrif-heimild að ruslinu þínu."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Upplýsingar eru ekki komnar frá þjóni ennþá, vinsamlega notaðu \"Gá að pósti\"."
+"Upplýsingar eru ekki komnar frá þjóni ennþá, vinsamlega notaðu \"Gá að pósti"
+"\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3658,8 +3637,7 @@ msgstr "VIlla: Engin IMAP tenging skilgreind fyrir þessa möppu"
 msgid "Connecting to server %1, please wait..."
 msgstr "Tengist við þjóninn %1, vinsamlega bíðið..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Villa við tengingu við þjóninn %1"
@@ -3687,11 +3665,11 @@ msgstr "Bæta við aðgangsheimildum"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Ertu viss um að þú viljir fjarlægja þínar eigin heimildir fyrir þessa möppu? Þú "
-"munt ekki hafa aðgang að henni eftir það."
+"Ertu viss um að þú viljir fjarlægja þínar eigin heimildir fyrir þessa möppu? "
+"Þú munt ekki hafa aðgang að henni eftir það."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3722,7 +3700,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Veldu möppu"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Á þessari vél"
@@ -3746,12 +3724,13 @@ msgstr "Veldu flýtilykil fyrir möppuna"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Til að velja lykil eða lyklasamsetningu sem velja gildu möppuna, smelltu á "
-"hnappinn að neðan og ýttu á þá lykla sem þú vilt nota fyrir þessa möppu.</qt>"
+"<qt>Til að velja lykil eða lyklasamsetningu sem velja gildu möppuna, smelltu "
+"á hnappinn að neðan og ýttu á þá lykla sem þú vilt nota fyrir þessa möppu.</"
+"qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3771,13 +3750,22 @@ msgstr "&Hætta við"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Mappan sem þú eyddir var tengd aðganginum <b>%1</b> "
-"sem setti póst í hana. Framvegis mun nýr póstur verða settur í sjálfgefnu "
-"innhólfsmöppuna.</qt>"
+"<qt>Mappan sem þú eyddir var tengd aðganginum <b>%1</b> sem setti póst í "
+"hana. Framvegis mun nýr póstur verða settur í sjálfgefnu innhólfsmöppuna.</"
+"qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3903,55 +3891,16 @@ msgstr "Staða ruslpósts:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>b<br>r<br>é<br>f</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt> "
-"<br>E"
-"<br>k"
-"<br>k"
-"<br>i"
-"<br> <b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>b"
-"<br>r"
-"<br>é"
-"<br>f</b>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt> <br>E<br>k<br>k<br>i<br> <b><br>H<br>T<br>M<br>L<br> "
+"<br>b<br>r<br>é<br>f</b>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3963,19 +3912,13 @@ msgstr "&Nafnið þitt:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Nafnið þitt</h3>"
-"<p>Í þessu svæði á nafnið þitt að vera eins og þú vilt að það birtist í "
-"pósthaus allra senda bréfa.</p> "
-"<p>Ef þú hefur þetta svæði tómt mun nafnið þitt ekki birtast, heldur bara "
-"netfangið þitt.</p></qt>"
+"<qt><h3>Nafnið þitt</h3><p>Í þessu svæði á nafnið þitt að vera eins og þú "
+"vilt að það birtist í pósthaus allra senda bréfa.</p> <p>Ef þú hefur þetta "
+"svæði tómt mun nafnið þitt ekki birtast, heldur bara netfangið þitt.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3983,17 +3926,13 @@ msgstr "&Fyrirtæki/félag:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Fyrirtæki/félag</h3>"
-"<p>Í þetta svæði geturðu skrifað nafn fyrirtækis þíns eða félags ef þú vilt að "
-"það birtist í haus bréfa sem þú sendir.</p>"
-"<p>Það er í lagi (og eðlilegt) að hafa þetta svæði autt.</p></qt>"
+"<qt><h3>Fyrirtæki/félag</h3><p>Í þetta svæði geturðu skrifað nafn fyrirtækis "
+"þíns eða félags ef þú vilt að það birtist í haus bréfa sem þú sendir.</"
+"p><p>Það er í lagi (og eðlilegt) að hafa þetta svæði autt.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4002,19 +3941,14 @@ msgstr "N&etfang:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Netfang</h3>"
-"<p>Í þetta svæði skaltu skrifa nefangið þitt.</p>"
-"<p>Ef þú hefur þetta svæði autt eða skrifar netfangið vitlaust mun fólk eiga "
+"<qt><h3>Netfang</h3><p>Í þetta svæði skaltu skrifa nefangið þitt.</p><p>Ef "
+"þú hefur þetta svæði autt eða skrifar netfangið vitlaust mun fólk eiga "
 "erfitt með að svara póstinum þínum.</p></qt>"
 
 #: identitydialog.cpp:165
@@ -4024,21 +3958,12 @@ msgstr "N&etfang:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4061,19 +3986,17 @@ msgstr "Veldu OpenPGP lykilinn sem ætti að nota til að undirrita bréfin þí
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>OpenPGP lykillinn sem þú velur hér verður notaður til að undirrita og "
+"<qt><p>OpenPGP lykillinn sem þú velur hér verður notaður til að undirrita og "
 "dulkóða bréf fyrir sjálfan þig.  Þú getur einnig notað GnuPG lykla.</p> "
 "<p>Þú mátt hafa þetta svæði autt, en KMail getur þá ekki undirritað bréf með "
-"dulkóðun. Þetta hefur ekki áhrif á venjulega póstnotkun.</p> "
-"Þú getur fundið nánari upplýsingar um lykla á <a>http://www.gnupg.org</a></qt>"
+"dulkóðun. Þetta hefur ekki áhrif á venjulega póstnotkun.</p> Þú getur fundið "
+"nánari upplýsingar um lykla á <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4085,30 +4008,27 @@ msgstr "OpenPGP dulritunarlykillinn þinn"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Veldu OpenPGP lykilinn sem ætti að nota til að dulrita fyrir sjálfa(n) þig og "
-"fyrir \"Hengja dreifilykilinn minn við\" aðgerðina í ritlinum."
+"Veldu OpenPGP lykilinn sem ætti að nota til að dulrita fyrir sjálfa(n) þig "
+"og fyrir \"Hengja dreifilykilinn minn við\" aðgerðina í ritlinum."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP lykillinn sem þú velur hér verður notaður til að dulkóða skeyti "
-"fyrir sjálfa(n) þig og fyrir \"Hengja dreifilykilinn minn við\" aðgerðina í "
-"ritlinum. Þú getur einnig notað GnuPG lykla.</p> "
-"<p>Þú getur haft þetta svæði autt, en KMail getur þá ekki undirritað skeyti með "
-"dulkóðun. Þetta hefur ekki áhrif á venjulega póstnotkun.</p> "
-"Þú getur fundið nánari upplýsingar um lykla á <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>OpenPGP lykillinn sem þú velur hér verður notaður til að dulkóða "
+"skeyti fyrir sjálfa(n) þig og fyrir \"Hengja dreifilykilinn minn við\" "
+"aðgerðina í ritlinum. Þú getur einnig notað GnuPG lykla.</p> <p>Þú getur "
+"haft þetta svæði autt, en KMail getur þá ekki undirritað skeyti með "
+"dulkóðun. Þetta hefur ekki áhrif á venjulega póstnotkun.</p> Þú getur fundið "
+"nánari upplýsingar um lykla á <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4123,22 +4043,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Veldu S/MIME skírteinið sem ætti að nota til að undirrita bréfin þín stafrænt."
+"Veldu S/MIME skírteinið sem ætti að nota til að undirrita bréfin þín "
+"stafrænt."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) skírteinið sem þú velur hér verður notað til að undirrita "
-"bréfin þín stafrænt.</p>"
-"<p>Þú getur látið þetta vera tómt, en þá mun KMail ekki getað undirritað "
-"tölvupóstinn með S/MIME; þetta hefur engin áhrif á venjulegar póstaðgerðir.</p>"
-"</qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
+msgstr ""
+"<qt><p>S/MIME (X.509) skírteinið sem þú velur hér verður notað til að "
+"undirrita bréfin þín stafrænt.</p><p>Þú getur látið þetta vera tómt, en þá "
+"mun KMail ekki getað undirritað tölvupóstinn með S/MIME; þetta hefur engin "
+"áhrif á venjulegar póstaðgerðir.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4150,26 +4068,24 @@ msgstr "S/MIME dulritunarskírteinið þitt"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Veldu S/MIME skírteinið sem ætti að nota til að dulrita fyrir sjálfa(n) þig og "
-"fyrir \"Hengja við skírteinið mitt\" aðgerðina í ritlinum."
+"Veldu S/MIME skírteinið sem ætti að nota til að dulrita fyrir sjálfa(n) þig "
+"og fyrir \"Hengja við skírteinið mitt\" aðgerðina í ritlinum."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>S/MIME skírteinið sem þú velur hér verður notað til að dulrita skeyti til "
-"sjálfs þín og fyrir \"Hengja við skírteinið mitt\" aðgerðina í ritlinum.</p>"
-"<p>Þú getur látið þetta vera tómt, en þá mun KMail ekki getað dulkóðað afrit af "
-"skeytum með S/MIME; þetta hefur hinsvegar engin áhrif á venjulegar "
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>S/MIME skírteinið sem þú velur hér verður notað til að dulrita skeyti "
+"til sjálfs þín og fyrir \"Hengja við skírteinið mitt\" aðgerðina í ritlinum."
+"</p><p>Þú getur látið þetta vera tómt, en þá mun KMail ekki getað dulkóðað "
+"afrit af skeytum með S/MIME; þetta hefur hinsvegar engin áhrif á venjulegar "
 "póstaðgerðir.</p></qt>"
 
 #: identitydialog.cpp:280
@@ -4190,23 +4106,19 @@ msgstr "S&varnetfang:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Svarnetföng</h3>"
-"<p>Þetta lætur <tt>Svara-til:</tt> hausinn innihalda annað netfang en hið "
-"venjulega <tt>Frá:</tt> netfang.</p>"
-"<p>Þetta getur til dæmis komið sér vel þegar unnið er í hóp.  Þá viltu til "
-"dæmis að allur póstur sem þú sendir innhaldi þitt netfang í <tt>Frá:</tt> "
-"hausnum, en að öll svör fari á netfang hópsins.</p> "
-"<p>Ef þú ert í vafa skaltu hafa svæðið autt.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Svarnetföng</h3><p>Þetta lætur <tt>Svara-til:</tt> hausinn innihalda "
+"annað netfang en hið venjulega <tt>Frá:</tt> netfang.</p><p>Þetta getur til "
+"dæmis komið sér vel þegar unnið er í hóp.  Þá viltu til dæmis að allur "
+"póstur sem þú sendir innhaldi þitt netfang í <tt>Frá:</tt> hausnum, en að "
+"öll svör fari á netfang hópsins.</p> <p>Ef þú ert í vafa skaltu hafa svæðið "
+"autt.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4214,25 +4126,19 @@ msgstr "&Dulin netföng:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC - Dulin netföng</h3>"
-"<p>Netföngin sem þú tilgreinir hér verður bætt við allan póst sem þú sendir "
-"undir þessu auðkenni. Þau verða ekki sýnileg öðrum móttakendum.</p>"
-"<p>Það er algengt að nota þetta til að senda afrit af bréfunum á annað "
-"netfang.</p> "
-"<p>Til að tilgreina fleiri en eitt netfang skaltu nota kommur til að aðgreina "
-"lista dulinna móttakenda.</p>"
-"<p>Ef þú ert í vafa skildu þá svæðið eftir autt.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC - Dulin netföng</h3><p>Netföngin sem þú tilgreinir hér verður "
+"bætt við allan póst sem þú sendir undir þessu auðkenni. Þau verða ekki "
+"sýnileg öðrum móttakendum.</p><p>Það er algengt að nota þetta til að senda "
+"afrit af bréfunum á annað netfang.</p> <p>Til að tilgreina fleiri en eitt "
+"netfang skaltu nota kommur til að aðgreina lista dulinna móttakenda.</"
+"p><p>Ef þú ert í vafa skildu þá svæðið eftir autt.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4272,7 +4178,7 @@ msgstr "&Undirritunarskrá"
 msgid "&Picture"
 msgstr "&Mynd"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ógilt netfang"
 
@@ -4288,18 +4194,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Einn af uppsettu OpenPGP undirritunarlyklunum inniheldur ekki notandaauðkenni "
-"með netfanginu sem er notað fyrir þessa tengingu (%1).\n"
+"Einn af uppsettu OpenPGP undirritunarlyklunum inniheldur ekki "
+"notandaauðkenni með netfanginu sem er notað fyrir þessa tengingu (%1).\n"
 "Það gæti valdið því að móttakandi fær viðvörun þegar reynt er að staðfesta "
 "undirskriftina."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Einn af uppsettu OpenPGP undirritunarlyklunum inniheldur ekki notandaauðkenni "
-"með netfanginu sem er notað fyrir þessa tengingu (%1)."
+"Einn af uppsettu OpenPGP undirritunarlyklunum inniheldur ekki "
+"notandaauðkenni með netfanginu sem er notað fyrir þessa tengingu (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4308,8 +4214,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Eitt af uppsettu S/MIME undirritunarskírteinunum inniheldur ekki netfangið sem "
-"er notað fyrir þessa tengingu (%1).\n"
+"Eitt af uppsettu S/MIME undirritunarskírteinunum inniheldur ekki netfangið "
+"sem er notað fyrir þessa tengingu (%1).\n"
 "Það gæti valdið því að móttakandi fær viðvörun þegar reynt er að staðfesta "
 "undirskriftina."
 
@@ -4318,8 +4224,8 @@ msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Eitt af uppsettu S/MIME undirritunarskírteinunum inniheldur ekki netfangið sem "
-"er notað fyrir þessa tengingu (%1)."
+"Eitt af uppsettu S/MIME undirritunarskírteinunum inniheldur ekki netfangið "
+"sem er notað fyrir þessa tengingu (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4360,8 +4266,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (sjálfgefið)"
 
@@ -4409,19 +4315,19 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Stillingarnar voru sjálfkrafa fluttar yfir, en þú ættir eftir sem áður að skoða "
-"uppsetninguna á tengingunni þinni."
+"Stillingarnar voru sjálfkrafa fluttar yfir, en þú ættir eftir sem áður að "
+"skoða uppsetninguna á tengingunni þinni."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Það var ekki mögulegt að flytja sjálfkrafa stillingarnar svo vinsamlega skoðaðu "
-"uppsetninguna á tengingunni þinni."
+"Það var ekki mögulegt að flytja sjálfkrafa stillingarnar svo vinsamlega "
+"skoðaðu uppsetninguna á tengingunni þinni."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4460,17 +4366,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Villa: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Tengingin við þjóninn %1 slitnaði óvænt eða rann út. Reynt verður að tengjast "
-"sjálfvirkt aftur ef það er mögulegt."
+"Tengingin við þjóninn %1 slitnaði óvænt eða rann út. Reynt verður að "
+"tengjast sjálfvirkt aftur ef það er mögulegt."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4619,14 +4530,14 @@ msgstr "Safn lista"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4655,224 +4566,182 @@ msgstr "Ónothæfir dulkóðunarlyklar"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en einn dag.</p>\n"
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en %n daga.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en einn dag.</p>\n"
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en %n daga.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4886,213 +4755,171 @@ msgstr "S/MIME skírteini rennur fljótlega út"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>OpenPGP undirritunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> "
-"(Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>OpenPGP dulkóðunarlykillinn þinn</p><p align=center><b>%1</b> (Lykill 0x"
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>OpenPGP lykillinn fyrir</p><p align=center><b>%1</b> (Lykill 0x%2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Rótarskírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en einn dag.</p>\n"
+"<p>Rótarskírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en %n daga.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p>"
-"<p>fyrir S/MIME skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en einn dag.</p>\n"
+"<p>Milliliðs CA skírteinið</p><p align=center><b>%3</b></p><p>fyrir S/MIME "
+"skírteinið</p><p align=center><b>%1</b> (raðnúmer %2)</p><p>rennur út eftir "
+"minna en %n daga.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>S/MIME undirritunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> "
-"(raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>S/MIME dulkóðunarskírteinið þitt</p><p align=center><b>%1</b> (raðnúmer "
+"%2)</p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en einn dag.</p>\n"
-"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</p>"
-"<p>rennur út eftir minna en %n daga.</p>"
+"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en einn dag.</p>\n"
+"<p>S/MIME skírteinið fyrir</p><p align=center><b>%1</b> (raðnúmer %2)</"
+"p><p>rennur út eftir minna en %n daga.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5104,15 +4931,17 @@ msgstr "S/MIME skírteini rennur fljótlega út"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Einn eða fleiri af uppsettu OpenPGP dulkóðunarlyklunum eða S/MIME skírteinum er "
-"ekki ekki hægt að nota til dulkóðunar. Vinsamlega endurstilltu dulkóðunarlykla "
-"og skírteini fyrir þetta auðkenni í stillingarglugga auðkennis.\n"
+"Einn eða fleiri af uppsettu OpenPGP dulkóðunarlyklunum eða S/MIME skírteinum "
+"er ekki ekki hægt að nota til dulkóðunar. Vinsamlega endurstilltu "
+"dulkóðunarlykla og skírteini fyrir þetta auðkenni í stillingarglugga "
+"auðkennis.\n"
 "Ef þú velur að halda áfram, og það er þörf fyrir lyklana seinna, munt þú fá "
 "skilaboð um að skilgreina lykla sem á að nota."
 
@@ -5128,10 +4957,10 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Einn eða fleiri af uppsettu OpenPGP undirritunarlyklunum eða S/MIME skírteinum "
-"er ekki ekki hægt að nota til undirritunar. Vinsamlega endurstilltu "
-"undirritunarlykla og skírteini fyrir þetta auðkenni í stillingarglugga "
-"auðkennis.\n"
+"Einn eða fleiri af uppsettu OpenPGP undirritunarlyklunum eða S/MIME "
+"skírteinum er ekki ekki hægt að nota til undirritunar. Vinsamlega "
+"endurstilltu undirritunarlykla og skírteini fyrir þetta auðkenni í "
+"stillingarglugga auðkennis.\n"
 "Ef þú velur að halda áfram, og það er þörf fyrir lyklana seinna, munt þú fá "
 "skilaboð um að skilgreina lykla sem á að nota."
 
@@ -5143,13 +4972,13 @@ msgstr "Ónothæfir undirritunarlyklar"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Skoðun af móttakandastillingum gefur til kynna að það ætti að nota OpenPGP við "
-"dulritun af skeytinu, að minnsta kosti fyrir suma viðtakendur.\n"
+"Skoðun af móttakandastillingum gefur til kynna að það ætti að nota OpenPGP "
+"við dulritun af skeytinu, að minnsta kosti fyrir suma viðtakendur.\n"
 "Þú hefur hinsvegar ekki útbúið gilda OpenPGP dulritunarlykla fyrir þennan "
 "aðgang.\n"
 "Þú getur haldið áfram án þess að dulrita til sjálfs þíns, en athugaðu að þú "
@@ -5159,13 +4988,13 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Skoðun af móttakandastillingum gefur til kynna að það ætti að nota S/MIME við "
-"dulritun af skeytinu, að minnsta kosti fyrir suma viðtakendur.\n"
+"Skoðun af móttakandastillingum gefur til kynna að það ætti að nota S/MIME "
+"við dulritun af skeytinu, að minnsta kosti fyrir suma viðtakendur.\n"
 "Þú hefur hinsvegar ekki útbúið gilt S/MIME dulritunarskírteini fyrir þennan "
 "aðgang.\n"
 "Þú getur haldið áfram án þess að dulrita til sjálfs þíns, en athugaðu að þú "
@@ -5173,15 +5002,15 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Skoðun af móttakandastillingum gefur til kynna að það ætti að undirrita skeytið "
-"með OpenPGP, að minnsta kosti fyrir suma viðtakendur.\n"
-"Þú hefur hinsvegar ekki útbúið gild OpenPGP undirritunarskírteini fyrir þennan "
-"aðgang."
+"Skoðun af móttakandastillingum gefur til kynna að það ætti að undirrita "
+"skeytið með OpenPGP, að minnsta kosti fyrir suma viðtakendur.\n"
+"Þú hefur hinsvegar ekki útbúið gild OpenPGP undirritunarskírteini fyrir "
+"þennan aðgang."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5189,15 +5018,15 @@ msgstr "Ekki undirrita með OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Skoðun af móttakandastillingum gefur til kynna að það ætti að undirrita skeytið "
-"með S/MIME, að minnsta kosti fyrir suma viðtakendur.\n"
-"Þú hefur hinsvegar ekki útbúið gild S/MIME undirritunarskírteini fyrir þennan "
-"aðgang."
+"Skoðun af móttakandastillingum gefur til kynna að það ætti að undirrita "
+"skeytið með S/MIME, að minnsta kosti fyrir suma viðtakendur.\n"
+"Þú hefur hinsvegar ekki útbúið gild S/MIME undirritunarskírteini fyrir "
+"þennan aðgang."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5209,8 +5038,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Athugun af stillingum móttakanda gefur ekki til kynna neina almenna undirritun "
-"sem passar við fáanlegu undirritunarlyklana þína.\n"
+"Athugun af stillingum móttakanda gefur ekki til kynna neina almenna "
+"undirritun sem passar við fáanlegu undirritunarlyklana þína.\n"
 "Viltu senda bréfið án undirritunar?"
 
 #: keyresolver.cpp:1335
@@ -5219,11 +5048,11 @@ msgstr "Undirritun ekki möguleg"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Þú hefur ekki valið duritunarlykil fyrir þig (dulrita til sjálfs sín). Þú munt "
-"ekki geta afkóðað eigin skeyti ef þú dulritar það."
+"Þú hefur ekki valið duritunarlykil fyrir þig (dulrita til sjálfs sín). Þú "
+"munt ekki geta afkóðað eigin skeyti ef þú dulritar það."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5244,8 +5073,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Þú hefur ekki valið dulritunarlykil fyrir neinn af móttakendum skeytisins; "
 "verður það ekki dulritað af þeirri ástæðu."
@@ -5259,16 +5088,16 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Þú valdir ekki dulritunarlykil fyrir einn af móttakendunum. Viðkomandi persóna "
-"mun ekki getað afkóðað skeytið ef þú sendir það dulritað."
+"Þú valdir ekki dulritunarlykil fyrir einn af móttakendunum. Viðkomandi "
+"persóna mun ekki getað afkóðað skeytið ef þú sendir það dulritað."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Þú valdir ekki dulritunarlykla fyrir suma af móttakendunum. Viðkomandi persónur "
-"munu ekki getað afkóðað skeytið ef þú sendir það dulritað."
+"Þú valdir ekki dulritunarlykla fyrir suma af móttakendunum. Viðkomandi "
+"persónur munu ekki getað afkóðað skeytið ef þú sendir það dulritað."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5292,11 +5121,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Enginn gildur dulritunarlykill fannst fyrir \"%1\".\n"
 "\n"
@@ -5345,10 +5174,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Alvarleg villa: Gat ekki sótt póst: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Tókst ekki að bæta við bréfi:\n"
+msgid "Failed to add message:\n"
+msgstr "Tókst ekki að bæta við bréfi:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5438,6 +5265,50 @@ msgstr "&Aftengt IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir pósthólf"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Setja viðfangsefni bréfs"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Senda CC: til 'netfangs'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Senda BCC: til 'netfangs'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Bæta 'haus' við bréfið"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Lesa meginefni bréfs úr 'skrá'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Setja meginefni bréfs"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Bæta viðhengi við bréfið. Þetta er hægt að endurtaka"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Gá eingöngu að nýjum pósti"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Opna eingöngu ritilinn"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Skoða uppgefna bréfaskrá"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Senda bréf á 'vistfang' og hengja við skrána sem slóðin bendir á"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Póstur"
@@ -5494,14 +5365,13 @@ msgstr "%1: fann möppu %2. Verður hún notuð sem aðal hópvinnukerfismappa."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail fann eftirfarandi hópvinnukerfismöppur undir %1 og þarf að framkvæma "
-"eftirfarandi aðgerðir á þeim: %2 "
-"<br>Ef þú vilt ekki gera þetta, hættu þá við og IMAP auðlindin verður gerð "
-"óvirk."
+"<qt>KMail fann eftirfarandi hópvinnukerfismöppur undir %1 og þarf að "
+"framkvæma eftirfarandi aðgerðir á þeim: %2 <br>Ef þú vilt ekki gera þetta, "
+"hættu þá við og IMAP auðlindin verður gerð óvirk."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5550,11 +5420,11 @@ msgstr "Slóð afrituð á klemmuspjaldið."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Skráin <b>%1</b> er til fyrir.<br>Viltu skrifa yfir hana?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Vista í skrá"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Skipta út"
 
@@ -5572,7 +5442,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5592,11 +5462,11 @@ msgstr "Skráin inniheldur ekki bréf."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Skráin inniheldur mörg bréf. Aðeins það fyrsta er sýnt."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5605,114 +5475,115 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Eyði bréfum"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Sía bréf %1 af %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Er ekki nægilegt diskapláss?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Færa í þessa möppu"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Afrita í þessa möppu"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Færi bréf"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Eyði bréfum"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Opna slóð..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Viltu örugglega keyra <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Keyra"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Fann engin viðhengi til að vista."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Vista viðhengi á"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "viðhengi.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "viðhengi.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Skrá með nafninu %1 er til fyrir.  Viltu skrifa yfir hana ?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Skrá er til fyrir"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Yfirskrifa"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Hluti %1af bréfinu er dulritaður. Viltu geyma dulritunina þegar þú vistar?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail spurning"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Halda dulritun"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ekki halda"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"Hluti %1 af bréfinu er undirritaður. Viltu geyma undirritunina þegar þú vistar?"
+"Hluti %1 af bréfinu er undirritaður. Viltu geyma undirritunina þegar þú "
+"vistar?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Halda undirskrift"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5721,22 +5592,22 @@ msgstr ""
 "Gat ekki skrifað í skrána %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Gat ekki skrifað í skrána %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Það finnst engin færsla í vistfangaskránni fyrir þetta netfang. Bættu henni við "
-"og notaðu svo uppáhaldsforritið þitt til að bæta við skyndiskilaboðavistfangi "
-"(instant messaging)."
+"Það finnst engin færsla í vistfangaskránni fyrir þetta netfang. Bættu henni "
+"við og notaðu svo uppáhaldsforritið þitt til að bæta við "
+"skyndiskilaboðavistfangi (instant messaging)."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5746,78 +5617,78 @@ msgstr ""
 " %1\n"
 " það er ekki hægt að ákvarða hvern á að spjalla við."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus bakendinn býður ekki upp á \"x-obtain-keys\" aðgerðina. Vinsamlega "
 "sendu inn tilkynningu um þessa villu."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Villa í Chiasmus bakenda"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Óvænt skilagildi frá Chiasmus bakenda: \"x-obtain-keys\" aðgerðin skilaði ekki "
-"strengjalista. Vinsamlega tilkynntu um þessa villu."
+"Óvænt skilagildi frá Chiasmus bakenda: \"x-obtain-keys\" aðgerðin skilaði "
+"ekki strengjalista. Vinsamlega tilkynntu um þessa villu."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Engir lyklar fundust. Vinsamlega athugaðu hvort rétt lykilslóð sé uppgefin í "
 "Chiasmus stillingunum."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus dulritunarlyklaval"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus bakendinn býður ekki upp á \"x-decrypt\" aðgerðina. Vinsamlega sendu "
-"inn tilkynningu um þessa villu."
+"Chiasmus bakendinn býður ekki upp á \"x-decrypt\" aðgerðina. Vinsamlega "
+"sendu inn tilkynningu um þessa villu."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\"x-decrypt\" aðgerðin tekur ekki við viðföngunum sem búist var við. Vinsamlega "
-"sendu inn tilkynningu um þessa villu."
+"\"x-decrypt\" aðgerðin tekur ekki við viðföngunum sem búist var við. "
+"Vinsamlega sendu inn tilkynningu um þessa villu."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus dulritunarvilla"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Óvænt skilagildi frá Chiasmus bakenda: \"x-decrypt\" aðgerðin skilaði ekki "
 "bitafylki. Vinsamlega tilkynntu um þessa villu."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Póstur"
@@ -5916,7 +5787,7 @@ msgstr "Stærð"
 msgid "Encoding"
 msgstr "Stafatafla"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Þjappa"
 
@@ -5928,7 +5799,7 @@ msgstr "Dulritun"
 msgid "Sign"
 msgstr "Undirritun"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nafn viðhengis:"
 
@@ -5950,7 +5821,8 @@ msgstr "Aðalmóttakendur"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>Netföngin sem þú setur inn hér fá afrit af bréfinu.</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -5960,13 +5832,13 @@ msgstr "Aðrir móttakendur"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Netföngin sem þú setur inn hér fá afrit af bréfinu. Tæknilega séð er þetta "
-"það sama og að setja öll netföngin í <b>Til:</b> svæðið, en hinsvegar gefur "
-"þetta til kynna að móttakandinn af afritinu er áhorfandi, ekki "
+"<qt>Netföngin sem þú setur inn hér fá afrit af bréfinu. Tæknilega séð er "
+"þetta það sama og að setja öll netföngin í <b>Til:</b> svæðið, en hinsvegar "
+"gefur þetta til kynna að móttakandinn af afritinu er áhorfandi, ekki "
 "aðalmóttakandi.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -5975,9 +5847,8 @@ msgstr "Faldir móttakendur"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>Sama og <b>Afrit til:</b>, burtséð frá að engin af móttakendunum sér "
 "hverjir aðrir hafa fengið afrit af bréfinu.</qt>"
@@ -5990,7 +5861,7 @@ msgstr "&Senda póst"
 msgid "&Send Mail Via"
 msgstr "&Senda póst með"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "S&enda síðar"
@@ -6057,8 +5928,7 @@ msgstr "Ta&ka burt gæsalappir"
 msgid "Cl&ean Spaces"
 msgstr "Hreinsa &bil"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Nota &jafnbreitt letur"
@@ -6200,31 +6070,31 @@ msgstr "Du&lritunarsnið"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Staðall"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Punktalisti (diskur)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Punktalisti (hringur)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Punktalisti (kassi)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Raðaður listi (tugakerfi)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Raðaður listi (lækkandi)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Raðaður listi (hækkandi)"
 
@@ -6330,8 +6200,8 @@ msgstr "Loka ritli"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Bréfið sem þú skrifaðir virðist vitna í viðhengi en ekkert viðhengi er á "
@@ -6342,49 +6212,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Viðhengisáminning"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Senda óbreytt"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail fann ekki staðsetningu viðhengisins (%1).</p>"
-"<p>Þú verður að gefa upp fulla slóð ef þú vilt hengja skrá við.</p></qt>"
+"<qt><p>KMail fann ekki staðsetningu viðhengisins (%1).</p><p>Þú verður að "
+"gefa upp fulla slóð ef þú vilt hengja skrá við.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Hengja skrá við"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Hengja &við"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Stinga inn skrá"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Stinga inn skrá"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Villa kom upp þegar reynt var að flytja út lykilinn frá bakendanum:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Villa kom upp þegar reynt var að flytja út lykilinn frá bakendanum:</"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6423,96 +6293,108 @@ msgid ""
 "View"
 msgstr "Sýna"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Breyta..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Breyta skriftu..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Vista &sem..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Eiginleikar"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Hengja við..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail gat ekki þjappað skránni."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Þjappaða skráin er stærri en sú upprunalega. Viltu geyma upprunalegu skránna?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Geyma"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail gat ekki afþjappað skránni."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Vista viðhengi sem"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Setja sem texta"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Setja sem viðhengi"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Líma inn sem við&hengi"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nafnlaust"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Þú hefur valið að dulrita skeytið til sjálfs þín, en hinsvegar er enginn "
-"dulritunarlykill (OpenPGP eða S/MIME) skilgreindur fyrir þennan aðgang.</p> "
-"<p>Vinsamlega veldu lykilinn sem á að nota í auðkennisstillingunum.</p></qt>"
+"<qt><p>Þú hefur valið að dulrita skeytið til sjálfs þín, en hinsvegar er "
+"enginn dulritunarlykill (OpenPGP eða S/MIME) skilgreindur fyrir þennan "
+"aðgang.</p> <p>Vinsamlega veldu lykilinn sem á að nota í "
+"auðkennisstillingunum.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Óskilgreindur dulritunarlykill"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Til að geta undirritað bréfið verður þú fyrst að skilgreina OpenPGP eða "
-"S/MIME undirritunarlykilinn sem á að nota.</p>"
-"<p>Vinsamlega veldu lykilinn sem á að nota í stillingum auðkenna.</p></qt>"
+"<qt><p>Til að geta undirritað bréfið verður þú fyrst að skilgreina OpenPGP "
+"eða S/MIME undirritunarlykilinn sem á að nota.</p><p>Vinsamlega veldu "
+"lykilinn sem á að nota í stillingum auðkenna.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Óskilgreindur undiritunarlykill"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6520,92 +6402,91 @@ msgstr ""
 "KMail er í augnablikinu í ótengdum ham, bréfin þín verða geymd í úthólfinu "
 "þangað til þú tengist aftur."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Tengd/ótengd"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Þú verður að setja netfangið þitt í Frá: svæðið. Þú ættir að setja netfangið "
 "þitt í öll auðkenni til að sleppa að þurfa að skrifa það inn í hvert sinn þú "
 "býrð til nýtt skeyti."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Þú verður að tilgreina a.m.k. einn móttakanda í Til: svæðið eða CC eða sem BCC."
+"Þú verður að tilgreina a.m.k. einn móttakanda í Til: svæðið eða CC eða sem "
+"BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Þú tilgreindir ekki viðfangsefni. Senda bréfið samt?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Ekkert nafn tilgreint"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Þú tilgreindir ekki viðfangsefni. Senda bréfið samt?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ekkert viðfangsefni tilgreint"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "S&enda óbreytt"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Setja inn viðfangsefni"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Halda sniði, e&kki undirrita/dulrita"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Halda sniði, e&kki dulrita"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Halda sniði, e&kki undirrita"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Undirrita/dulrita (eyða sniði)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Dulrita (eyða sniði)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Undirrita (eyða sniði)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Innfelld undirritun/dulritun af HTML skeytum er ekki möguleg.</p>"
-"<p>Viltu eyða sniðinu?</p></qt>"
+"<qt><p>Innfelld undirritun/dulritun af HTML skeytum er ekki möguleg.</"
+"p><p>Viltu eyða sniðinu?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Undirrita/dulrita bréf?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6614,108 +6495,108 @@ msgstr ""
 "Sérsniðna mappan \"Uppköst\" fyrir \"%1\" er ekki til (lengur). Því verður "
 "sjálfgefna mappan fyrir uppköst notuð."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Vinsamlega búðu til flutningsleið og reyndu síðan aftur."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Að fara að senda póst..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Staðfesting sendingar"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Senda &núna"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Engir móttakendur"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Aðrir móttakendur"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Stafsetningarskoðun: virk"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Stafsetningarskoðun: óvirk"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Stafsetningarskoðun: hætt við"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Stafsetningarskoðun: stöðvuð"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Stafsetningarskoðun lokið."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Stafsetningarskoðun"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Vinsamlega tilgreindu dulritunar bakenda sem á að nota fyrir Chiasmus "
 "dulritun.\n"
 "Þú getur stillt þetta í dulritunar bakenda flipanum á öryggissíðunni."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Það lítur út fyrir að libkleopatra hafi verið byggt án Chiasmus stuðnings. Þú "
-"gætir þurft að endurbyggja libkleopatra með --enable-chiasmus."
+"Það lítur út fyrir að libkleopatra hafi verið byggt án Chiasmus stuðnings. "
+"Þú gætir þurft að endurbyggja libkleopatra með --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Engin Chiasmus bakendi fannst"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Engir Chiasmus lyklar fundust"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus dulritunarlyklaval"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Bréf var undirritað af %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Bréf var undirritað af %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP bréf - dulritað"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Skeyti með viðfangsefni: "
@@ -6765,11 +6646,11 @@ msgstr "Stafsetningarskoðun - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Ekki var hægt að ræsa ISpell/Aspell. Vinsamlega athugaðu að þú hafir ISpell eða "
-"Aspell rétt stillt og á skipanaslóð (PATH)."
+"Ekki var hægt að ræsa ISpell/Aspell. Vinsamlega athugaðu að þú hafir ISpell "
+"eða Aspell rétt stillt og á skipanaslóð (PATH)."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6802,13 +6683,10 @@ msgstr "<qt>Of margar síuaðgerðir í síureglu <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Óþekkt síuaðgerð <b>%1</b> "
-"<br>í síureglu <b>%2</b>."
-"<br>Hunsa hana.</qt>"
+"<qt>Óþekkt síuaðgerð <b>%1</b> <br>í síureglu <b>%2</b>.<br>Hunsa hana.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7025,158 +6903,129 @@ msgstr "Spila hljóð"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Þetta er listi yfir skilgreindar síur. Þær eru keyrðar að ofan og niður.</p>"
-"<p>Smelltu á síu og notaðu stýringarnar í hægri hluta gluggans til að breyta "
-"henni.</p></qt>"
+"<qt><p>Þetta er listi yfir skilgreindar síur. Þær eru keyrðar að ofan og "
+"niður.</p><p>Smelltu á síu og notaðu stýringarnar í hægri hluta gluggans til "
+"að breyta henni.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Smelltu á þennan takka til að búa til nýja síu.</p> "
-"<p>Síunni verður bætt í listann á undan völdu síunni í listanum, en þú getur "
-"auðvitað breytt röðinni seinna.</p>"
-"<p>Ef þú ýttir óvart á takkann þá geturðu hætt við með því að ýta á <em>"
-"Eyða</em> takkann</p></qt>"
+"<qt><p>Smelltu á þennan takka til að búa til nýja síu.</p> <p>Síunni verður "
+"bætt í listann á undan völdu síunni í listanum, en þú getur auðvitað breytt "
+"röðinni seinna.</p><p>Ef þú ýttir óvart á takkann þá geturðu hætt við með "
+"því að ýta á <em>Eyða</em> takkann</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Smelltu hér til að afrita síu.</p> "
-"<p>Ef þú ýttir óvart á takkann þá geturðu hætt við með því að ýta á <em>"
-"Eyða</em> takkann</p></qt>"
+"<qt><p>Smelltu hér til að afrita síu.</p> <p>Ef þú ýttir óvart á takkann þá "
+"geturðu hætt við með því að ýta á <em>Eyða</em> takkann</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Smelltu á þennan hnapp til að <em>eyða</p> þeirri síu sem valin er í "
-"listanum að ofan.</p>"
-"<p>Ekki er mögulegt að fá síu til baka þegar henni hefur verið eytt, en hægt er "
-"að smella á <em>Hætta við</em> hnappinn til að sleppa því að vista þær "
-"breytingar sem gerðar hafa verið.</p></qt>"
+"<qt><p>Smelltu á þennan hnapp til að <em>eyða</p> þeirri síu sem valin er í "
+"listanum að ofan.</p><p>Ekki er mögulegt að fá síu til baka þegar henni "
+"hefur verið eytt, en hægt er að smella á <em>Hætta við</em> hnappinn til að "
+"sleppa því að vista þær breytingar sem gerðar hafa verið.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Smelltu á þennan takka til að færa völdu síuna <em>efst</em> "
-"í listann að ofan.</p>"
-"<p>Þetta er gagnlegt þar sem röðin í listanum segir til um í hvaða röð síurnar "
-"eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</p></qt>"
+"<qt><p>Smelltu á þennan takka til að færa völdu síuna <em>efst</em> í "
+"listann að ofan.</p><p>Þetta er gagnlegt þar sem röðin í listanum segir til "
+"um í hvaða röð síurnar eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Smelltu á þennan hnapp til að færa völdu síuna <em>ofar</em> í listann.</p>"
-"<p>Þetta er gagnlegt þar sem röðin í listanum segir til um í hvaða röð síurnar "
-"eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</p> "
-"<p>Ef þú hefur smellir óvart á þennan hnapp getur þú lagað mistökin með því að "
-"ýta á <em>niður</em> hnappinn.</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Smelltu á þennan hnapp til að færa völdu síuna <em>ofar</em> í "
+"listann.</p><p>Þetta er gagnlegt þar sem röðin í listanum segir til um í "
+"hvaða röð síurnar eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</p> "
+"<p>Ef þú hefur smellir óvart á þennan hnapp getur þú lagað mistökin með því "
+"að ýta á <em>niður</em> hnappinn.</em></p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Smelltu á þennan takka til að færa völdu síuna <em>neðar</em> í listann.</p>"
-"<p>Þetta er gagnlegt þar sem röðin í listanum segir til um í hvaða röð síurnar "
-"eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</p> "
-"<p>Ef þú hefur smellir óvart á þennan hnapp getur þú lagað mistökin með því að "
-"ýta á <em>upp</em> hnappinn.</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Smelltu á þennan takka til að færa völdu síuna <em>neðar</em> í "
+"listann.</p><p>Þetta er gagnlegt þar sem röðin í listanum segir til um í "
+"hvaða röð síurnar eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</p> "
+"<p>Ef þú hefur smellir óvart á þennan hnapp getur þú lagað mistökin með því "
+"að ýta á <em>upp</em> hnappinn.</em></p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Smelltu á þennan takka til að færa völdu síuna <em>neðst</em> "
-"í listann að ofan.</p>"
-"<p>Þetta er gagnlegt þar sem röðin í listanum segir til um í hvaða röð síurnar "
-"eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</p></qt>"
+"<qt><p>Smelltu á þennan takka til að færa völdu síuna <em>neðst</em> í "
+"listann að ofan.</p><p>Þetta er gagnlegt þar sem röðin í listanum segir til "
+"um í hvaða röð síurnar eru keyrðar á skilaboðin. Sú efsta er keyrð fyrst.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Smelltu á þennan takka til að breyta heiti völdu síunnar.</p> "
-"<p>Síur fá venjulega nöfn sjálfkrafa, að því gefnu að þær byrji á \"&lt;\".</p>"
-"<p>Ef þú hefur óvart breytt heiti einhverrar síu og vilt fá sjálfgefna heitið "
-"aftur, smelltu þá aftur á þennan takka og veldu <em>hreinsa</em> og svo <em>"
-"Í lagi</em> í glugganum sem birtist.</p></qt>"
+"<qt><p>Smelltu á þennan takka til að breyta heiti völdu síunnar.</p> <p>Síur "
+"fá venjulega nöfn sjálfkrafa, að því gefnu að þær byrji á \"&lt;\".</p><p>Ef "
+"þú hefur óvart breytt heiti einhverrar síu og vilt fá sjálfgefna heitið "
+"aftur, smelltu þá aftur á þennan takka og veldu <em>hreinsa</em> og svo "
+"<em>Í lagi</em> í glugganum sem birtist.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Smelltu á þennan hnapp til að þvinga birtingu staðfestingarglugga.</p>"
-"<p>Þetta er gagnlegt ef þú hefur skilgreint reglu sem merkir bréf sem á að "
+"<qt><p>Smelltu á þennan hnapp til að þvinga birtingu staðfestingarglugga.</"
+"p><p>Þetta er gagnlegt ef þú hefur skilgreint reglu sem merkir bréf sem á að "
 "sækja síðar. Án þess möguleika að þvinga staðfestingarglugga væru þessi bréf "
-"aldrei sótt ef engin önnur stór bréf bíða á þjóninum, eða ef þú vildir breyta "
-"reglunni til að merkja bréfin öðruvísi.</p></qt>"
+"aldrei sótt ef engin önnur stór bréf bíða á þjóninum, eða ef þú vildir "
+"breyta reglunni til að merkja bréfin öðruvísi.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7186,6 +7035,16 @@ msgstr "POP3 síureglur"
 msgid "Filter Rules"
 msgstr "Síureglur"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Flytja inn"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Flytja inn"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Tiltækar síur"
@@ -7266,6 +7125,11 @@ msgstr "Setja þessa síu einnig í tækjaslánna"
 msgid "Icon for this filter:"
 msgstr "Táknmynd fyrir þessa síu:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Til"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Upp"
@@ -7274,16 +7138,29 @@ msgstr "Upp"
 msgid "Down"
 msgstr "Niður"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Endurnefna..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Ný"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Afrit til"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Eytt"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7292,8 +7169,8 @@ msgstr "Veldu flýtilykil fyrir möppuna"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Að minsta kosti ein sía er sett til að vinna á virkri IMAP tengingu. Slíkar "
 "síur eru bara virkjaðar þegar handvirk síun er valin og þegar verið er að "
@@ -7304,8 +7181,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Eftirfarandi síur hafa ekki verið vistaðar því þær eru ógildar ( innihalda t.d. "
-"ekki aðgerð eða leitarreglu)"
+"Eftirfarandi síur hafa ekki verið vistaðar því þær eru ógildar ( innihalda t."
+"d. ekki aðgerð eða leitarreglu)"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7353,16 +7230,16 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Möppunöfn geta ekki innihaldið / (skástrik) táknið. Vinsamlega gefðu upp annað "
-"möppunafn."
+"Möppunöfn geta ekki innihaldið / (skástrik) táknið. Vinsamlega gefðu upp "
+"annað möppunafn."
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Möppunöfn geta ekki haft . (punkt) fremt í nafninu. Vinsamlega gefðu upp annað "
-"möppunafn."
+"Möppunöfn geta ekki haft . (punkt) fremt í nafninu. Vinsamlega gefðu upp "
+"annað möppunafn."
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7378,28 +7255,24 @@ msgstr "Vandamál við IMAP skyndiminni"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Vandamál við IMAP skyndiminni.</b></p>"
-"<p>Ef þú lendir í vandamálum við að samræma IMAP möppur ættir þú fyrst að prófa "
-"að endurbyggja yfirlitsskrána. Þetta tekur nokkurn tíma, en mun ekki valda "
-"neinum vandræðum.</p>"
-"<p>Ef það dugar ekki til geturðu reynt að uppfæra IMAP skyndiminnið. Ef þú "
-"gerir þetta, tapast allar staðværar breytingar í þessari möppu og öllum "
+"<p><b>Vandamál við IMAP skyndiminni.</b></p><p>Ef þú lendir í vandamálum við "
+"að samræma IMAP möppur ættir þú fyrst að prófa að endurbyggja "
+"yfirlitsskrána. Þetta tekur nokkurn tíma, en mun ekki valda neinum vandræðum."
+"</p><p>Ef það dugar ekki til geturðu reynt að uppfæra IMAP skyndiminnið. Ef "
+"þú gerir þetta, tapast allar staðværar breytingar í þessari möppu og öllum "
 "undirmöppum hennar.</p>"
 
 #: kmfoldercachedimap.cpp:135
@@ -7437,8 +7310,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7477,8 +7350,8 @@ msgstr "Búið að búa til yfirlit fyrir þessa möppu."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Mappan %1 er ekki í samræmingarstöðu (staða var %2). Viltu endursetja hana í "
 "samræmingarstöðu og samræma eftir sem áður?"
@@ -7608,14 +7481,11 @@ msgstr "Bý til undirmöppur á miðlara"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Svo virðist sem möppunni <b>%1</b> hafi verið eytt. Viltu eyða henni á "
-"þjóninum?</p></qt>"
+"<qt><p>Svo virðist sem möppunni <b>%1</b> hafi verið eytt. Viltu eyða henni "
+"á þjóninum?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7636,13 +7506,11 @@ msgstr "Tek á móti möppum fyrir nafnsvið %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Svo virðist sem möppunni <b>%1</b> hafi verið eytt. Viltu eyða henni á "
-"þjóninum?</p></qt>"
+"<qt><p>Svo virðist sem möppunni <b>%1</b> hafi verið eytt. Viltu eyða henni "
+"á þjóninum?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7650,8 +7518,8 @@ msgstr "Hætt við"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP þjónninn %1 hefur ekki stuðning við IMAP umsagnir. Ekki er hægt að nota "
 "XML geymsluna á þessum þjóni. Vinsamlega endurstilltu KMail til samræmis."
@@ -7659,8 +7527,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP þjónninn %1 hefur ekki stuðning við IMAP umsagnir. Ekki er hægt að nota "
 "XML geymsluna á þessum þjóni. Vinsamlega endurstilltu KMail til samræmis."
@@ -7676,17 +7544,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Það eru ný bréf í möppunni (%1) sem er ekki búið að senda á þjóninn ennþá. "
-"Þú virðist hinsvegar ekki hafa nægar aðgangsheimildir að möppunni núna til að "
-"senda þau. Hafðu samband við kerfisstjórann þinn um að fá aðgang að möppunni, "
-"eða flyttu bréfin í aðra möppu.</p> "
-"<p>Viltu flytja bréfin yfir í aðra möppu núna?</p>"
+"<p>Það eru ný bréf í möppunni (%1) sem er ekki búið að senda á þjóninn "
+"ennþá. Þú virðist hinsvegar ekki hafa nægar aðgangsheimildir að möppunni "
+"núna til að senda þau. Hafðu samband við kerfisstjórann þinn um að fá aðgang "
+"að möppunni, eða flyttu bréfin í aðra möppu.</p> <p>Viltu flytja bréfin yfir "
+"í aðra möppu núna?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7695,20 +7563,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Það eru ný bréf í möppunni (%1) sem er ekki búið að senda á þjóninn ennþá. "
-"Þú virðist hinsvegar ekki hafa nægar aðgangsheimildir að möppunni núna til að "
-"senda þau. Hafðu samband við kerfisstjórann þinn um að fá aðgang að möppunni, "
-"eða flyttu bréfin í aðra möppu.</p> "
-"<p>Viltu flytja bréfin yfir í aðra möppu núna?</p>"
+"<p>Það eru ný bréf í möppunni (%1) sem er ekki búið að senda á þjóninn "
+"ennþá. Þú virðist hinsvegar ekki hafa nægar aðgangsheimildir að möppunni "
+"núna til að senda þau. Hafðu samband við kerfisstjórann þinn um að fá aðgang "
+"að möppunni, eða flyttu bréfin í aðra möppu.</p> <p>Viltu flytja bréfin yfir "
+"í aðra möppu núna?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Færa til:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ekki flytja"
 
@@ -7720,8 +7593,7 @@ msgstr "Flytja bréf í möppu"
 msgid "Permissions (ACL)"
 msgstr "Aðgangsheimildir (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Almennt"
@@ -7746,8 +7618,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Nota sérsniðnar &táknyndir"
@@ -7766,23 +7637,21 @@ msgstr "Láta vita um ný/ólesin bréf í þessari möppu"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ef þessi valkostur er virkjaður, munt þú fá tilkynningu um ný/ólesin bréf í "
-"þessari möppu. Einnig mun verða stoppað í þessari möppu ef þú velur að fara í "
-"næstu/fyrri möppu með ólesnum bréfum.</p>"
-"<p>Slepptu þessum valkosti ef þú vilt ekki fá tilkynningu um ný/ólesin bréf í "
-"möppunni og ef þú vilt að hoppað sé yfir hana þegar valið er að fara í "
-"næstu/fyrri möppu með ólesnum bréfum. Er þetta gagnlegt til að hunsa ný/ólesin "
-"bréf í ruslinu og ruslpóstmöppunni.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Ef þessi valkostur er virkjaður, munt þú fá tilkynningu um ný/ólesin "
+"bréf í þessari möppu. Einnig mun verða stoppað í þessari möppu ef þú velur "
+"að fara í næstu/fyrri möppu með ólesnum bréfum.</p><p>Slepptu þessum "
+"valkosti ef þú vilt ekki fá tilkynningu um ný/ólesin bréf í möppunni og ef "
+"þú vilt að hoppað sé yfir hana þegar valið er að fara í næstu/fyrri möppu "
+"með ólesnum bréfum. Er þetta gagnlegt til að hunsa ný/ólesin bréf í ruslinu "
+"og ruslpóstmöppunni.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7794,12 +7663,12 @@ msgstr "Halda svarbréfum í þessari möppu"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Hakaðu við hér ef þú vilt að svörin við bréfum frá þessari möppu verði einnig "
-"sett hér, í stað þess að setja þau í sjálfgefnu sendur póstur möppuna."
+"Hakaðu við hér ef þú vilt að svörin við bréfum frá þessari möppu verði "
+"einnig sett hér, í stað þess að setja þau í sjálfgefnu sendur póstur möppuna."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7809,17 +7678,21 @@ msgstr "Sýna sendanda/móttakanda dálk í skilaboðalistanum"
 msgid "Sho&w column:"
 msgstr "&Sýna dálk:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Setja sem sjálfgefið"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Sendandi"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Móttakandi"
@@ -7830,17 +7703,17 @@ msgstr "Auðkenni &sendanda:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Veldu auðkennið sem á að nota þegar nýr póstur er skrifaður eða þegar pósti í "
-"þessari möppu er svarað. Þetta þýðir að ef þú ert í einni af vinnumöppunum "
+"Veldu auðkennið sem á að nota þegar nýr póstur er skrifaður eða þegar pósti "
+"í þessari möppu er svarað. Þetta þýðir að ef þú ert í einni af vinnumöppunum "
 "þínum getur þú látið KMail nota samsvarandi sendanda netfang, undirritun og "
-"undirritunar- eða dulritunarlykla sjálfkrafa. Það er hægt að setja upp auðkenni "
-"í stillingarglugganum (Stillingar -> Stilla KMail)."
+"undirritunar- eða dulritunarlykla sjálfkrafa. Það er hægt að setja upp "
+"auðkenni í stillingarglugganum (Stillingar -> Stilla KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7858,26 +7731,26 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Hér tilgreinir þú hvaða notendur, sem deila þessari möppu, ættu að fá "
-"\"upptekinn\" tímabil í laus/upptekinn listann sinn og ættu að sjá áminningar "
-"yfir atburði eða verkefni í þessari möppu. Stillingarnar eiga einungis við "
-"dagatals og verkefnamöppurnar (fyrir verkefni er þessi stilling bara notuð "
-"fyrir áminningar).\n"
+"\"upptekinn\" tímabil í laus/upptekinn listann sinn og ættu að sjá "
+"áminningar yfir atburði eða verkefni í þessari möppu. Stillingarnar eiga "
+"einungis við dagatals og verkefnamöppurnar (fyrir verkefni er þessi stilling "
+"bara notuð fyrir áminningar).\n"
 "\n"
-"Dæmi: Yfirmaður deilir möppu með einkaritara sínum. Einungis yfirmaðurinn ætti "
-"að vera merktur sem upptekinn fyrir fundinn, svo hann ætti að velja "
+"Dæmi: Yfirmaður deilir möppu með einkaritara sínum. Einungis yfirmaðurinn "
+"ætti að vera merktur sem upptekinn fyrir fundinn, svo hann ætti að velja "
 "\"stjórnendur\" þar sem einkaritarinn hefur ekki sérréttindi á möppuna.\n"
-"Ef allir notendur vinnuhóps deila dagatali fyrir hópfundi, ættu allir lesendur "
-"möppunar að vera merktir uppteknir fyrir fundi.\n"
-"Fyrirtækjamappa sem er opinn öllum, með valfrjálsa atburði, ætti að vera merkt "
-"\"enginn\" þar sem ekki er vitað fyrirfram hverjir verða með."
+"Ef allir notendur vinnuhóps deila dagatali fyrir hópfundi, ættu allir "
+"lesendur möppunar að vera merktir uppteknir fyrir fundi.\n"
+"Fyrirtækjamappa sem er opinn öllum, með valfrjálsa atburði, ætti að vera "
+"merkt \"enginn\" þar sem ekki er vitað fyrirfram hverjir verða með."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7908,23 +7781,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Þú hefur sett upp möppuna til að innihalda hópvinnukerfisupplýsingar en "
-"stillingarvalkosturinn að fela hópvinnukerfismöppur er virkur. Þýðir þetta að "
-"mappan mun hverfa þegar þessum glugga er lokað. Ef þú vilt fjarlægja möppuna "
-"seinna verður þú að slökkva tímabundið á felun af hópvinnukerfismöppum til að "
-"geta séð hana."
+"stillingarvalkosturinn að fela hópvinnukerfismöppur er virkur. Þýðir þetta "
+"að mappan mun hverfa þegar þessum glugga er lokað. Ef þú vilt fjarlægja "
+"möppuna seinna verður þú að slökkva tímabundið á felun af "
+"hópvinnukerfismöppum til að geta séð hana."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7993,7 +7866,8 @@ msgstr "Villa kom upp þegar reynt var að ná í möppuupplýsingar."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Yfirlitsskráin fyrir '%1' er frá óþekktri útgáfu af KMail (%2).\n"
 "Hægt er að byggja yfirlitið upp á nýtt út í frá innhaldi möppunnar, en "
@@ -8025,11 +7899,11 @@ msgstr "Gat ekki opnað %1 - möppuna vantar."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Villa við opnun %1. Annað hvort er þetta ógild maildir mappa eða þú hefur ekki "
-"nægilegar heimildir."
+"Villa við opnun %1. Annað hvort er þetta ógild maildir mappa eða þú hefur "
+"ekki nægilegar heimildir."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8058,8 +7932,8 @@ msgid ""
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
 "Úthólf mappan inniheldur bréf sem voru líklega ekki búin til með KMail.\n"
-"Vinsamlegast færðu þau eitthvert annað, nema þú viljir að KMail sendi þau fyrir "
-"þig."
+"Vinsamlegast færðu þau eitthvert annað, nema þú viljir að KMail sendi þau "
+"fyrir þig."
 
 #: kmfoldermbox.cpp:112
 msgid ""
@@ -8071,21 +7945,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tilvísunarskrá möppu '%2' virðist ekki vera í samræmmi við innihald. Til að "
-"varna skemmdum á bréfum verður tilvísunarskráin endurgerð.Sem afleiðing af því "
-"geta bréf sem er buið að eyða birtst aftur og staða bréfs breyst.</p>"
-"<p>Vinsamlega lestu viðkomandi færslu í <a href=\"%1\">"
-"FAQ hluta KMail handbókarinnar</a> til að leita leiða til að koma í veg fyrir "
-"að þetta gerist aftur.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Tilvísunarskrá möppu '%2' virðist ekki vera í samræmmi við innihald. "
+"Til að varna skemmdum á bréfum verður tilvísunarskráin endurgerð.Sem "
+"afleiðing af því geta bréf sem er buið að eyða birtst aftur og staða bréfs "
+"breyst.</p><p>Vinsamlega lestu viðkomandi færslu í <a href=\"%1\">FAQ hluta "
+"KMail handbókarinnar</a> til að leita leiða til að koma í veg fyrir að þetta "
+"gerist aftur.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8145,7 +8016,7 @@ msgstr ""
 "'%1' virðist ekki vera mappa.\n"
 "Vinsamlegast færðu skrána frá."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8153,7 +8024,7 @@ msgstr ""
 "Aðgagnsheimildir möppunnar '%1' eru ekki réttar.\n"
 "Gangtu úr skugga um að þú getur skoðað og breytt innihaldi möppunnar."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8163,8 +8034,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8172,7 +8043,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Get ekki búið til möppu"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8273,13 +8144,13 @@ msgstr "&Vandamál með IMAP skyndiminni..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Get ekki búið til möppuna <b>%1</b> vegna ónægra heimilda á þjóninum. Ef þú "
-"vilt meina að þú ættir að geta búið til undimöppu hér, spurðu kerfisstjórann "
-"þinn um heimildir til þess.</qt> "
+"<qt>Get ekki búið til möppuna <b>%1</b> vegna ónægra heimilda á þjóninum. Ef "
+"þú vilt meina að þú ættir að geta búið til undimöppu hér, spurðu "
+"kerfisstjórann þinn um heimildir til þess.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8416,15 +8287,15 @@ msgstr "%1 mappan er ritvarin."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Viltu örugglega eyða valda bréfinu?"
-"<br>Þegar því hefur verið eytt er engin leið að endurheimta það.</qt>\n"
-"<qt>Viltu örugglega eyða %n völdu bréfunum? "
-"<br>Þegar þeim hefur verið eytt er engin leið að endurheimta þau.</qt>"
+"<qt>Viltu örugglega eyða valda bréfinu?<br>Þegar því hefur verið eytt er "
+"engin leið að endurheimta það.</qt>\n"
+"<qt>Viltu örugglega eyða %n völdu bréfunum? <br>Þegar þeim hefur verið eytt "
+"er engin leið að endurheimta þau.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8476,133 +8347,130 @@ msgstr ""
 "Tókst ekki að breyta %1\n"
 "(ekkert pláss á diski?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Skírteinis undirskriftarbeiðni"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Vinsamlega búðu til skírteini frá viðhenginu og skilaðu til sendanda."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail er í ótengdum ham. Öll nettengd verk eru í biðstöðu."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail er í tengdum ham. Haldið verður áfram með nettengd verk."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail er í augnablikinu í ótengdum ham. Hvað viltu gera?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Vinna í tengdum ham"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Vinna í ótengdum ham"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Þú hefur ekki les/skrif-heimild að innhólfinu þínu."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Úthólf"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Þú hefur ekki les/skrif-heimild að úthólfinu þínu."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Sendur póstur"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Þú hefur ekki les/skrif-heimild að senda póstinum þínum."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Rusl"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Þú hefur ekki les/skrif-heimild að ruslinu þínu."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Uppköst"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Þú hefur ekki les/skrif-heimild að uppköstunum þínum."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Þú hefur ekki les/skrif-heimild að ruslinu þínu."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Síðasta leit"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Mappan <i>%4</i> er þegar til. %1 notar nú <i>%5</i> "
-"möppuna fyrir sín bréf."
-"<p>%2 getur flutt fyrir þig innihald <i>%6<i> í þessa möppu, en það gæti "
-"hinsvegar skrifað yfir skrár með sama nafni í <i>%7</i>."
+"<qt>Mappan <i>%4</i> er þegar til. %1 notar nú <i>%5</i> möppuna fyrir sín "
+"bréf.<p>%2 getur flutt fyrir þig innihald <i>%6<i> í þessa möppu, en það "
+"gæti hinsvegar skrifað yfir skrár með sama nafni í <i>%7</i>."
 "<p><strong>Viltu að %3 flytji skrárnar núna?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Mappan <i>%4</i> er þegar til. %1 notar nú <i>%5</i> "
-"möppuna fyrir sín bréf. %2 getur flutt fyrir þig innihald <i>%6<i> "
-"í þessa möppu."
+"<qt>Mappan <i>%4</i> er þegar til. %1 notar nú <i>%5</i> möppuna fyrir sín "
+"bréf. %2 getur flutt fyrir þig innihald <i>%6<i> í þessa möppu."
 "<p><strong>Viltu að %3 flytji skrárnar núna?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Flytja póstskrár?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Óviðráðanleg villa kom upp í KMail og því verður stöðvað núna"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8613,11 +8481,11 @@ msgstr ""
 "Villan var:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Tæma rusl"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Viltu örugglega tæma ruslmöppurnar fyrir öll auðkenni?"
 
@@ -8692,8 +8560,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Nýr póstur</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8731,8 +8598,8 @@ msgstr "Viltu örugglega tæma ruslmöppuna?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Viltu örugglega færa öll bréf úr möppu <b>%1</b> í ruslmöppuna?</qt>"
 
@@ -8758,11 +8625,11 @@ msgstr "Eyða leit"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Viltu örugglega eyða leitinni <b>%1</b>? "
-"<br>Öll bréf sem eru sýnd þar verða eftir sem áður fáanleg í sýnum möppum.</qt>"
+"<qt>Viltu örugglega eyða leitinni <b>%1</b>? <br>Öll bréf sem eru sýnd þar "
+"verða eftir sem áður fáanleg í sýnum möppum.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8774,41 +8641,41 @@ msgstr "<qt>Viltu örugglega fjarlægja tómu möppuna <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ertu viss um að þú viljir fjarlægja tómu möppuna <b>%1</b> "
-"og allar undirmöppur hennar? Ekki er víst að undirmöppurnar séu tómar og "
-"innihaldi þeirra verður eytt líka. "
-"<p><b>Athugaðu</b> að fjarlægð bréf verða ekki vistuð í ruslmöppuna heldur "
-"verður þeim eytt óendurkvæmt.</qt>"
+"<qt>Ertu viss um að þú viljir fjarlægja tómu möppuna <b>%1</b> og allar "
+"undirmöppur hennar? Ekki er víst að undirmöppurnar séu tómar og innihaldi "
+"þeirra verður eytt líka. <p><b>Athugaðu</b> að fjarlægð bréf verða ekki "
+"vistuð í ruslmöppuna heldur verður þeim eytt óendurkvæmt.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ertu viss um að þú viljir fjarlægja möppuna <b>%1</b> "
-"og öllu innihaldi hennar? "
-"<p><b>Athugaðu</b> að fjarlægð bréf verða ekki vistuð í ruslmöppuna heldur "
-"verður þeim eytt óendurkvæmt.</qt>"
+"<qt>Ertu viss um að þú viljir fjarlægja möppuna <b>%1</b> og öllu innihaldi "
+"hennar? <p><b>Athugaðu</b> að fjarlægð bréf verða ekki vistuð í ruslmöppuna "
+"heldur verður þeim eytt óendurkvæmt.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ertu viss um að þú viljir fjarlægja möppuna <b>%1</b> "
-"og allar undirmöppur hennar, ásamt innihaldi? "
-"<p><b>Athugaðu</b> að fjarlægð bréf verða ekki vistuð í ruslmöppuna heldur "
-"verður þeim eytt óendurkvæmt.</qt>"
+"<qt>Ertu viss um að þú viljir fjarlægja möppuna <b>%1</b> og allar "
+"undirmöppur hennar, ásamt innihaldi? <p><b>Athugaðu</b> að fjarlægð bréf "
+"verða ekki vistuð í ruslmöppuna heldur verður þeim eytt óendurkvæmt.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Eytt"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8824,13 +8691,13 @@ msgstr "Viltu örugglega úrelda öll gömul bréf?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "<b>AÐVÖRUN:</b>Ef þú skoðar HTML tölvupóst þá ertu berskjaldaðri fyrir "
-"misnotkun þeirra sem senda ruslpóst.  HTML er jafnframt ákaflega flókin tækni "
-"og gallar í útfærslu hennar gætu veikt öryggi tölvunnar þinnar."
+"misnotkun þeirra sem senda ruslpóst.  HTML er jafnframt ákaflega flókin "
+"tækni og gallar í útfærslu hennar gætu veikt öryggi tölvunnar þinnar."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8843,8 +8710,8 @@ msgstr "Nota HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Með því að hlaða inn utanaðkomandi tilvísunum í HTML skeytum gerir þú þig "
 "berskjaldaðri fyrir ruslpósti og eykur líkurnar á að mögulegar öryggisholur "
@@ -8864,12 +8731,12 @@ msgstr "Sía á póstlistann %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Ekki við virkni KMail stólar á síun á miðlara en þú hefur ekki tilgreint neinn "
-"IMAP miðlara fyrir þetta.\n"
+"Ekki við virkni KMail stólar á síun á miðlara en þú hefur ekki tilgreint "
+"neinn IMAP miðlara fyrir þetta.\n"
 "Þú getur gert það undir \"síunar\" flipanum í stillingunum fyrir IMAP "
 "tenginguna."
 
@@ -8886,7 +8753,8 @@ msgstr "Gat ekki ræst skírteinisstjóra.  Vinsamlega athugið uppsetningu."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Gat ekki ræst GnuPG annálaskoðarann (kwatchgnupg). vinsamlega athugaðu "
 "uppsetninguna þína."
@@ -9220,8 +9088,7 @@ msgstr "Vi&sta viðhengi..."
 msgid "Appl&y All Filters"
 msgstr "&Virkja allar síur"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Vir&kja síu"
@@ -9335,7 +9202,6 @@ msgstr "Næsta ó&lesna bréf"
 msgid "Go to the next unread message"
 msgstr "Fara að næsta ólesna bréfi"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Fyrra bréf"
@@ -9475,8 +9341,8 @@ msgstr " Frumstilli..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9486,34 +9352,34 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Þetta bréf inniheldur beiðni um að senda afdrifstilkynningu.\n"
-"Það inniheldur meðhöndlunarskipun sem er merkt \"nauðsynlegt\", en KMail þekkir "
-"hana ekki.\n"
+"Það inniheldur meðhöndlunarskipun sem er merkt \"nauðsynlegt\", en KMail "
+"þekkir hana ekki.\n"
 "Þú getur valið að hunsa beiðnina eða látið KMail senda \"mistókst\" svar."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Þetta bréf inniheldur beiðni um að senda afdrifstilkynningu,\n"
 "en það þarf að senda tilkynninguna á fleiri en einn móttakanda.\n"
-"Þú getur valið að hunsa beiðnina eða láta KMail senda \"neitað\" eða venjulegt "
-"svar."
+"Þú getur valið að hunsa beiðnina eða láta KMail senda \"neitað\" eða "
+"venjulegt svar."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9525,8 +9391,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9534,8 +9400,8 @@ msgid ""
 msgstr ""
 "Þetta bréf inniheldur beiðni um að senda afdrifstilkynningu,\n"
 "en svarslóðin er ekki sú sama og beðið var um fyrir tilkynninguna.\n"
-"Þú getur annað hvort valið að hunsa beiðnina eða látið KMail senda \"neitað\" "
-"eða venjuelgt svar."
+"Þú getur annað hvort valið að hunsa beiðnina eða látið KMail senda \"neitað"
+"\" eða venjuelgt svar."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9561,17 +9427,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Kvittun: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Viðhengi: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Sýna viðhengi samkv. tillögu sendanda."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9621,45 +9487,38 @@ msgstr "Stillingar bréfhluta"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME tegund</em> skjalsins:</p>"
-"<p>Venjulega þarftu ekki að hreyfa við þessari stillingu, þar sem tegund "
-"skráarinnar er skoðuð sjálfkrafa. En stundum greinir %1 ekki tegundina rétt og "
-"þá getur þú leiðrétt það hér.</p></qt>"
+"<qt><p><em>MIME tegund</em> skjalsins:</p><p>Venjulega þarftu ekki að hreyfa "
+"við þessari stillingu, þar sem tegund skráarinnar er skoðuð sjálfkrafa. En "
+"stundum greinir %1 ekki tegundina rétt og þá getur þú leiðrétt það hér.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Stærð hlutarins:</p>"
-"<p>Stundum mun %1 aðeins gefa áætlaða stærð hér þar sem nákvæmur útreikningur á "
-"stærð tæki of langan tíma. Þegar svo er, þá er \"(áætlað.)\" bætt aftan við "
-"sýnda stærð.</p></qt>"
+"<qt><p>Stærð hlutarins:</p><p>Stundum mun %1 aðeins gefa áætlaða stærð hér "
+"þar sem nákvæmur útreikningur á stærð tæki of langan tíma. Þegar svo er, þá "
+"er \"(áætlað.)\" bætt aftan við sýnda stærð.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Skráarheiti hlutar:</p>"
-"<p>Þó að þetta sé sjálfgefið upprunalegt heiti viðhengis, þá er þetta ekki "
-"heiti skráarinnar. Heldur er þetta tillaga að skráarheiti sem móttakandi mun "
-"nota við að geyma þennan hluta á diski.</p></qt>"
+"<qt><p>Skráarheiti hlutar:</p><p>Þó að þetta sé sjálfgefið upprunalegt heiti "
+"viðhengis, þá er þetta ekki heiti skráarinnar. Heldur er þetta tillaga að "
+"skráarheiti sem móttakandi mun nota við að geyma þennan hluta á diski.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9667,17 +9526,14 @@ msgstr "&Lýsing:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Lýsing skeytahluta:</p>"
-"<p>Þetta eru aðeins upplýsingar um hlutann, líkt og viðfangsefni lýsir "
-"innihaldi alls bréfsins. Flest póstforrit munu sýna þessa lýsingu við forsýn "
-"bréfs, ásamt táknmynd viðhengis.</p></qt>"
+"<qt><p>Lýsing skeytahluta:</p><p>Þetta eru aðeins upplýsingar um hlutann, "
+"líkt og viðfangsefni lýsir innihaldi alls bréfsins. Flest póstforrit munu "
+"sýna þessa lýsingu við forsýn bréfs, ásamt táknmynd viðhengis.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9685,22 +9541,20 @@ msgstr "&Kóðun:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Flutningskóðun skeytahluta.</p>"
-"<p>Venjulega þarftu ekki að breyta þessu þar sem %1 mun nota nothæfa sjálfgefna "
-"kóðun, sem veltur á MIME tegund. En stundum getur þú minnkað stærð bréfsins "
-"verulega með því að breyta þessu t.d. ef PostScript skrá inniheldur aðeins "
-"texta, er betra að velja \"quoted-printable\" í stað sjáfgefins \"base64\" og "
-"minnka bréfið þannig um 25%.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Flutningskóðun skeytahluta.</p><p>Venjulega þarftu ekki að breyta "
+"þessu þar sem %1 mun nota nothæfa sjálfgefna kóðun, sem veltur á MIME "
+"tegund. En stundum getur þú minnkað stærð bréfsins verulega með því að "
+"breyta þessu t.d. ef PostScript skrá inniheldur aðeins texta, er betra að "
+"velja \"quoted-printable\" í stað sjáfgefins \"base64\" og minnka bréfið "
+"þannig um 25%.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9708,20 +9562,17 @@ msgstr "Ger&a tillögu um sjálfkrafa birtingu"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hakaðu við hér ef þú vilt koma með tillögu til móttakanda um að sýna þennan "
-"hluta (inni í) bréfinu þegar það er birt, í stað þess að sýna aðeins "
-"táknmynd.</p>"
-"<p>Tæknilega er þetta gert með því að skilgreina <em>innihaldsstöðu</em> "
-"svæðisins sem \"innfelt\" í stað sjáfgefins \"viðhengi\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Hakaðu við hér ef þú vilt koma með tillögu til móttakanda um að sýna "
+"þennan hluta (inni í) bréfinu þegar það er birt, í stað þess að sýna aðeins "
+"táknmynd.</p><p>Tæknilega er þetta gert með því að skilgreina "
+"<em>innihaldsstöðu</em> svæðisins sem \"innfelt\" í stað sjáfgefins "
+"\"viðhengi\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9729,14 +9580,12 @@ msgstr "&Undirrita þennan hluta"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hakaðu hér við ef þú vilt að þessi hluti bréfsins sé undirritaður.</p>"
-"<p>Undirritunin verður framkvæmd með lykli þess auðkennis sem þú hefur "
+"<qt><p>Hakaðu hér við ef þú vilt að þessi hluti bréfsins sé undirritaður.</"
+"p><p>Undirritunin verður framkvæmd með lykli þess auðkennis sem þú hefur "
 "valið.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9745,13 +9594,11 @@ msgstr "&Dulrita þennan hluta"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hakaðu hér við ef þú vilt að þessi skeytahluti sé dulritaður.</p>"
-"<p>Hlutinn verður dulritaður fyrir móttakanda bréfsins</p></qt>"
+"<qt><p>Hakaðu hér við ef þú vilt að þessi skeytahluti sé dulritaður.</"
+"p><p>Hlutinn verður dulritaður fyrir móttakanda bréfsins</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9765,17 +9612,13 @@ msgstr "POP sía"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Bréf sem á að sía fannst á POP tengingu:<b>%1</b> "
-"<p>Viðkomandi bréf er stærra en hámarksstærð sem þú skilgreindir fyrir þessa "
-"tengingu. "
-"<br> Þú getur valið hvað þú vilt gera við það með því að smella á viðeigandi "
-"hnapp."
+"Bréf sem á að sía fannst á POP tengingu:<b>%1</b> <p>Viðkomandi bréf er "
+"stærra en hámarksstærð sem þú skilgreindir fyrir þessa tengingu. <br> Þú "
+"getur valið hvað þú vilt gera við það með því að smella á viðeigandi hnapp."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10027,40 +9870,39 @@ msgstr "Póstforritið fyrir K skjáborðsumhverfið."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Næ í innihald möppu</h2>"
-"<p>Augnablik . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Næ í innihald möppu</h2><p>Augnablik . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Ótengt</h2>"
-"<p>KMail er í augnablikinu í ótengdum ham. Smelltu <a href=\"kmail:goOnline\">"
-"hér</a> til að tengjast . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Ótengt</h2><p>KMail er í augnablikinu í "
+"ótengdum ham. Smelltu <a href=\"kmail:goOnline\">hér</a> til að "
+"tengjast . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10068,17 +9910,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Velkomin(n) í KMail %1</h2>"
-"<p>KMail er póstforritið fyrir K skjáborðsumhverfið. Það er hannað til að vera "
+"<h2 style='margin-top: 0px;'>Velkomin(n) í KMail %1</h2><p>KMail er "
+"póstforritið fyrir K skjáborðsumhverfið. Það er hannað til að vera "
 "fullkomlega samhæft við tölvupóststaðla sem MIME, SMTP, POP3 og IMAP.</p>\n"
-"<ul>"
-"<li>KMail hefur marga öfluga eiginleika sem er lýst í <a href=\"%2\">"
-"leiðbeiningunum</a>.</li>\n"
-"<li><a href=\"%3\">Vefsíða KMail</a> býður upp á upplýsingar um nýjar útgáfur "
-"af forritinu.</li></ul>\n"
+"<ul><li>KMail hefur marga öfluga eiginleika sem er lýst í <a href="
+"\"%2\">leiðbeiningunum</a>.</li>\n"
+"<li><a href=\"%3\">Vefsíða KMail</a> býður upp á upplýsingar um nýjar "
+"útgáfur af forritinu.</li></ul>\n"
 "%8\n"
-"<p>Í þessari útgáfu af KMail er meðal annars boðið upp á þessa nýju eiginleika "
-"(í samanburði við KMail %4, sem er hluti af TDE %5):</p>\n"
+"<p>Í þessari útgáfu af KMail er meðal annars boðið upp á þessa nýju "
+"eiginleika (í samanburði við KMail %4, sem er hluti af TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10087,29 +9928,27 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail teymið</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Vinsamlegast gefðu þér tíma til að stilla KMail í valblaðinu "
-"Stillingar-&gt;Stilla KMail.  Nauðsynlegt er að skilgreina sjálfgefið auðkenni "
-"og inn/út tengingar.</p>\n"
+"<p>Vinsamlegast gefðu þér tíma til að stilla KMail í valblaðinu Stillingar-"
+"&gt;Stilla KMail.  Nauðsynlegt er að skilgreina sjálfgefið auðkenni og inn/"
+"út tengingar.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Áríðandi breytingar</span> "
-"(samanborið við KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Áríðandi breytingar</"
+"span> (samanborið við KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10140,7 +9979,8 @@ msgstr "Skoða viðhengi: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Viðhengi inniheldur hrá gögn. Reyni að sýna fyrsta stafinn.]\n"
@@ -10169,12 +10009,14 @@ msgstr "Opna viðhengi?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10196,6 +10038,58 @@ msgstr "(uppfyllir einhver eftirfarandi)"
 msgid "(match all of the following)"
 msgstr "(uppfyllir öll eftirfarandi)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lesið"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Gamalt"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Eytt"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Svarað"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Áframsent"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Í biðröð"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sent"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Vaktað"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Hunsað"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Ruslpóstur"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ekki ruslpóstur"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Verkþáttur"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Hefur viðhengi"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10275,15 +10169,15 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Banvæn villa: Get ekki unnið úr sendum pósti (ekkert pláss?).  Set bréfin sem "
-"eru til vandræða í möppuna \"Sendur póstur\"."
+"Banvæn villa: Get ekki unnið úr sendum pósti (ekkert pláss?).  Set bréfin "
+"sem eru til vandræða í möppuna \"Sendur póstur\"."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Ekki tókst að færa bréfið \"%1\" frá \"Úthólf\" til \"Sendur póstur\".\n"
 "Mögulegar ástæður eru lítið diskpláss eða ónógar heimildir til skriftar. "
@@ -10292,8 +10186,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Það er ekki hægt að senda bréf án þess að gefa upp móttakanda.\n"
 "Vinsamlegast gefðu upp tölvupóstfang '%1' í auðkenningahluta stillinganna og "
@@ -10322,11 +10216,11 @@ msgstr "Set póstflutning af stað..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Þú hefur valið að senda allan póst úr biðröðinni með ódulritaðri flutningsleið. "
-"Viltu halda áfram?"
+"Þú hefur valið að senda allan póst úr biðröðinni með ódulritaðri "
+"flutningsleið. Viltu halda áfram?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10350,15 +10244,16 @@ msgstr "Ekki tókst ekki að senda (sum) bréf í biðröðinni."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Hætt við sendingu:\n"
 "%1\n"
-"Bréfið mun bíða í útmöppunni þangað til þú annað hvort leysir úr vandanum (t.d. "
-"lagar netfangið) eða tekur bréfið úr útmöppunni.\n"
+"Bréfið mun bíða í útmöppunni þangað til þú annað hvort leysir úr vandanum (t."
+"d. lagar netfangið) eða tekur bréfið úr útmöppunni.\n"
 "Eftirfarandi samskiptaregla var notuð:\n"
 "  %2"
 
@@ -10368,20 +10263,16 @@ msgstr "Hætt við sendingu."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Sending brást:</p>"
-"<p>%1</p>"
-"<p>Bréfið mun bíða í útmöppunni þangað til þú annað hvort leysir úr vandanum "
-"(t.d. lagar netfangið) eða færir bréfið úr útmöppunni.</p>"
-"<p>Eftirfarandi samskiptaregla var notuð:  %2</p> "
-"<p>Viltu að ég haldi áfram að senda hin bréfin?</p>"
+"<p>Sending brást:</p><p>%1</p><p>Bréfið mun bíða í útmöppunni þangað til þú "
+"annað hvort leysir úr vandanum (t.d. lagar netfangið) eða færir bréfið úr "
+"útmöppunni.</p><p>Eftirfarandi samskiptaregla var notuð:  %2</p> <p>Viltu að "
+"ég haldi áfram að senda hin bréfin?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10399,15 +10290,16 @@ msgstr "Hæ&tta við að senda"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Sending brást:\n"
 "%1\n"
-"Bréfið mun bíða í útmöppunni þangað til þú annað hvort leysir úr vandanum (t.d. "
-"lagar netfangið) eða tekur bréfið úr útmöppunni.\n"
+"Bréfið mun bíða í útmöppunni þangað til þú annað hvort leysir úr vandanum (t."
+"d. lagar netfangið) eða tekur bréfið úr útmöppunni.\n"
 "Eftirfarandi samskiptaregla var notuð:\n"
 "  %2"
 
@@ -10448,43 +10340,43 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 virðist þegar vera keyrandi á annari skjábirtingu á þessari vél. Að keyra %2 "
-"oftar en einu sinni getur valdið tapi af pósti. Þú ættir ekki að ræsa %1 nema "
-"þú sért viss um að önnur útgáfa sé ekki keyrandi."
+"%1 virðist þegar vera keyrandi á annari skjábirtingu á þessari vél. Að keyra "
+"%2 oftar en einu sinni getur valdið tapi af pósti. Þú ættir ekki að ræsa %1 "
+"nema þú sért viss um að önnur útgáfa sé ekki keyrandi."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 virðist vera keyrandi á annari skjábirtingu á þessari vél. Að keyra %1 og %2 "
-"samtímis getur valdið tapi af pósti. Þú ættir ekki að ræsa %2 nema þú sért viss "
-"um að %1 sé ekki keyrandi."
+"%1 virðist vera keyrandi á annari skjábirtingu á þessari vél. Að keyra %1 og "
+"%2 samtímis getur valdið tapi af pósti. Þú ættir ekki að ræsa %2 nema þú "
+"sért viss um að %1 sé ekki keyrandi."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 virðist þegar vera keyrandi á %2. Að keyra %1 oftar en einu sinni getur "
-"valdið tapi af pósti. Þú ættir ekki að ræsa %1 á þessari vél nema þú sért viss "
-"um að það sé ekki þegar keyrandi á %2."
+"valdið tapi af pósti. Þú ættir ekki að ræsa %1 á þessari vél nema þú sért "
+"viss um að það sé ekki þegar keyrandi á %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 virðist vera keyrandi á %3. Að keyra %1 og %2 samtímis getur valdið tapi af "
-"pósti. Þú ættir ekki að ræsa %2 á þessari vél nema þú sért viss um að %1 sé "
-"ekki keyrandi á %3."
+"%1 virðist vera keyrandi á %3. Að keyra %1 og %2 samtímis getur valdið tapi "
+"af pósti. Þú ættir ekki að ræsa %2 á þessari vél nema þú sért viss um að %1 "
+"sé ekki keyrandi á %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10495,6 +10387,10 @@ msgstr "Ræsa %1"
 msgid "Exit"
 msgstr "Hætta"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nýr póstur í"
@@ -10521,12 +10417,13 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet er ekki tiltækt. Sterklega er mælt með því að þú notir TDEWallet til "
-"að halda utan um lykilorðin þín.\n"
+"TDEWallet er ekki tiltækt. Sterklega er mælt með því að þú notir TDEWallet "
+"til að halda utan um lykilorðin þín.\n"
 "KMail getur einnig geymt lykilorðið í stillingarskránni og er það þá geymt "
 "ruglað, en ætti ekki að teljast öruggt gegn afkóðun ef aðgangur fæst að "
 "uppsetningarskránni.\n"
@@ -10598,9 +10495,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Skipun sem er keyrð á þessari vél áður en póstur er sendur.  Þetta er t.d. hægt "
-"að nota til að setja upp SSH tengingar. Skiljið eftir autt ef ekki á að keyra "
-"neina skipun."
+"Skipun sem er keyrð á þessari vél áður en póstur er sendur.  Þetta er t.d. "
+"hægt að nota til að setja upp SSH tengingar. Skiljið eftir autt ef ekki á að "
+"keyra neina skipun."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10608,8 +10505,8 @@ msgstr "Miðlari krefst &auðkenningar"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Hakaðu við hér ef SMTP þjónninn krefst auðkenningar áður en hann tekur við "
 "pósti.  Þetta er þekkt sem 'Auðkennt SMTP' eða ASMTP."
@@ -10632,15 +10529,13 @@ msgstr "Sen&da sérsniðið vélarheiti til þjóns"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Hakaðu við hér til að láta KMail nota sérsniðið vélarheiti þegar það auðkennir "
-"sig gagnvart póstþjóni. "
-"<p> Þetta er gagnlegt þegar kerfisheiti er ekki rétt sett upp, eða til að dylja "
-"þitt raunverulega vélarheiti."
+"Hakaðu við hér til að láta KMail nota sérsniðið vélarheiti þegar það "
+"auðkennir sig gagnvart póstþjóni. <p> Þetta er gagnlegt þegar kerfisheiti er "
+"ekki rétt sett upp, eða til að dylja þitt raunverulega vélarheiti."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10671,8 +10566,8 @@ msgstr "Aðeins er leyft að nota skrár af þessari vél."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Vélarsvæðið má ekki vera tómt. Sláðu inn nafn eða IP vistfang SMTP þjónsins."
 
@@ -10686,10 +10581,10 @@ msgstr "Villa við sýningu af möppu %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10911,34 +10806,27 @@ msgstr "&Breyta bréfi"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Upplýsingar sem dulritunaríforritið skilaði var ekki hægt að vinna eðlilega, "
-"íforritið gæti verið skemmt.</p>"
-"<p>Vinsamlega hafðu samband við kerfissjtóra.</p></qt>"
+"<qt><p>Upplýsingar sem dulritunaríforritið skilaði var ekki hægt að vinna "
+"eðlilega, íforritið gæti verið skemmt.</p><p>Vinsamlega hafðu samband við "
+"kerfissjtóra.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Ekkert virkt dulritunaríforrit fannst og innbyggði OpenPGP kóðinn keyrði "
-"ekki sem skildi.</p>"
-"<p>Þú getur gert tvennt við þessu:</p>"
-"<ul>"
-"<li><em>annað hvort</em> virkt íforrit í stillingaglugganum undir Stillingar->"
-"Stilla KMail->Öryggi.</li>"
-"<li><em>eða</em> velja hefðbundnar OpenPGP stillingar í sama glugga.</li></ul>"
+"ekki sem skildi.</p><p>Þú getur gert tvennt við þessu:</p><ul><li><em>annað "
+"hvort</em> virkt íforrit í stillingaglugganum undir Stillingar->Stilla KMail-"
+">Öryggi.</li><li><em>eða</em> velja hefðbundnar OpenPGP stillingar í sama "
+"glugga.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10950,19 +10838,19 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus bakendinn býður ekki upp á \"x-encrypt\" aðgerðina. Vinsamlega sendu "
-"inn tilkynningu um þessa villu."
+"Chiasmus bakendinn býður ekki upp á \"x-encrypt\" aðgerðina. Vinsamlega "
+"sendu inn tilkynningu um þessa villu."
 
 #: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\"x-encrypt\" aðgerðin tekur ekki við viðföngunum sem búist var við. Vinsamlega "
-"sendu inn tilkynningu um þessa villu."
+"\"x-encrypt\" aðgerðin tekur ekki við viðföngunum sem búist var við. "
+"Vinsamlega sendu inn tilkynningu um þessa villu."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -10970,16 +10858,16 @@ msgstr "Chiasmus dulritunarvilla"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Óvænt skilagildi frá Chiasmus bakenda: \"x-encrypt\" aðgerðin skilaði ekki "
 "bitafylki. Vinsamlega tilkynntu um þessa villu."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Innfellta OpenPGP dulritunarsniðið styður ekki dulritun eða undirritun af "
@@ -11053,7 +10941,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Sumir hlutar bréfsins verða ekki undirritaðir.\n"
-"Að senda bréf sem eru aðeins undirrituð að hluta getur verið gegn stefnu léns.\n"
+"Að senda bréf sem eru aðeins undirrituð að hluta getur verið gegn stefnu "
+"léns.\n"
 "Undirrita alla hlutana?"
 
 #: messagecomposer.cpp:827
@@ -11092,8 +10981,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Athugun af stillingum móttakanda gefur til kynna að það eigi að spyrja þig "
@@ -11130,8 +11019,9 @@ msgstr "&Ekki dulrita"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Þú hefur valið að dulrita þetta bréf, og dulrita afrit til þín sjálfs. "
 "Hinsvegar finnast engir gildir dulritunarlyklar fyrir þetta auðkenni."
@@ -11143,13 +11033,13 @@ msgstr "Senda ódulritað?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Sumir hlutar bréfsins verða ekki dulritaðir.\n"
-"Að senda bréf sem eru aðeins dulrituð að hluta getur verið gegn stefnu lénsins "
-"og/eða valdið leka af viðkvæmum upplýsingum.\n"
+"Að senda bréf sem eru aðeins dulrituð að hluta getur verið gegn stefnu "
+"lénsins og/eða valdið leka af viðkvæmum upplýsingum.\n"
 "Dulrita alla hluta bréfsins?"
 
 #: messagecomposer.cpp:950
@@ -11160,8 +11050,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Þetta bréf verður ekki dulritað.\n"
-"Að senda ódulrituð bréf getur verið gegn stefnu lénsins og/eða valdið leka af "
-"viðkvæmum upplýsingum.\n"
+"Að senda ódulrituð bréf getur verið gegn stefnu lénsins og/eða valdið leka "
+"af viðkvæmum upplýsingum.\n"
 "Dulrita bréfið?"
 
 #: messagecomposer.cpp:955
@@ -11172,51 +11062,45 @@ msgstr "&Dulrita alla hluti"
 msgid "Unencrypted Message Warning"
 msgstr "Ódulritað bréf"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Villa: bakendinn skilaði engum dulkóðuðum gögnum.</p> "
-"<p>Vinsamlegast tilkynntu þessa villu:"
-"<br>%2</p></qt>"
+"<qt><p>Villa: bakendinn skilaði engum dulkóðuðum gögnum.</p> <p>Vinsamlegast "
+"tilkynntu þessa villu:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Ekki allir stafirnir eru til í stafatöflunni sem þú valdir. "
-"<br>"
-"<br>Viltu samt senda bréfið?</qt>"
+"<br><br>Viltu samt senda bréfið?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Einhverjir stafir munu glatast"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Tapa stöfum"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Velja aðra stafatöflu"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Ekki tókst að undirrita bréfið þar sem valdi bakendinn virðist ekki styðja "
 "undirritun. Þetta ætti ekki að geta gerst, vinsamlega sendu tilkynningu um "
 "þetta."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11225,38 +11109,40 @@ msgstr ""
 "undirritun. Þetta ætti ekki að geta gerst, vinsamlega sendu tilkynningu um "
 "þetta."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "Undirritunarferlið mistókst. Gakktu úr skugga um að gpg-forritið sé keyrandi."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Ekki tókst að dulrita bréfið þar sem valdi bakendinn virðist ekki styðja "
-"dulritun. Þetta ætti ekki að geta gerst, vinsamlega sendu tilkynningu um þetta."
+"dulritun. Þetta ætti ekki að geta gerst, vinsamlega sendu tilkynningu um "
+"þetta."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Ekki tókst að undirrita og dulrita bréfið þar sem valdi bakendinn virðist ekki "
-"styðja blöndun af undirritun og dulritun. Þetta ætti ekki að geta gerst, "
-"vinsamlega sendu tilkynningu um þetta."
+"Ekki tókst að undirrita og dulrita bréfið þar sem valdi bakendinn virðist "
+"ekki styðja blöndun af undirritun og dulritun. Þetta ætti ekki að geta "
+"gerst, vinsamlega sendu tilkynningu um þetta."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11277,15 +11163,15 @@ msgstr "&Snið pósthólfs:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Veldu hvort eigi að geyma bréfin í þessari möppu sem eina skrá fyrir hvert bréf "
-"(maildir) eða sem eina stóra skrá (mbox). KMail notar sjálfgefið maildir og "
-"aðeins þarf að breyta þessu í sjaldgæfum tilfellum. Ef þú ert óviss, láttu "
-"þetta þá vera óbreytt."
+"Veldu hvort eigi að geyma bréfin í þessari möppu sem eina skrá fyrir hvert "
+"bréf (maildir) eða sem eina stóra skrá (mbox). KMail notar sjálfgefið "
+"maildir og aðeins þarf að breyta þessu í sjaldgæfum tilfellum. Ef þú ert "
+"óviss, láttu þetta þá vera óbreytt."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11294,8 +11180,8 @@ msgstr "&Innihald möppu:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Veldu hvort þú vilt að nýja mappan verði notuð til að geyma póst, eða "
 "hópvinnukerfishluti sem verkefnalista eða minnismiða. Sjálfgefið er póstur. "
@@ -11337,8 +11223,7 @@ msgstr "Mismunandi niðurstöður fyrir undirritanir"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Kóðunarvélin skilaði engum afkóðuðum gögnum."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Staða: "
 
@@ -11367,12 +11252,11 @@ msgstr "Ekkert %1 íforrit fannst."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Bréfið er undirritað, en það er ekki hægt að staðfesta lögmæti "
-"undirritunarinnar."
-"<br/>Ástæða: %1"
+"undirritunarinnar.<br/>Ástæða: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11408,27 +11292,27 @@ msgstr "Kóðunaríforritið \"%1\" getur ekki afkóðað bréf."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Athugið:</b> Þetta HTML bréf getur innihaldið utanaðkomandi tilvísanir í "
 "myndir eða annað í þeim dúr. Af öryggis-/einkalífsástæðum eru utanaðkomandi "
 "tilvísanir ekki sóttar. Ef þú treystir sendanda þessa bréfs þá getur þú sýnt "
-"bréfið á umbeðnu formi <a href=\"kmail:loadExternal\">með þvi að smella hér</a>"
-"."
+"bréfið á umbeðnu formi <a href=\"kmail:loadExternal\">með þvi að smella hér</"
+"a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Athugið:</b> Þetta er HTML bréf. Af öryggisástæðum er aðeins hrár HTML texti "
-"sýndur. Ef þú treystir sendanda þessa bréfs þá getur þú sýnt bréfið á umbeðnu "
-"formi <a href=\"kmail:showHTML\">með þvi að smella hér</a>."
+"<b>Athugið:</b> Þetta er HTML bréf. Af öryggisástæðum er aðeins hrár HTML "
+"texti sýndur. Ef þú treystir sendanda þessa bréfs þá getur þú sýnt bréfið á "
+"umbeðnu formi <a href=\"kmail:showHTML\">með þvi að smella hér</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11684,11 +11568,11 @@ msgstr "geymt: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Ekkert netfang er geymt í %1 sem er notað til undirritunnar, svo við getum ekki "
-"borið það við netfang sendanda %2."
+"Ekkert netfang er geymt í %1 sem er notað til undirritunnar, svo við getum "
+"ekki borið það við netfang sendanda %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11804,10 +11688,11 @@ msgstr "Kioslave villuboð"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "POP3 þjónninn þinn styður ekki UIDL skipunina.  Þessi skipun er notuð til að "
 "ákvarða á öruggan hátt hvaða póst KMail hefur þegar lesið.\n"
@@ -11831,7 +11716,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr "Sæki bréf %1 af %2 (%3 af %4 Kb) fyrir %5@%6 (%7 Kb eftir á þjóninum)."
 
 #: popaccount.cpp:912
@@ -11848,1835 +11734,14 @@ msgstr "Ógilt svar frá þjóni"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Póstþjónninn þinn skilur ekki TOP skipunina. Því er ekki hægt að sækja hausa "
 "stórra bréfa áður en þau eru sótt."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Fara að"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Mappa"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Bréf"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Svara sérstakt"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Á&framsenda"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML tækjaslá"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Undirritun"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Undirrita bréf sjálfkrafa"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Þegar hakað er við hér eru öll bréf sem þú sendir  frá þér undirrituð. Að "
-"sjálfsögðu er hægt að aftengja undirritun fyrir hvert og eitt bréf."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Dulritun"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Þegar þetta er virkjað er bréfið/skráin ekki bara dulrituð með dreifilykli "
-"móttakanda, heldur einnig þínum. Gerir það þér kleyft að afkóða bréfið/skrána "
-"seinna. Það er sem regla góð hugmynd að hafa þetta á."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Sýna und&irritaðan/dulkóðaðan texta eftir ritun"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Þegar þetta er valið mun undirritaði/dulritaði textinn birtast í aðskildum "
-"glugga, og getur þú þá séð hvernig hann lítur út áður en þú sendir hann. Það er "
-"góð hugmynd að hafa þetta í gangi á meðan þú ert að staðfesta að "
-"dulritunarkerfið þitt virki sem skildi."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Vista send bréf &dulrituð"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Hakaðu við hér til að vista bréf dulrituð "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Geyma póst dulkóðaðan</h1>\n"
-"Þegar þetta er valið er allur sendur póstur geymdur dulkóðaður eins og hann var "
-"þegar hann var sendur.  Það er ekki mælt með þessu þar sem þú getur ekki lesið "
-"póstinn ef skírteinið rennur út.\n"
-"<p>\n"
-"Samt sem áður geta gilt staðbundnar reglur sem skikka þér til þess að velja "
-"þetta.  Ef þú ert í vafa, hafðu þá samband við kerfisstjórann þinn.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Allta&f sýna dulritunarlyklana til samþykkis"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Þegar hakað er við hér, mun alltaf verða sýndur listi yfir fáanlega dreifilykla "
-"og getur þú þá valið þann sem þú vilt nota til dulritunar. Ef þetta er afvalið "
-"mun forritið einungis sýna gluggann ef það finnur ekki rétta lykilinn eða ef "
-"það eru fleiri lyklar sem væri hægt að nota."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "&Dulrita bréf sjálfkrafa þegar mögulegt er"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Þegar hakað er við hér eru öll bréf send dulrituð ef mögulegt er og þess óskað. "
-"Að sjálfsögðu er hægt að aftengja dulritun fyrir hvert og eitt bréf."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Aldrei undirrita/dulrita þegar vistað er sem &uppkast"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Til: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Afrit (Cc): "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Almennt"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "Senda sva&r til"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "S&vara öllum..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "Á&framsenda"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Flýtilykill:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Eiginleikar möppu"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Mappan inniheldur póstlista"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Netfang lista:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Ven&julegt:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Ól&esið:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Úrelding bréfa"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Ú&relda eftir:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Úrelda l&esin bréf"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Úrelda e&ftir:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Úrelda ól&esin bréf"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "dag(a)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "viku(r)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "mánuð(i)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Ítarlegt"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Au&ðkenni sendanda:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Geym&slusnið:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Birting &lista:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Staðfesta að skírteini séu ekki úreld"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Ef þetta er valið, munu S/MIME skírteini verða staðfest með úreldingalista "
-"skírteina."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Hunsa þjónustuslóð skírteina"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Ekki skoða stefnu skírteinis"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Sjálfgefið er að GnuPG noti ~/.gnupg/policies.txt skrána til að athuga hvort "
-"stefna skírteinis sé leyfð. Ef hakað er við hér eru stefnur ekki athugaðar."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Aldrei nota úreldingalista"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ef þetta er valið, munu úreldingarlistar aldrei verða notaðir til að staðfesta "
-"S/MIME skírteini."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Ná í útgefandaskírteini sem vantar"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Þegar hakað er við hér, er náð í útgefandaskírteini þegar það er nauðsynlegt "
-"(þetta á við báða auðkennivalkostina, CRLs og OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP beiðnir"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Ekki framkvæma neinar HTTP beiðnir"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Slökkva algerlega á HTTP fyrir S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Nota þennan milliþjón fyrir HTTP beiðnir: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Nota HTTP milliþjón kerfis:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Ef hakað er við hér, mun gildið fyrir HTTP milliþjóninn sem sýnt er til hægri "
-"(sem er tekið frá http_proxy stillingu kerfisins) verða notað fyrir allar HTTP "
-"beiðnir."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Sláðu inn hér staðsetningu milliþjónsins sem á að nota fyrir allar HTTP beiðnir "
-"tengdar S/MIME. Sniðið er þjónn.gátt. Dæmi: myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Hunsa HTTP CRL þjónustuslóð skírteina"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP beiðnir"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Ekki framkvæma neinar LDAP beiðnir"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Slökkva algerlega á notkun af LDAP fyrir S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Hunsa LDAP CRL þjónustuslóð skírteina"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Aðalþjónn fyrir LDAP beiðnir:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Ef þú slærð inn LDAP þjón hér munu allar LDAP beiðnir verða sendar á hann "
-"fyrst. Mun þessi stilling þá hunsa allar aðrar sérstakar þjóns og gáttahluta í "
-"LDAP slóðum, og einnig verða notað ef þjóns og gáttar upplýsingar vantar í "
-"slóðina. Einungis verður notast við aðra LDAP þjóna ef tengingin við \"proxy\" "
-"mistekst.\n"
-"Sniðið er \"ÞJÓNN\" eða \"ÞJÓNN:GÁTT\". Ef GÁTT er ekki fylt út er notast við "
-"gátt 389 (sjálfgefna LDAP gáttin)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "B&æta við..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Hópvinnukerfi"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Frumstilla letur"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "ótakmarkað"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Stilling Undirritunnar"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Svara se&ndanda:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Áframsent bréf"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Vara þig við ef þú sendir ó&undirituð bréf"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Krossa við ef þú vilt láta vara þig við ef þú sendir óundirituð bréf"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Aðvörun þegar reynt er að senda óundirrituð bréf</h1>\n"
-"Ef hakað er við hér færðu aðvörun þegar þú reynir að senda bréf eða hluta bréfs "
-"sem er óundirritað.\n"
-"<p>\n"
-"Það er mælt með að þú hafir slökkt á þessu til að fá sem mestan heilleika.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Vara við þegar reynt er að senda ódulrituð bréf"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Hakaðu við til að láta vara þig þið því þegar þú ert um það bil að fara að "
-"senda ódulritað bréf."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Aðvörun þegar reynt er að senda ódulritað bréf</h1>\n"
-"Ef þetta er valið birtist þér aðvörun þegar þú reynir að senda hluta bréfs "
-"ódulritaða.\n"
-"<p>\n"
-"Mælt er með því að hafa þetta á til þess að ná sem mestum heilleika.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Va&ra við ef netfang móttakanda er ekki í skírteininu"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Hakaðu við til að fá aðvörun ef netfangið er ekki í skírteininu"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Aðvörun ef netfang móttakanda er ekki í skírteininu</h1>\n"
-"Ef þetta er valið færðu aðvörun ef netfang móttakanda er ekki geymt í "
-"skírteininu sem notað er til að dulkóða.\n"
-"<p>\n"
-"Mælt er með því að hafa þetta á til að ná hámarks öryggi.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Vara við ef skírteini/lyklar renna fljótlega út (stilltu nánar að neðan)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Fyrir undirritun"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Fyrir dulritun"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " daga"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Veldu fjölda daga hér"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Aðvörun ef undirritunarskírteini rennur út</h1>\n"
-"Veldu lágmarks fjölda daga sem undirritunarskírteini þarf að vera í gildi án "
-"þess að aðvörun sé birt.\n"
-"<p>\n"
-"Mælt er með 14 dögum fyrir SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Viðvörun ef skírteini rennur út</h1>\n"
-"Veldu lágmarks fjölda daga sem skírteini á að vera gilt án þess að viðvörun sé "
-"gefin.\n"
-"<p>\n"
-"Mælt er með 14 dögum fyrir SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Aðvörun ef skírteini í keðjunni rennur út</h1>\n"
-"Veldu lágmarks fjölda daga sem öll skírteini í keðjunni eiga að haldast í gildi "
-"áður en aðvörun er gefin.\n"
-"<p>\n"
-"Mælt er með 14 dögum fyrir SPHINX .\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Aðvörun ef CA skírteini rennur út</h1>\n"
-"Veldu lágmarks fjölda daga sem CA skírteini þarf að vera í gildi án þess að "
-"aðvörun sé birt.\n"
-"<p>\n"
-"Mælt er með 14 dögum fyrir SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Aðvörun ef rótarskírteini rennur út</h1>\n"
-"Veldu lágmarks fjölda daga sem rótarskírteini þarf að vera í gildi án þess að "
-"aðvörun sé birt.\n"
-"<p>\n"
-"Mælt er með 14 dögum fyrir SPHINX.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Fyrir rótarskírteini:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Fyrir milliliðs CA skírteini:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Fyrir notenda skírteini/lykla:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Kveikja á öllum \"Ekki spyrja aftur\" viðvörunum"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Innihald möppu:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Senda bréf úr biðröð við póstathugun"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Veldu hvort KMail eigi að senda öll skeyti úr úthólfinu handvirkt eða við "
-"allar póstathuganir, eða hvort þú vilt slökkva á að skeyti séu send sjálfvirkt "
-"</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Það eru ný bréf í möppunni (%1) sem er ekki búið að senda á þjóninn ennþá. "
-"Þú virðist hinsvegar ekki hafa nægar aðgangsheimildir að möppunni núna til að "
-"senda þau. Hafðu samband við kerfisstjórann þinn um að fá aðgang að möppunni, "
-"eða flyttu bréfin í aðra möppu.</p> "
-"<p>Viltu flytja bréfin yfir í aðra möppu núna?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Seinast valda mappan í möppulistanum."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Stefna við vísun af kerfisbakkatáknmynd"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Ýtarleg tilkynning um nýjan póst"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Ef þetta er valið, mun verða birtur fjöldinn af nýjum skeytum fyrir hverja "
-"möppu í tilkynningarglugganum. Annars muntu einungis fá glugga með tilkynningu "
-"um nýjan póst."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Velja ritil:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Nota &ytri ritil í stað þess innbyggða"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Virkja hópvinnukerfisvirkni"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Breyta Frá:/Til: hausum í svörum við boðunum"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook hefur ýmsa vankosti í sinni útfærslu af iCalendar staðlinum. "
-"Þessi valkostur fer framhjá einum þeirra. Ef þú átt í vandræðum með að Outlook "
-"notendur fá ekki svörin þín, prófaðu þá að virkja þennan valkost."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Senda hópvinnuboð í meginhluta bréfs"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook hefur ýmsa vankosti í sinni útfærslu af iCalendar staðlinum. "
-"Þessi valkostur fer framhjá einum þeirra. Ef þú átt í vandræðum með að Outlook "
-"notendur fá ekki boðin þín, prófaðu þá að virkja þennan valkost."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Sjálfvirk sending af boðum"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Þegar þetta er valið munt þú ekki sjá póstritilinn og öll boðskeyti verða send "
-"sjálfkrafa. Ef þú vilt sjá skeytin áður en þau eru send, afveldu þá þennan "
-"valkost. Athugaðu að textinn sem birtist í ritlinum er í iCalendar sniði og þú "
-"ættir ekki að breyta honum handvirkt."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Þegar þetta er virkjað er hægt að geyma færslur Kontact forritana "
-"(KOrganizer, KAddressBook, og KNotes.)</p>"
-"<p>Ef þú vilt nota þennan valkost þarftu einnig að stilla forritin til að "
-"notast við IMAP auðlindina, er það gert í TDE Stjórnborðinu.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Vanalega er engin þörf á að sjá möppurnar sem innihalda IMAP auðlindirnar. "
-"Ef þú hinsvegar þarft að hafa þær sýnilegar, getur þú stillt það hér.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Veldu sniðið sem á að geyma hópvinnukerfismöppurnar í. "
-"<ul>"
-"<li>Sjálfgefið er að nota ical (fyrir dagatals möppur) og vcard (fyrir möppur "
-"vistfangaskráar) staðlana. Þetta snið gerir alla valkosti Kontact fáanlega.</li>"
-"<li>Kolab XML sniðið notar sérstaka tegund sem passar betur að því sem er notað "
-"í Outlook. Þetta snið gefur betri Outlook samhæfni þegar notast er við Kolab "
-"þjón, eða sambærilega lausn.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Þetta velur yfirmöppu IMAP auðlindamappana.</p>"
-"<p>Kolab þjónninn setur IMAP innhólfið sjálfgefið sem yfirmöppu.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Þetta er auðkenni reikningsins sem inniheldur IMAP auðlindarmöppurnar.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Ef þú vilt setja IMAP möppunöfnin yfir á annað tungumál, getur þú valið á "
-"milli þessara fáanlegu tungumála.</p>"
-"<p> Athugið, eina ástæðan til að gera þetta er til að fá samhæfni við Microsoft "
-"Outlook. Það er talin slæm hugmynd að breyta þessu þar sem það gerir breytingu "
-"tungumáls ómögulega. </p>"
-"<p>Svo ekki setja þetta nema þú neyðist til þess.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Þetta gildi er notað til að ákvarða hvort eigi að sýna KMail kynninguna eður "
-"ei."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Hámarksfjöldi tenginga á hvern þjón"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Hér er hægt að takmarka tengingarfjöldann á hvern þjón þegar athugað er með "
-"póst. Sjálfgefið er að þetta sé ótakmarkað (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Sýna flýtileitarlínu"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Þessi valkostur sýnir eða felur leitarlínuna fyrir ofan bréfalistann sem má "
-"nota til að leita á snöggan hátt í listanum."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "Halda í stafatöflu úr bréfi þegar svarað eða áframsent, ef mögulegt"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Bæta undirskrift við sjálfkrafa"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Muna þetta auðkenni, þannig að það verði sjálfvalið í ritilglugganum hér "
-"eftir.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Muna þessa möppu fyrir send skeyti, þannig að hún verði sjálfvalin í "
-"ritilglugganum hér eftir."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Muna þessa flutningsleið, þannig að hún verði sjálfvalin í ritilglugganum hér "
-"eftir."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Muna þetta auðkenni, þannig að það verði sjálfvalið í ritilglugganum hér "
-"eftir.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Línus&kipti við dálk:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Vara við ef &rótarskírteini rennur út eftir minna en:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Veldu þetta til að Outlook &#8482; skilji nöfn viðhengja sem innihalda "
-"ekki-enska stafi"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Biðja s&jálfkrafa um tilkynningar um afdrif bréfa"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hakaðu við þetta ef þú vilt að KMail biðji sjálfkrafa um tilkynningar um "
-"afdrif bréfa fyrir öll send bréf.</p> "
-"<p>Þessi valkostur hefur aðeins áhrif á það sjálfgefna, þú getur alltaf gert "
-"þetta virkt eða óvirkt  í bréfaritlinum með því að fara í valmyndina <em>"
-"Valkostir</em>->&gt;<em>Fá tilkynningu um afdrif bréfs</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Nota nýleg vistföng fyrir sjálfklárun"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Afveldu þetta ef þú vilt ekki að nýlega notuð vistföng birtist í "
-"sjálfklárunarlistanum í ritlinum."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Tími milli sjálf&virkrar vistunar:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Það er hægt að taka afrit af textanum í ritlinum með jöfnu millibili. Þú velur "
-"tímabilið á milli vistana hér. Til að slökkva á sjálfvirkri vistun setur þú "
-"gildið til 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Ski&pta þekktum forskeytum út með \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Skipta &forskeytum út með \"Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Nota 'snjallar-tilvitnanir'"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Undirritunin er útrunnin."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tegund móttakanda"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Setur tegund móttakanda í valglugganum til,\n"
-"        CC and BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Tegund móttakanda ritill"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Setur tegund móttakanda í ritlinum til,\n"
-"        CC and BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Hámarksfjöldi af mótakandalínum."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "Halda í stafatöflu úr bréfi þegar svarað eða áframsent, ef mögulegt"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Sum bréf, sérstaklega þau sem eru búin til sjálfkrafa, tilgreina ekki "
-"stafatöfuna sem þarf að nota til að þau birtist rétt. Í slíkum tilfellum verður "
-"notast við stafatöfluna sem þú velur hér. Veldu þá töflu sem er mest notuð í "
-"þínum heimshluta. Sjálfgefið er að nota stafatöflu kerfisins."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Að breyta þessu frá 'Sjálfgefið' mun þvinga notkun af uppgefnu stafatöflunni "
-"fyrir öll bréf, óháð því hvað þau skilgreina sjálf."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Hakaðu við hér ef þú vilt að brostáknum sem :-) verði skipt út með brosköllum "
-"(litlar myndir)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr "Virkjaðu þetta til að sýna mismunandi stig af tilvitnuðum texta."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Sjálfvirkt fellistig:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Minnka leturstærð tilvitnaðs texta"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Virkjaðu þetta til að sýna tilvitnaðan texta með smærra letri."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Vista send bréf &dulrituð"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Sýna rusl&póstsstöðu í glyshausum"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Senda tilkynningar um afdrif pósts með tómum sendandastreng."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Senda tilkynningar um afdrif pósts með tómum sendandastreng. Sumir þjónar gætu "
-"hafnað slíkum bréfum. Ef þú upplifir slíkt afveldu þá þennan valkost."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Bréfalisti - ný bréf"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Setja inn &gæsalappir"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13787,6 +11852,11 @@ msgstr "Bæta við sem 'Afrit (CC)'"
 msgid "Add as BCC"
 msgstr "Bæta við sem 'Dulið afrit (BCC)'"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Hætta við"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13802,10 +11872,10 @@ msgstr "Valdir móttakendur"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Þú valdir einn móttakanda. Hámarksfjöldi af móttakendum er %1. Vinsamlega "
 "aðlagaðu valið.\n"
@@ -13826,11 +11896,11 @@ msgstr "Nota vistfangaflettirinn"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Þessi takki opnar glugga þar sem þú getur valið móttakendur úr lista yfir öll "
-"fáanleg vistföng."
+"Þessi takki opnar glugga þar sem þú getur valið móttakendur úr lista yfir "
+"öll fáanleg vistföng."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -13932,10 +12002,19 @@ msgstr "er stærra eða jafnt og"
 msgid " bytes"
 msgstr " bæti"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " daga"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Til að geta keyrt leitina þína verður að ná í öll skeyti möppunnar %1 frá "
 "þjóninum. Þetta getur tekið smá tíma. Viltu halda áfram með leitina?"
@@ -14086,16 +12165,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Sæki upplýsingar fyrir tengingu '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Sæki upplýsingar fyrir tengingu '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14114,10 +12189,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Innihald skriftu '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Innihald skriftu '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14140,20 +12213,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Geta Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Geta Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Engin sérstök geta fáanleg)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Tiltækar Sieve skriftur:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Tiltækar Sieve skriftur:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14231,8 +12300,8 @@ msgstr "Notaðu þetta svæði til að setja inn fasta undirskrift."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Notaðu þetta til að tilgreina textaskrá sem inniheldur undirskriftina þína. "
 "Verður hún lesin í hvert sinn sem þú býrð til nýtt skeyti eða bætir við "
@@ -14252,21 +12321,26 @@ msgstr "Opna skilgreinda skrá í textaritli."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Þú getur sett inn handahófskennda skipun hér, annað hvort með eða án slóðar "
 "allt eftir því hvort skipunin finnist í slóðinni þinni eður ei. KMail keyrir "
-"skipunina fyrir öll ný bréf og notar úttak hennar sem undirskrift. Skipanir sem "
-"er vanalegt að nota með þessu eru t.d. \"fortune\" eða \"ksig -random\"."
+"skipunina fyrir öll ný bréf og notar úttak hennar sem undirskrift. Skipanir "
+"sem er vanalegt að nota með þessu eru t.d. \"fortune\" eða \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Gefðu upp skipun:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Slóð"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Ný færsla:"
@@ -14303,6 +12377,11 @@ msgstr "Bæta við tengingu"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Viltu örugglega fjarlægja auðkennið <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "No&ta við:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14317,6 +12396,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Breyta skriftu..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14356,9 +12439,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14398,6 +12481,16 @@ msgstr ""
 "Gat ekki opnað skrá \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Til: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Afrit (Cc): "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14430,36 +12523,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14469,8 +12558,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14486,8 +12574,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14529,8 +12616,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -14690,6 +12776,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14725,111 +12815,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...að þú getur farið á næsta og fyrra bréf með því að nota\n"
-"hægri og vinstri örvalyklana?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...að þú getur smíðað síur með hraði byggðar á sendanda, móttakanda,\n"
-"viðfangsefni og póstlistum með <em>Bréf-&gt;Búa&nbsp;til&nbsp;síu</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...að þú getur losnað við &quot;[póstlista-heiti]&quot;\n"
-"sem er bætt við viðfangsefni á sumum póstlistum með því að nota <em>umskrifa\n"
-"haus</em> síu aðgerðina? skrifaðu bara\n"
-"<pre>umrita haus &quot;Subject&quot;\n"
-"   skipta út &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   með &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...að þú getur tengt póstlista við möppur í \n"
-"<em>Mappa-&gt;Eiginleikar</em> glugganum? þú getur þá notað\n"
-"<em>Bréf-&gt;Nýtt&nbsp;bréf&nbsp;á&nbsp;póstlista...</em>\n"
-"til að opna ritilinn með netfangi póstlistans innsettu.\n"
-"Einnig getur þú smellt með miðjutakkanum á möppuna.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...að þú getur skilgreint sérstakar táknmyndir fyrir hverja möppu?\n"
-"Sjá <em>Mappa->Eiginleikar</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...að KMail getur sýnt litarönd sem gefur til kynna tegund bréfsins\n"
-"(venjulegur texti/HTML/OpenPGP) sem verið er að birta?</p>\n"
-"<p>Þetta kemur í veg fyrir að hægt sé að falsa staðfestingu bréfa með\n"
-"því að senda HTML bréf sem herma eftir uppsetningu KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...að þú getur síað bréf eftir hvaða haus sem er með því að skrifa \n"
-"nafn hans í fyrsta svæðið í leitarreglunum?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>..að þú getur síað út bréf sem innihalda aðeins HTML, með reglunni\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...að þegar þú svarar er bara vitnað í þann hluta sem valinn er í "
-"bréfinu?</p>\n"
-"<p>Ef ekkert er valið er vitnað í allt bréfið.</p>\n"
-"<p>Þetta virkar meira að segja með viðhengjum ef þú velur\n"
-"<em>Sýn-&gt;Viðhengi-&gt;Innfelld</em>.</p>\n"
-"<p>Þetta er alltaf hægt þegar svarað er nema með\n"
-"<em>Bréf-&gt;Svara án tilvitnunar</em>.</p>\n"
-"<p align=\"right\"><em>framlag David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Það er ekkert til að afgera."
@@ -14897,6 +12882,15 @@ msgstr "Viðhengi: #%1 (ónefnt)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Skrá með nafninu \"%1\" er til fyrir. Viltu skrifa yfir hana ?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Skrifa yfir skrá?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15013,13 +13007,13 @@ msgstr "&Senda mynd með öllum bréfum"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Hakaðu við hér ef þú vilt að KMail bæti við X-Face haus í bréfin sem eru "
-"skrifuð með þessu auðkenni. X-Face er lítil (48x48 punktar) svarthvít mynd sem "
-"sum póstforrit geta sýnt."
+"skrifuð með þessu auðkenni. X-Face er lítil (48x48 punktar) svarthvít mynd "
+"sem sum póstforrit geta sýnt."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15047,13 +13041,13 @@ msgstr "Veldu skrá..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Notaðu þetta til að velja skrá sem á að nota til að búa til myndina. Hún ætti "
-"að vera í góðum gæðum og ferningslaga. Ljós bakgrunnur hjálpar til að fá sem "
-"besta niðurstöðu."
+"Notaðu þetta til að velja skrá sem á að nota til að búa til myndina. Hún "
+"ætti að vera í góðum gæðum og ferningslaga. Ljós bakgrunnur hjálpar til að "
+"fá sem besta niðurstöðu."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15061,20 +13055,21 @@ msgstr "Ná í frá vistfangaskrá"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Þú getur notað smækkað eintak af myndinni sem þú hefur sett í vistfangaskrána."
+"Þú getur notað smækkað eintak af myndinni sem þú hefur sett í "
+"vistfangaskrána."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail getur sent litla (48x48 punktar), lággæða, svarthvíta mynd með öllum "
-"bréfum. Þetta getur t.d. verið mynd af þér eða eithvað merki. Myndin verður þá "
-"sýnd hjá móttakanda bréfsins (ef forritið hans styður það)."
+"<qt>KMail getur sent litla (48x48 punktar), lággæða, svarthvíta mynd með "
+"öllum bréfum. Þetta getur t.d. verið mynd af þér eða eithvað merki. Myndin "
+"verður þá sýnd hjá móttakanda bréfsins (ef forritið hans styður það)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15082,11 +13077,11 @@ msgstr "Sláðu inn X-Face streng hér."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Dæmi má finna á <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Dæmi má finna á <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www."
+"xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15101,128 +13096,1734 @@ msgstr "Engin mynd"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Þú hefur ekki skilgreint tengiliðina þína í vistfangaskránni."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Undirritun"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Undirrita bréf sjálfkrafa"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Þegar hakað er við hér eru öll bréf sem þú sendir  frá þér undirrituð. Að "
+"sjálfsögðu er hægt að aftengja undirritun fyrir hvert og eitt bréf."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Dulritun"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Setja viðfangsefni bréfs"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Þegar þetta er virkjað er bréfið/skráin ekki bara dulrituð með dreifilykli "
+"móttakanda, heldur einnig þínum. Gerir það þér kleyft að afkóða bréfið/"
+"skrána seinna. Það er sem regla góð hugmynd að hafa þetta á."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Senda CC: til 'netfangs'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Sýna und&irritaðan/dulkóðaðan texta eftir ritun"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Senda BCC: til 'netfangs'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Þegar þetta er valið mun undirritaði/dulritaði textinn birtast í aðskildum "
+"glugga, og getur þú þá séð hvernig hann lítur út áður en þú sendir hann. Það "
+"er góð hugmynd að hafa þetta í gangi á meðan þú ert að staðfesta að "
+"dulritunarkerfið þitt virki sem skildi."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Bæta 'haus' við bréfið"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Vista send bréf &dulrituð"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Lesa meginefni bréfs úr 'skrá'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Hakaðu við hér til að vista bréf dulrituð "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Setja meginefni bréfs"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Geyma póst dulkóðaðan</h1>\n"
+"Þegar þetta er valið er allur sendur póstur geymdur dulkóðaður eins og hann "
+"var þegar hann var sendur.  Það er ekki mælt með þessu þar sem þú getur ekki "
+"lesið póstinn ef skírteinið rennur út.\n"
+"<p>\n"
+"Samt sem áður geta gilt staðbundnar reglur sem skikka þér til þess að velja "
+"þetta.  Ef þú ert í vafa, hafðu þá samband við kerfisstjórann þinn.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Bæta viðhengi við bréfið. Þetta er hægt að endurtaka"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Allta&f sýna dulritunarlyklana til samþykkis"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Gá eingöngu að nýjum pósti"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Þegar hakað er við hér, mun alltaf verða sýndur listi yfir fáanlega "
+"dreifilykla og getur þú þá valið þann sem þú vilt nota til dulritunar. Ef "
+"þetta er afvalið mun forritið einungis sýna gluggann ef það finnur ekki "
+"rétta lykilinn eða ef það eru fleiri lyklar sem væri hægt að nota."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Opna eingöngu ritilinn"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "&Dulrita bréf sjálfkrafa þegar mögulegt er"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Skoða uppgefna bréfaskrá"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Þegar hakað er við hér eru öll bréf send dulrituð ef mögulegt er og þess "
+"óskað. Að sjálfsögðu er hægt að aftengja dulritun fyrir hvert og eitt bréf."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Senda bréf á 'vistfang' og hengja við skrána sem slóðin bendir á"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Aldrei undirrita/dulrita þegar vistað er sem &uppkast"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lesið"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Gamalt"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Almennt"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Eytt"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "Senda sva&r til"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Svarað"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "S&vara öllum..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Áframsent"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "Á&framsenda"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Í biðröð"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Flýtilykill:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sent"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Vaktað"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Innihald möppu:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Hunsað"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Ruslpóstur"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ekki ruslpóstur"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Eiginleikar möppu"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Verkþáttur"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Mappan inniheldur póstlista"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Hefur viðhengi"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Netfang lista:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Ven&julegt:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Ól&esið:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Úrelding bréfa"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Ú&relda eftir:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Úrelda l&esin bréf"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Úrelda e&ftir:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Úrelda ól&esin bréf"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "dag(a)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "viku(r)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "mánuð(i)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Ítarlegt"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Au&ðkenni sendanda:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Geym&slusnið:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Birting &lista:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Senda bréf úr biðröð við póstathugun"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Veldu hvort KMail eigi að senda öll skeyti úr úthólfinu handvirkt eða "
+"við allar póstathuganir, eða hvort þú vilt slökkva á að skeyti séu send "
+"sjálfvirkt </p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Slóð"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Skrá með nafninu \"%1\" er til fyrir. Viltu skrifa yfir hana ?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Það eru ný bréf í möppunni (%1) sem er ekki búið að senda á þjóninn "
+"ennþá. Þú virðist hinsvegar ekki hafa nægar aðgangsheimildir að möppunni "
+"núna til að senda þau. Hafðu samband við kerfisstjórann þinn um að fá aðgang "
+"að möppunni, eða flyttu bréfin í aðra möppu.</p> <p>Viltu flytja bréfin yfir "
+"í aðra möppu núna?</p>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Skrifa yfir skrá?"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Seinast valda mappan í möppulistanum."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Stefna við vísun af kerfisbakkatáknmynd"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Ýtarleg tilkynning um nýjan póst"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Ef þetta er valið, mun verða birtur fjöldinn af nýjum skeytum fyrir hverja "
+"möppu í tilkynningarglugganum. Annars muntu einungis fá glugga með "
+"tilkynningu um nýjan póst."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Velja ritil:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Nota &ytri ritil í stað þess innbyggða"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Virkja hópvinnukerfisvirkni"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Breyta Frá:/Til: hausum í svörum við boðunum"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook hefur ýmsa vankosti í sinni útfærslu af iCalendar "
+"staðlinum. Þessi valkostur fer framhjá einum þeirra. Ef þú átt í vandræðum "
+"með að Outlook notendur fá ekki svörin þín, prófaðu þá að virkja þennan "
+"valkost."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Senda hópvinnuboð í meginhluta bréfs"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook hefur ýmsa vankosti í sinni útfærslu af iCalendar "
+"staðlinum. Þessi valkostur fer framhjá einum þeirra. Ef þú átt í vandræðum "
+"með að Outlook notendur fá ekki boðin þín, prófaðu þá að virkja þennan "
+"valkost."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Sjálfvirk sending af boðum"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Þegar þetta er valið munt þú ekki sjá póstritilinn og öll boðskeyti verða "
+"send sjálfkrafa. Ef þú vilt sjá skeytin áður en þau eru send, afveldu þá "
+"þennan valkost. Athugaðu að textinn sem birtist í ritlinum er í iCalendar "
+"sniði og þú ættir ekki að breyta honum handvirkt."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Þegar þetta er virkjað er hægt að geyma færslur Kontact forritana "
+"(KOrganizer, KAddressBook, og KNotes.)</p><p>Ef þú vilt nota þennan valkost "
+"þarftu einnig að stilla forritin til að notast við IMAP auðlindina, er það "
+"gert í TDE Stjórnborðinu.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Vanalega er engin þörf á að sjá möppurnar sem innihalda IMAP "
+"auðlindirnar. Ef þú hinsvegar þarft að hafa þær sýnilegar, getur þú stillt "
+"það hér.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Veldu sniðið sem á að geyma hópvinnukerfismöppurnar í. <ul><li>Sjálfgefið "
+"er að nota ical (fyrir dagatals möppur) og vcard (fyrir möppur "
+"vistfangaskráar) staðlana. Þetta snið gerir alla valkosti Kontact fáanlega.</"
+"li><li>Kolab XML sniðið notar sérstaka tegund sem passar betur að því sem er "
+"notað í Outlook. Þetta snið gefur betri Outlook samhæfni þegar notast er við "
+"Kolab þjón, eða sambærilega lausn.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Þetta velur yfirmöppu IMAP auðlindamappana.</p><p>Kolab þjónninn setur "
+"IMAP innhólfið sjálfgefið sem yfirmöppu.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Þetta er auðkenni reikningsins sem inniheldur IMAP auðlindarmöppurnar.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Ef þú vilt setja IMAP möppunöfnin yfir á annað tungumál, getur þú valið á "
+"milli þessara fáanlegu tungumála.</p><p> Athugið, eina ástæðan til að gera "
+"þetta er til að fá samhæfni við Microsoft Outlook. Það er talin slæm hugmynd "
+"að breyta þessu þar sem það gerir breytingu tungumáls ómögulega. </p><p>Svo "
+"ekki setja þetta nema þú neyðist til þess.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Þetta gildi er notað til að ákvarða hvort eigi að sýna KMail kynninguna eður "
+"ei."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Hámarksfjöldi tenginga á hvern þjón"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Hér er hægt að takmarka tengingarfjöldann á hvern þjón þegar athugað er með "
+"póst. Sjálfgefið er að þetta sé ótakmarkað (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Sýna flýtileitarlínu"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Þessi valkostur sýnir eða felur leitarlínuna fyrir ofan bréfalistann sem má "
+"nota til að leita á snöggan hátt í listanum."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "Halda í stafatöflu úr bréfi þegar svarað eða áframsent, ef mögulegt"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Bæta undirskrift við sjálfkrafa"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Muna þetta auðkenni, þannig að það verði sjálfvalið í ritilglugganum hér "
+"eftir.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Muna þessa möppu fyrir send skeyti, þannig að hún verði sjálfvalin í "
+"ritilglugganum hér eftir."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Muna þessa flutningsleið, þannig að hún verði sjálfvalin í ritilglugganum "
+"hér eftir."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Muna þetta auðkenni, þannig að það verði sjálfvalið í ritilglugganum hér "
+"eftir.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Línus&kipti við dálk:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Vara við ef &rótarskírteini rennur út eftir minna en:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Veldu þetta til að Outlook &#8482; skilji nöfn viðhengja sem innihalda ekki-"
+"enska stafi"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Biðja s&jálfkrafa um tilkynningar um afdrif bréfa"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Hakaðu við þetta ef þú vilt að KMail biðji sjálfkrafa um tilkynningar "
+"um afdrif bréfa fyrir öll send bréf.</p> <p>Þessi valkostur hefur aðeins "
+"áhrif á það sjálfgefna, þú getur alltaf gert þetta virkt eða óvirkt  í "
+"bréfaritlinum með því að fara í valmyndina <em>Valkostir</em>->&gt;<em>Fá "
+"tilkynningu um afdrif bréfs</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Nota nýleg vistföng fyrir sjálfklárun"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Afveldu þetta ef þú vilt ekki að nýlega notuð vistföng birtist í "
+"sjálfklárunarlistanum í ritlinum."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Tími milli sjálf&virkrar vistunar:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Það er hægt að taka afrit af textanum í ritlinum með jöfnu millibili. Þú "
+"velur tímabilið á milli vistana hér. Til að slökkva á sjálfvirkri vistun "
+"setur þú gildið til 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Ski&pta þekktum forskeytum út með \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Skipta &forskeytum út með \"Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Nota 'snjallar-tilvitnanir'"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Undirritunin er útrunnin."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tegund móttakanda"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Setur tegund móttakanda í valglugganum til,\n"
+"        CC and BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Tegund móttakanda ritill"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Setur tegund móttakanda í ritlinum til,\n"
+"        CC and BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Hámarksfjöldi af mótakandalínum."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "Halda í stafatöflu úr bréfi þegar svarað eða áframsent, ef mögulegt"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Sum bréf, sérstaklega þau sem eru búin til sjálfkrafa, tilgreina ekki "
+"stafatöfuna sem þarf að nota til að þau birtist rétt. Í slíkum tilfellum "
+"verður notast við stafatöfluna sem þú velur hér. Veldu þá töflu sem er mest "
+"notuð í þínum heimshluta. Sjálfgefið er að nota stafatöflu kerfisins."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Að breyta þessu frá 'Sjálfgefið' mun þvinga notkun af uppgefnu stafatöflunni "
+"fyrir öll bréf, óháð því hvað þau skilgreina sjálf."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Hakaðu við hér ef þú vilt að brostáknum sem :-) verði skipt út með "
+"brosköllum (litlar myndir)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr "Virkjaðu þetta til að sýna mismunandi stig af tilvitnuðum texta."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Sjálfvirkt fellistig:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Minnka leturstærð tilvitnaðs texta"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Virkjaðu þetta til að sýna tilvitnaðan texta með smærra letri."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Vista send bréf &dulrituð"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Sýna rusl&póstsstöðu í glyshausum"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Senda tilkynningar um afdrif pósts með tómum sendandastreng."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Senda tilkynningar um afdrif pósts með tómum sendandastreng. Sumir þjónar "
+"gætu hafnað slíkum bréfum. Ef þú upplifir slíkt afveldu þá þennan valkost."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Bréfalisti - ný bréf"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Setja inn &gæsalappir"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "B&reyta skrá"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Breyta..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Fara að"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Mappa"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Bréf"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Svara sérstakt"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Á&framsenda"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Frumstilla letur"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML tækjaslá"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Almennar stillingar"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML tækjaslá"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Staðfesta að skírteini séu ekki úreld"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Ef þetta er valið, munu S/MIME skírteini verða staðfest með úreldingalista "
+"skírteina."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Hunsa þjónustuslóð skírteina"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Ekki skoða stefnu skírteinis"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Sjálfgefið er að GnuPG noti ~/.gnupg/policies.txt skrána til að athuga hvort "
+"stefna skírteinis sé leyfð. Ef hakað er við hér eru stefnur ekki athugaðar."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Aldrei nota úreldingalista"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ef þetta er valið, munu úreldingarlistar aldrei verða notaðir til að "
+"staðfesta S/MIME skírteini."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Ná í útgefandaskírteini sem vantar"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Þegar hakað er við hér, er náð í útgefandaskírteini þegar það er nauðsynlegt "
+"(þetta á við báða auðkennivalkostina, CRLs og OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP beiðnir"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Ekki framkvæma neinar HTTP beiðnir"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Slökkva algerlega á HTTP fyrir S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Nota þennan milliþjón fyrir HTTP beiðnir: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Nota HTTP milliþjón kerfis:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Ef hakað er við hér, mun gildið fyrir HTTP milliþjóninn sem sýnt er til "
+"hægri (sem er tekið frá http_proxy stillingu kerfisins) verða notað fyrir "
+"allar HTTP beiðnir."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Sláðu inn hér staðsetningu milliþjónsins sem á að nota fyrir allar HTTP "
+"beiðnir tengdar S/MIME. Sniðið er þjónn.gátt. Dæmi: myproxy.nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Hunsa HTTP CRL þjónustuslóð skírteina"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP beiðnir"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Ekki framkvæma neinar LDAP beiðnir"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Slökkva algerlega á notkun af LDAP fyrir S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Hunsa LDAP CRL þjónustuslóð skírteina"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Aðalþjónn fyrir LDAP beiðnir:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Ef þú slærð inn LDAP þjón hér munu allar LDAP beiðnir verða sendar á hann "
+"fyrst. Mun þessi stilling þá hunsa allar aðrar sérstakar þjóns og gáttahluta "
+"í LDAP slóðum, og einnig verða notað ef þjóns og gáttar upplýsingar vantar í "
+"slóðina. Einungis verður notast við aðra LDAP þjóna ef tengingin við \"proxy"
+"\" mistekst.\n"
+"Sniðið er \"ÞJÓNN\" eða \"ÞJÓNN:GÁTT\". Ef GÁTT er ekki fylt út er notast "
+"við gátt 389 (sjálfgefna LDAP gáttin)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "B&æta við..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Hópvinnukerfi"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Frumstilla letur"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "ótakmarkað"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Stilling Undirritunnar"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Svara se&ndanda:"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Áframsent bréf"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Vara þig við ef þú sendir ó&undirituð bréf"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Krossa við ef þú vilt láta vara þig við ef þú sendir óundirituð bréf"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Aðvörun þegar reynt er að senda óundirrituð bréf</h1>\n"
+"Ef hakað er við hér færðu aðvörun þegar þú reynir að senda bréf eða hluta "
+"bréfs sem er óundirritað.\n"
+"<p>\n"
+"Það er mælt með að þú hafir slökkt á þessu til að fá sem mestan heilleika.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Vara við þegar reynt er að senda ódulrituð bréf"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Hakaðu við til að láta vara þig þið því þegar þú ert um það bil að fara að "
+"senda ódulritað bréf."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Aðvörun þegar reynt er að senda ódulritað bréf</h1>\n"
+"Ef þetta er valið birtist þér aðvörun þegar þú reynir að senda hluta bréfs "
+"ódulritaða.\n"
+"<p>\n"
+"Mælt er með því að hafa þetta á til þess að ná sem mestum heilleika.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Va&ra við ef netfang móttakanda er ekki í skírteininu"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Hakaðu við til að fá aðvörun ef netfangið er ekki í skírteininu"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Aðvörun ef netfang móttakanda er ekki í skírteininu</h1>\n"
+"Ef þetta er valið færðu aðvörun ef netfang móttakanda er ekki geymt í "
+"skírteininu sem notað er til að dulkóða.\n"
+"<p>\n"
+"Mælt er með því að hafa þetta á til að ná hámarks öryggi.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Vara við ef skírteini/lyklar renna fljótlega út (stilltu nánar að neðan)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Fyrir undirritun"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Fyrir dulritun"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Veldu fjölda daga hér"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Aðvörun ef undirritunarskírteini rennur út</h1>\n"
+"Veldu lágmarks fjölda daga sem undirritunarskírteini þarf að vera í gildi án "
+"þess að aðvörun sé birt.\n"
+"<p>\n"
+"Mælt er með 14 dögum fyrir SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Viðvörun ef skírteini rennur út</h1>\n"
+"Veldu lágmarks fjölda daga sem skírteini á að vera gilt án þess að viðvörun "
+"sé gefin.\n"
+"<p>\n"
+"Mælt er með 14 dögum fyrir SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Aðvörun ef skírteini í keðjunni rennur út</h1>\n"
+"Veldu lágmarks fjölda daga sem öll skírteini í keðjunni eiga að haldast í "
+"gildi áður en aðvörun er gefin.\n"
+"<p>\n"
+"Mælt er með 14 dögum fyrir SPHINX .\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Aðvörun ef CA skírteini rennur út</h1>\n"
+"Veldu lágmarks fjölda daga sem CA skírteini þarf að vera í gildi án þess að "
+"aðvörun sé birt.\n"
+"<p>\n"
+"Mælt er með 14 dögum fyrir SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Aðvörun ef rótarskírteini rennur út</h1>\n"
+"Veldu lágmarks fjölda daga sem rótarskírteini þarf að vera í gildi án þess "
+"að aðvörun sé birt.\n"
+"<p>\n"
+"Mælt er með 14 dögum fyrir SPHINX.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Fyrir rótarskírteini:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Fyrir milliliðs CA skírteini:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Fyrir notenda skírteini/lykla:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Kveikja á öllum \"Ekki spyrja aftur\" viðvörunum"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...að þú getur farið á næsta og fyrra bréf með því að nota\n"
+"hægri og vinstri örvalyklana?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...að þú getur smíðað síur með hraði byggðar á sendanda, móttakanda,\n"
+"viðfangsefni og póstlistum með <em>Bréf-&gt;Búa&nbsp;til&nbsp;síu</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...að þú getur losnað við &quot;[póstlista-heiti]&quot;\n"
+"sem er bætt við viðfangsefni á sumum póstlistum með því að nota "
+"<em>umskrifa\n"
+"haus</em> síu aðgerðina? skrifaðu bara\n"
+"<pre>umrita haus &quot;Subject&quot;\n"
+"   skipta út &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   með &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...að þú getur tengt póstlista við möppur í \n"
+"<em>Mappa-&gt;Eiginleikar</em> glugganum? þú getur þá notað\n"
+"<em>Bréf-&gt;Nýtt&nbsp;bréf&nbsp;á&nbsp;póstlista...</em>\n"
+"til að opna ritilinn með netfangi póstlistans innsettu.\n"
+"Einnig getur þú smellt með miðjutakkanum á möppuna.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...að þú getur skilgreint sérstakar táknmyndir fyrir hverja möppu?\n"
+"Sjá <em>Mappa->Eiginleikar</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...að KMail getur sýnt litarönd sem gefur til kynna tegund bréfsins\n"
+"(venjulegur texti/HTML/OpenPGP) sem verið er að birta?</p>\n"
+"<p>Þetta kemur í veg fyrir að hægt sé að falsa staðfestingu bréfa með\n"
+"því að senda HTML bréf sem herma eftir uppsetningu KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...að þú getur síað bréf eftir hvaða haus sem er með því að skrifa \n"
+"nafn hans í fyrsta svæðið í leitarreglunum?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>..að þú getur síað út bréf sem innihalda aðeins HTML, með reglunni\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...að þegar þú svarar er bara vitnað í þann hluta sem valinn er í bréfinu?"
+"</p>\n"
+"<p>Ef ekkert er valið er vitnað í allt bréfið.</p>\n"
+"<p>Þetta virkar meira að segja með viðhengjum ef þú velur\n"
+"<em>Sýn-&gt;Viðhengi-&gt;Innfelld</em>.</p>\n"
+"<p>Þetta er alltaf hægt þegar svarað er nema með\n"
+"<em>Bréf-&gt;Svara án tilvitnunar</em>.</p>\n"
+"<p align=\"right\"><em>framlag David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15273,9 +14874,6 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "Vista í &uppkastsmöppunni"
 
-#~ msgid "Configure KMail"
-#~ msgstr "Stilla KMail"
-
 #~ msgid "Open with..."
 #~ msgstr "Opna með..."
 
@@ -15342,33 +14940,42 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sjálfgefið að allir bréfahlutar séu dulritaðir</h1>\n"
-#~ "Ef þetta er valið eru allir hlutar bréfs dulritaðir (þ.e. skilboðin sjálf og öll viðhengi) sjálfgefið.\n"
+#~ "Ef þetta er valið eru allir hlutar bréfs dulritaðir (þ.e. skilboðin sjálf "
+#~ "og öll viðhengi) sjálfgefið.\n"
 #~ "<p>\n"
-#~ "Þetta er sjálfgefin stilling, þú getur samt hunsað það fyrir hvert og eitt bréfl\n"
+#~ "Þetta er sjálfgefin stilling, þú getur samt hunsað það fyrir hvert og "
+#~ "eitt bréfl\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "&Spyrja áður en hver hluti er dulritaður"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Smelltu til að láta spyrja um hvern hluta bréfs áður en hann er dulritaður"
+#~ msgstr ""
+#~ "Smelltu til að láta spyrja um hvern hluta bréfs áður en hann er dulritaður"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Spurja áður en hver hluti er dulritaður</h1>\n"
-#~ "Ef þetta er valið ertu spurð(ur) áður en hver hluti bréfsins er dulritaður (þ.e. aðal skilaboðin og viðhengin) hvort þú viljir að það sé dulritað eða ekki.\n"
+#~ "Ef þetta er valið ertu spurð(ur) áður en hver hluti bréfsins er "
+#~ "dulritaður (þ.e. aðal skilaboðin og viðhengin) hvort þú viljir að það sé "
+#~ "dulritað eða ekki.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15382,14 +14989,16 @@ msgstr "Skrifa yfir skrá?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ekki dulrita bréf<h1>\n"
 #~ "Ef þetta er valið eru bréf ekki sjálfgefið dulrituð.\n"
 #~ "<p>\n"
-#~ "Þetta er sjálfgefin stilling, þú getur hunsað hana fyrir hvert og eitt bréf.\n"
+#~ "Þetta er sjálfgefin stilling, þú getur hunsað hana fyrir hvert og eitt "
+#~ "bréf.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15401,20 +15010,32 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Dulritunaralgrím</h1>\n"
-#~ "Algrím er lýsing á því hvernig tölvan skal framkvæma ákveðið verkefni. Dulritunaralgrím lýsir því hvernig tölvan setur lykil móttakanda á bréfið svo að aðeins sá aðili geti lesið bréfið.\n"
+#~ "Algrím er lýsing á því hvernig tölvan skal framkvæma ákveðið verkefni. "
+#~ "Dulritunaralgrím lýsir því hvernig tölvan setur lykil móttakanda á bréfið "
+#~ "svo að aðeins sá aðili geti lesið bréfið.\n"
 #~ "<p>\n"
-#~ "Valið ákvarðar hversu erfitt eða létt það er að grípa inn í og lesa bréfið. Samt sem áður eru öll algrím í SPHINX umhverfinu talin mjög örugg. Almennt mun það sjálfgefna vera í lagi hér.\n"
+#~ "Valið ákvarðar hversu erfitt eða létt það er að grípa inn í og lesa "
+#~ "bréfið. Samt sem áður eru öll algrím í SPHINX umhverfinu talin mjög "
+#~ "örugg. Almennt mun það sjálfgefna vera í lagi hér.\n"
 #~ "<p>\n"
-#~ "Þetta er sjálfgefin stilling sem þú getur hunsað fyrir hvert og eitt bréf.\n"
+#~ "Þetta er sjálfgefin stilling sem þú getur hunsað fyrir hvert og eitt "
+#~ "bréf.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15426,16 +15047,21 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Athugun má enda í vistuðu skírteini</h1>\n"
-#~ "Ef þetta er valið má athugun á skírteini enda með skírteini vistuðu á tölvunni.\n"
+#~ "Ef þetta er valið má athugun á skírteini enda með skírteini vistuðu á "
+#~ "tölvunni.\n"
 #~ "<p>\n"
-#~ "Skírteini sem vistuð eru á tölvum eru þín eigin skírteini ásamt skírteini þeirra sem þú ert í sambandi við og skírteinis yfirvalda.\n"
+#~ "Skírteini sem vistuð eru á tölvum eru þín eigin skírteini ásamt skírteini "
+#~ "þeirra sem þú ert í sambandi við og skírteinis yfirvalda.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15447,12 +15073,15 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Athuga slóð skírteina alltaf að rótarskírteini</h1>\n"
-#~ "Ef þetta er valið mun slóð skírteinis móttakanda alltaf vera borin saman alla leið að rótarskírteininu.\n"
+#~ "Ef þetta er valið mun slóð skírteinis móttakanda alltaf vera borin saman "
+#~ "alla leið að rótarskírteininu.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15464,16 +15093,20 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Athuga slóð skírteina</h1>\n"
-#~ "Ef þetta er valið mun öll slóð skírteinis móttakanda vera borin saman við rótarskírteinið.\n"
+#~ "Ef þetta er valið mun öll slóð skírteinis móttakanda vera borin saman við "
+#~ "rótarskírteinið.\n"
 #~ "<p>\n"
-#~ "Athugið að það er ekki mögulegt að slökkva á því að athuga skírteini móttakanda.\n"
+#~ "Athugið að það er ekki mögulegt að slökkva á því að athuga skírteini "
+#~ "móttakanda.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15485,16 +15118,27 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Nota úreldingarlista fyrir skírteini</h1>\n"
-#~ "Úreldingarlistar innihalda skírteini sem búið er að afturkalla og ætti ekki að nota lengur til dulritunar.  Notandi gæti viljað láta úrelda skírteinið sitt ef hann eða hún hefði grun um að heilleika þess hafi verið ógnað á einhvern hátt (t.d. einhver hefði giskað á PIN númerið).\n"
+#~ "Úreldingarlistar innihalda skírteini sem búið er að afturkalla og ætti "
+#~ "ekki að nota lengur til dulritunar.  Notandi gæti viljað láta úrelda "
+#~ "skírteinið sitt ef hann eða hún hefði grun um að heilleika þess hafi "
+#~ "verið ógnað á einhvern hátt (t.d. einhver hefði giskað á PIN númerið).\n"
 #~ "<p>\n"
-#~ "Það er mælt með því að nota úreldingarlista til að auka öryggið.  Þú getur valið um hvaðan á að sækja úreldingalistana í stillingaglugganum fyrir skírteini og úreldingalista.\n"
+#~ "Það er mælt með því að nota úreldingarlista til að auka öryggið.  Þú "
+#~ "getur valið um hvaðan á að sækja úreldingalistana í stillingaglugganum "
+#~ "fyrir skírteini og úreldingalista.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15506,12 +15150,14 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gefa viðvörun ef úreldingalisti rennur brátt út</h1>\n"
-#~ "Ef þetta er valið mun þér birtast viðvörun ef einn af úreldingalistunum sem þú ert að nota rennur út bráðlega.\n"
+#~ "Ef þetta er valið mun þér birtast viðvörun ef einn af úreldingalistunum "
+#~ "sem þú ert að nota rennur út bráðlega.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15520,14 +15166,16 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gefa viðvörun ef úredlingalisti rennur út bráðlega</h1>\n"
-#~ "Hér geturðu valið hversu fljótt þú færð viðvörun áður en úreldingalisti rennur úr gildi.\n"
+#~ "Hér geturðu valið hversu fljótt þú færð viðvörun áður en úreldingalisti "
+#~ "rennur úr gildi.\n"
 #~ "<p>\n"
 #~ "Mælt er með 7 dögum fyrir SPHINX umhverfi.\n"
 #~ "</qt>"
@@ -15541,16 +15189,20 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Dulrita alltaf með eigin lykli</h1>\n"
-#~ "Ef þetta er valið munu dulrituð bréf frá þér líka vera dulrituð með þínum lykli.\n"
+#~ "Ef þetta er valið munu dulrituð bréf frá þér líka vera dulrituð með þínum "
+#~ "lykli.\n"
 #~ "<p>\n"
-#~ "Mælt er með að hafa kveikt á þessu til þess að þú getir lesið þau bréf sem þú hefur sent.\n"
+#~ "Mælt er með að hafa kveikt á þessu til þess að þú getir lesið þau bréf "
+#~ "sem þú hefur sent.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15562,16 +15214,21 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Viðvörun ef skírteini rennur út</h1>\n"
-#~ "Ef þetta er valið færðu viðvörun ef þú reynir að nota skírteini til að dulrita sem rennur út efir tilgreindan fjölda daga.\n"
+#~ "Ef þetta er valið færðu viðvörun ef þú reynir að nota skírteini til að "
+#~ "dulrita sem rennur út efir tilgreindan fjölda daga.\n"
 #~ "<p>\n"
-#~ "Mælt er með því að hafa þetta á til að koma í veg fyrir að skírteini sem renna bráðlega út séu notuð.\n"
+#~ "Mælt er með því að hafa þetta á til að koma í veg fyrir að skírteini sem "
+#~ "renna bráðlega út séu notuð.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15589,8 +15246,28 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Velja hvaða skírteini á að senda"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Sending Skírteina</h1> Án skírteinis þíns getur móttakandinn ekki gengið úr skugga um að það hafi í raun verið þú sem sendir bréfið eða hvort þriðji aðili hafi breytt því.<p> Móttakandinn getur fengið skírteinið þitt frá miðlægum þjón, en þú getur líka valið að innifela skírteinið þitt í bréfinu.  Þú getur valið hvort þú vilt hafa ekkert skírteini, aðeins þitt eigið eða alla keðjuna sem staðfesta þitt skírteini, með eða án rótarskírteininu.<p> Það er mælt með því að hafa að minnsta kosti alltaf þitt skírteini með bréfinu.<p> Þetta er sjálgefin stilling sem þú getur valið að hunsa fyrir hvert og eitt bréf. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Sending Skírteina</h1> Án skírteinis þíns getur móttakandinn "
+#~ "ekki gengið úr skugga um að það hafi í raun verið þú sem sendir bréfið "
+#~ "eða hvort þriðji aðili hafi breytt því.<p> Móttakandinn getur fengið "
+#~ "skírteinið þitt frá miðlægum þjón, en þú getur líka valið að innifela "
+#~ "skírteinið þitt í bréfinu.  Þú getur valið hvort þú vilt hafa ekkert "
+#~ "skírteini, aðeins þitt eigið eða alla keðjuna sem staðfesta þitt "
+#~ "skírteini, með eða án rótarskírteininu.<p> Það er mælt með því að hafa að "
+#~ "minnsta kosti alltaf þitt skírteini með bréfinu.<p> Þetta er sjálgefin "
+#~ "stilling sem þú getur valið að hunsa fyrir hvert og eitt bréf. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Senda þitt &eigið skírteini"
@@ -15610,16 +15287,20 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sjálfgerið að undirrita alla hluta bréfs</h1>\n"
-#~ "Ef þetta er valið er sjálfgefið að allir hlutar bréfs séu undirritaðir (þ.e. skilaboðin sjálf og öll viðhengi).\n"
+#~ "Ef þetta er valið er sjálfgefið að allir hlutar bréfs séu undirritaðir (þ."
+#~ "e. skilaboðin sjálf og öll viðhengi).\n"
 #~ "<p>\n"
-#~ "Þetta er sjálfgefin stilling sem þú getur valið að hunsa fyrir hvert og eitt bréf.\n"
+#~ "Þetta er sjálfgefin stilling sem þú getur valið að hunsa fyrir hvert og "
+#~ "eitt bréf.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15631,12 +15312,16 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Spurja áður en hver hluti er undirritaður</h1>\n"
-#~ "Þegar þetta er valið ertu spurð(ur) áður en hver hluti bréfs fyrir sig er undirritaður (þ.e. skilaboðin sjálf og öll viðhengi) um hvort þú viljir undirrita eða ekki.\n"
+#~ "Þegar þetta er valið ertu spurð(ur) áður en hver hluti bréfs fyrir sig er "
+#~ "undirritaður (þ.e. skilaboðin sjálf og öll viðhengi) um hvort þú viljir "
+#~ "undirrita eða ekki.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15650,17 +15335,20 @@ msgstr "Skrifa yfir skrá?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ekki undirrita bréf</h1>\n"
 #~ "Ef þetta er valið er sjálfgefið að engin bréf séu undirrituð.\n"
 #~ "<p>\n"
-#~ "Þetta er sjálfgefin stilling sem þú getur valið að hunsa fyrir hvert og eitt bréf.\n"
+#~ "Þetta er sjálfgefin stilling sem þú getur valið að hunsa fyrir hvert og "
+#~ "eitt bréf.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Undirritunarskírteinið er stillt á <em>skírteinis</em> síðunni."
 
 #~ msgid "RSA + SHA-1"
@@ -15672,20 +15360,33 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Undirritunaralgrím</h1>\n"
-#~ "Algrím er lýsing á því hvernig tölvan skal framkvæma ákveðið verkefni. Undirritunaralgrímið lýsir því hvernig tölvan setur undirritunarlykilinn þinn á bréfið svo að móttakandi geti gengið úr skugga um hvort þú hafir í raun sent bréfið.\n"
+#~ "Algrím er lýsing á því hvernig tölvan skal framkvæma ákveðið verkefni. "
+#~ "Undirritunaralgrímið lýsir því hvernig tölvan setur undirritunarlykilinn "
+#~ "þinn á bréfið svo að móttakandi geti gengið úr skugga um hvort þú hafir í "
+#~ "raun sent bréfið.\n"
 #~ "<p>\n"
-#~ "Valið ákvarðar hversu erfitt eða létt það er að grípa inn í og lesa bréfið. Samt sem áður eru öll algrím í SPHINX umhverfinu talin mjög örugg. Almennt mun það sjálfgefna vera í lagi hér.\n"
+#~ "Valið ákvarðar hversu erfitt eða létt það er að grípa inn í og lesa "
+#~ "bréfið. Samt sem áður eru öll algrím í SPHINX umhverfinu talin mjög "
+#~ "örugg. Almennt mun það sjálfgefna vera í lagi hér.\n"
 #~ "<p>\n"
-#~ "Þetta er sjálfgefin stilling sem þú getur hunsað fyrir hvert og eitt bréf.\n"
+#~ "Þetta er sjálfgefin stilling sem þú getur hunsað fyrir hvert og eitt "
+#~ "bréf.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15700,12 +15401,16 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Geyma bréf með undirskriftum</h1>\n"
-#~ "Þegar hakað er við hér þá eru send bréf geymd með þeim undirskriftum sem bætt hefur verið við þær. Það er mælt með þessu því þá getur þú athugað síðar hvort þú undirritaðir bréf eða hluta af því.\n"
+#~ "Þegar hakað er við hér þá eru send bréf geymd með þeim undirskriftum sem "
+#~ "bætt hefur verið við þær. Það er mælt með þessu því þá getur þú athugað "
+#~ "síðar hvort þú undirritaðir bréf eða hluta af því.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15720,12 +15425,18 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Fjölparta aðskilin undirritun</h1>\n"
-#~ "Þegar þetta er valið er undirritunin og undirrituðu gögnin aðskildir hlutar fjölparta/undirritaðs hlutar.  Hægt er að lesa undirrituð gögn bréfsins í meira að segja með póstforritum sem styðja hvorki undirritunaralgrímið né ASN.1 afkóðun.\n"
+#~ "Þegar þetta er valið er undirritunin og undirrituðu gögnin aðskildir "
+#~ "hlutar fjölparta/undirritaðs hlutar.  Hægt er að lesa undirrituð gögn "
+#~ "bréfsins í meira að segja með póstforritum sem styðja hvorki "
+#~ "undirritunaralgrímið né ASN.1 afkóðun.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15737,12 +15448,16 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Bréf undirrituð í gegn</h1>\n"
-#~ "Þegar þetta er valið eru bæði undirritunin og undirrituðu gögnin kóðuð í eina ASN.1 blokk.  Aðeins er hægt að lesa bréfin með póstforriti sem styður ASN.1 afkóðun.\n"
+#~ "Þegar þetta er valið eru bæði undirritunin og undirrituðu gögnin kóðuð í "
+#~ "eina ASN.1 blokk.  Aðeins er hægt að lesa bréfin með póstforriti sem "
+#~ "styður ASN.1 afkóðun.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15754,8 +15469,22 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Veldu hvenær þarf að slá inn PIN númerið"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN Innsláttur</h1> Hér geturðurðu valið hversu oft á að slá inn PIN númer til að fá aðgang að þín öryggisumhverfi þar sem skírteinin þín eru geymd.<p> Því oftar sem þú þarf að slá inn PIN númer, þess betur ertu varinn gegn því að bréf séu fölsuð í þínu nafni, en aftur á móti verða aðgerðir óþægilegri.</p><p> Ef þú ert óviss um hvað á að velja hér skaltu hafa þetta eins og það er.</p><p> Athugið að af öryggisástæðum er ekki hægt að slökkva algerlega á PIN innslættinum. </p></qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN Innsláttur</h1> Hér geturðurðu valið hversu oft á að slá inn "
+#~ "PIN númer til að fá aðgang að þín öryggisumhverfi þar sem skírteinin þín "
+#~ "eru geymd.<p> Því oftar sem þú þarf að slá inn PIN númer, þess betur ertu "
+#~ "varinn gegn því að bréf séu fölsuð í þínu nafni, en aftur á móti verða "
+#~ "aðgerðir óþægilegri.</p><p> Ef þú ert óviss um hvað á að velja hér skaltu "
+#~ "hafa þetta eins og það er.</p><p> Athugið að af öryggisástæðum er ekki "
+#~ "hægt að slökkva algerlega á PIN innslættinum. </p></qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Einu sinni í setu"
@@ -15772,16 +15501,21 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Aðvörun ef skírteini rennur út</h1>\n"
-#~ "Ef hakað er við hér færðu aðvörun þegar þú reynir að nota skírteini við undirritun sem rennur út eftir tilgreindan fjölda daga.\n"
+#~ "Ef hakað er við hér færðu aðvörun þegar þú reynir að nota skírteini við "
+#~ "undirritun sem rennur út eftir tilgreindan fjölda daga.\n"
 #~ "<p>\n"
-#~ "Mælt er með því að þú hafir þett á til að koma í veg fyrir að þú notir skírteini sem renna út bráðlega.\n"
+#~ "Mælt er með því að þú hafir þett á til að koma í veg fyrir að þú notir "
+#~ "skírteini sem renna út bráðlega.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15793,14 +15527,17 @@ msgstr "Skrifa yfir skrá?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Aðvörun ef netfang undirritara er ekki í skírteini</h1>\n"
-#~ "Ef hakað er við hér færðu aðvörun ef netfang þess sem undirritar er ekki í skírteininu sem notað er við undirritun.\n"
+#~ "Ef hakað er við hér færðu aðvörun ef netfang þess sem undirritar er ekki "
+#~ "í skírteininu sem notað er við undirritun.\n"
 #~ "<p>\n"
-#~ "Það er mælt með að þú hafir kveikt á þessu til að fá sem mestan heilleika.\n"
+#~ "Það er mælt með að þú hafir kveikt á þessu til að fá sem mestan "
+#~ "heilleika.\n"
 #~ "</qt>"
diff --git a/tde-i18n-it/messages/tdepim/kmail.po b/tde-i18n-it/messages/tdepim/kmail.po
index 4daf15dfedf..9c5c82b46b7 100644
--- a/tde-i18n-it/messages/tdepim/kmail.po
+++ b/tde-i18n-it/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-14 11:27+0200\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Alessandro Astarita,Andrea Rizzi,Federico Cozzi,Luigi Toscano"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -174,6 +174,12 @@ msgstr "N&essuno (usare con attenzione)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Account per gestione semiautomatica risorse"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Pulisci appunti"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -251,12 +257,12 @@ msgstr "&Nome utente (login):"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Il tuo fornitore di servizi internet ti ha dato un <em>nome utente</em> "
-"che serve per poter effettuare l'autenticazione sui loro server. In genere è la "
+"Il tuo fornitore di servizi internet ti ha dato un <em>nome utente</em> che "
+"serve per poter effettuare l'autenticazione sui loro server. In genere è la "
 "prima parte del tuo indirizzo di posta elettronica (prima di <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -278,12 +284,12 @@ msgstr "Memo&rizza password POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Seleziona questa opzione per fare in modo che KMail memorizzi la password.\n"
 "Se TDEWallet è disponibile la password sarà conservata in modo sicuro.\n"
@@ -317,11 +323,13 @@ msgstr "&Filtra i messaggi se più grandi di"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Se selezioni questa opzione, i filtri POP saranno utilizzati per decidere cosa "
-"fare con i messaggi. Puoi scaricarli, eliminarli oppure tenerli sul server."
+"Se selezioni questa opzione, i filtri POP saranno utilizzati per decidere "
+"cosa fare con i messaggi. Puoi scaricarli, eliminarli oppure tenerli sul "
+"server."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -370,13 +378,15 @@ msgstr "Testo in c&hiaro"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -419,9 +429,9 @@ msgstr "Spazio dei nomi:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Qui ci sono differenti spazi di nomi che il tuo server IMAP può supportare. "
 "Ogni spazio di nomi è un prefisso che separa dei gruppi di cartelle. Ad "
@@ -484,14 +494,14 @@ msgstr "Carica alle&gati su richiesta"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Attiva questa opzione per fare in modo che gli allegati non siano caricati "
-"automaticamente al momento della selezione del messaggio, ma solo quando viene "
-"fatto clic sull'allegato. In questo modo anche i messaggi di dimensioni più "
-"grandi possono venire visualizzati velocemente."
+"automaticamente al momento della selezione del messaggio, ma solo quando "
+"viene fatto clic sull'allegato. In questo modo anche i messaggi di "
+"dimensioni più grandi possono venire visualizzati velocemente."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -503,8 +513,8 @@ msgid ""
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
 "Controlla se ci sono sotto-cartelle solo per le cartelle aperte (espanse) "
-"nell'albero delle cartelle. Utilizza questa opzione se ci sono molte cartelle "
-"sul server."
+"nell'albero delle cartelle. Utilizza questa opzione se ci sono molte "
+"cartelle sul server."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -532,7 +542,7 @@ msgstr "<nessuno>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "posta in arrivo"
 
@@ -540,49 +550,51 @@ msgstr "posta in arrivo"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Il server non sembra supportare i numeri univoci per ogni messaggio. Questa "
 "funzionalità è necessaria per mantenere i messaggi scaricati sul server.\n"
-"Dato che alcuni server non dichiarano le loro funzionalità correttamente puoi, "
-"comunque, provare ad attivare l'opzione \"Mantieni i messaggi scaricati sul "
-"server\"."
+"Dato che alcuni server non dichiarano le loro funzionalità correttamente "
+"puoi, comunque, provare ad attivare l'opzione \"Mantieni i messaggi "
+"scaricati sul server\"."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Il server non sembra supportare lo scaricamento delle intestazioni dei "
-"messaggi. Questa funzionalità è necessaria per filtrare i messaggi sul server.\n"
-"Dato che alcuni server non dichiarano le loro funzionalità correttamente puoi, "
-"comunque, provare ad attivare il filtraggio dei messaggi sul server\"."
+"messaggi. Questa funzionalità è necessaria per filtrare i messaggi sul "
+"server.\n"
+"Dato che alcuni server non dichiarano le loro funzionalità correttamente "
+"puoi, comunque, provare ad attivare il filtraggio dei messaggi sul server\"."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Nota che questa funzionalità potrebbe causare problemi ad alcuni server POP3 "
 "che non supportano il pipelining, in quanto i messaggi potrebbero risultare "
 "danneggiati;\n"
 "questo comportamento è configurabile perché alcuni server supportano questa "
 "funzionalità ma non la rendono pubblica. Per verificare le funzionalità "
-"supportate dal server POP3, utilizza il pulsante in basso a questa finestra di "
-"dialogo;\n"
+"supportate dal server POP3, utilizza il pulsante in basso a questa finestra "
+"di dialogo;\n"
 "se il tuo server non dichiara di supportare il pipelining, ma desideri "
 "scaricare la posta in modo più veloce, puoi verificare se il server supporta "
-"effettivamente questa funzionalità inviando a te stesso una serie di messaggi e "
-"provare a scaricarli."
+"effettivamente questa funzionalità inviando a te stesso una serie di "
+"messaggi e provare a scaricarli."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -590,53 +602,53 @@ msgstr "Specifica prima un server ed una porta nella linguetta \"Generale\"."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Il server non sembra supportare il pipelining; quindi, questa opzione è stata "
-"disabilitata.\n"
-"Dato che alcuni server non dichiarano le loro funzionalità correttamente puoi, "
-"comunque, provare ad attivare il pipelining. Considera, però, che questa ciò "
-"potrebbe causare problemi ad alcuni server POP3 che non supportano il "
-"pipelining, in quanto i messaggi potrebbero risultare danneggiati. Quindi è "
-"importante che prima di utilizzare questa possibilità, tu faccia alcuni test, "
-"inviando a te stesso e provando a scaricare un numero elevato di messaggi dal "
-"tuo server POP."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Il server non sembra supportare il pipelining; quindi, questa opzione è "
+"stata disabilitata.\n"
+"Dato che alcuni server non dichiarano le loro funzionalità correttamente "
+"puoi, comunque, provare ad attivare il pipelining. Considera, però, che "
+"questa ciò potrebbe causare problemi ad alcuni server POP3 che non "
+"supportano il pipelining, in quanto i messaggi potrebbero risultare "
+"danneggiati. Quindi è importante che prima di utilizzare questa possibilità, "
+"tu faccia alcuni test, inviando a te stesso e provando a scaricare un numero "
+"elevato di messaggi dal tuo server POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Il server non sembra supportare i numeri univoci per ogni messaggio. Questa "
-"funzionalità è necessaria per mantenere i messaggi scaricati sul server, quindi "
-"quest'ultima opzione è stata disabilita.\n"
-"Dato che alcuni server non dichiarano le loro funzionalità correttamente puoi, "
-"comunque, provare ad attivare l'opzione \"Mantieni i messaggi scaricati sul "
-"server\"."
+"funzionalità è necessaria per mantenere i messaggi scaricati sul server, "
+"quindi quest'ultima opzione è stata disabilita.\n"
+"Dato che alcuni server non dichiarano le loro funzionalità correttamente "
+"puoi, comunque, provare ad attivare l'opzione \"Mantieni i messaggi "
+"scaricati sul server\"."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Il server non sembra supportare lo scaricamento delle intestazioni dei "
-"messaggi. Questa funzionalità è necessaria per filtrare i messaggi sul server, "
-"quindi quest'ultima opzione è stata disabilita.\n"
-"Dato che alcuni server non dichiarano le loro funzionalità correttamente puoi, "
-"comunque, provare ad attivare il filtraggio dei messaggi sul server\"."
+"messaggi. Questa funzionalità è necessaria per filtrare i messaggi sul "
+"server, quindi quest'ultima opzione è stata disabilita.\n"
+"Dato che alcuni server non dichiarano le loro funzionalità correttamente "
+"puoi, comunque, provare ad attivare il filtraggio dei messaggi sul server\"."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -716,8 +728,8 @@ msgstr "Account IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Devi aggiungere un account nella sezione rete delle impostazioni per poter "
 "ricevere la posta."
@@ -756,14 +768,14 @@ msgstr "Benvenuto in KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Sembra che sia la prima volta che esegui KMail. Puoi utilizzare la "
 "procedura guidata per configurare i tuoi account di posta. Basta inserire i "
-"dati della connessione che hai ricevuto dal tuo fornitore di posta elettronica "
-"nelle pagine seguenti.</qt>"
+"dati della connessione che hai ricevuto dal tuo fornitore di posta "
+"elettronica nelle pagine seguenti.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -825,8 +837,7 @@ msgstr "Utilizza consegna locale"
 msgid "Server Information"
 msgstr "Informazioni server"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nessuno"
@@ -947,7 +958,8 @@ msgstr ""
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>La cartella dei messaggi classificati come non certi (probabile spam) è <i>"
+"<p>La cartella dei messaggi classificati come non certi (probabile spam) è "
+"<i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -967,37 +979,36 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Qui puoi ricevere assistenza all'impostazione delle regole di filtro per "
-"usare alcuni strumenti anti-virus comuni.</p> "
-"<p>La procedura guidata può rilevare questi strumenti sul tuo computer e può "
-"creare le regole di filtro appropriate per classificare i messaggi contenenti "
-"virus. La procedura non prenderà in considerazione alcuna regola di filtro "
-"esistente: le nuove regole saranno aggiunte a quelle esistenti.</p> "
-"<p><b>Attenzione:</b> dato che KMail viene bloccato durante la scansione dei "
-"messaggi per i virus, potresti incontrare problemi di responsività, in quanto, "
-"generalmente, agli strumenti anti-virus serve molto tempo; se lo ritieni "
-"opportuno, considera di eliminare le regole di filtro create dalla procedura "
-"guidata tornando indietro alla situazione precedente."
+"usare alcuni strumenti anti-virus comuni.</p> <p>La procedura guidata può "
+"rilevare questi strumenti sul tuo computer e può creare le regole di filtro "
+"appropriate per classificare i messaggi contenenti virus. La procedura non "
+"prenderà in considerazione alcuna regola di filtro esistente: le nuove "
+"regole saranno aggiunte a quelle esistenti.</p> <p><b>Attenzione:</b> dato "
+"che KMail viene bloccato durante la scansione dei messaggi per i virus, "
+"potresti incontrare problemi di responsività, in quanto, generalmente, agli "
+"strumenti anti-virus serve molto tempo; se lo ritieni opportuno, considera "
+"di eliminare le regole di filtro create dalla procedura guidata tornando "
+"indietro alla situazione precedente."
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Seleziona uno strumento da utilizzare per il riconoscimento e poi vai alla "
-"pagina successiva.</p>"
+"<p>Seleziona uno strumento da utilizzare per il riconoscimento e poi vai "
+"alla pagina successiva.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1025,16 +1036,14 @@ msgstr "Sposta lo spam &probabile in:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "La cartella predefinita è posta in arrivo, ma puoi sempre modificarla qui "
-"sotto. "
-"<p>Non tutti gli strumenti classificano lo spam come non certo. Se non hai "
-"selezionato un programma che gestisce questa funzionalità, non puoi selezionare "
-"la cartella."
+"sotto. <p>Non tutti gli strumenti classificano lo spam come non certo. Se "
+"non hai selezionato un programma che gestisce questa funzionalità, non puoi "
+"selezionare la cartella."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1044,13 +1053,13 @@ msgstr "Controlla i messaggi utilizzando gli strumenti anti-virus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Fai in modo che i messaggi vengano controllati dagli strumenti anti-virus. La "
-"procedura guidata creerà i filtri appropriati. I messaggi vengono generalmente "
-"segnati in modo che i filtri possano agire su di essi e, per esempio, spostare "
-"i messaggi considerati virus in una cartella particolare."
+"Fai in modo che i messaggi vengano controllati dagli strumenti anti-virus. "
+"La procedura guidata creerà i filtri appropriati. I messaggi vengono "
+"generalmente segnati in modo che i filtri possano agire su di essi e, per "
+"esempio, spostare i messaggi considerati virus in una cartella particolare."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1059,12 +1068,12 @@ msgstr "Sposta i messaggi considerati virus nella cartella selezionata"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "È stato creato un filtro per rilevare i messaggi considerati virus infetti e "
-"per spostarli in una cartella predefinita. In genere, è la cartella cestino, ma "
-"è possibile cambiarla."
+"per spostarli in una cartella predefinita. In genere, è la cartella cestino, "
+"ma è possibile cambiarla."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1072,8 +1081,8 @@ msgstr "Inoltre, segna i messaggi considerati virus come letti"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Segna i messaggi che sono stati classificati virus, come letti, al momento "
 "dello spostamento nella cartella selezionata."
@@ -1257,8 +1266,8 @@ msgid ""
 "communication is here:"
 msgstr ""
 "Questo può avvenire perché non hai i permessi per farlo oppure perché la "
-"cartella è già presente sul server; il messaggio di errore della comunicazione "
-"con il server è il seguente:"
+"cartella è già presente sul server; il messaggio di errore della "
+"comunicazione con il server è il seguente:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1271,8 +1280,8 @@ msgstr "Errore durante la lettura della cartella %1 sul server: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1292,8 +1301,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1324,17 +1333,17 @@ msgstr "Eliminato"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Nessuna delle tue identità corrisponde al destinatario di questo messaggio,"
-"<br>scegli quale dei seguenti indirizzi è il tuo (se esiste):"
+"<qt>Nessuna delle tue identità corrisponde al destinatario di questo "
+"messaggio,<br>scegli quale dei seguenti indirizzi è il tuo (se esiste):"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Diverse identità corrispondono al destinatario di questo messaggio,"
 "<br>scegli quale dei seguenti indirizzi è il tuo:"
@@ -1366,18 +1375,21 @@ msgstr "Errore durante la compattazione di \"%1\". Compattazione annullata."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Questa impostazione è stata fatta dal tuo amministratore di sistema.</p> "
-"<p>Se pensi che sia un errore, contattalo.</p></qt>"
+"<qt> <p>Questa impostazione è stata fatta dal tuo amministratore di sistema."
+"</p> <p>Se pensi che sia un errore, contattalo.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Carica profilo..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configura account"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Aggiungi..."
@@ -1407,6 +1419,11 @@ msgstr "<qt>Vuoi davvero rimuovere l'identità <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Rimuovi identità"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Ri&muovi"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Aggiungi..."
@@ -1415,6 +1432,11 @@ msgstr "Aggiungi..."
 msgid "Modify..."
 msgstr "Modifica..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Ri&muovi"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Imposta come predefinito"
@@ -1431,17 +1453,15 @@ msgstr "&Spedizione"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Account di uscita (aggiungine almeno uno):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
@@ -1463,8 +1483,7 @@ msgstr "Imposta come predefinito"
 msgid "Common Options"
 msgstr "Opzioni comuni"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Conferma &prima di spedire"
@@ -1515,17 +1534,16 @@ msgstr "Dominio predefini&to:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Il dominio predefinito è utilizzato per il completamento degli indirizzi di "
-"posta elettronica costituiti solo dal nome utente.</p></qt>"
+"<qt> <p>Il dominio predefinito è utilizzato per il completamento degli "
+"indirizzi di posta elettronica costituiti solo dal nome utente.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1543,9 +1561,9 @@ msgstr "Aggiungi trasporto"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (predefinito)"
 
@@ -1630,6 +1648,10 @@ msgstr "Modifica account"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Impossibile trovare l'account <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Color&i"
@@ -1738,8 +1760,7 @@ msgstr "Collegamento visitato"
 msgid "Misspelled Words"
 msgstr "Parole sbagliate"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nuovo messaggio"
@@ -1927,8 +1948,8 @@ msgstr "Conversazioni ridotte in maniera predefinita"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Apri conversazioni sorvegliate o contenenti &messaggi nuovi, non letti o "
 "importanti."
@@ -1939,71 +1960,55 @@ msgstr "Visualizzazione data"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt> "
-"<p><strong>Per la visualizzazione della data possono essere utilizzati i "
-"seguenti formati:</strong></p> "
-"<ul> "
-"<li>d - il giorno come numero senza lo zero iniziale (1 - 31)</li> "
-"<li>dd - il giorno come numero con lo zero iniziale (01 - 31)</li> "
-"<li>ddd - l'abbreviazione del giorno della settimana (lun - dom)</li> "
-"<li>dddd - il giorno della settimana in modo esteso (lunedì - domenica)</li> "
-"<li>M - il mese come numero senza lo zero iniziale (1 - 12)</li> "
-"<li>MM - il mese come numero con lo zero iniziale (01 - 13)</li> "
-"<li>MMM - l'abbreviazione del mese (gen - dic)</li> "
-"<li>MMMM - il mese in modo esteso (gennaio - dicembre)</li> "
-"<li>yy - l'anno come numero a due cifre (00 - 99)</li> "
-"<li>yyyy - l'anno come numero a quattro cifre (0000 - 9999)</li></ul> "
-"<p><strong>Per la visualizzazione dell'ora possono essere utilizzati i seguenti "
-"formati:</string></p> "
-"<ul> "
-"<li>h - l'ora senza lo zero iniziale (0 - 23 oppure 1 - 12 in caso di "
-"visualizzazione AM/PM)</li> "
-"<li>hh - l'ora con lo zero iniziale (00 - 23 oppure 01 - 12 in caso di "
-"visualizzazione AM/PM)</li> "
-"<li>m - i minuti senza lo zero iniziale (0 - 59)</li> "
-"<li>mm - i minuti con lo zero iniziale (00 - 59)</li> "
-"<li>s - i secondi senza lo zero iniziale (0 - 59)</li> "
-"<li>ss - i secondi con lo zero iniziale (00 - 59)</li> "
-"<li>z - i millisecondi senza gli zero iniziali (0 - 999)</li> "
-"<li>zzz - i millisecondi con gli zero iniziali (000 - 999)</li> "
-"<li>ap - passa al formato AM/PM. ap sarà sostituito da \"am\" oppure da "
-"\"pm\".</li> "
-"<li>Z - fuso orario in forma numerica (-0500)</li></ul> "
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt> <p><strong>Per la visualizzazione della data possono essere utilizzati "
+"i seguenti formati:</strong></p> <ul> <li>d - il giorno come numero senza lo "
+"zero iniziale (1 - 31)</li> <li>dd - il giorno come numero con lo zero "
+"iniziale (01 - 31)</li> <li>ddd - l'abbreviazione del giorno della settimana "
+"(lun - dom)</li> <li>dddd - il giorno della settimana in modo esteso (lunedì "
+"- domenica)</li> <li>M - il mese come numero senza lo zero iniziale (1 - "
+"12)</li> <li>MM - il mese come numero con lo zero iniziale (01 - 13)</li> "
+"<li>MMM - l'abbreviazione del mese (gen - dic)</li> <li>MMMM - il mese in "
+"modo esteso (gennaio - dicembre)</li> <li>yy - l'anno come numero a due "
+"cifre (00 - 99)</li> <li>yyyy - l'anno come numero a quattro cifre (0000 - "
+"9999)</li></ul> <p><strong>Per la visualizzazione dell'ora possono essere "
+"utilizzati i seguenti formati:</string></p> <ul> <li>h - l'ora senza lo zero "
+"iniziale (0 - 23 oppure 1 - 12 in caso di visualizzazione AM/PM)</li> <li>hh "
+"- l'ora con lo zero iniziale (00 - 23 oppure 01 - 12 in caso di "
+"visualizzazione AM/PM)</li> <li>m - i minuti senza lo zero iniziale (0 - "
+"59)</li> <li>mm - i minuti con lo zero iniziale (00 - 59)</li> <li>s - i "
+"secondi senza lo zero iniziale (0 - 59)</li> <li>ss - i secondi con lo zero "
+"iniziale (00 - 59)</li> <li>z - i millisecondi senza gli zero iniziali (0 - "
+"999)</li> <li>zzz - i millisecondi con gli zero iniziali (000 - 999)</li> "
+"<li>ap - passa al formato AM/PM. ap sarà sostituito da \"am\" oppure da \"pm"
+"\".</li> <li>Z - fuso orario in forma numerica (-0500)</li></ul> "
 "<p><strong>Tutti gli altri caratteri saranno ignorati.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Modificare le impostazioni globali delle conversazioni sostituirà tutte le "
 "opzioni specifiche delle cartelle."
@@ -2020,8 +2025,7 @@ msgstr "Mostra la &barra di stato HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Mostra lo stato dello s&pam nelle intestazioni eleganti"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Sostituisci le faccine con le emoticon"
@@ -2030,8 +2034,7 @@ msgstr "Sostituisci le faccine con le emoticon"
 msgid "Use smaller font for quoted text"
 msgstr "Utilizza caratteri più piccoli per il testo citato"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Mostra i segni di citazione espandi/riduci"
@@ -2057,8 +2060,7 @@ msgstr "Automatica"
 msgid "&Override character encoding:"
 msgstr "F&orza la codifica dei caratteri:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Abilita icona del vassoio di sistema"
@@ -2160,24 +2162,20 @@ msgstr "<b>%f</b> sarà sostituito con il nome del file da modificare."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>Nelle frasi di risposta sono ammesse le seguenti sequenze speciali: "
-"<br><b>%D</b>: data, <b>%S</b>: oggetto, "
-"<br><b>%e</b>: indirizzo del mittente, <b>%F</b>: nome del mittente, <b>%f</b>"
-": iniziali del mittente,"
+"<br><b>%D</b>: data, <b>%S</b>: oggetto, <br><b>%e</b>: indirizzo del "
+"mittente, <b>%F</b>: nome del mittente, <b>%f</b>: iniziali del mittente,"
 "<br><b>%T</b>: nome del destinatario, <b>%t</b>: nome e indirizzo del "
-"destinatario, "
-"<br><b>%C</b>: nomi in copia carbone, <b>%c</b>: nomi e indirizzi in copia "
-"carbone, "
-"<br><b>%%</b>: simbolo di percentuale, <b>%_</b>: spazio, <b>%L</b>"
-": fine riga</qt>"
+"destinatario, <br><b>%C</b>: nomi in copia carbone, <b>%c</b>: nomi e "
+"indirizzi in copia carbone, <br><b>%%</b>: simbolo di percentuale, <b>%_</"
+"b>: spazio, <b>%L</b>: fine riga</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2200,21 +2198,20 @@ msgstr "Rispond&i a tutti:"
 msgid "&Forward:"
 msgstr "&Inoltra:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Carattere di &citazione:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Alle %D, hai scritto:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Alle %D, %F ha scritto:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Messaggio inoltrato"
 
@@ -2253,8 +2250,8 @@ msgstr "Inserisci nuovo prefisso per l'inoltro:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Questo elenco è controllato per ogni messaggio in uscita dall'alto verso il "
 "basso per un insieme di caratteri che contenga tutti i caratteri richiesti."
@@ -2293,10 +2290,9 @@ msgstr "Valore"
 msgid "Ne&w"
 msgstr "N&uovo"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nome:"
@@ -2305,16 +2301,15 @@ msgstr "&Nome:"
 msgid "&Value:"
 msgstr "&Valore:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomi degli allegati compatibili con Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Abilita questa opzione per rendere i nomi dei tuoi allegati che contengono "
 "caratteri non standard, compatibili con Outlook(tm)"
@@ -2326,7 +2321,8 @@ msgstr "A&bilita rilevamento di allegati mancanti"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Riconosci una delle seguenti parole chiave come intenzione di allegare un file:"
+"Riconosci una delle seguenti parole chiave come intenzione di allegare un "
+"file:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2344,20 +2340,20 @@ msgstr "allegato"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Hai scelto di codificare i nomi degli allegati contenenti caratteri non "
 "standard in modo da essere compatibili con Outlook(tm) e altri programmi di "
 "posta.\n"
-"Nota che KMail, in questo modo, potrebbe creare dei messaggi che potrebbero non "
-"essere riconosciuti da altri programmi di posta; quindi, si consiglia di non "
-"abilitare questa opzione."
+"Nota che KMail, in questo modo, potrebbe creare dei messaggi che potrebbero "
+"non essere riconosciuti da altri programmi di posta; quindi, si consiglia di "
+"non abilitare questa opzione."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2381,115 +2377,102 @@ msgstr "&Moduli crittografici"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>I messaggi qualche volta sono in entrambi i formati. Questa opzione permette "
-"di scegliere se visualizzare la parte HTML o quella in testo semplice.</p>"
-"<p>Se scegli la parte HTML, il messaggio verrà visualizzato in maniera "
-"migliore, ma allo stesso tempo può aumentare la probabilità che il tuo sistema "
-"venga compromesso da attacchi presenti o futuri.</p> "
-"<p>Se scegli invece la parte in testo semplice, si perderanno gran parte delle "
-"formattazioni del messaggio, ma ciò renderà <em>impossibile</em> "
-"sfruttare buchi di sicurezza in Konqueror (il programma che si occupa di "
-"visualizzare l'HTML).</p>"
-"<p>L'opzione seguente permette di evitare un utilizzo improprio dei messaggi "
-"HTML, ma non può nulla contro i problemi di sicurezza non conosciuti al momento "
-"in cui KMail è stato scritto.</p>"
-"<p>È, comunque, consigliato di <em>non</em> preferire l'HTML al testo "
-"semplice.</p> "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>I messaggi qualche volta sono in entrambi i formati. Questa opzione "
+"permette di scegliere se visualizzare la parte HTML o quella in testo "
+"semplice.</p><p>Se scegli la parte HTML, il messaggio verrà visualizzato in "
+"maniera migliore, ma allo stesso tempo può aumentare la probabilità che il "
+"tuo sistema venga compromesso da attacchi presenti o futuri.</p> <p>Se "
+"scegli invece la parte in testo semplice, si perderanno gran parte delle "
+"formattazioni del messaggio, ma ciò renderà <em>impossibile</em> sfruttare "
+"buchi di sicurezza in Konqueror (il programma che si occupa di visualizzare "
+"l'HTML).</p><p>L'opzione seguente permette di evitare un utilizzo improprio "
+"dei messaggi HTML, ma non può nulla contro i problemi di sicurezza non "
+"conosciuti al momento in cui KMail è stato scritto.</p><p>È, comunque, "
+"consigliato di <em>non</em> preferire l'HTML al testo semplice.</p> "
 "<p><b>Nota bene:</b> puoi impostare questa opzione cartella per cartella dal "
 "menu <i>Cartella</i> dalla finestra principale di KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Alcuni messaggi pubblicitari sono in formato HTML e contengono collegamenti "
-"a immagini sulla rete che potrebbero essere usate dal mittente per capire che "
-"hai letto il loro messaggio (&quot;web bugs&quot;).</p> "
-"<p> Non c'è nessun valido motivo per caricare queste immagini dalla rete, dato "
-"che il mittente avrebbe potuto inviartele in allegato.</p>"
-"<p> Per salvaguardarsi da questo tipo di uso dei messaggi in HTML, questa "
-"opzione è <em>disabilitata</em> in modo predefinito.</p> "
-"<p>Se vuoi vedere comunque le immagini HTML che non sono state allegate, puoi "
-"abilitare questa opzione ma dovresti fare molta attenzione.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p> Alcuni messaggi pubblicitari sono in formato HTML e contengono "
+"collegamenti a immagini sulla rete che potrebbero essere usate dal mittente "
+"per capire che hai letto il loro messaggio (&quot;web bugs&quot;).</p> <p> "
+"Non c'è nessun valido motivo per caricare queste immagini dalla rete, dato "
+"che il mittente avrebbe potuto inviartele in allegato.</p><p> Per "
+"salvaguardarsi da questo tipo di uso dei messaggi in HTML, questa opzione è "
+"<em>disabilitata</em> in modo predefinito.</p> <p>Se vuoi vedere comunque le "
+"immagini HTML che non sono state allegate, puoi abilitare questa opzione ma "
+"dovresti fare molta attenzione.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt> "
-"<h3>Politica di notifica delle disposizioni sul messaggio (MDN)</h3> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt> <h3>Politica di notifica delle disposizioni sul messaggio (MDN)</h3> "
 "<p>Le notifiche delle disposizioni sul messaggio (MDN), sono una "
-"generalizzazione delle più comuni <b>ricevute di lettura</b>"
-". L'autore del messaggio richiede l'invio di una notifica delle disposizioni ed "
-"il programma di posta del destinatario genera una risposta dalla quale il "
+"generalizzazione delle più comuni <b>ricevute di lettura</b>. L'autore del "
+"messaggio richiede l'invio di una notifica delle disposizioni ed il "
+"programma di posta del destinatario genera una risposta dalla quale il "
 "mittente può venire a conoscenza di cosa è accaduto al suo messaggio. Le "
-"disposizioni più comuni sono <b>visualizzato</b> (es. letto), <b>eliminato</b> "
-"e <b>diffuso</b> (es. inoltrato).</p> "
-"<p>Sono disponibili le seguenti opzioni per l'invio di MDN:</p> "
-"<ul> "
-"<li><em>Ignora</em>: ignora ogni richiesta di notifica delle disposizioni. "
-"Nessun MDN verrà inviato automaticamente (raccomandato).</li> "
-"<li><em>Chiedi</em>: risponde alle richieste solo dopo aver chiesto all'utente. "
-"In questo modo puoi inviare le MDN solo per alcuni messaggi e rifiutare o "
-"ignorare gli altri.</li> "
-"<li><em>Nega</em>: invia sempre una notifica <b>negato</b>. Questo è solo <em>"
-"un po'</em> meglio che inviare sempre una MDN. L'autore del messaggio è sempre "
-"in grado di conoscere che il messaggio è stato visualizzato, egli però non può "
-"sapere se è stato eliminato o letto, ecc...</li> "
-"<li><em>Invia sempre</em>: invia sempre la notifica delle disposizioni "
-"richiesta. Ciò significa che l'autore del messaggio può sempre sapere quando il "
-"messaggio è stato letto ed in più cosa gli è accaduto (visualizzato, eliminato, "
-"ecc...). Questa opzione è fortemente sconsigliata, ma dato che può avere senso "
-"nei rapporti fra clienti, è stata resa disponibile.</li></ul></qt>"
+"disposizioni più comuni sono <b>visualizzato</b> (es. letto), <b>eliminato</"
+"b> e <b>diffuso</b> (es. inoltrato).</p> <p>Sono disponibili le seguenti "
+"opzioni per l'invio di MDN:</p> <ul> <li><em>Ignora</em>: ignora ogni "
+"richiesta di notifica delle disposizioni. Nessun MDN verrà inviato "
+"automaticamente (raccomandato).</li> <li><em>Chiedi</em>: risponde alle "
+"richieste solo dopo aver chiesto all'utente. In questo modo puoi inviare le "
+"MDN solo per alcuni messaggi e rifiutare o ignorare gli altri.</li> "
+"<li><em>Nega</em>: invia sempre una notifica <b>negato</b>. Questo è solo "
+"<em>un po'</em> meglio che inviare sempre una MDN. L'autore del messaggio è "
+"sempre in grado di conoscere che il messaggio è stato visualizzato, egli "
+"però non può sapere se è stato eliminato o letto, ecc...</li> <li><em>Invia "
+"sempre</em>: invia sempre la notifica delle disposizioni richiesta. Ciò "
+"significa che l'autore del messaggio può sempre sapere quando il messaggio è "
+"stato letto ed in più cosa gli è accaduto (visualizzato, eliminato, ecc...). "
+"Questa opzione è fortemente sconsigliata, ma dato che può avere senso nei "
+"rapporti fra clienti, è stata resa disponibile.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2505,15 +2488,15 @@ msgstr "Permetti ai messaggi di caricare riferimenti e&sterni da Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>ATTENZIONE:</b> Permettere l'uso dell'HTML nella posta elettronica può "
 "aumentare il rischio che il sistema venga compromesso da attacchi presenti o "
-"futuri. <a href=\"whatsthis:%1\">Informazioni sui messaggi in HTML...</a> "
-"<a href=\"whatsthis:%2\">Riferimenti esterni...</a>"
+"futuri. <a href=\"whatsthis:%1\">Informazioni sui messaggi in HTML...</a> <a "
+"href=\"whatsthis:%2\">Riferimenti esterni...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2572,8 +2555,9 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>ATTENZIONE:</b> l'uso incondizionato delle conferme potrebbe compromettere "
-"la tua privacy. <a href=\"whatsthis:%1\">Maggiori informazioni...</a>"
+"<b>ATTENZIONE:</b> l'uso incondizionato delle conferme potrebbe "
+"compromettere la tua privacy. <a href=\"whatsthis:%1\">Maggiori "
+"informazioni...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2594,8 +2578,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Questa opzione richiede dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "nessun proxy"
@@ -2624,8 +2607,8 @@ msgstr "E&scludi messaggi importanti dalla procedura di scadenza"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Durante la ricerca di messaggi non letti:"
 
@@ -2649,8 +2632,8 @@ msgstr "Itera in tutte le cartelle"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "All'apertura di una cartella:"
 
@@ -2720,28 +2703,24 @@ msgstr "Directory (formato \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Questa opzione ti permette di scegliere il formato predefinito per le "
-"cartelle locali:</p>"
-"<p><b>mbox:</b> Le cartelle di posta di KMail vengono archiviate ognuna in un "
-"singolo file. I vari messaggi sono separati da una riga che comincia con \"From "
-"\". In questo modo si risparmia spazio su disco, ma il sistema è meno robusto, "
-"ad esempio quando si spostano messaggi da una cartella all'altra.</p>"
-"<p><b>maildir:</b> Le cartelle di posta di KMail sono rappresentate da cartelle "
-"vere e proprie sul disco. Ogni messaggio di posta è un file separato. In questo "
-"modo lo spazio utilizzato è di poco maggiore, ma il sistema è più robusto.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Questa opzione ti permette di scegliere il formato predefinito per le "
+"cartelle locali:</p><p><b>mbox:</b> Le cartelle di posta di KMail vengono "
+"archiviate ognuna in un singolo file. I vari messaggi sono separati da una "
+"riga che comincia con \"From \". In questo modo si risparmia spazio su "
+"disco, ma il sistema è meno robusto, ad esempio quando si spostano messaggi "
+"da una cartella all'altra.</p><p><b>maildir:</b> Le cartelle di posta di "
+"KMail sono rappresentate da cartelle vere e proprie sul disco. Ogni "
+"messaggio di posta è un file separato. In questo modo lo spazio utilizzato è "
+"di poco maggiore, ma il sistema è più robusto.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2774,54 +2753,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Quando si passa al successivo messaggio non letto, può accadere che non ce "
-"ne siano altri.</p>"
-"<p><b>Non iterare:</b> La ricerca si fermerà all'ultimo messaggio nella "
-"cartella attuale.</p> "
-"<p><b>Itera nella cartella corrente:</b> La ricerca continuerà dall'inizio "
-"dell'elenco dei messaggi ma senza proseguire in un'altra cartella.</p>"
-"<p><b>Itera in tutte le cartelle:</b> La ricerca continuerà dall'inizio "
-"dell'elenco dei messaggi. Se nessun messaggio verrà trovato continuerà nella "
-"cartella successiva.</p>"
-"<p>In maniera analoga, la ricerca del precedente messaggio non letto comincerà "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Quando si passa al successivo messaggio non letto, può accadere che "
+"non ce ne siano altri.</p><p><b>Non iterare:</b> La ricerca si fermerà "
+"all'ultimo messaggio nella cartella attuale.</p> <p><b>Itera nella cartella "
+"corrente:</b> La ricerca continuerà dall'inizio dell'elenco dei messaggi ma "
+"senza proseguire in un'altra cartella.</p><p><b>Itera in tutte le cartelle:</"
+"b> La ricerca continuerà dall'inizio dell'elenco dei messaggi. Se nessun "
+"messaggio verrà trovato continuerà nella cartella successiva.</p><p>In "
+"maniera analoga, la ricerca del precedente messaggio non letto comincerà "
 "dalla fine dell'elenco dei messaggi per poi proseguire nella cartella "
 "precedente.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>L'indicizzazione \"full text\" permette di effettuare ricerche molto veloci "
-"all'interno dei messaggi. In più, la barra degli strumenti selezionerà i "
-"messaggi a seconda del contenuto.</p> "
-"<p>Tale tipo di indicizzazione occupa una certa quantità di spazio disco (circa "
-"metà dello spazio occupato dai messaggi).</p> "
-"<p>Dopo aver abilitato questa opzione, l'indice dovrà essere costruito, ma sarà "
-"comunque possibile utilizzare KMail durante questa procedura.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt> <p>L'indicizzazione \"full text\" permette di effettuare ricerche molto "
+"veloci all'interno dei messaggi. In più, la barra degli strumenti "
+"selezionerà i messaggi a seconda del contenuto.</p> <p>Tale tipo di "
+"indicizzazione occupa una certa quantità di spazio disco (circa metà dello "
+"spazio occupato dai messaggi).</p> <p>Dopo aver abilitato questa opzione, "
+"l'indice dovrà essere costruito, ma sarà comunque possibile utilizzare KMail "
+"durante questa procedura.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2843,8 +2813,8 @@ msgstr "&Formato da utilizzare per le cartelle di groupware:"
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
-"Scegli il formato da utilizzare per memorizzare il contenuto delle cartelle di "
-"groupware."
+"Scegli il formato da utilizzare per memorizzare il contenuto delle cartelle "
+"di groupware."
 
 #: configuredialog.cpp:4840
 msgid "Deprecated Kolab1 (iCal/vCard)"
@@ -2889,11 +2859,11 @@ msgstr "&Nascondi cartelle di groupware"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Quando questa opzione è impostata, le cartelle della risorsa IMAP non verranno "
-"visualizzate nell'albero delle cartelle."
+"Quando questa opzione è impostata, le cartelle della risorsa IMAP non "
+"verranno visualizzate nell'albero delle cartelle."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2901,8 +2871,8 @@ msgstr "Mostra &solo le cartelle groupware di questo account"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Quando questa opzione è impostata, le cartelle di posta normali non verranno "
 "mostrate per l'account groupware configurato."
@@ -2916,8 +2886,8 @@ msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
-"Sincronizza le modifiche di groupware nelle cartelle di tipo IMAP disconnesso "
-"non appena ritorni in linea."
+"Sincronizza le modifiche di groupware nelle cartelle di tipo IMAP "
+"disconnesso non appena ritorni in linea."
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -2936,8 +2906,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Abilita questa opzione per rendere le tue risposte agli inviti, compatibili con "
-"Outlook(tm)"
+"Abilita questa opzione per rendere le tue risposte agli inviti, compatibili "
+"con Outlook(tm)"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2948,8 +2918,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Abilita questa opzione per rendere le tue risposte agli inviti, compatibili con "
-"Outlook(tm)"
+"Abilita questa opzione per rendere le tue risposte agli inviti, compatibili "
+"con Outlook(tm)"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2964,23 +2934,22 @@ msgid ""
 "compatible way."
 msgstr ""
 "Microsoft Outlook, quando utilizzato in combinazione con il server Microsoft "
-"Exchange, ha dei problemi di compatibilità con i messaggi di groupware. Abilita "
-"questa opzione per spedire inviti di groupware in modo che Microsoft Exchange "
-"non dia problemi."
+"Exchange, ha dei problemi di compatibilità con i messaggi di groupware. "
+"Abilita questa opzione per spedire inviti di groupware in modo che Microsoft "
+"Exchange non dia problemi."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Nomi degli allegati compatibili con Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Invio automatico degli inviti"
@@ -2996,24 +2965,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Gli inviti vengono generalmente spediti come allegato. Questa opzione fa in "
-"modo che vengano spediti come testo del messaggio; ciò è necessario quando "
-"bisogna inviare inviti a Microsoft Outlook. "
-"<br>Attivando questa opzione, però, non è più possibile avere un testo "
-"descrittivo che i programmi di posta possano leggere; in questo modo le persone "
-"che hanno programmi di posta che non possono visualizzare gli inviti, "
-"riceveranno un messaggio formattato male. "
-"<br>Le persone che hanno, invece, dei programmi di posta che possono "
-"visualizzare gli inviti non avranno problemi.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Gli inviti vengono generalmente spediti come allegato. Questa opzione fa "
+"in modo che vengano spediti come testo del messaggio; ciò è necessario "
+"quando bisogna inviare inviti a Microsoft Outlook. <br>Attivando questa "
+"opzione, però, non è più possibile avere un testo descrittivo che i "
+"programmi di posta possano leggere; in questo modo le persone che hanno "
+"programmi di posta che non possono visualizzare gli inviti, riceveranno un "
+"messaggio formattato male. <br>Le persone che hanno, invece, dei programmi "
+"di posta che possono visualizzare gli inviti non avranno problemi.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3117,30 +3085,28 @@ msgstr "Inoltro"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Qui puoi aggiungere, modificare ed eliminare i modelli personalizzati dei "
-"messaggi da utilizzare nella composizione di risposte o di inoltri. Crea il "
-"modello personalizzato selezionandolo attraverso il pulsante destro del mouse o "
-"dalla barra degli strumenti. In più, puoi abbinare una combinazione di tasti al "
-"modello per essere più veloce.</p> "
-"<p>I modelli di messaggio permettono la sostituzione dei comandi semplicemente "
-"digitandoli o selezionandoli dal menu <i>Inserisci comando</i>.</p> "
-"<p>Ci sono quattro tipi di modelli personalizzati: <i>Rispondi</i>, <i>"
-"Rispondi a tutti</i>, <i>Inoltra</i> e <i>Generale</i>"
-", utilizzabili per ogni tipo di operazione. Non puoi abbinare una scorciatoia "
-"al modello <i>Generale</i>.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt> <p>Qui puoi aggiungere, modificare ed eliminare i modelli "
+"personalizzati dei messaggi da utilizzare nella composizione di risposte o "
+"di inoltri. Crea il modello personalizzato selezionandolo attraverso il "
+"pulsante destro del mouse o dalla barra degli strumenti. In più, puoi "
+"abbinare una combinazione di tasti al modello per essere più veloce.</p> "
+"<p>I modelli di messaggio permettono la sostituzione dei comandi "
+"semplicemente digitandoli o selezionandoli dal menu <i>Inserisci comando</i>."
+"</p> <p>Ci sono quattro tipi di modelli personalizzati: <i>Rispondi</i>, "
+"<i>Rispondi a tutti</i>, <i>Inoltra</i> e <i>Generale</i>, utilizzabili per "
+"ogni tipo di operazione. Non puoi abbinare una scorciatoia al modello "
+"<i>Generale</i>.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3157,15 +3123,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3183,8 +3149,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"La scorciatoia selezionata è già utilizzata da un altro modello personalizzato, "
-"sei sicuro di voler continuare questa operazione?"
+"La scorciatoia selezionata è già utilizzata da un altro modello "
+"personalizzato, sei sicuro di voler continuare questa operazione?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3215,8 +3181,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"Non c'è nessun destinatario nella lista. Seleziona prima qualche destinatario e "
-"poi riprova di nuovo."
+"Non c'è nessun destinatario nella lista. Seleziona prima qualche "
+"destinatario e poi riprova di nuovo."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3241,11 +3207,11 @@ msgstr "Modifica con:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
-"KMail non è in grado di determinare quando l'editor scelto è stato chiuso. Per "
-"evitare perdite di dati la modifica dell'allegato sarà annullata."
+"KMail non è in grado di determinare quando l'editor scelto è stato chiuso. "
+"Per evitare perdite di dati la modifica dell'allegato sarà annullata."
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3346,8 +3312,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Impossibile effettuare la scadenza dei messaggi della cartella %1: cartella di "
-"destinazione %2 non trovata"
+"Impossibile effettuare la scadenza dei messaggi della cartella %1: cartella "
+"di destinazione %2 non trovata"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3499,6 +3465,11 @@ msgstr "Seleziona filtri"
 msgid "Filters"
 msgstr "Filtri"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Seleziona tutto il testo"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3513,8 +3484,8 @@ msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
 msgstr ""
-"Il file selezionato non è leggibile. I tuoi permessi di accesso potrebbero non "
-"essere sufficienti."
+"Il file selezionato non è leggibile. I tuoi permessi di accesso potrebbero "
+"non essere sufficienti."
 
 #: filterimporterexporter.cpp:235
 msgid "Export Filters"
@@ -3530,8 +3501,8 @@ msgstr "Attività &log dei filtri"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Qui puoi attivare e disattivare la registrazione dei log dell'attività dei "
 "filtri. Naturalmente, i log vengono registrati e visualizzati solo quando la "
@@ -3551,15 +3522,16 @@ msgstr "Registra log dell'esecuzione delle &regole di filtro"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Puoi controllare cosa registrazione nei log riguardo l'esecuzione delle regole "
-"di filtro applicate: in questo modo è possibile avere un resoconto dettagliato "
-"per ogni singola regola attivata; in alternativa, puoi avere il risultato "
-"dell'elaborazione di tutte le regole di un solo filtro."
+"Puoi controllare cosa registrazione nei log riguardo l'esecuzione delle "
+"regole di filtro applicate: in questo modo è possibile avere un resoconto "
+"dettagliato per ogni singola regola attivata; in alternativa, puoi avere il "
+"risultato dell'elaborazione di tutte le regole di un solo filtro."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3579,15 +3551,15 @@ msgstr "senza limite"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Registrare i log comporta l'utilizzo della memoria per conservare i dati; qui è "
-"possibile limitare la memoria da utilizzare: se la dimensione del log eccede "
-"questo limite, i dati più vecchi verranno cancellati fino a che la dimensione "
-"totale non raggiunga il limite impostato. "
+"Registrare i log comporta l'utilizzo della memoria per conservare i dati; "
+"qui è possibile limitare la memoria da utilizzare: se la dimensione del log "
+"eccede questo limite, i dati più vecchi verranno cancellati fino a che la "
+"dimensione totale non raggiunga il limite impostato. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3597,7 +3569,7 @@ msgstr ""
 "Impossibile scrivere il file %1:\n"
 "\"%2\" è la descrizione del messaggio di errore."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Errore KMail"
@@ -3638,12 +3610,13 @@ msgstr "Identificativo &utente:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "L'identificativo utente permette l'accesso sul server IMAP. Può essere "
-"semplicemente un nome utente oppure l'indirizzo di posta elettronica completo."
+"semplicemente un nome utente oppure l'indirizzo di posta elettronica "
+"completo."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3694,10 +3667,11 @@ msgstr "Non hai i permessi per leggere/scrivere la tua cartella cestino."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Informazioni non ancora recuperate dal server, utilizza \"Controlla la posta\"."
+"Informazioni non ancora recuperate dal server, utilizza \"Controlla la posta"
+"\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3707,8 +3681,7 @@ msgstr "Errore: nessun account IMAP definito per questa cartella"
 msgid "Connecting to server %1, please wait..."
 msgstr "Connessione al server %1, attendi..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Errore durante la connessione al server %1"
@@ -3737,11 +3710,11 @@ msgstr "Aggiungi permessi"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Sei sicuro di voler rimuovere i tuoi permessi da questa cartella? Non sarai più "
-"in grado di accederci in futuro."
+"Sei sicuro di voler rimuovere i tuoi permessi da questa cartella? Non sarai "
+"più in grado di accederci in futuro."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3772,7 +3745,7 @@ msgstr "Utilizzo:"
 msgid "Select Folder"
 msgstr "Seleziona cartella"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Cartelle locali"
@@ -3796,13 +3769,13 @@ msgstr "Seleziona la scorciatoia per la cartella"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Per scegliere un tasto o combinazione di tasti che selezionano la cartella "
-"attuale, fai clic sul pulsante sotto e premi i tasti che vuoi associare a "
-"questa cartella.</qt>"
+"<qt>Per scegliere un tasto o combinazione di tasti che selezionano la "
+"cartella attuale, fai clic sul pulsante sotto e premi i tasti che vuoi "
+"associare a questa cartella.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3823,13 +3796,22 @@ msgstr "&Annulla"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>La cartella che hai eliminato era associata all'account <b>%1</b> "
-"ed era impostata come cartella di consegna. Ora tutti i messaggi saranno "
-"consegnati nella cartella di posta in arrivo.</qt>"
+"<qt>La cartella che hai eliminato era associata all'account <b>%1</b> ed era "
+"impostata come cartella di consegna. Ora tutti i messaggi saranno consegnati "
+"nella cartella di posta in arrivo.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Totali: %2<br>Non letti: %3<br>Dimensione: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Quota: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3954,74 +3936,18 @@ msgstr "Stato spam:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>g"
-"<br>i"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>M<br>e<br>s<br>s<br>a<br>g<br>g<br>i<br>o<br> "
+"<br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>g"
-"<br>i"
-"<br>o"
-"<br> "
-"<br>n"
-"<br>o"
-"<br>n"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt> <br>M<br>e<br>s<br>s<br>a<br>g<br>g<br>i<br>o<br> <br>n<br>o<br>n<br> "
+"<br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4033,18 +3959,13 @@ msgstr "&Il tuo nome:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Il tuo nome</h3> "
-"<p> Questo campo dovrebbe contenere il tuo nome così come vuoi venga "
-"visualizzato nell'intestazione del messaggio;</p> "
-"<p>Se lo lasci vuoto, apparirà solo il tuo indirizzo di posta.</p></qt>"
+"<qt> <h3>Il tuo nome</h3> <p> Questo campo dovrebbe contenere il tuo nome "
+"così come vuoi venga visualizzato nell'intestazione del messaggio;</p> <p>Se "
+"lo lasci vuoto, apparirà solo il tuo indirizzo di posta.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4052,17 +3973,13 @@ msgstr "Organi&zzazione:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organizzazione</h3> "
-"<p> Questo campo dovrebbe contenere il nome della tua organizzazione se vuoi "
-"che venga visualizzato nell'intestazione del messaggio.</p> "
-"<p>È sicuro (e normale) lasciarlo vuoto.</p></qt>"
+"<qt> <h3>Organizzazione</h3> <p> Questo campo dovrebbe contenere il nome "
+"della tua organizzazione se vuoi che venga visualizzato nell'intestazione "
+"del messaggio.</p> <p>È sicuro (e normale) lasciarlo vuoto.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4071,20 +3988,16 @@ msgstr "Indirizzo di posta &elettronica:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Indirizzo di posta elettronica</h3> "
-"<p>Questo campo dovrebbe contenere il tuo indirizzo di posta elettronica.</p> "
-"<p>Se lo lasci vuoto o lo inserisci in maniera errata, i destinatari avranno "
-"dei problemi a risponderti.</p></qt>"
+"<qt> <h3>Indirizzo di posta elettronica</h3> <p>Questo campo dovrebbe "
+"contenere il tuo indirizzo di posta elettronica.</p> <p>Se lo lasci vuoto o "
+"lo inserisci in maniera errata, i destinatari avranno dei problemi a "
+"risponderti.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4093,21 +4006,12 @@ msgstr "Indirizzo di posta &elettronica:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4127,25 +4031,23 @@ msgstr "La tua chiave di firma OpenPGP"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Scegli la chiave OpenPGP che deve essere utilizzata per firmare digitalmente i "
-"tuoi messaggi."
+"Scegli la chiave OpenPGP che deve essere utilizzata per firmare digitalmente "
+"i tuoi messaggi."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt> "
-"<p>La chiave OpenPGP che scegli qui sarà utilizzata per firmare digitalmente i "
-"messaggi. Puoi utilizzare anche chiavi GnuPG.</p> "
-"<p>È possibile lasciare questo campo vuoto, ma in questo modo KMail non sarà in "
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt> <p>La chiave OpenPGP che scegli qui sarà utilizzata per firmare "
+"digitalmente i messaggi. Puoi utilizzare anche chiavi GnuPG.</p> <p>È "
+"possibile lasciare questo campo vuoto, ma in questo modo KMail non sarà in "
 "grado di firmare digitalmente i messaggi; le funzionalità normali di posta "
-"elettronica non verranno influenzate.</p> "
-"<p>Puoi saperne di più sulle chiavi a <a>http://www.gnupg.org</a></p></qt>"
+"elettronica non verranno influenzate.</p> <p>Puoi saperne di più sulle "
+"chiavi a <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4157,32 +4059,30 @@ msgstr "La tua chiave di cifratura OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Scegli la chiave OpenPGP che deve essere utilizzata per cifrare i messaggi per "
-"te stesso e per utilizzare la funzionalità \"Allega la mia chiave pubblica\" "
-"del compositore."
+"Scegli la chiave OpenPGP che deve essere utilizzata per cifrare i messaggi "
+"per te stesso e per utilizzare la funzionalità \"Allega la mia chiave "
+"pubblica\" del compositore."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>La chiave OpenPGP che scegli qui sarà utilizzata per cifrare i messaggi per "
-"te stesso e per utilizzare la funzionalità \"Allega la mia chiave pubblica\" "
-"del compositore. Puoi utilizzare anche chiavi GnuPG.</p> "
-"<p> È possibile lasciare questo campo vuoto, ma in questo modo KMail non sarà "
-"in grado di cifrare le copie dei tuoi messaggi in uscita utilizzando OpenPGP; "
-"le funzionalità normali di posta elettronica non verranno influenzate.</p> "
-"<p>Puoi saperne di più sulle chiavi a <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>La chiave OpenPGP che scegli qui sarà utilizzata per cifrare i "
+"messaggi per te stesso e per utilizzare la funzionalità \"Allega la mia "
+"chiave pubblica\" del compositore. Puoi utilizzare anche chiavi GnuPG.</p> "
+"<p> È possibile lasciare questo campo vuoto, ma in questo modo KMail non "
+"sarà in grado di cifrare le copie dei tuoi messaggi in uscita utilizzando "
+"OpenPGP; le funzionalità normali di posta elettronica non verranno "
+"influenzate.</p> <p>Puoi saperne di più sulle chiavi a <a>http://www.gnupg."
+"org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4202,18 +4102,16 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Il certificato S/MIME (X.509) che scegli qui sarà utilizzata per firmare "
-"digitalmente i messaggi.</p>"
-"<p>È possibile lasciare questo campo vuoto, ma in questo modo KMail non sarà in "
-"grado di firmare digitalmente i messaggi utilizzando S/MIME; le funzionalità "
-"normali di posta elettronica non verranno influenzate.</p></qt>"
+"<qt> <p>Il certificato S/MIME (X.509) che scegli qui sarà utilizzata per "
+"firmare digitalmente i messaggi.</p><p>È possibile lasciare questo campo "
+"vuoto, ma in questo modo KMail non sarà in grado di firmare digitalmente i "
+"messaggi utilizzando S/MIME; le funzionalità normali di posta elettronica "
+"non verranno influenzate.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4225,29 +4123,27 @@ msgstr "Il tuo certificato di cifratura S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Scegli il certificato S/MIME che deve essere utilizzato per cifrare i messaggi "
-"per te stesso e per utilizzare la funzionalità \"Allega il mio certificato\" "
-"del compositore."
+"Scegli il certificato S/MIME che deve essere utilizzato per cifrare i "
+"messaggi per te stesso e per utilizzare la funzionalità \"Allega il mio "
+"certificato\" del compositore."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Il certificato S/MIME che scegli qui sarà utilizzato per cifrare i messaggi "
-"per te stesso e per utilizzare la funzionalità \"Allega il mio certificato\" "
-"del compositore.</p>"
-"<p>È possibile lasciare questo campo vuoto, ma in questo modo KMail non sarà in "
-"grado di cifrare le copie dei tuoi messaggi in uscita utilizzando S/MIME; le "
-"funzionalità normali di posta elettronica non verranno influenzate.</p> </qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt> <p>Il certificato S/MIME che scegli qui sarà utilizzato per cifrare i "
+"messaggi per te stesso e per utilizzare la funzionalità \"Allega il mio "
+"certificato\" del compositore.</p><p>È possibile lasciare questo campo "
+"vuoto, ma in questo modo KMail non sarà in grado di cifrare le copie dei "
+"tuoi messaggi in uscita utilizzando S/MIME; le funzionalità normali di posta "
+"elettronica non verranno influenzate.</p> </qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4267,25 +4163,21 @@ msgstr "Indirizzo a cui &rispondere:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Indirizzo a cui rispondere</h3> "
-"<p>Questo campo imposta l'intestazione <tt>Risposte a:</tt> "
-"in modo da contenere un differente indirizzo di posta rispetto al normale <tt>"
-"Da:</tt>.</p> "
-"<p>Ciò può essere utile quando hai un gruppo di persone che lavorano insieme "
-"avendo simili mansioni. Potresti volere, per esempio, che ogni messaggio abbia "
-"il tuo indirizzo di posta nel campo <tt>Da:</tt>, ed invece le risposte ad un "
-"indirizzo di gruppo.</p>"
-"<p>Se sei un dubbio, lascia questo campo vuoto.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Indirizzo a cui rispondere</h3> <p>Questo campo imposta "
+"l'intestazione <tt>Risposte a:</tt> in modo da contenere un differente "
+"indirizzo di posta rispetto al normale <tt>Da:</tt>.</p> <p>Ciò può essere "
+"utile quando hai un gruppo di persone che lavorano insieme avendo simili "
+"mansioni. Potresti volere, per esempio, che ogni messaggio abbia il tuo "
+"indirizzo di posta nel campo <tt>Da:</tt>, ed invece le risposte ad un "
+"indirizzo di gruppo.</p><p>Se sei un dubbio, lascia questo campo vuoto.</p></"
+"qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4293,26 +4185,20 @@ msgstr "Indirizzi &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Indirizzi BCC (Blind Carbon Copy - Copia carbone nascosta)</h3> "
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Indirizzi BCC (Blind Carbon Copy - Copia carbone nascosta)</h3> "
 "<p>Gli indirizzi che inserirai qui saranno aggiunti per ogni messaggio in "
 "uscita che sarà spedito con questa identità. Essi non saranno visibili agli "
-"altri destinatari.</p> "
-"<p>Questa funzionalità è utilizzata comunemente per inviare ogni messaggio "
-"spedito ad un'altra delle tue caselle di posta.</p>"
-"<p>Per specificare più di un indirizzo, utilizza le virgole per separare i "
-"destinatari.</p>"
-"<p>Se sei un dubbio, lascia il campo vuoto.</p></qt>"
+"altri destinatari.</p> <p>Questa funzionalità è utilizzata comunemente per "
+"inviare ogni messaggio spedito ad un'altra delle tue caselle di posta.</"
+"p><p>Per specificare più di un indirizzo, utilizza le virgole per separare i "
+"destinatari.</p><p>Se sei un dubbio, lascia il campo vuoto.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4350,7 +4236,7 @@ msgstr "&Firma"
 msgid "&Picture"
 msgstr "&Immagine"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Indirizzo di posta elettronica non valido"
 
@@ -4367,19 +4253,19 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 "Uno dei certificati di firma OpenPGP configurati non contiene alcun "
-"identificativo utente con un indirizzo di posta elettronica per questa identità "
-"(%1).\n"
-"Ciò può causare dei problemi da parte di chi riceve al momento della verifica "
-"delle firme create con questa configurazione."
+"identificativo utente con un indirizzo di posta elettronica per questa "
+"identità (%1).\n"
+"Ciò può causare dei problemi da parte di chi riceve al momento della "
+"verifica delle firme create con questa configurazione."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Uno dei certificati di cifratura OpenPGP configurati non contiene alcun "
-"identificativo utente con un indirizzo di posta elettronica per questa identità "
-"(%1)."
+"identificativo utente con un indirizzo di posta elettronica per questa "
+"identità (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4390,16 +4276,16 @@ msgid ""
 msgstr ""
 "Uno dei certificati di firma S/MIME configurati non contiene un indirizzo di "
 "posta elettronica per questa identità (%1).\n"
-"Ciò può causare dei problemi da parte di chi riceve al momento della verifica "
-"delle firme create con questa configurazione."
+"Ciò può causare dei problemi da parte di chi riceve al momento della "
+"verifica delle firme create con questa configurazione."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Uno dei certificati di cifratura S/MIME configurati non contiene un indirizzo "
-"di posta elettronica per questa identità (%1)."
+"Uno dei certificati di cifratura S/MIME configurati non contiene un "
+"indirizzo di posta elettronica per questa identità (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4439,8 +4325,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (predefinito)"
 
@@ -4484,21 +4370,22 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail ha rilevato una voce di prefisso nel file di configurazione dell'account "
-"\"%1\" che è divenuta obsoleta con la gestione dello spazio dei nomi IMAP."
+"KMail ha rilevato una voce di prefisso nel file di configurazione "
+"dell'account \"%1\" che è divenuta obsoleta con la gestione dello spazio dei "
+"nomi IMAP."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"La configurazione è stata automaticamente aggiornata ma dovresti controllare i "
-"dati del tuo account."
+"La configurazione è stata automaticamente aggiornata ma dovresti controllare "
+"i dati del tuo account."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Non è stato possibile aggiornare la tua configurazione automaticamente, "
 "controlla i dati del tuo account."
@@ -4516,8 +4403,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Impossibile caricare il messaggio datato %1 da <i>%2</i> con oggetto <i>%3</i> "
-"sul server."
+"Impossibile caricare il messaggio datato %1 da <i>%2</i> con oggetto <i>%3</"
+"i> sul server."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4538,17 +4425,22 @@ msgstr "La cartella ha quasi raggiunto il suo limite di quota. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "Poiché non hai privilegi di scrittura su questa cartella, chiedi al suo "
 "proprietario di liberare un po' di spazio in essa."
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Errore: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "La connessione al server %1 si è chiusa inaspettatamente. Se possibile, sarà "
 "ristabilita automaticamente."
@@ -4596,8 +4488,8 @@ msgstr "Errore durante lo scaricamento dei messaggi dal server."
 #: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr ""
-"Errore durante lo scaricamento delle informazioni riguardanti la struttura dei "
-"messaggi."
+"Errore durante lo scaricamento delle informazioni riguardanti la struttura "
+"dei messaggi."
 
 #: imapjob.cpp:543
 msgid "Uploading message data failed."
@@ -4702,8 +4594,8 @@ msgstr "Archivi lista"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 "Uno o più delle chiavi di cifratura OpenPGP o dei certificati S/MIME "
 "configurati non sono totalmente affidabile per la cifratura."
@@ -4711,8 +4603,8 @@ msgstr ""
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 "Uno o più delle chiavi di cifratura OpenPGP o dei certificati S/MIME "
 "configurati non sono totalmente affidabile per la cifratura."
@@ -4731,8 +4623,8 @@ msgid ""
 "The following keys or certificates have unknown trust level: \n"
 msgstr ""
 "\n"
-"Le seguenti chiavi o certificati hanno un livello di affidabilità sconosciuto: "
-"\n"
+"Le seguenti chiavi o certificati hanno un livello di affidabilità "
+"sconosciuto: \n"
 
 #: keyresolver.cpp:323
 #, fuzzy
@@ -4741,8 +4633,8 @@ msgid ""
 "The following keys or certificates are <b>revoked</b>: \n"
 msgstr ""
 "\n"
-"Le seguenti chiavi o certificati hanno un livello di affidabilità sconosciuto: "
-"\n"
+"Le seguenti chiavi o certificati hanno un livello di affidabilità "
+"sconosciuto: \n"
 
 #: keyresolver.cpp:327
 msgid "Not Fully Trusted Encryption Keys"
@@ -4751,228 +4643,182 @@ msgstr "Nessuna chiave di cifratura completamente affidabile"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
+"(numero seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
 "<p>Il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"(numero seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4986,217 +4832,171 @@ msgstr "Il certificato S/MIME scade tra breve"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>La tua chiave di firma OpenPGP</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>La tua chiave di cifratura OpenPGP</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>La tua chiave OpenPGP per</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato radice</p><p align=center><b>%3</b></p><p>per il tuo "
+"certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero seriale "
+"%2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p>"
-"<p>per il tuo certificato S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il certificato intermedio CA</p><p align=center><b>%3</b></p><p>per il "
+"tuo certificato S/MIME</p><p align=center><b>%1</b> (numero seriale %2)</"
+"p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato di firma S/MIME</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
+"(numero seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
 "<p>Il tuo certificato di cifratura S/MIME</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"(numero seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di un giorno.</p>\n"
-"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> "
-"(numero seriale %2)</p>"
-"<p>scade fra meno di %n giorni.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di un giorno.</p>\n"
+"<p>Il tuo certificato S/MIME per</p><p align=center><b>%1</b> (numero "
+"seriale %2)</p><p>scade fra meno di %n giorni.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5208,9 +5008,10 @@ msgstr "Il certificato S/MIME scade tra breve"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5233,8 +5034,8 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Una o più chiavi di firma OpenPGP o certificati di firma S/MIME non sono "
-"utilizzabili per la firma. Riconfigura le tue chiavi di firma e i certificati "
-"per questa identità nel pannello di configurazione Identità.\n"
+"utilizzabili per la firma. Riconfigura le tue chiavi di firma e i "
+"certificati per questa identità nel pannello di configurazione Identità.\n"
 "Se scegli di continuare, e le chiavi sono necessarie, ti sarà richiesto di "
 "specificare quali utilizzare."
 
@@ -5246,38 +5047,40 @@ msgstr "Chiavi di firma non utilizzabili"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Esaminando le preferenze di cifratura dei destinatari risulta che il messaggio "
-"dovrebbe essere cifrato utilizzando OpenPGP, almeno per alcuni destinatari;\n"
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Esaminando le preferenze di cifratura dei destinatari risulta che il "
+"messaggio dovrebbe essere cifrato utilizzando OpenPGP, almeno per alcuni "
+"destinatari;\n"
 "in ogni modo, non hai configurato nessuna chiave di cifratura OpenPGP "
 "affidabile valido per questa identità.\n"
-"Puoi continuare senza cifrare per te stesso, ma fai attenzione perché non sarai "
-"in grado di leggere il tuo messaggio."
+"Puoi continuare senza cifrare per te stesso, ma fai attenzione perché non "
+"sarai in grado di leggere il tuo messaggio."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Esaminando le preferenze di cifratura dei destinatari risulta che il messaggio "
-"dovrebbe essere cifrato utilizzando S/MIME, almeno per alcuni destinatari;\n"
-"in ogni modo, non hai configurato nessun certificato di cifratura S/MIME valido "
-"per questa identità.\n"
-"Puoi continuare senza cifrare per te stesso, ma fai attenzione perché non sarai "
-"in grado di leggere il tuo messaggio."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Esaminando le preferenze di cifratura dei destinatari risulta che il "
+"messaggio dovrebbe essere cifrato utilizzando S/MIME, almeno per alcuni "
+"destinatari;\n"
+"in ogni modo, non hai configurato nessun certificato di cifratura S/MIME "
+"valido per questa identità.\n"
+"Puoi continuare senza cifrare per te stesso, ma fai attenzione perché non "
+"sarai in grado di leggere il tuo messaggio."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5292,8 +5095,8 @@ msgstr "Non firmare con OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5322,8 +5125,8 @@ msgstr "Impossibile firmare"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Non hai selezionato una chiave di cifratura per te stesso (cifra per te "
 "stesso). Non sarai in grado di decifrare il tuo messaggio se lo cifri."
@@ -5347,8 +5150,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Non hai selezionato una chiave di cifratura per nessuno dei destinatari di "
 "questo messaggio; quindi, il messaggio non verrà cifrato."
@@ -5362,9 +5165,9 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Non hai selezionato una chiave di cifratura per uno dei destinatario di questo "
-"messaggio: questa persona non sarà in grado di decifrare il messaggio se lo "
-"cifri."
+"Non hai selezionato una chiave di cifratura per uno dei destinatario di "
+"questo messaggio: questa persona non sarà in grado di decifrare il messaggio "
+"se lo cifri."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5372,8 +5175,8 @@ msgid ""
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "Non hai selezionato una chiave di cifratura per qualcuno dei destinatari di "
-"questo messaggio: queste persone non saranno in grado di decifrare il messaggio "
-"se lo cifri."
+"questo messaggio: queste persone non saranno in grado di decifrare il "
+"messaggio se lo cifri."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5398,11 +5201,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Non è stata trovata nessuna chiave di cifratura valida e affidabile per "
 "\"%1\".\n"
@@ -5452,10 +5255,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Errore critico: impossibile conservare la posta: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Impossibile aggiungere messaggio:\n"
+msgid "Failed to add message:\n"
+msgstr "Impossibile aggiungere messaggio:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5545,6 +5346,52 @@ msgstr "IMAP &disconnesso"
 msgid "&Maildir mailbox"
 msgstr "Casella di posta &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Imposta l'oggetto del messaggio"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Spedisci in CC: a \"indirizzo\""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Spedisci in BCC: a \"indirizzo\""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Aggiungi intestazione al messaggio"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Leggi il corpo del messaggio da \"file\""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Imposta il corpo del messaggio"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Aggiungi un allegato al messaggio. Questa opzione può essere ripetuta"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Controlla solo la presenza di nuovi messaggi"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Apri solo la finestra del compositore"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Visualizza il file del messaggio dato"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Spedisci il messaggio a \"indirizzo\" oppure allega il file a cui punta \"URL"
+"\""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Posta"
@@ -5587,8 +5434,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail creerà le cartelle groupware richieste come sotto-cartelle di %1; se non "
-"vuoi questo, annulla l'operazione e la risorsa IMAP verrà disabilitata"
+"KMail creerà le cartelle groupware richieste come sotto-cartelle di %1; se "
+"non vuoi questo, annulla l'operazione e la risorsa IMAP verrà disabilitata"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5597,18 +5444,18 @@ msgstr "%1: cartella non trovata, verrà creata."
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
-"%1: cartella trovata %2, sarà impostata come cartella di groupware principale."
+"%1: cartella trovata %2, sarà impostata come cartella di groupware "
+"principale."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail ha trovato le seguenti cartelle groupware in %1 e deve effettuare le "
-"seguenti operazioni: %2 "
-"<br>Se non vuoi questo, annulla l'operazione e la risorsa IMAP verrà "
-"disabilitata"
+"<qt>KMail ha trovato le seguenti cartelle groupware in %1 e deve effettuare "
+"le seguenti operazioni: %2 <br>Se non vuoi questo, annulla l'operazione e la "
+"risorsa IMAP verrà disabilitata"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5656,11 +5503,11 @@ msgstr "URL copiata negli appunti."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Il file <b>%1</b> esiste.<br>Vuoi sostituirlo?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Salva su file"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Sostituisci"
 
@@ -5679,7 +5526,7 @@ msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 "Il messaggio è stato rimosso durante il salvataggio. Non è stato salvato."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5699,11 +5546,11 @@ msgstr "Il file non contiene nessun messaggio."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Il file contiene più di un messaggio. Verrà mostrato solo il primo."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5713,85 +5560,85 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtraggio dei messaggi"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtraggio messaggio %1 di %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Spazio disco insufficiente?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Sposta in questa cartella"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copia in questa cartella"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Rilevata cache IMAP danneggiata nella cartella %1. La copia dei messaggi è "
 "stata annullata."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Spostamento messaggi"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Eliminazione messaggi"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Apertura URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Vuoi davvero eseguire <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Esegui"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nessun allegato da salvare."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Salva allegati in"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "allegato.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "allegato.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Un file con nome %1 è già esistente. Vuoi sovrascriverlo?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "File già esistente"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "S&ovrascrivi"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5799,30 +5646,30 @@ msgstr ""
 "La parte %1 del messaggio è cifrata. Vuoi mantenere la cifratura al "
 "salvataggio?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Domanda KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Mantieni cifratura"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Non mantenere"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "La parte %1 del messaggio è firmata. Vuoi mantenere la firma al salvataggio?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Mantieni firma"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5831,22 +5678,22 @@ msgstr ""
 "Impossibile scrivere il file %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Impossibile scrivere il file %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Non c'è nessuna voce nella rubrica per questo indirizzo di posta. Aggiungilo e "
-"poi inserisci l'indirizzo di messaggistica istantanea utilizzando il tuo "
+"Non c'è nessuna voce nella rubrica per questo indirizzo di posta. Aggiungilo "
+"e poi inserisci l'indirizzo di messaggistica istantanea utilizzando il tuo "
 "programma preferito."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5856,52 +5703,51 @@ msgstr ""
 " %1\n"
 " non è possibile determinare con chi vuoi avviare una chat."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Il modulo chiasmus non offre la funzionalità \"x-obtain-keys\". Per favore "
 "segnala questo problema."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Errore nel modulo chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Valore di ritorno inatteso dal modulo chiasmus: la funzionalità "
-"\"x-obtain-keys\" non ha restituito una stringa. Per piacere segnala questo "
-"problema."
+"Valore di ritorno inatteso dal modulo chiasmus: la funzionalità \"x-obtain-"
+"keys\" non ha restituito una stringa. Per piacere segnala questo problema."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Non è stata trovata nessuna chiave. Per piacere controlla che sia stato "
 "impostato un percorso valido nella configurazione chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Scelta chiave chiasmus di decifratura"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Il modulo chiasmus non offre la funzionalità \"x-decrypt\". Per piacere segnala "
-"questo problema."
+"Il modulo chiasmus non offre la funzionalità \"x-decrypt\". Per piacere "
+"segnala questo problema."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5909,19 +5755,19 @@ msgstr ""
 "La funzionalità \"x-decrypt\" non accetta i parametri richiesti. Per piacere "
 "segnala questo problema."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Errore di decifratura chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Valore di ritorno inatteso dal modulo chiasmus: la funzionalità \"x-decrypt\" "
-"non ha restituito un array di byte. Per piacere segnala questo problema."
+"Valore di ritorno inatteso dal modulo chiasmus: la funzionalità \"x-decrypt"
+"\" non ha restituito un array di byte. Per piacere segnala questo problema."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5931,7 +5777,7 @@ msgstr ""
 "Per: %2\n"
 "Soggetto: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Messaggio: %1"
@@ -6030,7 +5876,7 @@ msgstr "Dimensione"
 msgid "Encoding"
 msgstr "Codifica"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comprimi"
 
@@ -6042,7 +5888,7 @@ msgstr "Cifra"
 msgid "Sign"
 msgstr "Firma"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nome dell'allegato:"
 
@@ -6064,10 +5910,11 @@ msgstr "Destinatari principali"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>L'indirizzo di posta elettronica che inserisci in questo campo riceverà una "
-"copia del messaggio.</qt>"
+"<qt>L'indirizzo di posta elettronica che inserisci in questo campo riceverà "
+"una copia del messaggio.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6076,14 +5923,15 @@ msgstr "Destinatari aggiuntivi"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>L'indirizzo di posta elettronica che inserisci in questo campo riceverà una "
-"copia del messaggio. Tecnicamente è la stessa cosa che inserire tutti gli "
-"indirizzi nel campo <b>To:</b> con la differenza che generalmente chi riceve in "
-"copia carbone (CC) è solo un ascoltatore, non un partecipante attivo.</qt>"
+"<qt>L'indirizzo di posta elettronica che inserisci in questo campo riceverà "
+"una copia del messaggio. Tecnicamente è la stessa cosa che inserire tutti "
+"gli indirizzi nel campo <b>To:</b> con la differenza che generalmente chi "
+"riceve in copia carbone (CC) è solo un ascoltatore, non un partecipante "
+"attivo.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6091,13 +5939,12 @@ msgstr "Nascondi destinatari"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Essenzialmente è la stessa cosa del campo <b>Copia a:</b> "
-"con la differenza che gli altri destinatari non vedono chi ha ricevuto una "
-"copia nascosta.</qt>"
+"<qt>Essenzialmente è la stessa cosa del campo <b>Copia a:</b> con la "
+"differenza che gli altri destinatari non vedono chi ha ricevuto una copia "
+"nascosta.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6107,7 +5954,7 @@ msgstr "&Spedisci messaggio"
 msgid "&Send Mail Via"
 msgstr "&Spedisci messaggio attraverso"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Spedisci &più tardi"
@@ -6172,8 +6019,7 @@ msgstr "Ri&muovi caratteri di citazione"
 msgid "Cl&ean Spaces"
 msgstr "Pulisci spa&zi"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Utilizza caratteri a dimensione &fissa"
@@ -6314,31 +6160,31 @@ msgstr "Formato &crittografico del messaggio"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Elenco puntato (disco)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Elenco puntato (cerchio)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Elenco puntato (quadrato)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Elenco ordinato (decimali)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Elenco ordinato (lettere minuscole)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Elenco ordinato (lettere maiuscole)"
 
@@ -6422,21 +6268,22 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Salva di nuovo il messaggio nella cartella Modelli. Potrà essere utilizzato in "
-"un secondo momento."
+"Salva di nuovo il messaggio nella cartella Modelli. Potrà essere utilizzato "
+"in un secondo momento."
 
 #: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Salva il messaggio nella cartella bozze. In questo modo potrà essere modificato "
-"e inviato in un secondo momento."
+"Salva il messaggio nella cartella bozze. In questo modo potrà essere "
+"modificato e inviato in un secondo momento."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
-"Vuoi salvare il messaggio per utilizzarlo più tardi, oppure vuoi abbandonarlo?"
+"Vuoi salvare il messaggio per utilizzarlo più tardi, oppure vuoi "
+"abbandonarlo?"
 
 #: kmcomposewin.cpp:2262
 msgid "Close Composer"
@@ -6444,63 +6291,63 @@ msgstr "Chiudi compositore"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Il messaggio che hai composto sembra riferirsi ad un file allegato, ma non hai "
-"allegato nulla.\n"
+"Il messaggio che hai composto sembra riferirsi ad un file allegato, ma non "
+"hai allegato nulla.\n"
 "Vuoi allegare un file a questo messaggio?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Promemoria file allegato"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Spedisci così com'è"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>KMail non è in grado di identificare la posizione dell'allegato (%1);</p> "
-"<p>Devi specificarne il percorso completo se vuoi allegare un file.</p></qt>"
+"<qt> <p>KMail non è in grado di identificare la posizione dell'allegato (%1);"
+"</p> <p>Devi specificarne il percorso completo se vuoi allegare un file.</"
+"p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>L'amministratore ha disabilitato gli allegati superiori a %1 MB.</p>"
+"<qt><p>L'amministratore ha disabilitato gli allegati superiori a %1 MB.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Allega file"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "A&llega"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Inserisci file"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Inserisci file"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Si è verificato un errore durante l'esportazione della chiave dal modulo:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Si è verificato un errore durante l'esportazione della chiave dal "
+"modulo:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6539,300 +6386,308 @@ msgid ""
 "View"
 msgstr "Visualizza"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Modifica..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Modifica con..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Salva con no&me..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Proprietà"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Aggiungi allegato..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail non è in grado di comprimere il file."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Il file compresso è più grande dell'originale. Vuoi mantenere quest'ultimo?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Mantieni"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail non è in grado di decomprimere il file."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Salva allegato con nome"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Aggiungi come testo"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Aggiungi come allegato"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
-"Seleziona se vuoi inserire il contenuto come testo nell'editor, o se accodare "
-"il file riferito come allegato."
+"Seleziona se vuoi inserire il contenuto come testo nell'editor, o se "
+"accodare il file riferito come allegato."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Incolla come testo o come allegato?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "senza nome"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Hai richiesto che i messaggi siano cifrati anche per te stesso, ma "
+"<qt> <p>Hai richiesto che i messaggi siano cifrati anche per te stesso, ma "
 "l'identità attualmente selezionata non definisce una chiave di cifratura "
-"(OpenPGP o S/MIME) da usare.</p> "
-"<p>Scegli una chiave da utilizzare nel pannello di configurazione Identità.</p>"
-"</qt>"
+"(OpenPGP o S/MIME) da usare.</p> <p>Scegli una chiave da utilizzare nel "
+"pannello di configurazione Identità.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Chiave di cifratura non definita"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Per essere in grado di firmare questo messaggio devi prima definire la "
-"chiave di firma (OpenPGP o S/MIME) da utilizzare.</p> "
-"<p>Scegli la chiave da utilizzare nella finestra di configurazione identità.</p>"
-"</qt>"
+"<qt> <p>Per essere in grado di firmare questo messaggio devi prima definire "
+"la chiave di firma (OpenPGP o S/MIME) da utilizzare.</p> <p>Scegli la chiave "
+"da utilizzare nella finestra di configurazione identità.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Chiave di firma non definita"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 "KMail attualmente è in modalità non in linea, i tuoi messaggi verranno "
-"conservati nella casella di posta in uscita fino a quando non andrai in linea."
+"conservati nella casella di posta in uscita fino a quando non andrai in "
+"linea."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "In linea/Non in linea"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Devi inserire un indirizzo di posta elettronica nel campo \"Da:\". Dovresti, "
 "inoltre, impostare il tuo indirizzo per tutte le identità, in modo da non "
 "inserirlo per ogni messaggio."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Devi specificare almeno un destinatario nel campo \"A:\", \"CC\" oppure "
-"\"BCC\"."
+"Devi specificare almeno un destinatario nel campo \"A:\", \"CC\" oppure \"BCC"
+"\"."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Il campo A: è vuoto. Spedire comunque il messaggio?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Nessun campo A: specificato"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Non hai specificato l'oggetto. Spedire comunque il messaggio?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nessun oggetto specificato"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Sp&edisci così com'è"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Specifica l'oggetto"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Mantieni markup, non firmare/cifrare"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Mantieni markup, non cifrare"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Mantieni markup, non firmare"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Firma/cifra (elimina markup)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Cifra (elimina markup)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Firma (elimina markup)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>La cifratura o la firma dei messaggi HTML in linea non è possibile;</p> "
-"<p>vuoi eliminare i markup?</p></qt>"
+"<qt> <p>La cifratura o la firma dei messaggi HTML in linea non è possibile;</"
+"p> <p>vuoi eliminare i markup?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Firmare/cifrare il messaggio?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Le cartella delle bozze o dei modelli personalizzati per l'identità \"%1\" non "
-"esiste (non più); in alternativa, sarà utilizzata la cartella delle bozze o dei "
-"modelli predefinita."
+"Le cartella delle bozze o dei modelli personalizzati per l'identità \"%1\" "
+"non esiste (non più); in alternativa, sarà utilizzata la cartella delle "
+"bozze o dei modelli predefinita."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Crea un account per la spedizione e poi prova di nuovo."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Spedizione messaggio..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Invia conferma"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Spedisci &ora"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Nessun destinatario"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinatari aggiuntivi"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Controllo ortografico: attivo"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Controllo ortografico: inattivo"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Controllo ortografico annullato."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Controllo ortografico interrotto."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Controllo ortografico completato."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Controllo ortografico"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Per piacere, configura prima un modulo crittografico da utilizzare per la "
 "cifratura chiasmus.\n"
 "Puoi farlo nella scheda dei moduli crittografici della finestra di "
 "configurazione della pagina \"sicurezza\"."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 "Sembra che la libreria libkleopatra sia stata compilata senza il supporto a "
-"chiasmus. Potresti voler ricompilare libkleopatra con l'opzione "
-"--enable-chiasmus."
+"chiasmus. Potresti voler ricompilare libkleopatra con l'opzione --enable-"
+"chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Nessun modulo chiasmus configurato"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nessuna chiave chiasmus trovata"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Scelta chiave chiasmus di cifratura"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Il messaggio sarà firmato"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Il messaggio non sarà firmato"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Il messaggio sarà cifrato"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Il messaggio non sarà cifrato"
 
@@ -6882,8 +6737,8 @@ msgstr "Controllo ortografico - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Impossibile avviare ISpell/Aspell. Assicurati che ISpell o Aspell e la "
 "variabile d'ambiente PATH siano configurati correttamente."
@@ -6919,13 +6774,11 @@ msgstr "<qt>Troppe azioni nella regola di filtro <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Azione di filtro <b>%1</b> sconosciuta "
-"<br>nella regola di filtro <b>%2</b>."
-"<br>Ignorata.</qt>"
+"<qt>Azione di filtro <b>%1</b> sconosciuta <br>nella regola di filtro <b>%2</"
+"b>.<br>Ignorata.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7145,167 +6998,135 @@ msgstr "Riproduci suono"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Questa è la lista dei filtri definiti. Sono elaborati dall'alto verso il "
-"basso.</p>"
-"<p>Fai clic su qualsiasi filtro per modificarlo usando i comandi posti nella "
-"metà di destra della finestra.</p></qt>"
+"<qt><p>Questa è la lista dei filtri definiti. Sono elaborati dall'alto verso "
+"il basso.</p><p>Fai clic su qualsiasi filtro per modificarlo usando i "
+"comandi posti nella metà di destra della finestra.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per creare un nuovo filtro.</p>"
-"<p>Esso verrà inserito subito prima di quello selezionato, ma sarà in ogni "
-"momento possibile cambiarne la posizione.</p>"
-"<p>Se hai premuto questo pulsante per sbaglio, puoi ritornare alla situazione "
-"immediatamente precedente facendo clic sul pulsante <em>Elimina</em>.</p></qt>"
+"<qt><p>Fai clic su questo pulsante per creare un nuovo filtro.</p><p>Esso "
+"verrà inserito subito prima di quello selezionato, ma sarà in ogni momento "
+"possibile cambiarne la posizione.</p><p>Se hai premuto questo pulsante per "
+"sbaglio, puoi ritornare alla situazione immediatamente precedente facendo "
+"clic sul pulsante <em>Elimina</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per copiare un filtro.</p>"
-"<p>Se hai premuto questo pulsante per sbaglio, puoi ritornare alla situazione "
-"immediatamente precedente facendo clic sul pulsante <em>Elimina</em>.</p></qt>"
+"<qt><p>Fai clic su questo pulsante per copiare un filtro.</p><p>Se hai "
+"premuto questo pulsante per sbaglio, puoi ritornare alla situazione "
+"immediatamente precedente facendo clic sul pulsante <em>Elimina</em>.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per <em>eliminare</em> "
-"il filtro selezionato dalla lista sovrastante.</p> "
-"<p>Non c'è nessun modo per ripristinarlo una volta eliminato, ma è sempre "
-"possibile fare clic su <em>Annulla</em> in modo da tralasciare le modifiche.</p>"
-"</qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Fai clic su questo pulsante per <em>eliminare</em> il filtro "
+"selezionato dalla lista sovrastante.</p> <p>Non c'è nessun modo per "
+"ripristinarlo una volta eliminato, ma è sempre possibile fare clic su "
+"<em>Annulla</em> in modo da tralasciare le modifiche.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per spostare il filtro selezionato <em>"
-"in cima</em> alla lista sopra di esso.</p>"
-"<p>Ciò è utile in quanto l'ordine dei filtri nella lista determina l'ordine in "
-"cui sono attivati sui messaggi: quelli più in alto vengono eseguiti per "
-"prima.</p></qt>"
+"<qt><p>Fai clic su questo pulsante per spostare il filtro selezionato <em>in "
+"cima</em> alla lista sopra di esso.</p><p>Ciò è utile in quanto l'ordine dei "
+"filtri nella lista determina l'ordine in cui sono attivati sui messaggi: "
+"quelli più in alto vengono eseguiti per prima.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per spostare il filtro selezionato <em>"
-"in alto</em> di una posizione.</p> "
-"<p>Ciò è utile in quanto l'ordine dei filtri nella lista determina l'ordine "
-"attraverso il quale sono attivati sui messaggi: quelli più in alto vengono "
-"eseguiti per prima.</p> "
-"<p>Se hai premuto questo pulsante per sbaglio, puoi tornare alla situazione "
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Fai clic su questo pulsante per spostare il filtro selezionato <em>in "
+"alto</em> di una posizione.</p> <p>Ciò è utile in quanto l'ordine dei filtri "
+"nella lista determina l'ordine attraverso il quale sono attivati sui "
+"messaggi: quelli più in alto vengono eseguiti per prima.</p> <p>Se hai "
+"premuto questo pulsante per sbaglio, puoi tornare alla situazione "
 "immediatamente precedente facendo clic su <em>Giù</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per spostare il filtro selezionato <em>giù</em> "
-"di una posizione.</p> "
-"<p>Ciò è utile in quanto l'ordine dei filtri nella lista determina l'ordine "
-"attraverso il quale sono attivati sui messaggi: quelli più in alto vengono "
-"eseguiti per prima.</p> "
-"<p>Se hai premuto questo pulsante per sbaglio, puoi tornare alla situazione "
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Fai clic su questo pulsante per spostare il filtro selezionato "
+"<em>giù</em> di una posizione.</p> <p>Ciò è utile in quanto l'ordine dei "
+"filtri nella lista determina l'ordine attraverso il quale sono attivati sui "
+"messaggi: quelli più in alto vengono eseguiti per prima.</p> <p>Se hai "
+"premuto questo pulsante per sbaglio, puoi tornare alla situazione "
 "immediatamente precedente facendo clic su <em>Su</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per spostare il filtro selezionato <em>"
-"in fondo</em> alla lista sopra di esso.</p>"
-"<p>Ciò è utile in quanto l'ordine dei filtri nella lista determina l'ordine in "
-"cui sono attivati sui messaggi: quelli più in alto vengono eseguiti per "
-"prima.</p></qt>"
+"<qt><p>Fai clic su questo pulsante per spostare il filtro selezionato <em>in "
+"fondo</em> alla lista sopra di esso.</p><p>Ciò è utile in quanto l'ordine "
+"dei filtri nella lista determina l'ordine in cui sono attivati sui messaggi: "
+"quelli più in alto vengono eseguiti per prima.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fai clic su questo pulsante per rinominare il filtro selezionato.</p> "
-"<p>I filtri sono nominati automaticamente, a patto che comincino con "
-"\"&lt;\".</p>"
-"<p> Se hai rinominato un filtro per sbaglio e vuoi tornare indietro, fai clic "
-"su questo pulsante, seleziona <em>Pulisci</em> e poi <em>OK</em> "
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Fai clic su questo pulsante per rinominare il filtro selezionato.</p> "
+"<p>I filtri sono nominati automaticamente, a patto che comincino con \"&lt;"
+"\".</p><p> Se hai rinominato un filtro per sbaglio e vuoi tornare indietro, "
+"fai clic su questo pulsante, seleziona <em>Pulisci</em> e poi <em>OK</em> "
 "nella finestra che appare.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Seleziona questa opzione per fare in modo che la finestra di conferma sia "
-"mostrata sempre.</p> "
-"<p>Ciò è utile se hai impostato una serie di regole che segnano il messaggio "
-"per lo scaricamento più tardi. Senza la possibilità di mostrare la conferma, "
-"questi messaggi non potrebbero essere più scaricati, a meno che non ci siano "
-"messaggi più grandi in attesa sul server.</p></qt>"
+"<qt> <p>Seleziona questa opzione per fare in modo che la finestra di "
+"conferma sia mostrata sempre.</p> <p>Ciò è utile se hai impostato una serie "
+"di regole che segnano il messaggio per lo scaricamento più tardi. Senza la "
+"possibilità di mostrare la conferma, questi messaggi non potrebbero essere "
+"più scaricati, a meno che non ci siano messaggi più grandi in attesa sul "
+"server.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7315,6 +7136,16 @@ msgstr "Regole di filtro POP3"
 msgid "Filter Rules"
 msgstr "Regole di filtro"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importa"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importa"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtri disponibili"
@@ -7338,8 +7169,8 @@ msgstr "Impostazioni globali"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"&Mostra sempre i messaggi segnati come \"scarica più tardi\" nella finestra di "
-"conferma"
+"&Mostra sempre i messaggi segnati come \"scarica più tardi\" nella finestra "
+"di conferma"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7397,6 +7228,11 @@ msgstr "Aggiungi questo filtro nella barra degli strumenti"
 msgid "Icon for this filter:"
 msgstr "Icona per questo filtro:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "A"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Su"
@@ -7405,16 +7241,29 @@ msgstr "Su"
 msgid "Down"
 msgstr "Giù"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Rinomina..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nuovo"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copia in"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Eliminato"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7423,12 +7272,12 @@ msgstr "Seleziona la scorciatoia per la cartella"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Almeno un filtro si riferisce ad una cartella di un account IMAP in linea. "
-"Questi filtri saranno applicati solo durante il filtraggio manuale e all'arrivo "
-"di posta IMAP in linea."
+"Questi filtri saranno applicati solo durante il filtraggio manuale e "
+"all'arrivo di posta IMAP in linea."
 
 #: kmfilterdlg.cpp:786
 msgid ""
@@ -7492,8 +7341,8 @@ msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"I nomi delle cartelle non possono cominciare per . (punto); per piacere scegli "
-"un altro nome di cartella."
+"I nomi delle cartelle non possono cominciare per . (punto); per piacere "
+"scegli un altro nome di cartella."
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7509,29 +7358,26 @@ msgstr "Risoluzione problemi cache IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Risoluzione problemi cache IMAP.</b></p> "
-"<p>Se hai problemi con la sincronizzazione della cartella IMAP, dovresti prima "
-"di tutto provare a ricostruire l'indice dei file. Per fare ciò, potrebbe "
-"occorrere del tempo, ma non causerà alcun problema.</p> "
-"<p>Se questo non fosse abbastanza, potresti cercare di aggiornare la cache "
-"IMAP. Se esegui questa operazione, perderai tutte le modifiche alla cartella "
-"locale e tutte le sue sotto-cartelle.</p>"
+"<p><b>Risoluzione problemi cache IMAP.</b></p> <p>Se hai problemi con la "
+"sincronizzazione della cartella IMAP, dovresti prima di tutto provare a "
+"ricostruire l'indice dei file. Per fare ciò, potrebbe occorrere del tempo, "
+"ma non causerà alcun problema.</p> <p>Se questo non fosse abbastanza, "
+"potresti cercare di aggiornare la cache IMAP. Se esegui questa operazione, "
+"perderai tutte le modifiche alla cartella locale e tutte le sue sotto-"
+"cartelle.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7562,16 +7408,16 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Il file UID di cache non può essere letto per la cartella %1. Potrebbe essere "
-"un problema di permessi del file system, o è danneggiato."
+"Il file UID di cache non può essere letto per la cartella %1. Potrebbe "
+"essere un problema di permessi del file system, o è danneggiato."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"Il file UID di cache non può essere scritto per la cartella %1. Potrebbe essere "
-"un problema di permessi del file system."
+"Il file UID di cache non può essere scritto per la cartella %1. Potrebbe "
+"essere un problema di permessi del file system."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7593,10 +7439,10 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Sei sicuro di voler aggiornare la cache IMAP della cartella %1 e tutte le sue "
-"sotto-cartelle?\n"
-"Attraverso questa operazione perderai tutte le modifiche fatte localmente alle "
-"tue cartelle."
+"Sei sicuro di voler aggiornare la cache IMAP della cartella %1 e tutte le "
+"sue sotto-cartelle?\n"
+"Attraverso questa operazione perderai tutte le modifiche fatte localmente "
+"alle tue cartelle."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7612,11 +7458,11 @@ msgstr "L'indice di questa cartella è stato ricreato."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"La cartella %1 non è in stato di sincronizzazione iniziale (lo stato era a %2). "
-"Vuoi impostarla allo stato iniziale comunque?"
+"La cartella %1 non è in stato di sincronizzazione iniziale (lo stato era a "
+"%2). Vuoi impostarla allo stato iniziale comunque?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7743,15 +7589,11 @@ msgstr "Creazione sotto-cartelle sul server"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>I messaggi sul server nella cartella <b>%1</b> sono stati eliminati. Vuoi "
-"eliminarli localmente?"
-"<br>UID: %2</p></qt>"
+"<qt><p>I messaggi sul server nella cartella <b>%1</b> sono stati eliminati. "
+"Vuoi eliminarli localmente?<br>UID: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7772,13 +7614,11 @@ msgstr "Recupero cartelle per lo spazio dei nomi %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Sembra che la cartella <b>%1</b> sia stata eliminata. Vuoi eliminarla dal "
-"server?</p></qt>"
+"<qt> <p>Sembra che la cartella <b>%1</b> sia stata eliminata. Vuoi "
+"eliminarla dal server?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7786,19 +7626,21 @@ msgstr "Annullato"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"Il server IMAP %1 non supporta le annotazioni IMAP. La memorizzazione XML non "
-"può essere utilizzata su questo server. Riconfigura KMail in modo differente."
+"Il server IMAP %1 non supporta le annotazioni IMAP. La memorizzazione XML "
+"non può essere utilizzata su questo server. Riconfigura KMail in modo "
+"differente."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"Il server IMAP %1 non supporta le annotazioni imap. La memorizzazione XML non "
-"può essere utilizzata su questo server. Riconfigura KMail in modo differente"
+"Il server IMAP %1 non supporta le annotazioni imap. La memorizzazione XML "
+"non può essere utilizzata su questo server. Riconfigura KMail in modo "
+"differente"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7810,17 +7652,17 @@ msgstr "lost+found"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Ci sono dei messaggi nuovi nella cartella <b>%1</b> "
-"che non sono stati ancora caricati sul server, ma la cartella è stata eliminata "
-"dal server oppure non hai i permessi sufficienti per il caricamento.</p>"
-"<p>Tutti i messaggi rilevanti verranno spostati in <b>%2</b> "
-"per evitare perdite di dati.</p>"
+"<p>Ci sono dei messaggi nuovi nella cartella <b>%1</b> che non sono stati "
+"ancora caricati sul server, ma la cartella è stata eliminata dal server "
+"oppure non hai i permessi sufficienti per il caricamento.</p><p>Tutti i "
+"messaggi rilevanti verranno spostati in <b>%2</b> per evitare perdite di "
+"dati.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7828,21 +7670,26 @@ msgstr "Permessi di accesso insufficienti"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-msgstr ""
-"<p>Ci sono dei messaggi nuovi in questa cartella (%1) che non sono stati ancora "
-"caricati sul server, ma la cartella è stata eliminata dal server oppure non hai "
-"i permessi sufficienti per il caricamento. Contatta l'amministratore di sistema "
-"per farti assegnare i permessi sufficienti per caricare nuovi messaggi o "
-"spostarli in una cartella esterna.</p> "
-"<p>Vuoi spostare adesso questi messaggi in un'altra cartella?</p>"
-
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
+msgstr ""
+"<p>Ci sono dei messaggi nuovi in questa cartella (%1) che non sono stati "
+"ancora caricati sul server, ma la cartella è stata eliminata dal server "
+"oppure non hai i permessi sufficienti per il caricamento. Contatta "
+"l'amministratore di sistema per farti assegnare i permessi sufficienti per "
+"caricare nuovi messaggi o spostarli in una cartella esterna.</p> <p>Vuoi "
+"spostare adesso questi messaggi in un'altra cartella?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Sposta in:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Non spostare"
 
@@ -7854,8 +7701,7 @@ msgstr "Sposta messaggi nella cartella"
 msgid "Permissions (ACL)"
 msgstr "Permessi (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Generale"
@@ -7879,8 +7725,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Utilizza icone personalizzate"
@@ -7899,25 +7744,22 @@ msgstr "Azione in caso di posta nuova o non letta in questa cartella"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Se questa opzione è abilitata riceverai delle notifiche nel caso in cui in "
-"questa cartella ci saranno messaggi nuovi o non letti. In più, quando si va "
-"alla cartella precedente o successiva contenente messaggi non letti si verrà "
-"bloccati a questa cartella.</p> "
-"<p>Disabilita questa opzione se non vuoi ricevere notifiche e se vuoi che "
-"questa cartella venga saltata quando si va alla cartella successiva o "
-"precedente contenente messaggi non letti. Ciò è utile per ignorare tutta la "
-"posta nuova o non letta contenuta nel cestino o nella cartella dello spam.</p>"
-"</qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt> <p>Se questa opzione è abilitata riceverai delle notifiche nel caso in "
+"cui in questa cartella ci saranno messaggi nuovi o non letti. In più, quando "
+"si va alla cartella precedente o successiva contenente messaggi non letti si "
+"verrà bloccati a questa cartella.</p> <p>Disabilita questa opzione se non "
+"vuoi ricevere notifiche e se vuoi che questa cartella venga saltata quando "
+"si va alla cartella successiva o precedente contenente messaggi non letti. "
+"Ciò è utile per ignorare tutta la posta nuova o non letta contenuta nel "
+"cestino o nella cartella dello spam.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7929,13 +7771,13 @@ msgstr "Mantieni le risposte in questa cartella"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Abilita questa opzione se vuoi che le risposte che scrivi ai messaggi di questa "
-"cartella siano conservate nella stessa cartella dopo la spedizione, invece "
-"della cartella \"posta in uscita\" configurata."
+"Abilita questa opzione se vuoi che le risposte che scrivi ai messaggi di "
+"questa cartella siano conservate nella stessa cartella dopo la spedizione, "
+"invece della cartella \"posta in uscita\" configurata."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7945,17 +7787,21 @@ msgstr "Mostra la colonna mittente/destinatario nella lista dei messaggi"
 msgid "Sho&w column:"
 msgstr "M&ostra colonna:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Imposta come predefinito"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Mittente"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Destinatario"
@@ -7966,15 +7812,15 @@ msgstr "Identità &mittente:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Seleziona l'identità del mittente da usare quando si scrivono delle mail nuove "
-"o si risponde alle mail in questa cartella. Ciò vuol dire che se sei in una "
-"delle tue cartelle di lavoro, puoi far usare automaticamente a KMail "
+"Seleziona l'identità del mittente da usare quando si scrivono delle mail "
+"nuove o si risponde alle mail in questa cartella. Ciò vuol dire che se sei "
+"in una delle tue cartelle di lavoro, puoi far usare automaticamente a KMail "
 "l'indirizzo, la firma e le chiavi di firma o cifratura del mittente "
 "corrispondente. Le identità possono essere configurate nella finestra di "
 "configurazione principale. (Impostazioni -> Configura KMail)"
@@ -7995,18 +7841,18 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Questa impostazione definisce quali utenti che condividono questa cartella "
 "dovrebbero avere dei periodi \"occupati\" nei loro elenchi libero/occupato e "
-"dovrebbero vedere gli avvertimenti degli eventi o compiti in questa cartella. "
-"L'impostazione si applica solo alle cartelle Calendario e Compiti (per i "
-"compiti, questa impostazione è usata solo per gli avvertimenti).\n"
+"dovrebbero vedere gli avvertimenti degli eventi o compiti in questa "
+"cartella. L'impostazione si applica solo alle cartelle Calendario e Compiti "
+"(per i compiti, questa impostazione è usata solo per gli avvertimenti).\n"
 "\n"
 "Casi d'uso: se il capo condivide una cartella con la sua segretaria, solo il "
 "capo dovrebbe essere indicato occupato per le riunioni, quindi lui dovrebbe "
@@ -8015,8 +7861,8 @@ msgstr ""
 "D'altra parte se un gruppo di lavoro condivide un calendario per le riunioni "
 "del gruppo, tutti i lettori della cartella dovrebbero essere segnati come "
 "occupati per le riunioni.\n"
-"Una cartella aziendale con eventi opzionali userebbe \"Nessuno\" perché non si "
-"sa chi andrà a quegli eventi."
+"Una cartella aziendale con eventi opzionali userebbe \"Nessuno\" perché non "
+"si sa chi andrà a quegli eventi."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8049,21 +7895,21 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Hai configurato questa cartella per contenere informazioni di groupware e "
-"l'opzione di configurazione generale per nascondere le cartelle di groupware è "
-"impostata. Ciò vuol dire che questa cartella sparirà una volta che questa "
+"l'opzione di configurazione generale per nascondere le cartelle di groupware "
+"è impostata. Ciò vuol dire che questa cartella sparirà una volta che questa "
 "finestra sarà chiusa. Se vuoi rimuovere di nuovo la cartella, dovrai "
 "disattivare temporaneamente il nascondimento delle cartelle di groupware per "
 "poterla vedere."
@@ -8135,13 +7981,14 @@ msgstr "Errore durante il rilevamento delle informazioni legate alla cartella."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
-"L'indice dei messaggi per \"%1\" proviene da una versione sconosciuta di KMail "
-"(%2).\n"
-"Questo indice può essere rigenerato dalla tua cartella della posta, ma alcune "
-"informazioni, come i contrassegni di stato, potrebbero andare perdute. Vuoi "
-"utilizzare la vecchia versione del file di indice?"
+"L'indice dei messaggi per \"%1\" proviene da una versione sconosciuta di "
+"KMail (%2).\n"
+"Questo indice può essere rigenerato dalla tua cartella della posta, ma "
+"alcune informazioni, come i contrassegni di stato, potrebbero andare "
+"perdute. Vuoi utilizzare la vecchia versione del file di indice?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8167,8 +8014,8 @@ msgstr "Errore durante l'apertura di %1; questa cartella è mancante."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Errore durante l'apertura di %1; non è una maildir valida oppure non hai "
 "sufficienti permessi di accesso."
@@ -8184,8 +8031,8 @@ msgstr "Impossibile sincronizzare la cartella maildir."
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"Impossibile aggiungere messaggi alla cartella, probabilmente lo spazio disco è "
-"al minimo."
+"Impossibile aggiungere messaggi alla cartella, probabilmente lo spazio disco "
+"è al minimo."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -8201,8 +8048,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"La cartella \"posta in uscita\" potrebbe contenere dei messaggi non creati da "
-"KMail;\n"
+"La cartella \"posta in uscita\" potrebbe contenere dei messaggi non creati "
+"da KMail;\n"
 "rimuovili se non vuoi che KMail li spedisca."
 
 #: kmfoldermbox.cpp:112
@@ -8215,20 +8062,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>L'indice della cartella \"%2\" sembra non essere aggiornato. Per evitare "
-"corruzioni l'indice sarà rigenerato. Come risultato i messaggi eliminati "
-"potrebbero riapparire ed i contrassegni di stato potrebbero venire perduti.</p> "
-"<p>Per informazioni su come prevenire questo problema leggi la <a href=\"%1\">"
-"Sezione FAQ del manuale di KMail</a>.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>L'indice della cartella \"%2\" sembra non essere aggiornato. Per "
+"evitare corruzioni l'indice sarà rigenerato. Come risultato i messaggi "
+"eliminati potrebbero riapparire ed i contrassegni di stato potrebbero venire "
+"perduti.</p> <p>Per informazioni su come prevenire questo problema leggi la "
+"<a href=\"%1\">Sezione FAQ del manuale di KMail</a>.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8289,36 +8133,38 @@ msgstr ""
 "'%1' non sembra essere una cartella.\n"
 "Per piacere, sposta il file in una cartella."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 "I permessi alla cartella '%1' non sono corretti;\n"
-"assicurati di poter visualizzare e modificare il contenuto di questa cartella."
+"assicurati di poter visualizzare e modificare il contenuto di questa "
+"cartella."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
 msgstr ""
 "KMail non può creare la cartella '%1';\n"
-"assicurati di poter visualizzare e modificare il contenuto della cartella '%2'."
+"assicurati di poter visualizzare e modificare il contenuto della cartella "
+"'%2'."
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"Una cartella con lo stesso nome è stata eliminata dall'ultimo controllo della "
-"posta. Devi controllare la posta prima di creare un'altra cartella con lo "
-"stesso nome."
+"Una cartella con lo stesso nome è stata eliminata dall'ultimo controllo "
+"della posta. Devi controllare la posta prima di creare un'altra cartella con "
+"lo stesso nome."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Impossibile creare la cartella"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8416,13 +8262,14 @@ msgstr "&Risoluzione problemi cache IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Impossibile creare la cartella <b>%1</b> a causa di permessi insufficienti "
-"sul server. Se pensi di dover essere in grado di creare sotto-cartelle qui, "
-"chiedi al tuo amministratore di sistema i privilegi per farlo.</qt> "
+"<qt>Impossibile creare la cartella <b>%1</b> a causa di permessi "
+"insufficienti sul server. Se pensi di dover essere in grado di creare sotto-"
+"cartelle qui, chiedi al tuo amministratore di sistema i privilegi per farlo."
+"</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8439,23 +8286,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Impossibile spostare o copiare la cartella <b>%1</b> "
-"qui perché una cartella con lo stesso nome esiste già.</qt>"
+"<qt>Impossibile spostare o copiare la cartella <b>%1</b> qui perché una "
+"cartella con lo stesso nome esiste già.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Impossibile spostare o copiare la cartella <b>%1</b> "
-"perché non è stata copiata completamente essa stessa.</qt>"
+"<qt>Impossibile spostare o copiare la cartella <b>%1</b> perché non è stata "
+"copiata completamente essa stessa.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Impossibile spostare o copiare la cartella <b>%1</b> "
-"in una sotto-cartella interna a essa stessa.</qt>"
+"<qt>Impossibile spostare o copiare la cartella <b>%1</b> in una sotto-"
+"cartella interna a essa stessa.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8561,15 +8408,15 @@ msgstr "%1 cartella di sola lettura."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Vuoi veramente eliminare il messaggio selezionato?"
-"<br>Una volta eliminato, non potrà essere ripristinato.</qt>\n"
-"<qt>Vuoi veramente eliminare i %n messaggi selezionati?"
-"<br>Una volta eliminati, non potranno essere ripristinati.</qt>"
+"<qt>Vuoi veramente eliminare il messaggio selezionato?<br>Una volta "
+"eliminato, non potrà essere ripristinato.</qt>\n"
+"<qt>Vuoi veramente eliminare i %n messaggi selezionati?<br>Una volta "
+"eliminati, non potranno essere ripristinati.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8621,139 +8468,137 @@ msgstr ""
 "Errore durante la modifica di %1\n"
 "(Spazio disco esaurito?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Richiesta certificato di firma"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Per piacere create un certificato dall'allegato e rispediscilo al mittente."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
-"KMail è impostato per essere non in linea; tutti i compiti di rete sono sospesi"
+"KMail è impostato per essere non in linea; tutti i compiti di rete sono "
+"sospesi"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail è impostato per essere in linea; tutti i compiti di rete sono ripresi"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail attualmente è in modalità non in linea. Come vuoi procedere?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Lavora in modalità in linea"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Lavora in modalità non in linea"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 "Non hai i permessi per leggere/scrivere la tua cartella posta in arrivo."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "posta in uscita"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "Non hai i permessi per leggere/scrivere la tua cartella posta in uscita."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "posta inviata"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Non hai i permessi per leggere/scrivere la tua cartella posta inviata."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "cestino"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Non hai i permessi per leggere/scrivere la tua cartella cestino."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "bozze"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Non hai i permessi per leggere/scrivere la tua cartella bozze."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "modelli"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Non hai i permessi per leggere/scrivere la tua cartella dei modelli."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Ultima ricerca"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>La cartella <i>%4</i> esiste. %1 utilizzerà la cartella <i>%5</i> "
-"per i suoi messaggi. "
-"<p>%2 non può spostare il contenuto di <i>%6</i> in questa cartella, in quanto "
-"potrebbe andare a sostituire i file con lo stesso nome presenti in <i>%7</i>. "
-"<p><strong>Se sicuro di voler permettere che %3 sposti i messaggi di posta "
-"ora?</strong></qt>"
+"<qt>La cartella <i>%4</i> esiste. %1 utilizzerà la cartella <i>%5</i> per i "
+"suoi messaggi. <p>%2 non può spostare il contenuto di <i>%6</i> in questa "
+"cartella, in quanto potrebbe andare a sostituire i file con lo stesso nome "
+"presenti in <i>%7</i>. <p><strong>Se sicuro di voler permettere che %3 "
+"sposti i messaggi di posta ora?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>La cartella <i>%4</i> esiste. %1 ora usa la cartella <i>%5</i> "
-"per i suoi messaggi. %2 può spostare i contenuti di <i>%6</i> "
-"in questa cartella. "
+"<qt>La cartella <i>%4</i> esiste. %1 ora usa la cartella <i>%5</i> per i "
+"suoi messaggi. %2 può spostare i contenuti di <i>%6</i> in questa cartella. "
 "<p><strong>Vuoi che %3 sposti i file della posta ora?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrare i file della posta?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 "L'esecuzione di KMail verrà terminata adesso a causa di un errore fatale"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8764,11 +8609,11 @@ msgstr ""
 "L'errore è:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Svuota il cestino"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Sei sicuro di voler svuotare i cestini di tutti gli account?"
 
@@ -8843,8 +8688,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Ricevuta nuova posta</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8883,8 +8727,8 @@ msgstr "Vuoi davvero svuotare il cestino?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Sei sicuro di voler spostare tutti i messaggi della cartella <b>%1</b> "
 "nel cestino?</qt>"
@@ -8911,12 +8755,11 @@ msgstr "Elimina ricerca"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Sei sicuro di voler eliminare la ricerca <b>%1</b>? "
-"<br>Tutti i messaggi visualizzati saranno comunque disponibili nelle cartelle "
-"originali.</qt>"
+"<qt>Sei sicuro di voler eliminare la ricerca <b>%1</b>? <br>Tutti i messaggi "
+"visualizzati saranno comunque disponibili nelle cartelle originali.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8928,41 +8771,42 @@ msgstr "<qt>Sei sicuro di voler eliminare la cartella vuota <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Sei sicuro di voler eliminare la cartella vuota <b>%1</b> "
-"e tutte le sue sotto-cartelle? Queste sotto-cartelle potrebbero non essere "
-"vuote ed il loro contenuto verrà perso."
-"<p><b>Attenzione:</b> i messaggi cancellati non saranno salvati nel cestino ma "
-"eliminati in maniera permanente.</qt>"
+"<qt>Sei sicuro di voler eliminare la cartella vuota <b>%1</b> e tutte le sue "
+"sotto-cartelle? Queste sotto-cartelle potrebbero non essere vuote ed il loro "
+"contenuto verrà perso.<p><b>Attenzione:</b> i messaggi cancellati non "
+"saranno salvati nel cestino ma eliminati in maniera permanente.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Sei sicuro di voler eliminare la cartella <b>%1</b>"
-", perdendone il contenuto? "
-"<p><b>Attenzione:</b> i messaggi cancellati non saranno salvati nel cestino ma "
-"eliminati in maniera permanente.</qt>"
+"<qt>Sei sicuro di voler eliminare la cartella <b>%1</b>, perdendone il "
+"contenuto? <p><b>Attenzione:</b> i messaggi cancellati non saranno salvati "
+"nel cestino ma eliminati in maniera permanente.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Sei sicuro di voler eliminare la cartella <b>%1</b> "
-"e tutte le sue sotto-cartelle, perdendone il contenuto? "
-"<p><b>Attenzione:</b> i messaggi cancellati non saranno salvati nel cestino ma "
-"eliminati in maniera permanente.</qt>"
+"<qt>Sei sicuro di voler eliminare la cartella <b>%1</b> e tutte le sue sotto-"
+"cartelle, perdendone il contenuto? <p><b>Attenzione:</b> i messaggi "
+"cancellati non saranno salvati nel cestino ma eliminati in maniera "
+"permanente.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Eliminato"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8970,8 +8814,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Sei sicuro di voler aggiornare la cache IMAP?\n"
-"Attraverso questa operazione perderai tutte le modifiche fatte localmente alle "
-"tue cartelle IMAP."
+"Attraverso questa operazione perderai tutte le modifiche fatte localmente "
+"alle tue cartelle IMAP."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8979,13 +8823,13 @@ msgstr "Vuoi davvero effettuare la scadenza di tutti i vecchi messaggi?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"L'utilizzo dell'HTML nei messaggi di posta elettronica ti rende più vulnerabile "
-"allo \"spam\" e può aumentare la probabilità che il tuo sistema venga "
-"compromesso da attacchi presenti o futuri."
+"L'utilizzo dell'HTML nei messaggi di posta elettronica ti rende più "
+"vulnerabile allo \"spam\" e può aumentare la probabilità che il tuo sistema "
+"venga compromesso da attacchi presenti o futuri."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8998,12 +8842,12 @@ msgstr "Utilizza HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Caricare riferimenti esterni nelle mail HTML ti rende più vulnerabile allo "
-"\"spam\" e può aumentare la probabilità che il tuo sistema venga compromesso da "
-"attacchi presenti o futuri."
+"\"spam\" e può aumentare la probabilità che il tuo sistema venga compromesso "
+"da attacchi presenti o futuri."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -9019,14 +8863,14 @@ msgstr "Filtro su \"Mailing-List\" %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "La funzionalità di KMail \"fuori ufficio\" si basa su un filtro lato server. "
 "Non hai configurato ancora nessun server IMAP per questo compito.\n"
-"Per fare ciò utilizza la scheda \"filtri\" nel pannello di configurazione di un "
-"account IMAP."
+"Per fare ciò utilizza la scheda \"filtri\" nel pannello di configurazione di "
+"un account IMAP."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -9042,10 +8886,11 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Impossibile avviare il visualizzatore di log di GnuPG (kwatchgnupg); controlla "
-"l'installazione."
+"Impossibile avviare il visualizzatore di log di GnuPG (kwatchgnupg); "
+"controlla l'installazione."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9365,8 +9210,7 @@ msgstr "&Salva allegati..."
 msgid "Appl&y All Filters"
 msgstr "Appl&ica tutti i filtri"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&pplica filtro"
@@ -9414,7 +9258,8 @@ msgstr "Colonna dimen&sione"
 #: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Mostra/Nasconde la colonna della dimensione totale dei messaggi nelle cartelle."
+"Mostra/Nasconde la colonna della dimensione totale dei messaggi nelle "
+"cartelle."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9480,7 +9325,6 @@ msgstr "Messaggio successivo &non letto"
 msgid "Go to the next unread message"
 msgstr "Vai al messaggio successivo non letto"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Messaggio &precedente"
@@ -9528,8 +9372,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Fai scorrere in basso il messaggio attuale. Se sei già alla fine del messaggio "
-"attuale, vai al messaggio successivo non letto."
+"Fai scorrere in basso il messaggio attuale. Se sei già alla fine del "
+"messaggio attuale, vai al messaggio successivo non letto."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9619,69 +9463,73 @@ msgstr " Inizializzazione..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Questo messaggio contiene una richiesta di restituire una notifica di "
 "ricezione.\n"
-"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o una "
-"normale risposta."
+"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o "
+"una normale risposta."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Questo messaggio contiene una richiesta di inviare una notifica di ricezione.\n"
-"Essa contiene un'istruzione che è marcata come \"richiesta\", ma è sconosciuta "
-"a KMail.\n"
+"Questo messaggio contiene una richiesta di inviare una notifica di "
+"ricezione.\n"
+"Essa contiene un'istruzione che è marcata come \"richiesta\", ma è "
+"sconosciuta a KMail.\n"
 "Puoi ignorare la richiesta oppure lasciare che KMail invii un \"fallito\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Questo messaggio contiene una richiesta di inviare una notifica di ricezione,\n"
+"Questo messaggio contiene una richiesta di inviare una notifica di "
+"ricezione,\n"
 "ma è richiesto di inviare una notifica a più di un indirizzo.\n"
-"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o una "
-"normale risposta."
+"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o "
+"una normale risposta."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Questo messaggio contiene una richiesta di inviare una notifica di ricezione,\n"
+"Questo messaggio contiene una richiesta di inviare una notifica di "
+"ricezione,\n"
 "ma non è stato impostato un percorso di ritorno.\n"
-"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o una "
-"normale risposta."
+"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o "
+"una normale risposta."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Questo messaggio contiene una richiesta di inviare una notifica di ricezione,\n"
-"ma il percorso di ritorno è diverso dall'indirizzo per il quale la notifica era "
-"stata richiesta.\n"
-"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o una "
-"normale risposta."
+"Questo messaggio contiene una richiesta di inviare una notifica di "
+"ricezione,\n"
+"ma il percorso di ritorno è diverso dall'indirizzo per il quale la notifica "
+"era stata richiesta.\n"
+"Puoi ignorare la richiesta oppure lasciare che KMail invii un \"negato\" o "
+"una normale risposta."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9707,16 +9555,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Ricevuta: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Allegato: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Questo allegato è stato eliminato."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "L'allegato \"%1\" è stato eliminato."
 
@@ -9764,46 +9612,40 @@ msgstr "Proprietà parte messaggio"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Il <em>tipo MIME</em> del file.</p> "
-"<p>Normalmente, non devi modificare questa opzione, in quanto il tipo MIME del "
-"file è impostato automaticamente; tuttavia alcune volte, %1 può non rilevare "
-"correttamente il tipo. Attraverso questa opzione è possibile rimediare a questo "
-"problema.</p></qt>"
+"<qt> <p>Il <em>tipo MIME</em> del file.</p> <p>Normalmente, non devi "
+"modificare questa opzione, in quanto il tipo MIME del file è impostato "
+"automaticamente; tuttavia alcune volte, %1 può non rilevare correttamente il "
+"tipo. Attraverso questa opzione è possibile rimediare a questo problema.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>La dimensione della parte:</p> "
-"<p>alcune volte, %1 fornirà solo un dimensione stimata, perché il calcolo "
-"potrebbe richiedere molto tempo. Quando accade ciò, verrà mostrata la dicitura "
-"\"(stim.)\" accanto alla dimensione.</p></qt>"
+"<qt> <p>La dimensione della parte:</p> <p>alcune volte, %1 fornirà solo un "
+"dimensione stimata, perché il calcolo potrebbe richiedere molto tempo. "
+"Quando accade ciò, verrà mostrata la dicitura \"(stim.)\" accanto alla "
+"dimensione.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Il nome del file della parte:</p>"
-"<p>sebbene sia impostato in modo predefinito al nome del file allegato, esso "
-"non specifica il nome del file da allegare; semplicemente, suggerisce un nome "
-"di file da usare al programma di posta del destinatario del messaggio.</p></qt>"
+"<qt><p>Il nome del file della parte:</p><p>sebbene sia impostato in modo "
+"predefinito al nome del file allegato, esso non specifica il nome del file "
+"da allegare; semplicemente, suggerisce un nome di file da usare al programma "
+"di posta del destinatario del messaggio.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9811,18 +9653,16 @@ msgstr "&Descrizione:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Una descrizione della parte:</p> "
-"<p>questa è solo una descrizione generica della parte, un po' come l'oggetto di "
-"un messaggio serve per descrivere sinteticamente il messaggio stesso. Molti "
-"programmi di posta visualizzano questa informazione nella sezione anteprima, "
-"sotto l'icona dell'allegato.</p></qt>"
+"<qt> <p>Una descrizione della parte:</p> <p>questa è solo una descrizione "
+"generica della parte, un po' come l'oggetto di un messaggio serve per "
+"descrivere sinteticamente il messaggio stesso. Molti programmi di posta "
+"visualizzano questa informazione nella sezione anteprima, sotto l'icona "
+"dell'allegato.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9830,23 +9670,21 @@ msgstr "&Codifica:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>La codifica di trasporto di questa parte:</p> "
-"<p>normalmente non devi modificarla, in quanto %1 userà una codifica "
-"predefinita a seconda del tipo MIME; a volte però è possibile ridurre "
-"drasticamente la dimensione del messaggio utilizzando una codifica diversa. Ad "
-"esempio, nel caso di un file PostScript che non contiene dati binari ma solo "
-"testo semplice, scegliendo \"quoted-printable\" invece che \"base64\" è "
-"possibile ridurre il messaggio del 25%.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt> <p>La codifica di trasporto di questa parte:</p> <p>normalmente non "
+"devi modificarla, in quanto %1 userà una codifica predefinita a seconda del "
+"tipo MIME; a volte però è possibile ridurre drasticamente la dimensione del "
+"messaggio utilizzando una codifica diversa. Ad esempio, nel caso di un file "
+"PostScript che non contiene dati binari ma solo testo semplice, scegliendo "
+"\"quoted-printable\" invece che \"base64\" è possibile ridurre il messaggio "
+"del 25%.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9854,21 +9692,17 @@ msgstr "Suggerisci visualizzazione &automatica"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Seleziona questa opzione se vuoi suggerire al destinatario la "
+"<qt> <p>Seleziona questa opzione se vuoi suggerire al destinatario la "
 "visualizzazione automatica (in linea) di questa parte, nell'anteprima del "
-"messaggio, invece dell'icona;</p> "
-"<p>tecnicamente, questo comporta l'impostazione dell'intestazione <em>"
-"Content-Disposition</em> a \"in linea\" invece del predefinito \"allegato\".</p>"
-"</qt>"
+"messaggio, invece dell'icona;</p> <p>tecnicamente, questo comporta "
+"l'impostazione dell'intestazione <em>Content-Disposition</em> a \"in linea\" "
+"invece del predefinito \"allegato\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9876,16 +9710,13 @@ msgstr "&Firma questa parte"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Seleziona questa opzione se vuoi che questa parte del messaggio venga "
-"firmata;</p>"
-"<p>la firma sarà effettuata con la chiave che hai associato all'identità "
-"scelta.</p></qt>"
+"<qt><p>Seleziona questa opzione se vuoi che questa parte del messaggio venga "
+"firmata;</p><p>la firma sarà effettuata con la chiave che hai associato "
+"all'identità scelta.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9893,14 +9724,12 @@ msgstr "C&ifra questa parte"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Seleziona questa opzione se vuoi che questa parte del messaggio venga "
-"cifrata;</p>"
-"<p>la parte verrà cifrata per i destinatari di questo messaggio</p></qt>"
+"<qt> <p>Seleziona questa opzione se vuoi che questa parte del messaggio "
+"venga cifrata;</p><p>la parte verrà cifrata per i destinatari di questo "
+"messaggio</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9914,16 +9743,13 @@ msgstr "Filtro POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Messaggi da filtrare trovati sull'account POP: <b>%1</b>"
-"<p>I messaggi mostrati eccedono il limite massimo di dimensione definito per "
-"questo account."
-"<br> Puoi scegliere cosa fare facendo clic sul pulsante opportuno."
+"Messaggi da filtrare trovati sull'account POP: <b>%1</b><p>I messaggi "
+"mostrati eccedono il limite massimo di dimensione definito per questo "
+"account.<br> Puoi scegliere cosa fare facendo clic sul pulsante opportuno."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10176,40 +10002,39 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Scaricamento contenuto cartella</h2>"
-"<p>Attendere...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Scaricamento contenuto cartella</"
+"h2><p>Attendere...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Non in linea</h2>"
-"<p>KMail attualmente è in modalità non in linea. Fai clic <a "
-"href=\"kmail:goOnline\">qui</a> per andare in linea...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Non in linea</h2><p>KMail attualmente è in "
+"modalità non in linea. Fai clic <a href=\"kmail:goOnline\">qui</a> per "
+"andare in linea...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10217,18 +10042,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Benvenuto in KMail %1</h2>"
-"<p>KMail è un programma di posta elettronica per l'ambiente desktop TDE. È "
-"progettato per essere completamente compatibile con gli standard internet MIME, "
-"SMTP, POP3 e IMAP.</p>\n"
-"<ul>"
-"<li>KMail ha molte potenti funzionalità che sono descritte nella <a href=\"%2\">"
-"documentazione</a></li>\n"
+"<h2 style='margin-top: 0px;'>Benvenuto in KMail %1</h2><p>KMail è un "
+"programma di posta elettronica per l'ambiente desktop TDE. È progettato per "
+"essere completamente compatibile con gli standard internet MIME, SMTP, POP3 "
+"e IMAP.</p>\n"
+"<ul><li>KMail ha molte potenti funzionalità che sono descritte nella <a href="
+"\"%2\">documentazione</a></li>\n"
 "<li>Il <a href=\"%3\">sito di KMail</a> mette a disposizione maggiori "
 "informazioni sulle nuove versioni di KMail</li></ul>\n"
 "%8\n"
-"<p>Alcune delle nuove funzionalità di questa versione di KMail sono (rispetto a "
-"KMail %4, che fa parte di TDE %5):</p>\n"
+"<p>Alcune delle nuove funzionalità di questa versione di KMail sono "
+"(rispetto a KMail %4, che fa parte di TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10237,15 +10061,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; la squadra di KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10259,8 +10081,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Modifiche importanti</span> "
-"(rispetto a KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Modifiche importanti</"
+"span> (rispetto a KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10291,7 +10113,8 @@ msgstr "Visualizza allegato: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: l'allegato contiene dati binari. Viene mostrato solo il primo "
@@ -10321,14 +10144,16 @@ msgstr "Apro l'allegato?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "L'eliminazione di un allegato potrebbe invalidare eventuali firme digitali "
 "presenti nel messaggio."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "La modifica di un allegato potrebbe invalidare eventuali firme digitali "
 "presenti nel messaggio."
@@ -10351,6 +10176,58 @@ msgstr "(verifica almeno uno dei criteri seguenti)"
 msgid "(match all of the following)"
 msgstr "(verifica tutti i criteri seguenti)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Letto"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Vecchio"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Eliminato"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Risposto"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Inoltrato"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "In attesa"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Inviato"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Sorvegliato"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorato"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Da fare"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Ha un allegato"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Messaggio completo"
@@ -10428,26 +10305,27 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Spostamento del messaggio spedito \"%1\" dalla cartella \"posta in uscita\" "
 "alla cartella \"posta inviata\" fallito!\n"
 "È possibile che non ci sia abbastanza spazio disco oppure che i permessi di "
-"scrittura non siano impostati correttamente. Per piacere, cerca di risolvere il "
-"problema e sposta il messaggio manualmente."
+"scrittura non siano impostati correttamente. Per piacere, cerca di risolvere "
+"il problema e sposta il messaggio manualmente."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
-"Non è possibile inviare messaggi senza specificare l'indirizzo del mittente.\n"
-"Per piacere, imposta l'indirizzo di posta elettronica dell'identità '%1' nella "
-"sezione Identità del pannello di configurazione e prova di nuovo."
+"Non è possibile inviare messaggi senza specificare l'indirizzo del "
+"mittente.\n"
+"Per piacere, imposta l'indirizzo di posta elettronica dell'identità '%1' "
+"nella sezione Identità del pannello di configurazione e prova di nuovo."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10472,11 +10350,11 @@ msgstr "Inizializzazione procedura di spedizione..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Hai scelto di spedire tutti i messaggi in attesa utilizzando un trasporto non "
-"cifrato, vuoi continuare? "
+"Hai scelto di spedire tutti i messaggi in attesa utilizzando un trasporto "
+"non cifrato, vuoi continuare? "
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10501,8 +10379,9 @@ msgstr "Spedizione fallita di alcuni messaggi in attesa."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10520,21 +10399,17 @@ msgstr "Spedizione annullata."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Spedizione fallita:</p>"
-"<p>%1</p>"
-"<p>Il messaggio resterà nella cartella \"posta in uscita\" finché non "
-"risolverai il problema (es. indirizzo sbagliato) oppure fin quando non lo "
-"rimuoverai dalla cartella \"posta in uscita\".</p>"
-"<p>È stato utilizzato il seguente trasporto: %2</p> "
-"<p>Vuoi continuare con la spedizione dei restanti messaggi?</p>"
+"<p>Spedizione fallita:</p><p>%1</p><p>Il messaggio resterà nella cartella "
+"\"posta in uscita\" finché non risolverai il problema (es. indirizzo "
+"sbagliato) oppure fin quando non lo rimuoverai dalla cartella \"posta in "
+"uscita\".</p><p>È stato utilizzato il seguente trasporto: %2</p> <p>Vuoi "
+"continuare con la spedizione dei restanti messaggi?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10552,16 +10427,17 @@ msgstr "&Annulla spedizione"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Spedizione fallita:\n"
 "%1\n"
-"Il messaggio resterà nella cartella \"posta in uscita\" finché non risolverai "
-"il problema (es. indirizzo sbagliato) oppure fin quando non lo rimuoverai dalla "
-"cartella \"posta in uscita\".\n"
+"Il messaggio resterà nella cartella \"posta in uscita\" finché non "
+"risolverai il problema (es. indirizzo sbagliato) oppure fin quando non lo "
+"rimuoverai dalla cartella \"posta in uscita\".\n"
 "È stato utilizzato il seguente trasporto:\n"
 " %2"
 
@@ -10598,13 +10474,14 @@ msgstr "Sendmail è terminato in maniera anomala."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Devi fornire un nome utente ed una password per utilizzare questo server SMTP."
+"Devi fornire un nome utente ed una password per utilizzare questo server "
+"SMTP."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 sembra già essere in esecuzione su un altro display su questo computer. "
 "Eseguire %2 più di una volta può causare perdite di messaggi. Non dovresti "
@@ -10612,33 +10489,34 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "%1 sembra già essere in esecuzione su un altro display su questo computer. "
 "Eseguire %1 e %2 allo stesso tempo può causare perdite di messaggi. Non "
-"dovresti avviare %2 a meno che non sei sicuro che %1 non sia già in esecuzione."
+"dovresti avviare %2 a meno che non sei sicuro che %1 non sia già in "
+"esecuzione."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 sembra già essere in esecuzione su %2. Eseguire %1 più di una volta può "
-"causare perdite di messaggi. Non dovresti avviare %1 su questo computer a meno "
-"che non sei sicuro che non sia già in esecuzione su %2."
+"causare perdite di messaggi. Non dovresti avviare %1 su questo computer a "
+"meno che non sei sicuro che non sia già in esecuzione su %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 sembra essere in esecuzione su %3. Eseguire %1 e %2 allo stesso tempo può "
-"causare perdite di messaggi. Non dovresti avviare %2 su questo computer a meno "
-"che non sei sicuro che %1 non sia già in esecuzione su %3."
+"causare perdite di messaggi. Non dovresti avviare %2 su questo computer a "
+"meno che non sei sicuro che %1 non sia già in esecuzione su %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10649,6 +10527,10 @@ msgstr "Avvio %1"
 msgid "Exit"
 msgstr "Esci"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nuovi messaggi in"
@@ -10675,16 +10557,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet non è disponibile. Si raccomanda caldamente di usarlo per gestire le "
-"tue password.\n"
+"TDEWallet non è disponibile. Si raccomanda caldamente di usarlo per gestire "
+"le tue password.\n"
 "Però, KMail può anche salvare le password nel file della configurazione. La "
 "password è memorizzata in un formato offuscato, ma non dovrebbe essere "
-"considerata al sicuro da tentativi di decifrazione se si ottiene l'accesso al "
-"file di configurazione.\n"
+"considerata al sicuro da tentativi di decifrazione se si ottiene l'accesso "
+"al file di configurazione.\n"
 "Vuoi memorizzare la password per l'account '%1' nel file di configurazione?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10743,8 +10626,8 @@ msgstr "Il nome di dominio o l'indirizzo numerico del server SMTP."
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
 msgstr ""
-"Il numero di porta su cui il server SMTP è in ascolto. La porta predefinita è "
-"la 25."
+"Il numero di porta su cui il server SMTP è in ascolto. La porta predefinita "
+"è la 25."
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10756,8 +10639,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "Comando da avviare localmente, prima di spedire il messaggio. Può essere "
-"utilizzato per impostare un tunnel ssh, ad esempio. Lascia questa casella vuota "
-"se non vuoi avviare nessun comando."
+"utilizzato per impostare un tunnel ssh, ad esempio. Lascia questa casella "
+"vuota se non vuoi avviare nessun comando."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10765,12 +10648,12 @@ msgstr "Il server &richiede autorizzazione"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Seleziona questa opzione se il tuo server SMTP richiede l'autenticazione prima "
-"di accettare i messaggi. Questa funzionalità è conosciuta come \"SMTP con "
-"autenticazione\" o più semplicemente ASMTP."
+"Seleziona questa opzione se il tuo server SMTP richiede l'autenticazione "
+"prima di accettare i messaggi. Questa funzionalità è conosciuta come \"SMTP "
+"con autenticazione\" o più semplicemente ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10790,15 +10673,14 @@ msgstr "&Invia nome di host personalizzato al server"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Seleziona questa opzione per fare in modo che KMail utilizzi un nome di host "
-"personalizzato durante l'identificazione sul server di posta. "
-"<p>Ciò può essere utile quando il tuo nome di host di sistema non può essere "
-"impostato correttamente oppure per mascherarlo."
+"personalizzato durante l'identificazione sul server di posta. <p>Ciò può "
+"essere utile quando il tuo nome di host di sistema non può essere impostato "
+"correttamente oppure per mascherarlo."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10808,8 +10690,8 @@ msgstr "Nome di &host:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Inserisci il nome di host che KMail dovrebbe utilizzare per l'identificazione "
-"sul server."
+"Inserisci il nome di host che KMail dovrebbe utilizzare per "
+"l'identificazione sul server."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10829,8 +10711,8 @@ msgstr "Sono consentiti solo file locali."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Il campo host non può rimanere vuoto. Inserisci il nome o l'indirizzo IP del "
 "server SMTP."
@@ -10845,16 +10727,16 @@ msgstr "Errore durante l'elencazione della cartella %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "La rimozione della sottoscrizione locale dalle cartelle cancellerà tutte le "
 "informazioni presenti localmente riguardanti le cartelle stesse. Le cartelle "
 "non verranno modificate sul server. Premi annulla, se vuoi assicurarti che "
-"tutti i cambiamenti locali siano stati scritti sul server, controllando prima "
-"la posta."
+"tutti i cambiamenti locali siano stati scritti sul server, controllando "
+"prima la posta."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11075,35 +10957,29 @@ msgstr "&Modifica messaggio"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Le informazioni strutturate restituite dal plugin crittografico non possono "
-"essere processate correttamente; il plugin potrebbe essere danneggiato.</p> "
-"<p>Per piacere, contatta il tuo amministratore di sistema.</p></qt>"
+"<qt> <p>Le informazioni strutturate restituite dal plugin crittografico non "
+"possono essere processate correttamente; il plugin potrebbe essere "
+"danneggiato.</p> <p>Per piacere, contatta il tuo amministratore di sistema.</"
+"p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Non è stato trovato nessun plugin crittografico attivo e il codice interno "
-"di OpenPGP non è stato eseguito correttamente.</p> "
-"<p>Puoi fare due cose per risolvere questo problema:</p> "
-"<ul> "
-"<li>attivare un plugin utilizzando la finestra di dialogo Impostazioni->"
-"Configura KMail->Plugin.</li> "
-"<li>specificare le impostazioni tradizionali OpenPGP nella stessa finestra alla "
-"scheda Identità->Avanzate.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Non è stato trovato nessun plugin crittografico attivo e il codice "
+"interno di OpenPGP non è stato eseguito correttamente.</p> <p>Puoi fare due "
+"cose per risolvere questo problema:</p> <ul> <li>attivare un plugin "
+"utilizzando la finestra di dialogo Impostazioni->Configura KMail->Plugin.</"
+"li> <li>specificare le impostazioni tradizionali OpenPGP nella stessa "
+"finestra alla scheda Identità->Avanzate.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11115,11 +10991,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Il modulo chiasmus non offre la funzionalità \"x-encrypt\". Per favore segnala "
-"questo problema."
+"Il modulo chiasmus non offre la funzionalità \"x-encrypt\". Per favore "
+"segnala questo problema."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11135,16 +11011,16 @@ msgstr "Errore di cifratura chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Valore di ritorno inatteso dal modulo chiasmus: la funzionalità \"x-encrypt\" "
-"non ha restituito un array di byte. Per piacere segnala questo problema."
+"Valore di ritorno inatteso dal modulo chiasmus: la funzionalità \"x-encrypt"
+"\" non ha restituito un array di byte. Per piacere segnala questo problema."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Il formato crittografico del messaggio di OpenPGP in linea, non supporta la "
@@ -11169,8 +11045,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Esaminando le preferenze di firma dei destinatari risulta che vuoi che ti sia "
-"chiesto se firmare o no il messaggio.\n"
+"Esaminando le preferenze di firma dei destinatari risulta che vuoi che ti "
+"sia chiesto se firmare o no il messaggio.\n"
 "Vuoi firmare questo messaggio?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11200,8 +11076,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Hai richiesto di firmare questo messaggio, ma non è stata configurata nessuna "
-"chiave di firma per questa identità."
+"Hai richiesto di firmare questo messaggio, ma non è stata configurata "
+"nessuna chiave di firma per questa identità."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11253,17 +11129,18 @@ msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"Sono state trovate delle chiavi di cifratura affidabili per ogni destinatario.\n"
+"Sono state trovate delle chiavi di cifratura affidabili per ogni "
+"destinatario.\n"
 "Vuoi cifrare questo messaggio?"
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Esaminando le preferenze di cifratura dei destinatari risulta che vuoi che ti "
-"sia chiesto se cifrare o no il messaggio.\n"
+"Esaminando le preferenze di cifratura dei destinatari risulta che vuoi che "
+"ti sia chiesto se cifrare o no il messaggio.\n"
 "Vuoi cifrare questo messaggio?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11296,12 +11173,13 @@ msgstr "&Non cifrare"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Hai richiesto di cifrare questo messaggio, e di cifrare una copia per te "
-"stesso, ma non è stata configurata nessuna chiave di cifratura affidabile per "
-"questa identità."
+"stesso, ma non è stata configurata nessuna chiave di cifratura affidabile "
+"per questa identità."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11310,13 +11188,13 @@ msgstr "Spedisci senza cifratura?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Alcune parti di questo messaggio non saranno cifrate.\n"
-"Spedire dei messaggi solo parzialmente cifrati può violare la politica del sito "
-"oppure rivelare informazioni riservate.\n"
+"Spedire dei messaggi solo parzialmente cifrati può violare la politica del "
+"sito oppure rivelare informazioni riservate.\n"
 "Vuoi cifrare tutte le parti?"
 
 #: messagecomposer.cpp:950
@@ -11339,93 +11217,88 @@ msgstr "&Cifra tutte le parti"
 msgid "Unencrypted Message Warning"
 msgstr "Avvertimento di messaggio non cifrato"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Errore: il modulo non ha restituito nessun dato codificato.</p>"
-"<p>Per piacere segnala questo bug: "
-"<br>%2</p></qt>"
+"<qt><p>Errore: il modulo non ha restituito nessun dato codificato.</p><p>Per "
+"piacere segnala questo bug: <br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Non tutti i caratteri sono permessi dalla codifica scelta."
-"<br>"
-"<br>Spedire comunque il messaggio?</qt>"
+"<br><br>Spedire comunque il messaggio?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Alcuni caratteri andranno perduti"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Caratteri perduti"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Cambia codifica"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Questo messaggio non può essere firmato, in quanto il modulo scelto non sembra "
-"supportare la firma; ciò non dovrebbe mai accadere, per piacere segnala questo "
-"bug."
+"Questo messaggio non può essere firmato, in quanto il modulo scelto non "
+"sembra supportare la firma; ciò non dovrebbe mai accadere, per piacere "
+"segnala questo bug."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Questo messaggio non può essere firmato, in quanto il modulo scelto non sembra "
-"supportare la firma; ciò non dovrebbe mai accadere, per piacere segnala questo "
-"bug."
+"Questo messaggio non può essere firmato, in quanto il modulo scelto non "
+"sembra supportare la firma; ciò non dovrebbe mai accadere, per piacere "
+"segnala questo bug."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Log di controllo GnuPG per le operazioni di firma"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"L'operazione di firma non è riuscita. Assicurati che il programma gpg-agent sia "
-"in esecuzione."
+"L'operazione di firma non è riuscita. Assicurati che il programma gpg-agent "
+"sia in esecuzione."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Questo messaggio non può essere cifrato, in quanto il modulo scelto non sembra "
-"supportare la cifratura; ciò non dovrebbe mai accadere, per piacere segnala "
-"questo bug."
+"Questo messaggio non può essere cifrato, in quanto il modulo scelto non "
+"sembra supportare la cifratura; ciò non dovrebbe mai accadere, per piacere "
+"segnala questo bug."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Log di controllo GnuPG per le operazioni di cifratura"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Questo messaggio non può essere firmato e cifrato, in quanto il modulo scelto "
-"non sembra supportare la firma e la cifratura combinati; ciò non dovrebbe mai "
-"accadere, per piacere segnala questo bug."
+"Questo messaggio non può essere firmato e cifrato, in quanto il modulo "
+"scelto non sembra supportare la firma e la cifratura combinati; ciò non "
+"dovrebbe mai accadere, per piacere segnala questo bug."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11446,15 +11319,15 @@ msgstr "&Formato mailbox:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Seleziona se vuoi memorizzare i messaggi in questa cartella come un file per "
 "messaggio (maildir) o come un grosso file (mbox). KMail usa maildir come "
-"impostazione predefinita e ciò deve essere solo raramente cambiato. Se non sei "
-"sicuro, lascialo com'è."
+"impostazione predefinita e ciò deve essere solo raramente cambiato. Se non "
+"sei sicuro, lascialo com'è."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11463,12 +11336,13 @@ msgstr "&Contenuto cartella:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Seleziona se vuoi che la nuova cartella sia usata per la memorizzazione della "
-"posta o per la memorizzazione degli elementi di groupware come i compiti o le "
-"note. Il valore predefinito è la posta. Se non sei sicuro, lascialo com'è."
+"Seleziona se vuoi che la nuova cartella sia usata per la memorizzazione "
+"della posta o per la memorizzazione degli elementi di groupware come i "
+"compiti o le note. Il valore predefinito è la posta. Se non sei sicuro, "
+"lascialo com'è."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11508,8 +11382,7 @@ msgstr "Risultati differenti per le firme"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Il motore crittografico ha restituito dati non in chiaro."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stato: "
 
@@ -11538,11 +11411,11 @@ msgstr "Non è stato trovato nessun plugin %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Il messaggio è firmato ma la validità della firma non può essere verificata.<br "
-"/>Motivo: %1"
+"Il messaggio è firmato ma la validità della firma non può essere verificata."
+"<br />Motivo: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11576,28 +11449,28 @@ msgstr "Il plugin crittografico \"%1\" non può decifrare i messaggi."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b> questo messaggio HTML può contenere riferimenti esterni a immagini "
-"ecc. Per ragioni di sicurezza e privacy i riferimenti esterni non vengono "
-"caricati. Se ti fidi del mittente di questo messaggio puoi caricare i "
-"riferimenti esterni di questo messaggio <a href=\"kmail:loadExternal\">"
-"facendo clic qui</a>."
+"<b>Nota:</b> questo messaggio HTML può contenere riferimenti esterni a "
+"immagini ecc. Per ragioni di sicurezza e privacy i riferimenti esterni non "
+"vengono caricati. Se ti fidi del mittente di questo messaggio puoi caricare "
+"i riferimenti esterni di questo messaggio <a href=\"kmail:loadExternal"
+"\">facendo clic qui</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Nota:</b> Questo è un messaggio HTML. Per ragioni di sicurezza ne viene "
-"visualizzato solo il codice sorgente. Se il mittente di questo messaggio è di "
-"tua fiducia puoi attivare la visualizzazione HTML facendo clic <a "
-"href=\"kmail:showHTML\">qui</a>."
+"visualizzato solo il codice sorgente. Se il mittente di questo messaggio è "
+"di tua fiducia puoi attivare la visualizzazione HTML facendo clic <a href="
+"\"kmail:showHTML\">qui</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11850,8 +11723,8 @@ msgstr "memorizzato: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Nessun indirizzo è stato memorizzato nel %1 utilizzato per la firma, ciò non "
 "permette di confrontarlo con l'indirizzo del mittente %2."
@@ -11969,15 +11842,17 @@ msgstr "Messaggio di errore di Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Il tuo server POP3 (account: %1) non supporta il comando UIDL: esso serve per "
-"determinare, in maniera affidabile, quali messaggi sul server sono stati già "
-"visti da KMail;\n"
-"la funzionalità di lasciare i messaggi sul server non funzionerà correttamente."
+"Il tuo server POP3 (account: %1) non supporta il comando UIDL: esso serve "
+"per determinare, in maniera affidabile, quali messaggi sul server sono stati "
+"già visti da KMail;\n"
+"la funzionalità di lasciare i messaggi sul server non funzionerà "
+"correttamente."
 
 #: popaccount.cpp:752
 msgid ""
@@ -11997,7 +11872,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Scaricamento messaggio %1 di %2 (%3 di %4 KB) da %5@%6 (%7 KB lasciati sul "
 "server)."
@@ -12016,1940 +11892,15 @@ msgstr "Risposta del server non valida"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Il tuo server non supporta il comando TOP. Non è possibile recuperare le "
 "intestazioni dei messaggi più pesanti, prima di scaricarli completamente."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Vai"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Cartella"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Messa&ggio"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Rispondi speciale"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Inoltra"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barra degli strumenti HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Firma"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "F&irma automaticamente i messaggi"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Quando questa opzione è abilitata, tutti i messaggi che spedirai saranno "
-"firmati in modo predefinito; naturalmente è sempre possibile disabilitare la "
-"firma per ogni singolo messaggio."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Cifratura"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Quando cifri i messaggi di posta, ci&fra sempre, usando il certificato "
-"collegato alla mia identità"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Quando questa opzione è abilitata, il messaggio o il file non saranno cifrati "
-"solo con la chiave pubblica del destinatario, ma anche con la tua. Ciò ti darà "
-"la possibilità di decifrare il messaggio o il file in un secondo momento. "
-"Questo è generalmente una buona idea."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Mostra il testo f&irmato/cifrato dopo la composizione"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Quando questa opzione è abilitata, il testo firmato o cifrato sarà visualizzato "
-"in una finestra separata, dandoti la possibilità di vedere un'anteprima del "
-"messaggio che sarà inviato. Ciò è utile per verificare che il sistema di "
-"cifratura funzioni correttamente."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Memorizza i messaggi inviati in forma &cifrata"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Seleziona questa opzione per memorizzare i messaggi cifrati"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Memorizza i messaggi cifrati</h1>\n"
-"Quando questa casella è selezionata, i messaggi inviati saranno conservati in "
-"forma cifrata, come sono stati spediti. Ciò non è raccomandato, perché se il "
-"certificato utilizzato per la cifratura scade non sarà più possibile leggere i "
-"messaggi.\n"
-"<p>\n"
-"Ci potrebbero essere, comunque, delle ragioni per poter tenere questa opzione "
-"attiva. Se in dubbio, consulta il tuo amministratore locale.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Mostra sempre le chiavi di cifratura &per l'approvazione"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Quando questa opzione è abilitata, l'applicazione ti mostrerà sempre un elenco "
-"delle chiavi pubbliche tra cui puoi sceglierne una da utilizzare per la "
-"cifratura. Se questa opzione è disabilitata, l'applicazione mostrerà la "
-"finestra di dialogo solo se non è possibile trovare la chiave giusta o se ce ne "
-"sono diverse tra cui scegliere."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Cifra automaticamente i &messaggi quando possibile"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Quando questa opzione è abilitata, ogni messaggio che spedirai sarà cifrato se "
-"sarà possibile e desiderato; naturalmente è sempre possibile disabilitare la "
-"cifratura automatica per ogni singolo messaggio."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Non firmare/cifrare mai al sal&vataggio come bozza"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Come funziona?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "A: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Generale"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Risposta"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Risposta a tutti"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Inoltro"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Scorcia&toia:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Tipo di modello:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Proprietà cartella"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "La cartella contiene una &mailing list"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Indirizzo della lista:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormale:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Non l&etto:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Scadenza messaggi"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Effettua &scadenza dopo:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Effettua scadenza dei messaggi &letti"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Effettua scadenza &dopo:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Effettua scadenza dei messaggi &non letti"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Giorno(i)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Settimana(e)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mese(i)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avanzate"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Ident&ità mittente:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Formato di &memorizzazione:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Visualizzazione &lista:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Convalida i certificati utilizzando un CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Se questa opzione è selezionata, i certificati S/MIME verranno convalidati "
-"utilizzando le liste di revoca certificato (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Convalida in linea dei certificati (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Se questa opzione è selezionata, i certificati S/MIME saranno convalidati in "
-"linea utilizzando il protocollo OCSP (Online Certificates Status Protocol). "
-"Inserisci l'indirizzo del collegamento del risponditore OCSP qui sotto."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Convalida in linea del certificato"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Indirizzo del risponditore OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Inserisci qui l'indirizzo del server per la convalida in linea dei certificati. "
-"L'indirizzo del collegamento in genere inizia con http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Firma del risponditore OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignora l'URL di servizio dei certificati"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Non controllare le politiche dei certificati"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"GnuPG, utilizza in modo predefinito il file ~/.gnupg/policies.txt per "
-"controllare se una politica di certificato è permessa. Se questa opzione è "
-"selezionata, le politiche non verranno controllate."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Non consultare mai un CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Se questa opzione è selezionata, le liste di revoca certificato (CRL) non "
-"verranno mai utilizzate per convalidare i certificati S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Scarica i certificati emittente mancanti"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Se questa opzione è impostata, i certificati emittente mancanti vengono "
-"scaricati secondo necessità (ciò è valido per entrambi i metodi di convalida, "
-"CRL e OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Richieste HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Non effettuare nessuna richiesta HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Disabilita completamente l'utilizzo di HTTP per S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Utilizza questo proxy per le richieste HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Utilizza il proxy HTTP di sistema:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Se questa opzione è selezionata, il valore del proxy HTTP mostrato a destra "
-"(che viene dalla variabile d'ambiente http_proxy) sarà usato per ogni richiesta "
-"HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Inserisci qui l'indirizzo del tuo proxy HTTP, che sarà usato per tutte le "
-"richieste HTTP relative a S/MIME. La sintassi è host:porta, per esempio "
-"ilmioproxy.paperopoli.com:176671."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignora i punti di distribuzione CRL HTTP dei certificati"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Quando si cerca l'indirizzo di una CRL, il certificato da controllare di solito "
-"contiene quelle che sono note come voci \"Punto di distribuzione CRL\" (DP), "
-"che sono URL che descrivono il modo di accedere a un URL. Viene usata la prima "
-"voce DP trovata. Con questa opzione tutte le voci che usano lo schema HTTP sono "
-"ignorate quando si cerca un DP adatto."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Richieste LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Non effettuare nessuna richiesta LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Disabilita completamente l'utilizzo di LDAP per S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignora i punti di distribuzione CRL LDAP dei certificati"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Quando si cerca l'indirizzo di una CRL, il certificato da controllare di solito "
-"contiene quelle che sono note come voci \"Punto di distribuzione CRL\" (DP), "
-"che sono URL che descrivono il modo di accedere a un URL. Viene usata la prima "
-"voce DP trovata. Con questa opzione tutte le voci che usano lo schema LDAP sono "
-"ignorate quando si cerca un DP adatto."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Host primario per le richieste LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Inserire qui un server LDAP farà andare le richieste LDAP a quel server per "
-"primo. Più precisamente, questa impostazione cambia qualsiasi host e porta "
-"specificati in un URL LDAP e sarà usata anche se l'host e la porta sono stati "
-"omessi dall'URL. Gli altri server LDAP saranno usati solo se la connessione al "
-"\"proxy\" non riesce.\n"
-"La sintassi è \"HOST\" o \"HOST:PORTA\". Se PORTA viene omesso, viene usata la "
-"porta 389 (la porta standard LDAP)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Aggiungi frammento"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Aggiungi"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Frammento:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Gruppo:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Impostazioni per i frammenti"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Suggerimenti"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Mostra testo del frammento nel &suggerimento"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Determina se i suggerimenti debbano contenere il testo dalla linea segnata"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variabili"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Metodo di immissione delle variabili"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Finestra di dialogo singola per ogni variabile nel frammento"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-"Verrà mostrata una finestra di dialogo per ogni variabile in un frammento"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Una finestra di dialogo per tutte le variabili in un frammento"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Verrà mostrata una singola finestra di dialogo dove poter inserire i valori per "
-"tutte le variabili in un frammento"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Delimitatore:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Rispondi al mittente"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Rispondi a tutti / Rispondi alla lista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Inoltra messaggio"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Avverti prima di cercare di spedire messaggi &non firmati"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Seleziona questa opzione per essere avvertito prima di spedire messaggi non "
-"firmati."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti prima di cercare di spedire messaggi non firmati</h1>\n"
-"Se questa casella è selezionata, potrai essere avvertito quando cerchi di "
-"spedire parti di messaggio non firmate.\n"
-"<p>\n"
-"Si raccomanda di lasciare attiva questa opzione per la massima integrità.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Avverti prima di cercare di spedire messaggi non cifrati"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Seleziona questa opzione per essere avvertito prima di spedire un messaggio non "
-"cifrato."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti prima di cercare di spedire messaggi non cifrati</h1>"
-"n Se questa casella è selezionata, potrai essere avvertito quando cerchi di "
-"spedire parti di messaggio in modo non cifrato.\n"
-"<p>\n"
-"Si raccomanda di lasciare attiva questa opzione per la massima integrità.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Avverti se l'indirizzo del &mittente non è nel certificato"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Seleziona questa opzione per essere avvertito se l'indirizzo non è nel "
-"certificato"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti se l'indirizzo del destinatario non è nel certificato</h1>\n"
-"Se l'opzione è selezionata, sarà mostrato un avvertimento se l'indirizzo di "
-"posta elettronica del destinatario non è contenuto nel certificato utilizzato "
-"per la cifratura.\n"
-"<p>\n"
-"Si raccomanda di lasciare attiva questa opzione per la massima sicurezza.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Avverti se i certificati/chiavi scadono a breve (configuralo qui sotto)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Per la firma"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Per la cifratura"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " giorni"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Seleziona il numero dei giorni qui"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti se il certificato di firma è in scadenza</h1>\n"
-"Seleziona il numero minimo di giorni nei quali il certificato di cifratura "
-"dovrebbe essere valido prima di mostrare un avvertimento.\n"
-"<p>\n"
-"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti se il certificato di cifratura è in scadenza</h1>\n"
-"Seleziona il numero minimo di giorni nei quali il certificato di cifratura "
-"dovrebbe essere valido prima di mostrare un avvertimento.\n"
-"<p>\n"
-"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti se un certificato nella catena è in scadenza</h1>\n"
-"Seleziona il numero minimo di giorni nei quali tutti certificati nella catena "
-"dovrebbero essere validi prima di mostrare un avvertimento.\n"
-"<p>\n"
-"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti se il certificato CA è in scadenza</h1>\n"
-"Seleziona il numero minimo di giorni nei quali il certificato CA dovrebbe "
-"essere valido prima di mostrare un avvertimento.\n"
-"<p>\n"
-"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avverti se il certificato radice è in scadenza</h1>\n"
-"Seleziona il numero minimo di giorni nei quali il certificato radice dovrebbe "
-"essere valido prima di mostrare un avvertimento.\n"
-"<p>\n"
-"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Per i certificati radice:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Per i certificati CA intermedi:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Per i certificati/chiavi degli utilizzatori finali:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Riabilita tutti gli avvertimenti \"Non chiedere più\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Contenuto del modello"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Scorciatoia del modello"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Tipo di modello"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Spedisci messaggi in attesa al controllo della posta"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Scegli se vuoi che KMail spedisca tutti i messaggi in 'posta in uscita' al "
-"controllo manuale di nuova posta o al controllo di tutte le caselle, oppure se "
-"non vuoi che siano spediti automaticamente.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Sposta automaticamente i messaggi non sincronizzati dalle cartelle con permessi "
-"d'accesso insufficienti"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Se ci sono nuovi messaggi in una cartella non ancora caricati sul server, ma "
-"non ci sono permessi sufficienti sulla cartella remota, i messaggi verranno "
-"automaticamente spostati in una cartella lost+found."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Permetti contrassegni locali in cartelle a sola lettura"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Questa impostazione permette agli amministratori di impostare un ritardo minimo "
-"tra due controlli di posta.\"\n"
-"           \"L'utente non sarà in grado di scegliere un valore più piccolo di "
-"quello impostato qui."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"La cartella selezionata più recentemente nella finestra di selezione cartelle."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Ignora le impostazioni utente di umask e utilizza \"lettura-scrittura solo "
-"utente\""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politica di visualizzazione dell'icona nel vassoio di sistema"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Chiudi l'applicazione quando la finestra principale viene chiusa anche se è "
-"attiva l'icona nel vassoio di sistema."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Notifica di nuova posta più informativa"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Se questa opzione è abilitata per ogni cartella il numero dei nuovi messaggi "
-"ricevuti sarà mostrato nella notifica di nuova posta; altrimenti, riceverai "
-"semplicemente un messaggio di 'Ricevuta nuova posta'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Specifica l'e&ditor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Utilizza un editor &esterno invece del compositore"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"La soglia superata la quale si deve avvisare l'utente che una cartella è vicina "
-"al suo limite di quota."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Abilita funzionalità di groupware"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Modifica intestazioni Da: / A: nelle risposte agli inviti"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook ha alcune limitazioni nell'implementazione dello standard "
-"iCalendar; questa opzione fa in modo che possa funzionare. Se hai problemi con "
-"utenti di Outlook che non riescono a risponderti, prova ad attivare questa "
-"opzione."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Spedisci inviti di groupware nel corpo del messaggio"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook ha alcune limitazioni nell'implementazione dello standard "
-"iCalendar; questa opzione fa in modo che possa funzionare. Se hai problemi con "
-"utenti di Outlook che non riescono a ricevere gli inviti, prova ad attivare "
-"questa opzione."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Nomi inviti compatibili con Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook, quando utilizzato in combinazione con il server Microsoft "
-"Exchange, ha dei problemi di compatibilità con i messaggi di groupware. Abilita "
-"questa opzione per spedire inviti di groupware in modo che Microsoft Exchange "
-"non dia problemi."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Quando questo è selezionato, non vedrai la finestra del compositore delle "
-"lettere. Invece, tutte le mail di invito sono inviate automaticamente. Se vuoi "
-"vedere la mail prima di inviarla, puoi deselezionare questa opzione. Però, "
-"tieni presente che il testo nella finestra del compositore è in sintassi "
-"iCalendar, e non dovresti provare a modificarlo a mano."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Elimina i messaggi di invito dopo che è stata inviata la risposta "
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Quando è marcata, i messaggi di invito ricevuti a cui si è risposto verranno "
-"spostati nella cartella del cestino dopo che la risposta è stata inviata con "
-"successo."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Abilitando questa opzione è possibile conservare le voci delle applicazioni "
-"Kontact (KOrganizer, KAddressBook, e KNotes.)</p>"
-"<p>Se vuoi impostare questa opzione devi anche fare in modo che le applicazioni "
-"utilizzino la risorsa IMAP; ciò può essere fatto nel Centro di Controllo di "
-"TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>In genere non dovresti avere nessun motivo per visualizzare le cartelle che "
-"contengono risorse IMAP. Ma se ne hai veramente bisogno, puoi farlo "
-"impostandolo qui.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Se l'account utilizzato per memorizzare le informazione di groupware \"\n"
-"          \"non è usato per gestire la posta normale, imposta questa opzione "
-"per fare in modo che KMail mostri \"\n"
-"          \"solo le cartelle di groupware. Ciò è utile se gestisci la posta "
-"normale \"\n"
-"          \"attraverso un account aggiuntivo IMAP in linea.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Scegli il formato di memorizzazione per le cartelle di groupware. "
-"<ul>"
-"<li>Il formato predefinito è usare gli standard ical (per le cartelle dei "
-"calendari) e vcard (per le cartelle delle rubriche). Questo formato rende "
-"disponibili tutte le funzionalità di Kontact.</li>"
-"<li>Il formato XML Kolab usa un modello personalizzato che corrisponde più da "
-"vicino a quello usato in Outlook. Questo formato dà una migliore compatibilità "
-"con Outlook, quando si sa un server Kolab o una soluzione compatibile.</li></ul>"
-"</p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Questa opzione permette di scegliere il padre delle cartelle risorsa "
-"IMAP.</p>"
-"<p>In modo predefinito, il server Kolab imposta la 'posta in arrivo' IMAP come "
-"padre.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Questo è l'identificativo dell'account che contiene le cartelle risorsa "
-"IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Se vuoi impostare il nome della cartella dello spazio IMAP nella tua lingua, "
-"puoi scegliere tra le seguenti lingue.</p> "
-"<p>Nota che l'unica ragione per fare ciò è per compatibilità con Microsoft "
-"Outlook. È considerata una cattiva idea fare questo, dato che rende le "
-"modifiche alle lingue impossibili. </p>"
-"<p>Non farlo a meno che non sia necessario.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Filtra anche i nuovi messaggi ricevuti nelle cartelle di groupware."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Sincronizza le modifiche di groupware nelle cartelle di tipo DIMAP non appena "
-"ritorni in linea."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Questo valore è utilizzato per decidere se deve essere mostrata l'introduzione "
-"a KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Numero massimo di connessioni per host"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Questa opzione può essere utilizzata per limitare il numero di connessioni per "
-"host durante il controllo della nuova posta. Come impostazione predefinita il "
-"numero di connessioni è illimitato (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Mostra casella di testo della ricerca veloce"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Questa opzione abilita o disabilita la casella di testo della ricerca veloce "
-"sopra la lista dei messaggi, che può essere usata per cercare rapidamente tra "
-"le informazioni mostrate nella lista dei messaggi."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Nascondi la posta in arrivo locale se non usata"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Inoltra in linea come predefinito."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Consenti l'uso del carattere di punto e virgola (\";\") come separatore nel "
-"compositore di messaggi."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Mantieni se possibile l'insieme di caratteri originale nella risposta o "
-"nell'inoltro"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Aggiungi a&utomaticamente la firma"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ricorda questa identità, in modo che potrà essere utilizzata anche nelle "
-"finestre successive del compositore.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ricorda questa cartella per la posta inviata, in modo che potrà essere "
-"utilizzata in futuro nella finestra del compositore."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ricorda questo trasporto posta, in modo che potrà essere utilizzato in futuro "
-"nella finestra del compositore."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ricorda questa identità, in modo che potrà essere utilizzata anche nelle "
-"finestre successive del compositore.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "A &capo automatico alla colonna:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Avverti se i&l certificato di radice scade tra meno di:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Abilita questa opzione per rendere i nomi dei tuoi allegati che contengono "
-"caratteri non standard, compatibili con Outlook &#8482;"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-"Richiedi automaticamente le notifiche delle disposizioni sul &messaggio"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Abilita questa opzione se vuoi che KMail richieda le notifiche delle "
-"disposizioni sul messaggio (Message Disposition Notifications, MDN) per ogni "
-"tuo messaggio in uscita.</p>"
-"<p>Questa opzione interviene solo sul modo predefinito, puoi sempre abilitare o "
-"disabilitare le notifiche per ogni messaggio nel compositore alla voce di menu: "
-"<em>Opzioni</em>-><em>Richiedi notifica delle disposizioni</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Utilizza indirizzi recenti per l'autocompletamento"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Disabilita questa opzione se non vuoi che gli indirizzi recenti appaiano nella "
-"lista di autocompletamento del campo indirizzo durante la composizione."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Intervallo del salvataggio automatico:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Una copia di sicurezza del testo contenuto nella finestra di composizione può "
-"essere creata ad intervalli regolari. L'intervallo può essere impostato qui. "
-"Puoi disabilitare il salvataggio automatico impostandolo al valore 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Inserisci le firme sopra il testo citato"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Sostituisci il prefi&sso riconosciuto con \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Sostituisci il prefisso riconosciuto con \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Utilizza &citazioni intelligenti"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "La firma è scaduta."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tipo di selettore dei destinatari"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Seleziona il tipo di finestra per selezionare i destinatari per A,\n"
-"        CC e BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Tipo di editor dei destinatari"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Seleziona il tipo di editor dei destinatari per modificare A,\n"
-"        CC e BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Numero massimo di righe dell'editor dei destinatari."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Elenco dei tipi delle parti dei messaggi da rimuovere quando un messaggio viene "
-"inoltrato in linea."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Dimensione massima consentita in MB per un allegato."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-"Mostra la gestione frammenti di testo e il pannello inserimenti nel "
-"compositore."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Mostra il log di controllo GnuPG anche quando un'operazione crittografica si è "
-"completata con successo."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Mantieni se possibile l'insieme di caratteri originale nella risposta o "
-"nell'inoltro"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Alcune mail, specialmente quelle generate automaticamente, non specificano la "
-"codifica dei caratteri che deve essere usata per visualizzarle correttamente. "
-"In questi casi sarà usata una codifica di riserva, che puoi configurare qui. "
-"Impostala alla codifica più usata nella tua parte del mondo. Come impostazione "
-"predefinita viene usata la codifica configurata per tutto il sistema."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Cambiarla dal suo valore predefinito 'Auto' forzerà l'uso della codifica "
-"specificata per tutte le mail, indipendentemente da cosa queste specifichino."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Abilita questa opzione se vuoi che le faccine come questa :-) appaiano nel "
-"testo del messaggio sostituiti dalle emoticon (piccole immagini)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Abilita questa opzione per visualizzare differenti livelli di testo citato. "
-"Disabilitala per nascondere i livelli."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Livello espansione automatica:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Riduci dimensione caratteri per il testo citato"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Abilita questa opzione per visualizzare il testo citato con caratteri più "
-"piccoli."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Memorizza i messaggi inviati in forma &cifrata"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Mostra l'user agent nelle intestazioni eleganti"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Abilita questa opzione per fare in modo che le intestazioni User-Agent e "
-"X-Mailer siano visualizzati nelle intestazioni eleganti."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Consente di eliminare gli allegati dei messaggi esistenti."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Consente di modificare gli allegati dei messaggi esistenti."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-"Decifra sempre i messaggi durante la visualizzazione o chiedi prima di "
-"decifrare"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Invia notifiche delle disposizioni con un mittente vuoto."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Invia le notifiche delle disposizioni con un mittente vuoto. Alcuni server "
-"potrebbero essere configurati per rifiutare questi messaggi, se noti dei "
-"problemi inviando le notifiche di disposizione, deseleziona questa opzione."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Le frasi sono state trasformate in modelli"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Le vecchie frasi sono state trasformate in modelli"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Modello di messaggio per i nuovi messaggi"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Modello di messaggio per le risposte"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Modello di messaggio per le risposte a tutti"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Modello di messaggio per gli inoltri"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Caratteri di citazione"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Consenti agli utenti di modificare le impostazioni \"fuori ufficio\"."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Consenti agli utenti di inviare script sieve \"fuori ufficio\", ma non "
-"consentire la modifica delle impostazioni, come le scelte sul dominio a cui "
-"reagire e la reazione allo spam."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Manda risposte \"fuori ufficio\" solo ai messaggi provenienti da questo "
-"dominio."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Consenti l'invio di risposte \"fuori ufficio\" a messaggi marcati come SPAM."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Controlla se è ancora configurata e attiva una risposta \"fuori ufficio\" "
-"quando esegui KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 di %2 %3 utilizzato"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14058,6 +12009,11 @@ msgstr "Aggiungi al campo CC"
 msgid "Add as BCC"
 msgstr "Aggiungi al campo BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Annulla"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14073,15 +12029,15 @@ msgstr "Destinatari selezionati"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Hai selezionato un destinatario. Il massimo numero di destinatari supportati è "
-"%1. Seleziona il giusto numero.\n"
-"Hai selezionato %n destinatari. Il massimo numero di destinatari supportati è "
-"%1. Seleziona il giusto numero."
+"Hai selezionato un destinatario. Il massimo numero di destinatari supportati "
+"è %1. Seleziona il giusto numero.\n"
+"Hai selezionato %n destinatari. Il massimo numero di destinatari supportati "
+"è %1. Seleziona il giusto numero."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -14097,11 +12053,11 @@ msgstr "Usa la finestra di selezione degli indirizzi"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Questo pulsante apre una finestra separata dove puoi selezionare i destinatari "
-"da tutti gli indirizzi disponibili."
+"Questo pulsante apre una finestra separata dove puoi selezionare i "
+"destinatari da tutti gli indirizzi disponibili."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14203,13 +12159,23 @@ msgstr "è maggiore o uguale di"
 msgid " bytes"
 msgstr " byte"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " giorni"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Per eseguire la tua ricerca tutti i messaggi della cartella %1 devono essere "
-"scaricati dal server. Potrebbe volerci un po'. Vuoi continuare la tua ricerca?"
+"scaricati dal server. Potrebbe volerci un po'. Vuoi continuare la tua "
+"ricerca?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14355,16 +12321,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Riunisci i dati per l'account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Riunisci i dati per l'account '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14383,10 +12345,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Contenuto dello script '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Contenuto dello script '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14409,20 +12369,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Proprietà sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Proprietà sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Nessuna speciale proprietà disponibile)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Script sieve disponibili:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Script sieve disponibili:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14500,12 +12456,12 @@ msgstr "Utilizza questo campo per inserire una firma statica."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Utilizza questo pulsante per specificare il file di testo che contiene la tua "
-"firma. Sarà letto ogni volta che crei un nuovo messaggio o aggiungi una nuova "
-"firma."
+"Utilizza questo pulsante per specificare il file di testo che contiene la "
+"tua firma. Sarà letto ogni volta che crei un nuovo messaggio o aggiungi una "
+"nuova firma."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14521,22 +12477,27 @@ msgstr "Apre il file specificato in un editor di testi."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Puoi aggiungere un commando arbitrario qui, con o senza percorso completo a "
-"seconda se il comando è presente o no nella variabile d'ambiente PATH. Per ogni "
-"nuovo messaggio, KMail, eseguirà questo comando ed utilizzerà il suo risultato "
-"come firma. In genere i comandi utilizzati con questo sistema sono \"fortune\" "
-"oppure \"ksig -random\"."
+"seconda se il comando è presente o no nella variabile d'ambiente PATH. Per "
+"ogni nuovo messaggio, KMail, eseguirà questo comando ed utilizzerà il suo "
+"risultato come firma. In genere i comandi utilizzati con questo sistema sono "
+"\"fortune\" oppure \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "S&pecifica comando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Percorso"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nuova voce:"
@@ -14570,6 +12531,11 @@ msgstr "Aggiungi gruppo"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Vuoi davvero rimuovere questo gruppo e tutti i suoi frammenti?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Applica &a:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Modifica frammento"
@@ -14582,6 +12548,10 @@ msgstr "Modifica gruppo"
 msgid "Edit &group..."
 msgstr "Modifica &gruppo..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Modifica..."
@@ -14620,14 +12590,14 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Se abiliti questa opzione, il valore inserito a destra sarà salvato. Se "
-"riutilizzerai successivamente la stessa variabile, anche in un altro frammento, "
-"il valore inserito sarà utilizzato come valore predefinito per quella "
-"variabile."
+"riutilizzerai successivamente la stessa variabile, anche in un altro "
+"frammento, il valore inserito sarà utilizzato come valore predefinito per "
+"quella variabile."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14662,6 +12632,16 @@ msgstr "Non abilitare"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Impossibile inserire il contenuto dal file %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "A: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14691,58 +12671,51 @@ msgstr "Impossibile avviare un comando in pipe da un modello: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Qui puoi creare dei modelli da utilizzare nella composizione di nuovi "
-"messaggi, di risposte oppure di inoltri.</p> "
-"<p>I modelli di messaggio permettono la sostituzione dei comandi semplicemente "
-"digitandoli o selezionandoli dal menu <i>inserisci comando</i>.</p> "
-"<p>I modelli definiti qui sono riferiti alla cartella. Modificandoli si "
-"cambiano le impostazioni globali e per identità.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>Qui puoi creare dei modelli da utilizzare nella composizione di "
+"nuovi messaggi, di risposte oppure di inoltri.</p> <p>I modelli di messaggio "
+"permettono la sostituzione dei comandi semplicemente digitandoli o "
+"selezionandoli dal menu <i>inserisci comando</i>.</p> <p>I modelli definiti "
+"qui sono riferiti alla cartella. Modificandoli si cambiano le impostazioni "
+"globali e per identità.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Qui puoi creare dei modelli da utilizzare nella composizione di nuovi "
-"messaggi, di risposte oppure di inoltri.</p> "
-"<p>I modelli di messaggio permettono la sostituzione dei comandi semplicemente "
-"digitandoli o selezionandoli dal menu <i>inserisci comando</i>.</p> "
-"<p>I modelli definiti qui sono riferiti alla identità. Modificandoli si "
-"cambiano le impostazioni globali, ma non quelle per cartella.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>Qui puoi creare dei modelli da utilizzare nella composizione di "
+"nuovi messaggi, di risposte oppure di inoltri.</p> <p>I modelli di messaggio "
+"permettono la sostituzione dei comandi semplicemente digitandoli o "
+"selezionandoli dal menu <i>inserisci comando</i>.</p> <p>I modelli definiti "
+"qui sono riferiti alla identità. Modificandoli si cambiano le impostazioni "
+"globali, ma non quelle per cartella.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Qui puoi creare dei modelli da utilizzare nella composizione di nuovi "
-"messaggi, di risposte oppure di inoltri.</p> "
-"<p>I modelli di messaggio permettono la sostituzione dei comandi semplicemente "
-"digitandoli o selezionandoli dal menu <i>inserisci comando</i>.</p> "
-"<p>Questo è il modello globale (predefinito). Possono essere soppiantati dai "
-"modelli per identità o per cartella, se esistenti.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>Qui puoi creare dei modelli da utilizzare nella composizione di "
+"nuovi messaggi, di risposte oppure di inoltri.</p> <p>I modelli di messaggio "
+"permettono la sostituzione dei comandi semplicemente digitandoli o "
+"selezionandoli dal menu <i>inserisci comando</i>.</p> <p>Questo è il modello "
+"globale (predefinito). Possono essere soppiantati dai modelli per identità o "
+"per cartella, se esistenti.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -15003,6 +12976,10 @@ msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 "Metti in pipe il corpo del messaggio attuale e sostituiscilo con il risultato"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Imposta la posizione del cursore"
@@ -15035,117 +13012,6 @@ msgstr "Attiva il debug"
 msgid "Turn Debug Off"
 msgstr "Disattiva il debug"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...che puoi andare al messaggio successivo e precedente utilizzando "
-"rispettivamente i tasti con le frecce destro e sinistro?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...che puoi creare rapidamente i filtri sul mittente, destinatario,\n"
-"oggetto e mailing list con <em>Strumenti->Crea&nbsp;filtro</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...che puoi eliminare il &quot;[nome mailing list]&quot;\n"
-"aggiunto nell'oggetto dei messaggi ricevuti da alcune mailing list\n"
-"utilizzando l'azione del filtro <em>riscrivi intestazione</em>?\n"
-"Fai così:\n"
-"<pre>riscrivi intestazione &quot;Subject&quot;\n"
-"   sostituisci &quot;\\s*\\[nome mailing list\\]\\s*&quot;\n"
-"   con &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...che puoi associare le mailing list alle cartelle nella finestra di "
-"dialogo\n"
-"<em>Cartella-&gt;Gestione mailing list</em>? Poi, puoi utilizzare\n"
-"<em>Messaggio-&gt;Nuovo&nbsp;Messaggio&nbsp;alla&nbsp;mailing&nbsp;list...</em>"
-"\n"
-"per aprire la finestra di composizione con l'indirizzo della mailing list "
-"preimpostato.\n"
-"In alternativa, puoi fare clic con il pulsante centrale del mouse sulla "
-"cartella.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...che puoi assegnare delle icone personalizzate ad ogni singola cartella?\n"
-"Dai uno sguardo a <em>Cartella->Proprietà...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...che KMail può mostrare una barra colorata per indicare\n"
-"il tipo di messaggio (testo semplice/HTML/OpenPGP) visualizzato?</p>\n"
-"<p>Ciò rende visibile i tentativi di camuffare le verifiche di firma\n"
-"inviando messaggi in HTML che imitano il modo in cui KMail inserisce le "
-"firme.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...che puoi filtrare ogni intestazione semplicemente inserendone\n"
-"il nome nel primo campo di modifica di una regola di ricerca?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...che puoi filtrare i messaggi solo HTML con la regola\n"
-"<pre>&quot;Content-type&quot; contiene &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...che quando rispondi ad un messaggio, solo la parte di testo selezionata "
-"viene citata?</p>\n"
-"<p>Se non è selezionato nulla, viene citato l'intero messaggio.</p>\n"
-"<p>Tutto ciò funziona anche con il testo degli allegati quando\n"
-"si seleziona <em>Visualizza-&gt;Allegati-&gt;In linea</em>.</p>\n"
-"<p>Questa funzionalità è disponibile con tutti i comandi di risposta\n"
-"eccetto per <em>Messaggio-&gt;Rispondi senza citare</em>.</p>\n"
-"<p align=\"right\"><em>contributo di David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Non c'è niente da annullare."
@@ -15210,6 +13076,16 @@ msgstr "Allegato #%1 (senza nome)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Mostra il log di controllo GnuPG per questa operazione"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Un file con nome \"%1\" esiste già. Sei sicuro di volerlo sovrascrivere?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Sovrascrivi file?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15257,7 +13133,8 @@ msgid ""
 "Default values will be used."
 msgstr ""
 "Qualcuno (probabilmente tu) ha modificato lo script \"vacanze\" sul server.\n"
-"KMail non è in grado di determinare i parametri per le risposte automatiche.\n"
+"KMail non è in grado di determinare i parametri per le risposte "
+"automatiche.\n"
 "Verrano utilizzati i valori predefiniti."
 
 #: vacation.cpp:657
@@ -15326,13 +13203,14 @@ msgstr "&Spedisci immagine con ogni messaggio"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Segna questa casella se vuoi che KMail aggiunga una cosiddetta intestazione "
-"X-Face ai messaggi scritti con questa identità. Una X-Face è una piccola (48×48 "
-"pixel) immagine in bianco e nero che alcuni programmi possono visualizzare."
+"X-Face ai messaggi scritti con questa identità. Una X-Face è una piccola "
+"(48×48 pixel) immagine in bianco e nero che alcuni programmi possono "
+"visualizzare."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15360,13 +13238,13 @@ msgstr "Seleziona file..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Usa questo per selezionare un file immagine da cui creare l'immagine. "
-"L'immagine dovrebbe essere di elevato contrasto e di forma quasi quadrata. Uno "
-"sfondo chiaro migliorerà il risultato."
+"L'immagine dovrebbe essere di elevato contrasto e di forma quasi quadrata. "
+"Uno sfondo chiaro migliorerà il risultato."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15374,21 +13252,21 @@ msgstr "Imposta dalla rubrica"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Puoi usare una versione ridotta dell'immagine che hai impostato nella tua voce "
-"della rubrica."
+"Puoi usare una versione ridotta dell'immagine che hai impostato nella tua "
+"voce della rubrica."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail può inviare delle piccole (48×48 pixel) immagini monocromatiche di "
-"bassa qualità con ogni messaggio. Per esempio, potrebbe essere una tua foto o "
-"un simbolo. Viene mostrata nel programma di posta del destinatario (se "
+"bassa qualità con ogni messaggio. Per esempio, potrebbe essere una tua foto "
+"o un simbolo. Viene mostrata nel programma di posta del destinatario (se "
 "supportata)."
 
 #: xfaceconfigurator.cpp:180
@@ -15397,12 +13275,11 @@ msgstr "Utilizza questo campo per inserire una stringa X-Face arbitraria."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Esempi sono disponibili all'indirizzo <a "
-"href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</"
-"a>."
+"Esempi sono disponibili all'indirizzo <a href=\"http://www.xs4all.nl/~ace/X-"
+"Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15417,130 +13294,1841 @@ msgstr "Nessuna immagine"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Non hai definito il tuo contatto nella rubrica."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Totali: %2<br>Non letti: %3<br>Dimensione: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Firma"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Quota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "F&irma automaticamente i messaggi"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Imposta l'oggetto del messaggio"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Quando questa opzione è abilitata, tutti i messaggi che spedirai saranno "
+"firmati in modo predefinito; naturalmente è sempre possibile disabilitare la "
+"firma per ogni singolo messaggio."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Spedisci in CC: a \"indirizzo\""
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Cifratura"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Spedisci in BCC: a \"indirizzo\""
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Quando cifri i messaggi di posta, ci&fra sempre, usando il certificato "
+"collegato alla mia identità"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Aggiungi intestazione al messaggio"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Quando questa opzione è abilitata, il messaggio o il file non saranno "
+"cifrati solo con la chiave pubblica del destinatario, ma anche con la tua. "
+"Ciò ti darà la possibilità di decifrare il messaggio o il file in un secondo "
+"momento. Questo è generalmente una buona idea."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Leggi il corpo del messaggio da \"file\""
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Mostra il testo f&irmato/cifrato dopo la composizione"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Imposta il corpo del messaggio"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Quando questa opzione è abilitata, il testo firmato o cifrato sarà "
+"visualizzato in una finestra separata, dandoti la possibilità di vedere "
+"un'anteprima del messaggio che sarà inviato. Ciò è utile per verificare che "
+"il sistema di cifratura funzioni correttamente."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Aggiungi un allegato al messaggio. Questa opzione può essere ripetuta"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Memorizza i messaggi inviati in forma &cifrata"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Controlla solo la presenza di nuovi messaggi"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Seleziona questa opzione per memorizzare i messaggi cifrati"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Apri solo la finestra del compositore"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Memorizza i messaggi cifrati</h1>\n"
+"Quando questa casella è selezionata, i messaggi inviati saranno conservati "
+"in forma cifrata, come sono stati spediti. Ciò non è raccomandato, perché se "
+"il certificato utilizzato per la cifratura scade non sarà più possibile "
+"leggere i messaggi.\n"
+"<p>\n"
+"Ci potrebbero essere, comunque, delle ragioni per poter tenere questa "
+"opzione attiva. Se in dubbio, consulta il tuo amministratore locale.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Visualizza il file del messaggio dato"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Mostra sempre le chiavi di cifratura &per l'approvazione"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Spedisci il messaggio a \"indirizzo\" oppure allega il file a cui punta \"URL\""
+"Quando questa opzione è abilitata, l'applicazione ti mostrerà sempre un "
+"elenco delle chiavi pubbliche tra cui puoi sceglierne una da utilizzare per "
+"la cifratura. Se questa opzione è disabilitata, l'applicazione mostrerà la "
+"finestra di dialogo solo se non è possibile trovare la chiave giusta o se ce "
+"ne sono diverse tra cui scegliere."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Letto"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Cifra automaticamente i &messaggi quando possibile"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Vecchio"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Quando questa opzione è abilitata, ogni messaggio che spedirai sarà cifrato "
+"se sarà possibile e desiderato; naturalmente è sempre possibile disabilitare "
+"la cifratura automatica per ogni singolo messaggio."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Eliminato"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Non firmare/cifrare mai al sal&vataggio come bozza"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Risposto"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Come funziona?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Inoltrato"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Generale"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "In attesa"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Risposta"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Inviato"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Risposta a tutti"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Sorvegliato"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Inoltro"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorato"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Scorcia&toia:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Tipo di modello:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Contenuto del modello"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Da fare"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Scorciatoia del modello"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Ha un allegato"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Tipo di modello"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 di %2 %3 utilizzato"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Proprietà cartella"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Percorso"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "La cartella contiene una &mailing list"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Indirizzo della lista:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormale:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Non l&etto:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Scadenza messaggi"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Effettua &scadenza dopo:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Effettua scadenza dei messaggi &letti"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Effettua scadenza &dopo:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Effettua scadenza dei messaggi &non letti"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Giorno(i)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Settimana(e)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mese(i)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avanzate"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Ident&ità mittente:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Formato di &memorizzazione:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Visualizzazione &lista:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Spedisci messaggi in attesa al controllo della posta"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Un file con nome \"%1\" esiste già. Sei sicuro di volerlo sovrascrivere?"
+"<qt><p>Scegli se vuoi che KMail spedisca tutti i messaggi in 'posta in "
+"uscita' al controllo manuale di nuova posta o al controllo di tutte le "
+"caselle, oppure se non vuoi che siano spediti automaticamente.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Sovrascrivi file?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Sposta automaticamente i messaggi non sincronizzati dalle cartelle con "
+"permessi d'accesso insufficienti"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Se ci sono nuovi messaggi in una cartella non ancora caricati sul server, ma "
+"non ci sono permessi sufficienti sulla cartella remota, i messaggi verranno "
+"automaticamente spostati in una cartella lost+found."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Permetti contrassegni locali in cartelle a sola lettura"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Questa impostazione permette agli amministratori di impostare un ritardo "
+"minimo tra due controlli di posta.\"\n"
+"           \"L'utente non sarà in grado di scegliere un valore più piccolo "
+"di quello impostato qui."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"La cartella selezionata più recentemente nella finestra di selezione "
+"cartelle."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Ignora le impostazioni utente di umask e utilizza \"lettura-scrittura solo "
+"utente\""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politica di visualizzazione dell'icona nel vassoio di sistema"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Chiudi l'applicazione quando la finestra principale viene chiusa anche se è "
+"attiva l'icona nel vassoio di sistema."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Notifica di nuova posta più informativa"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Se questa opzione è abilitata per ogni cartella il numero dei nuovi messaggi "
+"ricevuti sarà mostrato nella notifica di nuova posta; altrimenti, riceverai "
+"semplicemente un messaggio di 'Ricevuta nuova posta'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Specifica l'e&ditor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Utilizza un editor &esterno invece del compositore"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"La soglia superata la quale si deve avvisare l'utente che una cartella è "
+"vicina al suo limite di quota."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Abilita funzionalità di groupware"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Modifica intestazioni Da: / A: nelle risposte agli inviti"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook ha alcune limitazioni nell'implementazione dello standard "
+"iCalendar; questa opzione fa in modo che possa funzionare. Se hai problemi "
+"con utenti di Outlook che non riescono a risponderti, prova ad attivare "
+"questa opzione."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Spedisci inviti di groupware nel corpo del messaggio"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook ha alcune limitazioni nell'implementazione dello standard "
+"iCalendar; questa opzione fa in modo che possa funzionare. Se hai problemi "
+"con utenti di Outlook che non riescono a ricevere gli inviti, prova ad "
+"attivare questa opzione."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Nomi inviti compatibili con Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook, quando utilizzato in combinazione con il server Microsoft "
+"Exchange, ha dei problemi di compatibilità con i messaggi di groupware. "
+"Abilita questa opzione per spedire inviti di groupware in modo che Microsoft "
+"Exchange non dia problemi."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Quando questo è selezionato, non vedrai la finestra del compositore delle "
+"lettere. Invece, tutte le mail di invito sono inviate automaticamente. Se "
+"vuoi vedere la mail prima di inviarla, puoi deselezionare questa opzione. "
+"Però, tieni presente che il testo nella finestra del compositore è in "
+"sintassi iCalendar, e non dovresti provare a modificarlo a mano."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Elimina i messaggi di invito dopo che è stata inviata la risposta "
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Quando è marcata, i messaggi di invito ricevuti a cui si è risposto verranno "
+"spostati nella cartella del cestino dopo che la risposta è stata inviata con "
+"successo."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Abilitando questa opzione è possibile conservare le voci delle "
+"applicazioni Kontact (KOrganizer, KAddressBook, e KNotes.)</p><p>Se vuoi "
+"impostare questa opzione devi anche fare in modo che le applicazioni "
+"utilizzino la risorsa IMAP; ciò può essere fatto nel Centro di Controllo di "
+"TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>In genere non dovresti avere nessun motivo per visualizzare le cartelle "
+"che contengono risorse IMAP. Ma se ne hai veramente bisogno, puoi farlo "
+"impostandolo qui.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Se l'account utilizzato per memorizzare le informazione di groupware \"\n"
+"          \"non è usato per gestire la posta normale, imposta questa opzione "
+"per fare in modo che KMail mostri \"\n"
+"          \"solo le cartelle di groupware. Ciò è utile se gestisci la posta "
+"normale \"\n"
+"          \"attraverso un account aggiuntivo IMAP in linea.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Scegli il formato di memorizzazione per le cartelle di groupware. "
+"<ul><li>Il formato predefinito è usare gli standard ical (per le cartelle "
+"dei calendari) e vcard (per le cartelle delle rubriche). Questo formato "
+"rende disponibili tutte le funzionalità di Kontact.</li><li>Il formato XML "
+"Kolab usa un modello personalizzato che corrisponde più da vicino a quello "
+"usato in Outlook. Questo formato dà una migliore compatibilità con Outlook, "
+"quando si sa un server Kolab o una soluzione compatibile.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Questa opzione permette di scegliere il padre delle cartelle risorsa IMAP."
+"</p><p>In modo predefinito, il server Kolab imposta la 'posta in arrivo' "
+"IMAP come padre.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Questo è l'identificativo dell'account che contiene le cartelle risorsa "
+"IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Se vuoi impostare il nome della cartella dello spazio IMAP nella tua "
+"lingua, puoi scegliere tra le seguenti lingue.</p> <p>Nota che l'unica "
+"ragione per fare ciò è per compatibilità con Microsoft Outlook. È "
+"considerata una cattiva idea fare questo, dato che rende le modifiche alle "
+"lingue impossibili. </p><p>Non farlo a meno che non sia necessario.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Filtra anche i nuovi messaggi ricevuti nelle cartelle di groupware."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Sincronizza le modifiche di groupware nelle cartelle di tipo DIMAP non "
+"appena ritorni in linea."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Questo valore è utilizzato per decidere se deve essere mostrata "
+"l'introduzione a KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Numero massimo di connessioni per host"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Questa opzione può essere utilizzata per limitare il numero di connessioni "
+"per host durante il controllo della nuova posta. Come impostazione "
+"predefinita il numero di connessioni è illimitato (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Mostra casella di testo della ricerca veloce"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Questa opzione abilita o disabilita la casella di testo della ricerca veloce "
+"sopra la lista dei messaggi, che può essere usata per cercare rapidamente "
+"tra le informazioni mostrate nella lista dei messaggi."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Nascondi la posta in arrivo locale se non usata"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Inoltra in linea come predefinito."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Consenti l'uso del carattere di punto e virgola (\";\") come separatore nel "
+"compositore di messaggi."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Mantieni se possibile l'insieme di caratteri originale nella risposta o "
+"nell'inoltro"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Aggiungi a&utomaticamente la firma"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ricorda questa identità, in modo che potrà essere utilizzata anche nelle "
+"finestre successive del compositore.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Ricorda questa cartella per la posta inviata, in modo che potrà essere "
+"utilizzata in futuro nella finestra del compositore."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Ricorda questo trasporto posta, in modo che potrà essere utilizzato in "
+"futuro nella finestra del compositore."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ricorda questa identità, in modo che potrà essere utilizzata anche nelle "
+"finestre successive del compositore.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "A &capo automatico alla colonna:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Avverti se i&l certificato di radice scade tra meno di:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Abilita questa opzione per rendere i nomi dei tuoi allegati che contengono "
+"caratteri non standard, compatibili con Outlook &#8482;"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+"Richiedi automaticamente le notifiche delle disposizioni sul &messaggio"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Abilita questa opzione se vuoi che KMail richieda le notifiche delle "
+"disposizioni sul messaggio (Message Disposition Notifications, MDN) per ogni "
+"tuo messaggio in uscita.</p><p>Questa opzione interviene solo sul modo "
+"predefinito, puoi sempre abilitare o disabilitare le notifiche per ogni "
+"messaggio nel compositore alla voce di menu: <em>Opzioni</em>-><em>Richiedi "
+"notifica delle disposizioni</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Utilizza indirizzi recenti per l'autocompletamento"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Disabilita questa opzione se non vuoi che gli indirizzi recenti appaiano "
+"nella lista di autocompletamento del campo indirizzo durante la composizione."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Intervallo del salvataggio automatico:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Una copia di sicurezza del testo contenuto nella finestra di composizione "
+"può essere creata ad intervalli regolari. L'intervallo può essere impostato "
+"qui. Puoi disabilitare il salvataggio automatico impostandolo al valore 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Inserisci le firme sopra il testo citato"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Sostituisci il prefi&sso riconosciuto con \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Sostituisci il prefisso riconosciuto con \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Utilizza &citazioni intelligenti"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "La firma è scaduta."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tipo di selettore dei destinatari"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Seleziona il tipo di finestra per selezionare i destinatari per A,\n"
+"        CC e BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Tipo di editor dei destinatari"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Seleziona il tipo di editor dei destinatari per modificare A,\n"
+"        CC e BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Numero massimo di righe dell'editor dei destinatari."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Elenco dei tipi delle parti dei messaggi da rimuovere quando un messaggio "
+"viene inoltrato in linea."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Dimensione massima consentita in MB per un allegato."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+"Mostra la gestione frammenti di testo e il pannello inserimenti nel "
+"compositore."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Mostra il log di controllo GnuPG anche quando un'operazione crittografica si "
+"è completata con successo."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Mantieni se possibile l'insieme di caratteri originale nella risposta o "
+"nell'inoltro"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Alcune mail, specialmente quelle generate automaticamente, non specificano "
+"la codifica dei caratteri che deve essere usata per visualizzarle "
+"correttamente. In questi casi sarà usata una codifica di riserva, che puoi "
+"configurare qui. Impostala alla codifica più usata nella tua parte del "
+"mondo. Come impostazione predefinita viene usata la codifica configurata per "
+"tutto il sistema."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Cambiarla dal suo valore predefinito 'Auto' forzerà l'uso della codifica "
+"specificata per tutte le mail, indipendentemente da cosa queste specifichino."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Abilita questa opzione se vuoi che le faccine come questa :-) appaiano nel "
+"testo del messaggio sostituiti dalle emoticon (piccole immagini)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Abilita questa opzione per visualizzare differenti livelli di testo citato. "
+"Disabilitala per nascondere i livelli."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Livello espansione automatica:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Riduci dimensione caratteri per il testo citato"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Abilita questa opzione per visualizzare il testo citato con caratteri più "
+"piccoli."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Memorizza i messaggi inviati in forma &cifrata"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Mostra l'user agent nelle intestazioni eleganti"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Abilita questa opzione per fare in modo che le intestazioni User-Agent e X-"
+"Mailer siano visualizzati nelle intestazioni eleganti."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Consente di eliminare gli allegati dei messaggi esistenti."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Consente di modificare gli allegati dei messaggi esistenti."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+"Decifra sempre i messaggi durante la visualizzazione o chiedi prima di "
+"decifrare"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Invia notifiche delle disposizioni con un mittente vuoto."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Invia le notifiche delle disposizioni con un mittente vuoto. Alcuni server "
+"potrebbero essere configurati per rifiutare questi messaggi, se noti dei "
+"problemi inviando le notifiche di disposizione, deseleziona questa opzione."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Le frasi sono state trasformate in modelli"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Le vecchie frasi sono state trasformate in modelli"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Modello di messaggio per i nuovi messaggi"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Modello di messaggio per le risposte"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Modello di messaggio per le risposte a tutti"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Modello di messaggio per gli inoltri"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Caratteri di citazione"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Consenti agli utenti di modificare le impostazioni \"fuori ufficio\"."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Consenti agli utenti di inviare script sieve \"fuori ufficio\", ma non "
+"consentire la modifica delle impostazioni, come le scelte sul dominio a cui "
+"reagire e la reazione allo spam."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Manda risposte \"fuori ufficio\" solo ai messaggi provenienti da questo "
+"dominio."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Consenti l'invio di risposte \"fuori ufficio\" a messaggi marcati come SPAM."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Controlla se è ancora configurata e attiva una risposta \"fuori ufficio\" "
+"quando esegui KMail."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Modifica &file"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Modifica..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Vai"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Cartella"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Messa&ggio"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Rispondi speciale"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Inoltra"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Suggerimenti"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Impostazioni per i frammenti"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra degli strumenti HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opzioni comuni"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barra degli strumenti HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Convalida i certificati utilizzando un CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Se questa opzione è selezionata, i certificati S/MIME verranno convalidati "
+"utilizzando le liste di revoca certificato (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Convalida in linea dei certificati (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Se questa opzione è selezionata, i certificati S/MIME saranno convalidati in "
+"linea utilizzando il protocollo OCSP (Online Certificates Status Protocol). "
+"Inserisci l'indirizzo del collegamento del risponditore OCSP qui sotto."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Convalida in linea del certificato"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Indirizzo del risponditore OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Inserisci qui l'indirizzo del server per la convalida in linea dei "
+"certificati. L'indirizzo del collegamento in genere inizia con http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Firma del risponditore OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignora l'URL di servizio dei certificati"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Non controllare le politiche dei certificati"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"GnuPG, utilizza in modo predefinito il file ~/.gnupg/policies.txt per "
+"controllare se una politica di certificato è permessa. Se questa opzione è "
+"selezionata, le politiche non verranno controllate."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Non consultare mai un CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Se questa opzione è selezionata, le liste di revoca certificato (CRL) non "
+"verranno mai utilizzate per convalidare i certificati S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Scarica i certificati emittente mancanti"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Se questa opzione è impostata, i certificati emittente mancanti vengono "
+"scaricati secondo necessità (ciò è valido per entrambi i metodi di "
+"convalida, CRL e OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Richieste HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Non effettuare nessuna richiesta HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Disabilita completamente l'utilizzo di HTTP per S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Utilizza questo proxy per le richieste HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Utilizza il proxy HTTP di sistema:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Se questa opzione è selezionata, il valore del proxy HTTP mostrato a destra "
+"(che viene dalla variabile d'ambiente http_proxy) sarà usato per ogni "
+"richiesta HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Inserisci qui l'indirizzo del tuo proxy HTTP, che sarà usato per tutte le "
+"richieste HTTP relative a S/MIME. La sintassi è host:porta, per esempio "
+"ilmioproxy.paperopoli.com:176671."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignora i punti di distribuzione CRL HTTP dei certificati"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Quando si cerca l'indirizzo di una CRL, il certificato da controllare di "
+"solito contiene quelle che sono note come voci \"Punto di distribuzione CRL"
+"\" (DP), che sono URL che descrivono il modo di accedere a un URL. Viene "
+"usata la prima voce DP trovata. Con questa opzione tutte le voci che usano "
+"lo schema HTTP sono ignorate quando si cerca un DP adatto."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Richieste LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Non effettuare nessuna richiesta LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Disabilita completamente l'utilizzo di LDAP per S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignora i punti di distribuzione CRL LDAP dei certificati"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Quando si cerca l'indirizzo di una CRL, il certificato da controllare di "
+"solito contiene quelle che sono note come voci \"Punto di distribuzione CRL"
+"\" (DP), che sono URL che descrivono il modo di accedere a un URL. Viene "
+"usata la prima voce DP trovata. Con questa opzione tutte le voci che usano "
+"lo schema LDAP sono ignorate quando si cerca un DP adatto."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Host primario per le richieste LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Inserire qui un server LDAP farà andare le richieste LDAP a quel server per "
+"primo. Più precisamente, questa impostazione cambia qualsiasi host e porta "
+"specificati in un URL LDAP e sarà usata anche se l'host e la porta sono "
+"stati omessi dall'URL. Gli altri server LDAP saranno usati solo se la "
+"connessione al \"proxy\" non riesce.\n"
+"La sintassi è \"HOST\" o \"HOST:PORTA\". Se PORTA viene omesso, viene usata "
+"la porta 389 (la porta standard LDAP)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Aggiungi frammento"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Aggiungi"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Frammento:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Gruppo:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Impostazioni per i frammenti"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Suggerimenti"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Mostra testo del frammento nel &suggerimento"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Determina se i suggerimenti debbano contenere il testo dalla linea segnata"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variabili"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Metodo di immissione delle variabili"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Finestra di dialogo singola per ogni variabile nel frammento"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+"Verrà mostrata una finestra di dialogo per ogni variabile in un frammento"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Una finestra di dialogo per tutte le variabili in un frammento"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Verrà mostrata una singola finestra di dialogo dove poter inserire i valori "
+"per tutte le variabili in un frammento"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Delimitatore:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Rispondi al mittente"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Rispondi a tutti / Rispondi alla lista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Inoltra messaggio"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Avverti prima di cercare di spedire messaggi &non firmati"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Seleziona questa opzione per essere avvertito prima di spedire messaggi non "
+"firmati."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti prima di cercare di spedire messaggi non firmati</h1>\n"
+"Se questa casella è selezionata, potrai essere avvertito quando cerchi di "
+"spedire parti di messaggio non firmate.\n"
+"<p>\n"
+"Si raccomanda di lasciare attiva questa opzione per la massima integrità.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Avverti prima di cercare di spedire messaggi non cifrati"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Seleziona questa opzione per essere avvertito prima di spedire un messaggio "
+"non cifrato."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti prima di cercare di spedire messaggi non cifrati</h1>n Se questa "
+"casella è selezionata, potrai essere avvertito quando cerchi di spedire "
+"parti di messaggio in modo non cifrato.\n"
+"<p>\n"
+"Si raccomanda di lasciare attiva questa opzione per la massima integrità.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Avverti se l'indirizzo del &mittente non è nel certificato"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Seleziona questa opzione per essere avvertito se l'indirizzo non è nel "
+"certificato"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti se l'indirizzo del destinatario non è nel certificato</h1>\n"
+"Se l'opzione è selezionata, sarà mostrato un avvertimento se l'indirizzo di "
+"posta elettronica del destinatario non è contenuto nel certificato "
+"utilizzato per la cifratura.\n"
+"<p>\n"
+"Si raccomanda di lasciare attiva questa opzione per la massima sicurezza.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Avverti se i certificati/chiavi scadono a breve (configuralo qui sotto)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Per la firma"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Per la cifratura"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Seleziona il numero dei giorni qui"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti se il certificato di firma è in scadenza</h1>\n"
+"Seleziona il numero minimo di giorni nei quali il certificato di cifratura "
+"dovrebbe essere valido prima di mostrare un avvertimento.\n"
+"<p>\n"
+"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti se il certificato di cifratura è in scadenza</h1>\n"
+"Seleziona il numero minimo di giorni nei quali il certificato di cifratura "
+"dovrebbe essere valido prima di mostrare un avvertimento.\n"
+"<p>\n"
+"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti se un certificato nella catena è in scadenza</h1>\n"
+"Seleziona il numero minimo di giorni nei quali tutti certificati nella "
+"catena dovrebbero essere validi prima di mostrare un avvertimento.\n"
+"<p>\n"
+"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti se il certificato CA è in scadenza</h1>\n"
+"Seleziona il numero minimo di giorni nei quali il certificato CA dovrebbe "
+"essere valido prima di mostrare un avvertimento.\n"
+"<p>\n"
+"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avverti se il certificato radice è in scadenza</h1>\n"
+"Seleziona il numero minimo di giorni nei quali il certificato radice "
+"dovrebbe essere valido prima di mostrare un avvertimento.\n"
+"<p>\n"
+"L'impostazione SPHINX raccomandata è di 14 giorni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Per i certificati radice:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Per i certificati CA intermedi:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Per i certificati/chiavi degli utilizzatori finali:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Riabilita tutti gli avvertimenti \"Non chiedere più\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...che puoi andare al messaggio successivo e precedente utilizzando "
+"rispettivamente i tasti con le frecce destro e sinistro?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...che puoi creare rapidamente i filtri sul mittente, destinatario,\n"
+"oggetto e mailing list con <em>Strumenti->Crea&nbsp;filtro</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...che puoi eliminare il &quot;[nome mailing list]&quot;\n"
+"aggiunto nell'oggetto dei messaggi ricevuti da alcune mailing list\n"
+"utilizzando l'azione del filtro <em>riscrivi intestazione</em>?\n"
+"Fai così:\n"
+"<pre>riscrivi intestazione &quot;Subject&quot;\n"
+"   sostituisci &quot;\\s*\\[nome mailing list\\]\\s*&quot;\n"
+"   con &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...che puoi associare le mailing list alle cartelle nella finestra di "
+"dialogo\n"
+"<em>Cartella-&gt;Gestione mailing list</em>? Poi, puoi utilizzare\n"
+"<em>Messaggio-&gt;Nuovo&nbsp;Messaggio&nbsp;alla&nbsp;mailing&nbsp;list...</"
+"em>\n"
+"per aprire la finestra di composizione con l'indirizzo della mailing list "
+"preimpostato.\n"
+"In alternativa, puoi fare clic con il pulsante centrale del mouse sulla "
+"cartella.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...che puoi assegnare delle icone personalizzate ad ogni singola "
+"cartella?\n"
+"Dai uno sguardo a <em>Cartella->Proprietà...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...che KMail può mostrare una barra colorata per indicare\n"
+"il tipo di messaggio (testo semplice/HTML/OpenPGP) visualizzato?</p>\n"
+"<p>Ciò rende visibile i tentativi di camuffare le verifiche di firma\n"
+"inviando messaggi in HTML che imitano il modo in cui KMail inserisce le "
+"firme.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...che puoi filtrare ogni intestazione semplicemente inserendone\n"
+"il nome nel primo campo di modifica di una regola di ricerca?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...che puoi filtrare i messaggi solo HTML con la regola\n"
+"<pre>&quot;Content-type&quot; contiene &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...che quando rispondi ad un messaggio, solo la parte di testo "
+"selezionata viene citata?</p>\n"
+"<p>Se non è selezionato nulla, viene citato l'intero messaggio.</p>\n"
+"<p>Tutto ciò funziona anche con il testo degli allegati quando\n"
+"si seleziona <em>Visualizza-&gt;Allegati-&gt;In linea</em>.</p>\n"
+"<p>Questa funzionalità è disponibile con tutti i comandi di risposta\n"
+"eccetto per <em>Messaggio-&gt;Rispondi senza citare</em>.</p>\n"
+"<p align=\"right\"><em>contributo di David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Mostra la ricerca veloce delle cartelle"
@@ -15563,7 +15151,9 @@ msgstr "Sovrascrivi file?"
 #~ msgstr "Recupero nuovi messaggi in corso"
 
 #~ msgid "Only filter mails received in disconnected IMAP inbox."
-#~ msgstr "Filtra solo i messaggi ricevuti nella posta in arrivo di tipo IMAP disconnesso."
+#~ msgstr ""
+#~ "Filtra solo i messaggi ricevuti nella posta in arrivo di tipo IMAP "
+#~ "disconnesso."
 
 #~ msgid "Show folder quick search line edit"
 #~ msgstr "Mostra casella di testo per la ricerca veloce delle cartelle"
@@ -15581,7 +15171,8 @@ msgstr "Sovrascrivi file?"
 #~ msgstr "La cartella di destinazione era %1, con URL %2."
 
 #~ msgid "The error message from the server communication is here:"
-#~ msgstr "Il messaggio di errore della comunicazione con il server è il seguente:"
+#~ msgstr ""
+#~ "Il messaggio di errore della comunicazione con il server è il seguente:"
 
 #~ msgid "Todo"
 #~ msgstr "Da fare"
@@ -15632,21 +15223,28 @@ msgstr "Sovrascrivi file?"
 #~ msgstr "C&ifra tutte le parti del messaggio"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Seleziona per cifrare tutte le parti del messaggio in modo predefinito"
+#~ msgstr ""
+#~ "Seleziona per cifrare tutte le parti del messaggio in modo predefinito"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Cifra tutte le parti del messaggio come impostazione predefinita</h1>\n"
-#~ "Se questa impostazione è selezionata, tutte le parti di un messaggio (cioè il corpo principale del messaggio e tutti gli allegati) saranno cifrate come impostazione predefinita.\n"
+#~ "<h1>Cifra tutte le parti del messaggio come impostazione predefinita</"
+#~ "h1>\n"
+#~ "Se questa impostazione è selezionata, tutte le parti di un messaggio "
+#~ "(cioè il corpo principale del messaggio e tutti gli allegati) saranno "
+#~ "cifrate come impostazione predefinita.\n"
 #~ "<p>\n"
-#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni singolo messaggio.\n"
+#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni "
+#~ "singolo messaggio.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15658,12 +15256,16 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Chiedi prima di cifrare ogni parte</h1>\n"
-#~ "Quando questa opzione è selezionata, per ogni parte del messaggio (cioè il corpo principale del messaggio e tutti gli allegati), ti sarà chiesto, una alla volta, se vuoi che sia cifrata.\n"
+#~ "Quando questa opzione è selezionata, per ogni parte del messaggio (cioè "
+#~ "il corpo principale del messaggio e tutti gli allegati), ti sarà chiesto, "
+#~ "una alla volta, se vuoi che sia cifrata.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15677,14 +15279,17 @@ msgstr "Sovrascrivi file?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Non cifrare i messaggi</h1>\n"
-#~ "Se questa opzione è selezionata, i messaggi non sono cifrati come impostazione predefinita.\n"
+#~ "Se questa opzione è selezionata, i messaggi non sono cifrati come "
+#~ "impostazione predefinita.\n"
 #~ "<p>\n"
-#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni singolo messaggio.\n"
+#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni "
+#~ "singolo messaggio.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15696,20 +15301,34 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo di cifratura</h1>\n"
-#~ "Un algoritmo è una descrizione fatta per il computer di come dovrebbe effettuare un certo compito. L'algoritmo di cifratura descrive come il computer deve applicare la tua chiave di destinatario al messaggio in modo che solo il destinatario voluto possa leggerlo.\n"
+#~ "Un algoritmo è una descrizione fatta per il computer di come dovrebbe "
+#~ "effettuare un certo compito. L'algoritmo di cifratura descrive come il "
+#~ "computer deve applicare la tua chiave di destinatario al messaggio in "
+#~ "modo che solo il destinatario voluto possa leggerlo.\n"
 #~ "<p>\n"
-#~ "La selezione di un certo algoritmo di cifratura determina quanto facile o difficile sarà intercettare e leggere un messaggio. Tuttavia, tutti gli algoritmi forniti nell'ambiente SPHINX sono considerati molto sicuri. Generalmente, l'impostazione predefinita funzionerà benone.\n"
+#~ "La selezione di un certo algoritmo di cifratura determina quanto facile o "
+#~ "difficile sarà intercettare e leggere un messaggio. Tuttavia, tutti gli "
+#~ "algoritmi forniti nell'ambiente SPHINX sono considerati molto sicuri. "
+#~ "Generalmente, l'impostazione predefinita funzionerà benone.\n"
 #~ "<p>\n"
-#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni singolo messaggio.\n"
+#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni "
+#~ "singolo messaggio.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15721,16 +15340,21 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Il controllo può finire con un certificato salvato localmente</h1>\n"
-#~ "Se questa opzione è segnata, il controllo della catena dei certificati può finire con un certificato salvato localmente.\n"
+#~ "Se questa opzione è segnata, il controllo della catena dei certificati "
+#~ "può finire con un certificato salvato localmente.\n"
 #~ "<p>\n"
-#~ "I certificati salvati localmente sono i tuoi certificati e i certificati dei partner di comunicazione e delle autorità di certificazione (AC).\n"
+#~ "I certificati salvati localmente sono i tuoi certificati e i certificati "
+#~ "dei partner di comunicazione e delle autorità di certificazione (AC).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15742,12 +15366,16 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Controlla sempre fino al certificato di radice</h1>\n"
-#~ "Se questa opzione è attiva, il percorso del certificato appartenente al certificato del destinatario sarà sempre controllato fino al certificato di radice.\n"
+#~ "Se questa opzione è attiva, il percorso del certificato appartenente al "
+#~ "certificato del destinatario sarà sempre controllato fino al certificato "
+#~ "di radice.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15759,16 +15387,20 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Controlla il percorso dei certificati</h1>\n"
-#~ "Se questa opzione è attiva, l'intero percorso di certificati del destinatario verrà controllato fino alla radice.\n"
+#~ "Se questa opzione è attiva, l'intero percorso di certificati del "
+#~ "destinatario verrà controllato fino alla radice.\n"
 #~ "<p>\n"
-#~ "Nota che non è possibile disattivare il controllo del certificato del destinatario tout court.\n"
+#~ "Nota che non è possibile disattivare il controllo del certificato del "
+#~ "destinatario tout court.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15780,16 +15412,28 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Usa le liste di revoca de certificati (CRL)</h1>\n"
-#~ "Una lista di revoca dei certificati contiene dei certificati che sono stati ritirati e non dovrebbero essere più usati per scopi di cifratura. Un utente potrebbe volere che il suo certificato sia revocato perché sospetta che l'integrità del certificato sia stata compromessa (per esempio qualcuno ha indovinato il PIN).\n"
+#~ "Una lista di revoca dei certificati contiene dei certificati che sono "
+#~ "stati ritirati e non dovrebbero essere più usati per scopi di cifratura. "
+#~ "Un utente potrebbe volere che il suo certificato sia revocato perché "
+#~ "sospetta che l'integrità del certificato sia stata compromessa (per "
+#~ "esempio qualcuno ha indovinato il PIN).\n"
 #~ "<p>\n"
-#~ "Si raccomanda di usare le CRL per avere massima sicurezza. Nella finestra di configurazione per la gestione di certificati e CRL, puoi selezionare da dove recuperare le CRL.\n"
+#~ "Si raccomanda di usare le CRL per avere massima sicurezza. Nella finestra "
+#~ "di configurazione per la gestione di certificati e CRL, puoi selezionare "
+#~ "da dove recuperare le CRL.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15801,12 +15445,14 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avverti se la CRL scade a breve</h1>\n"
-#~ "Se questa casella è segnata, sarai avvertito se una delle CRL che stai usando sta per scadere a breve.\n"
+#~ "Se questa casella è segnata, sarai avvertito se una delle CRL che stai "
+#~ "usando sta per scadere a breve.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15815,14 +15461,16 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avverti se la CRL scade a breve</h1>\n"
-#~ "In questo campo puoi specificare quanto prima che una CRL scada sarai avvertito della scadenza.\n"
+#~ "In questo campo puoi specificare quanto prima che una CRL scada sarai "
+#~ "avvertito della scadenza.\n"
 #~ "<p>\n"
 #~ "L'impostazione raccomandata per l'ambiente SPHINX è 7 giorni.\n"
 #~ "</qt>"
@@ -15836,16 +15484,20 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cifra sempre per te stesso</h1>\n"
-#~ "Se questa casella è selezionata, i messaggi cifrati che invii saranno cifrati anche con la tua chiave.\n"
+#~ "Se questa casella è selezionata, i messaggi cifrati che invii saranno "
+#~ "cifrati anche con la tua chiave.\n"
 #~ "<p>\n"
-#~ "Si raccomanda di lasciare attiva questa opzione per permetterti di leggere i messaggi che hai mandato.\n"
+#~ "Si raccomanda di lasciare attiva questa opzione per permetterti di "
+#~ "leggere i messaggi che hai mandato.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15857,16 +15509,22 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avverti se il certificato scade</h1>\n"
-#~ "Se questa casella è selezionata, sarai avvertito quando cerchi di usare un certificato di cifratura che scade entro la quantità di giorni specificata.\n"
+#~ "Se questa casella è selezionata, sarai avvertito quando cerchi di usare "
+#~ "un certificato di cifratura che scade entro la quantità di giorni "
+#~ "specificata.\n"
 #~ "<p>\n"
-#~ "Si raccomanda di lasciare attiva questa opzione per evitare di usare certificati che scadono a breve.\n"
+#~ "Si raccomanda di lasciare attiva questa opzione per evitare di usare "
+#~ "certificati che scadono a breve.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15887,8 +15545,30 @@ msgstr "Sovrascrivi file?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Seleziona quali certificati inviare"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Invio di certificati</h1> Senza il tuo certificato, il destinatario non potrà sapere se sei veramente tu che hai mandato il messaggio o se il messaggio è stato manomesso da parti terze. <p> Il destinatario può ottenere il tuo certificato da un server centrale, ma puoi anche scegliere di includere il tuo certificato nel messaggio. Puoi scegliere se non vuoi includere nessun certificato, solo il tuo certificato o un'intera catena di certificati che certificato il tuo certificato, incluso o escluso il certificato di radice. <p> Si raccomanda di includere sempre almeno il tuo certificato nel messaggio. <p> Questa impostazione è predefinita, la puoi cambiare per ogni singolo messaggio.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Invio di certificati</h1> Senza il tuo certificato, il "
+#~ "destinatario non potrà sapere se sei veramente tu che hai mandato il "
+#~ "messaggio o se il messaggio è stato manomesso da parti terze. <p> Il "
+#~ "destinatario può ottenere il tuo certificato da un server centrale, ma "
+#~ "puoi anche scegliere di includere il tuo certificato nel messaggio. Puoi "
+#~ "scegliere se non vuoi includere nessun certificato, solo il tuo "
+#~ "certificato o un'intera catena di certificati che certificato il tuo "
+#~ "certificato, incluso o escluso il certificato di radice. <p> Si "
+#~ "raccomanda di includere sempre almeno il tuo certificato nel messaggio. "
+#~ "<p> Questa impostazione è predefinita, la puoi cambiare per ogni singolo "
+#~ "messaggio.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "&Invia il tuo certificato"
@@ -15903,21 +15583,28 @@ msgstr "Sovrascrivi file?"
 #~ msgstr "Firma tutte le &parti del messaggio"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Seleziona per firmare tutte le parti del messaggio in modo predefinito"
+#~ msgstr ""
+#~ "Seleziona per firmare tutte le parti del messaggio in modo predefinito"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Firma tutte le parti del messaggio come impostazione predefinita</h1>\n"
-#~ "Se questa impostazione è selezionata, tutte le parti di un messaggio (cioè il corpo principale del messaggio e tutti gli allegati) saranno firmate come impostazione predefinita.\n"
+#~ "<h1>Firma tutte le parti del messaggio come impostazione predefinita</"
+#~ "h1>\n"
+#~ "Se questa impostazione è selezionata, tutte le parti di un messaggio "
+#~ "(cioè il corpo principale del messaggio e tutti gli allegati) saranno "
+#~ "firmate come impostazione predefinita.\n"
 #~ "<p>\n"
-#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni singolo messaggio.\n"
+#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni "
+#~ "singolo messaggio.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15929,12 +15616,16 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Chiedi prima di firmare ogni parte</h1>\n"
-#~ "Quando questa opzione è selezionata, per ogni parte del messaggio (cioè il corpo principale del messaggio e tutti gli allegati), ti sarà chiesto, una alla volta, se vuoi che sia firmata.\n"
+#~ "Quando questa opzione è selezionata, per ogni parte del messaggio (cioè "
+#~ "il corpo principale del messaggio e tutti gli allegati), ti sarà chiesto, "
+#~ "una alla volta, se vuoi che sia firmata.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15948,18 +15639,23 @@ msgstr "Sovrascrivi file?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Non firmare i messaggi</h1>\n"
-#~ "Se questa opzione è selezionata, i messaggi non sono firmati come impostazione predefinita.\n"
+#~ "Se questa opzione è selezionata, i messaggi non sono firmati come "
+#~ "impostazione predefinita.\n"
 #~ "<p>\n"
-#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni singolo messaggio.\n"
+#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni "
+#~ "singolo messaggio.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Il certificato di firma è configurato sulla pagina <em>Certificati</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Il certificato di firma è configurato sulla pagina <em>Certificati</em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15970,20 +15666,35 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo di firma</h1>\n"
-#~ "Un algoritmo è una descrizione fatta per il computer di come dovrebbe effettuare un certo compito. L'algoritmo di firma descrive come il computer deve applicare la tua chiave di firma al messaggio in modo che il destinatario possa determinare se il messaggio sia veramente da parte tua.\n"
+#~ "Un algoritmo è una descrizione fatta per il computer di come dovrebbe "
+#~ "effettuare un certo compito. L'algoritmo di firma descrive come il "
+#~ "computer deve applicare la tua chiave di firma al messaggio in modo che "
+#~ "il destinatario possa determinare se il messaggio sia veramente da parte "
+#~ "tua.\n"
 #~ "<p>\n"
-#~ "La selezione di un certo algoritmo di firma determina quanto facile o difficile sarà falsificare un messaggio. Tuttavia, tutti gli algoritmi forniti nell'ambiente SPHINX sono considerati molto sicuri. Generalmente, l'impostazione predefinita funzionerà benone.\n"
+#~ "La selezione di un certo algoritmo di firma determina quanto facile o "
+#~ "difficile sarà falsificare un messaggio. Tuttavia, tutti gli algoritmi "
+#~ "forniti nell'ambiente SPHINX sono considerati molto sicuri. Generalmente, "
+#~ "l'impostazione predefinita funzionerà benone.\n"
 #~ "<p>\n"
-#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni singolo messaggio.\n"
+#~ "Questa è un'impostazione predefinita, puoi sempre cambiarla per ogni "
+#~ "singolo messaggio.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15998,12 +15709,16 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Memorizza i messaggi con le firme</h1>\n"
-#~ "Quando questo riquadro è segnato, i messaggi inviati saranno memorizzati insieme alle firme loro applicate. Questo è raccomandato, perché ti permette di controllare se hai firmato un messaggio o una sua parte.\n"
+#~ "Quando questo riquadro è segnato, i messaggi inviati saranno memorizzati "
+#~ "insieme alle firme loro applicate. Questo è raccomandato, perché ti "
+#~ "permette di controllare se hai firmato un messaggio o una sua parte.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -16018,12 +15733,18 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Firma multiparte staccata</h1>\n"
-#~ "Quando questa opzione è selezionata, la firma e i dati firmati saranno parti separate di un parte di un messaggio Multipart/Signed. I dati firmati del messaggio saranno leggibili anche dai programmi di posta che non supportano gli algoritmi di firma e la decodifica ASN.1.\n"
+#~ "Quando questa opzione è selezionata, la firma e i dati firmati saranno "
+#~ "parti separate di un parte di un messaggio Multipart/Signed. I dati "
+#~ "firmati del messaggio saranno leggibili anche dai programmi di posta che "
+#~ "non supportano gli algoritmi di firma e la decodifica ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -16036,12 +15757,16 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Messaggi firmati opachi</h1>\n"
-#~ "Quando questa opzione è selezionata, sia la firma che il messaggio saranno cifrati in un blocco ASN.1. I messaggi saranno leggibili solo dai programmi di posta che supportano la decodifica ASN.1.\n"
+#~ "Quando questa opzione è selezionata, sia la firma che il messaggio "
+#~ "saranno cifrati in un blocco ASN.1. I messaggi saranno leggibili solo dai "
+#~ "programmi di posta che supportano la decodifica ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -16053,8 +15778,22 @@ msgstr "Sovrascrivi file?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Seleziona quanto spesso si deve inserire il PIN"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt><h1>Inserimento PIN</h1> Qui, puoi selezionare quanto spesso devi inserire il PIN per accedere al tuo ambiente di sicurezza personale (ASP) che contiene i tuoi certificati. <p> Più spesso devi scrivere il tuo PIN, maggiore la protezione contro la falsificazione dei messaggi a tuo nome, ma maggiore la scomodità delle operazioni. <p>Se non sei sicuro di cosa selezionare, lascia stare. <p> Nota che non è possibile disattivare completamente l'inserimento del PIN per ragioni di sicurezza.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>Inserimento PIN</h1> Qui, puoi selezionare quanto spesso devi "
+#~ "inserire il PIN per accedere al tuo ambiente di sicurezza personale (ASP) "
+#~ "che contiene i tuoi certificati. <p> Più spesso devi scrivere il tuo PIN, "
+#~ "maggiore la protezione contro la falsificazione dei messaggi a tuo nome, "
+#~ "ma maggiore la scomodità delle operazioni. <p>Se non sei sicuro di cosa "
+#~ "selezionare, lascia stare. <p> Nota che non è possibile disattivare "
+#~ "completamente l'inserimento del PIN per ragioni di sicurezza.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Una volta a sessione"
@@ -16071,16 +15810,22 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avverti se il certificato scade</h1>\n"
-#~ "Se questa casella è selezionata, sarai avvertito quando cerchi di usare un certificato di firma che scade entro la quantità di giorni specificata.\n"
+#~ "Se questa casella è selezionata, sarai avvertito quando cerchi di usare "
+#~ "un certificato di firma che scade entro la quantità di giorni "
+#~ "specificata.\n"
 #~ "<p>\n"
-#~ "Si raccomanda di lasciare attiva questa opzione per evitare di usare certificati che scadono a breve.\n"
+#~ "Si raccomanda di lasciare attiva questa opzione per evitare di usare "
+#~ "certificati che scadono a breve.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -16092,14 +15837,18 @@ msgstr "Sovrascrivi file?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avverti se l'indirizzo del firmatario non è nel certificato</h1>\n"
-#~ "Se l'opzione è selezionata, sarà mostrato un avvertimento se l'indirizzo di posta elettronica del firmatario non è contenuto nel certificato utilizzato per la firma.\n"
+#~ "Se l'opzione è selezionata, sarà mostrato un avvertimento se l'indirizzo "
+#~ "di posta elettronica del firmatario non è contenuto nel certificato "
+#~ "utilizzato per la firma.\n"
 #~ "<p>\n"
-#~ "Si raccomanda di lasciare attiva questa opzione per la massima integrità.\n"
+#~ "Si raccomanda di lasciare attiva questa opzione per la massima "
+#~ "integrità.\n"
 #~ "</qt>"
diff --git a/tde-i18n-ja/messages/tdepim/kmail.po b/tde-i18n-ja/messages/tdepim/kmail.po
index f2904c2c3e5..56306a0a4ad 100644
--- a/tde-i18n-ja/messages/tdepim/kmail.po
+++ b/tde-i18n-ja/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-02-08 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -20,14 +20,14 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 "Tadashi Jokagi,Taiki Komoda,Noboru Sinohara,Shinichi Tsunoda,Yukiko Bando"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -175,6 +175,12 @@ msgstr "なし(&E) (注意して使ってください)"
 msgid "Account for semiautomatic resource handling"
 msgstr "半自動リソース処理のアカウント"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "過去分をクリア"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -249,11 +255,12 @@ msgstr "ログイン(&L):"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"インターネットサービスプロバイダは、サーバでの認証のために「ユーザ名」を与えます。これは通常、あなたのメールアドレスの最初の部分 (@ より前の部分) です。"
+"インターネットサービスプロバイダは、サーバでの認証のために「ユーザ名」を与え"
+"ます。これは通常、あなたのメールアドレスの最初の部分 (@ より前の部分) です。"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -274,18 +281,19 @@ msgstr "POP パスワードを保存する(&R)"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "KMail にパスワードを保存させる場合、このオプションを有効にしてください。\n"
-"TDEWallet が利用可能であれば、TDEWallet にパスワードを保存します。これは安全だと考えられています。\n"
-"TDEWallet が利用できない場合は、代わりに KMail "
-"の設定ファイルにパスワードを保存します。パスワードは解読しにくいフォーマットで保存されますが、設定ファイルにアクセスされると解読される可能性があることに注意して"
-"ください。"
+"TDEWallet が利用可能であれば、TDEWallet にパスワードを保存します。これは安全"
+"だと考えられています。\n"
+"TDEWallet が利用できない場合は、代わりに KMail の設定ファイルにパスワードを保"
+"存します。パスワードは解読しにくいフォーマットで保存されますが、設定ファイル"
+"にアクセスされると解読される可能性があることに注意してください。"
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -313,11 +321,13 @@ msgstr "メッセージが次より大きければ POP フィルタを適用す�
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"このオプションを有効にすると、POP "
-"フィルタを用いてメッセージの処理を決定します。これによって、ダウンロード、削除、サーバに保持のいずれかを選択できるようになります。"
+"このオプションを有効にすると、POP フィルタを用いてメッセージの処理を決定しま"
+"す。これによって、ダウンロード、削除、サーバに保持のいずれかを選択できるよう"
+"になります。"
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -366,13 +376,15 @@ msgstr "平文(&X)"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -415,16 +427,18 @@ msgstr "名前空間:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"ここで IMAP サーバがサポートする名前空間を見ることができます。各名前空間はフォルダのグループを分ける添字を表します。名前空間により、例えば KMail "
-"は一つのアカウントで個人用フォルダと共有フォルダの両方を表示できます。"
+"ここで IMAP サーバがサポートする名前空間を見ることができます。各名前空間は"
+"フォルダのグループを分ける添字を表します。名前空間により、例えば KMail は一つ"
+"のアカウントで個人用フォルダと共有フォルダの両方を表示できます。"
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
-msgstr "サーバから名前空間を再ロードする。これにより、あらゆる変更が上書きされます。"
+msgstr ""
+"サーバから名前空間を再ロードする。これにより、あらゆる変更が上書きされます。"
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -477,12 +491,13 @@ msgstr "要求時に添付ファイルを読み込む(&M)"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"メールを選択したときに自動的に読み込まずに、添付ファイルをクリックしたときに読み込むようにするには、これを有効にしてください。これにより、巨大なEメールも瞬時に"
-"表示されます。"
+"メールを選択したときに自動的に読み込まずに、添付ファイルをクリックしたときに"
+"読み込むようにするには、これを有効にしてください。これにより、巨大なEメールも"
+"瞬時に表示されます。"
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -493,7 +508,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"フォルダツリーで開いている (展開されている) フォルダのサブフォルダのみをチェックします。サーバ上に多数のフォルダがある場合、この機能を用います。"
+"フォルダツリーで開いている (展開されている) フォルダのサブフォルダのみを"
+"チェックします。サーバ上に多数のフォルダがある場合、この機能を用います。"
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -521,7 +537,7 @@ msgstr "<なし>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "受信箱"
 
@@ -529,38 +545,47 @@ msgstr "受信箱"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"サーバは固有メッセージ番号をサポートしていないようです。この機能がないとサーバ上にメッセージを残すことができません。\n"
-"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこのオプションを利用できるかもしれません。"
+"サーバは固有メッセージ番号をサポートしていないようです。この機能がないとサー"
+"バ上にメッセージを残すことができません。\n"
+"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこ"
+"のオプションを利用できるかもしれません。"
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"サーバはメッセージヘッダの取得をサポートしていないようです。この機能がないとサーバ上のメッセージをフィルタリングできません。\n"
-"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこのオプションを利用できるかもしれません。"
+"サーバはメッセージヘッダの取得をサポートしていないようです。この機能がないと"
+"サーバ上のメッセージをフィルタリングできません。\n"
+"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこ"
+"のオプションを利用できるかもしれません。"
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"この機能は、パイプラインをサポートしていない POP3 サーバに壊れたメールを送信させてしまう可能性があることに注意してください。\n"
-"この設定は変更可能です。というのも、サーバによってはパイプラインをサポートしているにもかかわらず、それを公表していない場合があるからです。このダイアログの「サー"
-"バがサポートする機能をチェック」ボタンを使って、お使いの POP3 サーバがパイプラインのサポートを公表しているかどうかを確認できます。\n"
-"サーバが公表していないけれども、ダウンロードのスピードを向上させたい場合は、何本かのメールをまとめて自分自身に送り、それらをダウンロードしてテストしてみてくださ"
-"い。"
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"この機能は、パイプラインをサポートしていない POP3 サーバに壊れたメールを送信"
+"させてしまう可能性があることに注意してください。\n"
+"この設定は変更可能です。というのも、サーバによってはパイプラインをサポートし"
+"ているにもかかわらず、それを公表していない場合があるからです。このダイアログ"
+"の「サーバがサポートする機能をチェック」ボタンを使って、お使いの POP3 サーバ"
+"がパイプラインのサポートを公表しているかどうかを確認できます。\n"
+"サーバが公表していないけれども、ダウンロードのスピードを向上させたい場合は、"
+"何本かのメールをまとめて自分自身に送り、それらをダウンロードしてテストしてみ"
+"てください。"
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -568,43 +593,50 @@ msgstr "先に「一般」タブでサーバとポートを指定してくださ
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"サーバはパイプラインをサポートしていないようなので、このオプションを無効にしました。\n"
-"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこのオプションを利用できるかもしれません。\n"
-"注意: この機能は、パイプラインをサポートしていない POP "
-"サーバに壊れたメッセージを送信させてしまう可能性があります。したがって、重要なメールにこの機能を使う前に、まず自分自身に多数のテストメッセージを送り、それらをサ"
-"ーバから一度にダウンロードしてテストしてください。"
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"サーバはパイプラインをサポートしていないようなので、このオプションを無効にし"
+"ました。\n"
+"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこ"
+"のオプションを利用できるかもしれません。\n"
+"注意: この機能は、パイプラインをサポートしていない POP サーバに壊れたメッセー"
+"ジを送信させてしまう可能性があります。したがって、重要なメールにこの機能を使"
+"う前に、まず自分自身に多数のテストメッセージを送り、それらをサーバから一度に"
+"ダウンロードしてテストしてください。"
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"サーバが固有メッセージ番号をサポートしていないようです。この機能がないとサーバ上にメッセージを残すことができないので、このオプションを無効にしました。\n"
-"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこのオプションを利用できるかもしれません。"
+"サーバが固有メッセージ番号をサポートしていないようです。この機能がないとサー"
+"バ上にメッセージを残すことができないので、このオプションを無効にしました。\n"
+"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこ"
+"のオプションを利用できるかもしれません。"
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"サーバがメッセージヘッダの取得をサポートしていないようです。この機能がないとサーバ上のメッセージをフィルタリングできないので、このオプションを無効にしました。"
-"\n"
-"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこのオプションを利用できるかもしれません。"
+"サーバがメッセージヘッダの取得をサポートしていないようです。この機能がないと"
+"サーバ上のメッセージをフィルタリングできないので、このオプションを無効にしま"
+"した。\n"
+"しかし、サポートする機能を正しく公表しないサーバもあるので、場合によってはこ"
+"のオプションを利用できるかもしれません。"
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -678,9 +710,11 @@ msgstr "IMAP アカウント"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
-msgstr "メールを受信するためには設定のネットワークセクションでアカウントを追加する必要があります。"
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
+msgstr ""
+"メールを受信するためには設定のネットワークセクションでアカウントを追加する必"
+"要があります。"
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -716,13 +750,13 @@ msgstr "KMail へようこそ"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>KMail "
-"を初めて起動したようです。このウィザードを使ってメールアカウントを設定することができます。メールプロバイダから受け取った接続情報を次のページに入力してください。"
-"</qt>"
+"<qt>KMail を初めて起動したようです。このウィザードを使ってメールアカウントを"
+"設定することができます。メールプロバイダから受け取った接続情報を次のページに"
+"入力してください。</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -784,8 +818,7 @@ msgstr "ローカル配信を使う"
 msgid "Server Information"
 msgstr "サーバ情報"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "なし"
@@ -877,7 +910,9 @@ msgstr "アンチウイルスツールのスキャンが終了しました。"
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
-msgstr "<p>スパム検知ツールが見つかりませんでした。スパム検知ソフトをインストールしてこのウィザードを再起動してください。</p>"
+msgstr ""
+"<p>スパム検知ツールが見つかりませんでした。スパム検知ソフトをインストールして"
+"このウィザードを再起動してください。</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -921,24 +956,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>ここでは、一般的に知られているアンチウィルスツールを KMail で使うためのフィルタルールを作成します。</p>"
-"<p>このウィザードは、あなたのコンピュータ上のウィルスツールを検知するだけでなく、これらのツールを用いてメッセージを分類し、ウィルスを含むメッセージを分離する"
-"ためのルールを作成します。ウィザードは既存のフィルタルールを考慮に入れずに、常に新しいルールを追加します。</p>"
-"<p>注意: メッセージに対してウイルススキャンを実行している間は、KMail "
-"が固まったように見えます。アンチウィルスツールの処理は通常時間がかかるため、KMail "
-"の反応が遅くなるという問題が発生する可能性があります。そのような場合は、ウィザードが作成したフィルタルールを削除すると、以前の挙動に戻ります。"
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>ここでは、一般的に知られているアンチウィルスツールを KMail で使うための"
+"フィルタルールを作成します。</p><p>このウィザードは、あなたのコンピュータ上の"
+"ウィルスツールを検知するだけでなく、これらのツールを用いてメッセージを分類"
+"し、ウィルスを含むメッセージを分離するためのルールを作成します。ウィザードは"
+"既存のフィルタルールを考慮に入れずに、常に新しいルールを追加します。</p><p>注"
+"意: メッセージに対してウイルススキャンを実行している間は、KMail が固まったよ"
+"うに見えます。アンチウィルスツールの処理は通常時間がかかるため、KMail の反応"
+"が遅くなるという問題が発生する可能性があります。そのような場合は、ウィザード"
+"が作成したフィルタルールを削除すると、以前の挙動に戻ります。"
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -962,7 +999,9 @@ msgstr "既知のスパムの移動先(&K):"
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
-msgstr "スパムメッセージの標準のフォルダはごみ箱ですが、下のフォルダビューで変更することもできます。"
+msgstr ""
+"スパムメッセージの標準のフォルダはごみ箱ですが、下のフォルダビューで変更する"
+"こともできます。"
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -970,14 +1009,14 @@ msgstr "不確かなスパムの移動先(&P):"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"標準のフォルダは受信箱ですが、下のフォルダビューで変更することもできます。"
-"<p>ただし、不確かなスパムの検知はすべてのツールがサポートしているわけではありません。したがって、これをサポートするツールを選択しなかった場合は、フォルダも同"
-"様に選択できません。"
+"標準のフォルダは受信箱ですが、下のフォルダビューで変更することもできます。<p>"
+"ただし、不確かなスパムの検知はすべてのツールがサポートしているわけではありま"
+"せん。したがって、これをサポートするツールを選択しなかった場合は、フォルダも"
+"同様に選択できません。"
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -987,11 +1026,13 @@ msgstr "アンチウイルスツールを使用してメッセージをチェッ
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"アンチウィルスツールにあなたのメールをチェックさせましょう。このウィザードは適切なフィルタを作成します。メッセージは通常ツールによってマークされ、次のフィルタが"
-"これに呼応して、例えば、ウィルスメッセージを指定したフォルダに移動します。"
+"アンチウィルスツールにあなたのメールをチェックさせましょう。このウィザードは"
+"適切なフィルタを作成します。メッセージは通常ツールによってマークされ、次の"
+"フィルタがこれに呼応して、例えば、ウィルスメッセージを指定したフォルダに移動"
+"します。"
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1000,11 +1041,12 @@ msgstr "検出したウイルスメッセージを選択したフォルダに移
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"ウィルスに感染していると判断されたメッセージを検知し、これらを指定されたフォルダに移動するフィルタを作成します。標準のフォルダはごみ箱ですが、フォルダビューで変"
-"更することもできます。"
+"ウィルスに感染していると判断されたメッセージを検知し、これらを指定されたフォ"
+"ルダに移動するフィルタを作成します。標準のフォルダはごみ箱ですが、フォルダ"
+"ビューで変更することもできます。"
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1012,9 +1054,11 @@ msgstr "検出したウイルスメッセージを既読としてマーク"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
-msgstr "ウイルスに感染していると分類されたメッセージを選択したフォルダに移動すると同時に、既読としてマークします。"
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
+msgstr ""
+"ウイルスに感染していると分類されたメッセージを選択したフォルダに移動すると同"
+"時に、既読としてマークします。"
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1192,7 +1236,9 @@ msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
 "communication is here:"
-msgstr "あなたに実行する権限がないか、あるいはフォルダは既にサーバに存在します。サーバからのエラーメッセージ:"
+msgstr ""
+"あなたに実行する権限がないか、あるいはフォルダは既にサーバに存在します。サー"
+"バからのエラーメッセージ:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1205,8 +1251,8 @@ msgstr "サーバのフォルダ \"%1\" を読み込み中にエラー: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1226,8 +1272,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1258,16 +1304,20 @@ msgstr "削除"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
-msgstr "<qt>このメッセージの受信者にマッチする個人情報がありません。<br>あなたのアドレスがあれば以下から選択してください:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
+msgstr ""
+"<qt>このメッセージの受信者にマッチする個人情報がありません。<br>あなたのアド"
+"レスがあれば以下から選択してください:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
-msgstr "<qt>このメッセージの受信者にマッチする個人情報が複数あります。<br>あなたのアドレスを以下から選択してください:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
+msgstr ""
+"<qt>このメッセージの受信者にマッチする個人情報が複数あります。<br>あなたのア"
+"ドレスを以下から選択してください:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1292,22 +1342,26 @@ msgstr "フォルダ \"%1\" をコンパクト化しました"
 
 #: compactionjob.cpp:180 compactionjob.cpp:261
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
-msgstr "\"%1\" のコンパクト化でエラーが発生しました。コンパクト化を中止しました。"
+msgstr ""
+"\"%1\" のコンパクト化でエラーが発生しました。コンパクト化を中止しました。"
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>この設定はあなたのシステム管理者によって固定されています。</p>"
-"<p>これが間違いだと思われる場合は、管理者に連絡してください。</p></qt>"
+"<qt><p>この設定はあなたのシステム管理者によって固定されています。</p><p>これ"
+"が間違いだと思われる場合は、管理者に連絡してください。</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "プロファイルを読み込み(&L)..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "アカウントの設定"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "追加(&A)..."
@@ -1337,6 +1391,11 @@ msgstr "<qt>本当に個人情報 <b>%1</b> を削除しますか？</qt>"
 msgid "Remove Identity"
 msgstr "個人情報を削除"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "削除(&E)"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "追加..."
@@ -1345,6 +1404,11 @@ msgstr "追加..."
 msgid "Modify..."
 msgstr "変更..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "削除(&E)"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "デフォルトにする"
@@ -1362,17 +1426,15 @@ msgstr "送信(&S)"
 msgid "Outgoing accounts (add at least one):"
 msgstr "送信アカウント (最低一つ作成してください):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "名前"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "タイプ"
@@ -1394,8 +1456,7 @@ msgstr "デフォルトにする"
 msgid "Common Options"
 msgstr "共通オプション"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "送信する前に確認する(&B)"
@@ -1447,14 +1508,16 @@ msgstr "デフォルトのドメイン(&T):"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
-msgstr "<qt><p>デフォルトのドメインは、ユーザ名だけのメールアドレスを補完するために使用します。</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
+msgstr ""
+"<qt><p>デフォルトのドメインは、ユーザ名だけのメールアドレスを補完するために使"
+"用します。</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1472,9 +1535,9 @@ msgstr "送信方法を追加"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (デフォルト)"
 
@@ -1494,7 +1557,8 @@ msgstr "これらの %n 個の個人情報は特殊な送信方法を使うよ�
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
-msgstr "これらの %n 個の個人情報はデフォルトの送信方法を使うように変更されました:"
+msgstr ""
+"これらの %n 個の個人情報はデフォルトの送信方法を使うように変更されました:"
 
 #: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
@@ -1553,6 +1617,10 @@ msgstr "アカウントを変更"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>アカウント \"%1\" を特定できません。</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "色(&S)"
@@ -1662,8 +1730,7 @@ msgstr "既読のリンク"
 msgid "Misspelled Words"
 msgstr "スペル間違いの単語"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "新規メッセージ"
@@ -1858,9 +1925,10 @@ msgstr "すべてのスレッドをたたむ(&X)"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
-msgstr "新規、未読、重要なメッセージを含むスレッドと監視中のスレッドを展開する(&W)"
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
+msgstr ""
+"新規、未読、重要なメッセージを含むスレッドと監視中のスレッドを展開する(&W)"
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1868,67 +1936,49 @@ msgstr "日付表示"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p>日付に使用できる表現:</p>"
-"<ul>"
-"<li>d - 日を前 0 なしの数字で (1-31)。</li>"
-"<li>dd - 日を 2 桁の数字で (01-31)。</li>"
-"<li>ddd - 曜日の略名 (月 - 日)。</li>"
-"<li>dddd - 曜日の名前 (月曜日 - 日曜日)。</li>"
-"<li>M - 月を前 0 なしの数字で (1-12)。</li>"
-"<li>MM - 月を 2 桁の数字で (01-12)。</li>"
-"<li>MMM - 月の略名 (日本語の場合は MMMM と同じ)。</li>"
-"<li>MMMM - 月の名前 (1月 - 12 月)。</li>"
-"<li>yy - 年を西暦下 2 桁で (00-99)。</li>"
-"<li>yyyy - 年を 4 桁で (0000-9999)。</li></ul>"
-"<p>時刻に使用できる表現:</p>"
-"<ul>"
-"<li>h - 時を前 0 なしの数字で (0-23、あるいは AM/PM 表記で 0-12)。</li>"
-"<li>hh - 時を 2 桁の数字で (00-23、あるいは AM/PM 表記で 00-12)。</li>"
-"<li>m - 分を前 0 なしの数字で (0-59)。</li>"
-"<li>mm - 分を 2 桁の数字で (00-59)。</li>"
-"<li>s - 秒を前 0 なしの数字で (0-59)。</li>"
-"<li>ss - 秒を 2 桁の数字で (00-59)。</li>"
-"<li>z - ミリ秒を前 0 なしの数字で (0-999)。</li> "
-"<li>zzz - ミリ秒を 3 桁の数字で (000-999)。</li>"
-"<li>AP - AM/PM 表記になります。AP は \"AM\" または \"PM\" に置き換えられます。</li>"
-"<li>ap - AM/PM 表記になります。ap は \"am\" または \"pm\" に置き換えられます。</li>"
-"<li>Z - タイムゾーンの数字表記 (+0900)。</li></ul>"
-"<p>上記以外の入力文字は無視されます。</p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p>日付に使用できる表現:</p><ul><li>d - 日を前 0 なしの数字で (1-31)。</"
+"li><li>dd - 日を 2 桁の数字で (01-31)。</li><li>ddd - 曜日の略名 (月 - 日)。"
+"</li><li>dddd - 曜日の名前 (月曜日 - 日曜日)。</li><li>M - 月を前 0 なしの数"
+"字で (1-12)。</li><li>MM - 月を 2 桁の数字で (01-12)。</li><li>MMM - 月の略"
+"名 (日本語の場合は MMMM と同じ)。</li><li>MMMM - 月の名前 (1月 - 12 月)。</"
+"li><li>yy - 年を西暦下 2 桁で (00-99)。</li><li>yyyy - 年を 4 桁で "
+"(0000-9999)。</li></ul><p>時刻に使用できる表現:</p><ul><li>h - 時を前 0 なし"
+"の数字で (0-23、あるいは AM/PM 表記で 0-12)。</li><li>hh - 時を 2 桁の数字で "
+"(00-23、あるいは AM/PM 表記で 00-12)。</li><li>m - 分を前 0 なしの数字で "
+"(0-59)。</li><li>mm - 分を 2 桁の数字で (00-59)。</li><li>s - 秒を前 0 なしの"
+"数字で (0-59)。</li><li>ss - 秒を 2 桁の数字で (00-59)。</li><li>z - ミリ秒を"
+"前 0 なしの数字で (0-999)。</li> <li>zzz - ミリ秒を 3 桁の数字で (000-999)。"
+"</li><li>AP - AM/PM 表記になります。AP は \"AM\" または \"PM\" に置き換えられ"
+"ます。</li><li>ap - AM/PM 表記になります。ap は \"am\" または \"pm\" に置き換"
+"えられます。</li><li>Z - タイムゾーンの数字表記 (+0900)。</li></ul><p>上記以"
+"外の入力文字は無視されます。</p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "スレッド化の全体設定を変更すると、フォルダごとの設定が無効になります。"
 
 #: configuredialog.cpp:2221
@@ -1944,8 +1994,7 @@ msgid "Show s&pam status in fancy headers"
 msgstr "ファンシーヘッダにスパム情報を表示する(&P)"
 
 # ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "顔文字を感情アイコンに置き換える(&B)"
@@ -1956,8 +2005,7 @@ msgid "Use smaller font for quoted text"
 msgstr "引用テキストに小さいフォントを使う(&Q)"
 
 # ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "引用テキストに「展開/たたむ」マークを表示する(&W)"
@@ -1986,8 +2034,7 @@ msgid "&Override character encoding:"
 msgstr "文字エンコーディングを強制(&V):"
 
 # ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "システムトレイアイコンを有効にする(&T)"
@@ -2094,19 +2141,17 @@ msgstr "<b>%f</b> は編集するファイル名で置き換えられます。"
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>返信メッセージでは以下の置換が利用できます:"
-"<br><b>%D</b>: 日時 - <b>%S</b>: 件名"
-"<br><b>%e</b>: 送信者のアドレス - <b>%F</b>: 送信者の名前 - <b>%f</b>: 送信者のイニシャル"
-"<br><b>%T</b>: 受取人の名前 - <b>%t</b>: 受取人の名前とアドレス"
-"<br><b>%C</b>: CC 宛先の名前 - <b>%c</b>: CC 宛先の名前とアドレス"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>返信メッセージでは以下の置換が利用できます:<br><b>%D</b>: 日時 - <b>%S</"
+"b>: 件名<br><b>%e</b>: 送信者のアドレス - <b>%F</b>: 送信者の名前 - <b>%f</"
+"b>: 送信者のイニシャル<br><b>%T</b>: 受取人の名前 - <b>%t</b>: 受取人の名前と"
+"アドレス<br><b>%C</b>: CC 宛先の名前 - <b>%c</b>: CC 宛先の名前とアドレス"
 "<br><b>%%</b>: パーセント記号 - <b>%_</b>: スペース - <b>%L</b>: 改行</qt>"
 
 #: configuredialog.cpp:2943
@@ -2130,21 +2175,20 @@ msgstr "全員に返信(&Y):"
 msgid "&Forward:"
 msgstr "転送(&F):"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "引用の表示(&Q):"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D、あなたは書きました:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D、%F さんは書きました:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "転送メッセージ"
 
@@ -2182,9 +2226,11 @@ msgstr "新規転送用接頭句を入力:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
-msgstr "すべての送信メッセージについて、メッセージに使用されているすべての文字を含む文字セットをこのリストの上から順に検索します。"
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
+msgstr ""
+"すべての送信メッセージについて、メッセージに使用されているすべての文字を含む"
+"文字セットをこのリストの上から順に検索します。"
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2219,10 +2265,9 @@ msgstr "値"
 msgid "Ne&w"
 msgstr "新規(&W)"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "名前(&N):"
@@ -2232,17 +2277,18 @@ msgid "&Value:"
 msgstr "値(&V):"
 
 # ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook 互換の添付ファイル名(&K)"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
-msgstr "このオプションを有効にすると Outlook(tm) が英語以外の文字を含む添付ファイル名を理解できるようになります。"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
+msgstr ""
+"このオプションを有効にすると Outlook(tm) が英語以外の文字を含む添付ファイル名"
+"を理解できるようになります。"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2250,7 +2296,8 @@ msgstr "ファイルの添付漏れをチェックする(&N)"
 
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
-msgstr "以下のキーワードが本文に含まれている場合に添付ファイルをチェックします:"
+msgstr ""
+"以下のキーワードが本文に含まれている場合に添付ファイルをチェックします:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2268,19 +2315,21 @@ msgstr "添付"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "標準に準拠したエンコードされた添付ファイル名をサポートしていない Outlook(tm) "
-"その他のメールクライアントが理解できる方法で、英語以外の文字を含む添付ファイル名をエンコードすることを選択しました。\n"
-"これを有効にすると、KMail "
-"が標準に準拠しないメッセージを作成し、その結果、あなたのメッセージが標準に準拠したメールクライアントに理解されなくなる可能性があります。したがって、他に方法がな"
-"い場合を除いて、このオプションは有効にしないでください。"
+"その他のメールクライアントが理解できる方法で、英語以外の文字を含む添付ファイ"
+"ル名をエンコードすることを選択しました。\n"
+"これを有効にすると、KMail が標準に準拠しないメッセージを作成し、その結果、あ"
+"なたのメッセージが標準に準拠したメールクライアントに理解されなくなる可能性が"
+"あります。したがって、他に方法がない場合を除いて、このオプションは有効にしな"
+"いでください。"
 
 # ACCELERATOR changed by translator
 #: configuredialog.cpp:3682
@@ -2306,93 +2355,93 @@ msgstr "暗号化バックエンド(&N)"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>メッセージはしばしば HTML "
-"パートとプレーンテキストパートの両方のフォーマットで届きます。そのような場合にどちらを表示するかを最初のオプションで選択します。</p>"
-"<p>HTML パートを表示するとメッセージの見栄えは良くなりますが、セキュリティホールを攻撃されるリスクが増します。</p>"
-"<p>プレーンテキストで表示するとメッセージのフォーマット情報はほとんど失われます。しかし、HTML レンダラー (Konqueror) "
-"のセキュリティホールの攻撃は「不可能」に近くなります。</p>"
-"<p>二番目の外部参照のオプションを無効にしておけば、よくある HTML メッセージの悪用を防ぐことができます。しかし、このバージョンの KMail "
-"が作られた時点で知られていないセキュリティ上の問題を防ぐことまではできません。</p>"
-"<p>このような理由で、HTML をプレーンテキストより優先「しない」ことをお勧めします。</p>"
-"<p>注意: このオプションは KMail メインウィンドウの「フォルダ」メニューからフォルダごとに設定できます。</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>メッセージはしばしば HTML パートとプレーンテキストパートの両方のフォー"
+"マットで届きます。そのような場合にどちらを表示するかを最初のオプションで選択"
+"します。</p><p>HTML パートを表示するとメッセージの見栄えは良くなりますが、セ"
+"キュリティホールを攻撃されるリスクが増します。</p><p>プレーンテキストで表示す"
+"るとメッセージのフォーマット情報はほとんど失われます。しかし、HTML レンダ"
+"ラー (Konqueror) のセキュリティホールの攻撃は「不可能」に近くなります。</"
+"p><p>二番目の外部参照のオプションを無効にしておけば、よくある HTML メッセージ"
+"の悪用を防ぐことができます。しかし、このバージョンの KMail が作られた時点で知"
+"られていないセキュリティ上の問題を防ぐことまではできません。</p><p>このような"
+"理由で、HTML をプレーンテキストより優先「しない」ことをお勧めします。</p><p>"
+"注意: このオプションは KMail メインウィンドウの「フォルダ」メニューからフォル"
+"ダごとに設定できます。</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>HTML 形式の広告メールには、メールが読まれたかどうかを知るために広告者が利用する「ウェブバグ」と呼ばれる画像が含まれていることがあります。</p>"
-"<p>必要な画像は常に直接添付することが可能なので、このようにインターネットから画像をロードさせる正当な理由はありません。</p>"
-"<p>KMail の HTML 表示機能が悪用されることを避けるために、このオプションは標準設定では無効になっています。</p>"
-"<p>しかし、添付ファイルではない HTML "
-"メールの画像を見たいのであれば、このオプションを有効にすることができます。ただし、これには潜在的な問題があることに注意してください。</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>HTML 形式の広告メールには、メールが読まれたかどうかを知るために広告者"
+"が利用する「ウェブバグ」と呼ばれる画像が含まれていることがあります。</p><p>必"
+"要な画像は常に直接添付することが可能なので、このようにインターネットから画像"
+"をロードさせる正当な理由はありません。</p><p>KMail の HTML 表示機能が悪用され"
+"ることを避けるために、このオプションは標準設定では無効になっています。</p><p>"
+"しかし、添付ファイルではない HTML メールの画像を見たいのであれば、このオプ"
+"ションを有効にすることができます。ただし、これには潜在的な問題があることに注"
+"意してください。</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>開封通知ポリシー</h3>"
-"<p>メッセージの送信者が開封通知を要求すると、受信者側のメールプログラムはそれに対す返事を自動的に生成します。この返事によって、送信者はメッセージに「起こった"
-"こと」を知ることができます。「起こったこと」には、「表示された (読まれた)」「削除された」「転送された」などがあります。</p>"
-"<p>KMail が開封通知要求をどのように扱うかを、以下のオプションから選択できます。</p>"
-"<ul>"
-"<li>[無視] (推奨) すべての開封通知要求を無視します。自動的に開封通知が送られることはありません。</li>"
-"<li>[確認] 毎回ユーザに確認して、許可されたもののみを送ります。これを選択すると、一部のメッセージに対してのみ開封通知を送ることができます。</li>"
-"<li>[拒否] "
-"常に「拒否された」という通知を返します。これは「常に送信」するのとほとんど同じです。メッセージの送信者は、読まれたか、削除されたかは知ることはできませんが、それ"
-"でも送信したメッセージが届いたことは分かります。</li>"
-"<li>[常に送信] "
-"開封通知要求があれば、常に開封通知を送信します。メッセージの送信者はいつメッセージが受け取られたかだけでなく、読まれたか、削除されたかも知ることができます。この"
-"オプションはお勧めしません。これは顧客管理などで意味があるので、一応用意しているだけです。</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>開封通知ポリシー</h3><p>メッセージの送信者が開封通知を要求すると、受"
+"信者側のメールプログラムはそれに対す返事を自動的に生成します。この返事によっ"
+"て、送信者はメッセージに「起こったこと」を知ることができます。「起こったこ"
+"と」には、「表示された (読まれた)」「削除された」「転送された」などがありま"
+"す。</p><p>KMail が開封通知要求をどのように扱うかを、以下のオプションから選択"
+"できます。</p><ul><li>[無視] (推奨) すべての開封通知要求を無視します。自動的"
+"に開封通知が送られることはありません。</li><li>[確認] 毎回ユーザに確認して、"
+"許可されたもののみを送ります。これを選択すると、一部のメッセージに対してのみ"
+"開封通知を送ることができます。</li><li>[拒否] 常に「拒否された」という通知を"
+"返します。これは「常に送信」するのとほとんど同じです。メッセージの送信者は、"
+"読まれたか、削除されたかは知ることはできませんが、それでも送信したメッセージ"
+"が届いたことは分かります。</li><li>[常に送信] 開封通知要求があれば、常に開封"
+"通知を送信します。メッセージの送信者はいつメッセージが受け取られたかだけでな"
+"く、読まれたか、削除されたかも知ることができます。このオプションはお勧めしま"
+"せん。これは顧客管理などで意味があるので、一応用意しているだけです。</li></"
+"ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2408,14 +2457,15 @@ msgstr "インターネットからの外部参照のロードを許可する(&X
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"警告: HTML を Eメールで許可すると、既知または今後予想されるセキュリティ上の問題によって、システムが危険にさらされる可能性が高くなります。詳しくは "
-"<a href=\"whatsthis:%1\">HTML メールについて</a> と <a href=\"whatsthis:%2\">"
-"外部参照について</a> をご覧ください。"
+"警告: HTML を Eメールで許可すると、既知または今後予想されるセキュリティ上の問"
+"題によって、システムが危険にさらされる可能性が高くなります。詳しくは <a href="
+"\"whatsthis:%1\">HTML メールについて</a> と <a href=\"whatsthis:%2\">外部参照"
+"について</a> をご覧ください。"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2477,7 +2527,9 @@ msgstr "暗号化されたメッセージへの返信時には開封通知を送
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
-msgstr "警告: 無条件に開封通知を返すと、あなたのプライバシーが危うくなります。<a href=\"whatsthis:%1\">詳細</a>"
+msgstr ""
+"警告: 無条件に開封通知を返すと、あなたのプライバシーが危うくなります。<a "
+"href=\"whatsthis:%1\">詳細</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2497,8 +2549,7 @@ msgstr "全体の HTML 設定を変更すると、フォルダごとの設定が
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "このオプションは dirmngr >= 0.9.0 を必要とします"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "プロキシなし"
@@ -2527,8 +2578,8 @@ msgstr "重要なメッセージは古いメッセージの整理に含めない
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "未読メール検索時の挙動:"
 
@@ -2552,8 +2603,8 @@ msgstr "すべてのフォルダをループ"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "フォルダに移動したときの挙動:"
 
@@ -2623,24 +2674,23 @@ msgstr "ディレクトリ (maildir フォーマット)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>ローカルフォルダのデフォルトのフォーマットを選択します。</p>"
-"<p><b>mbox:</b> KMail のメールフォルダがそれぞれ一つのファイルになります。個々のメッセージは、\"From \" "
-"で始まる行で区切られます。この方法を使うとディスク領域を節約できますが、少し不安定になります (メッセージのフォルダ間移動時など)。</p>"
-"<p><b>maildir:</b> Kmail "
-"のメールフォルダはディスク上の実際のフォルダになります。個々のメッセージは独立したファイルになります。こちらを使うとディスク領域をより多く取りますが、メッセージ"
-"のフォルダ間移動などに際しても安全です。</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>ローカルフォルダのデフォルトのフォーマットを選択します。</"
+"p><p><b>mbox:</b> KMail のメールフォルダがそれぞれ一つのファイルになります。"
+"個々のメッセージは、\"From \" で始まる行で区切られます。この方法を使うとディ"
+"スク領域を節約できますが、少し不安定になります (メッセージのフォルダ間移動時"
+"など)。</p><p><b>maildir:</b> Kmail のメールフォルダはディスク上の実際のフォ"
+"ルダになります。個々のメッセージは独立したファイルになります。こちらを使うと"
+"ディスク領域をより多く取りますが、メッセージのフォルダ間移動などに際しても安"
+"全です。</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2673,45 +2723,41 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>次の未読メッセージに移動する際、現在のメッセージより下には未読メッセージがない場合があります。</p>"
-"<p>[ループしない] 現在のフォルダの最後のメッセージで検索を停止します。</p>"
-"<p>[現在のフォルダのみでループ] 現在のフォルダの先頭に戻って検索を続けます。他のフォルダには移動しません。</p>"
-"<p>[すべてのフォルダをループ] 現在のフォルダの先頭に戻って検索を続け、未読メッセージが見つからなければ、次のフォルダへ移動します。</p>"
-"<p>同様に、前の未読メッセージを検索する場合、フォルダの末尾から検索を開始し、選択されたオプションに応じて、前のフォルダに移動します。</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>次の未読メッセージに移動する際、現在のメッセージより下には未読メッセー"
+"ジがない場合があります。</p><p>[ループしない] 現在のフォルダの最後のメッセー"
+"ジで検索を停止します。</p><p>[現在のフォルダのみでループ] 現在のフォルダの先"
+"頭に戻って検索を続けます。他のフォルダには移動しません。</p><p>[すべてのフォ"
+"ルダをループ] 現在のフォルダの先頭に戻って検索を続け、未読メッセージが見つか"
+"らなければ、次のフォルダへ移動します。</p><p>同様に、前の未読メッセージを検索"
+"する場合、フォルダの末尾から検索を開始し、選択されたオプションに応じて、前の"
+"フォルダに移動します。</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>全文のインデックス (索引) "
-"を作成し、メッセージの内容の高速検索を可能にします。有効にすると、検索ダイアログが非常に高速に機能し、検索ツールバーも内容に基づいてメッセージを選択します。</"
-"p>"
-"<p>一定のディスク領域 (全メッセージの約半分) が必要です。</p>"
-"<p>有効にした後、インデックスの作成を開始しますが、作成中もそのまま KMail を使用できます。</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>全文のインデックス (索引) を作成し、メッセージの内容の高速検索を可能に"
+"します。有効にすると、検索ダイアログが非常に高速に機能し、検索ツールバーも内"
+"容に基づいてメッセージを選択します。</p><p>一定のディスク領域 (全メッセージの"
+"約半分) が必要です。</p><p>有効にした後、インデックスの作成を開始しますが、作"
+"成中もそのまま KMail を使用できます。</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2780,9 +2826,11 @@ msgstr "グループウェアフォルダを隠す(&P)"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
-msgstr "これを有効にすると、フォルダツリーの IMAP リソースフォルダが見えなくなります。"
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
+msgstr ""
+"これを有効にすると、フォルダツリーの IMAP リソースフォルダが見えなくなりま"
+"す。"
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2790,9 +2838,11 @@ msgstr "このアカウントにはグループウェアフォルダのみ表示
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
-msgstr "これを有効にすると、グループウェアのために設定されたアカウントのフォルダツリーに通常のメールフォルダを表示しません。"
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
+msgstr ""
+"これを有効にすると、グループウェアのために設定されたアカウントのフォルダツ"
+"リーに通常のメールフォルダを表示しません。"
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2802,7 +2852,9 @@ msgstr "グループウェアの変更を直ちに同期する"
 msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
-msgstr "オンラインになったときにオフライン IMAP フォルダのグループウェアの変更を直ちに同期します。"
+msgstr ""
+"オンラインになったときにオフライン IMAP フォルダのグループウェアの変更を直ち"
+"に同期します。"
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -2820,7 +2872,9 @@ msgstr "招待への返事の From/To ヘッダを無視する"
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
-msgstr "このオプションを有効にすると Outlook(tm) が会議参加要請への返事を理解できるようになります。"
+msgstr ""
+"このオプションを有効にすると Outlook(tm) が会議参加要請への返事を理解できるよ"
+"うになります。"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2830,7 +2884,9 @@ msgstr "メール本文で招待を送信する"
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
-msgstr "このオプションを有効にすると Outlook(tm) が会議参加要請を理解できるようになります。"
+msgstr ""
+"このオプションを有効にすると Outlook(tm) が会議参加要請を理解できるようになり"
+"ます。"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2844,24 +2900,24 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Microsoft Exchange サーバと組み合わせて使用した場合、Microsoft Outlook "
-"は標準に準拠したグループウェアメールを理解できません。Microsoft Exchange "
-"が理解できる方法でグループウェアの招待状を送るには、このオプションを有効にしてください。"
+"Microsoft Exchange サーバと組み合わせて使用した場合、Microsoft Outlook は標準"
+"に準拠したグループウェアメールを理解できません。Microsoft Exchange が理解でき"
+"る方法でグループウェアの招待状を送るには、このオプションを有効にしてくださ"
+"い。"
 
 # ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook 互換の添付ファイル名(&K)"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "招待を自動送信する"
@@ -2870,24 +2926,28 @@ msgstr "招待を自動送信する"
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
-msgstr "これを有効にすると、メール作成ウィンドウは表示されません。招待メールは自動で送信されます。"
+msgstr ""
+"これを有効にすると、メール作成ウィンドウは表示されません。招待メールは自動で"
+"送信されます。"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>通常、招待はメールの添付ファイルとして送付されます。このオプションは、招待メールをメールのテキスト内で送るように変更します。これは Microsoft "
-"Outlook に招待を送ったり、返答するために必要です。"
-"<br>しかし、そうすると、メールプログラムが理解できる記述的なテキストは得られなくなります。したがって、送付されたメッセージは、招待を理解しないメールプログラ"
-"ムを使用している人には非常に奇妙に見えます。"
-"<br>招待を理解するメールプログラムを使用している人は、招待メールに対する処理を行えます。</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>通常、招待はメールの添付ファイルとして送付されます。このオプションは、招"
+"待メールをメールのテキスト内で送るように変更します。これは Microsoft Outlook "
+"に招待を送ったり、返答するために必要です。<br>しかし、そうすると、メールプロ"
+"グラムが理解できる記述的なテキストは得られなくなります。したがって、送付され"
+"たメッセージは、招待を理解しないメールプログラムを使用している人には非常に奇"
+"妙に見えます。<br>招待を理解するメールプログラムを使用している人は、招待メー"
+"ルに対する処理を行えます。</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -2993,26 +3053,26 @@ msgstr "転送"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ここで、返信を作成したりメッセージを転送するときに使用するカスタムメッセージテンプレートの作成、編集、削除を行います。カスタムテンプレートは、マウスの右ク"
-"リックメニューまたはツールバーメニューから選択して作成します。また、素早く操作できるようにテンプレートにキーボードショートカットを割り当てることもできます。</"
-"p>"
-"<p>メッセージテンプレートは置換コマンドをサポートしています。コマンドを直接入力するか、「コマンドを挿入」メニューからコマンドを選択してください。</p>"
-"<p>カスタムテンプレートには 4 "
-"種類あります。「返信」「全員に返信」「転送」と、すべての操作に使用できる「汎用」です。「汎用」テンプレートにはキーボードショートカットを割り当てることはできませ"
-"ん。</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>ここで、返信を作成したりメッセージを転送するときに使用するカスタムメッ"
+"セージテンプレートの作成、編集、削除を行います。カスタムテンプレートは、マウ"
+"スの右クリックメニューまたはツールバーメニューから選択して作成します。また、"
+"素早く操作できるようにテンプレートにキーボードショートカットを割り当てること"
+"もできます。</p><p>メッセージテンプレートは置換コマンドをサポートしています。"
+"コマンドを直接入力するか、「コマンドを挿入」メニューからコマンドを選択してく"
+"ださい。</p><p>カスタムテンプレートには 4 種類あります。「返信」「全員に返"
+"信」「転送」と、すべての操作に使用できる「汎用」です。「汎用」テンプレートに"
+"はキーボードショートカットを割り当てることはできません。</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3030,15 +3090,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3055,7 +3115,9 @@ msgstr "キー競合"
 msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
-msgstr "選択されたショートカットは既に他のカスタムテンプレートに使われています。それでも割り当てますか？"
+msgstr ""
+"選択されたショートカットは既に他のカスタムテンプレートに使われています。それ"
+"でも割り当てますか？"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3097,7 +3159,9 @@ msgstr "名前を入力してください:"
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
-msgstr "<qt>指定された名前 <b>%1</b> の配布リストは既に存在します。別の名前を選択してください。</qt>"
+msgstr ""
+"<qt>指定された名前 <b>%1</b> の配布リストは既に存在します。別の名前を選択して"
+"ください。</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3106,9 +3170,11 @@ msgstr "次で編集:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
-msgstr "KMail は選択されたエディタが閉じられても検知できません。データの消失を避けるために編集を中止します。"
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
+msgstr ""
+"KMail は選択されたエディタが閉じられても検知できません。データの消失を避ける"
+"ために編集を中止します。"
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3206,7 +3272,9 @@ msgstr "フォルダ \"%1\" の %n 件の古いメッセージを削除中..."
 
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
-msgstr "フォルダ \"%1\" の古いメッセージを整理できませんでした: 行き先フォルダ \"%2\" が見つかりません"
+msgstr ""
+"フォルダ \"%1\" の古いメッセージを整理できませんでした: 行き先フォルダ "
+"\"%2\" が見つかりません"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3224,7 +3292,8 @@ msgstr "フォルダ \"%1\" の %n 件の古いメッセージを削除しまし
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
 "Moved %n old messages from folder %1 to folder %2."
-msgstr "フォルダ \"%1\" の %n 件の古いメッセージをフォルダ \"%2\" に移動しました。"
+msgstr ""
+"フォルダ \"%1\" の %n 件の古いメッセージをフォルダ \"%2\" に移動しました。"
 
 #: expirejob.cpp:240
 msgid "Removing old messages from folder %1 failed."
@@ -3232,7 +3301,8 @@ msgstr "フォルダ \"%1\" の古いメッセージを削除できませんで�
 
 #: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
-msgstr "フォルダ \"%1\" の古いメッセージをフォルダ \"%2\" に移動できませんでした。"
+msgstr ""
+"フォルダ \"%1\" の古いメッセージをフォルダ \"%2\" に移動できませんでした。"
 
 #: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
@@ -3240,7 +3310,9 @@ msgstr "フォルダ \"%1\" の古いメッセージの削除がキャンセル�
 
 #: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
-msgstr "フォルダ \"%1\" の古いメッセージのフォルダ \"%2\" への移動がキャンセルされました。"
+msgstr ""
+"フォルダ \"%1\" の古いメッセージのフォルダ \"%2\" への移動がキャンセルされま"
+"した。"
 
 #: expirypropertiesdialog.cpp:31
 msgid "Mail Expiry Properties"
@@ -3350,6 +3422,13 @@ msgstr "フィルタ"
 
 # #-#-#-#-#  kmail.po (kmail)  #-#-#-#-#
 # ACCELERATOR added by translator
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "すべてのテキストを選択(&S)"
+
+# #-#-#-#-#  kmail.po (kmail)  #-#-#-#-#
+# ACCELERATOR added by translator
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3363,7 +3442,9 @@ msgstr "フィルタをインポート"
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
-msgstr "選択されたファイルを読めません。ファイルへのアクセス権限が不足している可能性があります。"
+msgstr ""
+"選択されたファイルを読めません。ファイルへのアクセス権限が不足している可能性"
+"があります。"
 
 #: filterimporterexporter.cpp:235
 msgid "Export Filters"
@@ -3379,9 +3460,11 @@ msgstr "フィルタ動作のログを取る(&L)"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
-msgstr "ここでフィルタのログを有効/無効にできます。ログデータはこのオプションが有効になっている場合にのみ収集・表示されます。"
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
+msgstr ""
+"ここでフィルタのログを有効/無効にできます。ログデータはこのオプションが有効に"
+"なっている場合にのみ収集・表示されます。"
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3397,13 +3480,16 @@ msgstr "フィルタルールの評価をログ(&R)"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"適用されたフィルタのフィルタルールの評価に関するフィードバックを制御できます。このオプションを有効にすると、個々のフィルタルールについて詳細なフィードバックが得"
-"られます。無効にすると、一つのフィルタのすべてのルールの評価結果についてのフィードバックのみが得られます。"
+"適用されたフィルタのフィルタルールの評価に関するフィードバックを制御できま"
+"す。このオプションを有効にすると、個々のフィルタルールについて詳細なフィード"
+"バックが得られます。無効にすると、一つのフィルタのすべてのルールの評価結果に"
+"ついてのフィードバックのみが得られます。"
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3423,13 +3509,14 @@ msgstr "無制限"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"ログデータの収集は一時的にログデータを保存するためにメモリを使用します。ここで使用するメモリの最大量を制限できます。収集されたログデータのサイズがこの制限を超え"
-"ると、古いデータから削除されます。"
+"ログデータの収集は一時的にログデータを保存するためにメモリを使用します。ここ"
+"で使用するメモリの最大量を制限できます。収集されたログデータのサイズがこの制"
+"限を超えると、古いデータから削除されます。"
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3439,7 +3526,7 @@ msgstr ""
 "ファイル '%1' を書き込めませんでした。\n"
 "エラーの詳細: %2"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Kmail エラー"
@@ -3480,13 +3567,13 @@ msgstr "ユーザ識別子(&U):"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"ユーザ識別子は IMAP "
-"サーバ上のユーザのログインです。これは単なるユーザ名かユーザの完全なメールアドレスのどちらかです。サーバ上のあなた自身のアカウントのログインで、どちらかが分かり"
-"ます。"
+"ユーザ識別子は IMAP サーバ上のユーザのログインです。これは単なるユーザ名か"
+"ユーザの完全なメールアドレスのどちらかです。サーバ上のあなた自身のアカウント"
+"のログインで、どちらかが分かります。"
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3537,9 +3624,10 @@ msgstr "ごみ箱フォルダの読み/書き権限がありません。"
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
-msgstr "サーバからまだ情報を取得していません。「メールをチェック」を使ってください。"
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
+msgstr ""
+"サーバからまだ情報を取得していません。「メールをチェック」を使ってください。"
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3549,8 +3637,7 @@ msgstr "エラー: このフォルダに IMAP アカウントは定義されて�
 msgid "Connecting to server %1, please wait..."
 msgstr "サーバ %1 に接続しています。お待ちください..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "サーバ %1 への接続エラー"
@@ -3578,9 +3665,11 @@ msgstr "権限を追加"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
-msgstr "本当にこのフォルダのあなた自身の権限を削除しますか？以降アクセスできなくなります。"
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
+msgstr ""
+"本当にこのフォルダのあなた自身の権限を削除しますか？以降アクセスできなくなり"
+"ます。"
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3611,7 +3700,7 @@ msgstr "使用:"
 msgid "Select Folder"
 msgstr "フォルダを選択"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "ローカルフォルダ"
@@ -3635,15 +3724,18 @@ msgstr "フォルダのショートカットを選択"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>現在のフォルダを選択するためのキーまたはキーの組み合わせを設定します。下のボタンを押して、このフォルダと関連付けるキーを押してください。</qt>"
+"<qt>現在のフォルダを選択するためのキーまたはキーの組み合わせを設定します。下"
+"のボタンを押して、このフォルダと関連付けるキーを押してください。</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
-msgstr "選択されたショートカットは既に使われています。別のショートカットを選択してください。"
+msgstr ""
+"選択されたショートカットは既に使われています。別のショートカットを選択してく"
+"ださい。"
 
 #: foldertreebase.cpp:85
 msgid "&Move Here"
@@ -3659,12 +3751,22 @@ msgstr "キャンセル(&A)"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>削除したフォルダはアカウント \"%1\" "
-"のメールの行き先フォルダに指定されていました。このアカウントの新着メールの行き先を標準の受信箱にリセットしました。</qt>"
+"<qt>削除したフォルダはアカウント \"%1\" のメールの行き先フォルダに指定されて"
+"いました。このアカウントの新着メールの行き先を標準の受信箱にリセットしまし"
+"た。</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>合計: %2<br>未読: %3<br>サイズ: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>クォータ: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3787,40 +3889,16 @@ msgstr "スパムの状態:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>メ<br>ッ<br>セ<br>ー<br>ジ</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>メ<br>ッ<br>セ<br>ー<br>ジ</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr "<qt><br>H<br>T<br>M<br>L<br> <br>メ<br>ッ<br>セ<br>ー<br>ジ<br>な<br>し</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>H<br>T<br>M<br>L<br> <br>メ<br>ッ<br>セ<br>ー<br>ジ<br>な<br>し</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3833,17 +3911,13 @@ msgstr "あなたの名前(&N):"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>あなたの名前</h3>"
-"<p>ここにあなたの名前を入力します。これは送信するEメールのヘッダに表示されます。</p>"
-"<p>ここを空欄にしておくと、メールアドレスだけで名前は表示されません。</p></qt>"
+"<qt><h3>あなたの名前</h3><p>ここにあなたの名前を入力します。これは送信するE"
+"メールのヘッダに表示されます。</p><p>ここを空欄にしておくと、メールアドレスだ"
+"けで名前は表示されません。</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3851,16 +3925,13 @@ msgstr "組織(&Z):"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>組織</h3>"
-"<p>ここにあなたの所属する組織を入力します。これは送信するEメールのヘッダに表示されます。</p>"
-"<p>ここは空欄にしておいても問題はありません (通常はそうしておきます)。</p></qt>"
+"<qt><h3>組織</h3><p>ここにあなたの所属する組織を入力します。これは送信するE"
+"メールのヘッダに表示されます。</p><p>ここは空欄にしておいても問題はありませ"
+"ん (通常はそうしておきます)。</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3869,19 +3940,15 @@ msgstr "メールアドレス(&E):"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>メールアドレス</h3>"
-"<p>ここにあなたの完全なメールアドレスを入力します。</p>"
-"<p>ここが空欄だったり、間違っていると、受け取った人は返信できません。</p></qt>"
+"<qt><h3>メールアドレス</h3><p>ここにあなたの完全なメールアドレスを入力しま"
+"す。</p><p>ここが空欄だったり、間違っていると、受け取った人は返信できません。"
+"</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -3890,21 +3957,12 @@ msgstr "メールアドレス(&E):"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3927,18 +3985,17 @@ msgstr "メッセージの電子署名に使用する OpenPGP 鍵を選択しま
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>ここに指定された OpenPGP 鍵は、メッセージの電子署名に使用します。GnuPG 鍵も使用できます。</p>"
-"<p>ここは空欄にしておいてもかまいませんが、その場合は KMail は OpenPGP "
-"を使ってEメールに電子署名できません。通常のメール機能には影響ありません。</p>"
-"<p>詳しくは <a>http://www.gnupg.org</a> をご覧ください。</p></qt>"
+"<qt><p>ここに指定された OpenPGP 鍵は、メッセージの電子署名に使用します。"
+"GnuPG 鍵も使用できます。</p><p>ここは空欄にしておいてもかまいませんが、その場"
+"合は KMail は OpenPGP を使ってEメールに電子署名できません。通常のメール機能に"
+"は影響ありません。</p><p>詳しくは <a>http://www.gnupg.org</a> をご覧くださ"
+"い。</p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -3950,27 +4007,26 @@ msgstr "あなたの OpenPGP 暗号化鍵"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
-msgstr "自分自身へのメッセージの暗号化とメール作成の「自分の公開鍵を添付」に使用する OpenPGP 鍵を選択します。"
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
+msgstr ""
+"自分自身へのメッセージの暗号化とメール作成の「自分の公開鍵を添付」に使用する "
+"OpenPGP 鍵を選択します。"
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>ここに指定された OpenPGP 鍵は、自分自身へのメッセージの暗号化とメール作成の「自分の公開鍵を添付」に使用します。GnuPG "
-"鍵も使用できます。</p>"
-"<p>ここは空欄にしておいてもかまいませんが、その場合は KMail は OpenPGP "
-"を使って送信メールのコピーを暗号化できません。通常のメール機能には影響ありません。</p>"
-"<p>詳しくは <a>http://www.gnupg.org</a> をご覧ください。</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>ここに指定された OpenPGP 鍵は、自分自身へのメッセージの暗号化とメール"
+"作成の「自分の公開鍵を添付」に使用します。GnuPG 鍵も使用できます。</p><p>ここ"
+"は空欄にしておいてもかまいませんが、その場合は KMail は OpenPGP を使って送信"
+"メールのコピーを暗号化できません。通常のメール機能には影響ありません。</p><p>"
+"詳しくは <a>http://www.gnupg.org</a> をご覧ください。</qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -3988,16 +4044,15 @@ msgstr "メッセージの電子署名に使用する S/MIME 証明書を選択�
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ここに指定された S/MIMI (X.509) 証明書は、メッセージの電子署名に使用します。</p>"
-"<p>ここは空欄にしておいてもかまいませんが、その場合は KMail は S/MIME "
-"を使ってEメールに電子署名できません。通常のメール機能には影響ありません。</p></qt>"
+"<qt><p>ここに指定された S/MIMI (X.509) 証明書は、メッセージの電子署名に使用し"
+"ます。</p><p>ここは空欄にしておいてもかまいませんが、その場合は KMail は S/"
+"MIME を使ってEメールに電子署名できません。通常のメール機能には影響ありませ"
+"ん。</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4009,23 +4064,24 @@ msgstr "あなたの S/MIME 暗号証明書"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
-msgstr "自分自身へのメッセージの暗号化とメール作成の「自分の証明書を添付」に使用する S/MIME 証明書を選択します。"
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
+msgstr ""
+"自分自身へのメッセージの暗号化とメール作成の「自分の証明書を添付」に使用する "
+"S/MIME 証明書を選択します。"
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ここに指定された S/MIME 証明書は、自分自身へのメッセージの暗号化とメール作成の「自分の証明書を添付する」に使用します。</p>"
-"<p>ここは空欄にしておいてもかまいませんが、その場合は KMail は S/MIME "
-"を使って送信メッセージのコピーを暗号化できません。通常のメール機能には影響ありません。</p></qt>"
+"<qt><p>ここに指定された S/MIME 証明書は、自分自身へのメッセージの暗号化とメー"
+"ル作成の「自分の証明書を添付する」に使用します。</p><p>ここは空欄にしておいて"
+"もかまいませんが、その場合は KMail は S/MIME を使って送信メッセージのコピーを"
+"暗号化できません。通常のメール機能には影響ありません。</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4045,22 +4101,19 @@ msgstr "返信アドレス(&R):"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>返信アドレス</h3>"
-"<p>これはメールヘッダの <tt>Reply-to:</tt> になります。通常の <tt>From:</tt> "
-"とは異なるアドレスを指定するものです。</p>"
-"<p>これは例えば、複数の人と一緒に仕事をしていて、あなたが送信したメールの <tt>From:</tt> "
-"はあなたのアドレスにして、返信はグループのアドレスに行くようにする場合に利用できます。</p>"
-"<p>よく分からなければ、ここは空欄にしておいてください。</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>返信アドレス</h3><p>これはメールヘッダの <tt>Reply-to:</tt> になりま"
+"す。通常の <tt>From:</tt> とは異なるアドレスを指定するものです。</p><p>これは"
+"例えば、複数の人と一緒に仕事をしていて、あなたが送信したメールの <tt>From:</"
+"tt> はあなたのアドレスにして、返信はグループのアドレスに行くようにする場合に"
+"利用できます。</p><p>よく分からなければ、ここは空欄にしておいてください。</"
+"p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4068,22 +4121,19 @@ msgstr "&BCC アドレス:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) アドレス</h3>"
-"<p>ここに入力したアドレスは、この個人情報を使って送信されるすべてのメッセージに追加されます。これは他の受信者には見えません。</p>"
-"<p>これは自分の他のアカウントに送信メッセージのコピーを送るためによく使われます。</p>"
-"<p>複数の BBC 受信者を指定する場合は、アドレスをコンマで区切ります。</p>"
-"<p>よく分からなければ、ここは空欄にしておいてください。</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) アドレス</h3><p>ここに入力したアドレスは、こ"
+"の個人情報を使って送信されるすべてのメッセージに追加されます。これは他の受信"
+"者には見えません。</p><p>これは自分の他のアカウントに送信メッセージのコピーを"
+"送るためによく使われます。</p><p>複数の BBC 受信者を指定する場合は、アドレス"
+"をコンマで区切ります。</p><p>よく分からなければ、ここは空欄にしておいてくださ"
+"い。</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4123,7 +4173,7 @@ msgstr "署名(&S)"
 msgid "&Picture"
 msgstr "画像(&X)"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "不正なメールアドレス"
 
@@ -4139,14 +4189,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"設定された OpenPGP 署名鍵の一つに、この個人情報 (%1) のために設定されたメールアドレスを持つユーザ ID が含まれていません。\n"
-"受信者がこの設定による署名を検証しようとすると、警告メッセージが出る可能性があります。"
+"設定された OpenPGP 署名鍵の一つに、この個人情報 (%1) のために設定されたメール"
+"アドレスを持つユーザ ID が含まれていません。\n"
+"受信者がこの設定による署名を検証しようとすると、警告メッセージが出る可能性が"
+"あります。"
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
-msgstr "設定された OpenPGP 暗号化鍵の一つに、個人情報 (%1) のために設定されたメールアドレスを持つユーザ ID が含まれていません。"
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
+msgstr ""
+"設定された OpenPGP 暗号化鍵の一つに、個人情報 (%1) のために設定されたメールア"
+"ドレスを持つユーザ ID が含まれていません。"
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4155,14 +4209,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"設定された S/MIME 署名証明書の一つに、この個人情報 (%1) のために設定されたメールアドレスが含まれていません。\n"
-"受信者がこの設定による署名を検証しようとすると、警告メッセージが出る可能性があります。"
+"設定された S/MIME 署名証明書の一つに、この個人情報 (%1) のために設定された"
+"メールアドレスが含まれていません。\n"
+"受信者がこの設定による署名を検証しようとすると、警告メッセージが出る可能性が"
+"あります。"
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
-msgstr "設定された S/MIME 暗号証明書の一つに、この個人情報 (%1) のために設定されたメールアドレスが含まれていません。"
+msgstr ""
+"設定された S/MIME 暗号証明書の一つに、この個人情報 (%1) のために設定された"
+"メールアドレスが含まれていません。"
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4180,24 +4238,30 @@ msgstr "個人情報 \"%1\" を編集"
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
-msgstr "個人情報 \"%1\" に対応する送信済みフォルダが存在しません。標準の送信済みフォルダを使用します。"
+msgstr ""
+"個人情報 \"%1\" に対応する送信済みフォルダが存在しません。標準の送信済みフォ"
+"ルダを使用します。"
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
-msgstr "個人情報 \"%1\" に対応する下書きフォルダが存在しません。標準の下書きフォルダを使用します。"
+msgstr ""
+"個人情報 \"%1\" に対応する下書きフォルダが存在しません。標準の下書きフォルダ"
+"を使用します。"
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
-msgstr "個人情報 \"%1\" に対応するテンプレートフォルダが存在しません。標準のテンプレートフォルダを使用します。"
+msgstr ""
+"個人情報 \"%1\" に対応するテンプレートフォルダが存在しません。標準のテンプ"
+"レートフォルダを使用します。"
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (デフォルト)"
 
@@ -4239,18 +4303,20 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail は、アカウント \"%1\" の設定の中に、IMAP 名前空間のサポートによって必要なくなったプレフィックスの存在を検知しました。"
+"KMail は、アカウント \"%1\" の設定の中に、IMAP 名前空間のサポートによって必要"
+"なくなったプレフィックスの存在を検知しました。"
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
-msgstr "設定を自動で移行しましたが、念のためにアカウントの設定を確認してください。"
+"The configuration was automatically migrated but you should check your "
+"account configuration."
+msgstr ""
+"設定を自動で移行しましたが、念のためにアカウントの設定を確認してください。"
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr "設定を自動で移行できませんでした。アカウントの設定を確認してください。"
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4265,7 +4331,9 @@ msgstr "メッセージのアップロード中にエラー"
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
-msgstr "%1 付け、件名 \"%3\" の %2 からのメッセージをサーバにアップロードできませんでした。"
+msgstr ""
+"%1 付け、件名 \"%3\" の %2 からのメッセージをサーバにアップロードできませんで"
+"した。"
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4286,17 +4354,25 @@ msgstr "フォルダがクォータ制限の限界に近づいています。(%1
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"あなたにはこのフォルダに書き込む権限がないので、フォルダの所有者にフォルダに空きスペースを作るよう依頼してください。"
+"あなたにはこのフォルダに書き込む権限がないので、フォルダの所有者にフォルダに"
+"空きスペースを作るよう依頼してください。"
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "エラー: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
-msgstr "サーバ %1 への接続は突然閉じられたか、タイムアウトしました。可能ならば、自動的に再接続します。"
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
+msgstr ""
+"サーバ %1 への接続は突然閉じられたか、タイムアウトしました。可能ならば、自動"
+"的に再接続します。"
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4443,16 +4519,20 @@ msgstr "リストアーカイブ"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
-msgstr "設定されている OpenPGP 暗号化鍵または S/MIME 証明書の一つまたは複数が、暗号化用に完全に信頼されていません。"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
+msgstr ""
+"設定されている OpenPGP 暗号化鍵または S/MIME 証明書の一つまたは複数が、暗号化"
+"用に完全に信頼されていません。"
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
-msgstr "設定されている OpenPGP 暗号化鍵または S/MIME 証明書の一つまたは複数が、暗号化用に完全に信頼されていません。"
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
+msgstr ""
+"設定されている OpenPGP 暗号化鍵または S/MIME 証明書の一つまたは複数が、暗号化"
+"用に完全に信頼されていません。"
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4486,178 +4566,152 @@ msgstr "完全に信頼されていない暗号化鍵"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>あなたの OpenPGP 署名鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>あなたの OpenPGP 署名鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>あなたの OpenPGP 暗号鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>あなたの OpenPGP 暗号鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>次の OpenPGP 鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>次の OpenPGP 鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>は %n 日以"
+"内に失効します。</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>ルート証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>ルート証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>ルート証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>ルート証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>ルート証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p><p>"
+"ルート証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効します。</"
+"p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>中間 CA 証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>中間 CA 証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>中間 CA 証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>中間 CA 証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>中間 CA 証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p><p>中"
+"間 CA 証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効します。</"
+"p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p><p>は "
+"%n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>次の S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>次の S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4671,167 +4725,141 @@ msgstr "S/MIME 証明書が間もなく期限切れ"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>あなたの OpenPGP 署名鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>あなたの OpenPGP 署名鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>あなたの OpenPGP 暗号鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>あなたの OpenPGP 暗号鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>次の OpenPGP 鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>次の OpenPGP 鍵</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>は %n 日以"
+"内に失効します。</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>ルート証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>ルート証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>ルート証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>ルート証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>ルート証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p><p>"
+"ルート証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効します。</"
+"p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>中間 CA 証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>中間 CA 証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>中間 CA 証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</"
+"p><p>中間 CA 証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効しま"
+"す。</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p>"
-"<p>中間 CA 証明書</p><p align=center><b>%3</b></p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2) 用の</p><p>中"
+"間 CA 証明書</p><p align=center><b>%3</b></p><p>は %n 日以内に失効します。</"
+"p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 署名証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p><p>は "
+"%n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>S/MIME 暗号化証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>次の S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p>"
-"<p>は %n 日以内に失効します。</p>"
+"<p>次の S/MIME 証明書</p><p align=center><b>%1</b> (シリアル番号 %2)</p><p>"
+"は %n 日以内に失効します。</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -4843,15 +4871,18 @@ msgstr "S/MIME 証明書が間もなく期限切れ"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"設定した OpenPGP 暗号化鍵または S/MIME "
-"証明書の一つまたは複数が暗号化に利用できません。個人情報設定ダイアログでこの個人情報の暗号化鍵と証明書を再設定してください。\n"
-"このまま続けることを選択し、後で鍵が必要になった場合、使用する鍵を指定するように求められます。"
+"設定した OpenPGP 暗号化鍵または S/MIME 証明書の一つまたは複数が暗号化に利用で"
+"きません。個人情報設定ダイアログでこの個人情報の暗号化鍵と証明書を再設定して"
+"ください。\n"
+"このまま続けることを選択し、後で鍵が必要になった場合、使用する鍵を指定するよ"
+"うに求められます。"
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -4865,9 +4896,11 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"設定した OpenPGP 署名鍵または S/MIME "
-"証明書の一つまたは複数が署名に利用できません。個人情報設定ダイアログでこの個人情報の署名鍵と証明書を再設定してください。\n"
-"このまま続けることを選択し、後で鍵が必要になった場合、使用する鍵を指定するように求められます。"
+"設定した OpenPGP 署名鍵または S/MIME 証明書の一つまたは複数が署名に利用できま"
+"せん。個人情報設定ダイアログでこの個人情報の署名鍵と証明書を再設定してくださ"
+"い。\n"
+"このまま続けることを選択し、後で鍵が必要になった場合、使用する鍵を指定するよ"
+"うに求められます。"
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -4877,36 +4910,41 @@ msgstr "使用不可能な署名用鍵"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"この受信者、または少なくとも一部の受信者については、OpenPGP を使ってメッセージを暗号化するように設定されています。\n"
+"この受信者、または少なくとも一部の受信者については、OpenPGP を使ってメッセー"
+"ジを暗号化するように設定されています。\n"
 "しかし、この個人情報には有効な OpenPGP 暗号化鍵が設定されていません。\n"
-"メッセージを自分自身に暗号化せずに続けることは可能ですが、暗号化すると自分自身のメッセージを読めなくなってしまいます。"
+"メッセージを自分自身に暗号化せずに続けることは可能ですが、暗号化すると自分自"
+"身のメッセージを読めなくなってしまいます。"
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"この受信者、または少なくとも一部の受信者については、S/MIME を使ってメッセージを暗号化するように設定されています。\n"
+"この受信者、または少なくとも一部の受信者については、S/MIME を使ってメッセージ"
+"を暗号化するように設定されています。\n"
 "しかし、この個人情報には有効な S/MIME 暗号化証明書が設定されていません。\n"
-"メッセージを自分自身に暗号化せずに続けることは可能ですが、暗号化すると自分自身のメッセージを読めなくなってしまいます。"
+"メッセージを自分自身に暗号化せずに続けることは可能ですが、暗号化すると自分自"
+"身のメッセージを読めなくなってしまいます。"
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"このメッセージに署名しますか？この受信者、または少なくとも一部の受信者については、OpenPGP を使ってメッセージに署名するように設定されています。\n"
+"このメッセージに署名しますか？この受信者、または少なくとも一部の受信者につい"
+"ては、OpenPGP を使ってメッセージに署名するように設定されています。\n"
 "しかし、この個人情報には有効な OpenPGP 署名証明書が設定されていません。"
 
 #: keyresolver.cpp:1259
@@ -4915,12 +4953,13 @@ msgstr "OpenPGP 署名をしません"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"この受信者、または少なくとも一部の受信者については、S/MIME を使ってメッセージに署名するように設定されています。\n"
+"この受信者、または少なくとも一部の受信者については、S/MIME を使ってメッセージ"
+"に署名するように設定されています。\n"
 "しかし、この個人情報には有効な S/MIME 署名証明書が設定されていません。"
 
 #: keyresolver.cpp:1275
@@ -4933,7 +4972,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"この受信者に対する署名の設定には、利用可能なあなたの署名鍵に一致する一般的な署名のタイプがありません。\n"
+"この受信者に対する署名の設定には、利用可能なあなたの署名鍵に一致する一般的な"
+"署名のタイプがありません。\n"
 "署名せずにこのメッセージを送信しますか？"
 
 #: keyresolver.cpp:1335
@@ -4942,10 +4982,11 @@ msgstr "署名できません"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"自分自身のための (自分自身に対して暗号化するための) 暗号化鍵が選択されていません。暗号化すると、自分自身のメッセージを復号できなくなります。"
+"自分自身のための (自分自身に対して暗号化するための) 暗号化鍵が選択されていま"
+"せん。暗号化すると、自分自身のメッセージを復号できなくなります。"
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -4960,13 +5001,17 @@ msgstr "暗号化(&E)"
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
-msgstr "このメッセージの受信者に暗号化鍵が選択されていないため、メッセージを暗号化しません。"
+msgstr ""
+"このメッセージの受信者に暗号化鍵が選択されていないため、メッセージを暗号化し"
+"ません。"
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
-msgstr "このメッセージのいずれの受信者にも暗号化鍵が選択されていないため、メッセージを暗号化しません。"
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
+msgstr ""
+"このメッセージのいずれの受信者にも暗号化鍵が選択されていないため、メッセージ"
+"を暗号化しません。"
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -4976,13 +5021,17 @@ msgstr "暗号化せずに送信(&U)"
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "受信者のうちの一人に暗号化鍵が選択されていません。メッセージを暗号化すると、この人はメッセージを復号できません。"
+msgstr ""
+"受信者のうちの一人に暗号化鍵が選択されていません。メッセージを暗号化すると、"
+"この人はメッセージを復号できません。"
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "一部の受信者に暗号化鍵が選択されていません。メッセージを暗号化すると、これらの人はメッセージを復号できません。"
+msgstr ""
+"一部の受信者に暗号化鍵が選択されていません。メッセージを暗号化すると、これら"
+"の人はメッセージを復号できません。"
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5006,11 +5055,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "\"%1\" の有効で信頼された暗号化鍵が見つかりませんでした。\n"
 "\\n\n"
@@ -5059,10 +5108,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "致命的エラー: メールを回収できません: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"メッセージの追加に失敗しました:\n"
+msgid "Failed to add message:\n"
+msgstr "メッセージの追加に失敗しました:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5148,6 +5195,50 @@ msgstr "オフライン IMAP(&D)"
 msgid "&Maildir mailbox"
 msgstr "Maildir メールボックス(&M)"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "メッセージの件名を設定"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "CC: を 'アドレス' に送信"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "BCC: を 'アドレス' に送信"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "'ヘッダ' をメッセージに追加"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "'ファイル' からメッセージ本文を読む"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "メッセージの本文を設定"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "メールに添付ファイルを追加、これは繰り返せます"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "新しいメールのみチェック"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "作成ウィンドウのみ開く"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "与えられたメッセージファイルを表示"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "'アドレス' へメッセージを送信。'URL' が指すファイルを添付。"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "メール"
@@ -5190,8 +5281,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail は必要なグループウェアフォルダを \"%1\" のサブフォルダとして作成します。作成させたくなければ、キャンセルしてください。その場合は、IMAP "
-"リソースを無効にします。"
+"KMail は必要なグループウェアフォルダを \"%1\" のサブフォルダとして作成しま"
+"す。作成させたくなければ、キャンセルしてください。その場合は、IMAP リソースを"
+"無効にします。"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5199,16 +5291,19 @@ msgstr "%1: フォルダが見つかりません。作成します。"
 
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
-msgstr "%1: フォルダ \"%2\" が見つかりました。メインのグループウェアフォルダに設定します。"
+msgstr ""
+"%1: フォルダ \"%2\" が見つかりました。メインのグループウェアフォルダに設定し"
+"ます。"
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail は %1 に次のグループウェアフォルダを検出し、次の操作の実行します: %2"
-"<br>実行させたくなければ、キャンセルしてください。その場合は、IMAP リソースを無効にします。"
+"<qt>KMail は %1 に次のグループウェアフォルダを検出し、次の操作の実行します: "
+"%2<br>実行させたくなければ、キャンセルしてください。その場合は、IMAP リソース"
+"を無効にします。"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5254,11 +5349,11 @@ msgstr "URL をクリップボードにコピーしました。"
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>ファイル '%1' は既に存在します。<br>置き換えますか？</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "ファイルに保存"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "置換(&R)"
 
@@ -5276,7 +5371,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "保存の途中でメッセージが削除されました。保存はされていません。"
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5294,128 +5389,135 @@ msgstr "ファイルはメッセージを含んでいません。"
 
 #: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
-msgstr "ファイルは複数のメッセージを含んでいます。最初のメッセージのみ表示します。"
+msgstr ""
+"ファイルは複数のメッセージを含んでいます。最初のメッセージのみ表示します。"
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"これは MIME ダイジェスト転送です。メッセージの内容は添付ファイルの中にあります。\n"
+"これは MIME ダイジェスト転送です。メッセージの内容は添付ファイルの中にありま"
+"す。\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "メッセージをフィルタ中"
 
 # #-#-#-#-#  kmail.po (kmail)  #-#-#-#-#
 # @info:status
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "メッセージをフィルタ中 (%1/%2)"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "ディスク空きスペースが足りないようですが？"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "このフォルダに移動"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "このフォルダにコピー"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
-msgstr "フォルダ \"%1\" に壊れた IMAP キャッシュを検出したため、メッセージのコピーを中止しました。"
+msgstr ""
+"フォルダ \"%1\" に壊れた IMAP キャッシュを検出したため、メッセージのコピーを"
+"中止しました。"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "メッセージを移動中"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "メッセージを削除中"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL を開く..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>本当に <b>%1</b> を実行しますか？</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "実行"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "保存する添付ファイルがありません。"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "添付ファイルを保存"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "添付 1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "添付 %1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "'%1' という名前のファイルは既に存在します。上書きしますか？"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "ファイルは既に存在します"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "上書き(&O)"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
-msgstr "このメッセージのパート %1 は暗号化されています。保存時に暗号化されたままにしますか？"
+msgstr ""
+"このメッセージのパート %1 は暗号化されています。保存時に暗号化されたままにし"
+"ますか？"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail の質問"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "暗号化したままにする"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "復号する"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
-msgstr "そのメッセージのパート %1 は署名されています。保存時に署名も保存しますか？"
+msgstr ""
+"そのメッセージのパート %1 は署名されています。保存時に署名も保存しますか？"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "署名を保持"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5424,21 +5526,22 @@ msgstr ""
 "ファイル '%1' を書き込めませんでした:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "ファイル '%1' を書き込めませんでした。"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"アドレス帳にはこのEメールのエントリがありません。アドレス帳に追加し、その後インスタントメッセージクライアントを使ってインスタントメッセージアドレスを追加してく"
-"ださい。"
+"アドレス帳にはこのEメールのエントリがありません。アドレス帳に追加し、その後イ"
+"ンスタントメッセージクライアントを使ってインスタントメッセージアドレスを追加"
+"してください。"
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5448,61 +5551,71 @@ msgstr ""
 "%1\n"
 "誰とチャットすべきかを判断できません。"
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
-msgstr "Chaimus バックエンドは \"x-obtain-keys\" 関数を提供しません。このバグを報告してください。"
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
+msgstr ""
+"Chaimus バックエンドは \"x-obtain-keys\" 関数を提供しません。このバグを報告し"
+"てください。"
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus バックエンドエラー"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Chiasmus バックエンドからの予期しない返り値: \"x-obtain-keys\" 関数は文字リストを返しませんでした。このバグを報告してください。"
+"Chiasmus バックエンドからの予期しない返り値: \"x-obtain-keys\" 関数は文字リス"
+"トを返しませんでした。このバグを報告してください。"
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
-msgstr "鍵が見つかりません。Chiasmus 設定で有効な鍵のパスが設定されているか確認してください。"
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
+msgstr ""
+"鍵が見つかりません。Chiasmus 設定で有効な鍵のパスが設定されているか確認してく"
+"ださい。"
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus 復号鍵の選択"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
-msgstr "Chiasmus バックエンドは \"x-decrypt\" 関数を提供しません。このバグを報告してください。"
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
+msgstr ""
+"Chiasmus バックエンドは \"x-decrypt\" 関数を提供しません。このバグを報告して"
+"ください。"
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
-msgstr "\"x-decrypt\" 関数は期待されるパラメータを受け取りません。このバグを報告してください。"
+msgstr ""
+"\"x-decrypt\" 関数は期待されるパラメータを受け取りません。このバグを報告して"
+"ください。"
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus 復号エラー"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Chiasmus バックエンドからの予期しない返り値: \"x-decrypt\" 関数はバイト列を返しませんでした。このバグを報告してください。"
+"Chiasmus バックエンドからの予期しない返り値: \"x-decrypt\" 関数はバイト列を返"
+"しませんでした。このバグを報告してください。"
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5512,7 +5625,7 @@ msgstr ""
 "To: %2\n"
 "件名: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "メール: %1"
@@ -5611,7 +5724,7 @@ msgstr "サイズ"
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "圧縮"
 
@@ -5623,7 +5736,7 @@ msgstr "暗号化"
 msgid "Sign"
 msgstr "署名"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "添付ファイル名:"
 
@@ -5645,8 +5758,11 @@ msgstr "主要な受信者"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
-msgstr "<qt>このフィールドに入れたメールアドレスには、Eメールのコピーが送信されます。</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
+msgstr ""
+"<qt>このフィールドに入れたメールアドレスには、Eメールのコピーが送信されます。"
+"</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5655,12 +5771,14 @@ msgstr "その他の受信者"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>このフィールドに入れたメールアドレには、Eメールのコピーが送信されます。技術的には、これはすべてのアドレスを <b>To:</b> "
-"に入れるのと同じですが、通常カーボンコピー (CC) の受け手は主要な受信者ではなく、聞き手であることを表します。</qt>"
+"<qt>このフィールドに入れたメールアドレには、Eメールのコピーが送信されます。技"
+"術的には、これはすべてのアドレスを <b>To:</b> に入れるのと同じですが、通常"
+"カーボンコピー (CC) の受け手は主要な受信者ではなく、聞き手であることを表しま"
+"す。</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5668,10 +5786,11 @@ msgstr "隠された受信者"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
-msgstr "<qt>基本的には CC: フィールドと同じですが、他の受信者にはブラインドコピーを受け取る人が見えない点が異なります。</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
+msgstr ""
+"<qt>基本的には CC: フィールドと同じですが、他の受信者にはブラインドコピーを受"
+"け取る人が見えない点が異なります。</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -5683,7 +5802,7 @@ msgstr "送信(&S)"
 msgid "&Send Mail Via"
 msgstr "送信(&M)"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "後で送信(&L)"
@@ -5751,8 +5870,7 @@ msgstr "引用記号を除去(&M)"
 msgid "Cl&ean Spaces"
 msgstr "スペースをクリア(&E)"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "固定幅フォントを使う(&X)"
@@ -5893,31 +6011,31 @@ msgstr "メッセージの暗号化法形式(&C)"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "標準"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "箇条書き (ディスク)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "箇条書き (丸)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "箇条書き (四角)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "順序書き (数字)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "順序書き (英小文字)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "順序書き (英大文字)"
 
@@ -6002,7 +6120,9 @@ msgstr "下書きとして保存(&S)"
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
-msgstr "このメッセージをテンプレートフォルダに再保存します。そうすると後で利用できます。"
+msgstr ""
+"このメッセージをテンプレートフォルダに再保存します。そうすると後で利用できま"
+"す。"
 
 #: kmcomposewin.cpp:2257
 msgid ""
@@ -6020,57 +6140,62 @@ msgstr "メール作成を閉じる"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"作成されたメッセージは添付ファイルについて言及しているようですが、何も添付されていません。\n"
+"作成されたメッセージは添付ファイルについて言及しているようですが、何も添付さ"
+"れていません。\n"
 "メッセージにファイルを添付しますか？"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "添付ファイルチェック"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "このまま送信(&S)"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>添付ファイル (%1) の場所を認識できませんでした。</p>"
-"<p>ファイルを添付するには、フルパス名を指定する必要があります。</p></qt>"
+"<qt><p>添付ファイル (%1) の場所を認識できませんでした。</p><p>ファイルを添付"
+"するには、フルパス名を指定する必要があります。</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
-msgstr "<qt><p>管理者が %1 MB を超えるファイルを添付することを禁止しています。</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
+msgstr ""
+"<qt><p>管理者が %1 MB を超えるファイルを添付することを禁止しています。</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "ファイルを添付"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "添付(&A)"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "ファイルを挿入"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "ファイルを挿入"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
-msgstr "<qt><p>バックエンドからの鍵のエクスポートの試行中にエラー発生:</p><p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
+msgstr ""
+"<qt><p>バックエンドからの鍵のエクスポートの試行中にエラー発生:</p><p><b>%1</"
+"b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6109,279 +6234,305 @@ msgid ""
 "View"
 msgstr "表示"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "編集..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "外部アプリケーションで編集..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "名前を付けて保存(&A)..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "プロパティ(&P)"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "添付ファイルを追加..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "ファイルを圧縮できませんでした。"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr "圧縮ファイルがオリジナルよりも大きくなっています。オリジナルのファイルを保持しますか？"
+msgstr ""
+"圧縮ファイルがオリジナルよりも大きくなっています。オリジナルのファイルを保持"
+"しますか？"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "保持する"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "ファイルを展開できませんでした。"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "添付ファイルに名前を付けて保存"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "テキストとして追加"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "添付ファイルとして追加"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
-msgstr "内容をテキストとしてエディタに挿入するか、添付ファイルとして追加するかを選択してください。"
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
+msgstr ""
+"内容をテキストとしてエディタに挿入するか、添付ファイルとして追加するかを選択"
+"してください。"
 
 # Caption
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "テキストまたは添付ファイル"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "名前なし"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>メッセージを自分自身に対して暗号化することを要求していますが、現在選択中の個人情報には、これに使う (OpenPGP または S/MIME) "
-"暗号化鍵が定義されていません。</p>"
-"<p>個人情報設定で使用する鍵を選択してください。</p></qt>"
+"<qt><p>メッセージを自分自身に対して暗号化することを要求していますが、現在選択"
+"中の個人情報には、これに使う (OpenPGP または S/MIME) 暗号化鍵が定義されていま"
+"せん。</p><p>個人情報設定で使用する鍵を選択してください。</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "未定義の暗号化キー"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>このメッセージに署名するには、それに使用する鍵 (OpenPGP または S/MIME) を定義する必要があります。</p>"
-"<p>現在の個人情報の鍵は個人情報設定で定義できます。</p></qt>"
+"<qt><p>このメッセージに署名するには、それに使用する鍵 (OpenPGP または S/"
+"MIME) を定義する必要があります。</p><p>現在の個人情報の鍵は個人情報設定で定義"
+"できます。</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "未定義の署名用キー"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
-msgstr "KMail は現在オフラインモードです。オンラインに戻るまで、メッセージは「送信待ち」に残ります。"
+msgstr ""
+"KMail は現在オフラインモードです。オンラインに戻るまで、メッセージは「送信待"
+"ち」に残ります。"
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "オンライン/オフライン"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"差出人フィールドにメールアドレスを入力してください。また、メッセージごとに入力する必要がないように、すべての個人情報にもメールアドレスを設定してください。"
+"差出人フィールドにメールアドレスを入力してください。また、メッセージごとに入"
+"力する必要がないように、すべての個人情報にもメールアドレスを設定してくださ"
+"い。"
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
-msgstr "少なくとも一人の受信者を To: フィールドまたは CC や BCC として指定する必要があります。"
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
+msgstr ""
+"少なくとも一人の受信者を To: フィールドまたは CC や BCC として指定する必要が"
+"あります。"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "To: フィールドがありません。このまま送信しますか？"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "To: が指定されていません"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "件名が設定されていません。このまま送信しますか？"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "件名が指定されていません"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "このまま送信(&E)"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "件名を指定(&S)"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "マークアップを維持し、署名/暗号化をしない(&K)"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "マークアップを維持し、暗号化しない(&K)"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "マークアップを維持し、署名しない(&K)"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "署名/暗号化 (マークアップを削除)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "暗号化 (マークアップを削除)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "署名 (マークアップを削除)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
-msgstr "<qt><p>HTML メッセージのインライン署名/暗号化はできません。</p><p>マークアップを削除しますか？</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
+msgstr ""
+"<qt><p>HTML メッセージのインライン署名/暗号化はできません。</p><p>マークアッ"
+"プを削除しますか？</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "メッセージを署名/暗号化しますか？"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
-msgstr "個人情報 \"%1\" に対応する下書き/テンプレートフォルダが存在しません。標準の下書き/テンプレートフォルダを使用します。"
+msgstr ""
+"個人情報 \"%1\" に対応する下書き/テンプレートフォルダが存在しません。標準の下"
+"書き/テンプレートフォルダを使用します。"
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "設定で送信アカウントを作成して、やり直してください。"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "メールを送信します..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "送信の確認"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "今すぐ送信(&S)"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "受信者未設定"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "その他の受信者"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "スペルチェック: オン"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "スペルチェック: オフ"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "スペルチェックがキャンセルされました。"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "スペルチェックが停止されました。"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "スペルチェックが完了しました。"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "スペルチェッカー"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "まず Chiasmus 暗号化に使用する暗号化バックエンドを設定してください。\n"
-"設定ダイアログの「セキュリティ」ページの「暗号化バックエンド」タブで設定できます。"
+"設定ダイアログの「セキュリティ」ページの「暗号化バックエンド」タブで設定でき"
+"ます。"
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"libkleopatra が Chiasmus のサポートを外してコンパイルされているようです。--enable-chiasmus オプションを用いて "
-"libkleopatra を再コンパイルしてください。"
+"libkleopatra が Chiasmus のサポートを外してコンパイルされているようです。--"
+"enable-chiasmus オプションを用いて libkleopatra を再コンパイルしてください。"
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Chiasmus バックエンドが設定されていません"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Chiasmus 鍵が見つかりません"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus 暗号化鍵の選択"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "メッセージは署名されます"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "メッセージは署名されません"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "メッセージは暗号化されます"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "メッセージは暗号化されません"
 
@@ -6430,10 +6581,11 @@ msgstr "スペルチェック - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/Aapell を開始できませんでした。ISpell または Aspell が正しく設定されていて、PATH にあることを確認してください。"
+"ISpell/Aapell を開始できませんでした。ISpell または Aspell が正しく設定されて"
+"いて、PATH にあることを確認してください。"
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6466,10 +6618,11 @@ msgstr "<qt>フィルタルール <b>%1</b> にフィルタアクションが多
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
-msgstr "<qt>未知のフィルタアクション <b>%1</b><br>フィルタルール <b>%2</b><br>無視します。</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
+msgstr ""
+"<qt>未知のフィルタアクション <b>%1</b><br>フィルタルール <b>%2</b><br>無視し"
+"ます。</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6690,141 +6843,120 @@ msgstr "音を鳴らす"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>定義済みのフィルタの一覧です。フィルタは上位のものから順に適用されます。</p>"
-"<p>フィルタをクリックして、ダイアログ右側のコントロールを使って編集してください。</p></qt>"
+"<qt><p>定義済みのフィルタの一覧です。フィルタは上位のものから順に適用されま"
+"す。</p><p>フィルタをクリックして、ダイアログ右側のコントロールを使って編集し"
+"てください。</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>新しいフィルタを作成します。</p>"
-"<p>作成されたフィルタは現在選択されているものの前に挿入されますが、これは後で変更できます。</p>"
-"<p>このボタンを誤って押しても、右の「削除」ボタンをクリックしてすぐに取り消すことができます。</p></qt>"
+"<qt><p>新しいフィルタを作成します。</p><p>作成されたフィルタは現在選択されて"
+"いるものの前に挿入されますが、これは後で変更できます。</p><p>このボタンを誤っ"
+"て押しても、右の「削除」ボタンをクリックしてすぐに取り消すことができます。</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>フィルタのコピーを作成します。</p>"
-"<p>このボタンを誤って押しても、右の「削除」ボタンをクリックしてすぐに取り消すことができます。</p></qt>"
+"<qt><p>フィルタのコピーを作成します。</p><p>このボタンを誤って押しても、右の"
+"「削除」ボタンをクリックしてすぐに取り消すことができます。</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>上のリストで選択したフィルタを削除します。</p>"
-"<p>削除されたフィルタを取り戻す方法はありませんが、「キャンセル」ボタンをクリックしてダイアログを閉じることで、いつでも変更を破棄できます。</p></qt>"
+"<qt><p>上のリストで選択したフィルタを削除します。</p><p>削除されたフィルタを"
+"取り戻す方法はありませんが、「キャンセル」ボタンをクリックしてダイアログを閉"
+"じることで、いつでも変更を破棄できます。</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>現在選択されているフィルタを上のリストの一番上に移動します。</p>"
-"<p>フィルタはリストの上位のものから順にメッセージに適用されます。</p></qt>"
+"<qt><p>現在選択されているフィルタを上のリストの一番上に移動します。</p><p>"
+"フィルタはリストの上位のものから順にメッセージに適用されます。</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
-"<qt>"
-"<p>現在選択されているフィルタを上のリスト上で一つ上に移動します。</p>"
-"<p>フィルタはリストの上位のものから順にメッセージに適用されます。</p>"
-"<p>このボタンを誤って押しても、右の「下」ボタンで元に戻すことができます。</p></qt>"
+"<qt><p>現在選択されているフィルタを上のリスト上で一つ上に移動します。</p><p>"
+"フィルタはリストの上位のものから順にメッセージに適用されます。</p><p>このボタ"
+"ンを誤って押しても、右の「下」ボタンで元に戻すことができます。</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>現在選択されているフィルタを上のリスト上で一つ下に移動します。</p>"
-"<p>フィルタはリストの上位のものから順にメッセージに適用されます。</p>"
-"<p>このボタンを誤って押しても、左の「上」ボタンで元に戻すことができます。</p></qt>"
+"<qt><p>現在選択されているフィルタを上のリスト上で一つ下に移動します。</p><p>"
+"フィルタはリストの上位のものから順にメッセージに適用されます。</p><p>このボタ"
+"ンを誤って押しても、左の「上」ボタンで元に戻すことができます。</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>現在選択されているフィルタを上のリストの一番下に移動します。</p>"
-"<p>フィルタはリストの上位のものから順にメッセージに適用されます。</p></qt>"
+"<qt><p>現在選択されているフィルタを上のリストの一番下に移動します。</p><p>"
+"フィルタはリストの上位のものから順にメッセージに適用されます。</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>現在選択されているフィルタの名前を変更します。</p>"
-"<p>\"&lt;\" で始まるフィルタには自動的に名前が付きます。</p>"
-"<p>誤って変更してしまったフィルタの名前を自動の名前に戻すには、このボタンをクリックし、ダイアログで「クリア」を選択してから「OK」を押してください。</p>"
-"</qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>現在選択されているフィルタの名前を変更します。</p><p>\"&lt;\" で始まる"
+"フィルタには自動的に名前が付きます。</p><p>誤って変更してしまったフィルタの名"
+"前を自動の名前に戻すには、このボタンをクリックし、ダイアログで「クリア」を選"
+"択してから「OK」を押してください。</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>このオプションを有効にすると、確認ダイアログを強制的に表示させることができます。</p>"
-"<p>これは、メッセージを後でダウンロードするようタグ付けするルールセットが定義されている場合に役立ちます。ダイアログを強制的に表示させるオプションがないと、他"
-"に大きなメッセージがサーバにあるか、メッセージに別のタグを付けるようにルールセットを書き直さない限り、それらのメッセージをダウンロードできなくなってしまいます。"
-"</p></qt>"
+"<qt><p>このオプションを有効にすると、確認ダイアログを強制的に表示させることが"
+"できます。</p><p>これは、メッセージを後でダウンロードするようタグ付けするルー"
+"ルセットが定義されている場合に役立ちます。ダイアログを強制的に表示させるオプ"
+"ションがないと、他に大きなメッセージがサーバにあるか、メッセージに別のタグを"
+"付けるようにルールセットを書き直さない限り、それらのメッセージをダウンロード"
+"できなくなってしまいます。</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -6834,6 +6966,16 @@ msgstr "POP3 フィルタルール"
 msgid "Filter Rules"
 msgstr "フィルタルール"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "インポート(&I)"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "インポート(&I)"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "設定済みのフィルタ"
@@ -6856,7 +6998,8 @@ msgstr "全体オプション"
 
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
-msgstr "確認ダイアログに「後でダウンロード」にマッチするメッセージを常に表示する(&S)"
+msgstr ""
+"確認ダイアログに「後でダウンロード」にマッチするメッセージを常に表示する(&S)"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -6914,6 +7057,11 @@ msgstr "このフィルタをツールバーに追加"
 msgid "Icon for this filter:"
 msgstr "このフィルタのアイコン:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "To"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "上"
@@ -6922,16 +7070,29 @@ msgstr "上"
 msgid "Down"
 msgstr "下"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "名前変更..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "新規"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "コピー(&C)"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "削除"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6940,17 +7101,20 @@ msgstr "フォルダのショートカットを選択"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"少なくとも一つのフィルタがオンライン IMAP アカウントのフォルダを対象としています。そのようなフィルタは手動フィルタリング時と受信オンライン IMAP "
-"メールのフィルタ時にのみ適用されます。"
+"少なくとも一つのフィルタがオンライン IMAP アカウントのフォルダを対象としてい"
+"ます。そのようなフィルタは手動フィルタリング時と受信オンライン IMAP メールの"
+"フィルタ時にのみ適用されます。"
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
-msgstr "以下のフィルタは有効でないため (アクションが未定義、検索ルールがないなど) 、保存しませんでした。"
+msgstr ""
+"以下のフィルタは有効でないため (アクションが未定義、検索ルールがないなど) 、"
+"保存しませんでした。"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -6997,19 +7161,24 @@ msgstr "フォルダの作成に失敗しました"
 msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
-msgstr "フォルダ名にはスラッシュ (/) は使えません。他のフォルダ名を指定してください。"
+msgstr ""
+"フォルダ名にはスラッシュ (/) は使えません。他のフォルダ名を指定してください。"
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
-msgstr "フォルダ名の最初の文字にドット (.) は使えません。他のフォルダ名を指定してください。"
+msgstr ""
+"フォルダ名の最初の文字にドット (.) は使えません。他のフォルダ名を指定してくだ"
+"さい。"
 
 #: kmfolder.cpp:932
 msgid ""
 "Your IMAP server does not allow the character '%1'; please choose another "
 "folder name."
-msgstr "IMAP サーバは文字 \"%1\" の使用を許可していません。他のフォルダ名を指定してください。"
+msgstr ""
+"IMAP サーバは文字 \"%1\" の使用を許可していません。他のフォルダ名を指定してく"
+"ださい。"
 
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
@@ -7017,27 +7186,24 @@ msgstr "IMAP キャッシュのトラブルシューティング"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p>IMAP キャッシュのトラブルシューティング</p>"
-"<p>IMAP "
-"フォルダの同期に問題があるなら、最初にインデックスファイルを再構築してみてください。再構築には時間がかかりますが、別に問題は起こしません。</p>"
-"<p>もしこれで解決しなければ、IMAP "
-"キャッシュを更新してみてください。ただしこうすると、そのフォルダやサブフォルダに加えたローカルな変更は失われます。</p>"
+"<p>IMAP キャッシュのトラブルシューティング</p><p>IMAP フォルダの同期に問題が"
+"あるなら、最初にインデックスファイルを再構築してみてください。再構築には時間"
+"がかかりますが、別に問題は起こしません。</p><p>もしこれで解決しなければ、"
+"IMAP キャッシュを更新してみてください。ただしこうすると、そのフォルダやサブ"
+"フォルダに加えたローカルな変更は失われます。</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7068,17 +7234,21 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"フォルダ \"%1\" の UID キャッシュファイルを読めませんでした。ファイルシステムの許可属性に問題があるか、ファイルが壊れている可能性があります。"
+"フォルダ \"%1\" の UID キャッシュファイルを読めませんでした。ファイルシステム"
+"の許可属性に問題があるか、ファイルが壊れている可能性があります。"
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
-msgstr "フォルダ \"%1\" の UID キャッシュファイルに書き込めませんでした。ファイルシステムの許可属性に問題がある可能性があります。"
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
+msgstr ""
+"フォルダ \"%1\" の UID キャッシュファイルに書き込めませんでした。ファイルシス"
+"テムの許可属性に問題がある可能性があります。"
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
-msgstr "IMAP フォルダの名前を変更する前に、サーバと同期を取らなければなりません。"
+msgstr ""
+"IMAP フォルダの名前を変更する前に、サーバと同期を取らなければなりません。"
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7111,9 +7281,11 @@ msgstr "このフォルダのインデックスを再構築しました。"
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
-msgstr "フォルダ \"%1\" は初期同期状態ではありません (状態は %2 です)。初期状態にリセットし、同期しますか？"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
+msgstr ""
+"フォルダ \"%1\" は初期同期状態ではありません (状態は %2 です)。初期状態にリ"
+"セットし、同期しますか？"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7215,7 +7387,9 @@ msgstr "サーバにメッセージをアップロード中"
 msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
-msgstr "<p>フォルダ \"%1\" へのアクセスが制限されています。このフォルダにメッセージを追加することはできません。</p>"
+msgstr ""
+"<p>フォルダ \"%1\" へのアクセスが制限されています。このフォルダにメッセージを"
+"追加することはできません。</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7236,14 +7410,11 @@ msgstr "サーバにサブフォルダを作成中"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>フォルダ \"%1\" のメールはサーバ上で削除されています。これらをローカルでも削除しますか？"
-"<br>UID: %2</p></qt>"
+"<qt><p>フォルダ \"%1\" のメールはサーバ上で削除されています。これらをローカル"
+"でも削除しますか？<br>UID: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7264,10 +7435,11 @@ msgstr "名前空間 \"%1\" 用フォルダを取得中"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
-msgstr "<qt><p>フォルダ \"%1\" は削除されたようです。これをサーバから削除しますか？</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
+msgstr ""
+"<qt><p>フォルダ \"%1\" は削除されたようです。これをサーバから削除しますか？</"
+"p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7275,17 +7447,19 @@ msgstr "中止しました"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"IMAP サーバ %1 は IMAP 注釈をサポートしていません。XML ストレージはこのサーバでは使えません。KMail の設定を変更してください。"
+"IMAP サーバ %1 は IMAP 注釈をサポートしていません。XML ストレージはこのサーバ"
+"では使えません。KMail の設定を変更してください。"
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"IMAP サーバ %1 は IMAP 注釈をサポートしていません。XML ストレージはこのサーバでは使えません。KMail の設定を変更してください。"
+"IMAP サーバ %1 は IMAP 注釈をサポートしていません。XML ストレージはこのサーバ"
+"では使えません。KMail の設定を変更してください。"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7297,16 +7471,16 @@ msgstr "lost+found"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>フォルダ \"%1\" "
-"には、まだサーバにアップロードされていない新規メッセージがあります。しかし、サーバ上でフォルダが削除されているか、あなたにこれらをアップロードするために必要なア"
-"クセス権限がありません。</p>"
-"<p>データが消失しないように、これらのメッセージをフォルダ \"%2\" へ移動します。</p>"
+"<p>フォルダ \"%1\" には、まだサーバにアップロードされていない新規メッセージが"
+"あります。しかし、サーバ上でフォルダが削除されているか、あなたにこれらをアッ"
+"プロードするために必要なアクセス権限がありません。</p><p>データが消失しないよ"
+"うに、これらのメッセージをフォルダ \"%2\" へ移動します。</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7314,19 +7488,25 @@ msgstr "アクセス権限がありません"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>このフォルダ (%1) "
-"には、まだサーバにアップロードされていない新規メッセージがあります。しかし、サーバ上でフォルダが削除されているか、あなたにこれらをアップロードするために必要なア"
-"クセス権限がありません。管理者に連絡して新規メッセージのアップロードを許可してもらうか、メッセージをこのフォルダから移動してください。</p>"
-"<p>これらのメッセージを今他のフォルダに移動しますか？</p>"
+"<p>このフォルダ (%1) には、まだサーバにアップロードされていない新規メッセージ"
+"があります。しかし、サーバ上でフォルダが削除されているか、あなたにこれらを"
+"アップロードするために必要なアクセス権限がありません。管理者に連絡して新規"
+"メッセージのアップロードを許可してもらうか、メッセージをこのフォルダから移動"
+"してください。</p><p>これらのメッセージを今他のフォルダに移動しますか？</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "次に移動:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "移動しない"
 
@@ -7338,8 +7518,7 @@ msgstr "メッセージをフォルダに移動"
 msgid "Permissions (ACL)"
 msgstr "権限 (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "全般"
@@ -7363,8 +7542,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "アイコンを指定する(&I)"
@@ -7383,20 +7561,20 @@ msgstr "このフォルダの新規/未読メールを含める"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>このオプションを有効にすると、このフォルダの新規/未読メールについて通知します。また、未読メッセージのある前後のフォルダに移動するときに、このフォルダも含"
-"めます。</p>"
-"<p>このフォルダの新規/未読メールについては通知が不要で、未読メッセージのある前後のフォルダに移動するときにこのフォルダを除外する場合は、このオプションのチェ"
-"ックを外してください。これはごみ箱やスパムフォルダの新規/未読メールを無視するのに役立ちます。</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>このオプションを有効にすると、このフォルダの新規/未読メールについて通"
+"知します。また、未読メッセージのある前後のフォルダに移動するときに、このフォ"
+"ルダも含めます。</p><p>このフォルダの新規/未読メールについては通知が不要で、"
+"未読メッセージのある前後のフォルダに移動するときにこのフォルダを除外する場合"
+"は、このオプションのチェックを外してください。これはごみ箱やスパムフォルダの"
+"新規/未読メールを無視するのに役立ちます。</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7408,10 +7586,12 @@ msgstr "返信をこのフォルダに保存する"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
-msgstr "このフォルダのメールに対する返信メールを、送信済みフォルダではなくこのフォルダに置く場合は、このオプションを有効にしてください。"
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
+msgstr ""
+"このフォルダのメールに対する返信メールを、送信済みフォルダではなくこのフォル"
+"ダに置く場合は、このオプションを有効にしてください。"
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7421,17 +7601,21 @@ msgstr "メッセージ一覧に送信者/受信者列を表示"
 msgid "Sho&w column:"
 msgstr "表示する列(&W):"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "デフォルトにする"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "送信者"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "受信者"
@@ -7442,15 +7626,17 @@ msgstr "送信者の個人情報(&S):"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"このフォルダで新規メールを書いたり、このフォルダのメールに返信する際に使用する送信者の個人情報を選択します。これによって、作業フォルダのいずれかが選択されていれ"
-"ば、そのフォルダに対応する送信者メールアドレス、署名、そして署名/暗号化鍵を KMail に自動的に使用させることができます。個人情報はメインの設定ダイアログ "
-"(設定 -> KMail を設定) で設定してください。"
+"このフォルダで新規メールを書いたり、このフォルダのメールに返信する際に使用す"
+"る送信者の個人情報を選択します。これによって、作業フォルダのいずれかが選択さ"
+"れていれば、そのフォルダに対応する送信者メールアドレス、署名、そして署名/暗号"
+"化鍵を KMail に自動的に使用させることができます。個人情報はメインの設定ダイア"
+"ログ (設定 -> KMail を設定) で設定してください。"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7468,22 +7654,26 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"この設定は、このフォルダを共有するどのユーザが動静リストで「予定有り」期間を設定され、このフォルダのイベントまたはタスクのアラームを見るべきかを定義します。設定"
-"はカレンダーおよびタスクフォルダのみに適用されます。(タスクに対しては、この設定はアラームに対してのみ使用されます。)\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"この設定は、このフォルダを共有するどのユーザが動静リストで「予定有り」期間を"
+"設定され、このフォルダのイベントまたはタスクのアラームを見るべきかを定義しま"
+"す。設定はカレンダーおよびタスクフォルダのみに適用されます。(タスクに対して"
+"は、この設定はアラームに対してのみ使用されます。)\n"
 "\n"
-"使用例: "
-"ボスが秘書とフォルダを共有している場合、ボスのみが会議に対して「予定有り」とマークされるべきです。よって、秘書はフォルダの管理権を持たないので、ボスが「Admi"
-"ns」を選択します。\n"
-"一方、作業グループがグループミーティングについてカレンダーを共有している場合、フォルダのすべての読者がこのミーティングに対して「予定有り」とマークされなければな"
-"りません。\n"
-"自由参加のイベントを含む全社的なフォルダであれば、誰がこれらのイベントに参加するか不明なので、「Nobody」を使うべきです。"
+"使用例: ボスが秘書とフォルダを共有している場合、ボスのみが会議に対して「予定"
+"有り」とマークされるべきです。よって、秘書はフォルダの管理権を持たないので、"
+"ボスが「Admins」を選択します。\n"
+"一方、作業グループがグループミーティングについてカレンダーを共有している場"
+"合、フォルダのすべての読者がこのミーティングに対して「予定有り」とマークされ"
+"なければなりません。\n"
+"自由参加のイベントを含む全社的なフォルダであれば、誰がこれらのイベントに参加"
+"するか不明なので、「Nobody」を使うべきです。"
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7500,7 +7690,9 @@ msgstr "このフォルダの全読者"
 #: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
-msgstr "この設定により、他の人と共有しているフォルダについてはアラームを無効にすることができます。"
+msgstr ""
+"この設定により、他の人と共有しているフォルダについてはアラームを無効にするこ"
+"とができます。"
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -7514,20 +7706,22 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"このフォルダにグループウェア情報を保管し、グループウェアフォルダを隠すように全般オプションが設定されました。したがって、設定ダイアログを閉じると、このフォルダは"
-"見えなくなります。フォルダを再び削除する場合は、一時的に「グループウェアフォルダを隠す」オプションを無効にしてください。"
+"このフォルダにグループウェア情報を保管し、グループウェアフォルダを隠すように"
+"全般オプションが設定されました。したがって、設定ダイアログを閉じると、この"
+"フォルダは見えなくなります。フォルダを再び削除する場合は、一時的に「グループ"
+"ウェアフォルダを隠す」オプションを無効にしてください。"
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7574,7 +7768,8 @@ msgstr "メッセージ取得中"
 #: kmfolderimap.cpp:1274
 #, c-format
 msgid "Error while listing the contents of the folder %1."
-msgstr "フォルダ \"%1\" のリスティング (内容一覧表示) 中にエラーが発生しました。"
+msgstr ""
+"フォルダ \"%1\" のリスティング (内容一覧表示) 中にエラーが発生しました。"
 
 #: kmfolderimap.cpp:1695
 msgid "Error while retrieving messages."
@@ -7596,11 +7791,13 @@ msgstr "フォルダ情報の取得中にエラーが発生しました。"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "\"%1\" のメールインデックスは KMail の未知のバージョン (%2) のものです。\n"
-"このインデックスはあなたのメールフォルダから再生成することもできますが、そうすると一部の情報、例えば状態フラグなどが失われる可能性があります。インデックスファイ"
-"ルをダウングレードしますか？"
+"このインデックスはあなたのメールフォルダから再生成することもできますが、そう"
+"すると一部の情報、例えば状態フラグなどが失われる可能性があります。インデック"
+"スファイルをダウングレードしますか？"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -7615,7 +7812,9 @@ msgstr "ダウングレードしない"
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
-msgstr "%1 のメールインデックスが破損しています。これから再生成します。このため、 ステータスを含む一部情報が失われます。"
+msgstr ""
+"%1 のメールインデックスが破損しています。これから再生成します。このため、 ス"
+"テータスを含む一部情報が失われます。"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -7623,9 +7822,11 @@ msgstr "%1 を開けません。このフォルダはありません。"
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
-msgstr "%1 を開こうとしてエラーが発生しました。無効な maildir フォルダであるか、必要なアクセス権限がありません。"
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
+msgstr ""
+"%1 を開こうとしてエラーが発生しました。無効な maildir フォルダであるか、必要"
+"なアクセス権限がありません。"
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -7637,7 +7838,9 @@ msgstr "maildir フォルダの同期が取れませんでした。"
 
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
-msgstr "メッセージをフォルダに追加できませんでした。おそらくディスク領域が足りないためです。"
+msgstr ""
+"メッセージをフォルダに追加できませんでした。おそらくディスク領域が足りないた"
+"めです。"
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -7665,20 +7868,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>フォルダ \"%2\" "
-"のインデックスは古すぎるようです。メッセージの破損を防ぐために、インデックスを再生成する必要があります。その結果、削除したメッセージが復活したり、状態フラグが失"
-"われたりする場合があります。</p>"
-"<p>この問題の再発を防ぐ方法については、<a href=\"%1\">KMail のマニュアルの FAQ セクション</a> "
-"内の対応する項をお読みください。</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>フォルダ \"%2\" のインデックスは古すぎるようです。メッセージの破損を防"
+"ぐために、インデックスを再生成する必要があります。その結果、削除したメッセー"
+"ジが復活したり、状態フラグが失われたりする場合があります。</p><p>この問題の再"
+"発を防ぐ方法については、<a href=\"%1\">KMail のマニュアルの FAQ セクション</"
+"a> 内の対応する項をお読みください。</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7735,7 +7935,7 @@ msgstr ""
 "'%1' はフォルダではないようです。\n"
 "ファイルを取り除いてください。"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7743,7 +7943,7 @@ msgstr ""
 "フォルダ \"%1\" のアクセス許可が適切ではありません。\n"
 "このフォルダの内容を参照/変更できるかどうか確認してください。"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7753,16 +7953,17 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"同じ名前のフォルダが前回メールをチェックしてから削除されています。同じ名前のフォルダを新たに作成するには、先にメールをチェックする必要があります。"
+"同じ名前のフォルダが前回メールをチェックしてから削除されています。同じ名前の"
+"フォルダを新たに作成するには、先にメールをチェックする必要があります。"
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "フォルダを作成できませんでした"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7860,12 +8061,12 @@ msgstr "IMAP キャッシュのトラブルシューティング(&T)..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>サーバでの権限が不十分なため、フォルダ \"%1\" "
-"を作成できません。ここにサブフォルダを作れるはずであれば、管理者に連絡して許可を得てください。</qt>"
+"<qt>サーバでの権限が不十分なため、フォルダ \"%1\" を作成できません。ここにサ"
+"ブフォルダを作れるはずであれば、管理者に連絡して許可を得てください。</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -7881,18 +8082,24 @@ msgstr "合計"
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
-msgstr "<qt>フォルダ \"%1\" をここに移動/コピーすることはできません。同じ名前のフォルダが既に存在します。</qt>"
+msgstr ""
+"<qt>フォルダ \"%1\" をここに移動/コピーすることはできません。同じ名前のフォル"
+"ダが既に存在します。</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
-msgstr "<qt>フォルダ \"%1\" が完全にコピーされていないため、移動/コピーすることができません。</qt>"
+msgstr ""
+"<qt>フォルダ \"%1\" が完全にコピーされていないため、移動/コピーすることができ"
+"ません。</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
-msgstr "<qt>フォルダ \"%1\" をそれ自身のサブフォルダに移動/コピーすることはできません。</qt>"
+msgstr ""
+"<qt>フォルダ \"%1\" をそれ自身のサブフォルダに移動/コピーすることはできませ"
+"ん。</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -7992,11 +8199,13 @@ msgstr "%1 フォルダは読み取り専用です。"
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
-msgstr "<qt>本当に %n 件の選択されたメッセージを削除しますか？<br>削除してしまうと、元には戻せません。</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
+msgstr ""
+"<qt>本当に %n 件の選択されたメッセージを削除しますか？<br>削除してしまうと、"
+"元には戻せません。</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8048,129 +8257,133 @@ msgstr ""
 "%1 の変更に失敗\n"
 "(デバイスの空き領域不足？)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "証明書の署名要求"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "添付ファイルから証明書を作成し、送信者に送り返してください。"
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
-msgstr "KMail がオフラインモードになりました。すべてのネットワークジョブを中断しました。"
+msgstr ""
+"KMail がオフラインモードになりました。すべてのネットワークジョブを中断しまし"
+"た。"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
-msgstr "KMail がオンラインモードになりました。すべてのネットワークジョブを再開しました。"
+msgstr ""
+"KMail がオンラインモードになりました。すべてのネットワークジョブを再開しまし"
+"た。"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail は現在オフラインモードです。どうしますか？"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "オンライン作業"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "オフライン作業"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "受信箱フォルダの読み/書き権限がありません。"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "送信待ち"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "送信待ちフォルダの読み/書き権限がありません。"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "送信済み"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "送信済みフォルダの読み/書き権限がありません。"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "ごみ箱"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "ごみ箱フォルダの読み/書き権限がありません。"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "下書き"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "下書きフォルダの読み/書き権限がありません。"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "テンプレート"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "テンプレートフォルダへの読み/書き権限がありません。"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "前回の検索"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>\"%4\" フォルダが存在します。%1 は今そのメッセージ用に \"%5\" フォルダを使用します。"
-"<p>%2 はこのフォルダに \"%6\" の内容を移動できます。ただし、\"%7\" に同名のファイルがあると、これを置換してしまう可能性があります。"
+"<qt>\"%4\" フォルダが存在します。%1 は今そのメッセージ用に \"%5\" フォルダを"
+"使用します。<p>%2 はこのフォルダに \"%6\" の内容を移動できます。ただ"
+"し、\"%7\" に同名のファイルがあると、これを置換してしまう可能性があります。"
 "<p>%3 に今メールファイルを移動させますか？</qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>\"%4\" フォルダが存在します。%1 はそのメッセージ用に \"%5\" フォルダを使用します。%2 はこのフォルダに \"%6\" "
-"の内容を移動できます。"
-"<p>%3 に今メールファイルを移動させますか？</qt>"
+"<qt>\"%4\" フォルダが存在します。%1 はそのメッセージ用に \"%5\" フォルダを使"
+"用します。%2 はこのフォルダに \"%6\" の内容を移動できます。<p>%3 に今メール"
+"ファイルを移動させますか？</qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "メールファイルを移行しますか？"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail に致命的エラーが発生しました。終了します。"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8181,11 +8394,11 @@ msgstr ""
 "エラーは:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "ごみ箱を空にする"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "本当にすべてのアカウントのごみ箱フォルダを空にしますか？"
 
@@ -8258,8 +8471,7 @@ msgstr "%1 に %n 件の新規メッセージ"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "新着メール<br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8297,9 +8509,10 @@ msgstr "本当にごみ箱フォルダを空にしますか？"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
-msgstr "<qt>本当にフォルダ \"%1\" のすべてのメッセージをごみ箱に移動しますか？</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
+msgstr ""
+"<qt>本当にフォルダ \"%1\" のすべてのメッセージをごみ箱に移動しますか？</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8323,9 +8536,11 @@ msgstr "検索を削除"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
-msgstr "<qt>本当に検索 <b>%1</b> を削除しますか？<br>表示されているメッセージは元のフォルダに残ります。</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
+msgstr ""
+"<qt>本当に検索 <b>%1</b> を削除しますか？<br>表示されているメッセージは元の"
+"フォルダに残ります。</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8337,34 +8552,39 @@ msgstr "<qt>本当に空のフォルダ \"%1\" を削除しますか？</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>本当に空のフォルダ \"%1\" とそのサブフォルダを削除しますか？サブフォルダが空でなかった場合、その内容も一緒に削除されます。"
-"<p>注意: 破棄されたメッセージはごみ箱に移動されるのではなく、完全に削除されます。</qt>"
+"<qt>本当に空のフォルダ \"%1\" とそのサブフォルダを削除しますか？サブフォルダ"
+"が空でなかった場合、その内容も一緒に削除されます。<p>注意: 破棄されたメッセー"
+"ジはごみ箱に移動されるのではなく、完全に削除されます。</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>本当にフォルダ \"%1\" とその内容を破棄しますか？"
-"<p>注意: 破棄されたメッセージはごみ箱に移動されるのではなく、完全に削除されます。</qt>"
+"<qt>本当にフォルダ \"%1\" とその内容を破棄しますか？<p>注意: 破棄されたメッ"
+"セージはごみ箱に移動されるのではなく、完全に削除されます。</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>本当にフォルダ \"%1\" およびサブフォルダとその内容を削除しますか？"
-"<p>注意: 破棄されたメッセージはごみ箱に移動されるのではなく、完全に削除されます。</qt>"
+"<qt>本当にフォルダ \"%1\" およびサブフォルダとその内容を削除しますか？<p>注"
+"意: 破棄されたメッセージはごみ箱に移動されるのではなく、完全に削除されます。"
+"</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "削除"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8380,13 +8600,13 @@ msgstr "本当にすべての古いメッセージを整理しますか？"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"HTML "
-"をメールに使用するとスパムの被害を受けやすくなるだけではなく、既知または今後予想されるその他のセキュリティ上の問題によって、あなたのシステムが危険にさらされる可"
-"能性が増します。"
+"HTML をメールに使用するとスパムの被害を受けやすくなるだけではなく、既知または"
+"今後予想されるその他のセキュリティ上の問題によって、あなたのシステムが危険に"
+"さらされる可能性が増します。"
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8399,12 +8619,12 @@ msgstr "HTML を使う"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"HTML "
-"メールで外部参照を許可すると、スパムの被害を受けやすくなるだけではなく、既知または今後予想されるその他のセキュリティ上の問題によって、あなたのシステムが危険にさ"
-"らされる可能性が増します。"
+"HTML メールで外部参照を許可すると、スパムの被害を受けやすくなるだけではなく、"
+"既知または今後予想されるその他のセキュリティ上の問題によって、あなたのシステ"
+"ムが危険にさらされる可能性が増します。"
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8420,11 +8640,12 @@ msgstr "メーリングリスト %1 でのフィルタ..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMail 不在返信機能はサーバ側のフィルタ機能に依存します。IMAP サーバがこのために設定されていません。\n"
+"KMail 不在返信機能はサーバ側のフィルタ機能に依存します。IMAP サーバがこのため"
+"に設定されていません。\n"
 "IMAP のアカウント設定の「フィルタ」タブで設定してください。"
 
 #: kmmainwidget.cpp:1743
@@ -8436,12 +8657,17 @@ msgstr "サーバ側のフィルタ機能が設定されていません"
 msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
-msgstr "証明書マネージャを起動できませんでした。正しくインストールされているか確認してください。"
+msgstr ""
+"証明書マネージャを起動できませんでした。正しくインストールされているか確認し"
+"てください。"
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
-msgstr "GnuPG LogViewer (kwatchgnupg) を起動できませんでした。正しくインストールされているか確認してください。"
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
+msgstr ""
+"GnuPG LogViewer (kwatchgnupg) を起動できませんでした。正しくインストールされ"
+"ているか確認してください。"
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -8769,8 +8995,7 @@ msgstr "添付ファイルを保存(&T)..."
 msgid "Appl&y All Filters"
 msgstr "すべてのフィルタを適用(&Y)"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "フィルタを適用(&P)"
@@ -8816,7 +9041,8 @@ msgstr "サイズ列(&S)"
 
 #: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
-msgstr "フォルダ内のメッセージの合計サイズを表示する列の表示/非表示を切り替えます。"
+msgstr ""
+"フォルダ内のメッセージの合計サイズを表示する列の表示/非表示を切り替えます。"
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -8882,7 +9108,6 @@ msgstr "次の未読メッセージ(&U)"
 msgid "Go to the next unread message"
 msgstr "次の未読メッセージへ移動"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "前のメッセージ(&P)"
@@ -8929,7 +9154,9 @@ msgstr "次の未読テキストに移動"
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
-msgstr "メッセージを下にスクロールしていって、メッセージの最後に到達すると、次のメッセージに移動します。"
+msgstr ""
+"メッセージを下にスクロールしていって、メッセージの最後に到達すると、次のメッ"
+"セージに移動します。"
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9017,30 +9244,32 @@ msgstr " 初期化中..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "このメッセージには開封通知要求が含まれています。\n"
-"無視することも、「拒否」を返信することも、あるいは通常の返信をすることもできます。"
+"無視することも、「拒否」を返信することも、あるいは通常の返信をすることもでき"
+"ます。"
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "このメッセージには開封通知要求が含まれています。\n"
-"「必要」とマークされた処理命令が含まれていますが、KMail にとって未知のものです。\n"
+"「必要」とマークされた処理命令が含まれていますが、KMail にとって未知のもので"
+"す。\n"
 "要求を無視することも、「失敗」を返信することもできます。"
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9051,8 +9280,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9063,15 +9292,16 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "このメッセージには開封通知要求が含まれています。\n"
-"ただし返信パスアドレスが、通知を送るべく指定されているアドレスと異なっています。\n"
+"ただし返信パスアドレスが、通知を送るべく指定されているアドレスと異なっていま"
+"す。\n"
 "無視することも、「拒否」を送信することも、普通に返信することもできます。"
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
@@ -9090,22 +9320,24 @@ msgstr "送信(&S)"
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
-msgstr "\"Disposition-Notification-Options\" ヘッダが含まれていますが、未知のパラメータです"
+msgstr ""
+"\"Disposition-Notification-Options\" ヘッダが含まれていますが、未知のパラメー"
+"タです"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "受取: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "添付ファイル: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "この添付ファイルは削除されました。"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "添付ファイル '%1' は削除されました。"
 
@@ -9153,42 +9385,37 @@ msgstr "メッセージパートのプロパティ"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ファイルの MIME タイプ</p>"
-"<p>ファイルタイプは自動的にチェックされるので、通常はこの設定を変更する必要はありません。しかし %1 "
-"がタイプを正しく検出できないことがあります。そのような場合、ここで修正できます。</p></qt>"
+"<qt><p>ファイルの MIME タイプ</p><p>ファイルタイプは自動的にチェックされるの"
+"で、通常はこの設定を変更する必要はありません。しかし %1 がタイプを正しく検出"
+"できないことがあります。そのような場合、ここで修正できます。</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>パートのサイズ</p>"
-"<p>正確なサイズを計算すると時間がかり過ぎる場合、%1 "
-"はここに推定サイズを表示することがあります。そのような場合、表示サイズに「(推定)」と付加することで、そのことを示します。</p></qt>"
+"<qt><p>パートのサイズ</p><p>正確なサイズを計算すると時間がかり過ぎる場合、%1 "
+"はここに推定サイズを表示することがあります。そのような場合、表示サイズに「(推"
+"定)」と付加することで、そのことを示します。</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>パートのファイル名</p>"
-"<p>ここには標準で添付ファイルのファイル名がセットされますが、添付するファイルをここで指定するわけではありません。これは、受信者のメールクライアントがパートを"
-"ディスクに保存する際に提示するファイル名として使われるものです。</p></qt>"
+"<qt><p>パートのファイル名</p><p>ここには標準で添付ファイルのファイル名がセッ"
+"トされますが、添付するファイルをここで指定するわけではありません。これは、受"
+"信者のメールクライアントがパートをディスクに保存する際に提示するファイル名と"
+"して使われるものです。</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9196,16 +9423,14 @@ msgstr "説明(&D):"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>パートの説明</p>"
-"<p>パートに関する説明です。本文メッセージに対する「件名」のようなものです。ほとんどのメールクライアントは、メッセージプレビューに添付ファイルのアイコンととも"
-"にこの情報を表示します。</p></qt>"
+"<qt><p>パートの説明</p><p>パートに関する説明です。本文メッセージに対する「件"
+"名」のようなものです。ほとんどのメールクライアントは、メッセージプレビューに"
+"添付ファイルのアイコンとともにこの情報を表示します。</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9213,21 +9438,20 @@ msgstr "エンコーディング(&E):"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>このパートの送信時のエンコーディング</p>"
-"<p>%1 は MIME "
-"タイプに応じて適切なエンコーディングを選択するので、通常、この設定を変更する必要はありません。しかし、この設定によりメッセージのサイズを大幅に削減できる場合があ"
-"ります。例えば、バイナリデータを持たず、テキストのみからなる PostScript ファイルの場合、標準の \"base64\" を選択するよりも "
-"\"quoted-printable\" を選択する方が、25% ほどメッセージのサイズを減らせます。</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>このパートの送信時のエンコーディング</p><p>%1 は MIME タイプに応じて適"
+"切なエンコーディングを選択するので、通常、この設定を変更する必要はありませ"
+"ん。しかし、この設定によりメッセージのサイズを大幅に削減できる場合がありま"
+"す。例えば、バイナリデータを持たず、テキストのみからなる PostScript ファイル"
+"の場合、標準の \"base64\" を選択するよりも \"quoted-printable\" を選択する方"
+"が、25% ほどメッセージのサイズを減らせます。</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9235,19 +9459,17 @@ msgstr "自動的に表示させる(&A)"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>受信者のメールクライアントに、このパートを標準のアイコンビューではなく、メッセージプレビュー中にインライン表示させるには、このオプションを有効にしてくださ"
-"い。</p>"
-"<p>技術的には、これはこのパートの <em>Content-Disposition</em> ヘッダフィールドに \"attachment\" ではなく\" "
-"inline\" と指定することで実現されます。</p></qt>"
+"<qt><p>受信者のメールクライアントに、このパートを標準のアイコンビューではな"
+"く、メッセージプレビュー中にインライン表示させるには、このオプションを有効に"
+"してください。</p><p>技術的には、これはこのパートの <em>Content-Disposition</"
+"em> ヘッダフィールドに \"attachment\" ではなく\" inline\" と指定することで実"
+"現されます。</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9255,14 +9477,13 @@ msgstr "このパートに署名(&S)"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>このパートに署名する場合は、このオプションを有効にしてください。</p>"
-"<p>現在選択されている個人情報に設定されている鍵を用いて署名します。</p></qt>"
+"<qt><p>このパートに署名する場合は、このオプションを有効にしてください。</"
+"p><p>現在選択されている個人情報に設定されている鍵を用いて署名します。</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9270,13 +9491,11 @@ msgstr "このパートを暗号化(&Y)"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>このパートを暗号化する場合は、このオプションを有効にしてください。</p>"
-"<p>このパートはこのメッセージの受信者に合った暗号化が施されます。</p></qt>"
+"<qt><p>このパートを暗号化する場合は、このオプションを有効にしてください。</"
+"p><p>このパートはこのメッセージの受信者に合った暗号化が施されます。</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9290,14 +9509,12 @@ msgstr "POP フィルタ"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"フィルタすべきメッセージが POP アカウントに見つかりました: <b>%1</b>"
-"<p>これらのメッセージのサイズは、このアカウントに設定された最大サイズを超えています。"
+"フィルタすべきメッセージが POP アカウントに見つかりました: <b>%1</b><p>これら"
+"のメッセージのサイズは、このアカウントに設定された最大サイズを超えています。"
 "<br>適切なボタンにチェックを入れて、このメッセージの処理を選択してください。"
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9310,7 +9527,9 @@ msgstr "メッセージのフィルタに使われたルールセット: なし"
 
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
-msgstr "ルールセットにマッチし、「ダウンロード」または「削除」としてタグ付けられたメッセージを表示"
+msgstr ""
+"ルールセットにマッチし、「ダウンロード」または「削除」としてタグ付けられた"
+"メッセージを表示"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -9421,7 +9640,9 @@ msgstr "アイコン(&A)"
 
 #: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
-msgstr "すべての添付ファイルをアイコンで表示します。参照するにはそれらをクリックします。"
+msgstr ""
+"すべての添付ファイルをアイコンで表示します。参照するにはそれらをクリックしま"
+"す。"
 
 #: kmreaderwin.cpp:551
 msgid ""
@@ -9463,7 +9684,9 @@ msgstr "隠す(&H)"
 #: kmreaderwin.cpp:575
 #, fuzzy
 msgid "Show Attachments only in the header of the mail"
-msgstr "すべての添付ファイルをアイコンで表示します。参照するにはそれらをクリックします。"
+msgstr ""
+"すべての添付ファイルをアイコンで表示します。参照するにはそれらをクリックしま"
+"す。"
 
 # #-#-#-#-#  kmail.po (kmail)  #-#-#-#-#
 # ACCELERATOR changed by translator
@@ -9552,40 +9775,39 @@ msgstr "K デスクトップ環境用のメールクライアント"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 "<h2 style='margin-top: 0px;'>フォルダの内容を取得中</h2>\n"
 "<p>お待ちください...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>オフライン</h2>"
-"<p>KMail は現在オフラインモードです。オンラインにするには、<a href=\"kmail:goOnline\">ここ</a> "
-"をクリックしてください。</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>オフライン</h2><p>KMail は現在オフラインモードで"
+"す。オンラインにするには、<a href=\"kmail:goOnline\">ここ</a> をクリックして"
+"ください。</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9593,14 +9815,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>KMail %1 へようこそ</h2>"
-"<p>Kmail は TDE デスクトップ環境のためのメールクライアントです。KMail は MIME, SMTP, POP3, IMAP "
-"といったインターネットメールの標準規格をすべてサポートしています。</p>\n"
-"<ul>"
-"<li>KMail は <a href=\"%2\">ハンドブック</a> に説明されているように、強力な機能を数多く備えています。</li>\n"
-"<li>KMail の最新バージョンについては <a href=\"%3\">KMail ホームページ</a> をご覧ください。</li></ul>\n"
+"<h2 style='margin-top: 0px;'>KMail %1 へようこそ</h2><p>Kmail は TDE デスク"
+"トップ環境のためのメールクライアントです。KMail は MIME, SMTP, POP3, IMAP と"
+"いったインターネットメールの標準規格をすべてサポートしています。</p>\n"
+"<ul><li>KMail は <a href=\"%2\">ハンドブック</a> に説明されているように、強力"
+"な機能を数多く備えています。</li>\n"
+"<li>KMail の最新バージョンについては <a href=\"%3\">KMail ホームページ</a> を"
+"ご覧ください。</li></ul>\n"
 "%8\n"
-"<p>このリリースの新機能 (TDE %5 の一部として配布された KMail %4 と比較して):</p>\n"
+"<p>このリリースの新機能 (TDE %5 の一部として配布された KMail %4 と比較して):"
+"</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9609,19 +9833,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail 開発チーム一同</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>「設定」-&gt;「KMail を設定」から KMail 設定パネルを開いて必要事項を入力してください。\n"
+"<p>「設定」-&gt;「KMail を設定」から KMail 設定パネルを開いて必要事項を入力し"
+"てください。\n"
 "少なくとも標準の個人情報と送信・受信メールアカウントの作成が必要です。</p>\n"
 
 #: kmreaderwin.cpp:1375
@@ -9661,9 +9884,12 @@ msgstr "添付ファイルを表示: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
-msgstr "[KMail: 添付ファイルにはバイナリデータが含まれています。最初の %n 文字を表示します。]"
+msgstr ""
+"[KMail: 添付ファイルにはバイナリデータが含まれています。最初の %n 文字を表示"
+"します。]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -9687,13 +9913,19 @@ msgstr "添付ファイルを開きますか？"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
-msgstr "添付ファイルを削除すると、このメッセージの電子署名が無効になる可能性があります。"
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
+msgstr ""
+"添付ファイルを削除すると、このメッセージの電子署名が無効になる可能性がありま"
+"す。"
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
-msgstr "添付ファイルを編集すると、このメッセージの電子署名が無効になる可能性があります。"
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
+msgstr ""
+"添付ファイルを編集すると、このメッセージの電子署名が無効になる可能性がありま"
+"す。"
 
 #: kmreaderwin.cpp:2956
 msgid "Attachments:"
@@ -9713,6 +9945,58 @@ msgstr "(以下のいずれかにマッチ)"
 msgid "(match all of the following)"
 msgstr "(以下のすべてにマッチ)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "既読"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "古い"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "削除"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "返信済み"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "転送済み"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "送信待ち"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "送信済み"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "監視中"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "無視"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "スパム"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "非スパム"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "To-Do"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "添付ファイルあり"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "完全なメッセージ"
@@ -9784,26 +10068,31 @@ msgstr "送信待ちフォルダにメッセージを追加できません"
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
-msgstr "致命的エラー: 送信済みメッセージを処理できません (領域不足？) メッセージを「送信済み」フォルダへ移動中"
+msgstr ""
+"致命的エラー: 送信済みメッセージを処理できません (領域不足？) メッセージを"
+"「送信済み」フォルダへ移動中"
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"送信済みメッセージ \"%1\" を「送信待ち」から「送信済み」へ移動できませんでした。\n"
-"考えられる原因は、ディスクに十分な空き領域がないか、書き込み権限がない場合です。問題を解消してから手動で移動してください。"
+"送信済みメッセージ \"%1\" を「送信待ち」から「送信済み」へ移動できませんでし"
+"た。\n"
+"考えられる原因は、ディスクに十分な空き領域がないか、書き込み権限がない場合で"
+"す。問題を解消してから手動で移動してください。"
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "送信者のアドレスを指定しないでメッセージを送信することはできません。\n"
-"設定ダイアログの個人情報で、個人情報 '%1' のメールアドレスを設定して、やり直してください。"
+"設定ダイアログの個人情報で、個人情報 '%1' のメールアドレスを設定して、やり直"
+"してください。"
 
 #: kmsender.cpp:454
 #, c-format
@@ -9826,9 +10115,10 @@ msgstr "送信プロセスを初期化します..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
-msgstr "すべての送信待ちメッセージを暗号化なしで送信しようとしています。続けますか？"
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
+msgstr ""
+"すべての送信待ちメッセージを暗号化なしで送信しようとしています。続けますか？"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -9852,14 +10142,16 @@ msgstr "送信待ちメッセージの送信に失敗しました。"
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "送信中止:\n"
 "%1\n"
-"このメッセージは、問題 (例えばアドレスの間違い) を解消するか、「送信待ち」フォルダから取り除くまで、「送信待ち」フォルダに残ります。\n"
+"このメッセージは、問題 (例えばアドレスの間違い) を解消するか、「送信待ち」"
+"フォルダから取り除くまで、「送信待ち」フォルダに残ります。\n"
 "\n"
 "以下の転送プロトコルを使用しました:\n"
 "  %2"
@@ -9870,19 +10162,16 @@ msgstr "送信を中止しました。"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>送信失敗:</p>"
-"<p>%1</p>"
-"<p>このメッセージは、問題 (例えばアドレスの間違い) を解消するか、「送信待ち」フォルダから取り除くまで、「送信待ち」フォルダに残ります。</p>"
-"<p>以下の転送プロトコルを使用しました:  %2</p>"
-"<p>残りのメッセージを送信しますか？</p>"
+"<p>送信失敗:</p><p>%1</p><p>このメッセージは、問題 (例えばアドレスの間違い) "
+"を解消するか、「送信待ち」フォルダから取り除くまで、「送信待ち」フォルダに残"
+"ります。</p><p>以下の転送プロトコルを使用しました:  %2</p><p>残りのメッセージ"
+"を送信しますか？</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -9900,14 +10189,16 @@ msgstr "送信中止(&A)"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "送信失敗:\n"
 "%1\n"
-"このメッセージは、問題 (例えばアドレスの間違い) を解消するか、「送信待ち」フォルダから取り除くまで、「送信待ち」フォルダに残ります。\n"
+"このメッセージは、問題 (例えばアドレスの間違い) を解消するか、「送信待ち」"
+"フォルダから取り除くまで、「送信待ち」フォルダに残ります。\n"
 "\n"
 "以下の転送プロトコルを使用しました:\n"
 "  %2"
@@ -9948,39 +10239,43 @@ msgstr "SMTP サーバを使うには、ユーザ名とパスワードが必要�
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 はこのマシンの他のディスプレイで起動中のようです。%2 を二つ以上起動すると、メールを失う可能性があります。起動していないと確信できない限り、%1 "
-"を起動すべきではありません。"
+"%1 はこのマシンの他のディスプレイで起動中のようです。%2 を二つ以上起動する"
+"と、メールを失う可能性があります。起動していないと確信できない限り、%1 を起動"
+"すべきではありません。"
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 はこのマシンの他のディスプレイで起動中のようです。%1 と %2 を同時に起動すると、メールを失う可能性があります。%1 "
-"が起動していないと確信できない限り、%2 を起動すべきではありません。"
+"%1 はこのマシンの他のディスプレイで起動中のようです。%1 と %2 を同時に起動す"
+"ると、メールを失う可能性があります。%1 が起動していないと確信できない限"
+"り、%2 を起動すべきではありません。"
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 は %2 で起動中のようです。%1 を二つ以上起動すると、メールを失う可能性があります。%2 で起動していないと確信できない限り、このコンピュータで "
-"%1 を起動すべきではありません。"
+"%1 は %2 で起動中のようです。%1 を二つ以上起動すると、メールを失う可能性があ"
+"ります。%2 で起動していないと確信できない限り、このコンピュータで %1 を起動す"
+"べきではありません。"
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 は %3 で起動中のようです。%1 と %2 を同時に起動すると、メールを失う可能性があります。%3 で %1 "
-"が起動していないと確信できない限り、このコンピュータで %2 を起動すべきではありません。"
+"%1 は %3 で起動中のようです。%1 と %2 を同時に起動すると、メールを失う可能性"
+"があります。%3 で %1 が起動していないと確信できない限り、このコンピュータで "
+"%2 を起動すべきではありません。"
 
 #: kmstartup.cpp:232
 #, c-format
@@ -9991,6 +10286,10 @@ msgstr "%1 を開始"
 msgid "Exit"
 msgstr "終了"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "新着メッセージ"
@@ -10015,14 +10314,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet が利用できません。パスワードの管理には TDEWallet を使うことを強くお勧めします。\n"
-"しかしながら、代わりに KMail "
-"の設定ファイルにパスワードを保存することもできます。パスワードは解読しにくいフォーマットで保存されますが、設定ファイルにアクセスされると解読されてしまう可能性が"
-"あることに注意してください。\n"
+"TDEWallet が利用できません。パスワードの管理には TDEWallet を使うことを強くお"
+"勧めします。\n"
+"しかしながら、代わりに KMail の設定ファイルにパスワードを保存することもできま"
+"す。パスワードは解読しにくいフォーマットで保存されますが、設定ファイルにアク"
+"セスされると解読されてしまう可能性があることに注意してください。\n"
 "アカウント \"%1\" のパスワードを設定ファイルに保存しますか？"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10091,7 +10392,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"メール送信前にローカルで実行するコマンドです。例えば SSH トンネルを設定するために使えます。コマンドを実行しない場合は空欄にしておいてください。"
+"メール送信前にローカルで実行するコマンドです。例えば SSH トンネルを設定するた"
+"めに使えます。コマンドを実行しない場合は空欄にしておいてください。"
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10099,11 +10401,12 @@ msgstr "サーバは認証が必要(&R)"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"お使いのサーバがメールを受け入れる前に認証を必要とする場合は、このオプションを有効にしてください。これは「認証付き SMTP」 あるいは単純に "
-"「ASMTP」として知られています。"
+"お使いのサーバがメールを受け入れる前に認証を必要とする場合は、このオプション"
+"を有効にしてください。これは「認証付き SMTP」 あるいは単純に 「ASMTP」として"
+"知られています。"
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10123,13 +10426,13 @@ msgstr "ユーザ定義のホスト名をサーバに送る(&D)"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"自分のホスト名としてメールサーバに送るホスト名を指定する場合、このオプションを有効にしてください。"
-"<p>これは、システムのホスト名が正しく設定されていなかったり、システムのホスト名を隠しておきたいときに役立ちます。"
+"自分のホスト名としてメールサーバに送るホスト名を指定する場合、このオプション"
+"を有効にしてください。<p>これは、システムのホスト名が正しく設定されていなかっ"
+"たり、システムのホスト名を隠しておきたいときに役立ちます。"
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10158,9 +10461,11 @@ msgstr "ローカルファイルのみが可能です。"
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
-msgstr "ホストは空欄にできません。SMTP サーバの名前または IP アドレスを入力してください。"
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
+msgstr ""
+"ホストは空欄にできません。SMTP サーバの名前または IP アドレスを入力してくださ"
+"い。"
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10172,13 +10477,15 @@ msgstr "フォルダ \"%1\" のリスティング (内容一覧表示) 中にエ
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"フォルダのローカル購読を停止すると、これらのフォルダに関するローカルにある情報がすべて削除されます。フォルダはサーバ上で変更されません。メールをチェックしてロー"
-"カルな変更がすべてサーバに反映されていることを確認する場合は、「キャンセル」を押してください。"
+"フォルダのローカル購読を停止すると、これらのフォルダに関するローカルにある情"
+"報がすべて削除されます。フォルダはサーバ上で変更されません。メールをチェック"
+"してローカルな変更がすべてサーバに反映されていることを確認する場合は、「キャ"
+"ンセル」を押してください。"
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10248,7 +10555,9 @@ msgstr "利用できません"
 msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
-msgstr "KMail はこのフォルダにメーリングリストを自動検出できませんでした。アドレスを入力してください。"
+msgstr ""
+"KMail はこのフォルダにメーリングリストを自動検出できませんでした。アドレスを"
+"入力してください。"
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10395,31 +10704,27 @@ msgstr "メッセージを編集(&E)"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>暗号化プラグインから返された構造情報を正しく処理できませんでした。プラグインが壊れている可能性があります。</p>"
-"<p>システム管理者に連絡してください。</p></qt>"
+"<qt><p>暗号化プラグインから返された構造情報を正しく処理できませんでした。プラ"
+"グインが壊れている可能性があります。</p><p>システム管理者に連絡してください。"
+"</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>アクティブな暗号化プラグインが見つかりません。また、組み込みの OpenPGP コードも実行できませんでした。</p>"
-"<p>この問題は以下のいずれかの方法で解決できます。</p>"
-"<ul>"
-"<li>「設定」->「KMail を設定」->「プラグイン」ダイアログでプラグインを有効にする。</li>"
-"<li>同じダイアログの「個人情報」->「詳細」で、従来の OpenPGP の設定を行う。</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>アクティブな暗号化プラグインが見つかりません。また、組み込みの OpenPGP "
+"コードも実行できませんでした。</p><p>この問題は以下のいずれかの方法で解決でき"
+"ます。</p><ul><li>「設定」->「KMail を設定」->「プラグイン」ダイアログでプラ"
+"グインを有効にする。</li><li>同じダイアログの「個人情報」->「詳細」で、従来"
+"の OpenPGP の設定を行う。</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10431,15 +10736,19 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
-msgstr "Chiasmus バックエンドは \"x-encrypt\" 関数を提供しません。このバグを報告してください。"
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
+msgstr ""
+"Chiasmus バックエンドは \"x-encrypt\" 関数を提供しません。このバグを報告して"
+"ください。"
 
 #: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
-msgstr "\"x-encrypt\" 関数は期待されるパラメータを受け付けません。このバグを報告してください。"
+msgstr ""
+"\"x-encrypt\" 関数は期待されるパラメータを受け付けません。このバグを報告して"
+"ください。"
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -10447,18 +10756,20 @@ msgstr "Chiasmus 暗号化エラー"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Chiasmus バックエンドからの予期しない返り値: \"x-encrypt\" 関数はバイト列を返しませんでした。このバグを報告してください。"
+"Chiasmus バックエンドからの予期しない返り値: \"x-encrypt\" 関数はバイト列を返"
+"しませんでした。このバグを報告してください。"
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"インライン OpenPGP 暗号化メッセージフォーマットは添付ファイルの暗号化または署名をサポートしません。\n"
+"インライン OpenPGP 暗号化メッセージフォーマットは添付ファイルの暗号化または署"
+"名をサポートしません。\n"
 "本当に時代遅れなインライン OpenPGP を使いますか？"
 
 #: messagecomposer.cpp:640
@@ -10479,7 +10790,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"この受信者については、メッセージごとに署名するかどうかを確認するように設定されています。\n"
+"この受信者については、メッセージごとに署名するかどうかを確認するように設定さ"
+"れています。\n"
 "このメッセージに署名しますか？"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -10508,7 +10820,9 @@ msgstr ""
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
-msgstr "このメッセージに署名するように要求しましたが、この個人情報には有効な署名鍵が設定されていません。"
+msgstr ""
+"このメッセージに署名するように要求しましたが、この個人情報には有効な署名鍵が"
+"設定されていません。"
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -10525,7 +10839,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "このメッセージの一部は署名されません。\n"
-"部分的にのみ署名されたメッセージを送信すると、サイトポリシーに違反する可能性があります。\n"
+"部分的にのみ署名されたメッセージを送信すると、サイトポリシーに違反する可能性"
+"があります。\n"
 "メッセージのすべての部分に署名しますか？"
 
 #: messagecomposer.cpp:827
@@ -10564,11 +10879,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"この受信者については、メッセージごとに暗号化するかどうかを確認するように設定されています。\n"
+"この受信者については、メッセージごとに暗号化するかどうかを確認するように設定"
+"されています。\n"
 "このメッセージを暗号化しますか？"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -10601,9 +10917,12 @@ msgstr "暗号化しない(&N)"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
-msgstr "このメッセージを暗号化し、コピーを自分自身に暗号化することを要求しましたが、この個人情報には有効な信頼された暗号化鍵が設定されていません。"
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
+msgstr ""
+"このメッセージを暗号化し、コピーを自分自身に暗号化することを要求しましたが、"
+"この個人情報には有効な信頼された暗号化鍵が設定されていません。"
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -10612,12 +10931,13 @@ msgstr "暗号化せずに送信しますか？"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "このメッセージの一部は暗号化されません。\n"
-"部分的にのみ暗号化されたメッセージを送信すると、サイトポリシーに違反したり、重要な情報が漏洩する可能性があります。\n"
+"部分的にのみ暗号化されたメッセージを送信すると、サイトポリシーに違反したり、"
+"重要な情報が漏洩する可能性があります。\n"
 "メッセージのすべての部分を暗号化しますか？"
 
 #: messagecomposer.cpp:950
@@ -10628,7 +10948,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "このメッセージは暗号化されていません。\n"
-"暗号化されていないメッセージを送信すると、サイトポリシーに違反したり、重要な情報が漏洩する可能性があります。\n"
+"暗号化されていないメッセージを送信すると、サイトポリシーに違反したり、重要な"
+"情報が漏洩する可能性があります。\n"
 "メッセージを暗号化しますか？"
 
 #: messagecomposer.cpp:955
@@ -10639,84 +10960,88 @@ msgstr "メッセージのすべての部分を暗号化(&E)"
 msgid "Unencrypted Message Warning"
 msgstr "暗号化されていないメッセージの警告"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>エラー: バックエンドがエンコードされたデータを返しませんでした。</p>"
-"<p>このバグを報告してください:"
-"<br>%2</p></qt>"
+"<qt><p>エラー: バックエンドがエンコードされたデータを返しませんでした。</"
+"p><p>このバグを報告してください:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
-msgstr "<qt>選択されたエンコーディングに含まれていない文字があります。<br><br>このままメッセージを送信しますか？</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
+msgstr ""
+"<qt>選択されたエンコーディングに含まれていない文字があります。<br><br>このま"
+"まメッセージを送信しますか？</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "一部の文字は失われます"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "文字を失う"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "エンコーディングを変更"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"選択されたバックエンドは署名をサポートしていないようなので、このメッセージに署名できませんでした。これは実際に起きてはならないことです。このバグを報告してくださ"
-"い。"
+"選択されたバックエンドは署名をサポートしていないようなので、このメッセージに"
+"署名できませんでした。これは実際に起きてはならないことです。このバグを報告し"
+"てください。"
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"選択されたバックエンドは署名をサポートしていないようなので、このメッセージに署名できませんでした。これは実際に起きてはならないことです。このバグを報告してくださ"
-"い。"
+"選択されたバックエンドは署名をサポートしていないようなので、このメッセージに"
+"署名できませんでした。これは実際に起きてはならないことです。このバグを報告し"
+"てください。"
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "署名操作の GnuPG 検査ログ"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
-msgstr "署名に失敗しました。gpg-agent プログラムが実行されていることを確認してください。"
+msgstr ""
+"署名に失敗しました。gpg-agent プログラムが実行されていることを確認してくださ"
+"い。"
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"選択されたバックエンドが暗号化をサポートしていないようなので、このメッセージを暗号化できませんでした。これは実際に起きてはならないことです。このバグを報告してく"
-"ださい。"
+"選択されたバックエンドが暗号化をサポートしていないようなので、このメッセージ"
+"を暗号化できませんでした。これは実際に起きてはならないことです。このバグを報"
+"告してください。"
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "暗号化操作の GnuPG 検査ログ"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"選択されたバックエンドが署名と暗号化の組合せをサポートしていないようなので、このメッセージを署名/暗号化できませんでした。これは実際に起きてはならないことです。"
-"このバグを報告してください。"
+"選択されたバックエンドが署名と暗号化の組合せをサポートしていないようなので、"
+"このメッセージを署名/暗号化できませんでした。これは実際に起きてはならないこと"
+"です。このバグを報告してください。"
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -10737,14 +11062,15 @@ msgstr "メールボックスの形式(&F):"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"このフォルダのメッセージを、メッセージ単位のファイル (maildir) として保存するか、一つの大きなファイル (mbox) "
-"として保存するかを選択します。KMail は標準で maildir "
-"を使用します。これは、ごくまれな状況を除いて、変更する必要はありません。よく分からなければ、このオプションはそのままにしておいてください。"
+"このフォルダのメッセージを、メッセージ単位のファイル (maildir) として保存する"
+"か、一つの大きなファイル (mbox) として保存するかを選択します。KMail は標準で "
+"maildir を使用します。これは、ごくまれな状況を除いて、変更する必要はありませ"
+"ん。よく分からなければ、このオプションはそのままにしておいてください。"
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -10753,11 +11079,12 @@ msgstr "フォルダの内容(&C):"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"新規フォルダをメールの保存に使用するか、タスクやメモなどのグループウェアのアイテムの保存に使うかを選択します。標準はメールです。よく分からなければ、このオプショ"
-"ンはそのままにしておいてください。"
+"新規フォルダをメールの保存に使用するか、タスクやメモなどのグループウェアのア"
+"イテムの保存に使うかを選択します。標準はメールです。よく分からなければ、この"
+"オプションはそのままにしておいてください。"
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -10777,7 +11104,8 @@ msgstr "名前が指定されていません"
 
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
-msgstr "<qt>フォルダ \"%1\" を作成できませんでした。フォルダは既に存在します。</qt>"
+msgstr ""
+"<qt>フォルダ \"%1\" を作成できませんでした。フォルダは既に存在します。</qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -10795,8 +11123,7 @@ msgstr "署名とは異なる検証結果"
 msgid "The crypto engine returned no cleartext data."
 msgstr "暗号化エンジンは平文のデータを返しませんでした。"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "状態: "
 
@@ -10825,9 +11152,11 @@ msgstr "%1 プラグインが見つかりません。"
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
-msgstr "このメッセージは署名されていますが、署名の有効性は検証できませんでした。<br />理由: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
+msgstr ""
+"このメッセージは署名されていますが、署名の有効性は検証できませんでした。<br /"
+">理由: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -10861,24 +11190,26 @@ msgstr "暗号化プラグイン \"%1\" はメッセージを復号できませ�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"注意: この HTML "
-"メッセージには画像などへの外部参照が含まれている可能性があります。セキュリティ/プライバシー上の理由で、外部への参照はロードしません。このメッセージの送信者を信"
-"頼する場合は、<a href=\"kmail:loadExternal\">ここをクリック</a>すると外部参照をロードできます。"
+"注意: この HTML メッセージには画像などへの外部参照が含まれている可能性があり"
+"ます。セキュリティ/プライバシー上の理由で、外部への参照はロードしません。この"
+"メッセージの送信者を信頼する場合は、<a href=\"kmail:loadExternal\">ここをク"
+"リック</a>すると外部参照をロードできます。"
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"注意: これは HTML メッセージです。セキュリティ上の理由で、生の HTML コードで表示しています。このメッセージの送信者を信頼する場合は、<a "
-"href=\"kmail:showHTML\">ここをクリック</a>すると HTML 形式で表示できます。"
+"注意: これは HTML メッセージです。セキュリティ上の理由で、生の HTML コードで"
+"表示しています。このメッセージの送信者を信頼する場合は、<a href=\"kmail:"
+"showHTML\">ここをクリック</a>すると HTML 形式で表示できます。"
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11119,9 +11450,11 @@ msgstr "保存された値: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
-msgstr "署名に使われた %1 の中にメールアドレスがありません。送信者のアドレス %2 との比較ができません。"
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
+msgstr ""
+"署名に使われた %1 の中にメールアドレスがありません。送信者のアドレス %2 との"
+"比較ができません。"
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11236,20 +11569,23 @@ msgstr "Kioslave エラーメッセージ"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"お使いの POP3 サーバ (アカウント: %1) は UIDL コマンドをサポートしていません。このコマンドは、サーバ上にあるメールのどれが KMail "
-"が既に読んだメールなのかを確実に判断するために必要です。\n"
+"お使いの POP3 サーバ (アカウント: %1) は UIDL コマンドをサポートしていませ"
+"ん。このコマンドは、サーバ上にあるメールのどれが KMail が既に読んだメールなの"
+"かを確実に判断するために必要です。\n"
 "したがって、メッセージをサーバに残しておく機能は正常には動作しません。"
 
 #: popaccount.cpp:752
 msgid ""
 "_n: Fetched 1 message from %1. Deleting messages from server...\n"
 "Fetched %n messages from %1. Deleting messages from server..."
-msgstr "%1 から %n 件のメッセージを取得しました。サーバからメッセージを削除します..."
+msgstr ""
+"%1 から %n 件のメッセージを取得しました。サーバからメッセージを削除します..."
 
 #: popaccount.cpp:762 popaccount.cpp:782
 msgid ""
@@ -11259,8 +11595,11 @@ msgstr "%1 から %n 件のメッセージを取得しました。転送を終�
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
-msgstr "%5@%6 から %2 中 %1 件メッセージ取得 (%4 KB 中 %3 KB) (%7 KB がサーバに残っています)。"
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
+msgstr ""
+"%5@%6 から %2 中 %1 件メッセージ取得 (%4 KB 中 %3 KB) (%7 KB がサーバに残って"
+"います)。"
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11276,1797 +11615,15 @@ msgstr "サーバから無効な応答"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"あなたのサーバは TOP コマンドをサポートしていません。したがって、サイズの大きいメールをダウンロードする前にヘッダのみを取得することはできません。"
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "移動(&G)"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "フォルダ(&O)"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "メッセージ(&M)"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "特別な返信"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "転送(&F)"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML ツールバー"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "署名"
-
-# ACCELERATOR changed by translator
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "自動的にメッセージに署名する(&U)"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"<qt>"
-"<p>このオプションを有効にすると、デフォルトですべての送信メッセージに署名します。もちろん、それぞれのメッセージについて個別に署名を無効にすることもできます。"
-"</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "暗号化"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr "メールを暗号化するときに常に自分自身の証明書でも暗号化する(&Y)"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"このオプションを有効にすると、メッセージ/ファイルを受信者の公開鍵で暗号化するだけでなく、あなたの鍵でも暗号化します。これによって、後でメッセージ/ファイルを復"
-"号できるようになります。これは一般的にお勧めできるオプションです。"
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "メッセージ作成後に署名/暗号化されたテキストを表示する(&I)"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"このオプションを有効にすると、署名/暗号化されたテキストが別のウィンドウに表示され、それがどのよう見えるかを送信前に確認できます。これは暗号システムが正常に機能"
-"するかどうかを検証する場合に役立ちます。"
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "暗号化された状態でメッセージを保存する(&P)"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "有効にすると、暗号化された状態でメッセージを保存します"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>暗号化された状態でメッセージを保存する</h1>\n"
-"このオプションを有効にすると、送信したメッセージを暗号化された状態 (送られたのと同じ状態) "
-"で保存します。暗号化に使用した証明書が期限切れになるとメッセージが読めなくなってしまうので、このオプションはお勧めできません。\n"
-"<p>\n"
-"しかしながら、ローカルルールがこれを有効にすることを要求している場合もあります。疑わしい場合はシステム管理者に相談してください。\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "常に暗号化鍵を表示して確認を求める(&F)"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"このオプションを有効にすると、暗号化に使う鍵を選択するための公開鍵のリストが常に表示されます。無効にすると、正しい鍵が見つからない、または使用可能な鍵が複数ある"
-"場合にのみダイアログが表示されます。"
-
-# ACCELERATOR changed by translator
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "可能なら自動的にメッセージを暗号化する(&I)"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"このオプションを有効にすると、可能かつ要求されていれば、常にメッセージを暗号化します。もちろん、それぞれのメッセージについて個別に暗号化を無効にすることもできま"
-"す。"
-
-# ACCELERATOR changed by translator
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "下書き保存中は署名/暗号化しない(&S)"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "これはどのように動作するの？"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "宛先: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "汎用"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "返信"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "全員に返信"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "転送"
-
-# ACCELERATOR changed by translator
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "ショートカット(&K):"
-
-# ACCELERATOR changed by translator
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "テンプレートの種類(&N):"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "フォルダのプロパティ"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "フォルダはメーリングリストを含む(&M)"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "リストのアドレス(&A):"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "標準(&O):"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "未読(&E):"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "古いメッセージの整理"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "次の日数が経過したら整理する(&X):"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "古い既読メッセージを整理する(&R)"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "次の日数が経過したら整理する(&F):"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "古い未読メッセージを整理する(&U)"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "日"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "週間"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "カ月"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "詳細"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "送信者の個人情報(&Y):"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "格納形式(&S):"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "リストの表示(&L):"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "CRL (証明書失効リスト) を用いて証明書を検証する"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr "このオプションを選択すると、証明書失効リスト (CRL) を使って S/MIME 証明書を検証します。"
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "証明書をオンラインで検証する (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"このオプションを選択すると、S/MIME 証明書をオンライン証明書ステータスプロトコル  (OCSP) を用いてオンラインで検証します。OCSP レスポンダの "
-"URL を下に入力してください。"
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "証明書のオンライン検証"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP レスポンダ URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"証明書のオンライン検証のためのサーバのアドレス (OCSP レスポンダ) をここに入力してください。URL は通常 http:// で始まります。"
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP レスポンダ署名:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "証明書のサービス URL を無視する"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "証明書のポリシーをチェックしない"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"GnuPG は標準で ~/.gnupg/policies.txt "
-"というファイルを使って証明書ポリシーが認められているかどうかをチェックします。このオプションを有効にすると、ポリシーをチェックしません。"
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "CRL (証明書失効リスト) をチェックしない"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr "このオプションを有効にすると、S/MIME 証明書の検証に CRL (証明書失効リスト) を使用しません。"
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "欠落した発行者証明書を取得する"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr "このオプションを有効にすると、必要に応じて欠落した発行者証明書を取得します。これは CRL と OCSP の両方の検証方法に適用されます。"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP 要求"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "HTTP 要求を実行しない"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "S/MIME に対して HTTP の使用を完全に無効にします。"
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP 要求に次のプロキシを使う: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "システムの HTTP プロキシを使う:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"このオプションを選択すると、右に表示されている HTTP プロキシの値 (環境変数 http_proxy からの値) をあらゆる HTTP "
-"要求に対して用います。"
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"S/MIME に関連するすべての HTTP 要求に対して用いる HTTP プロキシの場所を host:port の形式で入力します (例 "
-"myproxy.nowhere.com:3128)。"
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "証明書の HTTP CRL 配布点を無視する"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL の場所を探す場合、テストされるべき証明書には通常 DP (CRL Distribution Point) "
-"エントリと呼ばれるものが含まれています。これは URL にアクセスする方法を記述する複数の URL です。最初に見つかった DP "
-"エントリが用いられます。このオプションを有効にすると、適切な DP を探すときに HTTP 記法を用いるすべてのエントリを無視します。"
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP 要求"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "LDAP 要求を実行しない"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "S/MIME に対して LDAP の使用を完全に無効にします。"
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "証明書の LDAP CRL 配布点を無視する"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL の場所を探す場合、テストされるべき証明書には通常 DP (CRL Distribution Point) "
-"エントリと呼ばれるものが含まれています。これは URL へのアクセス方法を記述する複数の URL です。最初に見つかった DP "
-"エントリが用いられます。このオプションを有効にすると、適切な DP を探すときに LDAP 記法を用いるすべてのエントリを無視します。"
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP 要求に対するプライマリホスト:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"LDAP サーバをここに入力すると、すべての LDAP 要求が最初にそのサーバに行きます。より正確には、この設定は LDAP URL "
-"に指定されたホストとポートを無効にします。また、URL のホストとポートが省略された場合にも使われます。他の LDAP "
-"サーバは「プロキシ」への接続が失敗した場合にのみ用いられます。\n"
-"形式は \"HOST\" または \"HOST:PORT\" のいずれかです。PORT が省略された場合、標準的な LDAP ポートである 389 "
-"が使われます。"
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "定型表現を追加"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "追加(&A)"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "定型表現(&S):"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "グループ:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "定型表現の設定"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "ツールチップ"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "定型表現のテキストをツールチップに表示する(&T)"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "ブックマークされた行のテキストを含むツールチップを表示するかどうかを決定します"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "変数"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "変数の入力方法"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "定型表現に含まれる変数ごとに一つのダイアログ"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "定型表現に含まれる変数ごとに入力ダイアログを表示します"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "定型表現に含まれるすべての変数に対して一つのダイアログ"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr "定型表現に含まれるすべての変数の値を入力できるダイアログを表示します"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "区切り:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "送信者に返信"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "全員に返信 / リストに返信"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "メッセージを転送"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "未署名のメッセージの送信時に警告する(&U)"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "有効にすると、未署名のメッセージを送信しようとすると警告します"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>未署名のメッセージの送信時に警告</h1>\n"
-"このオプションを有効にすると、全部または一部が未署名のメッセージを送信しようとすると、警告します。\n"
-"<p>\n"
-"最大限の完全性のために、このオプションを有効にしておくことをお勧めします。\n"
-"</qt>"
-
-# ACCELERATOR changed by translator
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "暗号化されていないメッセージの送信時に警告する(&T)"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "有効にすると、暗号化されていないメッセージを送信しようとすると警告します"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>暗号化されていないメッセージの送信時に警告</h1>\n"
-"このオプションを有効にすると、一部または全く暗号化されていないメッセージを送信しようとすると警告します。\n"
-"<p>\n"
-"最大限の完全性のために、このオプションを有効にしておくことをお勧めします。\n"
-"</qt>"
-
-# ACCELERATOR changed by translator
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "受信者のメールアドレスが証明書になければ警告する(&S)"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "有効にすると、アドレスが証明書になければ警告します"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>受信者のメールアドレスが証明書になければ警告</h1>\n"
-"このオプションを有効にすると、暗号化に使用する証明書に受信者のメールアドレスがなければ警告します。\n"
-"<p>\n"
-"最大限の安全のために、このオプションを有効にしておくことをお勧めします。\n"
-"</qt>"
-
-# ACCELERATOR added by translator
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "証明書および鍵が間もなく失効する場合に警告する(&K) (しきい値は下で設定)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "署名用"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "暗号化用"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " 日"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "日数を選択"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>署名証明書が失効する前に警告</h1>\n"
-"署名証明書が失効する何日前から警告するかを選択します。\n"
-"<p>\n"
-"SPHINX 環境での推奨値は 14 日です。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>暗号化証明書が失効する前に警告</h1>\n"
-"暗号化証明書が失効する何日前から警告するかを選択します。\n"
-"<p>\n"
-"SPHINX 環境での推奨値は 14 日です。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>連鎖上の証明書が失効する前に警告</h1>\n"
-"証明書連鎖上のすべての証明書について、失効する何日前から警告するかを選択します。\n"
-"<p>\n"
-"SPHINX 環境での推奨値は 14 日です。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>CA 証明書が失効する前に警告</h1>\n"
-"CA 証明書が失効する何日前から警告するかを選択します。\n"
-"<p>\n"
-"SPHINX 環境での推奨値は 14 日です。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ルート証明書が失効する前に警告</h1>\n"
-"ルート証明書が失効する何日前から警告するかを選択します。\n"
-"<p>\n"
-"SPHINX 環境での推奨値は 14 日です。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "ルート証明書:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "中間 CA 証明書:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "エンドユーザ証明書/鍵:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "「今後は確認しない」を選択した警告をすべて再有効化する"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "テンプレートの内容"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "テンプレートのショートカット"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "テンプレートの種類"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "受信メールチェック時に送信待ちメッセージを送信"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>手動またはすべてのアカウントの受信メールチェック時に、送信待ちメッセージを自動的に送信するかどうかを選択します。</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr "同期されていないメールを自動的にアクセス権限のないフォルダから移動"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"フォルダにアクセス権限がないためにサーバにアップロードできていない新規メッセージは、遺失物フォルダ (lost+found) に移動されます。"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "読み取り専用のフォルダでローカルフラグを許可する"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr "管理者は、メール確認の最短間隔を指定することができます。 ユーザはこれより短い値を設定することはできません。"
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "フォルダ選択ダイアログで最後に選択されたフォルダ。"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr "一般ユーザの umask 設定を無視して「所有者のみが読み取り・書き込み可能」を使う"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "システムトレイの表示ポリシー"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr "メインウィンドウが閉じられたら、システムトレイのアイコンがアクティブであっても、アプリケーションを終了します。"
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "詳細な新着メール通知"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"このオプションを有効にすると、各フォルダの新着メッセージ数が新着メール通知に表示されます。無効にすると、「新着メールが届きました」というメッセージのみが表示され"
-"ます。"
-
-# ACCELERATOR changed by translator
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "エディタを指定(&N):"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "メール作成に外部エディタを使う(&X)"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr "フォルダがクォータ制限に近づいたことをユーザに通知するしきい値"
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "グループウェア機能を有効にする"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "招待への返事 で From/To ヘッダを無視する"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook の iCalendar 規格の実装には多数の欠点があります。このオプションはそれらの一つに対処します。Outlook "
-"ユーザがあなたの返答を受け取れないという問題がある場合、このオプションを試してみてください。"
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "メールの本体でグループウェアの招待を送信する"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook の iCalendar 規格の実装には多数の欠点があります。このオプションはそれらの一つに対処します。Outlook "
-"ユーザがあなたの招待を受け取れないという問題がある場合、このオプションを試してみてください。"
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Exchange 互換の招待状"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Exchange サーバと組み合わせて使用した場合、Microsoft Outlook "
-"は標準に準拠したグループウェアメールを理解できません。Microsoft Exchange "
-"が理解できる方法でグループウェアの招待状を送るには、このオプションを有効にしてください。"
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"このオプションを有効にすると、メール作成ウィンドウを表示せずに、すべての招待メールを自動的に送信します。送信前にメールを確認する場合は、このオプションを無効にし"
-"てください。ただし、メール作成ウィンドウのテキストは iCalendar 文法で書かれているので、手で修正しないでください。"
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "招待への返事を送信した後に招待メールを削除する"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr "このオプションを有効にすると、招待への返事が送信された後に、受信した招待メールがごみ箱フォルダに移動されます。"
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>このオプションを有効にすると、Kontact アプリケーション (KOrganizer, KAddressbook, KNotes) "
-"のエントリを保存できるようになります。</p>"
-"<p>このオプションを利用するためには、これらのアプリケーションが IMAP リソースを使うように設定されている必要があります。これは TDE "
-"コントロールセンターで行えます。</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr "<p>通常 IMAP リソースフォルダを見る必要はありませんが、必要であれば、ここで設定できます。</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>グループウェア情報を保存するためのアカウントを通常メールの管理に使わない場合、ここを設定してください。KMail "
-"はこの中のグループウェアフォルダだけを表示します。通常メールを他の IMAP アカウントで管理する場合便利な設定です。</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>グループウェアフォルダの保存形式を選択します。"
-"<ul>"
-"<li>標準は、iCal (カレンダーフォルダ用) と vCard (アドレス帳フォルダ用) 形式を使用します。この形式を使うと Kontact "
-"のすべての機能が利用可能になります。</li>"
-"<li>Kolab XML 形式は Outlook で使われているものにより近いカスタムモデルを使います。この形式は Kolab "
-"サーバまたは互換の方法を用いた場合、Outlook との互換性が高まります。</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>IMAP リソースフォルダの親を選択します。</p>"
-"<p>標準では、Kolab サーバは IMAP inbox を親にセットします。</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>IMAP リソースフォルダを持つアカウントの ID です。</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>IMAP ストレージのフォルダ名をローカル言語にする場合は、リストの利用可能な言語から選択することができます。</p>"
-"<p>注意: このオプションの唯一の目的は Microsoft Outlook "
-"との互換性です。このオプションを使用すると言語の変更が不可能になるので、お勧めしません。</p>"
-"<p>本当にそうする必要がない限り、使用しないでください。</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "グループウェアフォルダで受信した新規メールもフィルタする"
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr "オンラインになったときに DIMAP フォルダのグループウェアの変更を直ちに同期します。"
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "この値は「KMail はじめに」を表示するかどうかを決定します。"
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "ホストあたりの最大接続数"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr "これは新着メールのチェック中にホストごとの接続数を制限するために用います。標準設定は無制限 (0) です。"
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "クイック検索を表示"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"このオプションを有効にすると、メッセージ一覧の上に検索語を入力するフィールドが表示されます。メッセージ一覧の情報を素早く検索するために利用できます。"
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "使用されていなければローカルの受信箱を隠す"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "インライン転送をデフォルトにします。"
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "メッセージ作成でセミコロン (;) を区切りとして使用できるようにします。"
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "可能なら返信および転送時に元のメッセージの文字セットを使う"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "署名を自動的に挿入する(&U)"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr "この個人情報を記憶し、今後のメール作成ウィンドウでも使用します。"
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr "このフォルダを送信済みメッセージフォルダとして記憶し、今後のメール作成ウィンドウでも使用します。"
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "このメール送信手段を記憶し、今後のメール作成ウィンドウでも使用します。"
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr "この個人情報を記憶し、今後のメール作成ウィンドウでも使用します。"
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "次の文字数で行を折り返す(&W):"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "受信者のエディタ行の最大数"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr "このオプションを有効にすると、Outlook (tm) が英語以外の文字を含む添付ファイル名を理解できるようになります。"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "自動的に開封通知を要求する(&M)"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"<qt>"
-"<p>すべての送信メッセージで、自動的に開封通知要求を送る場合は、このオプションを有効してください。</p>"
-"<p>このオプションは標準の動作を変更するだけで、開封通知要求を送るかどうかは、それぞれのメッセージについて個別に選択できます。メール作成の「オプション」->"
-"「開封通知を要求」メニューを使用してください。</p></qt>"
-
-# ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "自動補完に最近のアドレスを用いる(&F)"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr "メール作成ウィンドウのアドレスフィールドの自動補完リストに最近用いたアドレスを出したくない場合は、このオプションを無効にしてください。"
-
-# ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "自動保存の間隔(&I):"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"メール作成ウィンドウ内のテキストのバックアップを定期的に作成することができます。バックアップ作成の間隔をここで設定します。間隔を 0 "
-"にセットすると、自動保存を無効にできます。"
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "引用したテキストの上に署名を挿入する"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "認識された接頭句を \"Re:\" で置き換える(&X)"
-
-# ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "認識された接頭句を \"&Fwd:\" で置き換える(&Z)"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "スマート引用を使う(&Q)"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "署名は失効しています。"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "アドレス選択ダイアログのタイプ"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"To, CC そして BCC 受信者を選択するためのダイアログの\n"
-"タイプを設定します。"
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "受信者エディタのタイプ"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"To, CC そして BCC を編集するための\n"
-"受信者エディタのタイプを設定します。"
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "受信者のエディタ行の最大数"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr "インラインで転送されるメールから取り除くメッセージパートの種類のリスト"
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "メールへの添付を許可するファイルの最大サイズを MB で指定します。"
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "メール作成ウィンドウに定型表現の管理と挿入を行うためのパネルを表示します。"
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr "暗号化が成功した場合も GnuPG 検査ログを表示します。"
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "可能なら返信および転送時に元のメッセージの文字セットを使う"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"一部のEメール、特に自動生成されたものには、メッセージを正しく表示するために必要な文字エンコーディングが指定されていません。そのような場合に、ここで設定した代替"
-"文字エンコーディングを使用します。お住いの国で最も一般的に使用されている文字エンコーディングを選択してください。標準では、システム全体に設定されたエンコーディン"
-"グを使用します。"
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"これを標準の「自動」から変更すると、それぞれのメッセージに指定されているエンコーディングに関係なく、すべてのメッセージにここで指定したエンコーディングを使用しま"
-"す。"
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr "メッセージテキストに現れる :-) のような顔文字を感情アイコン (小さな絵) で置換するには、これを有効にしてください。"
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr "引用テキストのレベル (深さ) を表示するには、このオプションを有効にしてください。無効にすると、引用テキストのレベルは表示されません。"
-
-# ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "自動的にたたむレベル(&T):"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "引用テキストのフォントサイズを小さくする"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "引用テキストをより小さなフォントを用いて表示するには、このオプションを有効にしてください。"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "暗号化された状態でメッセージを保存する(&P)"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-# ACCELERATOR added by translator
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "ファンシーヘッダにユーザエージェントを表示する(&X)"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"ヘッダの表示方法にファンシーヘッダを選択している場合もユーザエージェントと X-Mailer を表示させるには、このオプションを有効にしてください。"
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "既存のメールの添付ファイルの削除を許可する"
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "既存のメールの添付ファイルの編集を許可する"
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "メッセージを表示するときに常に復号するか、復号する前に尋ねるかどうか"
+"あなたのサーバは TOP コマンドをサポートしていません。したがって、サイズの大き"
+"いメールをダウンロードする前にヘッダのみを取得することはできません。"
 
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "空の送信者で開封通知を送る"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"送信者を空にして開封通知を送ります。そのようなメッセージを拒否するように設定されているサーバもあります。開封通知の送信で問題が発生するようであれば、このオプショ"
-"ンを無効にしてください。"
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "表現をテンプレートに変換しました"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "元の表現をテンプレートに変換しました"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "新規メッセージ用のメッセージテンプレート"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "返信用のメッセージテンプレート"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "全員に返信用のメッセージテンプレート"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "転送用のメッセージテンプレート"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "引用記号"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "ユーザに不在返信の設定変更を許可する"
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"ユーザに不在返信 Sieve スクリプトのアップロードを許可する。ただし返信を行うドメインやスパムに対して返信するかどうかなどの設定の変更は許可しない。"
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "このドメインからのメールに対してのみ不在返信を送信する"
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "スパムとしてマークされたメッセージに不在返信を送信することを許可する"
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr "KMail の起動時にアクティブな不在返信があるかどうかをチェックします。"
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 / %2 %3 使用済み"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13171,6 +11728,11 @@ msgstr "CC に追加"
 msgid "Add as BCC"
 msgstr "BCC に追加"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "キャンセル(&A)"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13186,11 +11748,13 @@ msgstr "選択した受信者"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
-msgstr "%n 人の受信者を選択しました。受信者は %1 人までしか指定できません。選択を調整してください。"
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
+msgstr ""
+"%n 人の受信者を選択しました。受信者は %1 人までしか指定できません。選択を調整"
+"してください。"
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13206,9 +11770,11 @@ msgstr "アドレス選択ダイアログを使う"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
-msgstr "このボタンを押すと別のダイアログが開き、そこで利用可能なすべてのアドレスから受信者を選択できます。"
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
+msgstr ""
+"このボタンを押すと別のダイアログが開き、そこで利用可能なすべてのアドレスから"
+"受信者を選択できます。"
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -13310,13 +11876,23 @@ msgstr "以上"
 msgid " bytes"
 msgstr " バイト"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " 日"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"要求された検索を行うためには、フォルダ \"%1\" "
-"のすべてのメッセージをサーバからダウンロードする必要があります。これには時間がかかります。検索を続けますか？"
+"要求された検索を行うためには、フォルダ \"%1\" のすべてのメッセージをサーバか"
+"らダウンロードする必要があります。これには時間がかかります。検索を続けます"
+"か？"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -13447,20 +12023,15 @@ msgstr "Sieve 診断"
 msgid ""
 "Collecting diagnostic information about Sieve support...\n"
 "\n"
-msgstr ""
-"Sieve サポートについての診断情報を収集中...\n"
+msgstr "Sieve サポートについての診断情報を収集中...\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"アカウント \"%1\" に関するデータを収集中...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "アカウント \"%1\" に関するデータを収集中...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -13479,10 +12050,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"スクリプト \"%1\" の内容:\n"
+msgid "Contents of script '%1':\n"
+msgstr "スクリプト \"%1\" の内容:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13505,20 +12074,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve 機能:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve 機能:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(利用可能な特別な機能はありません)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"利用可能な Sieve スクリプト:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "利用可能な Sieve スクリプト:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -13560,11 +12125,15 @@ msgstr "署名を挿入する(&E)"
 msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
-msgstr "この個人情報を用いて作成するメールに署名を挿入する場合は、このオプションを有効にしてください。"
+msgstr ""
+"この個人情報を用いて作成するメールに署名を挿入する場合は、このオプションを有"
+"効にしてください。"
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
-msgstr "入力方法に関するヘルプが必要であれば、下のウィジェットをクリックしてください。"
+msgstr ""
+"入力方法に関するヘルプが必要であれば、下のウィジェットをクリックしてくださ"
+"い。"
 
 #: signatureconfigurator.cpp:72
 msgid ""
@@ -13594,10 +12163,12 @@ msgstr "ここに任意の署名を入力してください。"
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"このボタンをクリックすると、署名を含むテキストファイルを選択することができます。新規メールの作成時や署名を追加するたびに、指定されたファイルを読み込みます。"
+"このボタンをクリックすると、署名を含むテキストファイルを選択することができま"
+"す。新規メールの作成時や署名を追加するたびに、指定されたファイルを読み込みま"
+"す。"
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -13613,20 +12184,26 @@ msgstr "指定されたファイルをテキストエディタで開きます。
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"ここに任意のコマンドを追加できます。コマンドが PATH "
-"にあるかどうかに応じて、完全パスまたはコマンドのみを指定します。すべての新規メールに対して、KMail はコマンドを実行し、(標準出力への) "
-"その出力を署名として利用します。このメカニズムで用いる通常のコマンドは \"fortune\" または \"ksig -random\" です。"
+"ここに任意のコマンドを追加できます。コマンドが PATH にあるかどうかに応じて、"
+"完全パスまたはコマンドのみを指定します。すべての新規メールに対して、KMail は"
+"コマンドを実行し、(標準出力への) その出力を署名として利用します。このメカニズ"
+"ムで用いる通常のコマンドは \"fortune\" または \"ksig -random\" です。"
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "コマンドを指定(&P):"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "パス"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "新規エントリ:"
@@ -13660,6 +12237,11 @@ msgstr "グループを追加"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "本当にこのグループとそのすべての定型表現を削除しますか？"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "次に適用(&T):"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "定型表現を編集"
@@ -13672,6 +12254,10 @@ msgstr "グループを編集"
 msgid "Edit &group..."
 msgstr "グループを編集(&G)..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "編集(&E)..."
@@ -13704,15 +12290,19 @@ msgstr "これらの変数に代入する値を入力:"
 msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
-msgstr "右に入力した値をこの変数のデフォルト値として保存する場合は、これを有効にします"
+msgstr ""
+"右に入力した値をこの変数のデフォルト値として保存する場合は、これを有効にしま"
+"す"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
-"このオプションを有効にすると、右に入力した値が保存されます。後で同じ変数を使うと、他の定型表現であっても、ここで入力した値がその変数のデフォルト値になります。"
+"このオプションを有効にすると、右に入力した値が保存されます。後で同じ変数を使"
+"うと、他の定型表現であっても、ここで入力した値がその変数のデフォルト値になり"
+"ます。"
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -13747,6 +12337,16 @@ msgstr "有効にしない"
 msgid "Cannot insert content from file %1: %2"
 msgstr "ファイル '%1' から内容を挿入できません: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "宛先: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13776,50 +12376,50 @@ msgstr "テンプレートからパイプコマンドを開始できません: %
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>新しいメッセージや返信を作成したりメッセージを転送するときに使用するメッセージテンプレートを作成します。</p>"
-"<p>メッセージテンプレートは置換コマンドをサポートしています。コマンドを直接入力するか、「コマンドを挿入」メニューからコマンドを選択してください。</p>"
-"<p>ここで指定したテンプレートはフォルダ固有です。全体のテンプレートと個人情報ごとのテンプレートより優先されます。</p></qt>"
+"<qt><p>新しいメッセージや返信を作成したりメッセージを転送するときに使用する"
+"メッセージテンプレートを作成します。</p><p>メッセージテンプレートは置換コマン"
+"ドをサポートしています。コマンドを直接入力するか、「コマンドを挿入」メニュー"
+"からコマンドを選択してください。</p><p>ここで指定したテンプレートはフォルダ固"
+"有です。全体のテンプレートと個人情報ごとのテンプレートより優先されます。</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>新しいメッセージや返信を作成したりメッセージを転送するときに使用するメッセージテンプレートを作成します。</p>"
-"<p>メッセージテンプレートは置換コマンドをサポートしています。コマンドを直接入力するか、「コマンドを挿入」メニューからコマンドを選択してください。</p>"
-"<p>ここで指定したテンプレートはすべての個人情報で使用可能です。全体のテンプレートよりは優先しますが、フォルダごとのテンプレートの方が優先されます。</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>新しいメッセージや返信を作成したりメッセージを転送するときに使用する"
+"メッセージテンプレートを作成します。</p><p>メッセージテンプレートは置換コマン"
+"ドをサポートしています。コマンドを直接入力するか、「コマンドを挿入」メニュー"
+"からコマンドを選択してください。</p><p>ここで指定したテンプレートはすべての個"
+"人情報で使用可能です。全体のテンプレートよりは優先しますが、フォルダごとのテ"
+"ンプレートの方が優先されます。</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>新しいメッセージや返信を作成したりメッセージを転送するときに使用するメッセージテンプレートを作成します。</p>"
-"<p>メッセージテンプレートは置換コマンドをサポートしています。コマンドを直接入力するか、「コマンドを挿入」メニューからコマンドを選択してください。</p>"
-"<p>これは全体の (デフォルトの) テンプレートです。個人情報およびフォルダごとのテンプレートの方が優先されます。</p></qt>"
+"<qt><p>新しいメッセージや返信を作成したりメッセージを転送するときに使用する"
+"メッセージテンプレートを作成します。</p><p>メッセージテンプレートは置換コマン"
+"ドをサポートしています。コマンドを直接入力するか、「コマンドを挿入」メニュー"
+"からコマンドを選択してください。</p><p>これは全体の (デフォルトの) テンプレー"
+"トです。個人情報およびフォルダごとのテンプレートの方が優先されます。</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14071,6 +12671,10 @@ msgstr "現在のメッセージ本文をパイプで渡し、結果をそのま
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "現在のメッセージ本文をパイプで渡し、結果で置き換え"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "カーソル位置をセット"
@@ -14103,100 +12707,6 @@ msgstr "デバッグを有効にする"
 msgid "Turn Debug Off"
 msgstr "デバッグを無効にする"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>左右矢印キーを使って前後のメッセージに移動することができます。</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>「ツール」->「フィルタを作成」を利用すると、送信者、受信者、件名およびメーリングリストでのフィルタを素早く作成することができます。</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>フィルタアクション「ヘッダを書き直し」を使って、メーリングリストの件名から&quot;[メーリングリスト名]&quot;という部分を簡単に取り除くことがで"
-"きます。"
-"<pre>ヘッダを書き直し &quot;件名&quot;\n"
-"    置換対象 &quot;\\s*\\[メーリングリスト名\\]\\s*&quot;\n"
-"    置換後 &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>「フォルダ」-&gt;「メーリングリストの管理」でメーリングリストをフォルダに関連付けけることができます。メーリングリストに関連付けられたフォルダで「メッ"
-"セージ」-&gt;「メーリングリストに投稿」を選択すると、メール作成ウィンドウにメーリングリストのアドレスがあらかじめセットされます。あるいは、フォルダ上でマウ"
-"スの中ボタンをクリックしても同じことができます。</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>各フォルダにお好みのアイコンを割り当てることができます。「フォルダ」->「プロパティ」をご覧ください。</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>KMail は現在表示されているメッセージのタイプ (プレーンテキスト/HTML/OpenPGPなど) を示すカラーバーを表示することができます。</p>"
-"\n"
-"<p>これによって、KMail の署名状態フレームを装った HTML を送信して署名検証をごまかそうとする攻撃を防ぐことができます。</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>検索ルールの最初のフィールドに名前を指定するだけで、任意のヘッダをフィルタすることができます。</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>HTML だけのメッセージは次のようなフィルタルールで排除することができます。"
-"<pre>&quot;Content-type&quot; 含む &quot;text/html&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>選択した部分だけを引用して返信することができます。</p>"
-"<p>何も選択されていない場合は、全文が引用されます。</p>"
-"<p>この機能は「表示」-&gt;「添付ファイル」-&gt;「インライン」が選択されているときは、添付ファイル中のテキストについても利用できます。</p>"
-"<p>この機能は「メッセージ」-&gt;「引用なしで返信」を選択した場合を除き、すべての返信で有効です。</p><p align=\"right\"><em>"
-"投稿者 David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "元に戻せるものがありません。"
@@ -14246,7 +12756,9 @@ msgstr "引用テキストをたたみます。"
 
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
-msgstr "証明書マネージャを起動できませんでした。正しくインストールされているか確認してください。"
+msgstr ""
+"証明書マネージャを起動できませんでした。正しくインストールされているか確認し"
+"てください。"
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -14261,6 +12773,15 @@ msgstr "添付ファイル #%1 (名前なし)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "この操作に対する GnuPG の検査ログを表示"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "'%1' という名前のファイルは既に存在します。本当に上書きしますか？"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "ファイルを上書きしますか？"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14305,7 +12826,8 @@ msgid ""
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
 "Default values will be used."
 msgstr ""
-"誰かが (おそらくあなたが) サーバの vacation スクリプトを変更してしまいました。\n"
+"誰かが (おそらくあなたが) サーバの vacation スクリプトを変更してしまいまし"
+"た。\n"
 "KMail は自動返信のパラメータを特定できなくなりました。\n"
 "デフォルトの値を使用します。"
 
@@ -14376,12 +12898,13 @@ msgstr "すべての送信メッセージに画像を添付する(&W)"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"この個人情報を用いて作成するメッセージに X-Face と呼ばれるヘッダを追加する場合は、このオプションを有効にしてください。X-Face "
-"は一部のメールクライアントで表示可能な小さな (48x48 ピクセル) 白黒画像です。"
+"この個人情報を用いて作成するメッセージに X-Face と呼ばれるヘッダを追加する場"
+"合は、このオプションを有効にしてください。X-Face は一部のメールクライアントで"
+"表示可能な小さな (48x48 ピクセル) 白黒画像です。"
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -14409,11 +12932,12 @@ msgstr "ファイルを選択..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"添付画像を作成するための画像ファイルを選択します。画像はコントラストが高く、ほぼ正方形である必要があります。背景を明るくすると、よい結果が得られます。"
+"添付画像を作成するための画像ファイルを選択します。画像はコントラストが高く、"
+"ほぼ正方形である必要があります。背景を明るくすると、よい結果が得られます。"
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14421,19 +12945,19 @@ msgstr "アドレス帳からセット"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr "アドレス帳エントリにセットされている画像の縮小版を利用できます。"
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail は小さな (48x48 ピクセル) "
-"低品質のモノクロ画像をすべてのメッセージに添付することができます。例えば、あなたの写真やグリフなど。サポートしていれば、受信者のメールクライアントにも表示されま"
-"す。"
+"<qt>KMail は小さな (48x48 ピクセル) 低品質のモノクロ画像をすべてのメッセージ"
+"に添付することができます。例えば、あなたの写真やグリフなど。サポートしていれ"
+"ば、受信者のメールクライアントにも表示されます。"
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14441,11 +12965,11 @@ msgstr "ここに任意の X-Face 文字を入力してください。"
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"サンプルは <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a> から取得できます。"
+"サンプルは <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all."
+"nl/~ace/X-Faces/</a> から取得できます。"
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14460,128 +12984,1765 @@ msgstr "画像なし"
 msgid "You do not have your own contact defined in the address book."
 msgstr "連絡先としてアドレス帳に定義されていません。"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>合計: %2<br>未読: %3<br>サイズ: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "署名"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>クォータ: %1"
+# ACCELERATOR changed by translator
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "自動的にメッセージに署名する(&U)"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "メッセージの件名を設定"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"<qt><p>このオプションを有効にすると、デフォルトですべての送信メッセージに署名"
+"します。もちろん、それぞれのメッセージについて個別に署名を無効にすることもで"
+"きます。</p></qt>"
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "CC: を 'アドレス' に送信"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "暗号化"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "BCC: を 'アドレス' に送信"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "メールを暗号化するときに常に自分自身の証明書でも暗号化する(&Y)"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "'ヘッダ' をメッセージに追加"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"このオプションを有効にすると、メッセージ/ファイルを受信者の公開鍵で暗号化する"
+"だけでなく、あなたの鍵でも暗号化します。これによって、後でメッセージ/ファイル"
+"を復号できるようになります。これは一般的にお勧めできるオプションです。"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "'ファイル' からメッセージ本文を読む"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "メッセージ作成後に署名/暗号化されたテキストを表示する(&I)"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "メッセージの本文を設定"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"このオプションを有効にすると、署名/暗号化されたテキストが別のウィンドウに表示"
+"され、それがどのよう見えるかを送信前に確認できます。これは暗号システムが正常"
+"に機能するかどうかを検証する場合に役立ちます。"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "メールに添付ファイルを追加、これは繰り返せます"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "暗号化された状態でメッセージを保存する(&P)"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "新しいメールのみチェック"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "有効にすると、暗号化された状態でメッセージを保存します"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "作成ウィンドウのみ開く"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>暗号化された状態でメッセージを保存する</h1>\n"
+"このオプションを有効にすると、送信したメッセージを暗号化された状態 (送られた"
+"のと同じ状態) で保存します。暗号化に使用した証明書が期限切れになるとメッセー"
+"ジが読めなくなってしまうので、このオプションはお勧めできません。\n"
+"<p>\n"
+"しかしながら、ローカルルールがこれを有効にすることを要求している場合もありま"
+"す。疑わしい場合はシステム管理者に相談してください。\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "与えられたメッセージファイルを表示"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "常に暗号化鍵を表示して確認を求める(&F)"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "'アドレス' へメッセージを送信。'URL' が指すファイルを添付。"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"このオプションを有効にすると、暗号化に使う鍵を選択するための公開鍵のリストが"
+"常に表示されます。無効にすると、正しい鍵が見つからない、または使用可能な鍵が"
+"複数ある場合にのみダイアログが表示されます。"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "既読"
+# ACCELERATOR changed by translator
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "可能なら自動的にメッセージを暗号化する(&I)"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "古い"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"このオプションを有効にすると、可能かつ要求されていれば、常にメッセージを暗号"
+"化します。もちろん、それぞれのメッセージについて個別に暗号化を無効にすること"
+"もできます。"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "削除"
+# ACCELERATOR changed by translator
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "下書き保存中は署名/暗号化しない(&S)"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "返信済み"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "これはどのように動作するの？"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "転送済み"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "汎用"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "送信待ち"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "返信"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "送信済み"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "全員に返信"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "監視中"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "転送"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "無視"
+# ACCELERATOR changed by translator
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "ショートカット(&K):"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "スパム"
+# ACCELERATOR changed by translator
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "テンプレートの種類(&N):"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "非スパム"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "テンプレートの内容"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "To-Do"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "テンプレートのショートカット"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "添付ファイルあり"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "テンプレートの種類"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 / %2 %3 使用済み"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "フォルダのプロパティ"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "パス"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "フォルダはメーリングリストを含む(&M)"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "リストのアドレス(&A):"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "標準(&O):"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "未読(&E):"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "古いメッセージの整理"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "次の日数が経過したら整理する(&X):"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "古い既読メッセージを整理する(&R)"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "次の日数が経過したら整理する(&F):"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "古い未読メッセージを整理する(&U)"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "日"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "週間"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "カ月"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "詳細"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "送信者の個人情報(&Y):"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "格納形式(&S):"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "リストの表示(&L):"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "受信メールチェック時に送信待ちメッセージを送信"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "'%1' という名前のファイルは既に存在します。本当に上書きしますか？"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>手動またはすべてのアカウントの受信メールチェック時に、送信待ちメッセー"
+"ジを自動的に送信するかどうかを選択します。</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "ファイルを上書きしますか？"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr "同期されていないメールを自動的にアクセス権限のないフォルダから移動"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"フォルダにアクセス権限がないためにサーバにアップロードできていない新規メッ"
+"セージは、遺失物フォルダ (lost+found) に移動されます。"
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "読み取り専用のフォルダでローカルフラグを許可する"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"管理者は、メール確認の最短間隔を指定することができます。 ユーザはこれより短い"
+"値を設定することはできません。"
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "フォルダ選択ダイアログで最後に選択されたフォルダ。"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"一般ユーザの umask 設定を無視して「所有者のみが読み取り・書き込み可能」を使う"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "システムトレイの表示ポリシー"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"メインウィンドウが閉じられたら、システムトレイのアイコンがアクティブであって"
+"も、アプリケーションを終了します。"
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "詳細な新着メール通知"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"このオプションを有効にすると、各フォルダの新着メッセージ数が新着メール通知に"
+"表示されます。無効にすると、「新着メールが届きました」というメッセージのみが"
+"表示されます。"
+
+# ACCELERATOR changed by translator
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "エディタを指定(&N):"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "メール作成に外部エディタを使う(&X)"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "フォルダがクォータ制限に近づいたことをユーザに通知するしきい値"
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "グループウェア機能を有効にする"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "招待への返事 で From/To ヘッダを無視する"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook の iCalendar 規格の実装には多数の欠点があります。このオプ"
+"ションはそれらの一つに対処します。Outlook ユーザがあなたの返答を受け取れない"
+"という問題がある場合、このオプションを試してみてください。"
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "メールの本体でグループウェアの招待を送信する"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook の iCalendar 規格の実装には多数の欠点があります。このオプ"
+"ションはそれらの一つに対処します。Outlook ユーザがあなたの招待を受け取れない"
+"という問題がある場合、このオプションを試してみてください。"
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Exchange 互換の招待状"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Exchange サーバと組み合わせて使用した場合、Microsoft Outlook は標準"
+"に準拠したグループウェアメールを理解できません。Microsoft Exchange が理解でき"
+"る方法でグループウェアの招待状を送るには、このオプションを有効にしてくださ"
+"い。"
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"このオプションを有効にすると、メール作成ウィンドウを表示せずに、すべての招待"
+"メールを自動的に送信します。送信前にメールを確認する場合は、このオプションを"
+"無効にしてください。ただし、メール作成ウィンドウのテキストは iCalendar 文法で"
+"書かれているので、手で修正しないでください。"
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "招待への返事を送信した後に招待メールを削除する"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"このオプションを有効にすると、招待への返事が送信された後に、受信した招待メー"
+"ルがごみ箱フォルダに移動されます。"
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>このオプションを有効にすると、Kontact アプリケーション (KOrganizer, "
+"KAddressbook, KNotes) のエントリを保存できるようになります。</p><p>このオプ"
+"ションを利用するためには、これらのアプリケーションが IMAP リソースを使うよう"
+"に設定されている必要があります。これは TDE コントロールセンターで行えます。</"
+"p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>通常 IMAP リソースフォルダを見る必要はありませんが、必要であれば、ここで設"
+"定できます。</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>グループウェア情報を保存するためのアカウントを通常メールの管理に使わない場"
+"合、ここを設定してください。KMail はこの中のグループウェアフォルダだけを表示"
+"します。通常メールを他の IMAP アカウントで管理する場合便利な設定です。</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>グループウェアフォルダの保存形式を選択します。<ul><li>標準は、iCal (カレン"
+"ダーフォルダ用) と vCard (アドレス帳フォルダ用) 形式を使用します。この形式を"
+"使うと Kontact のすべての機能が利用可能になります。</li><li>Kolab XML 形式は "
+"Outlook で使われているものにより近いカスタムモデルを使います。この形式は "
+"Kolab サーバまたは互換の方法を用いた場合、Outlook との互換性が高まります。</"
+"li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>IMAP リソースフォルダの親を選択します。</p><p>標準では、Kolab サーバは "
+"IMAP inbox を親にセットします。</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>IMAP リソースフォルダを持つアカウントの ID です。</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>IMAP ストレージのフォルダ名をローカル言語にする場合は、リストの利用可能な"
+"言語から選択することができます。</p><p>注意: このオプションの唯一の目的は "
+"Microsoft Outlook との互換性です。このオプションを使用すると言語の変更が不可"
+"能になるので、お勧めしません。</p><p>本当にそうする必要がない限り、使用しない"
+"でください。</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "グループウェアフォルダで受信した新規メールもフィルタする"
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"オンラインになったときに DIMAP フォルダのグループウェアの変更を直ちに同期しま"
+"す。"
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "この値は「KMail はじめに」を表示するかどうかを決定します。"
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "ホストあたりの最大接続数"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"これは新着メールのチェック中にホストごとの接続数を制限するために用います。標"
+"準設定は無制限 (0) です。"
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "クイック検索を表示"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"このオプションを有効にすると、メッセージ一覧の上に検索語を入力するフィールド"
+"が表示されます。メッセージ一覧の情報を素早く検索するために利用できます。"
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "使用されていなければローカルの受信箱を隠す"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "インライン転送をデフォルトにします。"
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "メッセージ作成でセミコロン (;) を区切りとして使用できるようにします。"
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "可能なら返信および転送時に元のメッセージの文字セットを使う"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "署名を自動的に挿入する(&U)"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "この個人情報を記憶し、今後のメール作成ウィンドウでも使用します。"
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"このフォルダを送信済みメッセージフォルダとして記憶し、今後のメール作成ウィン"
+"ドウでも使用します。"
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "このメール送信手段を記憶し、今後のメール作成ウィンドウでも使用します。"
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "この個人情報を記憶し、今後のメール作成ウィンドウでも使用します。"
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "次の文字数で行を折り返す(&W):"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "受信者のエディタ行の最大数"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"このオプションを有効にすると、Outlook (tm) が英語以外の文字を含む添付ファイル"
+"名を理解できるようになります。"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "自動的に開封通知を要求する(&M)"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>すべての送信メッセージで、自動的に開封通知要求を送る場合は、このオプ"
+"ションを有効してください。</p><p>このオプションは標準の動作を変更するだけで、"
+"開封通知要求を送るかどうかは、それぞれのメッセージについて個別に選択できま"
+"す。メール作成の「オプション」->「開封通知を要求」メニューを使用してくださ"
+"い。</p></qt>"
+
+# ACCELERATOR added by translator
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "自動補完に最近のアドレスを用いる(&F)"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"メール作成ウィンドウのアドレスフィールドの自動補完リストに最近用いたアドレス"
+"を出したくない場合は、このオプションを無効にしてください。"
+
+# ACCELERATOR added by translator
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "自動保存の間隔(&I):"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"メール作成ウィンドウ内のテキストのバックアップを定期的に作成することができま"
+"す。バックアップ作成の間隔をここで設定します。間隔を 0 にセットすると、自動保"
+"存を無効にできます。"
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "引用したテキストの上に署名を挿入する"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "認識された接頭句を \"Re:\" で置き換える(&X)"
+
+# ACCELERATOR added by translator
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "認識された接頭句を \"&Fwd:\" で置き換える(&Z)"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "スマート引用を使う(&Q)"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "署名は失効しています。"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "アドレス選択ダイアログのタイプ"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"To, CC そして BCC 受信者を選択するためのダイアログの\n"
+"タイプを設定します。"
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "受信者エディタのタイプ"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"To, CC そして BCC を編集するための\n"
+"受信者エディタのタイプを設定します。"
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "受信者のエディタ行の最大数"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr "インラインで転送されるメールから取り除くメッセージパートの種類のリスト"
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "メールへの添付を許可するファイルの最大サイズを MB で指定します。"
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+"メール作成ウィンドウに定型表現の管理と挿入を行うためのパネルを表示します。"
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr "暗号化が成功した場合も GnuPG 検査ログを表示します。"
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "可能なら返信および転送時に元のメッセージの文字セットを使う"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"一部のEメール、特に自動生成されたものには、メッセージを正しく表示するために必"
+"要な文字エンコーディングが指定されていません。そのような場合に、ここで設定し"
+"た代替文字エンコーディングを使用します。お住いの国で最も一般的に使用されてい"
+"る文字エンコーディングを選択してください。標準では、システム全体に設定された"
+"エンコーディングを使用します。"
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"これを標準の「自動」から変更すると、それぞれのメッセージに指定されているエン"
+"コーディングに関係なく、すべてのメッセージにここで指定したエンコーディングを"
+"使用します。"
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"メッセージテキストに現れる :-) のような顔文字を感情アイコン (小さな絵) で置換"
+"するには、これを有効にしてください。"
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"引用テキストのレベル (深さ) を表示するには、このオプションを有効にしてくださ"
+"い。無効にすると、引用テキストのレベルは表示されません。"
+
+# ACCELERATOR added by translator
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "自動的にたたむレベル(&T):"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "引用テキストのフォントサイズを小さくする"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"引用テキストをより小さなフォントを用いて表示するには、このオプションを有効に"
+"してください。"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "暗号化された状態でメッセージを保存する(&P)"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+# ACCELERATOR added by translator
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "ファンシーヘッダにユーザエージェントを表示する(&X)"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"ヘッダの表示方法にファンシーヘッダを選択している場合もユーザエージェントと X-"
+"Mailer を表示させるには、このオプションを有効にしてください。"
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "既存のメールの添付ファイルの削除を許可する"
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "既存のメールの添付ファイルの編集を許可する"
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "メッセージを表示するときに常に復号するか、復号する前に尋ねるかどうか"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "空の送信者で開封通知を送る"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"送信者を空にして開封通知を送ります。そのようなメッセージを拒否するように設定"
+"されているサーバもあります。開封通知の送信で問題が発生するようであれば、この"
+"オプションを無効にしてください。"
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "表現をテンプレートに変換しました"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "元の表現をテンプレートに変換しました"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "新規メッセージ用のメッセージテンプレート"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "返信用のメッセージテンプレート"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "全員に返信用のメッセージテンプレート"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "転送用のメッセージテンプレート"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "引用記号"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "ユーザに不在返信の設定変更を許可する"
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"ユーザに不在返信 Sieve スクリプトのアップロードを許可する。ただし返信を行うド"
+"メインやスパムに対して返信するかどうかなどの設定の変更は許可しない。"
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "このドメインからのメールに対してのみ不在返信を送信する"
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "スパムとしてマークされたメッセージに不在返信を送信することを許可する"
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr "KMail の起動時にアクティブな不在返信があるかどうかをチェックします。"
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "ファイルを編集(&F)"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "編集(&E)..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "移動(&G)"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "フォルダ(&O)"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "メッセージ(&M)"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "特別な返信"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "転送(&F)"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "ツールチップ"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "定型表現の設定"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML ツールバー"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "共通オプション"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML ツールバー"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "CRL (証明書失効リスト) を用いて証明書を検証する"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"このオプションを選択すると、証明書失効リスト (CRL) を使って S/MIME 証明書を検"
+"証します。"
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "証明書をオンラインで検証する (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"このオプションを選択すると、S/MIME 証明書をオンライン証明書ステータスプロトコ"
+"ル  (OCSP) を用いてオンラインで検証します。OCSP レスポンダの URL を下に入力し"
+"てください。"
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "証明書のオンライン検証"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP レスポンダ URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"証明書のオンライン検証のためのサーバのアドレス (OCSP レスポンダ) をここに入力"
+"してください。URL は通常 http:// で始まります。"
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP レスポンダ署名:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "証明書のサービス URL を無視する"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "証明書のポリシーをチェックしない"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"GnuPG は標準で ~/.gnupg/policies.txt というファイルを使って証明書ポリシーが認"
+"められているかどうかをチェックします。このオプションを有効にすると、ポリシー"
+"をチェックしません。"
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "CRL (証明書失効リスト) をチェックしない"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"このオプションを有効にすると、S/MIME 証明書の検証に CRL (証明書失効リスト) を"
+"使用しません。"
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "欠落した発行者証明書を取得する"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"このオプションを有効にすると、必要に応じて欠落した発行者証明書を取得します。"
+"これは CRL と OCSP の両方の検証方法に適用されます。"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP 要求"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "HTTP 要求を実行しない"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "S/MIME に対して HTTP の使用を完全に無効にします。"
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP 要求に次のプロキシを使う: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "システムの HTTP プロキシを使う:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"このオプションを選択すると、右に表示されている HTTP プロキシの値 (環境変数 "
+"http_proxy からの値) をあらゆる HTTP 要求に対して用います。"
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"S/MIME に関連するすべての HTTP 要求に対して用いる HTTP プロキシの場所を host:"
+"port の形式で入力します (例 myproxy.nowhere.com:3128)。"
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "証明書の HTTP CRL 配布点を無視する"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL の場所を探す場合、テストされるべき証明書には通常 DP (CRL Distribution "
+"Point) エントリと呼ばれるものが含まれています。これは URL にアクセスする方法"
+"を記述する複数の URL です。最初に見つかった DP エントリが用いられます。このオ"
+"プションを有効にすると、適切な DP を探すときに HTTP 記法を用いるすべてのエン"
+"トリを無視します。"
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP 要求"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "LDAP 要求を実行しない"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "S/MIME に対して LDAP の使用を完全に無効にします。"
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "証明書の LDAP CRL 配布点を無視する"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL の場所を探す場合、テストされるべき証明書には通常 DP (CRL Distribution "
+"Point) エントリと呼ばれるものが含まれています。これは URL へのアクセス方法を"
+"記述する複数の URL です。最初に見つかった DP エントリが用いられます。このオプ"
+"ションを有効にすると、適切な DP を探すときに LDAP 記法を用いるすべてのエント"
+"リを無視します。"
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP 要求に対するプライマリホスト:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"LDAP サーバをここに入力すると、すべての LDAP 要求が最初にそのサーバに行きま"
+"す。より正確には、この設定は LDAP URL に指定されたホストとポートを無効にしま"
+"す。また、URL のホストとポートが省略された場合にも使われます。他の LDAP サー"
+"バは「プロキシ」への接続が失敗した場合にのみ用いられます。\n"
+"形式は \"HOST\" または \"HOST:PORT\" のいずれかです。PORT が省略された場合、"
+"標準的な LDAP ポートである 389 が使われます。"
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "定型表現を追加"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "追加(&A)"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "定型表現(&S):"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "グループ:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "定型表現の設定"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "ツールチップ"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "定型表現のテキストをツールチップに表示する(&T)"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"ブックマークされた行のテキストを含むツールチップを表示するかどうかを決定しま"
+"す"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "変数"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "変数の入力方法"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "定型表現に含まれる変数ごとに一つのダイアログ"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "定型表現に含まれる変数ごとに入力ダイアログを表示します"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "定型表現に含まれるすべての変数に対して一つのダイアログ"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr "定型表現に含まれるすべての変数の値を入力できるダイアログを表示します"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "区切り:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "送信者に返信"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "全員に返信 / リストに返信"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "メッセージを転送"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "未署名のメッセージの送信時に警告する(&U)"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "有効にすると、未署名のメッセージを送信しようとすると警告します"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>未署名のメッセージの送信時に警告</h1>\n"
+"このオプションを有効にすると、全部または一部が未署名のメッセージを送信しよう"
+"とすると、警告します。\n"
+"<p>\n"
+"最大限の完全性のために、このオプションを有効にしておくことをお勧めします。\n"
+"</qt>"
+
+# ACCELERATOR changed by translator
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "暗号化されていないメッセージの送信時に警告する(&T)"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"有効にすると、暗号化されていないメッセージを送信しようとすると警告します"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>暗号化されていないメッセージの送信時に警告</h1>\n"
+"このオプションを有効にすると、一部または全く暗号化されていないメッセージを送"
+"信しようとすると警告します。\n"
+"<p>\n"
+"最大限の完全性のために、このオプションを有効にしておくことをお勧めします。\n"
+"</qt>"
+
+# ACCELERATOR changed by translator
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "受信者のメールアドレスが証明書になければ警告する(&S)"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "有効にすると、アドレスが証明書になければ警告します"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>受信者のメールアドレスが証明書になければ警告</h1>\n"
+"このオプションを有効にすると、暗号化に使用する証明書に受信者のメールアドレス"
+"がなければ警告します。\n"
+"<p>\n"
+"最大限の安全のために、このオプションを有効にしておくことをお勧めします。\n"
+"</qt>"
+
+# ACCELERATOR added by translator
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"証明書および鍵が間もなく失効する場合に警告する(&K) (しきい値は下で設定)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "署名用"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "暗号化用"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "日数を選択"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>署名証明書が失効する前に警告</h1>\n"
+"署名証明書が失効する何日前から警告するかを選択します。\n"
+"<p>\n"
+"SPHINX 環境での推奨値は 14 日です。\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>暗号化証明書が失効する前に警告</h1>\n"
+"暗号化証明書が失効する何日前から警告するかを選択します。\n"
+"<p>\n"
+"SPHINX 環境での推奨値は 14 日です。\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>連鎖上の証明書が失効する前に警告</h1>\n"
+"証明書連鎖上のすべての証明書について、失効する何日前から警告するかを選択しま"
+"す。\n"
+"<p>\n"
+"SPHINX 環境での推奨値は 14 日です。\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>CA 証明書が失効する前に警告</h1>\n"
+"CA 証明書が失効する何日前から警告するかを選択します。\n"
+"<p>\n"
+"SPHINX 環境での推奨値は 14 日です。\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ルート証明書が失効する前に警告</h1>\n"
+"ルート証明書が失効する何日前から警告するかを選択します。\n"
+"<p>\n"
+"SPHINX 環境での推奨値は 14 日です。\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "ルート証明書:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "中間 CA 証明書:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "エンドユーザ証明書/鍵:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "「今後は確認しない」を選択した警告をすべて再有効化する"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>左右矢印キーを使って前後のメッセージに移動することができます。</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>「ツール」->「フィルタを作成」を利用すると、送信者、受信者、件名およびメー"
+"リングリストでのフィルタを素早く作成することができます。</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>フィルタアクション「ヘッダを書き直し」を使って、メーリングリストの件名から"
+"&quot;[メーリングリスト名]&quot;という部分を簡単に取り除くことができます。"
+"<pre>ヘッダを書き直し &quot;件名&quot;\n"
+"    置換対象 &quot;\\s*\\[メーリングリスト名\\]\\s*&quot;\n"
+"    置換後 &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>「フォルダ」-&gt;「メーリングリストの管理」でメーリングリストをフォルダに"
+"関連付けけることができます。メーリングリストに関連付けられたフォルダで「メッ"
+"セージ」-&gt;「メーリングリストに投稿」を選択すると、メール作成ウィンドウに"
+"メーリングリストのアドレスがあらかじめセットされます。あるいは、フォルダ上で"
+"マウスの中ボタンをクリックしても同じことができます。</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>各フォルダにお好みのアイコンを割り当てることができます。「フォルダ」->「プ"
+"ロパティ」をご覧ください。</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>KMail は現在表示されているメッセージのタイプ (プレーンテキスト/HTML/"
+"OpenPGPなど) を示すカラーバーを表示することができます。</p>\n"
+"<p>これによって、KMail の署名状態フレームを装った HTML を送信して署名検証をご"
+"まかそうとする攻撃を防ぐことができます。</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>検索ルールの最初のフィールドに名前を指定するだけで、任意のヘッダをフィルタ"
+"することができます。</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>HTML だけのメッセージは次のようなフィルタルールで排除することができます。"
+"<pre>&quot;Content-type&quot; 含む &quot;text/html&quot;</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>選択した部分だけを引用して返信することができます。</p><p>何も選択されてい"
+"ない場合は、全文が引用されます。</p><p>この機能は「表示」-&gt;「添付ファイ"
+"ル」-&gt;「インライン」が選択されているときは、添付ファイル中のテキストについ"
+"ても利用できます。</p><p>この機能は「メッセージ」-&gt;「引用なしで返信」を選"
+"択した場合を除き、すべての返信で有効です。</p><p align=\"right\"><em>投稿者 "
+"David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "フォルダのクイック検索フィールドを表示する"
diff --git a/tde-i18n-kk/messages/tdepim/kmail.po b/tde-i18n-kk/messages/tdepim/kmail.po
index d6cd29fec31..169ce7a128b 100644
--- a/tde-i18n-kk/messages/tdepim/kmail.po
+++ b/tde-i18n-kk/messages/tdepim/kmail.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-04-27 10:35+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh\n"
@@ -16,13 +16,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Мәмбет Ізбасаров,Сайран Киккарин"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -169,6 +169,12 @@ msgstr "Ж&оқ (байқап қолданыңыз)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Ресурстарды жартылай автоматты түрде қолдану тіркелгісі"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Ескілерін тазалау"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -244,12 +250,12 @@ msgstr "&Пайдаланушы:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Бұл Интернет-провайдеріңіздің пошта сервер жүйесіне кіру үшін берілген <em>"
-"пайдаланушы атауы</em>. Әдетте бұл эл.пошта адресіңіздің (<em>@</em> "
+"Бұл Интернет-провайдеріңіздің пошта сервер жүйесіне кіру үшін берілген "
+"<em>пайдаланушы атауы</em>. Әдетте бұл эл.пошта адресіңіздің (<em>@</em> "
 "таңбасының алдындағы) бөлігі."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -271,18 +277,18 @@ msgstr "POP па&ролі жаттап алынсын"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Паролін жаттап алу үшін осы құсбелгіні қойыңыз.\n"
 "Егер TDEWallet қолдануда болса, пароль сонда сақталынады.\n"
 "Егер TDEWallet қолданудан тыс болса, пароль KMail баптау файлында сақталады. "
-"Пароль оқылмайтын пішімде сақталады, бірақ баптау файлына қатынай алынатындар "
-"пароліңіздің шифрін шеше алуы ықтимал."
+"Пароль оқылмайтын пішімде сақталады, бірақ баптау файлына қатынай "
+"алынатындар пароліңіздің шифрін шеше алуы ықтимал."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -310,8 +316,9 @@ msgstr "Келесіден артық хаттар &сүзгіден өткіз�
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Бұл параметрді таңдасаңыз, хаттарды сервердің өзінде сүзгілеуге болады. "
 "Сүзгілегенде хатты көшіріп алуға, жоюға немесе серверде қалдыруыңызға болады."
@@ -363,13 +370,15 @@ msgstr "Жай &мәтін"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -412,13 +421,13 @@ msgstr "Атаулы орныдар:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Мұнда IMAP серверіңіз қолдайтын атаулы орындары көрсетілген. Әрбір атаулы орыны "
-"- бір қапшық тобын ерекшелейтін префиксі. Атаулы орындары, мысалы, дербес және "
-"ортақ қапшықтарыңызды бір тіркелгіде көрсетуге мүмкіндік береді."
+"Мұнда IMAP серверіңіз қолдайтын атаулы орындары көрсетілген. Әрбір атаулы "
+"орыны - бір қапшық тобын ерекшелейтін префиксі. Атаулы орындары, мысалы, "
+"дербес және ортақ қапшықтарыңызды бір тіркелгіде көрсетуге мүмкіндік береді."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -476,9 +485,9 @@ msgstr "Тірке&мелер талап еткенде жүктелсін"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Эл.поштаның тіркемесін автоматты түрде жүктемеу үшін осыны таңдаңыз, сонда "
 "тіркемені әдейі түрткенде ғана ол жүктеледі. Бұл үлкен хаттармен айналысуды "
@@ -522,7 +531,7 @@ msgstr "<жоқ>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "кіріс"
 
@@ -530,8 +539,8 @@ msgstr "кіріс"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Сервер хаттарды қайталанбайтын түрде нөмірлемейтін сияқты, ал бұл алынған "
 "хаттарды серверде қалдыру үшін қажетті қасиет.\n"
@@ -542,8 +551,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Сервер хаттардың айдарларын қарауды қолдамайды, ал бұл қасиет севердегі "
 "хаттарды сүзгілеу үшін қажет.\n"
@@ -552,19 +561,20 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Байқаңыз, бұл кейбір (pipeline) тізбектеуді қолдамайтын POP3 серверлерді "
 "хаттарды бүлдіріп жіберетіндей етіп қылады;\n"
-"сонда да, кейбір серверлер бұл мүмкіндікті жарияламаса да, қолдайды. "
-"POP3-серверіңізді тексеру үшін, диалогтың жоғарындағы 'Сервердің мүмкіндіктерін "
+"сонда да, кейбір серверлер бұл мүмкіндікті жарияламаса да, қолдайды. POP3-"
+"серверіңізді тексеру үшін, диалогтың жоғарындағы 'Сервердің мүмкіндіктерін "
 "тексеру' деген батырманы қолданыңыз.\n"
 "Егер сервер тізбектеуді жарияламаса, жылдамдықты қажет етсеңіз, тізбектеуді "
 "қосып, өз-өзіңізге бірнеше хаттарды жіберіп, оларды қабылдап көріңіз."
@@ -575,30 +585,31 @@ msgstr "Алдымен \"Жалпы\" қойындысында серверді
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Сервер тізбектеуді қолдамайтын сияқты, сондықтан бұл параметр рұқсат "
 "етілмеген.\n"
-"Кейбір серверлер өзінің мүмкіндігін дұрыс жарияламайды, сондықтан бұған қарамай "
-"тізбектеуді қосып көруге болады. Байқаңыз, бұл кейбір (pipeline) тізбектеуді "
-"қолдамайтын POP3 серверлерді хаттарды бүлдіріп жіберетіндей етіп қылады. "
-"Сондықтан бұл мүмкіндікті қосып маңызды хат жіберудің алдында, өз-өзіңізге "
-"біраз хатттарды жіберіп, оларды POP-серверінен бірден қабылдап сынап көріңіз."
+"Кейбір серверлер өзінің мүмкіндігін дұрыс жарияламайды, сондықтан бұған "
+"қарамай тізбектеуді қосып көруге болады. Байқаңыз, бұл кейбір (pipeline) "
+"тізбектеуді қолдамайтын POP3 серверлерді хаттарды бүлдіріп жіберетіндей етіп "
+"қылады. Сондықтан бұл мүмкіндікті қосып маңызды хат жіберудің алдында, өз-"
+"өзіңізге біраз хатттарды жіберіп, оларды POP-серверінен бірден қабылдап "
+"сынап көріңіз."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Сервер хаттарға қайталанбайтын түрде нөмірлемейтін сияқты, ал бұл алынған "
 "хаттарды серверде қалдыру үшін қажетті қасиет, сондықтан бұл параметр рұқсат "
@@ -611,8 +622,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Сервер хаттардың айдарларын қарауды қолдамайды, ал бұл қасиет севердегі "
 "хаттарды сүзгілеу үшін қажет; сондықтан бұл параметр рұқсат етілмеген.\n"
@@ -691,8 +702,8 @@ msgstr "IMAP тіркелгісі"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Поштаны қабылдау үшін тіркелгіні баптаулардың желі бөлімінде қосу қажет."
 
@@ -730,13 +741,14 @@ msgstr "KMail-ге қош келдіңіз"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Сіз бірінші рет KMail бағдарламасын іске қосқан сияқтыңыз. Бұл шебер пошта "
-"тіркелгіңізді баптап бере алады. Ол үшін, келесі беттерде, эл.пошта "
-"провайдеріңізден алған пошта серверіне қосылатын параметрлерін келтіріңіз.</qt>"
+"<qt>Сіз бірінші рет KMail бағдарламасын іске қосқан сияқтыңыз. Бұл шебер "
+"пошта тіркелгіңізді баптап бере алады. Ол үшін, келесі беттерде, эл.пошта "
+"провайдеріңізден алған пошта серверіне қосылатын параметрлерін келтіріңіз.</"
+"qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -798,8 +810,7 @@ msgstr "Жергілікті жеткізуді қолдану"
 msgid "Server Information"
 msgstr "Сервер мәліметі"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Жоқ"
@@ -937,26 +948,25 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Мұнда KMail-дағы кейбір белгілі вирус-қарсы құралдарды қолданатын сүзгі "
-"ережелерін баптауға көмек беріледі.</p>"
-"<p>Шебер бұл құралдарды компьютеріңізде табады да, оларға вирустары бар "
-"хаттарды анықтайтын ережелерді құруға көмек береді. Шебер бар сүзгі ережелерін "
-"қолданбайды, ол тек жаңа ережелерін қосады.</p>"
-"<p><b>Ескерту:</b> Вирустарды іздеу кезінде KMail қатып қалғандай болуы мүмкін, "
-"себебі вирустарды іздеу әдетте көп уақыт алады. Егер мұндайы ұнамаса, жаңадан "
-"орнатылған сүзгі ережелерді өшіріп, бұрынғы баптауына қайтыңыз."
+"ережелерін баптауға көмек беріледі.</p><p>Шебер бұл құралдарды "
+"компьютеріңізде табады да, оларға вирустары бар хаттарды анықтайтын "
+"ережелерді құруға көмек береді. Шебер бар сүзгі ережелерін қолданбайды, ол "
+"тек жаңа ережелерін қосады.</p><p><b>Ескерту:</b> Вирустарды іздеу кезінде "
+"KMail қатып қалғандай болуы мүмкін, себебі вирустарды іздеу әдетте көп уақыт "
+"алады. Егер мұндайы ұнамаса, жаңадан орнатылған сүзгі ережелерді өшіріп, "
+"бұрынғы баптауына қайтыңыз."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -982,8 +992,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Спам хаттар үшін әдеттегі қапшық - өшірілгендер қапшығы, бірақ басқа қапшықты "
-"да таңдауға болады."
+"Спам хаттар үшін әдеттегі қапшық - өшірілгендер қапшығы, бірақ басқа "
+"қапшықты да таңдауға болады."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -991,15 +1001,13 @@ msgstr "Спам болуы &мүмкіндер келесіге жылжыты�
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Бұның әдеттегі қапшығы - кіріс қапшығы, бірақ басқа қапшықты да таңдауға "
-"болады."
-"<p>Спам болуы мүмкін деген санатты барлық құралдар қолдамайды. Егер таңдалған "
-"бағдарламаңыз мұндайды қолдамаса, бұл қапшықты да таңдай алмайсыз."
+"болады.<p>Спам болуы мүмкін деген санатты барлық құралдар қолдамайды. Егер "
+"таңдалған бағдарламаңыз мұндайды қолдамаса, бұл қапшықты да таңдай алмайсыз."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1009,8 +1017,8 @@ msgstr "Хаттарды вирус-қарсы құралдармен тексе
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Хаттар вирус-қарсы құралдармен тексеріледі. Керек сүзгілерді шебер жасайды. "
 "Әдетте бұл құралдар тексерілгендерді белгілейді де, сосын сүзгілер оларды "
@@ -1023,8 +1031,8 @@ msgstr "Вирусы бар хаттарды таңдалған қапшыққа
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Вирусы бар деп белгіленген хаттарды анықтайтын және бұл хаттарды арнайы "
 "қапшыққа жылжытатан сүзгі құрылады. Әдеттегі қапшық - өшірілгендер қапшығы, "
@@ -1036,8 +1044,8 @@ msgstr "Сонымен қатар, вирусы бар хаттар оқылға
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Вирус жұққан деп анықталған хаттарды оқылған деп белгілеп, арнайы қапшыққа "
 "жылжыту."
@@ -1232,8 +1240,8 @@ msgstr "Сервердегі %1 қапшығын оқығанда қате па�
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1253,8 +1261,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1285,20 +1293,20 @@ msgstr "Жойылған"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Хатты қабылдайтын іс-әлпеті анықталынбады. "
-"<br>Қайсына жіберілсін, таңдаңыз:"
+"<qt>Хатты қабылдайтын іс-әлпеті анықталынбады. <br>Қайсына жіберілсін, "
+"таңдаңыз:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Хатты қабылдауға жарайтын бірнеше іс-әлпеті бар. "
-"<br>Қайсына жіберілсін, таңдаңыз:"
+"<qt>Хатты қабылдауға жарайтын бірнеше іс-әлпеті бар. <br>Қайсына жіберілсін, "
+"таңдаңыз:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1327,18 +1335,21 @@ msgstr "\"%1\"қапшығын ықшамдау кезінде қате пайд
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Бұл параметрді әкімші түзеген. "
-"<p>Қате деп ойласаңыз - онымен қатынаңыз.</p></p></qt>"
+"<qt><p>Бұл параметрді әкімші түзеген. <p>Қате деп ойласаңыз - онымен "
+"қатынаңыз.</p></p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Профильді жүктеу..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Тіркелгіні баптау"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Қ&осу..."
@@ -1368,6 +1379,11 @@ msgstr "<qt><b>%1</b> деген іс-әлпетін өшіргіңіз келг
 msgid "Remove Identity"
 msgstr "Іс-әлпетін өшіру"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Ө&шіру"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Қосу..."
@@ -1376,6 +1392,11 @@ msgstr "Қосу..."
 msgid "Modify..."
 msgstr "Өзгерту..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Ө&шіру"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Әдетті қылу"
@@ -1392,17 +1413,15 @@ msgstr "&Жіберу"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Жіберетін тіркелгілер (кемінде біреуін жазу):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Атауы"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Түрі"
@@ -1424,8 +1443,7 @@ msgstr "Әдетті қылу"
 msgid "Common Options"
 msgstr "Жалпы параметрлері"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Жіберу &алдында құптау сұралсын"
@@ -1476,17 +1494,16 @@ msgstr "Әде&тті домен:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Әдетті домен тек пайдаланушының атауынан тұратын эл.пошта адресін толықтыру "
-"үшін қолданылады.</p></qt>"
+"<qt><p>Әдетті домен тек пайдаланушының атауынан тұратын эл.пошта адресін "
+"толықтыру үшін қолданылады.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1504,9 +1521,9 @@ msgstr "Жіберу әдісін қосу"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (әдетті)"
 
@@ -1585,6 +1602,10 @@ msgstr "Тіркелгіні өзгерту"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt><b>%1</b> тіркелгісі табылмады.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Түстері"
@@ -1693,8 +1714,7 @@ msgstr "Жолыққан сілтеме"
 msgid "Misspelled Words"
 msgstr "Емлесі күдікті сөздер"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Жаңа хат"
@@ -1883,8 +1903,8 @@ msgstr "Ілеспе хаттарды түйіп көрсету әдетті б�
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "&Жаңа, оқылмаған, маңыздысы бар не қарап жатқан ілеспе хаттар тобы жайылсын."
 
@@ -1894,70 +1914,54 @@ msgstr "Күнін көрсету пішімі"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<p><strong>Күнді көрсетуге қолданылатын өрнектері:</strong></p>"
-"<ul>"
-"<li>d - алдында нөлі жазылмаған айдын күн нөмірі (1-31) </li>"
-"<li>dd - алдында нөлі жазылған айдын күн нөмірі, (01-31)</li>"
-"<li>ddd - апта күнінің қысқартылған атауы (Дс - Жс)</li>"
-"<li>dddd - апта күнінің толық атауы (Дүйсенбі - Жексенбі)</li>"
-"<li>M - алдында нөлі жазылмаған ай нөмірі (1-12)</li>"
-"<li>MM - алдында нөлі жазылған ай нөмірі (01-12)</li>"
-"<li>MMM - айдың қысқартылған атауы (Қаң -Жел)</li>"
-"<li>MMMM - айдың толық атауы (Қаңтар - Желтоқсан)</li>"
-"<li>yy - жылдың екі таңбалы сан түрі (00-99)</li>"
-"<li>yyyy - жылдың төрт таңбалы сан түрі (0000-9999)</li></ul>"
-"<p><strong>Уақытты көрсетуге қолданылатын өрнектері:</string></p> "
-"<ul>"
-"<li>h - алдында нөлі жазылмаған сағат (0-23 немесе AM/PM көрсету пішімінде: "
-"1-12)</li>"
-"<li>hh - алдында нөлі жазылған сағат (0-23 немесе AM/PM көрсету пішімінде: "
-"1-12)</li>"
-"<li>m - алдында нөлі жазылмаған минут (0-59)</li>"
-"<li>mm - алдында нөлі жазылған минут (00-59)</li>"
-"<li>s - алдында нөлі жазылмаған секунд(0-59)</li>"
-"<li>ss - алдында нөлі жазылған секунд(00-59)</li>"
-"<li>z - алдында нөлі жазылмаған милисекунд (0-999)</li>"
-"<li>zzz - алдында нөлі жазылған милисекунд (000-999)</li>"
-"<li>AP -  12-сағаттық пішімге ауыстыру.AP деген \"AM\" немесе \"PM\" дегенімен "
-"ауыстырылады.</li>"
-"<li>ap - 12-сағаттық пішімге ауыстыру. ap деген \"am\" немесе \"pm\" дегенімен "
-"ауыстырылады.</li>"
-"<li>Z - санды пішімдегі  уақыт белдеуі (-0600)</li></ul>"
-"<p><strong>Басқа таңбалар елемей қалдырылады.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<p><strong>Күнді көрсетуге қолданылатын өрнектері:</strong></p><ul><li>d - "
+"алдында нөлі жазылмаған айдын күн нөмірі (1-31) </li><li>dd - алдында нөлі "
+"жазылған айдын күн нөмірі, (01-31)</li><li>ddd - апта күнінің қысқартылған "
+"атауы (Дс - Жс)</li><li>dddd - апта күнінің толық атауы (Дүйсенбі - "
+"Жексенбі)</li><li>M - алдында нөлі жазылмаған ай нөмірі (1-12)</li><li>MM - "
+"алдында нөлі жазылған ай нөмірі (01-12)</li><li>MMM - айдың қысқартылған "
+"атауы (Қаң -Жел)</li><li>MMMM - айдың толық атауы (Қаңтар - Желтоқсан)</"
+"li><li>yy - жылдың екі таңбалы сан түрі (00-99)</li><li>yyyy - жылдың төрт "
+"таңбалы сан түрі (0000-9999)</li></ul><p><strong>Уақытты көрсетуге "
+"қолданылатын өрнектері:</string></p> <ul><li>h - алдында нөлі жазылмаған "
+"сағат (0-23 немесе AM/PM көрсету пішімінде: 1-12)</li><li>hh - алдында нөлі "
+"жазылған сағат (0-23 немесе AM/PM көрсету пішімінде: 1-12)</li><li>m - "
+"алдында нөлі жазылмаған минут (0-59)</li><li>mm - алдында нөлі жазылған "
+"минут (00-59)</li><li>s - алдында нөлі жазылмаған секунд(0-59)</li><li>ss - "
+"алдында нөлі жазылған секунд(00-59)</li><li>z - алдында нөлі жазылмаған "
+"милисекунд (0-999)</li><li>zzz - алдында нөлі жазылған милисекунд (000-999)</"
+"li><li>AP -  12-сағаттық пішімге ауыстыру.AP деген \"AM\" немесе \"PM\" "
+"дегенімен ауыстырылады.</li><li>ap - 12-сағаттық пішімге ауыстыру. ap деген "
+"\"am\" немесе \"pm\" дегенімен ауыстырылады.</li><li>Z - санды пішімдегі  "
+"уақыт белдеуі (-0600)</li></ul><p><strong>Басқа таңбалар елемей қалдырылады."
+"</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Ілеспе хаттар жөніндегі жалпы баптауды өзгерту барлық қапшықтардың "
 "параметрлеріне әсерін тигізеді."
@@ -1974,8 +1978,7 @@ msgstr "HTML к&үй-жайы жолағы көрсетілсін"
 msgid "Show s&pam status in fancy headers"
 msgstr "&Айдарда спам белгісі көрсетілсін"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Көңіл белгілері графиктік белгілермен ауыстырылсын"
@@ -1984,8 +1987,7 @@ msgstr "Көңіл белгілері графиктік белгілермен
 msgid "Use smaller font for quoted text"
 msgstr "Дәйексөз кішірек қаріптермен келтірілсін"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Дәйексөз жайылып/бүктеліп көрсетілсін"
@@ -2011,8 +2013,7 @@ msgstr "Авто"
 msgid "&Override character encoding:"
 msgstr "&Мәжбүрлеп алмастыратын кодтамасы:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Жүйелік сөреде таңбашасы болсын"
@@ -2114,23 +2115,20 @@ msgstr "<b>%f</b> өңдейтін файл атауымен алмастыры�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Жауап бергенде келесі орынбасар айнымалылар қолданылады: "
-"<br><b>%D</b>: күні/уақыты, <b>%S</b>: тақырыбы, "
-"<br><b>%e</b>: жіберушінің адресі, <b>%F</b>: жіберушінің аты, <b>%f</b>"
-": жіберушінің аты-жөнінің бірінші әріптері,"
-"<br><b>%T</b>: алушының аты, <b>%t</b>: алушының аты және адресі,"
-"<br><b>%C</b>: көшірмесін алушылардың аты,<b>%c</b>: көшірмесін алушылардың аты "
-"және адресі,"
-"<br><b>%%</b>: пайыз таңбасы, <b>%_</b>: бос орын, <b>%L</b>"
-": жаңа жолдың басы </qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Жауап бергенде келесі орынбасар айнымалылар қолданылады: <br><b>%D</b>: "
+"күні/уақыты, <b>%S</b>: тақырыбы, <br><b>%e</b>: жіберушінің адресі, <b>%F</"
+"b>: жіберушінің аты, <b>%f</b>: жіберушінің аты-жөнінің бірінші әріптері,"
+"<br><b>%T</b>: алушының аты, <b>%t</b>: алушының аты және адресі,<br><b>%C</"
+"b>: көшірмесін алушылардың аты,<b>%c</b>: көшірмесін алушылардың аты және "
+"адресі,<br><b>%%</b>: пайыз таңбасы, <b>%_</b>: бос орын, <b>%L</b>: жаңа "
+"жолдың басы </qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2153,21 +2151,20 @@ msgstr "&Барлығына жауап беру:"
 msgid "&Forward:"
 msgstr "&Басқаға жіберу:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Дәйексөз көрсеткіші:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D хатында жазғаныңыз:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D хатында %F жазғаны:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Басқаға жіберілген хат"
 
@@ -2205,8 +2202,8 @@ msgstr "Басқаға жіберілетін жаңа префиксі:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Бұл кодтамалар тізімінің жоғардан төменге дейін әрбір шығыс хаттағы "
 "таңбаларының барлығы түгел екенін тексеріп шығарады."
@@ -2244,10 +2241,9 @@ msgstr "Мәні"
 msgid "Ne&w"
 msgstr "&Жаңа"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Атауы:"
@@ -2256,16 +2252,15 @@ msgstr "&Атауы:"
 msgid "&Value:"
 msgstr "&Мәні:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Тіркеме атауы Outlook-пен үйлесімді болсын"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Outlook(tm) түсінетіндей тіркеме атауларында латын әліппеге жатпайтын "
 "таңбаларын колдану үшін осы құсбелгісін қойыңыз"
@@ -2295,19 +2290,19 @@ msgstr "тіркеген"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"Сіз тіркеген файлдар атауы Outlook(tm) пен Outlook Express(tm) бағдарламаларға "
-"түсінікті болсын деп, латын әліппеге жатпайтын әріптермен стандарттан тыс жазу "
-"әдісін таңдадыңыз.\n"
-"Байқаңыз, хаттарыңызды стандартты ұстанатын эл.пошта клиенттері танымай қалуы "
-"мүмкін. Сондықтан бұны, басқа амал болмаса ғана қолданыңыз."
+"Сіз тіркеген файлдар атауы Outlook(tm) пен Outlook Express(tm) "
+"бағдарламаларға түсінікті болсын деп, латын әліппеге жатпайтын әріптермен "
+"стандарттан тыс жазу әдісін таңдадыңыз.\n"
+"Байқаңыз, хаттарыңызды стандартты ұстанатын эл.пошта клиенттері танымай "
+"қалуы мүмкін. Сондықтан бұны, басқа амал болмаса ғана қолданыңыз."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2331,107 +2326,92 @@ msgstr "&Крипто модульдер"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Эл.пошта хаттардың біразы екі пішімді болып келеді. Бұл параметр сондай "
-"хатты қай түрде, яғни HTML, әлде жай мәтін түрінде көрсетуді таңдау үшін. </p>"
-"<p>HTML көрінісі хатты әсемірек қылып көрсетеді, бірақ қауіпсіздік деңгейін сәл "
-"төмендетеді. </p>"
-"<p>Жай мәтін көрінісі хаттың пішімдеуін жоғалтады, дегенмен жүйелік "
-"HTML-көрсету (Konqueror) тетігін қолданған кезде қауіпсіздіктің бұзылуы <em>"
-"мүмкін емеске</em> жақын. </p>"
-"<p>Төмендегі параметр HTML пішімінің мәлім қауіптерінен қорғайды. Алайда, ол "
-"осы KMail нұсқасының шығуына дейін беймәлім болған қауіпсіздіктің бұзу "
-"әдістеріне қарсылық көрсете алмайды.</p>"
-"<p>Сондықтан жай мәтінді HTML-ден <em>артық</em> көргені ұсынылады.</p>"
-"<p><b>Ескерту:</b> Бұл таңдауды әрбір қапшық деңгейінде KMail негізгі "
-"терезесінің <i>Қапшық</i> мәзірінде жасай аласыз.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Эл.пошта хаттардың біразы екі пішімді болып келеді. Бұл параметр "
+"сондай хатты қай түрде, яғни HTML, әлде жай мәтін түрінде көрсетуді таңдау "
+"үшін. </p><p>HTML көрінісі хатты әсемірек қылып көрсетеді, бірақ қауіпсіздік "
+"деңгейін сәл төмендетеді. </p><p>Жай мәтін көрінісі хаттың пішімдеуін "
+"жоғалтады, дегенмен жүйелік HTML-көрсету (Konqueror) тетігін қолданған кезде "
+"қауіпсіздіктің бұзылуы <em>мүмкін емеске</em> жақын. </p><p>Төмендегі "
+"параметр HTML пішімінің мәлім қауіптерінен қорғайды. Алайда, ол осы KMail "
+"нұсқасының шығуына дейін беймәлім болған қауіпсіздіктің бұзу әдістеріне "
+"қарсылық көрсете алмайды.</p><p>Сондықтан жай мәтінді HTML-ден <em>артық</"
+"em> көргені ұсынылады.</p><p><b>Ескерту:</b> Бұл таңдауды әрбір қапшық "
+"деңгейінде KMail негізгі терезесінің <i>Қапшық</i> мәзірінде жасай аласыз.</"
+"p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Кейбір HTML пішіміндегі жарнамалық хаттарда сыртқы көздерге сілтемелер "
-"болады, мысалы кескіндерге, оны жүктегені Сіз олардың хатын оқығаныңыз туралы "
-"белгі береді (&quot;web bugs&quot;).</p>"
-"<p>Кескінді желіден жүктеудің салмақты себебі жоқ, өйткені, керек кескінді "
-"тікелей хатқа тіркеуге болады.</p>"
-"<p>Бұл параметр HTML мүмкіндіктерін асыра қолданудан қорғау үшін, әдетте <em>"
-"қосылмаған</em>.</p>"
-"<p>Сонда да, тіркемеген HTML кескіндерін көргіңіз келсе, осы параметрді "
-"қосыңыз, бірақ оның мүмкін салдары есіңізде болсын.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Кейбір HTML пішіміндегі жарнамалық хаттарда сыртқы көздерге "
+"сілтемелер болады, мысалы кескіндерге, оны жүктегені Сіз олардың хатын "
+"оқығаныңыз туралы белгі береді (&quot;web bugs&quot;).</p><p>Кескінді "
+"желіден жүктеудің салмақты себебі жоқ, өйткені, керек кескінді тікелей хатқа "
+"тіркеуге болады.</p><p>Бұл параметр HTML мүмкіндіктерін асыра қолданудан "
+"қорғау үшін, әдетте <em>қосылмаған</em>.</p><p>Сонда да, тіркемеген HTML "
+"кескіндерін көргіңіз келсе, осы параметрді қосыңыз, бірақ оның мүмкін "
+"салдары есіңізде болсын.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Хатпен не істеген туралы хабарлау (MDN) ережесі</h3>"
-"<p>MDN деген <b>оқылғанын растау</b> дегеннің кеңейтілген түрі. Автор "
-"хабарлауды сұрайды, алушының бағдарламасы хатпен не істелген туралы жауап "
-"жібереді, Хабарлауда келесі бір мәлімет болуы мүмкін: <b>қаралды</b> "
-"(яғни оқылды), <b>өшірілді</b> және <b>тапсырылды</b> (мысалы, басқаға).</p>"
-"<p>KMail келесі амалдарды жүзеге асырады:</p>"
-"<ul>"
-"<li><em>Елемеу</em>: ешқандай хабарлама жіберілмейді. Автоматты түрде ешбір MDN "
-"жіберілмейді (әдеттегі амал). </li>"
-"<li><em>Сұрау</em>:хабарламаны жіберуге рұқсат сұрау. Бұл жолымен Сізге "
-"керегінде ғана хабарламаны жіберіп, қалғандардан бас тартып не елемей қалдыруға "
-"болады</li>"
-"<li><em>Жетті</em>: әрқашанда <b>жеткен</b> туралы хабарлама жіберу. Хат авторы "
-"хат жеткенін білетін болады, бірақ онымен не істегенін - өшірілгенін, "
-"оқылғанын, т.б. білмейді.</li>"
-"<li><em>Әрқашанда жіберу</em>: Сұралған хабарламасын әрқашанда жіберу. Хат "
-"авторы хат жеткенін және онымен не істегенін білетін болады. Бір ерекше "
-"кәсіпкерлік қажеттілігі болмаса бұл таңдауды жасау жөнді амалға жатпайды.</li>"
-"</ul> </qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Хатпен не істеген туралы хабарлау (MDN) ережесі</h3><p>MDN деген "
+"<b>оқылғанын растау</b> дегеннің кеңейтілген түрі. Автор хабарлауды сұрайды, "
+"алушының бағдарламасы хатпен не істелген туралы жауап жібереді, Хабарлауда "
+"келесі бір мәлімет болуы мүмкін: <b>қаралды</b> (яғни оқылды), <b>өшірілді</"
+"b> және <b>тапсырылды</b> (мысалы, басқаға).</p><p>KMail келесі амалдарды "
+"жүзеге асырады:</p><ul><li><em>Елемеу</em>: ешқандай хабарлама жіберілмейді. "
+"Автоматты түрде ешбір MDN жіберілмейді (әдеттегі амал). </li><li><em>Сұрау</"
+"em>:хабарламаны жіберуге рұқсат сұрау. Бұл жолымен Сізге керегінде ғана "
+"хабарламаны жіберіп, қалғандардан бас тартып не елемей қалдыруға болады</"
+"li><li><em>Жетті</em>: әрқашанда <b>жеткен</b> туралы хабарлама жіберу. Хат "
+"авторы хат жеткенін білетін болады, бірақ онымен не істегенін - өшірілгенін, "
+"оқылғанын, т.б. білмейді.</li><li><em>Әрқашанда жіберу</em>: Сұралған "
+"хабарламасын әрқашанда жіберу. Хат авторы хат жеткенін және онымен не "
+"істегенін білетін болады. Бір ерекше кәсіпкерлік қажеттілігі болмаса бұл "
+"таңдауды жасау жөнді амалға жатпайды.</li></ul> </qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2447,14 +2427,14 @@ msgstr "&Интернеттен сыртқы сілтемелерді жүкте
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>ЕСКЕРТУ:</b> HTML эл.поштаны рұқсат ету жүйеңіздің қауіпсіздік деңгейін "
-"төмендетеді. <a href=\"whatsthis:%1\">HTML эл.пошта туралы...</a> "
-"<a href=\"whatsthis:%2\">Сыртқы сілтемелер туралы...</a>"
+"төмендетеді. <a href=\"whatsthis:%1\">HTML эл.пошта туралы...</a> <a href="
+"\"whatsthis:%2\">Сыртқы сілтемелер туралы...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2530,14 +2510,14 @@ msgstr "Кілттер мен куәліктер автоимпортталсы�
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"HTML жалпы баптауын өзгерту барлық қапшықтардың параметрлеріне әсерін тигізеді."
+"HTML жалпы баптауын өзгерту барлық қапшықтардың параметрлеріне әсерін "
+"тигізеді."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Бұл параметр dirmngr >= 0.9.0 орнатылғанын кажет етеді"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "прокси-сервері жоқ"
@@ -2566,8 +2546,8 @@ msgstr "Маңызды хаттар ескіргендерге жатқызыл&
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Оқылмаған хаттарды іздегенде:"
 
@@ -2591,8 +2571,8 @@ msgstr "Барлық қапшықтарды айналып шығу"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Қапшыққа кіргенде:"
 
@@ -2661,26 +2641,23 @@ msgstr "Каталогтар (\"maildir\" пішімі)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Мұнда жергілікті пошта қапшықтарының әдетті пішімін таңдауға болады:</p>"
-"<p><b>mbox:</b> KMail пошта қапшықтарының әрбіреуі жеке файлдарда сақталады. "
-"Жеке хаттар бір-бірінен \"From\" деп басталатын жолымен бөлінеді. Бұл дискідегі "
-"орынды үнемдейді, бірақ бұның , бәлкім, ыңғайлығы төмендеу болар, мысалы, хатты "
-"қапшықтан қапшыққа жылжытқан кезде.</p>"
-"<p><b>maildir:</b> Әрбір KMail қапшықтары дискіде жеке қапшықтарда сақталады. "
-"Әрбір хатқа да жеке файл бөлінеді. Бұл дискіде көбірек орынды алады, бірақ "
-"кейбірде ыңғайлырақ, мысалы, хатты қапшықтан қапшыққа жылжытқан кезде.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Мұнда жергілікті пошта қапшықтарының әдетті пішімін таңдауға болады:</"
+"p><p><b>mbox:</b> KMail пошта қапшықтарының әрбіреуі жеке файлдарда "
+"сақталады. Жеке хаттар бір-бірінен \"From\" деп басталатын жолымен бөлінеді. "
+"Бұл дискідегі орынды үнемдейді, бірақ бұның , бәлкім, ыңғайлығы төмендеу "
+"болар, мысалы, хатты қапшықтан қапшыққа жылжытқан кезде.</p><p><b>maildir:</"
+"b> Әрбір KMail қапшықтары дискіде жеке қапшықтарда сақталады. Әрбір хатқа да "
+"жеке файл бөлінеді. Бұл дискіде көбірек орынды алады, бірақ кейбірде "
+"ыңғайлырақ, мысалы, хатты қапшықтан қапшыққа жылжытқан кезде.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2713,51 +2690,42 @@ msgstr "Гб"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Келесі оқылмаған хатқа ауысқанда, назардағы хаттан төмен оқылмаған хат "
-"қалмауы мүмкін. Сонда</p>"
-"<p><b>Айналмау</b> дегенде соңғы хатта тоқтатады.</p>"
-"<p><b>Назардағы қапшықта айналып шығу</b> дегенде іздеу қапшықтың басынан "
-"бастап жалғастырылады.</p>"
-"<p><b>Барлық қапшықтарды айналып шығу</b> дегенде де іздеу қапшықтың басынан "
-"бастап жалғастырылады, ол біткенде іздеу келесі қапшықтарда жүргізіледі. </p> "
-"<p>Дәл солай алдыңғы оқылмаған хабарды іздеген кезде іздеу жоғарыдан төменге "
-"оралып жүргізіледі.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Келесі оқылмаған хатқа ауысқанда, назардағы хаттан төмен оқылмаған "
+"хат қалмауы мүмкін. Сонда</p><p><b>Айналмау</b> дегенде соңғы хатта "
+"тоқтатады.</p><p><b>Назардағы қапшықта айналып шығу</b> дегенде іздеу "
+"қапшықтың басынан бастап жалғастырылады.</p><p><b>Барлық қапшықтарды айналып "
+"шығу</b> дегенде де іздеу қапшықтың басынан бастап жалғастырылады, ол "
+"біткенде іздеу келесі қапшықтарда жүргізіледі. </p> <p>Дәл солай алдыңғы "
+"оқылмаған хабарды іздеген кезде іздеу жоғарыдан төменге оралып жүргізіледі.</"
+"p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Толық мәтіндік индекстеу хаттардың мазмұны бойынша іздеуді жылдамдатуға "
-"мүмкіндік береді. Сонымен қатар, бұл іздеу  панель құралы арқылы хаттарды "
-"мазмұны бойынша таңдауға мүмкіндік береді.</p>"
-"<p>Бұл мүмкіндік дискіде қосымша (шамамен хаттар алатын орнының жарымындай) "
-"орынды талап етеді.</p>"
-"<p>Параметр қосылғаннан кейін, индекс құруы басталады, бірақ бұл кезде KMail-ді "
-"әдеттегідей қолдана беруге болады.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Толық мәтіндік индекстеу хаттардың мазмұны бойынша іздеуді "
+"жылдамдатуға мүмкіндік береді. Сонымен қатар, бұл іздеу  панель құралы "
+"арқылы хаттарды мазмұны бойынша таңдауға мүмкіндік береді.</p><p>Бұл "
+"мүмкіндік дискіде қосымша (шамамен хаттар алатын орнының жарымындай) орынды "
+"талап етеді.</p><p>Параметр қосылғаннан кейін, индекс құруы басталады, бірақ "
+"бұл кезде KMail-ді әдеттегідей қолдана беруге болады.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2825,8 +2793,8 @@ msgstr "Бірлескен жұмыстың қапшықтары &жасырыл
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Құсбелгісі қойылса, қапшықтардың тізімінде IMAP ресурстар қапшықтары "
 "көрсетілмейді."
@@ -2837,8 +2805,8 @@ msgstr "Бұл тіркелгі үшін &тек бірлескен жұмыст
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Құсбелгісі қойылса, бірлескен жұмысқа бапталған тіркелгісі үшін қапшықтар "
 "тізімінде кәдімгі пошта қапшықтары көрсетілмейді."
@@ -2896,19 +2864,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Тіркеме атауы Outlook-пен үйлесімді болсын"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Шақыру автоматты түрде жіберілсін"
@@ -2923,23 +2890,22 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Әдетте шақыру пошта тіркемесі түрінде жіберіледі. Бұл параметр қосылса, "
-"Microsoft Outlook-пен шақыру-жауаптармен алмасу үшін, шақыру және оның жауабы "
-"тікелей хат мәтіні арқылы жіберіледі."
-"<br>Бірақ бұл кезде бұндай хатта жазылатын түсініктеме болмайды, сондықтан "
-"шақыру пішімін түсінбейтін пошта бағдарламасын қолданатындар бұл хаттың түріне "
-"таң қалуы мүмкін."
-"<br>Ал шақыру хаттарды түсінетін пошта бағдарламалардың иелері бұндай "
-"шақырулармен жұмыс істей береді.</qt>"
+"Microsoft Outlook-пен шақыру-жауаптармен алмасу үшін, шақыру және оның "
+"жауабы тікелей хат мәтіні арқылы жіберіледі.<br>Бірақ бұл кезде бұндай хатта "
+"жазылатын түсініктеме болмайды, сондықтан шақыру пішімін түсінбейтін пошта "
+"бағдарламасын қолданатындар бұл хаттың түріне таң қалуы мүмкін.<br>Ал шақыру "
+"хаттарды түсінетін пошта бағдарламалардың иелері бұндай шақырулармен жұмыс "
+"істей береді.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3043,17 +3009,16 @@ msgstr "Басқаға жіберу"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3071,15 +3036,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3149,8 +3114,8 @@ msgstr "Іс-әлпетін өңдеу"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3403,6 +3368,11 @@ msgstr "Қапшықты таңдау"
 msgid "Filters"
 msgstr "%1 сүзгісі"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Барлық мәтінді таңдау"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3434,11 +3404,11 @@ msgstr "&Сүзгі журналы жүргізілсін"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Мұнда сүзгі журналының жүргізуін қосып-ажырата аласыз. Әрине, оған деректер тек "
-"қосылған кезде жазылады. "
+"Мұнда сүзгі журналының жүргізуін қосып-ажырата аласыз. Әрине, оған деректер "
+"тек қосылған кезде жазылады. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3454,10 +3424,11 @@ msgstr "Сүзгілеу &ережесінің жұмысын жазу"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Хаттарды сүзгілеу ережелерін қолдану барысын бақылауыңызға болады. Бұл  "
 "параметр таңдалса, журналда әрбір сүзгінің әрбір ережесінің жұмыс нәтижесі "
@@ -3481,15 +3452,15 @@ msgstr "шектеусіз"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Журналды жүргізгенде, деректерді уақытша сақтау үшін біршама жады жұмсалады. "
-"Мұнда қолданылатын жадының жоғарғы шегін орнатуға болады. Егер журналдың өлшемі "
-"келтірілген шегіне жетсе, онда орынды босату үшін ескі деректер журналдан "
-"жойылады. "
+"Мұнда қолданылатын жадының жоғарғы шегін орнатуға болады. Егер журналдың "
+"өлшемі келтірілген шегіне жетсе, онда орынды босату үшін ескі деректер "
+"журналдан жойылады. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3499,7 +3470,7 @@ msgstr ""
 "%1 файл жазылмады:\n"
 "Қатенің сипаттамасы: \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail қатесі"
@@ -3540,13 +3511,13 @@ msgstr "&Пайдаланушының идентификаторы:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"IMAP-серверге кіру үшін пайдаланушының идентификаторы. Бұл тек пайдаланушының "
-"атауы немесе оның эл.пошта адресі болуы мүмкін - сервердің шақыру жазуы керегін "
-"анықтайды."
+"IMAP-серверге кіру үшін пайдаланушының идентификаторы. Бұл тек "
+"пайдаланушының атауы немесе оның эл.пошта адресі болуы мүмкін - сервердің "
+"шақыру жазуы керегін анықтайды."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3597,8 +3568,8 @@ msgstr "Өшірілгендер қапшығыңызға оқу/жазуға р
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "Мәлімет серверден алынбады, \"Поштаны тексеру\" мәзірін қолданыңыз."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3609,8 +3580,7 @@ msgstr "Қате: бұл қапшық үшін IMAP тіркелгісі аны�
 msgid "Connecting to server %1, please wait..."
 msgstr "%1 сервермен байланыс құрылуда, күте тұрыңыз..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "%1 сервермен байланыс қатесі"
@@ -3638,8 +3608,8 @@ msgstr "Рұқсаттарды қосу"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Өзіңіздің бұл қапшыққа қатынау рұқсатыңызды өшіргіңіз келгені шын ба? Бұдан "
 "кейін Сіз қапшыққа қатынай алмайсыз."
@@ -3673,7 +3643,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Қапшықты таңдау"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Жергілікті қапшықтар"
@@ -3698,9 +3668,9 @@ msgstr "Қапшыққа тіркесімді таңдау"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Басқанда назардағы қапшықты таңдайтын пернелер тіркесімін таңдаңыз. "
 "Төмендегі батырманы түртіп, осы қапшыққа арнағыңыз келген перне тіркесімін "
@@ -3724,12 +3694,22 @@ msgstr "Қ&айту"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Жойылған қапшық <b>%1</b> тіркелгісіне тиесілі келген поштаны қабылдайтын. "
-"Енді тіркелгіге келген хаттар әдетті \"Кіріс\" қапшығына бағытталады.</qt>"
+"<qt>Жойылған қапшық <b>%1</b> тіркелгісіне тиесілі келген поштаны "
+"қабылдайтын. Енді тіркелгіге келген хаттар әдетті \"Кіріс\" қапшығына "
+"бағытталады.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3855,39 +3835,13 @@ msgstr "Спам күй-жайы:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr "<qt><br>H<br>T<br>M<br>L<br> <br>ж<br>о<br>қ</qt>"
 
 #: identitydialog.cpp:93
@@ -3900,18 +3854,13 @@ msgstr "&Есіміңіз:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Есіміңіз</h3>"
-"<p>Бұл өрісте, жіберілетін хаттың айдарында көрсетілетін есіміңізді немесе "
-"бүркеншік атыңызды келтіруге болады.</p>"
-"<p>Егер өріс бос қалса, хат айдарында тек эл.пошта адресіңіз ғана "
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
+msgstr ""
+"<qt><h3>Есіміңіз</h3><p>Бұл өрісте, жіберілетін хаттың айдарында "
+"көрсетілетін есіміңізді немесе бүркеншік атыңызды келтіруге болады.</"
+"p><p>Егер өріс бос қалса, хат айдарында тек эл.пошта адресіңіз ғана "
 "көрсетіледі.</p></qt>"
 
 #: identitydialog.cpp:135
@@ -3920,17 +3869,13 @@ msgstr "&Ұйымыңыз:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Ұйымыңыз</h3>"
-"<p>Бұл өрісте, жіберілетін хаттың айдарында көрсетілетін Сіз істейтін "
-"ұйымыңызды келтіруге болады.</p>"
-"<p>Бұны бос қалдыру да ерсі емес.</p></qt>"
+"<qt><h3>Ұйымыңыз</h3><p>Бұл өрісте, жіберілетін хаттың айдарында "
+"көрсетілетін Сіз істейтін ұйымыңызды келтіруге болады.</p><p>Бұны бос "
+"қалдыру да ерсі емес.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3939,20 +3884,15 @@ msgstr "&Эл.пошта адресіңіз:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Эл.пошта адресіңіз</h3>"
-"<p>Бұнда толық эл.пошта адресіңізді келтіру керек.</p>"
-"<p>Егер бұны бос қалдырсаңыз не қате толтырсаңыз, хатыңызға жауап беруге мүмкін "
-"болмайды.</p></qt>"
+"<qt><h3>Эл.пошта адресіңіз</h3><p>Бұнда толық эл.пошта адресіңізді келтіру "
+"керек.</p><p>Егер бұны бос қалдырсаңыз не қате толтырсаңыз, хатыңызға жауап "
+"беруге мүмкін болмайды.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -3961,21 +3901,12 @@ msgstr "&Эл.пошта адресіңіз:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3999,19 +3930,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Мұнда таңдаған OpenPGP кілті хаттарды цифрлық қолтаңбалауға пайдаланады. "
-"Сонымен қатар GnuPG кілттерін де пайдалануға болады.</p>"
-"<p>Егер бұл өрісті бос қалдырсаңыз, онда KMail тек OpenPGP қолданып хатты "
-"цифрлық қолтаңбалай алмайды, ал кәдімгі пошта айналымына бұның әсері жоқ.</p>"
-"<p>Кілттер туралы толығырақ мынадан оқыңыз: <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>Мұнда таңдаған OpenPGP кілті хаттарды цифрлық қолтаңбалауға "
+"пайдаланады. Сонымен қатар GnuPG кілттерін де пайдалануға болады.</p><p>Егер "
+"бұл өрісті бос қалдырсаңыз, онда KMail тек OpenPGP қолданып хатты цифрлық "
+"қолтаңбалай алмайды, ал кәдімгі пошта айналымына бұның әсері жоқ.</"
+"p><p>Кілттер туралы толығырақ мынадан оқыңыз: <a>http://www.gnupg.org</a></"
+"p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4023,30 +3953,27 @@ msgstr "OpenPGP шифрлау кілтіңіз"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Өзіңізге шифрлау үшін және құрастырғыштағы \"Менің ашық кілтімді тіркеу\" "
 "командасы үшін қолданылатын OpenPGP кілтін таңдаңыз."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Мұнда таңдаған OpenPGP кілті хаттарыңызды өзіңізге шифрлау үшін және "
-"құрастырғыштағы \"Менің ашық кілтімді тіркеу\" командасы үшін қолданылады.</p>"
-"<p>Егер бұл өрісті бос қалдырсаңыз, онда KMail тек OpenPGP қолданып, жіберетін "
-"хаттың көшірмесін өзіңізге шифрлай алмайды, ал кәдімгі пошта айналымына бұның "
-"әсері жоқ.</p>"
-"<p>Кілттер туралы толығырақ мынадан оқыңыз: <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Мұнда таңдаған OpenPGP кілті хаттарыңызды өзіңізге шифрлау үшін және "
+"құрастырғыштағы \"Менің ашық кілтімді тіркеу\" командасы үшін қолданылады.</"
+"p><p>Егер бұл өрісті бос қалдырсаңыз, онда KMail тек OpenPGP қолданып, "
+"жіберетін хаттың көшірмесін өзіңізге шифрлай алмайды, ал кәдімгі пошта "
+"айналымына бұның әсері жоқ.</p><p>Кілттер туралы толығырақ мынадан оқыңыз: "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4065,18 +3992,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Мұнда таңдаған S/MIME (X.509) куәлік хаттарыңызды қолтаңбалау үшін "
-"қолданылады.</p>"
-"<p>Егер бұл өрісті бос қалдырсаңыз, онда KMail тек S/MIME қолданып хатты "
-"цифрлық қолтанбалай алмайды, ал кәдімгі пошта айналымына бұның әсері жоқ.</p>"
-"</qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Мұнда таңдаған S/MIME (X.509) куәлік хаттарыңызды қолтаңбалау үшін "
+"қолданылады.</p><p>Егер бұл өрісті бос қалдырсаңыз, онда KMail тек S/MIME "
+"қолданып хатты цифрлық қолтанбалай алмайды, ал кәдімгі пошта айналымына "
+"бұның әсері жоқ.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4088,27 +4012,25 @@ msgstr "S/MIME шифрлау куәлігіңіз"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Өзіңізге шифрлау үшін және құрастырғыштағы \"Менің куәлігімді тіркеу\" "
 "командасы үшін қолданылатын S/MIME куәлігін таңдаңыз."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Мұнда таңдаған S/MIME куәлік хаттарды өзіңізге шифрлау үшін және "
-"құрастырғыштағы \"Менің куәлігімді тіркеу\" командасы үшін қолданылады.</p>"
-"<p>Егер бұл өрісті бос қалдырсаңыз, онда KMail тек S/MIME қолданып, жіберетін "
-"хаттың көшірмесін өзіңізге шифрлай алмайды, ал кәдімгі пошта айналымына бұның "
-"әсері жоқ.</p></qt>"
+"<qt><p>Мұнда таңдаған S/MIME куәлік хаттарды өзіңізге шифрлау үшін және "
+"құрастырғыштағы \"Менің куәлігімді тіркеу\" командасы үшін қолданылады.</"
+"p><p>Егер бұл өрісті бос қалдырсаңыз, онда KMail тек S/MIME қолданып, "
+"жіберетін хаттың көшірмесін өзіңізге шифрлай алмайды, ал кәдімгі пошта "
+"айналымына бұның әсері жоқ.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4128,23 +4050,20 @@ msgstr "&Жауап беру адресі:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Жауап беру адресі</h3>"
-"<p>Хаттың<tt>Reply-to:</tt> айдарындағы жауап беру адресін анықтайды. Бұл жауап "
-"беру адресі <tt>Кімнен:</tt> деген өрісінен өзге болғанда қолданылады.</p>"
-"<p>Бұл бір топ адам бір істі атқарып жатқанда ыңғайлы. Мұндай жағдайда <tt>"
-"Жауап беру адресі:</tt> өрісінде топтың ортақ адресті келтіріп, <tt>Кімнен:</tt> "
-"өрісінде хатты жібергеннің жеке адресті келтіруге болады.</p>"
-"<p>Күмәндансаңыз бұл өрісті бос қалдырыңыз.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Жауап беру адресі</h3><p>Хаттың<tt>Reply-to:</tt> айдарындағы жауап "
+"беру адресін анықтайды. Бұл жауап беру адресі <tt>Кімнен:</tt> деген "
+"өрісінен өзге болғанда қолданылады.</p><p>Бұл бір топ адам бір істі атқарып "
+"жатқанда ыңғайлы. Мұндай жағдайда <tt>Жауап беру адресі:</tt> өрісінде "
+"топтың ортақ адресті келтіріп, <tt>Кімнен:</tt> өрісінде хатты жібергеннің "
+"жеке адресті келтіруге болады.</p><p>Күмәндансаңыз бұл өрісті бос қалдырыңыз."
+"</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4152,22 +4071,18 @@ msgstr "&Жасырын көшірме адрестері:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Жасырын көшірме адрестері</h3>"
-"<p>Осы өрісте келтірілген адрестерге бүкіл осы іс-әлпетінен жіберілген әрбір "
-"хат жіберіледі, бірақ бұл адрестер басқа алушыларға көрінбейді.</p>"
-"<p>Әдетте бұны хаттың көшірмесін басқа тіркелгіге жіберу үшін қолданады.</p>"
-"<p>Күмәндансаңыз бұл өрісті бос қалдырыңыз.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Жасырын көшірме адрестері</h3><p>Осы өрісте келтірілген адрестерге "
+"бүкіл осы іс-әлпетінен жіберілген әрбір хат жіберіледі, бірақ бұл адрестер "
+"басқа алушыларға көрінбейді.</p><p>Әдетте бұны хаттың көшірмесін басқа "
+"тіркелгіге жіберу үшін қолданады.</p><p>Күмәндансаңыз бұл өрісті бос "
+"қалдырыңыз.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4207,7 +4122,7 @@ msgstr "Қ&олтаңба"
 msgid "&Picture"
 msgstr "&Сурет"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Жарамсыз эл.пошта адресі"
 
@@ -4223,18 +4138,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Бапталған OpenPGP қолтанбалау кілттерінің біреуінде, осы іс-әлпеті (%1) үшін, "
-"эл.пошта адресі көрсетілген пайдаланушының идентификаторы жоқ.\n"
-"Бұл алушы жағында қолтаңбаны тексеру кезінде ескерту хабарларының пайда болуға "
-"себеп болуы мүмкін."
+"Бапталған OpenPGP қолтанбалау кілттерінің біреуінде, осы іс-әлпеті (%1) "
+"үшін, эл.пошта адресі көрсетілген пайдаланушының идентификаторы жоқ.\n"
+"Бұл алушы жағында қолтаңбаны тексеру кезінде ескерту хабарларының пайда "
+"болуға себеп болуы мүмкін."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Бапталған OpenPGP шифрлау кілттерінің біреуінде, осы іс-әлпеті (%1) үшін, "
-"эл.пошта адресі көрсетілген пайдаланушының идентификаторы жоқ."
+"Бапталған OpenPGP шифрлау кілттерінің біреуінде, осы іс-әлпеті (%1) үшін, эл."
+"пошта адресі көрсетілген пайдаланушының идентификаторы жоқ."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4245,16 +4160,16 @@ msgid ""
 msgstr ""
 "Бапталған S/MIME қолтаңбалау куәлігінің біреуінде, осы іс-әлпеті (%1) үшін, "
 "эл.пошта адресі көрсетілген пайдаланушының идентификаторы жоқ.\n"
-"Бұл алушы жағында қолтаңбаны тексеру кезінде ескерту хабарларының пайда болуға "
-"себеп болуы мүмкін."
+"Бұл алушы жағында қолтаңбаны тексеру кезінде ескерту хабарларының пайда "
+"болуға себеп болуы мүмкін."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Бапталған S/MIME шифрлау куәлігінің біреуінде, осы іс-әлпеті (%1) үшін, "
-"эл.пошта адресі көрсетілген пайдаланушының идентификаторы жоқ."
+"Бапталған S/MIME шифрлау куәлігінің біреуінде, осы іс-әлпеті (%1) үшін, эл."
+"пошта адресі көрсетілген пайдаланушының идентификаторы жоқ."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4295,8 +4210,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (әдеттегі)"
 
@@ -4339,21 +4254,21 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail \"%1\" тіркелгінің баптауында IMAP атаулы орындарының қолданудан шыққан "
-"префикс жазуын байқады."
+"KMail \"%1\" тіркелгінің баптауында IMAP атаулы орындарының қолданудан "
+"шыққан префикс жазуын байқады."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Баптаулар автоматты түрде ауысады, дегенмен тіркелгі баптауларын тексеріп "
 "шығыңыз."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Баптаулар автоматты түрде ауыпады, сондықтан тіркелгі баптауларын тексеріп "
 "шығыңыз."
@@ -4394,17 +4309,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Қате: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"%1 серверімен қосылым кенеттен үзілді не жауапты күту мерзімі бітті. Сервермен "
-"байланысты қайта орнату әрекеті автоматты түрде жасалады."
+"%1 серверімен қосылым кенеттен үзілді не жауапты күту мерзімі бітті. "
+"Сервермен байланысты қайта орнату әрекеті автоматты түрде жасалады."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4551,14 +4471,14 @@ msgstr "Архивтер"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4587,190 +4507,152 @@ msgstr "Шифрлау кілттер қолдануға келмейді"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>OpenPGP қолтаңбалау кілтінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>OpenPGP қолтаңбалау кілтінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>OpenPGP шифрлау кілтінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>OpenPGP шифрлау кілтінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>OpenPGP кілтінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>OpenPGP кілтінің жарамдылық "
+"мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME қолтаңбалау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>түбір куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME қолтаңбалау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>түбір куәлігінің жарамдылық "
+"мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME шифрлау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>түбір куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME шифрлау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>түбір куәлігінің жарамдылық "
+"мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>түбір куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME куәлігінің</"
+"p><p align=center><b>%3</b></p><p>түбір куәлігінің жарамдылық мерзімі</p><p>"
+"%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME қолтаңбалау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>аралық CA куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME қолтаңбалау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>аралық CA куәлігінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME шифрлау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>аралық CA куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME шифрлау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>аралық CA куәлігінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>аралық CA куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME куәлігінің</"
+"p><p align=center><b>%3</b></p><p>аралық CA куәлігінің жарамдылық мерзімі</"
+"p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME қолтаңбалау куәлігіңіздің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME қолтаңбалау "
+"куәлігіңіздің жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME шифрлау куәлігіңіздің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME шифрлау "
+"куәлігіңіздің жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME куәлігінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4784,179 +4666,141 @@ msgstr "S/MIME куәлігінің мерзімі жақында бітеді"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>OpenPGP қолтаңбалау кілтінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>OpenPGP қолтаңбалау кілтінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>OpenPGP шифрлау кілтінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>OpenPGP шифрлау кілтінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>OpenPGP кілтінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>OpenPGP кілтінің жарамдылық "
+"мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME қолтаңбалау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>түбір куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME қолтаңбалау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>түбір куәлігінің жарамдылық "
+"мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME шифрлау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>түбір куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME шифрлау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>түбір куәлігінің жарамдылық "
+"мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>түбір куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME куәлігінің</"
+"p><p align=center><b>%3</b></p><p>түбір куәлігінің жарамдылық мерзімі</p><p>"
+"%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME қолтаңбалау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>аралық CA куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME қолтаңбалау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>аралық CA куәлігінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME шифрлау куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>аралық CA куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME шифрлау "
+"куәлігінің</p><p align=center><b>%3</b></p><p>аралық CA куәлігінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME куәлігінің</p><p align=center><b>%3</b></p>"
-"<p>аралық CA куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME куәлігінің</"
+"p><p align=center><b>%3</b></p><p>аралық CA куәлігінің жарамдылық мерзімі</"
+"p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME қолтаңбалау куәлігіңіздің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME қолтаңбалау "
+"куәлігіңіздің жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME шифрлау куәлігіңіздің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME шифрлау "
+"куәлігіңіздің жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p>"
-"<p>S/MIME куәлігінің жарамдылық мерзімі</p>"
-"<p>%n күннен кем кезде бітеді.</p>"
+"<p align=center><b>%1</b> (тізбекті нөмірі: %2)</p><p>S/MIME куәлігінің "
+"жарамдылық мерзімі</p><p>%n күннен кем кезде бітеді.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -4968,9 +4812,10 @@ msgstr "S/MIME куәлігінің мерзімі жақында бітеді"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4991,9 +4836,10 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Таңдалған OpenPGP қолтаңбалау кілттің немесе S/MIME қолтаңбалау куәліктерінің "
-"біреуі не бірнешесі қолтаңбалауға келмеді. Іс-әлпетін баптау диалогы арқылы "
-"іс-әлпетінің қолтаңбалау кілттері мен куәліктерін өзгертіңіз.\n"
+"Таңдалған OpenPGP қолтаңбалау кілттің немесе S/MIME қолтаңбалау "
+"куәліктерінің біреуі не бірнешесі қолтаңбалауға келмеді. Іс-әлпетін баптау "
+"диалогы арқылы іс-әлпетінің қолтаңбалау кілттері мен куәліктерін "
+"өзгертіңіз.\n"
 "Жалғастыруды таңдасаңыз қолданатын кілттерді келтіруі сұралады."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
@@ -5004,10 +4850,10 @@ msgstr "Қолтаңбалау кілттер қолдануға келмейд�
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Алушы жақтағы шифрлау параметріледі тексерген кезде, кейбір алушылар OpenPGP "
 "шифрлауы қажет екендігі байқалды, бірақ қолданыстағы іс-әлпетінде сенім "
@@ -5019,27 +4865,27 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Алушы жақтағы шифрлау параметрлерді тексерген кезде, S/MIME шифрлауы қажет "
-"екендігі байқалды, бірақ қолданыстағы іс-әлпетінде сенім артылған жарамды "
-"S/MIME шифрлау куәліктер жоқ.\n"
+"екендігі байқалды, бірақ қолданыстағы іс-әлпетінде сенім артылған жарамды S/"
+"MIME шифрлау куәліктер жоқ.\n"
 "Өзіңізге шифрламай жалғастыруыңызға болады, бірақ онда өзіңіздің хабарыңызды "
 "өзіңіз оқи алмайтын боласыз."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Алушы жақтағы қолтаңбалау параметріледі тексерген кезде, OpenPGP қолтаңбалауы "
-"қажет екендігі байқалды, бірақ қолданыстағы іс-әлпетінде бапталған жарамды "
-"OpenPGP қолтаңбалау куәліктер жоқ."
+"Алушы жақтағы қолтаңбалау параметріледі тексерген кезде, OpenPGP "
+"қолтаңбалауы қажет екендігі байқалды, бірақ қолданыстағы іс-әлпетінде "
+"бапталған жарамды OpenPGP қолтаңбалау куәліктер жоқ."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5047,14 +4893,14 @@ msgstr "OpenPGP қолтаңбасыз"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "Алушы жақтағы қолтаңбалау параметріледі тексерген кезде, S/MIME қолтаңбалауы "
-"қажет екендігі байқалды, бірақ қолданыстағы іс-әлпетінде бапталған жарамды "
-"S/MIME қолтаңбалау куәліктері жоқ."
+"қажет екендігі байқалды, бірақ қолданыстағы іс-әлпетінде бапталған жарамды S/"
+"MIME қолтаңбалау куәліктері жоқ."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5076,8 +4922,8 @@ msgstr "Қолтаңбалау мүмкін емес"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Сіз өзіңізге шифрлау кілтін таңдап алмадыңыз. Сіз өзіңізге хатты шифрласаңыз "
 "оны сосын оқи алмайсыз."
@@ -5100,10 +4946,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Сіз осы хатты алушылар үшін шифрлау кілтін таңдап алмадыңыз, хат шифрланбайды."
+"Сіз осы хатты алушылар үшін шифрлау кілтін таңдап алмадыңыз, хат "
+"шифрланбайды."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5114,8 +4961,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Сіз бір алушы үшін шифрлау кілтін таңдап алмадыңыз, егер хатты шифрласаңыз ол "
-"оны оқи алмайды."
+"Сіз бір алушы үшін шифрлау кілтін таңдап алмадыңыз, егер хатты шифрласаңыз "
+"ол оны оқи алмайды."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5147,11 +4994,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "\"%1\" үшін жарамды және сенімді шифрлау кілті табылмады.\n"
 "\n"
@@ -5200,10 +5047,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Дағдарысты қате: пошта алынбады: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Хатты қосу қатесі:\n"
+msgid "Failed to add message:\n"
+msgstr "Хатты қосу қатесі:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5290,6 +5135,50 @@ msgstr "&Ажыратылған IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir пошта жәшігі"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Хат тақырыбы"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Көшірмесін 'address' дегенге жіберу"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Көшірмесін 'address' дегенге жасырып жіберу"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Хатқа 'header' айдарын қосу"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Хат бетін 'file' дегеннен алу"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Хат беті"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Хатқа тіркеме қосу. Бұны қайталауға болады"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Тек жаңа хаттар бар-жоғын тексеру"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Тек құрастырғыш терезесін ашу"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Келтірген хат файлын қарау"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "'URL' сілтемедегі файлды тіркеп 'address' дегенге хат жіберу"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Пошта"
@@ -5347,14 +5236,13 @@ msgstr "%1: %2 қапшығы табылды. Ол бірлескен жұмыс
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail %1 қапшығында бірлескен жұмыстың қапшықтарын тауып, келесі әрекет "
-"орындайды: %2"
-"<br>Егер бұны қаламасыңыз, әрекеттен қайтыңыз, сонда IMAP ресурстары рұқсат "
-"етілмейді"
+"орындайды: %2<br>Егер бұны қаламасыңыз, әрекеттен қайтыңыз, сонда IMAP "
+"ресурстары рұқсат етілмейді"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5401,11 +5289,11 @@ msgstr "URL алмасу буферіне көшірімеленді."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt><b>%1</b> деген файл бар ғой.<br>Оны алмастырғыңыз келе ме?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Файлға сақтау"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Алмастыру"
 
@@ -5423,7 +5311,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5443,11 +5331,11 @@ msgstr "Файлдың құрамында хат жоқ."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Бұл файлдың құрамында бірнеше хат бар. Тек бірінші хат көрсетілген."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5456,115 +5344,115 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Хаттарды өшіру"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "%3 / %2 хатты дегеннен жылжыту."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Дискіде бос орын жеткіліксіз бе?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Осы қапшыққа жылжыту"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Осы қапшыққа көшірмелеу"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Хаттарды жылжыту"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Хаттарды өшіру"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL адресін ашу..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Шынымен <b>%1</b> дегенді орындауды қалайсыз ба?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Орындау"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Сақталатын тіркеме табылмады."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Келесіге тіркемені сақтау"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "тіркеме.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "тіркеме.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "%1 деп аталған файл бар ғой. Оның үстінен жазыла берсін бе?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Файл бар ғой"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Үстінен жазу"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Хаттың %1 бөлігі шифрланған. Хатты шифрланған түрде сақтағыңыз келе ме?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail сұрағы"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Шифрлауды сақтау"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Шифрлауды сақтамау"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Хаттың %1 бөлігі қолтаңбаланған. Қолтаңбаланған хатты сақтағыңыз келе ме?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Қолтаңбалауды сақтау"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5573,22 +5461,22 @@ msgstr ""
 "%1 деген файл жазылмады:\n"
 "%2 "
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "%1 деген файл жазылмады."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Бұл эл.пошта адресі адрестік кітапшада жазылмаған. Бұны адрестік кітапшаға "
 "жазып алыңыз да оған Сіз қолданатын лезде хабарласу клиенті үшін адресін де "
 "қосыңыз."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5598,50 +5486,51 @@ msgstr ""
 " %1\n"
 " кіммен әңгіме құру керек екені түсініксіз."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus бағдарламасы \"x-obtain-keys\" функциясын ұсынбады. Қате туралы "
 "хабарлаңыз."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus бағдарламасының қатесі"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Chiasmus бағдарламасы күтпеген мәнді қайтарды. Оның \"x-obtain-keys\" функциясы "
-"жолдар тізімін қайтару тиіс емес. Қате туралы хабарлаңыз."
+"Chiasmus бағдарламасы күтпеген мәнді қайтарды. Оның \"x-obtain-keys\" "
+"функциясы жолдар тізімін қайтару тиіс емес. Қате туралы хабарлаңыз."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Кілттер табылмады. Chiasmus баптау параметрлеріндегі кілттің жолын дұрыстаңыз."
+"Кілттер табылмады. Chiasmus баптау параметрлеріндегі кілттің жолын "
+"дұрыстаңыз."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus шифрді шешу кілтін таңдау"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus бағдарламасы \"x-decrypt\" функциясын ұсынбады. Қате туралы "
 "хабарлаңыз."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5649,26 +5538,26 @@ msgstr ""
 "\"x-decrypt\" функциясы күткен параметрлерді қабылдамады. Қате туралы "
 "хабарлаңыз."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus шифрді шешу қатесі"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Chiasmus бағдарламасы күтпеген мәнді қайтарды. Оның \"x-decrypt\" функциясы "
 "байт жиымын қайтару тиіс емес. Қате туралы хабарлаңыз."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Пошта"
@@ -5767,7 +5656,7 @@ msgstr "Өлшемі"
 msgid "Encoding"
 msgstr "Кодтамасы"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Сығу"
 
@@ -5779,7 +5668,7 @@ msgstr "Шифрлау"
 msgid "Sign"
 msgstr "Қолтаңба"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Тіркеме атауы:"
 
@@ -5801,7 +5690,8 @@ msgstr "Негізгі алушылар"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>Бұл өрістегі эл.пошта адресі хаттың көшірмесін алады.</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -5811,9 +5701,9 @@ msgstr "Қосымша алушылар"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Бұл өрістегі эл.пошта адресі хаттың көшірмесін алады. Техникалық жағынан "
 "бұл <b>Кімге:</b> деген өрісіне жазғанбен тең, айырмашылығы: бұл көшірме "
@@ -5826,9 +5716,8 @@ msgstr "Жасырын алушылар"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>Бұл өріс <b>Көшірмесін кімге:</b> өрісіне ұқсас, айырмашылығы: басқа "
 "алушыларға жасырын көшірменің алушылары көрсетілмейды.</qt>"
@@ -5841,7 +5730,7 @@ msgstr "&Хатты жіберу"
 msgid "&Send Mail Via"
 msgstr "&Эл.поштаны жіберу жолы"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&Кейінірек жіберу"
@@ -5908,8 +5797,7 @@ msgstr "Дәйекше таңбаларын ө&шіру"
 msgid "Cl&ean Spaces"
 msgstr "Бос орындардан та&зарту"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Ені б&ірыңғай қаріп"
@@ -6051,31 +5939,31 @@ msgstr "&Криптография пішімі"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандартты"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Жолбелгі тізім (Дөңгелек)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Жолбелгі тізім (Шеңбер)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Жолбелгі тізім (Шаршы)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Реттелген тізім (ондық сан)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Реттелген тізім (кіші әріп)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Реттелген тізім (үлкен әріп)"
 
@@ -6184,8 +6072,8 @@ msgstr "Құрастырғышын жабу"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Хатыңызда тіркемеге сілтеме бар сияқты, бірақ ештеңе тіркелмеген.\n"
@@ -6195,49 +6083,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Тіркеме туралы ескерту"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Бар түрінде жіберу"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>(%1) тіркемесінің жолы анықталмаған;</p>"
-"<p>файлды тіркегіңіз келсе, оның жолын келтіріңіз.</p></qt>"
+"<qt><p>(%1) тіркемесінің жолы анықталмаған;</p><p>файлды тіркегіңіз келсе, "
+"оның жолын келтіріңіз.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Файлды тіркеу"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Тіркеу"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Файлды енгізу"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Файлды енгізу"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Келесіден кілтті  экспорттау кезінде қате пайда болды:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Келесіден кілтті  экспорттау кезінде қате пайда болды:</p><p><b>%1</"
+"b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6276,20 +6164,35 @@ msgid ""
 "View"
 msgstr "Көру"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Өзгерту..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Cкриптті өңдеу..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Былай сақтау..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Қас&иеттер"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Тіркемені қосу..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail бұл файлды сығалмайды."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6297,76 +6200,71 @@ msgstr ""
 "Сығылған файлдың өлшемі бастапқы файлдың өлшемінен асып кетті. Файлды "
 "сығылмаған түрінде қалдыру керек пе?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Қалдыру"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail бұл файлды тарқаталмады."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Тіркемені былай сақтау"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Мәтін ретінде қосу"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Тіркеме ретінде қосу"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "&Тіркеме қылып орналастыру"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "аталмаған "
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Хатты өзіңізге шифрлауды сұрадыңыз, бірақ қолданыстағы іс-әлпетінде "
-"таңдалған (OpenPGP не S/MIME) кілттер жоқ.</p>"
-"<p>Іс-әлпетін баптау диалогында кілтті таңдаңыз.</p></qt>"
+"<qt><p>Хатты өзіңізге шифрлауды сұрадыңыз, бірақ қолданыстағы іс-әлпетінде "
+"таңдалған (OpenPGP не S/MIME) кілттер жоқ.</p><p>Іс-әлпетін баптау "
+"диалогында кілтті таңдаңыз.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Шифрлау кілті аңықталмаған"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Хатты қолтаңбалау үшін, OpenPGP немесе S/MIME қолтаңбалау кілтін анықтау "
-"керек.</p>"
-"<p>Іс-әлпетін баптау диалогында кілтті таңдаңыз.</p></qt>"
+"<qt> <p>Хатты қолтаңбалау үшін, OpenPGP немесе S/MIME қолтаңбалау кілтін "
+"анықтау керек.</p><p>Іс-әлпетін баптау диалогында кілтті таңдаңыз.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Қолтаңбалау кілті анықталмаған"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6374,93 +6272,91 @@ msgstr ""
 "KMail желіден тыс режімде, хатыңыз желіге қосылғанша шығыс қапшығында "
 "сақталады."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Желіде/Желіден тыс"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Эл.пошта адресіңізді \"Кімнен\" өрісіне келтіріңіз. Сонымен қатар, өзіңіздің "
-"эл.пошта адресіңізді, әрбір хатты жіберген сайын оны теріп отырмау үшін, барлық "
-"іс-әлпеттерінде келтіріңіз."
+"эл.пошта адресіңізді, әрбір хатты жіберген сайын оны теріп отырмау үшін, "
+"барлық іс-әлпеттерінде келтіріңіз."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Кемінде бір алушының адресін келтіруіңіз қажет, \"Кімге\" деген өрісте немесе "
-"\"Көшірмесі\", әлде \"Жасырын көшірмесі\" өрістеріне."
+"Кемінде бір алушының адресін келтіруіңіз қажет, \"Кімге\" деген өрісте "
+"немесе \"Көшірмесі\", әлде \"Жасырын көшірмесі\" өрістеріне."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Тақырыбын келтірмедіңіз. Хат тақырыпсыз жіберіле берсін бе?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Атауы келтірілмеген"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Тақырыбын келтірмедіңіз. Хат тақырыпсыз жіберіле берсін бе?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Тақырыбы келтірілмеген"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Ж&іберіле берсін"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Тақырыпты келтіру"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Пішімдеуді сақтау, қолтаңбалаусыз/шифрлаусыз"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Пішімдеуді сақтау, шифрлаусыз"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Пішімдеуді сақтау, қолтаңбалаусыз"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Қолтаңбалау/шифрлау (пішімдеуді өшіру)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Шифрлау (пішімдеуді өшіру)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Қолтаңбалау (пішімдеуді өшіру)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>HTML пішімдегі хаттарын қолтаңбалау/шифрлау мүмкін емес.</p>"
-"<p>Пішімдеуі өшірілсін бе?</p></qt>"
+"<qt><p>HTML пішімдегі хаттарын қолтаңбалау/шифрлау мүмкін емес.</"
+"p><p>Пішімдеуі өшірілсін бе?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Хатты қолтаңбалау/шифрлау керек пе?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6469,110 +6365,110 @@ msgstr ""
 "\"%1\" іс-әлпетінде жоба жазбаға арнап қойған қапшығы (енді) жоқ; сондықтан "
 "әдеттегі қапшық қолданылады."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Жіберетін тіркелгіні құрып, қайталап көріңіз."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Хат жіберілуге дайын..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Құптауды жіберу"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Қазір жіберу"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Алушылар жоқ"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Қосымша алушылар"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Емлесін тексеру"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Емлесін тексеру"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Емлесін тексеру доғарылды."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Емлесін тексеру тоқтатылды."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Емлесін тексеру аяқталды."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Емлесін тексеру"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Крипто протоколдарды алдымен Chiasmus шифрлауды қолданатындай баптаңыз.\n"
 "Бұны баптау диалогындағы \"Қауіпсіздік\" бетіндегі \"Крипто протоколдар\" "
 "қойындысында істей аласыз."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"libkleopatra жиыны Chiasmus-ты қолдауынсыз жинақталған сияқты. Оны "
-"--enable-chiasmus параметрімен қайта компиляциялаған жөн."
+"libkleopatra жиыны Chiasmus-ты қолдауынсыз жинақталған сияқты. Оны --enable-"
+"chiasmus параметрімен қайта компиляциялаған жөн."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Chiasmus протоколы бапталмаған"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Chiasmus кілттері табылмады"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus шифрлау кілтін таңдау"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Хатты %1 қолтаңбаланған."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Хатты %1 қолтаңбаланған."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP - шифрланған хат"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Хат тақырыбы: "
@@ -6622,11 +6518,11 @@ msgstr "Емлесін тексеру - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/Aspell жегілмеді. ISpell/Aspell дұрыс бапталғанын және PATH жолдарында "
-"бар екендігін тексеріңіз."
+"ISpell/Aspell жегілмеді. ISpell/Aspell дұрыс бапталғанын және PATH "
+"жолдарында бар екендігін тексеріңіз."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6659,13 +6555,11 @@ msgstr "<qt><b>%1</b> сүзгі ережесінде әрекеттер тым
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt><b>%2</b> сүзгі ережесінде"
-"<br> <b>%1</b> әрекеті беймәлім."
-"<br> Әрекет еленбей қалдырылды.</qt>"
+"<qt><b>%2</b> сүзгі ережесінде<br> <b>%1</b> әрекеті беймәлім.<br> Әрекет "
+"еленбей қалдырылды.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6882,167 +6776,134 @@ msgstr "Дыбысты орындау"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Бұл анықтаған сүзгілер тізімі. Олар жоғарыдан бастап төменге қарай іске "
-"асырылады.</p>"
-"<p>Өзгерту үшін, керек сүзгіні түртіп, оң жағындағы батырмаларды қолданыңыз.</p>"
-"</q>"
+"<qt><p>Бұл анықтаған сүзгілер тізімі. Олар жоғарыдан бастап төменге қарай "
+"іске асырылады.</p><p>Өзгерту үшін, керек сүзгіні түртіп, оң жағындағы "
+"батырмаларды қолданыңыз.</p></q>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Жаңа сүзгіні құру үшін осы батырманы басыңыз.</p>"
-"<p> Ол таңдалған сүзгінің алдына енгізіледі. Оның кезектегі орнын әрқашанда "
-"өзгерте аласыз.</p>"
-"<p>Егер бұл батырманы байқамай басып қалсаңыз, <em>Өшіру</em> "
-"батырмасын басып, сүзгіні құрудан бас тартуға болады.</p></qt>"
+"<qt><p>Жаңа сүзгіні құру үшін осы батырманы басыңыз.</p><p> Ол таңдалған "
+"сүзгінің алдына енгізіледі. Оның кезектегі орнын әрқашанда өзгерте аласыз.</"
+"p><p>Егер бұл батырманы байқамай басып қалсаңыз, <em>Өшіру</em> батырмасын "
+"басып, сүзгіні құрудан бас тартуға болады.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Сүзгінің көшірмесін жасау үшін осы батырманы басыңыз.</p>"
-"<p>Егер бұл батырманы байқамай басып қалсаңыз, <em>Өшіру</em> "
-"батырмасын басып сүзгінің көшірмесін құрудан бас тартуға болады.</p></qt>"
+"<qt><p>Сүзгінің көшірмесін жасау үшін осы батырманы басыңыз.</p><p>Егер бұл "
+"батырманы байқамай басып қалсаңыз, <em>Өшіру</em> батырмасын басып сүзгінің "
+"көшірмесін құрудан бас тартуға болады.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Осы батырманы бассаңыз таңдалған сүзгі тізімнен <em>өшіріледі</em>.</p>"
-"<p>Бұдан кейін өшірілген сүзгіні қайтаруға болмайды, бірақ Сіз әрқашанда <em>"
-"Қайту</em> батырмасын басып, диалогтан шығып, бүкіл өзгертулерден бас тарта "
-"аласыз.</p></qt>"
+"<qt><p>Осы батырманы бассаңыз таңдалған сүзгі тізімнен <em>өшіріледі</em>.</"
+"p><p>Бұдан кейін өшірілген сүзгіні қайтаруға болмайды, бірақ Сіз әрқашанда "
+"<em>Қайту</em> батырмасын басып, диалогтан шығып, бүкіл өзгертулерден бас "
+"тарта аласыз.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Таңдалған сүзгіні тізімі бойынша <em>төмендету</em> "
-"үшін осы батырманы басыңыз.</p>"
-"<p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану кезегін анықтайды. Ең "
-"жоғарғы сүзгі бірінші қолданылады.</p>"
-"<p>Егер бұл батырманы байқамай басып қалсаңыз, <em>Жоғарлату</em> "
-"батырмасын басып сүзгіні қайтаруға болады.</p></qt>"
+"<qt><p>Таңдалған сүзгіні тізімі бойынша <em>төмендету</em> үшін осы "
+"батырманы басыңыз.</p><p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану "
+"кезегін анықтайды. Ең жоғарғы сүзгі бірінші қолданылады.</p><p>Егер бұл "
+"батырманы байқамай басып қалсаңыз, <em>Жоғарлату</em> батырмасын басып "
+"сүзгіні қайтаруға болады.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Таңдалған сүзгіні тізімі бойынша <em>жоғарлату</em> "
-"үшін осы батырманы басыңыз.</p>"
-"<p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану кезегін анықтайды. Ең "
-"жоғарғы сүзгі бірінші қолданылады.</p>"
-"<p>Егер бұл батырманы байқамай басып қалсаңыз, <em>Төмендету</em> "
-"батырмасын басып сүзгіні қайтаруға болады.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Таңдалған сүзгіні тізімі бойынша <em>жоғарлату</em> үшін осы "
+"батырманы басыңыз.</p><p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану "
+"кезегін анықтайды. Ең жоғарғы сүзгі бірінші қолданылады.</p><p>Егер бұл "
+"батырманы байқамай басып қалсаңыз, <em>Төмендету</em> батырмасын басып "
+"сүзгіні қайтаруға болады.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Таңдалған сүзгіні тізімі бойынша <em>төмендету</em> "
-"үшін осы батырманы басыңыз.</p>"
-"<p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану кезегін анықтайды. Ең "
-"жоғарғы сүзгі бірінші қолданылады.</p>"
-"<p>Егер бұл батырманы байқамай басып қалсаңыз, <em>Жоғарлату</em> "
-"батырмасын басып сүзгіні қайтаруға болады.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Таңдалған сүзгіні тізімі бойынша <em>төмендету</em> үшін осы "
+"батырманы басыңыз.</p><p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану "
+"кезегін анықтайды. Ең жоғарғы сүзгі бірінші қолданылады.</p><p>Егер бұл "
+"батырманы байқамай басып қалсаңыз, <em>Жоғарлату</em> батырмасын басып "
+"сүзгіні қайтаруға болады.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Таңдалған сүзгіні тізімі бойынша <em>төмендету</em> "
-"үшін осы батырманы басыңыз.</p>"
-"<p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану кезегін анықтайды. Ең "
-"жоғарғы сүзгі бірінші қолданылады.</p>"
-"<p>Егер бұл батырманы байқамай басып қалсаңыз, <em>Жоғарлату</em> "
-"батырмасын басып сүзгіні қайтаруға болады.</p></qt>"
+"<qt><p>Таңдалған сүзгіні тізімі бойынша <em>төмендету</em> үшін осы "
+"батырманы басыңыз.</p><p>Сүзгілер реті маңызды, себебі ол хаттарға қолдану "
+"кезегін анықтайды. Ең жоғарғы сүзгі бірінші қолданылады.</p><p>Егер бұл "
+"батырманы байқамай басып қалсаңыз, <em>Жоғарлату</em> батырмасын басып "
+"сүзгіні қайтаруға болады.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Таңдалған сүзгіні қайта атау үшін осы батырманы басыңыз.</p>"
-"<p>Сүзгінің атауы \"&lt;\" дегеннен басталатын болса ол атау автоматты түрде "
-"берілген.</p>"
-"<p>Егер бұны байқамай басып қалып, автоматты түрде атауды қайтарғыңыз келсе осы "
-"батырманы қайта басып, <em>Тазалау</em> дегенді, содан кейін көрінген диалогта "
-"<em>OK</em> дегенді басыңыз.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Таңдалған сүзгіні қайта атау үшін осы батырманы басыңыз.</"
+"p><p>Сүзгінің атауы \"&lt;\" дегеннен басталатын болса ол атау автоматты "
+"түрде берілген.</p><p>Егер бұны байқамай басып қалып, автоматты түрде атауды "
+"қайтарғыңыз келсе осы батырманы қайта басып, <em>Тазалау</em> дегенді, содан "
+"кейін көрінген диалогта <em>OK</em> дегенді басыңыз.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Құптау диалогын шақыру.</p>"
-"<p>Егер сіз кейінге қалдырылған хаттарды жүктеу үшін ережелер жиынын таңдасаңыз "
-"бұл өте пайдалы. Егер осы диалог көрсетілмесе, осы хаттар серверде қала берер "
-"еді, егер жаңа хат келмесе немесе хатты басқаша белгілейтін жаңа ереже жиынын "
-"көрсеткіңіз келсе.</p></qt>"
+"<qt><p>Құптау диалогын шақыру.</p><p>Егер сіз кейінге қалдырылған хаттарды "
+"жүктеу үшін ережелер жиынын таңдасаңыз бұл өте пайдалы. Егер осы диалог "
+"көрсетілмесе, осы хаттар серверде қала берер еді, егер жаңа хат келмесе "
+"немесе хатты басқаша белгілейтін жаңа ереже жиынын көрсеткіңіз келсе.</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7052,6 +6913,16 @@ msgstr "POP3 сүзгі ережелері"
 msgid "Filter Rules"
 msgstr "Сүзгі ережелері"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Импорттау"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Импорттау"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Бар сүзгілер"
@@ -7075,7 +6946,8 @@ msgstr "Жалпы параметрлері"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"Құптау диалогында 'Кейін жүктеу' деп белгіленген хаттар әрқашанда &көрсетілсін"
+"Құптау диалогында 'Кейін жүктеу' деп белгіленген хаттар әрқашанда "
+"&көрсетілсін"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7133,6 +7005,11 @@ msgstr "Бұл сүзгі құралдар панеліне қосылсын"
 msgid "Icon for this filter:"
 msgstr "Сүзгінің таңбашасы:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Кімге"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Жоғары"
@@ -7141,16 +7018,29 @@ msgstr "Жоғары"
 msgid "Down"
 msgstr "Төмен"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Қайта атау..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Жаңа"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Мынаған &көшірмелеу"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Жойылған"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7159,8 +7049,8 @@ msgstr "Қапшыққа тіркесімді таңдау"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Кемінде бір сүзгі желідегі IMAP тіркелгіні мақсаттаған. Бұл сүзгі қолмен "
 "сүзгілегенде және желідегі келген IMAP поштаны сүзгілегенде ғана істейді."
@@ -7243,29 +7133,24 @@ msgstr "IMAP бүркемесін жөндеу"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>IMAP бүркемесін жөндеу.</b></p>"
-"<p>IMAP бүркемесін қадамдастыру мәселесі туатын болса, алдымен қапшық индексін "
-"қайта құрып көріңіз. Бұл біршама уақытты алатын, бірақ мәселелер туғызбайтын "
-"амал.</p>"
-"<p>Егер бұл көмектеспесе IMAP бүркемесін жаңартыңыз. Бірақ бұл кезде IMAP "
-"қапшықтарында және олардың ішкі қапшықтарында жасалған барлық өзгерістер "
-"жоғалады.</p>"
+"<p><b>IMAP бүркемесін жөндеу.</b></p><p>IMAP бүркемесін қадамдастыру "
+"мәселесі туатын болса, алдымен қапшық индексін қайта құрып көріңіз. Бұл "
+"біршама уақытты алатын, бірақ мәселелер туғызбайтын амал.</p><p>Егер бұл "
+"көмектеспесе IMAP бүркемесін жаңартыңыз. Бірақ бұл кезде IMAP қапшықтарында "
+"және олардың ішкі қапшықтарында жасалған барлық өзгерістер жоғалады.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7302,8 +7187,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7324,8 +7209,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"%1 қапшығының және оның барлық ішкі қапшықтарының IMAP бүркемесін жаңартқыңыз "
-"келгені рас па?\n"
+"%1 қапшығының және оның барлық ішкі қапшықтарының IMAP бүркемесін "
+"жаңартқыңыз келгені рас па?\n"
 "Жергілікті қапшықтардағы барлық жасалған өзгерістер жоғалады."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7342,8 +7227,8 @@ msgstr "Қапшық индексі жаңадан құрылды."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "%1 қапшығы қадамдастырылмаған (ол %2 күйінде). Оны шынымен жаңадан "
 "қадамдастырғыңыз келгені рас па?"
@@ -7471,13 +7356,11 @@ msgstr "Серверде ішкі қапшықтарды құру"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p><b>%1</b> қапшығы өшірілген сияқты. Оны серверден де өшіру керек пе?</p></qt>"
+"<qt><p><b>%1</b> қапшығы өшірілген сияқты. Оны серверден де өшіру керек пе?</"
+"p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7498,12 +7381,11 @@ msgstr "%1 атаулы орынның қапшықтарының тізімін
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p><b>%1</b> қапшығы өшірілген сияқты. Оны серверден де өшіру керек пе?</p></qt>"
+"<qt><p><b>%1</b> қапшығы өшірілген сияқты. Оны серверден де өшіру керек пе?</"
+"p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7511,20 +7393,20 @@ msgstr "Доғарылған"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"%1 IMAP сервері IMAP аңдатпаларын қолдамайды. XML түрінде бұл серверде сақтауға "
-"болмайды, KMail баптауларын түзеңіз."
+"%1 IMAP сервері IMAP аңдатпаларын қолдамайды. XML түрінде бұл серверде "
+"сақтауға болмайды, KMail баптауларын түзеңіз."
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"%1 IMAP сервері IMAP аңдатпаларын қолдамайды. XML түрінде бұл серверде сақтауға "
-"болмайды, KMail баптауларын түзеңіз."
+"%1 IMAP сервері IMAP аңдатпаларын қолдамайды. XML түрінде бұл серверде "
+"сақтауға болмайды, KMail баптауларын түзеңіз."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7537,17 +7419,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Қапшықта серверге әлі жүктеп берілмеген жаңа хаттар бар, бірақ оларды жүктеп "
-"беруге рұқсаттар жеткілікті емес секілді. Серверге хаттарды тапсыру "
+"<p>Қапшықта серверге әлі жүктеп берілмеген жаңа хаттар бар, бірақ оларды "
+"жүктеп беруге рұқсаттар жеткілікті емес секілді. Серверге хаттарды тапсыру "
 "рұқсаттарыңызды түгелдеу үшін жүйе әкімшісімен байланысыңыз немесе ол жаңа "
-"хаттарды қапшықтан алып тастаңыз.</p> "
-"<p>Бұл хаттарды басқа қапшыққа ауыстырғыңыз келеді ме?</p>"
+"хаттарды қапшықтан алып тастаңыз.</p> <p>Бұл хаттарды басқа қапшыққа "
+"ауыстырғыңыз келеді ме?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7556,20 +7438,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Қапшықта серверге әлі жүктеп берілмеген жаңа хаттар бар, бірақ оларды жүктеп "
-"беруге рұқсаттар жеткілікті емес секілді. Серверге хаттарды тапсыру "
+"<p>Қапшықта серверге әлі жүктеп берілмеген жаңа хаттар бар, бірақ оларды "
+"жүктеп беруге рұқсаттар жеткілікті емес секілді. Серверге хаттарды тапсыру "
 "рұқсаттарыңызды түгелдеу үшін жүйе әкімшісімен байланысыңыз немесе ол жаңа "
-"хаттарды қапшықтан алып тастаңыз.</p> "
-"<p>Бұл хаттарды басқа қапшыққа ауыстырғыңыз келеді ме?</p>"
+"хаттарды қапшықтан алып тастаңыз.</p> <p>Бұл хаттарды басқа қапшыққа "
+"ауыстырғыңыз келеді ме?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Келесіге жылжыту:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Қапшықта қалдыру"
 
@@ -7581,8 +7468,7 @@ msgstr "Жылжыту"
 msgid "Permissions (ACL)"
 msgstr "Рұқсаттар (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Жалпы"
@@ -7607,8 +7493,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Қалаған &таңбашалар"
@@ -7627,23 +7512,20 @@ msgstr "Бұл қапшықтағы жаңа/оқылмаған хат тура�
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Егер бұл амал рұқсат етілсе, осы қапшықта жаңа/оқылмаған хат бар туралы "
-"құлақтандыру жасалады. Сонымен қатар, алдыңғы/келесі оқылмағандары бар қапшықта "
-"ауысу осы қапшықта тоқтатылады.</p>"
-"<p>Бұл амал рұқсат етілмесе, аталған құлақтандыру жасалмайды, және "
-"алдыңғы/келесі оқылмағандары бар қапшықта ауысқанда бұл қапшыта тоқтамайды. Бұл "
-"өшірілгендерге не спамға арналған қапшықтардағы оқылмаған хаттарды елемеуге "
-"пайдалы.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Егер бұл амал рұқсат етілсе, осы қапшықта жаңа/оқылмаған хат бар "
+"туралы құлақтандыру жасалады. Сонымен қатар, алдыңғы/келесі оқылмағандары "
+"бар қапшықта ауысу осы қапшықта тоқтатылады.</p><p>Бұл амал рұқсат етілмесе, "
+"аталған құлақтандыру жасалмайды, және алдыңғы/келесі оқылмағандары бар "
+"қапшықта ауысқанда бұл қапшыта тоқтамайды. Бұл өшірілгендерге не спамға "
+"арналған қапшықтардағы оқылмаған хаттарды елемеуге пайдалы.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7655,9 +7537,9 @@ msgstr "Осы қапшықта жауаптар сақталсын"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Осы қапшықтағы хаттарға жауаптар, жіберілген пошта қапшығына сақталғаннын "
 "орнына, өзінде қалсын десеңіз осы параметрді таңдаңыз."
@@ -7670,17 +7552,21 @@ msgstr "Хаттар тізімінде Жіберуші/Алушы бағаны
 msgid "Sho&w column:"
 msgstr "Көрс&етілетін бағандар:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Әдетті қылу"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Жіберуші"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Алушы"
@@ -7691,17 +7577,18 @@ msgstr "&Жіберушінің іс-әлпеті:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Жаңа хаттарды жіберуге немесе осы қапшықтағы хаттарға жауап беруге қолданатын "
-"жіберушінің іс-әлпетін таңдаңыз. Сонда, осы жұмыс қапшықтарының біреуінде "
-"болсаңыз, KMail сол қапшыққа сәйкесті жіберушінің эл.пошта адресін, оның "
-"қолтаңбасын, қолтаңбалау және шифрлау кілттерін автоматты түрде қолданады. "
-"Іс-әлпеттері KMail баптау диалогында орнатылады. (Баптау -> KMail баптаулары)"
+"Жаңа хаттарды жіберуге немесе осы қапшықтағы хаттарға жауап беруге "
+"қолданатын жіберушінің іс-әлпетін таңдаңыз. Сонда, осы жұмыс қапшықтарының "
+"біреуінде болсаңыз, KMail сол қапшыққа сәйкесті жіберушінің эл.пошта "
+"адресін, оның қолтаңбасын, қолтаңбалау және шифрлау кілттерін автоматты "
+"түрде қолданады. Іс-әлпеттері KMail баптау диалогында орнатылады. (Баптау -> "
+"KMail баптаулары)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7719,28 +7606,28 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Бұл параметр осы қапшықтың пайдаланушылардың қайсы үшін оқиғалар \"бос емес\" "
-"уақыт деп белгіленетінін және осы қапшықтағы оқиғалар мен тапсырмалар туралы "
-"ескерту кімге көрсетілетінін анықтайды. Параметр тек күнтізбе және тапсырма "
-"қапшықтарында қолданылады (тапсырмалар үшін бұл параметр тек ескерту үшін "
-"қолданылады.)\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Бұл параметр осы қапшықтың пайдаланушылардың қайсы үшін оқиғалар \"бос емес"
+"\" уақыт деп белгіленетінін және осы қапшықтағы оқиғалар мен тапсырмалар "
+"туралы ескерту кімге көрсетілетінін анықтайды. Параметр тек күнтізбе және "
+"тапсырма қапшықтарында қолданылады (тапсырмалар үшін бұл параметр тек "
+"ескерту үшін қолданылады.)\n"
 "\n"
-"Мысалы: егер бастық пен хатшысы қапшықты ортақтасып қолданатын болса және бұл "
-"қапшықтағы оқиға бастықтың уақыты ғана күнтізбесінде бос емес деп белгіленетін "
-"болса, онда бастық \"Әкімшілері үшін\" дегенді таңдау керек, өйткені ол ғана "
-"қапшық әкімшісі болып табылады.\n"
+"Мысалы: егер бастық пен хатшысы қапшықты ортақтасып қолданатын болса және "
+"бұл қапшықтағы оқиға бастықтың уақыты ғана күнтізбесінде бос емес деп "
+"белгіленетін болса, онда бастық \"Әкімшілері үшін\" дегенді таңдау керек, "
+"өйткені ол ғана қапшық әкімшісі болып табылады.\n"
 "Басқа мысал: күнтізбені жұмыс тобы бірлесіп қолданғанда, жиналысты "
-"жоспарлағанда, \"Барлығы үшін\" деп барлық жұмыс тобының мүшелерінің уақыты бос "
-"емес деп белгіленуі тиіс.\n"
-"Ал жалпы компаниялық оқиғасын жоспарлайтын қапшық үшін,\"Ешкім\" дегенін таңдау "
-"керек, себебі бұл оқиғаларға кімнің қатысатыны алдын-ала белгісіз."
+"жоспарлағанда, \"Барлығы үшін\" деп барлық жұмыс тобының мүшелерінің уақыты "
+"бос емес деп белгіленуі тиіс.\n"
+"Ал жалпы компаниялық оқиғасын жоспарлайтын қапшық үшін,\"Ешкім\" дегенін "
+"таңдау керек, себебі бұл оқиғаларға кімнің қатысатыны алдын-ала белгісіз."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7771,17 +7658,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Сіз бұл қапшықты бірлескен жұмыс үшін баптап, бірлесіп жұмыс жасау қапшығын "
 "жасыруды таңдадыңыз. Бұл диалог терезесі жабылғанда көрсетілген осы қапшық "
@@ -7856,7 +7743,8 @@ msgstr "Қапшық мәліметін алу қатесі."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "'%1' дегеннің пошта индексі KMail беймәлім нұсқасынан (%2).\n"
 "Бұл қапшықтың индексін қайта құруға болады, бірақ кейбір мәліметтер, хаттар "
@@ -7886,8 +7774,8 @@ msgstr "%1 дегенді ашқанда қате пайда болды, қап�
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "%1 дегенді ашқанда қате пайда болды, немесе бұл жарамды пошта қапшығы емес "
 "немесе қатнауға жеткілікті рұқсатыңыз жоқ."
@@ -7932,21 +7820,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>'%2' қапшығының индексі ескірген сияқты. Хаттардың жоғалуын болдырмау үшін "
-"индекс қайтадан құрылады. Осының нәтижесінде қапшықта бұрын өшірілген хаттар "
-"қайта пайда болуы мүмкін және хаттардың күй-жай мәліметі де жоғалуы мүмкін.</p>"
-"<p> Келешекте бұл жағдайдың қайталанбауы үшін KMail анықтамасының <a "
-"href=\"%1\">Cұрақтар мен жауаптарының (FAQ)</a> тиісті бөлімінін оқыңыз.</p>"
-"</qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>'%2' қапшығының индексі ескірген сияқты. Хаттардың жоғалуын болдырмау "
+"үшін индекс қайтадан құрылады. Осының нәтижесінде қапшықта бұрын өшірілген "
+"хаттар қайта пайда болуы мүмкін және хаттардың күй-жай мәліметі де жоғалуы "
+"мүмкін.</p><p> Келешекте бұл жағдайдың қайталанбауы үшін KMail анықтамасының "
+"<a href=\"%1\">Cұрақтар мен жауаптарының (FAQ)</a> тиісті бөлімінін оқыңыз.</"
+"p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8003,7 +7888,7 @@ msgstr ""
 "%1 деген қапшық емес сияқты.\n"
 "Файлды жолдан алып тастаңыз."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8011,7 +7896,7 @@ msgstr ""
 "'%1' қапшығының рұқсаттары дұрыс орнатылмаған;\n"
 "бұл қапшықты қарауға және өзгертуге болатындай етіп қылыңыз."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8021,8 +7906,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8030,7 +7915,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Қапшықты құру жаңылысы"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8131,13 +8016,13 @@ msgstr "&IMAP бүркемесін жөндеу..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Рұқсатыңыз жеткіліксіздігіне байланысты серверде <b>%1</b> "
-"қапшығы құрылмады. Егер сервердің осы орынында ішкі қапшықты құру мүмкіндігіне "
-"ие болам десеңіз, қажетті құқықтарды жүйе әкімшісінен сұраңыз.</qt> "
+"<qt>Рұқсатыңыз жеткіліксіздігіне байланысты серверде <b>%1</b> қапшығы "
+"құрылмады. Егер сервердің осы орынында ішкі қапшықты құру мүмкіндігіне ие "
+"болам десеңіз, қажетті құқықтарды жүйе әкімшісінен сұраңыз.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8268,13 +8153,13 @@ msgstr "%1 қапшығы тек оқу үшін."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Таңдалған %n хатты жоюды қалайсыз ба?"
-"<br>Жойылған хатты қайтаруға болмайды.</qt>"
+"<qt>Таңдалған %n хатты жоюды қалайсыз ба?<br>Жойылған хатты қайтаруға "
+"болмайды.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8326,133 +8211,132 @@ msgstr ""
 "%1 дегенді өзгерту қатесі\n"
 "(Дискіде орын жоқ?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Куәліктің қолтаңбасын сұрау"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Тіркемеден куәлікті құрып, жіберушіге қайтарыңыз."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail желіден тыс режімге ауысты. Барлық желілік тапсырмалар қалғуда"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail желіге қосылды. Барлық желілік тапсырмалар жалғастырылды"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail желіден тыс режімде істеп тұр. Нені қалайсыз?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Желіге қосылу"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Желіден тыс қалу"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Кіріс қапшығыңызға оқу/жазуға рұқсатыңыз жоқ."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "шығыс"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Шығыс қапшығыңызға оқу/жазуға рұқсатыңыз жоқ."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "жіберілген"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Жіберілгендер қапшығыңызға оқу/жазуға рұқсатыңыз жоқ."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "өшірілген"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Өшірілгендер қапшығыңызға оқу/жазуға рұқсатыңыз жоқ."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "жоба жазулар"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Жоба жазу қапшығыңызға оқу/жазуға рұқсатыңыз жоқ."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Өшірілгендер қапшығыңызға оқу/жазуға рұқсатыңыз жоқ."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Соңғы іздеу"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt><i>%4</i> деген қапшық бар ғой. %1 енді өзінің хаттар үшін <i>%5</i> "
-"қапшығын қолданады."
-"<p>%2 <i>%6<i> қапшығының мазмұнын осы қапшыққа жылжыта алады. Сонда <i>%7</i> "
-"қапшығындағыларда атауы бірдейлері болса - олар ауыстырылатын болады."
-"<p><strong>%3 пошта файлдарын қазір жылжытқанды қалайсыз ба?</strong></qt>"
+"қапшығын қолданады.<p>%2 <i>%6<i> қапшығының мазмұнын осы қапшыққа жылжыта "
+"алады. Сонда <i>%7</i> қапшығындағыларда атауы бірдейлері болса - олар "
+"ауыстырылатын болады.<p><strong>%3 пошта файлдарын қазір жылжытқанды "
+"қалайсыз ба?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt><i>%4</i> деген қапшық бар ғой. %1 енді өзінің хаттары үшін <i>%5</i> "
-"қапшығын қолданады."
-"<p>%2 <i>%6<i> қапшығының мазмұнын осы қапшыққа жылжыта алады."
-"<p><strong>%3 пошта файлдарын қазір жылжытқанды қалайсыз ба?</strong></qt>"
+"қапшығын қолданады.<p>%2 <i>%6<i> қапшығының мазмұнын осы қапшыққа жылжыта "
+"алады.<p><strong>%3 пошта файлдарын қазір жылжытқанды қалайсыз ба?</strong></"
+"qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Пошта файлдарын аударып алу керек пе?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail түзелмейтін қатеге тап болып қазір доғарылады"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8463,11 +8347,11 @@ msgstr ""
 "Қатесі:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Өшірілгендерді тазалау"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Барлық тіркелгілердің өшірілгендер қапшығын тазалау керек пе?"
 
@@ -8541,8 +8425,7 @@ msgstr "%1 дегенде %n жаңа хат"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Жаңа хат келді</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8580,8 +8463,8 @@ msgstr "Өшірілгендер қапшығын тазалағыңыз кел�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt><b>%1</b> қапшығынан барлық хаттарды өшірілгендер қапшығына жылжытқыңыз "
 "келгені рас па?</qt>"
@@ -8608,8 +8491,8 @@ msgstr "Іздеуді өшіру"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt><b>%1</b> іздеуді өшіру керек пе? Ондағы бүкіл хаттар әрбірі өз "
 "қапшықтарында қалады - өшірілетін тек сілтемелер.</qt>"
@@ -8624,39 +8507,41 @@ msgstr "<qt><b>%1</b> бос қапшықты өшіргіңіз келгені
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt><b>%1</b> бос қапшықты ішкі қапшықтарымен бірге өшіргіңіз келгені рас па? "
-"Ішкілері бос болмауы мүмкін, олардың мазмұны да бірге жойылады. "
-"<p><b>Байқаңыз</b>, жойылған хаттарды қалпына келтіруге болмайды, себебі олар "
-"өшірілгендер қапшығында сақталмайды.</qt>"
+"<qt><b>%1</b> бос қапшықты ішкі қапшықтарымен бірге өшіргіңіз келгені рас "
+"па? Ішкілері бос болмауы мүмкін, олардың мазмұны да бірге жойылады. "
+"<p><b>Байқаңыз</b>, жойылған хаттарды қалпына келтіруге болмайды, себебі "
+"олар өшірілгендер қапшығында сақталмайды.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt><b>%1</b> қапшығын оның барлық мазмұнымен жойғыңыз келгені рас па?  "
-"<p><b>Байқаңыз</b>, жойылған хаттарды қалпына келтіруге болмайды, себебі олар "
-"өшірілгендер қапшығында сақталмайды.</qt>"
+"<p><b>Байқаңыз</b>, жойылған хаттарды қалпына келтіруге болмайды, себебі "
+"олар өшірілгендер қапшығында сақталмайды.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt><b>%1</b> қапшығын оның барлық ішкі қапшықтарының мазмұнымен бірге жойғыңыз "
-"келгені рас па?"
-"<p><b>Байқаңыз</b>, жойылған хаттарды қалпына келтіруге болмайды, себебі олар "
-"өшірілгендер қапшығында сақталмайды.</qt>"
+"<qt><b>%1</b> қапшығын оның барлық ішкі қапшықтарының мазмұнымен бірге "
+"жойғыңыз келгені рас па?<p><b>Байқаңыз</b>, жойылған хаттарды қалпына "
+"келтіруге болмайды, себебі олар өшірілгендер қапшығында сақталмайды.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Жойылған"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8672,9 +8557,9 @@ msgstr "Барлық ескі хаттарды өшіргіңіз келгені
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Поштада HTML-ды қолдану \"спамға\" қарсылығыңызды осалдатады да, жүйеңізді "
 "қазір мәлім немесе болашақтағы шабуылдау әдістермен бұзу ықтималдығын "
@@ -8691,12 +8576,12 @@ msgstr "HTML-ды қолдану"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"HTML пішіміндегі поштадағы сыртқы сілтемелерді жүктеу \"спамға\" қарсылығыңызды "
-"осалдатады да, жүйеңізді қазір мәлім немесе болашақтағы шабулдау әдістермен "
-"бұзу ықтималдығын ұлғайтады."
+"HTML пішіміндегі поштадағы сыртқы сілтемелерді жүктеу \"спамға\" "
+"қарсылығыңызды осалдатады да, жүйеңізді қазір мәлім немесе болашақтағы "
+"шабулдау әдістермен бұзу ықтималдығын ұлғайтады."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8712,8 +8597,8 @@ msgstr "%1 пошта тізімін сүзгілеу..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "Кеңседе жоқ туралы ескерту мүмкіндігі сервер жақтағы сүзгілеуді баптауына "
@@ -8733,9 +8618,11 @@ msgstr "Куәліктер менеджері жегілмеді. орнатуд
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"GnuPG журналы ашылмады. kwatchgnupg бағдарламасын орнату дұрыстығын тексеріңіз."
+"GnuPG журналы ашылмады. kwatchgnupg бағдарламасын орнату дұрыстығын "
+"тексеріңіз."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9067,8 +8954,7 @@ msgstr "Ті&ркемелерді сақтау..."
 msgid "Appl&y All Filters"
 msgstr "Барлық сүзгілерді қ&олдану"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Сүзгіні қо&лдану"
@@ -9182,7 +9068,6 @@ msgstr "Келесі оқыл&маған хат"
 msgid "Go to the next unread message"
 msgstr "Келесі оқылмаған хатқа өту"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Алдыңғы хат"
@@ -9321,21 +9206,21 @@ msgstr " Инициализациялау..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Хатта поштаны алғаныңыз туралы хабарлама сұралған.\n"
-"Cұрауды елемеуге болады немесе хат жеткен туралы хабарламаны не кәдімгі жауапты "
-"беруге болады."
+"Cұрауды елемеуге болады немесе хат жеткен туралы хабарламаны не кәдімгі "
+"жауапты беруге болады."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Хатта поштаны алғаныңыз туралы хабарлама сұралған.\n"
@@ -9344,8 +9229,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9357,8 +9242,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9370,8 +9255,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9406,17 +9291,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Қабылдау: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Тіркеме: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Тіркемелерді жіберуші ұсынған күйінде көрсету."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9466,45 +9351,37 @@ msgstr "Хат бөлігінің қасиеттері"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Файлдың <em>MIME түрі</em>:</p>"
-"<p>қалыпты жағдайда файлдың MIME түрі автоматты түрде анықталады да, бұл "
-"баптауды өзгертудің қажеті жоқ, дегенмен кейбірде %1 файлдың түрін дұрыс "
-"анықтамауы мүмкін - сонда оны осымен түзеуге болады. </p></qt>"
+"<qt><p>Файлдың <em>MIME түрі</em>:</p><p>қалыпты жағдайда файлдың MIME түрі "
+"автоматты түрде анықталады да, бұл баптауды өзгертудің қажеті жоқ, дегенмен "
+"кейбірде %1 файлдың түрін дұрыс анықтамауы мүмкін - сонда оны осымен түзеуге "
+"болады. </p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Бөліктің өлшемі:</p>"
-"<p>Кейбірде %1 тек жуық өлшемін көрсетеді, себебі өлшемді дәлдеп есептеу көп "
-"уақытты алуы мүмкін, мұндайда өлшем санына \"(жуық)\" деген қосылып "
-"көрсетіледі.</p></qt>"
+"<qt><p>Бөліктің өлшемі:</p><p>Кейбірде %1 тек жуық өлшемін көрсетеді, себебі "
+"өлшемді дәлдеп есептеу көп уақытты алуы мүмкін, мұндайда өлшем санына "
+"\"(жуық)\" деген қосылып көрсетіледі.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Бөліктің файл атауы:</p>"
-"<p>әдетте бұл тіркелген файлдың атауы, бірақ атауын өзгертуге болады. Бұндай "
-"кейбір кезде қажет болады, мысалы, бастапқы атауды алушы оқи не дискіде сақтай "
-"алмаса.</p></qt>"
+"<qt><p>Бөліктің файл атауы:</p><p>әдетте бұл тіркелген файлдың атауы, бірақ "
+"атауын өзгертуге болады. Бұндай кейбір кезде қажет болады, мысалы, бастапқы "
+"атауды алушы оқи не дискіде сақтай алмаса.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9512,16 +9389,14 @@ msgstr "&Сипаттамасы:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Бөліктің сипаттамасы:</p>"
-"<p>Бұл хаттың тақырыбы сияқты, бөлік туралы ақпарат; пошта клиенттерінің көбі "
-"тіркеме таңбашасының қасында осы жолды көрсетеді.</p></qt>"
+"<qt><p>Бөліктің сипаттамасы:</p><p>Бұл хаттың тақырыбы сияқты, бөлік туралы "
+"ақпарат; пошта клиенттерінің көбі тіркеме таңбашасының қасында осы жолды "
+"көрсетеді.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9529,22 +9404,20 @@ msgstr "&Кодтамасы:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Бөліктің тасымалдау кодтамасы:</p>"
-"<p>қалыпты жағдайда бұны өзгертудің қажеті жоқ - %1 MIME түріне қарап оның "
-"әдетті кодтамасын қолданады, дегенмен кейбірде лайықты кодтамасын таңдап хаттың "
-"өлшемін елеулі қысқартуға болады. Мысалы, бинарлық деректері жоқ тек жай "
-"мәтіннен құрылған PostScript файлы үшін әдетті \"base64\" орнына "
-"\"quoted-printable\" таңдағанда, хат өлшемі 25%-ға дейін қысқарады.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Бөліктің тасымалдау кодтамасы:</p><p>қалыпты жағдайда бұны өзгертудің "
+"қажеті жоқ - %1 MIME түріне қарап оның әдетті кодтамасын қолданады, дегенмен "
+"кейбірде лайықты кодтамасын таңдап хаттың өлшемін елеулі қысқартуға болады. "
+"Мысалы, бинарлық деректері жоқ тек жай мәтіннен құрылған PostScript файлы "
+"үшін әдетті \"base64\" орнына \"quoted-printable\" таңдағанда, хат өлшемі "
+"25%-ға дейін қысқарады.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9552,20 +9425,16 @@ msgstr "&Автоматты түрде көрсетуді ұсыну"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Бұны таңдасаңыз осы бөлікті таңбаша ретінде көрсету орнына, хат бетінде өзі "
-"көрсетеді;</p>"
-"<p>техникалық түрде бұл  <em>Content-Disposition</em> "
-"айдарының өрісінде әдеттегі \"attachment\" дегеннің орнына \"inline\" дегенді "
-"келтіріп жүзеге асырады.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Бұны таңдасаңыз осы бөлікті таңбаша ретінде көрсету орнына, хат "
+"бетінде өзі көрсетеді;</p><p>техникалық түрде бұл  <em>Content-Disposition</"
+"em> айдарының өрісінде әдеттегі \"attachment\" дегеннің орнына \"inline\" "
+"дегенді келтіріп жүзеге асырады.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9573,15 +9442,13 @@ msgstr "Осы бөлікті қ&олтаңбалау"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Егер хаттың бөлігін қолтаңбалағыңыз келсе осы параметрді таңдаңыз.</p>"
-"<p>Қолтаңбалау үшін қолданыстағы іс-әлпетінде таңдалған кілт қолданылады.</p>"
-"</qt>"
+"<qt><p>Егер хаттың бөлігін қолтаңбалағыңыз келсе осы параметрді таңдаңыз.</"
+"p><p>Қолтаңбалау үшін қолданыстағы іс-әлпетінде таңдалған кілт қолданылады.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9589,13 +9456,11 @@ msgstr "Осы бөлікті ши&фрлау"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Егер хаттың осы бөлігін шифрлағыңыз келсе, осы параметрді таңдаңыз;</p>"
-"<p>бөлік хатты алушыларға шифрланып барады.</p></qt>"
+"<qt><p>Егер хаттың осы бөлігін шифрлағыңыз келсе, осы параметрді таңдаңыз;</"
+"p><p>бөлік хатты алушыларға шифрланып барады.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9609,15 +9474,12 @@ msgstr "POP сүзгі"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"POP тіркелгісінде сүзгіден өтпейтін хаттар бар: <b>%1</b>"
-"<p> Көрсетілген хаттардың өлшемі осы тіркелгі үшін орнатылған жоғарғы шегінен "
-"асып тұр."
+"POP тіркелгісінде сүзгіден өтпейтін хаттар бар: <b>%1</b><p> Көрсетілген "
+"хаттардың өлшемі осы тіркелгі үшін орнатылған жоғарғы шегінен асып тұр."
 "<br>Керек батырмаларды басып, қалаған амалды таңдауыңызға болады."
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9875,40 +9737,39 @@ msgstr "TDE эл.пошта клиенті."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Қапшық мазмұнын алу</h2>"
-"<p>Күте тұрыңыз . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Қапшық мазмұнын алу</h2><p>Күте тұрыңыз . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Желіден тыс</h2>"
-"<p>KMail желіден тыс режімде істеп тұр. Желіге қосылу үшін <a "
-"href=\"kmail:goOnline\">мұнда</a> түртіңіз . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Желіден тыс</h2><p>KMail желіден тыс режімде "
+"істеп тұр. Желіге қосылу үшін <a href=\"kmail:goOnline\">мұнда</a> "
+"түртіңіз . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9916,17 +9777,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>KMail %1: қош келдіңіз</h2>"
-"<p>KMail деген - TDE пошта клиенті. Ол Интернет пошта, яғни MIME, SMTP, POP3, "
-"IMAP стандарттарымен толық үйлесімді бағдарлама.</p>\n"
-"<ul>"
-"<li>KMail-дің көптеген пайдалы қасиеттері бар, олар толық <a href=\"%2\">"
-"құжаттамасында</a></li> сипатталған.\n"
+"<h2 style='margin-top: 0px;'>KMail %1: қош келдіңіз</h2><p>KMail деген - TDE "
+"пошта клиенті. Ол Интернет пошта, яғни MIME, SMTP, POP3, IMAP "
+"стандарттарымен толық үйлесімді бағдарлама.</p>\n"
+"<ul><li>KMail-дің көптеген пайдалы қасиеттері бар, олар толық <a href="
+"\"%2\">құжаттамасында</a></li> сипатталған.\n"
 "<li><a href=\"%3\">KMail мекен парағында</a> KMail-дің жаңа нұсқалары туралы "
 "ақпараттар келтірілген</li></ul>\n"
 "%8\n"
-"<p>Төменде KMail-дің осы нұсқасының кейбір жаңа мүмкіндіктері келтірілген (TDE "
-"%5 құрамына кіретін KMail %4 нұсқасымен салыстырғанда):</p>\n"
+"<p>Төменде KMail-дің осы нұсқасының кейбір жаңа мүмкіндіктері келтірілген "
+"(TDE %5 құрамына кіретін KMail %4 нұсқасымен салыстырғанда):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9935,15 +9795,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail жасаушылар тобы</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9989,7 +9847,8 @@ msgstr "Қарайтын тіркеме: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Тіркеменің мазмұнында бинарлық деректер бар. Алғашқы %n таңба "
@@ -10017,12 +9876,14 @@ msgstr "Тіркемені ашу керек пе?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10044,6 +9905,58 @@ msgstr "(кез келген шартпен сәйкес келеді)"
 msgid "(match all of the following)"
 msgstr "(барлық шартпен сәйкес келеді) "
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Оқылған"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Ескі"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Жойылған"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Жауап берілген"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Басқаға жіберілген"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Кезекке қойылған"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Жіберілген"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Каралған"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Елемеген"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Спам"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Құнды"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Аяқталмаған"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Тіркемесі бар"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10128,21 +10041,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Жіберілген \"%1\" хатты \"шығыс\" қапшығынан \"жіберілген\" қапшығына "
 "жылжытқанда жаңылыс пайда болды.\n"
-"Мүмкін, дискіде бос орын немесе жазуға рұқсат жоқ. Мәселені шешіп хатты қолмен "
-"жылжытыңыз."
+"Мүмкін, дискіде бос орын немесе жазуға рұқсат жоқ. Мәселені шешіп хатты "
+"қолмен жылжытыңыз."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Жіберушінің адресін келтірмей, хаттарды жіберу мүмкін емес.\n"
 "Баптау диалогының Іс-әлпеттер бөлімінде '%1' іс-әлпетінің эл.пошта адресін "
@@ -10169,8 +10082,8 @@ msgstr "Жіберу әрекеті басталуда..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Барлық кезектегі эл.поштаны шифрланбаған түрде жіберуді таңдадыңыз, "
 "жалғастыруды қалайсыз ба? "
@@ -10197,8 +10110,9 @@ msgstr "Кезектегі (кейбір) хаттарды жіберу қате
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10215,19 +10129,15 @@ msgstr "Жіберу доғарылды."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Жіберу жаңылысы:</p>"
-"<p>%1</p>"
-"<p>Маселені шешкенше (мысалы, адресті дұрыстағанша) немесе хабарды 'шығыс' "
-"капшығынан өшіріп тастағанша, хат 'шығыс' капшығында қалады.</p>"
-"<p>Қолданған тасымалдау протоколы:  %2</p> "
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Жіберу жаңылысы:</p><p>%1</p><p>Маселені шешкенше (мысалы, адресті "
+"дұрыстағанша) немесе хабарды 'шығыс' капшығынан өшіріп тастағанша, хат "
+"'шығыс' капшығында қалады.</p><p>Қолданған тасымалдау протоколы:  %2</p> "
 "<p>Қалған хаттарды жіберуді қалайсыз ба?</p>"
 
 #: kmsender.cpp:730
@@ -10246,8 +10156,9 @@ msgstr "Жіберуді д&оғару"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10295,40 +10206,40 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 осы компьютерде жегілген және басқа мониторда орындалуда сияқты. Егер %2 бір "
-"данадан артық жегілетін болса пошта жоғалуы мүмкін. %1 деген орындалып жатқан "
-"болмаса ғана оны іске қосыңыз."
+"%1 осы компьютерде жегілген және басқа мониторда орындалуда сияқты. Егер %2 "
+"бір данадан артық жегілетін болса пошта жоғалуы мүмкін. %1 деген орындалып "
+"жатқан болмаса ғана оны іске қосыңыз."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 осы компьютерде жегілген және басқа мониторда орындалуда сияқты. %1 және %2 "
-"бірмезгілде жегілетін болса пошта жоғалуы мүмкін. %1 деген орындалып жатқан "
-"болмаса ғана %2 дегенді іске қосыңыз."
+"%1 осы компьютерде жегілген және басқа мониторда орындалуда сияқты. %1 және "
+"%2 бірмезгілде жегілетін болса пошта жоғалуы мүмкін. %1 деген орындалып "
+"жатқан болмаса ғана %2 дегенді іске қосыңыз."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 деген %2 дегенде жегілген сияқты. Егер %1 бір данадан артық жегілетін болса "
-"пошта жоғалуы мүмкін. %2 деген орындалып жатқан болмаса ғана %1 дегенді іске "
-"қосыңыз."
+"%1 деген %2 дегенде жегілген сияқты. Егер %1 бір данадан артық жегілетін "
+"болса пошта жоғалуы мүмкін. %2 деген орындалып жатқан болмаса ғана %1 "
+"дегенді іске қосыңыз."
 
 #: kmstartup.cpp:222
 #, fuzzy
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 деген %2 дегенде жегілген. %1 және %2 бірмезгілде жегілетін болса пошта "
 "жоғалуы мүмкін. %1 деген %3 дегенде орындалып жатқан болмаса ғана %2 дегенді "
@@ -10343,6 +10254,10 @@ msgstr "%1 дегенді жегу"
 msgid "Exit"
 msgstr "Шығу"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Жаңа хаттары бар "
@@ -10367,15 +10282,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet әмияні қол жеткізбейді. Парольдерді сақтау үшін TDEWallet-ті қолдану "
-"өте лазым.\n"
-"Бірақ KMail парольді өзінің баптау файлында да сақтай алады. Пароль оқылмайтын "
-"пішімде сақталады, бірақ баптау файлына қатынай алынатындар пароліңіздің шифрін "
-"шеше алуы ықтимал.\n"
+"TDEWallet әмияні қол жеткізбейді. Парольдерді сақтау үшін TDEWallet-ті "
+"қолдану өте лазым.\n"
+"Бірақ KMail парольді өзінің баптау файлында да сақтай алады. Пароль "
+"оқылмайтын пішімде сақталады, бірақ баптау файлына қатынай алынатындар "
+"пароліңіздің шифрін шеше алуы ықтимал.\n"
 "'%1' тіркелгісін паролін баптау файлында сақтауын қалайсыз ба?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10444,8 +10360,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Эл.поштаны жіберудің алдында жергілікті орындалатын команда. Бұны, мысал үшін, "
-"ssh туннелін орнату үшін қолдануға болады. Қажеті жоқ болса, бос қалдырыңыз."
+"Эл.поштаны жіберудің алдында жергілікті орындалатын команда. Бұны, мысал "
+"үшін, ssh туннелін орнату үшін қолдануға болады. Қажеті жоқ болса, бос "
+"қалдырыңыз."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10453,12 +10370,12 @@ msgstr "Сервер аутентификациялауды &талап етед
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Егер поштаны қабылдаудың алдында SMTP сервер аутентификациялауды талап ететін "
-"болса, осы құсбелгіні қойыңыз. Бұндайды 'Authenticated SMTP' немесе ASMTP "
-"дейді."
+"Егер поштаны қабылдаудың алдында SMTP сервер аутентификациялауды талап "
+"ететін болса, осы құсбелгіні қойыңыз. Бұндайды 'Authenticated SMTP' немесе "
+"ASMTP дейді."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10478,15 +10395,13 @@ msgstr "Серверге қалаған хост атауы жі&берілсі�
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"KMail пошта серверде идентификациялау үшін басқа хост атауын қолданатын болса, "
-"осы құсбелгіні қойыңыз."
-"<p>Бұл әдеттегі хост атауын жіберуге болмайтын немесе компьютеріңіздің шын "
-"атауы жасырылатын жағдайларда қолданылады."
+"KMail пошта серверде идентификациялау үшін басқа хост атауын қолданатын "
+"болса, осы құсбелгіні қойыңыз.<p>Бұл әдеттегі хост атауын жіберуге болмайтын "
+"немесе компьютеріңіздің шын атауы жасырылатын жағдайларда қолданылады."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10516,8 +10431,8 @@ msgstr "Тек жергілікті файлдар қолдау табады."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Хост өрісі бос болмау керек. Атауын немесе SMTP серверінің IP-адресін "
 "келтіріңіз."
@@ -10532,10 +10447,10 @@ msgstr "%1 қапшығының ақтару кездегі қатесі: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10756,35 +10671,27 @@ msgstr "Хатты өңд&еу"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Шифрлау плагин модулі қайтарған мәлімет түсініксіз, бәлкім, плагин модулі "
-"зақымданған. </p>"
-"<p>Жүйе әкімшісімен байланысыңыз.</p></qt>"
+"<qt> <p>Шифрлау плагин модулі қайтарған мәлімет түсініксіз, бәлкім, плагин "
+"модулі зақымданған. </p><p>Жүйе әкімшісімен байланысыңыз.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Белсенді шифрлау плагин модулі табылмады және құрамындағы OpenPGP модулі де "
-"істемейді.</p>"
-"<p>Бұл жағдайдан шығудың екі жолы бар:</p>"
-"<ul>"
-"<li><em>немесе</em>Баптау ->KMail баптаулары->Плагин модульдер диалогын "
-"қолданып крипто модулін белсендіру арқылы.</li>"
-"<li><em>немесе</em> жаңағы диалогының Іс-әлпеті бөлігіндегі Қосымша қойындыны "
-"қолданып дәстүрлі OpenPGP баптауын таңдау арқылы.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Белсенді шифрлау плагин модулі табылмады және құрамындағы OpenPGP модулі "
+"де істемейді.</p><p>Бұл жағдайдан шығудың екі жолы бар:</"
+"p><ul><li><em>немесе</em>Баптау ->KMail баптаулары->Плагин модульдер "
+"диалогын қолданып крипто модулін белсендіру арқылы.</li><li><em>немесе</em> "
+"жаңағы диалогының Іс-әлпеті бөлігіндегі Қосымша қойындыны қолданып дәстүрлі "
+"OpenPGP баптауын таңдау арқылы.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10796,8 +10703,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus протоколында \"x-encrypt\" функциясы жоқ. Бұл қате туралы "
 "жасаушыларына хабарлаңыз."
@@ -10807,8 +10714,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\"x-encrypt\" функциясын шақыру параметрлері күткенге сәйкес келмейді. Бұл қате "
-"туралы жасаушыларына хабарлаңыз."
+"\"x-encrypt\" функциясын шақыру параметрлері күткенге сәйкес келмейді. Бұл "
+"қате туралы жасаушыларына хабарлаңыз."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -10816,16 +10723,16 @@ msgstr "Chiasmus шифрлау қатесі"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Chiasmus протоколы күтпеген мәнін қайтарды. \"x-encrypt\" функциясы байттар "
 "жиынын қайтармады. Бұл қате туралы жасаушыларына хабарлаңыз."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Ендірілген OpenPGP қолтаңбалау/шифрлау тіркемеге таратылмайды.\n"
@@ -10880,8 +10787,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Хатты қолтаңбалағыңыз келді, бірақ қолданыстағы іс-әлпетіңізде қолтаңбалау үшін "
-"жарамды кілт бапталмаған."
+"Хатты қолтаңбалағыңыз келді, бірақ қолданыстағы іс-әлпетіңізде қолтаңбалау "
+"үшін жарамды кілт бапталмаған."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -10898,7 +10805,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Хаттың кейбір бөліктері қолтаңбаланбаған.\n"
-"Жарты-жарым қолтаңбаланған хатты жіберу сайттың ережесіне қайшы келуі мүмкін.\n"
+"Жарты-жарым қолтаңбаланған хатты жіберу сайттың ережесіне қайшы келуі "
+"мүмкін.\n"
 "Хаттың барлық бөліктері қолтаңбалансын ба?"
 
 #: messagecomposer.cpp:827
@@ -10937,12 +10845,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Алушының шифрлауды қалау-қаламауына байланысты, бұл хатты шифрлау не шифрламау "
-"туралы Сізден сұралады.\n"
+"Алушының шифрлауды қалау-қаламауына байланысты, бұл хатты шифрлау не "
+"шифрламау туралы Сізден сұралады.\n"
 "Бұл хат шифрлансын ба?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -10975,11 +10883,12 @@ msgstr "Шифрла&мау"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Бұл хатты шифрлап жіберуді және көшірмесін өзіңізге шифрлауды қаладыңыз, бірақ "
-"қолданыстағы іс-әлпетіңізде бапталған жарамды шифрлау кілттері жоқ."
+"Бұл хатты шифрлап жіберуді және көшірмесін өзіңізге шифрлауды қаладыңыз, "
+"бірақ қолданыстағы іс-әлпетіңізде бапталған жарамды шифрлау кілттері жоқ."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -10988,8 +10897,8 @@ msgstr "Шифрламай жіберілсін бе?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Хаттың кейбір бөліктері шифрланбаған.\n"
@@ -11005,8 +10914,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Хат шифрланбаған.\n"
-"Жарты-жарым шифрланған хатты жіберу сайттың ережесіне қайшы келуі және/немесе "
-"құпиялар жарияланып кетуі мүмкін.\n"
+"Жарты-жарым шифрланған хатты жіберу сайттың ережесіне қайшы келуі және/"
+"немесе құпиялар жарияланып кетуі мүмкін.\n"
 "Хат шифрлансын ба?"
 
 #: messagecomposer.cpp:955
@@ -11017,84 +10926,81 @@ msgstr "Хаттың барлық бөлігі &шифрлансын"
 msgid "Unencrypted Message Warning"
 msgstr "Шифрланбаған туралы ескерту"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Қате: криптомодулі кейбір шифрланған деректерді қайтармады.</p>"
-"<p>Қате туралы хабарлаңыз:"
-"<br>%2</p></qt>"
+"<qt><p>Қате: криптомодулі кейбір шифрланған деректерді қайтармады.</"
+"p><p>Қате туралы хабарлаңыз:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qr>Таңдалған кодтамаға кейбір таңбалар кірмейді."
-"<br>"
-"<br>Хат осы күйіде жіберле берсін бе?</qt>"
+"<qr>Таңдалған кодтамаға кейбір таңбалар кірмейді.<br><br>Хат осы күйіде "
+"жіберле берсін бе?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Кейбір таңбалар жоғалып кетеді"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Таңбалар жоғала берсін"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Кодтамасын өзгерту"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Хат қолтаңбаланған жоқ, себебі таңдалған протокол қолтаңбалауды қолдамайтын "
-"сияқты. Мұндай болуы тиіс емес, сондықтан қате туралы жасаушыларына хабарлаңыз."
+"сияқты. Мұндай болуы тиіс емес, сондықтан қате туралы жасаушыларына "
+"хабарлаңыз."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Хат қолтаңбаланған жоқ, себебі таңдалған протокол қолтаңбалауды қолдамайтын "
-"сияқты. Мұндай болуы тиіс емес, сондықтан қате туралы жасаушыларына хабарлаңыз."
+"сияқты. Мұндай болуы тиіс емес, сондықтан қате туралы жасаушыларына "
+"хабарлаңыз."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Хат шифрланған жоқ, себебі таңдалған протокол шифрлауды қолдамайтын сияқты. "
 "Мұндай болуы тиіс емес, сондықтан қате туралы жасаушыларына хабарлаңыз."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Хат қолтаңбаланып шифрланған жоқ, себебі таңдалған протокол қолтаңбалау мен "
 "қатар шифрлауды қолдамайтын сияқты. Мұндай болуы тиіс емес, сондықтан қате "
@@ -11119,15 +11025,15 @@ msgstr "Пошта жәшігінің &пішімі:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Пошта жәшігінің пішімін таңдаңыз: бұл әрбір хат бөлек бір файлда сақталатын "
-"қапшық (maildir) немесе барлық хаттарды тізбектеген бір үлкен файл (mbox) болуы "
-"мүмкін. Әдетте KMail maildir түрін қолданады, бұны өзгерту қажеттілігі сирек "
-"туады. Күдіктенсеңіз, бар түрде қалдырыңыз."
+"қапшық (maildir) немесе барлық хаттарды тізбектеген бір үлкен файл (mbox) "
+"болуы мүмкін. Әдетте KMail maildir түрін қолданады, бұны өзгерту қажеттілігі "
+"сирек туады. Күдіктенсеңіз, бар түрде қалдырыңыз."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11136,12 +11042,12 @@ msgstr "Қапшықтың &мазмұны:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Қапшықтың мазмұнын таңдаңыз: пошта ма, әлде бірлескен жұмысты ұйымдастыруға "
-"арналған тапсырмалар мен жазбалар ма? Әдетті таңдау - пошта. Күдіктенсеңіз, бар "
-"түрде қалдырыңыз."
+"арналған тапсырмалар мен жазбалар ма? Әдетті таңдау - пошта. Күдіктенсеңіз, "
+"бар түрде қалдырыңыз."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11179,8 +11085,7 @@ msgstr "Қолтаңбаның әртүрлі нәтижелері"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Шифрлау тетігі мәтінді деректерін қайтармады."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Күй-жайы: "
 
@@ -11209,10 +11114,11 @@ msgstr "%1 плагин модулі табылмады."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Хат қолтаңбаланған, бірақ қолтаңбасының шындылығы тексерілмеді.<br />Себебі: %1"
+"Хат қолтаңбаланған, бірақ қолтаңбасының шындылығы тексерілмеді.<br />Себебі: "
+"%1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11248,26 +11154,26 @@ msgstr "%1 шифрлау плагин модулі хаттардың шифр�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Ескерту:</b>Бұл HTML-дегі хатта сыртқы кескіндерге және т.б. сілтемелер бар. "
-"Құпиялық/қауіпсіздік себептермен сыртқы сілтемелер жүктелмеді. Егер хат "
+"<b>Ескерту:</b>Бұл HTML-дегі хатта сыртқы кескіндерге және т.б. сілтемелер "
+"бар. Құпиялық/қауіпсіздік себептермен сыртқы сілтемелер жүктелмеді. Егер хат "
 "жіберушісі сенімді болса, <a href=\"kmail:loadExternal\">мұнда түртіп</a> "
 "осы хаттағы сыртқы сілтемелерін жүктеп алуға болады."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Ескерту:</b> Бұл хат HTML пішімінде. Қауіпсіздік себептермен хат коды жай "
-"мәтін түрінде көрсетіледі.<br />Егер хат жіберушісі сенімді болса, <a "
-"href=\"kmail:showHTML\">мұнда түртіп</a> осы хатты HTML пішімінде көрсетуге "
+"мәтін түрінде көрсетіледі.<br />Егер хат жіберушісі сенімді болса, <a href="
+"\"kmail:showHTML\">мұнда түртіп</a> осы хатты HTML пішімінде көрсетуге "
 "болады."
 
 #: objecttreeparser.cpp:1227
@@ -11517,8 +11423,8 @@ msgstr "сақталған: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Қолтаңбалау үшін қолданылған %1 дегенде пошта адресі сақталмаған, сонымен %2 "
 "жіберушінің адресімен салыстыру мүмкін емес."
@@ -11637,10 +11543,11 @@ msgstr "Kioslave қатесінің хабарламасы"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "POP3 серверіңіз UIDL командасын қолдамайды. Бұл сервердегі хаттардың қайсы "
 "қаралғаның нақты анықтау үшін қажет.\n"
@@ -11660,7 +11567,8 @@ msgstr "%1 дегеннен %n хабар алынды. Тасымалдау а�
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "%5@%6 үшін келген жалпы %2 хаттан %1-хат алынуда (%4 Кб мөлшерінен %3 Kб, "
 "серверде жалпы қалғаны - %7 Кб)."
@@ -11680,1836 +11588,14 @@ msgstr "Сервердің жауабы дұрыс емес"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Серверіңіз TOP командасын қолдамайды. Сондықтан үлкен хаттарды жүктеп алудың "
 "алдында айдарларын көшіріп алу мүмкін емес."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Өту"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Қ&апшық"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Хат"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Арнайы жауап"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Басқаға жолдау"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML құралдары"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Қолтаңбалау"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Хаттар &автоматты түрде қолтаңбалансын"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Құсбелгісі қойылса, барлық жіберілетін хаттар әдетті түрде қолтаңбаланады. "
-"Әрине, қаласаңыз, әрбір хатты жекелеп қолтаңбаламай жіберуіңізге болады."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Шифрлау"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Құсбелгісі қойылса, хат/файл алушының ашық кілтімен ғана емес өзіңіздің "
-"кілтіңізбен де шифрланады. Бұл біраз уақыттан кейін хаттың/файлдың шифрін шешу "
-"мүмкіндігі болу үшін істеледі."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Шифрланған/қол&таңбаланған мәтін көрсетілсін"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Шифрлаудың және қолтаңбалаудың нәтижесі хатты жіберердің алдында жеке терезеде "
-"көрсетіледі. Сонымен, шифрлау тегіс өткеніне көз жетізуге болады."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Жіберілген хаттар &шифрланған түрде сақталсын"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Хаттар шифрланған түрінде сақтау үшін құсбелгісін қойыңыз"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Хаттар шифрланған түрінде сақталсын</h1>\n"
-"Бұл құсбелгі қойылса, хаттар жіберілген шифрланған түрінде сақталады. Бұл онша "
-"жақсы амал емес, себебі қажетті куәліктердің мерзімі біткен соң, бұл хаттарды "
-"оқи алмайсыз.\n"
-"<p>\n"
-"Сонда да, жергілікті ережелер бойынша осылай сақтау керек болып қалатын "
-"жағдайлар болады. Күмәндансаңыз, жергілікті әкімшісімен ақылдасыңыз.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Әрқашанда шифрлау кілттер &таңдауы көрсетілсін"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Құсбелгісі қойылса, бағдарлама шифрлау үшін таңдауға әрқашанда барлық "
-"кілттердің тізімін көрсетеді. Әйтпесе, ол осы кілт таңдауын, тек жарайтын кілт "
-"таба алмағанда немесе жарайтын кілттер бірнеше болғанда ғана ұсынады."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Мүмкіндігі болса, хаттар &автоматты түрде шифрлансын"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Құсбелгісі қойылса, барлық шифрлауы мүмкін жіберілетін хаттарыңыз шифрланады, "
-"әрине әрбір жеке хатты қалауыңыз бойынша шифрламай жіберуге де болады."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "&Жоба жазулар қолтаңбаланбасын/шифрланбасын"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Кімге: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Көшірмесі: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Жалпы"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Жауап адресі"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Б&арлығына жауап беру..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Басқаға жолдау"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Тіркесімі:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Қапшық қасиеттері"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Қапшықтың мазмұны - &тарату тізімі"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Тізім &адресі:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Кә&дімгі:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Оқыл&маған:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Хаттың мерзімі"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Ескіру мерзімі:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "&Оқылғанды ескі деу"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Ес&кіру мерзімі:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "&Оқылмағанды ескі деу"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Күн"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Апта"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Ай"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Қосымша"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Жіберушінің іс-әлп&еті:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Сақтау пішімі:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Тізім көрсететіні:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Куәліктер CRL тізімінен тексерілсін"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Бұл параметр таңдалса, S/MIME куәліктері CRL тізімдерде бар-жоғы тексеріледі."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Куәліктер желіде тексерілсін (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Құсбелгісі қойылса, S/MIME куәліктері Куәліктердің желілік күй-жай протоколы "
-"(Online Certificates Status Protocol, OCSP) арқылы тексеріледі. Төменде OCSP "
-"қызметінің адресін келтіріңіз."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Куәліктерді желіде тексеру"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP қызметінің URL адресі:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Куәлікті желіде тексеретін (OCSP қызметінің) серверінің адресі. Әдетте URL "
-"адресі http:// деп басталады."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP қызметінің қолтаңбасы:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Куәліктер қызметінің URL адресін елемеу"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Куәліктер ережесі тексерілмесін"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Әдетте қуәліктер ережесін қолдануға рұқсаттың бар екендігін тексеру үшін GnuPG  "
-"~/.gnupg/policies.txt файлын қолданады. Егер бұл параметрді таңдасыңыз ережелер "
-"тексерілмейді."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "CRL қолданылмасын"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Құсбелгісі қойылса, S/MIME куәліктерін тексергенде күші жойылған куәліктердің "
-"тізімі (CRL) қолданбайды."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Куәлікті шығараттындардың жоқ куәліктері алынсын"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Құсбелгісі қойылса, куәлікті шығарушының жоқ куәліктері алынады (CRL тізімдер "
-"мен OCSP екеуі де қолданылады)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP сұраулары"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "HTTP сұраулары болмасын"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "S/MIME үшін HTTP мүлдем рұксат етілмесін."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP сұрау үшін қолданатын прокси: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Қолданатын жүйелік HTTP прокси:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Құсбелгісі қойылса, оң жақта көрсетілген HTTP (ортаның http_proxy айнымалысынан "
-"алынған) прокси сервері кез кеген HTTP сұрауы үшін қолданылады."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Мұнда S/MIME-мен істегенде барлық HTTP сұрауы үшін қолданылатын  "
-"прокси-сервердің адресін келтіріңіз. Бұл сервер:порт түрінде келтіріледі, "
-"мысалы: myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "HTTP-колданатын CRL тарату орталықтары еленбесін"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Күші жойылған куәліктер тізімінің (CRL) орналасуын аңықтағанда,  тексерілетін "
-"куәлікте \"CRL тарату орталығы\" (CRL Distribution Point, DP) дегендер болады, "
-"ол URL адрестеріне бағыттайтын сілтемелер. Алғашқы табылған DP жазуы "
-"қолданылады.  Бұл параметр таңдалса, лайықты DP-ні іздегенде "
-"HTTP-қолданатындары еленбейді."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP сұраулары"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "LDAP сұраулары орындалмасын"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "S/MIME үшін LDAP мүлдем қолданылмасын."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "LDAP-колданатын CRL тарату орталықтары еленбесін"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Күші жойылған куәліктер тізімінің (CRL) орналасуын аңықтағанда,  тексерілетін "
-"куәлікте \"CRL тарату орталығы\" (CRL Distribution Point, DP) дегендер болады, "
-"ол URL адрестеріне бағыттайтын сілтемелер. Алғашқы табылған DP жазуы "
-"қолданылады.  Бұл параметр таңдалса, лайықты DP-ні іздегенде "
-"LDAP-қолданатындары еленбейді."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP сұраулары үшін негізгі сервері:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"LDAP сервері көрсетілсе, барлық сұраулар алдымен соған жіберіледі. Нақты "
-"айтқанда, бұл параметр LDAP URL адресінде көрсетілгеннен басымды, сонымен "
-"URL-де сервердің адресі не порты көрсетілмегенде қолданылады. Басқа LDAP "
-"серверлері тек егер \"прокси\" арқылы байланыс болмаса ғана қолданылады.\n"
-"Серверді \"ХОСТ\" немесе \"ХОСТ:ПОРТ\" түрінде көрсетіледі. Егер порт "
-"көрсетілмесе, онда (стандартты LDAP порты) 489 порты қолданылады."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "Қ&осу..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Бірлескен жұмыс"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Қаріп параметрлерін ысыру"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "шектеусіз"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Қолтаңба параметрлері"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Жіб&ерушіге жауап беру:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Басқаға жіберілген хат"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Қолтаңбалан&баған хатты жібергенде ескертілсін"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Қолтаңбаланбаған хатты жібергенде ескертілсін десеңіз осыны таңдаңыз."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Қолтаңбаланбаған хатты жібергенде ескерту</h1>\n"
-"Құсбелгісі қойылса, қолтаңбаланбаған хатты не оның бөлігін жіберу әрекеті "
-"туралы ескертіледі.\n"
-"<p>\n"
-"Тұтастығын сақтау үшін осы параметрдің қосылып тұрғаны жөн.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Шифрланбаған хаттарды жібергенде &ескертілсін"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Шифрланбаған хаттарды жібергенде ескерту жасалсын десеңіз осы құсбелгіні "
-"қойыңыз."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Шифрланбаған хаттарды жібергенде ескертілсін</h1>\n"
-"Құсбелгісі қойылса, хатты не оның бөлігін шифрланбаған түрде жібергенде ескерту "
-"жасалады.\n"
-"<p>\n"
-"Тұтастығын сақтау үшін осы параметрдің қосылып тұрғаны жөн.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Куәлікте &алушының эл.пошта адресі болмаса, ескертілсін"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Куәлікте алушының адресі болмаса ескерту жасалсын десеңіз осы құсбелгіні "
-"қойыңыз"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Куәлікте алушының адресі болмаса, ескертілсін</h1>\n"
-"Құсбелгісі қойылса, қолтаңбалауға қолданылатын куәлікте алушының эл.пошта "
-"адресі жоқ болған жағдайда ескерту жасалады.\n"
-"<p>Қауіпсіздікті жоғарлатуды көздесеңіз бұл параметрін таңдап қою жөн.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Куәлік/кілттердің мерзімі бітетіні неше күн бұрын ескертілсін"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Қолтаңбалау үшін"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Шифрлау үшін"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " күн"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Мұнда күндер санын таңдаңыз"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1> Қолтаңба куәліктің мерзімі жақында бітетін болса, ескерту</h1>\n"
-"Қолтаңбалау куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын "
-"төменгі шегін таңдаңыз.\n"
-"<p>\n"
-"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Куәліктің мерзімі жақында бітетіні туралы ескертілсін</h1>\n"
-"Шифрлау куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын төменгі "
-"шегін таңдаңыз.\n"
-"<p>\n"
-"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Тізбектегі куәліктің мерзімі жақында бітетін болса, ескерту</h1>\n"
-"Тізбектегі бүкіл куәліктер күшінде болып, ешбір ескертусіз қолданатын күн санын "
-"төменгі шегін таңдаңыз.\n"
-"<p>\n"
-"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>CA куәлігінің мерзімі жақында бітетін болса, ескерту</h1>\n"
-"CA куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын төменгі шегін "
-"таңдаңыз.\n"
-"<p>\n"
-"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
-"</qt></qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Түбір куәлігінің мерзімі жақында бітетін болса, ескерту</h1>\n"
-"Түбір куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын төменгі "
-"шегін таңдаңыз.\n"
-"<p>\n"
-"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
-"</qt></qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Түбір куәліктер үшін:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Аралық СА куәліктері үшін:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Пайдаланушылардың куәлік/кілттер үшін: "
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Барлық \"Ендігәрі сұралмасын\" деген ескертулер қайта болсын"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Қа&пшықтың мазмұны:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Кезектегі хат тексеріске жіберілсін"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Шығыс қапшықтағы хаттар тексеріске қолмен жіберілсін бе әлде бірден "
-"автоматты түрде жіберілсін бе, таңдаңыз.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Қапшықта серверге әлі жүктеп берілмеген жаңа хаттар бар, бірақ оларды жүктеп "
-"беруге рұқсаттар жеткілікті емес секілді. Серверге хаттарды тапсыру "
-"рұқсаттарыңызды түгелдеу үшін жүйе әкімшісімен байланысыңыз немесе ол жаңа "
-"хаттарды қапшықтан алып тастаңыз.</p> "
-"<p>Бұл хаттарды басқа қапшыққа ауыстырғыңыз келеді ме?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Қапшық таңдау диалогындағы ең жиі таңдалған қапшық."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Жүйелік сөредегі таңбашаны көрсету ережесі"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Пошта келгені туралы толық құлақтандыру"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Құсбелгісі қойылса, әрбір қапшықтың атауымен қатар ондағы жаңа хаттар саны "
-"көрсетіледі. әйтпесе, тек 'Жаңа хат келді' деген хабарлама көрсетіледі."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Сыртқы &өңдегіші:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Құрастырғышының орына с&ыртқы өңдегіш қолданылсын"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Бірлескен жұмыс рұқсат етілсін"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "From:/To: айдарларды жауаптан жауапқа көшірмелеу"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook бағдарламасында бірқатар кемістіктер бар, мысалы  iCalendar "
-"стандартын жүзеге асыруда. Бұл параметр осындай бір қатені айналып шығу үшін. "
-"Егер Outlook пайдаланушылармен хат алмасқанда олар жауабыңызды ала алмаса, осы "
-"параметрді орнатып көріңіз."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Бірлескен жұмыс шақырулары хат бетінде жіберілсін"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook бағдарламасында бірқатар кемістіктер бар, мысалы  iCalendar "
-"стандартын жүзеге асыруда. Бұл параметр осындай бір қатені айналып шығу үшін. "
-"Егер Outlook пайдаланушылармен хат алмасқанда олар шақыруларыңызды ала алмаса, "
-"осы параметрді орнатып көріңіз."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Шақыру автоматты түрде жіберілсін"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Осы құсбелгі қойылса, шақыруды жібергенде құрастырғыш терезесі көрсетілмей, "
-"барлық шақыру поштасы автоматты түрде жіберіледі. Егер жібермек поштаны "
-"көргіңіз келсе, осы құсбелгіні алып тастаңыз. Бірақ көрсетілетін мәтін "
-"iCalendar пішімінде болады, ол қолмен өзгертуге арналмаған."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Бұл параметр Kontact қолданбасының (KOrganizer, KAddressBook және KNotes) "
-"жазуларын сақтауға мүмкіндік береді.</p>"
-"<p>Бұл параметрді қоссаңыз көрсетілген қолданбаларға IMAP ресурстарды "
-"қолданатын қылу керек. Бұл TDE Басқару орталығында орнатылады</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Әдетте IMAP ресурстар сақталған қапшықтарды қараудың қажеті жоқ. Егер сонда "
-"да көргіңіз келсе, осы құсбелгіні қойыңыз.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Бірлескен жұмыстарға арналған қапшықтардың пішімін таңдаңыз."
-"<ul>"
-"<li>Әдеттегі пішімі - ical (күнтізбе қапшығы үшін) және vcard (адрес "
-"кітапшасының қапшығы үшін). Бұл пішімдер барлық Kontact мүмкіндіктерің "
-"қамтиды.</li>"
-"<li>Kolab XML өзіндік   Outlook пішіміне ұқсас үлгіні қолданады. Бұл Outlook "
-"пішімімен үйлесімділігі жоғары, Kolab сервері не онымен үйлесімді серверлермен "
-"істейтін пішім.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>IMAP ресурстың аталық қапшығын таңдау.</p>"
-"<p>Әдетте Kolab сервері аталық қапшық ретінде IMAP кіріс қапшығын орнатады.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>IMAP қапшығының ие тіркелгісінің идентификаторы.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Егер IMAP қапшықтарын өз тіліңізде атағыңыз келсе, тілді тек қолдайтын "
-"тілдер тізімінен таңдай аласыз.</p>"
-"<p>Бұл мүмкіндік тек Microsoft Outlook бағдарламасымен үйлесімдік үшін "
-"жасалған. Бір таңдаған сон, кейін тілді өзгерту мүмкін емес.</p>"
-"<p>Жалпы, тілді өзгертпей қалдыру жөн.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "KMail кіріспе бетін көрсету."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Бір хостпен орнататын қосылымдардың шегі"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Жаңа поштаны тексергенде хостпен қосылылымдарды шектеу саны. Әдетте қосылым "
-"саны шектелмейді (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Жедел іздеу өрісі көрсетілсін"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr "Хаттар тізімінде мәліметті жедел іздеу өрісті көрсету/жасыру."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "Мүмкін болса, жауап не басқаға жіберетін хаттың кодтамасы өзгермесін"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Қолтаңба а&втоматты түрде қосылсын"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Бұл іс-әлпеті келесіде поштаны құрастырғанда әдетті болсын.\n"
-"       "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Бұл жіберілгендердің қапшығы келесіде поштаны құрастырғанда әдетті болсын."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "Бұл жіберу әдісі келесіде поштаны құрастырғанда әдетті болсын."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Бұл іс-әлпеті келесіде поштаны құрастырғанда әдетті болсын.\n"
-"       "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Жолды қай бағаннан ас&ырмау:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Түбір куәлігінің мерзімі бітуге не&ше күн қалғанда ескерту:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Outlook &#8482; ағылшын емес таңбаларымен аталған тіркемені түсіну үшін осыны "
-"таңдаңыз"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "&Хатпен не істеген туралы хабарлауы автоматты түрде сұралсын"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>>Хатпен не істеген туралы хабарлама (Message Disposition Notification, MDN) "
-"бүкіл жіберілетін хат үшін сұрауға осы құсбелгіні қойыңыз.</p>"
-"<p>Бұл әдетті жағдайды өзгертетін параметр, бірақ әрбір жеке хаттың қасиетін "
-"құрастырғыш мәзірінің <em>Параметрлер</em>-><em>Қаралған туралы құлақтандыруды "
-"сұрау</em> деген жол арқылы өзгертуге болады.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Автотолтыру үшін соңғы адрестер қолданылсын"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Құрастырғыш адрес жолын автотолтыру үшін жуырдағы адрестері ұсынбасын десеңіз "
-"осы құсбелгіні алып тастаңыз."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Автосақтау аралығы:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Хат жазып жатқанда автоматты түрде сақтық көшірмесі жасалынады. Сақтық "
-"көшірмесі жасалып отыратын уақыт аралығын орнатыңыз. 0 деп қойсаныз көшірме "
-"жасалмайды."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Танылған префикс \"&Re:\" дегенмен алмастырылсын"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Танылған префикс\"&Fwd:\" дегенмен алмастырылсын"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Парасатты дәйексөз қолданылсын"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Қолтаңбаның мерзімі өтіп кеткен."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Адрес таңдаңышының түрі"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr "Адрестерді таңдау диалогының түрін көрсетіңіз."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Алушылар өңдегішінің түрі"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "Поштаны алушылардың өңдегішінің түрін орнатыңыз."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Алушыларды келтіру жолдар саны."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "Мүмкін болса, жауап не басқаға жіберетін хаттың кодтамасы өзгермесін"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Кейбір хаттар, әсіресе автоматты түрде жазылғандар, қолданған кодтамасын "
-"белгілемейді. Мұндай кезде осында келтірілген кодтама қолданылады. Еліңізде жиі "
-"қолданатын кодтамасын көрсетіңіз. Әдетте, жүйенің негізгі кодтамасы "
-"қолданылады."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Бұны әдеттегі ('Авто') дегеннен өзгертсеңіз барлық хаттарды көрсету үшін, "
-"олардағы белгіленген кодтамасын елемей, осы кодтама қолданылады."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Осыны таңдасаңыз, хат мәтініндегі :-) сияқты күлімдеу белгілер көңіл күйі "
-"белгілер (шағын суреттермен) алмастырылады."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Осыны таңдасаңыз, дәйексөздің әртүрлі деңгейлерін белгілеп көрсетеді. "
-"Дәйексөздің деңгейін көрсету кажет емес болса құсбелгісін алып тастаңыз."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Келесі деңгейін автоматты түрде жасыру:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Дәйексөз мәтінін қаріп өлшемі кішірейтсін"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Дәйексөзді көрсету үшін кішірек қаріп қолданылсын десеңіз осы құсбелгіні "
-"қойыңыз."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Жіберілген хаттар &шифрланған түрде сақталсын"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "&Айдарда спам белгісі көрсетілсін"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Хатпен не істеген туралы хабарлауды жіберушіні көрсетпей жіберсін."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Хатпен не істеген туралы хабарлауы жіберушіні көрсетпей жіберу.Кейбір серверлер "
-"мұндай хаттарды қабылдамауы мүмкін, мұндайда құсбелгісін алып тастаңыз."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Хаттар тізімі - жаңа хаттар"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Дәйекше &таңбаларын қосу"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13616,6 +11702,11 @@ msgstr "Көшірме алушы деп қосу"
 msgid "Add as BCC"
 msgstr "Жасырын көшірме алушы деп қосу"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Қ&айту"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13631,10 +11722,10 @@ msgstr "Таңдалған алушылар"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Сіз %n алушыны таңдадыңыз. Тек %1 алушы рұқсат етілген. Алушылардың санын "
 "қысқартыңыз."
@@ -13653,8 +11744,8 @@ msgstr "Адрес таңдау диалогы"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Бұл батырма бар адрестерден керек алушының таңдауға арналған диалогын ашады."
 
@@ -13758,13 +11849,23 @@ msgstr "келесіден артық не тең"
 msgid " bytes"
 msgstr " байт"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " күн"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Тапсырылған іздеуді жасау үшін %1 қапшығының барлық хаттарын серверден жүктеп "
-"алу қажет. Бұл біраз уақытты алуы мүмкін. Іздеуді жалғастырғыңыз келеді ме?"
+"Тапсырылған іздеуді жасау үшін %1 қапшығының барлық хаттарын серверден "
+"жүктеп алу қажет. Бұл біраз уақытты алуы мүмкін. Іздеуді жалғастырғыңыз "
+"келеді ме?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -13907,16 +12008,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"'%1'тіркелгісі туралы деректеді жинау...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "'%1'тіркелгісі туралы деректеді жинау...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -13935,10 +12032,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"'%1'скрипттің мазмұны:\n"
+msgid "Contents of script '%1':\n"
+msgstr "'%1'скрипттің мазмұны:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13961,20 +12056,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve мүмкіндіктері:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve мүмкіндіктері:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Арнайы мүмкіндіктері жоқ)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Қолдануға дайын Sieve скрипттері:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Қолдануға дайын Sieve скрипттері:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14017,8 +12108,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Бұл іс-әлпетінен жіберетін хаттарға қолтаңба қосылсын десеңіз, осы құсбелгіні "
-"қойыңыз."
+"Бұл іс-әлпетінен жіберетін хаттарға қолтаңба қосылсын десеңіз, осы "
+"құсбелгіні қойыңыз."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14053,11 +12144,12 @@ msgstr "Хатқа қосылатын қолтаңба осы өрісте ке�
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Мұнда қолтаңбаңыздың мәтін файлының атауын келтіруге болады. Бұл файлдың жазуы "
-"әрбір жаңа хат жазғанда не хаттың соңына жаңа қолтаңбаны қосқанда, алынады."
+"Мұнда қолтаңбаңыздың мәтін файлының атауын келтіруге болады. Бұл файлдың "
+"жазуы әрбір жаңа хат жазғанда не хаттың соңына жаңа қолтаңбаны қосқанда, "
+"алынады."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14073,21 +12165,26 @@ msgstr "Келтірілген файлды мәтін өндегішінде а
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Мұнда кез келген команданы келтіруге болады, жолмен немесе жолсыз. Әрбір жаңа "
-"хат үшін KMail осы команданы орындайды да, оның шығыс хабарламасын хатқа "
-"қолтаңба ретінде қосылады. Әдетте мұнда \"fortune\" немесе \"ksig -random\" "
-"командалары қолданады."
+"Мұнда кез келген команданы келтіруге болады, жолмен немесе жолсыз. Әрбір "
+"жаңа хат үшін KMail осы команданы орындайды да, оның шығыс хабарламасын "
+"хатқа қолтаңба ретінде қосылады. Әдетте мұнда \"fortune\" немесе \"ksig -"
+"random\" командалары қолданады."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Командасы:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Жаңа жазу:"
@@ -14124,6 +12221,11 @@ msgstr "Тіркелгіні қосу"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt><b>%1</b> деген іс-әлпетін өшіргіңіз келгені рас па?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Келесіге қ&оданылсын:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14138,6 +12240,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Cкриптті өңдеу..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14177,9 +12283,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14219,6 +12325,16 @@ msgstr ""
 "\"%1\" файлы ашылмады:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Кімге: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Көшірмесі: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14251,36 +12367,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14290,8 +12402,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14307,8 +12418,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14350,8 +12460,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 msgid "&Insert Command..."
@@ -14513,6 +12622,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14545,118 +12658,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...оң және сол жебе пернелерді басып тізімдегі келесі не алдыңғы хатқа "
-"ауысуға болады.</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...<em>Хат->Сүзгіні&nbsp;құру</em> мәзір\n"
-"арқылы жіберушілер, алушылар, тақырыптар және тарату тізіміне сүзгіні тез "
-"орнатуға болады.</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...кейбір таратылатын тізімнің тақырыбына қосылатын\n"
-"&quot;[тарату тізімінің атауы]&quot; дегеннен <em>rewrite header</em>\n"
-"сүзгісін қолданып құтылуға болады. Ол үшін "
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[тарату тізімінің атауы\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre> деп қолданыңыз.\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...<em>Қапшық-&gt;Тарату тізімін басқару</em> диалогында\n"
-"тарату тізімін қапшықтармен сәйкестендіруге болады.\n"
-"Бұдан кейін құрастырғышты тарату тізімімен ашу үшін\n"
-"<em>Хат-&gt;Жаңа&nbsp;тарату&nbsp;тізімі...</em> деген мәзір жолын қолдануға "
-"болады.\n"
-"Басқаша бұны сол қапшықты тышқанның ортаңғы батырмасымен түртіп істеуге "
-"болады.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...әрбір қапшыққа бөлек таңбашаны тағайындауға болады.\n"
-"<em>Қапшық-&gt;Қасиеттер...</em> дегенді қараңыз</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...KMail назардағы хаттың түріне (Plain text/HTML/OpenPGP)\n"
-"сәйкесті түсті жолағын көрсете алады.</p>\n"
-"<p>Бұл KMail қолтаңбасы сәтті тексеруден өтті деген түрлі HTML хат арқылы "
-"алдауға жол бермейді.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...іздеу ережесінің бірінші өрісінде айдарын атауын келтіріп\n"
-"кез-келген айдарды сүзгілеуге болады.</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>"
-"<pre>...&quot;Content-type&quot; мазмұнында келесі бар: "
-"&quot;text/html&quot;</pre>\n"
-" ережесі арқылы таза HTML хаттарды сүзгілеп тастауға болады.\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...жауап берген кезде хаттың тек таңдалған бөлігі ғана дәйексөз ретінде "
-"алынады.</p>\n"
-"<p>Егер ештеңе таңдалмаса, хаттың барлығы дәйексөз ретінде алынады.</p>\n"
-"<p>Егер \n"
-"<em>Көрініс-&gt;Тіркемелер-&gt;Хат бетінде</em> таңдалса бұл тіркемесінің "
-"мәтінімен де жұмыс істейді.</p>\n"
-"<p>Бұл барлық жауап беру командалармен істейді, тек\n"
-"<em>Хат-&gt;Арнайы жауап-&gt;Дәйексөзсіз жауап беру...</em> "
-"дегенді пайдаланғанда ғана істемейді.</p>\n"
-"<p align=\"right\"><em>David F. Newman қосқан үлесі</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Қайтатын әрекет жоқ."
@@ -14724,6 +12725,15 @@ msgstr "#%1 тіркемесі (аталмаған)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "\"%1\" деп аталған файл бар ғой. Оны қайта жазғыңыз келе ме?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Файл үстінен жаза берейік пе?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14839,13 +12849,13 @@ msgstr "Сурет әрбір хатпен &жіберілсін"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"KMail осы іс-әлпетінде жазылған хаттарының басына X-Face деп аталатын суретті "
-"қоссын десеңіз осы құсбелгіні қойыңыз. X-Face деген - кейбір пошта клиенттері "
-"көрсете алатын шағын (48х48 пиксел) ақ-қара суреті."
+"KMail осы іс-әлпетінде жазылған хаттарының басына X-Face деп аталатын "
+"суретті қоссын десеңіз осы құсбелгіні қойыңыз. X-Face деген - кейбір пошта "
+"клиенттері көрсете алатын шағын (48х48 пиксел) ақ-қара суреті."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -14873,13 +12883,13 @@ msgstr "Файлды таңдау..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Суретті қай файлдағы кескіннен құрылатынын таңдау үшін осы батырманы басыңыз. "
-"Сурет жоғары контрасты және шаршыға жақын болу керек. Аясы ашық түсті кескін "
-"жақсы нәтиже береді."
+"Суретті қай файлдағы кескіннен құрылатынын таңдау үшін осы батырманы "
+"басыңыз. Сурет жоғары контрасты және шаршыға жақын болу керек. Аясы ашық "
+"түсті кескін жақсы нәтиже береді."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14887,19 +12897,19 @@ msgstr "Адрес кітапшасынан алынсын"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr "Сурет адрес кітапшаңыздан алынады."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail әрбір хатта шағын (48х48 пиксел) ақ-қара суретті жібере алады. Бұл, "
-"мысалы, Сіздің суретіңіз немесе тамғаңыз болуы мүмкін. Бұл сурет алушының пошта "
-"клиентінде көрсетіледі (егер ол бұндайды қолдайтын болса)."
+"<qt>KMail әрбір хатта шағын (48х48 пиксел) ақ-қара суретті жібере алады. "
+"Бұл, мысалы, Сіздің суретіңіз немесе тамғаңыз болуы мүмкін. Бұл сурет "
+"алушының пошта клиентінде көрсетіледі (егер ол бұндайды қолдайтын болса)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14907,11 +12917,11 @@ msgstr "Бұл өріс X-Face мәліметі үшін."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Мысалдарды <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a> сайтында көруге болады."
+"Мысалдарды <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all."
+"nl/~ace/X-Faces/</a> сайтында көруге болады."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14926,128 +12936,1738 @@ msgstr "Сурет жоқ"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Адрес кітапшаңызда өзіңіз туралы жазу жоқ."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Қолтаңбалау"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Хаттар &автоматты түрде қолтаңбалансын"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Құсбелгісі қойылса, барлық жіберілетін хаттар әдетті түрде қолтаңбаланады. "
+"Әрине, қаласаңыз, әрбір хатты жекелеп қолтаңбаламай жіберуіңізге болады."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Шифрлау"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Хат тақырыбы"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Құсбелгісі қойылса, хат/файл алушының ашық кілтімен ғана емес өзіңіздің "
+"кілтіңізбен де шифрланады. Бұл біраз уақыттан кейін хаттың/файлдың шифрін "
+"шешу мүмкіндігі болу үшін істеледі."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Көшірмесін 'address' дегенге жіберу"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Шифрланған/қол&таңбаланған мәтін көрсетілсін"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Көшірмесін 'address' дегенге жасырып жіберу"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Шифрлаудың және қолтаңбалаудың нәтижесі хатты жіберердің алдында жеке "
+"терезеде көрсетіледі. Сонымен, шифрлау тегіс өткеніне көз жетізуге болады."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Хатқа 'header' айдарын қосу"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Жіберілген хаттар &шифрланған түрде сақталсын"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Хат бетін 'file' дегеннен алу"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Хаттар шифрланған түрінде сақтау үшін құсбелгісін қойыңыз"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Хат беті"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Хаттар шифрланған түрінде сақталсын</h1>\n"
+"Бұл құсбелгі қойылса, хаттар жіберілген шифрланған түрінде сақталады. Бұл "
+"онша жақсы амал емес, себебі қажетті куәліктердің мерзімі біткен соң, бұл "
+"хаттарды оқи алмайсыз.\n"
+"<p>\n"
+"Сонда да, жергілікті ережелер бойынша осылай сақтау керек болып қалатын "
+"жағдайлар болады. Күмәндансаңыз, жергілікті әкімшісімен ақылдасыңыз.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Хатқа тіркеме қосу. Бұны қайталауға болады"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Әрқашанда шифрлау кілттер &таңдауы көрсетілсін"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Тек жаңа хаттар бар-жоғын тексеру"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Құсбелгісі қойылса, бағдарлама шифрлау үшін таңдауға әрқашанда барлық "
+"кілттердің тізімін көрсетеді. Әйтпесе, ол осы кілт таңдауын, тек жарайтын "
+"кілт таба алмағанда немесе жарайтын кілттер бірнеше болғанда ғана ұсынады."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Тек құрастырғыш терезесін ашу"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Мүмкіндігі болса, хаттар &автоматты түрде шифрлансын"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Келтірген хат файлын қарау"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Құсбелгісі қойылса, барлық шифрлауы мүмкін жіберілетін хаттарыңыз "
+"шифрланады, әрине әрбір жеке хатты қалауыңыз бойынша шифрламай жіберуге де "
+"болады."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "'URL' сілтемедегі файлды тіркеп 'address' дегенге хат жіберу"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "&Жоба жазулар қолтаңбаланбасын/шифрланбасын"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Оқылған"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Ескі"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Жалпы"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Жойылған"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Жауап адресі"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Жауап берілген"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Б&арлығына жауап беру..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Басқаға жіберілген"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Басқаға жолдау"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Кезекке қойылған"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Тіркесімі:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Жіберілген"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Каралған"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Қа&пшықтың мазмұны:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Елемеген"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Спам"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Құнды"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Қапшық қасиеттері"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Аяқталмаған"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Қапшықтың мазмұны - &тарату тізімі"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Тіркемесі бар"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Тізім &адресі:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Кә&дімгі:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Оқыл&маған:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Хаттың мерзімі"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Ескіру мерзімі:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "&Оқылғанды ескі деу"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Ес&кіру мерзімі:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "&Оқылмағанды ескі деу"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Күн"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Апта"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Ай"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Қосымша"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Жіберушінің іс-әлп&еті:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Сақтау пішімі:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Тізім көрсететіні:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Кезектегі хат тексеріске жіберілсін"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Шығыс қапшықтағы хаттар тексеріске қолмен жіберілсін бе әлде бірден "
+"автоматты түрде жіберілсін бе, таңдаңыз.</p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "\"%1\" деп аталған файл бар ғой. Оны қайта жазғыңыз келе ме?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Қапшықта серверге әлі жүктеп берілмеген жаңа хаттар бар, бірақ оларды "
+"жүктеп беруге рұқсаттар жеткілікті емес секілді. Серверге хаттарды тапсыру "
+"рұқсаттарыңызды түгелдеу үшін жүйе әкімшісімен байланысыңыз немесе ол жаңа "
+"хаттарды қапшықтан алып тастаңыз.</p> <p>Бұл хаттарды басқа қапшыққа "
+"ауыстырғыңыз келеді ме?</p>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Файл үстінен жаза берейік пе?"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Қапшық таңдау диалогындағы ең жиі таңдалған қапшық."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Жүйелік сөредегі таңбашаны көрсету ережесі"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Пошта келгені туралы толық құлақтандыру"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Құсбелгісі қойылса, әрбір қапшықтың атауымен қатар ондағы жаңа хаттар саны "
+"көрсетіледі. әйтпесе, тек 'Жаңа хат келді' деген хабарлама көрсетіледі."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Сыртқы &өңдегіші:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Құрастырғышының орына с&ыртқы өңдегіш қолданылсын"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Бірлескен жұмыс рұқсат етілсін"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "From:/To: айдарларды жауаптан жауапқа көшірмелеу"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook бағдарламасында бірқатар кемістіктер бар, мысалы  "
+"iCalendar стандартын жүзеге асыруда. Бұл параметр осындай бір қатені айналып "
+"шығу үшін. Егер Outlook пайдаланушылармен хат алмасқанда олар жауабыңызды "
+"ала алмаса, осы параметрді орнатып көріңіз."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Бірлескен жұмыс шақырулары хат бетінде жіберілсін"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook бағдарламасында бірқатар кемістіктер бар, мысалы  "
+"iCalendar стандартын жүзеге асыруда. Бұл параметр осындай бір қатені айналып "
+"шығу үшін. Егер Outlook пайдаланушылармен хат алмасқанда олар "
+"шақыруларыңызды ала алмаса, осы параметрді орнатып көріңіз."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Шақыру автоматты түрде жіберілсін"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Осы құсбелгі қойылса, шақыруды жібергенде құрастырғыш терезесі көрсетілмей, "
+"барлық шақыру поштасы автоматты түрде жіберіледі. Егер жібермек поштаны "
+"көргіңіз келсе, осы құсбелгіні алып тастаңыз. Бірақ көрсетілетін мәтін "
+"iCalendar пішімінде болады, ол қолмен өзгертуге арналмаған."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Бұл параметр Kontact қолданбасының (KOrganizer, KAddressBook және KNotes) "
+"жазуларын сақтауға мүмкіндік береді.</p><p>Бұл параметрді қоссаңыз "
+"көрсетілген қолданбаларға IMAP ресурстарды қолданатын қылу керек. Бұл TDE "
+"Басқару орталығында орнатылады</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Әдетте IMAP ресурстар сақталған қапшықтарды қараудың қажеті жоқ. Егер "
+"сонда да көргіңіз келсе, осы құсбелгіні қойыңыз.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Бірлескен жұмыстарға арналған қапшықтардың пішімін таңдаңыз."
+"<ul><li>Әдеттегі пішімі - ical (күнтізбе қапшығы үшін) және vcard (адрес "
+"кітапшасының қапшығы үшін). Бұл пішімдер барлық Kontact мүмкіндіктерің "
+"қамтиды.</li><li>Kolab XML өзіндік   Outlook пішіміне ұқсас үлгіні "
+"қолданады. Бұл Outlook пішімімен үйлесімділігі жоғары, Kolab сервері не "
+"онымен үйлесімді серверлермен істейтін пішім.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>IMAP ресурстың аталық қапшығын таңдау.</p><p>Әдетте Kolab сервері аталық "
+"қапшық ретінде IMAP кіріс қапшығын орнатады.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>IMAP қапшығының ие тіркелгісінің идентификаторы.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Егер IMAP қапшықтарын өз тіліңізде атағыңыз келсе, тілді тек қолдайтын "
+"тілдер тізімінен таңдай аласыз.</p><p>Бұл мүмкіндік тек Microsoft Outlook "
+"бағдарламасымен үйлесімдік үшін жасалған. Бір таңдаған сон, кейін тілді "
+"өзгерту мүмкін емес.</p><p>Жалпы, тілді өзгертпей қалдыру жөн.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "KMail кіріспе бетін көрсету."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Бір хостпен орнататын қосылымдардың шегі"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Жаңа поштаны тексергенде хостпен қосылылымдарды шектеу саны. Әдетте қосылым "
+"саны шектелмейді (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Жедел іздеу өрісі көрсетілсін"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr "Хаттар тізімінде мәліметті жедел іздеу өрісті көрсету/жасыру."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "Мүмкін болса, жауап не басқаға жіберетін хаттың кодтамасы өзгермесін"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Қолтаңба а&втоматты түрде қосылсын"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Бұл іс-әлпеті келесіде поштаны құрастырғанда әдетті болсын.\n"
+"       "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Бұл жіберілгендердің қапшығы келесіде поштаны құрастырғанда әдетті болсын."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "Бұл жіберу әдісі келесіде поштаны құрастырғанда әдетті болсын."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Бұл іс-әлпеті келесіде поштаны құрастырғанда әдетті болсын.\n"
+"       "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Жолды қай бағаннан ас&ырмау:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Түбір куәлігінің мерзімі бітуге не&ше күн қалғанда ескерту:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Outlook &#8482; ағылшын емес таңбаларымен аталған тіркемені түсіну үшін "
+"осыны таңдаңыз"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "&Хатпен не істеген туралы хабарлауы автоматты түрде сұралсын"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>>Хатпен не істеген туралы хабарлама (Message Disposition "
+"Notification, MDN) бүкіл жіберілетін хат үшін сұрауға осы құсбелгіні қойыңыз."
+"</p><p>Бұл әдетті жағдайды өзгертетін параметр, бірақ әрбір жеке хаттың "
+"қасиетін құрастырғыш мәзірінің <em>Параметрлер</em>-><em>Қаралған туралы "
+"құлақтандыруды сұрау</em> деген жол арқылы өзгертуге болады.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Автотолтыру үшін соңғы адрестер қолданылсын"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Құрастырғыш адрес жолын автотолтыру үшін жуырдағы адрестері ұсынбасын "
+"десеңіз осы құсбелгіні алып тастаңыз."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Автосақтау аралығы:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Хат жазып жатқанда автоматты түрде сақтық көшірмесі жасалынады. Сақтық "
+"көшірмесі жасалып отыратын уақыт аралығын орнатыңыз. 0 деп қойсаныз көшірме "
+"жасалмайды."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Танылған префикс \"&Re:\" дегенмен алмастырылсын"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Танылған префикс\"&Fwd:\" дегенмен алмастырылсын"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Парасатты дәйексөз қолданылсын"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Қолтаңбаның мерзімі өтіп кеткен."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Адрес таңдаңышының түрі"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr "Адрестерді таңдау диалогының түрін көрсетіңіз."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Алушылар өңдегішінің түрі"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "Поштаны алушылардың өңдегішінің түрін орнатыңыз."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Алушыларды келтіру жолдар саны."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "Мүмкін болса, жауап не басқаға жіберетін хаттың кодтамасы өзгермесін"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Кейбір хаттар, әсіресе автоматты түрде жазылғандар, қолданған кодтамасын "
+"белгілемейді. Мұндай кезде осында келтірілген кодтама қолданылады. Еліңізде "
+"жиі қолданатын кодтамасын көрсетіңіз. Әдетте, жүйенің негізгі кодтамасы "
+"қолданылады."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Бұны әдеттегі ('Авто') дегеннен өзгертсеңіз барлық хаттарды көрсету үшін, "
+"олардағы белгіленген кодтамасын елемей, осы кодтама қолданылады."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Осыны таңдасаңыз, хат мәтініндегі :-) сияқты күлімдеу белгілер көңіл күйі "
+"белгілер (шағын суреттермен) алмастырылады."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Осыны таңдасаңыз, дәйексөздің әртүрлі деңгейлерін белгілеп көрсетеді. "
+"Дәйексөздің деңгейін көрсету кажет емес болса құсбелгісін алып тастаңыз."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Келесі деңгейін автоматты түрде жасыру:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Дәйексөз мәтінін қаріп өлшемі кішірейтсін"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Дәйексөзді көрсету үшін кішірек қаріп қолданылсын десеңіз осы құсбелгіні "
+"қойыңыз."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Жіберілген хаттар &шифрланған түрде сақталсын"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "&Айдарда спам белгісі көрсетілсін"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Хатпен не істеген туралы хабарлауды жіберушіні көрсетпей жіберсін."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Хатпен не істеген туралы хабарлауы жіберушіні көрсетпей жіберу.Кейбір "
+"серверлер мұндай хаттарды қабылдамауы мүмкін, мұндайда құсбелгісін алып "
+"тастаңыз."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Хаттар тізімі - жаңа хаттар"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Дәйекше &таңбаларын қосу"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Файлды өңдеу"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Өзгерту..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Өту"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Қ&апшық"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Хат"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Арнайы жауап"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Басқаға жолдау"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Қаріп параметрлерін ысыру"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML құралдары"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Жалпы параметрлері"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML құралдары"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Куәліктер CRL тізімінен тексерілсін"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Бұл параметр таңдалса, S/MIME куәліктері CRL тізімдерде бар-жоғы тексеріледі."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Куәліктер желіде тексерілсін (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Құсбелгісі қойылса, S/MIME куәліктері Куәліктердің желілік күй-жай протоколы "
+"(Online Certificates Status Protocol, OCSP) арқылы тексеріледі. Төменде OCSP "
+"қызметінің адресін келтіріңіз."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Куәліктерді желіде тексеру"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP қызметінің URL адресі:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Куәлікті желіде тексеретін (OCSP қызметінің) серверінің адресі. Әдетте URL "
+"адресі http:// деп басталады."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP қызметінің қолтаңбасы:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Куәліктер қызметінің URL адресін елемеу"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Куәліктер ережесі тексерілмесін"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Әдетте қуәліктер ережесін қолдануға рұқсаттың бар екендігін тексеру үшін "
+"GnuPG  ~/.gnupg/policies.txt файлын қолданады. Егер бұл параметрді "
+"таңдасыңыз ережелер тексерілмейді."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "CRL қолданылмасын"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Құсбелгісі қойылса, S/MIME куәліктерін тексергенде күші жойылған "
+"куәліктердің тізімі (CRL) қолданбайды."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Куәлікті шығараттындардың жоқ куәліктері алынсын"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Құсбелгісі қойылса, куәлікті шығарушының жоқ куәліктері алынады (CRL "
+"тізімдер мен OCSP екеуі де қолданылады)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP сұраулары"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "HTTP сұраулары болмасын"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "S/MIME үшін HTTP мүлдем рұксат етілмесін."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP сұрау үшін қолданатын прокси: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Қолданатын жүйелік HTTP прокси:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Құсбелгісі қойылса, оң жақта көрсетілген HTTP (ортаның http_proxy "
+"айнымалысынан алынған) прокси сервері кез кеген HTTP сұрауы үшін қолданылады."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Мұнда S/MIME-мен істегенде барлық HTTP сұрауы үшін қолданылатын  прокси-"
+"сервердің адресін келтіріңіз. Бұл сервер:порт түрінде келтіріледі, мысалы: "
+"myproxy.nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "HTTP-колданатын CRL тарату орталықтары еленбесін"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Күші жойылған куәліктер тізімінің (CRL) орналасуын аңықтағанда,  "
+"тексерілетін куәлікте \"CRL тарату орталығы\" (CRL Distribution Point, DP) "
+"дегендер болады, ол URL адрестеріне бағыттайтын сілтемелер. Алғашқы табылған "
+"DP жазуы қолданылады.  Бұл параметр таңдалса, лайықты DP-ні іздегенде HTTP-"
+"қолданатындары еленбейді."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP сұраулары"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "LDAP сұраулары орындалмасын"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "S/MIME үшін LDAP мүлдем қолданылмасын."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "LDAP-колданатын CRL тарату орталықтары еленбесін"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Күші жойылған куәліктер тізімінің (CRL) орналасуын аңықтағанда,  "
+"тексерілетін куәлікте \"CRL тарату орталығы\" (CRL Distribution Point, DP) "
+"дегендер болады, ол URL адрестеріне бағыттайтын сілтемелер. Алғашқы табылған "
+"DP жазуы қолданылады.  Бұл параметр таңдалса, лайықты DP-ні іздегенде LDAP-"
+"қолданатындары еленбейді."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP сұраулары үшін негізгі сервері:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"LDAP сервері көрсетілсе, барлық сұраулар алдымен соған жіберіледі. Нақты "
+"айтқанда, бұл параметр LDAP URL адресінде көрсетілгеннен басымды, сонымен "
+"URL-де сервердің адресі не порты көрсетілмегенде қолданылады. Басқа LDAP "
+"серверлері тек егер \"прокси\" арқылы байланыс болмаса ғана қолданылады.\n"
+"Серверді \"ХОСТ\" немесе \"ХОСТ:ПОРТ\" түрінде көрсетіледі. Егер порт "
+"көрсетілмесе, онда (стандартты LDAP порты) 489 порты қолданылады."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "Қ&осу..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Бірлескен жұмыс"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Қаріп параметрлерін ысыру"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "шектеусіз"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Қолтаңба параметрлері"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Жіб&ерушіге жауап беру:"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Басқаға жіберілген хат"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Қолтаңбалан&баған хатты жібергенде ескертілсін"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Қолтаңбаланбаған хатты жібергенде ескертілсін десеңіз осыны таңдаңыз."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Қолтаңбаланбаған хатты жібергенде ескерту</h1>\n"
+"Құсбелгісі қойылса, қолтаңбаланбаған хатты не оның бөлігін жіберу әрекеті "
+"туралы ескертіледі.\n"
+"<p>\n"
+"Тұтастығын сақтау үшін осы параметрдің қосылып тұрғаны жөн.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Шифрланбаған хаттарды жібергенде &ескертілсін"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Шифрланбаған хаттарды жібергенде ескерту жасалсын десеңіз осы құсбелгіні "
+"қойыңыз."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Шифрланбаған хаттарды жібергенде ескертілсін</h1>\n"
+"Құсбелгісі қойылса, хатты не оның бөлігін шифрланбаған түрде жібергенде "
+"ескерту жасалады.\n"
+"<p>\n"
+"Тұтастығын сақтау үшін осы параметрдің қосылып тұрғаны жөн.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Куәлікте &алушының эл.пошта адресі болмаса, ескертілсін"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Куәлікте алушының адресі болмаса ескерту жасалсын десеңіз осы құсбелгіні "
+"қойыңыз"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Куәлікте алушының адресі болмаса, ескертілсін</h1>\n"
+"Құсбелгісі қойылса, қолтаңбалауға қолданылатын куәлікте алушының эл.пошта "
+"адресі жоқ болған жағдайда ескерту жасалады.\n"
+"<p>Қауіпсіздікті жоғарлатуды көздесеңіз бұл параметрін таңдап қою жөн.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Куәлік/кілттердің мерзімі бітетіні неше күн бұрын ескертілсін"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Қолтаңбалау үшін"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Шифрлау үшін"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Мұнда күндер санын таңдаңыз"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1> Қолтаңба куәліктің мерзімі жақында бітетін болса, ескерту</h1>\n"
+"Қолтаңбалау куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын "
+"төменгі шегін таңдаңыз.\n"
+"<p>\n"
+"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Куәліктің мерзімі жақында бітетіні туралы ескертілсін</h1>\n"
+"Шифрлау куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын төменгі "
+"шегін таңдаңыз.\n"
+"<p>\n"
+"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
+"</qt> "
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Тізбектегі куәліктің мерзімі жақында бітетін болса, ескерту</h1>\n"
+"Тізбектегі бүкіл куәліктер күшінде болып, ешбір ескертусіз қолданатын күн "
+"санын төменгі шегін таңдаңыз.\n"
+"<p>\n"
+"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>CA куәлігінің мерзімі жақында бітетін болса, ескерту</h1>\n"
+"CA куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын төменгі "
+"шегін таңдаңыз.\n"
+"<p>\n"
+"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
+"</qt></qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Түбір куәлігінің мерзімі жақында бітетін болса, ескерту</h1>\n"
+"Түбір куәлігі күшінде болып, ешбір ескертусіз қолданатын күн санын төменгі "
+"шегін таңдаңыз.\n"
+"<p>\n"
+"SPHINX ортасында бұны 14 күн деп қойған жөн деп табылады.\n"
+"</qt></qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Түбір куәліктер үшін:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Аралық СА куәліктері үшін:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Пайдаланушылардың куәлік/кілттер үшін: "
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Барлық \"Ендігәрі сұралмасын\" деген ескертулер қайта болсын"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...оң және сол жебе пернелерді басып тізімдегі келесі не алдыңғы хатқа "
+"ауысуға болады.</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...<em>Хат->Сүзгіні&nbsp;құру</em> мәзір\n"
+"арқылы жіберушілер, алушылар, тақырыптар және тарату тізіміне сүзгіні тез "
+"орнатуға болады.</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...кейбір таратылатын тізімнің тақырыбына қосылатын\n"
+"&quot;[тарату тізімінің атауы]&quot; дегеннен <em>rewrite header</em>\n"
+"сүзгісін қолданып құтылуға болады. Ол үшін <pre>rewrite header &quot;"
+"Subject&quot;\n"
+"   replace &quot;\\s*\\[тарату тізімінің атауы\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre> деп қолданыңыз.\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...<em>Қапшық-&gt;Тарату тізімін басқару</em> диалогында\n"
+"тарату тізімін қапшықтармен сәйкестендіруге болады.\n"
+"Бұдан кейін құрастырғышты тарату тізімімен ашу үшін\n"
+"<em>Хат-&gt;Жаңа&nbsp;тарату&nbsp;тізімі...</em> деген мәзір жолын қолдануға "
+"болады.\n"
+"Басқаша бұны сол қапшықты тышқанның ортаңғы батырмасымен түртіп істеуге "
+"болады.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...әрбір қапшыққа бөлек таңбашаны тағайындауға болады.\n"
+"<em>Қапшық-&gt;Қасиеттер...</em> дегенді қараңыз</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...KMail назардағы хаттың түріне (Plain text/HTML/OpenPGP)\n"
+"сәйкесті түсті жолағын көрсете алады.</p>\n"
+"<p>Бұл KMail қолтаңбасы сәтті тексеруден өтті деген түрлі HTML хат арқылы "
+"алдауға жол бермейді.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...іздеу ережесінің бірінші өрісінде айдарын атауын келтіріп\n"
+"кез-келген айдарды сүзгілеуге болады.</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p><pre>...&quot;Content-type&quot; мазмұнында келесі бар: &quot;text/"
+"html&quot;</pre>\n"
+" ережесі арқылы таза HTML хаттарды сүзгілеп тастауға болады.\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...жауап берген кезде хаттың тек таңдалған бөлігі ғана дәйексөз ретінде "
+"алынады.</p>\n"
+"<p>Егер ештеңе таңдалмаса, хаттың барлығы дәйексөз ретінде алынады.</p>\n"
+"<p>Егер \n"
+"<em>Көрініс-&gt;Тіркемелер-&gt;Хат бетінде</em> таңдалса бұл тіркемесінің "
+"мәтінімен де жұмыс істейді.</p>\n"
+"<p>Бұл барлық жауап беру командалармен істейді, тек\n"
+"<em>Хат-&gt;Арнайы жауап-&gt;Дәйексөзсіз жауап беру...</em> дегенді "
+"пайдаланғанда ғана істемейді.</p>\n"
+"<p align=\"right\"><em>David F. Newman қосқан үлесі</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15142,16 +14762,20 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1> Хаттың барлық бөліктерін шифрлауын әдетті қылу</h1>\n"
-#~ "Құсбелгісі қойылса, хаттың барлық бөліктерін (хат бетін және тіркемелерін) шифрлауы әдетті болады.\n"
+#~ "Құсбелгісі қойылса, хаттың барлық бөліктерін (хат бетін және "
+#~ "тіркемелерін) шифрлауы әдетті болады.\n"
 #~ "<p>\n"
-#~ "Бұл әдетті амал, сонда да, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен айнуға да болады.\n"
+#~ "Бұл әдетті амал, сонда да, қалауыңыз бойынша әрбір жеке хат үшін бұл "
+#~ "әдеттен айнуға да болады.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15163,12 +14787,15 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Әрбір бөлікті шифрлаудың алдында сұралсын</h1>\n"
-#~ "Құсбелгісі қойылса, хаттың әрбір жеке бөлігін (хаттың бетін және барлық тіркемесін) шифрлаудың керегі - керегі жоқтығы сұралады.\n"
+#~ "Құсбелгісі қойылса, хаттың әрбір жеке бөлігін (хаттың бетін және барлық "
+#~ "тіркемесін) шифрлаудың керегі - керегі жоқтығы сұралады.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15182,14 +14809,16 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Хаттар шифрланбасын</h1>\n"
 #~ "Құсбелгісі қойылса, хатты шифрлау әдетті болады.\n"
 #~ "<p>\n"
-#~ "Бұл әдетті амал, сонда да, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен айнуға да болады.\n"
+#~ "Бұл әдетті амал, сонда да, қалауыңыз бойынша әрбір жеке хат үшін бұл "
+#~ "әдеттен айнуға да болады.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15201,20 +14830,33 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Шифрлау алгоритмі</h1>\n"
-#~ "Алгоритм деген компьютерге берілетін, тапсырманы қалай орындайтынын белгілейтін, нұсқауы. Шифрлау алгоритмі - компьютерге берілген, алушының кілтін қолданып, хатты тек алушы ғана оқитын қылу жолын анықтайтын нұсқау.\n"
+#~ "Алгоритм деген компьютерге берілетін, тапсырманы қалай орындайтынын "
+#~ "белгілейтін, нұсқауы. Шифрлау алгоритмі - компьютерге берілген, алушының "
+#~ "кілтін қолданып, хатты тек алушы ғана оқитын қылу жолын анықтайтын "
+#~ "нұсқау.\n"
 #~ "<p>\n"
-#~ "Шифрлау алгоритмін таңдау, хатыңызды қағып алып оқып шығудың күрделілігін анықтайды. Дегенмен, SPHINX ортасындағы барлық алгоритмдер өте мықты деп саналады. Сонымен әдеттегісі де әбден сенімді.\n"
+#~ "Шифрлау алгоритмін таңдау, хатыңызды қағып алып оқып шығудың күрделілігін "
+#~ "анықтайды. Дегенмен, SPHINX ортасындағы барлық алгоритмдер өте мықты деп "
+#~ "саналады. Сонымен әдеттегісі де әбден сенімді.\n"
 #~ "<p>\n"
-#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен айнуға да болады.\n"
+#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен "
+#~ "айнуға да болады.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15226,16 +14868,22 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Куәлік тексерісі жергілікті сақталған куәлікпен аяқтай алсын</h1>\n"
-#~ " Құсбелгісі қойылса, куәлік тізбегін тексеру жергілікті сақталған куәлікпен аяқталуы болады.\n"
+#~ " Құсбелгісі қойылса, куәлік тізбегін тексеру жергілікті сақталған "
+#~ "куәлікпен аяқталуы болады.\n"
 #~ "<p>\n"
-#~ "Жергілікті сақталған куәліктер - Сіздің жеке куәліктеріңіз, хаттармен алмасатын әріптестеріңіздің куәліктері және куәліктер қызметінің (CA) куәліктері.\n"
+#~ "Жергілікті сақталған куәліктер - Сіздің жеке куәліктеріңіз, хаттармен "
+#~ "алмасатын әріптестеріңіздің куәліктері және куәліктер қызметінің (CA) "
+#~ "куәліктері.\n"
 #~ "</qt>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15247,12 +14895,15 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Куәлік жолы әрқашанда түбірлік куәлікке дейін тексерілсін </h1>\n"
-#~ "Құсбелгісі қойылса, алушының куәлігінің жолы, әрқашанда түбірлік куәлікке дейін толық тексерілетін болады.\n"
+#~ "Құсбелгісі қойылса, алушының куәлігінің жолы, әрқашанда түбірлік куәлікке "
+#~ "дейін толық тексерілетін болады.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15264,14 +14915,17 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Куәліктердің жолы тексерілсін</h1>\n"
-#~ "Құсбелгісі қойылса, алушының барлық куәлік жолы түбірге дейін тексеріледі.\n"
+#~ "Құсбелгісі қойылса, алушының барлық куәлік жолы түбірге дейін "
+#~ "тексеріледі.\n"
 #~ "<p>\n"
 #~ "Есіңізде болсын, алушының өз куәлігін тексеруін болдырмау мүмкін емес.\n"
 #~ "</qt>"
@@ -15285,33 +14939,47 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1> Күші жойылған куәліктердің тізімдері (CRL) қолданылсын</h1>\n"
-#~ "Күші жойылған куәліктердің тізімдері қайтарып алынған, сондықтан шифрлау үшін енді қолдануы болмайтын куәліктер. Алушы, өз куәлігінің сенімділігіне күмәндануға себеп (мысалы, егер біреу PIN нөмірін біліп қойып) пайда болса, куәлігінің күшін жоя алады.\n"
+#~ "Күші жойылған куәліктердің тізімдері қайтарып алынған, сондықтан шифрлау "
+#~ "үшін енді қолдануы болмайтын куәліктер. Алушы, өз куәлігінің "
+#~ "сенімділігіне күмәндануға себеп (мысалы, егер біреу PIN нөмірін біліп "
+#~ "қойып) пайда болса, куәлігінің күшін жоя алады.\n"
 #~ "<p>\n"
-#~ "Қауіпсіздігін арттыру үшін CRL тізімдерін қолдану әбден лазым. CRL-ларды алу жолын куәліктерді баптау және CRL-ды басқару диалогында таңдауға болады.\n"
+#~ "Қауіпсіздігін арттыру үшін CRL тізімдерін қолдану әбден лазым. CRL-ларды "
+#~ "алу жолын куәліктерді баптау және CRL-ды басқару диалогында таңдауға "
+#~ "болады.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "CRL мерзімі бі&туге неше күн қалғанда ескерту:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "CRL мерзімі жақында бітеді деген ескерту алу үшін құсбелгісін қойыңыз"
+#~ msgstr ""
+#~ "CRL мерзімі жақында бітеді деген ескерту алу үшін құсбелгісін қойыңыз"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>CRL мерзімі жақында бітетін болса, ескерту</h1>\n"
-#~ "Құсбелгісі қойылса, қолданудағы CRL-дың біреуінің мерзімі жақында бітетін болса - Сізге ескерту жасалады.\n"
+#~ "Құсбелгісі қойылса, қолданудағы CRL-дың біреуінің мерзімі жақында бітетін "
+#~ "болса - Сізге ескерту жасалады.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15320,14 +14988,16 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>CRL мерзімі бітуге жақында ескерту</h1>\n"
-#~ "Бұл өрісте CRL мерзімі бітуге неше күн қалғанда ескерту жасалатынын келтіруге болады.\n"
+#~ "Бұл өрісте CRL мерзімі бітуге неше күн қалғанда ескерту жасалатынын "
+#~ "келтіруге болады.\n"
 #~ "<p>\n"
 #~ "SPHINX ортасында бұны 7 күн деп қойған жөн деп табылады.\n"
 #~ "</qt>"
@@ -15336,42 +15006,55 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgstr "Хаттар әрқашанда ө&зі үшін шифрлансын"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Барлық шифрланған хаттарды өз кілтімен шифрлау үшін осы құсбелгіні қойыңыз."
+#~ msgstr ""
+#~ "Барлық шифрланған хаттарды өз кілтімен шифрлау үшін осы құсбелгіні "
+#~ "қойыңыз."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Хаттар әрқашанда өзі үшін шифрлансын</h1>\n"
-#~ "Құсбелгісі қойылса, шифрлап жіберген хаттар өз кілтіңізбен де шифрланатын болады.\n"
+#~ "Құсбелгісі қойылса, шифрлап жіберген хаттар өз кілтіңізбен де шифрланатын "
+#~ "болады.\n"
 #~ "<p>\n"
-#~ "Жіберілген хаттарыңызды өзіңіз оқи алатын болу үшін осы параметрін таңдап қою керек.\n"
+#~ "Жіберілген хаттарыңызды өзіңіз оқи алатын болу үшін осы параметрін таңдап "
+#~ "қою керек.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
 #~ msgstr "Тіз&бектегі куәлік мерзімі бітуге неше күн қалғанда ескерту:"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Куәліктің мерзімі жақында бітетіні ескертілсін десеңіз осы құсбелгіні қойыңыз"
+#~ msgstr ""
+#~ "Куәліктің мерзімі жақында бітетіні ескертілсін десеңіз осы құсбелгіні "
+#~ "қойыңыз"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Куәліктің мерзімі жақында бітетіні ескертілсін</h1>\n"
-#~ "Құсбелгісі қойылса, шифрлауға қолданып жатқан куәліктің келтірілген күннен кейін мерзімі бітетіні туралы ескертіледі.\n"
+#~ "Құсбелгісі қойылса, шифрлауға қолданып жатқан куәліктің келтірілген "
+#~ "күннен кейін мерзімі бітетіні туралы ескертіледі.\n"
 #~ "<p>\n"
-#~ "Мерзімі жуық арада бітетін куәліктерді қолдануды болдырмау үшін осы параметрді таңдау жөн.\n"
+#~ "Мерзімі жуық арада бітетін куәліктерді қолдануды болдырмау үшін осы "
+#~ "параметрді таңдау жөн.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15392,8 +15075,28 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Жіберетен куәліктерін таңдау"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Куәліктерді жіберу</h1> Сіздің куәлігіңізсіз хат алушысы хат шын Сіз жіберген түрде, ешбір бөтен жақтан өзгеріс енізілмеген екенің тексере алмайды. <p> Алушы куәлігіңізді орталық серверден ала алады, немесе өз куәлігіңізді хатпен бірге де жібере аласыз. Сіз куәлікті хатпен бірге жіберу-жібермеуді, тек өз куәлігіңізді немесе куәліктердің бүкіл тізбегін жіберуді, куәліктер тізбегіне түбірлік куәлікті қосу-қоспауды таңдай аласыз. <p> Ең болмаса хатпен бірге әрқашанда өз куәлігіңізді жіберу жөн. <p> Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен айнуға да болады.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Куәліктерді жіберу</h1> Сіздің куәлігіңізсіз хат алушысы хат шын "
+#~ "Сіз жіберген түрде, ешбір бөтен жақтан өзгеріс енізілмеген екенің тексере "
+#~ "алмайды. <p> Алушы куәлігіңізді орталық серверден ала алады, немесе өз "
+#~ "куәлігіңізді хатпен бірге де жібере аласыз. Сіз куәлікті хатпен бірге "
+#~ "жіберу-жібермеуді, тек өз куәлігіңізді немесе куәліктердің бүкіл тізбегін "
+#~ "жіберуді, куәліктер тізбегіне түбірлік куәлікті қосу-қоспауды таңдай "
+#~ "аласыз. <p> Ең болмаса хатпен бірге әрқашанда өз куәлігіңізді жіберу жөн. "
+#~ "<p> Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен "
+#~ "айнуға да болады.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Ж&еке куәлігіңізді жіберу"
@@ -15408,21 +15111,27 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgstr "Хаттың бүкіл &бөліктері қолтаңбалансын"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Хаттын бүкіл бөліктерін қолтаңбалау әдетті болсын десеңіз осы құсбелгіні қойыңыз"
+#~ msgstr ""
+#~ "Хаттын бүкіл бөліктерін қолтаңбалау әдетті болсын десеңіз осы құсбелгіні "
+#~ "қойыңыз"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Хаттың бүкіл бөліктерін қолтаңбалау әдетті болсын</h1>\n"
-#~ "Құсбелгісі қойылса, хаттың барлық бөлігін (яғни хаттың беті мен барлық тіркемелерін) қолтаңбалау әдетті болады.\n"
+#~ "Құсбелгісі қойылса, хаттың барлық бөлігін (яғни хаттың беті мен барлық "
+#~ "тіркемелерін) қолтаңбалау әдетті болады.\n"
 #~ "<p>\n"
-#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен айнуға да болады.\n"
+#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен "
+#~ "айнуға да болады.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15434,12 +15143,15 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Әрбір бөлігінің қолтаңбалауын сұрау</h1>\n"
-#~ "Құсбелгісі қойылса, хаттың барлық бөлігін (яғни хаттың беті мен барлық тіркемелерін) қолтаңбалау алдында сұрау әдетті болады.\n"
+#~ "Құсбелгісі қойылса, хаттың барлық бөлігін (яғни хаттың беті мен барлық "
+#~ "тіркемелерін) қолтаңбалау алдында сұрау әдетті болады.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15453,16 +15165,19 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Хаттар қолтаңбаланбасын</h1>\n"
 #~ "Құсбелгісі қойылса, хатты қолтаңбаламау әдетті болады. <p>\n"
-#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен айнуға да болады.\n"
+#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен "
+#~ "айнуға да болады.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Қолтаңба куәлігі <em>Куәліктер</em> бетінде бапталады."
 
 #~ msgid "RSA + SHA-1"
@@ -15474,20 +15189,33 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Қолтаңба алгоритмі</h1>\n"
-#~ "Алгоритм деген компьютерге берілетін, тапсырманы қалай орындайтынын белгілейтін, нұсқауы. Қолтаңбалау алгоритмі - компьютерге берілген, алушының кілтін қолданып, хат шын Сізден екенін растауды анықтайтын нұсқау.\n"
+#~ "Алгоритм деген компьютерге берілетін, тапсырманы қалай орындайтынын "
+#~ "белгілейтін, нұсқауы. Қолтаңбалау алгоритмі - компьютерге берілген, "
+#~ "алушының кілтін қолданып, хат шын Сізден екенін растауды анықтайтын "
+#~ "нұсқау.\n"
 #~ "<p>\n"
-#~ "Қолтаңбалау алгоритмін таңдау, Сіздің атыңыздан жалған хатты жіберунің күрделілігін анықтайды. Дегенмен, SPHINX ортасындағы барлық алгоритмдер өте мықты деп саналады. Сонымен әдеттегісі де әбден сенімді.\n"
+#~ "Қолтаңбалау алгоритмін таңдау, Сіздің атыңыздан жалған хатты жіберунің "
+#~ "күрделілігін анықтайды. Дегенмен, SPHINX ортасындағы барлық алгоритмдер "
+#~ "өте мықты деп саналады. Сонымен әдеттегісі де әбден сенімді.\n"
 #~ "<p>\n"
-#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен айнуға да болады.\n"
+#~ "Бұл әдетті таңдау, қалауыңыз бойынша әрбір жеке хат үшін бұл әдеттен "
+#~ "айнуға да болады.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15502,12 +15230,16 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Хаттар қолтаңбасымен сақталсын</h1>\n"
-#~ "Құсбелгісі қойылса жіберілген хаттар қолтаңбасымен бірге сақталады. Бұл параметрді таңдап қойған жөн, өйткені бұл кейін хат не оның бөлігі қолтаңбаланғанына көз жеткізуге мүмкіндік береді.\n"
+#~ "Құсбелгісі қойылса жіберілген хаттар қолтаңбасымен бірге сақталады. Бұл "
+#~ "параметрді таңдап қойған жөн, өйткені бұл кейін хат не оның бөлігі "
+#~ "қолтаңбаланғанына көз жеткізуге мүмкіндік береді.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15517,34 +15249,47 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgstr "MIME стан&дарты"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Multipart/Signed дегеннің мазмұнында қолтаңба және қолтаңбаланған деректер."
+#~ msgstr ""
+#~ "Multipart/Signed дегеннің мазмұнында қолтаңба және қолтаңбаланған "
+#~ "деректер."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Қолтаңба жеке бөлігінде</h1>\n"
-#~ "Құсбелгісі қойылса, қолтаңба мен қолтаңбаланған деректер Multipart/Signed хаттың жеке бөлігінде орналасады. Пайдаланушының пошталық бағдарламасы, қолтаңба алгоритмін және ASN.1 декодтауын қолдамаса да қолтаңбаланған деректер оқылады.\n"
+#~ "Құсбелгісі қойылса, қолтаңба мен қолтаңбаланған деректер Multipart/Signed "
+#~ "хаттың жеке бөлігінде орналасады. Пайдаланушының пошталық бағдарламасы, "
+#~ "қолтаңба алгоритмін және ASN.1 декодтауын қолдамаса да қолтаңбаланған "
+#~ "деректер оқылады.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
 #~ msgstr "&Мөлдірліксіз (тек SPHINX ортасында ғана жөнді)"
 
 #~ msgid "Signature and signed data encoded in one ASN.1 block."
-#~ msgstr "Қолтаңба және қолтаңбаланған деректері бір ASN.1 блогында кодталған."
+#~ msgstr ""
+#~ "Қолтаңба және қолтаңбаланған деректері бір ASN.1 блогында кодталған."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Мөлдірліксіз қолтаңбаланған хаттар</h1>\n"
-#~ "Құсбелгісі қойылса, қолтаңба және қолтаңбаланған деректері бір ASN.1 блогында кодталады. Хаттарды тек ASN.1 декодтауын қолдайтын пошта бағдарламасымен оқуға болады.\n"
+#~ "Құсбелгісі қойылса, қолтаңба және қолтаңбаланған деректері бір ASN.1 "
+#~ "блогында кодталады. Хаттарды тек ASN.1 декодтауын қолдайтын пошта "
+#~ "бағдарламасымен оқуға болады.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15556,8 +15301,23 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "PIN-кодын қаншама жиі келтіру керектігін таңдаңыз"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN-кодын келтіру</h1>Мұнда, куәлігіңіздер жатқан жеке қауіпсіздік ортаға (PSE, Personal Security Environment) қатынау үшін, PIN-кодыңызді қаншалықты жиі келтіру керектігін таңдауыңызға болады. <p> PIN-кодын жиі енгізгенде Сіздің атыңыздан жалған  поштаны жіберу мүмкіндігінен күштірек қорғаулы боласыз, бірақ бағдарламамен жұмыс істеу ыңғайсызданады. <p> Күмәндансаңыз, бұны өзгертпей бар күйінде қалдырыңыз. <p> Есіңізде болсын, PIN-кодын мүлдем келтірмеуі қауіпсіздік себебтерінен мүмкін емес.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN-кодын келтіру</h1>Мұнда, куәлігіңіздер жатқан жеке "
+#~ "қауіпсіздік ортаға (PSE, Personal Security Environment) қатынау үшін, PIN-"
+#~ "кодыңызді қаншалықты жиі келтіру керектігін таңдауыңызға болады. <p> PIN-"
+#~ "кодын жиі енгізгенде Сіздің атыңыздан жалған  поштаны жіберу "
+#~ "мүмкіндігінен күштірек қорғаулы боласыз, бірақ бағдарламамен жұмыс істеу "
+#~ "ыңғайсызданады. <p> Күмәндансаңыз, бұны өзгертпей бар күйінде қалдырыңыз. "
+#~ "<p> Есіңізде болсын, PIN-кодын мүлдем келтірмеуі қауіпсіздік себебтерінен "
+#~ "мүмкін емес.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Сеанстың басында бір рет"
@@ -15574,16 +15334,21 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Куәліктің мерзімі жақында бітетін болса, ескерту</h1>\n"
-#~ " Құсбелгісі қойылса, қолтаңбалауға қолданып жатқан куәліктің келтірілген күннен кейін мерзімі бітетіні туралы ескертіледі.\n"
+#~ " Құсбелгісі қойылса, қолтаңбалауға қолданып жатқан куәліктің келтірілген "
+#~ "күннен кейін мерзімі бітетіні туралы ескертіледі.\n"
 #~ "<p>\n"
-#~ "Мерзімі жуық арада бітетін куәліктерді қолдануды болдырмау үшін осы параметрді таңдау жөн.\n"
+#~ "Мерзімі жуық арада бітетін куәліктерді қолдануды болдырмау үшін осы "
+#~ "параметрді таңдау жөн.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15595,13 +15360,15 @@ msgstr "Файл үстінен жаза берейік пе?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Куәлікте қолтаңбалаушының эл.пошта адресі болмаса, ескерту</h1>\n"
-#~ "Құсбелгісі қойылса, қолтаңбалауға қолданылатын куәлікте алушының эл.пошта адресі жоқ болған жағдайда ескерту жасалады.\n"
+#~ "Құсбелгісі қойылса, қолтаңбалауға қолданылатын куәлікте алушының эл.пошта "
+#~ "адресі жоқ болған жағдайда ескерту жасалады.\n"
 #~ "<p>Тұтастығын сақтау үшін осы параметрдің қосылып тұрғаны жөн.\n"
 #~ "</qt>"
diff --git a/tde-i18n-km/messages/tdepim/kmail.po b/tde-i18n-km/messages/tdepim/kmail.po
index 3c594be4630..e054b8ae398 100644
--- a/tde-i18n-km/messages/tdepim/kmail.po
+++ b/tde-i18n-km/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-04 09:36+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"khoemsokhem@khmeros.info,soursdey@khmeros.info, "
-"evannak@khmeros.info,piseth_dv@khmeros.info"
+"khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
+"piseth_dv@khmeros.info"
 
 #: aboutdata.cpp:53
 msgid "Maintainer"
@@ -172,6 +172,12 @@ msgstr "គ្មាន (ប្រើដោយ​ប្រុងប្រយ័�
 msgid "Account for semiautomatic resource handling"
 msgstr "គណនី​សម្រាប់​ការ​ប្រើប្រាស់​ធនធាន​ពាក់កណ្ដាល​ស្វ័យប្រវត្តិ"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "ជម្រះ​អ្វីចាស់ៗ"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -186,8 +192,7 @@ msgstr "ជម្រះ​អ្វីចាស់ៗ"
 #: accountdialog.cpp:1036
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
-msgstr ""
-"លុប​ការបម្រុងទុក​ដែល​ហួស​សម័យ​សម្រាប់​ធនធាន​ដែល​បាន​តំណាង​ដោយ​គណនី​នេះ ។"
+msgstr "លុប​ការបម្រុងទុក​ដែល​ហួស​សម័យ​សម្រាប់​ធនធាន​ដែល​បាន​តំណាង​ដោយ​គណនី​នេះ ។"
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -247,15 +252,13 @@ msgstr "ឈ្មោះចូល ៖"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"ក្រុមហ៊ុន​ផ្ដល់​សេវា​អ៊ីនធឺណិតរបស់​អ្នក​ បាន​ផ្ដល់​ឲ្យ​អ្នក​នូវ <em>"
-"ឈ្មោះ​អ្នកប្រើ</em> "
-"ដែល​ត្រូវបាន​ប្រើដើម្បី​ផ្ទៀងផ្ទាត់​ភាពត្រឹមត្រូវ​របស់​អ្នក​ជាមួយនឹង​​ម៉ាស៊ីនបម្"
-"រើ​របស់​ពួកគេ ។ ជាធម្មតា​ វាជា​ផ្នែក​ដំបូង​នៃ​អាសយដ្ឋាន​អ៊ីមែល​របស់អ្នក "
-"(នៅពីមុខ <em>@</em>) ។"
+"ក្រុមហ៊ុន​ផ្ដល់​សេវា​អ៊ីនធឺណិតរបស់​អ្នក​ បាន​ផ្ដល់​ឲ្យ​អ្នក​នូវ <em>ឈ្មោះ​អ្នកប្រើ</em> ដែល​ត្រូវបាន​ប្រើដើម្បី​"
+"ផ្ទៀងផ្ទាត់​ភាពត្រឹមត្រូវ​របស់​អ្នក​ជាមួយនឹង​​ម៉ាស៊ីនបម្រើ​របស់​ពួកគេ ។ ជាធម្មតា​ វាជា​ផ្នែក​ដំបូង​នៃ​អាសយដ្ឋាន​"
+"អ៊ីមែល​របស់អ្នក (នៅពីមុខ <em>@</em>) ។"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -276,21 +279,18 @@ msgstr "ទុក​ពាក្យសម្ងាត់ POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "ធីក​ជម្រើស​នេះ​ដើម្បី​ឲ្យ KMail ទុក​ពាក្យ​សម្ងាត់ ។\n"
-"ប្រសិន​បើ​មាន TDEWallet នោះពាក្យ​សម្ងាត់​មឹងត្រូវបាន​ទុក​នៅទីនោះ "
-"ដែលត្រូវបានគិតថា​មានសុវត្ថិភាព ។\n"
-"យ៉ាងណា​ក៏ដោយ ប្រសិនបើ​មាន TDEWallet  "
-"ពាក្យ​សម្ងាត់​នឹងត្រូវបាន​ទុក​នៅក្នុងឯកសារ​កំណត់រចនាសម្ព័ន្ធ​​របស់ KMail​ ។ "
-"ពាក្យ​សម្ងាត់​គឺ​ត្រូវបាន​ទុក​​នៅក្នុង​ទ្រង់ទ្រាយ​បិទបាំង "
-"ប៉ុន្តែ​មិនគួរ​ត្រូវបាន​គិតថា​មាន​សុវត្ថិភាព​ពីការបង្ខំ​ឌិគ្រីបទេ "
-"ប្រសិន​បើ​ចូល​ដំណើរការទៅឯកសារ​កំណត់​រចនា​សម្ព័ន្ធ គឺ​ត្រូវបានយក ។"
+"ប្រសិន​បើ​មាន TDEWallet នោះពាក្យ​សម្ងាត់​មឹងត្រូវបាន​ទុក​នៅទីនោះ ដែលត្រូវបានគិតថា​មានសុវត្ថិភាព ។\n"
+"យ៉ាងណា​ក៏ដោយ ប្រសិនបើ​មាន TDEWallet  ពាក្យ​សម្ងាត់​នឹងត្រូវបាន​ទុក​នៅក្នុងឯកសារ​កំណត់រចនាសម្ព័ន្ធ​​របស់ "
+"KMail​ ។ ពាក្យ​សម្ងាត់​គឺ​ត្រូវបាន​ទុក​​នៅក្នុង​ទ្រង់ទ្រាយ​បិទបាំង ប៉ុន្តែ​មិនគួរ​ត្រូវបាន​គិតថា​មាន​សុវត្ថិភាព​"
+"ពីការបង្ខំ​ឌិគ្រីបទេ ប្រសិន​បើ​ចូល​ដំណើរការទៅឯកសារ​កំណត់​រចនា​សម្ព័ន្ធ គឺ​ត្រូវបានយក ។"
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -318,11 +318,11 @@ msgstr "ត្រង​សារ​ បើ​ពួកវា​ធំជាង"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"ប្រសិនបើ​អ្នក​ជ្រើស​ជម្រើស​នេះ, តម្រង POP "
-"នឹង​ត្រូវបាន​ប្រើ​ដើម្បី​សម្រេចថានឹងធ្វើអ្វី​ជាមួយ​នឹងសារ ។ "
+"ប្រសិនបើ​អ្នក​ជ្រើស​ជម្រើស​នេះ, តម្រង POP នឹង​ត្រូវបាន​ប្រើ​ដើម្បី​សម្រេចថានឹងធ្វើអ្វី​ជាមួយ​នឹងសារ ។ "
 "នៅពេល​នោះ​អ្នកអាច​ជ្រើសដើម្បី​ ទាញយក លុប ឬ ទុកពួកវា​នៅលើ​ម៉ាស៊ីន​បម្រើ ។"
 
 #: accountdialog.cpp:737
@@ -372,13 +372,15 @@ msgstr "ជម្រះ​អត្ថបទ"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "ចូល"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "ធម្មតា"
 
@@ -421,21 +423,17 @@ msgstr "ចន្លោះ​ឈ្មោះ ៖"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"នៅទី​នេះ​អ្នក​ឃើញ​ចន្លោះឈ្មោះ​​ផ្សេងគ្នា ដែឡ​ម៉ាស៊ីនបម្រើ​ IMAP "
-"របស់អ្នកគាំទ្រ ។ "
-"ចន្លោះ​ឈ្មោះ​នីមួយៗ​តំណាង​ឲ្យ​បុព្វបទ​មួយ​ដែល​បំបែក​ក្រុម​របស់ថត ។ "
-"ចន្លោះ​ឈ្មោះអនុញ្ញាត​ឲ្យ​ KMail ឧទាហរណ៍ ឲ្យវាបង្ហាញ​ថត​ផ្ទាល់ខ្លួន​របស់អ្នក​ "
-"និង​បាន​ចែក​រំលែក​ថត​នៅក្នុង​គណនី​មួយ ។"
+"នៅទី​នេះ​អ្នក​ឃើញ​ចន្លោះឈ្មោះ​​ផ្សេងគ្នា ដែឡ​ម៉ាស៊ីនបម្រើ​ IMAP របស់អ្នកគាំទ្រ ។ ចន្លោះ​ឈ្មោះ​នីមួយៗ​តំណាង​"
+"ឲ្យ​បុព្វបទ​មួយ​ដែល​បំបែក​ក្រុម​របស់ថត ។ ចន្លោះ​ឈ្មោះអនុញ្ញាត​ឲ្យ​ KMail ឧទាហរណ៍ ឲ្យវាបង្ហាញ​ថត​ផ្ទាល់ខ្លួន​"
+"របស់អ្នក​ និង​បាន​ចែក​រំលែក​ថត​នៅក្នុង​គណនី​មួយ ។"
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
-msgstr ""
-"ផ្ទុក​ចន្លោះឈ្មោះ​ពី​ម៉ាស៊ីន​បម្រើ​ឡើងវិញ ។ "
-"វានឹង​សរសេរជាន់លើ​ការផ្លាស់ប្ដូរ​មួយចំនួន ។"
+msgstr "ផ្ទុក​ចន្លោះឈ្មោះ​ពី​ម៉ាស៊ីន​បម្រើ​ឡើងវិញ ។ វានឹង​សរសេរជាន់លើ​ការផ្លាស់ប្ដូរ​មួយចំនួន ។"
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -488,14 +486,12 @@ msgstr "ផ្ទុក​ឯកសារភ្ជាប់​បើ​ទាម
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"ជ្រើស​ជម្រើស​នេះ ដើម្បី​មិន​ផ្ទុក​ឯកសារភ្ជាប់​ដោយ​ស្វ័យប្រវត្តិ "
-"នៅ​ពេល​អ្នក​ជ្រើស​អ៊ីមែល "
-"ប៉ុន្តែ​ផ្ទុក​ដោយ​ស្វ័យប្រវត្តិ​តែ​នៅ​ពេល​អ្នក​ចុច​លើ​ឯកសារ​ភ្ជាប់​ប៉ុណ្ណោះ ។ "
-"ដោយ​ប្រើ​វិធីនេះ សារ​ធំៗ​នឹង​ត្រូវ​បាន​បង្ហាញ​ភ្លាមៗ ។"
+"ជ្រើស​ជម្រើស​នេះ ដើម្បី​មិន​ផ្ទុក​ឯកសារភ្ជាប់​ដោយ​ស្វ័យប្រវត្តិ នៅ​ពេល​អ្នក​ជ្រើស​អ៊ីមែល ប៉ុន្តែ​ផ្ទុក​ដោយ​"
+"ស្វ័យប្រវត្តិ​តែ​នៅ​ពេល​អ្នក​ចុច​លើ​ឯកសារ​ភ្ជាប់​ប៉ុណ្ណោះ ។ ដោយ​ប្រើ​វិធីនេះ សារ​ធំៗ​នឹង​ត្រូវ​បាន​បង្ហាញ​ភ្លាមៗ ។"
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -506,9 +502,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"មាន​តែថត​ដែលបានបើក (បានបន្លាយ) នៅក្នុង​ថត​ដើមឈើប៉ុណ្ណោះ "
-"ដែលត្រូវបានពិនិត្យ​សម្រាប់​ថតរង ។ "
-"ប្រើ​វា​ប្រសិនបើ​មាន​ថត​ច្រើន​នៅលើ​ម៉ាស៊ីនបម្រើ ។"
+"មាន​តែថត​ដែលបានបើក (បានបន្លាយ) នៅក្នុង​ថត​ដើមឈើប៉ុណ្ណោះ ដែលត្រូវបានពិនិត្យ​សម្រាប់​ថតរង ។ ប្រើ​វា​"
+"ប្រសិនបើ​មាន​ថត​ច្រើន​នៅលើ​ម៉ាស៊ីនបម្រើ ។"
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -536,7 +531,7 @@ msgstr "​<គ្មាន>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "ប្រអប់​ទទួល"
 
@@ -544,48 +539,45 @@ msgstr "ប្រអប់​ទទួល"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"ម៉ាស៊ីន​បម្រើ​​ហាក់ដូចជាមិនគាំទ្រ​ចំនួនសារ​ដែលមានតែមួយគត់ឡើយ "
-"ប៉ុន្តែ​នេះ​ជា​តម្រូវការ​សម្រាប់​ការទុកសារ​នៅលើ​ម៉ាស៊ីន​បម្រើ ។\n"
-"ចាប់តាំងពី​ម៉ាស៊ីនបម្រើ​មួយចំនួន​​មិនបាន​ប្រកាស់ពី​សមត្ថភាព​​របស់ពួកគេឲ្យត្រឹមត្"
-"រូវ អ្នកនៅតែមាន​លទ្ធភាព​​បើក​ការទុក​សារដែលបានទៅ​ប្រមូលយកនៅលើ​ម៉ាស៊ីនបម្រើ​បាន ។"
+"ម៉ាស៊ីន​បម្រើ​​ហាក់ដូចជាមិនគាំទ្រ​ចំនួនសារ​ដែលមានតែមួយគត់ឡើយ ប៉ុន្តែ​នេះ​ជា​តម្រូវការ​សម្រាប់​ការទុកសារ​នៅលើ​"
+"ម៉ាស៊ីន​បម្រើ ។\n"
+"ចាប់តាំងពី​ម៉ាស៊ីនបម្រើ​មួយចំនួន​​មិនបាន​ប្រកាស់ពី​សមត្ថភាព​​របស់ពួកគេឲ្យត្រឹមត្រូវ អ្នកនៅតែមាន​លទ្ធភាព​​បើក​"
+"ការទុក​សារដែលបានទៅ​ប្រមូលយកនៅលើ​ម៉ាស៊ីនបម្រើ​បាន ។"
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"ម៉ាស៊ីន​បម្រើ​ហាក់ដូចជា​មិន​គាំទ្រ​ការទៅប្រមូល​យក​បឋមកថារបស់​សារឡើយ "
-"ប៉ុន្តែ​នេះ​ជា​តម្រូវការ​សម្រាប់​សារ​តម្រង​នៅលើ​ម៉ាស៊ីន​បម្រើ ។\n"
-"ចាប់តាំងពី​ម៉ាស៊ីន​បម្រើ​មួយ​ចំនួន​មិនបាន​ប្រកាស់សម្ថភាព​របស់គេ​ត្រឹមត្រូ "
-"អ្នកនៅតែ​មាន​លទ្ធភាព​បើក​​សារតម្រង​នៅលើ​ម៉ាស៊ីន​បម្រើ​បាន ។"
+"ម៉ាស៊ីន​បម្រើ​ហាក់ដូចជា​មិន​គាំទ្រ​ការទៅប្រមូល​យក​បឋមកថារបស់​សារឡើយ ប៉ុន្តែ​នេះ​ជា​តម្រូវការ​សម្រាប់​សារ​តម្រង​"
+"នៅលើ​ម៉ាស៊ីន​បម្រើ ។\n"
+"ចាប់តាំងពី​ម៉ាស៊ីន​បម្រើ​មួយ​ចំនួន​មិនបាន​ប្រកាស់សម្ថភាព​របស់គេ​ត្រឹមត្រូ អ្នកនៅតែ​មាន​លទ្ធភាព​បើក​​សារតម្រង​នៅលើ​"
+"ម៉ាស៊ីន​បម្រើ​បាន ។"
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"សូម​ចំណាំ​ថា លក្ខណៈ​ពិសេស​នេះ​អាច​បង្ក​ឲ្យ​ម៉ាស៊ីន​បម្រើ POP3 "
-"មួយចំនួនដែល​មិនគាំទ្រ​ការផ្ញើ​តាមបំពង់​ផ្ញើ​សំបុត្រ​ដែល​ខូច ។\n"
-"ថ្វី​បើការនេះ​អាចកំណត់រចនាសម្ព័ន្ធ​បានក៏ដោយ "
-"ព្រោះ​ម៉ាស៊ីន​បម្រើ​មួយចំនួន​គាំទ្រការ​ផ្ញើតាម​បំពង់ "
-"ប៉ុន្តែ​មិន​ប្រកាស់​សមត្ថភាព​របស់ពួកគេឡើយ ។ ដើម្បី​ពិនិត្យ​មើល​ថាតើ "
-"ម៉ាស៊ីន​បម្រើ​ POP3 របស់អ្នក​ប្រកាស់​ការគាំទ្រ​ការផ្ញើតាមបំពង់​ឬអត់ "
-"សូមប្រើ​ប៊ូតុង \"ពិនិត្យ​មើល​អ្វីដែល​ម៉ាស៊ីនបម្រើ​គាំទ្រ\" "
-"នៅខាងក្រោម​នៃ​ប្រអប់ ។\n"
-"ប្រសិនបើ​ម៉ាស៊ីន​បម្រើរបស់អ្នក​មិនប្រកាស់វាទេ ប៉ុន្តែ​អ្នកចង់​ឲ្យ​ផ្ញើលឿនជាងមុន "
-"ពេលនោះ​អ្នក​គួរតែ​ធ្វើការសាកល្បង​ណាមួយ​ជាមុន​ដោយ​ផ្ញើ​​បណ្ដុំសំបុត្រ​របស់អ្នក​ផ្"
-"ទាល់ ហើយនិង​តាម​ការទាញយក​វា ។"
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"សូម​ចំណាំ​ថា លក្ខណៈ​ពិសេស​នេះ​អាច​បង្ក​ឲ្យ​ម៉ាស៊ីន​បម្រើ POP3 មួយចំនួនដែល​មិនគាំទ្រ​ការផ្ញើ​តាមបំពង់​ផ្ញើ​សំបុត្រ​"
+"ដែល​ខូច ។\n"
+"ថ្វី​បើការនេះ​អាចកំណត់រចនាសម្ព័ន្ធ​បានក៏ដោយ ព្រោះ​ម៉ាស៊ីន​បម្រើ​មួយចំនួន​គាំទ្រការ​ផ្ញើតាម​បំពង់ ប៉ុន្តែ​មិន​"
+"ប្រកាស់​សមត្ថភាព​របស់ពួកគេឡើយ ។ ដើម្បី​ពិនិត្យ​មើល​ថាតើ ម៉ាស៊ីន​បម្រើ​ POP3 របស់អ្នក​ប្រកាស់​ការគាំទ្រ​"
+"ការផ្ញើតាមបំពង់​ឬអត់ សូមប្រើ​ប៊ូតុង \"ពិនិត្យ​មើល​អ្វីដែល​ម៉ាស៊ីនបម្រើ​គាំទ្រ\" នៅខាងក្រោម​នៃ​ប្រអប់ ។\n"
+"ប្រសិនបើ​ម៉ាស៊ីន​បម្រើរបស់អ្នក​មិនប្រកាស់វាទេ ប៉ុន្តែ​អ្នកចង់​ឲ្យ​ផ្ញើលឿនជាងមុន ពេលនោះ​អ្នក​គួរតែ​"
+"ធ្វើការសាកល្បង​ណាមួយ​ជាមុន​ដោយ​ផ្ញើ​​បណ្ដុំសំបុត្រ​របស់អ្នក​ផ្ទាល់ ហើយនិង​តាម​ការទាញយក​វា ។"
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -593,53 +585,47 @@ msgstr "សូម​បញ្ជាក់​ម៉ាស៊ីនបម្រើ
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"ម៉ាស៊ីន​បម្រើ​​ហាក់ដូចជាមិន​គាំទ្រ​ការផ្ញើ​តាមបំពុងឡើយ ។ ដូច្នេះ "
-"ជម្រើស​នេះ​ត្រូវបានបិទ ។\n"
-"ចាប់តាំងពី​ម៉ាស៊ីនបម្រើ​មិនប្រកាស់​សមត្ថភាព​របស់ពួកគេ​ត្រឹមត្រូវ "
-"អ្នកនៅតែមាន​លទ្ធភាព​បើក​ការផ្ញើតាមបំពង់បាន ។ ប៉ុន្តែ​សូមចំណាំថា "
-"លក្ខណៈពិសេស​នេះ​អាច​បង្កឲ្យ​ម៉ាស៊ីន​បម្រើ POP "
-"មួយចំនួន​ដែល​មិនគាំទ្រ​ការផ្ញើតាម​បំពង់​ដើម្បីផ្ញើ​សារដែលខូច ។ "
-"ដូចនេះ​មុនពេល​ប្រើ​លក្ខណៈពិសេស​នេះ​​ជាមួយ​សំបុត្រ​សំខាន់ "
-"អ្នកគួរតែ​សាកល្បង​វា​ដោយ​ផ្ញើ​ចំនួន​នៃ​សារដែលបានសាកល្បង​ដែលមានទំហំធំជាងទៅកាន់ខ្ល"
-"ួន​របស់អ្នកផ្ទាល់ ដែល​អ្នកទាំងទាញយក​ទាំងអស់ពីក្នុងការផ្ញើ​មួយពិ​ម៉ាស៊ីនបម្រើ "
-"POP ។"
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​​ហាក់ដូចជាមិន​គាំទ្រ​ការផ្ញើ​តាមបំពុងឡើយ ។ ដូច្នេះ ជម្រើស​នេះ​ត្រូវបានបិទ ។\n"
+"ចាប់តាំងពី​ម៉ាស៊ីនបម្រើ​មិនប្រកាស់​សមត្ថភាព​របស់ពួកគេ​ត្រឹមត្រូវ អ្នកនៅតែមាន​លទ្ធភាព​បើក​"
+"ការផ្ញើតាមបំពង់បាន ។ ប៉ុន្តែ​សូមចំណាំថា លក្ខណៈពិសេស​នេះ​អាច​បង្កឲ្យ​ម៉ាស៊ីន​បម្រើ POP មួយចំនួន​ដែល​មិនគាំទ្រ​"
+"ការផ្ញើតាម​បំពង់​ដើម្បីផ្ញើ​សារដែលខូច ។ ដូចនេះ​មុនពេល​ប្រើ​លក្ខណៈពិសេស​នេះ​​ជាមួយ​សំបុត្រ​សំខាន់ អ្នកគួរតែ​"
+"សាកល្បង​វា​ដោយ​ផ្ញើ​ចំនួន​នៃ​សារដែលបានសាកល្បង​ដែលមានទំហំធំជាងទៅកាន់ខ្លួន​របស់អ្នកផ្ទាល់ ដែល​"
+"អ្នកទាំងទាញយក​ទាំងអស់ពីក្នុងការផ្ញើ​មួយពិ​ម៉ាស៊ីនបម្រើ POP ។"
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"ម៉ាស៊ីនបម្រើហាក់ដូចជា​មិន​គាំទ្រ​ចំនួនសារដែល​មានតែមួយគត់ "
-"ប៉ុន្តែ​​នេះ​ជាតម្រូវការ​សម្រាប់​ក្នុង​ការទុក​សារនៅលើ​ម៉ាស៊ីន​បម្រើ ។ ដូច្នេះ "
-"ជម្រើសនេះត្រូវបានបិទ ។\n"
-"ចាប់តាំងពី​ម៉ាស៊ីន​បម្រើ​មួយ​ចំនួនមិនប្រកាស់​សមត្ថភាព​របស់ពួកវា​ឲ្យត្រឹមត្រូវ​ "
-"អ្នកនៅតែមាន​លទ្ធភាព​បើកការ​​ទុក​សារដែលបានទៅយក​នៅលើម៉ាស៊ីនបម្រើឲ្យ​បើក ។"
+"ម៉ាស៊ីនបម្រើហាក់ដូចជា​មិន​គាំទ្រ​ចំនួនសារដែល​មានតែមួយគត់ ប៉ុន្តែ​​នេះ​ជាតម្រូវការ​សម្រាប់​ក្នុង​ការទុក​សារនៅលើ​"
+"ម៉ាស៊ីន​បម្រើ ។ ដូច្នេះ ជម្រើសនេះត្រូវបានបិទ ។\n"
+"ចាប់តាំងពី​ម៉ាស៊ីន​បម្រើ​មួយ​ចំនួនមិនប្រកាស់​សមត្ថភាព​របស់ពួកវា​ឲ្យត្រឹមត្រូវ​ អ្នកនៅតែមាន​លទ្ធភាព​បើកការ​​ទុក​"
+"សារដែលបានទៅយក​នៅលើម៉ាស៊ីនបម្រើឲ្យ​បើក ។"
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"ម៉ាស៊ីន​បម្រើ​ហាក់ដូចជាមិន​គាំទ្រ​ការទៅ​ប្រមូលយក​​បឋមកថា​សា "
-"ប៉ុន្តែ​នេះ​ជាតម្រូវការ​សម្រាប់​សារតម្រង​នៅលើ​ម៉ាស៊ីនបម្រើ ។ ដូចនេះ "
-"នេះជាជម្រើស​ដែលបាន​បិទ ។\n"
-"ចាប់តាំងពី​ម៉ាស៊ីនបម្រើ​មួយចំនួន​​មិន​ប្រកាស់​សមត្ថភាព​របស់ពួកគេ "
-"អ្នក​នៅតែលទ្ធភាព​ក្នុង​ការបើក​សារតម្រង​នៅលើម៉ាស៊ីន​បម្រើ​បាន ។"
+"ម៉ាស៊ីន​បម្រើ​ហាក់ដូចជាមិន​គាំទ្រ​ការទៅ​ប្រមូលយក​​បឋមកថា​សា ប៉ុន្តែ​នេះ​ជាតម្រូវការ​សម្រាប់​សារតម្រង​នៅលើ​"
+"ម៉ាស៊ីនបម្រើ ។ ដូចនេះ នេះជាជម្រើស​ដែលបាន​បិទ ។\n"
+"ចាប់តាំងពី​ម៉ាស៊ីនបម្រើ​មួយចំនួន​​មិន​ប្រកាស់​សមត្ថភាព​របស់ពួកគេ អ្នក​នៅតែលទ្ធភាព​ក្នុង​ការបើក​សារតម្រង​"
+"នៅលើម៉ាស៊ីន​បម្រើ​បាន ។"
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -713,11 +699,9 @@ msgstr "គណនី IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
-msgstr ""
-"អ្នកត្រូវ​បន្ថែម​គណនី​មួយ​នៅក្នុង​ផ្នែក​បណ្ដាញ​នៃ​ការកំណត់​ "
-"ដើម្បីទទួល​សំបុត្រ​បាន ។"
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
+msgstr "អ្នកត្រូវ​បន្ថែម​គណនី​មួយ​នៅក្នុង​ផ្នែក​បណ្ដាញ​នៃ​ការកំណត់​ ដើម្បីទទួល​សំបុត្រ​បាន ។"
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -753,15 +737,13 @@ msgstr "សូមស្វាគមន៍​ការ​មកកាន់ KMail
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>អ្នក​ដូចជា​ទើប​តែ​ចាប់ផ្ដើម KMail ជាលើក​ដំបូង ។ "
-"អ្នក​អាច​ប្រើ​អ្នក​ជំនួយការ​នេះ ដើម្បី​រៀបចំ​គណនី​សំបុត្រ​របស់​អ្នក ។ "
-"អ្នក​គ្រាន់​តែ​បញ្ចូល​ទិន្នន័យ​ដែ​ល​ទាក់ទង​នឹង​ការ​តភ្ជាប់ "
-"ដែល​អ្នក​បាន​ទទួល​ពី​អ្នក​ផ្ដល់​សេវា​សំបុត្រ​របស់​អ្នក "
-"ទៅ​ក្នុង​ទំព័របន្ទាប់​ជា​ការ​ស្រេច ។</qt>"
+"<qt>អ្នក​ដូចជា​ទើប​តែ​ចាប់ផ្ដើម KMail ជាលើក​ដំបូង ។ អ្នក​អាច​ប្រើ​អ្នក​ជំនួយការ​នេះ ដើម្បី​រៀបចំ​គណនី​"
+"សំបុត្រ​របស់​អ្នក ។ អ្នក​គ្រាន់​តែ​បញ្ចូល​ទិន្នន័យ​ដែ​ល​ទាក់ទង​នឹង​ការ​តភ្ជាប់ ដែល​អ្នក​បាន​ទទួល​ពី​អ្នក​ផ្ដល់​សេវា​សំបុត្រ​"
+"របស់​អ្នក ទៅ​ក្នុង​ទំព័របន្ទាប់​ជា​ការ​ស្រេច ។</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -823,8 +805,7 @@ msgstr "ប្រើ​ការបញ្ចូន​មូលដ្ឋាន"
 msgid "Server Information"
 msgstr "​ព័ត៌មាន​របស់​ម៉ាស៊ីន​បម្រើ"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "​គ្មាន"
@@ -878,8 +859,7 @@ msgstr "ជ្រើស​ដើម្បី​លៃតម្រូវ​ដំ
 
 #: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
-msgstr ""
-"សេចក្ដី​សង្ខេប​នៃ​ការផ្លាស់ប្ដូរដែលត្រូវបាន​បង្កើត​ដោយ​អ្នក​ជំនួយការនេះ"
+msgstr "សេចក្ដី​សង្ខេប​នៃ​ការផ្លាស់ប្ដូរដែលត្រូវបាន​បង្កើត​ដោយ​អ្នក​ជំនួយការនេះ"
 
 #: antispamwizard.cpp:199
 msgid "Virus handling"
@@ -918,8 +898,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>រក​មិន​ឃើញ​ឧបករណ៍​រុករក​សារឥតបានការឡើយ ។ "
-"សូម​ដំឡើង​​កម្មវិធី​រុករក​សារឥតបានការ ហើយ​រត់​អ្នក​ជំនួយការ​នេះ​ម្ដងទៀត ។</p>"
+"<p>រក​មិន​ឃើញ​ឧបករណ៍​រុករក​សារឥតបានការឡើយ ។ សូម​ដំឡើង​​កម្មវិធី​រុករក​សារឥតបានការ ហើយ​រត់​អ្នក​ជំនួយការ​"
+"នេះ​ម្ដងទៀត ។</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -943,8 +923,7 @@ msgstr "<br>មិន​ផ្លាស់ទី​សារ​ឥតបាន�
 
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
-msgstr ""
-"<p>ថត​សម្រាប់​សារ​ដែល​បាន​ចាត់ជា​មិន​ច្បាស់ (ប្រហែល​ជា​ឥតបានការ) គឺ <i>"
+msgstr "<p>ថត​សម្រាប់​សារ​ដែល​បាន​ចាត់ជា​មិន​ច្បាស់ (ប្រហែល​ជា​ឥតបានការ) គឺ <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -964,39 +943,31 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>នៅទី​នេះ​អ្នកអាច​យក​អ្នក​ជំនួយការណ៍​ណាមួយ​ក្នុង​ការ​រៀបចំច្បាប់​តម្រង​របស់ "
-"KMail ដើម្បី​ប្រើ​ឧបករណ៍​ប្រឆាំង​នឹង​មេរោគ​ដែល​បាន​ស្គាល់ជាទូទៅ ​។</p>"
-"<p>អ្នកជំនួយការណ៍​អាច​រុករក​ឧបករណ៍​ទាំងនោះ​នៅលើ​កុំព្យូទ័រ​របស់អ្នក​ "
-"ដែល​ល្អ​ដូចជា​​បង្កើត​ច្បាប់តម្រង​ដើម្បី​បែងចែកសារ ដោយប្រើ​ឧបករណ៍​ទាំងនោះ ហើយ "
-"ដើម្បី​​​ដាក់សារ​ដែលមាន​មេរោគ​ផ្សេង​ពី​គេ ។ "
-"អ្នកជំនួយការណ៍នឹង​មិនយក​ច្បាប់តម្រង​ដែល​មាន​​មួយចំនួន​ទៅក្នុង​ការគិត​ ៖ "
-"វានឹង​បន្ថែម​ខាងចុង​​ច្បាប់ថ្មី​ជានិច្ច ។</p>"
-"<p><b>ព្រមាន ៖</b> នៅពេល​ដែល KMail លេចឡើង​​ "
-"​នោះវា​នឹងត្រូវបាន​គាំង​នៅកំឡុងពេល​ដែល​វិភាគ​សារ​រក​មេរោគ "
-"អ្នកអាចជួបប្រទះ​បញ្ហា​ដែលមានភាព​អើពើ​ពី​ KMail "
-"ព្រោះ​ការប្រតិបត្តិ​ឧបករណ៍​ប្រឆាំង​នឹង​មេរោគ ដែក​ជាទួ​ទៅ​ជាអ្នក​ចំនាយ​ពេលវេលា​។ "
-"សូមគិត​ថា​ការលុប​ច្បាប់តម្រង​បានធ្វើដោយ​អ្នកជំនួយការណ៍​ដែលត្រូវ​ត្រឡប់ទៅកាន់​ឥរិ"
-"យាបថ​ចាស់វិញ ។"
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>នៅទី​នេះ​អ្នកអាច​យក​អ្នក​ជំនួយការណ៍​ណាមួយ​ក្នុង​ការ​រៀបចំច្បាប់​តម្រង​របស់ KMail ដើម្បី​ប្រើ​ឧបករណ៍​ប្រឆាំង​"
+"នឹង​មេរោគ​ដែល​បាន​ស្គាល់ជាទូទៅ ​។</p><p>អ្នកជំនួយការណ៍​អាច​រុករក​ឧបករណ៍​ទាំងនោះ​នៅលើ​កុំព្យូទ័រ​របស់អ្នក​ "
+"ដែល​ល្អ​ដូចជា​​បង្កើត​ច្បាប់តម្រង​ដើម្បី​បែងចែកសារ ដោយប្រើ​ឧបករណ៍​ទាំងនោះ ហើយ ដើម្បី​​​ដាក់សារ​ដែលមាន​"
+"មេរោគ​ផ្សេង​ពី​គេ ។ អ្នកជំនួយការណ៍នឹង​មិនយក​ច្បាប់តម្រង​ដែល​មាន​​មួយចំនួន​ទៅក្នុង​ការគិត​ ៖ វានឹង​បន្ថែម​ខាងចុង​​"
+"ច្បាប់ថ្មី​ជានិច្ច ។</p><p><b>ព្រមាន ៖</b> នៅពេល​ដែល KMail លេចឡើង​​ ​នោះវា​នឹងត្រូវបាន​គាំង​"
+"នៅកំឡុងពេល​ដែល​វិភាគ​សារ​រក​មេរោគ អ្នកអាចជួបប្រទះ​បញ្ហា​ដែលមានភាព​អើពើ​ពី​ KMail ព្រោះ​ការប្រតិបត្តិ​"
+"ឧបករណ៍​ប្រឆាំង​នឹង​មេរោគ ដែក​ជាទួ​ទៅ​ជាអ្នក​ចំនាយ​ពេលវេលា​។ សូមគិត​ថា​ការលុប​ច្បាប់តម្រង​បានធ្វើដោយ​"
+"អ្នកជំនួយការណ៍​ដែលត្រូវ​ត្រឡប់ទៅកាន់​ឥរិយាបថ​ចាស់វិញ ។"
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
-msgstr ""
-"<p>សូម​ជ្រើស​ឧបករណ៍​ដែល​ត្រូវ​តែតែ​បាន​ប្រើ​សម្រាប់​រកឃើញ "
-"និង​ទៅ​ទំព័រ​បន្ទាប់ ។</p>"
+msgstr "<p>សូម​ជ្រើស​ឧបករណ៍​ដែល​ត្រូវ​តែតែ​បាន​ប្រើ​សម្រាប់​រកឃើញ និង​ទៅ​ទំព័រ​បន្ទាប់ ។</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1015,8 +986,7 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"ថតលំនាំដើម​សម្រាប់​សារ​ឥតបានការ​គឺ ថតធុងសំរាម "
-"ប៉ុន្តែ​អ្នក​អាច​ប្ដូរ​វា​នៅ​ក្នុង​ទិដ្ឋភាព​ថត​ខាង​ក្រោម ។"
+"ថតលំនាំដើម​សម្រាប់​សារ​ឥតបានការ​គឺ ថតធុងសំរាម ប៉ុន្តែ​អ្នក​អាច​ប្ដូរ​វា​នៅ​ក្នុង​ទិដ្ឋភាព​ថត​ខាង​ក្រោម ។"
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1024,15 +994,13 @@ msgstr "ផ្លាស់ទីសារ​ដែល​ប្រហែល​ជ
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"ថត​​លំនាំដើមគឺជា​ថត​ប្រអប់ទទួល "
-"ប៉ុន្តែ​អ្នកអាច​ផ្លាស់ប្ដូរ​នៅក្នុង​ទិដ្ឋភាព​ថត​ខាងក្រោម ។"
-"<p>មិនមែន​គ្រប់ឧបករណ៍​នោះទេ​ដែល​គាំទ្រ​ការបែងចែក​​នៅពេល​ដែល​មិនប្រាកដ​នោះ ។ "
-"ប្រសិន​បើអ្នក​មិនបាន​ជ្រើស​ឧបករណ៍​ដែលគួរតែមាន​ទេ អ្នក​ក៏មិនអាចជ្រើស​ថត​បានដែរ ។"
+"ថត​​លំនាំដើមគឺជា​ថត​ប្រអប់ទទួល ប៉ុន្តែ​អ្នកអាច​ផ្លាស់ប្ដូរ​នៅក្នុង​ទិដ្ឋភាព​ថត​ខាងក្រោម ។<p>មិនមែន​គ្រប់ឧបករណ៍​"
+"នោះទេ​ដែល​គាំទ្រ​ការបែងចែក​​នៅពេល​ដែល​មិនប្រាកដ​នោះ ។ ប្រសិន​បើអ្នក​មិនបាន​ជ្រើស​ឧបករណ៍​ដែលគួរតែមាន​"
+"ទេ អ្នក​ក៏មិនអាចជ្រើស​ថត​បានដែរ ។"
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1042,13 +1010,12 @@ msgstr "ពិនិត្យ​មើល​សារ​ដោយប្រើ​
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"អនុញ្ញាត​ឲ្យ​ឧបករណ៍​ប្រឆាំង​នឹង​មេរោគ​ពិនិត្យ​មើល​សាររបស់អ្នក ។ អ្នកជំនួយការ "
-"នឹង​បង្កើត​តម្រង​ដែលសមរម្យ ។ ជាធម្មតា​ សារត្រូវបាន​សម្គាល់​ដោយ​ឧបករណ៍ "
-"ដូច្នេះ​តម្រង​ដូ​ចខាងក្រោម​នេះ​អាចមាន​ប្រតិកម្ម​នៅលើវា ហើយ ឧទាហរណ៍ "
-"ផ្លាស់ទី​សារ​ដែល​មាន​មេរោគទៅកាន់​ថត​ពិសេស ។"
+"អនុញ្ញាត​ឲ្យ​ឧបករណ៍​ប្រឆាំង​នឹង​មេរោគ​ពិនិត្យ​មើល​សាររបស់អ្នក ។ អ្នកជំនួយការ នឹង​បង្កើត​តម្រង​ដែលសមរម្យ ។ "
+"ជាធម្មតា​ សារត្រូវបាន​សម្គាល់​ដោយ​ឧបករណ៍ ដូច្នេះ​តម្រង​ដូ​ចខាងក្រោម​នេះ​អាចមាន​ប្រតិកម្ម​នៅលើវា ហើយ "
+"ឧទាហរណ៍ ផ្លាស់ទី​សារ​ដែល​មាន​មេរោគទៅកាន់​ថត​ពិសេស ។"
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1057,13 +1024,12 @@ msgstr "ផ្លាស់ទី​សារ​មានមេរោគ​ដែ
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"តម្រង​ដែលត្រូវ​រកសារ​​បាន​បែងចែក​នៅពេលបាន​ឆ្លងមេរោគ "
-"និង​ដែលត្រូវ​ផ្លាស់ទី​សារទាំងនោះ​ទៅក្នុង​ថត​ដែល​បានកំណត់​ជាមុន "
-"​គឺ​ត្រូវបានបង្កើត ។ ថត​លំនាំដើម​គឺ​ជាថត​ធុងសំរាម "
-"ប៉ុន្តែ​អ្នកអាច​ផ្លាស់ប្ដូរ​វា​នៅក្នុង​ទិដ្ឋភាពថត ។"
+"តម្រង​ដែលត្រូវ​រកសារ​​បាន​បែងចែក​នៅពេលបាន​ឆ្លងមេរោគ និង​ដែលត្រូវ​ផ្លាស់ទី​សារទាំងនោះ​ទៅក្នុង​ថត​ដែល​"
+"បានកំណត់​ជាមុន ​គឺ​ត្រូវបានបង្កើត ។ ថត​លំនាំដើម​គឺ​ជាថត​ធុងសំរាម ប៉ុន្តែ​អ្នកអាច​ផ្លាស់ប្ដូរ​វា​នៅក្នុង​"
+"ទិដ្ឋភាពថត ។"
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1071,11 +1037,11 @@ msgstr "ថែមទាំង សម្គាល់​សារ​មេរោ�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"សម្គាល់​សារ​ដែលបានបែងចែក​នៅពេល​ដែល​ឆ្លងមេរោគ​ថាបានអាន "
-"វាល្អដូច​ដែល​ផ្លាស់ទីពួកវាទៅកាន់​ថត​ដែលបាន​ជ្រើស ។"
+"សម្គាល់​សារ​ដែលបានបែងចែក​នៅពេល​ដែល​ឆ្លងមេរោគ​ថាបានអាន វាល្អដូច​ដែល​ផ្លាស់ទីពួកវាទៅកាន់​ថត​ដែលបាន​"
+"ជ្រើស ។"
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1253,9 +1219,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"វា​ប្រហែល​ជា​បណ្ដាល​មក​ពី​អ្នក​មិន​មាន​សិទ្ធិ​ធ្វើ​វា ឬ "
-"មាន​ថត​នេះ​នៅ​លើ​ម៉ាស៊ីនបម្រើ​រួច​ហើយ ។ "
-"សារកំហុស​ដែល​ចេញ​មកពី​ទំនាក់ទំនង​ម៉ាស៊ីន​បម្រើ គឺនៅទីនេះ ៖"
+"វា​ប្រហែល​ជា​បណ្ដាល​មក​ពី​អ្នក​មិន​មាន​សិទ្ធិ​ធ្វើ​វា ឬ មាន​ថត​នេះ​នៅ​លើ​ម៉ាស៊ីនបម្រើ​រួច​ហើយ ។ សារកំហុស​ដែល​ចេញ​"
+"មកពី​ទំនាក់ទំនង​ម៉ាស៊ីន​បម្រើ គឺនៅទីនេះ ៖"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1268,8 +1233,8 @@ msgstr "មាន​កំហុស ខណៈពេល​អាន​ថត %1 �
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1289,8 +1254,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1321,20 +1286,20 @@ msgstr "​បាន​លុប"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>មិន​មាន​អត្តសញ្ញាណ​ណា​ផ្គូផ្គង​នឹង​អ្នក​ទទួល​សារ​នេះ​ឡើយ ។br> "
-"សូម​ជ្រើស​អាសយដ្ឋាន​ខាងក្រោម​ណាមួយ​របស់អ្នក​ ប្រសិនបើមាន ៖"
+"<qt>មិន​មាន​អត្តសញ្ញាណ​ណា​ផ្គូផ្គង​នឹង​អ្នក​ទទួល​សារ​នេះ​ឡើយ ។br> សូម​ជ្រើស​អាសយដ្ឋាន​ខាងក្រោម​ណាមួយ​"
+"របស់អ្នក​ ប្រសិនបើមាន ៖"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>មាន​អត្តសញ្ញាណ​ជាច្រើន​ផ្គូផ្គង​ទៅនឹង​អ្នកទទួល​សារនេះ ។"
-"<br> សូម​ជ្រើស​​អាសយដ្ឋានណាមួយខាងក្រោម​ណាមួយ​ដែល​ជារបស់អ្នក ៖"
+"<qt>មាន​អត្តសញ្ញាណ​ជាច្រើន​ផ្គូផ្គង​ទៅនឹង​អ្នកទទួល​សារនេះ ។<br> សូម​ជ្រើស​​អាសយដ្ឋានណាមួយខាងក្រោម​"
+"ណាមួយ​ដែល​ជារបស់អ្នក ៖"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1351,8 +1316,7 @@ msgstr "អាគុយម៉ង់បន្ថែម​សម្រាប់​
 #: compactionjob.cpp:99
 #, c-format
 msgid "For safety reasons, compaction has been disabled for %1"
-msgstr ""
-"ដើម្បី​ឲ្យ​មាន​សុវត្ថិភាព ការ​បង្រួម​ត្រូវ​បាន​មិន​អនុញ្ញាត​ឡើយ​សម្រាប់ %1"
+msgstr "ដើម្បី​ឲ្យ​មាន​សុវត្ថិភាព ការ​បង្រួម​ត្រូវ​បាន​មិន​អនុញ្ញាត​ឡើយ​សម្រាប់ %1"
 
 #: compactionjob.cpp:176 compactionjob.cpp:259
 msgid "Folder \"%1\" successfully compacted"
@@ -1360,23 +1324,25 @@ msgstr "បាន​បង្រួម​ថត \"%1\" ដោយ​ជោគជ�
 
 #: compactionjob.cpp:180 compactionjob.cpp:261
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
-msgstr ""
-"កំហុស​បាន​កើតឡើងនៅខណៈពេល​ដែល​កំពុង​បង្រួម \"%1\" ។ បានបោះបង់​ការបង្រួម ។"
+msgstr "កំហុស​បាន​កើតឡើងនៅខណៈពេល​ដែល​កំពុង​បង្រួម \"%1\" ។ បានបោះបង់​ការបង្រួម ។"
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ការកំណត់​នេះ​បានត្រូវបាន​ជួសជុល​ដោយ​អ្នកគ្រប់គ្រងរបស់​អ្នក ។</p>"
-"<p>ប្រសិនបើអ្នកគិតថា​ នេះជា​កំហុស សូម​ទាក់ទង​គាត់ ។</p></qt>"
+"<qt><p>ការកំណត់​នេះ​បានត្រូវបាន​ជួសជុល​ដោយ​អ្នកគ្រប់គ្រងរបស់​អ្នក ។</p><p>ប្រសិនបើអ្នកគិតថា​ នេះជា​"
+"កំហុស សូម​ទាក់ទង​គាត់ ។</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "ផ្ទុក​ទម្រង់..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "កំណត់​រចនា​សម្ព័ន្ធ​គណនី"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "​បន្ថែម..."
@@ -1406,6 +1372,11 @@ msgstr "<qt>តើអ្នកពិតជាចង់​យក​​អត្�
 msgid "Remove Identity"
 msgstr "យក​អត្តសញ្ញាណ​ចេញ"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "​យកចេញ"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "​បន្ថែម..."
@@ -1414,6 +1385,11 @@ msgstr "​បន្ថែម..."
 msgid "Modify..."
 msgstr "​កែប្រែ..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "​យកចេញ"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "​កំណត់​ជា​លំនាំដើម"
@@ -1430,17 +1406,15 @@ msgstr "ការផ្ញើ"
 msgid "Outgoing accounts (add at least one):"
 msgstr "គណនីផ្ញើចេញ (បន្ថែម​យ៉ាងហោចណាស់​មួយ) ៖"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "​ឈ្មោះ"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "​ប្រភេទ"
@@ -1462,8 +1436,7 @@ msgstr "​កំណត់ជាលំនាំដើម"
 msgid "Common Options"
 msgstr "ជម្រើស​ទូទៅ"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "អះអាងមុនផ្ញើ"
@@ -1514,17 +1487,16 @@ msgstr "ដែន​លំនាំដើម ៖"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ដែន​លំនាំដើម​គឺត្រូវបាន​ប្រើ​ដើម្បី​បំពេញ​អាសយដ្ឋាន​អ៊ីមែល​​ដែលមាន​តែ​ឈ្មោះរប"
-"ស់អ្នកប្រើ​ប៉ុណ្ណោះ ។</p></qt>"
+"<qt><p>ដែន​លំនាំដើម​គឺត្រូវបាន​ប្រើ​ដើម្បី​បំពេញ​អាសយដ្ឋាន​អ៊ីមែល​​ដែលមាន​តែ​ឈ្មោះរបស់អ្នកប្រើ​ប៉ុណ្ណោះ ។</"
+"p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1542,9 +1514,9 @@ msgstr "បន្ថែម​ការ​បញ្ជូន"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (លំនាំដើម)"
 
@@ -1557,16 +1529,14 @@ msgstr "កែប្រែ​ការ​បញ្ជូន"
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
 "These %n identities have been changed to use the modified transport:"
-msgstr ""
-"អត្តសញ្ញាណ %n ទាំងនេះ​ត្រូវបាន​ផ្លាស់ប្ដូរ​ដើម្បី​ប្រើ​ការបញ្ជូនដែលបាន​កែប្រែ ៖"
+msgstr "អត្តសញ្ញាណ %n ទាំងនេះ​ត្រូវបាន​ផ្លាស់ប្ដូរ​ដើម្បី​ប្រើ​ការបញ្ជូនដែលបាន​កែប្រែ ៖"
 
 #: configuredialog.cpp:927
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
-msgstr ""
-"អត្តសញ្ញាណ %n ទាំងនេះ​ត្រូវបាន​ផ្លាស់ប្ដូរ​ដើម្បី​ប្រើ​ការបញ្ជូន​លំនាំដើម ៖"
+msgstr "អត្តសញ្ញាណ %n ទាំងនេះ​ត្រូវបាន​ផ្លាស់ប្ដូរ​ដើម្បី​ប្រើ​ការបញ្ជូន​លំនាំដើម ៖"
 
 #: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
@@ -1625,6 +1595,10 @@ msgstr "កែប្រែ​គណនី"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>មិនអាច​រកទីតាំង​គណនី <b>%1</b> បានឡើយ ។</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "ពណ៌"
@@ -1733,8 +1707,7 @@ msgstr "តំណដែល​បាន​ទស្សនា​"
 msgid "Misspelled Words"
 msgstr "ពាក្យប្រកបខុស"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "សារ​ថ្មី"
@@ -1922,11 +1895,9 @@ msgstr "ខ្សែស្រឡាយ​លំនាំដើម​ដែលត
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
-msgstr ""
-"បើក​ខ្សែស្រឡាយ​ដែលមាន​សារថ្មី សារមិនទាន់អាន ឬ សំខាន់​ "
-"ហើយ​បើក​ខ្សែស្រឡាយ​ដែល​បានឃ្លាំមើល ។"
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
+msgstr "បើក​ខ្សែស្រឡាយ​ដែលមាន​សារថ្មី សារមិនទាន់អាន ឬ សំខាន់​ ហើយ​បើក​ខ្សែស្រឡាយ​ដែល​បានឃ្លាំមើល ។"
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1934,73 +1905,52 @@ msgstr "បង្ហាញ​កាលបរិច្ឆេទ"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>កន្សោម​ទាំងនេះ​អាចត្រូវបាន​ប្រើ​សម្រាប់​កាលបរិច្ឆេទ ៖</strong></p>"
-"<ul>"
-"<li>d - ថ្ងៃ​ដាក់ជា​លេខ​ដែល​មិនមានលេខសូន្យ​នៅពីមុខ (1-31)</li>"
-"<li>dd - ថ្ងៃ​ដាក់ជាលេខ​ដែលមានលេខសូន្យ​នៅពីមុខ(01-31)</li>"
-"<li>ddd - អក្សរកាត់​ឈ្មោះ​នៃថ្ងៃ (Mon - Sun)</li>"
-"<li>dddd - ឈ្មោះ​ថ្ងៃ​ពេញ (Monday - Sunday)</li>"
-"<li>M - ខែ សរសេរជា​លេខ​ដោយ​មិនមាន​លេខ​សូន្យ​នៅពីមុខ (1-12)</li>"
-"<li>MM - ខែ​ សរសេរជាលេខ​ដែលមានលេខសូន្យ​នៅពីមុខ (01-12)</li>"
-"<li>MMM - អក្សរកាត់ឈ្មោះ​នៃខែ (Jan - Dec)</li>"
-"<li>MMMM - ឈ្មោះខែ​សរសេរពេញ (January - December)</li>"
-"<li>yy - ឆ្នាំ​ សរសេរជាតួលេខ (00-99)</li>"
-"<li>yyyy - ឆ្នាំ សរសេរ​ជាតួលេខ​បួនខ្ទង់ (0000-9999)</li></ul>"
-"<p><strong>កន្សោមទាំងនេះ​អាចត្រូវបានប្រើសម្រាប់ពេលវេលា ៖</string></p> "
-"<ul>"
-"<li>h - ម៉ោង ដែលមិនមាន​លេខសូន្យ​នៅពីមុខ (0-23 ឬ 1-12 ប្រសិនបើបង្ហាញ AM/PM)</li>"
-"<li>hh - ម៉ោង ដែលមាន​លេខសូន្យ​នៅពីមុខ (00-23 ឬ 01-12 ប្រសិនបើ​បង្ហាញ AM/PM)</li>"
-"<li>m - នាទី ដែលមិនមាន​លេខសូន្យ​នៅពីមុខ (0-59)</li>"
-"<li>mm - ម៉ោង ដែលមានលេខសូន្យ​នៅពីមុខ (00-59)</li>"
-"<li>s - វិនាទី ដែលមិនមាន​លេខសូន្យ​នៅពីមុខ (0-59)</li>"
-"<li>ss - វិនាទី​ ដែលមានលេខសូន្យ​នៅពីមុខ (00-59)</li>"
-"<li>z - មិល្លី​វិនាទី ដែលមិនមាន​លេខសូន​នៅពីមុខ(0-999)</li>"
-"<li>zzz - មិល្លី​វិនាទី ដែលមានលេខសូន្យ​នៅពីមុខ (000-999)</li>"
-"<li>AP - ប្ដូរទៅ​ឲ្យ​បង្ហាញ AM/PM វិញ ។ AP នឹងត្រូវបានជំនួសដោយ \"AM\" ក៏បាន ឬ "
-"\"PM\" ក៏បាន ។</li>"
-"<li>ap - ប្ដូរទៅ​ឲ្យ​បង្ហាញ AM/PM វិញ ។ ap នឹងត្រូវបានជំនួសដោយ \"am\" ក៏បាន ឬ "
-"\"pm\" ក៏បាន ។</li>"
-"<li>Z - តំបន់ពេលវេលា​ជាទំរង់តួលេខ (-0500)</li></ul>"
-"<p><strong>រាល់​តួអក្សរ​បញ្ចូល​ផ្សេងទៀតទាំងអស់​នឹងត្រូវបាន​មិនអើពើ ។</strong>"
-"</p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>កន្សោម​ទាំងនេះ​អាចត្រូវបាន​ប្រើ​សម្រាប់​កាលបរិច្ឆេទ ៖</strong></p><ul><li>d "
+"- ថ្ងៃ​ដាក់ជា​លេខ​ដែល​មិនមានលេខសូន្យ​នៅពីមុខ (1-31)</li><li>dd - ថ្ងៃ​ដាក់ជាលេខ​ដែលមានលេខសូន្យ​"
+"នៅពីមុខ(01-31)</li><li>ddd - អក្សរកាត់​ឈ្មោះ​នៃថ្ងៃ (Mon - Sun)</li><li>dddd - ឈ្មោះ​"
+"ថ្ងៃ​ពេញ (Monday - Sunday)</li><li>M - ខែ សរសេរជា​លេខ​ដោយ​មិនមាន​លេខ​សូន្យ​នៅពីមុខ "
+"(1-12)</li><li>MM - ខែ​ សរសេរជាលេខ​ដែលមានលេខសូន្យ​នៅពីមុខ (01-12)</li><li>MMM - "
+"អក្សរកាត់ឈ្មោះ​នៃខែ (Jan - Dec)</li><li>MMMM - ឈ្មោះខែ​សរសេរពេញ (January - "
+"December)</li><li>yy - ឆ្នាំ​ សរសេរជាតួលេខ (00-99)</li><li>yyyy - ឆ្នាំ សរសេរ​ជាតួលេខ​"
+"បួនខ្ទង់ (0000-9999)</li></ul><p><strong>កន្សោមទាំងនេះ​អាចត្រូវបានប្រើសម្រាប់ពេលវេលា ៖</"
+"string></p> <ul><li>h - ម៉ោង ដែលមិនមាន​លេខសូន្យ​នៅពីមុខ (0-23 ឬ 1-12 ប្រសិនបើបង្ហាញ AM/"
+"PM)</li><li>hh - ម៉ោង ដែលមាន​លេខសូន្យ​នៅពីមុខ (00-23 ឬ 01-12 ប្រសិនបើ​បង្ហាញ AM/PM)</"
+"li><li>m - នាទី ដែលមិនមាន​លេខសូន្យ​នៅពីមុខ (0-59)</li><li>mm - ម៉ោង ដែលមានលេខសូន្យ​នៅពីមុខ "
+"(00-59)</li><li>s - វិនាទី ដែលមិនមាន​លេខសូន្យ​នៅពីមុខ (0-59)</li><li>ss - វិនាទី​ "
+"ដែលមានលេខសូន្យ​នៅពីមុខ (00-59)</li><li>z - មិល្លី​វិនាទី ដែលមិនមាន​លេខសូន​នៅពីមុខ(0-999)</"
+"li><li>zzz - មិល្លី​វិនាទី ដែលមានលេខសូន្យ​នៅពីមុខ (000-999)</li><li>AP - ប្ដូរទៅ​ឲ្យ​បង្ហាញ "
+"AM/PM វិញ ។ AP នឹងត្រូវបានជំនួសដោយ \"AM\" ក៏បាន ឬ \"PM\" ក៏បាន ។</li><li>ap - ប្ដូរទៅ​ឲ្យ​"
+"បង្ហាញ AM/PM វិញ ។ ap នឹងត្រូវបានជំនួសដោយ \"am\" ក៏បាន ឬ \"pm\" ក៏បាន ។</li><li>Z - "
+"តំបន់ពេលវេលា​ជាទំរង់តួលេខ (-0500)</li></ul><p><strong>រាល់​តួអក្សរ​បញ្ចូល​ផ្សេងទៀតទាំងអស់​"
+"នឹងត្រូវបាន​មិនអើពើ ។</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
-msgstr ""
-"ការ​ផ្លាស់ប្ដូរ​ការកំណត់​ខ្សែស្រឡាយ​សកល​ "
-"នឹង​បដិសេធ​នូវ​រាល់​តម្លៃ​ជាក់លាក់​របស់​ថត​ទាំងអស់ ។"
+"Changing the global threading setting will override all folder specific "
+"values."
+msgstr "ការ​ផ្លាស់ប្ដូរ​ការកំណត់​ខ្សែស្រឡាយ​សកល​ នឹង​បដិសេធ​នូវ​រាល់​តម្លៃ​ជាក់លាក់​របស់​ថត​ទាំងអស់ ។"
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2014,8 +1964,7 @@ msgstr "បង្ហាញ​របា​រស្ថានភាព HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "បង្ហាញ​ស្ថាន​ភាព​សារឥតបានការ នៅ​ក្នុង​បឋមកថា​ស្អាតបាត"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "ជំនួស​អក្សរ​សញ្ញាអារម្មណ៍​ដោយ​រូបសញ្ញាអារម្មណ៍"
@@ -2024,8 +1973,7 @@ msgstr "ជំនួស​អក្សរ​សញ្ញាអារម្មណ
 msgid "Use smaller font for quoted text"
 msgstr "ប្រើ​ពុម្ព​អក្សរ​តូច​ចំពោះ​អត្ថបទ​ដកស្រង់"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "បង្ហាញ​សញ្ញា​ដកស្រង់​បន្លាយ/វេញ"
@@ -2051,8 +1999,7 @@ msgstr "ស្វ័យប្រវត្តិ"
 msgid "&Override character encoding:"
 msgstr "បដិសេធការ​អ៊ិនកូដ​តួអក្សរ ៖"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "អនុញ្ញាត​រូបតំណាង​ក្នុង​ថាស​ប្រព័ន្ធ"
@@ -2154,23 +2101,19 @@ msgstr "<b>%f</b> នឹងត្រូវបាន​ជំនួស​ដោ�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>កន្លែង​ដាក់ខាងក្រោម​​ គឺត្រូវបាន​គាំទ្រ​នៅក្នុង​ឃ្លា​ឆ្លើយតប ៖"
-"<br><b>%D</b> ៖ កាលបរិច្ឆេទ, <b>%S</b> ៖ ប្រធានបទ,"
-"<br><b>%e</b> ៖ អាសយដ្ឋាន​របស់​អ្នកផ្ញើ, <b>%F</b> ៖ ឈ្មោះ​របស់​អ្នកផ្ញើ, <b>"
-"%f</b>​ ៖ ការចាប់ផ្ដើម​របស់​អ្នកប្រើ,"
-"<br><b>%T</b> ៖ ឈ្មោះ​របស់​អ្នកទទួល, <b>%t</b> ៖ ឈ្មោះ​ "
-"និង​អាសយដ្ឋាន​របស់​អ្នក​ទទួល,"
-"<br><b>%C</b> ៖ ឈ្មោះ​ច្បាប់​ចម្លង​កាបូន, <b>%c</b> ៖ ឈ្មោះ​ និង​ "
-"អាសយដ្ឋាន​ច្បាប់ចម្លង​កាបូន,"
-"<br><b>%%</b> ៖ សញ្ញា​ភាគរយ, <b>%_</b> ៖ ចន្លោះ, <b>%L</b> ៖ ផ្ដាច់តំណ</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>កន្លែង​ដាក់ខាងក្រោម​​ គឺត្រូវបាន​គាំទ្រ​នៅក្នុង​ឃ្លា​ឆ្លើយតប ៖<br><b>%D</b> ៖ កាលបរិច្ឆេទ, <b>"
+"%S</b> ៖ ប្រធានបទ,<br><b>%e</b> ៖ អាសយដ្ឋាន​របស់​អ្នកផ្ញើ, <b>%F</b> ៖ ឈ្មោះ​របស់​"
+"អ្នកផ្ញើ, <b>%f</b>​ ៖ ការចាប់ផ្ដើម​របស់​អ្នកប្រើ,<br><b>%T</b> ៖ ឈ្មោះ​របស់​អ្នកទទួល, <b>"
+"%t</b> ៖ ឈ្មោះ​ និង​អាសយដ្ឋាន​របស់​អ្នក​ទទួល,<br><b>%C</b> ៖ ឈ្មោះ​ច្បាប់​ចម្លង​កាបូន, <b>%c</"
+"b> ៖ ឈ្មោះ​ និង​ អាសយដ្ឋាន​ច្បាប់ចម្លង​កាបូន,<br><b>%%</b> ៖ សញ្ញា​ភាគរយ, <b>%_</b> ៖ "
+"ចន្លោះ, <b>%L</b> ៖ ផ្ដាច់តំណ</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2193,21 +2136,20 @@ msgstr "ឆ្លើយតប​ទៅ​ទាំងអស់ ៖"
 msgid "&Forward:"
 msgstr "បញ្ជូន​បន្ត ៖"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "ទ្រនិចបង្ហាញ​សម្រង់ ៖"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "នៅថ្ងៃ %D, អ្នក​បាន​សរសេរ​ថា ៖"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "នៅថ្ងៃ %D, %F បាន​សរសេរ​ថា ៖"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "សារ​ដែល​បាន​បញ្ជូន​បន្ត"
 
@@ -2245,11 +2187,11 @@ msgstr "បញ្ចូល​បុព្វបទ​​បញ្ជូន​ប
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"បញ្ជី​នេះ​ត្រូវបាន​ពិនិត្យ​រកមើល​រាល់​សារ​ផ្ញើចេញ​ពី​កំពូល​ទៅ​បាត​ទាំងអស់​ "
-"សម្រាប់​សំណុំតួអក្សរ​មួយ​ដែល​មានតួអក្សរ​ដែល​បាន​ទាមទារ​ទាំងអស់ ។"
+"បញ្ជី​នេះ​ត្រូវបាន​ពិនិត្យ​រកមើល​រាល់​សារ​ផ្ញើចេញ​ពី​កំពូល​ទៅ​បាត​ទាំងអស់​ សម្រាប់​សំណុំតួអក្សរ​មួយ​ដែល​មានតួអក្សរ​ដែល​"
+"បាន​ទាមទារ​ទាំងអស់ ។"
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2283,10 +2225,9 @@ msgstr "​តម្លៃ"
 msgid "Ne&w"
 msgstr "​ថ្មី"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "​ឈ្មោះ ៖"
@@ -2295,19 +2236,18 @@ msgstr "​ឈ្មោះ ៖"
 msgid "&Value:"
 msgstr "តម្លៃ ៖"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "ការ​ដាក់ឈ្មោះ​ឯកសារ​ភ្ជាប់​ Outlook ដែល​ឆបគ្នា"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"បើក​ជម្រើស​នេះ​ដើម្បី​​ធ្វើ​ឲ្យ Outlook(tm) "
-"ស្គាល់​ឈ្មោះ​ឯកសារ​ភ្ជាប់​ដែល​មាន​តួអក្សរ​មិន​មែន​ជា​ភាសា​អង់គ្លេស"
+"បើក​ជម្រើស​នេះ​ដើម្បី​​ធ្វើ​ឲ្យ Outlook(tm) ស្គាល់​ឈ្មោះ​ឯកសារ​ភ្ជាប់​ដែល​មាន​តួអក្សរ​មិន​មែន​ជា​ភាសា​"
+"អង់គ្លេស"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2315,8 +2255,7 @@ msgstr "បើក​ការ​រក​​នៃ​ឯកសារ​ភ្ជ
 
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
-msgstr ""
-"ទទួល​ស្គាល់​​​ពាក្យ​គន្លឹះ​មួយ​ចំនួន​ខាងក្រោម​ នៅពេល​មាន​បំណង​ភ្ជាប់​ឯកសារ ៖"
+msgstr "ទទួល​ស្គាល់​​​ពាក្យ​គន្លឹះ​មួយ​ចំនួន​ខាងក្រោម​ នៅពេល​មាន​បំណង​ភ្ជាប់​ឯកសារ ៖"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2334,22 +2273,20 @@ msgstr "បាន​ភ្ជាប់"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"អ្នក​បាន​ជ្រើស​ដើម្បី​អ៊ិនកូដឈ្មោះ​ឯកសារ​ភ្ជាប់​ដែល​មាន​តួអក្សរ​មិនមែន​ជា​ភាសាអង"
-"់គ្លេស តាម​វិធី​ដែល​បាន​ស្វែងយល់​ដោយ Outlook(tm) "
-"និង​កម្មវិធី​ផ្ញើ​អ៊ីមែល​ផ្សេង​ទៀត "
-"​ដែល​មិនគាំទ្រឈ្មោះ​ឯកសារ​ភ្ជាប់​ដែលបាន​អ៊ិនកូដ​​តាម​ខ្នាតគំរូ ។\n"
-"ចងចាំថា KMail អាច​បង្កើត​សារ​ដែល​​មិនធ្វើ​តាម​ខ្នាត​គំរូ ហើយ​ ដោយហេតុ​នេះ "
-"វា​គឺ​អាចធ្វើ​បាន​ដែល​សារ​របស់​អ្នក​នឹង​មិនត្រូវបាន​យល់ដោយ​ម៉ាស៊ីន​ភ្ញៀវ​សំបុត្រ"
-"​ដែល​ធ្វើតាម​ខ្នាតគំរូ ។ ដូច្នេះ លើកលែងតែអ្នក​​គ្មាន​ជម្រើស​ផ្សេង "
-"អ្នក​មិនគួរ​​បើក​ជម្រើស​នេះ​ឡើយ ។"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"អ្នក​បាន​ជ្រើស​ដើម្បី​អ៊ិនកូដឈ្មោះ​ឯកសារ​ភ្ជាប់​ដែល​មាន​តួអក្សរ​មិនមែន​ជា​ភាសាអង់គ្លេស តាម​វិធី​ដែល​បាន​ស្វែងយល់​"
+"ដោយ Outlook(tm) និង​កម្មវិធី​ផ្ញើ​អ៊ីមែល​ផ្សេង​ទៀត ​ដែល​មិនគាំទ្រឈ្មោះ​ឯកសារ​ភ្ជាប់​ដែលបាន​អ៊ិនកូដ​​តាម​"
+"ខ្នាតគំរូ ។\n"
+"ចងចាំថា KMail អាច​បង្កើត​សារ​ដែល​​មិនធ្វើ​តាម​ខ្នាត​គំរូ ហើយ​ ដោយហេតុ​នេះ វា​គឺ​អាចធ្វើ​បាន​ដែល​សារ​របស់​"
+"អ្នក​នឹង​មិនត្រូវបាន​យល់ដោយ​ម៉ាស៊ីន​ភ្ញៀវ​សំបុត្រ​ដែល​ធ្វើតាម​ខ្នាតគំរូ ។ ដូច្នេះ លើកលែងតែអ្នក​​គ្មាន​ជម្រើស​"
+"ផ្សេង អ្នក​មិនគួរ​​បើក​ជម្រើស​នេះ​ឡើយ ។"
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2373,121 +2310,92 @@ msgstr "កម្មវិធី​ខាងក្រោយ Crypto"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ជួនកាល សារ​មក​តាម​ទ្រង់ទ្រាយ​ទាំងពីរ ។ "
-"ជម្រើស​នេះ​ត្រួតត្រា​ថាតើ​​អ្នកចង់​បង្ហាញ​​ផ្នែក HTML ឬ "
-"ផ្នែក​នៃ​អត្ថបទ​ធម្មតា​ត្រូវបាន​បង្ហាញ ។</p>"
-"<p>ការបង្ហាញផ្នែក HTML ធ្វើឲ្យ​សារ​មើល​ទៅ​ដូច​ជា​ល្អប្រសើ "
-"ប៉ុន្តែនៅពេលដូចគ្នា​​នេះដែរ "
-"វា​បង្កើន​គ្រោះថ្នាក់​នៃ​ច្រក​សុវត្ថិភាព​ដែល​នឹង​ត្រូវបាន​ទាញយក ។</p>"
-"<p>ការបង្ហាញ​​អត្ថបទធម្មតា​​ នឹងបាត់​​ការធ្វើទ្រង់ទ្រាយ​របស់​សារ​ជាច្រើន "
-"ប៉ុន្តែ​ធ្វើឲ្យវា​ស្ទើរតែ <em>អាចធ្វើទៅបាន</em> "
-"ក្នុងការទាញ​យក​ច្រកសុវត្ថិភាពនៅក្នុង​ការបង្ហាញ​ HTML (Konqueror) ។</p>"
-"<p>ជម្រើស​ខាងក្រោម ការពារ​ប្រឆាំងនឹង​ការប្រើសារ HTML ទូទៅ​មួយខុស "
-"ប៉ុន្តែ​វាមិនអាច​ការពារ​ប្រឆាំង​នឹង​ការប្រកាស់សុវត្ថិភាពដែលមិនបានស្គាល់​នៅពេល​ដែ"
-"ល​កំណែនេះរបស់ KMail ត្រូវបាន​សរសេរ ។</p>"
-"<p>ដូច្នេះ​វា​កឺ​ណែនាំ​​ <em>មិនឲ្យ</em>ចូលចិត្ត​ HTML ជាង​អត្ថបទធម្មតា ។</p>"
-"<p><b>ចំណាំ ៖</b> អ្នកអាច​កំណត់​ជម្រើស​នេះ​នៅលើ​មូលដ្ឋានក្នុងមួយថត ពីម៉ឺនុយ <i>"
-"ថត</i> នៃ​បង្អួច​ចម្បង​របស់ KMail ។</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>ជួនកាល សារ​មក​តាម​ទ្រង់ទ្រាយ​ទាំងពីរ ។ ជម្រើស​នេះ​ត្រួតត្រា​ថាតើ​​អ្នកចង់​បង្ហាញ​​ផ្នែក HTML ឬ "
+"ផ្នែក​នៃ​អត្ថបទ​ធម្មតា​ត្រូវបាន​បង្ហាញ ។</p><p>ការបង្ហាញផ្នែក HTML ធ្វើឲ្យ​សារ​មើល​ទៅ​ដូច​ជា​"
+"ល្អប្រសើ ប៉ុន្តែនៅពេលដូចគ្នា​​នេះដែរ វា​បង្កើន​គ្រោះថ្នាក់​នៃ​ច្រក​សុវត្ថិភាព​ដែល​នឹង​ត្រូវបាន​ទាញយក ។</"
+"p><p>ការបង្ហាញ​​អត្ថបទធម្មតា​​ នឹងបាត់​​ការធ្វើទ្រង់ទ្រាយ​របស់​សារ​ជាច្រើន ប៉ុន្តែ​ធ្វើឲ្យវា​ស្ទើរតែ "
+"<em>អាចធ្វើទៅបាន</em> ក្នុងការទាញ​យក​ច្រកសុវត្ថិភាពនៅក្នុង​ការបង្ហាញ​ HTML (Konqueror) ។</"
+"p><p>ជម្រើស​ខាងក្រោម ការពារ​ប្រឆាំងនឹង​ការប្រើសារ HTML ទូទៅ​មួយខុស ប៉ុន្តែ​វាមិនអាច​ការពារ​ប្រឆាំង​"
+"នឹង​ការប្រកាស់សុវត្ថិភាពដែលមិនបានស្គាល់​នៅពេល​ដែល​កំណែនេះរបស់ KMail ត្រូវបាន​សរសេរ ។</"
+"p><p>ដូច្នេះ​វា​កឺ​ណែនាំ​​ <em>មិនឲ្យ</em>ចូលចិត្ត​ HTML ជាង​អត្ថបទធម្មតា ។</p><p><b>ចំណាំ ៖</b> "
+"អ្នកអាច​កំណត់​ជម្រើស​នេះ​នៅលើ​មូលដ្ឋានក្នុងមួយថត ពីម៉ឺនុយ <i>ថត</i> នៃ​បង្អួច​ចម្បង​របស់ KMail ។</p></"
+"qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ការប្រកាស់​សំបុត្រ​មួយ​ចំនួនគឺតាម​ HTML ហើយ មានសេចក្ដី​យោង ឧទាហរណ៍ "
-"រូបភាព​ដែល​អ្នក​ឃោសនា​ប្រើ​ដើម្បី​ស្វែងយល់ថា​អ្នក​បាន​អានសារ​របស់​ពួកគេ "
-"(&quot;កំហុស​បណ្ដាញ&quot;) ឬអត់ ។</p>"
-"<p>គ្មាន​ហេតុផល​ត្រឹមត្រូវ​ណា​ដើម្បី​ផ្ទុក​រូបភាព​នៅក្រៅ​ពី​អ៊ិនធឺណិត​ដូចនេះ​ឡើយ"
-" គឺចាប់តាំងពី​អ្នកផ្ញើ​អ្នក​ភ្ជាប់​រូបភាព​ដែល​បានទាមទារ​ផ្ទាល់​ទៅ​សារ​ជានិច្ចមក "
-"។</p>"
-"<p>ដើម្បី​ការពារពី​ការប្រើ HTML ខុស​ក្នុងការបង្ហាញលក្ខណៈពិសេស​របស់​ KMail "
-"ដែល​ជម្រើសនេះ​គឺ <em>ត្រូវបានបិទ</em>តាមលំនាំដើម ។</p>"
-"<p>ទោះជាយ៉ាងណាក៏ដោយ ប្រសិនបើអ្នកចង់ ឧទាហរណ៍  មើលរូបភាព​នៅក្នុង​សារ​ HTML "
-"ដែលមិនត្រូវបាន​ភ្ជាប់ទៅកាន់វានោះទេ អ្នកអាចបើក​ជម្រើស​នេះ "
-"ប៉ុន្តែ​អ្នកគួរ​តែដឹងអំពី បញ្ហា​ដែល​នឹង​អាច​កើត​មាន ។</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>ការប្រកាស់​សំបុត្រ​មួយ​ចំនួនគឺតាម​ HTML ហើយ មានសេចក្ដី​យោង ឧទាហរណ៍ រូបភាព​ដែល​អ្នក​ឃោសនា​ប្រើ​"
+"ដើម្បី​ស្វែងយល់ថា​អ្នក​បាន​អានសារ​របស់​ពួកគេ (&quot;កំហុស​បណ្ដាញ&quot;) ឬអត់ ។</p><p>គ្មាន​ហេតុផល​"
+"ត្រឹមត្រូវ​ណា​ដើម្បី​ផ្ទុក​រូបភាព​នៅក្រៅ​ពី​អ៊ិនធឺណិត​ដូចនេះ​ឡើយ គឺចាប់តាំងពី​អ្នកផ្ញើ​អ្នក​ភ្ជាប់​រូបភាព​ដែល​"
+"បានទាមទារ​ផ្ទាល់​ទៅ​សារ​ជានិច្ចមក ។</p><p>ដើម្បី​ការពារពី​ការប្រើ HTML ខុស​"
+"ក្នុងការបង្ហាញលក្ខណៈពិសេស​របស់​ KMail ដែល​ជម្រើសនេះ​គឺ <em>ត្រូវបានបិទ</em>តាមលំនាំដើម ។</"
+"p><p>ទោះជាយ៉ាងណាក៏ដោយ ប្រសិនបើអ្នកចង់ ឧទាហរណ៍  មើលរូបភាព​នៅក្នុង​សារ​ HTML ដែលមិនត្រូវបាន​"
+"ភ្ជាប់ទៅកាន់វានោះទេ អ្នកអាចបើក​ជម្រើស​នេះ ប៉ុន្តែ​អ្នកគួរ​តែដឹងអំពី បញ្ហា​ដែល​នឹង​អាច​កើត​មាន ។</p></"
+"qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>គោលការណ៍​ការជូន​ដំណឹងអំពី​ការ​រៀបចំ​សារ</h3>"
-"<p>MDNs គឺជា​ការសរុប​នៃ​អ្វី​ដែល​ត្រូវបានហៅ​ជាទូទៅថា <b>បង្កាន់ដៃ​អាន</b>"
-" ។ អ្នកនិពន្វសារ ស្នើរ​ឲ្យ​មានការផ្ញើ​​ការជូន​ដំណឹង​អំពី​ការ​រៀបចំ ហើយ "
-"កម្មវិធី​សំបុត្រ​របស់​អ្នកផ្ញើ "
-"បង្កើត​ការឆ្លើយតប​មួយ​ពី​អ្នក​និពន្វ​ណាមួយ​ដែល​អាច​សិក្សាពី​អ្វី​ដែល​កើត​មាន​ឡើង"
-"​ចំពោះ​សារ​របស់គាត់ ។ ប្រភេទ​ការរៀបចំ​រួមមាន <b>បាន​បង្ហាញ</b> "
-"(មានន័យថា បានអាន) <b>បានលុប</b> និង​<b>បានបញ្ជូន</b> "
-"(ឧទាហរណ៍. បានបញ្ជូន​បន្ត) ។</p>"
-"<p>Thជម្រើស​ដូចតទៅនេះ​គឺ​អាចរកបាន​ដើម្បី​ត្រួតពិនិត្យការផ្ញើ​នៃ MDNs របស់ "
-"KMail ៖</p>"
-"<ul>"
-"<li><em>មិនអើពើ</em> ៖ "
-"មិនអើពើ​ចំពោះ​សំណើរ​សម្រាប់​ការជូន​ដំណឹង​អំពី​ការរៀបចំ​មួយចំនួន ។ គ្មាន MDN "
-"ដែលនឹងធ្លាប់​ត្រូវបាន​ផ្ញើ​ដោយស្វ័យប្រវត្តិ​នោះទេ (បាន​ផ្ដល់អនុសាសន៍) ។</li>"
-"<li><em>សួរ</em> ៖ "
-"ឆ្លើយ​នឹង​សំណើរ​តែបន្ទាប់ពី​ការសួររក​សិទ្ធិ​របស់អ្នកប្រើ​ប៉ុណ្ណោះ ។ វិធីនេះ "
-"អ្នកអាច​ផ្ញើ MDNs សម្រាប់សារដែលបាន​ជ្រើស នៅខណៈពេល​ដែល​កំពុង​បដិសេធ ឬ "
-"មិនអើពើ​នឹង​ពួក​វា​ចំពោះសារផ្សេងទៀត ។</li>"
-"<li><em>បដិសេធ</em> ៖ ផ្ញើ​ការជូន​ដំណឹង <b>បានបដិសេធ</b> "
-"ជានិច្ច ។ នេះ​គ្រាន់តែ <em>ស្រាល</em> ដែល​ប្រសើជាង​ការផ្ញើ​ MDNs រហូត ។ "
-"អ្នកនិពន្វ​នឹងនៅតែ​ដឹងថា​សាររបស់គាត់​បានមានការប្រែប្រួល "
-"តែគាត់​មិនអាចប្រាប់ថាតើ​វាត្រូវបាន​លុប ឬ​ អាន ។ល។</li>"
-"<li><em>ផ្ញើជានិច្ច</em> ៖ ផ្ញើ​ការជូន​ដំណឹង​អំពី​​ការរៀបចំ​ដែល​បាន​ស្នើ​រហូត ។ "
-"មានន័យថា​អ្នកនិពន្វ​សារនេះ​ចាប់ផ្ដើមដឹង​នៅពេល​ដែល​​សារ​ត្រូវបាន​ធ្វើឲ្យប្រែប្រួល"
-" ហើយ ជាបន្ថែម​ទៅទៀត គឺ​អ្វី​ដែល​កើតឡើង​ចំពោះវា (បានបង្ហាញ បានលុប។ល។) ។ "
-"ជម្រើស​នេះ​គឺ​ត្រូវបាន​ធ្វើ​ឲ្យ​រាំងស្ទះ​យ៉ាងធ្ងន់ធ្ងរ ប៉ុន្តែ "
-"ចាប់តាំងពីវាបានធ្វើឲ្យមានវិញ្ញាណច្រើន ឧទាហរណ៍. "
-"ចំពោះ​ការគ្រប់គ្រង​ទំនាក់ទំនង​របស់​អតិថិជន មក វាត្រូវបាន​ធ្វើឲ្យមាន ។</li></ul>"
-"</qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>គោលការណ៍​ការជូន​ដំណឹងអំពី​ការ​រៀបចំ​សារ</h3><p>MDNs គឺជា​ការសរុប​នៃ​អ្វី​ដែល​ត្រូវបានហៅ​"
+"ជាទូទៅថា <b>បង្កាន់ដៃ​អាន</b> ។ អ្នកនិពន្វសារ ស្នើរ​ឲ្យ​មានការផ្ញើ​​ការជូន​ដំណឹង​អំពី​ការ​រៀបចំ ហើយ "
+"កម្មវិធី​សំបុត្រ​របស់​អ្នកផ្ញើ បង្កើត​ការឆ្លើយតប​មួយ​ពី​អ្នក​និពន្វ​ណាមួយ​ដែល​អាច​សិក្សាពី​អ្វី​ដែល​កើត​មាន​ឡើង​ចំពោះ​"
+"សារ​របស់គាត់ ។ ប្រភេទ​ការរៀបចំ​រួមមាន <b>បាន​បង្ហាញ</b> (មានន័យថា បានអាន) <b>បានលុប</b> "
+"និង​<b>បានបញ្ជូន</b> (ឧទាហរណ៍. បានបញ្ជូន​បន្ត) ។</p><p>Thជម្រើស​ដូចតទៅនេះ​គឺ​អាចរកបាន​ដើម្បី​"
+"ត្រួតពិនិត្យការផ្ញើ​នៃ MDNs របស់ KMail ៖</p><ul><li><em>មិនអើពើ</em> ៖ មិនអើពើ​ចំពោះ​សំណើរ​"
+"សម្រាប់​ការជូន​ដំណឹង​អំពី​ការរៀបចំ​មួយចំនួន ។ គ្មាន MDN ដែលនឹងធ្លាប់​ត្រូវបាន​ផ្ញើ​ដោយស្វ័យប្រវត្តិ​នោះទេ "
+"(បាន​ផ្ដល់អនុសាសន៍) ។</li><li><em>សួរ</em> ៖ ឆ្លើយ​នឹង​សំណើរ​តែបន្ទាប់ពី​ការសួររក​សិទ្ធិ​របស់អ្នកប្រើ​"
+"ប៉ុណ្ណោះ ។ វិធីនេះ អ្នកអាច​ផ្ញើ MDNs សម្រាប់សារដែលបាន​ជ្រើស នៅខណៈពេល​ដែល​កំពុង​បដិសេធ ឬ មិនអើពើ​"
+"នឹង​ពួក​វា​ចំពោះសារផ្សេងទៀត ។</li><li><em>បដិសេធ</em> ៖ ផ្ញើ​ការជូន​ដំណឹង <b>បានបដិសេធ</b> "
+"ជានិច្ច ។ នេះ​គ្រាន់តែ <em>ស្រាល</em> ដែល​ប្រសើជាង​ការផ្ញើ​ MDNs រហូត ។ អ្នកនិពន្វ​នឹងនៅតែ​ដឹងថា​"
+"សាររបស់គាត់​បានមានការប្រែប្រួល តែគាត់​មិនអាចប្រាប់ថាតើ​វាត្រូវបាន​លុប ឬ​ អាន ។ល។</"
+"li><li><em>ផ្ញើជានិច្ច</em> ៖ ផ្ញើ​ការជូន​ដំណឹង​អំពី​​ការរៀបចំ​ដែល​បាន​ស្នើ​រហូត ។ មានន័យថា​អ្នកនិពន្វ​"
+"សារនេះ​ចាប់ផ្ដើមដឹង​នៅពេល​ដែល​​សារ​ត្រូវបាន​ធ្វើឲ្យប្រែប្រួល ហើយ ជាបន្ថែម​ទៅទៀត គឺ​អ្វី​ដែល​កើតឡើង​"
+"ចំពោះវា (បានបង្ហាញ បានលុប។ល។) ។ ជម្រើស​នេះ​គឺ​ត្រូវបាន​ធ្វើ​ឲ្យ​រាំងស្ទះ​យ៉ាងធ្ងន់ធ្ងរ ប៉ុន្តែ "
+"ចាប់តាំងពីវាបានធ្វើឲ្យមានវិញ្ញាណច្រើន ឧទាហរណ៍. ចំពោះ​ការគ្រប់គ្រង​ទំនាក់ទំនង​របស់​អតិថិជន មក "
+"វាត្រូវបាន​ធ្វើឲ្យមាន ។</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2503,16 +2411,15 @@ msgstr "អនុញ្ញាត​ឲ្យ​សារ​ផ្ទុក​ស
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ព្រមាន ៖</b> ការ​អនុញ្ញាត​ HTML នៅក្នុង​អ៊ីមែល អាចបង្កើន​នូវ​ការគ្រោះថ្នាក់ "
-"ដែល​ប្រព័ន្ធ​របស់អ្នក​​នឹងត្រូវបាន​យល់ព្រម​ដោយ​​ការបង្ហាញ "
-"និង​ទាញ​យក​សុវត្ថិភាព​ដែលបាន​គិត​ទុក​ជាមុន ។ <a href=\"whatsthis:%1\">"
-"បន្ថែម​អំពី​សំបុត្រ HTML...</a> <a href=\"whatsthis:%2\">"
-"បន្ថែម​អំពី​សេចក្ដី​យោង​ខាងក្រៅ...</a>"
+"<b>ព្រមាន ៖</b> ការ​អនុញ្ញាត​ HTML នៅក្នុង​អ៊ីមែល អាចបង្កើន​នូវ​ការគ្រោះថ្នាក់ ដែល​ប្រព័ន្ធ​របស់អ្នក​​"
+"នឹងត្រូវបាន​យល់ព្រម​ដោយ​​ការបង្ហាញ និង​ទាញ​យក​សុវត្ថិភាព​ដែលបាន​គិត​ទុក​ជាមុន ។ <a href=\"whatsthis:"
+"%1\">បន្ថែម​អំពី​សំបុត្រ HTML...</a> <a href=\"whatsthis:%2\">បន្ថែម​អំពី​សេចក្ដី​យោង​"
+"ខាងក្រៅ...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2571,9 +2478,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>ព្រមាន ៖</b> ការអះអាង​អំពី​ការ​ត្រឡប់​ដោយ​គ្មាន​លក្ខខ័ណ្ឌ "
-"ធ្វើ​ឲ្យ​មាន​ភាព​អន្ដរាយ​ដោយ​ភាព​ជា​ឯកជន​របស់អ្នក ។ <a href=\"whatsthis:%1\">"
-"បន្ថែម​ទៀត...</a>"
+"<b>ព្រមាន ៖</b> ការអះអាង​អំពី​ការ​ត្រឡប់​ដោយ​គ្មាន​លក្ខខ័ណ្ឌ ធ្វើ​ឲ្យ​មាន​ភាព​អន្ដរាយ​ដោយ​ភាព​ជា​ឯកជន​"
+"របស់អ្នក ។ <a href=\"whatsthis:%1\">បន្ថែម​ទៀត...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2586,16 +2492,13 @@ msgstr "នាំចូល​កូនសោ និង​វិញ្ញាប�
 #: configuredialog.cpp:3963
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
-msgstr ""
-"ការ​ផ្លាស់ប្ដូរ​​ការកំណត់​ HTML សកល "
-"នឹង​បដិសេធ​រាល់​តម្លៃ​ជាក់លាក់​របស់​ថត​ទាំងអស់ ។"
+msgstr "ការ​ផ្លាស់ប្ដូរ​​ការកំណត់​ HTML សកល នឹង​បដិសេធ​រាល់​តម្លៃ​ជាក់លាក់​របស់​ថត​ទាំងអស់ ។"
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "ជម្រើស​នេះ​ទាមទារ dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "គ្មាន​ប្រូកស៊ី"
@@ -2624,8 +2527,8 @@ msgstr "ដក​មិន​ឲ្យ​សារ​សំខាន់​ផុ
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "ពេល​ព្យាយាម​រក​សារ​មិន​ទាន់​អាន ៖"
 
@@ -2649,8 +2552,8 @@ msgstr "រង្វិលជុំ​នៅ​ក្នុង​ថត​ទា
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "ពេល​ចូល​ថត​មួយ ៖"
 
@@ -2719,28 +2622,21 @@ msgstr "ថត (ទ្រង់ទ្រាយ \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>វា​ជ្រើស​ទ្រង់ទ្រាយ​ប្រអប់សំបុត្រ​ណាមួយ​ដែល​នឹងជា​លំនាំ​ដើម​សម្រាប់​ថតមូលដ្ឋា"
-"ន ៖</p>"
-"<p><b>mbox ៖</b>​ ថតសំបុត្រ​របស់​ KMail គឺត្រូវបាន​តំណាងដោយឯកសារទោល​នីមួយៗ ។ "
-"សារ​មួយៗ គឺត្រូវបាន​ដាក់ឲ្យ​ដាច់ពី​គ្នា​ដោយ​បន្ទាត់​ដែល​ចាប់ផ្ដើម​ដោយ \"ពី\" ។ "
-"វា​រក្សារទុក​ទំហំ​នៅលើថាស ប៉ុន្តែ​អាច​ប្រហែល​ជា​មិនសូវ​រឹងមាំទេ ឧទាហរណ៍. "
-"នៅពេល​ដែល​កំពុង​ផ្លាស់ទី​សាររវាងថត ។</p>"
-"<p><b>maildir ៖</b> ថតសំបុត្រ​របស់ KMail "
-"គឺត្រូវបានតំណាងដោយថត​ជាក់លាក់​នៅលើថាស ។ សារ​មួយៗ​ជា​ឯកសារផ្សេងពីគ្នា ។ "
-"ការនេះ​ប្រហែល​ជា​ចំណាយ​ទំហំនៅលើ​ថាស​បន្តិច ប៉ុន្តែ​វាគួរតែ​រឹងមាំជាង ឧទាហរណ៍. "
-"នៅពេល​ដែលកំពុង​ផ្លាស់ទីសារ​​រវាងថត ។</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>វា​ជ្រើស​ទ្រង់ទ្រាយ​ប្រអប់សំបុត្រ​ណាមួយ​ដែល​នឹងជា​លំនាំ​ដើម​សម្រាប់​ថតមូលដ្ឋាន ៖</p><p><b>mbox ៖"
+"</b>​ ថតសំបុត្រ​របស់​ KMail គឺត្រូវបាន​តំណាងដោយឯកសារទោល​នីមួយៗ ។ សារ​មួយៗ គឺត្រូវបាន​ដាក់ឲ្យ​ដាច់ពី​គ្នា​"
+"ដោយ​បន្ទាត់​ដែល​ចាប់ផ្ដើម​ដោយ \"ពី\" ។ វា​រក្សារទុក​ទំហំ​នៅលើថាស ប៉ុន្តែ​អាច​ប្រហែល​ជា​មិនសូវ​រឹងមាំទេ "
+"ឧទាហរណ៍. នៅពេល​ដែល​កំពុង​ផ្លាស់ទី​សាររវាងថត ។</p><p><b>maildir ៖</b> ថតសំបុត្រ​របស់ KMail "
+"គឺត្រូវបានតំណាងដោយថត​ជាក់លាក់​នៅលើថាស ។ សារ​មួយៗ​ជា​ឯកសារផ្សេងពីគ្នា ។ ការនេះ​ប្រហែល​ជា​ចំណាយ​"
+"ទំហំនៅលើ​ថាស​បន្តិច ប៉ុន្តែ​វាគួរតែ​រឹងមាំជាង ឧទាហរណ៍. នៅពេល​ដែលកំពុង​ផ្លាស់ទីសារ​​រវាងថត ។</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2773,55 +2669,40 @@ msgstr "ជីកាបៃ"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>នៅពេល​ដែល​កំពុង​លោតទៅកាន់​សារ​មិនអាន​បន្ទាប់ វា​អាច​បង្ហាញ​ថា "
-"គ្មាន​សារមិនទាន់អាន​បន្ថែម​ទេ​ដែល​នៅក្រោម​សារ​បច្ចុប្បន្ន ។</p>"
-"<p><b>កុំ​រង្វិល​ជុំ ៖</b> "
-"ការស្វែងរក​នឹង​បញ្ឈប់​នៅត្រង់​សារចុងក្រោយ​ក្នុង​ថត​បច្ចុប្បន្ន ។</p>"
-"<p><b>រង្វិល​ជុំ​នៅក្នុង​ថតបច្ចុប្បន្ន ៖</b> "
-"ការស្វែងរក​នឹង​បន្ត​នៅ​ខាងលើ​គេ​នៃ​បញ្ជី​សារ "
-"ប៉ុន្តែ​មិនទៅកាន់​ថត​ផ្សេងទៀតទេ ។</p>"
-"<p><b>រង្វិល​ជុំ​ក្នុង​ថតទាំងអស់ ៖</b> "
-"ការស្វែង​​នឹងបន្ត​នៅ​ខាងលើ​គេ​នៃ​បញ្ជី​សារ ។ "
-"ប្រសិន​បើមិនបានរកឃើញ​សារ​ដែល​មិនទាន់អានទេ ពេលនោះវានឹង​បន្ត​ទោកាន់ថតបន្ទាប់ ។</p>"
-"<p>ស្រដៀងគ្នានេះដែរ ពេលនោះ​ការស្វែងរក​សារដែល​មិនទាន់អាន​មុន "
-"ការស្វែងរក​នឹងចាប់ផ្ដើម​ពីបាត​នៃ​បញ្ជីសារ "
-"និង​បន្ត​ទៅកាន់​ថត​មុន​ដែលពឹងផ្អែក​ទៅលើ ដែល​បានជ្រើស​ជម្រើស ។</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>នៅពេល​ដែល​កំពុង​លោតទៅកាន់​សារ​មិនអាន​បន្ទាប់ វា​អាច​បង្ហាញ​ថា គ្មាន​សារមិនទាន់អាន​បន្ថែម​ទេ​"
+"ដែល​នៅក្រោម​សារ​បច្ចុប្បន្ន ។</p><p><b>កុំ​រង្វិល​ជុំ ៖</b> ការស្វែងរក​នឹង​បញ្ឈប់​នៅត្រង់​សារចុងក្រោយ​ក្នុង​"
+"ថត​បច្ចុប្បន្ន ។</p><p><b>រង្វិល​ជុំ​នៅក្នុង​ថតបច្ចុប្បន្ន ៖</b> ការស្វែងរក​នឹង​បន្ត​នៅ​ខាងលើ​គេ​នៃ​បញ្ជី​"
+"សារ ប៉ុន្តែ​មិនទៅកាន់​ថត​ផ្សេងទៀតទេ ។</p><p><b>រង្វិល​ជុំ​ក្នុង​ថតទាំងអស់ ៖</b> ការស្វែង​​នឹងបន្ត​នៅ​"
+"ខាងលើ​គេ​នៃ​បញ្ជី​សារ ។ ប្រសិន​បើមិនបានរកឃើញ​សារ​ដែល​មិនទាន់អានទេ ពេលនោះវានឹង​បន្ត​"
+"ទោកាន់ថតបន្ទាប់ ។</p><p>ស្រដៀងគ្នានេះដែរ ពេលនោះ​ការស្វែងរក​សារដែល​មិនទាន់អាន​មុន ការស្វែងរក​"
+"នឹងចាប់ផ្ដើម​ពីបាត​នៃ​បញ្ជីសារ និង​បន្ត​ទៅកាន់​ថត​មុន​ដែលពឹងផ្អែក​ទៅលើ ដែល​បានជ្រើស​ជម្រើស ។</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ការធ្វើលិបិក្រម​អត្ថបទ​ពេញលេញ "
-"អនុញ្ញាត​ឲ្យ​ធ្វើការ​ស្វែងរក​កាន់តែរហ័ស​នៅលើ​មាតិកា​សាររបស់អ្នក ។ "
-"នៅពេល​ដែល​បាន​អនុញ្ញាត ប្រអប់ស្វែងរក​នឹង​ធ្វើការលឿនដូច​រន្ទះ ។ "
-"របារឧបករណ៍​ស្វែងរក​នឹងជ្រើស​សារ​ដោយពឹងលើ​មាតិកា​ផងដែរ ។</p>"
-"<p>វាតម្លើង​ចំនួន​ទំហំថាស​ជាក់លាក់ (ប្រហែល​ពាក់កណ្ដាល​ទំហំថាស​សម្រាប់​សារ) ។</p>"
-"<p>បន្ទាប់ពីការ​អនុញ្ញាត លិបិក្រម​នឹង​ត្រូវ​ឲ្យត្រូវបាន​ស្ថាបនា​ "
-"ប៉ុន្តែ​អ្នក​អាច​បន្ត​ប្រើ​ KMail នៅខណៈ​ដែល​ប្រតិបត្តិការនេះកំពុងរត់ ។</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>ការធ្វើលិបិក្រម​អត្ថបទ​ពេញលេញ អនុញ្ញាត​ឲ្យ​ធ្វើការ​ស្វែងរក​កាន់តែរហ័ស​នៅលើ​មាតិកា​"
+"សាររបស់អ្នក ។ នៅពេល​ដែល​បាន​អនុញ្ញាត ប្រអប់ស្វែងរក​នឹង​ធ្វើការលឿនដូច​រន្ទះ ។ របារឧបករណ៍​ស្វែងរក​"
+"នឹងជ្រើស​សារ​ដោយពឹងលើ​មាតិកា​ផងដែរ ។</p><p>វាតម្លើង​ចំនួន​ទំហំថាស​ជាក់លាក់ (ប្រហែល​ពាក់កណ្ដាល​ទំហំថាស​"
+"សម្រាប់​សារ) ។</p><p>បន្ទាប់ពីការ​អនុញ្ញាត លិបិក្រម​នឹង​ត្រូវ​ឲ្យត្រូវបាន​ស្ថាបនា​ ប៉ុន្តែ​អ្នក​អាច​បន្ត​ប្រើ​ "
+"KMail នៅខណៈ​ដែល​ប្រតិបត្តិការនេះកំពុងរត់ ។</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2842,8 +2723,7 @@ msgstr "ទ្រង់ទ្រាយ​ដែល​ប្រើ​សម្រ
 #: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
-msgstr ""
-"ជ្រើស​ទ្រង់ទ្រាយ​ដើម្បី​ប្រើសម្រាប់​ទុក​មាតិកា​របស់ថត ដែល​ប្រើ​ជា​ក្រុម ។"
+msgstr "ជ្រើស​ទ្រង់ទ្រាយ​ដើម្បី​ប្រើសម្រាប់​ទុក​មាតិកា​របស់ថត ដែល​ប្រើ​ជា​ក្រុម ។"
 
 #: configuredialog.cpp:4840
 msgid "Deprecated Kolab1 (iCal/vCard)"
@@ -2888,8 +2768,8 @@ msgstr "លាក់​ថត​ប្រើ​ជា​ក្រុម"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "ពេល​ធីក​វា អ្នក​នឹង​មិន​ឃើញ​ថត​ធនធាន IMAP នៅ​ក្នុង​មែកធាង​ថត​ឡើយ ។"
 
 #: configuredialog.cpp:4909
@@ -2898,12 +2778,11 @@ msgstr "បង្ហាញ​តែ​ថត groupware សម្រាប់​�
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"នៅពេល​ដែល​អ្នក​បាន​ធីកវា "
-"អ្នក​នឹង​មិនឃើញ​ថត​សំបុត្រ​ធម្មតា​នៅក្នុង​មែកធាងថត​សម្រាប់​គណនី​ដែល​បាន​កំណត់​រច"
-"នា​សម្ព័ន្ធ​សម្រាប់ groupware ទេ ។"
+"នៅពេល​ដែល​អ្នក​បាន​ធីកវា អ្នក​នឹង​មិនឃើញ​ថត​សំបុត្រ​ធម្មតា​នៅក្នុង​មែកធាងថត​សម្រាប់​គណនី​ដែល​បាន​កំណត់​រចនា​"
+"សម្ព័ន្ធ​សម្រាប់ groupware ទេ ។"
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2914,8 +2793,7 @@ msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
-"ធ្វើសមកាលកម្ម​​ការ​ផ្លាស់ប្ដូរ groupware នៅ​ក្នុងថត IMAP ដែល​បាន​ផ្ដាច់​ភ្លាមៗ "
-"នៅពេល​នៅ​លើ​បណ្ដាញ ។"
+"ធ្វើសមកាលកម្ម​​ការ​ផ្លាស់ប្ដូរ groupware នៅ​ក្នុងថត IMAP ដែល​បាន​ផ្ដាច់​ភ្លាមៗ នៅពេល​នៅ​លើ​បណ្ដាញ ។"
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -2927,17 +2805,13 @@ msgstr "អនុញ្ញាត​ឲ្យ​ប្រើ​ជា​ក្រ
 
 #: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
-msgstr ""
-"ធ្វើ​ឲ្យ​បឋមកថា ពី ៖/ជូនចំពោះ ៖ ខុស​ពី​ភាព​ដើម "
-"នៅ​ក្នុង​ការ​ឆ្លើយតប​ទៅ​សេចក្ដី​អញ្ជើញ"
+msgstr "ធ្វើ​ឲ្យ​បឋមកថា ពី ៖/ជូនចំពោះ ៖ ខុស​ពី​ភាព​ដើម នៅ​ក្នុង​ការ​ឆ្លើយតប​ទៅ​សេចក្ដី​អញ្ជើញ"
 
 #: configuredialog.cpp:4949
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
-msgstr ""
-"បើក​ជម្រើស​នេះ​ដើម្បី​ធ្វើឲ្យ Outlook(tm) "
-"ដឹងអំពី​ចម្លើយរបស់​អ្នក​ទៅកាន់​ចម្លើយតប​ការ​អញ្ជើញ"
+msgstr "បើក​ជម្រើស​នេះ​ដើម្បី​ធ្វើឲ្យ Outlook(tm) ដឹងអំពី​ចម្លើយរបស់​អ្នក​ទៅកាន់​ចម្លើយតប​ការ​អញ្ជើញ"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2947,9 +2821,7 @@ msgstr "ផ្ញើ​ការ​អញ្ជើញ​នៅក្នុង​
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
-msgstr ""
-"បើក​ជម្រើស​នេះ​ដើម្បី​ធ្វើ​ឲ្យ​ Outlook(tm) "
-"ដឹងអំ​ពី​ចម្លើយរបស់​អ្នក​ទៅ​ការអញ្ជើញ"
+msgstr "បើក​ជម្រើស​នេះ​ដើម្បី​ធ្វើ​ឲ្យ​ Outlook(tm) ដឹងអំ​ពី​ចម្លើយរបស់​អ្នក​ទៅ​ការអញ្ជើញ"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2963,24 +2835,22 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Microsoft Outlook នៅ​ពេល​បាន​ប្រើ​ដោយ​បន្សំ​ជា​មួយ Microsoft Exchange server "
-"មាន​បញ្ហា​ ដោយ​យល់​ថា​អ៊ីមែល groupware ដែល​ត្រូវ​គ្នា​តាម​ស្តង់ដារ ។ "
-"បើក​ជម្រើស​នេះ ដើម្បី​ផ្ញើ​ការ​អញ្ជើញ groupware តាម​វិធី​ដែល​ Microsoft "
-"Exchange យល់ ។"
+"Microsoft Outlook នៅ​ពេល​បាន​ប្រើ​ដោយ​បន្សំ​ជា​មួយ Microsoft Exchange server មាន​បញ្ហា​ ដោយ​"
+"យល់​ថា​អ៊ីមែល groupware ដែល​ត្រូវ​គ្នា​តាម​ស្តង់ដារ ។ បើក​ជម្រើស​នេះ ដើម្បី​ផ្ញើ​ការ​អញ្ជើញ "
+"groupware តាម​វិធី​ដែល​ Microsoft Exchange យល់ ។"
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "ការ​ដាក់ឈ្មោះ​ឯកសារ​ភ្ជាប់​ Outlook ដែល​ឆបគ្នា"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "ផ្ញើការអញ្ជើញ​ដោយ​ស្វ័យប្រវត្តិ"
@@ -2990,30 +2860,26 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"នៅពេល​ដែល​វា​បើក អ្នកប្រើ​នឹង​មិនឃើញ​បង្អួច​កម្មវិធី​តែង​សំបុត្រឡើយ ។ "
-"សំបុត្រ​អញ្ជើញគឺ​ត្រូវបាន​ផ្ញើ​ដោយស្វ័យប្រវត្តិ"
+"នៅពេល​ដែល​វា​បើក អ្នកប្រើ​នឹង​មិនឃើញ​បង្អួច​កម្មវិធី​តែង​សំបុត្រឡើយ ។ សំបុត្រ​អញ្ជើញគឺ​ត្រូវបាន​ផ្ញើ​"
+"ដោយស្វ័យប្រវត្តិ"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>ការអញ្ជើញ ជាធម្មតាបាន​ផ្ញើ​ជា​ឯកសារភ្ជាប់​ទៅ​កាន់សំបុត្រ​មួយ ។ "
-"ការនេះ​ប្ដូរ​ការផ្លាស់ប្ដូរ​សំបុត្រ​អញ្ជើញ​ឲ្យត្រូវបាន​ផ្ញើ​ទៅ​ក្នុង​អត្ថបទ​របស់"
-"សំបុត្រ​ជំនួស​វិញ ។ នេះ​ការចាំបាច់​ដែលត្រូវផ្ញើ​ការអញ្ជើញ "
-"និង​ការឆ្លើយតប​ទៅ​កាន់ Microsoft Outlook ។"
-"<br>ប៉ុន្តែ នៅពេល​ដែល​អ្នក​ធ្វើការនេះ "
-"អ្នកនឹងមិន​ទទួល​អត្ថបទ​ពិពណ៌នា​ដែល​កម្មវិធី​សំបុត្រ​អាច​អានបាន បានយូរឡើយ ។ "
-"ដូច្នេះ ការទៅកាន់​មនុស្ស​ដែល​មាន​កម្មវិធី​អ៊ីមែល​​ដែលមិនយល់​អំពី​ការអញ្ជើញ​ "
-"នោះសារ​លទ្ធផល​​មើល​ទៅដូចជាប្លែកណាស់ ។"
-"<br>មនុស្ស​ដែលមាន​​កម្មវិធី​អ៊ីមែល​​ដែល​យល់អំពី​ការអញ្ជើញ​ "
-"នឹងនៅតែ​អាច​ធ្វើការជាមួយ​វា ។</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>ការអញ្ជើញ ជាធម្មតាបាន​ផ្ញើ​ជា​ឯកសារភ្ជាប់​ទៅ​កាន់សំបុត្រ​មួយ ។ ការនេះ​ប្ដូរ​ការផ្លាស់ប្ដូរ​សំបុត្រ​"
+"អញ្ជើញ​ឲ្យត្រូវបាន​ផ្ញើ​ទៅ​ក្នុង​អត្ថបទ​របស់សំបុត្រ​ជំនួស​វិញ ។ នេះ​ការចាំបាច់​ដែលត្រូវផ្ញើ​ការអញ្ជើញ និង​"
+"ការឆ្លើយតប​ទៅ​កាន់ Microsoft Outlook ។<br>ប៉ុន្តែ នៅពេល​ដែល​អ្នក​ធ្វើការនេះ អ្នកនឹងមិន​ទទួល​"
+"អត្ថបទ​ពិពណ៌នា​ដែល​កម្មវិធី​សំបុត្រ​អាច​អានបាន បានយូរឡើយ ។ ដូច្នេះ ការទៅកាន់​មនុស្ស​ដែល​មាន​កម្មវិធី​អ៊ីមែល​​"
+"ដែលមិនយល់​អំពី​ការអញ្ជើញ​ នោះសារ​លទ្ធផល​​មើល​ទៅដូចជាប្លែកណាស់ ។<br>មនុស្ស​ដែលមាន​​កម្មវិធី​អ៊ីមែល​​ដែល​យល់អំពី​"
+"ការអញ្ជើញ​ នឹងនៅតែ​អាច​ធ្វើការជាមួយ​វា ។</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3117,30 +2983,24 @@ msgstr "បញ្ជូន​បន្ត"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>នៅ​ទីនេះ អ្នក​អាច​បន្ថែម កែសម្រួល និង​លុប​ពុម្ព​សារ​ផ្ទាល់ខ្លួន "
-"ដើម្បី​ប្រើ​នៅ​ពេល​អ្នក​តែង​ការ​ឆ្លើយតប ឬ​បញ្ជូន​សារ​បន្ត ។ "
-"បង្កើត​ពុម្ពផ្ទាល់ខ្លួន​ដោយ​ជ្រើស​វា​​ ដោយ​ប្រើម៉ឺនុយ​ប៊ូតុង​​កណ្ដុរ​ស្ដាំ "
-"ឬ​ម៉ឺនុយ​របារឧបករណ៍ ។ "
-"អ្នក​ក៏​អាច​ចង​បន្សំ​ក្ដារចុច​ទៅ​ពុម្ព​សម្រាប់​ប្រតិបត្តិការ​លឿន​ជាង​ផងដែរ ។</p>"
-"<p>ពុម្ពសារ​គាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស​ដោយ​វាយ​ពួកវា​យ៉ាង​សាមញ្ញ "
-"ឬ​ជ្រើស​ពួកវា​ពី​ម៉ឺនុយ <i>បញ្ចូល​ពាក្យ​បញ្ជា</i> ។</p>"
-"<p>មាន​ពុម្ព​ផ្ទាល់ខ្លួន ៤ ប្រភេទ ៖ បាន​ប្រើ​ដើម្បី <i>ឆ្លើយតប</i> <i>"
-"ឆ្លើយតប​ទៅ​អ្នក​ទាំងអស់</i> <i>បញ្ជូន​បន្ត</i> និង​<i>សកល</i> "
-"ដែល​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​ប្រតិបត្តិការ​គ្រប់ប្រភេទ ។ "
-"អ្នក​មិន​អាច​ចង​ផ្លូវ​កាត់​ក្ដារចុចទៅ​ពុម្ព <i>សកល</i> បាន​ទេ ។</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>នៅ​ទីនេះ អ្នក​អាច​បន្ថែម កែសម្រួល និង​លុប​ពុម្ព​សារ​ផ្ទាល់ខ្លួន ដើម្បី​ប្រើ​នៅ​ពេល​អ្នក​តែង​ការ​"
+"ឆ្លើយតប ឬ​បញ្ជូន​សារ​បន្ត ។ បង្កើត​ពុម្ពផ្ទាល់ខ្លួន​ដោយ​ជ្រើស​វា​​ ដោយ​ប្រើម៉ឺនុយ​ប៊ូតុង​​កណ្ដុរ​ស្ដាំ ឬ​ម៉ឺនុយ​"
+"របារឧបករណ៍ ។ អ្នក​ក៏​អាច​ចង​បន្សំ​ក្ដារចុច​ទៅ​ពុម្ព​សម្រាប់​ប្រតិបត្តិការ​លឿន​ជាង​ផងដែរ ។</p><p>ពុម្ពសារ​"
+"គាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស​ដោយ​វាយ​ពួកវា​យ៉ាង​សាមញ្ញ ឬ​ជ្រើស​ពួកវា​ពី​ម៉ឺនុយ <i>បញ្ចូល​ពាក្យ​បញ្ជា</i> ។</"
+"p><p>មាន​ពុម្ព​ផ្ទាល់ខ្លួន ៤ ប្រភេទ ៖ បាន​ប្រើ​ដើម្បី <i>ឆ្លើយតប</i> <i>ឆ្លើយតប​ទៅ​អ្នក​ទាំងអស់</"
+"i> <i>បញ្ជូន​បន្ត</i> និង​<i>សកល</i> ដែល​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​ប្រតិបត្តិការ​គ្រប់ប្រភេទ ។ អ្នក​មិន​"
+"អាច​ចង​ផ្លូវ​កាត់​ក្ដារចុចទៅ​ពុម្ព <i>សកល</i> បាន​ទេ ។</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3157,15 +3017,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3183,16 +3043,14 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"ផ្លូវកាត់​ដែល​បាន​ជ្រើស​ត្រូវ​បាន​ប្រើ​​សម្រាប់​ពុម្ពផ្ទាល់ខ្លួន​ផ្សេង​ទៀត​រួចហើ"
-"យ តើ​អ្នក​នៅ​តែ​ចង់​​បន្ត​ជា​មួយ​នឹង​ការ​ផ្ដល់​នេះ​ដែរឬទេ ?"
+"ផ្លូវកាត់​ដែល​បាន​ជ្រើស​ត្រូវ​បាន​ប្រើ​​សម្រាប់​ពុម្ពផ្ទាល់ខ្លួន​ផ្សេង​ទៀត​រួចហើយ តើ​អ្នក​នៅ​តែ​ចង់​​បន្ត​ជា​មួយ​នឹង​ការ​"
+"ផ្ដល់​នេះ​ដែរឬទេ ?"
 
 #: customtemplates.cpp:438
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
-msgstr ""
-"ផ្លូវ​កាត់​ដែល​បាន​ជ្រើស​ត្រូវ​បាន​ប្រើ​រួចហើយ "
-"តើ​អ្នក​ចង់​បន្ត​ជា​មួយ​នឹង​ការ​ផ្ដល់​នេះ​ឬទេ ?"
+msgstr "ផ្លូវ​កាត់​ដែល​បាន​ជ្រើស​ត្រូវ​បាន​ប្រើ​រួចហើយ តើ​អ្នក​ចង់​បន្ត​ជា​មួយ​នឹង​ការ​ផ្ដល់​នេះ​ឬទេ ?"
 
 #: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
@@ -3214,9 +3072,7 @@ msgstr "​អ៊ីមែល"
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
-msgstr ""
-"មិន​មាន​អ្នក​ទទួល​នៅ​ក្នុង​បញ្ជី​របស់​អ្នក​ឡើយ ។ សូម​ជ្រើស​អ្នក​ទទួល​សិន "
-"បន្ទាប់​មក​សាកល្បង​ម្ដង​ទៀត ។"
+msgstr "មិន​មាន​អ្នក​ទទួល​នៅ​ក្នុង​បញ្ជី​របស់​អ្នក​ឡើយ ។ សូម​ជ្រើស​អ្នក​ទទួល​សិន បន្ទាប់​មក​សាកល្បង​ម្ដង​ទៀត ។"
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3230,8 +3086,7 @@ msgstr "​សូម​បញ្ចូល​ឈ្មោះ ៖"
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
-msgstr ""
-"<qt>មាន​បញ្ជីចែកចាយ​ឈ្មោះ <b>%1</b> រួច​ហើយ ។ សូម​ជ្រើស​ឈ្មោះ​មួយ​ទៀត ។</qt>"
+msgstr "<qt>មាន​បញ្ជីចែកចាយ​ឈ្មោះ <b>%1</b> រួច​ហើយ ។ សូម​ជ្រើស​ឈ្មោះ​មួយ​ទៀត ។</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3240,12 +3095,11 @@ msgstr "កែសម្រួល​ជា​មួយ ៖"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
-"KMail មិនអាច​រក​ឃើញ​ទេ​ នៅពេល​កម្មវិធី​និពន្ធ​ដែល​បាន​ជ្រើស​ត្រូវ​បាន​បិទ ។ "
-"ដើម្បីជៀសវាង​ពីការ​បាត់បង់​ទិន្នន័យ "
-"ការ​កែសម្រួល​ឯកសារ​ភ្ជាប់​នឹង​ត្រូវ​បានបោះបង់ ។"
+"KMail មិនអាច​រក​ឃើញ​ទេ​ នៅពេល​កម្មវិធី​និពន្ធ​ដែល​បាន​ជ្រើស​ត្រូវ​បាន​បិទ ។ ដើម្បីជៀសវាង​ពីការ​បាត់បង់​"
+"ទិន្នន័យ ការ​កែសម្រួល​ឯកសារ​ភ្ជាប់​នឹង​ត្រូវ​បានបោះបង់ ។"
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3343,8 +3197,7 @@ msgstr "កំពុង​យក​សារចាស់ៗ %n ចេញ​ព�
 
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
-msgstr ""
-"មិនអាច​ធ្វើ​ឲ្យ​សារ​ពីថត %1 ផុតកំណត់​បានឡើយ ៖ រកមិន​ឃើញ​ថត​ទិសដៅ %2 ឡើយ"
+msgstr "មិនអាច​ធ្វើ​ឲ្យ​សារ​ពីថត %1 ផុតកំណត់​បានឡើយ ៖ រកមិន​ឃើញ​ថត​ទិសដៅ %2 ឡើយ"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3411,9 +3264,7 @@ msgstr "លុប​ជាអចិន្ត្រៃយ៍"
 #: expirypropertiesdialog.cpp:113
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
-msgstr ""
-"ចំណាំ ៖ "
-"សកម្មភាព​ផុតកំណត់​នឹងត្រូវបាន​អនុវត្ត​យ៉ាងលឿន​បន្ទាប់ពីការកំណត់​ការអះអាង ។"
+msgstr "ចំណាំ ៖ សកម្មភាព​ផុតកំណត់​នឹងត្រូវបាន​អនុវត្ត​យ៉ាងលឿន​បន្ទាប់ពីការកំណត់​ការអះអាង ។"
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3488,6 +3339,11 @@ msgstr "ជ្រើស​តម្រង"
 msgid "Filters"
 msgstr "តម្រង"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "ជ្រើស​អត្ថបទ​ទាំងអស់"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3501,9 +3357,7 @@ msgstr "នាំចូល​តម្រង"
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
-msgstr ""
-"ឯកសារ​ដែលបាន​ជ្រើស​មិន​អាច​អាន​បានទេ ។ "
-"សិទ្ធិ​ចូលដំណើរការ​ឯកសារ​របស់​អ្នក​អាច​មិន​គ្រប់គ្រាន់ ។"
+msgstr "ឯកសារ​ដែលបាន​ជ្រើស​មិន​អាច​អាន​បានទេ ។ សិទ្ធិ​ចូលដំណើរការ​ឯកសារ​របស់​អ្នក​អាច​មិន​គ្រប់គ្រាន់ ។"
 
 #: filterimporterexporter.cpp:235
 msgid "Export Filters"
@@ -3519,12 +3373,11 @@ msgstr "សកម្មភាព​ចុះកំណត់ហេតុ​តម
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"អ្នកអាចបើក និង​បិទ​​ការចុះកំណត់​ហេតុ​នៃ​សកម្មភាព​តម្រង​នៅទីនេះ ។ អញ្ចឹងហើយ "
-"ទិន្នន័យ​កំណត់ហេតុ​គឺត្រូវបាន​ប្រមូល​ "
-"និង​បង្ហាញ​តែនៅពេល​ដែល​បើក​ការចុះកំណត់ហេតុ​ប៉ុណ្ណោះ ។ "
+"អ្នកអាចបើក និង​បិទ​​ការចុះកំណត់​ហេតុ​នៃ​សកម្មភាព​តម្រង​នៅទីនេះ ។ អញ្ចឹងហើយ ទិន្នន័យ​កំណត់ហេតុ​គឺត្រូវបាន​"
+"ប្រមូល​ និង​បង្ហាញ​តែនៅពេល​ដែល​បើក​ការចុះកំណត់ហេតុ​ប៉ុណ្ណោះ ។ "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3540,17 +3393,16 @@ msgstr "ការ​វាយតម្លៃ​ច្បាប់​តម្រ
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"អ្នកអាច​ត្រួតពិនិត្យ​មតិអ្នកប្រើ​នៅក្នុង​កំណត់​ហេតុ "
-"ដែលទាក់ទងនឹង​ការវាយ​តម្លៃ​នៃ​ច្បាប់តម្រង​របស់​តម្រង​ដែលបាន​ឆ្លើយតប ៖ "
-"ការដែលបាន​ធីក​ជម្រើស​នេះ "
-"នឹងផ្ដល់​មតិអ្នកប្រើ​លម្អិត​សម្រាប់​ច្បាប់តម្រង​ទោល​នីមួយៗ ។ ឆ្លាស់គ្នានេះដែរ "
-"គឺមានតែ​មតិអ្នកប្រើ​អំពី​លទ្ធផល​របស់​ការវាយតម្លៃ​នៃ​ច្បាប់ទាំងអស់​របស់តម្រង​តែមួ"
-"យ​ប៉ុណ្ណោះ​ដែល​នឹងត្រូវបានផ្ដល់ ។"
+"អ្នកអាច​ត្រួតពិនិត្យ​មតិអ្នកប្រើ​នៅក្នុង​កំណត់​ហេតុ ដែលទាក់ទងនឹង​ការវាយ​តម្លៃ​នៃ​ច្បាប់តម្រង​របស់​តម្រង​ដែលបាន​"
+"ឆ្លើយតប ៖ ការដែលបាន​ធីក​ជម្រើស​នេះ នឹងផ្ដល់​មតិអ្នកប្រើ​លម្អិត​សម្រាប់​ច្បាប់តម្រង​ទោល​នីមួយៗ ។ "
+"ឆ្លាស់គ្នានេះដែរ គឺមានតែ​មតិអ្នកប្រើ​អំពី​លទ្ធផល​របស់​ការវាយតម្លៃ​នៃ​ច្បាប់ទាំងអស់​របស់តម្រង​តែមួយ​ប៉ុណ្ណោះ​"
+"ដែល​នឹងត្រូវបានផ្ដល់ ។"
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3570,17 +3422,14 @@ msgstr "គ្មាន​កំណត់"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"ការប្រមូល​ផ្ដុំ​ទិន្នន័យ​កំណត់ហេតុ "
-"ប្រើ​សតិ​ដើម្បី​ទុក​ទិន្នន័យ​កំណត់ហេតុ​ជាអាចិន្ត្រៃយ៍ ។ "
-"អ្នកអាច​កំណត់​ចំនួន​អតិបរមា​នៃ​សតិ​ដែល​ត្រូវ​ប្រើ​នៅទីនេះ ៖ "
-"ប្រសិនបើ​ទំហំ​នៃ​ទិន្នន័យ​កំណត់ហេតុ​ដែលបាន​ប្រមូល​ហួស​ពី​ដែន​នេះ "
-"នៅពេល​នោះ​ទិន្នន័យ​ដែល​ចាស់បំផុត​នឹងត្រូវបាន​បោះចោល​ "
-"រហូត​ទាល់តែ​ដែន​​​មិន​ហួស​ឆ្ងាយ ។ "
+"ការប្រមូល​ផ្ដុំ​ទិន្នន័យ​កំណត់ហេតុ ប្រើ​សតិ​ដើម្បី​ទុក​ទិន្នន័យ​កំណត់ហេតុ​ជាអាចិន្ត្រៃយ៍ ។ អ្នកអាច​កំណត់​ចំនួន​អតិបរមា​នៃ​"
+"សតិ​ដែល​ត្រូវ​ប្រើ​នៅទីនេះ ៖ ប្រសិនបើ​ទំហំ​នៃ​ទិន្នន័យ​កំណត់ហេតុ​ដែលបាន​ប្រមូល​ហួស​ពី​ដែន​នេះ នៅពេល​នោះ​ទិន្នន័យ​ដែល​"
+"ចាស់បំផុត​នឹងត្រូវបាន​បោះចោល​ រហូត​ទាល់តែ​ដែន​​​មិន​ហួស​ឆ្ងាយ ។ "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3590,7 +3439,7 @@ msgstr ""
 "មិនអាច​សរសេរ​ឯកសារ %1 បានឡើយ​ ៖\n"
 "\"%2\" គឺ​ជា​សេចក្ដីពណ៌នា​លម្អិត​អំពី​កំហុស ។"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "កំហុស KMail"
@@ -3631,13 +3480,12 @@ msgstr "គ្រឿង​សម្គាល់​របស់​អ្នកប
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"គ្រឿងសម្គាល់​របស់អ្នកប្រើ​គឺជា​ការចូល​របស់​អ្នកប្រើ​នៅលើ​ម៉ាស៊ីនបម្រើ IMAP ។ "
-"វា​អាច​ជា​ឈ្មោះ​អ្នកប្រើ​ធម្មតា ឬ អាសយដ្ឋាន​អ៊ីមែល​​ពេញលេញ​របស់អ្នកប្រើ ។ "
-"ការចូល​សម្រាប់​គណនី​ផ្ទាល់ខ្លួន​របស់​អ្នក​នៅលើ​ម៉ាស៊ីនបម្រើ "
+"គ្រឿងសម្គាល់​របស់អ្នកប្រើ​គឺជា​ការចូល​របស់​អ្នកប្រើ​នៅលើ​ម៉ាស៊ីនបម្រើ IMAP ។ វា​អាច​ជា​ឈ្មោះ​អ្នកប្រើ​"
+"ធម្មតា ឬ អាសយដ្ឋាន​អ៊ីមែល​​ពេញលេញ​របស់អ្នកប្រើ ។ ការចូល​សម្រាប់​គណនី​ផ្ទាល់ខ្លួន​របស់​អ្នក​នៅលើ​ម៉ាស៊ីនបម្រើ "
 "នឹងប្រាប់អ្នក​ថា​វាជាអាមួយណា ។"
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3689,10 +3537,9 @@ msgstr "អ្នក​មិនមាន​សិទ្ធិ​អាន/ស�
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
-msgstr ""
-"មិនទាន់បានទៅ​យក​ព័ត៌មាន​ពី​ម៉ាស៊ីន​បម្រើ​នៅឡើយទេ សូមប្រើ \"ពិនិត្យ​សំបុត្រ\" ។"
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
+msgstr "មិនទាន់បានទៅ​យក​ព័ត៌មាន​ពី​ម៉ាស៊ីន​បម្រើ​នៅឡើយទេ សូមប្រើ \"ពិនិត្យ​សំបុត្រ\" ។"
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3702,17 +3549,14 @@ msgstr "កំហុស ៖ មិន​បាន​កំណត់​គណន
 msgid "Connecting to server %1, please wait..."
 msgstr "កំពុង​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ %1 ។ សូម​រង់ចាំ..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "មានកំហុស​ក្នុងការតភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ %1"
 
 #: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
-msgstr ""
-"ម៉ាស៊ីន​បម្រើ​ IMAP "
-"នេះ​មិនបាន​គាំទ្រ​សម្រាប់​បញ្ជី​​​ត្រួតត្រា​ការចូលដំណើរការ​ឡើយ (ACL)"
+msgstr "ម៉ាស៊ីន​បម្រើ​ IMAP នេះ​មិនបាន​គាំទ្រ​សម្រាប់​បញ្ជី​​​ត្រួតត្រា​ការចូលដំណើរការ​ឡើយ (ACL)"
 
 #: folderdiaacltab.cpp:524
 #, c-format
@@ -3733,11 +3577,11 @@ msgstr "បន្ថែម​សិទ្ធិ"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"តើអ្នកពិត​ជាចង់​យក​​សិទ្ធិ​ផ្ទាល់ខ្លួន​របស់អ្នក​សម្រាប់​ថតនេះ​ចេញ​ឬ ? "
-"អ្នកនឹង​មិនអាច​ចូល​ដំណើរការវា​នៅពេលក្រោយទៀត​បានឡើយ ។"
+"តើអ្នកពិត​ជាចង់​យក​​សិទ្ធិ​ផ្ទាល់ខ្លួន​របស់អ្នក​សម្រាប់​ថតនេះ​ចេញ​ឬ ? អ្នកនឹង​មិនអាច​ចូល​ដំណើរការវា​"
+"នៅពេលក្រោយទៀត​បានឡើយ ។"
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3768,7 +3612,7 @@ msgstr "ការ​ប្រើ​ប្រាស់ ៖"
 msgid "Select Folder"
 msgstr "​ជ្រើស​ថត"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "ថត​មូលដ្ឋាន"
@@ -3792,18 +3636,16 @@ msgstr "ជ្រើស​ផ្លូវកាត់​សម្រាប់​
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>ដើម្បី​ជ្រើស​គ្រាប់ចុច ឬ ការបញ្ចូលគ្នា​នៃគ្រាប់ចុច ដែល​ជ្រើស​ថត​បច្ចុប្បន្ន "
-"សូមចុច​ប៊ូតុង​ខាងក្រោម "
-"ហើយ​បន្ទាប់មក​សង្កត់​គ្រាប់ចុច​ដែលអ្នកចង់​ឲ្យ​ភ្ជាប់​ជាមួយ​ថតនេះ ។</qt>"
+"<qt>ដើម្បី​ជ្រើស​គ្រាប់ចុច ឬ ការបញ្ចូលគ្នា​នៃគ្រាប់ចុច ដែល​ជ្រើស​ថត​បច្ចុប្បន្ន សូមចុច​ប៊ូតុង​ខាងក្រោម ហើយ​"
+"បន្ទាប់មក​សង្កត់​គ្រាប់ចុច​ដែលអ្នកចង់​ឲ្យ​ភ្ជាប់​ជាមួយ​ថតនេះ ។</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
-msgstr ""
-"ផ្លូវកាត់​ដែលបាន​ជ្រើស​នេះ​គឺ​ត្រូវបាន​ប្រើ​រួចហើយ សូមជ្រើស​មួយផ្សេងទៀត ។"
+msgstr "ផ្លូវកាត់​ដែលបាន​ជ្រើស​នេះ​គឺ​ត្រូវបាន​ប្រើ​រួចហើយ សូមជ្រើស​មួយផ្សេងទៀត ។"
 
 #: foldertreebase.cpp:85
 msgid "&Move Here"
@@ -3819,13 +3661,21 @@ msgstr "​បោះបង់"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>ថត​ដែលអ្នក​បានលុប​ត្រូវបាន​ភ្ជាប់​ជាមួយ​គណនី <b>%1</b> "
-"ដែល​បានបញ្ជូន​សំបុត្រ​ទៅ​ដល់វា ។ ថត​ដែល​គណនី​បញ្ជូន​សំបុត្រ​ថ្មី​ទៅក្នុង​ "
-"គឺត្រូវបាន​កំណត់​ទៅកាន់​ថត​ប្រអប់ទទួល​សំបុត្រ​ឡើងវិញហើយ ។</qt>"
+"<qt>ថត​ដែលអ្នក​បានលុប​ត្រូវបាន​ភ្ជាប់​ជាមួយ​គណនី <b>%1</b> ដែល​បានបញ្ជូន​សំបុត្រ​ទៅ​ដល់វា ។ ថត​ដែល​គណនី​"
+"បញ្ជូន​សំបុត្រ​ថ្មី​ទៅក្នុង​ គឺត្រូវបាន​កំណត់​ទៅកាន់​ថត​ប្រអប់ទទួល​សំបុត្រ​ឡើងវិញហើយ ។</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>សរុប ៖ %2<br>មិនបាន​អាន ៖ %3<br>ទំហំ ៖ %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>កូតា ៖ %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3948,53 +3798,15 @@ msgstr "ស្ថានភាព​សារ​ឥតបានការ ៖"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>សារ<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>មិន"
-"<br>"
-"<br>មាន"
-"<br>"
-"<br>សារ"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>"
-"<br>ឡើយ</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>មិន<br><br>មាន<br><br>សារ<br> <br>H<br>T<br>M<br>L<br><br>ឡើយ</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4006,18 +3818,12 @@ msgstr "ឈ្មោះ​របស់​អ្នក ៖"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>ឈ្មោះ​របស់អ្នក</h3>"
-"<p>វាលនេះ​គួរតែមាន​ឈ្មោះរបស់អ្នក "
-"នៅពេល​ដែលអ្នក​ចង់​ឲ្យវា​លេចឡើង​នៅក្នុង​​ក្បាល​អ៊ីមែល​ដែល​ត្រូវផ្ញើចេញ ។</p>"
-"<p>ប្រសិនបើ​អ្នក​ទុក​វា​ឲ្យ​ទទេ​ឈ្មោះ​ពិត​របស់​អ្នក​នឹង​មិន​បង្ហាញ​ទេ "
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
+msgstr ""
+"<qt><h3>ឈ្មោះ​របស់អ្នក</h3><p>វាលនេះ​គួរតែមាន​ឈ្មោះរបស់អ្នក នៅពេល​ដែលអ្នក​ចង់​ឲ្យវា​លេចឡើង​"
+"នៅក្នុង​​ក្បាល​អ៊ីមែល​ដែល​ត្រូវផ្ញើចេញ ។</p><p>ប្រសិនបើ​អ្នក​ទុក​វា​ឲ្យ​ទទេ​ឈ្មោះ​ពិត​របស់​អ្នក​នឹង​មិន​បង្ហាញ​ទេ "
 "បង្ហាញ​តែ​អាសយដ្ឋាន​អ៊ីមែល​ប៉ុណ្ណោះ ។</p></qt>"
 
 #: identitydialog.cpp:135
@@ -4026,17 +3832,13 @@ msgstr "ស្ថាប័ន ៖"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>ស្ថាប័ន</h3>"
-"<p>វាលនេះ​គួរ​តែមាន​ឈ្មោះ​​អង្គការ​របស់​អ្នក "
-"ប្រសិនបើ​​អ្នកចង់​បង្ហាញ​វា​នៅក្នុង​ក្បាល​អ៊ីមែល​ដែល​បាន​ផ្ញើចេញ ។</p>"
-"<p>វា​មាន​សុវត្ថិភាព (និង​ ធម្មតា) ដែល​ទុក​វា​ឲ្យ​នៅទទេ ។</p></qt>"
+"<qt><h3>ស្ថាប័ន</h3><p>វាលនេះ​គួរ​តែមាន​ឈ្មោះ​​អង្គការ​របស់​អ្នក ប្រសិនបើ​​អ្នកចង់​បង្ហាញ​វា​នៅក្នុង​"
+"ក្បាល​អ៊ីមែល​ដែល​បាន​ផ្ញើចេញ ។</p><p>វា​មាន​សុវត្ថិភាព (និង​ ធម្មតា) ដែល​ទុក​វា​ឲ្យ​នៅទទេ ។</p></"
+"qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4045,20 +3847,14 @@ msgstr "​អាសយដ្ឋាន​អ៊ីមែល ៖"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>អាសយដ្ឋាន​អ៊ីមែល</h3>"
-"<p>វាលនេះ​គួរតែ​មាន​អាសយដ្ឋាន​អ៊ីមែល​ពេញលេញ​របស់អ្នក ។</p>"
-"<p>ប្រសិនបើ​អ្នកទុក​វា​ឲ្យ​នៅទទេ ឬ​ ដាក់វាខុស "
-"នោះ​គេ​នឹង​ពិបាក​ឆ្លើយតប​ទៅកាន់អ្នក ។</p></qt>"
+"<qt><h3>អាសយដ្ឋាន​អ៊ីមែល</h3><p>វាលនេះ​គួរតែ​មាន​អាសយដ្ឋាន​អ៊ីមែល​ពេញលេញ​របស់អ្នក ។</"
+"p><p>ប្រសិនបើ​អ្នកទុក​វា​ឲ្យ​នៅទទេ ឬ​ ដាក់វាខុស នោះ​គេ​នឹង​ពិបាក​ឆ្លើយតប​ទៅកាន់អ្នក ។</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4067,21 +3863,12 @@ msgstr "​អាសយដ្ឋាន​អ៊ីមែល ៖"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4100,27 +3887,20 @@ msgstr "កូនសោ​ហត្ថលេខា OpenPGP របស់​អ្
 #: identitydialog.cpp:194
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
-msgstr ""
-"ជ្រើសកូន​​សោ OpenPGP "
-"ដែល​គួរតែត្រូវបានប្រើ​ដើម្បី​ចុះហត្ថលេខា​លើ​សាររបស់អ្នក​ជាលក្ខណៈ​ឌីជីថល ។"
+msgstr "ជ្រើសកូន​​សោ OpenPGP ដែល​គួរតែត្រូវបានប្រើ​ដើម្បី​ចុះហត្ថលេខា​លើ​សាររបស់អ្នក​ជាលក្ខណៈ​ឌីជីថល ។"
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>កូនសោ OpenPGP "
-"ដែលអ្នក​ជ្រើស​នៅទីនេះ​នឹងត្រូវបានប្រើ​ដើម្បី​ចុះហត្ថលេខា​លើ​សារតាមលក្ខណៈ​ឌីជីថល "
-"។ អ្នក​ក៏អាចប្រើ​សោ GnuPG ផងដែរ ។</p>"
-"<p>អ្នកអាច​ទុកវា​ឲ្យនៅទទេ ប៉ុន្តែ​ KMail "
-"នឹងមិនអាច​ចុះហត្ថលេខា​អ៊ីមែល​តាមលក្ខណៈ​ឌីជីថល​ដោយប្រើ​ OpenPGP បានឡើយ ។ "
-"មុខងារ​សំបុត្រ​ធម្មតា នឹង​មិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</p>"
-"<p>អ្នកអាច​ស្វែងយល់​បន្ថែម​អំពីសោ​នៅ <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>កូនសោ OpenPGP ដែលអ្នក​ជ្រើស​នៅទីនេះ​នឹងត្រូវបានប្រើ​ដើម្បី​ចុះហត្ថលេខា​លើ​សារតាមលក្ខណៈ​"
+"ឌីជីថល ។ អ្នក​ក៏អាចប្រើ​សោ GnuPG ផងដែរ ។</p><p>អ្នកអាច​ទុកវា​ឲ្យនៅទទេ ប៉ុន្តែ​ KMail នឹងមិនអាច​"
+"ចុះហត្ថលេខា​អ៊ីមែល​តាមលក្ខណៈ​ឌីជីថល​ដោយប្រើ​ OpenPGP បានឡើយ ។ មុខងារ​សំបុត្រ​ធម្មតា នឹង​មិនត្រូវបាន​"
+"ប៉ះពាល់ឡើយ ។</p><p>អ្នកអាច​ស្វែងយល់​បន្ថែម​អំពីសោ​នៅ <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4132,34 +3912,26 @@ msgstr "កូនសោ​អ៊ិនគ្រីប OpenPGP របស់អ្
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"ជ្រើស​កូនសោ OpenPGP "
-"ដែល​គួរតែ​ត្រូវបាន​ប្រើ​នៅពេល​ដែលកំពុង​អ៊ិនគ្រីប​ទៅ​ខ្លួនអ្នកផ្ទាល់ "
-"និង​សម្រាប់​លក្ខណៈ​ពិសេស \"ភ្ជាប់​កូនសោ​សាធារណៈ​របស់​ខ្ញុំ\" "
-"នៅក្នុង​កម្មវិធី​តែង ។"
+"ជ្រើស​កូនសោ OpenPGP ដែល​គួរតែ​ត្រូវបាន​ប្រើ​នៅពេល​ដែលកំពុង​អ៊ិនគ្រីប​ទៅ​ខ្លួនអ្នកផ្ទាល់ និង​សម្រាប់​លក្ខណៈ​"
+"ពិសេស \"ភ្ជាប់​កូនសោ​សាធារណៈ​របស់​ខ្ញុំ\" នៅក្នុង​កម្មវិធី​តែង ។"
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>កូនសោ OpenPGP "
-"ដែលអ្នក​ជ្រើស​នៅទីនេះ​នឹងត្រូវ​បាន​ប្រើ​ដើម្បី​អ៊ិនគ្រីប​​សារ​ទៅ​ខ្លួនអ្នកផ្ទាល់"
-" និង​សម្រាប់លក្ខណៈ​ពិសេស \"ភ្ជាប់​កូនសោ​សាធារណៈ​របស់​ខ្ញុំ\" "
-"នៅក្នុង​កម្មវិធី​តែង ។ អ្នក​ក៏អាចប្រើកូនសោ GnuPG បានដែរ ។</p>"
-"<p>អ្នក​អាច​ទុកវា​ឲ្យ​នៅទទេ​ ប៉ុន្តែ​ KMail "
-"នឹងមិនអាចអ៊ិនគ្រីប​ច្បាប់ចម្លង​នៃ​​សារផ្ញើចេញ​​ទៅអ្នកដោយប្រើ OpenPGP បានទេ ។ "
-"មុខងារ​សំបុត្រ​ធម្មតានឹងមិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</p>"
-"<p>អ្នកអាច​ស្វែងយល់បន្ថែម​អំពី​កូនសោ​នៅ <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>កូនសោ OpenPGP ដែលអ្នក​ជ្រើស​នៅទីនេះ​នឹងត្រូវ​បាន​ប្រើ​ដើម្បី​អ៊ិនគ្រីប​​សារ​ទៅ​ខ្លួនអ្នកផ្ទាល់ និង​"
+"សម្រាប់លក្ខណៈ​ពិសេស \"ភ្ជាប់​កូនសោ​សាធារណៈ​របស់​ខ្ញុំ\" នៅក្នុង​កម្មវិធី​តែង ។ អ្នក​ក៏អាចប្រើកូនសោ GnuPG "
+"បានដែរ ។</p><p>អ្នក​អាច​ទុកវា​ឲ្យ​នៅទទេ​ ប៉ុន្តែ​ KMail នឹងមិនអាចអ៊ិនគ្រីប​ច្បាប់ចម្លង​នៃ​​សារផ្ញើចេញ​​"
+"ទៅអ្នកដោយប្រើ OpenPGP បានទេ ។ មុខងារ​សំបុត្រ​ធម្មតានឹងមិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</p><p>អ្នកអាច​"
+"ស្វែងយល់បន្ថែម​អំពី​កូនសោ​នៅ <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4174,23 +3946,19 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"ជ្រើស​វិញ្ញាបនបត្រ S/MIME "
-"ដែលគួរតែត្រូវបាន​ប្រើ​ដើម្បី​ចុះហត្ថលេខាលើ​សារ​របស់អ្នកតាមលក្ខណៈ​ឌីជីថល ។"
+"ជ្រើស​វិញ្ញាបនបត្រ S/MIME ដែលគួរតែត្រូវបាន​ប្រើ​ដើម្បី​ចុះហត្ថលេខាលើ​សារ​របស់អ្នកតាមលក្ខណៈ​ឌីជីថល ។"
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>វិញ្ញាបនបត្រ S/MIME (X.509) ដែលអ្នក​ជ្រើស​នៅទីនេះ "
-"នឹង​ត្រូវបាន​ប្រើ​ដើម្បី​ចុះហត្ថលេខា​លើសារ​តាមលក្ខណៈ​ឌីជីថល ។</p>"
-"<p>អ្នកអាច​ទុកវា​ឲ្យ​នៅទទេ ប៉ុន្តែ KMail "
-"នឹង​មិនអាច​ចុះហត្ថលេខា​លើ​អ៊ីមែលដោយប្រើ S/MIME តាមលក្ខណៈ​ឌីជីថល​បាន​ឡើយ ។ "
-"មុខងារ​សំបុត្រ​​ធម្មតា​នឹងមិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</p></qt>"
+"<qt><p>វិញ្ញាបនបត្រ S/MIME (X.509) ដែលអ្នក​ជ្រើស​នៅទីនេះ នឹង​ត្រូវបាន​ប្រើ​ដើម្បី​ចុះហត្ថលេខា​"
+"លើសារ​តាមលក្ខណៈ​ឌីជីថល ។</p><p>អ្នកអាច​ទុកវា​ឲ្យ​នៅទទេ ប៉ុន្តែ KMail នឹង​មិនអាច​ចុះហត្ថលេខា​លើ​"
+"អ៊ីមែលដោយប្រើ S/MIME តាមលក្ខណៈ​ឌីជីថល​បាន​ឡើយ ។ មុខងារ​សំបុត្រ​​ធម្មតា​នឹងមិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</"
+"p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4202,30 +3970,24 @@ msgstr "វិញ្ញាបនបត្រ​ការ​អ៊ិនគ្រ
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"ជ្រើស​វិញ្ញាបនបត្រ S/MIME "
-"ដែលគួរតែត្រូវបាន​ប្រើ​នៅពេល​កំពុង​អ៊ិនគ្រីបទៅកាន់​អ្នកផ្ទាល់​ "
-"និង​សម្រាប់លក្ខណៈ​ពិសេស \"ភ្ជាប់​វិញ្ញាបនបត្រ​របស់ខ្ញុំ\" "
-"នៅក្នុង​កម្មវិធី​តែង ។"
+"ជ្រើស​វិញ្ញាបនបត្រ S/MIME ដែលគួរតែត្រូវបាន​ប្រើ​នៅពេល​កំពុង​អ៊ិនគ្រីបទៅកាន់​អ្នកផ្ទាល់​ និង​សម្រាប់លក្ខណៈ​"
+"ពិសេស \"ភ្ជាប់​វិញ្ញាបនបត្រ​របស់ខ្ញុំ\" នៅក្នុង​កម្មវិធី​តែង ។"
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>វិញ្ញាបនបត្រ​ S/MIME ដែលអ្នកបាន​ជ្រើស​នៅទីនេះ "
-"នឹងត្រូវបានប្រើ​សម្រាប់អ៊ិនគ្រីបសារ​ទៅ​កាន់អ្នកផ្ទាល់ និង​សម្រាប់​លក្ខណៈពិសេស "
-"\"ភ្ជាប់​វិញ្ញាបនបត្ររបស់ខ្ញុំ\" នៅក្នុង​កម្មវិធីតែង ។</p>"
-"<p>អ្នកអាច​ទុកវា​ឲ្យ​នៅទទេ ប៉ុន្តែ​ KMail "
-"នឹងមិនអាច​អ៊ិនគ្រីប​ច្បាប់ចម្លងនៃ​សារ​ផ្ញើចេញទៅឲ្យអ្នក​ដោយប្រើ S/MIME ។ "
-"មុខងារ​សំបុត្រ​ធម្មតានឹងមិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>វិញ្ញាបនបត្រ​ S/MIME ដែលអ្នកបាន​ជ្រើស​នៅទីនេះ នឹងត្រូវបានប្រើ​សម្រាប់អ៊ិនគ្រីបសារ​ទៅ​"
+"កាន់អ្នកផ្ទាល់ និង​សម្រាប់​លក្ខណៈពិសេស \"ភ្ជាប់​វិញ្ញាបនបត្ររបស់ខ្ញុំ\" នៅក្នុង​កម្មវិធីតែង ។</"
+"p><p>អ្នកអាច​ទុកវា​ឲ្យ​នៅទទេ ប៉ុន្តែ​ KMail នឹងមិនអាច​អ៊ិនគ្រីប​ច្បាប់ចម្លងនៃ​សារ​ផ្ញើចេញទៅឲ្យអ្នក​"
+"ដោយប្រើ S/MIME ។ មុខងារ​សំបុត្រ​ធម្មតានឹងមិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4245,24 +4007,18 @@ msgstr "ឆ្លើយតប​ទៅកាន់​អាសយដ្ឋាន
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>ឆ្លើយតប​ទៅកាន់​អាសយដ្ឋាន</h3>"
-"<p>កំណត់​បឋមកថា <tt>ឆ្លើយតបទៅ ៖</tt> "
-"ឲ្យ​មាន​អាសយដ្ឋាន​អ៊ីមែល​ខុស​គ្នា​ពី​អាសយដ្ឋាន <tt>ពី ៖</tt> ធម្មតា ។</p>"
-"<p>វា​មាន​ប្រយោជន៍ នៅ​ពេល​អ្នក​ធ្វើការ​ជា​ក្រុម "
-"ដែល​សមាជិក​ម្នាក់ៗ​មាន​តួនាទី​ស្រដៀង​គ្នា ។ ឧទាហរណ៍ "
-"អ្នក​ប្រហែល​ជា​ចង់​ឲ្យ​អ៊ីមែល​ដែល​បាន​ផ្ញើ​ទៅ មាន​អ៊ីមែល​របស់​អ្នក​នៅ​ក្នុង​វាល "
-"<tt>ពី ៖</tt> ប៉ុន្តែ​ចង់​ឲ្យ​ការ​ឆ្លើយតប​នានា​ចូល​ទៅ​អាសយដ្ឋាន​ក្រុម ។</p>"
-"<p>បើ​នៅ​សង្ស័យ សូម​ទុក​វា​នៅ​ទទេ​ចុះ ។</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>ឆ្លើយតប​ទៅកាន់​អាសយដ្ឋាន</h3><p>កំណត់​បឋមកថា <tt>ឆ្លើយតបទៅ ៖</tt> ឲ្យ​មាន​"
+"អាសយដ្ឋាន​អ៊ីមែល​ខុស​គ្នា​ពី​អាសយដ្ឋាន <tt>ពី ៖</tt> ធម្មតា ។</p><p>វា​មាន​ប្រយោជន៍ នៅ​ពេល​អ្នក​"
+"ធ្វើការ​ជា​ក្រុម ដែល​សមាជិក​ម្នាក់ៗ​មាន​តួនាទី​ស្រដៀង​គ្នា ។ ឧទាហរណ៍ អ្នក​ប្រហែល​ជា​ចង់​ឲ្យ​អ៊ីមែល​ដែល​បាន​ផ្ញើ​"
+"ទៅ មាន​អ៊ីមែល​របស់​អ្នក​នៅ​ក្នុង​វាល <tt>ពី ៖</tt> ប៉ុន្តែ​ចង់​ឲ្យ​ការ​ឆ្លើយតប​នានា​ចូល​ទៅ​អាសយដ្ឋាន​ក្រុម ។"
+"</p><p>បើ​នៅ​សង្ស័យ សូម​ទុក​វា​នៅ​ទទេ​ចុះ ។</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4270,26 +4026,19 @@ msgstr "អាសយដ្ឋាន​ចម្លង​ជា​សម្ងា
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>អាសយដ្ឋាន​ចម្លង​ជា​សម្ងាត់​ជូន (Blind Carbon Copy)</h3>"
-"<p>អាសយដ្ឋាន​ដែលអ្នក​បញ្ចូល​នៅទីនេះ​នឹងត្រូវបាន​បន្ថែម​ទៅកាន់​សំបុត្រ​ផ្ញើចេញ​នី"
-"មួយៗ ដែលត្រូវបាន​ផ្ញើជាមួយ​អត្តសញ្ញាណ​នេះ ។ "
-"ពួកវា​នឹងមិនត្រូវបាន​មើលឃើញដោយអ្នកទទួល​ផ្សេងទៀតទេ ។</p>"
-"<p>ជាទូទៅ​ការនេះ​ត្រូវបានប្រើ​ដើម្បី​ផ្ញើ​ច្បាប់​ចម្លង​របស់សារ​ដែលបានផ្ញើនីមួយៗ​"
-"ទៅ​កាន់​គណនី​ផ្សេងទៀតរបស់ច្បាប់ចម្លងរបស់អ្នក ។</p>"
-"<p>ដើម្បី​បញ្ជាក់អាសយដ្ឋាន​ច្រើន​ជាងមួយ សូម​ប្រើ​សញ្ញាក្បៀស "
-"ដើម្បី​បំបែក​អ្នក​ទទួល​ច្បាប់ចម្លង​សម្ងាត់​របស់​អ្នក ។</p>"
-"<p>បើ​នៅ​សង្ស័យ សូម​ទុក​វាល​នេះ​នៅ​ទទេ​ចុះ ។</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>អាសយដ្ឋាន​ចម្លង​ជា​សម្ងាត់​ជូន (Blind Carbon Copy)</h3><p>អាសយដ្ឋាន​ដែលអ្នក​បញ្ចូល​"
+"នៅទីនេះ​នឹងត្រូវបាន​បន្ថែម​ទៅកាន់​សំបុត្រ​ផ្ញើចេញ​នីមួយៗ ដែលត្រូវបាន​ផ្ញើជាមួយ​អត្តសញ្ញាណ​នេះ ។ ពួកវា​"
+"នឹងមិនត្រូវបាន​មើលឃើញដោយអ្នកទទួល​ផ្សេងទៀតទេ ។</p><p>ជាទូទៅ​ការនេះ​ត្រូវបានប្រើ​ដើម្បី​ផ្ញើ​ច្បាប់​"
+"ចម្លង​របស់សារ​ដែលបានផ្ញើនីមួយៗ​ទៅ​កាន់​គណនី​ផ្សេងទៀតរបស់ច្បាប់ចម្លងរបស់អ្នក ។</p><p>ដើម្បី​"
+"បញ្ជាក់អាសយដ្ឋាន​ច្រើន​ជាងមួយ សូម​ប្រើ​សញ្ញាក្បៀស ដើម្បី​បំបែក​អ្នក​ទទួល​ច្បាប់ចម្លង​សម្ងាត់​របស់​អ្នក ។</"
+"p><p>បើ​នៅ​សង្ស័យ សូម​ទុក​វាល​នេះ​នៅ​ទទេ​ចុះ ។</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4327,7 +4076,7 @@ msgstr "ហត្ថលេខា"
 msgid "&Picture"
 msgstr "រូបភាព"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "អាសយដ្ឋាន​អ៊ីមែល​មិនត្រឹមត្រូវ"
 
@@ -4343,21 +4092,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"កូនសោ​ការចុះហត្ថលេខា OpenPGP ដែលបាន​កំណត់រចនា​សម្ព័ន្ធ​មួយ "
-"មិនមាន​លេខសម្គាល់​អ្នក​ប្រើណាមួយ​ជាមួយ​អាសយដ្ឋាន​អ៊ីមែល​ដែល​បានកំណត់​រចនាសម្ព័ន្"
-"ធសម្រាប់អត្តសញ្ញាណ (%1)នេះ ។\n"
-"ការនេះ​អាច​មានលទ្ធផល​នៅក្នុង​សារព្រមាន​នៅលើ​ផ្នែក​ការទទួល​នៅពេល​ដែលកំពុង​ព្យាយាម"
-"ផ្ទៀងផ្ទាត់​ហត្ថលេខា​ដែលបានធ្វើ​ដោយ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ ។"
+"កូនសោ​ការចុះហត្ថលេខា OpenPGP ដែលបាន​កំណត់រចនា​សម្ព័ន្ធ​មួយ មិនមាន​លេខសម្គាល់​អ្នក​ប្រើណាមួយ​ជាមួយ​"
+"អាសយដ្ឋាន​អ៊ីមែល​ដែល​បានកំណត់​រចនាសម្ព័ន្ធសម្រាប់អត្តសញ្ញាណ (%1)នេះ ។\n"
+"ការនេះ​អាច​មានលទ្ធផល​នៅក្នុង​សារព្រមាន​នៅលើ​ផ្នែក​ការទទួល​នៅពេល​ដែលកំពុង​ព្យាយាមផ្ទៀងផ្ទាត់​ហត្ថលេខា​"
+"ដែលបានធ្វើ​ដោយ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ ។"
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"កូនសោ​អ៊ិនគ្រីប​ OpenPGP "
-"ដែលបាន​កំណត់​រចនាសម្ព័ន្ធ​មិនមាន​លេខសម្គាល់​របស់អ្នកប្រើ​ណាមួយ​ដែល​បានភ្ជាប់ជាមួ"
-"យ​​អាសយដ្ឋាន​អ៊ីមែល​ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ​សម្រាប់​អត្តសញ្ញាណ (%1) "
-"នេះ​ឡើយ ។"
+"កូនសោ​អ៊ិនគ្រីប​ OpenPGP ដែលបាន​កំណត់​រចនាសម្ព័ន្ធ​មិនមាន​លេខសម្គាល់​របស់អ្នកប្រើ​ណាមួយ​ដែល​បានភ្ជាប់ជាមួយ​​"
+"អាសយដ្ឋាន​អ៊ីមែល​ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ​សម្រាប់​អត្តសញ្ញាណ (%1) នេះ​ឡើយ ។"
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4366,19 +4112,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា S/MIME ដែលបាន​កំណត់រចនាសម្ព័ន្ធ​មួយ "
-"មិនមាន​អាសយដ្ឋាន​អ៊ីមែល​ដែលបានកំណត់រចនា​សម្ព័ន្ធសម្រាប់​អត្តសញ្ញាណ (%1) នេះ ។\n"
-"ការនេះ​អាចមានលទ្ធផល​នៅក្នុង​សារព្រមាន​នៅលើ​ផ្នែក​ទទួល​ "
-"នៅពេល​ដែលកំពុង​ព្យាយាម​ផ្ទៀងផ្ទាត់​ហត្ថលេខា​ដែលបានធ្វើ​ដោយ​ការកំណត់រចនា​សម្ព័ន្ធ"
-"​នេះ ។"
+"វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា S/MIME ដែលបាន​កំណត់រចនាសម្ព័ន្ធ​មួយ មិនមាន​អាសយដ្ឋាន​អ៊ីមែល​"
+"ដែលបានកំណត់រចនា​សម្ព័ន្ធសម្រាប់​អត្តសញ្ញាណ (%1) នេះ ។\n"
+"ការនេះ​អាចមានលទ្ធផល​នៅក្នុង​សារព្រមាន​នៅលើ​ផ្នែក​ទទួល​ នៅពេល​ដែលកំពុង​ព្យាយាម​ផ្ទៀងផ្ទាត់​ហត្ថលេខា​"
+"ដែលបានធ្វើ​ដោយ​ការកំណត់រចនា​សម្ព័ន្ធ​នេះ ។"
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"វិញ្ញាបនបត្រ​អ៊ិនគ្រីប​ S/MIME ដែលបានកំណត់​រចនាសម្ព័ន្ធ​មួយ "
-"មិនមាន​អាសយដ្ឋាន​អ៊ីមែល​ដែលបាន​កំណត់​រចនាសម្ព័ន្ធ​សម្រាប់​អ្តសញ្ញាណ (%1) នេះ ។"
+"វិញ្ញាបនបត្រ​អ៊ិនគ្រីប​ S/MIME ដែលបានកំណត់​រចនាសម្ព័ន្ធ​មួយ មិនមាន​អាសយដ្ឋាន​អ៊ីមែល​ដែលបាន​កំណត់​"
+"រចនាសម្ព័ន្ធ​សម្រាប់​អ្តសញ្ញាណ (%1) នេះ ។"
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4397,29 +4142,28 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"មិនមានថត​សំបុត្រ​ដែលបានផ្ញើ​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" (តទៅទៀតឡើយ) ។ "
-"ដូច្នេះ​ ថត​សំបុត្រ​ដែលបាន​ផ្ញើ​លំនាំដើម​នឹងត្រូវបាន​ប្រើ ។"
+"មិនមានថត​សំបុត្រ​ដែលបានផ្ញើ​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" (តទៅទៀតឡើយ) ។ ដូច្នេះ​ ថត​សំបុត្រ​"
+"ដែលបាន​ផ្ញើ​លំនាំដើម​នឹងត្រូវបាន​ប្រើ ។"
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"មិនមាន​ថត​សេចក្ដីព្រាង​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" (តទៅទៀតឡើយ) ។ "
-"ដូច្នេះ ថត​សេចក្ដីព្រាង​លំនាំដើម​នឹងត្រូវបានប្រើ ។"
+"មិនមាន​ថត​សេចក្ដីព្រាង​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" (តទៅទៀតឡើយ) ។ ដូច្នេះ ថត​សេចក្ដីព្រាង​"
+"លំនាំដើម​នឹងត្រូវបានប្រើ ។"
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"ថត​ពុម្ព​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" មិន​មាន (ទៀតទេ) ដូច្នេះ "
-"ថត​ពុម្ពលំនាំដើម​នឹង​ត្រូវ​បាន​ប្រើ ។"
+"ថត​ពុម្ព​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" មិន​មាន (ទៀតទេ) ដូច្នេះ ថត​ពុម្ពលំនាំដើម​នឹង​ត្រូវ​បាន​ប្រើ ។"
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (លំនាំដើម)"
 
@@ -4433,9 +4177,7 @@ msgstr "​អាសយដ្ឋាន​អ៊ីមែល"
 
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
-msgstr ""
-"អ្នក​ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នកប្រើ និង​ពាក្យសម្ងាត់ "
-"ដើម្បី​ចូលដំណើរការ​ប្រអប់សំបុត្រ​នេះ ។"
+msgstr "អ្នក​ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នកប្រើ និង​ពាក្យសម្ងាត់ ដើម្បី​ចូលដំណើរការ​ប្រអប់សំបុត្រ​នេះ ។"
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4463,24 +4205,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail បាន​រក​ធាតុ​បញ្ចូល​បុព្វបទនៅក្នុង​ការកំណត់​រចនាសម្ព័ន្ធ​នៃ​គណនី \"%1\" "
-"ដែល​គេលែងប្រើ​វា​ជាមួយ​ការគាំទ្រ​នៃ​ចន្លោះឈ្មោះ IMAP ។"
+"KMail បាន​រក​ធាតុ​បញ្ចូល​បុព្វបទនៅក្នុង​ការកំណត់​រចនាសម្ព័ន្ធ​នៃ​គណនី \"%1\" ដែល​គេលែងប្រើ​វា​ជាមួយ​"
+"ការគាំទ្រ​នៃ​ចន្លោះឈ្មោះ IMAP ។"
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"ការកំណត់​រចនា​សម្ព័ន្ធ​ត្រូវបានផ្លាស់ទី​ដោយស្វ័យប្រវត្តិ "
-"ប៉ុន្តែ​អ្នកគួរ​តែ​ពិនិត្យ​មើល​ការកំណត់​រចនាសម្ព័ន្ធ​គណនី​របស់អ្នក ។"
+"ការកំណត់​រចនា​សម្ព័ន្ធ​ត្រូវបានផ្លាស់ទី​ដោយស្វ័យប្រវត្តិ ប៉ុន្តែ​អ្នកគួរ​តែ​ពិនិត្យ​មើល​ការកំណត់​រចនាសម្ព័ន្ធ​គណនី​"
+"របស់អ្នក ។"
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"វា​មិនអាច​ផ្លាស់ទី​ការកំណត់​រចនាសម្ព័ន្ធ​របស់អ្នកដោយស្វ័យប្រវត្តិបានទេ "
-"ដូច្នេះ​សូមពិនិត្យ​ការកំណត់​រចនាសម្ព័ន្ធ​គណនី​របស់អ្នក ។"
+"វា​មិនអាច​ផ្លាស់ទី​ការកំណត់​រចនាសម្ព័ន្ធ​របស់អ្នកដោយស្វ័យប្រវត្តិបានទេ ដូច្នេះ​សូមពិនិត្យ​ការកំណត់​រចនាសម្ព័ន្ធ​"
+"គណនី​របស់អ្នក ។"
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4495,8 +4237,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"មិនអាច​ផ្ទុក​សារ​ដែល​មាន​កាលបរិច្ឆេទ %1 ​ពី <i>%2</i> ែល​​មាន​ប្រធាន​បទ <i>"
-"%3</i> ទៅកាន់​ម៉ាស៊ីនបម្រើ​បានទេ ។."
+"មិនអាច​ផ្ទុក​សារ​ដែល​មាន​កាលបរិច្ឆេទ %1 ​ពី <i>%2</i> ែល​​មាន​ប្រធាន​បទ <i>%3</i> ទៅកាន់​"
+"ម៉ាស៊ីនបម្រើ​បានទេ ។."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4517,21 +4259,24 @@ msgstr "ថត​ជិត​ដល់​ដែនកំណត់​កូតា
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"ព្រោះថា​អ្នក​មិនមាន​សិទ្ធិ​សរសេរ​នៅ​លើ​ថត​នេះ​ទេ "
-"សូម​សួរ​ម្ចាស់​ថត​ដើម្បី​ស្នើ​ទំហំ​ខ្លះ​នៅ​លើ​វា ។"
+"ព្រោះថា​អ្នក​មិនមាន​សិទ្ធិ​សរសេរ​នៅ​លើ​ថត​នេះ​ទេ សូម​សួរ​ម្ចាស់​ថត​ដើម្បី​ស្នើ​ទំហំ​ខ្លះ​នៅ​លើ​វា ។"
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "​កំហុស ៖ %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"ការ​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីនបម្រើ​ %1 "
-"ត្រូវបាន​បិទ​ដោយ​មិនបាន​បិទ​ដោយ​មិនបាន​រំពឹងទុក ឬ អស់ម៉ោង ។ "
-"ប្រសិនបើ​អាច​ធ្វើបាន វា​នឹងត្រូវបាន​បង្កើត​ឡើង​វិញ​ដោយស្វ័យប្រវត្តិ​ ។"
+"ការ​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីនបម្រើ​ %1 ត្រូវបាន​បិទ​ដោយ​មិនបាន​បិទ​ដោយ​មិនបាន​រំពឹងទុក ឬ អស់ម៉ោង ។ ប្រសិនបើ​អាច​"
+"ធ្វើបាន វា​នឹងត្រូវបាន​បង្កើត​ឡើង​វិញ​ដោយស្វ័យប្រវត្តិ​ ។"
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4678,22 +4423,20 @@ msgstr "ប័ណ្ណសារ​បញ្ជី"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"សោ​អ៊ិនគ្រីប​របស់ OpenPGP "
-"ឬ​វិញ្ញាបនបត្រ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​របស់​អ្នក​មួយ "
-"ឬ​ច្រើន​​មិន​ត្រូវ​បាន​ទុកចិត្ត​យ៉ាង​ពេញលេញ​សម្រាប់​ការ​អ៊ិនគ្រីប​ទេ ។"
+"សោ​អ៊ិនគ្រីប​របស់ OpenPGP ឬ​វិញ្ញាបនបត្រ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​របស់​អ្នក​មួយ ឬ​ច្រើន​​មិន​ត្រូវ​បាន​ទុកចិត្ត​យ៉ាង​"
+"ពេញលេញ​សម្រាប់​ការ​អ៊ិនគ្រីប​ទេ ។"
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"សោ​អ៊ិនគ្រីប​របស់ OpenPGP "
-"ឬ​វិញ្ញាបនបត្រ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​របស់​អ្នក​មួយ "
-"ឬ​ច្រើន​​មិន​ត្រូវ​បាន​ទុកចិត្ត​យ៉ាង​ពេញលេញ​សម្រាប់​ការ​អ៊ិនគ្រីប​ទេ ។"
+"សោ​អ៊ិនគ្រីប​របស់ OpenPGP ឬ​វិញ្ញាបនបត្រ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​របស់​អ្នក​មួយ ឬ​ច្រើន​​មិន​ត្រូវ​បាន​ទុកចិត្ត​យ៉ាង​"
+"ពេញលេញ​សម្រាប់​ការ​អ៊ិនគ្រីប​ទេ ។"
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4727,186 +4470,152 @@ msgstr "កូនសោ​អ៊ិនគ្រីប​មិនបាន​ទ
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>កូនសោការចុះហត្ថលេខា OpenPGP របស់អ្នក</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ផុតកំណត់​​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>កូនសោការចុះហត្ថលេខា OpenPGP របស់អ្នក</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ផុតកំណត់​​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>កូនសោ​អ៊ិនគ្រីប OpenPGP របស់អ្នក</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>កូនសោ​អ៊ិនគ្រីប OpenPGP របស់អ្នក</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>កូនសោ​ OpenPGP សម្រាប់</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ផុត​កំណត់​ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>កូនសោ​ OpenPGP សម្រាប់</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ផុត​កំណត់​"
+"ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា S/MIME របស់អ្នក</p><p align=center><b>"
-"%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ​"
+"ការចុះហត្ថលេខា S/MIME របស់អ្នក</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</"
+"p><p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់វិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប S/MIME របស់អ្នក</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p><p>សម្រាប់វិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប "
+"S/MIME របស់អ្នក</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>ផុតកំណត់​ក្នុង​ពេល​"
+"តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់វិញ្ញាបនបត្រ S/MIME </p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p><p>សម្រាប់វិញ្ញាបនបត្រ S/MIME "
+"</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</"
+"p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ​ចុះហត្ថលេខា S/MIME</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ​"
+"ចុះហត្ថលេខា S/MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>នឹង​ផុតកំណត់​ក្នុង​"
+"រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ​អ៊ិនគ្រីប S/MIME</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ​"
+"អ៊ិនគ្រីប S/MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>នឹង​ផុតកំណត់​ក្នុង​"
+"រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ S/MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ S/"
+"MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង "
+"%n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា S/MIME របស់អ្នក</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"(លេខសម្គាល់ %2)</p><p>ផុតកំណត់​ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រការអ៊ិនគ្រីប S/MIME របស់អ្នក</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រការអ៊ិនគ្រីប S/MIME របស់អ្នក</p><p align=center><b>%1</b> (លេខសម្គាល់ "
+"%2)</p><p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ S/MIME សម្រាប់</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ S/MIME សម្រាប់</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</"
+"p><p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4920,175 +4629,141 @@ msgstr "វិញ្ញាបនបត្រ S/MIME ជិតផុតកំណ�
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>កូនសោការចុះហត្ថលេខា OpenPGP របស់អ្នក</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ផុតកំណត់​​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>កូនសោការចុះហត្ថលេខា OpenPGP របស់អ្នក</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>ផុតកំណត់​​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>កូនសោ​អ៊ិនគ្រីប OpenPGP របស់អ្នក</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>កូនសោ​អ៊ិនគ្រីប OpenPGP របស់អ្នក</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>កូនសោ​ OpenPGP សម្រាប់</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ផុត​កំណត់​ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>កូនសោ​ OpenPGP សម្រាប់</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>ផុត​កំណត់​"
+"ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា S/MIME របស់អ្នក</p><p align=center><b>"
-"%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ​"
+"ការចុះហត្ថលេខា S/MIME របស់អ្នក</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</"
+"p><p>ផុត​កំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់វិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប S/MIME របស់អ្នក</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p><p>សម្រាប់វិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប "
+"S/MIME របស់អ្នក</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>ផុតកំណត់​ក្នុង​ពេល​"
+"តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់វិញ្ញាបនបត្រ S/MIME </p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ root </p><p align=center><b>%3</b></p><p>សម្រាប់វិញ្ញាបនបត្រ S/MIME "
+"</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</"
+"p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ​ចុះហត្ថលេខា S/MIME</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ​"
+"ចុះហត្ថលេខា S/MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>នឹង​ផុតកំណត់​ក្នុង​"
+"រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ​អ៊ិនគ្រីប S/MIME</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ​"
+"អ៊ិនគ្រីប S/MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>នឹង​ផុតកំណត់​ក្នុង​"
+"រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p>"
-"<p>សម្រាប់​វិញ្ញាបនបត្រ S/MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ CA កម្រិត​មធ្យម</p><p align=center><b>%3</b></p><p>សម្រាប់​វិញ្ញាបនបត្រ S/"
+"MIME</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p><p>នឹង​ផុតកំណត់​ក្នុង​រយៈពេល​តិចជាង "
+"%n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា S/MIME របស់អ្នក</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"(លេខសម្គាល់ %2)</p><p>ផុតកំណត់​ក្នុងពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រការអ៊ិនគ្រីប S/MIME របស់អ្នក</p><p align=center><b>%1</b> "
-"(លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រការអ៊ិនគ្រីប S/MIME របស់អ្នក</p><p align=center><b>%1</b> (លេខសម្គាល់ "
+"%2)</p><p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>វិញ្ញាបនបត្រ S/MIME សម្រាប់</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</p>"
-"<p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
+"<p>វិញ្ញាបនបត្រ S/MIME សម្រាប់</p><p align=center><b>%1</b> (លេខសម្គាល់ %2)</"
+"p><p>ផុតកំណត់​ក្នុង​ពេល​តិចជាង %n ថ្ងៃ ។</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5100,19 +4775,18 @@ msgstr "វិញ្ញាបនបត្រ S/MIME ជិតផុតកំណ�
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"កូនសោ​អ៊ិនគ្រីប OpenPGP ឬ វិញ្ញាបនបត្រ S/MIME ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ មួយ​​ "
-"ឬ ច្រើន​គឺ​មិនអាច​​ប្រើ​សម្រាប់​​ការអ៊ិនគ្រីប​បាន​ឡើយ ។ "
-"សូម​កំណត់​រចនាសម្ព័ន្ធកូនសោអ៊ិនគ្រីប​ "
-"និង​វិញ្ញាបនបត្រ​របស់​អ្នកឡើងវិញ​​សម្រាប់​អត្តសញ្ញាណ​នេះ​ដែល​នៅក្នុង​ប្រអប់​កំណត"
-"់​រចនា​សម្ព័ន្ធ​​អត្តសញ្ញាណ​ ។\n"
-"ប្រសិនបើ​អ្នក​ជ្រើស​ដើម្បី​បន្ត ហើយកូន​សោ​គឺ​ត្រូវបាន​ទាមទារ​ពេល​ក្រោយ "
-"នោះអ្នកនឹងត្រូវបាន​វាយបញ្ចូល​ដើម្បី​បញ្ជាក់កូន​សោ​ដែល​ត្រូវប្រើ ។"
+"កូនសោ​អ៊ិនគ្រីប OpenPGP ឬ វិញ្ញាបនបត្រ S/MIME ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ មួយ​​ ឬ ច្រើន​គឺ​មិនអាច​​ប្រើ​"
+"សម្រាប់​​ការអ៊ិនគ្រីប​បាន​ឡើយ ។ សូម​កំណត់​រចនាសម្ព័ន្ធកូនសោអ៊ិនគ្រីប​ និង​វិញ្ញាបនបត្រ​របស់​អ្នកឡើងវិញ​​សម្រាប់​"
+"អត្តសញ្ញាណ​នេះ​ដែល​នៅក្នុង​ប្រអប់​កំណត់​រចនា​សម្ព័ន្ធ​​អត្តសញ្ញាណ​ ។\n"
+"ប្រសិនបើ​អ្នក​ជ្រើស​ដើម្បី​បន្ត ហើយកូន​សោ​គឺ​ត្រូវបាន​ទាមទារ​ពេល​ក្រោយ នោះអ្នកនឹងត្រូវបាន​វាយបញ្ចូល​ដើម្បី​"
+"បញ្ជាក់កូន​សោ​ដែល​ត្រូវប្រើ ។"
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5126,14 +4800,12 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"កូនសោចុះហត្ថលេខា OpenPGP ឬ វិញ្ញាបនបត្រ​ចុះហត្ថលេខា S/MIME "
-"ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ មួយ​​ ឬ "
-"ច្រើន​គឺ​មិនអាច​​ប្រើ​សម្រាប់​​ការការចុះហត្ថលេខា​បាន​ឡើយ ។ "
-"សូម​កំណត់​រចនាសម្ព័ន្ធ​សោចុះហត្ថលេខា​ "
-"និង​វិញ្ញាបនបត្រចុះហត្ថលេខា​​របស់​អ្នក​ឡើងវិញ​សម្រាប់​អត្តសញ្ញាណ​នេះ​ដែល​នៅក្នុង"
-"​ប្រអប់​កំណត់​រចនា​សម្ព័ន្ធ​​អត្តសញ្ញាណ​ ។\n"
-"ប្រសិនបើ​អ្នក​ជ្រើស​ដើម្បី​បន្ត ហើយ​សោ​គឺ​ត្រូវបាន​ទាមទារ​ពេល​ក្រោយ "
-"នោះអ្នកនឹងត្រូវបាន​វាយបញ្ចូល​ដើម្បី​បញ្ជាក់​កូនសោដែល​ត្រូវប្រើ ។"
+"កូនសោចុះហត្ថលេខា OpenPGP ឬ វិញ្ញាបនបត្រ​ចុះហត្ថលេខា S/MIME ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ មួយ​​ ឬ "
+"ច្រើន​គឺ​មិនអាច​​ប្រើ​សម្រាប់​​ការការចុះហត្ថលេខា​បាន​ឡើយ ។ សូម​កំណត់​រចនាសម្ព័ន្ធ​សោចុះហត្ថលេខា​ និង​"
+"វិញ្ញាបនបត្រចុះហត្ថលេខា​​របស់​អ្នក​ឡើងវិញ​សម្រាប់​អត្តសញ្ញាណ​នេះ​ដែល​នៅក្នុង​ប្រអប់​កំណត់​រចនា​សម្ព័ន្ធ​​"
+"អត្តសញ្ញាណ​ ។\n"
+"ប្រសិនបើ​អ្នក​ជ្រើស​ដើម្បី​បន្ត ហើយ​សោ​គឺ​ត្រូវបាន​ទាមទារ​ពេល​ក្រោយ នោះអ្នកនឹងត្រូវបាន​វាយបញ្ចូល​ដើម្បី​បញ្ជាក់​"
+"កូនសោដែល​ត្រូវប្រើ ។"
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5143,50 +4815,45 @@ msgstr "កូនសោ​ចុះហត្ថលេខា​មិន​អា
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"ការពិនិត្យនៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការអ៊ិនគ្រីប​របស់អ្នកទទួល "
-"បានស្នើ​ថា​សារគួរតែត្រូវបានអ៊ិនគ្រីប​ដោយប្រើ OpenPGP "
-"យ៉ាងហោចណាស់​គឺសម្រាប់​អ្នកទទួល​មួយចំនួន​ ។\n"
-"ទោះជាយ៉ាងណា​ក៏ដោយ អ្នក​មិនបានកំណត់​រចនាសម្ព័ន្ធ​សោអ៊ិនគ្រីប​ OpenPGP "
-"ដែលបានទុក​ចិត្ត​បាន​ត្រឹមត្រូវឡើយ ។\n"
-"អ្នក​អាច​បន្ត​ដោយគ្មាន​ការអ៊ិនគ្រីប​ទៅកាន់​ខ្លួន​អ្នក​ផ្ទាល់ "
-"ប៉ុន្តែ​ត្រូវ​ដឹងថា​អ្នកនឹងមិនអាច​អាច​​សាររបស់អ្នកបានទេ​​ប្រសិនបើអ្នក​ធ្វើ​ដូចនោ"
-"ះ ។"
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"ការពិនិត្យនៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការអ៊ិនគ្រីប​របស់អ្នកទទួល បានស្នើ​ថា​សារគួរតែត្រូវបានអ៊ិនគ្រីប​ដោយប្រើ "
+"OpenPGP យ៉ាងហោចណាស់​គឺសម្រាប់​អ្នកទទួល​មួយចំនួន​ ។\n"
+"ទោះជាយ៉ាងណា​ក៏ដោយ អ្នក​មិនបានកំណត់​រចនាសម្ព័ន្ធ​សោអ៊ិនគ្រីប​ OpenPGP ដែលបានទុក​ចិត្ត​បាន​"
+"ត្រឹមត្រូវឡើយ ។\n"
+"អ្នក​អាច​បន្ត​ដោយគ្មាន​ការអ៊ិនគ្រីប​ទៅកាន់​ខ្លួន​អ្នក​ផ្ទាល់ ប៉ុន្តែ​ត្រូវ​ដឹងថា​អ្នកនឹងមិនអាច​អាច​​"
+"សាររបស់អ្នកបានទេ​​ប្រសិនបើអ្នក​ធ្វើ​ដូចនោះ ។"
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"ការពិនិត្យនៃ​ចំណង់ចំណូល​ចិត្ត​ក្នុងការអ៊ិនគ្រីប​របស់អ្នកទទួល​ "
-"បានស្នើថា​សារ​គួរតែត្រូវ​បាន​អ៊ិនគ្រីប​ដោយប្រើ S/MIME "
-"យ៉ាងហោចណាស់​គឺ​សម្រាប់​អ្នកទទួល​មួយចំនួន ។\n"
-"ទោះជាយ៉ាងណា​ក៏ដោយ អ្នក​មិនបាន​កំណត់​រចនាសម្ព័ន្ធវិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប "
-"S/MIME បានត្រឹមត្រូវ​សម្រាប់អត្តសញ្ញាណ​នេះឡើយ ។\n"
-"អ្នកអាច​បន្ត​ដោយគ្មាន​ការអ៊ិនគ្រីប​ទៅកាន់​ខ្លួន​អ្នកផ្ទាល់ "
-"ប៉ុន្តែ​ត្រូវដឹងថា​អ្នកនឹង​មិនអាច​អាន​សារផ្ទាល់ខ្លួន​របស់អ្នកបានទេ​ប្រសិនបើអ្នកធ"
-"្វើដូចនោះ ។"
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"ការពិនិត្យនៃ​ចំណង់ចំណូល​ចិត្ត​ក្នុងការអ៊ិនគ្រីប​របស់អ្នកទទួល​ បានស្នើថា​សារ​គួរតែត្រូវ​បាន​អ៊ិនគ្រីប​ដោយប្រើ S/"
+"MIME យ៉ាងហោចណាស់​គឺ​សម្រាប់​អ្នកទទួល​មួយចំនួន ។\n"
+"ទោះជាយ៉ាងណា​ក៏ដោយ អ្នក​មិនបាន​កំណត់​រចនាសម្ព័ន្ធវិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប S/MIME បានត្រឹមត្រូវ​"
+"សម្រាប់អត្តសញ្ញាណ​នេះឡើយ ។\n"
+"អ្នកអាច​បន្ត​ដោយគ្មាន​ការអ៊ិនគ្រីប​ទៅកាន់​ខ្លួន​អ្នកផ្ទាល់ ប៉ុន្តែ​ត្រូវដឹងថា​អ្នកនឹង​មិនអាច​អាន​សារផ្ទាល់ខ្លួន​"
+"របស់អ្នកបានទេ​ប្រសិនបើអ្នកធ្វើដូចនោះ ។"
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"ការពិនិត្យនៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការចុះហត្ថលេខា​របស់អ្នកទទួល "
-"បានស្នើថា​សារគួរតែ​ត្រូវបាន​ចុះហត្ថលេខា​ដោយប្រើ OpenPGP "
-"យ៉ាងហោចណាស់​គឺ​សម្រាប់​អ្នកទទួល​មួយចំនួន ។\n"
-"ទោះជាយ៉ាងណាក៏ដោយ អ្នកមិនបាន​កំណត់​រចនា​សម្ព័នញធ​វិញ្ញាបនបត្រ​​ការចុះហត្ថលេខា "
-"OpenPGP បានត្រឹមត្រូវ​សម្រាប់អត្តសញ្ញាណ​ឡើយ ។"
+"ការពិនិត្យនៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការចុះហត្ថលេខា​របស់អ្នកទទួល បានស្នើថា​សារគួរតែ​ត្រូវបាន​ចុះហត្ថលេខា​"
+"ដោយប្រើ OpenPGP យ៉ាងហោចណាស់​គឺ​សម្រាប់​អ្នកទទួល​មួយចំនួន ។\n"
+"ទោះជាយ៉ាងណាក៏ដោយ អ្នកមិនបាន​កំណត់​រចនា​សម្ព័នញធ​វិញ្ញាបនបត្រ​​ការចុះហត្ថលេខា OpenPGP បានត្រឹមត្រូវ​"
+"សម្រាប់អត្តសញ្ញាណ​ឡើយ ។"
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5194,16 +4861,15 @@ msgstr "កុំ​ចុះហត្ថលេខា OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"ការពិនិត្យ​នៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការចុះហត្ថលេខា​របស់អ្នកទទួល​ "
-"បានស្នើថា​សារគួរតែត្រូវបាន​ចុះហត្ថលេខា​ដោយប្រើ S/MIME "
-"យ៉ាងហោចណាស់​សម្រាប់​អ្នកទទួល​មួយចំនួន ។\n"
-"ទោះជាយ៉ាងណា​ក៏ដោយ អ្នកមិនបាន​កំណត់រចនាសម្ព័ន្ធ​​វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា​ "
-"S/MIME បានត្រឹមត្រូវ​សម្រាប់​អត្តសញ្ញាណ​នេះ ។"
+"ការពិនិត្យ​នៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការចុះហត្ថលេខា​របស់អ្នកទទួល​ បានស្នើថា​សារគួរតែត្រូវបាន​ចុះហត្ថលេខា​"
+"ដោយប្រើ S/MIME យ៉ាងហោចណាស់​សម្រាប់​អ្នកទទួល​មួយចំនួន ។\n"
+"ទោះជាយ៉ាងណា​ក៏ដោយ អ្នកមិនបាន​កំណត់រចនាសម្ព័ន្ធ​​វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា​ S/MIME បានត្រឹមត្រូវ​"
+"សម្រាប់​អត្តសញ្ញាណ​នេះ ។"
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5215,9 +4881,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"ការពិនិត្យ​នៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការចុះហត្ថលេខា​របស់អ្នកទទួល "
-"បានបង្ហាញ​ថាគ្មាន​ប្រភេទទូទៅ​នៃ​ហត្ថលេខា​ណា​ដែល​ដូចទៅនឹង​សោហត្ថលេខា​ដែលអាចរកបានរ"
-"បស់អ្នកឡើយ ។\n"
+"ការពិនិត្យ​នៃ​ចំណង់ចំណូលចិត្ត​ក្នុងការចុះហត្ថលេខា​របស់អ្នកទទួល បានបង្ហាញ​ថាគ្មាន​ប្រភេទទូទៅ​នៃ​ហត្ថលេខា​ណា​"
+"ដែល​ដូចទៅនឹង​សោហត្ថលេខា​ដែលអាចរកបានរបស់អ្នកឡើយ ។\n"
 "ផ្ញើសារ​ដោយមិនមាន​ការចុះហត្ថលេខាឬ ?"
 
 #: keyresolver.cpp:1335
@@ -5226,12 +4891,11 @@ msgstr "មិនមាន​ការចុះហត្ថលេខាណា​
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"អ្នក​មិនបាន​ជ្រើស​សោ​ការ​អ៊ិនគ្រីប​សម្រាប់ខ្លួនអ្នកទេ "
-"(អ៊ិនគ្រីប​ទៅ​ខ្លួនឯងផ្ទាល់) ។ "
-"អ្នកនឹងមិនអាច​ឌិគ្រីប​សារខ្លួន​របស់អ្នកផ្ទាល់បានឡើយ​ប្រសិនបើ​អ្នក​អ៊ិនគ្រីបវា ។"
+"អ្នក​មិនបាន​ជ្រើស​សោ​ការ​អ៊ិនគ្រីប​សម្រាប់ខ្លួនអ្នកទេ (អ៊ិនគ្រីប​ទៅ​ខ្លួនឯងផ្ទាល់) ។ អ្នកនឹងមិនអាច​ឌិគ្រីប​សារខ្លួន​"
+"របស់អ្នកផ្ទាល់បានឡើយ​ប្រសិនបើ​អ្នក​អ៊ិនគ្រីបវា ។"
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5247,16 +4911,14 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"អ្នក​មិនបាន​ជ្រើសកូន​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​សារនេះឡើយ ។ ដូច្នេះ​ "
-"សារ​នឹងមិនត្រូវ​បាន​អ៊ិនគ្រីបឡើយ ។"
+"អ្នក​មិនបាន​ជ្រើសកូន​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​សារនេះឡើយ ។ ដូច្នេះ​ សារ​នឹងមិនត្រូវ​បាន​អ៊ិនគ្រីបឡើយ ។"
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"អ្នក​មិនបាន​ជ្រើសកូន​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​សារនេះណាមួយ​ឡើយ ។ ដូច្នេះ​ "
-"សារ​នឹងមិនត្រូវ​បាន​អ៊ិនគ្រីបឡើយ ។"
+"អ្នក​មិនបាន​ជ្រើសកូន​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​សារនេះណាមួយ​ឡើយ ។ ដូច្នេះ​ សារ​នឹងមិនត្រូវ​បាន​អ៊ិនគ្រីបឡើយ ។"
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5267,16 +4929,16 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"អ្នក​មិនបាន​ជ្រើសកូន​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​ណាម្នាក់ទេ ៖ "
-"បុគ្គល​នេះ​នឹងមិនអាច​ឌិគ្រីប​សារបានឡើយ បើ​អ្នក​អ៊ិនគ្រីបវានោះ ។"
+"អ្នក​មិនបាន​ជ្រើសកូន​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​ណាម្នាក់ទេ ៖ បុគ្គល​នេះ​នឹងមិនអាច​ឌិគ្រីប​សារបានឡើយ បើ​អ្នក​"
+"អ៊ិនគ្រីបវានោះ ។"
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"អ្នក​មិនបាន​ជ្រើស​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​ណាខ្លះឡើយ ៖ "
-"បុគ្គល​ទាំងនេះ​នឹងមិនអាច​ឌិគ្រីប​សារបាន​ឡើយ បើ​អ្នក​អ៊ិនគ្រីបវា​នោះ ។"
+"អ្នក​មិនបាន​ជ្រើស​សោ​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​ណាខ្លះឡើយ ៖ បុគ្គល​ទាំងនេះ​នឹងមិនអាច​ឌិគ្រីប​សារបាន​ឡើយ បើ​អ្នក​"
+"អ៊ិនគ្រីបវា​នោះ ។"
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5300,11 +4962,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "រកមិនឃើញ​កូនសោ​ដែល​ត្រឹមត្រូវ និង​ ដែលជឿទុកចិត្ត​បាន \"%1\" បានឡើយ ។\n"
 "\n"
@@ -5329,8 +4991,7 @@ msgstr "ការ​ជ្រើស​ឈ្មោះ"
 
 #: keyresolver.cpp:1800
 msgid "Which name shall the contact '%1' have in your addressbook?"
-msgstr ""
-"ឈ្មោះ​មួយណា​ដែល​ទំនាក់ទំនង '%1' គួរតែមាន​នៅក្នុង​សៀវភៅ​អាសយដ្ឋាន​របស់​អ្នក ?"
+msgstr "ឈ្មោះ​មួយណា​ដែល​ទំនាក់ទំនង '%1' គួរតែមាន​នៅក្នុង​សៀវភៅ​អាសយដ្ឋាន​របស់​អ្នក ?"
 
 #: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, c-format
@@ -5354,10 +5015,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "កំហុស​ធ្ងន់ធ្ងរ ៖ មិន​អាច​ប្រមូល​សំបុត្រ ៖ "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"ការបន្ថែម​សារ​បាន​បរាជ័យ ៖\n"
+msgid "Failed to add message:\n"
+msgstr "ការបន្ថែម​សារ​បាន​បរាជ័យ ៖\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5443,6 +5102,50 @@ msgstr "IMAP ផ្ដាច់"
 msgid "&Maildir mailbox"
 msgstr "ប្រអប់សំបុត្រ maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "កំណត់​ប្រធាន​បទ​សារ"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "ផ្ញើ​ច្បាប់ចម្លង​ជូន​ចំពោះ 'អាសយដ្ឋាន'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "ផ្ញើ​ច្បាប់ចម្លងសម្ងាត់​ជូន​ចំពោះ 'អាសយដ្ឋាន'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "បន្ថែម 'បឋមកថា' ទៅ​កាន់សារ"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "អាន​តួសារពី 'ឯកសារ'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "កំណត់​តួសារ"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "បន្ថែម​ឯកសារ​ភ្ជាប់​ទៅ​កាន់​សំបុត្រ ។ ការនេះ​អាចត្រូវ​បាន​ធ្វើ​ម្ដងទៀត​បាន"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "ពិនិត្យ​រក​មើល​តែ​សារថ្មី​ប៉ុណ្ណោះ"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "បើកតែ​បង្អូច​អ្នក​តែង​ប៉ុណ្ណោះ"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "មើល​ឯកសារ​ សារ​ដែលបាន​ផ្ដល់ឲ្យ"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "ផ្ញើ​សារទៅ​កាន់​ចម្លើយ 'អាសយដ្ឋាន' ភ្ជាប់​ឯកសារ​​ដែល​ 'URL' ចង្អុល​ទៅ"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "​សំបុត្រ"
@@ -5485,8 +5188,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"ឥឡូវ KMail នឹង​បង្កើតថត groupware ដែលបានទាមទារ​ជា​ថតរង​នៃ %1 ។ "
-"ប្រសិនបើអ្នកមិនចង់​បង្កើត​វា, បោះបង់ ហើយ ធនធាន IMAP នឹងត្រូវបានបិទ"
+"ឥឡូវ KMail នឹង​បង្កើតថត groupware ដែលបានទាមទារ​ជា​ថតរង​នៃ %1 ។ ប្រសិនបើអ្នកមិនចង់​បង្កើត​"
+"វា, បោះបង់ ហើយ ធនធាន IMAP នឹងត្រូវបានបិទ"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5498,13 +5201,12 @@ msgstr "%1 ៖ បាន​រកឃើញថត %2 ។ វា​នឹងត�
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail បាន​រកឃើញ​ថត​ប្រើ​ជា​ក្រុម នៅក្នុង %1 ដូចតទៅនេះ ហើយ "
-"ត្រូវ​ធ្វើ​ប្រតិបត្តិការ​ដូចតទៅ ៖ %2"
-"<br>ប្រសិនបើ​អ្នក​មិនចង់​ធ្វើវា បោះបង់​ ហើយ ធនធាន IMAP នឹងត្រូវបាន​បិទ"
+"<qt>KMail បាន​រកឃើញ​ថត​ប្រើ​ជា​ក្រុម នៅក្នុង %1 ដូចតទៅនេះ ហើយ ត្រូវ​ធ្វើ​ប្រតិបត្តិការ​ដូចតទៅ ៖ "
+"%2<br>ប្រសិនបើ​អ្នក​មិនចង់​ធ្វើវា បោះបង់​ ហើយ ធនធាន IMAP នឹងត្រូវបាន​បិទ"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5550,11 +5252,11 @@ msgstr "បាន​ចម្លង URL ទៅ​ក្ដារតម្បៀ�
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>មាន​ឯកសារ <b>%1</b> រួចហើយ ។<br>តើអ្នកពិត​ជាងចង់​ជំនួស​វាឬ ?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "​រក្សាទុក​ទៅ​ឯកសារ"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "​ជំនួស"
 
@@ -5570,11 +5272,9 @@ msgstr ""
 
 #: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
-msgstr ""
-"សារ​ត្រូវ​បាន​យក​ចេញ ខណៈពេល​កំពុង​រក្សាវា​ទុក​ ។ "
-"វា​មិន​ទាន់​បាន​រក្សា​ទុក​នៅឡើយ​ទេ​ ។"
+msgstr "សារ​ត្រូវ​បាន​យក​ចេញ ខណៈពេល​កំពុង​រក្សាវា​ទុក​ ។ វា​មិន​ទាន់​បាន​រក្សា​ទុក​នៅឡើយ​ទេ​ ។"
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5592,134 +5292,126 @@ msgstr "ឯកសារ​មិនមាន​សារឡើយ ។"
 
 #: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
-msgstr ""
-"ឯកសារ​មាន​សារ​ច្រើន​ ។ មាន​តែ​សារ​ដំបូង​គេ​ប៉ុណ្ណោះ ដែល​នឹង​ត្រូវ​បង្ហាញ ។"
+msgstr "ឯកសារ​មាន​សារ​ច្រើន​ ។ មាន​តែ​សារ​ដំបូង​គេ​ប៉ុណ្ណោះ ដែល​នឹង​ត្រូវ​បង្ហាញ ។"
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"នេះ​គឺ​ជា​ការ​បញ្ជូនបន្ត​របស់​អត្ថបទ​សង្ខេប MIME ។ "
-"មាតិកា​របស់​សារ​ស្ថិត​នៅ​ក្នុង​ឯកសារភ្ជាប់ ។\n"
+"នេះ​គឺ​ជា​ការ​បញ្ជូនបន្ត​របស់​អត្ថបទ​សង្ខេប MIME ។ មាតិកា​របស់​សារ​ស្ថិត​នៅ​ក្នុង​ឯកសារភ្ជាប់ ។\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "កំពុង​ត្រងសារ"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "កំពុង​ត្រងសារ %1 នៃ %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "មិនមាន​ទំហំ​ថាស​ទំនេរ​ឬ ?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "ផ្លាស់ទី​ទៅ​ថត​នេះ"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "ចម្លង​ទៅ​ថត​នេះ"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
-msgstr ""
-"ឃ្លាំង​សម្ងាត់ IMAP ដូច​ដែល​បាន​រក​ឃើញ​ក្នុង​ថត %1 ។ "
-"ការ​ចម្លង​នៃ​សារ​ត្រូវ​បាន​បោះបង់ ។"
+msgstr "ឃ្លាំង​សម្ងាត់ IMAP ដូច​ដែល​បាន​រក​ឃើញ​ក្នុង​ថត %1 ។ ការ​ចម្លង​នៃ​សារ​ត្រូវ​បាន​បោះបង់ ។"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "កំពុង​ផ្លាស់ទី​សារ"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "កំពុង​លុបសារ"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "កំពុង​បើក URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>តើអ្នកពិត​ជាង​ចង់​ប្រតិបត្តិ <b>%1</b> ឬ ?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "​ប្រតិបត្តិ"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "រក​មិន​ឃើញ​ឯកសារភ្ជាប់ ដើម្បី​រក្សាទុក ។"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "រក្សាទុក​ឯកសារ​ភ្ជាប់ទៅ"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "ឯកសារភ្ជាប់ 1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "ឯកសារភ្ជាប់ %1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "មាន​ឯកសារ​ឈ្មោះ %1 រួចហើយ ។ តើអ្នកចង់​សរសេរជាន់​លើវាឬ ?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "​មាន​ឯកសារ​រួច​ហើយ"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "​សរសេរ​ជាន់​លើ"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
-msgstr ""
-"ផ្នែក %1 របស់សារ គឺត្រូវបាន​អ៊ិនគ្រីប ។ តើអ្នកចង់​ទុក​ការអ៊ិនគ្រីប "
-"ពេល​រក្សាទុក​ឬ ?"
+msgstr "ផ្នែក %1 របស់សារ គឺត្រូវបាន​អ៊ិនគ្រីប ។ តើអ្នកចង់​ទុក​ការអ៊ិនគ្រីប ពេល​រក្សាទុក​ឬ ?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "សំណួរ KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "ទុក​ការអ៊ិនគ្រីប"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "កុំទុក"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
-msgstr ""
-"ផ្នែក %1 របស់សារគឺ​ត្រូវបាន​ចុះហត្ថលេខា ។ តើអ្នក​ចង់​ទុក​ហត្ថលេខា "
-"ពេល​រក្សាទុក​ឬ ?"
+msgstr "ផ្នែក %1 របស់សារគឺ​ត្រូវបាន​ចុះហត្ថលេខា ។ តើអ្នក​ចង់​ទុក​ហត្ថលេខា ពេល​រក្សាទុក​ឬ ?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "ទុក​ហត្ថលេខា"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5728,23 +5420,21 @@ msgstr ""
 "មិនអាច​សរសេរ​ឯកសារ %1 ៖\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "មិនអាច​សរសេរ​ឯកសារ %1 បានឡើយ ។"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"គ្មាន​ធាតុ​សៀវភៅ​អាសយដ្ឋានសម្រាប់​អាសយដ្ឋាន​អ៊ីមែល​នេះឡើយ ។ "
-"បន្ថែម​ពួកវា​ចូល​ទៅ​សៀវភៅអាសយដ្ឋាន "
-"ហើយបន្ទាប់មកបន្ថែម​អាសយដ្ឋាន​សារ​បច្ចុប្បន្ន​ដោយប្រើ​កម្មវិធី​ផ្ញើ​សារ​ដែល​អ្នក​"
-"ចូលចិត្ត ។"
+"គ្មាន​ធាតុ​សៀវភៅ​អាសយដ្ឋានសម្រាប់​អាសយដ្ឋាន​អ៊ីមែល​នេះឡើយ ។ បន្ថែម​ពួកវា​ចូល​ទៅ​សៀវភៅអាសយដ្ឋាន "
+"ហើយបន្ទាប់មកបន្ថែម​អាសយដ្ឋាន​សារ​បច្ចុប្បន្ន​ដោយប្រើ​កម្មវិធី​ផ្ញើ​សារ​ដែល​អ្នក​ចូលចិត្ត ។"
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5754,71 +5444,65 @@ msgstr ""
 " %1\n"
 " វា​មិនអាច​កំណត់​ថាអ្នកណា​ដែលត្រូវ​ជជែក​កំសាន្ត​ជាមួយ​ឡើយ ។"
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"កម្មវិធីខាងក្រោយ Chiasmus មិនផ្ដល់មុខងារ \"x-obtain-keys\" ឡើយ ។ "
-"សូមរាយការណ៍​កំហុស​នេះ ។"
+"កម្មវិធីខាងក្រោយ Chiasmus មិនផ្ដល់មុខងារ \"x-obtain-keys\" ឡើយ ។ សូមរាយការណ៍​កំហុស​នេះ ។"
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "កំហុស​កម្មវិធី​ខាងក្រោយ Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"ត្រឡប់​តម្លៃ​ដែល​មិនបានរំពឹង​ពី​កម្មវិធីខាងក្រោយ Chiasmus ៖ អនុគមន៍ "
-"\"x-obtain-keys\" មិនបាន​ត្រឡប់​បញ្ជី​ខ្សែអក្សរ​ឡើយ ។ សូមរាយការកំហុស ។"
+"ត្រឡប់​តម្លៃ​ដែល​មិនបានរំពឹង​ពី​កម្មវិធីខាងក្រោយ Chiasmus ៖ អនុគមន៍ \"x-obtain-keys\" មិនបាន​ត្រឡប់​"
+"បញ្ជី​ខ្សែអក្សរ​ឡើយ ។ សូមរាយការកំហុស ។"
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"រកមិន​ឃើញ​កូនសោ​ឡើយ ។ សូម​ពិនិត្យ​ថា "
-"ផ្លូវសោ​ដែល​ត្រឹមត្រូវ​បាន​កំណត់​នៅក្នុង​ការកំណត់រចនាសម្ព័ន្ធ​ Chiasmus ។"
+"រកមិន​ឃើញ​កូនសោ​ឡើយ ។ សូម​ពិនិត្យ​ថា ផ្លូវសោ​ដែល​ត្រឹមត្រូវ​បាន​កំណត់​នៅក្នុង​ការកំណត់រចនាសម្ព័ន្ធ​ Chiasmus ។"
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "ជម្រើស​កូនសោ​​ឌិគ្រីប​ Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
-msgstr ""
-"កម្មវិធីខាងក្រោយ Chiasmus មិន​ផ្ដល់​អនុគមន៍ \"x-decrypt\" ឡើយ ។ "
-"សូម​រាយការណ៍​កំហុស​នេះ ។"
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
+msgstr "កម្មវិធីខាងក្រោយ Chiasmus មិន​ផ្ដល់​អនុគមន៍ \"x-decrypt\" ឡើយ ។ សូម​រាយការណ៍​កំហុស​នេះ ។"
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
-msgstr ""
-"អនុគមន៍ \"x-decrypt\" មិន​ទទួលយក​ប៉ារ៉ាម៉ែត្រ​ដែល​រំពឹង​ឡើយ ។ "
-"សូម​រាយការណ៍​កំហុស​នេះ ។"
+msgstr "អនុគមន៍ \"x-decrypt\" មិន​ទទួលយក​ប៉ារ៉ាម៉ែត្រ​ដែល​រំពឹង​ឡើយ ។ សូម​រាយការណ៍​កំហុស​នេះ ។"
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "កំហុស​ការឌិគ្រីប Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"ត្រឡប់តម្លៃ​ដែលមិនបាន​រំពឹងពី​កម្មវិធី​ខាងក្រោយ Chiasmus ៖ មុខងារ \"x-decrypt\" "
-"មិនបានត្រឡប់​អារេ​បៃឡើយ ។ សូមរាយការណ៍​កំហុស​។"
+"ត្រឡប់តម្លៃ​ដែលមិនបាន​រំពឹងពី​កម្មវិធី​ខាងក្រោយ Chiasmus ៖ មុខងារ \"x-decrypt\" មិនបានត្រឡប់​អារេ​"
+"បៃឡើយ ។ សូមរាយការណ៍​កំហុស​។"
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5828,7 +5512,7 @@ msgstr ""
 "ជូន​ចំពោះ ៖ %2\n"
 "ប្រធាន​បទ ៖ %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "សំបុត្រ ៖ %1"
@@ -5927,7 +5611,7 @@ msgstr "​ទំហំ"
 msgid "Encoding"
 msgstr "ការ​អ៊ិនកូដ"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "​បង្ហាប់"
 
@@ -5939,7 +5623,7 @@ msgstr "​អ៊ិនគ្រីប"
 msgid "Sign"
 msgstr "​ចុះ​ហត្ថលេខា"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "ឈ្មោះ​ឯកសារ​ភ្ជាប់ ៖"
 
@@ -5961,10 +5645,9 @@ msgstr "អ្នកទទួល​ចម្បង"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
-msgstr ""
-"<qt>អាសយដ្ឋាន​អ៊ីមែល​ដែលអ្នកបាន​ដាក់​នៅក្នុង​វាលនេះ "
-"វាទទួល​ច្បាប់ចម្លង​នៃ​អ៊ីមែល ។</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
+msgstr "<qt>អាសយដ្ឋាន​អ៊ីមែល​ដែលអ្នកបាន​ដាក់​នៅក្នុង​វាលនេះ វាទទួល​ច្បាប់ចម្លង​នៃ​អ៊ីមែល ។</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5973,16 +5656,14 @@ msgstr "អ្នកទទួល​បន្ថែម​ទៀត"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>អាសយដ្ឋាន​អ៊ីមែល​ដែលអ្នក​បានដាក់នៅក្នុង​វាលនេះ "
-"វាទទួល​ច្បាប់ចម្លង​នៃ​អ៊ីមែល ។ តាមលក្ខណៈ​បច្ចេកទេស "
-"វា​ជា​វត្ថុដូចគ្នានៅពេល​ដែលដាក់​អាសយដ្ឋានទាំងអស់នៅក្នុងវាល <b>ជូនចំពោះ ៖</b> "
-"ប៉ុន្តែ​ខុសគ្នា​ត្រង់ថា "
-"វា​ចាត់ទុក​អ្នក​ទទួល​ច្បាប់ចម្លងសម្ងាត់​នេះ​ជា​អ្នក​ស្ដាប់​ប៉ុណ្ណោះ "
-"មិន​មែន​ជា​អ្នក​ទទួល​ចម្បង​ឡើយ ។</qt>"
+"<qt>អាសយដ្ឋាន​អ៊ីមែល​ដែលអ្នក​បានដាក់នៅក្នុង​វាលនេះ វាទទួល​ច្បាប់ចម្លង​នៃ​អ៊ីមែល ។ តាមលក្ខណៈ​"
+"បច្ចេកទេស វា​ជា​វត្ថុដូចគ្នានៅពេល​ដែលដាក់​អាសយដ្ឋានទាំងអស់នៅក្នុងវាល <b>ជូនចំពោះ ៖</b> ប៉ុន្តែ​"
+"ខុសគ្នា​ត្រង់ថា វា​ចាត់ទុក​អ្នក​ទទួល​ច្បាប់ចម្លងសម្ងាត់​នេះ​ជា​អ្នក​ស្ដាប់​ប៉ុណ្ណោះ មិន​មែន​ជា​អ្នក​ទទួល​ចម្បង​ឡើយ ។"
+"</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5990,14 +5671,11 @@ msgstr "អ្នកទទួល​ដែលលាក់"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>តាមលក្ខណៈ​ចាំបាច់​ វត្ថុដូចគ្នា​ជាវាល <b>ចម្លងទៅ ៖</b> "
-"ប៉ុន្តែ​ខុសគ្នាត្រង់ថា​ "
-"អ្នកទទួល​ផ្សេងទៀតទាំងអស់​មើលមិនឃើញ​អ្នកណា​ដែលទទួល​ច្បាប់ចម្លង​ដែលលាក់នោះទេ ។</qt"
-">"
+"<qt>តាមលក្ខណៈ​ចាំបាច់​ វត្ថុដូចគ្នា​ជាវាល <b>ចម្លងទៅ ៖</b> ប៉ុន្តែ​ខុសគ្នាត្រង់ថា​ អ្នកទទួល​"
+"ផ្សេងទៀតទាំងអស់​មើលមិនឃើញ​អ្នកណា​ដែលទទួល​ច្បាប់ចម្លង​ដែលលាក់នោះទេ ។</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6007,7 +5685,7 @@ msgstr "ផ្ញើ​សំបុត្រ"
 msgid "&Send Mail Via"
 msgstr "ផ្ញើសំបុត្រ​តាម​រយៈ"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "ផ្ញើពេលក្រោយ"
@@ -6072,8 +5750,7 @@ msgstr "យក​តួអក្សរ​សម្រង់​ចេញ"
 msgid "Cl&ean Spaces"
 msgstr "សម្អាតកន្លែង"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "ប្រើពុម្ពអក្សរថេរ"
@@ -6214,31 +5891,31 @@ msgstr "​ទ្រង់ទ្រាយ​សារ​គ្រីប"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "​ខ្នាត​គំរូ"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "បញ្ជី​ជា​ចំណុច"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "បញ្ជី​ជា​ចំណុច (រង្វង់)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "បញ្ជី​ជា​ចំណុច (ការេ)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "បញ្ជី​លេខរៀង (គោលដប់)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "បញ្ជីលេខរៀង (អាល់ហ្វាតូច)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "បញ្ជីលេខរៀង (អាល់ហ្វាធំ)"
 
@@ -6321,17 +5998,14 @@ msgstr "រក្សាទុក​ជា​សេចក្ដី​ព្រា
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
-msgstr ""
-"រក្សាទុក​សារ​នេះ​នៅ​ក្នុង​ថត​ពុម្ព​ម្ដង​ទៀត ។ "
-"បន្ទាប់​មក​វា​អាច​ត្រូវ​បាន​ប្រើ​នៅ​ពេល​ក្រោយ ។"
+msgstr "រក្សាទុក​សារ​នេះ​នៅ​ក្នុង​ថត​ពុម្ព​ម្ដង​ទៀត ។ បន្ទាប់​មក​វា​អាច​ត្រូវ​បាន​ប្រើ​នៅ​ពេល​ក្រោយ ។"
 
 #: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"រក្សាទុក​សារនេះ​នៅក្នុង​ថត​សេចក្ដីព្រាង ។ នៅពេលនោះ​វាអាច​ត្រូវបាន​កែសម្រួល​ "
-"និង​ ផ្ញើ​នៅពេល​ក្រោយទៀត ។"
+"រក្សាទុក​សារនេះ​នៅក្នុង​ថត​សេចក្ដីព្រាង ។ នៅពេលនោះ​វាអាច​ត្រូវបាន​កែសម្រួល​ និង​ ផ្ញើ​នៅពេល​ក្រោយទៀត ។"
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6343,65 +6017,60 @@ msgstr "បិទ​កម្មវិធី​តែង"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"អ្នក​ហាក់​ដូច​ជា​ចង់​ភ្ជាប់​ឯកសារ​អ្វី​មួយ ក្នុង​សារ​របស់​អ្នក "
-"ប៉ុន្តែ​អ្នក​មិន​បាន​ភ្ជាប់​អ្វី​ឡើយ ។\n"
+"អ្នក​ហាក់​ដូច​ជា​ចង់​ភ្ជាប់​ឯកសារ​អ្វី​មួយ ក្នុង​សារ​របស់​អ្នក ប៉ុន្តែ​អ្នក​មិន​បាន​ភ្ជាប់​អ្វី​ឡើយ ។\n"
 "តើអ្នកចង់​ភ្ជាប់​ឯកសារ​ទៅ​សាររបស់អ្នក​ទេ ?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "ឧបករណ៍​រំលឹក​ការ​ភ្ជាប់​ឯកសារ"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "ផ្ញើអញ្ចឹង"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail មិនអាច​​ទទួល​ស្គាល់​ទីតាំង​​នៃ​ឯកសារភ្ជាប់ (%1) បានឡើយ ។</p>"
-"<p>អ្នកត្រូវតែ​បញ្ជាក់​ផ្លូវពេញលេញ ប្រសិនបើអ្នក​ចង់​ភ្ជាប់​ឯកសារមួយនោះ ។</p>"
-"</qt>"
+"<qt><p>KMail មិនអាច​​ទទួល​ស្គាល់​ទីតាំង​​នៃ​ឯកសារភ្ជាប់ (%1) បានឡើយ ។</p><p>អ្នកត្រូវតែ​បញ្ជាក់​"
+"ផ្លូវពេញលេញ ប្រសិនបើអ្នក​ចង់​ភ្ជាប់​ឯកសារមួយនោះ ។</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
-msgstr ""
-"<qt>"
-"<p>អ្នក​គ្រប់គ្រង​របស់​អ្នក​​មិន​អនុញ្ញាត​ឲ្យ​ភ្ជាប់​ឯកសារ​ដែល​ធំជាង %1 "
-"មេ.ប. ។</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
+msgstr "<qt><p>អ្នក​គ្រប់គ្រង​របស់​អ្នក​​មិន​អនុញ្ញាត​ឲ្យ​ភ្ជាប់​ឯកសារ​ដែល​ធំជាង %1 មេ.ប. ។</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "ភ្ជាប់ឯកសារ"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "ភ្ជាប់"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "​បញ្ចូល​ឯកសារ"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "​បញ្ចូល​ឯកសារ"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>កំហុស​មួយ​បាន​កើតឡើង​នៅខណៈដែល​កំពុងព្យាយាម​នាំសោចេញ​ពីកម្មវិធី​ខាងក្រោយ ៖</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>កំហុស​មួយ​បាន​កើតឡើង​នៅខណៈដែល​កំពុងព្យាយាម​នាំសោចេញ​ពីកម្មវិធី​ខាងក្រោយ ៖</p><p><b>%1</"
+"b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6440,297 +6109,299 @@ msgid ""
 "View"
 msgstr "មើល"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "​កែសម្រួល..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "កែសម្រួល​ជា​មួយ..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "​រក្សាទុកជា..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "​លក្ខណៈ​សម្បត្តិ"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "បន្ថែម​ឯកសារភ្ជាប់..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail មិនអាច​បង្ហាប់​ឯកសារ​បានឡើយ ។"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr ""
-"ឯកសារដែលបាន​បង្ហាប់ គឺមាន​ទំហំ​ធំជាង​ឯកសារដើម ។ តើអ្នកចង់​ទុក​ឯកសារដើម​ទេ ?"
+msgstr "ឯកសារដែលបាន​បង្ហាប់ គឺមាន​ទំហំ​ធំជាង​ឯកសារដើម ។ តើអ្នកចង់​ទុក​ឯកសារដើម​ទេ ?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "រក្សា"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail មិនអាច​ពន្លា​ឯកសារ​បានឡើយ ។"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "រក្សាទុក​ឯកសារភ្ជាប់​ជា"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "បន្ថែម​ជា​អត្ថបទ"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "បន្ថែម​ជា​ឯកសារ​ភ្ជាប់"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
-"សូម​ជ្រើស​ថាតើ​អ្នក​ចង់​បញ្ចូល​មាតិកា​ជា​អត្ថបទ​ទៅ​ក្នុង​កម្មវិធី​និពន្ធ "
-"ឬ​បន្ថែម​ឯកសារ​យោង​ជា​ឯកសា​រភ្ជាប់ ។"
+"សូម​ជ្រើស​ថាតើ​អ្នក​ចង់​បញ្ចូល​មាតិកា​ជា​អត្ថបទ​ទៅ​ក្នុង​កម្មវិធី​និពន្ធ ឬ​បន្ថែម​ឯកសារ​យោង​ជា​ឯកសា​រភ្ជាប់ ។"
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "បិទភ្ជាប់​ជា​អត្ថបទ ឬ​ឯកសារ​ភ្ជាប់ ?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "​គ្មាន​ឈ្មោះ"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>អ្នក​បាន​ស្នើ​ឲ្យ​សារនោះ​ត្រូវបានអ៊ិនគ្រីប​ទៅ​កាន់ខ្លួនអ្នកផ្ទាល់ "
-"ប៉ុន្តែ​អត្តសញ្ញាណ​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន​ មិនកំណត់​សោការអ៊ិនគ្រីប (OpenPGP "
-"or S/MIME) ដែលត្រូវប្រើ​សម្រាប់​វាឡើយ ។</p>"
-"<p>សូមជ្រើស​សោ​ដើម្បី​ប្រើ​នៅក្នុង​ការកំណត់រចនាសម្ព័ន្ធ​អត្តសញ្ញាណ​ ។</p></qt>"
+"<qt><p>អ្នក​បាន​ស្នើ​ឲ្យ​សារនោះ​ត្រូវបានអ៊ិនគ្រីប​ទៅ​កាន់ខ្លួនអ្នកផ្ទាល់ ប៉ុន្តែ​អត្តសញ្ញាណ​ដែល​បាន​ជ្រើស​"
+"បច្ចុប្បន្ន​ មិនកំណត់​សោការអ៊ិនគ្រីប (OpenPGP or S/MIME) ដែលត្រូវប្រើ​សម្រាប់​វាឡើយ ។</"
+"p><p>សូមជ្រើស​សោ​ដើម្បី​ប្រើ​នៅក្នុង​ការកំណត់រចនាសម្ព័ន្ធ​អត្តសញ្ញាណ​ ។</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "កូនសោ​អ៊ិនគ្រីប​មិន​បាន​កំណត់"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ដើម្បី​អាច​ចុះហត្ថលេខា​លើសារ​នេះ ដំបូងអ្នកត្រូវតែ​កំណត់​សោ​ចុះហត្ថលេខា "
-"(OpenPGP or S/MIME) ដែលត្រូវប្រើសិន ។</p>"
-"<p>សូមជ្រើស​សោ​ដើម្បី​ប្រើ​នៅក្នុង​ការកំណត់​រចនា​សម្ព័ន្ធ​អត្តសញ្ញាណ ។</p></qt>"
+"<qt><p>ដើម្បី​អាច​ចុះហត្ថលេខា​លើសារ​នេះ ដំបូងអ្នកត្រូវតែ​កំណត់​សោ​ចុះហត្ថលេខា (OpenPGP or S/"
+"MIME) ដែលត្រូវប្រើសិន ។</p><p>សូមជ្រើស​សោ​ដើម្បី​ប្រើ​នៅក្នុង​ការកំណត់​រចនា​សម្ព័ន្ធ​អត្តសញ្ញាណ ។</p></"
+"qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "កូនសោ​ចុះហត្ថលេខា​មិន​បាន​កំណត់"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"ឥឡូវ KMail នៅក្នុង​របៀប​ក្រៅ​បណ្ដាញ "
-"សារ​របស់អ្នកនឹងត្រូវបាន​រក្សាទុក​​នៅក្នុង​ប្រអប់ចេញរហូត​ដល់អ្នក​នៅលើ​បណ្ដាញវិញ ។"
+"ឥឡូវ KMail នៅក្នុង​របៀប​ក្រៅ​បណ្ដាញ សារ​របស់អ្នកនឹងត្រូវបាន​រក្សាទុក​​នៅក្នុង​ប្រអប់ចេញរហូត​ដល់អ្នក​នៅលើ​"
+"បណ្ដាញវិញ ។"
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "លើបណ្ដាញ/ក្រៅបណ្ដាញ"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"អ្នកត្រូវតែ​បញ្ចូល​​​អាសយដ្ឋាន​អ៊ីមែល​របស់អ្នក​នៅក្នុងវាល ពី ៖ ។ "
-"អ្នក​ក៏គួរតែកំណត់​អាសយដ្ឋាន​អ៊ីមែល​​របស់អ្នក​សម្រាប់​អត្តសញ្ញាណ​ទាំងអស់ "
-"ដូចច្នេះ​អ្នក​​មិនត្រូវ​បញ្ចូល​វា​នៅគ្រប់​សារទាំងអស់​នោះទេ ។"
+"អ្នកត្រូវតែ​បញ្ចូល​​​អាសយដ្ឋាន​អ៊ីមែល​របស់អ្នក​នៅក្នុងវាល ពី ៖ ។ អ្នក​ក៏គួរតែកំណត់​អាសយដ្ឋាន​អ៊ីមែល​​របស់អ្នក​"
+"សម្រាប់​អត្តសញ្ញាណ​ទាំងអស់ ដូចច្នេះ​អ្នក​​មិនត្រូវ​បញ្ចូល​វា​នៅគ្រប់​សារទាំងអស់​នោះទេ ។"
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"អ្នកត្រូវ​តែ​បញ្ជាក់​អ្នកទទួល​យ៉ាងហោចណាស់​ម្នាក់ នៅក្នុង​វាល ជូនចំពោះ ឬ "
-"វាល​ចម្លងជូន ឬក៏​វាល​ចម្លងសម្ងាត់​ជូន ។"
+"អ្នកត្រូវ​តែ​បញ្ជាក់​អ្នកទទួល​យ៉ាងហោចណាស់​ម្នាក់ នៅក្នុង​វាល ជូនចំពោះ ឬ វាល​ចម្លងជូន ឬក៏​វាល​ចម្លងសម្ងាត់​"
+"ជូន ។"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "បាត់​វាល​ជូន​ចំពោះ ។ អញ្ចឹង​ផ្ញើទេ ?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "គ្មាន​ជូន​ចំពោះ ៖ បាន​បញ្ជាក់"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "អ្នក​មិនបាន​បញ្ជាក់ប្រធានបទ​ឡើយ ។ អញ្ចឹង​ផ្ញើសារ​ឬ ?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "មិន​បាន​បញ្ជាក់​ប្រធានបទ​ឡើយ"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "ផ្ញើអញ្ចឹង"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "បញ្ជាក់​ប្រធានបទ"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "ទុក​ការសម្គាល់ កុំ​ចុះហត្ថលេខា/អ៊ិនគ្រីប"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "ទុក​ការសម្គាល់ កុំ​អ៊ិនគ្រីប"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "ទុក​ការសម្គាល់ កុំ​ចុះហត្ថលេខា"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "ចុះហត្ថលេខា​/​អ៊ិនគ្រីប (លុប​ការសម្គាល់)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "អ៊ិនគ្រីប (លុប​ការសម្គាល់)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "ចុះហត្ថលេខា (លុប​ការសម្គាល់)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ការចុះហត្ថលេខា​/អ៊ិនគ្រីប​ក្នុងបណ្ដាញ​នៃ​សារ​ HTML "
-"គឺ​មិនអាច​ធ្វើទៅបានទេ ។</p>"
-"<p>តើអ្នកចង់​លុប​ការសម្គាល់របស់អ្នកឬ ?</p></qt>"
+"<qt><p>ការចុះហត្ថលេខា​/អ៊ិនគ្រីប​ក្នុងបណ្ដាញ​នៃ​សារ​ HTML គឺ​មិនអាច​ធ្វើទៅបានទេ ។</p><p>តើអ្នកចង់​"
+"លុប​ការសម្គាល់របស់អ្នកឬ ?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "ចុះហត្ថលេខា​/​អ៊ិនគ្រីប​សារ ?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"ថត​ពុម្ព ឬ​សេចក្ដីព្រាង​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" មិនមាន (ទៀតទេ) "
-"ដូច្នេះ ថត​ពុម្ព ឬ​សេចក្ដី​ព្រាង​នឹង​ត្រូវ​បាន​ប្រើ ។"
+"ថត​ពុម្ព ឬ​សេចក្ដីព្រាង​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" មិនមាន (ទៀតទេ) ដូច្នេះ ថត​ពុម្ព ឬ​សេចក្ដី​"
+"ព្រាង​នឹង​ត្រូវ​បាន​ប្រើ ។"
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "សូម​បង្កើត​គណនី​មួយ​សម្រាប់​ការផ្ញើ ហើយ​ព្យាយាម​ម្ដងទៀត ។"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "ប្រុង​នឹង​ផ្ញើ​សំបុត្រ​ហើយ..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "​ផ្ញើ​ការ​អះអាង"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "ផ្ញើ​ឥឡូវ"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "គ្មាន​អ្នកទទួល"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "អ្នកទទួល​បន្ថែម​ទៀត"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "​ពិនិត្យ​​អក្ខរាវិរុទ្ធ ៖ បើក"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "​ពិនិត្យ​​អក្ខរាវិរុទ្ធ ៖ បិទ"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " បាន​បោះបង់​ការ​ពិនិត្យអក្ខរាវិរុទ្ធ ។"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " បាន​បញ្ឈប់​ការ​ពិនិត្យ​អក្ខរាវិរុទ្ធ ។"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "ពិនិត្យ​អក្ខរាវិរុទ្ធ​បញ្ចប់​ទាំងស្រុង ។"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "អ្នក​ពិនិត្យ​​អក្ខរាវិរុទ្ធ"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
-"សូម​កំណត់​រចនា​សម្ព័ន្ធ​​កម្មវិធី​ខាងក្រោយ​គ្រីប "
-"ដើម្បី​ប្រើ​សម្រាប់ការអ៊ិនគ្រីប Chiasmus មុនគេ ។\n"
-"អ្នកអាច​ធ្វើ​ការនេះ​នៅក្នុង​ថេប​កម្មវិធី​ខាងក្រោយគ្រីប​នៃ​ទំព័រ​​កំណត់រចនាសម្ព័ន"
-"្ធ​​សុវត្ថិភាព​របស់​ប្រអប់ ។"
+"សូម​កំណត់​រចនា​សម្ព័ន្ធ​​កម្មវិធី​ខាងក្រោយ​គ្រីប ដើម្បី​ប្រើ​សម្រាប់ការអ៊ិនគ្រីប Chiasmus មុនគេ ។\n"
+"អ្នកអាច​ធ្វើ​ការនេះ​នៅក្នុង​ថេប​កម្មវិធី​ខាងក្រោយគ្រីប​នៃ​ទំព័រ​​កំណត់រចនាសម្ព័ន្ធ​​សុវត្ថិភាព​របស់​ប្រអប់ ។"
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"តាមមើលទៅ libkleopatra ត្រូវបាន​ចងក្រង​ដោយគ្មាន​ការគាំទ្រ Chiasmus ។ "
-"អ្នក​ប្រហែល​ជា​ចង់ចងក្រង​ libkleopatra ឡើងវិញ​ដោយ--enable-chiasmus ។"
+"តាមមើលទៅ libkleopatra ត្រូវបាន​ចងក្រង​ដោយគ្មាន​ការគាំទ្រ Chiasmus ។ អ្នក​ប្រហែល​ជា​ចង់ចងក្រង​ "
+"libkleopatra ឡើងវិញ​ដោយ--enable-chiasmus ។"
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "មិន​បាន​កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​ខាង​ក្រោយ Chiasmus ឡើយ"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "រក​មិន​ឃើញ​កូនសោ Chiasmus ឡើយ"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "ការ​ជ្រើស​កូនសោ​អ៊ិនគ្រីប Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "សារ​នឹង​ត្រូវ​បាន​ចុះហត្ថលេខា"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "សារ​​នឹង​មិន​ត្រូវ​បាន​ចុះហត្ថលេខា​ទេ"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "សារ​នឹង​ត្រូវ​បាន​អ៊ិនគ្រីប"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "សារ​នឹង​មិន​ត្រូវ​អ៊ិនគ្រីប​ទេ"
 
@@ -6755,9 +6426,7 @@ msgstr "​មិន​អើពើ"
 
 #: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
-msgstr ""
-"ការពិនិត្យ​អក្ខរាវិរុទ្ធ​ដោយស្វ័យប្រវត្តិ​គឺមិនអាចធ្វើបាន​នៅលើអត្ថបទ​ជាមួយ "
-"markup ឡើយ ។"
+msgstr "ការពិនិត្យ​អក្ខរាវិរុទ្ធ​ដោយស្វ័យប្រវត្តិ​គឺមិនអាចធ្វើបាន​នៅលើអត្ថបទ​ជាមួយ markup ឡើយ ។"
 
 #: kmedit.cpp:631
 msgid ""
@@ -6781,11 +6450,11 @@ msgstr "​ពិនិត្យ​​អក្ខរាវិរុទ្ធ -
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/Aspell មិនអាច​ចាប់ផ្ដើម​បានទេ ។ សូមប្រាកដថា​អ្នកបានកំណត់រចនាសម្ព័ន្ធ​ "
-"ISpell ឬ Aspell យ៉ាងត្រឹមត្រូវ ហើយ​មាននៅក្នុង​ផ្លូវរបស់អ្នក ។"
+"ISpell/Aspell មិនអាច​ចាប់ផ្ដើម​បានទេ ។ សូមប្រាកដថា​អ្នកបានកំណត់រចនាសម្ព័ន្ធ​ ISpell ឬ "
+"Aspell យ៉ាងត្រឹមត្រូវ ហើយ​មាននៅក្នុង​ផ្លូវរបស់អ្នក ។"
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6818,13 +6487,11 @@ msgstr "<qt>សកម្មភាព​ត្រង​ច្រើន​ណា�
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>មិនស្គាល់​សកម្មភាព​តម្រង <b>%1</b>"
-"<br>នៅក្នុង​ច្បាប់តម្រង <b>%2</b> ។"
-"<br>មិនអើពើ​នឹងវា ។</qt>"
+"<qt>មិនស្គាល់​សកម្មភាព​តម្រង <b>%1</b><br>នៅក្នុង​ច្បាប់តម្រង <b>%2</b> ។<br>មិនអើពើ​នឹងវា ។"
+"</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7044,166 +6711,120 @@ msgstr "ចាក់សំឡេង​"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>នេះ​ជា​បញ្ជី​នៃ​តម្រង​ដែល​បាន​កំណត់ ។ "
-"ពួកវា​ត្រូវបាន​ដំណើរការ​ពី​កំពូលទៅបាត ។</p>"
-"<p>ចុច​លើ​តម្រងណាមួយ​ដើម្បី​កែសម្រួល​វា​ដោយប្រើ​វត្ថុបញ្ជា​​នៅខាងស្ដាំ​ដៃ​ពាក់កណ"
-"្ដាល​ប្រអប់ ។</p></qt>"
+"<qt><p>នេះ​ជា​បញ្ជី​នៃ​តម្រង​ដែល​បាន​កំណត់ ។ ពួកវា​ត្រូវបាន​ដំណើរការ​ពី​កំពូលទៅបាត ។</p><p>ចុច​លើ​"
+"តម្រងណាមួយ​ដើម្បី​កែសម្រួល​វា​ដោយប្រើ​វត្ថុបញ្ជា​​នៅខាងស្ដាំ​ដៃ​ពាក់កណ្ដាល​ប្រអប់ ។</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​បង្កើត​តម្រងថ្មី ។</p>"
-"<p>តម្រង​នឹងត្រូវបាន​បញ្ចូល​​តែនៅពីមុខ​តម្រង​ដែលបាន​ជ្រើស​បច្ចុប្បន្ន​ប៉ុណ្ណោះ "
-"ប៉ុន្តែ​អ្នក​តែងតែអាចផ្លាស់ប្ដូរ​វា​បាននៅពេលក្រោយ​ ។</p>"
-"<p>ប្រសិនបើអ្នក​បានចុច​ប៊ូតុងនេះ​ដោយចៃដន្យ "
-"អ្នកអាចមិន​ធ្វើវាវិញ​បាន​ដោយ​ចុច​លើប៊ូតុង <em>លុប</em> ។</p></qt>"
+"<qt><p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​បង្កើត​តម្រងថ្មី ។</p><p>តម្រង​នឹងត្រូវបាន​បញ្ចូល​​តែនៅពីមុខ​តម្រង​ដែលបាន​ជ្រើស​"
+"បច្ចុប្បន្ន​ប៉ុណ្ណោះ ប៉ុន្តែ​អ្នក​តែងតែអាចផ្លាស់ប្ដូរ​វា​បាននៅពេលក្រោយ​ ។</p><p>ប្រសិនបើអ្នក​បានចុច​"
+"ប៊ូតុងនេះ​ដោយចៃដន្យ អ្នកអាចមិន​ធ្វើវាវិញ​បាន​ដោយ​ចុច​លើប៊ូតុង <em>លុប</em> ។</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​ចម្លង​តម្រង ។</p>"
-"<p>ប្រសិនបើអ្នក​បាន​ចុចប៊ូតុង​នេះ​ដោយចៃដន្យ "
-"អ្នកអាច​មិនធ្វើ​វាវិញ​បាន​ដោយ​ចុចលើប៊ូតុង <em>សុប</em> ។</p></qt>"
+"<qt><p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​ចម្លង​តម្រង ។</p><p>ប្រសិនបើអ្នក​បាន​ចុចប៊ូតុង​នេះ​ដោយចៃដន្យ អ្នកអាច​មិនធ្វើ​"
+"វាវិញ​បាន​ដោយ​ចុចលើប៊ូតុង <em>សុប</em> ។</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ចុច​ប៊ូតុង​នេះ​ដើម្បី <em>លុប</em> "
-"តម្រង​ដែលបានជ្រើស​បច្ចុប្បន្នពី​បញ្ជី​ខាងលើ ។</p>"
-"<p>គ្មាន​វិធី​ដើម្បី​យក​តម្រង​​មកវិញ​បានទេ​ពេល​ដែល​វា​បាន​លុបនោះ "
-"ប៉ុន្តែ​អ្នក​តែងតែអាច​ទុក​ប្រអប់​នោះ​ដោយចុច <em>បោះបង់</em> "
-"ដើម្បី​បោះចោលការផ្លាស់ប្ដូរ​ដែល​បាន​ធ្វើ​ ។</p></qt>"
+"<qt><p>ចុច​ប៊ូតុង​នេះ​ដើម្បី <em>លុប</em> តម្រង​ដែលបានជ្រើស​បច្ចុប្បន្នពី​បញ្ជី​ខាងលើ ។</p><p>គ្មាន​វិធី​"
+"ដើម្បី​យក​តម្រង​​មកវិញ​បានទេ​ពេល​ដែល​វា​បាន​លុបនោះ ប៉ុន្តែ​អ្នក​តែងតែអាច​ទុក​ប្រអប់​នោះ​ដោយចុច <em>បោះបង់</"
+"em> ដើម្បី​បោះចោលការផ្លាស់ប្ដូរ​ដែល​បាន​ធ្វើ​ ។</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ចុចលើ​ប៊ូតុង​នេះ ដើម្បីផ្លាស់ទី​តម្រង​ដែលបាន​ជ្រើស​បច្ចុប្បន្នទៅ<em>"
-"កំពូល</em>បញ្ជី​ខាងលើ ។</p>"
-"<p>វា​មាន​ប្រយោជន៍ ចាប់តាំងពីលំដាប់តម្រង​នៅនៅក្នុង​បញ្ជី "
-"កំណត់លំដាប់​នៅដែល​វា​​ត្រូវបាន​សាកល្បង​ដាក់សារនៅក្នុង ។ "
-"តម្រង​ដែល​នៅលើ​គេ​បំផុត​គឺ​ត្រូវបាន​សាកល្បង​មុនគេ ។</p></qt>"
+"<qt><p>ចុចលើ​ប៊ូតុង​នេះ ដើម្បីផ្លាស់ទី​តម្រង​ដែលបាន​ជ្រើស​បច្ចុប្បន្នទៅ<em>កំពូល</em>បញ្ជី​ខាងលើ ។</"
+"p><p>វា​មាន​ប្រយោជន៍ ចាប់តាំងពីលំដាប់តម្រង​នៅនៅក្នុង​បញ្ជី កំណត់លំដាប់​នៅដែល​វា​​ត្រូវបាន​សាកល្បង​"
+"ដាក់សារនៅក្នុង ។ តម្រង​ដែល​នៅលើ​គេ​បំផុត​គឺ​ត្រូវបាន​សាកល្បង​មុនគេ ។</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ចុចប៊ូតុងនេះ​ដើម្បី​ផ្លាស់ទី​តម្រង​ដែលបានជ្រើស​បច្ចុប្បន្ន <em>ឡើងលើ</em> "
-"មួយ​នៅក្នុង​បញ្ជី​ខាងលើ ។</p>"
-"<p>វាមានប្រយោជន៍​ចាប់តាំងពី​លំដាប់​តម្រង​នៅក្នុង​បញ្ជី​​កំណត់​លំដាប់​​ដែល​ពួកវាត"
-"្រូវបានដាក់​​សាកល្បង​នៅក្នុង ៖ តម្រង​ដែល​នៅខ្ពស់​ជាងគេ សាកល្បងមុនគេ ។</p>"
-"<p>ប្រសិនបើ​អ្នក​បាន​ចុច​ប៊ូតុង​នេះ​​ដោយចៃដន្យ "
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>ចុចប៊ូតុងនេះ​ដើម្បី​ផ្លាស់ទី​តម្រង​ដែលបានជ្រើស​បច្ចុប្បន្ន <em>ឡើងលើ</em> មួយ​នៅក្នុង​បញ្ជី​"
+"ខាងលើ ។</p><p>វាមានប្រយោជន៍​ចាប់តាំងពី​លំដាប់​តម្រង​នៅក្នុង​បញ្ជី​​កំណត់​លំដាប់​​ដែល​ពួកវាត្រូវបានដាក់​​សាកល្បង​"
+"នៅក្នុង ៖ តម្រង​ដែល​នៅខ្ពស់​ជាងគេ សាកល្បងមុនគេ ។</p><p>ប្រសិនបើ​អ្នក​បាន​ចុច​ប៊ូតុង​នេះ​​ដោយចៃដន្យ "
 "អ្នកអាចមិន​ធ្វើវាវិញដោយចុចលើប៊ូតុង <em>ចុះក្រោម</em> ។</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​ផ្លាស់ទី​តម្រង​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន <em>"
-"ចុះក្រោម</em> មួយ​ ក្នុង​បញ្ជីខាងលើ ។</p>"
-"<p>វា​​មានប្រយោជន៍​ចាប់ពី​លំដាប់​នៃ​តម្រង​នៅក្នុង​បញ្ជី​ "
-"កំណត់​លំដាប់ដែល​ពួកវា​បាន​សាកល្បង​ដាក់សារ​នៅក្នុង ៖ "
-"តម្រង​ដែលនៅខ្ពស់ជាងគេសាកល្បង​មុនគេ ។</p>"
-"<p>ប្រសិនបើអ្នក​បាន​ចុច​ប៊ូតុង​នេះ​ដោយចៃដន្យ "
-"អ្នកអាច​មិនធ្វើវិញ​ដោយចុច​លើ​ប៊ូតុង <em>ឡើងលើ</em> ។</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​ផ្លាស់ទី​តម្រង​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន <em>ចុះក្រោម</em> មួយ​ ក្នុង​"
+"បញ្ជីខាងលើ ។</p><p>វា​​មានប្រយោជន៍​ចាប់ពី​លំដាប់​នៃ​តម្រង​នៅក្នុង​បញ្ជី​ កំណត់​លំដាប់ដែល​ពួកវា​បាន​សាកល្បង​"
+"ដាក់សារ​នៅក្នុង ៖ តម្រង​ដែលនៅខ្ពស់ជាងគេសាកល្បង​មុនគេ ។</p><p>ប្រសិនបើអ្នក​បាន​ចុច​ប៊ូតុង​នេះ​"
+"ដោយចៃដន្យ អ្នកអាច​មិនធ្វើវិញ​ដោយចុច​លើ​ប៊ូតុង <em>ឡើងលើ</em> ។</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ចុច​លើ​ប៊ូតុង​នេះ ដើម្បី​ផ្លាស់ទី​តម្រងដែលបានជ្រើស​បច្ចុប្បន្នទៅ<em>បាត</em>"
-"បញ្ជី​ខាងលើ</p>"
-"<p>វា​មានប្រយោជន៍ ចាប់តាំងពី​លំដាប់តម្រង​នៅក្នុងបញ្ជី "
-"កំណត់លំដាប់​ដែល​ពួកវា​ត្រូវបាន​សាកល្បង​ដាក់សារនៅក្នុង ៖ តម្រង​ដែលនៅលើ​គេ​បំផុត "
-"ត្រូវបានសាកល្បង​មុន ។</p></qt>"
+"<qt><p>ចុច​លើ​ប៊ូតុង​នេះ ដើម្បី​ផ្លាស់ទី​តម្រងដែលបានជ្រើស​បច្ចុប្បន្នទៅ<em>បាត</em>បញ្ជី​ខាងលើ</"
+"p><p>វា​មានប្រយោជន៍ ចាប់តាំងពី​លំដាប់តម្រង​នៅក្នុងបញ្ជី កំណត់លំដាប់​ដែល​ពួកវា​ត្រូវបាន​សាកល្បង​"
+"ដាក់សារនៅក្នុង ៖ តម្រង​ដែលនៅលើ​គេ​បំផុត ត្រូវបានសាកល្បង​មុន ។</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​ប្ដូរឈ្មោះ​តម្រង​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ។</p>"
-"<p>តម្រង​ត្រូវបាន​ដាក់ឈ្មោះ​ដោយស្វ័យប្រវត្តិ ដែលវែងដូច​ដែលពួកវាចាប់ផ្ដើមជាមួយ "
-"\"&lt;\".</p>"
-"<p>ប្រសិន​បើអ្នក​បាន​ប្ដូរឈ្មោះ​តម្រង​ដោយចៃដន្យ ហើយ "
-"ចង់ដាក់ឈ្មោះវិញ​ដោយស្វ័យប្រវត្តិ សូមចុច​ប៊ូតុងនេះ ហើយ ជ្រើស <em>ជម្រះ</em> "
-"ដែល​នៅជាប់​ដោយ <em>យល់ព្រម</em> នៅក្នុង​ប្រអប់ដែល​មើលឃើញ ។</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​ប្ដូរឈ្មោះ​តម្រង​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ។</p><p>តម្រង​ត្រូវបាន​ដាក់ឈ្មោះ​"
+"ដោយស្វ័យប្រវត្តិ ដែលវែងដូច​ដែលពួកវាចាប់ផ្ដើមជាមួយ \"&lt;\".</p><p>ប្រសិន​បើអ្នក​បាន​ប្ដូរឈ្មោះ​"
+"តម្រង​ដោយចៃដន្យ ហើយ ចង់ដាក់ឈ្មោះវិញ​ដោយស្វ័យប្រវត្តិ សូមចុច​ប៊ូតុងនេះ ហើយ ជ្រើស <em>ជម្រះ</em> ដែល​"
+"នៅជាប់​ដោយ <em>យល់ព្រម</em> នៅក្នុង​ប្រអប់ដែល​មើលឃើញ ។</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​បង្ខំ​ឲ្យ​​បង្ហាញ​ប្រអប់​អំណះអំណាង​ ។</p>"
-"<p>វាមានប្រយោជន៍​ "
-"ប្រសិនបើ​អ្នក​បាន​កំណត់​កម្រងច្បាប់​ដែលបានទាញយក​សារស្លាកនៅពេល​ក្រោយ ។ "
-"ដោយគ្មានលទ្ធភាព​បង្ខំ​ប្រអប់​ដែល​លេចឡើង សារទាំងនេះ​​មិនអាច​ទាញយកបានឡើយ "
-"​ប្រសិនបើ​គ្មាន​សារដែលមានទំហំ​ធំ​ផ្សេងទៀតកំពុងរង់ចាំ​នៅលើម៉ាស៊ីនបម្រើ​នោះ ឬ "
-"ប្រសិនបើ​អ្នក​ចង់​ផ្លាស់ប្ដូរកម្រងច្បាប់​ទៅ​ស្លាកសារ​ផ្សេងៗគ្នានោះ ។</p></qt>"
+"<qt><p>ចុច​ប៊ូតុង​នេះ​ដើម្បី​បង្ខំ​ឲ្យ​​បង្ហាញ​ប្រអប់​អំណះអំណាង​ ។</p><p>វាមានប្រយោជន៍​ ប្រសិនបើ​អ្នក​បាន​កំណត់​"
+"កម្រងច្បាប់​ដែលបានទាញយក​សារស្លាកនៅពេល​ក្រោយ ។ ដោយគ្មានលទ្ធភាព​បង្ខំ​ប្រអប់​ដែល​លេចឡើង សារទាំងនេះ​​"
+"មិនអាច​ទាញយកបានឡើយ ​ប្រសិនបើ​គ្មាន​សារដែលមានទំហំ​ធំ​ផ្សេងទៀតកំពុងរង់ចាំ​នៅលើម៉ាស៊ីនបម្រើ​នោះ ឬ ប្រសិនបើ​"
+"អ្នក​ចង់​ផ្លាស់ប្ដូរកម្រងច្បាប់​ទៅ​ស្លាកសារ​ផ្សេងៗគ្នានោះ ។</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7213,6 +6834,16 @@ msgstr "ច្បាប់តម្រង POP3"
 msgid "Filter Rules"
 msgstr "ច្បាប់តម្រង"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "​នាំចូល"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "​នាំចូល"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "តម្រង​ដែល​អាច​ប្រើ​បាន"
@@ -7293,6 +6924,11 @@ msgstr "បន្ថែម​តម្រង​នេះ ទៅ​របារ�
 msgid "Icon for this filter:"
 msgstr "រូបតំណាង​សម្រាប់​តម្រង​នេះ ៖"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "​ជូនចំពោះ"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "​ឡើង​លើ"
@@ -7301,16 +6937,29 @@ msgstr "​ឡើង​លើ"
 msgid "Down"
 msgstr "ចុះក្រោម"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "​ប្តូរឈ្មោះ..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "​ថ្មី"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "​ចម្លង​ទៅ"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "​បាន​លុប"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7319,20 +6968,19 @@ msgstr "ជ្រើស​ផ្លូវកាត់​សម្រាប់​
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"យ៉ាងហោចណាស់​តម្រង​មួយ​កំណត់គោលដៅ​ថត​នៅលើ​គណនី​ IMAP នៅលើបណ្ដាញ ។ តម្រង​ដូចនោះ "
-"នឹងត្រូវបាន​អនុវត្ត​តែ​នៅពេល​​ត្រងដោយដៃ និង​នៅពេល​កំពុងត្រង​សំបុត្រ IMAP "
-"នៅលើបណ្ដាញ​ចូលមក ។"
+"យ៉ាងហោចណាស់​តម្រង​មួយ​កំណត់គោលដៅ​ថត​នៅលើ​គណនី​ IMAP នៅលើបណ្ដាញ ។ តម្រង​ដូចនោះ នឹងត្រូវបាន​អនុវត្ត​តែ​"
+"នៅពេល​​ត្រងដោយដៃ និង​នៅពេល​កំពុងត្រង​សំបុត្រ IMAP នៅលើបណ្ដាញ​ចូលមក ។"
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"តម្រង​​ដូចតទៅនេះ​មិនបាន​រក្សាទុកឡើយ ព្រោះ​ពួកវា​មិនត្រឹមត្រូវ (ឧទាហរណ៍ ដោយ​មាន "
-"ការគ្មានសកម្មភាព ឬ គ្មាន​ច្បាប់ស្វែងរក) ។"
+"តម្រង​​ដូចតទៅនេះ​មិនបាន​រក្សាទុកឡើយ ព្រោះ​ពួកវា​មិនត្រឹមត្រូវ (ឧទាហរណ៍ ដោយ​មាន ការគ្មានសកម្មភាព ឬ "
+"គ្មាន​ច្បាប់ស្វែងរក) ។"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7379,24 +7027,19 @@ msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​
 msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
-msgstr ""
-"ឈ្មោះ​ថត​មិន​អាច​មានតួអក្សរ / (សញ្ញា​/)បាន​ទេ ។ សូម​ជ្រើស​ឈ្មោះ​ថតផ្សេងទៀត ។"
+msgstr "ឈ្មោះ​ថត​មិន​អាច​មានតួអក្សរ / (សញ្ញា​/)បាន​ទេ ។ សូម​ជ្រើស​ឈ្មោះ​ថតផ្សេងទៀត ។"
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
-msgstr ""
-"ឈ្មោះ​ថត​មិនអាច​ចាប់​ផ្ដើម​ដោយតួអក្សរ . (ចំណុច)បាន​ទេ ។ "
-"សូម​ជ្រើស​ឈ្មោះ​ថត​ផ្សេងទៀត ។"
+msgstr "ឈ្មោះ​ថត​មិនអាច​ចាប់​ផ្ដើម​ដោយតួអក្សរ . (ចំណុច)បាន​ទេ ។ សូម​ជ្រើស​ឈ្មោះ​ថត​ផ្សេងទៀត ។"
 
 #: kmfolder.cpp:932
 msgid ""
 "Your IMAP server does not allow the character '%1'; please choose another "
 "folder name."
-msgstr ""
-"ម៉ាស៊ីន​បម្រើ​ IMAP របស់អ្នក​មិន​អនុញ្ញាត​ចំពោះ​តួអក្សរ '%1' ឡើយ ។ "
-"សូម​ជ្រើស​ឈ្មោះ​ថត​ផ្សេងទៀត ។"
+msgstr "ម៉ាស៊ីន​បម្រើ​ IMAP របស់អ្នក​មិន​អនុញ្ញាត​ចំពោះ​តួអក្សរ '%1' ឡើយ ។ សូម​ជ្រើស​ឈ្មោះ​ថត​ផ្សេងទៀត ។"
 
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
@@ -7404,31 +7047,24 @@ msgstr "ការ​ដោះស្រាយបញ្ហា​អំពី​ឃ
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>ការដោះស្រាយ​បញ្ហា​ឃ្លាំងសម្ងាត់​ IMAP ។</b></p>"
-"<p>ប្រសិនបើអ្នក​មាន​បញ្ហា​ជាមួយ​ការធ្វើសមកាលកម្ម​ថត IMAP "
-"ដំបូងអ្នកគួរតែ​ព្យាយាម​ស្ថាបនា​ឯកសារ​លិបិក្រម​ឡើងវិញ ។ "
-"វា​នឹង​ចំនាយពេល​មួយចំនួនដើម្បី​ស្ថាបនា​ឡើងវិញ "
-"ប៉ុន្តែ​នឹងមិន​បង្ក​បញ្ហា​ណាមួយឡើយ ។</p>"
-"<p>ប្រសិនបើ​វា​មិនគ្រប់គ្រាន់ អ្នកអាច​ព្យាយាម​ធ្វើឲ្យឃ្លាំងសម្ងាត់ IMAP ស្រស់ ។ "
-"ប្រសិនបើ​អ្នក​ធ្វើ​ការនេះ "
-"អ្នកនឹង​បាត់បង់​ការផ្លាស់ប្ដូរ​មូល​ដ្ឋាន​ទាំងអស់​របស់អ្នក​សម្រាប់​ថតនេះ "
-"និង​ថតរងរបស់វាទាំងអស់ ។</p>"
+"<p><b>ការដោះស្រាយ​បញ្ហា​ឃ្លាំងសម្ងាត់​ IMAP ។</b></p><p>ប្រសិនបើអ្នក​មាន​បញ្ហា​ជាមួយ​"
+"ការធ្វើសមកាលកម្ម​ថត IMAP ដំបូងអ្នកគួរតែ​ព្យាយាម​ស្ថាបនា​ឯកសារ​លិបិក្រម​ឡើងវិញ ។ វា​នឹង​ចំនាយពេល​"
+"មួយចំនួនដើម្បី​ស្ថាបនា​ឡើងវិញ ប៉ុន្តែ​នឹងមិន​បង្ក​បញ្ហា​ណាមួយឡើយ ។</p><p>ប្រសិនបើ​វា​មិនគ្រប់គ្រាន់ អ្នកអាច​"
+"ព្យាយាម​ធ្វើឲ្យឃ្លាំងសម្ងាត់ IMAP ស្រស់ ។ ប្រសិនបើ​អ្នក​ធ្វើ​ការនេះ អ្នកនឹង​បាត់បង់​ការផ្លាស់ប្ដូរ​មូល​ដ្ឋាន​"
+"ទាំងអស់​របស់អ្នក​សម្រាប់​ថតនេះ និង​ថតរងរបស់វាទាំងអស់ ។</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7459,23 +7095,20 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"មិនអាច​អាន​​ឯកសារឃ្លាំងសម្ងាត់​​ UID របស់​ថត​ %1 បានទេ ។ "
-"អាចនឹងមាន​បញ្ហា​កើត​ឡើង​ជា​មួយ​សិទ្ធ​ប្រព័ន្ធ​របស់​ប្រព័ន្ធ​​​ឯកសារឬ ឬ "
-"វា​​ខូច ។"
+"មិនអាច​អាន​​ឯកសារឃ្លាំងសម្ងាត់​​ UID របស់​ថត​ %1 បានទេ ។ អាចនឹងមាន​បញ្ហា​កើត​ឡើង​ជា​មួយ​សិទ្ធ​ប្រព័ន្ធ​របស់​"
+"ប្រព័ន្ធ​​​ឯកសារឬ ឬ វា​​ខូច ។"
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"មិន​អាច​សរសេរ​​ឯកសារ​ឃ្លាំង​សម្ងាត់​ UID របស់​ថត​ %1 បាន​ទេ​។ "
-"អាចនឹងមាន​បញ្ហា​កើត​ឡើង​ជា​មួយ​សិទ្ធ​របស់​ប្រព័ន្ធ​ឯកសារ​ ។"
+"មិន​អាច​សរសេរ​​ឯកសារ​ឃ្លាំង​សម្ងាត់​ UID របស់​ថត​ %1 បាន​ទេ​។ អាចនឹងមាន​បញ្ហា​កើត​ឡើង​ជា​មួយ​សិទ្ធ​របស់​"
+"ប្រព័ន្ធ​ឯកសារ​ ។"
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
-msgstr ""
-"អ្នកត្រូវតែ​ធ្វើ​សមកាលកម្មជាមួយ​ម៉ាស៊ីនបម្រើ​មុនពេល​ធ្វើការ​ប្ដូរឈ្មោះ​ថត "
-"IMAP ។"
+msgstr "អ្នកត្រូវតែ​ធ្វើ​សមកាលកម្មជាមួយ​ម៉ាស៊ីនបម្រើ​មុនពេល​ធ្វើការ​ប្ដូរឈ្មោះ​ថត IMAP ។"
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7508,11 +7141,11 @@ msgstr "លិបិក្រម​របស់​ថត​នេះ​​ត្
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"ថត %1 មិននៅក្នុង​​សភាព sync ដំបូង (សភាពគឺ %2) ឡើយ ។ "
-"តើអ្នកចង់​កំណត់​វាម្ដងទៀត​ទៅសភាព sync ដំបូង និង sync ជានិច្ចឬ ?"
+"ថត %1 មិននៅក្នុង​​សភាព sync ដំបូង (សភាពគឺ %2) ឡើយ ។ តើអ្នកចង់​កំណត់​វាម្ដងទៀត​ទៅសភាព sync "
+"ដំបូង និង sync ជានិច្ចឬ ?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7615,8 +7248,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>សិទ្ធិ​ចូល​ដំណើរការ​របស់​អ្នក​ទៅ​កាន់​ថត <b>%1</b> "
-"ត្រូវ​បាន​ដាក់​កម្រិត វា​នឹង​មិន​អាច​បន្ថែម​សារ​ទៅ​ថត​នេះ​ទៀត​បាន​ទេ ។</p>"
+"<p>សិទ្ធិ​ចូល​ដំណើរការ​របស់​អ្នក​ទៅ​កាន់​ថត <b>%1</b> ត្រូវ​បាន​ដាក់​កម្រិត វា​នឹង​មិន​អាច​បន្ថែម​សារ​ទៅ​ថត​នេះ​"
+"ទៀត​បាន​ទេ ។</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7637,15 +7270,11 @@ msgstr "កំពុង​បង្កើត​ថត​រង​នៅលើ​
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>បាន​លុប​សំបុត្រ​នៅលើ​ម៉ាស៊ីន​បម្រើ​នៅក្នុង​ថត <b>%1</b>"
-" ។ តើអ្នកចង់​លុបវា​ចេញ​ឬ ?"
-"<br>UID ៖ %2</p></qt>"
+"<qt><p>បាន​លុប​សំបុត្រ​នៅលើ​ម៉ាស៊ីន​បម្រើ​នៅក្នុង​ថត <b>%1</b> ។ តើអ្នកចង់​លុបវា​ចេញ​ឬ ?<br>UID ៖ "
+"%2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7666,13 +7295,10 @@ msgstr "កំពុងទៅយក​ថត​សម្រាប់​ចន្
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>វា​មើលទៅ​ហាក់ដូចជា​បានលុបថត <b>%1</b> ។ "
-"តើអ្នកចង់​លុបវា​ចេញពី​ម៉ាស៊ីនបម្រើ​ឬ ?</p></qt>"
+"<qt><p>វា​មើលទៅ​ហាក់ដូចជា​បានលុបថត <b>%1</b> ។ តើអ្នកចង់​លុបវា​ចេញពី​ម៉ាស៊ីនបម្រើ​ឬ ?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7680,21 +7306,19 @@ msgstr "​បានបោះបង់"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"ម៉ាស៊ីន​បម្រើ IMAP %1 មិនមានការគាំទ្រសម្រាប់​ចំណារ​ពន្យល់ IMAP ។ ការផ្ទុក XML "
-"មិនអាច​ប្រើ​នៅលើ​ម៉ាស៊ីនបម្រើ​នេះ​បានឡើយ ។ សូមកំណត់​រចនា​សម្ព័ន្ធ KMail "
-"ផ្សេងពីគ្នា​ម្ដងទៀត ។"
+"ម៉ាស៊ីន​បម្រើ IMAP %1 មិនមានការគាំទ្រសម្រាប់​ចំណារ​ពន្យល់ IMAP ។ ការផ្ទុក XML មិនអាច​ប្រើ​នៅលើ​"
+"ម៉ាស៊ីនបម្រើ​នេះ​បានឡើយ ។ សូមកំណត់​រចនា​សម្ព័ន្ធ KMail ផ្សេងពីគ្នា​ម្ដងទៀត ។"
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"ម៉ាស៊ីន​បម្រើ IMAP %1 មិនមាន​ការ​គាំទ្រ​ចំពោះចំណារ​ពន្យល់ imap ទេ ។ ការផ្ទុក "
-"XML មិនអាច​ប្រើ​នៅលើ​ម៉ាស៊ីនបម្រើ​នេះ​បានឡើយ សូមកំណត់​រចនា​សម្ព័ន្ធ KMail "
-"ផ្សេងពីនេះ​ម្ដងទៀត ។"
+"ម៉ាស៊ីន​បម្រើ IMAP %1 មិនមាន​ការ​គាំទ្រ​ចំពោះចំណារ​ពន្យល់ imap ទេ ។ ការផ្ទុក XML មិនអាច​ប្រើ​នៅលើ​"
+"ម៉ាស៊ីនបម្រើ​នេះ​បានឡើយ សូមកំណត់​រចនា​សម្ព័ន្ធ KMail ផ្សេងពីនេះ​ម្ដងទៀត ។"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7706,18 +7330,15 @@ msgstr "lost+found"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>មាន​សារ​ថ្មី​នៅ​ក្នុងថត <b>%1</b> "
-"ដែល​មិន​ត្រូវ​បានផ្ទុក​ឡើង​ទៅ​ម៉ាស៊ីន​បម្រើ​នៅ​ឡើយ​ទេ "
-"ប៉ុន្តែ​ថត​ត្រូវ​បានលុប​នៅ​លើ​ម៉ាស៊ីនបម្រើ "
-"ឬ​អ្នក​មិនមាន​សិទ្ធិ​គ្រប់គ្រាន់​នៅ​លើ​ថត​ដើម្បី​ផ្ទុក​ពូក​វា​ឡើង ។</p>"
-"<p>ដូច្នេះ​សាារ​ដែល​ប៉ះពាល់​ទាំងអស់​នឹ​​ត្រូវ​បាន​ផ្លាស់ទៅ​​កាន់o <b>%2</b> "
-"ដើម្បី​ជៀសវាង​ពី​ការ​បាត់បង់​ទិន្នន័យ ។<//p>"
+"<p>មាន​សារ​ថ្មី​នៅ​ក្នុងថត <b>%1</b> ដែល​មិន​ត្រូវ​បានផ្ទុក​ឡើង​ទៅ​ម៉ាស៊ីន​បម្រើ​នៅ​ឡើយ​ទេ ប៉ុន្តែ​ថត​ត្រូវ​"
+"បានលុប​នៅ​លើ​ម៉ាស៊ីនបម្រើ ឬ​អ្នក​មិនមាន​សិទ្ធិ​គ្រប់គ្រាន់​នៅ​លើ​ថត​ដើម្បី​ផ្ទុក​ពូក​វា​ឡើង ។</p><p>ដូច្នេះ​សាារ​"
+"ដែល​ប៉ះពាល់​ទាំងអស់​នឹ​​ត្រូវ​បាន​ផ្លាស់ទៅ​​កាន់o <b>%2</b> ដើម្បី​ជៀសវាង​ពី​ការ​បាត់បង់​ទិន្នន័យ ។<//p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7725,22 +7346,24 @@ msgstr "សិទ្ធិ​ចូល​ដំណើរការ​មិន​
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-msgstr ""
-"<p>មាន​សារ​ថ្មី​នៅ​ក្នុង​ថត​នេះ (%1) "
-"ដែល​មិន​ទាន់​បាន​ផ្ទុក​ឡើង​ទៅ​ម៉ាស៊ីនបម្រើ​នៅ​ឡើយ​ទេ "
-"ប៉ុន្តែ​ថត​ត្រូវ​បាន​លុប​នៅ​លើ​ម៉ាស៊ីន​​បម្រើ "
-"ឬអ្នក​​​មិន​មាន​សិទ្ធិ​គ្រប់គ្រាន់​នៅ​លើ​ថត ដើម្បី​ផ្ទុក​ពួក​វា​ឡើង​បាន​ឡើយ ។ "
-"សូម​ទាក់ទង​អ្នក​គ្រប់គ្រង​របស់​អ្នក ដើម្បី​ផ្ដល់​សិទ្ធិ​ផ្ទុក​សារ​ថ្មី​ឡើង "
-"ដល់​អ្នក ឬ ផ្លាស់ទី​ពួកវា​ចេញ​ពី​ថត​នេះ ។</p> "
-"<p>តើ​អ្នក​ចង់​ផ្លាស់ទី​សារ​ទាំងនេះ ទៅ​ថត​ផ្សេង​ឥឡូវ​ឬ ?</p>"
-
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
+msgstr ""
+"<p>មាន​សារ​ថ្មី​នៅ​ក្នុង​ថត​នេះ (%1) ដែល​មិន​ទាន់​បាន​ផ្ទុក​ឡើង​ទៅ​ម៉ាស៊ីនបម្រើ​នៅ​ឡើយ​ទេ ប៉ុន្តែ​ថត​ត្រូវ​បាន​លុប​"
+"នៅ​លើ​ម៉ាស៊ីន​​បម្រើ ឬអ្នក​​​មិន​មាន​សិទ្ធិ​គ្រប់គ្រាន់​នៅ​លើ​ថត ដើម្បី​ផ្ទុក​ពួក​វា​ឡើង​បាន​ឡើយ ។ សូម​ទាក់ទង​អ្នក​"
+"គ្រប់គ្រង​របស់​អ្នក ដើម្បី​ផ្ដល់​សិទ្ធិ​ផ្ទុក​សារ​ថ្មី​ឡើង ដល់​អ្នក ឬ ផ្លាស់ទី​ពួកវា​ចេញ​ពី​ថត​នេះ ។</p> <p>តើ​អ្នក​"
+"ចង់​ផ្លាស់ទី​សារ​ទាំងនេះ ទៅ​ថត​ផ្សេង​ឥឡូវ​ឬ ?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "ផ្លាស់ទី​ទៅ ៖"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "​កុំផ្លាស់​ទី"
 
@@ -7752,8 +7375,7 @@ msgstr "ផ្លាស់ទី​សារ​ទៅ​ថត"
 msgid "Permissions (ACL)"
 msgstr "សិទ្ធិ (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "​ទូទៅ"
@@ -7777,8 +7399,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "ប្រើ​រូបតំណាង​ផ្ទាល់ខ្លួន"
@@ -7797,26 +7418,19 @@ msgstr "ប្រើសំបុត្រ​​ថ្មី/មិនទាន�
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ប្រសិនបើ​បានបើក​ជម្រើសនេះ "
-"នោះអ្នកនឹងត្រូវបានជូនដំណឹង​អំពី​សំបុត្រ​ថ្មី​/​មិនទាន់អាននៅក្នុង​ថតនេះ ។ "
-"ម្យ៉ាងទៀត ទៅកាន់​ថតបន្ទាប់​/មុន ជាមួយ​សារ​ដែល​មិនទាន់អាន "
-"នឹង​បញ្ឈប់​នៅត្រង់នេះ ។</p>"
-"<p>កុំធីក​ជម្រើស​នេះ "
-"ប្រសិនបើអ្នក​មិនចង់​ទទួល​ការជូនដំណឹងអំពី​សំបុត្រ​ថ្មី​/​មិនទាន់អាននៅក្នុងថតនេះ "
-"ហើយ ប្រសិនបើ​អ្នកចង់​​រំលងថតនេះ "
-"នៅពេល​ដែល​កំពុង​ទៅកាន់​ថតបន្ទាប់/មុន​ជាមួយសារដែល​មិនទាន់អាន ។ "
-"វាមានប្រយោជន៍​ចំពោះការដែល​មិនអើពើ​នឹង​សំបុត្រ​/មិនទាន់អាន​ណាមួយ​នៅក្នុង​ធុងសំរាម"
-"​របស់អ្នក និង​ថត​ដាក់សារឥតបានការ ។</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>ប្រសិនបើ​បានបើក​ជម្រើសនេះ នោះអ្នកនឹងត្រូវបានជូនដំណឹង​អំពី​សំបុត្រ​ថ្មី​/​មិនទាន់អាននៅក្នុង​ថតនេះ ។ "
+"ម្យ៉ាងទៀត ទៅកាន់​ថតបន្ទាប់​/មុន ជាមួយ​សារ​ដែល​មិនទាន់អាន នឹង​បញ្ឈប់​នៅត្រង់នេះ ។</p><p>កុំធីក​ជម្រើស​"
+"នេះ ប្រសិនបើអ្នក​មិនចង់​ទទួល​ការជូនដំណឹងអំពី​សំបុត្រ​ថ្មី​/​មិនទាន់អាននៅក្នុងថតនេះ ហើយ ប្រសិនបើ​អ្នកចង់​​"
+"រំលងថតនេះ នៅពេល​ដែល​កំពុង​ទៅកាន់​ថតបន្ទាប់/មុន​ជាមួយសារដែល​មិនទាន់អាន ។ វាមានប្រយោជន៍​ចំពោះការដែល​"
+"មិនអើពើ​នឹង​សំបុត្រ​/មិនទាន់អាន​ណាមួយ​នៅក្នុង​ធុងសំរាម​របស់អ្នក និង​ថត​ដាក់សារឥតបានការ ។</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7828,14 +7442,12 @@ msgstr "ទុក​ការឆ្លើយតប​នៅក្នុង​ថ
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"ធីក​ជម្រើស​នេះ "
-"ប្រសិនបើ​អ្នកចង់ឲ្យ​​ការឆ្លើយតបដែលអ្នក​សរសេរទៅ​កាន់សំបុត្រ​ក្នុងថត​នេះ​​​ដាក់នៅក"
-"្នុង​ថត​ដូចគ្នានេះ​បន្ទាប់ពីការ​ផ្ញើ "
-"ជំនួស​នៅក្នុង​ថត​សំបុត្រ​ដែលផ្ញើ​ដែលបាន​កំណត់រចនាសម្ព័ន្ធ ។"
+"ធីក​ជម្រើស​នេះ ប្រសិនបើ​អ្នកចង់ឲ្យ​​ការឆ្លើយតបដែលអ្នក​សរសេរទៅ​កាន់សំបុត្រ​ក្នុងថត​នេះ​​​ដាក់នៅក្នុង​ថត​"
+"ដូចគ្នានេះ​បន្ទាប់ពីការ​ផ្ញើ ជំនួស​នៅក្នុង​ថត​សំបុត្រ​ដែលផ្ញើ​ដែលបាន​កំណត់រចនាសម្ព័ន្ធ ។"
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7845,17 +7457,21 @@ msgstr "បង្ហាញ​​ជួរឈរ​អ្នកផ្ញើ/អ�
 msgid "Sho&w column:"
 msgstr "បង្ហាញ​ជួរឈរ ៖"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "​កំណត់ជាលំនាំដើម"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "​អ្នក​ផ្ញើ"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "អ្នកទទួល"
@@ -7866,19 +7482,16 @@ msgstr "អត្តសញ្ញាណ​អ្នកផ្ញើ ៖"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"ជ្រើស​អត្តសញ្ញាណ​អ្នកផ្ញើដើម្បីប្រើ​នៅពេល​ដែល​កំពុងសរសេរ​សំបុត្រថ្មី ឬ "
-"កំពុងឆ្លើយតប​ទៅកាន់សំបុត្រ​នៅក្នុង​ថតនេះ ។ មានន័យថា "
-"ប្រសិនបើអ្នក​នៅក្នុង​ថត​ការងារណាមួយរបស់អ្នក អ្នកអាច​ធ្វើឲ្យ KMail "
-"ប្រើ​ទំនាក់ទំនង​​អាសយដ្ឋាន​អ៊ីមែល​​របស់អ្នកផ្ញើ ហត្ថលេខា និង​ការចុះហត្ថលេខា ឬ "
-"សោអ៊ិនគ្រីប​ដោយស្វ័យប្រវត្តិ ។ "
-"អត្តសញ្ញាណ​អាចត្រូវបាន​រៀបចំ​នៅក្នុង​ប្រអប់កំណត់រចនាសម្ព័ន្ធ​ចម្បង ។ (ការកំណត់ "
-"-> កំណត់​រចនាសម្ព័ន្ធ​ KMail)"
+"ជ្រើស​អត្តសញ្ញាណ​អ្នកផ្ញើដើម្បីប្រើ​នៅពេល​ដែល​កំពុងសរសេរ​សំបុត្រថ្មី ឬ កំពុងឆ្លើយតប​ទៅកាន់សំបុត្រ​នៅក្នុង​"
+"ថតនេះ ។ មានន័យថា ប្រសិនបើអ្នក​នៅក្នុង​ថត​ការងារណាមួយរបស់អ្នក អ្នកអាច​ធ្វើឲ្យ KMail ប្រើ​ទំនាក់ទំនង​​"
+"អាសយដ្ឋាន​អ៊ីមែល​​របស់អ្នកផ្ញើ ហត្ថលេខា និង​ការចុះហត្ថលេខា ឬ សោអ៊ិនគ្រីប​ដោយស្វ័យប្រវត្តិ ។ អត្តសញ្ញាណ​"
+"អាចត្រូវបាន​រៀបចំ​នៅក្នុង​ប្រអប់កំណត់រចនាសម្ព័ន្ធ​ចម្បង ។ (ការកំណត់ -> កំណត់​រចនាសម្ព័ន្ធ​ KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7896,28 +7509,25 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"ការកំណត់​នេះ​ កំណត់អ្នកប្រើណាមួយ​ក្នុង​ការចែករំលែក​ថតនេះ ដែលគួរតែទទួល​កំឡុងពេល "
-"\"រវល់\" នៅក្នុង​បញ្ជី ទំនេរ/រវល់ របស់ពួកគេ ហើយ "
-"គួរតែមើល​ការជូនដំណឹង​សម្រាប់​ព្រឹត្តិការណ៍ ឬ ភារកិច្ច​នៅក្នុង​ថតនេះ ។ ការកំណត់​ "
-"ឆ្លើយតប​តែទៅកាន់​ថត ប្រតិទិន និង​ភារកិច្ច​ប៉ណ្ណោះ(ចំពោះ​ភារកិច្ច "
-"ការកំណត់នេះ​គឺត្រូវបានប្រើ​សម្រាប់តែ​ការជូនដំណឹងប៉ុណ្ណោះ) ។\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"ការកំណត់​នេះ​ កំណត់អ្នកប្រើណាមួយ​ក្នុង​ការចែករំលែក​ថតនេះ ដែលគួរតែទទួល​កំឡុងពេល \"រវល់\" នៅក្នុង​បញ្ជី "
+"ទំនេរ/រវល់ របស់ពួកគេ ហើយ គួរតែមើល​ការជូនដំណឹង​សម្រាប់​ព្រឹត្តិការណ៍ ឬ ភារកិច្ច​នៅក្នុង​ថតនេះ ។ "
+"ការកំណត់​ ឆ្លើយតប​តែទៅកាន់​ថត ប្រតិទិន និង​ភារកិច្ច​ប៉ណ្ណោះ(ចំពោះ​ភារកិច្ច ការកំណត់នេះ​គឺត្រូវបានប្រើ​"
+"សម្រាប់តែ​ការជូនដំណឹងប៉ុណ្ណោះ) ។\n"
 "\n"
-"ឧទាហរណ៍​ការប្រើធុង ៖ ប្រសិនបើ​ចៅហ្វាយ​ចែករំលែក​ថត​តាម​លេខា​របស់គាត់ "
-"មានតែ​ចៅហ្វាយ​ប៉ុណ្ណោះ​ដែលគួរតែត្រូវបានសំគាល់ថា​ រវល់សម្រាប់​ការប្រជុំរបស់គាត់ "
-"ដូច្នេះ​​គាត់គួរតែ​ជ្រើស \"គ្រប់គ្រង\" "
+"ឧទាហរណ៍​ការប្រើធុង ៖ ប្រសិនបើ​ចៅហ្វាយ​ចែករំលែក​ថត​តាម​លេខា​របស់គាត់ មានតែ​ចៅហ្វាយ​ប៉ុណ្ណោះ​"
+"ដែលគួរតែត្រូវបានសំគាល់ថា​ រវល់សម្រាប់​ការប្រជុំរបស់គាត់ ដូច្នេះ​​គាត់គួរតែ​ជ្រើស \"គ្រប់គ្រង\" "
 "ចាប់តាំងពីលេខា​គ្មានសិទ្ធិ​គ្រប់គ្រងលើថត ។\n"
-"ម្យ៉ាងវិញ​ទៀត​ ប្រសិនបើ​ក្រុមការងារ​ចែករំលែក​ប្រតិទិន​សម្រាប់ការប្រជុំក្រុម "
-"នោះ​អ្នកអាន​ថតទាំងអស់​គួរ​តែត្រូវបាន​សម្គាល់​ថា រវល់ សម្រាប់​ការប្រជុំ ។\n"
-"ថតធំទូលាយ​របស់ក្រុមហ៊ុន​​ជាមួយ​ព្រិត្តិការណ៍​ស្រេចចិត្តដែលមាន​នៅក្នុងវា នឹងប្រើ "
-"\"គ្មាននរណាម្នាក់\" ចាប់​ពី​វាមិនត្រូវបានគេស្គាល់ "
-"ដែលនឹងទៅកាន់​ព្រឹត្តិការណ៍នោះ ។"
+"ម្យ៉ាងវិញ​ទៀត​ ប្រសិនបើ​ក្រុមការងារ​ចែករំលែក​ប្រតិទិន​សម្រាប់ការប្រជុំក្រុម នោះ​អ្នកអាន​ថតទាំងអស់​គួរ​"
+"តែត្រូវបាន​សម្គាល់​ថា រវល់ សម្រាប់​ការប្រជុំ ។\n"
+"ថតធំទូលាយ​របស់ក្រុមហ៊ុន​​ជាមួយ​ព្រិត្តិការណ៍​ស្រេចចិត្តដែលមាន​នៅក្នុងវា នឹងប្រើ \"គ្មាននរណាម្នាក់\" ចាប់​ពី​"
+"វាមិនត្រូវបានគេស្គាល់ ដែលនឹងទៅកាន់​ព្រឹត្តិការណ៍នោះ ។"
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7934,9 +7544,7 @@ msgstr "អ្នកអាន​ថតនេះ"
 #: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
-msgstr ""
-"កា​រកំណត់​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​បិទ​ការ​ជូនដំណឹង​សម្រាប់​ថត​ដែលបាន​ចែករំលែក​ដោយ​"
-"អ្នក​ផ្សេង ។ "
+msgstr "កា​រកំណត់​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​បិទ​ការ​ជូនដំណឹង​សម្រាប់​ថត​ដែលបាន​ចែករំលែក​ដោយ​អ្នក​ផ្សេង ។ "
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -7950,24 +7558,22 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr ""
-"អ្នកបាន​កំណត់រចនា​សម្ព័ន្ធ​ថតនេះ​ឲ្យមាន​ព័ត៌មាន​​កម្មវិធី​ពហុអ្នកប្រើ "
-"និង​ជម្រើស​កំណត់​រចនាសម្ព័ន្ធ​ទូទៅ​ដើម្បីលាក់ថត​កម្មវិធី​ពហុព័ត៌មាន​ដែលបាន​កំណត់"
-" ។ មានន័យថា ថតនេះ​នឹងបាត់​នៅពេល​ដែល​ប្រអប់កំណត់​រចនា​សម្ព័ន្ធ​បាន​បិទ​ម្ដង ។ "
-"ប្រសិនបើ​អ្នកចង់​យក​ថត​ចេញ​ម្ដងទៀត "
-"អ្នកនឹងត្រូវ​បិទ​ការលាក់​​នៃ​ថតព័ត៌មានពហុអ្នកប្រើ​បណ្ដោះអាសន្ន​សិន​ដើម្បី​អាចមើល"
-"​វា​ឃើញ ។"
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"អ្នកបាន​កំណត់រចនា​សម្ព័ន្ធ​ថតនេះ​ឲ្យមាន​ព័ត៌មាន​​កម្មវិធី​ពហុអ្នកប្រើ និង​ជម្រើស​កំណត់​រចនាសម្ព័ន្ធ​ទូទៅ​"
+"ដើម្បីលាក់ថត​កម្មវិធី​ពហុព័ត៌មាន​ដែលបាន​កំណត់ ។ មានន័យថា ថតនេះ​នឹងបាត់​នៅពេល​ដែល​ប្រអប់កំណត់​រចនា​សម្ព័ន្ធ​"
+"បាន​បិទ​ម្ដង ។ ប្រសិនបើ​អ្នកចង់​យក​ថត​ចេញ​ម្ដងទៀត អ្នកនឹងត្រូវ​បិទ​ការលាក់​​នៃ​ថតព័ត៌មានពហុអ្នកប្រើ​"
+"បណ្ដោះអាសន្ន​សិន​ដើម្បី​អាចមើល​វា​ឃើញ ។"
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8036,12 +7642,12 @@ msgstr "មាន​កំហុស​នៅខណៈពេល​ដែល​ក
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "លិបិក្រម​សំបុត្រ​​សម្រាប់ '%1' គឺបានមកពីកំណែ KMail (%2) ដែលមិនស្គាល់មួយ ។\n"
-"លិបិក្រម​នេះ​អាចត្រូវបាន​បង្កើត​ពី​ថត​សំបុត្រ​របស់អ្នក​ម្ដងទៀត "
-"ប៉ុន្តែ​ព័ត៌មាន​មួយចំនួន​​រួមទាំង​ទង់​ស្ថានភាព​អាចត្រូវបាន​បាត់បង់ ។ "
-"តើអ្នកចង់​បន្ទាប​​ឯកសារ​លិបិក្រម​របស់អ្នក​ឬ ?"
+"លិបិក្រម​នេះ​អាចត្រូវបាន​បង្កើត​ពី​ថត​សំបុត្រ​របស់អ្នក​ម្ដងទៀត ប៉ុន្តែ​ព័ត៌មាន​មួយចំនួន​​រួមទាំង​ទង់​ស្ថានភាព​"
+"អាចត្រូវបាន​បាត់បង់ ។ តើអ្នកចង់​បន្ទាប​​ឯកសារ​លិបិក្រម​របស់អ្នក​ឬ ?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8057,8 +7663,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"លិបិក្រម​សំបុត្រ​សម្រាប់ '%1' បាន​ខូច ហើយ​នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​វិញ​ឥឡូវ "
-"ប៉ុន្តែ​ព័ត៌មាន​មួយ​ចំនួន រួម​មាន​ទង់ស្ថានភាព​នឹង​បាត់បង់ ។"
+"លិបិក្រម​សំបុត្រ​សម្រាប់ '%1' បាន​ខូច ហើយ​នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​វិញ​ឥឡូវ ប៉ុន្តែ​ព័ត៌មាន​មួយ​ចំនួន រួម​មាន​"
+"ទង់ស្ថានភាព​នឹង​បាត់បង់ ។"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8066,11 +7672,11 @@ msgstr "មាន​កំហុស​ក្នុង​ការ​បើក %1
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"មានកំហុស​ក្នុងការ​បើក %1 ។ វាអាចមកពី​ថត maildir មិនត្រឹមត្រូវ ឬក៏ "
-"អ្នក​មិនមាន​សិទ្ធិ​ចូលដំណើរការគ្រប់គ្រាន់ ។"
+"មានកំហុស​ក្នុងការ​បើក %1 ។ វាអាចមកពី​ថត maildir មិនត្រឹមត្រូវ ឬក៏ អ្នក​មិនមាន​សិទ្ធិ​"
+"ចូលដំណើរការគ្រប់គ្រាន់ ។"
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8086,9 +7692,7 @@ msgstr "មិនអាច​បន្ថែម​សារ​ទៅកាន់
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
-msgstr ""
-"KMFolderMaildir::addMsg: ការបញ្ចប់​ដោយមិនធម្មតា "
-"ដើម្បី​ការពារ​ពីការបាត់បង់​ទិន្នន័យ ។"
+msgstr "KMFolderMaildir::addMsg: ការបញ្ចប់​ដោយមិនធម្មតា ដើម្បី​ការពារ​ពីការបាត់បង់​ទិន្នន័យ ។"
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8112,20 +7716,15 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>លិបិក្រម​ថត '%2' ហាក់ដូចជា​ផុត​កំណត់ ។ ដើម្បីរារាំង​ការធ្វើ​ឲ្យសារខូច "
-"លិបិក្រម​នឹងត្រូវបាន​បង្កើត​ឡើងវិញ ។ ជា​លទ្ធផល "
-"សារដែលបានលុប​​អាច​លេចឡើង​ម្ដងទៀត​ ហើយ ទង់ស្ថានភាព​អាច​ត្រូវបាន​បាត់បង់ ។</p>"
-"<p>សូម​អាន​ធាតុបញ្ចូល​ទំនាក់ទំនងនៅក្នុង <a href=\"%1\">"
-"ផ្នែក FAQ សៀវភៅដៃ KMail</a> "
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>លិបិក្រម​ថត '%2' ហាក់ដូចជា​ផុត​កំណត់ ។ ដើម្បីរារាំង​ការធ្វើ​ឲ្យសារខូច លិបិក្រម​នឹងត្រូវបាន​បង្កើត​"
+"ឡើងវិញ ។ ជា​លទ្ធផល សារដែលបានលុប​​អាច​លេចឡើង​ម្ដងទៀត​ ហើយ ទង់ស្ថានភាព​អាច​ត្រូវបាន​បាត់បង់ ។</"
+"p><p>សូម​អាន​ធាតុបញ្ចូល​ទំនាក់ទំនងនៅក្នុង <a href=\"%1\">ផ្នែក FAQ សៀវភៅដៃ KMail</a> "
 "សម្រាប់ព័ត៌មាន​អំពី​របៀប​រារាំង​បញ្ហា​នេះ​ពី​ការកើតឡើង​ម្ដងទៀត ។</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -8183,7 +7782,7 @@ msgstr ""
 "'%1' ទំនង​មិន​មែន​ជា​ថត​ឡើយ ។\n"
 "សូម​យក​ឯកសារ​ចេញ​ឲ្យ​ផុត ។"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8191,7 +7790,7 @@ msgstr ""
 "សិទ្ធិ​របស់​ថត​ '%1' មិនត្រឹមត្រូវទេ ។\n"
 "សូម​ប្រាកដ​ថា​អ្នកអាច​មើល និង​កែប្រែមាតិកា​ថត​នេះបាន ។"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8201,17 +7800,17 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"ថត​ដែលមានឈ្មោះ​ដូចគ្នា​ត្រូវ​បាន​លុប​តាំងពី​ការ​មើលសំបុត្រ​ចុងក្រោយ ។ "
-"អ្នក​ត្រូវ​តែ​មើល​សំបុត្រ​សិន មុននឹង​បង្កើត​ថត​ដែល​មាន​ឈ្មោះ​ដូចគ្នា ។"
+"ថត​ដែលមានឈ្មោះ​ដូចគ្នា​ត្រូវ​បាន​លុប​តាំងពី​ការ​មើលសំបុត្រ​ចុងក្រោយ ។ អ្នក​ត្រូវ​តែ​មើល​សំបុត្រ​សិន មុននឹង​បង្កើត​ថត​"
+"ដែល​មាន​ឈ្មោះ​ដូចគ្នា ។"
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "មិនអាច​បង្កើត​ថត"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8308,14 +7907,13 @@ msgstr "ដោះស្រាយបញ្ហា​ឃ្លាំងសម្ង
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>មិនអាច​បង្កើត​ថត <b>%1</b> បានឡើយ "
-"ដោយសារ​សិទ្ធិមិនគ្រប់គ្រាន់នៅលើ​ម៉ាស៊ីនបម្រើ ។ ប្រសិនបើអ្នកគិត "
-"អ្នក​គួរតែអាច​បង្កើត​ថតរង​នៅទីនេះ "
-"ស្នើសុំ​ទៅ​អ្នកគ្រប់គ្រងរបស់​អ្នក​ឲ្យផ្ដល់សិទ្ធិ​ឲ្យអ្នកអាចធ្វើវាបាន ។</qt> "
+"<qt>មិនអាច​បង្កើត​ថត <b>%1</b> បានឡើយ ដោយសារ​សិទ្ធិមិនគ្រប់គ្រាន់នៅលើ​ម៉ាស៊ីនបម្រើ ។ "
+"ប្រសិនបើអ្នកគិត អ្នក​គួរតែអាច​បង្កើត​ថតរង​នៅទីនេះ ស្នើសុំ​ទៅ​អ្នកគ្រប់គ្រងរបស់​អ្នក​ឲ្យផ្ដល់សិទ្ធិ​"
+"ឲ្យអ្នកអាចធ្វើវាបាន ។</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8332,23 +7930,21 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>មិនអាច​ផ្លាស់ទី ឬ​ចម្លង​ថត <b>%1</b> នៅ​ទីនេះ​បាន​ឡើង "
-"ព្រោះ​ឯកសារ​ដែល​មាន​ឈ្មោះ​ដូចគ្នា គឺ​មាន​រួចហើយ ។</qt>"
+"<qt>មិនអាច​ផ្លាស់ទី ឬ​ចម្លង​ថត <b>%1</b> នៅ​ទីនេះ​បាន​ឡើង ព្រោះ​ឯកសារ​ដែល​មាន​ឈ្មោះ​ដូចគ្នា គឺ​មាន​"
+"រួចហើយ ។</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>មិនអាច​ផ្លាស់ទី ឬ​ចម្លងថត <b>%1</b> បានទេ "
-"ព្រោះ​វា​មិន​បាន​ចម្លង​ចប់​សព្វគ្រប់​ដោយ​ខ្លួន​វាឡើយ ។</qt>"
+"<qt>មិនអាច​ផ្លាស់ទី ឬ​ចម្លងថត <b>%1</b> បានទេ ព្រោះ​វា​មិន​បាន​ចម្លង​ចប់​សព្វគ្រប់​ដោយ​ខ្លួន​វាឡើយ ។</"
+"qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
-msgstr ""
-"<qt>មិនអាច​ផ្លាស់ទី ឬ​ចម្លង​ថត <b>%1</b> "
-"ទៅ​ក្នុង​ថតរង​នៅ​ក្រោម​ខ្លួន​វា​បាន​ទេ ។</qt>"
+msgstr "<qt>មិនអាច​ផ្លាស់ទី ឬ​ចម្លង​ថត <b>%1</b> ទៅ​ក្នុង​ថតរង​នៅ​ក្រោម​ខ្លួន​វា​បាន​ទេ ។</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8448,13 +8044,13 @@ msgstr "ថត %1 គឺបានតែ​អាន​ប៉ុណ្ណោះ 
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>តើអ្នកពិតជាង​ចង់​លុប %n សារដែលបាន​ជ្រើស​ឬ ?"
-"<br>ពេលបាន​លុប​ម្ដង នោះពួកវាមិនអាច​​ស្ដារ​វិញ​បានឡើយ ។</qt>"
+"<qt>តើអ្នកពិតជាង​ចង់​លុប %n សារដែលបាន​ជ្រើស​ឬ ?<br>ពេលបាន​លុប​ម្ដង នោះពួកវាមិនអាច​​ស្ដារ​វិញ​"
+"បានឡើយ ។</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8506,153 +8102,144 @@ msgstr ""
 "បរាជ័យ​ក្នុង​ការ​កែប្រែ %1\n"
 "(មិនមាន​សល់​ទំហំ​នៅលើ​ឧបករណ៍​ឬ ?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "សំណើរ​ហត្ថលេខា​វិញ្ញាបនបត្រ"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "សូម​បង្កើត​វិញ្ញាបនបត្រ​ពី​ឯកសារភ្ជាប់ ហើយ​ ត្រឡប់វា​ទៅ​អ្នកផ្ញើ ។"
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
-msgstr ""
-"KMail ត្រូវបាន​កំណត់​ឲ្យនៅ​ក្រៅ​បណ្ដាញ ។ "
-"រាល់ការងារ​នៅលើបណ្ដាញ​ទាំងអស់​ត្រូវបាន​ផ្អាក"
+msgstr "KMail ត្រូវបាន​កំណត់​ឲ្យនៅ​ក្រៅ​បណ្ដាញ ។ រាល់ការងារ​នៅលើបណ្ដាញ​ទាំងអស់​ត្រូវបាន​ផ្អាក"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
-msgstr ""
-"KMail ត្រូវបាន​កំណត់​ឲ្យនៅលើ​បណ្ដាញ ។ រាល់​ការងារនៅលើ​បណ្ដាញ​ទាំងអស់​បាន​បន្ត"
+msgstr "KMail ត្រូវបាន​កំណត់​ឲ្យនៅលើ​បណ្ដាញ ។ រាល់​ការងារនៅលើ​បណ្ដាញ​ទាំងអស់​បាន​បន្ត"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
-msgstr ""
-"បច្ចុប្បន្ន KMail នៅក្នុង​របៀប​ក្រៅបណ្ដាញ ។ តើអ្នក​ចង់​បន្ត​ដោយ​របៀបណា ?"
+msgstr "បច្ចុប្បន្ន KMail នៅក្នុង​របៀប​ក្រៅបណ្ដាញ ។ តើអ្នក​ចង់​បន្ត​ដោយ​របៀបណា ?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "ធ្វើការ​នៅលើ​បណ្ដាញ"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "ធ្វើការ​នៅក្រៅ​បណ្ដាញ"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "អ្នកមិនមាន​សិទ្ធិ​​អាន/សរសេរទៅកាន់​ថតប្រអប់ទទួល​របស់អ្នកឡើយ ។"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "ប្រអប់ចេញ"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "អ្នក​មិនមាន​សិទ្ធិ​អាន​/សរសេរទៅ​ថត​ប្រអប់ចេញរបស់អ្នក​ឡើយ ។"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "សំបុត្រផ្ញើចេញ"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "អ្នក​មិនមាន​សិទ្ធិ​​អាន​/​សរសេរទៅកាន់​ថត​សំបុត្រ​ផ្ញើចេញ​របស់អ្នកឡើយ ។"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "ធុងសំរាម"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "អ្នក​មិនមាន​សិទ្ធិ​អាន/សរសេរទៅកាន់​ថត​ធុងសំរាម​របស់​អ្នកឡើយ ។"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "សេចក្ដី​ព្រាង"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "អ្នកមិនមាន​សិទ្ធិ​អាន​/​សរសេរ​ទៅកាន់​ថត​សេចក្ដី​ព្រាង​របស់អ្នកឡើយ ។"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "ពុម្ព"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "អ្នក​គ្មាន​សិទ្ធិ​អាន/សរសេរ​ទៅ​ថត​ពុម្ព​របស់​អ្នក​ទេ ។"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "​ការស្វែងរក​ចុង​ក្រោយ"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>មានថត <i>%4</i> រួចហើយ ។ ឥឡូវ %1 ប្រើ​ថត <i>%5</i> សម្រាប់​សារ​របស់វា ។"
-"<p>%2 អាចផ្លាស់ទី​មាតិកា​របស់ <i>%6<i> ទៅក្នុង​ថតនេះឲ្យអ្នក "
-"បើតាមគិតទៅ​វា​អាចជំនួស​ឯកសារ​ដែល​មាន​រួច​មួយចំនួន​ដោយដោយឈ្មោះ​ដូចគ្នា​នៅក្នុង "
-"<i>%7</i> ។"
-"<p><strong>តើអ្នកចង់ឲ្យ​ %3 ផ្លាស់ទី​ឯកសារសំបុត្រ​ឥឡូវឬ ?</strong></qt>"
+"<qt>មានថត <i>%4</i> រួចហើយ ។ ឥឡូវ %1 ប្រើ​ថត <i>%5</i> សម្រាប់​សារ​របស់វា ។<p>%2 "
+"អាចផ្លាស់ទី​មាតិកា​របស់ <i>%6<i> ទៅក្នុង​ថតនេះឲ្យអ្នក បើតាមគិតទៅ​វា​អាចជំនួស​ឯកសារ​ដែល​មាន​រួច​មួយចំនួន​"
+"ដោយដោយឈ្មោះ​ដូចគ្នា​នៅក្នុង <i>%7</i> ។<p><strong>តើអ្នកចង់ឲ្យ​ %3 ផ្លាស់ទី​ឯកសារសំបុត្រ​ឥឡូវឬ ?"
+"</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>មានថត <i>%4</i> ។ ឥឡូវ %1 ប្រើ​ថត <i>%5</i> សម្រាប់​សាររបស់វា ។ %2 "
-"អាច​ផ្លាស់ទី​មាតិកា​របស់​ <i>%6</i> ទៅក្នុង​ថតនេះ​ឲ្យអ្នក ។"
-"<p><strong>តើអ្នក​ចង់​ឲ្យ​ %3 ផ្លាស់ទី​ឯកសារ​សំបុត្រ​ឥឡូវ​ឬ ?</strong></qt>"
+"<qt>មានថត <i>%4</i> ។ ឥឡូវ %1 ប្រើ​ថត <i>%5</i> សម្រាប់​សាររបស់វា ។ %2 អាច​ផ្លាស់ទី​មាតិកា​"
+"របស់​ <i>%6</i> ទៅក្នុង​ថតនេះ​ឲ្យអ្នក ។<p><strong>តើអ្នក​ចង់​ឲ្យ​ %3 ផ្លាស់ទី​ឯកសារ​សំបុត្រ​ឥឡូវ​ឬ ?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "ផ្លាស់ទី​ឯកសារ​សំបុត្រ​ឬ ?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
-msgstr ""
-"KMail បាន​ជួបប្រទះ​នឹង​កំហុស​ដ៏ធ្ងន់ធ្ងរ​មួយ ហើយ "
-"នឹង​បញ្ចប់​ដំណើរការ​ក្នុង​ពេល​ឥឡូវ"
+msgstr "KMail បាន​ជួបប្រទះ​នឹង​កំហុស​ដ៏ធ្ងន់ធ្ងរ​មួយ ហើយ នឹង​បញ្ចប់​ដំណើរការ​ក្នុង​ពេល​ឥឡូវ"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
 "The error was:\n"
 "%1"
 msgstr ""
-"KMail បាន​ជួបប្រទះ​នឹង​កំហុស​ដ៏ធ្ងន់ធ្ងរមួយ​ ហើយ​ "
-"នឹងបញ្ចប់ដំណើរការ​ក្នុង​ពេល​ឥឡូវ ។\n"
+"KMail បាន​ជួបប្រទះ​នឹង​កំហុស​ដ៏ធ្ងន់ធ្ងរមួយ​ ហើយ​ នឹងបញ្ចប់ដំណើរការ​ក្នុង​ពេល​ឥឡូវ ។\n"
 "កំហុស​នោះគឺ ៖\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "សម្អាត​ធុងសំរាម"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​សម្អាត​ធុងសំរាម របស់​គណនី​ទាំងអស់​ឬ ?"
 
@@ -8725,8 +8312,7 @@ msgstr "មាន​សារ​ថ្មី %n នៅ​ក្នុង %1"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>មាន​សំបុត្រ​ថ្មី​មក​ដល់ </b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8764,10 +8350,9 @@ msgstr "តើ​អ្នក​ពិត​ជា​ចង់​សម្អា
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
-msgstr ""
-"<qt>តើអ្នក​ពិតជាចង់​ផ្លាស់ទី​សារទាំងអស់ពី​ថត <b>%1</b> ទៅធុងសំរាម​ឬ ?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
+msgstr "<qt>តើអ្នក​ពិតជាចង់​ផ្លាស់ទី​សារទាំងអស់ពី​ថត <b>%1</b> ទៅធុងសំរាម​ឬ ?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8791,11 +8376,11 @@ msgstr "​លុប​ការស្វែងរក"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>តើអ្នកពិតជា​ចង់​លុប​ការស្វែងរក <b>%1</b>ឬ ?"
-"<br>សារ​មួយចំនួន​ដែលបាន​បង្ហាញ​នឹងនៅតែមាន​នៅក្នុង​ថតដើម​របស់ពួកវា ។</qt>"
+"<qt>តើអ្នកពិតជា​ចង់​លុប​ការស្វែងរក <b>%1</b>ឬ ?<br>សារ​មួយចំនួន​ដែលបាន​បង្ហាញ​នឹងនៅតែមាន​នៅក្នុង​"
+"ថតដើម​របស់ពួកវា ។</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8807,39 +8392,40 @@ msgstr "<qt>តើអ្នកពិតជា​ចង់លុប​ថតទ�
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>តើអ្នក​ពិតជាចង់​លុប​ថតទទេ <b>%1</b> ហើយនិង​ ថតរង​របស់​វាទាំងអស់ឬ ? "
-"ថតរង​ទាំងនោះ​អាច​មិនទទេឡើយ ហើយ មាតិកា​របស់ពួកវា​ក៏នឹងត្រូវបាន​បោះចោល​ផងដែរ ។ "
-"<p><b>ប្រយ័ត្ន</b>ថាសារដែលត្រូវ​បោះចោល​​​គឺមិនត្រូវបាន​រក្សាទុក​ទៅក្នុង​ថតធុងសំរ"
-"ាម​របស់អ្នកឡើយ ហើយ ត្រូវបាន​លុប​ជារៀងរហូត ។</qt>"
+"<qt>តើអ្នក​ពិតជាចង់​លុប​ថតទទេ <b>%1</b> ហើយនិង​ ថតរង​របស់​វាទាំងអស់ឬ ? ថតរង​ទាំងនោះ​អាច​"
+"មិនទទេឡើយ ហើយ មាតិកា​របស់ពួកវា​ក៏នឹងត្រូវបាន​បោះចោល​ផងដែរ ។ <p><b>ប្រយ័ត្ន</b>ថាសារដែលត្រូវ​"
+"បោះចោល​​​គឺមិនត្រូវបាន​រក្សាទុក​ទៅក្នុង​ថតធុងសំរាម​របស់អ្នកឡើយ ហើយ ត្រូវបាន​លុប​ជារៀងរហូត ។</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>តើអ្នកពិតជា​ចង់​លុប​ថត <b>%1</b> ដែលធ្វើការ​បោះចោល​មាតិកា​របស់វាឬ ? "
-"<p><b>ប្រយ័ត្ន</b>ថាសារ​ដែលបានបោះចោល​មិនត្រូវបាន​រក្សាទុក​ទៅក្នុង​ថតធុងសំរាម​របស"
-"់អ្នកឡើយ ហើយ ត្រូវបាន​លុប​ជារៀងរហូត ។</qt>"
+"<qt>តើអ្នកពិតជា​ចង់​លុប​ថត <b>%1</b> ដែលធ្វើការ​បោះចោល​មាតិកា​របស់វាឬ ? <p><b>ប្រយ័ត្ន</"
+"b>ថាសារ​ដែលបានបោះចោល​មិនត្រូវបាន​រក្សាទុក​ទៅក្នុង​ថតធុងសំរាម​របស់អ្នកឡើយ ហើយ ត្រូវបាន​លុប​"
+"ជារៀងរហូត ។</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>តើអ្នក​ពិត​ជា​ចង់​លុប​ថត <b>%1</b> ហើយនឹង​​ថតរងរបស់​វាទាំងអស់​ "
-"ដែល​ធ្វើការ​បោះចោល​មាតិកា​របស់វាឬ ? "
-"<p><b>ប្រយ័ត្ន</b>ថាសារដែលបាន​បោះចោល​មិនត្រូវបាន​រក្សាទុក​នៅក្នុង​ថតធុងសំរាម​របស"
-"់អ្នកឡើយ ហើយ​ត្រូវបានលុប​ជារៀងរហូត ។</qt>"
+"<qt>តើអ្នក​ពិត​ជា​ចង់​លុប​ថត <b>%1</b> ហើយនឹង​​ថតរងរបស់​វាទាំងអស់​ ដែល​ធ្វើការ​បោះចោល​មាតិកា​"
+"របស់វាឬ ? <p><b>ប្រយ័ត្ន</b>ថាសារដែលបាន​បោះចោល​មិនត្រូវបាន​រក្សាទុក​នៅក្នុង​ថតធុងសំរាម​"
+"របស់អ្នកឡើយ ហើយ​ត្រូវបានលុប​ជារៀងរហូត ។</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "​បាន​លុប"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8847,8 +8433,7 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "តើអ្នកពិត​ជាចង់​ធ្វើ​ឲ្យ​ឃ្លាំងសម្ងាត់ IMAP ស្រស់ឬ ?\n"
-"ការនេះ​នឹង​យក​រាល់ការផ្លាស់ប្ដូរ​ដែលអ្នកបានធ្វើ​តាមតំបន់​ទៅថត IMAP "
-"របស់អ្នក​ចេញ ។"
+"ការនេះ​នឹង​យក​រាល់ការផ្លាស់ប្ដូរ​ដែលអ្នកបានធ្វើ​តាមតំបន់​ទៅថត IMAP របស់អ្នក​ចេញ ។"
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8856,14 +8441,13 @@ msgstr "តើអ្នកពិតជាចង់​ឲ្យ​សារចា
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"ការប្រើ​នៃ​ HTML នៅក្នុង​សំបុត្រ​នឹង​ធ្វើឲ្យអ្នក​កាន់តែទទួលការការពារ​ពី "
-"\"សារឥតបានការ\" និង​អាច​បង្កើន​ភាព​ដែលដូចគ្នា "
-"ដែលប្រព័ន្ធរបស់អ្នកនឹងត្រូវបាន​ស្រុះស្រួល​ដោយការបង្ហាញ​ផ្សេងទៀត "
-"និង​ការទាញយក​សុវត្ថិភាពដែលបាន​ស្មានទុក ។"
+"ការប្រើ​នៃ​ HTML នៅក្នុង​សំបុត្រ​នឹង​ធ្វើឲ្យអ្នក​កាន់តែទទួលការការពារ​ពី \"សារឥតបានការ\" និង​អាច​"
+"បង្កើន​ភាព​ដែលដូចគ្នា ដែលប្រព័ន្ធរបស់អ្នកនឹងត្រូវបាន​ស្រុះស្រួល​ដោយការបង្ហាញ​ផ្សេងទៀត និង​ការទាញយក​"
+"សុវត្ថិភាពដែលបាន​ស្មានទុក ។"
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8876,14 +8460,12 @@ msgstr "ប្រើ HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"ការផ្ទុក​​សេចក្ដីយោង​ខាងក្រៅ​នៅក្នុង​សំបុត្រ html "
-"នឹងធ្វើ​ឲ្យអ្នក​កាន់តែ​ទទួលការពារ​ពី\"សារឥតបានការ\" ហើយ "
-"អាច​បង្កើន​ភាព​ដែល​ដូច​គ្នា "
-"ដែលប្រព័ន្ធ​របស់​អ្នក​នឹង​ត្រូវបាន​ស្រុះស្រួល​ដោយការបង្ហាញ​ផ្សេងទៀត "
-"និង​ការទាញ​យក​សុវត្ថិភាព​ដែល​បាន​ស្មានទុក ។"
+"ការផ្ទុក​​សេចក្ដីយោង​ខាងក្រៅ​នៅក្នុង​សំបុត្រ html នឹងធ្វើ​ឲ្យអ្នក​កាន់តែ​ទទួលការពារ​ពី\"សារឥតបានការ\" "
+"ហើយ អាច​បង្កើន​ភាព​ដែល​ដូច​គ្នា ដែលប្រព័ន្ធ​របស់​អ្នក​នឹង​ត្រូវបាន​ស្រុះស្រួល​ដោយការបង្ហាញ​ផ្សេងទៀត និង​"
+"ការទាញ​យក​សុវត្ថិភាព​ដែល​បាន​ស្មានទុក ។"
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8899,12 +8481,11 @@ msgstr "តម្រង​នៅលើ​បញ្ជី​សំបុត្រ
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"ការឆ្លើយតប​ពេល​នៅក្រៅការិយាល័យ​របស់ KMail ដែលអាច​ដើរបាន "
-"ឆ្លើយតប​នៅលើ​តម្រង​ផ្នែក​ម៉ាស៊ីនបម្រើ​ ។ "
+"ការឆ្លើយតប​ពេល​នៅក្រៅការិយាល័យ​របស់ KMail ដែលអាច​ដើរបាន ឆ្លើយតប​នៅលើ​តម្រង​ផ្នែក​ម៉ាស៊ីនបម្រើ​ ។ "
 "អ្នកមិនទាន់បាន​កំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនបម្រើ IMAP សម្រាប់ការនេះនៅឡើយទេ ។\n"
 "អ្នកអាច​ធ្វើការនេះ​នៅលើ​ថេប \"តម្រង\" នៃ​ការកំណត់រចនា​សម្ព័ន្ធ​គណនី​ IMAP ។"
 
@@ -8917,16 +8498,15 @@ msgstr "មិនបាន​កំណត់​រចនា​សម្ព័ន
 msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
-msgstr ""
-"មិនអាចចាប់ផ្ដើម​អ្នកគ្រប់គ្រង​​វិញ្ញាបនបត្រ​បានឡើយ ។ "
-"សូម​ពិនិត្យ​មើល​ការដំឡើង​របស់អ្នក ។"
+msgstr "មិនអាចចាប់ផ្ដើម​អ្នកគ្រប់គ្រង​​វិញ្ញាបនបត្រ​បានឡើយ ។ សូម​ពិនិត្យ​មើល​ការដំឡើង​របស់អ្នក ។"
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"មិនអាច​ចាប់ផ្ដើម​កម្មវិធី​មើល​​កំណត់ហេតុ GnuPG (kwatchgnupg) បានឡើយ ។ "
-"សូម​ពិនិត្យ​មើល​ការដំឡើង​របស់អ្នក ។"
+"មិនអាច​ចាប់ផ្ដើម​កម្មវិធី​មើល​​កំណត់ហេតុ GnuPG (kwatchgnupg) បានឡើយ ។ សូម​ពិនិត្យ​មើល​ការដំឡើង​"
+"របស់អ្នក ។"
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9227,8 +8807,7 @@ msgstr "សម្គាល់​ខ្សែស្រឡាយ​ជា​ធា
 
 #: kmmainwidget.cpp:2966
 msgid "Remove &Action Item Thread Mark"
-msgstr ""
-"យក​ធាតុ​សកម្មភាព​ចេញ​ កា​រសម្គាល់​ខ្សែស្រឡាយRemove &Action Item Thread Mark"
+msgstr "យក​ធាតុ​សកម្មភាព​ចេញ​ កា​រសម្គាល់​ខ្សែស្រឡាយRemove &Action Item Thread Mark"
 
 #: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
@@ -9246,8 +8825,7 @@ msgstr "រក្សាទុក​ឯកសារ​ភ្ជាប់..."
 msgid "Appl&y All Filters"
 msgstr "អនុវត្ត​​គ្រប់​តម្រង​ទាំងអស់"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "អនុវត្ត​តម្រង"
@@ -9359,7 +8937,6 @@ msgstr "សារ​មិន​ទាន់អាន​បន្ទាប់"
 msgid "Go to the next unread message"
 msgstr "ទៅកាន់​សារ​មិនទាន់អាន​បន្ទាប់"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "សារ​មុន"
@@ -9407,8 +8984,7 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"រមូរ​សារ​បច្ចុប្បន្ន​ចុះក្រោម ។ ប្រសិន​បើ​នៅខាងចុងសារបច្ចុប្បន្ន "
-"សូមទៅកាន់​សារ​មិនទាន់អាន​បច្ចុប្បន្ន ។"
+"រមូរ​សារ​បច្ចុប្បន្ន​ចុះក្រោម ។ ប្រសិន​បើ​នៅខាងចុងសារបច្ចុប្បន្ន សូមទៅកាន់​សារ​មិនទាន់អាន​បច្ចុប្បន្ន ។"
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9496,70 +9072,65 @@ msgstr " កំពុង​ចាប់​ផ្ដើម..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "សារ​នេះ​មាន​សំណើរ​មួយ​ដែលត្រូវ​ត្រឡប់​ការជូនដំណឹង​​អំពី​សារស្វាគមន៍​របស់អ្នក ។\n"
-"អ្នក​អាច​មិនអើពើ​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើចម្លើយ \"បដិសេធ\" ឬ "
-"ធម្មតា​ក៏បាន ។"
+"អ្នក​អាច​មិនអើពើ​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើចម្លើយ \"បដិសេធ\" ឬ ធម្មតា​ក៏បាន ។"
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "សារ​នេះ​មាន​សំណើរ​ដែលត្រូវ​ផ្ញើ​ការជូន​ដំណឹង​អំពី​ការសារស្វាគមន៍​របស់អ្នក​ ។\n"
-"វា​មាន​ការណែនាំ​ដំណើរការដែលត្រូវបាន​សម្គាល់ថា \"បានទាមទារ\" ប៉ុន្តែ​ KMail "
-"មិនស្គាល់ ។\n"
-"អ្នក​អាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬអនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល "
-"\"បានបរាជ័យ\" ក៏បាន ។"
+"វា​មាន​ការណែនាំ​ដំណើរការដែលត្រូវបាន​សម្គាល់ថា \"បានទាមទារ\" ប៉ុន្តែ​ KMail មិនស្គាល់ ។\n"
+"អ្នក​អាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬអនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល \"បានបរាជ័យ\" ក៏បាន ។"
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "សារ​នេះ​មាន​សំណើរ​ដែលត្រូវផ្ញើ​ការជូន​ដំណឹង​អំពី​សារស្វាគមន៍​របស់អ្នក\n"
-"ប៉ុន្តែ​វា​ត្រូវ​បាន​ដាក់ស្នើ​ដើម្បី​ផ្ញើ​ការជូន​ដំណឹង​ទៅកាន់​អាសយដ្ឋាន​ច្រើនជាង"
-"​មួយ ។\n"
-"អ្នកអាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល​បាន​ "
-"\"បដិសេធ\" ឬ ធម្មតា​ក៏បាន ។"
+"ប៉ុន្តែ​វា​ត្រូវ​បាន​ដាក់ស្នើ​ដើម្បី​ផ្ញើ​ការជូន​ដំណឹង​ទៅកាន់​អាសយដ្ឋាន​ច្រើនជាង​មួយ ។\n"
+"អ្នកអាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល​បាន​ \"បដិសេធ\" ឬ ធម្មតា​"
+"ក៏បាន ។"
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "សារ​នេះ​មាន​សំណើរ​ដែល​ត្រូវ​ផ្ញើ​ការជូន​ដំណឹង​អំពី​សារស្វាគមន៍​របស់អ្នក\n"
 "ប៉ុន្តែ​មិនមាន​​​ផ្លូវ​ដែល​ត្រឡប់​បាន​កំណត់​ឡើយ ។\n"
-"អ្នកអាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល​បាន​ "
-"\"បដិសេធ\" ឬ ធម្មតា​ក៏បាន ។"
+"អ្នកអាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល​បាន​ \"បដិសេធ\" ឬ ធម្មតា​ក៏បាន "
+"។"
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "សារ​នេះ​មាន​សំណើរ​ដែល​ត្រូវ​ផ្ញើ​ការជូន​ដំណឹង​អំពី​សារស្វាគមន៍​របស់អ្នក\n"
-"ប៉ុន្តែ​អាសយដ្ឋាន​ផ្លូវ​ត្រឡប់​ខុស​ពី​អាសយដ្ឋាន​​ត្រង់ថា​ការជូន​ដំណឹង​ត្រូវបាន​ដ"
-"ាក់ស្នើ​ដើម្បី​ឲ្យ​បាន​ផ្ញើ​ចេញ ។\n"
-"អ្នកអាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល​បាន​ "
-"\"បដិសេធ\" ឬ ធម្មតា​ក៏បាន ។"
+"ប៉ុន្តែ​អាសយដ្ឋាន​ផ្លូវ​ត្រឡប់​ខុស​ពី​អាសយដ្ឋាន​​ត្រង់ថា​ការជូន​ដំណឹង​ត្រូវបាន​ដាក់ស្នើ​ដើម្បី​ឲ្យ​បាន​ផ្ញើ​ចេញ ។\n"
+"អ្នកអាច​មិនអើពើ​នឹង​សំណើរ​ក៏បាន ឬ អនុញ្ញាត​ឲ្យ KMail ផ្ញើ​ចម្លើយ​ដែល​បាន​ \"បដិសេធ\" ឬ ធម្មតា​"
+"ក៏បាន ។"
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9577,24 +9148,22 @@ msgstr "​ផ្ញើ"
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
-msgstr ""
-"បឋមកថា \"ជម្រើស​ការ​ជូន​ដំណឹង​អំពី​ការ​រៀបចំ\" មានការទាមទារ "
-"ប៉ុន្តែ​មិនស្គាល់​ប៉ារ៉ាម៉ែត្រ"
+msgstr "បឋមកថា \"ជម្រើស​ការ​ជូន​ដំណឹង​អំពី​ការ​រៀបចំ\" មានការទាមទារ ប៉ុន្តែ​មិនស្គាល់​ប៉ារ៉ាម៉ែត្រ"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "បង្កាន់ដៃ ៖ "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "ឯកសារភ្ជាប់ ៖ %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "ឯកសារ​ភ្ជាប់​ត្រូវ​បាន​លុប​ហើយ ។"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "ឯកសារ​ភ្ជាប់ '%1' ត្រូវ​បានលុប ។"
 
@@ -9642,48 +9211,36 @@ msgstr "លក្ខណៈ​សម្បត្តិ​ផ្នែក​នៃ
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> <em>ប្រភេទ MIME</em> របស់​ឯកសារ ៖</p>"
-"<p>ជាធម្មតា ចាប់ពី​ប្រភេទ​នៃ​ឯកសារ​​ត្រូវបាន​ពិនិត្យ​ដោយស្វ័យប្រវត្តិមក "
-"គឺ​អ្នក​មិន​ត្រូវ​ប៉ះពាល់​ការកំណត់​នេះឡើយ ។ ប៉ុន្តែ​ ជួនកាល %1 "
-"មិនអាច​រក​ប្រភេទ​បាន​ត្រឹមត្រូវឡើយ -- "
-"ទី​នេះ​ជាកន្លែង​ដែល​អ្នក​អាច​ជួសជុល​វាបាន ។</p></qt>"
+"<qt><p> <em>ប្រភេទ MIME</em> របស់​ឯកសារ ៖</p><p>ជាធម្មតា ចាប់ពី​ប្រភេទ​នៃ​ឯកសារ​​ត្រូវបាន​"
+"ពិនិត្យ​ដោយស្វ័យប្រវត្តិមក គឺ​អ្នក​មិន​ត្រូវ​ប៉ះពាល់​ការកំណត់​នេះឡើយ ។ ប៉ុន្តែ​ ជួនកាល %1 មិនអាច​រក​ប្រភេទ​បាន​"
+"ត្រឹមត្រូវឡើយ -- ទី​នេះ​ជាកន្លែង​ដែល​អ្នក​អាច​ជួសជុល​វាបាន ។</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ទំហំ​របស់​ផ្នែក ៖</p>"
-"<p>ជួនកាល %1 នឹង​បាន​តែ​ផ្ដល់​នូវ​ទំហំ​ដែល​បាន​វាយតម្លៃនៅទីនេះ "
-"ព្រោះ​​ការគណនា​អំពី​ទំហំ​ពិតប្រាកដ​នឹង​ត្រូវ​ចំណាយ​ពេល​ច្រើន​ណាស់ ។ "
-"នៅពេល​ដែល​ដូច​នោះ វា​នឹងត្រូវ​បាន​ធ្វើ​ឲ្យ​មើល​ឃើញដោយបន្ថែម \"(est.)\" "
-"ទៅកាន់​ទំហំ​​ដែលបាន​បង្ហាញ ។</p></qt>"
+"<qt><p>ទំហំ​របស់​ផ្នែក ៖</p><p>ជួនកាល %1 នឹង​បាន​តែ​ផ្ដល់​នូវ​ទំហំ​ដែល​បាន​វាយតម្លៃនៅទីនេះ ព្រោះ​​"
+"ការគណនា​អំពី​ទំហំ​ពិតប្រាកដ​នឹង​ត្រូវ​ចំណាយ​ពេល​ច្រើន​ណាស់ ។ នៅពេល​ដែល​ដូច​នោះ វា​នឹងត្រូវ​បាន​ធ្វើ​ឲ្យ​មើល​"
+"ឃើញដោយបន្ថែម \"(est.)\" ទៅកាន់​ទំហំ​​ដែលបាន​បង្ហាញ ។</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ឈ្មោះ​ឯកសារ​របស់​ផ្នែក ៖</p>"
-"<p>ទោះ​បី​ជា​​វា​ធ្វើ​លំនាំដើម​ទៅកាន់​ឈ្មោះ​នៃ​ឯកសារ​ភ្ជាប់ "
-"វា​មិន​បញ្ជាក់​ឯកសារ​​ដែល​ត្រូវ​បាន​ភ្ជាប់​នោះទេ ។ បែបហ្នឹង​ដែរ "
-"វា​ផ្ដល់​យោបល់​អំពី​ឈ្មោះ​ឯកសារ​ដែល​ត្រូវបាន​ប្រើ​ដោយភ្នាក់ងារ​សំបុត្រ​របស់​អ្នក"
-"​ទទួល​នៅពេល​ដែល​កំពុង​រក្សាទុក​ផ្នែក​ទៅ​កាន់​ថាស ។</p></qt>"
+"<qt><p>ឈ្មោះ​ឯកសារ​របស់​ផ្នែក ៖</p><p>ទោះ​បី​ជា​​វា​ធ្វើ​លំនាំដើម​ទៅកាន់​ឈ្មោះ​នៃ​ឯកសារ​ភ្ជាប់ វា​មិន​"
+"បញ្ជាក់​ឯកសារ​​ដែល​ត្រូវ​បាន​ភ្ជាប់​នោះទេ ។ បែបហ្នឹង​ដែរ វា​ផ្ដល់​យោបល់​អំពី​ឈ្មោះ​ឯកសារ​ដែល​ត្រូវបាន​ប្រើ​"
+"ដោយភ្នាក់ងារ​សំបុត្រ​របស់​អ្នក​ទទួល​នៅពេល​ដែល​កំពុង​រក្សាទុក​ផ្នែក​ទៅ​កាន់​ថាស ។</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9691,18 +9248,14 @@ msgstr "​ការ​ពិពណ៌នា ៖"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>សេចក្ដី​ពណ៌នា​អំពី​ផ្នែក ៖</p>"
-"<p>នេះ​គ្រាន់​តែ​ជា​ព័ត៌មាន​មួយ​នៃ​សេចក្ដី​ពណ៌នា​អំពី​ផ្នែក ដែលភាគច្រើន​ដូចជា "
-"ប្រធាន​បទ គឺ​សម្រាប់​សារ​ទាំងមូល ។ "
-"ភ្នាក់ងារ​សំបុត្រ​ភាគ​ច្រើន​បំផុត​នឹង​បង្ហាញ​ព័ត៌មាន​នេះ​នៅក្នុង​​ការមើល​សារ​របស"
-"់​ពួក​គេ​ជាមុន​​តាម​ផ្នែក​រូបតំណាង​របស់​ឯកសារ​ភ្ជាប់ ។</p></qt>"
+"<qt><p>សេចក្ដី​ពណ៌នា​អំពី​ផ្នែក ៖</p><p>នេះ​គ្រាន់​តែ​ជា​ព័ត៌មាន​មួយ​នៃ​សេចក្ដី​ពណ៌នា​អំពី​ផ្នែក ដែលភាគច្រើន​"
+"ដូចជា ប្រធាន​បទ គឺ​សម្រាប់​សារ​ទាំងមូល ។ ភ្នាក់ងារ​សំបុត្រ​ភាគ​ច្រើន​បំផុត​នឹង​បង្ហាញ​ព័ត៌មាន​នេះ​នៅក្នុង​​ការមើល​"
+"សារ​របស់​ពួក​គេ​ជាមុន​​តាម​ផ្នែក​រូបតំណាង​របស់​ឯកសារ​ភ្ជាប់ ។</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9710,23 +9263,19 @@ msgstr "ការ​អ៊ិនកូដ ៖"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>អ៊ិនកូឌីង​ការដឹកជញ្ជូន​របស់ផ្នែកនេះ ៖</p>"
-"<p>ជាទូទៅ អ្នក​មិនត្រូវផ្លាស់ប្ដូរ​វាទេ គឺចាប់ពី​ %1 "
-"នឹងប្រើ​សំណុំតួអក្សរលំនាំដើម​ដែលសមរម្យ ដោយផ្អែក​លើប្រភេទ MIME ។ ពេលខ្លះ​ "
-"អ្នកនៅអាចកាត់បន្ថយ​ទំហំ​នៃលទ្ធផល​សារ​ដែលសំខាន់ ឧទាហរណ៍. ប្រសិនបើ​ឯកសារ "
-"PostScript មិនមាន​ទិន្នន័យគោលពីរ ប៉ុន្តែ​មាន​អត្ថបទសុទ្ធ -- ក្នុងករណីនេះ "
-"ការជ្រើស \"អត្ថបទដកស្រង់ដែលអាចបោះពុម្ពបាន\" នៅលើ​ \"គោល 64\" លំនាំដើម "
-"នឹងសន្សំបាន 25% នៅក្នុង​ទំហំសារលទ្ធផល ។</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>អ៊ិនកូឌីង​ការដឹកជញ្ជូន​របស់ផ្នែកនេះ ៖</p><p>ជាទូទៅ អ្នក​មិនត្រូវផ្លាស់ប្ដូរ​វាទេ គឺចាប់ពី​ %1 "
+"នឹងប្រើ​សំណុំតួអក្សរលំនាំដើម​ដែលសមរម្យ ដោយផ្អែក​លើប្រភេទ MIME ។ ពេលខ្លះ​ អ្នកនៅអាចកាត់បន្ថយ​ទំហំ​"
+"នៃលទ្ធផល​សារ​ដែលសំខាន់ ឧទាហរណ៍. ប្រសិនបើ​ឯកសារ PostScript មិនមាន​ទិន្នន័យគោលពីរ ប៉ុន្តែ​មាន​"
+"អត្ថបទសុទ្ធ -- ក្នុងករណីនេះ ការជ្រើស \"អត្ថបទដកស្រង់ដែលអាចបោះពុម្ពបាន\" នៅលើ​ \"គោល 64\" "
+"លំនាំដើម នឹងសន្សំបាន 25% នៅក្នុង​ទំហំសារលទ្ធផល ។</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9734,20 +9283,15 @@ msgstr "ផ្ដល់​យោបល់​ឲ្យ​បង្ហាញ​ដ
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ធីក​ជម្រើស​នេះ ប្រសិនបើ​អ្នក​ចង់​ផ្ដល់យោបល់​ទៅ​អ្នកទទួល បង្ហាញ​ "
-"(នៅក្នុង​បណ្ដាញ) នៃ​ផ្នែក​នេះ​នៅក្នុង​ការមើល​សារជាមុន "
-"ជំនួសឲ្យទិដ្ឋភ​​រូបតំណាង​លំនាំដើម ។</p>"
-"<p>តាម​លក្ខណៈបច្ចេកទេស វាត្រូវបាន​អនុវត្ត​ដោយ​ការកំណត់វាល​បឋមកថា<em>"
-"Cការជូន​ដំណឹង​អំពី​មាតិកា</em> ​របស់ផ្នែក​នេះទៅ \"ក្នុងបណ្ដាញ\" "
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>ធីក​ជម្រើស​នេះ ប្រសិនបើ​អ្នក​ចង់​ផ្ដល់យោបល់​ទៅ​អ្នកទទួល បង្ហាញ​ (នៅក្នុង​បណ្ដាញ) នៃ​ផ្នែក​នេះ​"
+"នៅក្នុង​ការមើល​សារជាមុន ជំនួសឲ្យទិដ្ឋភ​​រូបតំណាង​លំនាំដើម ។</p><p>តាម​លក្ខណៈបច្ចេកទេស វាត្រូវបាន​"
+"អនុវត្ត​ដោយ​ការកំណត់វាល​បឋមកថា<em>Cការជូន​ដំណឹង​អំពី​មាតិកា</em> ​របស់ផ្នែក​នេះទៅ \"ក្នុងបណ្ដាញ\" "
 "ជំនួស​ឲ្យ​\"ឯកសារភ្ជាប់\"លំនាំដើម ។</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
@@ -9756,16 +9300,12 @@ msgstr "ចុះហត្ថលេខា​នៅផ្នែក​នេះ"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ធីក​ជម្រើស​នេះ ប្រសិន​បើ​អ្នក​ចង់​ឲ្យផ្នែក​សារ​នេះ​ត្រូវបាន​ចុះហត្ថលេខា ។</p>"
-"<p>ហត្ថលេខា "
-"នឹងត្រូវបាន​បង្កើត​ជាមួយ​សោ​ដែល​អ្នក​ភ្ជាប់​ជាមួយ​អត្តសញ្ញាណ​​ដែលបាន​ជ្រើស​បច្ចុ"
-"ប្បន្ន ។</p></qt>"
+"<qt><p>ធីក​ជម្រើស​នេះ ប្រសិន​បើ​អ្នក​ចង់​ឲ្យផ្នែក​សារ​នេះ​ត្រូវបាន​ចុះហត្ថលេខា ។</p><p>ហត្ថលេខា "
+"នឹងត្រូវបាន​បង្កើត​ជាមួយ​សោ​ដែល​អ្នក​ភ្ជាប់​ជាមួយ​អត្តសញ្ញាណ​​ដែលបាន​ជ្រើស​បច្ចុប្បន្ន ។</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9773,13 +9313,11 @@ msgstr "អ៊ិនគ្រីប​ផ្នែក​នេះ"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ធីក​ជម្រើស​នេះ ប្រសិន​បើអ្នក​ចង់​ឲ្យ​ផ្នែក​សារ​នេះ​ត្រូវបាន​អ៊ិនគ្រីប ។</p>"
-"<p>ផ្នែក​នឹងត្រូវ​បាន​អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​សារ​នេះ</p></qt>"
+"<qt><p>ធីក​ជម្រើស​នេះ ប្រសិន​បើអ្នក​ចង់​ឲ្យ​ផ្នែក​សារ​នេះ​ត្រូវបាន​អ៊ិនគ្រីប ។</p><p>ផ្នែក​នឹងត្រូវ​បាន​"
+"អ៊ិនគ្រីប​សម្រាប់​អ្នកទទួល​សារ​នេះ</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9793,15 +9331,12 @@ msgstr "តម្រង POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"សារ​ដែលត្រូវ​ត្រង​បាន​រកឃើញ​នៅលើ​គណនី POP ៖ <b>%1</b>"
-"<p>សារបាន​បង្ហាញ​លើសពី​ទំហំ​កំណត់​អតិបរមា ដែលអ្នក​បាន​កំណត់​សម្រាប់​គណនី​នេះ ។"
-"<br>អ្នក​អាច​ជ្រើស​​នូវអ្វី​ដែលអ្នក​ចង់​ធ្វើ​ជាមួយ​ពួកវា​ដោយ​ចុច​ប៊ូតុង​ល្មម ។"
+"សារ​ដែលត្រូវ​ត្រង​បាន​រកឃើញ​នៅលើ​គណនី POP ៖ <b>%1</b><p>សារបាន​បង្ហាញ​លើសពី​ទំហំ​កំណត់​អតិបរមា "
+"ដែលអ្នក​បាន​កំណត់​សម្រាប់​គណនី​នេះ ។<br>អ្នក​អាច​ជ្រើស​​នូវអ្វី​ដែលអ្នក​ចង់​ធ្វើ​ជាមួយ​ពួកវា​ដោយ​ចុច​ប៊ូតុង​ល្មម ។"
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9813,9 +9348,7 @@ msgstr "កំណត់​ច្បាប់​សារ​ដែលបាន​
 
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
-msgstr ""
-"បង្ហាញ​សារ​ដែលបាន​ផ្គូរផ្គង​ដោយ​ការកំណត់​ច្បាប់ និង​ដែលបាន​ដាក់ស្លាក 'ទាញយក' ឬ "
-"'លុប'"
+msgstr "បង្ហាញ​សារ​ដែលបាន​ផ្គូរផ្គង​ដោយ​ការកំណត់​ច្បាប់ និង​ដែលបាន​ដាក់ស្លាក 'ទាញយក' ឬ 'លុប'"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10053,40 +9586,38 @@ msgstr "កម្មវិធី​ផ្ញើ​អ៊ីមែល សម្�
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>កំពុង​ទៅ​ប្រមូល​យក​មាតិកា​ថត</h2>"
-"<p>សូម​រង់ចាំ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>កំពុង​ទៅ​ប្រមូល​យក​មាតិកា​ថត</h2><p>សូម​រង់ចាំ . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>ក្រៅប្រព័ន្ធ</h2>"
-"<p>បច្ចុប្បន្ន KMail គឺ​នៅក្នុងរបៀប​ក្រៅ​បណ្ដាញ ។ សូម​ចុច <a "
-"href=\"kmail:goOnline\">នៅទីនេះ</a> ដើម្បី​នៅលើបណ្ដាញ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>ក្រៅប្រព័ន្ធ</h2><p>បច្ចុប្បន្ន KMail គឺ​នៅក្នុងរបៀប​ក្រៅ​"
+"បណ្ដាញ ។ សូម​ចុច <a href=\"kmail:goOnline\">នៅទីនេះ</a> ដើម្បី​នៅលើបណ្ដាញ . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10094,16 +9625,15 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>សូមស្វាគមន៍​មក​កាន់ KMail %1</h2>"
-"<p>KMail គឺ​ជា​កម្មវិធី​ផ្ញើ​អ៊ីមែល សម្រាប់​បរិស្ថាន​ផ្ទៃតុ K ។</p>\n"
-"<ul>"
-"<li>KMail មាន​លក្ខណៈពិសេសៗ​អស្ចារ្យ​ជាច្រើន "
-"ដែល​ត្រូវ​បានពណ៌នា​យ៉ាង​ក្បោះក្បាយ​នៅ​ក្នុង <a href=\"%2\">ឯកសារ</a></li>\n"
-"<li>អ្នក​អាច​រកមើល​កំណែ​ថ្មីៗ​របស់ KMail នៅ​ក្នុង <a href=\"%3\">"
-"គេហទំព័រ​របស់​វា</A> ។</li></ul>\n"
+"<h2 style='margin-top: 0px;'>សូមស្វាគមន៍​មក​កាន់ KMail %1</h2><p>KMail គឺ​ជា​កម្មវិធី​ផ្ញើ​"
+"អ៊ីមែល សម្រាប់​បរិស្ថាន​ផ្ទៃតុ K ។</p>\n"
+"<ul><li>KMail មាន​លក្ខណៈពិសេសៗ​អស្ចារ្យ​ជាច្រើន ដែល​ត្រូវ​បានពណ៌នា​យ៉ាង​ក្បោះក្បាយ​នៅ​ក្នុង <a "
+"href=\"%2\">ឯកសារ</a></li>\n"
+"<li>អ្នក​អាច​រកមើល​កំណែ​ថ្មីៗ​របស់ KMail នៅ​ក្នុង <a href=\"%3\">គេហទំព័រ​របស់​វា</A> ។</li></"
+"ul>\n"
 "%8\n"
-"<p>លក្ខណៈពិសេស​មួយ​ចំនួន​នៃ​លក្ខណៈពិសេស​ថ្មីៗ​នៅ​ក្នុង​ការ​ចេញផ្សាយ​លើក​នេះ​របស់"
-" KMail មាន​ដូចជា (ប្រៀបធៀប​ទៅ KMail %4 ដែល​ជា​ផ្នែក​របស់ TDE %5) ៖</p>\n"
+"<p>លក្ខណៈពិសេស​មួយ​ចំនួន​នៃ​លក្ខណៈពិសេស​ថ្មីៗ​នៅ​ក្នុង​ការ​ចេញផ្សាយ​លើក​នេះ​របស់ KMail មាន​ដូចជា "
+"(ប្រៀបធៀប​ទៅ KMail %4 ដែល​ជា​ផ្នែក​របស់ TDE %5) ៖</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10112,31 +9642,27 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; ពី​ក្រុម KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>សូម​ចំណាយពេល​បន្តិច​ដើម្បី​បំពេញ​នៅក្នុង​បន្ទះក្ដារ​កំណត់រចនា​សម្ព័ន្ធ​ "
-"KMail នៅ Settings-&gt; កំណត់​រចនា​សម្ព័ន្ធ KMail ។\n"
-"អ្នក​ត្រូវ​បង្កើត​យ៉ាងហោចណាស់​អត្តសញ្ញាណ​លំនាំដើម​មួយ និង​គណនី​សំបុត្រ​មក​ដល់​ "
-"ក៍ដូចជា​សំបុត្រ​ផ្ញើ​ចេញ​ដែរ ។</p>\n"
+"<p>សូម​ចំណាយពេល​បន្តិច​ដើម្បី​បំពេញ​នៅក្នុង​បន្ទះក្ដារ​កំណត់រចនា​សម្ព័ន្ធ​ KMail នៅ Settings-&gt; កំណត់​"
+"រចនា​សម្ព័ន្ធ KMail ។\n"
+"អ្នក​ត្រូវ​បង្កើត​យ៉ាងហោចណាស់​អត្តសញ្ញាណ​លំនាំដើម​មួយ និង​គណនី​សំបុត្រ​មក​ដល់​ ក៍ដូចជា​សំបុត្រ​ផ្ញើ​ចេញ​ដែរ ។</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; "
-"font-weight:bold;'>ការផ្លាស់ប្ដូរ​ដែល​សំខាន់</span> (បាន​ប្រៀបធៀប​ទៅ​នឹង KMail "
-"%1) ៖</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>ការផ្លាស់ប្ដូរ​ដែល​សំខាន់</span> "
+"(បាន​ប្រៀបធៀប​ទៅ​នឹង KMail %1) ៖</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10167,10 +9693,10 @@ msgstr "មើល​ឯកសារ​ភ្ជាប់ ៖ %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
-msgstr ""
-"[KMail ៖ ឯកសារ​ភ្ជាប់​មាន​ទិន្នន័យ​គោល​ពីរ ។ ព្យាយាម​បង្ហាញ​តួអក្សរ %n ជាមុន ។]"
+msgstr "[KMail ៖ ឯកសារ​ភ្ជាប់​មាន​ទិន្នន័យ​គោល​ពីរ ។ ព្យាយាម​បង្ហាញ​តួអក្សរ %n ជាមុន ។]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10194,14 +9720,15 @@ msgstr "បើក​ឯកសារភ្ជាប់​ឬ ?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "កា​រលុប​ឯកសារ​ភ្ជាប់​អាច​បដិសេធ​ហត្ថលេខា​ឌីជីថល​នៅ​លើ​សារ​នេះ ។"
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
-msgstr ""
-"ការ​កែប្រែ​ឯកសារ​ភ្ជាប់​អាច​បដិសេធ​ហត្ថលេខា​ឌីជីថល​មួយ​ចំនួន​នៅ​លើ​សារ​នេះ ។"
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
+msgstr "ការ​កែប្រែ​ឯកសារ​ភ្ជាប់​អាច​បដិសេធ​ហត្ថលេខា​ឌីជីថល​មួយ​ចំនួន​នៅ​លើ​សារ​នេះ ។"
 
 #: kmreaderwin.cpp:2956
 msgid "Attachments:"
@@ -10221,6 +9748,58 @@ msgstr "(ផ្គូរផ្គង​ណាមួយ​ខាងក្រោ�
 msgid "(match all of the following)"
 msgstr "(ផ្គូរផ្គង​ខាងក្រោម​ទាំងអស់)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "​អាន"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "ចាស់"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "​បាន​លុប"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "បាន​ឆ្លើយតប"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "បាន​បញ្ជូន​បន្ត"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "​បាន​ដាក់​ជា​ជួរ"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "បាន​ផ្ញើ"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "បានឃ្លាំមើល"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "​មិនអើពើ"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "​សារ​ឥត​បាន​ការ"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "បន្លំ"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "​ត្រូវ​ធ្វើ"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "មាន​ឯកសារ​ភ្ជាប់"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "សារ​ពេញលេញ"
@@ -10293,31 +9872,29 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"កំហុស​សំខាន់ ៖ មិនអាច​ដំណើរការ​សំបុត្រ​ដែល​បាន​ផ្ញើ​ហើយ (អស់​ទំហំ​ឬ ?) "
-"កំពុង​ផ្លាស់ទី​សារ​ដែលបរាជ័យ​ទៅកាន់​ថត \"សំបុត្រ​ផ្ញើចេញ\" ។"
+"កំហុស​សំខាន់ ៖ មិនអាច​ដំណើរការ​សំបុត្រ​ដែល​បាន​ផ្ញើ​ហើយ (អស់​ទំហំ​ឬ ?) កំពុង​ផ្លាស់ទី​សារ​ដែលបរាជ័យ​ទៅកាន់​ថត "
+"\"សំបុត្រ​ផ្ញើចេញ\" ។"
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"ការផ្លាស់ទី​សារ​ដែល​បាន​ផ្ញើ​ចេញ \"%1\" ពី \"ប្រអប់ចេញ\" ទៅថត​ "
-"\"សំបុត្រ​ផ្ញើចេញ\" បាន​បរាជ័យ ។\n"
-"ហេតុ​ផល​ដែល​អាច​ទទួល​យក​បាន​គឺ​មក​ពី​ការ​ខ្វះ​ទំហំ​ថាស ឬ "
-"សិទ្ធិ​ក្នុង​ការសរសេរ ។ សូម​ព្យាយាម​​ដោះស្រាយ​បញ្ហា​ និង​ផ្លាស់ទី​សារ​ដោយ​ដៃ ។"
+"ការផ្លាស់ទី​សារ​ដែល​បាន​ផ្ញើ​ចេញ \"%1\" ពី \"ប្រអប់ចេញ\" ទៅថត​ \"សំបុត្រ​ផ្ញើចេញ\" បាន​បរាជ័យ ។\n"
+"ហេតុ​ផល​ដែល​អាច​ទទួល​យក​បាន​គឺ​មក​ពី​ការ​ខ្វះ​ទំហំ​ថាស ឬ សិទ្ធិ​ក្នុង​ការសរសេរ ។ សូម​ព្យាយាម​​ដោះស្រាយ​បញ្ហា​ និង​"
+"ផ្លាស់ទី​សារ​ដោយ​ដៃ ។"
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "មិនអាចធ្វើ​ការ​ផ្ញើ​សារដោយគ្មាន​ការ​បញ្ជាក់​ពី​អាសយដ្ឋាន​របស់អ្នក​ផ្ញើឡើយ ។\n"
-"សូម​កំណត់​អាសយដ្ឋាន​អ៊ីមែល​​របស់អត្តសញ្ញាណ '%1' "
-"នៅក្នុង​ផ្នែក​អត្តសញ្ញាណ​នៃ​ប្រអប់​កំណត់​រចនាសម្ព័ន្ធ​ "
-"ហើយ​និង​ព្យាយាម​ម្ដងទៀត ។"
+"សូម​កំណត់​អាសយដ្ឋាន​អ៊ីមែល​​របស់អត្តសញ្ញាណ '%1' នៅក្នុង​ផ្នែក​អត្តសញ្ញាណ​នៃ​ប្រអប់​កំណត់​រចនាសម្ព័ន្ធ​ ហើយ​និង​"
+"ព្យាយាម​ម្ដងទៀត ។"
 
 #: kmsender.cpp:454
 #, c-format
@@ -10340,11 +9917,11 @@ msgstr "កំពុង​ចាប់ផ្ដើម​ដំណើរការ
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"អ្នក​បាន​ជ្រើស​ផ្ញើ​អ៊ីមែល​ដែលបាន​ដាក់ជាជួរ​ទាំងអស់​​​ដោយប្រើ​ការជញ្ជូន​ដែលមិនបា"
-"ន​អ៊ិនគ្រីប​មួយ តើអ្នក​ចង់​បន្ត​ឬ ? "
+"អ្នក​បាន​ជ្រើស​ផ្ញើ​អ៊ីមែល​ដែលបាន​ដាក់ជាជួរ​ទាំងអស់​​​ដោយប្រើ​ការជញ្ជូន​ដែលមិនបាន​អ៊ិនគ្រីប​មួយ តើអ្នក​ចង់​បន្ត​"
+"ឬ ? "
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10368,15 +9945,16 @@ msgstr "បរាជ័យ​ក្នុង​ការផ្ញើសារ​
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "ការផ្ញើ​បាន​បោះបង់ ៖\n"
 "%1\n"
-"សារ​នឹង​នៅតែ​នៅក្នុងថត​ 'ប្រអប់ចេញ' រហូត​ទាល់តែងអ្នក​បាន​ដោះស្រាយ​បញ្ហា​ក៏បាន "
-"(ឧទាហរណ៍. អាសយដ្ឋាន​ដែលបានខូច) ឬ យក​សារចេញពី​ថត 'ប្រអប់ចេញ​' ក៏បាន ។\n"
+"សារ​នឹង​នៅតែ​នៅក្នុងថត​ 'ប្រអប់ចេញ' រហូត​ទាល់តែងអ្នក​បាន​ដោះស្រាយ​បញ្ហា​ក៏បាន (ឧទាហរណ៍. អាសយដ្ឋាន​"
+"ដែលបានខូច) ឬ យក​សារចេញពី​ថត 'ប្រអប់ចេញ​' ក៏បាន ។\n"
 "ពិធីការ​ដឹកជញ្ជូន​ខាងក្រោម​គឺ​ត្រូវបាន​ប្រើ ៖\n"
 "  %2"
 
@@ -10386,21 +9964,16 @@ msgstr "ការ​ផ្ញើ​បាន​បោះបង់ ។"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>ការផ្ញើ​បាន​បរាជ័យ ៖</p>"
-"<p>%1</p>"
-"<p>សារ​នឹង​នៅតែ​នៅក្នុង​ថត 'ប្រអប់ចេញ' "
-"រហូតទាល់តែអ្នក​បាន​ដោះស្រាយ​បញ្ហាហើយ​ក៏បាន (ឧទាហរណ៍. អាសយដ្ឋាន​ដែលបាន​ខូច) ឬ "
-"យក​សារចេញពីថត​ 'ប្រអប់ចេញ' ។</p>"
-"<p>ពិធីការ​ដឹកជញ្ជូន​ខាងក្រោម​គឺ​ត្រូវបាន​ប្រើ ៖  %2</p>"
-"<p>តើអ្នកចង់​ឲ្យ​ខ្ញុំ​បន្ត​ការផ្ញើ​សារ​ដែល​នៅសល់ឬ ?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>ការផ្ញើ​បាន​បរាជ័យ ៖</p><p>%1</p><p>សារ​នឹង​នៅតែ​នៅក្នុង​ថត 'ប្រអប់ចេញ' រហូតទាល់តែអ្នក​បាន​"
+"ដោះស្រាយ​បញ្ហាហើយ​ក៏បាន (ឧទាហរណ៍. អាសយដ្ឋាន​ដែលបាន​ខូច) ឬ យក​សារចេញពីថត​ 'ប្រអប់ចេញ' ។</"
+"p><p>ពិធីការ​ដឹកជញ្ជូន​ខាងក្រោម​គឺ​ត្រូវបាន​ប្រើ ៖  %2</p><p>តើអ្នកចង់​ឲ្យ​ខ្ញុំ​បន្ត​ការផ្ញើ​សារ​ដែល​"
+"នៅសល់ឬ ?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10418,15 +9991,16 @@ msgstr "បោះបង់​ការផ្ញើ"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "ការផ្ញើ​បាន​បរាជ័យ ៖\n"
 "%1\n"
-"សារ​នឹង​នៅតែ​នៅក្នុងថត​ 'ប្រអប់ចេញ' រហូត​ទាល់តែងអ្នក​បាន​ដោះស្រាយ​បញ្ហា​ក៏បាន "
-"(ឧទាហរណ៍. អាសយដ្ឋាន​ដែលបានខូច) ឬ យក​សារចេញពី​ថត 'ប្រអប់ចេញ​' ក៏បាន ។\n"
+"សារ​នឹង​នៅតែ​នៅក្នុងថត​ 'ប្រអប់ចេញ' រហូត​ទាល់តែងអ្នក​បាន​ដោះស្រាយ​បញ្ហា​ក៏បាន (ឧទាហរណ៍. អាសយដ្ឋាន​"
+"ដែលបានខូច) ឬ យក​សារចេញពី​ថត 'ប្រអប់ចេញ​' ក៏បាន ។\n"
 "ពិធីការ​ដឹកជញ្ជូន​ខាងក្រោម​គឺ​ត្រូវបាន​ប្រើ ៖\n"
 "  %2"
 
@@ -10461,49 +10035,46 @@ msgstr "បាន​ចេញ​ពី​ការផ្ញើ​សំបុត
 
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
-msgstr ""
-"អ្នក​ត្រូវ​ផ្គត់ផ្គង់​ឈ្មោះ​អ្នកប្រើ​ និង​ពាក្យ​សម្ងាត់ "
-"ដើម្បី​ប្រើ​ម៉ាស៊ីន​បម្រើ SMTP នេះ ។"
+msgstr "អ្នក​ត្រូវ​ផ្គត់ផ្គង់​ឈ្មោះ​អ្នកប្រើ​ និង​ពាក្យ​សម្ងាត់ ដើម្បី​ប្រើ​ម៉ាស៊ីន​បម្រើ SMTP នេះ ។"
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ​ការបង្ហាញ​ផ្សេងទៀត​នៅលើ​ម៉ាស៊ីន​នេះ​រួចហើយ ។ "
-"ការរត់​ %2 ច្រើន​ជាង​ម្ដង អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ អ្នក​មិនគួរ​ចាប់ផ្ដើម "
-"%1 លើកលែងតែអ្នក​​ប្រាកដ​ថា វាមិនទាន់​រត់​នៅឡើយទេ ។"
+"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ​ការបង្ហាញ​ផ្សេងទៀត​នៅលើ​ម៉ាស៊ីន​នេះ​រួចហើយ ។ ការរត់​ %2 ច្រើន​ជាង​"
+"ម្ដង អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ អ្នក​មិនគួរ​ចាប់ផ្ដើម %1 លើកលែងតែអ្នក​​ប្រាកដ​ថា វាមិនទាន់​រត់​"
+"នៅឡើយទេ ។"
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ​ការបង្ហាញ​ផ្សេងទៀត​នៅលើ​ម៉ាស៊ីន​នេះ​រួចហើយ ។ "
-"ការរត់ %1និង %2 នៅពេល​តែមួយ អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ អ្នក​មិនគួរ​ចាប់ផ្ដើម "
-"%2 ទេ លើកលែងតែអ្នក​​ប្រាកដ​ថា %1មិនទាន់​រត់​នៅឡើយទេ ។"
+"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ​ការបង្ហាញ​ផ្សេងទៀត​នៅលើ​ម៉ាស៊ីន​នេះ​រួចហើយ ។ ការរត់ %1និង %2 នៅពេល​"
+"តែមួយ អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ អ្នក​មិនគួរ​ចាប់ផ្ដើម %2 ទេ លើកលែងតែអ្នក​​ប្រាកដ​ថា %1មិនទាន់​រត់​"
+"នៅឡើយទេ ។"
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ %2 ។ ការរត់​ %1 ច្រើន​ជាង​ម្ដង "
-"អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ អ្នក​មិនគួរ​ចាប់ផ្ដើម %1 នៅលើ​កុំព្យូទ័រ​នេះទេ "
-"​លុះត្រា​តែអ្នក​​ប្រាកដ​ថា វាមិនទាន់​រត់​នៅលើ %2 ​នៅឡើយទេ ។"
+"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ %2 ។ ការរត់​ %1 ច្រើន​ជាង​ម្ដង អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ អ្នក​"
+"មិនគួរ​ចាប់ផ្ដើម %1 នៅលើ​កុំព្យូទ័រ​នេះទេ ​លុះត្រា​តែអ្នក​​ប្រាកដ​ថា វាមិនទាន់​រត់​នៅលើ %2 ​នៅឡើយទេ ។"
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ %3 ។​ ការរត់ %1 និង​ %2 នៅពេល​តែមួយ "
-"អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ អ្នក​មិនគួរ​ចាប់ផ្ដើម %2 នៅលើ​កុំព្យូទ័រ​នេះទេ "
-"លើកលែងតែអ្នក​​ប្រាកដ​ថា %1 វាមិនទាន់​រត់​នៅលើ %3 នៅឡើយទេ ។"
+"%1 ហាក់ដូចជា​កំពុង​តែ​បាន​រត់​នៅលើ %3 ។​ ការរត់ %1 និង​ %2 នៅពេល​តែមួយ អាច​បង្ក​ឲ្យ​បាត់បង់​នៃ​សារ ។ "
+"អ្នក​មិនគួរ​ចាប់ផ្ដើម %2 នៅលើ​កុំព្យូទ័រ​នេះទេ លើកលែងតែអ្នក​​ប្រាកដ​ថា %1 វាមិនទាន់​រត់​នៅលើ %3 "
+"នៅឡើយទេ ។"
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10514,6 +10085,10 @@ msgstr "ចាប់ផ្ដើម %1"
 msgid "Exit"
 msgstr "​ចេញ"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "សារ​ថ្មី​នៅក្នុង"
@@ -10538,20 +10113,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"មិន​មាន TDEWallet ទេ ។ "
-"វា​ជា​ការផ្ដល់​អនុសាសន៍​យ៉ាងខ្លាំងក្លា​ក្នុងការ​ឲ្យប្រើ​​ TDEWallet "
-"សម្រាប់​ការគ្រប់គ្រង​ពាក្យសម្ងាត់​របស់អ្នក ។\n"
-"ទោះជាយ៉ាងណាក៏ដោយ KMail "
-"អាចទុក​ពាក្យ​សម្ងាត់​នៅក្នុង​ឯកសារកំណត់រចនា​សម្ព័ន្ធ​របស់វា​ជំនួស​វិញ ។ "
-"ពាក្យ​សម្ងាត់​ គឺត្រូវបាន​ទុក​នៅក្នុងទ្រង់ទ្រាយ​ដែល​បាន​លាក់ "
-"ប៉ុន្តែ​មិនគួរត្រូវបាន​​គិតថាសុវត្ថិភាព​ពី​ការខំប្រឹង​ធ្វើការឌិគ្រីប "
-"ប្រសិនបើ​ចូលដំណើការទៅ​ឯកសារកំណត់​រចនាសម្ព័ន្ធត្រូវបាន​យកបាន ។\n"
-"តើអ្នកចង់​ទុក​ពាក្យ​សម្ងាត់​សម្រាប់​គណនី​ '%1' "
-"នៅក្នុង​ឯកសារកំណត់រចនាសម្ព័ន្ធ​ឬ ?"
+"មិន​មាន TDEWallet ទេ ។ វា​ជា​ការផ្ដល់​អនុសាសន៍​យ៉ាងខ្លាំងក្លា​ក្នុងការ​ឲ្យប្រើ​​ TDEWallet សម្រាប់​"
+"ការគ្រប់គ្រង​ពាក្យសម្ងាត់​របស់អ្នក ។\n"
+"ទោះជាយ៉ាងណាក៏ដោយ KMail អាចទុក​ពាក្យ​សម្ងាត់​នៅក្នុង​ឯកសារកំណត់រចនា​សម្ព័ន្ធ​របស់វា​ជំនួស​វិញ ។ ពាក្យ​"
+"សម្ងាត់​ គឺត្រូវបាន​ទុក​នៅក្នុងទ្រង់ទ្រាយ​ដែល​បាន​លាក់ ប៉ុន្តែ​មិនគួរត្រូវបាន​​គិតថាសុវត្ថិភាព​ពី​ការខំប្រឹង​"
+"ធ្វើការឌិគ្រីប ប្រសិនបើ​ចូលដំណើការទៅ​ឯកសារកំណត់​រចនាសម្ព័ន្ធត្រូវបាន​យកបាន ។\n"
+"តើអ្នកចង់​ទុក​ពាក្យ​សម្ងាត់​សម្រាប់​គណនី​ '%1' នៅក្នុង​ឯកសារកំណត់រចនាសម្ព័ន្ធ​ឬ ?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
 msgid "TDEWallet Not Available"
@@ -10608,8 +10180,7 @@ msgstr "ឈ្មោះ​ដែន ឬ អាសយដ្ឋាន​ជាល�
 #: kmtransport.cpp:406
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
-msgstr ""
-"ចំនួន​ច្រក​ដែល​ម៉ាស៊ីន​បម្រើ SMTP កំពុងតែស្ដាប់ ។ ច្រក​លំនាំដើម​គឺ 25 ។"
+msgstr "ចំនួន​ច្រក​ដែល​ម៉ាស៊ីន​បម្រើ SMTP កំពុងតែស្ដាប់ ។ ច្រក​លំនាំដើម​គឺ 25 ។"
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10620,9 +10191,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"ពាក្យ​បញ្ជា​ដែល​ត្រូវ​រត់​តាម​តំបន់​, ដំបូង​ត្រូវ​ផ្ញើ​អ៊ីមែល ។ "
-"វា​អាច​ត្រូវបាន​ប្រើ​ដើម្បី​រៀបចំssh tunnels ឧទាហរណ៏ ទុក​ឲ្យ​វា​នៅទទេ​ "
-"ប្រសិនបើ​មិនមាន​ពាក្យ​បញ្ជា​ដែល​គួរតែ​បាន​រត់ទេនោះ ។"
+"ពាក្យ​បញ្ជា​ដែល​ត្រូវ​រត់​តាម​តំបន់​, ដំបូង​ត្រូវ​ផ្ញើ​អ៊ីមែល ។ វា​អាច​ត្រូវបាន​ប្រើ​ដើម្បី​រៀបចំssh tunnels "
+"ឧទាហរណ៏ ទុក​ឲ្យ​វា​នៅទទេ​ ប្រសិនបើ​មិនមាន​ពាក្យ​បញ្ជា​ដែល​គួរតែ​បាន​រត់ទេនោះ ។"
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10630,25 +10200,19 @@ msgstr "ម៉ាស៊ីន​បម្រើ​ទាមទារ​​កា
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"ធីក​ជម្រើស​នេះ​ ប្រសិនបើ​ម៉ាស៊ីន​បម្រើ​ SMTP "
-"របស់អ្នក​ទាមទារ​ការផ្ទៀងផ្ទាត់​ភាពត្រឹមត្រូវ​មុន​ការទទួល​យក​សំបុត្រ ។ "
-"វា​ត្រូវបាន​គេ​ស្គាល់ថា 'SMTP ដែលបាន​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ' ឬ គ្រាន់តែជា "
-"ASMTP ។"
+"ធីក​ជម្រើស​នេះ​ ប្រសិនបើ​ម៉ាស៊ីន​បម្រើ​ SMTP របស់អ្នក​ទាមទារ​ការផ្ទៀងផ្ទាត់​ភាពត្រឹមត្រូវ​មុន​ការទទួល​យក​"
+"សំបុត្រ ។ វា​ត្រូវបាន​គេ​ស្គាល់ថា 'SMTP ដែលបាន​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ' ឬ គ្រាន់តែជា ASMTP ។"
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
-msgstr ""
-"ឈ្មោះ​អ្នកប្រើ​​ដែលត្រូវ​ផ្ញើ​ទោ​កាន់​ម៉ាស៊ីន​បម្រើ​​សម្រាប់​ការផ្ទៀងផ្ទាត់​ភាព​"
-"ត្រឹមត្រូវ"
+msgstr "ឈ្មោះ​អ្នកប្រើ​​ដែលត្រូវ​ផ្ញើ​ទោ​កាន់​ម៉ាស៊ីន​បម្រើ​​សម្រាប់​ការផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
 
 #: kmtransport.cpp:452
 msgid "The password to send to the server for authorization"
-msgstr ""
-"ពាក្យសម្ងាត់​ដែល​ត្រូវ​ផ្ញើ​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​សម្រាប់​ការផ្ទៀងផ្ទាត់​ភាព​ត្រ"
-"ឹមត្រូវ"
+msgstr "ពាក្យសម្ងាត់​ដែល​ត្រូវ​ផ្ញើ​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​សម្រាប់​ការផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
 
 #: kmtransport.cpp:457
 msgid "&Store SMTP password"
@@ -10660,16 +10224,13 @@ msgstr "ផ្ញើ​ឈ្មោះ​ម៉ាស៊ីន​ផ្ទាល
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"ធីក​ជម្រើ​ស​នេះ​ដើម្បី​មាន​ KMail "
-"ដែលប្រើ​ឈ្មោះ​ម៉ាស៊ីន​ផ្ទាល់ខ្លួន​​នៅពេល​ដែល​កំពុង​សម្គាល់​​ខ្លួន​វាផ្ទាល់​ទៅកាន"
-"់​ម៉ាស៊ីន​បម្រើ​សំបុត្រ ។"
-"<p>វាមាន​ប្រយោជន៍​នៅពេល​ដែល​ឈ្មោះ​ម៉ាស៊ីន​របស់​ប្រព័ន្ធ​របស់​អ្នក​មិនអាចត្រូវបាន"
-"​កំណត់​យ៉ាងត្រឹមត្រូវ​ ឬ បិទបាំង​ឈ្មោះ​ម៉ាស៊ីន​ពិត​របស់​ប្រព័ន្ធ​របស់អ្នក ។"
+"ធីក​ជម្រើ​ស​នេះ​ដើម្បី​មាន​ KMail ដែលប្រើ​ឈ្មោះ​ម៉ាស៊ីន​ផ្ទាល់ខ្លួន​​នៅពេល​ដែល​កំពុង​សម្គាល់​​ខ្លួន​វាផ្ទាល់​ទៅកាន់​"
+"ម៉ាស៊ីន​បម្រើ​សំបុត្រ ។<p>វាមាន​ប្រយោជន៍​នៅពេល​ដែល​ឈ្មោះ​ម៉ាស៊ីន​របស់​ប្រព័ន្ធ​របស់​អ្នក​មិនអាចត្រូវបាន​កំណត់​"
+"យ៉ាងត្រឹមត្រូវ​ ឬ បិទបាំង​ឈ្មោះ​ម៉ាស៊ីន​ពិត​របស់​ប្រព័ន្ធ​របស់អ្នក ។"
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10678,9 +10239,7 @@ msgstr "ឈ្មោះ​ម៉ាស៊ីន ៖"
 #: kmtransport.cpp:489
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
-msgstr ""
-"បញ្ចូល​ឈ្មោះ​ម៉ាស៊ីន​ KMail ដែលគួរ​តែ​ប្រើ​ "
-"នៅពេល​ដែល​កំពុង​សម្គាល់​ខ្លួន​វាផ្ទាល់ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ ។"
+msgstr "បញ្ចូល​ឈ្មោះ​ម៉ាស៊ីន​ KMail ដែលគួរ​តែ​ប្រើ​ នៅពេល​ដែល​កំពុង​សម្គាល់​ខ្លួន​វាផ្ទាល់ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ ។"
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10700,11 +10259,9 @@ msgstr "អនុញ្ញាត​តែ​ឯកសារ​មូលដ្ឋ
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
-msgstr ""
-"វា​ម៉ាស៊ីន​មិនអាច​ទទេ​បានទេ​ ។ សូម​បញ្ចូល​ឈ្មោះ ឬ អាសយដ្ឋាន​ IP "
-"នៃ​ម៉ាស៊ីន​បម្រើ SMTP ។"
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
+msgstr "វា​ម៉ាស៊ីន​មិនអាច​ទទេ​បានទេ​ ។ សូម​បញ្ចូល​ឈ្មោះ ឬ អាសយដ្ឋាន​ IP នៃ​ម៉ាស៊ីន​បម្រើ SMTP ។"
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10716,21 +10273,18 @@ msgstr "មានកំហុស​នៅខណៈ​ដែល​កំពុង
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"ការ​ឈប់ជាវ​ជាប្រចាំ​មូលដ្ឋាន​ពី​ថត "
-"នឹង​យក​ព័ត៌មាន​ទាំងអស់​ដែល​បង្ហាញ​ជា​មូលដ្ឋាន​អំពី​ថត​នេះ​ចេញ ។ "
-"ថត​នឹង​មិន​ត្រូវ​បាន​ផ្លាស់ប្ដូរ​នៅលើ​ម៉ាស៊ីន​បម្រើ​ទេ ។ សង្កត់ បោះបង់ "
-"ដើម្បី​ប្រាកដ​ថា​ការ​ផ្លាស់ប្ដូរ​មូលដ្ឋាន​ទាំងអស់​ត្រូវ​បាន​សរសេរ​ទៅ​ម៉ាស៊ីន​បម្"
-"រើ ដោយ​ចុច​សំបុត្រ​ជាមុន​សិន ។"
+"ការ​ឈប់ជាវ​ជាប្រចាំ​មូលដ្ឋាន​ពី​ថត នឹង​យក​ព័ត៌មាន​ទាំងអស់​ដែល​បង្ហាញ​ជា​មូលដ្ឋាន​អំពី​ថត​នេះ​ចេញ ។ ថត​នឹង​មិន​ត្រូវ​"
+"បាន​ផ្លាស់ប្ដូរ​នៅលើ​ម៉ាស៊ីន​បម្រើ​ទេ ។ សង្កត់ បោះបង់ ដើម្បី​ប្រាកដ​ថា​ការ​ផ្លាស់ប្ដូរ​មូលដ្ឋាន​ទាំងអស់​ត្រូវ​បាន​"
+"សរសេរ​ទៅ​ម៉ាស៊ីន​បម្រើ ដោយ​ចុច​សំបុត្រ​ជាមុន​សិន ។"
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
-msgstr ""
-"ការ​ផ្លាស់ប្ដូរ​មូលដ្ឋាន នឹង​ត្រូវ​បាន​បាត់បង់ នៅ​ពេលដែល​ឈប់​ជាវជា​ប្រចាំ"
+msgstr "ការ​ផ្លាស់ប្ដូរ​មូលដ្ឋាន នឹង​ត្រូវ​បាន​បាត់បង់ នៅ​ពេលដែល​ឈប់​ជាវជា​ប្រចាំ"
 
 #: mailinglistpropertiesdialog.cpp:49
 msgid "Mailinglist Folder Properties"
@@ -10796,9 +10350,7 @@ msgstr "​មិន​មាន"
 msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
-msgstr ""
-"KMail មិនងាច​រក​បញ្ជី​សំបុត្រ​រួម​នៅក្នុង​ថត​នេះ​បាន​ឡើយ ។ "
-"សូម​បំពេញ​​អាសយដ្ឋាន​ដោយ​ដៃ ។"
+msgstr "KMail មិនងាច​រក​បញ្ជី​សំបុត្រ​រួម​នៅក្នុង​ថត​នេះ​បាន​ឡើយ ។ សូម​បំពេញ​​អាសយដ្ឋាន​ដោយ​ដៃ ។"
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10945,36 +10497,27 @@ msgstr "កែសម្រួល​សារ"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ការធ្វើ​ឲ្យមាន​រចនាសម្ព័ន្ធ​ព័ត៌មាន​បានត្រឡប់​ដោយ​កម្មវិធី​ជំនួយ Crypto "
-"ដែលមិនអាច​ត្រូវបាន​​ចូល​ដំណើរការបាន​យ៉ាងត្រឹមត្រូវ​នោះទេ ។ "
-"កម្មវិធី​ជំនួយ​អាចត្រូវបាន​បំផ្លាញ ។</p>"
-"<p>សូម​ទាក់ទង​អ្នកគ្រប់គ្រង​ប្រព័ន្ធ​របស់អ្នក ។</p></qt>"
+"<qt><p>ការធ្វើ​ឲ្យមាន​រចនាសម្ព័ន្ធ​ព័ត៌មាន​បានត្រឡប់​ដោយ​កម្មវិធី​ជំនួយ Crypto ដែលមិនអាច​ត្រូវបាន​​ចូល​"
+"ដំណើរការបាន​យ៉ាងត្រឹមត្រូវ​នោះទេ ។ កម្មវិធី​ជំនួយ​អាចត្រូវបាន​បំផ្លាញ ។</p><p>សូម​ទាក់ទង​អ្នកគ្រប់គ្រង​"
+"ប្រព័ន្ធ​របស់អ្នក ។</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>គ្មាន​សកម្មភាព​កម្មវិធី​ជំនួយ Crypto ដែលបានរកឃើញ​ទេ និង​កូដ​ OpenPGP "
-"ដែលមានស្រាប់​ មិនបាន​រត់យ៉ាងជោគជ័យឡើយ ។</p>"
-"<p>អ្នកអាច​ធ្វើវត្ថុពីរ​ ដើម្បីផ្លាស់ប្ដូរ​វា ៖</p>"
-"<ul>"
-"<li><em></em> ធ្វើឲ្យ​កម្មវិធីជំនួយ​សកម្ម​ដោយប្រើ ការកំណត់->"
-"កំណត់រចនា​សម្ព័ន្ធ​ KMail->ប្រអប់​កម្មវិធី​ជំនួយ​ ក៏បាន </li>"
-"<li><em>ឬ</em> បញ្ជាក់ការកំណត់​ OpenPGP បុរាណ​នៅលើអត្តសញ្ញាណ​របស់ប្រអប់->"
-"ថេបកម្រិត​ខ្ពស់​ក៏បាន ។</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>គ្មាន​សកម្មភាព​កម្មវិធី​ជំនួយ Crypto ដែលបានរកឃើញ​ទេ និង​កូដ​ OpenPGP ដែលមានស្រាប់​ មិនបាន​"
+"រត់យ៉ាងជោគជ័យឡើយ ។</p><p>អ្នកអាច​ធ្វើវត្ថុពីរ​ ដើម្បីផ្លាស់ប្ដូរ​វា ៖</p><ul><li><em></em> "
+"ធ្វើឲ្យ​កម្មវិធីជំនួយ​សកម្ម​ដោយប្រើ ការកំណត់->កំណត់រចនា​សម្ព័ន្ធ​ KMail->ប្រអប់​កម្មវិធី​ជំនួយ​ ក៏បាន </"
+"li><li><em>ឬ</em> បញ្ជាក់ការកំណត់​ OpenPGP បុរាណ​នៅលើអត្តសញ្ញាណ​របស់ប្រអប់->ថេបកម្រិត​ខ្ពស់​"
+"ក៏បាន ។</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10986,19 +10529,15 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
-msgstr ""
-"កម្មវិធី​ខាងក្រោយ Chiasmus មិនផ្ដល់​មុខងារ \"x-encrypt\" ឡើយ ។ "
-"សូម​រាយការណ៍​កំហុស ។"
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
+msgstr "កម្មវិធី​ខាងក្រោយ Chiasmus មិនផ្ដល់​មុខងារ \"x-encrypt\" ឡើយ ។ សូម​រាយការណ៍​កំហុស ។"
 
 #: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
-msgstr ""
-"មុខងារ \"x-encrypt\" មិនទទួល​យក​ប៉ារ៉ាម៉ែត្រ​​ដែលបាន​រំពឹងទុកឡើយ ។ "
-"សូមរាយការណ៍​កំហុស ។"
+msgstr "មុខងារ \"x-encrypt\" មិនទទួល​យក​ប៉ារ៉ាម៉ែត្រ​​ដែលបាន​រំពឹងទុកឡើយ ។ សូមរាយការណ៍​កំហុស ។"
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11006,20 +10545,19 @@ msgstr "កំហុស​ក្នុង​ការ​អ៊ិនគ្រី
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"ការត្រឡប់​តម្លៃ​​ពី​កម្មវិធី​ខាងក្រោយ Chiasmus ដែលមិនបានរំពឹងទុក ៖ មុខងារ "
-"\"x-encrypt\" មិនបាន​ត្រឡប់​អារេ​បៃ​ទេ ។ សូម​រាយការណ៍​កំហុស ។"
+"ការត្រឡប់​តម្លៃ​​ពី​កម្មវិធី​ខាងក្រោយ Chiasmus ដែលមិនបានរំពឹងទុក ៖ មុខងារ \"x-encrypt\" មិនបាន​"
+"ត្រឡប់​អារេ​បៃ​ទេ ។ សូម​រាយការណ៍​កំហុស ។"
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"ទ្រង់ទ្រាយ​សារ​គ្រីប OpenPGP មិនគាំទ្រ​​ការអ៊ិនគ្រីប ឬ "
-"ការចុះហត្ថលេខា​នៃ​ឯកសារភ្ជាប់​ឡើយ ។\n"
+"ទ្រង់ទ្រាយ​សារ​គ្រីប OpenPGP មិនគាំទ្រ​​ការអ៊ិនគ្រីប ឬ ការចុះហត្ថលេខា​នៃ​ឯកសារភ្ជាប់​ឡើយ ។\n"
 "ពិតជា​ប្រើ OpenPGPនៅក្នុង​បណ្ដាញ​ដែល​មិនពេញ​ចិត្ត​មែនទេ ?"
 
 #: messagecomposer.cpp:640
@@ -11040,8 +10578,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"ការពិនិត្យ​របស់​ចំណង់ចំណូលចិត្ត​ក្នុងការ​ចុះហត្ថលេខា​របស់​អ្នកទទួល "
-"បានស្នើ​ថា​អ្នកត្រូវបាន​សួរចុះហត្ថលេខា​ ឬ មិនចុះហត្ថលេខា​លើសារនេះ ។\n"
+"ការពិនិត្យ​របស់​ចំណង់ចំណូលចិត្ត​ក្នុងការ​ចុះហត្ថលេខា​របស់​អ្នកទទួល បានស្នើ​ថា​អ្នកត្រូវបាន​សួរចុះហត្ថលេខា​ ឬ "
+"មិនចុះហត្ថលេខា​លើសារនេះ ។\n"
 "ចុះហត្ថលេខា​លើសារនេះ ?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11071,9 +10609,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"អ្នក​បាន​ស្នើ​ឲ្យ​ចុះហត្ថលេខា​លើសារនេះ "
-"ប៉ុន្តែ​មិនមាន​សោចុះហត្ថលេខា​ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ​សម្រាប់​អត្តសញ្ញាណ​នេះឡើ"
-"យ ។"
+"អ្នក​បាន​ស្នើ​ឲ្យ​ចុះហត្ថលេខា​លើសារនេះ ប៉ុន្តែ​មិនមាន​សោចុះហត្ថលេខា​ដែលបាន​កំណត់​រចនា​សម្ព័ន្ធ​សម្រាប់​"
+"អត្តសញ្ញាណ​នេះឡើយ ។"
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11124,18 +10661,17 @@ msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"សោអ៊ិនគ្រីប​​ដែលបាន​ទុកចិត្ត​ដែលត្រឹមត្រូវ "
-"ត្រូវបាន​រក​ឃើញ​សម្រាប់​អ្នក​ទទួល​ទាំងអស់ ។\n"
+"សោអ៊ិនគ្រីប​​ដែលបាន​ទុកចិត្ត​ដែលត្រឹមត្រូវ ត្រូវបាន​រក​ឃើញ​សម្រាប់​អ្នក​ទទួល​ទាំងអស់ ។\n"
 "អ៊ិនគ្រីប​សារ​នេះ​ឬ ?"
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"ការពិនិត្យ​របស់​ចំណង់ចំណូលចិត្ត​ក្នុងការអ៊ិនគ្រីប​របស់អ្នកទទួល​បានស្នើ​ថា "
-"អ្នក​ត្រូវតែ​សួរ ឬ មិន​អ៊ិនគ្រីប​សារនេះ ។\n"
+"ការពិនិត្យ​របស់​ចំណង់ចំណូលចិត្ត​ក្នុងការអ៊ិនគ្រីប​របស់អ្នកទទួល​បានស្នើ​ថា អ្នក​ត្រូវតែ​សួរ ឬ មិន​អ៊ិនគ្រីប​"
+"សារនេះ ។\n"
 "អ៊ិនគ្រីប​សារនេះ​ឬ ?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11168,13 +10704,12 @@ msgstr "កុំ​អ៊ិន​គ្រីប"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"អ្នក​បាន​ស្នើឲ្យ​អ៊ិនគ្រីប​សារ​នេះ ហើយ​ "
-"អ៊ិនគ្រីប​​ច្បាប់ចម្លង​មួយ​ទៅ​ឲ្យ​អ្នក​ផ្ទាល់ "
-"ប៉ុន្តែ​សោ​អ៊ិនគ្រីប​ដេលបាន​ទុកចិត្ត​យ៉ាងត្រឹមត្រូវ​ "
-"ត្រូវបាន​កំណត់​រចនាសម្ព័ន្ធសម្រាប់​អត្តសញ្ញាណ​នេះ ។"
+"អ្នក​បាន​ស្នើឲ្យ​អ៊ិនគ្រីប​សារ​នេះ ហើយ​ អ៊ិនគ្រីប​​ច្បាប់ចម្លង​មួយ​ទៅ​ឲ្យ​អ្នក​ផ្ទាល់ ប៉ុន្តែ​សោ​អ៊ិនគ្រីប​ដេលបាន​ទុកចិត្ត​"
+"យ៉ាងត្រឹមត្រូវ​ ត្រូវបាន​កំណត់​រចនាសម្ព័ន្ធសម្រាប់​អត្តសញ្ញាណ​នេះ ។"
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11183,13 +10718,13 @@ msgstr "ផ្ញើ​ដោយ​មិនបាន​អ៊ិនគ្រី
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "ផ្នែក​មួយចំនួន​របស់​សារ​នេះ​នឹងមិនត្រូវបាន​អ៊ិនគ្រីបទេ ។\n"
-"ការ​ផ្ញើ​តែ​សារដែលបាន​អ៊ិនគ្រីប​ខ្លះៗ អាច​បំពាន​លើ​គោលការណ៍​តំបន់ ហើយ​/​ឬ "
-"បែកធ្លាយ​នូវព័ត៌មាន​ដែល​អាចដឹង ។\n"
+"ការ​ផ្ញើ​តែ​សារដែលបាន​អ៊ិនគ្រីប​ខ្លះៗ អាច​បំពាន​លើ​គោលការណ៍​តំបន់ ហើយ​/​ឬ បែកធ្លាយ​នូវព័ត៌មាន​ដែល​"
+"អាចដឹង ។\n"
 "អ៊ិនគ្រីប​ផ្នែក​ទាំងអស់​ជំនួស​ឬ ?"
 
 #: messagecomposer.cpp:950
@@ -11200,8 +10735,7 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "សារនេះ​នឹង​មិន​ត្រូវបាន​អ៊ិនគ្រីប​ទេ ។\n"
-"ការផ្ញើ​សារ​ដែលមិនបាន​អ៊ិនគ្រីប អាច​បំពាន​លើ​គោលការណ៍​តំបន់ ហើយ/ឬ "
-"បែកធ្លាយ​នូវព័ត៌មាន​ដែល​អាចដឹង ។\n"
+"ការផ្ញើ​សារ​ដែលមិនបាន​អ៊ិនគ្រីប អាច​បំពាន​លើ​គោលការណ៍​តំបន់ ហើយ/ឬ បែកធ្លាយ​នូវព័ត៌មាន​ដែល​អាចដឹង ។\n"
 "អ៊ិនគ្រីប​សារ​ជំនួស​ឬ ?"
 
 #: messagecomposer.cpp:955
@@ -11212,94 +10746,83 @@ msgstr "អ៊ិនគ្រីប​គ្រប់​ផ្នែក​ទា
 msgid "Unencrypted Message Warning"
 msgstr "ការ​ព្រមាន​ចំពោះ​សារ​ដែល​មិនបាន​អ៊ិនគ្រីប"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>កំហុស ៖ កម្មវិធី​ខាងក្រោយ មិនបាន​ត្រឡប់​ទិន្នន័យ​អ៊ិនកូដ​ណាមួយឡើយ ។</p>"
-"<p>សូម​រាយការណ៍​កំហុស ៖"
+"<qt><p>កំហុស ៖ កម្មវិធី​ខាងក្រោយ មិនបាន​ត្រឡប់​ទិន្នន័យ​អ៊ិនកូដ​ណាមួយឡើយ ។</p><p>សូម​រាយការណ៍​កំហុស ៖"
 "<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>មិនមែន​តួអក្សរ​ទាំងអស់​ទាំងអស់​នោះទេ​ដែល​សម​ទៅ​នឹងការ​អ៊ិនកូដ​​ដែល​បាន​​ជ្រើ"
-"ស ។"
-"<br>"
-"<br>បើអញ្ចឹង​ផ្ញើសារ​ឬ ?</qt>"
+"<qt>មិនមែន​តួអក្សរ​ទាំងអស់​ទាំងអស់​នោះទេ​ដែល​សម​ទៅ​នឹងការ​អ៊ិនកូដ​​ដែល​បាន​​ជ្រើស ។<br><br>បើអញ្ចឹង​ផ្ញើសារ​"
+"ឬ ?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "តួអក្សរ​មួយ​ចំនួន​នឹងត្រូវបាន​បាត់បង់"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "បាត់បង់​តួអក្សរ"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "ផ្លាស់​ប្ដូរ​ការអ៊ិនកូដ"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"ចាប់តាំងពី​កម្មវិធី​ខាងក្រោយ​ដែល​បាន​ជ្រើស​ "
-"ហាក់ដូចជា​មិន​គាំទ្រ​ការចុះហត្ថលេខា​ នោះមិនអាច​ចុះហត្ថលេខា​លើ​សារ​នេះ​បានទេ ។ "
-"ការនេះ​គួរ​តែ​មិនដែល​កើត​ឡើង​ប្រាកដ​ណាស់ សូមរាយការណ៍កំហុស ។"
+"ចាប់តាំងពី​កម្មវិធី​ខាងក្រោយ​ដែល​បាន​ជ្រើស​ ហាក់ដូចជា​មិន​គាំទ្រ​ការចុះហត្ថលេខា​ នោះមិនអាច​ចុះហត្ថលេខា​លើ​"
+"សារ​នេះ​បានទេ ។ ការនេះ​គួរ​តែ​មិនដែល​កើត​ឡើង​ប្រាកដ​ណាស់ សូមរាយការណ៍កំហុស ។"
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"ចាប់តាំងពី​កម្មវិធី​ខាងក្រោយ​ដែល​បាន​ជ្រើស​ "
-"ហាក់ដូចជា​មិន​គាំទ្រ​ការចុះហត្ថលេខា​ នោះមិនអាច​ចុះហត្ថលេខា​លើ​សារ​នេះ​បានទេ ។ "
-"ការនេះ​គួរ​តែ​មិនដែល​កើត​ឡើង​ប្រាកដ​ណាស់ សូមរាយការណ៍កំហុស ។"
+"ចាប់តាំងពី​កម្មវិធី​ខាងក្រោយ​ដែល​បាន​ជ្រើស​ ហាក់ដូចជា​មិន​គាំទ្រ​ការចុះហត្ថលេខា​ នោះមិនអាច​ចុះហត្ថលេខា​លើ​"
+"សារ​នេះ​បានទេ ។ ការនេះ​គួរ​តែ​មិនដែល​កើត​ឡើង​ប្រាកដ​ណាស់ សូមរាយការណ៍កំហុស ។"
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "កំណត់​ហេតុ​ត្រួតពិនិត្យ GnuPG ​សម្រាប់​ប្រតិបត្តិការ​ចុះហត្ថលេខា"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
-msgstr ""
-"ការប្រតិបត្តិ​ចុះហត្ថលេខា​បាន​បរាជ័យ ។ សូម​ប្រាកដ​ថា កម្មវិធី​ភ្នាក់​ងារ gpg "
-"កំពង់​រត់ ។"
+msgstr "ការប្រតិបត្តិ​ចុះហត្ថលេខា​បាន​បរាជ័យ ។ សូម​ប្រាកដ​ថា កម្មវិធី​ភ្នាក់​ងារ gpg កំពង់​រត់ ។"
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"ចាប់តាំងពី​កម្មវិធី​ខាងក្រោយដែលបាន​ជ្រើស​ហាក់ដូចជាមិន​គាំទ្រនឹងការអ៊ិនគ្រីបមក "
-"សារ​នេះ​មិនអាច​ត្រូវបាន​អ៊ិនគ្រីប​បាន​ឡើយ ។ "
-"ការនេះ​គួរតែ​មិនដែល​កើត​ឡើង​ប្រាកដ​ណាស់ សូម​រាយការណ៍​កំហុស ។"
+"ចាប់តាំងពី​កម្មវិធី​ខាងក្រោយដែលបាន​ជ្រើស​ហាក់ដូចជាមិន​គាំទ្រនឹងការអ៊ិនគ្រីបមក សារ​នេះ​មិនអាច​ត្រូវបាន​អ៊ិនគ្រីប​"
+"បាន​ឡើយ ។ ការនេះ​គួរតែ​មិនដែល​កើត​ឡើង​ប្រាកដ​ណាស់ សូម​រាយការណ៍​កំហុស ។"
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "កំណត់​ហេតុ​ត្រួតពិនិត្យ GnuPG សម្រាប់​​ប្រតិបត្តិការ​អ៊ិនគ្រីប"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"ចាប់តាំងពី​​កម្មវិធី​ខាងក្រោយ​ដែល​បាន​ជ្រើស​ហាក់ដូចជា​មិន​គាំទ្រ​ការចុះហត្ថលេខា​"
-"ដែលបាន​បញ្ចូលគ្នាមក សារនេះ​មិនអាច​ត្រូវបាន​ចុះហត្ថលេខា និង​ អ៊ិនគ្រីប​បានឡើយ ។ "
-"ការនេះ​គួរតែ​មិន​ដែល​កើត​ឡើង​ប្រាកដណាស់ សូម​រាយការណ៍​កំហុស ។"
+"ចាប់តាំងពី​​កម្មវិធី​ខាងក្រោយ​ដែល​បាន​ជ្រើស​ហាក់ដូចជា​មិន​គាំទ្រ​ការចុះហត្ថលេខា​ដែលបាន​បញ្ចូលគ្នាមក សារនេះ​"
+"មិនអាច​ត្រូវបាន​ចុះហត្ថលេខា និង​ អ៊ិនគ្រីប​បានឡើយ ។ ការនេះ​គួរតែ​មិន​ដែល​កើត​ឡើង​ប្រាកដណាស់ សូម​រាយការណ៍​"
+"កំហុស ។"
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11320,15 +10843,14 @@ msgstr "ទ្រង់ទ្រាយ​ប្រអប់​បញ្ចូល
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"ជ្រើស​ថាតើ​អ្នក​ចង់​ទុក​សារនៅក្នុង​ថត​នេះជាលក្ខណៈឯកសារមួយ​ក្នុង​មួយសារ "
-"(maildir) ឬ ជាលក្ខណៈ​ឯកសារធំ (mbox) ។ KMail ប្រើ maildir តាមលំនាំដើម ហើយ "
-"នេះគ្រាន់តែ​ត្រូវការ​ឲ្យបាន​ផ្លាស់ប្ដូរ​នៅក្នុង​ពេល​វេលា​ដ៏កម្រ ។ "
-"ប្រសិន​បើ​អ្នក​មិនប្រាកដ សូម​ទុក​ជម្រើស​​នេះឲ្យ​នៅដដែល ។"
+"ជ្រើស​ថាតើ​អ្នក​ចង់​ទុក​សារនៅក្នុង​ថត​នេះជាលក្ខណៈឯកសារមួយ​ក្នុង​មួយសារ (maildir) ឬ ជាលក្ខណៈ​ឯកសារធំ "
+"(mbox) ។ KMail ប្រើ maildir តាមលំនាំដើម ហើយ នេះគ្រាន់តែ​ត្រូវការ​ឲ្យបាន​ផ្លាស់ប្ដូរ​នៅក្នុង​ពេល​"
+"វេលា​ដ៏កម្រ ។ ប្រសិន​បើ​អ្នក​មិនប្រាកដ សូម​ទុក​ជម្រើស​​នេះឲ្យ​នៅដដែល ។"
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11337,12 +10859,11 @@ msgstr "ថត​ មាន ៖"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"ជ្រើស​ថាតើ​អ្នកចង់​ឲ្យ​ថតថ្មី​ត្រូវបាន​ប្រើ​សម្រាប់​កន្លែងទុក​សំបុត្រ "
-"សម្រាប់​កន្លែង​ទុក​នៃ​ធាតុ​កម្មវិធី​ពហុអ្នកប្រើ ដូចជា​ភារកិច្ច ឬ កំណត់ចំណាំ ។ "
-"លំនាំដើម​គឺ​សំបុត្រ ។ ប្រសិនបើអ្នក​មិនប្រាកដ សូម​ទុក​វា​នៅដដែល ។"
+"ជ្រើស​ថាតើ​អ្នកចង់​ឲ្យ​ថតថ្មី​ត្រូវបាន​ប្រើ​សម្រាប់​កន្លែងទុក​សំបុត្រ សម្រាប់​កន្លែង​ទុក​នៃ​ធាតុ​កម្មវិធី​ពហុអ្នកប្រើ "
+"ដូចជា​ភារកិច្ច ឬ កំណត់ចំណាំ ។ លំនាំដើម​គឺ​សំបុត្រ ។ ប្រសិនបើអ្នក​មិនប្រាកដ សូម​ទុក​វា​នៅដដែល ។"
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11350,8 +10871,7 @@ msgstr "ចន្លោះ​ឈ្មោះ​សម្រាប់​ថត �
 
 #: newfolderdialog.cpp:170
 msgid "Select the personal namespace the folder should be created in."
-msgstr ""
-"ជ្រើស​ចន្លោះ​ឈ្មោះ​ផ្ទាល់ខ្លួន​ដែល​ថត​គួរតែ​ត្រូវបាន​បង្កើត​វា​នៅក្នុង ។"
+msgstr "ជ្រើស​ចន្លោះ​ឈ្មោះ​ផ្ទាល់ខ្លួន​ដែល​ថត​គួរតែ​ត្រូវបាន​បង្កើត​វា​នៅក្នុង ។"
 
 #: newfolderdialog.cpp:193
 msgid "Please specify a name for the new folder."
@@ -11381,8 +10901,7 @@ msgstr "លទ្ធផល​ផ្សេងគ្នា​ សម្រាប�
 msgid "The crypto engine returned no cleartext data."
 msgstr "ម៉ាស៊ីន crypto បានត្រឡប់​ទិន្នន័យ​ដែល​មិនបាន​ជម្រះ​អត្ថបទ ។"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "ស្ថានភាព ៖ "
 
@@ -11411,12 +10930,11 @@ msgstr "គ្មាន​រកឃើញ​កម្មវិធី​ជំន
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"សារ​ត្រូវបាន​ចុះហត្ថលេខា​ "
-"ប៉ុន្តែ​សុពលភាព​របស់​ហត្ថលេខា​​មិនអាច​ត្រូវបាន​ផ្ទៀងផ្ទាត់​បានទេ ។<br />"
-"ហេតុផល ៖ %1"
+"សារ​ត្រូវបាន​ចុះហត្ថលេខា​ ប៉ុន្តែ​សុពលភាព​របស់​ហត្ថលេខា​​មិនអាច​ត្រូវបាន​ផ្ទៀងផ្ទាត់​បានទេ ។<br /"
+">ហេតុផល ៖ %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11450,30 +10968,26 @@ msgstr "កម្មវិធី​ជំនួយ Crypto \"%1\" មិនអា
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>ចំណាំ ៖</b> សារ​ HTML នេះ​អាច​មាន​សេចក្ដី​យោង​​​ខាងក្រៅដែលទៅកាន់​រូបភាព ។ល។ "
-"ចំពោះ​ហេតុផល សុវត្ថិភាព​/ភាព​ជា​ឯកជន "
-"សេចក្ដី​យោង​ខាងក្រៅគឺមិនត្រូវបាន​ផ្ទុក​ឡើយ ។ "
-"ប្រសិន​បើអ្នកទុកចិត្ត​លើអ្នក​ផ្ញើ​សារនេះ "
-"ពេលនោះ​អ្នក​អាច​ផ្ទុក​សេចក្ដី​យោង​ខាងក្រៅ​​សម្រាប់​សារ​នេះ <a "
-"href=\"kmail:loadExternal\">ដោយ​ចុច​នៅទីនេះ</a> ។"
+"<b>ចំណាំ ៖</b> សារ​ HTML នេះ​អាច​មាន​សេចក្ដី​យោង​​​ខាងក្រៅដែលទៅកាន់​រូបភាព ។ល។ ចំពោះ​ហេតុផល "
+"សុវត្ថិភាព​/ភាព​ជា​ឯកជន សេចក្ដី​យោង​ខាងក្រៅគឺមិនត្រូវបាន​ផ្ទុក​ឡើយ ។ ប្រសិន​បើអ្នកទុកចិត្ត​លើអ្នក​ផ្ញើ​"
+"សារនេះ ពេលនោះ​អ្នក​អាច​ផ្ទុក​សេចក្ដី​យោង​ខាងក្រៅ​​សម្រាប់​សារ​នេះ <a href=\"kmail:loadExternal"
+"\">ដោយ​ចុច​នៅទីនេះ</a> ។"
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>ចំណាំ ៖</b> នេះ​ជា​សារ​ HTML មួយ ។ ចំពោះ​ហេតុផល​សុវត្ថិភាព "
-"គឺបាន​បង្ហាញ​តែ​កូដ​ HTML ដើម​តែប៉ុណ្ណោះ ។ "
-"ប្រសិនបើ​អ្នក​ទុកចិត្ត​លើ​អ្នក​ផ្ញើ​សារ​នេះ ពេល​នោះ​អ្នក​អាចធ្វើ​ឲ្យ​​ HTML "
-"ដែលបាន​ធ្វើ​ទ្រង់ទ្រាយ​ បង្ហាញ​សម្រាប់​សារ​នេះ <a href=\"kmail:showHTML\">"
-"ដោយចុច​នៅត្រង់នេះ</a> ។"
+"<b>ចំណាំ ៖</b> នេះ​ជា​សារ​ HTML មួយ ។ ចំពោះ​ហេតុផល​សុវត្ថិភាព គឺបាន​បង្ហាញ​តែ​កូដ​ HTML ដើម​"
+"តែប៉ុណ្ណោះ ។ ប្រសិនបើ​អ្នក​ទុកចិត្ត​លើ​អ្នក​ផ្ញើ​សារ​នេះ ពេល​នោះ​អ្នក​អាចធ្វើ​ឲ្យ​​ HTML ដែលបាន​ធ្វើ​"
+"ទ្រង់ទ្រាយ​ បង្ហាញ​សម្រាប់​សារ​នេះ <a href=\"kmail:showHTML\">ដោយចុច​នៅត្រង់នេះ</a> ។"
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11703,8 +11217,7 @@ msgstr "​ការព្រមាន ៖"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"អាសយដ្ឋាន​សំបុត្រ​របស់អ្នកផ្ញើ គឺ​​មិនត្រូវបាន​ទុក​នៅក្នុង​ %1 "
-"ដែលត្រូវបាន​ប្រើសម្រាប់​ការចុះហត្ថលេខាឡើយ​ ។"
+"អាសយដ្ឋាន​សំបុត្រ​របស់អ្នកផ្ញើ គឺ​​មិនត្រូវបាន​ទុក​នៅក្នុង​ %1 ដែលត្រូវបាន​ប្រើសម្រាប់​ការចុះហត្ថលេខាឡើយ​ ។"
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11716,12 +11229,11 @@ msgstr "បានទុក ៖ "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"គ្មាន​​អាសយដ្ឋាន​សំបុត្រ​​​បាន​ទុក​នៅក្នុង %1 "
-"ដែលបានប្រើ​សម្រាប់​ការចុះហត្ថលេខាឡើយ "
-"ដូច្នេះ​យើង​មិនអាច​ប្រៀបធៀប​វា​ទៅកាន់​អាសយដ្ឋាន​របស់​អ្នក​ផ្ញើ​ %2 ទេ ។"
+"គ្មាន​​អាសយដ្ឋាន​សំបុត្រ​​​បាន​ទុក​នៅក្នុង %1 ដែលបានប្រើ​សម្រាប់​ការចុះហត្ថលេខាឡើយ ដូច្នេះ​យើង​មិនអាច​"
+"ប្រៀបធៀប​វា​ទៅកាន់​អាសយដ្ឋាន​របស់​អ្នក​ផ្ញើ​ %2 ទេ ។"
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11836,16 +11348,16 @@ msgstr "សារ​កំហុស Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"ម៉ាស៊ីន​បម្រើ​ POP3 របស់អ្នក (គណនី ៖ %1)​ មិនគាំទ្រ​ពាក្យ​បញ្ជា UIDL ៖ "
-"ពាក្យ​បញ្ជា​នេះគឺ​ត្រូវបានទាមទារឲ្យ​កំណត់ តាមវិធីដែល​អាចទុកចិត្ត​បាន "
-"ដែល​សំបុត្រ​នៅលើ​ម៉ាស៊ីន​បម្រើ KMail បាន​មើល​ឃើញ​ពី​មុន​រួចទៅ​ហើយ ។\n"
-"លក្ខណៈ​ពិសេស​ដែល​ត្រូវ​ទុក​សំបុត្រ​នៅលើ​ម៉ាស៊ីន​បម្រើ​នឹង​មិនធ្វើការ​បាន​ត្រឹមត្"
-"រូវ​ ។"
+"ម៉ាស៊ីន​បម្រើ​ POP3 របស់អ្នក (គណនី ៖ %1)​ មិនគាំទ្រ​ពាក្យ​បញ្ជា UIDL ៖ ពាក្យ​បញ្ជា​នេះគឺ​"
+"ត្រូវបានទាមទារឲ្យ​កំណត់ តាមវិធីដែល​អាចទុកចិត្ត​បាន ដែល​សំបុត្រ​នៅលើ​ម៉ាស៊ីន​បម្រើ KMail បាន​មើល​ឃើញ​ពី​មុន​"
+"រួចទៅ​ហើយ ។\n"
+"លក្ខណៈ​ពិសេស​ដែល​ត្រូវ​ទុក​សំបុត្រ​នៅលើ​ម៉ាស៊ីន​បម្រើ​នឹង​មិនធ្វើការ​បាន​ត្រឹមត្រូវ​ ។"
 
 #: popaccount.cpp:752
 msgid ""
@@ -11861,10 +11373,11 @@ msgstr "បាន​ទៅ​ប្រមូលយក​ %n សារពី %1 
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"កំពុង​ទៅ​ប្រមូលយក​សារ %1 នៃ %2 (%3 នៃ %4 គីឡូបៃ) សម្រាប់ %5@%6 (%7 គីឡូបៃ "
-"ដែលមាន​លើម៉ាស៊ីន​បម្រើ) ។"
+"កំពុង​ទៅ​ប្រមូលយក​សារ %1 នៃ %2 (%3 នៃ %4 គីឡូបៃ) សម្រាប់ %5@%6 (%7 គីឡូបៃ ដែលមាន​លើម៉ាស៊ីន​"
+"បម្រើ) ។"
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11880,1960 +11393,15 @@ msgstr "ចម្លើយ​មិនត្រឹមត្រូវ​ពី​
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"ម៉ាស៊ីនបម្រើ​របស់អ្នក​មិនគាំទ្រ​ពាក្យ​បញ្ជា TOP ទេ ។ "
-"ដូច្នេះ​ដំបូង​វា​មិនអាច​ធ្វើការ​ប្រមូល​យក​បឋមកថា​របស់សំបុត្រ​ដែល​ធំ​ "
-"សូម​ធ្វើការ​ទាញយក​ពួក​វា​ជាមុន ។"
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "​ទៅ"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "ថត"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "សារ"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "ឆ្លើយ​តបពិសេស"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "​ទៅ​មុខ"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "របា​ឧបករណ៍​ HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "ការចុះហត្ថលេខា"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "ចុះហត្ថលេខា​លើសារ​ដោយស្វ័យប្រវត្តិ"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"នៅពេល​ដែល​បាន​បើក​ជម្រើស​នេះ "
-"សារ​​ទាំងអស់​ដែល​អ្នក​ផ្ញើ​នឹងត្រូវបាន​ចុះហត្ថលេខា​តាម​លំនាំដើម ។ ពិតមែនហើយ "
-"វា​នៅតែអាច​​បិទ​ការ​ចុះហត្ថលេខា​សម្រាប់​សារ​ផ្ទាល់ខ្លួន​នីមួយៗ ។"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "កំពុង​អ៊ិនគ្រីប"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"នៅពេល​អ៊ិនគ្រីប​អ៊ីមែល "
-"តែងតែ​អ៊ិនគ្រីប​វិញ្ញាបនបត្រ​របស់​អត្តសញ្ញាណ​ផ្ទាល់​របស់​អ្នក​ខ្ញុំ​ដែរ"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"នៅពេល​ដែល​បានបើក​ជម្រើស​នេះ សារ​/ឯកសារ "
-"នឹងមិនត្រឹមតែ​ត្រូវបាន​អ៊ិនគ្រីប​ដោយប្រើ​សោ​សាធារណៈ​របស់​អ្នក​ទទួល​ប៉ុណ្ណោះទេ "
-"ប៉ុន្តែ​វាក៏ត្រូវបាន​ប្រើ​ជាមួយ​សោ​របស់អ្នក​ផងដែរ ។ "
-"វា​នឹងអនុញ្ញាត​ឲ្យអ្នក​ឌិគ្រីប​សារ​/ឯកសារ​នៅពេលក្រោយ ។ "
-"ជាទូទៅ​នេះ​ជា​គំនិត​ដ៏ល្អ ។"
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "បង្ហាញ​អត្ថបទ​ដែលបាន​​ចុះហត្ថលេខា/បាន​អ៊ិនគ្រីប​បន្ទាប់ពីការតែង"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"នៅពេល​ដែលបាន​បើក​ជម្រើស​នេះ អត្ថបទ​ដែលបាន​ចុះហត្ថលេខា​/​បាន​អ៊ិនគ្រីប "
-"នឹងត្រូវបាន​បង្ហាញ​នៅក្នុង​បង្អួច​ដែល​ផ្សេងពីគ្នា "
-"ដែលអនុញ្ញាត​ឲ្យ​អ្នកដឹង​អំពី​របៀប​ដែលវា​នឹងមាន​លក្ខណៈ​ដូចម្ដេច​​នៅមុនពេល​ដែលផ្ញើ"
-"វា ។ នេះ​ជាគំនិតល្អ​ "
-"នៅពេលដែលអ្នក​កំពុង​ផ្ទៀងផ្ទាត់​ថាប្រព័ន្ធ​អ៊ិនគ្រីបរបស់​អ្នក​ធ្វើការ ។"
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "ទុក​សារ​ដែលបាន​ផ្ញើ​ បាន​អ៊ិនគ្រីប"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "ធីក​ដើម្បី​ទុក​សារ​ បានអ៊ិនគ្រីប"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ទុក​សារ​​បានអ៊ិនគ្រីប</h1>\n"
-"នៅពេល​ដែល​បាន​ធីក​ប្រអប់នេះ សារដែលបានផ្ញើគឺត្រូវបាន​ទុក​ សារដែល​បានអ៊ិនគ្រីប "
-"ដូចដែល​ពួកវា​ត្រូវបាន​ផ្ញើ ។ វា​មិនត្រូវបាន​ផ្ដល់អនុសាសន៍ឡើយ "
-"ដែលអ្នកនឹង​មិន​អាច​អានសារ​បានទៅមុខទៀតទេ "
-"ប្រសិនបើ​វិញ្ញាបនបត្រ​ដែល​ចាំបាច់​ផុតកំណត់ ។\n"
-"<p>\n"
-"ទោះជាយ៉ាងណា​ក៏ដោយ ប្រហែល​ជាមាន​ខច្បាប់មូលដ្ឋាន​ដែលតម្រូវឲ្យអ្នកបើកជម្រើស​នេះ ។ "
-"នៅពេល​ដែលឋិតក្នុង​មន្ទិលសង្ស័យ "
-"សូម​ពិនិត្យ​ជាមួយ​អ្នកគ្រប់គ្រង​មូលដ្ឋានរបស់អ្នក ។\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "បង្ហាញ​សោ​អ៊ិនគ្រីប​ដើម្បី​អនុម័ត​ជានិច្ច"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"នៅពេល​ដែល​បាន​បើក​ជម្រើស​នេះ "
-"កម្មវិធី​នឹង​បង្ហាញបញ្ជី​នៃ​សោសាធារណៈ​ដល់អ្នកជានិច្ច​ពី​សោ​មួយណាដែលបាន​ជ្រើសមួយ​"
-"ដែល​វា​នឹង​ប្រើ​ដើម្បី​ធ្វើការអ៊ិនគ្រីប ។ ប្រសិនបើ​វា​បិទ "
-"នោះកម្មវិធី​នឹង​បានតែ​បង្ហាញ​ប្រអប់ប៉ុណ្ណោះ "
-"ប្រសិនបើវា​មិនអាច​រក​សោ​ដែល​ត្រឹមត្រូវបានទេ ឬ "
-"ប្រសិនបើមាន​​សោ​មួយចំនួន​ដែលអាចប្រើ​បាន ។"
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "អ៊ិនគ្រីប​សារ​ដោយស្វ័យប្រវត្តិ​នៅពេល​ណា​ក៏ដោយ​ឲ្យ​តែ​អាច​ធ្វើ​ទៅ​បាន"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"នៅពេល​ដែលបាន​បើក​ជម្រើស​នេះ សារទាំងអស់ដែលអ្នក​បាន​ផ្ញើនឹងត្រូវ​អ៊ិនបានគ្រីប "
-"នៅពេល​ណាក៏ដោយ ការអ៊ិនគ្រីប​អាច​ធ្វើទៅបាន និង​បាន​ប៉ង​ធ្វើ ។ ពិតណាស់​ "
-"វា​នៅតែ​អាច​​បិទ​ការ​អ៊ិនគ្រីប​ដោយស្វ័យប្រវត្តិ​សម្រាប់​សារ​ផ្ទាល់ខ្លួន​នីមួយៗ ។"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "កុំ​ចុះហត្ថលេខា​/អ៊ិនគ្រីប នៅពេល​ដែល​កំពុង​រក្សាទុក​ជា​សេចក្ដីព្រាង"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "តើ​វា​ដំណើរ​ការ​យ៉ាង​ដូចម្ដេច ?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "ជូនចំពោះ ៖ "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "ចម្លងជូន ៖ "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "សកល"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "ឆ្លើយតប"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "ឆ្លើយតប​ទៅ​អ្នក​ទាំងអស់..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "បញ្ជូន​បន្ត"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "​ផ្លូវ​កាត់ ៖"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "ប្រភេទ​ពុម្ព ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "លក្ខណៈ​សម្បត្តិ​របស់​ថត"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "ថត​កាន់កាប់​​បញ្ជី​សំបុត្រ​រួម"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "រាយ​អាសយដ្ឋាន ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "ធម្មតា ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "មិនបាន​អាន  ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "ការផុត​កំណត់​នៃ​សារ"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "ផុត​កំណត់​បន្ទាប់ពី ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "ផុត​កំណត់​សារ​ដែល​បាន​អាន"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "ផុត​កំណត់​បន្ទាប់ពី ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "សារ​មិនទាន់អាន​​ផុត​កំណត់"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "​ថ្ងៃ"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "​សប្ដាហ៍"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "​ខែ"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "​កម្រិត​ខ្ពស់"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "អត្តសញ្ញាណ​អ្នកផ្ញើ ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "ទ្រង់ទ្រាយ​ផ្ទុក ៖"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "ការបង្ហាញ​បញ្ជី ៖"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "វិញ្ញាបនបត្រ​​ដោយប្រើ CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"ប្រិសន​បើ​បាន​ជ្រើស​ជម្រើស​នេះ វិញ្ញាបនបត្រ S/MIME "
-"គឺត្រូវបាន​ធ្វើ​ឲ្យមាន​សុពលភាព ដោយប្រើ​បញ្ជី​ដកហូត​វិញ្ញាបនបត្រ​វិញ (CRLs) ។"
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "វិញ្ញាបនបត្រ​សុពលកម្ម​នៅលើបណ្ដាញ (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"ប្រសិនបើ​បានជ្រើស​ជម្រើស​នេះ វិញ្ញាបនបត្រ​ S/MIME  "
-"គឺត្រូវបាន​ធ្វើ​ឲ្យមាន​សុពលភាព​នៅលើបណ្ដាញ "
-"ដោយប្រើ​ពិធីការ​ស្ថានភាព​វិញ្ញាបនបត្រ​នៅលើបណ្ដាញ (OCSP) ។ បំពេញ​ URL "
-"នៃ​អ្នកឆ្លើយតប OCSP ខាងក្រោម ។"
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "សុពលកម្ម​វិញ្ញបនបត្រ​នៅលើ​បណ្ដាញ"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP អ្នកផ្ញើ URL ៖"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"បញ្ចូល​​អាសយដ្ឋាន​នៃ​ម៉ាស៊ីនបម្រើ​នៅទីនេះ​សម្រាប់​សុពលកម្ម​នៅលើ​បណ្ដាញ​នៃ​វិញ្ញា"
-"បនបត្រ (អ្នកឆ្លើយតប OCSP) ។ URL តែងតែ​ចាប់ផ្ដើម​ជាមួយ http:// ។"
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "ហត្ថលេខា​អ្នកឆ្លើយតប OCSP ៖"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "មិនអើពើ​នឹង​សេវា URL នៃ​វិញ្ញាបនបត្រ"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "កុំ​ពិនិត្យ​មើល​គោលការណ៍​វិញ្ញាបនបត្រ"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"តាមលំនាំដើម GnuPG ប្រើ​ឯកសារ ~/.gnupg/policies.txt "
-"ដើម្បី​ពិនិត្យ​មើល​ថាតើ​គោលការណ៍​វិញ្ញាបនបត្រ​​គឺត្រូវបាន​អនុញ្ញាត​ឬអត់ ។ "
-"ប្រសិន​បើ​បាន​ជ្រើស​ជម្រើស​នេះ គោលការណ៍​មិន​ត្រូវបាន​ពិនិត្យ​ឡើយ ។"
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "កុំពិគ្រោះ CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"ប្រសិន​បើ​ជម្រើស​នេះ​ត្រូវបាន​ធីក "
-"បញ្ជី​ដកហូត​វិញ្ញាបនបត្រ​វិញ​គឺ​មិនធ្លាប់ត្រូវបាន​ប្រើ​ដើម្បី​ធ្វើឲ្យវិញ្ញាបនបត្"
-"រ S/MIME មានសុពលភាព​ឡើយ ។"
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "ទៅប្រមូល​យក​វិញ្ញាបនបត្រ​អ្នកចេញ​ដែល​បាត់បង់"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"ប្រសិនបើ​ជម្រើស​នេះ​ត្រូវបាន​ធីក វិញ្ញាបនបត្រ​អ្នកចេញ​ដែល​បាត់បង់ "
-"គឺត្រូវបាន​ទៅប្រមូល​យក​នៅពេលដែល​ចាំបាច់ "
-"(វា​អនុវត្ត​ទៅ​វិធីសាស្ត្រ​សុពលកម្មទាំងពី គឺ CRLs និង OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "ការស្នើ HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "កុំ​ធ្វើ​ការ​ស្នើ​ HTTP មួយចំនួន"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "បិទ​ការប្រើប្រាស់នៃ​ HTTP សម្រាប់ S/MIME ទាំងមូល ៖"
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "ប្រើ​ប្រូកស៊ី​នេះ​សម្រាប់​ការ​ស្នើ HTTP ៖ "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "ប្រើ​ប្រព័ន្ធប្រូកស៊ី HTTP ៖"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"ប្រសិនបើ​ជម្រើស​នេះ​ត្រូវបាន​ជ្រើស តម្លៃ​នៃ​ប្រូកស៊ី HTTP បាន​បង្ហាញ​នៅខាងស្ដាំ "
-"(ដែល​មកពី​អថេរ​បរិស្ថាន http_proxy) នឹងត្រូវបាន​ប្រើ​សម្រាប់​សំណើរ​ HTTP "
-"មួយចំនួន ។"
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"បញ្ចូល​ទីតាំង​នៃ​ប្រូកស៊ី HTTP របស់អ្នក​នៅទីនេះ "
-"ដែល​នឹងត្រូវបាន​ប្រើ​សម្រាប់​គ្រប់​ការស្នើ​ HTTP ដែលទាក់ទង​នឹង S/MIME ទាំងអស់ ។ "
-"វាក្យសម្ពន្ធ​គឺ ម៉ាស៊ីន:ច្រក សម្រាប់​វត្ថុ​ myproxy.nowhere.com:3128 ។"
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "មិនអើពើ​នឹងចំណុច​ចែកចាយ​ HTTP CRL នៃ​វិញ្ញាបនបត្រឡើយ"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"នៅពេល​ដែលកំពុង​ស្វែងរក​ទីតាំង​នៃ CRL, វិញ្ញាបនបត្រ​ដែល​ត្រូវបាន​សាកល្បង "
-"ជាធម្មតាមាន អ្វី​ដែល​គេស្គាល់ថាជា​ធាតុបញ្ចូល \"ចំណុច​ចែកចាយ CRL\" (DP), ដែលជា​ "
-"URLs ពិពណ៌នា​អំពី​វិធី​ដើម្បី​ចូលដំណើរការ URL ។ ធាតុបញ្ចូល​ DP "
-"ដែលបាន​រកឃើញ​ដំបូង គឺត្រូវបាន​ប្រើ ។  ជាមួយ​ជម្រើស​ធាតុបញ្ចូល​ទាំងអស់ "
-"ការប្រើ​​គ្រោងការណ៍ HTTP ត្រូវបាន​មិអើពើ​នៅពេលដែលកំពុង​រកមើល DP ដែលសមរម្យ ។"
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "ការស្នើ LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "មិនធ្វើ​ការ​ស្នើ​ LDAP ណាមួយ​ឡើយ"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "បិទ​ការប្រើ​ប្រាស់​នៃ LDAP សម្រាប់ S/MIME ទាំងមូល ។"
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "មិនអើពើ​នឹងចំណុច​ចែកចាយ LDAP CRL នៃ​វិញ្ញាបនបត្រ"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"នៅពេល​ដែល​កំពុង​រកមើល​ទីតាំង CRL វិញ្ញាបនបត្រ​ដែល​ត្រូវបាន​សាកល្បង "
-"ជាធម្មតាមានអ្វី​ដែល​គេ​ស្គាល់ថាជា​ធាតុបញ្ចូល \"ចំណុចចែកចាយ CRL\" (DP) "
-"ដែលជា​​ការពណ៌នា​ពី​ URLs ដែលជា​វិធី​ចូល​ទៅ​ដំណើរការ URL ។ ធាតុ​បញ្ចូល​ DP "
-"ដែលបាន​រកឃើញ​មុនគេ​គឺត្រូវ​បានប្រើ ។  ជាមួយ​ជម្រើស​នេះ​ដែរ "
-"ធាតុបញ្ចូល​ទាំងអស់​​ដែលប្រើ​​គ្រោងការណ៍ LDAP​ "
-"គឺត្រូវបាន​មិនអើពើ​នៅពេល​ដែល​កំពុង​រកមើល​ DP ដែលសមរម្យ​ ។"
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "ម៉ាស៊ីនចម្បង​សម្រាប់​សំណើ LDAP ៖"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"ការបញ្ចូល​ម៉ាស៊ីន​បម្រើ LDAP នៅត្រង់នេះ នឹងធ្វើ​ឲ្យ​សំណើរ LDAP "
-"ទាំងអស់ទៅកាន់ម៉ាស៊ីនបម្រើ​នោះ​មុនគេ ។ កាន់តែ​ច្បាស់​ជាងនេះទៀត "
-"ការកំណត់​នេះ​បដិសេធ​ចំពោះ​ម៉ាស៊ីន​បម្រើ និង​ "
-"ផ្នែក​ច្រក​ដែលបានបញ្ជាក់មួយ​ចំនួននៅក្នុង LDAP URL "
-"និង​ក៏នឹងត្រូវបាន​ប្រើ​ដែរ​ប្រសិនបើ​ម៉ាស៊ីន​បម្រើ និង​ច្រកត្រូវបាន​លុបចេញពី "
-"URL ។ ម៉ាស៊ីនបម្រើ​ LDAP ផ្សេងទៀត នឹងត្រូវបានប្រើតែប៉ុណ្ណោះ "
-"ប្រសិនបើ​ការតភ្ជាប់ទៅកាន់\"ប្រូកស៊ី\" បានបរាជ័យនោះ ។\n"
-"វាក្យ​សម្ពន្ធ គឺ \"HOST\" ឬ \"HOST:PORT\" ។ ប្រសិនបើបានលុប PORT នោះ​ច្រក 389 "
-"(ច្រក LDAP ខ្នាតគំរូ) ត្រូវបាន​ប្រើ ។"
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "បន្ថែម Snippet"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "​បន្ថែម"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "Snippet ៖"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "ក្រុម ៖"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "កំណត់​ការ​ច្រឹប"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "ព័ត៌មាន​ជំនួយ"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "បង្ហាញអត្ថបទ​របស់ snippet នៅ​ក្នុង​ព័ត៌មាន​ជំនួយ"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"សម្រេចិត្ត​ប្រសិនបើ​ព័ត៌មាន​ជំនួយ​គួរ​ត្រូវ​បានបង្ហាញ​ដោយ​មាន​អត្ថបទ​ពី​បន្ទាត់​"
-"ដែលបាន​ចំណាំ"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "អថេរ"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "វិធីសាស្ត្រ​បញ្ចូល​សម្រាប់​អថេរ"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "ប្រអប់​តែ​មួយ​សម្រាប់​អថេរ​នីមួយៗ​នៅ​ក្នុង snippet"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-"ប្រអប់​បញ្ចូល​មួយ​នឹង​ត្រូវ​បានបង្ហាញ​សម្រាប់​​គ្រប់​អថេរ​នៅ​ក្នុង snippet"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "ប្រអប់​មួយ​សម្រាប់​អថេរ​នៅ​ក្នុង snippet"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"ប្រអប់​តែ​មួយ​នឹង​ត្រូវ​បាន​បង្ហាញ "
-"នៅ​កន្លែង​ដែលអ្នកអាច​បញ្ចូល​តម្លៃ​សម្រាប់​អថេរ​ទាំងអស់​នៅ​ក្នុង snippet"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "ឧប​ករណ៍​កំណត់​ព្រំដែន ៖"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "ការ​កំណត់​រចនាសម្ព័ន្ធ​ពុម្ព"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "ឆ្លើយ​តប​ទៅ​អ្នក​ផ្ញើ"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "ឆ្លើយ​តប​ទៅ​អ្នក​ទាំងអស់/ឆ្លើយ​តប​ទៅ​បញ្ជី"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "បញ្ជូន​សារ​បន្ត"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "ព្រមាន​ នៅពេល​ដែល​កំពុងព្យាយាម​ផ្ញើ​សារ​ដែល​មិនទាន់បាន​ចុះហត្ថលេខា"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"ពិនិត្យ​មើល​ដើម្បី​ទទួល​យក​ការព្រមាន​នៅពេល​ដែល​កំពុង​ផ្ញើ​សារ​ដែល​មិនទាន់​បាន​ចុ"
-"ះហត្ថលេខា ។"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន​ នៅពេលដែល​កំពុងព្យាយាម​ផ្ញើ​សារ​ដែល​មិនទាន់បាន​ចុះហត្ថលេខា</h1>\n"
-"ប្រសិនបើ​បាន​ធីក​ប្រអប់​នេះ "
-"អ្នកនឹង​ត្រូវបាន​ព្រមាន​នៅពេល​ដែល​អ្នកព្យាយាម​ផ្ញើ​សារ​មួយផ្នែក​ ឬ​ "
-"ទាំងមូលដែលមិនបាន​​ចុះហត្ថលេខានោះ ។\n"
-"<p>\n"
-"វា​ត្រូវ​បាន​ផ្ដល់​អនុសាសន៍​ឲ្យ​ទុក​ជម្រើស​នេះ​នៅបើក​សម្រាប់​ការរួមបញ្ចូល​គ្នា​អ"
-"តិបរមា ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "ព្រមាន​ នៅពេល​កំពុង​ព្យាយាមផ្ញើ​សារ​ដែល​មិនបាន​អ៊ិនគ្រីប"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "ធីក​ដើម្បី​ទទួល​យក​ការ​ព្រមាន នៅពេល​​សារ​ដែល​មិនបាន​អ៊ិនគ្រីប ។"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន នៅពេល​ដែល​កំពុងព្យាយាម​ផ្ញើ​សារ​ដែល​មិនបាន​អ៊ិនគ្រីប</h1>\n"
-"ប្រសិនបើ​បាន​ធីកប្រអប់​ននេះ អ្នក​នឹងត្រូវបាន​ព្រមាន​នៅពេល​ដែល​ព្យាយាម​ផ្ញើផ្នែក "
-"ឬ សារទាំងមូលដែលមិនបាន​អ៊ិនគ្រីប ។\n"
-"<p>\n"
-"វា​ត្រូវបាន​ផ្ដល់អនុសាសន៍​ឲ្យទុក​ជម្រើស​នេះ​នៅបើក​សម្រាប់​ការរួមបញ្ចូល​គ្នា​អតិប"
-"រមា ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"ព្រមាន​ ប្រសិនបើ​អាសយដ្ឋាន​អ៊ីមែល​របស់​អ្នកទទួល​​មិនមាន​នៅក្នុង​វិញ្ញាបនបត្រ"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "ធីកដើម្បី​ទទួល​ការ​ព្រមាន​ ប្រសិនបើ​អាសយដ្ឋាន​មិននៅក្នុង​វិញ្ញាបនបត្រ"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន​ ប្រសិនបើ​អាសយដ្ឋាន​អ៊ីមែល​របស់​អ្នកទទួលមិន​នៅក្នុង​វិញ្ញាបនបត្រ</h1>"
-"\n"
-"ប្រសិនបើ​បាន​ធីក​ជម្រើស​នេះ ការព្រមាន​ត្រូវបាន​ប្រកាស់ "
-"ប្រសិនបើ​​អាសយដ្ឋាន​សំបុត្រ​​របស់អ្នកទទួល​មិនមាន​នៅក្នុង​វិញ្ញាបនបត្រ​ដែល​បានប្រ"
-"ើ​សម្រាប់​ការអ៊ិនគ្រីប ។\n"
-"<p>\n"
-"វាត្រូវបាន​ផ្ដល់អនុសាសន៍​ឲ្យ​ទុក​ជម្រើស​នេះ​នៅបើក​សម្រាប់​សុវត្ថិភាព​អតិបរមា ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"ព្រមាន ប្រសិនបើ​វញ្ញាបនបត្រ/សោ ជិតផុតកំណត់ "
-"(កំណត់​រចនាសម្ព័ន្ធ​កម្រិតពន្លឺ​ខាងក្រោម)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "សម្រាប់​ការចុះ​ហត្ថលេខា"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "សម្រាប់​ការបម្លែង​ជាកូដ"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "​ ថ្ងៃ"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "ជ្រើស​ចំនួន​ថ្ងៃ​នៅទីនេះ"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន​ប្រសិនបើ​វិញ្ញាបនបត្រ​ហត្ថលេខា​ផុតកំណត់</h1>\n"
-"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា​ "
-"ដែល​វិញ្ញាបនបត្រ​ហត្ថលេខា​គួរ​តែ​ត្រឹមត្រូវ​ដោយក្រៅពីការប្រកាស់ការព្រមាន ។\n"
-"<p>\n"
-"ការកំណត់​ SPHINX ដែលបានផ្ដល់អនុសាសន៍​គឺ 14 ថ្ងៃ ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន​ប្រសិនបើ​វិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប​​ផុតកំណត់</h1>\n"
-"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា​ដែល​វិញ្ញាបនបត្រ​​ការអ៊ិនគ្រីប​គួរតែត្រឹមត្រូវ​ដោយ​គ្មា"
-"ន​ការប្រកាស់​ការព្រមាន ។\n"
-"<p>\n"
-"ការកំណត់ SPHINX ដែលបាន​ផ្ដល់អនុសាសន៍គឺ 14 ថ្ងៃ ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន​ ប្រសិនបើ​វិញ្ញាបនបត្រ​នៅក្នុង​លំដាប់​ផុតកំណត់</h1>\n"
-"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា​ "
-"ដែល​វិញ្ញាបនបត្រ​នៅក្នុង​លំដាប់​គួរតែត្រឹមត្រូវ​ដោយគ្មាន​ការប្រកាស់​ការព្រមាន ។"
-"\n"
-"<p>\n"
-"ការកំណត់​ SPHINX ដែលបាន​ផ្ដល់អនុសាសន៍គឺ 14 ថ្ងៃ ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន​​ ប្រសិន​បើវិញ្ញាបនបត្រ CA ផុតកំណត់</h1>\n"
-"ជ្រើស​ចំនួន​ថ្ងៃ​​អប្បរមា​ដែល​វិញ្ញាបនបត្រ CA "
-"គួរ​តែ​ត្រឹមត្រូវ​​ដោយគ្មាន​ការ​ប្រកាស់​ការព្រមាន ។\n"
-"<p>\n"
-"ការកំណត់ SPHINX ដែលបានផ្ដល់​អនុសាសន៍​គឺ 14 ថ្ងៃ ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>ព្រមាន​ប្រសិន​បើ​វិញ្ញាបនបត្រដើម​ផុតកំណត់</h1>\n"
-"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា "
-"ដែល​វិញ្ញាបនបត្រ​ដើម​គួរតែ​ត្រឹមត្រូវ​ក្រៅពី​ការប្រកាស់ការព្រមាន ។\n"
-"<p>\n"
-"ការកំណត់ SPHINX ដែល​បាន​ផ្ដល់អនុសាសន៍គឺ 14 ថ្ងៃ ។\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "សម្រាប់​វិញ្ញាបនបត្រ​ដើម ៖"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "សម្រាប់​វិញ្ញាបនបត្រ​ CA មធ្យម ៖"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "សម្រាប់​សោ/​វិញ្ញាបនបត្រ​អ្នកប្រើ ៖"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "បើក​ការព្រមាន \"កុំ​សួរម្ដងទៀត\" ទាំងអស់ឡើងវិញ"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "មាតិកា​ពុម្ព"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "ផ្លូវកាត់​ពុម្ព"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "ប្រភេទ​ពុម្ព"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "ផ្ញើ​សំបុត្រ​ដែល​បាន​ដាក់ជាជួរ​នៅលើ​ការពិនិត្យ​សំបុត្រ"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>ជ្រើស​ថាតើ​អ្នកចង់​ឲ្យ​ KMail ផ្ញើ​​សារទាំងអស់​នៅក្នុង​ប្រអប់ចេញ​នៅលើសៀវភៅដៃ "
-"ឬក៏ ការពិនិត្យ​សារទាំងអស់, ឬ "
-"ថាតើ​អ្នក​មិនចង់​ឲ្យ​ផ្ញើសារ​ទាំងអស់​ដោយស្វ័យប្រវត្តិ ។ </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"ផ្លាស់ទី​សារ​ដែល​មិន​បានធ្វើ​សមកាលកម្ម​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ថត​ដែល​មាន​សិទ្ធិ​ច"
-"ូល​ដំណើរការ​មិន​គ្រប់គ្រាន់"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"ប្រសិន​បើ​មាន​សារ​ថ្មី​នៅ​ក្នុង​ថត​មួយ "
-"ដែល​មិន​ត្រូវ​បាន​ផ្ទុក​ឡើង​ទៅ​កាន់ម៉ាស៊ីន​បម្រើ​នៅ​ឡើយ​ទេ "
-"ប៉ុន្តែ​អ្នក​មិនមាន​សិទ្ធិ​គ្រប់គ្រាន់​នៅ​លើ​ថត​ឥឡូវ​ដើម្បី​ផ្ទុក​ពួក​វា​ឡើង​ទេ "
-"សារ​ទាំងនេះ​នឹង​ត្រូវ​បាន​ផ្លាស់ទី​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​ថត​ lost and found ។"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "អនុញ្ញាត​ទង់​មូលដ្ឋាន​នៅ​ក្នុង​ថត​ដែល​បានតែ​អាន"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"ការ​កំណត់​នេះ "
-"អនុញ្ញាត​ឲ្យ​អ្នក​គ្រប់គ្រង​កំណត់​ការ​ពន្យារ​អប្បបរមា​ចន្លោះ​ការ​ពិនិត្យ​សំបុត្រ"
-"​ទាំង​ពីរ ។\"\n"
-"           "
-"\"អ្នក​ប្រើ​នឹង​មិន​អាច​ជ្រើស​តម្លៃ​តូច​ជាង​តម្លៃ​ដែល​បានកំណត់​នៅ​ទីនេះទេ ។"
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "ថត​ដែលបាន​ជ្រើស​ថ្មីៗ​បំផុត នៅក្នុង​ប្រអប់​ជ្រើស​ថត ។"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"បដិសេធ​អ្នកប្រើ​ការ​កំណត់ umask និង​ប្រើ \"អាន-សរសេរ "
-"សម្រាប់​តែ​អ្នក​ប្រើ​ប៉ុណ្ណោះ\" ជំនួស​វិញ"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "គោលការណ៍​​សម្រាប់​ការបង្ហាញ​រូបតំណាង​ថាសប្រព័ន្ធ"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"បិទ​កម្មវិធី​នៅពេល​បង្អួច​មេ​ត្រូវ​បាន​បិទ "
-"សូម្បីតែ​មាន​រូបតំណាង​ប្រព័ន្ធ​សកម្ម​ក៏​ដោយ ។"
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "បង្ហាញ​ការជូនដំណឹង​សំបុត្រ​ថ្មីជាអក្សរ"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"ប្រសិនបើ​ជម្រើសនេះ​បាន​បើក​សម្រាប់​ថតនីមួយៗ​នៅពេលនោះ "
-"ចំនួន​នៃ​សារដែល​ទើប​មកដល់ថ្មីៗ​​​ត្រូវបាន​បង្ហាញ​នៅក្នុង​ការជូនដំណឹង​សំបុត្រ​ថ្ម"
-"ី ។ ម្យ៉ាងវិញទៀត អ្នកនឹង​ទទួល​បានតែ​សារ 'សំបុត្រ​ថ្មី​ដែល​បាន​​មកដល់' ធម្មតា ។"
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "បញ្ជាក់​កម្មវិធី​កែសម្រួល ៖"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "ប្រើ​កម្មវិធី​កែសម្រួល​ខាងក្នុង ជំនួស​ឲ្យ​កម្មវិធី​តែង"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"កម្រិត​ពន្លឺ​​សម្រាប់​នៅ​ពេល​ត្រូវ​ព្រមាន​ដល់​អ្នក​ប្រើ​ថា "
-"ថត​ជិត​ដល់​ដែន​កំណត់​កូតា​របស់​វា​ហើយ ។"
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "បើក​កម្មវិធី​ពហុអ្នកប្រើ​ដែល​អាច​ដើរបាន"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "កាត់​ពី ៖/ទៅ ៖ បឋមកថា​នៅក្នុង​ការឆ្លើយតប ដើម្បី​ឆ្លើយតប"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook មានចំនួន​នៃ shortcomings នៅក្នុងការប្រតិបត្តិ​នៃ​ខ្នាតគំរូ "
-"iCalendar ។ ជម្រើស​នេះ​ធ្វើការ​នៅជុំវិញ​ពួកវាមួយ ។ ប្រសិនបើអ្នក​មានបញ្ហា​ជាមួយ "
-"Outlook អ្នកប្រើ​មិនអាច​ទទួល​ការឆ្លើយតប​របស់អ្នកបានឡើយ "
-"សូមព្យាយាម​កំណត់​ជម្រើស​នេះ ។"
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "ផ្ញើ​ការអញ្ជើញ​កម្មវិធី​ពហុអ្នកប្រើ​នៅក្នុង​តួ​សំបុត្រ"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook មានចំនួន​នៃ shortcomings នៅក្នុងការប្រតិបត្តិ​នៃ​ខ្នាតគំរូ "
-"iCalendar ។ ជម្រើស​នេះ​ធ្វើការ​នៅជុំវិញ​ពួកវាមួយ ។ ប្រសិនបើអ្នក​មានបញ្ហា​ជាមួយ "
-"Outlook អ្នកប្រើ​មិនអាច​ទទួល​ការអញ្ជើញ​​របស់អ្នកបានឡើយ "
-"សូមព្យាយាម​កំណត់​ជម្រើស​នេះ ។"
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "ការ​ផ្លាស់ប្ដូរ​ឆបគ្នា​ទៅ​នឹង​ឈ្មោះ​ការ​អញ្ជើញ"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook នៅ​ពេល​បាន​ប្រើ​ដោយ​បន្សំ​ជា​មួយ Microsoft Exchange server "
-"មាន​បញ្ហា​ ដោយ​យល់​ថា​អ៊ីមែល groupware ដែល​ត្រូវ​គ្នា​តាម​ស្តង់ដារ ។ "
-"បើក​ជម្រើស​នេះ ដើម្បី​ផ្ញើ​ការ​អញ្ជើញ groupware តាម​វិធី​ដែល​ Microsoft "
-"Exchange យល់ ។"
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"នៅពេល​ដែល​អ្នក​បាន​ធីក​​វា អ្នកនឹង​មិនឃើញ​បង្អួច​កម្មវិធី​តែង​​សំបុត្រ​ទេ ។ "
-"ដោយជំនួស សំបុត្រ​អញ្ជើញ​ទាំងអស់គឺ​ត្រូវបាន​ផ្ញើ​ដោយស្វ័យប្រវត្តិ ។ "
-"ប្រសិនបើអ្នក​ចង់​មើល​សំបុត្រ​មុនពេល​ផ្ញើ​វា អ្នកអាច​ដោះធីក​ជម្រើស​នេះ​វិញ ។ "
-"ទោះជាយ៉ាងណាក៏ដោយ "
-"សូម​ដឹងថា​អត្ថបទ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​គឺ​នៅក្នុង​វាក្យសម្ពន្ធ Calendar "
-"ហើយអ្នក​មិនគួរ​ព្យាយាម​កែប្រែ​វា​ដោយដៃ​ទេ ។"
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "លុប​អ៊ីមែល​​អញ្ជើញ​ បន្ទាប់ពី​​កា​រឆ្លើយតប​ទៅ​ពួកវា​ត្រូវ​បាន​ផ្ញើ"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"នៅ​ពេល​បាន​គូសធីក​វា អ៊ីមែល​អញ្ជើញ​ដែល​បាន​ទទួល​ ដែល​ត្រូវ​បាន​ឆ្លើយតប​ "
-"នឹង​ត្រូវ​បាន​ផ្លាស់ទី​ទៅ​ថត​ធុង​សំរាម "
-"នៅពេល​ការ​ឆ្លើយ​តប​ត្រូវ​បាន​ផ្ញើ​ដោយ​ជោគជ័យ ។"
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>ការបើក​ជម្រើស​នេះ ធ្វើ​ឲ្យវា​អាច​ទុក​ធាតុបញ្ចូល​ពី​កម្មវិធី Kontact "
-"(KOrganizer, KAddressBook, និង​ KNotes ។)</p>"
-"<p>ប្រសិនបើអ្នក​ចង់​កំណត់​ជម្រើស​នេះ "
-"អ្នក​ក៏ត្រូវតែ​កំណត់​កម្មវិធី​ដើម្បី​​ប្រើ​ធនធាន​ IMAP ។ "
-"ការនេះ​ត្រូវបានធ្វើ​រួចរាល់​នៅក្នុងមជ្ឈមណ្ឌល​ត្រួតពិនិត្យ TDE ។</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>ជាធម្មតា អ្នកនឹងគ្មាន​ហេតុផល​ណាមួយ​​ដើម្បី​មើល​ថតដែលកាន់​ធនធាន IMAP ឡើយ ។ "
-"ប៉ុន្តែ​ប្រសិនបើ​អ្នក​ត្រូវការ​មើល​វា អ្នកអាច​កំណត់​វា​នៅទីនេះ  ។</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>ប្រសិន​បើ​គណនី ត្រូវ​បាន​ប្រើ​សម្រាប់​ផ្ទុក​ព័ត៌មាន groupware \"\n"
-"          \"គឺ​មិនត្រូវ​បាន​ប្រើ​ដើម្បី​គ្រប់គ្រង​សំបុត្រ​ធម្មតា "
-"កំណត់​ជម្រើស​នេះ​ដើម្បី​ធ្វើឲ្យ KMail \"\n"
-"          \"បង្ហាញ​តែ​ថត groupware ក្នុង​វា​តែ​ប៉ុណ្ណោះ ។ វា​មាន​ប្រយោជន៍ "
-"ប្រសិន​បើអ្នក​កំពុង​ដោះស្រាយ​នូវ​សំបុត្រ \"\n"
-"          \"ទៀងទាត់ តាម​រយៈ​គណនី IMAP លើ​បណ្ដាញ​បន្ថែម ។</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>ជ្រើស​ទ្រង់ទ្រាយ​ស្តុកទុករបស់​ថត​កម្មវិធី​ពហុអ្នកប្រើ ។ "
-"<ul>"
-"<li>ទ្រង់ទ្រាយ​លំនាំដើម គឺ​ប្រើខ្នាតគំរូ ical (សម្រាប់​ថត​ប្រតិទិន) និង vcard "
-"(សម្រាប់​ថត​សៀវភៅ​អាសយដ្ឋាន) ។ ទ្រង់ទ្រាយ​នេះ ធ្វើឲ្យ​​មាន​លក្ខណៈ​ពិសេស Kontact "
-"ទាំងអស់ ។</li>"
-"<li>ទ្រង់ទ្រាយ Kolab XML "
-"ប្រើ​ម៉ូដែល​ផ្ទាល់ខ្លួន​ដែល​ផ្គូរ​ផ្គង​កាន់តែ​ជិត​​ទៅនឹង​ទ្រង់ទ្រាយ​មួយ​ដែលបានប្"
-"រើ​នៅក្នុង Outlook ។ ទ្រង់ទ្រាយនេះ​ផ្ដល់នូវភាពឆបគ្នា​របស់ Outlook "
-"កាន់តែប្រសើឡើង នៅពេល​ដែល​កំពុង​ប្រើ​ម៉ាស៊ីនបម្រើ Kolab ឬ "
-"ការដោះស្រាយ​​ភាពឆបគ្នាមួយ ។</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>វា​ជ្រើស​មេ​នៃ​ថត​ធនធាន IMAP ។</p>"
-"<p>តាមលំនាំ​ដើម ម៉ាស៊ីន​បម្រើ Kolab កំណត់​ប្រអប់ទទួល​ IMAP ជា​មេ ។</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>នេះ​ជា​លេខសម្គាល់​នៃ​គណនី​ដែល​រង់ចាំ​ថត​ធនធាន​ IMAP ។</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>ប្រសិនបើ​អ្នក​កំណត់​ឈ្មោះ​ថត​នៃ​កន្លែងផ្ទុក​​ IMAP "
-"ទៅកាន់ភាសាមូលដ្ឋាន​របស់អ្នក អ្នកអាច​ជ្រើស​រវាង​ភាសាដែលមាន​ទាំងនេះ ។</p>"
-"<p> សូម​ចំណាំថា "
-"ហេតុផល​តែមួយ​គត់​ដែល​ត្រូវធ្វើ​ដូច្នេះ​គឺ​សម្រាប់​ភាពឆបគ្នា​ជាមួយ​ Microsoft "
-"Outlook ។ វា​ត្រូវបាន​ចាត់ទុក​ថា​ជា​គំនិតអាក្រក់​មួយ​ក្នុង​ការ​កំណត់​វា "
-"គឺ​ចាប់តាំងពីវា​ធ្វើការផ្លាស់ប្ដូ​រភាសា​តាមដែលអាច​ធ្វើទៅបានម្លេះ ។ </p>"
-"<p>ដូច្នេះ​ កុំ​កំណត់​វា​ លុះត្រាតែអ្នក​ត្រូវ​តែធ្វើ ។</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "ត្រង​សំបុត្រ​ថ្មី​ដែល​បាន​ទទួល​នៅ​ក្នុង​ថត groupware ដែរ ។"
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"ធ្វើសមកាលកម្ម​ការ​ផ្លាស់ប្ដូរ groupware នៅ​ក្នុ​ងថត DIMAP "
-"ភ្លាមៗ​នៅពេល​នៅ​លើ​បណ្ដាញ ។"
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"តម្លៃ​នេះ​គឺត្រូវបាន​ប្រើ​ដើម្បី​សម្រេច​ថាតើ​ ការណែនាំ​អំពី KMail "
-"គួរតែត្រូវបាន​បង្ហាញ​ឬអត់ ។"
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "ចំនួន​ការតភ្ជាប់​អតិបរមា​ក្នុង​មួយ​ម៉ាស៊ីន"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"វា​អាចត្រូវបាន​ប្រើ​ដើម្បី​ដាក់កម្រិត​​ចំនួន​នៃ​ការតភ្ជាប់​ក្នុងមួយ​ម៉ាស៊ីន "
-"នៅខណៈពេល​ដែល​កំពុង​ពិនិត្យរកមើល​សំបុត្រ​ថ្មី ។ តាមលំនាំដើម "
-"ចំនួន​នៃ​ការតភ្ជាប់​គឺមិន​កំណត់ (0) ។"
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "បង្ហាញ​​ការកែសម្រួល​បន្ទាត់​ស្វែងរក​រហ័ស"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"ជម្រើស​នេះ​ អនុញ្ញាត ឬ​ មិនអនុញ្ញាត​ការកែសម្រួល​បន្ទាត់ស្វែងរក នៅខាងលើ​បញ្ជីសារ "
-"ដែលអាចត្រូវបាន​ប្រើដើម្បី​ស្វែងរក​ព័ត៌មាន​ដែល​បាន​បង្ហាញ​នៅក្នុង​បញ្ជីសារ​ដោយស្វ"
-"័យប្រវត្តិ ។"
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "លាក់​ប្រអប់​ទទួលមូលដ្ឋាន ប្រសិន​បើ​មិន​បាន​ប្រើ"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "បញ្ចូល​បន្ត​នៅ​ក្នុង​តួ​ជា​លំនាំដើម ។"
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"អនុញ្ញាត​តួអក្សរ​​ចំណុច​ក្បៀស (';') "
-"ឲ្យ​ប្រើជា​ឧបករណ៍​ខណ្ឌចែក​នៅ​ក្នុង​កម្មវិធីតែង​សារ ។"
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"ប្រសិនបើ​អាចធ្វើទៅបាន រក្សាទុក​សំណុំតួអក្សរ​ដើម​នៅពេល​កំពុង​ឆ្លើយតប​ ឬ "
-"កំពុង​បញ្ជូន​បន្ត​​"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "បញ្ចូល​ហត្ថលេខា​ដោយ​ស្វ័យ​ប្រវត្តិ"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"ចងចាំ​អត្តសញ្ញាណ​នេះ​ "
-"ដូច្នេះ​វា​នឹងត្រូវបាន​ប្រើ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​នៅពេល​អនាគត​ផងដែរ ។\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"ចងចាំ​​ថត​នេះ​សម្រាប់​វត្ថុ​ដែល​បាន​​ផ្ញើ "
-"ដូច្នេះ​វានឹង​ត្រូវបាន​ប្រើ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​នៅពេល​អនាគត​ផងដែរ ។"
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"ចងចាំ​ការបញ្ជូន​សំបុត្រ​នេះ "
-"ដូច្នេះ​វា​នឹង​ត្រូវបាន​ប្រើនៅក្នុង​បង្អួច​កម្មវិធី​តែងក្នុងពេល​អនាគត​ផងដែរ ។"
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"ចងចាំ​អត្តសញ្ញាណ​នេះ​ "
-"ដូច្នេះ​វា​នឹងត្រូវបាន​ប្រើ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​នៅពេល​អនាគត​ផងដែរ ។\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "ពាក្យ​​រុំ​នៅ​ជួឈរ "
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "ចំនួន​អតិបរមា​នៃ​បន្ទាត់​កម្មវិធី​កែសម្រួល​​អ្នកទទួល ។"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"បើក​ជម្រើស​នេះ​ដើម្បី​ធ្វើ Outlook &#8482 ។ "
-"ស្វែងយល់អំពី​ឈ្មោះ​ឯកសារភ្ជាប់​ដែល​មាន​តួអក្សរ​មិនមែន​ជា​ភាសាអង់គ្លេស"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "ស្នើ​ការជូន​ដំណឹង​អំពី​ការរៀបចំ​សារ​ដោយស្វ័យប្រវត្តិ"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>បើក​ជម្រើស​នេះ​ប្រសិនបើ​អ្នក​ចង់​ឲ្យ​ KMail "
-"ស្នើ​ការជូនដំណឹង​អំពី​ការរៀបចំសារ (MDNs) "
-"សម្រាប់​​សារផ្ញើចេញ​របស់អ្នក​នីមួយៗ ។</p>"
-"<p>ជម្រើស​នេះ​​មានឥទ្ធិពល​តែ​នៅលើលំនាំដើម​តែប៉ុណ្ណោះ ។ អ្នក​នៅតែអាច​បើក ឬ "
-"បិទការស្នើ MDN ​នៅលើ​មូលដ្ឋាន​ក្នុង​មួយសារ​នៅក្នុង​កម្មវិធី​តែង ធាតុ​ម៉ឺនុយ <em>"
-"ជម្រើស</em>-><em>ការជូនដំណឹង​អំពី​ការរៀបចំ​សំណើរ</em> ។</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "ប្រើ​អាសយដ្ឋាន​​បច្ចុប្បន្ន​សម្រាប់​ការបំពេញ​ដោយស្វ័យប្រវត្តិ"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"បិទ​ជម្រើស​នេះ​ "
-"ប្រសិនបើ​អ្នក​មិនចង់​ឲ្យ​អាសយដ្ឋាន​ដែល​បានប្រើ​ថ្មីៗ​នេះ​លេចឡើង​នៅក្នុង​​បញ្ជី​ប"
-"ញ្ចប់​ដោយស្វ័យប្រវត្តិ​នៅក្នុង​វាល​អាសយដ្ឋាន​របស់កម្មវិធី​តែង ។"
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "រក្សាទុក​ចន្លោះពេល​ដោយស្វ័យប្រវត្តិ ៖"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"ច្បាប់ចម្លង​បម្រុង​ទុក​របស់​អត្ថបទ​នៅក្នុង​បង្អួច​កម្មវិធីតែង "
-"ដែលអាច​ត្រូវបាន​បង្កើត​យ៉ាងទៀងទាត់ ។ "
-"ចន្លោះពេល​ដែល​​បានប្រើ​ដើម្បី​បង្កើត​ព័ត៌មាន​បម្រុងទុក​គឺត្រូវបាន​កំណត់​នៅទីនេះ "
-"។ អ្នកអាច​បិទ​ការរក្សាទុក​ដោយស្វ័យប្រវត្តិ​​ដោយ​កំណត់វា​ទៅតម្លៃ 0 ។"
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "បញ្ចូល​ហត្ថលេខា​ខាង​លើ​អត្ថបទ​ដែល​បាន​ស្រង់"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "ជំនួស​បុព្វបទ​ដែលបានទទួល​ស្គាល់​ដោយ \"ឆ្លើយតប ៖\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "ជំនួស​បុព្វបទ​ដែល​បាន​ទទួល​ស្គាល់​ដោយ \"បញ្ជូន​បន្ត ៖\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "ប្រើ​ការ​ដកស្រង់​ឆ្លាត"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "ហត្ថលេខា​បាន​ផុត​កំណត់​ហើយ ។"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "ប្រភេទ​នៃ​ឧបករណ៍ជ្រើស​អាសយដ្ឋាន"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"កំណត់​ប្រភេទ​របស់​ប្រអប់ ដើម្បី​ជ្រើស​អ្នក​ទទួល​សម្រាប់ ជូនចំពោះ\n"
-"        ចម្លងជូន និង​ចម្លងជាសម្ងាត់ជូន ។"
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "ប្រភេទ​នៃ​កម្មវិធី​កែសម្រួល​អ្នកទទួល"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"កំណត់​ប្រភេទ​របស់​កម្មវិធី​និពន្ធ​អ្នក​ទទួល ដើម្បី​កែសម្រួល ជូនចំពោះ\n"
-"        ចម្លងជូន និង​ចម្លងជាសម្ងាត់ជូន ។"
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "ចំនួន​អតិបរមា​នៃ​បន្ទាត់​កម្មវិធី​កែសម្រួល​​អ្នកទទួល ។"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"បញ្ជីប្រភេទ​ផ្នែក​សារ​ត្រូវ​ហូត​សំបុត្រ​ចេញ "
-"ដែល​កំពុង​ត្រូវ​បានបញ្ជូន​បន្ត​នៅ​ក្នុង​តួ ។"
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-"ទំហំ​អតិបរមា​គិត​ជា​មេកាបៃ​ "
-"ដែល​ឯកសារ​ភ្ជាប់​របស់​អ៊ីមែល​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​មាន ។"
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-"បង្ហាញ​ការ​គ្រប់គ្រង Snippet អត្ថបទ​ និង​បញ្ចូល​បន្ទះ​នៅ​ក្នុង​កម្មវិធី​តែង ។"
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"បង្ហាញ​កំណត់​ហេតុ​ត្រួតពិនិត្យ GnuPG សូម្បី​តែ​បន្ទាប់​ពី​ប្រតិបត្តិការ crypto "
-"ដែល​បាន​បញ្ចប់​ដោយ​ជោគជ័យ ។"
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"ប្រសិនបើ​អាចធ្វើទៅបាន រក្សាទុក​សំណុំតួអក្សរ​ដើម​នៅពេល​កំពុង​ឆ្លើយតប​ ឬ "
-"កំពុង​បញ្ជូន​បន្ត​​"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"អ៊ីមែល​មួយ​ចំនួន ជាពិសេស​ទាំងនោះ​គឺត្រូវបាន​បង្កើត​ដោយស្វ័យ​ប្រវត្តិ​ "
-"ដែលមិនបាន​បញ្ជាក់​សំណុំតួអក្សរ​ដែលត្រូវការ​ឲ្យ​ត្រូវបាន​ប្រើ​​ដើម្បី​បង្ហាញ​ពួកវ"
-"ា​ឲ្យ​ត្រឹមត្រូវ ។ ក្នុង​ករណី​ដូច​នោះ​ "
-"សំណុំ​តួអក្សរ​ត្រឡប់ក្រោយនឹង​ត្រូវបាន​ប្រើ "
-"ដែលអ្នកអាច​កំណត់រចនាសម្ព័ន្ធ​នៅទីនេះ ។ "
-"កំណត់វា​ទៅជាកា​រអ៊ិនកូដដែលបានប្រើ​ជាទូទៅបំផុត​នៅក្នុង​ផ្នែក​នៃ​ពិភពលោក​របស់អ្នក "
-"។ ជាលំនាំដើម "
-"សំណុំតួអក្សរ​បានកំណត់រចនាសម្ព័ន្ធ​សម្រាប់​ប្រព័ន្ធ​ទាំងមូល​ដែលត្រូវបានប្រើ ។"
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"ការ​ផ្លាស់ប្ដូរ​វា​ពី​លំនាំ​ដើម 'ស្វ័យប្រវត្តិ​'​ "
-"របស់វា​នឹងបង្ខំ​ឲ្យ​ប្រើការ​អ៊ិនកូដ​​ដែលបាន​បញ្ជាក់​សម្រាប់​អ៊ីមែល​ទាំងអស់​ដែល​ម"
-"ិនបាន​គិតដល់​អ្វី​ដែល​ពួកគេ​បញ្ជាក់​សម្រាប់​សម្រាប់ខ្លួន​ពួក​គេ​ផ្ទាល់ ។"
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"បើក​វា ប្រសិនបើអ្នកចង់​ឲ្យ​សញ្ញាអារម្មណ៍​ដូចជា :-) លេចចេញ​នៅ​ក្នុង​អត្ថបទសារ "
-"ដើម្បី​ឲ្យ​វាជំនួស​ដោយ​សញ្ញា​អារម្មណ៍ (រូបភាព​តូច) ។"
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"បើក​ជម្រើស​នេះ​​ដើម្បី​បង្ហាញ​កម្រិត​ផ្សេងគ្នា​នៃ​អត្ថបទ​ដក​ស្រង់ ។ "
-"បិទ​វា​ដើម្បី​លាក់​កម្រិត​នៃ​អត្ថបទ​ដកស្រង់ ។"
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "កម្រិត​វេញ​ស្វ័យប្រវត្តិ ៖"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "បន្ថយ​ទំហំ​ពុម្ព​អក្សរ​សម្រាប់​អត្ថបទ​ដកស្រង់"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"បើក​ជម្រើស​នេះ​ដើម្បី​បង្ហាញ​អត្ថបទ​ដកស្រង់​ដោយ​ពុម្ព​អក្សរ​តូចជាងមុន ។"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "ទុក​សារ​ដែលបាន​ផ្ញើ​ បាន​អ៊ិនគ្រីប"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "បង្ហាញ​ភ្នាក់ងារ​អ្នក​ប្រើ​នៅ​ក្នុង​បឋមកថា​ស្អាត​បាត"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"បើក​ជម្រើស​នេះ ដើម្បី​ទទួល​បន្ទាត់​បឋមកថា​កម្មវិធី​ផ្ញើ​អ៊ីមែល X "
-"និង​ភ្នាក់ងារ​អ្នក​ប្រើ​ដែល​បាន​បង្ហាញ នៅ​ពេល​ប្រើ​បឋមកថា​ស្អាត​បាត ។"
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "អនុញ្ញាត​ឲ្យ​លុប​ឯកសារ​ភ្ជាប់​របស់​សំបុត្រ​ដែល​មាន​ស្រាប់ ។"
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "អនុញ្ញាត​ឲ្យ​កែសម្រួល​ឯកសារ​ភ្ជាប់​របស់​សំបុត្រ​ដែល​មាន​ស្រាប់ ។"
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "តែងតែ​ឌិគ្រីប​សារ​ នៅពេល​មើល ឬ​សួរ​មុននឹង​ឌិគ្រីប"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "ផ្ញើ​ការជូន​ដំណឹងអំពី​ការរៀបចំ​សារ​ជាមួយ​អ្នកផ្ញើ​ទទេ ។"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"ផ្ញើ​ការជូនដំណឹង​អំពី​ការរៀបចំ​សារ​ជាមួយ​ខ្សែអក្សរ​អ្នកផ្ញើ​ទទេ​មួយ ។ "
-"ម៉ាស៊ីន​បម្រើ​មួយ​ចំនួន​អាច​ត្រូវបាន​កំណត់​រចនា​សម្ព័ន្ធ​ "
-"ដើម្បី​បដិសេធ​សារដូចនោះ ដូច្នេះ​ប្រសិន​បើអ្នកកំពុង​ពិសោធ​បញ្ហា​ក្នុងការ​ផ្ញើ "
-"MDNs សូម​ដោះធីក​ជម្រើស​នេះ ។"
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "ឃ្លា​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​ពុម្ព"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "ឃ្លា​ចាស់​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​ពុម្ព"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "ពុម្ពសារ​​សម្រាប់​សារ​ថ្មី"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "ពុម្ពសារ​សម្រាប់​ឆ្លើយតប"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "ពុម្ពសារ​សម្រាប់​ឆ្លើយតប​ទៅ​អ្នក​ទាំងអស់"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "ពុម្ព​សារ​សម្រាប់​បញ្ជូន​បន្ត"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "តួអក្សរ​សម្រង់"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-"អនុញ្ញាត​ឲ្យ​ការ​កំណត់​ក្រៅការិយាល័យ​​អាច​​ផ្លាស់ប្ដូរ​បាន​ដោយ​​អ្នក​ប្រើ ។"
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ផ្ទុកស្គ្រីប​ត្រង​ក្រៅការិយាល័យ​ "
-"ប៉ុន្តែ​មិន​អនុញ្ញាត​ឲ្យ​ពួកគេ​ផ្លាស់ប្ដូរ​នៃ​ការ​កំណត់​ណា​មួ​យ​ទេ ដូច​ជា "
-"ប្រតិកម្ម​ដែន និង​ការ​ប្ដូរ​ប្រតិកម្ម​សារ​ឥតបានការ ។"
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"ផ្ញោះ​កា​រឆ្លើយបត​នៅ​ក្រៅការិយាល័យ​ទៅ​សំបុត្រ​ដែល​បាន​មក​តែ​ពី​ដែន​នេះ​​ប៉ុណ្ណោះ"
-" ។"
+"ម៉ាស៊ីនបម្រើ​របស់អ្នក​មិនគាំទ្រ​ពាក្យ​បញ្ជា TOP ទេ ។ ដូច្នេះ​ដំបូង​វា​មិនអាច​ធ្វើការ​ប្រមូល​យក​បឋមកថា​"
+"របស់សំបុត្រ​ដែល​ធំ​ សូម​ធ្វើការ​ទាញយក​ពួក​វា​ជាមុន ។"
 
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"អនុញ្ញាត​ឲ្យ​ឆ្លើយតប​នៅក្រៅការិយាល័យ​​ត្រូវ​បានផ្ញើ​ទៅ​សារ​ដែល​បាន​សម្គាល់​ជា "
-"SPAM ។"
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"ពិនិត្យ​មើល "
-"ប្រសិន​បើ​នៅ​តែ​មាន​ការ​កំណត់​រចនាសម្ព័ន្ធ​ការ​ឆ្លើយតប​នៅ​ក្រៅ​ការិយាល័យ​សកម្ម "
-"នៅពេល​ចាប់ផ្ដើម​ KMail ។"
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "បាន​ប្រើ %1 នៃ %2 %3"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13938,6 +11506,11 @@ msgstr "បន្ថែម​ជា​ចម្លងជូន"
 msgid "Add as BCC"
 msgstr "បន្ថែម​ជា​​ចម្លង​ជា​សម្ងាត់​ជូន"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "​បោះបង់"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13953,13 +11526,13 @@ msgstr "អ្នកទទួល​ដែល​បាន​ជ្រើស"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"អ្នក​បាន​ជ្រើស​អ្នក​ទទួល %n នាក់ ។ ចំនួន​អ្នក​ទទួល​អតិបរមា ដែល​បាន​គាំទ្រ​គឺ %1 "
-"នាក់ ។ សូម​លៃតម្រូវ​ការ​ជ្រើស​របស់​អ្នក ។"
+"អ្នក​បាន​ជ្រើស​អ្នក​ទទួល %n នាក់ ។ ចំនួន​អ្នក​ទទួល​អតិបរមា ដែល​បាន​គាំទ្រ​គឺ %1 នាក់ ។ សូម​លៃតម្រូវ​ការ​"
+"ជ្រើស​របស់​អ្នក ។"
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13975,11 +11548,10 @@ msgstr "ប្រើ​ប្រអប់​ជ្រើស​អាសយដ្
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"ប៊ូតុង​នេះ​បើក​ប្រអប់​ដែល​ផ្សេងពីគ្នា​ "
-"ដែលអ្នក​អាច​ជ្រើស​អ្នកទទួល​នៅខាងក្រៅ​​អាសយដ្ឋាន​ដែលមាន​ទាំងអស់ ។"
+"ប៊ូតុង​នេះ​បើក​ប្រអប់​ដែល​ផ្សេងពីគ្នា​ ដែលអ្នក​អាច​ជ្រើស​អ្នកទទួល​នៅខាងក្រៅ​​អាសយដ្ឋាន​ដែលមាន​ទាំងអស់ ។"
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14081,14 +11653,22 @@ msgstr "ធំជាង ឬ ស្មើ​នឹង"
 msgid " bytes"
 msgstr " ​បៃ"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "​ ថ្ងៃ"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"ដើម្បី​ប្រតិបត្តិ​ការស្វែងរក​របស់អ្នក សារនៃ​ថត %1 "
-"ទាំងអស់​ត្រូវតែ​បាន​ទាញ​យកពី​ម៉ាស៊ីនបម្រើ ។ "
-"ការនេះ​ប្រហែល​ជា​ចំណាយពេល​មួយចំនួន ។ តើអ្នកចង់​បន្ត​ការស្វែងរករបស់អ្នកឬ ?"
+"ដើម្បី​ប្រតិបត្តិ​ការស្វែងរក​របស់អ្នក សារនៃ​ថត %1 ទាំងអស់​ត្រូវតែ​បាន​ទាញ​យកពី​ម៉ាស៊ីនបម្រើ ។ ការនេះ​"
+"ប្រហែល​ជា​ចំណាយពេល​មួយចំនួន ។ តើអ្នកចង់​បន្ត​ការស្វែងរករបស់អ្នកឬ ?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14224,16 +11804,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"កំពុង​ប្រមូល​ទិន្នន័យ​សម្រាប់​គណនី '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "កំពុង​ប្រមូល​ទិន្នន័យ​សម្រាប់​គណនី '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14252,10 +11828,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"មាតិកា​នៃ​ស្គ្រីប '%1' ៖\n"
+msgid "Contents of script '%1':\n"
+msgstr "មាតិកា​នៃ​ស្គ្រីប '%1' ៖\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14278,20 +11852,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"សមត្ថភាព Sieve ៖\n"
+msgid "Sieve capabilities:\n"
+msgstr "សមត្ថភាព Sieve ៖\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(មិនមាន​សមត្ថភាព​ពិសេស​ឡើយ)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"មាន​ស្គ្រីប Sieve ៖\n"
+msgid "Available Sieve scripts:\n"
+msgstr "មាន​ស្គ្រីប Sieve ៖\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14334,13 +11904,12 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"ធីក​ប្រអប់​នេះ​ ប្រសិន​បើ​អ្នកចង់ឲ្យ KMail "
-"បន្ថែម​ហត្ថលេខា​ខាងចុងទៅសំបុត្រ​ដែលបាន​សរសេរ​ជាមួយ​អត្តសញ្ញាណ​នេះ ។"
+"ធីក​ប្រអប់​នេះ​ ប្រសិន​បើ​អ្នកចង់ឲ្យ KMail បន្ថែម​ហត្ថលេខា​ខាងចុងទៅសំបុត្រ​ដែលបាន​សរសេរ​ជាមួយ​អត្តសញ្ញាណ​"
+"នេះ ។"
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
-msgstr ""
-"ចុច​លើ​ធាតុក្រាហ្វិកខាងក្រោម​ដើម្បី​បាន​ជំនួយ​នៅលើ​វិធី​សាស្ត្រ​បញ្ចូល ។"
+msgstr "ចុច​លើ​ធាតុក្រាហ្វិកខាងក្រោម​ដើម្បី​បាន​ជំនួយ​នៅលើ​វិធី​សាស្ត្រ​បញ្ចូល ។"
 
 #: signatureconfigurator.cpp:72
 msgid ""
@@ -14370,12 +11939,11 @@ msgstr "ប្រើវាល​នេះ​ដើម្បី​បញ្ចូ
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"ប្រើ​អ្នកស្នើ​នេះ​ដើម្បី​បញ្ជាក់​ឯកសារអត្ថបទ ដែលមាន​ហត្ថលេខារបស់អ្នក ។ "
-"វា​នឹង​ត្រូវបានអាន​រាល់ពេល​ដែលអ្នក​បង្កើត​សំបុត្រ​ថ្មី ឬ "
-"បន្ថែម​ហត្ថលេខាថ្មី​ខាងចុង ។"
+"ប្រើ​អ្នកស្នើ​នេះ​ដើម្បី​បញ្ជាក់​ឯកសារអត្ថបទ ដែលមាន​ហត្ថលេខារបស់អ្នក ។ វា​នឹង​ត្រូវបានអាន​រាល់ពេល​"
+"ដែលអ្នក​បង្កើត​សំបុត្រ​ថ្មី ឬ បន្ថែម​ហត្ថលេខាថ្មី​ខាងចុង ។"
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14391,24 +11959,26 @@ msgstr "បើក​ឯកសារ​ដែលបាន​បញ្ជាក់
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"អ្នក​អាច​បន្ថែម​ពាក្យ​បញ្ជាដោយ​បំពាន​នៅ​ទីនេះ ទោះ​ជា​ដោយ​មានផ្លូវ "
-"ឬ​គ្មាន​ផ្លូវ​ក៏​ដោយ "
-"អាស្រ័យ​លើ​ថាតើ​មាន​ពាក្យ​បញ្ជា​នៅ​ក្នុង​ផ្លូវ​របស់​អ្នក​ឬក៏​អត់ ។ "
-"សម្រាប់​គ្រប់​សំបុត្រ​​​ថ្មី​ទាំងអស់ KMail នឹង​ប្រតិបត្តិ​ពាក្យ​បញ្ជា "
-"ហើយ​ប្រើ​វា​ដើម្បី​បង្ហាញលទ្ធផល (ទៅ​លទ្ធផល​ស្តង់​ដា) ជា​ហត្ថលេខា ។ "
-"ពាក្យ​បញ្ជា​ធម្មតា​សម្រាប់​ប្រើ​ជា​មួយ​យន្ដការ​នេះ​គឺ \"fortune\" ឬ \"ksig "
-"-random\" ។"
+"អ្នក​អាច​បន្ថែម​ពាក្យ​បញ្ជាដោយ​បំពាន​នៅ​ទីនេះ ទោះ​ជា​ដោយ​មានផ្លូវ ឬ​គ្មាន​ផ្លូវ​ក៏​ដោយ អាស្រ័យ​លើ​ថាតើ​មាន​"
+"ពាក្យ​បញ្ជា​នៅ​ក្នុង​ផ្លូវ​របស់​អ្នក​ឬក៏​អត់ ។ សម្រាប់​គ្រប់​សំបុត្រ​​​ថ្មី​ទាំងអស់ KMail នឹង​ប្រតិបត្តិ​ពាក្យ​បញ្ជា ហើយ​"
+"ប្រើ​វា​ដើម្បី​បង្ហាញលទ្ធផល (ទៅ​លទ្ធផល​ស្តង់​ដា) ជា​ហត្ថលេខា ។ ពាក្យ​បញ្ជា​ធម្មតា​សម្រាប់​ប្រើ​ជា​មួយ​"
+"យន្ដការ​នេះ​គឺ \"fortune\" ឬ \"ksig -random\" ។"
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "បញ្ជាក់ពាក្យ​បញ្ជា ៖"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "ផ្លូវ"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "ធាតុ​បញ្ចូល​ថ្មី ៖"
@@ -14442,6 +12012,11 @@ msgstr "បន្ថែម​ក្រុម"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​យក​ក្រុម​នេះ​ និង​ការ​ច្រឹបរបស់​វា​ទាំងអស់​ចេញឬ ?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "អនុវត្ត​ទៅ ៖"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "កែសម្រួល​ការ​ច្រឹប"
@@ -14454,6 +12029,10 @@ msgstr "កែសម្រួល​ក្រុម"
 msgid "Edit &group..."
 msgstr "កែសម្រួល​ក្រុម..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "​កែសម្រួល..."
@@ -14486,21 +12065,17 @@ msgstr "បញ្ចូល​តម្លៃ​ជំនួស​សម្រា
 msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
-msgstr ""
-"អនុញ្ញាត​ឲ្យ​វា​រក្សាទុក​តម្លៃ​ដែល​បាន​បញ្ចូល​ទៅ​ស្ដាំ​ជា​តម្លៃ​លំនាំដើម​សម្រាប់"
-"​អថេរ​នេះ"
+msgstr "អនុញ្ញាត​ឲ្យ​វា​រក្សាទុក​តម្លៃ​ដែល​បាន​បញ្ចូល​ទៅ​ស្ដាំ​ជា​តម្លៃ​លំនាំដើម​សម្រាប់​អថេរ​នេះ"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
-"ប្រសិន​បើ​អ្នក​បើកជម្រើស​នេះ "
-"តម្លៃ​ដែល​បាន​បញ្ចូល​ទៅ​ខាង​ស្ដាំ​នឹង​ត្រូវ​បាន​រក្សាទុក ។ "
-"ប្រសិន​បើអ្នក​ប្រើ​អថេរ​ដូចគ្នា​ពេលក្រោយ សូម្បី​តែ "
-"នៅ​ក្នុង​កា​រច្រឹប​ផ្សេង​ក៏​ដោយ "
-"តម្លៃ​ដែល​បាន​បញ្ចូល​ទៅ​ស្ដាំ​នឹង​ជា​តម្លៃលំនាំដើម​សម្រាប់​អថេរ​នោះ ។"
+"ប្រសិន​បើ​អ្នក​បើកជម្រើស​នេះ តម្លៃ​ដែល​បាន​បញ្ចូល​ទៅ​ខាង​ស្ដាំ​នឹង​ត្រូវ​បាន​រក្សាទុក ។ ប្រសិន​បើអ្នក​ប្រើ​អថេរ​"
+"ដូចគ្នា​ពេលក្រោយ សូម្បី​តែ នៅ​ក្នុង​កា​រច្រឹប​ផ្សេង​ក៏​ដោយ តម្លៃ​ដែល​បាន​បញ្ចូល​ទៅ​ស្ដាំ​នឹង​ជា​តម្លៃលំនាំដើម​សម្រាប់​"
+"អថេរ​នោះ ។"
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14535,6 +12110,16 @@ msgstr "​មិន​អនុញ្ញាត"
 msgid "Cannot insert content from file %1: %2"
 msgstr "មិន​អាច​បញ្ចូល​មាតិកា​ពី​ឯកសារ %1 ៖ %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "ជូនចំពោះ ៖ "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "ចម្លងជូន ៖ "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14564,60 +12149,45 @@ msgstr "មិន​អាច​ចាប់ផ្ដើមពាក្យ​ប
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>នៅ​ទីនេះ អ្នក​អាច​បង្កើត​ពុម្ព​សារ​ដើម្បី​ប្រើ នៅ​ពេល​អ្នក​តែង​សារ​ថ្មី "
-"ឬ​ឆ្លើយតប ឬ​នៅ​ពេល​អ្នក​បញ្ជូន​សារ​បន្ត ។</p>"
-"<p>ពុម្ពសារ​គាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស ដោយ​វាយ​ពួកវា​យ៉ាង​សាមញ្ញ "
-"ឬ​ជ្រើស​ពួកវា​ពី​ម៉ឺនុយ <i>បញ្ជូល​ពាក្យ​បញ្ជា</i> ។</p>"
-"<p>ពុម្ព​សារ​បាន​បញ្ជាក់​នៅ​ទីនេះ​ជា​ថត​ជាក់លាក់ ។ ពួកវា​បដិសេធ​ពុម្ព​សកល "
-"ហើយ​ពុម្ព​ក្នុង​មួយ​អត្តសញ្ញាណ ប្រសិន​បើ​ពួកវា​ត្រូវ​បាន​បញ្ជាក់ ។</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>នៅ​ទីនេះ អ្នក​អាច​បង្កើត​ពុម្ព​សារ​ដើម្បី​ប្រើ នៅ​ពេល​អ្នក​តែង​សារ​ថ្មី ឬ​ឆ្លើយតប ឬ​នៅ​ពេល​អ្នក​បញ្ជូន​"
+"សារ​បន្ត ។</p><p>ពុម្ពសារ​គាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស ដោយ​វាយ​ពួកវា​យ៉ាង​សាមញ្ញ ឬ​ជ្រើស​ពួកវា​ពី​ម៉ឺនុយ <i>បញ្ជូល​"
+"ពាក្យ​បញ្ជា</i> ។</p><p>ពុម្ព​សារ​បាន​បញ្ជាក់​នៅ​ទីនេះ​ជា​ថត​ជាក់លាក់ ។ ពួកវា​បដិសេធ​ពុម្ព​សកល ហើយ​ពុម្ព​"
+"ក្នុង​មួយ​អត្តសញ្ញាណ ប្រសិន​បើ​ពួកវា​ត្រូវ​បាន​បញ្ជាក់ ។</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>នៅ​ទីនេះ អ្នក​អាច​បង្កើត​ពុម្ពសារ​ដើម្បី​ប្រើ​នៅពេល​អ្នក​តែង​សារ​ថ្មី "
-"ឬ​ឆ្លើយតប ឬ​នៅ​ពេល​អ្នក​បញ្ជូន​សារ​បន្ត ។</p>"
-"<p>ពុម្ពសារគាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស​ដោយ​វាយ​ពួកវា​ធម្មតា "
-"ឬ​ជ្រើស​ពួកវា​ចេញ​ពីម៉ឺនុយ <i>បញ្ចូល​ពាក្យ​បញ្ជា</i> ។</p>"
-"<p>នៅទីនេះ​ពុម្ព​បាន​បញ្ជាក់​គឺ​ជា​អត្តសញ្ញាណ​សំបុត្រ​ដ៏​ទំលំទូលាយ ។ "
-"ពួក​វា​បដិសេធពុម្ព​សកល និង​កំពុង​ត្រូវ​បាន​បដិសេធ​ដោយ​ពុម្ព​ក្នុង​មួយ​ថត "
-"ប្រសិន​បើ​ពួកវា​ត្រូវ​បាន​បញ្ជាក់ ។</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>នៅ​ទីនេះ អ្នក​អាច​បង្កើត​ពុម្ពសារ​ដើម្បី​ប្រើ​នៅពេល​អ្នក​តែង​សារ​ថ្មី ឬ​ឆ្លើយតប ឬ​នៅ​ពេល​អ្នក​បញ្ជូន​"
+"សារ​បន្ត ។</p><p>ពុម្ពសារគាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស​ដោយ​វាយ​ពួកវា​ធម្មតា ឬ​ជ្រើស​ពួកវា​ចេញ​ពីម៉ឺនុយ <i>បញ្ចូល​"
+"ពាក្យ​បញ្ជា</i> ។</p><p>នៅទីនេះ​ពុម្ព​បាន​បញ្ជាក់​គឺ​ជា​អត្តសញ្ញាណ​សំបុត្រ​ដ៏​ទំលំទូលាយ ។ ពួក​វា​បដិសេធពុម្ព​"
+"សកល និង​កំពុង​ត្រូវ​បាន​បដិសេធ​ដោយ​ពុម្ព​ក្នុង​មួយ​ថត ប្រសិន​បើ​ពួកវា​ត្រូវ​បាន​បញ្ជាក់ ។</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>នៅ​ទីនេះ អ្នក​អាច​បង្កើត​ពុម្ពសារ​ដើម្បី​ប្រើ​ នៅពេល​អ្នក​តែង​សារ​ថ្មី "
-"ឬ​ឆ្លើយតប ឬ​នៅពេល​អ្នក​​បញ្ជូនសារ​បន្ត ។</p>"
-"<p>ពុម្ពសារ​នេះ​គាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស​ដោយ​វាយ​ពួកវា​តាមធម្មតា "
-"ឬ​ជ្រើស​ពួកវា​ពី​ម៉ឺនុយ <i>បញ្ចូល​ពាក្យ​បញ្ជា</i> ។</p>"
-"<p>នេះ​ជា​ពុម្ពសកល (លំនាំដើម) ។ "
-"ពួក​វា​អាច​ត្រូវ​បាន​បដិសេធ​ដោយពុម្ព​​ក្នុង​មួយ​អត្តសញ្ញាណ "
-"និងដោយ​ពុម្ព​ក្នុង​មួយ​ថត ប្រសិន​បើ​ពួកវា​ត្រូវ​បាន​បញ្ជាក់ ។</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>នៅ​ទីនេះ អ្នក​អាច​បង្កើត​ពុម្ពសារ​ដើម្បី​ប្រើ​ នៅពេល​អ្នក​តែង​សារ​ថ្មី ឬ​ឆ្លើយតប ឬ​នៅពេល​អ្នក​​"
+"បញ្ជូនសារ​បន្ត ។</p><p>ពុម្ពសារ​នេះ​គាំទ្រ​ពាក្យ​បញ្ជា​ជំនួស​ដោយ​វាយ​ពួកវា​តាមធម្មតា ឬ​ជ្រើស​ពួកវា​ពី​ម៉ឺនុយ "
+"<i>បញ្ចូល​ពាក្យ​បញ្ជា</i> ។</p><p>នេះ​ជា​ពុម្ពសកល (លំនាំដើម) ។ ពួក​វា​អាច​ត្រូវ​បាន​បដិសេធ​ដោយពុម្ព​​"
+"ក្នុង​មួយ​អត្តសញ្ញាណ និងដោយ​ពុម្ព​ក្នុង​មួយ​ថត ប្រសិន​បើ​ពួកវា​ត្រូវ​បាន​បញ្ជាក់ ។</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14869,6 +12439,10 @@ msgstr "ដាក់​តួអក្សរ​សារ​បច្ចុប្
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "ដាក់​តួសារ​បច្ចុប្បន្ន​ជា​បំពង់ ហើយ​ជំនួស​ដោយ​លទ្ធផល​នេះ"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "កំណត់​ទីតាំង​ទស្សទ្រនិច"
@@ -14901,115 +12475,6 @@ msgstr "បើក​ការ​បំបាត់​កំហុស"
 msgid "Turn Debug Off"
 msgstr "បិទ​ការ​បំបាត់​កំហុស"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...ដែលអ្នកអាច​ទៅកាន់​សារ​បន្ទាប់ និង​មុន ដោយប្រើ\n"
-"គ្រាប់ចុច​ព្រួញ​​ស្ដាំ​ និង​ឆ្វេងដោយរៀងខ្លួន ?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...ដែលអ្នក​អាច​បង្កើត​តម្រង​នៅលើ​អ្នកផ្ញើ​យ៉ាងលឿន, អ្នកទទួល,\n"
-"ប្រធានបទ និង​បញ្ជីសំបុត្រ​រួមដោយប្រើ <em>ឧបករណ៍-&gt;បង្កើត&nbsp;តម្រង</em> ?</p>"
-"\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ដែលអ្នកអាចកំចាត់ &quot;[ឈ្មោះ​បញ្ជី​សំបុត្ររួម]&quot;\n"
-"ដែលបាន​បន្ថែម​ទៅកាន់​ប្រធានបទ​នៃ​បញ្ជី​សំបុត្រ​រួម​មួយចំនួន​ "
-"ដោយប្រើតម្រងសកម្មភាព <em>សរសេរ\n"
-"បឋមកថាឡើងវិញ</em>ឬ ? គ្រាន់តែប្រើ\n"
-"<pre>សរសេរ​បឋមកថា​ឡើងវិញ &quot;ប្រធានបទ&quot;\n"
-"   ជំនួស &quot;\\s*\\[ឈ្មោះ​បញ្ជី​សំបុត្រ​រួម\\]\\s*&quot;\n"
-"   ដោយ &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...ដែលអ្នកអាច​ភ្ជាប់​បញ្ជី​សំបុត្ររួម​ជាមួយ​ថត​នៅក្នុងប្រអប់\n"
-"<em>ថត-&gt;ការគ្រប់គ្រង​បញ្ជី​សំបុត្រ​រួម</em>ឬ ? ពេលនោះអ្នកអាចប្រើ\n"
-"<em>សារ-&gt;ថ្មី&nbsp;សារ&nbsp;ទៅ&nbsp;បញ្ជី​&nbsp;សំបុត្ររួម...</em>\n"
-"ដើម្បី​បើក​កម្មវិធី​តែង​ជាមួយ​ការកំណត់​អាសយដ្ឋាន​បញ្ជី​សំបុត្ររួមជាមុន ។\n"
-"ឆ្លាស់មកវិញ អ្នកអាច​ចុច​ជាមួយ​ប៊ូតុង​កណ្ដុរ​កណ្ដាល​លើថត ។</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...ដែលអ្នកអាច​ផ្ដល់​រូបតំណាង​ផ្ទាល់ខ្លួន​​ទៅកាន់​ថតផ្ទាល់ខ្លួន​នីមួយៗឬ ?\n"
-"សូម​មើល <em>ថត-&gt;លក្ខណៈ​សម្បត្តិ</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...ដែល KMail អាច​បង្ហាញ​របា​រពណ៌ ដែលចង្អុរ​បង្ហាញ​ពី​ប្រភេទ​នៃ​សារ\n"
-"(អត្ថបទ​ធម្មតា/HTML/OpenPGP) ដែលបានបង្ហាញ​បច្ចុប្បន្ន​ឬ ?</p>\n"
-"<p>ការខកខាន​នេះ​មាន​បំណង​ក្លែង​ការផ្ទៀងផ្ទាត់​ហត្ថលេខា​ឲ្យ​បានជោគជ័យ \n"
-"ដោយផ្ញើ​សំបុត្រ HTML ដែលធ្វើតាម​ស៊ុមស្ថានភាព​ហត្ថលេខា​របស់​ KMail ។</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...ដែលអ្នកអាច​ត្រង​នៅលើ​បឋមកថា​មួយចំនួន "
-"ដោយ​ធ្វើ​ឲ្យ​ការបញ្ចូល​ឈ្មោះ​របស់វា​ងាយស្រួល​\n"
-"នៅក្នុងវាល​កែសម្រួល​ដំបូង​នៃ​ច្បាប់​ក្នុង​ការស្វែងរក​ឬ ?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ដែលអ្នកអាច​ត្រងចេញ HTML តែសារ​ប៉ុណ្ណោះ​ដោយប្រើច្បាប់\n"
-"<pre>&quot;ប្រភេទមាតិកា&quot; មាន &quot;អត្ថបទ/html&quot; ?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...នោះដែល​កំពុង​ឆ្លើយតប "
-"ផ្នែក​របស់សារ​ដែលបាន​ជ្រើស​តែប៉ុណ្ណោះ​ឬ​ដែល​ជា​អត្ថបទដកស្រង់ ?</p>\n"
-"<p>ប្រសិនបើ​គ្មាន​អ្វី​ដែល​បាន​ជ្រើស​ទេ​នោះ "
-"នោះសារទាំងមូល​ជា​អត្ថបទ​ដកស្រង់ ។</p>\n"
-"<p>ភាព​ទាំងមូល​នេះ ធ្វើការជាមួយ​អត្ថបទ​របស់ឯកសារភ្ជាប់​ នៅពេល​ដែល\n"
-"<em>មើល-&gt;ឯកសារភ្ជាប់-&gt;ក្នុងបណ្ដាញ</em> ត្រូវបានជ្រើស ។</p>\n"
-"<p>លក្ខណៈ​ពិសេស​នេះ​ គឺ​មាន​ជាមួយ​ពាក្យបញ្ជា​ការឆ្លើយតបទាំងអស់​ លើកលែងតែ\n"
-"<em>សារ-&gt;ឆ្លើយតប​ដោយ​គ្មាន​ការដកស្រង់</em> ។</p>\n"
-"<p align=\"right\"><em>បានចែកចាយ​ដោយ David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "គ្មាន​អ្វី​ដែល​មិនត្រូវ​ធ្វើ​វិញ​ទេ ។"
@@ -15058,9 +12523,7 @@ msgstr "វេញ​អត្ថបទ​ដកស្រង់ ។"
 
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
-msgstr ""
-"មិនអាច​ចាប់ផ្ដើម​កម្មវិធី​គ្រប់គ្រង​វិញ្ញាបនបត្រ​បានឡើយ ។ "
-"សូម​ពិនិត្យ្រ​មើល​កដំឡើង​របស់អ្នក ។n."
+msgstr "មិនអាច​ចាប់ផ្ដើម​កម្មវិធី​គ្រប់គ្រង​វិញ្ញាបនបត្រ​បានឡើយ ។ សូម​ពិនិត្យ្រ​មើល​កដំឡើង​របស់អ្នក ។n."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -15075,6 +12538,15 @@ msgstr "ឯកសារ​ភ្ជាប់ #%1 (មិនបាន​ដាក
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "បង្ហាញ​កំណត់​ហេតុ​​កា​រត្រួតពិនិត្យ GnuPG សម្រាប់​ប្រតិបត្តិការ​នេះ"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "​មាន​ឯកសារឈ្មោះ \"%1\" ​រួច​ហើយ ។ តើ​អ្នក​ពិត​ជា​ចង់​សរសេរ​ជាន់​លើ​វា​ឬ ?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "​សរសេរ​ជាន់​លើ​ឯកសារ ?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15106,10 +12578,9 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"ម៉ាស៊ីនបម្រើ​របស់អ្នក​មិនបាន​រាយ \"វិស្សមកាល\" "
-"នៅក្នុង​បញ្ជី​របស់វា​នៃ​ពាក្យបន្ថែម Sieve ដែលបានគាំទ្រ ។\n"
-"បើដោយគ្មាន​វា KMail "
-"មិនអាច​ដំឡើង​​ការឆ្លើយតប​ពេល​នៅក្រៅ​ការិយាល័យ​សម្រាប់​អ្នក​បានឡើយ ។\n"
+"ម៉ាស៊ីនបម្រើ​របស់អ្នក​មិនបាន​រាយ \"វិស្សមកាល\" នៅក្នុង​បញ្ជី​របស់វា​នៃ​ពាក្យបន្ថែម Sieve "
+"ដែលបានគាំទ្រ ។\n"
+"បើដោយគ្មាន​វា KMail មិនអាច​ដំឡើង​​ការឆ្លើយតប​ពេល​នៅក្រៅ​ការិយាល័យ​សម្រាប់​អ្នក​បានឡើយ ។\n"
 "សូម​ទាក់ទង​អ្នកគ្រប់គ្រង​ប្រព័ន្ធ​របស់អ្នក ។"
 
 #: vacation.cpp:622
@@ -15122,10 +12593,8 @@ msgid ""
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
 "Default values will be used."
 msgstr ""
-"នរណា​ម្នាក់ (ប្រហែល​ជាអ្នក) "
-"បានផ្លាស់ប្ដូរ​​ស្គ្រីប​វិស្សមកាល​នៅលើ​ម៉ាស៊ីនបម្រើ ។\n"
-"KMail "
-"គឺ​អាច​កំណត់​ប៉ារ៉ាម៉ែត្រ​សម្រាប់​ការឆ្លើយតប​ដោយស្វ័យប្រវត្តិ​មិនបានយូរទេ ។\n"
+"នរណា​ម្នាក់ (ប្រហែល​ជាអ្នក) បានផ្លាស់ប្ដូរ​​ស្គ្រីប​វិស្សមកាល​នៅលើ​ម៉ាស៊ីនបម្រើ ។\n"
+"KMail គឺ​អាច​កំណត់​ប៉ារ៉ាម៉ែត្រ​សម្រាប់​ការឆ្លើយតប​ដោយស្វ័យប្រវត្តិ​មិនបានយូរទេ ។\n"
 "តម្លៃ​លំនាំ​ដើម​នឹងត្រូវបានប្រើ ។"
 
 #: vacation.cpp:657
@@ -15194,13 +12663,13 @@ msgstr "ផ្ញើ​រូបភាព​តាម​​រាល់សារ
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"ធីក​ប្រអប់​នេះ​ ប្រសិនបើអ្នក​ចង់ឲ្យ​ KMail បន្ថែមបឋមកថាដែល​មាន​ឈ្មោះថា X-Face "
-"ទៅកាន់សារ​ដែល​បានសរសេរ​ដោយប្រើ​អត្តសញ្ញាណ​នេះ ។ X-Face គឺជា​រូបភាព​ស​ខ្មៅ "
-"(48x48 ភីកសែល)  ដែល​កម្មវិធី​ផ្ញើ​អ៊ីមែល​មួយ​ចំនួន អាច​បង្ហាញ​បាន ។"
+"ធីក​ប្រអប់​នេះ​ ប្រសិនបើអ្នក​ចង់ឲ្យ​ KMail បន្ថែមបឋមកថាដែល​មាន​ឈ្មោះថា X-Face ទៅកាន់សារ​ដែល​"
+"បានសរសេរ​ដោយប្រើ​អត្តសញ្ញាណ​នេះ ។ X-Face គឺជា​រូបភាព​ស​ខ្មៅ (48x48 ភីកសែល)  ដែល​កម្មវិធី​ផ្ញើ​"
+"អ៊ីមែល​មួយ​ចំនួន អាច​បង្ហាញ​បាន ។"
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15228,13 +12697,12 @@ msgstr "ជ្រើស​ឯកសារ..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"ប្រើ​វា​​ដើម្បី​ជ្រើស​ឯកសាររូបភាព​មួយ​ដើម្បី​បង្កើត​រូបភាព​ពីវា ។ "
-"រូបភាព​គួរតែ​ជា​កម្រិតពណ៌ខ្ពស់ និង​ជិត​ក្លាយ​ជា​រូបរាង​បួនជ្រុង ។ "
-"ផ្ទៃខាងក្រោយ​ដែល​ភ្លឺ​ជួយ​ធ្វើ​ឲ្យ​លទ្ធផល​ប្រសើរឡើង ។"
+"ប្រើ​វា​​ដើម្បី​ជ្រើស​ឯកសាររូបភាព​មួយ​ដើម្បី​បង្កើត​រូបភាព​ពីវា ។ រូបភាព​គួរតែ​ជា​កម្រិតពណ៌ខ្ពស់ និង​ជិត​ក្លាយ​ជា​"
+"រូបរាង​បួនជ្រុង ។ ផ្ទៃខាងក្រោយ​ដែល​ភ្លឺ​ជួយ​ធ្វើ​ឲ្យ​លទ្ធផល​ប្រសើរឡើង ។"
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15242,21 +12710,20 @@ msgstr "កំណត់​ពី​សៀវភៅ​អាសយដ្ឋាន
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"អ្នក​អាច​ប្រើ​កំណែ​មាត្រដ្ឋាន​ចុះ​នៃ​រូបភាព​ដែលអ្នក​បាន​កំណត់​នៅក្នុង​ធាតុបញ្ចូល"
-"​​សៀវភៅ​អាសយដ្ឋាន​របស់អ្នក ។"
+"អ្នក​អាច​ប្រើ​កំណែ​មាត្រដ្ឋាន​ចុះ​នៃ​រូបភាព​ដែលអ្នក​បាន​កំណត់​នៅក្នុង​ធាតុបញ្ចូល​​សៀវភៅ​អាសយដ្ឋាន​របស់អ្នក ។"
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail អាចផ្ញើ​រូបភាព តូច(48x48 pixels), គុណភាព​ទាប, តែមួយពណ៌ "
-"ជាមួយ​រាល់សារ​ទាំងអស់ ។ ឧទាហរណ៍, វា​អាចជា​​រូបភាព​អ្នក ឬ ជារូបចម្លាក់ខូង ។ "
-"វាត្រូវបាន​បង្ហាញ​នៅក្នុង​កម្មវិធី​ផ្ញើ​អ៊ីមែល​របស់​អ្នក​ទទួល (បើ​គាំទ្រ) ។"
+"<qt>KMail អាចផ្ញើ​រូបភាព តូច(48x48 pixels), គុណភាព​ទាប, តែមួយពណ៌ ជាមួយ​រាល់សារ​ទាំងអស់ ។ "
+"ឧទាហរណ៍, វា​អាចជា​​រូបភាព​អ្នក ឬ ជារូបចម្លាក់ខូង ។ វាត្រូវបាន​បង្ហាញ​នៅក្នុង​កម្មវិធី​ផ្ញើ​អ៊ីមែល​របស់​អ្នក​"
+"ទទួល (បើ​គាំទ្រ) ។"
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15264,16 +12731,15 @@ msgstr "ប្រើ​វាលនេះ​ដើម្បី​បញ្ចូ
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"ឧទាហរណ៍​ដែល​អាច​រកបាន​នៅ <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"ឧទាហរណ៍​ដែល​អាច​រកបាន​នៅ <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
+"www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
-msgstr ""
-"គ្មាន​រូបភាព​ដែល​កំណត់​សម្រាប់ធាតុបញ្ចូល​​សៀវភៅ​អាសយដ្ឋាន​របស់​អ្នក​ឡើយ ។"
+msgstr "គ្មាន​រូបភាព​ដែល​កំណត់​សម្រាប់ធាតុបញ្ចូល​​សៀវភៅ​អាសយដ្ឋាន​របស់​អ្នក​ឡើយ ។"
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 #: xfaceconfigurator.cpp:261
@@ -15282,134 +12748,1743 @@ msgstr "គ្មាន​រូបភាព"
 
 #: xfaceconfigurator.cpp:261
 msgid "You do not have your own contact defined in the address book."
+msgstr "អ្នក​មិនបានមានទំនាក់ទំនង​​ផ្ទាល់ខ្លួន​​ដែល​បាន​កំណត់​នៅក្នុង​សៀវភៅ​អាស័យដ្ឋានឡើយ ។"
+
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "ការចុះហត្ថលេខា"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "ចុះហត្ថលេខា​លើសារ​ដោយស្វ័យប្រវត្តិ"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
-"អ្នក​មិនបានមានទំនាក់ទំនង​​ផ្ទាល់ខ្លួន​​ដែល​បាន​កំណត់​នៅក្នុង​សៀវភៅ​អាស័យដ្ឋានឡើយ"
-" ។"
+"នៅពេល​ដែល​បាន​បើក​ជម្រើស​នេះ សារ​​ទាំងអស់​ដែល​អ្នក​ផ្ញើ​នឹងត្រូវបាន​ចុះហត្ថលេខា​តាម​លំនាំដើម ។ "
+"ពិតមែនហើយ វា​នៅតែអាច​​បិទ​ការ​ចុះហត្ថលេខា​សម្រាប់​សារ​ផ្ទាល់ខ្លួន​នីមួយៗ ។"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>សរុប ៖ %2<br>មិនបាន​អាន ៖ %3<br>ទំហំ ៖ %4"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "កំពុង​អ៊ិនគ្រីប"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>កូតា ៖ %1"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "នៅពេល​អ៊ិនគ្រីប​អ៊ីមែល តែងតែ​អ៊ិនគ្រីប​វិញ្ញាបនបត្រ​របស់​អត្តសញ្ញាណ​ផ្ទាល់​របស់​អ្នក​ខ្ញុំ​ដែរ"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "កំណត់​ប្រធាន​បទ​សារ"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"នៅពេល​ដែល​បានបើក​ជម្រើស​នេះ សារ​/ឯកសារ នឹងមិនត្រឹមតែ​ត្រូវបាន​អ៊ិនគ្រីប​ដោយប្រើ​សោ​សាធារណៈ​របស់​អ្នក​ទទួល​"
+"ប៉ុណ្ណោះទេ ប៉ុន្តែ​វាក៏ត្រូវបាន​ប្រើ​ជាមួយ​សោ​របស់អ្នក​ផងដែរ ។ វា​នឹងអនុញ្ញាត​ឲ្យអ្នក​ឌិគ្រីប​សារ​/ឯកសារ​"
+"នៅពេលក្រោយ ។ ជាទូទៅ​នេះ​ជា​គំនិត​ដ៏ល្អ ។"
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "ផ្ញើ​ច្បាប់ចម្លង​ជូន​ចំពោះ 'អាសយដ្ឋាន'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "បង្ហាញ​អត្ថបទ​ដែលបាន​​ចុះហត្ថលេខា/បាន​អ៊ិនគ្រីប​បន្ទាប់ពីការតែង"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "ផ្ញើ​ច្បាប់ចម្លងសម្ងាត់​ជូន​ចំពោះ 'អាសយដ្ឋាន'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"នៅពេល​ដែលបាន​បើក​ជម្រើស​នេះ អត្ថបទ​ដែលបាន​ចុះហត្ថលេខា​/​បាន​អ៊ិនគ្រីប នឹងត្រូវបាន​បង្ហាញ​នៅក្នុង​បង្អួច​"
+"ដែល​ផ្សេងពីគ្នា ដែលអនុញ្ញាត​ឲ្យ​អ្នកដឹង​អំពី​របៀប​ដែលវា​នឹងមាន​លក្ខណៈ​ដូចម្ដេច​​នៅមុនពេល​ដែលផ្ញើវា ។ នេះ​"
+"ជាគំនិតល្អ​ នៅពេលដែលអ្នក​កំពុង​ផ្ទៀងផ្ទាត់​ថាប្រព័ន្ធ​អ៊ិនគ្រីបរបស់​អ្នក​ធ្វើការ ។"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "បន្ថែម 'បឋមកថា' ទៅ​កាន់សារ"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "ទុក​សារ​ដែលបាន​ផ្ញើ​ បាន​អ៊ិនគ្រីប"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "អាន​តួសារពី 'ឯកសារ'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "ធីក​ដើម្បី​ទុក​សារ​ បានអ៊ិនគ្រីប"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "កំណត់​តួសារ"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ទុក​សារ​​បានអ៊ិនគ្រីប</h1>\n"
+"នៅពេល​ដែល​បាន​ធីក​ប្រអប់នេះ សារដែលបានផ្ញើគឺត្រូវបាន​ទុក​ សារដែល​បានអ៊ិនគ្រីប ដូចដែល​ពួកវា​ត្រូវបាន​"
+"ផ្ញើ ។ វា​មិនត្រូវបាន​ផ្ដល់អនុសាសន៍ឡើយ ដែលអ្នកនឹង​មិន​អាច​អានសារ​បានទៅមុខទៀតទេ ប្រសិនបើ​វិញ្ញាបនបត្រ​"
+"ដែល​ចាំបាច់​ផុតកំណត់ ។\n"
+"<p>\n"
+"ទោះជាយ៉ាងណា​ក៏ដោយ ប្រហែល​ជាមាន​ខច្បាប់មូលដ្ឋាន​ដែលតម្រូវឲ្យអ្នកបើកជម្រើស​នេះ ។ នៅពេល​ដែលឋិតក្នុង​"
+"មន្ទិលសង្ស័យ សូម​ពិនិត្យ​ជាមួយ​អ្នកគ្រប់គ្រង​មូលដ្ឋានរបស់អ្នក ។\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "បង្ហាញ​សោ​អ៊ិនគ្រីប​ដើម្បី​អនុម័ត​ជានិច្ច"
+
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"បន្ថែម​ឯកសារ​ភ្ជាប់​ទៅ​កាន់​សំបុត្រ ។ ការនេះ​អាចត្រូវ​បាន​ធ្វើ​ម្ដងទៀត​បាន"
+"នៅពេល​ដែល​បាន​បើក​ជម្រើស​នេះ កម្មវិធី​នឹង​បង្ហាញបញ្ជី​នៃ​សោសាធារណៈ​ដល់អ្នកជានិច្ច​ពី​សោ​មួយណាដែលបាន​"
+"ជ្រើសមួយ​ដែល​វា​នឹង​ប្រើ​ដើម្បី​ធ្វើការអ៊ិនគ្រីប ។ ប្រសិនបើ​វា​បិទ នោះកម្មវិធី​នឹង​បានតែ​បង្ហាញ​ប្រអប់ប៉ុណ្ណោះ "
+"ប្រសិនបើវា​មិនអាច​រក​សោ​ដែល​ត្រឹមត្រូវបានទេ ឬ ប្រសិនបើមាន​​សោ​មួយចំនួន​ដែលអាចប្រើ​បាន ។"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "ពិនិត្យ​រក​មើល​តែ​សារថ្មី​ប៉ុណ្ណោះ"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "អ៊ិនគ្រីប​សារ​ដោយស្វ័យប្រវត្តិ​នៅពេល​ណា​ក៏ដោយ​ឲ្យ​តែ​អាច​ធ្វើ​ទៅ​បាន"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "បើកតែ​បង្អូច​អ្នក​តែង​ប៉ុណ្ណោះ"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"នៅពេល​ដែលបាន​បើក​ជម្រើស​នេះ សារទាំងអស់ដែលអ្នក​បាន​ផ្ញើនឹងត្រូវ​អ៊ិនបានគ្រីប នៅពេល​ណាក៏ដោយ ការអ៊ិនគ្រីប​"
+"អាច​ធ្វើទៅបាន និង​បាន​ប៉ង​ធ្វើ ។ ពិតណាស់​ វា​នៅតែ​អាច​​បិទ​ការ​អ៊ិនគ្រីប​ដោយស្វ័យប្រវត្តិ​សម្រាប់​សារ​ផ្ទាល់ខ្លួន​"
+"នីមួយៗ ។"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "មើល​ឯកសារ​ សារ​ដែលបាន​ផ្ដល់ឲ្យ"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "កុំ​ចុះហត្ថលេខា​/អ៊ិនគ្រីប នៅពេល​ដែល​កំពុង​រក្សាទុក​ជា​សេចក្ដីព្រាង"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "ផ្ញើ​សារទៅ​កាន់​ចម្លើយ 'អាសយដ្ឋាន' ភ្ជាប់​ឯកសារ​​ដែល​ 'URL' ចង្អុល​ទៅ"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "តើ​វា​ដំណើរ​ការ​យ៉ាង​ដូចម្ដេច ?"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "​អាន"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "សកល"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "ចាស់"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "ឆ្លើយតប"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "​បាន​លុប"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "ឆ្លើយតប​ទៅ​អ្នក​ទាំងអស់..."
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "បាន​ឆ្លើយតប"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "បញ្ជូន​បន្ត"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "បាន​បញ្ជូន​បន្ត"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "​ផ្លូវ​កាត់ ៖"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "​បាន​ដាក់​ជា​ជួរ"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "ប្រភេទ​ពុម្ព ៖"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "បាន​ផ្ញើ"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "មាតិកា​ពុម្ព"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "បានឃ្លាំមើល"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "ផ្លូវកាត់​ពុម្ព"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "​មិនអើពើ"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "ប្រភេទ​ពុម្ព"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "​សារ​ឥត​បាន​ការ"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "លក្ខណៈ​សម្បត្តិ​របស់​ថត"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "បន្លំ"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "ថត​កាន់កាប់​​បញ្ជី​សំបុត្រ​រួម"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "​ត្រូវ​ធ្វើ"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "រាយ​អាសយដ្ឋាន ៖"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "មាន​ឯកសារ​ភ្ជាប់"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "ធម្មតា ៖"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "បាន​ប្រើ %1 នៃ %2 %3"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "មិនបាន​អាន  ៖"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "ផ្លូវ"
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "ការផុត​កំណត់​នៃ​សារ"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "ផុត​កំណត់​បន្ទាប់ពី ៖"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "ផុត​កំណត់​សារ​ដែល​បាន​អាន"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "ផុត​កំណត់​បន្ទាប់ពី ៖"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "សារ​មិនទាន់អាន​​ផុត​កំណត់"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "​ថ្ងៃ"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "​សប្ដាហ៍"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "​ខែ"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "​កម្រិត​ខ្ពស់"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "អត្តសញ្ញាណ​អ្នកផ្ញើ ៖"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "ទ្រង់ទ្រាយ​ផ្ទុក ៖"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "ការបង្ហាញ​បញ្ជី ៖"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "ផ្ញើ​សំបុត្រ​ដែល​បាន​ដាក់ជាជួរ​នៅលើ​ការពិនិត្យ​សំបុត្រ"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"​មាន​ឯកសារឈ្មោះ \"%1\" ​រួច​ហើយ ។ តើ​អ្នក​ពិត​ជា​ចង់​សរសេរ​ជាន់​លើ​វា​ឬ ?"
+"<qt><p>ជ្រើស​ថាតើ​អ្នកចង់​ឲ្យ​ KMail ផ្ញើ​​សារទាំងអស់​នៅក្នុង​ប្រអប់ចេញ​នៅលើសៀវភៅដៃ ឬក៏ ការពិនិត្យ​"
+"សារទាំងអស់, ឬ ថាតើ​អ្នក​មិនចង់​ឲ្យ​ផ្ញើសារ​ទាំងអស់​ដោយស្វ័យប្រវត្តិ ។ </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "​សរសេរ​ជាន់​លើ​ឯកសារ ?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr "ផ្លាស់ទី​សារ​ដែល​មិន​បានធ្វើ​សមកាលកម្ម​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ថត​ដែល​មាន​សិទ្ធិ​ចូល​ដំណើរការ​មិន​គ្រប់គ្រាន់"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"ប្រសិន​បើ​មាន​សារ​ថ្មី​នៅ​ក្នុង​ថត​មួយ ដែល​មិន​ត្រូវ​បាន​ផ្ទុក​ឡើង​ទៅ​កាន់ម៉ាស៊ីន​បម្រើ​នៅ​ឡើយ​ទេ ប៉ុន្តែ​អ្នក​មិនមាន​សិទ្ធិ​"
+"គ្រប់គ្រាន់​នៅ​លើ​ថត​ឥឡូវ​ដើម្បី​ផ្ទុក​ពួក​វា​ឡើង​ទេ សារ​ទាំងនេះ​នឹង​ត្រូវ​បាន​ផ្លាស់ទី​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​ថត​ lost "
+"and found ។"
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "អនុញ្ញាត​ទង់​មូលដ្ឋាន​នៅ​ក្នុង​ថត​ដែល​បានតែ​អាន"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"ការ​កំណត់​នេះ អនុញ្ញាត​ឲ្យ​អ្នក​គ្រប់គ្រង​កំណត់​ការ​ពន្យារ​អប្បបរមា​ចន្លោះ​ការ​ពិនិត្យ​សំបុត្រ​ទាំង​ពីរ ។\"\n"
+"           \"អ្នក​ប្រើ​នឹង​មិន​អាច​ជ្រើស​តម្លៃ​តូច​ជាង​តម្លៃ​ដែល​បានកំណត់​នៅ​ទីនេះទេ ។"
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "ថត​ដែលបាន​ជ្រើស​ថ្មីៗ​បំផុត នៅក្នុង​ប្រអប់​ជ្រើស​ថត ។"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr "បដិសេធ​អ្នកប្រើ​ការ​កំណត់ umask និង​ប្រើ \"អាន-សរសេរ សម្រាប់​តែ​អ្នក​ប្រើ​ប៉ុណ្ណោះ\" ជំនួស​វិញ"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "គោលការណ៍​​សម្រាប់​ការបង្ហាញ​រូបតំណាង​ថាសប្រព័ន្ធ"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr "បិទ​កម្មវិធី​នៅពេល​បង្អួច​មេ​ត្រូវ​បាន​បិទ សូម្បីតែ​មាន​រូបតំណាង​ប្រព័ន្ធ​សកម្ម​ក៏​ដោយ ។"
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "បង្ហាញ​ការជូនដំណឹង​សំបុត្រ​ថ្មីជាអក្សរ"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"ប្រសិនបើ​ជម្រើសនេះ​បាន​បើក​សម្រាប់​ថតនីមួយៗ​នៅពេលនោះ ចំនួន​នៃ​សារដែល​ទើប​មកដល់ថ្មីៗ​​​ត្រូវបាន​បង្ហាញ​នៅក្នុង​"
+"ការជូនដំណឹង​សំបុត្រ​ថ្មី ។ ម្យ៉ាងវិញទៀត អ្នកនឹង​ទទួល​បានតែ​សារ 'សំបុត្រ​ថ្មី​ដែល​បាន​​មកដល់' ធម្មតា ។"
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "បញ្ជាក់​កម្មវិធី​កែសម្រួល ៖"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "ប្រើ​កម្មវិធី​កែសម្រួល​ខាងក្នុង ជំនួស​ឲ្យ​កម្មវិធី​តែង"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "កម្រិត​ពន្លឺ​​សម្រាប់​នៅ​ពេល​ត្រូវ​ព្រមាន​ដល់​អ្នក​ប្រើ​ថា ថត​ជិត​ដល់​ដែន​កំណត់​កូតា​របស់​វា​ហើយ ។"
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "បើក​កម្មវិធី​ពហុអ្នកប្រើ​ដែល​អាច​ដើរបាន"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "កាត់​ពី ៖/ទៅ ៖ បឋមកថា​នៅក្នុង​ការឆ្លើយតប ដើម្បី​ឆ្លើយតប"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook មានចំនួន​នៃ shortcomings នៅក្នុងការប្រតិបត្តិ​នៃ​ខ្នាតគំរូ iCalendar ។ "
+"ជម្រើស​នេះ​ធ្វើការ​នៅជុំវិញ​ពួកវាមួយ ។ ប្រសិនបើអ្នក​មានបញ្ហា​ជាមួយ Outlook អ្នកប្រើ​មិនអាច​ទទួល​"
+"ការឆ្លើយតប​របស់អ្នកបានឡើយ សូមព្យាយាម​កំណត់​ជម្រើស​នេះ ។"
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "ផ្ញើ​ការអញ្ជើញ​កម្មវិធី​ពហុអ្នកប្រើ​នៅក្នុង​តួ​សំបុត្រ"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook មានចំនួន​នៃ shortcomings នៅក្នុងការប្រតិបត្តិ​នៃ​ខ្នាតគំរូ iCalendar ។ "
+"ជម្រើស​នេះ​ធ្វើការ​នៅជុំវិញ​ពួកវាមួយ ។ ប្រសិនបើអ្នក​មានបញ្ហា​ជាមួយ Outlook អ្នកប្រើ​មិនអាច​ទទួល​"
+"ការអញ្ជើញ​​របស់អ្នកបានឡើយ សូមព្យាយាម​កំណត់​ជម្រើស​នេះ ។"
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "ការ​ផ្លាស់ប្ដូរ​ឆបគ្នា​ទៅ​នឹង​ឈ្មោះ​ការ​អញ្ជើញ"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook នៅ​ពេល​បាន​ប្រើ​ដោយ​បន្សំ​ជា​មួយ Microsoft Exchange server មាន​បញ្ហា​ ដោយ​"
+"យល់​ថា​អ៊ីមែល groupware ដែល​ត្រូវ​គ្នា​តាម​ស្តង់ដារ ។ បើក​ជម្រើស​នេះ ដើម្បី​ផ្ញើ​ការ​អញ្ជើញ "
+"groupware តាម​វិធី​ដែល​ Microsoft Exchange យល់ ។"
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"នៅពេល​ដែល​អ្នក​បាន​ធីក​​វា អ្នកនឹង​មិនឃើញ​បង្អួច​កម្មវិធី​តែង​​សំបុត្រ​ទេ ។ ដោយជំនួស សំបុត្រ​អញ្ជើញ​ទាំងអស់គឺ​"
+"ត្រូវបាន​ផ្ញើ​ដោយស្វ័យប្រវត្តិ ។ ប្រសិនបើអ្នក​ចង់​មើល​សំបុត្រ​មុនពេល​ផ្ញើ​វា អ្នកអាច​ដោះធីក​ជម្រើស​នេះ​វិញ ។ "
+"ទោះជាយ៉ាងណាក៏ដោយ សូម​ដឹងថា​អត្ថបទ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​គឺ​នៅក្នុង​វាក្យសម្ពន្ធ Calendar ហើយអ្នក​"
+"មិនគួរ​ព្យាយាម​កែប្រែ​វា​ដោយដៃ​ទេ ។"
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "លុប​អ៊ីមែល​​អញ្ជើញ​ បន្ទាប់ពី​​កា​រឆ្លើយតប​ទៅ​ពួកវា​ត្រូវ​បាន​ផ្ញើ"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"នៅ​ពេល​បាន​គូសធីក​វា អ៊ីមែល​អញ្ជើញ​ដែល​បាន​ទទួល​ ដែល​ត្រូវ​បាន​ឆ្លើយតប​ នឹង​ត្រូវ​បាន​ផ្លាស់ទី​ទៅ​ថត​ធុង​សំរាម "
+"នៅពេល​ការ​ឆ្លើយ​តប​ត្រូវ​បាន​ផ្ញើ​ដោយ​ជោគជ័យ ។"
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>ការបើក​ជម្រើស​នេះ ធ្វើ​ឲ្យវា​អាច​ទុក​ធាតុបញ្ចូល​ពី​កម្មវិធី Kontact (KOrganizer, "
+"KAddressBook, និង​ KNotes ។)</p><p>ប្រសិនបើអ្នក​ចង់​កំណត់​ជម្រើស​នេះ អ្នក​ក៏ត្រូវតែ​កំណត់​កម្មវិធី​ដើម្បី​​"
+"ប្រើ​ធនធាន​ IMAP ។ ការនេះ​ត្រូវបានធ្វើ​រួចរាល់​នៅក្នុងមជ្ឈមណ្ឌល​ត្រួតពិនិត្យ TDE ។</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>ជាធម្មតា អ្នកនឹងគ្មាន​ហេតុផល​ណាមួយ​​ដើម្បី​មើល​ថតដែលកាន់​ធនធាន IMAP ឡើយ ។ ប៉ុន្តែ​ប្រសិនបើ​អ្នក​"
+"ត្រូវការ​មើល​វា អ្នកអាច​កំណត់​វា​នៅទីនេះ  ។</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>ប្រសិន​បើ​គណនី ត្រូវ​បាន​ប្រើ​សម្រាប់​ផ្ទុក​ព័ត៌មាន groupware \"\n"
+"          \"គឺ​មិនត្រូវ​បាន​ប្រើ​ដើម្បី​គ្រប់គ្រង​សំបុត្រ​ធម្មតា កំណត់​ជម្រើស​នេះ​ដើម្បី​ធ្វើឲ្យ KMail \"\n"
+"          \"បង្ហាញ​តែ​ថត groupware ក្នុង​វា​តែ​ប៉ុណ្ណោះ ។ វា​មាន​ប្រយោជន៍ ប្រសិន​បើអ្នក​កំពុង​"
+"ដោះស្រាយ​នូវ​សំបុត្រ \"\n"
+"          \"ទៀងទាត់ តាម​រយៈ​គណនី IMAP លើ​បណ្ដាញ​បន្ថែម ។</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>ជ្រើស​ទ្រង់ទ្រាយ​ស្តុកទុករបស់​ថត​កម្មវិធី​ពហុអ្នកប្រើ ។ <ul><li>ទ្រង់ទ្រាយ​លំនាំដើម គឺ​ប្រើខ្នាតគំរូ "
+"ical (សម្រាប់​ថត​ប្រតិទិន) និង vcard (សម្រាប់​ថត​សៀវភៅ​អាសយដ្ឋាន) ។ ទ្រង់ទ្រាយ​នេះ ធ្វើឲ្យ​​មាន​"
+"លក្ខណៈ​ពិសេស Kontact ទាំងអស់ ។</li><li>ទ្រង់ទ្រាយ Kolab XML ប្រើ​ម៉ូដែល​ផ្ទាល់ខ្លួន​ដែល​ផ្គូរ​ផ្គង​"
+"កាន់តែ​ជិត​​ទៅនឹង​ទ្រង់ទ្រាយ​មួយ​ដែលបានប្រើ​នៅក្នុង Outlook ។ ទ្រង់ទ្រាយនេះ​ផ្ដល់នូវភាពឆបគ្នា​របស់ "
+"Outlook កាន់តែប្រសើឡើង នៅពេល​ដែល​កំពុង​ប្រើ​ម៉ាស៊ីនបម្រើ Kolab ឬ ការដោះស្រាយ​​ភាពឆបគ្នាមួយ ។</"
+"li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>វា​ជ្រើស​មេ​នៃ​ថត​ធនធាន IMAP ។</p><p>តាមលំនាំ​ដើម ម៉ាស៊ីន​បម្រើ Kolab កំណត់​ប្រអប់ទទួល​ IMAP ជា​"
+"មេ ។</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>នេះ​ជា​លេខសម្គាល់​នៃ​គណនី​ដែល​រង់ចាំ​ថត​ធនធាន​ IMAP ។</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>ប្រសិនបើ​អ្នក​កំណត់​ឈ្មោះ​ថត​នៃ​កន្លែងផ្ទុក​​ IMAP ទៅកាន់ភាសាមូលដ្ឋាន​របស់អ្នក អ្នកអាច​ជ្រើស​រវាង​"
+"ភាសាដែលមាន​ទាំងនេះ ។</p><p> សូម​ចំណាំថា ហេតុផល​តែមួយ​គត់​ដែល​ត្រូវធ្វើ​ដូច្នេះ​គឺ​សម្រាប់​ភាពឆបគ្នា​"
+"ជាមួយ​ Microsoft Outlook ។ វា​ត្រូវបាន​ចាត់ទុក​ថា​ជា​គំនិតអាក្រក់​មួយ​ក្នុង​ការ​កំណត់​វា គឺ​ចាប់តាំងពីវា​"
+"ធ្វើការផ្លាស់ប្ដូ​រភាសា​តាមដែលអាច​ធ្វើទៅបានម្លេះ ។ </p><p>ដូច្នេះ​ កុំ​កំណត់​វា​ លុះត្រាតែអ្នក​ត្រូវ​"
+"តែធ្វើ ។</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "ត្រង​សំបុត្រ​ថ្មី​ដែល​បាន​ទទួល​នៅ​ក្នុង​ថត groupware ដែរ ។"
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr "ធ្វើសមកាលកម្ម​ការ​ផ្លាស់ប្ដូរ groupware នៅ​ក្នុ​ងថត DIMAP ភ្លាមៗ​នៅពេល​នៅ​លើ​បណ្ដាញ ។"
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "តម្លៃ​នេះ​គឺត្រូវបាន​ប្រើ​ដើម្បី​សម្រេច​ថាតើ​ ការណែនាំ​អំពី KMail គួរតែត្រូវបាន​បង្ហាញ​ឬអត់ ។"
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "ចំនួន​ការតភ្ជាប់​អតិបរមា​ក្នុង​មួយ​ម៉ាស៊ីន"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"វា​អាចត្រូវបាន​ប្រើ​ដើម្បី​ដាក់កម្រិត​​ចំនួន​នៃ​ការតភ្ជាប់​ក្នុងមួយ​ម៉ាស៊ីន នៅខណៈពេល​ដែល​កំពុង​ពិនិត្យរកមើល​សំបុត្រ​"
+"ថ្មី ។ តាមលំនាំដើម ចំនួន​នៃ​ការតភ្ជាប់​គឺមិន​កំណត់ (0) ។"
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "បង្ហាញ​​ការកែសម្រួល​បន្ទាត់​ស្វែងរក​រហ័ស"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"ជម្រើស​នេះ​ អនុញ្ញាត ឬ​ មិនអនុញ្ញាត​ការកែសម្រួល​បន្ទាត់ស្វែងរក នៅខាងលើ​បញ្ជីសារ ដែលអាចត្រូវបាន​"
+"ប្រើដើម្បី​ស្វែងរក​ព័ត៌មាន​ដែល​បាន​បង្ហាញ​នៅក្នុង​បញ្ជីសារ​ដោយស្វ័យប្រវត្តិ ។"
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "លាក់​ប្រអប់​ទទួលមូលដ្ឋាន ប្រសិន​បើ​មិន​បាន​ប្រើ"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "បញ្ចូល​បន្ត​នៅ​ក្នុង​តួ​ជា​លំនាំដើម ។"
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "អនុញ្ញាត​តួអក្សរ​​ចំណុច​ក្បៀស (';') ឲ្យ​ប្រើជា​ឧបករណ៍​ខណ្ឌចែក​នៅ​ក្នុង​កម្មវិធីតែង​សារ ។"
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "ប្រសិនបើ​អាចធ្វើទៅបាន រក្សាទុក​សំណុំតួអក្សរ​ដើម​នៅពេល​កំពុង​ឆ្លើយតប​ ឬ កំពុង​បញ្ជូន​បន្ត​​"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "បញ្ចូល​ហត្ថលេខា​ដោយ​ស្វ័យ​ប្រវត្តិ"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"ចងចាំ​អត្តសញ្ញាណ​នេះ​ ដូច្នេះ​វា​នឹងត្រូវបាន​ប្រើ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​នៅពេល​អនាគត​ផងដែរ ។\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"ចងចាំ​​ថត​នេះ​សម្រាប់​វត្ថុ​ដែល​បាន​​ផ្ញើ ដូច្នេះ​វានឹង​ត្រូវបាន​ប្រើ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​នៅពេល​អនាគត​"
+"ផងដែរ ។"
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"ចងចាំ​ការបញ្ជូន​សំបុត្រ​នេះ ដូច្នេះ​វា​នឹង​ត្រូវបាន​ប្រើនៅក្នុង​បង្អួច​កម្មវិធី​តែងក្នុងពេល​អនាគត​ផងដែរ ។"
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"ចងចាំ​អត្តសញ្ញាណ​នេះ​ ដូច្នេះ​វា​នឹងត្រូវបាន​ប្រើ​នៅក្នុង​បង្អួច​កម្មវិធី​តែង​នៅពេល​អនាគត​ផងដែរ ។\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "ពាក្យ​​រុំ​នៅ​ជួឈរ "
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "ចំនួន​អតិបរមា​នៃ​បន្ទាត់​កម្មវិធី​កែសម្រួល​​អ្នកទទួល ។"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"បើក​ជម្រើស​នេះ​ដើម្បី​ធ្វើ Outlook &#8482 ។ ស្វែងយល់អំពី​ឈ្មោះ​ឯកសារភ្ជាប់​ដែល​មាន​តួអក្សរ​មិនមែន​ជា​"
+"ភាសាអង់គ្លេស"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "ស្នើ​ការជូន​ដំណឹង​អំពី​ការរៀបចំ​សារ​ដោយស្វ័យប្រវត្តិ"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>បើក​ជម្រើស​នេះ​ប្រសិនបើ​អ្នក​ចង់​ឲ្យ​ KMail ស្នើ​ការជូនដំណឹង​អំពី​ការរៀបចំសារ (MDNs) សម្រាប់​​"
+"សារផ្ញើចេញ​របស់អ្នក​នីមួយៗ ។</p><p>ជម្រើស​នេះ​​មានឥទ្ធិពល​តែ​នៅលើលំនាំដើម​តែប៉ុណ្ណោះ ។ អ្នក​នៅតែអាច​"
+"បើក ឬ បិទការស្នើ MDN ​នៅលើ​មូលដ្ឋាន​ក្នុង​មួយសារ​នៅក្នុង​កម្មវិធី​តែង ធាតុ​ម៉ឺនុយ <em>ជម្រើស</em>-"
+"><em>ការជូនដំណឹង​អំពី​ការរៀបចំ​សំណើរ</em> ។</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "ប្រើ​អាសយដ្ឋាន​​បច្ចុប្បន្ន​សម្រាប់​ការបំពេញ​ដោយស្វ័យប្រវត្តិ"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"បិទ​ជម្រើស​នេះ​ ប្រសិនបើ​អ្នក​មិនចង់​ឲ្យ​អាសយដ្ឋាន​ដែល​បានប្រើ​ថ្មីៗ​នេះ​លេចឡើង​នៅក្នុង​​បញ្ជី​បញ្ចប់​"
+"ដោយស្វ័យប្រវត្តិ​នៅក្នុង​វាល​អាសយដ្ឋាន​របស់កម្មវិធី​តែង ។"
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "រក្សាទុក​ចន្លោះពេល​ដោយស្វ័យប្រវត្តិ ៖"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"ច្បាប់ចម្លង​បម្រុង​ទុក​របស់​អត្ថបទ​នៅក្នុង​បង្អួច​កម្មវិធីតែង ដែលអាច​ត្រូវបាន​បង្កើត​យ៉ាងទៀងទាត់ ។ ចន្លោះពេល​"
+"ដែល​​បានប្រើ​ដើម្បី​បង្កើត​ព័ត៌មាន​បម្រុងទុក​គឺត្រូវបាន​កំណត់​នៅទីនេះ ។ អ្នកអាច​បិទ​ការរក្សាទុក​ដោយស្វ័យប្រវត្តិ​​"
+"ដោយ​កំណត់វា​ទៅតម្លៃ 0 ។"
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "បញ្ចូល​ហត្ថលេខា​ខាង​លើ​អត្ថបទ​ដែល​បាន​ស្រង់"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "ជំនួស​បុព្វបទ​ដែលបានទទួល​ស្គាល់​ដោយ \"ឆ្លើយតប ៖\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "ជំនួស​បុព្វបទ​ដែល​បាន​ទទួល​ស្គាល់​ដោយ \"បញ្ជូន​បន្ត ៖\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "ប្រើ​ការ​ដកស្រង់​ឆ្លាត"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "ហត្ថលេខា​បាន​ផុត​កំណត់​ហើយ ។"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "ប្រភេទ​នៃ​ឧបករណ៍ជ្រើស​អាសយដ្ឋាន"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"កំណត់​ប្រភេទ​របស់​ប្រអប់ ដើម្បី​ជ្រើស​អ្នក​ទទួល​សម្រាប់ ជូនចំពោះ\n"
+"        ចម្លងជូន និង​ចម្លងជាសម្ងាត់ជូន ។"
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "ប្រភេទ​នៃ​កម្មវិធី​កែសម្រួល​អ្នកទទួល"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"កំណត់​ប្រភេទ​របស់​កម្មវិធី​និពន្ធ​អ្នក​ទទួល ដើម្បី​កែសម្រួល ជូនចំពោះ\n"
+"        ចម្លងជូន និង​ចម្លងជាសម្ងាត់ជូន ។"
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "ចំនួន​អតិបរមា​នៃ​បន្ទាត់​កម្មវិធី​កែសម្រួល​​អ្នកទទួល ។"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr "បញ្ជីប្រភេទ​ផ្នែក​សារ​ត្រូវ​ហូត​សំបុត្រ​ចេញ ដែល​កំពុង​ត្រូវ​បានបញ្ជូន​បន្ត​នៅ​ក្នុង​តួ ។"
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "ទំហំ​អតិបរមា​គិត​ជា​មេកាបៃ​ ដែល​ឯកសារ​ភ្ជាប់​របស់​អ៊ីមែល​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​មាន ។"
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "បង្ហាញ​ការ​គ្រប់គ្រង Snippet អត្ថបទ​ និង​បញ្ចូល​បន្ទះ​នៅ​ក្នុង​កម្មវិធី​តែង ។"
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"បង្ហាញ​កំណត់​ហេតុ​ត្រួតពិនិត្យ GnuPG សូម្បី​តែ​បន្ទាប់​ពី​ប្រតិបត្តិការ crypto ដែល​បាន​បញ្ចប់​ដោយ​ជោគជ័យ ។"
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "ប្រសិនបើ​អាចធ្វើទៅបាន រក្សាទុក​សំណុំតួអក្សរ​ដើម​នៅពេល​កំពុង​ឆ្លើយតប​ ឬ កំពុង​បញ្ជូន​បន្ត​​"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"អ៊ីមែល​មួយ​ចំនួន ជាពិសេស​ទាំងនោះ​គឺត្រូវបាន​បង្កើត​ដោយស្វ័យ​ប្រវត្តិ​ ដែលមិនបាន​បញ្ជាក់​សំណុំតួអក្សរ​ដែលត្រូវការ​ឲ្យ​"
+"ត្រូវបាន​ប្រើ​​ដើម្បី​បង្ហាញ​ពួកវា​ឲ្យ​ត្រឹមត្រូវ ។ ក្នុង​ករណី​ដូច​នោះ​ សំណុំ​តួអក្សរ​ត្រឡប់ក្រោយនឹង​ត្រូវបាន​ប្រើ "
+"ដែលអ្នកអាច​កំណត់រចនាសម្ព័ន្ធ​នៅទីនេះ ។ កំណត់វា​ទៅជាកា​រអ៊ិនកូដដែលបានប្រើ​ជាទូទៅបំផុត​នៅក្នុង​ផ្នែក​នៃ​"
+"ពិភពលោក​របស់អ្នក ។ ជាលំនាំដើម សំណុំតួអក្សរ​បានកំណត់រចនាសម្ព័ន្ធ​សម្រាប់​ប្រព័ន្ធ​ទាំងមូល​ដែលត្រូវបានប្រើ ។"
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"ការ​ផ្លាស់ប្ដូរ​វា​ពី​លំនាំ​ដើម 'ស្វ័យប្រវត្តិ​'​ របស់វា​នឹងបង្ខំ​ឲ្យ​ប្រើការ​អ៊ិនកូដ​​ដែលបាន​បញ្ជាក់​សម្រាប់​អ៊ីមែល​"
+"ទាំងអស់​ដែល​មិនបាន​គិតដល់​អ្វី​ដែល​ពួកគេ​បញ្ជាក់​សម្រាប់​សម្រាប់ខ្លួន​ពួក​គេ​ផ្ទាល់ ។"
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"បើក​វា ប្រសិនបើអ្នកចង់​ឲ្យ​សញ្ញាអារម្មណ៍​ដូចជា :-) លេចចេញ​នៅ​ក្នុង​អត្ថបទសារ ដើម្បី​ឲ្យ​វាជំនួស​ដោយ​សញ្ញា​"
+"អារម្មណ៍ (រូបភាព​តូច) ។"
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"បើក​ជម្រើស​នេះ​​ដើម្បី​បង្ហាញ​កម្រិត​ផ្សេងគ្នា​នៃ​អត្ថបទ​ដក​ស្រង់ ។ បិទ​វា​ដើម្បី​លាក់​កម្រិត​នៃ​អត្ថបទ​ដកស្រង់ ។"
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "កម្រិត​វេញ​ស្វ័យប្រវត្តិ ៖"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "បន្ថយ​ទំហំ​ពុម្ព​អក្សរ​សម្រាប់​អត្ថបទ​ដកស្រង់"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "បើក​ជម្រើស​នេះ​ដើម្បី​បង្ហាញ​អត្ថបទ​ដកស្រង់​ដោយ​ពុម្ព​អក្សរ​តូចជាងមុន ។"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "ទុក​សារ​ដែលបាន​ផ្ញើ​ បាន​អ៊ិនគ្រីប"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "បង្ហាញ​ភ្នាក់ងារ​អ្នក​ប្រើ​នៅ​ក្នុង​បឋមកថា​ស្អាត​បាត"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"បើក​ជម្រើស​នេះ ដើម្បី​ទទួល​បន្ទាត់​បឋមកថា​កម្មវិធី​ផ្ញើ​អ៊ីមែល X និង​ភ្នាក់ងារ​អ្នក​ប្រើ​ដែល​បាន​បង្ហាញ នៅ​ពេល​"
+"ប្រើ​បឋមកថា​ស្អាត​បាត ។"
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "អនុញ្ញាត​ឲ្យ​លុប​ឯកសារ​ភ្ជាប់​របស់​សំបុត្រ​ដែល​មាន​ស្រាប់ ។"
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "អនុញ្ញាត​ឲ្យ​កែសម្រួល​ឯកសារ​ភ្ជាប់​របស់​សំបុត្រ​ដែល​មាន​ស្រាប់ ។"
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "តែងតែ​ឌិគ្រីប​សារ​ នៅពេល​មើល ឬ​សួរ​មុននឹង​ឌិគ្រីប"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "ផ្ញើ​ការជូន​ដំណឹងអំពី​ការរៀបចំ​សារ​ជាមួយ​អ្នកផ្ញើ​ទទេ ។"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"ផ្ញើ​ការជូនដំណឹង​អំពី​ការរៀបចំ​សារ​ជាមួយ​ខ្សែអក្សរ​អ្នកផ្ញើ​ទទេ​មួយ ។ ម៉ាស៊ីន​បម្រើ​មួយ​ចំនួន​អាច​ត្រូវបាន​កំណត់​រចនា​"
+"សម្ព័ន្ធ​ ដើម្បី​បដិសេធ​សារដូចនោះ ដូច្នេះ​ប្រសិន​បើអ្នកកំពុង​ពិសោធ​បញ្ហា​ក្នុងការ​ផ្ញើ MDNs សូម​ដោះធីក​ជម្រើស​"
+"នេះ ។"
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "ឃ្លា​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​ពុម្ព"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "ឃ្លា​ចាស់​ត្រូវ​បាន​បម្លែង​ទៅ​ជា​ពុម្ព"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "ពុម្ពសារ​​សម្រាប់​សារ​ថ្មី"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "ពុម្ពសារ​សម្រាប់​ឆ្លើយតប"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "ពុម្ពសារ​សម្រាប់​ឆ្លើយតប​ទៅ​អ្នក​ទាំងអស់"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "ពុម្ព​សារ​សម្រាប់​បញ្ជូន​បន្ត"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "តួអក្សរ​សម្រង់"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "អនុញ្ញាត​ឲ្យ​ការ​កំណត់​ក្រៅការិយាល័យ​​អាច​​ផ្លាស់ប្ដូរ​បាន​ដោយ​​អ្នក​ប្រើ ។"
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ផ្ទុកស្គ្រីប​ត្រង​ក្រៅការិយាល័យ​ ប៉ុន្តែ​មិន​អនុញ្ញាត​ឲ្យ​ពួកគេ​ផ្លាស់ប្ដូរ​នៃ​ការ​កំណត់​ណា​មួ​យ​ទេ ដូច​"
+"ជា ប្រតិកម្ម​ដែន និង​ការ​ប្ដូរ​ប្រតិកម្ម​សារ​ឥតបានការ ។"
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "ផ្ញោះ​កា​រឆ្លើយបត​នៅ​ក្រៅការិយាល័យ​ទៅ​សំបុត្រ​ដែល​បាន​មក​តែ​ពី​ដែន​នេះ​​ប៉ុណ្ណោះ ។"
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "អនុញ្ញាត​ឲ្យ​ឆ្លើយតប​នៅក្រៅការិយាល័យ​​ត្រូវ​បានផ្ញើ​ទៅ​សារ​ដែល​បាន​សម្គាល់​ជា SPAM ។"
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"ពិនិត្យ​មើល ប្រសិន​បើ​នៅ​តែ​មាន​ការ​កំណត់​រចនាសម្ព័ន្ធ​ការ​ឆ្លើយតប​នៅ​ក្រៅ​ការិយាល័យ​សកម្ម នៅពេល​ចាប់ផ្ដើម​ "
+"KMail ។"
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "កែសម្រួល​អត្ថបទ"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "​កែសម្រួល..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "​ទៅ"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "ថត"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "សារ"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "ឆ្លើយ​តបពិសេស"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "​ទៅ​មុខ"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "ព័ត៌មាន​ជំនួយ"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "កំណត់​ការ​ច្រឹប"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "របា​ឧបករណ៍​ HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "ជម្រើស​ទូទៅ"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "របា​ឧបករណ៍​ HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "វិញ្ញាបនបត្រ​​ដោយប្រើ CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"ប្រិសន​បើ​បាន​ជ្រើស​ជម្រើស​នេះ វិញ្ញាបនបត្រ S/MIME គឺត្រូវបាន​ធ្វើ​ឲ្យមាន​សុពលភាព ដោយប្រើ​បញ្ជី​ដកហូត​"
+"វិញ្ញាបនបត្រ​វិញ (CRLs) ។"
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "វិញ្ញាបនបត្រ​សុពលកម្ម​នៅលើបណ្ដាញ (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"ប្រសិនបើ​បានជ្រើស​ជម្រើស​នេះ វិញ្ញាបនបត្រ​ S/MIME  គឺត្រូវបាន​ធ្វើ​ឲ្យមាន​សុពលភាព​នៅលើបណ្ដាញ ដោយប្រើ​"
+"ពិធីការ​ស្ថានភាព​វិញ្ញាបនបត្រ​នៅលើបណ្ដាញ (OCSP) ។ បំពេញ​ URL នៃ​អ្នកឆ្លើយតប OCSP ខាងក្រោម ។"
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "សុពលកម្ម​វិញ្ញបនបត្រ​នៅលើ​បណ្ដាញ"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP អ្នកផ្ញើ URL ៖"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"បញ្ចូល​​អាសយដ្ឋាន​នៃ​ម៉ាស៊ីនបម្រើ​នៅទីនេះ​សម្រាប់​សុពលកម្ម​នៅលើ​បណ្ដាញ​នៃ​វិញ្ញាបនបត្រ (អ្នកឆ្លើយតប "
+"OCSP) ។ URL តែងតែ​ចាប់ផ្ដើម​ជាមួយ http:// ។"
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "ហត្ថលេខា​អ្នកឆ្លើយតប OCSP ៖"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "មិនអើពើ​នឹង​សេវា URL នៃ​វិញ្ញាបនបត្រ"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "កុំ​ពិនិត្យ​មើល​គោលការណ៍​វិញ្ញាបនបត្រ"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"តាមលំនាំដើម GnuPG ប្រើ​ឯកសារ ~/.gnupg/policies.txt ដើម្បី​ពិនិត្យ​មើល​ថាតើ​គោលការណ៍​"
+"វិញ្ញាបនបត្រ​​គឺត្រូវបាន​អនុញ្ញាត​ឬអត់ ។ ប្រសិន​បើ​បាន​ជ្រើស​ជម្រើស​នេះ គោលការណ៍​មិន​ត្រូវបាន​ពិនិត្យ​ឡើយ ។"
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "កុំពិគ្រោះ CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"ប្រសិន​បើ​ជម្រើស​នេះ​ត្រូវបាន​ធីក បញ្ជី​ដកហូត​វិញ្ញាបនបត្រ​វិញ​គឺ​មិនធ្លាប់ត្រូវបាន​ប្រើ​ដើម្បី​ធ្វើឲ្យវិញ្ញាបនបត្រ "
+"S/MIME មានសុពលភាព​ឡើយ ។"
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "ទៅប្រមូល​យក​វិញ្ញាបនបត្រ​អ្នកចេញ​ដែល​បាត់បង់"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"ប្រសិនបើ​ជម្រើស​នេះ​ត្រូវបាន​ធីក វិញ្ញាបនបត្រ​អ្នកចេញ​ដែល​បាត់បង់ គឺត្រូវបាន​ទៅប្រមូល​យក​នៅពេលដែល​ចាំបាច់ "
+"(វា​អនុវត្ត​ទៅ​វិធីសាស្ត្រ​សុពលកម្មទាំងពី គឺ CRLs និង OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "ការស្នើ HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "កុំ​ធ្វើ​ការ​ស្នើ​ HTTP មួយចំនួន"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "បិទ​ការប្រើប្រាស់នៃ​ HTTP សម្រាប់ S/MIME ទាំងមូល ៖"
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "ប្រើ​ប្រូកស៊ី​នេះ​សម្រាប់​ការ​ស្នើ HTTP ៖ "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "ប្រើ​ប្រព័ន្ធប្រូកស៊ី HTTP ៖"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"ប្រសិនបើ​ជម្រើស​នេះ​ត្រូវបាន​ជ្រើស តម្លៃ​នៃ​ប្រូកស៊ី HTTP បាន​បង្ហាញ​នៅខាងស្ដាំ (ដែល​មកពី​អថេរ​បរិស្ថាន "
+"http_proxy) នឹងត្រូវបាន​ប្រើ​សម្រាប់​សំណើរ​ HTTP មួយចំនួន ។"
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"បញ្ចូល​ទីតាំង​នៃ​ប្រូកស៊ី HTTP របស់អ្នក​នៅទីនេះ ដែល​នឹងត្រូវបាន​ប្រើ​សម្រាប់​គ្រប់​ការស្នើ​ HTTP ដែលទាក់ទង​"
+"នឹង S/MIME ទាំងអស់ ។ វាក្យសម្ពន្ធ​គឺ ម៉ាស៊ីន:ច្រក សម្រាប់​វត្ថុ​ myproxy.nowhere.com:3128 ។"
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "មិនអើពើ​នឹងចំណុច​ចែកចាយ​ HTTP CRL នៃ​វិញ្ញាបនបត្រឡើយ"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"នៅពេល​ដែលកំពុង​ស្វែងរក​ទីតាំង​នៃ CRL, វិញ្ញាបនបត្រ​ដែល​ត្រូវបាន​សាកល្បង ជាធម្មតាមាន អ្វី​ដែល​"
+"គេស្គាល់ថាជា​ធាតុបញ្ចូល \"ចំណុច​ចែកចាយ CRL\" (DP), ដែលជា​ URLs ពិពណ៌នា​អំពី​វិធី​ដើម្បី​ចូលដំណើរការ "
+"URL ។ ធាតុបញ្ចូល​ DP ដែលបាន​រកឃើញ​ដំបូង គឺត្រូវបាន​ប្រើ ។  ជាមួយ​ជម្រើស​ធាតុបញ្ចូល​ទាំងអស់ ការប្រើ​​"
+"គ្រោងការណ៍ HTTP ត្រូវបាន​មិអើពើ​នៅពេលដែលកំពុង​រកមើល DP ដែលសមរម្យ ។"
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "ការស្នើ LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "មិនធ្វើ​ការ​ស្នើ​ LDAP ណាមួយ​ឡើយ"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "បិទ​ការប្រើ​ប្រាស់​នៃ LDAP សម្រាប់ S/MIME ទាំងមូល ។"
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "មិនអើពើ​នឹងចំណុច​ចែកចាយ LDAP CRL នៃ​វិញ្ញាបនបត្រ"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"នៅពេល​ដែល​កំពុង​រកមើល​ទីតាំង CRL វិញ្ញាបនបត្រ​ដែល​ត្រូវបាន​សាកល្បង ជាធម្មតាមានអ្វី​ដែល​គេ​ស្គាល់ថាជា​"
+"ធាតុបញ្ចូល \"ចំណុចចែកចាយ CRL\" (DP) ដែលជា​​ការពណ៌នា​ពី​ URLs ដែលជា​វិធី​ចូល​ទៅ​ដំណើរការ URL ។ "
+"ធាតុ​បញ្ចូល​ DP ដែលបាន​រកឃើញ​មុនគេ​គឺត្រូវ​បានប្រើ ។  ជាមួយ​ជម្រើស​នេះ​ដែរ ធាតុបញ្ចូល​ទាំងអស់​​ដែលប្រើ​​"
+"គ្រោងការណ៍ LDAP​ គឺត្រូវបាន​មិនអើពើ​នៅពេល​ដែល​កំពុង​រកមើល​ DP ដែលសមរម្យ​ ។"
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "ម៉ាស៊ីនចម្បង​សម្រាប់​សំណើ LDAP ៖"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"ការបញ្ចូល​ម៉ាស៊ីន​បម្រើ LDAP នៅត្រង់នេះ នឹងធ្វើ​ឲ្យ​សំណើរ LDAP ទាំងអស់ទៅកាន់ម៉ាស៊ីនបម្រើ​នោះ​មុនគេ ។ "
+"កាន់តែ​ច្បាស់​ជាងនេះទៀត ការកំណត់​នេះ​បដិសេធ​ចំពោះ​ម៉ាស៊ីន​បម្រើ និង​ ផ្នែក​ច្រក​ដែលបានបញ្ជាក់មួយ​"
+"ចំនួននៅក្នុង LDAP URL និង​ក៏នឹងត្រូវបាន​ប្រើ​ដែរ​ប្រសិនបើ​ម៉ាស៊ីន​បម្រើ និង​ច្រកត្រូវបាន​លុបចេញពី URL ។ "
+"ម៉ាស៊ីនបម្រើ​ LDAP ផ្សេងទៀត នឹងត្រូវបានប្រើតែប៉ុណ្ណោះ ប្រសិនបើ​ការតភ្ជាប់ទៅកាន់\"ប្រូកស៊ី\" "
+"បានបរាជ័យនោះ ។\n"
+"វាក្យ​សម្ពន្ធ គឺ \"HOST\" ឬ \"HOST:PORT\" ។ ប្រសិនបើបានលុប PORT នោះ​ច្រក 389 (ច្រក LDAP "
+"ខ្នាតគំរូ) ត្រូវបាន​ប្រើ ។"
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "បន្ថែម Snippet"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "​បន្ថែម"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "Snippet ៖"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "ក្រុម ៖"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "កំណត់​ការ​ច្រឹប"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "ព័ត៌មាន​ជំនួយ"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "បង្ហាញអត្ថបទ​របស់ snippet នៅ​ក្នុង​ព័ត៌មាន​ជំនួយ"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "សម្រេចិត្ត​ប្រសិនបើ​ព័ត៌មាន​ជំនួយ​គួរ​ត្រូវ​បានបង្ហាញ​ដោយ​មាន​អត្ថបទ​ពី​បន្ទាត់​ដែលបាន​ចំណាំ"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "អថេរ"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "វិធីសាស្ត្រ​បញ្ចូល​សម្រាប់​អថេរ"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "ប្រអប់​តែ​មួយ​សម្រាប់​អថេរ​នីមួយៗ​នៅ​ក្នុង snippet"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "ប្រអប់​បញ្ចូល​មួយ​នឹង​ត្រូវ​បានបង្ហាញ​សម្រាប់​​គ្រប់​អថេរ​នៅ​ក្នុង snippet"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "ប្រអប់​មួយ​សម្រាប់​អថេរ​នៅ​ក្នុង snippet"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"ប្រអប់​តែ​មួយ​នឹង​ត្រូវ​បាន​បង្ហាញ នៅ​កន្លែង​ដែលអ្នកអាច​បញ្ចូល​តម្លៃ​សម្រាប់​អថេរ​ទាំងអស់​នៅ​ក្នុង snippet"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "ឧប​ករណ៍​កំណត់​ព្រំដែន ៖"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "ការ​កំណត់​រចនាសម្ព័ន្ធ​ពុម្ព"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "ឆ្លើយ​តប​ទៅ​អ្នក​ផ្ញើ"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "ឆ្លើយ​តប​ទៅ​អ្នក​ទាំងអស់/ឆ្លើយ​តប​ទៅ​បញ្ជី"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "បញ្ជូន​សារ​បន្ត"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "ព្រមាន​ នៅពេល​ដែល​កំពុងព្យាយាម​ផ្ញើ​សារ​ដែល​មិនទាន់បាន​ចុះហត្ថលេខា"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "ពិនិត្យ​មើល​ដើម្បី​ទទួល​យក​ការព្រមាន​នៅពេល​ដែល​កំពុង​ផ្ញើ​សារ​ដែល​មិនទាន់​បាន​ចុះហត្ថលេខា ។"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន​ នៅពេលដែល​កំពុងព្យាយាម​ផ្ញើ​សារ​ដែល​មិនទាន់បាន​ចុះហត្ថលេខា</h1>\n"
+"ប្រសិនបើ​បាន​ធីក​ប្រអប់​នេះ អ្នកនឹង​ត្រូវបាន​ព្រមាន​នៅពេល​ដែល​អ្នកព្យាយាម​ផ្ញើ​សារ​មួយផ្នែក​ ឬ​ "
+"ទាំងមូលដែលមិនបាន​​ចុះហត្ថលេខានោះ ។\n"
+"<p>\n"
+"វា​ត្រូវ​បាន​ផ្ដល់​អនុសាសន៍​ឲ្យ​ទុក​ជម្រើស​នេះ​នៅបើក​សម្រាប់​ការរួមបញ្ចូល​គ្នា​អតិបរមា ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "ព្រមាន​ នៅពេល​កំពុង​ព្យាយាមផ្ញើ​សារ​ដែល​មិនបាន​អ៊ិនគ្រីប"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "ធីក​ដើម្បី​ទទួល​យក​ការ​ព្រមាន នៅពេល​​សារ​ដែល​មិនបាន​អ៊ិនគ្រីប ។"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន នៅពេល​ដែល​កំពុងព្យាយាម​ផ្ញើ​សារ​ដែល​មិនបាន​អ៊ិនគ្រីប</h1>\n"
+"ប្រសិនបើ​បាន​ធីកប្រអប់​ននេះ អ្នក​នឹងត្រូវបាន​ព្រមាន​នៅពេល​ដែល​ព្យាយាម​ផ្ញើផ្នែក ឬ សារទាំងមូលដែលមិនបាន​"
+"អ៊ិនគ្រីប ។\n"
+"<p>\n"
+"វា​ត្រូវបាន​ផ្ដល់អនុសាសន៍​ឲ្យទុក​ជម្រើស​នេះ​នៅបើក​សម្រាប់​ការរួមបញ្ចូល​គ្នា​អតិបរមា ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "ព្រមាន​ ប្រសិនបើ​អាសយដ្ឋាន​អ៊ីមែល​របស់​អ្នកទទួល​​មិនមាន​នៅក្នុង​វិញ្ញាបនបត្រ"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "ធីកដើម្បី​ទទួល​ការ​ព្រមាន​ ប្រសិនបើ​អាសយដ្ឋាន​មិននៅក្នុង​វិញ្ញាបនបត្រ"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន​ ប្រសិនបើ​អាសយដ្ឋាន​អ៊ីមែល​របស់​អ្នកទទួលមិន​នៅក្នុង​វិញ្ញាបនបត្រ</h1>\n"
+"ប្រសិនបើ​បាន​ធីក​ជម្រើស​នេះ ការព្រមាន​ត្រូវបាន​ប្រកាស់ ប្រសិនបើ​​អាសយដ្ឋាន​សំបុត្រ​​របស់អ្នកទទួល​មិនមាន​នៅក្នុង​"
+"វិញ្ញាបនបត្រ​ដែល​បានប្រើ​សម្រាប់​ការអ៊ិនគ្រីប ។\n"
+"<p>\n"
+"វាត្រូវបាន​ផ្ដល់អនុសាសន៍​ឲ្យ​ទុក​ជម្រើស​នេះ​នៅបើក​សម្រាប់​សុវត្ថិភាព​អតិបរមា ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "ព្រមាន ប្រសិនបើ​វញ្ញាបនបត្រ/សោ ជិតផុតកំណត់ (កំណត់​រចនាសម្ព័ន្ធ​កម្រិតពន្លឺ​ខាងក្រោម)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "សម្រាប់​ការចុះ​ហត្ថលេខា"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "សម្រាប់​ការបម្លែង​ជាកូដ"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "ជ្រើស​ចំនួន​ថ្ងៃ​នៅទីនេះ"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន​ប្រសិនបើ​វិញ្ញាបនបត្រ​ហត្ថលេខា​ផុតកំណត់</h1>\n"
+"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា​ ដែល​វិញ្ញាបនបត្រ​ហត្ថលេខា​គួរ​តែ​ត្រឹមត្រូវ​ដោយក្រៅពីការប្រកាស់ការព្រមាន ។\n"
+"<p>\n"
+"ការកំណត់​ SPHINX ដែលបានផ្ដល់អនុសាសន៍​គឺ 14 ថ្ងៃ ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន​ប្រសិនបើ​វិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប​​ផុតកំណត់</h1>\n"
+"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា​ដែល​វិញ្ញាបនបត្រ​​ការអ៊ិនគ្រីប​គួរតែត្រឹមត្រូវ​ដោយ​គ្មាន​ការប្រកាស់​ការព្រមាន ។\n"
+"<p>\n"
+"ការកំណត់ SPHINX ដែលបាន​ផ្ដល់អនុសាសន៍គឺ 14 ថ្ងៃ ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន​ ប្រសិនបើ​វិញ្ញាបនបត្រ​នៅក្នុង​លំដាប់​ផុតកំណត់</h1>\n"
+"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា​ ដែល​វិញ្ញាបនបត្រ​នៅក្នុង​លំដាប់​គួរតែត្រឹមត្រូវ​ដោយគ្មាន​ការប្រកាស់​ការព្រមាន ។\n"
+"<p>\n"
+"ការកំណត់​ SPHINX ដែលបាន​ផ្ដល់អនុសាសន៍គឺ 14 ថ្ងៃ ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន​​ ប្រសិន​បើវិញ្ញាបនបត្រ CA ផុតកំណត់</h1>\n"
+"ជ្រើស​ចំនួន​ថ្ងៃ​​អប្បរមា​ដែល​វិញ្ញាបនបត្រ CA គួរ​តែ​ត្រឹមត្រូវ​​ដោយគ្មាន​ការ​ប្រកាស់​ការព្រមាន ។\n"
+"<p>\n"
+"ការកំណត់ SPHINX ដែលបានផ្ដល់​អនុសាសន៍​គឺ 14 ថ្ងៃ ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>ព្រមាន​ប្រសិន​បើ​វិញ្ញាបនបត្រដើម​ផុតកំណត់</h1>\n"
+"ជ្រើស​ចំនួន​ថ្ងៃ​អប្បរមា ដែល​វិញ្ញាបនបត្រ​ដើម​គួរតែ​ត្រឹមត្រូវ​ក្រៅពី​ការប្រកាស់ការព្រមាន ។\n"
+"<p>\n"
+"ការកំណត់ SPHINX ដែល​បាន​ផ្ដល់អនុសាសន៍គឺ 14 ថ្ងៃ ។\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "សម្រាប់​វិញ្ញាបនបត្រ​ដើម ៖"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "សម្រាប់​វិញ្ញាបនបត្រ​ CA មធ្យម ៖"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "សម្រាប់​សោ/​វិញ្ញាបនបត្រ​អ្នកប្រើ ៖"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "បើក​ការព្រមាន \"កុំ​សួរម្ដងទៀត\" ទាំងអស់ឡើងវិញ"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...ដែលអ្នកអាច​ទៅកាន់​សារ​បន្ទាប់ និង​មុន ដោយប្រើ\n"
+"គ្រាប់ចុច​ព្រួញ​​ស្ដាំ​ និង​ឆ្វេងដោយរៀងខ្លួន ?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...ដែលអ្នក​អាច​បង្កើត​តម្រង​នៅលើ​អ្នកផ្ញើ​យ៉ាងលឿន, អ្នកទទួល,\n"
+"ប្រធានបទ និង​បញ្ជីសំបុត្រ​រួមដោយប្រើ <em>ឧបករណ៍-&gt;បង្កើត&nbsp;តម្រង</em> ?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ដែលអ្នកអាចកំចាត់ &quot;[ឈ្មោះ​បញ្ជី​សំបុត្ររួម]&quot;\n"
+"ដែលបាន​បន្ថែម​ទៅកាន់​ប្រធានបទ​នៃ​បញ្ជី​សំបុត្រ​រួម​មួយចំនួន​ ដោយប្រើតម្រងសកម្មភាព <em>សរសេរ\n"
+"បឋមកថាឡើងវិញ</em>ឬ ? គ្រាន់តែប្រើ\n"
+"<pre>សរសេរ​បឋមកថា​ឡើងវិញ &quot;ប្រធានបទ&quot;\n"
+"   ជំនួស &quot;\\s*\\[ឈ្មោះ​បញ្ជី​សំបុត្រ​រួម\\]\\s*&quot;\n"
+"   ដោយ &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...ដែលអ្នកអាច​ភ្ជាប់​បញ្ជី​សំបុត្ររួម​ជាមួយ​ថត​នៅក្នុងប្រអប់\n"
+"<em>ថត-&gt;ការគ្រប់គ្រង​បញ្ជី​សំបុត្រ​រួម</em>ឬ ? ពេលនោះអ្នកអាចប្រើ\n"
+"<em>សារ-&gt;ថ្មី&nbsp;សារ&nbsp;ទៅ&nbsp;បញ្ជី​&nbsp;សំបុត្ររួម...</em>\n"
+"ដើម្បី​បើក​កម្មវិធី​តែង​ជាមួយ​ការកំណត់​អាសយដ្ឋាន​បញ្ជី​សំបុត្ររួមជាមុន ។\n"
+"ឆ្លាស់មកវិញ អ្នកអាច​ចុច​ជាមួយ​ប៊ូតុង​កណ្ដុរ​កណ្ដាល​លើថត ។</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...ដែលអ្នកអាច​ផ្ដល់​រូបតំណាង​ផ្ទាល់ខ្លួន​​ទៅកាន់​ថតផ្ទាល់ខ្លួន​នីមួយៗឬ ?\n"
+"សូម​មើល <em>ថត-&gt;លក្ខណៈ​សម្បត្តិ</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...ដែល KMail អាច​បង្ហាញ​របា​រពណ៌ ដែលចង្អុរ​បង្ហាញ​ពី​ប្រភេទ​នៃ​សារ\n"
+"(អត្ថបទ​ធម្មតា/HTML/OpenPGP) ដែលបានបង្ហាញ​បច្ចុប្បន្ន​ឬ ?</p>\n"
+"<p>ការខកខាន​នេះ​មាន​បំណង​ក្លែង​ការផ្ទៀងផ្ទាត់​ហត្ថលេខា​ឲ្យ​បានជោគជ័យ \n"
+"ដោយផ្ញើ​សំបុត្រ HTML ដែលធ្វើតាម​ស៊ុមស្ថានភាព​ហត្ថលេខា​របស់​ KMail ។</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...ដែលអ្នកអាច​ត្រង​នៅលើ​បឋមកថា​មួយចំនួន ដោយ​ធ្វើ​ឲ្យ​ការបញ្ចូល​ឈ្មោះ​របស់វា​ងាយស្រួល​\n"
+"នៅក្នុងវាល​កែសម្រួល​ដំបូង​នៃ​ច្បាប់​ក្នុង​ការស្វែងរក​ឬ ?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ដែលអ្នកអាច​ត្រងចេញ HTML តែសារ​ប៉ុណ្ណោះ​ដោយប្រើច្បាប់\n"
+"<pre>&quot;ប្រភេទមាតិកា&quot; មាន &quot;អត្ថបទ/html&quot; ?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...នោះដែល​កំពុង​ឆ្លើយតប ផ្នែក​របស់សារ​ដែលបាន​ជ្រើស​តែប៉ុណ្ណោះ​ឬ​ដែល​ជា​អត្ថបទដកស្រង់ ?</p>\n"
+"<p>ប្រសិនបើ​គ្មាន​អ្វី​ដែល​បាន​ជ្រើស​ទេ​នោះ នោះសារទាំងមូល​ជា​អត្ថបទ​ដកស្រង់ ។</p>\n"
+"<p>ភាព​ទាំងមូល​នេះ ធ្វើការជាមួយ​អត្ថបទ​របស់ឯកសារភ្ជាប់​ នៅពេល​ដែល\n"
+"<em>មើល-&gt;ឯកសារភ្ជាប់-&gt;ក្នុងបណ្ដាញ</em> ត្រូវបានជ្រើស ។</p>\n"
+"<p>លក្ខណៈ​ពិសេស​នេះ​ គឺ​មាន​ជាមួយ​ពាក្យបញ្ជា​ការឆ្លើយតបទាំងអស់​ លើកលែងតែ\n"
+"<em>សារ-&gt;ឆ្លើយតប​ដោយ​គ្មាន​ការដកស្រង់</em> ។</p>\n"
+"<p align=\"right\"><em>បានចែកចាយ​ដោយ David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "បង្ហាញ​វាល​ស្វែងរក​ថត​រហ័ស"
diff --git a/tde-i18n-ko/messages/tdepim/kmail.po b/tde-i18n-ko/messages/tdepim/kmail.po
index 76b6cb29ae3..49cfbc35196 100644
--- a/tde-i18n-ko/messages/tdepim/kmail.po
+++ b/tde-i18n-ko/messages/tdepim/kmail.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-01-30 21:04+0900\n"
 "Last-Translator: Youngbin Park <shrike@nate.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -27,13 +27,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Kyuhyong Yoo,Kyungho Lee,Hongsoo Byun,Sung-Jae Cho"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -182,6 +182,12 @@ msgstr "사용안함(사용 주의)(&E)"
 msgid "Account for semiautomatic resource handling"
 msgstr "반자동 리소스 핸들링 계정"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "이전 내용 지우기"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -257,12 +263,13 @@ msgstr "로그인(&L):"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"서버로부터 인증받을 때 사용하는 것으로 서비스 공급자로부터 부여받은 <em>사용자 이름</em>"
-"입니다. 대부분의 경우 메일 주소의 앞부분 입니다.(<em>@</em> 앞 부분)."
+"서버로부터 인증받을 때 사용하는 것으로 서비스 공급자로부터 부여받은 <em>사용"
+"자 이름</em>입니다. 대부분의 경우 메일 주소의 앞부분 입니다.(<em>@</em> 앞 부"
+"분)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -283,18 +290,18 @@ msgstr "POP 비밀번호 기억(&R)"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "이 옵션을 선택하시면 KMail에 비밀번호가 저장됩니다. \n"
-"만약 TDEWallet에 비밀번호를 저장하는 것이 가능하다면, 그곳에 저장하는 것이 더 안전하기 때문에 TDEWallet에 비밀번호가 "
-"저장됩니다.\n"
-"하지만 TDEWallet이 비활성화 되어 있다면, 비밀번호는 KMail의 설정파일에 저장됩니다. 비밀번호는 보안프로그램만이 알 수 있는 "
-"형식으로 저장됩니다."
+"만약 TDEWallet에 비밀번호를 저장하는 것이 가능하다면, 그곳에 저장하는 것이 "
+"더 안전하기 때문에 TDEWallet에 비밀번호가 저장됩니다.\n"
+"하지만 TDEWallet이 비활성화 되어 있다면, 비밀번호는 KMail의 설정파일에 저장됩"
+"니다. 비밀번호는 보안프로그램만이 알 수 있는 형식으로 저장됩니다."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -323,9 +330,12 @@ msgstr "다음 용량보다 큰 메일 걸러냄(&F)"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
-msgstr "이 옵션을 선택 하면 POP 필터가 작동 합니다. 서버에서 다운로드, 삭제 저장을 선택할 수 있습니다."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
+msgstr ""
+"이 옵션을 선택 하면 POP 필터가 작동 합니다. 서버에서 다운로드, 삭제 저장을 선"
+"택할 수 있습니다."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -374,13 +384,15 @@ msgstr "텍스트 지우기(&X)"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "로그인(&L)"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "일반(&P)"
 
@@ -424,14 +436,14 @@ msgstr "바꿈:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -490,12 +502,12 @@ msgstr "요청할 때만 첨부파일 불러오기(&M)"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"이메일을 선택했을 때 첨부파일을 자동으로 다운로드 하지 않고 첨부파일을 클릭했을 때에만 다운로드 합니다. 용량이 큰 이메일도 바로 볼 수 "
-"있습니다."
+"이메일을 선택했을 때 첨부파일을 자동으로 다운로드 하지 않고 첨부파일을 클릭했"
+"을 때에만 다운로드 합니다. 용량이 큰 이메일도 바로 볼 수 있습니다."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -505,7 +517,9 @@ msgstr "열린 디렉터리만 목록화"
 msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
-msgstr "디렉터리 트리의 열려진 디렉터리(확장된)만. 서버에 디렉터리가 많을 경우에 사용하십시오."
+msgstr ""
+"디렉터리 트리의 열려진 디렉터리(확장된)만. 서버에 디렉터리가 많을 경우에 사용"
+"하십시오."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -533,7 +547,7 @@ msgstr "<없음>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "받은 편지함"
 
@@ -541,38 +555,45 @@ msgstr "받은 편지함"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"서버가 고유 메세지 숫자를 지원하지 않는것 같습니다. 이는 서버에 메시지를 남기려면, 필요한 기능입니다.\n"
-"어떤 서버는 제공하는 서비스를 제대로 알려주지 못하기도 하므로, 메시지를 남길 수 있을 가능성이 있습니다."
+"서버가 고유 메세지 숫자를 지원하지 않는것 같습니다. 이는 서버에 메시지를 남기"
+"려면, 필요한 기능입니다.\n"
+"어떤 서버는 제공하는 서비스를 제대로 알려주지 못하기도 하므로, 메시지를 남길 "
+"수 있을 가능성이 있습니다."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"서버가 메시지 헤더 받기를 지원하지 않습니다. 하지만 이는 서버에서 메시지를 필터링하기 위해 필요한 기능입니다.\n"
-"어떤 서버는 제공하는 서비스를 제대로 알려주지 못하기도 하므로, 메시지를 필터링 할 수 있을 가능성이 있습니다."
+"서버가 메시지 헤더 받기를 지원하지 않습니다. 하지만 이는 서버에서 메시지를 필"
+"터링하기 위해 필요한 기능입니다.\n"
+"어떤 서버는 제공하는 서비스를 제대로 알려주지 못하기도 하므로, 메시지를 필터"
+"링 할 수 있을 가능성이 있습니다."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"파이프라이닝을 지원하지 않는 일부 POP3 서버가 잘못된 메일을 발송하는 원인이 될 수 있다는 점을 주의하십시오.\n"
-"비록 파이프라이닝 설정이 가능해도, 파이프라이닝에 대한 지원을 알려주지 않을 수 있습니다. POP3 서버가 파이프라이닝을 지원하는지 확인하고 "
-"싶은경우 아래있는 \"서버가 지원하는 방식 확인\" 을 누르시기 바랍니다.\n"
-"POP3서버가 파이프라이닝을 지원한다는 내용이 없더라도 보다 빠른 성능을 원한다면 여러분 스스로에게 일련의 메일을 보내고 받으면서 테스트 "
-"해보시길 바랍니다."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"파이프라이닝을 지원하지 않는 일부 POP3 서버가 잘못된 메일을 발송하는 원인이 "
+"될 수 있다는 점을 주의하십시오.\n"
+"비록 파이프라이닝 설정이 가능해도, 파이프라이닝에 대한 지원을 알려주지 않을 "
+"수 있습니다. POP3 서버가 파이프라이닝을 지원하는지 확인하고 싶은경우 아래있"
+"는 \"서버가 지원하는 방식 확인\" 을 누르시기 바랍니다.\n"
+"POP3서버가 파이프라이닝을 지원한다는 내용이 없더라도 보다 빠른 성능을 원한다"
+"면 여러분 스스로에게 일련의 메일을 보내고 받으면서 테스트 해보시길 바랍니다."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -580,42 +601,47 @@ msgstr "일반 설정 탭에서 메일 서버와 포트를 먼저 지정하십�
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "서버에서 파이프라이닝을 지원하지 않으므로 옵션을 사용할 수 없습니다.\n"
-"어떤 서버는 제공하는 서비스를 제대로 알려주지 못하기도 하므로, 파이프라이닝을 사용할 수 있을 가능성이 있습니다. 하지만 이 기능은 "
-"파이프라이닝을 지원하지 않는 서버에서는 잘못된 메시지를 보내게 할 수도 있음을 주의하십시오. 그러므로 중요한 메일에 대해 이 기능을 사용하기 "
-"전에 먼저 많은 수의 테스트 메세지를 스스로에게 보내고 모두 다운로드 받으면서 문제가 없는지 테스트 해봐야 합니다."
+"어떤 서버는 제공하는 서비스를 제대로 알려주지 못하기도 하므로, 파이프라이닝"
+"을 사용할 수 있을 가능성이 있습니다. 하지만 이 기능은 파이프라이닝을 지원하"
+"지 않는 서버에서는 잘못된 메시지를 보내게 할 수도 있음을 주의하십시오. 그러므"
+"로 중요한 메일에 대해 이 기능을 사용하기 전에 먼저 많은 수의 테스트 메세지를 "
+"스스로에게 보내고 모두 다운로드 받으면서 문제가 없는지 테스트 해봐야 합니다."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"서버가 고유 메세지 숫자를 지원하지 않습니다. 이는 서버에 메시지를 남기려면, 필요한 기능입니다. 그러므로 이 옵션은 사용할 수 없습니다.\n"
-"어떤 서버는 지원하는 서비스를 정확히 알려주지 못하기도 하므로, 받은 메시지를 남길 수 있을 가능성이 있습니다."
+"서버가 고유 메세지 숫자를 지원하지 않습니다. 이는 서버에 메시지를 남기려면, "
+"필요한 기능입니다. 그러므로 이 옵션은 사용할 수 없습니다.\n"
+"어떤 서버는 지원하는 서비스를 정확히 알려주지 못하기도 하므로, 받은 메시지를 "
+"남길 수 있을 가능성이 있습니다."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"서버가 메시지 헤더 받기를 지원하지 않습니다. 하지만 이는 서버에서 메시지를 필터링하기 위해 필요한 기능입니다. 그러므로 이 옵션을 사용하지 "
-"못합니다.\n"
-"어떤 서버는 지원하는 서비스를 정확히 알려주지 못하기도 하므로, 메시지를 필터링 할 수 있을 가능성이 있습니다."
+"서버가 메시지 헤더 받기를 지원하지 않습니다. 하지만 이는 서버에서 메시지를 필"
+"터링하기 위해 필요한 기능입니다. 그러므로 이 옵션을 사용하지 못합니다.\n"
+"어떤 서버는 지원하는 서비스를 정확히 알려주지 못하기도 하므로, 메시지를 필터"
+"링 할 수 있을 가능성이 있습니다."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -694,8 +720,8 @@ msgstr "IMAP 계정"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "메일을 받기 위해 설정사항의 네트워크 항목에서 계정을 추가해야 합니다."
 
 #: accountwizard.cpp:87
@@ -739,13 +765,13 @@ msgstr "맞춤법 검사 - K메일"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -816,8 +842,7 @@ msgstr "Use local delivery"
 msgid "Server Information"
 msgstr "서버 작동"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "사용 안함(&N)"
@@ -958,23 +983,25 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>여기에서는 일반적으로 바이러스 방지 도구로 사용하는 K메일의 필터 규칙 설정에 도움을 얻을 수 있습니다.</p>"
-"<p>마법사는 메세지를 분류하고, 바이러스를 포함하는 메세지를 격리하는 필터 규칙을 만드는 도구를 검색할 수 있습니다.마법사는 존재하는 어느 "
-"필터에 대해 고려하지는 않을 것입니다. 항상 새로운 규칙을 추가할 수 있습니다.</p><b>경 고:</b>"
-"바이러스 방지 도구가 메세지들을 검색하는 동안 정지되어 있는 것처럼 보여서, 민감한 KMail이 이에 대해 문제를 제기 할 수 있습니다. 이런 "
-"경우 이전의 정상적인 동작을 위해서 마법사를 통해 만든 규칙에 대해 삭제를 고려해 보십시오."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>여기에서는 일반적으로 바이러스 방지 도구로 사용하는 K메일의 필터 규칙 설정"
+"에 도움을 얻을 수 있습니다.</p><p>마법사는 메세지를 분류하고, 바이러스를 포함"
+"하는 메세지를 격리하는 필터 규칙을 만드는 도구를 검색할 수 있습니다.마법사는 "
+"존재하는 어느 필터에 대해 고려하지는 않을 것입니다. 항상 새로운 규칙을 추가"
+"할 수 있습니다.</p><b>경 고:</b>바이러스 방지 도구가 메세지들을 검색하는 동"
+"안 정지되어 있는 것처럼 보여서, 민감한 KMail이 이에 대해 문제를 제기 할 수 있"
+"습니다. 이런 경우 이전의 정상적인 동작을 위해서 마법사를 통해 만든 규칙에 대"
+"해 삭제를 고려해 보십시오."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -990,7 +1017,9 @@ msgstr "선택한 메일을 읽은 상태로 표시"
 #: antispamwizard.cpp:947
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
-msgstr "스팸으로 분류된 메일을 읽은 것으로 표시하여 선택한 디렉터리로 이동한 것 같이 표시합니다."
+msgstr ""
+"스팸으로 분류된 메일을 읽은 것으로 표시하여 선택한 디렉터리로 이동한 것 같이 "
+"표시합니다."
 
 #: antispamwizard.cpp:950
 msgid "Move &known spam to:"
@@ -1008,10 +1037,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1022,11 +1050,11 @@ msgstr "Anti-virus 도구를 사용하여 메일 검사"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Anti-virus 도구가 사용자의 메일을 검사하도록 합니다. 마법사에서 적절한 규칙을 만듭니다. 메세지는 필터가 검사하도록 도구에 의해 "
-"표시됩니다."
+"Anti-virus 도구가 사용자의 메일을 검사하도록 합니다. 마법사에서 적절한 규칙"
+"을 만듭니다. 메세지는 필터가 검사하도록 도구에 의해 표시됩니다."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1035,11 +1063,12 @@ msgstr "바이러스 메일로 검색된 메일을 선택한 디렉터리로 옮
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"바이러스에 감염된 것으로 분류한 메일을 검색하여 미리 지정한 디렉터리로 옮기는 필터를 생성합니다. 기본 디렉터리는 지운 편지함입니다. 이것은 "
-"디렉터리 보기에서 변경할 수 있습니다."
+"바이러스에 감염된 것으로 분류한 메일을 검색하여 미리 지정한 디렉터리로 옮기"
+"는 필터를 생성합니다. 기본 디렉터리는 지운 편지함입니다. 이것은 디렉터리 보기"
+"에서 변경할 수 있습니다."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1047,9 +1076,11 @@ msgstr "추가적으로, 바이러스에 감염된 메일을 읽은것으로 표
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
-msgstr "선택한 디렉터리로 옮긴 것 같이, 바이러스에 감염된 것으로 분류한 메일을 읽은 것으로 분류합니다."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
+msgstr ""
+"선택한 디렉터리로 옮긴 것 같이, 바이러스에 감염된 것으로 분류한 메일을 읽은 "
+"것으로 분류합니다."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1239,8 +1270,8 @@ msgstr "서버에서 디렉터리 %1을(를) 읽는 도중 오류 발생."
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1260,8 +1291,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1292,17 +1323,21 @@ msgstr "삭제됨"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
-msgstr "<qt>이 메일의 수신자와 일치하는 사용자 계정이 없습니다,<br>다음 중에서 무엇이 사용자의 주소인지 선택하십시오:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
+msgstr ""
+"<qt>이 메일의 수신자와 일치하는 사용자 계정이 없습니다,<br>다음 중에서 무엇"
+"이 사용자의 주소인지 선택하십시오:"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
-msgstr "<qt>이 메일의 수신자와 일치하는 사용자 계정이 없습니다,<br>다음 중에서 무엇이 사용자의 주소인지 선택하십시오:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
+msgstr ""
+"<qt>이 메일의 수신자와 일치하는 사용자 계정이 없습니다,<br>다음 중에서 무엇"
+"이 사용자의 주소인지 선택하십시오:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1332,15 +1367,21 @@ msgstr "\"%1\"을(를) 압축할 수 없습니다. 압축이 중단되었습니�
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
-msgstr "<qt><p>설정이 관리자에 의해 고정되었습니다.</p> <p>잘못된 것이 있으면 관리자에게 문의하십시오.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
+msgstr ""
+"<qt><p>설정이 관리자에 의해 고정되었습니다.</p> <p>잘못된 것이 있으면 관리자"
+"에게 문의하십시오.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "프로필 불러오기(&L)..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "계정 설정"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "추가(&A)..."
@@ -1370,6 +1411,11 @@ msgstr "<qt><b>%1</b>사용자 이름을 삭제하시겠습니까 ?</qt>"
 msgid "Remove Identity"
 msgstr "사용자를 삭제합니다"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "제거(&E)"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "추가..."
@@ -1378,6 +1424,11 @@ msgstr "추가..."
 msgid "Modify..."
 msgstr "변경..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "제거(&E)"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "기본값으로 설정"
@@ -1394,17 +1445,15 @@ msgstr "메일 보내기(&S)"
 msgid "Outgoing accounts (add at least one):"
 msgstr "메일을 보내는 계정(최소 하나 이상):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "이름"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "형식"
@@ -1427,8 +1476,7 @@ msgstr "기본값으로 설정"
 msgid "Common Options"
 msgstr "일반 옵션"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "보내기 전에 확인(&B)"
@@ -1479,14 +1527,16 @@ msgstr "기본 도메인(&T):"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
-msgstr "<qt><p>기본 도메인은 사용자 이름으로 이루어진 완전한 메일 주소를 완성하는데 사용됩니다.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
+msgstr ""
+"<qt><p>기본 도메인은 사용자 이름으로 이루어진 완전한 메일 주소를 완성하는데 "
+"사용됩니다.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1506,9 +1556,9 @@ msgstr "전송 추가"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (기본값)"
 
@@ -1591,6 +1641,10 @@ msgstr "계정 수정"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt><b>%1</b> 계정을 위치시킬 수 없습니다.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "색상(&S)"
@@ -1700,8 +1754,7 @@ msgstr "열어본 링크"
 msgid "Misspelled Words"
 msgstr "맞춤법 틀림"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "새 메일"
@@ -1891,8 +1944,8 @@ msgstr "기본값으로 스레드 닫음"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr "새로운, 읽지 않은, 또는 중요한 메일만 스레드 확장(&W)"
 
 #: configuredialog.cpp:2055
@@ -1901,67 +1954,49 @@ msgstr "날짜 표시"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>이 표현은 날짜에 사용 됩니다:</strong></p>"
-"<ul>"
-"<li>d - 앞에 0을 붙이지 않은 날짜 (1-31)</li>"
-"<li>dd - 앞에 0을 붙인 날짜(01-31)</li> "
-"<li>ddd - 단축 요일 표시 (Mon - Sun)</li>"
-"<li>dddd - 전체 요일 표시(Monday - Sunday)</li>"
-"<li>M - 앞에 0을 붙이지 않은 월 표시 (1-12)</li>"
-"<li>MM - 앞에 0을 붙이지 않은 월(01-12)</li>"
-"<li>MMM - 단축된 월이름 표기(Jan - Dec)</li>"
-"<li>MMMM - 전체 월이름 표기(January - December)</li>"
-"<li>yy - 두 자리 연도 표기(00-99)</li>"
-"<li>yyyy - 네 자리 연도 표기(0000-9999)</li></ul>"
-"<p><strong>이 표기는 시간에 사용 됩니다:</string></p>"
-"<ul>"
-"<li> h -시간에 0을 쓰지않음 (0-23과 1-12AM/PM 사용시)</li>"
-"<li>hh - 시간에 0을 씀 (00-23과 01-23AM/PM 사용시)</li>"
-"<li>m - 분에 0을 쓰지않음 (0-59)</li>"
-"<li>mm - 분에 0을 씀 (00-59) </li>"
-"<li>s - 초에 0을 쓰지않음 (0-59)</li>"
-"<li>ss - 초에 0을 씀(00-59)</li>"
-"<li>z - 1/1000초에 0을 쓰지않음 (0-999)</li>"
-"<li>zzz - 1/1000초에 0을 씀 (000-999)</li>"
-"<li>AP - AM/PM 사용으로 전환. AP는 \"AM\" 또는 \"PM\"로 바뀝니다.</li>"
-"<li>ap - AM/PM 사용으로 전환. ap는 \"am\"또는\"pm\"으로 바뀝니다.</li>"
-"<li>Z 숫자로 시간대 표시 (-0500)</li></ul>"
-"<p><strong>모든 다른 입력 문자는 무시됩니다.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>이 표현은 날짜에 사용 됩니다:</strong></p><ul><li>d - 앞에 0"
+"을 붙이지 않은 날짜 (1-31)</li><li>dd - 앞에 0을 붙인 날짜(01-31)</li> "
+"<li>ddd - 단축 요일 표시 (Mon - Sun)</li><li>dddd - 전체 요일 표시(Monday - "
+"Sunday)</li><li>M - 앞에 0을 붙이지 않은 월 표시 (1-12)</li><li>MM - 앞에 0"
+"을 붙이지 않은 월(01-12)</li><li>MMM - 단축된 월이름 표기(Jan - Dec)</"
+"li><li>MMMM - 전체 월이름 표기(January - December)</li><li>yy - 두 자리 연도 "
+"표기(00-99)</li><li>yyyy - 네 자리 연도 표기(0000-9999)</li></ul><p><strong>"
+"이 표기는 시간에 사용 됩니다:</string></p><ul><li> h -시간에 0을 쓰지않음 "
+"(0-23과 1-12AM/PM 사용시)</li><li>hh - 시간에 0을 씀 (00-23과 01-23AM/PM 사용"
+"시)</li><li>m - 분에 0을 쓰지않음 (0-59)</li><li>mm - 분에 0을 씀 (00-59) </"
+"li><li>s - 초에 0을 쓰지않음 (0-59)</li><li>ss - 초에 0을 씀(00-59)</"
+"li><li>z - 1/1000초에 0을 쓰지않음 (0-999)</li><li>zzz - 1/1000초에 0을 씀 "
+"(000-999)</li><li>AP - AM/PM 사용으로 전환. AP는 \"AM\" 또는 \"PM\"로 바뀝니"
+"다.</li><li>ap - AM/PM 사용으로 전환. ap는 \"am\"또는\"pm\"으로 바뀝니다.</"
+"li><li>Z 숫자로 시간대 표시 (-0500)</li></ul><p><strong>모든 다른 입력 문자"
+"는 무시됩니다.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "전체적인 스레드 설정을 변경하면 모든 디렉터리 지정값을 덮어씁니다."
 
 #: configuredialog.cpp:2221
@@ -1976,8 +2011,7 @@ msgstr "HTML 상태 표시줄 보기(&U)"
 msgid "Show s&pam status in fancy headers"
 msgstr "스팸 상태 보기(&P)"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "스마일리를 이모티콘으로 대체"
@@ -1986,8 +2020,7 @@ msgstr "스마일리를 이모티콘으로 대체"
 msgid "Use smaller font for quoted text"
 msgstr "Use smaller font for quoted text"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Show expand/collapse quote marks"
@@ -2013,8 +2046,7 @@ msgstr "자동"
 msgid "&Override character encoding:"
 msgstr "최상위 문자 인코딩 셋(&O)"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "시스템 트레이 아이콘 사용"
@@ -2119,19 +2151,17 @@ msgstr "<b>%f</b>은(는) 편집할 파일명으로 바뀝니다."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>다음 대체 문자는 회신 메일에 지원됩니다:"
-"<br> <b>%D</b>: 날짜, <b>%S</b>: 제목,"
-"<br><b>%e</b>: 보낸사람의 주소, <b>%F</b>: 보낸사람의 이름, <b>%f</b>: 보낸 사람의 이니셜,"
-"<br><b>%T</b>: 받는사람 이름, <b>%t</b>: 받는 사람의 이름과 주소,"
-"<br><b>%C</b>: 숨은 참조 이름, <b>%c</b>: 숨은 참조 이름과 주소,"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>다음 대체 문자는 회신 메일에 지원됩니다:<br> <b>%D</b>: 날짜, <b>%S</b>: "
+"제목,<br><b>%e</b>: 보낸사람의 주소, <b>%F</b>: 보낸사람의 이름, <b>%f</b>: "
+"보낸 사람의 이니셜,<br><b>%T</b>: 받는사람 이름, <b>%t</b>: 받는 사람의 이름"
+"과 주소,<br><b>%C</b>: 숨은 참조 이름, <b>%c</b>: 숨은 참조 이름과 주소,"
 "<br><b>%%</b>: 퍼센트 기호, <b>%_</b>: 공백, <b>%L</b>: 줄바꿈</qt>"
 
 #: configuredialog.cpp:2943
@@ -2155,21 +2185,20 @@ msgstr "모두에게 회신(&Y):"
 msgid "&Forward:"
 msgstr "전달(&F):"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "인용 부호(&Q):"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D에, 작성된 원본 메시지:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D에, %F가 작성한 메시지:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "전달된 메일"
 
@@ -2205,8 +2234,8 @@ msgstr "새 전달 접두사 입력:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr "발신 메일은 이 목록에 있는 모든 문자셋으로 검사합니다."
 
 #: configuredialog.cpp:3278
@@ -2241,10 +2270,9 @@ msgstr "값"
 msgid "Ne&w"
 msgstr "새로운(&W)"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "이름(&N):"
@@ -2253,17 +2281,17 @@ msgstr "이름(&N):"
 msgid "&Value:"
 msgstr "값(&V):"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "아웃룩 호환 첨부파일 이름"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
-msgstr "아웃룩(tm)에서 첨부파일의 이름을 인식하도록 합니다. (비 영어 문자 포함)"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
+msgstr ""
+"아웃룩(tm)에서 첨부파일의 이름을 인식하도록 합니다. (비 영어 문자 포함)"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2289,17 +2317,18 @@ msgstr "첨부"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"첨부 이름을 비-영어 문자로 인코딩하기를 선택했습니다. 이 문자는 비표준 첨부이름으로 아웃룩(tm)이나 다른 메일 클라이언트에서 지원되지 않는 "
-"것입니다.\n"
-"KMail은 비표준 메일을 생성하게되고, 당연히 이 메일을 인식하지 못하는 메일 클라이언트가 있을 수 있다는 것에 유의하십시오."
+"첨부 이름을 비-영어 문자로 인코딩하기를 선택했습니다. 이 문자는 비표준 첨부이"
+"름으로 아웃룩(tm)이나 다른 메일 클라이언트에서 지원되지 않는 것입니다.\n"
+"KMail은 비표준 메일을 생성하게되고, 당연히 이 메일을 인식하지 못하는 메일 클"
+"라이언트가 있을 수 있다는 것에 유의하십시오."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2323,90 +2352,87 @@ msgstr "암호 처리(&N)"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>이 옵션은 사용자가 HTML태그 포함 문서로 보길 원하는지 기본 텍스트 문서로 보길 원하는지 제어합니다.</p>"
-"<p> HTML태그 포함 문서로 보는 것은 메일을 더 좋은 상태로 보여주지만, 동시에 보안에 문제가 생깁니다. </p>"
-"<p>기본 텍스트 문서로 보는 것은 메일 형식의 많은 부분을 잃게 되지만, HTML태그 포함 문서로 볼 때 발생하는 보안 문제가 <em>"
-"생기지 않습니다</em>.</p>"
-"<p> 아래의 옵션은 HTML 메일의 흔한 잘못을 방지하기 위한 것입니다. 그러나 그것은 K메일 현재 버전이 쓰여진 때에 발견되지 않은 보안 "
-"문제를 감지할 수는 없습니다.</p>"
-"<p> 그러므로 기본텍스트 문서보다 HTML태그 포함 문서를 선호하는 것은 <em>권장하지 않습니다.</em></p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>이 옵션은 사용자가 HTML태그 포함 문서로 보길 원하는지 기본 텍스트 문서"
+"로 보길 원하는지 제어합니다.</p><p> HTML태그 포함 문서로 보는 것은 메일을 더 "
+"좋은 상태로 보여주지만, 동시에 보안에 문제가 생깁니다. </p><p>기본 텍스트 문"
+"서로 보는 것은 메일 형식의 많은 부분을 잃게 되지만, HTML태그 포함 문서로 볼 "
+"때 발생하는 보안 문제가 <em>생기지 않습니다</em>.</p><p> 아래의 옵션은 HTML "
+"메일의 흔한 잘못을 방지하기 위한 것입니다. 그러나 그것은 K메일 현재 버전이 쓰"
+"여진 때에 발견되지 않은 보안 문제를 감지할 수는 없습니다.</p><p> 그러므로 기"
+"본텍스트 문서보다 HTML태그 포함 문서를 선호하는 것은 <em>권장하지 않습니다.</"
+"em></p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>어떤 메일 광고는 HTML 내부에 존재합니다. 예를 들어, 당신이 해당 메일을 읽었는지 확인할 수 있는 이미지를 넣고는 합니다 "
-"(&quot;웹 버그&quot;).</p> "
-"<p>보내는 사람은 언제나 메일에 직접적으로 이미지를 첨부할 수 있기 때문에, 이런 형식으로 오는 이미지는 문제가 있습니다.</p>"
-"<p>KMail의 HTML표시 기능의 이런 부분을 제거하려면 이 옵션의 기본값을 <em>사용안함</em> 으로 하십시오.</p>"
-"<p>하지만, 문제점들이 신경쓰이지 않는다면, 이 옵션을 사용하면 됩니다.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>어떤 메일 광고는 HTML 내부에 존재합니다. 예를 들어, 당신이 해당 메일"
+"을 읽었는지 확인할 수 있는 이미지를 넣고는 합니다 (&quot;웹 버그&quot;).</p> "
+"<p>보내는 사람은 언제나 메일에 직접적으로 이미지를 첨부할 수 있기 때문에, 이"
+"런 형식으로 오는 이미지는 문제가 있습니다.</p><p>KMail의 HTML표시 기능의 이"
+"런 부분을 제거하려면 이 옵션의 기본값을 <em>사용안함</em> 으로 하십시오.</"
+"p><p>하지만, 문제점들이 신경쓰이지 않는다면, 이 옵션을 사용하면 됩니다.</p></"
+"qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>메시지 저장 알림 정책</h3>"
-"<p>MDN은 일반화되어 보통 <b>수신 확인</b>으로 불리웁니다. 메일을 보낸이가 메시지 받는이의 메일 프로그램에 의해 보내지는 정보로 "
-"자신의 메일이 어떻게 처리되었는가 알게 해줍니다. 일반적으로 수신 확인 형식은 <b>표시됨</b> (i.e. 읽음), <b>삭제됨</b> "
-", <b>전송됨</b> (e.g. 보내짐) 과 같습니다.</p>"
-"<p>MDN KMail 전송에는 다음 옵션들이 가능합니다:</p>"
-"<ul>"
-"<li><em>무시</em>: 모든 수신 확인 요청을 무시합니다. 아무런 MDN도 보내지지 않습니다.(권장)</li>"
-"<li><em>묻기</em>: 사용자의 허가를 묻습니다. 이를 통해 선택한 메일에 대해서만 MDN을 보내줄 수 있습니다.</li>"
-"<li><em>거부</em>: 항상 <b>거부됨</b> 알림을 보냅니다. 이는 모든 MDN에 답하는 것 보다 <em>조금</em> "
-"낫습니다. 여전히 보낸이는 메일이 지워졌거나 읽혔는지만을 모를 뿐 메일이 사용자에게 인식되었다는 것은 알 수 있습니다.</li>"
-"<li><em>항상 보냄</em>: 수신 확인에 항상 답합니다. 이는 보낸이가 자신의 메일이 어떻게 처리되었는지 자세하게 알 수 있게 해 "
-"줍니다. 권장되지는 않지만, 거래자 관계 관리 등의 문제에 있어서는 유용합니다.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>메시지 저장 알림 정책</h3><p>MDN은 일반화되어 보통 <b>수신 확인</b>으"
+"로 불리웁니다. 메일을 보낸이가 메시지 받는이의 메일 프로그램에 의해 보내지는 "
+"정보로 자신의 메일이 어떻게 처리되었는가 알게 해줍니다. 일반적으로 수신 확인 "
+"형식은 <b>표시됨</b> (i.e. 읽음), <b>삭제됨</b> , <b>전송됨</b> (e.g. 보내"
+"짐) 과 같습니다.</p><p>MDN KMail 전송에는 다음 옵션들이 가능합니다:</"
+"p><ul><li><em>무시</em>: 모든 수신 확인 요청을 무시합니다. 아무런 MDN도 보내"
+"지지 않습니다.(권장)</li><li><em>묻기</em>: 사용자의 허가를 묻습니다. 이를 통"
+"해 선택한 메일에 대해서만 MDN을 보내줄 수 있습니다.</li><li><em>거부</em>: 항"
+"상 <b>거부됨</b> 알림을 보냅니다. 이는 모든 MDN에 답하는 것 보다 <em>조금</"
+"em> 낫습니다. 여전히 보낸이는 메일이 지워졌거나 읽혔는지만을 모를 뿐 메일이 "
+"사용자에게 인식되었다는 것은 알 수 있습니다.</li><li><em>항상 보냄</em>: 수"
+"신 확인에 항상 답합니다. 이는 보낸이가 자신의 메일이 어떻게 처리되었는지 자세"
+"하게 알 수 있게 해 줍니다. 권장되지는 않지만, 거래자 관계 관리 등의 문제에 있"
+"어서는 유용합니다.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2422,15 +2448,15 @@ msgstr "메일이 인터넷을 통해 외부 정보를 참조하도록 허용(&X
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>경고:</b> 이메일에 HTML을 허용하면 시스템의 보안 문제를 증가시킬 수 있습니다.각 옵션에 대한 자세한 정보를 보시려면 다음을 "
-"참고하시기 바랍니다.\n"
-"<a href=\"whatsthis:%1\">HTML 형식의 메일에 관하여...</a> <a href=\"whatsthis:%2\">"
-"외부 참조에 관하여...</a>"
+"<b>경고:</b> 이메일에 HTML을 허용하면 시스템의 보안 문제를 증가시킬 수 있습니"
+"다.각 옵션에 대한 자세한 정보를 보시려면 다음을 참고하시기 바랍니다.\n"
+"<a href=\"whatsthis:%1\">HTML 형식의 메일에 관하여...</a> <a href="
+"\"whatsthis:%2\">외부 참조에 관하여...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2511,8 +2537,7 @@ msgstr "전역 HTML 설정 변경은 모든 디렉터리의 특정 값보다 우
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "이 옵션은 dirmngr >= 0.9.0 이상이 설치되어 있어야 사용할 수 있습니다."
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "프록시 없음"
@@ -2541,8 +2566,8 @@ msgstr "중요한 메일은 보관(&X)"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "읽지 않은 메일을 찾을 때:"
 
@@ -2566,8 +2591,8 @@ msgstr "모든 디렉터리 반복"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "디렉터리 안에서의 이동옵션 :"
 
@@ -2636,23 +2661,22 @@ msgstr "디렉터리 입니다.(\"maildir\" 형식)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>메일박스 형식의 설정은 로컬 디렉터리의 기본 값이 됩니다.:</p>"
-"<p><b> mbox:</b> KMail의 메일 디렉터리는 각각 하나의 파일로 나타납니다. 개개의 메일는 \"From\" 으로 시작되는 줄로 "
-"분리됩니다. 이것은 디스크 공간을 적게쓰지만 디렉터리 사이에서 메일을 이동할때는 불안정합니다.</p>"
-"<p><b> maildir:</b>KMail의 메일 디렉터리는 디스크에서 실제 디렉터리로 나타나며, 개개의 메일은 파일로 분리됩니다. 디스크 "
-"공간을 많이쓰지만 디렉터리 사이에서 메일을 이동할때는 안정적입니다.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>메일박스 형식의 설정은 로컬 디렉터리의 기본 값이 됩니다.:</p><p><b> "
+"mbox:</b> KMail의 메일 디렉터리는 각각 하나의 파일로 나타납니다. 개개의 메일"
+"는 \"From\" 으로 시작되는 줄로 분리됩니다. 이것은 디스크 공간을 적게쓰지만 디"
+"렉터리 사이에서 메일을 이동할때는 불안정합니다.</p><p><b> maildir:</b>KMail"
+"의 메일 디렉터리는 디스크에서 실제 디렉터리로 나타나며, 개개의 메일은 파일로 "
+"분리됩니다. 디스크 공간을 많이쓰지만 디렉터리 사이에서 메일을 이동할때는 안정"
+"적입니다.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2687,39 +2711,34 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>다음 잃지 않은 메일로 이동 할때 현재 메일 이후 잃지 않은 메일이 없을 경우 나타납니다.</p>"
-"<p><b>반복 중지:</b> 찾기 명령 실행시 현재 디렉터리에서만 찾고 중지합니다. </p>"
-"<p><b>현재 디렉터리만 반복:</b> 목록 처음부터 다시 검색하지만, 다른 디렉터리로 가진 않습니다.</p>"
-"<p><b>모든 디렉터리에서 반복:</b> 목록 처음부터 다시 검색하고, 읽지 않은 메일이 없을 경우 다음 디렉터리를 또 검색합니다.</p>"
-"<p>같은 방법으로, 이전 읽지 않은 메일을 검색하면, 목록 끝부터 검색하여 선택한 옵션에 따라 다른 디렉터리로 갈지 정하게 됩니다.</p>"
-"</qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>다음 잃지 않은 메일로 이동 할때 현재 메일 이후 잃지 않은 메일이 없을 "
+"경우 나타납니다.</p><p><b>반복 중지:</b> 찾기 명령 실행시 현재 디렉터리에서"
+"만 찾고 중지합니다. </p><p><b>현재 디렉터리만 반복:</b> 목록 처음부터 다시 검"
+"색하지만, 다른 디렉터리로 가진 않습니다.</p><p><b>모든 디렉터리에서 반복:</"
+"b> 목록 처음부터 다시 검색하고, 읽지 않은 메일이 없을 경우 다음 디렉터리를 "
+"또 검색합니다.</p><p>같은 방법으로, 이전 읽지 않은 메일을 검색하면, 목록 끝부"
+"터 검색하여 선택한 옵션에 따라 다른 디렉터리로 갈지 정하게 됩니다.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2786,8 +2805,8 @@ msgstr "그룹웨어 디렉터리 숨김(&H)"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "체크하면, 디렉터리 트리에서 IMAP 리소스 디렉터리가 보이지 않게 됩니다."
 
 #: configuredialog.cpp:4909
@@ -2798,8 +2817,8 @@ msgstr "계정 리소스 디렉터리(&R)"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "체크하면, 디렉터리 트리에서 IMAP 리소스 디렉터리가 보이지 않게 됩니다."
 
 #: configuredialog.cpp:4921
@@ -2828,7 +2847,8 @@ msgstr "보낸사람:/받는사람: 헤더를 초대에 대한 답글에 따라
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
-msgstr "이 옵션을 켜면, 초대에 대한 답글에 따라 아웃룩(tm)이 인식하도록 합니다."
+msgstr ""
+"이 옵션을 켜면, 초대에 대한 답글에 따라 아웃룩(tm)이 인식하도록 합니다."
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2853,19 +2873,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "아웃룩 호환 첨부파일 이름"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "자동으로 초대장 보냄"
@@ -2874,24 +2893,27 @@ msgstr "자동으로 초대장 보냄"
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
-msgstr "이 옵션을 사용하시면, 편지쓰기 창을 통하지 않고서 초대장을 자동으로 보내실 수 있습니다."
+msgstr ""
+"이 옵션을 사용하시면, 편지쓰기 창을 통하지 않고서 초대장을 자동으로 보내실 "
+"수 있습니다."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>초대는 보통 메일에 첨부물로 붙게 됩니다. 이것은 초대를 메일 내용 안에 텍스트로 바꾸도록 합니다; 마이크로소프트 아웃룩에 초대와 "
-"답장을 보내려면 필요합니다."
-"<br>하지만, 설정할 경우, 메일 프로그램이 더 이상 기술적인 텍스트를 사용치 못하게 됩니다; 그래서 초대를 인식하지 못하는 메일 프로그램을 "
-"이용하는 사람은 초대 메일이 이상하게 보일 수 있습니다."
-"<br>초대를 인식할 수 있는 프로그램을 가진 사람에게는 문제가 없습니다.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>초대는 보통 메일에 첨부물로 붙게 됩니다. 이것은 초대를 메일 내용 안에 텍"
+"스트로 바꾸도록 합니다; 마이크로소프트 아웃룩에 초대와 답장을 보내려면 필요합"
+"니다.<br>하지만, 설정할 경우, 메일 프로그램이 더 이상 기술적인 텍스트를 사용"
+"치 못하게 됩니다; 그래서 초대를 인식하지 못하는 메일 프로그램을 이용하는 사람"
+"은 초대 메일이 이상하게 보일 수 있습니다.<br>초대를 인식할 수 있는 프로그램"
+"을 가진 사람에게는 문제가 없습니다.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -2999,17 +3021,16 @@ msgstr "포워딩(&F)"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3027,15 +3048,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3096,7 +3117,9 @@ msgstr "이름 입력 :"
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
-msgstr "<qt><b>%1</b>(으)로 주어진 이름의 배포 목록이 이미 있습니다. 다른 이름을 선택하세요.</qt>"
+msgstr ""
+"<qt><b>%1</b>(으)로 주어진 이름의 배포 목록이 이미 있습니다. 다른 이름을 선택"
+"하세요.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3105,8 +3128,8 @@ msgstr "사용자 정보 편집"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3209,7 +3232,9 @@ msgstr ""
 
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
-msgstr "%1 디렉터리에서 메시지를 만료할 수 없습니다: 대상 디렉터리 %2을(를) 찾을 수 없습니다."
+msgstr ""
+"%1 디렉터리에서 메시지를 만료할 수 없습니다: 대상 디렉터리 %2을(를) 찾을 수 "
+"없습니다."
 
 #: expirejob.cpp:199
 #, fuzzy
@@ -3244,7 +3269,8 @@ msgstr "%1 디렉터리의 오래된 메시지를 지우는데 실패했습니�
 
 #: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
-msgstr "오래된 메시지(들)을 %1 디렉터리에서 %2 디렉터리로 옮기는 것을 실패했습니다."
+msgstr ""
+"오래된 메시지(들)을 %1 디렉터리에서 %2 디렉터리로 옮기는 것을 실패했습니다."
 
 #: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
@@ -3369,6 +3395,11 @@ msgstr "디렉터리 선택"
 msgid "Filters"
 msgstr "%1 필터 규칙"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "모든 메일 선택(&A)"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3400,10 +3431,11 @@ msgstr "필터 동작 기록(&L)"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"여기서 필터 동작 기록하기를 설정/해제할 수 있습니다. 물론 로그 데이터는 수집되며, 기록하기 옵션이 설정되어 있을 때만 보여집니다."
+"여기서 필터 동작 기록하기를 설정/해제할 수 있습니다. 물론 로그 데이터는 수집"
+"되며, 기록하기 옵션이 설정되어 있을 때만 보여집니다."
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3419,13 +3451,16 @@ msgstr "필터 규칙 평가 기록(&R)"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"적용된 필터의 필터 규칙 평가와 관련된 기록에 피드백을 제어할 수 있습니다. 이 옵션에 체크하면 각각의 단일 필터 규칙에 대해 자세한 피드백을 "
-"부여할 것입니다. 체크되지 않는다면, 단일 필터의 모든 규칙 평가의 결과에 관해서만 피드백이 주어집니다."
+"적용된 필터의 필터 규칙 평가와 관련된 기록에 피드백을 제어할 수 있습니다. 이 "
+"옵션에 체크하면 각각의 단일 필터 규칙에 대해 자세한 피드백을 부여할 것입니"
+"다. 체크되지 않는다면, 단일 필터의 모든 규칙 평가의 결과에 관해서만 피드백이 "
+"주어집니다."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3445,13 +3480,15 @@ msgstr "제한 없음"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"기록 데이터를 보존하기 위해 임시적으로 메모리를 사용합니다; 여기서 기록 데이터의 메모리 허용 최대 용량을 정할 수 있습니다. 만약 수집된 "
-"기록 데이터의 크기가 제한 용량을 넘으면 제한을 초과하지 않을 때까지 가장 오래된 데이터를 버릴 것입니다."
+"기록 데이터를 보존하기 위해 임시적으로 메모리를 사용합니다; 여기서 기록 데이"
+"터의 메모리 허용 최대 용량을 정할 수 있습니다. 만약 수집된 기록 데이터의 크기"
+"가 제한 용량을 넘으면 제한을 초과하지 않을 때까지 가장 오래된 데이터를 버릴 "
+"것입니다."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3461,7 +3498,7 @@ msgstr ""
 "파일 %1을(를) 쓸 수 없습니다:\n"
 "\"%2\"은(는) 자세한 오류 설명입니다."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "K메일 오류"
@@ -3502,12 +3539,12 @@ msgstr "사용자 인증(&U):"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"사용자 인증은 IMAP서버에서의 사용자 로그인 입니다. 사용자의 간단한 이름이나 이메일 주소가 될 수 있습니다. 서버에 주어진 계정에 대한 "
-"로그인 입니다."
+"사용자 인증은 IMAP서버에서의 사용자 로그인 입니다. 사용자의 간단한 이름이나 "
+"이메일 주소가 될 수 있습니다. 서버에 주어진 계정에 대한 로그인 입니다."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3558,8 +3595,8 @@ msgstr "지운 편지함에 대한 읽기/쓰기 허가가 없습니다 "
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "서버에서 정보를 검색하지 못했습니다. \"메일 확인\"을 사용하십시오."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3570,8 +3607,7 @@ msgstr "오류: 이 디렉터리에 대한 IMAP 계정이 정의되지 않았습
 msgid "Connecting to server %1, please wait..."
 msgstr "%1 서버에 연결 중입니다. 잠시 기다려주십시오..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "%1 서버에 연결중 오류"
@@ -3597,9 +3633,11 @@ msgstr "권한 추가"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
-msgstr "이 디렉터리에 대한 사용자 자신의 권한을 삭제하시겠습니까? 나중에 접근할 수 없습니다."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
+msgstr ""
+"이 디렉터리에 대한 사용자 자신의 권한을 삭제하시겠습니까? 나중에 접근할 수 없"
+"습니다."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3628,7 +3666,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "디렉터리 선택"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "로컬 디렉터리"
@@ -3654,11 +3692,12 @@ msgstr "디렉터리 단축키 선택"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>현재 선택된 디렉터리에 대한 키나 키 조합을 선택하시고 아래의 버튼을 눌러 현재 선택된 디렉터리의 단축키로 지정하세요.</qt>"
+"<qt>현재 선택된 디렉터리에 대한 키나 키 조합을 선택하시고 아래의 버튼을 눌러 "
+"현재 선택된 디렉터리의 단축키로 지정하세요.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3678,11 +3717,20 @@ msgstr "작업 취소(&A)"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "알 수 없음"
@@ -3806,39 +3854,13 @@ msgstr "스팸상태 : "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>메<br>세<br>지</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr "<qt><br>H<br>T<br>M<br>L<br> <br>메<br>세<br>지<br> <br>아<br>님</qt>"
 
 #: identitydialog.cpp:93
@@ -3851,16 +3873,12 @@ msgstr "사용자 이름(&Y):"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>사용자 이름</h3>"
-"<p>보낸 이메일 헤더 사용자의 이름을 포함할 것입니다. 빈 칸으로 둘 경우 사용자의 이름 대신 이메일 주소만 나타날 것입니다.</p></qt>"
+"<qt><h3>사용자 이름</h3><p>보낸 이메일 헤더 사용자의 이름을 포함할 것입니다. "
+"빈 칸으로 둘 경우 사용자의 이름 대신 이메일 주소만 나타날 것입니다.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3868,16 +3886,13 @@ msgstr "단체(&Z):"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>단체</h3>"
-"<p>이 칸에 단체이름을 써넣으시면 전자 메일 헤더에 단체 이름이 들어갑니다.</p>"
-"<p>보통 비워두며, 빈 칸으로 두시는 것이 안전합니다.</p></qt>"
+"<qt><h3>단체</h3><p>이 칸에 단체이름을 써넣으시면 전자 메일 헤더에 단체 이름"
+"이 들어갑니다.</p><p>보통 비워두며, 빈 칸으로 두시는 것이 안전합니다.</p></"
+"qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3886,19 +3901,15 @@ msgstr "이메일 주소(&E):"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>전자 메일 주소</h3>"
-"<p>정확한 전자 메일 주소를 입력하시기 바랍니다.</p>"
-"<p>이 칸을 비워두시거나, 잘못되었을 경우 전자 메일을 회신 받으실 수 없습니다.</p></qt>"
+"<qt><h3>전자 메일 주소</h3><p>정확한 전자 메일 주소를 입력하시기 바랍니다.</"
+"p><p>이 칸을 비워두시거나, 잘못되었을 경우 전자 메일을 회신 받으실 수 없습니"
+"다.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -3907,21 +3918,12 @@ msgstr "이메일 주소(&E):"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3944,18 +3946,17 @@ msgstr "메일을 전자 서명하기 위해 사용하는 OpenPGP 키를 선택"
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>선택한 OpenPGP 키는 디지털 서명에 사용됩니다. GnuPG 키 또한 사용할 수 있습니다.</p>"
-"<p>비워 놓을 수 있지만, KMail이 OpenPGP를 사용하여 이메일에 디지털 서명을 할 수 없게 됩니다; 보통 메일 기능에는 아무런 "
-"상관이 없습니다.</p>"
-"<p>다음에서 키에 대한 보다 많은 정보를 알 수 있습니다.<a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>선택한 OpenPGP 키는 디지털 서명에 사용됩니다. GnuPG 키 또한 사용할 수 "
+"있습니다.</p><p>비워 놓을 수 있지만, KMail이 OpenPGP를 사용하여 이메일에 디지"
+"털 서명을 할 수 없게 됩니다; 보통 메일 기능에는 아무런 상관이 없습니다.</"
+"p><p>다음에서 키에 대한 보다 많은 정보를 알 수 있습니다.<a>http://www.gnupg."
+"org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -3967,27 +3968,26 @@ msgstr "사용자의 OpenPGP 암호 키"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
-msgstr "사용자 자신을 암호화 하고 \"나의 공용키 첨부\" 기능을 위해 사용할 OpenPGP 키를 선택하십시오."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
+msgstr ""
+"사용자 자신을 암호화 하고 \"나의 공용키 첨부\" 기능을 위해 사용할 OpenPGP 키"
+"를 선택하십시오."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>선택한 OpenPGP 키는 스스로에게 보내는 메일의 암호화와 편집기의 \"내 공용키 첨부\" 기능에 사용됩니다. GnuPG 키도 사용할 "
-"수 있습니다.</p>"
-"<p>비워둘 수 있지만, 그러면 KMail이 내보내는 메일을 OpenPGP를 사용하여 암호화 할 수 없게 됩니다; 보통 메일에는 아무런 상관이 "
-"없습니다.</p>"
-"<p>다음에서 키에 대해 보다 많은 정보를 얻을 수 있습니다.<a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>선택한 OpenPGP 키는 스스로에게 보내는 메일의 암호화와 편집기의 \"내 공"
+"용키 첨부\" 기능에 사용됩니다. GnuPG 키도 사용할 수 있습니다.</p><p>비워둘 "
+"수 있지만, 그러면 KMail이 내보내는 메일을 OpenPGP를 사용하여 암호화 할 수 없"
+"게 됩니다; 보통 메일에는 아무런 상관이 없습니다.</p><p>다음에서 키에 대해 보"
+"다 많은 정보를 얻을 수 있습니다.<a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4005,16 +4005,14 @@ msgstr "메일을 전자 서명하기 위해 사용하는 S/MIME 인증서를 �
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>선택한 S/MIME (X.509) 인증서는 메일의 디지털 서명에 사용됩니다. </p>"
-"<p>비워둘 수 있지만, KMail이 S/MIME을 이용해 메일에 디지털 서명을 할 수 없게 됩니다; 보통 메일 기능에는 아무런 문제가 "
-"없습니다. </p></qt>"
+"<qt><p>선택한 S/MIME (X.509) 인증서는 메일의 디지털 서명에 사용됩니다. </"
+"p><p>비워둘 수 있지만, KMail이 S/MIME을 이용해 메일에 디지털 서명을 할 수 없"
+"게 됩니다; 보통 메일 기능에는 아무런 문제가 없습니다. </p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4026,23 +4024,24 @@ msgstr "사용자의 S/MIME 암호 인증서"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
-msgstr "사용자 자신을 암호화 하고 \"나의 인증서 첨부\"기능을 위해 사용할 S/MIME 인증서를 선택하십시오."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
+msgstr ""
+"사용자 자신을 암호화 하고 \"나의 인증서 첨부\"기능을 위해 사용할 S/MIME 인증"
+"서를 선택하십시오."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>선택한 S/MIME 인증서가 스스로에게 보내는 메일의 암호화와 편집기의 \"내 인증서 첨부\" 기능에 사용됩니다.</p>"
-"<p>비워둘 수 있지만, KMail이 내보내는 메일을 S/MIME을 사용해 암호화 할 수 없게 됩니다. 보통 메일 기능에는 아무런 문제가 "
-"없습니다.</p></qt>"
+"<qt><p>선택한 S/MIME 인증서가 스스로에게 보내는 메일의 암호화와 편집기의 "
+"\"내 인증서 첨부\" 기능에 사용됩니다.</p><p>비워둘 수 있지만, KMail이 내보내"
+"는 메일을 S/MIME을 사용해 암호화 할 수 없게 됩니다. 보통 메일 기능에는 아무"
+"런 문제가 없습니다.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4062,20 +4061,18 @@ msgstr "회신 주소(&R):"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>회신 주소</h3>"
-"<p>보내는 사람의 전자메일 주소와 다른 전자 메일로 회신 받기를 원하시면 이 부분에 정확한 전자메일 주소를 입력하시기 바랍니다.</p> "
-"<p>발신자주소를 그룹메일로 사용하실경우 유용하게 이용하실수 있습니다. 예를들어, 여러분이 보낸 메일을 그룹에 있는 사용자들이 보도록 할 수 "
-"있습니다. 결정하기 힘들다면 비어두십시오.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>회신 주소</h3><p>보내는 사람의 전자메일 주소와 다른 전자 메일로 회신 "
+"받기를 원하시면 이 부분에 정확한 전자메일 주소를 입력하시기 바랍니다.</p> <p>"
+"발신자주소를 그룹메일로 사용하실경우 유용하게 이용하실수 있습니다. 예를들어, "
+"여러분이 보낸 메일을 그룹에 있는 사용자들이 보도록 할 수 있습니다. 결정하기 "
+"힘들다면 비어두십시오.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4083,22 +4080,18 @@ msgstr "숨은 참조(BCC)(&B)"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>숨은참조(BCC) 주소</h3>"
-"<p>전자 메일 주소로 메일은 발송되지만 다른 수신인들은 이 주소의 사람들이 메일을 받았는지 알수 없습니다.</p>"
-"<p>같은 메일을 여러분의 다른 계정에 복사본으로 보내는데 사용됩니다.</p>"
-"<p>한 개 이상의 이메일 주소를 쓰기 위해, 숨은 참조의 목록을 콤마로 구분하십시오.</p>"
-"<p>결정하기 모호하면 비어두십시오.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>숨은참조(BCC) 주소</h3><p>전자 메일 주소로 메일은 발송되지만 다른 수"
+"신인들은 이 주소의 사람들이 메일을 받았는지 알수 없습니다.</p><p>같은 메일을 "
+"여러분의 다른 계정에 복사본으로 보내는데 사용됩니다.</p><p>한 개 이상의 이메"
+"일 주소를 쓰기 위해, 숨은 참조의 목록을 콤마로 구분하십시오.</p><p>결정하기 "
+"모호하면 비어두십시오.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4138,7 +4131,7 @@ msgstr "서명 파일(&S):"
 msgid "&Picture"
 msgstr "그림(&P)"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "유효하지 않은 이메일 주소"
 
@@ -4154,14 +4147,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"설정된 OpenPGP 서명키 중 하나가 개인정보(%1)에 대해 설정된 이메일 주소를 포함하지 않습니다.\n"
-"이 서명키는 설정에서 만들어진 서명 확인 시도 중에 수신부쪽에 경고메세지를 유발할 것입니다."
+"설정된 OpenPGP 서명키 중 하나가 개인정보(%1)에 대해 설정된 이메일 주소를 포함"
+"하지 않습니다.\n"
+"이 서명키는 설정에서 만들어진 서명 확인 시도 중에 수신부쪽에 경고메세지를 유"
+"발할 것입니다."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
-msgstr "설정된 OpenPGP 암호화 키 중 하나가 개인정보(%1)에 대해 설정된 이메일 주소를 포함하지 않습니다."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
+msgstr ""
+"설정된 OpenPGP 암호화 키 중 하나가 개인정보(%1)에 대해 설정된 이메일 주소를 "
+"포함하지 않습니다."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4170,14 +4167,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"설정된 S/MIME 서명 인증서 중의 하나가 이 개인정보(%1)에 대해 설정된 이메일 주소를 포함하고 있지 않습니다.\n"
-"이 경우 이 설정으로 만들어진 서명을 확인할 때 수신부에 경고 메세지를 유발할 것입니다."
+"설정된 S/MIME 서명 인증서 중의 하나가 이 개인정보(%1)에 대해 설정된 이메일 주"
+"소를 포함하고 있지 않습니다.\n"
+"이 경우 이 설정으로 만들어진 서명을 확인할 때 수신부에 경고 메세지를 유발할 "
+"것입니다."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
-msgstr "설정된 S/MIME 암호화 인증서 중 하나가 이 개인정보(%1)에 대해 설정된 이메일 주소를 포함하고 있지 않습니다."
+msgstr ""
+"설정된 S/MIME 암호화 인증서 중 하나가 이 개인정보(%1)에 대해 설정된 이메일 주"
+"소를 포함하고 있지 않습니다."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4195,25 +4196,31 @@ msgstr "\"%1\" 사용자 정보변경"
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
-msgstr "사용자 정보 \"%1\"에 대한 사용자 정의 보낸 편지함이 존재않습니다. 기본 보낸 편지함을 사용합니다."
+msgstr ""
+"사용자 정보 \"%1\"에 대한 사용자 정의 보낸 편지함이 존재않습니다. 기본 보낸 "
+"편지함을 사용합니다."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
-msgstr "사용자 정보 \"%1\"에 대한 사용자 정의 임시 보관함이 존재하지 않습니다. 기본 임시 보관함을 사용합니다."
+msgstr ""
+"사용자 정보 \"%1\"에 대한 사용자 정의 임시 보관함이 존재하지 않습니다. 기본 "
+"임시 보관함을 사용합니다."
 
 #: identitydialog.cpp:662
 #, fuzzy
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
-msgstr "사용자 정보 \"%1\"에 대한 사용자 정의 임시 보관함이 존재하지 않습니다. 기본 임시 보관함을 사용합니다."
+msgstr ""
+"사용자 정보 \"%1\"에 대한 사용자 정의 임시 보관함이 존재하지 않습니다. 기본 "
+"임시 보관함을 사용합니다."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (기본값)"
 
@@ -4261,19 +4268,19 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4311,17 +4318,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "오류 : %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4471,14 +4483,14 @@ msgstr "목록 문서"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4507,208 +4519,182 @@ msgstr "사용할 수 없는 암호 키"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>사용자의 OpenPGP 암호키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 OpenPGP 암호 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 OpenPGP 암호키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 OpenPGP 암호 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>의 유"
+"효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>의 유"
+"효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의 유효기"
+"간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의 유효기"
+"간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p><p>의 유효"
+"기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p><p>의 유효"
+"기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p>"
-"<p>유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서에 대"
+"한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p><p>유효기간이 "
+"하루밖에 남지 않았습니다.</p>\n"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서에 대"
+"한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p><p>의 유효기간"
+"이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서"
+"에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의유"
+"효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서"
+"에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의 유"
+"효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4723,208 +4709,182 @@ msgstr "S/MIME 인증서의 유효기간이 곧 만료됩니다."
 #: keyresolver.cpp:750
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 OpenPGP 서명키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:755
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>사용자의 OpenPGP 암호키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 OpenPGP 암호 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 OpenPGP 암호키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 OpenPGP 암호 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:760
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>의 유"
+"효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 OpenPGP 키</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>의 유"
+"효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:770
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의 유효기"
+"간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의 유효기"
+"간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:777
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p><p>의 유효"
+"기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인증서"
+"에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2) </p><p>의 유효"
+"기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:784
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p>"
-"<p>유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>루트 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서에 대"
+"한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p><p>유효기간이 "
+"하루밖에 남지 않았습니다.</p>\n"
+"<p>루트 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서에 대"
+"한 루트인증서</p><p align=center><b>%1</b> (일련번호 %2)의 </p><p>의 유효기간"
+"이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:792
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 서명 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 서명 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:799
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 암호 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 암호 인"
+"증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:806
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>매개 CA 인증서</p><p align=center><b>%3</b></p>"
-"<p>사용자의 S/MIME 인증서에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서"
+"에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의유"
+"효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>매개 CA 인증서</p><p align=center><b>%3</b></p><p>사용자의 S/MIME 인증서"
+"에 대한 매개 CA 인증서</p><p align=center><b>%1</b> (일련번호 %2)</p><p>의 유"
+"효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:815
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 S/MIME 서명 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:820
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 S/MIME 암호 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</"
+"p><p>의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:825
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
-"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p>"
-"<p>의 유효기간이 %n 일 남았습니다.</p>"
+"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 하루밖에 남지 않았습니다.</p>\n"
+"<p>사용자의 S/MIME 인증서</p> <p align=center><b>%1</b> (일련번호 %2)</p><p>"
+"의 유효기간이 %n 일 남았습니다.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -4936,14 +4896,16 @@ msgstr "S/MIME 인증서의 유효기간이 곧 만료됩니다."
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"설정된 OpenPGP 암호화 키나 S/MIME 인증서 중 하나 혹은 그 이상이 암호화에 사용될 수 없습니다. 사용자 설정 대화창에서 이 사용자 "
-"정보에 대한 암호화 키와 인증서를 재설정 해주십시오.\n"
+"설정된 OpenPGP 암호화 키나 S/MIME 인증서 중 하나 혹은 그 이상이 암호화에 사용"
+"될 수 없습니다. 사용자 설정 대화창에서 이 사용자 정보에 대한 암호화 키와 인증"
+"서를 재설정 해주십시오.\n"
 "계속을 선택하고나서 후에 키가 필요하게되면, 사용할 키를 불어봅니다."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
@@ -4958,8 +4920,9 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"설정된 OpenPGP 서명 키나 S/MIME 서명 인증서 중 하나 혹은 그 이상이 서명에 사용될 수 없습니다. 사용자 정보 설정 대화창에서 이 "
-"사용자 정보에 대한 서명키와 인증서를 재설정 해주십시오.\n"
+"설정된 OpenPGP 서명 키나 S/MIME 서명 인증서 중 하나 혹은 그 이상이 서명에 사"
+"용될 수 없습니다. 사용자 정보 설정 대화창에서 이 사용자 정보에 대한 서명키와 "
+"인증서를 재설정 해주십시오.\n"
 "계속을 선택하고나서 후에 키가 필요하게되면, 사용할 키를 물어봅니다."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
@@ -4970,38 +4933,44 @@ msgstr "사용할 수 없는 서명 키"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"적어도 여러명의 수신인들이 암호화 방침의 시험결과로 메시지를 OpenPGP를 사용하여 암호화 해야 한다고 전해왔습니다. 하지만 이 사용자 "
-"정보에 대한 사용가능하고 신뢰할 수 있는 OpenPGP 키가 설정되어 있지 않습니다.\n"
-"스스로 암호화하지 않고 계속할 수 있습니다. 하지만, 그러한 경우 가지고 있는 메시지를 읽을 수 없을 것이라는 점을 알아두십시오."
+"적어도 여러명의 수신인들이 암호화 방침의 시험결과로 메시지를 OpenPGP를 사용하"
+"여 암호화 해야 한다고 전해왔습니다. 하지만 이 사용자 정보에 대한 사용가능하"
+"고 신뢰할 수 있는 OpenPGP 키가 설정되어 있지 않습니다.\n"
+"스스로 암호화하지 않고 계속할 수 있습니다. 하지만, 그러한 경우 가지고 있는 메"
+"시지를 읽을 수 없을 것이라는 점을 알아두십시오."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"적어도 여러명의 수신인들이 암호화 방침의 시험결과로 메시지를 S/MIME를 사용하여 암호화 해야 한다고 전해왔습니다. 하지만 이 사용자 정보에 "
-"대한 사용가능하고 신뢰할 수 있는 S/MIME 암호화 인증서를 설정하지 않았습니다.하지만, 이 사용자 정보에 대해 유효한 S/MIME 암호화 "
-"인증서를 설정하지 않았습니다.\n"
-"스스로 암호화하지 않고 계속할 수 있습니다. 하지만, 그러한 경우 가지고 있는 메시지를 읽을 수 없을 것이라는 점을 알아두십시오."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"적어도 여러명의 수신인들이 암호화 방침의 시험결과로 메시지를 S/MIME를 사용하"
+"여 암호화 해야 한다고 전해왔습니다. 하지만 이 사용자 정보에 대한 사용가능하"
+"고 신뢰할 수 있는 S/MIME 암호화 인증서를 설정하지 않았습니다.하지만, 이 사용"
+"자 정보에 대해 유효한 S/MIME 암호화 인증서를 설정하지 않았습니다.\n"
+"스스로 암호화하지 않고 계속할 수 있습니다. 하지만, 그러한 경우 가지고 있는 메"
+"시지를 읽을 수 없을 것이라는 점을 알아두십시오."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"적어도 몇몇의 수신인들이 암호화 방침의 시험결과로 OpenPGP를 사용해 메일을 서명해야 한다고 전해왔습니다.\n"
-"하지만, 이 사용자 정보에 대해 유효한 OpenPGP 서명 인증서를 설정하지 않았습니다."
+"적어도 몇몇의 수신인들이 암호화 방침의 시험결과로 OpenPGP를 사용해 메일을 서"
+"명해야 한다고 전해왔습니다.\n"
+"하지만, 이 사용자 정보에 대해 유효한 OpenPGP 서명 인증서를 설정하지 않았습니"
+"다."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5009,13 +4978,15 @@ msgstr "OpenPGP 서명 안함"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"적어도 몇몇의 수신인들이 암호화 방침의 시험결과로 S/MIME를 사용해 메일을 서명해야 한다고 전해왔습니다.\n"
-"하지만, 이 사용자 정보에 대해 유효한 S/MIME 서명 인증서를 설정하지 않았습니다."
+"적어도 몇몇의 수신인들이 암호화 방침의 시험결과로 S/MIME를 사용해 메일을 서명"
+"해야 한다고 전해왔습니다.\n"
+"하지만, 이 사용자 정보에 대해 유효한 S/MIME 서명 인증서를 설정하지 않았습니"
+"다."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5037,9 +5008,11 @@ msgstr "No signing possible"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
-msgstr "사용자 자신의 암호화 키를 선택하지 않았었습니다.(자신을 암호화) 사용자가 암호화한 메일을 열 수 없게 됩니다."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
+msgstr ""
+"사용자 자신의 암호화 키를 선택하지 않았었습니다.(자신을 암호화) 사용자가 암호"
+"화한 메일을 열 수 없게 됩니다."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5054,13 +5027,17 @@ msgstr "암호화(&E)"
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
-msgstr "이 메시지의 수신자에 대한 암호키를 찾을 수 없습니다. 메시지를 암호화하지 않습니다."
+msgstr ""
+"이 메시지의 수신자에 대한 암호키를 찾을 수 없습니다. 메시지를 암호화하지 않습"
+"니다."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
-msgstr "이 메시지의 어느 수취인들에 대해서도 암호화 키를 선택하지 않았었습니다. 메시지를 암호화하지 않습니다."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
+msgstr ""
+"이 메시지의 어느 수취인들에 대해서도 암호화 키를 선택하지 않았었습니다. 메시"
+"지를 암호화하지 않습니다."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5070,13 +5047,17 @@ msgstr "암호화하지 않은 상태로 전송(&U)"
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "수신자들 중 한 사람에 대한 암호화 키를 선택하지 않았었습니다: 메일을 암호화하면 해당 수신자는 암호 해제를 하지 못합니다."
+msgstr ""
+"수신자들 중 한 사람에 대한 암호화 키를 선택하지 않았었습니다: 메일을 암호화하"
+"면 해당 수신자는 암호 해제를 하지 못합니다."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "수신자 중 한 사람에 대한 암호화 키를 선택하지 않았었습니다: 메일을 암호화하면 해당 수신자는 암호 해제를 하지 못합니다."
+msgstr ""
+"수신자 중 한 사람에 대한 암호화 키를 선택하지 않았었습니다: 메일을 암호화하"
+"면 해당 수신자는 암호 해제를 하지 못합니다."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5100,11 +5081,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "\"%1\"에서 유효하고 신뢰할 수 있는 암호 키를 찾을 수 없습니다.\n"
 "\n"
@@ -5153,10 +5134,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "치명적인 오류: 메일을 가져올 수 없습니다: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"메일 추가 실패:\n"
+msgid "Failed to add message:\n"
+msgstr "메일 추가 실패:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5248,6 +5227,50 @@ msgstr "IMAP 접속 해제(&D)"
 msgid "&Maildir mailbox"
 msgstr "Maildir 편지함(&M)"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "메시지의 제목 설정"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "참조 주소로 보내기"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "숨은 참조 주소로 보내기"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "메시지에 헤더 추가"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "파일에서 메시지 본문 읽기"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "메시지 본문 설정"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "메일에 첨부파일을 추가합니다. 반복하여 사용할 수 있습니다."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "새 메일만 확인"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "편지쓰기 창만 열기"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "주어진 메시지 파일 보기"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "수신인 주소로 메일 보내고, 첨부파일을 인터넷 주소로 보내기"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "메세지"
@@ -5292,8 +5315,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"Kmail은 %1의 하위디렉터리인 IMAP 리소스에 대해 필요한 디렉터리를 생성할 것입니다. 원하지 않으실 경우  \"아니오\"를 누르시면 "
-"IMAP 리소스를 사용하지 않을 것입니다."
+"Kmail은 %1의 하위디렉터리인 IMAP 리소스에 대해 필요한 디렉터리를 생성할 것입"
+"니다. 원하지 않으실 경우  \"아니오\"를 누르시면 IMAP 리소스를 사용하지 않을 "
+"것입니다."
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5306,12 +5330,13 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"Kmail은 %1의 하위디렉터리인 IMAP 리소스에 대해 필요한 디렉터리를 생성할 것입니다. 원하지 않으실 경우  \"아니오\"를 누르시면 "
-"IMAP 리소스를 사용하지 않을 것입니다."
+"Kmail은 %1의 하위디렉터리인 IMAP 리소스에 대해 필요한 디렉터리를 생성할 것입"
+"니다. 원하지 않으실 경우  \"아니오\"를 누르시면 IMAP 리소스를 사용하지 않을 "
+"것입니다."
 
 #: kmailicalifaceimpl.cpp:1802
 #, fuzzy
@@ -5357,13 +5382,14 @@ msgstr "클립보드에 URL을 복사했습니다."
 
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
-msgstr "<qt>이미 %1 파일이 있습니다. 기존 파일을 이 파일로 바꾸시겠습니까?</qt>"
+msgstr ""
+"<qt>이미 %1 파일이 있습니다. 기존 파일을 이 파일로 바꾸시겠습니까?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "파일로 저장"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "바꾸기(&R)"
 
@@ -5381,7 +5407,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5401,11 +5427,11 @@ msgstr "메일이 파일안에 없습니다."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "파일에 여러개의 메일이 있습니다. 첫번째 메일만 표시합니다."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5414,117 +5440,119 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "메일 삭제"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "%1 에서 %2개 중 %3개의 메일을 가져오는 중"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "디스크의 공간이 부족합니까?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "이 디렉터리로 이동"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "이 디렉터리에 복사 "
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "메일 이동"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "메일 삭제"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL 여는 중..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt><b>%1</b>를 실행하시겠습니까?</qt> "
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "명령어 실행"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "저장하기 위한 첨부파일을 찾을 수 없습니다."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "첨부 파일 저장"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "첨부물.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "첨부물.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "이미 %1 파일이 있습니다. 기존 파일을 이 파일로 바꾸시겠습니까?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "파일이 이미 존재합니다."
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "덮어쓰기(&O)"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
-msgstr "메일의 %1 부분이 암호화되어 있습니다. 저장할때 암호를 유지하시겠습니까?"
+msgstr ""
+"메일의 %1 부분이 암호화되어 있습니다. 저장할때 암호를 유지하시겠습니까?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "K메일에 대한 물음 "
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "암호화"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "암호화 하지 않음(&N)"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
-msgstr "이 메일의 %1 부분이 서명되어 있습니다. 저장할 때 서명을 유지하시겠습니까?"
+msgstr ""
+"이 메일의 %1 부분이 서명되어 있습니다. 저장할 때 서명을 유지하시겠습니까?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "서명"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5533,19 +5561,21 @@ msgstr ""
 "파일 %1을 쓸 수 없습니다:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "%1 파일에 쓸 수 없습니다."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
-msgstr "이 이메일 주소에 대한 주소록 항목이 없습니다. 주소록에 등록한 후에 선호하는 메신저 주소를 추가하십시오."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
+msgstr ""
+"이 이메일 주소에 대한 주소록 항목이 없습니다. 주소록에 등록한 후에 선호하는 "
+"메신저 주소를 추가하십시오."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5555,67 +5585,67 @@ msgstr ""
 " %1\n"
 " 누구와 대화할 것인지 정할 수 없습니다."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "암호 키 선택"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "메세지"
@@ -5714,7 +5744,7 @@ msgstr "크기"
 msgid "Encoding"
 msgstr "인코딩"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "압축"
 
@@ -5726,7 +5756,7 @@ msgstr "암호화"
 msgid "Sign"
 msgstr "서명"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "첨부파일 이름"
 
@@ -5748,8 +5778,10 @@ msgstr "주 수신자"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
-msgstr "<qt>이 항목에 입력한 이메일 주소는 이메일의 복사본을 전송받습니다.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
+msgstr ""
+"<qt>이 항목에 입력한 이메일 주소는 이메일의 복사본을 전송받습니다.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5758,12 +5790,13 @@ msgstr "추가 수신자"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>참조(CC)에 들어간 사람은 <b>받는사람:</b>란에 들어간 사람과 같은 내용을 받게됩니다. 다만 참조(CC)에 넣어줌으로서 이 "
-"메일의 담당자를 구별하기 위함입니다.</qt>"
+"<qt>참조(CC)에 들어간 사람은 <b>받는사람:</b>란에 들어간 사람과 같은 내용을 "
+"받게됩니다. 다만 참조(CC)에 넣어줌으로서 이 메일의 담당자를 구별하기 위함입니"
+"다.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5771,10 +5804,11 @@ msgstr "숨겨진 수신자"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
-msgstr "<qt><b>참조(CC):</b>와 같은 효과를 나타내지만 메일 수신자가 누구인지 다른 수신자가 알 수 없습니다.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
+msgstr ""
+"<qt><b>참조(CC):</b>와 같은 효과를 나타내지만 메일 수신자가 누구인지 다른 수"
+"신자가 알 수 없습니다.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
@@ -5786,7 +5820,7 @@ msgstr "Sendmail(&S)"
 msgid "&Send Mail Via"
 msgstr "Sendmail(&S)"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "나중에 보내기(&L)"
@@ -5854,8 +5888,7 @@ msgstr "인용문자 제거(&M)"
 msgid "Cl&ean Spaces"
 msgstr "빈공간 지우기(&E)"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "고정폭 글꼴 사용(&X)"
@@ -5998,31 +6031,31 @@ msgstr "암호 메세지 형식(&C):"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "표준"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "비순서 목록(디스크)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "비순서 목록(원)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "비순서 목록(사각)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "순서 목록(소수점)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "순서 목록(내림차순)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "순서 목록(오름차순)"
 
@@ -6109,13 +6142,15 @@ msgstr "임시 보관함에 저장(&S)"
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
-msgstr "이 메시지를 임시 디렉터리에 저장합니다. 나중에 보내거나 편집하실 수 있습니다."
+msgstr ""
+"이 메시지를 임시 디렉터리에 저장합니다. 나중에 보내거나 편집하실 수 있습니다."
 
 #: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
-msgstr "이 메시지를 임시 디렉터리에 저장합니다. 나중에 보내거나 편집하실 수 있습니다."
+msgstr ""
+"이 메시지를 임시 디렉터리에 저장합니다. 나중에 보내거나 편집하실 수 있습니다."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6127,8 +6162,8 @@ msgstr "편집기 닫기"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr "파일이 첨부되지 않았습니다. 파일을 첨부할까요?"
 
@@ -6136,43 +6171,49 @@ msgstr "파일이 첨부되지 않았습니다. 파일을 첨부할까요?"
 msgid "File Attachment Reminder"
 msgstr "첨부파일 보기"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "현재 상태로 보내기(&S)"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
-msgstr "<qt><p>첨부파일(%1)의 위치를 알 수 없습니다.;</p> <p>첨부파일의 전체 경로를 지정하십시오.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
+msgstr ""
+"<qt><p>첨부파일(%1)의 위치를 알 수 없습니다.;</p> <p>첨부파일의 전체 경로를 "
+"지정하십시오.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "파일 첨부"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "첨부(&A)"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "파일 삽입"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "파일 삽입"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
-msgstr "<qt><p>백엔드로부터 키를 내보내는 도중 오류가 발생하였습니다: </p><p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
+msgstr ""
+"<qt><p>백엔드로부터 키를 내보내는 도중 오류가 발생하였습니다: </p><p><b>%1</"
+"b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6211,288 +6252,305 @@ msgid ""
 "View"
 msgstr "보기"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "편집..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "편집..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "다른 이름으로 저장(&A)..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "등록정보(&P)"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "첨부파일 추가..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail이 이 파일을 압축할 수 없습니다."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "압축된 파일이 원본보다 큽니다. 원본을 보관하시겠습니까?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "경고음(&B)"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail이 이 파일을 압축해제할 수 없습니다."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "다른이름으로 첨부파일 저장"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "텍스트 추가"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "첨부파일 추가"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "첨부파일 붙여넣기(&H)"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "이름없음"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>스스로에게 보내는 메일의 암호화를 요청하였지만, 해당 사용자는 사용할 암호화 키(OpenPGP or S/MIME)를 정하지 않았습니다. "
-"</p>"
-"<p>사용자 설정에서 암호화 키를 선택해주십시오.</p></qt>"
+"<qt><p>스스로에게 보내는 메일의 암호화를 요청하였지만, 해당 사용자는 사용할 "
+"암호화 키(OpenPGP or S/MIME)를 정하지 않았습니다. </p><p>사용자 설정에서 암호"
+"화 키를 선택해주십시오.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "알 수 없는 암호화 키"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이 메일에 서명 하려면 먼저 (OpenPGP 또는 S/MIME) 키를 지정해야 합니다.</p> "
-"<p>사용자 설정에서 사용할 키를 선택하십시오.</p></qt>"
+"<qt><p>이 메일에 서명 하려면 먼저 (OpenPGP 또는 S/MIME) 키를 지정해야 합니다."
+"</p> <p>사용자 설정에서 사용할 키를 선택하십시오.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "알 수 없는 서명 키 입니다"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"보낸 사람: 필드에 당신의 이메일 주소를 입력해야 합니다. 또한 모든 사용자에 이메일 주소를 지정해주면, 메일을 보낼 때마다 자신의 이메일 "
-"주소를 넣지 않아도 됩니다."
+"보낸 사람: 필드에 당신의 이메일 주소를 입력해야 합니다. 또한 모든 사용자에 이"
+"메일 주소를 지정해주면, 메일을 보낼 때마다 자신의 이메일 주소를 넣지 않아도 "
+"됩니다."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
-msgstr "받는 사람 필드나 참조, 또는 숨은 참조 영역에 최소 한명 이상의 받는 사람을 지정해야 합니다."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
+msgstr ""
+"받는 사람 필드나 참조, 또는 숨은 참조 영역에 최소 한명 이상의 받는 사람을 지"
+"정해야 합니다."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "제목을 지정하지 않았습니다. 무시하고 메일을 보내겠습니까?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "이름이 지정되지 않았습니다"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "제목을 지정하지 않았습니다. 무시하고 메일을 보내겠습니까?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "제목이 지정되지 않았습니다"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "지금 상태로 보내기(&E)"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "제목 지정하기(&S)"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "서명/암호화 하지 않고 표시 유지(&K)"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "암호화 하지 않고 표시 유지(&K)"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "서명 하지 않고 표시 유지(&K)"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "서명/암호화 (표시 지움)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "암호화 (표시 지움)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "서명 (표시 지움)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
-msgstr "<qt><p>HTML 메일의 인라인 서명/암호화는 불가능합니다.;</p><p>문서 형식을 지우시겠습니까?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
+msgstr ""
+"<qt><p>HTML 메일의 인라인 서명/암호화는 불가능합니다.;</p><p>문서 형식을 지우"
+"시겠습니까?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "메일을 서명/암호화 하시겠습니까?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
-msgstr "사용자 정보 \"%1\"에 대한 사용자 정의 임시 보관함이 존재하지 않습니다. 기본 임시 보관함을 사용합니다."
+msgstr ""
+"사용자 정보 \"%1\"에 대한 사용자 정의 임시 보관함이 존재하지 않습니다. 기본 "
+"임시 보관함을 사용합니다."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "보낼 계정을 만들고 다시 시도하십시오. "
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "메일 보내기에 대해서..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "보내기 확인"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "지금 보내기(&S)"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "수신인 없음"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "추가 수신자"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "맞춤법 검사"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "맞춤법 검사"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " 맞춤법 검사 취소."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " 맞춤법 검사 멈춤."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " 맞춤법 검사 완료."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "맞춤법 검사"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "No signature found"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "암호 키 선택"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "메시지가 %1 으로 서명되었습니다."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "메시지가 %1 으로 서명되었습니다."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP 메일 - 암호화됨"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "다음 제목을 갖는 메일: "
@@ -6542,10 +6600,11 @@ msgstr "맞춤법 검사 - K메일"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/Aspell을 시작할 수 없습니다.ISpell 또는 Aspell의 경로 및 설정사항이 올바르게 되었는지 확인하십시오."
+"ISpell/Aspell을 시작할 수 없습니다.ISpell 또는 Aspell의 경로 및 설정사항이 올"
+"바르게 되었는지 확인하십시오."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6578,9 +6637,8 @@ msgstr "<qt>필터 규칙 '%1'에 너무 많은 필터 작동이 있습니다.</
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr "<qt>필터 규칙 '%2' 에 알 수 없는 필터 작동 `%1'.을 무시합니다.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -6799,146 +6857,130 @@ msgstr "소리 재생"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이것은 정의된 필터 목록입니다. 목록은 처음 부터 끝까지 처리됩니다.</p>"
-"<p> 대화상자 오른편에 있는 제어판을 사용하여 그것을 편집하기 위해 필터를 클릭하십시오.</p></qt>"
+"<qt><p>이것은 정의된 필터 목록입니다. 목록은 처음 부터 끝까지 처리됩니다.</"
+"p><p> 대화상자 오른편에 있는 제어판을 사용하여 그것을 편집하기 위해 필터를 클"
+"릭하십시오.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>새 필터를 만드려면 이 버튼을 클릭하십시오. </p>"
-"<p> 그것은 현재 선택된 것 바로 앞에 삽입되지만, 당신은 항상 나중에 그것을 변경할 수 있습니다. </p>"
-"<p> 실수로 이 버튼을 누르게 되면, (오른쪽에 있는) <em>delete</em>버튼을 눌러서 실행취소 할 수 있습니다.</p></qt>"
+"<qt><p>새 필터를 만드려면 이 버튼을 클릭하십시오. </p><p> 그것은 현재 선택된 "
+"것 바로 앞에 삽입되지만, 당신은 항상 나중에 그것을 변경할 수 있습니다. </"
+"p><p> 실수로 이 버튼을 누르게 되면, (오른쪽에 있는) <em>delete</em>버튼을 눌"
+"러서 실행취소 할 수 있습니다.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>새 필터를 만들기 위해 이 버튼을 클릭하십시오. </p>"
-"<p> 그것은 현재 선택된 것 바로 앞에 삽입되지만, 당신은 항상 나중에 그것을 변경할 수 있습니다. </p>"
-"<p> 실수로 이 버튼을 누르게 되면, (오른쪽에 있는) <em>delete</em>버튼을 눌러서 실행취소 할 수 있습니다.</p></qt>"
+"<qt><p>새 필터를 만들기 위해 이 버튼을 클릭하십시오. </p><p> 그것은 현재 선택"
+"된 것 바로 앞에 삽입되지만, 당신은 항상 나중에 그것을 변경할 수 있습니다. </"
+"p><p> 실수로 이 버튼을 누르게 되면, (오른쪽에 있는) <em>delete</em>버튼을 눌"
+"러서 실행취소 할 수 있습니다.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>위 목록에서 현재 선택된 필터를 <em>지우시려면</em> 이 버튼을 클릭하십시오.</p>"
-"<p>지워진 필터를 되살릴 수 없습니다. 하지만,  <em>취소</em>메뉴를 통해 변경된 사항을 적용하지 않을 수 있습니다.</p></qt>"
+"<qt><p>위 목록에서 현재 선택된 필터를 <em>지우시려면</em> 이 버튼을 클릭하십"
+"시오.</p><p>지워진 필터를 되살릴 수 없습니다. 하지만,  <em>취소</em>메뉴를 통"
+"해 변경된 사항을 적용하지 않을 수 있습니다.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>현재 선택된 필터를 위 목록에서 <em>위로 이동</em>시키려면 이 버튼을 클릭하십시오. </p>"
-"<p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합니다. 그렇기 때문에 이 버튼은 유용합니다: </p>"
-"<p>버튼을 잘못 눌렀다면, (오른쪽에 있는) <em> 아래 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
+"<qt><p>현재 선택된 필터를 위 목록에서 <em>위로 이동</em>시키려면 이 버튼을 클"
+"릭하십시오. </p><p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합니"
+"다. 그렇기 때문에 이 버튼은 유용합니다: </p><p>버튼을 잘못 눌렀다면, (오른쪽"
+"에 있는) <em> 아래 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
-"<qt>"
-"<p>현재 선택된 필터를 위 목록에서 <em>위로 이동</em>시키려면 이 버튼을 클릭하십시오. </p>"
-"<p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합니다. 그렇기 때문에 이 버튼은 유용합니다: </p>"
-"<p>버튼을 잘못 눌렀다면, (오른쪽에 있는) <em> 아래 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
+"<qt><p>현재 선택된 필터를 위 목록에서 <em>위로 이동</em>시키려면 이 버튼을 클"
+"릭하십시오. </p><p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합니"
+"다. 그렇기 때문에 이 버튼은 유용합니다: </p><p>버튼을 잘못 눌렀다면, (오른쪽"
+"에 있는) <em> 아래 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>현재 선택된 필터를 위 목록에서 <em>아래로 이동</em>시키려면 이 버튼을 클릭하십시오. </p>"
-"<p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합니다. 그렇기 때문에 이 버튼은 유용합니다: </p>"
-"<p>버튼을 잘못 눌렀다면, (왼쪽에 있는) <em> 위로 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
+"<qt><p>현재 선택된 필터를 위 목록에서 <em>아래로 이동</em>시키려면 이 버튼을 "
+"클릭하십시오. </p><p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합"
+"니다. 그렇기 때문에 이 버튼은 유용합니다: </p><p>버튼을 잘못 눌렀다면, (왼쪽"
+"에 있는) <em> 위로 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>현재 선택된 필터를 위 목록에서 <em>아래로 이동</em>시키려면 이 버튼을 클릭하십시오. </p>"
-"<p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합니다. 그렇기 때문에 이 버튼은 유용합니다: </p>"
-"<p>버튼을 잘못 눌렀다면, (왼쪽에 있는) <em> 위로 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
+"<qt><p>현재 선택된 필터를 위 목록에서 <em>아래로 이동</em>시키려면 이 버튼을 "
+"클릭하십시오. </p><p>목록에 있는 필터의 순서가 메일 필터링하는 순서를 결정합"
+"니다. 그렇기 때문에 이 버튼은 유용합니다: </p><p>버튼을 잘못 눌렀다면, (왼쪽"
+"에 있는) <em> 위로 </em> 버튼을 클릭하여 실행취소 할 수 있습니다.</p></qt> "
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>현재 선택된 필터의 이름을 바꾸려면, 이 버튼을 클릭하십시오. </p>"
-"<p> \"<<\" 로 시작하면, 필터의 이름이 자동으로 만들어집니다. </p>"
-"<p>실수로 필터의 이름을 다시 만들어서 자동으로 되돌리고 싶다면, 버튼을 클릭하고, <em>Clear</em> "
-"를 선택하십시오. 그런 다음<em>확인</em> 버튼을 누르십시오</p></qt>"
+"<qt><p>현재 선택된 필터의 이름을 바꾸려면, 이 버튼을 클릭하십시오. </p><p> "
+"\"<<\" 로 시작하면, 필터의 이름이 자동으로 만들어집니다. </p><p>실수로 필터"
+"의 이름을 다시 만들어서 자동으로 되돌리고 싶다면, 버튼을 클릭하고, "
+"<em>Clear</em> 를 선택하십시오. 그런 다음<em>확인</em> 버튼을 누르십시오</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이 단추를 선택하면 강제로 확인 디얼로그를 불수있습니다. </p>"
-"<p>만약 태그 메일을 나중에 다운로드 하기 규칙을 규정하면 유용합니다. 다이얼로그 팝업을 강제로 사용하지 못하면, 큰 메일이 서버에 없을때 "
-"와 테그 메일을 다르게 규칙 바꿀때 메일을 다운로드 할수없습니다.</p></qt>"
+"<qt><p>이 단추를 선택하면 강제로 확인 디얼로그를 불수있습니다. </p><p>만약 태"
+"그 메일을 나중에 다운로드 하기 규칙을 규정하면 유용합니다. 다이얼로그 팝업을 "
+"강제로 사용하지 못하면, 큰 메일이 서버에 없을때 와 테그 메일을 다르게 규칙 바"
+"꿀때 메일을 다운로드 할수없습니다.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -6948,6 +6990,16 @@ msgstr "POP3 메일 규칙"
 msgid "Filter Rules"
 msgstr "메일 규칙"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "내보내기(&I)"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "내보내기(&I)"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "가능한 메일 규칙"
@@ -7034,6 +7086,11 @@ msgstr "도구모음에 이 필터를 추가합니다."
 msgid "Icon for this filter:"
 msgstr "이 규칙의 아이콘:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "받는사람"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "위"
@@ -7042,16 +7099,29 @@ msgstr "위"
 msgid "Down"
 msgstr "아래"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "이름변경"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "새로운 규칙"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "복사(&C)"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "삭제됨"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7060,15 +7130,17 @@ msgstr "디렉터리 단축키 선택"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
-msgstr "다음 필터는 유효하지 않으므로 저장되지 않았습니다. (동작이나 검색 규칙을 포함하지 않은것)"
+msgstr ""
+"다음 필터는 유효하지 않으므로 저장되지 않았습니다. (동작이나 검색 규칙을 포함"
+"하지 않은것)"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7139,26 +7211,24 @@ msgstr "IMAP 캐시 문제 해결"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>IMAP 캐쉬에서 문제점 찾기</b></p>"
-"<p>IMAP 디렉터리동기화에 문제가 있을 경우 우선 인덱스파일을 재생성 해보시기 바랍니다. 파일을 재생성하는데는 다소 시간이 걸립니다.</p> "
-"<p>그래도 문제가 계속될 경우 IMAP 캐쉬를 새로고침해보시기 바랍니다. 이 경우 로컬 디렉터리와  하위디렉터리의 모든 데이터의 연결이 해제 "
-"됩니다.</p>"
+"<p><b>IMAP 캐쉬에서 문제점 찾기</b></p><p>IMAP 디렉터리동기화에 문제가 있을 "
+"경우 우선 인덱스파일을 재생성 해보시기 바랍니다. 파일을 재생성하는데는 다소 "
+"시간이 걸립니다.</p> <p>그래도 문제가 계속될 경우 IMAP 캐쉬를 새로고침해보시"
+"기 바랍니다. 이 경우 로컬 디렉터리와  하위디렉터리의 모든 데이터의 연결이 해"
+"제 됩니다.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7195,8 +7265,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7234,9 +7304,11 @@ msgstr "이디렉터리의 인덱스가 재생성되었습니다."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
-msgstr "%1 디렉터리는 초기 동기화 상태가 아닙니다.(%2 상태.). 동기화 상태를 초기상태로 만드시겠습니까?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
+msgstr ""
+"%1 디렉터리는 초기 동기화 상태가 아닙니다.(%2 상태.). 동기화 상태를 초기상태"
+"로 만드시겠습니까?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7363,11 +7435,11 @@ msgstr "서버에 하위디렉터리를 생성"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
-msgstr "<qt><p>디렉터리 <b>%1</b>이(가) 삭제 되었는지 확인하십시오. 서버로 부터 삭제하시겠습니까?</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
+msgstr ""
+"<qt><p>디렉터리 <b>%1</b>이(가) 삭제 되었는지 확인하십시오. 서버로 부터 삭제"
+"하시겠습니까?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7388,10 +7460,11 @@ msgstr "디렉터리 목록 검색하기"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
-msgstr "<qt><p>디렉터리 <b>%1</b>이(가) 삭제 되었는지 확인하십시오. 서버로 부터 삭제하시겠습니까?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
+msgstr ""
+"<qt><p>디렉터리 <b>%1</b>이(가) 삭제 되었는지 확인하십시오. 서버로 부터 삭제"
+"하시겠습니까?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7399,20 +7472,20 @@ msgstr "중지됨"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"%1 IMAP서버가 IMAP 주석기능을 지원하지 않스니다. 이 서버의 XML 저장소를 사용할 수 없습니다. KMail의 설정을 바꾸시기 "
-"바랍니다."
+"%1 IMAP서버가 IMAP 주석기능을 지원하지 않스니다. 이 서버의 XML 저장소를 사용"
+"할 수 없습니다. KMail의 설정을 바꾸시기 바랍니다."
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"%1 IMAP서버가 IMAP 주석기능을 지원하지 않스니다. 이 서버의 XML 저장소를 사용할 수 없습니다. KMail의 설정을 바꾸시기 "
-"바랍니다."
+"%1 IMAP서버가 IMAP 주석기능을 지원하지 않스니다. 이 서버의 XML 저장소를 사용"
+"할 수 없습니다. KMail의 설정을 바꾸시기 바랍니다."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7424,11 +7497,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7437,15 +7510,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "이동:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "서명하지 않음"
@@ -7459,8 +7537,7 @@ msgstr "디렉터리로 메일 이동"
 msgid "Permissions (ACL)"
 msgstr "권한 (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "일반"
@@ -7485,8 +7562,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "사용자가 정의한 아이콘 사용(&I)"
@@ -7506,23 +7582,21 @@ msgstr "이 디렉터리에 새 메일이 있으면 알림"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7534,10 +7608,12 @@ msgstr "이 디렉터리의 회신 유지"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
-msgstr "메일이 보내진 디렉터리에 회신을 같이 넣어두고 싶을 경우 체크하십시오. 해당 회신이 설정된 받은 편지함에 들어가지 않습니다."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
+msgstr ""
+"메일이 보내진 디렉터리에 회신을 같이 넣어두고 싶을 경우 체크하십시오. 해당 회"
+"신이 설정된 받은 편지함에 들어가지 않습니다."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7547,17 +7623,21 @@ msgstr "메시지 목록에 보낸 사람과 받는 사람 표시"
 msgid "Sho&w column:"
 msgstr "열 보기(&W) :"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "기본값으로 설정"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "보낸사람"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "받는사람"
@@ -7568,15 +7648,17 @@ msgstr "보내는 사람 인증(&S)"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"이 디렉터리 에서 새로운 메일을 작성할 때나 메일에 회신할 때 쓰일 보낸 사람 서명을 선택하세요. 만약 여러분이 하나 이상의 회사 디렉터리를 "
-"가지고 있다면, 각각의 회사 디렉터리들마다 각기 다른 이메일 주소와 각기 다른 서명, 각기 다른 인증키로 회신 및 메일 보내기를 하실 수 "
-"있다는 뜻입니다. 이에 대한 변경이나 설정은 메인 설정 대화창에서 가능합니다.(설정 -> KMail 설정)"
+"이 디렉터리 에서 새로운 메일을 작성할 때나 메일에 회신할 때 쓰일 보낸 사람 서"
+"명을 선택하세요. 만약 여러분이 하나 이상의 회사 디렉터리를 가지고 있다면, 각"
+"각의 회사 디렉터리들마다 각기 다른 이메일 주소와 각기 다른 서명, 각기 다른 인"
+"증키로 회신 및 메일 보내기를 하실 수 있다는 뜻입니다. 이에 대한 변경이나 설정"
+"은 메인 설정 대화창에서 가능합니다.(설정 -> KMail 설정)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7594,22 +7676,25 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"이 설정은 freebusy목록에서 \"busy\"기간에 어느 유저가 이 디렉터리를 공유하게 되는지, 그리고 이 디렉터리의 이벤트나 작업의 "
-"알람을 어떻게 볼 것인지를 결정합니다. 이 설정은 달력과 작업 디렉터리에만 적용됩니다.(작업의 경우, 이 설정은 오직 알람사용에만 "
-"적용됩니다.)\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"이 설정은 freebusy목록에서 \"busy\"기간에 어느 유저가 이 디렉터리를 공유하게 "
+"되는지, 그리고 이 디렉터리의 이벤트나 작업의 알람을 어떻게 볼 것인지를 결정합"
+"니다. 이 설정은 달력과 작업 디렉터리에만 적용됩니다.(작업의 경우, 이 설정은 "
+"오직 알람사용에만 적용됩니다.)\n"
 "\n"
-"예를 들어, 만약 사장님이 비서와 디렉터리를 공유하고 있다면, 오직 사장님만 약속으로 인해 busy상태를 설정할 수 있고, \"관리자\"를 "
-"선택하여 그의 비서가 이 디렉터리에 대해 관리자 권한을 가질 수 없도록 설정할 수 있습니다.\n"
-"만약 작업그룹이 그룹 미팅을 위한 달력을 공유하고 있다면, 디렉터리의 모든 그룹원들은 busy상태가 됩니다.\n"
-"회사 전체에 공유되는 디렉터리에는 이벤트 옵션으로 \"Nobody\"옵션을 제공하며, 이 옵션은 해당 이벤트에 누가 가는지 모르도록 설정할 수 "
-"있습니다."
+"예를 들어, 만약 사장님이 비서와 디렉터리를 공유하고 있다면, 오직 사장님만 약"
+"속으로 인해 busy상태를 설정할 수 있고, \"관리자\"를 선택하여 그의 비서가 이 "
+"디렉터리에 대해 관리자 권한을 가질 수 없도록 설정할 수 있습니다.\n"
+"만약 작업그룹이 그룹 미팅을 위한 달력을 공유하고 있다면, 디렉터리의 모든 그룹"
+"원들은 busy상태가 됩니다.\n"
+"회사 전체에 공유되는 디렉터리에는 이벤트 옵션으로 \"Nobody\"옵션을 제공하며, "
+"이 옵션은 해당 이벤트에 누가 가는지 모르도록 설정할 수 있습니다."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7640,20 +7725,22 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"이 디렉터리가 그룹웨어 정보를 포함하도록 설정하고, 그룹웨어 디렉터리 숨기기가 일반 설정에서 사용되었습니다. 이는 현재 대화창이 닫히면, "
-"디렉터리가 안 보이게 된다는 것을 의미합니다. 다시 디렉터리를 옮기거나 하려면 그룹웨어 디렉터리 숨기기 옵션을 임시적으로 해제해야 합니다."
+"이 디렉터리가 그룹웨어 정보를 포함하도록 설정하고, 그룹웨어 디렉터리 숨기기"
+"가 일반 설정에서 사용되었습니다. 이는 현재 대화창이 닫히면, 디렉터리가 안 보"
+"이게 된다는 것을 의미합니다. 다시 디렉터리를 옮기거나 하려면 그룹웨어 디렉터"
+"리 숨기기 옵션을 임시적으로 해제해야 합니다."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7723,10 +7810,12 @@ msgstr "디렉터리 정보를 가져오는 도중 오류"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "%1 메일 인덱스는 K메일 (%2) 의 알려지지 않은 버전에서 왔습니다.\n"
-"편지함에서 인덱스를 만들 수 있습니다.그러나, 일부 정보는 없어질 수 있습니다. 인덱스 파일의 버전을 낮추기 원합니까?  "
+"편지함에서 인덱스를 만들 수 있습니다.그러나, 일부 정보는 없어질 수 있습니다. "
+"인덱스 파일의 버전을 낮추기 원합니까?  "
 
 #: kmfolderindex.cpp:372
 #, fuzzy
@@ -7744,7 +7833,8 @@ msgid ""
 "information, like status flags, might get lost."
 msgstr ""
 "%1 메일 인덱스는 K메일 (%2) 의 알려지지 않은 버전에서 왔습니다.\n"
-"편지함에서 인덱스를 만들 수 있습니다.그러나, 일부 정보는 없어질 수 있습니다. 인덱스 파일의 버전을 낮추기 원합니까?  "
+"편지함에서 인덱스를 만들 수 있습니다.그러나, 일부 정보는 없어질 수 있습니다. "
+"인덱스 파일의 버전을 낮추기 원합니까?  "
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -7752,9 +7842,11 @@ msgstr "%1 을(를) 열 수 없습니다. 디렉터리가 없습니다."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
-msgstr "%1을 열 수 없습니다. 유효한 maildir 디렉터리가 아니거나 엑세스 권한이 없습니다."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
+msgstr ""
+"%1을 열 수 없습니다. 유효한 maildir 디렉터리가 아니거나 엑세스 권한이 없습니"
+"다."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -7792,19 +7884,16 @@ msgstr "\"%1\"파일을 열 수 없음: %2"
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>디렉터리 목록에 '%2' 데이타가 없다. 메일 손실을 막기위해 목록을 다시 만들어야한다. 삭제된 메일이 다시 나타나거나 상태 플래그가 "
-"손실된는 결과가날수있다.</p>"
-"<p>관련 사항을 잃으시오 <a href=\"%1\">KMail 메뉴얼의 FAQ 섹션 </a>이 문제가 다시 일어나지 않게 하기위한 정보</p>"
-"</qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>디렉터리 목록에 '%2' 데이타가 없다. 메일 손실을 막기위해 목록을 다시 "
+"만들어야한다. 삭제된 메일이 다시 나타나거나 상태 플래그가 손실된는 결과가날수"
+"있다.</p><p>관련 사항을 잃으시오 <a href=\"%1\">KMail 메뉴얼의 FAQ 섹션 </a>"
+"이 문제가 다시 일어나지 않게 하기위한 정보</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7861,7 +7950,7 @@ msgstr ""
 "'%1'은(는) 디렉터리가 아닙니다.\n"
 "파일을 다른곳으로 옮기십시오."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7869,7 +7958,7 @@ msgstr ""
 "'%1' 디렉터리의 권한이 올바르지 않습니다.\n"
 "이 디렉터리에에 대한 읽기 및 변경권한이 있는지 확인하십시오."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7879,8 +7968,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7888,7 +7977,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "디렉터리 만들기 실패"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7992,12 +8081,13 @@ msgstr "IMAP 캐쉬 문제점 검사(&T)..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt><b>%1</b>디렉터리를 만들 수 없습니다. 권한이 없습니다. 서버 관리자에게 여러분이 이 곳에 디렉터리를 만들 수 있는 권한이 "
-"있는지 확인하시기 바랍니다.</qt>"
+"<qt><b>%1</b>디렉터리를 만들 수 없습니다. 권한이 없습니다. 서버 관리자에게 여"
+"러분이 이 곳에 디렉터리를 만들 수 있는 권한이 있는지 확인하시기 바랍니다.</"
+"qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8014,20 +8104,23 @@ msgstr "전체"
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
-msgstr "<qt><b>%1</b> 디렉터리를 만들수 없습니다. 디렉터리가 이미 존재합니다.</qt>"
+msgstr ""
+"<qt><b>%1</b> 디렉터리를 만들수 없습니다. 디렉터리가 이미 존재합니다.</qt>"
 
 #: kmfoldertree.cpp:2000
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
-msgstr "<qt><b>%1</b> 디렉터리는 자신의 하위 디렉터리로 이동시킬 수 없습니다.</qt>"
+msgstr ""
+"<qt><b>%1</b> 디렉터리는 자신의 하위 디렉터리로 이동시킬 수 없습니다.</qt>"
 
 #: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
-msgstr "<qt><b>%1</b> 디렉터리는 자신의 하위 디렉터리로 이동시킬 수 없습니다.</qt>"
+msgstr ""
+"<qt><b>%1</b> 디렉터리는 자신의 하위 디렉터리로 이동시킬 수 없습니다.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8135,13 +8228,15 @@ msgstr "%1 디렉터리는 읽기 전용입니다."
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>선택한 메일을 정말로 삭제하시겠습니까? 삭제된 메일은 복구할 수 없습니다.</qt>\n"
-"<qt>선택한 %n 개의 메일을 정말로 삭제하시겠습니까? 삭제된 메일들은 복구할 수 없습니다.</qt>"
+"<qt>선택한 메일을 정말로 삭제하시겠습니까? 삭제된 메일은 복구할 수 없습니다."
+"</qt>\n"
+"<qt>선택한 %n 개의 메일을 정말로 삭제하시겠습니까? 삭제된 메일들은 복구할 수 "
+"없습니다.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8193,131 +8288,132 @@ msgstr ""
 "고장 수정 %1\n"
 "(장치에 공간이 없습니다?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "인증 서명 요구"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "첨부파일로 부터 인증서를 만들고 보낸사람에게 되돌려 주십시오."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "인덱스 디렉터리에 대한 읽기/쓰기 허가가 없습니다 "
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "보낼 편지함"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "보낼 편지함 디렉터리에 대해 잃기/쓰기 권한이 없습니다."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "보낸 편지함"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "보낸 편지함에 대한 읽기/쓰기 허가가 없습니다 "
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "지운 편지함"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "지운 편지함에 대한 읽기/쓰기 허가가 없습니다 "
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "임시 보관함"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "임시 보관함에 대한 읽기/쓰기 허가가 없습니다 "
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "지운 편지함에 대한 읽기/쓰기 허가가 없습니다 "
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "마지막 검색"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i>디렉터리가 이미 존재하기 때문에, %1 응용프로그램이 메시지를 처리하기 위해서 <i>%5</i> "
-"디렉터리를 이용합니다.%2 응용프로그램이 <i>%6</i> 디렉터리의 내용을 이 디렉터리에 복사합니다. 이 과정에서 <i>%7</i> "
-"디렉터리의 파일들과 같은 이름을 가지는 파일들은 대체됩니다. "
-"<p><strong> %3 응용프로그램을 사용하여 메일 파일을 지금 옮기시겠습니까?</strong></qt>"
+"<qt><i>%4</i>디렉터리가 이미 존재하기 때문에, %1 응용프로그램이 메시지를 처리"
+"하기 위해서 <i>%5</i> 디렉터리를 이용합니다.%2 응용프로그램이 <i>%6</i> 디렉"
+"터리의 내용을 이 디렉터리에 복사합니다. 이 과정에서 <i>%7</i> 디렉터리의 파일"
+"들과 같은 이름을 가지는 파일들은 대체됩니다. <p><strong> %3 응용프로그램을 사"
+"용하여 메일 파일을 지금 옮기시겠습니까?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i> 디렉터리가 이미 존재하므로, %1 응용프로그램은 메시지를 처리하기 위해서 <i>%5</i> "
-"디렉터리를 이용합니다. %2 응용프로그램은 <i>%6</i> 디렉터리의 내용을 이 디렉터리로 옮기게 됩니다. "
-"<p><strong>%3 응용프로그램을 사용하여 메일 파일을 지금 옮기시겠습니까?</strong></qt>"
+"<qt><i>%4</i> 디렉터리가 이미 존재하므로, %1 응용프로그램은 메시지를 처리하"
+"기 위해서 <i>%5</i> 디렉터리를 이용합니다. %2 응용프로그램은 <i>%6</i> 디렉터"
+"리의 내용을 이 디렉터리로 옮기게 됩니다. <p><strong>%3 응용프로그램을 사용하"
+"여 메일 파일을 지금 옮기시겠습니까?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "메일 파일을 이동시키시겠습니까?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail에 치명적 오류가 있어 프로그램을 종료 합니다."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8328,11 +8424,11 @@ msgstr ""
 "오류:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "지운 편지함 비움"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "모든 계정의 지운 편지함 디렉터리를 비우시겠습니까?"
 
@@ -8409,8 +8505,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>새 메일이 도착하였습니다</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8448,9 +8543,10 @@ msgstr "지운 편지함을 비우시겠습니까? "
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
-msgstr "<qt><b>%1</b>디렉터리의 모든 메시지를 지운 편지함으로 보내시겠습니까?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
+msgstr ""
+"<qt><b>%1</b>디렉터리의 모든 메시지를 지운 편지함으로 보내시겠습니까?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8476,10 +8572,11 @@ msgstr "디렉터리 삭제"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>검색 디렉터리 <b>%1</b>을(를) 정말로 삭제하시겠습니까? 안의 메시지들은 지워지지 않고 다른 디렉터리에 저장됩니다.</qt>"
+"<qt>검색 디렉터리 <b>%1</b>을(를) 정말로 삭제하시겠습니까? 안의 메시지들은 지"
+"워지지 않고 다른 디렉터리에 저장됩니다.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8492,30 +8589,36 @@ msgstr "<qt>비어있는 <b>%1</b> 디렉터리를 삭제하시겠습니까?</qt
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
-msgstr "<qt><b>%1</b> 디렉터리의 모든 하위디렉터리와 그 내용을 지우시겠습니까?</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
+msgstr ""
+"<qt><b>%1</b> 디렉터리의 모든 하위디렉터리와 그 내용을 지우시겠습니까?</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
-msgstr "<qt><b>%1</b> 디렉터리의 모든 하위디렉터리와 그 내용을 지우시겠습니까?</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
+msgstr ""
+"<qt><b>%1</b> 디렉터리의 모든 하위디렉터리와 그 내용을 지우시겠습니까?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
-msgstr "<qt><b>%1</b> 디렉터리의 모든 하위디렉터리와 그 내용을 지우시겠습니까?</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
+msgstr ""
+"<qt><b>%1</b> 디렉터리의 모든 하위디렉터리와 그 내용을 지우시겠습니까?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "삭제됨"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8531,12 +8634,13 @@ msgstr "모든 오래된 메일을 삭제하시겠습니까?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"메일을 HTML 사용하여 쓰면, \"스팸 메일\" 에 노출되기 쉽게 됩니다. 또한 당신의 시스템은 보안 정보를 부당하게 사용하는 것 때문에 "
-"지금 또 앞으로손상될 것입니다."
+"메일을 HTML 사용하여 쓰면, \"스팸 메일\" 에 노출되기 쉽게 됩니다. 또한 당신"
+"의 시스템은 보안 정보를 부당하게 사용하는 것 때문에 지금 또 앞으로손상될 것입"
+"니다."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8549,11 +8653,12 @@ msgstr "HTML 사용"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"메일을 HTML을 사용해서 쓰면, \"스팸 메일\" 에 노출되기 쉽게 됩니다. 또한 당신의 시스템은 보안 정보를 부당하게 사용하는 것 때문에 "
-"지금 또 앞으로손상될 것입니다."
+"메일을 HTML을 사용해서 쓰면, \"스팸 메일\" 에 노출되기 쉽게 됩니다. 또한 당신"
+"의 시스템은 보안 정보를 부당하게 사용하는 것 때문에 지금 또 앞으로손상될 것입"
+"니다."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8569,11 +8674,12 @@ msgstr "메이링 목록 필터 %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"K메일의 \"자리비움\"답변 기능은 서버의 규칙에 의존합니다. 이 기능을 위한 IMAP 서버의 설정을 변경하지 않았습니다.\n"
+"K메일의 \"자리비움\"답변 기능은 서버의 규칙에 의존합니다. 이 기능을 위한 "
+"IMAP 서버의 설정을 변경하지 않았습니다.\n"
 "IMAP 계정 설정의 \"규칙\" 탭에서 변경할 수 있습니다."
 
 #: kmmainwidget.cpp:1743
@@ -8589,8 +8695,10 @@ msgstr "인증 관리자를 시작할 수 없습니다. 설치를 확인 하십�
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
-msgstr "GnuPG 로그 뷰어(kwatchgnupg)를 시작할 수 없습니다; 설치를 확인하십시오."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
+msgstr ""
+"GnuPG 로그 뷰어(kwatchgnupg)를 시작할 수 없습니다; 설치를 확인하십시오."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -8924,8 +9032,7 @@ msgstr "첨부파일 저장(&T)...."
 msgid "Appl&y All Filters"
 msgstr "모든 필터 적용(&Y)"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "필터 적용(&P)"
@@ -9039,7 +9146,6 @@ msgstr "읽지 않은 메일(&U)"
 msgid "Go to the next unread message"
 msgstr "읽지 않은 다음 메일로 가기"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "이전 메일(&P)"
@@ -9086,7 +9192,8 @@ msgstr "읽지 않은 다음 문서로 이동"
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
-msgstr "현재 메일을 아래로 스크롤. 만약 메일이 끝나면, 다음 잃지않은 메일로 가기."
+msgstr ""
+"현재 메일을 아래로 스크롤. 만약 메일이 끝나면, 다음 잃지않은 메일로 가기."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9179,8 +9286,8 @@ msgstr " 초기화 중..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9190,21 +9297,22 @@ msgstr ""
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "메시지가 수신 확인 요청을 포함하고 있습니다.\n"
-"\"요청됨\" 이라는 진행 명령을 포함하고 있으나, KMail은 이를 인식할 수 없습니다.\n"
+"\"요청됨\" 이라는 진행 명령을 포함하고 있으나, KMail은 이를 인식할 수 없습니"
+"다.\n"
 "무시하거나 KMail을 통해 \"실패\" 메시지를 보낼 수 있습니다."
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9216,8 +9324,8 @@ msgstr ""
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9229,8 +9337,8 @@ msgstr ""
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9256,23 +9364,24 @@ msgstr "메일 보내기(&S)"
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
-msgstr "헤더 \"수신 확인 옵션\" 은 요청을 포함하고 있지만, 알 수 없는 파라미터입니다."
+msgstr ""
+"헤더 \"수신 확인 옵션\" 은 요청을 포함하고 있지만, 알 수 없는 파라미터입니다."
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "받는 사람: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "첨부파일: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "첨부 파일을 발신자가 제시한데로 보여주기."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9322,43 +9431,36 @@ msgstr "메일 속성"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>파일의 <em>마임 타입</em>:</p>"
-"<p>파일 형식이 자동으로 확인되는 동안은 설정할 필요가 없습니다. 때로는 %1 이(가) 형식에 맞지않게 검출될 때가 있습니다. 여기에서 "
-"수정할 수 있습니다"
-"<p></qt>"
+"<qt><p>파일의 <em>마임 타입</em>:</p><p>파일 형식이 자동으로 확인되는 동안은 "
+"설정할 필요가 없습니다. 때로는 %1 이(가) 형식에 맞지않게 검출될 때가 있습니"
+"다. 여기에서 수정할 수 있습니다<p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>부분의 크기:</p>"
-"<p>때로는, %1 이(가) 예상 크기만을 줍니다, 정확한 크기를 산출하는데에는 많은 시간이 소요되기 때문입니다. 이 원인일 때에는 크기 표시 "
-"추가\"(est)\"로 가시화 할 수 있습니다.</p></qt>"
+"<qt><p>부분의 크기:</p><p>때로는, %1 이(가) 예상 크기만을 줍니다, 정확한 크기"
+"를 산출하는데에는 많은 시간이 소요되기 때문입니다. 이 원인일 때에는 크기 표"
+"시 추가\"(est)\"로 가시화 할 수 있습니다.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이 부분의 파일 이름:</p>"
-"<p>이 기본값이 첨부 파일의 이름이더라도 파일을 첨부하도록 정하지 않습니다. 다만 수신자가 디스크에 저장할 때 수신자의 메일 에이젼트가 이 "
-"파일 이름을 사용하도록 제의 합니다.</p></qt>"
+"<qt><p>이 부분의 파일 이름:</p><p>이 기본값이 첨부 파일의 이름이더라도 파일"
+"을 첨부하도록 정하지 않습니다. 다만 수신자가 디스크에 저장할 때 수신자의 메"
+"일 에이젼트가 이 파일 이름을 사용하도록 제의 합니다.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9366,15 +9468,13 @@ msgstr "설명(&D):"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이 부분의 설명:</p>"
-"<p>이 부분의 정보 설명입니다. 많은 메일 에이젼트에서 이 정보를 첨부 파일 아이콘 옆의 메일 미리보기에서 보여줍니다. </p></qt>"
+"<qt><p>이 부분의 설명:</p><p>이 부분의 정보 설명입니다. 많은 메일 에이젼트에"
+"서 이 정보를 첨부 파일 아이콘 옆의 메일 미리보기에서 보여줍니다. </p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9382,20 +9482,19 @@ msgstr "인코딩(&E):"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>이 부분의 전송 인코딩:</p>"
-"<p> %1 마임 타입에 의존하는 기본 인코딩을 쓰는 동안은 바꿀 필요가 없습니다. 하지만 때로는 메일의 크기를 상당히 줄일 수 있습니다. "
-"만약 포스트스크립트 파일이 바이너리 데이터를 포함하지 않고 텍스트로만 되었다면 기본값 \"base64 \" 대신 \"인쇄 가능\" 을 선택하면 "
-"크기를 25%를 줄일 수 있습니다.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>이 부분의 전송 인코딩:</p><p> %1 마임 타입에 의존하는 기본 인코딩을 쓰"
+"는 동안은 바꿀 필요가 없습니다. 하지만 때로는 메일의 크기를 상당히 줄일 수 있"
+"습니다. 만약 포스트스크립트 파일이 바이너리 데이터를 포함하지 않고 텍스트로"
+"만 되었다면 기본값 \"base64 \" 대신 \"인쇄 가능\" 을 선택하면 크기를 25%를 줄"
+"일 수 있습니다.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9403,18 +9502,16 @@ msgstr "자동 표시 추천(&A)"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>수신자에게 기본 아이콘 대신 메시지의 이 부분을 자동으로 메시지 미리보기에 보이도록 제안하고 싶을 경우 이 옵션을 체크하십시오; </p>"
-"<p>기술적으로, 이 제안은 이 부분의 <em>내용 배치</em> 헤더 필드를 기본적인 \"첨부물\" 대신 \"인라인\"으로 설정 함으로써 "
-"가능합니다.</p></qt>"
+"<qt><p>수신자에게 기본 아이콘 대신 메시지의 이 부분을 자동으로 메시지 미리보"
+"기에 보이도록 제안하고 싶을 경우 이 옵션을 체크하십시오; </p><p>기술적으로, "
+"이 제안은 이 부분의 <em>내용 배치</em> 헤더 필드를 기본적인 \"첨부물\" 대신 "
+"\"인라인\"으로 설정 함으로써 가능합니다.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9422,14 +9519,12 @@ msgstr "이 부분 서명(&S)"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>만약 이 메일 부분이 서명되기를 바라면 이 옵션을 선택합니다.</p> "
-"<p>현재 선택한 사용자 정보에 대응하는 키로 서명합니다.</p></qt>"
+"<qt><p>만약 이 메일 부분이 서명되기를 바라면 이 옵션을 선택합니다.</p> <p>현"
+"재 선택한 사용자 정보에 대응하는 키로 서명합니다.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9437,13 +9532,11 @@ msgstr "이 부분을 암호화(&Y)"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이 부분이 암호화되기를 바라면 이 옵션 선택하십시오.</p> "
-"<p>이 부분은 이 메일의 수신자를 위해 암호화됩니다</p></qt>"
+"<qt><p>이 부분이 암호화되기를 바라면 이 옵션 선택하십시오.</p> <p>이 부분은 "
+"이 메일의 수신자를 위해 암호화됩니다</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9457,15 +9550,13 @@ msgstr "POP 필터"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"POP계정에서 찾은 필터에게 메일: <b>%1</b>"
-"<p>이 메일은 사용자가 정한 이 계정의 최고의 크기 한도를 넘었다고 알려줍니다."
-"<br>이것을 어떻게 할 것인가를 알맞은 단추를 누르는 것으로 선택할수 있습니다."
+"POP계정에서 찾은 필터에게 메일: <b>%1</b><p>이 메일은 사용자가 정한 이 계정"
+"의 최고의 크기 한도를 넘었다고 알려줍니다.<br>이것을 어떻게 할 것인가를 알맞"
+"은 단추를 누르는 것으로 선택할수 있습니다."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9720,17 +9811,16 @@ msgstr "TDE 이메일 클라이언트"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9740,18 +9830,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9759,19 +9848,19 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2>K메일 %1에 오신 것을 환영합니다</h2>"
-"<p>K메일은 TDE 데스크톱용메일 클라이언트입니다. MIME, SMTP, POP3 와 IMAP 을 포함한 인터넷메일링 표준과 호환되도록 "
-"디자인되어 있습니다.</p>\n"
-"<ul>"
-"<li>K메일은 <A HREF=\"%2\">문서</A></li> 에 서술되어 있는 강력한 기능을 가지고 있습니다</A></li>\n"
-"<li><A HREF=\"%3\">K메일 홈페이지</A>에서는 다른 메일 클라이언트의 메일 디렉터리를 가져오기 위해 도구를 제공합니다</li>"
-"</ul>\n"
+"<h2>K메일 %1에 오신 것을 환영합니다</h2><p>K메일은 TDE 데스크톱용메일 클라이"
+"언트입니다. MIME, SMTP, POP3 와 IMAP 을 포함한 인터넷메일링 표준과 호환되도"
+"록 디자인되어 있습니다.</p>\n"
+"<ul><li>K메일은 <A HREF=\"%2\">문서</A></li> 에 서술되어 있는 강력한 기능을 "
+"가지고 있습니다</A></li>\n"
+"<li><A HREF=\"%3\">K메일 홈페이지</A>에서는 다른 메일 클라이언트의 메일 디렉"
+"터리를 가져오기 위해 도구를 제공합니다</li></ul>\n"
 "<p><span style='font-size:125%; font-weight:bold;'>중요한 수정사항</span> "
 "(compared to KMail %8):</p>\n"
 "<ul>\n"
 "%9</ul>\n"
-"<p>다른 새로운 사항들은 다음 버젼에서 포함될 것 입니다. (compared to KMail %4, which is part of TDE "
-"%5):</p>\n"
+"<p>다른 새로운 사항들은 다음 버젼에서 포함될 것 입니다. (compared to KMail "
+"%4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9779,15 +9868,13 @@ msgstr ""
 "<p>&nbsp; &nbsp; The KMail Team</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9831,9 +9918,12 @@ msgstr "첨부파일 보기: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
-msgstr "[K메일: 첨부파일이 바이너리 데이터를 포함하고 있습니다. 처음 %n 문자를 보여줍니다.]"
+msgstr ""
+"[K메일: 첨부파일이 바이너리 데이터를 포함하고 있습니다. 처음 %n 문자를 보여줍"
+"니다.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -9857,12 +9947,14 @@ msgstr "첨부파일을 열겠습니까?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9884,6 +9976,58 @@ msgstr "(다음 중 어느 것이든 일치)"
 msgid "(match all of the following)"
 msgstr "(다음에서 모두 일치)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "읽기"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "오래됨"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "삭제됨"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "회신함"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "전달됨"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "대기상태"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "보냈음"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "보았음"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "무시됨"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "스팸"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "할일"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "첨부파일 있음"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9962,23 +10106,27 @@ msgstr "보낼 편지함에 메일을 추가할 수 없음"
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
-msgstr "치명적인 오류: 보낸 메일을 처리를 할 수 없습니다 (용량 부족?) \"보낸 편지함\" 으로 메일 보내기 실패."
+msgstr ""
+"치명적인 오류: 보낸 메일을 처리를 할 수 없습니다 (용량 부족?) \"보낸 편지함"
+"\" 으로 메일 보내기 실패."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"보낸 메일 \"%1\" 를 \"보낼 편지함\"에서 \"보낸 편지함\"으로 이동하기를 실패하였습니다.\n"
-"이유는 디스크 공간 부족과 쓰기 허가에 있을수 잇습니다. 문제를 해결하고 메일를 수동으로 이동하십시오."
+"보낸 메일 \"%1\" 를 \"보낼 편지함\"에서 \"보낸 편지함\"으로 이동하기를 실패하"
+"였습니다.\n"
+"이유는 디스크 공간 부족과 쓰기 허가에 있을수 잇습니다. 문제를 해결하고 메일"
+"를 수동으로 이동하십시오."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "발신 주소를 지정하지 않은 메일는 전송할 수 없습니다.\n"
 "ID 설정 대화상자에서 이메일 주소의 ID '%1'을(를) 설정하십시오."
@@ -10004,11 +10152,11 @@ msgstr "전송 작업 초기화..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 
 #: kmsender.cpp:505
 #, fuzzy
@@ -10033,15 +10181,18 @@ msgstr "(일부)메일을 전송하지 못했습니다."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "전송 실패:\n"
 "%1\n"
-"메일는 문제를 해결하거나 (예를 들어. 잘못된 주소)메일을 지울때 까지는 '보낼 편지함' 에보관되어 있습니다.\n"
-"주의: 다른 메일들이 '보낼 편지함' 에 보관되어 있으면, 이 메일이다른 메시지가 전송되는 것을 막습니다 \n"
+"메일는 문제를 해결하거나 (예를 들어. 잘못된 주소)메일을 지울때 까지는 '보낼 "
+"편지함' 에보관되어 있습니다.\n"
+"주의: 다른 메일들이 '보낼 편지함' 에 보관되어 있으면, 이 메일이다른 메시지가 "
+"전송되는 것을 막습니다 \n"
 "다음 전송 프로토콜이 사용되었습니다:\n"
 "  %2"
 
@@ -10051,18 +10202,18 @@ msgstr "메일 전송 중단됨."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 "전송 실패:\n"
 "%1\n"
-"메일는 문제를 해결하거나 (예를 들어. 잘못된 주소)메일을 지울때 까지는 '보낼 편지함' 에보관되어 있습니다.\n"
-"주의: 다른 메일들이 '보낼 편지함' 에 보관되어 있으면, 이 메일이다른 메시지가 전송되는 것을 막습니다 \n"
+"메일는 문제를 해결하거나 (예를 들어. 잘못된 주소)메일을 지울때 까지는 '보낼 "
+"편지함' 에보관되어 있습니다.\n"
+"주의: 다른 메일들이 '보낼 편지함' 에 보관되어 있으면, 이 메일이다른 메시지가 "
+"전송되는 것을 막습니다 \n"
 "다음 전송 프로토콜이 사용되었습니다:\n"
 "  %2 "
 
@@ -10082,15 +10233,18 @@ msgstr "메일 전송 중단(&A)"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "전송 실패:\n"
 "%1\n"
-"메일은 문제를 해결하거나 (예를 들어. 잘못된 주소)메일을 지울때 까지는 '보낼 편지함' 에보관되어 있습니다.\n"
-"주의: 다른 메일들이 '보낼 편지함' 에 보관되어 있으면, 이 메일이다른 메시지가 전송되는 것을 막습니다 \n"
+"메일은 문제를 해결하거나 (예를 들어. 잘못된 주소)메일을 지울때 까지는 '보낼 "
+"편지함' 에보관되어 있습니다.\n"
+"주의: 다른 메일들이 '보낼 편지함' 에 보관되어 있으면, 이 메일이다른 메시지가 "
+"전송되는 것을 막습니다 \n"
 "다음 전송 프로토콜이 사용되었습니다:\n"
 "  %2 "
 
@@ -10126,43 +10280,46 @@ msgstr "메일 전송이 비정상적으로 종료되었습니다."
 
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
-msgstr "SMTP(메일 전송)서버를 사용하시려면 사용자 이름과 비밀번호가 있어야합니다."
+msgstr ""
+"SMTP(메일 전송)서버를 사용하시려면 사용자 이름과 비밀번호가 있어야합니다."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1이(가) 이 컴퓨터의 다른 디스플레이 에서 실행중입니다. %2을(를) 하나 이상 실행하면 메일을 잃어버릴 수 있습니다. 이것을 끄기 전까지 "
-"%1을(를) 실행하면 안됩니다."
+"%1이(가) 이 컴퓨터의 다른 디스플레이 에서 실행중입니다. %2을(를) 하나 이상 실"
+"행하면 메일을 잃어버릴 수 있습니다. 이것을 끄기 전까지 %1을(를) 실행하면 안됩"
+"니다."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1이(가) 이 컴퓨터의 다른 디스플레이 에서 실행중입니다. %1과 %2을(를) 동시에 실행하면 메일을 잃어버릴 수 있습니다. %1을(를) "
-"끄기 전까지 %2를 실행하면 안됩니다."
+"%1이(가) 이 컴퓨터의 다른 디스플레이 에서 실행중입니다. %1과 %2을(를) 동시에 "
+"실행하면 메일을 잃어버릴 수 있습니다. %1을(를) 끄기 전까지 %2를 실행하면 안됩"
+"니다."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1이(가) %2에서 실행중입니다. %1을(를) 하나 이상 실행하면 메일을 잃어버릴 수 있습니다. %2을(를) 끄기 전까지는 %1을(를) "
-"실행하면 안됩니다."
+"%1이(가) %2에서 실행중입니다. %1을(를) 하나 이상 실행하면 메일을 잃어버릴 수 "
+"있습니다. %2을(를) 끄기 전까지는 %1을(를) 실행하면 안됩니다."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1이(가) %3에서 실행 중입니다. %1와(과) %2을(를) 동시에 실행하면 메일을 잃어버릴 수 있습니다. %1을(를) %3 에서 끄기 "
-"전까지는 %2을(를) 실행하면 안됩니다."
+"%1이(가) %3에서 실행 중입니다. %1와(과) %2을(를) 동시에 실행하면 메일을 잃어"
+"버릴 수 있습니다. %1을(를) %3 에서 끄기 전까지는 %2을(를) 실행하면 안됩니다."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10173,6 +10330,10 @@ msgstr "%1 실행"
 msgid "Exit"
 msgstr "나감"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "새 메일"
@@ -10197,13 +10358,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet을 사용할 수 없습니다. 여러분의 비밀번호를 안전하게 관리하기 위해서는 TDEWallet이 꼭 필요합니다.\n"
-"일단, KMail이 TDEWallet 대신 설정파일에 비밀번호를 저장합니다. 비밀번호는 그냥 봐서는 알 수 없는 형식으로 저장되며, 보안 관련 "
-"프로그램들이 설정파일을 검색할 때 해독됩니다.\n"
+"TDEWallet을 사용할 수 없습니다. 여러분의 비밀번호를 안전하게 관리하기 위해서"
+"는 TDEWallet이 꼭 필요합니다.\n"
+"일단, KMail이 TDEWallet 대신 설정파일에 비밀번호를 저장합니다. 비밀번호는 그"
+"냥 봐서는 알 수 없는 형식으로 저장되며, 보안 관련 프로그램들이 설정파일을 검"
+"색할 때 해독됩니다.\n"
 "%1계정의 비밀번호를 설정파일에 저장하시겠습니까?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10272,8 +10436,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"로컬에서 실행되는 명령으로, 메일을 보내기 전에 우선해서 실행됩니다. 예를 들어 ssh와 같은 것을 설정하여 사용할 수 있습니다. 비워두시면 "
-"아무런 명령도 실행하지 않습니다."
+"로컬에서 실행되는 명령으로, 메일을 보내기 전에 우선해서 실행됩니다. 예를 들"
+"어 ssh와 같은 것을 설정하여 사용할 수 있습니다. 비워두시면 아무런 명령도 실행"
+"하지 않습니다."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10281,11 +10446,11 @@ msgstr "서버에서 인증 요구(&R)"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"이 옵션을 선택하시면, SMTP서버가 메일을 수신하기 전에 인증을 요구합니다. 이것은 흔히 Authenticated SMTP, 혹은 줄여서 "
-"ASMTP라고 부릅니다."
+"이 옵션을 선택하시면, SMTP서버가 메일을 수신하기 전에 인증을 요구합니다. 이것"
+"은 흔히 Authenticated SMTP, 혹은 줄여서 ASMTP라고 부릅니다."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10305,13 +10470,13 @@ msgstr "사용자 지정 호스트 이름을 서버로 보냄(&D)"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"이 옵션을 선택하시면, KMail은 메일 서버에 자신을 인식시키기 위해 사용자가 지정한 호스트 이름을 전송합니다. "
-"<p>이것은 여러분의 시스템의 호스트 이름을 감추거나 호스트 이름이 없는 경우에 유용하게 사용할 수 있습니다."
+"이 옵션을 선택하시면, KMail은 메일 서버에 자신을 인식시키기 위해 사용자가 지"
+"정한 호스트 이름을 전송합니다. <p>이것은 여러분의 시스템의 호스트 이름을 감추"
+"거나 호스트 이름이 없는 경우에 유용하게 사용할 수 있습니다."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10341,8 +10506,8 @@ msgstr "로컬 파일만 지원합니다."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "SMTP서버의 도메인 네임입니다."
 
 #: kmtransport.cpp:788
@@ -10356,10 +10521,10 @@ msgstr "%1 디렉터리의 목록을 만드는 동안 오류 발생 :"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10430,7 +10595,9 @@ msgstr "사용 불가능"
 msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
-msgstr "K메일에서 이 디렉터리에 대한 메일링 리스트를 검색할 수 없습니다. 직접 주소를 입력하십시오."
+msgstr ""
+"K메일에서 이 디렉터리에 대한 메일링 리스트를 검색할 수 없습니다. 직접 주소를 "
+"입력하십시오."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10587,31 +10754,27 @@ msgstr "메일 수정(&E)"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>암호화 플러그인을 사용하여 정보를 구조화하는 동안 오류가 발생했습니다. 아마도 해당 플러그인이 손상된 것 같습니다.</p> "
-"<p>여러분의 시스템 관리자에게 문의하세요.</p></qt>"
+"<qt><p>암호화 플러그인을 사용하여 정보를 구조화하는 동안 오류가 발생했습니"
+"다. 아마도 해당 플러그인이 손상된 것 같습니다.</p> <p>여러분의 시스템 관리자"
+"에게 문의하세요.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>암호화 플러그인을 찾을 수 없어 OpenPGP 코드를 구성하고 실행하는데 실패했습니다.</p> "
-"<p>이 오류를 해결하기 위해 여러분은 두가지 일을 하실 수 있습니다. :</p> "
-"<ul>"
-"<li>설정 -> KMail설정 -> 플러그인 대화창에서 플러그인 사용을 활성화시키거나,</li> "
-"<li>같은 대화창의 인증 -> 고급 탭에서 전통적인 OpenPGP 설정을 지정하실 수 있습니다.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>암호화 플러그인을 찾을 수 없어 OpenPGP 코드를 구성하고 실행하는데 실패했습"
+"니다.</p> <p>이 오류를 해결하기 위해 여러분은 두가지 일을 하실 수 있습니다. :"
+"</p> <ul><li>설정 -> KMail설정 -> 플러그인 대화창에서 플러그인 사용을 활성화"
+"시키거나,</li> <li>같은 대화창의 인증 -> 고급 탭에서 전통적인 OpenPGP 설정을 "
+"지정하실 수 있습니다.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10623,8 +10786,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10639,17 +10802,18 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"즉시 처리되는 OpenPGP 암호화 메시지 형식이 암호화나 서명 첨부를 지원하지 않습니다.\n"
+"즉시 처리되는 OpenPGP 암호화 메시지 형식이 암호화나 서명 첨부를 지원하지 않습"
+"니다.\n"
 "즉시 처리되는 OpenPGP의 사용을 중지하시겠습니까?"
 
 #: messagecomposer.cpp:640
@@ -10703,7 +10867,9 @@ msgstr ""
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
-msgstr "이 메시지에 서명하실 수 없습니다. 유효한 서명 키가 이 인증에서 구성되지 않았습니다."
+msgstr ""
+"이 메시지에 서명하실 수 없습니다. 유효한 서명 키가 이 인증에서 구성되지 않았"
+"습니다."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -10759,11 +10925,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"수신자들의 암호화정도를 검사하여 이 메시지를 암호화 할 수 있다는 결과가 나왔습니다.\n"
+"수신자들의 암호화정도를 검사하여 이 메시지를 암호화 할 수 있다는 결과가 나왔"
+"습니다.\n"
 "이 메시지를 암호화하시겠습니까?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -10796,9 +10963,12 @@ msgstr "암호화 하지 않음(&N)"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
-msgstr "이 메시지를 암호화하려 했지만, 이 인증에서 유효한 암호화 인증키가 구성되지 않아 암호화 할 수 없습니다."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
+msgstr ""
+"이 메시지를 암호화하려 했지만, 이 인증에서 유효한 암호화 인증키가 구성되지 않"
+"아 암호화 할 수 없습니다."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -10807,8 +10977,8 @@ msgstr "암호화하지 않고 보내시겠습니까?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "이 메시지의 몇몇 부분이 암호화되지 않았습니다.\n"
@@ -10834,85 +11004,84 @@ msgstr "모든 부분을 암호화(&E)"
 msgid "Unencrypted Message Warning"
 msgstr "경고! 암호화되지 않은 메시지"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>오류 : 어떤 인코딩된 자료도 돌아오지 않았습니다.</p> "
-"<p> 버그리포트를 제출해 주시기 바랍니다."
-"<br>%2</p></qt>"
+"<qt><p>오류 : 어떤 인코딩된 자료도 돌아오지 않았습니다.</p> <p> 버그리포트를 "
+"제출해 주시기 바랍니다.<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
-msgstr "<qt>모든 문자가 현재 선택된 인코딩 옵션으로 인코딩되지 못했스니다.<br><br>그냥 메시지를 보내시겠습니까?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
+msgstr ""
+"<qt>모든 문자가 현재 선택된 인코딩 옵션으로 인코딩되지 못했스니다.<br><br>그"
+"냥 메시지를 보내시겠습니까?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "내용이 손실될 수 있습니다."
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "손실된 글자들"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "인코딩 변경"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"이 메시지는 서명할 수 없습니다. 아마도 서명에 관련된 응용프로그램이 서명을 제대로 지원하지 않는 듯 합니다. 버그리포트를 보내주시기 "
-"바랍니다."
+"이 메시지는 서명할 수 없습니다. 아마도 서명에 관련된 응용프로그램이 서명을 제"
+"대로 지원하지 않는 듯 합니다. 버그리포트를 보내주시기 바랍니다."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"이 메시지는 서명할 수 없습니다. 아마도 서명에 관련된 응용프로그램이 서명을 제대로 지원하지 않는 듯 합니다. 버그리포트를 보내주시기 "
-"바랍니다."
+"이 메시지는 서명할 수 없습니다. 아마도 서명에 관련된 응용프로그램이 서명을 제"
+"대로 지원하지 않는 듯 합니다. 버그리포트를 보내주시기 바랍니다."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"이 메시지를 암호화 할 수 없습니다. 아마도 암호화에 관련된 응용프로그램이 암호화를 제대로 수행하지 못하는 것 같습니다. 버그리포트를 "
-"보내주시기 바랍니다."
+"이 메시지를 암호화 할 수 없습니다. 아마도 암호화에 관련된 응용프로그램이 암호"
+"화를 제대로 수행하지 못하는 것 같습니다. 버그리포트를 보내주시기 바랍니다."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"이 메시지를 서명하거나 암호화할 수 없습니다. 아마도 암호화 및 서명에 관련된 프로그램이 제대로 작업을 수행하지 못하는 것 같습니다. "
-"버그리포트를 보내주시기 바랍니다."
+"이 메시지를 서명하거나 암호화할 수 없습니다. 아마도 암호화 및 서명에 관련된 "
+"프로그램이 제대로 작업을 수행하지 못하는 것 같습니다. 버그리포트를 보내주시"
+"기 바랍니다."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -10933,14 +11102,16 @@ msgstr "메일함 형식(&F)"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"이 메일함에 어떤 방식으로 메시지를 저장할 것인지 선택하세요. 디렉터리별로 maildir이라는 파일에 메시지를 저장하거나, 메일함 전체를 "
-"하나의 큰 mbox라는 파일에 저장할 수 있습니다. KMail은 maildir을 기본적으로 사용합니다만, 상황에 따라 얼마든지 바뀔 수 "
-"있습니다. 만약 여러분이 잘 모르시겠다면, 이 옵션은 그냥 지나가세요."
+"이 메일함에 어떤 방식으로 메시지를 저장할 것인지 선택하세요. 디렉터리별로 "
+"maildir이라는 파일에 메시지를 저장하거나, 메일함 전체를 하나의 큰 mbox라는 파"
+"일에 저장할 수 있습니다. KMail은 maildir을 기본적으로 사용합니다만, 상황에 따"
+"라 얼마든지 바뀔 수 있습니다. 만약 여러분이 잘 모르시겠다면, 이 옵션은 그냥 "
+"지나가세요."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -10949,11 +11120,13 @@ msgstr "디렉터리가 포함할 내용(&C) :"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"새 디렉터리에 여러분이 원하는 기능을 선택하세요. 단순히 메일 저장소로 쓰실 수도 있고, 그룹웨어의 작업이라든지 메모와 같은 여러가지 항목들을 "
-"저장하는 곳으로도 쓰일 수 있습니다. 기본 설정은 메일 저장소입니다. 만약 여러분이 잘 모르시겠다면, 이 옵션은 그냥 지나가세요."
+"새 디렉터리에 여러분이 원하는 기능을 선택하세요. 단순히 메일 저장소로 쓰실 수"
+"도 있고, 그룹웨어의 작업이라든지 메모와 같은 여러가지 항목들을 저장하는 곳으"
+"로도 쓰일 수 있습니다. 기본 설정은 메일 저장소입니다. 만약 여러분이 잘 모르시"
+"겠다면, 이 옵션은 그냥 지나가세요."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -10974,7 +11147,8 @@ msgstr "이름이 지정되지 않았습니다"
 
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
-msgstr "<qt><b>%1</b> 디렉터리를 만들수 없습니다. 디렉터리가 이미 존재합니다.</qt>"
+msgstr ""
+"<qt><b>%1</b> 디렉터리를 만들수 없습니다. 디렉터리가 이미 존재합니다.</qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -10992,8 +11166,7 @@ msgstr "서명 결과가 다름"
 msgid "The crypto engine returned no cleartext data."
 msgstr "암호화 엔진이 암호화되지 않은 텍스트 데이터를 생성했습니다."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "상태 :"
 
@@ -11025,9 +11198,11 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
-msgstr "메시지가 서명되었습니다. 그러나 서명 타당성 검사를 통과하지 못했습니다. <br />이유 : %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
+msgstr ""
+"메시지가 서명되었습니다. 그러나 서명 타당성 검사를 통과하지 못했습니다. <br /"
+">이유 : %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11063,24 +11238,26 @@ msgstr "\"%1\" 암호화 플러그인이 암호화된 메시지를 해석하지
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>주의 :</b> 이 HTML 메시지가 외부 이미지를 포함하고 있는 것 같습니다. 보안이나 개인정보보호등의 이유로 외부에서 참조되는 "
-"항목들을 불러오지 않았습니다. 만약 이 메시지를 보낸 사람을 믿을 수 있다면, 이 메시지에 포함된 외부 참조 항목들을 <a "
-"href=\"kmail:loadExternal\">이 곳</a>을 클릭하여 보실 수 있습니다."
+"<b>주의 :</b> 이 HTML 메시지가 외부 이미지를 포함하고 있는 것 같습니다. 보안"
+"이나 개인정보보호등의 이유로 외부에서 참조되는 항목들을 불러오지 않았습니다. "
+"만약 이 메시지를 보낸 사람을 믿을 수 있다면, 이 메시지에 포함된 외부 참조 항"
+"목들을 <a href=\"kmail:loadExternal\">이 곳</a>을 클릭하여 보실 수 있습니다."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>주의 :</b> 보안상의 이유로 이 HTML 메시지의 가장 기본적인 정보만 표시했습니다. 만약 이 메시지를 보낸 사람을 믿을 수 있다면, "
-"<a href=\"kmail:showHTML\">이 곳</a>을 클릭하여 이 메시지를 HTML형식으로 보실 수 있습니다."
+"<b>주의 :</b> 보안상의 이유로 이 HTML 메시지의 가장 기본적인 정보만 표시했습"
+"니다. 만약 이 메시지를 보낸 사람을 믿을 수 있다면, <a href=\"kmail:showHTML"
+"\">이 곳</a>을 클릭하여 이 메시지를 HTML형식으로 보실 수 있습니다."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11334,9 +11511,11 @@ msgstr "저장 :"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
-msgstr "서명을 위한 메일 주소가 %1에 저장되지 않았습니다. 때문에 %2 보낸 사람주소와 비교할 수 없습니다."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
+msgstr ""
+"서명을 위한 메일 주소가 %1에 저장되지 않았습니다. 때문에 %2 보낸 사람주소와 "
+"비교할 수 없습니다."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11452,12 +11631,14 @@ msgstr "Kioslave 오류 메시지"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"POP3 서버가 UIDL 명령어를 지원 하지 않습니다. 이 명령어는 신뢰할수 있는 방법이 요구됩니다, 전에 KMail에서 본 서버안의 메일\n"
+"POP3 서버가 UIDL 명령어를 지원 하지 않습니다. 이 명령어는 신뢰할수 있는 방법"
+"이 요구됩니다, 전에 KMail에서 본 서버안의 메일\n"
 "메일을 서버안에 두는 기능이 잘 작동 하지 않을수 있습니다."
 
 #: popaccount.cpp:752
@@ -11481,7 +11662,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr "메일 추출 %2의 %1(%4의%3KB) %5에서(%6 KB 남았습니다)."
 
 #: popaccount.cpp:912
@@ -11499,1768 +11681,14 @@ msgstr "서버로부터 잘못된 응답"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr "서버에서 TOP 명령을 지원하지 않습니다. 대용량 메일에서 파일을 다운받기 전에 머릿글을 먼저 가져올 수 없습니다."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "이동(&G)"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "디렉터리(&O)"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "메시지(&M)"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "전달(&F)"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML 도구모음"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "서명하기"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "메시지에 자동으로 서명하기(&A)"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"이 옵션이 활성화되면, 여러분이 보내시는 모든 메시지를 서명하여 보냅니다. 물론 각각의 메시지를 보낼때마다 서명을 넣지 않을 수도 있습니다."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "암호화하기"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"이 옵션이 활성화되면, 모든 파일과 메시지들은 수신인의 공개키가 아닌 여러분의 개인 키로 암호화됩니다. 이 옵션을 통해 여러분은 암호화된 "
-"메시지와 파일을 나중에 다시 해석하실 수 있습니다. 일반적으로 이 옵션을 선택하는 것은 좋은 생각입니다."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "작성 후 서명/암호화된 텍스트 보여주기(&I)"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"이 옵션이 활성화되면, 여러분이 메시지를 보내기 전에 이것이 어떻게 보이는지 확인할 수 있도록 별도의 창을 통해 서명/암호화된 텍스트 내용을 "
-"보여줍니다. 여러분의 시스템이 어떻게 암호화 작업을 수행하는지 확인하는 좋은 방법입니다."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "보낸 메시지를 암호화하여 저장(&P)"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "메시지를 암호화하여 저장하시려면 선택하세요."
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>메시지를 암호화하여 저장</h1>\n"
-"이 체크박스를 체크하시면, 보낸 메시지를 암호화하여 저장합니다. 여러분의 인증서가 기한이 만료되어 더 이상 사용할 수 없을 때 저장된 "
-"메시지들을 읽을 수 없게 되기 때문에 권장하지는 않습니다.\n"
-"<p>\n"
-"어찌되었든 여러분의 상황에 따라 이 옵션을 활성화할지를 선택하세요. 만약 의문점이 있으시다면 관리자에게 문의하시기 바랍니다.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "접근할 수 있는 암호화 키를 항상 보여줌(&F)"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"이 옵션이 활성화되면, 응용프로그램은 여러분에게 공개 키 목록을 보여주게 되며, 여러분은 이 중에 하나를 선택하여 암호화할 수 있습니다. 이 "
-"옵션이 비활성화되면, 응용프로그램은 유효한 키가 없을 때나 여러개를 사용할 수 있을 때에만 목록을 보여주게 됩니다."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "가능한 시점에 메시지를 자동으로 암호화(&M)"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"이 옵션이 활성화되면, 여러분이 보내는 모든 메시지는 여러분이 원할 때 혹은 가능한 어느 시점에 암호화됩니다. 물론 각각의 메시지별로 암호화를 "
-"선택하지 않을 수도 있습니다."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "임시 보관함에 저장할 때 서명/암호화 하지 않기(&V)"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "받는 사람: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "참조: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "일반"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "회신(&R)"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "모두에게 응답(&A)..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "전달(&F)"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "단축키"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "디렉터리 설정"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "메일링 리스트가 있는 디렉터리(&M)"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "주소 목록(&A) :"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "일반(&O) :"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "읽지않음(&E) :"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "메시지 만료"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "만료 기한(&X) :"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "읽은 메시지 만료(&R)"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "만료 기한(&F)"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "읽지 않은 메시지 만료(&U)"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "일"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "주"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "달"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "고급 옵션"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "보내는 사람 인증(&Y) :"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "저장소 형식(&S)"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "목록 보이기(&L) :"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "CRLs를 사용하여 인증서 확인"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr "이 옵션을 선택하시면, S/MIME 인증서를 CRLs를 이용하여 확인합니다."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "온라인(OCSP)로 인증서 확인"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"이 옵션을 선택하시면, S/MIME 인증서를 OCSP(Online Certificates Status Protocol)을 통해 확인하게 "
-"됩니다. 아래에 OCSP의 주소를 넣으세요."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "온라인 인증서 확인"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP 주소 :"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr "인증서를 온라인으로 확인하기 위한 서버 주소를 입력하세요.(OCSP responder) 주소는 http://로 시작합니다."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP 서명 :"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "인증서의 서비스 주소를 무시"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "인증서 정책을 검사하지 않음."
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"기본적으로 GnuPG는 ~/.gnupg/policies.txt 에 기술한 정책에 따라 인증서의 정책을 승인합니다. 이 옵션을 선택하시면, "
-"정책을 검사하지 않습니다."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "CRL을 참조하지 않음."
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr "이 옵션을 선택하시면, S/MIME 인증서를 확인하는데 CRL을 참조하지 않습니다."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "인증서에 미진한 부분 추가"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"이 옵션을 선택하시면, 필요하다면 인증서에서 문제가 되는 부분을 붙일 수 있습니다.(CRLs와 OSCP를 이용하여 이 작업을 수행합니다.)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP 요청"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "어떤 HTTP 요청도 승인하지 않음."
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "S/MIME을 위한 HTTP설정 사용하지 않음."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP요청에 대해 이 프록시 사용"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "시스템의 HTTP 프록시 사용"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"이 옵션을 선택하시면, HTTP 프록시 값(http_proxy에서 정의된 값들)이 오른쪽에 보이는데, HTTP요청을 처리하기 위해 하나를 "
-"선택하실 수 있습니다."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"S/MIME에 연계된 HTTP 요청을 처리하기 위한, 여러분의 HTTP 프록시서버 위치를 입력하세요. 호스트의 포트는 "
-"myproxy.nowhere.com:3128과 같은 형식으로 지정하실 수 있습니다."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "HTTP CRL 인증서 배포지점 무시"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL의 위치를 찾을 때 지정된 주소에 접근할 수 있는 방법을 설명하는 주소, 일반적으로 \"CRL 배포지점\"(DP)로 알려진 항목을 "
-"인증서가 포함하고 있는지 테스트하게 됩니다. 첫번째로 찾아낸 DP 항목을 사용합니다. 이 옵션을 사용하시면, 정확한 DP를 찾기 위한 작업을 "
-"할 때 모든 항목은 HTTP구성을 사용하게 됩니다."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP 요청"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "LDAP 요청을 승인하지 않습니다."
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "S/MIME을 위한 LDAP 요청을 사용하지 않습니다."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "LDAP CRL 인증서 배포지점 무시"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"CRL의 위치를 찾을 때 지정된 주소에 접근할 수 있는 방법을 설명하는 주소, 일반적으로 \"CRL 배포지점\"(DP)로 알려진 항목을 "
-"인증서가 포함하고 있는지 테스트하게 됩니다. 첫번째로 찾아낸 DP 항목을 사용합니다. 이 옵션을 사용하시면, 정확한 DP를 찾기 위한 작업을 "
-"할 때 모든 항목은 LDAP구성을 사용하게 됩니다."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP요청을 위한 첫번째 호스트 :"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"모든 LDAP요청을 가장 먼저 처리하기 위한 LDAP 서버를 입력하세요. 보다 정확하게, 이 설정은 LDAP 주소에 지정되어 있는 호스트와 "
-"포트정보를 덮어쓰게 되며, 호스트와 포트정보를 생략합니다. 다른 LDAP서버는 오직 \"프록시\"에 접속하는데 실패했을 때만 이 설정을 "
-"사용하게 됩니다. \n"
-"문장은 \"호스트\"나 \"호스트:포트\"로 구성됩니다. 만약 포트가 생략되면, 일반적인 LDAP 포트인 389포트를 사용하게 됩니다."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "추가(&A)..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "그룹웨어(&G)"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "글꼴 설정 리셋"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "제한 없음"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "서명 설정"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "보낸 사람에게 회신(&N):"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "전달된 메일"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "서명되지 않은 메시지를 보낼 때마다 경고(&U)"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "서명되지 않은 메시지를 보낼 때마다 경고하게 하려면 선택하세요."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>서명되지 않은 메시지를 보낼 때마다 경고</h1>\n"
-"이 옵션을 선택하시면, 여러분은 여러분이 서명되지 않은 메시지, 혹은 서명되지 않은 부분을 포함하는 메시지를 보내려고 할 때마다 경고를 "
-"보여주게 됩니다.\n"
-"<p>\n"
-"최대한의 보안을 위해 이 옵션은 선택하시는 것을 권장합니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "암호화되지 않은 메시지를 보내고자 할 때 경고(&W)"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "암호화되지 않은 메시지를 보내려고 할 때 경고하게끔 하시려면 이 옵션을 선택하세요."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>암호화되지 않은 메시지를 보내고자 할 때 경고</h1>\n"
-"이 옵션을 선택하시면 여러분이 암호화되지 않은 메시지, 혹은 암호화되지 않은 부분을 보내려고 할 때마다 경고를 하게 됩니다.\n"
-"<p>\n"
-"최대한의 보안을 위해 이 옵션을 선택하시는 것을 권장합니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "인증서에 수신자의 이메일 주소가 없을 때 경고(&R)"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "메일 주소가 인증되지 않았을 때 경고합니다."
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>수신인 메일 주소가 인증되지 않았을 때 경고</h1>\n"
-"이 옵션을 선택하시면, 암호화를 위한 인증서에 수신인 메일 주소가 없을 경우 경고를 띄우게 됩니다.\n"
-"<p>\n"
-"최대한의 보안을 위해 이 옵션을 선택하는 것을 권장합니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "인증서나 키의 만료가 가까웠을 때 경고(아래의 설정에서 시작)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "서명"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "암호화"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "일"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "여기에서 기간을 설정하세요."
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>서명 인증서가 만료되기 전에 경고</h1>\n"
-"서명인증서가 만료되기 몇일 전부터 경고를 할 것인지 설정하세요.\n"
-"<p>\n"
-"SPHINX에서 권장하는 설정은 14일입니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>암호화 인증서 만료 경고</h1>\n"
-"여기서 최소한의 날짜를 선택하게 되면, 그 날짜만큼 만료가 다가오는 암호화 인증서는 사용할 수 없게 됩니다.\n"
-"<p>\n"
-"SPHINX에서 권장하는 설정은 14일입니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>인증서 체인 만료 경고하기</h1>\n"
-"체인안의 모든 인증서에 대한 유효성관련 경고를 할 최소 기한을 정해주세요.\n"
-"<p>\n"
-"SPHINX에서 권장하는 기간은 14일입니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>CA 인증서가 만료되기 전에 경고</h1>\n"
-"CA인증서가 만료되기 몇일 전부터 경고를 할 것인지 설정하세요.\n"
-"<p>\n"
-"SPHINX가 권장하는 설정은 14일입니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>root 인증서가 만료되기 전에 경고</h1>\n"
-"root인증서가 만료되기 몇일 전부터 경고를 할 것인지 설정하세요.\n"
-"<p>\n"
-"SPHINX가 권장하는 설정은 14일입니다.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "root 인증서 :"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "중개 CA 인증서 :"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "최종사용자 인증서/키 :"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "모든 \"다시 묻지 않기\" 경로를 재활성화"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "디렉터리 내용(&F):"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "메일검사 대기열의 메일을 보내기"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>여기서 KMail이 보낼편지함과 메일검사중인 모든 메일을 보내도록 하거나, 모든 메시지를 한번에 보내지 않도록 결정할 수 있습니다.</p>"
-"</qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "디렉터리 선택창의 가장 최근에 선택된 디렉터리"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "시스템 트레이 아이콘 사용정책"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "자세한 새 메일 알림방법"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"이 옵션을 선택하시면, 각 디렉터리에 새로운 메시지가 도착할 때마다 새로운 메일이 왔음을 자세한 정보를 통해 알립니다. 선택하지 않으시면 "
-"간단한 정보를 보여주며 새 메일이 왔음을 알리게 됩니다."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "지정된 편집기(&D) :"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "편지쓰기 대신 외부 편집기를 사용함(&X)"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "그룹웨어 기능 사용"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "보낸사람:/받는사람: 헤더를 초대에 대한 답글에 따라 변경"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"마이크로소프트 아웃룩은 자제 내장된 ICalender의 기능을 사용하기 위해 수많은 단축키들을 가지는데 이 옵션은 이것과 비슷합니다. 만약 "
-"여러분이 여러분의 회신을 받아볼 수 없는 등, 아웃룩 사용자와 의사소통에 문제가 있다면, 이 옵션을 설정해 보세요."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "메일 본문에 그룹웨어 초대문 넣어 보내기"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"마이크로소프트 아웃룩은 자제 내장된 ICalender의 기능을 사용하기 위해 수많은 단축키들을 가지는데 이 옵션은 이것과 비슷합니다. 만약 "
-"여러분이 여러분의 회신을 받아볼 수 없는 등, 아웃룩 사용자와 의사소통에 문제가 있다면, 이 옵션을 설정해 보세요."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "자동으로 초대장 보냄"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"이 옵션을 선택하시면, 여러분은 편지쓰기를 실행시키지 않고서 모든 초대장을 자동으로 보내실 수 있습니다. 만약 여러분이 메일을 보내기 전에 그 "
-"내용을 확인하고자 핫니다면, 이 옵션을 선택하지 마세요. iCalendar 구문으로 쓰인 텍스트 편지쓰기 창에서는 여러분은 모든 항목을 "
-"수동으로 수정하셔야 합니다."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>이 옵션을 활성화하면, KOrganizer나 K주소록, KNotes등의 Kontact응용프로그램의 항목들을 저장하실 수 있습니다. </p> "
-"<p>이 옵션을 선택하시려면, TDE제어판에서 각 응용프로그램들이 IMAP리소스를 사용할 수 있도록 설정하셔야 합니다.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>일반적으로 여러분은 어떤 이유로든지 간에 디렉터리를 볼 때 IMAP 리소스를 사용하지 않도록 설정했을 것입니다. 하지만 만약 여러분이 "
-"IMAP리소스를 사용하여 디렉터리를 보고 싶다면, 이곳에서 설정하세요.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>그룹웨어 디렉터리의 저장 형식을 선택하세요. "
-"<ul>"
-"<li>기본형식은 ical(달력디렉터리용)이나 vcard(주소록 디렉터리용)입니다. 이 형식은 모든 Kontact요소들을 사용할 수 있도록 "
-"해줍니다.</li> "
-"<li>Kolab XML형식은 한사람만 사용하는 아웃룩에 적합한 모델입니다. 이 형식은 Kolab서버에 호환되는 솔루션을 사용할 때 아웃룩의 "
-"호환성을 더 높여줍니다.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>IMAP리소스 디렉터리의 상위를 선택합니다.</p> "
-"<p>기본적으로 Kolab서버는 IMAP 받은편지함을 상위디렉터리로 설정합니다.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>IMAP리소스 디렉터리에 고정된 계정의 아이디를 설정합니다.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>여러분의 지역언어로 IMAP 저장 디렉터리의 이름을 설정하고 싶다면, 가능한 언어목록에서 선택하실 수 있습니다.</p> "
-"<p>마이크로소프트 아웃룩과의 호환성을 해치기 때문에 권장하지 않습니다. 일단 선택하게 되면 언어를 다시 바꿀수는 없습니다.</p> "
-"<p>반드시 필요한 것이 아니라면, 이 옵션을 선택하지 않기 바랍니다.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "KMail 소개를 보여줄지 말지를 결정하는 값입니다."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "호스트에 연결될 최대 접속수"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr "새로운 메일을 확인하는 동안 호스트에 연결될 최대 접속수를 제한합니다. 기본적으로 접속수제한은 없습니다.(0)"
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "빠른 검색 줄 편집 보이기"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"이 옵션을 통해 메시지 목록에서 정보를 빠르게 검색하기 위한 검색 줄 편집을 메시지 목록위에 위치시키거나 해제할 수 있습니다. "
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "회신하거나 전달할 때 원래 문자셋 유지(가능한 경우)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "서명을 자동으로 가져옴(&U)"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"여기서 설정하는 값들은 다음 편지쓰기 창에서 적용됩니다.\n"
-"......."
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr "여기서 설정한 보내는 항목에 대한 디렉터리 설정들은 다음 편지쓰기 창에서 적용됩니다."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "여기서 설정된 메일 교환 설정값들은 다음 편지쓰기창에서 적용됩니다."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"여기서 설정하는 값들은 다음 편지쓰기 창에서 적용됩니다.\n"
-"......."
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, fuzzy, no-c-format
-msgid "Word &wrap at column:"
-msgstr "열의 단어를 감쌈 :"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "수신인 편집기의 최대줄 수 "
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr "아웃룩(tm)에서 첨부파일의 이름을 인식하도록 합니다. (비 영어 문자 포함)"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "요청 알림 메시지들을 자동으로 정렬(&M)"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Use recent addresses for autocompletion"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "자동 저장 간격 :"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"편지쓰기 창의 텍스트를 정기적으로 백업합니다. 백업을 만들기 위한 저장 간격을 여기서 설정합니다. 값을 0으로 주시게 되면, 이 옵션을 "
-"해제하는 것과 같은 효과를 가집니다."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "\"회신\"으로 인식된 경로 대체(&I)"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "\"전달\"로 인식된 경로 대체(&I)"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "smart quoting 사용(&Q)"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "서명이 만료되었습니다."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "주소 선택기 형식"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr "받는 사람, 참조, 숨은참조의 수신인을 선택하기 위한 대화창 설정."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "수신인 편집기 형식"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "받는 사람, 참조, 숨은참조의 수신인을 선택하기 위한 대화창 설정."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "수신인 편집기의 최대줄 수 "
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "회신하거나 전달할 때 원래 문자셋 유지(가능한 경우)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"이 항목들을 자동으로 생성하는 종류의 어떤 이메일은 이 항목들을 표시하기 위한 문자 인코딩 값을 지정하지 않습니다. 이러한 경우에 문자 "
-"인코딩이 실패한 경우는 여기서 설정한 인코딩을 참조하여 작업을 수행합니다. 여기서 설정하는 문자 인코딩은 여러분의 지역언어에서 가장 많이 "
-"쓰이는 인코딩으로 설정하시기 바랍니다. 기본설정은 여러분의 시스템에서 사용하는 그대로 설정됩니다."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr "기본설정인 자동을 변경하게 되면 모든 메시지와 이메일등에 지정된 대로의 인코딩 작업을 수행합니다."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr "이 옵션을 사용하여 :-)와 같은 스마일 표시들이 이모티콘으로 변경되어 표시됩니다."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatic collapse level:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reduce font size for quoted text"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Enable this option to show quoted text with a smaller font."
+"서버에서 TOP 명령을 지원하지 않습니다. 대용량 메일에서 파일을 다운받기 전에 "
+"머릿글을 먼저 가져올 수 없습니다."
 
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "보낸 메시지를 암호화하여 저장(&P)"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "스팸 상태 보기(&P)"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "메일 수신 알림"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "메시지 목록 - 새로운 메시지"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "메일을 전달되지 않은 상태로 표시(&F)"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "인용문자 추가(&Q)"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13367,6 +11795,11 @@ msgstr "참조 추가"
 msgid "Add as BCC"
 msgstr "숨은 참조 추가"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "작업 취소(&A)"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13383,13 +11816,15 @@ msgstr "선택된 수신인"
 #: recipientspicker.cpp:784
 #, fuzzy
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"_n: 여러분은 1명의 수신인을 선택하셨습니다. 지원가능한 최대한의 수신인 수는 %1입니다. 선택을 바꾸시기 바랍니다.\n"
-"여러분은 %n명의 수신인을 선택하셨습니다. 지원가능한 최대한의 수신인 수는 %1입니다. 선택을 바꾸시기 바랍니다."
+"_n: 여러분은 1명의 수신인을 선택하셨습니다. 지원가능한 최대한의 수신인 수는 "
+"%1입니다. 선택을 바꾸시기 바랍니다.\n"
+"여러분은 %n명의 수신인을 선택하셨습니다. 지원가능한 최대한의 수신인 수는 %1입"
+"니다. 선택을 바꾸시기 바랍니다."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13405,9 +11840,11 @@ msgstr "주소 사용 - 선택 대화창"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
-msgstr "이 버튼을 누르면 여러분이 사용가능한 주소에서 수신인을 선택할 수 있도록 하는 대화창을 띄웁니다."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
+msgstr ""
+"이 버튼을 누르면 여러분이 사용가능한 주소에서 수신인을 선택할 수 있도록 하는 "
+"대화창을 띄웁니다."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -13510,12 +11947,22 @@ msgstr "같거나 낫습니다."
 msgid " bytes"
 msgstr "바이트"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "일"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"디렉터리 %1의 모든 메시지를 검색하시려면 서버에서 다운로드받으셔야 합니다. 이것은 시간이 좀 걸립니다. 검색을 계속하시겠습니까?"
+"디렉터리 %1의 모든 메시지를 검색하시려면 서버에서 다운로드받으셔야 합니다. 이"
+"것은 시간이 좀 걸립니다. 검색을 계속하시겠습니까?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -13661,16 +12108,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Collecting data for account '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 #, fuzzy
@@ -13687,10 +12130,8 @@ msgid ""
 msgstr "계정 형식: IMAP 계정"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Contents of script '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13713,10 +12154,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve capabilities:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
@@ -13724,8 +12163,7 @@ msgstr "(No special capabilities available)"
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "가능한 메일 규칙"
 
 #: sievedebugdialog.cpp:358
@@ -13768,7 +12206,9 @@ msgstr "서명 사용"
 msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
-msgstr "이 신원의 서명을 KMail이 메일을 보낼 때마다 붙여나가게 하려면 이 박스를 선택하세요."
+msgstr ""
+"이 신원의 서명을 KMail이 메일을 보낼 때마다 붙여나가게 하려면 이 박스를 선택"
+"하세요."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -13802,11 +12242,11 @@ msgstr "이 필드를 이용하여 임의의 고정된 서명을 입력합니다
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"이 요청기를 이용하여 텍스트 파일이 여러분의 서명을 포함하도록 지정합니다. 이 파일은 여러분이 새로운 메일을 작성할 때나 새로운 서명을 붙일 "
-"때마다 읽힙니다."
+"이 요청기를 이용하여 텍스트 파일이 여러분의 서명을 포함하도록 지정합니다. 이 "
+"파일은 여러분이 새로운 메일을 작성할 때나 새로운 서명을 붙일 때마다 읽힙니다."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -13822,19 +12262,25 @@ msgstr "텍스트 편집기에서 지정된 파일 열기"
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"여러분은 여기에 임의의 명령을 추가할 수 있습니다. 모든 새 메일에 KMail은 이 명령을 실행하여 나온 결과를 사용합니다.(서명등) "
-"일반적으로 명령은 \"fortune\"이나 \"ksig-random\"과 같은 형식의 작동방식으로 동작합니다."
+"여러분은 여기에 임의의 명령을 추가할 수 있습니다. 모든 새 메일에 KMail은 이 "
+"명령을 실행하여 나온 결과를 사용합니다.(서명등) 일반적으로 명령은 \"fortune"
+"\"이나 \"ksig-random\"과 같은 형식의 작동방식으로 동작합니다."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "명령어 지정(&P) :"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "새로운 항목 :"
@@ -13871,6 +12317,11 @@ msgstr "계정 추가"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt><b>%1</b>사용자 이름을 삭제하시겠습니까 ?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "적용 위치(&T):"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13885,6 +12336,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "편집..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13924,9 +12379,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13966,6 +12421,16 @@ msgstr "암호화 하지 않음(&N)"
 msgid "Cannot insert content from file %1: %2"
 msgstr "\"%1\"파일을 열 수 없음: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "받는 사람: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "참조: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13998,36 +12463,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14037,8 +12498,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14054,8 +12514,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14097,8 +12556,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -14258,6 +12716,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14293,111 +12755,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...각각 왼쪽과 오른쪽 화살표 키를 사용함으로써 이전 메시지와 다음\n"
-"메시지로 이동할 수 있습니다.</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...<em>도구-&gt;필터&nbsp;생성</em>으로 전송자, 수취인, 제목과\n"
-"메일 목록을 빠르게 생성할 수 있습니다.</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...<em>헤더 덮어쓰기</em> 필터 동작을 사용함으로써 몇몇 메일 \n"
-"목록의 제목에 '[mailing list name]'을 추가하는 것을 포기할 수 있\n"
-"습니다. 다음을 사용하기만 하면 됩니다.\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p><em>디렉터리-&gt;속성</em> 대화상자에서 디렉터리와 함께 메일\n"
-"목록을 결합시킬 수 있습니다. 메일 목록 주소 설정을 콤포저로 열기 위해\n"
-"<em>메시지-&gt;새&nbsp;메시지-&gt;메일&nbsp;목록...</em>을 사용할 수 \n"
-"있습니다. 그 외에 디렉터리에 마우스 가운데 클릭을 할 수도 있습니다.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>각 디렉터리에 대해 개인적으로 아이콘을 설정하실 수 있습니다.\n"
-"<em>디렉터리-&gt;속성</em>을 보십시오.</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...KMail은 현재 나타나는 (순수 text/HTML/OpenPGP) 메시지의 종류를\n"
-"나타내는 색상 막대를 보여줄 수 있습니다.</p>\n"
-"<p>KMail의 서명 상태 프레임을 속이는 HTML 메일을 보냄으로써 속이기 \n"
-"위한 방해 시도가 성공적으로 KMail의 서명 상태 프레임을 서명 인증되도록 합니다.\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...어떤 헤더에서 검색 규칙의 첫번째 편집 영역에 그 이름을 입력하는\n"
-"것으로도 필터링 할 수 있습니다.</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>"
-"<pre>&quot;text/html&quot;을 포함하는 &quot;Content-type&quot;</pre>\n"
-"으로 메시지만 HTML 필터링 할 수 있습니다.\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...답신을 보낼 때, 메시지의 선택된 부분만 인용됩니까?</p>\n"
-"<p>만약 아무것도 선택하지 않았다면, 전체 메시지가 인용됩니다.</p>\n"
-"<em>보기-&gt;첨부파일-&gt;인라인</em> 이 선택되었을 때, 이것\n"
-"또한 첨부된 텍스트와 동작합니다.</p>\n"
-"<p>이 요소는 모든 답신 명령에 사용가능합니다.\n"
-"<p><em>메시지-&gt;인용없이 답신</em>만 제외하고, 이 요소는 모든 \n"
-"답신 명령에 사용가능합니다.</p>\n"
-"<p align=\"right\"><em>David F. Newman에 의해 기고되었습니다.</p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "작업취소할 것이 없습니다."
@@ -14464,6 +12821,17 @@ msgstr "첨부파일 #%1(이름없음)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "이미 %1 파일이 있습니다. 기존 파일을 이 파일로 바꾸시겠습니까?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "덮어쓰기(&O)"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14496,7 +12864,8 @@ msgid ""
 "Please contact you system administrator."
 msgstr ""
 "여러분의 서버가 \"휴가\"라는 Sieve 확장기능을 지원하지 않습니다.\n"
-"이 기능을 사용하지 않으면 KMail은 사무실에 없음 답변기능을 사용할 수 없습니다.\n"
+"이 기능을 사용하지 않으면 KMail은 사무실에 없음 답변기능을 사용할 수 없습니"
+"다.\n"
 "여러분의 시스템 관리자에게 연락바랍니다."
 
 #: vacation.cpp:622
@@ -14579,12 +12948,13 @@ msgstr "모든 메시지에 그림을 같이 보내기(&S)"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"이 옵션을 선택하시면, 이 신원으로 사용할 수 있는 X-face헤더를 메시지에 추가하실 수 있습니다. X-face는 48x48픽셀의 "
-"흑백이미지로 클라이언트에서 볼 수 있습니다."
+"이 옵션을 선택하시면, 이 신원으로 사용할 수 있는 X-face헤더를 메시지에 추가하"
+"실 수 있습니다. X-face는 48x48픽셀의 흑백이미지로 클라이언트에서 볼 수 있습니"
+"다."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -14612,12 +12982,13 @@ msgstr "파일 선택..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"여기서 이미지가 있는 파일을 선택하여 그림을 생성할 수 있습니다. 이미지는 높은 수준의 대조값과 정사각형을 포함합니다. 빛배경은 보다 좋은 "
-"결과물을 얻을 수 있도록 해줍니다."
+"여기서 이미지가 있는 파일을 선택하여 그림을 생성할 수 있습니다. 이미지는 높"
+"은 수준의 대조값과 정사각형을 포함합니다. 빛배경은 보다 좋은 결과물을 얻을 "
+"수 있도록 해줍니다."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14625,18 +12996,19 @@ msgstr "주소록에서 설정"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr "여러분의 주소록 항목을 이용하여 그림의 크기를 작게 만들 수 있습니다."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail은 모든 메시지에 48x48 픽셀의 작고, 낮은 품질의 모노크롬 그림을 보낼 수 있습니다. 이 그림은 수신인의 클라이언트가 이 "
-"기능을 지원한다면 그 클라이언트에서 볼 수 있습니다."
+"<qt>KMail은 모든 메시지에 48x48 픽셀의 작고, 낮은 품질의 모노크롬 그림을 보"
+"낼 수 있습니다. 이 그림은 수신인의 클라이언트가 이 기능을 지원한다면 그 클라"
+"이언트에서 볼 수 있습니다."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14644,12 +13016,11 @@ msgstr "이 필드를 사용하여 임의의 X-face스트링값을 입력합니�
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"<a "
-"href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</"
-"a>에서 사용가능한 예를 참조하실 수 있습니다."
+"<a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-"
+"Faces/</a>에서 사용가능한 예를 참조하실 수 있습니다."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14664,130 +13035,1712 @@ msgstr "그림 없음"
 msgid "You do not have your own contact defined in the address book."
 msgstr "주소록에 정의된 여러분 고유의 연락처가 없습니다."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "서명하기"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "메시지에 자동으로 서명하기(&A)"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"이 옵션이 활성화되면, 여러분이 보내시는 모든 메시지를 서명하여 보냅니다. 물"
+"론 각각의 메시지를 보낼때마다 서명을 넣지 않을 수도 있습니다."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "암호화하기"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "메시지의 제목 설정"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"이 옵션이 활성화되면, 모든 파일과 메시지들은 수신인의 공개키가 아닌 여러분의 "
+"개인 키로 암호화됩니다. 이 옵션을 통해 여러분은 암호화된 메시지와 파일을 나중"
+"에 다시 해석하실 수 있습니다. 일반적으로 이 옵션을 선택하는 것은 좋은 생각입"
+"니다."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "참조 주소로 보내기"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "작성 후 서명/암호화된 텍스트 보여주기(&I)"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "숨은 참조 주소로 보내기"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"이 옵션이 활성화되면, 여러분이 메시지를 보내기 전에 이것이 어떻게 보이는지 확"
+"인할 수 있도록 별도의 창을 통해 서명/암호화된 텍스트 내용을 보여줍니다. 여러"
+"분의 시스템이 어떻게 암호화 작업을 수행하는지 확인하는 좋은 방법입니다."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "메시지에 헤더 추가"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "보낸 메시지를 암호화하여 저장(&P)"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "파일에서 메시지 본문 읽기"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "메시지를 암호화하여 저장하시려면 선택하세요."
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "메시지 본문 설정"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>메시지를 암호화하여 저장</h1>\n"
+"이 체크박스를 체크하시면, 보낸 메시지를 암호화하여 저장합니다. 여러분의 인증"
+"서가 기한이 만료되어 더 이상 사용할 수 없을 때 저장된 메시지들을 읽을 수 없"
+"게 되기 때문에 권장하지는 않습니다.\n"
+"<p>\n"
+"어찌되었든 여러분의 상황에 따라 이 옵션을 활성화할지를 선택하세요. 만약 의문"
+"점이 있으시다면 관리자에게 문의하시기 바랍니다.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "메일에 첨부파일을 추가합니다. 반복하여 사용할 수 있습니다."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "접근할 수 있는 암호화 키를 항상 보여줌(&F)"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "새 메일만 확인"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"이 옵션이 활성화되면, 응용프로그램은 여러분에게 공개 키 목록을 보여주게 되"
+"며, 여러분은 이 중에 하나를 선택하여 암호화할 수 있습니다. 이 옵션이 비활성화"
+"되면, 응용프로그램은 유효한 키가 없을 때나 여러개를 사용할 수 있을 때에만 목"
+"록을 보여주게 됩니다."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "편지쓰기 창만 열기"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "가능한 시점에 메시지를 자동으로 암호화(&M)"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "주어진 메시지 파일 보기"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"이 옵션이 활성화되면, 여러분이 보내는 모든 메시지는 여러분이 원할 때 혹은 가"
+"능한 어느 시점에 암호화됩니다. 물론 각각의 메시지별로 암호화를 선택하지 않을 "
+"수도 있습니다."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "수신인 주소로 메일 보내고, 첨부파일을 인터넷 주소로 보내기"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "임시 보관함에 저장할 때 서명/암호화 하지 않기(&V)"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "읽기"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "오래됨"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "일반"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "삭제됨"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "회신(&R)"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "회신함"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "모두에게 응답(&A)..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "전달됨"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "전달(&F)"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "대기상태"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "단축키"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "보냈음"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "보았음"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "디렉터리 내용(&F):"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "무시됨"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "스팸"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "디렉터리 설정"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "할일"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "메일링 리스트가 있는 디렉터리(&M)"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "첨부파일 있음"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "주소 목록(&A) :"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "일반(&O) :"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "읽지않음(&E) :"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "메시지 만료"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "만료 기한(&X) :"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "읽은 메시지 만료(&R)"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "만료 기한(&F)"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "읽지 않은 메시지 만료(&U)"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "일"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "주"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "달"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "고급 옵션"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "보내는 사람 인증(&Y) :"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "저장소 형식(&S)"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "목록 보이기(&L) :"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "메일검사 대기열의 메일을 보내기"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>여기서 KMail이 보낼편지함과 메일검사중인 모든 메일을 보내도록 하거나, "
+"모든 메시지를 한번에 보내지 않도록 결정할 수 있습니다.</p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: util.h:208
-#, fuzzy
+#: kmail.kcfg:73
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "이미 %1 파일이 있습니다. 기존 파일을 이 파일로 바꾸시겠습니까?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
 
-#: util.h:210
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "디렉터리 선택창의 가장 최근에 선택된 디렉터리"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "시스템 트레이 아이콘 사용정책"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "자세한 새 메일 알림방법"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"이 옵션을 선택하시면, 각 디렉터리에 새로운 메시지가 도착할 때마다 새로운 메일"
+"이 왔음을 자세한 정보를 통해 알립니다. 선택하지 않으시면 간단한 정보를 보여주"
+"며 새 메일이 왔음을 알리게 됩니다."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "지정된 편집기(&D) :"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "편지쓰기 대신 외부 편집기를 사용함(&X)"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "그룹웨어 기능 사용"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "보낸사람:/받는사람: 헤더를 초대에 대한 답글에 따라 변경"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"마이크로소프트 아웃룩은 자제 내장된 ICalender의 기능을 사용하기 위해 수많은 "
+"단축키들을 가지는데 이 옵션은 이것과 비슷합니다. 만약 여러분이 여러분의 회신"
+"을 받아볼 수 없는 등, 아웃룩 사용자와 의사소통에 문제가 있다면, 이 옵션을 설"
+"정해 보세요."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "메일 본문에 그룹웨어 초대문 넣어 보내기"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"마이크로소프트 아웃룩은 자제 내장된 ICalender의 기능을 사용하기 위해 수많은 "
+"단축키들을 가지는데 이 옵션은 이것과 비슷합니다. 만약 여러분이 여러분의 회신"
+"을 받아볼 수 없는 등, 아웃룩 사용자와 의사소통에 문제가 있다면, 이 옵션을 설"
+"정해 보세요."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "자동으로 초대장 보냄"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"이 옵션을 선택하시면, 여러분은 편지쓰기를 실행시키지 않고서 모든 초대장을 자"
+"동으로 보내실 수 있습니다. 만약 여러분이 메일을 보내기 전에 그 내용을 확인하"
+"고자 핫니다면, 이 옵션을 선택하지 마세요. iCalendar 구문으로 쓰인 텍스트 편지"
+"쓰기 창에서는 여러분은 모든 항목을 수동으로 수정하셔야 합니다."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>이 옵션을 활성화하면, KOrganizer나 K주소록, KNotes등의 Kontact응용프로그램"
+"의 항목들을 저장하실 수 있습니다. </p> <p>이 옵션을 선택하시려면, TDE제어판에"
+"서 각 응용프로그램들이 IMAP리소스를 사용할 수 있도록 설정하셔야 합니다.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>일반적으로 여러분은 어떤 이유로든지 간에 디렉터리를 볼 때 IMAP 리소스를 사"
+"용하지 않도록 설정했을 것입니다. 하지만 만약 여러분이 IMAP리소스를 사용하여 "
+"디렉터리를 보고 싶다면, 이곳에서 설정하세요.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>그룹웨어 디렉터리의 저장 형식을 선택하세요. <ul><li>기본형식은 ical(달력디"
+"렉터리용)이나 vcard(주소록 디렉터리용)입니다. 이 형식은 모든 Kontact요소들을 "
+"사용할 수 있도록 해줍니다.</li> <li>Kolab XML형식은 한사람만 사용하는 아웃룩"
+"에 적합한 모델입니다. 이 형식은 Kolab서버에 호환되는 솔루션을 사용할 때 아웃"
+"룩의 호환성을 더 높여줍니다.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>IMAP리소스 디렉터리의 상위를 선택합니다.</p> <p>기본적으로 Kolab서버는 "
+"IMAP 받은편지함을 상위디렉터리로 설정합니다.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>IMAP리소스 디렉터리에 고정된 계정의 아이디를 설정합니다.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>여러분의 지역언어로 IMAP 저장 디렉터리의 이름을 설정하고 싶다면, 가능한 언"
+"어목록에서 선택하실 수 있습니다.</p> <p>마이크로소프트 아웃룩과의 호환성을 해"
+"치기 때문에 권장하지 않습니다. 일단 선택하게 되면 언어를 다시 바꿀수는 없습니"
+"다.</p> <p>반드시 필요한 것이 아니라면, 이 옵션을 선택하지 않기 바랍니다.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "KMail 소개를 보여줄지 말지를 결정하는 값입니다."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "호스트에 연결될 최대 접속수"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"새로운 메일을 확인하는 동안 호스트에 연결될 최대 접속수를 제한합니다. 기본적"
+"으로 접속수제한은 없습니다.(0)"
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "빠른 검색 줄 편집 보이기"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"이 옵션을 통해 메시지 목록에서 정보를 빠르게 검색하기 위한 검색 줄 편집을 메"
+"시지 목록위에 위치시키거나 해제할 수 있습니다. "
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "회신하거나 전달할 때 원래 문자셋 유지(가능한 경우)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "서명을 자동으로 가져옴(&U)"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"여기서 설정하는 값들은 다음 편지쓰기 창에서 적용됩니다.\n"
+"......."
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"여기서 설정한 보내는 항목에 대한 디렉터리 설정들은 다음 편지쓰기 창에서 적용"
+"됩니다."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "여기서 설정된 메일 교환 설정값들은 다음 편지쓰기창에서 적용됩니다."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"여기서 설정하는 값들은 다음 편지쓰기 창에서 적용됩니다.\n"
+"......."
+
+#: kmail.kcfg:354
+#, fuzzy, no-c-format
+msgid "Word &wrap at column:"
+msgstr "열의 단어를 감쌈 :"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "수신인 편집기의 최대줄 수 "
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"아웃룩(tm)에서 첨부파일의 이름을 인식하도록 합니다. (비 영어 문자 포함)"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "요청 알림 메시지들을 자동으로 정렬(&M)"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Use recent addresses for autocompletion"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "자동 저장 간격 :"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"편지쓰기 창의 텍스트를 정기적으로 백업합니다. 백업을 만들기 위한 저장 간격을 "
+"여기서 설정합니다. 값을 0으로 주시게 되면, 이 옵션을 해제하는 것과 같은 효과"
+"를 가집니다."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "\"회신\"으로 인식된 경로 대체(&I)"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "\"전달\"로 인식된 경로 대체(&I)"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "smart quoting 사용(&Q)"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "서명이 만료되었습니다."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "주소 선택기 형식"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr "받는 사람, 참조, 숨은참조의 수신인을 선택하기 위한 대화창 설정."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "수신인 편집기 형식"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "받는 사람, 참조, 숨은참조의 수신인을 선택하기 위한 대화창 설정."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "수신인 편집기의 최대줄 수 "
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "회신하거나 전달할 때 원래 문자셋 유지(가능한 경우)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"이 항목들을 자동으로 생성하는 종류의 어떤 이메일은 이 항목들을 표시하기 위한 "
+"문자 인코딩 값을 지정하지 않습니다. 이러한 경우에 문자 인코딩이 실패한 경우"
+"는 여기서 설정한 인코딩을 참조하여 작업을 수행합니다. 여기서 설정하는 문자 인"
+"코딩은 여러분의 지역언어에서 가장 많이 쓰이는 인코딩으로 설정하시기 바랍니"
+"다. 기본설정은 여러분의 시스템에서 사용하는 그대로 설정됩니다."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"기본설정인 자동을 변경하게 되면 모든 메시지와 이메일등에 지정된 대로의 인코"
+"딩 작업을 수행합니다."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"이 옵션을 사용하여 :-)와 같은 스마일 표시들이 이모티콘으로 변경되어 표시됩니"
+"다."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatic collapse level:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reduce font size for quoted text"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Enable this option to show quoted text with a smaller font."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "보낸 메시지를 암호화하여 저장(&P)"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "스팸 상태 보기(&P)"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "메일 수신 알림"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "메시지 목록 - 새로운 메시지"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "메일을 전달되지 않은 상태로 표시(&F)"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "인용문자 추가(&Q)"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "파일 편집(&F)"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "편집..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "이동(&G)"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "디렉터리(&O)"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "메시지(&M)"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "전달(&F)"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "글꼴 설정 리셋"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML 도구모음"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "일반 옵션"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML 도구모음"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "CRLs를 사용하여 인증서 확인"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr "이 옵션을 선택하시면, S/MIME 인증서를 CRLs를 이용하여 확인합니다."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "온라인(OCSP)로 인증서 확인"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"이 옵션을 선택하시면, S/MIME 인증서를 OCSP(Online Certificates Status "
+"Protocol)을 통해 확인하게 됩니다. 아래에 OCSP의 주소를 넣으세요."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "온라인 인증서 확인"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP 주소 :"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"인증서를 온라인으로 확인하기 위한 서버 주소를 입력하세요.(OCSP responder) 주"
+"소는 http://로 시작합니다."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP 서명 :"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "인증서의 서비스 주소를 무시"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "인증서 정책을 검사하지 않음."
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"기본적으로 GnuPG는 ~/.gnupg/policies.txt 에 기술한 정책에 따라 인증서의 정책"
+"을 승인합니다. 이 옵션을 선택하시면, 정책을 검사하지 않습니다."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "CRL을 참조하지 않음."
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"이 옵션을 선택하시면, S/MIME 인증서를 확인하는데 CRL을 참조하지 않습니다."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "인증서에 미진한 부분 추가"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"이 옵션을 선택하시면, 필요하다면 인증서에서 문제가 되는 부분을 붙일 수 있습니"
+"다.(CRLs와 OSCP를 이용하여 이 작업을 수행합니다.)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP 요청"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "어떤 HTTP 요청도 승인하지 않음."
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "S/MIME을 위한 HTTP설정 사용하지 않음."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP요청에 대해 이 프록시 사용"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "시스템의 HTTP 프록시 사용"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"이 옵션을 선택하시면, HTTP 프록시 값(http_proxy에서 정의된 값들)이 오른쪽에 "
+"보이는데, HTTP요청을 처리하기 위해 하나를 선택하실 수 있습니다."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"S/MIME에 연계된 HTTP 요청을 처리하기 위한, 여러분의 HTTP 프록시서버 위치를 입"
+"력하세요. 호스트의 포트는 myproxy.nowhere.com:3128과 같은 형식으로 지정하실 "
+"수 있습니다."
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "HTTP CRL 인증서 배포지점 무시"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL의 위치를 찾을 때 지정된 주소에 접근할 수 있는 방법을 설명하는 주소, 일반"
+"적으로 \"CRL 배포지점\"(DP)로 알려진 항목을 인증서가 포함하고 있는지 테스트하"
+"게 됩니다. 첫번째로 찾아낸 DP 항목을 사용합니다. 이 옵션을 사용하시면, 정확"
+"한 DP를 찾기 위한 작업을 할 때 모든 항목은 HTTP구성을 사용하게 됩니다."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP 요청"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "LDAP 요청을 승인하지 않습니다."
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "S/MIME을 위한 LDAP 요청을 사용하지 않습니다."
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "LDAP CRL 인증서 배포지점 무시"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"CRL의 위치를 찾을 때 지정된 주소에 접근할 수 있는 방법을 설명하는 주소, 일반"
+"적으로 \"CRL 배포지점\"(DP)로 알려진 항목을 인증서가 포함하고 있는지 테스트하"
+"게 됩니다. 첫번째로 찾아낸 DP 항목을 사용합니다. 이 옵션을 사용하시면, 정확"
+"한 DP를 찾기 위한 작업을 할 때 모든 항목은 LDAP구성을 사용하게 됩니다."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP요청을 위한 첫번째 호스트 :"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"모든 LDAP요청을 가장 먼저 처리하기 위한 LDAP 서버를 입력하세요. 보다 정확하"
+"게, 이 설정은 LDAP 주소에 지정되어 있는 호스트와 포트정보를 덮어쓰게 되며, 호"
+"스트와 포트정보를 생략합니다. 다른 LDAP서버는 오직 \"프록시\"에 접속하는데 실"
+"패했을 때만 이 설정을 사용하게 됩니다. \n"
+"문장은 \"호스트\"나 \"호스트:포트\"로 구성됩니다. 만약 포트가 생략되면, 일반"
+"적인 LDAP 포트인 389포트를 사용하게 됩니다."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "추가(&A)..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "그룹웨어(&G)"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "글꼴 설정 리셋"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "제한 없음"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "서명 설정"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "보낸 사람에게 회신(&N):"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "전달된 메일"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "서명되지 않은 메시지를 보낼 때마다 경고(&U)"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "서명되지 않은 메시지를 보낼 때마다 경고하게 하려면 선택하세요."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>서명되지 않은 메시지를 보낼 때마다 경고</h1>\n"
+"이 옵션을 선택하시면, 여러분은 여러분이 서명되지 않은 메시지, 혹은 서명되지 "
+"않은 부분을 포함하는 메시지를 보내려고 할 때마다 경고를 보여주게 됩니다.\n"
+"<p>\n"
+"최대한의 보안을 위해 이 옵션은 선택하시는 것을 권장합니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "암호화되지 않은 메시지를 보내고자 할 때 경고(&W)"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"암호화되지 않은 메시지를 보내려고 할 때 경고하게끔 하시려면 이 옵션을 선택하"
+"세요."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>암호화되지 않은 메시지를 보내고자 할 때 경고</h1>\n"
+"이 옵션을 선택하시면 여러분이 암호화되지 않은 메시지, 혹은 암호화되지 않은 부"
+"분을 보내려고 할 때마다 경고를 하게 됩니다.\n"
+"<p>\n"
+"최대한의 보안을 위해 이 옵션을 선택하시는 것을 권장합니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "인증서에 수신자의 이메일 주소가 없을 때 경고(&R)"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "메일 주소가 인증되지 않았을 때 경고합니다."
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>수신인 메일 주소가 인증되지 않았을 때 경고</h1>\n"
+"이 옵션을 선택하시면, 암호화를 위한 인증서에 수신인 메일 주소가 없을 경우 경"
+"고를 띄우게 됩니다.\n"
+"<p>\n"
+"최대한의 보안을 위해 이 옵션을 선택하는 것을 권장합니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "인증서나 키의 만료가 가까웠을 때 경고(아래의 설정에서 시작)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "서명"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "암호화"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "여기에서 기간을 설정하세요."
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>서명 인증서가 만료되기 전에 경고</h1>\n"
+"서명인증서가 만료되기 몇일 전부터 경고를 할 것인지 설정하세요.\n"
+"<p>\n"
+"SPHINX에서 권장하는 설정은 14일입니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>암호화 인증서 만료 경고</h1>\n"
+"여기서 최소한의 날짜를 선택하게 되면, 그 날짜만큼 만료가 다가오는 암호화 인증"
+"서는 사용할 수 없게 됩니다.\n"
+"<p>\n"
+"SPHINX에서 권장하는 설정은 14일입니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>인증서 체인 만료 경고하기</h1>\n"
+"체인안의 모든 인증서에 대한 유효성관련 경고를 할 최소 기한을 정해주세요.\n"
+"<p>\n"
+"SPHINX에서 권장하는 기간은 14일입니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>CA 인증서가 만료되기 전에 경고</h1>\n"
+"CA인증서가 만료되기 몇일 전부터 경고를 할 것인지 설정하세요.\n"
+"<p>\n"
+"SPHINX가 권장하는 설정은 14일입니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>root 인증서가 만료되기 전에 경고</h1>\n"
+"root인증서가 만료되기 몇일 전부터 경고를 할 것인지 설정하세요.\n"
+"<p>\n"
+"SPHINX가 권장하는 설정은 14일입니다.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "root 인증서 :"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "중개 CA 인증서 :"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "최종사용자 인증서/키 :"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "모든 \"다시 묻지 않기\" 경로를 재활성화"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...각각 왼쪽과 오른쪽 화살표 키를 사용함으로써 이전 메시지와 다음\n"
+"메시지로 이동할 수 있습니다.</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...<em>도구-&gt;필터&nbsp;생성</em>으로 전송자, 수취인, 제목과\n"
+"메일 목록을 빠르게 생성할 수 있습니다.</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...<em>헤더 덮어쓰기</em> 필터 동작을 사용함으로써 몇몇 메일 \n"
+"목록의 제목에 '[mailing list name]'을 추가하는 것을 포기할 수 있\n"
+"습니다. 다음을 사용하기만 하면 됩니다.\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
 #, fuzzy
-msgid "Overwrite File?"
-msgstr "덮어쓰기(&O)"
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p><em>디렉터리-&gt;속성</em> 대화상자에서 디렉터리와 함께 메일\n"
+"목록을 결합시킬 수 있습니다. 메일 목록 주소 설정을 콤포저로 열기 위해\n"
+"<em>메시지-&gt;새&nbsp;메시지-&gt;메일&nbsp;목록...</em>을 사용할 수 \n"
+"있습니다. 그 외에 디렉터리에 마우스 가운데 클릭을 할 수도 있습니다.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>각 디렉터리에 대해 개인적으로 아이콘을 설정하실 수 있습니다.\n"
+"<em>디렉터리-&gt;속성</em>을 보십시오.</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...KMail은 현재 나타나는 (순수 text/HTML/OpenPGP) 메시지의 종류를\n"
+"나타내는 색상 막대를 보여줄 수 있습니다.</p>\n"
+"<p>KMail의 서명 상태 프레임을 속이는 HTML 메일을 보냄으로써 속이기 \n"
+"위한 방해 시도가 성공적으로 KMail의 서명 상태 프레임을 서명 인증되도록 합니"
+"다.\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...어떤 헤더에서 검색 규칙의 첫번째 편집 영역에 그 이름을 입력하는\n"
+"것으로도 필터링 할 수 있습니다.</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p><pre>&quot;text/html&quot;을 포함하는 &quot;Content-type&quot;</pre>\n"
+"으로 메시지만 HTML 필터링 할 수 있습니다.\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...답신을 보낼 때, 메시지의 선택된 부분만 인용됩니까?</p>\n"
+"<p>만약 아무것도 선택하지 않았다면, 전체 메시지가 인용됩니다.</p>\n"
+"<em>보기-&gt;첨부파일-&gt;인라인</em> 이 선택되었을 때, 이것\n"
+"또한 첨부된 텍스트와 동작합니다.</p>\n"
+"<p>이 요소는 모든 답신 명령에 사용가능합니다.\n"
+"<p><em>메시지-&gt;인용없이 답신</em>만 제외하고, 이 요소는 모든 \n"
+"답신 명령에 사용가능합니다.</p>\n"
+"<p align=\"right\"><em>David F. Newman에 의해 기고되었습니다.</p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
diff --git a/tde-i18n-lt/messages/tdepim/kmail.po b/tde-i18n-lt/messages/tdepim/kmail.po
index 72f98815a5e..d909fd7889f 100644
--- a/tde-i18n-lt/messages/tdepim/kmail.po
+++ b/tde-i18n-lt/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-08-29 14:49+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -24,16 +24,16 @@ msgstr ""
 "X-Poedit-Language: Lithuanian\n"
 "X-Poedit-Country: LITHUANIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Eugenijus Paulauskas,Ričardas Čepas,Donatas Glodenis,Donatas Glodenis"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -180,6 +180,12 @@ msgstr "Ni&eko (naudoti atsargiai)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Pusiau automatinio resursų tvarkymo paskyra"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Išvalyti atmintį"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -256,12 +262,12 @@ msgstr "&Registracijos vardas:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Jūsų Interneto paslaugų tiekėjas suteikia jums <em>naudotojo vardą</em>"
-", kuris yra naudojamas identifikuoti jus savo serveriuose. Dažnai jis yra "
+"Jūsų Interneto paslaugų tiekėjas suteikia jums <em>naudotojo vardą</em>, "
+"kuris yra naudojamas identifikuoti jus savo serveriuose. Dažnai jis yra "
 "pirmoji Jūsų e. pašto adreso dalis (dalis iki <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -283,20 +289,20 @@ msgstr "Išsa&ugoti POP slaptažodį"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Pažymėkite šią parinktį, jei norite, kad KMail įrašytų slaptažodį. \n"
-" Jei veikia TDE slaptažodinė, slaptažodis bus saugomas joje, nes taip yra daug "
-"saugiau. \n"
+" Jei veikia TDE slaptažodinė, slaptažodis bus saugomas joje, nes taip yra "
+"daug saugiau. \n"
 "Jei TDE slaptažodinė nepaleista, slaptažodis bus saugojamas KMail "
 "konfigūracijos byloje klaidinančiu formatu, tačiau tai neturėtų būti laikoma "
-"dalyku, apsaugančiu nuo dešifravimo bandymu tuo atveju, kai gaunamas priėjimas "
-"prie konfigūracijos bylos."
+"dalyku, apsaugančiu nuo dešifravimo bandymu tuo atveju, kai gaunamas "
+"priėjimas prie konfigūracijos bylos."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -324,12 +330,13 @@ msgstr "&Filtruoti laiškus, jeigu jie yra didesni, nei"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Jeigu Jūs pažymėsite šitą parinktį, POP filtrai nuspręs ką daryti su laiškais. "
-"Po to Jūs galėsite nurodyti juos atsiųsti, ištrinti arba palikti juos "
-"serveryje."
+"Jeigu Jūs pažymėsite šitą parinktį, POP filtrai nuspręs ką daryti su "
+"laiškais. Po to Jūs galėsite nurodyti juos atsiųsti, ištrinti arba palikti "
+"juos serveryje."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -378,13 +385,15 @@ msgstr "&Atviru tekstu"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -427,14 +436,14 @@ msgstr "Vardų zona:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Čia galite nustatyti kitokią vardų zoną, kurią palaiko Jūsų IMAP serveris. "
 "Kiekviena vardų sritis nurodo priešdėlį, kuris skiria aplankų grupes. Vardų "
-"zona leidžia KMail rodyti Jūsų asmeninius aplankus ir bendro naudojimo aplankus "
-"vienoje paskyroje."
+"zona leidžia KMail rodyti Jūsų asmeninius aplankus ir bendro naudojimo "
+"aplankus vienoje paskyroje."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -493,13 +502,13 @@ msgstr "Įkelti &priedus taip nurodžius"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Įjunkite šią parinktį norėdami, kad priedai būtų įkeliami ne automatiškai, "
-"pažymėjus e. pašto laišką, bet tik tada, kai spragteli priedo ženklelį. Įjungus "
-"šią parinktį ir dideli e. pašto laiškai bus rodomos iškart."
+"pažymėjus e. pašto laišką, bet tik tada, kai spragteli priedo ženklelį. "
+"Įjungus šią parinktį ir dideli e. pašto laiškai bus rodomos iškart."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -511,8 +520,8 @@ msgid ""
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
 "Tik tuose aplankuose, kurie yra atverti (išskleisti) aplankų medžio "
-"struktūroje, bus ieškoma paaplankių. Naudokite šią parinktį jei serveryje yra "
-"daug aplankų."
+"struktūroje, bus ieškoma paaplankių. Naudokite šią parinktį jei serveryje "
+"yra daug aplankų."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -540,7 +549,7 @@ msgstr "<nėra>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "gaunami"
 
@@ -548,11 +557,11 @@ msgstr "gaunami"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Atrodo, kad serveris nepalaiko unikalių laiškų numerių, tačiau būtent to reikia "
-"norint palikti laiškus serveryje.\n"
+"Atrodo, kad serveris nepalaiko unikalių laiškų numerių, tačiau būtent to "
+"reikia norint palikti laiškus serveryje.\n"
 "Kadangi kai kurie serveriai automatiškai nepraneša apie savo galimybes, jums "
 "visgi gali pavykti įjungti parsisiųstų laiškų palikimo serveryje parinktį."
 
@@ -560,31 +569,32 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Atrodo, kad serveris nepalaiko tik laiškų antraščių parsiuntimo, tačiau būtent "
-"to reikia norint filtruoti laiškus serveryje.\n"
+"Atrodo, kad serveris nepalaiko tik laiškų antraščių parsiuntimo, tačiau "
+"būtent to reikia norint filtruoti laiškus serveryje.\n"
 "Kadangi kai kurie serveriai automatiškai nepraneša apie savo galimybes, jums "
 "visgi gali pavykti įjungti laiškų filtravimo serveryje parinktį."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Atminkite, kad, įjungus šią savybę, kai kurie POP3 serveriai, nepalaikantys "
 "„pipelining“, gali atsiųsti sugadintus laiškus;\n"
-"Tai yra konfigūruojamas dalykas, nes kai kurie serveriai palaiko „pipelining“, "
-"bet neanonsuoja šios galimybės. Norėdami patikrinti ar Jūsų POP3 serveris "
-"anonsuoja „pipelining“ palaikymą, spragtelėkite „Tikrinti, ką palaiko serveris“ "
-"mygtuką dialogo apačioje;\n"
+"Tai yra konfigūruojamas dalykas, nes kai kurie serveriai palaiko "
+"„pipelining“, bet neanonsuoja šios galimybės. Norėdami patikrinti ar Jūsų "
+"POP3 serveris anonsuoja „pipelining“ palaikymą, spragtelėkite „Tikrinti, ką "
+"palaiko serveris“ mygtuką dialogo apačioje;\n"
 "Jeigu Jūsų serveris to neanonsuoja, bet norite turėti didesnį greitį, nei "
 "turite, iš pradžių atlikite bandymą: pasiųskite sau pačiam paketą laiškų ir "
 "juos pasiimkite."
@@ -592,37 +602,39 @@ msgstr ""
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
 msgstr ""
-"Prašome visų pirma nurodyti serverį ir prievadą „Bendrųjų“ parinkčių kortelėje."
+"Prašome visų pirma nurodyti serverį ir prievadą „Bendrųjų“ parinkčių "
+"kortelėje."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Atrodo, kad serveris nepalaiko „pipelining“; todėl ši parinktis yra išjungta.\n"
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Atrodo, kad serveris nepalaiko „pipelining“; todėl ši parinktis yra "
+"išjungta.\n"
 "Kai kurie serveriai ne visada teisingai praneša savo galimybes, tad Jūs dar "
-"turite galimybę bandyti įjungti „pipelining“.Tačiau atkreipkite dėmesį, kad dėl "
-"tokio bandymo kai kurie POP serveriai, nepalaikantys „pipelining“, gali siųsti "
-"sugadintus laiškus. Taigi, prieš naudodami šią parinktį svarbiems laiškams, "
-"galite visų pirma padaryti bandymą pasiųsdami sau didesnį kiekį bandomųjų "
-"laiškų, kuriuos po to vienu metu parsisiųskite iš POP serverio."
+"turite galimybę bandyti įjungti „pipelining“.Tačiau atkreipkite dėmesį, kad "
+"dėl tokio bandymo kai kurie POP serveriai, nepalaikantys „pipelining“, gali "
+"siųsti sugadintus laiškus. Taigi, prieš naudodami šią parinktį svarbiems "
+"laiškams, galite visų pirma padaryti bandymą pasiųsdami sau didesnį kiekį "
+"bandomųjų laiškų, kuriuos po to vienu metu parsisiųskite iš POP serverio."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Atrodo, kad serveris nepalaiko unikalių laiškų numerių, tačiau būtent to reikia "
-"norint palikti laiškus serveryje; taigi, ši parinktis buvo išjungta.\n"
+"Atrodo, kad serveris nepalaiko unikalių laiškų numerių, tačiau būtent to "
+"reikia norint palikti laiškus serveryje; taigi, ši parinktis buvo išjungta.\n"
 "Kadangi kai kurie serveriai automatiškai nepraneša apie savo galimybes, jums "
 "visgi gali pavykti įjungti laiškų palikimo serveryje parinktį."
 
@@ -631,12 +643,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Atrodo, kad serveris nepalaiko tik laiškų antraščių parsiuntimo, tačiau būtent "
-"to reikia norint filtruoti laiškus serveryje; taigi, ši parinktis buvo "
-"išjungta.\n"
+"Atrodo, kad serveris nepalaiko tik laiškų antraščių parsiuntimo, tačiau "
+"būtent to reikia norint filtruoti laiškus serveryje; taigi, ši parinktis "
+"buvo išjungta.\n"
 "Kadangi kai kurie serveriai automatiškai nepraneša apie savo galimybes, jums "
 "visgi gali pavykti įjungti laiškų filtravimo serveryje parinktį."
 
@@ -721,8 +733,8 @@ msgstr "IMAP paskyra"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Pagal nustatytą tvarką, norint pasiimti laiškus, reikia įdėti paskyrą tinklo "
 "skyriuje."
@@ -761,13 +773,13 @@ msgstr "Jus sveikina KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>KMail greičiausiai paleidžiate pirmą kartą. Šio vedlio padedami galite "
-"nustatyti savo pašto dėžutes. Tiesiog įrašykite prisijungimo informaciją, kurią "
-"gavote iš e. pašto paslaugų teikėjo, šiuose puslapiuose.</qt>"
+"nustatyti savo pašto dėžutes. Tiesiog įrašykite prisijungimo informaciją, "
+"kurią gavote iš e. pašto paslaugų teikėjo, šiuose puslapiuose.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -829,8 +841,7 @@ msgstr "Naudoti pristatymą vietoje"
 msgid "Server Information"
 msgstr "Serverio informacija"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nieko"
@@ -945,13 +956,13 @@ msgstr "<br>Laiškai, laikomi šlamštu, perkeliami į aplanką <i>"
 #: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr ""
-"<br>"
-"<br>Laiškai, laikomi šlamštu, nėra perkeliami į kokį nors aplanką.</p>"
+"<br><br>Laiškai, laikomi šlamštu, nėra perkeliami į kokį nors aplanką.</p>"
 
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>Aplankas laiškams, kurie yra neaiškaus pobūdžio (gal būt - šlamštas) yra <i>"
+"<p>Aplankas laiškams, kurie yra neaiškaus pobūdžio (gal būt - šlamštas) yra "
+"<i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -971,28 +982,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Čia galite ieškoti pagalbos norėdami sukurti KMail filtrų taisykles "
-"naudojant gerai žinomus virusų naikinimo įrankius.</p>"
-"<p>Vedlys gali rasti tuos įrankius Jūsų kompiuteryje ir sukurti filtravimo "
-"taisykles, siekiant suskirstyti laiškus panaudojant šiuos įrankius ir išskirti "
-"laiškus, turinčius virusų. Vedlys nekreips dėmesio į jau egzistuojančius "
-"filtrus, jis tiesiog papildys taisyklių sąrašą.</p>"
-"<p><b>Perspėjimas:</b>Paleidus virusų paieškos filtrus KMail yra užblokuojamas, "
-"ir, kadangi ši operacija paprastai užtrunka, KMail kurį laiką gali nereaguoti į "
-"Jūsų veiksmus. Norėdami susigrąžinti įprastą KMail elgesį, apsvarstykite "
-"galimybę ištrinti vedlio sukurtus filtrus."
+"naudojant gerai žinomus virusų naikinimo įrankius.</p><p>Vedlys gali rasti "
+"tuos įrankius Jūsų kompiuteryje ir sukurti filtravimo taisykles, siekiant "
+"suskirstyti laiškus panaudojant šiuos įrankius ir išskirti laiškus, "
+"turinčius virusų. Vedlys nekreips dėmesio į jau egzistuojančius filtrus, jis "
+"tiesiog papildys taisyklių sąrašą.</p><p><b>Perspėjimas:</b>Paleidus virusų "
+"paieškos filtrus KMail yra užblokuojamas, ir, kadangi ši operacija paprastai "
+"užtrunka, KMail kurį laiką gali nereaguoti į Jūsų veiksmus. Norėdami "
+"susigrąžinti įprastą KMail elgesį, apsvarstykite galimybę ištrinti vedlio "
+"sukurtus filtrus."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -1000,8 +1010,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Prašome pasirinkti įrankius, kurie bus naudojami šlamšto aptikimui, ir eiti "
-"į kitą puslapį.</p>"
+"<p>Prašome pasirinkti įrankius, kurie bus naudojami šlamšto aptikimui, ir "
+"eiti į kitą puslapį.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1029,15 +1039,14 @@ msgstr "Perkelti laiškus, laikomus &potencialiai šlamštu, į:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Numatytasis aplankas yra gautų laiškų aplankas, tačiau apačioje esančioje "
-"aplankų peržiūroje galite tai pakeisti."
-"<p>Ne visi įrankiai gali klasifikuoti laiškus kaip galimai šlamštą. Jei "
-"naudojate šios galimybės neturintį įrankį, negalėsite pasirinkti ir aplanko."
+"aplankų peržiūroje galite tai pakeisti.<p>Ne visi įrankiai gali klasifikuoti "
+"laiškus kaip galimai šlamštą. Jei naudojate šios galimybės neturintį įrankį, "
+"negalėsite pasirinkti ir aplanko."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1047,12 +1056,13 @@ msgstr "Skirstyti laiškus naudojant virusų naikinimo įrankius"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Leisti virusų naikinimo įrankiams patikrinti Jūsų laiškus. Vedlys sukurs tam "
-"reikalingus filtrus. Šie įrankiai pažymi laiškus, kad kiti filtrai galėtų šiuos "
-"laiškus pastebėti ir, pvz., perkelti virusuotus laiškus į atskirą aplanką."
+"reikalingus filtrus. Šie įrankiai pažymi laiškus, kad kiti filtrai galėtų "
+"šiuos laiškus pastebėti ir, pvz., perkelti virusuotus laiškus į atskirą "
+"aplanką."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1061,12 +1071,12 @@ msgstr "Perkelti aptiktus virusuotus laiškus į pažymėtą aplanką"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Sukurtas filtras, kuris ras laiškus, klasifikuotus kaip virusuotus, ir perkels "
-"juos į tam numatytą aplanką. Numatytas aplankas yra šiukšlių aplankas, tačiau "
-"galite tai pakeisti aplankų rodyme."
+"Sukurtas filtras, kuris ras laiškus, klasifikuotus kaip virusuotus, ir "
+"perkels juos į tam numatytą aplanką. Numatytas aplankas yra šiukšlių "
+"aplankas, tačiau galite tai pakeisti aplankų rodyme."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1074,11 +1084,11 @@ msgstr "Taip pat pažymėti aptiktus virusuotus laiškus skaitytais"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Žymėti laiškus, kurie buvo klasifikuoti kaip virusuoti, skaitytais, ir perkelti "
-"juos į pažymėtą aplanką."
+"Žymėti laiškus, kurie buvo klasifikuoti kaip virusuoti, skaitytais, ir "
+"perkelti juos į pažymėtą aplanką."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1273,8 +1283,8 @@ msgstr "Bandant perskaityti aplanko %1 turinį serveryje įvyko klaida: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1294,8 +1304,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1326,20 +1336,20 @@ msgstr "Pašalintas"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Nei viena iš Jūsų tapatybių neatitinka šio laiško gavėjo, "
-"<br>prašome pasirinkti, kuris iš nurodytų adresų yra Jūsų:"
+"<qt>Nei viena iš Jūsų tapatybių neatitinka šio laiško gavėjo, <br>prašome "
+"pasirinkti, kuris iš nurodytų adresų yra Jūsų:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Nei viena iš Jūsų tapatybių neatitinka šio laiško gavėjo, "
-"<br>prašome pasirinkti, kuris iš nurodytų adresų yra Jūsų:"
+"<qt>Nei viena iš Jūsų tapatybių neatitinka šio laiško gavėjo, <br>prašome "
+"pasirinkti, kuris iš nurodytų adresų yra Jūsų:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1368,18 +1378,21 @@ msgstr "Glaudinant „%1“ įvyko klaida. Glaudinimas nutrauktas."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Šis nustatymas yra nustatytas administratoriaus.</p>"
-"<p>Jei manote, kad tai - klaida, susisiekite su juo.</p></qt>"
+"<qt><p>Šis nustatymas yra nustatytas administratoriaus.</p><p>Jei manote, "
+"kad tai - klaida, susisiekite su juo.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Į&kelti profilį..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Konfigūruoti paskyrą"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Įdėti..."
@@ -1409,6 +1422,11 @@ msgstr "<qt>Ar tikrai norite pašalinti tapatybę <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Šalinti tapatybę"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Pa&šalinti"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Įdėti..."
@@ -1417,6 +1435,11 @@ msgstr "Įdėti..."
 msgid "Modify..."
 msgstr "Keisti..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Pa&šalinti"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Nustatyti numatytuoju"
@@ -1433,17 +1456,15 @@ msgstr "&Siuntimas"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Išsiunčiamų paskyros (įdėkite bent vieną):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Vardas"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipas"
@@ -1465,8 +1486,7 @@ msgstr "Numatytas"
 msgid "Common Options"
 msgstr "Bendros parinktys"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Klausti prieš siunčiant"
@@ -1517,17 +1537,16 @@ msgstr "Numa&tytasis domenas:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Numatytasis domenas yra naudojamas užbaigti e. pašto adresams, kurie turi "
-"tik naudotojų vardus.</p></qt>"
+"<qt><p>Numatytasis domenas yra naudojamas užbaigti e. pašto adresams, kurie "
+"turi tik naudotojų vardus.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1545,9 +1564,9 @@ msgstr "Įdėti transportą"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (numatytoji)"
 
@@ -1632,6 +1651,10 @@ msgstr "Modifikuoti paskyrą"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Nepavyksta rasti paskyros <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Spalvos"
@@ -1740,8 +1763,7 @@ msgstr "Lankyta jungtis"
 msgid "Misspelled Words"
 msgstr "Klaidingas žodis"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Naujas laiškas"
@@ -1930,8 +1952,8 @@ msgstr "Nustatyti numatytą parinktį: gijos užvertos"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Atverti gijas, &turinčias naujų, neskaitytų arba svarbių laiškų, taip pat - "
 "stebimas gijas."
@@ -1942,72 +1964,56 @@ msgstr "Datos rodymas"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Šias išraiškas galima naudoti datai:</strong></p>"
-"<ul>"
-"<li>d - diena, kaip skaičius be priekinio nulio (1-31)</li>"
-"<li>dd - diena, kaip skaičius su priekiniu nuliu (01-31)</li>"
-"<li>ddd - sutrumpintas dienos pavadinimas (Pir - Sek)</li>"
-"<li>dddd - ilgas dienos pavadinimas (Pirmadienis - Sekmadienis)</li>"
-"<li>M - mėnuo, kaip skaičius be priekinio nulio (1-12)</li>"
-"<li>MM - mėnuo, kaip skaičius su priekiniu nuliu (01-12)</li>"
-"<li>MMM - sutrumpintas mėnesio pavadinimas (Sau - Grd)</li>"
-"<li>MMMM - pilnas mėnesio pavadinimas (Sausis - Gruodis)</li>"
-"<li>yy - metai dviem skaitmenimis (00-99)</li>"
-"<li>yyyy - metai keturiais skaitmenimis (0000-9999)</li></ul>"
-"<p><strong>Šias išraiškas galima naudoti laikui:</string></p> "
-"<ul>"
-"<li>h - valandos be priekinio nulio (0-23 arba 1-12, jei rodoma  AM/PM)</li>"
-"<li>hh - valanda su priekiniu nuliu (00-23 arba 01-12 jei rodoma AM/PM)</li>"
-"<li>m - minutės be priekinio nulio (0-59)</li>"
-"<li>mm - minutės su priekiniu nuliu (00-59)</li>"
-"<li>s - sekundės be priekinio nulio (0-59)</li>"
-"<li>ss - sekundės su priekiniu nuliu (00-59)</li>"
-"<li>z - milisekundės be priekinio nulio (0-999)</li>"
-"<li>zzz - milisekundės su priekiniais nuliais (000-999)</li>"
-"<li>AP - perjungti į AM/PM rodymą. AP gali būti pakeisti arba „AM“ arba "
-"„PM“.</li>"
-"<li>ap - perjungti į AM arba PM rodymą. ap bus pakeistas arba „am“ arba "
-"„pm“.</li>"
-"<li>Z - laiko zona skaitinėje formoje (-0500)</li></ul>"
-"<p><strong>Visi kiti įvedami simboliai bus ignoruojami.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Šias išraiškas galima naudoti datai:</strong></p><ul><li>d - "
+"diena, kaip skaičius be priekinio nulio (1-31)</li><li>dd - diena, kaip "
+"skaičius su priekiniu nuliu (01-31)</li><li>ddd - sutrumpintas dienos "
+"pavadinimas (Pir - Sek)</li><li>dddd - ilgas dienos pavadinimas (Pirmadienis "
+"- Sekmadienis)</li><li>M - mėnuo, kaip skaičius be priekinio nulio (1-12)</"
+"li><li>MM - mėnuo, kaip skaičius su priekiniu nuliu (01-12)</li><li>MMM - "
+"sutrumpintas mėnesio pavadinimas (Sau - Grd)</li><li>MMMM - pilnas mėnesio "
+"pavadinimas (Sausis - Gruodis)</li><li>yy - metai dviem skaitmenimis "
+"(00-99)</li><li>yyyy - metai keturiais skaitmenimis (0000-9999)</li></"
+"ul><p><strong>Šias išraiškas galima naudoti laikui:</string></p> <ul><li>h - "
+"valandos be priekinio nulio (0-23 arba 1-12, jei rodoma  AM/PM)</li><li>hh - "
+"valanda su priekiniu nuliu (00-23 arba 01-12 jei rodoma AM/PM)</li><li>m - "
+"minutės be priekinio nulio (0-59)</li><li>mm - minutės su priekiniu nuliu "
+"(00-59)</li><li>s - sekundės be priekinio nulio (0-59)</li><li>ss - sekundės "
+"su priekiniu nuliu (00-59)</li><li>z - milisekundės be priekinio nulio "
+"(0-999)</li><li>zzz - milisekundės su priekiniais nuliais (000-999)</"
+"li><li>AP - perjungti į AM/PM rodymą. AP gali būti pakeisti arba „AM“ arba "
+"„PM“.</li><li>ap - perjungti į AM arba PM rodymą. ap bus pakeistas arba „am“ "
+"arba „pm“.</li><li>Z - laiko zona skaitinėje formoje (-0500)</li></"
+"ul><p><strong>Visi kiti įvedami simboliai bus ignoruojami.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Keičiant bendruosius gijų nustatymus, bus anuliuotos visos aplanko specifinės "
-"reikšmės."
+"Keičiant bendruosius gijų nustatymus, bus anuliuotos visos aplanko "
+"specifinės reikšmės."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2021,8 +2027,7 @@ msgstr "Rodyti HTML &būsenos juostą"
 msgid "Show s&pam status in fancy headers"
 msgstr "Pilnose antraštėse rodyti šla&mšto statusą"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Pakeisti šypsenėles emotikonais"
@@ -2031,8 +2036,7 @@ msgstr "Pakeisti šypsenėles emotikonais"
 msgid "Use smaller font for quoted text"
 msgstr "Cituotam tekstui naudoti smulkesnį šriftą"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Rodyti citatų sutraukimo/išplėtimo žymes"
@@ -2058,8 +2062,7 @@ msgstr "Automatiškai"
 msgid "&Override character encoding:"
 msgstr "&Nepaisyti esamos koduotės:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Įjungti sistemos dėklo ženkliuką"
@@ -2161,23 +2164,19 @@ msgstr "<b>%f</b> bus pakeistas redaguotinos bylos vardu."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Šie pamainymai tinka atsakymų frazėse:"
-"<br><b>%D</b>: data, <b>%S</b>: tema,"
-"<br><b>%e</b>: siuntėjo adresas, <b>%F</b>: siuntėjo vardas, <b>%f</b>"
-": siuntėjo inicialai,"
-"<br><b>%T</b>: gavėjo vardas, <b>%t</b>: gavėjo vardas ir adresas,"
-"<br><b>%C</b>: Kopijų gavėjų vardai, <b>%c</b>: kopijų gavėjų vardai ir "
-"adresai,"
-"<br><b>%%</b>: procento ženklas, <b>%_</b>: erdvė, <b>%L</b>"
-": eilutės pabaiga</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Šie pamainymai tinka atsakymų frazėse:<br><b>%D</b>: data, <b>%S</b>: "
+"tema,<br><b>%e</b>: siuntėjo adresas, <b>%F</b>: siuntėjo vardas, <b>%f</b>: "
+"siuntėjo inicialai,<br><b>%T</b>: gavėjo vardas, <b>%t</b>: gavėjo vardas ir "
+"adresas,<br><b>%C</b>: Kopijų gavėjų vardai, <b>%c</b>: kopijų gavėjų vardai "
+"ir adresai,<br><b>%%</b>: procento ženklas, <b>%_</b>: erdvė, <b>%L</b>: "
+"eilutės pabaiga</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2200,21 +2199,20 @@ msgstr "Atsaky&ti visiems:"
 msgid "&Forward:"
 msgstr "&Persiųsti:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Citatos indikatorius:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D, Jūs rašėte:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D, %F rašė:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Persiųstas laiškas"
 
@@ -2252,8 +2250,8 @@ msgstr "Įrašyti naują persiuntimo priešdėlį:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Šis sąrašas yra peržiūrimas kiekvienam išeinančiam laiškui nuo pradžios iki "
 "galo, ieškant koduotės, turinčios visus reikalingus simbolius."
@@ -2291,10 +2289,9 @@ msgstr "Reikšmė"
 msgid "Ne&w"
 msgstr "Nau&ja"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Vardas:"
@@ -2303,16 +2300,15 @@ msgstr "&Vardas:"
 msgid "&Value:"
 msgstr "&Reikšmė:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Su Outlook suderinami priedų pavadinimai"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Įgalinkite šią parinktį, jei norite, kad Outlook(tm) suprastų priedų vardus, "
 "turinčius ne angliškų simbolių."
@@ -2341,21 +2337,21 @@ msgstr "pridėtas"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"Jūs pasirinkote užšifruoti priedų vardus, turinčius ne-angliškų simbolių, būdu, "
-"suprantamu Outlook(tm) ir kitoms pašto programoms, kurios nepalaiko su "
+"Jūs pasirinkote užšifruoti priedų vardus, turinčius ne-angliškų simbolių, "
+"būdu, suprantamu Outlook(tm) ir kitoms pašto programoms, kurios nepalaiko su "
 "standartais suderintų šifruotų priedų pavadinimų.\n"
-"Atkreipkite dėmesį, kad KMail gali sukurti su standartais nesuderintus laiškus, "
-"kurie, tačiau, gali ir nebūti suprantami su standartais suderintus laiškus "
-"atpažįstančiomis pašto programoms; taigi, šią parinktį įjunkite tik tuo atveju, "
-"jei tikrai neturite kito pasirinkimo."
+"Atkreipkite dėmesį, kad KMail gali sukurti su standartais nesuderintus "
+"laiškus, kurie, tačiau, gali ir nebūti suprantami su standartais suderintus "
+"laiškus atpažįstančiomis pašto programoms; taigi, šią parinktį įjunkite tik "
+"tuo atveju, jei tikrai neturite kito pasirinkimo."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2379,115 +2375,99 @@ msgstr "Šifravimo &programų sąsajos"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Laiškai kartais ateina abiem formatais.  Ši parinktis nustato, ar Jūs "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Laiškai kartais ateina abiem formatais.  Ši parinktis nustato, ar Jūs "
 "norite,  kad būtų rodoma HTML formato dalis, ar paprasto teksto formato "
-"dalis.</p>"
-"<p>HTML dalies rodymas gali pagerinti laiško išvaizdą, bet tuo pačiu metu "
-"padidina riziką, kad bus panaudotos saugumo skylės.</p>"
-"<p>Rodant paprasto teksto dalį prarandamas laiško formatavimas, bet tai padaro "
-"beveik <em>neįmanomu</em> saugumo skylių HTML variklyje (Konqueror) "
-"panaudojimą.</p> "
-"<p>Parinktis žemiau saugo nuo vieno dažno piktnaudžiavimo HTML laiškuose, "
+"dalis.</p><p>HTML dalies rodymas gali pagerinti laiško išvaizdą, bet tuo "
+"pačiu metu padidina riziką, kad bus panaudotos saugumo skylės.</p><p>Rodant "
+"paprasto teksto dalį prarandamas laiško formatavimas, bet tai padaro beveik "
+"<em>neįmanomu</em> saugumo skylių HTML variklyje (Konqueror) panaudojimą.</"
+"p> <p>Parinktis žemiau saugo nuo vieno dažno piktnaudžiavimo HTML laiškuose, "
 "tačiau ji negali apsaugoti nuo saugumo problemų, kurios nebuvo žinomos tuo "
-"metu, kai buvo rašoma ši KMail versija.</p> "
-"<p>Dėl to yra rekomenduojama <em>ne</em>teikti pirmenybės HTML prieš įprastą "
-"tekstą.</p> "
-"<p><b>Pastaba:</b> Jūs galite nustatyti šią parinktį kiekvienam aplankui "
-"atskirai KMail pagrindinio lango <i>Aplanko</i> meniu.</p></qt>"
+"metu, kai buvo rašoma ši KMail versija.</p> <p>Dėl to yra rekomenduojama "
+"<em>ne</em>teikti pirmenybės HTML prieš įprastą tekstą.</p> <p><b>Pastaba:</"
+"b> Jūs galite nustatyti šią parinktį kiekvienam aplankui atskirai KMail "
+"pagrindinio lango <i>Aplanko</i> meniu.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kai kurios pašto reklamos yra HTML formato ir turi jungtis į pvz. "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Kai kurios pašto reklamos yra HTML formato ir turi jungtis į pvz. "
 "paveikslėlius, kuriuos reklamuotojai naudoja tam, kad sužinotų, jog Jūs "
-"perskaitėte laišką („žiniatinklio vabalai“).</p>"
-"<p> Nėra jokios priežasties nurodyti įkelti tokius paveikslėlius iš Interneto, "
-"nes siuntėjas visada gali pridėti reikalingus paveikslėlius tiesiog prie "
-"laiško.</p>"
-"<p> Norint apsisaugoti nuo tokio piktnaudžiavimo KMail HTML rodymu, šios "
-"parinkties numatytasis nustatymas yra <em>išjungti</em>.</p> "
-"<p>Tačiau galite tai įjungti, pvz., norėdami pamatyti paveikslėlius, kurie "
-"nebuvo pridėti prie laiško, tačiau turėtumėte žinoti apie potencialią "
-"problemą.</p></qt>"
+"perskaitėte laišką („žiniatinklio vabalai“).</p><p> Nėra jokios priežasties "
+"nurodyti įkelti tokius paveikslėlius iš Interneto, nes siuntėjas visada gali "
+"pridėti reikalingus paveikslėlius tiesiog prie laiško.</p><p> Norint "
+"apsisaugoti nuo tokio piktnaudžiavimo KMail HTML rodymu, šios parinkties "
+"numatytasis nustatymas yra <em>išjungti</em>.</p> <p>Tačiau galite tai "
+"įjungti, pvz., norėdami pamatyti paveikslėlius, kurie nebuvo pridėti prie "
+"laiško, tačiau turėtumėte žinoti apie potencialią problemą.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Pranešimo apie laiško pristatymą taisyklė</h3>"
-"<p>PLP (pranešimai apie laiško pristatymą) yra tai, kas paprastai vadinama<b>"
-"perskaitymo pranešimu</b>. Laiško autorius prašo pranešimo apie laiško "
-"pristatymą, ir gavėjo e. pašto programa sukuria atsakymą, iš kurio autorius "
-"gali sužinoti, kas nutiko jo laiškui. Paprastai laiško pristatymo pranešimai "
-"įvardinami tipais <b>parodytas</b> (t.y., perskaitytas), <b>ištrintas</b> ir <b>"
-"apdorotas</b> (pvz., persiųstas).</p>"
-"<p>Tai, kaip KMail siunčia PLP, yra nustatoma tokiomis parinktimis:</p>"
-"<ul>"
-"<li><em>Ignoruoti</em>: ignoruoti visus PLP prašymus. Jokie PLP nebus siunčiami "
-"automatiškai (rekomenduojama).</li>"
-"<li><em>Klausiti</em>: atsakyti į PLP prašymus prieš tai paklausus naudotojo "
-"leidimo. Tokiu būdu, galite siųsti PLP dėl pasirinktų laiškų, o kitus prašymus "
-"ignoruoti arba atmesti.</li>"
-"<li><em>Atmesti</em>: visuomet siųsti pranešimą <b>atmesta</b>. Tai - tik <em>"
-"šiek - tiek</em> geriau nei visuomet siųsti PLP. Autorius vis tiek žinos, kad "
-"Jūs kažką su laišku darėte, jis tik nebus tikras, ar laiškas ištrintas, ar "
-"perskaitytas, ir pan.</li>"
-"<li><em>Visuomet siųsti</em>: visuomet siųsti prašomą pranešimą apie laiško "
-"pristatymą. Tai reiškia, kad autorius visada žinos, ar Jūs kažką darėte su "
-"laišku, ir taip pat - ką darėte (perskaitėte, ištrynėte, ir t.t.). Šia "
-"parinktimi naudotis nerekomenduojama, tačiau, kadangi ji gali būti reikalinga, "
-"pvz., ryšių su klientais tikslais, ji yra palikta kaip galimybė.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Pranešimo apie laiško pristatymą taisyklė</h3><p>PLP (pranešimai "
+"apie laiško pristatymą) yra tai, kas paprastai vadinama<b>perskaitymo "
+"pranešimu</b>. Laiško autorius prašo pranešimo apie laiško pristatymą, ir "
+"gavėjo e. pašto programa sukuria atsakymą, iš kurio autorius gali sužinoti, "
+"kas nutiko jo laiškui. Paprastai laiško pristatymo pranešimai įvardinami "
+"tipais <b>parodytas</b> (t.y., perskaitytas), <b>ištrintas</b> ir "
+"<b>apdorotas</b> (pvz., persiųstas).</p><p>Tai, kaip KMail siunčia PLP, yra "
+"nustatoma tokiomis parinktimis:</p><ul><li><em>Ignoruoti</em>: ignoruoti "
+"visus PLP prašymus. Jokie PLP nebus siunčiami automatiškai (rekomenduojama)."
+"</li><li><em>Klausiti</em>: atsakyti į PLP prašymus prieš tai paklausus "
+"naudotojo leidimo. Tokiu būdu, galite siųsti PLP dėl pasirinktų laiškų, o "
+"kitus prašymus ignoruoti arba atmesti.</li><li><em>Atmesti</em>: visuomet "
+"siųsti pranešimą <b>atmesta</b>. Tai - tik <em>šiek - tiek</em> geriau nei "
+"visuomet siųsti PLP. Autorius vis tiek žinos, kad Jūs kažką su laišku "
+"darėte, jis tik nebus tikras, ar laiškas ištrintas, ar perskaitytas, ir pan."
+"</li><li><em>Visuomet siųsti</em>: visuomet siųsti prašomą pranešimą apie "
+"laiško pristatymą. Tai reiškia, kad autorius visada žinos, ar Jūs kažką "
+"darėte su laišku, ir taip pat - ką darėte (perskaitėte, ištrynėte, ir t.t.). "
+"Šia parinktimi naudotis nerekomenduojama, tačiau, kadangi ji gali būti "
+"reikalinga, pvz., ryšių su klientais tikslais, ji yra palikta kaip galimybė."
+"</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2503,15 +2483,15 @@ msgstr "Leisti laiškams įkelti i&šorines nuorodas iš Interneto"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<qt><b>DĖMESIO:</b> Leidžiant e. pašte HTML, gali padidėti Jūsų sistemos "
 "pažeidimo naudojant esamas ir naujai atsiradusias saugumo spragas rizika. <a "
-"href=\"whatsthis:%1\">Plačiau apie HTML paštą...</a> <a href=\"whatsthis:%2\">"
-"Plačiau apie išorines nuorodas...</a>"
+"href=\"whatsthis:%1\">Plačiau apie HTML paštą...</a> <a href=\"whatsthis:"
+"%2\">Plačiau apie išorines nuorodas...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2572,8 +2552,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<qt><b>DĖMESIO:</b> Besąlygiškai grąžinami patvirtinimai mažina Jūsų privatumą. "
-"<a href=\"whatsthis:%1\">Plačiau...</a>"
+"<qt><b>DĖMESIO:</b> Besąlygiškai grąžinami patvirtinimai mažina Jūsų "
+"privatumą. <a href=\"whatsthis:%1\">Plačiau...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2587,15 +2567,14 @@ msgstr "Automatiškai importuoti raktus ir sertifikatus"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Pakeičiant globalius HTML nustatymus, bus anuliuotos visos specifinės aplankų "
-"reikšmės."
+"Pakeičiant globalius HTML nustatymus, bus anuliuotos visos specifinės "
+"aplankų reikšmės."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Šiai parinkčiai reikia dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "be proxy"
@@ -2624,8 +2603,8 @@ msgstr "N&etrinti pasenusių svarbių laiškų"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Ieškant neskaitytų laiškų:"
 
@@ -2649,8 +2628,8 @@ msgstr "Grįžti ieškoti nuo pradžių"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Patekus į aplanką:"
 
@@ -2719,27 +2698,23 @@ msgstr "Aplankai („maildir“ formatas)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Tai parenka numatytąjį pašto dėžučių formatą vietiniams aplankams:</p>"
-"<p><b>mbox:</b> Kiekvieną KMail'o pašto aplanką atitinka viena byla. Atskiri "
-"laiškai atskiriami vienas nuo kito pagal eilutę, prasidedančia „From “.  Tai "
-"taupo vietą diske, bet gali būti ne taip greita, pvz. perkeliant laiškus iš "
-"vieno aplanko į kitą.</p>"
-"<p><b>maildir:</b> Kiekvieną KMail'o pašto aplanką atinką tikras aplankas "
-"diske.  Atskiri laiškai yra atskiros bylos.  Galbūt tai šiek tiek švaisto vietą "
-"diske, bet turėtų būti greičiau pvz. perkeliant laiškus iš vieno aplanko į "
-"kitą.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Tai parenka numatytąjį pašto dėžučių formatą vietiniams aplankams:</"
+"p><p><b>mbox:</b> Kiekvieną KMail'o pašto aplanką atitinka viena byla. "
+"Atskiri laiškai atskiriami vienas nuo kito pagal eilutę, prasidedančia „From "
+"“.  Tai taupo vietą diske, bet gali būti ne taip greita, pvz. perkeliant "
+"laiškus iš vieno aplanko į kitą.</p><p><b>maildir:</b> Kiekvieną KMail'o "
+"pašto aplanką atinką tikras aplankas diske.  Atskiri laiškai yra atskiros "
+"bylos.  Galbūt tai šiek tiek švaisto vietą diske, bet turėtų būti greičiau "
+"pvz. perkeliant laiškus iš vieno aplanko į kitą.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2772,53 +2747,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pereinant į kitą neskaitytą laišką gali atsitikti, kad po esamo laiško nėra "
-"daugiau neskaitytų laiškų.</p>"
-"<p><b>Nepradėti iš naujo:</b> Pažymėjus šią parinktį, paieška prasidės laiškų "
-"sąrašo pradžioje. <b>Ieškoti nuo pradžių dabartiniame aplanke:</b> "
-"paieška bus tęsiama nuo sąrašo pradžios, tačiau nebus ieškoma kituose "
-"aplankuose. <b>Ieškoti visuose aplankuose:</b> Paieška bus tęsiama nuo sąrašo "
-"pradžios. Neradus neskaitytų laiškų, paieška bus tęsiama kitame aplanke.</p>"
-"<p>Panašiai, ieškant ankstenio neskaityto laiško, paieška iš naujo prasidės nuo "
-"laiškų sąrašo galo, ir bus tęsiama į ankstesnį aplanką, žinoma, priklausomai "
-"nuo pažymėtos ši parinkties.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Pereinant į kitą neskaitytą laišką gali atsitikti, kad po esamo "
+"laiško nėra daugiau neskaitytų laiškų.</p><p><b>Nepradėti iš naujo:</b> "
+"Pažymėjus šią parinktį, paieška prasidės laiškų sąrašo pradžioje. <b>Ieškoti "
+"nuo pradžių dabartiniame aplanke:</b> paieška bus tęsiama nuo sąrašo "
+"pradžios, tačiau nebus ieškoma kituose aplankuose. <b>Ieškoti visuose "
+"aplankuose:</b> Paieška bus tęsiama nuo sąrašo pradžios. Neradus neskaitytų "
+"laiškų, paieška bus tęsiama kitame aplanke.</p><p>Panašiai, ieškant "
+"ankstenio neskaityto laiško, paieška iš naujo prasidės nuo laiškų sąrašo "
+"galo, ir bus tęsiama į ankstesnį aplanką, žinoma, priklausomai nuo pažymėtos "
+"ši parinkties.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Viso teksto rodyklės sudarymas leidžia labai greitas laiškų turinio "
-"paieškas. Jei ji bus įjungta, paieškos dialogas veiks labai greitai. Taip pat "
-"ir paieškos įrankių juostos pagalba atliekama paieška galės žymėti laiškus "
-"pagal turinį.</p>"
-"<p>Rodyklė užima šiek tiek vietos diske (maždaug pusę laiškų užimamos "
-"vietos).</p>"
-"<p>Įjungus šią parinktį rodyklės sudarymas bus pradėtas, tačiau ir jos sudarymo "
-"metu toliau galėsite naudoti KMail.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Viso teksto rodyklės sudarymas leidžia labai greitas laiškų turinio "
+"paieškas. Jei ji bus įjungta, paieškos dialogas veiks labai greitai. Taip "
+"pat ir paieškos įrankių juostos pagalba atliekama paieška galės žymėti "
+"laiškus pagal turinį.</p><p>Rodyklė užima šiek tiek vietos diske (maždaug "
+"pusę laiškų užimamos vietos).</p><p>Įjungus šią parinktį rodyklės sudarymas "
+"bus pradėtas, tačiau ir jos sudarymo metu toliau galėsite naudoti KMail.</"
+"p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2886,8 +2853,8 @@ msgstr "S&lėpti grupinio darbo įrangos aplankus"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "Pažymėjus šią parinktį IMAP resursų aplankų aplankų medyje nematysite."
 
 #: configuredialog.cpp:4909
@@ -2896,11 +2863,11 @@ msgstr "&Rodyti tik šios paskyros grupinio darbo aplankus"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Pažymėjus šią parinktį grupiniam darbui sukonfigūruotoje paskyroje nematysite "
-"įprastų pašto aplankų."
+"Pažymėjus šią parinktį grupiniam darbui sukonfigūruotoje paskyroje "
+"nematysite įprastų pašto aplankų."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2956,24 +2923,23 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Microsoft Outlook, naudojamas kartu su Microsoft Exchange serveriu, turi įdą, "
-"neleidžiančią suprasti standartus atitinkančių grupinio darbo el. laiškų. "
-"Įjunkite šią parinktį norėdami užtikrinti, kad Microsoft Exchange supras "
-"grupinio darbo pakvietimus."
+"Microsoft Outlook, naudojamas kartu su Microsoft Exchange serveriu, turi "
+"įdą, neleidžiančią suprasti standartus atitinkančių grupinio darbo el. "
+"laiškų. Įjunkite šią parinktį norėdami užtikrinti, kad Microsoft Exchange "
+"supras grupinio darbo pakvietimus."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Su Outlook suderinami priedų pavadinimai"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatiškai siųsti pakvietimus"
@@ -2988,24 +2954,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Paprastai kvietimai siunčiami kaip e. laiško priedai. Šio jungiklio "
-"paskirtis - padaryti taip, kad pakvietimas būtų siunčiamas e.laiško tekste; tai "
-"yra būtina, norint siųsti pakvietimus ir atsakymus į pakvietimus Microsoft "
-"Outlook naudotojams."
-"<br>Tačiau, tai darydami, negausite tokio teksto, kurį gali skaityti e. pašto "
-"programos; taigi, žmonės, kurie naudojasi programomis, kurios nesupranta "
-"pakvietimų, gaus labai keistai atrodančius laiškus."
-"<br>Tačiau ir pakvietimų nesuprantančios programos galės pateikti tokį "
-"tekstą.</qt>"
+"paskirtis - padaryti taip, kad pakvietimas būtų siunčiamas e.laiško tekste; "
+"tai yra būtina, norint siųsti pakvietimus ir atsakymus į pakvietimus "
+"Microsoft Outlook naudotojams.<br>Tačiau, tai darydami, negausite tokio "
+"teksto, kurį gali skaityti e. pašto programos; taigi, žmonės, kurie "
+"naudojasi programomis, kurios nesupranta pakvietimų, gaus labai keistai "
+"atrodančius laiškus.<br>Tačiau ir pakvietimų nesuprantančios programos galės "
+"pateikti tokį tekstą.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3109,30 +3074,28 @@ msgstr "Persiunčiamas"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Čia galima pridėti, redaguoti ir trinti savadarbius laiškų šablonus, kuriuos "
-"galima naudoti rašant atsakymus ar persiunčiant laiškus. Savadarbį šabloną "
-"galite sukurti pasirinkdami jį pasinaudoję dešiniu pelės klavišu arba per "
-"įrankių juostos meniu. Taip pat šabloną galite susieti su greitaisiais "
-"klavišais greitesniam paleidimui.</p>"
-"<p>Laiškų šablonuose galima naudoti pakaitos simbolius ir komandas pasirenkant "
-"juos iš meniu <i>Įterpti komandą</i> ar teisiog įrašant.</p>"
-"<p>Savadarbiai šablonai gali būti keturių tipų: šablonai, naudojami <i>"
-"Atsakyti</i>, <i>Atsakyti visiems</i>, <i>Persiųsti</i>, ir <i>Universalūs</i>"
-", kuriuos galima pritaikyti visoms operacijoms. Universaliems šablonams klavišų "
-"kombinacijų priskirti negalima.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Čia galima pridėti, redaguoti ir trinti savadarbius laiškų šablonus, "
+"kuriuos galima naudoti rašant atsakymus ar persiunčiant laiškus. Savadarbį "
+"šabloną galite sukurti pasirinkdami jį pasinaudoję dešiniu pelės klavišu "
+"arba per įrankių juostos meniu. Taip pat šabloną galite susieti su "
+"greitaisiais klavišais greitesniam paleidimui.</p><p>Laiškų šablonuose "
+"galima naudoti pakaitos simbolius ir komandas pasirenkant juos iš meniu "
+"<i>Įterpti komandą</i> ar teisiog įrašant.</p><p>Savadarbiai šablonai gali "
+"būti keturių tipų: šablonai, naudojami <i>Atsakyti</i>, <i>Atsakyti visiems</"
+"i>, <i>Persiųsti</i>, ir <i>Universalūs</i>, kuriuos galima pritaikyti "
+"visoms operacijoms. Universaliems šablonams klavišų kombinacijų priskirti "
+"negalima.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3149,15 +3112,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3175,8 +3138,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Pasirinktas klavišų derinys jau yra naudojamas kitam savadarbiam šablonui, ar "
-"tikrai norite priskirti jį šiam šablonui?"
+"Pasirinktas klavišų derinys jau yra naudojamas kitam savadarbiam šablonui, "
+"ar tikrai norite priskirti jį šiam šablonui?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3221,8 +3184,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Platinimo sąrašas tokiu pavadinimu <b>%1</b> jau yra. Prašome parinkti kitą "
-"pavadinimą.</qt>"
+"<qt>Platinimo sąrašas tokiu pavadinimu <b>%1</b> jau yra. Prašome parinkti "
+"kitą pavadinimą.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3231,8 +3194,8 @@ msgstr "Redaguoti tapatybę"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3500,6 +3463,11 @@ msgstr "Pasirinkite aplanką"
 msgid "Filters"
 msgstr "Filtruoti: %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Žymėti visą tekstą"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3531,8 +3499,8 @@ msgstr "Filtrų ž&urnalo veiksmai"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Čia galite įjungti ar išjungti filtrų veiksmų žurnalą. Žinoma, žurnalas "
 "veiksmus fiksuota tik tada, kai filtrų žurnalo veiksmai yra įjungti. "
@@ -3551,15 +3519,16 @@ msgstr "Žurnalo įrašų filtro tai&syklių įvertinimas"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Galite valdyti žurnale registruojamą informaciją apie pritaikytų filtrų "
-"taisyklių vertinimą: pažymėjus šią parinktį gausite detalų grįžtamąjį ryšį apie "
-"kiekvieną filtro taisyklę; kitu atveju gausite informaciją tik apie visų vieno "
-"filtro taisyklių įvertinimą."
+"taisyklių vertinimą: pažymėjus šią parinktį gausite detalų grįžtamąjį ryšį "
+"apie kiekvieną filtro taisyklę; kitu atveju gausite informaciją tik apie "
+"visų vieno filtro taisyklių įvertinimą."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3579,15 +3548,15 @@ msgstr "neribotas"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Surenkant duomenis žurnalams jie yra laikiniai saugojami atmintyje; čia galite "
-"nustatyti, kiek maksimaliai atminties gali būti naudojama: jei surinktų žurnalo "
-"duomenų kiekis viršys šį limitą, senesni duomenys bus išmetami tol, kol limitas "
-"nebebus viršijamas. "
+"Surenkant duomenis žurnalams jie yra laikiniai saugojami atmintyje; čia "
+"galite nustatyti, kiek maksimaliai atminties gali būti naudojama: jei "
+"surinktų žurnalo duomenų kiekis viršys šį limitą, senesni duomenys bus "
+"išmetami tol, kol limitas nebebus viršijamas. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3597,7 +3566,7 @@ msgstr ""
 "Nepavyksta rašyti į bylą %1:\n"
 "„%2“ yra detalus klaidos aprašymas."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail klaida"
@@ -3638,9 +3607,9 @@ msgstr "&Naudotojo identifikatorius:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Naudotojo identifikacija yra naudotojo prisijungimas prie IMAP serverio. Tai "
 "gali būti paprastas naudotojo vardas arba visas naudotojo e. pašto adresas; "
@@ -3696,8 +3665,8 @@ msgstr "Savo šiukšliadėžės aplankui Jūs neturite skaitymo - rašymo leidim
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Informacija dar negauta iš serverio, prašome paspausti mygtuką „Tikrinti "
 "paštą“."
@@ -3710,8 +3679,7 @@ msgstr "Klaida: šiam aplankui neapibrėžta jokia IMAP paskyra"
 msgid "Connecting to server %1, please wait..."
 msgstr "Jungiuosi prie serverio %1, prašome palaukti..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Bandant prisijungti prie serverio %1 įvyko klaida"
@@ -3739,11 +3707,11 @@ msgstr "Pridėti leidimus"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Ar tikrai norite pašalinti savo leidimus šiam aplankui? Vėliau nebegalėsite jo "
-"pasiekti."
+"Ar tikrai norite pašalinti savo leidimus šiam aplankui? Vėliau nebegalėsite "
+"jo pasiekti."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3774,7 +3742,7 @@ msgstr "Naudojimas:"
 msgid "Select Folder"
 msgstr "Pasirinkite aplanką"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Vietiniai aplankai"
@@ -3798,13 +3766,13 @@ msgstr "Pažymėti klavišų kombinaciją aplankui"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Norėdami pasirinkti klavišą ar klavišų kombinaciją, pažyminčią šį aplanką, "
-"spauskite žemiau esantį mygtuką ir po to nuspauskite klavišą(us), kuriuos "
-"norite susieti su šiuo aplanku.</qt>"
+"<qt>Norėdami pasirinkti klavišą ar klavišų kombinaciją, pažyminčią šį "
+"aplanką, spauskite žemiau esantį mygtuką ir po to nuspauskite klavišą(us), "
+"kuriuos norite susieti su šiuo aplanku.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3825,13 +3793,22 @@ msgstr "Nutr&aukti"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Aplankas, kurį ištrynėte, buvo susietas su paskyra <b>%1</b> "
-"į kurią gautas paštas buvo dedamas į minėtą aplanką. Dabar į šią paskyrą "
-"gaunamas paštas bus dedamas į pagrindinį gaunamų laiškų aplanką.</qt>"
+"<qt>Aplankas, kurį ištrynėte, buvo susietas su paskyra <b>%1</b> į kurią "
+"gautas paštas buvo dedamas į minėtą aplanką. Dabar į šią paskyrą gaunamas "
+"paštas bus dedamas į pagrindinį gaunamų laiškų aplanką.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3956,69 +3933,17 @@ msgstr "Šlamšto statusas:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>L"
-"<br>a"
-"<br>i"
-"<br>š"
-"<br>k"
-"<br>a"
-"<br>s</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>L<br>a<br>i<br>š<br>k<br>a<br>s</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>e"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>L"
-"<br>a"
-"<br>i"
-"<br>š"
-"<br>k"
-"<br>a"
-"<br>s</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>e<br><br>H<br>T<br>M<br>L<br> "
+"<br>L<br>a<br>i<br>š<br>k<br>a<br>s</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4030,19 +3955,14 @@ msgstr "&Jūsų vardas:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Jūsų vardas</h3>"
-"<p>Šiame lauke turi būti įrašytas Jūsų vardas ta forma, kuria jis turi būti "
-"įrašytas siunčiamo e. laiško antraštėje;</p>"
-"<p>jei laukas liks neužpildytas, Jūsų vardo antraštėje nebus, ten pasirodys tik "
-"e. pašto adresas.</p></qt>"
+"<qt><h3>Jūsų vardas</h3><p>Šiame lauke turi būti įrašytas Jūsų vardas ta "
+"forma, kuria jis turi būti įrašytas siunčiamo e. laiško antraštėje;</"
+"p><p>jei laukas liks neužpildytas, Jūsų vardo antraštėje nebus, ten "
+"pasirodys tik e. pašto adresas.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4050,17 +3970,14 @@ msgstr "Organi&zacija:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizacija</h3>"
-"<p>Šiame lauke nurodomas organizacijos pavadinimas tuo atveju, jei norite, kad "
-"Jūsų organizacijos vardas būtų rodomas išsiųstų laiškų antraštėje.</p>"
-"<p>Palikti jį tuščią yra visiškai saugu ir normalu.</p></qt>"
+"<qt><h3>Organizacija</h3><p>Šiame lauke nurodomas organizacijos pavadinimas "
+"tuo atveju, jei norite, kad Jūsų organizacijos vardas būtų rodomas išsiųstų "
+"laiškų antraštėje.</p><p>Palikti jį tuščią yra visiškai saugu ir normalu.</"
+"p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4069,20 +3986,15 @@ msgstr "&E. pašto adresas:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E. pašto adresas</h3>"
-"<p>Čia turi būti įrašytas visas Jūsų e. pašto adresas.</p>"
-"<p>Jei paliksite lauką neužpildytą, arba, jei padarysite klaidą, žmonės, "
-"bandydami Jums atsakyti, susidurs su sunkumais.</p></qt>"
+"<qt><h3>E. pašto adresas</h3><p>Čia turi būti įrašytas visas Jūsų e. pašto "
+"adresas.</p><p>Jei paliksite lauką neužpildytą, arba, jei padarysite klaidą, "
+"žmonės, bandydami Jums atsakyti, susidurs su sunkumais.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4091,21 +4003,12 @@ msgstr "&E. pašto adresas:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4129,19 +4032,17 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Čia pasirinktas OpenPGP raktas bus naudojamas skaitmeniniu būdu pasirašyti "
-"laiškus. Taip pat galite naudoti GnuPG raktus.</p>"
-"<p>Jei paliksite neužpildytą, KMail negalės skaitmeniniu būdu, naudojant "
-"OpenPGP, pasirašyti laiškų, tačiau įprastų pašto funkcijų tai nepalies.</p>"
-"<p>Apie raktus daugiau sužinoti galite <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>Čia pasirinktas OpenPGP raktas bus naudojamas skaitmeniniu būdu "
+"pasirašyti laiškus. Taip pat galite naudoti GnuPG raktus.</p><p>Jei "
+"paliksite neužpildytą, KMail negalės skaitmeniniu būdu, naudojant OpenPGP, "
+"pasirašyti laiškų, tačiau įprastų pašto funkcijų tai nepalies.</p><p>Apie "
+"raktus daugiau sužinoti galite <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4153,31 +4054,27 @@ msgstr "Jūsų OpenPGP šifravimo raktas"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Pažymėkite OpenPGP raktą, kurį naudosite šifruoti sau ir „Pridėti mano viešąjį "
-"raktą“ parinkčiai redaktoriuje."
+"Pažymėkite OpenPGP raktą, kurį naudosite šifruoti sau ir „Pridėti mano "
+"viešąjį raktą“ parinkčiai redaktoriuje."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Čia pasirinktas OpenPGP bus naudojamas šifruoti laiškus sau pačiam bei "
-"redaktoriaus galimybei „Pridėti mano viešąjį raktą“ įgyvendinti. Taip pat "
-"galite naudoti GnuPG raktus.</p>"
-"<p>Jei paliksite neužpildytą, KMail negalės skaitmeniniu būdu, naudojant "
-"OpenPGP, užkoduoti išeinančių laiškų, tačiau įprastų pašto funkcijų tai "
-"nepalies.</p>"
-"<p>Apie raktus daugiau sužinoti galite <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Čia pasirinktas OpenPGP bus naudojamas šifruoti laiškus sau pačiam "
+"bei redaktoriaus galimybei „Pridėti mano viešąjį raktą“ įgyvendinti. Taip "
+"pat galite naudoti GnuPG raktus.</p><p>Jei paliksite neužpildytą, KMail "
+"negalės skaitmeniniu būdu, naudojant OpenPGP, užkoduoti išeinančių laiškų, "
+"tačiau įprastų pašto funkcijų tai nepalies.</p><p>Apie raktus daugiau "
+"sužinoti galite <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4192,22 +4089,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Pažymėkite S/MIME sertifikatą, kuris turėtų būti naudojamas skaitmeniniam Jūsų "
-"laiškų pasirašymui."
+"Pažymėkite S/MIME sertifikatą, kuris turėtų būti naudojamas skaitmeniniam "
+"Jūsų laiškų pasirašymui."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) sertifikatas, kurį čia pasirinksite, bus naudojamas "
-"skaitmeniniu būdu pasirašyti laiškus.</p>"
-"<p>Jei paliksite neužpildytą, KMail negalės skaitmeniniu būdu, naudojant "
-"S/MIME, pasirašyti laiškų, tačiau įprastų pašto funkcijų tai nepalies.</p></qt>"
+"<qt><p>S/MIME (X.509) sertifikatas, kurį čia pasirinksite, bus naudojamas "
+"skaitmeniniu būdu pasirašyti laiškus.</p><p>Jei paliksite neužpildytą, KMail "
+"negalės skaitmeniniu būdu, naudojant S/MIME, pasirašyti laiškų, tačiau "
+"įprastų pašto funkcijų tai nepalies.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4219,25 +4114,23 @@ msgstr "Jūsų S/MIME šifravimo sertifikatas"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Pasirinkite S/MIME sertifikatą, kuriuo turi būti šifruojami sau siunčiami "
 "laiškai bei įgyvendinama redaktoriaus funkcija „Pridėti mano sertifikatą“."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Čia pasirinktas S/MIME sertifikatas bus naudojamas šifruoti laiškus sau "
-"pačiam bei redaktoriaus galimybei „Pridėti mano sertifikatą“ įgyvendinti.</p>"
-"<p>Jei paliksite neužpildytą, KMail negalės skaitmeniniu būdu, naudojant "
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Čia pasirinktas S/MIME sertifikatas bus naudojamas šifruoti laiškus "
+"sau pačiam bei redaktoriaus galimybei „Pridėti mano sertifikatą“ įgyvendinti."
+"</p><p>Jei paliksite neužpildytą, KMail negalės skaitmeniniu būdu, naudojant "
 "S/MIME, užkoduoti išeinančių laiškų, tačiau įprastų pašto funkcijų tai "
 "nepalies.</p></qt>"
 
@@ -4259,24 +4152,20 @@ msgstr "„Kam atsakyti“ ad&resas:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>„Kam atsakyti“ adresai</h3>"
-"<p>Čia nustatoma, kad antraštėje <tt>Atsakyti-kam:</tt> "
-"būtų įrašytas kitas nei <tt>Nuo:</tt> adresas.</p>"
-"<p>Tai gali būti naudinga, kai turite grupę žmonių, kurie dirba panašiuose "
-"vaidmenyse. Pvz., galite norėti, kad visi Jums parašyti laiškai būtų siunčiami "
-"adresu, nurodytu <tt>Nuo:</tt> lauke, o visi atsakymai keliautų grupės "
-"adresu.</p>"
-"<p>jei abejojate tokio adreso reikalingumu, palikite lauką neužpildytą.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>„Kam atsakyti“ adresai</h3><p>Čia nustatoma, kad antraštėje "
+"<tt>Atsakyti-kam:</tt> būtų įrašytas kitas nei <tt>Nuo:</tt> adresas.</"
+"p><p>Tai gali būti naudinga, kai turite grupę žmonių, kurie dirba panašiuose "
+"vaidmenyse. Pvz., galite norėti, kad visi Jums parašyti laiškai būtų "
+"siunčiami adresu, nurodytu <tt>Nuo:</tt> lauke, o visi atsakymai keliautų "
+"grupės adresu.</p><p>jei abejojate tokio adreso reikalingumu, palikite lauką "
+"neužpildytą.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4284,24 +4173,19 @@ msgstr "&BCC adresai:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy - „slaptos kopijos“) adresai</h3>"
-"<p>Adresai, kuriuos čia įrašysite, bus įdėti į kiekvieną laišką, kurį Jūs "
-"išsiųsite šia tapatybe. Jie bus nematomi kitiems gavėjams.</p>"
-"<p>Dažniausiai tai yra naudojama norint nusiųsti kiekvieno siunčiamo laiško "
-"kopiją kitai Jūsų paskyrai.</p>"
-"<p>Norėdami nurodyti daugiau nei vieną adresą, atskirkite juos kableliais.</p>"
-"<p>Jei kyla abejonių, palikite šitą laukelį tuščią.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy - „slaptos kopijos“) adresai</h3><p>Adresai, "
+"kuriuos čia įrašysite, bus įdėti į kiekvieną laišką, kurį Jūs išsiųsite šia "
+"tapatybe. Jie bus nematomi kitiems gavėjams.</p><p>Dažniausiai tai yra "
+"naudojama norint nusiųsti kiekvieno siunčiamo laiško kopiją kitai Jūsų "
+"paskyrai.</p><p>Norėdami nurodyti daugiau nei vieną adresą, atskirkite juos "
+"kableliais.</p><p>Jei kyla abejonių, palikite šitą laukelį tuščią.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4339,7 +4223,7 @@ msgstr "Pa&rašas:"
 msgid "&Picture"
 msgstr "&Paveikslėlis"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Neteisingas e. pašto adresas"
 
@@ -4357,13 +4241,13 @@ msgid ""
 msgstr ""
 "Vienas iš konfigūruotų OpenPGP pasirašymo raktų neturi jokio naudotojo ID su "
 "šiai tapatybei konfigūruotu e. pašto adresu (%1).\n"
-"Dėl šio neatitikimo gavėjo pusėje gali būti rodomi perspėjimo pranešimai, nes "
-"bus bandoma patikrinti parašus, padarytus su šia konfigūracija."
+"Dėl šio neatitikimo gavėjo pusėje gali būti rodomi perspėjimo pranešimai, "
+"nes bus bandoma patikrinti parašus, padarytus su šia konfigūracija."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Vienas iš konfigūruotų OpenPGP šifravimo raktų neturi jokio naudotojo ID su "
 "šiai tapatybei konfigūruotu e. pašto adresu (%1)."
@@ -4377,16 +4261,16 @@ msgid ""
 msgstr ""
 "Vienas iš konfigūruotų S/MIME pasirašymo sertifikatų neturi jokio šiai "
 "tapatybei konfigūruoto e. pašto adreso (%1).\n"
-" Dėl šio neatitikimo gavėjo pusėje gali būti rodomi perspėjimo pranešimai, nes "
-"bus bandoma patikrinti parašus, padarytus su šia konfigūracija."
+" Dėl šio neatitikimo gavėjo pusėje gali būti rodomi perspėjimo pranešimai, "
+"nes bus bandoma patikrinti parašus, padarytus su šia konfigūracija."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Vienas iš konfigūruotų S/MIME šifravimo sertifikatų neturi jokio šiai tapatybei "
-"konfigūruoto e. pašto adreso (%1)"
+"Vienas iš konfigūruotų S/MIME šifravimo sertifikatų neturi jokio šiai "
+"tapatybei konfigūruoto e. pašto adreso (%1)"
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4413,21 +4297,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Tapatybės „%1“ parinkto juodraščių aplanko nėra (arba, jau nebėra). Todėl bus "
-"naudojamas numatytasis juodraščių aplankas."
+"Tapatybės „%1“ parinkto juodraščių aplanko nėra (arba, jau nebėra). Todėl "
+"bus naudojamas numatytasis juodraščių aplankas."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Savadarbiai šablonai tapatybei „%1“ neegzistuoja (arba, jų jau nebėra). Todėl "
-"bus naudojami numatytieji šablonai."
+"Savadarbiai šablonai tapatybei „%1“ neegzistuoja (arba, jų jau nebėra). "
+"Todėl bus naudojami numatytieji šablonai."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Numatytoji)"
 
@@ -4474,18 +4358,18 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Konfigūracija buvo automatiškai perkelta, tačiau vis tiek ją patikrinkite."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Jūsų paskyros konfigūracijos automatiškai migruoti nepavyko, prašome patikrinti "
-"savo paskyros konfigūraciją."
+"Jūsų paskyros konfigūracijos automatiškai migruoti nepavyko, prašome "
+"patikrinti savo paskyros konfigūraciją."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4523,17 +4407,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Klaida: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Ryšys su serveriu %1 buvo netikėtai nutrauktas ar baigėsi prisijungimo laikas. "
-"Jei įmanoma, jis bus automatiškai atstatytas."
+"Ryšys su serveriu %1 buvo netikėtai nutrauktas ar baigėsi prisijungimo "
+"laikas. Jei įmanoma, jis bus automatiškai atstatytas."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4684,14 +4573,14 @@ msgstr "Pateikti archyvų sąrašą"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4720,265 +4609,212 @@ msgstr "Nenaudotini šifravimo raktai"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausią %n dieną.</p>\n"
-"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienas.</p>\n"
-"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienų.</p>"
+"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausią %n dieną.</p>\n"
+"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienas.</p>\n"
+"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienų.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausią %n dieną.</p>\n"
-"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienas.</p>\n"
-"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienų.</p>"
+"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausią %n dieną.</p>\n"
+"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienas.</p>\n"
+"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienų.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p><p>baigia "
+"galioti už mažiau nei %n dienos.</p>\n"
+"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p><p>baigia "
+"galioti už mažiau nei %n dienų.</p>\n"
+"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p><p>baigia "
+"galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Jūsų S/MIME pasirašymo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
 "<p>Jūsų S/MIME pasirašymo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
 "<p>Jūsų S/MIME pasirašymo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Jūsų S/MIME šifravimo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
 "<p>Jūsų S/MIME šifravimo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
 "<p>Jūsų S/MIME šifravimo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> (serijinis "
+"numeris: %2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> (serijinis "
+"numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> (serijinis "
+"numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4992,254 +4828,201 @@ msgstr "S/MIME sertifikatas greitai baigs galioti"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausią %n dieną.</p>\n"
-"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienas.</p>\n"
-"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienų.</p>"
+"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausią %n dieną.</p>\n"
+"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienas.</p>\n"
+"<p>Jūsų OpenPGP parašo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienų.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausią %n dieną.</p>\n"
-"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienas.</p>\n"
-"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>baigs galioti per artimiausias %n dienų.</p>"
+"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausią %n dieną.</p>\n"
+"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienas.</p>\n"
+"<p>Jūsų OpenPGP šifravimo raktas</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>baigs galioti per artimiausias %n dienų.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p><p>baigia "
+"galioti už mažiau nei %n dienos.</p>\n"
+"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p><p>baigia "
+"galioti už mažiau nei %n dienų.</p>\n"
+"<p>OpenPGP raktas</p><p align=center><b>%1</b> (raktoID 0x%2)</p><p>baigia "
+"galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Root sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Root sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME pasirašymo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"pasirašymo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: "
+"%2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME šifravimo sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"šifravimo sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p>"
-"<p>Jūsų S/MIME sertifikatui</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Tarpinis CA sertifikavimas</p><p align=center><b>%3</b></p><p>Jūsų S/MIME "
+"sertifikatui</p><p align=center><b>%1</b> (serijinis numeris: %2)</"
+"p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Jūsų S/MIME pasirašymo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
 "<p>Jūsų S/MIME pasirašymo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
 "<p>Jūsų S/MIME pasirašymo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Jūsų S/MIME šifravimo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
 "<p>Jūsų S/MIME šifravimo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
 "<p>Jūsų S/MIME šifravimo sertifikatas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"(serijinis numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienos.</p>\n"
-"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>\n"
-"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> "
-"(serijinis numeris: %2)</p>"
-"<p>baigia galioti už mažiau nei %n dienų.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> (serijinis "
+"numeris: %2)</p><p>baigia galioti už mažiau nei %n dienos.</p>\n"
+"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> (serijinis "
+"numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>\n"
+"<p>Jūsų S/MIME sertifikatas skirtas</p><p align=center><b>%1</b> (serijinis "
+"numeris: %2)</p><p>baigia galioti už mažiau nei %n dienų.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5251,14 +5034,15 @@ msgstr "S/MIME sertifikatas greitai baigs galioti"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Vienas ar daugiau iš Jūsų konfigūruotų OpenPGP rakų ar S/MIME sertifikatų nėra "
-"tinkamas šifravimui. Prašome pakeisti šifravimo raktų ir sertifikatų "
+"Vienas ar daugiau iš Jūsų konfigūruotų OpenPGP rakų ar S/MIME sertifikatų "
+"nėra tinkamas šifravimui. Prašome pakeisti šifravimo raktų ir sertifikatų "
 "konfigūraciją šiai tapatybei tapatybės konfigūravimo dialoge.\n"
 "Jei pasirinksite tęsti, prireikus rakto Jūsų bus pasiteirauta, kokius raktus "
 "naudoti."
@@ -5275,8 +5059,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Vienas ar daugiau iš Jūsų konfigūruotų OpenPGP rakų ar S/MIME sertifikatų nėra "
-"tinkamas šifravimui. Prašome pakeisti šifravimo raktų ir sertifikatų "
+"Vienas ar daugiau iš Jūsų konfigūruotų OpenPGP rakų ar S/MIME sertifikatų "
+"nėra tinkamas šifravimui. Prašome pakeisti šifravimo raktų ir sertifikatų "
 "konfigūraciją šiai tapatybei tapatybės konfigūravimo dialoge.\n"
 "Jei pasirinksite tęsti, prireikus rakto Jūsų bus pasiteirauta, kokius raktus "
 "naudoti."
@@ -5289,15 +5073,15 @@ msgstr "Nenurodyti pasirašymo raktai"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Gavėjų šifravimo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų būti "
-"šifruojamas naudojant OpenPGP, bent jau kai kurių gavėjų atveju;\n"
-"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių, patikimų OpenPGP "
-"šifravimo raktų.\n"
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Gavėjų šifravimo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų "
+"būti šifruojamas naudojant OpenPGP, bent jau kai kurių gavėjų atveju;\n"
+"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių, patikimų "
+"OpenPGP šifravimo raktų.\n"
 "Galite tęsti be šifravimo sau, bet turėkite omeny tai, kad tokiu atveju "
 "negalėsite perskaityti savo pačių šifruoto laiško."
 
@@ -5305,29 +5089,29 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Gavėjų šifravimo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų būti "
-"šifruojamas naudojant S/MIME, bent jau kai kurių gavėjų atveju;\n"
-"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių S/MIME šifravimo "
-"sertifikatų.\n"
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Gavėjų šifravimo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų "
+"būti šifruojamas naudojant S/MIME, bent jau kai kurių gavėjų atveju;\n"
+"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių S/MIME "
+"šifravimo sertifikatų.\n"
 "Galite tęsti be šifravimo sau, bet turėkite omeny tai, kad tokiu atveju "
 "negalėsite perskaityti savo pačių šifruoto laiško."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Gavėjų pasirašymo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų būti "
-"pasirašomas naudojant OpenPGP, bent jau kai kurių gavėjų atveju;\n"
-"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių OpenPGP pasirašymo "
-"raktų."
+"Gavėjų pasirašymo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų "
+"būti pasirašomas naudojant OpenPGP, bent jau kai kurių gavėjų atveju;\n"
+"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių OpenPGP "
+"pasirašymo raktų."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5335,15 +5119,15 @@ msgstr "Nepasirašyti OpenPGP parašu"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Gavėjų pasirašymo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų būti "
-"pasirašomas naudojant S/MIME, bent jau kai kurių gavėjų atveju;\n"
-"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių S/MIME pasirašymo "
-"sertifikatų."
+"Gavėjų pasirašymo pasirinkčių peržiūra leidžia spręsti, kad laiškas turėtų "
+"būti pasirašomas naudojant S/MIME, bent jau kai kurių gavėjų atveju;\n"
+"tačiau šiai tapatybei Jūs neturite sukonfigūravę galiojančių S/MIME "
+"pasirašymo sertifikatų."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5365,8 +5149,8 @@ msgstr "Pasirašymas neįmanomas"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Jūs nenurodėte šifravimo rakto laiškams, kuriuos siunčiate sau (šifruoti sau "
 "adresuotus laiškus). Užšifravę šį laišką nebegalėsite jo iššifruoti."
@@ -5390,11 +5174,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Jūs nepriskyrėte šifravimo rakto nei vienam iš šio laiško gavėjų, todėl laiškas "
-"bus siunčiamas neužšifruotas."
+"Jūs nepriskyrėte šifravimo rakto nei vienam iš šio laiško gavėjų, todėl "
+"laiškas bus siunčiamas neužšifruotas."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5405,8 +5189,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Jūs nepriskyrėte šifravimo rakto vienam iš šio laiško gavėjų, todėl, užšifravus "
-"laišką, jis negalės jo iššifruoti."
+"Jūs nepriskyrėte šifravimo rakto vienam iš šio laiško gavėjų, todėl, "
+"užšifravus laišką, jis negalės jo iššifruoti."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5439,11 +5223,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Nerasta galiojančių ir patikimų šifravimo raktų gavėjui „%1“.\n"
 "\n"
@@ -5492,10 +5276,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritinė klaida: Nepavyksta surinkti laiškų: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Nepavyko įdėti laiško:\n"
+msgid "Failed to add message:\n"
+msgstr "Nepavyko įdėti laiško:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5587,6 +5369,52 @@ msgstr "&Atjungtas IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir laiškadėžė"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Nustatykite laiško temą"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Siųsti „CC:“ „adresui“"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Siųsti  BCC: („slaptą kopiją“) „adresui“"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Pridėti „antraštę“ laiškui"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Skaityti laiško tekstą iš „bylos“"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Nustatyti laiško tekstą"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Pridėti priedą laiškui. Tai gali būti kartojama"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Tik tikrinti naują paštą"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Tik atverti naujo laiško langą"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Peržiūrėti šią laiško bylą"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Siųsti laišką respondentui, nurodytam „adreso“ lauke, pridėti bylą, į kurią "
+"rodo „URL“"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Paštas"
@@ -5630,8 +5458,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail dabar sukurs būtinus grupinio darbo resursų aplankus kaip %1 paaplankius; "
-"jei to nenorite, spauskite „Ne“, ir IMAP resursai bus išjungti"
+"KMail dabar sukurs būtinus grupinio darbo resursų aplankus kaip %1 "
+"paaplankius; jei to nenorite, spauskite „Ne“, ir IMAP resursai bus išjungti"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5640,17 +5468,18 @@ msgstr "%1: aplanko nerasta, jis bus sukurtas."
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
-"%1: aptiktas aplankas %2, jis bus padarytas pagrindiniu grupinio darbo aplanku."
+"%1: aptiktas aplankas %2, jis bus padarytas pagrindiniu grupinio darbo "
+"aplanku."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail aptiko šiuos grupinio darbo aplankus %1 ir turės atlikti šiuos "
-"veiksmus: %2"
-"<br>Jei to nenorite, spauskite „Ne“, ir IMAP resursai bus išjungti<qt>"
+"veiksmus: %2<br>Jei to nenorite, spauskite „Ne“, ir IMAP resursai bus "
+"išjungti<qt>"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5700,11 +5529,11 @@ msgstr "URL nukopijuotas į talpyklę."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Byla <b>%1</b> jau yra. <br> Ar norite ją pakeisti?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Įrašyti byloje"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Pa&keisti"
 
@@ -5722,7 +5551,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Laiškas buvo pašalintas bandant jį įrašyti. Įrašyti nepavyko."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5742,126 +5571,128 @@ msgstr "Byloje nėra laiško."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Byloje yra daugiau nei vienas laiškas. Rodomas tik pirmas laiškas."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Tai – persiųsta MIME santrauka.  Laiško turinys yra patalpintas priede(-uose).\n"
+"Tai – persiųsta MIME santrauka.  Laiško turinys yra patalpintas priede(-"
+"uose).\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Laiškai filtruojami"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Filtruojamas laiškas %3 iš %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Neužtenka vietos diske?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Perkelti į šį aplanką"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopijuoti į šį aplanką"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Laiškai perkeliami"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Laiškai trinami"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Atveriu URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ar tikrai norite vykdyti <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Neradau priedų išsaugojimui."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Įrašyti priedą į"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "priedas.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "priedas.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Byla vardu %1 jau yra.  Ar Jūs norite rašyti vietoje jos?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Byla jau egzistuoja"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Perrašyti"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"Laiško dalis %1 yra šifruota.  Ar Jūs norite ją išsaugoti šifruotame pavidale?"
+"Laiško dalis %1 yra šifruota.  Ar Jūs norite ją išsaugoti šifruotame "
+"pavidale?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail klausimas"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Išlaikyti šifravimą"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Neišlaikyti"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "Laiško dalis %1 yra pasirašyta.  Ar Jūs norite ją išsaugoti su parašu?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Išlaikyti parašą"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5870,22 +5701,22 @@ msgstr ""
 "Nepavyko rašyti į bylą %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Nepavyko rašyti į bylą %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Šiam e. adresui nėra Adresų knygelės įrašo. Pridėkite juos prie Adresų knygelės "
-"ir tuomet pridėkite greitųjų žinučių adresus pasinaudodami Jūsų pasirinktu "
-"greitųjų žinučių klientu."
+"Šiam e. adresui nėra Adresų knygelės įrašo. Pridėkite juos prie Adresų "
+"knygelės ir tuomet pridėkite greitųjų žinučių adresus pasinaudodami Jūsų "
+"pasirinktu greitųjų žinučių klientu."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5895,77 +5726,78 @@ msgstr ""
 " %1\n"
 " nepavyko išsiaiškinti, su kuo turėtumėte kalbėtis."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus programinė sąsaja nepateikia „x-obtain-keys“ funkcijos. Prašome "
 "pranešti apie šią programos ydą."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus programinės sąsajos klaida"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Netikėta reikšmė iš Chiasmus programinės sąsajos: „x-obtain-keys“ funkcija "
 "nepateikė eilučių sąrašo. Prašome pranešti apie šią ydą."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Raktų nerasta. Prašome patikrinti, ar Chiasmus konfigūracijoje nurodytas "
 "teisingas kelias iki raktų."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus šifravimo rakto pasirinkimas"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus programinė sąsaja nepateikia „x-decrypt“ funkcijos. Prašome pranešti "
-"apie šią ydą."
+"Chiasmus programinė sąsaja nepateikia „x-decrypt“ funkcijos. Prašome "
+"pranešti apie šią ydą."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"„x-decrypt“ funkcija nepriima lauktų parametrų. Prašome pranešti apie šią ydą."
+"„x-decrypt“ funkcija nepriima lauktų parametrų. Prašome pranešti apie šią "
+"ydą."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus dešifravimo klaida"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Netikėta reikšmė iš Chiasmus programinės sąsajos: „x-decrypt“ funkcija "
 "nepateikė baitų masyvo. Prašome pranešti apie šią ydą."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Paštas"
@@ -6064,7 +5896,7 @@ msgstr "Dydis"
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Suspausti"
 
@@ -6076,7 +5908,7 @@ msgstr "Šifravimas"
 msgid "Sign"
 msgstr "Pasirašymas"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Priedo pavadinimas:"
 
@@ -6098,7 +5930,8 @@ msgstr "Pagrindiniai gavėjai"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>Šiame laiške įrašyti adresatai gaus laiško kopiją.</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -6108,15 +5941,15 @@ msgstr "Papildomi gavėjai"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Šiame lauke įrašyti e. pašto adresai gauna šio e. laiško kopiją. Techniškai "
-"tai niekuo nesiskiria nuo gavėjo įrašymo į <b>Kam:</b> "
-"lauką, tačiau simboliškai pasakoma, kad gavėjas turi gauti „laiško kopiją“ "
-"(angl. „Carbon Copy“ - CC), taigi jis laikomas nuošaliu klausytoju, o ne "
-"gavėju.</qt>"
+"<qt>Šiame lauke įrašyti e. pašto adresai gauna šio e. laiško kopiją. "
+"Techniškai tai niekuo nesiskiria nuo gavėjo įrašymo į <b>Kam:</b> lauką, "
+"tačiau simboliškai pasakoma, kad gavėjas turi gauti „laiško kopiją“ (angl. "
+"„Carbon Copy“ - CC), taigi jis laikomas nuošaliu klausytoju, o ne gavėju.</"
+"qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6124,12 +5957,11 @@ msgstr "Paslėpti gavėjai"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Iš esmės tai yra tas pats, kas įrašyti adresą į <b>Kopija:</b> "
-"tačiau yra ir vienas skirtumas: gavėjai nemato, kas gauna „aklą kopiją“.</qt>"
+"<qt>Iš esmės tai yra tas pats, kas įrašyti adresą į <b>Kopija:</b> tačiau "
+"yra ir vienas skirtumas: gavėjai nemato, kas gauna „aklą kopiją“.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6139,7 +5971,7 @@ msgstr "Siųsti &paštą"
 msgid "&Send Mail Via"
 msgstr "Siųsti &paštą per"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Siųsti &vėliau"
@@ -6204,8 +6036,7 @@ msgstr "Ša&linti citavimo ženklus"
 msgid "Cl&ean Spaces"
 msgstr "Iš&valyti tarpus"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Naudoti ne&kintamo pločio šriftą"
@@ -6348,31 +6179,31 @@ msgstr "&Kriptografinis laiško formatas"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standartinis"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Ženklelių sąrašas (skrit.)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Ženklelių sąrašas (apskr.)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Ženklelių sąrašas (kvadr.)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Rikiuojantis sąrašas (skaičiai)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Rikiuojantis sąrašas (alfa maž.)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Rikiuojantis sąrašas (alfa didž.)"
 
@@ -6476,61 +6307,61 @@ msgstr "Užverti redaktorių"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Laiškas, kurį surašėte, atrodo turi nuorodą į prisegtą bylą, tačiau Jūs nieko "
-"nepridėjote.\n"
+"Laiškas, kurį surašėte, atrodo turi nuorodą į prisegtą bylą, tačiau Jūs "
+"nieko nepridėjote.\n"
 "Ar norite pridėti bylą prie šio laiško?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Bylos priedo priminimas"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Siųsti k&aip yra"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail nerado priedo (%1) buvimo vietos;</p>"
-"<p>norėdami pridėti bylą turite nurodyti visą jos kelią.</p></qt>"
+"<qt><p>KMail nerado priedo (%1) buvimo vietos;</p><p>norėdami pridėti bylą "
+"turite nurodyti visą jos kelią.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Pridėti bylą"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Pridėti"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Įterpti bylą"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Įterpti bylą"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bandant eksportuoti raktą iš naudotojo sąsajos įvyko klaida:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Bandant eksportuoti raktą iš naudotojo sąsajos įvyko klaida:</p><p><b>"
+"%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6569,96 +6400,107 @@ msgid ""
 "View"
 msgstr "Rodyti"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Redaguoti..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Redaguoti scenarijų..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Įrašyti &kaip..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Savybės"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Pridėti priedą..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail negali suspausti bylos"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "Suspausta byla yra didesnė už originalą. Ar norite saugoti originalą?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Palikti"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail negali išspausti šios bylos."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Įrašyti priedą kaip"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Pridėti kaip tekstą"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Pridėti kaip priedą"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Įterpti kaip pri&edą"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "bevardis"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jūs prašote užšifruoti laišką sau, tačiau šiuo metu pasirinktoje tapatybėje "
-"nėra apibrėžtas joks šifravimui naudotinas (OpenPGP ar S/MIME) raktas ar "
-"sertifikatas.</p>"
-"<p>Prašome pasirinkti naudotiną raktą(-us) tapatybės konfigūracijoje.</p></qt>"
+"<qt><p>Jūs prašote užšifruoti laišką sau, tačiau šiuo metu pasirinktoje "
+"tapatybėje nėra apibrėžtas joks šifravimui naudotinas (OpenPGP ar S/MIME) "
+"raktas ar sertifikatas.</p><p>Prašome pasirinkti naudotiną raktą(-us) "
+"tapatybės konfigūracijoje.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Neapibrėžtas šifravimo raktas"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Norėdami pasirašyti šį laišką, Jūs pirma turėtumėte nurodyti raktą, kuris "
-"turėtų būti tam naudojamas (OpenPGP arba S/MIME). </p>"
-"<p>Prašome nurodyti naudotiną raktą tapatybės konfigūracijoje.</p></qt>"
+"<qt><p>Norėdami pasirašyti šį laišką, Jūs pirma turėtumėte nurodyti raktą, "
+"kuris turėtų būti tam naudojamas (OpenPGP arba S/MIME). </p><p>Prašome "
+"nurodyti naudotiną raktą tapatybės konfigūracijoje.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nenurodytas pasirašymo raktas"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6666,166 +6508,164 @@ msgstr ""
 "KMail šiuo metu veikia neprijungtas prie tinklo, Jūsų laiškai bus laikomi "
 "išeinančių laiškų aplanke kol prisijungsite."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Prisijungęs/atsijungęs"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Turite įrašyti savo e. pašto adresą lauke Nuo:. Taip pat turėtumėte nurodyti "
 "savo e. pašto adresą kiekvienoje tapatybėje, kad nereikėtų jo įrašinėti "
 "kiekvieną kartą ranka."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Jums būtina nurodyti bent vieną gavėją lauke Kam:, arba laukuose CC ar BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Laukas „Kam:“ yra tuščias. Ar vis tiek siųsti?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Lauke „Kam:“ nėra adresato"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Jūs neįrašėte temos. Ar vis tiek siųsti?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nenurodyta tema"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Siųsti k&aip yra"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Nurodyti „Temą“"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Išlaikyti žymes, nepasirašyti/nešifruoti"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Išlaikyti žymes, nešifruoti"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Išlaikyti žymes, nepasirašyti"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Pasirašyti/šifruoti (trinti žymes)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Šifruoti (trinti žymes)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Pasirašyti (trinti žymes)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>HTML formatuotų laiškų pasirašymas/šifravimas nėra galimas;</p>"
-"<p>ar norite panaikinti html formatavimą?</p></qt>"
+"<qt><p>HTML formatuotų laiškų pasirašymas/šifravimas nėra galimas;</p><p>ar "
+"norite panaikinti html formatavimą?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Pasirašyti/užšifruoti laišką?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Tapatybės „%1“ parinkto juodraščių ar šablonų aplanko nėra (arba, jau nebėra). "
-"Todėl bus naudojamas numatytasis juodraščių ar šablonų aplankas."
+"Tapatybės „%1“ parinkto juodraščių ar šablonų aplanko nėra (arba, jau "
+"nebėra). Todėl bus naudojamas numatytasis juodraščių ar šablonų aplankas."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Sukurkite siuntimo paskyrą ir pakartokite."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Ruošiuosi siųsti laišką..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Išsiuntimo patvirtinimas"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Siųsti dabar"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Be gavėjų"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Papildomi gavėjai"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Korektorius: išjungtas"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Korektorius: išjungtas"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Rašybos tikrinimas atšauktas."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Rašybos tikrinimas sustabdytas."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Rašybos tikrinimas atliktas."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Korektorius"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Prašome visų pirma sukonfigūruoti Crypto programinę sąsają Chisasmus "
 "šifravimui.\n"
 "Tai galite atlikti Crypto programinių sąsajų kortelėje konfigūravimo dialogo "
 "Saugumo puslapyje."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6833,34 +6673,34 @@ msgstr ""
 "Atrodo, kad libkleopatra buvo sukompiliuota be Chiasmus palaikymo. Prašome "
 "perkompiliuoti libkeopatra su parinktimi --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Nesukonfigūruota jokia Chiasmus programinė sąsaja"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nerasta Chiasmus raktų"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus šifravimo rakto pasirinkimas"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Laišką pasirašė %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Laišką pasirašė %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP laiškas – šifruotas"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Laiškas, kurio tema: "
@@ -6910,8 +6750,8 @@ msgstr "Korektorius - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Nepasileidžia ISpell arba Aspell. Įsitikinkite, kad ISpell arba Aspell yra "
 "teisingai suderintas ir yra Jūsų kelyje PATH."
@@ -6947,13 +6787,11 @@ msgstr "<qt>Per daug filtravimo veiksmų taisyklėje <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"Nežinomas filtro veiksmas <b>%1</b>"
-"<br> filtro taisyklėje <b>%2</b>."
-"<br>Jis bus ignoruojamas.</qt>"
+"Nežinomas filtro veiksmas <b>%1</b><br> filtro taisyklėje <b>%2</b>.<br>Jis "
+"bus ignoruojamas.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7173,161 +7011,131 @@ msgstr "Groti garsą"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tai yra apibrėžtų filtrų sąrašas.  Jie naudojami nuo viršaus į apačią</p>"
-"<p>Spragtelėkite ant bet kurio filtro, norėdami redaguoti jį naudojant "
-"valdiklius dešinėje dialogo pusėje.</p></qt>"
+"<qt><p>Tai yra apibrėžtų filtrų sąrašas.  Jie naudojami nuo viršaus į "
+"apačią</p><p>Spragtelėkite ant bet kurio filtro, norėdami redaguoti jį "
+"naudojant valdiklius dešinėje dialogo pusėje.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Norėdami sukurti naują filtrą, spragtelėkite šį mygtuką.</p> "
-"<p>Filtras bus įdėtas prieš šiuo metu pasirinktą, bet Jūs galite bet kada tai "
-"pakeisti.</p>"
-"<p>Jei Jūs spragtelėjote šį mygtuką atsitiktinai, Jūs galite panaikinti tai "
-"spragtelėdami <em>Ištrinti</em> mygtuką.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Norėdami sukurti naują filtrą, spragtelėkite šį mygtuką.</p> "
+"<p>Filtras bus įdėtas prieš šiuo metu pasirinktą, bet Jūs galite bet kada "
+"tai pakeisti.</p><p>Jei Jūs spragtelėjote šį mygtuką atsitiktinai, Jūs "
+"galite panaikinti tai spragtelėdami <em>Ištrinti</em> mygtuką.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Spragtelėkite šį mygtuką norėdami nukopijuoti filtrą.</p> "
-"<p>Jei Jūs spragtelėjote šį mygtuką atsitiktinai, Jūs galite panaikinti tai "
+"<qt><p>Spragtelėkite šį mygtuką norėdami nukopijuoti filtrą.</p> <p>Jei Jūs "
+"spragtelėjote šį mygtuką atsitiktinai, Jūs galite panaikinti tai "
 "spragtelėdami <em>Ištrinti</em> mygtuką.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Norėdami <em>ištrinti</em> dabar pasirinktą filtrą iš sąrašo aukščiau, "
-"spragtelėkite šį mygtuką.</p>"
-"<p>Ištrynus filtrą, jo negalima sugrąžinti, tačiau Jūs visada galite palikti "
-"dialogą spragtelėdami <em>Atšaukti</em> mygtuką ir taip atmesti padarytus "
-"pakeitimus.</p></qt>"
+"<qt><p>Norėdami <em>ištrinti</em> dabar pasirinktą filtrą iš sąrašo "
+"aukščiau, spragtelėkite šį mygtuką.</p><p>Ištrynus filtrą, jo negalima "
+"sugrąžinti, tačiau Jūs visada galite palikti dialogą spragtelėdami "
+"<em>Atšaukti</em> mygtuką ir taip atmesti padarytus pakeitimus.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Paspauskite šį mygtuką norėdami perkelti pažymėtą filtrą <em>į viršų</em> "
-"aukščiau pateiktame sąraše.</p>"
-"<p>Tai gali būti naudinga, nes filtrų tvarka sąraše apsprendžia kokia tvarka "
-"jie pritaikomi laiškams. Viršutinis filtras pritaikomas pirmas.</p></qt>"
+"<qt><p>Paspauskite šį mygtuką norėdami perkelti pažymėtą filtrą <em>į viršų</"
+"em> aukščiau pateiktame sąraše.</p><p>Tai gali būti naudinga, nes filtrų "
+"tvarka sąraše apsprendžia kokia tvarka jie pritaikomi laiškams. Viršutinis "
+"filtras pritaikomas pirmas.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Spragtelėkite šį mygtuką norėdami perkelti pažymėtą filtrą <em>aukštyn</em> "
-"aukščiau esančiame sąraše.</p>"
-"<p>Tai reikalinga, nes filtrų tvarka sąraše apsprendžia kokia tvarka jie "
-"pritaikomi laiškams: viršutinis filtras pritaikomas pirmas.</p>"
-"<p>Jei paspaudėte šį mygtuką netyčia, galite atstatyti buvusią tvarką "
-"paspausdami mygtuką <em>žemyn</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Spragtelėkite šį mygtuką norėdami perkelti pažymėtą filtrą "
+"<em>aukštyn</em> aukščiau esančiame sąraše.</p><p>Tai reikalinga, nes filtrų "
+"tvarka sąraše apsprendžia kokia tvarka jie pritaikomi laiškams: viršutinis "
+"filtras pritaikomas pirmas.</p><p>Jei paspaudėte šį mygtuką netyčia, galite "
+"atstatyti buvusią tvarką paspausdami mygtuką <em>žemyn</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Paspauskite šį mygtuką norėdami perkelti pažymėtą filtrą <em>žemyn</em> "
-"aukščiau pateiktame sąraše.</p>"
-"<p>Tai reikalinga, nes filtrų tvarka sąraše apsprendžia kokia tvarka jie "
-"pritaikomi laiškams. Viršutinis filtras pritaikomas pirmas.</p>"
-"<p>Jei Jūs paspaudėte šį mygtuką netyčia, Jūs galite atstatyti tai paspausdami "
-"mygtuką <em>aukštyn</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Paspauskite šį mygtuką norėdami perkelti pažymėtą filtrą <em>žemyn</"
+"em> aukščiau pateiktame sąraše.</p><p>Tai reikalinga, nes filtrų tvarka "
+"sąraše apsprendžia kokia tvarka jie pritaikomi laiškams. Viršutinis filtras "
+"pritaikomas pirmas.</p><p>Jei Jūs paspaudėte šį mygtuką netyčia, Jūs galite "
+"atstatyti tai paspausdami mygtuką <em>aukštyn</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Paspauskite šį mygtuką norėdami perkelti pažymėtą filtrą <em>"
-"į pačią apačią</em> aukščiau pateiktame sąraše.</p>"
-"<p>Tai gali būti naudinga, nes filtrų tvarka sąraše apsprendžia kokia tvarka "
-"jie pritaikomi laiškams. Viršutinis filtras pritaikomas pirmas.</p></qt>"
+"<qt><p>Paspauskite šį mygtuką norėdami perkelti pažymėtą filtrą <em>į pačią "
+"apačią</em> aukščiau pateiktame sąraše.</p><p>Tai gali būti naudinga, nes "
+"filtrų tvarka sąraše apsprendžia kokia tvarka jie pritaikomi laiškams. "
+"Viršutinis filtras pritaikomas pirmas.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Paspauskite šį mygtuką norėdami pervadinti pasirinktą filtrą.</p>"
-"<p>Pavadinimai filtrams parenkami automatiškai, jie prasideda „&lt;“.</p>"
-"<p>Jei Jūs pervadinote filtrą netyčia ir norite atstatyti automatiškai "
-"parenkamą pavadinimą, paspauskite šį mygtuką ir pasirinkite <em>Išvalyti</em>"
-", ir paskui <em>OK</em> pasirodžiusiame dialoge.</p></qt>"
+"<qt><p>Paspauskite šį mygtuką norėdami pervadinti pasirinktą filtrą.</"
+"p><p>Pavadinimai filtrams parenkami automatiškai, jie prasideda „&lt;“.</"
+"p><p>Jei Jūs pervadinote filtrą netyčia ir norite atstatyti automatiškai "
+"parenkamą pavadinimą, paspauskite šį mygtuką ir pasirinkite <em>Išvalyti</"
+"em>, ir paskui <em>OK</em> pasirodžiusiame dialoge.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Pažymėkite šį mygtuką, jei norite, kad pasirodytų patvirtinimo dialogas.</p> "
-"<p>Tai naudinga jei Jūs sukūrėte taisyklių rinkinį, kuris pažymi laiškos "
-"vėlesniam atsisiuntimui. Be galimybės priverstinai iškviesti dialogo langą šie "
-"laiškai gali likti neatsisiųsti, jei serveryje nebūtų kitų didelių laiškų, ar "
-"jei Jūs norėtumėte pakeisti taisyklių rinkinį kitokiam laiškų pažymėjimui.</p>"
-"</qt>"
+"<qt> <p>Pažymėkite šį mygtuką, jei norite, kad pasirodytų patvirtinimo "
+"dialogas.</p> <p>Tai naudinga jei Jūs sukūrėte taisyklių rinkinį, kuris "
+"pažymi laiškos vėlesniam atsisiuntimui. Be galimybės priverstinai iškviesti "
+"dialogo langą šie laiškai gali likti neatsisiųsti, jei serveryje nebūtų kitų "
+"didelių laiškų, ar jei Jūs norėtumėte pakeisti taisyklių rinkinį kitokiam "
+"laiškų pažymėjimui.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7337,6 +7145,16 @@ msgstr "POP3 filtrų taisyklės"
 msgid "Filter Rules"
 msgstr "Filtravimo taisyklės"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "S&varbus"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "S&varbus"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Sudaryti filtrai"
@@ -7419,6 +7237,11 @@ msgstr "Taip pat įdėti šį filtrą į įrankių juostą"
 msgid "Icon for this filter:"
 msgstr "Ženkliukas šiam filtrui"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Kam"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Aukštyn"
@@ -7427,16 +7250,29 @@ msgstr "Aukštyn"
 msgid "Down"
 msgstr "Žemyn"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Pervardinti..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Naujas"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopijuoti į"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Pašalintas"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7445,20 +7281,20 @@ msgstr "Pažymėti klavišų kombinaciją aplankui"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Bent vienas filtras yra numatomas taikyti internetinėms IMAP paskyroms. Tokie "
-"filtrai bus taikomi tik rankiniu būdu filtruojant, ir be to, filtruojant "
-"gaunamus internetinės IMAP paskyros laiškus."
+"Bent vienas filtras yra numatomas taikyti internetinėms IMAP paskyroms. "
+"Tokie filtrai bus taikomi tik rankiniu būdu filtruojant, ir be to, "
+"filtruojant gaunamus internetinės IMAP paskyros laiškus."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Šie filtrai nebuvo išsaugoti, nes jie buvo neteisingi (pvz. neturintys veiksmų "
-"ar atrankos taisyklių)."
+"Šie filtrai nebuvo išsaugoti, nes jie buvo neteisingi (pvz. neturintys "
+"veiksmų ar atrankos taisyklių)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7506,8 +7342,8 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Aplankų varduose neturi būti / (brūkšnelių) ženklų; prašome pasirinkti kitokį "
-"aplanko vardą."
+"Aplankų varduose neturi būti / (brūkšnelių) ženklų; prašome pasirinkti "
+"kitokį aplanko vardą."
 
 #: kmfolder.cpp:913
 msgid ""
@@ -7522,8 +7358,8 @@ msgid ""
 "Your IMAP server does not allow the character '%1'; please choose another "
 "folder name."
 msgstr ""
-"Jūsų IMAP serveris neleidžia simbolio „%1“ aplankų varduose; prašome pasirinkti "
-"kitokį aplanko vardą."
+"Jūsų IMAP serveris neleidžia simbolio „%1“ aplankų varduose; prašome "
+"pasirinkti kitokį aplanko vardą."
 
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
@@ -7532,27 +7368,23 @@ msgstr "IMAP talpyklės sutrikimų šalinimas"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>IMAP talpyklės sutrikimų šalinimas.</b></p>"
-"<p>Jei sinchronizuojant IMAP aplanką kyla problemų, visų pirma galite pamėginti "
-"atstatyti rodyklės bylą. Tai šiek tiek užtruks, tačiau papildomų problemų "
-"nesukels.</p>"
-"<p>Jei to neužtenka, galite bandyti atnaujinti IMAP talpyklę. Jei tai darysite, "
+"<p><b>IMAP talpyklės sutrikimų šalinimas.</b></p><p>Jei sinchronizuojant "
+"IMAP aplanką kyla problemų, visų pirma galite pamėginti atstatyti rodyklės "
+"bylą. Tai šiek tiek užtruks, tačiau papildomų problemų nesukels.</p><p>Jei "
+"to neužtenka, galite bandyti atnaujinti IMAP talpyklę. Jei tai darysite, "
 "prarasite visus vietoje atliktus pakeitimus šiam aplankui ir visiems "
 "paaplankiams.</p>"
 
@@ -7586,17 +7418,17 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Aplanko %1 UID atmintinė neperskaitoma.  could not be read. To priežastis gali "
-"būti neteisingi bylų sistemos leidimai; taip pat gali būti, kad bylų sistema "
-"yra sugadinta."
+"Aplanko %1 UID atmintinė neperskaitoma.  could not be read. To priežastis "
+"gali būti neteisingi bylų sistemos leidimai; taip pat gali būti, kad bylų "
+"sistema yra sugadinta."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"Aplanko %1 UID atmintinė neperskaitoma.  could not be read. To priežastis gali "
-"būti neteisingi bylų sistemos leidimai."
+"Aplanko %1 UID atmintinė neperskaitoma.  could not be read. To priežastis "
+"gali būti neteisingi bylų sistemos leidimai."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7618,7 +7450,8 @@ msgid ""
 "This will remove all changes you have done locally to your folders."
 msgstr ""
 "Ar tikrai norite atnaujinti aplanko %1 ir visų jo paaplankių IMAP talpyklę?\n"
-"Tokiu būdu bus panaikinti visi pakeitimai, kuriuos atlikote aplankams vietoje."
+"Tokiu būdu bus panaikinti visi pakeitimai, kuriuos atlikote aplankams "
+"vietoje."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7634,11 +7467,12 @@ msgstr "Aplankų indeksas buvo sukurtas."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Aplankas %1 nėra pradinėje sinchronizuotoje būklėje (būklė buvo %2). Ar norite "
-"atstatyti pirminę sinchronizuotą būklę ir sinchronizuoti bet kuriuo atveju?"
+"Aplankas %1 nėra pradinėje sinchronizuotoje būklėje (būklė buvo %2). Ar "
+"norite atstatyti pirminę sinchronizuotą būklę ir sinchronizuoti bet kuriuo "
+"atveju?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7766,15 +7600,11 @@ msgstr "Serveryje sukuriu paaplankius"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Atrodo, kad laiškai serverio aplanke <b>%1</b> buvo ištrinti. Ar norite "
-"ištrinti juos taip pat ir savo kompiuteryje? "
-"<br>UID: %2</p></qt>"
+"<qt><p>Atrodo, kad laiškai serverio aplanke <b>%1</b> buvo ištrinti. Ar "
+"norite ištrinti juos taip pat ir savo kompiuteryje? <br>UID: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7795,13 +7625,11 @@ msgstr "Parsisiunčiami aplankai vardų sričiai %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Atrodo, kad aplankas <b>%1</b> buvo ištrintas. Ar norite ištrinti jį taip "
-"pat ir iš serverio?</p></qt>"
+"<qt><p>Atrodo, kad aplankas <b>%1</b> buvo ištrintas. Ar norite ištrinti jį "
+"taip pat ir iš serverio?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7809,16 +7637,16 @@ msgstr "Nutraukta"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP serveris %1 nepalaiko IMAP anotacijų. XML saugojimas negali būti "
 "naudojamas šiame serveryje; prašome perkonfigūruoti KMail."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP serveris %1 nepalaiko IMAP anotacijų. XML saugojimas negali būti "
 "naudojamas šiame serveryje; prašome perkonfigūruoti KMail"
@@ -7834,15 +7662,15 @@ msgstr "pamesta+rasta"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Aplanke <b>%1</b> yra naujų laiškų, kurie dar nėra įkelti į serverį, tačiau "
-"atrodo, kad tokiam veiksmui šiuo metu neturite užtektinai teisių. </p> "
-"<p>Visi šios problemos paveikti laiškai bus perkelti į aplanką <b>%2</b> "
+"<p>Aplanke <b>%1</b> yra naujų laiškų, kurie dar nėra įkelti į serverį, "
+"tačiau atrodo, kad tokiam veiksmui šiuo metu neturite užtektinai teisių. </"
+"p> <p>Visi šios problemos paveikti laiškai bus perkelti į aplanką <b>%2</b> "
 "siekiant išvengti jų praradimo.</p>"
 
 #: kmfoldercachedimap.cpp:3123
@@ -7852,20 +7680,25 @@ msgstr "Nepakankamos prieigos teisės"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Aplanke <b>%1</b> yra naujų laiškų, kurie dar nėra įkelti į serverį, tačiau "
-"atrodo, kad tokiam veiksmui šiuo metu neturite užtektinai teisių. Prašome "
-"susisiekti su administratoriumi, kad jis suteiktų Jums teises įkelti naujus "
-"laiškus, arba pašalinkite laiškus iš šio palanko.</p> "
-"<p>Ar norite perkelti šiuos laiškus į kitą aplanką?</p>"
+"<p>Aplanke <b>%1</b> yra naujų laiškų, kurie dar nėra įkelti į serverį, "
+"tačiau atrodo, kad tokiam veiksmui šiuo metu neturite užtektinai teisių. "
+"Prašome susisiekti su administratoriumi, kad jis suteiktų Jums teises įkelti "
+"naujus laiškus, arba pašalinkite laiškus iš šio palanko.</p> <p>Ar norite "
+"perkelti šiuos laiškus į kitą aplanką?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Perkelti į:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Neperkelti"
 
@@ -7877,8 +7710,7 @@ msgstr "Perkelti laišką į aplanką"
 msgid "Permissions (ACL)"
 msgstr "Leidimai (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Bendros"
@@ -7902,8 +7734,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Naudoti par&inktus ženkliukus"
@@ -7922,24 +7753,21 @@ msgstr "Atlikti veiksmą dėl naujų/neskaitytų laiškų šiame aplanke"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Įgalinus šią parinktį būsite perspėti apie naujus/neskaitytus laiškus šiame "
-"aplanke. Be to, judant į kitą/ankstesnį aplanką bus sustota prie šio "
-"aplanko.</p>"
-"<p>Panaikinkite šios parinkties pažymėjimą jei nenorite būti perspėti apie "
-"naujus/neskaitytus laiškus šiame aplanke arba jei norite, kad šis aplankas būtų "
-"praleistas einant nuo vieno aplanko su neskaitytais/naujais laiškais prie kito. "
-"Taip galima daryti norint ignoruoti naujus/neskaitytus laiškus šlamšto ar "
-"šiukšliadėžės aplanke.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Įgalinus šią parinktį būsite perspėti apie naujus/neskaitytus laiškus "
+"šiame aplanke. Be to, judant į kitą/ankstesnį aplanką bus sustota prie šio "
+"aplanko.</p><p>Panaikinkite šios parinkties pažymėjimą jei nenorite būti "
+"perspėti apie naujus/neskaitytus laiškus šiame aplanke arba jei norite, kad "
+"šis aplankas būtų praleistas einant nuo vieno aplanko su neskaitytais/"
+"naujais laiškais prie kito. Taip galima daryti norint ignoruoti naujus/"
+"neskaitytus laiškus šlamšto ar šiukšliadėžės aplanke.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7951,9 +7779,9 @@ msgstr "Laikyti atsakymus šiame aplanke"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Pažymėkite šią parinktį, jei norite, kad atsakymai, kuriuos rašote laiškams "
 "šiame aplanke, po išsiuntimo būtų įkeliami į tą patį aplanką vietoje to, kad "
@@ -7967,17 +7795,21 @@ msgstr "Rodyti siuntėjo/gavėjo stulpelį laiškų sąraše"
 msgid "Sho&w column:"
 msgstr "Ro&dyti stulpelį:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Numatytas"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Siuntėją"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Gavėją"
@@ -7988,17 +7820,17 @@ msgstr "&Siuntėjo tapatybė:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Pažymėkite siuntėjo tapatybę, kuri turi būti naudojama rašant naujus laiškus ar "
-"atsakant į laiškus iš šio aplanko. Tokiu būdu, būdami konkrečiame aplanke, "
-"galite priversti KMail naudoti atitinkamą siuntėjo e. pašto adresą, parašo "
-"ir/ar šifravimo raktus automatiškai. Tapatybes galima nustatyti pagrindiniame "
-"konfigūravimo dialoge. (Nustatymai -> Konfigūruoti KMail)"
+"Pažymėkite siuntėjo tapatybę, kuri turi būti naudojama rašant naujus laiškus "
+"ar atsakant į laiškus iš šio aplanko. Tokiu būdu, būdami konkrečiame "
+"aplanke, galite priversti KMail naudoti atitinkamą siuntėjo e. pašto adresą, "
+"parašo ir/ar šifravimo raktus automatiškai. Tapatybes galima nustatyti "
+"pagrindiniame konfigūravimo dialoge. (Nustatymai -> Konfigūruoti KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -8016,26 +7848,26 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Šis nustatymas apibrėžia, kurie naudotojai, bendrai naudojantys šį aplanką, "
-"turėtų matyti „užimtus“ periodus užimtumo sąrašuose, bei gauti perspėjimus dėl "
-"įvykių ar darbų šiame aplanke. Nustatymas veikia tik Kalendoriaus ir Darbų "
-"aplankus (dėl darbų, šis nustatymas naudojamas tik perspėjimams).\n"
-"Pavyzdiniai naudojimo atvejai: jei viršininkas bendrai naudoja aplanką su savo "
-"sekretore, tik viršininkas turi būti nurodytas kaip „užimtas“ savo susitikimų "
-"metu, todėl  jis turėtų pasirinkti „Administratoriai“, kadangi sekretorė neturi "
-"administravimo teisės konkrečiam aplankui.\n"
+"turėtų matyti „užimtus“ periodus užimtumo sąrašuose, bei gauti perspėjimus "
+"dėl įvykių ar darbų šiame aplanke. Nustatymas veikia tik Kalendoriaus ir "
+"Darbų aplankus (dėl darbų, šis nustatymas naudojamas tik perspėjimams).\n"
+"Pavyzdiniai naudojimo atvejai: jei viršininkas bendrai naudoja aplanką su "
+"savo sekretore, tik viršininkas turi būti nurodytas kaip „užimtas“ savo "
+"susitikimų metu, todėl  jis turėtų pasirinkti „Administratoriai“, kadangi "
+"sekretorė neturi administravimo teisės konkrečiam aplankui.\n"
 "Iš kitos pusės, jei darbo grupė bendrai naudojasi Kalendoriumi grupės "
 "susitikimams, visi aplanko skaitytojai turi būti pažymėti užsiėmusiais "
 "susitikimų metu.\n"
-"Visos įmonės naudojamame aplanke su pasirenkamais įvykiais turi būti nustatyta "
-"„Niekas“, kadangi nėra žinoma, kas eis į konkrečius įvykius."
+"Visos įmonės naudojamame aplanke su pasirenkamais įvykiais turi būti "
+"nustatyta „Niekas“, kadangi nėra žinoma, kas eis į konkrečius įvykius."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8066,23 +7898,24 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr ""
-"Jūs šį aplanką konfigūravote nustatydami, kad jame gali būti saugoti grupinio "
-"darbo programų informacija, bendrosiose konfigūravimo parinktyse numatėte "
-"slėpti grupinio darbo aplankus. Tai reiškia, kad šis aplankas išnyks uždarius "
-"konfigūravimo dialogą. Jei norėsite pašalinti šį aplanką, turėsite trumpam "
-"išjungti grupinio darbo aplankų slėpimą, kad galėtumėte jį pamatyti."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"Jūs šį aplanką konfigūravote nustatydami, kad jame gali būti saugoti "
+"grupinio darbo programų informacija, bendrosiose konfigūravimo parinktyse "
+"numatėte slėpti grupinio darbo aplankus. Tai reiškia, kad šis aplankas "
+"išnyks uždarius konfigūravimo dialogą. Jei norėsite pašalinti šį aplanką, "
+"turėsite trumpam išjungti grupinio darbo aplankų slėpimą, kad galėtumėte jį "
+"pamatyti."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8151,12 +7984,13 @@ msgstr "Klaida gaunant aplanko informaciją."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Laiškų rodyklė „%1“ yra nežinomos KMail (%2) versijos.\n"
 "Šita rodyklė gali būti sugeneruota iš naujo iš Jūsų laiškų aplanko, bet tam "
-"tikra informacija, įskaitant būsenos žymes, gali pradingti. Ar norite apdoroti "
-"savo rodyklės bylą?"
+"tikra informacija, įskaitant būsenos žymes, gali pradingti. Ar norite "
+"apdoroti savo rodyklės bylą?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8172,8 +8006,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"Laiškų rodyklė „%1“ yra sugadinta ir dabar bus atkurta, bet dalis informacijos, "
-"pvz., būsenos vėliavėlės, bus prarasta."
+"Laiškų rodyklė „%1“ yra sugadinta ir dabar bus atkurta, bet dalis "
+"informacijos, pvz., būsenos vėliavėlės, bus prarasta."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8181,11 +8015,11 @@ msgstr "Klaida atveriant %1; šio aplanko nėra."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Klaida atveriant %1. Arba tai nėra teisingas maildir pašto aplankas, arba Jūs "
-"neturite reikiamų prieigos teisių."
+"Klaida atveriant %1. Arba tai nėra teisingas maildir pašto aplankas, arba "
+"Jūs neturite reikiamų prieigos teisių."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8198,8 +8032,8 @@ msgstr "Nepavyko sinchronizuoti maildir pašto aplanko."
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"Laiškai nebuvo pridėti prie aplanko, gali būti, kad taip yra dėl ribotos disko "
-"vietos."
+"Laiškai nebuvo pridėti prie aplanko, gali būti, kad taip yra dėl ribotos "
+"disko vietos."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -8230,21 +8064,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aplanko „%2“ laiškų rodyklė paseno.  Norint išvengti laiškų sugadinimo "
-"rodyklė bus sugeneruota iš naujo.  Dėl to gali atsirasti ištrinti laiškai ir "
-"gali pasikeisti būsenos žymės.</p> "
-"<p>Prašome perskaityti atitinkamą vietą  <a href=\"%1\">"
-"KMail Vadovo D.U.K. skyriuje</a>, kaip ateityje išvengti pakartotino šios "
-"problemos atsiradimo.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Aplanko „%2“ laiškų rodyklė paseno.  Norint išvengti laiškų "
+"sugadinimo rodyklė bus sugeneruota iš naujo.  Dėl to gali atsirasti ištrinti "
+"laiškai ir gali pasikeisti būsenos žymės.</p> <p>Prašome perskaityti "
+"atitinkamą vietą  <a href=\"%1\">KMail Vadovo D.U.K. skyriuje</a>, kaip "
+"ateityje išvengti pakartotino šios problemos atsiradimo.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8305,16 +8135,16 @@ msgstr ""
 "Atrodo, kad „%1“ nėra aplankas.\n"
 "Prašome perkelti bylą, kad ji netrukdytų."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 "Aplanko „%1“ leidimai yra neteisingi;\n"
-"prašome juos pataisyti užtikrinant, kad galėsite peržiūrėti ir keisti aplanko "
-"turinį."
+"prašome juos pataisyti užtikrinant, kad galėsite peržiūrėti ir keisti "
+"aplanko turinį."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8325,8 +8155,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8334,7 +8164,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Nepavyko sukurti aplanko"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8433,12 +8263,12 @@ msgstr "&Tvarkyti IMAP talpyklės problemas..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Dėl netinkamų leidimų serveryje negalima sukurti aplanko <b>%1</b>"
-". Jei norite turėti teisę sukurti ten paaplankius, paprašykite ją suteikti savo "
+"<qt>Dėl netinkamų leidimų serveryje negalima sukurti aplanko <b>%1</b>. Jei "
+"norite turėti teisę sukurti ten paaplankius, paprašykite ją suteikti savo "
 "administratoriaus.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8456,23 +8286,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Nepavyko nukopijuoti ar perkelti aplanko <b>%1</b>"
-", nes aplankas tokiu pavadinimu jau yra.</qt>"
+"<qt>Nepavyko nukopijuoti ar perkelti aplanko <b>%1</b>, nes aplankas tokiu "
+"pavadinimu jau yra.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Nepavyko perkelti ar nukopijuoti aplanko <b>%1</b> "
-"nes jo paties kopijavimas dar nėra baigtas.</qt>"
+"<qt>Nepavyko perkelti ar nukopijuoti aplanko <b>%1</b> nes jo paties "
+"kopijavimas dar nėra baigtas.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Nepavyko perkelti ar nukopijuoti aplanko <b>%1</b> "
-"į paaplankį jame pačiame.</qt>"
+"<qt>Nepavyko perkelti ar nukopijuoti aplanko <b>%1</b> į paaplankį jame "
+"pačiame.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8582,17 +8412,17 @@ msgstr "%1 aplankas skirtas tik skaitymui."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ar Jūs tikrai norite ištrinti %n pasirinktą laišką?"
-"<br>Ištrynus, jis negali būti atstatytas.</qt>\n"
-"<qt>Ar Jūs tikrai norite ištrinti %n pasirinktus laiškus?"
-"<br>Ištrynus, jie negali būti atstatyti.</qt>\n"
-"<qt>Ar Jūs tikrai norite ištrinti %n pasirinktų laiškų?"
-"<br>Ištrynus, jie negali būti atstatyti.</qt>"
+"<qt>Ar Jūs tikrai norite ištrinti %n pasirinktą laišką?<br>Ištrynus, jis "
+"negali būti atstatytas.</qt>\n"
+"<qt>Ar Jūs tikrai norite ištrinti %n pasirinktus laiškus?<br>Ištrynus, jie "
+"negali būti atstatyti.</qt>\n"
+"<qt>Ar Jūs tikrai norite ištrinti %n pasirinktų laiškų?<br>Ištrynus, jie "
+"negali būti atstatyti.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8644,133 +8474,130 @@ msgstr ""
 "Nepavyko modifikuoti %1\n"
 "(Trūksta vietos įrenginyje?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Parašo sertifikato paklausimas"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Prašome sukurti sertifikatą iš priedo ir grąžinti siuntėjui."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail nustatytas dirbti atsijungus; visi darbai tinkle sustabdyti"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail nustatytas dirbti prisijungus; visi darbai tinkle atnaujinami"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail šiuo metu veikia neprisijungęs. Ar norite prisijungti?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Dirbti prisijungus"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Dirbti neprisijungus"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Savo gaunamų laiškų aplankui Jūs neturite skaitymo - rašymo leidimo."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "siunčiami"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Savo siunčiamų laiškų aplankui Jūs neturite skaitymo - rašymo leidimo."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "išsiųsti"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Savo išsiųstų laiškų aplankui Jūs neturite skaitymo - rašymo leidimo."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "šiukšlės"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Savo šiukšliadėžės aplankui Jūs neturite skaitymo - rašymo leidimo."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "juodraščiai"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Savo juodraščių aplankui Jūs neturite skaitymo - rašymo leidimo."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "šablonai"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Savo šablonų aplankui Jūs neturite skaitymo - rašymo leidimo."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Naujausia paieška"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Aplankas<i>%4</i> jau yra. %1 šiuo metu naudoja <i>%5</i> "
-"aplanką savo pranešimams."
-"<p>%2 gali perkelti aplanko <i>%6<i> turinį Jums į šį aplanką, tačiau tokiu "
-"būdu gali būti pakeista bet kuri jau egzistuojanti byla tokiu pačiu pavadinimu, "
-"esanti <i>%7</i>."
-"<p><strong>Ar norite, kad %3 perkeltų pašto bylas dabar?</strong></qt>"
+"<qt>Aplankas<i>%4</i> jau yra. %1 šiuo metu naudoja <i>%5</i> aplanką savo "
+"pranešimams.<p>%2 gali perkelti aplanko <i>%6<i> turinį Jums į šį aplanką, "
+"tačiau tokiu būdu gali būti pakeista bet kuri jau egzistuojanti byla tokiu "
+"pačiu pavadinimu, esanti <i>%7</i>.<p><strong>Ar norite, kad %3 perkeltų "
+"pašto bylas dabar?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Aplankas<i>%4</i> jau yra. %1 šiuo metu naudoja <i>%5</i> "
-"aplanką savo pranešimams."
-"<p>%2 gali perkelti aplanko <i>%6<i> turinį Jums į šį aplanką."
+"<qt>Aplankas<i>%4</i> jau yra. %1 šiuo metu naudoja <i>%5</i> aplanką savo "
+"pranešimams.<p>%2 gali perkelti aplanko <i>%6<i> turinį Jums į šį aplanką."
 "<p><strong>Ar norite, kad %3 perkeltų pašto bylas dabar?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migruoti pašto bylas?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail ištiko lemtinga klaida ir jis bus sustabdytas"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8781,11 +8608,11 @@ msgstr ""
 "Klaida yra:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Ištuštinti šiukšliadėžę"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ar tikrai norite ištuštinti visų paskyrų šiukšliadėžes?"
 
@@ -8861,8 +8688,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Atėjo naujas paštas</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8900,11 +8726,11 @@ msgstr "Ar tikrai norite ištuštinti šiukšliadėžę?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Ar tikrai norite perkelti visus laiškus iš aplanko <b>%1</b> "
-"į šiukšliadėžę?</qt>"
+"<qt>Ar tikrai norite perkelti visus laiškus iš aplanko <b>%1</b> į "
+"šiukšliadėžę?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8928,12 +8754,11 @@ msgstr "Ištrinti paieškos aplanką"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Ar tikrai norite ištrinti paieškos aplanką <b>%1</b>"
-"? Aplanke rodomi laiškai nebus ištrinti, nes jie saugomi kituose "
-"aplankuose.</qt>"
+"<qt>Ar tikrai norite ištrinti paieškos aplanką <b>%1</b>? Aplanke rodomi "
+"laiškai nebus ištrinti, nes jie saugomi kituose aplankuose.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8945,35 +8770,38 @@ msgstr "<qt>Ar tikrai norite pašalinti tuščią aplanką <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "Ar tikrai norite pašalinti tuščią aplanką <b>%1</b> ir visus jo paaplankius? "
 "Paaplankiai gali nebūti tušti, bet jų turinys taip pat bus pašalintas.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Ar tikrai norite pašalinti aplanką <b>%1</b> ir visus jo paaplankius, "
 "pašalindami jų turinį?</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Ar tikrai norite pašalinti aplanką <b>%1</b> ir visus jo paaplankius, "
 "pašalindami jų turinį?</qt>"
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Pašalintas"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8988,9 +8816,9 @@ msgstr "Ar tikrai norite sunaikinti visus senus laiškus?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Naudojant laiškuose HTML gali padidėti tikimybė gauti „šlamštą“;  taip pat "
 "išauga Jūsų sistemos pažeidimo dėl esamų ar būsimų saugumo skylių tikimybė."
@@ -9006,8 +8834,8 @@ msgstr "Naudoti HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Įkeliant išorines HTML nuorodas padidėja tikimybė gauti „šlamštą“; taip pat "
 "išauga Jūsų sistemos pažeidimo dėl esamų ar būsimų saugumo spragų tikimybė."
@@ -9026,13 +8854,14 @@ msgstr "Filtruoti pagal pašto sąrašą %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMail „Nesu darbo vietoje“ atsakymų kūrimas priklauso nuo serverio pusės "
 "filtravimo. Šiam tikslui Jūs dar nesukonfigūravote IMAP serverio.\n"
-"Tai galite atlikti „Filtravimo“ kortelėje IMAP paskyros konfigūravimo dialoge."
+"Tai galite atlikti „Filtravimo“ kortelėje IMAP paskyros konfigūravimo "
+"dialoge."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -9048,10 +8877,11 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Nepavyksta startuoti GnuPG žurnalų žiūryklės (kwatchgnupg); prašome patikrinti, "
-"ar ji įdiegta."
+"Nepavyksta startuoti GnuPG žurnalų žiūryklės (kwatchgnupg); prašome "
+"patikrinti, ar ji įdiegta."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9373,8 +9203,7 @@ msgstr "Į&rašyti priedus..."
 msgid "Appl&y All Filters"
 msgstr "Pritaikyti &visus filtrus"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Pritaik&yti filtrą"
@@ -9488,7 +9317,6 @@ msgstr "Kitas &neskaitytas laiškas"
 msgid "Go to the next unread message"
 msgstr "Eiti į ankstesnį neskaitytą laišką"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Ankstesnis laiškas"
@@ -9536,8 +9364,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Slinkti žemyn esamo laiško tekstu.  Jei pasiektas laiško galas, eiti prie kito "
-"neskaityto laiško."
+"Slinkti žemyn esamo laiško tekstu.  Jei pasiektas laiško galas, eiti prie "
+"kito neskaityto laiško."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9629,21 +9457,21 @@ msgstr " Sužadinama..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Šis laiškas atėjo su prašymu išsiųsti pranešimą apie pristatymą.\n"
-"Galite ignoruoti šį prašymą, arba leisti KMail siųsti pranešimą „atmesta“, arba "
-"- įprastą atsakymą."
+"Galite ignoruoti šį prašymą, arba leisti KMail siųsti pranešimą „atmesta“, "
+"arba - įprastą atsakymą."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Šis laiškas atėjo su prašymu išsiųsti pranešimą apie pristatymą.\n"
@@ -9653,34 +9481,34 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Šis laiškas atėjo su prašymu išsiųsti pranešimą apie pristatymą,\n"
 "tačiau prašoma išsiųsti pranešimus daugiau nei vienu adresu.\n"
-"Galite ignoruoti šį prašymą, arba leisti KMail siųsti pranešimą „atmesta“, arba "
-"- įprastą atsakymą."
+"Galite ignoruoti šį prašymą, arba leisti KMail siųsti pranešimą „atmesta“, "
+"arba - įprastą atsakymą."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Šis laiškas atėjo su prašymu išsiųsti pranešimą apie pristatymą,\n"
 "tačiau nėra nurodytas atsakymo siuntimo kelias.\n"
-"Galite ignoruoti šį prašymą, arba leisti KMail siųsti pranešimą „atmesta“, arba "
-"- įprastą atsakymą."
+"Galite ignoruoti šį prašymą, arba leisti KMail siųsti pranešimą „atmesta“, "
+"arba - įprastą atsakymą."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9689,8 +9517,8 @@ msgstr ""
 "Šiame laiške yra prašymas pateikti pranešimą apie pristatymą,\n"
 "tačiau atsakymo siuntimui nurodytas adresas skiriasi nuo to, kuriuo prašoma "
 "siųsti pranešimą.\n"
-"Galite ignoruoti prašymą, arba leisti KMail siųsti atsakymą „atmesta“, arba - "
-"siųsti įprastą pranešimą."
+"Galite ignoruoti prašymą, arba leisti KMail siųsti atsakymą „atmesta“, arba "
+"- siųsti įprastą pranešimą."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9709,24 +9537,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Antraštė „Disposition-Notification-Options“ turi reikalaujamą tačiau nežinomą "
-"parametrą"
+"Antraštė „Disposition-Notification-Options“ turi reikalaujamą tačiau "
+"nežinomą parametrą"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Patvirtinimas: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Priedas: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Rodyti priedus taip, kaip rekomenduoja siuntėjas."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9776,45 +9604,37 @@ msgstr "Laiško dalies savybės"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bylos <em>MIME tipas</em>:</p>"
-"<p>paprastai jums nereikia liesti šio nustatymo, kadangi bylos tipas "
-"patikrinamas automatiškai; Tačiau kartais %1 gali nedetekuoti teisingo tipo.  "
-"Čia Jūs galite tai pataisyti.</p></qt>"
+"<qt><p>Bylos <em>MIME tipas</em>:</p><p>paprastai jums nereikia liesti šio "
+"nustatymo, kadangi bylos tipas patikrinamas automatiškai; Tačiau kartais %1 "
+"gali nedetekuoti teisingo tipo.  Čia Jūs galite tai pataisyti.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dalies dydis:</p>"
-"<p>kartais %1 nurodo čia tik numanomą dydį, kadangi tikslaus dydžio "
-"skaičiavimas užimtų per daug laiko. Tokiu atveju tai pažymima pridedant "
-"„(apyt.)“ prie rodomo dydžio.</p></qt>"
+"<qt><p>Dalies dydis:</p><p>kartais %1 nurodo čia tik numanomą dydį, kadangi "
+"tikslaus dydžio skaičiavimas užimtų per daug laiko. Tokiu atveju tai "
+"pažymima pridedant „(apyt.)“ prie rodomo dydžio.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dalies bylos vardas:</p>"
-"<p>nors tai parenkama pagal pridedamos bylos vardą, tai nenurodo bylos, kuri "
-"bus prisegta; vietoje to, tai nurodo bylos vardą, kurį naudos gavėjo pašto "
-"programa išsaugodama laiško dalį diske.</p></qt>"
+"<qt><p>Dalies bylos vardas:</p><p>nors tai parenkama pagal pridedamos bylos "
+"vardą, tai nenurodo bylos, kuri bus prisegta; vietoje to, tai nurodo bylos "
+"vardą, kurį naudos gavėjo pašto programa išsaugodama laiško dalį diske.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9822,17 +9642,14 @@ msgstr "Ap&rašymas:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Laiško dalies aprašymas:</p>"
-"<p>Tai tik informacinis dalies aprašymas, panašiai kaip laiško tema visam "
-"laiškui; daugelis laiško programų rodo šią informaciją laiškų peržiūros metu, "
-"kartu su priedo ženkliuku.</p></qt>"
+"<qt><p>Laiško dalies aprašymas:</p><p>Tai tik informacinis dalies aprašymas, "
+"panašiai kaip laiško tema visam laiškui; daugelis laiško programų rodo šią "
+"informaciją laiškų peržiūros metu, kartu su priedo ženkliuku.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9840,22 +9657,20 @@ msgstr "&Kodavimas:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Transportuotojo kodavimas šiai daliai:</p>"
-"<p>paprastai jums nereikia to keisti, nes %1 naudoja tinkamą numatytąjį "
-"kodavimą, priklausomai nuo MIME tipo; vis tik kartais galite žymiai sumažinti "
-"išsiųsto laiško dydį, pvz. jei PostScript byla neturi dvejetainių duomenų, o "
-"tik paprastą tekstą; tokiu atveju pasirinkę „quoted-printable“ vietoj "
-"numatytojo „base64“ Jūs laimėsite 25% galutinio laiško dydžio.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Transportuotojo kodavimas šiai daliai:</p><p>paprastai jums nereikia "
+"to keisti, nes %1 naudoja tinkamą numatytąjį kodavimą, priklausomai nuo MIME "
+"tipo; vis tik kartais galite žymiai sumažinti išsiųsto laiško dydį, pvz. jei "
+"PostScript byla neturi dvejetainių duomenų, o tik paprastą tekstą; tokiu "
+"atveju pasirinkę „quoted-printable“ vietoj numatytojo „base64“ Jūs laimėsite "
+"25% galutinio laiško dydžio.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9863,21 +9678,18 @@ msgstr "Siūlyti parodyti &automatiškai"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pažymėkite šią parinktį, jei norite, kad gavėjui ši dalis būtų rodoma "
-"automatiškai laiško peržiūros metu kartu su laiško tekstu, vietoje numatytojo "
-"vaizdo ženkliuko pavidalu.</p>"
-"<p>Techniškai tai įgyvendinama nustatant šios dalies <em>"
-"Content-Disposition</em> (turinio išdėstymas) antraštės reikšmę lygia „inline“ "
-"(tekste) vietoje numatytosios „attachment“ (priedo) reikšmės.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Pažymėkite šią parinktį, jei norite, kad gavėjui ši dalis būtų rodoma "
+"automatiškai laiško peržiūros metu kartu su laiško tekstu, vietoje "
+"numatytojo vaizdo ženkliuko pavidalu.</p><p>Techniškai tai įgyvendinama "
+"nustatant šios dalies <em>Content-Disposition</em> (turinio išdėstymas) "
+"antraštės reikšmę lygia „inline“ (tekste) vietoje numatytosios "
+"„attachment“ (priedo) reikšmės.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9885,14 +9697,12 @@ msgstr "Pa&sirašyti šią dalį"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pažymėkite šią parinktį, jei norite pasirašyti šią laiško dalį;</p>"
-"<p>parašas bus sukurtas naudojant raktą, kurį Jūs susiejote su šiuo metu "
+"<qt><p>Pažymėkite šią parinktį, jei norite pasirašyti šią laiško dalį;</"
+"p><p>parašas bus sukurtas naudojant raktą, kurį Jūs susiejote su šiuo metu "
 "pažymėta tapatybe.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9901,13 +9711,11 @@ msgstr "Už&šifruoti šią dalį"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pažymėkite šią parinktį, jei norite, kad ši laiško dalis būtų šifruota;</p>"
-"<p>laiško dalis bus šifruojama laiško gavėjams</p></qt>"
+"<qt><p>Pažymėkite šią parinktį, jei norite, kad ši laiško dalis būtų "
+"šifruota;</p><p>laiško dalis bus šifruojama laiško gavėjams</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9921,15 +9729,13 @@ msgstr "POP filtras"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Laiškai filtravimui, rasti Jūsų POP paskyroje: <b>%1</b>"
-"<p>Rodomi laiškai viršijo Jūsų nurodytą šiai paskyrai dydžio limitą. "
-"<br> Jūs galite pasirinkti, ką su jais daryti, pažymėdami atitinkamą mygtuką."
+"Laiškai filtravimui, rasti Jūsų POP paskyroje: <b>%1</b><p>Rodomi laiškai "
+"viršijo Jūsų nurodytą šiai paskyrai dydžio limitą. <br> Jūs galite "
+"pasirinkti, ką su jais daryti, pažymėdami atitinkamą mygtuką."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10185,40 +9991,39 @@ msgstr "K darbastalio aplinkos e. pašto klientas"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Gaunami aplankų turiniai</h2>"
-"<p>Prašome palaukti . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Gaunami aplankų turiniai</h2><p>Prašome "
+"palaukti . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Neprisijungęs</h2>"
-"<p>KMail šiuo metu veikia neprisijungęs. Spauskite <a href=\"kmail:goOnline\">"
-"čia</a> norėdami prisijungti . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Neprisijungęs</h2><p>KMail šiuo metu veikia "
+"neprisijungęs. Spauskite <a href=\"kmail:goOnline\">čia</a> norėdami "
+"prisijungti . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10226,18 +10031,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Jus sveikina KMail %1</h2>"
-"<p>KMail yra K darbastalio aplinkos elektroninio pašto programa. KMail yra "
-"visiškai suderinta su Interneto pašto standartais, įskaitant MIME, SMTP, POP3 "
-"ir IMAP.</p>\n"
-"<ul>"
-"<li>KMail turi daugybę galimybių, kurios yra aprašytos <a href=\"%2\">"
-"documentacijoje</a></li>\n"
+"<h2 style='margin-top: 0px;'>Jus sveikina KMail %1</h2><p>KMail yra K "
+"darbastalio aplinkos elektroninio pašto programa. KMail yra visiškai "
+"suderinta su Interneto pašto standartais, įskaitant MIME, SMTP, POP3 ir IMAP."
+"</p>\n"
+"<ul><li>KMail turi daugybę galimybių, kurios yra aprašytos <a href="
+"\"%2\">documentacijoje</a></li>\n"
 "<li><a href=\"%3\">KMail svetainė</A> pateikia informaciją apie naujas KMail "
 "versijas</li></ul>\n"
 "%8\n"
-"<p>Kai kurios naujos KMail galimybės (lyginant su KMail %4, kuris buvo TDE %5 "
-"dalis):</p>\n"
+"<p>Kai kurios naujos KMail galimybės (lyginant su KMail %4, kuris buvo TDE "
+"%5 dalis):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10245,30 +10049,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp;KMail komanda</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
 "<p>Prašome paskirti laiko KMail konfigūravimo pultui, esančiam Nustatymai- "
 "&gt;Konfigūruoti KMail, užpildyti.\n"
-"Jums reikia sukurti bent jau pagrindę tapatybę ir gaunamų, o taip pat siunčiamų "
-"laiškų paskyrą.</p>\n"
+"Jums reikia sukurti bent jau pagrindę tapatybę ir gaunamų, o taip pat "
+"siunčiamų laiškų paskyrą.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Svarbiausi pakeitimai</span> "
-"(lyginant su KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Svarbiausi pakeitimai</"
+"span> (lyginant su KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10299,13 +10101,15 @@ msgstr "Rodyti priedą: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Priede yra dvejetainiai duomenys. Bandoma parodyti %n simbolį.]\n"
 "[KMail: Priede yra dvejetainiai duomenys. Bandoma parodyti pirmus %n "
 "simbolius.]\n"
-"[KMail: Priede yra dvejetainiai duomenys. Bandoma parodyti pirmus %n simbolių.]"
+"[KMail: Priede yra dvejetainiai duomenys. Bandoma parodyti pirmus %n "
+"simbolių.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10329,12 +10133,14 @@ msgstr "Atverti priedą?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10356,6 +10162,58 @@ msgstr "(turi atitikti bet kurią iš nurodytų taisyklių)"
 msgid "(match all of the following)"
 msgstr "(turi atitikti visas nurodytas taisykles)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Skaityta"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Senas"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Pašalintas"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Atsakytas"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Persiųstas"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Esantis eilėje"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Išsiųstas"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Stebimas"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignoruojamas"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Šlamštas"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ne šlamštas"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Darbas"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Turi priedą"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10435,29 +10293,30 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Kritinė klaida:  Nepavyksta apdoroti išsiųsto laiško (trūksta vietos?). Laiškas "
-"perkeliamas į aplanką „išsiųsti“."
+"Kritinė klaida:  Nepavyksta apdoroti išsiųsto laiško (trūksta vietos?). "
+"Laiškas perkeliamas į aplanką „išsiųsti“."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Išsiųsto laiško „%1“ perkėlimas iš „siunčiami“ į „išsiųsti“ aplanką nepavyko.\n"
+"Išsiųsto laiško „%1“ perkėlimas iš „siunčiami“ į „išsiųsti“ aplanką "
+"nepavyko.\n"
 "Galimos priežastys yra vietos diske trūkumas ar rašymo leidimo nebuvimas. "
 "Prašome pabandyti ištaisyti problemą ir perkelti laišką rankiniu būdu."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Išsiųsti laišką nenurodžius siuntėjo adreso nėra įmanoma.\n"
-"Prašome įrašyti tapatybės „%1“ e. pašto adresą konfigūracijos dialogo Tapatybės "
-"sekcijoje ir bandyti iš naujo."
+"Prašome įrašyti tapatybės „%1“ e. pašto adresą konfigūracijos dialogo "
+"Tapatybės sekcijoje ir bandyti iš naujo."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10483,8 +10342,8 @@ msgstr "Sužadinu siuntimo procesą..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Jūs pasirinkote siųsti visus eilėje esančius laiškus naudojant nešifruotą "
 "transportą; ar tikrai norite tęsti? "
@@ -10511,15 +10370,17 @@ msgstr "Nepavyko išsiųsti kai kurių eilės laiškų."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Siuntimas nutrauktas:\n"
 "%1\n"
 "Laiškas pasiliks aplanke „siunčiami“ tol, kol problema (pvz., neteisingas "
-"adresas) bus išspręsta, arba, kol pašalinsite laišką iš aplanko „siunčiami“.\n"
+"adresas) bus išspręsta, arba, kol pašalinsite laišką iš aplanko "
+"„siunčiami“.\n"
 "Naudotas šis transportavimo protokolas:\n"
 "  %2"
 
@@ -10529,21 +10390,16 @@ msgstr "Siuntimas nutrauktas"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Siuntimas nesėkmingas:</p>"
-"<p>%1</p>"
-"<p>Laiškas pasiliks aplanke „siunčiami“ tol, kol bus sutvarkyta problema (pvz., "
-"neteisingas adresas), arba kol laiškas bus pašalintas iš aplanko "
-"„siunčiami“.</p>"
-"<p>Naudotas šis transportavimo protokolas: %2</p>"
-"<p>Ar norite toliau siųsti likusius laiškus?"
+"<p>Siuntimas nesėkmingas:</p><p>%1</p><p>Laiškas pasiliks aplanke "
+"„siunčiami“ tol, kol bus sutvarkyta problema (pvz., neteisingas adresas), "
+"arba kol laiškas bus pašalintas iš aplanko „siunčiami“.</p><p>Naudotas šis "
+"transportavimo protokolas: %2</p><p>Ar norite toliau siųsti likusius laiškus?"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10561,15 +10417,17 @@ msgstr "&Nutraukti siuntimą"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Siuntimas nesėkmingas:\n"
 "%1\n"
 "Laiškas pasiliks aplanke „siunčiami“ tol, kol bus sutvarkyta problema (pvz., "
-"neteisingas adresas), arba kol laiškas bus pašalintas iš aplanko „siunčiami“.\n"
+"neteisingas adresas), arba kol laiškas bus pašalintas iš aplanko "
+"„siunčiami“.\n"
 "Naudotas šis transportavimo protokolas:\n"
 "  %2"
 
@@ -10610,19 +10468,19 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 atrodo jau yra paleistas kitame rodyme šiame kompiuteryje. Paleidus %2 "
-"daugiau nei vieną kartą galite prarasti paštą. Neturėtumėte paleisti %1, nebent "
-"esate įsitikinę, kad procesas tikrai nėra paleistas."
+"daugiau nei vieną kartą galite prarasti paštą. Neturėtumėte paleisti %1, "
+"nebent esate įsitikinę, kad procesas tikrai nėra paleistas."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "%1 atrodo jau yra rodomas kitame šio kompiuterio rodyme. Paleidus %1 arba %2 "
 "tuo pačiu metu galite prarasti paštą. Paleisti %2 turėtumėte tik tuo atveju, "
@@ -10630,23 +10488,23 @@ msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"Atrodo, kad %1 jau yra paleistas ant %2. Paleidus %1 dar kartą galite prarasti "
-"paštą. Neturėtumėte paleisti %1, nebent esate įsitikinę, kad procesas tikrai "
-"nėra paleistas ant %2."
+"Atrodo, kad %1 jau yra paleistas ant %2. Paleidus %1 dar kartą galite "
+"prarasti paštą. Neturėtumėte paleisti %1, nebent esate įsitikinę, kad "
+"procesas tikrai nėra paleistas ant %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "Atrodo, kad %1 jau yra paleistas ant %3. Paleidus %1 ir %2 tuo pačiu metu "
-"galite prarasti paštą. Neturėtumėte paleisti %2 šiame kompiuteryje, nebent, jei "
-"esate įsitikinę, kad %1 tikrai nėra paleistas ant %3."
+"galite prarasti paštą. Neturėtumėte paleisti %2 šiame kompiuteryje, nebent, "
+"jei esate įsitikinę, kad %1 tikrai nėra paleistas ant %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10657,6 +10515,10 @@ msgstr "Paleisti %1"
 msgid "Exit"
 msgstr "Išeiti"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nauji laiškai aplanke"
@@ -10684,16 +10546,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDE slaptažodinė nepasiekiama. Primygtinai rekomenduojama naudoti TDE "
 "slaptažodinę slaptažodžių tvarkymui.\n"
-"KMail taip pat gali įrašyti SMTP slaptažodį į konfigūracijos bylą.  Slaptažodis "
-"įrašomas klaidinančiu formatu, tačiau tai neturėtų būti laikoma dalyku, "
-"apsaugančiu nuo dešifravimo bandymu tuo atveju, kai gaunamas priėjimas prie "
-"konfigūracijos bylos.\n"
+"KMail taip pat gali įrašyti SMTP slaptažodį į konfigūracijos bylą.  "
+"Slaptažodis įrašomas klaidinančiu formatu, tačiau tai neturėtų būti laikoma "
+"dalyku, apsaugančiu nuo dešifravimo bandymu tuo atveju, kai gaunamas "
+"priėjimas prie konfigūracijos bylos.\n"
 "Ar norite paskyros „%1“ slaptažodį saugoti konfigūracijos byloje?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10771,11 +10634,12 @@ msgstr "Serveriui &reikia autentikacijos"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Pažymėkite šią parinktį, jei Jūsų SMTP serveriui reikia autentikacijos prieš "
-"priimant laiškus.  Tai žinoma kaip „SMTP su autentikacija“ arba tiesiog ASMTP."
+"priimant laiškus.  Tai žinoma kaip „SMTP su autentikacija“ arba tiesiog "
+"ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10795,15 +10659,14 @@ msgstr "Siųsti &derintą savo mazgo vardą serveriui"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Pažymėkite šią parinktį, jei norite, kad Kmail siųstų derintą mazgo vardą, "
-"identifikuodamas save pašto serveriui. "
-"<p> Tai gali būti naudinga, jei Jūsų sistemos mazgo vardas nenustatytas "
-"teisingai ar siekiant nuslėpti tikrąjį Jūsų sistemos mazgo vardą."
+"identifikuodamas save pašto serveriui. <p> Tai gali būti naudinga, jei Jūsų "
+"sistemos mazgo vardas nenustatytas teisingai ar siekiant nuslėpti tikrąjį "
+"Jūsų sistemos mazgo vardą."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10834,8 +10697,8 @@ msgstr "Galimos tik vietinės bylos."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Mazgo vardo laukas negali būti tuščias. Prašome įrašyti SMTP serverio vardą "
 "arba IP adresą."
@@ -10850,14 +10713,14 @@ msgstr "Klaida pateikiant sąrašą aplankui %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Atsisakant aplankų prenumeratos bus pašalinta informacija, kuri apie aplanką "
-"saugoma lokaliai. Serveryje aplankai nebus pakeisti. Norėdami užsitikrinti, kad "
-"visi vietiniai pakeitimai buvo įrašyti į serverį, paspauskite mygtuką "
+"saugoma lokaliai. Serveryje aplankai nebus pakeisti. Norėdami užsitikrinti, "
+"kad visi vietiniai pakeitimai buvo įrašyti į serverį, paspauskite mygtuką "
 "„Atšaukti“ ir visų pirma pasitikrinkite paštą."
 
 #: localsubscriptiondialog.cpp:124
@@ -10929,7 +10792,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail negalėjo rasti pašto sąrašo šiame aplanke. Prašome įrašyti adresą ranka."
+"KMail negalėjo rasti pašto sąrašo šiame aplanke. Prašome įrašyti adresą "
+"ranka."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -11078,35 +10942,27 @@ msgstr "R&edaguoti laišką"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Crypto priedas pateikė struktūrinę informaciją, kuri negali būti teisingai "
-"apdorota; priedas gali būti sugadintas.</p>"
-"<p>Susisiekite su savo sistemos administratorių.</p></qt>"
+"<qt><p>Crypto priedas pateikė struktūrinę informaciją, kuri negali būti "
+"teisingai apdorota; priedas gali būti sugadintas.</p><p>Susisiekite su savo "
+"sistemos administratorių.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Nerasta aktyvaus Crypto priedo, o įdėtas OpenPGP kodas nepasileidžia "
-"sėkmingai.</p>"
-"<p>Tam pakeisti Jūs turite dvi galimybes:</p>"
-"<ul>"
-"<li><em>arba</em> suaktyvinti priedą pasinaudojant Nustatymai-> "
-"Konfigūruoti KMail->Priedai dialogu, </li>"
-"<li><em>arba</em> nustatyti įprastinius OpenPGP nustatymus to paties dialogo "
-"Tapatybė->Papildomai kortelėje.</li></ul>"
+"sėkmingai.</p><p>Tam pakeisti Jūs turite dvi galimybes:</p><ul><li><em>arba</"
+"em> suaktyvinti priedą pasinaudojant Nustatymai-> Konfigūruoti KMail-"
+">Priedai dialogu, </li><li><em>arba</em> nustatyti įprastinius OpenPGP "
+"nustatymus to paties dialogo Tapatybė->Papildomai kortelėje.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11118,11 +10974,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus programinė sąsaja nepateikia „x-encrypt“ funkcijos. Prašome pranešti "
-"apie šią ydą."
+"Chiasmus programinė sąsaja nepateikia „x-encrypt“ funkcijos. Prašome "
+"pranešti apie šią ydą."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11137,16 +10993,16 @@ msgstr "Chiasmus šifravimo klaida"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Netikėtas atsakymas iš Chiasmus programinės sąsajos: „x-encrypt“ funkcija "
 "nepateikė bitų masyvo. Prašome pranešti apie šią ydą."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Tekste įrašomas OpenPGP formatas nepalaiko priedų pasirašymo ar šifravimo.\n"
@@ -11170,8 +11026,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Peržiūrėjus gavėjų pasirašymo pasirinkimus nustatyta, kad turi būti paklausta, "
-"ar šį laišką pasirašyti.\n"
+"Peržiūrėjus gavėjų pasirašymo pasirinkimus nustatyta, kad turi būti "
+"paklausta, ar šį laišką pasirašyti.\n"
 "Ar norite pasirašyti laišką?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11229,8 +11085,8 @@ msgid ""
 "Sign message instead?"
 msgstr ""
 "Šis laiškas nebus pasirašytas.\n"
-"Siunčiant nepasirašytą laišką gali būti pažeista srities tvarka.\\ Gal norite "
-"pasirašyti laišką?"
+"Siunčiant nepasirašytą laišką gali būti pažeista srities tvarka.\\ Gal "
+"norite pasirašyti laišką?"
 
 #: messagecomposer.cpp:831
 msgid "&Sign All Parts"
@@ -11258,12 +11114,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Peržiūrėjus gavėjų pasirašymo pasirinkimus nustatyta, kad turi būti paklausta, "
-"ar šį laišką šifruoti.\n"
+"Peržiūrėjus gavėjų pasirašymo pasirinkimus nustatyta, kad turi būti "
+"paklausta, ar šį laišką šifruoti.\n"
 "Ar norite šifruoti laišką?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11296,11 +11152,13 @@ msgstr "&Nešifruoti"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Jūs prašėte užšifruoti šį laišką, bei užšifruoti sau siunčiamą kopiją, tačiau "
-"galiojančių ir patikimų šifravimo raktų šiai tapatybei nėra sukonfigūruota."
+"Jūs prašėte užšifruoti šį laišką, bei užšifruoti sau siunčiamą kopiją, "
+"tačiau galiojančių ir patikimų šifravimo raktų šiai tapatybei nėra "
+"sukonfigūruota."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11309,8 +11167,8 @@ msgstr "Siųsti nešifruotą?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Kai kurios šio laiško dalys nebus šifruojamos.\n"
@@ -11326,8 +11184,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Šis laiškas nebus šifruojamas.\n"
-"Nešifruotų laiškų siuntimas gali pažeisti srities tvarką ir/ar atverti slaptą "
-"informaciją. \n"
+"Nešifruotų laiškų siuntimas gali pažeisti srities tvarką ir/ar atverti "
+"slaptą informaciją. \n"
 "Gal norite šifruoti visas laiško dalis?"
 
 #: messagecomposer.cpp:955
@@ -11338,84 +11196,79 @@ msgstr "&Šifruoti visas dalis"
 msgid "Unencrypted Message Warning"
 msgstr "Perspėjimas dėl nešifruoto laiško"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klaida: programa nepateikė jokios šifruotos informacijos.</p>"
-"<p>Praneškite apie šitą ydą:"
-"<br>%2</p></qt>"
+"<qt><p>Klaida: programa nepateikė jokios šifruotos informacijos.</"
+"p><p>Praneškite apie šitą ydą:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Ne visi simboliai patenka į pasirinktą koduotę."
-"<br>"
-"<br>Ar vis tiek siųsti laišką?</qt>"
+"<qt>Ne visi simboliai patenka į pasirinktą koduotę.<br><br>Ar vis tiek "
+"siųsti laišką?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Kai kurie simboliai bus prarasti"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Šalinti simbolius"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Pakeisti koduotę"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Laiško pasirašyti nepavyko, nes pasirinkta sąsaja atrodo nepalaiko pasirašymo; "
-"taip neturėjo atsitikti, prašome pranešti apie šią programos ydą."
+"Laiško pasirašyti nepavyko, nes pasirinkta sąsaja atrodo nepalaiko "
+"pasirašymo; taip neturėjo atsitikti, prašome pranešti apie šią programos ydą."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Laiško pasirašyti nepavyko, nes pasirinkta sąsaja atrodo nepalaiko pasirašymo; "
-"taip neturėjo atsitikti, prašome pranešti apie šią programos ydą."
+"Laiško pasirašyti nepavyko, nes pasirinkta sąsaja atrodo nepalaiko "
+"pasirašymo; taip neturėjo atsitikti, prašome pranešti apie šią programos ydą."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "Pasirašyti nepavyko. Prašome patikrinti, ar gpg-agent programa veikia."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Laiško užšifruoti nepavyko, nes pasirinkta sąsaja atrodo nepalaiko šifravimo; "
-"taip neturėjo atsitikti, prašome pranešti apie šią programos ydą."
+"Laiško užšifruoti nepavyko, nes pasirinkta sąsaja atrodo nepalaiko "
+"šifravimo; taip neturėjo atsitikti, prašome pranešti apie šią programos ydą."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Laiško pasirašyti ir užšifruoti nepavyko, nes pasirinkta sąsaja atrodo "
 "nepalaiko pasirašymo ir šifravimo kartu; taip neturėjo atsitikti, prašome "
@@ -11440,15 +11293,15 @@ msgstr "Pašto dėžės &formatas:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Pasirinkite, ar norite saugoti laiškus šiame aplanke kaip atskiras bylas "
-"(maildir) ar kaip vieną didelę bylą (mbox). KMail numatyta naudoti maildir, ir "
-"šį nustatymą reikia pakeisti tik atskirais atvejais. Jei nesate tikri, palikite "
-"šią parinktį nepakeistą."
+"(maildir) ar kaip vieną didelę bylą (mbox). KMail numatyta naudoti maildir, "
+"ir šį nustatymą reikia pakeisti tik atskirais atvejais. Jei nesate tikri, "
+"palikite šią parinktį nepakeistą."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11457,8 +11310,8 @@ msgstr "Aplanko &turinys:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Pažymėkite, ar naujas aplankas turi būti naudojamas pašto saugojimui, ar "
 "grupinio darbo įrankiams, tokiems, kaip darbai ar lipnūs lapeliai. Numatyta "
@@ -11501,8 +11354,7 @@ msgstr "Skirtingi rezultatai parašams"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Šifravimo variklis negrąžino atviro teksto duomenų."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Būsena: "
 
@@ -11531,11 +11383,11 @@ msgstr "Nerastas %1 priedas."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Laiškas pasirašytas, tačiau parašo galiojimas negali būti patikrintas.<br />"
-"Priežastis: %1"
+"Laiškas pasirašytas, tačiau parašo galiojimas negali būti patikrintas.<br /"
+">Priežastis: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11571,26 +11423,26 @@ msgstr "Šifravimo priedas „%1“ negali iššifruoti jokių laiškų."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Pastaba:</b> Šiame HTML laiške gali būti nuorodų į išorinius paveikslėlius "
-"ir pan. Saugumo/privatumo sumetimais šie objektai iš išorės neįkeliami.  Jei "
-"pasitikite laiško siuntėju, galite įkelti išorinius objektus šiam laiškui <a "
-"href=\"kmail:loadExternal\">spragtelėdami čia</a>."
+"<b>Pastaba:</b> Šiame HTML laiške gali būti nuorodų į išorinius "
+"paveikslėlius ir pan. Saugumo/privatumo sumetimais šie objektai iš išorės "
+"neįkeliami.  Jei pasitikite laiško siuntėju, galite įkelti išorinius "
+"objektus šiam laiškui <a href=\"kmail:loadExternal\">spragtelėdami čia</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Pastaba:</b> Tai yra HTML laiškas.  Saugumo sumetimais rodomas tik HTML "
-"kodas. Jei pasitikite laiško siuntėju, galite aktyvuoti formatuoto HTML rodymą "
-"šiam laiškui <a href=\"kmail:showHTML\">spragtelėdami čia</a>."
+"kodas. Jei pasitikite laiško siuntėju, galite aktyvuoti formatuoto HTML "
+"rodymą šiam laiškui <a href=\"kmail:showHTML\">spragtelėdami čia</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11850,11 +11702,11 @@ msgstr "išsaugota: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Pašto adresas nėra išsaugotas %1, naudojamame pasirašymui, todėl mes negalime "
-"sulyginti jo su siuntėjo adresu %2."
+"Pašto adresas nėra išsaugotas %1, naudojamame pasirašymui, todėl mes "
+"negalime sulyginti jo su siuntėjo adresu %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11969,14 +11821,15 @@ msgstr "Kioslave klaidos pranešimas"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Jūsų „%1“ paskyros POP3 serveris nepalaiko UIDL komandos. Šita komanda yra "
-"reikalinga norint patikimai nustatyti kuriuos serveryje esančius laiškus Kmail "
-"jau skaitė anksčiau;\n"
+"reikalinga norint patikimai nustatyti kuriuos serveryje esančius laiškus "
+"Kmail jau skaitė anksčiau;\n"
 "Dėl to galimybė palikti laiškus serveryje, neveiks kaip pridera."
 
 #: popaccount.cpp:752
@@ -11999,7 +11852,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Išrenkamas laiškas %1 iš %2 (%3 iš %4 KB) iš %5@%6 (%7 KB liko serveryje)."
 
@@ -12017,1882 +11871,15 @@ msgstr "Klaidingas serverio atsakas"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Jūsų serveris nepalaiko TOP komandos. Todėl nėra galimybės pirmiausia išrinkti "
-"ilgų laiškų antraštes prieš juos atsiunčiant."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Eiti"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Aplankas"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Laiškas"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Specialus atsakymas"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Persiųsti"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML įrankių juosta"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Pasirašymas"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automatiškai pas&irašyti laiškus"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Įjungus šią parinktį, visi Jūsų siunčiami laiškai, jei nenurodysite kitaip, bus "
-"pasirašyti; žinoma, išlieka galimybė individualiai išjungti kiekvieno laiško  "
-"pasirašymą."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Šifravimas"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Įgalinus šią parinktį, laiškas/byla bus šifruojamas ne tik gavėjo viešuoju "
-"raktu, bet ir Jūsų raktu. Tai įgalins Jus vėliau iššifruoti laišką/bylą. "
-"Įjungti šią parinktį yra gerai."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Rodyti pa&sirašytą/užšifruotą tekstą po redagavimo"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Įgalinus šią parinktį pasirašytas/užšifruotas tekstas bus rodomas atskirame "
-"lange, taigi, prieš siųsdami galėsite matyti, kaip jis atrodo. Šią parinktį "
-"įgalinti yra gerai tuo atveju, jei norite įsitikinti, kad Jūsų šifravimo "
-"sistema tikrai veikia."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Išsaugoti išsiųstus laiškus ši&fruotu formatu"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Pažymėkite, jei norite išsaugoti laiškus šifruotame pavidale "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Išsaugoti laiškus šifruotus</h1>\n"
-"Kai ši parinktis pažymėta, išsiųsti laiškai išsaugomi šifruotame pavidale, taip "
-"kaip jie buvo išsiųsti.  Tai nėra rekomenduojama, nes Jūs negalėsite "
-"perskaityti laiškų, jei pasibaigs reikalingo sertifikato galiojimo laikas.\n"
-"<p>\n"
-"Tačiau gali būti vietinės taisyklės, kurios reikalauja įjungti šią parinktį.  "
-"Jei abejojate, paklauskite vietinio administratoriaus.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Visuomet rodyti šifravimo raktus &patvirtinimui"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Įgalinus šią parinktį programa visuomet rodys Jums viešųjų raktų sąrašą, iš "
-"kurių galėsite pasirinkti tą, kurį naudosite šifravimui. Jei parinktis "
-"neįjungta, programa rodys šį dialogą tik tuo atveju, jei negalės rasti teisingo "
-"rakto, arba, jei ras keletą naudotinų raktų."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Kada tik įmanoma, automatiškai šifruoti &laiškus"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Įjungus šią parinktį, kiekvienas Jūsų siunčiamas laiškas bus užšifruojamas, "
-"jeigu šifravimas yra galimas ir pageidaujamas. Žinoma, lieka galimybė "
-"individualiai išjungti kiekvieno laiško automatinį šifravimą."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Niekada nepasirašyti/nešifruoti tik iš&saugant kaip juodraštį"
+"Jūsų serveris nepalaiko TOP komandos. Todėl nėra galimybės pirmiausia "
+"išrinkti ilgų laiškų antraštes prieš juos atsiunčiant."
 
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Kaip tai veikia?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Kam: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universalus"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Atsakyti"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Atsakyti visiems"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Persiųsti"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Spart&usis klavišas:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Ša&blono tipas:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Aplanko savybės"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Aplanke yra &pašto sąrašas"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Sąrašo adresas:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Normalus:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "N&eskaityti:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Senų laiškų naikinimas"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Su&naikinti po:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Sunaikinti &skaitytus laiškus?"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Sunaikinti &po:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Sunaikinti &neperskaitytus laiškus"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dienų(-os)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Savaičių(-ės)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mėnesių(-io)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Sudėtingesni"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Siuntėjo tapat&ybė:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Saugojimo formatas:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Dat&os rodymas:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validuoti sertifikatus naudojant CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Įjungus šią parinktį, S/MIME sertifikatai yra patikrinami naudojant Sertifikatų "
-"atšaukimo sąrašus (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validuoti sertifikatus Internete (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Jei ši parinktis pažymėta, S/MIME sertifikatai yra tikrinami pasinaudojant "
-"„Online Certificate Status Protocol“ protokolu (OCSP). Įrašykite OCSP "
-"respondento URL adresą žemiau."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Sertifikato validavimas Internete"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP respondento URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Čia įrašykite serverio, naudojamo sertifikatų tikrinimui (OCSP respondento), "
-"adresą. URL paprastai prasideda http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP atsakytojo parašas:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignoruoti sertifikatų tarnybos URL"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Netikrinti sertifikatų taisyklių"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Siekiant nustatyti, ar sertifikato taisyklė yra leidžiama, GnuPG paprastai "
-"naudoja ~/.gnupg/policies.txt bylą. Jei ši parinktis pažymėta, dėl GnuPG "
-"netikrina, ar sertifikate nurodyta taisyklė yra leidžiama."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Niekuomet neklausti CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Pažymėjus šią parinktį Sertifikatų atšaukimo sąrašai niekuomet nenaudojami "
-"tikrinant S/MIME sertifikatus"
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Parsisiųsti trūkstamus išdavėjo sertifikatus"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Pažymėjus šią parinktį trūkstami sertifikatus išdavusios įstaigos sertifikatai "
-"yra parsisiunčiami, jei to reikia (tai taikoma abiejų tikrinimo metodų atveju, "
-"ir CRL, ir OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP užklausos"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Nevykdyti jokių HTTP užklausų"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Visiškai išjungia HTTP naudojimą su S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP užklausoms naudoti šį proxy: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Naudoti sistemos HTTP proxy:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Pažymėjus šią parinktį, HTTP proxy reikšmė, rodoma dešinėje (ji paprastai "
-"pateikiama aplinkos kintamuoju http_proxy) bus naudojama bet kokiai HTTP "
-"užklausai."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Čia įrašykite jūsų HTTP pavaduojančio serverio adresą, kuris bus naudojamas "
-"visoms HTTP užklausoms, susijusioms su S/MIME. Sintaksė tokia: "
-"mazgas:prievadas, pvz., manoserveris.niekur.lt:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignoruoti CRL platinimo centrų HTTP adresus, nurodytus sertifikate"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Ieškant CRL platinimo vietos paprastai atsižvelgiama į sertifikate esančius "
-"„CRL platinimo centro“ (Angl.: „Distribution point“ - DP) įrašus, kurie "
-"sudaryti iš URL, nurodančių, kaip pasiekti URL. Naudojamas pirmasis pasiektas "
-"DP įrašas. Įjungus šią parinktį visi įrašai, naudojantys HTTP schemą, ieškant "
-"tinkamo DP yra ignoruojami."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP užklausos"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Nevykdyti jokių LDAP užklausų"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Visiškai išjungia LDAP naudojimą su S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignoruoti CRL platinimo centrų LDAP adresus, nurodytus sertifikate"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Ieškant CRL platinimo vietos paprastai atsižvelgiama į sertifikate esančius "
-"„CRL platinimo centro“ (Angl.: „Distribution point“ - DP) įrašus, kurie "
-"sudaryti iš URL, nurodančių, kaip pasiekti URL. Naudojamas pirmasis pasiektas "
-"DP įrašas. Įjungus šią parinktį visi įrašai, naudojantys LDAP schemą, ieškant "
-"tinkamo DP yra ignoruojami."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Pirminis mazgas LDAP užklausoms:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Įrašius čia LDAP serverį visos LDAP užklausos bus visų pirma nukreipiamos į tą "
-"serverį. Tiksliau tariant, šis nustatymas turi viršų visiems nurodytiems "
-"mazgams ir prievadams LDAP URL, ir taip pat bus naudojamas jei mazgas ir "
-"prievadas URL nėra nurodytas. Kiti LDAP serveriai bus naudojami tik tada, jei "
-"nepavyks prisijungti prie „atstovaujančio serverio“.\n"
-"Įrašo sintaksė tokia: „MAZGAS“ arba „MAZGAS:PRIEVADAS“. Jei PRIEVADAS yra "
-"praleistas, bus naudojamas prievadas 389 (standartinis LDAP privdas)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Įdėti..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Grupinio darbo įranga"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Panaikinti šrifto nustatymus"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "neribotas"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Šablonų konfigūravimas"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Atsakyti siuntėjui"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Atsakyti visiems / Atsakyti sąrašui"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Persiųsti laišką"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "&Perspėti bandant išsiųsti nepasirašytus laiškus"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Pažymėkite, jei norite būti perspėti prieš išsiunčiant nepasirašytus laiškus."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti bandant išsiųsti nepasirašytus laiškus</h1>\n"
-"Pažymėjus tai, Jūs būsite perspėti, kai bandysite išsiųsti laiško dalis ar visą "
-"laišką nepasirašytus.\n"
-"<p>\n"
-"Rekomenduojama palikti šią parinktį įjungta didžiausiam saugumui.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Pe&rspėti bandant siųsti nešifruotus laiškus"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Pažymėkite, jei norite būti perspėti prieš siunčiant nešifruotus laiškus."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti bandant siųsti nešifruotus laiškus</h1>\n"
-"Pažymėjus tai Jūs būsite perspėjami, kai tik Jūs bandysite išsiųsti laišką ar "
-"jo dalis nešifruotais.\n"
-"<p>\n"
-"Rekomenduojama palikti šią parinktį įjungta didžiausiai saugumui.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Perspėti, jei &gavėjo e. pašto adreso nėra sertifikate"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Pažymėkite, jei norite, kad jus perspėtų, jei adresas nėra sertifikate"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti, jei gavėjo e. pašto adreso nėra sertifikate</h1>\n"
-"Pažymėjus šią parinktį, perspėjama, jei gavėjo e. pašto adreso nėra "
-"sertifikate, naudojamame šifravimui.\n"
-"<p>\n"
-"Rekomenduojama palikti šią parinktį įjungta didžiausiam saugumui.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Perspėti, jei sertifikatai/raktai neužilgo baigs galioti (slenksčius "
-"konfigūruoti žemiau)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Pasirašymui"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Šifravimui"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dienų(-os)"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Pasirinkite čia dienų skaičių"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti, jei baigiasi parašo sertifikato galiojimo laikas.</h1>\n"
-"Pasirinkite mažiausią dienų skaičių, kurį turi galioti parašo sertifikatas, kad "
-"nebūtų perspėjimo.\n"
-"<p>\n"
-"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti, jei baigiasi šifravimo sertifikato galiojimo laikas.</h1>\n"
-"Pasirinkite mažiausią dienų skaičių, kurį turi galioti šifravimo sertifikatas, "
-"kad nebūtų perspėjimo.\n"
-"<p>\n"
-"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti, jei baigiasi sertifikato grandinėje galiojimo laikas.</h1>\n"
-"Pasirinkite mažiausią dienų skaičių, kurį turi atitikti visi sertifikatai "
-"grandinėje, kad nebūtų perspėjimo.\n"
-"<p>\n"
-"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti, jei baigiasi CA sertifikato galiojimo laikas.</h1>\n"
-"Pasirinkite mažiausią dienų skaičių, kurį turi galioti CA sertifikatas, kad "
-"nebūtų perspėjimo.\n"
-"<p>\n"
-"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Perspėti, jei baigiasi šakninio sertifikato galiojimo laikas.</h1>\n"
-"Pasirinkite mažiausią dienų skaičių, kurį turi galioti šakninissertifikatas, "
-"kad nebūtų perspėjimo.\n"
-"<p>\n"
-"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Root sertifikatams:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Tarpiniams CA sertifikatams:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Galutinių naudotojų sertifikatams/raktams:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Iš naujo įgalinti visus „Daugiau manęs neklausti“ perspėjimus"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Šablono turinys"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Šablono greitasis klavišas"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Šablono tipas"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Siųsti išrikiuotus laiškus tikrinant paštą"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pasirinkite, ar norite, kad KMail siųstų laiškus iš siunčiamų laiškų aplanko "
-"tik rankinio pašto tikrinimo, ar bet kurio pašto tikrinimo metu, arba "
-"nurodykite, kad išvis nenorite laiškų siųsti automatiškai. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Automatiškai perkelti nesinchronizuotus laiškus iš aplankų, kuriems trūksta "
-"prieigos teisių"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Jei šiame aplanke yra naujų laiškų, kurie dar nėra įkelti į serverį, o į "
-"aplanką serveryje rašyti Jūs neturite užtektinai teisių, šie laiškai bus "
-"automatiškai perkelti į aplanką rasta+pamesta."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Šis nustatymas leidžia administratoriams nustatyti minimalų laiko tarpą tarp e. "
-"pašto patikrinimų.\"\n"
-"           \"Naudotojas negalės pasirinkti reikšmės, kuri yra mažesnė už čia "
-"nustatytąją."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Pastutinis pažymėtas aplankas aplankų pasirinkimo dialoge."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Nepaisyti naudotojo „umask“ nustatymo ir naudoti „rašyti ir skaityti tik "
-"naudotojui“ nustatymą vietoje jo"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Taisyklė, nustatanti sistemos dėklo ženkliuko rodymą"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Pranešimas apie naują laišką"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr "++"
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Parinkti re&daktorių:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Vietoje vidinio, naudoti išorinį redaktorių"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Įjungti grupinio darbo įrangos funkcijas"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Sukeisti Nuo:/Kam: antraštes atsakymuose į atsakymus"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook iCalendar standartą įgyvendina nepilnai, jame yra daug "
-"trūkumų; ši parinktis leidžia juos apeiti. Jei Outlook naudotojai negali gauti "
-"Jūsų atsakymų, pamėginkite nustatyti šią parinktį."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Siųsti grupinio darbo įrangos pakvietimus laiško tekste"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook iCalendar standartą įgyvendina nepilnai, jame yra daug "
-"trūkumų; ši parinktis leidžia juos apeiti. Jei Outlook naudotojai negali gauti "
-"Jūsų kvietimų, pamėginkite nustatyti šią parinktį."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Su Exchange suderinami kvietimų pavadinimai"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook, naudojamas kartu su Microsoft Exchange serveriu, turi įdą, "
-"neleidžiančią suprasti standartus atitinkančių grupinio darbo el. laiškų. "
-"Įjunkite šią parinktį norėdami užtikrinti, kad Microsoft Exchange supras "
-"grupinio darbo pakvietimus."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Nustačius šią parinktį laiško redagavimo langas nebus rodomas. Vietoje to, visi "
-"pakvietimo laiškai siunčiami automatiškai. Jei norite perskaityti laišką prieš "
-"jį išsiunčiant, galite išjungti šią parinktį. Tačiau atkreipkite dėmesį, kad "
-"tuomet rodomame redaktoriaus lange matysite iCalendar sintaksę, kurios nedera "
-"keisti ranka."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Įgalinus šią parinktį taps įmanoma saugoti įrašus iš Kontact programų "
-"(KOrganizer, KAddressBook, ir KNotes.)</p>"
-"<p>Jei norite įjungti šią parinktį, turite taip pat nurodyti programoms naudoti "
-"IMAP resursus; tai atliekama TDE valdymo centre.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Paprastai jums nebus reikalo matyti aplankus, turinčius IMAP resursus. "
-"Tačiau jei norėsite juos matyti, galite šią parinktį įgalinti čia.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Jei paskyra naudojama grupinio darbo informacijai saugoti \"\n"
-"          \"ir nenaudojama paprastam paštui, nustatykite, kad KMail \"\n"
-"          \"joje rodytų tik grupinio darbo aplankus. Tai naudinga norint "
-"tvarkyti \"\n"
-"          \"paprastą paštą per papildomą SMTP paskyrą.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Pasirinkite grupinio darbo aplankų saugojimo formatą. "
-"<ul>"
-"<li>Numatytos parinktys yra ical (kalendoriaus aplankams) ir vcard (adresų "
-"knygelės aplankams) standartų naudojimas. Šie formatai įgalina panaudoti visas "
-"Kontact galimybes.</li>"
-"<li>Kolab XML formats naudoja savadarbį modelį, panašų į Outlook naudojamą "
-"modelį. Šis formatas suteikia geresnį suderinamumą su Outlook naudojant Kolab "
-"serverį arba panašų sprendimą.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Čia galima pasirinkti IMAP resursų aplankų aukščiausio lygio aplanką.</p>"
-"<p>Pagal numatytą parinktį Kolab serveris nustato IMAPgaunamų laiškų dėžutę "
-"pagrindiniu aplanku.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Tai yra paskyros, turinčios IMAP resursų aplankus, ID.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Jei norite naudoti IMAP aplankų vardų pavadinimus su savos kalbos "
-"rašmenimis, galite pasirinkti tarp galimų kalbų.</p>"
-"<p> Tačiau atkreipkite dėmesį, kad taip daryti verta tik dėl suderinamumo su "
-"Microsoft Outlook. Manoma, kad taip daryti nėra gerai, nes tuomet neįmanoma "
-"keisti kalbų. </p>"
-"<p>Taigi, nenaudokite šios parinkties, nebent kitaip negalite.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Šis įrašas naudojamas nustatant, ar turi būti rodoma KMail įžanga."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimalus prisijungimų iš mazgo skaičius."
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ši parinktis gali būti naudojama siekiant apriboti maksimalų prisijungimų "
-"skaičių iš mazgo tikrinant naują paštą. Pagal numatytą parinktį, prisijungimų "
-"skaičius nėra ribojamas (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Rodyti greitosios paieškos eilutę"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ši parinktis įgalina arba panaikina paieškos eilutės virš laiškų sąrašo rodymą; "
-"ši eilutė gali būti naudojama greitai ieškoti informacijos laiškų sąraše."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Išlaikyti originalo koduotę atsakant arba persiunčiant, jei tai įmanoma"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomatiškai pridėti parašą"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Atsiminti šią tapatybę, kad ji būtų naudojama ir vėliau atvėrus redaktoriaus "
-"langą.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Atsiminkite šį ieškomų laiškų aplanką kad jis būtų naudojama ir vėliau atvėrus "
-"redaktoriaus langą."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Atsiminti šį pašto siuntimo būdą ir naudoti ateityje atvėrus redaktoriaus "
-"langą."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Atsiminti šią tapatybę, kad ji būtų naudojama ir vėliau atvėrus redaktoriaus "
-"langą.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Kelti žodžiu&s ties simboliu:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Perspėti, jei root sertifikato galiojimas baigiasi anksčiau, nei:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Įgalinkite šią parinktį, jei norite, kad Outlook&#8482; suprastų priedų vardus, "
-"turinčius ne angliškų simbolių."
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Automatiškai prašyti &pranešimo apie laiško pristatymą"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Įjunkite šią parinktį jei norite, kad KMail prašytų pranešimo apie laiško "
-"pristatymą (PLP) dėl kiekvieno Jūsų išsiųsto laiško.</p>"
-"<p>Ši parinktis yra numatytoji parinktis; Jūs vis tiek galėsite įjungti arba "
-"išjungti PLP prašymus redaktoriaus lange kiekvienam laiškui individualiai, "
-"pasirinkdami meniu įrašą <em>Parinktys</em>->&gt;<em>"
-"Prašyti pristatymo pranešimo</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Naudoti neseniai naudotus adresus automatiniam užbaigimui"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Išjunkite šią parinktį jei nenorite, kad neseniai naudoti adresai pasirodytų "
-"automatinio užbaigimo sąraše redaktoriaus adresų laukuose."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Automatinio išsaugojimo intervalas:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"KMail gali reguliariai kurti atsarginę kopiją teksto, esančio redagavimo lange. "
-"Čia nustatomas atsarginių kopijų kūrimo intervalas. Galite panaikinti "
-"automatinį išsaugojimą nustatydami reikšmę „0“."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Pakeisti atpažintą prie&šdėlį su „Re:“"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Pakeisti atpažintą priešdėlį su „&Fwd:“"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Taikyti i&šmanų citavimą"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Parašo galiojimas baigėsi."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Adresato parinkimo dialogo tipas"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Čia nurodomas tipas adresatų parinkimo dialogo laukams „Kam“,\n"
-"        „CC“ ir „BCC“."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Gavimo patvirtinimo redaktoriaus tipas"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Čia galima nustatyti gavėjų redaktorių „Kam“,\n"
-"        „CC“ ir „BCC“ laukų keitimui."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maksimalus gavėjo eilučių skaičius redaktoriaus lange."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Išlaikyti originalo koduotę atsakant arba persiunčiant, jei tai įmanoma"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Kai kurie e. laiškai, ypač - generuoti automatiškai, nenurodo rašmenų koduotės, "
-"kuri būtina, kad juos teisingai rodytų. Tokiais atvejais bus naudojamas "
-"atsarginė rašmenų kodavimo schema, kurią galite nustatyti čia. Nustatykite "
-"koduotę, kuri dažniausiai naudojama Jūsų pasaulio dalyje. Kaip numatyta "
-"parinktis rodoma koduotė, naudojamas visoje sistemoje."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Jei pakeisite numatytąją parinktį „Auto“, nurodyta koduotė bus naudojama "
-"visiems e. laiškams, nesvarbu, kokia koduotė juose nurodyta."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Įgalinkite šią parinktį jei norite kad šypsenėlės, tokios, kaip :-) , būtų "
-"laiškuose rodomos kaip „emocijos“ (maži paveikslėliai)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Įgalinkite šią parinktį jei norite, kad būtų matomi skirtingi cituojamo teksto "
-"lygiai. Išjunkite norėdami paslėpti skirtingus cituojamo teksto lygius."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatinio sutraukimo lygmuo:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Sumažinti cituojamo teksto šrifto dydį"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Įgalinkite šią parinktį jei norite, kad cituojamas  tekstas būtų rodomas "
-"smulkesniu šriftu."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Išsaugoti išsiųstus laiškus ši&fruotu formatu"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Įmantriose antraštėse rodyti siuntėjo programos pavadinimą"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Įjunkite šią parinktį jei norite matyti „User-Agent“ ir „X-Mailer“ laiško "
-"eilutes įmantriose antraštėse."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-"Siųsti pranešimą apie laiškų pristatymą su tuščiu siuntėjo adreso lauku."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Siųsti pranešimą apie laiškų pristatymą su tuščiu siuntėjo adreso lauku. Kai "
-"kurie serveriai gali būti nustatyti atmesti tokius laiškus, taigi, jei turite "
-"problemų siųsdami PLP, panaikinkite šio langelio pažymėjimą."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Frazės buvo išverstos į šablonus"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Senos frazės buvo išverstos į šablonus"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Laiško šablonas naujam laiškui"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Laiško šablonas atsakymui"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Laiško šablonas atsakymui visiems"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Laiško šablonas persiuntimui"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Kabučių ženklai"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 iš %2 %3 panaudota"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14004,6 +11991,11 @@ msgstr "Pridėti prie „CC“"
 msgid "Add as BCC"
 msgstr "Pridėti prie „BCC“"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Nutr&aukti"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14019,10 +12011,10 @@ msgstr "Pažymėti gavėjai"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Jūsų nurodėte %n gavėją. Maksimalus galimas gavėjų skaičius yra %1. Prašome "
 "pataisyti pažymėjimą.\n"
@@ -14045,11 +12037,11 @@ msgstr "Naudoti adresų parinkimo dialogą"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Šis mygtukas atveria atskirą dialogą, kuriame galite pasirinkti gavėjus iš visų "
-"prieinamų adresų."
+"Šis mygtukas atveria atskirą dialogą, kuriame galite pasirinkti gavėjus iš "
+"visų prieinamų adresų."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14151,13 +12143,22 @@ msgstr "yra didesnis arba lygus"
 msgid " bytes"
 msgstr " baitai"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dienų(-os)"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Norėdami įvykdyti paiešką aplanke %1 visi serveryje esantys laiškai turi būti "
-"parsisiųsti iš serverio. Tai gali užtrukti. Ar norite tęsti paiešką?"
+"Norėdami įvykdyti paiešką aplanke %1 visi serveryje esantys laiškai turi "
+"būti parsisiųsti iš serverio. Tai gali užtrukti. Ar norite tęsti paiešką?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14310,16 +12311,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Surenkami duomenys iš paskyros „%1“...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Surenkami duomenys iš paskyros „%1“...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14338,10 +12335,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Scenarijaus „%1“ turinys:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Scenarijaus „%1“ turinys:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14364,20 +12359,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve galimybės:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve galimybės:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Nėra specialių galimybių)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Prieinami Sieve scenarijai:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Prieinami Sieve scenarijai:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14457,11 +12448,11 @@ msgstr "Šiame lauke galite įrašyti pasirinktą statinį parašą."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Nurodykite bylą, kurios tekstas bus pridedamas kaip parašas po kiekvienu naujai "
-"sukuriamo laiško tekstu."
+"Nurodykite bylą, kurios tekstas bus pridedamas kaip parašas po kiekvienu "
+"naujai sukuriamo laiško tekstu."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14477,22 +12468,27 @@ msgstr "Atverti nurodytą bylą teksto redaktoriumi."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Čia galima nurodyti pasirinktą komandą, tiek su, tiek ir be kelio, priklausomai "
-"nuo to, ar ši komanda yra Jūsų Kelyje. Kiekvienam naujam laiškui KMail vykdys "
-"šią komandą ir naudos ką ji pateiks (į standartinę išvestį) kaip parašą. "
-"Paprastai šiame mechanizme naudojamos komandos yra „fortune“ arba „ksig "
-"-random“."
+"Čia galima nurodyti pasirinktą komandą, tiek su, tiek ir be kelio, "
+"priklausomai nuo to, ar ši komanda yra Jūsų Kelyje. Kiekvienam naujam "
+"laiškui KMail vykdys šią komandą ir naudos ką ji pateiks (į standartinę "
+"išvestį) kaip parašą. Paprastai šiame mechanizme naudojamos komandos yra "
+"„fortune“ arba „ksig -random“."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Nurodyti komandą:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "kelias"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Naujas įrašas:"
@@ -14529,6 +12525,11 @@ msgstr "Įdėti paskyrą"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Ar tikrai norite pašalinti tapatybę <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Kam pri&taikyti:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14543,6 +12544,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Redaguoti scenarijų..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14582,9 +12587,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14621,6 +12626,16 @@ msgstr "Neįgalinti"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Nepavyko įterpti turinio iš bylos „%1“: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Kam: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14650,61 +12665,52 @@ msgstr "Nepavyksta vykdyti nukreipimo komandos iš šablono: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Čia galite kurti laiškų šablonus ir juos naudoti rašydami naujus laiškus ar "
-"atsakymus arba persiųsdami laiškus.</p>"
-"<p>Laiškų šablonuose galima naudoti pakaitos simbolius ir komandas pasirenkant "
-"juos iš meniu <i>Įterpti komandą</i> ar teisiog įrašant.</p>"
-"<p>Čia matote konkretaus aplanko šablonus, kurie pakeičia tiek globaliuosius "
-"šablonus, tiek ir konkrečiai tapatybei skirtus šablonus, jei čia taip "
-"nurodoma.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Čia galite kurti laiškų šablonus ir juos naudoti rašydami naujus "
+"laiškus ar atsakymus arba persiųsdami laiškus.</p><p>Laiškų šablonuose "
+"galima naudoti pakaitos simbolius ir komandas pasirenkant juos iš meniu "
+"<i>Įterpti komandą</i> ar teisiog įrašant.</p><p>Čia matote konkretaus "
+"aplanko šablonus, kurie pakeičia tiek globaliuosius šablonus, tiek ir "
+"konkrečiai tapatybei skirtus šablonus, jei čia taip nurodoma.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Čia galite kurti laiškų šablonus ir juos naudoti rašydami naujus laiškus ar "
-"atsakymus arba persiųsdami laiškus.</p>"
-"<p>Laiškų šablonuose galima naudoti pakaitos simbolius ir komandas pasirenkant "
-"juos iš meniu <i>Įterpti komandą</i> ar teisiog įrašant.</p>"
-"<p>Čia matote konkrečios tapatybės šablonus, kurie pakeičia globaliuosius "
-"šablonus; šiuos šablonus taip pat gali pakeisti aplankui skirtais šablonais, "
-"jei tokie nurodomi.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Čia galite kurti laiškų šablonus ir juos naudoti rašydami naujus "
+"laiškus ar atsakymus arba persiųsdami laiškus.</p><p>Laiškų šablonuose "
+"galima naudoti pakaitos simbolius ir komandas pasirenkant juos iš meniu "
+"<i>Įterpti komandą</i> ar teisiog įrašant.</p><p>Čia matote konkrečios "
+"tapatybės šablonus, kurie pakeičia globaliuosius šablonus; šiuos šablonus "
+"taip pat gali pakeisti aplankui skirtais šablonais, jei tokie nurodomi.</p></"
+"qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Čia galite sukurti laiškų šablonus ir juos naudoti kurdami naujus laiškus ar "
-"atsakymus, arba persiųsdami laiškus.</p>"
-"<p>Laiškų šablonuose galima naudoti pakaitos simbolius ir komandas pasirenkant "
-"juos iš meniu <i>Įterpti komandą</i> ar teisiog įrašant.</p>"
-"<p>Čia matote globalųjį (numatytąjį) šabloną. Juos galim pakeisti kiekvienai "
-"tapatybei skirtais šablonais arba aplankui skirtais šablonais, jei tokie "
-"nurodomi.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Čia galite sukurti laiškų šablonus ir juos naudoti kurdami naujus "
+"laiškus ar atsakymus, arba persiųsdami laiškus.</p><p>Laiškų šablonuose "
+"galima naudoti pakaitos simbolius ir komandas pasirenkant juos iš meniu "
+"<i>Įterpti komandą</i> ar teisiog įrašant.</p><p>Čia matote globalųjį "
+"(numatytąjį) šabloną. Juos galim pakeisti kiekvienai tapatybei skirtais "
+"šablonais arba aplankui skirtais šablonais, jei tokie nurodomi.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14958,6 +12964,10 @@ msgstr "Nukreipti dabartinio laiško turinį ir įterpti rezultatą koks jis yra
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Nukreipti dabartinio laiško turinį ir pakeisti rezultatu"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Nustatyti žymeklio poziciją"
@@ -14990,113 +13000,6 @@ msgstr "Įjungti išriktavimą"
 msgid "Turn Debug Off"
 msgstr "Išjungti išriktavimą"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...kad į kitą ar ankstesnį laišką galite peršokti naudodami\n"
-"dešiniosios ir kairiosios rodyklės klavišus?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...kad galite greitai kurti filtrus pagal siuntėją, gavėją,\n"
-"temą ir pašto sąrašus per meniu <em>Įrankiai-&gt;Sukurti&nbsp;filtrą</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...kad Jūs galite atsikratyti &quot;[pašto sąrašo pavadinimas]&quot;,\n"
-"pridedamo prie laiško temos kai kuriuose pašto sąrašuose, naudodami \n"
-"<em>perrašyti antraštę</em> filtro veiksmą?  Tiesiog naudokite\n"
-"<pre>Perrašyti antraštę &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[pašto sąrašo pavadinimas\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...kad galite susieti pašto sąrašus su aplankais\n"
-"<em>Aplankas-&gt;Pašto sąrašų tvarkymas</em> dialoge? Po to galite naudoti\n"
-"<em>Laiškas-&gt;Naujas&nbsp;laiškas&nbsp;pašto&nbsp;sąrašui...</em> "
-"laiškų redaktoriui\n"
-"atverti su nustatytu pašto sąrašo adresu.\n"
-"Taip pat galite spustelėti aplanką viduriniu pelės klavišu.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...kad galite parinkti skirtingus ženkliukus kiekvienam aplankui?\n"
-"Žr. <em>Aplankas-&gt;Savybės</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...kad KMail gali rodyti spalvotą juostelę, nurodančią rodomo \n"
-"laiško tipą (Paprastas tekstas/HTML/OpenPGP)?</p>\n"
-"<p>Tai apsaugo nuo bandymų imituoti sėkmingą parašo patikrinimą\n"
-"siunčiant HTML laiškus, mėgdžiojančius KMail parašo tikrinimo būsenos "
-"rėmelį.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...kad Jūs galite filtruoti pagal bet kurią antraštę, tiesiog įvesdami\n"
-"jos vardą pirmame redaguojamame atrankos taisyklės lauke?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...kad Jūs galite nufiltruoti tik HTML laiškus, naudodami taisyklę\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...kad atsakant į laišką cituojama tik ta jo dalis, kuri prieš tai buvo "
-"pažymėta?</p>\n"
-"<p>Tuo atveju, jei niekas nebuvo pažymėta, cituojamas visas tekstas.</p>\n"
-"<p>Tai galioja ir tekstiniams priedams, kai nustatyta parinktis\n"
-"<em>Rodyti-&gt;Priedai-&gt;Įdėtas tekste</em>.</p>\n"
-"<p>Šią parinktį galima naudoti su visomis atsakymo komandomis\n"
-"išskyrus<em>Laiškas-&gt;Atsakyti necituojant</em>.</p>\n"
-"<p align=\"right\"><em>parašė David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nėra ko atšaukti."
@@ -15165,6 +13068,15 @@ msgstr "Priedas #%1 (bevardis)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Byla pavadinimu „%1“ jau yra. Ar norite ją perrašyti?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Perrašyti bylą?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15282,9 +13194,9 @@ msgstr "&Siųsti paveikslėlį su kiekvienu laišku"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Pažymėkite šią parinktį jei norite, kad KMail pridėtų taip vadinamas X-Face "
 "antraštes iš šios tapatybės rašomuose laiškuose. X-Face yra mažas (48x48 "
@@ -15317,14 +13229,14 @@ msgstr "Pažymėti bylą..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Naudokite tai norėdami pažymėti paveikslėlio bylą, iš kurios norite sukurti "
 "nespalvotą paveikslėlį. Paveikslėlis turi būti didelio kontrasto ir beveik "
-"kvadratinės formos. Geresnių rezultatų pasiekiama, kai paveikslėlio fonas yra "
-"baltas."
+"kvadratinės formos. Geresnių rezultatų pasiekiama, kai paveikslėlio fonas "
+"yra baltas."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15332,17 +13244,17 @@ msgstr "Įdėti iš adresų knygelės"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Galite naudoti sumažintą paveikslėlio versiją, kurią pridėjote prie adresų "
 "knygelės įrašo."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail gali siųsti mažą (48x48 pikselių), žemos kokybės, monochroinį "
 "paveikslėlį su kiekvienu laišku. Tai gali būti, pvz., jūsų nuotrauka ar "
@@ -15355,11 +13267,11 @@ msgstr "Šiame lauke galite įrašyti pasirinktą X-Face eilutę."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Pavyzdžius galima rasti <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Pavyzdžius galima rasti <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15374,130 +13286,1781 @@ msgstr "Paveikslėlio nėra"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Jūsų paties kontaktas nėra aprašytas adresų knygoje."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Pasirašymas"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automatiškai pas&irašyti laiškus"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Įjungus šią parinktį, visi Jūsų siunčiami laiškai, jei nenurodysite kitaip, "
+"bus pasirašyti; žinoma, išlieka galimybė individualiai išjungti kiekvieno "
+"laiško  pasirašymą."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Šifravimas"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Nustatykite laiško temą"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Įgalinus šią parinktį, laiškas/byla bus šifruojamas ne tik gavėjo viešuoju "
+"raktu, bet ir Jūsų raktu. Tai įgalins Jus vėliau iššifruoti laišką/bylą. "
+"Įjungti šią parinktį yra gerai."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Siųsti „CC:“ „adresui“"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Rodyti pa&sirašytą/užšifruotą tekstą po redagavimo"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Siųsti  BCC: („slaptą kopiją“) „adresui“"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Įgalinus šią parinktį pasirašytas/užšifruotas tekstas bus rodomas atskirame "
+"lange, taigi, prieš siųsdami galėsite matyti, kaip jis atrodo. Šią parinktį "
+"įgalinti yra gerai tuo atveju, jei norite įsitikinti, kad Jūsų šifravimo "
+"sistema tikrai veikia."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Pridėti „antraštę“ laiškui"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Išsaugoti išsiųstus laiškus ši&fruotu formatu"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Skaityti laiško tekstą iš „bylos“"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Pažymėkite, jei norite išsaugoti laiškus šifruotame pavidale "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Nustatyti laiško tekstą"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Išsaugoti laiškus šifruotus</h1>\n"
+"Kai ši parinktis pažymėta, išsiųsti laiškai išsaugomi šifruotame pavidale, "
+"taip kaip jie buvo išsiųsti.  Tai nėra rekomenduojama, nes Jūs negalėsite "
+"perskaityti laiškų, jei pasibaigs reikalingo sertifikato galiojimo laikas.\n"
+"<p>\n"
+"Tačiau gali būti vietinės taisyklės, kurios reikalauja įjungti šią "
+"parinktį.  Jei abejojate, paklauskite vietinio administratoriaus.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Pridėti priedą laiškui. Tai gali būti kartojama"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Visuomet rodyti šifravimo raktus &patvirtinimui"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Tik tikrinti naują paštą"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Įgalinus šią parinktį programa visuomet rodys Jums viešųjų raktų sąrašą, iš "
+"kurių galėsite pasirinkti tą, kurį naudosite šifravimui. Jei parinktis "
+"neįjungta, programa rodys šį dialogą tik tuo atveju, jei negalės rasti "
+"teisingo rakto, arba, jei ras keletą naudotinų raktų."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Tik atverti naujo laiško langą"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Kada tik įmanoma, automatiškai šifruoti &laiškus"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Peržiūrėti šią laiško bylą"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Įjungus šią parinktį, kiekvienas Jūsų siunčiamas laiškas bus užšifruojamas, "
+"jeigu šifravimas yra galimas ir pageidaujamas. Žinoma, lieka galimybė "
+"individualiai išjungti kiekvieno laiško automatinį šifravimą."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Niekada nepasirašyti/nešifruoti tik iš&saugant kaip juodraštį"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Kaip tai veikia?"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universalus"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Atsakyti"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Atsakyti visiems"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Persiųsti"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Spart&usis klavišas:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Ša&blono tipas:"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Šablono turinys"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Šablono greitasis klavišas"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Šablono tipas"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Aplanko savybės"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Aplanke yra &pašto sąrašas"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Sąrašo adresas:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Normalus:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "N&eskaityti:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Senų laiškų naikinimas"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Su&naikinti po:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Sunaikinti &skaitytus laiškus?"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Sunaikinti &po:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Sunaikinti &neperskaitytus laiškus"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dienų(-os)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Savaičių(-ės)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mėnesių(-io)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Sudėtingesni"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Siuntėjo tapat&ybė:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Saugojimo formatas:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Dat&os rodymas:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Siųsti išrikiuotus laiškus tikrinant paštą"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Siųsti laišką respondentui, nurodytam „adreso“ lauke, pridėti bylą, į kurią "
-"rodo „URL“"
+"<qt><p>Pasirinkite, ar norite, kad KMail siųstų laiškus iš siunčiamų laiškų "
+"aplanko tik rankinio pašto tikrinimo, ar bet kurio pašto tikrinimo metu, "
+"arba nurodykite, kad išvis nenorite laiškų siųsti automatiškai. </p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Skaityta"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Automatiškai perkelti nesinchronizuotus laiškus iš aplankų, kuriems trūksta "
+"prieigos teisių"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Senas"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Jei šiame aplanke yra naujų laiškų, kurie dar nėra įkelti į serverį, o į "
+"aplanką serveryje rašyti Jūs neturite užtektinai teisių, šie laiškai bus "
+"automatiškai perkelti į aplanką rasta+pamesta."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Pašalintas"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Atsakytas"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Šis nustatymas leidžia administratoriams nustatyti minimalų laiko tarpą tarp "
+"e. pašto patikrinimų.\"\n"
+"           \"Naudotojas negalės pasirinkti reikšmės, kuri yra mažesnė už čia "
+"nustatytąją."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Persiųstas"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Pastutinis pažymėtas aplankas aplankų pasirinkimo dialoge."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Esantis eilėje"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Nepaisyti naudotojo „umask“ nustatymo ir naudoti „rašyti ir skaityti tik "
+"naudotojui“ nustatymą vietoje jo"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Išsiųstas"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Taisyklė, nustatanti sistemos dėklo ženkliuko rodymą"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Stebimas"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignoruojamas"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Pranešimas apie naują laišką"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Šlamštas"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr "++"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ne šlamštas"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Parinkti re&daktorių:"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Darbas"
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Vietoje vidinio, naudoti išorinį redaktorių"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Turi priedą"
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 iš %2 %3 panaudota"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Įjungti grupinio darbo įrangos funkcijas"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "kelias"
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Sukeisti Nuo:/Kam: antraštes atsakymuose į atsakymus"
 
-#: util.h:208
+#: kmail.kcfg:173
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Byla pavadinimu „%1“ jau yra. Ar norite ją perrašyti?"
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook iCalendar standartą įgyvendina nepilnai, jame yra daug "
+"trūkumų; ši parinktis leidžia juos apeiti. Jei Outlook naudotojai negali "
+"gauti Jūsų atsakymų, pamėginkite nustatyti šią parinktį."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Perrašyti bylą?"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Siųsti grupinio darbo įrangos pakvietimus laiško tekste"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook iCalendar standartą įgyvendina nepilnai, jame yra daug "
+"trūkumų; ši parinktis leidžia juos apeiti. Jei Outlook naudotojai negali "
+"gauti Jūsų kvietimų, pamėginkite nustatyti šią parinktį."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Su Exchange suderinami kvietimų pavadinimai"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook, naudojamas kartu su Microsoft Exchange serveriu, turi "
+"įdą, neleidžiančią suprasti standartus atitinkančių grupinio darbo el. "
+"laiškų. Įjunkite šią parinktį norėdami užtikrinti, kad Microsoft Exchange "
+"supras grupinio darbo pakvietimus."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Nustačius šią parinktį laiško redagavimo langas nebus rodomas. Vietoje to, "
+"visi pakvietimo laiškai siunčiami automatiškai. Jei norite perskaityti "
+"laišką prieš jį išsiunčiant, galite išjungti šią parinktį. Tačiau "
+"atkreipkite dėmesį, kad tuomet rodomame redaktoriaus lange matysite "
+"iCalendar sintaksę, kurios nedera keisti ranka."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Įgalinus šią parinktį taps įmanoma saugoti įrašus iš Kontact programų "
+"(KOrganizer, KAddressBook, ir KNotes.)</p><p>Jei norite įjungti šią "
+"parinktį, turite taip pat nurodyti programoms naudoti IMAP resursus; tai "
+"atliekama TDE valdymo centre.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Paprastai jums nebus reikalo matyti aplankus, turinčius IMAP resursus. "
+"Tačiau jei norėsite juos matyti, galite šią parinktį įgalinti čia.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Jei paskyra naudojama grupinio darbo informacijai saugoti \"\n"
+"          \"ir nenaudojama paprastam paštui, nustatykite, kad KMail \"\n"
+"          \"joje rodytų tik grupinio darbo aplankus. Tai naudinga norint "
+"tvarkyti \"\n"
+"          \"paprastą paštą per papildomą SMTP paskyrą.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Pasirinkite grupinio darbo aplankų saugojimo formatą. <ul><li>Numatytos "
+"parinktys yra ical (kalendoriaus aplankams) ir vcard (adresų knygelės "
+"aplankams) standartų naudojimas. Šie formatai įgalina panaudoti visas "
+"Kontact galimybes.</li><li>Kolab XML formats naudoja savadarbį modelį, "
+"panašų į Outlook naudojamą modelį. Šis formatas suteikia geresnį "
+"suderinamumą su Outlook naudojant Kolab serverį arba panašų sprendimą.</li></"
+"ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Čia galima pasirinkti IMAP resursų aplankų aukščiausio lygio aplanką.</"
+"p><p>Pagal numatytą parinktį Kolab serveris nustato IMAPgaunamų laiškų "
+"dėžutę pagrindiniu aplanku.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Tai yra paskyros, turinčios IMAP resursų aplankus, ID.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Jei norite naudoti IMAP aplankų vardų pavadinimus su savos kalbos "
+"rašmenimis, galite pasirinkti tarp galimų kalbų.</p><p> Tačiau atkreipkite "
+"dėmesį, kad taip daryti verta tik dėl suderinamumo su Microsoft Outlook. "
+"Manoma, kad taip daryti nėra gerai, nes tuomet neįmanoma keisti kalbų. </"
+"p><p>Taigi, nenaudokite šios parinkties, nebent kitaip negalite.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Šis įrašas naudojamas nustatant, ar turi būti rodoma KMail įžanga."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimalus prisijungimų iš mazgo skaičius."
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ši parinktis gali būti naudojama siekiant apriboti maksimalų prisijungimų "
+"skaičių iš mazgo tikrinant naują paštą. Pagal numatytą parinktį, "
+"prisijungimų skaičius nėra ribojamas (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Rodyti greitosios paieškos eilutę"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ši parinktis įgalina arba panaikina paieškos eilutės virš laiškų sąrašo "
+"rodymą; ši eilutė gali būti naudojama greitai ieškoti informacijos laiškų "
+"sąraše."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Išlaikyti originalo koduotę atsakant arba persiunčiant, jei tai įmanoma"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomatiškai pridėti parašą"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Atsiminti šią tapatybę, kad ji būtų naudojama ir vėliau atvėrus redaktoriaus "
+"langą.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Atsiminkite šį ieškomų laiškų aplanką kad jis būtų naudojama ir vėliau "
+"atvėrus redaktoriaus langą."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Atsiminti šį pašto siuntimo būdą ir naudoti ateityje atvėrus redaktoriaus "
+"langą."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Atsiminti šią tapatybę, kad ji būtų naudojama ir vėliau atvėrus redaktoriaus "
+"langą.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Kelti žodžiu&s ties simboliu:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Perspėti, jei root sertifikato galiojimas baigiasi anksčiau, nei:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Įgalinkite šią parinktį, jei norite, kad Outlook&#8482; suprastų priedų "
+"vardus, turinčius ne angliškų simbolių."
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Automatiškai prašyti &pranešimo apie laiško pristatymą"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Įjunkite šią parinktį jei norite, kad KMail prašytų pranešimo apie "
+"laiško pristatymą (PLP) dėl kiekvieno Jūsų išsiųsto laiško.</p><p>Ši "
+"parinktis yra numatytoji parinktis; Jūs vis tiek galėsite įjungti arba "
+"išjungti PLP prašymus redaktoriaus lange kiekvienam laiškui individualiai, "
+"pasirinkdami meniu įrašą <em>Parinktys</em>->&gt;<em>Prašyti pristatymo "
+"pranešimo</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Naudoti neseniai naudotus adresus automatiniam užbaigimui"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Išjunkite šią parinktį jei nenorite, kad neseniai naudoti adresai pasirodytų "
+"automatinio užbaigimo sąraše redaktoriaus adresų laukuose."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Automatinio išsaugojimo intervalas:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"KMail gali reguliariai kurti atsarginę kopiją teksto, esančio redagavimo "
+"lange. Čia nustatomas atsarginių kopijų kūrimo intervalas. Galite panaikinti "
+"automatinį išsaugojimą nustatydami reikšmę „0“."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Pakeisti atpažintą prie&šdėlį su „Re:“"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Pakeisti atpažintą priešdėlį su „&Fwd:“"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Taikyti i&šmanų citavimą"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Parašo galiojimas baigėsi."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Adresato parinkimo dialogo tipas"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Čia nurodomas tipas adresatų parinkimo dialogo laukams „Kam“,\n"
+"        „CC“ ir „BCC“."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Gavimo patvirtinimo redaktoriaus tipas"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Čia galima nustatyti gavėjų redaktorių „Kam“,\n"
+"        „CC“ ir „BCC“ laukų keitimui."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maksimalus gavėjo eilučių skaičius redaktoriaus lange."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Išlaikyti originalo koduotę atsakant arba persiunčiant, jei tai įmanoma"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Kai kurie e. laiškai, ypač - generuoti automatiškai, nenurodo rašmenų "
+"koduotės, kuri būtina, kad juos teisingai rodytų. Tokiais atvejais bus "
+"naudojamas atsarginė rašmenų kodavimo schema, kurią galite nustatyti čia. "
+"Nustatykite koduotę, kuri dažniausiai naudojama Jūsų pasaulio dalyje. Kaip "
+"numatyta parinktis rodoma koduotė, naudojamas visoje sistemoje."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Jei pakeisite numatytąją parinktį „Auto“, nurodyta koduotė bus naudojama "
+"visiems e. laiškams, nesvarbu, kokia koduotė juose nurodyta."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Įgalinkite šią parinktį jei norite kad šypsenėlės, tokios, kaip :-) , būtų "
+"laiškuose rodomos kaip „emocijos“ (maži paveikslėliai)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Įgalinkite šią parinktį jei norite, kad būtų matomi skirtingi cituojamo "
+"teksto lygiai. Išjunkite norėdami paslėpti skirtingus cituojamo teksto "
+"lygius."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatinio sutraukimo lygmuo:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Sumažinti cituojamo teksto šrifto dydį"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Įgalinkite šią parinktį jei norite, kad cituojamas  tekstas būtų rodomas "
+"smulkesniu šriftu."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Išsaugoti išsiųstus laiškus ši&fruotu formatu"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Įmantriose antraštėse rodyti siuntėjo programos pavadinimą"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Įjunkite šią parinktį jei norite matyti „User-Agent“ ir „X-Mailer“ laiško "
+"eilutes įmantriose antraštėse."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+"Siųsti pranešimą apie laiškų pristatymą su tuščiu siuntėjo adreso lauku."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Siųsti pranešimą apie laiškų pristatymą su tuščiu siuntėjo adreso lauku. Kai "
+"kurie serveriai gali būti nustatyti atmesti tokius laiškus, taigi, jei "
+"turite problemų siųsdami PLP, panaikinkite šio langelio pažymėjimą."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Frazės buvo išverstos į šablonus"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Senos frazės buvo išverstos į šablonus"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Laiško šablonas naujam laiškui"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Laiško šablonas atsakymui"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Laiško šablonas atsakymui visiems"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Laiško šablonas persiuntimui"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Kabučių ženklai"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Redaguoti &bylą"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Redaguoti..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Eiti"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Aplankas"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Laiškas"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Specialus atsakymas"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Persiųsti"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Panaikinti šrifto nustatymus"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML įrankių juosta"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Bendros parinktys"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML įrankių juosta"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validuoti sertifikatus naudojant CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Įjungus šią parinktį, S/MIME sertifikatai yra patikrinami naudojant "
+"Sertifikatų atšaukimo sąrašus (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validuoti sertifikatus Internete (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Jei ši parinktis pažymėta, S/MIME sertifikatai yra tikrinami pasinaudojant "
+"„Online Certificate Status Protocol“ protokolu (OCSP). Įrašykite OCSP "
+"respondento URL adresą žemiau."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Sertifikato validavimas Internete"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP respondento URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Čia įrašykite serverio, naudojamo sertifikatų tikrinimui (OCSP respondento), "
+"adresą. URL paprastai prasideda http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP atsakytojo parašas:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignoruoti sertifikatų tarnybos URL"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Netikrinti sertifikatų taisyklių"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Siekiant nustatyti, ar sertifikato taisyklė yra leidžiama, GnuPG paprastai "
+"naudoja ~/.gnupg/policies.txt bylą. Jei ši parinktis pažymėta, dėl GnuPG "
+"netikrina, ar sertifikate nurodyta taisyklė yra leidžiama."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Niekuomet neklausti CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Pažymėjus šią parinktį Sertifikatų atšaukimo sąrašai niekuomet nenaudojami "
+"tikrinant S/MIME sertifikatus"
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Parsisiųsti trūkstamus išdavėjo sertifikatus"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Pažymėjus šią parinktį trūkstami sertifikatus išdavusios įstaigos "
+"sertifikatai yra parsisiunčiami, jei to reikia (tai taikoma abiejų tikrinimo "
+"metodų atveju, ir CRL, ir OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP užklausos"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Nevykdyti jokių HTTP užklausų"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Visiškai išjungia HTTP naudojimą su S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP užklausoms naudoti šį proxy: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Naudoti sistemos HTTP proxy:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Pažymėjus šią parinktį, HTTP proxy reikšmė, rodoma dešinėje (ji paprastai "
+"pateikiama aplinkos kintamuoju http_proxy) bus naudojama bet kokiai HTTP "
+"užklausai."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Čia įrašykite jūsų HTTP pavaduojančio serverio adresą, kuris bus naudojamas "
+"visoms HTTP užklausoms, susijusioms su S/MIME. Sintaksė tokia: mazgas:"
+"prievadas, pvz., manoserveris.niekur.lt:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignoruoti CRL platinimo centrų HTTP adresus, nurodytus sertifikate"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Ieškant CRL platinimo vietos paprastai atsižvelgiama į sertifikate esančius "
+"„CRL platinimo centro“ (Angl.: „Distribution point“ - DP) įrašus, kurie "
+"sudaryti iš URL, nurodančių, kaip pasiekti URL. Naudojamas pirmasis "
+"pasiektas DP įrašas. Įjungus šią parinktį visi įrašai, naudojantys HTTP "
+"schemą, ieškant tinkamo DP yra ignoruojami."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP užklausos"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Nevykdyti jokių LDAP užklausų"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Visiškai išjungia LDAP naudojimą su S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignoruoti CRL platinimo centrų LDAP adresus, nurodytus sertifikate"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Ieškant CRL platinimo vietos paprastai atsižvelgiama į sertifikate esančius "
+"„CRL platinimo centro“ (Angl.: „Distribution point“ - DP) įrašus, kurie "
+"sudaryti iš URL, nurodančių, kaip pasiekti URL. Naudojamas pirmasis "
+"pasiektas DP įrašas. Įjungus šią parinktį visi įrašai, naudojantys LDAP "
+"schemą, ieškant tinkamo DP yra ignoruojami."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Pirminis mazgas LDAP užklausoms:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Įrašius čia LDAP serverį visos LDAP užklausos bus visų pirma nukreipiamos į "
+"tą serverį. Tiksliau tariant, šis nustatymas turi viršų visiems nurodytiems "
+"mazgams ir prievadams LDAP URL, ir taip pat bus naudojamas jei mazgas ir "
+"prievadas URL nėra nurodytas. Kiti LDAP serveriai bus naudojami tik tada, "
+"jei nepavyks prisijungti prie „atstovaujančio serverio“.\n"
+"Įrašo sintaksė tokia: „MAZGAS“ arba „MAZGAS:PRIEVADAS“. Jei PRIEVADAS yra "
+"praleistas, bus naudojamas prievadas 389 (standartinis LDAP privdas)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Įdėti..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Grupinio darbo įranga"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Panaikinti šrifto nustatymus"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "neribotas"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Šablonų konfigūravimas"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Atsakyti siuntėjui"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Atsakyti visiems / Atsakyti sąrašui"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Persiųsti laišką"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "&Perspėti bandant išsiųsti nepasirašytus laiškus"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Pažymėkite, jei norite būti perspėti prieš išsiunčiant nepasirašytus laiškus."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti bandant išsiųsti nepasirašytus laiškus</h1>\n"
+"Pažymėjus tai, Jūs būsite perspėti, kai bandysite išsiųsti laiško dalis ar "
+"visą laišką nepasirašytus.\n"
+"<p>\n"
+"Rekomenduojama palikti šią parinktį įjungta didžiausiam saugumui.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Pe&rspėti bandant siųsti nešifruotus laiškus"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Pažymėkite, jei norite būti perspėti prieš siunčiant nešifruotus laiškus."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti bandant siųsti nešifruotus laiškus</h1>\n"
+"Pažymėjus tai Jūs būsite perspėjami, kai tik Jūs bandysite išsiųsti laišką "
+"ar jo dalis nešifruotais.\n"
+"<p>\n"
+"Rekomenduojama palikti šią parinktį įjungta didžiausiai saugumui.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Perspėti, jei &gavėjo e. pašto adreso nėra sertifikate"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Pažymėkite, jei norite, kad jus perspėtų, jei adresas nėra sertifikate"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti, jei gavėjo e. pašto adreso nėra sertifikate</h1>\n"
+"Pažymėjus šią parinktį, perspėjama, jei gavėjo e. pašto adreso nėra "
+"sertifikate, naudojamame šifravimui.\n"
+"<p>\n"
+"Rekomenduojama palikti šią parinktį įjungta didžiausiam saugumui.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Perspėti, jei sertifikatai/raktai neužilgo baigs galioti (slenksčius "
+"konfigūruoti žemiau)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Pasirašymui"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Šifravimui"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Pasirinkite čia dienų skaičių"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti, jei baigiasi parašo sertifikato galiojimo laikas.</h1>\n"
+"Pasirinkite mažiausią dienų skaičių, kurį turi galioti parašo sertifikatas, "
+"kad nebūtų perspėjimo.\n"
+"<p>\n"
+"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti, jei baigiasi šifravimo sertifikato galiojimo laikas.</h1>\n"
+"Pasirinkite mažiausią dienų skaičių, kurį turi galioti šifravimo "
+"sertifikatas, kad nebūtų perspėjimo.\n"
+"<p>\n"
+"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti, jei baigiasi sertifikato grandinėje galiojimo laikas.</h1>\n"
+"Pasirinkite mažiausią dienų skaičių, kurį turi atitikti visi sertifikatai "
+"grandinėje, kad nebūtų perspėjimo.\n"
+"<p>\n"
+"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti, jei baigiasi CA sertifikato galiojimo laikas.</h1>\n"
+"Pasirinkite mažiausią dienų skaičių, kurį turi galioti CA sertifikatas, kad "
+"nebūtų perspėjimo.\n"
+"<p>\n"
+"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Perspėti, jei baigiasi šakninio sertifikato galiojimo laikas.</h1>\n"
+"Pasirinkite mažiausią dienų skaičių, kurį turi galioti šakninissertifikatas, "
+"kad nebūtų perspėjimo.\n"
+"<p>\n"
+"Rekomenduojamas SPHINX nustatymas yra 14 dienų.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Root sertifikatams:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Tarpiniams CA sertifikatams:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Galutinių naudotojų sertifikatams/raktams:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Iš naujo įgalinti visus „Daugiau manęs neklausti“ perspėjimus"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...kad į kitą ar ankstesnį laišką galite peršokti naudodami\n"
+"dešiniosios ir kairiosios rodyklės klavišus?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...kad galite greitai kurti filtrus pagal siuntėją, gavėją,\n"
+"temą ir pašto sąrašus per meniu <em>Įrankiai-&gt;Sukurti&nbsp;filtrą</em>?</"
+"p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...kad Jūs galite atsikratyti &quot;[pašto sąrašo pavadinimas]&quot;,\n"
+"pridedamo prie laiško temos kai kuriuose pašto sąrašuose, naudodami \n"
+"<em>perrašyti antraštę</em> filtro veiksmą?  Tiesiog naudokite\n"
+"<pre>Perrašyti antraštę &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[pašto sąrašo pavadinimas\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...kad galite susieti pašto sąrašus su aplankais\n"
+"<em>Aplankas-&gt;Pašto sąrašų tvarkymas</em> dialoge? Po to galite naudoti\n"
+"<em>Laiškas-&gt;Naujas&nbsp;laiškas&nbsp;pašto&nbsp;sąrašui...</em> laiškų "
+"redaktoriui\n"
+"atverti su nustatytu pašto sąrašo adresu.\n"
+"Taip pat galite spustelėti aplanką viduriniu pelės klavišu.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...kad galite parinkti skirtingus ženkliukus kiekvienam aplankui?\n"
+"Žr. <em>Aplankas-&gt;Savybės</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...kad KMail gali rodyti spalvotą juostelę, nurodančią rodomo \n"
+"laiško tipą (Paprastas tekstas/HTML/OpenPGP)?</p>\n"
+"<p>Tai apsaugo nuo bandymų imituoti sėkmingą parašo patikrinimą\n"
+"siunčiant HTML laiškus, mėgdžiojančius KMail parašo tikrinimo būsenos rėmelį."
+"</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...kad Jūs galite filtruoti pagal bet kurią antraštę, tiesiog įvesdami\n"
+"jos vardą pirmame redaguojamame atrankos taisyklės lauke?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...kad Jūs galite nufiltruoti tik HTML laiškus, naudodami taisyklę\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...kad atsakant į laišką cituojama tik ta jo dalis, kuri prieš tai buvo "
+"pažymėta?</p>\n"
+"<p>Tuo atveju, jei niekas nebuvo pažymėta, cituojamas visas tekstas.</p>\n"
+"<p>Tai galioja ir tekstiniams priedams, kai nustatyta parinktis\n"
+"<em>Rodyti-&gt;Priedai-&gt;Įdėtas tekste</em>.</p>\n"
+"<p>Šią parinktį galima naudoti su visomis atsakymo komandomis\n"
+"išskyrus<em>Laiškas-&gt;Atsakyti necituojant</em>.</p>\n"
+"<p align=\"right\"><em>parašė David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15585,59 +15148,74 @@ msgstr "Perrašyti bylą?"
 #~ msgstr "Šif&ruoti visas laiško dalis"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Pažymėkite, jei norite kad numatyta parinktis būtų visų laiško dalių saugojimas šifruotame pavidale"
+#~ msgstr ""
+#~ "Pažymėkite, jei norite kad numatyta parinktis būtų visų laiško dalių "
+#~ "saugojimas šifruotame pavidale"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Visų laiško dalių šifravimas kaip numatyta parinktis</h1>\n"
-#~ "Pažymėjus šią parinktį visos laiško dalys (t.y., tiek laiško tekstas, tiek ir priedai) bus šifruojami pagal nutylėjimą.\n"
+#~ "Pažymėjus šią parinktį visos laiško dalys (t.y., tiek laiško tekstas, "
+#~ "tiek ir priedai) bus šifruojami pagal nutylėjimą.\n"
 #~ "<p>\n"
-#~ "Tai yra numatyta parinktis, tad kiekvienam individualiam laiškui ją vis tiek galima pakeisti.\n"
+#~ "Tai yra numatyta parinktis, tad kiekvienam individualiam laiškui ją vis "
+#~ "tiek galima pakeisti.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "&Klausti prieš šifruojant kiekvieną dalį"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Pažymėkite jei norite, kad būtų klausiama dėl kiekvienos dalies šifravimo"
+#~ msgstr ""
+#~ "Pažymėkite jei norite, kad būtų klausiama dėl kiekvienos dalies šifravimo"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Klausti prieš šifruojant kiekvieną dalį</h1>\n"
-#~ "Pažymėjus šią parinktį bus klausiama apie kiekvienos laiško dalies šifravimą (t.y., apie laiško tekstą bei kiekvieną priedą) atskirai.\n"
+#~ "Pažymėjus šią parinktį bus klausiama apie kiekvienos laiško dalies "
+#~ "šifravimą (t.y., apie laiško tekstą bei kiekvieną priedą) atskirai.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
 #~ msgstr "&Nešifruoti laiškų"
 
 #~ msgid "Check for not encrypting a message by default"
-#~ msgstr "Pažymėkite jei numatyta parinktimi norite padaryti laiškų siuntimą be šifravimo."
+#~ msgstr ""
+#~ "Pažymėkite jei numatyta parinktimi norite padaryti laiškų siuntimą be "
+#~ "šifravimo."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Nešifruoti laiškų</h1>\n"
-#~ "Jei ši parinktis įjungta, pagal numatytą nustatymą laiškai nebus šifruojami.\n"
+#~ "Jei ši parinktis įjungta, pagal numatytą nustatymą laiškai nebus "
+#~ "šifruojami.\n"
 #~ "<p>\n"
-#~ "Tai yra numatyta parinktis, tad kiekvienam individualiam laiškui ją vis tiek galima pakeisti.\n"
+#~ "Tai yra numatyta parinktis, tad kiekvienam individualiam laiškui ją vis "
+#~ "tiek galima pakeisti.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15649,24 +15227,39 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Šifravimo algoritmas</h1>\n"
-#~ "Algoritmas nusako kompiuteriui, kaip atlikti tam tikrą užduotį. Šifravimo algoritmas nusako, kaip kompiuteris turi užšifruoti laišką gavėjui taip, kad tik numatytas gavėjas galėtų iššifruoti laišką.\n"
+#~ "Algoritmas nusako kompiuteriui, kaip atlikti tam tikrą užduotį. Šifravimo "
+#~ "algoritmas nusako, kaip kompiuteris turi užšifruoti laišką gavėjui taip, "
+#~ "kad tik numatytas gavėjas galėtų iššifruoti laišką.\n"
 #~ "<p>\n"
-#~ "Tam tikro šifravimo algoritmo parinkimas apsprendžia, kiek lengva ar kiek sudėtinga bus perėmus laišką jį perskaityti. Tačiau turėkite omeny, kad visi algoritmai, pateikiami SPHINX aplinkoje, laikomi saugiais. Čia turėtų puikiai veikti numatytas nustatymas.\n"
+#~ "Tam tikro šifravimo algoritmo parinkimas apsprendžia, kiek lengva ar kiek "
+#~ "sudėtinga bus perėmus laišką jį perskaityti. Tačiau turėkite omeny, kad "
+#~ "visi algoritmai, pateikiami SPHINX aplinkoje, laikomi saugiais. Čia "
+#~ "turėtų puikiai veikti numatytas nustatymas.\n"
 #~ "<p>\n"
-#~ "Tai yra numatyta parinktis, tad kiekvienam individualiam laiškui ją vis tiek galima pakeisti.\n"
+#~ "Tai yra numatyta parinktis, tad kiekvienam individualiam laiškui ją vis "
+#~ "tiek galima pakeisti.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
-#~ msgstr "Pažymėkite jei norite, kad sertifikatą patikrinus jis būtų iš&saugotas lokaliai"
+#~ msgstr ""
+#~ "Pažymėkite jei norite, kad sertifikatą patikrinus jis būtų iš&saugotas "
+#~ "lokaliai"
 
 #~ msgid "Check to end with locally saved certificate."
 #~ msgstr "Pažymėkite, jei norite kad sertifikatas būtų lokaliai išsaugotas."
@@ -15674,33 +15267,43 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sertifikatą patikrinus jį galima išsaugoti lokaliai</h1>\n"
-#~ "Pažymėjus šią parinktį sertifikatų grandinės patikrinimas bus užbaigtas kartu išsaugant sertifikatą vietinėje mašinoje.\n"
+#~ "Pažymėjus šią parinktį sertifikatų grandinės patikrinimas bus užbaigtas "
+#~ "kartu išsaugant sertifikatą vietinėje mašinoje.\n"
 #~ "<p>\n"
-#~ "Vietoje išsaugoti sertifikatai - tai Jūsų pačių bei Jūsų susirašinėjimo partnerių sertifikatai, sertifikavimo agentūrų CA) sertifikatai.\n"
+#~ "Vietoje išsaugoti sertifikatai - tai Jūsų pačių bei Jūsų susirašinėjimo "
+#~ "partnerių sertifikatai, sertifikavimo agentūrų CA) sertifikatai.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
 #~ msgstr "Visuomet ly&ginti su root sertifikatu"
 
 #~ msgid "Check here to check up to the root certificate"
-#~ msgstr "Pažymėkite čia jei norite, kad būtų sutikrinta su šakniniu sertifikatu"
+#~ msgstr ""
+#~ "Pažymėkite čia jei norite, kad būtų sutikrinta su šakniniu sertifikatu"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Visuomet sutikrinti sertifikato kelią iki šakninio sertifikato</h1>\n"
-#~ "Įgalinus šią parinktį, sertifikatas, priklausantis kitam gavėjo sertifikatui, bus tikrinamas tol, kol bus pasiektas šakninis sertifikatas.\n"
+#~ "Įgalinus šią parinktį, sertifikatas, priklausantis kitam gavėjo "
+#~ "sertifikatui, bus tikrinamas tol, kol bus pasiektas šakninis "
+#~ "sertifikatas.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15712,16 +15315,20 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Patikrinti sertifikato kelią</h1>\n"
-#~ "Įgalinus šią parinktį, bus tikrinamas visas gavėjo sertifikato kelias iki pat šakninio sertifikato.\n"
+#~ "Įgalinus šią parinktį, bus tikrinamas visas gavėjo sertifikato kelias iki "
+#~ "pat šakninio sertifikato.\n"
 #~ "<p>\n"
-#~ "Atkreipkite dėmesį, kad nėra įmanoma išjungti paties gavėjo sertifikato patikrinimą.\n"
+#~ "Atkreipkite dėmesį, kad nėra įmanoma išjungti paties gavėjo sertifikato "
+#~ "patikrinimą.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15733,33 +15340,48 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Naudoti sertifikatų atšaukimo sąrašus (CRL)</h1>\n"
-#~ "Sertifikatų atšaukimo sąrašuose įtraukti tie sertifikatai, kurie yra atšaukti ir kurių nereikėtų naudoti šifravimui. Naudotojas gali atšaukti sertifikatą tuo atveju, jei įtaria, kad sertifikatas nebėra patikimas (pvz., kas nors atspėjo PIN).\n"
+#~ "Sertifikatų atšaukimo sąrašuose įtraukti tie sertifikatai, kurie yra "
+#~ "atšaukti ir kurių nereikėtų naudoti šifravimui. Naudotojas gali atšaukti "
+#~ "sertifikatą tuo atveju, jei įtaria, kad sertifikatas nebėra patikimas "
+#~ "(pvz., kas nors atspėjo PIN).\n"
 #~ "<p>\n"
-#~ "CRL naudoti rekomenduojama siekiant maksimalaus saugumo. Sertifikatų ir CRL tvarkymo dialoge galite pasirinkti, iš kur CRL turėtų būti parsisiunčiami.\n"
+#~ "CRL naudoti rekomenduojama siekiant maksimalaus saugumo. Sertifikatų ir "
+#~ "CRL tvarkymo dialoge galite pasirinkti, iš kur CRL turėtų būti "
+#~ "parsisiunčiami.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Perspėti jei CRL &baigia galioti už mažiau nei:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Pažymėkite, jei norite, kad jus perspėtų, jei CRL baigia galioti artimoje ateityje"
+#~ msgstr ""
+#~ "Pažymėkite, jei norite, kad jus perspėtų, jei CRL baigia galioti artimoje "
+#~ "ateityje"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perspėti jei CRL baigia galioti artimoje ateityje</h1>\n"
-#~ "Pažymėjus šią parinktį būsite perspėti, jei vienas iš Jūsų naudojamų CRL baigs galioti artimiausioje ateityje.\n"
+#~ "Pažymėjus šią parinktį būsite perspėti, jei vienas iš Jūsų naudojamų CRL "
+#~ "baigs galioti artimiausioje ateityje.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15768,14 +15390,16 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perspėti jei CRL baigia galioti artimoje ateityje</h1>\n"
-#~ "Šiame lauke galite nurodyti, kiek laiko iki CRL galiojimo pabaigos Jus turi apie tai perspėti.\n"
+#~ "Šiame lauke galite nurodyti, kiek laiko iki CRL galiojimo pabaigos Jus "
+#~ "turi apie tai perspėti.\n"
 #~ "<p>\n"
 #~ "SPHINX aplinkoje rekomenduojama nurodyti 7 dienas.\n"
 #~ "</qt>"
@@ -15784,42 +15408,54 @@ msgstr "Perrašyti bylą?"
 #~ msgstr "Visada šifruoti &sau pačiam"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Pažymėkite, jei norite šifruotus laiškus taip pat užšifruoti savo raktu."
+#~ msgstr ""
+#~ "Pažymėkite, jei norite šifruotus laiškus taip pat užšifruoti savo raktu."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Užšifruoti sau</h1>\n"
-#~ "Pažymėjus šią parinktį šifruoti ir Jūsų siunčiami laiškai bus taip pat šifruojami ir Jūsų pačių raktu.\n"
+#~ "Pažymėjus šią parinktį šifruoti ir Jūsų siunčiami laiškai bus taip pat "
+#~ "šifruojami ir Jūsų pačių raktu.\n"
 #~ "<p>\n"
-#~ "Rekomenduojama palikti šią parinktį įjungtą, kad vėliau galėtumėte perskaityti tai, ką išsiuntėte.\n"
+#~ "Rekomenduojama palikti šią parinktį įjungtą, kad vėliau galėtumėte "
+#~ "perskaityti tai, ką išsiuntėte.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
 #~ msgstr "Perspėti jei sertifikatas nustos galioti už &mažiau nei:"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Pažymėkite, jei norite, kad Jus perspėtų, jei sertifikatas greitai nustos galioti"
+#~ msgstr ""
+#~ "Pažymėkite, jei norite, kad Jus perspėtų, jei sertifikatas greitai nustos "
+#~ "galioti"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perspėti jei sertifikatas baigia galioti</h1>\n"
-#~ "Pažymėjus šią parinktį būsite perspėjami, kai bandysite pasinaudoti sertifikatu, kuris baigs galioti už nurodyto laiko tarpo.\n"
+#~ "Pažymėjus šią parinktį būsite perspėjami, kai bandysite pasinaudoti "
+#~ "sertifikatu, kuris baigs galioti už nurodyto laiko tarpo.\n"
 #~ "<p>\n"
-#~ "Rekomenduojama palikti šią parinktį įjungtą siekiant išvengti greitai baigiančių galioti sertifikatų panaudojimo.\n"
+#~ "Rekomenduojama palikti šią parinktį įjungtą siekiant išvengti greitai "
+#~ "baigiančių galioti sertifikatų panaudojimo.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15840,8 +15476,29 @@ msgstr "Perrašyti bylą?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Parenka, kurį sertifikatą siųsti"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Sertifikatų siuntimas</h1> Be Jūsų sertifikato gavėjas negalės nustatyti, ar tai tikrai Jūs išsiuntėte laišką, bei, ar laiškas kartais nebuvo pakeliui pakeistas trečiosios šalies. <p> Gavėjas gali gauti Jūsų sertifikatą iš centrinio serverio, tačiau taip pat galite pridėti savo sertifikatą kartu su laišku. Galite nurodyti, kad išvis nenorite pridėti sertifikatų, tik savo sertifikatą, arba visą sertifikatų grandinę, sertifikuojančią Jūsų pačių sertifikatą, įskaitant šakninį sertifikatą, arba jo neįskaitant. <p> Rekomenduojama prie siunčiamo laiško visuomet pridėti bent jau savo sertifikatą. <p> Tai yra numatytas nustatymas, jį galite pakeisti kiekviename atskirame laiške. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Sertifikatų siuntimas</h1> Be Jūsų sertifikato gavėjas negalės "
+#~ "nustatyti, ar tai tikrai Jūs išsiuntėte laišką, bei, ar laiškas kartais "
+#~ "nebuvo pakeliui pakeistas trečiosios šalies. <p> Gavėjas gali gauti Jūsų "
+#~ "sertifikatą iš centrinio serverio, tačiau taip pat galite pridėti savo "
+#~ "sertifikatą kartu su laišku. Galite nurodyti, kad išvis nenorite pridėti "
+#~ "sertifikatų, tik savo sertifikatą, arba visą sertifikatų grandinę, "
+#~ "sertifikuojančią Jūsų pačių sertifikatą, įskaitant šakninį sertifikatą, "
+#~ "arba jo neįskaitant. <p> Rekomenduojama prie siunčiamo laiško visuomet "
+#~ "pridėti bent jau savo sertifikatą. <p> Tai yra numatytas nustatymas, jį "
+#~ "galite pakeisti kiekviename atskirame laiške. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Siųsti &savo paties sertifikatą"
@@ -15856,63 +15513,78 @@ msgstr "Perrašyti bylą?"
 #~ msgstr "Pasirašyti visas laiško &dalis"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Pažymėkite jei norite, kad visų laiško dalių pasirašymas būtų numatyta parinktis."
+#~ msgstr ""
+#~ "Pažymėkite jei norite, kad visų laiško dalių pasirašymas būtų numatyta "
+#~ "parinktis."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Visų laiško dalių pasirašymas kaip numatyta parinktis</h1>\n"
-#~ "Pažymėjus šią parinktį visos laiško dalys (t.y., ir laiško tekstas, ir priedai) bus pasirašomi automatiškai.\n"
+#~ "Pažymėjus šią parinktį visos laiško dalys (t.y., ir laiško tekstas, ir "
+#~ "priedai) bus pasirašomi automatiškai.\n"
 #~ "<p>\n"
-#~ "Tai yra numatytas nustatymas, jį galite pakeisti kiekviename atskirame laiške.\n"
+#~ "Tai yra numatytas nustatymas, jį galite pakeisti kiekviename atskirame "
+#~ "laiške.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Klausti &prieš pasirašant kiekvieną dalį"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Pažymėkite jei norite, kad dėl kiekvienos dalies pasirašymo būtų klausiama"
+#~ msgstr ""
+#~ "Pažymėkite jei norite, kad dėl kiekvienos dalies pasirašymo būtų klausiama"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Klausti prieš kiekvienos dalies pasirašymą</h1>\n"
-#~ "Pažymėjus šią parinktį bus atskirai klausiama apie kiekvienos laiško dalies (t.y., ir laiško teksto, ir priedų) pasirašymą.\n"
+#~ "Pažymėjus šią parinktį bus atskirai klausiama apie kiekvienos laiško "
+#~ "dalies (t.y., ir laiško teksto, ir priedų) pasirašymą.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
 #~ msgstr "N&epasirašyti laiškų"
 
 #~ msgid "Check for not signing a message by default"
-#~ msgstr "Pažymėkite jei nenorite, kad laiškų pasirašymas būtų numatyta parinktis"
+#~ msgstr ""
+#~ "Pažymėkite jei nenorite, kad laiškų pasirašymas būtų numatyta parinktis"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Nepasirašyti laiškų</h1>\n"
 #~ "Pažymėjus šią parinktį laiškai nebus automatiškai pasirašomi.\n"
 #~ "<p>\n"
-#~ "Tai yra numatyta parinktis, Jūs galite ją pakeisti kiekvienam atskiram laiškui.\n"
+#~ "Tai yra numatyta parinktis, Jūs galite ją pakeisti kiekvienam atskiram "
+#~ "laiškui.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Parašo sertifikatas yra sukonfigūruotas puslapyje <em>Sertifikatai</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Parašo sertifikatas yra sukonfigūruotas puslapyje <em>Sertifikatai</em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15923,20 +15595,34 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Parašo algoritmas</h1>\n"
-#~ "Algoritmas yra kompiuteriui pateikiama tam tikro veiksmo atlikimo instrukcija. Parašo algoritmas aprašo instrukciją, pagal kurią kompiuteris pritaiko Jūsų parašą laiškui, ir pagal kurią gavėjas gali nuspręsti, ar laiškas tikrai atėjo iš Jūsų.\n"
+#~ "Algoritmas yra kompiuteriui pateikiama tam tikro veiksmo atlikimo "
+#~ "instrukcija. Parašo algoritmas aprašo instrukciją, pagal kurią "
+#~ "kompiuteris pritaiko Jūsų parašą laiškui, ir pagal kurią gavėjas gali "
+#~ "nuspręsti, ar laiškas tikrai atėjo iš Jūsų.\n"
 #~ "<p>\n"
-#~ "Tam tikro parašo algoritmo pasirinkimas apsprendžia, kiek sudėtinga ar lengva yra padirbti laišką. Tačiau visi algoritmai, pateikiami su SPHINX aplinka, laikomi labai saugiais. Paprastai puikiai turėtų veikti numatyti nustatymai.\n"
+#~ "Tam tikro parašo algoritmo pasirinkimas apsprendžia, kiek sudėtinga ar "
+#~ "lengva yra padirbti laišką. Tačiau visi algoritmai, pateikiami su SPHINX "
+#~ "aplinka, laikomi labai saugiais. Paprastai puikiai turėtų veikti numatyti "
+#~ "nustatymai.\n"
 #~ "<p>\n"
-#~ "Šis nustatymas yra numatytasis, bet Jūs galite jį pakeisti kiekvienam atskiram laiškui.\n"
+#~ "Šis nustatymas yra numatytasis, bet Jūs galite jį pakeisti kiekvienam "
+#~ "atskiram laiškui.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15951,12 +15637,16 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Saugoti laiškus su parašais</h1>\n"
-#~ "Pažymėjus šią parinktį siunčiami laiškai bus saugomi kartu su jiems pritaikytais parašais. Taip daryti rekomenduotina, nes vėliau galėsite patikrinti, ar pasirašėte tam tikrą laiško dalį, ar ne.\n"
+#~ "Pažymėjus šią parinktį siunčiami laiškai bus saugomi kartu su jiems "
+#~ "pritaikytais parašais. Taip daryti rekomenduotina, nes vėliau galėsite "
+#~ "patikrinti, ar pasirašėte tam tikrą laiško dalį, ar ne.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15971,12 +15661,18 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Parašas kaip atskiras priedas</h1>\n"
-#~ "Įjungus šį parametrą parašas ir pasirašyti duomenys bus atskiros Multipart/Signed laiško dalies dalys. Pasirašyti laiško duomenys bus perskaitomi ir tų pašto programų, kurios nepalaiko parašo algoritmo ir ASN.1 dekodavimo.\n"
+#~ "Įjungus šį parametrą parašas ir pasirašyti duomenys bus atskiros "
+#~ "Multipart/Signed laiško dalies dalys. Pasirašyti laiško duomenys bus "
+#~ "perskaitomi ir tų pašto programų, kurios nepalaiko parašo algoritmo ir "
+#~ "ASN.1 dekodavimo.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15988,12 +15684,16 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Pasirašytų laiškų nepermatomumas</h1>\n"
-#~ "Pažymėjus šią parinktį ir parašas, ir pasirašyti duomenys bus užkoduoti viename ASN.1 bloke. Laiškai bus perskaitomi tik tų pašto programų, kurios palaiko ASN.1 dekodavimą.\n"
+#~ "Pažymėjus šią parinktį ir parašas, ir pasirašyti duomenys bus užkoduoti "
+#~ "viename ASN.1 bloke. Laiškai bus perskaitomi tik tų pašto programų, "
+#~ "kurios palaiko ASN.1 dekodavimą.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -16005,8 +15705,23 @@ msgstr "Perrašyti bylą?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Pažymėkite, kiek dažnai PIN turi būti įvedamas"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN įvedimas</h1> Čia galite nurodyti, kaip bus prašoma įvesti PIN prisijungimui prie asmeninio saugumo aplinkos (PSE) kurioje yra Jūsų sertifikatai. <p> Kuo dažniau bus prašoma įvesti PIN, tuo labiau būsite apsaugoti nuo suklastotų e. pašto laiškų rašymo Jūsų vardu, tačiau tuo pačiu sistemos naudojimas bus mažiau patogus. <p> Jei nesate tikri, ką pasirinkti, palikite šią parinktį nepakeistą. <p> Taip pat atkreipkite dėmesį, kad PIN įvedimo prašymų išjungti visiškai neįmanoma dėl saugumo sumetimų. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN įvedimas</h1> Čia galite nurodyti, kaip bus prašoma įvesti "
+#~ "PIN prisijungimui prie asmeninio saugumo aplinkos (PSE) kurioje yra Jūsų "
+#~ "sertifikatai. <p> Kuo dažniau bus prašoma įvesti PIN, tuo labiau būsite "
+#~ "apsaugoti nuo suklastotų e. pašto laiškų rašymo Jūsų vardu, tačiau tuo "
+#~ "pačiu sistemos naudojimas bus mažiau patogus. <p> Jei nesate tikri, ką "
+#~ "pasirinkti, palikite šią parinktį nepakeistą. <p> Taip pat atkreipkite "
+#~ "dėmesį, kad PIN įvedimo prašymų išjungti visiškai neįmanoma dėl saugumo "
+#~ "sumetimų. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Vieną kartą per sesiją"
@@ -16023,17 +15738,22 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perspėti jei sertifikatas baigia galioti</h1>\n"
-#~ "Pažymėjus šią parinktį būsite perspėjami, kai tik bandysite naudoti sertifikatą, kuris neužilgo nustos galioti.\n"
+#~ "Pažymėjus šią parinktį būsite perspėjami, kai tik bandysite naudoti "
+#~ "sertifikatą, kuris neužilgo nustos galioti.\n"
 #~ "<p>\n"
 #~ "<p>\n"
-#~ "Šią parinktį rekomenduojama naudoti siekiant išvengti baigiančių galioti sertifikatų naudojimo.\n"
+#~ "Šią parinktį rekomenduojama naudoti siekiant išvengti baigiančių galioti "
+#~ "sertifikatų naudojimo.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -16045,17 +15765,31 @@ msgstr "Perrašyti bylą?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perspėti, jei gavėjo e. pašto adreso nėra sertifikate</h1>\n"
-#~ "Pažymėjus šią parinktį, perspėjama, jei gavėjo e. pašto adreso nėra sertifikate, naudojamame pasirašymui.\n"
+#~ "Pažymėjus šią parinktį, perspėjama, jei gavėjo e. pašto adreso nėra "
+#~ "sertifikate, naudojamame pasirašymui.\n"
 #~ "<p>\n"
 #~ "Rekomenduojama palikti šią parinktį įjungta didžiausiam patikimumui.\n"
 #~ "</qt>"
 
-#~ msgid "<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with synchronizing an IMAP folder, you should first try rebuilding the index file. This will take some time to rebuild, but will not cause any problems.</p><p>If that is not enough, you can try refreshing the IMAP cache. If you do this, you will loose all your local changes for this folder and all its subfolders.</p>"
-#~ msgstr "<p><b>IMAP talpyklės sutrikimų šalinimas.</b></p><p>Jei sinchronizuojant IMAP aplanką kyla problemų, visų pirma galite pamėginti atstatyti rodyklės bylą. Tai šiek tiek užtruks, tačiau papildomų problemų nesukels.</p><p>Jei to neužtenka, galite bandyti atnaujinti IMAP talpyklę. Jei tai darysite, prarasite visus vietoje atliktus pakeitimus šiam aplankui ir visiems paaplankiams.</p>"
+#~ msgid ""
+#~ "<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+#~ "synchronizing an IMAP folder, you should first try rebuilding the index "
+#~ "file. This will take some time to rebuild, but will not cause any "
+#~ "problems.</p><p>If that is not enough, you can try refreshing the IMAP "
+#~ "cache. If you do this, you will loose all your local changes for this "
+#~ "folder and all its subfolders.</p>"
+#~ msgstr ""
+#~ "<p><b>IMAP talpyklės sutrikimų šalinimas.</b></p><p>Jei sinchronizuojant "
+#~ "IMAP aplanką kyla problemų, visų pirma galite pamėginti atstatyti "
+#~ "rodyklės bylą. Tai šiek tiek užtruks, tačiau papildomų problemų nesukels."
+#~ "</p><p>Jei to neužtenka, galite bandyti atnaujinti IMAP talpyklę. Jei tai "
+#~ "darysite, prarasite visus vietoje atliktus pakeitimus šiam aplankui ir "
+#~ "visiems paaplankiams.</p>"
diff --git a/tde-i18n-lv/messages/tdepim/kmail.po b/tde-i18n-lv/messages/tdepim/kmail.po
index bbc47101268..888c677cbd6 100644
--- a/tde-i18n-lv/messages/tdepim/kmail.po
+++ b/tde-i18n-lv/messages/tdepim/kmail.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2002-03-23 20:42EEST\n"
 "Last-Translator: Andris Maziks <andzha@latnet.lv>\n"
 "Language-Team: Latvian\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Andris Maziks"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -175,6 +175,12 @@ msgstr "Nav (li&etot uzmanīgi)"
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Tīrs te&ksts"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -258,9 +264,9 @@ msgstr "&Pieteikšanās:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -283,12 +289,12 @@ msgstr "Saglabāt POP pa&roli konfigurācijas failā"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -320,8 +326,9 @@ msgstr ""
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -374,13 +381,15 @@ msgstr "Tīrs te&ksts"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -427,9 +436,9 @@ msgstr "&Nomainīt"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -490,9 +499,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -534,7 +543,7 @@ msgstr "<nav>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "inbokss"
 
@@ -542,28 +551,29 @@ msgstr "inbokss"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -573,23 +583,23 @@ msgstr "Lūdzu norādiet pasta programmu uzstādījumos."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -597,8 +607,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -678,8 +688,8 @@ msgstr "Konts:"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -720,9 +730,9 @@ msgstr ""
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -792,8 +802,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Parak&sts:"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "&Nav"
@@ -928,17 +937,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -972,10 +980,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -986,8 +993,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -998,8 +1005,8 @@ msgstr "Pārvietot Ziņojumu uz Mapi"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -1009,8 +1016,8 @@ msgstr "Marķēt tekošo ziņojumu kā lasītu"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1215,8 +1222,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1238,8 +1245,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1269,15 +1276,15 @@ msgstr "&Veidot..."
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1308,9 +1315,8 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
@@ -1318,6 +1324,11 @@ msgstr ""
 msgid "&Load Profile..."
 msgstr "&Profili"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Konfigurēt &Filtrus..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Pievienot..."
@@ -1350,6 +1361,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Jauna Identitāte"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Aizvākt"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Pievienot..."
@@ -1359,6 +1375,11 @@ msgstr "Pievienot..."
 msgid "Modify..."
 msgstr "&Modificēt..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Aizvākt"
+
 #: configuredialog.cpp:502
 #, fuzzy
 msgid "Set as Default"
@@ -1376,17 +1397,15 @@ msgstr "&Sūtīšana"
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Vārds"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tips"
@@ -1410,8 +1429,7 @@ msgstr "Saglabāt kā Melnrakstu"
 msgid "Common Options"
 msgstr "Kopējās opcijas"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Ap&stiprināt pirms sūtīt"
@@ -1466,14 +1484,14 @@ msgstr "Nokl&usētā sūtīšanas metode:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1493,9 +1511,9 @@ msgstr "Pievienot Transportu"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr ""
 
@@ -1579,6 +1597,10 @@ msgstr "Konfigurēt Akauntu"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "Nevar izveidot kontu"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 #, fuzzy
 msgid "Color&s"
@@ -1700,8 +1722,7 @@ msgstr "Atsekota saite"
 msgid "Misspelled Words"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "Jauns ziņojums"
@@ -1904,8 +1925,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1914,40 +1935,33 @@ msgstr ""
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1963,8 +1977,7 @@ msgstr ""
 msgid "Show s&pam status in fancy headers"
 msgstr "Parak&stīt Ziņojumu"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1973,8 +1986,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2000,8 +2012,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr ""
@@ -2108,13 +2119,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2141,21 +2151,20 @@ msgstr "A&tbildēt visiem:"
 msgid "&Forward:"
 msgstr "Pā&rsūtīt:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr ""
 
@@ -2194,8 +2203,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2230,10 +2239,9 @@ msgstr "Vērtība"
 msgid "Ne&w"
 msgstr "Jau&ns"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nosaukums:"
@@ -2242,16 +2250,15 @@ msgstr "&Nosaukums:"
 msgid "&Value:"
 msgstr "&Vērtība:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2280,13 +2287,13 @@ msgstr "Pielikums: "
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2314,62 +2321,56 @@ msgstr "Iespraudņi"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2387,10 +2388,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2478,8 +2479,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2510,8 +2510,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2537,8 +2537,8 @@ msgstr "Šifrēta ziņojuma beigas"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2611,16 +2611,14 @@ msgstr ""
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2655,32 +2653,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2749,8 +2742,8 @@ msgstr "Izbeigt mapi"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2759,8 +2752,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2815,19 +2808,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Automātiska šifrēšana izmantojot OpenPGP"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automātiska šifrēšana izmantojot OpenPGP"
@@ -2840,14 +2832,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2960,17 +2952,16 @@ msgstr "&Pārsūtīt kā Pielikumu"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2988,15 +2979,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3067,8 +3058,8 @@ msgstr "Rediģēt &Failu"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3328,6 +3319,11 @@ msgstr "Izveidot Mapi"
 msgid "Filters"
 msgstr "Ieslēgt fil&tru Uz..."
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Izvēlēties &Visus Ziņojumus"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3360,8 +3356,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3379,10 +3375,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3405,10 +3402,10 @@ msgstr "nenosaukts"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3417,7 +3414,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 #, fuzzy
 msgid "KMail Error"
@@ -3461,9 +3458,9 @@ msgstr "Drošības Brīdinājums"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3522,8 +3519,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3534,8 +3531,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, fuzzy, c-format
 msgid "Error connecting to server %1"
 msgstr "Nevar savienoties ar serveri %1"
@@ -3561,8 +3557,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3593,7 +3589,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Izveidot Mapi"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 #, fuzzy
 msgid "Local Folders"
@@ -3621,9 +3617,9 @@ msgstr "Meklēt Mapēs"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3647,11 +3643,20 @@ msgstr "Ad&vancēts"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Nezināms"
@@ -3771,39 +3776,13 @@ msgstr ""
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr ""
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr ""
 
 #: identitydialog.cpp:93
@@ -3818,12 +3797,9 @@ msgstr "&Nosaukums:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3832,11 +3808,9 @@ msgstr "Organi&zācija:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3846,14 +3820,11 @@ msgstr "Epasta adrese:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3863,21 +3834,12 @@ msgstr "Epasta adrese:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3901,12 +3863,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3921,20 +3882,18 @@ msgstr "Jūsu OpenPGP Atslēga"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3954,11 +3913,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3972,18 +3930,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -4007,14 +3964,12 @@ msgstr "A&tbildēt-Uz Adresi:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -4024,15 +3979,12 @@ msgstr "&Pasta Adrese:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -4077,7 +4029,7 @@ msgstr "Parak&sts:"
 msgid "&Picture"
 msgstr "Parak&sts:"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 #, fuzzy
 msgid "Invalid Email Address"
 msgstr "Pievienot epasta adresi"
@@ -4097,8 +4049,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4149,8 +4101,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr ""
 
@@ -4201,14 +4153,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4250,14 +4202,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "No: "
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4421,14 +4378,14 @@ msgstr "&Pasta Adrese:"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4456,136 +4413,110 @@ msgstr "Šifrēšana"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4600,136 +4531,110 @@ msgstr "Drošības Brīdinājums"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4743,9 +4648,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4772,26 +4678,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4802,8 +4708,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4825,8 +4731,8 @@ msgstr ""
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4848,8 +4754,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4887,11 +4793,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4933,8 +4839,7 @@ msgid "Critical error: Unable to collect mail: "
 msgstr ""
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
 msgstr ""
 
 #: kmacctimap.cpp:300
@@ -5032,6 +4937,55 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr "Pastadir Pastkastīte"
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "uz &nosūtītajiem ziņojumiem"
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr "Sūtīt CC: uz 'adresi'."
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "Sūtīt BCC: uz 'adresi'."
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr ""
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr ""
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Jauns ziņojums"
+
+#: kmail_options.h:20
+#, fuzzy
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Pievienot pielikumu pastam, tas var tikt atkārtots"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr ""
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr ""
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Pasts"
@@ -5089,9 +5043,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5145,12 +5099,12 @@ msgstr "URL nokopēts starpliktuvē."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 #, fuzzy
 msgid "Save to File"
 msgstr "Saglabāt uz Diska"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Nomainīt"
 
@@ -5168,7 +5122,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5187,220 +5141,220 @@ msgstr ""
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Izvēlēties &Visus Ziņojumus"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Izvēlēties &Visus Ziņojumus"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr ""
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 #, fuzzy
 msgid "Move to This Folder"
 msgstr "Pārvietot uz Šo Mapi"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 #, fuzzy
 msgid "Copy to This Folder"
 msgstr "Kopēt uz Šo Mapi"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "Jauns ziņojums"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "Izvēlēties &Visus Ziņojumus"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Atveru URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 #, fuzzy
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "Vai tiešām gribat palaist ?%1? ? "
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "izpildīt komandu"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr ""
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Vil&tus Pielikums"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr ""
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Šifrēšana"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Ši&frēt Ziņojumu"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Parak&sts:"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr ""
 "Nevar nolasīt failu:\n"
 "%1"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Šifrēšana"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Pasts"
@@ -5502,7 +5456,7 @@ msgstr "Izmērs"
 msgid "Encoding"
 msgstr "Kodējums"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr ""
 
@@ -5515,7 +5469,7 @@ msgstr "Šifrēšana"
 msgid "Sign"
 msgstr ""
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "Vil&tus Pielikums"
@@ -5536,7 +5490,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5546,9 +5501,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5557,9 +5512,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5572,7 +5526,7 @@ msgstr "&Sendmail"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr ""
@@ -5644,8 +5598,7 @@ msgstr ""
 msgid "Cl&ean Spaces"
 msgstr "&Notīrīt Tukšumus"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr ""
@@ -5795,31 +5748,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr "Ši&frēt Ziņojumu"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr ""
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5928,8 +5881,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5938,34 +5891,37 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Skatīt Pielikumu: "
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Send as Is"
 msgstr "Sendmail"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr ""
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr ""
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "&Iespraust Failu..."
+
 #: kmcomposewin.cpp:2959
 #, fuzzy
 msgid "Insert File"
@@ -5973,9 +5929,8 @@ msgstr "&Iespraust Failu..."
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -6016,290 +5971,302 @@ msgid ""
 "View"
 msgstr ""
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Labo&t"
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Labo&t"
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Saglabāt &Kā..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Īpašības..."
+
 #: kmcomposewin.cpp:3224
 #, fuzzy
 msgid "Add Attachment..."
 msgstr "Pielikums: "
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr ""
 "Nevar nolasīt failu:\n"
 "%1"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr ""
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr ""
 "Nevar nolasīt failu:\n"
 "%1"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 #, fuzzy
 msgid "Save Attachment As"
 msgstr "Vil&tus Pielikums"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Pielikums: "
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Vil&tus Pielikums"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nenosaukts"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 #, fuzzy
 msgid "Undefined Encryption Key"
 msgstr "Šifrēšana"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Nav Norādīts Subjekts"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nav Norādīts Subjekts"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "S&end as Is"
 msgstr "Sendmail"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "Nē, Ļaujiet Man Norādīt Subjektu"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Šifrēšana"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Ši&frēt Ziņojumu"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 #, fuzzy
 msgid "Please create an account for sending and try again."
 msgstr "Lūdzu norādiet sūtīšanas metodi uzstādījumos un mēģiniet vēlreiz."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr ""
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr ""
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 #, fuzzy
 msgid "&Send Now"
 msgstr "Sūtīt &Tagad"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 msgid "Too many receipients"
 msgstr ""
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "izpildīt komandu"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Pareizrakstības pārbaude atcelta."
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr ""
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Pareizrakstības pārbaude atcelta."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr ""
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr ""
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr ""
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Beigas nav atrastas."
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Šifrēšana"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Ziņojumu bija parakstījis %1"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Ziņojumu bija parakstījis %1"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Ziņojumu saraksts"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Ziņojumu saraksts"
@@ -6347,8 +6314,8 @@ msgstr ""
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6383,9 +6350,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6627,102 +6593,86 @@ msgstr ""
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6734,6 +6684,16 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Svarīgs"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Svarīgs"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Pieejamie Filtri"
@@ -6821,6 +6781,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "Piemērot šo filtru"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "&Līdz"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Uz augšu"
@@ -6829,16 +6794,29 @@ msgstr "Uz augšu"
 msgid "Down"
 msgstr "Lejup"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Pārsaukt..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Jauns"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopēt Uz"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "&Veidot..."
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6847,8 +6825,8 @@ msgstr "Meklēt Mapēs"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6925,19 +6903,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6977,8 +6952,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6998,7 +6973,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to saturus?"
+"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to "
+"saturus?"
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7014,8 +6990,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7158,10 +7134,8 @@ msgstr "Izveidot Mapi"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7185,9 +7159,8 @@ msgstr "Meklēt Mapēs"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7197,14 +7170,14 @@ msgstr "&Ports:"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7220,11 +7193,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7233,15 +7206,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "&Pārvietot Uz"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -7255,8 +7233,7 @@ msgstr "Pārvietot Ziņojumu uz Mapi"
 msgid "Permissions (ACL)"
 msgstr "Mapju saraksts"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, fuzzy, no-c-format
 msgid "General"
 msgstr "&Vispārējs"
@@ -7281,8 +7258,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, fuzzy, no-c-format
 msgid "Use custom &icons"
 msgstr "&Izmantot pielāgotos fontus"
@@ -7304,14 +7280,13 @@ msgstr "Izb&eigt vecus ziņojumus šajā mapē"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7326,9 +7301,9 @@ msgstr "Izb&eigt vecus ziņojumus šajā mapē"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7340,17 +7315,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "&Nelasīts"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Saglabāt kā Melnrakstu"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Sūtītājs"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Uztvērējs"
@@ -7362,11 +7341,11 @@ msgstr "&Jauna Identitāte:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7386,12 +7365,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7424,17 +7403,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7524,7 +7503,8 @@ msgstr ""
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7548,8 +7528,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7591,13 +7571,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7656,13 +7634,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7670,8 +7648,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7679,7 +7657,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Nevar izveidot kontu"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7787,9 +7765,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7926,10 +7904,10 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7986,149 +7964,148 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Lūdzu norādiet sūtīšanas metodi uzstādījumos un mēģiniet vēlreiz."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 #, fuzzy
 msgid "Work Online"
 msgstr "Darba"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 #, fuzzy
 msgid "Work Offline"
 msgstr "Darba"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 #, fuzzy
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 "Jums nav lasīšanas tiesību failam:\n"
 "%1"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 #, fuzzy
 msgid "outbox"
 msgstr "Auto"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 #, fuzzy
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "Jums nav lasīšanas tiesību failam:\n"
 "%1"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 #, fuzzy
 msgid "sent-mail"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 #, fuzzy
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Jums nav lasīšanas tiesību failam:\n"
 "%1"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 #, fuzzy
 msgid "trash"
 msgstr "&Ekstras"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 #, fuzzy
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 "Jums nav lasīšanas tiesību failam:\n"
 "%1"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr ""
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 #, fuzzy
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 "Jums nav lasīšanas tiesību failam:\n"
 "%1"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Nomainīt"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 "Jums nav lasīšanas tiesību failam:\n"
 "%1"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 #, fuzzy
 msgid "Last Search"
 msgstr "&Meklēt"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8136,12 +8113,12 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 #, fuzzy
 msgid "Empty Trash"
 msgstr "&Tukšs"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Vai tiešām gribat izbeigt šo mapi \"%1\"?"
@@ -8224,8 +8201,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -8269,8 +8245,8 @@ msgstr "Vai tiešām gribat izbeigt šo mapi \"%1\"?"
 #: kmmainwidget.cpp:1154
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr "Vai tiešām gribat izbeigt šo mapi \"%1\"?"
 
 #: kmmainwidget.cpp:1173
@@ -8298,10 +8274,11 @@ msgstr "Izvēlēties epasta adresi(es)"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to saturus?"
+"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to "
+"saturus?"
 
 #: kmmainwidget.cpp:1214
 #, fuzzy
@@ -8316,33 +8293,39 @@ msgstr "Vai tiešām gribat izbeigt šo mapi \"%1\"?"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to saturus?"
+"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to "
+"saturus?"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to saturus?"
+"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to "
+"saturus?"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to saturus?"
+"Vai tiešām gribat aizvākt mapi \"%1\" un visas apakšmapes, zaudējot to "
+"saturus?"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "&Veidot..."
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8356,9 +8339,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8372,8 +8355,8 @@ msgstr ""
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8390,8 +8373,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8407,7 +8390,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8773,8 +8757,7 @@ msgstr "Vil&tus Pielikums"
 msgid "Appl&y All Filters"
 msgstr "Piemēr&ot Filtrus"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Piemēr&ot Filtrus"
@@ -8900,7 +8883,6 @@ msgstr "Nelasīts ziņojums"
 msgid "Go to the next unread message"
 msgstr "Nelasīts ziņojums"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 #, fuzzy
 msgid "&Previous Message"
@@ -9057,25 +9039,25 @@ msgstr " Inicializēju..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9083,8 +9065,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9092,8 +9074,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9122,16 +9104,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr ""
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, fuzzy, c-format
 msgid "Attachment: %1"
 msgstr "Pielikums: "
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr ""
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9184,29 +9166,26 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9215,11 +9194,10 @@ msgstr "A&praksts:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9229,14 +9207,13 @@ msgstr "&Kodējums"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9245,13 +9222,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9260,9 +9235,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -9272,9 +9246,8 @@ msgstr "Ši&frēt šo daļu"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -9290,11 +9263,9 @@ msgstr "Kpasts POP Filtrs"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9564,15 +9535,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9581,18 +9551,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9602,14 +9571,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr ""
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9652,7 +9620,8 @@ msgstr "Skatīt Pielikumu: "
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9678,12 +9647,14 @@ msgstr "Atvērt Pielikumu?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9705,6 +9676,67 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "&Lasīt"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr ""
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "&Veidot..."
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "&Atbildēts"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "Pā&rsūtīt:"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "&Ierindots"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "&Sūtīt"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr ""
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "&Nelasīts"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Uz: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "Atvērt Pielikumu?"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9788,17 +9820,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9823,8 +9855,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9850,8 +9882,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9863,13 +9896,11 @@ msgstr "Sūtīt vēlāk"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9890,8 +9921,9 @@ msgstr "&Sūtīšana"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9925,30 +9957,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9961,6 +9993,10 @@ msgstr ""
 msgid "Exit"
 msgstr "Labo&t"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -9987,8 +10023,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -10067,8 +10104,8 @@ msgstr "Serveris piep&rasa autentifikāciju"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -10090,10 +10127,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -10125,8 +10161,8 @@ msgstr "Atļauti tikai lokāli faili."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -10143,10 +10179,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10394,22 +10430,18 @@ msgstr "Parak&stīt Ziņojumu"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10420,8 +10452,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10436,14 +10468,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10544,8 +10576,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10581,8 +10613,9 @@ msgstr "Ši&frēt Ziņojumu"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10593,8 +10626,8 @@ msgstr "Filtrējamo &ziņojumu izmērs:"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10616,71 +10649,69 @@ msgstr "Ši&frēt Ziņojumu"
 msgid "Unencrypted Message Warning"
 msgstr "Šifrēts ziņojums"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Uzstādīt &Kodējumu"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10704,10 +10735,10 @@ msgstr "Normāls teksts"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10718,8 +10749,8 @@ msgstr "Mapju saraksts"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10762,8 +10793,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr ""
 
@@ -10796,8 +10826,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10835,18 +10865,18 @@ msgstr "Nevar atkodēt ziņojumu:"
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -11104,8 +11134,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -11229,10 +11259,11 @@ msgstr ""
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11249,7 +11280,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -11267,1643 +11299,12 @@ msgstr ""
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "&Go"
-msgstr "&Līdz"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "M&ape"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Ziņoju&ms"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, fuzzy, no-c-format
-msgid "&Forward"
-msgstr "Pā&rsūtīt:"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "&Sūtīšana"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automātiski parak&stīt ziņojumus izmantojot OpenPGP"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Šifrēšana"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Filtrējamo &ziņojumu izmērs:"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automātiski ši&frēt ziņojumus ja vien iespējams"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Uz: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Cc: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "&Vispārējs"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "At&bildēt Uz: "
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "A&tbildēt visiem:"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "Pā&rsūtīt:"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Nomainīt"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, fuzzy, no-c-format
-msgid "Folder Properties"
-msgstr "Īpašības..."
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "List &address:"
-msgstr "&Pasta Adrese:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, fuzzy, no-c-format
-msgid "N&ormal:"
-msgstr "Normāls teksts"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, fuzzy, no-c-format
-msgid "Unr&ead:"
-msgstr "&Nelasīts"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "Veca Ziņojuma Izbeigšanās"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, fuzzy, no-c-format
-msgid "E&xpire after:"
-msgstr "Izbeigt mapi"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "Izbeigt vecus ziņojumus?"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, fuzzy, no-c-format
-msgid "Expire a&fter:"
-msgstr "Izbeigt mapi"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "Izb&eigt vecus ziņojumus"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, fuzzy, no-c-format
-msgid "Day(s)"
-msgstr "diena(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, fuzzy, no-c-format
-msgid "Week(s)"
-msgstr "nedēļa(as)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, fuzzy, no-c-format
-msgid "Month(s)"
-msgstr "mēnesis"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Advanced"
-msgstr "Ad&vancēts"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Jauna Identitāte:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "&Pasta Adrese:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Drošības Brīdinājums"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Parak&sts:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Beigas nav atrastas."
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Drošības Brīdinājums"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Drošības Brīdinājums"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Pievienot..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "Izbeigt mapi"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Šifrēšana"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "nenosaukts"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Parak&sts:"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "At&bildēt sūtītājam:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "A&tbildēt visiem:"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Nelasīts ziņojums"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, fuzzy, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Šifrēta ziņojuma beigas"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, fuzzy, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Šifrēta ziņojuma beigas"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Brīdinājums pirms no&vecojušiem ziņojumiem"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Šifrēšana"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, fuzzy, no-c-format
-msgid " days"
-msgstr "diena(s)"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Beigas nav atrastas."
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Drošības Brīdinājums"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Mapju saraksts"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Nomainīt"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Nomainīt"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Izvēlēties Sendmail Atrašanās Vietu"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Norādīt re&daktoru:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, fuzzy, no-c-format
-msgid "Enable groupware functionality"
-msgstr "&Vispārējs"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automātiska šifrēšana izmantojot OpenPGP"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomātiski pievienot parakstu"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Brīdinājums pirms no&vecojušiem ziņojumiem"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, fuzzy, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "A&utomātiski pievienot parakstu"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "Pārbaudes inter&vāls (minūtēs):"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Brīdinājums: Paraksts ir slikts."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, fuzzy, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tīrs te&ksts"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Marķēt tekošo ziņojumu kā lasītu"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Parak&stīt Ziņojumu"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Izvēlēties &Visus Ziņojumus"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "&Marķēt Visus Ziņojumus kā Lasītus"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13020,6 +11421,11 @@ msgstr ""
 msgid "Add as BCC"
 msgstr ""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Ad&vancēts"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13036,10 +11442,10 @@ msgstr "Izvēlēties epasta adresi(es)"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13058,8 +11464,8 @@ msgstr "Tīrs te&ksts"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13176,10 +11582,19 @@ msgstr "ir lielāks par vai vienāds ar"
 msgid " bytes"
 msgstr ""
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, fuzzy, no-c-format
+msgid " days"
+msgstr "diena(s)"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13327,13 +11742,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13351,8 +11764,7 @@ msgid ""
 msgstr "Akaunta tips: Pop akaunts"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13370,8 +11782,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13380,8 +11791,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Pieejamie Filtri"
 
 #: sievedebugdialog.cpp:358
@@ -13455,8 +11865,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13476,17 +11886,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Norādīt komandu:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Jauns Ieraksts:"
@@ -13522,6 +11937,11 @@ msgstr ""
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "At&tiecināt uz:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13536,6 +11956,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Labo&t"
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13575,9 +11999,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13616,6 +12040,16 @@ msgstr ""
 "Nevar atvērt failu \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Uz: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Cc: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13645,36 +12079,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13909,6 +12339,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13945,76 +12379,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -14083,6 +12447,16 @@ msgstr "Pielikums: "
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "&Iespraust Failu..."
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14188,9 +12562,9 @@ msgstr "Sūtīt no Rindas"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14223,9 +12597,9 @@ msgstr "&Iespraust Failu..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14235,15 +12609,15 @@ msgstr "Pievienot Adresugrāmatai"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14252,8 +12626,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14269,143 +12643,1509 @@ msgstr ""
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr ""
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "&Sūtīšana"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automātiski parak&stīt ziņojumus izmantojot OpenPGP"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
-msgstr "uz &nosūtītajiem ziņojumiem"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Šifrēšana"
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr "Sūtīt CC: uz 'adresi'."
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr "Sūtīt BCC: uz 'adresi'."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Jauns ziņojums"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Filtrējamo &ziņojumu izmērs:"
 
-#: kmail_options.h:20
-#, fuzzy
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Pievienot pielikumu pastam, tas var tikt atkārtots"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
 msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automātiski ši&frēt ziņojumus ja vien iespējams"
+
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "&Lasīt"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "&Veidot..."
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "&Vispārējs"
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
-msgstr "&Atbildēts"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "At&bildēt Uz: "
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "A&tbildēt visiem:"
+
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
 msgstr "Pā&rsūtīt:"
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "&Ierindots"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr ""
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "&Sūtīt"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Nomainīt"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Mapju saraksts"
+
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Nomainīt"
+
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Nomainīt"
+
+#: folderpropertiesdialog.ui:16
+#, fuzzy, no-c-format
+msgid "Folder Properties"
+msgstr "Īpašības..."
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
 msgstr ""
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
+#: folderpropertiesdialog.ui:91
+#, fuzzy, no-c-format
+msgid "List &address:"
+msgstr "&Pasta Adrese:"
+
+#: folderpropertiesdialog.ui:122
+#, fuzzy, no-c-format
+msgid "N&ormal:"
+msgstr "Normāls teksts"
+
+#: folderpropertiesdialog.ui:215
+#, fuzzy, no-c-format
+msgid "Unr&ead:"
 msgstr "&Nelasīts"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "Veca Ziņojuma Izbeigšanās"
+
+#: folderpropertiesdialog.ui:283
+#, fuzzy, no-c-format
+msgid "E&xpire after:"
+msgstr "Izbeigt mapi"
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "Izbeigt vecus ziņojumus?"
+
+#: folderpropertiesdialog.ui:339
+#, fuzzy, no-c-format
+msgid "Expire a&fter:"
+msgstr "Izbeigt mapi"
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "Izb&eigt vecus ziņojumus"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, fuzzy, no-c-format
+msgid "Day(s)"
+msgstr "diena(s)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, fuzzy, no-c-format
+msgid "Week(s)"
+msgstr "nedēļa(as)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, fuzzy, no-c-format
+msgid "Month(s)"
+msgstr "mēnesis"
+
+#: folderpropertiesdialog.ui:451
+#, fuzzy, no-c-format
+msgid "Advanced"
+msgstr "Ad&vancēts"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Jauna Identitāte:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "&Pasta Adrese:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
 msgstr ""
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "Uz: "
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "Atvērt Pielikumu?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:86
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
 msgstr ""
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "&Iespraust Failu..."
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Izvēlēties Sendmail Atrašanās Vietu"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Norādīt re&daktoru:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, fuzzy, no-c-format
+msgid "Enable groupware functionality"
+msgstr "&Vispārējs"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automātiska šifrēšana izmantojot OpenPGP"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomātiski pievienot parakstu"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Brīdinājums pirms no&vecojušiem ziņojumiem"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, fuzzy, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "A&utomātiski pievienot parakstu"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "Pārbaudes inter&vāls (minūtēs):"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Brīdinājums: Paraksts ir slikts."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, fuzzy, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tīrs te&ksts"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Marķēt tekošo ziņojumu kā lasītu"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Parak&stīt Ziņojumu"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Izvēlēties &Visus Ziņojumus"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "&Marķēt Visus Ziņojumus kā Lasītus"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Rediģēt &Failu"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Labo&t"
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, fuzzy, no-c-format
+msgid "&Go"
+msgstr "&Līdz"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "M&ape"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Ziņoju&ms"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, fuzzy, no-c-format
+msgid "&Forward"
+msgstr "Pā&rsūtīt:"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Šifrēšana"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Kopējās opcijas"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Drošības Brīdinājums"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Parak&sts:"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Beigas nav atrastas."
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Drošības Brīdinājums"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Drošības Brīdinājums"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Pievienot..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "Izbeigt mapi"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Šifrēšana"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "nenosaukts"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Parak&sts:"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "At&bildēt sūtītājam:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "A&tbildēt visiem:"
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Nelasīts ziņojums"
+
+#: warningconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Šifrēta ziņojuma beigas"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, fuzzy, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Šifrēta ziņojuma beigas"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Brīdinājums pirms no&vecojušiem ziņojumiem"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Šifrēšana"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Beigas nav atrastas."
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Drošības Brīdinājums"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid ""
@@ -14881,10 +14621,6 @@ msgstr "&Iespraust Failu..."
 #~ msgstr "&Jauns"
 
 #, fuzzy
-#~ msgid "Confi&gure..."
-#~ msgstr "Konfigurēt &Filtrus..."
-
-#, fuzzy
 #~ msgid "Configure %1 Plugin"
 #~ msgstr "Konfigurēt Akauntu"
 
@@ -15296,10 +15032,6 @@ msgstr "&Iespraust Failu..."
 #~ msgstr "Nevar atkodēt ziņojumu:"
 
 #, fuzzy
-#~ msgid "Error: "
-#~ msgstr "No: "
-
-#, fuzzy
 #~ msgid "Message was signed with key %1, created %2."
 #~ msgstr "Ziņojums bija parakstīts ar nezināmu atslēgu 0x%1."
 
@@ -15660,8 +15392,10 @@ msgstr "&Iespraust Failu..."
 #~ msgid "SMTP authentication"
 #~ msgstr "SMTP autentifikācija"
 
-#~ msgid "Pipelining for POP3 (faster mail download on slow responding networks)"
-#~ msgstr "Izmantot trubas priekš POP3 (ātrākai pasta lejuplādei no lēniem tīkliem)"
+#~ msgid ""
+#~ "Pipelining for POP3 (faster mail download on slow responding networks)"
+#~ msgstr ""
+#~ "Izmantot trubas priekš POP3 (ātrākai pasta lejuplādei no lēniem tīkliem)"
 
 #~ msgid "Expiry of old messages"
 #~ msgstr "Vecu ziņojumu izbeigšana"
diff --git a/tde-i18n-mk/messages/tdepim/kmail.po b/tde-i18n-mk/messages/tdepim/kmail.po
index 8541091b360..a5347314d01 100644
--- a/tde-i18n-mk/messages/tdepim/kmail.po
+++ b/tde-i18n-mk/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-04-19 00:53+0200\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Владимир Стефанов,Божидар Проевски"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -172,6 +172,12 @@ msgstr "Н&ема (користете внимателно)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Сметка за полуавтоматско ракување со ресурси"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Исчисти минато"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,9 +254,9 @@ msgstr "&Најава:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "Вашиот доставувач на интернет-сервиси ви има дадено <em>корисничко име</em> "
 "кое што се користи за проверка на вашата автентичност на нивните сервери. "
@@ -275,20 +281,20 @@ msgstr "За&чувај ја POP-лозинката"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Изберете ја оваа опција за КПошта да ја зачува лозинката.\n"
 "Ако има достапен КПаричник лозинката ќе биде зачувана таму што се смета за "
 "безбедно.\n"
-"Но ако нема достапен КПаричник, лозинката ќе биде зачувана во конфигурациската "
-"датотека на КПошта. Лозинката е зачувана во нечитлив формат, но не треба да се "
-"смета за безбедна од декриптирање ако постои достап до конфигурациската "
-"датотека."
+"Но ако нема достапен КПаричник, лозинката ќе биде зачувана во "
+"конфигурациската датотека на КПошта. Лозинката е зачувана во нечитлив "
+"формат, но не треба да се смета за безбедна од декриптирање ако постои "
+"достап до конфигурациската датотека."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -316,12 +322,13 @@ msgstr "&Филтрирај ги пораките ако се поголеми �
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ако ја изберете оваа опција, ќе бидат употребени POP-филтри за да се одреди што "
-"да се прави со пораките. Потоа може да изберете дали да ги симнете, да ги "
-"избришете или да ги оставите на серверот."
+"Ако ја изберете оваа опција, ќе бидат употребени POP-филтри за да се одреди "
+"што да се прави со пораките. Потоа може да изберете дали да ги симнете, да "
+"ги избришете или да ги оставите на серверот."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -370,13 +377,15 @@ msgstr "Обичен те&кст"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -419,9 +428,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -478,9 +487,9 @@ msgstr "Вчитај ги при&лозите по потреба"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Активирајте го ова за прилозите да не се вчитуваат автоматски кога ќе ја "
 "изберете пораката туку само кога ќе кликнете на прилогот. На овој начин "
@@ -495,8 +504,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Само папките што се отворени (раширени) во стеблото со папки ќе бидат проверени "
-"за потпапки. Користете го ова ако има многу папки на серверот."
+"Само папките што се отворени (раширени) во стеблото со папки ќе бидат "
+"проверени за потпапки. Користете го ова ако има многу папки на серверот."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -524,7 +533,7 @@ msgstr "<нема>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "вл. сандаче"
 
@@ -532,8 +541,8 @@ msgstr "вл. сандаче"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Изгледа дека серверот не поддржува единствени броеви на пораки, но ова е "
 "потребно за оставање на пораки на серверот.\n"
@@ -544,31 +553,32 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Изгледа дека серверот не поддржува преземање на заглавија на пораки, но ова е "
-"потребно за филтрирање на пораките на серверот.\n"
+"Изгледа дека серверот не поддржува преземање на заглавија на пораки, но ова "
+"е потребно за филтрирање на пораките на серверот.\n"
 "Бидејќи некои сервери не ги објавуваат правилно нивните можности вие сепак "
 "можете да го вклучите филтрирањето на пораки на серверот."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Забележете дека оваа можност може да предизвика некои POP3-сервери, што не "
 "поддржуваат групирање на наредби, да испратат оштетени пораки.\n"
 "Ова е конфигурабилно бидејќи некои сервери подржуваат групирање но не ги "
 "објавуваат нивните способности. За да проверите дали вашиот POP3-сервер ја "
-"објавува поддршката за групирање искористете го копчето „Провери што поддржува "
-"серверот“ на долниот крај од дијалогот.\n"
+"објавува поддршката за групирање искористете го копчето „Провери што "
+"поддржува серверот“ на долниот крај од дијалогот.\n"
 "Ако вашиот сервер не го објавува групирањето, а сакате поголема брзина, би "
 "требало прво да направите тестирање така што ќе си испратите неколку пораки "
 "самиот на себе си а потоа ќе ги симнете."
@@ -579,31 +589,32 @@ msgstr "Ве молам прво наведете сервер и порта в�
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Изгледа дека серверот не поддржува групирање на наредби. Поради тоа оваа опција "
-"е оневозможена.\n"
-"Бидејќи некои сервери не ги објавуваат правилно нивните способности вие сѐ уште "
-"имате можност да го вклучите групирањето. Забележете дека оваа можност може да "
-"предизвика некои POP3-сервери, што не поддржуваат групирање на наредби, да "
-"испратат оштетени пораки. Поради тоа пред да ја употребите оваа можност со "
-"важни пораки би требало прво да ја тестирате така што ќе си испратите поголем "
-"број на пораки самиот на себе си а потоа ќе ги симнете одеднаш од POP-серверот."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Изгледа дека серверот не поддржува групирање на наредби. Поради тоа оваа "
+"опција е оневозможена.\n"
+"Бидејќи некои сервери не ги објавуваат правилно нивните способности вие сѐ "
+"уште имате можност да го вклучите групирањето. Забележете дека оваа можност "
+"може да предизвика некои POP3-сервери, што не поддржуваат групирање на "
+"наредби, да испратат оштетени пораки. Поради тоа пред да ја употребите оваа "
+"можност со важни пораки би требало прво да ја тестирате така што ќе си "
+"испратите поголем број на пораки самиот на себе си а потоа ќе ги симнете "
+"одеднаш од POP-серверот."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Изгледа дека серверот не поддржува единствени броеви на пораки, но ова е "
 "потребно за оставање на пораки на серверот. Поради тоа оваа опција е "
@@ -616,11 +627,11 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Изгледа дека серверот не поддржува преземање на заглавија на пораки, но ова е "
-"потребно за филтрирање на пораките на серверот. Поради тоа оваа опција е "
+"Изгледа дека серверот не поддржува преземање на заглавија на пораки, но ова "
+"е потребно за филтрирање на пораките на серверот. Поради тоа оваа опција е "
 "оневозможена.\n"
 "Бидејќи некои сервери не ги објавуваат правилно нивните можности вие сепак "
 "можете да го вклучите филтрирањето на пораки на серверот."
@@ -706,8 +717,8 @@ msgstr "IMAP-сметка"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Треба да додадете сметка во одделот „Мрежа“ од поставувањата за да може да "
 "примате пошта."
@@ -746,14 +757,14 @@ msgstr "Добредојдовте во КПошта"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Изгледа дека го стартувате КПошта за прв пат. Можете да го користите овој "
-"волшебник за да ги конфигурирате вашите е-поштенски сметки. Само внесете ги на "
-"следните страници податоците за врската што сте ги добиле од вашиот доставувач "
-"на е-пошта.</qt>"
+"<qt>Изгледа дека го стартувате КПошта за прв пат. Можете да го користите "
+"овој волшебник за да ги конфигурирате вашите е-поштенски сметки. Само "
+"внесете ги на следните страници податоците за врската што сте ги добиле од "
+"вашиот доставувач на е-пошта.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -815,8 +826,7 @@ msgstr "Користи локална испорака"
 msgid "Server Information"
 msgstr "Информација за серверот"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Нема"
@@ -950,29 +960,28 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Тука може да добиете помош во конфигурацијата на правилата за филтрирање на "
-"КПошта за употреба на некои попознати антивирусни алатки.</p>"
-"<p>Волшебникот може да ги детектира тие алатки на вашиот компјутер како и да "
-"создаде правила за филтрирање за класификација на пораките и одвојување на "
-"пораките што содржат вируси. Волшебникот нема да ги земе предвид постоечките "
-"правила за филтрирање туку секогаш ќе ги додаде новите правила.</p>"
-"<p><b>Внимание:</b> Бидејќи КПошта изгледа како да е замрзната за време на "
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Тука може да добиете помош во конфигурацијата на правилата за филтрирање "
+"на КПошта за употреба на некои попознати антивирусни алатки.</"
+"p><p>Волшебникот може да ги детектира тие алатки на вашиот компјутер како и "
+"да создаде правила за филтрирање за класификација на пораките и одвојување "
+"на пораките што содржат вируси. Волшебникот нема да ги земе предвид "
+"постоечките правила за филтрирање туку секогаш ќе ги додаде новите правила.</"
+"p><p><b>Внимание:</b> Бидејќи КПошта изгледа како да е замрзната за време на "
 "скенирањето на пораките за вируси, може да имате проблеми со реагирањето на "
 "КПошта. Тоа е така бидејќи операциите на антивирусните алатки бараат доста "
-"време. Ако сакате да се вратите на поранешното однесување можеби ќе сакате да "
-"ги избришете правилата за филтрирање."
+"време. Ако сакате да се вратите на поранешното однесување можеби ќе сакате "
+"да ги избришете правилата за филтрирање."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1004,10 +1013,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1018,13 +1026,13 @@ msgstr "Провери ги пораките со антивирусните а�
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Овозможува проверка на вашите пораки со антивирусните алатки. Волшебникот ќе ги "
-"создаде соодветните филтри. Пораките се обично означени од алатките за филтрите "
-"што следат да можат да дејствуваат и на пр. да ги преместат пораките со вируси "
-"во специјална папка."
+"Овозможува проверка на вашите пораки со антивирусните алатки. Волшебникот ќе "
+"ги создаде соодветните филтри. Пораките се обично означени од алатките за "
+"филтрите што следат да можат да дејствуваат и на пр. да ги преместат "
+"пораките со вируси во специјална папка."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1033,12 +1041,12 @@ msgstr "Премести ги детектираните пораки со ви�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Ќе биде создаден филтер за детектирање на пораки класифицирани како инфицирани "
-"со вирус и преместување на истите во одредена папка. Стандардната папка е "
-"корпата но тоа можете да го измените во прегледот со папки."
+"Ќе биде создаден филтер за детектирање на пораки класифицирани како "
+"инфицирани со вирус и преместување на истите во одредена папка. Стандардната "
+"папка е корпата но тоа можете да го измените во прегледот со папки."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1046,11 +1054,11 @@ msgstr "Додатно, означи ги пораките со вируси к�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Покрај преместувањето во избраната папка ги означува како прочитани пораките во "
-"кои биле пронајдени вируси."
+"Покрај преместувањето во избраната папка ги означува како прочитани пораките "
+"во кои биле пронајдени вируси."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1231,9 +1239,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Ова може да биде затоа што немате дозвола да ја направите папката или затоа што "
-"папката веќе постои на серверот. Ова е пораката за грешка од комуникацијата со "
-"серверот:"
+"Ова може да биде затоа што немате дозвола да ја направите папката или затоа "
+"што папката веќе постои на серверот. Ова е пораката за грешка од "
+"комуникацијата со серверот:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1246,8 +1254,8 @@ msgstr "Грешка при читањето на папката %1 на сер�
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1267,8 +1275,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1299,17 +1307,17 @@ msgstr "Избришана"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Ниеден од вашите идентитети не се совпаѓа со примачот на поракава."
 "<br>Изберете која од следните адреси е ваша, ако има таква:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Неколку од вашите идентитети се совпаѓаат со примачот на поракава."
 "<br>Изберете која од следните адреси е ваша:"
@@ -1342,18 +1350,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ова поставување е фиксирано од вашиот администратор.</p>"
-"<p>Ако мислите дека е ова грешка, ве молиме контактирајте со него.</p></qt>"
+"<qt><p>Ова поставување е фиксирано од вашиот администратор.</p><p>Ако "
+"мислите дека е ова грешка, ве молиме контактирајте со него.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Вчитај профи&л..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Конфигурирајте сметка"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Дод&ај..."
@@ -1383,6 +1394,11 @@ msgstr "<qt>Дали навистина сакате да го отстрани�
 msgid "Remove Identity"
 msgstr "Отстранување на идентитет"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Отстрани"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Додај..."
@@ -1391,6 +1407,11 @@ msgstr "Додај..."
 msgid "Modify..."
 msgstr "Измени..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Отстрани"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Постави како почетен"
@@ -1407,17 +1428,15 @@ msgstr "&Испраќање"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Излезни сметки (додајте барем една):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Име"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Тип"
@@ -1439,8 +1458,7 @@ msgstr "Како почетен"
 msgid "Common Options"
 msgstr "Општи опции"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Потврди пред &испраќање"
@@ -1492,17 +1510,16 @@ msgstr "Стандард&ен домен:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Стандардниот домен се користи за да се довршат е-поштенските адреси што се "
-"состојат само од корисничко име.</p></qt>"
+"<qt><p>Стандардниот домен се користи за да се довршат е-поштенските адреси "
+"што се состојат само од корисничко име.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1520,9 +1537,9 @@ msgstr "Додајте транспорт"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (стандардно)"
 
@@ -1607,6 +1624,10 @@ msgstr "Изменете сметка"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Не можам да ја лоцирам сметката <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Бои"
@@ -1715,8 +1736,7 @@ msgstr "Посетена врска"
 msgid "Misspelled Words"
 msgstr "Неправописни зборови"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Нова порака"
@@ -1905,11 +1925,11 @@ msgstr "Нишките се стандардно затворени"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Отвори ги нишките што содржат но&ви, непрочитани или важни пораки и отвори ги "
-"следените нишки."
+"Отвори ги нишките што содржат но&ви, непрочитани или важни пораки и отвори "
+"ги следените нишки."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1917,70 +1937,56 @@ msgstr "Приказ на датум"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Овие изрази може да се користат за датумот:</strong></p>"
-"<ul>"
-"<li>d - денот како број без водечка нула (1-31)</li>"
-"<li>dd - денот како број со водечка нула (01-31)</li>"
-"<li>ddd - скратеното име на денот (пон - нед)</li>"
-"<li>dddd - долгото име на денот (понеделник - недела)</li>"
-"<li>M - месецот како број без водечка нула (1-12)</li>"
-"<li>MM - месецот како број со водечка нула (01-12)</li>"
-"<li>MMM - скратеното име на месецот (јан - дек)</li>"
-"<li>MMMM - долгото име на месецот (јануари - декември)</li>"
-"<li>yy - годината како двоцифрен број (00-99)</li>"
-"<li>yyyy - годината како четирицифрен број (0000-9999)</li></ul>"
-"<p><strong>Овие изрази може да се користат за времето:</string></p> "
-"<ul>"
-"<li>h - часот без водечка нула (0-23 или 1-12 ако е приказот AM/PM)</li>"
-"<li>hh - часот со водечка нула (00-23 or 01-12 ако е приказот AM/PM)</li>"
-"<li>m - минутите без водечка нула (0-59)</li>"
-"<li>mm - минутите со водечка нула (00-59)</li>"
-"<li>s - секундите без водечка нула (0-59)</li>"
-"<li>ss - секундите со водечка нула (00-59)</li>"
-"<li>z - милисекундите без водечки нули (0-999)</li>"
-"<li>zzz - милисекундите со водечки нули (000-999)</li>"
-"<li>AP - префрлање на приказ AM/PM. AP ќе биде заменето со „AM“ или „PM“.</li>"
-"<li>ap - префрлање на приказ AM/PM. ap ќе биде заменето со „am“ или „pm“.</li>"
-"<li>Z - временската зона во нумерички фомат (-0500)</li></ul>"
-"<p><strong>Сите други влезни знаци ќе бидат игнорирани.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Овие изрази може да се користат за датумот:</strong></"
+"p><ul><li>d - денот како број без водечка нула (1-31)</li><li>dd - денот "
+"како број со водечка нула (01-31)</li><li>ddd - скратеното име на денот (пон "
+"- нед)</li><li>dddd - долгото име на денот (понеделник - недела)</li><li>M - "
+"месецот како број без водечка нула (1-12)</li><li>MM - месецот како број со "
+"водечка нула (01-12)</li><li>MMM - скратеното име на месецот (јан - дек)</"
+"li><li>MMMM - долгото име на месецот (јануари - декември)</li><li>yy - "
+"годината како двоцифрен број (00-99)</li><li>yyyy - годината како "
+"четирицифрен број (0000-9999)</li></ul><p><strong>Овие изрази може да се "
+"користат за времето:</string></p> <ul><li>h - часот без водечка нула (0-23 "
+"или 1-12 ако е приказот AM/PM)</li><li>hh - часот со водечка нула (00-23 or "
+"01-12 ако е приказот AM/PM)</li><li>m - минутите без водечка нула (0-59)</"
+"li><li>mm - минутите со водечка нула (00-59)</li><li>s - секундите без "
+"водечка нула (0-59)</li><li>ss - секундите со водечка нула (00-59)</li><li>z "
+"- милисекундите без водечки нули (0-999)</li><li>zzz - милисекундите со "
+"водечки нули (000-999)</li><li>AP - префрлање на приказ AM/PM. AP ќе биде "
+"заменето со „AM“ или „PM“.</li><li>ap - префрлање на приказ AM/PM. ap ќе "
+"биде заменето со „am“ или „pm“.</li><li>Z - временската зона во нумерички "
+"фомат (-0500)</li></ul><p><strong>Сите други влезни знаци ќе бидат "
+"игнорирани.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Менувањето на глобалните поставувања за нишките ќе ги пребрише сите вредности "
-"специфични за папките."
+"Менувањето на глобалните поставувања за нишките ќе ги пребрише сите "
+"вредности специфични за папките."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -1994,8 +2000,7 @@ msgstr "Покажи ја лентата со стат&усот на HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -2004,8 +2009,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr "Користи помал фонт за цитираниот текст"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2031,8 +2035,7 @@ msgstr "Автом."
 msgid "&Override character encoding:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Овозможи икона во сис. лента"
@@ -2134,23 +2137,20 @@ msgstr "<b>%f</b> ќе биде заменето со датотеката за
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Следните променливи се поддржани во фразите при одговарање:"
-"<br><b>%D</b>: датум, <b>%S</b>: тема,"
-"<br><b>%e</b>: адреса на испраќачот, <b>%F</b>: име на испраќачот, <b>%f</b>"
-": иницијали на испраќачот,"
-"<br><b>%T</b>: име на примачот, <b>%t</b>: име и адреса на примачот,"
-"<br><b>%C</b>: имиња од копијата (carbon copy), <b>%c</b>"
-": имиња и адреси од копијата (carbon copy),"
-"<br><b>%%</b>: знакот процент, <b>%_</b>: празно место, <b>%L</b>"
-": нова линија</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Следните променливи се поддржани во фразите при одговарање:<br><b>%D</"
+"b>: датум, <b>%S</b>: тема,<br><b>%e</b>: адреса на испраќачот, <b>%F</b>: "
+"име на испраќачот, <b>%f</b>: иницијали на испраќачот,<br><b>%T</b>: име на "
+"примачот, <b>%t</b>: име и адреса на примачот,<br><b>%C</b>: имиња од "
+"копијата (carbon copy), <b>%c</b>: имиња и адреси од копијата (carbon copy),"
+"<br><b>%%</b>: знакот процент, <b>%_</b>: празно место, <b>%L</b>: нова "
+"линија</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2173,21 +2173,20 @@ msgstr "Одговори на &сите:"
 msgid "&Forward:"
 msgstr "&Препрати:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Индикатор за &цитат:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Во %D Вие напишавте:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Во %D %F напиша:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Препратена порака"
 
@@ -2225,8 +2224,8 @@ msgstr "Внесете нов префикс за препраќање:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Оваа листа се проверува на секоја испратена порака од горе до долу за множ. "
 "знаци што ги содржи сите потребни знаци."
@@ -2238,7 +2237,8 @@ msgstr "Внесете множ. знаци:"
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"За&држи го оригиналното множ. знаци при одговарање или препраќање (ако е можно)"
+"За&држи го оригиналното множ. знаци при одговарање или препраќање (ако е "
+"можно)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2264,10 +2264,9 @@ msgstr "Вредност"
 msgid "Ne&w"
 msgstr "Но&во"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Име:"
@@ -2276,8 +2275,7 @@ msgstr "&Име:"
 msgid "&Value:"
 msgstr "&Вредност:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Именување на прилози соодветно на Outlook"
@@ -2285,8 +2283,8 @@ msgstr "Именување на прилози соодветно на Outlook"
 #: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Изберете ја оваа опција за Outlook(tm) да може да ги разбира имињата на "
 "прилозите што содржат не-англиски знаци."
@@ -2317,13 +2315,13 @@ msgstr "приложено"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2348,115 +2346,101 @@ msgstr "Крипто-зад&нини"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Пораките понекогаш доаѓаат и со двата формати. Оваа опција определува дали "
-"сакате да се прикаже делот со HTML или делот со обичен текст.</p>"
-"<p>Прикажувањето на делот со HTML ја прави пораката да изгледа подобро но во "
-"исто време го зголемува ризикот од злоупотреба на можните безбедносни дупки.</p>"
-"<p>Со прикажувањето на делот со обичен текст се губи голем дел од форматирањето "
-"на пораката но е скоро <em>невозможно</em> да се злоупотребат можните "
-"безбедносни дупки во исцртувачот на HTML (Konqueror).</p>"
-"<p>Долната опција заштитува од една од вообичаените злоупотреби на пораките со "
-"HTML но не може де заштити од безбедносните прашања што не биле познати во "
-"текот на пишувањето на оваа верзија на КПошта.</p>"
-"<p>Поради тоа е препорачливо да <em>не</em> претпочитате HTML туку обичен "
-"текст.</p>"
-"<p><b>Забелешка:</b> Оваа опција може да ја наместите поодделно по папка од "
-"менито <i>Папка</i> во главниот прозорец на КПошта.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Пораките понекогаш доаѓаат и со двата формати. Оваа опција определува "
+"дали сакате да се прикаже делот со HTML или делот со обичен текст.</"
+"p><p>Прикажувањето на делот со HTML ја прави пораката да изгледа подобро но "
+"во исто време го зголемува ризикот од злоупотреба на можните безбедносни "
+"дупки.</p><p>Со прикажувањето на делот со обичен текст се губи голем дел од "
+"форматирањето на пораката но е скоро <em>невозможно</em> да се злоупотребат "
+"можните безбедносни дупки во исцртувачот на HTML (Konqueror).</p><p>Долната "
+"опција заштитува од една од вообичаените злоупотреби на пораките со HTML но "
+"не може де заштити од безбедносните прашања што не биле познати во текот на "
+"пишувањето на оваа верзија на КПошта.</p><p>Поради тоа е препорачливо да "
+"<em>не</em> претпочитате HTML туку обичен текст.</p><p><b>Забелешка:</b> "
+"Оваа опција може да ја наместите поодделно по папка од менито <i>Папка</i> "
+"во главниот прозорец на КПошта.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Некои поштенски реклами се во HTML и содржат референции до, на пример, слики "
-"што рекламните агенции ги користат за да дознаат дали сте ја прочитале нивната "
-"порака („веб-бубачки“).</p>"
-"<p>Не постои валидна причина за вакво вчитување на слики од Интернет бидејќи "
-"испраќачот секогаш може да ја приложи сликата директно на пораката.</p>"
-"<p>За заштита од вакви злоупотреби на можноста за прикажување на HTML во КПошта "
-"оваа опција е стандардно <em>оневозможена</em>.</p>"
-"<p>Ако сепак сакате да ги гледате сликите во HTML-пораките што не биле "
-"приложени кон нив, може да ја овозможите оваа опција, но треба да сте свесни за "
-"можните проблеми.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Некои поштенски реклами се во HTML и содржат референции до, на "
+"пример, слики што рекламните агенции ги користат за да дознаат дали сте ја "
+"прочитале нивната порака („веб-бубачки“).</p><p>Не постои валидна причина за "
+"вакво вчитување на слики од Интернет бидејќи испраќачот секогаш може да ја "
+"приложи сликата директно на пораката.</p><p>За заштита од вакви злоупотреби "
+"на можноста за прикажување на HTML во КПошта оваа опција е стандардно "
+"<em>оневозможена</em>.</p><p>Ако сепак сакате да ги гледате сликите во HTML-"
+"пораките што не биле приложени кон нив, може да ја овозможите оваа опција, "
+"но треба да сте свесни за можните проблеми.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Политика за известувањата за статусот на пораките</h3>"
-"<p>Известувањата за статусот на пораките (ИСП) се обопштување на она што се "
-"нарекува <b>„признаница за прием“</b>. Авторот на пораката бара да му биде "
-"испратено известување за статусот, а програмата за е-пошта на примачот генерира "
-"одговор од кој авторот може да дознае што се случило со неговата порака. Меѓу "
-"најчестите типови на известувања спаѓаат <b>прикажана</b> (т.е. прочитана), <b>"
-"избришана</b> и <b>испорачана</b> (пр. препратена) итн.</p>"
-"<p>Достапни се следните опции за регулирање на испраќањето на известувања од "
-"КПошта:</p>"
-"<ul>"
-"<li><em>Игнорирај</em>: Игнорира какво било барање за известување за статус. "
-"Никакво известување нема да биде испратено автоматски (препорачано).</li>"
-"<li><em>Прашај</em>: Испраќа известувања само откако ќе добие дозвола од "
-"корисникот. На овој начин може да испраќате известувања за одредени пораки, а "
-"да ги игнорирате другите.</li>"
-"<li><em>Одбиј</em>: Секогаш испраќа известување <b>одбиена</b>. Ова е <em>"
-"нешто</em> подобро отколку секогаш да се испраќаат известувања. Авторот ќе "
-"дознае дали врз пораката било дејствувано, само нема да знае дали таа била "
-"избришана, прочитана или нешто друго.</li>"
-"<li><em>Испрати секогаш</em>: Секогаш го испраќа бараното известување за "
-"статус. Тоа значи дека авторот на пораката ќе знае дали врз пораката било "
-"дејствувано, и додатно ќе знае што точно се случило со пораката (прикажана, "
-"избришана итн.). Оваа опција воопшто не се препорачува, но бидејќи има смисол "
-"на пример за менаџирање на односи со клиентите, постои како можност.</li></ul>"
-"</qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Политика за известувањата за статусот на пораките</"
+"h3><p>Известувањата за статусот на пораките (ИСП) се обопштување на она што "
+"се нарекува <b>„признаница за прием“</b>. Авторот на пораката бара да му "
+"биде испратено известување за статусот, а програмата за е-пошта на примачот "
+"генерира одговор од кој авторот може да дознае што се случило со неговата "
+"порака. Меѓу најчестите типови на известувања спаѓаат <b>прикажана</b> (т.е. "
+"прочитана), <b>избришана</b> и <b>испорачана</b> (пр. препратена) итн.</"
+"p><p>Достапни се следните опции за регулирање на испраќањето на известувања "
+"од КПошта:</p><ul><li><em>Игнорирај</em>: Игнорира какво било барање за "
+"известување за статус. Никакво известување нема да биде испратено автоматски "
+"(препорачано).</li><li><em>Прашај</em>: Испраќа известувања само откако ќе "
+"добие дозвола од корисникот. На овој начин може да испраќате известувања за "
+"одредени пораки, а да ги игнорирате другите.</li><li><em>Одбиј</em>: Секогаш "
+"испраќа известување <b>одбиена</b>. Ова е <em>нешто</em> подобро отколку "
+"секогаш да се испраќаат известувања. Авторот ќе дознае дали врз пораката "
+"било дејствувано, само нема да знае дали таа била избришана, прочитана или "
+"нешто друго.</li><li><em>Испрати секогаш</em>: Секогаш го испраќа бараното "
+"известување за статус. Тоа значи дека авторот на пораката ќе знае дали врз "
+"пораката било дејствувано, и додатно ќе знае што точно се случило со "
+"пораката (прикажана, избришана итн.). Оваа опција воопшто не се препорачува, "
+"но бидејќи има смисол на пример за менаџирање на односи со клиентите, постои "
+"како можност.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2472,15 +2456,15 @@ msgstr "Дозволи пораките да вчитуваат &надворе�
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>ВНИМАНИЕ:</b> Дозволувањето на HTML во е-пошт. пораки може да го зголеми "
-"ризикот вашиот систем да биде компромитиран од тековни и очекувани безбедносни "
-"злоупотреби . <a href=\"whatsthis:%1\">Повеќе за HTML-пораките...</a> "
-"<a href=\"whatsthis:%2\">Повеќе за надворешните референции...</a>"
+"ризикот вашиот систем да биде компромитиран од тековни и очекувани "
+"безбедносни злоупотреби . <a href=\"whatsthis:%1\">Повеќе за HTML-пораките..."
+"</a> <a href=\"whatsthis:%2\">Повеќе за надворешните референции...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2562,8 +2546,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Оваа опција побарува dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "без прокси"
@@ -2592,8 +2575,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "При обид за пронаоѓање на непрочитани пораки:"
 
@@ -2617,8 +2600,8 @@ msgstr "врти во сите папки"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "При влегување во папка:"
 
@@ -2687,25 +2670,21 @@ msgstr "именици (формат „maildir“)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Ова избира кој формат на пошт. сандаче ќе биде стандарден за локалните "
-"папки:</p>"
-"<p><b>датотеки (mbox):</b> папките со пошта во КПошта се претставени секоја со "
-"своја посебна датотека. Индивидуалните пораки се одделени една од друга со "
-"линија која почнува со „From “. Ова штеди простор на дискот но не е толку "
-"робусно, пр. при преместување на пораки меѓу папки.</p>"
-"<p><b>именици (maildir):</b> папките со пошта во КПошта се претставени со "
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Ова избира кој формат на пошт. сандаче ќе биде стандарден за "
+"локалните папки:</p><p><b>датотеки (mbox):</b> папките со пошта во КПошта се "
+"претставени секоја со своја посебна датотека. Индивидуалните пораки се "
+"одделени една од друга со линија која почнува со „From “. Ова штеди простор "
+"на дискот но не е толку робусно, пр. при преместување на пораки меѓу папки.</"
+"p><p><b>именици (maildir):</b> папките со пошта во КПошта се претставени со "
 "вистински папки на дискот. real folders on disk. Индивидуалните пораки се "
 "одделни датотеки. Ова може да троши нешто повеќе простор на дискот но е "
 "поробусно, пр. при пренесување на пораки меѓу папки.</p></qt>"
@@ -2743,54 +2722,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>При скокање на наредната непрочитана порака може да се случи да нема повеќе "
-"непрочитани пораки под тековната.</p>"
-"<p><b>Не врти во јамка</b> Пребарувањето ќе застане на последната порака во "
-"тековната папка.</p>"
-"<p><b>Врти во тековната папка</b> Пребарувањето ќе продолжи на почетокот на "
-"листата со пораки, но нема да оди во некоја друга папка.</p>"
-"<p><b>Врти во сите папки</b> Пребарувањето ќе продолжи на почетокот на листата "
-"со пораки. Ако нема непрочитани пораки ќе продолжи во наредната папка.</p>"
-"<p>Слично, при пребарувањето за претходна непрочитана порака, пребарувањето ќе "
-"започне од крајот на листата со пораки и ќе продолжи во претходната папка во "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>При скокање на наредната непрочитана порака може да се случи да нема "
+"повеќе непрочитани пораки под тековната.</p><p><b>Не врти во јамка</b> "
+"Пребарувањето ќе застане на последната порака во тековната папка.</"
+"p><p><b>Врти во тековната папка</b> Пребарувањето ќе продолжи на почетокот "
+"на листата со пораки, но нема да оди во некоја друга папка.</p><p><b>Врти во "
+"сите папки</b> Пребарувањето ќе продолжи на почетокот на листата со пораки. "
+"Ако нема непрочитани пораки ќе продолжи во наредната папка.</p><p>Слично, "
+"при пребарувањето за претходна непрочитана порака, пребарувањето ќе започне "
+"од крајот на листата со пораки и ќе продолжи во претходната папка во "
 "зависност од тоа која опција е избрана.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Индексирањето на цел текст овозможува многу брзи пребарувања на содржината "
-"на вашите пораки. Кога е овозможено, дијалогот за пребарување ќе работи многу "
-"брзо. Исто така алатникот за пребарување ќе ги избира пораките базирано врз "
-"содржината.</p>"
-"<p>Ова зафаќа одреден простор на дискот (околу половина од просторот што го "
-"зафаќаат пораките).</p>"
-"<p>По вклучувањето ќе треба да се изгради индексот, но можете да продолжите да "
-"ја користите КПошта додека се извршува оваа операција.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Индексирањето на цел текст овозможува многу брзи пребарувања на "
+"содржината на вашите пораки. Кога е овозможено, дијалогот за пребарување ќе "
+"работи многу брзо. Исто така алатникот за пребарување ќе ги избира пораките "
+"базирано врз содржината.</p><p>Ова зафаќа одреден простор на дискот (околу "
+"половина од просторот што го зафаќаат пораките).</p><p>По вклучувањето ќе "
+"треба да се изгради индексот, но можете да продолжите да ја користите КПошта "
+"додека се извршува оваа операција.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2856,8 +2826,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2866,8 +2836,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2920,19 +2890,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Именување на прилози соодветно на Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2945,14 +2914,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -3062,17 +3031,16 @@ msgstr "&Препрати"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3089,15 +3057,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3171,8 +3139,8 @@ msgstr "Уредете идентитет"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3434,6 +3402,11 @@ msgstr "Изберете папка"
 msgid "Filters"
 msgstr "Филтер %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Избери го целиот текст"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3465,8 +3438,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3483,10 +3456,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3507,10 +3481,10 @@ msgstr "неограничено"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3521,7 +3495,7 @@ msgstr ""
 "Не можев да ја запишам датотеката %1:\n"
 "Деталниот опис на грешката е „%2“."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Грешка во КПошта"
@@ -3562,14 +3536,14 @@ msgstr "&Идентификатор на корисник:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Идентификаторот на корисник е најавата на корисникот на IMAP-серверот. Ова може "
-"да биде само корисничкото име или целосната е-поштенска адреса на корисникот. "
-"Најавата за вашата сопствена сметка на серверот ќе ви укаже која од двете форми "
-"е потребна."
+"Идентификаторот на корисник е најавата на корисникот на IMAP-серверот. Ова "
+"може да биде само корисничкото име или целосната е-поштенска адреса на "
+"корисникот. Најавата за вашата сопствена сметка на серверот ќе ви укаже која "
+"од двете форми е потребна."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3620,11 +3594,11 @@ msgstr "Немате дозвола за читање/запишување за
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Информацијата сѐ уште не е преземена од серверот. Ве молам користете „Провери "
-"пошта“."
+"Информацијата сѐ уште не е преземена од серверот. Ве молам користете "
+"„Провери пошта“."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3634,8 +3608,7 @@ msgstr "Грешка: за оваа папка не е дефинирана IMAP
 msgid "Connecting to server %1, please wait..."
 msgstr "Се поврзувам со серверот %1, почекајте..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Грешка при поврзувањето со серверот %1"
@@ -3663,11 +3636,11 @@ msgstr "Додајте дозволи"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Дали навистина сакате да ги отстраните вашите сопствени дозволи за оваа папка? "
-"После ова нема да можете да ѝ пристапите."
+"Дали навистина сакате да ги отстраните вашите сопствени дозволи за оваа "
+"папка? После ова нема да можете да ѝ пристапите."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3698,7 +3671,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Изберете папка"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Локални папки"
@@ -3722,13 +3695,13 @@ msgstr "Изберете кратенка за папка"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>За да изберете тастер или комбинација на тастери кои што ќе ја избираат "
-"тековната папка кликнете на долното копче и притиснете ги тастерите што сакате "
-"да ги придружите на оваа папка.</qt>"
+"тековната папка кликнете на долното копче и притиснете ги тастерите што "
+"сакате да ги придружите на оваа папка.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3749,13 +3722,22 @@ msgstr "Отк&ажи"
 #: folderutil.cpp:93
 #, fuzzy
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Папката што ја избришавте беше поврзана со сметката <b>%1</b> "
-"која што испраќаше пошта во папката. Папката во која што сметката ќе испраќа "
-"пошта е вратена на влезното сандаче.</qt>"
+"<qt>Папката што ја избришавте беше поврзана со сметката <b>%1</b> која што "
+"испраќаше пошта во папката. Папката во која што сметката ќе испраќа пошта е "
+"вратена на влезното сандаче.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3874,69 +3856,17 @@ msgstr ""
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>п"
-"<br>о"
-"<br>р"
-"<br>а"
-"<br>к"
-"<br>а</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>п<br>о<br>р<br>а<br>к<br>а</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>П"
-"<br>о"
-"<br>р"
-"<br>а"
-"<br>к"
-"<br>а"
-"<br> "
-"<br>б"
-"<br>е"
-"<br>з"
-"<br>  "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>П<br>о<br>р<br>а<br>к<br>а<br> <br>б<br>е<br>з<br>  "
+"<br>H<br>T<br>M<br>L<br></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3948,19 +3878,14 @@ msgstr "&Вашето име:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Вашето име</h3>"
-"<p>Ова поле треба да го содржи вашето име како што сакате тоа да изгледа во "
-"заглавието на пораката што се испраќа.</p>"
-"<p>Ако го оставите ова празно вашето име нема да се појавува туку само "
-"е-поштенската адреса.</p></qt>"
+"<qt><h3>Вашето име</h3><p>Ова поле треба да го содржи вашето име како што "
+"сакате тоа да изгледа во заглавието на пораката што се испраќа.</p><p>Ако го "
+"оставите ова празно вашето име нема да се појавува туку само е-поштенската "
+"адреса.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3968,17 +3893,13 @@ msgstr "Органи&зација:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Организација</h3>"
-"<p>Ова поле треба да го содржи името на вашата организација ако сакате тоа да "
-"се појавува во заглавието на пораката што се испраќа.</p>"
-"<p>Вообичаено е ова да се остави празно.</p></qt>"
+"<qt><h3>Организација</h3><p>Ова поле треба да го содржи името на вашата "
+"организација ако сакате тоа да се појавува во заглавието на пораката што се "
+"испраќа.</p><p>Вообичаено е ова да се остави празно.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3987,20 +3908,15 @@ msgstr "&Е-поштенска адреса:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Е-поштенска адреса</h3>"
-"<p>Ова поле треба да ја содржи вашата целосна е-поштенска адреса.</p>"
-"<p>Ако го оставите ова празно или ако го погрешите другите нема да можат да ви "
-"одговорат.</p></qt>"
+"<qt><h3>Е-поштенска адреса</h3><p>Ова поле треба да ја содржи вашата целосна "
+"е-поштенска адреса.</p><p>Ако го оставите ова празно или ако го погрешите "
+"другите нема да можат да ви одговорат.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4009,21 +3925,12 @@ msgstr "&Е-поштенска адреса:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4048,20 +3955,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP-клучот што ќе го изберете тука ќе се користи за дигитално "
-"потпишување на пораки. Исто така може да користите и GnuPG-клучеви.</p>"
-"<p>Ова може да го оставите празно но КПошта нема да може да ги потпишува "
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>OpenPGP-клучот што ќе го изберете тука ќе се користи за дигитално "
+"потпишување на пораки. Исто така може да користите и GnuPG-клучеви.</"
+"p><p>Ова може да го оставите празно но КПошта нема да може да ги потпишува "
 "пораките дигитално со помош на OpenPGP. Нормалните поштенски функции нема да "
-"бидат нарушени.</p>"
-"<p>Повеќе за клучевите може да научите на <a>http://www.gnupg.org</a></p></qt>"
+"бидат нарушени.</p><p>Повеќе за клучевите може да научите на <a>http://www."
+"gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4073,31 +3978,28 @@ msgstr "Вашиот OpenPGP-клуч за криптирање"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Изберете го OpenPGP-клучот што треба да се користи кога криптирате на вас "
 "самиот и за можноста „Приложи го мојот јавен клуч“ во составувачот."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP-клучот што ќе го изберете тука ќе се користи за криптирање на "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>OpenPGP-клучот што ќе го изберете тука ќе се користи за криптирање на "
 "пораките на вас самиот и за можноста „Приложи го мојот јавен клуч“ во "
-"составувачот. Исто така може да користите и GnuPG-клучеви.</p>"
-"<p>Ова може да го оставите празно но КПошта нема да може да ги криптира копиите "
-"од излезните пораки на вас со помош на OpenPGP. Нормалните поштенски функции "
-"нема да бидат нарушени.</p>"
-"<p>Повеќе за клучевите може да научите на <a>http://www.gnupg.org</a></qt>"
+"составувачот. Исто така може да користите и GnuPG-клучеви.</p><p>Ова може да "
+"го оставите празно но КПошта нема да може да ги криптира копиите од "
+"излезните пораки на вас со помош на OpenPGP. Нормалните поштенски функции "
+"нема да бидат нарушени.</p><p>Повеќе за клучевите може да научите на "
+"<a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4117,18 +4019,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Серфитикатот S/MIME (X.509) што ќе го изберете тука ќе се користи за "
-"дигитално потпишување на пораки.</p>"
-"<p>Ова може да го оставите празно но КПошта нема да може да ги потпишува "
-"пораките дигитално со помош на S/MIME. Нормалните поштенски функции нема да "
-"бидат нарушени.</p></qt>"
+"<qt><p>Серфитикатот S/MIME (X.509) што ќе го изберете тука ќе се користи за "
+"дигитално потпишување на пораки.</p><p>Ова може да го оставите празно но "
+"КПошта нема да може да ги потпишува пораките дигитално со помош на S/MIME. "
+"Нормалните поштенски функции нема да бидат нарушени.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4140,28 +4039,25 @@ msgstr "Вашиот S/MIME-сертификат за криптирање"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Изберете го S/MIME-сертификатот што треба да се користи кога криптирате на вас "
-"самиот и за можноста „Приложи го мојот јавен клуч“ во составувачот."
+"Изберете го S/MIME-сертификатот што треба да се користи кога криптирате на "
+"вас самиот и за можноста „Приложи го мојот јавен клуч“ во составувачот."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME-сертификатот што ќе го изберете тука ќе се користи за криптирање на "
-"пораките на вас самиот и за можноста „Приложи го мојот јавен клуч“ во "
-"составувачот.</p>"
-"<p>Ова може да го оставите празно но КПошта нема да може да ги криптира копиите "
-"од излезните пораки на вас со помош на S/MIME. Нормалните поштенски функции "
-"нема да бидат нарушени.</p></qt>"
+"<qt><p>S/MIME-сертификатот што ќе го изберете тука ќе се користи за "
+"криптирање на пораките на вас самиот и за можноста „Приложи го мојот јавен "
+"клуч“ во составувачот.</p><p>Ова може да го оставите празно но КПошта нема "
+"да може да ги криптира копиите од излезните пораки на вас со помош на S/"
+"MIME. Нормалните поштенски функции нема да бидат нарушени.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4181,24 +4077,19 @@ msgstr "Адреса за одгово&р:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адреси за одговор</h3>"
-"<p>Ова го поставува заглавието <tt>Одговор:</tt> да содржи различна адреса од "
-"нормалната адреса <tt>Од:</tt>.</p>"
-"<p>Ова може да биде корисно кога имате група на луѓе што работат заедно со "
-"слични улоги. На пример можеби би сакале сите испратени пораки да ја имаат "
-"вашата адреса во полето <tt>Од:</tt>, но сите одговори да одат на некоја групна "
-"адреса.</p>"
-"<p>Ако не сте сигурни оставете го ова поле празно.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адреси за одговор</h3><p>Ова го поставува заглавието <tt>Одговор:</"
+"tt> да содржи различна адреса од нормалната адреса <tt>Од:</tt>.</p><p>Ова "
+"може да биде корисно кога имате група на луѓе што работат заедно со слични "
+"улоги. На пример можеби би сакале сите испратени пораки да ја имаат вашата "
+"адреса во полето <tt>Од:</tt>, но сите одговори да одат на некоја групна "
+"адреса.</p><p>Ако не сте сигурни оставете го ова поле празно.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4206,25 +4097,20 @@ msgstr "Адреси за &слепа копија (BCC):"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адреси за слепа копија (Blind Carbon Copy)</h3>"
-"<p>Адресите што ќе ги внесете тука ќе бидат додадени на секоја порака испратена "
-"со овој идентитет. Тие нема да бидат видливи за другите примачи.</p>"
-"<p>Ова вообичаено се користи за да се испрати копија од секоја испратена порака "
-"на некоја друга ваша сметка.</p>"
-"<p>За да наведете повеќе од една адреса употребете запирки за одвојување на "
-"адресите на примачите на слепата копија.</p>"
-"<p>Ако не сте сигурни оставете го ова поле празно.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адреси за слепа копија (Blind Carbon Copy)</h3><p>Адресите што ќе ги "
+"внесете тука ќе бидат додадени на секоја порака испратена со овој идентитет. "
+"Тие нема да бидат видливи за другите примачи.</p><p>Ова вообичаено се "
+"користи за да се испрати копија од секоја испратена порака на некоја друга "
+"ваша сметка.</p><p>За да наведете повеќе од една адреса употребете запирки "
+"за одвојување на адресите на примачите на слепата копија.</p><p>Ако не сте "
+"сигурни оставете го ова поле празно.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4263,7 +4149,7 @@ msgstr "Потпи&с"
 msgid "&Picture"
 msgstr "С&лика"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Невалидна е-пошт. адреса"
 
@@ -4279,18 +4165,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Еден од конфигурираните OpenPGP-клучеви за потпишување не содржи никаков ид. на "
-"корисник со конфигурираната е-пошт адреса за овој идентитет (%1).\n"
-"Ова може да предизвика пораки со предупредување на приемната страна при обид за "
-"се верификуваат потписите направени со оваа конфигурација."
+"Еден од конфигурираните OpenPGP-клучеви за потпишување не содржи никаков ид. "
+"на корисник со конфигурираната е-пошт адреса за овој идентитет (%1).\n"
+"Ова може да предизвика пораки со предупредување на приемната страна при обид "
+"за се верификуваат потписите направени со оваа конфигурација."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Еден од конфигурираните OpenPGP-клучеви за криптирање не содржи никаков ид. на "
-"корисник со конфигурираната е-пошт адреса за овој идентитет (%1)."
+"Еден од конфигурираните OpenPGP-клучеви за криптирање не содржи никаков ид. "
+"на корисник со конфигурираната е-пошт адреса за овој идентитет (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4301,8 +4187,8 @@ msgid ""
 msgstr ""
 "Еден од конфигурираните S/MIME-сертификати за потпишување не ја содржи "
 "конфигурираната е-пошт адреса за овој идентитет (%1).\n"
-"Ова може да предизвика пораки со предупредување на приемната страна при обид за "
-"се верификуваат потписите направени со оваа конфигурација."
+"Ова може да предизвика пораки со предупредување на приемната страна при обид "
+"за се верификуваат потписите направени со оваа конфигурација."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4337,21 +4223,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Сопствената папка за нацрти за идентитетот „%1“ не постои (повеќе). Поради тоа "
-"ќе се користи стандардната папка за нацрти."
+"Сопствената папка за нацрти за идентитетот „%1“ не постои (повеќе). Поради "
+"тоа ќе се користи стандардната папка за нацрти."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Сопствената папка за обрасци за идентитетот „%1“ не постои (повеќе). Поради тоа "
-"ќе се користи стандардната папка за обрасци."
+"Сопствената папка за обрасци за идентитетот „%1“ не постои (повеќе). Поради "
+"тоа ќе се користи стандардната папка за обрасци."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (стандардно)"
 
@@ -4398,19 +4284,19 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Конфигурацијата беше автоматски мигрирана но би требало да ја проверите "
 "конфигурацијата на вашата сметка."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Автоматското мигрирање на вашата конфигурација на беше возможно па ве молиме да "
-"ја проверите конфигурацијата на вашата сметка."
+"Автоматското мигрирање на вашата конфигурација на беше возможно па ве молиме "
+"да ја проверите конфигурацијата на вашата сметка."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4447,17 +4333,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Грешка: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Врската со серверот %1 беше неочекувано затворена или ѝ истече времето. Таа ќе "
-"биде автоматски воспоставена ако е тоа можно."
+"Врската со серверот %1 беше неочекувано затворена или ѝ истече времето. Таа "
+"ќе биде автоматски воспоставена ако е тоа можно."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4605,14 +4496,14 @@ msgstr "Прелистај ги архивите"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4641,262 +4532,212 @@ msgstr "Неупотребливи клучеви за криптирање"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за потпишување</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за потпишување</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за потпишување</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за криптирање</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за криптирање</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за криптирање</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n ден.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n ден.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n ден.</p>\n"
 "<p>Вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>\n"
 "<p>Вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n ден.</p>\n"
 "<p>Вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>\n"
 "<p>Вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4910,251 +4751,201 @@ msgstr "S/MIME-сертификатот истекува наскоро"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Вашиот OpenPGP-клуч за потпишување</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> "
-"(Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Вашиот OpenPGP-клуч за криптирање</p><p align=center><b>%1</b> (Ид. на "
+"клуч 0x%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>OpenPGP-клучот за</p><p align=center><b>%1</b> (Ид. на клуч 0x%2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за потпишување</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за потпишување</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за потпишување</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за криптирање</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за криптирање</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за вашиот S/MIME-"
+"сертификат за криптирање</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n ден.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>\n"
+"<p>Кореновиот сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот</p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n ден.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за вашиот "
+"S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> (сериски број "
+"%2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME-сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n ден.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>\n"
+"<p>Посредничкиот CA-сертификат</p><p align=center><b>%3</b></p><p>за S/MIME-"
+"сертификатот </p><p align=center><b>%1</b> (сериски број %2)</p><p>истекува "
+"за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n ден.</p>\n"
 "<p>Вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>\n"
 "<p>Вашиот S/MIME-сертификат за потпишување</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n ден.</p>\n"
 "<p>Вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>\n"
 "<p>Вашиот S/MIME-сертификат за криптирање</p><p align=center><b>%1</b> "
-"(сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"(сериски број %2)</p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n ден.</p>\n"
-"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>\n"
-"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</p>"
-"<p>истекува за помалку од %n дена.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n ден.</p>\n"
+"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>\n"
+"<p>S/MIME-сертификатот за</p><p align=center><b>%1</b> (сериски број %2)</"
+"p><p>истекува за помалку од %n дена.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5166,14 +4957,15 @@ msgstr "S/MIME-сертификатот истекува наскоро"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Едне или повеќе од вашите конфигурирани OpenPGP-клучеви за криптирање или "
-"S/MIME-сертификати не е употреблив за криптирање. Реконфигурирајте ги вашите "
+"Едне или повеќе од вашите конфигурирани OpenPGP-клучеви за криптирање или S/"
+"MIME-сертификати не е употреблив за криптирање. Реконфигурирајте ги вашите "
 "клучеви за криптирање и сертификати за овој идентитет во дијалогот за "
 "конфигурација на идентитет.\n"
 "Ако изберете да продолжите и ако клучевите се потребни подоцна, ќе бидете "
@@ -5191,8 +4983,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Едне или повеќе од вашите конфигурирани OpenPGP-клучеви за потпишување или "
-"S/MIME-сертификати за потпишување не е употреблив за потпишување. "
+"Едне или повеќе од вашите конфигурирани OpenPGP-клучеви за потпишување или S/"
+"MIME-сертификати за потпишување не е употреблив за потпишување. "
 "Реконфигурирајте ги вашите клучеви за потпишување и сертификати за овој "
 "идентитет во дијалогот за конфигурација на идентитет.\n"
 "Ако изберете да продолжите и ако клучевите се потребни подоцна, ќе бидете "
@@ -5206,26 +4998,26 @@ msgstr "Неупотребливи клучеви за потпишување"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5236,8 +5028,8 @@ msgstr "Не потпишувај со OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5259,11 +5051,11 @@ msgstr "Потпишувањето не е возможно"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Не избравте клуч за криптирање на вас самиот (encrypt to self). Нема да можете "
-"да ја декриптирате вашата сопствена порака ако ја криптирате."
+"Не избравте клуч за криптирање на вас самиот (encrypt to self). Нема да "
+"можете да ја декриптирате вашата сопствена порака ако ја криптирате."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5284,11 +5076,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Не избравте клуч за криптирање за ниеден од примачите на поракава. Поради тоа "
-"пораката нема да биде криптирана."
+"Не избравте клуч за криптирање за ниеден од примачите на поракава. Поради "
+"тоа пораката нема да биде криптирана."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5299,8 +5091,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Не избравте клуч за криптирање за еден од примачите. Оваа личност нема да може "
-"да ја декриптира пораката ако ја криптирате."
+"Не избравте клуч за криптирање за еден од примачите. Оваа личност нема да "
+"може да ја декриптира пораката ако ја криптирате."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5333,11 +5125,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Не беше пронајден валиден и доверлив клуч за „%1“.\n"
 "\n"
@@ -5386,10 +5178,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Критична грешка: не можам да ја соберам поштата: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Не успеав да ја додадам пораката:\n"
+msgid "Failed to add message:\n"
+msgstr "Не успеав да ја додадам пораката:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5434,8 +5224,7 @@ msgstr "Ја преместувам пораката %3 од %2 од %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Не можам да ја отстранам поштата од пошт. сандаче <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Не можам да ја отстранам поштата од пошт. сандаче <b>%1</b>:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5483,6 +5272,52 @@ msgstr "Непо&врзан IMAP"
 msgid "&Maildir mailbox"
 msgstr "Пошт. сандаче &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Ја поставува темата на пораката"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Испраќа копија (CC:) на „address“"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Испраќа слепа копија (BCC:) на „address“"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Го додава „header“ на пораката"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Го вчитува телото на пораката од „file“"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Го поставува телото на пораката"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Додава прилог на пораката. Ова може да се повторува"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Само проверува за нова пошта"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Само го отвора составувачот"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Ја прегледува дадената датотека со порака"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Ја испраќа пораката на „address“ односно ја приложува датотеката на која што "
+"покажува „URL“"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Пошта"
@@ -5537,9 +5372,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5590,11 +5425,11 @@ msgstr "URL е копиран на таблата со исечоци."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Датотеката <b>%1</b> постои.<br>Дали сакате да ја замените?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Зачувај во датотека"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "За&мени"
 
@@ -5612,7 +5447,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5632,11 +5467,11 @@ msgstr "Датотеката не содржи порака."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Датотеката содржи повеќе пораки. Само првата порака е прикажана."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5645,103 +5480,103 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Филтрирам пораки"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Ја филтрирам пораката %1 од %2."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Нема доволно слободен простор на дискот?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Премести во оваа папка"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Копирај во оваа папка"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Преместување на пораки"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Бришење на пораки"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Отворам URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Дали навистина сакате да ја извршите <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Изврши"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Не се пронајдени прилози за зачувување."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Зачувајте ги прилозите во"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "прилог.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "прилог.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Датотеката со име %1 веќе постои. Дали сакате да запишете врз неа?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Датотеката веќе постои"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "За&пиши"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"Делот %1 од пораката е криптиран. Дали сакате да го зачувате криптирањето при "
-"зачувувањето?"
+"Делот %1 од пораката е криптиран. Дали сакате да го зачувате криптирањето "
+"при зачувувањето?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Прашање на КПошта"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Задржи го криптирањето"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Не задржувај"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5749,11 +5584,11 @@ msgstr ""
 "Делот %1 од пораката е потпишан. Дали сакате да го зачувате потписот при "
 "зачувувањето?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Задржи го потписот"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5762,85 +5597,85 @@ msgstr ""
 "Не можев да ја запишам датотеката %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Не можев да ја запишам датотеката %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Пошта"
@@ -5939,7 +5774,7 @@ msgstr "Големина"
 msgid "Encoding"
 msgstr "Кодирање"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Компресија"
 
@@ -5951,7 +5786,7 @@ msgstr "Криптирај"
 msgid "Sign"
 msgstr "Потпиши"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Име на прилогот:"
 
@@ -5973,10 +5808,11 @@ msgstr "Главни приматели"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>На е-поштенските адреси, што ќе ги ставите во ова поле, ќе биде испратена "
-"копија од пораката.</qt>"
+"<qt>На е-поштенските адреси, што ќе ги ставите во ова поле, ќе биде "
+"испратена копија од пораката.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5985,14 +5821,14 @@ msgstr "Додатни приматели"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>На е-поштенските адреси, што ќе ги ставите во ова поле, ќе биде испратена "
-"копија од пораката. Ова технички исто како адресите да сте ги ставиле во полето "
-"<b>To:</b> но се разликува по тоа што симболизира дека примателот на копијата "
-"(Carbon Copy) е слушател а не главниот примател.</qt>"
+"<qt>На е-поштенските адреси, што ќе ги ставите во ова поле, ќе биде "
+"испратена копија од пораката. Ова технички исто како адресите да сте ги "
+"ставиле во полето <b>To:</b> но се разликува по тоа што симболизира дека "
+"примателот на копијата (Carbon Copy) е слушател а не главниот примател.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6000,13 +5836,11 @@ msgstr "Скриени приматели"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Есенцијално истото нешто како и полето <b>Копија до:</b> "
-"но се разликува во тоа што останатите приматели не гледаат кој ја прима слепата "
-"копија.</qt>"
+"<qt>Есенцијално истото нешто како и полето <b>Копија до:</b> но се разликува "
+"во тоа што останатите приматели не гледаат кој ја прима слепата копија.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6016,7 +5850,7 @@ msgstr "И&спрати пошта"
 msgid "&Send Mail Via"
 msgstr "И&спрати пошта преку"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Испрати по&доцна"
@@ -6081,8 +5915,7 @@ msgstr "О&тстрани знаци за цитат"
 msgid "Cl&ean Spaces"
 msgstr "Исчисти ги празните м&еста"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Користи фи&ксен фонт"
@@ -6224,31 +6057,31 @@ msgstr "Формат на &криптографска порака"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандардно"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Листа за набројување (диск)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Листа за набројување (кругче)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Листа за набројување (квадрат)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Нумерирана листа (децимална)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Нумерирана листа (мали букви)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Нумерирана листа (големи букви)"
 
@@ -6356,8 +6189,8 @@ msgstr "Го затворате составувачот"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Пораката што ја составивте укажува на приложена датотека но вие немате "
@@ -6368,37 +6201,39 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Потсетување за прилог"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "И&спрати како што е"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>КПошта не можеше да ја препознае локацијата на прилогот (%1).</p>"
-"<p>Треба да ја наведете целосната патека ако сакате да приложите датотека.</p>"
-"</qt>"
+"<qt><p>КПошта не можеше да ја препознае локацијата на прилогот (%1).</"
+"p><p>Треба да ја наведете целосната патека ако сакате да приложите датотека."
+"</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Приложете датотека"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Приложи"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Вметнете датотека"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Вметнете датотека"
@@ -6406,13 +6241,11 @@ msgstr "Вметнете датотека"
 #: kmcomposewin.cpp:3129
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Се случи грешка при обидот да се изнесе клучот:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Се случи грешка при обидот да се изнесе клучот:</p><p><b>%1</b></p></"
+"qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6451,20 +6284,35 @@ msgid ""
 "View"
 msgstr "Прегледај"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "&Додај..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Отвори со..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "З&ачувај како..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Својства"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Додај прилог..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "КПошта не можеше да ја компресира датотеката."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6472,77 +6320,74 @@ msgstr ""
 "Компресираната датотека е поголема од оригиналот. Дали сакате да го задржите "
 "оригиналот?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Задржи"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "КПошта не можеше да ја декомпресира датотеката."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Зачувајте прилог како"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Додај како текст"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Додај како прилог"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Вметни како &прилог"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "неименувано"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Побаравте пораките да бидат криптирани на вас самиот, но тековно избраниот "
-"идентитет не дефинира OpenPGP или S/MIME клуч за употреба со ова.</p>"
-"<p>Изберете ги клучевите за користење во конфигурацијата на идентитет.</p></qt>"
+"<qt><p>Побаравте пораките да бидат криптирани на вас самиот, но тековно "
+"избраниот идентитет не дефинира OpenPGP или S/MIME клуч за употреба со ова.</"
+"p><p>Изберете ги клучевите за користење во конфигурацијата на идентитет.</"
+"p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Недефиниран клуч за криптирање"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>За да можете да ја потпишете оваа порака прво треба да го дефинирате OpenPGP "
-"или S/MIME клучот за потпишување што ќе се користи.</p>"
-"<p>Ве молам изберете го клучот што ќе се користи во конфигурацијата на "
-"идентитет.</p></qt>"
+"<qt><p>За да можете да ја потпишете оваа порака прво треба да го дефинирате "
+"OpenPGP или S/MIME клучот за потпишување што ќе се користи.</p><p>Ве молам "
+"изберете го клучот што ќе се користи во конфигурацијата на идентитет.</p></"
+"qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Недефиниран клуч за потпишување"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6550,196 +6395,195 @@ msgstr ""
 "КПошта е моментално во режим без мрежа. Вашите пораки ќе бидат задржани во "
 "излезното сандаче додека не се поврзете на мрежа."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "На мрежа/без мрежа"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Мора да ја внесете вашата е-поштенска адреса во полето „Од:“. Исто така би "
-"требало да ја поставите вашата е-поштенска адреса за сите идентитети за да не "
-"мора да ја внесувате за секоја порака."
+"требало да ја поставите вашата е-поштенска адреса за сите идентитети за да "
+"не мора да ја внесувате за секоја порака."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Мора да наведете барем еден примач во полето „До:“ или пак во CC или BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Не наведовте тема. Ќе ја испратите ли сепак пораката?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Не е зададено име"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Не наведовте тема. Ќе ја испратите ли сепак пораката?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Не е наведена тема"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Испрати како што &е"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "Наведете ја &темата"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Сопствената папка за нацрти за идентитетот „%1“ не постои (повеќе). Поради тоа "
-"ќе се користи стандардната папка за нацрти."
+"Сопствената папка за нацрти за идентитетот „%1“ не постои (повеќе). Поради "
+"тоа ќе се користи стандардната папка за нацрти."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Ве молам создајте сметка за испраќање и обидете се повторно."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Ја испраќам пораката..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Потврда за испраќање"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "И&спрати сега"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Главни приматели"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Додатни приматели"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Проверувач на правопис"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Проверувач на правопис"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Проверката на правопис е откажана."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Проверката на правопис е запрена."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Проверката на правопис е завршена."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Проверувач на правопис"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Пораката е потпишана од %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Пораката е потпишана од %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP-порака - криптирана"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Порака со тема: "
@@ -6792,11 +6636,11 @@ msgstr "Проверка на правопис - КПошта"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/Aspell не можеше да се стартува. Осигурете се дека ги имате ISpell или "
-"Aspell правилно конфигурирани и дека се во вашата $PATH."
+"ISpell/Aspell не можеше да се стартува. Осигурете се дека ги имате ISpell "
+"или Aspell правилно конфигурирани и дека се во вашата $PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6830,13 +6674,11 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Непознато дејство за филтрирање <b>%1</b>"
-"<br>во правилото за филтрирање <b>%2</b>."
-"<br>Го игнорирам.</qt>"
+"<qt>Непознато дејство за филтрирање <b>%1</b><br>во правилото за филтрирање "
+"<b>%2</b>.<br>Го игнорирам.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7055,162 +6897,131 @@ msgstr "Пушти звук"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ова е листата на дефинирани филтри. Тие се обработуваат од горе надолу.</p>"
-"<p>Кликнете на кој било филтер за да го уредувате користејќи ги контролите на "
-"десната половина од дијалогов.</p></qt>"
+"<qt><p>Ова е листата на дефинирани филтри. Тие се обработуваат од горе "
+"надолу.</p><p>Кликнете на кој било филтер за да го уредувате користејќи ги "
+"контролите на десната половина од дијалогов.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликнете на копчево за да создадете нов филтер.</p>"
-"<p>Филтерот ќе биде вметнат пред тековно избраниот, но ова понатаму може да го "
-"измените.</p>"
-"<p>Ако сте го кликнале ова копче по грешка, може да го поништите ова со кликање "
-"на копчето <em>Избриши</em>.</p></qt>"
+"<qt><p>Кликнете на копчево за да создадете нов филтер.</p><p>Филтерот ќе "
+"биде вметнат пред тековно избраниот, но ова понатаму може да го измените.</"
+"p><p>Ако сте го кликнале ова копче по грешка, може да го поништите ова со "
+"кликање на копчето <em>Избриши</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликнете на копчево за да копирате филтер.</p>"
-"<p>Ако сте го кликнале ова копче по грешка, може да го поништите ова со кликање "
-"на копчето <em>Избриши</em>.</p></qt>"
+"<qt><p>Кликнете на копчево за да копирате филтер.</p><p>Ако сте го кликнале "
+"ова копче по грешка, може да го поништите ова со кликање на копчето "
+"<em>Избриши</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликнете на копчево за да го <em>избришете</em> тековно избраниот филтер од "
-"горната листа.</p>"
-"<p>Не постои начин филтерот да се врати откако е избришан. но секогаш можете да "
-"го напуштите дијалогот со кликање на <em>Откажи</em> "
-"за да ги поништите направените измени.</p></qt>"
+"<qt><p>Кликнете на копчево за да го <em>избришете</em> тековно избраниот "
+"филтер од горната листа.</p><p>Не постои начин филтерот да се врати откако е "
+"избришан. но секогаш можете да го напуштите дијалогот со кликање на "
+"<em>Откажи</em> за да ги поништите направените измени.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликнете на копчево за да го поместите тековно избраниот филтер за едно "
-"место  <em>надолу</em> во листата.</p>"
-"<p>Ова е корисно бидејќи редоследот на филтрите во листата го одредува "
-"редоследот по кој тие се применуваат на пораките: најгорниот филтер се "
-"применува прв.</p>"
-"<p>Ако сте го кликнале ова копче по грешка, може да го вратите ова со кликање "
-"на копчето <em>Нагоре</em>.</p></qt>"
+"<qt><p>Кликнете на копчево за да го поместите тековно избраниот филтер за "
+"едно место  <em>надолу</em> во листата.</p><p>Ова е корисно бидејќи "
+"редоследот на филтрите во листата го одредува редоследот по кој тие се "
+"применуваат на пораките: најгорниот филтер се применува прв.</p><p>Ако сте "
+"го кликнале ова копче по грешка, може да го вратите ова со кликање на "
+"копчето <em>Нагоре</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Кликнете на копчево за да го поместите тековно избраниот филтер за едно "
-"место  <em>нагоре</em> во листата.</p>"
-"<p>Ова е корисно бидејќи редоследот на филтрите во листата го одредува "
-"редоследот по кој тие се применуваат на пораките: најгорниот филтер се "
-"применува прв.</p>"
-"<p>Ако сте го кликнале ова копче по грешка, може да го вратите ова со кликање "
-"на копчето <em>Надолу</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Кликнете на копчево за да го поместите тековно избраниот филтер за "
+"едно место  <em>нагоре</em> во листата.</p><p>Ова е корисно бидејќи "
+"редоследот на филтрите во листата го одредува редоследот по кој тие се "
+"применуваат на пораките: најгорниот филтер се применува прв.</p><p>Ако сте "
+"го кликнале ова копче по грешка, може да го вратите ова со кликање на "
+"копчето <em>Надолу</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Кликнете на копчево за да го поместите тековно избраниот филтер за едно "
-"место  <em>надолу</em> во листата.</p>"
-"<p>Ова е корисно бидејќи редоследот на филтрите во листата го одредува "
-"редоследот по кој тие се применуваат на пораките: најгорниот филтер се "
-"применува прв.</p>"
-"<p>Ако сте го кликнале ова копче по грешка, може да го вратите ова со кликање "
-"на копчето <em>Нагоре</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Кликнете на копчево за да го поместите тековно избраниот филтер за "
+"едно место  <em>надолу</em> во листата.</p><p>Ова е корисно бидејќи "
+"редоследот на филтрите во листата го одредува редоследот по кој тие се "
+"применуваат на пораките: најгорниот филтер се применува прв.</p><p>Ако сте "
+"го кликнале ова копче по грешка, може да го вратите ова со кликање на "
+"копчето <em>Нагоре</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликнете на копчево за да го поместите тековно избраниот филтер за едно "
-"место  <em>надолу</em> во листата.</p>"
-"<p>Ова е корисно бидејќи редоследот на филтрите во листата го одредува "
-"редоследот по кој тие се применуваат на пораките: најгорниот филтер се "
-"применува прв.</p>"
-"<p>Ако сте го кликнале ова копче по грешка, може да го вратите ова со кликање "
-"на копчето <em>Нагоре</em>.</p></qt>"
+"<qt><p>Кликнете на копчево за да го поместите тековно избраниот филтер за "
+"едно место  <em>надолу</em> во листата.</p><p>Ова е корисно бидејќи "
+"редоследот на филтрите во листата го одредува редоследот по кој тие се "
+"применуваат на пораките: најгорниот филтер се применува прв.</p><p>Ако сте "
+"го кликнале ова копче по грешка, може да го вратите ова со кликање на "
+"копчето <em>Нагоре</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликнете на ова копче за да го преименувате тековно избраниот филтер.</p>"
-"<p>Филтрите се именуваат автоматски сѐ додека започнуваат со „&lt;“.</p>"
-"<p>Ако сте преименувале филтер по грешка и сакате да го вратите автоматското "
-"именување назад кликнете на копчево и изберете <em>Исчисти</em> и потоа <em>"
-"Во ред</em> во наредниот дијалог.</p></qt>"
+"<qt><p>Кликнете на ова копче за да го преименувате тековно избраниот филтер."
+"</p><p>Филтрите се именуваат автоматски сѐ додека започнуваат со „&lt;“.</"
+"p><p>Ако сте преименувале филтер по грешка и сакате да го вратите "
+"автоматското именување назад кликнете на копчево и изберете <em>Исчисти</em> "
+"и потоа <em>Во ред</em> во наредниот дијалог.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -7222,6 +7033,16 @@ msgstr "Правила за филтрирање на POP3"
 msgid "Filter Rules"
 msgstr "Правила за филтрирање"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "Внес&и"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "Внес&и"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Достапни филтри"
@@ -7302,6 +7123,11 @@ msgstr "Дополнително додај го филтерот на алат�
 msgid "Icon for this filter:"
 msgstr "Икона за филтерот:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "До"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Нагоре"
@@ -7310,16 +7136,29 @@ msgstr "Нагоре"
 msgid "Down"
 msgstr "Надолу"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Преименувај..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Нов"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Копирај во"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Избришана"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7328,8 +7167,8 @@ msgstr "Изберете кратенка за папка"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7337,8 +7176,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Следните филтри не беа зачувани бидејќи не се валидни (т.е. не содржат дејства "
-"или правила за пребарување)."
+"Следните филтри не беа зачувани бидејќи не се валидни (т.е. не содржат "
+"дејства или правила за пребарување)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7386,16 +7225,16 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Имињата на папките не можат да го содржат знакот / (коса црта). Изберете друго "
-"име за папката."
+"Имињата на папките не можат да го содржат знакот / (коса црта). Изберете "
+"друго име за папката."
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Имињата на папките не можат да започнуваат со знакот . (точка). Изберете друго "
-"име за папката."
+"Имињата на папките не можат да започнуваат со знакот . (точка). Изберете "
+"друго име за папката."
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7410,19 +7249,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -7460,8 +7296,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7495,8 +7331,8 @@ msgstr "Индексот за папкава беше повторно креи�
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7625,14 +7461,11 @@ msgstr "Создавам потпапки на серверот"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Изгледа дека папката <b>%1</b> била избришана. Дали сакате да ја избришете "
-"од серверот?</p></qt>"
+"<qt><p>Изгледа дека папката <b>%1</b> била избришана. Дали сакате да ја "
+"избришете од серверот?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7653,13 +7486,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Изгледа дека папката <b>%1</b> била избришана. Дали сакате да ја избришете "
-"од серверот?</p></qt>"
+"<qt><p>Изгледа дека папката <b>%1</b> била избришана. Дали сакате да ја "
+"избришете од серверот?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7667,14 +7498,14 @@ msgstr "Прекинато"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7687,11 +7518,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7700,15 +7531,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Премести во:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Не преместувај"
 
@@ -7720,8 +7556,7 @@ msgstr "Преместете ги пораките во папка"
 msgid "Permissions (ACL)"
 msgstr "Дозволи (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Општо"
@@ -7745,8 +7580,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Користи сопствени &икони"
@@ -7765,14 +7599,13 @@ msgstr "Дејствувај на нова/непрочитана пошта в�
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7785,13 +7618,13 @@ msgstr "Задржи ги одговорите во папкава"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Изберете ја оваа опција ако сакате одговорите што ги пишувате на пораки во оваа "
-"папка да бидат оставени во истата по испраќањето, наместо да бидат ставени во "
-"стандардната папка со испратена пошта."
+"Изберете ја оваа опција ако сакате одговорите што ги пишувате на пораки во "
+"оваа папка да бидат оставени во истата по испраќањето, наместо да бидат "
+"ставени во стандардната папка со испратена пошта."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7801,17 +7634,21 @@ msgstr "Ги покажува колоните за примач/испраќа�
 msgid "Sho&w column:"
 msgstr "Покажи &колона:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Како почетен"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Испраќач"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Примач"
@@ -7822,11 +7659,11 @@ msgstr "Идентитет на и&спраќачот:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7845,12 +7682,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7881,17 +7718,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7961,12 +7798,13 @@ msgstr "Грешка при земањето на информации за па
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Индексот на пораки „%1“ е од непозната верзија на КПошта (%2).\n"
 "Овој индекс може да биде регенериран од вашата папка со пораки, но некои "
-"информации, вклучително ознаките за статус, можат да се изгубат. Дали сакате да "
-"ја деградирате вашата индексна датотека?"
+"информации, вклучително ознаките за статус, можат да се изгубат. Дали сакате "
+"да ја деградирате вашата индексна датотека?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -7984,8 +7822,8 @@ msgid ""
 msgstr ""
 "Индексот на пораки „%1“ е од непозната верзија на КПошта (%2).\n"
 "Овој индекс може да биде регенериран од вашата папка со пораки, но некои "
-"информации, вклучително ознаките за статус, можат да се изгубат. Дали сакате да "
-"ја деградирате вашата индексна датотека?"
+"информации, вклучително ознаките за статус, можат да се изгубат. Дали сакате "
+"да ја деградирате вашата индексна датотека?"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -7993,8 +7831,8 @@ msgstr "Грешка при отворањето на %1. Оваа папка н
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Грешка при отворањето на %1. Или ова не е валидна maildir-папка или немате "
 "доволни дозволи за пристап."
@@ -8010,8 +7848,8 @@ msgstr "Не можам да ја синхронизирам maildir-папка�
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"Пораката не можеше да биде додадена на папката, веројатно недостасува простор "
-"на дискот."
+"Пораката не можеше да биде додадена на папката, веројатно недостасува "
+"простор на дискот."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -8042,22 +7880,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Изгледа дека индексот на папката „%2“ е застарен. За да се спречи оштетување "
-"на пораките индексот ќе биде регенериран. Како резултат на тоа избришаните "
-"пораки може повторно да се појават и можно е да бидат изгубени ознаките за "
-"статус.</p>"
-"<p>Ве молиме да ја прочитате соодветниот дел во <a href=\"%1\">"
-"секцијата за ЧПП од прирачникот на КПошта</a> за информација како да спречите "
-"овој проблем да се појави повторно.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Изгледа дека индексот на папката „%2“ е застарен. За да се спречи "
+"оштетување на пораките индексот ќе биде регенериран. Како резултат на тоа "
+"избришаните пораки може повторно да се појават и можно е да бидат изгубени "
+"ознаките за статус.</p><p>Ве молиме да ја прочитате соодветниот дел во <a "
+"href=\"%1\">секцијата за ЧПП од прирачникот на КПошта</a> за информација "
+"како да спречите овој проблем да се појави повторно.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8119,7 +7953,7 @@ msgstr ""
 "Изгледа дека „%1“ не е папка.\n"
 "Ве молам тргнете ја датотеката оттаму."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8127,7 +7961,7 @@ msgstr ""
 "Дозволите за папката „%1“ не се исправни.\n"
 "Осигурете се дека можете да ја гледате и менувате содржината на оваа папка."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8137,8 +7971,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8146,7 +7980,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Не успеав да создадам папка"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8245,9 +8079,9 @@ msgstr ""
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Не можам да ја создадам папката <b>%1</b> поради недоволни дозволи на "
 "серверот. Ако мислите дека би требало да можете да создавате папки тука, "
@@ -8277,14 +8111,16 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Не можам да ја преместам папката <b>%1</b> во потпапка под самата неа.</qt>"
+"<qt>Не можам да ја преместам папката <b>%1</b> во потпапка под самата неа.</"
+"qt>"
 
 #: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Не можам да ја преместам папката <b>%1</b> во потпапка под самата неа.</qt>"
+"<qt>Не можам да ја преместам папката <b>%1</b> во потпапка под самата неа.</"
+"qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8394,17 +8230,17 @@ msgstr "%1, папката е само за читање."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Дали навистина сакате да ја избришете %n-та избрана порака?"
-"<br>Еднаш избришана, таа не може да се врати назад.</qt>\n"
-"<qt>Дали навистина сакате да ги избришете %n-те избрани пораки?"
-"<br>Еднаш избришани, тие не можат да се вратат назад.</qt>\n"
-"<qt>Дали навистина сакате да ги избришете %n-те избрани пораки?"
-"<br>Еднаш избришани, тие не можат да се вратат назад.</qt>"
+"<qt>Дали навистина сакате да ја избришете %n-та избрана порака?<br>Еднаш "
+"избришана, таа не може да се врати назад.</qt>\n"
+"<qt>Дали навистина сакате да ги избришете %n-те избрани пораки?<br>Еднаш "
+"избришани, тие не можат да се вратат назад.</qt>\n"
+"<qt>Дали навистина сакате да ги избришете %n-те избрани пораки?<br>Еднаш "
+"избришани, тие не можат да се вратат назад.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8456,133 +8292,132 @@ msgstr ""
 "Не можам да го изменам %1\n"
 "(Нема повеќе простор на уредот?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "КПошта е без мрежа; сите мрежни задачи се суспендирани"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "КПошта е на мрежа; сите мрежни задачи се продолжени"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "КПошта е моментално во режим без мрежа. Како сакате да продолжите?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Работи на мрежа"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Работи без мрежа"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Немате дозвола за читање/запишување за вашето влезно сандаче."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "изл. сандаче"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Немате дозвола за читање/запишување за вашето излезно сандаче."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "испратени"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Немате дозвола за читање/запишување за вашата папка со испратени пораки."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "корпа"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Немате дозвола за читање/запишување за вашата корпа."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "нацрти"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Немате дозвола за читање/запишување за вашата папка со нацрти."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "обрасци"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Немате дозвола за читање/запишување во Вашата папка со обрасци."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Последното барање"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Папката <i>%4</i> постои. %1 сега ја користи папката <i>%5</i> "
-"за нејзините пораки."
-"<p>%2 може да ја пренесе содржината на <i>%6<i> во оваа папка за вас, иако ова "
-"може да ги замени постоечките датотеки со исто име во <i>%7</i>."
-"<p><strong>Дали сакате %3 да ги премести датотеките со пошта сега?</strong></qt>"
+"<qt>Папката <i>%4</i> постои. %1 сега ја користи папката <i>%5</i> за "
+"нејзините пораки.<p>%2 може да ја пренесе содржината на <i>%6<i> во оваа "
+"папка за вас, иако ова може да ги замени постоечките датотеки со исто име во "
+"<i>%7</i>.<p><strong>Дали сакате %3 да ги премести датотеките со пошта сега?"
+"</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Папката <i>%4</i> постои. %1 сега ја користи папката<i>%5</i> "
-"за нејзините пораки. %2 може да ја премести содржината на <i>%6</i> "
-"во оваа папка наместо вас."
-"<p><strong>Дали сакате %3 да ги премести поштенските пораки сега?</strong></qt>"
+"<qt>Папката <i>%4</i> постои. %1 сега ја користи папката<i>%5</i> за "
+"нејзините пораки. %2 може да ја премести содржината на <i>%6</i> во оваа "
+"папка наместо вас.<p><strong>Дали сакате %3 да ги премести поштенските "
+"пораки сега?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Ги пренесувате датотеките со пошта?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "КПошта имаше фатална грешка и ќе се исклучи сега"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8593,11 +8428,11 @@ msgstr ""
 "Грешката беше:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Испразни ја корпата"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Дали сте сигурни дека сакате да ги испразните корпите на сите сметки?"
 
@@ -8674,8 +8509,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Пристигната е нова пошта</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8713,8 +8547,8 @@ msgstr "Дали сте сигурен дека сакате да ја испр�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Дали сте сигурен дека сакате да ги преместите сите пораки од папката <b>"
 "%1</b> во корпата?</qt>"
@@ -8741,8 +8575,8 @@ msgstr "Бришење на пребарување"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt>Дали сте сигурни дека сакате да го избришете пребарувањето <b>%1</b>?"
 "<br>Пораките кои ги покажува сѐ уште ќе бидат достапни во нивните оригинални "
@@ -8755,45 +8589,47 @@ msgstr "Бришење на папка"
 #: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Дали сте сигурни дека сакате да ја избришете празната папка <b>%1</b>?</qt>"
+"<qt>Дали сте сигурни дека сакате да ја избришете празната папка <b>%1</b>?</"
+"qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Дали навистина сакате да ја избришете празната папка <b>%1</b> "
-"и сите нејзини потпапки? Потпапките може да не се празни и нивната содржина "
-"исто така ќе биде избришана. "
-"<p><b>Внимавајте</b>, избришаните пораки не се сочувуваат во Корпата туку се "
-"бришат перманентно.</qt>"
+"<qt>Дали навистина сакате да ја избришете празната папка <b>%1</b> и сите "
+"нејзини потпапки? Потпапките може да не се празни и нивната содржина исто "
+"така ќе биде избришана. <p><b>Внимавајте</b>, избришаните пораки не се "
+"сочувуваат во Корпата туку се бришат перманентно.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Дали навистина сакате да ја избришете папката <b>%1</b> "
-"отфрлајќи ја нејзината содржина? "
-"<p><b>Внимавајте</b>, избришаните пораки не се сочувуваат во Корпата туку се "
-"бришат перманентно.</qt>"
+"<qt>Дали навистина сакате да ја избришете папката <b>%1</b> отфрлајќи ја "
+"нејзината содржина? <p><b>Внимавајте</b>, избришаните пораки не се "
+"сочувуваат во Корпата туку се бришат перманентно.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Дали сте сигурни дека сакате да ја избришете папката <b>%1</b> "
-"и сите нејзини потпапки, отфрлајќи ја нивната содржина? "
-"<p><b>Внимавајте</b>, избришаните пораки не се сочувуваат во Корпата туку се "
-"бришат перманентно.</qt>"
+"<qt>Дали сте сигурни дека сакате да ја избришете папката <b>%1</b> и сите "
+"нејзини потпапки, отфрлајќи ја нивната содржина? <p><b>Внимавајте</b>, "
+"избришаните пораки не се сочувуваат во Корпата туку се бришат перманентно.</"
+"qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Избришана"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8807,9 +8643,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8823,8 +8659,8 @@ msgstr "Користи HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8841,8 +8677,8 @@ msgstr "Филтер за поштенската листа %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8861,7 +8697,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Не можев да го стартувам GnuPG LogViewer (kwatchgnupg). Проверете ја вашата "
 "инсталација."
@@ -9199,8 +9036,7 @@ msgstr "Зачувај ги при&лозите..."
 msgid "Appl&y All Filters"
 msgstr "Примен&и ги сите филтри"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Примени филтер"
@@ -9237,7 +9073,8 @@ msgstr "Вкупно по&раки"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Ја прикажува/сокрива колоната со приказ на вкупниот број на пораки во папките."
+"Ја прикажува/сокрива колоната со приказ на вкупниот број на пораки во "
+"папките."
 
 #: kmmainwidget.cpp:3026
 #, fuzzy
@@ -9250,7 +9087,8 @@ msgstr "Вкупно по&раки"
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Ја прикажува/сокрива колоната со приказ на вкупниот број на пораки во папките."
+"Ја прикажува/сокрива колоната со приказ на вкупниот број на пораки во "
+"папките."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9316,7 +9154,6 @@ msgstr "Следна &непрочитана порака"
 msgid "Go to the next unread message"
 msgstr "Оди на следната непрочитана порака"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Прет&ходна порака"
@@ -9457,25 +9294,25 @@ msgstr " Иницијализирам..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9483,8 +9320,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9492,8 +9329,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9524,17 +9361,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr ""
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Прилог: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Ги покажува прилозите како што е предложено од испраќачот."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9584,46 +9421,39 @@ msgstr "Својства на делот од пораката"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME-типот</em> на датотеката:</p>"
-"<p>Обично нема потреба да менувате нешто тука бидејќи типот на датотеката е "
-"автоматски проверен. Сепак понекогаш %1 не може правилно да го детектира типот "
-"-- тука е местото каде што може да го поправите тоа.</p></qt>"
+"<qt><p><em>MIME-типот</em> на датотеката:</p><p>Обично нема потреба да "
+"менувате нешто тука бидејќи типот на датотеката е автоматски проверен. Сепак "
+"понекогаш %1 не може правилно да го детектира типот -- тука е местото каде "
+"што може да го поправите тоа.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Големината на делот:</p>"
-"<p>Понекогаш %1 тука ќе даде само приближна проценка на големината бидејќи "
-"пресметувањето на точната големина би одзело многу време. Во тој случај на "
-"прикажаната големината ќе биде додадено “(прибл.)“.</p></qt>"
+"<qt><p>Големината на делот:</p><p>Понекогаш %1 тука ќе даде само приближна "
+"проценка на големината бидејќи пресметувањето на точната големина би одзело "
+"многу време. Во тој случај на прикажаната големината ќе биде додадено "
+"“(прибл.)“.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Името на датотека на делот:</p>"
-"<p>Иако ова се поклопува со името на приложената датотека, не ја наведува "
-"датотеката за приложување. Наместо тоа го предлага името на датотека што ќе се "
-"користи од поштенскиот клиент на примачот при зачувување на делот на диск.</p>"
-"</qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
+msgstr ""
+"<qt><p>Името на датотека на делот:</p><p>Иако ова се поклопува со името на "
+"приложената датотека, не ја наведува датотеката за приложување. Наместо тоа "
+"го предлага името на датотека што ќе се користи од поштенскиот клиент на "
+"примачот при зачувување на делот на диск.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9631,17 +9461,15 @@ msgstr "&Опис:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Опис на делот:</p>"
-"<p>Ова е само информативен опис на делот, слично како што темата е за целата "
-"порака. Повеќето поштенски клиенти ќе ја прикажат оваа информација во нивните "
-"прегледи на пораките заедно со иконата на прилогот.</p></qt>"
+"<qt><p>Опис на делот:</p><p>Ова е само информативен опис на делот, слично "
+"како што темата е за целата порака. Повеќето поштенски клиенти ќе ја "
+"прикажат оваа информација во нивните прегледи на пораките заедно со иконата "
+"на прилогот.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9649,14 +9477,13 @@ msgstr "Кодирањ&е:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9665,21 +9492,17 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Изберете ја оваа опција ако сакате да му предложите на примачот автоматски "
-"(inline) приказ на овој дел во прегледот на пораката, наместо стандардниот "
-"приказ со икона.</p>"
-"<p>Ова се изведува така што заглавието <em>Content-Disposition</em> "
-"за овој дел ќе се постави на „inline“ наместо на стандардното „attachment“.</p>"
-"</qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Изберете ја оваа опција ако сакате да му предложите на примачот "
+"автоматски (inline) приказ на овој дел во прегледот на пораката, наместо "
+"стандардниот приказ со икона.</p><p>Ова се изведува така што заглавието "
+"<em>Content-Disposition</em> за овој дел ќе се постави на „inline“ наместо "
+"на стандардното „attachment“.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9687,9 +9510,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -9699,9 +9521,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -9716,11 +9537,9 @@ msgstr "ПОП-филтер"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9973,40 +9792,39 @@ msgstr "Клиентот за електронска пошта на работ�
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Ја преземам содржината на папката</h2>"
-"<p>Почекајте . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Ја преземам содржината на папката</"
+"h2><p>Почекајте . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Без мрежа</h2>"
-"<p>КПошта е моментално во режим без мрежа. Кликнете <a href=\"kmail:goOnline\">"
-"тука</a> за да се поврзете на мрежа . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Без мрежа</h2><p>КПошта е моментално во режим "
+"без мрежа. Кликнете <a href=\"kmail:goOnline\">тука</a> за да се поврзете на "
+"мрежа . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10014,18 +9832,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Добредојдовте во КПошта %1</h2>"
-"<p>КПошта е клиентот за електронска пошта за работната околина TDE. Дизајниран "
-"е да биде целосно компатибилен со е-поштенските стандарди на Интернет "
-"вклучувајќи ги MIME, SMTP, POP3 и IMAP.</p>\n"
-"<ul>"
-"<li>КПошта има многу моќни можности што се опишани во <a href=\"%2\">"
-"документацијата</a></li>\n"
-"<li><a href=\"%3\">Домашната страница на КПошта </A> "
-"нуди информации за новите верзии на КПошта</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Добредојдовте во КПошта %1</h2><p>КПошта е "
+"клиентот за електронска пошта за работната околина TDE. Дизајниран е да биде "
+"целосно компатибилен со е-поштенските стандарди на Интернет вклучувајќи ги "
+"MIME, SMTP, POP3 и IMAP.</p>\n"
+"<ul><li>КПошта има многу моќни можности што се опишани во <a href="
+"\"%2\">документацијата</a></li>\n"
+"<li><a href=\"%3\">Домашната страница на КПошта </A> нуди информации за "
+"новите верзии на КПошта</li></ul>\n"
 "%8\n"
-"<p>Некои од новите можности во ова издание на КПошта вклучуваат (споредено со "
-"КПошта %4, што е дел од %5):</p>\n"
+"<p>Некои од новите можности во ова издание на КПошта вклучуваат (споредено "
+"со КПошта %4, што е дел од %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10034,15 +9851,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; тимот на КПошта</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10084,15 +9899,16 @@ msgstr "Преглед на прилогот %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[КПошта: Прилогот содржи бинарни податоци. Се обидувам да го покажам првиот "
 "%nзнак.]\n"
-"[КПошта: Прилогот содржи бинарни податоци. Се обидувам да ги покажам првите %n "
-"знаци.]\n"
-"[КПошта: Прилогот содржи бинарни податоци. Се обидувам да ги покажам првите %n "
-"знаци.]"
+"[КПошта: Прилогот содржи бинарни податоци. Се обидувам да ги покажам првите "
+"%n знаци.]\n"
+"[КПошта: Прилогот содржи бинарни податоци. Се обидувам да ги покажам првите "
+"%n знаци.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10117,12 +9933,14 @@ msgstr "Отворате прилог?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10144,6 +9962,58 @@ msgstr "(се совпаѓа со боли кое од следниве)"
 msgid "(match all of the following)"
 msgstr "(се совпаѓа со сите следни)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Прочитана"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Стара"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Избришана"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Одговорена"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Препратена"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Во редица"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Испратена"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Следена"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Игнорирана"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr ""
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Има прилог"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10226,25 +10096,26 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Пренесувањето на испратената порака „%1“ од излезното сандаче во папката со "
 "испратени пораки не успеа.\n"
-"Можни причини се недостаток на простор на дискот или дозвола за запишување. Ве "
-"молиме обидете се да го поправите проблемот и да ја преместите пораката рачно."
+"Можни причини се недостаток на простор на дискот или дозвола за запишување. "
+"Ве молиме обидете се да го поправите проблемот и да ја преместите пораката "
+"рачно."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Не е возможно да се испраќаат пораки без наведување на адреса на испраќач.\n"
-"Поставете ја е-поштенската адреса на идентитетот „%1“ во одделот Идентитети на "
-"дијалогот за конфигирација и обидете се повторно."
+"Поставете ја е-поштенската адреса на идентитетот „%1“ во одделот Идентитети "
+"на дијалогот за конфигирација и обидете се повторно."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10267,8 +10138,8 @@ msgstr "Го подготвувам процесот за испраќање..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10294,8 +10165,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10312,20 +10184,17 @@ msgstr "Испраќањето е прекинато."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Испраќањето не успеа:</p>"
-"<p>%1</p>"
-"<p>Пораката ќе остане во излезното сандаче сѐ додека не го поправите проблемот "
-"(пр. неправилна адреса) или ја отстраните пораката од излезното сандаче.</p>"
-"<p>Беше користен следниот протокол за транспорт:  %2</p>"
-"<p>Дали сакате да продолжам со испраќање на преостанатите пораки?</p>"
+"<p>Испраќањето не успеа:</p><p>%1</p><p>Пораката ќе остане во излезното "
+"сандаче сѐ додека не го поправите проблемот (пр. неправилна адреса) или ја "
+"отстраните пораката од излезното сандаче.</p><p>Беше користен следниот "
+"протокол за транспорт:  %2</p><p>Дали сакате да продолжам со испраќање на "
+"преостанатите пораки?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10343,8 +10212,9 @@ msgstr "Прекини со испр&аќање"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10387,47 +10257,48 @@ msgstr "Sendmail излезе абнормално."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Треба да наведете корисничко име и лозинка за да го користите овој SMTP-сервер."
+"Треба да наведете корисничко име и лозинка за да го користите овој SMTP-"
+"сервер."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"Изгледа дека %1 веќе работи на друг приказ на оваа машина. Извршувањето на %2 "
-"повеќе од еднаш може да предизвика губење на поштата. Не би требало да го "
+"Изгледа дека %1 веќе работи на друг приказ на оваа машина. Извршувањето на "
+"%2 повеќе од еднаш може да предизвика губење на поштата. Не би требало да го "
 "стартувате %1 освен ако сте сигурни дека не работи."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"Изгледа дека %1 работи на друг приказ на оваа машина. Извршувањето на %1 и %2 "
-"во исто време може да предизвика губење на поштата. Не би требало да го "
+"Изгледа дека %1 работи на друг приказ на оваа машина. Извршувањето на %1 и "
+"%2 во исто време може да предизвика губење на поштата. Не би требало да го "
 "стартувате %2 освен ако сте сигурни дека %1 не работи."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"Изгледа дека %1 веќе работи на %2. Извршувањето на %1 повеќе од еднаш може да "
-"предизвика губење на поштата. Не би требало да го стартувате %1 на оваа машина "
-"освен ако сте сигурни дека не работи на %2."
+"Изгледа дека %1 веќе работи на %2. Извршувањето на %1 повеќе од еднаш може "
+"да предизвика губење на поштата. Не би требало да го стартувате %1 на оваа "
+"машина освен ако сте сигурни дека не работи на %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "Изгледа дека %1 работи на %3. Извршувањето на %1 и %2 во исто време може да "
-"предизвика губење на поштата. Не би требало да го стартувате %2 на оваа машина "
-"освен ако сте сигурни дека %1 не работи на %3."
+"предизвика губење на поштата. Не би требало да го стартувате %2 на оваа "
+"машина освен ако сте сигурни дека %1 не работи на %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10438,6 +10309,10 @@ msgstr "Стартувај %1"
 msgid "Exit"
 msgstr "Излези"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Нови пораки во"
@@ -10465,15 +10340,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Паричникот TDEWallet не е достапен. Многу е препорачливо да го користите "
 "TDEWallet за менаџирање на вашите лозинки.\n"
 "И покрај тоа, КПошта може да ја зачува лозинката во неговата конфигурациска "
-"датотека. Лозинката е зачувана во нечитлив формат,  но не треба да се смета за "
-"безбедна од декриптирање ако постои достап до конфигурациската датотека.\n"
+"датотека. Лозинката е зачувана во нечитлив формат,  но не треба да се смета "
+"за безбедна од декриптирање ако постои достап до конфигурациската датотека.\n"
 "Дали сакате да ја зачувате лозинката за сметката „%1“ во конфигурациската "
 "датотека?"
 
@@ -10545,9 +10421,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Команда што ќе се извршува локално, пред испраќањето на поштата. Ова може да се "
-"користи на пример за поставување на тунели. Оставете го празно ако не треба да "
-"се извршува ниедна команда."
+"Команда што ќе се извршува локално, пред испраќањето на поштата. Ова може да "
+"се користи на пример за поставување на тунели. Оставете го празно ако не "
+"треба да се извршува ниедна команда."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10555,8 +10431,8 @@ msgstr "Серверот поба&рува пров. на автентичнос
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Изберете ја оваа опција ако вашиот SMTP-сервер побарува проверување на "
 "автентичноста пред да прифати пошта. Ова е познато како „Authenticated SMTP“ "
@@ -10580,15 +10456,14 @@ msgstr "&Испрати сопствено име на серверот"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Обележете ја оваа опција за КПошта да користи сопствено име на сервер кога се "
-"идентификува на поштенскиот сервер."
-"<p>Ова е корисно ако вашето име на системот не може да биде поставено коректно "
-"или за да го маскирате вистинското име на вашиот систем."
+"Обележете ја оваа опција за КПошта да користи сопствено име на сервер кога "
+"се идентификува на поштенскиот сервер.<p>Ова е корисно ако вашето име на "
+"системот не може да биде поставено коректно или за да го маскирате "
+"вистинското име на вашиот систем."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10619,8 +10494,8 @@ msgstr "Дозволени се само локални датотеки"
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Полето за сервер не може да биде празно. Внесете го името или IP-адресата на "
 "SMTP-серверот."
@@ -10635,10 +10510,10 @@ msgstr "Грешка при листањето на папката %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10710,8 +10585,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"КПошта не можеше да детектира пошт. листа во оваа папка. Пополнете ги адресите "
-"рачно."
+"КПошта не можеше да детектира пошт. листа во оваа папка. Пополнете ги "
+"адресите рачно."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10859,22 +10734,18 @@ msgstr "Ур&еди ја пораката"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10887,8 +10758,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10903,14 +10774,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -11005,8 +10876,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -11038,8 +10909,9 @@ msgstr ""
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -11049,8 +10921,8 @@ msgstr ""
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -11070,73 +10942,70 @@ msgstr ""
 msgid "Unencrypted Message Warning"
 msgstr ""
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>во избраното кодирање недостасуваат некои од знаците."
-"<br>"
-"<br>Дали сепак ја испраќате пораката?</qt>"
+"<qt>во избраното кодирање недостасуваат некои од знаците.<br><br>Дали сепак "
+"ја испраќате пораката?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Некои знаци ќе бидат изгубени"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Избриши ги знаците"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Смени кодирање"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -11158,15 +11027,15 @@ msgstr "&Формат на пошт. сандаче:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Изберете дали сакате да ги чувате пораките како една датотека по порака "
 "(maildir) или како една голема датотека со сите пораки (mbox). КПошта "
-"стандардно користи maildir и ова треба да се смени само во ретки случаеви. Ако "
-"не сте сигурни оставете ја оваа опција како што е."
+"стандардно користи maildir и ова треба да се смени само во ретки случаеви. "
+"Ако не сте сигурни оставете ја оваа опција како што е."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11175,8 +11044,8 @@ msgstr "Папката &содржи:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11216,8 +11085,7 @@ msgstr "Различни резултати за потписите"
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Статус: "
 
@@ -11246,11 +11114,11 @@ msgstr "Не беше пронајден приклучок за %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Пораката е потпишана, но валидноста на потписот не може да се верификува.<br />"
-"Причина: %1"
+"Пораката е потпишана, но валидноста на потписот не може да се верификува."
+"<br />Причина: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11286,28 +11154,28 @@ msgstr "Крипто-приклучокот „%1“ не може да декр
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Забелешка:</b> Оваа HTML-порака може да содржи надворешни референции кон "
 "слики итн. Поради безбедносни причини или причини на приватност надворешните "
-"референции не се вчитани. Ако му верувате на испраќачот на оваа порака, можете "
-"да ги вчитате надворешните референции на оваа порака со тоа што <a "
+"референции не се вчитани. Ако му верувате на испраќачот на оваа порака, "
+"можете да ги вчитате надворешните референции на оваа порака со тоа што <a "
 "href=\"kmail:loadExternal\">ќе кликнете тука</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Забелешка:</b> Ова е HTML-порака. Поради безбедносни причини е покажан само "
-"HTML-кодот. Ако му верувате на испраќачот на оваа порака, можете да го "
-"активирате приказот на оваа порака со форматиран HTML така што <a "
-"href=\"kmail:showHTML\">ќе кликнете тука</a>."
+"<b>Забелешка:</b> Ова е HTML-порака. Поради безбедносни причини е покажан "
+"само HTML-кодот. Ако му верувате на испраќачот на оваа порака, можете да го "
+"активирате приказот на оваа порака со форматиран HTML така што <a href="
+"\"kmail:showHTML\">ќе кликнете тука</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11567,8 +11435,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -11684,10 +11552,11 @@ msgstr "Порака со грешка на Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11710,7 +11579,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Ја земам пораката %1 од %2 (%3 од %4 KB) за %5@%6 (%7 KB преостануваат на "
 "серверот)."
@@ -11729,1655 +11599,14 @@ msgstr "Невалиден одговор од серверот"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Вашиот сервер не ја поддржува командата „TOP“. Поради тоа не е возможно да се "
-"земат прво заглавијата на големите пораки, пре да се симнат пораките."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Оди"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Пап&ка"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Порака"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Одговори специјално"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Препрати"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Алатник за HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"Вашиот сервер не ја поддржува командата „TOP“. Поради тоа не е возможно да "
+"се земат прво заглавијата на големите пораки, пре да се симнат пораките."
 
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "До:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Општо"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "Одгово&ри на"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Одговори на &сите..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Препрати"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Кр&атенка:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Тип образец:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Својства на папка"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Папката содржи &пошт. листа"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Адреса на листата:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Н&ормално:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Н&епрочитани:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "денови"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "недели"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "месеци"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Напредно"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Идентитет на испраќач:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Формат на &чување:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Листата прикажува:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "Дод&ај..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Врати ги поставувањата за фонт"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "неограничено"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Конфигурација на обрасци"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Одговори на испраќачот:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Одговори на &сите..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Препратена порака"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " денови"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Изберете го тука бројот на денови"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Содржина на &папка:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "За&мени"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "За&мени"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Користи надворешен &уредувач наместо составувачот"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Автоматски внеси ги клучевите и сертификатите"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Авто&матски барај известувања за статусот на пораките"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Изберете ја оваа опција ако сакате КПошта да бара известувања за статусот на "
-"пораките за секоја Ваша испратена порака.</p>"
-"<p>Оваа опција се однесува само на стандардната конфигурација. Сѐ уште може да "
-"го овозможите или оневозможите барањето за известување во составувачот за "
-"секоја порака посебно, преку менито <em>Опции</em>-><em>"
-"Барај известување за статусот на пораката</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Потписот е истечен."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Ги покажува сите заглавија на пораките"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Покажува стандардна листа на заглавија на пораките"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Испрати известување за статусот на пораката со празен испраќач."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Испрати известување за статусот на пораката со празно поле за испраќач. - Некои "
-"сервери може да бидат конфигурирани да ги одбиваат ваквите пораки, па ако имате "
-"проблеми со испраќањето на известувањата исклучете ја оваа опција."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Листа со пораки - нови пораки"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Додај знаци за &цитат"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13490,6 +11719,11 @@ msgstr ""
 msgid "Add as BCC"
 msgstr ""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Отк&ажи"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13505,10 +11739,10 @@ msgstr ""
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13525,8 +11759,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13629,10 +11863,19 @@ msgstr "е поголемо или еднакво на"
 msgid " bytes"
 msgstr " бајти"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " денови"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13787,13 +12030,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13809,8 +12050,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13828,8 +12068,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13837,8 +12076,7 @@ msgid "(No special capabilities available)"
 msgstr ""
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:358
@@ -13874,8 +12112,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Обележете го ова ако сакате КПошта да додаве потпис на пораките што се напишани "
-"со овој идентитет."
+"Обележете го ова ако сакате КПошта да додаве потпис на пораките што се "
+"напишани со овој идентитет."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -13909,8 +12147,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13927,17 +12165,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Наведете &команда:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr ""
@@ -13974,6 +12217,11 @@ msgstr "Додајте сметка"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Дали навистина сакате да го отстраните идентитетот <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Примени &на:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13987,6 +12235,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr ""
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14026,9 +12278,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14065,6 +12317,16 @@ msgstr ""
 "Не можам да ја отворам датотеката „%1“:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "До:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14100,36 +12362,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14364,6 +12622,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14400,112 +12662,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...дека можете да отидете на следната и на претходната порака со\n"
-"користење на тастерите со лева и десна стрелка соодветно?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...дека можете брзо да создадете филтри според испраќачот, примачот,\n"
-"темата и поштенските листи со<em>Алатки-&gt;Креирај&nbsp;филтер</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...дека можете да се ослободите од додаденото „[име на пошт. листа]“\n"
-"на темата на некои поштенски листи со користењето на дејството за филтрирање\n"
-"<em>презапиши го заглавието</em>? Само направете\n"
-"<pre>презапиши го заглавието „Тема“\n"
-"   замени „\\s*\\[име на пошт. листа\\]\\s*“\n"
-"   со „“</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...дека можете да ги поврзете поштенските листи со папките во дијалогот\n"
-"<em>Папка-&gt;Менаџмент на поштенските листи</em>? Потоа може да користите\n"
-"<em>Порака-&gt;Нова&nbsp;порака&nbsp;до&nbsp;поштенска&nbsp;листа...</em>\n"
-"за да го отворите составувачот со веќе внесена адреса на поштенската листа.\n"
-"Или може да кликнете со средното копче од глушецот на папката.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...можете на секоја папка да ѝ доделите сопствени икони?\n"
-"Видете <em>Папка-&gt;Својства</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...дека КПошта може да прикаже обоена лента укажувајќи на типот на пораката\n"
-"(обичен текст/HTML/OpenPGP) што е тековно прикажана?</p>\n"
-"<p>Ова ги попречува обидите да се симулира успешна верификација на потпис со "
-"испраќање на HTML-пораки кои ги имитираат рамките со статус на потпис на "
-"КПошта.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...дека можете да филтрирате според кое било заглавие така што\n"
-"едноставно ќе го внесете неговото име во првото поле за уредување\n"
-"или правило за пребарување?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...дека можете да ги филтрирате пораките што имаат само HTML со правилото\n"
-"<pre>„Content-type“ содржи „text/html“?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...дека кога одговарате се цитира само избраниот дел од пораката?</p>\n"
-"<p>Ако ништо не е избрано се цитира целата порака.</p>\n"
-"<p>Ова функционира дури и со текст од прилозите ако е избрано\n"
-"<em>Приказ-&gt;Прилози-&gt;Внатрешно</em>.</p>\n"
-"<p>Оваа можност е достапна со соте команди за одговор освен\n"
-"<em>Порака-&gt;Одговори без цитат</em>.</p>\n"
-"<p align=\"right\"><em>Придонес на David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -14575,6 +12731,17 @@ msgstr "Прилог бр. %1 (неименувано)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Датотеката со име „%1“ веќе постои. Дали сте сигурен дека сакате да запишете "
+"врз неа?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Запишувате врз датотека?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14674,9 +12841,9 @@ msgstr "И&спрати слика со секоја порака"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14705,13 +12872,13 @@ msgstr "Избери датотека..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Користете го ова за да изберете датотека во која што се наоѓа сликата. Сликата "
-"треба да биде со висок контраст и скоро квадратна. Посветла подлога ќе го "
-"подобри резултатот."
+"Користете го ова за да изберете датотека во која што се наоѓа сликата. "
+"Сликата треба да биде со висок контраст и скоро квадратна. Посветла подлога "
+"ќе го подобри резултатот."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14719,16 +12886,17 @@ msgstr "Постави од адресарот"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Може да искористите намалена верзија од сликата што ја имате во вашиот адресар."
+"Може да искористите намалена верзија од сликата што ја имате во вашиот "
+"адресар."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14737,11 +12905,11 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Примерите се достапни на <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Примерите се достапни на <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14756,132 +12924,1557 @@ msgstr "Нема слика"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Ја поставува темата на пораката"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Испраќа копија (CC:) на „address“"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Испраќа слепа копија (BCC:) на „address“"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Го додава „header“ на пораката"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Го вчитува телото на пораката од „file“"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Го поставува телото на пораката"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Додава прилог на пораката. Ова може да се повторува"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Само проверува за нова пошта"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Само го отвора составувачот"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Ја прегледува дадената датотека со порака"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Ја испраќа пораката на „address“ односно ја приложува датотеката на која што "
-"покажува „URL“"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Прочитана"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Стара"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Избришана"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Одговорена"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Препратена"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Општо"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Во редица"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "Одгово&ри на"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Испратена"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Одговори на &сите..."
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Следена"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Препрати"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Игнорирана"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Кр&атенка:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Тип образец:"
+
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Содржина на &папка:"
+
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "За&мени"
+
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "За&мени"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Својства на папка"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Папката содржи &пошт. листа"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Адреса на листата:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Н&ормално:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Н&епрочитани:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
 msgstr ""
 
-#: kmsearchpattern.h:232
-msgid "To Do"
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
 msgstr ""
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Има прилог"
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "денови"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "недели"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "месеци"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Напредно"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Идентитет на испраќач:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Формат на &чување:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Листата прикажува:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Датотеката со име „%1“ веќе постои. Дали сте сигурен дека сакате да запишете "
-"врз неа?"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Запишувате врз датотека?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr ""
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Користи надворешен &уредувач наместо составувачот"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Автоматски внеси ги клучевите и сертификатите"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Авто&матски барај известувања за статусот на пораките"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Изберете ја оваа опција ако сакате КПошта да бара известувања за "
+"статусот на пораките за секоја Ваша испратена порака.</p><p>Оваа опција се "
+"однесува само на стандардната конфигурација. Сѐ уште може да го овозможите "
+"или оневозможите барањето за известување во составувачот за секоја порака "
+"посебно, преку менито <em>Опции</em>-><em>Барај известување за статусот на "
+"пораката</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr ""
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Потписот е истечен."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Ги покажува сите заглавија на пораките"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Покажува стандардна листа на заглавија на пораките"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Испрати известување за статусот на пораката со празен испраќач."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Испрати известување за статусот на пораката со празно поле за испраќач. - "
+"Некои сервери може да бидат конфигурирани да ги одбиваат ваквите пораки, па "
+"ако имате проблеми со испраќањето на известувањата исклучете ја оваа опција."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Листа со пораки - нови пораки"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Додај знаци за &цитат"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Филтрирање"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Додај..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Оди"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Пап&ка"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Порака"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Одговори специјално"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Препрати"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Врати ги поставувањата за фонт"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Алатник за HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Општи опции"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Алатник за HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr ""
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "Дод&ај..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr ""
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Врати ги поставувањата за фонт"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "неограничено"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Конфигурација на обрасци"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Одговори на испраќачот:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Одговори на &сите..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Препратена порака"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr ""
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Изберете го тука бројот на денови"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...дека можете да отидете на следната и на претходната порака со\n"
+"користење на тастерите со лева и десна стрелка соодветно?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...дека можете брзо да создадете филтри според испраќачот, примачот,\n"
+"темата и поштенските листи со<em>Алатки-&gt;Креирај&nbsp;филтер</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...дека можете да се ослободите од додаденото „[име на пошт. листа]“\n"
+"на темата на некои поштенски листи со користењето на дејството за "
+"филтрирање\n"
+"<em>презапиши го заглавието</em>? Само направете\n"
+"<pre>презапиши го заглавието „Тема“\n"
+"   замени „\\s*\\[име на пошт. листа\\]\\s*“\n"
+"   со „“</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...дека можете да ги поврзете поштенските листи со папките во дијалогот\n"
+"<em>Папка-&gt;Менаџмент на поштенските листи</em>? Потоа може да користите\n"
+"<em>Порака-&gt;Нова&nbsp;порака&nbsp;до&nbsp;поштенска&nbsp;листа...</em>\n"
+"за да го отворите составувачот со веќе внесена адреса на поштенската листа.\n"
+"Или може да кликнете со средното копче од глушецот на папката.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...можете на секоја папка да ѝ доделите сопствени икони?\n"
+"Видете <em>Папка-&gt;Својства</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...дека КПошта може да прикаже обоена лента укажувајќи на типот на "
+"пораката\n"
+"(обичен текст/HTML/OpenPGP) што е тековно прикажана?</p>\n"
+"<p>Ова ги попречува обидите да се симулира успешна верификација на потпис со "
+"испраќање на HTML-пораки кои ги имитираат рамките со статус на потпис на "
+"КПошта.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...дека можете да филтрирате според кое било заглавие така што\n"
+"едноставно ќе го внесете неговото име во првото поле за уредување\n"
+"или правило за пребарување?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...дека можете да ги филтрирате пораките што имаат само HTML со "
+"правилото\n"
+"<pre>„Content-type“ содржи „text/html“?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...дека кога одговарате се цитира само избраниот дел од пораката?</p>\n"
+"<p>Ако ништо не е избрано се цитира целата порака.</p>\n"
+"<p>Ова функционира дури и со текст од прилозите ако е избрано\n"
+"<em>Приказ-&gt;Прилози-&gt;Внатрешно</em>.</p>\n"
+"<p>Оваа можност е достапна со соте команди за одговор освен\n"
+"<em>Порака-&gt;Одговори без цитат</em>.</p>\n"
+"<p align=\"right\"><em>Придонес на David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
diff --git a/tde-i18n-ms/messages/tdepim/kmail.po b/tde-i18n-ms/messages/tdepim/kmail.po
index 86eda2db80a..9691984e190 100644
--- a/tde-i18n-ms/messages/tdepim/kmail.po
+++ b/tde-i18n-ms/messages/tdepim/kmail.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mimos\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2005-11-23 18:09+0800\n"
 "Last-Translator: MIMOS <opensource@mimos.my>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "MIMOS"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -166,6 +166,12 @@ msgstr "&Tiada (gunakan berhati-hati)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Akaun untuk pengendalian sumber separa automatik"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Kosongkan yang Terdahulu"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -242,13 +248,13 @@ msgstr "&Log masuk:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Pembekal layanan Internet memberikan anda satu <em>nama pengguna</em> "
-"untuk mengesahkan anda dengan pelayan mereka . Biasanya ia adalah bahagian "
-"pertama alamat email anda (bahagian sebelum <em>@</em>)."
+"Pembekal layanan Internet memberikan anda satu <em>nama pengguna</em> untuk "
+"mengesahkan anda dengan pelayan mereka . Biasanya ia adalah bahagian pertama "
+"alamat email anda (bahagian sebelum <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -269,19 +275,19 @@ msgstr "Sto&rkan kata laluan POP "
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Semak opsyen ini supaya  KMail dapat menyimpan kata laluan.\n"
 "Jika TDEWallet wujud, kata laluan akan disimpan di sini kerana ia dianggap "
 "selamat.\n"
-"Bagaimanapun, jika  TDEWallet tidak ada, kata laluan akan disimpan dalam fail "
-"konfigurasi KMail. Kata laluan disimpan dalam format keliru, tapi tidak boleh "
-"dianggap selamat daripada penyahsulitan jika akses ke fail konfigurasi "
+"Bagaimanapun, jika  TDEWallet tidak ada, kata laluan akan disimpan dalam "
+"fail konfigurasi KMail. Kata laluan disimpan dalam format keliru, tapi tidak "
+"boleh dianggap selamat daripada penyahsulitan jika akses ke fail konfigurasi "
 "diperoleh."
 
 #: accountdialog.cpp:640
@@ -311,11 +317,12 @@ msgstr "&Tapis mesej jika lebih besar daripada"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Jika anda memilih opsyen ini, penapis POP akan digunakan untuk memutuskan apa "
-"yang akan dilakukan terhadap mesej. Anda boleh pilih untuk memuat turun, "
+"Jika anda memilih opsyen ini, penapis POP akan digunakan untuk memutuskan "
+"apa yang akan dilakukan terhadap mesej. Anda boleh pilih untuk memuat turun, "
 "menghapus atau membiarkan ia berada pada pelayan"
 
 #: accountdialog.cpp:737
@@ -365,13 +372,15 @@ msgstr "Kosongkan te&ks"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOG MASUK"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -414,9 +423,9 @@ msgstr "Ruang nama:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -477,13 +486,13 @@ msgstr "Muatkan la&mpiran yang ada permintaan"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Aktifkan ini untuk memuatkan lampiran  bukan secara automatik semasa memilih "
-"e-mel tetapi hanya apabila anda mengklik lampiran. Dengan cara ini juga, e-mel "
-"besar akan dipaparkan dengan segera."
+"e-mel tetapi hanya apabila anda mengklik lampiran. Dengan cara ini juga, e-"
+"mel besar akan dipaparkan dengan segera."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -494,8 +503,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Folder terbuka (berkembang) dalam folder pepohon sahaja yang akan disemak untuk "
-"mencari subfolder. Gunakan ini jika ada banyak folder dalam pelayan. "
+"Folder terbuka (berkembang) dalam folder pepohon sahaja yang akan disemak "
+"untuk mencari subfolder. Gunakan ini jika ada banyak folder dalam pelayan. "
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -523,7 +532,7 @@ msgstr "<none>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "peti masuk"
 
@@ -531,20 +540,21 @@ msgstr "peti masuk"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Pelayan tidak menyokong bilangan mesej yang unik, tetapi inilah syarat untuk "
 "meninggalkan mesej dalam pelayan.\n"
-"Oleh sebab sesetengah pelayan tidak mengisytiharkan kemampuannya yang sebenar, "
-"anda masih ada peluang  meninggalkan mesej yang telah diperoleh dalam pelayan."
+"Oleh sebab sesetengah pelayan tidak mengisytiharkan kemampuannya yang "
+"sebenar, anda masih ada peluang  meninggalkan mesej yang telah diperoleh "
+"dalam pelayan."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Pelayan tidak menyokong memungut pengepala mesej, tetapi inilah syarat untuk "
 "menapis mesej dalam pelayan.\n"
@@ -553,24 +563,26 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Ambil perhatian bahawa ciri ini boleh menyebabkan sesetengah pelayan POP3 yang "
-"tidak menyokong saluran maklumat menghantar mel rosak;\n"
-"Bagaimanapun, ini boleh dikonfigurasi kerana ada pelayan yang menyokong saluran "
-"maklumat tetapi tidak mengisytiharkan kemampuannya. Untuk menyemak sama ada "
-"pelayan POP3 anda mengisytiharkan sokongan saluran maklumat, gunakan butang "
-"yang di bawahnya ada dialog \"Semak apa yang disokong oleh pelayan\";\n"
-"Jika pelayan tidak mengisytiharkannya, tapi anda masih mahukan kelajuan lebih "
-"tinggi, anda patut membuat beberapa ujian bermula dengan menghantar mel kepada "
-"diri sendiri dan cuba muat turun mesej tersebut."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Ambil perhatian bahawa ciri ini boleh menyebabkan sesetengah pelayan POP3 "
+"yang tidak menyokong saluran maklumat menghantar mel rosak;\n"
+"Bagaimanapun, ini boleh dikonfigurasi kerana ada pelayan yang menyokong "
+"saluran maklumat tetapi tidak mengisytiharkan kemampuannya. Untuk menyemak "
+"sama ada pelayan POP3 anda mengisytiharkan sokongan saluran maklumat, "
+"gunakan butang yang di bawahnya ada dialog \"Semak apa yang disokong oleh "
+"pelayan\";\n"
+"Jika pelayan tidak mengisytiharkannya, tapi anda masih mahukan kelajuan "
+"lebih tinggi, anda patut membuat beberapa ujian bermula dengan menghantar "
+"mel kepada diri sendiri dan cuba muat turun mesej tersebut."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -578,50 +590,51 @@ msgstr "Nyatakan pelayan dan port pada tab Umum terlebih dahulu."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Nampaknya pelayan tidak menyokong saluran maklumat; jadi, opsyen ini telah "
 "dinyahaktifkan.\n"
-"Oleh sebab ada pelayan yang tidak mengisytiharkan kemampuan sebenar, anda masih "
-"ada peluang membuka saluran maklumat. Tetapi ambil perhatian bahawa ciri ini "
-"boleh menyebabkan pelayan POP yang tidak menyokong saluran maklumat menghantar "
-"mel rosak.Jadi, sebelum menggunakan ciri ini untuk mel penting, anda patut "
-"mengujinya dengan menghantar sebilangan besar mesej teks yang dimuat turun "
-"secara serentak  dari pelayan POP kepada diri sendiri."
+"Oleh sebab ada pelayan yang tidak mengisytiharkan kemampuan sebenar, anda "
+"masih ada peluang membuka saluran maklumat. Tetapi ambil perhatian bahawa "
+"ciri ini boleh menyebabkan pelayan POP yang tidak menyokong saluran maklumat "
+"menghantar mel rosak.Jadi, sebelum menggunakan ciri ini untuk mel penting, "
+"anda patut mengujinya dengan menghantar sebilangan besar mesej teks yang "
+"dimuat turun secara serentak  dari pelayan POP kepada diri sendiri."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Nampaknya pelayan tidak menyokong bilangan mesej yang unik, tetapi inilah "
 "syarat untuk meninggalkan mesej pada pelayan; oleh itu, opsyen ini telah "
 "dinyahaktifkan.\n"
-"Oleh sebab ada pelayan yang tidak mengisytiharkan kemampuan sebenar, anda masih "
-"ada peluang meninggalkan mesej yang telah dikutip pada pelayan."
+"Oleh sebab ada pelayan yang tidak mengisytiharkan kemampuan sebenar, anda "
+"masih ada peluang meninggalkan mesej yang telah dikutip pada pelayan."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Nampaknya pelayan tidak menyokong pengepala kutipan mesej, tetapi inilah syarat "
-"untuk menapis mesej pada pelayan; oleh itu, opsyen ini telah dinyahaktifkan.\n"
-"Oleh sebab ada pelayan yang tidak mengisytiharkan kemampuan sebenar, anda masih "
-"ada peluang membuka mesej penapis dalam pelayan."
+"Nampaknya pelayan tidak menyokong pengepala kutipan mesej, tetapi inilah "
+"syarat untuk menapis mesej pada pelayan; oleh itu, opsyen ini telah "
+"dinyahaktifkan.\n"
+"Oleh sebab ada pelayan yang tidak mengisytiharkan kemampuan sebenar, anda "
+"masih ada peluang membuka mesej penapis dalam pelayan."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -698,8 +711,8 @@ msgstr "Akaun IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Anda perlu tambah satu akaun dalam seting bahagian  jaringan supaya boleh "
 "menerima mel."
@@ -738,13 +751,13 @@ msgstr "Selamat datang ke KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Nampaknya ini kali pertama anda memulakan KMail. Anda boleh menggunakan "
-"wizard untuk mengeset  akaun mel. Masukkan data sambungan yang anda terima dari "
-"pembekal e-mel ke dalam halaman berikut.</qt>"
+"wizard untuk mengeset  akaun mel. Masukkan data sambungan yang anda terima "
+"dari pembekal e-mel ke dalam halaman berikut.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -806,8 +819,7 @@ msgstr "Gunakan penghantaran setempat"
 msgid "Server Information"
 msgstr "Maklumat Pelayan"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Tiada"
@@ -942,29 +954,28 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Di sini anda boleh dapatkan bantuan untuk mengeset peraturan penapis KMail "
-"untuk menggunakan beberapa alat antivirus yang diketahui umum</p>"
-"<p>Wizard boleh mengesan alat ini dalam komputer, sekaligus mencipta peraturan "
-"penapis dan menggunakannya untuk mengasingkan mesej yang mengandungi virus. "
-"Wizard tidak akan mengambil kira peraturan penapis sedia ada: ia akan sentiasa "
-"menambah peraturan baru.</p>"
-"<p><b>Amaran:</b> Jika KMail kelihatan kaku semasa mengimbas mesej yang "
-"mengandungi virus, anda mungkin berhadapan dengan masalah tindak balas KMail "
-"kerana operasi alat antivirus biasanya mengambil masa yang lama; Pertimbangkan "
-"untuk menghapuskan peraturan penapis yang dicipta oleh wizard untuk kembali "
-"kepada peri laku sebelumnya."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Di sini anda boleh dapatkan bantuan untuk mengeset peraturan penapis "
+"KMail untuk menggunakan beberapa alat antivirus yang diketahui umum</"
+"p><p>Wizard boleh mengesan alat ini dalam komputer, sekaligus mencipta "
+"peraturan penapis dan menggunakannya untuk mengasingkan mesej yang "
+"mengandungi virus. Wizard tidak akan mengambil kira peraturan penapis sedia "
+"ada: ia akan sentiasa menambah peraturan baru.</p><p><b>Amaran:</b> Jika "
+"KMail kelihatan kaku semasa mengimbas mesej yang mengandungi virus, anda "
+"mungkin berhadapan dengan masalah tindak balas KMail kerana operasi alat "
+"antivirus biasanya mengambil masa yang lama; Pertimbangkan untuk "
+"menghapuskan peraturan penapis yang dicipta oleh wizard untuk kembali kepada "
+"peri laku sebelumnya."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1000,10 +1011,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1014,12 +1024,12 @@ msgstr "Semak mesej menggunakan alat antivirus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Benarkan alat antivirus menyemak mesej. Wizard akan mencipta penapis yang "
-"sesuai. Biasanya mesej ditanda oleh alat tersebut supaya penapis berikut boleh "
-"bertindak, contohnya, alihkan mesej virus ke folder khusus"
+"sesuai. Biasanya mesej ditanda oleh alat tersebut supaya penapis berikut "
+"boleh bertindak, contohnya, alihkan mesej virus ke folder khusus"
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1028,12 +1038,12 @@ msgstr "Alilhkan mesej yang dikesan bervirus ke folder khusus"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Satu penapis akan mengesan mesej yang dikelaskan dijangkiti virus dan "
-"mengalihkannya ke folder pratakrif telah dicipta. Folder piawai adalah folder "
-"sampah, tapi anda boleh mengubahnya dalam paparan folder."
+"mengalihkannya ke folder pratakrif telah dicipta. Folder piawai adalah "
+"folder sampah, tapi anda boleh mengubahnya dalam paparan folder."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1041,11 +1051,11 @@ msgstr "Sebagai tambahan, tandakan mesej bervirus sebagai sudah baca"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Tandakan mesej yang dikelaskan dijangkiti virus sebagai sudah baca, sekaligus "
-"pindahkannya ke folder yang dipilih."
+"Tandakan mesej yang dikelaskan dijangkiti virus sebagai sudah baca, "
+"sekaligus pindahkannya ke folder yang dipilih."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1226,8 +1236,8 @@ msgid ""
 "communication is here:"
 msgstr ""
 "Mungkin kerana anda tidak mempunyai keizinan untuk melakukannya, atau kerana "
-"folder ini telah wujud dalam pelayan; mesej ralat dari komunikasi pelayan ada "
-"di sini:"
+"folder ini telah wujud dalam pelayan; mesej ralat dari komunikasi pelayan "
+"ada di sini:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1240,8 +1250,8 @@ msgstr "Ralat semasa membaca folder %1 dalam pelayan:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1261,8 +1271,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1293,21 +1303,21 @@ msgstr "Dihapuskan"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Tiada satu pun identiti anda sepadan dengan penerima mesej ini,"
-"<br>Pilih mana satu antara berikut adalah alamat anda:"
+"<qt>Tiada satu pun identiti anda sepadan dengan penerima mesej ini,<br>Pilih "
+"mana satu antara berikut adalah alamat anda:"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Tiada satu pun identiti anda sepadan dengan penerima mesej ini,"
-"<br>Pilih mana satu antara berikut adalah alamat anda:"
+"<qt>Tiada satu pun identiti anda sepadan dengan penerima mesej ini,<br>Pilih "
+"mana satu antara berikut adalah alamat anda:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1337,18 +1347,21 @@ msgstr "Ralat berlaku semasa memadatkan \"%1\". Pemadatan dihenti paksa."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Seting ini telah ditetapkan oleh pentadbir anda.</p>"
-"<p>Jika anda rasa ini adalah suatu ralat, hubungi beliau..</p></qt>"
+"<qt><p>Seting ini telah ditetapkan oleh pentadbir anda.</p><p>Jika anda rasa "
+"ini adalah suatu ralat, hubungi beliau..</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Muatkan Profail..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "&Konfigur KMail..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "T&ambah..."
@@ -1378,6 +1391,11 @@ msgstr "<qt>Anda pasti ingin mengeluarkan identiti bernama <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Buang Identiti"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Buang"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Tambah..."
@@ -1386,6 +1404,11 @@ msgstr "Tambah..."
 msgid "Modify..."
 msgstr "Ubahsuai..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Buang"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Set sebagai Piawai"
@@ -1402,17 +1425,15 @@ msgstr "&Menghantar"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Akaun keluar (tambah sekurang-kurangnya satu):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nama"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Jenis"
@@ -1435,8 +1456,7 @@ msgstr "Set sebagai Piawai"
 msgid "Common Options"
 msgstr "Opsyen Biasa"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Sahkan se&belum hantar"
@@ -1487,17 +1507,16 @@ msgstr "Domain pia&wai:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Domain piawai digunakan untuk melengkapkan alamat e-mel yang mengandungi "
-"nama pengguna sahaja.</p></qt>"
+"<qt><p>Domain piawai digunakan untuk melengkapkan alamat e-mel yang "
+"mengandungi nama pengguna sahaja.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1517,9 +1536,9 @@ msgstr "Tambah Pengangkutan"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Piawai)"
 
@@ -1602,6 +1621,10 @@ msgstr "Ubah Suai Akaun"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Tidak dapat mengesan akaun <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Wa&rna"
@@ -1710,8 +1733,7 @@ msgstr "Pautan Susulan"
 msgid "Misspelled Words"
 msgstr "Perkataan Salah Eja"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Mesej Baru"
@@ -1900,8 +1922,8 @@ msgstr "Merantaikan piawai kepada tertutup"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Buka rantaian  yang mengandungi mesej bar&u, mesej belum baca atau mesej "
 "penting dan buka rantaian yang diawasi."
@@ -1912,69 +1934,54 @@ msgstr "Paparan Tarikh"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Ungkapan ini boleh digunakan untuk tarikh:</strong></p>"
-"<ul>"
-"<li>d - hari sebagai nombor tanpa didahului oleh sifar (1-31)</li>"
-"<li>dd - hari sebagai nombor didahului oleh sifar (01-31)</li>"
-"<li>hhh - nama hari dipendekkan (Isn - Ahd)</li>"
-"<li>hhhh - nama penuh hari (Isnin - Ahad)</li>"
-"<li>B - Bulan sebagai nombor tanpa didahului oleh sifar (1-12)</li>"
-"<li>BB - Bulan sebagai nombor didahului dengan sifar(01-12)</li>"
-"<li>BBB - nama bulan dipendekkan (Jan - Dis)</li>"
-"<li>BBBB - Nama penuh bulan (Januari - Disember)</li>"
-"<li>tt - tahun ditulis sebagai angka dua digit (00-99)</li>"
-"<li>tttt - tahun ditulis sebagai angka empat digit (0000-9999)</li></ul>"
-"<p><kuat>ungkapan berikut boleh digunakan untuk masa:</string></p> "
-"<ul>"
-"<li>h - jam tanpa didahului oleh sifar (0-23 or 1-12 paparkan jika AM/PM)</li>"
-"<li>hh - jam didahului dengan sifar (00-23 or 01-12 paparkan jika AM/PM)</li>"
-"<li>m - minit tanpa didahului oleh sifar(0-59)</li>"
-"<li>mm - minit didahului dengan sifar (00-59)</li>"
-"<li>s - saat tanpa didahului oleh sifar (0-59)</li>"
-"<li>ss - saat didahului dengan sifar (00-59)</li>"
-"<li>z - milisaat tanpa didahului oleh sifar(0-999)</li>"
-"<li>zzz - milisaat didahului dengan sifar (000-999)</li>"
-"<li>AP - tukarkan ke paparan AM/PM. AP akan digantikan sama ada oleh \"AM\" "
-"atau \"PM\".</li>"
-"<li>ap - tukar kepada paparan. ap akan digantikan sama ada oleh  \"am\" atau "
-"\"pm\".</li>"
-"<li>Z - zon masa dalam bentuk angka (-0500)</li></ul>"
-"<p><strong>semua input lain akan diabaikan.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Ungkapan ini boleh digunakan untuk tarikh:</strong></"
+"p><ul><li>d - hari sebagai nombor tanpa didahului oleh sifar (1-31)</"
+"li><li>dd - hari sebagai nombor didahului oleh sifar (01-31)</li><li>hhh - "
+"nama hari dipendekkan (Isn - Ahd)</li><li>hhhh - nama penuh hari (Isnin - "
+"Ahad)</li><li>B - Bulan sebagai nombor tanpa didahului oleh sifar (1-12)</"
+"li><li>BB - Bulan sebagai nombor didahului dengan sifar(01-12)</li><li>BBB - "
+"nama bulan dipendekkan (Jan - Dis)</li><li>BBBB - Nama penuh bulan (Januari "
+"- Disember)</li><li>tt - tahun ditulis sebagai angka dua digit (00-99)</"
+"li><li>tttt - tahun ditulis sebagai angka empat digit (0000-9999)</li></"
+"ul><p><kuat>ungkapan berikut boleh digunakan untuk masa:</string></p> "
+"<ul><li>h - jam tanpa didahului oleh sifar (0-23 or 1-12 paparkan jika AM/"
+"PM)</li><li>hh - jam didahului dengan sifar (00-23 or 01-12 paparkan jika AM/"
+"PM)</li><li>m - minit tanpa didahului oleh sifar(0-59)</li><li>mm - minit "
+"didahului dengan sifar (00-59)</li><li>s - saat tanpa didahului oleh sifar "
+"(0-59)</li><li>ss - saat didahului dengan sifar (00-59)</li><li>z - milisaat "
+"tanpa didahului oleh sifar(0-999)</li><li>zzz - milisaat didahului dengan "
+"sifar (000-999)</li><li>AP - tukarkan ke paparan AM/PM. AP akan digantikan "
+"sama ada oleh \"AM\" atau \"PM\".</li><li>ap - tukar kepada paparan. ap akan "
+"digantikan sama ada oleh  \"am\" atau \"pm\".</li><li>Z - zon masa dalam "
+"bentuk angka (-0500)</li></ul><p><strong>semua input lain akan diabaikan.</"
+"strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Menukar seting rantaian global akan menulis tindih semua nilai folder yang "
 "dinyatakan."
@@ -1991,8 +1998,7 @@ msgstr "Paparkan bar stat&us HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Paparkan status s&pam dalam pengepala beragam"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Gantikan smileys dengan ikon emosi"
@@ -2001,8 +2007,7 @@ msgstr "Gantikan smileys dengan ikon emosi"
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Paparkan tanda sebutan kembang/runtuh"
@@ -2028,8 +2033,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Tulis tindihkan pengekodan aksara:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Aktifkan ikon dulang sistem"
@@ -2135,21 +2139,19 @@ msgstr "<b>%f</b> akan diganti dengan nama fail untuk diedit."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Pemegang tempat berikut disokong di dalam frasa jawapan:"
-"<br><b>%D</b>: tarikh, <b>%S</b>: subjek,"
-"<br><b>%e</b>: alamat pengirim, <b>%F</b>: nama pengirim, <b>%f</b>"
-": Tandatangan pengirim,"
-"<br><b>%T</b>: nama penerima, <b>%t</b>: nama dan alamat penerima,"
-"<br><b>%C</b>: salinan nama, <b>%c</b>: salinan nama dan alamat,"
-"<br><b>%%</b>: tanda peratus, <b>%_</b>: ruang, <b>%L</b>:pemisah baris</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Pemegang tempat berikut disokong di dalam frasa jawapan:<br><b>%D</b>: "
+"tarikh, <b>%S</b>: subjek,<br><b>%e</b>: alamat pengirim, <b>%F</b>: nama "
+"pengirim, <b>%f</b>: Tandatangan pengirim,<br><b>%T</b>: nama penerima, <b>"
+"%t</b>: nama dan alamat penerima,<br><b>%C</b>: salinan nama, <b>%c</b>: "
+"salinan nama dan alamat,<br><b>%%</b>: tanda peratus, <b>%_</b>: ruang, <b>"
+"%L</b>:pemisah baris</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2172,21 +2174,20 @@ msgstr "Jawa&b kepada semua:"
 msgid "&Forward:"
 msgstr "&Perpanjangkan:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Petunjuk &Petikan:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Di  %D, anda telah menulis:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Di %D, %F telah menulis:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Mesej Diperpanjang"
 
@@ -2224,11 +2225,11 @@ msgstr "Masukkan awalan perpanjang baru"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Senarai ini disemak bagi setiap mesej yang keluar, dengan turutan dari atas ke "
-"bawah bagi set aksara yang mengandungi semua aksara yang diperlukan."
+"Senarai ini disemak bagi setiap mesej yang keluar, dengan turutan dari atas "
+"ke bawah bagi set aksara yang mengandungi semua aksara yang diperlukan."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2263,10 +2264,9 @@ msgstr "Nilai"
 msgid "Ne&w"
 msgstr "Ba&ru"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nama:"
@@ -2275,19 +2275,18 @@ msgstr "&Nama:"
 msgid "&Value:"
 msgstr "&Nilai:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Penamaan lampiran serasi Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Buka opsyen ini supaya Outlook (tm) faham nama lampiran yang mengandungi aksara "
-"bukan Inggeris"
+"Buka opsyen ini supaya Outlook (tm) faham nama lampiran yang mengandungi "
+"aksara bukan Inggeris"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2313,22 +2312,22 @@ msgstr "dilampirkan"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Anda telah memilih untuk mengekodkan nama lampiran yang mengandungi aksara "
 "bukan Inggeris dalam cara yang difahami oleh Outlook (tm) dan difahami juga "
 "oleh pelanggan mel lain yang tidak menyokong nama lampiran yang dikodkan "
 "sebagai patuh piawai. \n"
-"Ambil perhatian bahawa Kmail mungkin boleh mencipta mesej serasi dengan bukan "
-"piawai, oleh itu ada kemungkinan mesej anda itu tidak pula difahami oleh "
-"pelanggan mel patuh piawai; jadi, jika tiada pilihan lain, anda dinasihatkan "
-"supaya tidak mengaktifkan opsyen ini."
+"Ambil perhatian bahawa Kmail mungkin boleh mencipta mesej serasi dengan "
+"bukan piawai, oleh itu ada kemungkinan mesej anda itu tidak pula difahami "
+"oleh pelanggan mel patuh piawai; jadi, jika tiada pilihan lain, anda "
+"dinasihatkan supaya tidak mengaktifkan opsyen ini."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2352,114 +2351,100 @@ msgstr "Hujung Belaka&ng Kripto"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Adakala mesej sampai dalam kedua-dua format. Opsyen ini mengawal sama ada "
-"yang dipaparkan adalah  bahagian HTML atau teks ringkas.</p>"
-"<p>Paparan bahagian HTML kelihatan lebih elok, tetapi dalam masa yang sama,  ia "
-"menambah risiko eksploitasi ruang keselamatan.</p>"
-"<p>Paparan teks ringkas pula menyebabkan kebanyakan format mesej hilang, tetapi "
-" ruang keselamatan hampir <em>mustahil</em> diekspoitasi  pada  penrealisasi "
-"(Konqueror) HTML.</p>"
-"<p>Opsyen berikut melindungi daripada satu penyalahgunaan biasa mesej HTML,  "
-"tetapi ia tidak dapat melindunginya daripada isu yang tidak diketahui semasa "
-"versi KMail ditulis.</p>"
-"<p>Dinasihatkan supaya<em>tidak</em> mengutamakan HTML daripada teks "
-"ringkas.</p>"
-"<p><b>Perhatian:</b> anda boleh mengeset opsyen ini folder demi folder dari <i>"
-"Folder</i> menu  tetingkap utama KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Adakala mesej sampai dalam kedua-dua format. Opsyen ini mengawal sama "
+"ada yang dipaparkan adalah  bahagian HTML atau teks ringkas.</p><p>Paparan "
+"bahagian HTML kelihatan lebih elok, tetapi dalam masa yang sama,  ia "
+"menambah risiko eksploitasi ruang keselamatan.</p><p>Paparan teks ringkas "
+"pula menyebabkan kebanyakan format mesej hilang, tetapi  ruang keselamatan "
+"hampir <em>mustahil</em> diekspoitasi  pada  penrealisasi (Konqueror) HTML.</"
+"p><p>Opsyen berikut melindungi daripada satu penyalahgunaan biasa mesej "
+"HTML,  tetapi ia tidak dapat melindunginya daripada isu yang tidak diketahui "
+"semasa versi KMail ditulis.</p><p>Dinasihatkan supaya<em>tidak</em> "
+"mengutamakan HTML daripada teks ringkas.</p><p><b>Perhatian:</b> anda boleh "
+"mengeset opsyen ini folder demi folder dari <i>Folder</i> menu  tetingkap "
+"utama KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>beberapa iklan mel adalah HTML dan mengandungi rujukan kepada, contohnya, "
-"imej yang ditugaskan untuk mengetahui sama ada anda telah membaca mesej mereka "
-"atau belum (&quot;web bug&quot;).</p>"
-"<p>Tiada sebab kukuh untuk memuat imej keluar dari internet dengan cara ini, "
-"kerana penghantar boleh melampirkan imej yang diperlukan secara langsung ke "
-"dalam mesej bila-bila masa.</p>"
-"<p>Untuk melindungi dari penyalahgunaan ciri paparan HTML, opsyen ini <em>"
-"dilnyahaktifkan</em> secara piawai.</p>"
-"<p>Bagaimanapun, jika anda mahu, contohnya, memaparkan imej yang tidak "
-"terlampir  dalam mesej HTML, anda boleh aktifkan opsyen ini, tetapi anda perlu "
-"menyedari masalah yang mungkin berlaku.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>beberapa iklan mel adalah HTML dan mengandungi rujukan kepada, "
+"contohnya, imej yang ditugaskan untuk mengetahui sama ada anda telah membaca "
+"mesej mereka atau belum (&quot;web bug&quot;).</p><p>Tiada sebab kukuh untuk "
+"memuat imej keluar dari internet dengan cara ini, kerana penghantar boleh "
+"melampirkan imej yang diperlukan secara langsung ke dalam mesej bila-bila "
+"masa.</p><p>Untuk melindungi dari penyalahgunaan ciri paparan HTML, opsyen "
+"ini <em>dilnyahaktifkan</em> secara piawai.</p><p>Bagaimanapun, jika anda "
+"mahu, contohnya, memaparkan imej yang tidak terlampir  dalam mesej HTML, "
+"anda boleh aktifkan opsyen ini, tetapi anda perlu menyedari masalah yang "
+"mungkin berlaku.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Dasar Pemberitahuan Penyusunan Mesej</h3>"
-"<p>Secara umum MDN dinamai <b>resit baca</b>. Penulis mesej meminta "
-"pemberitahuan penyusunan  dihantar dan penerima program mel menjana jawapan "
-"supaya penulis tahu apa yang telah berlaku kepada mesej tersebut. Jenis "
-"penyusunan yang biasa termasuk <b>dipaparkan</b> (iaitu, dibaca), <b>"
-"dihapuskan</b> dan <b>dikirim</b> (contoh, diperpanjangkan).</p>"
-"<p>Opsyen berikut disediakan untuk mengawal penghantaran MDN:</p>"
-"<ul>"
-"<li><em>Abaikan</em>: Mengabaikan sebarang permintaan pemberitahuan penyusunan "
-". Secara automatik MDN tidak akan dihantar. (disyorkan).</li>"
-"<li><em>Tanya</em>: Jawapan kepada permintaan hanya diberikan selepas mendapat "
-"izin daripada pengguna. Dengan cara ini, anda boleh menghantar MDN untuk mesej "
-"yang dipilih, dalam masa yang sama menolak atau mengabaikannya untuk pihak "
-"lain.</li>"
-"<li><em>Tolak</em>: Sentiasa menghantar pemberitahuan <b>tertolak</b>. Ini <em>"
-"sedikit</em> lebih baik berbanding terlalu kerap menghantar MDN. Penulis masih "
-"tahu bahawa mesejnya telah diambil tindakan, hanya tidak tahu sama ada mesej "
-"itu dihapus, dibaca dll.</li>"
-"<li><em>Hantar selalu</em>: Selalu menghantar pemberitahuan penyusunan yang "
-"diminta. Ini bermakna, penulis mesej tahu bila dan apa tindakan yang diambil ke "
-"atas mesejnya (dipaparkan, dihapuskan, dll.). Anda sangat tidak digalakkan "
-"memilih opsyen ini, tetapi oleh sebab ia berguna contohnya untuk pengurusan "
-"perhubungan pelanggan, ia telah diwujudkan.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Dasar Pemberitahuan Penyusunan Mesej</h3><p>Secara umum MDN dinamai "
+"<b>resit baca</b>. Penulis mesej meminta pemberitahuan penyusunan  dihantar "
+"dan penerima program mel menjana jawapan supaya penulis tahu apa yang telah "
+"berlaku kepada mesej tersebut. Jenis penyusunan yang biasa termasuk "
+"<b>dipaparkan</b> (iaitu, dibaca), <b>dihapuskan</b> dan <b>dikirim</b> "
+"(contoh, diperpanjangkan).</p><p>Opsyen berikut disediakan untuk mengawal "
+"penghantaran MDN:</p><ul><li><em>Abaikan</em>: Mengabaikan sebarang "
+"permintaan pemberitahuan penyusunan . Secara automatik MDN tidak akan "
+"dihantar. (disyorkan).</li><li><em>Tanya</em>: Jawapan kepada permintaan "
+"hanya diberikan selepas mendapat izin daripada pengguna. Dengan cara ini, "
+"anda boleh menghantar MDN untuk mesej yang dipilih, dalam masa yang sama "
+"menolak atau mengabaikannya untuk pihak lain.</li><li><em>Tolak</em>: "
+"Sentiasa menghantar pemberitahuan <b>tertolak</b>. Ini <em>sedikit</em> "
+"lebih baik berbanding terlalu kerap menghantar MDN. Penulis masih tahu "
+"bahawa mesejnya telah diambil tindakan, hanya tidak tahu sama ada mesej itu "
+"dihapus, dibaca dll.</li><li><em>Hantar selalu</em>: Selalu menghantar "
+"pemberitahuan penyusunan yang diminta. Ini bermakna, penulis mesej tahu bila "
+"dan apa tindakan yang diambil ke atas mesejnya (dipaparkan, dihapuskan, "
+"dll.). Anda sangat tidak digalakkan memilih opsyen ini, tetapi oleh sebab ia "
+"berguna contohnya untuk pengurusan perhubungan pelanggan, ia telah "
+"diwujudkan.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2475,15 +2460,15 @@ msgstr "Benarkan mesej memuatkan rujukan l&uar dari internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>AMARAN:</b> Membenarkan HTML dalam e-mel boleh menambah risiko bahawa sistem "
-"akan dikompromi dengan eksploitasi keselamatan semasa dan yang dijangka. <a "
-"href=\"Apa ini:%1\">Lagi tentang mel HTML...</a> <a href=\"apa ini:%2\">"
-"Lagi tentang rujukan luar...</a>"
+"<b>AMARAN:</b> Membenarkan HTML dalam e-mel boleh menambah risiko bahawa "
+"sistem akan dikompromi dengan eksploitasi keselamatan semasa dan yang "
+"dijangka. <a href=\"Apa ini:%1\">Lagi tentang mel HTML...</a> <a href=\"apa "
+"ini:%2\">Lagi tentang rujukan luar...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2544,8 +2529,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>AMARAN:</b> Mengembalikan pengesahan tanpa syarat akan  mengganggu privasi "
-"anda. <a href=\"whatsthis:%1\">Lebih lanjut...</a>"
+"<b>AMARAN:</b> Mengembalikan pengesahan tanpa syarat akan  mengganggu "
+"privasi anda. <a href=\"whatsthis:%1\">Lebih lanjut...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2566,8 +2551,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Opsyen ini perlukan dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "Tiada proksi"
@@ -2596,8 +2580,8 @@ msgstr "&Keluarkan mesej penting dari peluputan"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Apabila cuba mencari mesej belum baca:"
 
@@ -2621,8 +2605,8 @@ msgstr "Gelungkan dalam Semua Folder"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Apabila masuk ke folder:"
 
@@ -2691,27 +2675,24 @@ msgstr "Direktori (\"maildir\" format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Ini memilih format peti mel mana akan jadi piawai untuk folder setempat:</p>"
-"<p><b>peti mel:</b> Setiap folder KMail diwakili oleh satu fail tunggal. Mesej "
-"individu diasingkan antara satu sama lain oleh garisan yang dimulakan dengan "
-"\"Daripada \". Ini menjimatkan ruang cakera, tapi mungkin kurang kukuh, "
-"contohnya apabila mengalihkan mesej antara folder.</p>"
-"<p><b>maildir:</b> folder mel KMail diwakili oleh folder sebenar pada cakera. "
-"Mesej individu adalah fail berasingan. Ini mungkin membazir sedikit ruang dalam "
-"cakera, tetapi ia sepatutnya lebih kukuh, contohnya, semasa mengalihkan mesej "
-"antara folder.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Ini memilih format peti mel mana akan jadi piawai untuk folder "
+"setempat:</p><p><b>peti mel:</b> Setiap folder KMail diwakili oleh satu fail "
+"tunggal. Mesej individu diasingkan antara satu sama lain oleh garisan yang "
+"dimulakan dengan \"Daripada \". Ini menjimatkan ruang cakera, tapi mungkin "
+"kurang kukuh, contohnya apabila mengalihkan mesej antara folder.</"
+"p><p><b>maildir:</b> folder mel KMail diwakili oleh folder sebenar pada "
+"cakera. Mesej individu adalah fail berasingan. Ini mungkin membazir sedikit "
+"ruang dalam cakera, tetapi ia sepatutnya lebih kukuh, contohnya, semasa "
+"mengalihkan mesej antara folder.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2745,45 +2726,37 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Apabila melompat ke mesej belum baca seterusnya, mungkin berlaku bahawa "
-"tidak ada lagi mesej belum baca di bawah mesej semasa.</p>"
-"<p><b>Jangan gelungkan:</b> Carian akan berhenti pada mesej terakhir dalam "
-"folder semasa.</p>"
-"<p><b>Gelungkan dalam folder semasa:</b> Carian akan terus bersambung ke mesej "
-"teratas, tapi tidak akan pergi ke folder lain.</p>"
-"<p><b>Gelungkan dalam semua folder:</b> Carian akan terus bersambung ke mesej "
-"teratas. Jika tidak ada lagi mesej belum baca, ia akan teruskan carian ke "
-"folder seterusnya.</p>"
-"<p>Demikian juga, jika carian mesej belum baca sebelumnya, carian akan bermula "
-"dari mesej terbawah senarai dan bersambung ke folder sebelumnya bergantung "
-"kepada opsyen yang dipilih.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Apabila melompat ke mesej belum baca seterusnya, mungkin berlaku "
+"bahawa tidak ada lagi mesej belum baca di bawah mesej semasa.</"
+"p><p><b>Jangan gelungkan:</b> Carian akan berhenti pada mesej terakhir dalam "
+"folder semasa.</p><p><b>Gelungkan dalam folder semasa:</b> Carian akan terus "
+"bersambung ke mesej teratas, tapi tidak akan pergi ke folder lain.</"
+"p><p><b>Gelungkan dalam semua folder:</b> Carian akan terus bersambung ke "
+"mesej teratas. Jika tidak ada lagi mesej belum baca, ia akan teruskan carian "
+"ke folder seterusnya.</p><p>Demikian juga, jika carian mesej belum baca "
+"sebelumnya, carian akan bermula dari mesej terbawah senarai dan bersambung "
+"ke folder sebelumnya bergantung kepada opsyen yang dipilih.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2851,8 +2824,8 @@ msgstr "&Sembunyikan folder groupware"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Jika ini disemak, folder sumber IMAP tidak dapat dilihat dalam pepohon folder"
 
@@ -2864,8 +2837,8 @@ msgstr "Folder &Sumber adalah di dalam akaun:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Jika ini disemak, folder sumber IMAP tidak dapat dilihat dalam pepohon folder"
 
@@ -2920,19 +2893,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Penamaan lampiran serasi Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Penghantaran undangan automatik"
@@ -2947,23 +2919,22 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Undangan biasanya dihantar sebagai lampiran kepada mel. Sebaliknya, suis "
 "ini menukar mel undangan untuk dihantar di dalam teks mel; Ini perlu untuk "
-"menghantar undangan dan jawapan kepada Microsoft Outlook ."
-"<br>Tetapi, jika ini dilakukan, anda tidak lagi mendapat teks huraian yang "
-"boleh dibaca oleh program; jadi, mesej ini kelihatan ganjil bagi mereka yang "
-"mempunyai program e-mel yang tidak memahami undangan tersebut."
-"<br>Pemilik program e-mel yang memahami undangan ini tidak akan menghadapi "
-"sebarang masalah.</qt>"
+"menghantar undangan dan jawapan kepada Microsoft Outlook .<br>Tetapi, jika "
+"ini dilakukan, anda tidak lagi mendapat teks huraian yang boleh dibaca oleh "
+"program; jadi, mesej ini kelihatan ganjil bagi mereka yang mempunyai program "
+"e-mel yang tidak memahami undangan tersebut.<br>Pemilik program e-mel yang "
+"memahami undangan ini tidak akan menghadapi sebarang masalah.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3072,17 +3043,16 @@ msgstr "&Perpanjangkan"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3100,15 +3070,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3156,8 +3126,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"Tiada penerima di dalam senarai anda. Mula-mula, pilih beberapa penerima  dan "
-"cuba lagi."
+"Tiada penerima di dalam senarai anda. Mula-mula, pilih beberapa penerima  "
+"dan cuba lagi."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3182,8 +3152,8 @@ msgstr "Edit Identiti"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3287,7 +3257,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Tidak dapat meluputkan mesej dari folder %1: folder destinasi %2 tidak ditemui"
+"Tidak dapat meluputkan mesej dari folder %1: folder destinasi %2 tidak "
+"ditemui"
 
 #: expirejob.cpp:199
 #, fuzzy
@@ -3364,8 +3335,8 @@ msgstr "Hapuskan secara kekal"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Perhatian: Tindakan peluputan akan dilaksanakan serta-merta selepas mengesahkan "
-"seting."
+"Perhatian: Tindakan peluputan akan dilaksanakan serta-merta selepas "
+"mengesahkan seting."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3448,6 +3419,11 @@ msgstr "Pilih Folder"
 msgid "Filters"
 msgstr "Tapis %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Pilih &Semua Mesej"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3479,8 +3455,8 @@ msgstr "&Log aktiviti penapis"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Anda boleh menutup dan membuka pengelogan aktiviti penapis di sini. Data log "
 "dikutip dan dipaparkan hanya apabila pengelogan dibuka."
@@ -3499,10 +3475,11 @@ msgstr "Logkan penilaian pe&raturan penapis"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Anda boleh mengawal maklum balas dalam log berkaitan penilaian peraturan "
 "penapis yang digunakan: Menyemak opsyen ini akan memberikan maklum balas "
@@ -3528,15 +3505,15 @@ msgstr "Tidak terhad"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Mengutip data log menggunakan memori untuk storan data log sementara; di sini "
-"anda boleh menghadkan jumlah maksimum yang hendak digunakan: jika saiz log data "
-"yang dikutip melebihi had, data paling lama akan dibuang sehingga ia tidak lagi "
-"melebihi had."
+"Mengutip data log menggunakan memori untuk storan data log sementara; di "
+"sini anda boleh menghadkan jumlah maksimum yang hendak digunakan: jika saiz "
+"log data yang dikutip melebihi had, data paling lama akan dibuang sehingga "
+"ia tidak lagi melebihi had."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3546,7 +3523,7 @@ msgstr ""
 "Tidak dapat menulis fail %1:\n"
 "\"%2\" adalah huraian ralat perincian"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Ralat KMail"
@@ -3587,13 +3564,14 @@ msgstr "Pengecam &Pengguna:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Pengecam pengguna ialah log masuk pengguna dalam pelayan IMAP. Ia mungkin suatu "
-"nama ringkas pengguna atau alamat penuh e-mel pengguna; mengelog masuk akaun "
-"anda sendiri dalam pelayan akan memberitahu anda yang mana satu log masuk itu."
+"Pengecam pengguna ialah log masuk pengguna dalam pelayan IMAP. Ia mungkin "
+"suatu nama ringkas pengguna atau alamat penuh e-mel pengguna; mengelog masuk "
+"akaun anda sendiri dalam pelayan akan memberitahu anda yang mana satu log "
+"masuk itu."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3644,8 +3622,8 @@ msgstr "Anda tidak mempunyai keizinan baca/tulis ke folder sampah anda."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "Maklumat belum diperoleh semula dari pelayan, gunakan \"Semak Mel\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3656,8 +3634,7 @@ msgstr "Ralat: tiada akaun IMAP ditakrifkan untuk folder ini"
 msgid "Connecting to server %1, please wait..."
 msgstr "Sedang membuat sambungan ke pelayan %1, tunggu..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Ralat semasa membuat sambungan ke pelayan %1"
@@ -3685,8 +3662,8 @@ msgstr "Tambahkan Keizinan"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Anda pasti ingin membuang keizinan sendiri untuk folder ini? Anda tidak akan "
 "dapat mengaksesnya selepas ini."
@@ -3720,7 +3697,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Pilih Folder"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Folder Setempat"
@@ -3745,13 +3722,13 @@ msgstr "Pilih Jalan Pintas untuk Folder"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Untuk memilih kekunci atau kombinasi kekunci yang memilih folder semasa, "
-"klik butang di bawah dan tekan kekunci yang anda ingin sekutukan dengan folder "
-"ini.</qt>"
+"klik butang di bawah dan tekan kekunci yang anda ingin sekutukan dengan "
+"folder ini.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3771,11 +3748,20 @@ msgstr "B&atalkan"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Tidak diketahui"
@@ -3900,69 +3886,17 @@ msgstr "Status spam:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3974,19 +3908,14 @@ msgstr "Nama &anda:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Nama anda</h3>"
-"<p>Oleh sebab anda ingin nama anda muncul pada pengepala e-mel yang dihantar "
-"keluar, maka medan ini sepatutnya mengandungi nama anda ;</p>"
-"<p>Jika anda membiarkan bahagian ini kosong, hanya alamat e-mel muncul, tidak "
-"nama sebenar anda</p></qt>"
+"<qt><h3>Nama anda</h3><p>Oleh sebab anda ingin nama anda muncul pada "
+"pengepala e-mel yang dihantar keluar, maka medan ini sepatutnya mengandungi "
+"nama anda ;</p><p>Jika anda membiarkan bahagian ini kosong, hanya alamat e-"
+"mel muncul, tidak nama sebenar anda</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3994,17 +3923,14 @@ msgstr "Organi&sasi:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisasi</h3>"
-"<p>Jika anda ingin nama organisasi muncul dalam pengepala e-mel yang dihantar "
-"keluar, medan ini sepatutnya diisi dengan  nama organisasi.</p>"
-"<p>Membiarkannya kosong adalah selamat (dan normal).</p></qt>"
+"<qt><h3>Organisasi</h3><p>Jika anda ingin nama organisasi muncul dalam "
+"pengepala e-mel yang dihantar keluar, medan ini sepatutnya diisi dengan  "
+"nama organisasi.</p><p>Membiarkannya kosong adalah selamat (dan normal).</"
+"p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4013,20 +3939,15 @@ msgstr "Alamat &e-mel:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Alamat e-mel</h3>"
-"<p>Medan ini sepatutnya mengandungi alamat e-mel penuh anda.</p>"
-"<p>Jika anda membiarkannya kosong, atau silap isi, orang lain akan menghadapi "
-"masalah menjawab e-mel anda.</p></qt>"
+"<qt><h3>Alamat e-mel</h3><p>Medan ini sepatutnya mengandungi alamat e-mel "
+"penuh anda.</p><p>Jika anda membiarkannya kosong, atau silap isi, orang lain "
+"akan menghadapi masalah menjawab e-mel anda.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4035,21 +3956,12 @@ msgstr "Alamat &e-mel:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4074,21 +3986,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kekunci OpenPGP yang anda pilih di sini akan digunakan untuk menandatangani "
-"mesej secara digital. Anda juga boleh menggunakan kekunci GnuPG.</p>"
-"<p>Anda boleh membiarkan bahagian ini kosong, tetapi KMail tidak akan dapat "
-"menandatangi e-mel secara digital menggunakan OpenPGP; fungsi mel normal tidak "
-"akan terganggu.</p>"
-"<p>Anda boleh mengetahui lebih tentang kekunci di  <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Kekunci OpenPGP yang anda pilih di sini akan digunakan untuk "
+"menandatangani mesej secara digital. Anda juga boleh menggunakan kekunci "
+"GnuPG.</p><p>Anda boleh membiarkan bahagian ini kosong, tetapi KMail tidak "
+"akan dapat menandatangi e-mel secara digital menggunakan OpenPGP; fungsi mel "
+"normal tidak akan terganggu.</p><p>Anda boleh mengetahui lebih tentang "
+"kekunci di  <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4100,32 +4009,29 @@ msgstr "Kekunci Penyulitan OpenPGP Anda"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Pilih kekunci OpenPGP yang sepatutnya digunakan apabila menyulitkan kepada diri "
-"sendiri dan untuk ciri \"Lampirkan Kekunci Umum Saya\" di dalam penggubah."
+"Pilih kekunci OpenPGP yang sepatutnya digunakan apabila menyulitkan kepada "
+"diri sendiri dan untuk ciri \"Lampirkan Kekunci Umum Saya\" di dalam "
+"penggubah."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Kekunci OpenPGP yang anda pilih di sini akan digunakan untuk menyulitkan "
-"mesej kepada diri sendiri dan untuk ciri \"Lampirkan Kekunci Umum Saya\" dalam "
-"penggubah. Anda juga boleh menggunakan kekunci GnuPG.</p>"
-"<p>Anda boleh membiarkan bahagian ini kosong, tetapi KMail tidak dapat "
-"menyulitkan salinan mesej yang dihantar keluar kepada anda menggunakan OpenPGP; "
-"fungsi mel normal tidak akan terjejas.</p>"
-"<p>Anda boleh mengetahui lebih tentang kekunci di <a>http://www.gnupg.org</a>"
-"</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Kekunci OpenPGP yang anda pilih di sini akan digunakan untuk "
+"menyulitkan mesej kepada diri sendiri dan untuk ciri \"Lampirkan Kekunci "
+"Umum Saya\" dalam penggubah. Anda juga boleh menggunakan kekunci GnuPG.</"
+"p><p>Anda boleh membiarkan bahagian ini kosong, tetapi KMail tidak dapat "
+"menyulitkan salinan mesej yang dihantar keluar kepada anda menggunakan "
+"OpenPGP; fungsi mel normal tidak akan terjejas.</p><p>Anda boleh mengetahui "
+"lebih tentang kekunci di <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4145,18 +4051,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Sijil S/MIME (X.509) yang anda pilih di sini akan digunakan untuk "
-"menandatangani mesej secara digital.</p>"
-"<p>Anda boleh membiarkannya kosong, tetapi KMail tidak akan dapat "
-"menandatangani e-mel secara digital menggunakan S/MIME; fungsi normal e-mel "
-"tidak akan terganggu.</p></qt>"
+"<qt><p>Sijil S/MIME (X.509) yang anda pilih di sini akan digunakan untuk "
+"menandatangani mesej secara digital.</p><p>Anda boleh membiarkannya kosong, "
+"tetapi KMail tidak akan dapat menandatangani e-mel secara digital "
+"menggunakan S/MIME; fungsi normal e-mel tidak akan terganggu.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4168,28 +4071,26 @@ msgstr "Sijil Penyulitan S/MIME Anda"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Pilih sijil S/MIME yang sepatutnya digunakan apabila penyulitan dibuat kepada "
-"diri sendiri dan juga untuk ciri \"Lampirkan Sijil Saya\" dalam penggubah. "
+"Pilih sijil S/MIME yang sepatutnya digunakan apabila penyulitan dibuat "
+"kepada diri sendiri dan juga untuk ciri \"Lampirkan Sijil Saya\" dalam "
+"penggubah. "
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Sijil S/MIME yang anda dipilih di sini akan digunakan untuk menyulitkan "
-"mesej kepada diri sendiri dan juga untuk ciri \"Lampirkan Sijil Saya\" dalam "
-"penggubah.</p>"
-"<p>Anda boleh membiarkan bahagian ini kosong, tetapi KMail tidak akan dapat "
-"menyulitkan salinan mesej keluar kepada anda menggunakan S/MIME; fungsi normal "
-"mel tidak akan terganggu.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Sijil S/MIME yang anda dipilih di sini akan digunakan untuk "
+"menyulitkan mesej kepada diri sendiri dan juga untuk ciri \"Lampirkan Sijil "
+"Saya\" dalam penggubah.</p><p>Anda boleh membiarkan bahagian ini kosong, "
+"tetapi KMail tidak akan dapat menyulitkan salinan mesej keluar kepada anda "
+"menggunakan S/MIME; fungsi normal mel tidak akan terganggu.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4209,24 +4110,20 @@ msgstr "&Jawapan Kepada:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Jawapan Kepada</h3>"
-"<p>Ini mengeset pengepala <tt>Jawapan tepada:</tt> supaya  mengandungi e-mel "
-"berlainan alamat menjadi alamat normal <tt>Daripada:</tt>.</p>"
-"<p>Ini berguna apabila anda bekerja dalam kumpulan yang menjalankan peranan "
-"serupa. Contohnya, anda mungkin ingin supaya setiap e-mel yang dihantar "
-"mempunyai e-mel anda di medan <tt>Daripada:</tt>, tetapi responsnya dihantar "
-"kepada alamat kumpulan.</p>"
-"<p>Jika ragu-ragu, biarkan medan ini kosong.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Jawapan Kepada</h3><p>Ini mengeset pengepala <tt>Jawapan tepada:</"
+"tt> supaya  mengandungi e-mel berlainan alamat menjadi alamat normal "
+"<tt>Daripada:</tt>.</p><p>Ini berguna apabila anda bekerja dalam kumpulan "
+"yang menjalankan peranan serupa. Contohnya, anda mungkin ingin supaya setiap "
+"e-mel yang dihantar mempunyai e-mel anda di medan <tt>Daripada:</tt>, tetapi "
+"responsnya dihantar kepada alamat kumpulan.</p><p>Jika ragu-ragu, biarkan "
+"medan ini kosong.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4234,24 +4131,19 @@ msgstr "Alamat &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Alamat SRk (Salinan Rahsia) </h3>"
-"<p>Alamat yang anda masukkan di sini akan ditambah ke setiap mel yang dihantar "
-"keluar menggunakan identiti ini. Ia tidak dapat dilihat oleh penerima lain.</p>"
-"<p>Biasanya ini digunakan untuk menghantar mesej ke akaun anda yang lain.</p>"
-"<p>Untuk menyatakan lebih daripada satu alamat, gunakan koma untuk mengasingkan "
-"senarai penerima SRk.</p>"
-"<p>Jika ragu, biarkan medan ini kosong.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Alamat SRk (Salinan Rahsia) </h3><p>Alamat yang anda masukkan di "
+"sini akan ditambah ke setiap mel yang dihantar keluar menggunakan identiti "
+"ini. Ia tidak dapat dilihat oleh penerima lain.</p><p>Biasanya ini digunakan "
+"untuk menghantar mesej ke akaun anda yang lain.</p><p>Untuk menyatakan lebih "
+"daripada satu alamat, gunakan koma untuk mengasingkan senarai penerima SRk.</"
+"p><p>Jika ragu, biarkan medan ini kosong.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4291,7 +4183,7 @@ msgstr "&Tandatangan"
 msgid "&Picture"
 msgstr "&Gambar"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Alamat E-mel Tidak Sah"
 
@@ -4308,19 +4200,19 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 "Salah satu kekunci tandatangan OpenPGP yang dikonfigurasi tidak mengandungi "
-"sebarang ID pengguna dengan alamat e-mel yang dikonfigurasi bagi identiti ini "
-"(%1).\n"
+"sebarang ID pengguna dengan alamat e-mel yang dikonfigurasi bagi identiti "
+"ini (%1).\n"
 "Ini mungkin menyebabkan mesej amaran kepada penerima semasa cuba mengesahkan "
 "tandatangan yang dibuat menggunakan konfigurasi ini."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Salah satu kekunci penyulitan OpenPGP yang dikonfigurasi tidak mengandungi "
-"sebarang ID pengguna dengan alamat e-mel yang dikonfigurasi bagi identiti ini "
-"(%1)."
+"sebarang ID pengguna dengan alamat e-mel yang dikonfigurasi bagi identiti "
+"ini (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4331,16 +4223,16 @@ msgid ""
 msgstr ""
 "Salah satu sijil penandatanganan S/MIME yang dikonfigurasi tidak mengandungi "
 "alamat e-mel yang yang dikonfigurasi dengan identiti ini (%1).\n"
-"Ini mungkin menyebabkan mesej amaran di pihak penerima semasa cuba mengesahkan "
-"tandatangan yang dibuat menggunakan konfigurasi ini."
+"Ini mungkin menyebabkan mesej amaran di pihak penerima semasa cuba "
+"mengesahkan tandatangan yang dibuat menggunakan konfigurasi ini."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Salah satu sijil penyulitan S/MIME yang dikonfigurasi tidak mengandungi alamat "
-"e-mel yang dikonfigurasi dengan identiti ini (%1)."
+"Salah satu sijil penyulitan S/MIME yang dikonfigurasi tidak mengandungi "
+"alamat e-mel yang dikonfigurasi dengan identiti ini (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4381,8 +4273,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Piawai)"
 
@@ -4429,14 +4321,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4477,17 +4369,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Ralat: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Sambungan ke pelayan %1 tanpa dijangka telah ditutup atau dihadkan masa. Jika "
-"boleh ia akan disambung semula secara automatik."
+"Sambungan ke pelayan %1 tanpa dijangka telah ditutup atau dihadkan masa. "
+"Jika boleh ia akan disambung semula secara automatik."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4637,14 +4534,14 @@ msgstr "Senaraikan Arkib"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4673,236 +4570,182 @@ msgstr "Kekunci Penyulitan Tidak Boleh Digunakan"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Kekunci penandatanganan OpenPGP anda</p><p align=center><b>%1</b> "
-"(ID kekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
+"_n: <p>Kekunci penandatanganan OpenPGP anda</p><p align=center><b>%1</b> (ID "
+"kekunci 0x%2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
 "<p>Kekunci penandatanganan OpenPGP anda</p><p align=center><b>%1</b> "
-"(KekunciID 0x%2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"(KekunciID 0x%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> "
-"(IDkekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> "
-"(IDKekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> "
+"(IDkekunci 0x%2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> (IDKekunci 0x"
+"%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</"
+"p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penandatanganan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penandatanganan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang  daripada %n hari.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"_n: <p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil "
+"penandatanganan S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil penandatanganan "
+"S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam "
+"masa kurang  daripada %n hari.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada  %n hari.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"_n: <p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil penyulitan "
+"S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam "
+"masa kurang daripada sehari.</p>\n"
+"<p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil penyulitan S/"
+"MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam "
+"masa kurang daripada  %n hari.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil S/MIME </p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil  S/MIME </p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada  %n hari.</p>"
+"_n: <p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil S/MIME </"
+"p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa kurang "
+"daripada sehari.</p>\n"
+"<p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil  S/MIME </p><p "
+"align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa kurang "
+"daripada  %n hari.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"_n: <p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor siri%2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri%2)</p>"
-"<p>luput dalam masa kuarang daripada %n hari.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"_n: <p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor siri%2)</"
+"p><p>luput dalam masa kuarang daripada %n hari.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil S/MIME </p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil S/MIME</p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada  %n hari.</p>"
+"_n: <p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil S/"
+"MIME </p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa "
+"kurang daripada sehari.</p>\n"
+"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil S/"
+"MIME</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa "
+"kurang daripada  %n hari.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor "
+"siri %2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor siri "
+"%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor "
+"siri %2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor siri "
+"%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4917,236 +4760,182 @@ msgstr "Sijil S/MIME Akan Luput Tidak Lama Lagi"
 #: keyresolver.cpp:750
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"_n: "
+"_n: <p>Kekunci penandatanganan OpenPGP anda</p><p align=center><b>%1</b> (ID "
+"kekunci 0x%2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
 "<p>Kekunci penandatanganan OpenPGP anda</p><p align=center><b>%1</b> "
-"(ID kekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Kekunci penandatanganan OpenPGP anda</p><p align=center><b>%1</b> "
-"(KekunciID 0x%2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"(KekunciID 0x%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:755
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"_n: "
-"<p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> "
-"(IDkekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> "
-"(IDKekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> "
+"(IDkekunci 0x%2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Kekunci penyulitan OpenPGP anda</p><p align=center><b>%1</b> (IDKekunci 0x"
+"%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:760
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"_n: "
-"<p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Kekunci OpenPGP untuk</p><p align=center><b>%1</b> (IDKekunci 0x%2)</"
+"p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:770
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penandatanganan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penandatanganan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang  daripada %n hari.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"_n: <p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil "
+"penandatanganan S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil penandatanganan "
+"S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam "
+"masa kurang  daripada %n hari.</p>"
 
 #: keyresolver.cpp:777
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada  %n hari.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"_n: <p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil penyulitan "
+"S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam "
+"masa kurang daripada sehari.</p>\n"
+"<p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil penyulitan S/"
+"MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam "
+"masa kurang daripada  %n hari.</p>"
 
 #: keyresolver.cpp:784
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil S/MIME </p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil root</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil  S/MIME </p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada  %n hari.</p>"
+"_n: <p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil S/MIME </"
+"p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa kurang "
+"daripada sehari.</p>\n"
+"<p>Sijil root</p><p align=center><b>%3</b></p><p>untuk sijil  S/MIME </p><p "
+"align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa kurang "
+"daripada  %n hari.</p>"
 
 #: keyresolver.cpp:792
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri%2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"_n: <p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor siri%2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:799
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"_n: "
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri%2)</p>"
-"<p>luput dalam masa kuarang daripada %n hari.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"_n: <p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil "
+"penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor siri%2)</"
+"p><p>luput dalam masa kuarang daripada %n hari.</p>"
 
 #: keyresolver.cpp:806
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil S/MIME </p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p>"
-"<p>untuk sijil S/MIME</p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada  %n hari.</p>"
+"_n: <p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil S/"
+"MIME </p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa "
+"kurang daripada sehari.</p>\n"
+"<p>Sijil AP pengantara</p><p align=center><b>%3</b></p><p>untuk sijil S/"
+"MIME</p><p align=center><b>%1</b> (nombor siri %2)</p><p>luput dalam masa "
+"kurang daripada  %n hari.</p>"
 
 #: keyresolver.cpp:815
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor "
+"siri %2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil tandatangan S/MIME anda</p><p align=center><b>%1</b> (nombor siri "
+"%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:820
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> "
-"(nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor "
+"siri %2)</p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil penyulitan S/MIME anda</p><p align=center><b>%1</b> (nombor siri "
+"%2)</p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:825
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"_n: "
-"<p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada sehari.</p>\n"
-"<p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</p>"
-"<p>luput dalam masa kurang daripada %n hari.</p>"
+"_n: <p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada sehari.</p>\n"
+"<p>Sijil S/MIME untuk</p><p align=center><b>%1</b> (nombor siri %2)</"
+"p><p>luput dalam masa kurang daripada %n hari.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5158,17 +4947,18 @@ msgstr "Sijil S/MIME Akan Luput Tidak Lama Lagi"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Satu atau lebih kekunci penyulitan OpenPGP yang dikonfigurasi atau sijil S/MIME "
-"tidak boleh digunakan untuk penyulitan. Konfigur semula kekunci dan sijil "
-"penyulitan untuk identiti ini di dalam dialog konfigurasi identiti.\n"
-"Jika anda memilih untuk meneruskan, dan kekunci diperlukan kemudian, anda akan "
-"segera diingatkan supaya menyatakan kekunci yang hendak digunakan."
+"Satu atau lebih kekunci penyulitan OpenPGP yang dikonfigurasi atau sijil S/"
+"MIME tidak boleh digunakan untuk penyulitan. Konfigur semula kekunci dan "
+"sijil penyulitan untuk identiti ini di dalam dialog konfigurasi identiti.\n"
+"Jika anda memilih untuk meneruskan, dan kekunci diperlukan kemudian, anda "
+"akan segera diingatkan supaya menyatakan kekunci yang hendak digunakan."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5182,12 +4972,12 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Satu atau lebih kekunci tandatangan OpenPGP anda yang dikonfigurasi atau sijil "
-"tandatangan  S/MIME tidak boleh digunakan untuk tandatangan. Konfigur semula "
-"kekunci tandatangan dan sijil anda untuk identiti ini dalam dialog "
+"Satu atau lebih kekunci tandatangan OpenPGP anda yang dikonfigurasi atau "
+"sijil tandatangan  S/MIME tidak boleh digunakan untuk tandatangan. Konfigur "
+"semula kekunci tandatangan dan sijil anda untuk identiti ini dalam dialog "
 "konfigurasi.\n"
-"Jika anda memilih untuk meneruskan, dan kekunci ini diperlukan kemudian, anda "
-"akan segera diingatkan supaya menyatakan kekunci yang hendak digunakan ."
+"Jika anda memilih untuk meneruskan, dan kekunci ini diperlukan kemudian, "
+"anda akan segera diingatkan supaya menyatakan kekunci yang hendak digunakan ."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5197,13 +4987,14 @@ msgstr "Kekunci Tandatangan Tdak Boleh Digunakan"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Pemeriksaan keutamaan penyulitan penerima menunjukkan mesej hendaklah "
-"disulitkan dengan OpenPGP, sekurang-kurangnya untuk beberapa orang penerima;\n"
+"disulitkan dengan OpenPGP, sekurang-kurangnya untuk beberapa orang "
+"penerima;\n"
 "bagaimanapun, anda belum konfigur kekunci OpenPGP sah yang dipercayai untuk "
 "identiti ini .\n"
 "Anda boleh teruskan tanpa penyulitan kepada diri sendiri, tetapi ambil "
@@ -5214,10 +5005,10 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Pemeriksaan keutamaan penyulitan  penerima menunjukkan mesej hendaklah "
 "disulitkan dengan S/MIME, sekurang-kurangnya untuk beberapa penerima; \n"
@@ -5228,8 +5019,8 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5244,8 +5035,8 @@ msgstr "Jangan Tandatangan dengan OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5264,8 +5055,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Pemeriksaan keutamaan tandatangan penerima menunjukkan tiada jenis tandatangan "
-"biasa yang sepadan dengan kekunci tandatangan anda.\n"
+"Pemeriksaan keutamaan tandatangan penerima menunjukkan tiada jenis "
+"tandatangan biasa yang sepadan dengan kekunci tandatangan anda.\n"
 "Hantar mesej tanpa tandatangan?"
 
 #: keyresolver.cpp:1335
@@ -5274,11 +5065,11 @@ msgstr "Tandatangan tidak boleh dilakukan"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Anda tidak memilih kekunci penyulitan untuk diri sendiri. Jika anda menyulitkan "
-"mesej sendiri, mesej tersebut tidak akan boleh dinyahsulitkan."
+"Anda tidak memilih kekunci penyulitan untuk diri sendiri. Jika anda "
+"menyulitkan mesej sendiri, mesej tersebut tidak akan boleh dinyahsulitkan."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5294,16 +5085,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Anda tidak memilih kekunci penyulitan untuk penerima mesej ini; oleh itu, mesej "
-"ini tidak akan disulitkan."
+"Anda tidak memilih kekunci penyulitan untuk penerima mesej ini; oleh itu, "
+"mesej ini tidak akan disulitkan."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Anda tidak memilih kekunci penyulitan untuk mana-mana penerima mesej ini; oleh "
-"itu, mesej ini tidak akan disulitkan."
+"Anda tidak memilih kekunci penyulitan untuk mana-mana penerima mesej ini; "
+"oleh itu, mesej ini tidak akan disulitkan."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5314,8 +5105,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Anda tidak memilih kekunci penyulitan untuk salah satu penerima: penerima ini "
-"tidak akan dapat menyahsulit mesej tersebut jika anda sulitkan ia."
+"Anda tidak memilih kekunci penyulitan untuk salah satu penerima: penerima "
+"ini tidak akan dapat menyahsulit mesej tersebut jika anda sulitkan ia."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5323,7 +5114,8 @@ msgid ""
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "Anda tidak memilih kekunci penyulitan untuk beberapa penerima: penerima "
-"berkenaan tidak akan dapat menyahsulitkan mesej tersebut jika anda sulitkan ia."
+"berkenaan tidak akan dapat menyahsulitkan mesej tersebut jika anda sulitkan "
+"ia."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5347,11 +5139,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Tiada kekunci penyulitan yang sah dan dipercayai ditemui untuk \"%1\".\n"
 "\n"
@@ -5400,10 +5192,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Ralat kritikal: tidak dapat memungut mel:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Gagal menambah mesej:\n"
+msgid "Failed to add message:\n"
+msgstr "Gagal menambah mesej:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5495,6 +5285,52 @@ msgstr "IMAP &putus"
 msgid "&Maildir mailbox"
 msgstr "Peti mel &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Setkan subjek mesej"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Hantar Sk: kepada 'alamat'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Hantar SRk: kepada 'alamat'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Tambahkan 'pengepala' kepada mesej"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Baca isi mesej dari 'fail'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Setkan isi mesej"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Tambah lampiran kepada mel. Ini boleh diulangi"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Semak mel baru sahaja"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Buka tetingkap komposer sahaja"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Paparkan fail mesej yang diberi"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Hantar mesej ke penerima 'alamat'. Lampirkan fail yang ditunjukkan oleh  "
+"'URL' "
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mel"
@@ -5554,9 +5390,9 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "Sekarang KMail mencipta folder yang diperlukan untuk sumber IMAP  sebagai "
 "subfolder %1; jika anda tidak mahu, tekan\"Tidak\", dan sumber IMAP akan "
@@ -5610,11 +5446,11 @@ msgstr "URL telah disalin ke klipbod."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Fail <b>%1</b> wujud.<br>Anda ingin menggantikannya?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Simpan ke dalam Fail"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Gantikan"
 
@@ -5632,7 +5468,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5652,100 +5488,100 @@ msgstr "Fail tidak mengandungi mesej."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fail mengandungi berbilang mesej. Hanya mesej pertama dipaparkan."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Ini ialah ringkasan  MIME yang  diperpanjangkan. Kandungan mesej ini terkandung "
-"dalam lampiran.\n"
+"Ini ialah ringkasan  MIME yang  diperpanjangkan. Kandungan mesej ini "
+"terkandung dalam lampiran.\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Menghapuskan mesej"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Mengalihkan mesej %3 daripada %2 dari %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Ruang cakera tidak mencukupi?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Alih ke folder ini"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Salin ke folder ini"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Mengalihkan mesej"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Menghapuskan mesej"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Membuka URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Anda pasti inigin melaksanakan <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "Laksanakan Arahan"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Tidak menemui lampiran untuk disimpan."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Simpan Lampiran Ke"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "lampiran.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "lampiran.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Fail bernama %1 telah wujud. Anda ingin menulis gantikannya?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fail Telah Wujud"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Tulis ganti"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5753,21 +5589,21 @@ msgstr ""
 "Bahagian %1 mesej telah disulitkan. Anda ingin mengekalkan penyulitan semasa "
 "menyimpan?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Soalan KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Penyulitan"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Ja&ngan Sulitkan"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5775,12 +5611,12 @@ msgstr ""
 "Bahagian %1 mesej telah ditandatangani. Anda ingin mengekalkan tandatangan "
 "semasa menyimpan?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Tandatangan"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5789,22 +5625,22 @@ msgstr ""
 "Fail tidak dapat ditulis %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Tidak dapat menulis fail %1"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Tiada entri  Buku Alamat untuk alamat e-mel ini. Masukkan entri ke dalam Buku "
-"Alamat dan kemudian masukkan alamat penghantaran mesej segera menggunakan "
-"pelanggan penghantaran mesej yang digemari. "
+"Tiada entri  Buku Alamat untuk alamat e-mel ini. Masukkan entri ke dalam "
+"Buku Alamat dan kemudian masukkan alamat penghantaran mesej segera "
+"menggunakan pelanggan penghantaran mesej yang digemari. "
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5814,67 +5650,67 @@ msgstr ""
 " %1\n"
 "Tidak dapat menentukan untuk chating dengan siapa."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Pilihan Kekunci Penyulitan"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Mel"
@@ -5973,7 +5809,7 @@ msgstr "Saiz"
 msgid "Encoding"
 msgstr "Pengekodan"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Mampatkan"
 
@@ -5985,7 +5821,7 @@ msgstr "Sulitkan"
 msgid "Sign"
 msgstr "Tandatangan"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nama lampiran"
 
@@ -6007,9 +5843,11 @@ msgstr "Penerima Primer"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Alamat e-mel yang diletakkan di medan ini akan menerima salinan e-mel.</qt>"
+"<qt>Alamat e-mel yang diletakkan di medan ini akan menerima salinan e-mel.</"
+"qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6018,9 +5856,9 @@ msgstr "Penerima Tambahan"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Alamat e-mel yang diletakkan di medan ini akan menerima salinan e-mel. "
 "Secara teknikal, hal ini samalah seperti meletakkan semua alamat ke dalam "
@@ -6033,13 +5871,12 @@ msgstr "Penerima Tersembunyi"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Pada dasarnya sama dengan medan <b>Salinan Kepada:</b> "
-"tetapi bezanya ialah semua penerima lain tidak nampak siapa yang menerima "
-"salinan buta tuli.</qt>"
+"<qt>Pada dasarnya sama dengan medan <b>Salinan Kepada:</b> tetapi bezanya "
+"ialah semua penerima lain tidak nampak siapa yang menerima salinan buta tuli."
+"</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6049,7 +5886,7 @@ msgstr "&Hantar Mel"
 msgid "&Send Mail Via"
 msgstr "&Hantar Mel Melalui"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Hantar &Kemudian"
@@ -6116,8 +5953,7 @@ msgstr "&Buang Aksara Petikan"
 msgid "Cl&ean Spaces"
 msgstr "Bers&ihkan Ruang"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Guna Fon Yang Di&tetapkan"
@@ -6260,31 +6096,31 @@ msgstr "Format Mesej &Kriptografi "
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Senarai terbulet (lekuk)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Senarai Terbulet (Bulat)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Senarai terbulet (Persegi)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "List bertertib (Perpuluhan)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Senarai Bertertib (bawah Alfa)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Senarai Bertertib (atas Alfa)"
 
@@ -6393,8 +6229,8 @@ msgstr "Tutup Penggubah"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Mesej yang anda gubah seolah-olah merujuk kepada lampiran fail tetapi anda "
@@ -6405,49 +6241,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Peringatan Lampiran Fail"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Hantar Seperti Adanya"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail tidak dapat mengecam lokasi lampiran (%1);</p>"
-"<p>anda perlu nyatakan laluan penuh jika ingin melampirkan fail.</p></qt>"
+"<qt><p>KMail tidak dapat mengecam lokasi lampiran (%1);</p><p>anda perlu "
+"nyatakan laluan penuh jika ingin melampirkan fail.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Lampirkan Fail"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Lampirkan"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Sisipkan Fail"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Sisipkan Fail"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ralat berlaku semasa cuba mengeksport kekunci dari hujung belakang:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Ralat berlaku semasa cuba mengeksport kekunci dari hujung belakang:</"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6486,190 +6322,199 @@ msgid ""
 "View"
 msgstr "Paparkan"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Edit..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Edit..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Simpan &Sebagai"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Ciri"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Tambah Lampiran..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail tidak dapat memampatkan fail."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Fail mampat lebih besar daripada fail asal. Biarkan dalam bentuk fail asal?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "&Bip"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail tidak dapat menyahmampat fail."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Simpan Lampiran Sebagai"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Tambah sebagai Teks"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Tambah sebagai Lampiran"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Tampalkan sebagai Lampi&ran"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "tak dinamakan"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Anda meminta supaya mesej disulitkan kepada anda sendiri, tetapi identiti "
-"semasa yang dipilih tidak mentakrif sebarang kekunci penyulitan yang hendak "
-"digunakan untuk tujuan tersebut (OpenPGP atau S/MIME) .</p>"
-"<p>Pilih kekunci yang hendak digunakan dalam konfigurasi identiti.</p></qt>"
+"<qt><p>Anda meminta supaya mesej disulitkan kepada anda sendiri, tetapi "
+"identiti semasa yang dipilih tidak mentakrif sebarang kekunci penyulitan "
+"yang hendak digunakan untuk tujuan tersebut (OpenPGP atau S/MIME) .</"
+"p><p>Pilih kekunci yang hendak digunakan dalam konfigurasi identiti.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Kekunci Penyulitan Tak Ditakrif"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Takrifkan kekunci tandatangan (OpenPGP atau S/MIME) yang hendak digunakan "
-"terlebih dahulu supaya boleh menandatangani mesej ini.</p>"
-"<p>Pilih kekunci yang hendak digunakan dalam konfigurasi identiti.</p></qt>"
+"<qt><p>Takrifkan kekunci tandatangan (OpenPGP atau S/MIME) yang hendak "
+"digunakan terlebih dahulu supaya boleh menandatangani mesej ini.</p><p>Pilih "
+"kekunci yang hendak digunakan dalam konfigurasi identiti.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Kekunci Tandatangan Tak Ditakrif"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Anda mesti memasukkan alamat e-mel di medan Daripada: Anda juga sepatutnya "
 "mengeset alamat e-mel untuk semua identiti supaya anda tidak perlu "
 "memasukkannya di setiap mesej"
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Anda mesti nyatakan sekurang-kurangnya satu penerima samada di dalam medan "
 "Kepada: atau sebagai Sk atau sebagai SRk"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Anda tidak menyatakan  subjek. Hantarkan jua mesej?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Tiada nama dinyatakan"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Anda tidak menyatakan  subjek. Hantarkan jua mesej?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Tiada Subjek Dinyatakan"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "H&antar seperti adanya"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Nyatakan Subjek"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Kekalkan tanda, jangan tandatangan/sulitkan"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Kekalkan tanda, jangan sulitkan"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Kekalkan tanda, jangan tandatangan"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Tandatangan/sulitkan (hapuskan tanda)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Sulitkan (hapuskan tanda)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Tandatangan (hapuskan tanda)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Penandatanganan/penyulitan baris dalam mesej HTML tidak boleh dibuat ;</p>"
-"<p>Anda ingin hapuskan penandaan?</p></qt>"
+"<qt><p>Penandatanganan/penyulitan baris dalam mesej HTML tidak boleh dibuat ;"
+"</p><p>Anda ingin hapuskan penandaan?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Tandatangan/Sulitkan Mesej?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6678,107 +6523,107 @@ msgstr ""
 "Folder draf langganan untuk identiti \"%1\" tidak wujud (lagi); oleh itu, "
 "folder draf piawai akan digunakan."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Cipta akaun untuk menghantar dan cuba sekali lagi."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Akan menghantar e-mel..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Hantar Pengesahan"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Hantar Sekarang"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Tiada penerima"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Penerima Tambahan"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Penyemak eja"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Penyemak eja"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Semakan ejaan dibatalkan."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Semakan ejaan dihentikan."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Semakan ejaan selesai."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Penyemak eja"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Tanda tangan tidak ditemui"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Pilihan Kekunci Penyulitan"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Mesej ditandatangani oleh %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Mesej ditandatangani oleh %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Mesej OpenPGP - Disulitkan"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Mesej dengan subjek:"
@@ -6829,8 +6674,8 @@ msgstr "Semak Eja KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell tidak dapat dimulakan. Pastikan ISpell atau Aspell dikonfigur "
 "dengan betul di dalam PATH anda."
@@ -6863,17 +6708,16 @@ msgstr "Ada masalah berlaku semasa mengaplikasikan tindakan ini."
 #: kmfilter.cpp:265
 msgid "<qt>Too many filter actions in filter rule <b>%1</b>.</qt>"
 msgstr ""
-"<qt>Terlalu banyak tindakan penapis di dalam peraturan penapis <b>%1</b>.</qt>"
+"<qt>Terlalu banyak tindakan penapis di dalam peraturan penapis <b>%1</b>.</"
+"qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Tindakan penapis tidak diketahui <b>%1</b>"
-"<br>di dalam peraturan penapis <b>%2</b>."
-"<br>Mengabaikannya.</qt>"
+"<qt>Tindakan penapis tidak diketahui <b>%1</b><br>di dalam peraturan penapis "
+"<b>%2</b>.<br>Mengabaikannya.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7093,167 +6937,140 @@ msgstr "Siar bunyi"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ini adalah senarai penapis yang ditakrif. Ia diproses dari atas ke bawah.</p>"
-"<p>Klik mana-mana penapis untuk mengedit menggunakan kawalan di sebelah kanan "
-"dialog.</p></qt>"
+"<qt><p>Ini adalah senarai penapis yang ditakrif. Ia diproses dari atas ke "
+"bawah.</p><p>Klik mana-mana penapis untuk mengedit menggunakan kawalan di "
+"sebelah kanan dialog.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk mencipta penapis baru.</p>"
-"<p>Penapis akan disisipkan betul-betul sebelum pilihan semasa, bagaimanapun, "
-"anda boleh mengubahnya bila-bila masa.</p>"
-"<p>Jika anda terklik butang ini tanpa sengaja, ia boleh dibatalkan dengan "
-"mengklik butang <em>Hapus</em> </p></qt>"
+"<qt><p>Klik butang ini untuk mencipta penapis baru.</p><p>Penapis akan "
+"disisipkan betul-betul sebelum pilihan semasa, bagaimanapun, anda boleh "
+"mengubahnya bila-bila masa.</p><p>Jika anda terklik butang ini tanpa "
+"sengaja, ia boleh dibatalkan dengan mengklik butang <em>Hapus</em> </p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk menyalin penapis.</p>"
-"<p>Jika anda terklik butang ini tanpa sengaja, anda boleh membatalkannya dengan "
-"mengklik butang<em>Hapus</em>.</p></qt>"
+"<qt><p>Klik butang ini untuk menyalin penapis.</p><p>Jika anda terklik "
+"butang ini tanpa sengaja, anda boleh membatalkannya dengan mengklik "
+"butang<em>Hapus</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk <em>menghapuskan</em> penapis semasa yang  dipilih  "
-"dari senarai di atas.</p>"
-"<p>Jika telah dihapuskan, tiada cara untuk mendapatkannya semula, tetapi anda "
-"boleh meninggalkan dialog ini bila-bila masa dengan mengklik <em>Batal</em> "
-"untuk membuang sebarang perubahan yang telah dibuat.</p></qt>"
+"<qt><p>Klik butang ini untuk <em>menghapuskan</em> penapis semasa yang  "
+"dipilih  dari senarai di atas.</p><p>Jika telah dihapuskan, tiada cara untuk "
+"mendapatkannya semula, tetapi anda boleh meninggalkan dialog ini bila-bila "
+"masa dengan mengklik <em>Batal</em> untuk membuang sebarang perubahan yang "
+"telah dibuat.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk mengalihkan penapis terkini yang dipilih masa ini satu "
-"tingkat <em>ke bawah</em> dari senarai di atas.</p>"
-"<p>Ini berfaedah kerana turutan penapis dalam senarai menentukan turutan cubaan "
-"pada mesej: penapis teratas dicuba terlebih dahulu.</p>"
-"<p>Jika anda terklik butang ini tanpa sengaja, anda boleh membatalkan dengan "
-"mengklik butang <em>Ke atas</em>.</p></qt>"
+"<qt><p>Klik butang ini untuk mengalihkan penapis terkini yang dipilih masa "
+"ini satu tingkat <em>ke bawah</em> dari senarai di atas.</p><p>Ini berfaedah "
+"kerana turutan penapis dalam senarai menentukan turutan cubaan pada mesej: "
+"penapis teratas dicuba terlebih dahulu.</p><p>Jika anda terklik butang ini "
+"tanpa sengaja, anda boleh membatalkan dengan mengklik butang <em>Ke atas</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk mengalihkan penapis yang  dipilih masa ini  satu "
-"tingkat <em>ke atas</em> dalam senarai di atas.</p>"
-"<p>Ini berfaedah kerana turutan penapis dalam senarai menentukan turutan cubaan "
-"pada mesej: Senarai teratas akan dicuba terlebih dahulu.</p>"
-"<p>Jika anda terklik butang ini tanpa sengaja, ia boleh dibatalkan dengan "
-"mengklik butang <em>ke bawah</em> .</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klik butang ini untuk mengalihkan penapis yang  dipilih masa ini  "
+"satu tingkat <em>ke atas</em> dalam senarai di atas.</p><p>Ini berfaedah "
+"kerana turutan penapis dalam senarai menentukan turutan cubaan pada mesej: "
+"Senarai teratas akan dicuba terlebih dahulu.</p><p>Jika anda terklik butang "
+"ini tanpa sengaja, ia boleh dibatalkan dengan mengklik butang <em>ke bawah</"
+"em> .</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk mengalihkan penapis terkini yang dipilih masa ini satu "
-"tingkat <em>ke bawah</em> dari senarai di atas.</p>"
-"<p>Ini berfaedah kerana turutan penapis dalam senarai menentukan turutan cubaan "
-"pada mesej: penapis teratas dicuba terlebih dahulu.</p>"
-"<p>Jika anda terklik butang ini tanpa sengaja, anda boleh membatalkan dengan "
-"mengklik butang <em>Ke atas</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klik butang ini untuk mengalihkan penapis terkini yang dipilih masa "
+"ini satu tingkat <em>ke bawah</em> dari senarai di atas.</p><p>Ini berfaedah "
+"kerana turutan penapis dalam senarai menentukan turutan cubaan pada mesej: "
+"penapis teratas dicuba terlebih dahulu.</p><p>Jika anda terklik butang ini "
+"tanpa sengaja, anda boleh membatalkan dengan mengklik butang <em>Ke atas</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk mengalihkan penapis terkini yang dipilih masa ini satu "
-"tingkat <em>ke bawah</em> dari senarai di atas.</p>"
-"<p>Ini berfaedah kerana turutan penapis dalam senarai menentukan turutan cubaan "
-"pada mesej: penapis teratas dicuba terlebih dahulu.</p>"
-"<p>Jika anda terklik butang ini tanpa sengaja, anda boleh membatalkan dengan "
-"mengklik butang <em>Ke atas</em>.</p></qt>"
+"<qt><p>Klik butang ini untuk mengalihkan penapis terkini yang dipilih masa "
+"ini satu tingkat <em>ke bawah</em> dari senarai di atas.</p><p>Ini berfaedah "
+"kerana turutan penapis dalam senarai menentukan turutan cubaan pada mesej: "
+"penapis teratas dicuba terlebih dahulu.</p><p>Jika anda terklik butang ini "
+"tanpa sengaja, anda boleh membatalkan dengan mengklik butang <em>Ke atas</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik butang ini untuk menamakan semula penapis pilihan terkini.</p>"
-"<p>Penapis dinamakan secara automatik, selagi ia bermula dengan \"&lt;\".</p>"
-"<p>Jika anda telah menamakan semula penapis tanpa sengaja dan ingin penamaan "
-"automatik semula, klik butang ini dan pilih<em>Kosongkan</em> "
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Klik butang ini untuk menamakan semula penapis pilihan terkini.</"
+"p><p>Penapis dinamakan secara automatik, selagi ia bermula dengan \"&lt;\".</"
+"p><p>Jika anda telah menamakan semula penapis tanpa sengaja dan ingin "
+"penamaan automatik semula, klik butang ini dan pilih<em>Kosongkan</em> "
 "diikuti dengan <em>OK</em> di dalam dialog yang muncul.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Semak butang ini untuk memaksa paparan dialog kepastian.</p>"
-"<p>Ini berfedah jika anda telah mentakrifkan set peraturan yang melabelkan "
-"mesej yang hendak dimuat turun kemudian. Tanpa dialog popup, mesej tersebut "
-"tidak akan dimuat turun jika tiada mesej besar menunggu dalam pelayan, atau "
-"jika anda ingin mengubah set peraturan untuk melabel mesej dengan label "
-"lain.</p></qt>"
+"<qt><p>Semak butang ini untuk memaksa paparan dialog kepastian.</p><p>Ini "
+"berfedah jika anda telah mentakrifkan set peraturan yang melabelkan mesej "
+"yang hendak dimuat turun kemudian. Tanpa dialog popup, mesej tersebut tidak "
+"akan dimuat turun jika tiada mesej besar menunggu dalam pelayan, atau jika "
+"anda ingin mengubah set peraturan untuk melabel mesej dengan label lain.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7263,6 +7080,16 @@ msgstr "Peraturan Penapis POP3"
 msgid "Filter Rules"
 msgstr "Peraturan Penapis"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Import"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Import"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Penapis Yang Boleh Didapatkan"
@@ -7345,6 +7172,11 @@ msgstr "Tambahkan penapis ini ke bar alat"
 msgid "Icon for this filter:"
 msgstr "Ikonkan untuk penapis ini:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Ke"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Ke atas"
@@ -7353,16 +7185,29 @@ msgstr "Ke atas"
 msgid "Down"
 msgstr "Ke bawah"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Namakan semula..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Baru"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Salin Ke"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Dihapuskan"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7371,8 +7216,8 @@ msgstr "Pilih Jalan Pintas untuk Folder"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7429,15 +7274,16 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Nama folder tidak boleh mengandungi aksara/ (garis sendeng);  pilih nama yang "
-"lain."
+"Nama folder tidak boleh mengandungi aksara/ (garis sendeng);  pilih nama "
+"yang lain."
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Nama folder tidak boleh bermula dengan aksara . (titik); pilih nama yang lain."
+"Nama folder tidak boleh bermula dengan aksara . (titik); pilih nama yang "
+"lain."
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7452,28 +7298,25 @@ msgstr "Sedang menyelesaikan masalah Cache IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Menyelesaikan masalah cache IMAP.</b></p>"
-"<p>Jika anda menghadapi masalah menyegerakkan folder IMAP, cuba bina semula "
-"fail indeks. Pembinaan akan memerlukan masa, tetapi tidak akan menyebabkan "
-"sebarang masalah.</p>"
-"<p>Jika itu tidak memadai, cuba muat semula cache IMAP. Jika ini dilakukan, "
-"perubahan setempat dalam folder ini dan dalam semua subfolder akan hilang.</p>"
+"<p><b>Menyelesaikan masalah cache IMAP.</b></p><p>Jika anda menghadapi "
+"masalah menyegerakkan folder IMAP, cuba bina semula fail indeks. Pembinaan "
+"akan memerlukan masa, tetapi tidak akan menyebabkan sebarang masalah.</"
+"p><p>Jika itu tidak memadai, cuba muat semula cache IMAP. Jika ini "
+"dilakukan, perubahan setempat dalam folder ini dan dalam semua subfolder "
+"akan hilang.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7510,8 +7353,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7552,11 +7395,11 @@ msgstr "Indeks folder ini telah dicipta semula."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Folder %1 tidak dalam keadaan segerak pemulaan (keadaan adalah %2). Anda ingin "
-"mengeset semula kepada keadaan segerak pemulaan dan segerakkan?"
+"Folder %1 tidak dalam keadaan segerak pemulaan (keadaan adalah %2). Anda "
+"ingin mengeset semula kepada keadaan segerak pemulaan dan segerakkan?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7683,14 +7526,11 @@ msgstr "Mencipta semula subfolder dalam pelayan"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Nampaknya folder <b>%1</b> telah dihapuskan. Anda ingin menghapuskannya dari "
-"pelayan?</p></qt>"
+"<qt><p>Nampaknya folder <b>%1</b> telah dihapuskan. Anda ingin "
+"menghapuskannya dari pelayan?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7711,13 +7551,11 @@ msgstr "Memperoleh semula folder untuk ruang nama %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Nampaknya folder <b>%1</b> telah dihapuskan. Anda ingin menghapuskannya dari "
-"pelayan?</p></qt>"
+"<qt><p>Nampaknya folder <b>%1</b> telah dihapuskan. Anda ingin "
+"menghapuskannya dari pelayan?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7725,20 +7563,20 @@ msgstr "Dihenti paksa"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"Pelayan IMAP %1 tidak menyokong anotasi IMAP. Storan  XML tidak boleh digunakan "
-"dalam pelayan ini; konfigur semula KMail dengan konfigurasi lain."
+"Pelayan IMAP %1 tidak menyokong anotasi IMAP. Storan  XML tidak boleh "
+"digunakan dalam pelayan ini; konfigur semula KMail dengan konfigurasi lain."
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"Pelayan IMAP %1 tidak menyokong anotasi IMAP. Storan  XML tidak boleh digunakan "
-"dalam pelayan ini; konfigur semula KMail dengan konfigurasi lain."
+"Pelayan IMAP %1 tidak menyokong anotasi IMAP. Storan  XML tidak boleh "
+"digunakan dalam pelayan ini; konfigur semula KMail dengan konfigurasi lain."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7750,11 +7588,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7763,15 +7601,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Alih ke:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "Ja&gan tandatangan"
@@ -7785,8 +7628,7 @@ msgstr "Alihkan Mesej ke Folder"
 msgid "Permissions (ACL)"
 msgstr "Keizinan (SKA)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Umum"
@@ -7811,8 +7653,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Gunakan &ikon langganan"
@@ -7832,14 +7673,13 @@ msgstr "Maklumkan tentang kehadiran mel baru dalam folder ini"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7852,13 +7692,13 @@ msgstr "Simpan jawapan dalam folder ini"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Semak opsyen ini jika anda ingin jawapan mel yang telah anda tulis diletakkan "
-"dalam folder yang sama selepas dihantar, dan bukannya di dalam folder mel "
-"hantaran yang dikonfigur."
+"Semak opsyen ini jika anda ingin jawapan mel yang telah anda tulis "
+"diletakkan dalam folder yang sama selepas dihantar, dan bukannya di dalam "
+"folder mel hantaran yang dikonfigur."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7868,17 +7708,21 @@ msgstr "Paparkan lajur penghantar/penerima dalam Senarai Mesej"
 msgid "Sho&w column:"
 msgstr "&Paparkan lajur:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Set sebagai Piawai"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Penghantar"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Penerima"
@@ -7889,17 +7733,17 @@ msgstr "Identiti &penghantar:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Pilih identiti penghantar yang ingin digunakan semasa menulis mel baru atau "
-"menjawab mel dalam folder ini. Ini bermakna jika anda berada dalam salah satu "
-"folder kerja, anda boleh membuatkan KMail menggunakan alamat e-mel, tandatangan "
-"atau kekunci penyulitan penghantar yang sejajar. Identiti boleh dibina dalam "
-"dialog konfigurasi utama. (Seting-> Konfigur KMail)"
+"menjawab mel dalam folder ini. Ini bermakna jika anda berada dalam salah "
+"satu folder kerja, anda boleh membuatkan KMail menggunakan alamat e-mel, "
+"tandatangan atau kekunci penyulitan penghantar yang sejajar. Identiti boleh "
+"dibina dalam dialog konfigurasi utama. (Seting-> Konfigur KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7917,22 +7761,22 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Seting ini mentakrif mana satu pengguna kongsi yang sepatutnya mendapat tempoh "
-"\"sibuk\" dalam senarai sibuk bebas dan sepatutnya nampak penggera untuk "
-"peristiwa atau tugasan dalam folder ini. Seting ini digunakan hanya kepada "
-"folder Kalendar dan Tugasan  (untuk tugasan, seting ini hanya digunakan untuk "
-"penggera).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Seting ini mentakrif mana satu pengguna kongsi yang sepatutnya mendapat "
+"tempoh \"sibuk\" dalam senarai sibuk bebas dan sepatutnya nampak penggera "
+"untuk peristiwa atau tugasan dalam folder ini. Seting ini digunakan hanya "
+"kepada folder Kalendar dan Tugasan  (untuk tugasan, seting ini hanya "
+"digunakan untuk penggera).\n"
 "\n"
-"Contoh kes: jika bos berkongsi folder dengan setiausahanya, hanya bos ditanda "
-"sebagai sibuk kerana mesyuaratnya, jadi bos sepatutnya memilih \"Pentadbir\", "
-"kerana setiausaha tidak ada hak mentadbir ke atas folder.\n"
+"Contoh kes: jika bos berkongsi folder dengan setiausahanya, hanya bos "
+"ditanda sebagai sibuk kerana mesyuaratnya, jadi bos sepatutnya memilih "
+"\"Pentadbir\", kerana setiausaha tidak ada hak mentadbir ke atas folder.\n"
 "Sebaliknya, jika satu pasukan kerja berkongsi satu Kalendar untuk mesyuarat "
 "kumpulan, semua pembaca folder ditandakan sibuk kerana mesyuarat.\n"
 "Folder tahap syarikat yang mempunyai opsyen peristiwa menggunakan\"Tiada "
@@ -7967,23 +7811,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Anda telah mengkofigurasi folder ini supaya mengandungi maklumat groupware dan "
-"opsyen konfigurasi umum untuk menyembunyikan folder groupware telah diset. Itu "
-"bermakna, folder ini akan hilang jika dialog konfigurasi ditutup. Jika anda "
-"ingin mengeluarkan lagi folder ini, anda perlu menyahaktifkan persembunyian "
-"folder groupware buat sementara supaya ia boleh dilihat."
+"Anda telah mengkofigurasi folder ini supaya mengandungi maklumat groupware "
+"dan opsyen konfigurasi umum untuk menyembunyikan folder groupware telah "
+"diset. Itu bermakna, folder ini akan hilang jika dialog konfigurasi ditutup. "
+"Jika anda ingin mengeluarkan lagi folder ini, anda perlu menyahaktifkan "
+"persembunyian folder groupware buat sementara supaya ia boleh dilihat."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8053,7 +7897,8 @@ msgstr "Ralat semasa mengambil maklumat folder"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Indeks mel untuk '%1' adalah dari versi KMail (%2) yang tidak diketahui. \n"
 "Indeks ini boleh dijana dari folder mel anda, tetapi beberapa maklumat, "
@@ -8086,8 +7931,8 @@ msgstr "Ralat membuka %1; folder ini telah hilang."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Ralat membuka %1; sama ada ini folder maildir tidak sah, atau anda tidak "
 "mempunyai keizinan yang cukup untuk mengakses. "
@@ -8108,8 +7953,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"Maildir Folder KMF::tambah Mesej: menamatkan secara tak normal untuk menghalang "
-"kehilangan data.  "
+"Maildir Folder KMF::tambah Mesej: menamatkan secara tak normal untuk "
+"menghalang kehilangan data.  "
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8134,20 +7979,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Nampaknya indeks folder  '%2' telah tamat tempoh. Untuk mengelakkan "
+"<qt><p>Nampaknya indeks folder  '%2' telah tamat tempoh. Untuk mengelakkan "
 "kerosakan mesej, indeks akan dijana semula. Hasilnya, mesej terhapus akan "
-"muncul semula dan lambang status mungkin hilang. </p>"
-"<p>Untuk mengelakkan masalah ini berulang, baca entri berkaitan  di dalam "
-"bahagian FAQ <a href=\"%1\"> manual KMail</a></p></qt>"
+"muncul semula dan lambang status mungkin hilang. </p><p>Untuk mengelakkan "
+"masalah ini berulang, baca entri berkaitan  di dalam bahagian FAQ <a href="
+"\"%1\"> manual KMail</a></p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8206,7 +8048,7 @@ msgstr ""
 "'%1' kelihatan seperti bukan folder.\n"
 "Allihkan fail dari sini."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8214,7 +8056,7 @@ msgstr ""
 "Keizinan folder '%1' tidak betul;\n"
 "pastikan anda boleh memapar dan mengubah suai kandungan folder ini."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8224,8 +8066,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8233,7 +8075,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Gagal mencipta folder"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8338,13 +8180,13 @@ msgstr "&Selesaikan Masalah Cache IMAP"
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Tidak dapat mencipta folder <b>%1</b> kerana kurang keizinan dalam pelayan. "
-"Jika anda fikir anda sepatutnya boleh mencipta subfolder di sini, minta  "
-"pentadbir memberikan hak berbuat demikian.</qt> "
+"<qt>Tidak dapat mencipta folder <b>%1</b> kerana kurang keizinan dalam "
+"pelayan. Jika anda fikir anda sepatutnya boleh mencipta subfolder di sini, "
+"minta  pentadbir memberikan hak berbuat demikian.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8484,15 +8326,15 @@ msgstr "%1 Folder baca sahaja."
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"_n: <qt>Anda betul-betul ingin menghapuskan mesej yang dipilih?"
-"<br>Jika dihapuskan, ia tidak boleh disimpan semula.</qt>\n"
-"<qt>Anda betul-betul ingin menghapuskan  %n mesej yang dipilih?"
-"<br>Jika dihapuskan, ia tidak boleh disimpan semula.</qt>"
+"_n: <qt>Anda betul-betul ingin menghapuskan mesej yang dipilih?<br>Jika "
+"dihapuskan, ia tidak boleh disimpan semula.</qt>\n"
+"<qt>Anda betul-betul ingin menghapuskan  %n mesej yang dipilih?<br>Jika "
+"dihapuskan, ia tidak boleh disimpan semula.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8544,134 +8386,132 @@ msgstr ""
 "Gagal mengubah suai %1\n"
 "(Tiada lagi ruang dalam peranti?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Permohonan Sijil Tandatangan"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Cipta sijil dari lampiran dan kembali kepada penghantar."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Anda tidak mempunyai keizinan baca/tulis ke folder peti masuk anda."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "peti keluar"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Anda tidak mempunyai keizinan baca/tulis ke folder peti keluar anda."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "mel hantaran"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Anda tidak mempunyai keizinan baca/tullis ke folder mel hantaran anda."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Sampah"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Anda tidak mempunyai keizinan baca/tulis ke folder sampah anda."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "draf"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Anda tidak mempunyai keizinan baca/tulis ke folder draf anda."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Gantikan"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Anda tidak mempunyai keizinan baca/tulis ke folder sampah anda."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Carian Terakhir"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Folder <i>%4</i> wujud. %1 sekarang gunakan folder <i>%5</i>untuk mesejnya."
-"<p>%2 boleh membantu anda mengalihkan kandungan <i>%6<i> "
-"ke dalam folder, walaupun ini mungkin mengganti fail sedia ada yang mempunyai "
-"nama sama di dalam <i>%7</i>."
-"<p><kuat>Adakah anda ingin %3 mengalihkan fail mel sekarang?</kuat></qt>"
+"<qt>Folder <i>%4</i> wujud. %1 sekarang gunakan folder <i>%5</i>untuk "
+"mesejnya.<p>%2 boleh membantu anda mengalihkan kandungan <i>%6<i> ke dalam "
+"folder, walaupun ini mungkin mengganti fail sedia ada yang mempunyai nama "
+"sama di dalam <i>%7</i>.<p><kuat>Adakah anda ingin %3 mengalihkan fail mel "
+"sekarang?</kuat></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Folder <i>%4</i> wujud. %1 sekarang gunakan folder <i>%5</i> "
-"untuk mesejnya. %2 boleh membantu anda mengalihkan kandungan <i>%6</i> "
-"ke dalam folder."
-"<p><kuat>Adakah anda ingin %3 mengalihkan fail sekarang?</kuat></qt>"
+"<qt>Folder <i>%4</i> wujud. %1 sekarang gunakan folder <i>%5</i> untuk "
+"mesejnya. %2 boleh membantu anda mengalihkan kandungan <i>%6</i> ke dalam "
+"folder.<p><kuat>Adakah anda ingin %3 mengalihkan fail sekarang?</kuat></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Hijrahkan Fail Mel?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail menemui ralat fatal dan akan ditamatkan sekarang"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8682,11 +8522,11 @@ msgstr ""
 "Ralat itu ialah:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Kosongkan sampah"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Anda pasti ingin mengosongkan folder sampah bagi semua akaun?"
 
@@ -8763,8 +8603,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Mel baru telah sampai</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8802,11 +8641,11 @@ msgstr "Anda pasti ingin mengosongkan folder sampah?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Anda pasti ingin mengalihkan semua mesej dari folder <b>%1</b> "
-"ke tong sampah?</qt>"
+"<qt>Anda pasti ingin mengalihkan semua mesej dari folder <b>%1</b> ke tong "
+"sampah?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8832,12 +8671,12 @@ msgstr "Hapuskan Folder"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Anda pasti ingin menghapuskan folder carian <b>%1</b>"
-"? Jika ya, mesej yang dipaparkan di dalamnya tidak akan dihapus, kerana ia akan "
-"distorkan dalam folder lain.</qt>"
+"<qt>Anda pasti ingin menghapuskan folder carian <b>%1</b>? Jika ya, mesej "
+"yang dipaparkan di dalamnya tidak akan dihapus, kerana ia akan distorkan "
+"dalam folder lain.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8850,45 +8689,49 @@ msgstr "<qt>Anda pasti ingin  menghapuskan folder kosong <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Anda pasti ingin  menghapuskan folder kosong <b>%1</b> "
-"dan semua subfoldernya? Subfolder tersebut mungkin tidak kosong dan "
-"kandungannya juga akan dibuang.</qt>"
+"<qt>Anda pasti ingin  menghapuskan folder kosong <b>%1</b> dan semua "
+"subfoldernya? Subfolder tersebut mungkin tidak kosong dan kandungannya juga "
+"akan dibuang.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Anda pasti ingin menghapuskan folder <b>%1</b>, membuang kandungannya?</qt>"
+"<qt>Anda pasti ingin menghapuskan folder <b>%1</b>, membuang kandungannya?</"
+"qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Anda pasti ingin menghapuskan folder <b>%1</b> dan semua subfoldernya, "
 "membuang kandungannya?</qt>"
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Dihapuskan"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Anda pasti ingin memuat semua cache IMAP?\n"
-"Ini akan membuang semua perubahan setempat yang dilakukan  kepada folder IMAP "
-"anda."
+"Ini akan membuang semua perubahan setempat yang dilakukan  kepada folder "
+"IMAP anda."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8896,12 +8739,13 @@ msgstr "Anda pasti ingin meluputkan semua mesej lama?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Penggunaan HTML dalam mel ini akan membuat anda lebih terdedah kepada  \"spam\" "
-"dan mungkin meningkatkan kemungkinan sistem dieksploit dari segi keselamatan."
+"Penggunaan HTML dalam mel ini akan membuat anda lebih terdedah kepada  \"spam"
+"\" dan mungkin meningkatkan kemungkinan sistem dieksploit dari segi "
+"keselamatan."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8914,12 +8758,12 @@ msgstr "Gunakan HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Memuatkan rujukan luaran dalam mel html akan membuat anda lebih rentan terhadap "
-" \"spam\" dan mungkin meningkatkan kemungkinan sistem diekploitasi dari segi "
-"keselamatan."
+"Memuatkan rujukan luaran dalam mel html akan membuat anda lebih rentan "
+"terhadap  \"spam\" dan mungkin meningkatkan kemungkinan sistem diekploitasi "
+"dari segi keselamatan."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8935,12 +8779,12 @@ msgstr "Tapis dalam Senarai Mel %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Jawapan Luar Pejabat KMail dari segi fungsi bergantung pada penapisan pelayan "
-"sebelah. Anda belum kofigur pelayan  IMAP untuk ini.\n"
+"Jawapan Luar Pejabat KMail dari segi fungsi bergantung pada penapisan "
+"pelayan sebelah. Anda belum kofigur pelayan  IMAP untuk ini.\n"
 "Anda boleh melakukan ini pada tab \"Menapis\" konfigurasi akaun IMAP. "
 
 #: kmmainwidget.cpp:1743
@@ -8956,9 +8800,11 @@ msgstr "Tidak dapat memulakan pengurus sijil; semak pemasangan anda."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Tidak dapat memulakan pemapar Log GnuPG  (kwatchgnupg); semak pemasangan anda."
+"Tidak dapat memulakan pemapar Log GnuPG  (kwatchgnupg); semak pemasangan "
+"anda."
 
 #: kmmainwidget.cpp:2508
 #, fuzzy
@@ -9295,8 +9141,7 @@ msgstr "Simpan L&ampiran..."
 msgid "Appl&y All Filters"
 msgstr "&Gunakan Semua Penapis"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Gunakan Penapis"
@@ -9410,7 +9255,6 @@ msgstr "Mesej &Belum Baca Seterusnya"
 msgid "Go to the next unread message"
 msgstr "Pergi ke mesej belum baca seterusnya"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Mesej &Sebelumnya"
@@ -9553,25 +9397,26 @@ msgstr "Memulakan..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Mesej ini mengandungi permintaan untuk mengembalikan pemberitahuan terima "
 "mesej.\n"
-"Anda boleh sama ada abaikan atau biarkan KMail menghantar respons \"dinafikan\" "
-"atau respons normal."
+"Anda boleh sama ada abaikan atau biarkan KMail menghantar respons \"dinafikan"
+"\" atau respons normal."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima mesej.\n"
+"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima "
+"mesej.\n"
 "Ia mengandungi panduan pemprosesan yang ditanda sebagai \"dituntut\", tetapi "
 "tidak diketahui oleh KMail.\n"
 "Anda boleh sama ada abaikan permintaan ini atau biarkan KMail menghantar "
@@ -9579,44 +9424,48 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima mesej,\n"
-"tetapi pemeritahuan tersebut perlu dihantar kepada lebih daripada satu alamat.\n"
-"Anda boleh sama ada abaikan permintaan ini atau biarkan KMail menghantar respon "
-"\"ditolak\" atau respons normal."
+"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima "
+"mesej,\n"
+"tetapi pemeritahuan tersebut perlu dihantar kepada lebih daripada satu "
+"alamat.\n"
+"Anda boleh sama ada abaikan permintaan ini atau biarkan KMail menghantar "
+"respon \"ditolak\" atau respons normal."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima mesej,\n"
+"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima "
+"mesej,\n"
 "tetapi tiada laluan kembali diset.\n"
-"Anda boleh sama ada abaikan permintaan ini atau biar KMail menghantar respons "
-"\"ditolak\" atau respons normal."
+"Anda boleh sama ada abaikan permintaan ini atau biar KMail menghantar "
+"respons \"ditolak\" atau respons normal."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima mesej,\n"
+"Mesej ini mengandungi permintaan untuk menghantar pemberitahuan terima "
+"mesej,\n"
 "tetapi alamat laluan balik berbeza dengan alamat yang diminta sebagai tempat "
 "pemberitahuan terima.\n"
-"Anda boleh sama ada abaikan permintaan ini atau biar KMail menghantar respons "
-"\"ditolak\" atau respons normal."
+"Anda boleh sama ada abaikan permintaan ini atau biar KMail menghantar "
+"respons \"ditolak\" atau respons normal."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9642,17 +9491,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Resit:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Lampiran: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Paparkan lampiran seperti yang dicadangkan oleh penghantar"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9702,47 +9551,39 @@ msgstr "Ciri Bahagian Mesej"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jenis <em>MIME</em> fail:</p>"
-"<p>dalam keadaan normal, anda tidak perlu menyentuh seting ini, kerana jenis "
-"fail telah disemak secara automatik; tetapi, kadang-kadang, %1 mungkin tidak "
-"mengesan jenis sebenar -- anda boleh membetulkannya di sini.</p></qt>"
+"<qt><p>Jenis <em>MIME</em> fail:</p><p>dalam keadaan normal, anda tidak "
+"perlu menyentuh seting ini, kerana jenis fail telah disemak secara "
+"automatik; tetapi, kadang-kadang, %1 mungkin tidak mengesan jenis sebenar -- "
+"anda boleh membetulkannya di sini.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Saiz bahagian:</p>"
-"<p>kadang-kadang, %1 hanya memberikan saiz anggaran di sini, kerana mengira "
-"saiz secara tepat mengambil masa yang terlalu lama; jika kes ini berlaku, ia "
-"boleh dilihat dengan menambah \"(anggaran.)\" kepada saiz yang dipaparkan.</p>"
-"</qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
+msgstr ""
+"<qt><p>Saiz bahagian:</p><p>kadang-kadang, %1 hanya memberikan saiz anggaran "
+"di sini, kerana mengira saiz secara tepat mengambil masa yang terlalu lama; "
+"jika kes ini berlaku, ia boleh dilihat dengan menambah \"(anggaran.)\" "
+"kepada saiz yang dipaparkan.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bahagian nama fail:</p>"
-"<p>walaupun ini mempiawaikan nama fail terlampir, ia tidak menyatakan mana satu "
-"fail yang hendak dilampirkan; lebih tepat, ia mencadangkan nama fail yang akan "
-"digunakan oleh ejen mel penerima  apabila menyimpan bahagian tersebut ke "
-"cakera.</p></qt>"
+"<qt><p>Bahagian nama fail:</p><p>walaupun ini mempiawaikan nama fail "
+"terlampir, ia tidak menyatakan mana satu fail yang hendak dilampirkan; lebih "
+"tepat, ia mencadangkan nama fail yang akan digunakan oleh ejen mel penerima  "
+"apabila menyimpan bahagian tersebut ke cakera.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9750,17 +9591,15 @@ msgstr "&Huraian:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Huraian bahagian:</p>"
-"<p>ini hanya huraian maklumat tentang bahagian, seperti Subjek sebagai mesej "
-"keseluruhan; kebanyakan ejen mel akan memaparkan maklumat ini dalam prapapar "
-"mesej di samping ikon lampiran.</p></qt>"
+"<qt><p>Huraian bahagian:</p><p>ini hanya huraian maklumat tentang bahagian, "
+"seperti Subjek sebagai mesej keseluruhan; kebanyakan ejen mel akan "
+"memaparkan maklumat ini dalam prapapar mesej di samping ikon lampiran.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9768,22 +9607,20 @@ msgstr "&Pengekodan:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pengekodan pengangkutan bahagian ini:</p>"
-"<p>biasanya, tidak perlu ditukar, kerana %1 akan menggunakan pengekodan piawai "
-"yang baik, bergantung pada jenis MIME; bagaimanapun, kadang-kadang, anda boleh "
-"mengurangkan saiz mesej yang terhasil secara signifikan, contohnya,  jika fail  "
-"PostScript tidak mengandungi data binari, tetapi terdiri daripada teks tulin -- "
-"dalam kes ini, memilih \"petikan boleh cetak\" berbanding  \"asas 64\" piawai "
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Pengekodan pengangkutan bahagian ini:</p><p>biasanya, tidak perlu "
+"ditukar, kerana %1 akan menggunakan pengekodan piawai yang baik, bergantung "
+"pada jenis MIME; bagaimanapun, kadang-kadang, anda boleh mengurangkan saiz "
+"mesej yang terhasil secara signifikan, contohnya,  jika fail  PostScript "
+"tidak mengandungi data binari, tetapi terdiri daripada teks tulin -- dalam "
+"kes ini, memilih \"petikan boleh cetak\" berbanding  \"asas 64\" piawai "
 "boleh menjimatkan 25% saiz mesej yang terhasil.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
@@ -9792,21 +9629,17 @@ msgstr "Cadangkan paparan &automatik"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Semak opsyen ini jika anda ingin mencadangkan supaya penerima memilih "
-"paparan automatik (dalam baris)  bahagian ini dalam prapapar mesej, dan bukan "
-"paparan ikon piawai;</p>"
-"<p>secara teknikal, ini dilakukan dengan mengeset medan pengepala <em>"
-"Susunan Kandungan</em> bahagian ini kepada \"dalam baris\", bukan \"lampiran\" "
-"piawai.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Semak opsyen ini jika anda ingin mencadangkan supaya penerima memilih "
+"paparan automatik (dalam baris)  bahagian ini dalam prapapar mesej, dan "
+"bukan paparan ikon piawai;</p><p>secara teknikal, ini dilakukan dengan "
+"mengeset medan pengepala <em>Susunan Kandungan</em> bahagian ini kepada "
+"\"dalam baris\", bukan \"lampiran\" piawai.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9814,15 +9647,13 @@ msgstr "&Tandatangan bahagian ini"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Semak opsyen ini jika anda ingin bahagian mesej ditandatangani;</p>"
-"<p>tandatangan akan dibuat dengan kekunci yang anda sekutukan dengan identiti "
-"pilihan semasa.</p></qt>"
+"<qt><p>Semak opsyen ini jika anda ingin bahagian mesej ditandatangani;</"
+"p><p>tandatangan akan dibuat dengan kekunci yang anda sekutukan dengan "
+"identiti pilihan semasa.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9830,13 +9661,11 @@ msgstr "Sulit&kan bahagian ini"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Semak opsyen ini jika anda ingin bahagian mesej disulitkan;</p>"
-"<p>bahagian tersebut akan di sulitkan untuk penerima mesej ini</p></qt>"
+"<qt><p>Semak opsyen ini jika anda ingin bahagian mesej disulitkan;</"
+"p><p>bahagian tersebut akan di sulitkan untuk penerima mesej ini</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9850,15 +9679,12 @@ msgstr "Penapis POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Mesej yang hendak ditapis ditemui dalam akaun POP: <b>%1</b>"
-"<p>Mesej yang dipaparkan melebihi had saiz maksimum yang anda takrifkan untuk "
-"akaun ini."
+"Mesej yang hendak ditapis ditemui dalam akaun POP: <b>%1</b><p>Mesej yang "
+"dipaparkan melebihi had saiz maksimum yang anda takrifkan untuk akaun ini."
 "<br>Anda boleh memilih apa yang ingin dilakukan ke atasnya dengan menyemak "
 "butang yang sesuai.."
 
@@ -9873,8 +9699,8 @@ msgstr "Mesej Ditapis dengan Set Peraturan: tiada"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Paparkan mesej yang dipadankan dengan set peraturan dan ditandakan 'Muat turun' "
-"atau 'Hapuskan'"
+"Paparkan mesej yang dipadankan dengan set peraturan dan ditandakan 'Muat "
+"turun' atau 'Hapuskan'"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10117,35 +9943,34 @@ msgstr "Pelanggan e-mel untuk Persekitaran K Desktop"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10153,18 +9978,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Selamat datang ke KMail %1</h2>"
-"<p>KMail adalah pelanggan e-mel persekitaran  K Desktop. Ia direka bentuk "
-"serasi sepenuhnya dengan piawai penghantaran/penerimaan e-mel  MIME, SMTP, POP3 "
-"dan IMAP.</p>\n"
-"<ul>"
-"<li>KMail mempunyai banyak ciri berpengaruh yang diperincikan dalam <a "
+"<h2 style='margin-top: 0px;'>Selamat datang ke KMail %1</h2><p>KMail adalah "
+"pelanggan e-mel persekitaran  K Desktop. Ia direka bentuk serasi sepenuhnya "
+"dengan piawai penghantaran/penerimaan e-mel  MIME, SMTP, POP3 dan IMAP.</p>\n"
+"<ul><li>KMail mempunyai banyak ciri berpengaruh yang diperincikan dalam <a "
 "href=\"%2\">dokumentasi</a></li>\n"
-"<li>Laman utama KMail <a href=\"%3\">/A> menawarkan maklumat tentang versi baru "
-"KMail</li></ul>\n"
+"<li>Laman utama KMail <a href=\"%3\">/A> menawarkan maklumat tentang versi "
+"baru KMail</li></ul>\n"
 "%8\n"
-"<p>Beberapa ciri baru keluaran KMail ini termasuk (berbanding dengan KMail %4, "
-"yang sebahagian daripada TDE %5):</p>\n"
+"<p>Beberapa ciri baru keluaran KMail ini termasuk (berbanding dengan KMail "
+"%4, yang sebahagian daripada TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10173,15 +9996,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Pasukan The KMail </p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10227,7 +10048,8 @@ msgstr "Paparkan Lampiran: %1"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "_n: [KMail: Lampiran mengandungi data binari. Sedang cuba memaparkan aksara "
@@ -10249,8 +10071,8 @@ msgid ""
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 "Buka lampiran '%1'?\n"
-"Ambil perhatian bahawa membuka lampiran mungkin menyebabkan keselamatan sistem "
-"berkompromi."
+"Ambil perhatian bahawa membuka lampiran mungkin menyebabkan keselamatan "
+"sistem berkompromi."
 
 #: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
@@ -10258,12 +10080,14 @@ msgstr "Buka Lampiran?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10285,6 +10109,58 @@ msgstr "(padankan dengan mana-mana daripada yang berikut)"
 msgid "(match all of the following)"
 msgstr "(padankan dengan semua yang berikut)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Baca"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Lama"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Dihapuskan"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Dijawab"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Diperpanjangkan"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Dibaris gilir"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Dihantar"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Diawasi"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Diabaikan"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Tugasan"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Ada lampiran"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10364,26 +10240,26 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Ralat kritikal: Tidak dapat memproses mel yang dihantar (kehabisan ruang "
-"?)Mengalihkan mesej gagal ke folder \"mel dihantar\"."
+"Ralat kritikal: Tidak dapat memproses mel yang dihantar (kehabisan "
+"ruang ?)Mengalihkan mesej gagal ke folder \"mel dihantar\"."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Gagal mengalihkan mesej  \"%1\" dari \"peti keluar\" ke folder \"mel dihantar\" "
-"\n"
-"Mungkin kurang ruang pada cakera atau keizinan tulis. Betulkan masalah tersebut "
-"dan alihkan mesej secara manual."
+"Gagal mengalihkan mesej  \"%1\" dari \"peti keluar\" ke folder \"mel dihantar"
+"\" \n"
+"Mungkin kurang ruang pada cakera atau keizinan tulis. Betulkan masalah "
+"tersebut dan alihkan mesej secara manual."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Mesej tidak dapat dihantar tanpa menyatakan alamat penghantar.\n"
 " Setkan alamat e-mail identiti '%1' di dalam bahagian Identiti dialog "
@@ -10412,8 +10288,8 @@ msgstr "Memulakan proses penghantar..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Anda memilih untuk menghantar semua e-mel dibaris gilir menggunakan "
 "pengangkutan  ternyahsulit, anda ingin meneruskannya?"
@@ -10441,8 +10317,9 @@ msgstr "Gagal menghantar (beberapa) mesej baris gilir"
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10459,21 +10336,17 @@ msgstr "Penghantaran dihenti paksa."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Penghantaran gagal:</p>"
-"<p>%1</p>"
-"<p>Mesej akan tinggal di dalam folder 'peti keluar' sehingga masalah dibetulkan "
-"(misalnya alamat rosak) ataupun sehingga mesej dikeluarkan dari folder 'peti "
-"keluar'.</p>"
-"<p>Protokol pengangkutan berikut telah digunakan:  %2</p>"
-"<p>Anda ingin terus menghantar mesej yang selebihnya?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Penghantaran gagal:</p><p>%1</p><p>Mesej akan tinggal di dalam folder "
+"'peti keluar' sehingga masalah dibetulkan (misalnya alamat rosak) ataupun "
+"sehingga mesej dikeluarkan dari folder 'peti keluar'.</p><p>Protokol "
+"pengangkutan berikut telah digunakan:  %2</p><p>Anda ingin terus menghantar "
+"mesej yang selebihnya?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10491,16 +10364,17 @@ msgstr "&Henti Paksa Penghantaran"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Penghantaran gagal:\n"
 "%1\n"
 "Mesej akan tinggal di dalam folder 'peti keluar' sehingga masalah dibetulkan "
-"(misalnya alamat r osak) ataupun sehingga mesej dikeluarkan dari folder 'peti "
-"keluar'.\n"
+"(misalnya alamat r osak) ataupun sehingga mesej dikeluarkan dari folder "
+"'peti keluar'.\n"
 "Protokol pengangkutan berikut telah digunakan:\n"
 " %2"
 
@@ -10519,7 +10393,8 @@ msgid ""
 msgstr ""
 "Penghantaran gagal:\n"
 "%1\n"
-"Mesej akan tinggal  di dalam folder 'peti keluar' dan akan di hantar semula.\n"
+"Mesej akan tinggal  di dalam folder 'peti keluar' dan akan di hantar "
+"semula.\n"
 "Keluarkan ia dari kotak tersebut jika anda tidak mahu ia dihantar semula.\n"
 "Protokol pengangkutan berikut telah digunakan:\n"
 "  %2"
@@ -10536,44 +10411,44 @@ msgstr "Hantar mel keluar secara tak normal."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Anda perlu memberikan nama pengguna dan kata laluan untuk menggunakan pelayan "
-"SMTP ini."
+"Anda perlu memberikan nama pengguna dan kata laluan untuk menggunakan "
+"pelayan SMTP ini."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"Nampaknya %1  telah berjalan di paparan yang lain dalam mesin ini. Menjalankan "
-"%2 lebih dari sekali boleh menyebabkan kehilangan mel. Anda tidak sepatutnya "
-"memulakan %1 kecuali anda yakin ia belum berjalan."
+"Nampaknya %1  telah berjalan di paparan yang lain dalam mesin ini. "
+"Menjalankan %2 lebih dari sekali boleh menyebabkan kehilangan mel. Anda "
+"tidak sepatutnya memulakan %1 kecuali anda yakin ia belum berjalan."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"Nampaknya %1 telah berjalan di paparan lain dalam mesin ini. Menjalankan %1 dan "
-"%2 secara serentak boleh menyebabkan mel hilang. Anda tidak sepatutnya "
+"Nampaknya %1 telah berjalan di paparan lain dalam mesin ini. Menjalankan %1 "
+"dan %2 secara serentak boleh menyebabkan mel hilang. Anda tidak sepatutnya "
 "memulakan %2 kecuali anda pasti bahawa %1 tidak berjalan."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"Nampaknya %1 telah berjalan di %2. Menjalankan %1 lebih daripada sekali boleh "
-"menyebabkan mel hilang. Anda tidak sepatutnya memulakan %1 di komputer ini "
-"kecuali yakin  ia tidak berjalan di %2."
+"Nampaknya %1 telah berjalan di %2. Menjalankan %1 lebih daripada sekali "
+"boleh menyebabkan mel hilang. Anda tidak sepatutnya memulakan %1 di komputer "
+"ini kecuali yakin  ia tidak berjalan di %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "Nampaknya %1 telah berjalan di %3. Menjalankan %1 dan %2 serentak boleh "
 "menyebabkan mel hilang. Anda tidak sepatutnya memulakan  %2 di komputer ini "
@@ -10588,6 +10463,10 @@ msgstr "Mulakan %1"
 msgid "Exit"
 msgstr "Keluar"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Mesej Baru Dalam"
@@ -10614,12 +10493,13 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"Tiada TDEWallet. Sangat digalakkan menggunakan TDEWallet untuk menguruskan kata "
-"laluan.\n"
+"Tiada TDEWallet. Sangat digalakkan menggunakan TDEWallet untuk menguruskan "
+"kata laluan.\n"
 "Bagaimanapun, kata laluan boleh distor dalam fail konfigurasi KMail. Kata  "
 "laluan distor dalam format keliru, tetapi ini tidak boleh dianggap selamat "
 "daripada penyahsulitan jika fail konfigurasi dapat diakses. \n"
@@ -10692,9 +10572,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Arahan untuk dijalankan setempat sebelum menghantar e-mel. Ia boleh digunakan "
-"untuk mengeset, contohnya, terowong ssh. Biarkan ia kosong jika tiada arahan "
-"yang sepatutnya dijalankan."
+"Arahan untuk dijalankan setempat sebelum menghantar e-mel. Ia boleh "
+"digunakan untuk mengeset, contohnya, terowong ssh. Biarkan ia kosong jika "
+"tiada arahan yang sepatutnya dijalankan."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10702,8 +10582,8 @@ msgstr "Pelayan &perlukan pengesahan"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Semak opsyen ini jika pelayan SMTP anda perlukan pengesahan sebelum menerima "
 "mel. Ini dikenal sebagai 'SMPT autentik' atau ringkasanya ASMTP."
@@ -10726,15 +10606,13 @@ msgstr "Han&tar nama hos langganan kepada pelayan"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Semak opsyen ini supaya KMail menggunakan nama hos langganan semasa "
-"memperkenalkan dirinya kepada pelayan mel. "
-"<p> Ini berguna semasa nama hos sistem tidak diset dengan betul atau untuk "
-"melindungkan nama sebenar hos. "
+"memperkenalkan dirinya kepada pelayan mel. <p> Ini berguna semasa nama hos "
+"sistem tidak diset dengan betul atau untuk melindungkan nama sebenar hos. "
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10765,8 +10643,8 @@ msgstr "Fail setempat sahaja dibenarkan."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Medan Hos tidak boleh kosong. Masukkan nama atau alamat IP pelayan SMTP."
 
@@ -10780,10 +10658,10 @@ msgstr "Ralat semasa menyenaraikan folder %1:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10855,8 +10733,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail tidak dapat mengesan senarai mel dalam folder ini. Isikan alamat secara "
-"manual."
+"KMail tidak dapat mengesan senarai mel dalam folder ini. Isikan alamat "
+"secara manual."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -11013,35 +10891,27 @@ msgstr "&Edit Mesej"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Maklumat penstrukturan yang dikembalikan oleh plugin Crypto  tidak dapat "
-"diproses dengan betul; mungkin plugin rosak.</p>"
-"<p>Hubungi pentadbir sistem anda.</p></qt>"
+"<qt><p>Maklumat penstrukturan yang dikembalikan oleh plugin Crypto  tidak "
+"dapat diproses dengan betul; mungkin plugin rosak.</p><p>Hubungi pentadbir "
+"sistem anda.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>plugin Crypto aktif tidak ditemui dan kod OpenPGP binaan dalam tidak "
-"berjalan dengan baik.</p>"
-"<p>Anda boleh melakukan dua perkara untuk mengubah keadaan ini:</p>"
-"<ul>"
-"<li><em>sama ada</em> aktifkan plugin menggunakan seting dialog plugin ->"
-"Konfigur KMail->.</li>"
-"<li><em>atau</em> nyatakan seting OpenPGP  tradisi atas identiti dialog yang "
-"sama->Tab lanjutan.</li></ul>"
+"berjalan dengan baik.</p><p>Anda boleh melakukan dua perkara untuk mengubah "
+"keadaan ini:</p><ul><li><em>sama ada</em> aktifkan plugin menggunakan seting "
+"dialog plugin ->Konfigur KMail->.</li><li><em>atau</em> nyatakan seting "
+"OpenPGP  tradisi atas identiti dialog yang sama->Tab lanjutan.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11053,8 +10923,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -11069,14 +10939,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Format mesej kripto OpenPGP dalam baris tidak menyokong penyulitan atau "
@@ -11102,8 +10972,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Hasil pemeriksaan keutamaan tandatangan penerima menunjukkan anda akan ditanya "
-"sama ada ingin menandatangani mesej ini atau tidak.\n"
+"Hasil pemeriksaan keutamaan tandatangan penerima menunjukkan anda akan "
+"ditanya sama ada ingin menandatangani mesej ini atau tidak.\n"
 "Tandatangan mesej ini?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11133,8 +11003,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Anda meminta untuk menandatangani mesej ini, tetapi tiada kekunci tandatangan "
-"yang sah dikonfigur untuk identiti ini."
+"Anda meminta untuk menandatangani mesej ini, tetapi tiada kekunci "
+"tandatangan yang sah dikonfigur untuk identiti ini."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11151,8 +11021,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Sebahagian mesej ini tidak akan ditandatangan.\n"
-"Menghantar mesej yang hanya sebahagian ditandatangani mungkin melanggar dasar "
-"tapak.\n"
+"Menghantar mesej yang hanya sebahagian ditandatangani mungkin melanggar "
+"dasar tapak.\n"
 "Tandatangan semua bahagian?"
 
 #: messagecomposer.cpp:827
@@ -11191,12 +11061,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Hasil pemeriksaan keutamaan penyulitan penerima menunjukkan anda akan ditanya "
-"sama ada ingin menyulitkan mesej ini atau tidak.\n"
+"Hasil pemeriksaan keutamaan penyulitan penerima menunjukkan anda akan "
+"ditanya sama ada ingin menyulitkan mesej ini atau tidak.\n"
 "Sulitkan mesej?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11229,8 +11099,9 @@ msgstr "Ja&ngan Sulitkan"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Anda meminta untuk menyulitkan mesej ini dan menyulitkan satu salinan untuk  "
 "anda sendiri, tetapi tiada kekunci penyulitan sah yang boleh dipercayai "
@@ -11243,8 +11114,8 @@ msgstr "Hantar Tanpa Disulitkan?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Sebahagian mesej ini tidak akan disulitkan.\n"
@@ -11272,51 +11143,45 @@ msgstr "&Sulitkan Semua Bahagian"
 msgid "Unencrypted Message Warning"
 msgstr "Amaran Mesej Tak Disulitkan"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ralat: Hujung belakang tidak menghantar semula sebarang data yang dikod.</p>"
-"<p>Laporkan pepijat ini:"
-"<br>%2</p></qt>"
+"<qt><p>Ralat: Hujung belakang tidak menghantar semula sebarang data yang "
+"dikod.</p><p>Laporkan pepijat ini:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Bukan semua aksara sesuai dengan pengekodan yang dipilih."
-"<br>"
-"<br>Teruskan menghantar mesej?</qt>"
+"<br><br>Teruskan menghantar mesej?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Beberapa aksara akan hilang"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Aksara Hilang"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Tukar Pengekodan"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Mesej tidak dapat ditandatangani, kerana hujung belakang yang dipilih tidak "
 "menyokong tandatangan;  Ini tidak sepatutnya berlaku, laporkan pepijat ini."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11324,36 +11189,37 @@ msgstr ""
 "Mesej tidak dapat ditandatangani, kerana hujung belakang yang dipilih tidak "
 "menyokong tandatangan;  Ini tidak sepatutnya berlaku, laporkan pepijat ini."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Mesej ini tidak dapat disulitkan, kerana hujung belakang yang dipilih tidak "
 "menyokong penyulitan; Ini sepatutnya tidak berlaku, laporkan pepijat ini."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Mesej ini tidak dapat ditandatangan dan disulitkan, kerana hujung belakang yang "
-"dipilih tidak menyokong gabungan tandatangan dan penyulitan; ini tidak "
+"Mesej ini tidak dapat ditandatangan dan disulitkan, kerana hujung belakang "
+"yang dipilih tidak menyokong gabungan tandatangan dan penyulitan; ini tidak "
 "sepatutnya berlaku, laporkan pepijat ini."
 
 #: newfolderdialog.cpp:59
@@ -11375,15 +11241,15 @@ msgstr "&Format peti mel"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Pilih sama ada anda ingin menstor mesej dalam folder ini sebagai satu fail "
-"setiap mesej (maildir) atau sebagai satu fail besar (mbox). KMail menggunakan "
-"maildir secara piawai dan ini jarang-jarang perlu diubah.  Jika anda tidak "
-"pasti, biarkan opsyen ini dalam keadaan asal."
+"setiap mesej (maildir) atau sebagai satu fail besar (mbox). KMail "
+"menggunakan maildir secara piawai dan ini jarang-jarang perlu diubah.  Jika "
+"anda tidak pasti, biarkan opsyen ini dalam keadaan asal."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11392,8 +11258,8 @@ msgstr "Folder &mengandungi:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Pilih sama ada anda ingin folder baru digunakan untuk storan mel atau untuk "
 "penstoran item groupware seperti tugasan atau nota. Piawai adalah mel. Jika "
@@ -11435,8 +11301,7 @@ msgstr "Tanda tangan menghasilkan keputusan berbeza"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Tiada data teks kosong dikembalikan oleh enjin kripto."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11465,8 +11330,8 @@ msgstr "Tiada %1 plug-in ditemui."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Mesej telah ditandatangani, tetapi kesahihan tanda tangan tidak dapat "
 "disahkan.<br />Sebab: %1"
@@ -11505,27 +11370,27 @@ msgstr "Plugin Kripto \"%1\" tidak dapat menyahsulit mesej."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Perhatian:</b> Mesej HTML ini mungkin mengandungi  rujukan luar kepada imej "
-"dll. Atas sebab keselamatan/privasi, rujukan luar tidak dimuatkan. Jika anda "
-"percaya kepada penghantar mesej ini, anda boleh memuatkan rujukan luar untuk "
-"mesej ini <a href=\"kmail:loadExternal\">dengan mengklik di sini</a>."
+"<b>Perhatian:</b> Mesej HTML ini mungkin mengandungi  rujukan luar kepada "
+"imej dll. Atas sebab keselamatan/privasi, rujukan luar tidak dimuatkan. Jika "
+"anda percaya kepada penghantar mesej ini, anda boleh memuatkan rujukan luar "
+"untuk mesej ini <a href=\"kmail:loadExternal\">dengan mengklik di sini</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Perhatian:</b> Ini adalah mesej HTML. Atas sebab keselamatan, hanya kod "
-"mentah HTML dipaparkan. Jika anda percaya kepada penghantar mesej, anda boleh "
-"aktifkan paparan HTML terformat untuk mesej ini <a href=\"kmail:showHTML\">"
-"dengan mengklik di sini</a>."
+"mentah HTML dipaparkan. Jika anda percaya kepada penghantar mesej, anda "
+"boleh aktifkan paparan HTML terformat untuk mesej ini <a href=\"kmail:"
+"showHTML\">dengan mengklik di sini</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11782,8 +11647,8 @@ msgstr "distor:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Tiada alamat mel yang distor dalam %1 digunakan untuk tandatangan, jadi "
 "perbandingan dengan alamat penghantar %2 tidak boleh dibuat."
@@ -11902,15 +11767,16 @@ msgstr "Mesej Ralat Hamba Kio"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Pelayan POP3 anda tidak menyokong arahan UIDL: arahan ini perlu memastikan mana "
-"satu mel pada pelayan KMail yang sudah dilihat;\n"
-"Oleh itu, cirian untuk membiarkan mel pada pelayan tidak akan berfungsi dengan "
-"betul."
+"Pelayan POP3 anda tidak menyokong arahan UIDL: arahan ini perlu memastikan "
+"mana satu mel pada pelayan KMail yang sudah dilihat;\n"
+"Oleh itu, cirian untuk membiarkan mel pada pelayan tidak akan berfungsi "
+"dengan betul."
 
 #: popaccount.cpp:752
 #, fuzzy
@@ -11933,7 +11799,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Mengutip mesej %1 dari %2 (%3 daripada %4 KB) dari %5 (%6 KB baki dalam "
 "pelayan)."
@@ -11953,1860 +11820,14 @@ msgstr "Respons Tak Sah Dari Pelayan"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Pelayan anda tidak menyokong arahan TOP. Oleh itu, tidak mungkin dapat mengutip "
-"pengepala e-mel besar terlebih dahulu sebelum ia dimuat turun."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Pergi"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "F&older"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mesej"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Perpanjangkan"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Bar alat HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Menandatangan"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Tandatangan mesej secara automatik"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Jika opsyen ini diaktifkan, semua mesej yang anda hantar akan ditandatangan "
-"secara piawai; penandatanganan masih boleh dinyahaktifkan untuk setiap mesej "
-"secara individu."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Penyulitan"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Jika opsyen ini diaktifkan, mesej/fail bukan sahaja akan disulitkan dengan "
-"kekunci umum penerima, tetapi juga dengan kekunci anda. Ini membolehkan anda "
-"menyahsulit mesej/fail pada masa yang lain. Secara keseluruhannya, ini adalah "
-"idea yang baik."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Paparkan teks yang d&itandatangan/disultikan selepas menggubah"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Jika opsyen ini diaktifkan, teks yang ditandatangani/disulitkan akan dipaparkan "
-"dalam tetingkap berasingan, membolehkan anda tahu bagaimana rupanya sebelum "
-"dihantar. Ini idea yang baik apabila anda  ingin memastikan bahawa sistem "
-"penyullitan ini berfungsi dengan baik."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Stor mesej yang dihantar dalam bentuk &disulitkan"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Semak untuk menstor mesej dalam bentuk sulit"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Stor Mesej Disulitkan</h1>\n"
-"Jika kotak ini disemak, mesej yang dihantar distor dalam keadaan disulitkan "
-"seperti keadaannya semasa dihantar. Ini tidak digalakkan, kerana anda tidak "
-"akan dapat membaca mesej jika sijil yang diperlukan luput.\n"
-"<p>\n"
-"Bagaimanapun, banyak peraturan setempat yang menuntut anda menghidupkan opsyen "
-"ini. Jika ragu-ragu, semak dengan pentadbir setempat anda.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Sentiasa paparkan kekunci penyulitan &untuk diluluskan."
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Jika opsyen ini diaktifkan, aplikasi akan sentiasa memaparkan senarai kekunci "
-"umum yang anda boleh pilih untuk tujuan penyulitan. Jika ia dimatikan, aplikasi "
-"hanya akan memaparkan dialog jika ia tidak dapat mencari kekunci yang betul "
-"atau jika terdapat beberapa kekunci yang boleh digunakan."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Autosulitkan &mesej apabila boleh dilakukan"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Jika opsyen ini diaktifkan, jika boleh dan jika dikehendaki, setiap mesej yang "
-"dihantar akan disulitkan; penyulitan automatik ini masih boleh dinyahaktifkan "
-"untuk setiap mesej secara berasingan."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Jangan tandatangan/sulitkan apabila menyim&pan sebagai draf"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Ke:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Sk: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Umum"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Jawab Kepada"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Jawab kepada &Semua"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Perpanjangkan"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Jalan pintas:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Gantikan"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Ciri Folder"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Folder memegang satu senarai hantar/terima &mel"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Senaraikan &alamat:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Belum b&aca:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Mesej Akan Luput"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "L&uput selepas:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Luputkan mesej yang telah &dibaca"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Luput &selepas:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Luputkan mesej yang tidak &dibaca"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Hari"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Minggu"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Bulan"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Lanjutan"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identit&i penghantar:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Format &Storan:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Senarai paparan:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Sahkan sijil menggunakan SPS"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Jika opsyen ini dipilih, sijil S/MIME disahkan menggunakan senarai pembatalan "
-"sijil (SPS)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Sahkan sijil secara dalam talian (PSDT)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Jika opsyen ini dipilih, sijil S/MIME disahkan dalam talian menggunakan  "
-"Protokol Status Sijil Dalam Talian (PSDT). Isikan URL pemberi respons PSDT di "
-"bawah."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Pengesahan Sijil Dalam Talian"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL pemberi respons PSDT:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Masukkan alamat pelayan untuk pengesahan dalam talian bagi  sijil (pemberi "
-"respons PSDT di sini. Biasanya URL bermula dengan  http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Tandatangan pemberi respons PSDT:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Abaikan Servis  URL bagi sijil"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Jangan semak dasar sijil"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Menurut piawai, GniPG menggunakan fail ~/.gnupg/policies.txt untuk menyemak "
-"sama ada suatu dasar sijil dibenarkan atau tidak. Jika opsyen ini dipilih, "
-"polisi tidak akan disemak."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Jangan rujuk SPS"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Jika opsyen ini disemak, Senarai Pembatalan Sijil tidak akan digunakan untuk "
-"mengesahkan sijil S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Kutip sijil pengeluar yang hilang"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Jika opsyen ini disemak, sijil  pengeluar yang hilang akan dikutip apabila "
-"perlu  (Ini boleh digunakan untuk kedua-dua kaedah SPS dan PSDT)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Permohonan HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Jangan laksanakan sebarang  permohonan HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Menyahaktifkan seluruh penggunaan HTTP untuk S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Guna proksi ini untuk melaksanakan permohonan HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Guna proksi sistem HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Jika opsyen ini dipilih, nilai proksi  HTTP yang dipaparkan di sebelah kanan "
-"(yang datang dari persekitaran http_proksi) akan digunakan untuk sebarang "
-"permohonan HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Masukkan lokasi proksi HTTP anda di sini. Ia akan digunakan untuk semua "
-"permohonan HTTP berkaitan S/MIME. Sintaks adalah hos:port, contohnya "
-"myproxy.nowhere.com:3128"
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Abaikan Titik Agihan HTTP SPS bagi sijil"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Semasa mencari lokasi suatu SPS, sijil yang hendak diuji biasanya mengandungi "
-"apa yang dikenal sebagai entri \"Titik Agihan SPS\" (TA), yang merupakan "
-"huraian URL  tentang cara mengakses  URL. Entri TA yang pertama ditemui akan "
-"digunakan.  Dengan opsyen ini, semua masukan yang menggunakan skim HTTP  akan "
-"diabaikan semasa mencari TA yang sesuai."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Permohonan LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Jangan laksanakan sebarang permohonan LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Menyahaktifkan penggunaan LDAP untuk S/MIME secara menyeluruh."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Abaikan Titik Agihan LDAP SPS sijil"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Semasa mencari lokasi suatu SPS, sijil yang hendak diuji biasanya mengandungi "
-"apa yang dikenali sebagai entri  \"Titik Agihan SPS\" (TA), yang merupakan "
-"huraian URL tentang cara untuk mengakses URL. Masukan TA yang pertama ditemui "
-"akan digunakan.  Dengan opsyen ini, semua masukan menggunakan skim LDAP akan "
-"diabaikan semasa mencari TA yang sesuai."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Hos primer permohonan LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Memasukkan pelayan LDAP di sini akan membuat semua permohonan LDAP pergi ke "
-"pelayan terlebih dahulu.  Lebih tepat lagi, seting ini menulis tindih sebarang "
-"hos yang dinyatakan dan akan digunakan jika hos dan port telah digugurkan dari "
-"URL. Pelayan  LDAP yang lain akan digunakan hanya jika sambungan ke \"proksi\" "
-"gagal.\n"
-"Sintaks ialah \"HOS\" or \"HOS:PORT\". Jika  PORT digugurkan, port 389 (port "
-"LDAP piawai) digunakan."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "T&ambah..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Set Semula Seting Fon"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "Tidak terhad"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Konfigurasi Tandatangan"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Jawab kepada Pe&nghantar:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Jawab kepada &Semua"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Mesej Diperpanjang"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Beri amaran jika cuba menghantar mesej &tak bertandatangan"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Semak untuk diberi amaran apabila menghantar mesej tak bertandatangan."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Beri amaran Jika Cuba Menghantar Mesej Tak Bertandatangan</h1>\n"
-"Jika kotak ini disemak, anda akan diberi amaran jika cuba menghantar sebahagian "
-"atau seluruh mesej tak bertandatangan .\n"
-"<p>\n"
-"Anda digalakkan membiarkan opsyen ini terbuka untuk ketelusan maksimum.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Beri amaran apabila cuba menghantar mesej yang tak disulitkan"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Semak supaya diberi amaran apabila menghantar mesej tak disulitkan."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Beri amaran apabila cuba menghantar mesej tak disulitkan</h1>\n"
-"Jika kotak ini disemak, anda akan diberi amaran apabila cuba menghantar "
-"sebahagian atau keseluruhan mesej tanpa penyulitan.\n"
-"<p>\n"
-"Anda dinasihatkan membiarkan opsyen ini hidup untuk ketelusan penuh.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Beri amaran jika alamat e-mel &penerima tiada dalam sijil"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Semak untuk diberi amaran jika alamat tiada dalam sijil"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Beri amaran jika alamat e-mel penerima tiada dalam sijil</h1>\n"
-"Jika opsyen telah disemak, amaran dikeluarkan jika alamat e-mel penerima  tidak "
-"terkandung dalam sijil yang digunakan untuk penyulitan.\n"
-"<p>\n"
-"Dicadangkan supaya opsyen ini dibiarkan terbuka untuk keselamatan maksimum.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Beri amaran jika sijil/kekunci akan luput (konfigur ambang di bawah)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Untuk tandatangan"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Untuk penyulitan"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "hari"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Pilih bilangan hari di sini"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"<qt>\n"
-"<h1>Beri Amaran Jika Sijil Tandatangan Luput</h1>\n"
-"Pilih bilangan hari minimum yang sijil tandatangan sepatutnya masih sah tanpa "
-"perlu mengeluarkan amaran.\n"
-"<p>\n"
-"Seting SPHINX yang dicadangkan ialah 14 hari .\n"
-"</qt>"
+"Pelayan anda tidak menyokong arahan TOP. Oleh itu, tidak mungkin dapat "
+"mengutip pengepala e-mel besar terlebih dahulu sebelum ia dimuat turun."
 
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Beri Amaran Jika Sijil Penyulitan Luput</h1>\n"
-"Pilih bilangan hari minimum yang sijil penyulitan sepatutnya sah, tanpa "
-"mengeluarkan amaran.\n"
-"<p>\n"
-"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Beri Amaran Jika Ada Sijil Dalam Rantaian Telah Luput</h1>\n"
-"Pilih bilangan hari minimum untuk  semua sijil dalam rantaian yang sepatutnya "
-"sah, tanpa mengeluarkan amaran.\n"
-"<p>\n"
-"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Beri amaran jika sijil AP luput</h1>\n"
-"Pilih bilangan hari minimum yang sijil AP masih sah tanpa perlu mengeluarkan "
-"amaran.\n"
-"<p>\n"
-"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Beri amaran jika sijil root luput</h1>\n"
-"Pilih bilangan hari minimum yang sijil root sepatutnya masih sah tanpa perlu "
-"mengeluarkan amaran.\n"
-"<p>\n"
-"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Untuk sijil root:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Untuk sijil AP pengantara:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Untuk sijil/kekunci pengguna akhir:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Aktifkan Semula Semua Amaran\"Jangan Tanya Lagi\" "
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Kandungan &folder"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Gantikan"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Gantikan"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Hantar mel baris gilir  untuk semakan mel"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pilih sama ada anda ingin KMail menghantar semua mesej di dalam peti keluar "
-"secara manual atau semua semakan mesej, ataupun anda tidak mahu langsung mesej "
-"dihantar secara automatik. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Folder paling terkini dipilih dalam folder dialog pilihan."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Dasar untuk memapar ikon dulang sistem"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Panjang lebarkan pemberitahuan mel baru"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Jika opsyen ini diaktifkan, untuk setiap folder, bilangan mesej yang baru "
-"sampai  akan dipaparkan di dalam pemberitahuan mel baru; Jika tidak, anda hanya "
-"mendapat mesej ringkas  'Mesej baru sampai'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Nyatakan e&ditor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Guna pengedit l&uaran dan bukannya penggubah"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Aktifkan keberfungsian groupware"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Koyakkan Daripada:/Kepada: pengepala dalam jawapan ke jawapan"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook mempunyai beberapa kekurangan dalam pelaksanaan piawai  "
-"iCalendar; opsyen ini berfungsi sekitar salah satu daripada kekurangan "
-"tersebut. Jika anda menghadapi masalah dengan pengguna Outlook yang gagal "
-"menerima jawapan anda, cuba setkan opsyen ini."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Hantar undangan groupware dalam isi mel"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook mempunyai beberapa kekurangan dalam pelaksanaan piawai "
-"iCalendar; opsyen ini berfungsi sekitar salah satu daripada kekurangan "
-"tersebut. Jika anda menghadapi masalah dengan pengguna Outlook yang gagal "
-"menerima undangan anda, cuba setkan opsyen ini."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Penghantaran undangan automatik"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Jika ini disemak, anda tidak akan nampak tetingkap penggubah mel. Sebaliknya, "
-"semua mel undangan akan dihantar secara automatik. Jika anda ingin melihat mel "
-"sebelum dihantar, nyahtandakan opsyen ini. Bagaimanapun, ambil perhatian bahawa "
-"teks dalam tetingkap penggubah adalah dalam sintaks iKalendar, anda tidak "
-"sepatutnya cuba mengubahnya secara manual."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Mengaktifkan ini membolehkan storan entri dari aplikasi Kontact (KOrganizer, "
-"KAddressBook, dan KNotes.)</p>"
-"<p>Jika anda ingin mengeset opsyen ini, anda juga mesti mengeset aplikasi untuk "
-"menggunakan sumber IMAP; ini dilakukan di pusat kawalan TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Biasanya anda tidak akan ada sebarang sebab untuk melihat folder yang "
-"memuatkan sumber IMAP. Tapi jika anda perlu melihatnya, anda boleh mengesetnya "
-"di sini.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Pilih format storan folder groupware. "
-"<ul>"
-"<li>Format piawai ialah menggunakan ical (untuk folder kalendar) dan kadV "
-"piawai (untuk folder buku alamat). Format ini menjadikan semua ciri Kontact "
-"boleh didapatkan.</li>"
-"<li>Format Kolab XML menggunakan model kebiasaan yang paling padan dengan yang "
-"digunakan dalam Outlook. Format ini memberikan keserasian Outlook yang lebih "
-"tinggi  apabila menggunakan pelayan Kolab atau penyelesaian serasi yang "
-"lain.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Ini memilih induk folder sumber IMAP.</p>"
-"<p>Secara piawai, pelayan  Kolab mengeset peti masuk IMAP sebagai induk.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Ini adalah ID bagi akaun yang memegang folder sumber IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Jika anda mahu mengeset nama folder storan IMAP  ke dalam bahasa tempatan, "
-"anda boleh memilih bahasa berikut.</p>"
-"<p> Ambil perhatian bahawa, satu-satunya sebab untuk melakukan ini adalah untuk "
-"keserasian dengan Microsoft Outlook. Idea ini dianggap tak elok kerana "
-"menyebabkan penukaran bahasa tidak boleh dibuat. </p>"
-"<p>Jadi, jangan set jika tidak ada keperluan.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Nilai ini digunakan untuk membuat keputusan sama ada pengenalan KMail patut "
-"dipaparkan atau tidak."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Bilangan maksimum sambungan setiap hos"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ini boleh digunakan untuk mengehadkan bilangan sambungan per hos semasa "
-"menyemak mel baru. Dalam keadaan piawai, bilangan sambungan adalah tidak terhad "
-"(0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Paparkan edit garisan carian cepat"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Opsyen ini mengaktif atau menyahaktifkan pengeditan baris carian di atas "
-"senarai mesej, yang boleh digunakan untuk mencari maklumat yang dipaparkan "
-"dalam senarai mesej dengan kadar cepat."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Jika boleh, kekalkan set aksara asal apabila menjawab atau memperpanjangkan"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Tambah tandatangan secara a&utomatik"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ingat identiti ini, supaya masih boleh digunakan dalam tetingkap penggubah pada "
-"masa akan datang.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ingat item yang telah dihantar dalam folder ini, supaya masih boleh digunakan "
-"dalam tetingkap penggubah pada masa akan datang."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ingat pengangkut mel ini, supaya masih boleh digunakan dalam tetingkap "
-"penggubah pada masa akan datang."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ingat identiti ini, supaya masih boleh digunakan dalam tetingkap penggubah pada "
-"masa akan datang.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Balut perkataan pada lajur:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Beri amaran jika sijil root luput dalam masa &kurang daripada:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Pasang opsyen ini untuk menjadikan Outlook &#8482; memahami nama lampiran yang "
-"mengandungi aksara bukan Inggeris"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Minta ppemberitahuan penyusunan &mesej secara automatik"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aktifkan opsyen ini jika anda ingin KMail meminta Pemberitahuan Susunan "
-"Mesej (MDN)  untuk setiap mesej keluar.</p>"
-"<p>Opsyen ini hanya mempengaruhi piawai; anda masih boleh mengaktif atau "
-"menyahaktifkan permohonan MDN berdasarkan setiap mesej dalam <em>"
-"Opsyen penggubah, item menu  -><em>Mohon Pemberitahuan Susunan</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Guna alamat terkini untuk autoselesai"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Nyahaktifkan opsyen ini jika anda ingin alamat terkini yang digunakan muncul "
-"dalam senarai autopelengkapan di dalam medan alamat penggubah."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Autosimpan sela:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Salinan sandaran teks di dalam tetingkap penggubah boleh dicipta secara "
-"berkala. Sela masa yang digunakan untuk mencipta sandaran telah disetkan di "
-"sini. Anda boleh menyahaktifkan autosimpan dengan mengesetnya kepada nilai 0. "
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Gantikan awal&an yang dicam dengan \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Gantikan awalan yang dicam dengan \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Gunakan &petikan cekap"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Tanda tangan luput."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Jenis  pemilih penerima"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Mengeset jenis dialog untuk memilih penerima untuk Kepada,\n"
-"        Sk dan SRk."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Jenis editor penerima"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Mengeset jenis editor penerima untuk mengedit Kepada, \n"
-"Sk dan SRk"
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Bilangan maksimum baris pengedit penerima."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Jika boleh, kekalkan set aksara asal apabila menjawab atau memperpanjangkan"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Sebahagian e-mel, khususnya yang dijanakan secara automatik, tidak menyatakan "
-"pengekodan aksara yang perlu digunakan untuk memaparkannya dengan betul. Dalam "
-"kes seperti ini, pengekodan aksara fallback akan digunakan. Ia boleh disetkan "
-"di sini. Setkan ia kepada pengekodan aksara paling biasa digunakan di negara "
-"anda. Pengekodan yang dikonfigur untuk seluruh sistem akan  digunakan sebagai "
-"piawai."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Mengubah ini dari keadaan piawai 'Auto' akan memaksa penggunaan pengekodan "
-"khusus untuk semua e-mel, tanpa mengambil kira bagaimana ia dinyatakan."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Aktifkan  ini jika anda ingin smiley seperti  :-) yang muncul dalam teks mesej "
-"digantikan dengan ikon emosi (gambar kecil). "
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Aktifkan opsyen ini untuk memaparkan tahap berlainan bagi teks petikan. "
-"Nyahaktifkan untuk menyembunyikan tahap teks petikan. "
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Tahap runtuh automatik:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, fuzzy, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Aktifkan opsyen ini untuk memaparkan tahap berlainan bagi teks petikan. "
-"Nyahaktifkan untuk menyembunyikan tahap teks petikan. "
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Stor mesej yang dihantar dalam bentuk &disulitkan"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Paparkan status s&pam dalam pengepala beragam"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Pemberitahuan Penyusunan Mesej"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Senarai Mesej - Mesej Baru"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "Tandakan Mesej Sebagai Tidak &Diperpanjang"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Tambahkan Aksara &Petikan"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13917,6 +11938,11 @@ msgstr "Tambah sebagai Sk"
 msgid "Add as BCC"
 msgstr "Tambah sebagai SRk"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "B&atalkan"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13933,15 +11959,15 @@ msgstr "Penerima yang Dipilih"
 #: recipientspicker.cpp:784
 #, fuzzy
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "_n: Anda telah memilih 1 penerima. Bilangan maksimum penerima disokong ialah "
 "%1. Sesuaikan dengan pilihan.\n"
-"Anda telah memilih %n penerima. Bilangan maksimum penerima disokong ialah %1. "
-"Sila sesuaikan dengan pilihan."
+"Anda telah memilih %n penerima. Bilangan maksimum penerima disokong ialah "
+"%1. Sila sesuaikan dengan pilihan."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13957,8 +11983,8 @@ msgstr "Gunakan Dialog Pilihan Alamat"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Butang ini membuka dialog berasingan yang anda boleh pilih penerima daripada "
 "keseluruhan alamat yang ada. "
@@ -14063,13 +12089,22 @@ msgstr "lebih besar daripada atau sama dengan"
 msgid " bytes"
 msgstr " bait"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "hari"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Untuk melaksanakan carian anda, semua mesej dalam folder %1 perlu dimuat turun "
-"dari pelayan. Ini mungkin memakan masa. Anda ingin meneruskan carian?"
+"Untuk melaksanakan carian anda, semua mesej dalam folder %1 perlu dimuat "
+"turun dari pelayan. Ini mungkin memakan masa. Anda ingin meneruskan carian?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14220,13 +12255,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -14244,8 +12277,7 @@ msgid ""
 msgstr "Jenis akaun: Akaun IMAP "
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -14263,8 +12295,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -14273,8 +12304,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Penapis Yang Boleh Didapatkan"
 
 #: sievedebugdialog.cpp:358
@@ -14350,8 +12380,8 @@ msgstr "Gunakan medan ini untuk memasukkan tandatangan statik rambang."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Gunakan pemohon ini untuk menyatakan fail teks yang mengandungi tandatangan "
 "anda. Ia akan dibaca setiap kali anda mencipta mel baru atau menambah "
@@ -14371,22 +12401,28 @@ msgstr "Buka fail yang dinyatakan dalam pengedit teks."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Anda boleh menambah arahan rambang di sini, dengan atau tanpa laluan bergantung "
-"pada sama ada arahan tersebut ada atau tiada dalam laluan anda. Untuk setiap "
-"mel baru, KMail akan melaksanakan arahan tersebut dan menggunakan apa yang "
-"dihasilkannya (output standard) sebagai tandatangan. Arahan biasa yang "
-"digunakan bersama mekanisme ini ialah  \"untung\" or \"ksig  rawak\"."
+"Anda boleh menambah arahan rambang di sini, dengan atau tanpa laluan "
+"bergantung pada sama ada arahan tersebut ada atau tiada dalam laluan anda. "
+"Untuk setiap mel baru, KMail akan melaksanakan arahan tersebut dan "
+"menggunakan apa yang dihasilkannya (output standard) sebagai tandatangan. "
+"Arahan biasa yang digunakan bersama mekanisme ini ialah  \"untung\" or "
+"\"ksig  rawak\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Khususkan arahan:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Entri baru:"
@@ -14423,6 +12459,11 @@ msgstr "Tambah Akaun"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Anda pasti ingin mengeluarkan identiti bernama <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Gunakan &pada:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14437,6 +12478,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Edit..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14476,9 +12521,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14517,6 +12562,16 @@ msgstr ""
 "Tidak dapat membuka fail \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Ke:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Sk: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14552,36 +12607,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14816,6 +12867,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14852,116 +12907,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...bahawa anda boleh pergi ke mesej sebelumnya dan seterusnya menggunakan\n"
-"masing-masing kekunci kiri dan kanan?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...bahawa anda boleh dengan pantas mencipta penapis pada penghantar, "
-"penerima,\n"
-"senarai subjek dan terima/hantar mel dengan "
-"<em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...bahawa anda boleh menghindarkan &quot;[senarai nama mel]&quot;\n"
-"ditambah kepada subjek sebahagian senarai mel menggunakan <em>pengepala\n"
-"tulis semula</em>? Gunakan\n"
-"<pre>pengepala tulis semula &quot;Subject&quot;\n"
-"   ganti &quot;\\s*\\[nama senarai mel\\]\\s*&quot;\n"
-"   bersama &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...bahawa anda boleh gabungkan senarai mel dengan folder di dalam dialog\n"
-"<em>Folder-&gt;Pengurusan Senarai Mel</em>? Anda boleh gunakan\n"
-"<em>Mesej-&gt;New&nbsp;Mesej&nbsp;to&nbsp;Mel&nbsp;Senarai...</em>\n"
-"untuk membuka penggubah dengan alamat senarai mel dipraset.\n"
-"Sebagai alternatif, anda boleh mengklik butang tengah tetikus di atas "
-"folder.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...bahawa anda boleh menetapkan ikon langganan kepada setiap folder secara "
-"berasingan?\n"
-"Lihat <em>Folder-&gt;Properties</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...bahawa KMail boleh memaparkan bar warna yang menunjukkan jenis mesej\n"
-"(Teks ringkas/HTML/OpenPGP) dipaparkan sekarang?</p>\n"
-"<p>Ini menghalang usaha memalsukan tandatangan yang telah disahkan dengan \n"
-"menghantar mel  HTML yang menyerupai tandatangan bingkai status KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...bahawa anda boleh menapis sebarang pengepala hanya dengan memasukkan "
-"namanya\n"
-"dalam medan edit pertama bagi peraturan carian?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...bahawa anda boleh menapis keluar mesej HTML sahaja dengan peraturan "
-"tersebut\n"
-"<pra>&quot;Kandungan-jenis&quot; mengandungi &quot;teks/html&quot;?</pra>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...bahawa semasa menjawab, hanya bahagian terpilih mesej yang disebut?</p>\n"
-"<p>Jika tiada apa yang dipilih, mesej penuh disebut.</p>\n"
-"<p>Ini juga berfungsi ke atas teks lampiran apabila\n"
-"<em>View-&gt;Attachment-&gt;Inline</em> dipilih.</p>\n"
-"<p>Ciri ini terdapat bersama semua arahan jawapan kecuali\n"
-"<em>Message-&gt;Jawab Tanpa Petikan</em>.</p>\n"
-"<p align=\"right\"><em>disumbangan oleh David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Tiada apa-apa hendak dibatalkan."
@@ -15028,6 +12973,17 @@ msgstr "Lampairan #%1 (tak dinamakan)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Fail bernama %1 telah wujud. Anda ingin menulis gantikannya?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "&Tulis ganti"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15059,8 +13015,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Pelayan anda tidak menyenaraikan\"cuti\" dalam senarai sambungan  Saring yang "
-"disokong;\n"
+"Pelayan anda tidak menyenaraikan\"cuti\" dalam senarai sambungan  Saring "
+"yang disokong;\n"
 "tanpanya, KMail tidak dapat memasang jawapan di luar pejabat untuk anda.\n"
 "Hubungi pentadbir sistem anda."
 
@@ -15144,14 +13100,14 @@ msgstr "&Hantar gambar bersama setiap mesej"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Semak kotak ini jika anda ingin KMail menambah apa yang disebut sebagai "
-"pengepala  X-Face kepada mesej yang ditulis dengan identiti ini.  X-Face adalah "
-"imej hitam putih  (48x48 piksel) yang boleh dipaparkan oleh sebilangan "
-"pelanggan mel. "
+"pengepala  X-Face kepada mesej yang ditulis dengan identiti ini.  X-Face "
+"adalah imej hitam putih  (48x48 piksel) yang boleh dipaparkan oleh "
+"sebilangan pelanggan mel. "
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15179,9 +13135,9 @@ msgstr "Pilih fail..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Gunakan ini untuk memilih imej fail dari mana gambar akan dicipta. Imej "
 "sepatutnya berkontras tinggi dan berbentuk hampir kuadratik. Latar belakang "
@@ -15193,17 +13149,17 @@ msgstr "Setkan Dari Buku Alamat"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Anda boleh menggunakan versi yang diskalakecilkan bagi gambar yang anda set "
 "dalam entri buku alamat."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail boleh menghantar gambar monokrom kecil (48x48 piksel), berkualiti "
 "rendah bersama setiap mesej. Contoh, ini mungkin gambar anda atau  glif. Ia "
@@ -15215,11 +13171,11 @@ msgstr "Gunakan medan ini untuk masukkan rentetan X-Face."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Contoh boleh didapatkan di <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Contoh boleh didapatkan di <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15235,131 +13191,1763 @@ msgid "You do not have your own contact defined in the address book."
 msgstr ""
 "Anda tidak mempunyai orang hubungan sendiri yang ditakrif dalam buku alamat."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Menandatangan"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Tandatangan mesej secara automatik"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Jika opsyen ini diaktifkan, semua mesej yang anda hantar akan ditandatangan "
+"secara piawai; penandatanganan masih boleh dinyahaktifkan untuk setiap mesej "
+"secara individu."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Penyulitan"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Setkan subjek mesej"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Jika opsyen ini diaktifkan, mesej/fail bukan sahaja akan disulitkan dengan "
+"kekunci umum penerima, tetapi juga dengan kekunci anda. Ini membolehkan anda "
+"menyahsulit mesej/fail pada masa yang lain. Secara keseluruhannya, ini "
+"adalah idea yang baik."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Hantar Sk: kepada 'alamat'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Paparkan teks yang d&itandatangan/disultikan selepas menggubah"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Hantar SRk: kepada 'alamat'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Jika opsyen ini diaktifkan, teks yang ditandatangani/disulitkan akan "
+"dipaparkan dalam tetingkap berasingan, membolehkan anda tahu bagaimana "
+"rupanya sebelum dihantar. Ini idea yang baik apabila anda  ingin memastikan "
+"bahawa sistem penyullitan ini berfungsi dengan baik."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Tambahkan 'pengepala' kepada mesej"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Stor mesej yang dihantar dalam bentuk &disulitkan"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Baca isi mesej dari 'fail'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Semak untuk menstor mesej dalam bentuk sulit"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Setkan isi mesej"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Stor Mesej Disulitkan</h1>\n"
+"Jika kotak ini disemak, mesej yang dihantar distor dalam keadaan disulitkan "
+"seperti keadaannya semasa dihantar. Ini tidak digalakkan, kerana anda tidak "
+"akan dapat membaca mesej jika sijil yang diperlukan luput.\n"
+"<p>\n"
+"Bagaimanapun, banyak peraturan setempat yang menuntut anda menghidupkan "
+"opsyen ini. Jika ragu-ragu, semak dengan pentadbir setempat anda.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Tambah lampiran kepada mel. Ini boleh diulangi"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Sentiasa paparkan kekunci penyulitan &untuk diluluskan."
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Semak mel baru sahaja"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Jika opsyen ini diaktifkan, aplikasi akan sentiasa memaparkan senarai "
+"kekunci umum yang anda boleh pilih untuk tujuan penyulitan. Jika ia "
+"dimatikan, aplikasi hanya akan memaparkan dialog jika ia tidak dapat mencari "
+"kekunci yang betul atau jika terdapat beberapa kekunci yang boleh digunakan."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Buka tetingkap komposer sahaja"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Autosulitkan &mesej apabila boleh dilakukan"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Paparkan fail mesej yang diberi"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Jika opsyen ini diaktifkan, jika boleh dan jika dikehendaki, setiap mesej "
+"yang dihantar akan disulitkan; penyulitan automatik ini masih boleh "
+"dinyahaktifkan untuk setiap mesej secara berasingan."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Jangan tandatangan/sulitkan apabila menyim&pan sebagai draf"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
-"Hantar mesej ke penerima 'alamat'. Lampirkan fail yang ditunjukkan oleh  'URL' "
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Baca"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Umum"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Lama"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Jawab Kepada"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Dihapuskan"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Jawab kepada &Semua"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Dijawab"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Perpanjangkan"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Diperpanjangkan"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Jalan pintas:"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Dibaris gilir"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Gantikan"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Dihantar"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Kandungan &folder"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Diawasi"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Gantikan"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Diabaikan"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Gantikan"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Ciri Folder"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Folder memegang satu senarai hantar/terima &mel"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Tugasan"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Senaraikan &alamat:"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Ada lampiran"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Belum b&aca:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Mesej Akan Luput"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "L&uput selepas:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Luputkan mesej yang telah &dibaca"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Luput &selepas:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Luputkan mesej yang tidak &dibaca"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Hari"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Minggu"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Bulan"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Lanjutan"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identit&i penghantar:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Format &Storan:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Senarai paparan:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Hantar mel baris gilir  untuk semakan mel"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Pilih sama ada anda ingin KMail menghantar semua mesej di dalam peti "
+"keluar secara manual atau semua semakan mesej, ataupun anda tidak mahu "
+"langsung mesej dihantar secara automatik. </p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: util.h:208
-#, fuzzy
+#: kmail.kcfg:73
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Fail bernama %1 telah wujud. Anda ingin menulis gantikannya?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "&Tulis ganti"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Folder paling terkini dipilih dalam folder dialog pilihan."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Dasar untuk memapar ikon dulang sistem"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Panjang lebarkan pemberitahuan mel baru"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Jika opsyen ini diaktifkan, untuk setiap folder, bilangan mesej yang baru "
+"sampai  akan dipaparkan di dalam pemberitahuan mel baru; Jika tidak, anda "
+"hanya mendapat mesej ringkas  'Mesej baru sampai'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Nyatakan e&ditor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Guna pengedit l&uaran dan bukannya penggubah"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Aktifkan keberfungsian groupware"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Koyakkan Daripada:/Kepada: pengepala dalam jawapan ke jawapan"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook mempunyai beberapa kekurangan dalam pelaksanaan piawai  "
+"iCalendar; opsyen ini berfungsi sekitar salah satu daripada kekurangan "
+"tersebut. Jika anda menghadapi masalah dengan pengguna Outlook yang gagal "
+"menerima jawapan anda, cuba setkan opsyen ini."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Hantar undangan groupware dalam isi mel"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook mempunyai beberapa kekurangan dalam pelaksanaan piawai "
+"iCalendar; opsyen ini berfungsi sekitar salah satu daripada kekurangan "
+"tersebut. Jika anda menghadapi masalah dengan pengguna Outlook yang gagal "
+"menerima undangan anda, cuba setkan opsyen ini."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Penghantaran undangan automatik"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Jika ini disemak, anda tidak akan nampak tetingkap penggubah mel. "
+"Sebaliknya, semua mel undangan akan dihantar secara automatik. Jika anda "
+"ingin melihat mel sebelum dihantar, nyahtandakan opsyen ini. Bagaimanapun, "
+"ambil perhatian bahawa teks dalam tetingkap penggubah adalah dalam sintaks "
+"iKalendar, anda tidak sepatutnya cuba mengubahnya secara manual."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Mengaktifkan ini membolehkan storan entri dari aplikasi Kontact "
+"(KOrganizer, KAddressBook, dan KNotes.)</p><p>Jika anda ingin mengeset "
+"opsyen ini, anda juga mesti mengeset aplikasi untuk menggunakan sumber IMAP; "
+"ini dilakukan di pusat kawalan TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Biasanya anda tidak akan ada sebarang sebab untuk melihat folder yang "
+"memuatkan sumber IMAP. Tapi jika anda perlu melihatnya, anda boleh "
+"mengesetnya di sini.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Pilih format storan folder groupware. <ul><li>Format piawai ialah "
+"menggunakan ical (untuk folder kalendar) dan kadV piawai (untuk folder buku "
+"alamat). Format ini menjadikan semua ciri Kontact boleh didapatkan.</"
+"li><li>Format Kolab XML menggunakan model kebiasaan yang paling padan dengan "
+"yang digunakan dalam Outlook. Format ini memberikan keserasian Outlook yang "
+"lebih tinggi  apabila menggunakan pelayan Kolab atau penyelesaian serasi "
+"yang lain.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Ini memilih induk folder sumber IMAP.</p><p>Secara piawai, pelayan  Kolab "
+"mengeset peti masuk IMAP sebagai induk.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Ini adalah ID bagi akaun yang memegang folder sumber IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Jika anda mahu mengeset nama folder storan IMAP  ke dalam bahasa "
+"tempatan, anda boleh memilih bahasa berikut.</p><p> Ambil perhatian bahawa, "
+"satu-satunya sebab untuk melakukan ini adalah untuk keserasian dengan "
+"Microsoft Outlook. Idea ini dianggap tak elok kerana menyebabkan penukaran "
+"bahasa tidak boleh dibuat. </p><p>Jadi, jangan set jika tidak ada keperluan."
+"</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Nilai ini digunakan untuk membuat keputusan sama ada pengenalan KMail patut "
+"dipaparkan atau tidak."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Bilangan maksimum sambungan setiap hos"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ini boleh digunakan untuk mengehadkan bilangan sambungan per hos semasa "
+"menyemak mel baru. Dalam keadaan piawai, bilangan sambungan adalah tidak "
+"terhad (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Paparkan edit garisan carian cepat"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Opsyen ini mengaktif atau menyahaktifkan pengeditan baris carian di atas "
+"senarai mesej, yang boleh digunakan untuk mencari maklumat yang dipaparkan "
+"dalam senarai mesej dengan kadar cepat."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Jika boleh, kekalkan set aksara asal apabila menjawab atau memperpanjangkan"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Tambah tandatangan secara a&utomatik"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ingat identiti ini, supaya masih boleh digunakan dalam tetingkap penggubah "
+"pada masa akan datang.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Ingat item yang telah dihantar dalam folder ini, supaya masih boleh "
+"digunakan dalam tetingkap penggubah pada masa akan datang."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Ingat pengangkut mel ini, supaya masih boleh digunakan dalam tetingkap "
+"penggubah pada masa akan datang."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ingat identiti ini, supaya masih boleh digunakan dalam tetingkap penggubah "
+"pada masa akan datang.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Balut perkataan pada lajur:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Beri amaran jika sijil root luput dalam masa &kurang daripada:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Pasang opsyen ini untuk menjadikan Outlook &#8482; memahami nama lampiran "
+"yang mengandungi aksara bukan Inggeris"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Minta ppemberitahuan penyusunan &mesej secara automatik"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Aktifkan opsyen ini jika anda ingin KMail meminta Pemberitahuan "
+"Susunan Mesej (MDN)  untuk setiap mesej keluar.</p><p>Opsyen ini hanya "
+"mempengaruhi piawai; anda masih boleh mengaktif atau menyahaktifkan "
+"permohonan MDN berdasarkan setiap mesej dalam <em>Opsyen penggubah, item "
+"menu  -><em>Mohon Pemberitahuan Susunan</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Guna alamat terkini untuk autoselesai"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Nyahaktifkan opsyen ini jika anda ingin alamat terkini yang digunakan muncul "
+"dalam senarai autopelengkapan di dalam medan alamat penggubah."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Autosimpan sela:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Salinan sandaran teks di dalam tetingkap penggubah boleh dicipta secara "
+"berkala. Sela masa yang digunakan untuk mencipta sandaran telah disetkan di "
+"sini. Anda boleh menyahaktifkan autosimpan dengan mengesetnya kepada nilai "
+"0. "
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Gantikan awal&an yang dicam dengan \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Gantikan awalan yang dicam dengan \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Gunakan &petikan cekap"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Tanda tangan luput."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Jenis  pemilih penerima"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Mengeset jenis dialog untuk memilih penerima untuk Kepada,\n"
+"        Sk dan SRk."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Jenis editor penerima"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Mengeset jenis editor penerima untuk mengedit Kepada, \n"
+"Sk dan SRk"
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Bilangan maksimum baris pengedit penerima."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Jika boleh, kekalkan set aksara asal apabila menjawab atau memperpanjangkan"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Sebahagian e-mel, khususnya yang dijanakan secara automatik, tidak "
+"menyatakan pengekodan aksara yang perlu digunakan untuk memaparkannya dengan "
+"betul. Dalam kes seperti ini, pengekodan aksara fallback akan digunakan. Ia "
+"boleh disetkan di sini. Setkan ia kepada pengekodan aksara paling biasa "
+"digunakan di negara anda. Pengekodan yang dikonfigur untuk seluruh sistem "
+"akan  digunakan sebagai piawai."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Mengubah ini dari keadaan piawai 'Auto' akan memaksa penggunaan pengekodan "
+"khusus untuk semua e-mel, tanpa mengambil kira bagaimana ia dinyatakan."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Aktifkan  ini jika anda ingin smiley seperti  :-) yang muncul dalam teks "
+"mesej digantikan dengan ikon emosi (gambar kecil). "
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Aktifkan opsyen ini untuk memaparkan tahap berlainan bagi teks petikan. "
+"Nyahaktifkan untuk menyembunyikan tahap teks petikan. "
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Tahap runtuh automatik:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, fuzzy, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Aktifkan opsyen ini untuk memaparkan tahap berlainan bagi teks petikan. "
+"Nyahaktifkan untuk menyembunyikan tahap teks petikan. "
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Stor mesej yang dihantar dalam bentuk &disulitkan"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Paparkan status s&pam dalam pengepala beragam"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Pemberitahuan Penyusunan Mesej"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Senarai Mesej - Mesej Baru"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "Tandakan Mesej Sebagai Tidak &Diperpanjang"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Tambahkan Aksara &Petikan"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Edit &Fail"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Edit..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Pergi"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "F&older"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mesej"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Perpanjangkan"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Set Semula Seting Fon"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Bar alat HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opsyen Biasa"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Bar alat HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Sahkan sijil menggunakan SPS"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Jika opsyen ini dipilih, sijil S/MIME disahkan menggunakan senarai "
+"pembatalan sijil (SPS)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Sahkan sijil secara dalam talian (PSDT)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Jika opsyen ini dipilih, sijil S/MIME disahkan dalam talian menggunakan  "
+"Protokol Status Sijil Dalam Talian (PSDT). Isikan URL pemberi respons PSDT "
+"di bawah."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Pengesahan Sijil Dalam Talian"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL pemberi respons PSDT:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Masukkan alamat pelayan untuk pengesahan dalam talian bagi  sijil (pemberi "
+"respons PSDT di sini. Biasanya URL bermula dengan  http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Tandatangan pemberi respons PSDT:"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Abaikan Servis  URL bagi sijil"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Jangan semak dasar sijil"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Menurut piawai, GniPG menggunakan fail ~/.gnupg/policies.txt untuk menyemak "
+"sama ada suatu dasar sijil dibenarkan atau tidak. Jika opsyen ini dipilih, "
+"polisi tidak akan disemak."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Jangan rujuk SPS"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Jika opsyen ini disemak, Senarai Pembatalan Sijil tidak akan digunakan untuk "
+"mengesahkan sijil S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Kutip sijil pengeluar yang hilang"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Jika opsyen ini disemak, sijil  pengeluar yang hilang akan dikutip apabila "
+"perlu  (Ini boleh digunakan untuk kedua-dua kaedah SPS dan PSDT)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Permohonan HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Jangan laksanakan sebarang  permohonan HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Menyahaktifkan seluruh penggunaan HTTP untuk S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Guna proksi ini untuk melaksanakan permohonan HTTP:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Guna proksi sistem HTTP:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Jika opsyen ini dipilih, nilai proksi  HTTP yang dipaparkan di sebelah kanan "
+"(yang datang dari persekitaran http_proksi) akan digunakan untuk sebarang "
+"permohonan HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Masukkan lokasi proksi HTTP anda di sini. Ia akan digunakan untuk semua "
+"permohonan HTTP berkaitan S/MIME. Sintaks adalah hos:port, contohnya myproxy."
+"nowhere.com:3128"
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Abaikan Titik Agihan HTTP SPS bagi sijil"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Semasa mencari lokasi suatu SPS, sijil yang hendak diuji biasanya "
+"mengandungi apa yang dikenal sebagai entri \"Titik Agihan SPS\" (TA), yang "
+"merupakan huraian URL  tentang cara mengakses  URL. Entri TA yang pertama "
+"ditemui akan digunakan.  Dengan opsyen ini, semua masukan yang menggunakan "
+"skim HTTP  akan diabaikan semasa mencari TA yang sesuai."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Permohonan LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Jangan laksanakan sebarang permohonan LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Menyahaktifkan penggunaan LDAP untuk S/MIME secara menyeluruh."
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Abaikan Titik Agihan LDAP SPS sijil"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Semasa mencari lokasi suatu SPS, sijil yang hendak diuji biasanya "
+"mengandungi apa yang dikenali sebagai entri  \"Titik Agihan SPS\" (TA), yang "
+"merupakan huraian URL tentang cara untuk mengakses URL. Masukan TA yang "
+"pertama ditemui akan digunakan.  Dengan opsyen ini, semua masukan "
+"menggunakan skim LDAP akan diabaikan semasa mencari TA yang sesuai."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Hos primer permohonan LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Memasukkan pelayan LDAP di sini akan membuat semua permohonan LDAP pergi ke "
+"pelayan terlebih dahulu.  Lebih tepat lagi, seting ini menulis tindih "
+"sebarang hos yang dinyatakan dan akan digunakan jika hos dan port telah "
+"digugurkan dari URL. Pelayan  LDAP yang lain akan digunakan hanya jika "
+"sambungan ke \"proksi\" gagal.\n"
+"Sintaks ialah \"HOS\" or \"HOS:PORT\". Jika  PORT digugurkan, port 389 (port "
+"LDAP piawai) digunakan."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "T&ambah..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Set Semula Seting Fon"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "Tidak terhad"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Konfigurasi Tandatangan"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Jawab kepada Pe&nghantar:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Jawab kepada &Semua"
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Mesej Diperpanjang"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Beri amaran jika cuba menghantar mesej &tak bertandatangan"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Semak untuk diberi amaran apabila menghantar mesej tak bertandatangan."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri amaran Jika Cuba Menghantar Mesej Tak Bertandatangan</h1>\n"
+"Jika kotak ini disemak, anda akan diberi amaran jika cuba menghantar "
+"sebahagian atau seluruh mesej tak bertandatangan .\n"
+"<p>\n"
+"Anda digalakkan membiarkan opsyen ini terbuka untuk ketelusan maksimum.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Beri amaran apabila cuba menghantar mesej yang tak disulitkan"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Semak supaya diberi amaran apabila menghantar mesej tak disulitkan."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri amaran apabila cuba menghantar mesej tak disulitkan</h1>\n"
+"Jika kotak ini disemak, anda akan diberi amaran apabila cuba menghantar "
+"sebahagian atau keseluruhan mesej tanpa penyulitan.\n"
+"<p>\n"
+"Anda dinasihatkan membiarkan opsyen ini hidup untuk ketelusan penuh.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Beri amaran jika alamat e-mel &penerima tiada dalam sijil"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Semak untuk diberi amaran jika alamat tiada dalam sijil"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri amaran jika alamat e-mel penerima tiada dalam sijil</h1>\n"
+"Jika opsyen telah disemak, amaran dikeluarkan jika alamat e-mel penerima  "
+"tidak terkandung dalam sijil yang digunakan untuk penyulitan.\n"
+"<p>\n"
+"Dicadangkan supaya opsyen ini dibiarkan terbuka untuk keselamatan maksimum.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Beri amaran jika sijil/kekunci akan luput (konfigur ambang di bawah)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Untuk tandatangan"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Untuk penyulitan"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Pilih bilangan hari di sini"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri Amaran Jika Sijil Tandatangan Luput</h1>\n"
+"Pilih bilangan hari minimum yang sijil tandatangan sepatutnya masih sah "
+"tanpa perlu mengeluarkan amaran.\n"
+"<p>\n"
+"Seting SPHINX yang dicadangkan ialah 14 hari .\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri Amaran Jika Sijil Penyulitan Luput</h1>\n"
+"Pilih bilangan hari minimum yang sijil penyulitan sepatutnya sah, tanpa "
+"mengeluarkan amaran.\n"
+"<p>\n"
+"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri Amaran Jika Ada Sijil Dalam Rantaian Telah Luput</h1>\n"
+"Pilih bilangan hari minimum untuk  semua sijil dalam rantaian yang "
+"sepatutnya sah, tanpa mengeluarkan amaran.\n"
+"<p>\n"
+"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri amaran jika sijil AP luput</h1>\n"
+"Pilih bilangan hari minimum yang sijil AP masih sah tanpa perlu mengeluarkan "
+"amaran.\n"
+"<p>\n"
+"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Beri amaran jika sijil root luput</h1>\n"
+"Pilih bilangan hari minimum yang sijil root sepatutnya masih sah tanpa perlu "
+"mengeluarkan amaran.\n"
+"<p>\n"
+"Seting SPHINX yang dicadangkan ialah 14 hari.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Untuk sijil root:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Untuk sijil AP pengantara:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Untuk sijil/kekunci pengguna akhir:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Aktifkan Semula Semua Amaran\"Jangan Tanya Lagi\" "
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...bahawa anda boleh pergi ke mesej sebelumnya dan seterusnya "
+"menggunakan\n"
+"masing-masing kekunci kiri dan kanan?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...bahawa anda boleh dengan pantas mencipta penapis pada penghantar, "
+"penerima,\n"
+"senarai subjek dan terima/hantar mel dengan <em>Tools-&gt;Create&nbsp;"
+"Filter</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...bahawa anda boleh menghindarkan &quot;[senarai nama mel]&quot;\n"
+"ditambah kepada subjek sebahagian senarai mel menggunakan <em>pengepala\n"
+"tulis semula</em>? Gunakan\n"
+"<pre>pengepala tulis semula &quot;Subject&quot;\n"
+"   ganti &quot;\\s*\\[nama senarai mel\\]\\s*&quot;\n"
+"   bersama &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...bahawa anda boleh gabungkan senarai mel dengan folder di dalam dialog\n"
+"<em>Folder-&gt;Pengurusan Senarai Mel</em>? Anda boleh gunakan\n"
+"<em>Mesej-&gt;New&nbsp;Mesej&nbsp;to&nbsp;Mel&nbsp;Senarai...</em>\n"
+"untuk membuka penggubah dengan alamat senarai mel dipraset.\n"
+"Sebagai alternatif, anda boleh mengklik butang tengah tetikus di atas folder."
+"</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...bahawa anda boleh menetapkan ikon langganan kepada setiap folder "
+"secara berasingan?\n"
+"Lihat <em>Folder-&gt;Properties</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...bahawa KMail boleh memaparkan bar warna yang menunjukkan jenis mesej\n"
+"(Teks ringkas/HTML/OpenPGP) dipaparkan sekarang?</p>\n"
+"<p>Ini menghalang usaha memalsukan tandatangan yang telah disahkan dengan \n"
+"menghantar mel  HTML yang menyerupai tandatangan bingkai status KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...bahawa anda boleh menapis sebarang pengepala hanya dengan memasukkan "
+"namanya\n"
+"dalam medan edit pertama bagi peraturan carian?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...bahawa anda boleh menapis keluar mesej HTML sahaja dengan peraturan "
+"tersebut\n"
+"<pra>&quot;Kandungan-jenis&quot; mengandungi &quot;teks/html&quot;?</pra>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...bahawa semasa menjawab, hanya bahagian terpilih mesej yang disebut?</"
+"p>\n"
+"<p>Jika tiada apa yang dipilih, mesej penuh disebut.</p>\n"
+"<p>Ini juga berfungsi ke atas teks lampiran apabila\n"
+"<em>View-&gt;Attachment-&gt;Inline</em> dipilih.</p>\n"
+"<p>Ciri ini terdapat bersama semua arahan jawapan kecuali\n"
+"<em>Message-&gt;Jawab Tanpa Petikan</em>.</p>\n"
+"<p align=\"right\"><em>disumbangan oleh David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15455,33 +15043,42 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sulitkan Semua Bahagian Mesej Menurut Piawai</h1>\n"
-#~ "Jika opsyen ini dipilih, semua bahagian fail (iaitu isi utama mesej dan semua lampiran) disulitkan menurut piawai.\n"
+#~ "Jika opsyen ini dipilih, semua bahagian fail (iaitu isi utama mesej dan "
+#~ "semua lampiran) disulitkan menurut piawai.\n"
 #~ "<p>\n"
-#~ "Ini adalah seting piawai, anda masih boleh tulis tindih untuk setiap mesej.\n"
+#~ "Ini adalah seting piawai, anda masih boleh tulis tindih untuk setiap "
+#~ "mesej.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "Tanya &sebelum menyulitkan setiap bahagian"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Semak supaya ditanya sama ada setiap bahagian hendak disulitkan atau tidak"
+#~ msgstr ""
+#~ "Semak supaya ditanya sama ada setiap bahagian hendak disulitkan atau tidak"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tanya Sebelum Menyulitkan Setiap Bahagian</h1>\n"
-#~ "Jika opsyen ini dipilih, anda akan ditanya di setiap bahagian mesej (iaitu isi utama mesej dan juga semua lampiran) sama ada anda hendak ia disulitkan atau tidak.\n"
+#~ "Jika opsyen ini dipilih, anda akan ditanya di setiap bahagian mesej "
+#~ "(iaitu isi utama mesej dan juga semua lampiran) sama ada anda hendak ia "
+#~ "disulitkan atau tidak.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15495,14 +15092,16 @@ msgstr "&Tulis ganti"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Jangan Sulitkan Mesej</h1>\n"
 #~ "Jika opsyen ini dipilih, mesej tidak akan disulitkan menurut piawai.\n"
 #~ "<p>\n"
-#~ "Ini adalah seting piawai, anda masih boleh tulis tindih untuk setiap seting.\n"
+#~ "Ini adalah seting piawai, anda masih boleh tulis tindih untuk setiap "
+#~ "seting.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15514,18 +15113,31 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritma Penyulitan</h1>\n"
-#~ "Algoritma ialah huraian untuk komputer tentang bagaimana ia sepatutnya melaksanakan tugasan tertentu. Algoritma penyulitan menerangkan bagaimana komputer mengaplikasi kekunci penerima ke atas mesej anda supaya hanya penerima sasaran sahaja boleh membacanya.\n"
+#~ "Algoritma ialah huraian untuk komputer tentang bagaimana ia sepatutnya "
+#~ "melaksanakan tugasan tertentu. Algoritma penyulitan menerangkan bagaimana "
+#~ "komputer mengaplikasi kekunci penerima ke atas mesej anda supaya hanya "
+#~ "penerima sasaran sahaja boleh membacanya.\n"
 #~ "<p>\n"
-#~ "Pemilihan algoritma tertentu menentukan mudah atau susahnya ia memintas dan membaca sesuatu mesej.  Bagaimanapun, semua algoritma yang disediakan dalam persekitaran SPHINX dianggap sangat selamat. Secara umum, piawai berperanan dengan baik di sini.\n"
+#~ "Pemilihan algoritma tertentu menentukan mudah atau susahnya ia memintas "
+#~ "dan membaca sesuatu mesej.  Bagaimanapun, semua algoritma yang disediakan "
+#~ "dalam persekitaran SPHINX dianggap sangat selamat. Secara umum, piawai "
+#~ "berperanan dengan baik di sini.\n"
 #~ "<p>\n"
 #~ "Seting ini adalah piawai, anda boleh tulis tindih untuk setiap mesej.\n"
 #~ "</qt>"
@@ -15542,16 +15154,21 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Semakan Sijil Boleh Tamat Dengan Sijil Tersimpan Setempat</h1>\n"
-#~ "Jika opsyen ini disemak, semakan rantaian sijil boleh berakhir dengan sijil tersimpan setempat.\n"
+#~ "Jika opsyen ini disemak, semakan rantaian sijil boleh berakhir dengan "
+#~ "sijil tersimpan setempat.\n"
 #~ "<p>\n"
-#~ "Sijil tersimpan setempat adalah sijil anda sendiri, juga sijil rakan komunikasi dan autoriti persijilan (AP).\n"
+#~ "Sijil tersimpan setempat adalah sijil anda sendiri, juga sijil rakan "
+#~ "komunikasi dan autoriti persijilan (AP).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15563,12 +15180,15 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sentiasa Semak Laluan Sijil Ke Sijil Root</h1>\n"
-#~ "Jika opsyen ini diaktifkan, laluan sijil kepunyaan sijil penerima akan sentiasa disemak sepanjang laluannya ke sijil root.\n"
+#~ "Jika opsyen ini diaktifkan, laluan sijil kepunyaan sijil penerima akan "
+#~ "sentiasa disemak sepanjang laluannya ke sijil root.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15580,16 +15200,20 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Semak Laluan Sijil</h1>\n"
-#~ "Jika opsyen ini diaktifkan, seluruh laluan sijil penerima hingga ke root akan disemak.\n"
+#~ "Jika opsyen ini diaktifkan, seluruh laluan sijil penerima hingga ke root "
+#~ "akan disemak.\n"
 #~ "<p>\n"
-#~ "Ambil perhatian bahawa adalah tidak mungkin untuk menutup semakan sijil penerima itu sendiri.\n"
+#~ "Ambil perhatian bahawa adalah tidak mungkin untuk menutup semakan sijil "
+#~ "penerima itu sendiri.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15601,16 +15225,27 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gunakan Senarai Pembatalan Sijil (SPS)</h1>\n"
-#~ "Senarai pembatalan sijil mengandungi sijil yang telah ditarik balik dan tidak sepatutnya digunakan lagi untuk tujuan penyulitan. Pengguna mungkin ingin membatalkan sijilnya kerana curiga berlakunya pencerobohan (misalnya ada orang yang dapat meneka PIN).\n"
+#~ "Senarai pembatalan sijil mengandungi sijil yang telah ditarik balik dan "
+#~ "tidak sepatutnya digunakan lagi untuk tujuan penyulitan. Pengguna mungkin "
+#~ "ingin membatalkan sijilnya kerana curiga berlakunya pencerobohan "
+#~ "(misalnya ada orang yang dapat meneka PIN).\n"
 #~ "<p>\n"
-#~ "Anda disarankan menggunakan SPS untuk keselamatan maksimum. Anda boleh mendapatkan kembali SPS dengan memilih dari  dialog konfigurasi sijil dan dari dialog pengurusan SPS.\n"
+#~ "Anda disarankan menggunakan SPS untuk keselamatan maksimum. Anda boleh "
+#~ "mendapatkan kembali SPS dengan memilih dari  dialog konfigurasi sijil dan "
+#~ "dari dialog pengurusan SPS.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15622,12 +15257,14 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Beri amaran jika SPS telah hampir luput</h1>\n"
-#~ "Jika kotak ini disemak, anda akan diberi amaran apabila salah satu SPS yang anda gunakan telah hampir luput.\n"
+#~ "Jika kotak ini disemak, anda akan diberi amaran apabila salah satu SPS "
+#~ "yang anda gunakan telah hampir luput.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15636,14 +15273,16 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Beri amaran jika SPS telah hampir luput</h1>\n"
-#~ "Dalam medan ini, anda boleh nyatakan berapa lama anda ingin diberi amaran sebelum SPS luput.\n"
+#~ "Dalam medan ini, anda boleh nyatakan berapa lama anda ingin diberi amaran "
+#~ "sebelum SPS luput.\n"
 #~ "<p>\n"
 #~ "Seting persekitaran SPHINX yang dicadangkan ialah 7 hari.\n"
 #~ "</qt>"
@@ -15652,21 +15291,26 @@ msgstr "&Tulis ganti"
 #~ msgstr "Sentiasa sulitkan &kepada diri sendiri"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Semak supaya mesej sulit disulitkan menggunakan kekunci anda sendiri."
+#~ msgstr ""
+#~ "Semak supaya mesej sulit disulitkan menggunakan kekunci anda sendiri."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sentiasa sulitkan untuk diri sendiri</h1>\n"
-#~ "Jika kotak ini telah disemak, mesej sulit yang anda hantar juga disulitkan menggunakan kekunci anda sendiri.\n"
+#~ "Jika kotak ini telah disemak, mesej sulit yang anda hantar juga "
+#~ "disulitkan menggunakan kekunci anda sendiri.\n"
 #~ "<p>\n"
-#~ "anda dinasihatkan supaya menghidupkan opsyen ini untuk membolehkan anda membaca mesej yang telah dihantar.\n"
+#~ "anda dinasihatkan supaya menghidupkan opsyen ini untuk membolehkan anda "
+#~ "membaca mesej yang telah dihantar.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15678,16 +15322,21 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Beri Amaran Jika Sijil Luput</h1>\n"
-#~ "Jika opsyen ini disemak, anda akan diberi amaran jika cuba menggunakan sijil penyulitan yang luput dalam jangkamasa jumlah hari tertentu.\n"
+#~ "Jika opsyen ini disemak, anda akan diberi amaran jika cuba menggunakan "
+#~ "sijil penyulitan yang luput dalam jangkamasa jumlah hari tertentu.\n"
 #~ "<p>\n"
-#~ "Dinasihatkan membiarkan opsyen ini dibuka untuk mengelak penggunaan sijil yang hampir luput. \n"
+#~ "Dinasihatkan membiarkan opsyen ini dibuka untuk mengelak penggunaan sijil "
+#~ "yang hampir luput. \n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15708,8 +15357,29 @@ msgstr "&Tulis ganti"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Pilih sijil yang hendak dihantar"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Menghantar sijil</h1> Tanpa sijil anda, penerima tidak dapat menentukan sama ada mesej benar-benar dihantar oleh anda atau kemungkinan mesej telah dipinda oleh pihak ketiga. <p> Penerima boleh mendapatkan sijil anda dari pelayan pusat, tapi anda boleh memilih untuk menyertakan sijil bersama mesej. Anda boleh memilih sama ada tidak menyertakan sebarang sijil sama sekali, hanya sijil anda atau seluruh rantaian sijil yang mengesahkan sijil anda, termasuk atau tidak termasuk sijil root. <p> Dicadangkan supaya sentiasa menyertakan sekurang-kurang sijil anda sendiri bersama mesej. <p> Seting ini adalah piawai, anda boleh menulis tindih untuk setiap mesej. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Menghantar sijil</h1> Tanpa sijil anda, penerima tidak dapat "
+#~ "menentukan sama ada mesej benar-benar dihantar oleh anda atau kemungkinan "
+#~ "mesej telah dipinda oleh pihak ketiga. <p> Penerima boleh mendapatkan "
+#~ "sijil anda dari pelayan pusat, tapi anda boleh memilih untuk menyertakan "
+#~ "sijil bersama mesej. Anda boleh memilih sama ada tidak menyertakan "
+#~ "sebarang sijil sama sekali, hanya sijil anda atau seluruh rantaian sijil "
+#~ "yang mengesahkan sijil anda, termasuk atau tidak termasuk sijil root. <p> "
+#~ "Dicadangkan supaya sentiasa menyertakan sekurang-kurang sijil anda "
+#~ "sendiri bersama mesej. <p> Seting ini adalah piawai, anda boleh menulis "
+#~ "tindih untuk setiap mesej. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Hantar sijil &anda sendiri"
@@ -15729,33 +15399,42 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tandatangan Semua Mesej Secara Piawai</h1>\n"
-#~ "Jika opsyen ini dipilih, semua bahagian mesej (iaitu isi utama mesej dan semua lampiran) ditandatangani secara piawai.\n"
+#~ "Jika opsyen ini dipilih, semua bahagian mesej (iaitu isi utama mesej dan "
+#~ "semua lampiran) ditandatangani secara piawai.\n"
 #~ "<p>\n"
-#~ "Ini adalah seting piawai, anda masih boleh menulis tindih untuk setiap mesej.\n"
+#~ "Ini adalah seting piawai, anda masih boleh menulis tindih untuk setiap "
+#~ "mesej.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Tanya &sebelum menandatangani setiap bahagian"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Semak untuk ditanya sama ada setiap bahagian ditandatangani atau tidak"
+#~ msgstr ""
+#~ "Semak untuk ditanya sama ada setiap bahagian ditandatangani atau tidak"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tanya Sebelum Tanda Tangan Setiap Bahagian</h1>\n"
-#~ "Jika opsyen ini dipilih, di setiap bahagian mesej secara berasingan (iaitu isi utama mesej dan juga semua lampiran), anda akan ditanya adakah bahagian itu ingin anda tandatangani.\n"
+#~ "Jika opsyen ini dipilih, di setiap bahagian mesej secara berasingan "
+#~ "(iaitu isi utama mesej dan juga semua lampiran), anda akan ditanya adakah "
+#~ "bahagian itu ingin anda tandatangani.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15769,17 +15448,20 @@ msgstr "&Tulis ganti"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Jangan Tanda Tangan Mesej</h1>\n"
 #~ "Jika opsyen ini dipilih, mesej tidak akan ditandatangani menurut piawai.\n"
 #~ "<p>\n"
-#~ "Ini adalah seting piawai, anda masih boleh menulis tindih untuk setiap seting.\n"
+#~ "Ini adalah seting piawai, anda masih boleh menulis tindih untuk setiap "
+#~ "seting.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Sijil tandatangan ini dikonfigur pada <em> Sijil</em>."
 
 #~ msgid "RSA + SHA-1"
@@ -15791,18 +15473,31 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritma Tandatangan</h1>\n"
-#~ "Algoritma ialah perihalan komputer tentang bagaimana ia sepatutnya melaksanakan suatu tugasan . Algoritma tandatangan menerangkan bagaimana komputer menggunakan kekunci tandatangan ke atas mesej supaya  penerima boleh menentukan bahawa anda adalah penghantar sebenar mesej tersebut. \n"
+#~ "Algoritma ialah perihalan komputer tentang bagaimana ia sepatutnya "
+#~ "melaksanakan suatu tugasan . Algoritma tandatangan menerangkan bagaimana "
+#~ "komputer menggunakan kekunci tandatangan ke atas mesej supaya  penerima "
+#~ "boleh menentukan bahawa anda adalah penghantar sebenar mesej tersebut. \n"
 #~ "<p>\n"
-#~ "Pemilihan algoritma tandatangan tertentu menentukan senang atau susahnya hendak memalsukan suatu mesej. Bagaimanapun, semua algoritma yang disediakan dalam persekitaran SPHINX dianggap sangat selamat. Secara umum, piawai berjalan dengan baik di sini.\n"
+#~ "Pemilihan algoritma tandatangan tertentu menentukan senang atau susahnya "
+#~ "hendak memalsukan suatu mesej. Bagaimanapun, semua algoritma yang "
+#~ "disediakan dalam persekitaran SPHINX dianggap sangat selamat. Secara "
+#~ "umum, piawai berjalan dengan baik di sini.\n"
 #~ "<p>\n"
 #~ "Seting ini adalah piawai, anda boleh menulis tindih untuk setiap mesej.\n"
 #~ "</qt>"
@@ -15819,12 +15514,17 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Stor Mesej dengan Tandatangan</h1>\n"
-#~ "Apabila kotak ini disemak, mesej yang dihantar distor bersama dengan tandatangan yang terdapat padanya. Ini digalakkan, kerana pada masa akan datang, ia membolehkan anda menyemak sama ada suatu mesej atau sebahagian daripadanya telah ditandatangani atau belum.\n"
+#~ "Apabila kotak ini disemak, mesej yang dihantar distor bersama dengan "
+#~ "tandatangan yang terdapat padanya. Ini digalakkan, kerana pada masa akan "
+#~ "datang, ia membolehkan anda menyemak sama ada suatu mesej atau sebahagian "
+#~ "daripadanya telah ditandatangani atau belum.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15839,12 +15539,19 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tandatangan Tercerai Berbilang Bahagian</h1>\n"
-#~ "Jika opsyen ini dipilih, tandatangan dan data bertandatangan akan diasingkan dari berbilang bahagian/bahagian mesej bertandatangan. Data mesej bertandatangan akan dapat dibaca, walaupun menggunakan ejen pengguna mel yang tidak menyokong algoritma dan juga  yang tidak menyokong penyahkodan ASN.1.\n"
+#~ "Jika opsyen ini dipilih, tandatangan dan data bertandatangan akan "
+#~ "diasingkan dari berbilang bahagian/bahagian mesej bertandatangan. Data "
+#~ "mesej bertandatangan akan dapat dibaca, walaupun menggunakan ejen "
+#~ "pengguna mel yang tidak menyokong algoritma dan juga  yang tidak "
+#~ "menyokong penyahkodan ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15856,12 +15563,16 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Mesej bertandatangan legap</h1>\n"
-#~ "Jika opsyen ini dipilih, tandatangan dan data bertandatangan, kedua-duanya akan dikodkan ke dalam satu blok ASN>1. Mesej akan hanya dapat dibaca oleh ejen pengguna mel yang menyokong penyahkodan ASN>1 .\n"
+#~ "Jika opsyen ini dipilih, tandatangan dan data bertandatangan, kedua-"
+#~ "duanya akan dikodkan ke dalam satu blok ASN>1. Mesej akan hanya dapat "
+#~ "dibaca oleh ejen pengguna mel yang menyokong penyahkodan ASN>1 .\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15873,8 +15584,23 @@ msgstr "&Tulis ganti"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Pilih sekerap mana PIN mesti dimasukkan"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Entri PIN</h1>Di sini, anda boleh memilih berapa kali anda perlu memasukkan PIN untuk mengakses persekitaran keselamatan peribadi (PKP) yang mengandungi sijil anda. <p> Lebih kerap anda perlu memasukkan PIN, anda lebih dilindungi daripada mesej e-mel yang dipalsukan atas nama anda, tetapi prosesnya lebih rumit . <p> Jika anda tidak pasti untuk membuat pilihan, biarkan opsyen ini dalam keadaan asal. <p> Ambi perhatian bahawa, adalah tidak mungkin untuk mematikan masukan PIN sepenuhnya untuk tujuan keselamatan. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Entri PIN</h1>Di sini, anda boleh memilih berapa kali anda perlu "
+#~ "memasukkan PIN untuk mengakses persekitaran keselamatan peribadi (PKP) "
+#~ "yang mengandungi sijil anda. <p> Lebih kerap anda perlu memasukkan PIN, "
+#~ "anda lebih dilindungi daripada mesej e-mel yang dipalsukan atas nama "
+#~ "anda, tetapi prosesnya lebih rumit . <p> Jika anda tidak pasti untuk "
+#~ "membuat pilihan, biarkan opsyen ini dalam keadaan asal. <p> Ambi "
+#~ "perhatian bahawa, adalah tidak mungkin untuk mematikan masukan PIN "
+#~ "sepenuhnya untuk tujuan keselamatan. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Sekali setiap sesi"
@@ -15891,16 +15617,21 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Beri Amaran Jika Sijil Luput</h1>\n"
-#~ "Jika opsyen ini disemak, anda akan diberi amaran apabila menggunakan sijil tandatangan yang luput dalam bilangan hari tertentu.\n"
+#~ "Jika opsyen ini disemak, anda akan diberi amaran apabila menggunakan "
+#~ "sijil tandatangan yang luput dalam bilangan hari tertentu.\n"
 #~ "<p>\n"
-#~ "Anda digalakkan membiarkan opsyen ini terbuka untuk mengelakkan berlakunya penggunaan sijil yang akan luput.\n"
+#~ "Anda digalakkan membiarkan opsyen ini terbuka untuk mengelakkan "
+#~ "berlakunya penggunaan sijil yang akan luput.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15912,14 +15643,17 @@ msgstr "&Tulis ganti"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Beri amaran jika alamat e-mel penandatangan tiada dalam sijil</h1>\n"
-#~ "Jika opsyen ini disemak, amaran akan diberi jika alamat e-mel tuan punya tandatangan tidak terkandung dalam sijil yang digunakan untuk menandatangan.\n"
+#~ "Jika opsyen ini disemak, amaran akan diberi jika alamat e-mel tuan punya "
+#~ "tandatangan tidak terkandung dalam sijil yang digunakan untuk "
+#~ "menandatangan.\n"
 #~ "<p>\n"
 #~ "Digalakkan membiarkan opsyen ini terbuka untuk ketelusan maksimum.\n"
 #~ "</qt>"
@@ -15938,10 +15672,6 @@ msgstr "&Tulis ganti"
 #~ msgstr "Simpan dalam Folder &Draf"
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "&Konfigur KMail..."
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Buka Dengan..."
 
@@ -15991,11 +15721,42 @@ msgstr "&Tulis ganti"
 #~ msgid "Please select the spam filters to be created inside KMail."
 #~ msgstr "Pilih penapis spam yang akan dicipta dalam KMail"
 
-#~ msgid "<p>Here you can get some assistance in setting up KMail's filter rules to use some commonly-known anti-spam tools.</p><p>The wizard can detect those tools on your computer as well as create filter rules to classify messages using these tools and to separate messages classified as spam. The wizard will not take any existing filter rules into consideration: it will always append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen during the scan of the messages for spam, you may encounter problems with the responsiveness of KMail because anti-spam tool operations are usually time consuming; please consider deleting the filter rules created by the wizard to get back to the former behavior."
-#~ msgstr "<p>Di sini anda boleh dapatkan bantuan mengeset peraturan penapis KMail untuk menggunakan beberapa alat antispam yang diketahui umum.</p><p> Wizard boleh mengesan alat tersebut dalam komputer, juga boleh mencipta peraturan penapis untuk mengkelaskan mesej, kemudian menggunakannya pula untuk mengasingkan mesej yang bertaraf spam . Wizard tidak akan mengambil kira peraturan penapis sedia ada: ia akan sentiasa menambah peraturan baru.</p><p><b>Amaran:</b> Jika KMail kelihatan kaku semasa mengimbas mesej bertaraf spam, ada kemungkinan anda berhadapan dengan masalah tindak balas KMail kerana operasi alat antispam biasanya mengambil masa yang lama; Pertimbangkan untuk menghapuskan peraturan penapis yang dicipta oleh wizard untuk kembali kepada peri laku sebelumnya."
+#~ msgid ""
+#~ "<p>Here you can get some assistance in setting up KMail's filter rules to "
+#~ "use some commonly-known anti-spam tools.</p><p>The wizard can detect "
+#~ "those tools on your computer as well as create filter rules to classify "
+#~ "messages using these tools and to separate messages classified as spam. "
+#~ "The wizard will not take any existing filter rules into consideration: it "
+#~ "will always append the new rules.</p><p><b>Warning:</b> As KMail appears "
+#~ "to be frozen during the scan of the messages for spam, you may encounter "
+#~ "problems with the responsiveness of KMail because anti-spam tool "
+#~ "operations are usually time consuming; please consider deleting the "
+#~ "filter rules created by the wizard to get back to the former behavior."
+#~ msgstr ""
+#~ "<p>Di sini anda boleh dapatkan bantuan mengeset peraturan penapis KMail "
+#~ "untuk menggunakan beberapa alat antispam yang diketahui umum.</p><p> "
+#~ "Wizard boleh mengesan alat tersebut dalam komputer, juga boleh mencipta "
+#~ "peraturan penapis untuk mengkelaskan mesej, kemudian menggunakannya pula "
+#~ "untuk mengasingkan mesej yang bertaraf spam . Wizard tidak akan mengambil "
+#~ "kira peraturan penapis sedia ada: ia akan sentiasa menambah peraturan "
+#~ "baru.</p><p><b>Amaran:</b> Jika KMail kelihatan kaku semasa mengimbas "
+#~ "mesej bertaraf spam, ada kemungkinan anda berhadapan dengan masalah "
+#~ "tindak balas KMail kerana operasi alat antispam biasanya mengambil masa "
+#~ "yang lama; Pertimbangkan untuk menghapuskan peraturan penapis yang "
+#~ "dicipta oleh wizard untuk kembali kepada peri laku sebelumnya."
 
-#~ msgid "<p>For these tools it is possible to let the wizard create filter rules. KMail tried to find the tools in the PATH of your system; the wizard does not allow you to create rules for tools which were not found: this is to keep your configuration consistent and to minimize the risk of unpredicted behavior.</p>"
-#~ msgstr "<p>Untuk peralatan berikut, wizard boleh mencipta peraturan penapis. KMail cuba mencari peralatan dalam PATH sistem anda; wizard tidak membenarkan anda mencipta peraturan untuk peralatan yang tidak wujud: tujuannya ialah supaya konfigurasi anda konsisten dan  risiko sikap tidak dijangka dapat diminimumkan.</p>"
+#~ msgid ""
+#~ "<p>For these tools it is possible to let the wizard create filter rules. "
+#~ "KMail tried to find the tools in the PATH of your system; the wizard does "
+#~ "not allow you to create rules for tools which were not found: this is to "
+#~ "keep your configuration consistent and to minimize the risk of "
+#~ "unpredicted behavior.</p>"
+#~ msgstr ""
+#~ "<p>Untuk peralatan berikut, wizard boleh mencipta peraturan penapis. "
+#~ "KMail cuba mencari peralatan dalam PATH sistem anda; wizard tidak "
+#~ "membenarkan anda mencipta peraturan untuk peralatan yang tidak wujud: "
+#~ "tujuannya ialah supaya konfigurasi anda konsisten dan  risiko sikap tidak "
+#~ "dijangka dapat diminimumkan.</p>"
 
 #~ msgid "(found on this system)"
 #~ msgstr "(ditemui dalam sistem)"
@@ -16006,20 +15767,47 @@ msgstr "&Tulis ganti"
 #~ msgid "Classify messages manually as spam"
 #~ msgstr "Kelaskan mesej sebagai spam secara manual"
 
-#~ msgid "Sometimes messages are classified wrongly or even not at all; the latter might be by intention, because you perhaps filter out messages from mailing lists before you let the anti-spam tools classify the rest of the messages. You can correct these wrong or missing classifications manually by using the appropriate toolbar buttons which trigger special filters created by this wizard."
-#~ msgstr "Kadang-kadang berlaku kesilapan pengelasan mesej atau pengelasan tidak berlaku langsung; yang kedua mungkin disengajakan kerana anda mungkin menapis mesej dari senarai mel sebelum alat antispam mengkelaskan mesej-mesej lain. Anda boleh membetulkan kelas yang silap atau hilang secara manual menggunakan butang bar alat yang sesuai. Ini akan mencetuskan penapis khas yang dicipta oleh wizard."
+#~ msgid ""
+#~ "Sometimes messages are classified wrongly or even not at all; the latter "
+#~ "might be by intention, because you perhaps filter out messages from "
+#~ "mailing lists before you let the anti-spam tools classify the rest of the "
+#~ "messages. You can correct these wrong or missing classifications manually "
+#~ "by using the appropriate toolbar buttons which trigger special filters "
+#~ "created by this wizard."
+#~ msgstr ""
+#~ "Kadang-kadang berlaku kesilapan pengelasan mesej atau pengelasan tidak "
+#~ "berlaku langsung; yang kedua mungkin disengajakan kerana anda mungkin "
+#~ "menapis mesej dari senarai mel sebelum alat antispam mengkelaskan mesej-"
+#~ "mesej lain. Anda boleh membetulkan kelas yang silap atau hilang secara "
+#~ "manual menggunakan butang bar alat yang sesuai. Ini akan mencetuskan "
+#~ "penapis khas yang dicipta oleh wizard."
 
 #~ msgid "Classify messages using the anti-spam tools"
 #~ msgstr "Kelaskan mesej menggunakan alat antispam"
 
-#~ msgid "Let the anti-spam tools classify your messages. The wizard will create appropriate filters. The messages are usually marked by the tools so that following filters can react on this and, for example, move spam messages to a special folder."
-#~ msgstr "Benarkan alat antispam mengelaskan mesej. Wizard akan mencipta penapis yang sesuai. Biasanya mesej akan ditandakan oleh alat supaya penapis berikut boleh bertindak balas dan, misalnya, mengalihkan mesej bertaraf spam ke folder khusus."
+#~ msgid ""
+#~ "Let the anti-spam tools classify your messages. The wizard will create "
+#~ "appropriate filters. The messages are usually marked by the tools so that "
+#~ "following filters can react on this and, for example, move spam messages "
+#~ "to a special folder."
+#~ msgstr ""
+#~ "Benarkan alat antispam mengelaskan mesej. Wizard akan mencipta penapis "
+#~ "yang sesuai. Biasanya mesej akan ditandakan oleh alat supaya penapis "
+#~ "berikut boleh bertindak balas dan, misalnya, mengalihkan mesej bertaraf "
+#~ "spam ke folder khusus."
 
-#~ msgid "A filter to detect messages classified as spam and to move those messages into a predefined folder is created. The default folder is the trash folder, but you may change that in the folder view."
-#~ msgstr "Penapis untuk mengesan mesej bertaraf spam dan mengalihkannya ke folder pratakrif, telah dicipta. Folder piawai adalah folder sampah, tetapi anda boleh mengubahnya dalam paparan folder."
+#~ msgid ""
+#~ "A filter to detect messages classified as spam and to move those messages "
+#~ "into a predefined folder is created. The default folder is the trash "
+#~ "folder, but you may change that in the folder view."
+#~ msgstr ""
+#~ "Penapis untuk mengesan mesej bertaraf spam dan mengalihkannya ke folder "
+#~ "pratakrif, telah dicipta. Folder piawai adalah folder sampah, tetapi anda "
+#~ "boleh mengubahnya dalam paparan folder."
 
 #~ msgid "Additionally, mark detected spam messages as read"
-#~ msgstr "Sebagai tambahan, tandakan mesej yang dikesan oleh sebagai sudah baca"
+#~ msgstr ""
+#~ "Sebagai tambahan, tandakan mesej yang dikesan oleh sebagai sudah baca"
 
 #~ msgid "Target folder for spam:"
 #~ msgstr "Folder sasaran untuk spam:"
@@ -16043,11 +15831,15 @@ msgstr "&Tulis ganti"
 
 #, fuzzy
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
-#~ "_n:Penghantaran selesai. %n mesej baru dalam %1 KB (%2 KB masih berada dalam pelayan).\n"
-#~ "Penghantaran selesai. %n mesej baru dalam %1 KB (%2 KB masih berada dalam pelayan)."
+#~ "_n:Penghantaran selesai. %n mesej baru dalam %1 KB (%2 KB masih berada "
+#~ "dalam pelayan).\n"
+#~ "Penghantaran selesai. %n mesej baru dalam %1 KB (%2 KB masih berada dalam "
+#~ "pelayan)."
 
 #, fuzzy
 #~ msgid ""
@@ -16070,11 +15862,15 @@ msgstr "&Tulis ganti"
 
 #, fuzzy
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "_n: Penghantaran untuk akaun %3 selesai. %n mesej baru dalam %1 KB (%2 KB masih berada dalam pelayan).\n"
-#~ "Penghantaran untuk akaun %3 selesai. %n mesej baru dalam %1 KB (%2 KB masih berada dalam pelayan)."
+#~ "_n: Penghantaran untuk akaun %3 selesai. %n mesej baru dalam %1 KB (%2 KB "
+#~ "masih berada dalam pelayan).\n"
+#~ "Penghantaran untuk akaun %3 selesai. %n mesej baru dalam %1 KB (%2 KB "
+#~ "masih berada dalam pelayan)."
 
 #, fuzzy
 #~ msgid ""
@@ -16098,11 +15894,21 @@ msgstr "&Tulis ganti"
 #~ msgid "S&top"
 #~ msgstr "&Hentikan"
 
-#~ msgid "Check this option if you want to be notified about new mail that is moved to this folder; unchecking this is useful, for example, for ignoring spam folders."
-#~ msgstr "Semak opsyen ini jika anda ingin diberitahu tentang mel baru yang dialihkan ke folder ini; menyahsemak ini adalah berfaedah, contohnya, untuk mengabaikan folder spam."
+#~ msgid ""
+#~ "Check this option if you want to be notified about new mail that is moved "
+#~ "to this folder; unchecking this is useful, for example, for ignoring spam "
+#~ "folders."
+#~ msgstr ""
+#~ "Semak opsyen ini jika anda ingin diberitahu tentang mel baru yang "
+#~ "dialihkan ke folder ini; menyahsemak ini adalah berfaedah, contohnya, "
+#~ "untuk mengabaikan folder spam."
 
-#~ msgid "<qt>The destination folder of the account <b>%1</b> was restored to the inbox.</qt>"
-#~ msgstr "<qt>Folder destinasi bagi akaun <b>%1</b> telah distor semula ke dalam peti masuk.</qt>"
+#~ msgid ""
+#~ "<qt>The destination folder of the account <b>%1</b> was restored to the "
+#~ "inbox.</qt>"
+#~ msgstr ""
+#~ "<qt>Folder destinasi bagi akaun <b>%1</b> telah distor semula ke dalam "
+#~ "peti masuk.</qt>"
 
 #~ msgid "&Expire Folder"
 #~ msgstr "&Luputkan Folder"
@@ -16155,7 +15961,8 @@ msgstr "&Tulis ganti"
 #~ msgid "Mark Thread as &Ham"
 #~ msgstr "Tandakan Rantaian sebagai &Ham"
 
-#~ msgid "Optional columns in the message list: status, attachment, important, etc."
+#~ msgid ""
+#~ "Optional columns in the message list: status, attachment, important, etc."
 #~ msgstr "Lajur opsyenal dalam senarai mesej: status, lampiran, penting dll."
 
 #~ msgid "Load external references for certain folders and on request"
@@ -16182,8 +15989,12 @@ msgstr "&Tulis ganti"
 #~ msgid "TDEWallet support"
 #~ msgstr "Sokongan TDEWallet "
 
-#~ msgid "New authentication methods for IMAP, POP3, SMTP: NTLM (Microsoft Windows) and GSSAPI (Kerberos)"
-#~ msgstr "Kaedah  pengesahan baru untuk IMAP, POP3, SMTP: NTLM (Microsoft Windows) dan GSSAPI (Kerberos)"
+#~ msgid ""
+#~ "New authentication methods for IMAP, POP3, SMTP: NTLM (Microsoft Windows) "
+#~ "and GSSAPI (Kerberos)"
+#~ msgstr ""
+#~ "Kaedah  pengesahan baru untuk IMAP, POP3, SMTP: NTLM (Microsoft Windows) "
+#~ "dan GSSAPI (Kerberos)"
 
 #~ msgid "Optional compression of attachments"
 #~ msgstr "Pemampatam  lampiran opsyenal"
@@ -16240,22 +16051,37 @@ msgstr "&Tulis ganti"
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "In a few easy steps, this wizard will help you with the creation of a certificate. You use your certificates in order to sign messages, to encrypt messages and to decrypt messages that other people send to you in encrypted form.\n"
+#~ "In a few easy steps, this wizard will help you with the creation of a "
+#~ "certificate. You use your certificates in order to sign messages, to "
+#~ "encrypt messages and to decrypt messages that other people send to you in "
+#~ "encrypted form.\n"
 #~ "<p>\n"
-#~ "The certificates can either be generated in a centralized or a decentralized manner. Please contact your local help desk if you are unsure how to create a certificate in your organization."
+#~ "The certificates can either be generated in a centralized or a "
+#~ "decentralized manner. Please contact your local help desk if you are "
+#~ "unsure how to create a certificate in your organization."
 #~ msgstr ""
 #~ "<b>Selamat datang ke Wizard Sijil.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "Dengan beberapa langkah, wizard akan membantu mencipta satu sijil. Sijil berguna untuk menandatangani mesej, menyulitkan mesej dan menyahsulitkan mesej sulit yang diterima dari penghantar.\n"
+#~ "Dengan beberapa langkah, wizard akan membantu mencipta satu sijil. Sijil "
+#~ "berguna untuk menandatangani mesej, menyulitkan mesej dan menyahsulitkan "
+#~ "mesej sulit yang diterima dari penghantar.\n"
 #~ "<p>\n"
-#~ "Sijil boleh dihasilkan dalam bentuk terpusat atau ternyahpusat. Hubungi meja bantuan setempat jika anda tidak pasti bagaimana hendak mencipta sijil dalam organisasi anda."
+#~ "Sijil boleh dihasilkan dalam bentuk terpusat atau ternyahpusat. Hubungi "
+#~ "meja bantuan setempat jika anda tidak pasti bagaimana hendak mencipta "
+#~ "sijil dalam organisasi anda."
 
 #~ msgid "Your Personal Data"
 #~ msgstr "Data Peribadi Anda"
 
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "Pada halaman ini, anda akan memasukkan beberapa data peribadi yang akan distor dalam sijil. Ini akan membantu orang lain mempastikan bahawa memang anda yang menghantar mesej."
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "Pada halaman ini, anda akan memasukkan beberapa data peribadi yang akan "
+#~ "distor dalam sijil. Ini akan membantu orang lain mempastikan bahawa "
+#~ "memang anda yang menghantar mesej."
 
 #~ msgid "Enter your name here"
 #~ msgstr "Masukkan nama anda di sini"
@@ -16266,14 +16092,22 @@ msgstr "&Tulis ganti"
 #~ msgid "Enter your organization here"
 #~ msgstr "Masukkan nama organisasi anda di sini"
 
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
-#~ msgstr "Masukkan organisasi anda (misalnya syarikat, jabatan atau autoriti anda) di sini seperti yang akan dipaparkan pada sijil."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
+#~ msgstr ""
+#~ "Masukkan organisasi anda (misalnya syarikat, jabatan atau autoriti anda) "
+#~ "di sini seperti yang akan dipaparkan pada sijil."
 
 #~ msgid "Enter your email address here"
 #~ msgstr "Masukkan alamat e-mel di sini"
 
-#~ msgid "Enter the email address here which you want to use in connection with the certificate."
-#~ msgstr "Masukkan alamat e-mel yang akan digunakan dalam sambungan dengan sijil di sini."
+#~ msgid ""
+#~ "Enter the email address here which you want to use in connection with the "
+#~ "certificate."
+#~ msgstr ""
+#~ "Masukkan alamat e-mel yang akan digunakan dalam sambungan dengan sijil di "
+#~ "sini."
 
 #~ msgid "&Department:"
 #~ msgstr "&Jabatan:"
@@ -16284,8 +16118,14 @@ msgstr "&Tulis ganti"
 #~ msgid "Certificate Generation"
 #~ msgstr "Penghasilan Sijil"
 
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "Pada halaman ini, anda akan memilih sama ada penghasilan sijil dibuat terpusat atau ternyahpusat. Jika anda tidak pasti untuk membuat pilihan, semak dengan meja bantuan setempat."
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "Pada halaman ini, anda akan memilih sama ada penghasilan sijil dibuat "
+#~ "terpusat atau ternyahpusat. Jika anda tidak pasti untuk membuat pilihan, "
+#~ "semak dengan meja bantuan setempat."
 
 #~ msgid "Certificate &Generation"
 #~ msgstr "&Penghasilan Sijil"
@@ -16304,15 +16144,26 @@ msgstr "&Tulis ganti"
 
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "Pasangan kekunci tandatangan anda sekarang sedia untuk dihantar ke AP (autoriti persijilan) yang akan menghasilkan satu sijil untuk anda dan menghantarnya balik melalui e-mel.  Semak semula sijil yang dipaparkan di bawah. Anda juga sepatutnya menulis jumlah semak supaya boleh memadankannya dengan sijil yang dihantar balik oleh AP.\n"
+#~ "Pasangan kekunci tandatangan anda sekarang sedia untuk dihantar ke AP "
+#~ "(autoriti persijilan) yang akan menghasilkan satu sijil untuk anda dan "
+#~ "menghantarnya balik melalui e-mel.  Semak semula sijil yang dipaparkan di "
+#~ "bawah. Anda juga sepatutnya menulis jumlah semak supaya boleh "
+#~ "memadankannya dengan sijil yang dihantar balik oleh AP.\n"
 #~ " <p>\n"
-#~ "Jika anda ingin membuat sebarang perubahan, tekan Undur dan buat perubahan. Jika tidak, tekan Selesai untuk menghantar  pasangan kekunci tandatangan kepada AP.\n"
+#~ "Jika anda ingin membuat sebarang perubahan, tekan Undur dan buat "
+#~ "perubahan. Jika tidak, tekan Selesai untuk menghantar  pasangan kekunci "
+#~ "tandatangan kepada AP.\n"
 #~ "</qt>"
 
 #~ msgid "Extension"
diff --git a/tde-i18n-nb/messages/tdepim/kmail.po b/tde-i18n-nb/messages/tdepim/kmail.po
index 23e275a8d62..ac18cb18b3f 100644
--- a/tde-i18n-nb/messages/tdepim/kmail.po
+++ b/tde-i18n-nb/messages/tdepim/kmail.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-03-17 14:43+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -25,7 +25,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -33,7 +33,7 @@ msgstr ""
 "Knut Yrvin, Bjørn Steensrud, Eskild Hustvedt, Håvard Korsvoll, Sven Harald "
 "Klein Bakke, Axel Bojer, Lars Risan"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -182,6 +182,12 @@ msgstr "&Ingen (brukes med forsiktighet)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto for halvautomatisk ressurshåndtering"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Tøm historien"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -198,8 +204,8 @@ msgstr "Tøm historien"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Sletter alle utdaterte tilordninger for ressursen som er representert av denne "
-"kontoen."
+"Sletter alle utdaterte tilordninger for ressursen som er representert av "
+"denne kontoen."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -260,13 +266,13 @@ msgstr "&Brukernavn:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Tjenesteleverandøren for Internett ga deg et <em>brukernavn</em> "
-"som brukes til å godkjenne din bruker på deres tjener. Ofte er det første delen "
-"av e-postadressen (teksten før <em>@</em>)."
+"Tjenesteleverandøren for Internett ga deg et <em>brukernavn</em> som brukes "
+"til å godkjenne din bruker på deres tjener. Ofte er det første delen av e-"
+"postadressen (teksten før <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -287,19 +293,19 @@ msgstr "&Lagre POP-passordet"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Kryss av her for å la KMail lagre passordet.\n"
-"Hvis TDEWallet er tilgjengelig vil passordet bli lagret i TDEWallet hvor det er "
-"regnet som sikkert.\n"
+"Hvis TDEWallet er tilgjengelig vil passordet bli lagret i TDEWallet hvor det "
+"er regnet som sikkert.\n"
 "Men dersom TDEWallet ikke er tilgjengelig vil passordet bli lagret i KMails "
-"oppsettsfil. Passordet vil bli lagret i et sært format, men burde ikke regnes "
-"som sikkert fra dekrypteringsforsøk dersom noen oppnår tilgang til "
+"oppsettsfil. Passordet vil bli lagret i et sært format, men burde ikke "
+"regnes som sikkert fra dekrypteringsforsøk dersom noen oppnår tilgang til "
 "oppsettsfila."
 
 #: accountdialog.cpp:640
@@ -328,8 +334,9 @@ msgstr "&Bruk filter hvis meldinga er større enn"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Denne funksjonen gjør at POP-filteret blir brukt for å avgjøre hva som skal "
 "skje med meldingene. Velg om du vil laste dem ned, slette dem, eller beholde "
@@ -382,13 +389,15 @@ msgstr "&Klartekst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -431,14 +440,14 @@ msgstr "Navnerom :"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Her kan du se de forskjellige navnerommene som din IMAP-tjener støtter. Hvert "
-"navnerom representerer en forstavelse som skiller grupper av mapper. Navnerom "
-"gjør det mulig for KMail å vise dine personlige og delte mapper i en og samme "
-"konto."
+"Her kan du se de forskjellige navnerommene som din IMAP-tjener støtter. "
+"Hvert navnerom representerer en forstavelse som skiller grupper av mapper. "
+"Navnerom gjør det mulig for KMail å vise dine personlige og delte mapper i "
+"en og samme konto."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -497,13 +506,13 @@ msgstr "Last &vedlegg ved behov"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Skru på dette for å ikke laste vedleggene automatisk når du velger meldinga, "
-"men bare når du klikker på vedlegget. På denne måten vises også store meldinger "
-"øyeblikkelig."
+"men bare når du klikker på vedlegget. På denne måten vises også store "
+"meldinger øyeblikkelig."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -514,8 +523,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Bare mapper som er åpne (utvidet) i mappe-treet blir sjekket for undermapper. "
-"Bruk dette hvis det er mange mapper på tjeneren."
+"Bare mapper som er åpne (utvidet) i mappe-treet blir sjekket for "
+"undermapper. Bruk dette hvis det er mange mapper på tjeneren."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -543,7 +552,7 @@ msgstr "<ingen>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "innboks"
 
@@ -551,43 +560,44 @@ msgstr "innboks"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Tjeneren ser ikke ut til å støtte unike meldingsnumre. Dette er et krav for å "
-"beholde meldinger på tjeneren.\n"
-"Siden enkelte tjenere gir feil opplysninger om sine muligheter, har du fortsatt "
-"muligheten til å beholde nedlastede meldinger på tjeneren."
+"Tjeneren ser ikke ut til å støtte unike meldingsnumre. Dette er et krav for "
+"å beholde meldinger på tjeneren.\n"
+"Siden enkelte tjenere gir feil opplysninger om sine muligheter, har du "
+"fortsatt muligheten til å beholde nedlastede meldinger på tjeneren."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Tjeneren ser ikke ut til å støtte nedlasting av meldingshoder, men dette er et "
-"krav ved filtrering av meldinger på tjeneren.\n"
-"Siden enkelte tjenere gir feil opplysninger om sine muligheter, har du fortsatt "
-"muligheten til å skru på meldingsfiltring på tjeneren."
+"Tjeneren ser ikke ut til å støtte nedlasting av meldingshoder, men dette er "
+"et krav ved filtrering av meldinger på tjeneren.\n"
+"Siden enkelte tjenere gir feil opplysninger om sine muligheter, har du "
+"fortsatt muligheten til å skru på meldingsfiltring på tjeneren."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Legg merke til at denne funksjonen kan føre til at enkelte POP3-tjenere som "
 "ikke støtter parallell nedlasting sender ødelagte e-poster.\n"
 "Du kan alltid velge denne funksjonen fordi enkelte tjenere støtter parallell "
-"nedlasting uten å gi beskjed om det. For å undersøke om POP3-tjeneren du bruker "
-"støtter parallell nedlasting kan du bruke knappen «Se hva tjeneren støtter» "
-"nederst i vinduet.\n"
+"nedlasting uten å gi beskjed om det. For å undersøke om POP3-tjeneren du "
+"bruker støtter parallell nedlasting kan du bruke knappen «Se hva tjeneren "
+"støtter» nederst i vinduet.\n"
 "Selv om tjeneren ikke sier fra om støtten, kan teste om den likevel støtter "
 "parallell nedlasting ved å sende flere e-poster til deg selv, for så å laste "
 "disse ned."
@@ -598,49 +608,49 @@ msgstr "Velg en tjener og port på fanen «Generelt» først."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Denne tjeneren ser ikke ut til å støtte parallell nedlasting, derfor har dette "
-"valget blitt skrudd av.\n"
-"Siden noen tjenere ikke oppgir om de støtter dette har du fremdeles muligheten "
-"til å skru det på. Men merk at denne funksjonen kan få noen POP tjenere som "
-"ikke støtter det til å sende skadede meldinger. Så før du bruker denne "
-"funksjonen med viktige meldinger, burde du først prøve det ved å sende et "
-"større antall testmeldinger til deg selv, og laste dem ned samtidig fra POP "
-"tjeneren."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Denne tjeneren ser ikke ut til å støtte parallell nedlasting, derfor har "
+"dette valget blitt skrudd av.\n"
+"Siden noen tjenere ikke oppgir om de støtter dette har du fremdeles "
+"muligheten til å skru det på. Men merk at denne funksjonen kan få noen POP "
+"tjenere som ikke støtter det til å sende skadede meldinger. Så før du bruker "
+"denne funksjonen med viktige meldinger, burde du først prøve det ved å sende "
+"et større antall testmeldinger til deg selv, og laste dem ned samtidig fra "
+"POP tjeneren."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Tjeneren ser ikke ut til å ha støtte for unike meldingsnummer, men dette er "
-"nødvendig for å la meldinger ligge på tjeneren; derfor har dette valget blitt "
-"skrudd av.\n"
-"Siden noen tjenere gir feil opplysninger om hva de kan gjøre, har du fremdeles "
-"mulighet til å la hentede meldinger ligge igjen på tjeneren."
+"nødvendig for å la meldinger ligge på tjeneren; derfor har dette valget "
+"blitt skrudd av.\n"
+"Siden noen tjenere gir feil opplysninger om hva de kan gjøre, har du "
+"fremdeles mulighet til å la hentede meldinger ligge igjen på tjeneren."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Tjeneren ser ikke ut til å ha støtte for å hente meldingshoder, men dette "
-"kreves for å filtre meldinger på tjeneren; derfor har dette valget blitt skrudd "
-"av.\n"
+"kreves for å filtre meldinger på tjeneren; derfor har dette valget blitt "
+"skrudd av.\n"
 "Siden noen tjenere gir feil opplysninger om hva de kan, har du fremdeles "
 "muligheten til å skru på filtrering av meldingene på tjeneren."
 
@@ -722,11 +732,11 @@ msgstr "IMAP konto"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Du må legge til en konto i nettverksdelen av innstillingene for å kunne motta "
-"e-post."
+"Du må legge til en konto i nettverksdelen av innstillingene for å kunne "
+"motta e-post."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -762,14 +772,14 @@ msgstr "Velkommen til KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Det ser ut til at du har startet Kmail for første gang. Du kan bruke denne "
-"veiviseren for å sette opp e-postkontoene dine. På de følgende sidene skriver "
-"du inn de opplysningene du har fått fra internettleverandøren din for å sette "
-"opp en e-postkonto.</qt>"
+"<qt>Det ser ut til at du har startet Kmail for første gang. Du kan bruke "
+"denne veiviseren for å sette opp e-postkontoene dine. På de følgende sidene "
+"skriver du inn de opplysningene du har fått fra internettleverandøren din "
+"for å sette opp en e-postkonto.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -831,8 +841,7 @@ msgstr "Bruk lokal levering"
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ingen"
@@ -926,7 +935,8 @@ msgid ""
 "software and re-run this wizard.</p>"
 msgstr ""
 "<p>Beklager. Ingen verktøy for å håndtere søppelpost ble funnet. Installer "
-"programvare for å oppdage søppelpost og kjør denne veiviseren en gang til.</p>"
+"programvare for å oppdage søppelpost og kjør denne veiviseren en gang til.</"
+"p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -971,30 +981,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Her kan du få litt hjelp med å sette opp KMails filterregler for å bruke "
-"noen kjente antivirusverktøy.</p>"
-"<p>Veiviseren kan oppdage disse verktøyene på din maskin i tillegg til å lage "
-"filterregler for å klassifisere meldinger ved hjelp av disse verktøyene og å "
-"skille ut meldinger som inneholder virus. Denne veiviseren vil ikke ta de "
-"allerede eksisterende reglene i betraktning: den vil alltid legge til de nye "
-"reglene "
-"<p>"
-"<p><b>Advarsel:</b> Siden KMail stopper opp mens meldingene kontrolleres for "
-"virus, kan du oppleve problemer med svartiden til KMail. Dette skyldes at det "
-"er tidkrevende å sjekke for virus. Du kan vurdere å slå av filterreglene som "
-"veiviseren lager dersom du får slike problemer."
+"noen kjente antivirusverktøy.</p><p>Veiviseren kan oppdage disse verktøyene "
+"på din maskin i tillegg til å lage filterregler for å klassifisere meldinger "
+"ved hjelp av disse verktøyene og å skille ut meldinger som inneholder virus. "
+"Denne veiviseren vil ikke ta de allerede eksisterende reglene i betraktning: "
+"den vil alltid legge til de nye reglene <p><p><b>Advarsel:</b> Siden KMail "
+"stopper opp mens meldingene kontrolleres for virus, kan du oppleve problemer "
+"med svartiden til KMail. Dette skyldes at det er tidkrevende å sjekke for "
+"virus. Du kan vurdere å slå av filterreglene som veiviseren lager dersom du "
+"får slike problemer."
 
 # | msgid "<p>Please select the tools to be used for the spam detection and go to the next page.</p>"
 #: antispamwizard.cpp:919
@@ -1003,8 +1010,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"</p>Velg verktøyet du vil bruke for å filtrere ut søppelposten og gå til neste "
-"side.</p>"
+"</p>Velg verktøyet du vil bruke for å filtrere ut søppelposten og gå til "
+"neste side.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1032,13 +1039,12 @@ msgstr "Flytt mulig sø&ppelpost til:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"Standard målmappe er Innboks. Du kan endre dette i mappevisningen under. "
-"<p> ikke alle verktøy kan finne «mulig» søppelpost. Dersom verktøyet du har "
+"Standard målmappe er Innboks. Du kan endre dette i mappevisningen under. <p> "
+"ikke alle verktøy kan finne «mulig» søppelpost. Dersom verktøyet du har "
 "valgt ikke støtter dette kan du heller ikke velge en mappe."
 
 #: antispamwizard.cpp:1068
@@ -1049,12 +1055,13 @@ msgstr "Sjekk meldingene ved å bruke antivirusverktøyene"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"La antivirusverktøyene sjekke meldingene dine. Disse meldingene er normalt sett "
-"markert av verktøyene slik at de følgende filtrene kan reagere på dette og, for "
-"eksempel, flytte meldinger som inneholder virus til en spesiell mappe."
+"La antivirusverktøyene sjekke meldingene dine. Disse meldingene er normalt "
+"sett markert av verktøyene slik at de følgende filtrene kan reagere på dette "
+"og, for eksempel, flytte meldinger som inneholder virus til en spesiell "
+"mappe."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1063,12 +1070,12 @@ msgstr "Flytt virusmeldinger som ble oppdaget til den valgte mappa"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Det er opprettet et filter for å finne meldinger som er klassifisert som at de "
-"inneholder virus og flytte disse meldingene til en bestemt mappe. Standardmappa "
-"er papirkurven, men du kan endre dette i mappeoversikten."
+"Det er opprettet et filter for å finne meldinger som er klassifisert som at "
+"de inneholder virus og flytte disse meldingene til en bestemt mappe. "
+"Standardmappa er papirkurven, men du kan endre dette i mappeoversikten."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1076,8 +1083,8 @@ msgstr "Merk dessuten infiserte meldinger som lest"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Merk meldinger som har blitt klassifisert som virusinfisert som leste, i "
 "tillegg til å flytte dem til den valgte mappa."
@@ -1260,9 +1267,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Det kan være fordi du mangler tillatelse til å gjøre dette, eller fordi mappa "
-"allerede finnes på tjeneren. Her er feilmeldinga fra kommunikasjonen med "
-"tjeneren:"
+"Det kan være fordi du mangler tillatelse til å gjøre dette, eller fordi "
+"mappa allerede finnes på tjeneren. Her er feilmeldinga fra kommunikasjonen "
+"med tjeneren:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1275,8 +1282,8 @@ msgstr "Klarte ikke å lese mappa %1 på tjeneren:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1296,8 +1303,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1328,20 +1335,20 @@ msgstr "Slettet"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Ingen av dine identiteter stemmer med mottakeradressen til denne meldinga, "
-"<br>velg hvilken av disse adressene, om noen, som er din:"
+"<qt>Ingen av dine identiteter stemmer med mottakeradressen til denne "
+"meldinga, <br>velg hvilken av disse adressene, om noen, som er din:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Flere av dine identiteter stemmer med mottakeradressen til denne meldinga, "
-"<br>velg hvilken av disse adressene som er din:"
+"<qt>Flere av dine identiteter stemmer med mottakeradressen til denne "
+"meldinga, <br>velg hvilken av disse adressene som er din:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1371,18 +1378,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Denne innstillinga er fastsatt av systemadministrator. </p> "
-"<p>Hvis du tror det er en feil, så kontakt henne.</p></qt>"
+"<qt> <p>Denne innstillinga er fastsatt av systemadministrator. </p> <p>Hvis "
+"du tror det er en feil, så kontakt henne.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Last profil …"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Oppsett av konto"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Legg til …"
@@ -1413,6 +1423,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Fjern identitet"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Fj&ern"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Legg til …"
@@ -1421,6 +1436,11 @@ msgstr "Legg til …"
 msgid "Modify..."
 msgstr "Endre …"
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Fj&ern"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Velg som standard"
@@ -1437,17 +1457,15 @@ msgstr "&Sende"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Utgående kontoer (legg til minst en):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Navn"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1469,8 +1487,7 @@ msgstr "Velg som standard"
 msgid "Common Options"
 msgstr "Vanlige innstillinger"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Bekreft før sending"
@@ -1521,17 +1538,16 @@ msgstr "S&tandarddomene:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Standarddomenet settes etter alfakrøllen («@») i ufullstendige adresser.</p>"
-"</qt>"
+"<qt> <p>Standarddomenet settes etter alfakrøllen («@») i ufullstendige "
+"adresser.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1549,9 +1565,9 @@ msgstr "Legg til transport"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Standard)"
 
@@ -1634,6 +1650,10 @@ msgstr "Endre konto"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Finner ikke kontoen <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Farger"
@@ -1742,8 +1762,7 @@ msgstr "Besøkt lenke"
 msgid "Misspelled Words"
 msgstr "Feilstavede ord"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Ny melding"
@@ -1932,8 +1951,8 @@ msgstr "Trådene er i utgangspunktet lukkede"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Åpne tråder som inneholder n&ye, uleste eller viktige meldinger og åpne "
 "overvåkede tråder."
@@ -1944,66 +1963,50 @@ msgstr "Datovisning"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p> <strong>Følgende uttrykk kan brukes for datoer:</strong></p> "
-"<ul> "
-"<li>d – datoen er et tall uten null foran (1-31)</li> "
-"<li>dd – dagen er et tall med null foran (01-31)</li> "
-"<li>ddd – dagen er en forkortelse for ukedagen (man – søn)</li> "
-"<li>dddd – langt dagnavn (mandag-søndag)</li> "
-"<li>M – måned som tall uten null foran (1-12)</li> "
-"<li> MM – måned som tall med null foran (01-12)</li> "
-"<li>MMM – forkortet månedsnavn (jan – des)</li> "
-"<li> MMMM – fullt månedsnavn (januar – desember)</li> "
-"<li>yy – året er et tosifret tall (00-99)</li> "
-"<li>yyyy – året er et firesifret tall (0000-9999)</li></ul> "
-"<p><strong>Disse uttrykkene kan brukes for klokkeslett:</string></p> "
-"<ul> "
-"<li>m – minutter uten null foran(0-59)</li> "
-"<li>mm – minutter med null foran(00-59)</li> "
-"<li>s – sekunder uten null foran(0-59)</li> "
-"<li>ss – sekunder med null foran (00-59)</li> "
-"<li>z – millisekunder uten null foran(0-999)</li> "
-"<li>zzz – millisekunder med null foran(000-999)</li> "
-"<li>AP – vis AM/PM. AP blir erstattet med enten «AM» eller «PM».</li> "
-"<li>ap – bytter til AM/PM-visning. ap blir erstattet med enten «am» eller "
-"«pm».</li> "
-"<li>Z – tidssone i numerisk format (-0500)</li> </ul></ul>"
-"<p><strong>Alle andre inn-tegn blir ignorert</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p> <strong>Følgende uttrykk kan brukes for datoer:</strong></p> <ul> "
+"<li>d – datoen er et tall uten null foran (1-31)</li> <li>dd – dagen er et "
+"tall med null foran (01-31)</li> <li>ddd – dagen er en forkortelse for "
+"ukedagen (man – søn)</li> <li>dddd – langt dagnavn (mandag-søndag)</li> "
+"<li>M – måned som tall uten null foran (1-12)</li> <li> MM – måned som tall "
+"med null foran (01-12)</li> <li>MMM – forkortet månedsnavn (jan – des)</li> "
+"<li> MMMM – fullt månedsnavn (januar – desember)</li> <li>yy – året er et "
+"tosifret tall (00-99)</li> <li>yyyy – året er et firesifret tall "
+"(0000-9999)</li></ul> <p><strong>Disse uttrykkene kan brukes for klokkeslett:"
+"</string></p> <ul> <li>m – minutter uten null foran(0-59)</li> <li>mm – "
+"minutter med null foran(00-59)</li> <li>s – sekunder uten null foran(0-59)</"
+"li> <li>ss – sekunder med null foran (00-59)</li> <li>z – millisekunder uten "
+"null foran(0-999)</li> <li>zzz – millisekunder med null foran(000-999)</li> "
+"<li>AP – vis AM/PM. AP blir erstattet med enten «AM» eller «PM».</li> <li>ap "
+"– bytter til AM/PM-visning. ap blir erstattet med enten «am» eller «pm».</"
+"li> <li>Z – tidssone i numerisk format (-0500)</li> </ul></"
+"ul><p><strong>Alle andre inn-tegn blir ignorert</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Endring av de globale trådinnstillingene vil overstyre alle de lokale "
 "mappeinnstillingene."
@@ -2020,8 +2023,7 @@ msgstr "Vis HTML-stat&usstolpe"
 msgid "Show s&pam status in fancy headers"
 msgstr "Vis søppelpoststatus i flotte meldingshoder"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Vis humørfjes som ikon"
@@ -2030,8 +2032,7 @@ msgstr "Vis humørfjes som ikon"
 msgid "Use smaller font for quoted text"
 msgstr "Bruk mindre font for sitert tekst"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Vis hermetegn for utvid/fold sammen."
@@ -2057,8 +2058,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Overkjør tegnkoding:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Bruk systemikonfeltet"
@@ -2160,22 +2160,19 @@ msgstr "<b>%f</b> blir erstattet med navnet på fila som skal redigeres."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Du kan bruke følgende symbol i svarmeldingene: "
-"<br><b>%D</b>: dato, <b>%S</b>: emne, "
-"<br><b>%e</b>: avsenderadresse, <b>%F</b> avsenderens navn, <b>%f</b>"
-": forbokstavene til avsenderen,"
-"<br><b>%T</b>: mottakerens navn, <b>%t</b>: mottakerens navn og adresse, "
-"<br><b>%C</b>: kopimottakernes navn, <b>%c</b>: kopimottakernes navn og "
-"adresser, "
-"<br><b>%%</b>: prosenttegn, <b>%_</B>: mellomrom, <b>%L</b>: linjeskift</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Du kan bruke følgende symbol i svarmeldingene: <br><b>%D</b>: dato, <b>"
+"%S</b>: emne, <br><b>%e</b>: avsenderadresse, <b>%F</b> avsenderens navn, <b>"
+"%f</b>: forbokstavene til avsenderen,<br><b>%T</b>: mottakerens navn, <b>%t</"
+"b>: mottakerens navn og adresse, <br><b>%C</b>: kopimottakernes navn, <b>%c</"
+"b>: kopimottakernes navn og adresser, <br><b>%%</b>: prosenttegn, <b>%_</B>: "
+"mellomrom, <b>%L</b>: linjeskift</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2198,21 +2195,20 @@ msgstr "Svar til &alle:"
 msgid "&Forward:"
 msgstr "&Videresend:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Siteringstegn:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D, skrev du :"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D, skrev %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Videresendt melding"
 
@@ -2250,11 +2246,11 @@ msgstr "Oppgi ny forstavelse for videresending:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"For hvert brev som sendes sjekkes denne lista ovenfra og ned etter et tegnsett "
-"som inneholder alle de nødvendige tegnene. "
+"For hvert brev som sendes sjekkes denne lista ovenfra og ned etter et "
+"tegnsett som inneholder alle de nødvendige tegnene. "
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2288,10 +2284,9 @@ msgstr "Verdi"
 msgid "Ne&w"
 msgstr "N&y"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Navn:"
@@ -2300,19 +2295,18 @@ msgstr "&Navn:"
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Vedleggsnavngivning som samspiller med Outlook."
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Slå på dette for å få Outlook(tm) til å forstå navn på vedlegg med "
-"ikke-engelske tegn"
+"Slå på dette for å få Outlook(tm) til å forstå navn på vedlegg med ikke-"
+"engelske tegn"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2338,20 +2332,20 @@ msgstr "vedlagt"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Du har valgt å bruke en metode for koding av ikke-engelske tegn i navn til "
 "vedlegg som blir forstått av Outlook(tm) og andre e-postklienter som ikke "
 "støtter standarden for koding av navn på vedlegg.\n"
-"Merk at KMail kan lage ikke-standard meldinger, og det er da mulig at meldinga "
-"ikke blir forstått av e-postklienter som følger standarden; så du bør bare "
-"bruke dette valget hvis du ikke har noe annet valg."
+"Merk at KMail kan lage ikke-standard meldinger, og det er da mulig at "
+"meldinga ikke blir forstått av e-postklienter som følger standarden; så du "
+"bør bare bruke dette valget hvis du ikke har noe annet valg."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2375,110 +2369,96 @@ msgstr "Programt&illegg for kryptering"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Noen ganger kommer meldinger i begge format. Her bestemmer du om du vil "
-"vise meldinga med HTML eller som ren tekst.</p> "
-"<p>Å bruke HTML-visning kan se bedre ut, men øker risikoen for at "
-"sikkerhetshull utnyttes.</p> "
-"<p>Å vise bare ren tekst utelater mye av formateringen, men gjør det i nærheten "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt> <p> Noen ganger kommer meldinger i begge format. Her bestemmer du om du "
+"vil vise meldinga med HTML eller som ren tekst.</p> <p>Å bruke HTML-visning "
+"kan se bedre ut, men øker risikoen for at sikkerhetshull utnyttes.</p> <p>Å "
+"vise bare ren tekst utelater mye av formateringen, men gjør det i nærheten "
 "av <em>umulig</em> å utnytte sikkerhetshull i HTML-viseren (Konqueror).</p> "
 "<p>Valget nedenfor beskytter mot et par av ulempene ved HTML-meldinger, men "
 "beskytter ikke mot sikkerhetsspørsmål som ikke er kjent når denne utgaven av "
-"KMail ble skrevet.</p>"
-"<p>Det er derfor best å <em>ikke</em> velge HTML framfor tekst</p> "
-"<p><b>Merk:</b> Man kan velge dette for hver enkelt mappe fra <i>Mappe</i>"
-"-menyen i KMails hovedvindu</p></qt>"
+"KMail ble skrevet.</p><p>Det er derfor best å <em>ikke</em> velge HTML "
+"framfor tekst</p> <p><b>Merk:</b> Man kan velge dette for hver enkelt mappe "
+"fra <i>Mappe</i>-menyen i KMails hovedvindu</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Noen e-postannonser er i HTML og inneholder referanser til for eksempel "
-"bilder som annonsøren bruker til å finne ut at du har sett meldinga.</p> "
-"<p> Det er ingen gyldig grunn til å laste inn bilder fra nettet på denne måten, "
-"siden avsenderen alltid kan legge ved bildet direkte i meldinga.</p> "
-"<p> For å beskytte mot slik misbruk av KMails HTML-visning er dette valget i "
-"utgangspunktet <em>slått av</em>. </p> "
-"<p> Skulle du likevel ønske (for eksempel) å se bilder i HTML-meldinger uten at "
-"bildet er lagt ved, så kan du slå dette på, men du bør være oppmerksom på "
-"problemene dette kan føre til.</p>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt> <p>Noen e-postannonser er i HTML og inneholder referanser til for "
+"eksempel bilder som annonsøren bruker til å finne ut at du har sett meldinga."
+"</p> <p> Det er ingen gyldig grunn til å laste inn bilder fra nettet på "
+"denne måten, siden avsenderen alltid kan legge ved bildet direkte i meldinga."
+"</p> <p> For å beskytte mot slik misbruk av KMails HTML-visning er dette "
+"valget i utgangspunktet <em>slått av</em>. </p> <p> Skulle du likevel ønske "
+"(for eksempel) å se bilder i HTML-meldinger uten at bildet er lagt ved, så "
+"kan du slå dette på, men du bør være oppmerksom på problemene dette kan føre "
+"til.</p>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt> "
-"<h3>Håndtering av forespørsler om meldingskvittering</h3> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt> <h3>Håndtering av forespørsler om meldingskvittering</h3> "
 "<p>Meldingskvitteringer (engelsk forkortelse MDN) er en utvidelse av det som "
 "ofte kalles <b>lest-melding</b>. Den som sender meldingameldinga få "
 "tilbakemelding fra systemet, og mottakerens e-postprogram lager et svar som "
-"viser avsenderen hva som har hendt med meldinga. Vanlige tilbakemeldinger er <b>"
-"vist</b> (dvs. lest), <b>slettet</b> og <b>oversendt</b> "
-"(f.eks. videresendt). </p> "
-"<p>For å styre sending av meldingskvitteringer i KMail har du disse valgene:</p> "
-"<ul> "
-"<li><em>Ignorer</em>: Ignorer alle forespørsler om meldingskvitteringer. Ingen "
-"kvittering blir sendt automatisk (anbefales). </li> "
-"<li><em>Spør</em>: Sender meldingskvittering bare etter at brukeren er blitt "
-"spurt om det. På denne måten kan du sende kvittering for noen meldinger, mens "
-"du avviser eller ignorerer andre.</li> "
+"viser avsenderen hva som har hendt med meldinga. Vanlige tilbakemeldinger er "
+"<b>vist</b> (dvs. lest), <b>slettet</b> og <b>oversendt</b> (f.eks. "
+"videresendt). </p> <p>For å styre sending av meldingskvitteringer i KMail "
+"har du disse valgene:</p> <ul> <li><em>Ignorer</em>: Ignorer alle "
+"forespørsler om meldingskvitteringer. Ingen kvittering blir sendt automatisk "
+"(anbefales). </li> <li><em>Spør</em>: Sender meldingskvittering bare etter "
+"at brukeren er blitt spurt om det. På denne måten kan du sende kvittering "
+"for noen meldinger, mens du avviser eller ignorerer andre.</li> "
 "<li><em>Avvis</em>: Sender alltid en <b>avvist</b>-kvittering. Dette er bare "
 "<em>litt</em> bedre enn å alltid sende kvitteringer. Avsender får fremdeles "
-"vite at meldinga er kommet fram, men får ikke vite om den er lest eller slettet "
-"osv.</li> "
-"<li><em>Send alltid</em>: Sender alltid kvitteringen når det spørres etter det. "
-"Det betyr at avsenderen får vite når meldinga kom fram og hva som har hendt med "
-"den (vist, slettet osv.). Dette valget frarådes sterkt, men siden det er "
-"ønskelig for behandling av f.eks. kundeforhold. så er det gjort "
-"tilgjengelig.</li></ul></qt>"
+"vite at meldinga er kommet fram, men får ikke vite om den er lest eller "
+"slettet osv.</li> <li><em>Send alltid</em>: Sender alltid kvitteringen når "
+"det spørres etter det. Det betyr at avsenderen får vite når meldinga kom "
+"fram og hva som har hendt med den (vist, slettet osv.). Dette valget "
+"frarådes sterkt, men siden det er ønskelig for behandling av f.eks. "
+"kundeforhold. så er det gjort tilgjengelig.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2494,15 +2474,15 @@ msgstr "Tillat brev å hente e&ksterne referanser fra Internett"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ADVARSEL:</b> Å bruke HTML i e-post kan gjøre det lettere for uvedkommende å "
-"utnyttet sikkerhetshull for å få tilgang til systemet. <a href=\"whatsthis:%1\">"
-"Mer om HTML e-post … </a> <a href=\"whatsthis:%2\">Mer om eksterne referanser "
-"…</a>"
+"<b>ADVARSEL:</b> Å bruke HTML i e-post kan gjøre det lettere for "
+"uvedkommende å utnyttet sikkerhetshull for å få tilgang til systemet. <a "
+"href=\"whatsthis:%1\">Mer om HTML e-post … </a> <a href=\"whatsthis:%2\">Mer "
+"om eksterne referanser …</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2563,8 +2543,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>ADVARSEL:</b> Betingelsesløse bekreftelser kan undergrave personvernet. <a "
-"href=\"whatsthis:%1\">Mer …</a>"
+"<b>ADVARSEL:</b> Betingelsesløse bekreftelser kan undergrave personvernet. "
+"<a href=\"whatsthis:%1\">Mer …</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2585,8 +2565,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Dette valget krever dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "ingen mellomtjener"
@@ -2615,8 +2594,8 @@ msgstr "&Ikke la viktige meldinger blir foreldet"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Ved søk etter uleste meldinger:"
 
@@ -2640,8 +2619,8 @@ msgstr "Gå rundt i alle mapper"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Når du åpner en mappe:"
 
@@ -2710,26 +2689,23 @@ msgstr "Kataloger («maildir»-format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt> "
-"<p>Her velger du hva slags format e-postkassen skal bruke som standard for "
-"lokale mapper:</p> "
-"<p><b>mbox:</b>KMails e-postmappe er bare en fil. Hver melding adskilles med en "
-"linje som starter med «Fra». Dette sparer diskplass, men kan være mindre "
-"robust, f.eks. når man flytter meldinger mellom mapper</p> "
-"<p><b>maildir:</b> KMails e-postmapper er virkelige mapper på harddisken. Hver "
-"melding lagres som en egen fil. Dette kan kaste bort plass på disken, men burde "
-"være mer robust, f.eks. når man flytter meldinger mellom mapper.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt> <p>Her velger du hva slags format e-postkassen skal bruke som standard "
+"for lokale mapper:</p> <p><b>mbox:</b>KMails e-postmappe er bare en fil. "
+"Hver melding adskilles med en linje som starter med «Fra». Dette sparer "
+"diskplass, men kan være mindre robust, f.eks. når man flytter meldinger "
+"mellom mapper</p> <p><b>maildir:</b> KMails e-postmapper er virkelige mapper "
+"på harddisken. Hver melding lagres som en egen fil. Dette kan kaste bort "
+"plass på disken, men burde være mer robust, f.eks. når man flytter meldinger "
+"mellom mapper.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2763,52 +2739,43 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Når du hopper til neste uleste melding, kan det hende at det ikke finnes "
-"flere uleste meldinger lenger nede.</p>"
-"<p><b>Ikke gå rundt:</b> Søket stopper ved siste melding i den åpne mappa.</p> "
-"<p><b>Gå rundt i den åpne mappa: </b> Søket fortsetter fra toppen av mappa, men "
-"går ikke videre til neste mappe.</p>"
-"<p><b> Gå rundt i alle mapper:</b> Søket fortsetter fra toppen av mappa Hvis "
-"det ikke er flere uleste meldinger, fortsetter søket til neste mappe med uleste "
-"meldinger.</p>"
-"<p> Likeså når du søker etter forrige uleste melding, vil søket bli startet fra "
-"bunnen av mappa og fortsette med forrige mappe, avhengig av hva du har "
-"valgt.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt> <p> Når du hopper til neste uleste melding, kan det hende at det ikke "
+"finnes flere uleste meldinger lenger nede.</p><p><b>Ikke gå rundt:</b> Søket "
+"stopper ved siste melding i den åpne mappa.</p> <p><b>Gå rundt i den åpne "
+"mappa: </b> Søket fortsetter fra toppen av mappa, men går ikke videre til "
+"neste mappe.</p><p><b> Gå rundt i alle mapper:</b> Søket fortsetter fra "
+"toppen av mappa Hvis det ikke er flere uleste meldinger, fortsetter søket "
+"til neste mappe med uleste meldinger.</p><p> Likeså når du søker etter "
+"forrige uleste melding, vil søket bli startet fra bunnen av mappa og "
+"fortsette med forrige mappe, avhengig av hva du har valgt.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fulltekstindeksering tillater svært hurtige søk i meldingene dine. "
-"Verktøylinja for søk vil også gi mulighet for søk i meldingsinnhold.</p>"
-"<p> Dette vil bruke en del plass på harddisken (omtrent halvparten av det "
-"meldingene bruker allerede)</p>"
-"<p>Når du slår på denne funksjonen må indeksen bygges, men du kan fortsette å "
-"bruke KMail mens denne operasjonen pågår.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Fulltekstindeksering tillater svært hurtige søk i meldingene dine. "
+"Verktøylinja for søk vil også gi mulighet for søk i meldingsinnhold.</p><p> "
+"Dette vil bruke en del plass på harddisken (omtrent halvparten av det "
+"meldingene bruker allerede)</p><p>Når du slår på denne funksjonen må "
+"indeksen bygges, men du kan fortsette å bruke KMail mens denne operasjonen "
+"pågår.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2875,8 +2842,8 @@ msgstr "&Skjul gruppevaremapper"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "Når dette er valgt, vil du ikke se IMAP-ressursmappene i mappetreet"
 
 #: configuredialog.cpp:4909
@@ -2887,8 +2854,8 @@ msgstr "&Resursmapper er i kontoen:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "Når dette er valgt, vil du ikke se IMAP-ressursmappene i mappetreet"
 
 #: configuredialog.cpp:4921
@@ -2944,19 +2911,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Vedleggsnavngivning som samspiller med Outlook."
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatisk invitasjonssending"
@@ -2966,29 +2932,28 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Når dette er på vil brukeren ikke se meldingsvinduet. Invitasjonsmeldinger blir "
-"sendt automatisk"
+"Når dette er på vil brukeren ikke se meldingsvinduet. Invitasjonsmeldinger "
+"blir sendt automatisk"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Invitasjoner er normalt sett sendt som vedlegg til meldinger. Dette valget "
-"endrer på invitasjonsmeldingene slik at invitasjonene står i meldingsteksten "
-"istedenfor; dette er nødvendig for å sende invitasjoner og svar til Microsoft "
-"Outlook."
-"<br>Men, når du gjør dette vil du ikke lenger få beskrivende tekst som "
-"e-postprogrammer kan lese; så for folk som har e-postprogrammer som ikke "
-"forstår invitasjonen vil de meldingene se veldig rare ut."
-"<br>Folk som har e-postprogrammer som forstår invitasjoner, vil fremdeles kunne "
-"bruke dette.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Invitasjoner er normalt sett sendt som vedlegg til meldinger. Dette "
+"valget endrer på invitasjonsmeldingene slik at invitasjonene står i "
+"meldingsteksten istedenfor; dette er nødvendig for å sende invitasjoner og "
+"svar til Microsoft Outlook.<br>Men, når du gjør dette vil du ikke lenger få "
+"beskrivende tekst som e-postprogrammer kan lese; så for folk som har e-"
+"postprogrammer som ikke forstår invitasjonen vil de meldingene se veldig "
+"rare ut.<br>Folk som har e-postprogrammer som forstår invitasjoner, vil "
+"fremdeles kunne bruke dette.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3092,29 +3057,27 @@ msgstr "Send videre"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Her kan du legge til, redigere og slette selvvalgte meldingsmaler til bruk "
-"når du lager et svar eller sender en melding videre. Opprett en mal ved å velge "
-"den med menyen under høyre museknapp eller menyen på verktøylinja. Du kan også "
-"tilordne en tastekombinasjon til malen, som gir rask tilgang.</p> "
-"<p> Meldingsmaler støtter erstatningskommandoer, ved bare å taste dem eller ved "
-"å velge dem i menyen <i>Sett inn kommando</i>.</p> "
-"<p> Det er fire slags tilpassede menyer: de brukes til <i>Svar</i>, <i>"
-"Svar til alle</i>,<i>Send videre</i> og <i>Universal</i> "
-"som kan brukes til all slags handlinger. Tastebindinger kan ikke knyttes til <i>"
-"Universal</i>-maler.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt> <p>Her kan du legge til, redigere og slette selvvalgte meldingsmaler "
+"til bruk når du lager et svar eller sender en melding videre. Opprett en mal "
+"ved å velge den med menyen under høyre museknapp eller menyen på "
+"verktøylinja. Du kan også tilordne en tastekombinasjon til malen, som gir "
+"rask tilgang.</p> <p> Meldingsmaler støtter erstatningskommandoer, ved bare "
+"å taste dem eller ved å velge dem i menyen <i>Sett inn kommando</i>.</p> <p> "
+"Det er fire slags tilpassede menyer: de brukes til <i>Svar</i>, <i>Svar til "
+"alle</i>,<i>Send videre</i> og <i>Universal</i> som kan brukes til all slags "
+"handlinger. Tastebindinger kan ikke knyttes til <i>Universal</i>-maler.</p></"
+"qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3131,15 +3094,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3157,8 +3120,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Den snarveien som er valgt er allerede i bruk for en annen selvvalgt mal, vil "
-"du likevel fortsette med tilordningen?"
+"Den snarveien som er valgt er allerede i bruk for en annen selvvalgt mal, "
+"vil du likevel fortsette med tilordningen?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3204,8 +3167,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Det finnes allerede en distribusjonsliste med navnet <b>%1</b> "
-". Vennligst velg et annet navn.</qt>"
+"<qt>Det finnes allerede en distribusjonsliste med navnet <b>%1</b> . "
+"Vennligst velg et annet navn.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3214,8 +3177,8 @@ msgstr "Rediger identitet"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3474,6 +3437,11 @@ msgstr "Velg mappe"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Merk all tekst"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3505,8 +3473,8 @@ msgstr "&Logg filteraktiviteter"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Du kan skru på og av logging av filteraktiviteter her. Loggede data "
 "blirnaturligvis samlet og vises bare dersom logging er på."
@@ -3525,10 +3493,11 @@ msgstr "Logg evaluering av filter&regel"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Du kan kontrollere tilbakemeldinga i loggen som har med evalueringen av "
 "filterreglene av filtre som er på. Hvis dette valget er på, vil du få  "
@@ -3553,15 +3522,15 @@ msgstr "uendelig"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Samling av loggdata bruker minnet til midlertidig lagring av loggdata; her kan "
-"du begrense største mengde minne som kan brukes: hvis de samlede loggdataen "
-"overstiger begrensningen, vil det eldste bli avvist inntil begrensningen ikke "
-"lenger overstiges."
+"Samling av loggdata bruker minnet til midlertidig lagring av loggdata; her "
+"kan du begrense største mengde minne som kan brukes: hvis de samlede "
+"loggdataen overstiger begrensningen, vil det eldste bli avvist inntil "
+"begrensningen ikke lenger overstiges."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3571,7 +3540,7 @@ msgstr ""
 "Kunne ikke skrive til fila %1:\n"
 "«%2» er den detaljerte feilbeskrivelsen."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Kmail-feil"
@@ -3612,13 +3581,13 @@ msgstr "&Brukeridentifikator:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Bruker identifikasjonen er brukerens brukernavn på IMAP tjeneren. Dette kan "
-"være et enkelt brukernavn, eller hele e-postadressen til brukeren; brukernavnet "
-"for å logge deg inn på tjeneren vil fortelle deg hvilken det er."
+"være et enkelt brukernavn, eller hele e-postadressen til brukeren; "
+"brukernavnet for å logge deg inn på tjeneren vil fortelle deg hvilken det er."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3669,8 +3638,8 @@ msgstr "Mangler lese/skrive-tillatelse til papirkurvmappa."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "Informasjonen er ikke mottatt fra tjeneren enda. Bruk «Sjekk e-post»"
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3681,8 +3650,7 @@ msgstr "Feil: ingen IMAP konto angitt for denne mappen"
 msgid "Connecting to server %1, please wait..."
 msgstr "Kobler til tjeneren %1, vennligst vent …"
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Klarte ikke å koble til tjeneren %1"
@@ -3710,11 +3678,11 @@ msgstr "Legg til rettigheter"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Vil du virkelig fjerne dine egne rettigheter for denne mappen? Du vil ikke ha "
-"tilgang til den etterpå."
+"Vil du virkelig fjerne dine egne rettigheter for denne mappen? Du vil ikke "
+"ha tilgang til den etterpå."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3745,7 +3713,7 @@ msgstr "Bruk:"
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale mapper"
@@ -3769,13 +3737,13 @@ msgstr "Velg snarvei for mappe"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>For å velge en tast eller en kombinasjon av taster som velger den gjeldende "
-"mappen, klikk på knappen under og trykk tast(ene) du vil tilknytte denne "
-"mappa.</qt>"
+"<qt>For å velge en tast eller en kombinasjon av taster som velger den "
+"gjeldende mappen, klikk på knappen under og trykk tast(ene) du vil tilknytte "
+"denne mappa.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3795,13 +3763,22 @@ msgstr "&Avbryt"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 "<qt>Mappa du slettet hørte til kontoen <b>%1</b> som leverte e-post til den. "
 "Kontoen vil heretter levere e-post til innboks.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Ukjent"
@@ -3926,71 +3903,17 @@ msgstr "Søppelpost status:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>l"
-"<br>d"
-"<br>i"
-"<br>n"
-"<br>g</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>l<br>d<br>i<br>n<br>g</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>I"
-"<br>k"
-"<br>k"
-"<br>e"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>"
-"<br>M"
-"<br>e"
-"<br>l"
-"<br>d"
-"<br>i"
-"<br>n"
-"<br>g</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>I<br>k<br>k<br>e<br><br>H<br>T<br>M<br>L<br><br>M<br>e<br>l<br>d<br>i<br>n<br>g</"
+"qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4002,19 +3925,14 @@ msgstr "Navnet &ditt:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Navnet ditt</h3>"
-"<p>Dette feltet skal inneholde navnet ditt, slik du vil at det skal vises i "
-"meldingshodet som blir sendt ut.</p>"
-"<p>Hvis du lar dette feltet stå tomt, vil ikke navnet ditt komme fram, bare "
-"e-postadressen din.</p></qt>"
+"<qt><h3>Navnet ditt</h3><p>Dette feltet skal inneholde navnet ditt, slik du "
+"vil at det skal vises i meldingshodet som blir sendt ut.</p><p>Hvis du lar "
+"dette feltet stå tomt, vil ikke navnet ditt komme fram, bare e-postadressen "
+"din.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4022,17 +3940,13 @@ msgstr "Organisas&jon:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisasjon</h3>"
-"<p>I dette feltet bør det stå navnet på organisasjonen din hvis du vil at det "
-"skal synes i meldingshodet som sendes ut.</p>"
-"<p>Det er greit (og ganske vanlig) å la dette stå tomt.</p></qt>"
+"<qt><h3>Organisasjon</h3><p>I dette feltet bør det stå navnet på "
+"organisasjonen din hvis du vil at det skal synes i meldingshodet som sendes "
+"ut.</p><p>Det er greit (og ganske vanlig) å la dette stå tomt.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4041,20 +3955,15 @@ msgstr "&E-postadresse:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-postadresse</h3>"
-"<p>Dette feltet skal inneholda hele e-postadressen din.</p>"
-"<p>Hvis dette feltet er tomt, eller adressen er feil, vil man kunne ha "
-"problemer med å svare på meldingene dine.</p></qt>"
+"<qt><h3>E-postadresse</h3><p>Dette feltet skal inneholda hele e-postadressen "
+"din.</p><p>Hvis dette feltet er tomt, eller adressen er feil, vil man kunne "
+"ha problemer med å svare på meldingene dine.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4063,21 +3972,12 @@ msgstr "&E-postadresse:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4101,19 +4001,17 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>OpenPGP-nøkkelen du velger her blir brukt til å signere meldinger. Du kan "
-"også bruke GnuPG-nøkler.</p>"
-"<p>Du kan la dette stå tomt, men da kan ikke KMail signere meldinger "
-"kryptografisk med OpenPGP. Vanlige e-postfunksjoner blir ikke endret.</p>"
-"<p>Du kan finne ut mer om nøkler på <a>http://www.gnupg.org</a></qt>"
+"<qt><p>OpenPGP-nøkkelen du velger her blir brukt til å signere meldinger. Du "
+"kan også bruke GnuPG-nøkler.</p><p>Du kan la dette stå tomt, men da kan ikke "
+"KMail signere meldinger kryptografisk med OpenPGP. Vanlige e-postfunksjoner "
+"blir ikke endret.</p><p>Du kan finne ut mer om nøkler på <a>http://www.gnupg."
+"org</a></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4125,8 +4023,8 @@ msgstr "Din OpenPGP-krypteringsnøkkel"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Velg hvilken OpenPGP-nøkkel som skal brukes for å signere meldingene dine og "
 "for funksjonen «Legg ved min offentlige nøkkel»-kjennetegn i vinduet "
@@ -4134,21 +4032,18 @@ msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>OpenPGP-nøkkelen du velger her blir brukt til å signere meldinger og til å "
-"kryptere meldinger til deg selv. Du kan også bruke GnuPG-nøkler.</p> "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>OpenPGP-nøkkelen du velger her blir brukt til å signere meldinger og "
+"til å kryptere meldinger til deg selv. Du kan også bruke GnuPG-nøkler.</p> "
 "<p>Du kan  la dette være tomt, men da kan ikke KMail signere meldinger "
-"kryptografisk. Vanlige e-postfunksjoner blir ikke endret.</p>"
-"Du kan finne ut mer om nøkler på <a>http://www.gnupg.org</a></qt>"
+"kryptografisk. Vanlige e-postfunksjoner blir ikke endret.</p>Du kan finne ut "
+"mer om nøkler på <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4167,17 +4062,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509)-sertifikatet du velger her blir brukt til å signere "
+"<qt><p>S/MIME (X.509)-sertifikatet du velger her blir brukt til å signere "
 "meldinger. </p> </p>Du kan la dette stå tomt, men da kan ikke KMail signere "
-"meldinger kryptografisk ved hjelp av S/MIME. Vanlige e-postfunksjoner blir ikke "
-"endret.</p></qt>"
+"meldinger kryptografisk ved hjelp av S/MIME. Vanlige e-postfunksjoner blir "
+"ikke endret.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4189,27 +4082,24 @@ msgstr "Ditt S/MIME krypteringssertifikat"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Velg S/MIME-sertifikatet som skal brukes for kryptering til deg selv og for å "
-"signere meldinger."
+"Velg S/MIME-sertifikatet som skal brukes for kryptering til deg selv og for "
+"å signere meldinger."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>S/MIME-sertifikatet du velger her blir brukt til å signere meldinger og til "
-"å kryptere meldinger til deg selv.</p> "
-"<p>Du kan  la dette stå tomt, men da kan ikke KMail signere utgående meldinger "
-"til deg selv kryptografisk med S/MIME. Vanlige e-postfunksjoner blir ikke "
-"endret.</p></qt>"
+"<qt> <p>S/MIME-sertifikatet du velger her blir brukt til å signere meldinger "
+"og til å kryptere meldinger til deg selv.</p> <p>Du kan  la dette stå tomt, "
+"men da kan ikke KMail signere utgående meldinger til deg selv kryptografisk "
+"med S/MIME. Vanlige e-postfunksjoner blir ikke endret.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4229,24 +4119,19 @@ msgstr "&Svaradresse:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Svaradresse</h3>"
-"<p>Dette angir <tt>Svaradresse:</tt>-feltet i meldingshovedet til en annen "
-"adresse enn <tt>Fra:</tt>-adressen.</p>"
-"<p>Dette kan væra nyttig når du har en gruppe menneske som jobbar sammen i "
-"liknande roller. Det kan for eksempel hende du vil at e-postar du sender ut "
-"skal ha din e-postadresse i <tt>Fra:</tt>-feltet, men alle svar skal gå til en "
-"gruppeadresse.</p>"
-"<p>Hvis du er i tvil, så la dette feltet stå tomt.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Svaradresse</h3><p>Dette angir <tt>Svaradresse:</tt>-feltet i "
+"meldingshovedet til en annen adresse enn <tt>Fra:</tt>-adressen.</p><p>Dette "
+"kan væra nyttig når du har en gruppe menneske som jobbar sammen i liknande "
+"roller. Det kan for eksempel hende du vil at e-postar du sender ut skal ha "
+"din e-postadresse i <tt>Fra:</tt>-feltet, men alle svar skal gå til en "
+"gruppeadresse.</p><p>Hvis du er i tvil, så la dette feltet stå tomt.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4254,24 +4139,19 @@ msgstr "&Blindkopiadresser:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>BCC – Blindkopiadresser</h3> "
-"<p> Adressene som oppgis her blir lagt til all e-post som sendes med denne "
-"identiteten. Adressene er ikke synlige for andre mottakere.</p> "
-"<p>Dette brukes ofte til å sende en kopi av all sendt e-post til en annen av "
-"dine e-postkontoer. </p>Hvis du skriver inn flere blindkopi-adresser, så bruk "
-"komma mellom hver av dem."
-"<p>Er du i tvil, så la feltet stå tomt.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>BCC – Blindkopiadresser</h3> <p> Adressene som oppgis her blir lagt "
+"til all e-post som sendes med denne identiteten. Adressene er ikke synlige "
+"for andre mottakere.</p> <p>Dette brukes ofte til å sende en kopi av all "
+"sendt e-post til en annen av dine e-postkontoer. </p>Hvis du skriver inn "
+"flere blindkopi-adresser, så bruk komma mellom hver av dem.<p>Er du i tvil, "
+"så la feltet stå tomt.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4309,7 +4189,7 @@ msgstr "&Signatur"
 msgid "&Picture"
 msgstr "&Bilde"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ugyldig e-postadresse"
 
@@ -4325,18 +4205,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"En av OpenPGP-nøklene som er satt opp for signering inneholder ikke en bruker "
-"ID med den valgte e-postadressen for denne identiteten (%1).\n"
-"Dette kan føre til advarsler når mottakeren prøver å bekrefte signaturer som er "
-"laget med dette oppsettet."
+"En av OpenPGP-nøklene som er satt opp for signering inneholder ikke en "
+"bruker ID med den valgte e-postadressen for denne identiteten (%1).\n"
+"Dette kan føre til advarsler når mottakeren prøver å bekrefte signaturer som "
+"er laget med dette oppsettet."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"En av OpenPGP-krypteringsnøklene som er satt opp inneholder ikke en bruker ID "
-"med den e-postadressen som er valgt for denne identiteten (%1)"
+"En av OpenPGP-krypteringsnøklene som er satt opp inneholder ikke en bruker "
+"ID med den e-postadressen som er valgt for denne identiteten (%1)"
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4345,18 +4225,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"En av S/MIME-signeringssertifikatene som er satt opp inneholder ikke den "
-"e-postadressen som er satt opp for denne identiteten (%1).\n"
-"Dette kan føre til advarsler når mottakeren prøver å bekrefte signaturer laget "
-"med dette oppsettet."
+"En av S/MIME-signeringssertifikatene som er satt opp inneholder ikke den e-"
+"postadressen som er satt opp for denne identiteten (%1).\n"
+"Dette kan føre til advarsler når mottakeren prøver å bekrefte signaturer "
+"laget med dette oppsettet."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"En av S/MIME-krypteringssertifikatene som er satt opp inneholder ikke den "
-"e-postadressen som er satt opp for denne identiteten (%1)"
+"En av S/MIME-krypteringssertifikatene som er satt opp inneholder ikke den e-"
+"postadressen som er satt opp for denne identiteten (%1)"
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4375,8 +4255,8 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"Den selvvalgte mappa for sendt e-post for identiteten «%1» finnes ikke (mer). "
-"Derfor blir standardmappa for sendt e-post brukt."
+"Den selvvalgte mappa for sendt e-post for identiteten «%1» finnes ikke "
+"(mer). Derfor blir standardmappa for sendt e-post brukt."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4396,8 +4276,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (standard)"
 
@@ -4440,24 +4320,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail har oppdaget en prefiksoppføring i oppsettet av kontoen «%1» som du ikke "
-"trenger lenger med IMAP-navneromsstøtte."
+"KMail har oppdaget en prefiksoppføring i oppsettet av kontoen «%1» som du "
+"ikke trenger lenger med IMAP-navneromsstøtte."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Innstillingene ble automatisk overført, men du bør sjekke kontoinnstillingene "
-"dine."
+"Innstillingene ble automatisk overført, men du bør sjekke "
+"kontoinnstillingene dine."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Det var ikke mulig å overføre innstillingene dine automatisk. Vennligst sjekk "
-"kontoinnstillingene dine."
+"Det var ikke mulig å overføre innstillingene dine automatisk. Vennligst "
+"sjekk kontoinnstillingene dine."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4496,17 +4376,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Feil: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Forbindelsen til tjeneren %1 ble avbrutt uventet eller p.g.a. tidsavbrudd. Den "
-"vil bli gjenopprettet automatisk hvis mulig."
+"Forbindelsen til tjeneren %1 ble avbrutt uventet eller p.g.a. tidsavbrudd. "
+"Den vil bli gjenopprettet automatisk hvis mulig."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4655,14 +4540,14 @@ msgstr "Listearkiver"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4691,226 +4576,182 @@ msgstr "Ubrukelige krypteringsnøkler"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel ID 0x%2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel ID 0x%2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel ID 0x"
+"%2)</p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel ID 0x"
+"%2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel 0x%2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel ID 0x%2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel 0x"
+"%2)</p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel ID "
+"0x%2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for ditt S/MIME-signeringssertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for ditt S/MIME-"
+"signeringssertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p><p>foreldes om "
+"mindre enn en dag.</p>\n"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p><p>foreldes om "
+"mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Signeringssertifikat</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Signeringssertifikat</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>CA sertifikat</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
+"(serienummer %2)</p><p>foreldes om mindre enn en dag.</p>\n"
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"(serienummer %2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
+"(serienummer %2)</p><p>foreldes om mindre enn en dag.</p>\n"
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"(serienummer %2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4924,215 +4765,171 @@ msgstr "S/MIME-sertifikat foreldes snart"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel ID 0x%2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel ID 0x%2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel ID 0x"
+"%2)</p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Din signeringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel ID 0x"
+"%2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel 0x%2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>"
-"(Nøkkel ID 0x%2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel 0x"
+"%2)</p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Din krypteringsnøkkel for OpenPGP</p><p align=center><b>%1</b>(Nøkkel ID "
+"0x%2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>OpenPGP nøkkelen for</p><p align=center><b>%1</b>(Nøkkel 0x%2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for ditt S/MIME-signeringssertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for ditt S/MIME-"
+"signeringssertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p><p>foreldes om "
+"mindre enn en dag.</p>\n"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet</p><p align=center><b>%1</b> (serienummer %2></p><p>foreldes om "
+"mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>Signeringssertifikat</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>Signeringssertifikat</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>CA sertifikat</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
+"(serienummer %2)</p><p>foreldes om mindre enn en dag.</p>\n"
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"(serienummer %2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
+"(serienummer %2)</p><p>foreldes om mindre enn en dag.</p>\n"
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"(serienummer %2)</p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>foreldes om mindre enn en dag.</p>\n"
-"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>foreldes om mindre enn %n dager.</p>"
+"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn en dag.</p>\n"
+"<p>S/MIME-sertifikatet for</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>foreldes om mindre enn %n dager.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5144,17 +4941,19 @@ msgstr "S/MIME-sertifikat foreldes snart"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"En eller flere av OpenPGP-krypteringsnøklene eller S/MIME-sertifikatene du har "
-"satt opp kan ikke brukes til kryptering. Sett opp disse krypteringsnøklene og "
-"sertifikatene på nytt i oppsettsdialogen for denne identiteten.\n"
-"Hvis du fortsetter, og nøklene trengs senere, vil du bli spurt om hvilke nøkler "
-"som skal brukes."
+"En eller flere av OpenPGP-krypteringsnøklene eller S/MIME-sertifikatene du "
+"har satt opp kan ikke brukes til kryptering. Sett opp disse "
+"krypteringsnøklene og sertifikatene på nytt i oppsettsdialogen for denne "
+"identiteten.\n"
+"Hvis du fortsetter, og nøklene trengs senere, vil du bli spurt om hvilke "
+"nøkler som skal brukes."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5171,8 +4970,8 @@ msgstr ""
 "Ett eller flere av OpenPGP-signeringsnøklene eller S/MIME-sertifikatene dine "
 "kan ikke brukes til kryptering. Sett opp disse krypteringsnøklene og "
 "sertifikatene på nytt i oppsettsdialogen for denne identiteten.\n"
-"Hvis du velger å fortsette og nøklene trengs senere vil du bli spurt om å angi "
-"hvilke nøkler som skal brukes."
+"Hvis du velger å fortsette og nøklene trengs senere vil du bli spurt om å "
+"angi hvilke nøkler som skal brukes."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5182,13 +4981,13 @@ msgstr "Ubrukelige signeringsnøkler"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"En undersøkelse av mottagerens krypteringsoppsett viste at medlingen burde bli "
-"kryptert ved bruk av OpenPGP, i alle fall for noen av mottakerne;\n"
+"En undersøkelse av mottagerens krypteringsoppsett viste at medlingen burde "
+"bli kryptert ved bruk av OpenPGP, i alle fall for noen av mottakerne;\n"
 "men du har ikke satt opp noen gyldige og tiltrodde OpenPGP krypteringsnøkler "
 "for denne identiteten.\n"
 "Du kan velge å fortsette uten å kryptere til deg selv, merk at du ikke vil "
@@ -5198,29 +4997,29 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Undersøkelse av mottagerens krypteringsoppsett viste at meldinga burde bli "
 "kryptert ved bruk av S/MIME, i alle fall for noen av mottakerne;\n"
-"men du har ikke sattopp noen gyldige S/MIME krypteringssertifikater for denne "
-"identiteten.\n"
+"men du har ikke sattopp noen gyldige S/MIME krypteringssertifikater for "
+"denne identiteten.\n"
 "Du kan velge å fortsette uten å kryptere til deg selv, merk at du ikke vil "
 "kunne lese dine egne meldinger hvis du gjør det."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Undersøkelse av mottagerens oppsett for signering viste at meldinga burde bli "
-"signert ved hjelp av OpenPGP, i alle fall for noen av mottakerne;\n"
-"men du har ikke satt opp noen gyldige OpenPGP signeringssertifikater for denne "
-"identiteten."
+"Undersøkelse av mottagerens oppsett for signering viste at meldinga burde "
+"bli signert ved hjelp av OpenPGP, i alle fall for noen av mottakerne;\n"
+"men du har ikke satt opp noen gyldige OpenPGP signeringssertifikater for "
+"denne identiteten."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5228,15 +5027,15 @@ msgstr "Ikke signer med OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "Undersøkelse av mottagerens signeringsoppsett viste at meldinga burde bli "
 "signert ved bruk av S/MIME, i alle fall for noen av mottakerne;\n"
-"men du har ikke satt opp noen gyldige S/MIME signeringssertifikater for denne "
-"identiteten."
+"men du har ikke satt opp noen gyldige S/MIME signeringssertifikater for "
+"denne identiteten."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5258,11 +5057,11 @@ msgstr "Signering ikke mulig"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Du valgte ikke en krypteringsnøkkel for deg selv (krypter til sender). Du vil "
-"ikke kunne dekryptere din egen melding hvis du krypterer den."
+"Du valgte ikke en krypteringsnøkkel for deg selv (krypter til sender). Du "
+"vil ikke kunne dekryptere din egen melding hvis du krypterer den."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5278,16 +5077,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Du valgte ikke noen krypteringsnøkkel for mottakeren av denne meldinga, derfor "
-"blir ikke meldinga kryptert."
+"Du valgte ikke noen krypteringsnøkkel for mottakeren av denne meldinga, "
+"derfor blir ikke meldinga kryptert."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Du valgte ikke en krypteringsnøkkel for noen mottaker av denne meldinga; derfor "
-"vil ikke meldinga bli kryptert."
+"Du valgte ikke en krypteringsnøkkel for noen mottaker av denne meldinga; "
+"derfor vil ikke meldinga bli kryptert."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5306,8 +5105,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du valgte ikke en krypteringsnøkkel for noen av mottakerne: disse personene vil "
-"ikke kunne dekryptere denne meldinga hvis du krypterer den."
+"Du valgte ikke en krypteringsnøkkel for noen av mottakerne: disse personene "
+"vil ikke kunne dekryptere denne meldinga hvis du krypterer den."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5331,11 +5130,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Ingen gyldig og tiltrodd krypteringsnøkkel ble funnet for «%1».\n"
 "\n"
@@ -5384,10 +5183,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritisk feil: Klarer ikke hente e-post:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Klarte ikke å legge til meldinga:\n"
+msgid "Failed to add message:\n"
+msgstr "Klarte ikke å legge til meldinga:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5477,6 +5274,51 @@ msgstr "&Frakoblet IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-postboks"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Velg emne for meldinga."
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Send kopi til «adresse»"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Send blindkopi til «adresse»"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Legg «meldingshode» til i meldinga"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Les meldingsteksten fra «fil»"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Velg meldingskropp"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Legg til et vedlegg til meldinga. Dette kan gjentas"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Bare se etter ny e-post"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Bare åpne skrivevinduet"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Vis den oppgitte meldingsfila"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Send melding til «adresse» henholdsvis legg ved fila nettadressen peker til"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "E-post"
@@ -5533,13 +5375,13 @@ msgstr "%1: fant mappe %2. Setter den til hovedmappe for gruppevare."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail fant følgende gruppevaremapper i %1 og trenger å utføre følgende "
-"handlinger: %2 "
-"<br>Trykk «Avbryt» hvis du ikke vil dette. IMAP ressursen vil da bli slått av."
+"handlinger: %2 <br>Trykk «Avbryt» hvis du ikke vil dette. IMAP ressursen vil "
+"da bli slått av."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5588,11 +5430,11 @@ msgstr "Nettadressen er kopiert til utklippstavla."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Fila <b>%1</b> finnes fra før. <br>Vil du erstatte den?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Lagre til fil"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Erstatt"
 
@@ -5610,7 +5452,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Meldingen ble fjernet mens lagring pågikk. Den er ikke blitt lagret."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5630,127 +5472,128 @@ msgstr "Fila inneholder ikke en melding."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fila inneholder flere meldinger. Bare den første meldinga blir vist."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Dette er en videresendt MIME-sammensatt melding. Innholdet i meldinga finnes i "
-"vedlegget/-ene.\n"
+"Dette er en videresendt MIME-sammensatt melding. Innholdet i meldinga finnes "
+"i vedlegget/-ene.\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrerer meldinger"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer melding %1 av %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Ikke nok ledig diskplass?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Flytt til denne mappa"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopier til denne mappa"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Sletter meldinger"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Åpner nettadressen …"
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Er du sikker på at du vil kjøre <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Kjør"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Fant ingen vedlegg å lagre."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Lagre vedlegg til"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "vedlegg.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "vedlegg.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Det finnes allerede en fil som heter %1. Vil du overskrive den?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fila finnes allerede"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Skriv over"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Del %1 av meldinga er kryptert. Vil du bevare krypteringa når du lagrer?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-spørsmål"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Behold kryptering"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ikke behold"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"Del %1 av meldinga er signert. Vil du bevare signaturen når du lagrer meldinga?"
+"Del %1 av meldinga er signert. Vil du bevare signaturen når du lagrer "
+"meldinga?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Behold signatur"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5759,22 +5602,22 @@ msgstr ""
 "Kunne ikke skrive til fila %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Kunne ikke skrive fila %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Det er ikke noen adressebokoppføring for denne e-postadressen. Legg den til i "
-"adresseboka for så å legge til lynmeldings-adresser ved å bruke den "
+"Det er ikke noen adressebokoppføring for denne e-postadressen. Legg den til "
+"i adresseboka for så å legge til lynmeldings-adresser ved å bruke den "
 "lynmeldingsklienten du foretrekker."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5784,78 +5627,78 @@ msgstr ""
 " %1\n"
 " det er ikke mulig å avgjøre hvem du vil snakke med."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Chiasmus bakstykke tilbyr ikke «x-obtain-keys» funksjonen. Vennligst rapporter "
-"denne feilen."
+"Chiasmus bakstykke tilbyr ikke «x-obtain-keys» funksjonen. Vennligst "
+"rapporter denne feilen."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Feil i chiasmus-bakstykke"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Uventet returverdi fra Chiasmus bakstykke: «x-obtain-keys» funksjonen "
 "returnerte ikke en strengliste. Vennligst meld inn denne feilen."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Ingen nøkler ble funnet. Vennligst sjekk at en gyldig nøkkelsti er oppgitt i "
 "Chiasmus-oppsettet."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Valg av chiasmus dekrypteringsnøkkel"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus-motoren tilbyr ikke «x-decrypt»-funksjonen. Vennligst meld inn denne "
-"feilen."
+"Chiasmus-motoren tilbyr ikke «x-decrypt»-funksjonen. Vennligst meld inn "
+"denne feilen."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"«x-decrypt»-funksjonen aksepterer ikke de ventede parametre. Vennligst meld inn "
-"denne feilen."
+"«x-decrypt»-funksjonen aksepterer ikke de ventede parametre. Vennligst meld "
+"inn denne feilen."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus dekryptering feil"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Uventet returverdi fra Chiasmus bakstykke. «x-decrypt»-funksjonen returnerte "
 "ikke en byte-tabell. Vennligst meld inn denne feilen."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "E-post"
@@ -5954,7 +5797,7 @@ msgstr "Størrelse"
 msgid "Encoding"
 msgstr "Koding"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimer"
 
@@ -5966,7 +5809,7 @@ msgstr "Krypter"
 msgid "Sign"
 msgstr "Signer"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Navnet til vedlegget:"
 
@@ -5988,10 +5831,11 @@ msgstr "Hovedmottakere"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>E-postadressene du skriver i dette feltet vil motta en kopi av "
-"meldinga.</qt>"
+"<qt>E-postadressene du skriver i dette feltet vil motta en kopi av meldinga."
+"</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6000,14 +5844,14 @@ msgstr "Ytterlige mottakere"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>E-post adressene du skriver i dette feltet vil motta en kopi av meldinga. "
-"Dette er teknisk sett det samme som å skrive alle adressene i <b>Til:</b> "
-"feltet, men vil angi at mottakeren av kopien er en lytter og ikke "
-"hovedadressaten.</qt>"
+"<qt>E-post adressene du skriver i dette feltet vil motta en kopi av "
+"meldinga. Dette er teknisk sett det samme som å skrive alle adressene i "
+"<b>Til:</b> feltet, men vil angi at mottakeren av kopien er en lytter og "
+"ikke hovedadressaten.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6015,12 +5859,11 @@ msgstr "Skjulte mottakere"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Dette er i grunnen det samme som feltet <b>Kopi Til:</b>"
-", men andre mottakere vil ikke kunne se hvem som mottar en blindkopi.</qt>"
+"<qt>Dette er i grunnen det samme som feltet <b>Kopi Til:</b>, men andre "
+"mottakere vil ikke kunne se hvem som mottar en blindkopi.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6030,7 +5873,7 @@ msgstr "&Send e-post"
 msgid "&Send Mail Via"
 msgstr "&Send e-post via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Send s&enere"
@@ -6095,8 +5938,7 @@ msgstr "F&jern sitattegn"
 msgid "Cl&ean Spaces"
 msgstr "Slett &overflødige mellomrom"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Bruk skrift med fast bredde"
@@ -6239,31 +6081,31 @@ msgstr "&Kryptografisk meldingsformat"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Punktliste (kule)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Punktliste (sirkel)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Punktliste (firkant)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Ordnet liste (desimaltall)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Ordnet liste (alfabetisk, små bokstaver)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Ordnet liste (alfabetisk, store bokstaver)"
 
@@ -6355,8 +6197,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Lagre denne meldinga i kladdemappa. Den kan bli redigert og sent ved et senere "
-"tidspunkt."
+"Lagre denne meldinga i kladdemappa. Den kan bli redigert og sent ved et "
+"senere tidspunkt."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6368,61 +6210,61 @@ msgstr "Lukk meldingsredigeringa"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Meldinga du har laget ser ut til å referere til en vedlagt fil, men du har ikke "
-"lagt ved noe.\n"
+"Meldinga du har laget ser ut til å referere til en vedlagt fil, men du har "
+"ikke lagt ved noe.\n"
 "Vil du legge ved en fil?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Påminnelse om filvedlegg"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Send &uten endring"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail klarte ikke å finne ut hvor vedlegget er (%1).</p>"
-"<p>Du må skrive inn hele stien til fila hvis du vil legge den ved.</p></qt>"
+"<qt><p>KMail klarte ikke å finne ut hvor vedlegget er (%1).</p><p>Du må "
+"skrive inn hele stien til fila hvis du vil legge den ved.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Legg ved fil"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Legg ved"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Sett inn fil"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Sett inn fil"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>En feil oppstod under eksport av nøkkelen fra bakstykket:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>En feil oppstod under eksport av nøkkelen fra bakstykket:</p><p><b>"
+"%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6461,20 +6303,35 @@ msgid ""
 "View"
 msgstr "Vis"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Rediger …"
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Rediger skript …"
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Lagre som …"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Egenskaper"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Legg ved …"
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail kunne ikke komprimere fila."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6482,282 +6339,275 @@ msgstr ""
 "Den komprimerte fila er større enn den opprinnelige. Vil du beholde den "
 "opprinnelige?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Behold"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail kunne ikke dekomprimere fila."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Lagre vedlegg som"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Legg til som tekst"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Legg til som vedlegg"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Lim inn som et &vedlegg"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "navnløs"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Du har bedt om at meldingene skal bli kryptert til deg selv, men den valgte "
-"identiteten angir ingen (OpenPGP eller S/MIME) krypteringsnøkkel som skal "
-"brukes til dette.</p>"
-"<p>Velg hvilke(n) nøkkel(-er) som skal brukes i identitetsoppsettet.</p></qt>"
+"<qt><p>Du har bedt om at meldingene skal bli kryptert til deg selv, men den "
+"valgte identiteten angir ingen (OpenPGP eller S/MIME) krypteringsnøkkel som "
+"skal brukes til dette.</p><p>Velg hvilke(n) nøkkel(-er) som skal brukes i "
+"identitetsoppsettet.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Krypteringsnøkkelen er ikke angitt"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>For å kunne signere denne meldinga må du først ha angitt en (OpenPGP eller "
-"S/MIME)-nøkkel du vil bruke. </p>"
-"<p>I identitetsoppsettet kan du velge hvilken nøkkel som skal brukes for denne "
-"identiteten .</p></qt>"
+"<qt> <p>For å kunne signere denne meldinga må du først ha angitt en (OpenPGP "
+"eller S/MIME)-nøkkel du vil bruke. </p><p>I identitetsoppsettet kan du velge "
+"hvilken nøkkel som skal brukes for denne identiteten .</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Signeringsnøkkelen er ikke angitt"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"KMail er for øyeblikket i frakoblet modus. Meldingene dine vil ligge i utboksen "
-"til neste gang du kobler til internett."
+"KMail er for øyeblikket i frakoblet modus. Meldingene dine vil ligge i "
+"utboksen til neste gang du kobler til internett."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Tilkoblet/Frakoblet"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Du må skrive inn din e-postadresse i «Fra:»-feltet. Du burde også angi din "
-"e-postadresse for alle identiteter, slik at du ikke må skrive den inn for hver "
+"Du må skrive inn din e-postadresse i «Fra:»-feltet. Du burde også angi din e-"
+"postadresse for alle identiteter, slik at du ikke må skrive den inn for hver "
 "melding."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Du må oppgi minst en mottaker, enten i «Til:» -feltet, som kopi eller "
 "blindkopi."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Du oppga ikke et emne. Vil du sende meldinga likevel?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Navn ikke spesifisert"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du oppga ikke et emne. Vil du sende meldinga likevel?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Intet emne er oppgitt"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Send &uten endring"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Oppgi et emne"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Behold formateringa, ikke signer/&krypter"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Behold formateringa, ikke &krypter"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Behold formateringa, ikke signer"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Signering/Kryptering (slett formateringa)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Krypter (slett formateringa)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Signer (slett formateringa)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Integrert signering/kryptering av HTML-meldinger er ikke mulig.</p>"
-"<p>Vil du slette formateringa?</p></qt>"
+"<qt><p>Integrert signering/kryptering av HTML-meldinger er ikke mulig.</"
+"p><p>Vil du slette formateringa?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Vil du signere/kryptere meldinga?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Den selvvalgte kladd- eller makmappa for identiteten «%1» finnes ikke (lengre). "
-"Derfor brukes standardmappa for kladder eller meldingsmaler."
+"Den selvvalgte kladd- eller makmappa for identiteten «%1» finnes ikke "
+"(lengre). Derfor brukes standardmappa for kladder eller meldingsmaler."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Lag en brukerkonto for sending og prøv igjen."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "I ferd med å sende e-post …"
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Send Bekreftelse"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Send nå"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Ingen mottakere"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Ytterlige mottakere"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Stavekontroll: på"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Stavekontroll: av"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Stavekontrollen ble avbrutt."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Stavekontrollen ble stoppet."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Stavekontrollen er ferdig."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Sett opp et krypteringsbakstykke som skal brukes for chiasmus kryptering "
 "først.\n"
 "Du kan gjøre dette i fanen «Krypteringsbakstykker» i oppsettsdialogvinduets "
 "sikkerhetsside."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Det ser ut som om libkleopatra ble kompilert uten støtte for Chiasmus. Du vil "
-"kanskje rekompilere libkleopatra med --enable chiasmus."
+"Det ser ut som om libkleopatra ble kompilert uten støtte for Chiasmus. Du "
+"vil kanskje rekompilere libkleopatra med --enable chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Chiasmus bakstykke ikke satt opp"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Ingen Chiasmus-nøkler funnet"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Valg av chiasmus krypteringsnøkkel"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Meldinga ble signert av %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Meldinga ble signert av %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP-melding – kryptert"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Melding med emne:"
@@ -6807,11 +6657,11 @@ msgstr "Stavekontroll – KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Feil ved start av ISpell/Aspell. Sjekk at ISpell/Aspell har rett oppsett og er "
-"i din søkesti (PATH)."
+"Feil ved start av ISpell/Aspell. Sjekk at ISpell/Aspell har rett oppsett og "
+"er i din søkesti (PATH)."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6844,13 +6694,11 @@ msgstr "<qt>For mange filterhandlinger i filterregelen <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Ukjent filterhandling <b>%1</b> "
-"<br>i filterregelen <b>%2</b>."
-"<br> Bruker den ikke.</qt>"
+"<qt>Ukjent filterhandling <b>%1</b> <br>i filterregelen <b>%2</b>.<br> "
+"Bruker den ikke.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7070,163 +6918,131 @@ msgstr "Spill en lyd"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dette er lista over angitte filter. De blir gjennomført ovenfra og ned.</p>"
-"<p>Trykk på et hvilket som helst filter for å redigere dette med knappene i "
-"høyre del av meldingsvinduet.</p></qt>"
+"<qt><p>Dette er lista over angitte filter. De blir gjennomført ovenfra og "
+"ned.</p><p>Trykk på et hvilket som helst filter for å redigere dette med "
+"knappene i høyre del av meldingsvinduet.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bruk denne knappen for å lage et nytt filter.</p> "
-"<p>Filteret blir satt inn like før det som er valgt nå, men du kan selvsagt "
-"endre plasseringa senere.</p> "
-"<p>Dersom du ikke mente å trykke på denne knappen, kan du angre ved å trykke på "
-"<em>Slett</em> (til høyre).</p></qt>"
+"<qt><p>Bruk denne knappen for å lage et nytt filter.</p> <p>Filteret blir "
+"satt inn like før det som er valgt nå, men du kan selvsagt endre plasseringa "
+"senere.</p> <p>Dersom du ikke mente å trykke på denne knappen, kan du angre "
+"ved å trykke på <em>Slett</em> (til høyre).</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bruk denne knappen for å kopiere et filter.</p> "
-"<p>Dersom du ikke mente å trykke på denne knappen, kan du angre ved å trykke på "
-"<em>Slett</em> (til høyre).</p></qt>"
+"<qt><p>Bruk denne knappen for å kopiere et filter.</p> <p>Dersom du ikke "
+"mente å trykke på denne knappen, kan du angre ved å trykke på <em>Slett</em> "
+"(til høyre).</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Trykk på denne knappen for å <em>ta vekk</em> det markerte filteret fra "
-"lista ovenfor.</p>"
-"<p>Du kan ikke få tilbake filteret når du har fjernet det, men du kan når som "
-"helst forlate meldingsvinduet ved å velge <em>Avbryt</em> "
-"uten at noen endringer er gjort.</p></qt>"
+"<qt><p>Trykk på denne knappen for å <em>ta vekk</em> det markerte filteret "
+"fra lista ovenfor.</p><p>Du kan ikke få tilbake filteret når du har fjernet "
+"det, men du kan når som helst forlate meldingsvinduet ved å velge "
+"<em>Avbryt</em> uten at noen endringer er gjort.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bruk denne knappen for å flytte det valgte filteret til <em>toppen</em> "
-"avlista ovenfor.</p> "
-"<p>Dette er nyttig fordi rekkefølgen av filtrene i lista avgjør i hvilken "
-"rekkefølge de blir brukt på meldinger: Det øverste filteret brukes først.</p> "
-"</qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
+msgstr ""
+"<qt><p>Bruk denne knappen for å flytte det valgte filteret til <em>toppen</"
+"em> avlista ovenfor.</p> <p>Dette er nyttig fordi rekkefølgen av filtrene i "
+"lista avgjør i hvilken rekkefølge de blir brukt på meldinger: Det øverste "
+"filteret brukes først.</p> </qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bruk denne knappen for å flytte det valgte filteret <em>opp</em> "
-"ett trinn i lista ovenfor.</p> "
-"<p>Dette er nyttig fordi rekkefølgen av filtrene i lista avgjør i hvilken "
-"rekkefølge de blir brukt på meldinger: Det øverste filteret brukes først.</p>"
-"<p>Dersom du ikke mente å trykke denne knappen, kan du angre ved å trykke <em>"
-"Ned</em> (til høyre).</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Bruk denne knappen for å flytte det valgte filteret <em>opp</em> ett "
+"trinn i lista ovenfor.</p> <p>Dette er nyttig fordi rekkefølgen av filtrene "
+"i lista avgjør i hvilken rekkefølge de blir brukt på meldinger: Det øverste "
+"filteret brukes først.</p><p>Dersom du ikke mente å trykke denne knappen, "
+"kan du angre ved å trykke <em>Ned</em> (til høyre).</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å flytte det valgte filteret <em>ned</em> "
-"ett trinn i lista over.</p> "
-"<p>Dette er nyttig fordi rekkefølgen av filtrene i lista avgjør i hvilken "
-"rekkefølge de blir brukt på meldinger: Det øverste filteret brukes først.</p>"
-"<p>Dersom du ikke mente å trykke denne knappen, kan du angre ved å trykke <em>"
-"Opp</em> (til høyre).</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Bruk denne knappen til å flytte det valgte filteret <em>ned</em> ett "
+"trinn i lista over.</p> <p>Dette er nyttig fordi rekkefølgen av filtrene i "
+"lista avgjør i hvilken rekkefølge de blir brukt på meldinger: Det øverste "
+"filteret brukes først.</p><p>Dersom du ikke mente å trykke denne knappen, "
+"kan du angre ved å trykke <em>Opp</em> (til høyre).</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å flytte det valgte filteret til <em>bunns</em> "
-"i lista over.</p> "
-"<p>Dette er nyttig fordi rekkefølgen av filtrene i lista avgjør i hvilken "
-"rekkefølge de blir brukt på meldinger: Det øverste filteret brukes først.</p>"
-"</qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
+msgstr ""
+"<qt><p>Bruk denne knappen til å flytte det valgte filteret til <em>bunns</"
+"em> i lista over.</p> <p>Dette er nyttig fordi rekkefølgen av filtrene i "
+"lista avgjør i hvilken rekkefølge de blir brukt på meldinger: Det øverste "
+"filteret brukes først.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Trykk på denne knappen for å endre navn på det valgte filteret.</p>"
-"<p>Filternavnet velges automatisk så lenge filteret starter med «&lt;».</p>"
-"<p> Om du har gitt filteret et nytt navn ved et uhell og vil ha tilbake "
-"automatiske navn, trykk på denne knappen og velg <em>Tøm</em> etterfulgt av <em>"
-"OK </em>i det meldingsvinduet som dukker opp.</p></qt>"
+"<qt><p>Trykk på denne knappen for å endre navn på det valgte filteret.</"
+"p><p>Filternavnet velges automatisk så lenge filteret starter med «&lt;».</"
+"p><p> Om du har gitt filteret et nytt navn ved et uhell og vil ha tilbake "
+"automatiske navn, trykk på denne knappen og velg <em>Tøm</em> etterfulgt av "
+"<em>OK </em>i det meldingsvinduet som dukker opp.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Trykk på denne knappen for å få fram et meldingsvindu der du kan "
-"bekrefte.</p>"
-"<p>Dette er nyttig hvis du har angitt regler som markerer meldinger som skal "
-"lastes ned senere. Hvis du ikke kan få fram sprettoppsvinduer, vil disse "
-"meldingene aldri bli lastet ned så lenge ingen andre store meldinger venter på "
-"tjeneren, eller hvis du skulle endre reglene for merking av meldinger.</p></qt>"
+"<qt><p>Trykk på denne knappen for å få fram et meldingsvindu der du kan "
+"bekrefte.</p><p>Dette er nyttig hvis du har angitt regler som markerer "
+"meldinger som skal lastes ned senere. Hvis du ikke kan få fram "
+"sprettoppsvinduer, vil disse meldingene aldri bli lastet ned så lenge ingen "
+"andre store meldinger venter på tjeneren, eller hvis du skulle endre reglene "
+"for merking av meldinger.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7236,6 +7052,16 @@ msgstr "POP3-filterregler"
 msgid "Filter Rules"
 msgstr "Filterregler"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importer"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importer"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Tilgjengelige filtre"
@@ -7317,6 +7143,11 @@ msgstr "Legg dette filteret til verktøylinjen"
 msgid "Icon for this filter:"
 msgstr "Ikon for dette filteret:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Til"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Opp"
@@ -7325,16 +7156,29 @@ msgstr "Opp"
 msgid "Down"
 msgstr "Ned"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Gi nytt navn …"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Ny"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopier til"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Slettet"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7343,20 +7187,20 @@ msgstr "Velg snarvei for mappe"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Minst ett av filtrene brukes på en tilkoblet IMAP konto. Slike filtre vil bare "
-"bli brukt når du bruker manuell filtrering og når du filtrerer innkommende IMAP "
-"meldinger."
+"Minst ett av filtrene brukes på en tilkoblet IMAP konto. Slike filtre vil "
+"bare bli brukt når du bruker manuell filtrering og når du filtrerer "
+"innkommende IMAP meldinger."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Følgende filtre er ikke lagret fordi de er ugyldige (f.eks. mangler handlinger "
-"eller søkeregler)."
+"Følgende filtre er ikke lagret fordi de er ugyldige (f.eks. mangler "
+"handlinger eller søkeregler)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7426,29 +7270,25 @@ msgstr "Feilsøker IMAP-mellomlageret"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Feilsøker IMAP-mellomlageret.</b></p>"
-"<p>Hvis du har problemer med å synkronisere en IMAP-mappe, skal du først prøve "
-"å bygge om registerfila. Dette vil ta noe tid, men vil ikke føre til noen "
-"problemer.</p>"
-"<p>Hvis dette ikke er nok, kan du prøve å gjenoppfriske IMAP-mellomlageret. "
-"Hvis du gjør det vil du miste alle lokale endringer for denne mappa og alle "
-"undermappene.</p>"
+"<p><b>Feilsøker IMAP-mellomlageret.</b></p><p>Hvis du har problemer med å "
+"synkronisere en IMAP-mappe, skal du først prøve å bygge om registerfila. "
+"Dette vil ta noe tid, men vil ikke føre til noen problemer.</p><p>Hvis dette "
+"ikke er nok, kan du prøve å gjenoppfriske IMAP-mellomlageret. Hvis du gjør "
+"det vil du miste alle lokale endringer for denne mappa og alle undermappene."
+"</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7482,16 +7322,16 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"UID-mellomlager fila for mappe %1 kunne ikke leses. Det kan være et problem med "
-"systemrettigheter, eller fila er ødelagt."
+"UID-mellomlager fila for mappe %1 kunne ikke leses. Det kan være et problem "
+"med systemrettigheter, eller fila er ødelagt."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"UID-mellomlager fila for mappe %1 kunne ikke skrives. Det kan være et problem "
-"med systemrettigheter."
+"UID-mellomlager fila for mappe %1 kunne ikke skrives. Det kan være et "
+"problem med systemrettigheter."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7529,12 +7369,12 @@ msgstr "Indeksen for denne mappa er blitt gjenoppbygget."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Mappa %1 er ikke i statusen «synkronisert for første gang» (statusen var %2). "
-"Vil du sette status tilbake til «synkronisert for første gang» og fortsette med "
-"å synkronisere likevel?"
+"Mappa %1 er ikke i statusen «synkronisert for første gang» (statusen var "
+"%2). Vil du sette status tilbake til «synkronisert for første gang» og "
+"fortsette med å synkronisere likevel?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7659,14 +7499,11 @@ msgstr "Lager undermapper på tjeneren"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Post på tjeneren i mappe <b>%1</b> var slettet. Vil du slette dem lokalt? "
-"<br>UID-er: %2</p></qt>"
+"<qt> <p>Post på tjeneren i mappe <b>%1</b> var slettet. Vil du slette dem "
+"lokalt? <br>UID-er: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7688,13 +7525,11 @@ msgstr "Henter mapper for navnerom %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Det ser ut til at den mappa <b>%1</b> var slettet. Vil du slette den fra "
-"tjeneren?</p></qt>"
+"<qt><p>Det ser ut til at den mappa <b>%1</b> var slettet. Vil du slette den "
+"fra tjeneren?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7702,20 +7537,20 @@ msgstr "Avbrutt"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"IMAP tjeneren %1 har ikke støtte for IMAP kommentarer. XML lagringen kan ikke "
-"brukes på denne tjeneren; vennligst sett opp KMail annerledes."
+"IMAP tjeneren %1 har ikke støtte for IMAP kommentarer. XML lagringen kan "
+"ikke brukes på denne tjeneren; vennligst sett opp KMail annerledes."
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"IMAP tjeneren %1 har ikke støtte for IMAP kommentarer. XML lagringen kan ikke "
-"brukes på denne tjeneren; vennligst sett opp KMail annerledes."
+"IMAP tjeneren %1 har ikke støtte for IMAP kommentarer. XML lagringen kan "
+"ikke brukes på denne tjeneren; vennligst sett opp KMail annerledes."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7728,17 +7563,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Det er nye meldinger i denne mappa (%1) som ikke ennå er lastet opp til "
-"tjeneren, men det ser ikke ut til at du har tilstrekkelige tilgangsrettigheter "
-"i mappa til å laste opp disse. Kontakt din administrator for å få tillatelse, "
-"eller flytt meldingene ut av denne mappa.</p> "
-"<p>Vil du flytte disse meldingene til en annen mappe nå?</p>"
+"tjeneren, men det ser ikke ut til at du har tilstrekkelige "
+"tilgangsrettigheter i mappa til å laste opp disse. Kontakt din administrator "
+"for å få tillatelse, eller flytt meldingene ut av denne mappa.</p> <p>Vil du "
+"flytte disse meldingene til en annen mappe nå?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7747,20 +7582,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Det er nye meldinger i denne mappa (%1) som ikke ennå er lastet opp til "
-"tjeneren, men det ser ikke ut til at du har tilstrekkelige tilgangsrettigheter "
-"i mappa til å laste opp disse. Kontakt din administrator for å få tillatelse, "
-"eller flytt meldingene ut av denne mappa.</p> "
-"<p>Vil du flytte disse meldingene til en annen mappe nå?</p>"
+"tjeneren, men det ser ikke ut til at du har tilstrekkelige "
+"tilgangsrettigheter i mappa til å laste opp disse. Kontakt din administrator "
+"for å få tillatelse, eller flytt meldingene ut av denne mappa.</p> <p>Vil du "
+"flytte disse meldingene til en annen mappe nå?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Flytt til:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ikke flytt"
 
@@ -7772,8 +7612,7 @@ msgstr "Flytt meldinger til mappe"
 msgid "Permissions (ACL)"
 msgstr "Tillatelser (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Generelt"
@@ -7797,8 +7636,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Bruk selvvalgte &ikoner"
@@ -7817,22 +7655,21 @@ msgstr "Bruk på ny/ulest e-post i denne mappa"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt> </p>Dersom dette alternativet er slått på vil du bli varslet om ny/ulest "
-"e-post i denne mappa. Dessuten vil KMail stoppe ved denne mappa når du går til "
-"neste/forrige mappe med uleste meldinger.</p>"
-"<p>Slå av dette alternativet dersom du ikke vil bli varslet om ny/ulest e-post "
-"i mappa, og du vil at mappa skal bli hoppet over når du går til neste/forrige "
-"mappe med uleste meldinger. Dette er nyttig for å unngå varsling av ny/ulest "
-"e-post i papirkurv eller søppelpostmappe.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt> </p>Dersom dette alternativet er slått på vil du bli varslet om ny/"
+"ulest e-post i denne mappa. Dessuten vil KMail stoppe ved denne mappa når du "
+"går til neste/forrige mappe med uleste meldinger.</p><p>Slå av dette "
+"alternativet dersom du ikke vil bli varslet om ny/ulest e-post i mappa, og "
+"du vil at mappa skal bli hoppet over når du går til neste/forrige mappe med "
+"uleste meldinger. Dette er nyttig for å unngå varsling av ny/ulest e-post i "
+"papirkurv eller søppelpostmappe.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7844,13 +7681,13 @@ msgstr "Behold svar i denne mappa"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Kryss av for dette alternativet hvis du vil at svar du skrive til meldinger i "
-"denne mappa skal bli lagt i samme mappe etter sending, istedenfor i den valgte "
-"mappa for sendt e-post."
+"Kryss av for dette alternativet hvis du vil at svar du skrive til meldinger "
+"i denne mappa skal bli lagt i samme mappe etter sending, istedenfor i den "
+"valgte mappa for sendt e-post."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7860,17 +7697,21 @@ msgstr "Vis sender/mottaker-kolonne i meldingslista"
 msgid "Sho&w column:"
 msgstr "Vis &kolonne:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Velg som standard"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Avsender"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Mottaker"
@@ -7881,17 +7722,17 @@ msgstr "Avsender&identitet:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Velg senderidentitet i bruk ved nye meldinger, eller svar på e-post fra denne "
-"mappa. Dette betyr at du kan la KMail bruke passende avsenderadresser, signatur "
-"og kryptering helt automatisk ut fra mappa du sender fra. "
-"Identitet-opplysninger kan velges i hovedvindu for innstillinger. (Instillinger "
-"-> Sett opp Kmail)"
+"Velg senderidentitet i bruk ved nye meldinger, eller svar på e-post fra "
+"denne mappa. Dette betyr at du kan la KMail bruke passende avsenderadresser, "
+"signatur og kryptering helt automatisk ut fra mappa du sender fra. Identitet-"
+"opplysninger kan velges i hovedvindu for innstillinger. (Instillinger -> "
+"Sett opp Kmail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7909,24 +7750,24 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Dette valget angir hvilke av brukere som deler denne mappa som får se når du er "
-"opptatt eller ledig. De vil få beskjed om hendelsene eller oppgavene i denne "
-"mappa. Dette valget gjelder kun for Kalender og oppgavemappene (for oppgaver er "
-"dette valget bare brukt for beskjeder).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Dette valget angir hvilke av brukere som deler denne mappa som får se når du "
+"er opptatt eller ledig. De vil få beskjed om hendelsene eller oppgavene i "
+"denne mappa. Dette valget gjelder kun for Kalender og oppgavemappene (for "
+"oppgaver er dette valget bare brukt for beskjeder).\n"
 "\n"
 "Mulige bruksfelt: Hvis sjefen deler en mappe med sekretæren sin skal bare "
 "sjefen være markert som opptatt for dette møtet, så han burde velge "
 "«Administratorer», siden sekretæren ikke har administrator-rettigheter til "
 "mappa.\n"
-"Men dersom en arbeidsgruppe deler en kalender for gruppemøter, vil alle som kan "
-"lese mappa være markert som opptatt for møtene.\n"
+"Men dersom en arbeidsgruppe deler en kalender for gruppemøter, vil alle som "
+"kan lese mappa være markert som opptatt for møtene.\n"
 "En mappe som hele selskapet bruker med valgfrie hendelser vil bruke «Ingen» "
 "siden det ikke er kjent hvem som vil komme på disse hendelsene."
 
@@ -7959,17 +7800,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Du har satt opp denne mappa til å inneholde gruppevareinformasjon, og de "
 "generelle innstillingene er satt til å skjule gruppevaremapper. Det betyr at "
@@ -8044,7 +7885,8 @@ msgstr "Klarte ikke å hente mappeinformasjon."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "E-postregisteret for «%1» er fra en ukjent versjon av KMail (%2).\n"
 "Dette registeret kan gjenskapes fra e-postmappa, men noe\n"
@@ -8076,8 +7918,8 @@ msgstr "Klarte ikke å åpne %1; denne mappa mangler."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Klarte ikke å åpne «%1». Enten er det ikke en gyldig maildir-mappe, eller du "
 "mangler de nødvendige tilgangsrettighetene."
@@ -8120,21 +7962,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Registeret til mappa '%2' kan være foreldet. For å unngå at meldinger "
-"ødelegges lages registeret på nytt. Resultatet kan være at slettede meldinger "
-"kan gjenoppstå og status-flagg kan gå tapt.</p>"
-"<p>Les den tilhørende oppføringa i <a href=«%1»>spørsmålsdelen av håndboka til "
-"KMail</a> for informasjon om hvordan du kan unngå at problemet oppstår "
-"igjen.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Registeret til mappa '%2' kan være foreldet. For å unngå at meldinger "
+"ødelegges lages registeret på nytt. Resultatet kan være at slettede "
+"meldinger kan gjenoppstå og status-flagg kan gå tapt.</p><p>Les den "
+"tilhørende oppføringa i <a href=«%1»>spørsmålsdelen av håndboka til KMail</"
+"a> for informasjon om hvordan du kan unngå at problemet oppstår igjen.</p></"
+"qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8193,7 +8032,7 @@ msgstr ""
 "«%1» ser ikke ut til å være en mappe.\n"
 "Fjern fila, den er i veien."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8201,7 +8040,7 @@ msgstr ""
 "Rettighetene på mappa «%1» er feil.\n"
 "Se etter at du kan se og endre på innholdet i denne mappa."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8211,8 +8050,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8220,7 +8059,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Klarte ikke lage mappe"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8321,13 +8160,13 @@ msgstr "&Feilsøk IMAP-mellomlager …"
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Kunne ikke opprette mappe <b>%1</b> på grunn av manglende rettigheter på "
-"tjeneren. Hvis du mener at du skal ha mulighet til å opprette undermapper her, "
-"be administratoren din om å gi deg rettigheter til å gjøre det.</qt>"
+"tjeneren. Hvis du mener at du skal ha mulighet til å opprette undermapper "
+"her, be administratoren din om å gi deg rettigheter til å gjøre det.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8352,14 +8191,16 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Klarte ikke å flytte mappa <b>%1</b> inn i en undermappe av seg selv.</qt>"
+"<qt>Klarte ikke å flytte mappa <b>%1</b> inn i en undermappe av seg selv.</"
+"qt>"
 
 #: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Klarte ikke å flytte mappa <b>%1</b> inn i en undermappe av seg selv.</qt>"
+"<qt>Klarte ikke å flytte mappa <b>%1</b> inn i en undermappe av seg selv.</"
+"qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8466,15 +8307,15 @@ msgstr "%1 Mappe er skrivebeskyttet."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette den valgte meldinga? "
-"<br>Når den er slettet, kan den ikke gjenopprettes.</qt>\n"
-"<qt>Er du sikker på at du vil slette de %n valgte meldingene? "
-"<br>Når de er slettet, kan de ikke gjenopprettes.</qt> "
+"<qt>Er du sikker på at du vil slette den valgte meldinga? <br>Når den er "
+"slettet, kan den ikke gjenopprettes.</qt>\n"
+"<qt>Er du sikker på at du vil slette de %n valgte meldingene? <br>Når de er "
+"slettet, kan de ikke gjenopprettes.</qt> "
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8526,133 +8367,132 @@ msgstr ""
 "Klarte ikke å endre «%1».\n"
 "(Ikke mer plass på harddisken?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Forespørsel om sertifikatsignatur"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Lag et sertifikat og send det tilbake til avsenderen."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail er satt i frakoblet modus. Alle jobber som krever nettverk er satt på "
 "vent."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail er koblet til igjen. Alle jobber som krever nettverk er gjenopptatt."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail er i frakoblet modus. Hvordan vil du fortsette?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Arbeid tilkoblet "
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Mangler lese/skrive-tillatelser til innboksmappa."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "utboks"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Mangler lese/skrive-tillatelser til utboksmappa."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "sendt e-post"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Mangler lese/skrive-tillatelser til mappa for sendt e-post."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "papirkurv"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Mangler lese/skrive-tillatelse til papirkurvmappa."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "kladd"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Mangler skrive/lese-tillatelse til kladdemappa."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "maler"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Mangler lese/skrive-tillatelse til malmappa."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Siste søk"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt> Mappa <i>%4</i> finnes. %1 bruker nå mappa <i>%5</i> til sine meldinger. "
-"<p>%2 kan flytte innholdet i <i>%6<i> til denne mappa, som også fører til at "
-"eksisterende filer kan overskrives av filer med samme navn i <i>%7</i>. "
-"<p><strong>Vil du at %3 skal flytte e-postfiler nå?</strong></qt>"
+"<qt> Mappa <i>%4</i> finnes. %1 bruker nå mappa <i>%5</i> til sine "
+"meldinger. <p>%2 kan flytte innholdet i <i>%6<i> til denne mappa, som også "
+"fører til at eksisterende filer kan overskrives av filer med samme navn i <i>"
+"%7</i>. <p><strong>Vil du at %3 skal flytte e-postfiler nå?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt> Mappa <i>%4</i> finnes. %1 bruker nå mappa <i>%5</i> "
-"til sine meldinger. %2 kan flytte innholdet i <i>%6<i> til denne mappa."
-"<p><strong>Vil du at %3 skal flytte e-postfiler nå?</strong></qt>"
+"<qt> Mappa <i>%4</i> finnes. %1 bruker nå mappa <i>%5</i> til sine "
+"meldinger. %2 kan flytte innholdet i <i>%6<i> til denne mappa.<p><strong>Vil "
+"du at %3 skal flytte e-postfiler nå?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Overfør e-postfiler?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail støtte på en uopprettelig feil og avslutter nå"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8663,11 +8503,11 @@ msgstr ""
 "Feilen var:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Tøm papirkurven"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Er du sikker på at du vil tømme papirkurvmappene for alle kontoene?"
 
@@ -8742,8 +8582,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Ny e-post mottatt</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8762,7 +8601,8 @@ msgstr "Denne mappa har ingen innstillinger for foreldede meldinger"
 #: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette foreldede meldinger i mappa <b>%1</b>?</qt>"
+"<qt>Er du sikker på at du vil slette foreldede meldinger i mappa <b>%1</b>?</"
+"qt>"
 
 #: kmmainwidget.cpp:1133
 msgid "Expire Folder"
@@ -8782,11 +8622,11 @@ msgstr "Er du sikker på at du vil tømme papirkurven?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil flytte alle meldinger fra mappa <b>%1</b> "
-"til papirkurven?</qt>"
+"<qt>Er du sikker på at du vil flytte alle meldinger fra mappa <b>%1</b> til "
+"papirkurven?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8810,12 +8650,12 @@ msgstr "Slett søk"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette søket <b>%1</b>? "
-"<br>Meldingene som vises i den blir ikke slettet hvis du gjør dette, for de er "
-"lagret i andre mapper.</qt>"
+"<qt>Er du sikker på at du vil slette søket <b>%1</b>? <br>Meldingene som "
+"vises i den blir ikke slettet hvis du gjør dette, for de er lagret i andre "
+"mapper.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8827,41 +8667,41 @@ msgstr "<qt>Er du sikker på at du vil slette den tomme mappa <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette den tomme mappa <b>%1</b> "
-"og alle dens undermapper? Hvis undermappene ikke er tomme, så slettes også "
-"innholdet i dem. "
-"<p><b>Merk</b> at slettede meldinger ikke lagres i papirkurven og blir "
+"<qt>Er du sikker på at du vil slette den tomme mappa <b>%1</b> og alle dens "
+"undermapper? Hvis undermappene ikke er tomme, så slettes også innholdet i "
+"dem. <p><b>Merk</b> at slettede meldinger ikke lagres i papirkurven og blir "
 "permanent slettet.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette mappa <b>%1</b>"
-", og kvitte deg med innholdet?"
-"<p><b>Merk</b> at slettede meldinger ikke lagres i papirkurven og blir "
-"permanent slettet.</qt>"
+"<qt>Er du sikker på at du vil slette mappa <b>%1</b>, og kvitte deg med "
+"innholdet?<p><b>Merk</b> at slettede meldinger ikke lagres i papirkurven og "
+"blir permanent slettet.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil slette mappa <b>%1</b>"
-", alle undermappene, og kvitte deg med innholdet deres? "
-"<p><b>Merk</b> at slettede meldinger ikke lagres i papirkurven og blir "
-"permanent slettet.</qt>"
+"<qt>Er du sikker på at du vil slette mappa <b>%1</b>, alle undermappene, og "
+"kvitte deg med innholdet deres? <p><b>Merk</b> at slettede meldinger ikke "
+"lagres i papirkurven og blir permanent slettet.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Slettet"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8877,9 +8717,9 @@ msgstr "Er du sikker på at du vil slette alle foreldede meldinger?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Å bruke HTML i e-post gjør deg mer sårbar for søppelpost, og vil gjøre det "
 "lettere for uvedkommende å få tilgang til systemet."
@@ -8895,11 +8735,12 @@ msgstr "Bruk HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Lasting av eksterne referanser i html-meldinger vil gjøre det mer sårbar for "
-"søppelpost og vil gjøre det lettere for uvedkommende å få tilgang til systemet."
+"søppelpost og vil gjøre det lettere for uvedkommende å få tilgang til "
+"systemet."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8915,12 +8756,12 @@ msgstr "Filter på e-postlista %1 …"
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMails funksjoner for fraværsmeldinger er bygget på filtrering på tjenersiden. "
-"Du har ennå ikke satt opp en IMAP-tjener for dette.\n"
+"KMails funksjoner for fraværsmeldinger er bygget på filtrering på "
+"tjenersiden. Du har ennå ikke satt opp en IMAP-tjener for dette.\n"
 "Du kan gjøre det under fanen «Filtrering» i oppsettet for IMAP-kontoen."
 
 #: kmmainwidget.cpp:1743
@@ -8936,7 +8777,8 @@ msgstr "Klarte ikke starte sertifikathåndteringen. Kontroller installasjonen."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Klarte ikke starte GnuPG loggviser (kwatchgnupg); Kontroller installasjonen."
 
@@ -9269,8 +9111,7 @@ msgstr "&Lagre vedlegg …"
 msgid "Appl&y All Filters"
 msgstr "Bruk alle &filtrene"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Bruk filter"
@@ -9384,7 +9225,6 @@ msgstr "Neste &uleste melding"
 msgid "Go to the next unread message"
 msgstr "Gå til neste uleste melding"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Forrige melding"
@@ -9525,21 +9365,21 @@ msgstr " Starter opp …"
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Denne meldinga inneholder en forespørsel om å sende en meldingskvittering.\n"
-"Du kan enten ignorere denne forespørselen, eller la KMail kvittere, enten med "
-"«avvist» eller en vanlig kvittering."
+"Du kan enten ignorere denne forespørselen, eller la KMail kvittere, enten "
+"med «avvist» eller en vanlig kvittering."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Denne meldinga inneholder en forespørsel om å sende en meldingskvittering,\n"
@@ -9549,8 +9389,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9562,8 +9402,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9575,8 +9415,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9585,8 +9425,8 @@ msgstr ""
 "Denne meldinga inneholder en forespørsel om å sende meldingskvittering,\n"
 "men retur-vei-adressen er ikke lik den adressen som er oppgitt "
 "somkvitteringsadresse.\n"
-"Du kan enten ignorere forespørselen eller la KMail kvittere, enten med «avvist» "
-"eller en normal kvittering."
+"Du kan enten ignorere forespørselen eller la KMail kvittere, enten med "
+"«avvist» eller en normal kvittering."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9612,17 +9452,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Kvittering: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Vedlegg: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Vis vedlegget slik avsenderen foreslår"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9672,45 +9512,37 @@ msgstr "Egenskaper for meldingsdelen"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p><em>MIME-typen</em> for fila.</p> "
-"<p>Normalt behøver du ikke å røre denne innstillingen. Filtypen sjekkes "
-"automatisk, men noen ganger gjenkjenner ikke %1 typen riktig. Her kan du ordne "
-"dette.</p></qt>"
+"<qt> <p><em>MIME-typen</em> for fila.</p> <p>Normalt behøver du ikke å røre "
+"denne innstillingen. Filtypen sjekkes automatisk, men noen ganger "
+"gjenkjenner ikke %1 typen riktig. Her kan du ordne dette.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Størrelse på delen.</p>"
-"<p>Noen ganger vil %1 gi beregnet størrelse fordi beregningen av nøyaktig "
-"størrelse vil ta for lang tid. Når dette skjer, blir «(omtrent)»lagt  til bak "
-"størrelsen som blir vist.</p></qt>"
+"<qt><p>Størrelse på delen.</p><p>Noen ganger vil %1 gi beregnet størrelse "
+"fordi beregningen av nøyaktig størrelse vil ta for lang tid. Når dette "
+"skjer, blir «(omtrent)»lagt  til bak størrelsen som blir vist.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Filnavnet på delen.</p>"
-"<p>Selv om dette er standardnavnet på den vedlagte fila, så angir det ikke fila "
-"som legges ved. – Det er snarere et forslag til filnavn som mottagerens "
-"e-postprogram kan bruke når fila lagres på harddisken.</p></qt>"
+"<qt><p>Filnavnet på delen.</p><p>Selv om dette er standardnavnet på den "
+"vedlagte fila, så angir det ikke fila som legges ved. – Det er snarere et "
+"forslag til filnavn som mottagerens e-postprogram kan bruke når fila lagres "
+"på harddisken.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9718,17 +9550,15 @@ msgstr "&Beskrivelse:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>En beskrivelse av vedlegget.</p>"
-"<p> Dette er bare en beskrivelse av vedlegget, akkurat som emnet er det for "
-"hele brevet. De fleste e-post-lesere vil vise denne informasjonen ved "
-"forhåndsvisning av brevet ved siden av ikonet for vedlegget.</p></qt>"
+"<qt><p>En beskrivelse av vedlegget.</p><p> Dette er bare en beskrivelse av "
+"vedlegget, akkurat som emnet er det for hele brevet. De fleste e-post-lesere "
+"vil vise denne informasjonen ved forhåndsvisning av brevet ved siden av "
+"ikonet for vedlegget.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9736,23 +9566,21 @@ msgstr "&Koding:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Transportkodinga for meldingsdelen.</p>"
-"<p> Det er normalt ikke nødvendig å endre dette, da %1 bruker en grei "
-"standardkoding, avhengig av MIME-type. Allikevel er det noen ganger mulig å "
-"oppnå en betydelig reduksjon av størrelsen på brevet, f.eks. ved sending av en "
-"PostScript-fil som ikke inneholder binær-data, men består av ren tekst. I dette "
-"tilfellet vil et valg av «quoted-printable» istedenfor standarden «base64» "
-"spare opptil 25% i forhold til opprinnelig størrelse.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Transportkodinga for meldingsdelen.</p><p> Det er normalt ikke "
+"nødvendig å endre dette, da %1 bruker en grei standardkoding, avhengig av "
+"MIME-type. Allikevel er det noen ganger mulig å oppnå en betydelig reduksjon "
+"av størrelsen på brevet, f.eks. ved sending av en PostScript-fil som ikke "
+"inneholder binær-data, men består av ren tekst. I dette tilfellet vil et "
+"valg av «quoted-printable» istedenfor standarden «base64» spare opptil 25% i "
+"forhold til opprinnelig størrelse.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9760,20 +9588,17 @@ msgstr "Foreslå &automatisk visning"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kryss av her dersom du vil foreslå at e-postprogrammet til mottakeren viser "
-"vedlegget automatisk sammen med meldinga i stedet for bare som et ikon.</p> "
-"<p>Teknisk blir dette gjort ved å sette <em>Content-Disposition</em>"
-"-feltet til denne meldingsdelen til «inline» (inni) i stedet for «attachment» "
-"(vedlegg).</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Kryss av her dersom du vil foreslå at e-postprogrammet til mottakeren "
+"viser vedlegget automatisk sammen med meldinga i stedet for bare som et ikon."
+"</p> <p>Teknisk blir dette gjort ved å sette <em>Content-Disposition</em>-"
+"feltet til denne meldingsdelen til «inline» (inni) i stedet for "
+"«attachment» (vedlegg).</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9781,13 +9606,11 @@ msgstr "&Signer denne delen"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kryss av her om du vil at dette meldingsfeltet skal signeres.</p> "
+"<qt><p>Kryss av her om du vil at dette meldingsfeltet skal signeres.</p> "
 "<p>Underskrifta blir laget med nøkkelen du har valgt for den identiteten du "
 "bruker.</p></qt>"
 
@@ -9797,12 +9620,10 @@ msgstr "Kr&ypter denne delen"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kryss av her om du vil at denne delen av brevet skal krypteres.</p> "
+"<qt><p>Kryss av her om du vil at denne delen av brevet skal krypteres.</p> "
 "<p>Denne delen vil bli kryptert til mottakerne av brevet</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
@@ -9817,16 +9638,13 @@ msgstr "POP-filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 "Meldinger som skal filtreres ble funnet på POP-kontoen: <b>%1</b> "
 "<p>Meldingene overstiger den maksimale størrelsen som er valgt for denne "
-"kontoen. "
-"<br> Velg hva du vil gjøre med dem."
+"kontoen. <br> Velg hva du vil gjøre med dem."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10080,40 +9898,37 @@ msgstr "E-postklienten for skrivebordsmiljøet TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Henter mappeinhold</h2> "
-"<p>Vent . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Henter mappeinhold</h2> <p>Vent . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Frakoblet</h2> "
-"<p>KMail er frakoblet. Trykk <a href=\"kmail:goOnline\">her</a> "
-"for å koble til . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Frakoblet</h2> <p>KMail er frakoblet. Trykk <a "
+"href=\"kmail:goOnline\">her</a> for å koble til . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10121,18 +9936,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Velkommen til KMail %1</h2> "
-"<p>KMail er e-postprogrammet for K Desktop Environment. Den er laget for å "
-"samspille helt og fullt med Internetts e-poststandarder, deriblant MIME, SMTP, "
-"POP3 og IMAP.</p>\n"
-"<ul> "
-"<li>KMail har mange kraftige funksjoner som er beskrevet i <a href=\"%2\"> "
-"dokumentasjonen</a></li>\n"
+"<h2 style='margin-top: 0px;'>Velkommen til KMail %1</h2> <p>KMail er e-"
+"postprogrammet for K Desktop Environment. Den er laget for å samspille helt "
+"og fullt med Internetts e-poststandarder, deriblant MIME, SMTP, POP3 og IMAP."
+"</p>\n"
+"<ul> <li>KMail har mange kraftige funksjoner som er beskrevet i <a href="
+"\"%2\"> dokumentasjonen</a></li>\n"
 "<li>På <a href=\"%3\">KMails hjemmeside</A> finner du opplysninger om nye "
 "versjoner av KMail.</li></ul>\n"
 "%8\n"
-"<p>Noen nye funksjoner i denne utgaven av KMail (i forhold til KMail %4, som er "
-"en del av TDE %5) er blant annet:</p>\n"
+"<p>Noen nye funksjoner i denne utgaven av KMail (i forhold til KMail %4, som "
+"er en del av TDE %5) er blant annet:</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10141,22 +9955,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail-laget</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Ta deg tid til å fylle ut KMails oppsettspanel på Innstillinger-&gt;Oppsett "
-"for Kmail.\n"
-"Du trenger minst en hovedidentitet og både en inngående og en utgående "
-"e-postkonto.</p>\n"
+"<p>Ta deg tid til å fylle ut KMails oppsettspanel på Innstillinger-&gt;"
+"Oppsett for Kmail.\n"
+"Du trenger minst en hovedidentitet og både en inngående og en utgående e-"
+"postkonto.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10195,7 +10007,8 @@ msgstr "Vis vedlegg: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Vedlegget inneholder binære data. Forsøker å vise første tegn.]\n"
@@ -10224,12 +10037,14 @@ msgstr "Vil du åpne vedlegget?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10251,6 +10066,58 @@ msgstr "(pass med en av de følgende)"
 msgid "(match all of the following)"
 msgstr "(pass til alle de følgende)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lest"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Gammel"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Slettet"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Besvart"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Sendt videre"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Lagt til i kø"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sendt"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Overvåket"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorert"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Søppelpost"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ikke-søppelpost"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Huskeliste"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Har vedlegg"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10335,21 +10202,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Klarte ikke å flytte den sendte meldinga «%1» fra utboksen til mappa med sendte "
-"meldinger.\n"
+"Klarte ikke å flytte den sendte meldinga «%1» fra utboksen til mappa med "
+"sendte meldinger.\n"
 "Det kan hende systemet ikke har ledig plass, eller at du ikke har "
 "skrivetilgang. Prøv å rette problemet og flytt meldinga manuelt."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Det er ikke mulig å sende meldinger uten å angi en avsenderadresse.\n"
 "Velg en e-postadressen for identiteten «%1» i avsnittet «identiteter» i "
@@ -10378,8 +10245,8 @@ msgstr "Starter sendeprosessen …"
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Du har valgt å sende all e-post i køen over en ukryptert forbindelse. Vil du "
 "fortsette?"
@@ -10406,8 +10273,9 @@ msgstr "Klarte ikke å sende (en eller flere) meldinger i køen."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10424,20 +10292,16 @@ msgstr "Sending avbrutt."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Klarte ikke å sende:</p>"
-"<p>%1</p>"
-"<p>Meldinga vil ligge i utboksen til du fikser problemet (f.eks. feil adresse) "
-"eller fjerner meldinga fra utboksen.</p>"
-"<p>Følgende transportprotokoll ble brukt: %2</p>"
-"<p>Vil du prøve å sende resten av meldingene?</p>"
+"<p>Klarte ikke å sende:</p><p>%1</p><p>Meldinga vil ligge i utboksen til du "
+"fikser problemet (f.eks. feil adresse) eller fjerner meldinga fra utboksen.</"
+"p><p>Følgende transportprotokoll ble brukt: %2</p><p>Vil du prøve å sende "
+"resten av meldingene?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10455,8 +10319,9 @@ msgstr "&Avbryt sendinga"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10499,48 +10364,48 @@ msgstr "Sendmail avsluttet unormalt."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Du må angi et brukernavn og et passord for å få tilgang til denne "
-"SMTP-tjeneren."
+"Du må angi et brukernavn og et passord for å få tilgang til denne SMTP-"
+"tjeneren."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 ser ut til å kjøre allerede på en annen skjerm på denne maskinen. Å kjøre %2 "
-"mer enn en gang kan føre til at du mister e-post. Du burde ikke starte %1 hvis "
-"du er usikker på om den kjører allerede."
+"%1 ser ut til å kjøre allerede på en annen skjerm på denne maskinen. Å kjøre "
+"%2 mer enn en gang kan føre til at du mister e-post. Du burde ikke starte %1 "
+"hvis du er usikker på om den kjører allerede."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 ser ut til å kjøre allerede på en annen skjerm på denne maskinen. Å kjøre %1 "
-"og %2 på samme tid kan føre til at du mister e-post. Du burde ikke starte %2 "
-"hvis du er usikker på om %1 allerede kjører."
+"%1 ser ut til å kjøre allerede på en annen skjerm på denne maskinen. Å kjøre "
+"%1 og %2 på samme tid kan føre til at du mister e-post. Du burde ikke starte "
+"%2 hvis du er usikker på om %1 allerede kjører."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 ser ut til å kjøre allerede på %2. Å kjøre %1 mer enn en gang kan føre til "
-"at du mister e-post. Du burde ikke starte %1 på denne maskinen hvis du er "
-"usikker på om den allerede kjører på %2."
+"%1 ser ut til å kjøre allerede på %2. Å kjøre %1 mer enn en gang kan føre "
+"til at du mister e-post. Du burde ikke starte %1 på denne maskinen hvis du "
+"er usikker på om den allerede kjører på %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 ser ut til å kjøre allerede på %3. Å kjøre %1 og %2 samtidig kan føre til at "
-"du mister e-post. Du burde ikke starte %2 på denne maskinen hvis du er usikker "
-"på om %1 allerede kjører på %3."
+"%1 ser ut til å kjøre allerede på %3. Å kjøre %1 og %2 samtidig kan føre til "
+"at du mister e-post. Du burde ikke starte %2 på denne maskinen hvis du er "
+"usikker på om %1 allerede kjører på %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10551,6 +10416,10 @@ msgstr "Start %1"
 msgid "Exit"
 msgstr "Avslutt"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nye meldinger i"
@@ -10577,14 +10446,15 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet er ikke tilgjenglig. Det anbefales sterkt at du bruker TDEWallet for "
-"å behandle passordene dine.\n"
-"KMail kan alikevel lagre passordet i sin oppsettsfil istedenfor. Passordet vil "
-"bli lagret i et sært format, men burde ikke regnes som sikkert fra "
+"TDEWallet er ikke tilgjenglig. Det anbefales sterkt at du bruker TDEWallet "
+"for å behandle passordene dine.\n"
+"KMail kan alikevel lagre passordet i sin oppsettsfil istedenfor. Passordet "
+"vil bli lagret i et sært format, men burde ikke regnes som sikkert fra "
 "dekrypteringsforsøk hvis andre får tilgang til oppsettsfila.\n"
 "Vil du lagre passordet for kontoen %1 i oppsettsfila?"
 
@@ -10655,8 +10525,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "En kommando som skal kjøres lokalt før e-post blir sendt. Dette kan for "
-"eksempel brukes til å sette opp ssh-tunneler. La feltet stå tomt dersom du ikke "
-"vil kjøre noen kommando."
+"eksempel brukes til å sette opp ssh-tunneler. La feltet stå tomt dersom du "
+"ikke vil kjøre noen kommando."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10664,11 +10534,11 @@ msgstr "Tjeneren &krever godkjennelse"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Kryss av her dersom SMTP-tjeneren krever passord før du kan sende e-post. Denne "
-"funksjonen blir kalt «Godkjent SMTP» eller «ASMTP»."
+"Kryss av her dersom SMTP-tjeneren krever passord før du kan sende e-post. "
+"Denne funksjonen blir kalt «Godkjent SMTP» eller «ASMTP»."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10688,15 +10558,13 @@ msgstr "Sen&d tilpasset vertsnavn til tjeneren"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Kryss av her for å kunne velge hvilket vertsnavn KMail skal bruke overfor "
-"tjeneren. "
-"<p>Dette er nyttig dersom vertsnavnet på systemet ikke er rett satt opp eller "
-"dersom du vil skjule det virkelige vertsnavnet."
+"tjeneren. <p>Dette er nyttig dersom vertsnavnet på systemet ikke er rett "
+"satt opp eller dersom du vil skjule det virkelige vertsnavnet."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10726,11 +10594,11 @@ msgstr "Bare lokale filer kan brukes."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Tjenerfeltet kan ikke være tomt. Skriv inn navnet eller IP-adressen til "
-"SMTP-tjeneren."
+"Tjenerfeltet kan ikke være tomt. Skriv inn navnet eller IP-adressen til SMTP-"
+"tjeneren."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10742,10 +10610,10 @@ msgstr "Klarte ikke å liste opp mappa %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10967,35 +10835,28 @@ msgstr "&Rediger melding"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Programtillegget for kryptering ga strukturinformasjon som ikke kunne "
-"behandles på riktig måte. Programtillegget kan være skadet.</p>"
-"<p>Kontakt systemadministratoren.</p></qt>"
+"<qt> <p> Programtillegget for kryptering ga strukturinformasjon som ikke "
+"kunne behandles på riktig måte. Programtillegget kan være skadet.</"
+"p><p>Kontakt systemadministratoren.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Det ble ikke funnet noe programtillegg for aktiv krypto, og den innebygde "
-"OpenPGP-koden kjørte ikke riktig.</p>"
-"<p>Du kan gjøre to ting for å endre dette:</p>"
-"<ul>"
-"<li><em>Enten</em> skru på programtillegget ved å gå til «Innstillinger->"
-"Oppsett av KMail» og velge «Sikkerhet->Crypto-tillegg».</li>"
-"<li><em>Eller</em> angi tradisjonelle OpenPGP-innstillinger under: «Sikkerhet->"
-"OpenPGP» i det samme dialogvinduet .</li></ul>"
+"OpenPGP-koden kjørte ikke riktig.</p><p>Du kan gjøre to ting for å endre "
+"dette:</p><ul><li><em>Enten</em> skru på programtillegget ved å gå til "
+"«Innstillinger->Oppsett av KMail» og velge «Sikkerhet->Crypto-tillegg».</"
+"li><li><em>Eller</em> angi tradisjonelle OpenPGP-innstillinger under: "
+"«Sikkerhet->OpenPGP» i det samme dialogvinduet .</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11007,8 +10868,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus bakstykke tilbyr ikke \"x-encrypt\"-funksjonen. Vennligst meld inn "
 "denne feilen."
@@ -11018,8 +10879,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\"x-encrypt\"-funksjonen aksepterer ikke de ventede parametre. Vennligst meld "
-"inn denne feilen."
+"\"x-encrypt\"-funksjonen aksepterer ikke de ventede parametre. Vennligst "
+"meld inn denne feilen."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11027,20 +10888,20 @@ msgstr "Chiasmus krypterings-feil"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Uventet returverdi fra Chiasmus bakstykke. \"x-encrypt\"-funksjonen returnerte "
-"ikke en byte-tabell. Vennligst meld inn denne feilen."
+"Uventet returverdi fra Chiasmus bakstykke. \"x-encrypt\"-funksjonen "
+"returnerte ikke en byte-tabell. Vennligst meld inn denne feilen."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Det innebygde meldingsformatet for OpenPGP-kryptering støtter ikke kryptering "
-"eller signering av vedlegg.\n"
+"Det innebygde meldingsformatet for OpenPGP-kryptering støtter ikke "
+"kryptering eller signering av vedlegg.\n"
 "Vil du virkelig bruke det foreldede formatet «innebygd OpenPGP»?"
 
 #: messagecomposer.cpp:640
@@ -11092,8 +10953,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Du har valgt å signere denne meldinga, men ingen gyldige signeringsnøkler har "
-"blitt satt opp for denne identiteten."
+"Du har valgt å signere denne meldinga, men ingen gyldige signeringsnøkler "
+"har blitt satt opp for denne identiteten."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11110,7 +10971,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Noen deler av denne meldinga vil ikke bli signert.\n"
-"Å sende meldinger som bare delvis er signert kan være imot nettstedets praksis."
+"Å sende meldinger som bare delvis er signert kan være imot nettstedets "
+"praksis."
 
 #: messagecomposer.cpp:827
 msgid ""
@@ -11148,12 +11010,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Mottagerens krypteringsoppsett angir at du skal bli bli spurt om denne meldinga "
-"skal krypteres eller ikke.\n"
+"Mottagerens krypteringsoppsett angir at du skal bli bli spurt om denne "
+"meldinga skal krypteres eller ikke.\n"
 "Vil du kryptere meldinga?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11186,12 +11048,13 @@ msgstr "&Ikke krypter"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Du har bedt om å kryptere denne meldinga, og å kryptere en kopi til deg selv, "
-"men ingen tiltrodde og gyldige krypteringsnøkler har blitt satt opp for denne "
-"identiteten."
+"Du har bedt om å kryptere denne meldinga, og å kryptere en kopi til deg "
+"selv, men ingen tiltrodde og gyldige krypteringsnøkler har blitt satt opp "
+"for denne identiteten."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11200,8 +11063,8 @@ msgstr "Send ukryptert?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Noen deler av denne meldinga vil ikke bli kryptert.\n"
@@ -11217,8 +11080,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Denne meldinga vil ikke bli kryptert.\n"
-"Å sende ukrypterte meldinger kan bryte med nettstedets praksis og/eller lekke "
-"sensitiv informasjon.\n"
+"Å sende ukrypterte meldinger kan bryte med nettstedets praksis og/eller "
+"lekke sensitiv informasjon.\n"
 "Vil du kryptere meldingene isteden?"
 
 #: messagecomposer.cpp:955
@@ -11229,92 +11092,87 @@ msgstr "&Krypter alle delene"
 msgid "Unencrypted Message Warning"
 msgstr "Varsel om ukryptert melding"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Feil: Programtillegget for kryptering ga ingen kodede data. </p>"
-"<p>Meld fra om denne feilen:"
-"<br>%2</p></qt>"
+"<qt><p>Feil: Programtillegget for kryptering ga ingen kodede data. </"
+"p><p>Meld fra om denne feilen:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qt>Noen tegn passer ikke inn i den valgte kodinga.\n"
-"<br>"
-"<br>Vil du sende meldinga allikevel?</qt>"
+"<br><br>Vil du sende meldinga allikevel?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Noen tegn vil gå tapt"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Tapte karakterer"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Endre koding"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Denne meldinga kunne ikke bli signert siden den valgte motoren ikke ser ut til "
-"å støtte signering; dette skal egentlig aldri skje, det er fint om du rapporter "
-"denne feilen."
+"Denne meldinga kunne ikke bli signert siden den valgte motoren ikke ser ut "
+"til å støtte signering; dette skal egentlig aldri skje, det er fint om du "
+"rapporter denne feilen."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Denne meldinga kunne ikke bli signert siden den valgte motoren ikke ser ut til "
-"å støtte signering; dette skal egentlig aldri skje, det er fint om du rapporter "
-"denne feilen."
+"Denne meldinga kunne ikke bli signert siden den valgte motoren ikke ser ut "
+"til å støtte signering; dette skal egentlig aldri skje, det er fint om du "
+"rapporter denne feilen."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "Signeringshandlinga mislyktes. Se etter at programmet gpg-agent kjører."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Denne meldinga kunne ikke bli kryptert siden den valgte motoren ikke ser ut til "
-"å støtte kryptering. Dette skal egentlig aldri skje, det er fint om du "
+"Denne meldinga kunne ikke bli kryptert siden den valgte motoren ikke ser ut "
+"til å støtte kryptering. Dette skal egentlig aldri skje, det er fint om du "
 "rapporter denne feilen."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Denne meldinga kunne ikke bli signert og kryptert siden den valgte motoren ikke "
-"ser ut til å støtte kombinert signering og kryptering. Dette skal egentlig "
-"aldri skje, det er fint om du rapporter denne feilen."
+"Denne meldinga kunne ikke bli signert og kryptert siden den valgte motoren "
+"ikke ser ut til å støtte kombinert signering og kryptering. Dette skal "
+"egentlig aldri skje, det er fint om du rapporter denne feilen."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11335,14 +11193,15 @@ msgstr "&Postboksformat:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Velg om meldinga skal lagres i denne mappa som en fil pr. melding (maildir) "
-"eller som en stor fil (mbox). KMail bruker maildir som standard. Dette trenger "
-"kun å endres i sjeldne tilfeller. Om du er usikker lar du den stå som den er. "
+"eller som en stor fil (mbox). KMail bruker maildir som standard. Dette "
+"trenger kun å endres i sjeldne tilfeller. Om du er usikker lar du den stå "
+"som den er. "
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11351,12 +11210,12 @@ msgstr "&Mappeinnhold:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Velg om den nye mappa skal brukes som e-postlager til lageret til "
-"gruppevare-elementet som en oppgave eller notater. Standard er e-post. Om du er "
-"usikker lar du den stå som den er. "
+"Velg om den nye mappa skal brukes som e-postlager til lageret til gruppevare-"
+"elementet som en oppgave eller notater. Standard er e-post. Om du er usikker "
+"lar du den stå som den er. "
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11395,8 +11254,7 @@ msgid "The crypto engine returned no cleartext data."
 msgstr ""
 "Programtillegget for kryptering svarte med data som ikke var i klartekst."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11425,8 +11283,8 @@ msgstr "Ingen programtillegg for %1 ble funnet."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Meldinga er signert, men det går ikke å sjekke om signaturen er gyldig."
 "<br>Grunnen er: %1"
@@ -11465,27 +11323,27 @@ msgstr "Programtillegget «%1» kan ikke dekryptere meldinger."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Merk:</b> Denne HTML medlingen kan inneholde eksterne referanser til bildet "
-"osv. Av hensyn til ditt personvern og maskinens sikkerhet vil ikke eksterne "
-"referanser bli lastet. Hvis du stoler på senderen av denne meldinga kan du "
-"laste de eksterne referansene i denne meldinga <a href=\"kmail:loadExternal\">"
-"ved å klikke her</a>."
+"<b>Merk:</b> Denne HTML medlingen kan inneholde eksterne referanser til "
+"bildet osv. Av hensyn til ditt personvern og maskinens sikkerhet vil ikke "
+"eksterne referanser bli lastet. Hvis du stoler på senderen av denne meldinga "
+"kan du laste de eksterne referansene i denne meldinga <a href=\"kmail:"
+"loadExternal\">ved å klikke her</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Merk:</b> Dette er en HTML-melding. Av sikkerhetsgrunner blir bare ren "
-"HTML-kode vist. Dersom du stoler på avsenderen, kan du slå på formatert "
-"HTML-visning av denne meldinga med <a href=\"kmail:showHTML\">denne lenka</a>."
+"HTML-kode vist. Dersom du stoler på avsenderen, kan du slå på formatert HTML-"
+"visning av denne meldinga med <a href=\"kmail:showHTML\">denne lenka</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11742,8 +11600,8 @@ msgstr "lagret: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Ingen e-postadresse er lagret i %1 som blir brukt til signering. Kan derfor "
 "ikke sammenlikne med avsenderadressen %2."
@@ -11861,14 +11719,15 @@ msgstr "Feilmelding for Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"POP3-tjeneren (konto: %1) støtter ikke UIDL-kommandoen. Denne kommandoen trengs "
-" for at KMail på en pålitelig måte skal kunne finne ut hvilke e-poster du har "
-"sett før.\n"
+"POP3-tjeneren (konto: %1) støtter ikke UIDL-kommandoen. Denne kommandoen "
+"trengs  for at KMail på en pålitelig måte skal kunne finne ut hvilke e-"
+"poster du har sett før.\n"
 "Funksjonen som lar e-post ligge igjen på tjeneren vil derfor ikke fungere "
 "skikkelig."
 
@@ -11890,7 +11749,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Henter melding %1 av %2 (%3 av %4 KB) for %5@%6 (%7 KB igjen på tjeneren)."
 
@@ -11908,1861 +11768,15 @@ msgstr "Ugyldig svar fra tjeneren"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Tjeneren støtter ikke TOP-kommandoen. Derfor er det ikke mulig å hente "
 "brevhoder til store e-postmeldinger før de lastes ned."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Gå"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "M&appe"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Melding"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Svar spesielt"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Videresend:"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-verktøylinje"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signering"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Automatisk signering av meldinger"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Velg om alle meldinger skal signeres. Du kan selvsagt fortsatt skru av "
-"signering for hver enkelt melding."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Kryptering"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Når dette valget er på, vil meldinga/fila ikke bare bli kryptert med "
-"mottagerens offentlige nøkkel, men også med din nøkkel. Det gjør det mulig for "
-"deg å dekryptere meldinga/fila senere. Dette er generelt sett en god ide."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Vis s&ignert/kryptert tekst når du er ferdig"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Når dette valget er på vil den signerte/krypterte teksten bli vist i et eget "
-"vindu, noe som gjør det mulig å se hvordan det vil se ut før den er sendt. "
-"Dette er en god ide når du vil kontrollere at krypteringssystemet ditt "
-"fungerer."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Lagre sendte meldinger &krypterte"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Kryss av for å lagre meldinger kryptert"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Lagre meldinger kryptert</h1>\n"
-"Hvis du krysser av i denne boksen blir sendte meldinger lagret kryptert på "
-"samme måte som de ble sendt. Dette anbefales ikke, for du kan ikke lese "
-"meldinger etter at et nødvendig sertifikat er foreldet.\n"
-"<p>\n"
-"Llikevel kan det være lokale regler som forutsetter at man bruker dette valget. "
-"Hvis du er usikker, kontakt din systemadministrator.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Alltid vis krypterings nøkklene &for godkjenning"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Når dette valget er på vil programmet alltid vise deg en liste over offentlige "
-"nøkler hvor du kan velge hvilken nøkkel den skal bruke til kryptering. Hvis det "
-"er skrudd av vil programmet kun vise dialogen hvis det ikke kan finne den rette "
-"nøkkelen eller hvis det er flere som kan brukes."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Kr&ypter meldinger automatisk når det er mulig"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Hvis dette er på, vil hver melding du sender bli kryptert hvis dersom det "
-"ermulig og ønsket. Det er naturligvis fortsatt mulig å skru av automatisk "
-"kryptering for hver enkelt melding."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Aldri signer/krypter når en kladd blir &lagret"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Hvordan virker dette?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Til: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopi: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universal"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Svar"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Svar til alle"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Videresend"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Snar&vei:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Mal&type:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Mappeegenskaper"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Mappa inneholder en e-postliste"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Adresse for &e-postliste:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Ulest:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Forelding av meldinger"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Foreldet etter:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Foreld &leste meldinger"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Foreld e&tter:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Foreld &uleste meldinger"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "dag(er)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "uke(r)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "måned(er)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avansert"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Avsender&identitet:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Lagringsformat:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listevisninger:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Sjekk om sertifikat er gyldig ved å bruke kontrollinstanser (CRL)"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Hvis dette valget er på vil S/MIME-sertifikater bli sjekket ved å bruke lister "
-"for sertifikatgjenkalling (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Sjekk gyldigheten på sertifikater på Internett (OSCP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Hvis dette er valgt vil S/MIME-sertifikater bli sjekket ved hjelp av en "
-"statusprotokoll på Internett (forkortet til «OCSP» for "
-"«Online Certificates Status Protocol»). Fyll in nettadressen til "
-"OSCP-tilbyderen nedenfor."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Tilkoblet godkjenning av sertifikater"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Nettadresse for OCSP-tilbyderen:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Skriv nettadressen til tjeneren for godkjenning av sertifikater via Internett "
-"(OSCP-tilbyder). Nettadressen starter som oftest med http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Signatur for OCSP-tilbyder:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorer sertifikatenes service URL"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Ikke sjekk sertifikatpraksis"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Standardinnstillinga til GnuPG er å bruke fila ~/.gnupg/policies.txt for å "
-"sjekke om en sertifikatpraksis er tillatt. Hvis dette valget er på vil det ikke "
-"bli sjekket."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Aldri sjekk med en sertifikatliste (CRL)"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Hvis dette er valgt vil serifikatlista aldri bli brukt for å sjekke gyldigheten "
-"til S/MIME-sertifikater."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Hent manglende utstedersertifikater"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Hvis dette valget er på vil manglende utstedersertifikater bli hentet hvis det "
-"blir nødvendig (dette gjelder for begge metodene for å sjekke gyldighet på, "
-"både CRL og OSCP)."
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP forespørsler"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Ikke utfør noen HTTP forespørsler"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Skru bruken av HTTP for S/MIME helt av"
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Bruk denne mellomtjeneren for HTTP forespørsler: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Bruk system HTTP mellomtjener:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Hvis denne muligheten er valgt vil verdien til HTTP mellomtjeneren vist til "
-"høyre (som kommer fra miljøvariabelen http_proxy) bli brukt for alle "
-"HTTP-forespørsler."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Skriv adressen til din HTTP mellomtjener som vil bli brukt for alle HTTP "
-"forespørsler knyttet til S/MIME. Syntaksen er host:port, for eksempel: "
-"minmellomtjener.example.com:3128"
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Overse HTTP distribusjonspunkt for CRL sertifikater."
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Når det letes etter plasseringa til en CRL, så vil sertifikatet som skal testes "
-"vanligvis inneholde det som er kjent som «CRL distribusjonspunkt» (DP) "
-"oppføringen. Det er nettadresser som beskriver hvordan man får tilgang til "
-"adressen. Den første DP-oppføringa som blir funnet blir brukt.  Med dette "
-"valget vil alle oppføringene som bruker HTTP vil ikke bli tatt hensyn til når "
-"det søkes etter en brukbar DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-forespørsler"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Ikke utfør noen LDAP-forespørsler"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Skrur helt av bruken av LDAP for S/MIME"
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Overse LDAP distribusjonspunkt for CRL sertifikater"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Når det letes etter plasseringa til en CRL, så vil sertifikatet som skal testes "
-"vanligvis inneholde det som er kjent som «CRL distribusjonspunkt» (DP) "
-"oppføringen. Det er nettadresser som beskriver hvordan man får tilgang til "
-"adressen. Den første DP-oppføringa som blir funnet blir brukt.  Med dette "
-"valget vil alle oppføringene som bruker LDAP vil ikke bli tatt hensyn til når "
-"det søkes etter en brukbar DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primær vert for LDAP-forespørsler"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Hvis du skriver inn en LDAP tjener her vil alle LDAP forespørsler bli sendt til "
-"den tjeneren først. For å være presis, denne innstillinga vil overkjøre alle "
-"vert og port parametere spesifisert i en LDAP URL og vil også bli brukt hvis en "
-"vert og port ikke har blitt medregnet i URLen. Andre LDAP tjenere vil bare bli "
-"brukt hvis en feil oppstår under tilkoplingen til «mellomtjeneren».\n"
-"Syntaksen er «VERT» eller «VERT:PORT». Hvis PORT ikke er medregnet vil port 389 "
-"(standard LDAP port) bli brukt."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Legg til …"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Gruppevare"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Tilbakestill skriftinnstillingene"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "uendelig"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Maloppsett"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Svar til avsender"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Svar til alle/Svar til lista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Videresend melding"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Gi advarsel ved forsøk på å sende &usignerte meldinger"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Kryss av her for å bli varslet ved sending av usignerte meldinger"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel ved forsøk på å sende usignerte meldinger</h1>\n"
-"Krysser du av i denne boksen, vil du bli advart ved forsøk på å sende meldinger "
-"der hele eller deler av meldinga er usignert.\n"
-"<p>\n"
-"Det anbefales å la valget være på for størst mulig sikkerhet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Gi &Varsel før sending av ukrypterte meldinger"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Kryss av for å varsles ved sending av ukryptert melding."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel ved sending av ukrypterte meldinger</h1>\n"
-"Hvis du krysser av i boksen får du en advarsel når du årøver å sende en melding "
-"som helt eller delvis er ukryptert.\n"
-"<p>\n"
-"<p>Dette alternativet bør væra slått på for best muligtrygghet.</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Gi varsel om mottakerens e-post-adresse &ikke er i sertifikatet"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Kryss av for å få varsel hvis adressen ikke er i sertifikatet"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel hvis mottakers e-post-adresse mangler i sertifikatet</h1>\n"
-"Når valget er avkrysset vil du få en advarsel hvis e-post-adressen til "
-"mottakeren mangler i sertifikatet som brukes til kryptering.\n"
-"<p>\n"
-"Det anbefales å la dette valget være på for størst mulig sikkerhet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Gi varsel hvis sertifikater/nøkler blir foreldet snart (sett opp grenser "
-"nedenfor)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Bruk til signering"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Til kryptering"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dager"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Velg antall dager"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel hvis signatursertifikatet blir foreldet</h1>\n"
-"Velg laveste antall dager signatursertifikatet skal være gyldig uten å gi en "
-"advarsel.\n"
-"<p>\n"
-"Anbefalt SPHINX-innstilling er 14 dager.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel hvis krypteringssertifikatet blir foreldet</h1>\n"
-"Velg det laveste antall dager som krypteringssertifikatet skal være gyldig før "
-"det gis en advarsel.\n"
-"<p>\n"
-"Den anbefalte SPHINX-innstillinga er 14 dager.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel hvis et sertifikat i kjeden er foreldet</h1>\n"
-"Velg det laveste antall dager alle sertifikatene i kjeden skal være gyldige "
-"uten å gi advarsel.\n"
-"<p>\n"
-"Den anbefalte SPHINX-innstillinga er 14 dager.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel hvis CA-sertifikatet blir foreldet</h1>\n"
-"Velg minimum antall dager sertifikatet burde være gyldig uten å gien advarsel.\n"
-"<p>\n"
-"Anbefalt SPHINX-innstilling er 14 dager.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Gi advarsel hvis rotsertifikatet blir foreldet</h1>\n"
-"Velg minste antall dager rot-sertifikatet er gyldig uten å gi en advarsel.\n"
-"<p>\n"
-"Anbefalt SPHINX-innstilling er 14 dager.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Til rotsertifikater:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "For mellomsertifikater for CA-sertifikater:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "For sluttbruker-sertifikater/nøkler:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Slå på alle «Ikke spør igjen» advarsler igjen"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Malinnhold"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Snarvei til mal"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Maltype"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Send meldingene i køen når e-post hentes"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p>Velg om du vil at KMail skal sende alle meldingene i utboksen når du sjekker "
-"e-post manuelt, også ved automatisk sjekk, eller om du ikke vil at meldingene "
-"skal sendes automatisk i det hele tatt.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Det er nye meldinger i denne mappa (%1) som ikke ennå er lastet opp til "
-"tjeneren, men det ser ikke ut til at du har tilstrekkelige tilgangsrettigheter "
-"i mappa til å laste opp disse. Kontakt din administrator for å få tillatelse, "
-"eller flytt meldingene ut av denne mappa.</p> "
-"<p>Vil du flytte disse meldingene til en annen mappe nå?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Den sist valgte mappa i dialogen for mappevalg."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Praksis for visning av ikoner i systemikonfeltet"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Påminnelse ved ny e-post"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Hvis dette valget er på vil hver mappe vise antallet nye meldinger i beskjeden "
-"om ny e-post; hvis ikke vil du bare få en enkel melding om «Ny e-post mottatt»."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Oppgi skriveprogram:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Bruk et annet skriveprogram enn KMails eget"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Slå på funksjoner for gruppevare"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Bytt om på Fra:/Til: hodene i svar på svar"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook har flere mangler i sin implementasjon av iCalendar "
-"standarden; dette alternativet unngår en av dem. Hvis du har problemer med at "
-"Outlook brukere ikke kan motta svarene dine, så prøv å slå på dette "
-"alternativet."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Send gruppevareinvitasjoner i meldingsteksten"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook har flere mangler i sin implementasjon av "
-"iCalendar-standarden; dette alternativet unngår en av dem. Hvis du har "
-"problemer med at Outlook brukere ikke kan motta invitasjonene dine, så prøv å "
-"slå på dette alternativet."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automatisk invitasjonssending"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Når dette er valgt vil du ikke se ny-meldingsvinduet. I stedet blir alle "
-"invitasjonsmeldinger sendt automatisk. Hvis du vil se meldinga før du sender "
-"den kan du skru av dette valget. Men da må du være klar over at teksten i "
-"ny-meldingsvinduet er i iCalendar syntaks og du bør ikke prøve å endre det for "
-"hånd."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Hvis du skrur på dette, så blir det mulig å lagre elementene fra "
-"Kontact-programmene (KOrganizer, KAdressBook og KNotes.)</p> "
-"<p>Hvis du vil bruke dette, må du også sette programmene til å bruke "
-"IMAP-ressursen; dette kan gjøres i TDE Kontrollpanel.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalt har du ingen grunn til å se mappene som inneholder IMAP-ressursene. "
-"Men hvis du trenger å se dem kan du angi det her.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Velg lagringsformatet til gruppevare-mapper. "
-"<ul>"
-"<li>Standardformatet er å bruke ical (for kalendermapper) og vcard (for "
-"adressebokmapper) standardene. Dette formatet har alle Kontact funksjonene "
-"tilgjengelig. </li>"
-"<li>Kolab XML formatet bruker en tilpasset modell som passer bedre den som bli "
-"brukt i Outlook. Dette formatet gir bedre samspill med Outlook når du bruker en "
-"Kolab tjener eller en kompatibel løsning.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Her velger du rotmappa til IMAP.</p> "
-"<p>Standardverdien er at Kolab-tjeneren velger IMAP-innboksen som rotmappe.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Dette er ID'en til kontoen som inneholder IMAP-ressursmappene.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Hvis du vil sette alle mappenavnene til IMAP-lageret til ditt lokale språk, "
-"så kan du velge mellom disse tilgjengelige språkene.</p>"
-"<p> Merk det at den eneste grunnen til å gjøre dette er for å øke samspillet "
-"med Microsoft Outlook. Det er generelt sett en dårlig ide å velge dette, da det "
-"gjør det umulig å bytte språk. </p> "
-"<p>Så bare velg dette hvis du er helt nødt.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Denne verdien brukes for å avgjøre om du vil vise KMail-introduksjonen."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimalt antall tilkoblinger per vert"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Dette kan brukes til å begrense antall oppkoblinger per vert når det sjekkes "
-"for nye meldinger. Standard antall oppkoblinger er ubegrenset (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Vis redigeringslinje for hurtigsøk"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Dette valget skrur av eller på søkelinje-redigering over meldingslista som kan "
-"brukes til hurtigsøk gjennom informasjonen vist i meldingslista."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Bruk den samme tegnkodinga ved svar eller videresending hvis det er mulig"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Legg &automatisk til signatur"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Husk denne identiteten, slik at den vil bli brukt i senere meldingsvinduer "
-"også.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Husk denne mappa for sendte elementer, slik at den vil bli brukt i senere "
-"skrivevinduer også."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Husk denne e-post-transporten, slik at den vil bli brukt i senere skrivevinduer "
-"også."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Husk denne identiteten, slik at den vil bli brukt i senere meldingsvinduer "
-"også.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Tekstbryting ved kolonne:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "&Advar dersom rotsertifikatet går ut innen:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Slå på dette for å få Outlook&#8482; til å forstå navn på vedlegg som ikke "
-"bruker Engelske tegn"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Be automatisk om &meldingskvittering"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Slå på dette om du vil at KMail skal be om meldingskvittering for hver "
-"e-post du sender.</p> "
-"<p> Dette valget påvirker bare standardinnstillingen, du kan fremdeles slå av "
-"og på meldingskvitteringer for hver melding du sender, menyvalg <em>Valg</em>->"
-"<em>Be om meldingskvittering</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Bruk nylig brukte adresser til autofullføring"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Skru av dette alternativet dersom du ikke vil at nylig brukte adresser skal "
-"være mulig å velge i autofullføringslista i adressefeltet ved ny melding."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Intervall for autolagring:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"En sikkerhetskopi av teksten i skrivevinduet kan bli opprettet regelmessig. Du "
-"kan velge hvilket intervall som brukes til å lage sikkerhetskopiene her. Du kan "
-"skru av autolagring ved å sette det til 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Erstatt gjenkjente prefi&ks med «Re:»"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Erstatt gjenkjente forstavelser med «&Fwd:»"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Bruk smart sitering"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Signaturen er foreldet."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Type adressevelger"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Setter typen for mottagerboksen til Til,\n"
-"        CC og BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Mottagertype"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Setter typen for mottagerboksen til Til,\n"
-"        CC og BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Høyeste antall linjer i mottakerfeltet."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Bruk den samme tegnkodinga ved svar eller videresending hvis det er mulig"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Noen meldinger, spesielt de som blir opprettet automatisk, spesifiserer ikke "
-"tegnkoding som må brukes for å vise meldingene skikkelig. I disse tilfellene "
-"vil reservetegnkodingen bli brukt, som du kan sette opp her. Sett den til den "
-"tegnkodingen som er mest brukt i din del av verden. Som standardverdi brukes "
-"tegnkodingen som er satt opp for hele systemet."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Å bytte dette skjemaet fra «Automatisk»vil tvingen bruken av en spesifisert "
-"koding for alle meldinger, uansett hva de spesifiserer selv."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Skru på denne om du liker å vise smilefjes som dette :-) med humørfjes (små "
-"bilder)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Skru på dette alternativet for å vise forskjellige nivå av sitert tekst. Skru "
-"av for å skjule nivå."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Fold sammen nivå automatisk:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reduser font-størrelse for sitert tekst"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Skru på dette alternativet for å vise sitert tekst med en mindre font."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Lagre sendte meldinger &krypterte"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Vis søppelpoststatus i flotte meldingshoder"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Send meldingskvitteringer med en tom avsender."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Send meldingskvitteringer med tom sender. Noen tjenere kan være satt opp til å "
-"avvise slike meldinger, så hvis du opplever problemer med å sende "
-"meldingskvitteringer kan du skru av denne funksjonen."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Fraser er blitt konvertert til maler"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Gamle fraser er blitt konvertert til maler"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Meldingsmal for ny melding"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Meldingsmal for svar"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Meldingsmal for svar til alle"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Meldingsmal for videresending"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Sitattegn"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 av %2 %3 brukt"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13872,6 +11886,11 @@ msgstr "Legg til som Kopi"
 msgid "Add as BCC"
 msgstr "Legg til som Blindkopi"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Avbryt"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13887,15 +11906,15 @@ msgstr "Valgte mottakere"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Du valgte én mottaker. Det høyeste antallet mottakere som kan brukes er %1. Du "
-"må endre på mottakerlista.\n"
-"Du valgte %n mottakere. Det høyeste antallet mottakere som kan brukes er %1. Du "
-"må endre på mottakerlista. "
+"Du valgte én mottaker. Det høyeste antallet mottakere som kan brukes er %1. "
+"Du må endre på mottakerlista.\n"
+"Du valgte %n mottakere. Det høyeste antallet mottakere som kan brukes er %1. "
+"Du må endre på mottakerlista. "
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13911,11 +11930,11 @@ msgstr "Bruk dialog for å velge adresse"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Denne knappen åpner en separat dialog hvor du kan velge mottakerne blant alle "
-"tilgjengelige adresser."
+"Denne knappen åpner en separat dialog hvor du kan velge mottakerne blant "
+"alle tilgjengelige adresser."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14017,10 +12036,19 @@ msgstr "er større enn eller lik"
 msgid " bytes"
 msgstr " byte"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dager"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "For å utføre søket ditt må alle meldingene i mappa %1 bli lastet ned fra "
 "tjeneren. Dette kan ta litt tid. Vil du fortsette søket?"
@@ -14171,16 +12199,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Henter data for konto '%1' ...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Henter data for konto '%1' ...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14199,10 +12223,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Innhold av skript '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Innhold av skript '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14225,20 +12247,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve muligheter:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve muligheter:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Ingen spesielle muligheter tilgjengelig)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Tilgjengelige sieve skript:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Tilgjengelige sieve skript:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14281,8 +12299,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Kryss av her hvis du vil at KMail skal legge til en signatur på alle meldingene "
-"du skriver med denne identiteten."
+"Kryss av her hvis du vil at KMail skal legge til en signatur på alle "
+"meldingene du skriver med denne identiteten."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14316,11 +12334,11 @@ msgstr "Bruk dette feltet for å skrive inn en statisk signatur."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Bruk dette til å oppgi en tekstfil som inneholder signaturen din. Den vil bli "
-"lest hver gang du skriver en ny melding eller legger til en ny signatur."
+"Bruk dette til å oppgi en tekstfil som inneholder signaturen din. Den vil "
+"bli lest hver gang du skriver en ny melding eller legger til en ny signatur."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14336,22 +12354,27 @@ msgstr "Åpne den angitte fila i et skriveprogram."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Du kan skrive inn en kommando her, enten med full programsti eller uten "
-"programsti, alt ettersom kommandoen er i søkestien din eller ikke. For hver nye "
-"melding vil KMail kjøre denne kommandoen og bruke resultatet (til standard "
-"utdata) som signatur. Normale kommandoer du kan bruke med denne mekanismen er "
-"«fortune» eller «ksig -random»."
+"programsti, alt ettersom kommandoen er i søkestien din eller ikke. For hver "
+"nye melding vil KMail kjøre denne kommandoen og bruke resultatet (til "
+"standard utdata) som signatur. Normale kommandoer du kan bruke med denne "
+"mekanismen er «fortune» eller «ksig -random»."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "O&ppgi kommando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Sti"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Ny oppføring:"
@@ -14389,6 +12412,11 @@ msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 "<qt>Er det sikkert at du vil fjerne identiteten med navnet <b>«%1»</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Bruk &på:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14403,6 +12431,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Rediger skript …"
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14442,9 +12474,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14481,6 +12513,16 @@ msgstr "Ikke slå på"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Kan ikke sette inn innhold fra fila %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Til: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopi: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14510,58 +12552,51 @@ msgstr "Kan ikke starte rørkommando fra mal: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Her kan du opprette meldingsmaler som kan brukes når du lager nye meldinger "
-"eller svar, eller når du sender meldinger videre.</p> "
-"<p> I meldingsmalene kan du bruke utdata fra kommandoer enten ved å taste dem "
-"inn eller ved å velge dem fra menyen <i>Sett inn kommando</i>.</p> "
-"<p>Maler som oppgis her er spesielle for mappa. De overstyrer både globale "
-"maler og identitetsmaler hvis de er oppgitt.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p> Her kan du opprette meldingsmaler som kan brukes når du lager nye "
+"meldinger eller svar, eller når du sender meldinger videre.</p> <p> I "
+"meldingsmalene kan du bruke utdata fra kommandoer enten ved å taste dem inn "
+"eller ved å velge dem fra menyen <i>Sett inn kommando</i>.</p> <p>Maler som "
+"oppgis her er spesielle for mappa. De overstyrer både globale maler og "
+"identitetsmaler hvis de er oppgitt.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Her kan du opprette meldingsmaler som kan brukes når du lager nye meldinger "
-"eller svar, eller når du sender meldinger videre.</p> "
-"<p> I meldingsmalene kan du bruke utdata fra kommandoer enten ved å taste dem "
-"inn eller ved å velge dem fra menyen <i>Sett inn kommando</i>.</p> "
-"<p>Maler som oppgis her gjelder overalt for identiteten. De overstyrer globale "
-"maler,men overstyres av mappemaler hvis de er oppgitt.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p> Her kan du opprette meldingsmaler som kan brukes når du lager nye "
+"meldinger eller svar, eller når du sender meldinger videre.</p> <p> I "
+"meldingsmalene kan du bruke utdata fra kommandoer enten ved å taste dem inn "
+"eller ved å velge dem fra menyen <i>Sett inn kommando</i>.</p> <p>Maler som "
+"oppgis her gjelder overalt for identiteten. De overstyrer globale maler,men "
+"overstyres av mappemaler hvis de er oppgitt.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Her kan du opprette meldingsmaler som kan brukes når du lager nye meldinger "
-"eller svar, eller når du sender meldinger videre.</p> "
-"<p> I meldingsmalene kan du bruke utdata fra kommandoer enten ved å taste dem "
-"inn eller ved å velge dem fra menyen <i>Sett inn kommando</i>.</p> "
-"<p>Dette er en global (standard-)mal. De overstyres av identitetsmaler og "
-"mappemaler hvis de er oppgitt.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p> Her kan du opprette meldingsmaler som kan brukes når du lager nye "
+"meldinger eller svar, eller når du sender meldinger videre.</p> <p> I "
+"meldingsmalene kan du bruke utdata fra kommandoer enten ved å taste dem inn "
+"eller ved å velge dem fra menyen <i>Sett inn kommando</i>.</p> <p>Dette er "
+"en global (standard-)mal. De overstyres av identitetsmaler og mappemaler "
+"hvis de er oppgitt.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14846,6 +12881,10 @@ msgstr "Send ut gjeldende meldingstekst og sett inn resultatet som det er"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Send ut gjeldende meldingstekst og erstatt teksten med resultatet"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -14885,108 +12924,6 @@ msgstr "Slå på feilsøking"
 msgid "Turn Debug Off"
 msgstr "Slå av feilsøking"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>… at du kan gå til den neste og forrige meldinga ved å bruke de\n"
-"høyre og venstre piltastene?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>…at du enkelt kan lage filter på avsender, mottaker,\n"
-"emne og e-postliste med <em>Verktøy-&gt;Lag&nbsp;filter</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>… at du kan bruke et filter til å bli kvitt «[navnet på e-postlista]» som du "
-"finner i emneteksten til enkelte e-postlister? Bruk "
-"<pre>omskriv meldingshodet «Emne» \n"
-"    bytt ut «\\s*\\[navnet på e-postlista\\]\\s*&quot;\n"
-"   med «»</pre></p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>… at du kan knytte e-postlister til mapper i dialogvinduet\n"
-"<em>Mappe-&gt;E-postlistebehandling</em>? På denne måten kan du bruke <em>"
-"Melding-&gt;Ny&nbsp;melding&nbsp;til&nbsp;e-postliste&nbsp;…</em>\n"
-"for å lage en ny melding adressert til e-postlista.\n"
-"Du kan også trykke med midterste museknapp på mappa.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>… at du kan gi egne ikoner til hver av mappene? Se <em>"
-"Mapper-&gt;Egenskaper&nbsp;…</em>.</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>… at KMail kan vise en fargestolpe som viser hvilken type melding (ren tekst "
-"/ HTML / OpenPGP) som blir vist?</p> "
-"<p>Slik kan du avsløre forsøk på å forfalske gyldige signaturer ved å sende "
-"HTML-meldinger som etterlikner signaturmeldingene til KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>… at du kan filtrere på et vilkårlig meldingshode ved bare å skrive navnet i "
-"det første skrivefeltet i søkeregelen?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>… at du kan filtrere ut alle HTML-meldingene med regelen\n"
-"<pre>«Content-type» inneholder «text/html»?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>… at når du svarer, så blir bare den markerte delen av meldinga sitert?</p>\n"
-"<p>Hvis ingenting er valgt, blir hele meldinga sitert.</p>\n"
-"<p>Det virker til og med med tekst fra vedlegg når du velger\n"
-"<em>Vis-&gt;Vedlegg-&gt;Inni&nbsp;meldinga</em>.</p>\n"
-"<p>Denne egenskapen er tilgjengelig for alle «svar til»-kommandoer unntatt\n"
-"<em>Melding-&gt;Svar&nbsp;uten&nbsp;sitering</em>.</p>\n"
-"<p align=\"right\"><em>bidrag fra David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Ingenting å angre."
@@ -15054,6 +12991,15 @@ msgstr "Veglegg nr. %1 (uten navn)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Det finnes allerede en fil som heter «%1». Vil du overskrive den?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Skriv over fila?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15169,13 +13115,13 @@ msgstr "&Send bilde med hver melding"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Kryss av i denne boksen hvis du vil at KMail skal legge til et såkalt X-Face "
-"meldingshode til meldinger skrevet med denne identiteten. Et X-Face er et lite "
-"(48x48 piksler) svart-hvitt bilde som noen e-postklienter kan vise."
+"meldingshode til meldinger skrevet med denne identiteten. Et X-Face er et "
+"lite (48x48 piksler) svart-hvitt bilde som noen e-postklienter kan vise."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15203,13 +13149,13 @@ msgstr "Velg fil …"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Bruk dette til å velge en bildefil som det skal lages bilde fra. Bildet bør "
-"være i høy kontrast og nesten kvadratisk. En lys bakgrunn hjelper med å gjøre "
-"resultatet bedre."
+"være i høy kontrast og nesten kvadratisk. En lys bakgrunn hjelper med å "
+"gjøre resultatet bedre."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15217,21 +13163,21 @@ msgstr "Sett fra dresseboka"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Du kan bruke en nedskalert versjon av bildet du har satt i "
 "adressebokoppføringen."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail kan sende et lite (48x48), svart-hvitt bilde i lav kvalitet med hver "
-"melding. For eksempel kan dette være et bilde av deg eller et tegn som vil bli "
-"vist i mottagerens e-postkilent (hvis støttet)."
+"<qt>KMail kan sende et lite (48x48), svart-hvitt bilde i lav kvalitet med "
+"hver melding. For eksempel kan dette være et bilde av deg eller et tegn som "
+"vil bli vist i mottagerens e-postkilent (hvis støttet)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15239,11 +13185,11 @@ msgstr "Bruk dette feltet for å skrive inn en vilkårlig X-Face streng."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Eksempler tilgjengelige på <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Eksempler tilgjengelige på <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15258,129 +13204,1756 @@ msgstr "Ikke noe bilde"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Du har ikke din egen kontakt angitt i adresseboka."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signering"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Automatisk signering av meldinger"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Velg om alle meldinger skal signeres. Du kan selvsagt fortsatt skru av "
+"signering for hver enkelt melding."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Kryptering"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Velg emne for meldinga."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Når dette valget er på, vil meldinga/fila ikke bare bli kryptert med "
+"mottagerens offentlige nøkkel, men også med din nøkkel. Det gjør det mulig "
+"for deg å dekryptere meldinga/fila senere. Dette er generelt sett en god ide."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Send kopi til «adresse»"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Vis s&ignert/kryptert tekst når du er ferdig"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Send blindkopi til «adresse»"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Når dette valget er på vil den signerte/krypterte teksten bli vist i et eget "
+"vindu, noe som gjør det mulig å se hvordan det vil se ut før den er sendt. "
+"Dette er en god ide når du vil kontrollere at krypteringssystemet ditt "
+"fungerer."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Legg «meldingshode» til i meldinga"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Lagre sendte meldinger &krypterte"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Les meldingsteksten fra «fil»"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Kryss av for å lagre meldinger kryptert"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Velg meldingskropp"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Lagre meldinger kryptert</h1>\n"
+"Hvis du krysser av i denne boksen blir sendte meldinger lagret kryptert på "
+"samme måte som de ble sendt. Dette anbefales ikke, for du kan ikke lese "
+"meldinger etter at et nødvendig sertifikat er foreldet.\n"
+"<p>\n"
+"Llikevel kan det være lokale regler som forutsetter at man bruker dette "
+"valget. Hvis du er usikker, kontakt din systemadministrator.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Legg til et vedlegg til meldinga. Dette kan gjentas"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Alltid vis krypterings nøkklene &for godkjenning"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Bare se etter ny e-post"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Når dette valget er på vil programmet alltid vise deg en liste over "
+"offentlige nøkler hvor du kan velge hvilken nøkkel den skal bruke til "
+"kryptering. Hvis det er skrudd av vil programmet kun vise dialogen hvis det "
+"ikke kan finne den rette nøkkelen eller hvis det er flere som kan brukes."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Bare åpne skrivevinduet"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Kr&ypter meldinger automatisk når det er mulig"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Vis den oppgitte meldingsfila"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Hvis dette er på, vil hver melding du sender bli kryptert hvis dersom det "
+"ermulig og ønsket. Det er naturligvis fortsatt mulig å skru av automatisk "
+"kryptering for hver enkelt melding."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Aldri signer/krypter når en kladd blir &lagret"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Hvordan virker dette?"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universal"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Svar"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Svar til alle"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Videresend"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Snar&vei:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Mal&type:"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Malinnhold"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Snarvei til mal"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Maltype"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Mappeegenskaper"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Mappa inneholder en e-postliste"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Adresse for &e-postliste:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Ulest:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Forelding av meldinger"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Foreldet etter:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Foreld &leste meldinger"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Foreld e&tter:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Foreld &uleste meldinger"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "dag(er)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "uke(r)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "måned(er)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avansert"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Avsender&identitet:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Lagringsformat:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listevisninger:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Send meldingene i køen når e-post hentes"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Send melding til «adresse» henholdsvis legg ved fila nettadressen peker til"
+"<qt> <p>Velg om du vil at KMail skal sende alle meldingene i utboksen når du "
+"sjekker e-post manuelt, også ved automatisk sjekk, eller om du ikke vil at "
+"meldingene skal sendes automatisk i det hele tatt.</p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lest"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Gammel"
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Det er nye meldinger i denne mappa (%1) som ikke ennå er lastet opp til "
+"tjeneren, men det ser ikke ut til at du har tilstrekkelige "
+"tilgangsrettigheter i mappa til å laste opp disse. Kontakt din administrator "
+"for å få tillatelse, eller flytt meldingene ut av denne mappa.</p> <p>Vil du "
+"flytte disse meldingene til en annen mappe nå?</p>"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Slettet"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Besvart"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Sendt videre"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Den sist valgte mappa i dialogen for mappevalg."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Lagt til i kø"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sendt"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Praksis for visning av ikoner i systemikonfeltet"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Overvåket"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorert"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Påminnelse ved ny e-post"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Søppelpost"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Hvis dette valget er på vil hver mappe vise antallet nye meldinger i "
+"beskjeden om ny e-post; hvis ikke vil du bare få en enkel melding om «Ny e-"
+"post mottatt»."
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ikke-søppelpost"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Oppgi skriveprogram:"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Huskeliste"
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Bruk et annet skriveprogram enn KMails eget"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Har vedlegg"
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 av %2 %3 brukt"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Slå på funksjoner for gruppevare"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Sti"
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Bytt om på Fra:/Til: hodene i svar på svar"
 
-#: util.h:208
+#: kmail.kcfg:173
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Det finnes allerede en fil som heter «%1». Vil du overskrive den?"
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook har flere mangler i sin implementasjon av iCalendar "
+"standarden; dette alternativet unngår en av dem. Hvis du har problemer med "
+"at Outlook brukere ikke kan motta svarene dine, så prøv å slå på dette "
+"alternativet."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Skriv over fila?"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Send gruppevareinvitasjoner i meldingsteksten"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook har flere mangler i sin implementasjon av iCalendar-"
+"standarden; dette alternativet unngår en av dem. Hvis du har problemer med "
+"at Outlook brukere ikke kan motta invitasjonene dine, så prøv å slå på dette "
+"alternativet."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automatisk invitasjonssending"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Når dette er valgt vil du ikke se ny-meldingsvinduet. I stedet blir alle "
+"invitasjonsmeldinger sendt automatisk. Hvis du vil se meldinga før du sender "
+"den kan du skru av dette valget. Men da må du være klar over at teksten i ny-"
+"meldingsvinduet er i iCalendar syntaks og du bør ikke prøve å endre det for "
+"hånd."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Hvis du skrur på dette, så blir det mulig å lagre elementene fra Kontact-"
+"programmene (KOrganizer, KAdressBook og KNotes.)</p> <p>Hvis du vil bruke "
+"dette, må du også sette programmene til å bruke IMAP-ressursen; dette kan "
+"gjøres i TDE Kontrollpanel.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalt har du ingen grunn til å se mappene som inneholder IMAP-"
+"ressursene. Men hvis du trenger å se dem kan du angi det her.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Velg lagringsformatet til gruppevare-mapper. <ul><li>Standardformatet er "
+"å bruke ical (for kalendermapper) og vcard (for adressebokmapper) "
+"standardene. Dette formatet har alle Kontact funksjonene tilgjengelig. </"
+"li><li>Kolab XML formatet bruker en tilpasset modell som passer bedre den "
+"som bli brukt i Outlook. Dette formatet gir bedre samspill med Outlook når "
+"du bruker en Kolab tjener eller en kompatibel løsning.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Her velger du rotmappa til IMAP.</p> <p>Standardverdien er at Kolab-"
+"tjeneren velger IMAP-innboksen som rotmappe.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Dette er ID'en til kontoen som inneholder IMAP-ressursmappene.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Hvis du vil sette alle mappenavnene til IMAP-lageret til ditt lokale "
+"språk, så kan du velge mellom disse tilgjengelige språkene.</p><p> Merk det "
+"at den eneste grunnen til å gjøre dette er for å øke samspillet med "
+"Microsoft Outlook. Det er generelt sett en dårlig ide å velge dette, da det "
+"gjør det umulig å bytte språk. </p> <p>Så bare velg dette hvis du er helt "
+"nødt.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Denne verdien brukes for å avgjøre om du vil vise KMail-introduksjonen."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimalt antall tilkoblinger per vert"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Dette kan brukes til å begrense antall oppkoblinger per vert når det sjekkes "
+"for nye meldinger. Standard antall oppkoblinger er ubegrenset (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Vis redigeringslinje for hurtigsøk"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Dette valget skrur av eller på søkelinje-redigering over meldingslista som "
+"kan brukes til hurtigsøk gjennom informasjonen vist i meldingslista."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Bruk den samme tegnkodinga ved svar eller videresending hvis det er mulig"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Legg &automatisk til signatur"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Husk denne identiteten, slik at den vil bli brukt i senere meldingsvinduer "
+"også.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Husk denne mappa for sendte elementer, slik at den vil bli brukt i senere "
+"skrivevinduer også."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Husk denne e-post-transporten, slik at den vil bli brukt i senere "
+"skrivevinduer også."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Husk denne identiteten, slik at den vil bli brukt i senere meldingsvinduer "
+"også.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Tekstbryting ved kolonne:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "&Advar dersom rotsertifikatet går ut innen:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Slå på dette for å få Outlook&#8482; til å forstå navn på vedlegg som ikke "
+"bruker Engelske tegn"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Be automatisk om &meldingskvittering"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt> <p>Slå på dette om du vil at KMail skal be om meldingskvittering for "
+"hver e-post du sender.</p> <p> Dette valget påvirker bare "
+"standardinnstillingen, du kan fremdeles slå av og på meldingskvitteringer "
+"for hver melding du sender, menyvalg <em>Valg</em>-><em>Be om "
+"meldingskvittering</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Bruk nylig brukte adresser til autofullføring"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Skru av dette alternativet dersom du ikke vil at nylig brukte adresser skal "
+"være mulig å velge i autofullføringslista i adressefeltet ved ny melding."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Intervall for autolagring:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"En sikkerhetskopi av teksten i skrivevinduet kan bli opprettet regelmessig. "
+"Du kan velge hvilket intervall som brukes til å lage sikkerhetskopiene her. "
+"Du kan skru av autolagring ved å sette det til 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Erstatt gjenkjente prefi&ks med «Re:»"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Erstatt gjenkjente forstavelser med «&Fwd:»"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Bruk smart sitering"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Signaturen er foreldet."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Type adressevelger"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Setter typen for mottagerboksen til Til,\n"
+"        CC og BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Mottagertype"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Setter typen for mottagerboksen til Til,\n"
+"        CC og BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Høyeste antall linjer i mottakerfeltet."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Bruk den samme tegnkodinga ved svar eller videresending hvis det er mulig"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Noen meldinger, spesielt de som blir opprettet automatisk, spesifiserer ikke "
+"tegnkoding som må brukes for å vise meldingene skikkelig. I disse tilfellene "
+"vil reservetegnkodingen bli brukt, som du kan sette opp her. Sett den til "
+"den tegnkodingen som er mest brukt i din del av verden. Som standardverdi "
+"brukes tegnkodingen som er satt opp for hele systemet."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Å bytte dette skjemaet fra «Automatisk»vil tvingen bruken av en spesifisert "
+"koding for alle meldinger, uansett hva de spesifiserer selv."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Skru på denne om du liker å vise smilefjes som dette :-) med humørfjes (små "
+"bilder)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Skru på dette alternativet for å vise forskjellige nivå av sitert tekst. "
+"Skru av for å skjule nivå."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Fold sammen nivå automatisk:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reduser font-størrelse for sitert tekst"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Skru på dette alternativet for å vise sitert tekst med en mindre font."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Lagre sendte meldinger &krypterte"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Vis søppelpoststatus i flotte meldingshoder"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Send meldingskvitteringer med en tom avsender."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Send meldingskvitteringer med tom sender. Noen tjenere kan være satt opp til "
+"å avvise slike meldinger, så hvis du opplever problemer med å sende "
+"meldingskvitteringer kan du skru av denne funksjonen."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Fraser er blitt konvertert til maler"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Gamle fraser er blitt konvertert til maler"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Meldingsmal for ny melding"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Meldingsmal for svar"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Meldingsmal for svar til alle"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Meldingsmal for videresending"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Sitattegn"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Rediger &fil"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Rediger …"
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Gå"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "M&appe"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Melding"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Svar spesielt"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Videresend:"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Tilbakestill skriftinnstillingene"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-verktøylinje"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Vanlige innstillinger"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-verktøylinje"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Sjekk om sertifikat er gyldig ved å bruke kontrollinstanser (CRL)"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Hvis dette valget er på vil S/MIME-sertifikater bli sjekket ved å bruke "
+"lister for sertifikatgjenkalling (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Sjekk gyldigheten på sertifikater på Internett (OSCP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Hvis dette er valgt vil S/MIME-sertifikater bli sjekket ved hjelp av en "
+"statusprotokoll på Internett (forkortet til «OCSP» for "
+"«Online Certificates Status Protocol»). Fyll in nettadressen til OSCP-"
+"tilbyderen nedenfor."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Tilkoblet godkjenning av sertifikater"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Nettadresse for OCSP-tilbyderen:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Skriv nettadressen til tjeneren for godkjenning av sertifikater via "
+"Internett (OSCP-tilbyder). Nettadressen starter som oftest med http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Signatur for OCSP-tilbyder:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorer sertifikatenes service URL"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Ikke sjekk sertifikatpraksis"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Standardinnstillinga til GnuPG er å bruke fila ~/.gnupg/policies.txt for å "
+"sjekke om en sertifikatpraksis er tillatt. Hvis dette valget er på vil det "
+"ikke bli sjekket."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Aldri sjekk med en sertifikatliste (CRL)"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Hvis dette er valgt vil serifikatlista aldri bli brukt for å sjekke "
+"gyldigheten til S/MIME-sertifikater."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Hent manglende utstedersertifikater"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Hvis dette valget er på vil manglende utstedersertifikater bli hentet hvis "
+"det blir nødvendig (dette gjelder for begge metodene for å sjekke gyldighet "
+"på, både CRL og OSCP)."
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP forespørsler"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Ikke utfør noen HTTP forespørsler"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Skru bruken av HTTP for S/MIME helt av"
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Bruk denne mellomtjeneren for HTTP forespørsler: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Bruk system HTTP mellomtjener:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Hvis denne muligheten er valgt vil verdien til HTTP mellomtjeneren vist til "
+"høyre (som kommer fra miljøvariabelen http_proxy) bli brukt for alle HTTP-"
+"forespørsler."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Skriv adressen til din HTTP mellomtjener som vil bli brukt for alle HTTP "
+"forespørsler knyttet til S/MIME. Syntaksen er host:port, for eksempel: "
+"minmellomtjener.example.com:3128"
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Overse HTTP distribusjonspunkt for CRL sertifikater."
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Når det letes etter plasseringa til en CRL, så vil sertifikatet som skal "
+"testes vanligvis inneholde det som er kjent som «CRL "
+"distribusjonspunkt» (DP) oppføringen. Det er nettadresser som beskriver "
+"hvordan man får tilgang til adressen. Den første DP-oppføringa som blir "
+"funnet blir brukt.  Med dette valget vil alle oppføringene som bruker HTTP "
+"vil ikke bli tatt hensyn til når det søkes etter en brukbar DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-forespørsler"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Ikke utfør noen LDAP-forespørsler"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Skrur helt av bruken av LDAP for S/MIME"
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Overse LDAP distribusjonspunkt for CRL sertifikater"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Når det letes etter plasseringa til en CRL, så vil sertifikatet som skal "
+"testes vanligvis inneholde det som er kjent som «CRL "
+"distribusjonspunkt» (DP) oppføringen. Det er nettadresser som beskriver "
+"hvordan man får tilgang til adressen. Den første DP-oppføringa som blir "
+"funnet blir brukt.  Med dette valget vil alle oppføringene som bruker LDAP "
+"vil ikke bli tatt hensyn til når det søkes etter en brukbar DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primær vert for LDAP-forespørsler"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Hvis du skriver inn en LDAP tjener her vil alle LDAP forespørsler bli sendt "
+"til den tjeneren først. For å være presis, denne innstillinga vil overkjøre "
+"alle vert og port parametere spesifisert i en LDAP URL og vil også bli brukt "
+"hvis en vert og port ikke har blitt medregnet i URLen. Andre LDAP tjenere "
+"vil bare bli brukt hvis en feil oppstår under tilkoplingen til "
+"«mellomtjeneren».\n"
+"Syntaksen er «VERT» eller «VERT:PORT». Hvis PORT ikke er medregnet vil port "
+"389 (standard LDAP port) bli brukt."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Legg til …"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Gruppevare"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Tilbakestill skriftinnstillingene"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "uendelig"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Maloppsett"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Svar til avsender"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Svar til alle/Svar til lista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Videresend melding"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Gi advarsel ved forsøk på å sende &usignerte meldinger"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Kryss av her for å bli varslet ved sending av usignerte meldinger"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel ved forsøk på å sende usignerte meldinger</h1>\n"
+"Krysser du av i denne boksen, vil du bli advart ved forsøk på å sende "
+"meldinger der hele eller deler av meldinga er usignert.\n"
+"<p>\n"
+"Det anbefales å la valget være på for størst mulig sikkerhet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Gi &Varsel før sending av ukrypterte meldinger"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Kryss av for å varsles ved sending av ukryptert melding."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel ved sending av ukrypterte meldinger</h1>\n"
+"Hvis du krysser av i boksen får du en advarsel når du årøver å sende en "
+"melding som helt eller delvis er ukryptert.\n"
+"<p>\n"
+"<p>Dette alternativet bør væra slått på for best muligtrygghet.</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Gi varsel om mottakerens e-post-adresse &ikke er i sertifikatet"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Kryss av for å få varsel hvis adressen ikke er i sertifikatet"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel hvis mottakers e-post-adresse mangler i sertifikatet</h1>\n"
+"Når valget er avkrysset vil du få en advarsel hvis e-post-adressen til "
+"mottakeren mangler i sertifikatet som brukes til kryptering.\n"
+"<p>\n"
+"Det anbefales å la dette valget være på for størst mulig sikkerhet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Gi varsel hvis sertifikater/nøkler blir foreldet snart (sett opp grenser "
+"nedenfor)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Bruk til signering"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Til kryptering"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Velg antall dager"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel hvis signatursertifikatet blir foreldet</h1>\n"
+"Velg laveste antall dager signatursertifikatet skal være gyldig uten å gi en "
+"advarsel.\n"
+"<p>\n"
+"Anbefalt SPHINX-innstilling er 14 dager.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel hvis krypteringssertifikatet blir foreldet</h1>\n"
+"Velg det laveste antall dager som krypteringssertifikatet skal være gyldig "
+"før det gis en advarsel.\n"
+"<p>\n"
+"Den anbefalte SPHINX-innstillinga er 14 dager.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel hvis et sertifikat i kjeden er foreldet</h1>\n"
+"Velg det laveste antall dager alle sertifikatene i kjeden skal være gyldige "
+"uten å gi advarsel.\n"
+"<p>\n"
+"Den anbefalte SPHINX-innstillinga er 14 dager.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel hvis CA-sertifikatet blir foreldet</h1>\n"
+"Velg minimum antall dager sertifikatet burde være gyldig uten å gien "
+"advarsel.\n"
+"<p>\n"
+"Anbefalt SPHINX-innstilling er 14 dager.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Gi advarsel hvis rotsertifikatet blir foreldet</h1>\n"
+"Velg minste antall dager rot-sertifikatet er gyldig uten å gi en advarsel.\n"
+"<p>\n"
+"Anbefalt SPHINX-innstilling er 14 dager.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Til rotsertifikater:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "For mellomsertifikater for CA-sertifikater:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "For sluttbruker-sertifikater/nøkler:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Slå på alle «Ikke spør igjen» advarsler igjen"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>… at du kan gå til den neste og forrige meldinga ved å bruke de\n"
+"høyre og venstre piltastene?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>…at du enkelt kan lage filter på avsender, mottaker,\n"
+"emne og e-postliste med <em>Verktøy-&gt;Lag&nbsp;filter</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>… at du kan bruke et filter til å bli kvitt «[navnet på e-postlista]» som "
+"du finner i emneteksten til enkelte e-postlister? Bruk <pre>omskriv "
+"meldingshodet «Emne» \n"
+"    bytt ut «\\s*\\[navnet på e-postlista\\]\\s*&quot;\n"
+"   med «»</pre></p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>… at du kan knytte e-postlister til mapper i dialogvinduet\n"
+"<em>Mappe-&gt;E-postlistebehandling</em>? På denne måten kan du bruke "
+"<em>Melding-&gt;Ny&nbsp;melding&nbsp;til&nbsp;e-postliste&nbsp;…</em>\n"
+"for å lage en ny melding adressert til e-postlista.\n"
+"Du kan også trykke med midterste museknapp på mappa.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>… at du kan gi egne ikoner til hver av mappene? Se <em>Mapper-&gt;"
+"Egenskaper&nbsp;…</em>.</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>… at KMail kan vise en fargestolpe som viser hvilken type melding (ren "
+"tekst / HTML / OpenPGP) som blir vist?</p> <p>Slik kan du avsløre forsøk på "
+"å forfalske gyldige signaturer ved å sende HTML-meldinger som etterlikner "
+"signaturmeldingene til KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>… at du kan filtrere på et vilkårlig meldingshode ved bare å skrive "
+"navnet i det første skrivefeltet i søkeregelen?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>… at du kan filtrere ut alle HTML-meldingene med regelen\n"
+"<pre>«Content-type» inneholder «text/html»?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>… at når du svarer, så blir bare den markerte delen av meldinga sitert?</"
+"p>\n"
+"<p>Hvis ingenting er valgt, blir hele meldinga sitert.</p>\n"
+"<p>Det virker til og med med tekst fra vedlegg når du velger\n"
+"<em>Vis-&gt;Vedlegg-&gt;Inni&nbsp;meldinga</em>.</p>\n"
+"<p>Denne egenskapen er tilgjengelig for alle «svar til»-kommandoer unntatt\n"
+"<em>Melding-&gt;Svar&nbsp;uten&nbsp;sitering</em>.</p>\n"
+"<p align=\"right\"><em>bidrag fra David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15473,16 +15046,20 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Krypter alle meldingsdeler som standard</h1> \n"
-#~ "Med denne funksjonen, blir alle delene av meldinga (altså hoveddelen og alle vedleggene) krypterte som standard. \n"
+#~ "Med denne funksjonen, blir alle delene av meldinga (altså hoveddelen og "
+#~ "alle vedleggene) krypterte som standard. \n"
 #~ "<p>\n"
-#~ "Dette er en standardinnstilling, men du kan overstyre den for enkeltmeldinger.\n"
+#~ "Dette er en standardinnstilling, men du kan overstyre den for "
+#~ "enkeltmeldinger.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15494,12 +15071,15 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Bekreft kryptering for hver enkelt del</h1>\n"
-#~ "Hvis du velger dette, blir du spurt for hver del av meldinga (som f.eks. meldingsdelen og hvert vedlegg) om den delen skal krypteres eller ikke.\n"
+#~ "Hvis du velger dette, blir du spurt for hver del av meldinga (som f.eks. "
+#~ "meldingsdelen og hvert vedlegg) om den delen skal krypteres eller ikke.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15513,14 +15093,16 @@ msgstr "Skriv over fila?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ikke krypter meldinger</h1>\n"
 #~ "Hvis du velger dette blir ikke meldingene krypterte som standard.\n"
 #~ "<p>\n"
-#~ "Dette er en standardinnstilling, men du kan overstyre den for enkeltmeldinger.\n"
+#~ "Dette er en standardinnstilling, men du kan overstyre den for "
+#~ "enkeltmeldinger.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15532,20 +15114,34 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Krypteringsalgoritme</h1>\n"
-#~ "En algoritme er en beskrivelse av hvordan datamaskinen skal gå fram for å utføre en bestemt oppgave. En krypteringsalgoritme beskriver hvordan datamaskinen bruker mottakernøkkelen på din melding slik at bare den ønskede mottakeren kan lese meldinga.\n"
+#~ "En algoritme er en beskrivelse av hvordan datamaskinen skal gå fram for å "
+#~ "utføre en bestemt oppgave. En krypteringsalgoritme beskriver hvordan "
+#~ "datamaskinen bruker mottakernøkkelen på din melding slik at bare den "
+#~ "ønskede mottakeren kan lese meldinga.\n"
 #~ "<p>\n"
-#~ "Valget av bestemte krypteringsalgoritmer bestemmer hvor lett eller hvor vanskelig det er å avskjære og lese en melding. Men alle algoritmer som leveres i SPHINX-miljøet kan betraktes som meget sikre. Standard-innstillingene vil fungere utmerket.\n"
+#~ "Valget av bestemte krypteringsalgoritmer bestemmer hvor lett eller hvor "
+#~ "vanskelig det er å avskjære og lese en melding. Men alle algoritmer som "
+#~ "leveres i SPHINX-miljøet kan betraktes som meget sikre. Standard-"
+#~ "innstillingene vil fungere utmerket.\n"
 #~ "<p>\n"
-#~ "Dette er et standardvalg, men det kan overstyres for hver enkelt melding.\n"
+#~ "Dette er et standardvalg, men det kan overstyres for hver enkelt "
+#~ "melding.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15557,16 +15153,22 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Sertifikatkontrollen kan avsluttes med et lokalt lagret sertifikat</h1>\n"
-#~ "Her kan du vegle om kontrollen av sertifikatkjeden kan avsluttes med et lokalt lagret sertifikat.\n"
+#~ "<h1>Sertifikatkontrollen kan avsluttes med et lokalt lagret sertifikat</"
+#~ "h1>\n"
+#~ "Her kan du vegle om kontrollen av sertifikatkjeden kan avsluttes med et "
+#~ "lokalt lagret sertifikat.\n"
 #~ "<p>\n"
-#~ "Lokale sertifikater er dine egne sertifikater, i tillegg til sertifikatene til de du kommuniserer med og sertifikatinstansen (CA).\n"
+#~ "Lokale sertifikater er dine egne sertifikater, i tillegg til "
+#~ "sertifikatene til de du kommuniserer med og sertifikatinstansen (CA).\n"
 #~ "</qt>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15578,9 +15180,14 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Kontroller alltid sertifikatstien til rotsertifikatet</h1> Her kan du velge om sertifikatstien som hører til mottakarsertifikatet alltid skal kontrolleres helt opp til rotsertifikatet.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Kontroller alltid sertifikatstien til rotsertifikatet</h1> Her "
+#~ "kan du velge om sertifikatstien som hører til mottakarsertifikatet alltid "
+#~ "skal kontrolleres helt opp til rotsertifikatet.</qt>"
 
 #~ msgid "Check certificate &path"
 #~ msgstr "Kontroller &sertifikatstien"
@@ -15591,16 +15198,20 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sjekk sertifikatstien</h1>\n"
-#~ "Hvis du velger dette vil hele stien bli kontrollert fra mottakeren og fram til rota.\n"
+#~ "Hvis du velger dette vil hele stien bli kontrollert fra mottakeren og "
+#~ "fram til rota.\n"
 #~ "<p>\n"
-#~ "Merk at det ikke er mulig å skru av kontrollen av selve mottakerens sertifikat.\n"
+#~ "Merk at det ikke er mulig å skru av kontrollen av selve mottakerens "
+#~ "sertifikat.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15612,33 +15223,50 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Bruk lister for sertifikatgjenkalling (CRL)</h1>\n"
-#~ "En gjenkallingsliste for sertifikater inneholder sertifikater som er tilbakekalt. De bør ikke brukes til kryptering. En bruker kan ha grunner for å kalle sertifikatet tilbake; vedkommende kan mistenke misbruk (f.eks. kan noen ha gjettet PIN-koden).\n"
+#~ "En gjenkallingsliste for sertifikater inneholder sertifikater som er "
+#~ "tilbakekalt. De bør ikke brukes til kryptering. En bruker kan ha grunner "
+#~ "for å kalle sertifikatet tilbake; vedkommende kan mistenke misbruk (f."
+#~ "eks. kan noen ha gjettet PIN-koden).\n"
 #~ "<p>\n"
-#~ "Du bør bruke sertifikatgjenkallinger for å få størst mulig sikkerhet. I meldingsvinduet for oppsett av sertifikater og håndtering av sertifikatgjenkalling, kan du velge hvor du vil hente sertifikatgjenkallinger.\n"
+#~ "Du bør bruke sertifikatgjenkallinger for å få størst mulig sikkerhet. I "
+#~ "meldingsvinduet for oppsett av sertifikater og håndtering av "
+#~ "sertifikatgjenkalling, kan du velge hvor du vil hente "
+#~ "sertifikatgjenkallinger.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Gi en advarsel dersom &CRL utløper innen:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Kryss av for å få en advarsel hvis en sertifikatgjenkallinger blir foreldet i nærmeste framtid"
+#~ msgstr ""
+#~ "Kryss av for å få en advarsel hvis en sertifikatgjenkallinger blir "
+#~ "foreldet i nærmeste framtid"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Gi en advarsel hvis sertifikatgjenkallingen blir foreldet i nær framtid</h1>\n"
-#~ "Hvis du krysser av i boksen vil du få advarsel hvis en av sertifikatgjenkallingene du brukte blir foreldet i nær framtid.\n"
+#~ "<h1>Gi en advarsel hvis sertifikatgjenkallingen blir foreldet i nær "
+#~ "framtid</h1>\n"
+#~ "Hvis du krysser av i boksen vil du få advarsel hvis en av "
+#~ "sertifikatgjenkallingene du brukte blir foreldet i nær framtid.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15647,14 +15275,17 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Gi advarsel hvis sertifikatgjenkallingen blir foreldet i nærmeste framtid</h1>\n"
-#~ "I dette feltet kan det oppgis hvor tidlig du skal advares førsertifikatgjenkallingen blir foreldet.\n"
+#~ "<h1>Gi advarsel hvis sertifikatgjenkallingen blir foreldet i nærmeste "
+#~ "framtid</h1>\n"
+#~ "I dette feltet kan det oppgis hvor tidlig du skal advares "
+#~ "førsertifikatgjenkallingen blir foreldet.\n"
 #~ "<p>\n"
 #~ "Anbefalt innstilling for SPHINX-miljøet er 7 dager.\n"
 #~ "</qt>"
@@ -15668,14 +15299,17 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Krypter alltid til deg selv</h1>\n"
-#~ "Krysser du av i boksen vil meldinger du sender også krypteres med din egen nøkkel.\n"
+#~ "Krysser du av i boksen vil meldinger du sender også krypteres med din "
+#~ "egen nøkkel.\n"
 #~ "<p>\n"
 #~ "Det anbefales å la valget stå på for å lese meldinger du selv har sendt.\n"
 #~ "</qt>"
@@ -15689,16 +15323,21 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gi advarsel hvis sertifikatet blir foreldet</h1>\n"
-#~ "Hvis du krysser av her vil du få en advarsel hvis sertifikatet for kryptering blir foreldet innen et gitt antall dager.\n"
+#~ "Hvis du krysser av her vil du få en advarsel hvis sertifikatet for "
+#~ "kryptering blir foreldet innen et gitt antall dager.\n"
 #~ "<p>\n"
-#~ "Anbefalingen er å la dette valget være på for å unngå bruk av sertifikater som blir foreldet i nær framtid.\n"
+#~ "Anbefalingen er å la dette valget være på for å unngå bruk av "
+#~ "sertifikater som blir foreldet i nær framtid.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15719,8 +15358,28 @@ msgstr "Skriv over fila?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Velg hvilke(t) sertifikat(er) som skal sendes"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt><h1>Sending av sertifikater</h1> Uten sertifikatet vil mottakeren ikke være i stand til å avgjøre om det virkelig er deg som sendte en melding, eller om meldinga ble endret av en tredjepart.<p> Mottakeren kan skaffe seg ditt sertifikat fra en sentral tjener, men du kan også legge ved sertifikatet sammen med meldinga. Man kan velge om man vil legge ved sertifikatet, eller hele kjeden av sertifikater som bekrefter ditt eget sertifikat, med eller uten rotsertifikatet.<p>Det er anbefalt å alltid ta med minst ditt eget sertifikat i meldinga. <p> Denne innstillinga er standard, og kan endres for hver enkelt melding.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>Sending av sertifikater</h1> Uten sertifikatet vil mottakeren "
+#~ "ikke være i stand til å avgjøre om det virkelig er deg som sendte en "
+#~ "melding, eller om meldinga ble endret av en tredjepart.<p> Mottakeren kan "
+#~ "skaffe seg ditt sertifikat fra en sentral tjener, men du kan også legge "
+#~ "ved sertifikatet sammen med meldinga. Man kan velge om man vil legge ved "
+#~ "sertifikatet, eller hele kjeden av sertifikater som bekrefter ditt eget "
+#~ "sertifikat, med eller uten rotsertifikatet.<p>Det er anbefalt å alltid ta "
+#~ "med minst ditt eget sertifikat i meldinga. <p> Denne innstillinga er "
+#~ "standard, og kan endres for hver enkelt melding.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Send &ditt eget sertifikat"
@@ -15740,16 +15399,20 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Signer alle meldingsdeler som standard</h1>\n"
-#~ "Hvis du velger dette vil alle meldingsdeler signeres som standard (f.eks hovedmeldinga og alle vedlegg).\n"
+#~ "Hvis du velger dette vil alle meldingsdeler signeres som standard (f.eks "
+#~ "hovedmeldinga og alle vedlegg).\n"
 #~ "<p>\n"
-#~ "Dette er standardvalget. men du kan overstyre det for hver enkelt melding.\n"
+#~ "Dette er standardvalget. men du kan overstyre det for hver enkelt "
+#~ "melding.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15761,12 +15424,15 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Spør før signering av hver del</h1>\n"
-#~ "Velger du dette blir du spurt for hver meldingsdel (f.eks. hoveddelen og meldingens vedlegg) om den delen skal signeres.\n"
+#~ "Velger du dette blir du spurt for hver meldingsdel (f.eks. hoveddelen og "
+#~ "meldingens vedlegg) om den delen skal signeres.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15780,17 +15446,20 @@ msgstr "Skriv over fila?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ikke signer meldinger</h1>\n"
 #~ "Hvis du velger dette vil meldinger som standard være usignert .\n"
 #~ "<p>\n"
-#~ "Dette er standardinnstillingen, men det kan endres for hver enkelt melding.\n"
+#~ "Dette er standardinnstillingen, men det kan endres for hver enkelt "
+#~ "melding.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Signatursertifikatet settes opp på <em>Sertifikat</em>-siden."
 
 #~ msgid "RSA + SHA-1"
@@ -15802,20 +15471,34 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Signaturalgoritme</h1>\n"
-#~ "En algoritme er en beskrivelse av hvordan en datamaskin skal utføre en bestemt oppgave. Signeringsalgoritmen beskriver hvordan datamaskiner bruker signaturnøkkelen sammen med meldinga slik at mottakeren kan avgjøre om meldinga er fra deg. \n"
+#~ "En algoritme er en beskrivelse av hvordan en datamaskin skal utføre en "
+#~ "bestemt oppgave. Signeringsalgoritmen beskriver hvordan datamaskiner "
+#~ "bruker signaturnøkkelen sammen med meldinga slik at mottakeren kan "
+#~ "avgjøre om meldinga er fra deg. \n"
 #~ "<p>\n"
-#~ "Valget av en bestemt signaturalgoritme bestemmer hvor lett eller hvor vanskelig det er å forfalske en melding. Men alle algoritmer i SPHINX-miljøet anses for å være svært sikre. Standardinnstillingene vil vanligvis fungere fint.\n"
+#~ "Valget av en bestemt signaturalgoritme bestemmer hvor lett eller hvor "
+#~ "vanskelig det er å forfalske en melding. Men alle algoritmer i SPHINX-"
+#~ "miljøet anses for å være svært sikre. Standardinnstillingene vil "
+#~ "vanligvis fungere fint.\n"
 #~ "<p>\n"
-#~ "Denne innstillinga er standard og kan overstyres for hver enkelt melding.\n"
+#~ "Denne innstillinga er standard og kan overstyres for hver enkelt "
+#~ "melding.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15825,17 +15508,22 @@ msgstr "Skriv over fila?"
 #~ msgstr "&Lagre meldinger med signaturer"
 
 #~ msgid "Check to store messages with their signatures"
-#~ msgstr "Kryss av her for å lagre meldinger sammen med signaturene som hører til."
+#~ msgstr ""
+#~ "Kryss av her for å lagre meldinger sammen med signaturene som hører til."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lagre meldinger med signaturer</h1>\n"
-#~ "Når denne boksen er avkrysset, blir de sendte meldingene lagret sammen med signaturene som hører til. Dette anbefales fordi du da siden kan sjekke om meldinga, eller deler av den, ble signert.</qt>"
+#~ "Når denne boksen er avkrysset, blir de sendte meldingene lagret sammen "
+#~ "med signaturene som hører til. Dette anbefales fordi du da siden kan "
+#~ "sjekke om meldinga, eller deler av den, ble signert.</qt>"
 
 #~ msgid "Compound mode:"
 #~ msgstr "Modus for signaturoppbygging:"
@@ -15844,17 +15532,24 @@ msgstr "Skriv over fila?"
 #~ msgstr "&Standard MIME"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "En flerdelt, signert melding som inneholder signatur og signerte data."
+#~ msgstr ""
+#~ "En flerdelt, signert melding som inneholder signatur og signerte data."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Flerdelte signaturer</h1>\n"
-#~ "Hvis du velger dette vil signaturen og de signerte dataene være adskilte deler av en flerdels/signert meldingsdel. Signerte meldingsdata vil være lesbare selv med e-postprogrammer som ikke støtter signeringsalgoritmer og ikke støtter ASN.1-dekoding.\n"
+#~ "Hvis du velger dette vil signaturen og de signerte dataene være adskilte "
+#~ "deler av en flerdels/signert meldingsdel. Signerte meldingsdata vil være "
+#~ "lesbare selv med e-postprogrammer som ikke støtter signeringsalgoritmer "
+#~ "og ikke støtter ASN.1-dekoding.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15866,12 +15561,16 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Tett signering av meldinger</h1>\n"
-#~ "Hvis du velger dette vil både signaturen og signerte data være kodet i en ASN.1-blokk. Meldingene vil bare være leselige i e-post-lesere som støtter ASN.1-dekoding.\n"
+#~ "Hvis du velger dette vil både signaturen og signerte data være kodet i en "
+#~ "ASN.1-blokk. Meldingene vil bare være leselige i e-post-lesere som "
+#~ "støtter ASN.1-dekoding.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15883,8 +15582,22 @@ msgstr "Skriv over fila?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Velg hvor ofte PIN-koden må oppgis"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt><h1>PIN-oppføring</h1> Her kan du velge hvor ofte du må oppgi PIN-koden for å få tilgang til det personlige sikkehetsrommet der sertifikatene dine ligger. <p>Jo oftere du må oppgi PIN-koden, jo bedre er du vernet mot falsk e-post i ditt navn. Samtidig vil du møte flere hindringer ved bruk av programmet. <p>Dersom du er usikker på hva du skal velge, kan du la innstillinga være uendret. <p>Legg merke til at du av sikkerhetsgrunner ikke kan slå PIN-kontrollen helt av.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>PIN-oppføring</h1> Her kan du velge hvor ofte du må oppgi PIN-"
+#~ "koden for å få tilgang til det personlige sikkehetsrommet der "
+#~ "sertifikatene dine ligger. <p>Jo oftere du må oppgi PIN-koden, jo bedre "
+#~ "er du vernet mot falsk e-post i ditt navn. Samtidig vil du møte flere "
+#~ "hindringer ved bruk av programmet. <p>Dersom du er usikker på hva du skal "
+#~ "velge, kan du la innstillinga være uendret. <p>Legg merke til at du av "
+#~ "sikkerhetsgrunner ikke kan slå PIN-kontrollen helt av.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "En gang pr økt"
@@ -15901,35 +15614,45 @@ msgstr "Skriv over fila?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gi advarsel hvis sertifikat blir foreldet</h1>\n"
-#~ "Hvis du velger dette vil du få advarsel ved forsøk på å bruke et sertifikat til signering som blir foreldet innen et bestemt antall dager.\n"
+#~ "Hvis du velger dette vil du få advarsel ved forsøk på å bruke et "
+#~ "sertifikat til signering som blir foreldet innen et bestemt antall "
+#~ "dager.\n"
 #~ "<p>\n"
-#~ "Det anbefales å la dette være på for å unngå bruk av sertifikater som blir foreldet i nær framtid.\n"
+#~ "Det anbefales å la dette være på for å unngå bruk av sertifikater som "
+#~ "blir foreldet i nær framtid.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Advar dersom &signatursertifikatet går ut innen:"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Gi advarsel hvis undertegnerens e-postadresse &mangler i sertifikatet"
+#~ msgstr ""
+#~ "Gi advarsel hvis undertegnerens e-postadresse &mangler i sertifikatet"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Gi advarsel hvis undertegnerens e-post-adresse mangler i sertifikatet</h1>\n"
-#~ "Hvis du krysser av for dette gis det en advarsel hvis e-post-adressen til undertegneren mangler i sertifikatet som ble bruk ved signeringen.\n"
+#~ "<h1>Gi advarsel hvis undertegnerens e-post-adresse mangler i "
+#~ "sertifikatet</h1>\n"
+#~ "Hvis du krysser av for dette gis det en advarsel hvis e-post-adressen til "
+#~ "undertegneren mangler i sertifikatet som ble bruk ved signeringen.\n"
 #~ "<p>\n"
 #~ "Det anbefales å la dette være på for størst mulig sikkerhet.\n"
 #~ "</qt>"
diff --git a/tde-i18n-nds/messages/tdepim/kmail.po b/tde-i18n-nds/messages/tdepim/kmail.po
index f1efb324cf7..4c16877ed6f 100644
--- a/tde-i18n-nds/messages/tdepim/kmail.po
+++ b/tde-i18n-nds/messages/tdepim/kmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-12 20:13+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Heiko Evermann, Sönke Dibbern"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -169,6 +169,12 @@ msgstr "K&een (mit Acht bruken)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto mit halfautomaatsch Ressourcenpleeg"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Vörgeschicht leddig maken"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -243,9 +249,9 @@ msgstr "&Brukernaam:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "Dien Nettpostdeenst hett Di en <em>Brukernaam</em> geven, de för de "
 "Identiteetprööv op sien Reekners bruukt warrt. Normalerwies is dat de eerste "
@@ -270,20 +276,20 @@ msgstr "POP-Passwoort woh&ren"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Aktiveer dit, wenn KMail dat Passwoort wohren schall.\n"
-"Wenn TDEWallet verföögbor is, warrt dat Passwoort dor binnen wohrt, wat seker "
-"noog is.\n"
-"Wenn de elektroonsche Knipp nich verföögbor is, warrt dat Passwoort binnen de "
-"Instellendatei vun KMail wohrt. Dat steiht dor in en nich leesbore Form binnen, "
-"man wenn Een de Datei faatkriggt un dat Passwoort redig opslöteln will, is dat "
-"Formaat nich bannig seker."
+"Wenn TDEWallet verföögbor is, warrt dat Passwoort dor binnen wohrt, wat "
+"seker noog is.\n"
+"Wenn de elektroonsche Knipp nich verföögbor is, warrt dat Passwoort binnen "
+"de Instellendatei vun KMail wohrt. Dat steiht dor in en nich leesbore Form "
+"binnen, man wenn Een de Datei faatkriggt un dat Passwoort redig opslöteln "
+"will, is dat Formaat nich bannig seker."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -311,8 +317,9 @@ msgstr "Narichten &filtern, wenn se grötter sünd as"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Wenn aktiveert, warrt POP-Filtern för de Narichten bruukt. Du kannst denn "
 "utsöken, wat de Narichten daallaadt, wegdaan oder op den Server laten warrt."
@@ -364,13 +371,15 @@ msgstr "Eenfach Te&xt"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -413,13 +422,13 @@ msgstr "Naamrüüm:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Hier sühst Du de Naamrüüm, de Dien IMAP-Server ünnerstütt. Elk Naamruum steiht "
-"för en Prefix, dat Ornerkoppeln scheedt. Mit Naamrüüm kann KMail t.B. Dien "
-"persöönliche un deelte Ornern in een Konto wiesen."
+"Hier sühst Du de Naamrüüm, de Dien IMAP-Server ünnerstütt. Elk Naamruum "
+"steiht för en Prefix, dat Ornerkoppeln scheedt. Mit Naamrüüm kann KMail t.B. "
+"Dien persöönliche un deelte Ornern in een Konto wiesen."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -477,12 +486,12 @@ msgstr "B&ilagen op Nafraag laden"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Aktiveer dit, wenn Du Bilagen nich automaatsch daalladen wullt, man eerst, wenn "
-"Du op de Bilaag klickst. So warrt ok grote Narichten fuurts wiest."
+"Aktiveer dit, wenn Du Bilagen nich automaatsch daalladen wullt, man eerst, "
+"wenn Du op de Bilaag klickst. So warrt ok grote Narichten fuurts wiest."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -493,8 +502,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Bloots binnen apen Ornern vun den Ornerboom warrt na Ünnerornern söcht. Bruuk "
-"dit, wenn dat op den Server bannig vele Ornern gifft."
+"Bloots binnen apen Ornern vun den Ornerboom warrt na Ünnerornern söcht. "
+"Bruuk dit, wenn dat op den Server bannig vele Ornern gifft."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -522,7 +531,7 @@ msgstr "<keen>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Postingang"
 
@@ -530,8 +539,8 @@ msgstr "Postingang"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "As dat lett ünnerstütt de Server keen eensoortet Narichtennummern, wat aver "
 "nödig is, wenn Du Narichten op den Server laten wullt.\n"
@@ -542,8 +551,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "As dat lett ünnerstütt de Server dat Halen vun Narichtenköpp nich, wat aver "
 "nödig is, wenn Du Narichten al op den Server filtern wullt.\n"
@@ -552,23 +561,25 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Bitte beacht, dat en poor Servers, de Pipelining nich ünnerstütt, mit disse "
 "Funkschoon schaadhaftige Nettbreven sendt.\n"
-"Du kannst dat hier instellen, wiel en poor Servers Pipelining ünnerstütt, man "
-"ehr Könen nich heel richtig angifft. Wenn Du pröven wullt, wat Dien POP3-Server "
-"angifft, dat he Pipelining ünnerstütt, klick op \"Server-Könen testen\".\n"
+"Du kannst dat hier instellen, wiel en poor Servers Pipelining ünnerstütt, "
+"man ehr Könen nich heel richtig angifft. Wenn Du pröven wullt, wat Dien POP3-"
+"Server angifft, dat he Pipelining ünnerstütt, klick op \"Server-Könen testen"
+"\".\n"
 "Wenn Dien Server nich angifft, dat he dat ünnerstütt, Du aver liekers gauer "
-"daalladen wullt, schullst Du Di toeerst sülven en Bült Nettbreven tosennen un "
-"kieken, wat se richtig daallaadt warrt."
+"daalladen wullt, schullst Du Di toeerst sülven en Bült Nettbreven tosennen "
+"un kieken, wat se richtig daallaadt warrt."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -576,31 +587,31 @@ msgstr "Bitte toeerst en Reekner un en Port ünner \"Allgemeen\" angeven"
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "As dat lett ünnerstütt de Server Pipelining nich, dorför wöör de Optschoon "
 "utmaakt.\n"
 "En poor Servers gifft ehr Könen nich heel richtig an, Du kannst dat also "
-"versöken un Pipelining liekers anmaken. Bitte beacht, dat en poor Servers, de "
-"Pipelining nich ünnerstütt, mit disse Funkschoon schaadhaftige Nettbreven "
-"sendt. Ehr Du disse Optschoon also för wichtige Nettbreven bruukst, schullst Du "
-"Di man toeerst maal sülven en Bült Nettbreven tosennen un kieken, wat se "
+"versöken un Pipelining liekers anmaken. Bitte beacht, dat en poor Servers, "
+"de Pipelining nich ünnerstütt, mit disse Funkschoon schaadhaftige Nettbreven "
+"sendt. Ehr Du disse Optschoon also för wichtige Nettbreven bruukst, schullst "
+"Du Di man toeerst maal sülven en Bült Nettbreven tosennen un kieken, wat se "
 "richtig daallaadt warrt."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "As dat lett ünnerstütt de Server keen eensoortet Narichtennummern, wat aver "
 "nödig is, wenn Du Narichten op den Server laten wull; dorför wöör disse "
@@ -613,12 +624,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "As dat lett ünnerstütt de Server dat Halen vun Narichtenköpp nich, wat aver "
-"nödig is, wenn Du Narichten al op den Server filtern wullt; dorför wöör disse "
-"Optschoon utmaakt.\n"
+"nödig is, wenn Du Narichten al op den Server filtern wullt; dorför wöör "
+"disse Optschoon utmaakt.\n"
 "En poor Servers gifft ehr Könen nich heel richtig an, Du kannst dat also "
 "versöken un dat Filtern op den Server liekers anmaken."
 
@@ -700,11 +711,11 @@ msgstr "IMAP-Konto"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Du muttst binnen den Nettwark-Afsnitt vun de Instellen en Konto tofögen, wenn "
-"Du Nettpost kriegen wullt."
+"Du muttst binnen den Nettwark-Afsnitt vun de Instellen en Konto tofögen, "
+"wenn Du Nettpost kriegen wullt."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -740,13 +751,13 @@ msgstr "Willkamen bi KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>As dat lett hest Du KMail dat eerste Maal start. Du kannst dissen Hölper "
-"för dat Inrichten vun Dien Kontos bruken, giff eenfach de Verbinnendaten, de Du "
-"vun Dien Nettpostdeenst kregen hest, op de nakamen Sieden in.</qt>"
+"för dat Inrichten vun Dien Kontos bruken, giff eenfach de Verbinnendaten, de "
+"Du vun Dien Nettpostdeenst kregen hest, op de nakamen Sieden in.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -808,8 +819,7 @@ msgstr "Lokaal utlevern"
 msgid "Server Information"
 msgstr "Server-Informatschonen"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Keen"
@@ -947,36 +957,34 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Hier gifft dat Hülp för dat Opstellen vun Filterregeln in KMail, mit de Du "
-"en Reeg utbreedt bruukte Antivirus-Warktüüch bruken kannst.</p>"
-"<p>De Hölper kann disse Warktüüch op Dien Reekner finnen un Filterregeln "
-"opstellen, mit de disse Programmen virusversüükt Narichten finnen un utschutern "
-"köönt. De Hölper warrt keen vörhannen Filterregeln ankieken, he stellt jümmers "
-"niege Regeln op.</p>"
-"<p><b>Wohrschoen:</b> KMail antert wielt dat Dörkieken vun Narichten na "
-"Virussen nich, un de Virus-Prööv duert so ehr Tiet, so dat Du op KMail töven "
-"muttst. Wenn Du dat ole Bedregen wedderhebben wullt, muttst Du de vun dissen "
-"Hölper opstellten Filterregeln wedder wegdoon."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Hier gifft dat Hülp för dat Opstellen vun Filterregeln in KMail, mit de "
+"Du en Reeg utbreedt bruukte Antivirus-Warktüüch bruken kannst.</p><p>De "
+"Hölper kann disse Warktüüch op Dien Reekner finnen un Filterregeln "
+"opstellen, mit de disse Programmen virusversüükt Narichten finnen un "
+"utschutern köönt. De Hölper warrt keen vörhannen Filterregeln ankieken, he "
+"stellt jümmers niege Regeln op.</p><p><b>Wohrschoen:</b> KMail antert wielt "
+"dat Dörkieken vun Narichten na Virussen nich, un de Virus-Prööv duert so ehr "
+"Tiet, so dat Du op KMail töven muttst. Wenn Du dat ole Bedregen wedderhebben "
+"wullt, muttst Du de vun dissen Hölper opstellten Filterregeln wedder wegdoon."
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Bitte söök de Warktüüch ut, de Du för't Opdecken bruken wullt, un gah na de "
-"nakamen Siet.</p>"
+"<p>Bitte söök de Warktüüch ut, de Du för't Opdecken bruken wullt, un gah na "
+"de nakamen Siet.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -995,8 +1003,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"De vörinstellt Orner för Warven-Narichten is de Affallorner, dat kannst Du aver "
-"binnen de Orneransicht nerrn ännern."
+"De vörinstellt Orner för Warven-Narichten is de Affallorner, dat kannst Du "
+"aver binnen de Orneransicht nerrn ännern."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1004,15 +1012,13 @@ msgstr "Narichten mit Warvenver&dacht verschuven na:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "De vörinstellt Orner is de Postingang, dat kannst Du aver binnen de "
-"Orneransicht nerrn ännern."
-"<p>Nich all Warktüüch hebbt en \"Verdacht\"-Stoop. Wenn Dien Warktüüch dat nich "
-"hett, kannst Du hier ok keen Orner utsöken."
+"Orneransicht nerrn ännern.<p>Nich all Warktüüch hebbt en \"Verdacht\"-Stoop. "
+"Wenn Dien Warktüüch dat nich hett, kannst Du hier ok keen Orner utsöken."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1022,13 +1028,13 @@ msgstr "Narichten mit Antivirus-Warktüüch pröven"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Laat de Antivirus-Warktüüch Dien Narichten pröven. De Hölper warrt passen "
-"Filtern opstellen. De Narichten warrt normalerwies vun de Warktüüch markeert, "
-"so dat nakamen Filtern disse Narichten finnen un t.B. na en besünneren Orner "
-"verschuven köönt."
+"Filtern opstellen. De Narichten warrt normalerwies vun de Warktüüch "
+"markeert, so dat nakamen Filtern disse Narichten finnen un t.B. na en "
+"besünneren Orner verschuven köönt."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1037,12 +1043,12 @@ msgstr "Virenversüükt Narichten na utsöchten Orner verschuven"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"De Hölper stellt en Filter op, de as versüükt markeerte Narichten finnen un na "
-"en fastleggten Orner verschuven schall. Vörinstellt is de Affallorner, dat "
-"kannst Du aver binnen de Orneransicht ännern."
+"De Hölper stellt en Filter op, de as versüükt markeerte Narichten finnen un "
+"na en fastleggten Orner verschuven schall. Vörinstellt is de Affallorner, "
+"dat kannst Du aver binnen de Orneransicht ännern."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1050,11 +1056,11 @@ msgstr "Virenversüükt Narichten ok noch as leest markeren"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Markeert Narichten as leest, de as versüükt markeert sünd, un verschufft se na "
-"den utsöchten Orner."
+"Markeert Narichten as leest, de as versüükt markeert sünd, un verschufft se "
+"na den utsöchten Orner."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1234,8 +1240,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Villicht hest Du keen Verlööf, dat to doon, oder dat gifft den Orner al op den "
-"Server. De Fehlermellen vun den Server is:"
+"Villicht hest Du keen Verlööf, dat to doon, oder dat gifft den Orner al op "
+"den Server. De Fehlermellen vun den Server is:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1248,8 +1254,8 @@ msgstr "Fehler bi't Lesen vun den Orner \"%1\" op den Server: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1269,8 +1275,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1301,17 +1307,17 @@ msgstr "Wegdaan"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>De Adressaat vun disse Naricht passt op keen vun Dien Identiteten,"
 "<br>bitte giff an, welk vun disse Adressen Diene is:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>De Adressaat vun disse Naricht passt op mehr vun Dien Identiteten,"
 "<br>bitte giff an, welk vun disse Adressen Diene is:"
@@ -1343,18 +1349,21 @@ msgstr "Fehler bi't Lüttmaken vun \"%1\". Lüttmaken afbraken."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Disse Optschoon wöör vun Dien Systeempleger fastsett.</p>"
-"<p>Wenn Di dat en Fehler dücht, snack em dor op an.</p></qt>"
+"<qt><p>Disse Optschoon wöör vun Dien Systeempleger fastsett.</p><p>Wenn Di "
+"dat en Fehler dücht, snack em dor op an.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Profil &laden..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Konto inrichten"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Tofögen..."
@@ -1384,6 +1393,11 @@ msgstr "<qt>Wullt Du de Identiteet mit den Naam <b>%1</b> redig wegdoon?</qt>"
 msgid "Remove Identity"
 msgstr "Identiteet wegdoon"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Wegdoon"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Tofögen..."
@@ -1392,6 +1406,11 @@ msgstr "Tofögen..."
 msgid "Modify..."
 msgstr "Ännern..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Wegdoon"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "As Standard fastleggen"
@@ -1408,17 +1427,15 @@ msgstr "&Sennen"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Rutgahn Kontos (föög tominnst een to):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Naam"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Typ"
@@ -1440,8 +1457,7 @@ msgstr "As Standard fastleggen"
 msgid "Common Options"
 msgstr "Allgemeen Optschonen"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Ehr't Sennen nafragen"
@@ -1492,17 +1508,16 @@ msgstr "S&tandard-Domään:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mit de Standarddomään warrt Nettpostadressen vull maakt, de bloots den "
-"Brukernaam bargt.</p></qt>"
+"<qt><p>Mit de Standarddomään warrt Nettpostadressen vull maakt, de bloots "
+"den Brukernaam bargt.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 (%2)"
 
@@ -1520,9 +1535,9 @@ msgstr "Överdreegmetood tofögen"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Standard)"
 
@@ -1605,6 +1620,10 @@ msgstr "Konto ännern"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Konto <b>%1</b> lett sik nich finnen.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Klören"
@@ -1713,8 +1732,7 @@ msgstr "Besöcht Link"
 msgid "Misspelled Words"
 msgstr "Verkehrt schreven Wöör"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Niege Naricht"
@@ -1902,8 +1920,8 @@ msgstr "Klöönsnacks standardwies tomaken"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Klöönsnacks mit niege, nich leeste oder &wichtige Narichten un beluerte "
 "Klöönsnacks opmaken"
@@ -1914,73 +1932,55 @@ msgstr "Datumdorstellen"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Du kannst disse Utdrück för dat Datum bruken:</strong></p>"
-"<ul>"
-"<li>d - Dag as Tall ahn Null vörweg (1-31)</li>"
-"<li>dd - Dag as Tall mit Null vörweg (01-31)</li>"
-"<li>ddd - Afkört Wekendag (Ma - Sü)</li>"
-"<li>dddd - Heel Wekendag (Maandag - Sünndag)</li>"
-"<li>M - Maand as Tall ahn Null vörweg (1-12)</li>"
-"<li>MM - Maand as Tall mit Null vörweg (01-12)</li>"
-"<li>MMM - Afkört Maand (Jan - Dez)</li>"
-"<li>MMMM - Heel Maand (Januor - Dezember)</li>"
-"<li>yy - Johr mit twee Steden (00-99)</li>"
-"<li>yyyy - Johr mit veer Steden (0000 - 9999)</li></ul>"
-"<p><strong>Du kannst disse Utdrück för de Tiet bruken:</strong></p>"
-"<ul>"
-"<li>h - De Stünn ahn Null vörweg (0-23, oder 1-12 in 12-Stünnen-Dorstellen)</li>"
-"<li>hh - De Stünn mit Null vörweg (00-23, oder 01-12 in "
-"12-Stünnen-Dorstellen)</li>"
-"<li>m - De Minuut ahn Null vörweg (0-59)</li>"
-"<li>mm - De Minuut mit Null vörweg (00-59)</li>"
-"<li>s - De Sekunn ahn Null vörweg (0-59)</li>"
-"<li>ss - De Sekunn mit Null vörweg (00-59)</li>"
-"<li>z - de Millisekunn ahn Null(en) vörweg (0-999)</li>"
-"<li>zzz - de Millisekunn mit Null(en) vörweg (000-999)</li>"
-"<li>AP - Mark för 12-Stünnen-Dorstellen. För \"AP\" warrt \"AM\" oder \"PM\" "
-"insett.</li>"
-"<li>ap - Mark för 12-Stünnen-Dorstellen. För \"ap\" warrt \"am\" oder \"pm\" "
-"insett.</li>"
-"<li>Z - Tietrebeet in numeersche Form (-1200 - 1200)</li></ul>"
-"<p><strong>All anner Bookstaven warrt övergahn.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Du kannst disse Utdrück för dat Datum bruken:</strong></"
+"p><ul><li>d - Dag as Tall ahn Null vörweg (1-31)</li><li>dd - Dag as Tall "
+"mit Null vörweg (01-31)</li><li>ddd - Afkört Wekendag (Ma - Sü)</li><li>dddd "
+"- Heel Wekendag (Maandag - Sünndag)</li><li>M - Maand as Tall ahn Null "
+"vörweg (1-12)</li><li>MM - Maand as Tall mit Null vörweg (01-12)</li><li>MMM "
+"- Afkört Maand (Jan - Dez)</li><li>MMMM - Heel Maand (Januor - Dezember)</"
+"li><li>yy - Johr mit twee Steden (00-99)</li><li>yyyy - Johr mit veer Steden "
+"(0000 - 9999)</li></ul><p><strong>Du kannst disse Utdrück för de Tiet bruken:"
+"</strong></p><ul><li>h - De Stünn ahn Null vörweg (0-23, oder 1-12 in 12-"
+"Stünnen-Dorstellen)</li><li>hh - De Stünn mit Null vörweg (00-23, oder 01-12 "
+"in 12-Stünnen-Dorstellen)</li><li>m - De Minuut ahn Null vörweg (0-59)</"
+"li><li>mm - De Minuut mit Null vörweg (00-59)</li><li>s - De Sekunn ahn Null "
+"vörweg (0-59)</li><li>ss - De Sekunn mit Null vörweg (00-59)</li><li>z - de "
+"Millisekunn ahn Null(en) vörweg (0-999)</li><li>zzz - de Millisekunn mit "
+"Null(en) vörweg (000-999)</li><li>AP - Mark för 12-Stünnen-Dorstellen. För "
+"\"AP\" warrt \"AM\" oder \"PM\" insett.</li><li>ap - Mark för 12-Stünnen-"
+"Dorstellen. För \"ap\" warrt \"am\" oder \"pm\" insett.</li><li>Z - "
+"Tietrebeet in numeersche Form (-1200 - 1200)</li></ul><p><strong>All anner "
+"Bookstaven warrt övergahn.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Dat Ännern vun de globale Klöönsnack-Instellen warrt all besünner "
-"Orner-Instellen överschrieven."
+"Dat Ännern vun de globale Klöönsnack-Instellen warrt all besünner Orner-"
+"Instellen överschrieven."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -1994,8 +1994,7 @@ msgstr "HTML-&Statusbalken wiesen"
 msgid "Show s&pam status in fancy headers"
 msgstr "&Warven-Status för Smucke Köpp wiesen"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "För Smileys Snuten insetten"
@@ -2004,8 +2003,7 @@ msgstr "För Smileys Snuten insetten"
 msgid "Use smaller font for quoted text"
 msgstr "För ziteert Text lüttere Schriftoort bruken"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Tosamenfoold-Marken för Zitaten wiesen"
@@ -2031,8 +2029,7 @@ msgstr "Automaatsch"
 msgid "&Override character encoding:"
 msgstr "&Jümmers dissen Tekensett bruken:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Systeemafsnitt-Lüttbild bruken"
@@ -2134,21 +2131,19 @@ msgstr "För <b>%f</b> warrt de Dateinaam för't Bewerken insett"
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Du kannst disse Platzhollers binnen de Antwoort-Snacks bruken:"
-"<br><b>%D</b>: Datum, <b>%S</b>: Bedraap,"
-"<br><b>%e</b>: Adress vun den Senner, <b>%F</b>: sien Naam, <b>%f</b>"
-": sien Anfangbookstaven,"
-"<br><b>%T</b>: Naam vun den Adressaat, <b>%t</b>: sien Naam un Adress,"
-"<br><b>%C</b>: Naams vun de Kopie-Adressaten, <b>%c</b>: ehr Naams un Adressen"
-"<br><b>%%</b>: Perzent-Teken, <b>%_</b>: Leerteken, <b>%L</b>: Niege Reeg</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Du kannst disse Platzhollers binnen de Antwoort-Snacks bruken:<br><b>%D</"
+"b>: Datum, <b>%S</b>: Bedraap,<br><b>%e</b>: Adress vun den Senner, <b>%F</"
+"b>: sien Naam, <b>%f</b>: sien Anfangbookstaven,<br><b>%T</b>: Naam vun den "
+"Adressaat, <b>%t</b>: sien Naam un Adress,<br><b>%C</b>: Naams vun de Kopie-"
+"Adressaten, <b>%c</b>: ehr Naams un Adressen<br><b>%%</b>: Perzent-Teken, <b>"
+"%_</b>: Leerteken, <b>%L</b>: Niege Reeg</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2171,21 +2166,20 @@ msgstr "Na &All antern:"
 msgid "&Forward:"
 msgstr "&Wiederledden:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Zitaatmark:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "An'n %D hest Du schreven:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "An'n %D hett %F schreven:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Wiederleddt Naricht"
 
@@ -2223,8 +2217,8 @@ msgstr "Nieg Wiederledd-Prefix ingeven:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Disse List warrt för elk rutgahn Naricht vun baven na nerrn dörkeken; söcht "
 "warrt en Tekensett, de all bruukte Tekens bargt."
@@ -2261,10 +2255,9 @@ msgstr "Weert"
 msgid "Ne&w"
 msgstr "&Nieg"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Naam:"
@@ -2273,16 +2266,15 @@ msgstr "&Naam:"
 msgid "&Value:"
 msgstr "&Weert:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Bilagen kompatibel to Outlook nömen"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Aktiveer dit, wenn ok Outlook(tm) de Bilagennaams mit Sünnertekens verstahn "
 "schall"
@@ -2311,21 +2303,22 @@ msgstr "bileggt"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Du wullt Bilagennaams, de Sünnertekens (nich-engelsche Bookstaven) bargt, op en "
-"Wies koderen laten, de ok Outlook(tm) un anner Nettpostprogrammen verstahn "
-"köönt, de de Standardwies för't Koderen vun Bilagennaams nich versteiht.\n"
-"Beacht bitte, dat KMail denn Nettbreven opstellt, de sik nich to de Standards "
-"höllt, un dat Nettpostprogrammen, de sik to de Standards höllt, disse villicht "
-"nich verarbeiden köönt. Bruuk disse Optschoon bloots, wenn Du keen anner "
-"Mööglichkeit hest."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Du wullt Bilagennaams, de Sünnertekens (nich-engelsche Bookstaven) bargt, op "
+"en Wies koderen laten, de ok Outlook(tm) un anner Nettpostprogrammen "
+"verstahn köönt, de de Standardwies för't Koderen vun Bilagennaams nich "
+"versteiht.\n"
+"Beacht bitte, dat KMail denn Nettbreven opstellt, de sik nich to de "
+"Standards höllt, un dat Nettpostprogrammen, de sik to de Standards höllt, "
+"disse villicht nich verarbeiden köönt. Bruuk disse Optschoon bloots, wenn Du "
+"keen anner Mööglichkeit hest."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2349,112 +2342,100 @@ msgstr "Vers&lötel-Modulen"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Nettbreven bargt faken beed Formaten. Mit disse Optschoon kannst Du "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Nettbreven bargt faken beed Formaten. Mit disse Optschoon kannst Du "
 "fastleggen, wat Du den HTML-Deel oder den Eenfachtext-Deel wiest kriegen "
-"wullt.</p>"
-"<p>De Dorstellen in HTML lett de Naricht beter utsehn, man de Riskanz, dat "
-"Sekerheitlöcker utnütt warrt, is ok wat höger.</p>"
-"<p>Bi de Dorstellen as Eenfachtext geiht dat mehrste vun de Naricht ehr "
-"Formateren verloren, man dat Utnütten vun Sekerheitlöcker binnen den "
-"HTML-Wieser (Konqueror) is meist <em>nich mööglich</em>.</p>"
-"<p>Do Optschoon nerrn schuult Di vör een wiet utbreedt Misbruuk vun "
-"HTML-Narichten, man se kann Di nich vör Sekerheitlöcker schulen, de nich "
-"bekannt weern, as disse Verschoon vun KMail schreven wöör.</p>"
-"<p>Dorför is dat anraadt, HTML <em>nich</em> günt Eenfachtext vörtotrecken.</p>"
-"<p><b>Beacht:</b> Du kannst disse Optschoon för elk Orner över dat Menü <i>"
-"Orner</i> binnen dat Hööftfinster vun KMail enkelt instellen.</p></qt>"
+"wullt.</p><p>De Dorstellen in HTML lett de Naricht beter utsehn, man de "
+"Riskanz, dat Sekerheitlöcker utnütt warrt, is ok wat höger.</p><p>Bi de "
+"Dorstellen as Eenfachtext geiht dat mehrste vun de Naricht ehr Formateren "
+"verloren, man dat Utnütten vun Sekerheitlöcker binnen den HTML-Wieser "
+"(Konqueror) is meist <em>nich mööglich</em>.</p><p>Do Optschoon nerrn "
+"schuult Di vör een wiet utbreedt Misbruuk vun HTML-Narichten, man se kann Di "
+"nich vör Sekerheitlöcker schulen, de nich bekannt weern, as disse Verschoon "
+"vun KMail schreven wöör.</p><p>Dorför is dat anraadt, HTML <em>nich</em> "
+"günt Eenfachtext vörtotrecken.</p><p><b>Beacht:</b> Du kannst disse "
+"Optschoon för elk Orner över dat Menü <i>Orner</i> binnen dat Hööftfinster "
+"vun KMail enkelt instellen.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>En Reeg Warven-Narichten warrt as HTML sendt un bargt Betöög op t.B. lütte "
-"Biller (&quot;Web bugs&quot;, &quot;Tellbiller&quot;). Wenn disse Biller för't "
-"Wiesen daallaadt warrt, köönt de Senners dat rutfinnen un so faststellen, dat "
-"Du ehr Naricht leest hest.</p>"
-"<p>Dat gifft keen goden Grund, Biller so in Narichten intofögen, de Senner kann "
-"nödige Biller ok eenfach de Naricht bileggen.</p>"
-"<p>Disse Optschoon is standardwies <em>utmaakt</em>, so dat Du vör dissen "
-"Misbruuk vun de HTML-Dorstellen schuult büst.</p>"
-"<p>Wenn Du liekers op disse Oort inföögte Biller ankieken wullt, kannst Du "
-"disse Optschoon anmaken, wees Di aver kloor över dat Problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>En Reeg Warven-Narichten warrt as HTML sendt un bargt Betöög op t.B. "
+"lütte Biller (&quot;Web bugs&quot;, &quot;Tellbiller&quot;). Wenn disse "
+"Biller för't Wiesen daallaadt warrt, köönt de Senners dat rutfinnen un so "
+"faststellen, dat Du ehr Naricht leest hest.</p><p>Dat gifft keen goden "
+"Grund, Biller so in Narichten intofögen, de Senner kann nödige Biller ok "
+"eenfach de Naricht bileggen.</p><p>Disse Optschoon is standardwies "
+"<em>utmaakt</em>, so dat Du vör dissen Misbruuk vun de HTML-Dorstellen "
+"schuult büst.</p><p>Wenn Du liekers op disse Oort inföögte Biller ankieken "
+"wullt, kannst Du disse Optschoon anmaken, wees Di aver kloor över dat "
+"Problem.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Behanneln vun Narichttostand-Bescheden (NTBen)</h3>"
-"<p>De Schriever vun en Naricht kann Bescheden dor över anföddern, wat mit sien "
-"Naricht vör sik geiht; dat Nettpostprogramm vun den Adressaat stellt disse "
-"automaatsch op. Normaal Narichttostänn sünd <b>wiest</b> (d.h. leest), <b>"
-"wegdaan</b> un <b>verarbeidt</b> (t.B. wiederleddt).</p>"
-"<p>Du hest disse Optschonen för dat Behanneln vun NTB-Anföddern:</p>"
-"<ul>"
-"<li><em>Övergahn</em>: Övergeiht all Anfragen na all Bescheden. Bescheden warrt "
-"nienich automaatsch sendt (anraadt).</li>"
-"<li><em>Fragen</em>: Fraagt Di, wat op de Anföddern antert warrn schall. So "
-"kannst Du Bescheden för utsöchte Narichten sennen, wielt Du Anföddern bi anner "
-"Narichten övergahn oder afwiesen kannst.</li>"
-"<li><em>Afwiesen</em>: Sendt jümmers en &qout;Afwiest&quot;-Bescheed. Dat is "
-"bloots en <em>lütt beten</em> beter as jümmers den födderten Bescheed to "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Behanneln vun Narichttostand-Bescheden (NTBen)</h3><p>De Schriever "
+"vun en Naricht kann Bescheden dor över anföddern, wat mit sien Naricht vör "
+"sik geiht; dat Nettpostprogramm vun den Adressaat stellt disse automaatsch "
+"op. Normaal Narichttostänn sünd <b>wiest</b> (d.h. leest), <b>wegdaan</b> un "
+"<b>verarbeidt</b> (t.B. wiederleddt).</p><p>Du hest disse Optschonen för dat "
+"Behanneln vun NTB-Anföddern:</p><ul><li><em>Övergahn</em>: Övergeiht all "
+"Anfragen na all Bescheden. Bescheden warrt nienich automaatsch sendt "
+"(anraadt).</li><li><em>Fragen</em>: Fraagt Di, wat op de Anföddern antert "
+"warrn schall. So kannst Du Bescheden för utsöchte Narichten sennen, wielt Du "
+"Anföddern bi anner Narichten övergahn oder afwiesen kannst.</"
+"li><li><em>Afwiesen</em>: Sendt jümmers en &qout;Afwiest&quot;-Bescheed. Dat "
+"is bloots en <em>lütt beten</em> beter as jümmers den födderten Bescheed to "
 "sennen. De Senner kann so sehn, dat Du mit de Naricht wat doon hest, he kann "
-"bloots nich seggen, wat Du ehr ankeken, wegdaan oder dor wat anners mit maakt "
-"hest.</li>"
-"<li><em>Jümmers sennen</em>: Sendt jümmers den anfödderten Bescheed. De Senner "
-"kriggt to weten, <em>dat</em> Du wat mit de Naricht daan hest, un ok, <em>"
-"wat</em> Du dormit daan hest (ankeken, wegdaan, usw.). Vun disse Optschoon "
-"warrt redig afraadt. Liekers hett se ehr Sinn in wiss Ümgeven, t.B. in "
-"Kunnenpleeg-Systemen, un is dorför hier verföögbor.</li></ul></qt>"
+"bloots nich seggen, wat Du ehr ankeken, wegdaan oder dor wat anners mit "
+"maakt hest.</li><li><em>Jümmers sennen</em>: Sendt jümmers den anfödderten "
+"Bescheed. De Senner kriggt to weten, <em>dat</em> Du wat mit de Naricht daan "
+"hest, un ok, <em>wat</em> Du dormit daan hest (ankeken, wegdaan, usw.). Vun "
+"disse Optschoon warrt redig afraadt. Liekers hett se ehr Sinn in wiss "
+"Ümgeven, t.B. in Kunnenpleeg-Systemen, un is dorför hier verföögbor.</li></"
+"ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2470,16 +2451,15 @@ msgstr "Narichten dörvt e&xtern Dateien ut dat Internet daalladen"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>Wohrschoen</b>: HTML-Dorstellen in Nettbreven maakt de Riskanz grötter, dat "
-"aktuelle oder tokamen Sekerheitlöcker utnütt warrn köönt un Dien Reekner so "
-"schaadt warrt."
-"<br/><a href=\"whatsthis:%1\">Mehr över HTML-Nettbreven...</a> "
-"<a href=\"whatsthis:%2\">Mehr över extern Dateien...</a>"
+"<b>Wohrschoen</b>: HTML-Dorstellen in Nettbreven maakt de Riskanz grötter, "
+"dat aktuelle oder tokamen Sekerheitlöcker utnütt warrn köönt un Dien Reekner "
+"so schaadt warrt.<br/><a href=\"whatsthis:%1\">Mehr över HTML-Nettbreven...</"
+"a> <a href=\"whatsthis:%2\">Mehr över extern Dateien...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2538,8 +2518,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>Wohrschoen</b>: Wenn Du de Bescheden heel ahn Bedingen sennst, kann dat Dien "
-"Privaatrebeet schaden. <a href=\"whatsthis:%1\">Mehr dorto...</a>"
+"<b>Wohrschoen</b>: Wenn Du de Bescheden heel ahn Bedingen sennst, kann dat "
+"Dien Privaatrebeet schaden. <a href=\"whatsthis:%1\">Mehr dorto...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2560,8 +2540,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Disse Optschoon bruukt \"dirmngr\" >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "Keen Proxy"
@@ -2590,8 +2569,8 @@ msgstr "Wohrtiet gellt nich för &wichtige Narichten"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Sööktyp för nich leest Narichten:"
 
@@ -2615,8 +2594,8 @@ msgstr "Rundsöök in all Ornern"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Bi't Opmaken vun en Orner:"
 
@@ -2685,27 +2664,24 @@ msgstr "Ornern (\"maildir\"-Formaat)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Leggt fast, wat dat Standardformaat för lokale Ornern is:</p>"
-"<p><b>mbox:</b> För elkeen vun KMail sien Ornern gifft dat een Datei. Enkelte "
-"Narichten warrt dör en Reeg trennt, de mit \"From\" anfangt. Dat spoort wat "
-"Platz op de Fastplaat, man kunn ok wat weniger deegt wesen, t.B. wenn Du "
-"Narichten vun Orner na Orner verschuffst.</p>"
-"<p><b>maildir</b> De Ornern vun KMail höört ok Ornern op de Fastplaat to. "
-"Enkelte Narichten sünd enkelte Dateien dor binnen. Dat veraast en beten Platz "
-"op de Fastplaat, schull aver wat deegter wesen, wenn Du t.B. Narichten vun "
-"Orner na Orner verschuffst.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Leggt fast, wat dat Standardformaat för lokale Ornern is:</"
+"p><p><b>mbox:</b> För elkeen vun KMail sien Ornern gifft dat een Datei. "
+"Enkelte Narichten warrt dör en Reeg trennt, de mit \"From\" anfangt. Dat "
+"spoort wat Platz op de Fastplaat, man kunn ok wat weniger deegt wesen, t.B. "
+"wenn Du Narichten vun Orner na Orner verschuffst.</p><p><b>maildir</b> De "
+"Ornern vun KMail höört ok Ornern op de Fastplaat to. Enkelte Narichten sünd "
+"enkelte Dateien dor binnen. Dat veraast en beten Platz op de Fastplaat, "
+"schull aver wat deegter wesen, wenn Du t.B. Narichten vun Orner na Orner "
+"verschuffst.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2738,53 +2714,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bi't Jumpen na de nakamen nich leeste Naricht warrt dat vörkamen, dat dat "
-"keen nich leeste Naricht mehr nerrn de aktuelle gifft.</p>"
-"<p><b>Keen Rundsöök</b>: De Söök höllt bi de leste Naricht vun den aktuellen "
-"Orner op.</p>"
-"<p><b>Rundsöök in aktuell Orner</b>: De Söök geiht baven in de Narichtenlist "
-"wieder, wesselt aver nich na en anner Orner.</p>"
-"<p><b>Rundsöök in all Ornern</b>: De Söök geiht baven in de Narichtenlist "
-"wieder. Warrt keen nich leeste Naricht funnen, warrt binnen den nakamen Orner "
-"wiedersöcht.</p>"
-"<p>Dat sülve gellt ok bi de Söök na de verleden nich leeste Naricht, bloots "
-"start de Söök nerrn un geiht na den verleden Orner, wenn dat so instellt is.</p>"
-"</qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Bi't Jumpen na de nakamen nich leeste Naricht warrt dat vörkamen, dat "
+"dat keen nich leeste Naricht mehr nerrn de aktuelle gifft.</p><p><b>Keen "
+"Rundsöök</b>: De Söök höllt bi de leste Naricht vun den aktuellen Orner op.</"
+"p><p><b>Rundsöök in aktuell Orner</b>: De Söök geiht baven in de "
+"Narichtenlist wieder, wesselt aver nich na en anner Orner.</p><p><b>Rundsöök "
+"in all Ornern</b>: De Söök geiht baven in de Narichtenlist wieder. Warrt "
+"keen nich leeste Naricht funnen, warrt binnen den nakamen Orner wiedersöcht."
+"</p><p>Dat sülve gellt ok bi de Söök na de verleden nich leeste Naricht, "
+"bloots start de Söök nerrn un geiht na den verleden Orner, wenn dat so "
+"instellt is.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>Vulltextindizeren maakt dat mööglich, bannig gau binnen den Inholt vun Dien "
-"Narichten to söken. Wenn aktiveert, arbeidt de Söökdialoog bannig fix un de "
-"Söökbalken söcht Narichten na ehr Inholden ut.</p>"
-"<p>Dat bruukt aver ok en heel Deel Platz op de Fastplaat (so üm den halven "
-"Platz as de Narichten bruukt).</p>"
-"<p>Wenn Du dat anmaakst, mutt toeerst de Index opbuut warrn, Du kannst KMail "
-"aver wiederbruken, wielt disse Akschoon in den Achtergrund löppt.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt>Vulltextindizeren maakt dat mööglich, bannig gau binnen den Inholt vun "
+"Dien Narichten to söken. Wenn aktiveert, arbeidt de Söökdialoog bannig fix "
+"un de Söökbalken söcht Narichten na ehr Inholden ut.</p><p>Dat bruukt aver "
+"ok en heel Deel Platz op de Fastplaat (so üm den halven Platz as de "
+"Narichten bruukt).</p><p>Wenn Du dat anmaakst, mutt toeerst de Index opbuut "
+"warrn, Du kannst KMail aver wiederbruken, wielt disse Akschoon in den "
+"Achtergrund löppt.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2850,8 +2818,8 @@ msgstr "&Arbeitkoppel-Ornern versteken"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Wenn aktiveert, warrt de IMAP-Ressourceornern nich binnen den Ornerboom wiest"
 
@@ -2861,8 +2829,8 @@ msgstr "För dit Konto bloots &Arbeitkoppel-Ornern wiesen"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Wenn anmaakt, warrt de normalen Nettpostornern nich binnen den Ornerboom vun "
 "dat Arbeitkoppel-Konto wiest."
@@ -2924,23 +2892,22 @@ msgid ""
 "compatible way."
 msgstr ""
 "Microsoft Outlook hett, wenn dat tosamen mit en Microsoft Exchange Server "
-"bruukt warrt, Problemen bi't Verstahn vun Arbeitkoppel-Nettpost, de langs den "
-"Standard opstellt wöör. Maak dit an, wenn ok MS Exchange Dien "
+"bruukt warrt, Problemen bi't Verstahn vun Arbeitkoppel-Nettpost, de langs "
+"den Standard opstellt wöör. Maak dit an, wenn ok MS Exchange Dien "
 "Arbeitkoppel-Inladen verstahn könen schall."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Bilagen kompatibel to Outlook nömen"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Inladen automaatsch sennen"
@@ -2955,23 +2922,22 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Inladen warrt normalerwies as Bilagen to en Nettbreef sendt. Mit disse "
-"Optschoon warrt de Inladen ansteed binnen den Narichtentext sendt, dat nödig, "
-"wenn Du Inladen un Antwoorden na Microsoft Outlook sennen wullt."
+"Optschoon warrt de Inladen ansteed binnen den Narichtentext sendt, dat "
+"nödig, wenn Du Inladen un Antwoorden na Microsoft Outlook sennen wullt."
 "<br>Wenn Du dit anmaakst, kriggst Du keen Beschrieven mehr, de "
 "Nettpostprogrammen lesen köönt; för Lüüd mit Nettpostprogrammen, de keen "
-"Inladen versteiht, süht de Narichten bannig snaaksch ut."
-"<br>Lüüd, de ehr Nettpostprogramm Inladen versteiht, köönt ok mit disse Inladen "
-"arbeiden.</qt>"
+"Inladen versteiht, süht de Narichten bannig snaaksch ut.<br>Lüüd, de ehr "
+"Nettpostprogramm Inladen versteiht, köönt ok mit disse Inladen arbeiden.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3076,29 +3042,27 @@ msgstr "Wiederledden"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier kannst Du egen Narichtenvörlagen för't Antern oder Wiederledden "
-"tofögen, bewerken oder wegdoon. Egen Vörlagen laat sik över dat Rechtsklickmenü "
-"oder dat Warktüüchbalkenmenü opstellen. Du kannst de Vörlagen ok "
-"Tastkombinatschonen toornen, so dat Du dor gauer mit arbeiden kannst.</p>"
-"<p>Binnen Narichtenvörlagen kannst Du Utwesselbefehlen bruken, de Du eenfach "
-"ingeven oder binnen dat Menü <i>Befehl infögen</i> utsöken kannst.</p>"
-"<p>Dat gifft veer Vörlaagtypen: <i>Antern</i>, <i>Na all antern</i>, <i>"
-"Wiederledden</i> un <i>Allgemeen</i>. De Vörlagen vun den Typ <i>Allgemeen</i> "
-"laat sik för allens bruken, man Du kannst se keen Tastkombinatschoon "
-"toornen.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Hier kannst Du egen Narichtenvörlagen för't Antern oder Wiederledden "
+"tofögen, bewerken oder wegdoon. Egen Vörlagen laat sik över dat "
+"Rechtsklickmenü oder dat Warktüüchbalkenmenü opstellen. Du kannst de "
+"Vörlagen ok Tastkombinatschonen toornen, so dat Du dor gauer mit arbeiden "
+"kannst.</p><p>Binnen Narichtenvörlagen kannst Du Utwesselbefehlen bruken, de "
+"Du eenfach ingeven oder binnen dat Menü <i>Befehl infögen</i> utsöken kannst."
+"</p><p>Dat gifft veer Vörlaagtypen: <i>Antern</i>, <i>Na all antern</i>, "
+"<i>Wiederledden</i> un <i>Allgemeen</i>. De Vörlagen vun den Typ "
+"<i>Allgemeen</i> laat sik för allens bruken, man Du kannst se keen "
+"Tastkombinatschoon toornen.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3115,15 +3079,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3188,8 +3152,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Dat gifft al en Verdeellist mit den Naam <b>%1</b>"
-". Bitte söök en anner Naam ut.</qt>"
+"<qt>Dat gifft al en Verdeellist mit den Naam <b>%1</b>. Bitte söök en anner "
+"Naam ut.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3198,8 +3162,8 @@ msgstr "Bewerken mit:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "KMail kann dat nich rutfinnen, wenn Du den Editor tomaakst. Dormit Di keen "
 "Daten wegkaamt, warrt dat Bewerken vun de Bilaag afbraken."
@@ -3303,8 +3267,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Ole Narichten laat sik nich ut Orner \"%1\" wegdoon: Teelorner \"%2\" lett sik "
-"nich finnen"
+"Ole Narichten laat sik nich ut Orner \"%1\" wegdoon: Teelorner \"%2\" lett "
+"sik nich finnen"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3386,8 +3350,8 @@ msgstr ""
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
 msgstr ""
-"Bitte en Orner utsöken, na den Narichten na dat Enn vun ehr Wohrtiet verschaven "
-"warrt"
+"Bitte en Orner utsöken, na den Narichten na dat Enn vun ehr Wohrtiet "
+"verschaven warrt"
 
 #: expirypropertiesdialog.cpp:168
 msgid "No Folder Selected"
@@ -3399,8 +3363,8 @@ msgid ""
 "Please select a different folder than the current folder to expire message "
 "into."
 msgstr ""
-"Bitte en Orner utsöken, na den Narichten na dat Enn vun ehr Wohrtiet verschaven "
-"warrt"
+"Bitte en Orner utsöken, na den Narichten na dat Enn vun ehr Wohrtiet "
+"verschaven warrt"
 
 #: expirypropertiesdialog.cpp:178
 #, fuzzy
@@ -3460,6 +3424,11 @@ msgstr "Filtern utsöken"
 msgid "Filters"
 msgstr "Filtern"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Heel Text utsöken"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3491,12 +3460,12 @@ msgstr "&Filtervörgäng in't Logbook schrieven"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Hier kannst Du fastleggen, wat Filtervörgäng in't Logbook schreven warrt. "
-"Logbook-Indrääg warrt natürlich bloots schreven un wiest, wenn disse Optschoon "
-"anmaakt is."
+"Logbook-Indrääg warrt natürlich bloots schreven un wiest, wenn disse "
+"Optschoon anmaakt is."
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3512,10 +3481,11 @@ msgstr "Filter&regel-Pröven na't Logbook schrieven"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Du kannst hier fastleggen, woveel bi't Anwennen vun Filtern na't Logbook "
 "schreven warrt. Is disse Optschoon aktiveert, warrt de Enkelheiten för elk "
@@ -3540,15 +3510,15 @@ msgstr "ahn Grenz"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Dat Sammeln vun Logdaten bruukt Spiekerplatz. Hier kannst Du fastleggen, wo "
 "veel Spieker tohööchst bruukt warrn dörv. Bruukt dat Logbook mehr Spieker as "
-"hier angeven, warrt so lang de öllsten Daten wegdaan, bet dat Logbook lütt noog "
-"is."
+"hier angeven, warrt so lang de öllsten Daten wegdaan, bet dat Logbook lütt "
+"noog is."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3558,7 +3528,7 @@ msgstr ""
 "Datei \"%1\" lett sik nich schrieven.\n"
 "De Fehlerbeschrieven is: \"%2\""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail-Fehler"
@@ -3599,14 +3569,14 @@ msgstr "Br&uker-Beteker:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"De Bruker-Beteker is den Bruker sien Anmell-Tekenkeed för den IMAP-Server. Dat "
-"kann eenfach sien Brukernaam oder hele Nettpostadress wesen; an de "
-"Anmell-Tekenkeed för Dien egen Konto op den Server kannst Du sehn, wat richtig "
-"is."
+"De Bruker-Beteker is den Bruker sien Anmell-Tekenkeed för den IMAP-Server. "
+"Dat kann eenfach sien Brukernaam oder hele Nettpostadress wesen; an de "
+"Anmell-Tekenkeed för Dien egen Konto op den Server kannst Du sehn, wat "
+"richtig is."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3657,8 +3627,8 @@ msgstr "Du hest keen Lees-/Schriefverlöven för Dien Affall-Orner."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Informatschoon noch nich vun den Server haalt, bitte bruuk \"Na Nettpost "
 "kieken\"."
@@ -3671,8 +3641,7 @@ msgstr "Fehler: Keen IMAP-Konto angeven för dissen Orner"
 msgid "Connecting to server %1, please wait..."
 msgstr "An't Tokoppeln na Server %1, tööv bitte..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Fehler bi't Tokoppeln na Server %1"
@@ -3700,11 +3669,11 @@ msgstr "Verlöven tofögen"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Wullt Du redig Dien egen Verlöven fö dissen Orner wegdoon? Du kannst denn nich "
-"mehr op em togriepen."
+"Wullt Du redig Dien egen Verlöven fö dissen Orner wegdoon? Du kannst denn "
+"nich mehr op em togriepen."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3735,7 +3704,7 @@ msgstr "Bruuk:"
 msgid "Select Folder"
 msgstr "Orner utsöken"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale Ornern"
@@ -3759,9 +3728,9 @@ msgstr "Tastkombinatschoon för Orner utsöken"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Wenn Du den aktuellen Orner en Tast oder en Kombinatschoon vun Tasten "
 "toornen wullt, klick op den Knoop nerrn un drück denn de Tast(en), de Du för "
@@ -3786,13 +3755,22 @@ msgstr "&Afbreken"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>De Orner, den Du wegdaan hest, höör dat Konto <b>%1</b> "
-"to, för dat de Nettpost dor binnen afleggt wöör. För dit Konto wöör de Orner "
-"för't Aflevern vun Nettpost op den Hööft-Postingang torüchsett.</qt>"
+"<qt>De Orner, den Du wegdaan hest, höör dat Konto <b>%1</b> to, för dat de "
+"Nettpost dor binnen afleggt wöör. För dit Konto wöör de Orner för't Aflevern "
+"vun Nettpost op den Hööft-Postingang torüchsett.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Tosamen: %2<br>Nich leest: %3<br>Grött: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Bruukgrenz: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3916,71 +3894,17 @@ msgstr "Warven-Status:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>N"
-"<br>a"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br>-<br>N<br>a<br>r<br>i<br>c<br>h<br>t</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>K"
-"<br>e"
-"<br>e"
-"<br>n"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>N"
-"<br>a"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>K<br>e<br>e<br>n<br> <br>H<br>T<br>M<br>L<br>-"
+"<br>N<br>a<br>r<br>i<br>c<br>h<br>t</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3992,17 +3916,13 @@ msgstr "&Dien Naam:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
-msgstr ""
-"<qt><3>Dien Naam</h3>"
-"<p>Binnen dit Feld schull Dien Naam in de Form stahn, as Du em binnen den "
-"Narichtenkopp vun rutgahn Narichten hebben wullt.</p>"
-"<p>Wenn Du hier nix angiffst, warrt Dien Reaalnaam nich opduken, bloots de "
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
+msgstr ""
+"<qt><3>Dien Naam</h3><p>Binnen dit Feld schull Dien Naam in de Form stahn, "
+"as Du em binnen den Narichtenkopp vun rutgahn Narichten hebben wullt.</"
+"p><p>Wenn Du hier nix angiffst, warrt Dien Reaalnaam nich opduken, bloots de "
 "Nettpostadress.</p></qt>"
 
 #: identitydialog.cpp:135
@@ -4011,17 +3931,14 @@ msgstr "Organi&satschoon:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisatschoon</h3>"
-"<p>Hier schull de Naam vun Dien Organisatschoon stahn, wenn Du em binnen den "
-"Kopp vun rutgahn Narichten hebben wullt.</p>"
-"<p>Dat maakt nix (un is ok normaal), wenn Du dit Feld leddig lettst.</p></qt>"
+"<qt><h3>Organisatschoon</h3><p>Hier schull de Naam vun Dien Organisatschoon "
+"stahn, wenn Du em binnen den Kopp vun rutgahn Narichten hebben wullt.</"
+"p><p>Dat maakt nix (un is ok normaal), wenn Du dit Feld leddig lettst.</p></"
+"qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4030,20 +3947,15 @@ msgstr "N&ettpostadress:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Nettpostadress</h3>"
-"<p>Hier schull Dien hele Nettpostadress stahn.</p>"
-"<p>Wenn Du dit Feld leddig lettst oder en Fehler maakst, köönt de Lüüd Di nich "
-"antern.</p></qt>"
+"<qt><h3>Nettpostadress</h3><p>Hier schull Dien hele Nettpostadress stahn.</"
+"p><p>Wenn Du dit Feld leddig lettst oder en Fehler maakst, köönt de Lüüd Di "
+"nich antern.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4052,21 +3964,12 @@ msgstr "N&ettpostadress:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4086,26 +3989,23 @@ msgstr "Dien OpenPGP-Ünnerschriftslötel"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Söök den OpenPGP-Slötel ut, mit den Du Dien Narichten digitaal ünnerschrieven "
-"wullt."
+"Söök den OpenPGP-Slötel ut, mit den Du Dien Narichten digitaal "
+"ünnerschrieven wullt."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mit den OpenPGP-Slötel, den Du hier angiffst, warrt Narichten digitaal "
-"ünnerschreven. Du kannst ok GnuPG-Slötels bruken.</p>"
-"<p>Du kannst dit Feld leddig laten, man denn kann KMail Narichten nich digitaal "
-"mit OpenPGP ünnerschrieven. De normalen Nettpostfunkschonen warrt dor nich vun "
-"anröögt.</p>"
-"<p>Mehr Informatschonen över Slötels findt sik op <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Mit den OpenPGP-Slötel, den Du hier angiffst, warrt Narichten "
+"digitaal ünnerschreven. Du kannst ok GnuPG-Slötels bruken.</p><p>Du kannst "
+"dit Feld leddig laten, man denn kann KMail Narichten nich digitaal mit "
+"OpenPGP ünnerschrieven. De normalen Nettpostfunkschonen warrt dor nich vun "
+"anröögt.</p><p>Mehr Informatschonen över Slötels findt sik op <a>http://www."
+"gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4117,33 +4017,29 @@ msgstr "Dien OpenPGP-Slötel för't Verslöteln"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Söök den OpenPGP-Slötel ut, mit den Narichten för Di sülven verslötelt warrt un "
-"de för de Funkschoon \"Egen apen Slötel bileggen\" binnen den Nettbreef-Editor "
-"bruukt warrt."
+"Söök den OpenPGP-Slötel ut, mit den Narichten för Di sülven verslötelt warrt "
+"un de för de Funkschoon \"Egen apen Slötel bileggen\" binnen den Nettbreef-"
+"Editor bruukt warrt."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Mit den OpenPGP-Slötel, den Du hier angiffst, warrt Narichten för Di sülven "
-"verslötelt, un he warrt för de Funkschoon \"Egen apen Slötel bileggen\" binnen "
-"den Nettbreef-Editor bruukt. Du kannst ok GnuPG-Slötels bruken.</p>"
-"<p>Du kannst dit Feld leddig laten, man KMail kann denn rutgahn Narichten nich "
-"för Di sülven mit OpenPGP verslöteln. De normalen Nettpostfunkschonen warrt dor "
-"nich vun anröögt.</p>"
-"<p>Mehr Informatschonen över Slötels findt sik op <a>http://www.gnupg.org</a>"
-"</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Mit den OpenPGP-Slötel, den Du hier angiffst, warrt Narichten för Di "
+"sülven verslötelt, un he warrt för de Funkschoon \"Egen apen Slötel bileggen"
+"\" binnen den Nettbreef-Editor bruukt. Du kannst ok GnuPG-Slötels bruken.</"
+"p><p>Du kannst dit Feld leddig laten, man KMail kann denn rutgahn Narichten "
+"nich för Di sülven mit OpenPGP verslöteln. De normalen Nettpostfunkschonen "
+"warrt dor nich vun anröögt.</p><p>Mehr Informatschonen över Slötels findt "
+"sik op <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4163,18 +4059,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mit dat S/MIME- (X.509-) Zertifikaat, dat Du hier angiffst, warrt Narichten "
-"digitaal ünnerschreven.</p>"
-"<p>Du kannst dit Feld leddig laten, man KMail kann denn Narichten nich digitaal "
-"mit S/MIME ünnerschrieven. De normalen Nettpostfunkschonen warrt dor nich vun "
-"anröögt.</p></qt>"
+"<qt><p>Mit dat S/MIME- (X.509-) Zertifikaat, dat Du hier angiffst, warrt "
+"Narichten digitaal ünnerschreven.</p><p>Du kannst dit Feld leddig laten, man "
+"KMail kann denn Narichten nich digitaal mit S/MIME ünnerschrieven. De "
+"normalen Nettpostfunkschonen warrt dor nich vun anröögt.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4186,8 +4079,8 @@ msgstr "Dien S/MIME-Zertifikaat för't Verslöteln"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Söök dat S/MIME-Zertifikaat ut, mit dat Narichten för Di sülven verslötelt "
 "warrt un dat för de Funkschoon \"Egen Zertifikaat bileggen\" binnen den "
@@ -4195,20 +4088,18 @@ msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Mit dat S/MIME-Zertifikaat, dat Du hier angiffst, warrt Narichten för Di "
-"sülven verslötelt, un dat warrt för de Funkschoon \"Egen Zertifikaat bileggen\" "
-"binnen den Nettbreef-Editor bruukt.</p>"
-"<p>Du kannst dit Feld leddig laten, man KMail kann denn rutgahn Narichten nich "
-"för Di sülven mit S/MIME verslöteln. De normalen Nettpostfunkschonen warrt dor "
-"nich vun anröögt.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Mit dat S/MIME-Zertifikaat, dat Du hier angiffst, warrt Narichten för "
+"Di sülven verslötelt, un dat warrt för de Funkschoon \"Egen Zertifikaat "
+"bileggen\" binnen den Nettbreef-Editor bruukt.</p><p>Du kannst dit Feld "
+"leddig laten, man KMail kann denn rutgahn Narichten nich för Di sülven mit S/"
+"MIME verslöteln. De normalen Nettpostfunkschonen warrt dor nich vun anröögt."
+"</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4228,24 +4119,20 @@ msgstr "\"&Antern Na\"-Adress:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>\"Antern na\"-Adressen</h3>"
-"<p>Mit dit warrt för den Koppindrag <tt>Antern na:</tt> "
-"en anner Adress insett as för den normalen <tt>Vun:</tt>-Indrag.</p>"
-"<p>Dat kann goot wesen, wenn Du mit en Koppel vun Lüüd tosamenarbeidst, denn "
-"köönt all Dien Narichten Dien Nettpostadress binnen den <tt>Vun:</tt>"
-"-Indrag hebben, wielt de Antwoorden na en Nettpostadress för den Koppel "
-"geiht.</p>"
-"<p>Wenn Du nich seker büst, laat dat Feld leddig.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>\"Antern na\"-Adressen</h3><p>Mit dit warrt för den Koppindrag "
+"<tt>Antern na:</tt> en anner Adress insett as för den normalen <tt>Vun:</tt>-"
+"Indrag.</p><p>Dat kann goot wesen, wenn Du mit en Koppel vun Lüüd "
+"tosamenarbeidst, denn köönt all Dien Narichten Dien Nettpostadress binnen "
+"den <tt>Vun:</tt>-Indrag hebben, wielt de Antwoorden na en Nettpostadress "
+"för den Koppel geiht.</p><p>Wenn Du nich seker büst, laat dat Feld leddig.</"
+"p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4253,26 +4140,20 @@ msgstr "&Blindkopie(\"BCC\")-Adressen:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Blindkopie(\"BCC\")-Adressen</h3>"
-"<p>De Adressen, de Du hier ingiffst, warrt elk rutgahn Naricht toföögt, de Du "
-"över disse Identiteet sennst. För de Adressaten is bloots ehr egen Adress "
-"sichtbor.</p>"
-"<p>Normalerwiese warrt dir Feld dorför bruukt, Kopien vun de rutgahn Narichten "
-"na en anner egen Konto to sennen.</p>"
-"<p>Wenn Du mehr as een Blindkopie-Adressaat angeven wullt, trenn de Adressen "
-"mit Kommas.</p>"
-"<p>Wenn Du nich seker büst, laat dat Feld leddig</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Blindkopie(\"BCC\")-Adressen</h3><p>De Adressen, de Du hier "
+"ingiffst, warrt elk rutgahn Naricht toföögt, de Du över disse Identiteet "
+"sennst. För de Adressaten is bloots ehr egen Adress sichtbor.</"
+"p><p>Normalerwiese warrt dir Feld dorför bruukt, Kopien vun de rutgahn "
+"Narichten na en anner egen Konto to sennen.</p><p>Wenn Du mehr as een "
+"Blindkopie-Adressaat angeven wullt, trenn de Adressen mit Kommas.</p><p>Wenn "
+"Du nich seker büst, laat dat Feld leddig</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4310,7 +4191,7 @@ msgstr "&Signatuur"
 msgid "&Picture"
 msgstr "&Bild"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Leeg Nettpostadress"
 
@@ -4326,18 +4207,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Een vun de instellten OpenPGP-Ünnerschriftslötels bargt keen Bruker-ID mit de "
-"Nettpostadress, de  för disse Identiteet (%1) instellt is.\n"
+"Een vun de instellten OpenPGP-Ünnerschriftslötels bargt keen Bruker-ID mit "
+"de Nettpostadress, de  för disse Identiteet (%1) instellt is.\n"
 "Ünnerschriften, de mit de disse Instellen opstellt warrt, köönt bi de "
 "Adressaten bi't Pröven vun de Ünnerschrift to Wohrschoen föhren."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Een vun de instellten OpenPGP-Slötels för't Verslöteln bargt keen Bruker-ID mit "
-"de Nettpostadress, de för disse Identiteet (%1) instellt is."
+"Een vun de instellten OpenPGP-Slötels för't Verslöteln bargt keen Bruker-ID "
+"mit de Nettpostadress, de för disse Identiteet (%1) instellt is."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4346,8 +4227,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Een vun de instellten S/MIME-Ünnerschriftzertifikaten bargt de Nettpostadress "
-"nich, de för disse Identiteet (%1) instellt is.\n"
+"Een vun de instellten S/MIME-Ünnerschriftzertifikaten bargt de "
+"Nettpostadress nich, de för disse Identiteet (%1) instellt is.\n"
 "Ünnerschriften, de mit de disse Instellen opstellt warrt, köönt bi de "
 "Adressaten bi't Pröven vun de Ünnerschrift to Wohrschoen föhren."
 
@@ -4393,13 +4274,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Dat gifft den Orner för de egen Vörlagen för de Identiteet \"%1\" nich (mehr), "
-"ansteed warrt de Standard-Vörlagenorner bruukt."
+"Dat gifft den Orner för de egen Vörlagen för de Identiteet \"%1\" nich "
+"(mehr), ansteed warrt de Standard-Vörlagenorner bruukt."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Standard)"
 
@@ -4443,24 +4324,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail hett binnen de Instellen för dat Konto \"%1\" en Prefix-Indrag funnen, de "
-"mit de Ünnerstütten vun IMAP-Naamrüüm nich mehr nödig is."
+"KMail hett binnen de Instellen för dat Konto \"%1\" en Prefix-Indrag funnen, "
+"de mit de Ünnerstütten vun IMAP-Naamrüüm nich mehr nödig is."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "De Konto-Instellen wöörn automaatsch ännert, bitte prööv, wat allens richtig "
 "is."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Dat weer nich mööglich, Dien Konto-Instellen automaatsch to ännern, bitte prööv "
-"se vun Hand."
+"Dat weer nich mööglich, Dien Konto-Instellen automaatsch to ännern, bitte "
+"prööv se vun Hand."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4475,8 +4356,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"De Naricht vun den %1 vun <i>%2</i> mit den Bedraap <i>%3</i> "
-"lett sik nich na den Server hoochladen."
+"De Naricht vun den %1 vun <i>%2</i> mit den Bedraap <i>%3</i> lett sik nich "
+"na den Server hoochladen."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4497,20 +4378,25 @@ msgstr "De Orner is to dicht bi sien Bruukgrenz (%1)."
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Du hest för dissen Orner keen Schriefverlöven. Fraag bitte em sien Eegner, wat "
-"he dor en beten Platz binnen freemaken deit."
+"Du hest för dissen Orner keen Schriefverlöven. Fraag bitte em sien Eegner, "
+"wat he dor en beten Platz binnen freemaken deit."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Fehler: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"De Verbinnen na den Server %1 wöör afbraken oder de Tiet is för ehr aflopen. Se "
-"warrt automaatsch wedder herstellt, wenn mööglich."
+"De Verbinnen na den Server %1 wöör afbraken oder de Tiet is för ehr aflopen. "
+"Se warrt automaatsch wedder herstellt, wenn mööglich."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4586,8 +4472,8 @@ msgstr "Keen Orner utsöcht"
 #, fuzzy
 msgid "Please select the folder where the archive should be imported to."
 msgstr ""
-"Bitte en Orner utsöken, na den Narichten na dat Enn vun ehr Wohrtiet verschaven "
-"warrt"
+"Bitte en Orner utsöken, na den Narichten na dat Enn vun ehr Wohrtiet "
+"verschaven warrt"
 
 #: importarchivedialog.cpp:94
 #, fuzzy
@@ -4661,20 +4547,20 @@ msgstr "Archiev vun de List"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Een oder mehr vun Dien instellten OpenPGP-Verslötelslötels oder "
-"S/MIME-Zertifikaten warrt för't verslöteln nich heel troot."
+"Een oder mehr vun Dien instellten OpenPGP-Verslötelslötels oder S/MIME-"
+"Zertifikaten warrt för't verslöteln nich heel troot."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Een oder mehr vun Dien instellten OpenPGP-Verslötelslötels oder "
-"S/MIME-Zertifikaten warrt för't verslöteln nich heel troot."
+"Een oder mehr vun Dien instellten OpenPGP-Verslötelslötels oder S/MIME-"
+"Zertifikaten warrt för't verslöteln nich heel troot."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4708,224 +4594,182 @@ msgstr "Verslötelslötels warrt bloots deelwies troot"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> (Slötel-ID 0x"
+"%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> (Slötel-ID 0x"
+"%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> (Slötel-"
+"ID 0x%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> (Slötel-"
+"ID 0x%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Ünnerschriftzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Ünnerschriftzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för dat S/MIME-"
+"Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>löppt in "
+"weniger as een Dag af.</p>\n"
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för dat S/MIME-"
+"Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>löppt in "
+"weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
+"(Seriennummer %2)</p><p>löppt in weniger as een Dag af.</p>\n"
 "<p>Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"(Seriennummer %2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
+"(Seriennummer %2)</p><p>löppt in weniger as een Dag af.</p>\n"
 "<p>Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"(Seriennummer %2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4939,213 +4783,171 @@ msgstr "S/MIME-Zertifikaat löppt neegst af"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> (Slötel-ID 0x"
+"%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dien OpenPGP-Ünnerschriftslötel</p><p align=center><b>%1</b> (Slötel-ID 0x"
+"%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> "
-"(Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> (Slötel-"
+"ID 0x%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dien OpenPGP-Slötel för't Verslöteln</p><p align=center><b>%1</b> (Slötel-"
+"ID 0x%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>De OpenPGP-Slötel för</p><p align=center><b>%1</b> (Slötel-ID 0x%2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Ünnerschriftzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Ünnerschriftzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för Dien S/MIME-"
+"Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för dat S/MIME-"
+"Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>löppt in "
+"weniger as een Dag af.</p>\n"
+"<p>Dat Wörtelzertifikaat</p><p align=center><b>%3</b></p><p>för dat S/MIME-"
+"Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p><p>löppt in "
+"weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
+"(Seriennummer %2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p>"
-"<p>för dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat ZA-Twischenstoopzertifikaat</p><p align=center><b>%3</b></p><p>för "
+"dat S/MIME-Zertifikaat</p><p align=center><b>%1</b> (Seriennummer %2)</"
+"p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
+"(Seriennummer %2)</p><p>löppt in weniger as een Dag af.</p>\n"
 "<p>Dien S/MIME-Ünnerschriftzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"(Seriennummer %2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
+"(Seriennummer %2)</p><p>löppt in weniger as een Dag af.</p>\n"
 "<p>Dien S/MIME-Verslötelzertifikaat</p><p align=center><b>%1</b> "
-"(Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"(Seriennummer %2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as een Dag af.</p>\n"
-"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer %2)</p>"
-"<p>löppt in weniger as %n Daag af.</p>"
+"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as een Dag af.</p>\n"
+"<p>Dat S/MIME-Zertifikaat för</p><p align=center><b>%1</b> (Seriennummer "
+"%2)</p><p>löppt in weniger as %n Daag af.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5157,17 +4959,18 @@ msgstr "S/MIME-Zertifikaat löppt neegst af"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Een oder mehr vun Dien instellte OpenPGP-Slötels oder S/MIME-Zertifikaten is "
-"för't Verslöteln nich to bruken. Bitte prööv Dien Slötels un Zertifikaten för "
-"disse Identiteet binnen den Instellen-Dialoog.\n"
-"Wenn Du liekers wiedermaakst, warrst Du na de Slötels fraagt, de bruukt warrn "
-"schöölt, wenn dat nödig deiht."
+"för't Verslöteln nich to bruken. Bitte prööv Dien Slötels un Zertifikaten "
+"för disse Identiteet binnen den Instellen-Dialoog.\n"
+"Wenn Du liekers wiedermaakst, warrst Du na de Slötels fraagt, de bruukt "
+"warrn schöölt, wenn dat nödig deiht."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5182,10 +4985,10 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Een oder mehr vun Dien instellte OpenPGP-Slötels oder S/MIME-Zertifikaten is "
-"för't Ünnerschrieven nich to bruken. Bitte prööv Dien Slötels un Zertifikaten "
-"för disse Identiteet binnen den Instellen-Dialoog.\n"
-"Wenn Du liekers wiedermaakst, warrst Du na de Slötels fraagt, de bruukt warrn "
-"schöölt, wenn dat nödig deiht."
+"för't Ünnerschrieven nich to bruken. Bitte prööv Dien Slötels un "
+"Zertifikaten för disse Identiteet binnen den Instellen-Dialoog.\n"
+"Wenn Du liekers wiedermaakst, warrst Du na de Slötels fraagt, de bruukt "
+"warrn schöölt, wenn dat nödig deiht."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5195,15 +4998,15 @@ msgstr "Ünnerschriftslötels nich to bruken"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Dien Verslötelinstellen för de Adressaten maakt dat nödig, de Naricht mit "
 "OpenPGP to verslöteln, tominnst för en poor Adressaten.\n"
-"För disse Identiteet is aver keen gellen OpenPGP-Verslötelslötel instellt, den "
-"troot warrt.\n"
+"För disse Identiteet is aver keen gellen OpenPGP-Verslötelslötel instellt, "
+"den troot warrt.\n"
 "Du kannst wiedermaken, ahn de Naricht för Di sülven to verslöteln, man denn "
 "kannst Du Dien egen Naricht nich lesen."
 
@@ -5211,21 +5014,22 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Dien Verslötelinstellen för de Adressaten maakt dat nödig, de Naricht mit "
-"S/MIME to verslöteln, tominnst för en poor Adressaten.\n"
-"För disse Identiteet is aver keen gellen S/MIME-Verslötelzertifikaat instellt.\n"
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Dien Verslötelinstellen för de Adressaten maakt dat nödig, de Naricht mit S/"
+"MIME to verslöteln, tominnst för en poor Adressaten.\n"
+"För disse Identiteet is aver keen gellen S/MIME-Verslötelzertifikaat "
+"instellt.\n"
 "Du kannst wiedermaken, ahn de Naricht för Di sülven to verslöteln, man denn "
 "kannst Du Dien egen Naricht nich lesen."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5239,8 +5043,8 @@ msgstr "Nich mit OpenPGP ünnerschrieven"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5259,8 +5063,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Du hest keen Ünnerschriftslötels för den Ünnerschrifttyp verföögbor, de för den "
-"Adressaat instellt is.\n"
+"Du hest keen Ünnerschriftslötels för den Ünnerschrifttyp verföögbor, de för "
+"den Adressaat instellt is.\n"
 "Naricht ahn Ünnerschrift sennen?"
 
 #: keyresolver.cpp:1335
@@ -5269,11 +5073,11 @@ msgstr "Ünnerschrieven nich mööglich"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Du hest keen Slötel för't Verslöteln för Di sülven utsöcht. Du kannst so Dien "
-"egen Naricht nich wedder opslöteln, wenn Du ehr verslötelst."
+"Du hest keen Slötel för't Verslöteln för Di sülven utsöcht. Du kannst so "
+"Dien egen Naricht nich wedder opslöteln, wenn Du ehr verslötelst."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5294,8 +5098,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Du hest för keeneen vun de Adressaten vun disse Naricht en Verslötelslötel "
 "utsöcht, dorför warrt de Naricht nich verslötelt."
@@ -5344,11 +5148,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "För \"%1\" lett sik keen gellen Verslötelslötel finnen, den troot warrt.\n"
 "\n"
@@ -5397,10 +5201,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Swoor Fehler! Nettpost lett sik nich halen: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Fehler bi't Tofögen vun de Naricht:\n"
+msgid "Failed to add message:\n"
+msgstr "Fehler bi't Tofögen vun de Naricht:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5490,6 +5292,51 @@ msgstr "&Nich tokoppelt IMAP"
 msgid "&Maildir mailbox"
 msgstr "Nettpost&orner-Postfach"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Bedraap vun de Naricht fastleggen"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Kopie na \"Adress\" sennen"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Blindkopie na \"Adress\" sennen"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "\"Koppreeg\" de Naricht tofögen"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Hööftdeel ut \"Datei\" lesen"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Hööftdeel vun de Naricht fastleggen"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "De Naricht en Bilaag tofögen. Kann wedderhaalt warrn."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Bloots na niege Post kieken"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Bloots den Nettbreefeditor opmaken"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Angeven Narichtdatei ankieken"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Naricht na \"Adress\" sennen, un de Datei bileggen, op de \"URL\" wiest"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Nettpost"
@@ -5543,18 +5390,18 @@ msgstr "%1: Orner leet sik nich finnen, he warrt nu opstellt."
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
-"%1: Orner \"%2\" funnen. He warrt as Hööftorner för den Arbeitkoppel fastleggt."
+"%1: Orner \"%2\" funnen. He warrt as Hööftorner för den Arbeitkoppel "
+"fastleggt."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail hett disse Arbeitkoppel-Ornern binnen \"%1\" funnen un mutt nu disse "
-"Akschonen utföhren: %2"
-"<br>Wenn Du dat nich wullt, klick op \"Afbreken\", de IMAP-Ressource warrt denn "
-"utmaakt."
+"<qt>KMail hett disse Arbeitkoppel-Ornern binnen \"%1\" funnen un mutt nu "
+"disse Akschonen utföhren: %2<br>Wenn Du dat nich wullt, klick op \"Afbreken"
+"\", de IMAP-Ressource warrt denn utmaakt."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5602,11 +5449,11 @@ msgstr "URL na Twischenaflaag kopeert."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Dat gifft de Datei <b>%1</b> al. Wullt Du ehr överschrieven?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "As Datei sekern"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Ö&verschrieven"
 
@@ -5624,7 +5471,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "De Naricht wöör wielt dat Sekern wegmaakt. Se wöör nich sekert."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5644,11 +5491,11 @@ msgstr "Binnen de Datei gifft dat keen Naricht."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "De Datei bargt mehr as een Naricht, bloots de eerste warrt wiest."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5658,85 +5505,85 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Narichten warrt filtert"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Naricht %1 vun %2 warrt filtert"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Nich noog free Platz op de Fastplaat?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Na dissen Orner verschuven"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Na dissen Orner koperen"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Schaadhaftig IMAP-Twischenspieker binnen Orner \"%1\" funnen. Koperen vun "
 "Narichten afbraken."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Narichten warrt verschaven"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Narichten warrt wegdaan"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL warrt opmaakt..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Wullt Du <b>%1</b> redig utföhren?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Utföhren"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Keen Bilagen för't Sekern funnen."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Bilagen sekern as"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "bilaag.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "bilaag.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Dat gifft al en Datei mit den Naam \"%1\". Wullt Du ehr överschrieven?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Gifft Datei al"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Ö&verschrieven"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5744,19 +5591,19 @@ msgstr ""
 "De Deel %1 vun de Naricht is verslötelt. Wullt Du de Verslöteln bi't Sekern "
 "wohren?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-Fraag"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Verslöteln wohren"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Nich wohren"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5764,11 +5611,11 @@ msgstr ""
 "De Deel %1 vun de Naricht is ünnerschreven. Wullt Du de Ünnerschrift bi't "
 "Sekern wohren?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Ünnerschrift wohren"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5777,22 +5624,22 @@ msgstr ""
 "De Datei \"%1\" lett sik nich schrieven:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "De Datei \"%1\" lett sik nich schrieven."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Dat gifft för disse Nettpostadress keen Adressbook-Indrag. Föög ehr na dat "
-"Adressbook to, denn kannst Du later Kortnarichten-Adressen mit Dien vörtrocken "
-"Kortnarichten-Programm tofögen."
+"Adressbook to, denn kannst Du later Kortnarichten-Adressen mit Dien "
+"vörtrocken Kortnarichten-Programm tofögen."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5802,71 +5649,72 @@ msgstr ""
 " %1\n"
 " Dat lett sik nich utmaken, mit wokeen Du klönen wullt."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Dat Programm \"Chiasmus\" beedt de Funkschoon \"x-obtain-keys\" nich an. Bitte "
-"bericht dissen Fehler."
+"Dat Programm \"Chiasmus\" beedt de Funkschoon \"x-obtain-keys\" nich an. "
+"Bitte bericht dissen Fehler."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus-Programmfehler"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Dat Programm Chiasmus hett en nich verwacht Weert torüchgeven. De Funkschoon "
-"\"x-obtain-keys\" hett keen Tekenkedenlist levert. Bitte bericht dissen Fehler."
+"\"x-obtain-keys\" hett keen Tekenkedenlist levert. Bitte bericht dissen "
+"Fehler."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Keen Slötels funnen. Prööv bitte, wat en gellen Padd na de Slötels binnen de "
 "Instellen vun Chiasmus fastleggt is."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Opslötelslötel vun Chaismus utsöken"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Dat Programm \"Chiasmus\" beedt de Funkschoon \"x-decrypt\" nich an. Bitte "
 "bericht dissen Fehler."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"De Funkschoon \"x-decrypt\" nimmt anner Parameters an as verwacht wöör. Bitte "
-"bericht dissen Fehler."
+"De Funkschoon \"x-decrypt\" nimmt anner Parameters an as verwacht wöör. "
+"Bitte bericht dissen Fehler."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus-Fehler bi't Opslöteln"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Nich verwacht Torüchgaav vun dat Programm \"Chiasmus\". De Funkschoon "
-"\"x-decrypt\" hett keen Bytefeld levert. Bitte bericht dissen Fehler."
+"Nich verwacht Torüchgaav vun dat Programm \"Chiasmus\". De Funkschoon \"x-"
+"decrypt\" hett keen Bytefeld levert. Bitte bericht dissen Fehler."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5876,7 +5724,7 @@ msgstr ""
 "Na: %2\n"
 "Bedraap: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Nettbreef: %1"
@@ -5975,7 +5823,7 @@ msgstr "Grött"
 msgid "Encoding"
 msgstr "Koderen"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimeren"
 
@@ -5987,7 +5835,7 @@ msgstr "Verslöteln"
 msgid "Sign"
 msgstr "Ünnerschrieven"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Naam vun de Bilaag:"
 
@@ -6009,7 +5857,8 @@ msgstr "Hööftadressaten"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>En Kopie vun de Naricht warrt na de Nettpostadressen sendt, de hier "
 "indragen sünd.</qt>"
@@ -6021,14 +5870,14 @@ msgstr "Anner Adressaten"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>En Kopie vun de Naricht warrt na de Nettpostadressen sendt, de hier "
-"indragen sünd. Technisch is dat dat sülve, as all Adressen na dat <b>Vun:</b>"
-"-Feld rintoschrieven, man de Bruuk vun dit Feld maakt kloor, dat de "
-"Kopie-Adressaat en Mitleser is, nich de Hööftadressaat.</qt>"
+"indragen sünd. Technisch is dat dat sülve, as all Adressen na dat <b>Vun:</"
+"b>-Feld rintoschrieven, man de Bruuk vun dit Feld maakt kloor, dat de Kopie-"
+"Adressaat en Mitleser is, nich de Hööftadressaat.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6036,9 +5885,8 @@ msgstr "Versteken Adressaten"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>Meist dat sülve as dat <b>Kopie</b>-Feld, bloots kriegt de annern "
 "Adressaten nich to sehn, wokeen en Blindkopie kriggt.</qt>"
@@ -6051,7 +5899,7 @@ msgstr "Nettbreef &sennen"
 msgid "&Send Mail Via"
 msgstr "Nettbreef &sennen över"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&Later sennen"
@@ -6116,8 +5964,7 @@ msgstr "Zi&taatmark wegdoon"
 msgid "Cl&ean Spaces"
 msgstr "Twischenrü&üm kloormaken"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Fastbreed Schriftoort bruken"
@@ -6258,31 +6105,31 @@ msgstr "Verslötel&formaat"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Pünkt-List (Schiev)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Pünkt-List (Krink)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Pünkt-List (Rechteck)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Ornt List (Dezimaal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Ornt List (Lüttbookstaven)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Ornt List (Grootbookstaven)"
 
@@ -6366,7 +6213,8 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Sekert disse Naricht binnen den Vörlagenorner, Du kannst ehr denn later bruken."
+"Sekert disse Naricht binnen den Vörlagenorner, Du kannst ehr denn later "
+"bruken."
 
 #: kmcomposewin.cpp:2257
 msgid ""
@@ -6386,63 +6234,63 @@ msgstr "Editor tomaken"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Binnen Dien Naricht gifft dat Henwiesen, dat Du en Datei bileggen wullst, man "
-"bileggt is dor nix.\n"
+"Binnen Dien Naricht gifft dat Henwiesen, dat Du en Datei bileggen wullst, "
+"man bileggt is dor nix.\n"
 "Wullt Du de Naricht en Datei bileggen?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Bilagen-Anstoot"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Ahn Ännern &sennen"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>De Bilaag (%1) lett sik nich finnen.</p>"
-"<p>Wenn Du en Datei bileggen wullt, muttst Du ehr helen Padd angeven.</p></qt>"
+"<qt><p>De Bilaag (%1) lett sik nich finnen.</p><p>Wenn Du en Datei bileggen "
+"wullt, muttst Du ehr helen Padd angeven.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Dien Systeempleger seggt Nee to't Bileggen vun Dateien grötter as %1 MB.</p>"
+"<qt><p>Dien Systeempleger seggt Nee to't Bileggen vun Dateien grötter as %1 "
+"MB.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Datei bileggen"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Bileggen"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Datei infögen"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Datei infögen"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dat geev en Fehler bi't Exporteren vun den Slötel ut dat Hülpprogramm:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Dat geev en Fehler bi't Exporteren vun den Slötel ut dat Hülpprogramm:"
+"</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6481,99 +6329,110 @@ msgid ""
 "View"
 msgstr "Ankieken"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Bewerken..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Bewerken mit..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Sekern &as..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Egenscha&ppen"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Bilaag tofögen..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "De Datei lett sik nich komprimeren."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"De komprimeerte Datei is grötter as dat Orginaal. Wullt Du dat Orginaal bruken?"
+"De komprimeerte Datei is grötter as dat Orginaal. Wullt Du dat Orginaal "
+"bruken?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Jo"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "De Datei lett sik nich dekomprimeren."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Bilaag sekern as"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "As Text tofögen"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "As Bilaag tofögen"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
-"Söök bitte ut, wat Du den Inholt as Text na den Editor infögen oder de angeven "
-"Datei bileggen wullt."
+"Söök bitte ut, wat Du den Inholt as Text na den Editor infögen oder de "
+"angeven Datei bileggen wullt."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "As Bilaag oder Text infögen?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ahn Naam"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Du hest instellt, dat Narichten ok för Di sülven verslötelt warrn schöölt, "
-"man för de aktuelle Identiteet is dor keen OpenPGP- oder S/MIME-Verslötelslötel "
-"för angeven.</p>"
-"<p>Söök de Slötels, de Du bruken wullt, bitte binnen de Identiteet-Instellen "
-"ut.</p>"
+"<qt><p>Du hest instellt, dat Narichten ok för Di sülven verslötelt warrn "
+"schöölt, man för de aktuelle Identiteet is dor keen OpenPGP- oder S/MIME-"
+"Verslötelslötel för angeven.</p><p>Söök de Slötels, de Du bruken wullt, "
+"bitte binnen de Identiteet-Instellen ut.</p>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Keen Slötel för't Verslöteln angeven"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wenn Du disse Naricht ünnerschrieven wullt, muttst Du toeerst den "
-"Ünnerschriftslötel (OpenPGP oder S/MIME) angeven, den Du bruken wullt.</p>"
-"<p>Söök den Slötel, den Du bruken wullt, bitte binnen de Identiteet-Instellen "
-"ut.</p>"
+"<qt><p>Wenn Du disse Naricht ünnerschrieven wullt, muttst Du toeerst den "
+"Ünnerschriftslötel (OpenPGP oder S/MIME) angeven, den Du bruken wullt.</"
+"p><p>Söök den Slötel, den Du bruken wullt, bitte binnen de Identiteet-"
+"Instellen ut.</p>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Keen Ünnerschriftslötel angeven"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6581,200 +6440,197 @@ msgstr ""
 "Opstunns is KMail in Afkoppelbedrief; Dien Narichten warrt binnen den "
 "Postutgang wohrt, bet Du Di wedder tokoppelst."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "To-/Afkoppelt"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Du muttst Dien Nettpostadress in dat \"Vun:\"-Feld ingeven. Du kunnst ok Dien "
-"Nettpostadressen för all Identiteten fastleggen, denn bruukst Du ehr nich för "
-"elk Naricht nieg ingeven."
+"Du muttst Dien Nettpostadress in dat \"Vun:\"-Feld ingeven. Du kunnst ok "
+"Dien Nettpostadressen för all Identiteten fastleggen, denn bruukst Du ehr "
+"nich för elk Naricht nieg ingeven."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Du muttst tominnst een Adressaat binnen de Feller \"Na:\", \"Kopie:\" oder "
 "\"Blindkopie:\" angeven."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Dat Feld \"Na:\" is leddig. Wullt Du de Naricht liekers sennen?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Keen Adressaat angeven"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du hest keen Bedraap angeven. Wullt Du de Naricht liekers sennen?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Keen Bedraap angeven"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Ahn Ännern s&ennen"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Bedraap angeven"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Formateren &wohren, nich ünnerschrieven/verslöteln"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Formateren &wohren, nich verslöteln"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Formateren &wohren, nich ünnerschrieven"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Ünnerschrieven/verslöteln (Formateren wegdoon)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Verslöteln (Formateren wegdoon)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Ünnerschrieven (Formateren wegdoon)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dat Ünnerschrieven/Verslöteln binnen den Hööftdeel is för HTML-Narichten "
-"nich mööglich.</p>"
-"<p>Wullt Du de HTML-Formateren wegdoon?</p></qt>"
+"<qt><p>Dat Ünnerschrieven/Verslöteln binnen den Hööftdeel is för HTML-"
+"Narichten nich mööglich.</p><p>Wullt Du de HTML-Formateren wegdoon?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Naricht ünnerschrieven/verslöteln?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 "Dat gifft den Orner för egen Vörlagen oder nich fardige Narichten för de "
-"Identiteet \"%1\" nich (mehr), ansteed warrt de Standardorner för Vörlagen oder "
-"nich fardige Narichten bruukt."
+"Identiteet \"%1\" nich (mehr), ansteed warrt de Standardorner för Vörlagen "
+"oder nich fardige Narichten bruukt."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Stell bitte en Konto för rutgahn Narichten op un versöök dat nochmaal."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Naricht warrt neegst sendt..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Bescheed sennen"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Nu &sennen"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Keen Adressaten"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Anner Adressaten"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Klookschriever: An"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Klookschriever: Ut"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Schriefwies-Prööv afbraken."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Schriefwies-Prööv anhollen."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Schriefwies-Prööv beendt."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Klookschriever"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Bitte richt toeerst en Verslötel-Moduul för de Chiasmus-Verslöteln in.\n"
 "Dat kannst Du doon binnen den Instellendialoog ünner \"Sekerheit\" -> "
 "\"Verslötel-Modulen\"."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 "As dat lett wöör \"libkleopatra\" ahn Ünnerstütten för Chiasmus kompileert. "
-"Kompileer \"libkleopatra\" mit de Optschoon \"--enable-chiasmus\" nieg, wenn Du "
-"dat richten wullt."
+"Kompileer \"libkleopatra\" mit de Optschoon \"--enable-chiasmus\" nieg, wenn "
+"Du dat richten wullt."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Keen Chiasmus-Moduul angeven"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Keen Chiasmus-Slötels funnen"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus-Verslötelslötel utsöken"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Naricht warrt ünnerschreven"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Naricht warrt nich ünnerschreven"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Naricht warrt verslötelt"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Naricht warrt nich verslötelt"
 
@@ -6824,8 +6680,8 @@ msgstr "Klookschriever - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell lett sik nich starten. Bitte prööv, wat ISpell oder Aspell "
 "richtig installeert is un sik över Dien PATH-Variable finnen lett."
@@ -6861,12 +6717,10 @@ msgstr "<qt>To vele Filterakschonen binnen Filterregel <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Nich bekannt Filterakschoon <b>%1</b>"
-"<br>in Filterregel <b>%2</b>."
+"<qt>Nich bekannt Filterakschoon <b>%1</b><br>in Filterregel <b>%2</b>."
 "<br>Warrt övergahn.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7087,160 +6941,132 @@ msgstr "Klang afspelen:"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dit is de List vun inricht Filtern, se warrt vun baven na nerrn "
-"afarbeidt.</p>"
-"<p>Wenn Du en Filter bewerken wullt, klick op em un bruuk de Knööp binnen de "
-"rechte Half vun den Dialoog.</p></qt>"
+"<qt><p>Dit is de List vun inricht Filtern, se warrt vun baven na nerrn "
+"afarbeidt.</p><p>Wenn Du en Filter bewerken wullt, klick op em un bruuk de "
+"Knööp binnen de rechte Half vun den Dialoog.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du en niegen Filter opstellen wullt.</p>"
-"<p>De Filter warrt direktemang vör den inföögt, de jüst markeert is, man Du "
-"kannst em sien Positschoon jümmers ok later noch ännern.</p>"
-"<p>Wenn Du op dissen Knoop klickt hest, ahn dat redig to wullen, kannst Du "
-"eenfach op den <em>Wegdoon</em>-Knoop klicken.</p></qt>"
+"<qt><p>Klick op dissen Knoop, wenn Du en niegen Filter opstellen wullt.</"
+"p><p>De Filter warrt direktemang vör den inföögt, de jüst markeert is, man "
+"Du kannst em sien Positschoon jümmers ok later noch ännern.</p><p>Wenn Du op "
+"dissen Knoop klickt hest, ahn dat redig to wullen, kannst Du eenfach op den "
+"<em>Wegdoon</em>-Knoop klicken.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du en Filter koperen wullt.</p>"
-"<p>Wenn Du op dissen Knoop klickt hest, ahn dat redig to wullen, kannst Du "
-"eenfach op den <em>Wegdoon</em>-Knoop klicken.</p></qt>"
+"<qt><p>Klick op dissen Knoop, wenn Du en Filter koperen wullt.</p><p>Wenn Du "
+"op dissen Knoop klickt hest, ahn dat redig to wullen, kannst Du eenfach op "
+"den <em>Wegdoon</em>-Knoop klicken.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter ut de List "
-"baven <em>wegdoon</em> wullt.</p>"
-"<p>Wenn Du en Filter wegdaan hest, kannst Du em nich mehr wedderhalen, man wenn "
-"Du op <em>Afbreken</em> klickst, warrt Dien Ännern nich övernahmen.</p></qt>"
+"<qt><p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter ut de "
+"List baven <em>wegdoon</em> wullt.</p><p>Wenn Du en Filter wegdaan hest, "
+"kannst Du em nich mehr wedderhalen, man wenn Du op <em>Afbreken</em> "
+"klickst, warrt Dien Ännern nich övernahmen.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen de List "
-"baven <em>heel na baven</em> schuven wullt.</p>"
-"<p>De Filtern binnen de List warrt vun baven na nerrn op de Narichten anwendt, "
-"ehr Reeg scheelt also wat. De böverste Filter warrt toeerst versöcht.</p></qt>"
+"<qt><p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen "
+"de List baven <em>heel na baven</em> schuven wullt.</p><p>De Filtern binnen "
+"de List warrt vun baven na nerrn op de Narichten anwendt, ehr Reeg scheelt "
+"also wat. De böverste Filter warrt toeerst versöcht.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen de List "
-"baven na <em>baven</em> schuven wullt.</p>"
-"<p>De Filtern warrt vun baven na nerrn afarbeidt, ehr Reeg scheelt also wat.</p>"
-"<p>Wenn Du op dissen Knoop klickt hest, ahn dat redig to wullen, kannst Du "
-"eenfach op den <em>Na nerrn</em>-Knoop klicken.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen "
+"de List baven na <em>baven</em> schuven wullt.</p><p>De Filtern warrt vun "
+"baven na nerrn afarbeidt, ehr Reeg scheelt also wat.</p><p>Wenn Du op dissen "
+"Knoop klickt hest, ahn dat redig to wullen, kannst Du eenfach op den <em>Na "
+"nerrn</em>-Knoop klicken.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen de List "
-"baven na <em>nerrn</em> schuven wullt.</p>"
-"<p>De Filtern warrt vun baven na nerrn afarbeidt, ehr Reeg scheelt also wat.</p>"
-"<p>Wenn Du op dissen Knoop klickt hest, ahn dat redig to wullen, kannst Du "
-"eenfach op den <em>Na baven</em>-Knoop klicken.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen "
+"de List baven na <em>nerrn</em> schuven wullt.</p><p>De Filtern warrt vun "
+"baven na nerrn afarbeidt, ehr Reeg scheelt also wat.</p><p>Wenn Du op dissen "
+"Knoop klickt hest, ahn dat redig to wullen, kannst Du eenfach op den <em>Na "
+"baven</em>-Knoop klicken.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen de List "
-"baven <em>heel na nerrn</em> schuven wullt.</p>"
-"<p>De Filtern binnen de List warrt vun baven na nerrn op de Narichten anwendt, "
-"ehr Reeg scheelt also wat. De böverste Filter warrt toeerst versöcht.</p></qt>"
+"<qt><p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter binnen "
+"de List baven <em>heel na nerrn</em> schuven wullt.</p><p>De Filtern binnen "
+"de List warrt vun baven na nerrn op de Narichten anwendt, ehr Reeg scheelt "
+"also wat. De böverste Filter warrt toeerst versöcht.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter ümnömen "
-"wullt.</p>"
-"<p>Filtern kriegt ehr Naams automaatsch, wenn se mit \"&lt;\" anfangt.</p>"
-"<p>Wenn Du en Filter ümnöömt hest, ahn dat redig to wullen, un dat automaatsche "
-"Nömen torüchhebben wullt, klick op dissen Knoop un denn op <em>Leddig maken</em> "
-"un <em>OK</em> binnen den niegen Dialoog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Klick op dissen Knoop, wenn Du den opstunns markeerten Filter ümnömen "
+"wullt.</p><p>Filtern kriegt ehr Naams automaatsch, wenn se mit \"&lt;\" "
+"anfangt.</p><p>Wenn Du en Filter ümnöömt hest, ahn dat redig to wullen, un "
+"dat automaatsche Nömen torüchhebben wullt, klick op dissen Knoop un denn op "
+"<em>Leddig maken</em> un <em>OK</em> binnen den niegen Dialoog.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aktiveer dit, wenn Du en Nafraag-Dialoog wiest kriegen wullt.</p>"
-"<p>Dat is goot, wenn Du en Regelsett opstellt hest, dat Narichten för't "
-"Daalladen later markeert. Ahn disse Mööglichkeit, den Dialoog wiest to kriegen, "
-"kannst Du disse Narichten nich daalladen, wenn nich anner grote Naricht op den "
-"Server liggt oder Du den Regelsett so ännerst, dat de Naricht anners markeert "
-"warrt.</q></qt>"
+"<qt><p>Aktiveer dit, wenn Du en Nafraag-Dialoog wiest kriegen wullt.</"
+"p><p>Dat is goot, wenn Du en Regelsett opstellt hest, dat Narichten för't "
+"Daalladen later markeert. Ahn disse Mööglichkeit, den Dialoog wiest to "
+"kriegen, kannst Du disse Narichten nich daalladen, wenn nich anner grote "
+"Naricht op den Server liggt oder Du den Regelsett so ännerst, dat de Naricht "
+"anners markeert warrt.</q></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7250,6 +7076,16 @@ msgstr "POP3-Filterregeln"
 msgid "Filter Rules"
 msgstr "Filterregeln"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importeren"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importeren"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Verföögbor Filtern"
@@ -7273,8 +7109,8 @@ msgstr "Globaal Optschonen"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"Binnen Nafraag &jümmers de Narichten wiesen, op de \"Later Daalladen\"-Filtern "
-"passt"
+"Binnen Nafraag &jümmers de Narichten wiesen, op de \"Later Daalladen\"-"
+"Filtern passt"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7332,6 +7168,11 @@ msgstr "Filter ok noch den Menübalken tofögen"
 msgid "Icon for this filter:"
 msgstr "Filterlüttbild:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Na"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Na baven"
@@ -7340,16 +7181,29 @@ msgstr "Na baven"
 msgid "Down"
 msgstr "Na nerrn"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Ümnömen..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nieg"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Koperen na"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Wegdaan"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7358,21 +7212,21 @@ msgstr "Tastkombinatschoon för Orner utsöken"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Tominnst för een Filter is en Orner vun en tokoppelt IMAP-Konto as Teelorner "
-"angeven. Disse Oort Filtern warrt bloots bruukt bi't Filtern vun Hand bruukt, "
-"un ok denn bloots bi't Filtern vun rinkamen Narichten vun en tokoppelt "
-"IMAP-Konto."
+"angeven. Disse Oort Filtern warrt bloots bruukt bi't Filtern vun Hand "
+"bruukt, un ok denn bloots bi't Filtern vun rinkamen Narichten vun en "
+"tokoppelt IMAP-Konto."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"De nakamen Filtern sünd leeg (se bargt t.B. keen Akschoon oder keen Söökregel), "
-"se warrt nich sekert."
+"De nakamen Filtern sünd leeg (se bargt t.B. keen Akschoon oder keen "
+"Söökregel), se warrt nich sekert."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7420,8 +7274,8 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Ornernaams mööt keen \"/\" (Dwarsstreek) bargen, söök bitte en anner Ornernaam "
-"ut"
+"Ornernaams mööt keen \"/\" (Dwarsstreek) bargen, söök bitte en anner "
+"Ornernaam ut"
 
 #: kmfolder.cpp:913
 msgid ""
@@ -7445,28 +7299,25 @@ msgstr "Problemlösen för IMAP-Twischenspieker"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Problemlösen för IMAP-Twischenspieker</b></p>"
-"<p>Wenn dat bi't Synkroniseren vun en IMAP-Orner Problemen gifft, buu man "
-"toeerst de Indexdatei nieg op. Dat bruukt en wiss Tiet, maakt aver keen "
-"Problemen.</p>"
-"<p>Wenn dat nich langt, kannst Du den IMAP-Twischenspieker opfrischen. Deist Du "
-"dat, kaamt Di all lokale Ännern an den Orner un all sien Ünnerornern weg.</p>"
+"<p><b>Problemlösen för IMAP-Twischenspieker</b></p><p>Wenn dat bi't "
+"Synkroniseren vun en IMAP-Orner Problemen gifft, buu man toeerst de "
+"Indexdatei nieg op. Dat bruukt en wiss Tiet, maakt aver keen Problemen.</"
+"p><p>Wenn dat nich langt, kannst Du den IMAP-Twischenspieker opfrischen. "
+"Deist Du dat, kaamt Di all lokale Ännern an den Orner un all sien "
+"Ünnerornern weg.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7497,17 +7348,17 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"De Datei mit eensoortet IDs för den Orner \"%1\" lett sik nich lesen. Dat kunn "
-"en Problem mit de Dateiverlöven wesen, man villicht is ok dat Dateisysteem "
-"schaadhaftig."
+"De Datei mit eensoortet IDs för den Orner \"%1\" lett sik nich lesen. Dat "
+"kunn en Problem mit de Dateiverlöven wesen, man villicht is ok dat "
+"Dateisysteem schaadhaftig."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"De Datei mit eensoortet IDs för den Orner \"%1\" lett sik nich schrieven. Dat "
-"kunn en Problem mit de Dateiverlöven wesen."
+"De Datei mit eensoortet IDs för den Orner \"%1\" lett sik nich schrieven. "
+"Dat kunn en Problem mit de Dateiverlöven wesen."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7528,8 +7379,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Büst Du seker, wat Du den IMAP-Twischenspieker för den Orner \"%1\" un all sien "
-"Ünnerornern torüchsetten wullt?\n"
+"Büst Du seker, wat Du den IMAP-Twischenspieker för den Orner \"%1\" un all "
+"sien Ünnerornern torüchsetten wullt?\n"
 "Denn kaamt Di all lokale Ännern binnen disse Ornern weg."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7546,11 +7397,11 @@ msgstr "De Index för dissen Ornern wöör nieg opbuut."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"De Orner \"%1\" is nich in Start-Synkroontostand (Tostand weer %2). Wullt Du em "
-"liekers in den Start-Synkroontostand torüchsetten un denn synkroniseren?"
+"De Orner \"%1\" is nich in Start-Synkroontostand (Tostand weer %2). Wullt Du "
+"em liekers in den Start-Synkroontostand torüchsetten un denn synkroniseren?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7655,8 +7506,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Dien Togrieprechten för den Orner <b>%1</b> wöörn ingrenzt, Du kannst keen "
-"Narichten mehr na em tofögen.</p>"
+"<p>Dien Togrieprechten för den Orner <b>%1</b> wöörn ingrenzt, Du kannst "
+"keen Narichten mehr na em tofögen.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7677,15 +7528,11 @@ msgstr "Ünnerornern warrt op Server opstellt"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ut den Server-Orner <b>%1</b> wöörn Nettbreven wegdaan. Wullt Du disse ok "
-"lokaal wegdoon?"
-"<br>Eensoortet IDs: %2</p></qt>"
+"<qt><p>Ut den Server-Orner <b>%1</b> wöörn Nettbreven wegdaan. Wullt Du "
+"disse ok lokaal wegdoon?<br>Eensoortet IDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7706,13 +7553,11 @@ msgstr "Ornern för Naamruum %1 warrt haalt"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>As dat lett wöör de Orner <b>%1</b> wegmaakt. Wullt Du em ok op den Server "
-"wegmaken?</p></qt>"
+"<qt><p>As dat lett wöör de Orner <b>%1</b> wegmaakt. Wullt Du em ok op den "
+"Server wegmaken?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7720,19 +7565,19 @@ msgstr "Afbraken"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"De IMAP-Server %1 ünnerstütt IMAP-Anmarken nich. De XML-Spieker is för dissen "
-"Server nich to bruken, bitte änner Dien KMail-Instellen."
+"De IMAP-Server %1 ünnerstütt IMAP-Anmarken nich. De XML-Spieker is för "
+"dissen Server nich to bruken, bitte änner Dien KMail-Instellen."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"De IMAP-Server %1 ünnerstütt IMAP-Anmarken nich. De XML-Spieker is för dissen "
-"Server nich to bruken, bitte änner Dien KMail-Instellen."
+"De IMAP-Server %1 ünnerstütt IMAP-Anmarken nich. De XML-Spieker is för "
+"dissen Server nich to bruken, bitte änner Dien KMail-Instellen."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7744,17 +7589,16 @@ msgstr "Wegkamen+funnen"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Dat gifft binnen den Orner <b>%1</b> nieg Narichten, de noch nich na den "
-"Server hoochlaadt wöörn, man de Orner wöör op den Server wegdaan, oder Du hest "
-"nich noog Verlöven för em, dat Du dat doon kannst.</p>"
-"<p>De Narichten warrt na den Orner <b>%2</b> verschaven, denn kaamt Di keen "
-"Daten weg.</p>"
+"Server hoochlaadt wöörn, man de Orner wöör op den Server wegdaan, oder Du "
+"hest nich noog Verlöven för em, dat Du dat doon kannst.</p><p>De Narichten "
+"warrt na den Orner <b>%2</b> verschaven, denn kaamt Di keen Daten weg.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7762,21 +7606,26 @@ msgstr "Nich noog Verlöven"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Dat gifft binnen den Orner \"%1\" niege Narichten, de noch nich na den "
-"Server hoochlaadt wöörn, man de Orner wöör op den Server wegdaan, oder Du hest "
-"nich noog Verlöven, dat Du dat doon kannst. Beed Dien Systeempleger, dat he Di "
-"dat Hoochladen vun niege Narichten verlöövt, oder verschuuv de Narichten na en "
-"anner Orner.</p>"
-"<p>Wullt Du de Narichten nu na en anner Orner verschuven?</p>"
+"Server hoochlaadt wöörn, man de Orner wöör op den Server wegdaan, oder Du "
+"hest nich noog Verlöven, dat Du dat doon kannst. Beed Dien Systeempleger, "
+"dat he Di dat Hoochladen vun niege Narichten verlöövt, oder verschuuv de "
+"Narichten na en anner Orner.</p><p>Wullt Du de Narichten nu na en anner "
+"Orner verschuven?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Verschuven na:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Nich verschuven"
 
@@ -7788,8 +7637,7 @@ msgstr "Narichten na Orner verschuven"
 msgid "Permissions (ACL)"
 msgstr "Verlöven (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Allgemeen"
@@ -7813,8 +7661,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Egen Lüttbiller bruken"
@@ -7833,24 +7680,22 @@ msgstr "Akschoon för niege/nich leeste Nettbreven utföhren"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wenn aktiveert, kriggst Du Bescheden över niege/nich leeste Nettbreven "
-"binnen dissen Orner, un bi't Gahn na den nakamen/verleden Orner mit niege "
-"Narichten warrt disse hier binnen funnen.</p>"
-"<p>Maak dit ut, wenn Du keen Bescheden över niege/nich leeste Nettbreven hier "
-"binnen kriegen un Du ok nich wullt, dat niege Nettbreven hier funnen warrt, "
-"wenn Du na den nakamen/verleden Orner mit niege Narichten geihst. Dat is t.B. "
-"denn goot, wenn Du niege/nich leeste Nettbreven binnen Dien Affall- oder "
-"Warven-Orner övergahn wullt.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Wenn aktiveert, kriggst Du Bescheden över niege/nich leeste "
+"Nettbreven binnen dissen Orner, un bi't Gahn na den nakamen/verleden Orner "
+"mit niege Narichten warrt disse hier binnen funnen.</p><p>Maak dit ut, wenn "
+"Du keen Bescheden över niege/nich leeste Nettbreven hier binnen kriegen un "
+"Du ok nich wullt, dat niege Nettbreven hier funnen warrt, wenn Du na den "
+"nakamen/verleden Orner mit niege Narichten geihst. Dat is t.B. denn goot, "
+"wenn Du niege/nich leeste Nettbreven binnen Dien Affall- oder Warven-Orner "
+"övergahn wullt.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7862,12 +7707,12 @@ msgstr "Antwoorden binnen dissen Orner wohren"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Aktiveer dit, wenn Du Dien Antwoorden op Narichten hier binnen ok hier afleggen "
-"wullt, ansteed den instellten Orner för sendt Narichten to bruken"
+"Aktiveer dit, wenn Du Dien Antwoorden op Narichten hier binnen ok hier "
+"afleggen wullt, ansteed den instellten Orner för sendt Narichten to bruken"
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7877,17 +7722,21 @@ msgstr "Senner/Adressaat-Striep in Narichtenlist wiesen"
 msgid "Sho&w column:"
 msgstr "Striep &wiesen:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "As Standard fastleggen"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Senner"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Adressaat"
@@ -7898,17 +7747,18 @@ msgstr "&Senner-Identiteet:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Hier kannst Du fastleggen, welk Identiteet Du bruken wullt, wenn Du en niegen "
-"Nettbreef schriffst oder op en Naricht binnen den Orner anterst. Wenn Du also "
-"in een vun Dien Arbeitornern büst, kann KMail automaatsch de tohören "
-"Nettpostadress, Signatuur un Verslötel-/Ünnerschrievslötels bruken. Identiteten "
-"kannst Du binnen den Instellendialoog inrichten (Instellen -> KMail instellen)."
+"Hier kannst Du fastleggen, welk Identiteet Du bruken wullt, wenn Du en "
+"niegen Nettbreef schriffst oder op en Naricht binnen den Orner anterst. Wenn "
+"Du also in een vun Dien Arbeitornern büst, kann KMail automaatsch de tohören "
+"Nettpostadress, Signatuur un Verslötel-/Ünnerschrievslötels bruken. "
+"Identiteten kannst Du binnen den Instellendialoog inrichten (Instellen -> "
+"KMail instellen)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7926,21 +7776,21 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Disse Optschoon leggt fast, för welk Brukers vun den deelten Orner "
-"\"Bunnen\"-Tieden un Begeefnis-/Opgaven-Alarms opstellt warrt. De Optschoon "
-"gellt bloots för Kalenner- un Opgaven-Ornern (bi Opgaven-Ornern gellt dat "
-"bloots för Alarms).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Disse Optschoon leggt fast, för welk Brukers vun den deelten Orner \"Bunnen"
+"\"-Tieden un Begeefnis-/Opgaven-Alarms opstellt warrt. De Optschoon gellt "
+"bloots för Kalenner- un Opgaven-Ornern (bi Opgaven-Ornern gellt dat bloots "
+"för Alarms).\n"
 "\n"
 "Bispelen: Wenn de Baas vun en Bedrief en Orner mit sien Topleger/sche deelt, "
-"schull bloots de Baas wielt sien Möten bunnen wesen, he schull also \"Plegers\" "
-"utsöken, wiel sien Topleger/sche keen Plegerrechten för den Orner hett.\n"
+"schull bloots de Baas wielt sien Möten bunnen wesen, he schull also \"Plegers"
+"\" utsöken, wiel sien Topleger/sche keen Plegerrechten för den Orner hett.\n"
 "Wenn aver en Arbeitkoppel en Kalenner för Koppelmöten deelt, schullen all "
 "Koppelmaten (\"Lesers\" vun de Ornern) wielt de Möten bunnen wesen.\n"
 "En bedriefwiet Orner mit Begeefnissen ahn Mitmaakplicht dor binnen schull "
@@ -7977,23 +7827,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Du hest instellt, dat disse Orner Arbeitkoppel-Informatschonen bargen schall, "
-"man de allgemene Instellen, dat Arbeitkoppelornern versteken warrt, is ok "
-"anmaakt. Dat bedüüdt, dat de Orner versteken warrt, sodraad Du denn Dialoog "
-"tomaakst. Wenn Du den Orner wedder wegdoon wullt, muttst Du dat Versteken vun "
-"Arbeitkoppelornern tietwies utmaken."
+"Du hest instellt, dat disse Orner Arbeitkoppel-Informatschonen bargen "
+"schall, man de allgemene Instellen, dat Arbeitkoppelornern versteken warrt, "
+"is ok anmaakt. Dat bedüüdt, dat de Orner versteken warrt, sodraad Du denn "
+"Dialoog tomaakst. Wenn Du den Orner wedder wegdoon wullt, muttst Du dat "
+"Versteken vun Arbeitkoppelornern tietwies utmaken."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8062,12 +7912,13 @@ msgstr "Fehler bi't Halen vun Ornerinformatschonen"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "De Index för \"%1\" is vun en nich bekannt Verschoon vun KMail (%2).\n"
-"De Index kann ut Dien Nettpostorner nieg opstellt warrn, man dor köönt en Reeg "
-"Informatschonen, t.B. de Statusmarken, bi verloren gahn. Schall Dien Indexdatei "
-"daalgradeert warrn?"
+"De Index kann ut Dien Nettpostorner nieg opstellt warrn, man dor köönt en "
+"Reeg Informatschonen, t.B. de Statusmarken, bi verloren gahn. Schall Dien "
+"Indexdatei daalgradeert warrn?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8083,8 +7934,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"De Nettpost-Index för \"%1\" is schaadhaftig un warrt nu nieg opstellt, man en "
-"Reeg Informatschonen, t.B. de Statusmarken, kaamt dor bi weg."
+"De Nettpost-Index för \"%1\" is schaadhaftig un warrt nu nieg opstellt, man "
+"en Reeg Informatschonen, t.B. de Statusmarken, kaamt dor bi weg."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8092,11 +7943,11 @@ msgstr "Fehler bi't Opmaken vun \"%1\", disse Orner fehlt."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Fehler bi't Opmaken vun \"%1\". De Nettpostorner is leeg, oder Du hest dor nich "
-"noog Verlöven för."
+"Fehler bi't Opmaken vun \"%1\". De Nettpostorner is leeg, oder Du hest dor "
+"nich noog Verlöven för."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8109,8 +7960,8 @@ msgstr "Nettpostorner lett sik nich synkroniseren."
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"Naricht lett sik den Orner nich tofögen, villicht gifft dat nich noog Platz op "
-"de Fastplaat."
+"Naricht lett sik den Orner nich tofögen, villicht gifft dat nich noog Platz "
+"op de Fastplaat."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -8139,21 +7990,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>As dat lett is de Indexdatei vun den Orner \"%2\" to oolt. Dien Narichten "
-"kunnen schaadhaftig warrn, dorför warrt de Index nieg opbuut. As Resultaat "
-"köönt wegdaan Narichten wedder opduken un Statusmarken köönt verloren gahn.</p>"
-"<p>Bitte lees den <a href=\"%1\">tohören Afsnitt binnen de FAQ</a> "
-"vun dat KMail-Handbook, wenn Du weten wullt, wodennig Du dit Problem ut den Weg "
-"gahn kannst.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>As dat lett is de Indexdatei vun den Orner \"%2\" to oolt. Dien "
+"Narichten kunnen schaadhaftig warrn, dorför warrt de Index nieg opbuut. As "
+"Resultaat köönt wegdaan Narichten wedder opduken un Statusmarken köönt "
+"verloren gahn.</p><p>Bitte lees den <a href=\"%1\">tohören Afsnitt binnen de "
+"FAQ</a> vun dat KMail-Handbook, wenn Du weten wullt, wodennig Du dit Problem "
+"ut den Weg gahn kannst.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8213,7 +8061,7 @@ msgstr ""
 "As dat lett is \"%1\" keen Orner.\n"
 "Verschuuv de Datei bitte."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8221,7 +8069,7 @@ msgstr ""
 "De Verlöven vun den Orner \"%1\" sünd verkehrt.\n"
 "Stell bitte seker, dat Du den Ornerinholt ankieken un ännern dörvst."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8232,18 +8080,18 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"En Orner mit den sülven Naam wöör na't verleden Kieken na Nettpost wegdaan. Du "
-"muttst eerst na Nettpost kieken, ehr Du en anner Orner mit dissen Naam "
+"En Orner mit den sülven Naam wöör na't verleden Kieken na Nettpost wegdaan. "
+"Du muttst eerst na Nettpost kieken, ehr Du en anner Orner mit dissen Naam "
 "opstellen kannst."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Orner lett sik nich opstellen"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8340,13 +8188,13 @@ msgstr "Problemlösen för IMAP-&Twischenspieker..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Orner <b>%1</b> lett sik op Server nich opstellen, to wenig Verlöven. Wenn "
-"Du meenst, dat Du hier Ünnerornern opstellen dörven schullst, fraag Dien "
-"Systeempleger, wat he Di de nödigen Verlöven todeelt.</qt>"
+"<qt>Orner <b>%1</b> lett sik op Server nich opstellen, to wenig Verlöven. "
+"Wenn Du meenst, dat Du hier Ünnerornern opstellen dörven schullst, fraag "
+"Dien Systeempleger, wat he Di de nödigen Verlöven todeelt.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8363,8 +8211,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>De Orner <b>%1</b> lett sik nich hierhen verschuven oder koperen, dat gifft "
-"em al.</qt>"
+"<qt>De Orner <b>%1</b> lett sik nich hierhen verschuven oder koperen, dat "
+"gifft em al.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -8485,15 +8333,15 @@ msgstr "%1 Orner lett sik bloots lesen."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Wullt Du de utsöchte Naricht redig wegdoon?"
-"<br>Du kannst ehr denn nich wedderherstellen.</b>\n"
-"<qt>Wullt Du de %n utsöchten Narichten redig wegdoon?"
-"<br>Du kannst se denn nich wedderherstellen.</b>"
+"<qt>Wullt Du de utsöchte Naricht redig wegdoon?<br>Du kannst ehr denn nich "
+"wedderherstellen.</b>\n"
+"<qt>Wullt Du de %n utsöchten Narichten redig wegdoon?<br>Du kannst se denn "
+"nich wedderherstellen.</b>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8545,134 +8393,132 @@ msgstr ""
 "Ännern vun \"%1\" fehlslaan\n"
 "(Keen Platz mehr op de Reedschap na?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Zertifikaat-Ünnerschrievanfraag"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Bitte stell ut de Bilaag en Zertifikaat op un senn dat torüch."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail is op Afkoppelbedrief sett, all Nettwarkakschonen sünd torüchstellt."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail is op Tokoppelbedrief sett, all Nettwarkakschonen warrt wedder opnahmen"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail is opstunns in Afkoppelbedrief. Wodennig wullt Du wiedermaken?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Tokoppeln"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Afkoppeln"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Du hest keen Lees-/Schriefverlöven för Dien Postingang-Orner."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Postutgang"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Du hest keen Lees-/Schriefverlöven för Dien Postutgang-Orner."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Sendt"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Du hest keen Lees-/Schriefverlöven för Dien Sendt-Orner."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Affalltünn"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Du hest keen Lees-/Schriefverlöven för Dien Affall-Orner."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Nich fardig"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Du hest keen Lees-/Schriefverlöven för Dien Orner \"Nich fardig\"."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "Vörlagen"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Du hest keen Lees-/Schriefverlööf för Dien Vörlagenorner."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Verleden Söök"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Dat gifft den Orner <i>%4</i>. \"%1\" bruukt nu den Orner <i>%5</i> "
-"för sien Narichten."
-"<p>\"%2\" kann den Inholt vun <i>%6</i> na dissen Orner verschuven, man dat "
-"kann in <i>%7</i> vörhannen Dateien mit den sülven Naam överschrieven."
-"<p><strong>Schall \"%3\" de Narichten liekers nu verschuven?</strong></qt>"
+"<qt>Dat gifft den Orner <i>%4</i>. \"%1\" bruukt nu den Orner <i>%5</i> för "
+"sien Narichten.<p>\"%2\" kann den Inholt vun <i>%6</i> na dissen Orner "
+"verschuven, man dat kann in <i>%7</i> vörhannen Dateien mit den sülven Naam "
+"överschrieven.<p><strong>Schall \"%3\" de Narichten liekers nu verschuven?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Dat gifft den Orner <i>%4</i>. \"%1\" bruukt nu den Orner <i>%5</i> "
-"för sien Narichten. \"%2\" kann för Di den Inholt vun <i>%6</i> "
-"na dissen Orner verschuven."
-"<p><strong>Schall \"%3\" de Narichten verschuven?</strong></qt>"
+"<qt>Dat gifft den Orner <i>%4</i>. \"%1\" bruukt nu den Orner <i>%5</i> för "
+"sien Narichten. \"%2\" kann för Di den Inholt vun <i>%6</i> na dissen Orner "
+"verschuven.<p><strong>Schall \"%3\" de Narichten verschuven?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Nettpost-Dateien verschuven?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail hett en sworen Fehler opdeckt un warrt sik nu beennen"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8683,11 +8529,11 @@ msgstr ""
 "De Fehler weer:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Affalltünn leddig maken"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Büst Du seker, wat Du de Affalltünnen vun all Kontos leddig maken wullt?"
@@ -8763,8 +8609,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Nieg Narichten</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8803,11 +8648,11 @@ msgstr "Büst Du seker, wat Du den Affall-Orner leddig maken wullt?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Büst Du seker, wat Du all Narichten ut den Orner <b>%1</b> "
-"na de Affalltünn verschuven wullt?</qt>"
+"<qt>Büst Du seker, wat Du all Narichten ut den Orner <b>%1</b> na de "
+"Affalltünn verschuven wullt?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8831,11 +8676,11 @@ msgstr "Söök wegdoon"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Büst Du seker, wat Du de Söök <b>%1</b> wegdoon wullt?"
-"<br>All Narichten dor binnen steiht jümmers noch binnen ehr Orginaalorner.</qt>"
+"<qt>Büst Du seker, wat Du de Söök <b>%1</b> wegdoon wullt?<br>All Narichten "
+"dor binnen steiht jümmers noch binnen ehr Orginaalorner.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8848,41 +8693,43 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Büst Du seker, wat Du den leddigen Orner <b>%1</b> "
-"un all sien Ünnerornern wegdoon wullt? De Ünnerornern mööt nich leddig wesen, "
-"un ehr Inholden warrt ok wegsmeten"
-"<p><b>Beacht</b> bitte, dat wegsmeten Narichten nich binnen Dien Affall-Orner "
-"sekert warrt, Du kannst se nich wedderherstellen.</qt>"
+"<qt>Büst Du seker, wat Du den leddigen Orner <b>%1</b> un all sien "
+"Ünnerornern wegdoon wullt? De Ünnerornern mööt nich leddig wesen, un ehr "
+"Inholden warrt ok wegsmeten<p><b>Beacht</b> bitte, dat wegsmeten Narichten "
+"nich binnen Dien Affall-Orner sekert warrt, Du kannst se nich "
+"wedderherstellen.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Büst Du seker, wat Du den Orner <b>%1</b> wegdoon un sien Inholden "
-"wegsmieten wullt?"
-"<p><b>Beacht</b> bitte, dat wegsmeten Narichten nich binnen Dien Affall-Orner "
-"sekert warrt, Du kannst se nich wedderherstellen.</qt>"
+"wegsmieten wullt?<p><b>Beacht</b> bitte, dat wegsmeten Narichten nich binnen "
+"Dien Affall-Orner sekert warrt, Du kannst se nich wedderherstellen.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Büst Du seker, wat Du den Orner <b>%1</b> un all sien Ünnerornern wegdoon "
-"un ehr Inholden wegsmieten wullt?"
-"<p><b>Beacht</b> bitte, dat wegsmeten Narichten nich binnen Dien Affall-Orner "
-"sekert warrt, Du kannst se nich wedderherstellen.</qt>"
+"<qt>Büst Du seker, wat Du den Orner <b>%1</b> un all sien Ünnerornern "
+"wegdoon un ehr Inholden wegsmieten wullt?<p><b>Beacht</b> bitte, dat "
+"wegsmeten Narichten nich binnen Dien Affall-Orner sekert warrt, Du kannst se "
+"nich wedderherstellen.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Wegdaan"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8898,13 +8745,13 @@ msgstr "Büst Du seker, wat Du all ole Narichten wegdoon wullt?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Dat Bruken vun HTML för Nettpost warrt Dien Schuul gegen Warven daalsetten un "
-"maakt de Riskanz grötter, dat aktuelle un tokamen Sekerheitlöcker utnütt un "
-"Dien Reekner dor bi schaadt warrt."
+"Dat Bruken vun HTML för Nettpost warrt Dien Schuul gegen Warven daalsetten "
+"un maakt de Riskanz grötter, dat aktuelle un tokamen Sekerheitlöcker utnütt "
+"un Dien Reekner dor bi schaadt warrt."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8917,8 +8764,8 @@ msgstr "HTML bruken"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Dat Laden vun extern Dateien binnen HTML-Nettbreven warrt Dien Schuul gegen "
 "Warven daalsetten un maakt de Riskanz grötter, dat aktuelle un tokamen "
@@ -8938,12 +8785,12 @@ msgstr "Op Nettpostlist \"%1\" filtern..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"De Annerswo-Bescheden vun KMail bruukt Filtern op den Server, man Du hest dor "
-"noch keen IMAP-Server för inricht.\n"
+"De Annerswo-Bescheden vun KMail bruukt Filtern op den Server, man Du hest "
+"dor noch keen IMAP-Server för inricht.\n"
 "Du kannst dat ünner \"Filtern\" binnen de IMAP-Kontoinstellen doon."
 
 #: kmmainwidget.cpp:1743
@@ -8960,10 +8807,11 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"De Logbookkieker för GnuPG (\"kwatchgnupg\") lett sik nich starten, bitte prööv "
-"Dien Installatschoon."
+"De Logbookkieker för GnuPG (\"kwatchgnupg\") lett sik nich starten, bitte "
+"prööv Dien Installatschoon."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9282,8 +9130,7 @@ msgstr "Bi&lagen sekern..."
 msgid "Appl&y All Filters"
 msgstr "All Fi&ltern anwennen"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Filter anwennen"
@@ -9398,7 +9245,6 @@ msgstr "Nakamen n&ich leest Naricht"
 msgid "Go to the next unread message"
 msgstr "Na de nakamen nich leest Naricht gahn"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Verleden Naricht"
@@ -9446,8 +9292,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Binnen de Naricht na nerrn rullen. An't Enn vun de Naricht na de nakamen nich "
-"leeste Naricht gahn."
+"Binnen de Naricht na nerrn rullen. An't Enn vun de Naricht na de nakamen "
+"nich leeste Naricht gahn."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9537,35 +9383,35 @@ msgstr " An't Torechtmaken"
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Disse Naricht bargt en Anfraag na en Bescheed dor över, dat Du de Naricht "
 "kregen hest.\n"
-"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal Bescheed "
-"sennen laten."
+"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal "
+"Bescheed sennen laten."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Disse Naricht bargt en Anfraag na en Bescheed dor över, dat Du de Naricht "
 "kregen hest.\n"
-"Se bargt en Verarbeiden-Anwiesen, de as \"nödig\" markt is, man KMail versteiht "
-"ehr nich.\n"
+"Se bargt en Verarbeiden-Anwiesen, de as \"nödig\" markt is, man KMail "
+"versteiht ehr nich.\n"
 "Du kannst de Anfraag övergahn oder KMail en \"Fehlslaan\"-Bescheed sennen "
 "laten."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9573,13 +9419,13 @@ msgstr ""
 "Disse Naricht bargt en Anfraag na en Bescheed dor över, dat Du de Naricht "
 "kregen hest,\n"
 "man de Bescheed schall na mehr as een Adress sendt warrn.\n"
-"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal Bescheed "
-"sennen laten."
+"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal "
+"Bescheed sennen laten."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9587,13 +9433,13 @@ msgstr ""
 "Disse Naricht bargt en Anfraag na en Bescheed dor över, dat Du de Naricht "
 "kregen hest,\n"
 "man dat gifft keen Retuur-Padd.\n"
-"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal Bescheed "
-"sennen laten."
+"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal "
+"Bescheed sennen laten."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9601,9 +9447,10 @@ msgid ""
 msgstr ""
 "Disse Naricht bargt en Anfraag na en Bescheed dor över, dat Du de Naricht "
 "kregen hest,\n"
-"man de Retuurpadd-Adress is anners de, na de de Bescheed sendt warrn schall.\n"
-"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal Bescheed "
-"sennen laten."
+"man de Retuurpadd-Adress is anners de, na de de Bescheed sendt warrn "
+"schall.\n"
+"Du kannst de Anfraag övergahn oder KMail en \"Afwiest\"- oder normaal "
+"Bescheed sennen laten."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9622,24 +9469,23 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Optschonen-Koppindrag för Narichttostand-Bescheed "
-"(\"Disposition-Notification-Options\") bargt en nödigen, man nich bekannten "
-"Parameter."
+"Optschonen-Koppindrag för Narichttostand-Bescheed (\"Disposition-"
+"Notification-Options\") bargt en nödigen, man nich bekannten Parameter."
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Tostandbescheed: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Bilaag: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "De Bilaag wöör wegdaan."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "De Bilaag \"%1\" wöör wegdaan."
 
@@ -9687,45 +9533,37 @@ msgstr "Narichtendeel-Egenschappen"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>De <em>MIME-Typ</em> vun de Datei:</p>"
-"<p>Normalerwies bruukst Du hier nix ännern, de Typ vun de Datei warrt "
-"automaatsch faststellt. Wenn %1 dat villicht doch maal nich richtig maakt, "
-"kannst Du dat hier richten.</p></qt>"
+"<qt><p>De <em>MIME-Typ</em> vun de Datei:</p><p>Normalerwies bruukst Du hier "
+"nix ännern, de Typ vun de Datei warrt automaatsch faststellt. Wenn %1 dat "
+"villicht doch maal nich richtig maakt, kannst Du dat hier richten.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>De Grött vun den Deel:</p>"
-"<p>Wenn dat Utreken vun de naue Grött to veel Tiet bruukt, gifft %1 bloots en "
-"estemeerte Grött an; denn warrt \"(est.)\" de wieste Grött anhangt.</p></qt>"
+"<qt><p>De Grött vun den Deel:</p><p>Wenn dat Utreken vun de naue Grött to "
+"veel Tiet bruukt, gifft %1 bloots en estemeerte Grött an; denn warrt "
+"\"(est.)\" de wieste Grött anhangt.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>De Dateinaam vun den Deel:</p>"
-"<p>Ok wenn dit standardwies de Naam vun de bileggte Datei is, gifft dit Feld "
-"doch nich de Datei an, de bileggt warrt. Dat Feld is en Vörslag för den "
-"Adressaat sien Nettpostprogramm, den dat bruken kann, wenn de Deel na de "
-"Fastplaat sekert warrn schall.</p></qt>"
+"<qt><p>De Dateinaam vun den Deel:</p><p>Ok wenn dit standardwies de Naam vun "
+"de bileggte Datei is, gifft dit Feld doch nich de Datei an, de bileggt "
+"warrt. Dat Feld is en Vörslag för den Adressaat sien Nettpostprogramm, den "
+"dat bruken kann, wenn de Deel na de Fastplaat sekert warrn schall.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9733,18 +9571,15 @@ msgstr "&Beschrieven:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>En Beschrieven vun den Deel:</p>"
-"<p>Dit is bloots en Beschrieven för den Deel, jüst as de Bedraap en Beschrieven "
-"för de hele Naricht wesen kann. De mehrsten Nettpostprogrammen wiest disse "
-"Informatschoon binnen de Narichten-Vöransicht blang dat Bilaag-Lüttbild.</p>"
-"</qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
+msgstr ""
+"<qt><p>En Beschrieven vun den Deel:</p><p>Dit is bloots en Beschrieven för "
+"den Deel, jüst as de Bedraap en Beschrieven för de hele Naricht wesen kann. "
+"De mehrsten Nettpostprogrammen wiest disse Informatschoon binnen de "
+"Narichten-Vöransicht blang dat Bilaag-Lüttbild.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9752,22 +9587,20 @@ msgstr "&Koderen:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>De Överdreegkoderen vun den Deel:</p>"
-"<p>Normalerwies bruukst Du hier nix ännern, %1 söcht en gode Koderen för den "
-"MIME-Typ ut. För wiss Fäll kannst Du de Naricht recht wat lütter maken, t.B. "
-"wenn en PostScript-Datei keen binere Daten, man bloots eenfachen Text bargt. "
-"Denn kannst Du de Naricht bet to 25% lütter maken, wenn Du hier \"Quoted "
-"Printable\" un nich dat vörinstellte \"Base 64\" utsöchst.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>De Överdreegkoderen vun den Deel:</p><p>Normalerwies bruukst Du hier "
+"nix ännern, %1 söcht en gode Koderen för den MIME-Typ ut. För wiss Fäll "
+"kannst Du de Naricht recht wat lütter maken, t.B. wenn en PostScript-Datei "
+"keen binere Daten, man bloots eenfachen Text bargt. Denn kannst Du de "
+"Naricht bet to 25% lütter maken, wenn Du hier \"Quoted Printable\" un nich "
+"dat vörinstellte \"Base 64\" utsöchst.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9775,20 +9608,17 @@ msgstr "Dorstellen &binnen Text vörslaan"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aktiveer dit, wenn Du den Adressaat dat Wiesen binnen den Text vörslaan "
-"wullt, ansteed vun de normale Dorstellen as Lüttbild.</p>"
-"<p>Technisch warrt de Koppindrag för den Deel sien <em>Inholt-Fastleggen</em> "
-"(\"Content-Disposition\") op <i>inbett</i> (\"inline\") sett, un nich op den "
-"Standardweert <i>Bilaag</i> (\"attachment\").</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Aktiveer dit, wenn Du den Adressaat dat Wiesen binnen den Text "
+"vörslaan wullt, ansteed vun de normale Dorstellen as Lüttbild.</"
+"p><p>Technisch warrt de Koppindrag för den Deel sien <em>Inholt-Fastleggen</"
+"em> (\"Content-Disposition\") op <i>inbett</i> (\"inline\") sett, un nich op "
+"den Standardweert <i>Bilaag</i> (\"attachment\").</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9796,14 +9626,12 @@ msgstr "Deel ünner&schrieven"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aktiveer dit, wenn Du dissen Narichtendeel ünnerschrieven wullt.</p>"
-"<p>För de Ünnerschrift warrt de Slötel bruukt, den Du för de aktuelle "
+"<qt><p>Aktiveer dit, wenn Du dissen Narichtendeel ünnerschrieven wullt.</"
+"p><p>För de Ünnerschrift warrt de Slötel bruukt, den Du för de aktuelle "
 "Identiteet fastleggt hest.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9812,13 +9640,11 @@ msgstr "Deel &verslöteln"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aktiveer dit, wenn Du dissen Narichtendeel verslöteln wullt.</p>"
-"<p>De Deel warrt för all Adressaten vun de Naricht verslötelt.</p></qt>"
+"<qt><p>Aktiveer dit, wenn Du dissen Narichtendeel verslöteln wullt.</p><p>De "
+"Deel warrt för all Adressaten vun de Naricht verslötelt.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9832,17 +9658,13 @@ msgstr "POP-Filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Filtert Narichten op POP-Konto: <b>%1</b>"
-"<p>Disse Narichten sünd grötter as de Hööchstgrött, de Du för dit Konto "
-"instellt hest."
-"<br>Du kannst fastleggen, wat Du dor mit doon wullt, wenn Du de tohören "
-"Optschonen markeerst."
+"Filtert Narichten op POP-Konto: <b>%1</b><p>Disse Narichten sünd grötter as "
+"de Hööchstgrött, de Du för dit Konto instellt hest.<br>Du kannst fastleggen, "
+"wat Du dor mit doon wullt, wenn Du de tohören Optschonen markeerst."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9855,8 +9677,8 @@ msgstr "Dör Regelsett filterte Narichten: keen"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Narichten wiesen, op de en Regelsett passt un de för't Daalladen oder Wegdoon "
-"markeert wöörn"
+"Narichten wiesen, op de en Regelsett passt un de för't Daalladen oder "
+"Wegdoon markeert wöörn"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10096,40 +9918,39 @@ msgstr "Dat Nettpostprogramm för de K-Schriefdischümgeven"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Orner-Inholden warrt haalt</h2>"
-"<p>Bitte töven . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Orner-Inholden warrt haalt</h2><p>Bitte "
+"töven . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Afkoppelt</h2>"
-"<p>Opstunns is KMail in Afkoppel-Bedrief. Klick <a href=\"kmail:goOnline\">"
-"hier</a>, wenn Du Di tokoppeln wullt . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Afkoppelt</h2><p>Opstunns is KMail in Afkoppel-"
+"Bedrief. Klick <a href=\"kmail:goOnline\">hier</a>, wenn Du Di tokoppeln "
+"wullt . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10137,40 +9958,37 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Willkamen bi KMail %1</h2>"
-"<p>KMail is dat Nettpostprogramm för TDE, dat heel kompatibel to "
-"Internet-Nettpoststandards as MIME, SMTP, POP3 un IMAP is.</p>"
-"<ul>KMail bargt vele deegte Funkschonen, de binnen de <a href=\"%2\">"
-"Dokmentatschoon</a> beschreven warrt.</li>\n"
+"<h2 style='margin-top: 0px;'>Willkamen bi KMail %1</h2><p>KMail is dat "
+"Nettpostprogramm för TDE, dat heel kompatibel to Internet-Nettpoststandards "
+"as MIME, SMTP, POP3 un IMAP is.</p><ul>KMail bargt vele deegte Funkschonen, "
+"de binnen de <a href=\"%2\">Dokmentatschoon</a> beschreven warrt.</li>\n"
 "<li>Op de <a href=\"%3\">Tohuussiet vun KMail</a> findt sik Informatschonen "
 "över niege Verschonen.</li></ul>\n"
 "%8\n"
-"<p>Disse Verschoon bargt de nakamen niegen Funkschonen (günt to KMail %4, dat "
-"Deel vun TDE %5 is):</p>\n"
+"<p>Disse Verschoon bargt de nakamen niegen Funkschonen (günt to KMail %4, "
+"dat Deel vun TDE %5 is):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
 "<p>Wi haapt, dat Du Spaaß mit KMail hest.</p>\n"
-"<p>Velen Dank,</p><p style='margin-bottom: 0px'>&nbsp; &nbsp; De "
-"KMail-Koppel</p>"
+"<p>Velen Dank,</p><p style='margin-bottom: 0px'>&nbsp; &nbsp; De KMail-"
+"Koppel</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Bitte nimm Di en Ogenblick Tiet för't inrichten vun KMail ünner "
-"&quot;Instellen&quot; -&gt; &quot;KMail instellen&quot;.\n"
-"Du bruukst tominnst en Standardidentiteet un en Konto för rinkamen un rutgahn "
-"Nettpost.</p>\n"
+"<p>Bitte nimm Di en Ogenblick Tiet för't inrichten vun KMail ünner &quot;"
+"Instellen&quot; -&gt; &quot;KMail instellen&quot;.\n"
+"Du bruukst tominnst en Standardidentiteet un en Konto för rinkamen un "
+"rutgahn Nettpost.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10209,7 +10027,8 @@ msgstr "Bilaag ankieken: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Bilaag bargt bineer Daten, vun de dat eerste Teken wiest warrn "
@@ -10239,16 +10058,19 @@ msgstr "Bilaag opmaken?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Dat Wegdoon vun en Bilaag maakt en digitaal Ünnerschrift för disse Naricht "
 "leeg."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"Dat Ännern vun en Bilaag maakt en digitaal Ünnerschrift för disse Naricht leeg."
+"Dat Ännern vun en Bilaag maakt en digitaal Ünnerschrift för disse Naricht "
+"leeg."
 
 #: kmreaderwin.cpp:2956
 msgid "Attachments:"
@@ -10268,6 +10090,58 @@ msgstr "(passt op een vun de Nakamen)"
 msgid "(match all of the following)"
 msgstr "(passt op all vun de Nakamen)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Leest"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Oolt"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Wegdaan"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Antert"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Wiederleddt"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "In Postutgang"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sendt"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Beluert"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Övergahn"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Warven"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Naricht"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Opgaav"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Hett en Bilaag"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Heel Naricht"
@@ -10345,21 +10219,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Dat Verschuven vun de Naricht \"%1\" vun \"Postutgang\" na \"Sendt\" is "
 "fehlslaan.\n"
-"Möögliche Oorsaken sünd Platz- oder Verlövenproblemen op de Fastplaat. Versöök "
-"dat bitte to richten un verschuff de Naricht denn per Hand."
+"Möögliche Oorsaken sünd Platz- oder Verlövenproblemen op de Fastplaat. "
+"Versöök dat bitte to richten un verschuff de Naricht denn per Hand."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Dat is nich mööglich, Nettbreven ahn Senner-Adress to sennen.\n"
 "Legg bitte de Nettpostadress för de Identiteet \"%1\" binnen den Afsnitt "
@@ -10388,8 +10262,8 @@ msgstr "Sennen start..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Du wullt all töven Narichten mit en nich verslötelt Överdreegmetood sennen. "
 "Wullt Du wiedermaken?"
@@ -10416,15 +10290,16 @@ msgstr "Senenn vun (en poor) töven Narichten fehlslaan."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Sennen afbraken:\n"
 "%1\n"
-"De Naricht blifft so lang binnen den Postutgang, as dat Problem (t.B. en leeg "
-"Adress) nich richt is oder Du ehr vun dor wegmaakst.\n"
+"De Naricht blifft so lang binnen den Postutgang, as dat Problem (t.B. en "
+"leeg Adress) nich richt is oder Du ehr vun dor wegmaakst.\n"
 "Dit Överdreegprotokoll wöör bruukt:\n"
 "  %2"
 
@@ -10434,20 +10309,16 @@ msgstr "Sennen afbraken."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Sennen fehlslaan:</p>"
-"<p>%1</p>"
-"<p>De Naricht blifft so lang binnen den Postutgang, as dat Problem (t.B. en "
-"leeg Adress) nich richt is oder Du ehr vun dor wegmaakst.</p>"
-"<p>Dit Överdreegprotokoll wöör bruukt:  %2</p>"
-"<p>Wullt Du de övrigen Narichten liekers sennen?</p>"
+"<p>Sennen fehlslaan:</p><p>%1</p><p>De Naricht blifft so lang binnen den "
+"Postutgang, as dat Problem (t.B. en leeg Adress) nich richt is oder Du ehr "
+"vun dor wegmaakst.</p><p>Dit Överdreegprotokoll wöör bruukt:  %2</p><p>Wullt "
+"Du de övrigen Narichten liekers sennen?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10465,15 +10336,16 @@ msgstr "Sennen &afbreken"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Sennen fehslaan:\n"
 "%1\n"
-"De Naricht blifft so lang binnen den Postutgang, as dat Problem (t.B. en leeg "
-"Adress) nich richt is oder Du ehr vun dor wegmaakst.\n"
+"De Naricht blifft so lang binnen den Postutgang, as dat Problem (t.B. en "
+"leeg Adress) nich richt is oder Du ehr vun dor wegmaakst.\n"
 "Dit Överdreegprotokoll wöör bruukt:\n"
 " %2"
 
@@ -10509,47 +10381,48 @@ msgstr "Sendmail wöör nich normaal beendt."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"För't Bruken vun dissen SMTP-Server muttst Du Brukernaam un Passwoort angeven."
+"För't Bruken vun dissen SMTP-Server muttst Du Brukernaam un Passwoort "
+"angeven."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"As dat lett löppt %1 al op dit Systeem op en anner Schirm. Wenn Du %2 mehr as "
-"eenmaal startst, kann dat to Verlust vun Nettpost kamen. Start %1 bloots, wenn "
-"Du seker weetst, dat dat nich al löppt."
+"As dat lett löppt %1 al op dit Systeem op en anner Schirm. Wenn Du %2 mehr "
+"as eenmaal startst, kann dat to Verlust vun Nettpost kamen. Start %1 bloots, "
+"wenn Du seker weetst, dat dat nich al löppt."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "As dat lett löppt %1 al op dit Systeem op en anner Schirm. Wenn Du %1 un %2 "
-"blang eenanner lopen lettst, kann dat to Verlust vun Nettpost kamen. Start %2 "
-"bloots, wenn Du seker weetst, dat %1 nich al löppt."
+"blang eenanner lopen lettst, kann dat to Verlust vun Nettpost kamen. Start "
+"%2 bloots, wenn Du seker weetst, dat %1 nich al löppt."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"As dat lett löppt %1 al op %2. Wenn Du %1 mehr as eenmaal startst, kann dat to "
-"Verlust vun Nettpost kamen. Start %1 op dissen Reekner bloots, wenn Du seker "
-"weetst, dat dat nich al op %2 löppt."
+"As dat lett löppt %1 al op %2. Wenn Du %1 mehr as eenmaal startst, kann dat "
+"to Verlust vun Nettpost kamen. Start %1 op dissen Reekner bloots, wenn Du "
+"seker weetst, dat dat nich al op %2 löppt."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "As dat lett löppt %1 al op %3. Wenn Du %1 un %2 blang eenanner lopen lettst, "
-"kann dat to Verlust vun Nettpost kamen. Start %2 op dissen Reekner bloots, wenn "
-"Du seker weetst, dat %1 nich al op %3 löppt."
+"kann dat to Verlust vun Nettpost kamen. Start %2 op dissen Reekner bloots, "
+"wenn Du seker weetst, dat %1 nich al op %3 löppt."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10560,6 +10433,10 @@ msgstr "%1 starten"
 msgid "Exit"
 msgstr "Verlaten"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nieg Narichten in"
@@ -10586,14 +10463,15 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet is nich verföögbor. Dat is redig anraadt, de elektroonsche Knipp för "
-"de Pleeg vun Dien Passwöör to bruken.\n"
-"KMail kann dat Passwoort ok binnen sien Instellendatei wohren. Dat steiht dor "
-"in en nich leesbore Form binnen, man wenn Een de Datei faatkriggt un dat "
+"TDEWallet is nich verföögbor. Dat is redig anraadt, de elektroonsche Knipp "
+"för de Pleeg vun Dien Passwöör to bruken.\n"
+"KMail kann dat Passwoort ok binnen sien Instellendatei wohren. Dat steiht "
+"dor in en nich leesbore Form binnen, man wenn Een de Datei faatkriggt un dat "
 "Passwoort redig opslöteln will, is dat Formaat nich bannig seker.\n"
 "Wullt Du dat Passwoort för dat Konto \"%1\" binnen de Instellendatei sekern?"
 
@@ -10663,8 +10541,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"En Befehl, de lokaal ehr't Sennen utföhrt warrt. Dor kannst Du t.B. SSH-Tunnels "
-"mit opbuen. Laat dat Feld leddig, wenn Du keen Befehl utföhren wullt."
+"En Befehl, de lokaal ehr't Sennen utföhrt warrt. Dor kannst Du t.B. SSH-"
+"Tunnels mit opbuen. Laat dat Feld leddig, wenn Du keen Befehl utföhren wullt."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10672,11 +10550,12 @@ msgstr "Server p&röövt Identiteet"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Aktiveer dit, wenn Dien SMTP Dien Identiteet pröövt, ehr Du Nettbreven afsennen "
-"kannst. Disse Metood warrt ok \"Authenticated SMTP\" oder \"ASMTP\" nöömt."
+"Aktiveer dit, wenn Dien SMTP Dien Identiteet pröövt, ehr Du Nettbreven "
+"afsennen kannst. Disse Metood warrt ok \"Authenticated SMTP\" oder \"ASMTP\" "
+"nöömt."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10696,15 +10575,13 @@ msgstr "I&nstellt Reeknernaam na Server sennen"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Aktiveer dit, wenn KMail den Nettpostserver en fastleggten Reeknernaam angeven "
-"schall."
-"<p>Dat is goot, wenn de Naam vun Dien Reek nich richtig instellt is oder Du em "
-"schulen wullt."
+"Aktiveer dit, wenn KMail den Nettpostserver en fastleggten Reeknernaam "
+"angeven schall.<p>Dat is goot, wenn de Naam vun Dien Reek nich richtig "
+"instellt is oder Du em schulen wullt."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10734,11 +10611,11 @@ msgstr "Bloots lokale Dateien verlöövt."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Dat Feld \"Reekner:\" mutt nich leddig wesen. Giff bitte den Naam oder de "
-"IP-Adress vun den SMTP-Server in."
+"Dat Feld \"Reekner:\" mutt nich leddig wesen. Giff bitte den Naam oder de IP-"
+"Adress vun den SMTP-Server in."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10750,15 +10627,15 @@ msgstr "Fehler bi't Wiesen vun den Orner \"%1\": "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Wenn Du Ornern lokaal afbestellst, warrt all Informatschonen över de Ornern "
-"wegmaakt, de lokaal verföögbor sünd. Op den Server warrt se nich ännert. Wenn "
-"Du besekern wullt, dat all lokaal Ännern na den Server schreven wöörn, klick nu "
-"op Afbreken un kiek toeerst na Nettpost."
+"wegmaakt, de lokaal verföögbor sünd. Op den Server warrt se nich ännert. "
+"Wenn Du besekern wullt, dat all lokaal Ännern na den Server schreven wöörn, "
+"klick nu op Afbreken un kiek toeerst na Nettpost."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10977,36 +10854,28 @@ msgstr "Naricht &bewerken"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dat Verslötel-Moduul hett Struktuurinformatschonen torüchgeven, de sik nich "
-"verarbeiden laat, villicht is dat Moduul schaadhaftig.</p>"
-"<p>Snack dor bitte Dien Systeempleger op an.</p></qt>"
+"<qt><p>Dat Verslötel-Moduul hett Struktuurinformatschonen torüchgeven, de "
+"sik nich verarbeiden laat, villicht is dat Moduul schaadhaftig.</p><p>Snack "
+"dor bitte Dien Systeempleger op an.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Keen Verslötel-Moduul funnen, un dat inbute OpenPGP kunn ok nich utföhrt "
-"warrn.</p>"
-"<p>Du kannst nu twee Saken maken:</p>"
-"<ul>"
-"<li>Aktiveer en Verslötel-Moduul över den Instellen-Dialoog (Instellen -> "
-"KMail instellen -> Sekerheit -> Verslötel-Modulen)</li>"
-"<li><em>oder</em> giff normaal OpenPGP-Instellen binnen de Verslöteln-Siet vun "
-"den Identiteet-Dialoog an (Instellen -> KMail instellen -> Identiteten)</li>"
-"</ul>"
+"warrn.</p><p>Du kannst nu twee Saken maken:</p><ul><li>Aktiveer en Verslötel-"
+"Moduul över den Instellen-Dialoog (Instellen -> KMail instellen -> Sekerheit "
+"-> Verslötel-Modulen)</li><li><em>oder</em> giff normaal OpenPGP-Instellen "
+"binnen de Verslöteln-Siet vun den Identiteet-Dialoog an (Instellen -> KMail "
+"instellen -> Identiteten)</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11018,8 +10887,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Dat Programm \"Chiasmus\" beedt de Funkschoon \"x-encrypt\" nich an. Bitte "
 "bericht dissen Fehler."
@@ -11029,8 +10898,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"De Funkschoon \"x-encrypt\" nimmt anner Parameters an as verwacht wöör. Bitte "
-"bericht dissen Fehler."
+"De Funkschoon \"x-encrypt\" nimmt anner Parameters an as verwacht wöör. "
+"Bitte bericht dissen Fehler."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11038,16 +10907,16 @@ msgstr "Chiasmus-Fehler bi't Verslöteln"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Nich verwacht Torüchgaav vun dat Programm \"Chiasmus\". De Funkschoon "
-"\"x-encrypt\" hett keen Bytefeld levert. Bitte bericht dissen Fehler."
+"Nich verwacht Torüchgaav vun dat Programm \"Chiasmus\". De Funkschoon \"x-"
+"encrypt\" hett keen Bytefeld levert. Bitte bericht dissen Fehler."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Dat inbette OpenPGP-Verslötelformaat ünnerstütt dat Ünnerschrieven oder "
@@ -11103,8 +10972,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Du wullt disse Naricht ünnerschrieven, man för disse Identiteet is keen gellen "
-"Ünnerschrift-Slötel instellt."
+"Du wullt disse Naricht ünnerschrieven, man för disse Identiteet is keen "
+"gellen Ünnerschrift-Slötel instellt."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11162,12 +11031,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Dien Verslötelinstellen för de Adressaten gifft an, dat Du fraagt warrn wullt, "
-"wat disse Naricht verslötelt warrn schall.\n"
+"Dien Verslötelinstellen för de Adressaten gifft an, dat Du fraagt warrn "
+"wullt, wat disse Naricht verslötelt warrn schall.\n"
 "Schall de Naricht verslötelt warrn?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11200,11 +11069,12 @@ msgstr "&Nich verslöteln"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Du wullt disse Naricht un ok en Kopie för Di sülven verslöteln, man för disse "
-"Identiteet gifft dat keen gellen Verslötel-Slötels, de troot warrt."
+"Du wullt disse Naricht un ok en Kopie för Di sülven verslöteln, man för "
+"disse Identiteet gifft dat keen gellen Verslötel-Slötels, de troot warrt."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11213,8 +11083,8 @@ msgstr "Ahn Verslöteln sennen?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Delen vun de Naricht warrt nich verslötelt.\n"
@@ -11242,64 +11112,58 @@ msgstr "&All Delen verslöteln"
 msgid "Unencrypted Message Warning"
 msgstr "Wohrschoen: Nich verslötelt Naricht"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fehler: Dat Verslötelmoduul hett keen verslötelt Daten torüchgeven.</p>"
-"<p>Bitte bericht dissen Fehler:"
-"<br>%2</p></qt>"
+"<qt><p>Fehler: Dat Verslötelmoduul hett keen verslötelt Daten torüchgeven.</"
+"p><p>Bitte bericht dissen Fehler:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Mit de utsöchte Koderen laat sik nich all Tekens wiesen."
-"<br>"
-"<br>Naricht liekers sennen?</qt>"
+"<qt>Mit de utsöchte Koderen laat sik nich all Tekens wiesen.<br><br>Naricht "
+"liekers sennen?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Tekenverlust"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Tekens verleren"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Koderen ännern"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Disse Naricht lett sik nich ünnerschrieven, wiel dat utsöchte Verslötelmoduul "
-"Ünnerschrieven nich ünnerstütt. Dat schull nienich vörkamen, bitte bericht "
-"dissen Fehler."
+"Disse Naricht lett sik nich ünnerschrieven, wiel dat utsöchte "
+"Verslötelmoduul Ünnerschrieven nich ünnerstütt. Dat schull nienich vörkamen, "
+"bitte bericht dissen Fehler."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Disse Naricht lett sik nich ünnerschrieven, wiel dat utsöchte Verslötelmoduul "
-"Ünnerschrieven nich ünnerstütt. Dat schull nienich vörkamen, bitte bericht "
-"dissen Fehler."
+"Disse Naricht lett sik nich ünnerschrieven, wiel dat utsöchte "
+"Verslötelmoduul Ünnerschrieven nich ünnerstütt. Dat schull nienich vörkamen, "
+"bitte bericht dissen Fehler."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "GnuPG-Pröövlogbook för Ünnerschrievakschoon"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
@@ -11307,24 +11171,25 @@ msgstr ""
 "Dat Ünnerschrieven is fehlslaan. Kiek bitte, wat dat Programm \"gpg-agent\" "
 "löppt."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Disse Naricht lett sik nich verslöteln, wiel dat utsöchte Verslötelmoduul "
-"Verslöteln nich ünnerstütt. Dat schull nienich vörkamen, bitte bericht dissen "
-"Fehler."
+"Verslöteln nich ünnerstütt. Dat schull nienich vörkamen, bitte bericht "
+"dissen Fehler."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "GnuPG-Pröövlogbook för Verslötelakschoon"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Disse Naricht lett sik nich ünnerschrievn un verslöteln, wiel dat utsöchte "
 "Verslötelmoduul Verslöteln un Ünnerschrieven nich ünnerstütt. Dat schull "
@@ -11349,15 +11214,15 @@ msgstr "Postfach-&Formaat:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Hier kannst Du utsöken, wat Du de Narichten binnen dissen Orner as een Datei "
-"per Naricht (Maildir) oder as een grote Datei (Mbox) sekern wullt. KMail bruukt "
-"standardwies dat Maildir-Formaat, un dat bruukt ok bloots in rore Fäll ännert "
-"warrn. Wenn Du Di nich seker büst, laat disse Optschoon as se is."
+"per Naricht (Maildir) oder as een grote Datei (Mbox) sekern wullt. KMail "
+"bruukt standardwies dat Maildir-Formaat, un dat bruukt ok bloots in rore "
+"Fäll ännert warrn. Wenn Du Di nich seker büst, laat disse Optschoon as se is."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11366,13 +11231,13 @@ msgstr "Orner &bargt:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Hier kannst Du fastleggen, wat de niege Orner för Nettpost oder för "
 "Arbeitkoppel-Informatschonen as Opgaven un Notizen bruukt warrt. De "
-"Vörinstellen is Nettpost. Wenn Du Di nich seker büst, laat disse Optschoon as "
-"se is."
+"Vörinstellen is Nettpost. Wenn Du Di nich seker büst, laat disse Optschoon "
+"as se is."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11410,8 +11275,7 @@ msgstr "Verscheden Resultaten för Ünnerschriften"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Dat Verslötel-Moduul hett keen Kloortext torüchgeven."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11440,8 +11304,8 @@ msgstr "Keen %1-Moduul funnen."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "De Naricht is ünnerschreven, man dat Gellen vun de Ünnerschrift kann nich "
 "pröövt warrn.<br />Grund: %1"
@@ -11478,10 +11342,10 @@ msgstr "Verslötel-Moduul \"%1\" kann keen Narichten opslöteln."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Beacht bitte</b>: Disse HTML-Naricht kunn Betöög op extern Biller usw. "
 "bargen. För Dien Sekerheit/Privaatrebeet warrt disse extern Dateien nich "
@@ -11490,14 +11354,14 @@ msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Beacht bitte</b>: Dit is en HTML-Naricht. För Dien Sekerheit warrt bloots de "
-"HTML-Bornkode wiest. Wenn Du den Senner vun disse Naricht troost, kannst Du ok "
-"de <a href=\"kmail:showHTML\">formateerte Naricht</a> ankieken."
+"<b>Beacht bitte</b>: Dit is en HTML-Naricht. För Dien Sekerheit warrt bloots "
+"de HTML-Bornkode wiest. Wenn Du den Senner vun disse Naricht troost, kannst "
+"Du ok de <a href=\"kmail:showHTML\">formateerte Naricht</a> ankieken."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11748,12 +11612,12 @@ msgstr "sekert: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Binnen den %1, de för de Ünnerschrift bruukt warrt, is keen Nettpostadress "
-"angeven, so dat se nich günt den Senner sien Nettpostadress (%2) stellt warrn "
-"kann."
+"angeven, so dat se nich günt den Senner sien Nettpostadress (%2) stellt "
+"warrn kann."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11868,14 +11732,15 @@ msgstr "In-/Utgaavmoduul-Fehlermellen"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"De POP3-Server för dat Konto \"%1\" ünnerstütt den Befehl \"UIDL\" nich. Disse "
-"Befehl warrt bruukt, wenn KMail faststellen schall, welk vun de Nettbreven op "
-"den Server KMail al sehn hett.\n"
+"De POP3-Server för dat Konto \"%1\" ünnerstütt den Befehl \"UIDL\" nich. "
+"Disse Befehl warrt bruukt, wenn KMail faststellen schall, welk vun de "
+"Nettbreven op den Server KMail al sehn hett.\n"
 "De Funkschoon, de Nettbreven op den Server to laten, warrt nich richtig "
 "arbeiden."
 
@@ -11897,7 +11762,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Naricht %1 vun %2 (%3 vun %4 kB) warrt för %5@%6 haalt (%7kB blievt op den "
 "Server)."
@@ -11916,1901 +11782,15 @@ msgstr "Leeg Antwoort vun Server"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Wiel de Server den Befehl \"TOP\" nich ünnerstütt, köönt de Köppdaten vun grote "
-"Nettbreven nich haalt warrn, ehr se daallaadt warrt."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Gah na"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Orner"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Naricht"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Antern (besünner)"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Wiederledden"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-Warktüüchbalken"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Ünnerschrieven"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Narichten &automaatsch ünnerschrieven"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Wenn aktiveert, warrt all rutgahn Narichten standardwies ünnerschreven. "
-"Natürlich kannst Du dat Ünnerschrieven för elk Naricht enkel utmaken."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Verslöteln"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Bi't Verslöteln vun Nettbreven jümmers ok för't &Zertifikaat vun mien egen "
-"Identiteet verslöteln"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Wenn aktiveert, warrt de Naricht/Datei nich bloots mit den apen Slötel vun den "
-"Adressaat, man ok mit Dien egen apen Slötel verslötelt. Bloots so kannst Du de "
-"Naricht ok later noch opslöteln un denn lesen. Normalerwies warrt disse "
-"Optschoon anmaakt."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Ünners&chreven/verslötelt Text na't Opstellen wiesen"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Wenn aktiveert, warrt de ünnerschreven/verslötelt Text in en nieg Finster "
-"wiest, so dat Du di ankieken kannst, wodennig he utsüht, ehr Du em sennst. Dat "
-"is goot, wenn Du pröven wullt, wat Dien Verslötel-Systeem richtig arbeidt."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Sendt Narichten &verslötelt wohren"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Aktiveer dit, wenn Du Dien Narichten verslötelt wohren wullt"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Sendt Narichten verslötelt wohren</h1>\n"
-"Wenn dit aktiveert is, warrt sendt Narichten verslötelt sekert, so as se sendt "
-"wöörn. Dat is nich anraadt, wiel Du de Narichten nich mehr ankieken kannst, "
-"wenn een nödig Zertifikaat aflöppt.\n"
-"<p>\n"
-"Villicht gifft aver lokale Regeln, na de Du dat anmaken muttst. Wenn Du dat "
-"nich nau weetst, snack dor Dien Systeempleger op an.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Verslötelslötels jümmers för't &Beglöven wiesen"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Wenn aktiveert, warrt Di dat Programm jümmers en List vun apen Slötels wiesen, "
-"ut de Du den utsöken kannst, de denn för't Verslöteln bruukt warrt. Is dat nich "
-"aktiveert, kriggst Du de Utwahl bloots denn to sehn, wenn dat Programm den "
-"richtigen Slötel nich finnen kann oder wenn dat mehr as een Slötel gifft, de "
-"bruukt warrn kunn."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Narichten jü&mmers verslöteln wenn mööglich"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Wenn aktiveert, warrt Dien rutgahn Narichten jümmers verslötelt, wenn dat "
-"mööglich is un Sinn hett. Natürlich kannst Du disse automaatsche Verslöteln för "
-"elk Naricht enkel utmaken."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nich ünnerschrieven/verslöteln bi't Sekern as N&ich fardig"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Wodennig funkscheneert dit?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Na: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopie: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Allgemeen"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Antern"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Na all antern"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Wiederledden"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Tastkombinatschoon:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Vörlaag-Typ:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Orner-Egenschappen"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Orner bargt en &Nettpostlist"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "List&adress:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormaal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Nich l&eest:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Wohrtiet"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "W&ohrtiet löppt af na:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Wohrtiet gellt för &leest Narichten"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Wo&hrtiet löppt af na:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Wohrtiet gellt för &nich leest Narichten"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Daag"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Weken"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Maand(en)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Verwiedert"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Senner-&Identiteet:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Formaat för't &Sekern:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&List wiest:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Zertifikaat-Gellen mit ZTLen pröven"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Wenn aktiveert, warrt S/MIME-Zertifikaten över Zertifikaat-Torüchrooplisten "
-"(ZTLen) pröövt."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Zertifikaten över Internet pröven (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Wenn aktiveert, warrt S/MIME-Zertifikaten direktemang över dat Internet mit dat "
-"Internet-Zertifikaattostand-Protokoll (\"Online Certificates Status Protocol\", "
-"OCSP) pröövt. Giff bitte de URL vun den OCSP-Server nerrn in"
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Internet-Zertifikaatprööv"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL vun den OCSP-Server:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Giff hier de Adress vun den Server för' Pröven vun Zertifikaattostänn över "
-"Internet in (OCSP-Server). De URL fangt normalerwies mit http:// an."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Signatuur vun den OCSP-Server:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Deenst-URL vun Zertifikaten övergahn"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Zertifikaatregeln nich pröven"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Standardwies kiekt GnuPG binnen de Datei \"~./gnupg/policies.txt\", wat en "
-"Zertifikaatregel verlöövt is. Is dit aktiveert, warrt de Regeln nich pröövt."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "ZTLen nienich bruken"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Wenn aktiveert, warrt Zertifikaat-Torüchrooplisten nich för't Pröven vun "
-"S/MIME-Zertifikaten bruukt."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Fehlen Rutgeverzertifikaten daalladen"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Wenn aktiveert, warrt fehlen Rutgeverzertifikaten daallaadt, wenn nödig (gellt "
-"för beed Pröövmetoden, ZTLen un OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-Anfragen"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Keen HTTP-Anfragen utföhren"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "HTTP för S/MIME heel utmaken"
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Dissen Proxy för HTTP-Anfragen bruken: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Systeem-Proxy för HTTP bruken: "
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Wenn aktiveert, warrt de Weert för den HTTP-Proxy (wiest rechterhand, Weert vun "
-"de Ümgeven-Variable \"http_proxy\") för all HTTP-Anfragen bruukt."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Giff hier de Adress vun Dien HTTP-Proxy in, de för all HTTP-Anfragen för S/MIME "
-"bruukt warrt. De Schriefwies is \"Reekner:Port\", t.B. "
-"\"mienproxy.narms.nds:3128\"."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "HTTP-ZTL-Verdeelsteden ut Zertifikaten övergahn"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Vele Zertifikaten bargt Indrääg över ZTL-Verdeelsteden (\"CRL Distribution "
-"Points\") - URLs, ünner de künnig maakt warrt, woneem sik de ZTL findt. De "
-"eerste Verdeelsteed-Indrag warrt bruukt. Is disse Optschoon aktiveert, warrt "
-"all Indrääg övergahn, de dat HTTP-Protokoll bruukt."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-Anfragen"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Keen LDAP-Anfragen utföhren"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Maakt den Bruuk vun LDAP för S/MIME heel ut."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "LDAP-ZTL-Verdeelsteden ut Zertifikaten övergahn"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Vele Zertifikaten bargt Indrääg över ZTL-Verdeelsteden (\"CRL Distribution "
-"Points\") - URLs, ünner de künnig maakt warrt, woneem sik de ZTL findt. De "
-"eerste Verdeelsteed-Indrag warrt bruukt. Is disse Optschoon aktiveert, warrt "
-"all Indrääg övergahn, de dat LDAP-Protokoll bruukt."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Hööftreekner för LDAP-Anfragen:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Wenn Du hier en LDAP-Server angiffst, gaht all LDAP-Anfragen toeerst na dissen "
-"Server. Technisch warrt disse Reekner ansteed all angeven oder ok nich angeven "
-"Reekner- un Portdelen vun en LDAP-URL bruukt. Anner LDAP-Servers warrt bloots "
-"bruukt, wenn dat Tokoppeln na den \"Proxy\" fehlsleit.\n"
-"De Schriefwies is \"Reekner\" oder \"Reekner:Port\". Is keen Port angeven, "
-"warrt Port 389 (Standardport för LDAP) bruukt."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Snippel tofögen"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Tofögen"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Snippel:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Koppel:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Snippel-Instellen"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Kortinformatschonen"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Snippeltext as &Kortinformatschoon wiesen"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Leggt fast, wat as Kortinformatschoon wat Text vun de Reeg mit dat Leesteken "
-"wiest warrt"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variabeln"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Ingaavmetood för Variabeln"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Een Dialoog för elk Variabel binnen en Snippel"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "För elkeen Variabel binnen en Snippel warrt een Dialoog wiest"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Een Dialoog för all Variabeln binnen en Snippel"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"En enkel Dialoog warrt wiest, binnen den Du de Weerten för all Variabeln vun en "
-"Snippel ingeven kannst"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Trennteken:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Vörlagen instellen"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Antwoort na Senner"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Na all antern / Na List antern"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Naricht wiederledden"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Wohrschoen, ehr nich ünne&rschreven Narichten sendt warrt"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Aktiveer dit, wenn Du wohrschoot warrn wullt, ehr nich ünnerschreven Narichten "
-"sendt warrt"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, ehr nich ünnerschreven Narichten sendt warrt</h1>\n"
-"Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, ehr Du nich "
-"ünnerschreven Narichten oder Narichtdelen sennst.\n"
-"<p>\n"
-"För hööchste Sekerheit is disse Optschoon anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Wohrschoen, ehr nich verslötelt Narichten sendt warrt"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Aktiveer dit, wenn Du wohrschoot warrn wullt, ehr nich verslötelt Narichten "
-"sendt warrt"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, ehr nich verslötelt Narichten sendt warrt</h1>\n"
-"Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, ehr Narichtdelen oder "
-"heel Narichten ahn Verslöteln sendt warrt.\n"
-"<p>\n"
-"För hööchste Sekerheit is disse Optschoon anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Wohrschoen, wenn Ad&ressaat-Zertifikaat sien Nettpostadress nich bargt"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Aktiveer dit, wenn Du wohrschoot warrn wullt, wenn de Nettpostadress vun den "
-"Adressaat nich binnen sien Zertifikaat steiht."
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, wenn Adressaat-Zertifikaat Nettpostadress nich bargt</h1>\n"
-"Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn de Nettpostadress "
-"vun den Adressaat nich binnen sien för't Verslöteln bruukt Zertifikaat steiht.\n"
-"<p>\n"
-"För hööchste Sekerheit is disse Optschoon anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Wohrschoen, wenn Zertifikaten/Slötels neegst aflöppt (Tieden warrt nerrn "
-"instellt)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "För't Ünnerschrieven"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "För't Verslöteln"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " Daag"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Söök hier de Tall vun Daag ut"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, wenn Ünnerschriev-Zertifikaat aflöppt</h1>\n"
-"Hier kannst Du de Tall vun Daag fastleggen, de en Ünnerschriev-Zertifikaat noch "
-"gellen mutt, ahn dat Du wohrschoot warrst.\n"
-"<p>\n"
-"För SPHINX sünd 14 Daag anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, wenn Verslötel-Zertifikaat aflöppt.</h1>\n"
-"Hier kannst Du de Tall vun Daag fastleggen, de en Zertifikaat för't Verslöteln "
-"tominnst noch gellen mutt, ahn dat Du wohrschoot warrst.\n"
-"<p>\n"
-"För de SPHINX-Ümgeven sünd 14 Daag anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, wenn en Zertifikaat binnen de Keed aflöppt</h1>\n"
-"Hier kannst Du de Tall vun Daag fastleggen, de all Zertifikaten binnen de Keed "
-"noch gellen mööt, ahn dat Du wohrschoot warrst.\n"
-"<p>\n"
-"För de SPHINX-Ümgeven sünd 14 Daag anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, wenn ZA-Zertifikaat aflöppt</h1>\n"
-"Hier kannst Du de Tall vun Daag fastleggen, de dat Zertifikaat vun de ZA "
-"(Zertifikaatautoriteet) noch gellen mutt, ahn dat Du wohrschoot warrst.\n"
-"<p>\n"
-"För SPHINX sünd 14 Daag anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Wohrschoen, wenn dat Wörtelzertifikaat aflöppt</h1>\n"
-"Hier kannst Du de Tall vun Daag fastleggen, de dat Wörtelzertifikaat noch "
-"gellen mutt, ahn dat Du wohrschoot warrst.\n"
-"<p>\n"
-"För SPHINX sünd 14 Daag anraadt.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "För Wörtelzertifikaten:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "För ZA-Twischenstoopzertifikaten:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "För Brukerzertifikaten/-Slötels:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "All \"Nich nochmaal fragen\"-Wohrschoen wedder anmaken"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Vörlaag-Inholt"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Vörlaag-Tastkombinatschoon"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Vörlaag-Typ"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Töven Nettpost bi't Kieken sennen"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Legg fast, wat KMail Nettpost binnen den Postutgang bi't Kieken vun Hand "
-"oder jümmers bi't Kieken na Nettpost sennen schall, oder wat Du dat "
-"automaatsche Sennen heel utmaken wullt.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Nich synkroniseert Narichten automaatsch ut Ornern ahn noog Togrieprechten "
-"rutschuven"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Gifft dat binnen en Orner niege Narichten, de noch nich na den Server "
-"hoochlaadt wöörn, man Du hest nich noog Verlöven, dat Du dat nu doon kannst, "
-"denn warrt disse Narichten automaatsch na den Orner \"Wegkamen+funnen\" "
-"verschaven."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Lokaal Marken binnen bloots leesbor Ornern verlöven"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Mit disse Instellen köönt Plegers en lüttst Tietafstand fastleggen, de twischen "
-"tweemaal Kieken na Nettpost liggen mutt.\"\n"
-"           \"De Bruker kann keen lütter Weert as den hier fastleggten utsöken."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "De tolest utsöchte Orner binnen den Ornerutwahldialoog"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Den Bruker sien Instellen för de Dateirechten (\"umask\") övergahn un Dateien "
-"bloots för den Bruker lees- un schriefbor maken"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Regel för't Wiesen vun dat Systeemafsnitt-Lüttbild"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Dat Programm utmaken, wenn dat Hööftfinster tomaakt warrt, ok wenn dat en "
-"Systeemafsnitt-Lüttbild gifft"
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Enkelheiten binnen Bescheed över niege Post"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Wenn aktiveert, wiest de Bescheed över niege Nettpost de Tall vun niege "
-"Nettbreven per Orner, anners bargt de Bescheed bloots de Mellen, dat överhööft "
-"niege Post kamen is."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "E&ditor angeven:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "E&xtern Editor bruken"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"De Grenz, bi de en Bruker wohrschoot warrt, dat en Orner neeg to sien "
-"Bruukgrenz kamen is."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Arbeitkoppelfunkschonen anmaken"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "\"Vun\"- un \"Na\"-Koppregen in Antwoorden op Antwoorden ümdreihen"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook ünnerstütt den iCalendar-Standard nich heel richtig, disse "
-"Optschoon arbeidt an een vun disse Fehlers vörbi. Wenn Outlook-Brukers Dien "
-"Antwoorden nicht kriegt, versöök dat mit disse Optschoon."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Arbeitkoppel-Inladen binnen Hööftdeel sennen"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook ünnerstütt den iCalendar-Standard nich heel richtig, disse "
-"Optschoon arbeidt an een vun disse Fehlers vörbi. Wenn Outlook-Brukers Dien "
-"Inladen nicht kriegt, versöök dat mit disse Optschoon."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Inladen kompatibel to MS Exchange maken"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook hett, wenn dat tosamen mit en Microsoft Exchange Server "
-"bruukt warrt, Problemen bi't Verstahn vun Arbeitkoppel-Nettpost, de langs den "
-"Standard opstellt wöör. Maak dit an, wenn ok MS Exchange Dien "
-"Arbeitkoppel-Inladen verstahn könen schall."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Wenn aktiveert, duukt de Nettbreef-Editor nich op, ansteed warrt all Inladen "
-"automaatsch sendt. Wenn Du de Naricht ehr't Sennen ankieken wullt, maak disse "
-"Optschoon ut. Beacht bitte, dat de Text in iCalendar-Schriefwies is, Du "
-"schullst em nich per Hand ännern."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Inladen-Nettbreven wegdoon, wenn de Antwoort dor op loosstüert wöör"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Is dit anmaakt, warrt Inladen-Nettbreven, de en Antwoort kregen hebbt, na de "
-"Affalltünn verschaven."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Wenn aktiveert, köönt Indrääg vun de Kontact-Programmen (KOrganizer, "
-"KAdressbook un KNotes) sekert warrn.</p>"
-"<p>Wenn Du disse Optschoon bruken wullt, muttst Du ok de Programmen so "
-"instellen, dat se de IMAP-Ressource bruukt; dat kannst Du binnen dat "
-"TDE-Kuntrullzentrum.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalerwies gifft dat keen Grund, sik de Ornern mit de IMAP-Ressourcen "
-"antokieken. Wenn Du dat liekers wullt oder muttst, kannst Du disse Optschoon "
-"bruken.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Wenn Du dat Arbeitkoppel-Konto nich för normaal Nettpost\"\n"
-"          \"bruukst, maak dit an - KMail wiest denn bloots "
-"Arbeitkoppel-Ornern.\"\n"
-"          \"Dit is denn goot, wenn Du för normaal Nettpost en anner "
-"tokoppelt\"\n"
-"          \"IMAP-Konto bruukst.\"</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Formaat för de Arbeitkoppel-Ornern fastleggen"
-"<ul>"
-"<li>Standardwies warrt de \"ical\"- (för Kalennerornern) un \"vcard\"-Standard "
-"(för Adressbookornern) bruukt. Dit Formaat maakt all Kontact-Funkschonen "
-"verföögbor.</li>"
-"<li>Dat XML-Formaat vun Kolab is en egen Formaat, dat neger bi Outlook sien "
-"liggt. Wenn en Kolab-Server (oder en anner kompatibel Lösen) bruukt warrt, "
-"gifft dit Formaat en betere Kompatibiliteet to Outlook.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Hier kannst Du den Wörtelorner för de IMAP-Ressourceornern fastleggen.</p>"
-"<p>Standardwies leggt de Kolab-Server den IMAP-Postingang as Wörtelorner "
-"fast.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Dit is de ID vun dat Konto, na dat de IMAP-Ressourceornern tohöört.</p>"
+"Wiel de Server den Befehl \"TOP\" nich ünnerstütt, köönt de Köppdaten vun "
+"grote Nettbreven nich haalt warrn, ehr se daallaadt warrt."
 
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Wenn Du de Ornernaams vun den IMAP-Spieker op Dien egen Spraak instellen "
-"wullt, kannst Du een vun disse Spraken utsöken.</p>"
-"<p>Beacht bitte, dat dat dor bloots een Grund för gifft, dat is de "
-"Kompatibiliteet to Microsoft Outlook. Sünst is dat nich so goot, wiel denn dat "
-"Wesseln vun de Spraak nich mehr mööglich is.</p>"
-"<p>Laat dat also blieven, wenn Du dat nich bruukst.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Ok niege Nettbreven binnen Arbeitkoppelornern filtern"
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Ännern vun Arbeitkoppeldaten bi afkoppelt IMAP-Ornern fuurts na't Tokoppeln "
-"synkroniseren"
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Över dissen Weert warrt fastleggt, wat de Inföhren för KMail wiest warrt."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Hööchsttall för Verbinnen per Reekner"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Mit disse Optschoon kannst Du de Tall vun Verbinnen per Reekner för dat Kieken "
-"na Nettpost ingrenzen. Standardwies is disse Tall nich ingrenzt (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Fixsöök-Ingaavreeg wiesen"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Disse Optschoon maakt de Fixsöök baven de Narichtenlist an oder ut. Mit ehr "
-"kannst Du de Informatschonen binnen de Narichtenlist gau finnen."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Lokaal Postingang versteken, wenn he nich bruukt warrt"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Standardwies binnenreegs wiederledden"
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Den Streekpunkt (\";\") binnen den Narichteneditor as Trennteken tolaten"
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "Bi't Antern un Wiederledden Orginaaltekensett bruken (wenn mööglich)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Signatuur a&utomaatsch infögen"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Disse Identiteet wohren, so dat se ok later binnen dat Nettbreef-Editorfinster "
-"bruukt warrt\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Dissen Orner för sendt Narichten wohren, so dat he ok later binnen dat "
-"Nettbreef-Editorfinster bruukt warrt"
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Dissen Överdreegmetood wohren, so dat se ok later binnen dat "
-"Nettbreef-Editorfinster bruukt warrt"
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Disse Identiteet wohren, so dat se ok later binnen dat Nettbreef-Editorfinster "
-"bruukt warrt\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Reegü&mbrook bi Striep:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Wohrschoen, wenn Wörte&lzertifikaat aflöppt in weniger as"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Aktiveer dit, wenn Outlook &#8482; Bilagennaams mit Sünnertekens "
-"(nich-engelsche Bookstaven) verstahn schall"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "&Narichttostand-Bescheden automaatsch anföddern"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aktiveer dit, wenn KMail för rutgahn Narichten Narichttostand-Bescheden "
-"(NTBen) anföddern schall.</p>"
-"<p>Dit leegt bloots dat Standardbedregen fast, Du kannst dat för elk Naricht "
-"enkel binnen den Nettbreef-Editor anners fastleggen. Bruuk dat Menü <em>"
-"Optschonen</em> -> <em>Narichttostand-Bescheed anföddern</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Tolest bruukt Adressen för automaatsche Kompletteren bruken"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Maak disse Optschoon ut, wenn binnen den Nettbreef-Editor de tolest bruukten "
-"Adressen nich binnen de List för't automaatsche Kompletteren vun Adressen "
-"opduken schöölt."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Tiet för't automaatsche Sekern"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"De Text binnen den Nettbreef-Editor kann automaatsch sekert warrn. Hier kannst "
-"Du de Tiet instellen, na de jümmers automaatsch sekert warrt. De Weert 0 maakt "
-"de Funkschoon ut."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Signaturen baven ziteert Text infögen"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "För bekannte Prefi&xen \"Re:\" insetten"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "För bekannte Prefixen \"&Fwd:\" insetten"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Plietsch &ziteren"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "De Ünnerschrift is aflopen."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Typ vun de Adressaat-Utwahl"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Leggt den Dialoogtyp för Utsöken vun \"Na\"-, \"Kopie\"-\n"
-"un \"Blindkopie\"-Indrääg fast."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Typ vun den Adressaat-Editor"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Leggt den Editortyp för't Bewerken vun \"Na\"-, \"Kopie\"-\n"
-"un \"Blindkopie\"-Indrääg fast."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Hööchsttall för Adressaat-Editoregen"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"List vun Narichtdeel-Typen, de Du vun Nettbreven bi't Wiederledden binnenreegs "
-"wegmaken wullt"
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "De hööchtse tolaten Grött vun Nettpostbilagen in MB."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Textsnippel-Pleeg- un -Inföögpaneel binnen Editor wiesen"
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr "Dat GnuPG-Pröövlogbook liekers wiesen, wenn de Akschoon Spood harr"
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "Bi't Antern un Wiederledden Orginaaltekensett bruken (wenn mööglich)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"En poor Nettbreven, besünners automaatsch opstellte, gifft den Tekensett nich "
-"an, de för en richtige Dorstellen bruukt warrt. Denn warrt dat "
-"Standard-Tekensett bruukt, dat Du hier instellen kannst. Legg hier den "
-"Tekensett fast, de in Dien Deel vun de Welt tomehrst bruukt warrt. As "
-"Vörinstellen warrt de Koderen vun Dien Systeem bruukt."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Wenn Du hier wat anners as \"Automaatsch\" instellst, warrt all Nettbreven mit "
-"den niegen Tekensett wiest, de Angaven binnen de Narichten warrt övergahn."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Aktiveer dit, wenn Du ansteed vun Smileys binnen den Narichttext Snuten (lütt "
-"Biller) hebben wullt."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Aktiveer dit, wenn Du verscheden Evenen binnen ziteert Text hebben wullt."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Evene automaatsch infoolden:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Lüttere Schrift för ziteert Text bruken"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Aktiveer dit, wenn Du ziteert Text mit en lüttere Schrift dorstellen wullt"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Sendt Narichten &verslötelt wohren"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Brukerprogramm för Smucke Köpp wiesen"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Maak dit an, wenn Du binnen de Smucken Köpp de Regen \"Brukerprogramm\" un "
-"\"X-Senner\" wiest hebben wullt."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Dat Wegdoon vun Bilagen vun vörhannen Nettbreven tolaten"
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Dat Bewerken vun Bilagen vun vörhannen Nettbreven tolaten"
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Narichten bi't Ankieken jümmers opslöteln, oder vördem fragen"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Narichttostand-Bescheden mit leddig Senner-Feld sennen"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Sendt Narichttostand-Bescheden mit en leddig Senner-Feld. En Reeg Servers wiest "
-"disse Narichten torüch, wenn dat also Problemen bi't Sennen vun NTBen gifft, "
-"maak disse Optschoon ut."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Sätz to Vörlagen ümwannelt"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Ole Sätz to Vörlagen ümwannelt"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Narichtenvörlaag för nieg Naricht"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Narichtenvörlaag för Antwoort"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Narichtenvörlaag för Antwoort na all"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Narichtenvörlaag för Wiederledden"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Zitaattekens"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Brukers dörvt Annerwarts-Bescheden anners instellen"
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Brukers dörvt Annerwarts-Sieveskripten hoochladen, man de Instellen nich "
-"ännern, so as de Antwoort-Domään oder de Warvenpost-Optschoon."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "Annerwarts-Bescheden bloots för Nettbreven ut disse Domään loosstüern"
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "Annerwarts-Bescheden för Nettpost loosstüern, de as Warven markeert is"
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Bi't Opropen vun KMail pröven, wat dor noch en Annerwarts-Bescheed anmaakt is"
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 vun %2 %3 bruukt"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13919,6 +11899,11 @@ msgstr "To \"Kopie\" tofögen"
 msgid "Add as BCC"
 msgstr "To \"Blindkopie\" tofögen"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Afbreken"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13934,13 +11919,13 @@ msgstr "Adressaten utsöken"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Du hest 1 Adressaat utsöcht. De hööchste ünnerstütt Tall vun Adressaten is %1. "
-"Pass bitte Dien Utwahl to.\n"
+"Du hest 1 Adressaat utsöcht. De hööchste ünnerstütt Tall vun Adressaten is "
+"%1. Pass bitte Dien Utwahl to.\n"
 "Du hest %n Adressaten utsöcht. De hööchste ünnerstütt Tall vun Adressaten is "
 "%1. Pass bitte Dien Utwahl to."
 
@@ -13958,8 +11943,8 @@ msgstr "Adress-Utwahldialoog bruken"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Disse Knoop maakt en niegen Dialoog op, binnen den Du Adressaten ut all "
 "verföögbore Adressen utsöken kannst."
@@ -14064,10 +12049,19 @@ msgstr "is grötter as oder liek mit"
 msgid " bytes"
 msgstr " Bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " Daag"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "För't Utföhren vun Dien Söök mööt all Narichten binnen den Orner \"%1\" "
 "daallaadt warrn. Dat kann en Tiet duern. Wullt Du de Söök utföhren?"
@@ -14216,16 +12210,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Daten över Konto \"%1\" warrt sammelt...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Daten över Konto \"%1\" warrt sammelt...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14244,10 +12234,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Inholt vun dat Skript \"%1\":\n"
+msgid "Contents of script '%1':\n"
+msgstr "Inholt vun dat Skript \"%1\":\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14270,20 +12258,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-Könen:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-Könen:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Keen besünner Könen verföögbor)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Verföögbor Sieve-Skripten:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Verföögbor Sieve-Skripten:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14362,12 +12346,12 @@ msgstr "Hier kannst Du Dien faste Signatuur ingeven."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Bruuk dissen Knoop, wenn Du de Datei mit Dien Signatuur utsöken wullt. Se warrt "
-"jümmers leest, wenn Du en niegen Nettbreef opstellt oder Dien Signatuur "
-"anföögst."
+"Bruuk dissen Knoop, wenn Du de Datei mit Dien Signatuur utsöken wullt. Se "
+"warrt jümmers leest, wenn Du en niegen Nettbreef opstellt oder Dien "
+"Signatuur anföögst."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14383,22 +12367,27 @@ msgstr "Maakt de angeven Datei in en Texteditor op."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Hier kannst Du jichtenseen Befehl mit oder ahn sien Padd angeven, jümmers dor "
-"na, wat sik de Befehl över Dien PATH-Variable finnen lett. KMail röppt den "
-"Befehl jümmers op, wenn en Signatuur inföögt warrt, un bruukt em sien Utgaav "
-"(op de Standardutgaav) as Signatuurtext. Faken warrt hier de Befehlen "
+"Hier kannst Du jichtenseen Befehl mit oder ahn sien Padd angeven, jümmers "
+"dor na, wat sik de Befehl över Dien PATH-Variable finnen lett. KMail röppt "
+"den Befehl jümmers op, wenn en Signatuur inföögt warrt, un bruukt em sien "
+"Utgaav (op de Standardutgaav) as Signatuurtext. Faken warrt hier de Befehlen "
 "\"fortune\" un \"ksig --random\" bruukt."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Befehl angeven:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Padd"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nieg Indrag:"
@@ -14432,6 +12421,11 @@ msgstr "Koppel tofögen"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Wullt Du dissen Koppel un all sien Snippels redig wegdoon?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Anwennen op:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Snippel bewerken"
@@ -14444,6 +12438,10 @@ msgstr "Koppel bewerken"
 msgid "Edit &group..."
 msgstr "&Koppel bewerken..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Bewerken..."
@@ -14482,13 +12480,13 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Wenn Du disse Optschoon anmaakst, warrt de rechterhand ingeven Weert sekert. "
-"Wenn Du later de sülve Variabel bruukst, ok binnen en anner Snippel, warrt de "
-"rechterhand ingeven Weert as Standard för de Variabel bruukt."
+"Wenn Du later de sülve Variabel bruukst, ok binnen en anner Snippel, warrt "
+"de rechterhand ingeven Weert as Standard för de Variabel bruukt."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14523,6 +12521,16 @@ msgstr "Nich anmaken"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Inholt ut Datei \"%1\" lett sik nich infögen: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Na: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopie: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14552,59 +12560,51 @@ msgstr "Filterbefehl ut Vörlaag lett sik nich opropen: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier kannst Du Narichtenvörlagen för niege Narichten, Antwoorden un "
-"Wiederledden opstellen.</p>"
-"<p>Binnen Narichtenvörlagen kannst Du Utwesselbefehlen bruken, de Du eenfach "
-"ingeven oder binnen dat Menü <i>Befehl infögen</i> utsöken kannst.</p>"
-"<p>Hier angeven Vörlagen gellt för den Orner, se kaamt ansteed vun all globale "
-"oder Identiteet-Vörlagen to Bruuk.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hier kannst Du Narichtenvörlagen för niege Narichten, Antwoorden un "
+"Wiederledden opstellen.</p><p>Binnen Narichtenvörlagen kannst Du "
+"Utwesselbefehlen bruken, de Du eenfach ingeven oder binnen dat Menü "
+"<i>Befehl infögen</i> utsöken kannst.</p><p>Hier angeven Vörlagen gellt för "
+"den Orner, se kaamt ansteed vun all globale oder Identiteet-Vörlagen to "
+"Bruuk.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier kannst Du Narichtenvörlagen för niege Narichten, Antwoorden un "
-"Wiederledden opstellen.</p>"
-"<p>Binnen Narichtenvörlagen kannst Du Utwesselbefehlen bruken, de Du eenfach "
-"ingeven oder binnen dat Menü <i>Befehl infögen</i> utsöken kannst.</p>"
-"<p>Hier angeven Vörlagen gellt för de Identiteet; wenn angeven, kaamt se "
-"ansteed vun globale Vörlagen to Bruuk, wenn nich ok Orner-Vörlagen angeven "
-"sünd.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hier kannst Du Narichtenvörlagen för niege Narichten, Antwoorden un "
+"Wiederledden opstellen.</p><p>Binnen Narichtenvörlagen kannst Du "
+"Utwesselbefehlen bruken, de Du eenfach ingeven oder binnen dat Menü "
+"<i>Befehl infögen</i> utsöken kannst.</p><p>Hier angeven Vörlagen gellt för "
+"de Identiteet; wenn angeven, kaamt se ansteed vun globale Vörlagen to Bruuk, "
+"wenn nich ok Orner-Vörlagen angeven sünd.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hier kannst Du Narichtenvörlagen för niege Narichten, Antwoorden un "
-"Wiederledden opstellen.</p>"
-"<p>Binnen Narichtenvörlagen kannst Du Utwesselbefehlen bruken, de Du eenfach "
-"ingeven oder binnen dat Menü <i>Befehl infögen</i> utsöken kannst.</p>"
-"<p>Dit is en globaal (Standard-)Vörlaag; se kaamt to Bruuk, wenn keen "
-"Identiteet- oder Orner-Vörlagen angeven sünd.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Hier kannst Du Narichtenvörlagen för niege Narichten, Antwoorden un "
+"Wiederledden opstellen.</p><p>Binnen Narichtenvörlagen kannst Du "
+"Utwesselbefehlen bruken, de Du eenfach ingeven oder binnen dat Menü "
+"<i>Befehl infögen</i> utsöken kannst.</p><p>Dit is en globaal "
+"(Standard-)Vörlaag; se kaamt to Bruuk, wenn keen Identiteet- oder Orner-"
+"Vörlagen angeven sünd.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14855,13 +12855,18 @@ msgstr ""
 #: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr ""
-"Hööftdeel vun aktuelle Naricht dör Programm ledden un Utgaav infögen, as se is"
+"Hööftdeel vun aktuelle Naricht dör Programm ledden un Utgaav infögen, as se "
+"is"
 
 #: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 "Hööftdeel vun aktuelle Naricht dör Programm ledden un mit de Utgaav utwesseln"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Blinkerpositschoon fastleggen"
@@ -14894,114 +12899,6 @@ msgstr "Fehlersöök anmaken"
 msgid "Turn Debug Off"
 msgstr "Fehlersöök utmaken"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>... dat Du mit de linke un rechte Pieltast na de nakamen un verleden Naricht "
-"gahn kannst?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>... dat Du över dat <em>Rechtsklickmenü</em> vun de Narichtenlist mit <em>"
-"Filter opstellen</em> gau Filtern för Senner, Adressaat, Bedraap un "
-"Nettpostlisten opstellen kannst?\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... dat Du den Deel &quot;[List-Naam]&quot;, de bi en Reeg\n"
-"Nettpostlisten automaatsch den Bedraap toföögt warrt, eenfach\n"
-"looswarrn kannst, wenn Du de Filterakschoon <em>Koppreeg\n"
-"ümschrieven</em> bruukst? Dat geiht so:\n"
-"<pre>Koppreeg ümschrieven: &quot;Bedraap&quot;\n"
-"   wessel &quot;\\s*\\[List-Naam\\]\\s*&quot;\n"
-"   ut gegen &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>... dat Du Ornern över den Dialoog <em>Orner -&gt;\n"
-"Nettpostlist-Pleeg</em> Nettpostlisten toornen kannst? Denn kannst\n"
-"Du över den Orner sien <em>Rechtsklickmenü</em> un <em>Nieg\n"
-"Naricht na Nettpostlist...</em> den Nettbreefeditor mit de Adress vun\n"
-"de List binnen dat Adressaatfeld opmaken.\n"
-"Du kannst ok mit den Middelmuusknoop op den Orner klicken.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>... dat Du för elk Orner en egen Lüttbild instellen kannst?\n"
-"Kiek ünner <em>Orner -&gt; Egenschappen</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>... dat KMail en Klöörbalken wiesen kann, de den Typ (Eenfachtext,\n"
-"HTML, OpenPGP) vun de jüst wieste Naricht angifft?</p>\n"
-"<p>Dat schuult Di vör Versöök, över HTML-Narichten KMail sien Dorstellen\n"
-"för en pröövt, goot Ünnerschrift natomaken.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>... dat Du op elk Koppregen filtern kannst, wenn Du sien Naam in\n"
-"dat eerste Feld vun de Söökregel ingiffst?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... dat Du op HTML-Nettbreven filtern kannst, wenn Du\n"
-"<pre>&quot;Content-type&quot; bargt &quot;text/html&quot;</pre>\n"
-"as Söökregel bruukst?\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>... dat bi't Antern bloots de markeert Textdeel ziteert warrt?</p>\n"
-"<p>Wenn nix markeert is, warrt de hele Text ziteert.</p>\n"
-"<p>Dat funkscheneert sogor mit Text ut Bilagen, wenn Du\n"
-"<em>Ansicht -&gt; Bilagen -&gt; Inbett</em> anmaakt hest.</p>\n"
-"Disse Funkschoon is för all Anter-Befehlen verföögbor, utnahmen\n"
-"<em>Naricht -&gt; Ahn Zitaat antern</em>.</p>\n"
-"<p align=\"right\"><em>Bidragen vun David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Dat gifft nix, dat torüchnahmen warrn kunn."
@@ -15066,6 +12963,17 @@ msgstr "Bilaag Nr.%1 (ahn Naam)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "GnuPG-Pröövlogbook för disse Akschoon wiesen"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Dat gifft al en Datei mit den Naam \"%1\". Büst Du seker, dat Du ehr "
+"överschrieven wullt?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Datei överschrieven?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15097,7 +13005,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"De Server list Oorlööf (\"vacation\") nich bi sien ünnerstütt Verwiedern op.\n"
+"De Server list Oorlööf (\"vacation\") nich bi sien ünnerstütt Verwiedern "
+"op.\n"
 "Ahn disse Verwedern kann KMail de Annerswo-Bescheden nich installeren.\n"
 "Snack dor bitte Dien Systeempleger op an."
 
@@ -15181,13 +13090,13 @@ msgstr "&Bild elk Naricht bileggen"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Aktiveer dit, wenn KMail de Narichten vun disse Identiteet en so nöömt "
-"\"X-Face\"-Koppreeg tofögen schall. Dat is en lütt (48x48 Pixels) "
-"Swattwitt-Bild, dat en poor Nettpostprogrammen wiesen köönt."
+"Aktiveer dit, wenn KMail de Narichten vun disse Identiteet en so nöömt \"X-"
+"Face\"-Koppreeg tofögen schall. Dat is en lütt (48x48 Pixels) Swattwitt-"
+"Bild, dat en poor Nettpostprogrammen wiesen köönt."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15215,12 +13124,12 @@ msgstr "Datei utsöken..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Hier kannst Du de Bilddatei utsöken, ut de dat Bild maakt warrt. Dat Born-Bild "
-"schull hogen Kontrast hebben un (neegst to) quadraatsch wesen. En helle "
+"Hier kannst Du de Bilddatei utsöken, ut de dat Bild maakt warrt. Dat Born-"
+"Bild schull hogen Kontrast hebben un (neegst to) quadraatsch wesen. En helle "
 "Achtergrund maakt dat Resultaat beter."
 
 #: xfaceconfigurator.cpp:156
@@ -15229,17 +13138,17 @@ msgstr "Adressbook-Bild bruken"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Du kannst en lütter maakt Verschoon vun dat Bild bruken, dat Du binnen dat "
 "Adressbook angeven hest."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail kann en lütt (48x48 Pixels), swattwitt Bild vun siete Gööd mit elk "
 "Naricht sennen. Dat kann t.B. en Bild vun Di oder en Symbool wesen. En Reeg "
@@ -15251,11 +13160,11 @@ msgstr "Hier kannst Du jichtenseen X-Face-Tekenkeed ingeven."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Bispelen gifft dat op <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Bispelen gifft dat op <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
+"www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15270,131 +13179,1801 @@ msgstr "Keen Bild"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Du hest Dien egen Daten nich na't Adressbook ingeven."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Tosamen: %2<br>Nich leest: %3<br>Grött: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Ünnerschrieven"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Bruukgrenz: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Narichten &automaatsch ünnerschrieven"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Bedraap vun de Naricht fastleggen"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Wenn aktiveert, warrt all rutgahn Narichten standardwies ünnerschreven. "
+"Natürlich kannst Du dat Ünnerschrieven för elk Naricht enkel utmaken."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Kopie na \"Adress\" sennen"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Verslöteln"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Blindkopie na \"Adress\" sennen"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Bi't Verslöteln vun Nettbreven jümmers ok för't &Zertifikaat vun mien egen "
+"Identiteet verslöteln"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "\"Koppreeg\" de Naricht tofögen"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Wenn aktiveert, warrt de Naricht/Datei nich bloots mit den apen Slötel vun "
+"den Adressaat, man ok mit Dien egen apen Slötel verslötelt. Bloots so kannst "
+"Du de Naricht ok later noch opslöteln un denn lesen. Normalerwies warrt "
+"disse Optschoon anmaakt."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Hööftdeel ut \"Datei\" lesen"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Ünners&chreven/verslötelt Text na't Opstellen wiesen"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Hööftdeel vun de Naricht fastleggen"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Wenn aktiveert, warrt de ünnerschreven/verslötelt Text in en nieg Finster "
+"wiest, so dat Du di ankieken kannst, wodennig he utsüht, ehr Du em sennst. "
+"Dat is goot, wenn Du pröven wullt, wat Dien Verslötel-Systeem richtig "
+"arbeidt."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "De Naricht en Bilaag tofögen. Kann wedderhaalt warrn."
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Sendt Narichten &verslötelt wohren"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Bloots na niege Post kieken"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Aktiveer dit, wenn Du Dien Narichten verslötelt wohren wullt"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Bloots den Nettbreefeditor opmaken"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Sendt Narichten verslötelt wohren</h1>\n"
+"Wenn dit aktiveert is, warrt sendt Narichten verslötelt sekert, so as se "
+"sendt wöörn. Dat is nich anraadt, wiel Du de Narichten nich mehr ankieken "
+"kannst, wenn een nödig Zertifikaat aflöppt.\n"
+"<p>\n"
+"Villicht gifft aver lokale Regeln, na de Du dat anmaken muttst. Wenn Du dat "
+"nich nau weetst, snack dor Dien Systeempleger op an.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Angeven Narichtdatei ankieken"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Verslötelslötels jümmers för't &Beglöven wiesen"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Naricht na \"Adress\" sennen, un de Datei bileggen, op de \"URL\" wiest"
+"Wenn aktiveert, warrt Di dat Programm jümmers en List vun apen Slötels "
+"wiesen, ut de Du den utsöken kannst, de denn för't Verslöteln bruukt warrt. "
+"Is dat nich aktiveert, kriggst Du de Utwahl bloots denn to sehn, wenn dat "
+"Programm den richtigen Slötel nich finnen kann oder wenn dat mehr as een "
+"Slötel gifft, de bruukt warrn kunn."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Leest"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Narichten jü&mmers verslöteln wenn mööglich"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Oolt"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Wenn aktiveert, warrt Dien rutgahn Narichten jümmers verslötelt, wenn dat "
+"mööglich is un Sinn hett. Natürlich kannst Du disse automaatsche Verslöteln "
+"för elk Naricht enkel utmaken."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Wegdaan"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nich ünnerschrieven/verslöteln bi't Sekern as N&ich fardig"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Antert"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Wodennig funkscheneert dit?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Wiederleddt"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Allgemeen"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "In Postutgang"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Antern"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sendt"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Na all antern"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Beluert"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Wiederledden"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Övergahn"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Tastkombinatschoon:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Warven"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Vörlaag-Typ:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Naricht"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Vörlaag-Inholt"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Opgaav"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Vörlaag-Tastkombinatschoon"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Hett en Bilaag"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Vörlaag-Typ"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 vun %2 %3 bruukt"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Orner-Egenschappen"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Padd"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Orner bargt en &Nettpostlist"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "List&adress:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormaal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Nich l&eest:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Wohrtiet"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "W&ohrtiet löppt af na:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Wohrtiet gellt för &leest Narichten"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Wo&hrtiet löppt af na:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Wohrtiet gellt för &nich leest Narichten"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Daag"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Weken"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Maand(en)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Verwiedert"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Senner-&Identiteet:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Formaat för't &Sekern:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&List wiest:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Töven Nettpost bi't Kieken sennen"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Dat gifft al en Datei mit den Naam \"%1\". Büst Du seker, dat Du ehr "
-"överschrieven wullt?"
+"<qt><p>Legg fast, wat KMail Nettpost binnen den Postutgang bi't Kieken vun "
+"Hand oder jümmers bi't Kieken na Nettpost sennen schall, oder wat Du dat "
+"automaatsche Sennen heel utmaken wullt.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Datei överschrieven?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Nich synkroniseert Narichten automaatsch ut Ornern ahn noog Togrieprechten "
+"rutschuven"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Gifft dat binnen en Orner niege Narichten, de noch nich na den Server "
+"hoochlaadt wöörn, man Du hest nich noog Verlöven, dat Du dat nu doon kannst, "
+"denn warrt disse Narichten automaatsch na den Orner \"Wegkamen+funnen\" "
+"verschaven."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Lokaal Marken binnen bloots leesbor Ornern verlöven"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Mit disse Instellen köönt Plegers en lüttst Tietafstand fastleggen, de "
+"twischen tweemaal Kieken na Nettpost liggen mutt.\"\n"
+"           \"De Bruker kann keen lütter Weert as den hier fastleggten "
+"utsöken."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "De tolest utsöchte Orner binnen den Ornerutwahldialoog"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Den Bruker sien Instellen för de Dateirechten (\"umask\") övergahn un "
+"Dateien bloots för den Bruker lees- un schriefbor maken"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Regel för't Wiesen vun dat Systeemafsnitt-Lüttbild"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Dat Programm utmaken, wenn dat Hööftfinster tomaakt warrt, ok wenn dat en "
+"Systeemafsnitt-Lüttbild gifft"
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Enkelheiten binnen Bescheed över niege Post"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Wenn aktiveert, wiest de Bescheed över niege Nettpost de Tall vun niege "
+"Nettbreven per Orner, anners bargt de Bescheed bloots de Mellen, dat "
+"överhööft niege Post kamen is."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "E&ditor angeven:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "E&xtern Editor bruken"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"De Grenz, bi de en Bruker wohrschoot warrt, dat en Orner neeg to sien "
+"Bruukgrenz kamen is."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Arbeitkoppelfunkschonen anmaken"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "\"Vun\"- un \"Na\"-Koppregen in Antwoorden op Antwoorden ümdreihen"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook ünnerstütt den iCalendar-Standard nich heel richtig, disse "
+"Optschoon arbeidt an een vun disse Fehlers vörbi. Wenn Outlook-Brukers Dien "
+"Antwoorden nicht kriegt, versöök dat mit disse Optschoon."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Arbeitkoppel-Inladen binnen Hööftdeel sennen"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook ünnerstütt den iCalendar-Standard nich heel richtig, disse "
+"Optschoon arbeidt an een vun disse Fehlers vörbi. Wenn Outlook-Brukers Dien "
+"Inladen nicht kriegt, versöök dat mit disse Optschoon."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Inladen kompatibel to MS Exchange maken"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook hett, wenn dat tosamen mit en Microsoft Exchange Server "
+"bruukt warrt, Problemen bi't Verstahn vun Arbeitkoppel-Nettpost, de langs "
+"den Standard opstellt wöör. Maak dit an, wenn ok MS Exchange Dien "
+"Arbeitkoppel-Inladen verstahn könen schall."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Wenn aktiveert, duukt de Nettbreef-Editor nich op, ansteed warrt all Inladen "
+"automaatsch sendt. Wenn Du de Naricht ehr't Sennen ankieken wullt, maak "
+"disse Optschoon ut. Beacht bitte, dat de Text in iCalendar-Schriefwies is, "
+"Du schullst em nich per Hand ännern."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Inladen-Nettbreven wegdoon, wenn de Antwoort dor op loosstüert wöör"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Is dit anmaakt, warrt Inladen-Nettbreven, de en Antwoort kregen hebbt, na de "
+"Affalltünn verschaven."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Wenn aktiveert, köönt Indrääg vun de Kontact-Programmen (KOrganizer, "
+"KAdressbook un KNotes) sekert warrn.</p><p>Wenn Du disse Optschoon bruken "
+"wullt, muttst Du ok de Programmen so instellen, dat se de IMAP-Ressource "
+"bruukt; dat kannst Du binnen dat TDE-Kuntrullzentrum.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalerwies gifft dat keen Grund, sik de Ornern mit de IMAP-Ressourcen "
+"antokieken. Wenn Du dat liekers wullt oder muttst, kannst Du disse Optschoon "
+"bruken.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Wenn Du dat Arbeitkoppel-Konto nich för normaal Nettpost\"\n"
+"          \"bruukst, maak dit an - KMail wiest denn bloots Arbeitkoppel-"
+"Ornern.\"\n"
+"          \"Dit is denn goot, wenn Du för normaal Nettpost en anner tokoppelt"
+"\"\n"
+"          \"IMAP-Konto bruukst.\"</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Formaat för de Arbeitkoppel-Ornern fastleggen<ul><li>Standardwies warrt "
+"de \"ical\"- (för Kalennerornern) un \"vcard\"-Standard (för "
+"Adressbookornern) bruukt. Dit Formaat maakt all Kontact-Funkschonen "
+"verföögbor.</li><li>Dat XML-Formaat vun Kolab is en egen Formaat, dat neger "
+"bi Outlook sien liggt. Wenn en Kolab-Server (oder en anner kompatibel Lösen) "
+"bruukt warrt, gifft dit Formaat en betere Kompatibiliteet to Outlook.</li></"
+"ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Hier kannst Du den Wörtelorner för de IMAP-Ressourceornern fastleggen.</"
+"p><p>Standardwies leggt de Kolab-Server den IMAP-Postingang as Wörtelorner "
+"fast.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Dit is de ID vun dat Konto, na dat de IMAP-Ressourceornern tohöört.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Wenn Du de Ornernaams vun den IMAP-Spieker op Dien egen Spraak instellen "
+"wullt, kannst Du een vun disse Spraken utsöken.</p><p>Beacht bitte, dat dat "
+"dor bloots een Grund för gifft, dat is de Kompatibiliteet to Microsoft "
+"Outlook. Sünst is dat nich so goot, wiel denn dat Wesseln vun de Spraak nich "
+"mehr mööglich is.</p><p>Laat dat also blieven, wenn Du dat nich bruukst.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Ok niege Nettbreven binnen Arbeitkoppelornern filtern"
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Ännern vun Arbeitkoppeldaten bi afkoppelt IMAP-Ornern fuurts na't Tokoppeln "
+"synkroniseren"
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Över dissen Weert warrt fastleggt, wat de Inföhren för KMail wiest warrt."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Hööchsttall för Verbinnen per Reekner"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Mit disse Optschoon kannst Du de Tall vun Verbinnen per Reekner för dat "
+"Kieken na Nettpost ingrenzen. Standardwies is disse Tall nich ingrenzt (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Fixsöök-Ingaavreeg wiesen"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Disse Optschoon maakt de Fixsöök baven de Narichtenlist an oder ut. Mit ehr "
+"kannst Du de Informatschonen binnen de Narichtenlist gau finnen."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Lokaal Postingang versteken, wenn he nich bruukt warrt"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Standardwies binnenreegs wiederledden"
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Den Streekpunkt (\";\") binnen den Narichteneditor as Trennteken tolaten"
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "Bi't Antern un Wiederledden Orginaaltekensett bruken (wenn mööglich)"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Signatuur a&utomaatsch infögen"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Disse Identiteet wohren, so dat se ok later binnen dat Nettbreef-"
+"Editorfinster bruukt warrt\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Dissen Orner för sendt Narichten wohren, so dat he ok later binnen dat "
+"Nettbreef-Editorfinster bruukt warrt"
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Dissen Överdreegmetood wohren, so dat se ok later binnen dat Nettbreef-"
+"Editorfinster bruukt warrt"
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Disse Identiteet wohren, so dat se ok later binnen dat Nettbreef-"
+"Editorfinster bruukt warrt\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Reegü&mbrook bi Striep:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Wohrschoen, wenn Wörte&lzertifikaat aflöppt in weniger as"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Aktiveer dit, wenn Outlook &#8482; Bilagennaams mit Sünnertekens (nich-"
+"engelsche Bookstaven) verstahn schall"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "&Narichttostand-Bescheden automaatsch anföddern"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Aktiveer dit, wenn KMail för rutgahn Narichten Narichttostand-"
+"Bescheden (NTBen) anföddern schall.</p><p>Dit leegt bloots dat "
+"Standardbedregen fast, Du kannst dat för elk Naricht enkel binnen den "
+"Nettbreef-Editor anners fastleggen. Bruuk dat Menü <em>Optschonen</em> -> "
+"<em>Narichttostand-Bescheed anföddern</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Tolest bruukt Adressen för automaatsche Kompletteren bruken"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Maak disse Optschoon ut, wenn binnen den Nettbreef-Editor de tolest bruukten "
+"Adressen nich binnen de List för't automaatsche Kompletteren vun Adressen "
+"opduken schöölt."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Tiet för't automaatsche Sekern"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"De Text binnen den Nettbreef-Editor kann automaatsch sekert warrn. Hier "
+"kannst Du de Tiet instellen, na de jümmers automaatsch sekert warrt. De "
+"Weert 0 maakt de Funkschoon ut."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Signaturen baven ziteert Text infögen"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "För bekannte Prefi&xen \"Re:\" insetten"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "För bekannte Prefixen \"&Fwd:\" insetten"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Plietsch &ziteren"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "De Ünnerschrift is aflopen."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Typ vun de Adressaat-Utwahl"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Leggt den Dialoogtyp för Utsöken vun \"Na\"-, \"Kopie\"-\n"
+"un \"Blindkopie\"-Indrääg fast."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Typ vun den Adressaat-Editor"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Leggt den Editortyp för't Bewerken vun \"Na\"-, \"Kopie\"-\n"
+"un \"Blindkopie\"-Indrääg fast."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Hööchsttall för Adressaat-Editoregen"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"List vun Narichtdeel-Typen, de Du vun Nettbreven bi't Wiederledden "
+"binnenreegs wegmaken wullt"
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "De hööchtse tolaten Grött vun Nettpostbilagen in MB."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Textsnippel-Pleeg- un -Inföögpaneel binnen Editor wiesen"
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr "Dat GnuPG-Pröövlogbook liekers wiesen, wenn de Akschoon Spood harr"
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "Bi't Antern un Wiederledden Orginaaltekensett bruken (wenn mööglich)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"En poor Nettbreven, besünners automaatsch opstellte, gifft den Tekensett "
+"nich an, de för en richtige Dorstellen bruukt warrt. Denn warrt dat Standard-"
+"Tekensett bruukt, dat Du hier instellen kannst. Legg hier den Tekensett "
+"fast, de in Dien Deel vun de Welt tomehrst bruukt warrt. As Vörinstellen "
+"warrt de Koderen vun Dien Systeem bruukt."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Wenn Du hier wat anners as \"Automaatsch\" instellst, warrt all Nettbreven "
+"mit den niegen Tekensett wiest, de Angaven binnen de Narichten warrt "
+"övergahn."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Aktiveer dit, wenn Du ansteed vun Smileys binnen den Narichttext Snuten "
+"(lütt Biller) hebben wullt."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Aktiveer dit, wenn Du verscheden Evenen binnen ziteert Text hebben wullt."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Evene automaatsch infoolden:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Lüttere Schrift för ziteert Text bruken"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Aktiveer dit, wenn Du ziteert Text mit en lüttere Schrift dorstellen wullt"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Sendt Narichten &verslötelt wohren"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Brukerprogramm för Smucke Köpp wiesen"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Maak dit an, wenn Du binnen de Smucken Köpp de Regen \"Brukerprogramm\" un "
+"\"X-Senner\" wiest hebben wullt."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Dat Wegdoon vun Bilagen vun vörhannen Nettbreven tolaten"
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Dat Bewerken vun Bilagen vun vörhannen Nettbreven tolaten"
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Narichten bi't Ankieken jümmers opslöteln, oder vördem fragen"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Narichttostand-Bescheden mit leddig Senner-Feld sennen"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Sendt Narichttostand-Bescheden mit en leddig Senner-Feld. En Reeg Servers "
+"wiest disse Narichten torüch, wenn dat also Problemen bi't Sennen vun NTBen "
+"gifft, maak disse Optschoon ut."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Sätz to Vörlagen ümwannelt"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Ole Sätz to Vörlagen ümwannelt"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Narichtenvörlaag för nieg Naricht"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Narichtenvörlaag för Antwoort"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Narichtenvörlaag för Antwoort na all"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Narichtenvörlaag för Wiederledden"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Zitaattekens"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Brukers dörvt Annerwarts-Bescheden anners instellen"
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Brukers dörvt Annerwarts-Sieveskripten hoochladen, man de Instellen nich "
+"ännern, so as de Antwoort-Domään oder de Warvenpost-Optschoon."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "Annerwarts-Bescheden bloots för Nettbreven ut disse Domään loosstüern"
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "Annerwarts-Bescheden för Nettpost loosstüern, de as Warven markeert is"
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Bi't Opropen vun KMail pröven, wat dor noch en Annerwarts-Bescheed anmaakt is"
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Datei &bewerken"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Bewerken..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Gah na"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Orner"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Naricht"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Antern (besünner)"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Wiederledden"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Kortinformatschonen"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Snippel-Instellen"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-Warktüüchbalken"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Allgemeen Optschonen"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-Warktüüchbalken"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Zertifikaat-Gellen mit ZTLen pröven"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Wenn aktiveert, warrt S/MIME-Zertifikaten över Zertifikaat-Torüchrooplisten "
+"(ZTLen) pröövt."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Zertifikaten över Internet pröven (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Wenn aktiveert, warrt S/MIME-Zertifikaten direktemang över dat Internet mit "
+"dat Internet-Zertifikaattostand-Protokoll (\"Online Certificates Status "
+"Protocol\", OCSP) pröövt. Giff bitte de URL vun den OCSP-Server nerrn in"
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Internet-Zertifikaatprööv"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL vun den OCSP-Server:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Giff hier de Adress vun den Server för' Pröven vun Zertifikaattostänn över "
+"Internet in (OCSP-Server). De URL fangt normalerwies mit http:// an."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Signatuur vun den OCSP-Server:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Deenst-URL vun Zertifikaten övergahn"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Zertifikaatregeln nich pröven"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Standardwies kiekt GnuPG binnen de Datei \"~./gnupg/policies.txt\", wat en "
+"Zertifikaatregel verlöövt is. Is dit aktiveert, warrt de Regeln nich pröövt."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "ZTLen nienich bruken"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Wenn aktiveert, warrt Zertifikaat-Torüchrooplisten nich för't Pröven vun S/"
+"MIME-Zertifikaten bruukt."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Fehlen Rutgeverzertifikaten daalladen"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Wenn aktiveert, warrt fehlen Rutgeverzertifikaten daallaadt, wenn nödig "
+"(gellt för beed Pröövmetoden, ZTLen un OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-Anfragen"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Keen HTTP-Anfragen utföhren"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "HTTP för S/MIME heel utmaken"
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Dissen Proxy för HTTP-Anfragen bruken: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Systeem-Proxy för HTTP bruken: "
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Wenn aktiveert, warrt de Weert för den HTTP-Proxy (wiest rechterhand, Weert "
+"vun de Ümgeven-Variable \"http_proxy\") för all HTTP-Anfragen bruukt."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Giff hier de Adress vun Dien HTTP-Proxy in, de för all HTTP-Anfragen för S/"
+"MIME bruukt warrt. De Schriefwies is \"Reekner:Port\", t.B. \"mienproxy."
+"narms.nds:3128\"."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "HTTP-ZTL-Verdeelsteden ut Zertifikaten övergahn"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Vele Zertifikaten bargt Indrääg över ZTL-Verdeelsteden (\"CRL Distribution "
+"Points\") - URLs, ünner de künnig maakt warrt, woneem sik de ZTL findt. De "
+"eerste Verdeelsteed-Indrag warrt bruukt. Is disse Optschoon aktiveert, warrt "
+"all Indrääg övergahn, de dat HTTP-Protokoll bruukt."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-Anfragen"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Keen LDAP-Anfragen utföhren"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Maakt den Bruuk vun LDAP för S/MIME heel ut."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "LDAP-ZTL-Verdeelsteden ut Zertifikaten övergahn"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Vele Zertifikaten bargt Indrääg över ZTL-Verdeelsteden (\"CRL Distribution "
+"Points\") - URLs, ünner de künnig maakt warrt, woneem sik de ZTL findt. De "
+"eerste Verdeelsteed-Indrag warrt bruukt. Is disse Optschoon aktiveert, warrt "
+"all Indrääg övergahn, de dat LDAP-Protokoll bruukt."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Hööftreekner för LDAP-Anfragen:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Wenn Du hier en LDAP-Server angiffst, gaht all LDAP-Anfragen toeerst na "
+"dissen Server. Technisch warrt disse Reekner ansteed all angeven oder ok "
+"nich angeven Reekner- un Portdelen vun en LDAP-URL bruukt. Anner LDAP-"
+"Servers warrt bloots bruukt, wenn dat Tokoppeln na den \"Proxy\" fehlsleit.\n"
+"De Schriefwies is \"Reekner\" oder \"Reekner:Port\". Is keen Port angeven, "
+"warrt Port 389 (Standardport för LDAP) bruukt."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Snippel tofögen"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Tofögen"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Snippel:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Koppel:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Snippel-Instellen"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Kortinformatschonen"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Snippeltext as &Kortinformatschoon wiesen"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Leggt fast, wat as Kortinformatschoon wat Text vun de Reeg mit dat Leesteken "
+"wiest warrt"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variabeln"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Ingaavmetood för Variabeln"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Een Dialoog för elk Variabel binnen en Snippel"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "För elkeen Variabel binnen en Snippel warrt een Dialoog wiest"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Een Dialoog för all Variabeln binnen en Snippel"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"En enkel Dialoog warrt wiest, binnen den Du de Weerten för all Variabeln vun "
+"en Snippel ingeven kannst"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Trennteken:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Vörlagen instellen"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Antwoort na Senner"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Na all antern / Na List antern"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Naricht wiederledden"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Wohrschoen, ehr nich ünne&rschreven Narichten sendt warrt"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Aktiveer dit, wenn Du wohrschoot warrn wullt, ehr nich ünnerschreven "
+"Narichten sendt warrt"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, ehr nich ünnerschreven Narichten sendt warrt</h1>\n"
+"Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, ehr Du nich "
+"ünnerschreven Narichten oder Narichtdelen sennst.\n"
+"<p>\n"
+"För hööchste Sekerheit is disse Optschoon anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Wohrschoen, ehr nich verslötelt Narichten sendt warrt"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Aktiveer dit, wenn Du wohrschoot warrn wullt, ehr nich verslötelt Narichten "
+"sendt warrt"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, ehr nich verslötelt Narichten sendt warrt</h1>\n"
+"Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, ehr Narichtdelen "
+"oder heel Narichten ahn Verslöteln sendt warrt.\n"
+"<p>\n"
+"För hööchste Sekerheit is disse Optschoon anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Wohrschoen, wenn Ad&ressaat-Zertifikaat sien Nettpostadress nich bargt"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Aktiveer dit, wenn Du wohrschoot warrn wullt, wenn de Nettpostadress vun den "
+"Adressaat nich binnen sien Zertifikaat steiht."
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, wenn Adressaat-Zertifikaat Nettpostadress nich bargt</h1>\n"
+"Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn de "
+"Nettpostadress vun den Adressaat nich binnen sien för't Verslöteln bruukt "
+"Zertifikaat steiht.\n"
+"<p>\n"
+"För hööchste Sekerheit is disse Optschoon anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Wohrschoen, wenn Zertifikaten/Slötels neegst aflöppt (Tieden warrt nerrn "
+"instellt)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "För't Ünnerschrieven"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "För't Verslöteln"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Söök hier de Tall vun Daag ut"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, wenn Ünnerschriev-Zertifikaat aflöppt</h1>\n"
+"Hier kannst Du de Tall vun Daag fastleggen, de en Ünnerschriev-Zertifikaat "
+"noch gellen mutt, ahn dat Du wohrschoot warrst.\n"
+"<p>\n"
+"För SPHINX sünd 14 Daag anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, wenn Verslötel-Zertifikaat aflöppt.</h1>\n"
+"Hier kannst Du de Tall vun Daag fastleggen, de en Zertifikaat för't "
+"Verslöteln tominnst noch gellen mutt, ahn dat Du wohrschoot warrst.\n"
+"<p>\n"
+"För de SPHINX-Ümgeven sünd 14 Daag anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, wenn en Zertifikaat binnen de Keed aflöppt</h1>\n"
+"Hier kannst Du de Tall vun Daag fastleggen, de all Zertifikaten binnen de "
+"Keed noch gellen mööt, ahn dat Du wohrschoot warrst.\n"
+"<p>\n"
+"För de SPHINX-Ümgeven sünd 14 Daag anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, wenn ZA-Zertifikaat aflöppt</h1>\n"
+"Hier kannst Du de Tall vun Daag fastleggen, de dat Zertifikaat vun de ZA "
+"(Zertifikaatautoriteet) noch gellen mutt, ahn dat Du wohrschoot warrst.\n"
+"<p>\n"
+"För SPHINX sünd 14 Daag anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Wohrschoen, wenn dat Wörtelzertifikaat aflöppt</h1>\n"
+"Hier kannst Du de Tall vun Daag fastleggen, de dat Wörtelzertifikaat noch "
+"gellen mutt, ahn dat Du wohrschoot warrst.\n"
+"<p>\n"
+"För SPHINX sünd 14 Daag anraadt.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "För Wörtelzertifikaten:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "För ZA-Twischenstoopzertifikaten:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "För Brukerzertifikaten/-Slötels:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "All \"Nich nochmaal fragen\"-Wohrschoen wedder anmaken"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>... dat Du mit de linke un rechte Pieltast na de nakamen un verleden "
+"Naricht gahn kannst?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>... dat Du över dat <em>Rechtsklickmenü</em> vun de Narichtenlist mit "
+"<em>Filter opstellen</em> gau Filtern för Senner, Adressaat, Bedraap un "
+"Nettpostlisten opstellen kannst?\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... dat Du den Deel &quot;[List-Naam]&quot;, de bi en Reeg\n"
+"Nettpostlisten automaatsch den Bedraap toföögt warrt, eenfach\n"
+"looswarrn kannst, wenn Du de Filterakschoon <em>Koppreeg\n"
+"ümschrieven</em> bruukst? Dat geiht so:\n"
+"<pre>Koppreeg ümschrieven: &quot;Bedraap&quot;\n"
+"   wessel &quot;\\s*\\[List-Naam\\]\\s*&quot;\n"
+"   ut gegen &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>... dat Du Ornern över den Dialoog <em>Orner -&gt;\n"
+"Nettpostlist-Pleeg</em> Nettpostlisten toornen kannst? Denn kannst\n"
+"Du över den Orner sien <em>Rechtsklickmenü</em> un <em>Nieg\n"
+"Naricht na Nettpostlist...</em> den Nettbreefeditor mit de Adress vun\n"
+"de List binnen dat Adressaatfeld opmaken.\n"
+"Du kannst ok mit den Middelmuusknoop op den Orner klicken.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>... dat Du för elk Orner en egen Lüttbild instellen kannst?\n"
+"Kiek ünner <em>Orner -&gt; Egenschappen</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>... dat KMail en Klöörbalken wiesen kann, de den Typ (Eenfachtext,\n"
+"HTML, OpenPGP) vun de jüst wieste Naricht angifft?</p>\n"
+"<p>Dat schuult Di vör Versöök, över HTML-Narichten KMail sien Dorstellen\n"
+"för en pröövt, goot Ünnerschrift natomaken.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>... dat Du op elk Koppregen filtern kannst, wenn Du sien Naam in\n"
+"dat eerste Feld vun de Söökregel ingiffst?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... dat Du op HTML-Nettbreven filtern kannst, wenn Du\n"
+"<pre>&quot;Content-type&quot; bargt &quot;text/html&quot;</pre>\n"
+"as Söökregel bruukst?\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>... dat bi't Antern bloots de markeert Textdeel ziteert warrt?</p>\n"
+"<p>Wenn nix markeert is, warrt de hele Text ziteert.</p>\n"
+"<p>Dat funkscheneert sogor mit Text ut Bilagen, wenn Du\n"
+"<em>Ansicht -&gt; Bilagen -&gt; Inbett</em> anmaakt hest.</p>\n"
+"Disse Funkschoon is för all Anter-Befehlen verföögbor, utnahmen\n"
+"<em>Naricht -&gt; Ahn Zitaat antern</em>.</p>\n"
+"<p align=\"right\"><em>Bidragen vun David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Fixsöök-Ingaavreeg wiesen"
@@ -15417,7 +14996,9 @@ msgstr "Datei överschrieven?"
 #~ msgstr "Nieg Narichten warrt haalt"
 
 #~ msgid "Only filter mails received in disconnected IMAP inbox."
-#~ msgstr "Bloots Nettbreven filtern, de binnen den Postingang vun en afkoppelt IMAP-Konto ankamen sünd."
+#~ msgstr ""
+#~ "Bloots Nettbreven filtern, de binnen den Postingang vun en afkoppelt IMAP-"
+#~ "Konto ankamen sünd."
 
 #~ msgid "Show folder quick search line edit"
 #~ msgstr "Ingaavreeg för Orner-Fixsöök wiesen"
@@ -15492,38 +15073,48 @@ msgstr "Datei överschrieven?"
 #~ msgstr "&All Narichtdelen verslöteln"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Aktiveer dit, wenn Du standardwies all Narichtdelen verslöteln wullt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du standardwies all Narichtdelen verslöteln wullt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Standardwies all Narichtdelen verslöteln</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt all Narichtdelen (de Hööftdeel un all Bilagen) standardwies verslötelt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt all Narichtdelen (de Hööftdeel "
+#~ "un all Bilagen) standardwies verslötelt.\n"
 #~ "<p>\n"
-#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel Naricht ok anners fastleggen.\n"
+#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel "
+#~ "Naricht ok anners fastleggen.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "För el&k Narichtdeel ehr't Verslöteln nafragen"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Aktiveer dit, wenn Du för elk Narichtdeel wedder fraagt warrn wullt, wat Du em verslöteln wullt."
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du för elk Narichtdeel wedder fraagt warrn wullt, wat "
+#~ "Du em verslöteln wullt."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>För elk Narichtdeel ehr't Verslöteln nafragen</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrst Du för elkeen Narichtdeel (de Hööftdeel un all Bilagen) wedder fraagt, wat Du em verslöteln wullt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrst Du för elkeen Narichtdeel (de "
+#~ "Hööftdeel un all Bilagen) wedder fraagt, wat Du em verslöteln wullt.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15537,14 +15128,17 @@ msgstr "Datei överschrieven?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Narichten nich verslöteln</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt Narichten standardwies nich verslötelt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt Narichten standardwies nich "
+#~ "verslötelt.\n"
 #~ "<p>\n"
-#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel Naricht ok anners fastleggen.\n"
+#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel "
+#~ "Naricht ok anners fastleggen.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15556,58 +15150,84 @@ msgstr "Datei överschrieven?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Verslötel-Algoritmus</h1>\n"
-#~ "En Algoritmus is hier en List vun Anwiesen för den Reekner, wodennig he en geven Opgaav utföhren schall. De Verslötel-Algoritmus gifft an, wodennig de Reekner den Adressaat sien Slötel op de Naricht anwennen mutt, so dat bloots de Adressaat de Naricht opslöteln un lesen kann.\n"
+#~ "En Algoritmus is hier en List vun Anwiesen för den Reekner, wodennig he "
+#~ "en geven Opgaav utföhren schall. De Verslötel-Algoritmus gifft an, "
+#~ "wodennig de Reekner den Adressaat sien Slötel op de Naricht anwennen "
+#~ "mutt, so dat bloots de Adressaat de Naricht opslöteln un lesen kann.\n"
 #~ "<p>\n"
-#~ "Vun den utsöchten Algoritmus hangt dat af, wo licht oder swoor dat för en anner Persoon is, de Naricht aftofangen un to lesen, man all vun de SPHINX-Ümgeven praatstellte Algoritmen warrt as bannig seker estemeert. Normalerwies funkscheneert de Vörinstellen goot.\n"
+#~ "Vun den utsöchten Algoritmus hangt dat af, wo licht oder swoor dat för en "
+#~ "anner Persoon is, de Naricht aftofangen un to lesen, man all vun de "
+#~ "SPHINX-Ümgeven praatstellte Algoritmen warrt as bannig seker estemeert. "
+#~ "Normalerwies funkscheneert de Vörinstellen goot.\n"
 #~ "<p>\n"
-#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel Naricht ok anners fastleggen.\n"
+#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel "
+#~ "Naricht ok anners fastleggen.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
 #~ msgstr "Pröö&v dörv bi en lokaal sekert Zertifikaat ennen"
 
 #~ msgid "Check to end with locally saved certificate."
-#~ msgstr "Aktiveer dit, wenn Du de Prööv bi en lokaal sekert Zertifikaat ennen schall"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du de Prööv bi en lokaal sekert Zertifikaat ennen "
+#~ "schall"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Prööv dörv bi en lokaal sekert Zertifikaat ennen</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, dörv de Prööv vun de Zertifikaten-Keed mit en lokaal sekert Zertifikaat ennen.\n"
+#~ "Wenn disse Optschoon aktiveert is, dörv de Prööv vun de Zertifikaten-Keed "
+#~ "mit en lokaal sekert Zertifikaat ennen.\n"
 #~ "<p>\n"
-#~ "Lokaal sekert warrt Dien egen Zertifikaten, de vun Dien Kommunikatschoonpartnern un de vun de Zertifikaat-Autoriteten (CAs).\n"
+#~ "Lokaal sekert warrt Dien egen Zertifikaten, de vun Dien "
+#~ "Kommunikatschoonpartnern un de vun de Zertifikaat-Autoriteten (CAs).\n"
 #~ "<qt>"
 
 #~ msgid "Always c&heck to root certificate"
 #~ msgstr "Jümmers bet na't &Wörtelzertifikaat pröven"
 
 #~ msgid "Check here to check up to the root certificate"
-#~ msgstr "Aktiveer dit, wenn Du jümmers bet na't Wörtelzertifikaat pröven wullt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du jümmers bet na't Wörtelzertifikaat pröven wullt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Jümmers bet na't Wörtelzertifikaat pröven</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt de Zertifikaten-Keed vun denn Adressaat sien Zertifikaat jümmers heel bet na't Wörtelzertifikaat pröövt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt de Zertifikaten-Keed vun denn "
+#~ "Adressaat sien Zertifikaat jümmers heel bet na't Wörtelzertifikaat "
+#~ "pröövt.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15619,14 +15239,17 @@ msgstr "Datei överschrieven?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Zertifikaten-Keed pröven</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt de hele Zertifikaten-Keed vun den Adressaat sien Zertifikaat bet na't Wörtelzertifikaat hen pröövt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt de hele Zertifikaten-Keed vun "
+#~ "den Adressaat sien Zertifikaat bet na't Wörtelzertifikaat hen pröövt.\n"
 #~ "<p>\n"
 #~ "Beacht bitte, dat den Adressaat sien Zertifikaat jümmers pröövt warrt.\n"
 #~ "</qt>"
@@ -15640,33 +15263,48 @@ msgstr "Datei överschrieven?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Zertifikaat-Torüchrooplisten (ZTLen) bruken</h1>\n"
-#~ "Op en Zertifikaat-Torüchrooplist (\"Certificate Revocation List\", CRL) staht Zertifikaten, de torüchtrocken wöörn un de nich mehr för't Verslöteln bruukt warrn schöölt. En Bruker kann sien Zertifikaat t.B. denn torüchtrecken, wenn he meent, dat sien Zertifikaat nich mehr seker is (t.B. wenn de PIN apen worrn is).\n"
+#~ "Op en Zertifikaat-Torüchrooplist (\"Certificate Revocation List\", CRL) "
+#~ "staht Zertifikaten, de torüchtrocken wöörn un de nich mehr för't "
+#~ "Verslöteln bruukt warrn schöölt. En Bruker kann sien Zertifikaat t.B. "
+#~ "denn torüchtrecken, wenn he meent, dat sien Zertifikaat nich mehr seker "
+#~ "is (t.B. wenn de PIN apen worrn is).\n"
 #~ "<p>\n"
-#~ "För hööchste Sekerheit is dat Bruken vun ZTLen anraadt. Binnen den Instellen-Dialoog för Zertifikaten un Torüchrooplisten kannst Du angeven, woneem de ZTLen to finnen sünd.\n"
+#~ "För hööchste Sekerheit is dat Bruken vun ZTLen anraadt. Binnen den "
+#~ "Instellen-Dialoog för Zertifikaten un Torüchrooplisten kannst Du angeven, "
+#~ "woneem de ZTLen to finnen sünd.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "&Wohrschoen, wenn ZTL aflöppt in weniger as"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Aktiveer dit, wenn Du wohrschoot warrn wullt, wenn en ZTL neegst aflöppt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du wohrschoot warrn wullt, wenn en ZTL neegst aflöppt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Wohrschoen, wenn ZTL neegst aflöppt</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn een vun Dien ZTLen neegst aflöppt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn een vun "
+#~ "Dien ZTLen neegst aflöppt.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15675,14 +15313,16 @@ msgstr "Datei överschrieven?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Wohrschoen, wenn ZTL neegst aflöppt</h1>\n"
-#~ "Hier kannst Du de Tall vun Daag fastleggen, de Du ehr't Aflopen vun en ZTL dor över wohrschoot warrst.\n"
+#~ "Hier kannst Du de Tall vun Daag fastleggen, de Du ehr't Aflopen vun en "
+#~ "ZTL dor över wohrschoot warrst.\n"
 #~ "<p>\n"
 #~ "För de SPHINX-Ümgeven is de anraadt Tall 7 Daag.\n"
 #~ "</qt>"
@@ -15691,42 +15331,56 @@ msgstr "Datei överschrieven?"
 #~ msgstr "&Jümmers för mi sülven verslöteln"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Aktiveer dit, wenn Du verslötelt Narichten ok mit Dien egen Slötel verslöteln wullt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du verslötelt Narichten ok mit Dien egen Slötel "
+#~ "verslöteln wullt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Jümmers för mi sülven verslöteln</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt rutgahn verslötelt Narichten jümmers ok mit Dien egen Slötel verslötelt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt rutgahn verslötelt Narichten "
+#~ "jümmers ok mit Dien egen Slötel verslötelt.\n"
 #~ "<p>\n"
-#~ "Disse Optschoon is anraadt, anners kannst Du de Narichten, de Du sendt hest, nich lesen.\n"
+#~ "Disse Optschoon is anraadt, anners kannst Du de Narichten, de Du sendt "
+#~ "hest, nich lesen.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
 #~ msgstr "Wohrschoen, wenn en Keed-Zertifikaat aflöppt in weniger as"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Aktiveer dit, wenn Du wohrschoot warrn wullt, wenn dat Zertifikaat neegst aflöppt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du wohrschoot warrn wullt, wenn dat Zertifikaat neegst "
+#~ "aflöppt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Wohrschoen, wenn Zertifikaat aflöppt</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn Du en Zertifikaat för't Verslöteln bruken wullt, dat binnen de angeven Tall vun Daag aflöppt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn Du en "
+#~ "Zertifikaat för't Verslöteln bruken wullt, dat binnen de angeven Tall vun "
+#~ "Daag aflöppt.\n"
 #~ "<p>\n"
-#~ "Disse Optschoon is anraadt, dormit Du keen Zertifikaten bruukst, de neegst aflöppt.\n"
+#~ "Disse Optschoon is anraadt, dormit Du keen Zertifikaten bruukst, de "
+#~ "neegst aflöppt.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15747,10 +15401,29 @@ msgstr "Datei överschrieven?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Söcht de Zertifikaten för't Sennen ut"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
 #~ msgstr ""
-#~ "<qt><h1>Zertifikaten sennen</h1> Ahn Dien Zertifikaat kann de Adressaat nich faststellen, wat de Naricht redig vun Di is un wat se vun en anner Persoon ännert wöör.<p> He kann Dien Zertifikaat wull op en zentralen Server finnen, man Du kannst Dien Zertifikaat ok de Naricht bileggen. Du kannst keen Zertifikaat bileggen, bloots Dien egen Zertifikaat oder all Zertifikaten ut de Keed för Dien Zertifikaat, mit un ahn dat Wörtelzertifikaat.<p> Dat is anraadt, tominnst Dien egen Zertifikaat de Naricht bitoleggen.\n"
-#~ "<p> Dit is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel Naricht ok anners fastleggen.</qt>"
+#~ "<qt><h1>Zertifikaten sennen</h1> Ahn Dien Zertifikaat kann de Adressaat "
+#~ "nich faststellen, wat de Naricht redig vun Di is un wat se vun en anner "
+#~ "Persoon ännert wöör.<p> He kann Dien Zertifikaat wull op en zentralen "
+#~ "Server finnen, man Du kannst Dien Zertifikaat ok de Naricht bileggen. Du "
+#~ "kannst keen Zertifikaat bileggen, bloots Dien egen Zertifikaat oder all "
+#~ "Zertifikaten ut de Keed för Dien Zertifikaat, mit un ahn dat "
+#~ "Wörtelzertifikaat.<p> Dat is anraadt, tominnst Dien egen Zertifikaat de "
+#~ "Naricht bitoleggen.\n"
+#~ "<p> Dit is de Fastleggen vun en Standardbedregen, Du kannst dat för elk "
+#~ "enkel Naricht ok anners fastleggen.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "&Egen Zertifikaat sennen"
@@ -15765,63 +15438,80 @@ msgstr "Datei överschrieven?"
 #~ msgstr "All Naricht&delen ünnerschrieven"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Aktiveer dit, wenn Du standardwies all Narichtdelen ünnerschrieven wullt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du standardwies all Narichtdelen ünnerschrieven wullt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Standardwies all Narichten ünnerschrieven</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt all Narichtdelen (Hööftdeel un all Bilagen) standardwies ünnerschreven.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt all Narichtdelen (Hööftdeel un "
+#~ "all Bilagen) standardwies ünnerschreven.\n"
 #~ "<p>\n"
-#~ "Dit is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel Naricht ok anners fastleggen.\n"
+#~ "Dit is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel "
+#~ "Naricht ok anners fastleggen.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "För el&k Narichtdeel ehr't Ünnerschrieven nafragen"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Aktiveer dit, wenn Du för elk Narichtdeel wedder fraagt warrn wullt, wat Du em ünnerschrieven wullt."
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du för elk Narichtdeel wedder fraagt warrn wullt, wat "
+#~ "Du em ünnerschrieven wullt."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>För elk Narichtdeel ehr't Ünnerschrieven nafragen</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrst Du för elkeen Narichtdeel (de Hööftdeel un all Bilagen) wedder fraagt, wat Du em ünnerschrieven wullt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrst Du för elkeen Narichtdeel (de "
+#~ "Hööftdeel un all Bilagen) wedder fraagt, wat Du em ünnerschrieven wullt.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
 #~ msgstr "Narichten n&ich ünnerschrieven"
 
 #~ msgid "Check for not signing a message by default"
-#~ msgstr "Aktiveer dit, wenn Du Narichten standardwies nich ünnerschrieven wullt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du Narichten standardwies nich ünnerschrieven wullt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Narichten nich ünnerschrieven</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt Narichten standardwies nich ünnerschreven.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt Narichten standardwies nich "
+#~ "ünnerschreven.\n"
 #~ "<p>\n"
-#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel Naricht ok anners fastleggen.\n"
+#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel "
+#~ "Naricht ok anners fastleggen.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Dat Ünnerschriev-Zertifikaat warrt op de Siet <em>Zertifikaten</em> fastleggt."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Dat Ünnerschriev-Zertifikaat warrt op de Siet <em>Zertifikaten</em> "
+#~ "fastleggt."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15832,20 +15522,34 @@ msgstr "Datei överschrieven?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ünnerschriev-Algoritmus</h1>\n"
-#~ "En Algoritmus is hier en List vun Anwiesen för den Reekner, wodennig he en geven Opgaav utföhren schall. De Ünnerschriev-Algoritmus gifft an, wodennig de Reekner Dien Ünnerschriev-Slötel op de Naricht anwennen mutt, dormit de Adressaat faststellen kann, wat de Naricht redig vun Di is.\n"
+#~ "En Algoritmus is hier en List vun Anwiesen för den Reekner, wodennig he "
+#~ "en geven Opgaav utföhren schall. De Ünnerschriev-Algoritmus gifft an, "
+#~ "wodennig de Reekner Dien Ünnerschriev-Slötel op de Naricht anwennen mutt, "
+#~ "dormit de Adressaat faststellen kann, wat de Naricht redig vun Di is.\n"
 #~ "<p>\n"
-#~ "Vun den utsöchten Algoritmus hangt dat af, wo licht oder swoor dat is, en Naricht natomaken, man all vun de SPHINX-Ümgeven praatstellte Algoritmen warrt as bannig seker estemeert. Normalerwies funkscheneert de Vörinstellen goot.\n"
+#~ "Vun den utsöchten Algoritmus hangt dat af, wo licht oder swoor dat is, en "
+#~ "Naricht natomaken, man all vun de SPHINX-Ümgeven praatstellte Algoritmen "
+#~ "warrt as bannig seker estemeert. Normalerwies funkscheneert de "
+#~ "Vörinstellen goot.\n"
 #~ "<p>\n"
-#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel Naricht ok anners fastleggen.\n"
+#~ "Dat is de Fastleggen vun en Standardbedregen, Du kannst dat för elk enkel "
+#~ "Naricht ok anners fastleggen.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15855,16 +15559,23 @@ msgstr "Datei överschrieven?"
 #~ msgstr "Naricht-Ünner&schriften wohren"
 
 #~ msgid "Check to store messages with their signatures"
-#~ msgstr "Aktiveer dit, wenn Du de Narichten tosamen mit ehr Ünnerschriften sekern wullt"
+#~ msgstr ""
+#~ "Aktiveer dit, wenn Du de Narichten tosamen mit ehr Ünnerschriften sekern "
+#~ "wullt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Naricht-Ünnerschriften wohren</h1>Wenn disse Optschoon aktiveert is, warrt mit sendt Narichten ok ehr Ünnerschriften sekert. Dat is anraadt, wiel Du denn later kieken kannst, wat en Naricht oder Narichtdeel ünnerschreven hest.\n"
+#~ "<h1>Naricht-Ünnerschriften wohren</h1>Wenn disse Optschoon aktiveert is, "
+#~ "warrt mit sendt Narichten ok ehr Ünnerschriften sekert. Dat is anraadt, "
+#~ "wiel Du denn later kieken kannst, wat en Naricht oder Narichtdeel "
+#~ "ünnerschreven hest.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15874,17 +15585,26 @@ msgstr "Datei överschrieven?"
 #~ msgstr "Standard-&MIME"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "En Naricht vun den Typ \"Multipart/Signed\" (mehrdeelt/ünnerschreven), bargt de Ünnerschrift un de ünnerschreven Daten"
+#~ msgstr ""
+#~ "En Naricht vun den Typ \"Multipart/Signed\" (mehrdeelt/ünnerschreven), "
+#~ "bargt de Ünnerschrift un de ünnerschreven Daten"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Mehrdeelt; aftrennt Ünnerschrift</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt de Ünnerschrift un de ünnerschreven Daten enkelte Delen vun en Naricht mit den Typ Mehrdeelt/Ünnerschreven (\"Multipart/Signed\"). De ünnerschreven Daten köönt denn ok vun Nettpostprogrammen wiest warrn, de den Ünnerschriev-Algoritmus un ok ASN.1-Dekoderen nich ünnerstütt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt de Ünnerschrift un de "
+#~ "ünnerschreven Daten enkelte Delen vun en Naricht mit den Typ Mehrdeelt/"
+#~ "Ünnerschreven (\"Multipart/Signed\"). De ünnerschreven Daten köönt denn "
+#~ "ok vun Nettpostprogrammen wiest warrn, de den Ünnerschriev-Algoritmus un "
+#~ "ok ASN.1-Dekoderen nich ünnerstütt.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15896,12 +15616,16 @@ msgstr "Datei överschrieven?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Kodeert ünnerschreven Narichten</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrt de Ünnerschrift un de ünnerschreven Daten na een ASN.1-Block schreven. De Narichten köönt bloots vun Nettpostprogrammen wiest warrn, de ASN.1 ünnerstütt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrt de Ünnerschrift un de "
+#~ "ünnerschreven Daten na een ASN.1-Block schreven. De Narichten köönt "
+#~ "bloots vun Nettpostprogrammen wiest warrn, de ASN.1 ünnerstütt.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15913,8 +15637,23 @@ msgstr "Datei överschrieven?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Leggt fast, wo faken Du de PIN ingeven muttst"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt><h1>PIN-Ingaav</h1>Hier kannst Du fastleggen, wo faken Du de PIN för't Togriepen op Dien persöönlich Sekerheitümgeven (PSÜ) ingeven muttst. Dor binnen warrt Dien Zertifikaten wohrt.<p>Wat Du Dien PIN faker ingeven muttst, büst Du ok beter schuult vör Versöök, Narichten in Dien Naam natomaken, man is dat Arbeiden ok weniger kommood.<p>Wenn Du nich weetst, wat Du hier utsöken muttst, laat de Optschoon as se is.<p>Beacht bitte, dat Du de PIN-Ingaav för de Sekerheit nich heel utmaken kannst.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>PIN-Ingaav</h1>Hier kannst Du fastleggen, wo faken Du de PIN "
+#~ "för't Togriepen op Dien persöönlich Sekerheitümgeven (PSÜ) ingeven "
+#~ "muttst. Dor binnen warrt Dien Zertifikaten wohrt.<p>Wat Du Dien PIN faker "
+#~ "ingeven muttst, büst Du ok beter schuult vör Versöök, Narichten in Dien "
+#~ "Naam natomaken, man is dat Arbeiden ok weniger kommood.<p>Wenn Du nich "
+#~ "weetst, wat Du hier utsöken muttst, laat de Optschoon as se is.<p>Beacht "
+#~ "bitte, dat Du de PIN-Ingaav för de Sekerheit nich heel utmaken kannst.</"
+#~ "qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Eenmaal per Törn"
@@ -15931,35 +15670,46 @@ msgstr "Datei överschrieven?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Wohrschoen, wenn Zertifikaat aflöppt</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn Du en Zertifikaat för't Ünnerschrieven bruken wullt, dat binnen de angeven Tall vun Daag aflöppt.\n"
+#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn Du en "
+#~ "Zertifikaat för't Ünnerschrieven bruken wullt, dat binnen de angeven Tall "
+#~ "vun Daag aflöppt.\n"
 #~ "<p>\n"
-#~ "Disse Optschoon is anraadt, dormit Du keen Zertifikaten bruukst, de neegst aflöppt.\n"
+#~ "Disse Optschoon is anraadt, dormit Du keen Zertifikaten bruukst, de "
+#~ "neegst aflöppt.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Wohrschoen, wenn Ünnerschr&iev-Zertifikaat aflöppt in weniger as"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Wohrschoen, wenn Ünnerschriever-Zertifikaat &Nettpostadress nich bargt"
+#~ msgstr ""
+#~ "Wohrschoen, wenn Ünnerschriever-Zertifikaat &Nettpostadress nich bargt"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Wohrschoen, wenn Ünnerschriever-Zertifikaat Nettpostadress nich bargt</h1>\n"
-#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn de Nettpostadress vun den Ünnerschriever nich binnen dat för't Ünnerschrieven bruukt Zertifikaat steiht.\n"
+#~ "<h1>Wohrschoen, wenn Ünnerschriever-Zertifikaat Nettpostadress nich "
+#~ "bargt</h1>\n"
+#~ "Wenn disse Optschoon aktiveert is, warrst Du wohrschoot, wenn de "
+#~ "Nettpostadress vun den Ünnerschriever nich binnen dat för't "
+#~ "Ünnerschrieven bruukt Zertifikaat steiht.\n"
 #~ "<p>\n"
 #~ "För hööchste Sekerheit is disse Optschoon anraadt.\n"
 #~ "</qt>"
diff --git a/tde-i18n-nl/messages/tdepim/kmail.po b/tde-i18n-nl/messages/tdepim/kmail.po
index 3f57cf159d3..23b575a6dfe 100644
--- a/tde-i18n-nl/messages/tdepim/kmail.po
+++ b/tde-i18n-nl/messages/tdepim/kmail.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-03-01 20:20+0100\n"
 "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
 "Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Rinse de Vries,Bram Schoenmakers"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -179,6 +179,12 @@ msgstr "ge&en (met zorg gebruiken)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Account voor semi-automatische gegevensbronafhandeling"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Geschiedenis wissen"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -257,9 +263,9 @@ msgstr "&Gebruikersnaam:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "Uw provider gaf u een <em>gebruikersnaam</em>. Deze wordt gebruikt voor het "
 "inloggen op hun servers. Dit is vaak het eerste deel van uw e-mailadres (het "
@@ -284,19 +290,20 @@ msgstr "Pop-wachtwoo&rd opslaan"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Selecteer deze optie wanneer KMail het wachtwoord op moet slaan.\n"
-"Wanneer TDEWallet beschikbaar is, zal het wachtwoord daarin opgeslagen worden.\n"
+"Wanneer TDEWallet beschikbaar is, zal het wachtwoord daarin opgeslagen "
+"worden.\n"
 "Wanneer TDEWallet niet beschikbaar is, zullen de wachtwoorden in het "
 "configuratiebestand van KMail geplaatst worden. Deze wachtwoorden worden wel "
-"gecodeerd, maar dit is geen garantie dat ze niet ontcijferd kunnen worden zodra "
-"iemand toegang krijgt tot dat bestand."
+"gecodeerd, maar dit is geen garantie dat ze niet ontcijferd kunnen worden "
+"zodra iemand toegang krijgt tot dat bestand."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -324,12 +331,13 @@ msgstr "Berichten &filteren als ze groter zijn dan"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Als u deze optie selecteert, dan zal er gebruikt worden gemaakt van POP-filters "
-"om te beslissen wat er met uw e-mailberichten gaat gebeuren. U kunt ze "
-"selecteren voor ophalen, verwijderen, of op de server achterlaten."
+"Als u deze optie selecteert, dan zal er gebruikt worden gemaakt van POP-"
+"filters om te beslissen wat er met uw e-mailberichten gaat gebeuren. U kunt "
+"ze selecteren voor ophalen, verwijderen, of op de server achterlaten."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -378,13 +386,15 @@ msgstr "Platte te&kst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -427,18 +437,20 @@ msgstr "Namespaces:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"Hier ziet u de namespaces die uw IMAP-server ondersteunt. Een namespace is een "
-"voorvoegsel dat groepen en mappen uit elkaar houdt. Hiermee kunt u in KMail "
-"bijvoorbeeld uw persoonlijke mappen en gedeelde mappen in één account tonen."
+"Hier ziet u de namespaces die uw IMAP-server ondersteunt. Een namespace is "
+"een voorvoegsel dat groepen en mappen uit elkaar houdt. Hiermee kunt u in "
+"KMail bijvoorbeeld uw persoonlijke mappen en gedeelde mappen in één account "
+"tonen."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
 msgstr ""
-"Namespaces herladen van de server. Dit zal eventuele wijzigingen overschrijven."
+"Namespaces herladen van de server. Dit zal eventuele wijzigingen "
+"overschrijven."
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -491,13 +503,13 @@ msgstr "Bijlage&n op afroep openen"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Wanneer u deze optie inschakelt zullen bijlagen niet automatisch geladen worden "
-"maar alleen wanneer u ze aanklikt. Zo kunnen grote e-mailberichten meteen "
-"getoond worden."
+"Wanneer u deze optie inschakelt zullen bijlagen niet automatisch geladen "
+"worden maar alleen wanneer u ze aanklikt. Zo kunnen grote e-mailberichten "
+"meteen getoond worden."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -537,7 +549,7 @@ msgstr "<niets>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "postvak in"
 
@@ -545,43 +557,45 @@ msgstr "postvak in"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Deze server ondersteunt geen unieke berichtnummers, dit is echter een vereiste "
-"bij het achterlaten van berichten op de server.\n"
-"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn dat "
-"u deze optie alsnog aan kunt zetten."
+"Deze server ondersteunt geen unieke berichtnummers, dit is echter een "
+"vereiste bij het achterlaten van berichten op de server.\n"
+"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn "
+"dat u deze optie alsnog aan kunt zetten."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Met deze server kunt u geen berichtkoppen ophalen, hetgeen een vereiste is om "
-"berichten op de server te filteren.\n"
-"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn dat "
-"u deze optie alsnog aan kunt zetten."
+"Met deze server kunt u geen berichtkoppen ophalen, hetgeen een vereiste is "
+"om berichten op de server te filteren.\n"
+"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn "
+"dat u deze optie alsnog aan kunt zetten."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Houd er rekening mee dat deze functie er toe kan leiden dat bepaalde "
-"POP3-servers die geen pipelining ondersteunen beschadigde e-mailberichten "
+"Houd er rekening mee dat deze functie er toe kan leiden dat bepaalde POP3-"
+"servers die geen pipelining ondersteunen beschadigde e-mailberichten "
 "verzenden.\n"
-"Deze instelling is aanwezig omdat sommige servers pipelining wel ondersteunen, "
-"maar dit niet aankondigen. Om te controleren of uw POP3-server "
-"pipelining-ondersteuning aankondigt gebruikt u de knop onderaan deze dialoog.\n"
+"Deze instelling is aanwezig omdat sommige servers pipelining wel "
+"ondersteunen, maar dit niet aankondigen. Om te controleren of uw POP3-server "
+"pipelining-ondersteuning aankondigt gebruikt u de knop onderaan deze "
+"dialoog.\n"
 "Als uw server dit niet aankondigt, maar u wilt wel meer snelheid, dan kunt u "
 "dit eerst testen door een hoeveelheid e-mail naar uzelf te sturen en deze "
 "vervolgens op te halen."
@@ -589,53 +603,56 @@ msgstr ""
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
 msgstr ""
-"Specificeer a.u.b. eerst een server en een poortnummer in het tabblad Algemeen."
+"Specificeer a.u.b. eerst een server en een poortnummer in het tabblad "
+"Algemeen."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Deze server ondersteunt geen pipelining. Daarom is deze optie uitgeschakeld.\n"
-"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn dat "
-"u deze optie alsnog aan kunt zetten. Houd er wel rekening mee dat servers die "
-"geen pipelining ondersteunen de berichten kunnen beschadigen. Daarom dient u "
-"eerst deze optie uit te testen voordat u belangrijke e-mailberichten verliest. "
-"U kunt dat doen door een grote hoeveelheid e-mailberichten naar uzelf te sturen "
-"en ze in één keer van de POP-server te downloaden."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Deze server ondersteunt geen pipelining. Daarom is deze optie "
+"uitgeschakeld.\n"
+"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn "
+"dat u deze optie alsnog aan kunt zetten. Houd er wel rekening mee dat "
+"servers die geen pipelining ondersteunen de berichten kunnen beschadigen. "
+"Daarom dient u eerst deze optie uit te testen voordat u belangrijke e-"
+"mailberichten verliest. U kunt dat doen door een grote hoeveelheid e-"
+"mailberichten naar uzelf te sturen en ze in één keer van de POP-server te "
+"downloaden."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Deze server ondersteunt geen unieke berichtnummers, dit is echter een vereiste "
-"bij het achterlaten van berichten op de server. Deze optie is daarom "
-"uitgeschakeld.\n"
-"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn dat "
-"u deze optie alsnog aan kunt zetten."
+"Deze server ondersteunt geen unieke berichtnummers, dit is echter een "
+"vereiste bij het achterlaten van berichten op de server. Deze optie is "
+"daarom uitgeschakeld.\n"
+"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn "
+"dat u deze optie alsnog aan kunt zetten."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Met deze server kunt u geen berichtkoppen ophalen, hetgeen een vereiste is om "
-"berichten op de server te filteren. Deze optie is daarom uitgeschakeld.\n"
-"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn dat "
-"u deze optie alsnog aan kunt zetten."
+"Met deze server kunt u geen berichtkoppen ophalen, hetgeen een vereiste is "
+"om berichten op de server te filteren. Deze optie is daarom uitgeschakeld.\n"
+"Omdat sommige servers hun mogelijkheden niet goed aankondigen kan het zijn "
+"dat u deze optie alsnog aan kunt zetten."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -715,8 +732,8 @@ msgstr "IMAP-account"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "U moet eerst een account opgeven in het netwerkgedeelte van KMail's "
 "instellingen voordat u uw e-mail kunt ophalen."
@@ -755,14 +772,14 @@ msgstr "Welkom bij KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>U hebt KMail voor de eerste keer opgestart. U kunt met behulp van deze "
-"assistent snel uw e-mailaccounts instellen. Vul de verbindingsgegevens in op de "
-"volgende pagina's. De benodigde gegevens dienen door de provider verstrekt te "
-"zijn.</qt>"
+"assistent snel uw e-mailaccounts instellen. Vul de verbindingsgegevens in op "
+"de volgende pagina's. De benodigde gegevens dienen door de provider "
+"verstrekt te zijn.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -824,8 +841,7 @@ msgstr "Lokale bezorging aanhouden"
 msgid "Server Information"
 msgstr "Serverinformatie"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Geen"
@@ -880,7 +896,8 @@ msgstr "Opties om de afhandeling van virusberichten te verfijnen"
 #: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
 msgstr ""
-"Overzicht van de wijzigingen die aangebracht zullen worden door deze assistent"
+"Overzicht van de wijzigingen die aangebracht zullen worden door deze "
+"assistent"
 
 #: antispamwizard.cpp:199
 msgid "Virus handling"
@@ -919,8 +936,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Er zijn geen spamdetectie-hulpmiddelen gevonden. Installeer zo'n hulpmiddel "
-"en start deze assistent opnieuw.</p>"
+"<p>Er zijn geen spamdetectie-hulpmiddelen gevonden. Installeer zo'n "
+"hulpmiddel en start deze assistent opnieuw.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -964,28 +981,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Deze assistent biedt u hulp bij het opzetten van filters zodat KMail gebruik "
-"kan maken van veelgebruikte antivirus-hulpprogramma's.</p> "
-"<p>Deze programma's analyseren uw e-mailberichten en kunnen achterhalen of het "
-"bericht een virus bevat of niet. De assistent zal niets doen met uw bestaande "
-"filters, er worden enkel nieuwe filters toegevoegd.</p> "
-"<p><b>Waarschuwing:</b> KMail wordt tijdens het scannen voor berichten met spam "
-"geblokkeerd, het kan zijn dat KMail niet naar behoren reageert omdat deze "
-"handeling meestal veel tijd in beslag neemt. U kunt overwegen om de "
-"filterregels van de assistent te verwijderen om het oude gedrag weer terug te "
-"krijgen."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Deze assistent biedt u hulp bij het opzetten van filters zodat KMail "
+"gebruik kan maken van veelgebruikte antivirus-hulpprogramma's.</p> <p>Deze "
+"programma's analyseren uw e-mailberichten en kunnen achterhalen of het "
+"bericht een virus bevat of niet. De assistent zal niets doen met uw "
+"bestaande filters, er worden enkel nieuwe filters toegevoegd.</p> "
+"<p><b>Waarschuwing:</b> KMail wordt tijdens het scannen voor berichten met "
+"spam geblokkeerd, het kan zijn dat KMail niet naar behoren reageert omdat "
+"deze handeling meestal veel tijd in beslag neemt. U kunt overwegen om de "
+"filterregels van de assistent te verwijderen om het oude gedrag weer terug "
+"te krijgen."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1012,8 +1028,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"De standaardmap voor spamberichten is de prullenbak, maar u kunt dat wijzigen "
-"in de onderstaande mappenlijst."
+"De standaardmap voor spamberichten is de prullenbak, maar u kunt dat "
+"wijzigen in de onderstaande mappenlijst."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1021,15 +1037,14 @@ msgstr "Mogelijke s&pam verplaatsen naar:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"De standaardmap is het postvak in, maar u kunt dat wijzigen in de onderstaande "
-"mappenlijst. "
-"<p>Niet alle hulpmiddelen kunnen spam als onzeker bestempelen. Wanneer u geen "
-"geschikt hulpmiddel hebt kunt u ook geen map selecteren."
+"De standaardmap is het postvak in, maar u kunt dat wijzigen in de "
+"onderstaande mappenlijst. <p>Niet alle hulpmiddelen kunnen spam als onzeker "
+"bestempelen. Wanneer u geen geschikt hulpmiddel hebt kunt u ook geen map "
+"selecteren."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1039,13 +1054,14 @@ msgstr "Berichten classificeren met behulp van antivirusprogramma's"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Laat de antivirushulpprogramma's uw berichten classificeren. De assistent zal "
-"daarvoor de nodige filters aanmaken. De besmette berichten worden meestal door "
-"het antivirusprogramma gemarkeerd zodat u vervolgens met andere filters de "
-"virusberichten bijvoorbeeld naar een bepaalde map kunt verplaatsen."
+"Laat de antivirushulpprogramma's uw berichten classificeren. De assistent "
+"zal daarvoor de nodige filters aanmaken. De besmette berichten worden "
+"meestal door het antivirusprogramma gemarkeerd zodat u vervolgens met andere "
+"filters de virusberichten bijvoorbeeld naar een bepaalde map kunt "
+"verplaatsen."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1054,12 +1070,12 @@ msgstr "Gevonden geïnfecteerde berichten naar de geselecteerde map verplaatsen"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Een filter om geïnfecteerde berichten te vinden en ze vervolgens in een "
-"bepaalde map te plaatsen. De standaardmap is de prullenbak, maar dat kunt u in "
-"de mapweergave veranderen."
+"bepaalde map te plaatsen. De standaardmap is de prullenbak, maar dat kunt u "
+"in de mapweergave veranderen."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1067,8 +1083,8 @@ msgstr "Gevonden geïnfecteerde berichten als gelezen markeren"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Markeert gevonden geïnfecteerde berichten als gelezen en plaatst deze in de "
 "geselecteerde map."
@@ -1251,8 +1267,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Dit komt doordat u geen toegangsrechten hebt om deze handeling uit te voeren, "
-"of omdat de map reeds op de server staat. Hier is de foutmelding van de server:"
+"Dit komt doordat u geen toegangsrechten hebt om deze handeling uit te "
+"voeren, of omdat de map reeds op de server staat. Hier is de foutmelding van "
+"de server:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1265,8 +1282,8 @@ msgstr "Fout bij het lezen van map %1 van de server: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1286,8 +1303,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1318,21 +1335,20 @@ msgstr "Verwijderd"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Geen van uw identiteiten komt overeen met de ontvanger van dit bericht. "
 "<br>Kies welke van deze adressen van u is (indien aanwezig):"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Meerdere van uw identiteiten komen overeen met de ontvanger van dit "
-"bericht."
-"<br>Kies welke van deze adressen van u is:"
+"bericht.<br>Kies welke van deze adressen van u is:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1358,24 +1374,26 @@ msgstr "Map \"%1\" is met succes gecomprimeerd"
 #: compactionjob.cpp:180 compactionjob.cpp:261
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr ""
-"Er deed zich een fout voor tijdens het comprimeren van %1. Het comprimeren is "
-"afgebroken."
+"Er deed zich een fout voor tijdens het comprimeren van %1. Het comprimeren "
+"is afgebroken."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Deze instelling is gerepareerd door uw systeembeheerder.</p> "
-"<p>Als u het daar niet mee eens bent, neem dan contact met hem of haar op.</p>"
-"</qt>"
+"<qt><p>Deze instelling is gerepareerd door uw systeembeheerder.</p> <p>Als u "
+"het daar niet mee eens bent, neem dan contact met hem of haar op.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Profiel &laden..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Account instellen"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Toevoege&n..."
@@ -1406,6 +1424,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Identiteit verwijderen"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Verwijd&eren"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Toevoegen..."
@@ -1414,6 +1437,11 @@ msgstr "Toevoegen..."
 msgid "Modify..."
 msgstr "Wijzigen..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Verwijd&eren"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Instellen als standaard"
@@ -1430,17 +1458,15 @@ msgstr "Ver&zenden"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Uitgaande accounts (voeg tenminste één account toe):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Naam"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1462,8 +1488,7 @@ msgstr "Instellen als standaard"
 msgid "Common Options"
 msgstr "Algemene opties"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Ver&zending bevestigen"
@@ -1514,17 +1539,16 @@ msgstr "S&tandaarddomein:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Het standaarddomein wordt gebruikt om e-mailadressen die alleen bestaan uit "
-"een gebruikersnaam aan te vullen.</p></qt>"
+"<qt> <p>Het standaarddomein wordt gebruikt om e-mailadressen die alleen "
+"bestaan uit een gebruikersnaam aan te vullen.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1542,9 +1566,9 @@ msgstr "Transport toevoegen"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (standaard)"
 
@@ -1560,8 +1584,8 @@ msgid ""
 msgstr ""
 "Deze identiteit is veranderd zodat het gebruik maakt van het aangepaste "
 "transport:\n"
-"Deze %n identiteiten zijn veranderd zodat ze gebruik maken van het aangepaste "
-"transport:"
+"Deze %n identiteiten zijn veranderd zodat ze gebruik maken van het "
+"aangepaste transport:"
 
 #: configuredialog.cpp:927
 #, c-format
@@ -1631,6 +1655,10 @@ msgstr "Account bewerken"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Het account <b>%1</b> is niet gevonden.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Kle&uren"
@@ -1739,8 +1767,7 @@ msgstr "Bezochte koppeling"
 msgid "Misspelled Words"
 msgstr "Foutgespelde woorden"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nieuw bericht"
@@ -1928,11 +1955,11 @@ msgstr "Discussies zijn stan&daard gesloten"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Discussies openen als ze nieuwe, o&ngelezen of belangrijke berichten bevatten "
-"of als ze geobserveerd worden."
+"Discussies openen als ze nieuwe, o&ngelezen of belangrijke berichten "
+"bevatten of als ze geobserveerd worden."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1940,73 +1967,58 @@ msgstr "Datumweergave"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Deze expressies kunnen worden gebruikt voor de datum:</strong></p>"
-"<ul>"
-"<li>d - de dag als getal zonder nul aan het begin (1-31)</li>"
-"<li>dd - de dag als getal met een nul aan het begin (01-31)</li>"
-"<li>ddd - de afkorting van de dag (ma - zo)</li>"
-"<li>dddd - de volledige naam van de dag (maandag - zondag)</li>"
-"<li>M - de maand als getal zonder nul aan het begin (1-12)</li>"
-"<li>MM - de maand als getal met een nul aan het begin (01-12)</li>"
-"<li>MMM - de afkorting van de maand (jan - dec)</li>"
-"<li>MMMM - de volledige naam van de maand (januari - december)</li>"
-"<li>yy - het jaar in twee cijfers (00-99)</li>"
-"<li>yyyy - het jaar in vier cijfers (0000-9999)</li></ul>"
-"<p><strong>Deze expressies mogen worden gebruikt voor de tijd:</string></p> "
-"<ul>"
-"<li>h - het uur zonder nul aan het begin (0-23 of 1-12 bij AM/PM-weergave)</li>"
-"<li>hh - het uur met een nul aan het begin (00-23 of 01-12 bij "
-"AM/PM-weergave)</li>"
-"<li>m - de minuten zonder nul aan het begin (0-59)</li>"
-"<li>mm - de minuten met een nul aan het begin (00-59)</li>"
-"<li>s - de seconden zonder nul aan het begin (0-59)</li>"
-"<li>ss - de seconden met een nul aan het begin (00-59)</li>"
-"<li>z - de milliseconden zonder nullen aan het begin (0-999)</li>"
-"<li>zzz - de milliseconden met nullen aan het begin (000-999)</li>"
-"<li>AP - schakel over op AM/PM-weergave. AP zal worden vervangen door \"AM\" of "
-"\"PM\".</li>"
-"<li>ap - schakel over op AM/PM-weergave. ap zal worden vervangen door \"am\" of "
-"\"pm\".</li>"
-"<li>Z - tijdszone in numerieke vorm (-0500)</li></ul>"
-"<p><strong>Alle andere invoertekens zullen worden genegeerd.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Deze expressies kunnen worden gebruikt voor de datum:</"
+"strong></p><ul><li>d - de dag als getal zonder nul aan het begin (1-31)</"
+"li><li>dd - de dag als getal met een nul aan het begin (01-31)</li><li>ddd - "
+"de afkorting van de dag (ma - zo)</li><li>dddd - de volledige naam van de "
+"dag (maandag - zondag)</li><li>M - de maand als getal zonder nul aan het "
+"begin (1-12)</li><li>MM - de maand als getal met een nul aan het begin "
+"(01-12)</li><li>MMM - de afkorting van de maand (jan - dec)</li><li>MMMM - "
+"de volledige naam van de maand (januari - december)</li><li>yy - het jaar in "
+"twee cijfers (00-99)</li><li>yyyy - het jaar in vier cijfers (0000-9999)</"
+"li></ul><p><strong>Deze expressies mogen worden gebruikt voor de tijd:</"
+"string></p> <ul><li>h - het uur zonder nul aan het begin (0-23 of 1-12 bij "
+"AM/PM-weergave)</li><li>hh - het uur met een nul aan het begin (00-23 of "
+"01-12 bij AM/PM-weergave)</li><li>m - de minuten zonder nul aan het begin "
+"(0-59)</li><li>mm - de minuten met een nul aan het begin (00-59)</li><li>s - "
+"de seconden zonder nul aan het begin (0-59)</li><li>ss - de seconden met een "
+"nul aan het begin (00-59)</li><li>z - de milliseconden zonder nullen aan het "
+"begin (0-999)</li><li>zzz - de milliseconden met nullen aan het begin "
+"(000-999)</li><li>AP - schakel over op AM/PM-weergave. AP zal worden "
+"vervangen door \"AM\" of \"PM\".</li><li>ap - schakel over op AM/PM-"
+"weergave. ap zal worden vervangen door \"am\" of \"pm\".</li><li>Z - "
+"tijdszone in numerieke vorm (-0500)</li></ul><p><strong>Alle andere "
+"invoertekens zullen worden genegeerd.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Het wijzigen van globale instellingen voor discussies zal alle map-specifieke "
-"waarden overschrijven."
+"Het wijzigen van globale instellingen voor discussies zal alle map-"
+"specifieke waarden overschrijven."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2020,8 +2032,7 @@ msgstr "HTML-stat&usbalk tonen"
 msgid "Show s&pam status in fancy headers"
 msgstr "S&pamstatus in elegante koppen tonen"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Smileys vervangen door emoticons"
@@ -2030,8 +2041,7 @@ msgstr "Smileys vervangen door emoticons"
 msgid "Use smaller font for quoted text"
 msgstr "Kleiner lettertype voor aangehaalde tekst gebruiken"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Markeringen tonen om aanhalingen in- of uit te klappen"
@@ -2057,8 +2067,7 @@ msgstr "Automatisch"
 msgid "&Override character encoding:"
 msgstr "Primaire tekensetc&odering:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Systeemvakpictogram inschakelen"
@@ -2161,23 +2170,21 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>De volgende plaatshouders worden ondersteund in de antwoorduitdrukkingen: "
-"<br><b>%D</b>: datum, <b>%S</b>: onderwerp, "
-"<br><b>%e</b>: adres van de afzender, <b>%F</b>: naam van de afzender, <b>%f</b>"
-": initialen van afzender, "
-"<br><b>%T</b>: naam van de ontvanger, <b>%t</b>: naam en adres van de "
-"ontvanger\n"
-"<br><b>%C</b>: namen voor de kopie (CC), <b>%c</b>: namen voor de blinde kopie "
-"(BCC), "
-"<br><b>%%</b>: procentteken, <b>%_</b>: spatie, <b>%L</b>: regeleinde</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>De volgende plaatshouders worden ondersteund in de "
+"antwoorduitdrukkingen: <br><b>%D</b>: datum, <b>%S</b>: onderwerp, <br><b>"
+"%e</b>: adres van de afzender, <b>%F</b>: naam van de afzender, <b>%f</b>: "
+"initialen van afzender, <br><b>%T</b>: naam van de ontvanger, <b>%t</b>: "
+"naam en adres van de ontvanger\n"
+"<br><b>%C</b>: namen voor de kopie (CC), <b>%c</b>: namen voor de blinde "
+"kopie (BCC), <br><b>%%</b>: procentteken, <b>%_</b>: spatie, <b>%L</b>: "
+"regeleinde</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2200,21 +2207,20 @@ msgstr "Allen &beantwoorden:"
 msgid "&Forward:"
 msgstr "&Doorsturen:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Aanhalingsindicatie:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Op %D, schreef u:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Op %D, schreef %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Doorgestuurd bericht"
 
@@ -2252,11 +2258,11 @@ msgstr "Nieuw doorsturen-voorvoegsel invoeren:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Deze lijst wordt voor elk uitgaand bericht van boven naar beneden gecontroleerd "
-"op een tekenset die alle benodigde tekens bevat."
+"Deze lijst wordt voor elk uitgaand bericht van boven naar beneden "
+"gecontroleerd op een tekenset die alle benodigde tekens bevat."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2291,10 +2297,9 @@ msgstr "Waarde"
 msgid "Ne&w"
 msgstr "Nieu&w"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "Naa&m:"
@@ -2303,19 +2308,18 @@ msgstr "Naa&m:"
 msgid "&Value:"
 msgstr "&Waarde:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Bijlagenaamgeving compatibel met Outlook(tm)"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Zet deze optie aan om ervoor te zorgen dat Outlook(tm) de bijlagenamen begrijpt "
-"die niet-West-Europese tekens bevatten"
+"Zet deze optie aan om ervoor te zorgen dat Outlook(tm) de bijlagenamen "
+"begrijpt die niet-West-Europese tekens bevatten"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2324,8 +2328,8 @@ msgstr "Detectie van ontbrekende bijlagen activere&n"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Herken een van de volgende trefwoorden als een intentie om een bestand bij te "
-"voegen:"
+"Herken een van de volgende trefwoorden als een intentie om een bestand bij "
+"te voegen:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2343,13 +2347,13 @@ msgstr "bijgevoegd"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "U hebt ervoor gekozen om bijlagenamen die niet-Engelsetekens bevatten te "
 "coderen op een manier die door Outlook(tm) (en andere e-mailprogramma's die "
@@ -2381,117 +2385,104 @@ msgstr "Crypto-backe&nds"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>E-mailberichten worden soms in beide formaten verzonden. Met deze opties "
-"bepaalt u of u het HTML- of platte-tekstgedeelte wilt laten weergeven.</p>"
-"<p> Het weergeven van het HTML-gedeelte zorgt voor een mooier uiterlijk, maar "
-"verhoogt tevens het risico op misbruik van eventuele beveiligingsgaten.</p>"
-"<p>Bij het weergeven van platte tekst verliest u veel van de opmaak van het "
-"bericht, maar het is dan bijna <em>onmogelijk</em> om misbruik te maken van "
-"eventuele beveiligingsgaten in het HTML-weergaveprogramma (Konqueror).</p>"
-"<p>De optie hieronder beschermt u tegen een algemeen misbruik van "
-"HTML-berichten. Maar ze kan u niet beschermen tegen beveiligingsrisico's die "
-"onbekend waren op het moment dat deze versie van KMail geschreven werd.</p>"
-"<p>Het is daarom aan te raden om <em>geen</em> HTML in plaats van platte tekst "
-"te prefereren.</p>"
-"<p><b>Opmerking:</b> u kunt deze optie per map instellen via het menu <i>Map</i> "
-"van KMail's hoofdvenster.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>E-mailberichten worden soms in beide formaten verzonden. Met deze "
+"opties bepaalt u of u het HTML- of platte-tekstgedeelte wilt laten weergeven."
+"</p><p> Het weergeven van het HTML-gedeelte zorgt voor een mooier uiterlijk, "
+"maar verhoogt tevens het risico op misbruik van eventuele beveiligingsgaten."
+"</p><p>Bij het weergeven van platte tekst verliest u veel van de opmaak van "
+"het bericht, maar het is dan bijna <em>onmogelijk</em> om misbruik te maken "
+"van eventuele beveiligingsgaten in het HTML-weergaveprogramma (Konqueror).</"
+"p><p>De optie hieronder beschermt u tegen een algemeen misbruik van HTML-"
+"berichten. Maar ze kan u niet beschermen tegen beveiligingsrisico's die "
+"onbekend waren op het moment dat deze versie van KMail geschreven werd.</"
+"p><p>Het is daarom aan te raden om <em>geen</em> HTML in plaats van platte "
+"tekst te prefereren.</p><p><b>Opmerking:</b> u kunt deze optie per map "
+"instellen via het menu <i>Map</i> van KMail's hoofdvenster.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bij sommige e-mailreclame worden de afbeeldingen die in het bericht getoond "
-"worden niet met het bericht meegezonden, maar via het internet opgehaald van de "
-"server van de afzender. Hierdoor kan de adverteerder nagaan of, en wanneer, u "
-"hun reclame hebt geopend (&quot;web bugs&quot;).</p>"
-"<p>Dit kunt u zien als een inbreuk op uw privacy, en zorgt bij ongewenste "
-"e-mailreclame vaak voor nog meer berichten van dezelfde adverteerder. Er is "
-"geen enkele reden om afbeeldingen via internet te laten inladen: afbeeldingen "
-"kunnen immers ook in het bericht zelf worden ingesloten.</p>"
-"<p>Om u te beschermen tegen deze vorm van misbruik van de HTML-weergave in "
-"KMail is deze optie standaard <em>uitgeschakeld</em>.</p>"
-"<p>Als u desondanks toch de afbeeldingen wilt laten weergeven in "
-"e-mailberichten, dan kunt u deze optie activeren. Houd dan wel rekening met dit "
-"mogelijke probleem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Bij sommige e-mailreclame worden de afbeeldingen die in het bericht "
+"getoond worden niet met het bericht meegezonden, maar via het internet "
+"opgehaald van de server van de afzender. Hierdoor kan de adverteerder nagaan "
+"of, en wanneer, u hun reclame hebt geopend (&quot;web bugs&quot;).</p><p>Dit "
+"kunt u zien als een inbreuk op uw privacy, en zorgt bij ongewenste e-"
+"mailreclame vaak voor nog meer berichten van dezelfde adverteerder. Er is "
+"geen enkele reden om afbeeldingen via internet te laten inladen: "
+"afbeeldingen kunnen immers ook in het bericht zelf worden ingesloten.</"
+"p><p>Om u te beschermen tegen deze vorm van misbruik van de HTML-weergave in "
+"KMail is deze optie standaard <em>uitgeschakeld</em>.</p><p>Als u desondanks "
+"toch de afbeeldingen wilt laten weergeven in e-mailberichten, dan kunt u "
+"deze optie activeren. Houd dan wel rekening met dit mogelijke probleem.</p></"
+"qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt> "
-"<h3>Beleid voor ontvangst- en gelezenbevestigingnotificaties</h3> "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt> <h3>Beleid voor ontvangst- en gelezenbevestigingnotificaties</h3> "
 "<p>MDN is een algemene naam voor zogenaamde <b>ontvangst- en "
-"gelezenbevestigingen</b>. De schrijver van het bericht verzoekt een bevestiging "
-"voor ontvangst en gelezen en het e-mailprogramma van de ontvanger verstuurt een "
-"antwoord waaruit de schrijver kan achterhalen wat er met zijn bericht is "
-"gedaan. Bekende types zijn: <b>weergegeven</b> (dus gelezen), <b>verwijderd</b> "
-"en <b>doorgestuurd</b>. Voor het verzenden van bevestigingen biedt KMail de "
-"volgende instelmogelijkheden:</p> "
-"<p> </p>"
-"<ul>"
-"<li><em>Negeren</em>: Verzoeken om bevestiging negeren. Er zal in geen enkel "
-"geval een automatische bevestiging worden verzonden (aanbevolen).</li> "
+"gelezenbevestigingen</b>. De schrijver van het bericht verzoekt een "
+"bevestiging voor ontvangst en gelezen en het e-mailprogramma van de "
+"ontvanger verstuurt een antwoord waaruit de schrijver kan achterhalen wat er "
+"met zijn bericht is gedaan. Bekende types zijn: <b>weergegeven</b> (dus "
+"gelezen), <b>verwijderd</b> en <b>doorgestuurd</b>. Voor het verzenden van "
+"bevestigingen biedt KMail de volgende instelmogelijkheden:</p> <p> </"
+"p><ul><li><em>Negeren</em>: Verzoeken om bevestiging negeren. Er zal in geen "
+"enkel geval een automatische bevestiging worden verzonden (aanbevolen).</li> "
 "<li><em>Vragen</em>: Een bevestiging wordt pas verzonden als u daarvoor "
-"toestemming geeft.</li> "
-"<li><em>Weigeren</em>: Er wordt altijd een <b>weigermelding</b> "
-"verzonden. Dit is slechts <em>een beetje</em> beter dan altijd MDN's verzenden. "
-"De schrijver weet immers dat er iets met het bericht gedaan is, hij/zij kan "
-"alleen niet nagaan wat precies (gelezen, verwijderd, etc.). </li>"
-"<li><em>Altijd verzenden</em>: Altijd een bevestiging verzenden. Dit betekent "
-"dat de gebruiker altijd een bevestiging krijgt dat er iets met het bericht "
-"gedaan is, en bovendien wat ermee is gebeurd (weergegeven, verwijderd, etc.). "
-"Deze optie is handig voor e-mailbeheer in grote organisaties, maar wordt i.v.m. "
-"mogelijke inbreuk op uw privacy afgeraden voor normaal e-mailgebruik. </li></ul>"
-"</qt>"
+"toestemming geeft.</li> <li><em>Weigeren</em>: Er wordt altijd een "
+"<b>weigermelding</b> verzonden. Dit is slechts <em>een beetje</em> beter dan "
+"altijd MDN's verzenden. De schrijver weet immers dat er iets met het bericht "
+"gedaan is, hij/zij kan alleen niet nagaan wat precies (gelezen, verwijderd, "
+"etc.). </li><li><em>Altijd verzenden</em>: Altijd een bevestiging verzenden. "
+"Dit betekent dat de gebruiker altijd een bevestiging krijgt dat er iets met "
+"het bericht gedaan is, en bovendien wat ermee is gebeurd (weergegeven, "
+"verwijderd, etc.). Deze optie is handig voor e-mailbeheer in grote "
+"organisaties, maar wordt i.v.m. mogelijke inbreuk op uw privacy afgeraden "
+"voor normaal e-mailgebruik. </li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2507,15 +2498,15 @@ msgstr "E-mailberichten toestaan e&xterne referenties van internet te laden"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<qt><b>WAARSCHUWING:</b> het gebruik van HTML in e-mail vergroot mogelijk de "
 "kans dat uw systeem gevoelig wordt voor inbraken via beveiligingsgaten. <a "
-"href=\"whatsthis:%1\">Meer over HTML-berichten...</a> <a href=\"whatsthis:%2\">"
-"Meer over externe referenties...</a>"
+"href=\"whatsthis:%1\">Meer over HTML-berichten...</a> <a href=\"whatsthis:"
+"%2\">Meer over externe referenties...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2576,9 +2567,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<qt>"
-"<p><b>WAARSCHUWING:</b> onvoorwaardelijk bevestigingen retourneren ondermijnt "
-"uw privacy. <a href=\"whatsthis:%1\">Meer...</a>"
+"<qt><p><b>WAARSCHUWING:</b> onvoorwaardelijk bevestigingen retourneren "
+"ondermijnt uw privacy. <a href=\"whatsthis:%1\">Meer...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2599,8 +2589,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Deze optie vereist dirmngr 0.9.0 of nieuwer"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "geen proxy"
@@ -2622,7 +2611,8 @@ msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr ""
-"Om bevestiging vrage&n voordat alle berichten in de prullenbak worden geplaatst"
+"Om bevestiging vrage&n voordat alle berichten in de prullenbak worden "
+"geplaatst"
 
 #: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
@@ -2630,8 +2620,8 @@ msgstr "Berichten gemarkeerd als belan&grijk niet laten verlopen"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Bij het zoeken naar ongelezen berichten:"
 
@@ -2655,8 +2645,8 @@ msgstr "Alle mappen doorlopen"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Bij het binnengaan van een map:"
 
@@ -2726,27 +2716,24 @@ msgstr "mappen (van het type \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Hiermee selecteert u de standaard postbusopmaak voor lokale mappen:</p>"
-"<p><b>mbox:</b> KMail maakt voor elke e-mailmap een bestand aan. Individuele "
-"berichten worden in dit bestand van elkaar gescheiden door een regel die begint "
-"met \"From \". Dit bespaart schijfruimte, maar is wat minder robuust, "
-"bijvoorbeeld bij het verplaatsen van berichten tussen e-mailmappen.</p>"
-"<p><b>maildir:</b> KMail maakt voor elke e-mailmap een echte map op de schijf "
-"aan. Individuele berichten zijn aparte bestanden in deze mappen. Dit neemt wat "
-"meer schijfruimte in beslag, maar het is robuuster, zeker bij het verplaatsen "
-"van berichten tussen mappen.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Hiermee selecteert u de standaard postbusopmaak voor lokale mappen:</"
+"p><p><b>mbox:</b> KMail maakt voor elke e-mailmap een bestand aan. "
+"Individuele berichten worden in dit bestand van elkaar gescheiden door een "
+"regel die begint met \"From \". Dit bespaart schijfruimte, maar is wat "
+"minder robuust, bijvoorbeeld bij het verplaatsen van berichten tussen e-"
+"mailmappen.</p><p><b>maildir:</b> KMail maakt voor elke e-mailmap een echte "
+"map op de schijf aan. Individuele berichten zijn aparte bestanden in deze "
+"mappen. Dit neemt wat meer schijfruimte in beslag, maar het is robuuster, "
+"zeker bij het verplaatsen van berichten tussen mappen.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2779,51 +2766,43 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Als u naar het volgende ongelezen bericht springt, dan kan het gebeuren dat "
-"er geen ongelezen berichten meer onder het huidige bericht staan.</p> "
-"<p><b>Niet doorlopen:</b> de zoekopdracht stopt bij het laatste bericht in de "
-"huidige map.</p> "
-"<p><b>Huidige map doorlopen:</b> de zoekopdracht zal verdergaan bij het eerste "
-"bericht in de map, maar niet naar een andere map gaan.</p> "
-"<p><b>Alle mappen doorlopen:</b> de zoekopdracht zal doorgaan bij het eerste "
-"bericht in de volgende map.</p> "
-"<p>Op vergelijkbare wijze zal het zoeken naar het vorige ongelezen "
-"bericht,afhankelijk van de gekozen instelling, herstarten bij het laatste "
-"bericht in de map of verder zoeken in de vorige map.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Als u naar het volgende ongelezen bericht springt, dan kan het "
+"gebeuren dat er geen ongelezen berichten meer onder het huidige bericht "
+"staan.</p> <p><b>Niet doorlopen:</b> de zoekopdracht stopt bij het laatste "
+"bericht in de huidige map.</p> <p><b>Huidige map doorlopen:</b> de "
+"zoekopdracht zal verdergaan bij het eerste bericht in de map, maar niet naar "
+"een andere map gaan.</p> <p><b>Alle mappen doorlopen:</b> de zoekopdracht "
+"zal doorgaan bij het eerste bericht in de volgende map.</p> <p>Op "
+"vergelijkbare wijze zal het zoeken naar het vorige ongelezen bericht,"
+"afhankelijk van de gekozen instelling, herstarten bij het laatste bericht in "
+"de map of verder zoeken in de vorige map.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Het volledig indexeren van teksten maakt het mogelijk om zeer snel de inhoud "
-"van uw berichten te doorzoeken. Wanneer u hier gebruik van maakt zult u zien "
-"dat het zoekvenster een stuk sneller zal werken. Bovendien zal de zoekbalk ook "
-"berichten selecteren op basis van hun inhoud.</p> "
-"<p>Een dergelijke index neemt meer ruimte in beslag op uw harde schijf.</p> "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Het volledig indexeren van teksten maakt het mogelijk om zeer snel de "
+"inhoud van uw berichten te doorzoeken. Wanneer u hier gebruik van maakt zult "
+"u zien dat het zoekvenster een stuk sneller zal werken. Bovendien zal de "
+"zoekbalk ook berichten selecteren op basis van hun inhoud.</p> <p>Een "
+"dergelijke index neemt meer ruimte in beslag op uw harde schijf.</p> "
 "<p>Nadat u dit hebt aangezet wordt de index aangemaakt, maar u kunt in de "
 "tussentijd nog gewoon gebruik maken van KMail.</p></qt>"
 
@@ -2893,11 +2872,11 @@ msgstr "Groupware-mappen &verbergen"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Wanneer deze optie is geselecteerd ziet u geen IMAP gegevensbronmappen meer in "
-"de mappenstructuur."
+"Wanneer deze optie is geselecteerd ziet u geen IMAP gegevensbronmappen meer "
+"in de mappenstructuur."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2905,11 +2884,11 @@ msgstr "Alleen groupware-mappen voor dit account t&onen"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Wanneer deze optie is geselecteerd ziet u geen normale berichtmappen meer in de "
-"mappenstructuur van het account dat is ingesteld voor groupware."
+"Wanneer deze optie is geselecteerd ziet u geen normale berichtmappen meer in "
+"de mappenstructuur van het account dat is ingesteld voor groupware."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2972,19 +2951,18 @@ msgstr ""
 "Schakel deze optie in om groupware-uitnodigingen te versturen die correct "
 "kunnen worden verwerkt door Microsoft Exchange."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Bijlagenaamgeving compatibel met Outlook(tm)"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatisch uitnodigingen verzenden"
@@ -2999,24 +2977,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Uitnodigingen worden normaal gesproken als bijlagen verstuurd. Deze optie "
-"zal ertoe leiden dat uitnodigingsberichten als tekst in de e-mail zelf "
-"geplaatst worden; dit is nodig om uitnodigingen en antwoorden te verzenden naar "
-"Microsoft Outlook. "
-"<br>Het is echter wel zo dat er geen zinnige tekst overblijft in "
-"e-mailprogramma's die hiermee niet om kunnen gaan. Dat zal ertoe leiden dat de "
-"berichten er in die programma's vreemd uit zullen zien. "
-"<br>Dit zal nog wel werken voor degenen die e-mailprogramma's gebruiken die dit "
-"wel ondersteunen.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Uitnodigingen worden normaal gesproken als bijlagen verstuurd. Deze "
+"optie zal ertoe leiden dat uitnodigingsberichten als tekst in de e-mail zelf "
+"geplaatst worden; dit is nodig om uitnodigingen en antwoorden te verzenden "
+"naar Microsoft Outlook. <br>Het is echter wel zo dat er geen zinnige tekst "
+"overblijft in e-mailprogramma's die hiermee niet om kunnen gaan. Dat zal "
+"ertoe leiden dat de berichten er in die programma's vreemd uit zullen zien. "
+"<br>Dit zal nog wel werken voor degenen die e-mailprogramma's gebruiken die "
+"dit wel ondersteunen.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3121,30 +3098,28 @@ msgstr "Doorsturen"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Hier kunt u eigen berichtsjablonen toevoegen, bewerken en verwijderen voor "
-"het beantwoorden of doorsturen van berichten. Om een aangepast sjabloon aan te "
-"maken dient u met de rechtermuisknop te klikken of het menu in de werkbalk te "
-"gebruiken. U kunt ook een sneltoets instellen om sneller met sjablonen te "
-"kunnen werken.</p> "
-"<p>Berichtsjablonen kunnen plaatshouders bevatten door ze eenvoudigweg te typen "
-"of door ze uit het menu te kiezen met <i>Commando invoegen</i>.</p> "
-"<p>Er zijn vier verschillende soorten sjablonen: voor <i>Antwoorden</i>, <i>"
-"Allen beantwoorden</i>, <i>Doorsturen</i> of <i>Algemeen</i>"
-". De laatste soort kan voor allerlei dingen gebruikt worden. U kunt geen "
-"sneltoets toewijzen aan algemene sjablonen.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt> <p>Hier kunt u eigen berichtsjablonen toevoegen, bewerken en "
+"verwijderen voor het beantwoorden of doorsturen van berichten. Om een "
+"aangepast sjabloon aan te maken dient u met de rechtermuisknop te klikken of "
+"het menu in de werkbalk te gebruiken. U kunt ook een sneltoets instellen om "
+"sneller met sjablonen te kunnen werken.</p> <p>Berichtsjablonen kunnen "
+"plaatshouders bevatten door ze eenvoudigweg te typen of door ze uit het menu "
+"te kiezen met <i>Commando invoegen</i>.</p> <p>Er zijn vier verschillende "
+"soorten sjablonen: voor <i>Antwoorden</i>, <i>Allen beantwoorden</i>, "
+"<i>Doorsturen</i> of <i>Algemeen</i>. De laatste soort kan voor allerlei "
+"dingen gebruikt worden. U kunt geen sneltoets toewijzen aan algemene "
+"sjablonen.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3162,15 +3137,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3188,8 +3163,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"De geselecteerde sneltoets wordt reeds gebruikt voor een ander sjabloon. Wilt u "
-"deze sneltoets toch toewijzen?"
+"De geselecteerde sneltoets wordt reeds gebruikt voor een ander sjabloon. "
+"Wilt u deze sneltoets toch toewijzen?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3236,8 +3211,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Distributielijst met de opgegeven naam <b>%1</b> "
-"bestaat al. Geef een andere naam op.</qt>"
+"<qt>Distributielijst met de opgegeven naam <b>%1</b> bestaat al. Geef een "
+"andere naam op.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3246,8 +3221,8 @@ msgstr "Bewerken met:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "KMail kan niet detecteren wanneer de gekozen editor is afgesloten. Om "
 "gegevensverlies te voorkomen zal het bewerken van bijlagen worden afgebroken."
@@ -3351,8 +3326,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Kan geen berichten laten verlopen van de map %1: de bestemmingsmap %2 werd niet "
-"gevonden"
+"Kan geen berichten laten verlopen van de map %1: de bestemmingsmap %2 werd "
+"niet gevonden"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3426,8 +3401,8 @@ msgstr "Definitief verwijderen"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Opmerking: De verloophandeling wordt direct toegepast nadat u de instellingen "
-"hebt opgeslagen."
+"Opmerking: De verloophandeling wordt direct toegepast nadat u de "
+"instellingen hebt opgeslagen."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3504,6 +3479,11 @@ msgstr "Filters selecteren"
 msgid "Filters"
 msgstr "Filters"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Alle tekst selecteren"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3533,11 +3513,11 @@ msgstr "&Filteractiviteiten vastleggen"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Hier kunt u het vastleggen van filteractiviteiten aan- of uitzetten. Er worden "
-"alleen gegevens verzameld en getoond wanneer deze optie aan staat. "
+"Hier kunt u het vastleggen van filteractiviteiten aan- of uitzetten. Er "
+"worden alleen gegevens verzameld en getoond wanneer deze optie aan staat. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3553,15 +3533,16 @@ msgstr "Evaluatie van filter&regels vastleggen"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"U kunt instellen hoeveel gegevens het evalueren van de filterregels produceert. "
-"Door deze optie te selecteren, krijgt u informatie over de verwerking van elke "
-"regel in een filter. In het andere geval wordt alleen het eindresultaat van "
-"alle regels in een filter vastgelegd."
+"U kunt instellen hoeveel gegevens het evalueren van de filterregels "
+"produceert. Door deze optie te selecteren, krijgt u informatie over de "
+"verwerking van elke regel in een filter. In het andere geval wordt alleen "
+"het eindresultaat van alle regels in een filter vastgelegd."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3581,15 +3562,15 @@ msgstr "oneindig"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Het verzamelen van loggegevens heeft geheugen nodig om de gegevens tijdelijk in "
-"op te slaan. Hier kunt u instellen hoeveel geheugen daarvoor maximaal gebruikt "
-"mag worden: wanneer deze grens overschreden wordt, zullen de oudste gegevens "
-"verwijderd worden totdat de grootte onder de grens ligt. "
+"Het verzamelen van loggegevens heeft geheugen nodig om de gegevens tijdelijk "
+"in op te slaan. Hier kunt u instellen hoeveel geheugen daarvoor maximaal "
+"gebruikt mag worden: wanneer deze grens overschreden wordt, zullen de oudste "
+"gegevens verwijderd worden totdat de grootte onder de grens ligt. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3599,7 +3580,7 @@ msgstr ""
 "Kon bestand %1 niet schrijven:\n"
 "\"%2\" is de gedetailleerde foutmelding."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail - foutmelding"
@@ -3640,14 +3621,14 @@ msgstr "&Gebruikers-id:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "De gebruikers-id is de loginnaam van de gebruiker op de IMAP-server. Dit kan "
 "een eenvoudige gebruikersnaam zijn of het volledige e-mailadres van de "
-"gebruiker. Uw logingegevens van uw account zullen vermelden welke u dient in te "
-"vullen."
+"gebruiker. Uw logingegevens van uw account zullen vermelden welke u dient in "
+"te vullen."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3698,8 +3679,8 @@ msgstr "U hebt geen lees- of schrijfrechten voor uw prullenbak."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Nog geen informatie van de server ontvangen, gebruik a.u.b. \"Berichten "
 "ophalen\"."
@@ -3712,8 +3693,7 @@ msgstr "Fout: Geen IMAP-account aangemaakt voor deze map"
 msgid "Connecting to server %1, please wait..."
 msgstr "Bezig met verbinden met server %1, even geduld a.u.b..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Fout bij het verbinden met server %1"
@@ -3721,7 +3701,8 @@ msgstr "Fout bij het verbinden met server %1"
 #: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr ""
-"Deze IMAP-server biedt geen ondersteuning voor toegangscontrolelijsten (ACL's)"
+"Deze IMAP-server biedt geen ondersteuning voor toegangscontrolelijsten "
+"(ACL's)"
 
 #: folderdiaacltab.cpp:524
 #, c-format
@@ -3742,8 +3723,8 @@ msgstr "Toegangsrechten toevoegen"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Wilt u werkelijk uw eigen toegangsrechten verwijderen voor deze map? Het is "
 "niet meer mogelijk om toegang te krijgen tot deze map wanneer u dit doet."
@@ -3777,7 +3758,7 @@ msgstr "Gebruik:"
 msgid "Select Folder"
 msgstr "Map selecteren"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale mappen"
@@ -3801,9 +3782,9 @@ msgstr "Selecteer een sneltoets voor de map"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Om een toets of een combinatie van toetsen te kiezen, selecteert u de "
 "huidige map, klikt u op de onderstaande knop, en drukt u op de toetsen die u "
@@ -3827,13 +3808,22 @@ msgstr "&Annuleren"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>De map die u hebt verwijderd hoorde bij het account <b>%1</b>"
-", die daar berichten in plaatst. Berichten die op dat account binnenkomen "
-"zullen in het algemene postvak in terecht komen.</qt>"
+"<qt>De map die u hebt verwijderd hoorde bij het account <b>%1</b>, die daar "
+"berichten in plaatst. Berichten die op dat account binnenkomen zullen in het "
+"algemene postvak in terecht komen.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Totaal: %2<br>Ongelezen: %3<br>Grootte: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Quota: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3956,71 +3946,17 @@ msgstr "Spamstatus:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>b"
-"<br>e"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br>-<br>b<br>e<br>r<br>i<br>c<br>h<br>t</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>G"
-"<br>e"
-"<br>e"
-"<br>n"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>b"
-"<br>e"
-"<br>r"
-"<br>i"
-"<br>c"
-"<br>h"
-"<br>t</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>G<br>e<br>e<br>n<br><br>H<br>T<br>M<br>L<br>-"
+"<br>b<br>e<br>r<br>i<br>c<br>h<br>t</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4032,19 +3968,13 @@ msgstr "N&aam:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Uw naam</h3> "
-"<p> Dit veld bevat de naam die u wilt laten weergeven in de kop van de "
-"berichten die u verzendt.</p> "
-"<p>Als u dit veld leeglaat, dan zal uw echte naam niet verschijnen, maar alleen "
-"het e-mailadres.</p></qt>"
+"<qt> <h3>Uw naam</h3> <p> Dit veld bevat de naam die u wilt laten weergeven "
+"in de kop van de berichten die u verzendt.</p> <p>Als u dit veld leeglaat, "
+"dan zal uw echte naam niet verschijnen, maar alleen het e-mailadres.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4052,16 +3982,12 @@ msgstr "Organi&satie:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Organisatie</h3> "
-"<p>Dit veld bevat de naam van de organisatie die u wilt laten weergeven in de "
-"kop van de berichten die u verzendt.</p> "
+"<qt> <h3>Organisatie</h3> <p>Dit veld bevat de naam van de organisatie die u "
+"wilt laten weergeven in de kop van de berichten die u verzendt.</p> "
 "<p>Normaliter laat u dit veld leeg.</p></qt>"
 
 #: identitydialog.cpp:149
@@ -4071,20 +3997,15 @@ msgstr "&E-mailadres:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>E-mailadres</h3> "
-"<p>Dit veld bevat uw e-mailadres.</p> "
-"<p>Als u dit veld leeg laat, of er een onjuist e-mailadres inzet, dan kunnen de "
-"personen aan wie u een e-mail stuurt deze niet beantwoorden.</p></qt>"
+"<qt> <h3>E-mailadres</h3> <p>Dit veld bevat uw e-mailadres.</p> <p>Als u dit "
+"veld leeg laat, of er een onjuist e-mailadres inzet, dan kunnen de personen "
+"aan wie u een e-mail stuurt deze niet beantwoorden.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4093,21 +4014,12 @@ msgstr "&E-mailadres:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4130,21 +4042,18 @@ msgstr "Kies een OpenPGP-sleutel waarmee u uw berichten wilt ondertekenen."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt> "
-"<p>De OpenPGP-sleutel die u hier kiest zal worden gebruikt om berichten te "
-"ondertekenen en om deze met uw eigen sleutel te versleutelen. U kunt ook "
-"gebruik maken van GnuPG-sleutels.</p>"
-"<p>U kunt dit veld leeg laten, maar KMail zal dan geen berichten digitaal "
-"ondertekenen met OpenPGP. Normale e-mailfuncties zullen hier geen hinder van "
-"ondervinden.</p>"
-"<p>U vindt meer informatie over sleutels op <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt> <p>De OpenPGP-sleutel die u hier kiest zal worden gebruikt om berichten "
+"te ondertekenen en om deze met uw eigen sleutel te versleutelen. U kunt ook "
+"gebruik maken van GnuPG-sleutels.</p><p>U kunt dit veld leeg laten, maar "
+"KMail zal dan geen berichten digitaal ondertekenen met OpenPGP. Normale e-"
+"mailfuncties zullen hier geen hinder van ondervinden.</p><p>U vindt meer "
+"informatie over sleutels op <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4156,32 +4065,29 @@ msgstr "Uw OpenPGP-sleutel voor versleuteling"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Selecteer de OpenPGP-sleutel waarmee u voor uzelf versleutelt en voor de optie "
-"\"Mijn publieke sleutel bijvoegen\" tijdens het opstellen van een bericht."
+"Selecteer de OpenPGP-sleutel waarmee u voor uzelf versleutelt en voor de "
+"optie \"Mijn publieke sleutel bijvoegen\" tijdens het opstellen van een "
+"bericht."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p>De OpenPGP-sleutel die u hier kiest zal worden gebruikt om berichten te "
-"versleutelen voor uzelf en voor de optie \"Mijn publieke sleutel bijvoegen\" "
-"tijdens het opstellen van een bericht. U kunt ook gebruik maken van "
-"GnuPG-sleutels.</p>"
-"<p>U kunt dit veld leeg laten, maar KMail zal dan geen berichten naar uzelf "
-"digitaal ondertekenen met OpenPGP. Normale e-mailfuncties zullen hier geen "
-"hinder van ondervinden.</p>"
-"<p>U vindt meer informatie over sleutels op <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p>De OpenPGP-sleutel die u hier kiest zal worden gebruikt om berichten "
+"te versleutelen voor uzelf en voor de optie \"Mijn publieke sleutel bijvoegen"
+"\" tijdens het opstellen van een bericht. U kunt ook gebruik maken van GnuPG-"
+"sleutels.</p><p>U kunt dit veld leeg laten, maar KMail zal dan geen "
+"berichten naar uzelf digitaal ondertekenen met OpenPGP. Normale e-"
+"mailfuncties zullen hier geen hinder van ondervinden.</p><p>U vindt meer "
+"informatie over sleutels op <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4201,18 +4107,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Het S/MIME-certificaat (X.509) dat u hier kiest zal gebruikt worden om uw "
-"berichten digitaal te ondertekenen.</p>"
-"<p>U kunt dit veld leeg laten, maar KMail zal dan niet uw berichten digitaal "
-"ondertekenen. Normale e-mailfuncties zullen hier geen hinder van "
-"ondervinden.</p></qt>"
+"<qt> <p>Het S/MIME-certificaat (X.509) dat u hier kiest zal gebruikt worden "
+"om uw berichten digitaal te ondertekenen.</p><p>U kunt dit veld leeg laten, "
+"maar KMail zal dan niet uw berichten digitaal ondertekenen. Normale e-"
+"mailfuncties zullen hier geen hinder van ondervinden.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4224,8 +4127,8 @@ msgstr "Uw S/MIME-versleutelingscertificaat"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Selecteer het S/MIME-certificaat waarmee u uw bericht voor uzelf wilt "
 "versleutelen en voor de optie \"Mijn certificaat bijvoegen\" tijdens het "
@@ -4233,20 +4136,18 @@ msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Het S/MIME-certificaat dat u hier kiest zal gebruikt worden om berichten "
-"voor uzelf te versleutelen en voor de optie \"Mijn certificaat bijvoegen\" "
-"tijdens het opstellen van een bericht.</p> "
-"<p>U kunt dit leeg laten, maar KMail zal dan niet in staat zijn om kopieën van "
-"de uitgaande berichten naar uzelf te versleutelen met S/MIME. Dit heeft geen "
-"invloed op de overige e-mailfuncties.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Het S/MIME-certificaat dat u hier kiest zal gebruikt worden om "
+"berichten voor uzelf te versleutelen en voor de optie \"Mijn certificaat "
+"bijvoegen\" tijdens het opstellen van een bericht.</p> <p>U kunt dit leeg "
+"laten, maar KMail zal dan niet in staat zijn om kopieën van de uitgaande "
+"berichten naar uzelf te versleutelen met S/MIME. Dit heeft geen invloed op "
+"de overige e-mailfuncties.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4266,24 +4167,20 @@ msgstr "Antwoo&rdadres:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3>Antwoordadres</h3> "
-"<p>Vul dit veld in als u wilt dat antwoorden op uw berichten naar een ander "
-"e-mailadres worden gestuurd. "
-"<p>Dit wordt voornamelijk gebruikt voor groepen die aan een bepaald project "
-"werken. U kunt dan met deze instelling ervoor zorgen dat de geadresseerde kan "
-"zien dat het bericht van u afkomstig is, terwijl de beantwoording naar een "
-"groeps-e-mailadres wordt gestuurd.</p> "
-"<p>Als u twijfelt, laat dan dit veld leeg.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3>Antwoordadres</h3> <p>Vul dit veld in als u wilt dat antwoorden op "
+"uw berichten naar een ander e-mailadres worden gestuurd. <p>Dit wordt "
+"voornamelijk gebruikt voor groepen die aan een bepaald project werken. U "
+"kunt dan met deze instelling ervoor zorgen dat de geadresseerde kan zien dat "
+"het bericht van u afkomstig is, terwijl de beantwoording naar een groeps-e-"
+"mailadres wordt gestuurd.</p> <p>Als u twijfelt, laat dan dit veld leeg.</"
+"p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4291,26 +4188,21 @@ msgstr "&BCC-adres:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC-adressen (blinde kopie)</h3>"
-"<p>De adressen die u hier invoert zullen worden toegevoegd aan elk uitgaand "
-"e-mailbericht dat wordt verzonden onder deze identiteit, ze zullen niet "
-"zichtbaar zijn voor andere geadresseerden.</p> "
-"<p>Dit wordt over het algemeen gebruikt voor het verzenden van een kopie van "
-"elk bericht naar een ander account van u.</p> "
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC-adressen (blinde kopie)</h3><p>De adressen die u hier invoert "
+"zullen worden toegevoegd aan elk uitgaand e-mailbericht dat wordt verzonden "
+"onder deze identiteit, ze zullen niet zichtbaar zijn voor andere "
+"geadresseerden.</p> <p>Dit wordt over het algemeen gebruikt voor het "
+"verzenden van een kopie van elk bericht naar een ander account van u.</p> "
 "<p>Om meer dan één adres op te geven, maak dan een lijst van BCC-ontvangers "
-"gescheiden door een komma.</p>"
-"<p>Als u twijfelt, laat dit veld dan leeg.</p></qt>"
+"gescheiden door een komma.</p><p>Als u twijfelt, laat dit veld dan leeg.</"
+"p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4348,7 +4240,7 @@ msgstr "Onderte&kening"
 msgid "&Picture"
 msgstr "Af&beelding"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ongeldig e-mailadres"
 
@@ -4371,8 +4263,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Eén van de ingestelde OpenPGP-sleutels voor versleuteling bevat geen "
 "gebruikers-id met een e-mailadres voor deze identiteit (%1)."
@@ -4414,9 +4306,9 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"De aangepaste map met verzonden berichten voor identiteit \"%1\" bestaat niet "
-"(meer). In plaats daarvan zal de standaardmap voor verzonden berichten worden "
-"gebruikt."
+"De aangepaste map met verzonden berichten voor identiteit \"%1\" bestaat "
+"niet (meer). In plaats daarvan zal de standaardmap voor verzonden berichten "
+"worden gebruikt."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4431,13 +4323,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"De map met aangepaste sjablonen voor identiteit \"%1\" bestaat niet (meer). De "
-"standaard sjabloonmap wordt gebruikt."
+"De map met aangepaste sjablonen voor identiteit \"%1\" bestaat niet (meer). "
+"De standaard sjabloonmap wordt gebruikt."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (standaard)"
 
@@ -4452,7 +4344,8 @@ msgstr "E-mailadres"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"U moet een gebruikersnaam en wachtwoord opgeven voor toegang tot deze postbus."
+"U moet een gebruikersnaam en wachtwoord opgeven voor toegang tot deze "
+"postbus."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4480,21 +4373,21 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail heeft een voorvoegsel gevonden in de instellingen van account \"%1\". Dit "
-"is overbodig met de ondersteuning voor IMAP-namespaces."
+"KMail heeft een voorvoegsel gevonden in de instellingen van account \"%1\". "
+"Dit is overbodig met de ondersteuning voor IMAP-namespaces."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"De instellingen zijn automatisch overgezet maar u dient uw accountinstellingen "
-"alsnog te controleren."
+"De instellingen zijn automatisch overgezet maar u dient uw "
+"accountinstellingen alsnog te controleren."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Het was niet mogelijk om uw instellingen automatisch over te zetten dus "
 "controleer uw accountinstellingen."
@@ -4534,17 +4427,22 @@ msgstr "De map ligt tegen het quotum aan. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Omdat u geen schrijfrechten heeft voor deze map, kunt u de eigenaar van de map "
-"vragen om wat ruimte vrij te maken."
+"Omdat u geen schrijfrechten heeft voor deze map, kunt u de eigenaar van de "
+"map vragen om wat ruimte vrij te maken."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Fout: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "De verbinding met de server %1 was onverwacht verbroken. Dit zal automatisch "
 "opnieuw opgezet worden indien mogelijk."
@@ -4560,8 +4458,8 @@ msgstr "De verbinding met account %1 is verlopen."
 #: imapaccountbase.cpp:1253
 msgid "Error while uploading status of messages to server: "
 msgstr ""
-"Er deed zich een fout voor tijdens het verzenden van de berichtstatussen naar "
-"de server: "
+"Er deed zich een fout voor tijdens het verzenden van de berichtstatussen "
+"naar de server: "
 
 #: imapaccountbase.cpp:1298 listjob.cpp:118
 msgid "retrieving folders"
@@ -4594,8 +4492,8 @@ msgstr "Fout bij het ophalen van berichten van de server."
 #: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr ""
-"Er deed zich een fout voor tijdens het ophalen van de berichtstructuur van het "
-"bericht."
+"Er deed zich een fout voor tijdens het ophalen van de berichtstructuur van "
+"het bericht."
 
 #: imapjob.cpp:543
 msgid "Uploading message data failed."
@@ -4701,8 +4599,8 @@ msgstr "Lijstarchieven"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 "Eén of meer ingestelde OpenPGP-versleutelingssleutels of S/MIME-certificaten "
 "zijn niet volledig vertrouwd voor versleuteling."
@@ -4710,8 +4608,8 @@ msgstr ""
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 "Eén of meer ingestelde OpenPGP-versleutelingssleutels of S/MIME-certificaten "
 "zijn niet volledig vertrouwd voor versleuteling."
@@ -4730,7 +4628,8 @@ msgid ""
 "The following keys or certificates have unknown trust level: \n"
 msgstr ""
 "\n"
-"De volgende sleutels of certificaten hebben een onbekende vertrouwenswaarde: \n"
+"De volgende sleutels of certificaten hebben een onbekende "
+"vertrouwenswaarde: \n"
 
 #: keyresolver.cpp:323
 #, fuzzy
@@ -4739,7 +4638,8 @@ msgid ""
 "The following keys or certificates are <b>revoked</b>: \n"
 msgstr ""
 "\n"
-"De volgende sleutels of certificaten hebben een onbekende vertrouwenswaarde: \n"
+"De volgende sleutels of certificaten hebben een onbekende "
+"vertrouwenswaarde: \n"
 
 #: keyresolver.cpp:327
 msgid "Not Fully Trusted Encryption Keys"
@@ -4748,216 +4648,182 @@ msgstr "Onbruikbare sleutels voor versleuteling"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor ondertekening verloopt binnen één dag.</p>\n"
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor ondertekening verloopt binnen %n dagen.</p>"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor ondertekening verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor ondertekening verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor versleuteling verloopt binnen één dag.</p>\n"
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor versleuteling verloopt binnen %n dagen.</p>"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor versleuteling verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor versleuteling verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> verloopt binnen één dag.</p>\n"
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> verloopt binnen %n dagen.</p>"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-ondertekeningscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-ondertekeningscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"ondertekeningscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"ondertekeningscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"certificaat</p><p align=center><b>%1</b> (serienummer %2)</p><p>verloopt "
+"binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"certificaat</p><p align=center><b>%1</b> (serienummer %2)</p><p>verloopt "
+"binnen %n dagen.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
+"(serienummer %2)</p><p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
+"(serienummer %2)</p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer "
+"%2)</p><p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer "
+"%2)</p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor ondertekening verloopt binnen één dag.</p>\n"
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor ondertekening verloopt binnen %n dagen.</p>"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor ondertekening verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor ondertekening verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor versleuteling verloopt binnen één dag.</p>\n"
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor versleuteling verloopt binnen %n dagen.</p>"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor versleuteling verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor versleuteling verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> verloopt binnen één dag.</p>\n"
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> verloopt binnen %n dagen.</p>"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4971,205 +4837,171 @@ msgstr "S/MIME-certificaat zal binnenkort verlopen"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor ondertekening verloopt binnen één dag.</p>\n"
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor ondertekening verloopt binnen %n dagen.</p>"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor ondertekening verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor ondertekening verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor versleuteling verloopt binnen één dag.</p>\n"
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> voor versleuteling verloopt binnen %n dagen.</p>"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor versleuteling verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"voor versleuteling verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> verloopt binnen één dag.</p>\n"
-"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p>"
-"<p> verloopt binnen %n dagen.</p>"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"verloopt binnen één dag.</p>\n"
+"<p>Uw OpenPGP-sleutel </p><p align=center><b>%1</b> (sleutel-id 0x%2)</p><p> "
+"verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-ondertekeningscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-ondertekeningscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"ondertekeningscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"ondertekeningscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"certificaat</p><p align=center><b>%1</b> (serienummer %2)</p><p>verloopt "
+"binnen één dag.</p>\n"
+"<p>Het hoofdcertificaat</p><p align=center><b>%3</b></p> <p>voor uw S/MIME-"
+"certificaat</p><p align=center><b>%1</b> (serienummer %2)</p><p>verloopt "
+"binnen %n dagen.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
+"(serienummer %2)</p><p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat voor ondertekening</p><p align=center><b>%1</b> "
+"(serienummer %2)</p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer "
+"%2)</p><p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-versleutelingscertificaat</p><p align=center><b>%1</b> (serienummer "
+"%2)</p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen één dag.</p>\n"
-"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> "
-"<p>voor uw S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>verloopt binnen %n dagen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen één dag.</p>\n"
+"<p>Het tijdelijke CA-certificaat</p><p align=center><b>%3</b></p> <p>voor uw "
+"S/MIME-certificaat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor ondertekening verloopt binnen één dag.</p>\n"
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor ondertekening verloopt binnen %n dagen.</p>"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor ondertekening verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor ondertekening verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor versleuteling verloopt binnen één dag.</p>\n"
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> voor versleuteling verloopt binnen %n dagen.</p>"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor versleuteling verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> voor versleuteling verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> verloopt binnen één dag.</p>\n"
-"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p> verloopt binnen %n dagen.</p>"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> verloopt binnen één dag.</p>\n"
+"<p>Uw S/MIME-certificaat </p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p> verloopt binnen %n dagen.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5181,9 +5013,10 @@ msgstr "S/MIME-certificaat zal binnenkort verlopen"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5191,8 +5024,8 @@ msgstr ""
 "bruikbaar voor versleuteling. Stel uw sleutels voor versleuteling a.u.b. "
 "opnieuw in voor deze identiteit in het configuratiedialoog van de "
 "Identiteiten.\n"
-"Wanneer u kiest om door te gaan en u de sleutels later nog nodig hebt, zult u "
-"gevraagd worden om een sleutel te kiezen."
+"Wanneer u kiest om door te gaan en u de sleutels later nog nodig hebt, zult "
+"u gevraagd worden om een sleutel te kiezen."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5206,11 +5039,11 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Eén of meer ingestelde OpenPGP-sleutels of S/MIME-certificaten zijn niet meer "
-"bruikbaar voor ondertekening. Stel uw sleutels voor ondertekening a.u.b. "
-"opnieuw in voor deze identiteit in de identiteitsinstellingen.\n"
-"Wanneer u kiest om door te gaan en u de sleutels later nog nodig hebt, zult u "
-"gevraagd worden om een sleutel te kiezen."
+"Eén of meer ingestelde OpenPGP-sleutels of S/MIME-certificaten zijn niet "
+"meer bruikbaar voor ondertekening. Stel uw sleutels voor ondertekening a.u."
+"b. opnieuw in voor deze identiteit in de identiteitsinstellingen.\n"
+"Wanneer u kiest om door te gaan en u de sleutels later nog nodig hebt, zult "
+"u gevraagd worden om een sleutel te kiezen."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5220,38 +5053,38 @@ msgstr "Onbruikbare ondertekeningsleutels"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Volgens de versleutelingsvoorkeuren van de ontvangers dient het bericht met "
 "OpenPGP versleuteld te worden, tenminste voor enkele ontvangers.\n"
 "U hebt echter geen geldige en vertrouwde OpenPGP-sleutels voor versleuteling "
 "voor deze identiteit.\n"
-"U kunt doorgaan zonder dat u voor uzelf versleutelt, maar houd er rekening mee "
-"dat u dan uw eigen berichten niet meer kunt lezen."
+"U kunt doorgaan zonder dat u voor uzelf versleutelt, maar houd er rekening "
+"mee dat u dan uw eigen berichten niet meer kunt lezen."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Volgens de versleutelingsvoorkeuren van de ontvangers dient het bericht met "
 "S/MIME versleuteld te worden, tenminste voor enkele ontvangers.\n"
 "U hebt echter geen geldige S/MIME-versleutelingscertificaat voor deze "
 "identiteit.\n"
-"U kunt doorgaan zonder dat u voor uzelf versleutelt, maar houd er rekening mee "
-"dat u dan uw eigen berichten niet meer kunt lezen."
+"U kunt doorgaan zonder dat u voor uzelf versleutelt, maar houd er rekening "
+"mee dat u dan uw eigen berichten niet meer kunt lezen."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5266,8 +5099,8 @@ msgstr "Niet OpenPGP-ondertekenen"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5286,9 +5119,9 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Na onderzoek van de ondertekeningsvoorkeuren van de ontvanger bleek dat er geen "
-"gemeenschappelijk type ondertekening was voor uw beschikbare sleutels. Bericht "
-"verzenden zonder ondertekening?"
+"Na onderzoek van de ondertekeningsvoorkeuren van de ontvanger bleek dat er "
+"geen gemeenschappelijk type ondertekening was voor uw beschikbare sleutels. "
+"Bericht verzenden zonder ondertekening?"
 
 #: keyresolver.cpp:1335
 msgid "No signing possible"
@@ -5296,8 +5129,8 @@ msgstr "Geen ondertekening mogelijk"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "U hebt geen sleutel voor versleuteling voor uzelf gekozen (versleutelen voor "
 "mezelf). Het is niet mogelijk om uw eigen berichten te ontcijferen wanneer u "
@@ -5322,11 +5155,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers van "
-"dit bericht. Het bericht zal daardoor niet versleuteld worden."
+"U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers "
+"van dit bericht. Het bericht zal daardoor niet versleuteld worden."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5337,16 +5170,17 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers van "
-"dit bericht. Deze persoon kan het bericht niet lezen wanneer u het versleutelt."
+"U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers "
+"van dit bericht. Deze persoon kan het bericht niet lezen wanneer u het "
+"versleutelt."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"U hebt geen sleutels voor versleuteling gekozen voor één van de ontvangers van "
-"dit bericht. Deze personen kunnen het bericht niet lezen wanneer u het "
+"U hebt geen sleutels voor versleuteling gekozen voor één van de ontvangers "
+"van dit bericht. Deze personen kunnen het bericht niet lezen wanneer u het "
 "versleutelt."
 
 #: keyresolver.cpp:1585
@@ -5364,18 +5198,19 @@ msgid ""
 msgstr ""
 "Er is een probleem met de sleutel(s) voor \"%1\".\n"
 "\n"
-"Selecteer de sleutel(s) nogmaals die voor deze ontvanger gebruikt moet worden."
+"Selecteer de sleutel(s) nogmaals die voor deze ontvanger gebruikt moet "
+"worden."
 
 #: keyresolver.cpp:1678
 #, fuzzy
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Er is geen geldige en vertrouwde sleutel gevonden voor \"%1\".\n"
 "\n"
@@ -5424,10 +5259,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritieke fout, de berichten konden niet worden opgehaald: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Het toevoegen van het bericht is mislukt:\n"
+msgid "Failed to add message:\n"
+msgstr "Het toevoegen van het bericht is mislukt:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5517,6 +5350,52 @@ msgstr "IMAP zonder verbin&ding"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-postbus"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Onderwerp van bericht instellen"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "CC (kopie van bericht) naar 'adres' verzenden"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "BCC (blinde kopie) naar 'adres' verzenden"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "'berichtkop' aan bericht toevoegen"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Berichttekst vanuit 'bestand' inlezen"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Inhoud van bericht instellen"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Voeg een bijlage toe aan het bericht, dit kan worden herhaald"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Alleen controleren op nieuwe berichten"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Alleen venster voor opstellen van e-mailberichten openen"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Het opgegeven berichtenbestand tonen"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Bericht sturen naar 'address' resp. bijlage toevoegen waar 'URL' naar "
+"verwijst"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mail"
@@ -5573,14 +5452,13 @@ msgstr "%1: map %2 gevonden, deze zal ingesteld worden als hoofdmap groupware."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail heeft de volgende groupwaremappen in %1 gevonden en wil de volgende "
-"acties gaan uitvoeren: %2 "
-"<br>Wanneer u dit niet wilt dient u dit te annuleren en zal de "
-"IMAP-gegevensbron uitgeschakeld worden"
+"<qt>KMail heeft de volgende groupwaremappen in %1 gevonden en wil de "
+"volgende acties gaan uitvoeren: %2 <br>Wanneer u dit niet wilt dient u dit "
+"te annuleren en zal de IMAP-gegevensbron uitgeschakeld worden"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5628,11 +5506,11 @@ msgstr "URL-adres is gekopieerd naar het klembord."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Bestand <b>%1</b> bestaat reeds.<br>Wilt u het vervangen?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Opslaan naar bestand"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Vervangen"
 
@@ -5649,10 +5527,10 @@ msgstr ""
 #: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
-"Het bericht werd verwijderd terwijl het werd opgeslagen. Het opslaan is daarom "
-"niet gelukt."
+"Het bericht werd verwijderd terwijl het werd opgeslagen. Het opslaan is "
+"daarom niet gelukt."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5673,100 +5551,100 @@ msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Dit bestand bevat meerdere berichten. Het eerste bericht wordt weergegeven."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Dit is een doorgestuurd bericht, bestaande uit verschillende MIME-stukken. De "
-"inhoud van dit bericht bevindt zich in de bijlage(n).\n"
+"Dit is een doorgestuurd bericht, bestaande uit verschillende MIME-stukken. "
+"De inhoud van dit bericht bevindt zich in de bijlage(n).\n"
 "\n"
 "\n"
 "--\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Berichten filteren"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Bericht %1 van %2 wordt gefilterd"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Onvoldoende vrije schijfruimte?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Verplaatsen naar deze map"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiëren naar deze map"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
-"De IMAP-cache in map %1 blijkt corrupt te zijn. Het kopiëren van de berichten "
-"is afgebroken."
+"De IMAP-cache in map %1 blijkt corrupt te zijn. Het kopiëren van de "
+"berichten is afgebroken."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Berichten worden verplaatst"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Berichten worden verwijderd"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL-adres wordt geopend..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Wilt u werkelijk <b>%1</b> uitvoeren?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Er zijn geen bijlagen gevonden om op te slaan."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Bijlage opslaan als"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "bijlage.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "bijlage.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Een bestand met de naam %1 bestaat reeds. Wilt u het overschrijven?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Bestand bestaat reeds"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Overschrijven"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5774,19 +5652,19 @@ msgstr ""
 "Het deel %1 van het bericht is versleuteld. Wilt u de versleuteling bij het "
 "opslaan behouden?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail - vraag"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Versleuteling behouden"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Niet behouden"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5794,11 +5672,11 @@ msgstr ""
 "Het deel %1 van het bericht is ondertekend. Wilt u de ondertekening behouden "
 "bij het opslaan?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Handtekening behouden"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5807,22 +5685,22 @@ msgstr ""
 "Kon het bestand %1 niet opslaan:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Kon het bestand %1 niet opslaan."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Er bestaat geen adresboekingang voor dit e-mailadres. Voeg deze toe aan het "
-"adresboek en voeg vervolgens de instant messaging-adressen toe aan uw "
-"IM-programma van uw voorkeur."
+"adresboek en voeg vervolgens de instant messaging-adressen toe aan uw IM-"
+"programma van uw voorkeur."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5832,72 +5710,72 @@ msgstr ""
 "%1\n"
 " Het is onmogelijk om te bepalen met wie u wilt chatten."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Het Chiasmus-backend biedt geen functie \"x-obtain-keys\". Rapporteer deze bug "
-"a.u.b."
+"Het Chiasmus-backend biedt geen functie \"x-obtain-keys\". Rapporteer deze "
+"bug a.u.b."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus-backendfout"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Het Chiasmus-backend retourneerde een onverwachte waarde. De functie "
-"\"x-obtain-keys\" resulteerde niet in een lijst met strings. Rapporteer deze "
-"bug a.u.b."
+"Het Chiasmus-backend retourneerde een onverwachte waarde. De functie \"x-"
+"obtain-keys\" resulteerde niet in een lijst met strings. Rapporteer deze bug "
+"a.u.b."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Er zijn geen sleutels gevonden. Controleer of u een geldig sleutelpad hebt "
 "opgegeven in de instellingen van Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Sleutelselectie ontcijfering Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Het Chiasmus-backend biedt geen functie \"x-decrypt\". Rapporteer deze bug "
-"a.u.b."
+"Het Chiasmus-backend biedt geen functie \"x-decrypt\". Rapporteer deze bug a."
+"u.b."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"De functie \"x-decrypt\" accepteerde niet de verwachte parameters. Rapporteer "
-"a.u.b. deze bug."
+"De functie \"x-decrypt\" accepteerde niet de verwachte parameters. "
+"Rapporteer a.u.b. deze bug."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Ontcijferingsfout in Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Onverwachte waarde van het Chiasmus-backend. De functie \"x-decrypt\" "
 "resulteerde niet in een byte array. Rapporteer deze bug a.u.b."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5907,7 +5785,7 @@ msgstr ""
 "Aan: %2\n"
 "Onderwerp: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Bericht: %1"
@@ -6006,7 +5884,7 @@ msgstr "Grootte"
 msgid "Encoding"
 msgstr "Codering"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comprimeren"
 
@@ -6018,7 +5896,7 @@ msgstr "Versleutelen"
 msgid "Sign"
 msgstr "Ondertekenen"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Naam van bijlage:"
 
@@ -6040,10 +5918,11 @@ msgstr "Hoofdgeadresseerden"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>De e-mailadressen die in dit veld worden ingevuld ontvangen een kopie van "
-"het e-mailbericht.</qt>"
+"<qt>De e-mailadressen die in dit veld worden ingevuld ontvangen een kopie "
+"van het e-mailbericht.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6052,14 +5931,15 @@ msgstr "Extra geadresseerden"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>De e-mailadressen die u in dit veld hebt ingevoerd ontvangt een kopie van "
-"het bericht. Technisch gezien is dit hetzelfde als het plaatsen van het adres "
-"in het veld <b>Aan:</b>. Het verschil zit hem erin dat iemand in de Carbon Copy "
-"(CC) alleen maar meeluistert en niet de echte ontvanger is van het bericht.</qt>"
+"<qt>De e-mailadressen die u in dit veld hebt ingevoerd ontvangt een kopie "
+"van het bericht. Technisch gezien is dit hetzelfde als het plaatsen van het "
+"adres in het veld <b>Aan:</b>. Het verschil zit hem erin dat iemand in de "
+"Carbon Copy (CC) alleen maar meeluistert en niet de echte ontvanger is van "
+"het bericht.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6067,12 +5947,11 @@ msgstr "Verborgen geadresseerden"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>In principe hetzelfde als het veld <b>Kopiëren naar</b> "
-"(CC), alleenzien de andere ontvangers niet wie een kopie ontvangen heeft.</qt>"
+"<qt>In principe hetzelfde als het veld <b>Kopiëren naar</b> (CC), alleenzien "
+"de andere ontvangers niet wie een kopie ontvangen heeft.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6082,7 +5961,7 @@ msgstr "E-mail ver&zenden"
 msgid "&Send Mail Via"
 msgstr "E-mail verzenden &via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&Later verzenden"
@@ -6147,8 +6026,7 @@ msgstr "Aanhalingstekens verwijdere&n"
 msgid "Cl&ean Spaces"
 msgstr "Spaties &comprimeren"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Vast lettertype gebr&uiken"
@@ -6289,31 +6167,31 @@ msgstr "&Cryptografisch berichtformaat"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standaard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Opgesomde lijst (bolletje)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Opgesomde lijst (rondje)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Opgesomde lijst (vierkantje)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Geordende lijst (decimaal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Geordende lijst (kleine letters)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Geordende lijst (hoofdletters)"
 
@@ -6418,65 +6296,63 @@ msgstr "Opsteller sluiten"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Het bericht dat u hebt opgesteld verwijst naar een bijlage, maar u hebt er geen "
-"bijgesloten in dit bericht.\n"
+"Het bericht dat u hebt opgesteld verwijst naar een bijlage, maar u hebt er "
+"geen bijgesloten in dit bericht.\n"
 "Wilt u een bijlage toevoegen?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Herinnering voor bijlage toevoegen"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Zo &verzenden"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail heeft de locatie van de bijlage (%1) niet herkend.</p>"
-"<p>Geef het volledige pad op als u een bijlage wilt toevoegen.</p></qt>"
+"<qt><p>KMail heeft de locatie van de bijlage (%1) niet herkend.</p><p>Geef "
+"het volledige pad op als u een bijlage wilt toevoegen.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt> "
-"<p>Uw systeembeheerder staat het niet toe dat er bestanden groter dan %1 MB "
-"worden bijgevoegd.</p>"
+"<qt> <p>Uw systeembeheerder staat het niet toe dat er bestanden groter dan "
+"%1 MB worden bijgevoegd.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Bestand bijvoegen"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "Bij&lage"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Bestand invoegen"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Bestand invoegen"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Er deed zich een fout voor tijdens het exporteren van de sleutel vanuit het "
-"backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Er deed zich een fout voor tijdens het exporteren van de sleutel "
+"vanuit het backend:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6515,19 +6391,34 @@ msgid ""
 "View"
 msgstr "Tonen"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Bewerken..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Bewerken met..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Opslaan a&ls..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Eigenscha&ppen"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Bijlage toevoegen..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail kon het bestand niet comprimeren."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6535,169 +6426,162 @@ msgstr ""
 "Het gecomprimeerde bestand is groter dan het oorspronkelijke bestand. Wilt u "
 "het oorspronkelijke bestand behouden?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Behouden"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail kon het bestand niet uitpakken."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Bijlage opslaan als"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Als tekst toevoegen"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Als bijlage toevoegen"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Kies of u de inhoud als tekst wilt invoegen of als bijlage wilt toevoegen."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Plakken als tekst of bijvoegen?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "naamloos"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>U hebt opgegeven dat u berichten voor uzelf wilt versleutelen, maar de "
-"huidige identiteit bevat hiervoor geen sleutel voor versleuteling (OpenPGP of "
-"S/MIME).</p> "
-"<p>Selecteer a.u.b. de te gebruiken sleutel(s) in de "
-"identiteitsinstellingen.</p></qt>"
+"<qt><p>U hebt opgegeven dat u berichten voor uzelf wilt versleutelen, maar "
+"de huidige identiteit bevat hiervoor geen sleutel voor versleuteling "
+"(OpenPGP of S/MIME).</p> <p>Selecteer a.u.b. de te gebruiken sleutel(s) in "
+"de identiteitsinstellingen.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Niet-gedefinieerd versleutelingtype"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Om dit bericht te kunnen ondertekenen, dient u eerst een OpenPGP- of "
+"<qt><p>Om dit bericht te kunnen ondertekenen, dient u eerst een OpenPGP- of "
 "S/MIME-sleutel te definiëren die hiervoor zal worden gebruikt.</p> "
-"<p>Selecteer a.u.b. de te gebruiken sleutel(s) in de "
-"identiteitsinstellingen.</p></qt>"
+"<p>Selecteer a.u.b. de te gebruiken sleutel(s) in de identiteitsinstellingen."
+"</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Niet-gedefinieerde ondertekeningsleutel"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"KMail is momenteel in de offline-modus. Uw berichten zullen in het postvak uit "
-"bewaard blijven totdat u weer online gaat."
+"KMail is momenteel in de offline-modus. Uw berichten zullen in het postvak "
+"uit bewaard blijven totdat u weer online gaat."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"U dient uw e-mailadres in het Van:-veld in te voeren. U dient ook uw "
-"e-mailadres voor al uw identiteiten in te stellen, zodat u het niet voor ieder "
+"U dient uw e-mailadres in het Van:-veld in te voeren. U dient ook uw e-"
+"mailadres voor al uw identiteiten in te stellen, zodat u het niet voor ieder "
 "bericht hoeft in te voeren."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "U moet tenminste één ontvanger opgeven in het veld Aan, CC of BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Het To-veld is leeg. Het bericht toch verzenden?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Geen To: opgegeven"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "U hebt geen onderwerp ingevoerd. Het bericht toch verzenden?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Geen onderwerp ingevoerd"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Zo &verzenden"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Onderwerp opgeven"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Opmaak behouden, niet ondertekenen noch versleutelen"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Opmaak &behouden, niet versleutelen"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Opmaak behouden, niet ondertekenen"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Ondertekenen/versleutelen (opmaak verwijderen)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Versleutelen (Opmaak verwijderen)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "&Ondertekenen (opmaak verwijderen)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 "<qt> Het is niet mogelijk om HTML-berichten te ondertekenen of te "
-"versleutelen;</p> "
-"<p>Wilt u de opmaak wissen?</p></qt>"
+"versleutelen;</p> <p>Wilt u de opmaak wissen?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Bericht ondertekenen/versleutelen?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6706,106 +6590,107 @@ msgstr ""
 "(meer). In plaats daarvan zal de standaard concepten- of sjabloonmap worden "
 "gebruikt."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Maak een account aan voor het verzenden en probeer het opnieuw."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Staat op het punt een bericht te verzenden..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Bevestiging verzenden"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Nu ver&zenden"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Geen geadresseerden"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Extra geadresseerden"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Spellingcontrole: aan"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Spellingcontrole: uit"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Spellingcontrole geannuleerd."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Spellingcontrole gestopt."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Spellingcontrole uitgevoerd."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Spellingcontrole"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Stel eerst een cryptografische backend zodat u Chiasmus-versleuteling kunt "
 "gebruiken.\n"
-"U kunt dit doen in het tabblad Crypto-backends in het onderdeel Beveiliging van "
-"het configuratievenster van KMail."
+"U kunt dit doen in het tabblad Crypto-backends in het onderdeel Beveiliging "
+"van het configuratievenster van KMail."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Het lijkt erop dat libkleopatra is gecompileerd zonder Chiasmus-ondersteuning. "
-"Wellicht wilt u libkleopatra opnieuw compileren met de vlag --enable-chiasmus."
+"Het lijkt erop dat libkleopatra is gecompileerd zonder Chiasmus-"
+"ondersteuning. Wellicht wilt u libkleopatra opnieuw compileren met de vlag --"
+"enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Geen Chiasmus-backend ingesteld"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Geen Chiasmus-sleutels gevonden"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Sleutelselectie Chiasmus-versleuteling"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Het bericht zal worden ondertekend"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Het bericht zal niet worden ondertekend"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Het bericht zal versleuteld worden"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Het bericht zal niet versleuteld worden"
 
@@ -6856,11 +6741,11 @@ msgstr "Spellingcontrole - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpell/ASpell kon niet worden opgestart. Zorg ervoor dat ISpell of ASpell goed "
-"is geconfigureerd en in uw zoekpad (PATH) staat."
+"ISpell/ASpell kon niet worden opgestart. Zorg ervoor dat ISpell of ASpell "
+"goed is geconfigureerd en in uw zoekpad (PATH) staat."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6894,12 +6779,10 @@ msgstr "<qt>Teveel filterhandelingen in filterregel <b>%1'</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Onbekende filterhandeling <b>%1</b>"
-"<br> in filterregel <b>%2</b>."
+"<qt>Onbekende filterhandeling <b>%1</b><br> in filterregel <b>%2</b>."
 "<br>Deze wordt genegeerd.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7120,163 +7003,135 @@ msgstr "Geluid afspelen"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dit is de lijst met gedefinieerde filters. Ze zijn van boven naar onder "
-"opgesteld.</p>"
-"<p>Klik op een filter om deze te bewerken met de knoppen in de rechter helft "
-"van het dialoogvenster.</p></qt>"
+"<qt><p>Dit is de lijst met gedefinieerde filters. Ze zijn van boven naar "
+"onder opgesteld.</p><p>Klik op een filter om deze te bewerken met de knoppen "
+"in de rechter helft van het dialoogvenster.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Druk op deze knop om een nieuwe filter aan te maken.</p>"
-"<p>Deze wordt boven de momenteel geselecteerde filter ingevoegd. Dit kunt u "
-"later nog aanpassen.</p>"
-"<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u dit ongedaan "
-"maken door rechts op de knop <em>verwijderen</em> te drukken.</p></qt>"
+"<qt><p>Druk op deze knop om een nieuwe filter aan te maken.</p><p>Deze wordt "
+"boven de momenteel geselecteerde filter ingevoegd. Dit kunt u later nog "
+"aanpassen.</p><p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u "
+"dit ongedaan maken door rechts op de knop <em>verwijderen</em> te drukken.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Druk op deze knop om een filter te kopiëren.</p>"
-"<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u dit ongedaan "
-"maken door rechts op de knop <em>verwijderen</em> te drukken.</p></qt>"
+"<qt><p>Druk op deze knop om een filter te kopiëren.</p><p>Mocht u deze knop "
+"per ongeluk hebben ingedrukt, dan kunt u dit ongedaan maken door rechts op "
+"de knop <em>verwijderen</em> te drukken.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Druk op deze knop om het momenteel geselecteerde filter te <em>"
-"verwijderen</em> uit bovenstaande lijst.</p>"
-"<p>Eenmaal verwijderd kunt u het filter niet meer terughalen. Maar u kunt dit "
-"dialoogvenster altijd verlaten zonder dat de wijzigingen van kracht worden. Dit "
-"doet u door op <em>Annuleren</em> te drukken.</p></qt>"
+"<qt><p>Druk op deze knop om het momenteel geselecteerde filter te "
+"<em>verwijderen</em> uit bovenstaande lijst.</p><p>Eenmaal verwijderd kunt u "
+"het filter niet meer terughalen. Maar u kunt dit dialoogvenster altijd "
+"verlaten zonder dat de wijzigingen van kracht worden. Dit doet u door op "
+"<em>Annuleren</em> te drukken.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Druk op deze knop om het momenteel geselecteerde filter <em>bovenaan</em> "
-"in de lijst te zetten.</p>"
-"<p>Het aanpassen hiervan is handig omdat het programma de filters op volgorde "
-"afhandelt. Het eerste filter wordt als eerste afgehandeld.</p></qt>"
+"<qt><p>Druk op deze knop om het momenteel geselecteerde filter <em>bovenaan</"
+"em> in de lijst te zetten.</p><p>Het aanpassen hiervan is handig omdat het "
+"programma de filters op volgorde afhandelt. Het eerste filter wordt als "
+"eerste afgehandeld.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Druk op deze knop om het geselecteerde filter een plaats <em>omhoog</em> "
-"te zetten.</p>"
-"<p>Het aanpassen hiervan is handig omdat het programma de filters op volgorde "
-"afhandelt. U kunt dus berichten op verschillende criteria filteren.</p>"
-"<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u de zet ongedaan "
-"maken via de knop <em>omlaag</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Druk op deze knop om het geselecteerde filter een plaats <em>omhoog</"
+"em> te zetten.</p><p>Het aanpassen hiervan is handig omdat het programma de "
+"filters op volgorde afhandelt. U kunt dus berichten op verschillende "
+"criteria filteren.</p><p>Mocht u deze knop per ongeluk hebben ingedrukt, dan "
+"kunt u de zet ongedaan maken via de knop <em>omlaag</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Druk op deze knop om het momenteel geselecteerde filter een plaats <em>"
-"omlaag</em> in de lijst te zetten.</p>"
-"<p>Het aanpassen hiervan is handig omdat het programma de filters op volgorde "
-"afhandelt. Het eerste filter wordt als eerste afgehandeld."
-"<p>Mocht u deze knop per ongeluk hebben ingedrukt, dan kunt u de zet ongedaan "
-"maken via de knop <em>omhoog</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Druk op deze knop om het momenteel geselecteerde filter een plaats "
+"<em>omlaag</em> in de lijst te zetten.</p><p>Het aanpassen hiervan is handig "
+"omdat het programma de filters op volgorde afhandelt. Het eerste filter "
+"wordt als eerste afgehandeld.<p>Mocht u deze knop per ongeluk hebben "
+"ingedrukt, dan kunt u de zet ongedaan maken via de knop <em>omhoog</em></p></"
+"qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Druk op deze knop om het momenteel geselecteerde filter <em>onderaan</em> "
-"in de lijst te zetten.</p>"
-"<p>Het aanpassen hiervan is handig omdat het programma de filters op volgorde "
-"afhandelt. Het eerste filter wordt als eerste afgehandeld.</p></qt>"
+"<qt><p>Druk op deze knop om het momenteel geselecteerde filter <em>onderaan</"
+"em> in de lijst te zetten.</p><p>Het aanpassen hiervan is handig omdat het "
+"programma de filters op volgorde afhandelt. Het eerste filter wordt als "
+"eerste afgehandeld.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Druk op deze knop om de momenteel geselecteerde filter te hernoemen.</p>"
-"<p>Filters krijgen automatisch een naam, zolang ze maar beginnen met "
-"\"&lt;\".</p>"
-"<p>Als u per ongeluk een filter hebt hernoemd, en u wilt de automatische naam "
-"weer terug, druk dan op deze knop en selecteer <em>Beginwaarde</em> "
-"en vervolgens <em>Wissen</em> in het volgende dialoogvenster.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Druk op deze knop om de momenteel geselecteerde filter te hernoemen.</"
+"p><p>Filters krijgen automatisch een naam, zolang ze maar beginnen met \"&lt;"
+"\".</p><p>Als u per ongeluk een filter hebt hernoemd, en u wilt de "
+"automatische naam weer terug, druk dan op deze knop en selecteer "
+"<em>Beginwaarde</em> en vervolgens <em>Wissen</em> in het volgende "
+"dialoogvenster.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Selecteer deze optie om het tonen van de bevestigingsdialoog te forceren.</p>"
-"<p>Dit is bruikbaar als u een filterinstelling hebt gedefinieerd die berichten "
-"markeert om later te worden opgehaald. Zonder deze mogelijkheid kunnen deze "
-"berichten nooit worden opgehaald als er geen andere grote berichten op de "
-"server wachten, of als u de filterinstelling voor het markeren van de berichten "
-"wou veranderen.</p></qt>"
+"<qt> <p>Selecteer deze optie om het tonen van de bevestigingsdialoog te "
+"forceren.</p><p>Dit is bruikbaar als u een filterinstelling hebt "
+"gedefinieerd die berichten markeert om later te worden opgehaald. Zonder "
+"deze mogelijkheid kunnen deze berichten nooit worden opgehaald als er geen "
+"andere grote berichten op de server wachten, of als u de filterinstelling "
+"voor het markeren van de berichten wou veranderen.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7286,6 +7141,16 @@ msgstr "POP3-filterregels"
 msgid "Filter Rules"
 msgstr "Filterregels"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importeren"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importeren"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Beschikbare filters"
@@ -7368,6 +7233,11 @@ msgstr "Dit filter ook toevoegen aan werkbalk"
 msgid "Icon for this filter:"
 msgstr "Pictogram voor dit filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Aan"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Omhoog"
@@ -7376,16 +7246,29 @@ msgstr "Omhoog"
 msgid "Down"
 msgstr "Omlaag"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Hernoemen..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nieuw"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Ko&piëren naar"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Verwijderd"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7394,20 +7277,21 @@ msgstr "Selecteer een sneltoets voor de map"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Er is tenminste één filter dat als doelmap een map op een online IMAP-account "
-"heeft. Deze filters worden alleen toegepast wanneer er handmatig gefilterd "
-"wordt of wanneer u binnenkomende berichten van uw online IMAP-account ophaalt."
+"Er is tenminste één filter dat als doelmap een map op een online IMAP-"
+"account heeft. Deze filters worden alleen toegepast wanneer er handmatig "
+"gefilterd wordt of wanneer u binnenkomende berichten van uw online IMAP-"
+"account ophaalt."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"De volgende filters zijn niet opgeslagen omdat ze ongeldig zijn (bijv. omdat ze "
-"geen handelingen of zoekregels bevatten)."
+"De volgende filters zijn niet opgeslagen omdat ze ongeldig zijn (bijv. omdat "
+"ze geen handelingen of zoekregels bevatten)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7476,29 +7360,26 @@ msgstr "Probleemoplossing voor de IMAP-cache"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Probleemoplossing voor de IMAP-cache.</b></p> "
-"<p>Als u problemen ondervindt bij het synchroniseren van een IMAP-map, probeer "
-"dan eerst het index-bestand opnieuw aan te maken. Het opnieuw aanmaken kan "
-"enige tijd in beslag nemen, maar veroorzaakt verder geen problemen.</p> "
-"<p>Als dat niet helpt, dan kunt u proberen de IMAP-cache te verversen. Wanneer "
-"u dit doet zult u al uw lokale wijzigingen in deze map en de bijhorende "
-"submappen verliezen.</p>"
+"<p><b>Probleemoplossing voor de IMAP-cache.</b></p> <p>Als u problemen "
+"ondervindt bij het synchroniseren van een IMAP-map, probeer dan eerst het "
+"index-bestand opnieuw aan te maken. Het opnieuw aanmaken kan enige tijd in "
+"beslag nemen, maar veroorzaakt verder geen problemen.</p> <p>Als dat niet "
+"helpt, dan kunt u proberen de IMAP-cache te verversen. Wanneer u dit doet "
+"zult u al uw lokale wijzigingen in deze map en de bijhorende submappen "
+"verliezen.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7529,13 +7410,13 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Het UID-cachebestand van de map %1 kon niet gelezen worden. Er kan een probleem "
-"zijn met de toegangsrechten of het bestand is corrupt."
+"Het UID-cachebestand van de map %1 kon niet gelezen worden. Er kan een "
+"probleem zijn met de toegangsrechten of het bestand is corrupt."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Het UID-cachebestand voor de map %1 kon niet geschreven worden. Er kan een "
 "probleem zijn met uw toegangsrechten."
@@ -7576,11 +7457,11 @@ msgstr "De index van deze map is opnieuw aangemaakt."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"De map %1 bevindt zich niet in de oorspronkelijke synchronisatiestatus (status "
-"was %2)\n"
+"De map %1 bevindt zich niet in de oorspronkelijke synchronisatiestatus "
+"(status was %2)\n"
 "Wilt u deze terugzetten naar de oorspronkelijke synchronisatiestatus en toch "
 "synchroniseren?"
 
@@ -7709,15 +7590,11 @@ msgstr "De submappen worden op de server aangemaakt"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>De e-mails op de server in de map <b>%1</b> zijn verwijderd. Wilt u deze ook "
-"lokaal verwijderen?"
-"<br> UIDs: %2</p></qt>"
+"<qt> <p>De e-mails op de server in de map <b>%1</b> zijn verwijderd. Wilt u "
+"deze ook lokaal verwijderen?<br> UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7738,13 +7615,11 @@ msgstr "Mappen voor namespace %1 worden opgehaald"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Het lijkt of de map <b>%1</b> was verwijderd. Wilt u het verwijderen van de "
-"server?</p></qt>"
+"<qt><p>Het lijkt of de map <b>%1</b> was verwijderd. Wilt u het verwijderen "
+"van de server?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7752,21 +7627,21 @@ msgstr "Afgebroken"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"De IMAP-server %1 heeft geen ondersteuning voor mappen met speciale inhoud. De "
-"XML-opslag kon niet gebruikt worden voor deze server, pas de instellingen van "
-"KMail daarom aan."
+"De IMAP-server %1 heeft geen ondersteuning voor mappen met speciale inhoud. "
+"De XML-opslag kon niet gebruikt worden voor deze server, pas de instellingen "
+"van KMail daarom aan."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"De IMAP-server %1 heeft geen ondersteuning voor mappen met speciale inhoud. De "
-"XML-opslag kon niet gebruikt worden voor deze server, pas de instellingen van "
-"KMail daarom aan"
+"De IMAP-server %1 heeft geen ondersteuning voor mappen met speciale inhoud. "
+"De XML-opslag kon niet gebruikt worden voor deze server, pas de instellingen "
+"van KMail daarom aan"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7779,17 +7654,17 @@ msgstr "verloren+gevonden"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Er zijn nieuwe berichten in de map <b>%1</b> die nog niet naar de server "
 "verzonden zijn, maar de map is op de server verwijderd of u hebt onvoldoende "
-"toegangsrechten om naar de map te kunnen uploaden.</p>"
-"<p>De betreffende berichten worden verplaatst naar <b>%2</b> "
-"om gegevensverlies te voorkomen.</p>"
+"toegangsrechten om naar de map te kunnen uploaden.</p><p>De betreffende "
+"berichten worden verplaatst naar <b>%2</b> om gegevensverlies te voorkomen.</"
+"p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7797,21 +7672,26 @@ msgstr "Onvoldoende toegangsrechten"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Er zijn nieuwe berichten in deze map (%1) die nog niet naar de server "
-"verzonden zijn, maar de map is verwijderd van de server of u hebt onvoldoende "
-"toegangsrechten om naar de map te kunnen uploaden. Neem contact op met uw "
-"systeembeheerder om het uploaden naar deze map toe te staan, of verplaats de "
-"berichten uit deze map.</p> "
-"<p>Wilt u de berichten nu naar een andere map verplaatsen?</p>"
+"verzonden zijn, maar de map is verwijderd van de server of u hebt "
+"onvoldoende toegangsrechten om naar de map te kunnen uploaden. Neem contact "
+"op met uw systeembeheerder om het uploaden naar deze map toe te staan, of "
+"verplaats de berichten uit deze map.</p> <p>Wilt u de berichten nu naar een "
+"andere map verplaatsen?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Verplaatsen naar:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Niet verplaatsen"
 
@@ -7823,8 +7703,7 @@ msgstr "Berichten naar map verplaatsen"
 msgid "Permissions (ACL)"
 msgstr "Toegangsrechten (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Algemeen"
@@ -7848,8 +7727,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Aangepaste p&ictogrammen gebruiken"
@@ -7868,23 +7746,21 @@ msgstr "Notificatie van nieuwe of ongelezen berichten in deze map"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Wanneer deze optie is ingeschakeld zullen alle nieuwe/ongelezen berichten in "
-"deze map vermeld worden. Dat houdt ook in dat deze map geopend wordt bij het "
-"openen van de volgende/vorige map met ongelezen berichten.</p>"
-"<p>Schakel deze optie uit wanneer u niet wilt dat nieuwe/ongelezen berichten in "
-"deze map vermeld worden. Ook zal deze map overgeslagen worden wanneer u naar de "
-"volgende/vorige map gaat met ongelezen berichten. Dit is handig om mappen met "
-"ongewenste berichten te negeren.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt> <p>Wanneer deze optie is ingeschakeld zullen alle nieuwe/ongelezen "
+"berichten in deze map vermeld worden. Dat houdt ook in dat deze map geopend "
+"wordt bij het openen van de volgende/vorige map met ongelezen berichten.</"
+"p><p>Schakel deze optie uit wanneer u niet wilt dat nieuwe/ongelezen "
+"berichten in deze map vermeld worden. Ook zal deze map overgeslagen worden "
+"wanneer u naar de volgende/vorige map gaat met ongelezen berichten. Dit is "
+"handig om mappen met ongewenste berichten te negeren.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7896,9 +7772,9 @@ msgstr "Antwoorden in deze map behouden"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Activeer deze optie wanneer u uw antwoorden op berichten in deze map wilt "
 "bewaren in plaats van de map Verzonden."
@@ -7911,17 +7787,21 @@ msgstr "Afzender/ontvanger tonen in berichtenlijst"
 msgid "Sho&w column:"
 msgstr "Kolo&m tonen:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Instellen als standaard"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Afzender"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Ontvanger"
@@ -7932,17 +7812,17 @@ msgstr "Identiteit van af&zender:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Selecteer de identiteit van de afzender van de berichten die u opstelt in deze "
-"map. Dit betekent dat wanneer deze map bijvoorbeeld voor uw werk is kunt u "
-"automatisch aan deze map het bijbehorende e-mailadres, handtekening en sleutels "
-"koppelen. U kunt de identiteiten instellen in het configuratievenster "
-"(Instellingen->KMail instellen)."
+"Selecteer de identiteit van de afzender van de berichten die u opstelt in "
+"deze map. Dit betekent dat wanneer deze map bijvoorbeeld voor uw werk is "
+"kunt u automatisch aan deze map het bijbehorende e-mailadres, handtekening "
+"en sleutels koppelen. U kunt de identiteiten instellen in het "
+"configuratievenster (Instellingen->KMail instellen)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7960,26 +7840,27 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Deze instelling bepaalt welke gebruikers die deze map delen "
-"\"bezet\"-informatie en herinneringen kunnen ontvangen voor de evenementen en "
-"taken in deze map. Deze instelling is alleen van toepassing op een map voor "
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Deze instelling bepaalt welke gebruikers die deze map delen \"bezet\"-"
+"informatie en herinneringen kunnen ontvangen voor de evenementen en taken in "
+"deze map. Deze instelling is alleen van toepassing op een map voor "
 "evenementen en taken (en wanneer er enkel taken zijn zullen alleen de "
 "herinneringen opgehaald worden).\n"
 "\n"
 "Voorbeelden: wanneer de directeur een map deelt met zijn secretaresse, dient "
 "alleen de baas op \"bezet\" te komen te staan gedurende de evenementen. Hij "
-"dient dan de beheerdersrechten te kiezen omdat de secretaresse die niet heeft.\n"
+"dient dan de beheerdersrechten te kiezen omdat de secretaresse die niet "
+"heeft.\n"
 "Aan de andere kant, wanneer een werkgroep een agenda met groepsvergaderingen "
 "heeft, dient ieder lid op \"bezet\" te komen tijdens deze vergaderingen.\n"
-"Een bedrijf die een agenda heeft voor het hele bedrijf dient dit op \"Niemand\" "
-"te zetten omdat niet bekend is wie naar een bepaald evenement zal gaan."
+"Een bedrijf die een agenda heeft voor het hele bedrijf dient dit op \"Niemand"
+"\" te zetten omdat niet bekend is wie naar een bepaald evenement zal gaan."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7997,8 +7878,8 @@ msgstr "Alle lezers van deze map"
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
-"Met deze instelling kunt u herinneringen uitschakelen voor mappen die gedeeld "
-"worden met anderen. "
+"Met deze instelling kunt u herinneringen uitschakelen voor mappen die "
+"gedeeld worden met anderen. "
 
 #: kmfolderdia.cpp:562
 #, fuzzy
@@ -8012,23 +7893,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"U hebt deze map zo ingesteld dat ze groupware-informatie bevat en de algemene "
-"optie om groupwaremappen is aangezet. Dat betekent dat deze map zal verdwijnen "
-"op het moment dat u deze dialoog afsluit. Als u deze map later wilt "
-"verwijderen, dan dient u tijdelijk het verbergen van groupware-mappen uit te "
-"schakelen om de map zichtbaar te maken."
+"U hebt deze map zo ingesteld dat ze groupware-informatie bevat en de "
+"algemene optie om groupwaremappen is aangezet. Dat betekent dat deze map zal "
+"verdwijnen op het moment dat u deze dialoog afsluit. Als u deze map later "
+"wilt verwijderen, dan dient u tijdelijk het verbergen van groupware-mappen "
+"uit te schakelen om de map zichtbaar te maken."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8097,11 +7978,13 @@ msgstr "Fout bij het ophalen van mapinformatie."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "De berichtenindex voor '%1' is van een onbekende KMail-versie (%2).\n"
 "De index kan opnieuw gegenereerd worden, maar bepaalde informatie zoals "
-"statusmarkeringen, kan verloren gaan. Wilt u uw indexbestand opnieuw genereren?"
+"statusmarkeringen, kan verloren gaan. Wilt u uw indexbestand opnieuw "
+"genereren?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8117,8 +8000,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"De berichtenindex voor '%1' is corrupt en zal opnieuw aangemaakt worden, maar "
-"bepaalde informatie, zoals statusmarkeringen, kan verloren gaan."
+"De berichtenindex voor '%1' is corrupt en zal opnieuw aangemaakt worden, "
+"maar bepaalde informatie, zoals statusmarkeringen, kan verloren gaan."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8126,8 +8009,8 @@ msgstr "Fout bij openen van %1, deze map ontbreekt."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Fout bij openen van %1. Of dit is geen geldige maildir-map, of u hebt "
 "onvoldoende toegangsrechten."
@@ -8149,7 +8032,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: abnormale terminatie om gegevensverlies te voorkomen."
+"KMFolderMaildir::addMsg: abnormale terminatie om gegevensverlies te "
+"voorkomen."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8174,21 +8058,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>De index van map '%2' blijkt niet actueel te zijn. Om beschadiging van "
-"berichten te voorkomen zal de index opnieuw worden aangemaakt. Dit kan tot "
-"gevolg hebben dat reeds verwijderde berichten weer verschijnen en dat "
-"statusmarkeringen verloren gaan.</p> "
-"<p>Lees a.u.b. de <a href=\"%1\">FAQ in de handleiding van KMail</a> "
-"voor informatie over hoe u dit probleem in de toekomst kunt voorkomen.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>De index van map '%2' blijkt niet actueel te zijn. Om beschadiging "
+"van berichten te voorkomen zal de index opnieuw worden aangemaakt. Dit kan "
+"tot gevolg hebben dat reeds verwijderde berichten weer verschijnen en dat "
+"statusmarkeringen verloren gaan.</p> <p>Lees a.u.b. de <a href=\"%1\">FAQ in "
+"de handleiding van KMail</a> voor informatie over hoe u dit probleem in de "
+"toekomst kunt voorkomen.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8226,7 +8107,8 @@ msgstr "Kan het bericht niet toevoegen aan deze map:"
 #: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr ""
-"Het bericht kon niet worden toegevoegd aan de map. (Onvoldoende schijfruimte?)"
+"Het bericht kon niet worden toegevoegd aan de map. (Onvoldoende "
+"schijfruimte?)"
 
 #: kmfoldermgr.cpp:68
 msgid "Are you sure you want to expire old messages?"
@@ -8248,7 +8130,7 @@ msgstr ""
 "'%1' blijkt geen map te zijn.\n"
 "Haal het bestand a.u.b. uit de weg."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8256,7 +8138,7 @@ msgstr ""
 "De toegangsrechten van map '%1' zijn onjuist.\n"
 "Zorg ervoor dat u de inhoud van deze map kunt openen en bewerken."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8266,18 +8148,18 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 "Een map met dezelfde naam is verwijderd sinds de laatste e-mailcontrole. U "
-"dient uw e-mail te controleren voordat u een andere map aanmaakt met dezelfde "
-"naam."
+"dient uw e-mail te controleren voordat u een andere map aanmaakt met "
+"dezelfde naam."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "De map kon niet worden aangemaakt"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8374,9 +8256,9 @@ msgstr "Problemen in IMAP-bu&ffer oplossen..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Kon de map <b>%1</b> niet aanmaken omdat er onvoldoende toegangsrechten "
 "zijn op de server. Wanneer het mogelijk moet zijn om submappen aan te kunnen "
@@ -8398,22 +8280,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Kan de map <b>%1</b> niet hier verplaatsen of kopiëren omdat er al een map "
-"met dezelfde naam bestaat.</qt>"
+"<qt>Kan de map <b>%1</b> niet hier verplaatsen of kopiëren omdat er al een "
+"map met dezelfde naam bestaat.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Kan de map <b>%1</b> niet verplaatsen of kopiëren omdat het zichzelf niet "
-"volledig gekopieerd heeft.</qt>"
+"<qt>Kan de map <b>%1</b> niet verplaatsen of kopiëren omdat het zichzelf "
+"niet volledig gekopieerd heeft.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Kan de map <b>%1</b> niet verplaatsen of kopiëren in zijn eigen submap.</qt>"
+"<qt>Kan de map <b>%1</b> niet verplaatsen of kopiëren in zijn eigen submap.</"
+"qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8519,15 +8402,15 @@ msgstr "%1 mappen zijn alleen-lezen."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Wilt u werkelijk het geselecteerde bericht verwijderen?"
-"<br>Eenmaal verwijderd kunt u het niet meer terughalen.</qt>\n"
-"<qt>Wilt u werkelijk de %n geselecteerde berichten verwijderen?"
-"<br>Eenmaal verwijderd kunt u ze niet meer terughalen.</qt>"
+"<qt>Wilt u werkelijk het geselecteerde bericht verwijderen?<br>Eenmaal "
+"verwijderd kunt u het niet meer terughalen.</qt>\n"
+"<qt>Wilt u werkelijk de %n geselecteerde berichten verwijderen?<br>Eenmaal "
+"verwijderd kunt u ze niet meer terughalen.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8579,133 +8462,131 @@ msgstr ""
 "Fout bij het wijzigen van %1\n"
 "(Onvoldoende schijfruimte?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Certificaat-ondertekening-aanvraag"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Onderteken a.u.b. dit certificaat en stuur het retour."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail is ingesteld op de offline-modus. Alle netwerktaken zijn uitgesteld"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail is ingesteld op de online-modus. Alle netwerktaken worden hervat"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail bevindt zich in de offline-modus. Hoe wilt u verdergaan?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Online werken"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Offline werken"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw postvak in."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "postvak uit"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw postvak uit."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "verzonden"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "U hebt geen lees- of schrijfrechten voor uw map met verzonden berichten."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "prullenbak"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw prullenbak."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "concepten"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw conceptenmap."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "sjablonen"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "U hebt geen lees- of schrijfrechten voor uw sjabloonmap."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Laatste zoekopdracht"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>De map <i>%4</i> bestaat al. %1 gebruikt de map <i>%5</i> "
-"voor zijn berichten. "
-"<p>%2 kan de inhoud van <i>%6<i> naar deze map verplaatsen, hoewel dit "
-"bestaande bestanden met dezelfde naam kan overschrijven in <i>%7</i>. "
-"<p><strong>Wilt u dat %3 de berichtbestanden nu verplaatst?</strong></qt>"
+"<qt>De map <i>%4</i> bestaat al. %1 gebruikt de map <i>%5</i> voor zijn "
+"berichten. <p>%2 kan de inhoud van <i>%6<i> naar deze map verplaatsen, "
+"hoewel dit bestaande bestanden met dezelfde naam kan overschrijven in <i>%7</"
+"i>. <p><strong>Wilt u dat %3 de berichtbestanden nu verplaatst?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>De map <i>%4</i> bestaat al. %1 gebruikt nu de map <i>%5</i> "
-"voor zijn berichten. %2 kan de inhoud van <i>%6</i> in deze map verplaatsen. "
+"<qt>De map <i>%4</i> bestaat al. %1 gebruikt nu de map <i>%5</i> voor zijn "
+"berichten. %2 kan de inhoud van <i>%6</i> in deze map verplaatsen. "
 "<p><strong>Wilt u dat %3 de berichtbestanden nu verplaatst?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Berichtbestanden overplaatsen?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail kwam een fatale fout tegen en zal nu worden afgesloten."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8716,11 +8597,11 @@ msgstr ""
 "De fout was:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Prullenbak legen"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Wilt u werkelijk de prullenbak van alle accounts legen?"
 
@@ -8795,8 +8676,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Nieuw bericht binnengekomen</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8836,11 +8716,11 @@ msgstr "Wilt u werkelijk de prullenbak legen?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Wilt u werkelijk alle berichten uit de map <b>%1</b> "
-"naar de prullenbak verplaatsen?</qt>"
+"<qt>Wilt u werkelijk alle berichten uit de map <b>%1</b> naar de prullenbak "
+"verplaatsen?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8864,12 +8744,12 @@ msgstr "Zoekopdracht verwijderen"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Wilt u werkelijk de zoekmap <b>%1</b> verwijderen? "
-"<br>De berichten die er in worden weergegeven zullen echter niet worden "
-"verwijderd. Deze blijven in de originele map staan.</qt>"
+"<qt>Wilt u werkelijk de zoekmap <b>%1</b> verwijderen? <br>De berichten die "
+"er in worden weergegeven zullen echter niet worden verwijderd. Deze blijven "
+"in de originele map staan.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8881,24 +8761,21 @@ msgstr "<qt>Wilt u werkelijk de lege map <b>%1</b> verwijderen?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Wilt uw werkelijk de lege map <b>%1</b> en alle onderliggende mappen "
 "verwijderen? De onderliggende mappen bevatten mogelijk berichten die ook "
-"verwijderd zullen worden. "
-"<p><b>Let op</b>: de verwijderde berichten komen niet in de prullenbak maar "
-"worden definitief verwijderd.</qt>"
+"verwijderd zullen worden. <p><b>Let op</b>: de verwijderde berichten komen "
+"niet in de prullenbak maar worden definitief verwijderd.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Wilt uw werkelijk de map <b>%1</b> verwijderen, ongeacht de inhoud? "
 "<p><b>Let op</b>: de verwijderde berichten komen niet in de prullenbak maar "
@@ -8906,23 +8783,27 @@ msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Wilt uw werkelijk de map <b>%1</b> en alle onderliggende mappen "
-"verwijderen, ongeacht de inhoud? "
-"<p><b>Let op</b>: de verwijderde berichten komen niet in de prullenbak maar "
-"worden definitief verwijderd.</qt>"
+"verwijderen, ongeacht de inhoud? <p><b>Let op</b>: de verwijderde berichten "
+"komen niet in de prullenbak maar worden definitief verwijderd.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Verwijderd"
 
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
-"Wilt u werkelijk de IMAP-buffer verversen?Alle wijzigingen die u in uw lokale "
-"IMAP-mappen hebt gemaakt zullen verloren gaan."
+"Wilt u werkelijk de IMAP-buffer verversen?Alle wijzigingen die u in uw "
+"lokale IMAP-mappen hebt gemaakt zullen verloren gaan."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8932,13 +8813,13 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Het gebruik van HTML in e-mail maakt u meer kwetsbaar voor \"spam\" (ongewenste "
-"e-mailreclame) en vergroot de kans dat uw systeem gevoelig wordt voor andere "
-"typen van beveiligingsrisico's.\n"
+"Het gebruik van HTML in e-mail maakt u meer kwetsbaar voor \"spam"
+"\" (ongewenste e-mailreclame) en vergroot de kans dat uw systeem gevoelig "
+"wordt voor andere typen van beveiligingsrisico's.\n"
 "Wilt u toch doorgaan?"
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8952,8 +8833,8 @@ msgstr "Gebruik HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Het ophalen van externe referenties in HTML-berichten maakt u meer kwetsbaar "
 "voor \"spam\" (ongewenste e-mailreclame) en vergroot de kans dat uw systeem "
@@ -8973,12 +8854,12 @@ msgstr "Filteren op discussiegroep %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"De functie \"Afwezigheidsantwoord\" is afhankelijk van filtering op de server. "
-"U hebt hier nog geen IMAP-server voor ingesteld.\n"
+"De functie \"Afwezigheidsantwoord\" is afhankelijk van filtering op de "
+"server. U hebt hier nog geen IMAP-server voor ingesteld.\n"
 "U kunt dit regelen bij tabblad \"Filtering\" in de IMAP-accountconfiguratie."
 
 #: kmmainwidget.cpp:1743
@@ -8995,7 +8876,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "De GnuPG logweergave kon niet worden opgestart. Controleer a.u.b. uw "
 "installatie."
@@ -9317,8 +9199,7 @@ msgstr "Bijlagen op&slaan..."
 msgid "Appl&y All Filters"
 msgstr "Alle filters toe&passen"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "F&ilter toepassen"
@@ -9367,8 +9248,8 @@ msgstr "Kolom &grootte"
 #: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Schakelt de weergave van de kolom om die de totale grootte van de berichten in "
-"de mappen toont."
+"Schakelt de weergave van de kolom om die de totale grootte van de berichten "
+"in de mappen toont."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9434,7 +9315,6 @@ msgstr "Volgende &ongelezen bericht"
 msgid "Go to the next unread message"
 msgstr "Naar het volgende ongelezen bericht gaan"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Vori&ge bericht"
@@ -9573,46 +9453,49 @@ msgstr " Initialiseren..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Dit bericht bevat een verzoek voor een bevestiging voor ontvangst en gelezen.\n"
+"Dit bericht bevat een verzoek voor een bevestiging voor ontvangst en "
+"gelezen.\n"
 "U kunt dit verzoek negeren, een bevestiging laten versturen, of een "
 "\"geweigerd\" als antwoord versturen."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Dit bericht bevat een verzoek voor een bevestiging van ontvangst en gelezen.\n"
-"Het bevat een instructie dat is gemarkeerd als \"vereist\", maar niet bekend is "
-"bij KMail.\n"
-"U kunt dit verzoek negeren of KMail een antwoord in de vorm \"mislukt\" laten "
-"sturen."
+"Dit bericht bevat een verzoek voor een bevestiging van ontvangst en "
+"gelezen.\n"
+"Het bevat een instructie dat is gemarkeerd als \"vereist\", maar niet bekend "
+"is bij KMail.\n"
+"U kunt dit verzoek negeren of KMail een antwoord in de vorm \"mislukt\" "
+"laten sturen."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Dit bericht verzoekt een bevestiging voor ontvangst- en gelezente verzenden.\n"
+"Dit bericht verzoekt een bevestiging voor ontvangst- en gelezente "
+"verzenden.\n"
 "Deze bevestiging is echter gericht aan meer dan één adres.\n"
-"U kunt het verzoek negeren, een bevestiging laten sturen of een antwoord in de "
-"vorm \"geweigerd\" laten sturen."
+"U kunt het verzoek negeren, een bevestiging laten sturen of een antwoord in "
+"de vorm \"geweigerd\" laten sturen."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9624,8 +9507,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9633,8 +9516,8 @@ msgid ""
 msgstr ""
 "Dit bericht verzoekt een bevestiging voor ontvangst en gelezen.\n"
 "Het antwoordadres is echter anders dan het adres voor de bevestiging.\n"
-"U kunt dit verzoek negeren, een bevestiging laten versturen, of een antwoord in "
-"de vorm van \"geweigerd\"."
+"U kunt dit verzoek negeren, een bevestiging laten versturen, of een antwoord "
+"in de vorm van \"geweigerd\"."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9660,16 +9543,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Ontvangst:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Bijlage: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Deze bijlage is verwijderd."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "De bijlage '%1' is verwijderd."
 
@@ -9717,47 +9600,40 @@ msgstr "Eigenschappen van bijlagen"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Het <em>MIME-bestandstype</em>.</p> "
-"<p>Normaal gesproken hoeft u deze instelling niet te wijzigen, aangezien het "
-"MIME-bestandstype automatisch wordt gecontroleerd. Maar soms detecteert %1 het "
-"type niet correct. Hier kunt u dat dan herstellen.</p></qt>"
+"<qt> <p>Het <em>MIME-bestandstype</em>.</p> <p>Normaal gesproken hoeft u "
+"deze instelling niet te wijzigen, aangezien het MIME-bestandstype "
+"automatisch wordt gecontroleerd. Maar soms detecteert %1 het type niet "
+"correct. Hier kunt u dat dan herstellen.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> De grootte van de bijlage.</p> "
-"<p>Soms zal %1 alleen een geschatte grootte geven, omdat het berekenen van de "
-"exacte grootte teveel tijd vergt. Als dit het geval is, dan kunt u dit "
-"zichtbaar maken door \"(ca.)\" toe te voegen aan de weergegeven grootte.</p>"
-"</qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
+msgstr ""
+"<qt><p> De grootte van de bijlage.</p> <p>Soms zal %1 alleen een geschatte "
+"grootte geven, omdat het berekenen van de exacte grootte teveel tijd vergt. "
+"Als dit het geval is, dan kunt u dit zichtbaar maken door \"(ca.)\" toe te "
+"voegen aan de weergegeven grootte.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>De bestandsnaam van de bijlage.</p> "
-"<p>Alhoewel dit standaard de naam van het bijgevoegde bestand is, wordt het "
-"bestand dat moet worden bijgevoegd hiermee niet gespecificeerd. Het suggereert "
-"echter een bestandsnaam dat gebruikt moet worden door het e-mailprogramma van "
-"de ontvanger als deze de bijlage op de schijf opslaat.</p></qt>"
+"<qt> <p>De bestandsnaam van de bijlage.</p> <p>Alhoewel dit standaard de "
+"naam van het bijgevoegde bestand is, wordt het bestand dat moet worden "
+"bijgevoegd hiermee niet gespecificeerd. Het suggereert echter een "
+"bestandsnaam dat gebruikt moet worden door het e-mailprogramma van de "
+"ontvanger als deze de bijlage op de schijf opslaat.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9765,18 +9641,15 @@ msgstr "B&eschrijving:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Een beschrijving van de bijlage.</p> "
-"<p>Dit is gewoon een informele beschrijving van bijlage, ongeveer zoals het "
-"onderwerp van het e-mailbericht. De meeste e-mailprogramma's zullen deze "
-"informatie in hun berichtvoorbeelden weergeven, naast het pictogram van de "
-"bijlage.</p></qt>"
+"<qt> <p>Een beschrijving van de bijlage.</p> <p>Dit is gewoon een informele "
+"beschrijving van bijlage, ongeveer zoals het onderwerp van het e-"
+"mailbericht. De meeste e-mailprogramma's zullen deze informatie in hun "
+"berichtvoorbeelden weergeven, naast het pictogram van de bijlage.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9784,24 +9657,21 @@ msgstr "Cod&ering:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>De transportcodering voor deze bijlage.</p> "
-"<p>Normaal gesproken hoeft u dit niet te wijzigen, aangezien %1 een nette "
-"standaardcodering gebruikt, gebaseerd op het mime bestandstype. Maar soms kunt "
-"u de grootte van het uiteindelijke bericht aanzienlijk verkleinen. "
-"Bijvoorbeeld, als een PostScript-bestand geen binaire gegevens bevat, maar "
-"alleen uit pure tekst bestaat. In dat geval bespaart u tot 25% aan "
-"berichtgrootte door de standaardcodering \"base64\" te vervangen door "
-"\"quoted-printable\".</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>De transportcodering voor deze bijlage.</p> <p>Normaal gesproken "
+"hoeft u dit niet te wijzigen, aangezien %1 een nette standaardcodering "
+"gebruikt, gebaseerd op het mime bestandstype. Maar soms kunt u de grootte "
+"van het uiteindelijke bericht aanzienlijk verkleinen. Bijvoorbeeld, als een "
+"PostScript-bestand geen binaire gegevens bevat, maar alleen uit pure tekst "
+"bestaat. In dat geval bespaart u tot 25% aan berichtgrootte door de "
+"standaardcodering \"base64\" te vervangen door \"quoted-printable\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9809,21 +9679,18 @@ msgstr "&Automatische weergave voorstellen"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Selecteer deze optie als u de ontvanger wilt voorstellen om de bijlage "
-"automatisch (ingebed) te laten weergeven in het voorbeeldvenster, in plaats van "
-"het standaardpictogram. </p>"
-"<p> Technisch gezien wordt dit gedaan door het kopschriftveld <em>"
-"Content-Disposition</em> van deze bijlage op \"inline\" te zetten in plaats van "
-"het standaard gebruikte \"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt> <p>Selecteer deze optie als u de ontvanger wilt voorstellen om de "
+"bijlage automatisch (ingebed) te laten weergeven in het voorbeeldvenster, in "
+"plaats van het standaardpictogram. </p><p> Technisch gezien wordt dit gedaan "
+"door het kopschriftveld <em>Content-Disposition</em> van deze bijlage op "
+"\"inline\" te zetten in plaats van het standaard gebruikte \"attachment\".</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9831,15 +9698,13 @@ msgstr "De&ze bijlage ondertekenen"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Selecteer deze optie als u wilt dat deze bijlage wordt ondertekend.</p> "
-"<p>De ondertekening wordt gemaakt met de sleutel die u hebt geassocieerd met de "
-"momenteel geselecteerde identiteit.</p></qt>"
+"<qt> <p>Selecteer deze optie als u wilt dat deze bijlage wordt ondertekend.</"
+"p> <p>De ondertekening wordt gemaakt met de sleutel die u hebt geassocieerd "
+"met de momenteel geselecteerde identiteit.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9847,14 +9712,12 @@ msgstr "Deze bi&jlage versleutelen"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Selecteer deze optie als u deze bijlage wilt versleutelen.</p> "
-"<p>De bijlage zal worden versleuteld voor de geadresseerden van dit bericht.</p>"
-"</qt>"
+"<qt> <p>Selecteer deze optie als u deze bijlage wilt versleutelen.</p> <p>De "
+"bijlage zal worden versleuteld voor de geadresseerden van dit bericht.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9868,17 +9731,14 @@ msgstr "POP-filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Berichten om te filteren gevonden op POP-account: <b>%1</b> "
-"<p>De getoonde berichten overschrijden de maximum grootte dat u voor dit "
-"account hebt opgegeven. "
-"<br> U kunt opgeven wat u met ze wilt doen door de geschikte keuze te "
-"selecteren."
+"Berichten om te filteren gevonden op POP-account: <b>%1</b> <p>De getoonde "
+"berichten overschrijden de maximum grootte dat u voor dit account hebt "
+"opgegeven. <br> U kunt opgeven wat u met ze wilt doen door de geschikte "
+"keuze te selecteren."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10132,40 +9992,39 @@ msgstr "Het e-mailprogramma van de K Desktop Environment."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Mapinhoud wordt opgehaald</h2> "
-"<p>Even geduld. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Mapinhoud wordt opgehaald</h2> <p>Even "
+"geduld. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2> "
-"<p>KMail is op het moment in offline-modus. Klik <a href=\"kmail:goOnline\">"
-"hier</a> om online te gaan. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2> <p>KMail is op het moment in "
+"offline-modus. Klik <a href=\"kmail:goOnline\">hier</a> om online te "
+"gaan. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10173,15 +10032,14 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Welkom bij KMail %1</h2>"
-"<p>KMail is het e-mailprogramma van de K Desktop Environment. Het is ontworpen "
-"om de internet-mailstandaarden, waaronder MIME, SMTP, POP3 en IMAP, volledig te "
+"<h2 style='margin-top: 0px;'>Welkom bij KMail %1</h2><p>KMail is het e-"
+"mailprogramma van de K Desktop Environment. Het is ontworpen om de internet-"
+"mailstandaarden, waaronder MIME, SMTP, POP3 en IMAP, volledig te "
 "ondersteunen.</p>\n"
-"<ul>"
-"<li>KMail heeft vele krachtige functies; deze staan omschreven in de <a "
+"<ul><li>KMail heeft vele krachtige functies; deze staan omschreven in de <a "
 "href=\"%2\">documentatie</a>.</li>\n"
-"<li><a href=\"%3\">KMail's webpagina</a> geeft informatie over nieuwe versies "
-"van KMail.</li></ul>\n"
+"<li><a href=\"%3\">KMail's webpagina</a> geeft informatie over nieuwe "
+"versies van KMail.</li></ul>\n"
 "%8\n"
 "<p>Belangrijke wijzigingen (ten opzichte van KMail %4, dat deel uitmaakt van "
 "TDE %5):</p>\n"
@@ -10193,15 +10051,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; het team van KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10215,8 +10071,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Belangrijke "
-"wijzigingen</span> (ten opzichte van KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Belangrijke wijzigingen</"
+"span> (ten opzichte van KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10247,7 +10103,8 @@ msgstr "Bijlage tonen: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: de bijlage bevat binaire gegevens. Er wordt nu getracht het eerste "
@@ -10278,14 +10135,16 @@ msgstr "Bijlage openen?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"Het verwijderen van een bijlage kan de digitale ondertekening van het bericht "
-"ongeldig maken."
+"Het verwijderen van een bijlage kan de digitale ondertekening van het "
+"bericht ongeldig maken."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Het aanpassen van de bijlage kan de digitale handtekening van dit bericht "
 "ongeldig maken."
@@ -10308,6 +10167,58 @@ msgstr "(komt overeen met enkele van de volgende)"
 msgid "(match all of the following)"
 msgstr "(komt overeen met al het volgende)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Gelezen"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Oud"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Verwijderd"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Beantwoord"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Doorgestuurd"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Wachtende"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Verzonden"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Geobserveerd"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Genegeerd"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Ongewenste reclame"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Reclame"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Taak"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Heeft bijlage"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Volledig bericht"
@@ -10381,17 +10292,18 @@ msgid ""
 "message to \"sent-mail\" folder."
 msgstr ""
 "Kritieke fout: de verzonden post kon niet worden verwerkt (onvoldoende "
-"schijfruimte?). Het falende bericht wordt naar de map \"verzonden\" verplaatst."
+"schijfruimte?). Het falende bericht wordt naar de map \"verzonden\" "
+"verplaatst."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Het verplaatsen van het verzonden bericht \"%1\" vanuit \"postvak uit\" naar de "
-"map met verzonden berichten is mislukt.\n"
+"Het verplaatsen van het verzonden bericht \"%1\" vanuit \"postvak uit\" naar "
+"de map met verzonden berichten is mislukt.\n"
 "Mogelijke reden is onvoldoende schijfruimte, of onvoldoende schrijfrechten. "
 "Probeer dit probleem a.u.b. te herstellen en het bericht handmatig te "
 "verplaatsen."
@@ -10399,12 +10311,12 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Het is niet mogelijk om een bericht te verzenden zonder een afzender.\n"
-"Geef a.u.b. een e-mailadres op voor de identiteit %1 in de sectie Identiteiten "
-"van het configuratiedialoog en probeer het opnieuw."
+"Geef a.u.b. een e-mailadres op voor de identiteit %1 in de sectie "
+"Identiteiten van het configuratiedialoog en probeer het opnieuw."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10429,8 +10341,8 @@ msgstr "Verzendproces wordt geïnitialiseerd..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "U hebt ervoor gekozen om uw berichten in de wachtrij te versturen via een "
 "onversleuteld transport. Wilt u doorgaan? "
@@ -10457,8 +10369,9 @@ msgstr "Het verzenden van (sommige) berichten in de wachtrij is mislukt."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10476,19 +10389,15 @@ msgstr "Verzenden afgebroken."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Het verzenden is mislukt:</p>"
-"<p>%1</p>"
-"<p>Het bericht blijft in de map 'postvak uit' staan totdat u ofwel het probleem "
-"oplost, ofwel het bericht verwijdert.</p>"
-"<p>Het volgende transportprotocol werd gebruikt:  %2</p> "
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Het verzenden is mislukt:</p><p>%1</p><p>Het bericht blijft in de map "
+"'postvak uit' staan totdat u ofwel het probleem oplost, ofwel het bericht "
+"verwijdert.</p><p>Het volgende transportprotocol werd gebruikt:  %2</p> "
 "<p>Wilt u doorgaan met het verzenden van de overige berichten?</p>"
 
 #: kmsender.cpp:730
@@ -10507,8 +10416,9 @@ msgstr "Verzenden &stoppen"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10556,46 +10466,46 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 blijkt al te draaien op een ander scherm op deze computer. Wanneer u %2 "
-"meerdere keren tegelijkertijd uitvoert kan dat leiden tot berichtenverlies. Het "
-"wordt niet aangeraden om %1 te starten, tenzij u zeker weet dat het programma "
-"niet actief is."
+"meerdere keren tegelijkertijd uitvoert kan dat leiden tot berichtenverlies. "
+"Het wordt niet aangeraden om %1 te starten, tenzij u zeker weet dat het "
+"programma niet actief is."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "%1 blijkt al te draaien op een ander scherm op deze computer. Het "
 "tegelijkertijd uitvoeren van %1 en %2 kan leiden tot berichtenverlies. Het "
-"wordt niet aangeraden om %2 te starten, tenzij u zeker weet dat %1 niet actief "
-"is."
+"wordt niet aangeraden om %2 te starten, tenzij u zeker weet dat %1 niet "
+"actief is."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 blijkt al te draaien op %2. Wanneer u %1 meerdere keren tegelijkertijd "
-"uitvoert kan dat leiden tot berichtenverlies. Het wordt niet aangeraden om %1 "
-"op deze computer te starten, tenzij u zeker weet dat het programma niet actief "
-"is op %2."
+"uitvoert kan dat leiden tot berichtenverlies. Het wordt niet aangeraden om "
+"%1 op deze computer te starten, tenzij u zeker weet dat het programma niet "
+"actief is op %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 blijkt al te draaien op %3. Het tegelijkertijd uitvoeren van %1 en %2 kan "
-"leiden tot berichtenverlies. Het wordt niet aangeraden om %2 op deze computer "
-"te starten, tenzij u zeker weet dat %1 niet actief is op %3."
+"leiden tot berichtenverlies. Het wordt niet aangeraden om %2 op deze "
+"computer te starten, tenzij u zeker weet dat %1 niet actief is op %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10606,6 +10516,10 @@ msgstr "%1 starten"
 msgid "Exit"
 msgstr "Afsluiten"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nieuwe berichten in"
@@ -10632,16 +10546,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet is niet beschikbaar. Het wordt ten zeerste aangeraden om TDEWallet te "
-"gebruiken voor het beheer van wachtwoorden.\n"
+"TDEWallet is niet beschikbaar. Het wordt ten zeerste aangeraden om TDEWallet "
+"te gebruiken voor het beheer van wachtwoorden.\n"
 "U kunt er eventueel ook voor kiezen om een wachtwoord in het "
-"configuratiebestand van KMail op te slaan. Hoewel het wachtwoord gecodeerd in "
-"het bestand komt te staan, is er geen garantie dat het daar helemaal veilig is "
-"indien men toegang krijgt tot dit bestand.\n"
+"configuratiebestand van KMail op te slaan. Hoewel het wachtwoord gecodeerd "
+"in het bestand komt te staan, is er geen garantie dat het daar helemaal "
+"veilig is indien men toegang krijgt tot dit bestand.\n"
 "Wilt u het wachtwoord voor account '%1' in het configuratiebestand opslaan?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10722,8 +10637,8 @@ msgstr "Server ve&reist authenticatie"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Selecteer deze optie als uw SMTP-server een authenticatie verlangt voordat "
 "berichten kunnen worden verzonden. Dit wordt ook wel 'Authenticated SMTP' of "
@@ -10747,15 +10662,14 @@ msgstr "Aangepaste hostnaam naar server zen&den"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Selecteer deze optie als u wilt dat KMail een aangepaste hostnaam gebruikt bij "
-"zijn identificatie bij de server. "
-"<p>Dit is handig als de hostnaam van uw systeem niet juist is ingesteld of om "
-"de werkelijke hostnaam van uw systeem te verbergen."
+"Selecteer deze optie als u wilt dat KMail een aangepaste hostnaam gebruikt "
+"bij zijn identificatie bij de server. <p>Dit is handig als de hostnaam van "
+"uw systeem niet juist is ingesteld of om de werkelijke hostnaam van uw "
+"systeem te verbergen."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10786,11 +10700,11 @@ msgstr "Uitsluitend lokale bestanden zijn toegestaan."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Het opgeven van een servernaam in het veld Server is vereist. Voer de naam of "
-"het IP-adres in van de SMTP-server."
+"Het opgeven van een servernaam in het veld Server is vereist. Voer de naam "
+"of het IP-adres in van de SMTP-server."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10802,15 +10716,15 @@ msgstr "Fout bij het uitdraaien van de map %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Het lokaal uitschrijven uit mappen zal alle lokale informatie in die mappen "
 "verwijderen. De mappen worden niet veranderd op de server. Druk op Annuleren "
-"als u eerst uw e-mail wilt controleren om er zeker van te zijn dat alle lokale "
-"wijzigingen naar de server zijn geschreven."
+"als u eerst uw e-mail wilt controleren om er zeker van te zijn dat alle "
+"lokale wijzigingen naar de server zijn geschreven."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11029,35 +10943,28 @@ msgstr "Bericht b&ewerken"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>De structureringsinformatie die door de Crypto-plugin werd teruggegeven kon "
-"niet op de juiste wijze worden verwerkt. Mogelijk is de plugin beschadigd.</p>"
-"<p>Neem contact op met uw systeembeheerder.</p></qt>"
+"<qt><p>De structureringsinformatie die door de Crypto-plugin werd "
+"teruggegeven kon niet op de juiste wijze worden verwerkt. Mogelijk is de "
+"plugin beschadigd.</p><p>Neem contact op met uw systeembeheerder.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Er is geen actieve Crypto-plugin gevonden en de ingebouwde OpenPGP-code "
-"draaide zonder succes.</p> "
-"<p>U kunt twee dingen doen om dit te verhelpen:</p> "
-"<ul> "
-"<li><em>of</em> u activeert een plugin via de menuoptie \"Instellingen->"
-"KMail instellen->Plugin\";</li> "
-"<li><em>of</em> u geeft traditionele OpenPGP-instellingen op bij het tabblad "
-"\"Identiteit->Geavanceerd\" onder dezelfde menuoptie.</li></ul>"
+"draaide zonder succes.</p> <p>U kunt twee dingen doen om dit te verhelpen:</"
+"p> <ul> <li><em>of</em> u activeert een plugin via de menuoptie "
+"\"Instellingen->KMail instellen->Plugin\";</li> <li><em>of</em> u geeft "
+"traditionele OpenPGP-instellingen op bij het tabblad \"Identiteit-"
+">Geavanceerd\" onder dezelfde menuoptie.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11069,8 +10976,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Het Chiasmus-backend kent geen functie met de naam \"x-encrypt\". Rapporteer "
 "deze bug a.u.b."
@@ -11080,8 +10987,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"De functie \"x-encrypt\" accepteerde niet de verwachte parameters. Rapporteer "
-"deze bug a.u.b."
+"De functie \"x-encrypt\" accepteerde niet de verwachte parameters. "
+"Rapporteer deze bug a.u.b."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11089,20 +10996,20 @@ msgstr "Versleutelingsfout met Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Het Chiasmus-backend retourneerde een onverwachte waarde. De functie "
-"\"x-encrypt\" resulteerde niet in een byte array. Rapporteer deze bug a.u.b."
+"Het Chiasmus-backend retourneerde een onverwachte waarde. De functie \"x-"
+"encrypt\" resulteerde niet in een byte array. Rapporteer deze bug a.u.b."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Het ingebedde OpenPGP versleutelingsformaat ondersteunt geen versleuteling of "
-"ondertekening van bijlagen.\n"
+"Het ingebedde OpenPGP versleutelingsformaat ondersteunt geen versleuteling "
+"of ondertekening van bijlagen.\n"
 "Wilt u werkelijk de afgeraden ingebedde OpenPGP gebruiken?"
 
 #: messagecomposer.cpp:640
@@ -11212,12 +11119,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Volgens de versleutelingsvoorkeuren van de ontvangers wilt u gevraagd worden of "
-"het bericht versleuteld moet worden of niet.\n"
+"Volgens de versleutelingsvoorkeuren van de ontvangers wilt u gevraagd worden "
+"of het bericht versleuteld moet worden of niet.\n"
 "Bericht versleutelen?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11250,12 +11157,13 @@ msgstr "&Niet versleutelen"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"U hebt verzocht om dit bericht te versleutelen, en om een kopie voor uzelf te "
-"versleutelen, maar u hebt geen geldige vertrouwde sleutels ingesteld voor deze "
-"identiteit."
+"U hebt verzocht om dit bericht te versleutelen, en om een kopie voor uzelf "
+"te versleutelen, maar u hebt geen geldige vertrouwde sleutels ingesteld voor "
+"deze identiteit."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11264,13 +11172,13 @@ msgstr "Onversleuteld verzenden?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Sommige bijlagen van dit bericht zullen niet worden versleuteld.\n"
-"Het verzenden van gedeeltelijk versleutelde berichten kan botsen met webbeleid "
-"en/of kan er voor zorgen dat er gevoelige informatie uitlekt.\n"
+"Het verzenden van gedeeltelijk versleutelde berichten kan botsen met "
+"webbeleid en/of kan er voor zorgen dat er gevoelige informatie uitlekt.\n"
 "Wilt u alle delen toch versleutelen?"
 
 #: messagecomposer.cpp:950
@@ -11293,51 +11201,45 @@ msgstr "Alle berichtonderdelen versl&eutelen"
 msgid "Unencrypted Message Warning"
 msgstr "Waarschuwing onversleuteld bericht"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fout: Het backend gaf geen versleutelde data terug.</p>"
-"<p>Dien a.u.b. een bugrapport in over deze programmafout:"
-"<br>%2</p></qt>"
+"<qt><p>Fout: Het backend gaf geen versleutelde data terug.</p><p>Dien a.u.b. "
+"een bugrapport in over deze programmafout:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Niet alle tekens passen in de gekozen codering."
-"<br>"
-"<br>Wilt u het bericht toch verzenden?</qt>"
+"<qt>Niet alle tekens passen in de gekozen codering.<br><br>Wilt u het "
+"bericht toch verzenden?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Sommige tekens zullen verloren gaan"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Lettertekens verliezen"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Codering veranderen"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Dit bericht kon niet worden ondertekend, omdat het gekozen backend geen "
 "ondertekening ondersteunt. Dit zou eigenlijk niet mogen gebeuren. U wordt "
 "verzocht deze bug te rapporteren."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11346,38 +11248,39 @@ msgstr ""
 "ondertekening ondersteunt. Dit zou eigenlijk niet mogen gebeuren. U wordt "
 "verzocht deze bug te rapporteren."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "GnuPG-auditlog voor ondertekeningen"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "Het ondertekenen is mislukt. Controleer of gpg-agent actief is."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Dit bericht kon niet worden versleuteld, omdat het gekozen backend geen "
 "versleuteling ondersteunt. Dit zou eigenlijk niet mogen gebeuren. U wordt "
 "verzocht deze bug te rapporteren."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "GnuPG-auditlog voor versleutelingen"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Dit bericht kon niet worden ondertekend en versleuteld, omdat het gekozen "
-"backend geen ondertekening en versleuteling ondersteunt. Dit zou eigenlijk niet "
-"mogen gebeuren. U wordt verzocht deze bug te rapporteren."
+"backend geen ondertekening en versleuteling ondersteunt. Dit zou eigenlijk "
+"niet mogen gebeuren. U wordt verzocht deze bug te rapporteren."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11398,16 +11301,16 @@ msgstr "Postbus&formaat:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Kies of u de berichten in deze map in één bestand per bericht wilt opslaan "
-"(maildir) of in één groot bestand (mbox). KMail gebruikt standaard maildir. Het "
-"veranderen van het opslagtype hoeft alleen in bijzondere omstandigheden te "
-"gebeuren. Wanneer u niet precies weet wat u hier moet doen dient u deze optie "
-"zo te laten staan."
+"(maildir) of in één groot bestand (mbox). KMail gebruikt standaard maildir. "
+"Het veranderen van het opslagtype hoeft alleen in bijzondere omstandigheden "
+"te gebeuren. Wanneer u niet precies weet wat u hier moet doen dient u deze "
+"optie zo te laten staan."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11416,13 +11319,13 @@ msgstr "Map be&vat:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Kies of u de nieuwe map wilt gebruiken voor e-mailberichten of voor "
-"groupware-items als taken en notities. Het standaard type is voor "
-"e-mailberichten. Wanneer u niet weet wat u moet doen kunt u deze optie zo laten "
-"staan."
+"groupware-items als taken en notities. Het standaard type is voor e-"
+"mailberichten. Wanneer u niet weet wat u moet doen kunt u deze optie zo "
+"laten staan."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11431,7 +11334,8 @@ msgstr "Name&space van map:"
 #: newfolderdialog.cpp:170
 msgid "Select the personal namespace the folder should be created in."
 msgstr ""
-"Selecteer de persoonlijke namespace waar de map in aangemaakt dient te worden."
+"Selecteer de persoonlijke namespace waar de map in aangemaakt dient te "
+"worden."
 
 #: newfolderdialog.cpp:193
 msgid "Please specify a name for the new folder."
@@ -11444,7 +11348,8 @@ msgstr "Geen naam opgegeven"
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
-"<qt>Het aanmaken van de map <b>%1</b> is mislukt. Deze map bestaat reeds.</qt>"
+"<qt>Het aanmaken van de map <b>%1</b> is mislukt. Deze map bestaat reeds.</"
+"qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -11462,8 +11367,7 @@ msgstr "Verschillende resultaten voor ondertekeningen"
 msgid "The crypto engine returned no cleartext data."
 msgstr "De crypto-engine gaf geen leesbare tekst terug."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11492,8 +11396,8 @@ msgstr "Geen %1-plugin gevonden."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Het bericht is ondertekend, maar de geldigheid van de ondertekening kon niet "
 "worden geverifieerd.<br />Reden: %1"
@@ -11530,28 +11434,28 @@ msgstr "Crypto-plugin \"%1\" kan geen berichten ontcijferen."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Opmerking:</b> dit is een HTML-bericht en kan externe referenties naar "
 "afbeeldingen bevatten. Om veiligheidsredenen wordt alleen de ruwe HTML-code "
 "getoond. Als u de afzender van dit bericht vertrouwt kunt u de externe "
-"referenties voor dit bericht ophalen door <a href=\"kmail:loadExternal\">"
-"hier te klikken</a>."
+"referenties voor dit bericht ophalen door <a href=\"kmail:loadExternal"
+"\">hier te klikken</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Opmerking:</b> dit is een HTML-bericht. Om veiligheidsredenen wordt alleen "
-"de ruwe HTML-code getoond. Als u de afzender van dit bericht vertrouwt kunt u "
-"de opgemaakte HTML voor dit bericht activeren door <a href=\"kmail:showHTML\">"
-"hier</a> te klikken."
+"<b>Opmerking:</b> dit is een HTML-bericht. Om veiligheidsredenen wordt "
+"alleen de ruwe HTML-code getoond. Als u de afzender van dit bericht "
+"vertrouwt kunt u de opgemaakte HTML voor dit bericht activeren door <a href="
+"\"kmail:showHTML\">hier</a> te klikken."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11804,11 +11708,12 @@ msgstr "opgeslagen: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Er is geen e-mailadres opgeslagen in de %1, welke wordt gebruikt voor het "
-"ondertekenen. Hierdoor kunnen we die niet vergelijken met het afzenderadres %2."
+"ondertekenen. Hierdoor kunnen we die niet vergelijken met het afzenderadres "
+"%2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11863,7 +11768,8 @@ msgstr "Bericht was ondertekend door %1 (sleutel-id: %2)."
 #: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr ""
-"De ondertekening is geldig, maar de betrouwbaarheid van de sleutel is onbekend."
+"De ondertekening is geldig, maar de betrouwbaarheid van de sleutel is "
+"onbekend."
 
 #: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
@@ -11924,14 +11830,15 @@ msgstr "Kioslave-foutmelding"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Uw POP3-server (account %1) ondersteunt het commando UIDL niet. Dit commando is "
-"noodzakelijk om op een betrouwbare manier te bepalen welke berichten op de "
-"server KMail reeds heeft gezien.\n"
+"Uw POP3-server (account %1) ondersteunt het commando UIDL niet. Dit commando "
+"is noodzakelijk om op een betrouwbare manier te bepalen welke berichten op "
+"de server KMail reeds heeft gezien.\n"
 "De functie om berichten op de server achter te laten zal hierdoor niet goed "
 "werken."
 
@@ -11953,10 +11860,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Bericht %1 van %2 (%3 van %4 KB) voor %5@%6 wordt opgehaald (%7 KB blijft op de "
-"server staan)."
+"Bericht %1 van %2 (%3 van %4 KB) voor %5@%6 wordt opgehaald (%7 KB blijft op "
+"de server staan)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11972,1929 +11880,16 @@ msgstr "Ongeldig antwoord van de server"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Uw server ondersteunt het commando TOP niet. Hierdoor is het niet mogelijk om "
-"de kopschriften van grote e-mailberichten eerst op te halen voordat ze worden "
-"gedownload."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Ga naar"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Ma&p"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Beri&cht"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Speciaal antwoorden"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Doorsturen"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML werkbalk"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Ondertekenen"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Berichten automat&isch ondertekenen"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Als deze optie is geselecteerd zullen alle berichten die u verzendt standaard "
-"worden ondertekend. Uiteraard is het dan nog steeds mogelijk om het "
-"ondertekenen van een bericht uit te schakelen."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Versleuteling"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Bij het versleutelen van e-mailberichten ook het certificaat van mijn "
-"identiteit versleutelen."
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Wanneer deze optie aan staat, zal het bericht/bestand niet alleen versleuteld "
-"worden met de sleutel van de ontvanger, maar ook met uw eigen sleutel. Dit "
-"maakt het mogelijk om het bericht/bestand op een later tijdstip te ontcijferen. "
-"Het is aan te raden om dit te doen."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Ondertekende/versleutelde tekst tonen na het opstellen"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Wanneer deze optie aan staat, zal de ondertekende/versleutelde tekst in een "
-"apart venster getoond worden, zodat u het kunt bekijken voordat het wordt "
-"verzonden. Het is aan te raden om dit te doen zodat u zeker weet dat de "
-"versleuteling werkt."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Verzonden berichten v&ersleuteld opslaan"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Selecteer dit om berichten versleuteld op te slaan"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Berichten versleuteld opslaan</h1>\n"
-"Als deze optie is geselecteerd, dan worden verzonden berichten met dezelfde "
-"versleuteling opgeslagen. Dit is niet aan te bevelen, omdat u de berichten niet "
-"meer kunt lezen zodra het benodigde certificaat verloopt.\n"
-"<p>\n"
-"Maar er kunnen lokale regels zijn die vereisen dat u deze optie inschakelt. Bij "
-"twijfel, neem contact op met uw lokale systeembeheerder.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Altijd de sleutels voor &goedkeuring tonen"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Wanneer deze optie is geselecteerd, zal de toepassing altijd een lijst tonen "
-"van alle beschikbare publieke sleutels die u kunt gebruiken voor versleuteling. "
-"Wanneer dit uit staat, zal de toepassing enkel een dialoogvenster tonen wanneer "
-"het de juiste sleutel niet kan vinden of wanneer er meerdere sleutels gebruikt "
-"kunnen worden."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Berichten automatisch versleutelen, &indien mogelijk"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Als deze optie is geselecteerd, dan wordt elk bericht dat u verzendt "
-"versleuteld, als versleuteling mogelijk en gewenst is. Uiteraard is het dan nog "
-"steeds mogelijk om het versleutelen van een bericht uit te schakelen."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nooit versleutelen bij het opslaan van een &concept"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Hoe werkt dit?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Aan: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Algemeen"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Beantwoorden"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Allen beantwoorden"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Doorsturen"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Snelt&oets:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Sjabloon&type:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Mapeigenschappen"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Map bevat een discussiegroep"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Post&adres:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormaal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Ong&elezen:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Berichtenverloop"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Bericht&en bewaren tot:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Gelezen berichten laten ve&rlopen"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Berichten laten &verlopen na:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "&Ongelezen berichten laten verlopen"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dag(en)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "We(e)k(en)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Maand(en)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Identiteit van afzender:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Op&slagformaat:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Lijstweergaven:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Certificaten met CRL's valideren"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Wanneer deze optie is geselecteerd, zullen S/MIME-certificaten gevalideerd "
-"worden met Certificate Revocation Lists (CRL's)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Certificaten online valideren (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Wanneer deze optie is geselecteerd, zullen S/MIME-certificaten online "
-"gevalideerd worden met het Online Certificates Status Protocol (OCSP). Voer "
-"hieronder het URL-adres in van de OCSP-dienst."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Online certificaatvalidatie"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL-adres OCSP-dienst:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Voer hier het adres in van de server die de certificaten online valideert "
-"(OCSP-dienst). Het URL-adres begint doorgaans met http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Handtekening OCSP-dienst:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Service-URL van certificaten negeren"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Certificaatbeleid niet controleren"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Standaard gebruikt GnuPG het bestand ~/.gnupg/policies.txt om te controleren of "
-"een certificaatbeleid toegestaan is. Wanneer deze optie is geselecteerd wordt "
-"het beleid niet gecontroleerd."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nooit een CRL raadplegen"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Wanneer deze optie is geselecteerd zal de Certificate Revocation List nooit "
-"gebruikt worden om S/MIME-certificaten te valideren."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Ontbrekende uitgevers certificaten ophalen"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Wanneer deze optie is geselecteerd, zullen de ontbrekende uitgevers voor dit "
-"certificaat opgehaald worden indien nodig (dit is van toepassing op beide "
-"methoden, CRL's en OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-verzoeken"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Geen HTTP-verzoeken maken"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Schakelt het gebruik van HTTP voor S/MIME volledig uit."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Deze proxy voor HTTP-verzoeken gebruiken: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "HTTP-proxy van systeem gebruiken:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Wanneer deze optie is geselecteerd zal de HTTP-proxy die rechts wordt getoond "
-"gebruikt worden bij een HTTP-verzoek. (De waarde hiervan komt uit de "
-"omgevingsvariabele http_proxy.)"
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Voer de locatie in van uw HTTP-proxy die gebruikt zal worden voor alle "
-"HTTP-verzoeken gerelateerd aan S/MIME. De syntaxis is hostnaam:poort, "
-"bijvoorbeeld mijnproxy.nergens.nl:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "HTTP CRL-distributiepunt van certificaten negeren"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Wanneer u de locatie van een CRL aan het zoeken bent, zal het te testen "
-"certificaat ingangen bevatten onder de naam \"CRL Distribution Point\" (DP). "
-"Deze bevatten URL-adressen die het adres van de CRL beschrijven. Het eerste "
-"gevonden DP wordt gebruikt. Met deze optie worden alle ingangen volgens het "
-"HTTP-schema genegeerd wanneer er gezocht wordt naar een geschikte DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-verzoeken"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Geen LDAP-verzoeken maken"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Schakelt het gebruik van LDAP voor S/MIME volledig uit."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "LDAP CRL-distributiepunt van certificaat negeren"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Wanneer u de locatie van een CRL aan het zoeken bent, zal het te testen "
-"certificaat ingangen bevatten onder de naam \"CRL Distribution Point\" (DP). "
-"Deze bevatten URL-adressen die het adres van de CRL beschrijven. Het eerste "
-"gevonden DP wordt gebruikt. Met deze optie worden alle ingangen volgens het "
-"LDAP-schema genegeerd wanneer er gezocht wordt naar een geschikte DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primaire host voor LDAP-verzoeken:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Het invoeren van een LDAP-server zal ervoor zorgen dat ieder LDAP-verzoek eerst "
-"naar die server zal gaan. Om precies te zijn zal deze instelling voorrang "
-"hebben op iedere andere hostnaam en poort van een LDAP-URL-adres. Ook wordt "
-"deze instelling gebruikt wanneer er geen hostnaam en poort is opgegeven in het "
-"URL-adres. Andere LDAP-servers zullen pas geprobeerd worden wanneer de "
-"verbinding met de \"proxy\" mislukte.\n"
-"De syntaxis is \"HOST\" of \"HOST:POORT\". Wanneer de POORT weggelaten wordt "
-"zal standaard poort 389 gebruikt worden (de standaard LDAP-poort)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Fragment toevoegen"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Toevoegen"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Fragment:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Groep:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Fragmentinstellingen"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Hulpballonnen"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Fragmenttekst in hulpballon &tonen"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Bepaalt of een hulpballon de tekst van een gemarkeerde regel moet tonen"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variabelen"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Invoermethode voor variabelen"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Enkel dialoogvenster voor iedere variabele in een fragment"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-"Een invoervenster zal getoond worden voor iedere variabele in een tekstfragment"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Een dialoog voor alle variabelen in een fragment"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Een enkel dialoogvenster zal getoond worden waarin u de waarden kunt invullen "
-"voor alle variabelen in een fragment"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Scheiding:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Afzender beantwoorden"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Allen beantwoorden / naar lijst beantwoorden"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Bericht doorsturen"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Waarsch&uwen voor het verzenden van niet-ondertekende berichten"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Selecteer deze optie als u wilt worden gewaarschuwd bij het verzenden van "
-"niet-ondertekende berichten."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen voor het verzenden van niet-ondertekende berichten</h1>\n"
-"Als deze optie is geselecteerd zult u worden gewaarschuwd wanneer u een bericht "
-"wilt verzenden dat (deels) niet is ondertekend.\n"
-"<p>\n"
-"Voor maximale veiligheid wordt aanbevolen om deze optie te selecteren.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-"&Waarschuwen als er niet-versleutelde berichten zullen worden verstuurd"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Selecteer dit als u gewaarschuwd wilt worden voor het verzenden van "
-"niet-versleutelde berichten."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen voor het verzenden van niet-versleutelde berichten</h1>\n"
-"Als deze optie is geselecteerd, dan zult u worden gewaarschuwd als u probeert "
-"berichtdelen of hele berichten zonder versleuteling te verzenden.\n"
-"<p>\n"
-"Voor maximale zekerheid is het aan te bevelen deze optie te selecteren.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Waarschuwen als e-mailad&res van ontvanger niet in certificaat staat"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Selecteer dit als u wilt worden gewaarschuwd al het adres niet in het "
-"certificaat staat"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen als e-mailadres van ontvanger niet in certificaat staat</h1>\n"
-"als deze optie is geselecteerd, dan wordt u gewaarschuwd al het e-mailadres van "
-"de ontvanger niet aanwezig is in het certificaat dat voor versleuteling wordt "
-"gebruikt.\n"
-"<p>\n"
-"Voor maximale zekerheid wordt aanbevolen deze optie in te schakelen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Waarschuwen wanneer een certificaat/sleutel binnenkort zal verlopen (specifieke "
-"instellingen hieronder)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Voor ondertekening"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Voor versleuteling"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dagen"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Selecteer hier het aantal dagen"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen als een ondertekeningscertificaat verloopt</h1>\n"
-"Selecteer het minimum aantal dagen dat een ondertekeningscertificaat nog geldig "
-"moet zijn voordat er wordt gewaarschuwd.\n"
-"<p>\n"
-"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen als het versleutelingscertificaat verloopt</h1>\n"
-"Selecteer het minimum aantal dagen dat een versleutelingscertificaat nog geldig "
-"dient te zijn voordat u wordt gewaarschuwd.\n"
-"<p>\n"
-"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen als een certificaat in de certificatenketen verloopt</h1>\n"
-"Selecteer het minimum aantal dagen dat alle certificaten in de ketting nog "
-"geldig moeten zijn voordat er wordt gewaarschuwd.\n"
-"<p>\n"
-"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen als een CA-certificaat verloopt</h1>\n"
-"Selecteer het minimum aantal dagen dat een CA-certificaat geldig dient te zijn "
-"voordat er wordt gewaarschuwd.\n"
-"<p>\n"
-"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Waarschuwen als het broncertificaat verloopt</h1>\n"
-"Selecteer het minimum aantal dagen dat een broncertificaat geldig dient te zijn "
-"voordat er wordt gewaarschuwd.\n"
-"<p>\n"
-"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Voor hoofdcertificaten:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Voor tijdelijke CA-certificaten:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Voor certificaten/sleutels voor eindgebruikers:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-"Alle \"Deze vraag niet meer stellen\"-waarschuwingen opnieuw inschakelen"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Sjablooninhoud"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Sjabloonsneltoets"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Sjabloontype"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Berichten in wachtrij verzenden bij berichtencontrole"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p>Bepaal of u wilt dat KMail alle berichten in postvak-uit verzendt bij "
-"e-mailcontroles, of dat u niet wilt dat berichten automatisch worden verzonden. "
-"</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Niet-gesynchroniseerde e-mails automatisch verplaatsen vanuit mappen met "
-"onvoldoende toegangsrechten"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Wanneer er nieuwe berichten zijn in een map die nog niet naar de server zijn "
-"verzonden, maar de toegangsrechten voor die map te beperkt zijn, zullen deze "
-"berichten automatisch in de map \"lost + found\" geplaatst worden."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Lokale vlaggen toestaan in alleen-lezen-mappen"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Deze instelling geeft beheerders de mogelijkheid om de minimale duur tussen "
-"twee controles voor nieuwe berichten in te stellen.\"\n"
-"           \"De gebruiker zal niet in staat zijn een lagere waarde in te "
-"stellen."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "De meest recent geselecteerde map in het mappenselectiedialoog."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"De umask-waarde van de gebruiker negeren en het bestaand lees- en schrijfbaar "
-"maken voor de gebruiker"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Beleid voor het weergeven van het systeemvakpictogram"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Programma afsluiten wanneer het hoofdvenster is gesloten, zelfs wanneer het "
-"systeemvakpictogram actief is."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Uitvoerige notificatie voor nieuwe berichten"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Wanneer deze optie is geselecteerd zal er voor iedere map het aantal nieuwe "
-"berichten getoond worden in de notificatie voor nieuwe berichten, anders krijgt "
-"u een eenvoudige melding 'Nieuwe berichten ontvangen'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Editor spe&cificeren:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Externe editor gebr&uiken"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"De drempel voor wanneer de gebruiker gewaarschuwd dient te worden wanneer zijn "
-"quota wordt bereikt."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Groupware-functionaliteit activ&eren"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "De kopschriften Van:/Aan: aanpassen bij antwoorden op uitnodigingen"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook kent een aantal tekortkomingen in de implementatie van de "
-"iCalendar-standaard. Deze optie speelt daarop in. Wanneer u problemen hebt met "
-"Outlook-gebruikers die uw antwoorden niet kunnen ontvangen kunt u deze optie "
-"proberen."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Groupware-uitnodigingen in de berichttekst verzenden"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook kent een aantal tekortkomingen in de implementatie van de "
-"iCalendar-standaard. Deze optie speelt daarop in. Wanneer u problemen hebt met "
-"Outlook-gebruikers die uw uitnodigingen niet kunnen ontvangen kunt u deze optie "
-"proberen."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Naamgeving uitnodigingen compatible houden met Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook heeft, in combinatie met Microsoft Exchange, problemen met "
-"groupware-e-mail die zich aan de standaard houdt.\n"
-"Schakel deze optie in om groupware-uitnodigingen te versturen die correct "
-"kunnen worden verwerkt door Microsoft Exchange."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Wanneer dit is geselecteerd krijgt u niet de opsteller in beeld, maar worden "
-"alle uitnodigingsberichten automatisch verzonden. Als u het e-mailbericht wilt "
-"zien voordat u het verzendt, dient u deze optie uit te zetten. Wees u er echter "
-"van bewust dat de tekst in de opsteller in deiCalendar-syntaxis is, en het "
-"wordt niet aangeraden om dit handmatig te wijzigen."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Uitnodigingsemails verwijderen nadat een antwoord is verstuurd"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Wanneer dit is ingeschakeld zullen ontvangen uitnodigingsemails waarop "
-"geantwoord is verplaatst worden naar de prullenbak."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Wanneer u dit inschakelt is het mogelijk om items van de "
-"Kontact-toepassingen (KOrganizer, KAddressbook en KNotes) op te slaan.</p></p>"
-"Als u dit aanzet dient u ook de toepassingen in te stellen om gebruik te maken "
-"van de IMAP-gegevensbron. Dit kunt u doen in het TDE Configuratiecentrum.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Het is normaal gesproken niet nodig om de mappen te zien die de "
-"IMAP-gegevensbronnen bevatten. Maar wanneer u ze toch wilt zien, kunt u dat "
-"hier instellen.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Wanneer de account wordt gebruikt voor het opslaan van groupware-informatie "
-"\"\n"
-"           \"maar niet voor het opslaan van normale e-mail, schakel dan deze "
-"optie in om KMail alleen\"\n"
-"           \"groupware-mappen te laten tonen. Dit is handig wanneer u reguliere "
-"e-mail afhandelt\"\n"
-"           \"met een ander IMAP-account.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Kies het opslagformaat van de groupwaremappen. "
-"<ul> "
-"<li>Het standaard formaat is iCal (voor agendamappen) en vCard (voor "
-"adresboekmappen). Dit formaat maakt alle mogelijkheden van Kontact "
-"beschikbaar.</li> "
-"<li>Het XML-formaat van Kolab maakt gebruik van een eigen model dat meer "
-"overeenkomt met Outlook. Dit formaat geeft betere Outlook-compabiliteit wanneer "
-"u gebruik maakt met een Kolab-server of iets dat daarmee compatibel is.</li>"
-"</ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Dit kiest de hoofdmap van de IMAP-gegevensbronmappen.</p>"
-"<p>De Kolab-server stelt standaard de IMAP-inbox in als hoofdmap.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Dit is de ID van het account dat de IMAP-gegevensbronmappen bevat.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Wanneer u de mapnamen van de IMAP-opslag in uw eigen taal wilt hebben, kunt "
-"u kiezen uit de beschikbare talen.</p> "
-"<p>De enige reden waarom dit gedaan wordt is om compatibel met Microsoft "
-"Outlook te zijn. Het is geen goed idee om dit te doen omdat het dan onmogelijk "
-"wordt om van taal te veranderen.</p>"
-"<p>U dient deze optie niet aan te zetten tenzij het echt nodig is.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Ook nieuwe berichten filteren in groupware-mappen."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Groupware-wijzigingen in verbindingsloze IMAP-mappen meteen synchroniseren "
-"wanneer u online gaat."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Deze waarde wordt gebruikt om te bepalen of de inleiding van KMail getoond moet "
-"worden."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maximum aantal verbindingen per host"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Dit kan worden gebruikt om het aantal verbindingen per host te beperken bij het "
-"controleren op nieuwe berichten. Standaard is het aantal verbindingen onbeperkt "
-"(0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Snelzoeken tonen"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Met deze optie kunt u de zoekregel boven de berichtenlijst aan- of uitzetten. U "
-"kunt met deze zoekregel snel bepaalde gegevens zoeken uit de berichtenlijst."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Lokaal postvak in verbergen indien ongebruikt"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Standaard ingebed doorsturen."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Laat de puntkomma (;) gebruikt worden als scheidingsteken in de "
-"berichtopsteller."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Originele tekenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Handtekening auto&matisch invoegen"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Deze identiteit onthouden, zodat deze in de toekomst automatischgebruikt wordt "
-"wanneer u de volgende keer een bericht op gaat stellen.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Deze map voor verzonden items onthouden, zodat deze in de toekomst automatisch "
-"gebruikt wordt wanneer u de volgende keer een bericht op gaat stellen."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Onthoud dit berichtentransport, zodat deze in de toekomst automatisch gebruikt "
-"wordt wanneer u de volgende keer een bericht op gaat stellen."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Deze identiteit onthouden, zodat deze in de toekomst automatischgebruikt wordt "
-"wanneer u de volgende keer een bericht op gaat stellen.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Regels a&fbreken bij kolom:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Maximaal aantal regels geadresseerden-editor."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Zet deze optie aan om ervoor te zorgen dat Outlook &#8482; de bijlagenamen "
-"begrijpt die niet-West-Europese tekens bevatten"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Auto&matisch bevestigingen voor ontvangst en gelezen verzoeken"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Selecteer deze optie als u wilt dat KMail bevestigingen voor ontvangst en "
-"gelezen (MDNs) verzoekt voor alle berichten die u verzendt.</p> "
-"<p> Deze optie heeft alleen effect op de standaardinstelling, u kunt het "
-"MDN-verzoek per bericht regelen in de opsteller via de menuoptie <em>Opties</em>"
-"&gt;<em>Ontvangst en gelezen-bevestiging verzoeken</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Recente adressen gebruiken voor automatische aanvulling"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Schakel deze optie uit wanneer u geen recent gebruikte adressen wilt zien in de "
-"automatische aanvulling van de adresvelden."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Automatisch opslaan iedere:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Er kan automatisch een backup gemaakt worden van de tekst in de opsteller. U "
-"kunt hier een tijdsinterval kiezen om een nieuwe backup te maken. U kunt het "
-"automatisch opslaan uitschakelen door hier een waarde van 0 in te vullen."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Handtekening boven aangehaalde tekst invoegen"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Herkend voorvoegsel vervangen &door \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Herkend voorvoegsel vervangen door \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Intelligente aanhalingen gebr&uiken"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "De ondertekening is verlopen."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Selectietype geadresseerden"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Bepaalt het type dialoogvenster voor het selecteren van\n"
-"            geadresseerden."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Type selectie geadresseerden"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Stelt in welke dialoogvenster in beeld komt voor het selecteren van "
-"geadresseerden (Aan, CC en BCC)."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maximaal aantal regels geadresseerden-editor."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Lijst van berichtdelen die ontdaan worden van e-mailberichten die inline worden "
-"doorgestuurd."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "De maximale grootte in MB dat e-mailbijlagen mogen hebben."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Fragmentbeheer en invoegpaneel tonen in opsteller."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Auditlog tonen zelfs wanneer versleuteling en/of ondertekening geslaagd zijn."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Originele tekenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Sommige (vooral automatisch gegenereerde) e-mailberichten geven niet op welke "
-"tekensetcodering er wordt gebruikt. Dit is nodig om zo'n bericht goed in beeld "
-"te brengen. In zulke gevallen kunt u hier een reservecodering instellen. Stel "
-"de codering in dat het meest gebruikt wordt in uw werelddeel. Als standaard "
-"waarde wordt de systeemwaarde gebruikt."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Wanneer u deze optie op iets anders zet dan 'Automatisch' zal het gebruik van "
-"tekensetcodering van alle e-mailberichten geforceerd worden, ongeacht wat het "
-"bericht zelf opgeeft."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Schakel deze optie in om smileys als :-) in de tekst te laten vervangen door "
-"emoticons (kleine pictogrammetjes)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Schakel deze optie in om de verschillende niveaus van aangehaalde tekst te "
-"kunnen zien. Schakel deze optie uit om de verschillende niveaus te verbergen."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatisch inklappen bij niveau:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Lettergrootte verkleinen bij aangehaalde tekst"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Schakel deze optie in om aangehaalde tekst te tonen in een kleiner lettertype."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Verzonden berichten v&ersleuteld opslaan"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Gebruikersagent tonen in elegante koppen"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Schakel deze optie in om de gebruikersagent en X-Mailer te tonen in de elegante "
-"berichtkoppen."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Verwijderen van bijlagen van bestaande e-mailberichten toestaan."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Bewerken van bijlagen van bestaande e-mailberichten toestaan."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Altijd berichten decoderen bij weergave of vragen voor decodering"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Leesbevestiging verzenden met lege afzender."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Leesbevestigingen verzenden met een lege afzender. Sommige servers kunnen deze "
-"berichten weigeren. Wanneer u problemen ondervindt met het verzenden van "
-"leesbevestigingen dient u deze optie uit te zetten."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Uitdrukkingen zijn omgezet naar sjablonen"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Oude uitdrukkingen zijn omgezet naar sjablonen"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Berichtsjabloon voor nieuw bericht"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Berichtsjabloon voor beantwoorden"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Berichtsjabloon voor allen beantwoorden"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Berichtsjabloon voor doorsturen"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Tekens aanhalen"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Toestaan dat de gebruiker afwezigheidsberichten mag veranderen."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Toestaan dat gebruikers afwezigheids-sieve-scripts mogen uploaden, maar niet "
-"toestaan dat ze veranderingen aanbrengen in de instellingen (zoals het reageren "
-"op spam of alleen op een bepaald domein)."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Afwezigheidsberichten alleen versturen naar e-mails die van dit domein komen."
+"Uw server ondersteunt het commando TOP niet. Hierdoor is het niet mogelijk "
+"om de kopschriften van grote e-mailberichten eerst op te halen voordat ze "
+"worden gedownload."
 
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Toestaan dat afwezigheidsberichten worden verstuurd naar berichten die als spam "
-"zijn gemarkeerd."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Controleren of er nog een afwezigheidsbericht is ingesteld bij het openen van "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 van %2 %3 gebruikt"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14004,6 +11999,11 @@ msgstr "Toevoegen als CC"
 msgid "Add as BCC"
 msgstr "Toevoegen als BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Annuleren"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14019,10 +12019,10 @@ msgstr "Geselecteerde geadresseerden"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "U hebt %n geadresseerde geselecteerd. Het maximaal aantal ondersteunde "
 "geadresseerde is %1. Pas de selectie aan.\n"
@@ -14043,8 +12043,8 @@ msgstr "Adresselectievenster gebruiken"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Deze knop opent een apart dialoogvenster waarin u de ontvangers uit de "
 "beschikbare adressen kunt selecteren."
@@ -14149,13 +12149,23 @@ msgstr "is groter dan of gelijk aan"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dagen"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Om uw zoekopdracht uit te voeren in de map %1 dient deze gedownload te worden "
-"van de server. Dit kan enige tijd duren. Wilt u doorgaan met uw zoekopdracht?"
+"Om uw zoekopdracht uit te voeren in de map %1 dient deze gedownload te "
+"worden van de server. Dit kan enige tijd duren. Wilt u doorgaan met uw "
+"zoekopdracht?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14303,16 +12313,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Gegevens voor account '%1' worden verzameld...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Gegevens voor account '%1' worden verzameld...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14331,10 +12337,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Inhoud van script '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Inhoud van script '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14357,20 +12361,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-mogelijkheden:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-mogelijkheden:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Geen speciale mogelijkheden beschikbaar)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Beschikbare Sieve-scripts:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Beschikbare Sieve-scripts:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14413,13 +12413,14 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Selecteer dit vakje wanneer u wilt dat KMail een handtekening toevoegt aan "
-"e-mailberichten die met deze identiteit opgesteld worden."
+"Selecteer dit vakje wanneer u wilt dat KMail een handtekening toevoegt aan e-"
+"mailberichten die met deze identiteit opgesteld worden."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
 msgstr ""
-"Klik op de onderstaande elementen om hulp te verkrijgen over de invoermethodes."
+"Klik op de onderstaande elementen om hulp te verkrijgen over de "
+"invoermethodes."
 
 #: signatureconfigurator.cpp:72
 msgid ""
@@ -14450,12 +12451,12 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Gebruik dit veld om een tekstbestand te kiezen dat uw handtekening bevat. Het "
-"zal iedere keer gelezen worden wanneer u een nieuw bericht gaat opstellen of "
-"wanneer u een nieuwe handtekening wilt invoegen."
+"Gebruik dit veld om een tekstbestand te kiezen dat uw handtekening bevat. "
+"Het zal iedere keer gelezen worden wanneer u een nieuw bericht gaat "
+"opstellen of wanneer u een nieuwe handtekening wilt invoegen."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14471,14 +12472,14 @@ msgstr "Opent het opgegeven bestand in een tekstprogramma."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"U kunt hier een willekeurig commando invoeren, met of zonder pad afhankelijk of "
-"het commando zich in $PATH bevindt. Bij ieder nieuw bericht zal KMail het "
+"U kunt hier een willekeurig commando invoeren, met of zonder pad afhankelijk "
+"of het commando zich in $PATH bevindt. Bij ieder nieuw bericht zal KMail het "
 "commando uitvoeren en de (standaard) uitvoer gebruiken als handtekening. "
 "Normaal worden commando's gebruikt als \"fortune\" of \"ksig-random\"."
 
@@ -14486,6 +12487,11 @@ msgstr ""
 msgid "S&pecify command:"
 msgstr "Commando s&pecificeren:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Pad"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nieuwe ingang:"
@@ -14519,6 +12525,11 @@ msgstr "Groep toevoegen"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Wilt u de groep en bijbehorende fragmenten verwijderen?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Toepassen op:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Fragment bewerken"
@@ -14531,6 +12542,10 @@ msgstr "Groep bewerken"
 msgid "Edit &group..."
 msgstr "&Groep bewerken..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "B&ewerken..."
@@ -14564,18 +12579,19 @@ msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
 msgstr ""
-"Schakel dit in om de ingevoerde waarde als standaard waarde voor deze variabele "
-"op te slaan"
+"Schakel dit in om de ingevoerde waarde als standaard waarde voor deze "
+"variabele op te slaan"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
-"Wanneer u deze optie inschakelt zal het ingevoerde fragment opgeslagen worden. "
-"Wanneer u dezelfde variabele later gebruikt, zelfs in een ander fragment, zal "
-"de ingevoerde waarde als standaard waarde gebruikt worden voor die variabele."
+"Wanneer u deze optie inschakelt zal het ingevoerde fragment opgeslagen "
+"worden. Wanneer u dezelfde variabele later gebruikt, zelfs in een ander "
+"fragment, zal de ingevoerde waarde als standaard waarde gebruikt worden voor "
+"die variabele."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14610,6 +12626,16 @@ msgstr "Niet inschakelen"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Kon de inhoud van het bestand %1 niet invoegen: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Aan: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14639,60 +12665,53 @@ msgstr "Kon het precommando niet uitvoeren vanuit het sjabloon: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Hier kunt u berichtsjablonen aanmaken die u gebruikt bij het maken van een "
-"nieuw bericht, antwoorden of bij het doorsturen.</p> "
-"<p>De berichtsjablonen kunnen plaatshouders bevatten door ze simpelweg te typen "
-"of door ze te selecteren in het menu <i>Commando invoegen</i>.</p> "
-"<p>De sjablonen die hier worden gemaakt zijn specifiek voor een map. Ze krijgen "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>Hier kunt u berichtsjablonen aanmaken die u gebruikt bij het maken "
+"van een nieuw bericht, antwoorden of bij het doorsturen.</p> <p>De "
+"berichtsjablonen kunnen plaatshouders bevatten door ze simpelweg te typen of "
+"door ze te selecteren in het menu <i>Commando invoegen</i>.</p> <p>De "
+"sjablonen die hier worden gemaakt zijn specifiek voor een map. Ze krijgen "
 "voorrang boven de globale sjablonen en identiteitssjablonen indien deze "
 "bestaan.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Hier kunt u berichtsjablonen aanmaken die u kunt gebruiken bij het maken van "
-"nieuwe berichten, antwoorden of bij het doorsturen.</p> "
-"<p>De berichtsjablonen kunt u invoegen door de bijhorende plaatshouders in te "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>Hier kunt u berichtsjablonen aanmaken die u kunt gebruiken bij het "
+"maken van nieuwe berichten, antwoorden of bij het doorsturen.</p> <p>De "
+"berichtsjablonen kunt u invoegen door de bijhorende plaatshouders in te "
 "typen of door ze te selecteren in het menu <i>Commando invoegen</i>.</p> "
-"<p>De sjablonen die hier worden gemaakt zijn specifiek voor een identiteit. Ze "
-"krijgen voorrang boven de globale sjablonen en mapsjablonen indien deze "
+"<p>De sjablonen die hier worden gemaakt zijn specifiek voor een identiteit. "
+"Ze krijgen voorrang boven de globale sjablonen en mapsjablonen indien deze "
 "bestaan.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Hier kunt u berichtsjablonen aanmaken die u kunt gebruiken bij het opstellen "
-"van nieuwe berichten, antwoorden of bij het doorsturen.</p> "
-"<p>De berichtsjablonen kunt u invoegen door de bijhorende plaatshouders in te "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt> <p>Hier kunt u berichtsjablonen aanmaken die u kunt gebruiken bij het "
+"opstellen van nieuwe berichten, antwoorden of bij het doorsturen.</p> <p>De "
+"berichtsjablonen kunt u invoegen door de bijhorende plaatshouders in te "
 "typen of door ze te selecteren in het menu <i>Commando invoegen</i>.</p> "
-"<p>Dit is een globaal (standaard) sjabloon. Map- en identiteitsjablonen krijgen "
-"voorrang boven globale sjablonen.</p></qt>"
+"<p>Dit is een globaal (standaard) sjabloon. Map- en identiteitsjablonen "
+"krijgen voorrang boven globale sjablonen.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14927,8 +12946,8 @@ msgstr "Uitvoer van commando invoegen"
 #: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
-"Oorspronkelijke berichtinhoud doorsluizen door een programma en het resultaat "
-"daarvan invoegen als aangehaalde tekst"
+"Oorspronkelijke berichtinhoud doorsluizen door een programma en het "
+"resultaat daarvan invoegen als aangehaalde tekst"
 
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
@@ -14947,6 +12966,10 @@ msgstr "Huidige berichtinhoud doorsluizen en resultaat invoegen"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Huidige berichtinhoud doorsluizen en vervangen door resultaat"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Cursorpositie instellen"
@@ -14979,117 +13002,6 @@ msgstr "Debug-modus aanzetten"
 msgid "Turn Debug Off"
 msgstr "Debug-modus uitschakelen"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...u naar het volgende en vorige bericht kunt gaan met de pijltjestoetsen "
-"Links en Rechts?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...u snel filters kunt aanmaken op afzender, ontvanger, onderwerp\n"
-"en discussiegroep via menuoptie <em>Hulpmiddelen->Filter&nbsp;aanmaken</em>?</p>"
-"\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...u van de door sommige discussiegroepen automatisch ingevoegde referentie "
-"&quot;[discussiegroepnaam]&quot; af kunt komen met behulp van de "
-"filterhandeling <em>berichtkop herschrijven</em>?\n"
-"Gebruik hiervoor de filterinstelling "
-"<pre>berichtkop herschrijven&quot;\n"
-"Onderwerp   vervangen&quot;\\s*\\[discussiegroepnaam\\]\\s*&quot;\n"
-"   door &quot;&quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...u discussiegroepen kunt koppelen aan mappen via het dialoogvenster\n"
-"<em>Map-&gt;Eigenschappen...</em>? U kunt dan gebruik maken van menuoptie \n"
-"<em>Berichten-&gt;Nieuw&nbsp;bericht&nbsp;aan.&nbsp;discussiegroep...</em>\n"
-"om een nieuw e-mailbericht te openen met de discussiegroep als geadresseerde.\n"
-"U kunt ook met de middelste muisknop op de map klikken.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...u uw eigen pictogrammen kunt toewijzen aan elke individuele map?\n"
-"Kijk bij de menuoptie <em>Map-&gt;Eigenschappen...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...KMail een kleurenbalk kan gebruiken voor het markeren van het berichttype "
-"(platte tekst/html/OpenPGP) van het momenteel getoonde bericht?</p>\n"
-"<p>Dit verijdelt pogingen om de ondertekeningsverificatie te vervalsen\n"
-"door HTML-e-mailberichten te versturen die KMail's ondertekeningsstatusframes "
-"nabootsen.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...u op elke berichtkop kunt filteren door eenvoudigweg de naam\n"
-"ervan in het eerste tekstinvoerveld van een zoekregel in te vullen?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...u berichten die alleen in HTML zijn opgesteld eruit kunt filteren\n"
-"met de filterregel "
-"<pre>&quot;Content-type&quot; bevat &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...bij het beantwoorden alleen het geselecteerde deel van het bericht wordt "
-"aangehaald?</p>\n"
-"Als er niets is geselecteerd, dan wordt het hele bericht aangehaald."
-"<p>\n"
-"</p>Dit werkt ook bij tekst uit bijlagen als u bijlagen ingebed laat "
-"weergeven.</p>\n"
-"<p>Als u niet wilt dat het vorige bericht wordt aangehaald in uw antwoord,\n"
-"kies dan voor de menuoptie <em>Bericht-&gt;Beantwoorden zonder aanhaling</em>"
-".</p>\n"
-"<p align=\"right\"><em>Bijgedragen door David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Er is niets om ongedaan te maken."
@@ -15154,6 +13066,16 @@ msgstr "Bijlage #%1 (naamloos)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "GnuPG-auditlog tonen voor deze handeling"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Een bestand met de naam \"%1\" bestaat reeds. Wilt u het overschrijven?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Bestand overschrijven?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15201,7 +13123,8 @@ msgid ""
 "Default values will be used."
 msgstr ""
 "Iemand, mogelijk uzelf, heeft het vakantiescript op de server gewijzigd.\n"
-"KMail kan niet langer de parameters voor de automatische antwoorden bepalen.\n"
+"KMail kan niet langer de parameters voor de automatische antwoorden "
+"bepalen.\n"
 "In plaats daarvan zullen de standaardwaarden worden gebruikt."
 
 #: vacation.cpp:657
@@ -15270,14 +13193,14 @@ msgstr "Afbeelding ver&zenden met ieder bericht"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Selecteer deze optie om KMail een zogenaamde X-Face kop te laten toevoegen aan "
-"de berichten die u onder deze identiteit schrijft. Een X-Face is een klein "
-"zwartwit plaatje (48x48 pixels). Sommige e-mailprogramma's zijn in staat om "
-"zo'n plaatje te tonen."
+"Selecteer deze optie om KMail een zogenaamde X-Face kop te laten toevoegen "
+"aan de berichten die u onder deze identiteit schrijft. Een X-Face is een "
+"klein zwartwit plaatje (48x48 pixels). Sommige e-mailprogramma's zijn in "
+"staat om zo'n plaatje te tonen."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15307,13 +13230,14 @@ msgstr "Bestand selecteren..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Selecteer deze optie om een afbeeldingsbestand te selecteren zodat u een "
 "afbeelding kunt selecteren. De afbeelding dient veel contrasten een (bijna) "
-"vierkante vorm te hebben.Een lichte achtergrond zorgt voor een beter resultaat."
+"vierkante vorm te hebben.Een lichte achtergrond zorgt voor een beter "
+"resultaat."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15321,21 +13245,21 @@ msgstr "Uit adresboek halen"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"U kunt een verkleinde versie gebruiken van de afbeelding die u voor uzelf hebt "
-"ingesteld in het adresboek."
+"U kunt een verkleinde versie gebruiken van de afbeelding die u voor uzelf "
+"hebt ingesteld in het adresboek."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail kan een kleine zwartwit afbeelding (48x48 pixels) met iedere bericht "
-"meesturen. Dit kan bijvoorbeeld een logo zijn. Dit plaatje wordt in het "
-"e-mailprogramma van de ontvanger getoond (indien het ondersteund wordt)."
+"<qt>KMail kan een kleine zwartwit afbeelding (48x48 pixels) met iedere "
+"bericht meesturen. Dit kan bijvoorbeeld een logo zijn. Dit plaatje wordt in "
+"het e-mailprogramma van de ontvanger getoond (indien het ondersteund wordt)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15343,11 +13267,11 @@ msgstr "Gebruik dit veld om een willekeurige X-Face-tekst in te voeren."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Voorbeelden zijn beschikbaar op <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Voorbeelden zijn beschikbaar op <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15362,130 +13286,1832 @@ msgstr "Geen afbeelding"
 msgid "You do not have your own contact defined in the address book."
 msgstr "U hebt uzelf niet in het adresboek staan."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Totaal: %2<br>Ongelezen: %3<br>Grootte: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Ondertekenen"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Quota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Berichten automat&isch ondertekenen"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Onderwerp van bericht instellen"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Als deze optie is geselecteerd zullen alle berichten die u verzendt "
+"standaard worden ondertekend. Uiteraard is het dan nog steeds mogelijk om "
+"het ondertekenen van een bericht uit te schakelen."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "CC (kopie van bericht) naar 'adres' verzenden"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Versleuteling"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "BCC (blinde kopie) naar 'adres' verzenden"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Bij het versleutelen van e-mailberichten ook het certificaat van mijn "
+"identiteit versleutelen."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "'berichtkop' aan bericht toevoegen"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Wanneer deze optie aan staat, zal het bericht/bestand niet alleen "
+"versleuteld worden met de sleutel van de ontvanger, maar ook met uw eigen "
+"sleutel. Dit maakt het mogelijk om het bericht/bestand op een later tijdstip "
+"te ontcijferen. Het is aan te raden om dit te doen."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Berichttekst vanuit 'bestand' inlezen"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Ondertekende/versleutelde tekst tonen na het opstellen"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Inhoud van bericht instellen"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Wanneer deze optie aan staat, zal de ondertekende/versleutelde tekst in een "
+"apart venster getoond worden, zodat u het kunt bekijken voordat het wordt "
+"verzonden. Het is aan te raden om dit te doen zodat u zeker weet dat de "
+"versleuteling werkt."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Voeg een bijlage toe aan het bericht, dit kan worden herhaald"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Verzonden berichten v&ersleuteld opslaan"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Alleen controleren op nieuwe berichten"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Selecteer dit om berichten versleuteld op te slaan"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Alleen venster voor opstellen van e-mailberichten openen"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Berichten versleuteld opslaan</h1>\n"
+"Als deze optie is geselecteerd, dan worden verzonden berichten met dezelfde "
+"versleuteling opgeslagen. Dit is niet aan te bevelen, omdat u de berichten "
+"niet meer kunt lezen zodra het benodigde certificaat verloopt.\n"
+"<p>\n"
+"Maar er kunnen lokale regels zijn die vereisen dat u deze optie inschakelt. "
+"Bij twijfel, neem contact op met uw lokale systeembeheerder.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Het opgegeven berichtenbestand tonen"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Altijd de sleutels voor &goedkeuring tonen"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Bericht sturen naar 'address' resp. bijlage toevoegen waar 'URL' naar verwijst"
+"Wanneer deze optie is geselecteerd, zal de toepassing altijd een lijst tonen "
+"van alle beschikbare publieke sleutels die u kunt gebruiken voor "
+"versleuteling. Wanneer dit uit staat, zal de toepassing enkel een "
+"dialoogvenster tonen wanneer het de juiste sleutel niet kan vinden of "
+"wanneer er meerdere sleutels gebruikt kunnen worden."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Gelezen"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Berichten automatisch versleutelen, &indien mogelijk"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Oud"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Als deze optie is geselecteerd, dan wordt elk bericht dat u verzendt "
+"versleuteld, als versleuteling mogelijk en gewenst is. Uiteraard is het dan "
+"nog steeds mogelijk om het versleutelen van een bericht uit te schakelen."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Verwijderd"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nooit versleutelen bij het opslaan van een &concept"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Beantwoord"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Hoe werkt dit?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Doorgestuurd"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Algemeen"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Wachtende"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Beantwoorden"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Verzonden"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Allen beantwoorden"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Geobserveerd"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Doorsturen"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Genegeerd"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Snelt&oets:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Ongewenste reclame"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Sjabloon&type:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Reclame"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Sjablooninhoud"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Taak"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Sjabloonsneltoets"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Heeft bijlage"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Sjabloontype"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 van %2 %3 gebruikt"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Mapeigenschappen"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Pad"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Map bevat een discussiegroep"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Post&adres:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormaal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Ong&elezen:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Berichtenverloop"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Bericht&en bewaren tot:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Gelezen berichten laten ve&rlopen"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Berichten laten &verlopen na:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "&Ongelezen berichten laten verlopen"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dag(en)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "We(e)k(en)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Maand(en)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Identiteit van afzender:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Op&slagformaat:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Lijstweergaven:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Berichten in wachtrij verzenden bij berichtencontrole"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Een bestand met de naam \"%1\" bestaat reeds. Wilt u het overschrijven?"
+"<qt> <p>Bepaal of u wilt dat KMail alle berichten in postvak-uit verzendt "
+"bij e-mailcontroles, of dat u niet wilt dat berichten automatisch worden "
+"verzonden. </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Bestand overschrijven?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Niet-gesynchroniseerde e-mails automatisch verplaatsen vanuit mappen met "
+"onvoldoende toegangsrechten"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Wanneer er nieuwe berichten zijn in een map die nog niet naar de server zijn "
+"verzonden, maar de toegangsrechten voor die map te beperkt zijn, zullen deze "
+"berichten automatisch in de map \"lost + found\" geplaatst worden."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Lokale vlaggen toestaan in alleen-lezen-mappen"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Deze instelling geeft beheerders de mogelijkheid om de minimale duur tussen "
+"twee controles voor nieuwe berichten in te stellen.\"\n"
+"           \"De gebruiker zal niet in staat zijn een lagere waarde in te "
+"stellen."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "De meest recent geselecteerde map in het mappenselectiedialoog."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"De umask-waarde van de gebruiker negeren en het bestaand lees- en "
+"schrijfbaar maken voor de gebruiker"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Beleid voor het weergeven van het systeemvakpictogram"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Programma afsluiten wanneer het hoofdvenster is gesloten, zelfs wanneer het "
+"systeemvakpictogram actief is."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Uitvoerige notificatie voor nieuwe berichten"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Wanneer deze optie is geselecteerd zal er voor iedere map het aantal nieuwe "
+"berichten getoond worden in de notificatie voor nieuwe berichten, anders "
+"krijgt u een eenvoudige melding 'Nieuwe berichten ontvangen'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Editor spe&cificeren:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Externe editor gebr&uiken"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"De drempel voor wanneer de gebruiker gewaarschuwd dient te worden wanneer "
+"zijn quota wordt bereikt."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Groupware-functionaliteit activ&eren"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "De kopschriften Van:/Aan: aanpassen bij antwoorden op uitnodigingen"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook kent een aantal tekortkomingen in de implementatie van de "
+"iCalendar-standaard. Deze optie speelt daarop in. Wanneer u problemen hebt "
+"met Outlook-gebruikers die uw antwoorden niet kunnen ontvangen kunt u deze "
+"optie proberen."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Groupware-uitnodigingen in de berichttekst verzenden"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook kent een aantal tekortkomingen in de implementatie van de "
+"iCalendar-standaard. Deze optie speelt daarop in. Wanneer u problemen hebt "
+"met Outlook-gebruikers die uw uitnodigingen niet kunnen ontvangen kunt u "
+"deze optie proberen."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Naamgeving uitnodigingen compatible houden met Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook heeft, in combinatie met Microsoft Exchange, problemen met "
+"groupware-e-mail die zich aan de standaard houdt.\n"
+"Schakel deze optie in om groupware-uitnodigingen te versturen die correct "
+"kunnen worden verwerkt door Microsoft Exchange."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Wanneer dit is geselecteerd krijgt u niet de opsteller in beeld, maar worden "
+"alle uitnodigingsberichten automatisch verzonden. Als u het e-mailbericht "
+"wilt zien voordat u het verzendt, dient u deze optie uit te zetten. Wees u "
+"er echter van bewust dat de tekst in de opsteller in deiCalendar-syntaxis "
+"is, en het wordt niet aangeraden om dit handmatig te wijzigen."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Uitnodigingsemails verwijderen nadat een antwoord is verstuurd"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Wanneer dit is ingeschakeld zullen ontvangen uitnodigingsemails waarop "
+"geantwoord is verplaatst worden naar de prullenbak."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Wanneer u dit inschakelt is het mogelijk om items van de Kontact-"
+"toepassingen (KOrganizer, KAddressbook en KNotes) op te slaan.</p></p>Als u "
+"dit aanzet dient u ook de toepassingen in te stellen om gebruik te maken van "
+"de IMAP-gegevensbron. Dit kunt u doen in het TDE Configuratiecentrum.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Het is normaal gesproken niet nodig om de mappen te zien die de IMAP-"
+"gegevensbronnen bevatten. Maar wanneer u ze toch wilt zien, kunt u dat hier "
+"instellen.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Wanneer de account wordt gebruikt voor het opslaan van groupware-"
+"informatie \"\n"
+"           \"maar niet voor het opslaan van normale e-mail, schakel dan deze "
+"optie in om KMail alleen\"\n"
+"           \"groupware-mappen te laten tonen. Dit is handig wanneer u "
+"reguliere e-mail afhandelt\"\n"
+"           \"met een ander IMAP-account.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Kies het opslagformaat van de groupwaremappen. <ul> <li>Het standaard "
+"formaat is iCal (voor agendamappen) en vCard (voor adresboekmappen). Dit "
+"formaat maakt alle mogelijkheden van Kontact beschikbaar.</li> <li>Het XML-"
+"formaat van Kolab maakt gebruik van een eigen model dat meer overeenkomt met "
+"Outlook. Dit formaat geeft betere Outlook-compabiliteit wanneer u gebruik "
+"maakt met een Kolab-server of iets dat daarmee compatibel is.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Dit kiest de hoofdmap van de IMAP-gegevensbronmappen.</p><p>De Kolab-"
+"server stelt standaard de IMAP-inbox in als hoofdmap.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Dit is de ID van het account dat de IMAP-gegevensbronmappen bevat.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Wanneer u de mapnamen van de IMAP-opslag in uw eigen taal wilt hebben, "
+"kunt u kiezen uit de beschikbare talen.</p> <p>De enige reden waarom dit "
+"gedaan wordt is om compatibel met Microsoft Outlook te zijn. Het is geen "
+"goed idee om dit te doen omdat het dan onmogelijk wordt om van taal te "
+"veranderen.</p><p>U dient deze optie niet aan te zetten tenzij het echt "
+"nodig is.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Ook nieuwe berichten filteren in groupware-mappen."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Groupware-wijzigingen in verbindingsloze IMAP-mappen meteen synchroniseren "
+"wanneer u online gaat."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Deze waarde wordt gebruikt om te bepalen of de inleiding van KMail getoond "
+"moet worden."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maximum aantal verbindingen per host"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Dit kan worden gebruikt om het aantal verbindingen per host te beperken bij "
+"het controleren op nieuwe berichten. Standaard is het aantal verbindingen "
+"onbeperkt (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Snelzoeken tonen"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Met deze optie kunt u de zoekregel boven de berichtenlijst aan- of "
+"uitzetten. U kunt met deze zoekregel snel bepaalde gegevens zoeken uit de "
+"berichtenlijst."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Lokaal postvak in verbergen indien ongebruikt"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Standaard ingebed doorsturen."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Laat de puntkomma (;) gebruikt worden als scheidingsteken in de "
+"berichtopsteller."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Originele tekenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Handtekening auto&matisch invoegen"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Deze identiteit onthouden, zodat deze in de toekomst automatischgebruikt "
+"wordt wanneer u de volgende keer een bericht op gaat stellen.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Deze map voor verzonden items onthouden, zodat deze in de toekomst "
+"automatisch gebruikt wordt wanneer u de volgende keer een bericht op gaat "
+"stellen."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Onthoud dit berichtentransport, zodat deze in de toekomst automatisch "
+"gebruikt wordt wanneer u de volgende keer een bericht op gaat stellen."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Deze identiteit onthouden, zodat deze in de toekomst automatischgebruikt "
+"wordt wanneer u de volgende keer een bericht op gaat stellen.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Regels a&fbreken bij kolom:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Maximaal aantal regels geadresseerden-editor."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Zet deze optie aan om ervoor te zorgen dat Outlook &#8482; de bijlagenamen "
+"begrijpt die niet-West-Europese tekens bevatten"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Auto&matisch bevestigingen voor ontvangst en gelezen verzoeken"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Selecteer deze optie als u wilt dat KMail bevestigingen voor "
+"ontvangst en gelezen (MDNs) verzoekt voor alle berichten die u verzendt.</p> "
+"<p> Deze optie heeft alleen effect op de standaardinstelling, u kunt het MDN-"
+"verzoek per bericht regelen in de opsteller via de menuoptie <em>Opties</"
+"em>&gt;<em>Ontvangst en gelezen-bevestiging verzoeken</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Recente adressen gebruiken voor automatische aanvulling"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Schakel deze optie uit wanneer u geen recent gebruikte adressen wilt zien in "
+"de automatische aanvulling van de adresvelden."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Automatisch opslaan iedere:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Er kan automatisch een backup gemaakt worden van de tekst in de opsteller. U "
+"kunt hier een tijdsinterval kiezen om een nieuwe backup te maken. U kunt het "
+"automatisch opslaan uitschakelen door hier een waarde van 0 in te vullen."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Handtekening boven aangehaalde tekst invoegen"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Herkend voorvoegsel vervangen &door \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Herkend voorvoegsel vervangen door \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Intelligente aanhalingen gebr&uiken"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "De ondertekening is verlopen."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Selectietype geadresseerden"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Bepaalt het type dialoogvenster voor het selecteren van\n"
+"            geadresseerden."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Type selectie geadresseerden"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Stelt in welke dialoogvenster in beeld komt voor het selecteren van "
+"geadresseerden (Aan, CC en BCC)."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maximaal aantal regels geadresseerden-editor."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Lijst van berichtdelen die ontdaan worden van e-mailberichten die inline "
+"worden doorgestuurd."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "De maximale grootte in MB dat e-mailbijlagen mogen hebben."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Fragmentbeheer en invoegpaneel tonen in opsteller."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Auditlog tonen zelfs wanneer versleuteling en/of ondertekening geslaagd zijn."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Originele tekenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Sommige (vooral automatisch gegenereerde) e-mailberichten geven niet op "
+"welke tekensetcodering er wordt gebruikt. Dit is nodig om zo'n bericht goed "
+"in beeld te brengen. In zulke gevallen kunt u hier een reservecodering "
+"instellen. Stel de codering in dat het meest gebruikt wordt in uw "
+"werelddeel. Als standaard waarde wordt de systeemwaarde gebruikt."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Wanneer u deze optie op iets anders zet dan 'Automatisch' zal het gebruik "
+"van tekensetcodering van alle e-mailberichten geforceerd worden, ongeacht "
+"wat het bericht zelf opgeeft."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Schakel deze optie in om smileys als :-) in de tekst te laten vervangen door "
+"emoticons (kleine pictogrammetjes)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Schakel deze optie in om de verschillende niveaus van aangehaalde tekst te "
+"kunnen zien. Schakel deze optie uit om de verschillende niveaus te verbergen."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatisch inklappen bij niveau:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Lettergrootte verkleinen bij aangehaalde tekst"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Schakel deze optie in om aangehaalde tekst te tonen in een kleiner "
+"lettertype."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Verzonden berichten v&ersleuteld opslaan"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Gebruikersagent tonen in elegante koppen"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Schakel deze optie in om de gebruikersagent en X-Mailer te tonen in de "
+"elegante berichtkoppen."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Verwijderen van bijlagen van bestaande e-mailberichten toestaan."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Bewerken van bijlagen van bestaande e-mailberichten toestaan."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Altijd berichten decoderen bij weergave of vragen voor decodering"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Leesbevestiging verzenden met lege afzender."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Leesbevestigingen verzenden met een lege afzender. Sommige servers kunnen "
+"deze berichten weigeren. Wanneer u problemen ondervindt met het verzenden "
+"van leesbevestigingen dient u deze optie uit te zetten."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Uitdrukkingen zijn omgezet naar sjablonen"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Oude uitdrukkingen zijn omgezet naar sjablonen"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Berichtsjabloon voor nieuw bericht"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Berichtsjabloon voor beantwoorden"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Berichtsjabloon voor allen beantwoorden"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Berichtsjabloon voor doorsturen"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Tekens aanhalen"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Toestaan dat de gebruiker afwezigheidsberichten mag veranderen."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Toestaan dat gebruikers afwezigheids-sieve-scripts mogen uploaden, maar niet "
+"toestaan dat ze veranderingen aanbrengen in de instellingen (zoals het "
+"reageren op spam of alleen op een bepaald domein)."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Afwezigheidsberichten alleen versturen naar e-mails die van dit domein komen."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Toestaan dat afwezigheidsberichten worden verstuurd naar berichten die als "
+"spam zijn gemarkeerd."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Controleren of er nog een afwezigheidsbericht is ingesteld bij het openen "
+"van KMail."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Bestand be&werken"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "B&ewerken..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Ga naar"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Ma&p"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Beri&cht"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Speciaal antwoorden"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Doorsturen"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Hulpballonnen"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Fragmentinstellingen"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML werkbalk"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Algemene opties"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML werkbalk"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Certificaten met CRL's valideren"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Wanneer deze optie is geselecteerd, zullen S/MIME-certificaten gevalideerd "
+"worden met Certificate Revocation Lists (CRL's)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Certificaten online valideren (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Wanneer deze optie is geselecteerd, zullen S/MIME-certificaten online "
+"gevalideerd worden met het Online Certificates Status Protocol (OCSP). Voer "
+"hieronder het URL-adres in van de OCSP-dienst."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Online certificaatvalidatie"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL-adres OCSP-dienst:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Voer hier het adres in van de server die de certificaten online valideert "
+"(OCSP-dienst). Het URL-adres begint doorgaans met http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Handtekening OCSP-dienst:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Service-URL van certificaten negeren"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Certificaatbeleid niet controleren"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Standaard gebruikt GnuPG het bestand ~/.gnupg/policies.txt om te controleren "
+"of een certificaatbeleid toegestaan is. Wanneer deze optie is geselecteerd "
+"wordt het beleid niet gecontroleerd."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nooit een CRL raadplegen"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Wanneer deze optie is geselecteerd zal de Certificate Revocation List nooit "
+"gebruikt worden om S/MIME-certificaten te valideren."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Ontbrekende uitgevers certificaten ophalen"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Wanneer deze optie is geselecteerd, zullen de ontbrekende uitgevers voor dit "
+"certificaat opgehaald worden indien nodig (dit is van toepassing op beide "
+"methoden, CRL's en OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-verzoeken"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Geen HTTP-verzoeken maken"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Schakelt het gebruik van HTTP voor S/MIME volledig uit."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Deze proxy voor HTTP-verzoeken gebruiken: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "HTTP-proxy van systeem gebruiken:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Wanneer deze optie is geselecteerd zal de HTTP-proxy die rechts wordt "
+"getoond gebruikt worden bij een HTTP-verzoek. (De waarde hiervan komt uit de "
+"omgevingsvariabele http_proxy.)"
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Voer de locatie in van uw HTTP-proxy die gebruikt zal worden voor alle HTTP-"
+"verzoeken gerelateerd aan S/MIME. De syntaxis is hostnaam:poort, "
+"bijvoorbeeld mijnproxy.nergens.nl:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "HTTP CRL-distributiepunt van certificaten negeren"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Wanneer u de locatie van een CRL aan het zoeken bent, zal het te testen "
+"certificaat ingangen bevatten onder de naam \"CRL Distribution Point\" (DP). "
+"Deze bevatten URL-adressen die het adres van de CRL beschrijven. Het eerste "
+"gevonden DP wordt gebruikt. Met deze optie worden alle ingangen volgens het "
+"HTTP-schema genegeerd wanneer er gezocht wordt naar een geschikte DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-verzoeken"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Geen LDAP-verzoeken maken"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Schakelt het gebruik van LDAP voor S/MIME volledig uit."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "LDAP CRL-distributiepunt van certificaat negeren"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Wanneer u de locatie van een CRL aan het zoeken bent, zal het te testen "
+"certificaat ingangen bevatten onder de naam \"CRL Distribution Point\" (DP). "
+"Deze bevatten URL-adressen die het adres van de CRL beschrijven. Het eerste "
+"gevonden DP wordt gebruikt. Met deze optie worden alle ingangen volgens het "
+"LDAP-schema genegeerd wanneer er gezocht wordt naar een geschikte DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primaire host voor LDAP-verzoeken:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Het invoeren van een LDAP-server zal ervoor zorgen dat ieder LDAP-verzoek "
+"eerst naar die server zal gaan. Om precies te zijn zal deze instelling "
+"voorrang hebben op iedere andere hostnaam en poort van een LDAP-URL-adres. "
+"Ook wordt deze instelling gebruikt wanneer er geen hostnaam en poort is "
+"opgegeven in het URL-adres. Andere LDAP-servers zullen pas geprobeerd worden "
+"wanneer de verbinding met de \"proxy\" mislukte.\n"
+"De syntaxis is \"HOST\" of \"HOST:POORT\". Wanneer de POORT weggelaten wordt "
+"zal standaard poort 389 gebruikt worden (de standaard LDAP-poort)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Fragment toevoegen"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Toevoegen"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Fragment:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Groep:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Fragmentinstellingen"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Hulpballonnen"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Fragmenttekst in hulpballon &tonen"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Bepaalt of een hulpballon de tekst van een gemarkeerde regel moet tonen"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variabelen"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Invoermethode voor variabelen"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Enkel dialoogvenster voor iedere variabele in een fragment"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+"Een invoervenster zal getoond worden voor iedere variabele in een "
+"tekstfragment"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Een dialoog voor alle variabelen in een fragment"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Een enkel dialoogvenster zal getoond worden waarin u de waarden kunt "
+"invullen voor alle variabelen in een fragment"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Scheiding:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Afzender beantwoorden"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Allen beantwoorden / naar lijst beantwoorden"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Bericht doorsturen"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Waarsch&uwen voor het verzenden van niet-ondertekende berichten"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Selecteer deze optie als u wilt worden gewaarschuwd bij het verzenden van "
+"niet-ondertekende berichten."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen voor het verzenden van niet-ondertekende berichten</h1>\n"
+"Als deze optie is geselecteerd zult u worden gewaarschuwd wanneer u een "
+"bericht wilt verzenden dat (deels) niet is ondertekend.\n"
+"<p>\n"
+"Voor maximale veiligheid wordt aanbevolen om deze optie te selecteren.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+"&Waarschuwen als er niet-versleutelde berichten zullen worden verstuurd"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Selecteer dit als u gewaarschuwd wilt worden voor het verzenden van niet-"
+"versleutelde berichten."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen voor het verzenden van niet-versleutelde berichten</h1>\n"
+"Als deze optie is geselecteerd, dan zult u worden gewaarschuwd als u "
+"probeert berichtdelen of hele berichten zonder versleuteling te verzenden.\n"
+"<p>\n"
+"Voor maximale zekerheid is het aan te bevelen deze optie te selecteren.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Waarschuwen als e-mailad&res van ontvanger niet in certificaat staat"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Selecteer dit als u wilt worden gewaarschuwd al het adres niet in het "
+"certificaat staat"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen als e-mailadres van ontvanger niet in certificaat staat</"
+"h1>\n"
+"als deze optie is geselecteerd, dan wordt u gewaarschuwd al het e-mailadres "
+"van de ontvanger niet aanwezig is in het certificaat dat voor versleuteling "
+"wordt gebruikt.\n"
+"<p>\n"
+"Voor maximale zekerheid wordt aanbevolen deze optie in te schakelen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Waarschuwen wanneer een certificaat/sleutel binnenkort zal verlopen "
+"(specifieke instellingen hieronder)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Voor ondertekening"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Voor versleuteling"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Selecteer hier het aantal dagen"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen als een ondertekeningscertificaat verloopt</h1>\n"
+"Selecteer het minimum aantal dagen dat een ondertekeningscertificaat nog "
+"geldig moet zijn voordat er wordt gewaarschuwd.\n"
+"<p>\n"
+"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen als het versleutelingscertificaat verloopt</h1>\n"
+"Selecteer het minimum aantal dagen dat een versleutelingscertificaat nog "
+"geldig dient te zijn voordat u wordt gewaarschuwd.\n"
+"<p>\n"
+"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen als een certificaat in de certificatenketen verloopt</h1>\n"
+"Selecteer het minimum aantal dagen dat alle certificaten in de ketting nog "
+"geldig moeten zijn voordat er wordt gewaarschuwd.\n"
+"<p>\n"
+"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen als een CA-certificaat verloopt</h1>\n"
+"Selecteer het minimum aantal dagen dat een CA-certificaat geldig dient te "
+"zijn voordat er wordt gewaarschuwd.\n"
+"<p>\n"
+"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Waarschuwen als het broncertificaat verloopt</h1>\n"
+"Selecteer het minimum aantal dagen dat een broncertificaat geldig dient te "
+"zijn voordat er wordt gewaarschuwd.\n"
+"<p>\n"
+"De aanbevolen instelling voor de SPHINX-omgeving is 14 dagen.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Voor hoofdcertificaten:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Voor tijdelijke CA-certificaten:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Voor certificaten/sleutels voor eindgebruikers:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+"Alle \"Deze vraag niet meer stellen\"-waarschuwingen opnieuw inschakelen"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...u naar het volgende en vorige bericht kunt gaan met de pijltjestoetsen "
+"Links en Rechts?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...u snel filters kunt aanmaken op afzender, ontvanger, onderwerp\n"
+"en discussiegroep via menuoptie <em>Hulpmiddelen->Filter&nbsp;aanmaken</em>?"
+"</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...u van de door sommige discussiegroepen automatisch ingevoegde "
+"referentie &quot;[discussiegroepnaam]&quot; af kunt komen met behulp van de "
+"filterhandeling <em>berichtkop herschrijven</em>?\n"
+"Gebruik hiervoor de filterinstelling <pre>berichtkop herschrijven&quot;\n"
+"Onderwerp   vervangen&quot;\\s*\\[discussiegroepnaam\\]\\s*&quot;\n"
+"   door &quot;&quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...u discussiegroepen kunt koppelen aan mappen via het dialoogvenster\n"
+"<em>Map-&gt;Eigenschappen...</em>? U kunt dan gebruik maken van menuoptie \n"
+"<em>Berichten-&gt;Nieuw&nbsp;bericht&nbsp;aan.&nbsp;discussiegroep...</em>\n"
+"om een nieuw e-mailbericht te openen met de discussiegroep als "
+"geadresseerde.\n"
+"U kunt ook met de middelste muisknop op de map klikken.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...u uw eigen pictogrammen kunt toewijzen aan elke individuele map?\n"
+"Kijk bij de menuoptie <em>Map-&gt;Eigenschappen...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...KMail een kleurenbalk kan gebruiken voor het markeren van het "
+"berichttype (platte tekst/html/OpenPGP) van het momenteel getoonde bericht?</"
+"p>\n"
+"<p>Dit verijdelt pogingen om de ondertekeningsverificatie te vervalsen\n"
+"door HTML-e-mailberichten te versturen die KMail's "
+"ondertekeningsstatusframes nabootsen.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...u op elke berichtkop kunt filteren door eenvoudigweg de naam\n"
+"ervan in het eerste tekstinvoerveld van een zoekregel in te vullen?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...u berichten die alleen in HTML zijn opgesteld eruit kunt filteren\n"
+"met de filterregel <pre>&quot;Content-type&quot; bevat &quot;text/html&quot;?"
+"</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...bij het beantwoorden alleen het geselecteerde deel van het bericht "
+"wordt aangehaald?</p>\n"
+"Als er niets is geselecteerd, dan wordt het hele bericht aangehaald.<p>\n"
+"</p>Dit werkt ook bij tekst uit bijlagen als u bijlagen ingebed laat "
+"weergeven.</p>\n"
+"<p>Als u niet wilt dat het vorige bericht wordt aangehaald in uw antwoord,\n"
+"kies dan voor de menuoptie <em>Bericht-&gt;Beantwoorden zonder aanhaling</"
+"em>.</p>\n"
+"<p align=\"right\"><em>Bijgedragen door David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Snelzoeken voor mappen tonen"
diff --git a/tde-i18n-nn/messages/tdepim/kmail.po b/tde-i18n-nn/messages/tdepim/kmail.po
index df529faaadb..1f6c6ea4f47 100644
--- a/tde-i18n-nn/messages/tdepim/kmail.po
+++ b/tde-i18n-nn/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2006-07-23 19:03+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -20,13 +20,13 @@ msgstr ""
 "X-Generator: Emacs 22.0.50.1, po-mode 2.01+0.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Gaute Hvoslef Kvalnes,Håvard Korsvoll,Karl Ove Hufthammer"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "&Ingen (ver varsam)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto for halvautomatisk ressurshandsaming"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Tøm historia"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -189,7 +195,8 @@ msgstr "Tøm historia"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Slett alle utdaterte tilordningar for ressursen representert av denne kontoen."
+"Slett alle utdaterte tilordningar for ressursen representert av denne "
+"kontoen."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -250,13 +257,13 @@ msgstr "&Brukarnamn:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Internettleverandøren har gjeve deg eit <em>brukarnamn</em> "
-"du skal bruka til å henta ned e-post med. Brukarnamnet er ofte den første delen "
-"av e-postadressa (teksten før <em>@</em>)."
+"Internettleverandøren har gjeve deg eit <em>brukarnamn</em> du skal bruka "
+"til å henta ned e-post med. Brukarnamnet er ofte den første delen av e-"
+"postadressa (teksten før <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -277,19 +284,19 @@ msgstr "&Lagra POP-passordet"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Kryss av her for å la KMail lagra passordet.\n"
-"Dersom TDEWallet er tilgjengeleg, vert passordet lagra der, fordi det er rekna "
-"som trygt.\n"
-"Dersom TDEWallet ikkje er tilgengeleg, vert passordet lagra i oppsettsfila til "
-"KMail. Passordet vert lagra i eit uleseleg format, men du bør ikkje stola på at "
-"krypteringa er trygg dersom andre får tilgang til oppsettfila."
+"Dersom TDEWallet er tilgjengeleg, vert passordet lagra der, fordi det er "
+"rekna som trygt.\n"
+"Dersom TDEWallet ikkje er tilgengeleg, vert passordet lagra i oppsettsfila "
+"til KMail. Passordet vert lagra i eit uleseleg format, men du bør ikkje "
+"stola på at krypteringa er trygg dersom andre får tilgang til oppsettfila."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -317,12 +324,13 @@ msgstr "Berre bruk &filter på meldingar større enn"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Denne funksjonen gjer at POP-filter vert bruka til å avgjera korleis meldingane "
-"skal handterast. Du kan velja å lasta ned, sletta eller lata meldingane liggja "
-"att på tenaren."
+"Denne funksjonen gjer at POP-filter vert bruka til å avgjera korleis "
+"meldingane skal handterast. Du kan velja å lasta ned, sletta eller lata "
+"meldingane liggja att på tenaren."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -371,13 +379,15 @@ msgstr "&Klårtekst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -420,9 +430,9 @@ msgstr "Namnerom:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Her ser du dei ulike namneromma IMAP-tenaren støttar. Kvart namnerom "
 "representerer eit prefiks som skil mappegrupper. Med namnerom kan KMail for "
@@ -486,9 +496,9 @@ msgstr "Hent inn &vedlegg ved behov"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Ikkje hent vedlegg automatisk ved opning av e-post. Vedlegga vert då berre "
 "henta ned når du trykkjer på dei. På denne måten vert òg store e-postar vist "
@@ -532,7 +542,7 @@ msgstr "<ingen>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "innboks"
 
@@ -540,45 +550,47 @@ msgstr "innboks"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Tenaren ser ikkje ut til å støtta unike meldingsnummer, men dette er eit krav "
-"for å la meldinger liggja att på tenaren.\n"
-"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så har "
-"du framleis høve til å krysse av for å la meldingar liggja att."
+"Tenaren ser ikkje ut til å støtta unike meldingsnummer, men dette er eit "
+"krav for å la meldinger liggja att på tenaren.\n"
+"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så "
+"har du framleis høve til å krysse av for å la meldingar liggja att."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Det ser ut til at tenaren ikkje støttar å henta berre meldingshovud, men dette "
-"er eit krav for å kunna filtrera meldingar på tenaren.\n"
-"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så har "
-"du framleis høve til å skru på filtrering av meldingar på tenaren."
+"Det ser ut til at tenaren ikkje støttar å henta berre meldingshovud, men "
+"dette er eit krav for å kunna filtrera meldingar på tenaren.\n"
+"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så "
+"har du framleis høve til å skru på filtrering av meldingar på tenaren."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Legg merke til at denne funksjonen kan føra til at enkelte POP3-tenarar som "
 "ikkje støttar parallellnedlasting sender øydelagde e-postar.\n"
 "Men du kan likevel alltid velja funksjonen, då enkelte tenarar støttar "
-"parallellnedlasting utan å seia frå om det. For å undersøkja om POP3-tenaren du "
-"brukar støttar parallellnedlasting, kan du bruka knappen nedst i dialogen.\n"
-"Sjølv om tenaren ikkje seier frå om støtte, kan du testa om han likevel støttar "
-"parallellnedlasting ved å senda mange e-postar til deg sjølv og så lasta dei "
-"ned."
+"parallellnedlasting utan å seia frå om det. For å undersøkja om POP3-tenaren "
+"du brukar støttar parallellnedlasting, kan du bruka knappen nedst i "
+"dialogen.\n"
+"Sjølv om tenaren ikkje seier frå om støtte, kan du testa om han likevel "
+"støttar parallellnedlasting ved å senda mange e-postar til deg sjølv og så "
+"lasta dei ned."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -586,49 +598,50 @@ msgstr "Oppgje tenar og port på fana «Generelt» først."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Det ser ut til at tenaren ikkje støttar parallellnedlasting, og dette valet er "
-"derfor skrudd av.\n"
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Det ser ut til at tenaren ikkje støttar parallellnedlasting, og dette valet "
+"er derfor skrudd av.\n"
 "Men sidan nokre tenarar ikkje oppgjev rett informasjon om dei støttar dette "
-"eller ikkje, så har du framleis høve til å skru på denne funksjonen. Men merk "
-"at nokre POP-tenarar då kan senda øydelagde e-postar. Før du brukar dette på "
-"viktig e-post bør du derfor teste det ved først å senda mange testmeldingar til "
-"deg sjølv, og så lasta dei ned på éin gong frå POP-tenaren."
+"eller ikkje, så har du framleis høve til å skru på denne funksjonen. Men "
+"merk at nokre POP-tenarar då kan senda øydelagde e-postar. Før du brukar "
+"dette på viktig e-post bør du derfor teste det ved først å senda mange "
+"testmeldingar til deg sjølv, og så lasta dei ned på éin gong frå POP-tenaren."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Tenaren ser ikkje ut til å støtta unike meldingsnummer, men dette er eit krav "
-"for å la meldinger liggja att på tenaren. Funksjonen er derfor skrudd av.\n"
-"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så har "
-"du framleis høve til å krysse av for å la meldingar liggja att."
+"Tenaren ser ikkje ut til å støtta unike meldingsnummer, men dette er eit "
+"krav for å la meldinger liggja att på tenaren. Funksjonen er derfor skrudd "
+"av.\n"
+"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så "
+"har du framleis høve til å krysse av for å la meldingar liggja att."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Det ser ut som om tenaren ikkje støttar å henta berre meldingshovud, men dette "
-"er eit krav for å filtrera meldingar på tenaren. Dette valet er difor skrudd "
-"av.\n"
-"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så har "
-"du framleis høve til å skru på filtrering av meldingar på tenaren."
+"Det ser ut som om tenaren ikkje støttar å henta berre meldingshovud, men "
+"dette er eit krav for å filtrera meldingar på tenaren. Dette valet er difor "
+"skrudd av.\n"
+"Men sidan enkelte tenarar gjev feil opplysningar om kva dei kan gjera, så "
+"har du framleis høve til å skru på filtrering av meldingar på tenaren."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -708,11 +721,11 @@ msgstr "IMAP-konto"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Du må leggja til ein konto i nettverkskategorien i innstillingane for å kunna "
-"motta e-post."
+"Du må leggja til ein konto i nettverkskategorien i innstillingane for å "
+"kunna motta e-post."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -748,9 +761,9 @@ msgstr "Velkommen til KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Det ser ut til at du har starta KMail for første gong. Du kan no bruka "
 "denne vegvisaren for å setja opp e-postkontoane dine. Berre skriv inn "
@@ -816,8 +829,7 @@ msgstr "Bruk lokallevering"
 msgid "Server Information"
 msgstr "Tenarinformasjon"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ingen"
@@ -939,7 +951,8 @@ msgstr ""
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>Mappe for meldingar klassifiserte som mogleg (sannsynleg) søppelpost er <i>"
+"<p>Mappe for meldingar klassifiserte som mogleg (sannsynleg) søppelpost er "
+"<i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -959,28 +972,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Her kan du få litt hjelp med å setja opp KMail sine filterreglar til å bruka "
-"nokre av dei mest bruka antivirusverktøya.</p>"
-"<p>Vegvisaren kan finna desse verktøya på datamaskina di. Han kan òg laga "
-"filterreglar for å klassifisera meldingar ved hjelp av verktøya, og skilja ut "
-"meldingar som inneheld virus. Vegvisaren vil ikkje bruka nokon av dei "
-"eksisterande filtera; han vil alltid leggja til nye filterreglar.</p>"
-"<p><b>Åtvaring:</b> Sidan KMail stoppar opp medan meldingar vert kontrollerte "
-"for virus, kan du oppleva at programmet verkar treigt. Dette er fordi det "
-"vanlegvis er tidkrevjande å sjå etter virus. Du kan vurdere å slå av "
-"filterreglane som vegvisaren lagar dersom du opplever slike problem."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Her kan du få litt hjelp med å setja opp KMail sine filterreglar til å "
+"bruka nokre av dei mest bruka antivirusverktøya.</p><p>Vegvisaren kan finna "
+"desse verktøya på datamaskina di. Han kan òg laga filterreglar for å "
+"klassifisera meldingar ved hjelp av verktøya, og skilja ut meldingar som "
+"inneheld virus. Vegvisaren vil ikkje bruka nokon av dei eksisterande "
+"filtera; han vil alltid leggja til nye filterreglar.</p><p><b>Åtvaring:</b> "
+"Sidan KMail stoppar opp medan meldingar vert kontrollerte for virus, kan du "
+"oppleva at programmet verkar treigt. Dette er fordi det vanlegvis er "
+"tidkrevjande å sjå etter virus. Du kan vurdere å slå av filterreglane som "
+"vegvisaren lagar dersom du opplever slike problem."
 
 # | msgid "<p>Please select the tools to be used for the spam detection and go to the next page.</p>"
 #: antispamwizard.cpp:919
@@ -989,8 +1001,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Vel verktøya du vil bruka for oppdaging av søppelpost, og gå så vidare til "
-"neste side.</p>"
+"<p>Vel verktøya du vil bruka for oppdaging av søppelpost, og gå så vidare "
+"til neste side.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1017,15 +1029,14 @@ msgstr "Flytt &sannsynleg søppelpost til:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"Standardmappa er innboksen, men du kan endra dette nedanfor. "
-"<p>Ikkje alle verktøya støttar klassifisering av post som usikker/sannsynleg "
-"søppelpost. Viss du ikkje har valt eit verktøy som støttar dette, kan du heller "
-"ikkje velja ei mappe."
+"Standardmappa er innboksen, men du kan endra dette nedanfor. <p>Ikkje alle "
+"verktøya støttar klassifisering av post som usikker/sannsynleg søppelpost. "
+"Viss du ikkje har valt eit verktøy som støttar dette, kan du heller ikkje "
+"velja ei mappe."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1035,13 +1046,13 @@ msgstr "Sjekk meldingane ved hjelp av antivirusverktøya"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"La antivirusverktøya klassifisera meldingane dine. Vegvisaren vil oppretta dei "
-"naudsynte filtra. Vanlegvis vert meldingane markerte av verktøya slik at filter "
-"seinare kan reagere på dette, som å flytta virusmeldingar til ei særskilt "
-"mappe."
+"La antivirusverktøya klassifisera meldingane dine. Vegvisaren vil oppretta "
+"dei naudsynte filtra. Vanlegvis vert meldingane markerte av verktøya slik at "
+"filter seinare kan reagere på dette, som å flytta virusmeldingar til ei "
+"særskilt mappe."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1050,11 +1061,11 @@ msgstr "Flytt oppdaga virusmeldinger til den valde mappa"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Det er oppretta eit filter som oppdagar meldingar som er klassifiserte som at "
-"dei inneheld virus, og flyttar desse meldingane til ei eiga mappe. "
+"Det er oppretta eit filter som oppdagar meldingar som er klassifiserte som "
+"at dei inneheld virus, og flyttar desse meldingane til ei eiga mappe. "
 "Standardmappa er papirkorga, men du kan endra dette."
 
 #: antispamwizard.cpp:1084
@@ -1063,8 +1074,8 @@ msgstr "Merk i tillegg dei oppdaga virusmeldingane som lesne"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Merk meldingar som er klassifiserte som at dei inneheld virus som lesne, i "
 "tillegg til å flytta dei til den valde mappa."
@@ -1248,7 +1259,8 @@ msgid ""
 "communication is here:"
 msgstr ""
 "Dette kan vera fordi du ikkje har løyve til å gjera dette, eller fordi mappa "
-"allereie finst på tenaren. Feilmeldinga frå kommunikasjonen med tenaren er her:"
+"allereie finst på tenaren. Feilmeldinga frå kommunikasjonen med tenaren er "
+"her:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1261,8 +1273,8 @@ msgstr "Feil ved lesing av mappa %1 på tenaren: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1282,8 +1294,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1314,17 +1326,17 @@ msgstr "Sletta"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Ingen av identitetane dine passar til mottakaradressa til denne meldinga."
 "<br>Vel kva for ei av desse adressene som er di:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Ingen av identitetane dine passar til mottakaradressa til denne meldinga."
 "<br>Vel kva for ei av desse adressene som er di:"
@@ -1356,18 +1368,21 @@ msgstr "Feil ved komprimering av «%1». Komprimeringa er avbrote."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Denne innstillinga er fastsett av administratoren din.</p>"
-"<p>Viss du trur dette er ein feil, ta kontakt med han.</p></qt>"
+"<qt><p>Denne innstillinga er fastsett av administratoren din.</p><p>Viss du "
+"trur dette er ein feil, ta kontakt med han.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Hent profil …"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Oppsett av KMail"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Legg til …"
@@ -1397,6 +1412,11 @@ msgstr "<qt>Er du sikker på at du vil fjerna identiteten <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Fjern identitet"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Fjern"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Legg til …"
@@ -1405,6 +1425,11 @@ msgstr "Legg til …"
 msgid "Modify..."
 msgstr "Endra …"
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Fjern"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Bruk som standard"
@@ -1421,17 +1446,15 @@ msgstr "&Sending"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Utgåande kontoar (legg til minst éin):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Namn"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1453,8 +1476,7 @@ msgstr "Bruk som standard"
 msgid "Common Options"
 msgstr "Vanlege innstillingar"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Sta&dfest før sending"
@@ -1505,17 +1527,16 @@ msgstr "S&tandarddomene:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Standarddomenet vert lagt til etter krøllalfaen («@») i ufullstendige "
+"<qt><p>Standarddomenet vert lagt til etter krøllalfaen («@») i ufullstendige "
 "adresser.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1533,9 +1554,9 @@ msgstr "Legg til overføringsmetode"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (standard)"
 
@@ -1618,6 +1639,10 @@ msgstr "Endra konto"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Finn ikkje kontoen <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Fargar"
@@ -1726,8 +1751,7 @@ msgstr "Følgd lenkje"
 msgid "Misspelled Words"
 msgstr "Feilstava ord"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Ny melding"
@@ -1916,8 +1940,8 @@ msgstr "Trådar i utgangspunktet lukka"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Opna trådar med nye, ulesne eller viktige &meldingar, samt overvaka trådar"
 
@@ -1927,66 +1951,51 @@ msgstr "Datovising"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Du kan bruka følgjande uttrykk for datoar:</strong></p> "
-"<ul> "
-"<li>d: datoen som tal utan innleiande null (1-31)</li> "
-"<li>dd: datoen som tal med innleiande null (01-31)</li> "
-"<li>ddd: forkorta namn på dagen (må.–su.)</li> "
-"<li>dddd: fullt namn på dagen (måndag–sundag)</li> "
-"<li>M: månaden som tal utan innleiande null (1–12)</li> "
-"<li> MM: månaden som tal med innleiande null (01–12)</li> "
-"<li>MMM: forkorta namn på månaden (jan.–des.)</li> "
-"<li> MMMM: fullt namn på månaden (januar–desember)</li> "
-"<li>yy: årstalet med to siffer (00–99)</li> "
-"<li>yyyy: årstalet med fire siffer (0000–9999)</li></ul> "
-"<p><strong>Desse uttrykka kan brukast for klokkeslett:</string></p> "
-"<ul> "
-"<li>h: timane utan innleiande null (0–23)</li>"
-"<li>hh: timane med innleiande null (00–23)</li>"
-"<li>m: minutta utan innleiande null (0–59)</li> "
-"<li>mm: minutta med innleiande null (00–59)</li> "
-"<li>s: sekunda utan innleiande null (0–59)</li> "
-"<li>ss: sekunda med innleiande null (00–59)</li> "
-"<li>z: millisekunda utan innleiande nullar (0–999)</li> "
-"<li>zzz: millisekunda med innleiande nullar (000–999)</li> "
-"<li>AP: 12-timars format. AP vert bytt ut med anten «a.m.» eller «p.m.».</li> "
-"<li>Z: tidssone i numerisk format (-0500)</li> </ul></ul>"
-"<p><strong>Alle andre teikn vert ignorerte.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Du kan bruka følgjande uttrykk for datoar:</strong></p> <ul> "
+"<li>d: datoen som tal utan innleiande null (1-31)</li> <li>dd: datoen som "
+"tal med innleiande null (01-31)</li> <li>ddd: forkorta namn på dagen (må.–"
+"su.)</li> <li>dddd: fullt namn på dagen (måndag–sundag)</li> <li>M: månaden "
+"som tal utan innleiande null (1–12)</li> <li> MM: månaden som tal med "
+"innleiande null (01–12)</li> <li>MMM: forkorta namn på månaden (jan.–des.)</"
+"li> <li> MMMM: fullt namn på månaden (januar–desember)</li> <li>yy: årstalet "
+"med to siffer (00–99)</li> <li>yyyy: årstalet med fire siffer (0000–9999)</"
+"li></ul> <p><strong>Desse uttrykka kan brukast for klokkeslett:</string></p> "
+"<ul> <li>h: timane utan innleiande null (0–23)</li><li>hh: timane med "
+"innleiande null (00–23)</li><li>m: minutta utan innleiande null (0–59)</li> "
+"<li>mm: minutta med innleiande null (00–59)</li> <li>s: sekunda utan "
+"innleiande null (0–59)</li> <li>ss: sekunda med innleiande null (00–59)</li> "
+"<li>z: millisekunda utan innleiande nullar (0–999)</li> <li>zzz: "
+"millisekunda med innleiande nullar (000–999)</li> <li>AP: 12-timars format. "
+"AP vert bytt ut med anten «a.m.» eller «p.m.».</li> <li>Z: tidssone i "
+"numerisk format (-0500)</li> </ul></ul><p><strong>Alle andre teikn vert "
+"ignorerte.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Endring av dei globale trådinnstillingane vil overstyra alle dei lokale "
 "mappeinnstillingane."
@@ -2003,8 +2012,7 @@ msgstr "Vis HTML-&statuslinje"
 msgid "Show s&pam status in fancy headers"
 msgstr "Vis &søppelpoststatus i stilige meldingshovud"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Vis fjesingar som ikon"
@@ -2013,8 +2021,7 @@ msgstr "Vis fjesingar som ikon"
 msgid "Use smaller font for quoted text"
 msgstr "Bruk mindre skrift for sitert tekst"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Vis merke for samanfalding/utviding av sitert tekst"
@@ -2040,8 +2047,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Overstyr teiknkoding:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Slå på ikon i systemtrauet"
@@ -2144,22 +2150,18 @@ msgstr "<b>%f</b> vert bytt ut med namnet på fila du vil redigera."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Desse symbola er støtta i svartekstane:"
-"<br><b>%D</b>: dato, <b>%S</b>: emne,"
-"<br><b>%e</b>: adressa til avsendaren, <b>%F</b>: namnet på avsendaren, <b>"
-"%f</b>: førebokstavane til avsendaren,"
-"<br><b>%T</b>: namnet på mottakaren, <b>%t</b>: namnet og adressa til "
-"mottakaren,"
-"<br><b>%C</b>: namn på mottakarar av kopi, <b>%c</b>"
-": namn og adresser til mottakarar av kopi,"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Desse symbola er støtta i svartekstane:<br><b>%D</b>: dato, <b>%S</b>: "
+"emne,<br><b>%e</b>: adressa til avsendaren, <b>%F</b>: namnet på avsendaren, "
+"<b>%f</b>: førebokstavane til avsendaren,<br><b>%T</b>: namnet på "
+"mottakaren, <b>%t</b>: namnet og adressa til mottakaren,<br><b>%C</b>: namn "
+"på mottakarar av kopi, <b>%c</b>: namn og adresser til mottakarar av kopi,"
 "<br><b>%%</b>: prosentteikn, <b>%_</b>: mellomrom, <b>%L</b>: linjeskift</qt>"
 
 #: configuredialog.cpp:2943
@@ -2183,21 +2185,20 @@ msgstr "Sva&r til alle:"
 msgid "&Forward:"
 msgstr "Send &vidare:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Siteringsteikn:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D skreiv du:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D skreiv %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
@@ -2235,8 +2236,8 @@ msgstr "Skriv inn nytt vidaresendingsprefiks:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "For kvar e-post som vert sendt, vert denne lista gått gjennom, frå øvst til "
 "nedst, på jakt etter ei teiknkoding som inneheld alle teikna som trengst."
@@ -2273,10 +2274,9 @@ msgstr "Verdi"
 msgid "Ne&w"
 msgstr "N&y"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Namn:"
@@ -2285,19 +2285,18 @@ msgstr "&Namn:"
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Bruk vedleggsnamngjeving som er kompatibel med Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Slå på dette valet for å få Outlook™ til å forstå namn på vedlegg med "
-"ikkje-engelske teikn."
+"Slå på dette valet for å få Outlook™ til å forstå namn på vedlegg med ikkje-"
+"engelske teikn."
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2323,20 +2322,20 @@ msgstr "legg ved"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Du har valt å bruka ein metode for koding av ikkje-engelske teikn i namn til "
-"vedlegg som vert forstått av Outlook™ og andre e-postklienter som ikkje støttar "
-"korrekt koding av namn på vedlegg.\n"
+"vedlegg som vert forstått av Outlook™ og andre e-postklienter som ikkje "
+"støttar korrekt koding av namn på vedlegg.\n"
 "Merk at KMail då kan laga ikkje-standard meldingar, og det er då mogleg at "
-"meldinga ikkje vert forstått av e-postklientar som følgjer standarden. Du bør "
-"derfor berre slå på dette viss du ikke har noko anna val."
+"meldinga ikkje vert forstått av e-postklientar som følgjer standarden. Du "
+"bør derfor berre slå på dette viss du ikke har noko anna val."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2360,113 +2359,97 @@ msgstr "&Krypteringsbakstykke"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>E-post kan nokre gongar koma i begge format. Med dette valet kan du styra om "
-"HTML-delen eller tekstdelen av meldinga skal visast.</p>"
-"<p>Dersom du viser HTML-delen, kan meldinga sjå betre ut, men samtidig aukar du "
-"risikoen for utnytting av tryggleikshol.</p>"
-"<p>Ved å visa meldinga i tekstformat mistar du ein del av formateringa, men "
-"gjer det nesten <em>uråd</em> å utnytta tryggleikshol i HTML-visaren "
-"(Konqueror).</p>"
-"<p>Valet nedanfor sikrar deg mot eitt vanleg misbruk av HTML-e-post. Det kan "
-"likevel finnast andre sårbare område som ikkje var kjende då denne versjonen av "
-"KMail vart laga.</p>"
-"<p>Du bør difor <em>ikkje</em> føretrekkja HTML føre rein tekst.</p>"
-"<p><b>Merk:</b> Du kan velja denne innstillinga for enkelte mapper gjennom <i>"
-"Mappe</i>-menyen i hovudvindauget til KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>E-post kan nokre gongar koma i begge format. Med dette valet kan du "
+"styra om HTML-delen eller tekstdelen av meldinga skal visast.</p><p>Dersom "
+"du viser HTML-delen, kan meldinga sjå betre ut, men samtidig aukar du "
+"risikoen for utnytting av tryggleikshol.</p><p>Ved å visa meldinga i "
+"tekstformat mistar du ein del av formateringa, men gjer det nesten <em>uråd</"
+"em> å utnytta tryggleikshol i HTML-visaren (Konqueror).</p><p>Valet nedanfor "
+"sikrar deg mot eitt vanleg misbruk av HTML-e-post. Det kan likevel finnast "
+"andre sårbare område som ikkje var kjende då denne versjonen av KMail vart "
+"laga.</p><p>Du bør difor <em>ikkje</em> føretrekkja HTML føre rein tekst.</"
+"p><p><b>Merk:</b> Du kan velja denne innstillinga for enkelte mapper gjennom "
+"<i>Mappe</i>-menyen i hovudvindauget til KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Enkelte e-postreklamar er i HTML og inneheld referansar til mellom anna "
-"bilete. Desse referansane kan utnyttast til å finna ut at du har lese "
-"e-posten.</p>"
-"<p>Det er ingen grunn til å lasta ned bilete på denne måten, sidan avsendaren "
-"alltid kan leggja bileta ved e-posten.</p>"
-"<p>For å sikra deg mot slikt misbruk av HTML-visinga, er denne funksjonen <em>"
-"av</em> i utgangspunktet.</p>"
-"<p>Dersom du likevel vil visa bilete i HTML-e-post utan at bileta er lagde ved, "
-"kan du slå funksjonen på. Du bør vera klar over kva for problem det kan føra "
-"til.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Enkelte e-postreklamar er i HTML og inneheld referansar til mellom "
+"anna bilete. Desse referansane kan utnyttast til å finna ut at du har lese e-"
+"posten.</p><p>Det er ingen grunn til å lasta ned bilete på denne måten, "
+"sidan avsendaren alltid kan leggja bileta ved e-posten.</p><p>For å sikra "
+"deg mot slikt misbruk av HTML-visinga, er denne funksjonen <em>av</em> i "
+"utgangspunktet.</p><p>Dersom du likevel vil visa bilete i HTML-e-post utan "
+"at bileta er lagde ved, kan du slå funksjonen på. Du bør vera klar over kva "
+"for problem det kan føra til.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Handtering av forespørslar om meldingskvittering</h3>"
-"<p>Meldingskvittering vert på engelsk forkorta <b></b>"
-"MDN (Message Disposition Notification). Forfattaren av meldinga ber om ei "
-"tilbakemelding på e-posten han sender. Mottakaren sitt e-postprogram sender eit "
-"svar som fortel forfattaren kva som hendte med meldinga. Vanlege "
-"tilbakemeldingar er <b>vist</b> (dvs. lest), <b>sletta</b> og <b>oversendt</b> "
-"(t.d. vidaresendt).</p>"
-"<p>Desse vala er tilgjengeleg for å kontrollera sending av meldingskvitteringar "
-"i KMail:</p>"
-"<ul>"
-"<li><em>Ignorer</em>: Ignorerer alle forespørslar om meldingskvitteringar. "
-"Ingen kvitteringar vil bli sendt automatisk (tilrådd).</li>"
-"<li><em>Spør</em>: Sender meldingskvittering berre etter at brukaren er spurt "
-"om det. På denne måten kan du senda kvitteringar for enkelte meldingar, medan "
-"du avviser eller ignorerer andre.</li>"
-"<li><em>Avvis</em>: Sender alltid ei <b>avvist</b>-kvittering. Dette er berre "
-"<em>litt</em> betre enn å alltid senda kvitteringar. Forfattaren vil framleis "
-"vita at meldingane er handsama. Han kan berre ikkje vita om ho er sletta eller "
-"lest osv.</li>"
-"<li><em>Send alltid</em>: Sender alltid kvittering når det blir førespurt. "
-"Dette tyder at forfattaren av meldinga får vita når meldinga er blitt handsama, "
-"i tillegg kva som hendte med henne (vist, sletta osv.). Dette valet vert sterkt "
-"fråråda, men sidan det er ønskeleg for handtering av kundeforhold til dømes, så "
-"er det gjort tilgjengeleg.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Handtering av forespørslar om meldingskvittering</"
+"h3><p>Meldingskvittering vert på engelsk forkorta <b></b>MDN (Message "
+"Disposition Notification). Forfattaren av meldinga ber om ei tilbakemelding "
+"på e-posten han sender. Mottakaren sitt e-postprogram sender eit svar som "
+"fortel forfattaren kva som hendte med meldinga. Vanlege tilbakemeldingar er "
+"<b>vist</b> (dvs. lest), <b>sletta</b> og <b>oversendt</b> (t.d. "
+"vidaresendt).</p><p>Desse vala er tilgjengeleg for å kontrollera sending av "
+"meldingskvitteringar i KMail:</p><ul><li><em>Ignorer</em>: Ignorerer alle "
+"forespørslar om meldingskvitteringar. Ingen kvitteringar vil bli sendt "
+"automatisk (tilrådd).</li><li><em>Spør</em>: Sender meldingskvittering berre "
+"etter at brukaren er spurt om det. På denne måten kan du senda kvitteringar "
+"for enkelte meldingar, medan du avviser eller ignorerer andre.</"
+"li><li><em>Avvis</em>: Sender alltid ei <b>avvist</b>-kvittering. Dette er "
+"berre <em>litt</em> betre enn å alltid senda kvitteringar. Forfattaren vil "
+"framleis vita at meldingane er handsama. Han kan berre ikkje vita om ho er "
+"sletta eller lest osv.</li><li><em>Send alltid</em>: Sender alltid "
+"kvittering når det blir førespurt. Dette tyder at forfattaren av meldinga "
+"får vita når meldinga er blitt handsama, i tillegg kva som hendte med henne "
+"(vist, sletta osv.). Dette valet vert sterkt fråråda, men sidan det er "
+"ønskeleg for handtering av kundeforhold til dømes, så er det gjort "
+"tilgjengeleg.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2482,15 +2465,15 @@ msgstr "&Last eksterne referansar i e-postar frå Internett."
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ÅTVARING:</b> Bruk av HTML i e-post kan gjera det lettare for uvedkomande å "
-"utnytta tryggleikshol for å få tilgang til systemet. <a href=\"whatsthis:%1\">"
-"Meir om HTM i e-post …</a><a href=\"whatsthis:%2\">Meir om eksterne referansar "
-"…</a>"
+"<b>ÅTVARING:</b> Bruk av HTML i e-post kan gjera det lettare for uvedkomande "
+"å utnytta tryggleikshol for å få tilgang til systemet. <a href=\"whatsthis:"
+"%1\">Meir om HTM i e-post …</a><a href=\"whatsthis:%2\">Meir om eksterne "
+"referansar …</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2573,8 +2556,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Dette valet krev dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "ingen mellomtenar"
@@ -2603,8 +2585,8 @@ msgstr "&Ikkje la viktige meldingar gå ut på dato"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Ved leiting etter ulesne meldingar:"
 
@@ -2628,8 +2610,8 @@ msgstr "Gå rundt i alle mappene"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Når du opnar ei mappe:"
 
@@ -2698,28 +2680,24 @@ msgstr "Katalogar («maildir»-format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Vel kva for postboksformat som skal brukast som standardinnstillinga for "
-"lokale mapper:</p> "
-"<p><b>mbox:</b> Kvar e-postmappe i KMail vert representert som ei enkel fil. "
-"Meldingane i mappa vert skilde frå kvarandre med ei linje som startar med «From "
-"». Dette alternativet sparar litt diskplass, men kan vera mindre robust, særleg "
-"ved flytting av e-post mellom mapper.</p> "
-"<p><b>maildir:</b> E-postmappene i KMail vert representerte som verkelege "
-"mapper på disken. Kvar enkelt e-post har si fil. Dette alternativet tek ein del "
-"meir plass på disken, men er ofte meir robust, særleg ved flytting av e-post "
-"mellom mapper.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Vel kva for postboksformat som skal brukast som standardinnstillinga "
+"for lokale mapper:</p> <p><b>mbox:</b> Kvar e-postmappe i KMail vert "
+"representert som ei enkel fil. Meldingane i mappa vert skilde frå kvarandre "
+"med ei linje som startar med «From ». Dette alternativet sparar litt "
+"diskplass, men kan vera mindre robust, særleg ved flytting av e-post mellom "
+"mapper.</p> <p><b>maildir:</b> E-postmappene i KMail vert representerte som "
+"verkelege mapper på disken. Kvar enkelt e-post har si fil. Dette "
+"alternativet tek ein del meir plass på disken, men er ofte meir robust, "
+"særleg ved flytting av e-post mellom mapper.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2754,45 +2732,36 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Når du hoppar til neste ulesne melding, kan det henda at det ikkje finst "
-"fleire ulesne meldingar lenger nede.</p> "
-"<p><b>Ikkje gå rundt:</b> Søket vil stoppa ved den siste uleste meldinga i "
-"mappa.</p> "
-"<p><b>Gå rundt i gjeldande mappe: </b>Søket vil halda fram frå toppen av "
-"meldingslista, men ikkje gå til neste mappe.</p>"
-"<p><b>Gå rundt i alle mappene:</b> Søket vil halda fram frå toppen av "
-"meldingslista. Viss ingen uleste meldingar blir funne vil det halda fram i den "
-"neste mappa.</p> "
-"<p>Likeeins ved søk etter den førre uleste meldinga, vil søket starta frå "
-"botnen av meldingslista og halda fram med den førre mappa, avhengig av kva du "
-"har valt.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Når du hoppar til neste ulesne melding, kan det henda at det ikkje "
+"finst fleire ulesne meldingar lenger nede.</p> <p><b>Ikkje gå rundt:</b> "
+"Søket vil stoppa ved den siste uleste meldinga i mappa.</p> <p><b>Gå rundt i "
+"gjeldande mappe: </b>Søket vil halda fram frå toppen av meldingslista, men "
+"ikkje gå til neste mappe.</p><p><b>Gå rundt i alle mappene:</b> Søket vil "
+"halda fram frå toppen av meldingslista. Viss ingen uleste meldingar blir "
+"funne vil det halda fram i den neste mappa.</p> <p>Likeeins ved søk etter "
+"den førre uleste meldinga, vil søket starta frå botnen av meldingslista og "
+"halda fram med den førre mappa, avhengig av kva du har valt.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2860,8 +2829,8 @@ msgstr "&Gøym gruppevaremapper"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "Når dette er på vil du ikkje sjå IMAP-ressursmappene i mappetreet."
 
 #: configuredialog.cpp:4909
@@ -2872,8 +2841,8 @@ msgstr "Ressursmapper er i &kontoen:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "Når dette er på vil du ikkje sjå IMAP-ressursmappene i mappetreet."
 
 #: configuredialog.cpp:4921
@@ -2915,7 +2884,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Slå på dette valet for å få Outlook(tm) til å forstå dine svar på invitasjonar"
+"Slå på dette valet for å få Outlook(tm) til å forstå dine svar på "
+"invitasjonar"
 
 #: configuredialog.cpp:4963
 #, fuzzy
@@ -2930,19 +2900,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Bruk vedleggsnamngjeving som er kompatibel med Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatisk invitasjonssending"
@@ -2952,27 +2921,26 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Når dette er på, får ikkje brukaren sjå meldingsvindauget. Invitasjonsmeldingar "
-"vert sende ut automatisk."
+"Når dette er på, får ikkje brukaren sjå meldingsvindauget. "
+"Invitasjonsmeldingar vert sende ut automatisk."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Invitasjonar vert vanlegvis sendt som vedlegg til meldingar. Dette valet "
 "endrar på invitasjonsmeldingane slik at invitasjonane står i meldingsteksten "
 "istaden. Dette er nødvendig for å senda invitasjonar og svar til Microsoft "
-"Outlook."
-"<br>Men når du gjer dette vil du ikkje lenger få skildrande tekst som "
-"e-postprogram kan lesa. Så for folk som har e-postprogram som ikke forstår "
-"invitasjonen vil dei resulterande meldingane sjå veldig rare ut."
+"Outlook.<br>Men når du gjer dette vil du ikkje lenger få skildrande tekst "
+"som e-postprogram kan lesa. Så for folk som har e-postprogram som ikke "
+"forstår invitasjonen vil dei resulterande meldingane sjå veldig rare ut."
 "<br>Folk som har e-post program som forstår invitasjonar vil framleis kunne "
 "bruka dette.</qt>"
 
@@ -3082,17 +3050,16 @@ msgstr "Send &vidare"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3110,15 +3077,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3181,8 +3148,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Det finst alt ei distribusjonsliste med namnet <b>%1</b>"
-". Vel eit anna namn.</qt>"
+"<qt>Det finst alt ei distribusjonsliste med namnet <b>%1</b>. Vel eit anna "
+"namn.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3191,8 +3158,8 @@ msgstr "Rediger identitet"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3451,6 +3418,11 @@ msgstr "Vel mappe"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Merk all tekst"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3482,8 +3454,8 @@ msgstr "&Logg filteraktivitetar"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Du kan skru på og av logging av filteraktivitetar her. Logga data vert "
 "naturlegvis samla og vist berre dersom logging er slått på."
@@ -3502,10 +3474,11 @@ msgstr "Logg evaluering av filter&regel"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Du kan kontrollera tilbakemeldinga i loggen som har med evalueringa av "
 "filterreglane av påslegne filter. Har du dette valet slått på vil det gje "
@@ -3530,15 +3503,15 @@ msgstr "uendeleg"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Samling av loggdata brukar minnet til mellombels lagring av loggdata; her kan "
-"du avgrensa største mengde minne som kan brukast. Viss storleiken på dei samla "
-"loggdataa overstig avgrensninga vil det eldste bli fjerna inntil avgrensninga "
-"ikkje lenger er overstige."
+"Samling av loggdata brukar minnet til mellombels lagring av loggdata; her "
+"kan du avgrensa største mengde minne som kan brukast. Viss storleiken på dei "
+"samla loggdataa overstig avgrensninga vil det eldste bli fjerna inntil "
+"avgrensninga ikkje lenger er overstige."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3548,7 +3521,7 @@ msgstr ""
 "Klarte ikkje skriva fila %1:\n"
 "«%2» er den detaljerte feilskildringa."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail-feil"
@@ -3589,13 +3562,13 @@ msgstr "&Brukaridentifikator:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Brukaridentifikasjonen er brukaren sitt brukarnamn på IMAP-tenaren. Dette kan "
-"vera eit enkelt brukarnamn eller heile e-postadressa til brukaren; brukarnamnet "
-"for å logga inn på tenaren vil fortelje deg kva for det er."
+"Brukaridentifikasjonen er brukaren sitt brukarnamn på IMAP-tenaren. Dette "
+"kan vera eit enkelt brukarnamn eller heile e-postadressa til brukaren; "
+"brukarnamnet for å logga inn på tenaren vil fortelje deg kva for det er."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3646,8 +3619,8 @@ msgstr "Du har ikkje lese-/skriveløyve til papirkorgmappa."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "Informasjonen er ikkje motteken frå tenaren enno. Bruk «Sjekk e-post»."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3658,8 +3631,7 @@ msgstr "Feil: ingen IMAP-konto er fastsett for denne mappa"
 msgid "Connecting to server %1, please wait..."
 msgstr "Koplar til tenaren %1, vent litt …"
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Feil ved tilkopling til tenaren %1"
@@ -3687,8 +3659,8 @@ msgstr "Legg til løyver"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Vil du verkeleg fjerna dine eigne løyve for denne mappa? Du vil ikkje ha "
 "tilgang til henne etterpå."
@@ -3722,7 +3694,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokale mapper"
@@ -3747,12 +3719,12 @@ msgstr "Vel snøggtast for mappe"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Trykk på knappen nedanfor for å velja kva tast eller kombinasjon av tastar "
-"som skal knytast til denne mappa.</qt>"
+"<qt>Trykk på knappen nedanfor for å velja kva tast eller kombinasjon av "
+"tastar som skal knytast til denne mappa.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3772,12 +3744,21 @@ msgstr "&Avbryt"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Mappa du sletta høyrde til kontoen <b>%1</b> som leverte e-post til henne. "
-"Kontoen vil frå no av levera e-post til innboksen.</qt>"
+"<qt>Mappa du sletta høyrde til kontoen <b>%1</b> som leverte e-post til "
+"henne. Kontoen vil frå no av levera e-post til innboksen.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3903,58 +3884,16 @@ msgstr "Søppelpost-status:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<b><br>H<br>T<br>M<br>L<br>-<br>m<br>e<br>l<br>d<br>i<br>n<br>g</b>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>I"
-"<br>n"
-"<br>g"
-"<br>a"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>-"
-"<br>m"
-"<br>e"
-"<br>l"
-"<br>d"
-"<br>i"
-"<br>n"
-"<br>g</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>I<br>n<br>g<br>a<br> <br>H<br>T<br>M<br>L<br>-"
+"<br>m<br>e<br>l<br>d<br>i<br>n<br>g</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3966,19 +3905,14 @@ msgstr "Namnet &ditt:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Namnet ditt</h3>"
-"<p>Dette feltet skal innehalde namnet ditt, slik som du vil at det skal visast "
-"i meldingshovudet som vert sendt ut.</p>"
-"<p>Viss du lar dette feltet stå tomt, vil ikkje namnet ditt koma fram, berre "
-"e-postadressa di.</p></qt>"
+"<qt><h3>Namnet ditt</h3><p>Dette feltet skal innehalde namnet ditt, slik som "
+"du vil at det skal visast i meldingshovudet som vert sendt ut.</p><p>Viss du "
+"lar dette feltet stå tomt, vil ikkje namnet ditt koma fram, berre e-"
+"postadressa di.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3986,17 +3920,13 @@ msgstr "Organisas&jon:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisasjon</h3>"
-"<p>Dette feltet skal ha namnet på organisasjonen din viss du vil visa det i "
-"meldingshovudet som vert sendt ut.</p>"
-"<p>Det er greit (og ganske vanleg) å la dette feltet stå tomt.</p></qt>"
+"<qt><h3>Organisasjon</h3><p>Dette feltet skal ha namnet på organisasjonen "
+"din viss du vil visa det i meldingshovudet som vert sendt ut.</p><p>Det er "
+"greit (og ganske vanleg) å la dette feltet stå tomt.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4005,20 +3935,15 @@ msgstr "&E-postadresse:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-postadresse</h3>"
-"<p>Dette feltet skal innehalda den fulle e-postadressa di.</p>"
-"<p>Viss dette feltet er tomt, eller adressa er feil, vil folk kunne ha problem "
-"med å svara på meldingane dine.</p></qt>"
+"<qt><h3>E-postadresse</h3><p>Dette feltet skal innehalda den fulle e-"
+"postadressa di.</p><p>Viss dette feltet er tomt, eller adressa er feil, vil "
+"folk kunne ha problem med å svara på meldingane dine.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4027,21 +3952,12 @@ msgstr "&E-postadresse:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4061,25 +3977,22 @@ msgstr "OpenPGP-signaturnøkkelen din"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Vel kva for OpenPGP-nøkkel som skal brukast for å digitalt signera meldingane "
-"dine."
+"Vel kva for OpenPGP-nøkkel som skal brukast for å digitalt signera "
+"meldingane dine."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Den OpenPGP-nøkkelen du vel her vil bli bruka til å digitalt signera "
-"meldingar. Du kan også bruka GnuPGP-nøklar.</p>"
-"<p>Du kan la dette stå tomt, men KMail vil ikkje vera i stand til å signera "
-"e-postane dine digitalt ved bruk av OpenPGP. Vanlege e-postfunksjonar vil ikkje "
-"bli rørt.</p> "
-"<p>Du kan finna ut meir om nøklar på <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Den OpenPGP-nøkkelen du vel her vil bli bruka til å digitalt signera "
+"meldingar. Du kan også bruka GnuPGP-nøklar.</p><p>Du kan la dette stå tomt, "
+"men KMail vil ikkje vera i stand til å signera e-postane dine digitalt ved "
+"bruk av OpenPGP. Vanlege e-postfunksjonar vil ikkje bli rørt.</p> <p>Du kan "
+"finna ut meir om nøklar på <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4091,32 +4004,29 @@ msgstr "OpenPGP-krypteringsnøkkelen din"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Vel kva for OpenPGP-nøkkel som skal brukast for å kryptera meldingar til deg "
-"sjølv og for funksjonen «Legg ved min offentlege nøkkel» i «Ny "
-"melding»-vindauget."
+"sjølv og for funksjonen «Legg ved min offentlege nøkkel» i «Ny melding»-"
+"vindauget."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Den OpenPGP-nøkkelen du vel her vil bli bruka til å kryptera meldingar til "
-"deg sjølv og for funksjonen «Legg ved min offentlege nøkkel» i «Ny "
-"melding»-vindauget. Du kan også bruka GnuPGP-nøklar.</p>"
-"<p>Du kan la dette stå tomt, men KMail vil ikkje vera i stand til å kryptera "
-"kopiar av utgåande e-postar til deg sjølv ved hjelp av OpenPGP. Vanlege "
-"e-postfunksjonar vil ikkje bli rørt.</p> "
-"<p>Du kan finna ut meir om nøklar på <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Den OpenPGP-nøkkelen du vel her vil bli bruka til å kryptera "
+"meldingar til deg sjølv og for funksjonen «Legg ved min offentlege nøkkel» i "
+"«Ny melding»-vindauget. Du kan også bruka GnuPGP-nøklar.</p><p>Du kan la "
+"dette stå tomt, men KMail vil ikkje vera i stand til å kryptera kopiar av "
+"utgåande e-postar til deg sjølv ved hjelp av OpenPGP. Vanlege e-"
+"postfunksjonar vil ikkje bli rørt.</p> <p>Du kan finna ut meir om nøklar på "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4135,17 +4045,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Det S/MIME (X.509)-sertifikatet du vel her vil bli bruka til å digitalt "
-"signera meldingar. Du kan også bruka GnuPGP-nøklar.</p>"
-"<p>Du kan la dette stå tomt, men KMail vil ikkje vera i stand til å signera "
-"e-postane dine digitalt. Vanlege e-postfunksjonar vil ikkje bli rørt.</p></qt>"
+"<qt><p>Det S/MIME (X.509)-sertifikatet du vel her vil bli bruka til å "
+"digitalt signera meldingar. Du kan også bruka GnuPGP-nøklar.</p><p>Du kan la "
+"dette stå tomt, men KMail vil ikkje vera i stand til å signera e-postane "
+"dine digitalt. Vanlege e-postfunksjonar vil ikkje bli rørt.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4157,28 +4065,25 @@ msgstr "S/MIME-krypteringssertifikatet ditt"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Vel S/MIME-sertifikatet som skal bli bruka for kryptering til deg sjølv og til "
-"funksjonen «Legg ved sertifikatet mitt» i «Ny melding»-vindauget."
+"Vel S/MIME-sertifikatet som skal bli bruka for kryptering til deg sjølv og "
+"til funksjonen «Legg ved sertifikatet mitt» i «Ny melding»-vindauget."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Det S/MIME-sertifikatet du vel her vil bli bruka til å kryptera meldingar "
-"til deg sjølv og til funkjsonen «Legg ved sertifikatet mitt» i «Ny "
-"melding»-vindauget.</p>"
-"<p>Du kan la dette stå tomt, men KMail vil ikkje vera i stand til å kryptera "
-"kopiar av utgåande meldingar til deg sjølv ved hjelp av S/MIME. Vanlege "
-"e-postfunksjonar vil ikkje bli rørt.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Det S/MIME-sertifikatet du vel her vil bli bruka til å kryptera "
+"meldingar til deg sjølv og til funkjsonen «Legg ved sertifikatet mitt» i «Ny "
+"melding»-vindauget.</p><p>Du kan la dette stå tomt, men KMail vil ikkje vera "
+"i stand til å kryptera kopiar av utgåande meldingar til deg sjølv ved hjelp "
+"av S/MIME. Vanlege e-postfunksjonar vil ikkje bli rørt.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4198,24 +4103,19 @@ msgstr "&Svaradresse:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Svaradresse</h3>"
-"<p>Dette set <tt>Svaradresse:</tt>-feltet i meldingshovudet til ei anna adresse "
-"enn <tt>Frå:</tt>-adressa.</p>"
-"<p>Dette kan vera nyttig når du har ei gruppe menneske som jobbar saman i "
-"liknande roller. Det kan til dømes vera du vil at e-postar du sender ut skal ha "
-"di e-postadresse i <tt>Frå:</tt>-feltet, men alle svar skal gå til ei "
-"gruppeadresse.</p>"
-"<p>Om du er i tvil, så la dette feltet stå tomt.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Svaradresse</h3><p>Dette set <tt>Svaradresse:</tt>-feltet i "
+"meldingshovudet til ei anna adresse enn <tt>Frå:</tt>-adressa.</p><p>Dette "
+"kan vera nyttig når du har ei gruppe menneske som jobbar saman i liknande "
+"roller. Det kan til dømes vera du vil at e-postar du sender ut skal ha di e-"
+"postadresse i <tt>Frå:</tt>-feltet, men alle svar skal gå til ei "
+"gruppeadresse.</p><p>Om du er i tvil, så la dette feltet stå tomt.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4223,25 +4123,19 @@ msgstr "&Blindkopiadresser:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC-adresser (blindkopi)</h3> "
-"<p>Adressene du skriv her vert lagde til kvar einaste e-post som vert sendt med "
-"denne identiteten. Dei vil ikkje vera synlege for andre mottakarar.</p> "
-"<p>Denne funksjonen kan brukast til å senda kopiar av e-postane til ein annan "
-"av dine kontoar.</p> "
-"<p>For å skriva inn meir enn ei adresse, bruk komma for å skilje "
-"blindkopimottakarane.</p>"
-"<p>La dette feltet stå tomt om du er i tvil.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC-adresser (blindkopi)</h3> <p>Adressene du skriv her vert lagde "
+"til kvar einaste e-post som vert sendt med denne identiteten. Dei vil ikkje "
+"vera synlege for andre mottakarar.</p> <p>Denne funksjonen kan brukast til å "
+"senda kopiar av e-postane til ein annan av dine kontoar.</p> <p>For å skriva "
+"inn meir enn ei adresse, bruk komma for å skilje blindkopimottakarane.</"
+"p><p>La dette feltet stå tomt om du er i tvil.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4281,7 +4175,7 @@ msgstr "&Signatur"
 msgid "&Picture"
 msgstr "&Bilete"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ugyldig e-postadresse"
 
@@ -4297,15 +4191,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Ein av OpenPGP-nøklane som er sett opp inneheld ikkje nokon brukar-ID med dei "
-"oppsette e-postadressene for denne identiteten (%1).\n"
-"Dette kan føre til åtvaringar når mottakaren prøver å stadfesta signaturar som "
-"er laga med dette oppsettet."
+"Ein av OpenPGP-nøklane som er sett opp inneheld ikkje nokon brukar-ID med "
+"dei oppsette e-postadressene for denne identiteten (%1).\n"
+"Dette kan føre til åtvaringar når mottakaren prøver å stadfesta signaturar "
+"som er laga med dette oppsettet."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Ein av OpenPGP-krypteringsnøklane som er sett opp inneheld ikkje nokon "
 "brukar-ID med den oppsette e-postadressa for denne identiteten (%1)."
@@ -4317,10 +4211,10 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Ein av S/MIME-signeringssertifikata som er sett opp inneheld ikkje den oppsette "
-"e-postadressa for denne identiteten (%1).\n"
-"Dette kan føra til åtvaringar når mottakaren prøver å stadfesta signaturar laga "
-"med dette oppsettet."
+"Ein av S/MIME-signeringssertifikata som er sett opp inneheld ikkje den "
+"oppsette e-postadressa for denne identiteten (%1).\n"
+"Dette kan føra til åtvaringar når mottakaren prøver å stadfesta signaturar "
+"laga med dette oppsettet."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4347,16 +4241,16 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"Den sjølvvalde mappa for sendt e-post til identiteten «%1» finst ikkje lenger. "
-"Difor vert standardmappa for sendt e-post bruka."
+"Den sjølvvalde mappa for sendt e-post til identiteten «%1» finst ikkje "
+"lenger. Difor vert standardmappa for sendt e-post bruka."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Den sjølvvalde kladdemappa til identiteten «%1» finst ikkje lenger. Difor vert "
-"standardmappa for kladdemeldingar bruka."
+"Den sjølvvalde kladdemappa til identiteten «%1» finst ikkje lenger. Difor "
+"vert standardmappa for kladdemeldingar bruka."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4364,13 +4258,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Den sjølvvalde kladdemappa til identiteten «%1» finst ikkje lenger. Difor vert "
-"standardmappa for kladdemeldingar bruka."
+"Den sjølvvalde kladdemappa til identiteten «%1» finst ikkje lenger. Difor "
+"vert standardmappa for kladdemeldingar bruka."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (standard)"
 
@@ -4414,24 +4308,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail har oppdaga ei prefiksoppføring i oppsettet av kontoen «%1» som du ikkje "
-"treng lenger med IMAP-navneromsstøtte."
+"KMail har oppdaga ei prefiksoppføring i oppsettet av kontoen «%1» som du "
+"ikkje treng lenger med IMAP-navneromsstøtte."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Innstillingane vart automatisk overførde, men du bør sjekka kontoinnstillingane "
-"dine."
+"Innstillingane vart automatisk overførde, men du bør sjekka "
+"kontoinnstillingane dine."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Det var ikkje mogleg å overføra innstillingane dine automatisk. Du bør sjekka "
-"kontoinnstillingane dine."
+"Det var ikkje mogleg å overføra innstillingane dine automatisk. Du bør "
+"sjekka kontoinnstillingane dine."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4470,17 +4364,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Feil: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Sambandet til tenaren %1 vart avbrote uventa eller fordi det tok for lang tid. "
-"Det vil bli gjenoppretta automatisk dersom det går."
+"Sambandet til tenaren %1 vart avbrote uventa eller fordi det tok for lang "
+"tid. Det vil bli gjenoppretta automatisk dersom det går."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4629,14 +4528,14 @@ msgstr "Listearkiv"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4665,228 +4564,182 @@ msgstr "Ubrukelege krypteringsnøklar"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enne %n dagar.</p>"
+"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enne %n dagar.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enne %n dagar.</p>"
+"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enne %n dagar.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enne %n dagar.</p>"
+"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</"
+"p><p>går ut om mindre enne %n dagar.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn ein dag.</p>\n"
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre enn ein dag.</p>\n"
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre enn ein dag.</p>\n"
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4900,217 +4753,171 @@ msgstr "S/MIME-sertifikat går ut på dato snart"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enne %n dagar.</p>"
+"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>OpenPGP-signeringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enne %n dagar.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> "
-"(Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enne %n dagar.</p>"
+"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>OpenPGP-krypteringsnøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x"
+"%2)</p><p>går ut om mindre enne %n dagar.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</p>"
-"<p>går ut om mindre enne %n dagar.</p>"
+"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>OpenPGP-nøkkelen din</p><p align=center><b>%1</b> (Nøkkel-ID 0x%2)</"
+"p><p>går ut om mindre enne %n dagar.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotsertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Rotsertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"signeringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>Rotsertifikatet ditt</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"krypteringssertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>CA-sertifikatet</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn ein dag.</p>\n"
+"<p>CA-sertifikatet</p><p align=center><b>%3</b></p><p>for S/MIME-"
+"sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre enn ein dag.</p>\n"
 "<p>S/MIME-signeringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre enn ein dag.</p>\n"
 "<p>S/MIME-krypteringssertifikatet ditt</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre enn ein dag.</p>\n"
-"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre enn %n dagar.</p>"
+"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn ein dag.</p>\n"
+"<p>S/MIME-sertifikatet ditt</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre enn %n dagar.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5122,14 +4929,15 @@ msgstr "S/MIME-sertifikat går ut på dato snart"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Ein eller fleire av dei oppsette OpenPGP-krypteringsnøklane eller "
-"S/MIME-sertifikata dine er ikkje brukande til kryptering. Set opp desse "
+"Ein eller fleire av dei oppsette OpenPGP-krypteringsnøklane eller S/MIME-"
+"sertifikata dine er ikkje brukande til kryptering. Set opp desse "
 "krypteringsnøklane og sertifikata på nytt for denne identiteten i "
 "oppsettsdialogen for identitet.\n"
 "Viss du held fram, og nøklane trengst seinare, vil du bli spurt om kva for "
@@ -5147,10 +4955,9 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Ein eller fleire av dei oppsette OpenPGP-signeringsnøklane eller "
-"S/MIME-signeringssertifikata dine kan ikkje brukast til signering. Set opp "
-"desse signeringsnøklane og sertifikata på nytt i oppsettsdialogen for "
-"identitet.\n"
+"Ein eller fleire av dei oppsette OpenPGP-signeringsnøklane eller S/MIME-"
+"signeringssertifikata dine kan ikkje brukast til signering. Set opp desse "
+"signeringsnøklane og sertifikata på nytt i oppsettsdialogen for identitet.\n"
 "Viss du held fram, og nøklane trengst seinare, vil du bli spurt om kva for "
 "nøklar som skal brukast."
 
@@ -5162,45 +4969,45 @@ msgstr "Ubrukelege signeringsnøklar"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Undersøkjing av mottakarane sine krypteringsinnstillingar viste at meldinga bør "
-"krypterast ved bruk av OpenPGP, i alle fall for nokre av mottakarane.\n"
+"Undersøkjing av mottakarane sine krypteringsinnstillingar viste at meldinga "
+"bør krypterast ved bruk av OpenPGP, i alle fall for nokre av mottakarane.\n"
 "Men du har ikkje sett opp nokon gyldig og tiltrudd OpenPGP-krypteringsnøkkel "
 "for denne identiteten.\n"
-"Du kan halda fram utan å kryptera til deg sjølv, men ver klar over at du ikkje "
-"vil vera i stand til å lesa dine eigne meldingar viss du gjer det."
+"Du kan halda fram utan å kryptera til deg sjølv, men ver klar over at du "
+"ikkje vil vera i stand til å lesa dine eigne meldingar viss du gjer det."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Undersøkjing av mottakarane sine krypteringsinnstillingar viste at meldinga bør "
-"krypterast ved bruk av S/MIME, i alle fall for nokon av mottakarane.\n"
-"Men du har ikkje sett opp nokon gyldig og tiltrudd S/MIME-krypteringssertifikat "
-"for denne identiteten.\n"
-"Du kan halda fram utan å kryptera til deg sjølv, men ver klar over at du ikkje "
-"vil vera i stand til å lesa dine eigne meldingar viss du gjer det."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Undersøkjing av mottakarane sine krypteringsinnstillingar viste at meldinga "
+"bør krypterast ved bruk av S/MIME, i alle fall for nokon av mottakarane.\n"
+"Men du har ikkje sett opp nokon gyldig og tiltrudd S/MIME-"
+"krypteringssertifikat for denne identiteten.\n"
+"Du kan halda fram utan å kryptera til deg sjølv, men ver klar over at du "
+"ikkje vil vera i stand til å lesa dine eigne meldingar viss du gjer det."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Undersøkjing av mottakarane sine signeringsinnstillingar viste at meldinga bør "
-"signerast ved bruk av OpenPGP, i alle fall for nokon av mottakarane.\n"
-"Men du har ikkje sett opp nokon gyldig og tiltrudd OpenPGP-signeringsnøkkel for "
-"denne identiteten."
+"Undersøkjing av mottakarane sine signeringsinnstillingar viste at meldinga "
+"bør signerast ved bruk av OpenPGP, i alle fall for nokon av mottakarane.\n"
+"Men du har ikkje sett opp nokon gyldig og tiltrudd OpenPGP-signeringsnøkkel "
+"for denne identiteten."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5208,15 +5015,15 @@ msgstr "Ikkje signer med OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Undersøkjing av mottakarane sine signeringsinnstillingar viste at meldinga bør "
-"signerast ved bruk av S/MIME, i alle fall for nokon av mottakarane.\n"
-"Men du har ikkje sett opp nokon gyldig og tiltrudd S/MIME-signeringssertifikat "
-"for denne identiteten."
+"Undersøkjing av mottakarane sine signeringsinnstillingar viste at meldinga "
+"bør signerast ved bruk av S/MIME, i alle fall for nokon av mottakarane.\n"
+"Men du har ikkje sett opp nokon gyldig og tiltrudd S/MIME-"
+"signeringssertifikat for denne identiteten."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5228,8 +5035,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"Undersøkjing av mottakaren sine innstillingar for signering viser at de ikkje "
-"har nokon signaturtype felles.\n"
+"Undersøkjing av mottakaren sine innstillingar for signering viser at de "
+"ikkje har nokon signaturtype felles.\n"
 "Skal meldinga sendast utan signering?"
 
 #: keyresolver.cpp:1335
@@ -5238,12 +5045,12 @@ msgstr "Signering er ikkje mogleg"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Du valde ikkje nokon krypteringsnøkkel for deg sjølv (krypter til seg sjølv). "
-"Du vil ikkje vera i stand til å dekryptera dine eigne meldingar viss du "
-"krypterer dei."
+"Du valde ikkje nokon krypteringsnøkkel for deg sjølv (krypter til seg "
+"sjølv). Du vil ikkje vera i stand til å dekryptera dine eigne meldingar viss "
+"du krypterer dei."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5259,16 +5066,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Du har ikkje valt krypteringsnøkkel for mottakaren av denne meldinga. Meldinga "
-"vil difor ikkje bli kryptert."
+"Du har ikkje valt krypteringsnøkkel for mottakaren av denne meldinga. "
+"Meldinga vil difor ikkje bli kryptert."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Du har ikkje valt krypteringsnøkkel for nokon av mottakaren av denne meldinga. "
-"Meldinga vil difor ikkje bli kryptert."
+"Du har ikkje valt krypteringsnøkkel for nokon av mottakaren av denne "
+"meldinga. Meldinga vil difor ikkje bli kryptert."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5314,11 +5121,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Ingen gyldige og tiltrudde krytperingsnøklar blei funne for «%1».\n"
 "\n"
@@ -5367,10 +5174,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritisk feil: Klarte ikkje henta e-post: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Klarte ikkje leggja til melding:\n"
+msgid "Failed to add message:\n"
+msgstr "Klarte ikkje leggja til melding:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5460,6 +5265,50 @@ msgstr "&Fråkopla IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-postboks"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Vel emne for meldinga"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Send kopi til «adresse»"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Send blindkopi til «adresse»"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Legg «meldingshovud» til melding"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Les meldingskropp frå «fil»"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Vel meldingskropp"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Legg vedlegg til e-posten. Kan gjerast fleire gonger"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Berre sjekk for ny e-post"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Berre opna redigeringsvindauge"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Vis den oppgjevne meldingsfila"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Send melding til «adresse» høvesvis legg ved fila URL-en peikar mot"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "E-post"
@@ -5503,8 +5352,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail vil no laga dei nødvendige mappene for IMAP-ressursen som undermapper av "
-"%1. Viss du ikkje vil dette, avbryt, og IMAP-ressursen vil bli slått av"
+"KMail vil no laga dei nødvendige mappene for IMAP-ressursen som undermapper "
+"av %1. Viss du ikkje vil dette, avbryt, og IMAP-ressursen vil bli slått av"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5516,13 +5365,13 @@ msgstr "%1: Fann mappa %2. Ho vert bruka som hovudmappe til gruppevare."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail fann dei følgjande gruppevaremappene i %1 og må utføra dei følgjande "
-"operasjonane: %2"
-"<br>Viss du ikkje vil dette, avbryt, og IMAP-ressursen vil bli slått av"
+"<qt>KMail fann dei følgjande gruppevaremappene i %1 og må utføra dei "
+"følgjande operasjonane: %2<br>Viss du ikkje vil dette, avbryt, og IMAP-"
+"ressursen vil bli slått av"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5571,11 +5420,11 @@ msgstr "URL kopiert til utklippstavla."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Fila <b>%1</b> finst.<br>Vil du byta henne ut?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Lagra til fil"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Byt ut"
 
@@ -5593,7 +5442,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5613,11 +5462,11 @@ msgstr "Fila inneheld ikkje ei melding."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fila inneheld fleire meldingar. Berre den første meldinga vert vist."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5627,114 +5476,114 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Slettar meldingar"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer melding %1 av %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Ikkje nok ledig diskplass?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Flytt til denne mappa"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopier til denne mappa"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Flyttar meldingar"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Slettar meldingar"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Opnar URL …"
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Vil du verkeleg fjerna identiteten <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Køyr"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Fann ingen vedlegg å lagra."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Lagra vedlegg til"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "vedlegg.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "vedlegg.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Ei fil med dette namnet %1 finst frå før. Vil du skriva over henne?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fila finst frå før"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Skriv over"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Del %1 av meldinga er kryptert. Vil du ta vare på krypteringa ved lagring?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-spørsmål"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Ta vare på kryptering"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ikkje ta vare på"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Del %1 av meldinga er signert. Vil du ta vare på signaturen ved lagring?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Ta vare på signatur"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5743,22 +5592,22 @@ msgstr ""
 "Klarte ikkje skriva til fila %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Klarte ikkje skriva til fila %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Det er inga oppføring i adresseboka for denne e-postadressa. Legg henne til i "
-"adresseboka og legg så til direktemeldingsadresser ved hjelp av dine føretrekte "
-"direktemeldingsklient."
+"Det er inga oppføring i adresseboka for denne e-postadressa. Legg henne til "
+"i adresseboka og legg så til direktemeldingsadresser ved hjelp av dine "
+"føretrekte direktemeldingsklient."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5768,77 +5617,78 @@ msgstr ""
 " %1\n"
 " det er ikkje mogleg å avgjera kven du vil prate med."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus-bakstykket manglar funksjonen «x-obtain-keys». Denne feilen bør "
 "rapporterast."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Feil med Chiasmus-bakstykket"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Uventa returverdi frå Chiasmus-bakstykket: Funksjonen «x-obtain-keys» "
 "returnerte ikkje noka strengliste. Denne feilen bør rapporterast."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Fann ingen nøklar. Kontroller om ein gyldig nøkkelstig er sett opp i Chiasmus."
+"Fann ingen nøklar. Kontroller om ein gyldig nøkkelstig er sett opp i "
+"Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Val av krypteringsnøkkel til Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus-bakstykket manglar funksjonen «x-decrypt». Denne feilen bør "
 "rapporterast."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Funksjonen «x-decrypt» godtek ikkje dei forventa parametrane. Denne feilen bør "
-"rapporterast."
+"Funksjonen «x-decrypt» godtek ikkje dei forventa parametrane. Denne feilen "
+"bør rapporterast."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Feil med dekryptering i Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Uventa returverdi frå Chiasmus-bakstykket: Funksjonen «x-decrypt» returnerte "
 "ikkje nokon byte-tabell. Denne feilen bør rapporterast."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "E-post"
@@ -5937,7 +5787,7 @@ msgstr "Storleik"
 msgid "Encoding"
 msgstr "Koding"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimer"
 
@@ -5949,7 +5799,7 @@ msgstr "Krypter"
 msgid "Sign"
 msgstr "Signer"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Namn på vedlegget:"
 
@@ -5971,9 +5821,11 @@ msgstr "hovudmottakarar:"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>E-postadressene du skriv i dette feltet vil motta ein kopi av meldinga.</qt>"
+"<qt>E-postadressene du skriv i dette feltet vil motta ein kopi av meldinga.</"
+"qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5982,13 +5834,13 @@ msgstr "Ytterlegare mottakarar"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>E-postadressene du skriv i dette feltet vil motta ein kopi av meldinga. "
-"Dette er teknisk sett det same som å skrive alle adressene i <b>Til:</b>"
-"-feltet men vil symbolisere at mottakaren av kopien er ein lyttar og ikkje "
+"Dette er teknisk sett det same som å skrive alle adressene i <b>Til:</b>-"
+"feltet men vil symbolisere at mottakaren av kopien er ein lyttar og ikkje "
 "hovudadressaten.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -5997,12 +5849,11 @@ msgstr "Gøymde mottakarar"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Dette er grunnleggjande det same som feltet <b>Kopi Til:</b>"
-", men andre mottakarar vil ikkje kunne sjå kven som mottek ein blindkopi.</qt>"
+"<qt>Dette er grunnleggjande det same som feltet <b>Kopi Til:</b>, men andre "
+"mottakarar vil ikkje kunne sjå kven som mottek ein blindkopi.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6012,7 +5863,7 @@ msgstr "&Send e-post"
 msgid "&Send Mail Via"
 msgstr "&Send e-post via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Send s&einare"
@@ -6079,8 +5930,7 @@ msgstr "&Fjern sitatteikn"
 msgid "Cl&ean Spaces"
 msgstr "R&ensk mellomrom"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Bruk skrift med fast breidd"
@@ -6222,31 +6072,31 @@ msgstr "&Kryptografisk meldingsformat"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Punktliste (kule)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Punktliste (sirkel)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Punktliste (firkant)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Ordna liste (desimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Ordna liste (alfabetisk, små bokstavar)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Ordna liste (alfabetisk, store bokstavar)"
 
@@ -6353,61 +6203,61 @@ msgstr "Lukk meldingsredigering"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Meldinga du har laga ser ut til å referera til ei vedlagt fil, men du har ikkje "
-"lagt ved noko.\n"
+"Meldinga du har laga ser ut til å referera til ei vedlagt fil, men du har "
+"ikkje lagt ved noko.\n"
 "Vil du leggja ved ei fil til meldinga?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Filvedleggpåminnar"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Send &utan endring"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail klarte ikkje å finna plasseringa av vedlegget (%1).</p>"
-"<p>Du må skriva inn heile stigen til fila viss du vil leggja henne ved.</p></qt>"
+"<qt><p>KMail klarte ikkje å finna plasseringa av vedlegget (%1).</p><p>Du må "
+"skriva inn heile stigen til fila viss du vil leggja henne ved.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Legg ved fil"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Legg ved"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Set inn fil"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Set inn fil"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Det oppstod ein feil under eksport av nøkkelen frå bakgrunnen: </p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Det oppstod ein feil under eksport av nøkkelen frå bakgrunnen: </"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6446,20 +6296,35 @@ msgid ""
 "View"
 msgstr "Vis"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Rediger …"
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Rediger skript …"
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Lagra &som …"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Eigenskapar"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Legg ved …"
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Kmail klarte ikkje komprimera fila."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6467,77 +6332,73 @@ msgstr ""
 "Den komprimerte fila er større enn den opphavlege. Vil du ta vare på den "
 "opphavlege?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Ta vare på"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail klarte ikkje dekomprimera fila."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Lagra vedlegg som"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Legg til som tekst"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Legg til som vedlegg"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Lim inn som &vedlegg"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "namnlaus"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Du har bede om at meldingane skal krypterast til deg sjølv, men det er ikkje "
-"sett opp nokon (OpenPGP eller S/MIME) krypteringsnøkkel for den valde "
-"identiteten som kan brukast til dette.</p>"
-"<p>Vel nøkkelen/nøklane som skal brukast i identitetsoppsettet.</p></qt>"
+"<qt><p>Du har bede om at meldingane skal krypterast til deg sjølv, men det "
+"er ikkje sett opp nokon (OpenPGP eller S/MIME) krypteringsnøkkel for den "
+"valde identiteten som kan brukast til dette.</p><p>Vel nøkkelen/nøklane som "
+"skal brukast i identitetsoppsettet.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Krypteringsnøkkelen er ikkje oppgjeve"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>For å kunna signera denne meldinga, må du først velja kva for (OpenPGP eller "
-"S/MIME) nøkkel du vil bruka.</p> "
-"<p>Du kan velja nøkkelen som skal brukast i identitetsoppsettet.</p></qt>"
+"<qt><p>For å kunna signera denne meldinga, må du først velja kva for "
+"(OpenPGP eller S/MIME) nøkkel du vil bruka.</p> <p>Du kan velja nøkkelen som "
+"skal brukast i identitetsoppsettet.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Signeringsnøkkelen er ikkje oppgjeve"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6545,169 +6406,167 @@ msgstr ""
 "KMail er no i fråkopla modus. Meldingane dine vert lagde i utboksen til du "
 "koplar til."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Tilkopla/fråkopla"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Du må skriva inn e-postadressa di i Frå:-feltet. Du bør også setja "
-"e-postadressa for alle identitetane, slik at du ikkje treng å skriva henne inn "
+"Du må skriva inn e-postadressa di i Frå:-feltet. Du bør også setja e-"
+"postadressa for alle identitetane, slik at du ikkje treng å skriva henne inn "
 "for kvar melding."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Du må oppgje minst ein mottakar, anten i Til:-feltet eller som CC eller BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Du har ikkje oppgjeve noko emne. Send meldinga likevel?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Namn ikkje oppgjeve"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du har ikkje oppgjeve noko emne. Send meldinga likevel?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ingen emne oppgjeve"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Send &utan endring"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Oppgje emnet"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Hald på formatering, i&kkje signer/krypter"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Hald på formatering, i&kkje krypter"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Hald på formatering, i&kkje signer"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Signering/kryptering (slett formatering)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Krypter (slett formatering)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Signer (slett formatering)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Integrert signering/kryptering av HTML-meldingar er ikkje mogleg.</p>"
-"<p>Vil du sletta formateringa?</p></qt>"
+"<qt><p>Integrert signering/kryptering av HTML-meldingar er ikkje mogleg.</"
+"p><p>Vil du sletta formateringa?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Signer/krypter melding?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Den sjølvvalde kladdemappa til identiteten «%1» finst ikkje lenger. Difor vert "
-"standardmappa for kladdemeldingar bruka."
+"Den sjølvvalde kladdemappa til identiteten «%1» finst ikkje lenger. Difor "
+"vert standardmappa for kladdemeldingar bruka."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Opprett ein konto for sending av e-post og prøv igjen."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "I ferd med å senda e-post …"
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Stadfest sending"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Send no"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Ingen mottakarar"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Ytterlegare mottakarar"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Stavekontroll"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Stavekontroll"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Stavekontroll avbroten."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Stavekontroll stoppa."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Stavekontroll ferdig."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Set først opp eit krypteringsbakstykke som Chiasmus kan bruka.\n"
 "Dette kan du gjera på fana «Krypteringsbakstykke» på tryggleikssida i "
 "oppsettet."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6715,34 +6574,34 @@ msgstr ""
 "Det ser ut som om libkleopatra er kompilert utan støtte for Chiasmus. Du vil "
 "kanskje kompilera libkleopatra på nytt med --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Chiasmus-bakstykket er ikkje sett opp"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Fann ingen Chiasmus-nøklar"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Val av krypteringsnøkkel for Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Meldinga er signert av %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Meldinga er signert av %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP-melding – kryptert"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Meldingar med emne: "
@@ -6792,11 +6651,11 @@ msgstr "Stavekontroll – KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Feil ved start av ISpell/ASpell. Sjå til at ISpell eller ASpell er rett oppsett "
-"og i søkjestigen (PATH)."
+"Feil ved start av ISpell/ASpell. Sjå til at ISpell eller ASpell er rett "
+"oppsett og i søkjestigen (PATH)."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6829,13 +6688,11 @@ msgstr "<qt>For mange filterhendingar i filterregel <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Ukjend filterhending <b>%1</b>"
-"<br>i filterregel.<b>%2</b>"
-"<br>Ignorerer henne.</qt>"
+"<qt>Ukjend filterhending <b>%1</b><br>i filterregel.<b>%2</b><br>Ignorerer "
+"henne.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7052,146 +6909,115 @@ msgstr "Spel ein lyd"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dette er lista over oppgjevne filter. Dei vert handsama frå toppen og "
-"nedover.</p> "
-"<p>Klikk på eit filter for å redigera det med kontrollane til høgre i "
-"dialogen.</p></qt>"
+"<qt><p>Dette er lista over oppgjevne filter. Dei vert handsama frå toppen og "
+"nedover.</p> <p>Klikk på eit filter for å redigera det med kontrollane til "
+"høgre i dialogen.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bruk denne knappen for å laga eit nytt filter.</p> "
-"<p>Filteret vert sett inn like før det som er valt no, men du kan sjølvsagt "
-"endra plasseringa seinare.</p> "
-"<p>Dersom du trykte denne knappen i vanvare, kan du angra deg ved å trykkja "
-"knappen <em>Slett</em> (til høgre).</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Bruk denne knappen for å laga eit nytt filter.</p> <p>Filteret vert "
+"sett inn like før det som er valt no, men du kan sjølvsagt endra plasseringa "
+"seinare.</p> <p>Dersom du trykte denne knappen i vanvare, kan du angra deg "
+"ved å trykkja knappen <em>Slett</em> (til høgre).</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bruk denne knappen for å kopera eit filter.</p> "
-"<p>Dersom du trykte .</p> "
-"<p>Dersom du trykte denne knappen i vanvare, kan du angra deg ved å trykkja "
-"knappen <em>Slett</em> (til høgre).</p></qt>"
+"<qt><p>Bruk denne knappen for å kopera eit filter.</p> <p>Dersom du trykte ."
+"</p> <p>Dersom du trykte denne knappen i vanvare, kan du angra deg ved å "
+"trykkja knappen <em>Slett</em> (til høgre).</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å <em>sletta</em> det valte filteret frå lista "
-"over.</p> "
-"<p>Du kan ikkje få filteret tilbake etter at det er sletta, men du kan forlata "
-"dialogen via <em>Avbryt</em>-knappen for å angra alle endringane.</p></qt>"
+"<qt><p>Bruk denne knappen til å <em>sletta</em> det valte filteret frå lista "
+"over.</p> <p>Du kan ikkje få filteret tilbake etter at det er sletta, men du "
+"kan forlata dialogen via <em>Avbryt</em>-knappen for å angra alle endringane."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å flytta det valte filteret <em>opp</em> "
-"eitt steg i lista over.</p> "
-"<p>Rekkjefølgja av filtera i lista avgjer i kva rekkjefølgje dei vert bruka. "
-"Det øvste filteret vert prøvd først.</p> "
+"<qt><p>Bruk denne knappen til å flytta det valte filteret <em>opp</em> eitt "
+"steg i lista over.</p> <p>Rekkjefølgja av filtera i lista avgjer i kva "
+"rekkjefølgje dei vert bruka. Det øvste filteret vert prøvd først.</p> "
 "<p>Dersom du trykte denne knappen i vanvare, kan du angra deg ved å trykkja "
 "knappen <em>Ned</em> (til høgre).</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å flytta det valte filteret <em>opp</em> "
-"eitt steg i lista over.</p> "
-"<p>Rekkjefølgja av filtera i lista avgjer i kva rekkjefølgje dei vert bruka. "
-"Det øvste filteret vert prøvd først.</p> "
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Bruk denne knappen til å flytta det valte filteret <em>opp</em> eitt "
+"steg i lista over.</p> <p>Rekkjefølgja av filtera i lista avgjer i kva "
+"rekkjefølgje dei vert bruka. Det øvste filteret vert prøvd først.</p> "
 "<p>Dersom du trykte denne knappen i vanvare, kan du angra deg ved å trykkja "
 "knappen <em>Ned</em> (til høgre).</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å flytta det valte filteret <em>ned</em> "
-"eitt steg i lista over.</p> "
-"<p>Rekkjefølgja av filtera i lista avgjer i kva rekkjefølgje dei vert bruka. "
-"Det øvste filteret vert prøvd først.</p> "
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Bruk denne knappen til å flytta det valte filteret <em>ned</em> eitt "
+"steg i lista over.</p> <p>Rekkjefølgja av filtera i lista avgjer i kva "
+"rekkjefølgje dei vert bruka. Det øvste filteret vert prøvd først.</p> "
 "<p>Dersom du trykte denne knappen i vanvare, kan du angra deg ved å trykkja "
 "knappen <em>Opp</em> (til venstre).</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å flytta det valte filteret <em>ned</em> "
-"eitt steg i lista over.</p> "
-"<p>Rekkjefølgja av filtera i lista avgjer i kva rekkjefølgje dei vert bruka. "
-"Det øvste filteret vert prøvd først.</p> "
+"<qt><p>Bruk denne knappen til å flytta det valte filteret <em>ned</em> eitt "
+"steg i lista over.</p> <p>Rekkjefølgja av filtera i lista avgjer i kva "
+"rekkjefølgje dei vert bruka. Det øvste filteret vert prøvd først.</p> "
 "<p>Dersom du trykte denne knappen i vanvare, kan du angra deg ved å trykkja "
 "knappen <em>Opp</em> (til venstre).</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bruk denne knappen til å endra namnet på det valre filteret.</p> "
+"<qt><p>Bruk denne knappen til å endra namnet på det valre filteret.</p> "
 "<p>Filtera får automatisk namn, så lenge dei startar med «&lt;».</p> "
 "<p>Dersom du har endra eit filternamn i vanvare og vil ha det automatiske "
 "namnet tilbake, trykk på denne knappen og vel <em>Tøm</em> og så <em>OK</em> "
@@ -7199,21 +7025,19 @@ msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Merk av her for å alltid visa stadfestingsdialogen.</p> "
-"<p>Dette er nyttig dersom du har oppgjeve eit regelsett som markerer meldingar "
-"som skal lastast ned seinare. Dersom du ikkje kunne tvinga dialogen til å "
-"visast, kunne det henda nokre meldingar aldri vart lasta ned dersom ingen andre "
-"store meldingar låg på tenaren og venta eller dersom du ville endra regelsettet "
-"for å markera meldingane på ein annan måte.</p></qt>"
+"<qt><p>Merk av her for å alltid visa stadfestingsdialogen.</p> <p>Dette er "
+"nyttig dersom du har oppgjeve eit regelsett som markerer meldingar som skal "
+"lastast ned seinare. Dersom du ikkje kunne tvinga dialogen til å visast, "
+"kunne det henda nokre meldingar aldri vart lasta ned dersom ingen andre "
+"store meldingar låg på tenaren og venta eller dersom du ville endra "
+"regelsettet for å markera meldingane på ein annan måte.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7223,6 +7047,16 @@ msgstr "POP3-filter-reglar"
 msgid "Filter Rules"
 msgstr "Filter-reglar"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importer"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importer"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Tilgjengelege filter"
@@ -7304,6 +7138,11 @@ msgstr "Legg til dette filteret på verktøylinja"
 msgid "Icon for this filter:"
 msgstr "Ikon for dette filteret:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Til"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Opp"
@@ -7312,16 +7151,29 @@ msgstr "Opp"
 msgid "Down"
 msgstr "Ned"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Endra namn …"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nytt"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopier til"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Sletta"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7330,20 +7182,20 @@ msgstr "Vel snøggtast for mappe"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Minst eitt filter er meint for ei mappe på ein IMAP-nettkonto. Slike filter "
-"vert berre bruka ved manuell filtrering og ved filtrering av innkomande e-post "
-"frå IMAP-nettkontoar."
+"vert berre bruka ved manuell filtrering og ved filtrering av innkomande e-"
+"post frå IMAP-nettkontoar."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Dei følgjande filtra vart ikkje lagra fordi dei er ugyldige. (Manglar kanskje "
-"handling eller søkjeregel.)"
+"Dei følgjande filtra vart ikkje lagra fordi dei er ugyldige. (Manglar "
+"kanskje handling eller søkjeregel.)"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7412,28 +7264,25 @@ msgstr "Feilsøkjer IMAP-mellomlager"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Feilsøking i IMAP-mellomlageret.</b></p>"
-"<p>Viss du har problem med å synkronisera ei IMAP-mappe, bør du først prøva å "
-"byggja om indeksfila. Dette vil ta noko tid, men vil ikkje føra til problem.</p>"
-"<p>Viss dette ikkje er nok, kan du prøva å friska opp igjen IMAP-mellomlageret. "
-"Viss du gjer dette vil du missa alle dei lokale endringane for denne mappa og "
-"alle undermappene.</p>"
+"<p><b>Feilsøking i IMAP-mellomlageret.</b></p><p>Viss du har problem med å "
+"synkronisera ei IMAP-mappe, bør du først prøva å byggja om indeksfila. Dette "
+"vil ta noko tid, men vil ikkje føra til problem.</p><p>Viss dette ikkje er "
+"nok, kan du prøva å friska opp igjen IMAP-mellomlageret. Viss du gjer dette "
+"vil du missa alle dei lokale endringane for denne mappa og alle undermappene."
+"</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7470,8 +7319,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7510,8 +7359,8 @@ msgstr "Indeksen for denne mappa er blitt bygd om."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Mappa %1 er ikkje i statusen synkronisert for første gong (statusen var %2). "
 "Vil du setja statusen tilbake til synkronisert for første gong og halda fram "
@@ -7642,13 +7491,10 @@ msgstr "Lagar undermapper på tenar"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Det ser ut til at mappa <b>%1</b> var sletta. Vil du sletta henne frå "
+"<qt><p>Det ser ut til at mappa <b>%1</b> var sletta. Vil du sletta henne frå "
 "tenaren?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
@@ -7670,12 +7516,10 @@ msgstr "Hentar mapper for namnerommet %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Det ser ut til at mappa <b>%1</b> var sletta. Vil du sletta henne frå "
+"<qt><p>Det ser ut til at mappa <b>%1</b> var sletta. Vil du sletta henne frå "
 "tenaren?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7684,20 +7528,20 @@ msgstr "Avbrote"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"IMAP-tenaren %1 støttar ikkje IMAP-kommentarar. XML-lagringa kan ikkje brukast "
-"på denne tenaren. Du må endra på KMail-oppsettet."
+"IMAP-tenaren %1 støttar ikkje IMAP-kommentarar. XML-lagringa kan ikkje "
+"brukast på denne tenaren. Du må endra på KMail-oppsettet."
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"IMAP-tenaren %1 støttar ikkje IMAP-kommentarar. XML-lagringa kan ikkje brukast "
-"på denne tenaren. Du må endra på KMail-oppsettet."
+"IMAP-tenaren %1 støttar ikkje IMAP-kommentarar. XML-lagringa kan ikkje "
+"brukast på denne tenaren. Du må endra på KMail-oppsettet."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7710,17 +7554,17 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Nokre av dei nye meldingane i denne mappa (%1) er ikkje lasta opp til "
-"tenaren enno, men det ser ikkje ut til at du har tilstrekkelege tilgangsløyve "
-"til å lasta dei opp. Ta kontakt med administratoren for å tillata opplasting av "
-"nye meldingar, eller flytt meldingane ut av denne mappa.</p>"
-"<p>Vil du flytta desse meldingane til ei anna mappe no?</p>"
+"tenaren enno, men det ser ikkje ut til at du har tilstrekkelege "
+"tilgangsløyve til å lasta dei opp. Ta kontakt med administratoren for å "
+"tillata opplasting av nye meldingar, eller flytt meldingane ut av denne "
+"mappa.</p><p>Vil du flytta desse meldingane til ei anna mappe no?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7729,20 +7573,25 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>Nokre av dei nye meldingane i denne mappa (%1) er ikkje lasta opp til "
-"tenaren enno, men det ser ikkje ut til at du har tilstrekkelege tilgangsløyve "
-"til å lasta dei opp. Ta kontakt med administratoren for å tillata opplasting av "
-"nye meldingar, eller flytt meldingane ut av denne mappa.</p>"
-"<p>Vil du flytta desse meldingane til ei anna mappe no?</p>"
+"tenaren enno, men det ser ikkje ut til at du har tilstrekkelege "
+"tilgangsløyve til å lasta dei opp. Ta kontakt med administratoren for å "
+"tillata opplasting av nye meldingar, eller flytt meldingane ut av denne "
+"mappa.</p><p>Vil du flytta desse meldingane til ei anna mappe no?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Flytt til:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ikkje flytt"
 
@@ -7754,8 +7603,7 @@ msgstr "Flytt meldingar til mappe"
 msgid "Permissions (ACL)"
 msgstr "Løyve (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Generelt"
@@ -7779,8 +7627,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Bruk tilpassa &ikon"
@@ -7799,14 +7646,13 @@ msgstr "Bruk på ny/ulesen e-post i denne mappa"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7819,13 +7665,13 @@ msgstr "Ta vare på svar i denne mappa"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Kryss av for dette valet viss du vil at svar du skriv på meldingar i denne "
-"mappa skal leggjast i same mappe etter sending, istadenfor i den oppsette mappa "
-"for sent e-post."
+"mappa skal leggjast i same mappe etter sending, istadenfor i den oppsette "
+"mappa for sent e-post."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7835,17 +7681,21 @@ msgstr "Vis sendar/mottakar-kolonne i meldingslista"
 msgid "Sho&w column:"
 msgstr "Vis &kolonne:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Bruk som standard"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Avsendar"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Mottakar"
@@ -7856,14 +7706,14 @@ msgstr "Avsendar&identitet:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Vel kva for sendaridentitet som skal brukast når du skriv nye meldingar eller "
-"svarar på meldingar i denne mappa. På denne måten kan du bruka ulike "
+"Vel kva for sendaridentitet som skal brukast når du skriv nye meldingar "
+"eller svarar på meldingar i denne mappa. På denne måten kan du bruka ulike "
 "innstillingar alt etter kva mappe du er i. KMail vil henta avsendaradresse, "
 "signatur og signerings- eller krypteringsnøklar frå den identiteten du har "
 "vald. Du kan setja opp identitetane i hovudvindauget for innstillingar. "
@@ -7885,12 +7735,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Denne innstillinga styrer kva for brukarar som delar denne mappa som får sjå "
 "når du er oppteken eller ledig. Dei vil få melding om hendingane eller "
@@ -7899,7 +7749,8 @@ msgstr ""
 "\n"
 "Moglege bruksområde: Dersom sjefen deler ei mappe med sekretæren sin, skal "
 "berre sjefen vera markert som oppteken for dette møtet. Difor bør han velja "
-"«Administratorar», sidan sekretæren ikkje har administratortilgang til mappa.\n"
+"«Administratorar», sidan sekretæren ikkje har administratortilgang til "
+"mappa.\n"
 "Dersom ei arbeidsgruppe deler ein kalender for gruppemøte, vil alle som kan "
 "lesa mappa vera markerte som opptekne for møta.\n"
 "Ei mappe som heile firmaet brukar med valfrie hendingar vil bruka «Ingen», "
@@ -7934,23 +7785,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Du har sett opp denne mappa til å innehalda gruppevareinformasjon og det "
-"generelle oppsettsvalet om å gøyma gruppevaremapper er på. Det betyr at denne "
-"mappa vil forsvinna når denne oppsettsdialogen vert lukka. Viss du vil fjerna "
-"denne mappa igjen, må du mellombels slå av gøyming av gruppevaremapper for å "
-"kunne sjå henne."
+"generelle oppsettsvalet om å gøyma gruppevaremapper er på. Det betyr at "
+"denne mappa vil forsvinna når denne oppsettsdialogen vert lukka. Viss du vil "
+"fjerna denne mappa igjen, må du mellombels slå av gøyming av "
+"gruppevaremapper for å kunne sjå henne."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8019,7 +7870,8 @@ msgstr "Feil under henting av mappeinformasjon."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "E-postindeksen for «%1» er frå ein ukjend KMail-versjon (%2). Indeksen kan "
 "regenererast frå e-postmappa, men noko informasjon kan gå tapt. Vil du "
@@ -8049,8 +7901,8 @@ msgstr "Feil under opning av %1; denne mappa manglar."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Feil ved opning av %1. Mappa kan vera ei ugyldig maildir-mappe eller "
 "tilgangsløyva kan vera feil."
@@ -8093,21 +7945,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Det ser ut til at indeksen til mappa «%2» er for gammal. For å hindra at "
-"meldingar vert øydelagde, vert indeksen laga på nytt. Resultatet kan bli at "
-"sletta meldingar dukkar opp att og at statusinformasjonen går tapt.</p> "
-"<p>I <a href=\"%1\">spørsmålsdelen av KMail-handboka</a> "
-"finn du informasjon om korleis du kan hindra at dette problemet skjer igjen.</p>"
-"</qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Det ser ut til at indeksen til mappa «%2» er for gammal. For å hindra "
+"at meldingar vert øydelagde, vert indeksen laga på nytt. Resultatet kan bli "
+"at sletta meldingar dukkar opp att og at statusinformasjonen går tapt.</p> "
+"<p>I <a href=\"%1\">spørsmålsdelen av KMail-handboka</a> finn du informasjon "
+"om korleis du kan hindra at dette problemet skjer igjen.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8166,7 +8014,7 @@ msgstr ""
 "«%1» verkar ikkje å vera ei mappa.\n"
 "Fjern fila, ho er i vegen."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8174,7 +8022,7 @@ msgstr ""
 "Løyva til mappa «%1» er feil.\n"
 "Sjå etter at du kan lesa og endra innhald i denne mappa."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8184,8 +8032,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8193,7 +8041,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Klarte ikkje laga mappe"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8294,9 +8142,9 @@ msgstr "&Feilsøk IMAP-mellomlager …"
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Klarte ikkje oppretta mappa <b>%1</b> på grunn av utilstrekkelege "
 "tilgangsløyve på tenaren. Dersom du meiner at du skal kunna oppretta "
@@ -8439,15 +8287,15 @@ msgstr "%1 Mappe er skriveverna."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Vil du verkeleg sletta den valde meldinga? "
-"<br>Meldinga som vert sletta kan ikkje gjenopprettast.</qt>\n"
-"<qt>Vil du verkeleg sletta dei %n valde meldingane? "
-"<br>Meldingane som vert sletta kan ikkje gjenopprettast.</qt>"
+"<qt>Vil du verkeleg sletta den valde meldinga? <br>Meldinga som vert sletta "
+"kan ikkje gjenopprettast.</qt>\n"
+"<qt>Vil du verkeleg sletta dei %n valde meldingane? <br>Meldingane som vert "
+"sletta kan ikkje gjenopprettast.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8499,133 +8347,133 @@ msgstr ""
 "Endringa av %1 mislukkast.\n"
 "(Ikkje meir diskplass?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Førespurnad om sertifikatsignatur"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Lag eit sertifikat av vedlegget og returner det til avsendaren."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
-"KMail er sett i fråkopla modus. Alle jobbar som krev nettverk er sette på vent."
+"KMail er sett i fråkopla modus. Alle jobbar som krev nettverk er sette på "
+"vent."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail er kopla til igjen. Alle jobbar som krev nettverk er tekne opp att."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail er i fråkopla modus. Korleis vil du halda fram?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Arbeid tilkopla"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Du har ikkje lese-/skriveløyve til innboksmappa."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "utboks"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Du har ikkje lese-/skriveløyve til utboksmappa."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "sendt e-post"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Du har ikkje lese-/skriveløyve til mappa for sende meldingar."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "papirkorg"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Du har ikkje lese-/skriveløyve til papirkorgmappa."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "kladd"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Du har ikkje lese-/skriveløyve til kladdemappa."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Du har ikkje lese-/skriveløyve til papirkorgmappa."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Førre søk"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Mappa <i>%4</i> finst. %1 legg no meldingar i mappa <i>%5</i>. "
-"<p>%2 kan flytta innhaldet i <i>%6<i> til denne mappa, men ver klar over at "
-"dette vil gjera at filer med same namn vert skrivne over i <i>%7</i>. "
-"<p><strong>Vil du at %3 skal flytta e-postfilene no?</strong></qt>"
+"<qt>Mappa <i>%4</i> finst. %1 legg no meldingar i mappa <i>%5</i>. <p>%2 kan "
+"flytta innhaldet i <i>%6<i> til denne mappa, men ver klar over at dette vil "
+"gjera at filer med same namn vert skrivne over i <i>%7</i>. <p><strong>Vil "
+"du at %3 skal flytta e-postfilene no?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Mappa <i>%4</i> finst. %1 legg no meldingar i mappa <i>%5</i>. "
-"<p>%2 kan flytta innhaldet i <i>%6<i> til denne mappa."
-"<p><strong>Vil du at %3 skal flytta e-postfilene no?</strong></qt>"
+"<qt>Mappa <i>%4</i> finst. %1 legg no meldingar i mappa <i>%5</i>. <p>%2 kan "
+"flytta innhaldet i <i>%6<i> til denne mappa.<p><strong>Vil du at %3 skal "
+"flytta e-postfilene no?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Overfør e-postfiler?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail støytte på ein fatal feil og avsluttar no"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8636,11 +8484,11 @@ msgstr ""
 "Feilen var:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Tøm papirkorga"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Vil du verkeleg tøma papirkorgmappene for alle kontoane?"
 
@@ -8715,8 +8563,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Ny e-post motteken</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8735,7 +8582,8 @@ msgstr "Denne mappa har ingen innstillingar for forelda meldingar"
 #: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil sletta forelda meldingar i mappa <b>%1</b>?</qt>"
+"<qt>Er du sikker på at du vil sletta forelda meldingar i mappa <b>%1</b>?</"
+"qt>"
 
 #: kmmainwidget.cpp:1133
 msgid "Expire Folder"
@@ -8755,11 +8603,11 @@ msgstr "Vil du verkeleg tøma papirkorga?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Vil du verkeleg flytta alle meldingane frå mappa <b>%1</b> "
-"til papirkorga?</qt>"
+"<qt>Vil du verkeleg flytta alle meldingane frå mappa <b>%1</b> til "
+"papirkorga?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8783,12 +8631,11 @@ msgstr "Slett søk"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Vil du verkeleg sletta søket <b>%1</b>? "
-"<br>Meldingane som er viste her vil framleis liggja i dei opphavlege mappene "
-"sine.</qt>"
+"<qt>Vil du verkeleg sletta søket <b>%1</b>? <br>Meldingane som er viste her "
+"vil framleis liggja i dei opphavlege mappene sine.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8800,40 +8647,41 @@ msgstr "<qt>Vil du verkeleg sletta den tomme mappa <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Vil du verkeleg sletta den tomme mappa <b>%1</b> "
-"og alle undermappene hennar? Det kan vera at undermappene ikkje er tomme, og "
-"innhaldet i dei vil også bli sletta."
-"<p>Ver klar over at dei sletta meldingane <b>ikkje</b> "
-"vert lagra i papirkorga, men sletta for alltid.</qt>"
+"<qt>Vil du verkeleg sletta den tomme mappa <b>%1</b> og alle undermappene "
+"hennar? Det kan vera at undermappene ikkje er tomme, og innhaldet i dei vil "
+"også bli sletta.<p>Ver klar over at dei sletta meldingane <b>ikkje</b> vert "
+"lagra i papirkorga, men sletta for alltid.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Vil du verkeleg sletta mappa <b>%1</b>, og kvitta deg med innhaldet?"
-"<p>Ver klar over at dei sletta meldingane <b>ikkje</b> "
-"vert lagra i papirkorga, men sletta for alltid.</qt>"
+"<p>Ver klar over at dei sletta meldingane <b>ikkje</b> vert lagra i "
+"papirkorga, men sletta for alltid.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Er du sikker på at du vil sletta mappa <b>%1</b>"
-", alle undermappene, og kvitta deg med innhaldet deira?"
-"<p>Ver klar over at dei sletta meldingane <b>ikkje</b> "
-"vert lagra i papirkorga, men sletta for alltid.</qt>"
+"<qt>Er du sikker på at du vil sletta mappa <b>%1</b>, alle undermappene, og "
+"kvitta deg med innhaldet deira?<p>Ver klar over at dei sletta meldingane "
+"<b>ikkje</b> vert lagra i papirkorga, men sletta for alltid.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Sletta"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8849,12 +8697,12 @@ msgstr "Vil du verkeleg sletta alle forelda meldingar?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Bruk av HTML i e-post vil gjera deg meir sårbar mot søppelpost («spam») og kan "
-"gjera det lettare for uvedkomande å få tilgang til systemet."
+"Bruk av HTML i e-post vil gjera deg meir sårbar mot søppelpost («spam») og "
+"kan gjera det lettare for uvedkomande å få tilgang til systemet."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8867,11 +8715,12 @@ msgstr "Bruk HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Lasting av eksterne referansar i HTML-meldingar vil gjera deg meir sårbar mot "
-"søppelpost og kan gjera det lettare for uvedkomande å få tilgang til systemet."
+"Lasting av eksterne referansar i HTML-meldingar vil gjera deg meir sårbar "
+"mot søppelpost og kan gjera det lettare for uvedkomande å få tilgang til "
+"systemet."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8887,8 +8736,8 @@ msgstr "Filtrer på e-postlista %1 …"
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMail sin funksjonalitet for vekke-meldingar er tufta på filtrering på "
@@ -8908,7 +8757,8 @@ msgstr "Klarte ikkje starta sertifikathandteringa. Kontroller installasjonen."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Klarte ikkje starta GnuPG-loggvisar (kwatchgnupg). Kontroller installasjonen."
 
@@ -9242,8 +9092,7 @@ msgstr "&Lagra vedlegg …"
 msgid "Appl&y All Filters"
 msgstr "Bruk alle &filtra"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Bruk filter"
@@ -9357,7 +9206,6 @@ msgstr "Neste &ulesne melding"
 msgid "Go to the next unread message"
 msgstr "Gå til neste ulesne melding"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Førre melding"
@@ -9498,8 +9346,8 @@ msgstr " Startar opp …"
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9509,21 +9357,21 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Denne meldinga inneheld ein førespurnad om å senda ei meldingskvittering,\n"
-"Ho inneheld ein handsamingsinstruksjon som er merka «naudsynt», men som ikkje "
-"er kjend for KMail.\n"
+"Ho inneheld ein handsamingsinstruksjon som er merka «naudsynt», men som "
+"ikkje er kjend for KMail.\n"
 "Du kan anten ignorera førespurnaden eller la KMail kvittera med «mislukka»."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9535,8 +9383,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9548,8 +9396,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9584,17 +9432,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Kvittering: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Vedlegg: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Vis vedlegga slik avsendaren føreslår."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9644,45 +9492,39 @@ msgstr "Eigenskapar for meldingsdel"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME</em>-typen til fila.</p> "
-"<p>Vanlegvis treng du ikkje røra denne innstillinga, sidan filtypen automatisk "
-"vert sjekka. Av og til klarar likevel ikkje %1 å oppdaga filtypen rett. På "
-"denne måten kan du fiksa det.</p></qt>"
+"<qt><p><em>MIME</em>-typen til fila.</p> <p>Vanlegvis treng du ikkje røra "
+"denne innstillinga, sidan filtypen automatisk vert sjekka. Av og til klarar "
+"likevel ikkje %1 å oppdaga filtypen rett. På denne måten kan du fiksa det.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Storleiken på meldingsdelen.</p> "
-"<p>Av og til oppgjev berre %1 ein estimert storleik her, fordi utrekning av den "
-"nøyaktige storleiken tek for lang tid. I så fall vert det varsla ved at «(om "
-"lag)» vert lagt til den viste storleiken.</p></qt>"
+"<qt><p>Storleiken på meldingsdelen.</p> <p>Av og til oppgjev berre %1 ein "
+"estimert storleik her, fordi utrekning av den nøyaktige storleiken tek for "
+"lang tid. I så fall vert det varsla ved at «(om lag)» vert lagt til den "
+"viste storleiken.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Filnamnet på meldingsdelen.</p> "
-"<p>Sjølv om standardinnstillinga her er namnet på den vedlagde fila, vel du "
-"ikkje her kva for fil som skal leggjast ved. I staden vel du kva for filnamn "
-"mottakaren skal bruka når vedlegget vert lagra.</p></qt>"
+"<qt><p>Filnamnet på meldingsdelen.</p> <p>Sjølv om standardinnstillinga her "
+"er namnet på den vedlagde fila, vel du ikkje her kva for fil som skal "
+"leggjast ved. I staden vel du kva for filnamn mottakaren skal bruka når "
+"vedlegget vert lagra.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9690,17 +9532,14 @@ msgstr "&Skildring:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ei skildring av meldingsdelen.</p> "
-"<p>Dette er berre ei uformell skildring av meldingsdelen, omtrent som emnelinja "
-"i meldinga. Dei fleste e-postprogramma viser denne skildringa saman med "
-"vedleggsikonet.</p></qt>"
+"<qt><p>Ei skildring av meldingsdelen.</p> <p>Dette er berre ei uformell "
+"skildring av meldingsdelen, omtrent som emnelinja i meldinga. Dei fleste e-"
+"postprogramma viser denne skildringa saman med vedleggsikonet.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9708,23 +9547,20 @@ msgstr "&Koding:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Transportkodinga for meldingsdelen.</p> "
-"<p>Vanlegvis treng du ikkje endra denne, sidan %1 vil velja ei fornuftig "
-"standardkoding basert på MIME-typen. Av og til kan du redusera "
-"meldingsstorleiken ein del ved å velja ei anna koding, til dømes dersom ei "
-"PostScript-fil inneheld rein tekst i staden for binærdata. I så fall kan "
-"vedlegget verta opp til 25% mindre dersom du vel «quoted-printable» i staden "
-"for standardvalet «base 64».</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Transportkodinga for meldingsdelen.</p> <p>Vanlegvis treng du ikkje "
+"endra denne, sidan %1 vil velja ei fornuftig standardkoding basert på MIME-"
+"typen. Av og til kan du redusera meldingsstorleiken ein del ved å velja ei "
+"anna koding, til dømes dersom ei PostScript-fil inneheld rein tekst i staden "
+"for binærdata. I så fall kan vedlegget verta opp til 25% mindre dersom du "
+"vel «quoted-printable» i staden for standardvalet «base 64».</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9732,19 +9568,17 @@ msgstr "Føreslå &automatisk vising"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Merk av her dersom du vil føreslå at e-postprogrammet til mottakaren viser "
-"vedlegget automatisk saman med meldinga i staden for berre som eit ikon.</p> "
-"<p>Teknisk vert dette gjort ved å setja <em>Content-Disposition</em>"
-"-feltet til denne meldingsdelen til «inline» i staden for «attachment».</p></qt>"
+"<qt><p>Merk av her dersom du vil føreslå at e-postprogrammet til mottakaren "
+"viser vedlegget automatisk saman med meldinga i staden for berre som eit "
+"ikon.</p> <p>Teknisk vert dette gjort ved å setja <em>Content-Disposition</"
+"em>-feltet til denne meldingsdelen til «inline» i staden for «attachment».</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9752,13 +9586,11 @@ msgstr "&Signer denne delen"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Merk av her dersom du vil signera denne meldingsdelen.</p> "
+"<qt><p>Merk av her dersom du vil signera denne meldingsdelen.</p> "
 "<p>Signaturen vert laga med nøkkelen som er assosiert med identiteten du "
 "brukar.</p></qt>"
 
@@ -9768,12 +9600,10 @@ msgstr "Kr&ypter denne delen"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Merk av her dersom du vil kryptera denne meldingsdelen.</p> "
+"<qt><p>Merk av her dersom du vil kryptera denne meldingsdelen.</p> "
 "<p>Meldingsdelen vert kryptert for mottakarane av denne meldinga.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
@@ -9788,15 +9618,12 @@ msgstr "POP-filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Meldingar som skal filtrerast på POP-konto: <b>%1</b> "
-"<p>Meldingane som er viste er større enn maksimumsstorleiken du har valt for "
-"denne kontoen. "
+"Meldingar som skal filtrerast på POP-konto: <b>%1</b> <p>Meldingane som er "
+"viste er større enn maksimumsstorleiken du har valt for denne kontoen. "
 "<br>Du kan velja kva du vil gjera med dei ved å kryssa av i rett rute."
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -10051,40 +9878,37 @@ msgstr "E-postklienten for skrivebordsmiljøet TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Hentar mappeinnhald</h2>"
-"<p>Vent litt …</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Hentar mappeinnhald</h2><p>Vent litt …</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Fråkopla</h2>"
-"<p>KMail er no i fråkopla modus. Trykk <a href=\"kmail:goOnline\">her</a> "
-"for å kopla til …</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Fråkopla</h2><p>KMail er no i fråkopla modus. "
+"Trykk <a href=\"kmail:goOnline\">her</a> for å kopla til …</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10092,18 +9916,17 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Velkommen til KMail %1</h2>"
-"<p>KMail er e-postprogrammet for skrivebordsmiljøet TDE. Programmet er laga for "
-"å samspela fullt og heilt med dei ulike e-poststandardane for Internett – MIME, "
-"SMTP, POP3 og IMAP.</p>\n"
-"<ul>"
-"<li>KMail har mange kraftige funksjonar du kan lesa meir om i <a href=\"%2\">"
-"brukarhandboka</a>.</li>\n"
+"<h2 style='margin-top: 0px;'>Velkommen til KMail %1</h2><p>KMail er e-"
+"postprogrammet for skrivebordsmiljøet TDE. Programmet er laga for å samspela "
+"fullt og heilt med dei ulike e-poststandardane for Internett – MIME, SMTP, "
+"POP3 og IMAP.</p>\n"
+"<ul><li>KMail har mange kraftige funksjonar du kan lesa meir om i <a href="
+"\"%2\">brukarhandboka</a>.</li>\n"
 "<li>På <a href=\"%3\">heimesida til KMail</A> finn du informasjon om nye "
 "versjonar av KMail.</li></ul>\n"
 "%8\n"
-"<p>Her er nokre av dei nye funksjonane i denne utgåva av KMail (samanlikna med "
-"KMail %4 frå TDE %5):</p>\n"
+"<p>Her er nokre av dei nye funksjonane i denne utgåva av KMail (samanlikna "
+"med KMail %4 frå TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10112,19 +9935,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail-utviklarane</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Ta deg tid til å fylla ut oppsettpanelet for KMail i Fil-&gt;Set opp KMail.\n"
+"<p>Ta deg tid til å fylla ut oppsettpanelet for KMail i Fil-&gt;Set opp "
+"KMail.\n"
 "Du må laga minst ein primæridentitet og både ein innkomande og ein utgåande "
 "e-postkonto.</p>\n"
 
@@ -10165,7 +9987,8 @@ msgstr "Vis vedlegg: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Vedlegget inneheld binære data. Prøver å visa det første teiknet.]\n"
@@ -10193,12 +10016,14 @@ msgstr "Opna vedlegg?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10220,6 +10045,58 @@ msgstr "(pass &ein eller fleire av dei følgjande)"
 msgid "(match all of the following)"
 msgstr "(pass til a&lle dei følgjande)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lesen"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Gamal"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Sletta"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Svart på"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Vidaresendt"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Lagd i kø"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sendt"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Overvaka"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorert"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Søppelpost"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ikkje søppelpost"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Hugseliste"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Har vedlegg"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10299,15 +10176,15 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Kritisk feil: Klarte ikkje handsama sende meldingar (ikkje meir plass?) Flyttar "
-"meldinga til mappa «sendt e-post»."
+"Kritisk feil: Klarte ikkje handsama sende meldingar (ikkje meir plass?) "
+"Flyttar meldinga til mappa «sendt e-post»."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Klarte ikkje flytta den sende meldinga «%1» frå utboksen til mappa med sende "
 "meldingar.\n"
@@ -10317,12 +10194,12 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Det er ikkje mogleg å senda meldingar utan å oppgje ei sendaradresse.\n"
-"Set e-postadressa til identiteten «%1» i identitetavsnittet i oppsettsdialogen "
-"og prøv igjen."
+"Set e-postadressa til identiteten «%1» i identitetavsnittet i "
+"oppsettsdialogen og prøv igjen."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10347,11 +10224,11 @@ msgstr "Startar sendeprosessen …"
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Du har valt å senda all e-post i køen over eit ukryptert samband. Vil du halda "
-"fram?"
+"Du har valt å senda all e-post i køen over eit ukryptert samband. Vil du "
+"halda fram?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10375,8 +10252,9 @@ msgstr "Klarte ikkje senda (nokre) meldingar i køen."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10393,20 +10271,16 @@ msgstr "Sending avborte."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Feil ved sending:</p>"
-"<p>%1</p>"
-"<p>Meldinga vil liggja i utboksen til du fiksar problemet (til dømes ei feil "
-"adresse) eller fjernar meldinga frå utboksen.</p>"
-"<p>Følgjande transportprotokoll vart bruka: %2</p>"
-"<p>Vil du prøve å senda resten av meldingane?</p>"
+"<p>Feil ved sending:</p><p>%1</p><p>Meldinga vil liggja i utboksen til du "
+"fiksar problemet (til dømes ei feil adresse) eller fjernar meldinga frå "
+"utboksen.</p><p>Følgjande transportprotokoll vart bruka: %2</p><p>Vil du "
+"prøve å senda resten av meldingane?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10424,8 +10298,9 @@ msgstr "&Avbryt sending"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10452,7 +10327,8 @@ msgstr ""
 "Klarte ikkje å senda:\n"
 "%1\n"
 "Meldinga vil liggja i utboksen og kjem til å sendast om att.\n"
-"Fjern henne frå utboksen dersom du ikkje vil at meldinga skal sendast om att.\n"
+"Fjern henne frå utboksen dersom du ikkje vil at meldinga skal sendast om "
+"att.\n"
 "Følgjande transportprotokoll vart bruka:\n"
 "  %2"
 
@@ -10468,47 +10344,48 @@ msgstr "Sendmail avslutta unormalt."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Du må oppgje eit brukarnamn og eit passord for å bruka til denne SMTP-tenaren."
+"Du må oppgje eit brukarnamn og eit passord for å bruka til denne SMTP-"
+"tenaren."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 ser ut til å allereie køyre på ein anna skjerm på denne maskina. Å køyra %2 "
-"meir enn ein gong kan føra til tap av e-post. Du burde ikkje starta %1 viss du "
-"ikkje er sikker på om det ikkje allereie køyrer."
+"%1 ser ut til å allereie køyre på ein anna skjerm på denne maskina. Å køyra "
+"%2 meir enn ein gong kan føra til tap av e-post. Du burde ikkje starta %1 "
+"viss du ikkje er sikker på om det ikkje allereie køyrer."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 ser ut til å køyre på ein anna skjerm på denne maskina. Å køyra %1 og %2 på "
-"same tid kan føra til tap av e-post. Du burde ikkje starta %2 viss du ikkje er "
-"sikker på at %1 ikkje køyrer."
+"%1 ser ut til å køyre på ein anna skjerm på denne maskina. Å køyra %1 og %2 "
+"på same tid kan føra til tap av e-post. Du burde ikkje starta %2 viss du "
+"ikkje er sikker på at %1 ikkje køyrer."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 ser ut til å allereie køyra på %2. Å køyra %1 meir enn ein gong kan føra til "
-"tap av e-post. Du bør ikkje starta %1 på denne maskina viss du ikkje er sikker "
-"på at det ikkje allereie køyrer på %2."
+"%1 ser ut til å allereie køyra på %2. Å køyra %1 meir enn ein gong kan føra "
+"til tap av e-post. Du bør ikkje starta %1 på denne maskina viss du ikkje er "
+"sikker på at det ikkje allereie køyrer på %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 ser ut til å køyra på %3. Å køyra %1 og %2 på same tid kan føra til tap av "
-"e-post. Du bør ikkje starta %2 på denne maskina viss du ikkje er sikker på at "
-"%1 ikkje køyrer på %3."
+"%1 ser ut til å køyra på %3. Å køyra %1 og %2 på same tid kan føra til tap "
+"av e-post. Du bør ikkje starta %2 på denne maskina viss du ikkje er sikker "
+"på at %1 ikkje køyrer på %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10519,6 +10396,10 @@ msgstr "Start %1"
 msgid "Exit"
 msgstr "Avslutt"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nye meldingar i"
@@ -10545,15 +10426,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet er ikkje tilgjengeleg. Det er veldig lurt å bruka TDEWallet til å "
 "handtera passord.\n"
-"KMail kan lagra passordet i oppsettsfila i staden. Passordet vert lagra i eit "
-"uleseleg format, men du bør ikkje stola på at krypteringa er trygg dersom andre "
-"får tilgang til oppsettsfila.\n"
+"KMail kan lagra passordet i oppsettsfila i staden. Passordet vert lagra i "
+"eit uleseleg format, men du bør ikkje stola på at krypteringa er trygg "
+"dersom andre får tilgang til oppsettsfila.\n"
 "Vil du lagra passordet til kontoen «%1» i oppsettsfila?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10622,9 +10504,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Ein kommando som skal køyrast lokalt før e-post vert sendt. Dette kan til dømes "
-"brukast til å setja opp ssh-tunnelar. Lat feltet stå tomt dersom du ikkje vil "
-"køyra nokon kommando."
+"Ein kommando som skal køyrast lokalt før e-post vert sendt. Dette kan til "
+"dømes brukast til å setja opp ssh-tunnelar. Lat feltet stå tomt dersom du "
+"ikkje vil køyra nokon kommando."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10632,8 +10514,8 @@ msgstr "Tenaren &krev autentisering"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Kryss av her dersom SMTP-tenaren krev passord før du kan senda e-post. Denne "
 "funksjonen vert kalla «Autentisert SMTP» eller «ASMTP»."
@@ -10656,15 +10538,13 @@ msgstr "Sen&d anna vertsnamn til tenaren"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Kryss av her for å kunna velja kva for vertsnamn KMail skal bruka overfor "
-"tenaren. "
-"<p>Dette er nyttig dersom vertsnamnet på systemet ikkje er rett sett opp eller "
-"dersom du vil gøyma det verkelege vertsnamnet."
+"tenaren. <p>Dette er nyttig dersom vertsnamnet på systemet ikkje er rett "
+"sett opp eller dersom du vil gøyma det verkelege vertsnamnet."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10693,11 +10573,11 @@ msgstr "Berre lokale filer er tillete."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Vertsnamnet kan ikkje vera tomt. Skriv inn namnet eller den numeriske adressa "
-"til SMTP-tenaren."
+"Vertsnamnet kan ikkje vera tomt. Skriv inn namnet eller den numeriske "
+"adressa til SMTP-tenaren."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10709,10 +10589,10 @@ msgstr "Feil under listing av mappe %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10784,8 +10664,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail klarte ikkje oppdaga nokon e-postliste i denne mappa. Fyll inn adresser "
-"manuelt."
+"KMail klarte ikkje oppdaga nokon e-postliste i denne mappa. Fyll inn "
+"adresser manuelt."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10934,35 +10814,28 @@ msgstr "&Rediger melding"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klarte ikkje handtera strukturinformasjonen frå programtillegget for "
-"kryptering. Programtillegget kan vera skadd.</p> "
-"<p>Ta kontakt med systemadministratoren.</p></qt>"
+"<qt><p>Klarte ikkje handtera strukturinformasjonen frå programtillegget for "
+"kryptering. Programtillegget kan vera skadd.</p> <p>Ta kontakt med "
+"systemadministratoren.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Fann ingen aktive programtillegg for kryptering, og klarte ikkje køyra den "
-"innebygde OpenPGP-koden.</p> "
-"<p>Du kan gjera to ting for å endra dette:</p> "
-"<ul>"
-"<li><em>Anten</em> slå på eit programtillegg gjennom dialogen Innstillingar → "
-"Set opp KMail → Programtillegg.</li> "
-"<li><em>Eller</em> oppgje tradisjonelle OpenPGP-innstillingar på fana Identitet "
-"-> Avansert i same dialogen.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Fann ingen aktive programtillegg for kryptering, og klarte ikkje køyra "
+"den innebygde OpenPGP-koden.</p> <p>Du kan gjera to ting for å endra dette:</"
+"p> <ul><li><em>Anten</em> slå på eit programtillegg gjennom dialogen "
+"Innstillingar → Set opp KMail → Programtillegg.</li> <li><em>Eller</em> "
+"oppgje tradisjonelle OpenPGP-innstillingar på fana Identitet -> Avansert i "
+"same dialogen.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10974,8 +10847,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus-bakstykket tilbyr ikkje funksjonen «x-encrypt». Denne feilen bør "
 "rapporterast."
@@ -10985,8 +10858,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Funksjonen «x-encrypt» godtek ikkje dei forventa parametrane. Denne feilen bør "
-"rapporterast."
+"Funksjonen «x-encrypt» godtek ikkje dei forventa parametrane. Denne feilen "
+"bør rapporterast."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -10994,20 +10867,20 @@ msgstr "Feil med Chiasmus-kryptering"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Uventa returverdi frå Chiasmus-bakstykket: Funksjonen «x-encrypt» returnerte "
 "ingen byte-tabell. Denne feilen bør rapporterast."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Det innebygde meldingsformatet for OpenPGP-kryptering støttar ikkje kryptering "
-"eller signering av vedlegg.\n"
+"Det innebygde meldingsformatet for OpenPGP-kryptering støttar ikkje "
+"kryptering eller signering av vedlegg.\n"
 "Vil du verkeleg bruka forelda innebygd OpenPGP?"
 
 #: messagecomposer.cpp:640
@@ -11059,8 +10932,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Du har bede om å signera denne meldinga, men ingen gyldig signeringsnøkkel er "
-"sett opp for denne identiteten."
+"Du har bede om å signera denne meldinga, men ingen gyldig signeringsnøkkel "
+"er sett opp for denne identiteten."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11116,8 +10989,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Undersøkjing av mottakarane sine krypteringsinnstillingar viser at du blir "
@@ -11154,11 +11027,13 @@ msgstr "&Ikkje krypter"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Du har bede om å kryptera denne meldinga, og kryptera ein kopi til deg sjølv, "
-"men ingen gyldig tiltrudd krypteringsnøkkel er sett opp for denne identiteten."
+"Du har bede om å kryptera denne meldinga, og kryptera ein kopi til deg "
+"sjølv, men ingen gyldig tiltrudd krypteringsnøkkel er sett opp for denne "
+"identiteten."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11167,13 +11042,13 @@ msgstr "Send ukryptert?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Nokre delar av denne meldinga vil ikkje bli kryptert.\n"
-"Å senda delvis krypterte meldingar kan strida mot nettstaden sin praksis "
-"og/eller sleppa ut sensitiv informasjon.\n"
+"Å senda delvis krypterte meldingar kan strida mot nettstaden sin praksis og/"
+"eller sleppa ut sensitiv informasjon.\n"
 "Krypter alle delar i staden?"
 
 #: messagecomposer.cpp:950
@@ -11196,87 +11071,82 @@ msgstr "&Krypter alle delar"
 msgid "Unencrypted Message Warning"
 msgstr "Varsel om ukryptert melding"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Feil: Krypteringsmotoren tering returnerte ikkje noko koda data.</p> "
-"<p>Meld frå om denne feilen:"
-"<br>%2</p></qt>"
+"<qt><p>Feil: Krypteringsmotoren tering returnerte ikkje noko koda data.</p> "
+"<p>Meld frå om denne feilen:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Enkelte teikn passar ikkje i den valde kodinga. "
-"<br>"
-"<br>Skal meldinga sendast likevel?</qt>"
+"<qt>Enkelte teikn passar ikkje i den valde kodinga. <br><br>Skal meldinga "
+"sendast likevel?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Nokre teikn vil ikkje koma med"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Tapte teikn"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Endra koding"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Denne meldinga kunne ikkje signerast, sidan den valde krypteringmotoren ikkje "
-"ser ut til å støtta signering. Dette skal faktisk aldri skje, det er fint om du "
-"rapporterer feilen."
+"Denne meldinga kunne ikkje signerast, sidan den valde krypteringmotoren "
+"ikkje ser ut til å støtta signering. Dette skal faktisk aldri skje, det er "
+"fint om du rapporterer feilen."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Denne meldinga kunne ikkje signerast, sidan den valde krypteringmotoren ikkje "
-"ser ut til å støtta signering. Dette skal faktisk aldri skje, det er fint om du "
-"rapporterer feilen."
+"Denne meldinga kunne ikkje signerast, sidan den valde krypteringmotoren "
+"ikkje ser ut til å støtta signering. Dette skal faktisk aldri skje, det er "
+"fint om du rapporterer feilen."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Denne meldinga kunne ikkje krypterast, sidan den valde krypteringsmotoren ikkje "
-"ser ut til å støtta kryptering. Dette skal faktisk aldri skje, det er fint om "
-"du rapporterer feilen."
+"Denne meldinga kunne ikkje krypterast, sidan den valde krypteringsmotoren "
+"ikkje ser ut til å støtta kryptering. Dette skal faktisk aldri skje, det er "
+"fint om du rapporterer feilen."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Denne meldinga kunne ikkje signerast og krypterast, sidan den valde "
 "krypteringsmotoren ikkje ser ut til å støtta signering og kryptering. Dette "
@@ -11301,15 +11171,15 @@ msgstr "&Postboksformat:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Vel om du vil lagra meldingane i denne mappa som éi fil per melding (maildir) "
-"eller som éi stor fil (mbox). Standardvalet i KMail er maildir, og du treng "
-"neppe endra på denne innstillinga. Dersom du er usikker, kan du la innstillinga "
-"stå som ho er."
+"Vel om du vil lagra meldingane i denne mappa som éi fil per melding "
+"(maildir) eller som éi stor fil (mbox). Standardvalet i KMail er maildir, og "
+"du treng neppe endra på denne innstillinga. Dersom du er usikker, kan du la "
+"innstillinga stå som ho er."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11318,12 +11188,13 @@ msgstr "&Mappeinnhald:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Her kan du velja om du vil at den nye mappa skal brukast til e-postlagring "
-"eller til lagring av gruppevare-element som oppgåver eller notat. Standardvalet "
-"er e-post.Dersom du er usikker, kan du la innstillinga stå som ho er."
+"eller til lagring av gruppevare-element som oppgåver eller notat. "
+"Standardvalet er e-post.Dersom du er usikker, kan du la innstillinga stå som "
+"ho er."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11361,8 +11232,7 @@ msgstr "Ulike resultat for signaturar"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Krypteringsmotoren gav ikkje klartekst tilbake."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11391,8 +11261,8 @@ msgstr "Fann ingen %1-programtillegg."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Meldinga er signert, men det går ikkje å stadfesta om signaturen er gyldig."
 "<br>Grunnen er: %1"
@@ -11431,26 +11301,27 @@ msgstr "Programtillegget «%1» kan ikkje dekryptera meldingar."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Merk:</b> Denne HTML-meldinga kan innehalda eksterne referansar til bilete "
-"og liknande. Av tryggleiksgrunnar vert ikkje eksterne referansar lasta inn. "
-"Dersom du stolar på avsendaren, kan du lasta inn dei eksterne referansane til "
-"denne meldinga med <a href=\"kmail:loadExternal\">denne lenkja</a>."
+"<b>Merk:</b> Denne HTML-meldinga kan innehalda eksterne referansar til "
+"bilete og liknande. Av tryggleiksgrunnar vert ikkje eksterne referansar "
+"lasta inn. Dersom du stolar på avsendaren, kan du lasta inn dei eksterne "
+"referansane til denne meldinga med <a href=\"kmail:loadExternal\">denne "
+"lenkja</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Merk:</b> Dette er ei HTML-melding. Av tryggleiksgrunnar vert berre rein "
-"HTML-kode vist. Dersom du stolar på avsendaren, kan du slå på formatert "
-"HTML-vising av denne meldinga med <a href=\"kmail:showHTML\">denne lenkja</a>."
+"HTML-kode vist. Dersom du stolar på avsendaren, kan du slå på formatert HTML-"
+"vising av denne meldinga med <a href=\"kmail:showHTML\">denne lenkja</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11695,7 +11566,8 @@ msgstr "Åtvaring:"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"E-postadressa til avsendaren er ikkje lagra i %1 som vert bruka til signering."
+"E-postadressa til avsendaren er ikkje lagra i %1 som vert bruka til "
+"signering."
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11707,11 +11579,11 @@ msgstr "lagra: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Inga e-postadresse er lagra i %1 som vert bruka til signering. Kan difor ikkje "
-"samanlikna med avsendaradressa %2."
+"Inga e-postadresse er lagra i %1 som vert bruka til signering. Kan difor "
+"ikkje samanlikna med avsendaradressa %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11827,10 +11699,11 @@ msgstr "Kioslave-feilmelding"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "POP3-tenaren støttar ikkje UIDL-kommandoen. Denne kommandoen trengst for at "
 "KMail på ein påliteleg måte skal kunna finna ut kva for e-postar du har "
@@ -11856,7 +11729,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Hentar melding %1 av %2 (%3 av %4 KB) for %5@%6 (%7 KB att på tenaren)."
 
@@ -11874,1824 +11748,14 @@ msgstr "Ugyldig svar frå tenaren"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Tenaren støttar ikkje TOP-kommandoen. Difor kan ikkje KMail henta berre "
 "meldingshovuda til store e-postar før dei vert lasta ned."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Gå"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "M&appe"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Melding"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Svar spesielt"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Send &vidare"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-verktøylinje"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signering"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Si&gner meldingar automatisk"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Vel om alle meldingane du sender skal signerast. Du kan sjølvsagt uansett velja "
-"om kvar enkel melding skal signerast eller ikkje."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Kryptering"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Når dette valet er på, vil meldinga/fila ikkje berre bli kryptert med "
-"mottakaren sin offentlege nøkkel, men også med din eigen. Dette vil gjera deg i "
-"stand til å dekryptera meldinga/fila seinare. Dette er generelt ein god idé."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Vis s&ignert/kryptert tekst når du er ferdig"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Når dette valet er på vil den signerte/krypterte teksten bli vist i eit separat "
-"vindauge, noko som gjer det mogleg å sjå korleis det vil sjå ut før meldinga "
-"vert sendt. Dette er ein god idé når du sjekkar om krypteringssystemet "
-"fungerer."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Lagra sendte meldingar &krypterte"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Kryss av for å lagra meldingar krypterte "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Lagra meldingar kryptert</h1> Her kan du velja om dei sende meldingane skal "
-"lagrast slik dei vart krypterte. Dette er ikkje tilrådd, sidan du ikkje lenger "
-"vil kunna lesa meldinga dersom eitt av sertifikata er forelda. "
-"<p>Lokal praksis kan krevja at dette alternativet er på. Kontakt "
-"systemadministratoren dersom du er i tvil.</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Vis alltid krypteringsnøklane &for godkjenning"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Når dette valet er slått på vil programmet alltid visa deg ei liste over "
-"offentlege nøklar der du kan velja kva for nøkkel som skal brukast til "
-"kryptering. Viss det er slått av vil programmet berre visa dialogen viss den "
-"rette nøkkelen ikkje blir funne eller hvis det er fleire som kan brukast."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Kr&ypter automatisk meldingar når det går"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Viss dette valet er slått på, vil kvar melding du sender bli kryptert dersom "
-"det er mogleg og ønskjeleg. Det er naturlegvis framleis mogleg å slå av den "
-"automatiske krypteringa for kvar melding individuelt."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Aldri signer/krypter når ein kladd blir &lagra"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Til:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopi: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Generelt"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Svar til"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Svar til &alle …"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "Send &vidare"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Snøggtast:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Mappeeigenskapar"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Mappa held ei e-postliste"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "adresse for e-&postliste:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Ulesen:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Forelding av meldingar"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Forelda etter:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Foreld &leste meldingar"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Foreld e&tter:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Foreld &uleste meldingar"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "dag(ar)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "veke(r)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "månad(er)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avansert"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Avsendar&identitet:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Lagringsformat:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listevisingar:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Sjekk om sertifikat er gyldig ved å bruka CRL'ar"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Viss dette valet er på, vil S/MIME-sertifikat bli validert ved bruk av "
-"«Certificate Revocation Lists» (CRL-ar)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Valider sertifikat på internett (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Viss dette valet er slått på, vil S/MIME-sertifikat bli validert på internett "
-"ved hjelp av «Online Certificates Status Protocol» (OCSP). Fyll inn nettadressa "
-"til OCSP-tilbydaren under."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Validering av sertifikat over internett"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Adresse for OCSP-tilbydar:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Skriv inn nettadressa til tenaren for validering av sertifikat (OCSP-tilbydar). "
-"Nettadressa startar vanlegvis med http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Signatur for OCSP-tilbydar:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorer teneste-URL til sertifikata"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Ikkje sjekk sertifikatpraksis"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Standardinstillinga til GnuPG er å bruka fila ~/.gnupg/policies.txt for å "
-"sjekka om ein sertifikatpraksis er tilleten. Viss dette valet er slått på vil "
-"det ikke bli sjekka."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Aldri sjekk med ein CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Viss dette valet er slått på, vil «Certificate Revocation Lists» aldri bli "
-"bruka til å validera S/MIME-sertifikat."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Hent manglande utferdarsertifikat"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Viss dette valet er slått på, vil manglande utstedersertifikat bli henta når "
-"det er nødvendig (dette gjeld for begge valideringsmetodane, CRL og OSCP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-førespurnader"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Ikkje utfør nokon HTTP-førespurnader"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Slår bruken av HTTP for S/MIME heilt av."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Bruk denne mellomtenaren for HTTP-førespurnader: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Bruk HTTP-mellomtenaren til systemet:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Dersom dette alternativet er valt, vert HTTP-mellomtenaren til høgre bruka til "
-"alle HTTP-førespurnader. (Verdien kjem frå miljøvariabelen http_proxy.)"
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Her kan du oppgje adressa til HTTP-mellomtenaren som skal brukast til alle "
-"HTTP-førespurnader knytte til S/MIME. Syntaksen er vert:port, til dømes "
-"minmellomtenar.example.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorer HTTP CRL-distribusjonspunkt for sertifikat"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Når det vert leita etter adressa til ein CRL, vil sertifikatet som skal testast "
-"vanlegvis innehalda såkalla CRL-distribusjonspunkt (DP). Det er nettadresser "
-"som skildrar korleis ein får tilgang til adressa. Den første DP-oppføringa vert "
-"bruka.  Med dette alternativet vert alle oppføringar som brukar HTTP ignorerte "
-"når det vert leita etter ein brukbar DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-førespurnader"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Ikkje utfør nokon LDAP-førespurnader"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Slår bruken av LDAP for S/MIME heilt av."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorer LDAP CRL-distribusjonspunkt for sertifikat"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Når det vert leita etter adressa til ein CRL, vil sertifikatet som skal testast "
-"vanlegvis innehalda såkalla CRL-distribusjonspunkt (DP). Det er nettadresser "
-"som skildrar korleis ein får tilgang til adressa. Den første DP-oppføringa vert "
-"bruka.  Med dette alternativet vert alle oppføringar som brukar LDAP ignorerte "
-"når det vert leita etter ein brukbar DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primær vert for LDAP-førespurnader:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Dersom du skriv inn ein LDAP-tenar her, vert alle LDAP-førespurnader sende til "
-"den tenaren først. Denne innstillinga vil overstyra alle vert- og portdelar i "
-"ei LDAP-adresse og vert òg bruka dersom vert og port ikkje er oppgjevne i "
-"adressa. Andre LDAP-tenarar vert berre bruka dersom sambandet til mellomtenaren "
-"mislukkast.\n"
-"Syntaksen er «VERT» eller «VERT:PORT». Dersom PORT ikkje er oppgjeve, vert "
-"LDAP-standardporten 389 bruka."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Legg til …"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Gruppevare"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Tilbakestill skriftinstillingane"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "uendeleg"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Signaturoppsett"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Svar til avsendar:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Vidaresendt melding"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Varsel før sending av &usignerte meldingar"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Kryss av her for å verta varsla ved sending av usignerte meldingar."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel før sending av usignerte meldingar</h1> Her kan du velja å få varsel "
-"dersom du prøver å senda ei melding som er heilt eller delvis usignert. "
-"<p>Dette alternativet bør vera på for best mogleg tryggleik.</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Varsel før sending av ukrypterte meldingar"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Kryss av for å varslast ved sending av ukrypterte meldingar."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel før sending av ukrypterte meldingar</h1> Her kan du velja om du skal "
-"få varsel dersom du prøver å senda ei melding som er delvis eller heilt "
-"ukryptert. "
-"<p>Dette alternativet bør vera slått på for best mogleg tryggleik.</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Varsel dersom mottakaradressa &ikkje ligg i sertifikatet"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Kryss av for å varslast dersom adressa ikkje ligg i sertifikatet"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel dersom mottakaradressa ikkje ligg i sertifikatet</h1> "
-"Her kan du velja om du skal få varsel dersom e-postadressa til mottakaren "
-"manglar i sertifikatet som er bruka til kryptering. "
-"<p>Dette alternativet bør vera på for best mogleg tryggleik.</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Gje varsel dersom sertifikat/nøklar går ut snart (set opp grenser under)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Bruk til signering"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "For kryptering"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dagar"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Vel talet på dagar her"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel dersom signatursertifikatet vert forelda</h1> "
-"Her kan du velja det minste talet på dagar signatursertifikatet skal vera "
-"gyldig før du vert varsla. "
-"<p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel dersom krypteringssertifikat vil bli forelda</h1> "
-"Vel det minste talet på dagar krypteringssertifikatet må vera gyldige før det "
-"vert gjeve varsel. "
-"<p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel dersom eit sertifikat i kjeda vil bli forelda</h1> "
-"Vel det minste talet på dagar alle sertifikata i kjeda må vera gyldige før det "
-"vert gjeve varsel. "
-"<p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel dersom CA-sertifikatet vert forelda</h1> Her kan du velja det minste "
-"talet på dagar CA-sertifikatet skal vera gyldig før du vert varsla. "
-"<p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>"
-"<h1>Varsel dersom rotsertifikatet vert forelda</h1> Her kan du velja det minste "
-"talet på dagar rotsertifikatet skal vera gyldig før du vert varsla. "
-"<p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "For rotsertifikat:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "For mellomsertifikat for CA:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "For sluttbrukarsertifikat/nøklar:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Slå på igjen alle «Ikkje spør igjen»-åtvaringar"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Mappeinnhald:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Send meldingar i kø når e-post vert sjekka"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vel om du vil at KMail ska senda alle meldingar i utboksen ved manuell eller "
-"sjekk all e-post eller om du ikkje vil at meldingar skal sendast automatisk i "
-"det heile. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Nokre av dei nye meldingane i denne mappa (%1) er ikkje lasta opp til "
-"tenaren enno, men det ser ikkje ut til at du har tilstrekkelege tilgangsløyve "
-"til å lasta dei opp. Ta kontakt med administratoren for å tillata opplasting av "
-"nye meldingar, eller flytt meldingane ut av denne mappa.</p>"
-"<p>Vil du flytta desse meldingane til ei anna mappe no?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Den mest nyleg valde mappa i dialogen for mappeval."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Praksis for vising av ikon i systemtrauet"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Påminning ved ny e-post"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Viss dette valet er på vil kvar mappe vise talet på nye meldingar i påminninga "
-"om ny e-post. Viss ikkje vil du berre få ei enkel «Ny e-post motteken» melding."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "O&ppgje skriveprogram:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Bruk eit anna &skriveprogram enn KMail sitt eige"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Slå på gruppevare funksjonalitet"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Skyfle om Frå:/Til:-meldingshovud i svar på svar"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook har fleire manglar i sin implementasjon av "
-"iCalendar-standarden. Dette valet unngår ein av dei. Viss du har problem med at "
-"Outlook brukarar ikkje kan få svara dine, prøv å slå på dette valet."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Send gruppevareinvitasjonar i meldingsteksten."
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook har fleire manglar i sin implementasjon av "
-"iCalendar-standarden. Dette valet unngår ei av dei. Viss du har problem med at "
-"Outlook brukarar ikkje kan få invitasjonane dine, prøv å slå på dette valet."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automatisk invitasjonssending"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Dersom dette er vald, får du ikkje sjå meldingsvindauget. I staden vert alle "
-"invitasjonsmeldingar sende automatisk. Dersom du vil sjå meldingane før dei "
-"vert sende, kan du slå av dette alternativet. Ver klar over at teksten i "
-"meldinga vil vera i iCalendar-syntaks, og at du ikkje bør prøva å endra denne "
-"for hand."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Ved å slå på dette vil det vera mogleg å lagra elementa frå Kontactprogramma "
-"(KOrganizer, KAdressBook og KNotes.)</p>"
-"<p>Viss du vil slå på dette valet må du også setje programma til å bruka "
-"IMAP-ressursen: dette kan gjerast i TDE Kontrollsenter.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Vanlegvis har du ingen grunn til å sjå mappene som inneheld IMAP-ressursane. "
-"Men viss du treng å sjå dei kan du setje det her.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Vel lagringsformatet til gruppevaremapper. "
-"<ul>"
-"<li>Standardformatet er ical (for kalendermapper) og vcard (for "
-"adressebokmapper). Med desse formata kan alle Kontact-funksjonane brukast.</li> "
-"<li>Kolab XML-formatet brukar ein tilpassa modell som passar betre til den "
-"Outlook brukar. Dette formatet gjev betre samspel med Outlook, og passar fint "
-"om du brukar ein Kolab-tenar eller ei kompatibel løysing.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Dette vel rotmappa i IMAP-ressursen.</p> "
-"<p>Som standard set Kolab-tjeneren IMAP-innboksen til rotmappe.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Dette er ID'en til kontoen som inneheld IMAP-ressursmappene.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Viss du vil setje mappenamna i IMAP-lagringa til ditt lokale språk , kan du "
-"velje mellom desse tilgjengelege språka.</p> "
-"<p> Merk at den einaste grunnen til å gjera dette er for kompatibilitet med "
-"Microsoft Outlook. Det er generelt sett en dårleg ide å gjera dette sidan det "
-"gjer det umogleg å skifta språk. </p>"
-"<p>Så slå på dette berre viss du er heilt nøydd.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Denne verdien vert bruka for å avgjera om KMail-introduksjonen skal vistast."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimalt tal på tilkoblingar per vert"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Dette kan brukast til å avgrensa tal på oppkoplingar per vert ved sjekking av "
-"nye meldingar. Standard tal på oppkoplingar er uavgrensa (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Vis redigeringslinje for snøggsøk"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Dette valet slår på eller av redigering av søkjelinja over meldingslista som "
-"kan brukast til rask gjennomsøkjing av informasjonen i meldingslista."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "Bruk same teiknkoding ved svar eller vidaresending (dersom det går)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Legg automatisk til signatur"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Husk denne identiteten, slik at han vert bruka seinare i «Ny melding»-vindauge "
-"òg.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Husk denne mappa for sendte element, slik at ho vert bruka i framtidige «Ny "
-"melding»-vinduage også."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Hugs denne e-posttransporten, slik at han vert bruka i framtidige «Ny "
-"melding»-vindauge også."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Husk denne identiteten, slik at han vert bruka seinare i «Ny melding»-vindauge "
-"òg.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Tekstbryting ved &kolonne:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "&Varsel dersom rotsertifikatet går ut innan:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Slå på dette valet for å få Outlook &#8482; til å forstå namn på vedlegg med "
-"ikkje-engelske teikn."
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Be automatisk om &meldingskvittering"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Slå på dette valet viss du vil at KMail skal be om meldingskvittering (MDN) "
-"for kvar utgåande melding.</p>"
-"<p>Dette valet påverkar berre standardinnstillinga, du kan framleis slå på "
-"eller av meldingskvittering for kvar melding frå menyen når du skriv meldinga: "
-"<em>Innstillingar</em>->&gt;<em>Be om meldingskvittering</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Bruk nyleg bruka adresser ved autofullføring"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Slå av dette dersom du ikkje vil at nyleg bruka adresser skal visast i "
-"autofullføringslista til adressefelta."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Intervall for autolagring:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Det kan takast regelmessige tryggingskopiar av teksten du skriv i «Ny "
-"melding»-vindauget. Intervallet mellom kvar tryggingskopi set du her. Du kan "
-"slå av automatisk tryggingskopi ved å setja denne verdien til 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Byt ut attkjende &prefiksar med «Re:»"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Byt ut attkjende prefiksar med «&Fwd:»"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Br&uk smart sitering"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Signaturen er forelda."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Type adresseveljar"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Set typen for mottakarboksen til Til,\n"
-"        Kopi og Blindkopi."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Type mottakarfelt"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Vel type mottakarfelt for redigering av Til,\n"
-"        CC og BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Høgste tal på linjer i mottakarfeltet."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "Bruk same teiknkoding ved svar eller vidaresending (dersom det går)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Enkelte meldingar, spesielt dei som vert oppretta automatisk, oppgjev ikkje kva "
-"teiknkoding dei skal visast med. I slike tilfelle vert den reserveteiknkodinga "
-"som er vald her bruka. Det er lurt å velja den teiknkodinga som er vanlegast "
-"der du bur. Standardvalet er den teiknkodinga som systemet brukar."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Dersom du endrar dette frå «Automatisk», vert alle meldingar viste med den "
-"valde teiknkodinga, uansett kva dei sjølve spesifiserer."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Her kan du velja om du vil at fjesingar som til dømes :-) skal visast som tekst "
-"eller som små bilete."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Nivå for automatisk samanfalding"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Vis sitert tekst med mindre skrift"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Lagra sendte meldingar &krypterte"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Vis &søppelpoststatus i stilige meldingshovud"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Send meldingskvitteringar med tom avsendar."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Meldingsliste – nye meldingar"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Legg til &sitatteikn"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13802,6 +11866,11 @@ msgstr "Legg til som Kopi"
 msgid "Add as BCC"
 msgstr "Legg til som Blindkopi"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Avbryt"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13817,15 +11886,15 @@ msgstr "Valde mottakarar"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Du valde éin mottakar. Det høgste talet på mottakarar som kan brukast er %1. Du "
-"må endra på mottakarlista.\n"
-"Du valde %n mottakarar. Det høgste talet på mottakarar som kan brukast er %1. "
-"Du må endra på mottakarlista."
+"Du valde éin mottakar. Det høgste talet på mottakarar som kan brukast er %1. "
+"Du må endra på mottakarlista.\n"
+"Du valde %n mottakarar. Det høgste talet på mottakarar som kan brukast er "
+"%1. Du må endra på mottakarlista."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13841,11 +11910,11 @@ msgstr "Bruk dialogvindauget for adresseval"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Denne knappen opnar eit dialogvindauge der du kan velja mottakarar ut frå alle "
-"dei tilgjengelege adressene."
+"Denne knappen opnar eit dialogvindauge der du kan velja mottakarar ut frå "
+"alle dei tilgjengelege adressene."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -13947,13 +12016,22 @@ msgstr "er større eller lik"
 msgid " bytes"
 msgstr " byte"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dagar"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Alle meldingane i mappa %1 må lastast ned før søket kan utførast. Dette kan ta "
-"litt tid. Vil du halda fram med søket?"
+"Alle meldingane i mappa %1 må lastast ned før søket kan utførast. Dette kan "
+"ta litt tid. Vil du halda fram med søket?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14106,16 +12184,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Hentar data for kontoen «%1» ...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Hentar data for kontoen «%1» ...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14134,10 +12208,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Innhald i skriptet «%1»:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Innhald i skriptet «%1»:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14160,20 +12232,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-eigenskapar:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-eigenskapar:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Ingen spesielle eigenskapar er tilgjengelege.)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Tilgjengelege Sieve-skript:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Tilgjengelege Sieve-skript:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14251,8 +12319,8 @@ msgstr "Bruk dette feltet til å skriva inn ein statisk signatur."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Bruk denne boksen til oppgje ei tekstfil som inneheld signaturen din. Ho vil "
 "bli lesen kvar gong du skriv ein ny e-post eller legg til ein ny signatur."
@@ -14271,21 +12339,26 @@ msgstr "Opnar den oppgjevne fila i eit skriveprogram."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Du kan setja inn ein vilkårleg kommando her, anten med eller utan stig avhengig "
-"om kommandoen er i PATH. For kvar ny e-post, vil KMail køyra kommandoen og "
-"bruka utdataa som ein signatur. Vanlege kommandoar med slike mekanismar er "
-"«fortune» eller «ksig -random»."
+"Du kan setja inn ein vilkårleg kommando her, anten med eller utan stig "
+"avhengig om kommandoen er i PATH. For kvar ny e-post, vil KMail køyra "
+"kommandoen og bruka utdataa som ein signatur. Vanlege kommandoar med slike "
+"mekanismar er «fortune» eller «ksig -random»."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "O&ppgje kommando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Stig"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Ny oppføring:"
@@ -14322,6 +12395,11 @@ msgstr "Legg til konto"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Er du sikker på at du vil fjerna identiteten <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "B&ruk på:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14336,6 +12414,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Rediger skript …"
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14375,9 +12457,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14417,6 +12499,16 @@ msgstr ""
 "Kan ikkje opna fila «%1»:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Til:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopi: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14449,36 +12541,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14488,8 +12576,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14505,8 +12592,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14548,8 +12634,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -14719,6 +12804,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14755,108 +12844,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>… at du kan gå til den neste og førre meldinga ved å bruka høgre og venstre "
-"piltast?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>… at du enkelt kan laga filter på avsendar, mottakar,\n"
-"emne og e-postliste med <em>Verktøy-&gt;Lag&nbsp;filter</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>… at du kan bruka eit filter til å bli kvitt «[namnet på e-postlista]» som "
-"du finn i emneteksten til enkelte e-postlister? Bruk "
-"<pre>skriv om meldingshovud «Subject» \n"
-"    byt ut «\\s*\\[namnet på e-postlista\\]\\s*&quot;\n"
-"   med «»</pre></p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>… at du kan knyta e-postlister til mapper i dialogen <em>"
-"Mappe – Handtering av e-postliste</em>? På denne måten kan du bruka <em>"
-"Melding – Ny&nbsp;melding&nbsp;til&nbsp;e-postliste</em>\n"
-"for å laga ei ny melding adressert til e-postlista.\n"
-"Alternativt kan du trykkja med midterste museknapp på mappa.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>… at du kan gje eigne ikon til kvar av mappene? Sjå <em>"
-"Mapper-&gt;Eigenskapar</em>.</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>… at KMail kan visa ein fargestolpe som viser kva for type melding (rein "
-"tekst / HTML / OpenPGP) som vert vist?</p> "
-"<p>Slik kan du avsløra forsøk på å forfalska gyldige signaturar ved å senda "
-"HTML-meldingar som etterliknar signaturmeldingane til KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>… at du kan filtrera på eit vilkårleg meldingshovud ved berre å skriva "
-"namnet i det første skrivefeltet i søkjeregelen?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>… at du kan filtrera ut alle HTML-meldingane med regelen\n"
-"<pre>«Content-type» inneheld «text/html»?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>… at når du svarar, berre den merkte delen av meldinga blir sitert?</p>\n"
-"<p>Viss ingenting er valt, vil heile meldinga bli sitert.</p>\n"
-"<p>Det verkar til og med med tekst frå vedlegg når du vel\n"
-"<em>Vis-&gt;Vedlegg-&gt;Inni&nbsp;meldinga</em>.</p>\n"
-"<p>Denne eigenskapen er tilgjengeleg for alle «svar til»-kommandoar utanom\n"
-"<em>Melding-&gt;Svar&nbsp;utan&nbsp;signering</em>.</p>\n"
-"<p align=\"right\"><em>bidrag frå Davig F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Ingenting å angra."
@@ -14924,6 +12911,15 @@ msgstr "Vedlegg #%1 (namnlaus)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Fila «%1» finst frå før. Vil du skriva over henne?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Skriv over fil?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14955,7 +12951,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Tenaren din lista ikkje opp «ferie» i si liste over støtta Sieve-utvidingar.\n"
+"Tenaren din lista ikkje opp «ferie» i si liste over støtta Sieve-"
+"utvidingar.\n"
 "Utan dette kan ikkje KMail leggja inn vekke-meldingar for deg.\n"
 "Ta kontakt med systemadministratoren din."
 
@@ -15039,12 +13036,12 @@ msgstr "Send &bilete med kvar melding"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Her kan du velja om KMail skal leggja til eit såkalla X-Face til meldingar som "
-"er skrivne med denne identiteten. Eit X-Face er eit lite (48×48 pikslar) "
+"Her kan du velja om KMail skal leggja til eit såkalla X-Face til meldingar "
+"som er skrivne med denne identiteten. Eit X-Face er eit lite (48×48 pikslar) "
 "svart-kvitt-bilete som enkelte e-postprogram kan visa."
 
 #: xfaceconfigurator.cpp:100
@@ -15073,9 +13070,9 @@ msgstr "Vel fil …"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Her kan du velja ei biletfil som biletet skal lagast frå. Biletet bør ha høg "
 "kontrast og vera nesten kvadratisk. Lys bakgrunn gjev best resultat."
@@ -15086,21 +13083,21 @@ msgstr "Set frå adresseboka"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Du kan bruka ein nedskalert versjon av det biletet som ligg i adresseboka."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail kan senda med eit lite (48×48 pikslar) svart-kvitt-bilete i låg "
-"kvalitet i kvar melding. Dette kan til dømes vera eit bilete av deg sjølv eller "
-"eit teikn. Dersom e-postprogrammet til mottakaren støttar X-Face, vert biletet "
-"vist hos mottakaren."
+"kvalitet i kvar melding. Dette kan til dømes vera eit bilete av deg sjølv "
+"eller eit teikn. Dersom e-postprogrammet til mottakaren støttar X-Face, vert "
+"biletet vist hos mottakaren."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15108,11 +13105,11 @@ msgstr "Bruk dette feltet til å skriva inn ein vilkårleg X-Face-streng."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Du finn nokre døme på <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Du finn nokre døme på <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
+"www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15127,128 +13124,1707 @@ msgstr "Ingen bilete"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Du har ikkje definert din eigen kontakt i adresseboka."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signering"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Si&gner meldingar automatisk"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Vel om alle meldingane du sender skal signerast. Du kan sjølvsagt uansett "
+"velja om kvar enkel melding skal signerast eller ikkje."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Kryptering"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Vel emne for meldinga"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Når dette valet er på, vil meldinga/fila ikkje berre bli kryptert med "
+"mottakaren sin offentlege nøkkel, men også med din eigen. Dette vil gjera "
+"deg i stand til å dekryptera meldinga/fila seinare. Dette er generelt ein "
+"god idé."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Send kopi til «adresse»"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Vis s&ignert/kryptert tekst når du er ferdig"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Send blindkopi til «adresse»"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Når dette valet er på vil den signerte/krypterte teksten bli vist i eit "
+"separat vindauge, noko som gjer det mogleg å sjå korleis det vil sjå ut før "
+"meldinga vert sendt. Dette er ein god idé når du sjekkar om "
+"krypteringssystemet fungerer."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Legg «meldingshovud» til melding"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Lagra sendte meldingar &krypterte"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Les meldingskropp frå «fil»"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Kryss av for å lagra meldingar krypterte "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Vel meldingskropp"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Lagra meldingar kryptert</h1> Her kan du velja om dei sende "
+"meldingane skal lagrast slik dei vart krypterte. Dette er ikkje tilrådd, "
+"sidan du ikkje lenger vil kunna lesa meldinga dersom eitt av sertifikata er "
+"forelda. <p>Lokal praksis kan krevja at dette alternativet er på. Kontakt "
+"systemadministratoren dersom du er i tvil.</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Legg vedlegg til e-posten. Kan gjerast fleire gonger"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Vis alltid krypteringsnøklane &for godkjenning"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Berre sjekk for ny e-post"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Når dette valet er slått på vil programmet alltid visa deg ei liste over "
+"offentlege nøklar der du kan velja kva for nøkkel som skal brukast til "
+"kryptering. Viss det er slått av vil programmet berre visa dialogen viss den "
+"rette nøkkelen ikkje blir funne eller hvis det er fleire som kan brukast."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Berre opna redigeringsvindauge"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Kr&ypter automatisk meldingar når det går"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Vis den oppgjevne meldingsfila"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Viss dette valet er slått på, vil kvar melding du sender bli kryptert dersom "
+"det er mogleg og ønskjeleg. Det er naturlegvis framleis mogleg å slå av den "
+"automatiske krypteringa for kvar melding individuelt."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Send melding til «adresse» høvesvis legg ved fila URL-en peikar mot"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Aldri signer/krypter når ein kladd blir &lagra"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lesen"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Gamal"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Generelt"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Sletta"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Svar til"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Svart på"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Svar til &alle …"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Vidaresendt"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "Send &vidare"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Lagd i kø"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Snøggtast:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sendt"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Overvaka"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Mappeinnhald:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorert"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Søppelpost"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ikkje søppelpost"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Mappeeigenskapar"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Hugseliste"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Mappa held ei e-postliste"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Har vedlegg"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "adresse for e-&postliste:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Ulesen:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Forelding av meldingar"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Forelda etter:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Foreld &leste meldingar"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Foreld e&tter:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Foreld &uleste meldingar"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "dag(ar)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "veke(r)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "månad(er)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avansert"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Avsendar&identitet:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Lagringsformat:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listevisingar:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Send meldingar i kø når e-post vert sjekka"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Vel om du vil at KMail ska senda alle meldingar i utboksen ved "
+"manuell eller sjekk all e-post eller om du ikkje vil at meldingar skal "
+"sendast automatisk i det heile. </p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Stig"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Fila «%1» finst frå før. Vil du skriva over henne?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Nokre av dei nye meldingane i denne mappa (%1) er ikkje lasta opp til "
+"tenaren enno, men det ser ikkje ut til at du har tilstrekkelege "
+"tilgangsløyve til å lasta dei opp. Ta kontakt med administratoren for å "
+"tillata opplasting av nye meldingar, eller flytt meldingane ut av denne "
+"mappa.</p><p>Vil du flytta desse meldingane til ei anna mappe no?</p>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Skriv over fil?"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Den mest nyleg valde mappa i dialogen for mappeval."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Praksis for vising av ikon i systemtrauet"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Påminning ved ny e-post"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Viss dette valet er på vil kvar mappe vise talet på nye meldingar i "
+"påminninga om ny e-post. Viss ikkje vil du berre få ei enkel «Ny e-post "
+"motteken» melding."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "O&ppgje skriveprogram:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Bruk eit anna &skriveprogram enn KMail sitt eige"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Slå på gruppevare funksjonalitet"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Skyfle om Frå:/Til:-meldingshovud i svar på svar"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook har fleire manglar i sin implementasjon av iCalendar-"
+"standarden. Dette valet unngår ein av dei. Viss du har problem med at "
+"Outlook brukarar ikkje kan få svara dine, prøv å slå på dette valet."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Send gruppevareinvitasjonar i meldingsteksten."
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook har fleire manglar i sin implementasjon av iCalendar-"
+"standarden. Dette valet unngår ei av dei. Viss du har problem med at Outlook "
+"brukarar ikkje kan få invitasjonane dine, prøv å slå på dette valet."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automatisk invitasjonssending"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Dersom dette er vald, får du ikkje sjå meldingsvindauget. I staden vert alle "
+"invitasjonsmeldingar sende automatisk. Dersom du vil sjå meldingane før dei "
+"vert sende, kan du slå av dette alternativet. Ver klar over at teksten i "
+"meldinga vil vera i iCalendar-syntaks, og at du ikkje bør prøva å endra "
+"denne for hand."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Ved å slå på dette vil det vera mogleg å lagra elementa frå "
+"Kontactprogramma (KOrganizer, KAdressBook og KNotes.)</p><p>Viss du vil slå "
+"på dette valet må du også setje programma til å bruka IMAP-ressursen: dette "
+"kan gjerast i TDE Kontrollsenter.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Vanlegvis har du ingen grunn til å sjå mappene som inneheld IMAP-"
+"ressursane. Men viss du treng å sjå dei kan du setje det her.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Vel lagringsformatet til gruppevaremapper. <ul><li>Standardformatet er "
+"ical (for kalendermapper) og vcard (for adressebokmapper). Med desse formata "
+"kan alle Kontact-funksjonane brukast.</li> <li>Kolab XML-formatet brukar ein "
+"tilpassa modell som passar betre til den Outlook brukar. Dette formatet gjev "
+"betre samspel med Outlook, og passar fint om du brukar ein Kolab-tenar eller "
+"ei kompatibel løysing.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Dette vel rotmappa i IMAP-ressursen.</p> <p>Som standard set Kolab-"
+"tjeneren IMAP-innboksen til rotmappe.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Dette er ID'en til kontoen som inneheld IMAP-ressursmappene.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Viss du vil setje mappenamna i IMAP-lagringa til ditt lokale språk , kan "
+"du velje mellom desse tilgjengelege språka.</p> <p> Merk at den einaste "
+"grunnen til å gjera dette er for kompatibilitet med Microsoft Outlook. Det "
+"er generelt sett en dårleg ide å gjera dette sidan det gjer det umogleg å "
+"skifta språk. </p><p>Så slå på dette berre viss du er heilt nøydd.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Denne verdien vert bruka for å avgjera om KMail-introduksjonen skal vistast."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimalt tal på tilkoblingar per vert"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Dette kan brukast til å avgrensa tal på oppkoplingar per vert ved sjekking "
+"av nye meldingar. Standard tal på oppkoplingar er uavgrensa (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Vis redigeringslinje for snøggsøk"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Dette valet slår på eller av redigering av søkjelinja over meldingslista som "
+"kan brukast til rask gjennomsøkjing av informasjonen i meldingslista."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "Bruk same teiknkoding ved svar eller vidaresending (dersom det går)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Legg automatisk til signatur"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Husk denne identiteten, slik at han vert bruka seinare i «Ny melding»-"
+"vindauge òg.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Husk denne mappa for sendte element, slik at ho vert bruka i framtidige «Ny "
+"melding»-vinduage også."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Hugs denne e-posttransporten, slik at han vert bruka i framtidige «Ny "
+"melding»-vindauge også."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Husk denne identiteten, slik at han vert bruka seinare i «Ny melding»-"
+"vindauge òg.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Tekstbryting ved &kolonne:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "&Varsel dersom rotsertifikatet går ut innan:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Slå på dette valet for å få Outlook &#8482; til å forstå namn på vedlegg med "
+"ikkje-engelske teikn."
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Be automatisk om &meldingskvittering"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Slå på dette valet viss du vil at KMail skal be om meldingskvittering "
+"(MDN) for kvar utgåande melding.</p><p>Dette valet påverkar berre "
+"standardinnstillinga, du kan framleis slå på eller av meldingskvittering for "
+"kvar melding frå menyen når du skriv meldinga: <em>Innstillingar</em>->&gt;"
+"<em>Be om meldingskvittering</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Bruk nyleg bruka adresser ved autofullføring"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Slå av dette dersom du ikkje vil at nyleg bruka adresser skal visast i "
+"autofullføringslista til adressefelta."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Intervall for autolagring:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Det kan takast regelmessige tryggingskopiar av teksten du skriv i «Ny "
+"melding»-vindauget. Intervallet mellom kvar tryggingskopi set du her. Du kan "
+"slå av automatisk tryggingskopi ved å setja denne verdien til 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Byt ut attkjende &prefiksar med «Re:»"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Byt ut attkjende prefiksar med «&Fwd:»"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Br&uk smart sitering"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Signaturen er forelda."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Type adresseveljar"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Set typen for mottakarboksen til Til,\n"
+"        Kopi og Blindkopi."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Type mottakarfelt"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Vel type mottakarfelt for redigering av Til,\n"
+"        CC og BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Høgste tal på linjer i mottakarfeltet."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "Bruk same teiknkoding ved svar eller vidaresending (dersom det går)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Enkelte meldingar, spesielt dei som vert oppretta automatisk, oppgjev ikkje "
+"kva teiknkoding dei skal visast med. I slike tilfelle vert den "
+"reserveteiknkodinga som er vald her bruka. Det er lurt å velja den "
+"teiknkodinga som er vanlegast der du bur. Standardvalet er den teiknkodinga "
+"som systemet brukar."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Dersom du endrar dette frå «Automatisk», vert alle meldingar viste med den "
+"valde teiknkodinga, uansett kva dei sjølve spesifiserer."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Her kan du velja om du vil at fjesingar som til dømes :-) skal visast som "
+"tekst eller som små bilete."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Nivå for automatisk samanfalding"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Vis sitert tekst med mindre skrift"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Lagra sendte meldingar &krypterte"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Vis &søppelpoststatus i stilige meldingshovud"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Send meldingskvitteringar med tom avsendar."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Meldingsliste – nye meldingar"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Legg til &sitatteikn"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Rediger &fil"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Rediger …"
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Gå"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "M&appe"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Melding"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Svar spesielt"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Send &vidare"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Tilbakestill skriftinstillingane"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-verktøylinje"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Vanlege innstillingar"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-verktøylinje"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Sjekk om sertifikat er gyldig ved å bruka CRL'ar"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Viss dette valet er på, vil S/MIME-sertifikat bli validert ved bruk av "
+"«Certificate Revocation Lists» (CRL-ar)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Valider sertifikat på internett (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Viss dette valet er slått på, vil S/MIME-sertifikat bli validert på "
+"internett ved hjelp av «Online Certificates Status Protocol» (OCSP). Fyll "
+"inn nettadressa til OCSP-tilbydaren under."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Validering av sertifikat over internett"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Adresse for OCSP-tilbydar:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Skriv inn nettadressa til tenaren for validering av sertifikat (OCSP-"
+"tilbydar). Nettadressa startar vanlegvis med http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Signatur for OCSP-tilbydar:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorer teneste-URL til sertifikata"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Ikkje sjekk sertifikatpraksis"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Standardinstillinga til GnuPG er å bruka fila ~/.gnupg/policies.txt for å "
+"sjekka om ein sertifikatpraksis er tilleten. Viss dette valet er slått på "
+"vil det ikke bli sjekka."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Aldri sjekk med ein CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Viss dette valet er slått på, vil «Certificate Revocation Lists» aldri bli "
+"bruka til å validera S/MIME-sertifikat."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Hent manglande utferdarsertifikat"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Viss dette valet er slått på, vil manglande utstedersertifikat bli henta når "
+"det er nødvendig (dette gjeld for begge valideringsmetodane, CRL og OSCP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-førespurnader"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Ikkje utfør nokon HTTP-førespurnader"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Slår bruken av HTTP for S/MIME heilt av."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Bruk denne mellomtenaren for HTTP-førespurnader: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Bruk HTTP-mellomtenaren til systemet:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Dersom dette alternativet er valt, vert HTTP-mellomtenaren til høgre bruka "
+"til alle HTTP-førespurnader. (Verdien kjem frå miljøvariabelen http_proxy.)"
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Her kan du oppgje adressa til HTTP-mellomtenaren som skal brukast til alle "
+"HTTP-førespurnader knytte til S/MIME. Syntaksen er vert:port, til dømes "
+"minmellomtenar.example.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorer HTTP CRL-distribusjonspunkt for sertifikat"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Når det vert leita etter adressa til ein CRL, vil sertifikatet som skal "
+"testast vanlegvis innehalda såkalla CRL-distribusjonspunkt (DP). Det er "
+"nettadresser som skildrar korleis ein får tilgang til adressa. Den første DP-"
+"oppføringa vert bruka.  Med dette alternativet vert alle oppføringar som "
+"brukar HTTP ignorerte når det vert leita etter ein brukbar DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-førespurnader"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Ikkje utfør nokon LDAP-førespurnader"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Slår bruken av LDAP for S/MIME heilt av."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorer LDAP CRL-distribusjonspunkt for sertifikat"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Når det vert leita etter adressa til ein CRL, vil sertifikatet som skal "
+"testast vanlegvis innehalda såkalla CRL-distribusjonspunkt (DP). Det er "
+"nettadresser som skildrar korleis ein får tilgang til adressa. Den første DP-"
+"oppføringa vert bruka.  Med dette alternativet vert alle oppføringar som "
+"brukar LDAP ignorerte når det vert leita etter ein brukbar DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primær vert for LDAP-førespurnader:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Dersom du skriv inn ein LDAP-tenar her, vert alle LDAP-førespurnader sende "
+"til den tenaren først. Denne innstillinga vil overstyra alle vert- og "
+"portdelar i ei LDAP-adresse og vert òg bruka dersom vert og port ikkje er "
+"oppgjevne i adressa. Andre LDAP-tenarar vert berre bruka dersom sambandet "
+"til mellomtenaren mislukkast.\n"
+"Syntaksen er «VERT» eller «VERT:PORT». Dersom PORT ikkje er oppgjeve, vert "
+"LDAP-standardporten 389 bruka."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Legg til …"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Gruppevare"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Tilbakestill skriftinstillingane"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "uendeleg"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Signaturoppsett"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Svar til avsendar:"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Vidaresendt melding"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Varsel før sending av &usignerte meldingar"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Kryss av her for å verta varsla ved sending av usignerte meldingar."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel før sending av usignerte meldingar</h1> Her kan du velja å få "
+"varsel dersom du prøver å senda ei melding som er heilt eller delvis "
+"usignert. <p>Dette alternativet bør vera på for best mogleg tryggleik.</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Varsel før sending av ukrypterte meldingar"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Kryss av for å varslast ved sending av ukrypterte meldingar."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel før sending av ukrypterte meldingar</h1> Her kan du velja om "
+"du skal få varsel dersom du prøver å senda ei melding som er delvis eller "
+"heilt ukryptert. <p>Dette alternativet bør vera slått på for best mogleg "
+"tryggleik.</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Varsel dersom mottakaradressa &ikkje ligg i sertifikatet"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Kryss av for å varslast dersom adressa ikkje ligg i sertifikatet"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel dersom mottakaradressa ikkje ligg i sertifikatet</h1> Her kan "
+"du velja om du skal få varsel dersom e-postadressa til mottakaren manglar i "
+"sertifikatet som er bruka til kryptering. <p>Dette alternativet bør vera på "
+"for best mogleg tryggleik.</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Gje varsel dersom sertifikat/nøklar går ut snart (set opp grenser under)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Bruk til signering"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "For kryptering"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Vel talet på dagar her"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel dersom signatursertifikatet vert forelda</h1> Her kan du "
+"velja det minste talet på dagar signatursertifikatet skal vera gyldig før du "
+"vert varsla. <p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel dersom krypteringssertifikat vil bli forelda</h1> Vel det "
+"minste talet på dagar krypteringssertifikatet må vera gyldige før det vert "
+"gjeve varsel. <p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel dersom eit sertifikat i kjeda vil bli forelda</h1> Vel det "
+"minste talet på dagar alle sertifikata i kjeda må vera gyldige før det vert "
+"gjeve varsel. <p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel dersom CA-sertifikatet vert forelda</h1> Her kan du velja det "
+"minste talet på dagar CA-sertifikatet skal vera gyldig før du vert varsla. "
+"<p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt><h1>Varsel dersom rotsertifikatet vert forelda</h1> Her kan du velja det "
+"minste talet på dagar rotsertifikatet skal vera gyldig før du vert varsla. "
+"<p>Den tilrådde SPHINX-innstillinga er 14 dagar.</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "For rotsertifikat:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "For mellomsertifikat for CA:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "For sluttbrukarsertifikat/nøklar:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Slå på igjen alle «Ikkje spør igjen»-åtvaringar"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>… at du kan gå til den neste og førre meldinga ved å bruka høgre og "
+"venstre piltast?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>… at du enkelt kan laga filter på avsendar, mottakar,\n"
+"emne og e-postliste med <em>Verktøy-&gt;Lag&nbsp;filter</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>… at du kan bruka eit filter til å bli kvitt «[namnet på e-postlista]» "
+"som du finn i emneteksten til enkelte e-postlister? Bruk <pre>skriv om "
+"meldingshovud «Subject» \n"
+"    byt ut «\\s*\\[namnet på e-postlista\\]\\s*&quot;\n"
+"   med «»</pre></p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>… at du kan knyta e-postlister til mapper i dialogen <em>Mappe – "
+"Handtering av e-postliste</em>? På denne måten kan du bruka <em>Melding – "
+"Ny&nbsp;melding&nbsp;til&nbsp;e-postliste</em>\n"
+"for å laga ei ny melding adressert til e-postlista.\n"
+"Alternativt kan du trykkja med midterste museknapp på mappa.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>… at du kan gje eigne ikon til kvar av mappene? Sjå <em>Mapper-&gt;"
+"Eigenskapar</em>.</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>… at KMail kan visa ein fargestolpe som viser kva for type melding (rein "
+"tekst / HTML / OpenPGP) som vert vist?</p> <p>Slik kan du avsløra forsøk på "
+"å forfalska gyldige signaturar ved å senda HTML-meldingar som etterliknar "
+"signaturmeldingane til KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>… at du kan filtrera på eit vilkårleg meldingshovud ved berre å skriva "
+"namnet i det første skrivefeltet i søkjeregelen?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>… at du kan filtrera ut alle HTML-meldingane med regelen\n"
+"<pre>«Content-type» inneheld «text/html»?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>… at når du svarar, berre den merkte delen av meldinga blir sitert?</p>\n"
+"<p>Viss ingenting er valt, vil heile meldinga bli sitert.</p>\n"
+"<p>Det verkar til og med med tekst frå vedlegg når du vel\n"
+"<em>Vis-&gt;Vedlegg-&gt;Inni&nbsp;meldinga</em>.</p>\n"
+"<p>Denne eigenskapen er tilgjengeleg for alle «svar til»-kommandoar utanom\n"
+"<em>Melding-&gt;Svar&nbsp;utan&nbsp;signering</em>.</p>\n"
+"<p align=\"right\"><em>bidrag frå Davig F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15343,13 +14919,18 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Krypter alle meldingsdelar som standard</h1> Med denne funksjonen, blir alle delane av meldinga (altså hovuddelen og alle vedlegg) krypterte som standard. <p>Dette er ei standardinnstilling som du kan overstyra for kvar enkelt melding.</qt>"
+#~ "<h1>Krypter alle meldingsdelar som standard</h1> Med denne funksjonen, "
+#~ "blir alle delane av meldinga (altså hovuddelen og alle vedlegg) krypterte "
+#~ "som standard. <p>Dette er ei standardinnstilling som du kan overstyra for "
+#~ "kvar enkelt melding.</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "Spør &før kryptering av kvar del"
@@ -15360,9 +14941,14 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Spør før kryptering av kvar del</h1> Med denne funksjonen, blir du spurd om kvar enkelt del av meldinga (altså hovuddelen i tillegg til vedlegga) skal krypterast.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Spør før kryptering av kvar del</h1> Med denne funksjonen, blir "
+#~ "du spurd om kvar enkelt del av meldinga (altså hovuddelen i tillegg til "
+#~ "vedlegga) skal krypterast.</qt>"
 
 #~ msgid "&Do not encrypt messages"
 #~ msgstr "&Ikkje krypter meldingar"
@@ -15375,14 +14961,16 @@ msgstr "Skriv over fil?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ikkje krypter meldingar</h1>\n"
 #~ "Med denne funksjonen blir ikkje meldingane krypterte som standard.\n"
 #~ "<p>\n"
-#~ "Dette er ei standardinnstilling som kan overstyrast for kvar enkelt melding.</qt>"
+#~ "Dette er ei standardinnstilling som kan overstyrast for kvar enkelt "
+#~ "melding.</qt>"
 
 #~ msgid "Triple-DES"
 #~ msgstr "Triple-DES"
@@ -15393,13 +14981,29 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Krypteringsalgoritme</h1> Ein algoritme er ei skildring av korleis datamaskina skal utføra ei viss oppgåve. Krypteringsalgoritmen skildrar korleis datamaskina legg inn mottakarnøkkelen i meldinga slik at berre den rette mottakaren vil kunna lesa meldinga. <p>Valet av krypteringsalgoritme vil avgjera kor lett eller vanskeleg det er å avskjera og lesa ei melding. Alle algoritmane i SPHINX-miljøet er rekna som svært sikre. Standardinnstillingane vil fungera heilt fint. <p>Dette er ei standardinnstilling, som du kan overstyra for kvar enkelt melding.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Krypteringsalgoritme</h1> Ein algoritme er ei skildring av "
+#~ "korleis datamaskina skal utføra ei viss oppgåve. Krypteringsalgoritmen "
+#~ "skildrar korleis datamaskina legg inn mottakarnøkkelen i meldinga slik at "
+#~ "berre den rette mottakaren vil kunna lesa meldinga. <p>Valet av "
+#~ "krypteringsalgoritme vil avgjera kor lett eller vanskeleg det er å "
+#~ "avskjera og lesa ei melding. Alle algoritmane i SPHINX-miljøet er rekna "
+#~ "som svært sikre. Standardinnstillingane vil fungera heilt fint. <p>Dette "
+#~ "er ei standardinnstilling, som du kan overstyra for kvar enkelt melding.</"
+#~ "qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
 #~ msgstr "Kryss av for å a&vslutta med lokalt lagra sertifikat."
@@ -15410,16 +15014,21 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sertifikatkontrollen kan avsluttast med lokalt lagra sertifikat</h1>\n"
-#~ "Her kan du veilja om kontrollen av sertifikatkjeda kan avsluttast med eit lokalt lagra sertifikat.\n"
+#~ "Her kan du veilja om kontrollen av sertifikatkjeda kan avsluttast med eit "
+#~ "lokalt lagra sertifikat.\n"
 #~ "<p>\n"
-#~ "Lokale sertifikat er dine eigne sertifikat, i tillegg til sertifikata til dei du kommuniserer med og sertifikatautoritetane (CA).\n"
+#~ "Lokale sertifikat er dine eigne sertifikat, i tillegg til sertifikata til "
+#~ "dei du kommuniserer med og sertifikatautoritetane (CA).\n"
 #~ "</qt>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15431,9 +15040,14 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Kontroller alltid sertifikatstigen til rotsertifikatet</h1> Her kan du velja om sertifikatstigen som høyrer til mottakarsertifikatet alltid skal kontrollerast heilt opp til rotsertifikatet.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Kontroller alltid sertifikatstigen til rotsertifikatet</h1> Her "
+#~ "kan du velja om sertifikatstigen som høyrer til mottakarsertifikatet "
+#~ "alltid skal kontrollerast heilt opp til rotsertifikatet.</qt>"
 
 #~ msgid "Check certificate &path"
 #~ msgstr "Kontroller &sertifikatstig"
@@ -15444,11 +15058,17 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Kontroller sertifikatstig</h1> Her kan du velja om stigen til mottakarsertifikatet skal kontrollerast heilt opp til rota. <p>Legg merke til at det ikkje er mogleg å slå av kontroll av sjølve mottakarsertifikatet.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Kontroller sertifikatstig</h1> Her kan du velja om stigen til "
+#~ "mottakarsertifikatet skal kontrollerast heilt opp til rota. <p>Legg merke "
+#~ "til at det ikkje er mogleg å slå av kontroll av sjølve "
+#~ "mottakarsertifikatet.</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
 #~ msgstr "Br&uk lister for sertifikatgjenkalling (CRL)"
@@ -15459,24 +15079,42 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Bruk lister for sertifikatgjenkalling (CRL)</h1> Ei liste for sertifikatgjenkalling inneheld sertifikat som er trekte tilbake og ikkje lenger skal brukast til kryptering. Ein brukar kan ønskja å få sertifikatet sitt trekt tilbake dersom han eller ho mistenkjer misbruk av sertifikatet (til dømes dersom nokon har funne ut PIN-koden). <p>Du bør bruka CRL-lister før best mogleg tryggleik. I oppsettet for sertifikat- og CRL-handtering kan du velja kvar listene skal hentast frå.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Bruk lister for sertifikatgjenkalling (CRL)</h1> Ei liste for "
+#~ "sertifikatgjenkalling inneheld sertifikat som er trekte tilbake og ikkje "
+#~ "lenger skal brukast til kryptering. Ein brukar kan ønskja å få "
+#~ "sertifikatet sitt trekt tilbake dersom han eller ho mistenkjer misbruk av "
+#~ "sertifikatet (til dømes dersom nokon har funne ut PIN-koden). <p>Du bør "
+#~ "bruka CRL-lister før best mogleg tryggleik. I oppsettet for sertifikat- "
+#~ "og CRL-handtering kan du velja kvar listene skal hentast frå.</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Varsel dersom &CRL vil bli forelda innan:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Kryss av for å få varsel dersom ein CRL vil bli forelda i nær framtid"
+#~ msgstr ""
+#~ "Kryss av for å få varsel dersom ein CRL vil bli forelda i nær framtid"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Varsel dersom CRL vil bli forelda i nær framtid</h1> Her kan du velja å verta varsla dersom ein av CRL-ane du brukar vil bli forelda om ikkje så lenge.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Varsel dersom CRL vil bli forelda i nær framtid</h1> Her kan du "
+#~ "velja å verta varsla dersom ein av CRL-ane du brukar vil bli forelda om "
+#~ "ikkje så lenge.</qt>"
 
 #~ msgid "Number of days before warning"
 #~ msgstr "Tal på dagar før varsel"
@@ -15484,11 +15122,15 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Varsel dersom CRL vil bli forelda i nær framtid</h1> I dette feltet kan du velja kor tidleg du skal åtvarast før CRL-en blir forelda. <p>Den tilrådde innstillinga for SPHINX-miljøet er 7 dagar.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Varsel dersom CRL vil bli forelda i nær framtid</h1> I dette "
+#~ "feltet kan du velja kor tidleg du skal åtvarast før CRL-en blir forelda. "
+#~ "<p>Den tilrådde innstillinga for SPHINX-miljøet er 7 dagar.</qt>"
 
 #~ msgid "Always encrypt &to self"
 #~ msgstr "Krypter alltid til &seg sjølv"
@@ -15499,11 +15141,17 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Krypter alltid til seg sjølv</h1> Her kan du velja om krypterte meldingar du sender òg skal signerast med din eigen nøkkel. <p>Dette alternativet bør vera på for at du skal kunna lesa meldingar du sjølv har sendt.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Krypter alltid til seg sjølv</h1> Her kan du velja om krypterte "
+#~ "meldingar du sender òg skal signerast med din eigen nøkkel. <p>Dette "
+#~ "alternativet bør vera på for at du skal kunna lesa meldingar du sjølv har "
+#~ "sendt.</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
 #~ msgstr "Varsel dersom eit sertifikat i &kjeda vil bli forelda innan:"
@@ -15514,11 +15162,18 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Varsel dersom eit sertifikat i &kjeda vil bli forelda</h1> Her kan du velja å få varsel dersom eit sertifikat for kryptering vert forelda innan eit visst tidsrom. <p>Denne funksjonen bør vera på for at du skal unngå å bruka sertifikat som vil verta forelda i nær framtid.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Varsel dersom eit sertifikat i &kjeda vil bli forelda</h1> Her "
+#~ "kan du velja å få varsel dersom eit sertifikat for kryptering vert "
+#~ "forelda innan eit visst tidsrom. <p>Denne funksjonen bør vera på for at "
+#~ "du skal unngå å bruka sertifikat som vil verta forelda i nær framtid.</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
 #~ msgstr "Varsel dersom &mottakarsertifikatet vil bli forelda innan:"
@@ -15538,8 +15193,29 @@ msgstr "Skriv over fil?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Vel kva for sertifikat som skal sendast"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt><h1>Sending av sertifikat</h1> Utan sertifikatet vil ikkje mottakaren kunna avgjera om det verkeleg er du som har sendt meldinga eller om meldinga er endra av ein utanforståande. <p>Mottakaren kan henta sertifikatet ditt frå ein sentral tenar, men du kan òg velja å leggja sertifikatet ved meldinga. Du kan velja å ikkje leggja ved noko sertifikat i det heile, å leggja ved berre ditt eige sertifikat eller å leggja ved heile kjeda av sertifikat som er knytte til ditt eige sertifikat, med eller utan rotsertifikatet. <p>Du bør i det minste leggja ved ditt eige sertifikat når du sender meldingar. <p>Dette er ei standardinnstilling som kan overstyrast for kvar enkelt melding.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>Sending av sertifikat</h1> Utan sertifikatet vil ikkje mottakaren "
+#~ "kunna avgjera om det verkeleg er du som har sendt meldinga eller om "
+#~ "meldinga er endra av ein utanforståande. <p>Mottakaren kan henta "
+#~ "sertifikatet ditt frå ein sentral tenar, men du kan òg velja å leggja "
+#~ "sertifikatet ved meldinga. Du kan velja å ikkje leggja ved noko "
+#~ "sertifikat i det heile, å leggja ved berre ditt eige sertifikat eller å "
+#~ "leggja ved heile kjeda av sertifikat som er knytte til ditt eige "
+#~ "sertifikat, med eller utan rotsertifikatet. <p>Du bør i det minste leggja "
+#~ "ved ditt eige sertifikat når du sender meldingar. <p>Dette er ei "
+#~ "standardinnstilling som kan overstyrast for kvar enkelt melding.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Send &ditt eige sertifikat"
@@ -15554,16 +15230,23 @@ msgstr "Skriv over fil?"
 #~ msgstr "Signer alle meldings&delar"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Kryss av her for å lata alle meldingsdelane vera signerte i utgangspunktet"
+#~ msgstr ""
+#~ "Kryss av her for å lata alle meldingsdelane vera signerte i utgangspunktet"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Signer alle meldingsdelar</h1> Her kan du velja om alle delane av meldinga skal signerast (altså hovudmeldinga og alle vedlegga). <p>Dette er ei standardinnstilling som du kan overstyra for kvar enkelt melding.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Signer alle meldingsdelar</h1> Her kan du velja om alle delane av "
+#~ "meldinga skal signerast (altså hovudmeldinga og alle vedlegga). <p>Dette "
+#~ "er ei standardinnstilling som du kan overstyra for kvar enkelt melding.</"
+#~ "qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Spør &før signering av kvar del"
@@ -15574,9 +15257,14 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Spør før signering av kvar del</h1> Her kan du velja om du skal få spørsmål om kvar del av meldinga skal signerast (altså hovudmeldinga og alle vedlegga).</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Spør før signering av kvar del</h1> Her kan du velja om du skal "
+#~ "få spørsmål om kvar del av meldinga skal signerast (altså hovudmeldinga "
+#~ "og alle vedlegga).</qt>"
 
 #~ msgid "Do no&t sign messages"
 #~ msgstr "Ikkje sig&ner meldingar"
@@ -15589,11 +15277,16 @@ msgstr "Skriv over fil?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Ikkje signer meldingar</h1> Her kan du velja om meldingane ikkje skal signerast i utgangspunktet. <p>Dette er ei standardinnstilling som du kan overstyra for kvar enkelt melding.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Ikkje signer meldingar</h1> Her kan du velja om meldingane ikkje "
+#~ "skal signerast i utgangspunktet. <p>Dette er ei standardinnstilling som "
+#~ "du kan overstyra for kvar enkelt melding.</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Signatursertifikatet vert sett opp på <em>Sertifikat</em>-sida."
 
 #~ msgid "RSA + SHA-1"
@@ -15605,13 +15298,29 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Signaturalgoritme</h1> Ein algoritme er ei skildring av korleis datamaskina skal utføra ei viss oppgåve. Signaturalgoritmen skildrar korleis datamaskina legg inn signaturnøkkelen i meldinga slik at mottakaren kan vera sikker på at det verkeleg er du som har sendt meldinga.<p>Valet av signaturalgoritme vil avgjera kor lett eller vanskeleg det er å forfalska ei melding. Alle algoritmane i SPHINX-miljøet er rekna som svært sikre. Standardinnstillingane vil fungera heilt fint. <p>Dette er ei standardinnstilling, som du kan overstyra for kvar enkelt melding.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Signaturalgoritme</h1> Ein algoritme er ei skildring av korleis "
+#~ "datamaskina skal utføra ei viss oppgåve. Signaturalgoritmen skildrar "
+#~ "korleis datamaskina legg inn signaturnøkkelen i meldinga slik at "
+#~ "mottakaren kan vera sikker på at det verkeleg er du som har sendt "
+#~ "meldinga.<p>Valet av signaturalgoritme vil avgjera kor lett eller "
+#~ "vanskeleg det er å forfalska ei melding. Alle algoritmane i SPHINX-"
+#~ "miljøet er rekna som svært sikre. Standardinnstillingane vil fungera "
+#~ "heilt fint. <p>Dette er ei standardinnstilling, som du kan overstyra for "
+#~ "kvar enkelt melding.</qt>"
 
 #~ msgid "Signature &algorithm:"
 #~ msgstr "S&ignaturalgoritme:"
@@ -15625,12 +15334,16 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Lagra meldingar med signaturar</h1>\n"
-#~ "Når denne boksen er kryssa av, vert dei sendte meldingane lagra saman med signaturane som høyrer til. Dette er tilrådd, sidan du då seinare kan sjekka om meldinga eller delar av henne var signert.</qt>"
+#~ "Når denne boksen er kryssa av, vert dei sendte meldingane lagra saman med "
+#~ "signaturane som høyrer til. Dette er tilrådd, sidan du då seinare kan "
+#~ "sjekka om meldinga eller delar av henne var signert.</qt>"
 
 #~ msgid "Compound mode:"
 #~ msgstr "Modus for signaturoppbyggjing"
@@ -15639,14 +15352,22 @@ msgstr "Skriv over fil?"
 #~ msgstr "&Standard MIME"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Ei fleirdelt, signert melding som inneheld signatur og signerte data."
+#~ msgstr ""
+#~ "Ei fleirdelt, signert melding som inneheld signatur og signerte data."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Signaturen for seg</h1> Vel om signaturen og dataa som vert signerte skal vera ulike delar av ei fleirdelt, signert melding. Signerte meldingsdata vil vera lesbare i alle e-postprogram, sjølv om dei ikkje støttar signeringsalgoritmen og ASN.1-dekoding.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Signaturen for seg</h1> Vel om signaturen og dataa som vert "
+#~ "signerte skal vera ulike delar av ei fleirdelt, signert melding. Signerte "
+#~ "meldingsdata vil vera lesbare i alle e-postprogram, sjølv om dei ikkje "
+#~ "støttar signeringsalgoritmen og ASN.1-dekoding.</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
 #~ msgstr "&Tett (ikkje tilrådd for andre enn SPHINX)"
@@ -15657,9 +15378,15 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Tett signering av meldingar</h1> Med denne funksjonen vert både signaturen og den signerte informasjonen koda i ei ASN.1-blokk. Meldingane vil berre kunna lesast i e-postprogram som støttar dekoding av ASN.1.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Tett signering av meldingar</h1> Med denne funksjonen vert både "
+#~ "signaturen og den signerte informasjonen koda i ei ASN.1-blokk. "
+#~ "Meldingane vil berre kunna lesast i e-postprogram som støttar dekoding av "
+#~ "ASN.1.</qt>"
 
 #~ msgid "Entering PIN is required:"
 #~ msgstr "Krev PIN-kode:"
@@ -15670,8 +15397,22 @@ msgstr "Skriv over fil?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Vel kor ofte PIN-koden skal skrivast"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt><h1>PIN-oppføring</h1> Her kan du velja kor ofte du treng oppgje PIN-koden for å få tilgang til det personlege tryggleiksrommet der sertifikata dine ligg. <p>Jo oftare du treng oppgje PIN-koden, jo betre er du verna mot falsk e-post i ditt namn. Samstundes vil du møta fleire hindringar ved bruk av programmet. <p>Dersom du er usikker på kva du skal velja, kan du la innstillinga vera uendra. <p>Legg merke til at du av tryggleiksgrunnar ikkje kan slå PIN-kontrollen heilt av.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>PIN-oppføring</h1> Her kan du velja kor ofte du treng oppgje PIN-"
+#~ "koden for å få tilgang til det personlege tryggleiksrommet der "
+#~ "sertifikata dine ligg. <p>Jo oftare du treng oppgje PIN-koden, jo betre "
+#~ "er du verna mot falsk e-post i ditt namn. Samstundes vil du møta fleire "
+#~ "hindringar ved bruk av programmet. <p>Dersom du er usikker på kva du skal "
+#~ "velja, kan du la innstillinga vera uendra. <p>Legg merke til at du av "
+#~ "tryggleiksgrunnar ikkje kan slå PIN-kontrollen heilt av.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Ein gong kvar økt"
@@ -15688,26 +15429,39 @@ msgstr "Skriv over fil?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Varsel dersom sertifikat vert forelda</h1> Her kan du velja å få varsel dersom du prøver å signera med eit sertifikat som vil verta forelda innan ei viss tid. <p>Dette alternativet bør vera på for å unngå at du brukar sertifikat som snart vil verta forelda.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Varsel dersom sertifikat vert forelda</h1> Her kan du velja å få "
+#~ "varsel dersom du prøver å signera med eit sertifikat som vil verta "
+#~ "forelda innan ei viss tid. <p>Dette alternativet bør vera på for å unngå "
+#~ "at du brukar sertifikat som snart vil verta forelda.</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Varsel dersom &signatursertifikatet går ut innan:"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Varsel dersom e-postadressa til underteiknaren &manglar i sertifikatet"
+#~ msgstr ""
+#~ "Varsel dersom e-postadressa til underteiknaren &manglar i sertifikatet"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
-#~ msgstr "<qt><h1>Varsel dersom e-postadressa til underteiknaren manglar i sertifikatet</h1> Her kan du velja å få varsel dersom e-postadressa til ein underteiknar manglar i sertifikatet som vert bruka til signering. <p>Dette alternativet bør vera på for best mogleg tryggleik.</qt>"
+#~ msgstr ""
+#~ "<qt><h1>Varsel dersom e-postadressa til underteiknaren manglar i "
+#~ "sertifikatet</h1> Her kan du velja å få varsel dersom e-postadressa til "
+#~ "ein underteiknar manglar i sertifikatet som vert bruka til signering. "
+#~ "<p>Dette alternativet bør vera på for best mogleg tryggleik.</qt>"
 
 #~ msgid "Edit Recent Addresses"
 #~ msgstr "Rediger nylege adresser"
@@ -15724,9 +15478,6 @@ msgstr "Skriv over fil?"
 #~ msgid "Save in &Drafts Folder"
 #~ msgstr "Lagra i kladde&mappe"
 
-#~ msgid "Configure KMail"
-#~ msgstr "Oppsett av KMail"
-
 #, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Opna med …"
diff --git a/tde-i18n-pa/messages/tdepim/kmail.po b/tde-i18n-pa/messages/tdepim/kmail.po
index f72c5b704f5..b1435238247 100644
--- a/tde-i18n-pa/messages/tdepim/kmail.po
+++ b/tde-i18n-pa/messages/tdepim/kmail.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-05-07 12:45+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -166,6 +166,12 @@ msgstr "ਕੋਈ ਨਹੀਂ(&e) (ਧਿਆਨ ਨਾਲ ਵਰਤੋਂ)"
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "ਅਤੀਤ ਸਾਫ਼"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -241,13 +247,13 @@ msgstr "ਲਾਗਆਨ(&L):"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"ਤੁਹਾਡੇ ਇੰਟਰਨੈੱਟ ਦੇਣ ਵਾਲੇ ਨੇ ਤੁਹਾਨੂੰ ਇੱਕ <em>ਉਪਭੋਗੀ ਨਾਂ (user name)</em> "
-"ਦਿੱਤਾ ਹੋਵੇਗਾ, ਜਿਸ ਨਾਲ ਤੁਹਾਨੂੰ ਉਨ੍ਹਾਂ ਦੇ ਸਰਵਰ ਉੱਤੇ ਪਰਮਾਣਿਤਾ ਕੀਤਾ ਜਾਵੇਗਾ। ਇਹ "
-"ਤੁਹਾਡੇ ਈ-ਮੇਲ ਸਿਰਨਾਵੇਂ ਦਾ ਪਹਿਲਾਂ ਭਾਗ ਹੁੰਦਾ ਹੈ (<em>@</em> ਤੋਂ ਪਹਿਲਾਂ)।"
+"ਤੁਹਾਡੇ ਇੰਟਰਨੈੱਟ ਦੇਣ ਵਾਲੇ ਨੇ ਤੁਹਾਨੂੰ ਇੱਕ <em>ਉਪਭੋਗੀ ਨਾਂ (user name)</em> ਦਿੱਤਾ ਹੋਵੇਗਾ, ਜਿਸ ਨਾਲ "
+"ਤੁਹਾਨੂੰ ਉਨ੍ਹਾਂ ਦੇ ਸਰਵਰ ਉੱਤੇ ਪਰਮਾਣਿਤਾ ਕੀਤਾ ਜਾਵੇਗਾ। ਇਹ ਤੁਹਾਡੇ ਈ-ਮੇਲ ਸਿਰਨਾਵੇਂ ਦਾ ਪਹਿਲਾਂ ਭਾਗ "
+"ਹੁੰਦਾ ਹੈ (<em>@</em> ਤੋਂ ਪਹਿਲਾਂ)।"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -268,18 +274,18 @@ msgstr "POP ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ(&r)"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "ਕੇ-ਮੇਲ ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲਣ ਲਈ ਇਹ ਚੋਣ ਕਰੋ।\n"
 "ਜੇ ਕੇ-ਵਾਲਿਟ ਉਪਲੱਬਧ ਹੋਇਆ ਤਾਂ ਉੱਥੇ ਸੰਭਾਲਿਆ ਗੁਪਤ-ਕੋਡ ਸੁਰੱਖਿਆ ਹੋਵੇਗਾ।\n"
-"ਪਰ, ਜੇ ਕੇ-ਵਾਲਿਟ ਨਾ ਹੋਇਆ ਤਾਂ ਗੁਪਤ-ਕੋਡ ਨੂੰ ਕੇ-ਮੇਲ ਦੀ ਸੰਰਚਨਾ ਫਾਇਲ 'ਚ ਸੰਭਾਲਿਆ "
-"ਜਾਵੇਗਾ। ਇਹ ਗੁਪਤ-ਕੋਡ ਲੁਕਵੇਂ ਢੰਗ ਨਾਲ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ, ਪਰ ਇਸ ਨੂੰ ਡੀ-ਕ੍ਰਿਪਸ਼ਨ ਕਰਨ ਦੇ "
-"ਜਤਨਾਂ ਤੋਂ ਸੁਰੱਖਿਅਤ ਨਹੀਂ ਸਮਝਿਆ ਜਾਂਦੇ, ਜੇ ਸੰਰਚਨਾ ਫਾਇਲ ਕੋਈ ਖੋਲ੍ਹ ਲਵੇ।"
+"ਪਰ, ਜੇ ਕੇ-ਵਾਲਿਟ ਨਾ ਹੋਇਆ ਤਾਂ ਗੁਪਤ-ਕੋਡ ਨੂੰ ਕੇ-ਮੇਲ ਦੀ ਸੰਰਚਨਾ ਫਾਇਲ 'ਚ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ। ਇਹ ਗੁਪਤ-"
+"ਕੋਡ ਲੁਕਵੇਂ ਢੰਗ ਨਾਲ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ, ਪਰ ਇਸ ਨੂੰ ਡੀ-ਕ੍ਰਿਪਸ਼ਨ ਕਰਨ ਦੇ ਜਤਨਾਂ ਤੋਂ ਸੁਰੱਖਿਅਤ ਨਹੀਂ ਸਮਝਿਆ "
+"ਜਾਂਦੇ, ਜੇ ਸੰਰਚਨਾ ਫਾਇਲ ਕੋਈ ਖੋਲ੍ਹ ਲਵੇ।"
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -307,11 +313,12 @@ msgstr "ਸੁਨੇਹਿਆਂ ਉੱਤੇ ਫਿਲਟਰ ਲਗਾਓ, ਜ�
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"ਜੇ ਇਹ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ POP ਫਿਲਟਰ ਨੂੰ ਵਰਤਿਆ ਜਾਵੇਗਾ ਕਿ ਸੁਨੇਹਿਆਂ ਨਾਲ ਕੀ ਕੀਤਾ ਜਾਵੇ। "
-"ਤੁਸੀਂ ਸਰਵਰ ਤੋਂ ਡਾਊਨਲੋਡ ਕਰਨ, ਹਟਾਉਣ ਜਾਂ ਰੱਖਣ ਦੀ ਚੋਣ ਕਰ ਸਕਦੇ ਹੋ।"
+"ਜੇ ਇਹ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ POP ਫਿਲਟਰ ਨੂੰ ਵਰਤਿਆ ਜਾਵੇਗਾ ਕਿ ਸੁਨੇਹਿਆਂ ਨਾਲ ਕੀ ਕੀਤਾ ਜਾਵੇ। ਤੁਸੀਂ "
+"ਸਰਵਰ ਤੋਂ ਡਾਊਨਲੋਡ ਕਰਨ, ਹਟਾਉਣ ਜਾਂ ਰੱਖਣ ਦੀ ਚੋਣ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -360,13 +367,15 @@ msgstr "ਪਾਠ ਸਾਫ਼(&x)"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "ਲਾਗਿੰਨ(&L)"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "ਪਲੇਨ(&P)"
 
@@ -409,9 +418,9 @@ msgstr "ਨਾਂ ਥਾਂ:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -469,13 +478,12 @@ msgstr "ਲੋਡ਼ ਪੈਣ ਉੱਤੇ ਨੱਥੀ ਲੋਡ ਕਰੋ(&m)
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"ਇਹ ਸਰਗਰਮ ਕਰਨ ਨਾਲ ਨੱਥੀ ਨੂੰ ਆਟੋਮੈਟਿਕ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ, ਜਦੋਂ ਤੁਸੀਂ ਈ-ਮੇਲ "
-"ਚੁਣੋਗੇ, ਪਰ ਜਦੋਂ ਤੁਸੀਂ ਨੱਥੀ ਦਬਾਉਗੇ ਤਾਂ ਹੀ। ਇਸ ਢੰਗ ਨਾਲ ਵੱਡੀਆਂ ਈ-ਮੇਲਾਂ ਨੂੰ ਤੁਰੰਤ "
-"ਵੇਖਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"
+"ਇਹ ਸਰਗਰਮ ਕਰਨ ਨਾਲ ਨੱਥੀ ਨੂੰ ਆਟੋਮੈਟਿਕ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ, ਜਦੋਂ ਤੁਸੀਂ ਈ-ਮੇਲ ਚੁਣੋਗੇ, ਪਰ ਜਦੋਂ ਤੁਸੀਂ "
+"ਨੱਥੀ ਦਬਾਉਗੇ ਤਾਂ ਹੀ। ਇਸ ਢੰਗ ਨਾਲ ਵੱਡੀਆਂ ਈ-ਮੇਲਾਂ ਨੂੰ ਤੁਰੰਤ ਵੇਖਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -486,8 +494,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"ਸਿਰਫ਼ ਉਹੀ ਫੋਲਡਰ, ਜੋ ਕਿ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਖੁੱਲ੍ਹੇ (ਫੈਲੇ) ਹੁੰਦੇ ਹਨ, ਲਈ ਹੀ ਸਬ-ਫੋਲਡਰਾਂ "
-"ਲਈ ਜਾਂਚਿਆ ਜਾਂਦਾ ਹੈ। ਇਹ ਵਰਤੋਂ, ਜੇ ਸਰਵਰ ਉੱਤੇ ਕਈ ਫੋਲਡਰ ਹੋਣ।"
+"ਸਿਰਫ਼ ਉਹੀ ਫੋਲਡਰ, ਜੋ ਕਿ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਖੁੱਲ੍ਹੇ (ਫੈਲੇ) ਹੁੰਦੇ ਹਨ, ਲਈ ਹੀ ਸਬ-ਫੋਲਡਰਾਂ ਲਈ ਜਾਂਚਿਆ "
+"ਜਾਂਦਾ ਹੈ। ਇਹ ਵਰਤੋਂ, ਜੇ ਸਰਵਰ ਉੱਤੇ ਕਈ ਫੋਲਡਰ ਹੋਣ।"
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -515,7 +523,7 @@ msgstr "<none>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
@@ -523,28 +531,29 @@ msgstr "ਆਉਣ-ਬਕਸਾ"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -553,23 +562,23 @@ msgstr "ਸਧਾਰਨ ਟੈਬ ਉੱਤੇ ਪਹਿਲਾਂ ਸਰਵਰ �
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -577,8 +586,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -659,10 +668,9 @@ msgstr "IMAP ਖਾਤਾ"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
-msgstr ""
-"ਤੁਹਾਨੂੰ ਪੱਤਰ ਪਰਾਪਤ ਕਰਨ ਲਈ ਸੈਟਿੰਗ ਦੇ ਨੈੱਟਵਰਕ ਭਾਗ ਵਿੱਚ ਇੱਕ ਖਾਤਾ ਜੋੜਨ ਦੀ ਲੋੜ ਹੈ।"
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
+msgstr "ਤੁਹਾਨੂੰ ਪੱਤਰ ਪਰਾਪਤ ਕਰਨ ਲਈ ਸੈਟਿੰਗ ਦੇ ਨੈੱਟਵਰਕ ਭਾਗ ਵਿੱਚ ਇੱਕ ਖਾਤਾ ਜੋੜਨ ਦੀ ਲੋੜ ਹੈ।"
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -698,13 +706,13 @@ msgstr "ਕੇ-ਮੇਲ ਵੱਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>ਇੰਜ ਲੱਗਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਕੇ-ਮੇਲ ਪਹਿਲੀ ਵਾਰ ਵਰਤ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਇਹ ਸਹਾਇਕ ਨੂੰ ਆਪਣੇ "
-"ਪੱਤਰ ਖਾਤੇ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇਸਤੇਮਾਲ ਕਰ ਸਕਦੇ ਹੋ। ਸਿਰਫ਼ ਕੁਨੈਕਸ਼ਨ ਡਾਟਾ ਹੇਠ ਦਿੱਤੇ "
-"ਸਫ਼ਿਆਂ 'ਚ ਦਿਓ, ਜੋ ਕਿ ਆਪਣੇ ਈ-ਮੇਲ ਦੇਣ ਵਾਲੇ ਤੋਂ ਲਿਆ ਹੈ।</qt>"
+"<qt>ਇੰਜ ਲੱਗਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਕੇ-ਮੇਲ ਪਹਿਲੀ ਵਾਰ ਵਰਤ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਇਹ ਸਹਾਇਕ ਨੂੰ ਆਪਣੇ ਪੱਤਰ ਖਾਤੇ "
+"ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇਸਤੇਮਾਲ ਕਰ ਸਕਦੇ ਹੋ। ਸਿਰਫ਼ ਕੁਨੈਕਸ਼ਨ ਡਾਟਾ ਹੇਠ ਦਿੱਤੇ ਸਫ਼ਿਆਂ 'ਚ ਦਿਓ, ਜੋ ਕਿ ਆਪਣੇ ਈ-"
+"ਮੇਲ ਦੇਣ ਵਾਲੇ ਤੋਂ ਲਿਆ ਹੈ।</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -766,8 +774,7 @@ msgstr "ਲੋਕਲ ਡਿਲਵਰੀ ਵਰਤੋਂ"
 msgid "Server Information"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
@@ -901,17 +908,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -937,8 +943,7 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"ਕੂੜਾ ਸੁਨਹਿਆਂ ਲਈ ਮੂਲ ਫੋਲਡਰ ਰੱਦੀ ਹੈ, ਪਰ ਤੁਸੀਂ ਉਸ ਨੂੰ ਫੋਲਡਰ ਝਲਕ ਵਿੱਚ ਹੇਠਾਂ ਇਸ ਨੂੰ "
-"ਬਦਲ ਸਕਦੇ ਹੋ।"
+"ਕੂੜਾ ਸੁਨਹਿਆਂ ਲਈ ਮੂਲ ਫੋਲਡਰ ਰੱਦੀ ਹੈ, ਪਰ ਤੁਸੀਂ ਉਸ ਨੂੰ ਫੋਲਡਰ ਝਲਕ ਵਿੱਚ ਹੇਠਾਂ ਇਸ ਨੂੰ ਬਦਲ ਸਕਦੇ ਹੋ।"
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -946,14 +951,13 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"ਮੂਲ ਫੋਲਡਰ ਆਉਣ-ਫੋਲਡਰ (inbox) ਫੋਲਡਰ ਹੈ, ਪਰ ਤੁਸੀਂ ਉਸ ਨੂੰ ਫੋਲਡਰ ਝਲਕ 'ਚ ਬਦਲ ਸਕਦੇ ਹੋ। "
-"<p>ਸਭ ਸੰਦ ਨਾ-ਸੁਰੱਖਿਅਤ ਵਰਗੀਕਰਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹਨ। ਜੇ ਤੁਸੀਂ ਇੱਕ ਢੁੱਕਵਾਂ ਸੰਦ ਨਾ "
-"ਚੁਣਿਆ ਤਾਂ ਤੁਸੀਂ ਇੱਕ ਫੋਲਡਰ ਵੀ ਨਹੀਂ ਚੁਣ ਸਕਦੇ।"
+"ਮੂਲ ਫੋਲਡਰ ਆਉਣ-ਫੋਲਡਰ (inbox) ਫੋਲਡਰ ਹੈ, ਪਰ ਤੁਸੀਂ ਉਸ ਨੂੰ ਫੋਲਡਰ ਝਲਕ 'ਚ ਬਦਲ ਸਕਦੇ ਹੋ। <p>ਸਭ ਸੰਦ "
+"ਨਾ-ਸੁਰੱਖਿਅਤ ਵਰਗੀਕਰਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹਨ। ਜੇ ਤੁਸੀਂ ਇੱਕ ਢੁੱਕਵਾਂ ਸੰਦ ਨਾ ਚੁਣਿਆ ਤਾਂ ਤੁਸੀਂ ਇੱਕ ਫੋਲਡਰ "
+"ਵੀ ਨਹੀਂ ਚੁਣ ਸਕਦੇ।"
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -963,8 +967,8 @@ msgstr "ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਐਂਟੀ-ਵਾਇਰ�
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -974,8 +978,8 @@ msgstr "ਫੜੇ ਵਾਇਰਸ ਸੁਨੇਹਿਆਂ ਨੂੰ ਚੁਣ�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -984,8 +988,8 @@ msgstr "ਇਸ ਤੋਂ ਬਿਨਾਂ, ਵਾਇਰਲ ਸੁਨੇਹਿਆ�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1163,8 +1167,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"ਇਸ ਦਾ ਕਾਰਨ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ਇਸ ਲਈ ਅਧਿਕਾਰ ਨਾ ਹੋਵੇ ਜਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਸਰਵਰ "
-"ਉੱਤੇ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ; ਸਰਵਰ ਸੰਚਾਰ ਤੋਂ ਗਲਤੀ ਸੁਨੇਹਾ ਇਹ ਹੈ:"
+"ਇਸ ਦਾ ਕਾਰਨ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ਇਸ ਲਈ ਅਧਿਕਾਰ ਨਾ ਹੋਵੇ ਜਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਸਰਵਰ ਉੱਤੇ "
+"ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ; ਸਰਵਰ ਸੰਚਾਰ ਤੋਂ ਗਲਤੀ ਸੁਨੇਹਾ ਇਹ ਹੈ:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1177,8 +1181,8 @@ msgstr "ਸਰਵਰ ਉੱਤੇ ਫੋਲਡਰ %1 ਪੜ੍ਹਨ ਵਿੱ�
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1198,8 +1202,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1229,15 +1233,15 @@ msgstr "ਹਟਾਏ"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1267,18 +1271,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>ਇਹ ਸਥਾਪਨ ਤੁਹਾਡੇ ਪਰਸ਼ਾਸ਼ਕ ਵਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ।</p> "
-"<p>ਜੇਕਰ ਤੁਸੀਂ ਸੋਚਦੇ ਹੋ ਕਿ ਇਹ ਗਲਤੀ ਹੈ ਤਾਂ ਉਸ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</p></qt>"
+"<qt> <p>ਇਹ ਸਥਾਪਨ ਤੁਹਾਡੇ ਪਰਸ਼ਾਸ਼ਕ ਵਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ।</p> <p>ਜੇਕਰ ਤੁਸੀਂ ਸੋਚਦੇ ਹੋ ਕਿ ਇਹ ਗਲਤੀ "
+"ਹੈ ਤਾਂ ਉਸ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "ਪ੍ਰੋਫਾਇਲ ਲੋਡ(&L)..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "ਖਾਤਾ ਸੰਰਚਨਾ"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "ਸ਼ਾਮਿਲ(&A)..."
@@ -1308,6 +1315,11 @@ msgstr "<qt>ਕੀ ਤੁਸੀਂ ਪਛਾਣ ਨਾਂ <b>%1</b> ਹਟਾਉ
 msgid "Remove Identity"
 msgstr "ਪਛਾਣ ਹਟਾਓ"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "ਹਟਾਓ(&e)"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "ਸ਼ਾਮਿਲ..."
@@ -1316,6 +1328,11 @@ msgstr "ਸ਼ਾਮਿਲ..."
 msgid "Modify..."
 msgstr "ਸੋਧ..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "ਹਟਾਓ(&e)"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "ਮੂਲ ਵਾਂਗ ਸੈੱਟ ਕਰੋ"
@@ -1332,17 +1349,15 @@ msgstr "ਭੇਜਣ(&S)"
 msgid "Outgoing accounts (add at least one):"
 msgstr "ਬਾਹਰ ਭੇਜਣ ਵਾਲੇ ਖਾਤੇ (ਘੱਟੋ-ਘੱਟ ਇੱਕ):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "ਕਿਸਮ"
@@ -1364,8 +1379,7 @@ msgstr "ਮੂਲ ਬਣਾਓ"
 msgid "Common Options"
 msgstr "ਆਮ ਚੋਣਾਂ"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁਸ਼ਟੀ(&b)"
@@ -1416,14 +1430,14 @@ msgstr "ਮੂਲ ਡੋਮੇਨ(&t):"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1441,9 +1455,9 @@ msgstr "ਟਰਾਂਸਪੋਰਟ ਸ਼ਾਮਲ"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (ਮੂਲ)"
 
@@ -1522,6 +1536,10 @@ msgstr "ਖਾਤਾ ਸੋਧ"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt><b>%1</b> ਖਾਤਾ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "ਰੰਗ(&s)"
@@ -1630,8 +1648,7 @@ msgstr "ਖੋਲ੍ਹਿਆ ਸੰਬੰਧ"
 msgid "Misspelled Words"
 msgstr "ਗਲਤ ਸ਼ਬਦ ਜੋੜ"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ"
@@ -1820,8 +1837,8 @@ msgstr "ਬੰਦ ਕਰਨ ਲਈ ਮਾਮਲਾ ਮੂਲ"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1830,40 +1847,33 @@ msgstr "ਮਿਤੀ ਵੇਖਾਓ"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1878,8 +1888,7 @@ msgstr "HTML ਹਾਲਤ ਪੱਟੀ ਵੇਖਾਓ(&u)"
 msgid "Show s&pam status in fancy headers"
 msgstr "ਫੈਂਸੀ ਸਿਰਲੇਖ 'ਚ ਕੂੜਾ ਹਾਲਤ ਵੇਖਾਓ(&p)"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1888,8 +1897,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr "ਹਵਾਲਾ ਪਾਠ ਲਈ ਛੋਟੇ ਫੋਂਟ ਵਰਤੋਂ"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1915,8 +1923,7 @@ msgstr "ਸਵੈ"
 msgid "&Override character encoding:"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ ਤਬਦੀਲ(&O):"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ"
@@ -2018,13 +2025,12 @@ msgstr "<b>%f</b> ਫਾਇਲ ਨਾਂ ਨੂੰ ਸੋਧ ਨਾਲ ਤਬਦ
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2048,21 +2054,20 @@ msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(&y):"
 msgid "&Forward:"
 msgstr "ਅੱਗੇ ਭੇਜੋ(&F):"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D ਨੂੰ, ਤੁਸੀਂ ਲਿਖਿਆ:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D ਨੂੰ, %F ਨੇ ਲਿਖਿਆ:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ"
 
@@ -2098,8 +2103,8 @@ msgstr "ਨਵਾਂ ਅੱਗੇ ਭੇਜਣ ਅਗੇਤਰ ਦਿਓ:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2134,10 +2139,9 @@ msgstr "ਮੁੱਲ"
 msgid "Ne&w"
 msgstr "ਨਵਾਂ(&w)"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "ਨਾਂ(&N):"
@@ -2146,16 +2150,15 @@ msgstr "ਨਾਂ(&N):"
 msgid "&Value:"
 msgstr "ਮੁੱਲ(&V):"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2182,13 +2185,13 @@ msgstr "ਨੱਥੀ ਕੀਤੀ"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2213,62 +2216,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2285,10 +2282,10 @@ msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਰਾਹੀ
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2367,8 +2364,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ"
@@ -2397,8 +2393,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "ਜਦੋਂ ਨਾ-ਪੜ੍ਹ ਸੁਨੇਹੇ ਖੋਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਹੋਵੇ:"
 
@@ -2422,8 +2418,8 @@ msgstr "ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚ ਘੁੰਮਾਓ"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "ਜਦੋਂ ਇੱਕ ਫੋਲਡਰ 'ਚ ਜਾਓ:"
 
@@ -2492,16 +2488,14 @@ msgstr "ਡਾਇਰੈਕਟਰੀਆਂ (\"maildir\" ਫਾਰਮੈਟ)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2535,32 +2529,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2627,10 +2616,9 @@ msgstr "ਗਰੁੱਪਵੇਅਰ ਫੋਲਡਰ ਓਹਲੇ(&H)"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
-msgstr ""
-"ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ ਤੁਸੀਂ ਸਰੋਤ ਲੜੀ ਵਿੱਚ IMAP ਸਰੋਤ ਫੋਲਡਰ ਨਹੀਂ ਵੇਖ ਸਕੋਗੇ।"
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
+msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ ਤੁਸੀਂ ਸਰੋਤ ਲੜੀ ਵਿੱਚ IMAP ਸਰੋਤ ਫੋਲਡਰ ਨਹੀਂ ਵੇਖ ਸਕੋਗੇ।"
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2638,8 +2626,8 @@ msgstr "ਕੇਵਲ ਇਹ ਖਾਤੇ ਲਈ ਹੀ ਗਰੁੱਪਵੇਅ�
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2692,19 +2680,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "ਆਟੋਮੈਟਿਕ ਹੀ ਸੱਦਾ ਭੇਜਣਾ"
@@ -2717,14 +2704,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2829,17 +2816,16 @@ msgstr "ਅੱਗੇ ਭੇਜੋ"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2856,15 +2842,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2909,9 +2895,7 @@ msgstr "ਈ-ਮੇਲ"
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
-msgstr ""
-"ਤੁਹਾਡੀ ਸੂਚੀ ਵਿੱਚ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਹੈ। ਪਹਿਲਾਂ ਕੁਝ ਸੁਨੇਹੇ ਸ਼ਾਮਿਲ ਕਰੋ, ਫਿਰ ਕੋਸ਼ਿਸ਼ "
-"ਕਰੋ।"
+msgstr "ਤੁਹਾਡੀ ਸੂਚੀ ਵਿੱਚ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਹੈ। ਪਹਿਲਾਂ ਕੁਝ ਸੁਨੇਹੇ ਸ਼ਾਮਿਲ ਕਰੋ, ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -2934,8 +2918,8 @@ msgstr "ਪਛਾਣ ਸੋਧ"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3037,8 +3021,7 @@ msgstr ""
 
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
-msgstr ""
-"ਫੋਲਡਰ %1 ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ ਪੁੱਗ ਨਹੀਂ ਸਕਦੀ: ਟਿਕਾਣਾ ਫੋਲਡਰ %2 ਨਹੀਂ ਮਿਲਿਆ"
+msgstr "ਫੋਲਡਰ %1 ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ ਪੁੱਗ ਨਹੀਂ ਸਕਦੀ: ਟਿਕਾਣਾ ਫੋਲਡਰ %2 ਨਹੀਂ ਮਿਲਿਆ"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3078,8 +3061,7 @@ msgstr "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹ
 
 #: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
-msgstr ""
-"ਫੋਲਡਰ %1 ਵਿੱਚੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਣਾ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
+msgstr "ਫੋਲਡਰ %1 ਵਿੱਚੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਫੋਲਡਰ %2 ਵਿੱਚ ਭੇਜਣਾ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: expirypropertiesdialog.cpp:31
 msgid "Mail Expiry Properties"
@@ -3195,6 +3177,11 @@ msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 msgid "Filters"
 msgstr "ਫਿਲਟਰ %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "ਸਭ ਪਾਠ ਚੁਣੋ"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3226,8 +3213,8 @@ msgstr "ਲਾਗ ਫਿਲਟਰ ਸਰਗਰਮੀ(&L)"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3244,10 +3231,11 @@ msgstr "ਲਾਗ ਫਿਲਟਰ ਨਿਯਮ ਮੁਲਾਂਕਣ(&r)"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3268,10 +3256,10 @@ msgstr "ਅਣਸੀਮਤ"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3282,7 +3270,7 @@ msgstr ""
 "ਫਾਇਲ %1 ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "\"%2\" ਵਿੱਚ ਵੇਰਵੇ ਸਮੇਤ ਗਲਤੀ ਜਾਣਕਾਰੀ ਹੈ।"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "ਕੇ-ਮੇਲ ਗਲਤੀ"
@@ -3323,9 +3311,9 @@ msgstr "ਉਪਭੋਗੀ ਪਛਾਣ(&U):"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3377,8 +3365,8 @@ msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਰੱਦੀ ਫੋਲਡਰ ਵਿ�
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "ਸਰਵਰ ਤੋਂ ਜਾਣਕਾਰੀ ਹਾਲੇ ਪਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ, \"ਪੱਤਰ ਜਾਂਚ\" ਵਰਤੋਂ ਜੀ।"
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3389,8 +3377,7 @@ msgstr "ਗਲਤੀ: ਇਸ ਖਾਤੇ ਲਈ ਕੋਈ IMAP ਖਾਤਾ ਪ
 msgid "Connecting to server %1, please wait..."
 msgstr "ਸਰਵਰ %1 ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ, ਉਡੀਕੋ ਜੀ..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "ਸਰਵਰ %1 ਨਾਲ ਜੁੜ ਸਮੇਂ ਗਲਤੀ"
@@ -3418,11 +3405,10 @@ msgstr "ਅਧਿਕਾਰ ਸ਼ਾਮਲ"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"ਕੀ ਤੁਸੀਂ ਇਸ ਫੋਲਡਰ ਲਈ ਆਪਣੇ ਅਧਿਕਾਰ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ? ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਵਰਤ "
-"ਨਹੀਂ ਸਕਦੇ ਹੋ।"
+"ਕੀ ਤੁਸੀਂ ਇਸ ਫੋਲਡਰ ਲਈ ਆਪਣੇ ਅਧਿਕਾਰ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ? ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਵਰਤ ਨਹੀਂ ਸਕਦੇ ਹੋ।"
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3453,7 +3439,7 @@ msgstr "ਵਰਤੋਂ:"
 msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "ਲੋਕਲ ਫੋਲਡਰ"
@@ -3477,9 +3463,9 @@ msgstr "ਫੋਲਡਰ ਲਈ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3500,11 +3486,20 @@ msgstr "ਰੱਦ ਕਰੋ(&a)"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
@@ -3626,69 +3621,17 @@ msgstr "ਕੂੜਾ ਹਾਲਤ:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>ਕੋ"
-"<br>ਈ"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>ਸੁ"
-"<br>ਨੇ"
-"<br>ਨਾ"
-"<br>"
-"<br>"
-"<br>ਨ"
-"<br>ਹੀਂ</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>ਕੋ<br>ਈ<br> <br>H<br>T<br>M<br>L<br> "
+"<br>ਸੁ<br>ਨੇ<br>ਨਾ<br><br><br>ਨ<br>ਹੀਂ</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3700,19 +3643,14 @@ msgstr "ਤੁਹਾਡਾ ਨਾਂ(&Y):"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 "<qt>\n"
-"<h3>ਤੁਹਾਡਾ ਨਾਂ</h3> "
-"<p>ਇਹ ਖੇਤਰ ਤੁਹਾਡਾ ਨਾਂ ਰੱਖਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਤੁਸੀਂ ਭੇਜੇ ਜਾਣ ਵਾਲੇ ਈ-ਮੇਲ ਵਿੱਚ ਲੋਕਾਂ "
-"ਨੂੰ ਵਿਖਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ,</p> "
-"<p>ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਤੁਹਾਡਾ ਅਸਲੀ ਨਾਂ ਵਿਖਾਇਆ ਨਹੀਂ "
-"ਜਾਵੇਗਾ, ਸਿਰਫ਼ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਵਿਖਾਈ ਦੇਵੇਗਾ।</p></qt>"
+"<h3>ਤੁਹਾਡਾ ਨਾਂ</h3> <p>ਇਹ ਖੇਤਰ ਤੁਹਾਡਾ ਨਾਂ ਰੱਖਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਤੁਸੀਂ ਭੇਜੇ ਜਾਣ ਵਾਲੇ ਈ-ਮੇਲ ਵਿੱਚ "
+"ਲੋਕਾਂ ਨੂੰ ਵਿਖਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ,</p> <p>ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਤੁਹਾਡਾ ਅਸਲੀ ਨਾਂ "
+"ਵਿਖਾਇਆ ਨਹੀਂ ਜਾਵੇਗਾ, ਸਿਰਫ਼ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ ਵਿਖਾਈ ਦੇਵੇਗਾ।</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3720,11 +3658,9 @@ msgstr "ਸੰਗਠਨ(&z):"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3733,14 +3669,11 @@ msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ(&E):"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3750,21 +3683,12 @@ msgstr "ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ(&E):"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3787,12 +3711,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3805,20 +3728,18 @@ msgstr ""
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3837,11 +3758,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3854,18 +3774,17 @@ msgstr "ਤੁਹਾਡਾ S/MIME ਇਕਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕ
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3886,14 +3805,12 @@ msgstr "ਜਵਾਬ ਸਿਰਨਾਵਾਂ(&R):"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3902,15 +3819,12 @@ msgstr "&BCC ਸਿਰਨਾਵੀਂ:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3949,7 +3863,7 @@ msgstr "ਦਸਤਖਤ(&S)"
 msgid "&Picture"
 msgstr "ਤਸਵੀਰ(&P)"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "ਗਲਤ ਈ-ਮੇਲ ਸਿਰਨਾਵਾਂ"
 
@@ -3968,8 +3882,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4018,8 +3932,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (ਮੂਲ)"
 
@@ -4064,16 +3978,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"ਸੰਰਚਨਾ ਆਟੋਮੈਟਿਕ ਹੀ ਮਾਈਗਰੇਟ ਕੀਤਾ ਗਿਆ ਸੀ, ਪਰ ਤੁਹਾਨੂੰ ਆਪਣੇ ਖਾਤੇ ਦੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ "
-"ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।"
+"ਸੰਰਚਨਾ ਆਟੋਮੈਟਿਕ ਹੀ ਮਾਈਗਰੇਟ ਕੀਤਾ ਗਿਆ ਸੀ, ਪਰ ਤੁਹਾਨੂੰ ਆਪਣੇ ਖਾਤੇ ਦੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ ਕਰਨੀ "
+"ਚਾਹੀਦੀ ਹੈ।"
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4111,14 +4025,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "ਗਲਤੀ: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4268,14 +4187,14 @@ msgstr "ਸੂਚੀ ਪੁਰਾਲੇਖ"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4303,136 +4222,110 @@ msgstr "ਨਾ-ਵਰਤਣਯੋਗ ਇੰਕਰਿਪਸ਼ਨ ਕੁੰਜੀ
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4447,136 +4340,110 @@ msgstr "S/MIME ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਛੇਤੀ ਹ�
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4589,9 +4456,10 @@ msgstr "S/MIME ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਛੇਤੀ ਹ�
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4617,26 +4485,26 @@ msgstr "ਨਾ-ਵਰਤਣਯੋਗ ਦਸਤਖਤੀ ਕੁੰਜੀਆਂ"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4647,8 +4515,8 @@ msgstr "OpenPGP-ਦਸਤਖਤ ਨਾ ਕਰੋ"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4670,11 +4538,11 @@ msgstr "ਦਸਤਖਤ ਸੰਭਵ ਨਹੀਂ"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"ਤੁਹਾਨੂੰ ਆਪਣੇ ਲਈ ਇੱਕ ਇੰਕਰਿਪਸ਼ਨ ਕੁੰਜੀ ਦੀ ਚੋਣ ਨਹੀਂ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ (ਆਪਣੇ ਲਈ "
-"ਇੰਕਰਿਪਟ)। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ ਇੰਕਰਿਪਟ ਕਰ ਦਿੱਤਾ ਤਾਂ ਇਸ ਨੂੰ ਡਿਕਰਿਪਟ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
+"ਤੁਹਾਨੂੰ ਆਪਣੇ ਲਈ ਇੱਕ ਇੰਕਰਿਪਸ਼ਨ ਕੁੰਜੀ ਦੀ ਚੋਣ ਨਹੀਂ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ (ਆਪਣੇ ਲਈ ਇੰਕਰਿਪਟ)। ਜੇਕਰ ਤੁਸੀਂ "
+"ਇਸ ਨੂੰ ਇੰਕਰਿਪਟ ਕਰ ਦਿੱਤਾ ਤਾਂ ਇਸ ਨੂੰ ਡਿਕਰਿਪਟ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -4693,8 +4561,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4735,11 +4603,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "\"%1\" ਲਈ ਕੋਈ ਜਾਇਜ ਅਤੇ ਭਰੋਸੇਯੋਗ ਇੰਕਰਿਪਟ ਕੁੰਜੀ ਨਹੀਂ ਲੱਭੀ ਹੈ।\n"
 "\n"
@@ -4786,10 +4654,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "ਗੰਭੀਰ ਗਲਤੀ: ਪੱਤਰ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਗਲਤੀ:\n"
+msgid "Failed to add message:\n"
+msgstr "ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਗਲਤੀ:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -4879,6 +4745,50 @@ msgstr "ਨਾ-ਜੁੜਿਆ IMAP(&D)"
 msgid "&Maildir mailbox"
 msgstr "&Maildir ਪੱਤਰ-ਬਕਸਾ"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "ਸੁਨੇਹੇ ਦਾ ਵਿਸ਼ਾ ਦਿਓ"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "'ਸਿਰਨਾਵੀਆਂ' ਨੂੰ CC: ਭੇਜੋ"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "'ਸਿਰਨਾਵੀਆਂ' ਨੂੰ BCC: ਭੇਜੋ"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "ਸੁਨੇਹੇ ਵਿੱਚ 'ਸਿਰਲੇਖ' ਸ਼ਾਮਿਲ ਕਰੋ"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "'ਫਾਇਲ' ਵਿੱਚੋਂ ਸੁਨੇਹਾ ਭਾਗ ਪੜ੍ਹੋ"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "ਸੁਨੇਹਾ ਦਾ ਭਾਗ ਦਿਓ"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "ਪੱਤਰ ਨਾਲ ਨੱਥੀ ਕਰੋ। ਇਹ ਨੂੰ ਦੁਹਰਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "ਸਿਰਫ ਨਵੇਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਕਰੋ"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "ਸਿਰਫ਼ ਨਵਾਂ ਨਿਰਮਾਣ ਝਰੋਖਾ ਖੋਲ੍ਹੋ"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "ਦਿੱਤੇ ਸੁਨੇਹਾ ਫਾਇਲ ਦੀ ਝਲਕ"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "ਪੱਤਰ"
@@ -4933,9 +4843,9 @@ msgstr "%1: ਫੋਲਡਰ %2 ਮਿਲਿਆ ਹੈ। ਇਹ ਮੁੱਖ ਗ
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4983,15 +4893,13 @@ msgstr "URL ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕੀਤਾ।"
 
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
-msgstr ""
-"<qt> ਫਾਇਲ<b>%1</b> ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"
-"<br></qt>"
+msgstr "<qt> ਫਾਇਲ<b>%1</b> ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?<br></qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "ਤਬਦੀਲ(&R)"
 
@@ -5009,7 +4917,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5029,125 +4937,121 @@ msgstr "ਫਾਇਲ ਵਿੱਚ ਇੱਕ ਸੁਨੇਹਾ ਮੌਜੂਦ �
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "ਫਾਇਲ ਵਿੱਚ ਕਈ ਸੁਨੇਹੇ ਹਨ। ਸਿਰਫ਼ ਪਹਿਲਾਂ ਸੁਨੇਹਾ ਹੀ ਵੇਖਾਇਆ ਜਾਵੇਗਾ।"
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "ਸੁਨੇਹੇ ਫਿਲਟਰ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "%2 ਵਿੱਚੋਂ %1 ਸੁਨੇਹੇ ਫਿਲਟਰ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "ਕੀ ਡਿਸਕ ਤੇ ਖਾਲ਼ੀ ਥਾਂ ਨਹੀਂ ਹੈ?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "ਸੁਨੇਹੇ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL ਖੋਲ੍ਹੋ..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "ਚਲਾਓ"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "ਸੰਭਾਲਣ ਲਈ ਕੋਈ ਨੱਥੀ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "ਨੱਥੀ ਨੂੰ ਇੰਞ ਸੰਭਾਲੋ"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "ਨੱਥੀ.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "ਨੱਥੀ.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
-msgstr ""
-"ਫਾਇਲ ਨਾਂ %1 ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਦੇ ਉੱਪਰ ਹੀ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਫਾਇਲ ਨਾਂ %1 ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਦੇ ਉੱਪਰ ਹੀ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ(&O)"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
-msgstr ""
-"ਸੁਨੇਹੇ ਦਾ ਭਾਗ %1 ਇੰਕਰਿਪਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸੰਭਾਲਣ ਸਮੇਂ ਇੰਕਰਿਪਟ ਹੀ ਰੱਖਣਾ "
-"ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਸੁਨੇਹੇ ਦਾ ਭਾਗ %1 ਇੰਕਰਿਪਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸੰਭਾਲਣ ਸਮੇਂ ਇੰਕਰਿਪਟ ਹੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "ਕੇ-ਮੇਲ ਸਵਾਲ"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "ਇੰਕਰਿਪਸ਼ਨ ਰੱਖੋ"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "ਇੰਕਰਿਪਟ ਨਾ ਕਰੋ"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"ਸੁਨੇਹੇ ਦਾ ਭਾਗ %1 ਦਸਤਖਤੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਸੰਭਾਲਣ ਸਮੇਂ ਦਸਤਖਤਾਂ ਸਮੇਤ ਹੀ "
-"ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+"ਸੁਨੇਹੇ ਦਾ ਭਾਗ %1 ਦਸਤਖਤੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਸੰਭਾਲਣ ਸਮੇਂ ਦਸਤਖਤਾਂ ਸਮੇਤ ਹੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "ਦਸਤਖਤ ਰੱਖੋ"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5156,19 +5060,19 @@ msgstr ""
 "ਫਾਇਲ %1 ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "ਫਾਇਲ %1 ਨੂੰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5178,66 +5082,66 @@ msgstr ""
 " %1\n"
 " ਇਹ ਜਾਣਨਾ ਸੰਭਵ ਨਹੀਂ ਹੋਵੇਗਾ ਕਿ ਕੌਣ ਗੱਲਬਾਤ ਕਰ ਰਿਹਾ ਹੈ।"
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "ਵਾਕੰਸ਼ ਪਰਿਵਰਤਨ ਗਲਤੀ"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "ਵਾਕੰਸ਼ ਪਰਿਵਰਤਨ ਡਿਕਰਿਪਸ਼ਨ ਕੁੰਜੀ ਚੋਣ"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "ਪੱਤਰ"
@@ -5336,7 +5240,7 @@ msgstr "ਆਕਾਰ"
 msgid "Encoding"
 msgstr "ਇੰਕੋਡਿੰਗ"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "ਨਪੀੜੋ"
 
@@ -5348,7 +5252,7 @@ msgstr "ਇੰਕ੍ਰਿਪਟ"
 msgid "Sign"
 msgstr "ਦਸਤਖਤ"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "ਨੱਥੀ ਦਾ ਨਾਂ:"
 
@@ -5370,9 +5274,9 @@ msgstr "ਮੂਲ ਸੁਨੇਹੀ"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
-msgstr ""
-"<qt>ਇਸ ਖੇਤਰ ਵਿੱਚ ਦਿੱਤੇ ਈ-ਮੇਲ ਸਿਰਨਾਵੇਂ ਨੂੰ ਈ-ਮੇਲ ਦੀ ਨਕਲ ਭੇਜੀ ਜਾਵੇਗੀ।</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
+msgstr "<qt>ਇਸ ਖੇਤਰ ਵਿੱਚ ਦਿੱਤੇ ਈ-ਮੇਲ ਸਿਰਨਾਵੇਂ ਨੂੰ ਈ-ਮੇਲ ਦੀ ਨਕਲ ਭੇਜੀ ਜਾਵੇਗੀ।</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -5381,9 +5285,9 @@ msgstr "ਵਾਧੂ ਪਰਾਪਤ ਕਰਤਾ"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5392,9 +5296,8 @@ msgstr "ਲੁਕਵੇਂ ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5405,7 +5308,7 @@ msgstr "ਪੱਤਰ ਭੇਜੋ(&S)"
 msgid "&Send Mail Via"
 msgstr "ਇੰਞ ਪੱਤਰ ਭੇਜੋ(&S)"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "ਬਾਅਦ ਭੇਜੋ(&L)"
@@ -5470,8 +5373,7 @@ msgstr "ਹਵਾਲਾ ਅੱਖਰ ਹਟਾਓ(&m)"
 msgid "Cl&ean Spaces"
 msgstr "ਖਾਲੀ ਥਾਂ ਸਾਫ"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "ਸਥਿਰ ਫੋਂਟ ਵਰਤੋਂ(&x)"
@@ -5614,31 +5516,31 @@ msgstr "ਕਰਿਪਟੋਗਰਾਫਿਕਸ ਸੁਨੇਹਾ ਫਾਰਮ�
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "ਮਿਆਰੀ"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "ਬਿੰਦੀਦਾਰ ਸੂਚੀ (ਡਿਸਕ)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "ਬਿੰਦੀਦਾਰ ਸੂਚੀ (ਚੱਕਰ)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "ਬਿੰਦੀਦਾਰ ਸੂਚੀ (ਵਰਗ)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "ਲੜੀਬੱਧ ਸੂਚੀ (ਦਸ਼ਮਲਵ)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "ਲੜੀਬੱਧ ਸੂਚੀ (ਐਲਫਾ ਹੇਠਾਂ)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "ਲੜੀਬੱਧ ਸੂਚੀ (ਐਲਫਾ ਉੱਪਰ)"
 
@@ -5731,8 +5633,7 @@ msgstr ""
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
-msgstr ""
-"ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਲਈ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ ਜਾਂ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਲਈ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ ਜਾਂ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: kmcomposewin.cpp:2262
 msgid "Close Composer"
@@ -5740,8 +5641,8 @@ msgstr "ਕੰਪੋਜ਼ਰ ਬੰਦ ਕਰੋ"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5749,42 +5650,44 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "ਫਾਇਲ ਨੱਥੀ ਰੀਮਾਇਡਰ"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "ਇੰਝ ਭੇਜੋ(&S)"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "ਨੱਥੀ ਫਾਇਲ"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "ਨੱਥੀ(&A)"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "ਫਾਇਲ ਸ਼ਾਮਿਲ"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "ਫਾਇਲ ਸ਼ਾਮਿਲ"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5824,275 +5727,286 @@ msgid ""
 "View"
 msgstr "ਵੇਖੋ"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "ਸੋਧ..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "ਸਕਰਿਪਟ ਸੋਧ..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "ਇੰਝ ਸੰਭਾਲੋ(&A)..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(&P)"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "ਨੱਥੀ ਸ਼ਾਮਲ..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "ਕੇ-ਮੇਲ ਫਾਇਲ ਨੂੰ ਨਪੀੜ ਨਹੀਂ ਸਕੀ ਹੈ।"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr ""
-"ਨਪੀੜੀ ਫਾਇਲ ਦਾ ਅਕਾਰ ਅਸਲੀ ਨਾਲੋਂ ਵੱਡਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਅਸਲੀ ਨੂੰ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਨਪੀੜੀ ਫਾਇਲ ਦਾ ਅਕਾਰ ਅਸਲੀ ਨਾਲੋਂ ਵੱਡਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਅਸਲੀ ਨੂੰ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "ਰੱਖੋ"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "ਕੇ-ਮੇਲ ਫਾਇਲ ਨੂੰ ਖੋਲ੍ਹ ਨਹੀਂ ਸਕੀ ਹੈ।"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "ਨੱਥੀ ਇੰਝ ਸੰਭਾਲੋ"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "ਪਾਠ ਵਾਂਗ ਸ਼ਾਮਿਲ"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "ਨੱਥੀ ਵਾਂਗ ਸ਼ਾਮਲ"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "ਨੱਥੀ ਵਾਂਗ ਚੇਪੋ(&h)"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ਬੇਨਾਮ"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "ਨਾ-ਪਰਿਭਾਸ਼ਤ ਇੰਕਰਿਪਟ ਕੁੰਜੀ"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "ਨਾ-ਪਰਿਭਾਸ਼ਤ ਦਸਤਖਤੀ ਕੁੰਜੀ"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "ਆਨਲਾਇਨ/ਆਫਲਾਇਨ"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸੁਨੇਹੀ ਤਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ, ਭਾਵੇਂ ਵੱਲ: ਖੇਤਰ ਵਿੱਚ, ਜਾਂ ਨਕਲ "
-"ਜਾਂ ਲੁਕਵੀ ਨਕਲ ਦੇ ਰੂਪ ਵਿੱਚ।"
+"ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸੁਨੇਹੀ ਤਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ, ਭਾਵੇਂ ਵੱਲ: ਖੇਤਰ ਵਿੱਚ, ਜਾਂ ਨਕਲ ਜਾਂ ਲੁਕਵੀ ਨਕਲ ਦੇ ਰੂਪ "
+"ਵਿੱਚ।"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "ਵੱਲ: ਖੇਤਰ ਖਾਲੀ ਹੈ। ਕੀ ਕਿਵੇਂ ਵੀ ਭੇਜਣਾ ਹੈ?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "ਵੱਲ: ਨਹੀਂ ਦਿੱਤਾ"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "ਤੁਸੀਂ ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਕੀ ਸੁਨੇਹਾ ਇੰਜ ਹੀ ਭੇਜਣਾ ਹੈ?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "ਇੰਞ ਭੇਜੋ(&e)"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "ਵਿਸ਼ਾ ਦਿਓ(&S)"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "ਦਸਤਖਤ/ਇੰਕਰਿਪਟ (ਨਿਸ਼ਾਨ ਹਟਾਓ)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "ਇੰਕਰਿਪਟ (ਨਿਸ਼ਾਨ ਹਟਾਓ)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "ਦਸਤਖਤ (ਨਿਸ਼ਾਨ ਹਟਾਓ)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "ਕੀ ਦਸਤਖਤ/ਇੰਕਰਿਪਟ ਸੁਨੇਹਾ?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "ਭੇਜਣ ਲਈ ਖਾਤਾ ਬਣਾ ਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "ਈ-ਮੇਲ ਭੇਜਣ ਬਾਰੇ..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "ਭੇਜਣ ਬਾਰੇ ਪੁਸ਼ਟੀ"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "ਹੁਣੇ ਭੇਜੋ(&S)"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "ਵਾਧੂ ਪਰਾਪਤ ਕਰਤਾ"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr ""
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr ""
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਰੱਦ ਕੀਤੀ ਗਈ।"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਰੋਕੀ ਗਈ ਹੈ।"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਮੁਕੰਮਲ ਹੋਈ ਹੈ।"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚਕ"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "ਸੁਨੇਹਾ %1 ਰਾਹੀਂ ਦਸਤਖਤੀ ਹੈ"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "ਸੁਨੇਹਾ %1 ਰਾਹੀਂ ਦਸਤਖਤੀ ਹੈ"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP ਸੁਨੇਹਾ - ਇੰਕਰਿਪਟਡ"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "ਸੁਨੇਹਾ ਵਿਸ਼ੇ ਨਾਲ:"
@@ -6142,8 +6056,8 @@ msgstr "ਸ਼ਬਦ-ਜੋੜ - ਕੇ-ਮੇਲ"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6177,13 +6091,11 @@ msgstr "<qt>ਫਿਲਟਰ ਨਿਯਮ <b>%1</b> ਬਹੁਤ ਜਿਆਦਾ
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>ਫਿਲਟਰ ਨਿਯਮ <b>%2</b> ਵਿੱਚ"
-"<br> ਅਣਜਾਣ ਫਿਲਟਰ ਕਾਰਵਾਈ <b>%1</b> ਹੈ। "
-"<br>ਇਹ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।</qt>"
+"<qt>ਫਿਲਟਰ ਨਿਯਮ <b>%2</b> ਵਿੱਚ<br> ਅਣਜਾਣ ਫਿਲਟਰ ਕਾਰਵਾਈ <b>%1</b> ਹੈ। <br>ਇਹ ਨੂੰ "
+"ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6400,102 +6312,86 @@ msgstr "ਆਵਾਜ਼ ਚਲਾਓ"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6507,6 +6403,16 @@ msgstr "POP3 ਫਿਲਟਰ ਨਿਯਮ"
 msgid "Filter Rules"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "ਆਯਾਤ(&I)"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "ਆਯਾਤ(&I)"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "ਉਪਲੱਬਧ ਫਿਲਟਰ"
@@ -6587,6 +6493,11 @@ msgstr "ਸੰਦ-ਪੱਟੀ ਵਿੱਚ ਹੋਰ ਫਿਲਟਰ ਹੋਰ
 msgid "Icon for this filter:"
 msgstr "ਇਸ ਫਿਲਟਰ ਲਈ ਆਈਕਾਨ:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "ਵੱਲ"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "ਉੱਪਰ"
@@ -6595,16 +6506,29 @@ msgstr "ਉੱਪਰ"
 msgid "Down"
 msgstr "ਹੇਠਾਂ"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "ਨਾਂ-ਤਬਦੀਲ..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "ਨਵਾਂ"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "ਨਕਲ(&C)"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "ਹਟਾਏ"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6613,8 +6537,8 @@ msgstr "ਫੋਲਡਰ ਲਈ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6686,19 +6610,16 @@ msgstr "IMAP ਕੈਂਚੇ ਸਮੱਸਿਆ ਨਿਪਟਾਰਾ"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6736,8 +6657,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6773,8 +6694,8 @@ msgstr "ਇਸ ਫੋਲਡਰ ਲਈ ਤਤਕਰਾ ਮੁੜ ਬਣਾਇਆ
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6900,10 +6821,8 @@ msgstr "ਸਰਵਰ ਉੱਤੇ ਸਬ-ਫੋਲਡਰ ਬਣਾਏ ਜਾ ਰ
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -6925,13 +6844,11 @@ msgstr "ਨਾਂ-ਥਾਂ %1 ਲਈ ਫੋਲਡਰ ਲਏ ਜਾ ਰਹੇ �
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>ਇੰਝ ਜਾਪਦਾ ਹੈ ਕਿ ਫੋਲਡਰ <b>%1</b> ਹਟਾਇਆ ਗਿਆ ਸੀ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸਰਵਰ ਤੋਂ "
-"ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</p></qt>"
+"<qt> <p>ਇੰਝ ਜਾਪਦਾ ਹੈ ਕਿ ਫੋਲਡਰ <b>%1</b> ਹਟਾਇਆ ਗਿਆ ਸੀ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸਰਵਰ ਤੋਂ ਹਟਾਉਣਾ "
+"ਚਾਹੁੰਦੇ ਹੋ?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -6939,14 +6856,14 @@ msgstr "ਅਧੂਰਾ ਛੱਡਿਆ"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6959,11 +6876,11 @@ msgstr "ਗੁਆਚੇ+ਲੱਭੇ"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6972,15 +6889,20 @@ msgstr "ਅਧੂਰੇ ਪਹੁੰਚ ਅਧਿਕਾਰ"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "ਇਸ ਤੇ ਭੇਜੋ:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "ਨਾ ਭੇਜੋ"
 
@@ -6992,8 +6914,7 @@ msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 msgid "Permissions (ACL)"
 msgstr "ਅਧਿਕਾਰ (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "ਸਧਾਰਨ"
@@ -7017,8 +6938,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "ਪਸੰਦੀਦਾ ਅਕਾਰ ਵਰਤੋਂ(&i)"
@@ -7037,14 +6957,13 @@ msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਨਵੇਂ/ਨਾ-ਪੜੇ ਪੱ
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7057,9 +6976,9 @@ msgstr "ਦਿੱਤੇ ਜਵਾਬ ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਰੱ�
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7070,17 +6989,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "ਕਾਲਮ ਵੇਖਾਓ(&w):"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "ਮੂਲ ਬਣਾਓ"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "ਭੇਜਣ ਵਾਲਾ"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ"
@@ -7091,11 +7014,11 @@ msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਪਛਾਣ(&S):"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7114,12 +7037,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7150,17 +7073,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7230,7 +7153,8 @@ msgstr "ਫੋਲਡਰ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨ ਦੌ�
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7253,11 +7177,11 @@ msgstr "%1 ਖੋਲਣ ਦੌਰਾਨ ਗਲਤੀ, ਇਹ ਫੋਲਡਰ ਗ
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"%1 ਨੂੰ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ, ਜਾਂ ਤਾਂ ਇੱਕ ਠੀਕ maildir ਫੋਲਡਰ ਨਹੀਂ ਹੈ ਜਾਂ ਤੁਹਾਨੂੰ "
-"ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
+"%1 ਨੂੰ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ, ਜਾਂ ਤਾਂ ਇੱਕ ਠੀਕ maildir ਫੋਲਡਰ ਨਹੀਂ ਹੈ ਜਾਂ ਤੁਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ "
+"ਨਹੀਂ ਹਨ।"
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -7269,13 +7193,11 @@ msgstr "maildir ਫੋਲਡਰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜ
 
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
-msgstr ""
-"ਸੁਨੇਹਾ ਫੋਲਡਰ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਸੰਭਵ ਤੌਰ 'ਤੇ ਡਿਸਕ ਥਾਂ ਭਰ ਗਈ ਹੈ।"
+msgstr "ਸੁਨੇਹਾ ਫੋਲਡਰ ਵਿੱਚ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਸੰਭਵ ਤੌਰ 'ਤੇ ਡਿਸਕ ਥਾਂ ਭਰ ਗਈ ਹੈ।"
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
-msgstr ""
-"KMFolderMaildir::addMsg: ਡਾਟਾ ਖਰਾਬ ਹੋਣ ਤੋਂ ਬਚਣ ਲਈ ਅਧੂਰਾ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
+msgstr "KMFolderMaildir::addMsg: ਡਾਟਾ ਖਰਾਬ ਹੋਣ ਤੋਂ ਬਚਣ ਲਈ ਅਧੂਰਾ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -7299,13 +7221,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7365,7 +7285,7 @@ msgstr ""
 "'%1' ਇੱਕ ਫੋਲਡਰ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।\n"
 "ਫਾਇਲ ਨੂੰ ਕਿਤੇ ਹੋਰ ਭੇਜ ਦਿਓ ਜੀ।"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7373,7 +7293,7 @@ msgstr ""
 "ਫੋਲਡਰ '%1' ਲਈ ਅਧਿਕਾਰ ਗਲਤ ਹਨ।\n"
 "ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਹ ਫੋਲਡਰ ਦੇ ਭਾਗਾਂ ਨੂੰ ਵੇਖ ਅਤੇ ਸੋਧ ਸਕਦੇ ਹੋ।"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7383,8 +7303,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7392,7 +7312,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7490,9 +7410,9 @@ msgstr "IMAP ਕੈਚੇ ਸਮੱਸਿਆ ਨਿਪਟਾਰਾ(&T)..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7510,8 +7430,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>ਫੋਲਡਰ <b>%1</b> ਨੂੰ ਇੱਥੇ ਨਕਲ ਕੀਤਾ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਕਿਉਂਕਿ ਇਸ ਨਾਂ "
-"ਨਾਲ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।</qt>"
+"<qt>ਫੋਲਡਰ <b>%1</b> ਨੂੰ ਇੱਥੇ ਨਕਲ ਕੀਤਾ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਕਿਉਂਕਿ ਇਸ ਨਾਂ ਨਾਲ ਫੋਲਡਰ "
+"ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -7629,10 +7549,10 @@ msgstr "%1 ਫੋਲਡਰ ਸਿਰਫ਼ ਪੜ੍ਹਨ ਲਈ ਹੈ।"
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7685,124 +7605,122 @@ msgstr ""
 "%1 ਸੋਧ ਕਰਨੀ ਅਸਫ਼ਲ ਹੈ\n"
 "(ਕੀ ਜੰਤਰ ਉੱਤੇ ਕੋਈ ਖਾਲੀ ਥਾਂ ਬਚੀ ਹੈ?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਬੇਨਤੀ"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "ਨੱਥੀ ਤੋਂ ਇੱਕ ਸਰਟੀਫਿਕੇਟ ਬਣਾਓ ਅਤੇ ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਵਾਪਸ ਕਰੋ ਜੀ।"
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
-msgstr ""
-"ਕੇ-ਮੇਲ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਤਿਆਰ ਕੀਤੀ ਗਈ ਹੈ, ਸਭ ਨੈੱਟਵਰਕ ਕੰਮ ਸਸਪੈਂਡ ਕੀਤੇ ਜਾਣਗੇ।"
+msgstr "ਕੇ-ਮੇਲ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਤਿਆਰ ਕੀਤੀ ਗਈ ਹੈ, ਸਭ ਨੈੱਟਵਰਕ ਕੰਮ ਸਸਪੈਂਡ ਕੀਤੇ ਜਾਣਗੇ।"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "ਕੇ-ਮੇਲ ਆਨ-ਲਾਇਨ ਹੋਣ ਲਈ ਤਿਆਰ ਕੀਤੀ ਗਈ ਹੈ, ਸਭ ਨੈੱਟਵਰਕ ਕੰਮ ਮੁੜ-ਲਏ ਜਾਣਗੇ।"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "ਆਨਲਾਇਨ ਜਾਓ"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "ਆਫਲਾਇਨ ਹੀ ਚੱਲੋ"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਆਉਣ-ਬਕਸੇ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "ਬਾਹਰੀ-ਬਕਸਾ"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਆਉਟ-ਬਕਸੇ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "ਭੇਜੇ-ਪੱਤਰ"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੱਤਰ-ਭੇਜੇ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "ਰੱਦੀ"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਰੱਦੀ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "ਡਰਾਫਟ"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "ਤੁਹਾਨੂੰ ਆਪਣੇ ਡਰਾਫਟ ਫੋਲਡਰ ਵਿੱਚ ਪੜ੍ਹਨ/ਲਿਖਣ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "ਨਮੂਨੇ"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "ਆਖਰੀ ਖੋਜ"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "ਕੇਮੇਲ ਨੂੰ ਹੁਣੇ ਘਾਤਕ ਗਲਤੀ ਆਈ ਹੈ ਅਤੇ ਹੁਣ ਬੰਦ ਹੋ ਰਹੀ ਹੈ"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7813,11 +7731,11 @@ msgstr ""
 "ਗਲਤੀ ਸੀ:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਖਾਤਿਆਂ ਲਈ ਰੱਦੀ ਫੋਲਡਰ ਖਾਲੀ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -7892,8 +7810,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>ਨਵਾਂ ਪੱਤਰ ਆਇਆ ਹੈ</b> <br>%1"
 
 #: kmmainwidget.cpp:971
@@ -7931,10 +7848,9 @@ msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਫੋਲਡਰ ਨੂੰ ਰੱਦੀ ਵ
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
-msgstr ""
-"<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਫੋਲਡਰ ਤੋਂ ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜਣ ਲਈ ਸਹਿਮਤ ਹੋ?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
+msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਫੋਲਡਰ ਤੋਂ ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜਣ ਲਈ ਸਹਿਮਤ ਹੋ?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -7958,8 +7874,8 @@ msgstr "ਖੋਜ ਹਟਾਓ"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7972,29 +7888,32 @@ msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਖਾਲੀ ਫੋਲਡਰ ਨੂ
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "ਹਟਾਏ"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8007,9 +7926,9 @@ msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆ�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8023,8 +7942,8 @@ msgstr "HTML ਵਰਤੋਂ"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8041,8 +7960,8 @@ msgstr "%1 ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr "s ਦਫਤਰ ਜਵਾਬ ਚਾਲੂ IMAP ਲਈ ਚਾਲੂ IMAP "
 
@@ -8055,12 +7974,12 @@ msgstr "ਕੋਈ ਸਰਵਰ ਪਾਸੇ ਦੀ ਫਿਲਟਰ ਸੰਰਚ�
 msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
-msgstr ""
-"ਸਰਟੀਫਕੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਜੀ।"
+msgstr "ਸਰਟੀਫਕੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਜੀ।"
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8383,8 +8302,7 @@ msgstr "ਨੱਥੀ ਸੰਭਾਲੋ(&t)..."
 msgid "Appl&y All Filters"
 msgstr "ਸਭ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ(&y)"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "ਫਿਲਟਰ ਲਾਗੂ(&p)"
@@ -8497,7 +8415,6 @@ msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(&N)"
 msgid "Go to the next unread message"
 msgstr "ਅਗਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "ਪਿੱਛੇ ਸੁਨੇਹਾ(&P)"
@@ -8545,8 +8462,7 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"ਮੌਜੂਦਾ ਸੁਨੇਹੇ ਦੇ ਹੇਠਾਂ ਜਾਓ। ਜੇਕਰ ਮੌਜੂਦਾ ਸੁਨੇਹਾ ਖਤਮ ਹੋ ਗਿਆ ਹੋਵੇ ਤਾਂ ਅਗਲੇ "
-"ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ।"
+"ਮੌਜੂਦਾ ਸੁਨੇਹੇ ਦੇ ਹੇਠਾਂ ਜਾਓ। ਜੇਕਰ ਮੌਜੂਦਾ ਸੁਨੇਹਾ ਖਤਮ ਹੋ ਗਿਆ ਹੋਵੇ ਤਾਂ ਅਗਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ।"
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -8637,25 +8553,25 @@ msgstr " ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8663,8 +8579,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8672,8 +8588,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8702,17 +8618,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "ਰਸੀਦ:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "ਨੱਥੀ: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "ਨੱਥੀ ਨੂੰ ਭੇਜਣ ਵਾਲੇ ਦੇ ਸੁਝਾਅ ਮੁਤਾਬਕ ਹੀ ਵੇਖਾਓ।"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8762,29 +8678,26 @@ msgstr "ਸੁਨੇਹਾ ਭਾਗ ਵਿਸ਼ੇਸ਼ਤਾ"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8793,11 +8706,10 @@ msgstr "ਵੇਰਵਾ(&D):"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8806,14 +8718,13 @@ msgstr "ਇੰਕੋਡਿੰਗ(&E):"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8822,13 +8733,11 @@ msgstr "ਆਟੋਮੈਟਿਕ ਝਲਕ ਸੁਝਾਅ(&A)"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8837,9 +8746,8 @@ msgstr "ਇਸ ਭਾਗ ਤੇ ਦਸਤਖਤ(&S)"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8849,9 +8757,8 @@ msgstr "ਇਹ ਭਾਗ ਇਕ੍ਰਿਪਟ(&y)"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8866,11 +8773,9 @@ msgstr "POP ਫਿਲਟਰ"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9122,40 +9027,38 @@ msgstr "ਕੇ ਵੇਹੜਾ ਵਾਤਾਵਰਣ ਲਈ ਈ-ਮੇਲ ਕਲ
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>ਫੋਲਡਰ ਭਾਗ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ</h2>"
-"<p>ਉਡੀਕ ਕਰੋ ਜੀ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>ਫੋਲਡਰ ਭਾਗ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ</h2><p>ਉਡੀਕ ਕਰੋ "
+"ਜੀ . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>ਆਫਲਾਇਨ</h2>"
-"<p>ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ ਹੈ। ਆਨਲਾਇਨ ਜਾਣ ਲਈ <a href=\"kmail:goOnline\">"
-"ਏਥੇ</a> ਦਬਾਓ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>ਆਫਲਾਇਨ</h2><p>ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ ਹੈ। "
+"ਆਨਲਾਇਨ ਜਾਣ ਲਈ <a href=\"kmail:goOnline\">ਏਥੇ</a> ਦਬਾਓ . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9163,17 +9066,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>ਕੇਮੇਲ (KMail) %1 ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ</h2>"
-"<p>ਕੇਮੇਲ ਕੇਡੀਈ (TDE) ਲਈ ਇੱਕ ਈ-ਮੇਲ ਕਲਾਂਇਟ ਹੈ) ਇਸ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੇਲਿੰਗ ਮਿਆਰਾਂ, "
-"ਜਿਵੇਂ ਕਿ MIME, SMTP, POP3 ਅਤੇ IMAP ਦੇ ਮੁਤਾਬਕ ਹੀ ਤਿਆਰ ਕੀਤਾ ਗਿਆ ਹੈ।</p>\n"
-"<ul>"
-"<li>ਕੇਮੇਲ ਵਿੱਚ ਕਈ ਪਰਭਾਵਸ਼ਾਲੀ ਗੁਣ ਹਨ, ਜਿੰਨ੍ਹਾਂ ਬਾਰੇ ਜਾਣਕਾਰੀ <a href=\"%2\">"
-"ਦਸਤਾਵੇਜ਼</a> ਵਿੱਚ ਹੈ।</li>\n"
-"<li><a href=\"%3\">KMail ਮੁੱਖ ਸਫ਼ਾ</A> ਤੁਹਾਨੂੰ ਕੇਮੇਲ ਦੇ ਨਵੇਂ ਵਰਜਨਾਂ ਬਾਰੇ "
-"ਜਾਣਕਾਰੀ ਦਿੰਦਾ ਹੈ</li></ul>\n"
+"<h2 style='margin-top: 0px;'>ਕੇਮੇਲ (KMail) %1 ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ</h2><p>ਕੇਮੇਲ ਕੇਡੀਈ "
+"(TDE) ਲਈ ਇੱਕ ਈ-ਮੇਲ ਕਲਾਂਇਟ ਹੈ) ਇਸ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੇਲਿੰਗ ਮਿਆਰਾਂ, ਜਿਵੇਂ ਕਿ MIME, SMTP, POP3 ਅਤੇ "
+"IMAP ਦੇ ਮੁਤਾਬਕ ਹੀ ਤਿਆਰ ਕੀਤਾ ਗਿਆ ਹੈ।</p>\n"
+"<ul><li>ਕੇਮੇਲ ਵਿੱਚ ਕਈ ਪਰਭਾਵਸ਼ਾਲੀ ਗੁਣ ਹਨ, ਜਿੰਨ੍ਹਾਂ ਬਾਰੇ ਜਾਣਕਾਰੀ <a href=\"%2\">ਦਸਤਾਵੇਜ਼</"
+"a> ਵਿੱਚ ਹੈ।</li>\n"
+"<li><a href=\"%3\">KMail ਮੁੱਖ ਸਫ਼ਾ</A> ਤੁਹਾਨੂੰ ਕੇਮੇਲ ਦੇ ਨਵੇਂ ਵਰਜਨਾਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿੰਦਾ ਹੈ</"
+"li></ul>\n"
 "%8\n"
-"<p>ਕੇਮੇਲ ਦੇ ਇਹ ਜਾਰੀ ਵਰਜਨ ਵਿੱਚ ਕੁਝ ਨਵੇਂ ਫੀਚਰ ਹਨ (ਕੇਮੇਲ %4 ਦੇ ਮੁਕਾਬਲੇ, ਜੋ ਕਿ TDE "
-"%5 ਦਾ ਭਾਗ ਸੀ):</p>\n"
+"<p>ਕੇਮੇਲ ਦੇ ਇਹ ਜਾਰੀ ਵਰਜਨ ਵਿੱਚ ਕੁਝ ਨਵੇਂ ਫੀਚਰ ਹਨ (ਕੇਮੇਲ %4 ਦੇ ਮੁਕਾਬਲੇ, ਜੋ ਕਿ TDE %5 ਦਾ ਭਾਗ "
+"ਸੀ):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9182,15 +9084,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; ਕੇਮੇਲ ਟੀਮ</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9200,8 +9100,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>ਖਾਸ ਤਬਦੀਲੀਆਂ</span> "
-"(KMail %1 ਦੇ ਮੁਕਾਬਲੇ):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>ਖਾਸ ਤਬਦੀਲੀਆਂ</span> (KMail "
+"%1 ਦੇ ਮੁਕਾਬਲੇ):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -9232,7 +9132,8 @@ msgstr "ਨੱਥੀ ਝਲਕ: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9250,8 +9151,7 @@ msgid ""
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 "ਕੀ '%1' ਨੱਥੀ ਖੋਲ੍ਹਣਾ ਹੈ?\n"
-"ਯਾਦ ਰੱਖੋ ਕਿ ਕਿਸੇ ਨੱਥੀ ਨੂੰ ਖੋਲ੍ਹਣ ਨਾਲ ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੀ ਸੁਰੱਖਿਆ ਨੂੰ ਖਤਰਾ ਪੈਦਾ ਹੋ "
-"ਸਕਦਾ ਹੈ।"
+"ਯਾਦ ਰੱਖੋ ਕਿ ਕਿਸੇ ਨੱਥੀ ਨੂੰ ਖੋਲ੍ਹਣ ਨਾਲ ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੀ ਸੁਰੱਖਿਆ ਨੂੰ ਖਤਰਾ ਪੈਦਾ ਹੋ ਸਕਦਾ ਹੈ।"
 
 #: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
@@ -9259,12 +9159,14 @@ msgstr "ਕੀ ਨੱਥੀ ਖੋਲ੍ਹਣਾ ਹੈ?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9286,6 +9188,58 @@ msgstr "(ਕੋਈ ਵੀ ਮਿਲਦਾ)"
 msgid "(match all of the following)"
 msgstr "(ਸਭ ਨਾਲ ਮਿਲਦਾ)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "ਪੜ੍ਹੋ"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "ਪੁਰਾਣਾ"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "ਹਟਾਏ"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "ਜਵਾਬ ਦਿੱਤੇ"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "ਅੱਗੇ ਭੇਜੇ"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "ਕਤਾਰ ਵਿੱਚ"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "ਭੇਜੇ"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "ਵੇਖੇ"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "ਅਣਡਿੱਠਾ"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "ਸਪਮ"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "ਹਮ"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "ਕਰਨ-ਲਈ"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "ਨੱਥੀ ਹੈ"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9368,17 +9322,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9404,8 +9358,8 @@ msgstr "ਭੇਜਣ ਕਾਰਵਾਈ ਦੀ ਕਾਰਵਾਈ ਸ਼ੁਰੂ �
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9430,8 +9384,9 @@ msgstr "(ਕੁਝ) ਕਤਾਰਬੱਧ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9442,13 +9397,11 @@ msgstr "ਭੇਜਣਾ ਅਧੂਰਾ ਛੱਡਿਆ ਗਿਆ"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9467,8 +9420,9 @@ msgstr "ਭੇਜਣ ਅਧੂਰਾ ਛੱਡੋ(&A)"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9502,30 +9456,30 @@ msgstr "ਤੁਹਾਨੂੰ ਇਹ SMTP ਸਰਵਰ ਲਈ ਇੱਕ ਉਪ�
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9537,6 +9491,10 @@ msgstr "%1 ਸ਼ੁਰੂ"
 msgid "Exit"
 msgstr "ਬਾਹਰ"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਹਨ"
@@ -9563,8 +9521,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9641,8 +9600,8 @@ msgstr "ਸਰਵਰ ਨੂੰ ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9663,10 +9622,9 @@ msgstr "ਪਸੰਦੀਦਾ ਮੇਜ਼ਬਾਨ ਨਾਂ ਸਰਵਰ ਨੂ�
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9696,8 +9654,8 @@ msgstr "ਸਿਰਫ ਲੋਕਲ ਫਾਇਲਾਂ ਹੀ ਸਵੀਕਾਰ �
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9710,10 +9668,10 @@ msgstr "ਗਲਤੀ ਫੋਲਡਰ %1 ਕ੍ਰਮਬੱਧ ਕਰਨ ਦੌ�
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9784,8 +9742,7 @@ msgstr "ਉਪਲੱਬਧ ਨਹੀਂ"
 msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
-msgstr ""
-"ਕੇਮੇਲ ਇਹ ਫੋਲਡਰ ਵਿੱਚ ਇੱਕ ਮੇਲਿੰਗ ਲਿਸਟ ਖੋਜਣ ਲਈ ਅਸਫ਼ਲ ਹੈ। ਸਿਰਨਾਵਾਂ ਖੁਦ ਹੀ ਭਰੋ ਜੀ।"
+msgstr "ਕੇਮੇਲ ਇਹ ਫੋਲਡਰ ਵਿੱਚ ਇੱਕ ਮੇਲਿੰਗ ਲਿਸਟ ਖੋਜਣ ਲਈ ਅਸਫ਼ਲ ਹੈ। ਸਿਰਨਾਵਾਂ ਖੁਦ ਹੀ ਭਰੋ ਜੀ।"
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -9934,22 +9891,18 @@ msgstr "ਸੁਨੇਹਾ ਸੋਧ(&E)"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9962,8 +9915,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9978,14 +9931,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10080,8 +10033,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10113,8 +10066,9 @@ msgstr "ਇਕ੍ਰਿਪਟ ਨਾ ਕਰੋ(&N)"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10124,8 +10078,8 @@ msgstr "ਕੀ ਬਿਨਾਂ-ਇੰਕਰਿਪਸ਼ਨ ਹੀ ਭੇਜਣ�
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10145,73 +10099,70 @@ msgstr "ਸਭ ਭਾਗ ਇਕ੍ਰਿਪਟ"
 msgid "Unencrypted Message Warning"
 msgstr "ਨਾ-ਇਕ੍ਰਪਿਟਡ ਸੁਨੇਹਾ ਚੇਤਾਵਨੀ"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>ਸਭ ਅੱਖਰ ਚੁਣੀ ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਪੂਰੇ ਨਹੀਂ ਆ ਰਹੇ ਹਨ। "
-"<br> "
-"<br>ਕੀ ਸੁਨੇਹਾ ਕਿਸੇ ਵੀ ਤਰ੍ਹਾਂ ਭੇਜਣਾ ਹੈ?</qt>"
+"<qt>ਸਭ ਅੱਖਰ ਚੁਣੀ ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਪੂਰੇ ਨਹੀਂ ਆ ਰਹੇ ਹਨ। <br> <br>ਕੀ ਸੁਨੇਹਾ ਕਿਸੇ ਵੀ ਤਰ੍ਹਾਂ ਭੇਜਣਾ ਹੈ?"
+"</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "ਕੁਝ ਅੱਖਰ ਗੁਆਚ ਜਾਣਗੇ"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "ਗੁੰਮ ਅੱਖਰ"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "ਇਕੋਡਿੰਗ ਤਬਦੀਲ"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10233,10 +10184,10 @@ msgstr "Mailbox ਫਾਰਮੈਟ(&f):"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10246,8 +10197,8 @@ msgstr "ਫੋਲਡਰ ਰੱਖਦਾ ਹੈ(&c):"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10286,8 +10237,7 @@ msgstr "ਦਸਤਖਤਾਂ ਲਈ ਵੱਖਰੇ ਨਤੀਜੇ"
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "ਹਾਲਤ: "
 
@@ -10316,8 +10266,8 @@ msgstr "ਕੋਈ %1 ਪਲੱਗਇਨ ਨਹੀਂ ਲੱਭੀ ਹੈ।"
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10354,18 +10304,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10614,8 +10564,8 @@ msgstr "ਸੰਭਾਲੇ:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10731,10 +10681,11 @@ msgstr "Kioslave ਗਲਤੀ ਸੁਨੇਹਾ"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10755,10 +10706,10 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"%5@%6 ਲਈ %2 ਵਿੱਚੋਂ %1 ਸੁਨੇਹਾ (%4 KB ਵਿੱਚੋਂ %3) ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ (ਸਰਵਰ ਉੱਤੇ %7 KB "
-"ਬਾਕੀ)।"
+"%5@%6 ਲਈ %2 ਵਿੱਚੋਂ %1 ਸੁਨੇਹਾ (%4 KB ਵਿੱਚੋਂ %3) ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ (ਸਰਵਰ ਉੱਤੇ %7 KB ਬਾਕੀ)।"
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -10774,1646 +10725,13 @@ msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਜਵਾਬ ਆਇਆ"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "ਜਾਓ(&G)"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "ਫੋਲਡਰ(&o)"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "ਸੁਨੇਹਾ(&M)"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "ਖਾਸ ਜਵਾਬ"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "ਅੱਗੇ(&F)"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML ਸੰਦ-ਪੱਟੀ"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "ਦਸਤਖਤ"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "ਆਟੋਮੈਟਿਕ ਦਸਤਖਤ ਸੁਨੇਹੇ(&A)"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "ਵੱਲ: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "ਯੂਨੀਵਰਸਲ"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "ਜਵਾਬ"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "ਅੱਗੇ"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "ਫੋਲਡਰ ਪ੍ਰਾਪਰਟੀ"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "ਫੋਲਡਰ ਇੱਕ ਮੇਲਿੰਗ ਸੂਚੀ ਰੱਖਦਾ ਹੈ(&m)"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "ਸਿਰਨਾਵਾਂ ਸੂਚੀ(&a):"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "ਸਧਾਰਨ(&o):"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "ਨਾ-ਪੜ੍ਹੇ(&e):"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "ਸੁਨੇਹਾ ਮਿਆਦ"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "ਮਿਆਦ ਸਮਾਪਤ(&x):"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "ਪੜ੍ਹੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ(&r)"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "ਮਿਆਦ ਸਮਾਪਤ(&f):"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "ਨਾ-ਪੜੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ(&u)"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "ਦਿਨ"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "ਹਫਤੇ"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "ਮਹੀਨੇ"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਪਛਾਣ(&y):"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "ਸੰਭਾਲ ਫਾਰਮੈਟ(&S):"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "ਦਰਿਸ਼ ਸੂਚੀ(&L):"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "ਆਨਲਾਈਨ ਸਰਟੀਫਿਕੇਟ ਮਿਆਦ"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP ਜਵਾਬ-ਕਰਤਾ URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "ਸਰਟੀਫਕੇਟ ਨੀਤੀ ਕਦੇਂ ਨਾ ਜਾਂਚੋਂ"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "CRL ਕਦੇਂ ਨਾ ਜਾਂਚੋ"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "ਗੁੰਮ ਜਾਰੀਕਰਤਾ ਸਰਟੀਫਕੇਟ ਪ੍ਰਾਪਤ ਕਰੋ"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP ਬੇਨਤੀਆਂ"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "ਕੋਈ HTTP ਬੇਨਤੀਆਂ ਨਾ ਕਰੋ"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP ਬੇਨਤੀਆਂ ਲਈ ਇਹ ਪਰਾਕਸੀ ਵਰਤੋਂ:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "ਸਿਸਟਮ HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP ਬੇਨਤੀਆਂ"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "ਸ਼ਾਮਿਲ(&A)..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "ਗਰੁੱਪਵੇਅਰ(&G)"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "ਫੋਂਟ ਸੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "ਅਣਸੀਮਤ"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "ਸਭ ਨੂੰ ਜਵਾਬ / ਲਿਸਟ ਨੂੰ ਜਵਾਬ"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜੋ"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "ਚੇਤਾਵਨੀ ਦਿਓ, ਜਦੋਂ ਨਾ-ਦਸਤਖਤੀ ਸੁਨੇਹੇ ਭੇਜੇ ਜਾਣ (&u)"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "ਨਾ-ਦਸਤਖਤੀ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਚੇਤਾਵਨੀ ਦੇਣ ਲਈ ਜਾਂਚ ਕਰੋ।"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "ਦਸਤਖਤ ਲਈ"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " ਦਿਨ"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "ਦਿਨਾਂ ਦੀ ਗਿਣਤੀ ਇੱਥੋਂ ਚੁਣੋ"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "ਰੂਟ ਸਰਟੀਫਿਕੇਟ ਲਈ:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "ਉਪਭੋਗੀ ਸਰਟੀਫਿਕੇਟ/ਕੁੰਜੀਆਂ ਲਈ:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "ਸਭ \"ਮੈਨੂੰ ਨਾ ਪੁੱਛੋ\" ਚੇਤਾਵਨੀਆਂ ਮੁੜ-ਯੋਗ"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "ਨਮੂਨਾ ਸਮੱਗਰੀ"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "ਨਮੂਨਾ ਸ਼ਾਰਟਕੱਟ"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "ਨਮੂਨਾ ਕਿਸਮ"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "ਮੇਲ ਜਾਂਚ ਸਮੇਂ ਕਤਾਰਬੱਧ ਪੱਤਰ ਭੇਜੋ"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "ਫੋਲਡਰ ਚੋਣ ਵਾਰਤਾਲਾਪ ਵਿੱਚ ਤਾਜ਼ਾ ਵਰਤਿਆ ਫੋਲਡਰ।"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਉਣ ਲਈ ਨੀਤੀ"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ ਵੇਖਾਓ"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "ਸੰਪਾਦਕ ਦਿਓ(&d):"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "ਕੰਪੋਜ਼ਰ ਦੀ ਬਜਾਏ ਬਾਹਰੀ ਸੰਪਾਦਕ ਵਰਤੋਂ(&x)"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "ਗਰੁੱਪਵੇਅਰ ਸਹੂਲਤ ਯੋਗ"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "ਪ੍ਰਤੀ ਮੇਜ਼ਾਬਨ ਵੱਧ ਤੋਂ ਵੱਧ ਕੁਨੈਕਸ਼ਨ ਦੀ ਗਿਣਤੀ"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "ਤੇਜ਼ ਖੋਜ ਸਤਰ ਸੋਧ ਵੇਖਾਓ"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜੇ ਸਮੇਂ ਅਸੀਂ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "ਆਟੋਮੈਟਿਕ ਦਸਤਖਤ ਜੋੜ੍ਹੋ(&u)"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "ਕਾਲਮ ਤੇ ਸ਼ਬਦ ਸਮੇਟੋ(&w):"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਸਤਰਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਹੈ।"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "ਸਵੈ ਸੰਭਾਲ ਅੰਤਰਾਲ:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "ਦਸਤਖਤ ਦੀ ਮਿਆਦ ਗਲਤ"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "ਸਿਰਨਾਵਾਂ ਚੋਣਕਾਰ ਦੀ ਕਿਸਮ"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਕਿਸਮ"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਸਤਰਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਹੈ।"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜੇ ਸਮੇਂ ਅਸੀਂ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"ਇਹ ਯੋਗ ਕਰੋ, ਜੇ ਤੁਸੀਂ :-) ਵਰਗੇ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਪਾਠ ਸੁਨੇਹੇ ਵਿੱਚ ਭਾਵਾਂ (ਛੋਟੀਆਂ "
-"ਤਸਵੀਰਾਂ) ਦੇ ਰੂਪ ਵਿੱਚ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "ਆਟੋਮੈਟਿਕ ਸਮੇਟਣ ਪੱਧਰ:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "ਹਵਾਲਾ ਪਾਠ ਲਈ ਫੋਂਟ ਅਕਾਰ ਘਟਾਓ"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "ਸਭ ਸੁਨੇਹਾ ਸਿਰਲੇਖ ਵੇਖਾਓ"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "ਫੈਂਸੀ ਸਿਰਲੇਖ 'ਚ ਉਪਭੋਗੀ ਏਜੰਟ ਵੇਖਾਓ"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%2 %3 ਵਿੱਚੋਂ %1 ਵਰਤੀ"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -12523,6 +10841,11 @@ msgstr "CC ਲਈ ਸ਼ਾਮਿਲ"
 msgid "Add as BCC"
 msgstr "BCC ਲਈ ਸ਼ਾਮਿਲ"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "ਰੱਦ ਕਰੋ(&a)"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12538,10 +10861,10 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੀ"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12558,8 +10881,8 @@ msgstr "ਸਿਰਨਾਵਾਂ-ਚੋਣ ਵਾਰਤਾਲਾਪ ਵਰਤੋ
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12662,10 +10985,19 @@ msgstr "ਤੋਂ ਵੱਡਾ ਜਾਂ ਬਰਾਬਰ"
 msgid " bytes"
 msgstr " ਬਾਈਟ"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " ਦਿਨ"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12808,16 +11140,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"ਖਾਤਾ '%1' ਲਈ ਡਾਟਾ ਇੱਕਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "ਖਾਤਾ '%1' ਲਈ ਡਾਟਾ ਇੱਕਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -12836,10 +11164,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"ਸਕਰਿਪਟ '%1' ਦੇ ਭਾਗ:\n"
+msgid "Contents of script '%1':\n"
+msgstr "ਸਕਰਿਪਟ '%1' ਦੇ ਭਾਗ:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -12862,20 +11188,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"ਸਿਈਵੀ ਸਮੱਰਥਾ:\n"
+msgid "Sieve capabilities:\n"
+msgstr "ਸਿਈਵੀ ਸਮੱਰਥਾ:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(ਕੋਈ ਖਾਸ ਸਮਰੱਥਾ ਉਪਲੱਬਧ ਨਹੀਂ)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"ਉਪਲੱਬਧ ਸਿਈਵੀ ਸਕਰਿਪਟਾਂ:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "ਉਪਲੱਬਧ ਸਿਈਵੀ ਸਕਰਿਪਟਾਂ:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -12949,8 +11271,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12967,17 +11289,22 @@ msgstr "ਦਿੱਤੀ ਫਾਇਲ ਪਾਠ ਸੰਪਾਦਕ ਵਿੱਚ �
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "ਕਮਾਂਡ ਦਿਓ(&p):"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "ਮਾਰਗ"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "ਨਵਾਂ ਇੰਦਰਾਜ਼:"
@@ -13014,6 +11341,11 @@ msgstr "ਖਾਤਾ ਸ਼ਾਮਿਲ"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ ਪਛਾਣ ਨਾਂ <b>%1</b> ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "ਲਾਗੂ ਕਰੋ(&t):"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13028,6 +11360,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "ਸਕਰਿਪਟ ਸੋਧ..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13067,9 +11403,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13106,6 +11442,16 @@ msgstr "ਯੋਗ ਨਹੀਂ"
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "ਵੱਲ: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13135,36 +11481,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13417,6 +11759,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ ਦਿਓ"
@@ -13449,80 +11795,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>....ਤੁਸੀਂ ਅਗਲਾ ਤੇ ਪਿੱਛਲਾ ਸੁਨੇਹਾ ਸਿਰਫ ਸੱਜੀ ਅਤੇ ਖੱਬੀ ਸਵਿੱਚ ਦਬਾ ਕੇ \n"
-"ਅਨੁਸਾਰੀ ਸੁਨੇਹਾ ਵੇਖ ਸਕਦੇ ਹੋ?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...ਤੁਸੀਂ ਹਰੇਕ ਫੋਲਡਰ ਨੂੰ ਪਸੰਦੀਦਾ ਆਈਕਾਨ ਦੇ ਸਕਦੇ ਹੋ?\n"
-"ਵੇਖੋ <em>ਫੋਲਡਰ-&gt;ਵਿਸ਼ੇਸ਼ਤਾ</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "ਕੁਝ ਵੀ ਵਾਪਿਸ ਕਰਨ ਲਈ ਨਹੀਂ ਹੈ"
@@ -13575,8 +11847,7 @@ msgstr "ਹਵਾਲਾ ਪਾਠ ਸਮੇਟੋ।"
 
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
-msgstr ""
-"ਸਰਟੀਫਕੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਜੀ।"
+msgstr "ਸਰਟੀਫਕੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਜੀ।"
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -13591,6 +11862,15 @@ msgstr "ਨੱਥੀ #%1 (ਬੇਨਾਮ)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "ਫਾਇਲ ਨਾਂ \"%1\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "ਕੀ ਫਾਇਲ ਉੱਪਰ ਲਿਖਣਾ ਹੈ?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13700,9 +11980,9 @@ msgstr "ਹਰੇਕ ਸੁਨੇਹੇ ਨਾਲ ਤਸਵੀਰ ਭੇਜੋ(&
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13731,9 +12011,9 @@ msgstr "ਫਾਇਲ ਚੁਣੋ..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13742,15 +12022,15 @@ msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਤੋਂ ਚੁਣੋ"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13759,11 +12039,11 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"ਉਦਾਹਰਨਾਂ <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a> ਉੱਤੇ ਉਪਲੱਬਧ ਹਨ।"
+"ਉਦਾਹਰਨਾਂ <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/"
+"~ace/X-Faces/</a> ਉੱਤੇ ਉਪਲੱਬਧ ਹਨ।"
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -13778,129 +12058,1515 @@ msgstr "ਕੋਈ ਤਸਵੀਰ ਨਹੀਂ"
 msgid "You do not have your own contact defined in the address book."
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ 'ਚ ਤੁਹਾਡਾ ਆਪਣਾ ਸੰਪਰਕ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "ਦਸਤਖਤ"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "ਆਟੋਮੈਟਿਕ ਦਸਤਖਤ ਸੁਨੇਹੇ(&A)"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "ਸੁਨੇਹੇ ਦਾ ਵਿਸ਼ਾ ਦਿਓ"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "'ਸਿਰਨਾਵੀਆਂ' ਨੂੰ CC: ਭੇਜੋ"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "'ਸਿਰਨਾਵੀਆਂ' ਨੂੰ BCC: ਭੇਜੋ"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "ਸੁਨੇਹੇ ਵਿੱਚ 'ਸਿਰਲੇਖ' ਸ਼ਾਮਿਲ ਕਰੋ"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "'ਫਾਇਲ' ਵਿੱਚੋਂ ਸੁਨੇਹਾ ਭਾਗ ਪੜ੍ਹੋ"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "ਸੁਨੇਹਾ ਦਾ ਭਾਗ ਦਿਓ"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "ਪੱਤਰ ਨਾਲ ਨੱਥੀ ਕਰੋ। ਇਹ ਨੂੰ ਦੁਹਰਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "ਸਿਰਫ ਨਵੇਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਕਰੋ"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "ਸਿਰਫ਼ ਨਵਾਂ ਨਿਰਮਾਣ ਝਰੋਖਾ ਖੋਲ੍ਹੋ"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "ਦਿੱਤੇ ਸੁਨੇਹਾ ਫਾਇਲ ਦੀ ਝਲਕ"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "ਪੜ੍ਹੋ"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "ਪੁਰਾਣਾ"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "ਯੂਨੀਵਰਸਲ"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "ਹਟਾਏ"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "ਜਵਾਬ"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "ਜਵਾਬ ਦਿੱਤੇ"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "ਅੱਗੇ ਭੇਜੇ"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "ਅੱਗੇ"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "ਕਤਾਰ ਵਿੱਚ"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "ਭੇਜੇ"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "ਵੇਖੇ"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "ਨਮੂਨਾ ਸਮੱਗਰੀ"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "ਅਣਡਿੱਠਾ"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "ਨਮੂਨਾ ਸ਼ਾਰਟਕੱਟ"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "ਸਪਮ"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "ਨਮੂਨਾ ਕਿਸਮ"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "ਹਮ"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "ਫੋਲਡਰ ਪ੍ਰਾਪਰਟੀ"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "ਕਰਨ-ਲਈ"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "ਫੋਲਡਰ ਇੱਕ ਮੇਲਿੰਗ ਸੂਚੀ ਰੱਖਦਾ ਹੈ(&m)"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "ਨੱਥੀ ਹੈ"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "ਸਿਰਨਾਵਾਂ ਸੂਚੀ(&a):"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%2 %3 ਵਿੱਚੋਂ %1 ਵਰਤੀ"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "ਸਧਾਰਨ(&o):"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "ਮਾਰਗ"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "ਨਾ-ਪੜ੍ਹੇ(&e):"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "ਸੁਨੇਹਾ ਮਿਆਦ"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "ਮਿਆਦ ਸਮਾਪਤ(&x):"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "ਪੜ੍ਹੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ(&r)"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "ਮਿਆਦ ਸਮਾਪਤ(&f):"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "ਨਾ-ਪੜੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ(&u)"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "ਦਿਨ"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "ਹਫਤੇ"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "ਮਹੀਨੇ"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਪਛਾਣ(&y):"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "ਸੰਭਾਲ ਫਾਰਮੈਟ(&S):"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "ਦਰਿਸ਼ ਸੂਚੀ(&L):"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "ਮੇਲ ਜਾਂਚ ਸਮੇਂ ਕਤਾਰਬੱਧ ਪੱਤਰ ਭੇਜੋ"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"ਫਾਇਲ ਨਾਂ \"%1\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "ਕੀ ਫਾਇਲ ਉੱਪਰ ਲਿਖਣਾ ਹੈ?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "ਫੋਲਡਰ ਚੋਣ ਵਾਰਤਾਲਾਪ ਵਿੱਚ ਤਾਜ਼ਾ ਵਰਤਿਆ ਫੋਲਡਰ।"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਉਣ ਲਈ ਨੀਤੀ"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ ਵੇਖਾਓ"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "ਸੰਪਾਦਕ ਦਿਓ(&d):"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "ਕੰਪੋਜ਼ਰ ਦੀ ਬਜਾਏ ਬਾਹਰੀ ਸੰਪਾਦਕ ਵਰਤੋਂ(&x)"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "ਗਰੁੱਪਵੇਅਰ ਸਹੂਲਤ ਯੋਗ"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "ਪ੍ਰਤੀ ਮੇਜ਼ਾਬਨ ਵੱਧ ਤੋਂ ਵੱਧ ਕੁਨੈਕਸ਼ਨ ਦੀ ਗਿਣਤੀ"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "ਤੇਜ਼ ਖੋਜ ਸਤਰ ਸੋਧ ਵੇਖਾਓ"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜੇ ਸਮੇਂ ਅਸੀਂ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "ਆਟੋਮੈਟਿਕ ਦਸਤਖਤ ਜੋੜ੍ਹੋ(&u)"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "ਕਾਲਮ ਤੇ ਸ਼ਬਦ ਸਮੇਟੋ(&w):"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਸਤਰਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਹੈ।"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "ਸਵੈ ਸੰਭਾਲ ਅੰਤਰਾਲ:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "ਦਸਤਖਤ ਦੀ ਮਿਆਦ ਗਲਤ"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "ਸਿਰਨਾਵਾਂ ਚੋਣਕਾਰ ਦੀ ਕਿਸਮ"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਕਿਸਮ"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "ਸੁਨੇਹੀ ਸੰਪਾਦਕ ਸਤਰਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਹੈ।"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜੇ ਸਮੇਂ ਅਸੀਂ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"ਇਹ ਯੋਗ ਕਰੋ, ਜੇ ਤੁਸੀਂ :-) ਵਰਗੇ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਪਾਠ ਸੁਨੇਹੇ ਵਿੱਚ ਭਾਵਾਂ (ਛੋਟੀਆਂ ਤਸਵੀਰਾਂ) ਦੇ ਰੂਪ ਵਿੱਚ ਵੇਖਣਾ "
+"ਚਾਹੁੰਦੇ ਹੋ।"
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "ਆਟੋਮੈਟਿਕ ਸਮੇਟਣ ਪੱਧਰ:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "ਹਵਾਲਾ ਪਾਠ ਲਈ ਫੋਂਟ ਅਕਾਰ ਘਟਾਓ"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "ਸਭ ਸੁਨੇਹਾ ਸਿਰਲੇਖ ਵੇਖਾਓ"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "ਫੈਂਸੀ ਸਿਰਲੇਖ 'ਚ ਉਪਭੋਗੀ ਏਜੰਟ ਵੇਖਾਓ"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr ""
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "ਫਾਇਲ ਸੋਧ(&F)"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "ਸੋਧ..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "ਜਾਓ(&G)"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "ਫੋਲਡਰ(&o)"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "ਸੁਨੇਹਾ(&M)"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "ਖਾਸ ਜਵਾਬ"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "ਅੱਗੇ(&F)"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "ਫੋਂਟ ਸੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML ਸੰਦ-ਪੱਟੀ"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "ਆਮ ਚੋਣਾਂ"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML ਸੰਦ-ਪੱਟੀ"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "ਆਨਲਾਈਨ ਸਰਟੀਫਿਕੇਟ ਮਿਆਦ"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP ਜਵਾਬ-ਕਰਤਾ URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "ਸਰਟੀਫਕੇਟ ਨੀਤੀ ਕਦੇਂ ਨਾ ਜਾਂਚੋਂ"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "CRL ਕਦੇਂ ਨਾ ਜਾਂਚੋ"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "ਗੁੰਮ ਜਾਰੀਕਰਤਾ ਸਰਟੀਫਕੇਟ ਪ੍ਰਾਪਤ ਕਰੋ"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP ਬੇਨਤੀਆਂ"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "ਕੋਈ HTTP ਬੇਨਤੀਆਂ ਨਾ ਕਰੋ"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP ਬੇਨਤੀਆਂ ਲਈ ਇਹ ਪਰਾਕਸੀ ਵਰਤੋਂ:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "ਸਿਸਟਮ HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP ਬੇਨਤੀਆਂ"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "ਸ਼ਾਮਿਲ(&A)..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "ਗਰੁੱਪਵੇਅਰ(&G)"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "ਫੋਂਟ ਸੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "ਅਣਸੀਮਤ"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr ""
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "ਸਭ ਨੂੰ ਜਵਾਬ / ਲਿਸਟ ਨੂੰ ਜਵਾਬ"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜੋ"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "ਚੇਤਾਵਨੀ ਦਿਓ, ਜਦੋਂ ਨਾ-ਦਸਤਖਤੀ ਸੁਨੇਹੇ ਭੇਜੇ ਜਾਣ (&u)"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "ਨਾ-ਦਸਤਖਤੀ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਚੇਤਾਵਨੀ ਦੇਣ ਲਈ ਜਾਂਚ ਕਰੋ।"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "ਦਸਤਖਤ ਲਈ"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "ਦਿਨਾਂ ਦੀ ਗਿਣਤੀ ਇੱਥੋਂ ਚੁਣੋ"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "ਰੂਟ ਸਰਟੀਫਿਕੇਟ ਲਈ:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "ਉਪਭੋਗੀ ਸਰਟੀਫਿਕੇਟ/ਕੁੰਜੀਆਂ ਲਈ:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "ਸਭ \"ਮੈਨੂੰ ਨਾ ਪੁੱਛੋ\" ਚੇਤਾਵਨੀਆਂ ਮੁੜ-ਯੋਗ"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>....ਤੁਸੀਂ ਅਗਲਾ ਤੇ ਪਿੱਛਲਾ ਸੁਨੇਹਾ ਸਿਰਫ ਸੱਜੀ ਅਤੇ ਖੱਬੀ ਸਵਿੱਚ ਦਬਾ ਕੇ \n"
+"ਅਨੁਸਾਰੀ ਸੁਨੇਹਾ ਵੇਖ ਸਕਦੇ ਹੋ?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...ਤੁਸੀਂ ਹਰੇਕ ਫੋਲਡਰ ਨੂੰ ਪਸੰਦੀਦਾ ਆਈਕਾਨ ਦੇ ਸਕਦੇ ਹੋ?\n"
+"ਵੇਖੋ <em>ਫੋਲਡਰ-&gt;ਵਿਸ਼ੇਸ਼ਤਾ</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -14031,7 +13697,8 @@ msgstr "ਕੀ ਫਾਇਲ ਉੱਪਰ ਲਿਖਣਾ ਹੈ?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
diff --git a/tde-i18n-pl/messages/tdepim/kmail.po b/tde-i18n-pl/messages/tdepim/kmail.po
index d7825d149b9..1d116c5f39e 100644
--- a/tde-i18n-pl/messages/tdepim/kmail.po
+++ b/tde-i18n-pl/messages/tdepim/kmail.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2015-01-18 15:21+0100\n"
 "Last-Translator: mcbx\n"
 "Language-Team:  <pl@li.org>\n"
@@ -96,17 +96,18 @@ msgstr ""
 ">\n"
 ">\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"Mikołaj Machowski (aktualny tłumacz), Michał Rudolf, Jacek Stolarczyk, Michał "
-"Smoczyk"
+"Mikołaj Machowski (aktualny tłumacz), Michał Rudolf, Jacek Stolarczyk, "
+"Michał Smoczyk"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -251,6 +252,12 @@ msgstr "&brak (ostrożnie!)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto do półautomatycznej obsługi źródeł danych"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Wyczyść poprzednie"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -263,7 +270,8 @@ msgstr "Wyczyść poprzednie"
 
 #: accountdialog.cpp:417 accountdialog.cpp:518 accountdialog.cpp:700
 #: accountdialog.cpp:1036
-msgid "Delete all outdated allocations for the resource represented by this account."
+msgid ""
+"Delete all outdated allocations for the resource represented by this account."
 msgstr "Usuń wszystkie nieaktualne alokacje dla źródła danych danego konta."
 
 #: accountdialog.cpp:424
@@ -324,13 +332,13 @@ msgstr "&Użytkownik:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Twój dostawca Internetu podaje Ci <em>nazwę użytkownika</em> "
-"używaną do autoryzacji na jego serwerze. Zazwyczaj jest to początek Twojego "
-"adresu e-mail (część przed <em>@</em>)."
+"Twój dostawca Internetu podaje Ci <em>nazwę użytkownika</em> używaną do "
+"autoryzacji na jego serwerze. Zazwyczaj jest to początek Twojego adresu e-"
+"mail (część przed <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -351,12 +359,12 @@ msgstr "Zapisz &hasło POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Wybierz tę opcję, jeśli chcesz, by KMail przechowywał hasło. Jeśli dostępny "
 "jest Portfel, hasło zostanie zapisane w nim. To jest uważane za bezpieczną "
@@ -392,12 +400,13 @@ msgstr "&Filtruj wiadomości większe niż"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Jeśli wybierzesz tę opcję, filtry POP zostaną użyte do ustalenia, co zrobić z "
-"wiadomościami. Możesz później odebrać te wiadomości, usunąć je lub pozostawić "
-"na serwerze."
+"Jeśli wybierzesz tę opcję, filtry POP zostaną użyte do ustalenia, co zrobić "
+"z wiadomościami. Możesz później odebrać te wiadomości, usunąć je lub "
+"pozostawić na serwerze."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -446,13 +455,15 @@ msgstr "&Zwykły (niekodowany) tekst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -495,9 +506,9 @@ msgstr "Przestrzenie adresowe:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Tu można zobaczyć różne przestrzenie adresowe obsługiwane przez Twój serwer "
 "IMAP. Każda przestrzeń adresowa odpowiada prefiksowi oddzielającemu grupy "
@@ -506,7 +517,8 @@ msgstr ""
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
-msgstr "Ponownie wczytaj przestrzenie adresowe z serwera. To anuluje wszelkie zmiany."
+msgstr ""
+"Ponownie wczytaj przestrzenie adresowe z serwera. To anuluje wszelkie zmiany."
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -558,13 +570,13 @@ msgstr "Wczytuj załączniki na żą&danie"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Włącz tę opcję, by wyłączyć automatyczne wczytywanie załączników po wybraniu "
-"wiadomości. Załączniki będą wyświetlany dopiero po kliknięciu na nich - dzięki "
-"temu nawet duże wiadomości będą wyświetlane błyskawicznie."
+"wiadomości. Załączniki będą wyświetlany dopiero po kliknięciu na nich - "
+"dzięki temu nawet duże wiadomości będą wyświetlane błyskawicznie."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -604,7 +616,7 @@ msgstr "<żadnego>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "otrzymane"
 
@@ -612,8 +624,8 @@ msgstr "otrzymane"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Serwer najprawdopodobniej nie obsługuje unikatowych numerów wiadomości, a "
 "numery te są niezbędne do pozostawiania wiadomości na serwerze.\n"
@@ -624,8 +636,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Serwer najprawdopodobniej nie obsługuje pobierania nagłówków numerów "
 "wiadomości, a jest to niezbędne do filtrowania wiadomości na serwerze.\n"
@@ -634,24 +646,25 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Włączenie tej opcji może spowodować, że niektóre serwery POP3 nieobsługujące "
 "tej funkcji będą wysyłać uszkodzone wiadomości.\n"
-"Opcja ta jest dostępna, ponieważ niektóre serwery obsługują szybsze odbieranie "
-"poczty (pipelining), mimo że nie zgłaszają tego. Żeby sprawdzić, czy Twój "
-"serwer POP3 zgłasza obsługę szybszego odbierania, użyj przycisku \"Sprawdź "
-"możliwości serwera\" na dole okna.\n"
+"Opcja ta jest dostępna, ponieważ niektóre serwery obsługują szybsze "
+"odbieranie poczty (pipelining), mimo że nie zgłaszają tego. Żeby sprawdzić, "
+"czy Twój serwer POP3 zgłasza obsługę szybszego odbierania, użyj przycisku "
+"\"Sprawdź możliwości serwera\" na dole okna.\n"
 "Jeśli serwer nie zgłasza obsługi, ale chcesz przyspieszyć odbieranie poczty, "
-"spróbuj przetestować serwer, wysyłając kilka wiadomości do siebie i odbierając "
-"je z włączoną funkcją szybszego odbierania."
+"spróbuj przetestować serwer, wysyłając kilka wiadomości do siebie i "
+"odbierając je z włączoną funkcją szybszego odbierania."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -659,14 +672,14 @@ msgstr "Proszę podać serwer i port na karcie Ogólne."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Wygląda na to, że ten serwer nie obsługuje szybszego pobierania wiadomości "
 "(pipelining), dlatego ta opcja zostanie wyłączona.\n"
@@ -674,20 +687,20 @@ msgstr ""
 "spróbować włączyć opcję szybkiego odbierania wiadomości na serwerze. Na "
 "niektórych serwerach może to jednak spowodować uszkodzenie odbieranych "
 "wiadomości. Dlatego też zanim wykorzystasz tę funkcję do odbierania ważnych "
-"wiadomości, spróbuj przetestować serwer, wysyłając kilka wiadomości do siebie i "
-"odbierając je z włączoną funkcją szybszego odbierania."
+"wiadomości, spróbuj przetestować serwer, wysyłając kilka wiadomości do "
+"siebie i odbierając je z włączoną funkcją szybszego odbierania."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Serwer najprawdopodobniej nie obsługuje unikatowych numerów wiadomości, a "
-"numery te są niezbędne do pozostawiania wiadomości na serwerze. W związku z tym "
-"ta opcja została wyłączona.\n"
+"numery te są niezbędne do pozostawiania wiadomości na serwerze. W związku z "
+"tym ta opcja została wyłączona.\n"
 "Ponieważ niektóre serwery błędnie podają swoje możliwości, możesz mimo to "
 "spróbować włączyć opcję pozostawiania wiadomości na serwerze."
 
@@ -696,8 +709,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Serwer najprawdopodobniej nie obsługuje pobierania nagłówków numerów "
 "wiadomości, a jest to niezbędne do filtrowania wiadomości na serwerze. W "
@@ -786,9 +799,10 @@ msgstr "Konto IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
-msgstr "Musisz dodać konto w ustawieniach (część \"Sieć\"), by móc odbierać pocztę."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
+msgstr ""
+"Musisz dodać konto w ustawieniach (część \"Sieć\"), by móc odbierać pocztę."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -824,9 +838,9 @@ msgstr "Witamy w KMailu"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Wygląda na to, że KMail został uruchomiony po raz pierwszy. Możesz użyć "
 "tego asystenta, by skonfigurować Twoje konta pocztowe. Wystarczy wpisać dane "
@@ -892,8 +906,7 @@ msgstr "Użyj lokalnego dostarczania"
 msgid "Server Information"
 msgstr "Informacje o serwerze"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Brak"
@@ -1008,12 +1021,14 @@ msgstr "<p>Wiadomości rozpoznane jako spam są przenoszone do folderu <i>"
 #: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr ""
-"<p>Wiadomości rozpoznane jako spam nie są przenoszone do specjalnego "
-"folderu.</p>"
+"<p>Wiadomości rozpoznane jako spam nie są przenoszone do specjalnego folderu."
+"</p>"
 
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
-msgstr "<p>Folder dla wiadomości oznaczonych jako niepewne (prawdopodobnie spam) to <i>"
+msgstr ""
+"<p>Folder dla wiadomości oznaczonych jako niepewne (prawdopodobnie spam) to "
+"<i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -1028,41 +1043,39 @@ msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
 msgstr ""
-"Asystent wyszuka narzędzia do rozpoznawania spamu i skonfiguruje ich obsługą w "
-"KMailu."
+"Asystent wyszuka narzędzia do rozpoznawania spamu i skonfiguruje ich obsługą "
+"w KMailu."
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Tu można uzyskać pomoc w konfigurowaniu reguł filtrowania dla popularnych "
-"narzędzi antywirusowych.</p>"
-"<p>Asystent może wykryć narzędzia zainstalowane w systemie i utworzyć dla nich "
-"odpowiednie reguły filtrowania do klasyfikowania wiadomości i rozpoznania "
-"wiadomości zawierających wirusa. Asystent nie będzie uwzględniał istniejących "
-"reguł - zawsze utworzy nowe.</p>"
-"<p><b>Uwaga:</b> KMail nie będzie reagował w czasie poszukiwania wirusów w "
-"wiadomościach, ponieważ wyszukiwanie wirusów zabiera zwykle dużo czasu; może to "
-"zmniejszyć komfort korzystania z programu. Proszę usunąć reguły filtrowania, by "
-"przywrócić poprzednie zachowanie."
+"narzędzi antywirusowych.</p><p>Asystent może wykryć narzędzia zainstalowane "
+"w systemie i utworzyć dla nich odpowiednie reguły filtrowania do "
+"klasyfikowania wiadomości i rozpoznania wiadomości zawierających wirusa. "
+"Asystent nie będzie uwzględniał istniejących reguł - zawsze utworzy nowe.</"
+"p><p><b>Uwaga:</b> KMail nie będzie reagował w czasie poszukiwania wirusów w "
+"wiadomościach, ponieważ wyszukiwanie wirusów zabiera zwykle dużo czasu; może "
+"to zmniejszyć komfort korzystania z programu. Proszę usunąć reguły "
+"filtrowania, by przywrócić poprzednie zachowanie."
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Proszę wybrać narzędzia, które mają być używane do wykrywania, i przejść do "
-"następnej strony.</p>"
+"<p>Proszę wybrać narzędzia, które mają być używane do wykrywania, i przejść "
+"do następnej strony.</p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1090,15 +1103,14 @@ msgstr "Przenieś &prawdopodobny spam do:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Domyślnym folderem na spam jest otrzymane, ale można to zmienić w widoku "
-"katalogów poniżej. "
-"<p>Nie wszystkie narzędzia klasyfikują część wiadomości jako niepewne. Jeśli "
-"nie wybrałeś odpowiedniego narzędzia, wybór foldera będzie zablokowany."
+"katalogów poniżej. <p>Nie wszystkie narzędzia klasyfikują część wiadomości "
+"jako niepewne. Jeśli nie wybrałeś odpowiedniego narzędzia, wybór foldera "
+"będzie zablokowany."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1108,13 +1120,13 @@ msgstr "Sprawdź wiadomości używając narzędzi antywirusowych"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Pozwala programowi antywirusowemu na sprawdzenie Twoich wiadomości. Asystent "
-"utworzy odpowiednie filtry. Zawirusowane wiadomości są zwykle oznaczane przez "
-"program antywirusowy w taki sposób, że następne filtry mogą je rozpoznać  i np. "
-"przenieś je do specjalnego folderu."
+"utworzy odpowiednie filtry. Zawirusowane wiadomości są zwykle oznaczane "
+"przez program antywirusowy w taki sposób, że następne filtry mogą je "
+"rozpoznać  i np. przenieś je do specjalnego folderu."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1123,11 +1135,11 @@ msgstr "Przenieś wszystkie zawirusowane wiadomości do wybranego folderu"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Utworzono filtr do wykrywania zawirusowanych wiadomości i przenoszenia ich do "
-"wybranego folderu. Domyślny folder to Kosz, ale można to zmienić w widoku "
+"Utworzono filtr do wykrywania zawirusowanych wiadomości i przenoszenia ich "
+"do wybranego folderu. Domyślny folder to Kosz, ale można to zmienić w widoku "
 "folderów."
 
 #: antispamwizard.cpp:1084
@@ -1136,8 +1148,8 @@ msgstr "Dodatkowo zaznacz wybrane zawirusowane wiadomość jako przeczytane"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Zaznacz wiadomości, które zostały rozpoznane jako zawierające wirusa, jako "
 "przeczytane i przenieś je do wybranego foldera."
@@ -1217,8 +1229,8 @@ msgid ""
 "Archiving folder '%1' successfully completed. The archive was written to the "
 "file '%2'."
 msgstr ""
-"Archiwizacja folderu '%1' zakończyła się powodzeniem. Archiwum zapisano "
-"do pliku '%2'."
+"Archiwizacja folderu '%1' zakończyła się powodzeniem. Archiwum zapisano do "
+"pliku '%2'."
 
 #: backupjob.cpp:177
 msgid ""
@@ -1270,7 +1282,9 @@ msgstr "Nie udało się utworzyć struktury katalogów dla '%1' w archiwum."
 
 #: backupjob.cpp:425
 msgid "Unable to backup messages in folder '%1', the index file is corrupted."
-msgstr "Nie udało się skopiować wiadomości folderu '%1', plik indeksu jest uszkodzony."
+msgstr ""
+"Nie udało się skopiować wiadomości folderu '%1', plik indeksu jest "
+"uszkodzony."
 
 #: backupjob.cpp:483
 msgid "Unable to open archive for writing."
@@ -1302,8 +1316,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Może to oznaczać brak odpowiednich praw dostępu albo to, że odpowiedni folder "
-"na serwerze już istnieje. Komunikat błędu z komunikacji z serwerem:"
+"Może to oznaczać brak odpowiednich praw dostępu albo to, że odpowiedni "
+"folder na serwerze już istnieje. Komunikat błędu z komunikacji z serwerem:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1316,8 +1330,8 @@ msgstr "Nie można odczytać folderu %1 na serwerze: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1345,8 +1359,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 "<qt>tożsamość przypisana do tego zaproszenia nie posiada środka komunikacji."
 "<br>Proszę wybrać sposób dostarczenia odpowiedzi.</qt>"
@@ -1377,20 +1391,20 @@ msgstr "Delegowano: %1"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Żadna z Twoich tożsamości nie pasuje do odbiorcy tej wiadomości."
 "<br>Proszę wybrać, który z poniższych adresów jest Twój:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Kilka z Twoich tożsamości pasuje do adresata tej wiadomości."
-"<br>Proszę wybrać, który z poniższych adresów jest Twój:"
+"<qt>Kilka z Twoich tożsamości pasuje do adresata tej wiadomości.<br>Proszę "
+"wybrać, który z poniższych adresów jest Twój:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1419,18 +1433,21 @@ msgstr "Błąd podczas kompresji \"%1\". Kompresja przerwana."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>To ustawienie zostało wykonane przez administratora.</p>"
-"<p>Jeśli uważasz to za błąd, skontaktuj się z nim.</p></qt>"
+"<qt><p>To ustawienie zostało wykonane przez administratora.</p><p>Jeśli "
+"uważasz to za błąd, skontaktuj się z nim.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Wczytaj profil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Konfiguracja konta"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Dodaj..."
@@ -1460,6 +1477,11 @@ msgstr "<qt>Naprawdę chcesz usunąć tożsamość o nazwie <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Usuń tożsamość"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Usuń"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Dodaj..."
@@ -1468,6 +1490,11 @@ msgstr "Dodaj..."
 msgid "Modify..."
 msgstr "Zmień..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Usuń"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Ustaw jako domyślną"
@@ -1484,17 +1511,15 @@ msgstr "&Wysyłanie"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Poczta wychodząca (dodaj przynajmniej jedno konto):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nazwa"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Typ"
@@ -1516,8 +1541,7 @@ msgstr "Ustaw jako domyślne"
 msgid "Common Options"
 msgstr "Opcje wspólne"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Po&twierdź przed wysłaniem"
@@ -1568,17 +1592,16 @@ msgstr "&Domyślna domena:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Domyślna domena jest używana do uzupełniania adresu złożonego jedynie z "
-"nazwy użytkownika.</p></qt>"
+"<qt><p>Domyślna domena jest używana do uzupełniania adresu złożonego jedynie "
+"z nazwy użytkownika.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1596,9 +1619,9 @@ msgstr "Dodaj sposób wysyłania"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (domyślne)"
 
@@ -1683,6 +1706,10 @@ msgstr "Modyfikuj konto"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Nie można znaleźć konta <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Kolory"
@@ -1791,8 +1818,7 @@ msgstr "Odwiedzony odnośnik"
 msgid "Misspelled Words"
 msgstr "Słowa zapisane błędnie"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nowa wiadomość"
@@ -1980,8 +2006,8 @@ msgstr "Domyślnie zamykaj wszystkie wątki"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr "Otwiera&j wątki z nowymi, nieprzeczytanymi lub ważnymi wiadomościami."
 
 #: configuredialog.cpp:2055
@@ -1990,69 +2016,54 @@ msgstr "Wyświetlanie dat"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>W formacie daty można używać następujących wyrażeń:</strong></p>"
-"<ul>"
-"<li>d - numer dnia bez początkowego zera (1-31)</li>"
-"<li>dd - numer dnia z początkowym zerem (01-31)</li>"
-"<li>ddd - skrócona nazwa dnia (pon - nie)</li>"
-"<li>dddd - pełna nazwa dnia (poniedziałek- niedziela)</li>"
-"<li>M - numer miesiąca bez początkowego zera (1-12)</li>"
-"<li>MM - numer miesiąca z początkowym zerem (01-12)</li>"
-"<li>MMM - skrócona nazwa miesiąca (sty-gru)</li>"
-"<li>MMMM - pełna nazwa miesiąca (styczeń-grudzień)</li>"
-"<li>yy - ostatnie dwie cyfry roku (00-99)</li>"
-"<li>yyyy - pełny numer roku (0000-9999)</li> </ul> "
-"<p><strong>W formacie czasu można używać następujących wyrażeń:</strong></p>"
-"<ul>"
-"<li>h - godzina bez początkowego zera (0-23 lub 1-12 AM/PM)</li>"
-"<li>hh - godzina z początkowym zerem (00-23 lub 01-12 AM/PM)</li>"
-"<li>m - minuty bez początkowego zera (0-59)</li>"
-"<li>mm - minuty z początkowym zerem (00-59)</li>"
-"<li>s - sekundy bez początkowego zera (0-59)</li>"
-"<li>ss - sekundy z początkowym zerem (00-59)</li>"
-"<li>z - milisekundy bez początkowego zera (0-999)</li>"
-"<li>zzz - milisekundy z początkowymi zerami (000-999)</li>"
-"<li>AP - czas 12-godzinny (AM/PM)</li>"
-"<li>ap - czas 12-godzinny (am/pm)</li>"
-"<li>Z - strefa czasowa w formie numerycznej (+0100)</li> </ul> "
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>W formacie daty można używać następujących wyrażeń:</strong></"
+"p><ul><li>d - numer dnia bez początkowego zera (1-31)</li><li>dd - numer "
+"dnia z początkowym zerem (01-31)</li><li>ddd - skrócona nazwa dnia (pon - "
+"nie)</li><li>dddd - pełna nazwa dnia (poniedziałek- niedziela)</li><li>M - "
+"numer miesiąca bez początkowego zera (1-12)</li><li>MM - numer miesiąca z "
+"początkowym zerem (01-12)</li><li>MMM - skrócona nazwa miesiąca (sty-gru)</"
+"li><li>MMMM - pełna nazwa miesiąca (styczeń-grudzień)</li><li>yy - ostatnie "
+"dwie cyfry roku (00-99)</li><li>yyyy - pełny numer roku (0000-9999)</li> </"
+"ul> <p><strong>W formacie czasu można używać następujących wyrażeń:</"
+"strong></p><ul><li>h - godzina bez początkowego zera (0-23 lub 1-12 AM/PM)</"
+"li><li>hh - godzina z początkowym zerem (00-23 lub 01-12 AM/PM)</li><li>m - "
+"minuty bez początkowego zera (0-59)</li><li>mm - minuty z początkowym zerem "
+"(00-59)</li><li>s - sekundy bez początkowego zera (0-59)</li><li>ss - "
+"sekundy z początkowym zerem (00-59)</li><li>z - milisekundy bez początkowego "
+"zera (0-999)</li><li>zzz - milisekundy z początkowymi zerami (000-999)</"
+"li><li>AP - czas 12-godzinny (AM/PM)</li><li>ap - czas 12-godzinny (am/pm)</"
+"li><li>Z - strefa czasowa w formie numerycznej (+0100)</li> </ul> "
 "<p><strong>Pozostałe znaki zostaną zignorowane.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
-msgid "Changing the global threading setting will override all folder specific values."
+msgid ""
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Zmiana ogólnych ustawień dla wątków zmieni także ustawienia dla poszczególnych "
-"folderów."
+"Zmiana ogólnych ustawień dla wątków zmieni także ustawienia dla "
+"poszczególnych folderów."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2066,8 +2077,7 @@ msgstr "Pokaż pasek stanu &HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Zaznacz &spam w fantazyjnych nagłówkach"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Zastąp uśmieszki emotikonami"
@@ -2076,8 +2086,7 @@ msgstr "Zastąp uśmieszki emotikonami"
 msgid "Use smaller font for quoted text"
 msgstr "Użyj mniejszej czcionki do cytowanego tekstu"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Pokaż znaczki rozwijania/zwijania cytatów"
@@ -2087,7 +2096,8 @@ msgid "Show current sender time"
 msgstr "Pokazuj bieżący czas nadawcy"
 
 #: configuredialog.cpp:2262
-msgid "Close the standalone message window after replying or forwarding the message"
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
 msgstr "Zamknij okno wiadomości po odpowiedzeniu lub przekazaniu jej."
 
 #: configuredialog.cpp:2328
@@ -2102,8 +2112,7 @@ msgstr "Automatycznie"
 msgid "&Override character encoding:"
 msgstr "&Wymuś kodowanie:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Włącz ikonę na tacce systemowej"
@@ -2160,8 +2169,8 @@ msgid ""
 "When replying, only quote the selected text instead of the complete message "
 "when there is text selected in the message window."
 msgstr ""
-"Przy odpowiedzi cytuj tylko zaznaczony tekst zamiast całej wiadomości "
-"(tylko gdy jest zaznaczony tekst)."
+"Przy odpowiedzi cytuj tylko zaznaczony tekst zamiast całej wiadomości (tylko "
+"gdy jest zaznaczony tekst)."
 
 #: configuredialog.cpp:2704
 msgid "Warn if too many recipients are specified"
@@ -2206,19 +2215,17 @@ msgstr "<b>%f</b> zostanie zastąpione nazwą pliku do edycji."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>W tekście odpowiedzi można użyć następujących zmiennych:"
-"<br><b>%D</b>=data, <b>%S</b>=temat, "
-"<br><b>%e</b>=adres nadawcy, <b>%F</b>=nadawca, <b>%f</b>=inicjały nadawcy,"
-"<br><b>%T</b>=adresat , <b>%t</b>=adresat i jego adres, "
-"<br><b>%C</b>=adresaci kopii, <b>%c</b>=adresaci kopii i ich adresy,"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>W tekście odpowiedzi można użyć następujących zmiennych:<br><b>%D</"
+"b>=data, <b>%S</b>=temat, <br><b>%e</b>=adres nadawcy, <b>%F</b>=nadawca, <b>"
+"%f</b>=inicjały nadawcy,<br><b>%T</b>=adresat , <b>%t</b>=adresat i jego "
+"adres, <br><b>%C</b>=adresaci kopii, <b>%c</b>=adresaci kopii i ich adresy,"
 "<br><b>%%</b>=znak procentu, <b>%_</b>=spacja, <b>%L</b>=koniec wiersza</qt>"
 
 #: configuredialog.cpp:2943
@@ -2242,21 +2249,20 @@ msgstr "Odpowiedz &wszystkim:"
 msgid "&Forward:"
 msgstr "&Przekazywanie:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Oznaczenie &cytatu:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Dnia %D, napisałeś:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Dnia %D, %F napisał:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Przekazana wiadomość"
 
@@ -2294,11 +2300,11 @@ msgstr "Podaj nowy przedrostek przekazywania:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Poniższa lista jest przeszukiwana z góry na dół w poszukiwaniu zestawu znaków "
-"zawierającego wszystkie znaki użyte w wiadomości."
+"Poniższa lista jest przeszukiwana z góry na dół w poszukiwaniu zestawu "
+"znaków zawierającego wszystkie znaki użyte w wiadomości."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2332,10 +2338,9 @@ msgstr "Wartość"
 msgid "Ne&w"
 msgstr "&Nowy"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nazwa:"
@@ -2344,16 +2349,15 @@ msgstr "&Nazwa:"
 msgid "&Value:"
 msgstr "&Wartość:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nazwy załączników zgodne z Outlookiem"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Włącz tę opcję, by Outlook(tm) mógł zrozumieć nazwy załączników zawierające "
 "znaki narodowe"
@@ -2382,20 +2386,21 @@ msgstr "załączony"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"Wybrałeś opcję kodowania nazw załączników, zawierających znaki narodowe tak, by "
-"mogły być odczytane Outlook(tm) i inne programy pocztowe nie obsługujące "
+"Wybrałeś opcję kodowania nazw załączników, zawierających znaki narodowe tak, "
+"by mogły być odczytane Outlook(tm) i inne programy pocztowe nie obsługujące "
 "standardów kodowania nazw załączników.\n"
-"Uwaga: oznacza to, że KMail będzie tworzył wiadomości niezgodne ze standardem, "
-"które mogą sprawić problemy programom pocztowym zgodnym ze standardami. Jeśli "
-"nie jest to absolutnie konieczne, lepiej nie włączać tej opcji."
+"Uwaga: oznacza to, że KMail będzie tworzył wiadomości niezgodne ze "
+"standardem, które mogą sprawić problemy programom pocztowym zgodnym ze "
+"standardami. Jeśli nie jest to absolutnie konieczne, lepiej nie włączać tej "
+"opcji."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2419,111 +2424,97 @@ msgstr "&Narzędzia szyfrujące"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Listy czasem przychodzą jednocześnie w obu formatach. Ta opcja określa, "
-"który z nich ma być użyty: HTML (formatowany) czy zwykły tekst.</p>"
-"<p> Wyświetlanie wiadomości w HTML powoduje, że wygląda ona nieco lepiej, ale "
-"jednocześnie może stanowić zagrożenie dla bezpieczeństwa systemu.</p>"
-"<p> Wyświetlanie wiadomości jako zwykły tekst powoduje, że traci się część "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Listy czasem przychodzą jednocześnie w obu formatach. Ta opcja "
+"określa, który z nich ma być użyty: HTML (formatowany) czy zwykły tekst.</"
+"p><p> Wyświetlanie wiadomości w HTML powoduje, że wygląda ona nieco lepiej, "
+"ale jednocześnie może stanowić zagrożenie dla bezpieczeństwa systemu.</p><p> "
+"Wyświetlanie wiadomości jako zwykły tekst powoduje, że traci się część "
 "formatowania wiadomości, ale jednocześnie <em>uniemożliwia</em> "
 "wykorzystanie luki w generatorze strony HTML do zagrożenia bezpieczeństwu "
-"systemu.</p>"
-"<p> Opcja poniżej chroni przed typowym niewłaściwym użyciem HTML we "
-"wiadomościach. Ale nie może chronić przed wszystkimi nieznanymi (w momencie "
-"tworzenia tej wersji KMaila) zagrożeniami.</p>"
-"<p>Dlatego lepiej jest <em>nie</em> używać HTML zamiast zwykłego tekstu.</p>"
-"</qt>"
+"systemu.</p><p> Opcja poniżej chroni przed typowym niewłaściwym użyciem HTML "
+"we wiadomościach. Ale nie może chronić przed wszystkimi nieznanymi (w "
+"momencie tworzenia tej wersji KMaila) zagrożeniami.</p><p>Dlatego lepiej "
+"jest <em>nie</em> używać HTML zamiast zwykłego tekstu.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Niektóre listowne reklamówki w HTML-u zawierają odnośniki do obrazków, "
-"które są używane przez firmy reklamujące do sprawdzenia, że przeczytało się "
-"daną reklamówkę.</p>"
-"<p>Nie ma żadnego sensownego powodu, by w ten sposób wczytywać jakiekolwiek "
-"obrazki z sieci, gdyż nadawca może je załączyć do listu w zwykły sposób.</p>"
-"<p>Aby ochronić się przed takim nadużyciem HTML do wyświetlania listów przez "
-"KMail, ta opcja jest domyślnie <em>wyłączona</em>.</p>"
-"<p>Jeśli jednak chcesz oglądać obrazki nie dołączone do wiadomości, włącz tę "
-"opcję, ale pamiętaj o związanych z tym zagrożeniach.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p> Niektóre listowne reklamówki w HTML-u zawierają odnośniki do "
+"obrazków, które są używane przez firmy reklamujące do sprawdzenia, że "
+"przeczytało się daną reklamówkę.</p><p>Nie ma żadnego sensownego powodu, by "
+"w ten sposób wczytywać jakiekolwiek obrazki z sieci, gdyż nadawca może je "
+"załączyć do listu w zwykły sposób.</p><p>Aby ochronić się przed takim "
+"nadużyciem HTML do wyświetlania listów przez KMail, ta opcja jest domyślnie "
+"<em>wyłączona</em>.</p><p>Jeśli jednak chcesz oglądać obrazki nie dołączone "
+"do wiadomości, włącz tę opcję, ale pamiętaj o związanych z tym zagrożeniach."
+"</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Polityka powiadamiania o losie wiadomości</h3> "
-"<p>Powiadamianie o losie wiadomości (Message Disposition Notification, MDN) to "
-"generalizacja tak zwanego <em>potwierdzenia odbioru</em>"
-". Autor wiadomości żąda od programu pocztowego adresata powiadomienia, z "
-"którego autor może dowiedzieć się, co stało się z jego wiadomością. Typowe losy "
-"wiadomości to <em>przeczytana</em>, <em>usunięta</em>, <em>przesłana</em> "
-"(np. przekazana dalej)</p> "
-"<p>KMail oferuje następujące tryby obsługi MDN: "
-"<ul>"
-"<li><em>Ignoruj</em>: wszystkie żądania powiadomienia będą ignorowane. Żadne "
-"powiadomienia nie będą wysyłane automatycznie (zalecane).</li>"
-"<li><em>Pytaj</em>: powiadomienia będą wysyłane dopiero po potwierdzeniu przez "
-"użytkownika. Dzięki temu można będzie wysyłać MDN tylko dla wybranych "
-"wiadomości.</li>"
-"<li><em>Odrzuć</em>: zawsze wysyłana będzie odpowiedź <em>Odrzucona</em>"
-". Jest to tylko <em>nieco</em> lepsze od wysyłania zawsze odpowiedniego MDN. "
-"Autor będzie wiedział, że wiadomość została odebrana, nie będzie jedynie "
-"wiedział, co się z nią dalej stało.</li>"
-"<li><em>Zawsze wysyłaj</em>: zawsze wysyłana będzie właściwa odpowiedź. Oznacza "
-"to, że autor będzie dokładnie wiedział, co stało się z jego wiadomością. Użycie "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Polityka powiadamiania o losie wiadomości</h3> <p>Powiadamianie o "
+"losie wiadomości (Message Disposition Notification, MDN) to generalizacja "
+"tak zwanego <em>potwierdzenia odbioru</em>. Autor wiadomości żąda od "
+"programu pocztowego adresata powiadomienia, z którego autor może dowiedzieć "
+"się, co stało się z jego wiadomością. Typowe losy wiadomości to "
+"<em>przeczytana</em>, <em>usunięta</em>, <em>przesłana</em> (np. przekazana "
+"dalej)</p> <p>KMail oferuje następujące tryby obsługi MDN: "
+"<ul><li><em>Ignoruj</em>: wszystkie żądania powiadomienia będą ignorowane. "
+"Żadne powiadomienia nie będą wysyłane automatycznie (zalecane).</"
+"li><li><em>Pytaj</em>: powiadomienia będą wysyłane dopiero po potwierdzeniu "
+"przez użytkownika. Dzięki temu można będzie wysyłać MDN tylko dla wybranych "
+"wiadomości.</li><li><em>Odrzuć</em>: zawsze wysyłana będzie odpowiedź "
+"<em>Odrzucona</em>. Jest to tylko <em>nieco</em> lepsze od wysyłania zawsze "
+"odpowiedniego MDN. Autor będzie wiedział, że wiadomość została odebrana, nie "
+"będzie jedynie wiedział, co się z nią dalej stało.</li><li><em>Zawsze "
+"wysyłaj</em>: zawsze wysyłana będzie właściwa odpowiedź. Oznacza to, że "
+"autor będzie dokładnie wiedział, co stało się z jego wiadomością. Użycie "
 "tego trybu nie jest zalecane, ale ponieważ jest on przydatny w pewnych "
-"sytuacjach (takich jak system obsługi klientów), został on udostępniony</li>"
-"</ul></p></qt>"
+"sytuacjach (takich jak system obsługi klientów), został on udostępniony</"
+"li></ul></p></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2539,14 +2530,14 @@ msgstr "&Wczytuj zewnętrzne odnośniki do plików z Internetu"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>UWAGA:</b> Dopuszczenie formatu HTML w wiadomościach zwiększy możliwość "
-"zaatakowania systemu przed programy wykorzystujące luki w jego bezpieczeństwie. "
-"<a href=\"whatsthis:%1\">Więcej o wiadomościach HTML...</a> "
+"zaatakowania systemu przed programy wykorzystujące luki w jego "
+"bezpieczeństwie. <a href=\"whatsthis:%1\">Więcej o wiadomościach HTML...</a> "
 "<a href=\"whatsthis:%2\">Więcej o odnośnikach zewnętrznych...</a>"
 
 #: configuredialog.cpp:3824
@@ -2618,7 +2609,8 @@ msgid "Automatically import keys and certificates"
 msgstr "Automatycznie importuj klucze i certyfikaty"
 
 #: configuredialog.cpp:3963
-msgid "Changing the global HTML setting will override all folder specific values."
+msgid ""
+"Changing the global HTML setting will override all folder specific values."
 msgstr ""
 "Zmiana ogólnych ustawień dotyczących HTML zmieni także ustawienia dla "
 "poszczególnych folderów."
@@ -2627,8 +2619,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Ta opcja wymaga dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "brak pośrednika"
@@ -2657,8 +2648,8 @@ msgstr "&Nie usuwaj starych wiadomości oznaczonych jako ważne"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Wyszukiwanie nieprzeczytanych wiadomości:"
 
@@ -2682,8 +2673,8 @@ msgstr "zacznij od początku pierwszego folderu"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Po wejściu do folderu:"
 
@@ -2750,27 +2741,23 @@ msgstr "katalogi (format \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Tu możesz wybrać format skrzynki pocztowej do przechowywania lokalnych "
-"folderów</p>"
-"<p><b>mbox:</b> Foldery KMail są przechowywana w pojedynczych plikach. "
-"Oszczędza to miejsce, ale może być mniej efektywne, np. przy przenoszeniu "
-"wiadomości między folderami.</p> "
-"<p><b>maildir:</b> Foldery KMail są przechowywane jako prawdziwe katalogi na "
-"dysku, zaś poszczególne wiadomości odpowiadają pojedynczym plikom. Zajmuje to "
-"więcej miejsca na dysku, ale jest szybsze, np. przy przenoszeniu wiadomości "
-"między folderami.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Tu możesz wybrać format skrzynki pocztowej do przechowywania "
+"lokalnych folderów</p><p><b>mbox:</b> Foldery KMail są przechowywana w "
+"pojedynczych plikach. Oszczędza to miejsce, ale może być mniej efektywne, "
+"np. przy przenoszeniu wiadomości między folderami.</p> <p><b>maildir:</b> "
+"Foldery KMail są przechowywane jako prawdziwe katalogi na dysku, zaś "
+"poszczególne wiadomości odpowiadają pojedynczym plikom. Zajmuje to więcej "
+"miejsca na dysku, ale jest szybsze, np. przy przenoszeniu wiadomości między "
+"folderami.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2803,52 +2790,43 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Przy próbie przejścia do następnej nieprzeczytanej wiadomości, może się "
-"okazać, że nie ma już nieprzeczytanej wiadomości poniżej aktualnej.</p> "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Przy próbie przejścia do następnej nieprzeczytanej wiadomości, może "
+"się okazać, że nie ma już nieprzeczytanej wiadomości poniżej aktualnej.</p> "
 "<p><b>Nie zaczynaj od początku:</b> wyszukiwanie zostanie zakończone na "
-"ostatniej wiadomości aktualnego folderu.</p> "
-"<p><b>Zacznij od początku aktualnego folderu:</b> wyszukiwanie będzie "
-"kontynuowane od pierwszej wiadomości aktualnego folderu.</p> "
-"<p><b>Zacznij od początku pierwszego folderu:</b> wyszukiwanie będzie "
-"kontynuowane od pierwszej wiadomości pierwszego folderu.</p> "
-"<p>Analogicznie traktowane będzie wyszukiwanie poprzedniej nieprzeczytanej "
-"wiadomości.</p></qt>"
+"ostatniej wiadomości aktualnego folderu.</p> <p><b>Zacznij od początku "
+"aktualnego folderu:</b> wyszukiwanie będzie kontynuowane od pierwszej "
+"wiadomości aktualnego folderu.</p> <p><b>Zacznij od początku pierwszego "
+"folderu:</b> wyszukiwanie będzie kontynuowane od pierwszej wiadomości "
+"pierwszego folderu.</p> <p>Analogicznie traktowane będzie wyszukiwanie "
+"poprzedniej nieprzeczytanej wiadomości.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pełne indeksowanie tekstowe umożliwia szybkie wyszukiwanie w treści Twoich "
-"wiadomości. Jeśli ta opcja jest włączona, wyszukiwanie będzie bardzo szybkie, a "
-"pasek wyszukiwania będzie dotyczył także treści wiadomości.</p> "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Pełne indeksowanie tekstowe umożliwia szybkie wyszukiwanie w treści "
+"Twoich wiadomości. Jeśli ta opcja jest włączona, wyszukiwanie będzie bardzo "
+"szybkie, a pasek wyszukiwania będzie dotyczył także treści wiadomości.</p> "
 "<p>Indeks zajmuje sporą ilość miejsca (mniej więcej połowę tego, co same "
-"wiadomości).</p> "
-"<p>Po włączeniu tej opcji rozpocznie się tworzenie indeksu, ale podczas tej "
-"operacji możliwa będzie normalna praca z KMailem.</p></qt>"
+"wiadomości).</p> <p>Po włączeniu tej opcji rozpocznie się tworzenie indeksu, "
+"ale podczas tej operacji możliwa będzie normalna praca z KMailem.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2867,7 +2845,8 @@ msgid "&Format used for the groupware folders:"
 msgstr "&Format folderów grupowych:"
 
 #: configuredialog.cpp:4831
-msgid "Choose the format to use to store the contents of the groupware folders."
+msgid ""
+"Choose the format to use to store the contents of the groupware folders."
 msgstr "Wybierz format do przechowywania zawartości folderów grupowych."
 
 #: configuredialog.cpp:4840
@@ -2912,8 +2891,8 @@ msgstr "Ukryj fo&ldery grupowe"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Kiedy ta opcja jest włączona, foldery źródeł danych IMAP nie będą widoczne w "
 "drzewie folderów."
@@ -2924,8 +2903,8 @@ msgstr "Pokaż tylko foldery &grupowe dla tego konta"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Kiedy ta opcja jest włączona, zwykłe foldery poczty w drzewie folderów będą "
 "niewidoczne dla tego konta skonfigurowanego do pracy grupowej."
@@ -2939,8 +2918,8 @@ msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
-"Synchronizuj narzędzia pracy grupowej w folderach rozłączonego IMAP natychmiast "
-"po podłączeniu do sieci."
+"Synchronizuj narzędzia pracy grupowej w folderach rozłączonego IMAP "
+"natychmiast po podłączeniu do sieci."
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -2958,7 +2937,8 @@ msgstr "Przeformatuj nagłówki Od:/Do: w odpowiedzi na zaproszenia"
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
-msgstr "Włącz tę opcję, by Outlook(tm) mógł zrozumieć Twoje odpowiedzi na zaproszenia"
+msgstr ""
+"Włącz tę opcję, by Outlook(tm) mógł zrozumieć Twoje odpowiedzi na zaproszenia"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2968,7 +2948,8 @@ msgstr "Wyślij zaproszenia w treści wiadomości"
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
-msgstr "Włącz tę opcję, by Outlook(tm) mógł zrozumieć Twoje odpowiedzi na zaproszenia"
+msgstr ""
+"Włącz tę opcję, by Outlook(tm) mógł zrozumieć Twoje odpowiedzi na zaproszenia"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2982,22 +2963,23 @@ msgid ""
 "compatible way."
 msgstr ""
 "Microsoft Outlook używany w połączeniu z serwerem Microsoft Exchange, ma \n"
-"problem ze zrozumieniem zgodnych ze standardami wiadomości e-mail komunikacji \n"
-"grupowej. Włącz tę opcję, żeby wysyłać zaproszenia grupowe w sposób zrozumiały "
-"dla Microsoft Exchange."
+"problem ze zrozumieniem zgodnych ze standardami wiadomości e-mail "
+"komunikacji \n"
+"grupowej. Włącz tę opcję, żeby wysyłać zaproszenia grupowe w sposób "
+"zrozumiały dla Microsoft Exchange."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Odpowiedzi na zaproszenia zgodne z Outlookiem"
 
 #: configuredialog.cpp:4971
-msgid "Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+msgid ""
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr "Wysyłaj odpowiedzi na zaproszenia zgodne z Microsoft Outlook(tm)."
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatyczne wysyłanie zaproszeń"
@@ -3012,22 +2994,21 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Zaproszenia są zwykle wysyłane jako załączniki do wiadomości. Ta opcja "
 "spowoduje, że będą one wysłane w treści wiadomości - jest to niezbędne przy "
-"komunikacji z programem Microsoft Outlook. "
-"<br>Włączenie tej opcji oznacza jednak, że tekst zaproszenia nie będzie "
-"czytelny dla programów pocztowych nie obsługujących zaproszeń - w takich "
-"programach wiadomość będzie wyglądała dziwnie. "
-"<br>W programach obsługujących zaproszenia ta opcja nie spowoduje "
+"komunikacji z programem Microsoft Outlook. <br>Włączenie tej opcji oznacza "
+"jednak, że tekst zaproszenia nie będzie czytelny dla programów pocztowych "
+"nie obsługujących zaproszeń - w takich programach wiadomość będzie wyglądała "
+"dziwnie. <br>W programach obsługujących zaproszenia ta opcja nie spowoduje "
 "problemów.</qt>"
 
 #: configuredialog.cpp:5048
@@ -3132,29 +3113,27 @@ msgstr "Przekazanie"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu można dodawać, edytować i usuwać szablony użytkownika, używane do "
-"odpowiadania lub przekazywania wiadomości. Szablon można utworzyć, wybierając "
-"go z paska narzędzi lub z menu wywołanego prawym przyciskiem myszy. Można też "
-"przypisać skrót klawiszowy do szablonu.</p>"
-"<p>Szablony obsługują zastępowanie poleceń przez wpisanie ich lub wstawienie z "
-"menu <i>Wstaw polecenie</i>.</p>"
-"<p>Dostępne są cztery typy szablonów użytkownika: używane do <i>Odpowiedzi</i>"
-", <i>Odpowiedzi do wszystkich</i>, <i>Przekazania</i> i <i>Uniwersalne</i>"
-", używane w każdej sytuacji. Do <i>Uniwersalnego</i> "
-"szablonu nie można przypisać skrótu klawiszowego</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Tu można dodawać, edytować i usuwać szablony użytkownika, używane do "
+"odpowiadania lub przekazywania wiadomości. Szablon można utworzyć, "
+"wybierając go z paska narzędzi lub z menu wywołanego prawym przyciskiem "
+"myszy. Można też przypisać skrót klawiszowy do szablonu.</p><p>Szablony "
+"obsługują zastępowanie poleceń przez wpisanie ich lub wstawienie z menu "
+"<i>Wstaw polecenie</i>.</p><p>Dostępne są cztery typy szablonów użytkownika: "
+"używane do <i>Odpowiedzi</i>, <i>Odpowiedzi do wszystkich</i>, "
+"<i>Przekazania</i> i <i>Uniwersalne</i>, używane w każdej sytuacji. Do "
+"<i>Uniwersalnego</i> szablonu nie można przypisać skrótu klawiszowego</p></"
+"qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3170,17 +3149,17 @@ msgstr "Dodatkowi odbiorcy otrzymają kopię przekazywanej wiadomości"
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
-"Używanie tego szablonu przy przekazywaniu zdefiniuje domyślnych odbiorców jako "
-"podanych niżej. Lista oddzielana przecinkami."
+"Używanie tego szablonu przy przekazywaniu zdefiniuje domyślnych odbiorców "
+"jako podanych niżej. Lista oddzielana przecinkami."
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 "Przy użyciu tego szablonu odbiorcy podani tutaj otrzymają kopię "
 "przekazywanej wiadomości. Lista adresów e-mail oddzielana przecinkami."
@@ -3229,7 +3208,8 @@ msgstr "E-mail"
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
-msgstr "Na liście brak odbiorców. Proszę wybrać odbiorców i spróbować ponownie."
+msgstr ""
+"Na liście brak odbiorców. Proszę wybrać odbiorców i spróbować ponownie."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3253,8 +3233,8 @@ msgstr "Edytuj w:"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "KMail nie jest w stanie wykryć kiedy wybrany edytor został zamknięty. Aby "
 "uniknąć utraty danych edycja załącznika zostanie porzucona."
@@ -3395,7 +3375,8 @@ msgstr "Usuwanie starych wiadomości z folderu %1 nie powiodło się."
 
 #: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
-msgstr "Przenoszenie starych wiadomości z folderu %1 do folderu %2 nie powiodło się."
+msgstr ""
+"Przenoszenie starych wiadomości z folderu %1 do folderu %2 nie powiodło się."
 
 #: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
@@ -3403,7 +3384,8 @@ msgstr "Usuwanie starych wiadomości z folderu %1 zostało anulowane."
 
 #: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
-msgstr "Przenoszenie starych wiadomości z folderu %1 do folderu %2 zostało anulowane."
+msgstr ""
+"Przenoszenie starych wiadomości z folderu %1 do folderu %2 zostało anulowane."
 
 #: expirypropertiesdialog.cpp:31
 msgid "Mail Expiry Properties"
@@ -3434,8 +3416,10 @@ msgid "Delete permanently"
 msgstr "Usuń"
 
 #: expirypropertiesdialog.cpp:113
-msgid "Note: Expiry action will be applied immediately after confirming settings."
-msgstr "Uwaga: działanie zostanie wykonane bezpośrednio po potwierdzeniu ustawień."
+msgid ""
+"Note: Expiry action will be applied immediately after confirming settings."
+msgstr ""
+"Uwaga: działanie zostanie wykonane bezpośrednio po potwierdzeniu ustawień."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3508,6 +3492,11 @@ msgstr "Wybierz filtry"
 msgid "Filters"
 msgstr "Filtry"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Odznacz wszystko"
+
 #: filterimporterexporter.cpp:67
 msgid "Unselect All"
 msgstr "Odznacz wszystko"
@@ -3538,11 +3527,12 @@ msgstr "&Zapisuj działania filtrów do dziennika"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Można tu włączyć/wyłączyć zapisywania działań filtrów do dziennika. Oczywiście, "
-"dane są zbierane i wyświetlane tylko wtedy, gdy zapisywanie jest włączone. "
+"Można tu włączyć/wyłączyć zapisywania działań filtrów do dziennika. "
+"Oczywiście, dane są zbierane i wyświetlane tylko wtedy, gdy zapisywanie jest "
+"włączone. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3558,15 +3548,16 @@ msgstr "Zapisuj &wykonanie poszczególnych reguł"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Można tu określić poziom szczegółowości dziennika. Jeśli ta opcja jest "
-"włączona, zapisywane będą wyniki zastosowania poszczególnych reguł filtrowania. "
-"W przeciwnym razie zapisany będzie jedynie łączny wynik zastosowania wszystkich "
-"reguł danego filtra."
+"włączona, zapisywane będą wyniki zastosowania poszczególnych reguł "
+"filtrowania. W przeciwnym razie zapisany będzie jedynie łączny wynik "
+"zastosowania wszystkich reguł danego filtra."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3586,14 +3577,15 @@ msgstr "bez ograniczeń"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Zbieranie danych do dziennika zajmuje pamięć niezbędną do ich przechowywania. "
-"Tu można określić maksymalną wielkość używanej pamięci. Jeśli rozmiar dziennika "
-"przekroczy tę wielkość, najstarsze dane zostaną usunięte. "
+"Zbieranie danych do dziennika zajmuje pamięć niezbędną do ich "
+"przechowywania. Tu można określić maksymalną wielkość używanej pamięci. "
+"Jeśli rozmiar dziennika przekroczy tę wielkość, najstarsze dane zostaną "
+"usunięte. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3603,7 +3595,7 @@ msgstr ""
 "Nie można zapisać pliku %1:\n"
 "Błąd: \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Błąd KMaila"
@@ -3644,13 +3636,13 @@ msgstr "&Identyfikator użytkownika:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Identyfikator użytkownika na serwerze IMAP. Może to być nazwa użytkownika lub "
-"albo jego adres e-mail - nazwa podawana przy logowaniu na serwerze pozwoli to "
-"sprawdzić."
+"Identyfikator użytkownika na serwerze IMAP. Może to być nazwa użytkownika "
+"lub albo jego adres e-mail - nazwa podawana przy logowaniu na serwerze "
+"pozwoli to sprawdzić."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3662,7 +3654,8 @@ msgstr "Prawa dostępu"
 
 #: folderdiaacltab.cpp:118
 msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
-msgstr "<b>Uwaga: </b>Zmiana nazwy wymaga uprawnień do zapisu folderu nadrzędnego."
+msgstr ""
+"<b>Uwaga: </b>Zmiana nazwy wymaga uprawnień do zapisu folderu nadrzędnego."
 
 #: folderdiaacltab.cpp:245
 msgid "Custom Permissions"
@@ -3693,13 +3686,14 @@ msgid "Error retrieving user permissions."
 msgstr "Błąd podczas pobierania praw dostępu użytkownika."
 
 #: folderdiaacltab.cpp:430
-msgid "You might not have enough permissions to see the permissions of this folder."
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
 msgstr "Brak uprawnień do sprawdzenia uprawnień tego folderu."
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Nie pobrano jeszcze informacji z serwera, proszę użyć \"Sprawdź pocztę\". "
 "Niezbędne są uprawnienie administracyjne."
@@ -3712,8 +3706,7 @@ msgstr "Błąd: dla tego folderu nie zdefiniowano konta IMAP"
 msgid "Connecting to server %1, please wait..."
 msgstr "Łączenie z serwerem %1, proszę czekać..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Błąd podczas łączenia z serwerem %1"
@@ -3741,11 +3734,11 @@ msgstr "Dodaj prawa dostępu"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Na pewno usunąć Twoje własne prawa dostępu do tego folderu? Jeśli to zrobisz, "
-"nie będziesz mógł z niego skorzystać."
+"Na pewno usunąć Twoje własne prawa dostępu do tego folderu? Jeśli to "
+"zrobisz, nie będziesz mógł z niego skorzystać."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3776,7 +3769,7 @@ msgstr "Użycie:"
 msgid "Select Folder"
 msgstr "Wybierz folder"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokalne foldery"
@@ -3800,13 +3793,13 @@ msgstr "Wybierz skrót do folderu"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Aby wybrać klawisz lub kombinację klawiszy, które wybierają aktualny "
-"folder, kliknij przycisk poniżej i wciśnij odpowiedni klawisz lub "
-"kombinację.</qt>"
+"folder, kliknij przycisk poniżej i wciśnij odpowiedni klawisz lub kombinację."
+"</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3826,13 +3819,22 @@ msgstr "&Anuluj"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 "<qt>Usunięty folder był związany z kontem <b>%1</b> - poczta przychodząca z "
-"tego konta była dostarczana do tego foldera. W tej chwili poczta z tego konta "
-"będzie umieszczane w głównym folderze \"otrzymane\".</qt>"
+"tego konta była dostarczana do tego foldera. W tej chwili poczta z tego "
+"konta będzie umieszczane w głównym folderze \"otrzymane\".</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Wszystkie: %2<br>Nieprzeczytane: %3<br>Wielkość: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Limit: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3953,74 +3955,18 @@ msgstr "Stan spamu:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>W"
-"<br>i"
-"<br>a"
-"<br>d"
-"<br>o"
-"<br>m"
-"<br>o"
-"<br>ś"
-"<br>ć"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>W<br>i<br>a<br>d<br>o<br>m<br>o<br>ś<br>ć<br> "
+"<br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt><b>"
-"<br>W"
-"<br>i"
-"<br>a"
-"<br>d"
-"<br>o"
-"<br>m"
-"<br>o"
-"<br>ś"
-"<br>ć"
-"<br> "
-"<br>b"
-"<br>e"
-"<br>z"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><b><br>W<br>i<br>a<br>d<br>o<br>m<br>o<br>ś<br>ć<br> <br>b<br>e<br>z<br> "
+"<br>H<br>T<br>M<br>L</b></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4032,19 +3978,14 @@ msgstr "&Twoje imię:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Imię i nazwisko</h3>"
-"<p>To pole powinno zawierać Twoje imię i nazwisko, tak jak mają się one "
-"pojawiać w nagłówku wysyłanych przez Ciebie wiadomości.</p>"
-"<p>Jeśli to pole jest puste, w nagłówkach Twoich wiadomości pojawi się jedynie "
-"Twój adres e-mail.</p></qt>"
+"<qt><h3>Imię i nazwisko</h3><p>To pole powinno zawierać Twoje imię i "
+"nazwisko, tak jak mają się one pojawiać w nagłówku wysyłanych przez Ciebie "
+"wiadomości.</p><p>Jeśli to pole jest puste, w nagłówkach Twoich wiadomości "
+"pojawi się jedynie Twój adres e-mail.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4052,17 +3993,13 @@ msgstr "&Organizacja:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizacja</h3>"
-"<p>To pole może zawierać nazwę Twojej organizacji, wyświetlaną w nagłówku "
-"wysyłanych przez Ciebie wiadomości.</p>"
-"<p>Można spokojnie pozostawić to pole puste.</p></qt>"
+"<qt><h3>Organizacja</h3><p>To pole może zawierać nazwę Twojej organizacji, "
+"wyświetlaną w nagłówku wysyłanych przez Ciebie wiadomości.</p><p>Można "
+"spokojnie pozostawić to pole puste.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4070,22 +4007,16 @@ msgstr "Adres &e-mail:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adres e-mail</h3>"
-"<p>To pole powinno zawierać Twój pełny adres e-mail.</p>"
-"<p>Jeżeli posiadasz więcej niż jeden adres e-mail, dodaj odpowiedni alias lub "
-"utwórz nową tożsamość.</p> "
-"<p>Jeśli to pole jest puste, będzie trudno odpowiadać na wysyłane przez Ciebie "
-"wiadomości.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
+msgstr ""
+"<qt><h3>Adres e-mail</h3><p>To pole powinno zawierać Twój pełny adres e-mail."
+"</p><p>Jeżeli posiadasz więcej niż jeden adres e-mail, dodaj odpowiedni "
+"alias lub utwórz nową tożsamość.</p> <p>Jeśli to pole jest puste, będzie "
+"trudno odpowiadać na wysyłane przez Ciebie wiadomości.</p></qt>"
 
 #: identitydialog.cpp:165
 msgid "Email a&liases:"
@@ -4093,36 +4024,18 @@ msgstr "Aliasy &e-mail:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Aliasy e-mail</h3>"
-"<p>To pole zawiera aliasy adresu e-mail, traktowane tak samo jak adres"
-"należący do tej tożsamości.</p>"
-"<p>Przykład:</p>"
-"<table>"
-"<tr>"
-"<th>Podstawowy adres:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliasy:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Wpisz jeden adres w linii.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
+msgstr ""
+"<qt><h3>Aliasy e-mail</h3><p>To pole zawiera aliasy adresu e-mail, "
+"traktowane tak samo jak adresnależący do tej tożsamości.</p><p>Przykład:</"
+"p><table><tr><th>Podstawowy adres:</th><td>first.last@example.org</td></"
+"tr><tr><th>Aliasy:</th><td>first@example.org<br>last@example.org</td></tr></"
+"table><p>Wpisz jeden adres w linii.</p></qt>"
 
 #: identitydialog.cpp:185
 msgid "Cryptograph&y"
@@ -4138,25 +4051,23 @@ msgid "Your OpenPGP Signature Key"
 msgstr "Twój klucz podpisu OpenPGP"
 
 #: identitydialog.cpp:194
-msgid "Select the OpenPGP key which should be used to digitally sign your messages."
+msgid ""
+"Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr "Wybierz klucz OpenPGP do podpisywania Twoich wiadomości."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p> Wybrany klucz OpenPGP będzie używany do podpisywania wiadomości. Można "
-"także używać kluczy GnuPG.</p> "
-"<p>Jeśli to pole pozostanie puste, KMail nie będzie mógł podpisywać wiadomości "
-"za pomocą OpenPGP. Zwykłe funkcje pocztowe będą działały bez zmian.</p> "
-"<p>Więcej informacji o kluczach można znaleźć pod adresem <a>"
-"http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p> Wybrany klucz OpenPGP będzie używany do podpisywania wiadomości. "
+"Można także używać kluczy GnuPG.</p> <p>Jeśli to pole pozostanie puste, "
+"KMail nie będzie mógł podpisywać wiadomości za pomocą OpenPGP. Zwykłe "
+"funkcje pocztowe będą działały bez zmian.</p> <p>Więcej informacji o "
+"kluczach można znaleźć pod adresem <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4168,32 +4079,27 @@ msgstr "Twój klucz szyfrowania OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Wybierz klucz OpenPGP do szyfrowania wiadomości do siebie i do polecenia "
 "\"Dołącz mój klucz publiczny\" w edytorze."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p> Wybrany klucz OpenPGP będzie używany do szyfrowania wiadomości do siebie i "
-"do polecenia \"Dołącz mój klucz publiczny\" w edytorze. Można także używać "
-"kluczy GnuPG.</p> "
-"<p>Jeśli to pole pozostanie puste, KMail nie będzie mógł szyfrować kopii "
-"wiadomości dla Ciebie za pomocą OpenPGP. Zwykłe funkcje pocztowe będą działały "
-"bez zmian.</p> "
-"<p>Więcej informacji o kluczach można znaleźć pod adresem <a>"
-"http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p> Wybrany klucz OpenPGP będzie używany do szyfrowania wiadomości do "
+"siebie i do polecenia \"Dołącz mój klucz publiczny\" w edytorze. Można także "
+"używać kluczy GnuPG.</p> <p>Jeśli to pole pozostanie puste, KMail nie będzie "
+"mógł szyfrować kopii wiadomości dla Ciebie za pomocą OpenPGP. Zwykłe funkcje "
+"pocztowe będą działały bez zmian.</p> <p>Więcej informacji o kluczach można "
+"znaleźć pod adresem <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4211,16 +4117,15 @@ msgstr "Wybierz certyfikat S/MIME do podpisywania Twoich wiadomości."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> Wybrany certyfikat S/MIME będzie używany do podpisywania wiadomości.</p> "
-"<p>Jeśli to pole pozostanie puste, KMail nie będzie mógł podpisywać wiadomości "
-"za pomocą S/MIME. Zwykłe funkcje pocztowe będą działały bez zmian.</p></qt>"
+"<qt><p> Wybrany certyfikat S/MIME będzie używany do podpisywania wiadomości."
+"</p> <p>Jeśli to pole pozostanie puste, KMail nie będzie mógł podpisywać "
+"wiadomości za pomocą S/MIME. Zwykłe funkcje pocztowe będą działały bez zmian."
+"</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4232,27 +4137,25 @@ msgstr "Twój certyfikat szyfrowania S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Wybierz certyfikat S/MIME do szyfrowania Twoich wiadomości wysyłanych do siebie "
-"oraz do polecenia \"Dołącz mój certyfikat\" w edytorze."
+"Wybierz certyfikat S/MIME do szyfrowania Twoich wiadomości wysyłanych do "
+"siebie oraz do polecenia \"Dołącz mój certyfikat\" w edytorze."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> Wybrany certyfikat S/MIME będzie używany do szyfrowania wiadomości dla "
-"Ciebie oraz do polecenia \"Dołącz mój certyfikat\" w edytorze.</p> "
+"<qt><p> Wybrany certyfikat S/MIME będzie używany do szyfrowania wiadomości "
+"dla Ciebie oraz do polecenia \"Dołącz mój certyfikat\" w edytorze.</p> "
 "<p>Jeśli to pole pozostanie puste, KMail nie będzie mógł szyfrować kopii "
-"wiadomości dla Ciebie za pomocą S/MIME. Zwykłe funkcje pocztowe będą działały "
-"bez zmian.</p></qt>"
+"wiadomości dla Ciebie za pomocą S/MIME. Zwykłe funkcje pocztowe będą "
+"działały bez zmian.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4272,24 +4175,19 @@ msgstr "Adres &zwrotny:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adres zwrotny</h3> "
-"<p>Adres wpisany tutaj znajdzie się w nagłówku <tt>Reply-to:</tt>"
-". Spowoduje to, że odpowiedzi będą wysyłane na inny adres niż ten z nagłówka "
-"<tt>From:</tt> (Od:)</p> "
-"<p>Jest to użyteczne, jeśli grupa ludzi pełni podobne funkcje. Wówczas pole <tt>"
-"From:</tt> może zawierać Twój adres, ale odpowiedzi powinny być kierowane na "
-"adres grupy.</p> "
-"<p>W razie wątpliwości zostaw to pole puste.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adres zwrotny</h3> <p>Adres wpisany tutaj znajdzie się w nagłówku "
+"<tt>Reply-to:</tt>. Spowoduje to, że odpowiedzi będą wysyłane na inny adres "
+"niż ten z nagłówka <tt>From:</tt> (Od:)</p> <p>Jest to użyteczne, jeśli "
+"grupa ludzi pełni podobne funkcje. Wówczas pole <tt>From:</tt> może zawierać "
+"Twój adres, ale odpowiedzi powinny być kierowane na adres grupy.</p> <p>W "
+"razie wątpliwości zostaw to pole puste.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4297,23 +4195,19 @@ msgstr "Adresy &ukrytych kopii:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>UDW - ukryte \"do wiadomości\"</h3> "
-"<p>Na adresy, które zostaną tu wprowadzone, będą wysłane kopie listów dla tej "
-"tożsamości. Nie będą one widoczne dla adresatów wiadomości.</p> "
-"<p>Możesz użyć tego pola do przesyłania kopii na inne swoje konto pocztowe.</p> "
-"<p>Jeśli podajesz więcej niż jeden adres, rozdziel je przecinkami</p>"
-"<p>Jeżeli nie przesyłasz kopii, zostaw to pole puste.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>UDW - ukryte \"do wiadomości\"</h3> <p>Na adresy, które zostaną tu "
+"wprowadzone, będą wysłane kopie listów dla tej tożsamości. Nie będą one "
+"widoczne dla adresatów wiadomości.</p> <p>Możesz użyć tego pola do "
+"przesyłania kopii na inne swoje konto pocztowe.</p> <p>Jeśli podajesz więcej "
+"niż jeden adres, rozdziel je przecinkami</p><p>Jeżeli nie przesyłasz kopii, "
+"zostaw to pole puste.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4351,7 +4245,7 @@ msgstr "&Podpis"
 msgid "&Picture"
 msgstr "&Obrazek"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Nieprawidłowy adres e-mail"
 
@@ -4366,15 +4260,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Jeden z kluczy podpisu OpenPGP nie zawiera identyfikatora użytkownika z adresem "
-"e-mail dla tej tożsamości (%1). Może to spowodować wyświetlenie ostrzeżenia u "
-"adresata wiadomości, kiedy będzie on próbował sprawdzić podpis wykonany przy "
-"tej konfiguracji."
+"Jeden z kluczy podpisu OpenPGP nie zawiera identyfikatora użytkownika z "
+"adresem e-mail dla tej tożsamości (%1). Może to spowodować wyświetlenie "
+"ostrzeżenia u adresata wiadomości, kiedy będzie on próbował sprawdzić podpis "
+"wykonany przy tej konfiguracji."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Jeden z kluczy szyfrujących OpenPGP nie zawiera identyfikatora użytkownika z "
 "adresem e-mail dla tej tożsamości (%1)."
@@ -4388,8 +4282,8 @@ msgid ""
 msgstr ""
 "Jeden z certyfikatów podpisu S/MIME nie zawiera adresu e-mail dla tej "
 "tożsamości (%1).\n"
-"Może to spowodować wyświetlenie ostrzeżenia u adresata wiadomości, kiedy będzie "
-"on próbował sprawdzić podpis wykonany przy tej konfiguracji."
+"Może to spowodować wyświetlenie ostrzeżenia u adresata wiadomości, kiedy "
+"będzie on próbował sprawdzić podpis wykonany przy tej konfiguracji."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4437,8 +4331,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (domyślna)"
 
@@ -4452,7 +4346,8 @@ msgstr "Adres e-mail"
 
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
-msgstr "Dostęp do tej skrzynki pocztowej wymaga podania nazwy użytkownika i hasła."
+msgstr ""
+"Dostęp do tej skrzynki pocztowej wymaga podania nazwy użytkownika i hasła."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4480,21 +4375,21 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail wykrył wpis z prefiksem w konfiguracji konta \"%1\". Ten wpis jest zbędny "
-"dla obsługi przestrzeni nazw IMAP."
+"KMail wykrył wpis z prefiksem w konfiguracji konta \"%1\". Ten wpis jest "
+"zbędny dla obsługi przestrzeni nazw IMAP."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Konfiguracja została automatycznie uaktualniona, ale powinieneś sprawdzić "
 "konfigurację konta."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Automatyczne uaktualnianie konfiguracji nie powiodło się. Proszę sprawdzić "
 "konfigurację konta."
@@ -4512,8 +4407,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Nie można wysłać na serwer wiadomości datowanej na %1 od <i>%2</i> o temacie <i>"
-"%3</i>."
+"Nie można wysłać na serwer wiadomości datowanej na %1 od <i>%2</i> o temacie "
+"<i>%3</i>."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4534,17 +4429,22 @@ msgstr "Folder jest blisko limitu wielkości. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Ponieważ nie masz prawa zapisu do tego foldera, poproś właściciela o zwolnienie "
-"w nim odrobiny miejsca."
+"Ponieważ nie masz prawa zapisu do tego foldera, poproś właściciela o "
+"zwolnienie w nim odrobiny miejsca."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Błąd: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Połączenie z serwerem %1 zostało nieoczekiwanie przerwane lub upłynął "
 "maksymalny czas oczekiwania. Jeśli to możliwe, połączenie zostanie "
@@ -4687,19 +4587,19 @@ msgstr "Importowanie archiwum"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Jeden lub więcej z twoich kluczy szyfrujących  OpenPGP lub certyfikatów S/MIME "
-"nie są w pełni wiarygodne do szyfrowania."
+"Jeden lub więcej z twoich kluczy szyfrujących  OpenPGP lub certyfikatów S/"
+"MIME nie są w pełni wiarygodne do szyfrowania."
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Jeden lub więcej z twoich kluczy szyfrujących  OpenPGP lub certyfikatów S/MIME "
-"dla odbiorcy \"%1\" nie są w pełni wiarygodne do szyfrowania."
+"Jeden lub więcej z twoich kluczy szyfrujących  OpenPGP lub certyfikatów S/"
+"MIME dla odbiorcy \"%1\" nie są w pełni wiarygodne do szyfrowania."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4731,252 +4631,201 @@ msgstr "Nie w pełnie wiarygodne klucze szyfrujące"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+" <p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utracił ważność %n dzień temu.</p>\n"
-"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+" <p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utracił ważność %n dzień temu.</p>\n"
+"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utracił ważność %n dni temu.</p>\n"
+"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utracił ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-" "
-"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utracił ważność mniej niż dzień temu.</p>\n"
-"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+" <p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utracił ważność mniej niż dzień temu.</p>\n"
+"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p><p>utracił "
+"ważność %n dni temu.</p>\n"
+"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p><p>utracił "
+"ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność mniej niż dzień temu.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność mniej niż dzień temu.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utracił "
+"ważność %n dni temu.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utracił "
+"ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność mniej niż dzień temu.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utracił ważność mniej niż dzień temu.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność mniej niż dzień temu.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+" <p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność mniej niż dzień temu.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utracił ważność "
+"%n dni temu.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utracił ważność "
+"%n dni temu.</p>"
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność mniej niż dzień temu.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność mniej niż dzień temu.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p>"
-"<p>dla Twojego certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>stracił ważność mniej niż dzień temu.</p>\n"
-"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p>"
-"<p>dla Twojego certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>stracił ważność mniej niż %n dni temu.</p>\n"
-"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p>"
-"<p>dla Twojego certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>stracił ważność mniej niż %n dni temu.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p><p>dla Twojego "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>stracił ważność mniej niż dzień temu.</p>\n"
+"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p><p>dla Twojego "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>stracił ważność mniej niż %n dni temu.</p>\n"
+"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p><p>dla Twojego "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>stracił ważność mniej niż %n dni temu.</p>"
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność mniej niż dzień temu.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność mniej niż dzień temu.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność mniej niż dzień temu.</p>\n"
-"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utracił ważność mniej niż dzień temu.</p>\n"
+"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utracił ważność %n dni temu.</p>\n"
+"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utracił ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność mniej niż dzień temu.</p>\n"
-"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> (numer "
+"seryjny %2)</p><p>utracił ważność mniej niż dzień temu.</p>\n"
+"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utracił ważność %n dni temu.</p>\n"
+"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utracił ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-" "
-"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność mniej niż dzień temu.</p>\n"
-"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>\n"
-"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utracił ważność %n dni temu.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+" <p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność mniej niż dzień temu.</p>\n"
+"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>\n"
+"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utracił ważność %n dni temu.</p>"
 
 #: keyresolver.cpp:724
 msgid "OpenPGP Key Expired"
@@ -4988,252 +4837,201 @@ msgstr "Certyfikat S/MIME utracił ważność"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-" "
-"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+" <p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Klucz podpisu OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-" "
-"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+" <p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Klucz szyfrujący OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-" "
-"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+" <p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p><p>utraci "
+"ważność w ciągu %n dnia.</p>\n"
+"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p><p>utraci "
+"ważność w ciągu %n dni.</p>\n"
+"<p>Klucz OpenPGP dla</p><p align=center><b>%1</b> (KeyId ox%2)</p><p>utraci "
+"ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utraci "
+"ważność w ciągu %n dni.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utraci "
+"ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+" <p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utraci ważność "
+"w ciągu %n dni.</p>\n"
+"<p>Certyfikat podstawowy</p><p align=center><b>%3</b></p> <p>dla certyfikatu "
+"S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p><p>utraci ważność "
+"w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p>"
-"<p>dla Twojego certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>straci ważność w ciągu mniej niż %n dnia.</p>\n"
-"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p>"
-"<p>dla Twojego certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>straci ważność w ciągu mniej niż %n dni.</p>\n"
-"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p>"
-"<p>dla Twojego certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>straci ważność w ciągu mniej niż %n dni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p><p>dla Twojego "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>straci ważność w ciągu mniej niż %n dnia.</p>\n"
+"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p><p>dla Twojego "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>straci ważność w ciągu mniej niż %n dni.</p>\n"
+"<p>Certyfikat pośredni CA</p><p align=center><b>%3</b></p><p>dla Twojego "
+"certyfikatu szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>straci ważność w ciągu mniej niż %n dni.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> "
-"<p>dla certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Pośredni certyfikat CA</p><p align=center><b>%3</b></p> <p>dla "
+"certyfikatu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Certyfikat podpisu S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> "
-"(numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> (numer "
+"seryjny %2)</p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Certyfikat szyfrowania S/MIME</p><p align=center><b>%1</b> (numer seryjny "
+"%2)</p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-" "
-"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dnia.</p>\n"
-"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>\n"
-"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</p>"
-"<p>utraci ważność w ciągu %n dni.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+" <p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dnia.</p>\n"
+"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>\n"
+"<p>Certyfikat S/MIME dla</p><p align=center><b>%1</b> (numer seryjny %2)</"
+"p><p>utraci ważność w ciągu %n dni.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5245,9 +5043,10 @@ msgstr "Certyfikat S/MIME niedługo utraci ważność"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5285,10 +5084,10 @@ msgstr "Bezużyteczne klucze podpisu"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Zgodnie z ustawieniami szyfrowania dla adresata, wiadomość powinna zostać "
 "zaszyfrowana przy pomocy OpenPGP, jednak nie skonfigurowano poprawnego "
@@ -5300,10 +5099,10 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Zgodnie z ustawieniami szyfrowania dla adresata, wiadomość powinna zostać "
 "zaszyfrowana przy pomocy S/MIME, jednak nie skonfigurowano poprawnego "
@@ -5313,14 +5112,14 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Zgodnie z ustawieniami podpisu dla adresata, wiadomość powinna zostać podpisana "
-"przy pomocy OpenPGP, jednak nie skonfigurowano poprawnego klucza podpisu dla "
-"tej tożsamości."
+"Zgodnie z ustawieniami podpisu dla adresata, wiadomość powinna zostać "
+"podpisana przy pomocy OpenPGP, jednak nie skonfigurowano poprawnego klucza "
+"podpisu dla tej tożsamości."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5328,14 +5127,14 @@ msgstr "Nie podpisuj OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Zgodnie z ustawieniami podpisu dla adresata, wiadomość powinna zostać podpisana "
-"przy pomocy S/MIME, jednak nie skonfigurowano poprawnego certyfikatu podpisu "
-"S/MIME dla tej tożsamości."
+"Zgodnie z ustawieniami podpisu dla adresata, wiadomość powinna zostać "
+"podpisana przy pomocy S/MIME, jednak nie skonfigurowano poprawnego "
+"certyfikatu podpisu S/MIME dla tej tożsamości."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5357,8 +5156,8 @@ msgstr "Podpisywanie niemożliwe"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Nie wybrałeś klucza do szyfrowania do siebie. Nie będziesz mógł odczytać "
 "własnych wiadomości, jeśli je zaszyfrujesz."
@@ -5377,13 +5176,13 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Nie wybrałeś kluczy szyfrujących dla adresata tej wiadomości. W związku z tym "
-"wiadomość nie będzie szyfrowana."
+"Nie wybrałeś kluczy szyfrujących dla adresata tej wiadomości. W związku z "
+"tym wiadomość nie będzie szyfrowana."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Nie wybrałeś kluczy szyfrujących dla żadnego z adresatów. W związku z tym "
 "wiadomość nie będzie szyfrowana."
@@ -5428,11 +5227,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Brak poprawnych zaufanych kluczy szyfrujących dla \"%1\".\n"
 "\n"
@@ -5573,6 +5372,51 @@ msgstr "&Rozłączony IMAP"
 msgid "&Maildir mailbox"
 msgstr "Skrzynka &maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Ustaw temat wiadomości"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Wyślij kopię na \"adres\""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Wyślij ukrytą kopię na \"adres\""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Dodaj \"nagłówek\" do wiadomości"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Pobierz treść wiadomości z \"pliku\""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Ustaw treść wiadomości"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Dodaj załącznik do wiadomości. Operację tę można powtarzać"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Sprawdź wyłącznie nowa pocztę"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Otwórz tylko okno edytora"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Pokaż podaną wiadomość"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Wyślij wiadomość na \"adres\" lub załącz plik, do którego prowadzi \"URL\""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Poczta"
@@ -5624,17 +5468,18 @@ msgstr "%1: nie znaleziono foldera. Zostanie on utworzony."
 
 #: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
-msgstr "%1: znaleziono folder %2. Zostanie on wybrany jako główny folder grupowy."
+msgstr ""
+"%1: znaleziono folder %2. Zostanie on wybrany jako główny folder grupowy."
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail znalazł następujące foldery grupowe w %1 i musi wykonać następujące "
-"operacje: %2</br>Jeśli nie chcesz tego, anuluj operację, a źródło danych IMAP "
-"zostanie wyłączone"
+"<qt>KMail znalazł następujące foldery grupowe w %1 i musi wykonać "
+"następujące operacje: %2</br>Jeśli nie chcesz tego, anuluj operację, a "
+"źródło danych IMAP zostanie wyłączone"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5682,11 +5527,11 @@ msgstr "URL skopiowano do schowka."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Plik <b>%1</b> istnieje.<br>Zastąpić go ?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Zapisz do pliku"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Zastąp"
 
@@ -5704,9 +5549,10 @@ msgstr ""
 
 #: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
-msgstr "Ta wiadomość została usunięta podczas jej zapisywania i nie została zapisana."
+msgstr ""
+"Ta wiadomość została usunięta podczas jej zapisywania i nie została zapisana."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5726,11 +5572,11 @@ msgstr "Ten plik nie zawiera wiadomości."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Plik zawiera wiele wiadomości. Wyświetlono tylko pierwszą."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5740,111 +5586,113 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrowanie wiadomości"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrowanie wiadomości %1 z %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Brak miejsca na dysku?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Przenieś do tego folderu"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiuj do tego folderu"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
-msgstr "Wykryto uszkodzony bufor IMAP w folderze %1. Przerwano kopiowanie wiadomości."
+msgstr ""
+"Wykryto uszkodzony bufor IMAP w folderze %1. Przerwano kopiowanie wiadomości."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Przenoszenie wiadomości"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Usuwanie wiadomości"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Otwieranie URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Na pewno uruchomić <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Brak załączników do zapisania."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Zapisz załącznik do"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "załącznik.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "załącznik.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Plik o nazwie %1 już istnieje. Zastąpić go?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Plik już istnieje"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Zastąp"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
-msgstr "Część %1 wiadomości jest zaszyfrowana. Zachować szyfrowanie przy zapisie?"
+msgstr ""
+"Część %1 wiadomości jest zaszyfrowana. Zachować szyfrowanie przy zapisie?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Pytanie programu KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Zachowaj szyfrowanie"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Nie zachowuj"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "Część %1 wiadomości jest podpisana. Zachować podpis przy zapisie?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Zachowaj podpis"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5853,76 +5701,77 @@ msgstr ""
 "Nie można zapisać pliku %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Nie można zapisać pliku %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Dla tego adresu e-mail brak pozycji w książce adresowej. Dodaj go do książki "
 "adresowej, a następnie dodaj adresy komunikatorów, używając swojego "
 "komunikatora."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Znaleziono więcej niż jedną pozycję w książce adresowej z tym adresem e-mail:\n"
+"Znaleziono więcej niż jedną pozycję w książce adresowej z tym adresem e-"
+"mail:\n"
 " %1\n"
 " Nie można określić z kim zacząć rozmowę."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Rozszerzenie Chiasmus nie obsługuje funkcji \"x-obtain-keys\". Proszę zgłosić "
-"ten błąd."
+"Rozszerzenie Chiasmus nie obsługuje funkcji \"x-obtain-keys\". Proszę "
+"zgłosić ten błąd."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Błąd rozszerzenia Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Niespodziewana wartość zwrócona przez rozszerzenie Chiasmus. Funkcja "
-"\"x-obtain-keys\" nie zwróciła listy napisów. Proszę zgłosić ten błąd."
+"Niespodziewana wartość zwrócona przez rozszerzenie Chiasmus. Funkcja \"x-"
+"obtain-keys\" nie zwróciła listy napisów. Proszę zgłosić ten błąd."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Nie znaleziono kluczy. Proszę sprawdzić, czy ścieżka kluczy w konfiguracji "
 "rozszerzenia Chiasmus jest poprawna."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Wybór klucza deszyfrującego Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Rozszerzenie Chiasmus nie obsługuje funkcji \"x-decrypt\". Proszę zgłosić ten "
-"błąd."
+"Rozszerzenie Chiasmus nie obsługuje funkcji \"x-decrypt\". Proszę zgłosić "
+"ten błąd."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5930,19 +5779,19 @@ msgstr ""
 "Funkcja \"x-decrypt\" nie przyjmuje spodziewanych parametrów. Proszę zgłosić "
 "ten błąd."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Błąd deszyfrowania Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Niespodziewana wartość zwrócona przez rozszerzenie Chiasmus. Funkcja "
-"\"x-decrypt\" nie zwróciła tablicy bajtów. Proszę zgłosić ten błąd."
+"Niespodziewana wartość zwrócona przez rozszerzenie Chiasmus. Funkcja \"x-"
+"decrypt\" nie zwróciła tablicy bajtów. Proszę zgłosić ten błąd."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5952,7 +5801,7 @@ msgstr ""
 "Do: %2\n"
 "Temat: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "E-mail: %1"
@@ -6049,7 +5898,7 @@ msgstr "Rozmiar"
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Spakuj"
 
@@ -6061,7 +5910,7 @@ msgstr "Zaszyfruj"
 msgid "Sign"
 msgstr "Podpis"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nazwa załącznika:"
 
@@ -6082,10 +5931,12 @@ msgid "Primary Recipients"
 msgstr "Główni adresaci"
 
 #: kmcomposewin.cpp:1043
-msgid "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+msgid ""
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Na adresy, które zostaną tu umieszczona, wysłana będzie kopia "
-"wiadomości.</qt>"
+"<qt>Na adresy, które zostaną tu umieszczona, wysłana będzie kopia wiadomości."
+"</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6094,14 +5945,14 @@ msgstr "Dodatkowi adresaci"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Tu należy wpisać adresy adresatów kopii wiadomości. Technicznie jest to "
-"równoważne umieszczeniu tych adresów w polu <b>Do:</b> "
-", różnica polega na tym, że wysłanie kopii zwykle oznacza, że jej adresat jest "
-"słuchaczem, nie głównym adresatem wiadomości.</qt>"
+"równoważne umieszczeniu tych adresów w polu <b>Do:</b> , różnica polega na "
+"tym, że wysłanie kopii zwykle oznacza, że jej adresat jest słuchaczem, nie "
+"głównym adresatem wiadomości.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6109,9 +5960,8 @@ msgstr "Ukryci adresaci"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>To samo, co pole <b>Do wiadomości:</b>, ale inni adresaci nie będą "
 "widzieli, kto otrzymał ukrytą kopię.</qt>"
@@ -6124,7 +5974,7 @@ msgstr "&Wyślij pocztę"
 msgid "&Send Mail Via"
 msgstr "&Wyślij pocztę przez"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Wyślij &później"
@@ -6189,8 +6039,7 @@ msgstr "&Usuń znaki cytowania"
 msgid "Cl&ean Spaces"
 msgstr "Usuń sp&acje"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Czcionka &stałej szerokości"
@@ -6331,31 +6180,31 @@ msgstr "Format zaszy&frowanej wiadomości"
 msgid "Select a cryptographic format for this message"
 msgstr "Wybierz format szyfrowania dla tej wiadomości"
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Domyślny"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Wypunktowanie (kropki)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Wypunktowanie (kółka)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Wypunktowanie (kwadraty)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Lista uporządkowana (liczby arabskie)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Lista uporządkowana (małe litery)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Lista uporządkowana (wielkie litery)"
 
@@ -6435,7 +6284,8 @@ msgstr "Zapisz jako &roboczą"
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
-msgstr "Zapisz tę wiadomość w folderze Szablony. Można ją będzie później zmienić."
+msgstr ""
+"Zapisz tę wiadomość w folderze Szablony. Można ją będzie później zmienić."
 
 #: kmcomposewin.cpp:2257
 msgid ""
@@ -6455,63 +6305,63 @@ msgstr "Zamknij edytor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Utworzona wiadomość zawiera odniesienie do załączonego pliku, ale brak w niej "
-"załączników.\n"
+"Utworzona wiadomość zawiera odniesienie do załączonego pliku, ale brak w "
+"niej załączników.\n"
 "Załączyć jakiś plik?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Przypomnienie o załączniku"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Wyślij &tak"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail nie rozpoznał położenia załącznika (%1).</p>"
-"<p>Musisz podać pełną ścieżkę, jeśli chcesz załączyć plik.</p></qt>"
+"<qt><p>KMail nie rozpoznał położenia załącznika (%1).</p><p>Musisz podać "
+"pełną ścieżkę, jeśli chcesz załączyć plik.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt> "
-"<p>Twój administrator zabronił wysyłania załączników większych niż %1 MB.</p>"
+"<qt> <p>Twój administrator zabronił wysyłania załączników większych niż %1 "
+"MB.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Załącz plik"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Dołącz"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Wstaw plik"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Wstaw plik"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wystąpił błąd podczas próby eksportowania klucza:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Wystąpił błąd podczas próby eksportowania klucza:</p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6550,95 +6400,108 @@ msgid ""
 "View"
 msgstr "Pokaż"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Zmień..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Edytuj w..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Zapisz &jako..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Właściwości"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Załącz..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail nie mógł spakować pliku."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr "Spakowany plik jest większy niż oryginalna wersja. Zachować oryginalną wersję?"
+msgstr ""
+"Spakowany plik jest większy niż oryginalna wersja. Zachować oryginalną "
+"wersję?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Zachowaj"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail nie mógł rozpakować pliku."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Zapisz załącznik jako"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Dodaj jako tekst"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Dodaj jako załącznik"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
-"Proszę wybrać czy chcesz wstawić zawartość jako tekst do edytora czy dołączyć "
-"plik jako załącznik."
+"Proszę wybrać czy chcesz wstawić zawartość jako tekst do edytora czy "
+"dołączyć plik jako załącznik."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Wstaw jako tekst czy załącznik?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nienazwany"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wybrałeś opcję szyfrowania wiadomości do siebie, ale dla wybranej tożsamości "
-"nie wybrano żadnego klucza (OpenPGP lub S/MIME), używany do tego celu.</p>"
-"<p>Proszę wybrać klucz(e) dla tej tożsamości.</p></qt>"
+"<qt><p>Wybrałeś opcję szyfrowania wiadomości do siebie, ale dla wybranej "
+"tożsamości nie wybrano żadnego klucza (OpenPGP lub S/MIME), używany do tego "
+"celu.</p><p>Proszę wybrać klucz(e) dla tej tożsamości.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Niezdefiniowany klucz szyfrujący"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>By móc podpisać tę wiadomość, musisz najpierw zdefiniować klucz (OpenPGP lub "
-"S/MIME), używany do tego celu.</p>"
-"<p>Proszę wybrać klucz dla tej tożsamości.</p></qt>"
+"<qt><p>By móc podpisać tę wiadomość, musisz najpierw zdefiniować klucz "
+"(OpenPGP lub S/MIME), używany do tego celu.</p><p>Proszę wybrać klucz dla "
+"tej tożsamości.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Niezdefiniowany klucz podpisu"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6646,88 +6509,87 @@ msgstr ""
 "KMail jest w tej chwili w trybie offline. Wiadomości będą przechowywane w "
 "folderze \"do wysłania\" do momentu przejścia online."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Musisz wpisać swój adres w polu Od:. Powinieneś także ustalić swój adres dla "
 "poszczególnych tożsamości, aby uniknąć wpisywania go za każdym razem."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
-msgstr "Musisz wpisać adres przynajmniej jednego adresata w polu Do:, DW lub UDW."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
+msgstr ""
+"Musisz wpisać adres przynajmniej jednego adresata w polu Do:, DW lub UDW."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Pole jest puste. Wysłać mimo to?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Nie podano pola \"Do:\""
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nie podałeś tematu. Wysłać mimo wszystko?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nie podano tematu"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Wyślij &tak"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Nie, podam temat"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Zachowaj znaczniki, nie podpisuj/szyfruj"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Zachowaj znaczniki, nie szyfruj"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Zachowaj znaczniki, nie podpisuj"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Podpisz i szyfruj (usuń znaczniki)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Szyfruj (usuń znaczniki)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Podpisz (usuń znaczniki)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wewnętrzne podpisywanie/szyfrowanie wiadomości HTML nie jest możliwe.</p>"
-"<p>Usunąć znaczniki HTML?</p></qt>"
+"<qt><p>Wewnętrzne podpisywanie/szyfrowanie wiadomości HTML nie jest możliwe."
+"</p><p>Usunąć znaczniki HTML?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Podpisać/zaszyfrować wiadomość?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6735,23 +6597,23 @@ msgstr ""
 "Folder na wiadomości robocze lub szablony dla tożsamości \"%1\" już nie "
 "istnieje. Wykorzystany zostanie domyślny folder."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Proszę utworzyć konto do wysyłania poczty i spróbować jeszcze raz."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Wiadomość zaraz zostanie wysłana..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Potwierdzenie wysłania"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Wyślij &teraz"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
@@ -6759,83 +6621,83 @@ msgstr ""
 "Próbujesz wysłać wiadomość do więcej niż %1 adresatów. Czy wysłać wiadomość "
 "mimo to?"
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 msgid "Too many receipients"
 msgstr "Zbyt wielu adresatów"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 msgid "&Edit Recipients"
 msgstr "Edytuj adresatów"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Sprawdzanie pisowni: włączone"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Sprawdzanie pisowni: wyłączone"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Sprawdzanie pisowni anulowane."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Sprawdzanie pisowni zatrzymane."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Sprawdzanie pisowni zakończone."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Sprawdzanie pisowni"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Proszę najpierw skonfigurować rozszerzenie szyfrowania dla szyfrowania "
 "Chiasmus.\n"
 "Można to zrobić na karcie \"Rozszerzenia szyfrowania\" na stronie "
 "Bezpieczeństwo okna konfiguracji."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 "Wygląda na to, że biblioteka libkleopatra została skompilowana bez obsługi "
-"rozszerzenia Chiasmus. Zapewne konieczne będzie przekompilowanie libkleopatra z "
-"opcją --enable-chiasmus."
+"rozszerzenia Chiasmus. Zapewne konieczne będzie przekompilowanie "
+"libkleopatra z opcją --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Nie skonfigurowano rozszerzenia Chiasmus"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nie znaleziono kluczy Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Wybór klucza szyfrującego Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Wiadomość zostanie podpisana"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Wiadomość nie zostanie podpisana"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Wiadomość zostanie zaszyfrowana"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Wiadomość nie zostanie zaszyfrowana"
 
@@ -6857,7 +6719,8 @@ msgstr "Ignoruj wszystko"
 
 #: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
-msgstr "Automatyczne sprawdzanie pisowni nie jest możliwe w tekście ze znacznikami."
+msgstr ""
+"Automatyczne sprawdzanie pisowni nie jest możliwe w tekście ze znacznikami."
 
 #: kmedit.cpp:631
 msgid ""
@@ -6881,11 +6744,11 @@ msgstr "Sprawdzanie pisowni"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Błąd uruchomienia ISpell/ASpell. Upewnij się, że masz poprawnie skonfigurowany "
-"ISpell lub ASpell i jest on w Twojej ścieżce (PATH)."
+"Błąd uruchomienia ISpell/ASpell. Upewnij się, że masz poprawnie "
+"skonfigurowany ISpell lub ASpell i jest on w Twojej ścieżce (PATH)."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6917,12 +6780,11 @@ msgstr "<qt>Zbyt wiele akcji filtrowania w regule filtrowania <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Nieznana akcja <b>%1</b>"
-"<br>w regule filtrowania <b>%2</b>. Akcja zignorowana.</qt>"
+"<qt>Nieznana akcja <b>%1</b><br>w regule filtrowania <b>%2</b>. Akcja "
+"zignorowana.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7138,161 +7000,131 @@ msgstr "odtwórz dźwięk"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jest to lista zdefiniowanych filtrów. Wykonywane są od góry do dołu.</p>"
-"<p>Kliknij na którykolwiek z filtrów, by edytować go za pomocą kontrolek z "
+"<qt><p>Jest to lista zdefiniowanych filtrów. Wykonywane są od góry do dołu.</"
+"p><p>Kliknij na którykolwiek z filtrów, by edytować go za pomocą kontrolek z "
 "prawej strony okienka dialogowego.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by utworzyć nowy filtr.</p>"
-"<p>Będzie wstawiony tuż przed filtrem wybranym obecnie, ale kolejność można "
-"później zmienić. </p>"
-"<p>Jeśli nacisnęło się na ten przycisk przypadkowo, można przywrócić stan "
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Wciśnij ten przycisk, by utworzyć nowy filtr.</p><p>Będzie wstawiony "
+"tuż przed filtrem wybranym obecnie, ale kolejność można później zmienić. </"
+"p><p>Jeśli nacisnęło się na ten przycisk przypadkowo, można przywrócić stan "
 "poprzedni naciskając przycisk <em>Usuń</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by skopiować filtr.</p>"
-"<p>Jeśli nacisnęło się na ten przycisk przypadkowo, można przywrócić stan "
-"poprzedni naciskając przycisk <em>Usuń</em>.</p></qt>"
+"<qt><p>Wciśnij ten przycisk, by skopiować filtr.</p><p>Jeśli nacisnęło się "
+"na ten przycisk przypadkowo, można przywrócić stan poprzedni naciskając "
+"przycisk <em>Usuń</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by <em>usunąć</em> obecnie wybrany filtr z powyższej "
-"listy.</p>"
-"<p>Nie da się przywrócić usuniętego filtra, ale zawsze można opuścić okno "
-"dialogowe przyciskiem <em>Anuluj</em>, by porzucić wszystkie zmiany.</p></qt>"
+"<qt><p>Wciśnij ten przycisk, by <em>usunąć</em> obecnie wybrany filtr z "
+"powyższej listy.</p><p>Nie da się przywrócić usuniętego filtra, ale zawsze "
+"można opuścić okno dialogowe przyciskiem <em>Anuluj</em>, by porzucić "
+"wszystkie zmiany.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr na <em>początek</em>"
-".</p>"
-"<p>Jest to użyteczne, gdyż kolejność filtrów określa zarazem kolejność, w "
-"jakiej są one stosowane. Filtr na samej górze będzie zastosowany jako "
-"pierwszy.</p></qt>"
+"<qt><p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr na "
+"<em>początek</em>.</p><p>Jest to użyteczne, gdyż kolejność filtrów określa "
+"zarazem kolejność, w jakiej są one stosowane. Filtr na samej górze będzie "
+"zastosowany jako pierwszy.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr o jedną pozycję <em>"
-"w górę</em>.</p>"
-"<p>Jest to użyteczne, gdyż kolejność filtrów określa zarazem kolejność, w "
-"jakiej są one stosowane. Filtr na samej górze będzie zastosowany jako "
-"pierwszy</p>"
-"<p>Jeśli nacisnęło się na ten przycisk przypadkowo, można przywrócić stan "
-"poprzedni naciskając przycisk <em>w dół</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr o jedną "
+"pozycję <em>w górę</em>.</p><p>Jest to użyteczne, gdyż kolejność filtrów "
+"określa zarazem kolejność, w jakiej są one stosowane. Filtr na samej górze "
+"będzie zastosowany jako pierwszy</p><p>Jeśli nacisnęło się na ten przycisk "
+"przypadkowo, można przywrócić stan poprzedni naciskając przycisk <em>w dół</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr o jedną pozycję <em>"
-"w dół</em>.</p>"
-"<p>Jest to użyteczne, gdyż kolejność filtrów określa zarazem kolejność w jakiej "
-"są one stosowane. Filtr na samej górze będzie zastosowany jako pierwszy</p>"
-"<p>Jeśli nacisnęło się na ten przycisk przypadkowo, można przywrócić stan "
-"poprzedni naciskając przycisk <em>w górę</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr o jedną "
+"pozycję <em>w dół</em>.</p><p>Jest to użyteczne, gdyż kolejność filtrów "
+"określa zarazem kolejność w jakiej są one stosowane. Filtr na samej górze "
+"będzie zastosowany jako pierwszy</p><p>Jeśli nacisnęło się na ten przycisk "
+"przypadkowo, można przywrócić stan poprzedni naciskając przycisk <em>w górę</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr na <em>koniec</em>"
-".</p>"
-"<p>Jest to użyteczne, gdyż kolejność filtrów określa zarazem kolejność, w "
-"jakiej są one stosowane. Filtr na samej górze będzie zastosowany jako "
-"pierwszy</p></qt>"
+"<qt><p>Wciśnij ten przycisk, by przesunąć obecnie wybrany filtr na "
+"<em>koniec</em>.</p><p>Jest to użyteczne, gdyż kolejność filtrów określa "
+"zarazem kolejność, w jakiej są one stosowane. Filtr na samej górze będzie "
+"zastosowany jako pierwszy</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wciśnij ten przycisk, by zmienić nazwę obecnie wybranego filtra.</p>"
-"<p>Filtry są nazywane automatycznie, o ile zaczynają się one od \"&lt;\".</p>"
-"<p>Jeśli przypadkowo zmieniłeś nazwę filtra i chcesz przywrócić automatyczną "
-"nazwę, wciśnij ten przycisk, następnie wybierz <em>Wyczyść</em> i <em>OK</em> "
-"w pojawiającym się okienku dialogowym.</p></qt>"
+"<qt><p>Wciśnij ten przycisk, by zmienić nazwę obecnie wybranego filtra.</"
+"p><p>Filtry są nazywane automatycznie, o ile zaczynają się one od \"&lt;\".</"
+"p><p>Jeśli przypadkowo zmieniłeś nazwę filtra i chcesz przywrócić "
+"automatyczną nazwę, wciśnij ten przycisk, następnie wybierz <em>Wyczyść</em> "
+"i <em>OK</em> w pojawiającym się okienku dialogowym.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Włącz tę opcję, by wymusić prośbę o potwierdzenie.</p> "
-"<p>Jest to przydatne, jeśli zdefiniowałeś reguły, które oznaczają niektóre "
-"wiadomości do późniejszego odebrania. Bez tej opcji nie będziesz mógł ściągnąć "
-"tych wiadomości później, jeśli żadne inne duże wiadomości nie pojawią się na "
+"<qt><p>Włącz tę opcję, by wymusić prośbę o potwierdzenie.</p> <p>Jest to "
+"przydatne, jeśli zdefiniowałeś reguły, które oznaczają niektóre wiadomości "
+"do późniejszego odebrania. Bez tej opcji nie będziesz mógł ściągnąć tych "
+"wiadomości później, jeśli żadne inne duże wiadomości nie pojawią się na "
 "serwerze lub jeśli nie zmienisz reguł oznaczania wiadomości.</p></qt>"
 
 #: kmfilterdlg.cpp:133
@@ -7303,6 +7135,16 @@ msgstr "Reguły filtrowania POP3"
 msgid "Filter Rules"
 msgstr "Reguły filtrowania"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importuj"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importuj"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Dostępne filtry"
@@ -7325,7 +7167,8 @@ msgstr "Opcje ogólne"
 
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
-msgstr "Zawsze potwierdź po&minięcie wiadomości oznaczonych \"Odbierz później\" "
+msgstr ""
+"Zawsze potwierdź po&minięcie wiadomości oznaczonych \"Odbierz później\" "
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7383,6 +7226,11 @@ msgstr "Dodaj ten filtr do paska narzędzi"
 msgid "Icon for this filter:"
 msgstr "Ikona tego filtra:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Do"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Góra"
@@ -7391,16 +7239,29 @@ msgstr "Góra"
 msgid "Down"
 msgstr "Dół"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Zmień nazwę..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nowy"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopiuj do"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "usunięta"
+
 #: kmfilterdlg.cpp:645
 msgid "Select Source Folders"
 msgstr "Wybierz folder źródłowy"
@@ -7408,8 +7269,8 @@ msgstr "Wybierz folder źródłowy"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Przynajmniej jeden filtr dotyczy foldera w zdalnym koncie IMAP. Filtry takie "
 "będą stosowane jedynie przy filtrowaniu ręcznym oraz przy filtrowaniu poczty "
@@ -7467,7 +7328,8 @@ msgstr "Nie można utworzyć folderu"
 msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
-msgstr "Nazwa folderu nie może zawierać znaku / (ukośnik); proszę wybrać inną nazwę."
+msgstr ""
+"Nazwa folderu nie może zawierać znaku / (ukośnik); proszę wybrać inną nazwę."
 
 #: kmfolder.cpp:913
 msgid ""
@@ -7491,26 +7353,22 @@ msgstr "Rozwiązywanie problemów z buforem IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Rozwiązywanie problemów z buforem IMAP</b></p> "
-"<p>Jeśli wystąpił problem z synchronizacją foldera IMAP, należy najpierw "
-"odtworzyć plik indeksu. Zajmie to trochę czasu, ale nie spowoduje żadnych "
-"problemów.</p> "
+"<p><b>Rozwiązywanie problemów z buforem IMAP</b></p> <p>Jeśli wystąpił "
+"problem z synchronizacją foldera IMAP, należy najpierw odtworzyć plik "
+"indeksu. Zajmie to trochę czasu, ale nie spowoduje żadnych problemów.</p> "
 "<p>Jeśli to nie wystarczy, można odświeżyć bufor IMAP. Spowoduje to jednak "
 "utratę wszystkich zmian w tym folderze i jego podfolderach.</p>"
 
@@ -7543,20 +7401,21 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Nie można odczytać UID pliku bufora dla folderu %1. Być może wystąpił problem z "
-"prawami dostępu lub plik jest uszkodzony."
+"Nie można odczytać UID pliku bufora dla folderu %1. Być może wystąpił "
+"problem z prawami dostępu lub plik jest uszkodzony."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"Nie można zapisać UID pliku bufora dla folderu %1. Być może wystąpił problem z "
-"prawami dostępu."
+"Nie można zapisać UID pliku bufora dla folderu %1. Być może wystąpił problem "
+"z prawami dostępu."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
-msgstr "Przed zmianą nazwy folderów IMAP konieczna jest synchronizacja z serwerem."
+msgstr ""
+"Przed zmianą nazwy folderów IMAP konieczna jest synchronizacja z serwerem."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7589,11 +7448,11 @@ msgstr "Indeks tego folderu został odtworzony."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Folder %1 nie jest w stanie wstępnej synchronizacji (stan %2). Czy przywrócić "
-"go do stanu wstępnej synchronizacji i synchronizować?"
+"Folder %1 nie jest w stanie wstępnej synchronizacji (stan %2). Czy "
+"przywrócić go do stanu wstępnej synchronizacji i synchronizować?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7721,15 +7580,11 @@ msgstr "Tworzenie podfolderów na serwerze"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wiadomości z folderu <b>%1</b> na serwerze zostały usunięte. Usunąć je z "
-"lokalnego dysku?</p> "
-"<br>UID: %2</p></qt>"
+"<qt><p>Wiadomości z folderu <b>%1</b> na serwerze zostały usunięte. Usunąć "
+"je z lokalnego dysku?</p> <br>UID: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7750,13 +7605,11 @@ msgstr "Pobieranie folderów z przestrzeni nazw %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wygląda na to, że folder <b>%1</b> został usunięty. Usunąć go z serwera?</p>"
-"</qt>"
+"<qt><p>Wygląda na to, że folder <b>%1</b> został usunięty. Usunąć go z "
+"serwera?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7764,19 +7617,19 @@ msgstr "Przerwane"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"Serwer IMAP %1 nie obsługuje komentarzy IMAP. Zapisywanie XML nie jest możliwe "
-"na tym serwerze; proszę zmienić konfigurację KMaila."
+"Serwer IMAP %1 nie obsługuje komentarzy IMAP. Zapisywanie XML nie jest "
+"możliwe na tym serwerze; proszę zmienić konfigurację KMaila."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"Serwer IMAP %1 nie obsługuje komentarzy IMAP. Zapisywanie XML nie jest możliwe "
-"na tym serwerze; proszę zmienić konfigurację KMaila"
+"Serwer IMAP %1 nie obsługuje komentarzy IMAP. Zapisywanie XML nie jest "
+"możliwe na tym serwerze; proszę zmienić konfigurację KMaila"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7788,17 +7641,17 @@ msgstr "zgubione+znalezione"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>W folderze <b>%1</b> znajdują się nowe wiadomości, które nie zostały wysłane "
-"na serwer, ale folder na serwerze został usunięty lub brak wystarczających praw "
-"dostępu do folderu, żeby je wysłać.</p>"
-"<p>Wszystkie takie wiadomości zostaną przeniesione do <b>%2</b>"
-", żeby uniknąć utraty danych.</p>"
+"<p>W folderze <b>%1</b> znajdują się nowe wiadomości, które nie zostały "
+"wysłane na serwer, ale folder na serwerze został usunięty lub brak "
+"wystarczających praw dostępu do folderu, żeby je wysłać.</p><p>Wszystkie "
+"takie wiadomości zostaną przeniesione do <b>%2</b>, żeby uniknąć utraty "
+"danych.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7806,20 +7659,25 @@ msgstr "Niewystarczające prawa dostępu"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-msgstr ""
-"<p>W tym folderze (%1) znajdują się nowe wiadomości, które nie zostały wysłane "
-"na serwer, ale folder został usunięty lub brak wystarczających praw dostępu do "
-"foldera, żeby je wysłać. Poproś administratora o nadanie odpowiednich praw albo "
-"przenieś wiadomości z tego foldera.</p>"
-"<p>Czy chcesz teraz przenieść te wiadomości do innego foldera?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
+msgstr ""
+"<p>W tym folderze (%1) znajdują się nowe wiadomości, które nie zostały "
+"wysłane na serwer, ale folder został usunięty lub brak wystarczających praw "
+"dostępu do foldera, żeby je wysłać. Poproś administratora o nadanie "
+"odpowiednich praw albo przenieś wiadomości z tego foldera.</p><p>Czy chcesz "
+"teraz przenieść te wiadomości do innego foldera?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Przenieś do:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Nie przenoś"
 
@@ -7831,8 +7689,7 @@ msgstr "Przenieś wiadomości do foldera"
 msgid "Permissions (ACL)"
 msgstr "Prawa dostępu (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Ogólne"
@@ -7859,8 +7716,7 @@ msgstr ""
 "Folder nadrzędny nie pozwala na zapis.\n"
 "Po zmianie uprawnień niezbędna jest synchronizacja."
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Użyj &własnych ikon"
@@ -7879,24 +7735,22 @@ msgstr "Powiadamiaj o nowej/nieprzeczytanej poczcie w tym folderze"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Jeśli ta opcja jest włączona, będziesz powiadamiany o nowej/nieprzeczytanej "
-"poczcie w tym folderze. Ponadto, przechodzenie do następnego/poprzedniego "
-"foldera z nieprzeczytanymi wiadomościami będzie uwzględniać ten folder.</p> "
-"<p>Jeśli ta opcja jest wyłączona, nie będziesz powiadamiany o "
-"nowej/nieprzeczytanej poczcie w tym folderze i folder ten będzie pomijany przy "
-"przechodzeniu do następnego/poprzedniego foldera z nieprzeczytanymi "
-"wiadomościami. Jest to przydatne do ignorowania nowej/nieprzeczytanej poczty w "
-"koszu i folderze na spam.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Jeśli ta opcja jest włączona, będziesz powiadamiany o nowej/"
+"nieprzeczytanej poczcie w tym folderze. Ponadto, przechodzenie do następnego/"
+"poprzedniego foldera z nieprzeczytanymi wiadomościami będzie uwzględniać ten "
+"folder.</p> <p>Jeśli ta opcja jest wyłączona, nie będziesz powiadamiany o "
+"nowej/nieprzeczytanej poczcie w tym folderze i folder ten będzie pomijany "
+"przy przechodzeniu do następnego/poprzedniego foldera z nieprzeczytanymi "
+"wiadomościami. Jest to przydatne do ignorowania nowej/nieprzeczytanej poczty "
+"w koszu i folderze na spam.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7908,9 +7762,9 @@ msgstr "Przechowuj odpowiedzi w tym folderze"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Włącz tę opcję, jeśli chcesz, by odpowiedzi na listy z tego folderu były "
 "umieszczane w tym folderze, a nie w folderze \"wysłane\"."
@@ -7923,17 +7777,21 @@ msgstr "Pokaż kolumnę Nadawca/Adresat w liście wiadomości"
 msgid "Sho&w column:"
 msgstr "Pokaż &kolumnę:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Ustaw jako domyślne"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Nadawca"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Adresat"
@@ -7944,17 +7802,17 @@ msgstr "&Tożsamość nadawcy:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Wybierz tożsamość nadawcy używaną podczas pisania nowych wiadomości lub "
-"odpowiadania na wiadomości z tego folderu. Oznacza to, że jeśli jesteś w jednym "
-"ze swoich folderów roboczych, KMail może użyć odpowiednich adresów nadawcy, "
-"sygnatur oraz kluczy podpisu i szyfrowania. Tożsamości można ustawić w głównym "
-"oknie konfiguracji (Ustawienia->Konfiguracja KMail)"
+"odpowiadania na wiadomości z tego folderu. Oznacza to, że jeśli jesteś w "
+"jednym ze swoich folderów roboczych, KMail może użyć odpowiednich adresów "
+"nadawcy, sygnatur oraz kluczy podpisu i szyfrowania. Tożsamości można "
+"ustawić w głównym oknie konfiguracji (Ustawienia->Konfiguracja KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7972,12 +7830,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Ta opcja określa, którzy użytkownicy korzystający z tego folderu mają być "
 "oznaczani jako \"zajęci\" na ich liście zajęć, a także dostawać alarmy o "
@@ -7990,8 +7848,8 @@ msgstr ""
 "roboczych, wszyscy użytkownicy powinni być oznaczani jako zajęci podczas "
 "spotkań.\n"
 "Przykład 3: folder dostępny dla wszystkich pracowników firmy, informujący o "
-"dodatkowych zdarzeniach powinien mieć wybrane \"Nikt\", ponieważ nie wiadomo, "
-"kto będzie brał udział w tych zdarzeniach."
+"dodatkowych zdarzeniach powinien mieć wybrane \"Nikt\", ponieważ nie "
+"wiadomo, kto będzie brał udział w tych zdarzeniach."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8006,8 +7864,10 @@ msgid "All Readers of This Folder"
 msgstr "Wszyscy czytelnicy folderu"
 
 #: kmfolderdia.cpp:560
-msgid "This setting allows you to disable alarms for folders shared by others. "
-msgstr "Ta opcja pozwoli na wyłączenie alarmów dla folderów dzielonych z innymi. "
+msgid ""
+"This setting allows you to disable alarms for folders shared by others. "
+msgstr ""
+"Ta opcja pozwoli na wyłączenie alarmów dla folderów dzielonych z innymi. "
 
 #: kmfolderdia.cpp:562
 msgid "Block alarms locally"
@@ -8020,19 +7880,20 @@ msgstr "Udostępniaj wszystkim użytkownikom stan przeczytania"
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
-"Włączenie tej opcji udostępni wszystkim użytkownikom folderu stan przeczytania/nieprzeczytania "
-"wiadomości. Wyłączenie sprawi, że użytkownicy będą zmieniać ten stan niezależnie."
+"Włączenie tej opcji udostępni wszystkim użytkownikom folderu stan "
+"przeczytania/nieprzeczytania wiadomości. Wyłączenie sprawi, że użytkownicy "
+"będą zmieniać ten stan niezależnie."
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Ten folder został wybrany do przechowywania informacji o pracy grupowej, a "
 "opcja ukrywania folderów pracy grupowej jest włączona. Oznacza to, że folder "
@@ -8106,11 +7967,12 @@ msgstr "Błąd podczas pobierania informacji o folderze."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Indeks poczty dla foldera \"%1\" pochodzi z nieznanej wersji KMaila (%2).\n"
-"Indeks może zostać wygenerowany ponownie na podstawie foldera pocztowego, ale "
-"część informacji, w tym flagi stanu wiadomości, może zostać utracona. "
+"Indeks może zostać wygenerowany ponownie na podstawie foldera pocztowego, "
+"ale część informacji, w tym flagi stanu wiadomości, może zostać utracona. "
 "Wygenerować nowy plik indeksu mimo to?"
 
 #: kmfolderindex.cpp:372
@@ -8136,11 +7998,11 @@ msgstr "Błąd podczas otwierania %1 - brak foldera."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Błąd podczas otwierania %1. Nieprawidłowy folder maildir lub brak odpowiednich "
-"praw dostępu."
+"Błąd podczas otwierania %1. Nieprawidłowy folder maildir lub brak "
+"odpowiednich praw dostępu."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8156,7 +8018,8 @@ msgstr "Nie można dodać wiadomości do foldera, zapewne brak miejsca na dysku.
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
-msgstr "KMFolderMaildir::addMsg: awaryjne zakończenie dla uniknięcia utraty danych."
+msgstr ""
+"KMFolderMaildir::addMsg: awaryjne zakończenie dla uniknięcia utraty danych."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8167,8 +8030,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"Folder \"do wysłania\" zawiera wiadomości, które najprawdopodobniej nie zostały "
-"utworzone przy pomocy KMaila.\n"
+"Folder \"do wysłania\" zawiera wiadomości, które najprawdopodobniej nie "
+"zostały utworzone przy pomocy KMaila.\n"
 "Usuń je stamtąd, jeśli nie chcesz, by KMail je wysłał."
 
 #: kmfoldermbox.cpp:112
@@ -8181,22 +8044,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Indeks zawartości folderu \"%2\" jest nieaktualny. Dla uniknięcia możliwego "
-"uszkodzenia wiadomości indeks zostanie utworzony ponownie. Niestety w "
-"rezultacie usunięte wiadomości mogą pojawić się ponownie, zaś stan wiadomości "
-"może zostać utracony.</p> "
-"<p>Proszę przeczytać odpowiedni fragment w <a href=\"%1\">"
-"rozdziale FAQ podręcznika KMail</a>, by dowiedzieć się, jak uniknąć pojawiania "
-"się tego problemu w przyszłości.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Indeks zawartości folderu \"%2\" jest nieaktualny. Dla uniknięcia "
+"możliwego uszkodzenia wiadomości indeks zostanie utworzony ponownie. "
+"Niestety w rezultacie usunięte wiadomości mogą pojawić się ponownie, zaś "
+"stan wiadomości może zostać utracony.</p> <p>Proszę przeczytać odpowiedni "
+"fragment w <a href=\"%1\">rozdziale FAQ podręcznika KMail</a>, by dowiedzieć "
+"się, jak uniknąć pojawiania się tego problemu w przyszłości.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8212,7 +8071,8 @@ msgstr "Nie można zsynchronizować pliku indeksu <b>%1</b>: %2"
 
 #: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
-msgstr "Błąd wewnętrzny. Proszę skopiować szczegółowe informacji i zgłosić błąd."
+msgstr ""
+"Błąd wewnętrzny. Proszę skopiować szczegółowe informacji i zgłosić błąd."
 
 #: kmfoldermbox.cpp:602
 #, c-format
@@ -8256,7 +8116,7 @@ msgstr ""
 "\"%1\" nie jest folderem.\n"
 "Proszę usunąć plik."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8265,7 +8125,7 @@ msgstr ""
 "Proszę sprawdzić, czy możliwe jest przeglądanie i modyfikowanie zawartości "
 "folderu."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8276,18 +8136,18 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 "Folder o tej samej nazwie został usunięty w czasie od ostatniego sprawdzenia "
-"wiadomości. Musisz sprawdzić wiadomości zanim utworzysz inny folder o tej samej "
-"nazwie."
+"wiadomości. Musisz sprawdzić wiadomości zanim utworzysz inny folder o tej "
+"samej nazwie."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Nie można utworzyć folderu"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8330,7 +8190,9 @@ msgstr "Wyszukiwania"
 
 #: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
-msgstr "<qt>Przejść do następnej nieprzeczytanej wiadomości w folderze <b>%1</b>?</qt>"
+msgstr ""
+"<qt>Przejść do następnej nieprzeczytanej wiadomości w folderze <b>%1</b>?</"
+"qt>"
 
 #: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
@@ -8382,13 +8244,13 @@ msgstr "&Rozwiąż problemy z buforem IMAP..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Nie można utworzyć folderu <b>%1</b> z powodu niedostatecznych praw dostępu "
-"na serwerze. Jeśli uważasz, że powinieneś być w stanie tworzyć podkatalogi, "
-"poproś administratora o odpowiednie prawa dostępu.</qt> "
+"<qt>Nie można utworzyć folderu <b>%1</b> z powodu niedostatecznych praw "
+"dostępu na serwerze. Jeśli uważasz, że powinieneś być w stanie tworzyć "
+"podkatalogi, poproś administratora o odpowiednie prawa dostępu.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8405,20 +8267,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Nie można przenieść lub skopiować folderu <b>%1</b>"
-". Taki folder już istnieje.</qt>"
+"<qt>Nie można przenieść lub skopiować folderu <b>%1</b>. Taki folder już "
+"istnieje.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Nie można przenieść lub skopiować folderu <b>%1</b>"
-", ponieważ nie jest całkowicie skopiowany.</qt>"
+"<qt>Nie można przenieść lub skopiować folderu <b>%1</b>, ponieważ nie jest "
+"całkowicie skopiowany.</qt>"
 
 #: kmfoldertree.cpp:2010
-msgid "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
-msgstr "<qt>Nie można przenieść lub skopiować folderu <b>%1</b> do jego podfolderu.</qt>"
+msgid ""
+"<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
+msgstr ""
+"<qt>Nie można przenieść lub skopiować folderu <b>%1</b> do jego podfolderu.</"
+"qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8526,17 +8391,17 @@ msgstr "Folder %1 jest tylko do odczytu."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Na pewno usunąć wybraną wiadomość?"
-"<br> Nie będzie można jej odtworzyć.</qt>\n"
-"<qt>Na pewno usunąć %n wybrane wiadomości?"
-"<br> Nie będzie można ich odtworzyć.</qt>\n"
-"<qt>Na pewno usunąć %n wybranych wiadomości?"
-"<br> Nie będzie można ich odtworzyć.</qt>"
+"<qt>Na pewno usunąć wybraną wiadomość?<br> Nie będzie można jej odtworzyć.</"
+"qt>\n"
+"<qt>Na pewno usunąć %n wybrane wiadomości?<br> Nie będzie można ich "
+"odtworzyć.</qt>\n"
+"<qt>Na pewno usunąć %n wybranych wiadomości?<br> Nie będzie można ich "
+"odtworzyć.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8588,87 +8453,89 @@ msgstr ""
 "Błąd podczas zamiany %1\n"
 "Być może brak miejsca na dysku"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Żądanie podpisu certyfikatu"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Proszę utworzyć certyfikat z załącznika i zwrócić go do nadawcy."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail jest w trybie offline, wszystkie zadania sieciowe są zatrzymane"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
-msgstr "KMail jest w trybie online, wszystkie zadania sieciowe zostały wznowione"
+msgstr ""
+"KMail jest w trybie online, wszystkie zadania sieciowe zostały wznowione"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail jest w tej chwili w trybie offline. Co zrobić?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Pracuj w trybie online"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Pracuj w trybie offline"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Brak prawa odczytu/zapisu do foldera Otrzymane."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "do wysłania"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Brak prawa odczytu/zapisu do foldera Do wysłania."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "wysłane"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Brak prawa odczytu/zapisu do folderu Wysłane."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "kosz"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Brak prawa odczytu/zapisu do folderu Kosza."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "robocze"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Brak prawa odczytu/zapisu do folderu Robocze."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "szablony"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Brak prawa odczytu/zapisu do folderu szablonów."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Ostatnie wyszukiwanie"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
@@ -8678,47 +8545,43 @@ msgstr ""
 "Jeżeli dzieje się to często, skontaktuj się z administratorem.\n"
 "Niektóre informacje mogą zostać utracone."
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr "Problem z indeksami"
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Folder <i>%4</i> już istnieje. %1 aktualnie wykorzystuje folder <i>%5</i> "
-"do przechowywania wiadomości."
-"<p>%2 może przenieść zawartość  <i>%6<i> do tego folderu, ale może to zastąpić "
-"istniejące pliki o tej samej nazwie w <i>%7</i>."
-"<p><strong>Czy %3 ma teraz przenieść te pliki?</strong></qt>"
+"<qt>Folder <i>%4</i> już istnieje. %1 aktualnie wykorzystuje folder <i>%5</"
+"i> do przechowywania wiadomości.<p>%2 może przenieść zawartość  <i>%6<i> do "
+"tego folderu, ale może to zastąpić istniejące pliki o tej samej nazwie w <i>"
+"%7</i>.<p><strong>Czy %3 ma teraz przenieść te pliki?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Folder <i>%4</i> już istnieje. %1 aktualnie wykorzystuje folder <i>%5</i> "
-"do przechowywania wiadomości. %2 może przenieść zawartość <i>%6</i> "
-"do tego folderu."
-"<p><strong>Czy %3 ma teraz przenieść te pliki?</strong></qt>"
+"<qt>Folder <i>%4</i> już istnieje. %1 aktualnie wykorzystuje folder <i>%5</"
+"i> do przechowywania wiadomości. %2 może przenieść zawartość <i>%6</i> do "
+"tego folderu.<p><strong>Czy %3 ma teraz przenieść te pliki?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Przenieść pliki poczty?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail napotkał błąd krytyczny i zostanie zakończony"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8729,11 +8592,11 @@ msgstr ""
 "Komunikat o błędzie:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Opróżnij kosz"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Na pewno opróżnić kosze dla wszystkich kont?"
 
@@ -8809,8 +8672,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Nadeszła nowa wiadomość</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8848,9 +8710,11 @@ msgstr "Na pewno opróżnić kosz?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
-msgstr "<qt>Na pewno przenieść wszystkie wiadomości z folderu <b>%1</b> do kosza?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
+msgstr ""
+"<qt>Na pewno przenieść wszystkie wiadomości z folderu <b>%1</b> do kosza?</"
+"qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8862,9 +8726,8 @@ msgid ""
 "syncronized. Please wait until the syncronization of this folder is complete "
 "and then try again."
 msgstr ""
-"Nie można usunąć tego folderu, gdyż jest aktualnie synchronizowany. "
-"Proszę poczekać, aż synchronizacja dobiegnie końca i spróbować "
-"ponownie."
+"Nie można usunąć tego folderu, gdyż jest aktualnie synchronizowany. Proszę "
+"poczekać, aż synchronizacja dobiegnie końca i spróbować ponownie."
 
 #: kmmainwidget.cpp:1203
 msgid "Unable to delete folder"
@@ -8876,12 +8739,12 @@ msgstr "Usuń wyszukiwanie"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Na pewno usunąć folder wyszukiwania <b>%1</b>? "
-"<br>Wiadomości wyświetlone w tym folderze nie będą usunięte, ponieważ są "
-"przechowywane w innych folderach.</qt>"
+"<qt>Na pewno usunąć folder wyszukiwania <b>%1</b>? <br>Wiadomości "
+"wyświetlone w tym folderze nie będą usunięte, ponieważ są przechowywane w "
+"innych folderach.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8893,39 +8756,41 @@ msgstr "<qt>Na pewno usunąć pusty folder <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Na pewno usunąć pusty folder <b>%1</b> oraz wszystkie podfoldery? "
 "Podfoldery mogą nie być puste i ich zawartość zostanie także usunięta. "
-"<p><b>Uwaga</b> usunięte w ten sposób wiadomości nie są przenoszone do Kosza i "
-"są na zawsze stracone.</qt>"
+"<p><b>Uwaga</b> usunięte w ten sposób wiadomości nie są przenoszone do Kosza "
+"i są na zawsze stracone.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Na pewno usunąć folder <b>%1</b> wraz z zawartością? "
-"<p><b>Uwaga</b> usunięte w ten sposób wiadomości nie są przenoszone do Kosza i "
-"są na zawsze stracone.</qt>"
+"<qt>Na pewno usunąć folder <b>%1</b> wraz z zawartością? <p><b>Uwaga</b> "
+"usunięte w ten sposób wiadomości nie są przenoszone do Kosza i są na zawsze "
+"stracone.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Na pewno usunąć folder <b>%1</b> oraz wszystkie podfoldery wraz z "
-"zawartością? "
-"<p><b>Uwaga</b> usunięte w ten sposób wiadomości nie są przenoszone do Kosza i "
-"są na zawsze stracone.</qt>"
+"zawartością? <p><b>Uwaga</b> usunięte w ten sposób wiadomości nie są "
+"przenoszone do Kosza i są na zawsze stracone.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "usunięta"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8941,13 +8806,13 @@ msgstr "Na pewno usunąć wszystkie stare wiadomości?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Użycie HTML-u w wiadomości uczyni Twoją pocztę bardziej podatną na \"spam\" i "
-"zwiększy prawdopodobieństwo skutecznego zaatakowania systemu przed obecne lub "
-"przyszłe programy wykorzystujące dziury w jego bezpieczeństwie."
+"Użycie HTML-u w wiadomości uczyni Twoją pocztę bardziej podatną na \"spam\" "
+"i zwiększy prawdopodobieństwo skutecznego zaatakowania systemu przed obecne "
+"lub przyszłe programy wykorzystujące dziury w jego bezpieczeństwie."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8960,12 +8825,12 @@ msgstr "Użyj HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Wczytywanie zewnętrznych odnośników uczyni Twoją pocztę bardziej podatną na "
-"\"spam\" i zwiększy prawdopodobieństwo skutecznego zaatakowania systemu przez "
-"wykorzystanie istniejących lub przyszłych dziur w jego bezpieczeństwie."
+"\"spam\" i zwiększy prawdopodobieństwo skutecznego zaatakowania systemu "
+"przez wykorzystanie istniejących lub przyszłych dziur w jego bezpieczeństwie."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8981,13 +8846,14 @@ msgstr "Filtruj wg listy dyskusyjnej %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Funkcja informacji o nieobecności wymaga filtrowania po stronie serwera. Serwer "
-"IMAP nie jest jeszcze skonfigurowany odpowiednio.\n"
-"Można go skonfigurować na karcie \"Filtrowanie\" okna konfiguracji konta IMAP."
+"Funkcja informacji o nieobecności wymaga filtrowania po stronie serwera. "
+"Serwer IMAP nie jest jeszcze skonfigurowany odpowiednio.\n"
+"Można go skonfigurować na karcie \"Filtrowanie\" okna konfiguracji konta "
+"IMAP."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -8997,10 +8863,13 @@ msgstr "Filtrowanie na serwerze nie został skonfigurowane"
 msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
-msgstr "Nie można uruchomić menedżera certyfikatów. Proszę sprawdzić instalację."
+msgstr ""
+"Nie można uruchomić menedżera certyfikatów. Proszę sprawdzić instalację."
 
 #: kmmainwidget.cpp:1787
-msgid "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+msgid ""
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Nie można uruchomić przeglądarki dziennika GnuPG (kwatchgnupg). Proszę "
 "sprawdzić instalację."
@@ -9321,8 +9190,7 @@ msgstr "&Zapisz załączniki..."
 msgid "Appl&y All Filters"
 msgstr "Zastosuj wszystkie &filtry"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Zastosuj &filtr"
@@ -9356,7 +9224,8 @@ msgid ""
 msgstr "Kolumna \"&razem\""
 
 #: kmmainwidget.cpp:3024
-msgid "Toggle display of column showing the total number of messages in folders."
+msgid ""
+"Toggle display of column showing the total number of messages in folders."
 msgstr ""
 "Przełącz wyświetlanie kolumny pokazującej całkowitą liczbę wiadomości w "
 "folderze."
@@ -9437,7 +9306,6 @@ msgstr "Następna ni&eprzeczytana wiadomość"
 msgid "Go to the next unread message"
 msgstr "Idź do następnej nieprzeczytanej wiadomości"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Poprzednia wiadomość"
@@ -9485,8 +9353,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Przewiń aktualną wiadomość. Jeżeli to koniec wiadomości, przejdź do następnej "
-"nieprzeczytanej."
+"Przewiń aktualną wiadomość. Jeżeli to koniec wiadomości, przejdź do "
+"następnej nieprzeczytanej."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9577,8 +9445,8 @@ msgstr " Inicjalizacja..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9587,21 +9455,21 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Ta wiadomość zawiera żądanie powiadomienia o dalszym jej losie.\n"
-"Zawiera informacje o przetwarzaniu, oznaczone jako \"wymagane\", ale nieznane "
-"programowi KMail.\n"
+"Zawiera informacje o przetwarzaniu, oznaczone jako \"wymagane\", ale "
+"nieznane programowi KMail.\n"
 "Możesz zignorować żądanie albo wysłać odpowiedź \"nieudana\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9612,8 +9480,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9624,8 +9492,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9652,23 +9520,23 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Nagłówek \"Opcje powiadamiania o losie wiadomości\" zawiera nieznany wymagany "
-"parametr"
+"Nagłówek \"Opcje powiadamiania o losie wiadomości\" zawiera nieznany "
+"wymagany parametr"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Adres zwrotny: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Załącznik: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Załącznik został usunięty."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Załącznik \"%1\" został usunięty."
 
@@ -9716,45 +9584,37 @@ msgstr "Właściwości załącznika"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Typ MIME</em> dla pliku:</p>"
-"<p>zazwyczaj nie ma powodu zmieniać tych ustawień, ponieważ typ pliku jest "
-"sprawdzany automatycznie. Czasami jednak %1 może nie wykryć typu pliku "
-"poprawnie. Tu możesz to poprawić.</p></qt>"
+"<qt><p><em>Typ MIME</em> dla pliku:</p><p>zazwyczaj nie ma powodu zmieniać "
+"tych ustawień, ponieważ typ pliku jest sprawdzany automatycznie. Czasami "
+"jednak %1 może nie wykryć typu pliku poprawnie. Tu możesz to poprawić.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Rozmiar załącznika:</p>"
-"<p>czasami %1 podaje tu jedynie szacowany rozmiar,ponieważ dokładne obliczenie "
-"zajęłoby za dużo czasu. W takim wypadku rozmiar zostanie poprzedzony napisem "
-"\"ok.\". </p></qt>"
+"<qt><p>Rozmiar załącznika:</p><p>czasami %1 podaje tu jedynie szacowany "
+"rozmiar,ponieważ dokładne obliczenie zajęłoby za dużo czasu. W takim wypadku "
+"rozmiar zostanie poprzedzony napisem \"ok.\". </p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Nazwa pliku załącznika:</p>"
-"<p>chociaż wartością domyślną jest nazwa załączanego pliku, nie określa ona "
-"pliku do załączenia. Zamiast tego jest to sugerowana nazwa pliku przy "
-"zapisywaniu go przez adresata.</p></qt>"
+"<qt><p>Nazwa pliku załącznika:</p><p>chociaż wartością domyślną jest nazwa "
+"załączanego pliku, nie określa ona pliku do załączenia. Zamiast tego jest to "
+"sugerowana nazwa pliku przy zapisywaniu go przez adresata.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9762,16 +9622,14 @@ msgstr "&Opis:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Opis załącznika:</p>"
-"<p>dodatkowa informacja o załączniku, analogiczna do pola \"Temat\" wiadomości. "
-"Większość programów pocztowych pokazuje ten opis obok ikony załącznika.</p></qt>"
+"<qt><p>Opis załącznika:</p><p>dodatkowa informacja o załączniku, analogiczna "
+"do pola \"Temat\" wiadomości. Większość programów pocztowych pokazuje ten "
+"opis obok ikony załącznika.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9779,22 +9637,20 @@ msgstr "&Kodowanie:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kodowanie załącznika:</p>"
-"<p>zazwyczaj nie ma powodu niczego zmieniać, ponieważ %1 użyje domyślnego "
-"kodowania, zależnego od typu MIME. Czasami możesz jednak znacząco zmniejszyć "
-"wielkość wiadomości, np. jeśli plik PostScript nie zawiera danych binarnych, a "
-"jedynie sam tekst. Wtedy wybranie \"quoted-printable\" zamiast domyślnego "
-"\"base64\" zmniejszy wiadomość o ok. 25%.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Kodowanie załącznika:</p><p>zazwyczaj nie ma powodu niczego zmieniać, "
+"ponieważ %1 użyje domyślnego kodowania, zależnego od typu MIME. Czasami "
+"możesz jednak znacząco zmniejszyć wielkość wiadomości, np. jeśli plik "
+"PostScript nie zawiera danych binarnych, a jedynie sam tekst. Wtedy wybranie "
+"\"quoted-printable\" zamiast domyślnego \"base64\" zmniejszy wiadomość o ok. "
+"25%.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9802,21 +9658,17 @@ msgstr "Sugeruj &automatyczne wyświetlanie"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Włącz tę opcję, jeśli chcesz zasugerować adresatowi wyświetlenie tego "
+"<qt><p>Włącz tę opcję, jeśli chcesz zasugerować adresatowi wyświetlenie tego "
 "załącznika bezpośrednio w treści wiadomości (zamiast jako zwykłej ikony "
-"załącznika).</p> "
-"<p>Technicznie jest to realizowane przez ustawienie pola <em>"
-"Content-Disposition</em> w nagłówku tej części wiadomości na \"inline\" zamiast "
-"domyślnego \"attachment\".</p></qt>"
+"załącznika).</p> <p>Technicznie jest to realizowane przez ustawienie pola "
+"<em>Content-Disposition</em> w nagłówku tej części wiadomości na \"inline\" "
+"zamiast domyślnego \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9824,13 +9676,11 @@ msgstr "Podpisz tę &część"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Włącz tę wiadomość, jeśli chcesz podpisać tę część wiadomości.</p> "
+"<qt><p>Włącz tę wiadomość, jeśli chcesz podpisać tę część wiadomości.</p> "
 "<p>Część będzie podpisana kluczem związanym z aktualną tożsamością.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9839,13 +9689,11 @@ msgstr "Za&szyfruj tę część"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Włącz tę opcję, jeśli chcesz zakodować tę część wiadomości.</p> "
-"<p>Ta część będzie zakodowana dla adresatów tej wiadomości.</p></qt>"
+"<qt><p>Włącz tę opcję, jeśli chcesz zakodować tę część wiadomości.</p> <p>Ta "
+"część będzie zakodowana dla adresatów tej wiadomości.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9859,16 +9707,13 @@ msgstr "Filtr POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Filtrowane wiadomości na koncie POP: <b>%1</b>"
-"<p>Wyświetlone wiadomości przekraczają maksymalny dopuszczalny rozmiar dla tego "
-"konta."
-"<br>Możesz wybrać, co chcesz z nimi zrobić, wybierając odpowiedni przycisk."
+"Filtrowane wiadomości na koncie POP: <b>%1</b><p>Wyświetlone wiadomości "
+"przekraczają maksymalny dopuszczalny rozmiar dla tego konta.<br>Możesz "
+"wybrać, co chcesz z nimi zrobić, wybierając odpowiedni przycisk."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10013,7 +9858,8 @@ msgstr "&Wewnętrznie"
 
 #: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
-msgstr "Pokaż wszystkie załączniki bezpośrednio w wiadomości (jeśli to możliwe)"
+msgstr ""
+"Pokaż wszystkie załączniki bezpośrednio w wiadomości (jeśli to możliwe)"
 
 #: kmreaderwin.cpp:565
 msgid ""
@@ -10117,40 +9963,39 @@ msgstr "Klient poczty dla TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Pobieranie zawartości foldera</h2>"
-"<p>Proszę czekać...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Pobieranie zawartości foldera</h2><p>Proszę "
+"czekać...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail jest w trybie offline. Kliknij <a href=\"kmail:goOnline\">tutaj</a>"
-", by przejść w tryb online...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail jest w trybie offline. "
+"Kliknij <a href=\"kmail:goOnline\">tutaj</a>, by przejść w tryb online...</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10158,16 +10003,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Witamy w programie KMail %1</h2> "
-"<p>KMail jest programem pocztowym dla TDE. Jest on w pełni zgodny z pocztowymi "
-"standardami Internetu, takimi jak MIME, SMTP, POP3 oraz IMAP.</p>\n"
-"<ul>"
-"<li>KMail ma wiele możliwości, opisanych szczegółowo <a href=\"%2\">"
-"w dokumentacji</a></li>\n"
-"<li>Na <a href=\"%3\">stronie domowej programu KMail</a> "
-"można znaleźć informacje o nowych wersjach programu</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Witamy w programie KMail %1</h2> <p>KMail jest "
+"programem pocztowym dla TDE. Jest on w pełni zgodny z pocztowymi standardami "
+"Internetu, takimi jak MIME, SMTP, POP3 oraz IMAP.</p>\n"
+"<ul><li>KMail ma wiele możliwości, opisanych szczegółowo <a href=\"%2\">w "
+"dokumentacji</a></li>\n"
+"<li>Na <a href=\"%3\">stronie domowej programu KMail</a> można znaleźć "
+"informacje o nowych wersjach programu</li></ul>\n"
 "%8\n"
-"<p>Ważniejsze zmiany porównaniu z wersją %4, która była częścią TDE %5):</p>\n"
+"<p>Ważniejsze zmiany porównaniu z wersją %4, która była częścią TDE %5):</"
+"p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10181,13 +10026,13 @@ msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Proszę poświęcić chwilę, by skonfigurować KMaila (okno "
-"Ustawienia-&gt;Konfiguracja).\n"
+"<p>Proszę poświęcić chwilę, by skonfigurować KMaila (okno Ustawienia-&gt;"
+"Konfiguracja).\n"
 "Trzeba konieczne utworzyć przynajmniej jedną tożsamość oraz jedno konto "
 "pocztowe</p>\n"
 
@@ -10196,8 +10041,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Ważne zmiany</span> "
-"(w porównaniu z wersją %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Ważne zmiany</span> (w "
+"porównaniu z wersją %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10227,12 +10072,15 @@ msgstr "Pokaż załącznik: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Załącznik zawiera dane binarne. Próba pokazania pierwszego znaku.]\n"
-"[KMail: Załącznik zawiera dane binarne. Próba pokazania pierwszych %n znaków.]\n"
-"[KMail: Załącznik zawiera dane binarne. Próba pokazania pierwszych %n znaków.]"
+"[KMail: Załącznik zawiera dane binarne. Próba pokazania pierwszych %n "
+"znaków.]\n"
+"[KMail: Załącznik zawiera dane binarne. Próba pokazania pierwszych %n "
+"znaków.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10255,11 +10103,15 @@ msgid "Open Attachment?"
 msgstr "Otworzyć załącznik?"
 
 #: kmreaderwin.cpp:2804
-msgid "Deleting an attachment might invalidate any digital signature on this message."
+msgid ""
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Usunięcie załącznika może uszkodzić cyfrowy podpis tej wiadomości."
 
 #: kmreaderwin.cpp:2860
-msgid "Modifying an attachment might invalidate any digital signature on this message."
+msgid ""
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Modyfikacja załącznika może uszkodzić cyfrowy podpis tej wiadomości."
 
 #: kmreaderwin.cpp:2956
@@ -10280,6 +10132,58 @@ msgstr "(dopasowuj dowolną z poniższych)"
 msgid "(match all of the following)"
 msgstr "(dopasowuj wszystkie poniższe)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "przeczytana"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "stara"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "usunięta"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "odpowiedziana"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "przekazana"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "zakolejkowana"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "wysłana"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "śledzona"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "ignorowana"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "nie-spam"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "do zrobienia"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "zawiera załącznik"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Cała wiadomość"
@@ -10354,25 +10258,25 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Przeniesienie wysłanej wiadomości \"%1\" z folderu \"do wysłania\" do folderu "
-"\"wysłane\" nie powiodło się.\n"
+"Przeniesienie wysłanej wiadomości \"%1\" z folderu \"do wysłania\" do "
+"folderu \"wysłane\" nie powiodło się.\n"
 "Możliwe przyczyny to brak miejsca na dysku lub niewystarczające uprawnienia. "
 "Proszę spróbować usunąć przyczynę i przenieść wiadomość ręcznie."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Nie można wysyłać wiadomości bez podania adresu nadawcy.\n"
-"Proszę ustawić adres e-mail nadawcy dla tożsamości \"%1\" w sekcji Tożsamości "
-"okienka konfiguracyjnego i spróbować ponownie."
+"Proszę ustawić adres e-mail nadawcy dla tożsamości \"%1\" w sekcji "
+"Tożsamości okienka konfiguracyjnego i spróbować ponownie."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10398,9 +10302,10 @@ msgstr "Inicjalizacja procesu wysyłania..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
-msgstr "Wybrałeś wysyłanie całej poczty do wysłania bez szyfrowania. Kontynuować? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
+msgstr ""
+"Wybrałeś wysyłanie całej poczty do wysłania bez szyfrowania. Kontynuować? "
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10424,8 +10329,9 @@ msgstr "Nie powiodło się wysłanie (niektórych) wiadomości z kolejki."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10442,22 +10348,17 @@ msgstr "Wysyłanie przerwane."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Wysyłanie nie powiodło się:</p>"
-"<p>%1</p>"
-"<p>Wiadomość pozostanie w folderze \"do wysłania\" dopóki problem (np. błędny "
-"adres) nie zostanie rozwiązany lub jej stamtąd nie usuniesz.Zwróć uwagę, że "
-"inne wiadomości też nie będą wysłane, dopóki wiadomość ta jest w folderze \"do "
-"wysłania\"</p> "
-"<p>Użyto następującej metody wysyłania:</p>"
-"<p>%2</p> "
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Wysyłanie nie powiodło się:</p><p>%1</p><p>Wiadomość pozostanie w "
+"folderze \"do wysłania\" dopóki problem (np. błędny adres) nie zostanie "
+"rozwiązany lub jej stamtąd nie usuniesz.Zwróć uwagę, że inne wiadomości też "
+"nie będą wysłane, dopóki wiadomość ta jest w folderze \"do wysłania\"</p> "
+"<p>Użyto następującej metody wysyłania:</p><p>%2</p> "
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10475,8 +10376,9 @@ msgstr "&Przerwij wysyłanie"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10522,46 +10424,46 @@ msgstr "Ten serwer SMTP wymaga podania nazwy użytkownika i hasła."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "Wygląda na to, że %1 już działa na innym ekranie na tym komputerze. "
-"Uruchomienie więcej niż jednej kopii %2 może spowodować utratę wiadomości. Nie "
-"powinieneś uruchamiać %1 na tym komputerze, chyba, że jesteś pewien, że nie "
-"jest jeszcze uruchomione."
+"Uruchomienie więcej niż jednej kopii %2 może spowodować utratę wiadomości. "
+"Nie powinieneś uruchamiać %1 na tym komputerze, chyba, że jesteś pewien, że "
+"nie jest jeszcze uruchomione."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "Wygląda na to, że %1 już działa w na innym ekranie na tym komputerze. "
-"Uruchomienie %1 i %2 w tym samym czasie może spowodować utratę wiadomości. Nie "
-"powinieneś uruchamiać %2 na tym komputerze, chyba, że jesteś pewien, że %1 nie "
-"jest uruchomione."
+"Uruchomienie %1 i %2 w tym samym czasie może spowodować utratę wiadomości. "
+"Nie powinieneś uruchamiać %2 na tym komputerze, chyba, że jesteś pewien, że "
+"%1 nie jest uruchomione."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "Wygląda na to, że %1 już działa na komputerze %2. Uruchomienie więcej niż "
-"jednej kopii %1 może spowodować utratę wiadomości. Nie powinieneś uruchamiać %1 "
-"na tym komputerze, chyba, że jesteś pewien, że nie jest jeszcze uruchomione na "
-"%2."
+"jednej kopii %1 może spowodować utratę wiadomości. Nie powinieneś uruchamiać "
+"%1 na tym komputerze, chyba, że jesteś pewien, że nie jest jeszcze "
+"uruchomione na %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "Wygląda na to, że %1 już działa na komputerze %3. Uruchomienie %1 i %2 w tym "
-"samym czasie może spowodować utratę wiadomości. Nie powinieneś uruchamiać %2 na "
-"tym komputerze, chyba, że jesteś pewien, że %1 nie działa na %3."
+"samym czasie może spowodować utratę wiadomości. Nie powinieneś uruchamiać %2 "
+"na tym komputerze, chyba, że jesteś pewien, że %1 nie działa na %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10572,6 +10474,10 @@ msgstr "Uruchom %1"
 msgid "Exit"
 msgstr "Zakończ"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nowe wiadomości w"
@@ -10599,15 +10505,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Portfel nie jest dostępny. Użycie portfela do zarządzania hasłami jest "
 "zalecane.\n"
 "KMail może przechowywać Twoje hasło SMTP w pliku konfiguracyjnym. Hasło jest "
-"przechowywane w postaci zaszyfrowanej, ale nie jest ono bezpieczne, jeśli ktoś "
-"uzyska dostęp do Twoich plików konfiguracyjnych.\n"
+"przechowywane w postaci zaszyfrowanej, ale nie jest ono bezpieczne, jeśli "
+"ktoś uzyska dostęp do Twoich plików konfiguracyjnych.\n"
 "Czy przechować hasło dla konta \"%1\" w pliku konfiguracyjnym?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10663,7 +10570,8 @@ msgid "The domain name or numerical address of the SMTP server."
 msgstr "Nazwa lub adres numeryczny serwera SMTP."
 
 #: kmtransport.cpp:406
-msgid "The port number that the SMTP server is listening on. The default port is 25."
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
 msgstr "Numer portu, używanego przez serwer SMTP. Domyślna wartość to 25."
 
 #: kmtransport.cpp:411
@@ -10684,8 +10592,8 @@ msgstr "Serwer wymaga &uwierzytelniania"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Wybierz tę opcję, jeśli Twój serwer SMTP wymaga uwierzytelniania przed "
 "przyjęciem poczty. Jest to znane jako \"Authenticated SMTP\" lub po prostu "
@@ -10709,22 +10617,22 @@ msgstr "Wyślij &własną nazwę swojego komputera"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Wybierz tę opcję, jeśli chcesz, by KMail używał wybranej przez Ciebie nazwy "
-"podczas tożsamości dla serwera pocztowego."
-"<p>Jest to użyteczne, gdy nazwa Twojego komputera nie jest ustawiona poprawnie, "
-"lub gdy chcesz ukryć nazwę swojego komputera."
+"podczas tożsamości dla serwera pocztowego.<p>Jest to użyteczne, gdy nazwa "
+"Twojego komputera nie jest ustawiona poprawnie, lub gdy chcesz ukryć nazwę "
+"swojego komputera."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
 msgstr "Nazwa &komputera:"
 
 #: kmtransport.cpp:489
-msgid "Enter the hostname KMail should use when identifying itself to the server."
+msgid ""
+"Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
 "Podaj nazwę, której KMail ma użyć przy identyfikowaniu tego komputera dla "
 "serwera."
@@ -10747,9 +10655,11 @@ msgstr "Można używać tylko plików lokalnych."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
-msgstr "Pole serwera nie może być puste. Proszę podać nazwę lub adres IP serwera SMTP."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
+msgstr ""
+"Pole serwera nie może być puste. Proszę podać nazwę lub adres IP serwera "
+"SMTP."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10761,10 +10671,10 @@ msgstr "Błąd podczas wyświetlania folderu %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Lokalne odsubskrybowanie z folderów spowoduje utratę wszelkich informacji "
 "lokalne o tych folderach. Foldery nie zostaną zmienione na serwerze. Jeśli "
@@ -10987,35 +10897,27 @@ msgstr "&Edytuj wiadomość"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Niepoprawne informacje strukturalne zwrócone przez wtyczkę szyfrowania. Być "
-"może wtyczka jest uszkodzona.</p>"
-"<p>Proszę skontaktować się z administratorem systemu.</p></qt>"
+"<qt><p>Niepoprawne informacje strukturalne zwrócone przez wtyczkę "
+"szyfrowania. Być może wtyczka jest uszkodzona.</p><p>Proszę skontaktować się "
+"z administratorem systemu.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Nie znaleziono aktywnej wtyczki szyfrującej i nie udało się uruchomić "
-"wbudowanej obsługi PGP.</p> "
-"<p>Możesz poprawić to na dwa sposoby: "
-"<ul>"
-"<li><em>albo</em> włączyć wtyczkę w oknie Ustawienia->Konfiguracja KMail->"
-"Wtyczki,</li>"
-"<li><em>albo</em> podać tradycyjne ustawienia OpenPGP w oknie Tożsamość->"
-"Zaawansowane.</li></ul></p>"
+"wbudowanej obsługi PGP.</p> <p>Możesz poprawić to na dwa sposoby: "
+"<ul><li><em>albo</em> włączyć wtyczkę w oknie Ustawienia->Konfiguracja KMail-"
+">Wtyczki,</li><li><em>albo</em> podać tradycyjne ustawienia OpenPGP w oknie "
+"Tożsamość->Zaawansowane.</li></ul></p>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11027,9 +10929,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
-msgstr "Rozszerzenie Chiasmus nie obsługuje funkcji \"x-encrypt\". Proszę zgłosić błąd."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
+msgstr ""
+"Rozszerzenie Chiasmus nie obsługuje funkcji \"x-encrypt\". Proszę zgłosić "
+"błąd."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11045,16 +10949,16 @@ msgstr "Błąd szyfrowania Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Niespodziewana wartość zwrócona przez rozszerzenie Chiasmus. Funkcja "
-"\"x-encrypt\" nie zwróciła tablicy bajtów. Proszę zgłosić ten błąd."
+"Niespodziewana wartość zwrócona przez rozszerzenie Chiasmus. Funkcja \"x-"
+"encrypt\" nie zwróciła tablicy bajtów. Proszę zgłosić ten błąd."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Wewnętrzny format szyfrowania OpenPGP nie dopuszcza szyfrowania lub "
@@ -11079,8 +10983,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Zgodnie z ustawieniami podpisu dla tego adresata, powinieneś zostać zapytany o "
-"podpisanie tej wiadomości.\n"
+"Zgodnie z ustawieniami podpisu dla tego adresata, powinieneś zostać zapytany "
+"o podpisanie tej wiadomości.\n"
 "Podpisać ją?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11167,8 +11071,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Zgodnie z ustawieniami szyfrowania dla tego adresata, powinieneś zostać "
@@ -11205,12 +11109,13 @@ msgstr "&Nie szyfruj"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Wybrałeś zaszyfrowanie tej wiadomości i wysłanie zaszyfrowanej kopii do siebie, "
-"ale dla tej tożsamości nie skonfigurowano poprawnych zaufanych kluczy "
-"szyfrujących."
+"Wybrałeś zaszyfrowanie tej wiadomości i wysłanie zaszyfrowanej kopii do "
+"siebie, ale dla tej tożsamości nie skonfigurowano poprawnych zaufanych "
+"kluczy szyfrujących."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11219,8 +11124,8 @@ msgstr "Wysłać niezaszyfrowaną?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Niektóre części tej wiadomości nie będą zaszyfrowane.\n"
@@ -11248,61 +11153,55 @@ msgstr "Szyfruj &wszystkie części wiadomości"
 msgid "Unencrypted Message Warning"
 msgstr "Ostrzeżenie o niezaszyfrowanej wiadomości"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Błąd: wtyczka szyfrująca nie zwróciła żadnych zaszyfrowanych danych.</p> "
-"<p>Proszę zgłosić ten błąd:"
-"<br>%2</p></qt>"
+"<qt><p>Błąd: wtyczka szyfrująca nie zwróciła żadnych zaszyfrowanych danych.</"
+"p> <p>Proszę zgłosić ten błąd:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Nie wszystkie znaki pasują do wybranego kodowania."
-"<br>"
-"<br>Mimo wszystko wysłać wiadomość?</qt>"
+"<qt>Nie wszystkie znaki pasują do wybranego kodowania.<br><br>Mimo wszystko "
+"wysłać wiadomość?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Niektóre znaki będą utracone"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Usuń niezgodne znaki"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Zmień kodowanie"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Nie można podpisać tej wiadomości - nie znaleziono prawidłowych kluczy. To "
 "nie powinno się zdarzyć, proszę zgłosić raport o błędzie."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Nie można podpisać tej wiadomości - wybrana wtyczka nie obsługuje podpisów. To "
-"nie powinno się zdarzyć, proszę zgłosić raport o błędzie."
+"Nie można podpisać tej wiadomości - wybrana wtyczka nie obsługuje podpisów. "
+"To nie powinno się zdarzyć, proszę zgłosić raport o błędzie."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Dziennik audytu GnuPG dla operacji podpisywania"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
@@ -11310,27 +11209,28 @@ msgstr ""
 "Podpisywanie nie powiodło się. Proszę sprawdzić, czy program gpg-agent jest "
 "uruchomiony."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Nie można zaszyfrować tej wiadomości - wybrana wtyczka nie obsługuje "
 "szyfrowania. To nie powinno się zdarzyć, proszę zgłosić raport o błędzie."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Dziennik audytu GnuPG dla operacji szyfrowania"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Nie można podpisać i zaszyfrować tej wiadomości - wybrana wtyczka nie obsługuje "
-"jednoczesnego podpisywania i szyfrowania. To nie powinno się zdarzyć, proszę "
-"zgłosić raport o błędzie."
+"Nie można podpisać i zaszyfrować tej wiadomości - wybrana wtyczka nie "
+"obsługuje jednoczesnego podpisywania i szyfrowania. To nie powinno się "
+"zdarzyć, proszę zgłosić raport o błędzie."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11351,10 +11251,10 @@ msgstr "&Format skrzynki pocztowej:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Wybierz, czy wiadomości z tego folderu mają być przechowywane w osobnych "
 "plikach (maildir), czy jako jeden plik (mbox). KMail domyślnie używa formatu "
@@ -11367,12 +11267,12 @@ msgstr "&Zawartość folderu:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Wybierz, czy folder ma służyć do przechowywania wiadomości, czy też do "
-"przechowywania danych grupowych, takich jak zadania czy notatki. Domyślnie są "
-"to wiadomości i zwykle nie ma powodu tego zmieniać."
+"przechowywania danych grupowych, takich jak zadania czy notatki. Domyślnie "
+"są to wiadomości i zwykle nie ma powodu tego zmieniać."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11392,7 +11292,8 @@ msgstr "Nie podano nazwy"
 
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
-msgstr "<qt>Nie można utworzyć folderu <b>%1</b>, taki folder już istnieje.</qt>"
+msgstr ""
+"<qt>Nie można utworzyć folderu <b>%1</b>, taki folder już istnieje.</qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -11410,8 +11311,7 @@ msgstr "Różne wyniki dla podpisów"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Wtyczka szyfrująca nie zwróciła odszyfrowanych danych."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stan: "
 
@@ -11440,8 +11340,8 @@ msgstr "Nie znaleziono wtyczki %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Wiadomość jest podpisana, ale nie można sprawdzić poprawności podpisu.<br /> "
 "Powód: %1"
@@ -11477,22 +11377,22 @@ msgstr "Wtyczka szyfrująca \"%1\" nie może odszyfrować wiadomości."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Uwaga:</b> Ta wiadomość HTML może zawierać zewnętrzne odnośniki do obrazków "
-"itd. Ze względów bezpieczeństwa te zewnętrzne odnośniki nie zostały wczytane. "
-"Jeżeli ufasz nadawcy wiadomości, możesz wczytać odnośniki, <a "
-"href=\"kmail:loadExternal\">klikając tutaj</a>."
+"<b>Uwaga:</b> Ta wiadomość HTML może zawierać zewnętrzne odnośniki do "
+"obrazków itd. Ze względów bezpieczeństwa te zewnętrzne odnośniki nie zostały "
+"wczytane. Jeżeli ufasz nadawcy wiadomości, możesz wczytać odnośniki, <a href="
+"\"kmail:loadExternal\">klikając tutaj</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Uwaga:</b> To jest wiadomość HTML. Ze względów bezpieczeństwa wyświetlany "
 "jest tylko czysty kod HTML. Jeżeli ufasz nadawcy wiadomości, możesz obejrzeć "
@@ -11503,8 +11403,8 @@ msgid ""
 "This message is a <i>Toltec</i> Groupware object, it can only be viewed with "
 "Microsoft Outlook in combination with the Toltec connector."
 msgstr ""
-"Ta wiadomość to obiekt <i>Toltec</i> Groupware może być przeglądana tylko "
-"w Microsoft Outlook z programem Toltec connector."
+"Ta wiadomość to obiekt <i>Toltec</i> Groupware może być przeglądana tylko w "
+"Microsoft Outlook z programem Toltec connector."
 
 #: objecttreeparser.cpp:1239
 msgid "Show Raw Message"
@@ -11746,8 +11646,8 @@ msgstr "zapisane: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Używany do podpisywania %1 nie zawiera adresu e-mail, zatem porównanie z "
 "adresem nadawcy %2 nie jest możliwe."
@@ -11865,10 +11765,11 @@ msgstr "Komunikat o błędzie Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Twój serwer POP3 (konto: %1) nie obsługuje polecenia UIDL. Polecenie to jest "
 "potrzebne, by wiarygodnie ustalić, które z wiadomości na serwerze odebrano "
@@ -11894,7 +11795,9 @@ msgstr ""
 "Pobrano %n wiadomości z %1. Przerywanie pobierania..."
 
 #: popaccount.cpp:905
-msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+msgid ""
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Odbieranie wiadomości %1 z %2 (%3 z %4 KB) z konta %5@%6 (%7 KB pozostaje na "
 "serwerze)."
@@ -11913,1897 +11816,16 @@ msgstr "Nieprawidłowa odpowiedź od serwera"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Niestety, Twój serwer nie obsługuje polecenia TOP. W związku z tym niemożliwe "
-"jest pobranie samych nagłówków wiadomości przed odebraniem całych wiadomości."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Idź"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "F&older"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Wiado&mość"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Specjalna odpowiedź"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Przekazywanie"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Pasek narzędzi HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Podpisywanie"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automatycznie &podpisuj wiadomości"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Jeśli ta opcja jest włączona, wszystkie wysyłane wiadomości będą domyślnie "
-"podpisywane. Oczywiście można wyłączyć podpisywanie oddzielnie dla każdej "
-"wiadomości."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Szyfrowanie"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr "Podczas szyfrowania wiadomości zawsze &szyfruj je także moim kluczem"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Jeśli ta opcja jest włączona, wszystkie wiadomości/pliki będą domyślnie "
-"szyfrowane nie tylko kluczem adresata, ale i Twoim. Pozwoli Ci to na późniejsze "
-"odszyfrowanie wiadomości/pliku. Zwykle jest to dobry pomysł."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Po&każ podpisany/zaszyfrowany tekst po napisaniu"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Jeśli ta opcja jest włączona, napisany/zaszyfrowany tekst będzie wyświetlony w "
-"osobnym oknie, co pozwoli Ci sprawdzić jego wygląd przed wysłaniem. Jest to "
-"dobry pomysł, jeśli sprawdzasz funkcjonowanie szyfrowania w swoim systemie."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Zapisz wiadomości zaszy&frowane"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Włącz, by zapisywać wiadomości zaszyfrowane"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Przechowuj wiadomości zaszyfrowane</h1>\n"
-"Jeśli ta opcja jest włączona, wysyłane wiadomości są przechowywane w takiej "
-"postaci, w jakiej zostały wysłane. Nie jest to zalecane, ponieważ jeśli "
-"certyfikat utraci ważność, stracisz dostęp do wiadomości.\n"
-"<p>\n"
-"Lokalne przepisy mogą wymagać od Ciebie włączenia tej opcji. W razie "
-"wątpliwości skontaktuj się z administratorem systemu.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Zawsze pokaż &klucze szyfrujące do potwierdzenia"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Jeśli ta opcja jest włączona, przed zaszyfrowaniem wyświetlona zostanie lista "
-"kluczy szyfrujących do wyboru. Jeśli opcja jest wyłączona, program pokaże "
-"okienko jedynie wtedy, kiedy znalezienie odpowiedniego klucza nie będzie "
-"możliwe, albo kiedy będzie więcej kluczy możliwych do użycia ."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automatycznie &szyfruj wiadomości, jeśli to możliwe"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Jeśli ta opcja jest włączona, wszystkie wysyłane wiadomości będą domyślnie "
-"szyfrowane, o ile to tylko możliwe. Oczywiście można wyłączyć szyfrowanie "
-"oddzielnie dla każdej wiadomości."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nigdy nie podpisuj/szyfruj wiadomości &roboczych"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Jak to działa?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, no-c-format
-msgid "To:"
-msgstr "Do:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, no-c-format
-msgid "CC:"
-msgstr "DW:"
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Uniwersalny"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Odpowiedź"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Odpowiedź wszystkim"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Przekazywanie"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Skrót:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Typ szablonu:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Właściwości folderu"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Folder przechowuje listę dyskusyjną"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Adres listy:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Zwykła:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Nieprzeczytana:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Usuwanie starych wiadomości"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Usuń &starą pocztę po:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Usuń &przeczytane wiadomości"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Usuń &po:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Usuń &nieprzeczytane wiadomości"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "dniach"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "tygodniach"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "miesiącach"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Tożsamość nadawcy:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Format przechowywania:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Wygląd listy:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Sprawdź certyfikaty przy pomocy CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Jeśli ta opcja jest włączona, certyfikaty S/MIME będą sprawdzane za pomocą list "
-"unieważnień certyfikatów (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Sprawdź certyfikaty w sieci (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Jeśli ta opcja jest włączona, certyfikaty S/MIME będą sprawdzane w sieci za "
-"pomocą protokołu aktualnego stanu certyfikatów (OCSP). Proszę wpisać adres "
-"dostawcy OCSP poniżej."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Sprawdzanie certyfikatów w sieci"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Adres dostawcy OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Tu należy wpisać adres serwera przeprowadzającego sprawdzanie certyfikatów w "
-"sieci (OCSP). Adresy takie zwykle zaczynają się od http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Podpis dostawcy OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignoruj URL certyfikatów"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Nie sprawdzaj polityki certyfikatów"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Domyślnie GnuPG używa pliku ~/.gnupg/policies.txt do sprawdzenia, czy dana "
-"polityka certyfikatów jest dopuszczalna. Jeśli ta opcja jest włączona, polityki "
-"nie będą sprawdzane."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nigdy nie sprawdzaj CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Jeśli ta opcja jest włączona, listy unieważnień certyfikatów (CRL) nie będą "
-"używane do sprawdzania poprawności certyfikatów S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Pobierz brakującą informację o wystawcy certyfikatu"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Jeśli ta opcja jest włączona, brakujące informacje o wystawcy certyfikatu będą "
-"pobierane (dotyczy to obu metod sprawdzania, CRL i OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Żądania HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Nie realizuj żadnych żądań HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Całkowicie wyłącza użycie HTTP dla S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Użyj tego pośrednika dla żądań HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Użyj systemowego pośrednika HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Jeśli ta opcja jest włączona, we wszystkich żądaniach HTTP używane będzie "
-"pośrednik HTTP widoczny po prawej (pochodzący ze zmiennej środowiskowej "
-"http_proxy)."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Podaj adres lokalnego pośrednika HTTP, który ma być używany do żądań HTTP "
-"związanych z S/MIME. Składnia to serwer:port, na przykład "
-"mojposrednik.nigdzie.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignoruj HTTP punktów dystrybucyjnych CRL dla certyfikatów"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Kiedy poszukiwany jest adres CRL, testowany certyfikat zwykle zawiera adresy "
-"URL prowadzące do punktów dystrybucji CRL (list unieważnień certyfikatów). "
-"Używany jest pierwszy znaleziony URL. Jeśli ta opcja jest włączona, wszystkie "
-"adresy używające HTTP zostaną zignorowane przy poszukiwaniu odpowiedniego "
-"punktu."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Żądania LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Nie realizuj żadnych żądań LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Całkowicie wyłącza użycie LDAP dla S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignoruj LDAP dla punktów dystrybucji CRL dla certyfikatów"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Kiedy poszukiwany jest adres CRL, testowany certyfikat zwykle zawiera adresy "
-"URL prowadzące do punktów dystrybucji CRL (list unieważnień certyfikatów). "
-"Używany jest pierwszy znaleziony URL. Jeśli ta opcja jest włączona, wszystkie "
-"adresy używające LDAP zostaną zignorowane przy poszukiwaniu odpowiedniego "
-"punktu."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Główny serwer dla żądań LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Podanie tu serwera LDAP spowoduje, że wszelkie żądania LDAP będą kierowane "
-"najpierw do niego. Dokładniej, ustawienie to spowoduje zignorowanie wszelkich "
-"informacji o serwerach i portach, będących częścią URL dla LDAP. Inne serwery "
-"będą używany tylko wówczas, gdy połączenie z wybranym serwerem nie powiedzie "
-"się.\n"
-"Składnia to \"serwer\" lub \"serwer:port\". Jeśli nie podano portu, przyjmowana "
-"jest wartość 389 (standard LDAP)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Dodaj fragment"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Dodaj"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Fragment:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Grupa:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Ustawienia fragmentu"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Dymki narzędzi"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Pokaż tekst  w fragmentu w &dymku"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid "Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "Określa czy zostanie pokazany dymek z tekstem z założonego wiersza"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Zmienne"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Metoda wprowadzania dla zmiennych"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Jeden dialog dla każdej zmiennej we fragmencie"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Okno dialogowe zostanie pokazane dla każdej zmiennej fragmentu z osobna"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Jedno okno dialogowe dla wszystkich zmiennych we fragmencie"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr "Dla wszystkich zmiennych we fragmencie będzie pokazane jedno okno dialogowe"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Ogranicznik:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Konfiguracja szablonów"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Odpowiedz nadawcy"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Odpowiedz wszystkim/na listę"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Przekaż wiadomość"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "&Ostrzegaj przed wysłaniem niepodpisanej wiadomości"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Włącz ostrzeżenie przed wysłaniem niepodpisanej wiadomości."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj przed wysłaniem niepodpisanych wiadomości</h1>\n"
-"Jeśli ta opcja jest włączona, zostaniesz ostrzeżony przed wysłaniem "
-"niepodpisanej wiadomości lub jej części."
-"<p>\n"
-"Dla zwiększenia bezpieczeństwa zalecane jest pozostawienie tej opcji "
-"włączonej.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Ostrzegaj przed wysłaniem niezaszyfrowanej wiadomości"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Włącza ostrzeżenie przed wysłaniem niezaszyfrowanej wiadomości.wiadomości."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj przed wysłaniem niepodpisanych wiadomości</h1>\n"
-"Jeśli ta opcja jest włączona, będziesz ostrzegany przed próbą wysłania "
-"niezaszyfrowanej wiadomości lub jej części."
-"<p>\n"
-"Dla zwiększenia bezpieczeństwa zalecane jest pozostawienie tej opcji "
-"włączonej.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Ostrzegaj, jeśli w certyfikacie brak adresu &odbiorcy"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Włącz ostrzeżenie przed brakującym adresem e-mail"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj, jeśli w certyfikacie brak adresu adresata</h1>\n"
-"Jeśli ta opcja jest włączona, a w certyfikacie użytym do szyfrowania brak "
-"adresu adresata, zostanie wyświetlone ostrzeżenie.\n"
-"<p>\n"
-"Dla zwiększenia bezpieczeństwa zalecane jest pozostawienie tej opcji "
-"włączonej.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Ostrzegaj, jeśli certyfikaty/klucze niedługo utracą ważność (konfiguracja "
-"poniżej)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Do podpisywania"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Do szyfrowania"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dni"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Podaj liczbę dni"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj, jeśli certyfikat podpisu traci ważność</h1>\n"
-"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat podpisu utraci ważność w "
-"ciągu mniejszej liczby dni niż podana tutaj."
-"<p>\n"
-"Zalecane ustawienie SPHINX to 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj, jeśli certyfikat szyfrowania traci ważność</h1>\n"
-"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat szyfrowania utraci ważność w "
-"ciągu mniejszej liczby dni niż podana tutaj.\n"
-"<p>\n"
-"Zalecane ustawienie SPHINX to 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj, jeśli certyfikat w łańcuchu traci ważność</h1>\n"
-"Ostrzeżenie zostanie wyświetlone, jeśli dowolny certyfikat w łańcuchu utraci "
-"ważność w ciągu mniejszej liczby dni niż podana tutaj.\n"
-"<p>\n"
-"Zalecane ustawienie SPHINX to 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj, jeśli certyfikat CA traci ważność</h1>\n"
-"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat CA utraci ważność w ciągu "
-"mniejszej liczby dni niż podana tutaj.\n"
-"<p>\n"
-"Zalecane ustawienie SPHINX to 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ostrzegaj, jeśli certyfikat podstawowy traci ważność</h1>\n"
-"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat podstawowy utraci ważność w "
-"ciągu mniejszej liczby dni niż podana tutaj.\n"
-"<p>\n"
-"Zalecane ustawienie SPHINX to 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Dla certyfikatów podstawowych:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Szukaj pośrednich certyfikatów CA:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Dla certyfikatów/kluczy użytkownika:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Ponownie włącz wszystkie ostrzeżenia \"Nie pytaj więcej\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Zawartość szablonu"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Skrót szablonu"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Typ szablonu"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Wyślij wiadomości z kolejki przy sprawdzaniu poczty"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Czy KMail ma wysyłać wszystkie wiadomości z folderu \"Do wysłania\" przy "
-"ręcznym lub automatycznym sprawdzaniu poczty, czy też automatyczne wysyłanie ma "
-"być w ogóle wyłączone.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Automatycznie przenoś niezsynchronizowane wiadomości z folderów o "
-"niewystarczających prawach dostępu"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Jeśli w folderze znajdują się nowe wiadomości, które nie zostały wysłane na "
-"serwer, ale brak wystarczających praw dostępu do folderu, żeby je wysłać, "
-"wiadomości te zostaną automatycznie przeniesione do folderu "
-"zgubione+znalezione."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Zezwalaj na flagi lokalne w folderach tylko do odczytu"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"To ustawienie pozwala administratorowi na ustalenie minimalnego ograniczenia "
-"między dwoma sprawdzeniami poczty.\"\n"
-"           \"Użytkownik nie będzie mógł podać wartości mniejszej niż podana "
-"tutaj."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Ostatnio wybrany folder w oknie wyboru folderów."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Ignoruj maskę użytkownika (umask) i użyj wartości \"do czytania i pisania tylko "
-"dla użytkownika\""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Tryb wyświetlania ikony na tacce systemowej"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Zamknij program po zamknięciu głównego okna, nawet jeśli ikona w tacce "
-"systemowej jest aktywna."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Szczegółowe powiadamianie o nowej poczcie"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Jeśli ta opcja jest włączona, w zawiadomieniu o nadejściu nowej poczty "
-"wyświetlana będzie informacja o liczbie nowych wiadomości w każdym folderze. W "
-"przeciwnym razie wyświetlona zostanie jedynie informacja \"Nadeszła nowa "
-"wiadomość\"."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Podaj &edytor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Użyj edytora zewnętrznego zamiast wbudowanego"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"Próg kiedy należy ostrzec użytkownika kiedy folder zbliża się do limitu "
-"wielkości."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Włącz funkcje pracy grupowej"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Przeformatuj nagłówki Od:/Do: w odpowiedzi na zaproszenia"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Implementacja iCalendar w Microsoft Outlook ma wiele wad. Ta opcja służy do "
-"obejścia jednej z nich. Jeśli masz problemy otrzymywaniem odpowiedzi w "
-"Outlooku, włącz tę opcję."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Wysyłaj zaproszenia grupowe w treści wiadomości"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Implementacja iCalendar w Microsoft Outlook ma wiele wad. Ta opcja służy do "
-"obejścia jednej z nich. Jeśli masz problemy odczytaniem zaproszeń w Outlooku, "
-"włącz tę opcję."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Zgodne z Exchange nazywanie zaproszeń"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook używany w połączeniu z serwerem Microsoft Exchange, ma "
-"problem ze zrozumieniem zgodnych ze standardami wiadomości e-mail komunikacji "
-"grupowej. Włącz tę opcję, żeby wysyłać zaproszenia grupowe w sposób zrozumiały "
-"dla Microsoft Exchange."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-"Odpowiadając na zaproszenia, używaj formatu zgodnego z Microsoft "
-"Outlook."
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Jeśli ta opcja jest włączona, edytor wiadomości będzie niewidoczny i wszystkie "
-"zaproszenia będą wysyłane automatycznie. Jeśli chcesz zobaczyć wiadomość z "
-"zaproszeniem przed jej wysłaniem, wyłącz tę opcję. Uwaga: tekst wiadomości "
-"zaproszenia jest w formacie iCalendar i nie należy modyfikować go ręcznie."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Usuń e-maile z zaproszeniami po wysłaniu na nie odpowiedzi"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Kiedy zaznaczone, e-mail z zaproszeniem zostanie przeniesiony do Kosza kiedy "
-"zostanie wysłana odpowiedź."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr "Po napotkaniu wiadomości harmonogramu Toltec, wyświetlaj tekst zastępczy."
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr "Zastępczy tekst wiadomości harmonogramu Toltec."
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Włączenie tej opcji umożliwi przechowywanie danych z programu Kontakt "
-"(KOrganizer, KAddressBook i KNotes.)</p>"
-"<p>Jeśli chcesz włączyć tę opcję, powinieneś także włączyć korzystanie ze "
-"źródła danych IMAP w programach. Można to zrobić w Centrum sterowania.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Zwykle nie ma powodów do przeglądania folderów ze źródłami danych IMAP Jeśli "
-"jednak chcesz je przeglądać, możesz ustawić to tutaj.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Jeśli ten folder jest używany do przechowywania informacji grupowych \"\n"
-"          \"a nie do zwykłej poczty, ustaw tę opcję, by KMail pokazywał\"\n"
-"          \"jedynie foldery grupowe. Jest to użyteczne przy obsłudze zwykłej "
-"poczty\"\n"
-"          \"przez dodatkowe konto IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Wybierz format przechowywania folderów grupowych. "
-"<ul> "
-"<li>Domyślny format to ical (dla folderów kalendarza) i vCard (dla folderów "
-"książki adresowej). To pozwala na korzystanie ze wszystkich funkcji programu "
-"Kontact.</li> "
-"<li>Format XML Kolab jest bardziej podobny do formatu stosowanego przez program "
-"Outlook. Pozwala to na większą zgodność z Outlookiem podczas korzystania z "
-"serwera Kolab lub zgodnego z nim</li> </ul> </p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Wybiera folder nadrzędny dla folderów ze źródłami danych IMAP.</p>"
-"<p>Uwaga: Kolab wybiera folder nadrzędny na skrzynkę odbiorczą IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>To jest identyfikator konta zawierającego foldery ze źródłami danych "
-"IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Jeśli chcesz ustawić nazwy folderów IMAP w swoim języku, możesz wybrać jeden "
-"z poniższych języków.</p>"
-"<p>Uwaga: jedynym powodem, żeby zmienić język nazw jest zgodność z programem "
-"Microsoft Outlook. Poza tym jest to zły pomysł, ponieważ uniemożliwia zmianę "
-"języka w przyszłości.</p> "
-"<p>Lepiej nie wybierać tej opcji, jeśli nie jest to konieczne.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Filtruj także e-maile z folderów pracy grupowej."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid "Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Synchronizuj zmiany pracy grupowej w folderach dIMAP natychmiast po podłączeniu "
-"do sieci."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Ta wartość jest używana do określania, czy KMail ma wyświetlić Wprowadzenie."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksymalna liczba połączeń z danym serwerem"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Tu można ograniczyć liczbę połączeń z danym serwerem przy sprawdzaniu nowej "
-"poczty. Domyślnie liczba połączeń jest nieograniczona (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Pokaż pole edycyjne szybkiego wyszukiwania"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ta opcja włącza lub wyłącza pole szybkiego wyszukiwania nad listą wiadomości, "
-"które może być wykorzystane do szybkiego wyszukiwania informacji na liście "
-"wiadomości."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Ukryj skrzynkę lokalną jeśli nieużywana"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Przekaż wewnętrznie jako domyślne."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Zezwalaj by znak średnika (\";\") mógł być użyty jako separator w edytorze "
+"Niestety, Twój serwer nie obsługuje polecenia TOP. W związku z tym "
+"niemożliwe jest pobranie samych nagłówków wiadomości przed odebraniem całych "
 "wiadomości."
 
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "Zachowaj oryginalny zestaw znaków przy odpowiedzi lub przekazywaniu"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Automatycznie &dołącz podpis"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamiętaj tę tożsamość i użyj jej także przy edycji następnych wiadomości.\n"
-"         "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamiętaj ten folder na wysłane wiadomości i użyj go przy edycji następnych "
-"wiadomości."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "Zapamiętaj tę metodę wysyłania i użyj jej przy edycji następnych wiadomości."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamiętaj słownik i użyj go także przy edycji następnych wiadomości.\n"
-"         "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Zawijaj po &kolumnie:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Ostrzegaj gdy liczba adresatów jest większa niż "
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-"Jeżeli liczba odbiorców jest większa niż podana, KMail wyświetli ostrzeżenie "
-"wymagające potwierdzenia wysłania wiadomości."
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Włącz tę opcję, by Outlook &#8482; mógł zrozumieć nazwy załączników zawierające "
-"znaki narodowe"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "&Automatycznie wysyłaj potwierdzenia otrzymania i przeczytania wiadomości"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Jeśli ta opcja jest włączona, KMail będzie żądał od adresata każdej "
-"wiadomości powiadomienia o dalszym jej losie.</p>"
-"<p>Ta opcja dotyczy jedynie domyślnego zachowania programu. Nadal możliwe jest "
-"wybranie odpowiednich ustawień dla aktualnej wiadomości w edytorze, menu <em>"
-"Ustawienia</em>-><em>Żądaj powiadomienia o losie wiadomości</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Użyj ostatnich adresów do autouzupełniania"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Wyłącz tę opcję, jeśli nie chcesz, by ostatnio używane adresy pojawiały się na "
-"liście dopełnień w polach adresu edytora wiadomości."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Częstość autozapisywania:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Kopia tekstu w edytorze może być automatycznie zapisywana. Tu można ustawić "
-"częstotliwość autozapisywania lub wyłączyć je, ustawiając jego wartość na 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Wstaw sygnatury powyżej cytowanego tekstu"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Zastąp rozpoznany przedrostek przez \"&Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Zastąp rozpoznany przedrostek przez \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Inteligentne cytowanie"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Usuń podpis przy odpowiadaniu"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr "Przy odpowiadaniu cytuj tylko zaznaczony tekst"
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Metoda wybierania adresatów"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Wybiera rodzaj okienka stosowanego do wyboru adresatów do pól\n"
-"         Do, DW i UDW."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Typ edytora odbiorców"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Wybiera typ edytora odbiorców dla pól\n"
-"         Do, DW i UDW."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maksymalna liczba wierszy edytora odbiorców."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid "List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Lista typów wiadomości jakie mają być zignorowane w czasie przekazywania "
-"wewnętrznego."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Maksymalna dozwolona wielkość załącznika e-maila (w MB)."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Pokaż zarządzanie fragmentami i panel wstawiania w edytorze."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Pokaż dziennik audytu GnuPG nawet jeśli operacja kryptograficzna została "
-"uwieńczona powodzeniem."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "Zamknij okno wiadomości po odpowiadaniu lub przekazaniu."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Niektóre wiadomości, zwłaszcza te tworzone automatycznie, nie definiują zestawu "
-"znaków niezbędnego do poprawnego wyświetlenia zawartości. W takich wypadkach "
-"użyte zostanie kodowanie awaryjne, konfigurowane w tym miejscu. Należy ustawić "
-"je na kodowanie najczęściej używane w Twoim regionie. Domyślnie używane jest "
-"kodowanie systemowe."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Zmiana z domyślnej opcji \"Automatycznie\" spowoduje użycie podanego kodowania "
-"dla wszystkich wiadomości, niezależnie od podanego w nich kodowania."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Włącz tę opcję, jeśli chcesz, by uśmieszki takie jak :-) w wiadomościach były "
-"zastępowane emotikonami (małymi obrazkami)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr "Jeśli ta opcja jest włączona, wyświetlane będą różne poziomy cytowania tekstu."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Poziom automatycznego ukrywania:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Zmniejsz czcionkę cytowanego tekstu"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Jeśli ta opcja jest włączona, cytowany tekst będzie wyświetlany mniejszą "
-"czcionką."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, no-c-format
-msgid "Show current message sender time"
-msgstr "Pokazuj bieżący czas nadawcy"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-"włącz tą opcję aby wyświetlić informację o aktualnym czasie nadawcy wiadomości "
-"(obliczane ze strefy czasowej nadawcy)"
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Pokaż program pocztowy w eleganckich nagłówkach"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Jeśli ta opcja jest włączona, eleganckie nagłówki będą zawierać informację o "
-"polach User-Agent i X-Mailer."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Zezwalaj na usunięcie załączników istniejących e-maili."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Zezwalaj na edycję załączników istniejących e-maili."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Zawsze deszyfruj wiadomości przy oglądaniu lub pytaj przed deszyfrowaniem"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Wyślij powiadomienie o losie wiadomości (MDN) bez nadawcy."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Wysyła powiadomienie o losie wiadomości (MDN) bez nadawcy. Niektóre serwery są "
-"skonfigurowane w ten sposób, że odrzucają takie wiadomości, więc jeśli masz "
-"problemy z wysyłaniem powiadomień o losie wiadomości, to wyłącz tę opcję."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Frazy przekonwertowano na szablony"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Stare frazy przekonwertowano na szablony"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Szablon dla nowej wiadomości"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Szablon dla odpowiedzi"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Szablon dla odpowiedzi do wszystkich"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Szablon dla przekazywania"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Znaki cytowania"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Zezwalaj by ustawienia \"poza biurem\" mogły być zmienione przez użytkownika."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Pozwalaj użytkownikom na ładowanie skryptów odsiewania \"poza biurem\", ale "
-"wyłącz możliwość zmieniania ustawień, np. przełącznika domeny lub reakcji na "
-"SPAM."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "Wysyłaj odpowiedzi \"poza biurem\" na e-maile pochodzące tylko z tej domeny."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-"Zezwalaj by wiadomości \"poza biurem\" mogły być wysłane w odpowiedzi na "
-"wiadomości oznaczone jako SPAM."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr "Sprawdź czy odpowiedź \"poza biurem\" jest aktywna przy uruchomieniu KMaila."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "Użyto %1 z %2 %3"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13914,6 +11936,11 @@ msgstr "Dodaj jako DW"
 msgid "Add as BCC"
 msgstr "Dodaj jako UDW"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Anuluj"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13929,17 +11956,17 @@ msgstr "Wybrani odbiorcy"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Wybrałeś %n odbiorcę. Maksymalna dopuszczalna liczba to %1. Proszę dostosować "
-"wybór.\n"
-"Wybrałeś %n odbiorców. Maksymalna dopuszczalna liczba to %1. Proszę dostosować "
-"wybór.\n"
-"Wybrałeś %n odbiorców. Maksymalna dopuszczalna liczba to %1. Proszę dostosować "
-"wybór."
+"Wybrałeś %n odbiorcę. Maksymalna dopuszczalna liczba to %1. Proszę "
+"dostosować wybór.\n"
+"Wybrałeś %n odbiorców. Maksymalna dopuszczalna liczba to %1. Proszę "
+"dostosować wybór.\n"
+"Wybrałeś %n odbiorców. Maksymalna dopuszczalna liczba to %1. Proszę "
+"dostosować wybór."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13955,8 +11982,8 @@ msgstr "Użyj okienka wyboru adresów"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Ten przycisk otwiera osobne okienko, gdzie można wybrać odbiorców z listy "
 "wszystkich dostępnych adresów."
@@ -14061,13 +12088,23 @@ msgstr "jest większy lub równy niż"
 msgid " bytes"
 msgstr " bajtów"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dni"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Żeby zrealizować wyszukiwanie, konieczne jest pobranie z serwera wszystkich "
-"wiadomości w folderze %1. Może to zająć trochę czasu. Kontynuować wyszukiwanie?"
+"wiadomości w folderze %1. Może to zająć trochę czasu. Kontynuować "
+"wyszukiwanie?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14355,11 +12392,11 @@ msgstr "Użyj tego pola, by wstawić ustalony, stały podpis."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Użyj tego, by podać plik tekstowy zawierający Twój podpis. Będzie on czytany za "
-"każdym razem, gdy tworzysz nową wiadomość lub dołączasz nowy podpis."
+"Użyj tego, by podać plik tekstowy zawierający Twój podpis. Będzie on czytany "
+"za każdym razem, gdy tworzysz nową wiadomość lub dołączasz nowy podpis."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14375,11 +12412,11 @@ msgstr "Otwiera podany plik w edytorze tekstowym."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Można tu wprowadzić dowolne polecenie - ze ścieżką lub bez, w zależności od "
 "tego, czy polecenie jest na ścieżce systemowej. Dla każdej nowej wiadomości "
@@ -14390,6 +12427,11 @@ msgstr ""
 msgid "S&pecify command:"
 msgstr "Podaj pole&cenie:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Ścieżka"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nowa pozycja:"
@@ -14423,6 +12465,11 @@ msgstr "Dodaj grupę"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Naprawdę chcesz usunąć tę grupę i wszystkie przynależne fragmenty?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Element:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Edytuj fragment"
@@ -14435,6 +12482,10 @@ msgstr "Edytuj grupę"
 msgid "Edit &group..."
 msgstr "Edytuj &grupę..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Edytuj..."
@@ -14467,17 +12518,19 @@ msgstr "Podaj wartości zastępcze dla tych zmiennych:"
 msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
-msgstr "Włącz by zapisać wartość po prawej jako domyślna wartość dla tej zmiennej"
+msgstr ""
+"Włącz by zapisać wartość po prawej jako domyślna wartość dla tej zmiennej"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Jeśli włączysz tę opcję, wartość wprowadzona po prawej stronie zostanie "
-"zapisana. Jeśli użyjesz tej opcji później - nawet w innym fragmencie - wartość "
-"wprowadzona po prawej zostanie potraktowana jako domyślna wartość tej zmiennej."
+"zapisana. Jeśli użyjesz tej opcji później - nawet w innym fragmencie - "
+"wartość wprowadzona po prawej zostanie potraktowana jako domyślna wartość "
+"tej zmiennej."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14511,6 +12564,16 @@ msgstr "Nie włączaj"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Nie można wstawić zawartości z pliku %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr "Do:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, no-c-format
+msgid "CC:"
+msgstr "DW:"
+
 #: templateparser.cpp:970
 #, c-format
 msgid "Attachment %1"
@@ -14540,59 +12603,50 @@ msgstr "Nie można uruchomić polecenia filtrowania z szablonu: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu można tworzyć szablony wiadomości, używane przy tworzeniu nowych "
-"wiadomości, odpowiedzi lub przekazywaniu wiadomości.</p>"
-"<p>Szablony wiadomości obsługują polecenia zastępowania: można je wpisać lub "
-"wstawić z menu <i>Wstaw polecenie</i>.</p>"
-"<p>Szablony podane tutaj obowiązują tylko w tym folderze. Zastępują one zarówno "
-"szablony globalne, jak i te dla danej tożsamości.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tu można tworzyć szablony wiadomości, używane przy tworzeniu nowych "
+"wiadomości, odpowiedzi lub przekazywaniu wiadomości.</p><p>Szablony "
+"wiadomości obsługują polecenia zastępowania: można je wpisać lub wstawić z "
+"menu <i>Wstaw polecenie</i>.</p><p>Szablony podane tutaj obowiązują tylko w "
+"tym folderze. Zastępują one zarówno szablony globalne, jak i te dla danej "
+"tożsamości.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu można tworzyć szablony wiadomości, używane przy tworzeniu nowych "
-"wiadomości, odpowiedzi lub przekazywaniu wiadomości.</p>"
-"<p>Szablony wiadomości obsługują polecenia zastępowania: można je wpisać lub "
-"wstawić z menu <i>Wstaw polecenie</i>.</p>"
-"<p>Szablony podane tutaj obowiązują dla danej tożsamości. Zastępują one zarówno "
-"szablony globalne i mogą być zastąpione przez szablony dla danego folderu.</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tu można tworzyć szablony wiadomości, używane przy tworzeniu nowych "
+"wiadomości, odpowiedzi lub przekazywaniu wiadomości.</p><p>Szablony "
+"wiadomości obsługują polecenia zastępowania: można je wpisać lub wstawić z "
+"menu <i>Wstaw polecenie</i>.</p><p>Szablony podane tutaj obowiązują dla "
+"danej tożsamości. Zastępują one zarówno szablony globalne i mogą być "
+"zastąpione przez szablony dla danego folderu.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu można tworzyć szablony wiadomości, używane przy tworzeniu nowych "
-"wiadomości, odpowiedzi lub przekazywaniu wiadomości.</p>"
-"<p>Szablony wiadomości obsługują polecenia zastępowania: można je wpisać lub "
-"wstawić z menu <i>Wstaw polecenie</i>.</p>"
-"<p>To jest szablon domyślny. Można go zastąpić szablonem dla danej tożsamości "
-"lub danego folderu.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tu można tworzyć szablony wiadomości, używane przy tworzeniu nowych "
+"wiadomości, odpowiedzi lub przekazywaniu wiadomości.</p><p>Szablony "
+"wiadomości obsługują polecenia zastępowania: można je wpisać lub wstawić z "
+"menu <i>Wstaw polecenie</i>.</p><p>To jest szablon domyślny. Można go "
+"zastąpić szablonem dla danej tożsamości lub danego folderu.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14841,6 +12895,10 @@ msgstr "Filtruj treść aktualnej wiadomości i wstaw zawartość"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Filtruj treść aktualnej wiadomości i zastąp wynikiem filtrowania"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Ustaw pozycję kursora"
@@ -14873,111 +12931,6 @@ msgstr "Włącz debugowanie"
 msgid "Turn Debug Off"
 msgstr "Wyłącz debugowanie"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>... możesz przejść do następnej lub poprzedniej wiadomości, wciskając "
-"odpowiednio strzałkę w prawo lub w lewo?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>... możesz użyć szybko tworzyć filtr adresata, nadawcy, tematu lub listy "
-"dyskusyjnej poleceniem <em>Narzędzia->Utwórz&nbsp;filtr</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... możesz pozbyć się &quot;[nazwy listy dyskusyjnej]&quot;\n"
-"dodawanej do tematu przez niektóre listy za pomocą funkcji filtrowania\n"
-"<em>przepisz nagłówek</em>? Wystarczy użyć następującej akcji:\n"
-"<pre>przepisz nagłówek &quot;Temat&quot;\n"
-"   zamień &quot;\\s*\\[nazwa listy dyskusyjnej\\]\\s*&quot;\n"
-"   na &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>... w oknie Folder->Właściwości... możesz przypisać listy\n"
-"dyskusyjne do folderów? Możesz wtedy używać polecenia\n"
-"<em>Wiadomość-&gt;Wyślij&nbsp;na&nbsp;listę&nbsp;dyskusyjną...</em>,\n"
-"by otworzyć edytor wiadomości z wpisanym adresem listy.\n"
-"Możesz także kliknąć środkowym przyciskiem myszy na folderze.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>... możesz przyporządkować osobną ikonę dla każdego folderu?\n"
-"Sprawdź <em>Folder->&gt;Właściwości...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>... KMail może wyświetlać kolorowy pasek odróżniający poszczególne\n"
-"typy wiadomości (zwykły tekst, HTML, OpenPGP)?</p>\n"
-"<p>Zabezpiecza to przed próbami podrobienia skutecznej weryfikacji podpisu "
-"przez wiadomości w formacie HTML naśladujące ramkę podpisu KMaila.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>... możesz filtrować dowolny nagłówek, po prostu podając jego nazwę w "
-"pierwszym polu reguły wyszukiwania?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... możesz odfiltrować wiadomości w czystym HTML za pomocą reguły\n"
-"<pre>&quot;Content-type&quot; zawiera &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...kiedy odpowiadasz na wiadomość, cytowany jest tylko jej zaznaczony "
-"fragment</p>\n"
-"<p>Jeśli brak zaznaczenia, cytowana jest cała wiadomość.</p>\n"
-"<p>Działa to nawet dla załączników wyświetlanych wewnątrz wiadomości,\n"
-"jeśli wybrano opcję <em>Widok-&gt;Załączniki-&gt;Wewnętrznie</em>.</p>\n"
-"<p>Funkcja ta dotyczy wszystkich poleceń odpowiedzi oprócz\n"
-"<em>Wiadomość -&gt;Odpowiedz bez cytowania</em>.</p>\n"
-"<p align=\"right\"><em>David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nie ma niczego do cofnięcia."
@@ -15024,7 +12977,8 @@ msgstr "Zwiń cytowany tekst."
 
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
-msgstr "Nie można uruchomić menedżera certyfikatów. Proszę sprawdzić instalację."
+msgstr ""
+"Nie można uruchomić menedżera certyfikatów. Proszę sprawdzić instalację."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -15039,6 +12993,15 @@ msgstr "Załącznik %1 (bez nazwy)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Pokaż dziennik audytu GnuPG tej operacji"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Plik o nazwie \"%1\" już istnieje. Zastąpić go?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Zastąpić plik?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15070,8 +13033,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"Twój serwer nie wyświetla \"odpowiedzi o nieobecności\" na liście obsługiwanych "
-"rozszerzeń Sieve.\n"
+"Twój serwer nie wyświetla \"odpowiedzi o nieobecności\" na liście "
+"obsługiwanych rozszerzeń Sieve.\n"
 "Bez tego KMail nie może zainstalować odpowiedzi o nieobecności.\n"
 "Proszę skontaktować się z administratorem systemu."
 
@@ -15156,13 +13119,14 @@ msgstr "&Wysyłaj obrazek z każdą wiadomością"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Włącz tę opcję, jeśli chcesz, by KMail dodawał tak zwany nagłówek X-Face do "
 "wiadomości wysyłanych z tej tożsamości. X-Face to mały (48x48 pikseli) "
-"czarno-biały obrazek, który jest wyświetlany przez niektóre programy pocztowe."
+"czarno-biały obrazek, który jest wyświetlany przez niektóre programy "
+"pocztowe."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15190,13 +13154,13 @@ msgstr "Wybierz plik..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Użyj tego przycisku, by wybrać plik, z którego utworzony będzie obrazek. "
-"Obrazek powinien być mocno kontrastowy i prawie kwadratowy. Jasne tło poprawi "
-"wynik."
+"Obrazek powinien być mocno kontrastowy i prawie kwadratowy. Jasne tło "
+"poprawi wynik."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15204,21 +13168,21 @@ msgstr "Wybierz z książki adresowej"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Możesz użyć zmniejszonej wersji obrazka, który ustawiłeś w swojej pozycji "
 "książki adresowej."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail może wysyłać małe (48x48 pikseli) jednokolorowe obrazki przy każdej "
-"wiadomości. Może to być na przykład Twój obrazek lub znak. Będą one wyświetlane "
-"w programach pocztowych obsługujących tę funkcję."
+"<qt>KMail może wysyłać małe (48x48 pikseli) jednokolorowe obrazki przy "
+"każdej wiadomości. Może to być na przykład Twój obrazek lub znak. Będą one "
+"wyświetlane w programach pocztowych obsługujących tę funkcję."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15226,12 +13190,11 @@ msgstr "Użyj tego pola, by wstawić ustalony napis X-Face."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Przykłady są dostępne pod adresem <a "
-"href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</"
-"a>."
+"Przykłady są dostępne pod adresem <a href=\"http://www.xs4all.nl/~ace/X-"
+"Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15246,125 +13209,1803 @@ msgstr "Brak obrazka"
 msgid "You do not have your own contact defined in the address book."
 msgstr "W książce adresowej brak Twojej pozycji."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Wszystkie: %2<br>Nieprzeczytane: %3<br>Wielkość: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Podpisywanie"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Limit: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automatycznie &podpisuj wiadomości"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Ustaw temat wiadomości"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Jeśli ta opcja jest włączona, wszystkie wysyłane wiadomości będą domyślnie "
+"podpisywane. Oczywiście można wyłączyć podpisywanie oddzielnie dla każdej "
+"wiadomości."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Wyślij kopię na \"adres\""
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Szyfrowanie"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Wyślij ukrytą kopię na \"adres\""
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "Podczas szyfrowania wiadomości zawsze &szyfruj je także moim kluczem"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Dodaj \"nagłówek\" do wiadomości"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Jeśli ta opcja jest włączona, wszystkie wiadomości/pliki będą domyślnie "
+"szyfrowane nie tylko kluczem adresata, ale i Twoim. Pozwoli Ci to na "
+"późniejsze odszyfrowanie wiadomości/pliku. Zwykle jest to dobry pomysł."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Pobierz treść wiadomości z \"pliku\""
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Po&każ podpisany/zaszyfrowany tekst po napisaniu"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Ustaw treść wiadomości"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Jeśli ta opcja jest włączona, napisany/zaszyfrowany tekst będzie wyświetlony "
+"w osobnym oknie, co pozwoli Ci sprawdzić jego wygląd przed wysłaniem. Jest "
+"to dobry pomysł, jeśli sprawdzasz funkcjonowanie szyfrowania w swoim "
+"systemie."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Dodaj załącznik do wiadomości. Operację tę można powtarzać"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Zapisz wiadomości zaszy&frowane"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Sprawdź wyłącznie nowa pocztę"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Włącz, by zapisywać wiadomości zaszyfrowane"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Otwórz tylko okno edytora"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Przechowuj wiadomości zaszyfrowane</h1>\n"
+"Jeśli ta opcja jest włączona, wysyłane wiadomości są przechowywane w takiej "
+"postaci, w jakiej zostały wysłane. Nie jest to zalecane, ponieważ jeśli "
+"certyfikat utraci ważność, stracisz dostęp do wiadomości.\n"
+"<p>\n"
+"Lokalne przepisy mogą wymagać od Ciebie włączenia tej opcji. W razie "
+"wątpliwości skontaktuj się z administratorem systemu.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Pokaż podaną wiadomość"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Zawsze pokaż &klucze szyfrujące do potwierdzenia"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Wyślij wiadomość na \"adres\" lub załącz plik, do którego prowadzi \"URL\""
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Jeśli ta opcja jest włączona, przed zaszyfrowaniem wyświetlona zostanie "
+"lista kluczy szyfrujących do wyboru. Jeśli opcja jest wyłączona, program "
+"pokaże okienko jedynie wtedy, kiedy znalezienie odpowiedniego klucza nie "
+"będzie możliwe, albo kiedy będzie więcej kluczy możliwych do użycia ."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "przeczytana"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automatycznie &szyfruj wiadomości, jeśli to możliwe"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "stara"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Jeśli ta opcja jest włączona, wszystkie wysyłane wiadomości będą domyślnie "
+"szyfrowane, o ile to tylko możliwe. Oczywiście można wyłączyć szyfrowanie "
+"oddzielnie dla każdej wiadomości."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "usunięta"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nigdy nie podpisuj/szyfruj wiadomości &roboczych"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "odpowiedziana"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Jak to działa?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "przekazana"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Uniwersalny"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "zakolejkowana"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Odpowiedź"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "wysłana"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Odpowiedź wszystkim"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "śledzona"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Przekazywanie"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "ignorowana"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Skrót:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "spam"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Typ szablonu:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "nie-spam"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Zawartość szablonu"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "do zrobienia"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Skrót szablonu"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "zawiera załącznik"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Typ szablonu"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "Użyto %1 z %2 %3"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Właściwości folderu"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Ścieżka"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Folder przechowuje listę dyskusyjną"
 
-#: util.h:208
-msgid "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Plik o nazwie \"%1\" już istnieje. Zastąpić go?"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Adres listy:"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Zastąpić plik?"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Zwykła:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Nieprzeczytana:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Usuwanie starych wiadomości"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Usuń &starą pocztę po:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Usuń &przeczytane wiadomości"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Usuń &po:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Usuń &nieprzeczytane wiadomości"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "dniach"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "tygodniach"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "miesiącach"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Tożsamość nadawcy:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Format przechowywania:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Wygląd listy:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Wyślij wiadomości z kolejki przy sprawdzaniu poczty"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Czy KMail ma wysyłać wszystkie wiadomości z folderu \"Do wysłania\" "
+"przy ręcznym lub automatycznym sprawdzaniu poczty, czy też automatyczne "
+"wysyłanie ma być w ogóle wyłączone.</p></qt>"
+
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Automatycznie przenoś niezsynchronizowane wiadomości z folderów o "
+"niewystarczających prawach dostępu"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Jeśli w folderze znajdują się nowe wiadomości, które nie zostały wysłane na "
+"serwer, ale brak wystarczających praw dostępu do folderu, żeby je wysłać, "
+"wiadomości te zostaną automatycznie przeniesione do folderu zgubione"
+"+znalezione."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Zezwalaj na flagi lokalne w folderach tylko do odczytu"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"To ustawienie pozwala administratorowi na ustalenie minimalnego ograniczenia "
+"między dwoma sprawdzeniami poczty.\"\n"
+"           \"Użytkownik nie będzie mógł podać wartości mniejszej niż podana "
+"tutaj."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Ostatnio wybrany folder w oknie wyboru folderów."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Ignoruj maskę użytkownika (umask) i użyj wartości \"do czytania i pisania "
+"tylko dla użytkownika\""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Tryb wyświetlania ikony na tacce systemowej"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Zamknij program po zamknięciu głównego okna, nawet jeśli ikona w tacce "
+"systemowej jest aktywna."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Szczegółowe powiadamianie o nowej poczcie"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Jeśli ta opcja jest włączona, w zawiadomieniu o nadejściu nowej poczty "
+"wyświetlana będzie informacja o liczbie nowych wiadomości w każdym folderze. "
+"W przeciwnym razie wyświetlona zostanie jedynie informacja \"Nadeszła nowa "
+"wiadomość\"."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Podaj &edytor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Użyj edytora zewnętrznego zamiast wbudowanego"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"Próg kiedy należy ostrzec użytkownika kiedy folder zbliża się do limitu "
+"wielkości."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Włącz funkcje pracy grupowej"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Przeformatuj nagłówki Od:/Do: w odpowiedzi na zaproszenia"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Implementacja iCalendar w Microsoft Outlook ma wiele wad. Ta opcja służy do "
+"obejścia jednej z nich. Jeśli masz problemy otrzymywaniem odpowiedzi w "
+"Outlooku, włącz tę opcję."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Wysyłaj zaproszenia grupowe w treści wiadomości"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Implementacja iCalendar w Microsoft Outlook ma wiele wad. Ta opcja służy do "
+"obejścia jednej z nich. Jeśli masz problemy odczytaniem zaproszeń w "
+"Outlooku, włącz tę opcję."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Zgodne z Exchange nazywanie zaproszeń"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook używany w połączeniu z serwerem Microsoft Exchange, ma "
+"problem ze zrozumieniem zgodnych ze standardami wiadomości e-mail "
+"komunikacji grupowej. Włącz tę opcję, żeby wysyłać zaproszenia grupowe w "
+"sposób zrozumiały dla Microsoft Exchange."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+"Odpowiadając na zaproszenia, używaj formatu zgodnego z Microsoft Outlook."
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Jeśli ta opcja jest włączona, edytor wiadomości będzie niewidoczny i "
+"wszystkie zaproszenia będą wysyłane automatycznie. Jeśli chcesz zobaczyć "
+"wiadomość z zaproszeniem przed jej wysłaniem, wyłącz tę opcję. Uwaga: tekst "
+"wiadomości zaproszenia jest w formacie iCalendar i nie należy modyfikować go "
+"ręcznie."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Usuń e-maile z zaproszeniami po wysłaniu na nie odpowiedzi"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Kiedy zaznaczone, e-mail z zaproszeniem zostanie przeniesiony do Kosza kiedy "
+"zostanie wysłana odpowiedź."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+"Po napotkaniu wiadomości harmonogramu Toltec, wyświetlaj tekst zastępczy."
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr "Zastępczy tekst wiadomości harmonogramu Toltec."
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Włączenie tej opcji umożliwi przechowywanie danych z programu Kontakt "
+"(KOrganizer, KAddressBook i KNotes.)</p><p>Jeśli chcesz włączyć tę opcję, "
+"powinieneś także włączyć korzystanie ze źródła danych IMAP w programach. "
+"Można to zrobić w Centrum sterowania.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Zwykle nie ma powodów do przeglądania folderów ze źródłami danych IMAP "
+"Jeśli jednak chcesz je przeglądać, możesz ustawić to tutaj.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Jeśli ten folder jest używany do przechowywania informacji grupowych \"\n"
+"          \"a nie do zwykłej poczty, ustaw tę opcję, by KMail pokazywał\"\n"
+"          \"jedynie foldery grupowe. Jest to użyteczne przy obsłudze zwykłej "
+"poczty\"\n"
+"          \"przez dodatkowe konto IMAP.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Wybierz format przechowywania folderów grupowych. <ul> <li>Domyślny "
+"format to ical (dla folderów kalendarza) i vCard (dla folderów książki "
+"adresowej). To pozwala na korzystanie ze wszystkich funkcji programu Kontact."
+"</li> <li>Format XML Kolab jest bardziej podobny do formatu stosowanego "
+"przez program Outlook. Pozwala to na większą zgodność z Outlookiem podczas "
+"korzystania z serwera Kolab lub zgodnego z nim</li> </ul> </p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Wybiera folder nadrzędny dla folderów ze źródłami danych IMAP.</"
+"p><p>Uwaga: Kolab wybiera folder nadrzędny na skrzynkę odbiorczą IMAP.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>To jest identyfikator konta zawierającego foldery ze źródłami danych IMAP."
+"</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Jeśli chcesz ustawić nazwy folderów IMAP w swoim języku, możesz wybrać "
+"jeden z poniższych języków.</p><p>Uwaga: jedynym powodem, żeby zmienić język "
+"nazw jest zgodność z programem Microsoft Outlook. Poza tym jest to zły "
+"pomysł, ponieważ uniemożliwia zmianę języka w przyszłości.</p> <p>Lepiej nie "
+"wybierać tej opcji, jeśli nie jest to konieczne.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Filtruj także e-maile z folderów pracy grupowej."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Synchronizuj zmiany pracy grupowej w folderach dIMAP natychmiast po "
+"podłączeniu do sieci."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Ta wartość jest używana do określania, czy KMail ma wyświetlić Wprowadzenie."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksymalna liczba połączeń z danym serwerem"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Tu można ograniczyć liczbę połączeń z danym serwerem przy sprawdzaniu nowej "
+"poczty. Domyślnie liczba połączeń jest nieograniczona (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Pokaż pole edycyjne szybkiego wyszukiwania"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ta opcja włącza lub wyłącza pole szybkiego wyszukiwania nad listą "
+"wiadomości, które może być wykorzystane do szybkiego wyszukiwania informacji "
+"na liście wiadomości."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Ukryj skrzynkę lokalną jeśli nieużywana"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Przekaż wewnętrznie jako domyślne."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Zezwalaj by znak średnika (\";\") mógł być użyty jako separator w edytorze "
+"wiadomości."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "Zachowaj oryginalny zestaw znaków przy odpowiedzi lub przekazywaniu"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Automatycznie &dołącz podpis"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamiętaj tę tożsamość i użyj jej także przy edycji następnych wiadomości.\n"
+"         "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Zapamiętaj ten folder na wysłane wiadomości i użyj go przy edycji następnych "
+"wiadomości."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Zapamiętaj tę metodę wysyłania i użyj jej przy edycji następnych wiadomości."
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamiętaj słownik i użyj go także przy edycji następnych wiadomości.\n"
+"         "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Zawijaj po &kolumnie:"
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Ostrzegaj gdy liczba adresatów jest większa niż "
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+"Jeżeli liczba odbiorców jest większa niż podana, KMail wyświetli ostrzeżenie "
+"wymagające potwierdzenia wysłania wiadomości."
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Włącz tę opcję, by Outlook &#8482; mógł zrozumieć nazwy załączników "
+"zawierające znaki narodowe"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+"&Automatycznie wysyłaj potwierdzenia otrzymania i przeczytania wiadomości"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt> <p>Jeśli ta opcja jest włączona, KMail będzie żądał od adresata każdej "
+"wiadomości powiadomienia o dalszym jej losie.</p><p>Ta opcja dotyczy jedynie "
+"domyślnego zachowania programu. Nadal możliwe jest wybranie odpowiednich "
+"ustawień dla aktualnej wiadomości w edytorze, menu <em>Ustawienia</em>-"
+"><em>Żądaj powiadomienia o losie wiadomości</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Użyj ostatnich adresów do autouzupełniania"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Wyłącz tę opcję, jeśli nie chcesz, by ostatnio używane adresy pojawiały się "
+"na liście dopełnień w polach adresu edytora wiadomości."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Częstość autozapisywania:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Kopia tekstu w edytorze może być automatycznie zapisywana. Tu można ustawić "
+"częstotliwość autozapisywania lub wyłączyć je, ustawiając jego wartość na 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Wstaw sygnatury powyżej cytowanego tekstu"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Zastąp rozpoznany przedrostek przez \"&Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Zastąp rozpoznany przedrostek przez \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Inteligentne cytowanie"
+
+#: kmail.kcfg:470
+#, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Usuń podpis przy odpowiadaniu"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr "Przy odpowiadaniu cytuj tylko zaznaczony tekst"
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Metoda wybierania adresatów"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Wybiera rodzaj okienka stosowanego do wyboru adresatów do pól\n"
+"         Do, DW i UDW."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Typ edytora odbiorców"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Wybiera typ edytora odbiorców dla pól\n"
+"         Do, DW i UDW."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maksymalna liczba wierszy edytora odbiorców."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Lista typów wiadomości jakie mają być zignorowane w czasie przekazywania "
+"wewnętrznego."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Maksymalna dozwolona wielkość załącznika e-maila (w MB)."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Pokaż zarządzanie fragmentami i panel wstawiania w edytorze."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Pokaż dziennik audytu GnuPG nawet jeśli operacja kryptograficzna została "
+"uwieńczona powodzeniem."
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "Zamknij okno wiadomości po odpowiadaniu lub przekazaniu."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Niektóre wiadomości, zwłaszcza te tworzone automatycznie, nie definiują "
+"zestawu znaków niezbędnego do poprawnego wyświetlenia zawartości. W takich "
+"wypadkach użyte zostanie kodowanie awaryjne, konfigurowane w tym miejscu. "
+"Należy ustawić je na kodowanie najczęściej używane w Twoim regionie. "
+"Domyślnie używane jest kodowanie systemowe."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Zmiana z domyślnej opcji \"Automatycznie\" spowoduje użycie podanego "
+"kodowania dla wszystkich wiadomości, niezależnie od podanego w nich "
+"kodowania."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Włącz tę opcję, jeśli chcesz, by uśmieszki takie jak :-) w wiadomościach "
+"były zastępowane emotikonami (małymi obrazkami)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Jeśli ta opcja jest włączona, wyświetlane będą różne poziomy cytowania "
+"tekstu."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Poziom automatycznego ukrywania:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Zmniejsz czcionkę cytowanego tekstu"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Jeśli ta opcja jest włączona, cytowany tekst będzie wyświetlany mniejszą "
+"czcionką."
+
+#: kmail.kcfg:612
+#, no-c-format
+msgid "Show current message sender time"
+msgstr "Pokazuj bieżący czas nadawcy"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+"włącz tą opcję aby wyświetlić informację o aktualnym czasie nadawcy "
+"wiadomości (obliczane ze strefy czasowej nadawcy)"
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Pokaż program pocztowy w eleganckich nagłówkach"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Jeśli ta opcja jest włączona, eleganckie nagłówki będą zawierać informację o "
+"polach User-Agent i X-Mailer."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Zezwalaj na usunięcie załączników istniejących e-maili."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Zezwalaj na edycję załączników istniejących e-maili."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+"Zawsze deszyfruj wiadomości przy oglądaniu lub pytaj przed deszyfrowaniem"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Wyślij powiadomienie o losie wiadomości (MDN) bez nadawcy."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Wysyła powiadomienie o losie wiadomości (MDN) bez nadawcy. Niektóre serwery "
+"są skonfigurowane w ten sposób, że odrzucają takie wiadomości, więc jeśli "
+"masz problemy z wysyłaniem powiadomień o losie wiadomości, to wyłącz tę "
+"opcję."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Frazy przekonwertowano na szablony"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Stare frazy przekonwertowano na szablony"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Szablon dla nowej wiadomości"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Szablon dla odpowiedzi"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Szablon dla odpowiedzi do wszystkich"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Szablon dla przekazywania"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Znaki cytowania"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+"Zezwalaj by ustawienia \"poza biurem\" mogły być zmienione przez użytkownika."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Pozwalaj użytkownikom na ładowanie skryptów odsiewania \"poza biurem\", ale "
+"wyłącz możliwość zmieniania ustawień, np. przełącznika domeny lub reakcji na "
+"SPAM."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Wysyłaj odpowiedzi \"poza biurem\" na e-maile pochodzące tylko z tej domeny."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+"Zezwalaj by wiadomości \"poza biurem\" mogły być wysłane w odpowiedzi na "
+"wiadomości oznaczone jako SPAM."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Sprawdź czy odpowiedź \"poza biurem\" jest aktywna przy uruchomieniu KMaila."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Edytuj plik"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Edytuj..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Idź"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "F&older"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Wiado&mość"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Specjalna odpowiedź"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Przekazywanie"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Dymki narzędzi"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ustawienia fragmentu"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Pasek narzędzi HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opcje wspólne"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Pasek narzędzi HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Sprawdź certyfikaty przy pomocy CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Jeśli ta opcja jest włączona, certyfikaty S/MIME będą sprawdzane za pomocą "
+"list unieważnień certyfikatów (CRL)."
 
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Sprawdź certyfikaty w sieci (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Jeśli ta opcja jest włączona, certyfikaty S/MIME będą sprawdzane w sieci za "
+"pomocą protokołu aktualnego stanu certyfikatów (OCSP). Proszę wpisać adres "
+"dostawcy OCSP poniżej."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Sprawdzanie certyfikatów w sieci"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Adres dostawcy OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Tu należy wpisać adres serwera przeprowadzającego sprawdzanie certyfikatów w "
+"sieci (OCSP). Adresy takie zwykle zaczynają się od http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Podpis dostawcy OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignoruj URL certyfikatów"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Nie sprawdzaj polityki certyfikatów"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Domyślnie GnuPG używa pliku ~/.gnupg/policies.txt do sprawdzenia, czy dana "
+"polityka certyfikatów jest dopuszczalna. Jeśli ta opcja jest włączona, "
+"polityki nie będą sprawdzane."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nigdy nie sprawdzaj CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Jeśli ta opcja jest włączona, listy unieważnień certyfikatów (CRL) nie będą "
+"używane do sprawdzania poprawności certyfikatów S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Pobierz brakującą informację o wystawcy certyfikatu"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Jeśli ta opcja jest włączona, brakujące informacje o wystawcy certyfikatu "
+"będą pobierane (dotyczy to obu metod sprawdzania, CRL i OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Żądania HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Nie realizuj żadnych żądań HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Całkowicie wyłącza użycie HTTP dla S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Użyj tego pośrednika dla żądań HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Użyj systemowego pośrednika HTTP:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Jeśli ta opcja jest włączona, we wszystkich żądaniach HTTP używane będzie "
+"pośrednik HTTP widoczny po prawej (pochodzący ze zmiennej środowiskowej "
+"http_proxy)."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Podaj adres lokalnego pośrednika HTTP, który ma być używany do żądań HTTP "
+"związanych z S/MIME. Składnia to serwer:port, na przykład mojposrednik."
+"nigdzie.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignoruj HTTP punktów dystrybucyjnych CRL dla certyfikatów"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Kiedy poszukiwany jest adres CRL, testowany certyfikat zwykle zawiera adresy "
+"URL prowadzące do punktów dystrybucji CRL (list unieważnień certyfikatów). "
+"Używany jest pierwszy znaleziony URL. Jeśli ta opcja jest włączona, "
+"wszystkie adresy używające HTTP zostaną zignorowane przy poszukiwaniu "
+"odpowiedniego punktu."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Żądania LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Nie realizuj żadnych żądań LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Całkowicie wyłącza użycie LDAP dla S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignoruj LDAP dla punktów dystrybucji CRL dla certyfikatów"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Kiedy poszukiwany jest adres CRL, testowany certyfikat zwykle zawiera adresy "
+"URL prowadzące do punktów dystrybucji CRL (list unieważnień certyfikatów). "
+"Używany jest pierwszy znaleziony URL. Jeśli ta opcja jest włączona, "
+"wszystkie adresy używające LDAP zostaną zignorowane przy poszukiwaniu "
+"odpowiedniego punktu."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Główny serwer dla żądań LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Podanie tu serwera LDAP spowoduje, że wszelkie żądania LDAP będą kierowane "
+"najpierw do niego. Dokładniej, ustawienie to spowoduje zignorowanie "
+"wszelkich informacji o serwerach i portach, będących częścią URL dla LDAP. "
+"Inne serwery będą używany tylko wówczas, gdy połączenie z wybranym serwerem "
+"nie powiedzie się.\n"
+"Składnia to \"serwer\" lub \"serwer:port\". Jeśli nie podano portu, "
+"przyjmowana jest wartość 389 (standard LDAP)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Dodaj fragment"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Dodaj"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Fragment:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Grupa:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Ustawienia fragmentu"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Dymki narzędzi"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Pokaż tekst  w fragmentu w &dymku"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "Określa czy zostanie pokazany dymek z tekstem z założonego wiersza"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Zmienne"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Metoda wprowadzania dla zmiennych"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Jeden dialog dla każdej zmiennej we fragmencie"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+"Okno dialogowe zostanie pokazane dla każdej zmiennej fragmentu z osobna"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Jedno okno dialogowe dla wszystkich zmiennych we fragmencie"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Dla wszystkich zmiennych we fragmencie będzie pokazane jedno okno dialogowe"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Ogranicznik:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Konfiguracja szablonów"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Odpowiedz nadawcy"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Odpowiedz wszystkim/na listę"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Przekaż wiadomość"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "&Ostrzegaj przed wysłaniem niepodpisanej wiadomości"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Włącz ostrzeżenie przed wysłaniem niepodpisanej wiadomości."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj przed wysłaniem niepodpisanych wiadomości</h1>\n"
+"Jeśli ta opcja jest włączona, zostaniesz ostrzeżony przed wysłaniem "
+"niepodpisanej wiadomości lub jej części.<p>\n"
+"Dla zwiększenia bezpieczeństwa zalecane jest pozostawienie tej opcji "
+"włączonej.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Ostrzegaj przed wysłaniem niezaszyfrowanej wiadomości"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Włącza ostrzeżenie przed wysłaniem niezaszyfrowanej wiadomości.wiadomości."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj przed wysłaniem niepodpisanych wiadomości</h1>\n"
+"Jeśli ta opcja jest włączona, będziesz ostrzegany przed próbą wysłania "
+"niezaszyfrowanej wiadomości lub jej części.<p>\n"
+"Dla zwiększenia bezpieczeństwa zalecane jest pozostawienie tej opcji "
+"włączonej.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Ostrzegaj, jeśli w certyfikacie brak adresu &odbiorcy"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Włącz ostrzeżenie przed brakującym adresem e-mail"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj, jeśli w certyfikacie brak adresu adresata</h1>\n"
+"Jeśli ta opcja jest włączona, a w certyfikacie użytym do szyfrowania brak "
+"adresu adresata, zostanie wyświetlone ostrzeżenie.\n"
+"<p>\n"
+"Dla zwiększenia bezpieczeństwa zalecane jest pozostawienie tej opcji "
+"włączonej.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Ostrzegaj, jeśli certyfikaty/klucze niedługo utracą ważność (konfiguracja "
+"poniżej)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Do podpisywania"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Do szyfrowania"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Podaj liczbę dni"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj, jeśli certyfikat podpisu traci ważność</h1>\n"
+"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat podpisu utraci ważność w "
+"ciągu mniejszej liczby dni niż podana tutaj.<p>\n"
+"Zalecane ustawienie SPHINX to 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj, jeśli certyfikat szyfrowania traci ważność</h1>\n"
+"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat szyfrowania utraci "
+"ważność w ciągu mniejszej liczby dni niż podana tutaj.\n"
+"<p>\n"
+"Zalecane ustawienie SPHINX to 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj, jeśli certyfikat w łańcuchu traci ważność</h1>\n"
+"Ostrzeżenie zostanie wyświetlone, jeśli dowolny certyfikat w łańcuchu utraci "
+"ważność w ciągu mniejszej liczby dni niż podana tutaj.\n"
+"<p>\n"
+"Zalecane ustawienie SPHINX to 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj, jeśli certyfikat CA traci ważność</h1>\n"
+"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat CA utraci ważność w ciągu "
+"mniejszej liczby dni niż podana tutaj.\n"
+"<p>\n"
+"Zalecane ustawienie SPHINX to 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ostrzegaj, jeśli certyfikat podstawowy traci ważność</h1>\n"
+"Ostrzeżenie zostanie wyświetlone, jeśli certyfikat podstawowy utraci ważność "
+"w ciągu mniejszej liczby dni niż podana tutaj.\n"
+"<p>\n"
+"Zalecane ustawienie SPHINX to 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Dla certyfikatów podstawowych:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Szukaj pośrednich certyfikatów CA:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Dla certyfikatów/kluczy użytkownika:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Ponownie włącz wszystkie ostrzeżenia \"Nie pytaj więcej\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>... możesz przejść do następnej lub poprzedniej wiadomości, wciskając "
+"odpowiednio strzałkę w prawo lub w lewo?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>... możesz użyć szybko tworzyć filtr adresata, nadawcy, tematu lub listy "
+"dyskusyjnej poleceniem <em>Narzędzia->Utwórz&nbsp;filtr</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... możesz pozbyć się &quot;[nazwy listy dyskusyjnej]&quot;\n"
+"dodawanej do tematu przez niektóre listy za pomocą funkcji filtrowania\n"
+"<em>przepisz nagłówek</em>? Wystarczy użyć następującej akcji:\n"
+"<pre>przepisz nagłówek &quot;Temat&quot;\n"
+"   zamień &quot;\\s*\\[nazwa listy dyskusyjnej\\]\\s*&quot;\n"
+"   na &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>... w oknie Folder->Właściwości... możesz przypisać listy\n"
+"dyskusyjne do folderów? Możesz wtedy używać polecenia\n"
+"<em>Wiadomość-&gt;Wyślij&nbsp;na&nbsp;listę&nbsp;dyskusyjną...</em>,\n"
+"by otworzyć edytor wiadomości z wpisanym adresem listy.\n"
+"Możesz także kliknąć środkowym przyciskiem myszy na folderze.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>... możesz przyporządkować osobną ikonę dla każdego folderu?\n"
+"Sprawdź <em>Folder->&gt;Właściwości...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>... KMail może wyświetlać kolorowy pasek odróżniający poszczególne\n"
+"typy wiadomości (zwykły tekst, HTML, OpenPGP)?</p>\n"
+"<p>Zabezpiecza to przed próbami podrobienia skutecznej weryfikacji podpisu "
+"przez wiadomości w formacie HTML naśladujące ramkę podpisu KMaila.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>... możesz filtrować dowolny nagłówek, po prostu podając jego nazwę w "
+"pierwszym polu reguły wyszukiwania?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... możesz odfiltrować wiadomości w czystym HTML za pomocą reguły\n"
+"<pre>&quot;Content-type&quot; zawiera &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...kiedy odpowiadasz na wiadomość, cytowany jest tylko jej zaznaczony "
+"fragment</p>\n"
+"<p>Jeśli brak zaznaczenia, cytowana jest cała wiadomość.</p>\n"
+"<p>Działa to nawet dla załączników wyświetlanych wewnątrz wiadomości,\n"
+"jeśli wybrano opcję <em>Widok-&gt;Załączniki-&gt;Wewnętrznie</em>.</p>\n"
+"<p>Funkcja ta dotyczy wszystkich poleceń odpowiedzi oprócz\n"
+"<em>Wiadomość -&gt;Odpowiedz bez cytowania</em>.</p>\n"
+"<p align=\"right\"><em>David F. Newman</em></p>\n"
diff --git a/tde-i18n-pt/messages/tdepim/kmail.po b/tde-i18n-pt/messages/tdepim/kmail.po
index 9c9622bbd20..efc083ca17d 100644
--- a/tde-i18n-pt/messages/tdepim/kmail.po
+++ b/tde-i18n-pt/messages/tdepim/kmail.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-07-10 22:33+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -47,13 +47,13 @@ msgstr ""
 "X-POFile-SpellExtra: ODATEEN deIMAP keys AM AP IM DIGEST ss RSA OFROMNAME\n"
 "X-POFile-SpellExtra: CRAM min\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "José Nuno Pires,Pedro Morais"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -200,6 +200,12 @@ msgstr "&Nenhum (cuidado)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Conta para o tratamento de recursos semi-automáticos"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Limpar o Passado"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -277,14 +283,14 @@ msgstr "Uti&lizador:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"O seu Fornecedor de Acesso à Internet deu-lhe um <em>nome de utilizador</em>"
-", o qual é um utilizador para o autenticar nos seus servidores. Este é "
-"normalmente a primeira parte do seu endereço de e-mail (a parte antes do <em>"
-"@</em>)."
+"O seu Fornecedor de Acesso à Internet deu-lhe um <em>nome de utilizador</"
+"em>, o qual é um utilizador para o autenticar nos seus servidores. Este é "
+"normalmente a primeira parte do seu endereço de e-mail (a parte antes do "
+"<em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -305,20 +311,20 @@ msgstr "Guarda&r a senha POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Active esta opção para que o KMail guarde a senha.\n"
 "Se o TDEWallet estiver disponível a senha será guardada nele, o que é "
 "considerado seguro.\n"
 "No entanto, se o TDEWallet não estiver disponível, a senha é guardada no "
-"ficheiro de configuração do KMail. A senha é guardada numa forma obscura, mas "
-"não deve ser considerada segura contra descodificações se for obtido o acesso "
-"ao ficheiro de configuração."
+"ficheiro de configuração do KMail. A senha é guardada numa forma obscura, "
+"mas não deve ser considerada segura contra descodificações se for obtido o "
+"acesso ao ficheiro de configuração."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -346,12 +352,13 @@ msgstr "&Filtrar as mensagens se forem maiores do que"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Se seleccionar esta opção, os Filtros POP serão usados para decidir o que fazer "
-"com as mensagens. Pode então seleccionar entre obtê-las, apagá-las ou mantê-las "
-"no servidor."
+"Se seleccionar esta opção, os Filtros POP serão usados para decidir o que "
+"fazer com as mensagens. Pode então seleccionar entre obtê-las, apagá-las ou "
+"mantê-las no servidor."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -400,13 +407,15 @@ msgstr "Te&xto não cifrado"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -449,14 +458,14 @@ msgstr "Espaços de nomes:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Aqui poderá ver os diferentes espaços de nomes que o seu servidor de IMAP "
 "suporta. Cada um dos espaços de nomes representa um prefixo que separa os "
-"grupos de pastas. Os espaços de nomes permitem ao KMail, por exemplo, mostrar "
-"as suas pastas pessoais e partilhadas numa conta."
+"grupos de pastas. Os espaços de nomes permitem ao KMail, por exemplo, "
+"mostrar as suas pastas pessoais e partilhadas numa conta."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -515,12 +524,12 @@ msgstr "Carregar os a&nexos a pedido"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Active isto para não carregar os anexos automaticamente quando carrega no "
-"e-mail, mas apenas quando carregar no anexo. Desta forma, também as mensagens "
+"Active isto para não carregar os anexos automaticamente quando carrega no e-"
+"mail, mas apenas quando carregar no anexo. Desta forma, também as mensagens "
 "grandes são mostradas instantaneamente."
 
 #: accountdialog.cpp:1009
@@ -561,7 +570,7 @@ msgstr "<nenhuma>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "recebido"
 
@@ -569,48 +578,50 @@ msgstr "recebido"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "O servidor não parece suportar números de mensagem únicos, mas este é um "
 "requisito necessário para deixar as mensagens no servidor.\n"
 "Dado que a maioria dos servidores não anunciam correctamente as suas "
-"capacidades, você terá à mesma a possibilidade de activar a opção para deixar "
-"as mensagens no servidor."
+"capacidades, você terá à mesma a possibilidade de activar a opção para "
+"deixar as mensagens no servidor."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "O servidor não parece suportar a transferência dos cabeçalhos das mensagens, "
 "mas este é um requisito necessário para filtrar as mensagens no servidor.\n"
 "Dado que a maioria dos servidores não anunciam correctamente as suas "
-"capacidades, você terá à mesma a possibilidade de activar a opção para filtrar "
-"as mensagens no servidor."
+"capacidades, você terá à mesma a possibilidade de activar a opção para "
+"filtrar as mensagens no servidor."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Tenha em atenção que esta funcionalidade pode fazer com que alguns servidores "
-"de POP3 que não suportem o 'pipelining' enviem mensagens corrompidas;\n"
-"isto é configurável, porque alguns servidores suportam o 'pipelining' mas não "
-"anunciam as suas capacidades. Para o utilizador verificar se o seu servidor "
-"POP3 anuncia o suporte de 'pipelining', utilize o botão \"Ver o que o Servidor "
-"Suporta\" na parte inferior da janela;\n"
-"se o seu servidor não o anunciar, mas quiser mais velocidade do que consegue, "
-"faça primeiro alguns testes enviando para si próprio um conjunto de mensagens e "
-"puxando-as de volta."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Tenha em atenção que esta funcionalidade pode fazer com que alguns "
+"servidores de POP3 que não suportem o 'pipelining' enviem mensagens "
+"corrompidas;\n"
+"isto é configurável, porque alguns servidores suportam o 'pipelining' mas "
+"não anunciam as suas capacidades. Para o utilizador verificar se o seu "
+"servidor POP3 anuncia o suporte de 'pipelining', utilize o botão \"Ver o que "
+"o Servidor Suporta\" na parte inferior da janela;\n"
+"se o seu servidor não o anunciar, mas quiser mais velocidade do que "
+"consegue, faça primeiro alguns testes enviando para si próprio um conjunto "
+"de mensagens e puxando-as de volta."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -618,54 +629,54 @@ msgstr "Por favor indique primeiro um servidor e porto na página Geral."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "O servidor não parece suportar o 'pipelining'; como tal, esta opção foi "
 "desactivada.\n"
 "Dado que a maioria dos servidores não anunciam correctamente as suas "
 "capacidades, você terá à mesma a possibilidade de activar o 'pipelining'. "
-"Porém, lembre-se que esta opção possa fazer com que alguns servidores POP que "
-"não suportem esta funcionalidade enviem mensagens corrompidas. Por isso, antes "
-"de usar esta funcionalidade com correio importante, você deverá primeiro "
-"testá-la, enviando para si próprio um conjunto grande de mensagens de teste que "
-"deverá obter depois de uma vez do servidor de POP."
+"Porém, lembre-se que esta opção possa fazer com que alguns servidores POP "
+"que não suportem esta funcionalidade enviem mensagens corrompidas. Por isso, "
+"antes de usar esta funcionalidade com correio importante, você deverá "
+"primeiro testá-la, enviando para si próprio um conjunto grande de mensagens "
+"de teste que deverá obter depois de uma vez do servidor de POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "O servidor não parece suportar números de mensagem únicos, mas este é um "
-"requisito necessário para deixar as mensagens no servidor; como tal, esta opção "
-"foi desactivada.\n"
+"requisito necessário para deixar as mensagens no servidor; como tal, esta "
+"opção foi desactivada.\n"
 "Dado que a maioria dos servidores não anunciam correctamente as suas "
-"capacidades, você terá à mesma a possibilidade de activar a opção para deixar "
-"as mensagens no servidor."
+"capacidades, você terá à mesma a possibilidade de activar a opção para "
+"deixar as mensagens no servidor."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "O servidor não parece suportar a transferência dos cabeçalhos das mensagens, "
-"mas este é um requisito necessário para filtrar as mensagens no servidor; como "
-"tal, esta opção foi desactivada.\n"
+"mas este é um requisito necessário para filtrar as mensagens no servidor; "
+"como tal, esta opção foi desactivada.\n"
 "Dado que a maioria dos servidores não anunciam correctamente as suas "
-"capacidades, você terá à mesma a possibilidade de activar a opção para filtrar "
-"as mensagens no servidor."
+"capacidades, você terá à mesma a possibilidade de activar a opção para "
+"filtrar as mensagens no servidor."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -745,8 +756,8 @@ msgstr "Conta IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "É necessário adicionar uma conta na secção 'Rede' da configuração para o "
 "utilizador poder receber correio."
@@ -785,9 +796,9 @@ msgstr "Bem-vindo ao KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Parece que iniciou o KMail pela primeira vez. Pode usar este assistente "
 "para configurar as suas contas de correio. Basta indicar os dados de ligação "
@@ -853,8 +864,7 @@ msgstr "Usar a entrega local"
 msgid "Server Information"
 msgstr "Informações do Servidor"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nenhum"
@@ -947,8 +957,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Não foram encontradas ferramentas de detecção de lixo electrónico ('spam'). "
-"Instale as aplicações e volte a executar este assistente.</p>"
+"<p>Não foram encontradas ferramentas de detecção de lixo electrónico "
+"('spam'). Instale as aplicações e volte a executar este assistente.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -969,12 +979,14 @@ msgstr "<br>As mensagens de lixo são movidas para a pasta <i>"
 #: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr ""
-"<br>As mensagens de lixo não são movidas para nenhuma pasta em particular.</p>"
+"<br>As mensagens de lixo não são movidas para nenhuma pasta em particular.</"
+"p>"
 
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>A pasta para as mensagens classificadas como incertas (lixo provável) é <i>"
+"<p>A pasta para as mensagens classificadas como incertas (lixo provável) é "
+"<i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -995,30 +1007,29 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Aqui você poderá ter alguma assistência na configuração das regras de "
-"filtragem do KMail para usar algumas das ferramentas anti-vírus.</p>"
-"<p>O assistente poderá detectar estas ferramentas no seu computador, assim como "
+"filtragem do KMail para usar algumas das ferramentas anti-vírus.</p><p>O "
+"assistente poderá detectar estas ferramentas no seu computador, assim como "
 "poderá criar regras de filtragem para classificar as mensagens com estas "
 "ferramentas e para separar as mensagens classificadas como contendo vírus. O "
 "assistente não irá ter em conta nenhumas regras existentes de filtragem: ele "
-"irá sempre adicionar as regras novas.</p>"
-"<p><b>Atenção:</b> Dado que o KMail fica bloqueado durante a procura nas "
-"mensagens por vírus, poderá ter alguns problemas na capacidade de resposta do "
-"KMail, dado que as ferramentas anti-vírus são normalmente consumidoras de "
-"tempo; pense, nesse caso, por favor em apagar as regras de filtragem criadas "
-"pelo assistente para voltar ao comportamento anterior."
+"irá sempre adicionar as regras novas.</p><p><b>Atenção:</b> Dado que o KMail "
+"fica bloqueado durante a procura nas mensagens por vírus, poderá ter alguns "
+"problemas na capacidade de resposta do KMail, dado que as ferramentas anti-"
+"vírus são normalmente consumidoras de tempo; pense, nesse caso, por favor em "
+"apagar as regras de filtragem criadas pelo assistente para voltar ao "
+"comportamento anterior."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1054,16 +1065,14 @@ msgstr "Mover o lixo &provável para:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"A pasta por omissão é a pasta Recebido, mas podê-la-á alterar na área de pastas "
-"em baixo."
-"<p>Nem todas as ferramentas suportam a classificação de lixo provável. Se não "
-"tiver seleccionado uma ferramenta que o suporte, também não poderá seleccionar "
-"qualquer pasta."
+"A pasta por omissão é a pasta Recebido, mas podê-la-á alterar na área de "
+"pastas em baixo.<p>Nem todas as ferramentas suportam a classificação de lixo "
+"provável. Se não tiver seleccionado uma ferramenta que o suporte, também não "
+"poderá seleccionar qualquer pasta."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1073,13 +1082,13 @@ msgstr "Classificar as mensagens com as ferramentas anti-vírus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Deixa que as ferramentas anti-vírus classifiquem as suas mensagens. O "
-"assistente irá criar filtros apropriados. As mensagens são marcadas normalmente "
-"pelas ferramentas, de modo a que os filtros possam reagir a isto e, por "
-"exemplo, possa mover as mensagens com vírus para uma pasta especial."
+"assistente irá criar filtros apropriados. As mensagens são marcadas "
+"normalmente pelas ferramentas, de modo a que os filtros possam reagir a isto "
+"e, por exemplo, possa mover as mensagens com vírus para uma pasta especial."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1088,8 +1097,8 @@ msgstr "Mover as mensagens detectadas com vírus para a pasta seleccionada"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "É criado um filtro para detectar as mensagens infectadas com vírus para uma "
 "pasta predefinida. A pasta por omissão é a do lixo, mas você poderá alterar "
@@ -1101,11 +1110,11 @@ msgstr "Para além disso, marcar as mensagens com vírus como lidas"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Marca as mensagens como lidas que estiverem infectadas com vírus, assim como as "
-"move para a pasta seleccionada."
+"Marca as mensagens como lidas que estiverem infectadas com vírus, assim como "
+"as move para a pasta seleccionada."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1285,8 +1294,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Isto pode acontecer por você não ter permissões para o fazer ou porque a pasta "
-"já existe no servidor; a mensagem de erro comunicada está aqui:"
+"Isto pode acontecer por você não ter permissões para o fazer ou porque a "
+"pasta já existe no servidor; a mensagem de erro comunicada está aqui:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1299,8 +1308,8 @@ msgstr "Erro ao ler a pasta %1 no servidor: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1320,8 +1329,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1352,20 +1361,20 @@ msgstr "Removido"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Nenhuma das identidades corresponde ao destinatário desta mensagem,"
 "<br>escolha por favor qual é o seu endereço de e-mail entre os seguintes:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Diversas identidades correspondem ao receptor desta mensagem,"
-"<br>escolha por favor qual é o seu endereço de e-mail entre os seguintes:"
+"<qt>Diversas identidades correspondem ao receptor desta mensagem,<br>escolha "
+"por favor qual é o seu endereço de e-mail entre os seguintes:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1394,18 +1403,21 @@ msgstr "Ocorreu um erro ao compactar \"%1\". Compactação cancelada."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Esta configuração foi corrigida pelo seu administrador.</p>"
-"<p>Se você pensa que isto é um erro, contacte-o por favor.</p></qt>"
+"<qt><p>Esta configuração foi corrigida pelo seu administrador.</p><p>Se você "
+"pensa que isto é um erro, contacte-o por favor.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Carregar Perfi&l..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configurar a Conta"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Adicionar..."
@@ -1435,6 +1447,11 @@ msgstr "<qt>Deseja mesmo remover a identidade chamada <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Remover a Identidade"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "R&emover"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Adicionar..."
@@ -1443,6 +1460,11 @@ msgstr "Adicionar..."
 msgid "Modify..."
 msgstr "Modificar..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "R&emover"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Escolher por Omissão"
@@ -1459,17 +1481,15 @@ msgstr "&Envio"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contas de envio (adicione pelo menos uma):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
@@ -1491,8 +1511,7 @@ msgstr "Mudar a Predefinição"
 msgid "Common Options"
 msgstr "Opções Comuns"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Confirmar a&ntes de enviar"
@@ -1543,17 +1562,16 @@ msgstr "Domínio &por omissão:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O domínio por omissão é usado para completar os endereços de e-mail que só "
-"consistem do nome do utilizador.</p></qt>"
+"<qt><p>O domínio por omissão é usado para completar os endereços de e-mail "
+"que só consistem do nome do utilizador.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1571,9 +1589,9 @@ msgstr "Adicionar um Transporte"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Por Omissão)"
 
@@ -1656,6 +1674,10 @@ msgstr "Modificar a Conta"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Não foi possível localizar a conta <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Core&s"
@@ -1764,8 +1786,7 @@ msgstr "Ligação Seguida"
 msgid "Misspelled Words"
 msgstr "Palavras Incorrectas"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nova Mensagem"
@@ -1954,8 +1975,8 @@ msgstr "Tópicos fechados por omissão"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Abrir os tópicos com mensagens novas, não-lidas ou i&mportantes e os tópicos "
 "vigiados."
@@ -1966,70 +1987,55 @@ msgstr "Formato da Data"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Podem-se usar estas expressões para a data:</strong></p>"
-"<ul>"
-"<li>d - o dia como um número sem um zero inicial (1-31)</li>"
-"<li>dd - o dia como um número com um zero inicial (01-31)</li>"
-"<li>ddd - o nome do dia abreviado (Seg - Dom)</li>"
-"<li>dddd - O nome do dia longo (Segunda - Domingo)</li>"
-"<li>M - o mês como um número sem o zero inicial (1-12)</li>"
-"<li>MM - o mês como um número com um zero inicial (01-12)</li>"
-"<li>MMM - o nome abreviado do mês (Jan - Dez)</li>"
-"<li>MMMM - o nome longo do mês (Janeiro - Dezembro)</li>"
-"<li>yy - o ano como um número de dois algarismos (00-99)</li>"
-"<li>yyyy - o ano como um número de quatro algarismos (0000-9999)</li></ul>"
-"<p><strong>Estas expressões podem ser usadas para a hora:</string></p> "
-"<ul>"
-"<li>h - a hora sem o zero inicial (0-23 ou 1-12 se for no formato AM/PM)</li>"
-"<li>hh - a hora com o zero inicial (00-23 ou 01-12 se for no formato AM/PM)</li>"
-"<li>m - os minutos sem o zero inicial (0-59)</li>"
-"<li>mm - os minutos com um zero inicial (00-59)</li>"
-"<li>s - os segundos sem o zero inicial (0-59)</li>"
-"<li>ss - os segundos com um zero inicial (00-59)</li>"
-"<li>z - os milisegundos sem os zeros iniciais (0-999)</li>"
-"<li>zzz - os milisegundos com os zeros iniciais (000-999)</li>"
-"<li>AP - mudar para o formato AM/PM. O AP será então substituído por \"AM\" ou "
-"por \"PM\".</li>"
-"<li>ap - mudar para o formato AM/PM. O ap será então substituído por \"am\" ou "
-"por \"pm\".</li>"
-"<li>Z - o fuso-horário no formato numérico (-0500)</li></ul>"
-"<p><strong>Todos os outros caracteres diversos serão ignorados.</strong></p>"
-"</qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Podem-se usar estas expressões para a data:</strong></"
+"p><ul><li>d - o dia como um número sem um zero inicial (1-31)</li><li>dd - o "
+"dia como um número com um zero inicial (01-31)</li><li>ddd - o nome do dia "
+"abreviado (Seg - Dom)</li><li>dddd - O nome do dia longo (Segunda - "
+"Domingo)</li><li>M - o mês como um número sem o zero inicial (1-12)</"
+"li><li>MM - o mês como um número com um zero inicial (01-12)</li><li>MMM - o "
+"nome abreviado do mês (Jan - Dez)</li><li>MMMM - o nome longo do mês "
+"(Janeiro - Dezembro)</li><li>yy - o ano como um número de dois algarismos "
+"(00-99)</li><li>yyyy - o ano como um número de quatro algarismos "
+"(0000-9999)</li></ul><p><strong>Estas expressões podem ser usadas para a "
+"hora:</string></p> <ul><li>h - a hora sem o zero inicial (0-23 ou 1-12 se "
+"for no formato AM/PM)</li><li>hh - a hora com o zero inicial (00-23 ou 01-12 "
+"se for no formato AM/PM)</li><li>m - os minutos sem o zero inicial (0-59)</"
+"li><li>mm - os minutos com um zero inicial (00-59)</li><li>s - os segundos "
+"sem o zero inicial (0-59)</li><li>ss - os segundos com um zero inicial "
+"(00-59)</li><li>z - os milisegundos sem os zeros iniciais (0-999)</"
+"li><li>zzz - os milisegundos com os zeros iniciais (000-999)</li><li>AP - "
+"mudar para o formato AM/PM. O AP será então substituído por \"AM\" ou por "
+"\"PM\".</li><li>ap - mudar para o formato AM/PM. O ap será então substituído "
+"por \"am\" ou por \"pm\".</li><li>Z - o fuso-horário no formato numérico "
+"(-0500)</li></ul><p><strong>Todos os outros caracteres diversos serão "
+"ignorados.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Ao mudar a configuração global dos tópicos, irá sobrepor todos os valores "
 "específicos por cada pasta."
@@ -2046,8 +2052,7 @@ msgstr "Mostrar a barra de es&tado HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Mostrar o e&stado de lixo com cabeçalhos bonitos"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Substituir 'smileys' por 'emoticons'"
@@ -2056,8 +2061,7 @@ msgstr "Substituir 'smileys' por 'emoticons'"
 msgid "Use smaller font for quoted text"
 msgstr "Usar um tipo de letra menor para o texto citado"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Mostrar marcas de citação para expandir/recolher"
@@ -2083,8 +2087,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "Codificação de caracteres de sobrep&osição:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Activar o ícone na bandeja do sistema"
@@ -2187,23 +2190,20 @@ msgstr "<b>%f</b> será substituído pelo nome do ficheiro a editar."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Os seguintes códigos são válidos no texto de resposta:"
-"<br><b>%D</b>: data, <b>%S</b>: assunto,"
-"<br><b>%e</b>: endereço do remetente, <b>%F</b>: nome do remetente, <b>%f</b>"
-": iniciais do remetente,"
-"<br><b>%t</b>: nome e endereço do destinatário, <b>%T</b>"
-": nome do destinatário,"
-"<br><b>%C</b>: nomes dos destinatários de 'carbon copy', <b>%c</b>"
-": nomes e endereços dos destinatários de 'carbon copy'"
-"<br><b>%%</b>: percentagem, <b>%_</b>: espaço, <b>%L</b>: quebra de linha</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Os seguintes códigos são válidos no texto de resposta:<br><b>%D</b>: "
+"data, <b>%S</b>: assunto,<br><b>%e</b>: endereço do remetente, <b>%F</b>: "
+"nome do remetente, <b>%f</b>: iniciais do remetente,<br><b>%t</b>: nome e "
+"endereço do destinatário, <b>%T</b>: nome do destinatário,<br><b>%C</b>: "
+"nomes dos destinatários de 'carbon copy', <b>%c</b>: nomes e endereços dos "
+"destinatários de 'carbon copy'<br><b>%%</b>: percentagem, <b>%_</b>: espaço, "
+"<b>%L</b>: quebra de linha</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2226,21 +2226,20 @@ msgstr "Responder a &todos:"
 msgid "&Forward:"
 msgstr "&Reencaminhar:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Indicador de &citação:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Em %D, escreveu:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Em %D, %F escreveu:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Mensagem Reencaminhada"
 
@@ -2278,8 +2277,8 @@ msgstr "Indique o novo prefixo de reenvio:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Esta lista é percorrida para cada mensagem para procurar uma codificação que "
 "contenha todos os caracteres necessários."
@@ -2317,10 +2316,9 @@ msgstr "Valor"
 msgid "Ne&w"
 msgstr "No&vo"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nome:"
@@ -2329,16 +2327,15 @@ msgstr "&Nome:"
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomeação de anexos compatível com o Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Active esta opção para fazer com que o Outlook(tm) compreenda os nomes de "
 "anexos que contenham caracteres não Ingleses"
@@ -2369,22 +2366,22 @@ msgstr "anexado"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Você optou por codificar os nomes dos anexos que contenham caracteres "
-"não-ingleses de uma forma que é compreendida pelo Outlook(tm) e por outros "
-"clientes de correio que não suportam os nomes de anexos codificados de acordo "
-"com as normas.\n"
-"Lembre-se que o KMail poderá criar mensagens incompatíveis com a norma e, por "
-"consequência, é possível que as suas mensagens não sejam compreendidas pelos "
-"clientes compatíveis com as normas; por isso, a menos que não tenha outra "
-"escolha, você não deverá activar esta opção."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Você optou por codificar os nomes dos anexos que contenham caracteres não-"
+"ingleses de uma forma que é compreendida pelo Outlook(tm) e por outros "
+"clientes de correio que não suportam os nomes de anexos codificados de "
+"acordo com as normas.\n"
+"Lembre-se que o KMail poderá criar mensagens incompatíveis com a norma e, "
+"por consequência, é possível que as suas mensagens não sejam compreendidas "
+"pelos clientes compatíveis com as normas; por isso, a menos que não tenha "
+"outra escolha, você não deverá activar esta opção."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2408,113 +2405,100 @@ msgstr "I&nfra-Estruturas de Cifra"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Os e-mails normalmente vêm em ambos os formatos. Esta opção controla se o "
-"utilizador quer a componente de HTML ou a de texto para ser mostrada.</p>"
-"<p>Mostrar a componente de HTML faz com que a mensagem pareça mais apelativa, "
-"mas ao mesmo tempo aumenta o risco de quebras de segurança.</p>"
-"<p>Se o utilizador mostrar a parte de texto perde muita da formatação da "
-"mensagem, mas torna <em>impossível</em> que explorem problemas de segurança no "
-"motor de HTML do Konqueror.</p>"
-"<p>A opção em baixo protege contra um mau uso comum nas mensagens em HTML. Mas "
-"não pode proteger contra os problemas de segurança desconhecidos do KMail na "
-"altura em que esta versão foi feita.</p>"
-"<p>É por isso aconselhável <em>não</em> preferir o HTML a texto simples.</p>"
-"<p><b>Nota:</b> Pode configurar esta opção ao nível da pasta no menu <i>"
-"Pasta</i> da janela principal do KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Os e-mails normalmente vêm em ambos os formatos. Esta opção controla "
+"se o utilizador quer a componente de HTML ou a de texto para ser mostrada.</"
+"p><p>Mostrar a componente de HTML faz com que a mensagem pareça mais "
+"apelativa, mas ao mesmo tempo aumenta o risco de quebras de segurança.</"
+"p><p>Se o utilizador mostrar a parte de texto perde muita da formatação da "
+"mensagem, mas torna <em>impossível</em> que explorem problemas de segurança "
+"no motor de HTML do Konqueror.</p><p>A opção em baixo protege contra um mau "
+"uso comum nas mensagens em HTML. Mas não pode proteger contra os problemas "
+"de segurança desconhecidos do KMail na altura em que esta versão foi feita.</"
+"p><p>É por isso aconselhável <em>não</em> preferir o HTML a texto simples.</"
+"p><p><b>Nota:</b> Pode configurar esta opção ao nível da pasta no menu "
+"<i>Pasta</i> da janela principal do KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Alguma publicidade por e-mail vem em HTML e contém referências a imagens que "
-"essa publicidade usa para descobrir se o utilizador leu a mensagem deles "
-"(&quot;espiões da Web&quot;).</p>"
-"<p>Não existe uma razão válida para ler as imagens da Net desta maneira, dado "
-"que o emissor pode sempre anexar as imagens necessárias directamente.</p>"
-"<p>Para evitar este mau uso da capacidade de mostrar o HTML do KMail, esta "
-"opção vem <em>desligada</em> por omissão.</p>"
-"<p>Se, contudo, preferir ver as imagens nas mensagens de HTML que não foram "
-"anexadas a ela, pode activar a opção, mas deverá ficar a saber do possível "
-"problema.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Alguma publicidade por e-mail vem em HTML e contém referências a "
+"imagens que essa publicidade usa para descobrir se o utilizador leu a "
+"mensagem deles (&quot;espiões da Web&quot;).</p><p>Não existe uma razão "
+"válida para ler as imagens da Net desta maneira, dado que o emissor pode "
+"sempre anexar as imagens necessárias directamente.</p><p>Para evitar este "
+"mau uso da capacidade de mostrar o HTML do KMail, esta opção vem "
+"<em>desligada</em> por omissão.</p><p>Se, contudo, preferir ver as imagens "
+"nas mensagens de HTML que não foram anexadas a ela, pode activar a opção, "
+"mas deverá ficar a saber do possível problema.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Política de Notificação da Disposição da Mensagem</h3>"
-"<p>As MDNs são uma generalização do que é chamado normalmente como <b>"
-"confirmação de leitura</b>. O autor da mensagem pede uma notificação de "
-"disposição para ser enviada e o programa de correio do destinatário gera uma "
-"resposta a partir da qual o autor pode saber o que aconteceu à sua mensagem. Os "
-"tipos de disposição mais normais incluem o <b>mostrada</b> (i.e. lida), <b>"
-"removida</b> e <b>despachada</b> (p.ex. reencaminhado).</p>"
-"<p>As seguintes opções estão disponíveis para controlar o envio de MDNs pelo "
-"KMail:</p>"
-"<ul>"
-"<li><em>Ignorar</em>: Ignora os pedidos de notificações de disposição. Não será "
-"enviado nenhum MDN automaticamente (recomendado).</li>"
-"<li><em>Perguntar</em>: Os pedidos de resposta só são enviados após pedir "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Política de Notificação da Disposição da Mensagem</h3><p>As MDNs são "
+"uma generalização do que é chamado normalmente como <b>confirmação de "
+"leitura</b>. O autor da mensagem pede uma notificação de disposição para ser "
+"enviada e o programa de correio do destinatário gera uma resposta a partir "
+"da qual o autor pode saber o que aconteceu à sua mensagem. Os tipos de "
+"disposição mais normais incluem o <b>mostrada</b> (i.e. lida), <b>removida</"
+"b> e <b>despachada</b> (p.ex. reencaminhado).</p><p>As seguintes opções "
+"estão disponíveis para controlar o envio de MDNs pelo KMail:</"
+"p><ul><li><em>Ignorar</em>: Ignora os pedidos de notificações de disposição. "
+"Não será enviado nenhum MDN automaticamente (recomendado).</"
+"li><li><em>Perguntar</em>: Os pedidos de resposta só são enviados após pedir "
 "permissão ao utilizador. Desta forma, você pode enviar os MDNs para as "
-"mensagens seleccionadas e recusar ou ignorar outras.</li>"
-"<li><em>Recusar</em>: Envia sempre uma notificação de <b>recusada</b>"
-". Isto só é <em>ligeiramente</em> melhor do que enviar sempre os MDNs. O autor "
-"irá saber à mesma que as mensagens foram acedidas, só não saberá se as mesmas "
-"foram removidas ou lidas, etc.</li>"
-"<li><em>Enviar sempre</em>: Envia sempre a notificação de disposição pedida. "
-"Isto significa que o autor da mensagem fica a saber quando a mensagem foi "
-"acedida e, para além disso, o que aconteceu a ela (mostrada, removida, etc.). "
-"Esta opção é fortemente desencorajada, mas atendendo a que faz sentido p.ex. na "
-"gestão de relações com o cliente (CRM), foi tornada disponível.</li></ul></qt>"
+"mensagens seleccionadas e recusar ou ignorar outras.</li><li><em>Recusar</"
+"em>: Envia sempre uma notificação de <b>recusada</b>. Isto só é "
+"<em>ligeiramente</em> melhor do que enviar sempre os MDNs. O autor irá saber "
+"à mesma que as mensagens foram acedidas, só não saberá se as mesmas foram "
+"removidas ou lidas, etc.</li><li><em>Enviar sempre</em>: Envia sempre a "
+"notificação de disposição pedida. Isto significa que o autor da mensagem "
+"fica a saber quando a mensagem foi acedida e, para além disso, o que "
+"aconteceu a ela (mostrada, removida, etc.). Esta opção é fortemente "
+"desencorajada, mas atendendo a que faz sentido p.ex. na gestão de relações "
+"com o cliente (CRM), foi tornada disponível.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2530,16 +2514,16 @@ msgstr "Permitir o carregamento das referências e&xternas da Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>ATENÇÃO:</b> Se usar HTML no seu e-mail, torna-se mais vulnerável a 'spam' e "
-"pode aumentar o nível de susceptibilidade do seu sistema a ataques externos e "
-"aproveitamento de falhas de segurança.<a href=\"whatsthis:%1\">"
-"Mais sobre os e-mails de HTML...</a> <a href=\"whatsthis:%2\">"
-"Mais sobre as referências externas...</a>"
+"<b>ATENÇÃO:</b> Se usar HTML no seu e-mail, torna-se mais vulnerável a "
+"'spam' e pode aumentar o nível de susceptibilidade do seu sistema a ataques "
+"externos e aproveitamento de falhas de segurança.<a href=\"whatsthis:"
+"%1\">Mais sobre os e-mails de HTML...</a> <a href=\"whatsthis:%2\">Mais "
+"sobre as referências externas...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2600,8 +2584,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>AVISO:</b> A devolução incondicional de avisos quebra a sua privacidade.<a "
-"href=\"whatsthis:%1\">Mais...</a>"
+"<b>AVISO:</b> A devolução incondicional de avisos quebra a sua privacidade."
+"<a href=\"whatsthis:%1\">Mais...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2622,8 +2606,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Esta opção precisa do dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "sem 'proxy'"
@@ -2652,8 +2635,8 @@ msgstr "E&xcluir as mensagens importantes da expiração"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Ao tentar encontrar as mensagens não-lidas:"
 
@@ -2677,8 +2660,8 @@ msgstr "Circular em Todas as Pastas"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Se entrar numa pasta:"
 
@@ -2747,27 +2730,24 @@ msgstr "Directorias (formato \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Isto selecciona o formato das pastas locais da caixa de correio:</p>"
-"<p><b>mbox:</b> As pastas de correio do KMail são representadas por diferentes "
-"ficheiros. As mensagens individuais são separadas umas das outras por uma linha "
-"a começar por \"From \". Isto poupa espaço em disco, mas poderá ser menos "
-"robusto, p.ex. ao mover mensagens entre pastas.</p>"
-"<p><b>maildir:</b> As pastas de correio do KMail são representadas por pastas "
-"reais no disco. As mensagens individuais são ficheiros em separado. Isto pode "
-"desperdiçar algum espaço em disco, mas torna-se mais robusto, p.ex. ao mover as "
-"mensagens entre pastas.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Isto selecciona o formato das pastas locais da caixa de correio:</"
+"p><p><b>mbox:</b> As pastas de correio do KMail são representadas por "
+"diferentes ficheiros. As mensagens individuais são separadas umas das outras "
+"por uma linha a começar por \"From \". Isto poupa espaço em disco, mas "
+"poderá ser menos robusto, p.ex. ao mover mensagens entre pastas.</"
+"p><p><b>maildir:</b> As pastas de correio do KMail são representadas por "
+"pastas reais no disco. As mensagens individuais são ficheiros em separado. "
+"Isto pode desperdiçar algum espaço em disco, mas torna-se mais robusto, p."
+"ex. ao mover as mensagens entre pastas.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2800,55 +2780,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ao passar para a próxima mensagem não-lida, pode ocorrer que já não existam "
-"mensagens não-lidas por baixo da mensagem actual.</p>"
-"<p><b>Não circular:</b> A procura irá terminar na última mensagem da pasta "
-"actual.</p>"
-"<p><b>Circular na pasta actual:</b> A pesquisa irá continuar no topo da lista "
-"de mensagens, mas sem ir para outra pasta.</p>"
-"<p><b>Circular em todas as pastas:</b> A pesquisa irá continuar no topo da "
-"lista de mensagens. Se não forem encontradas mais nenhumas mensagens nesta "
-"lista irá continuar na próxima pasta.</p>"
-"<p>Da mesma forma, ao passar para a mensagem anterior não-lida, a pesquisa irá "
-"recomeçar do fim da lista de mensagens e continuar para a pasta anterior, "
-"dependendo da opção que estiver assinalada.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Ao passar para a próxima mensagem não-lida, pode ocorrer que já não "
+"existam mensagens não-lidas por baixo da mensagem actual.</p><p><b>Não "
+"circular:</b> A procura irá terminar na última mensagem da pasta actual.</"
+"p><p><b>Circular na pasta actual:</b> A pesquisa irá continuar no topo da "
+"lista de mensagens, mas sem ir para outra pasta.</p><p><b>Circular em todas "
+"as pastas:</b> A pesquisa irá continuar no topo da lista de mensagens. Se "
+"não forem encontradas mais nenhumas mensagens nesta lista irá continuar na "
+"próxima pasta.</p><p>Da mesma forma, ao passar para a mensagem anterior não-"
+"lida, a pesquisa irá recomeçar do fim da lista de mensagens e continuar para "
+"a pasta anterior, dependendo da opção que estiver assinalada.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A indexação de texto completo permite pesquisas muito rápidas no conteúdo "
-"das suas mensagens. Quando estiver activa, a janela de procura irá funcionar "
-"bastante depressa. Do mesmo modo, a barra da ferramenta de procura irá também "
-"seleccionar as mensagens com base no conteúdo.</p>"
-"<p>Ela ocupa uma certa quantidade de espaço em disco (cerca de metade do espaço "
-"das mensagens).</p>"
-"<p>Depois de activado, o índice terá de ser construído, mas poderá continuar a "
-"usar o KMail enquanto esta operação decorre.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>A indexação de texto completo permite pesquisas muito rápidas no "
+"conteúdo das suas mensagens. Quando estiver activa, a janela de procura irá "
+"funcionar bastante depressa. Do mesmo modo, a barra da ferramenta de procura "
+"irá também seleccionar as mensagens com base no conteúdo.</p><p>Ela ocupa "
+"uma certa quantidade de espaço em disco (cerca de metade do espaço das "
+"mensagens).</p><p>Depois de activado, o índice terá de ser construído, mas "
+"poderá continuar a usar o KMail enquanto esta operação decorre.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2915,11 +2885,11 @@ msgstr "&Esconder as pastas de 'groupware'"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Quando a opção estiver activa, você não irá ver as pastas de recursos do IMAP "
-"na árvore de pastas."
+"Quando a opção estiver activa, você não irá ver as pastas de recursos do "
+"IMAP na árvore de pastas."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2927,11 +2897,11 @@ msgstr "M&ostrar apenas as pastas de recursos para esta conta"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Quando a opção estiver activa, você não irá ver as pastas normais de correio na "
-"árvore de pastas que estiver configurada para 'groupware'."
+"Quando a opção estiver activa, você não irá ver as pastas normais de correio "
+"na árvore de pastas que estiver configurada para 'groupware'."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2960,8 +2930,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Active esta opção para fazer com que o Outlook(tm) compreenda as suas respostas "
-"aos convites"
+"Active esta opção para fazer com que o Outlook(tm) compreenda as suas "
+"respostas aos convites"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2972,8 +2942,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Active esta opção para fazer com que o Outlook(tm) compreenda as suas respostas "
-"aos convites"
+"Active esta opção para fazer com que o Outlook(tm) compreenda as suas "
+"respostas aos convites"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2989,22 +2959,21 @@ msgid ""
 msgstr ""
 "O Microsoft Outlook, ao ser usado en conjunto com um servidor Microsoft "
 "Exchange, tem um problema na compreensão do e-mail de 'groupware' compatível "
-"com as normas. Active esta opção de modo a enviar os convites de 'groupware' de "
-"forma que o Microsoft Exchange compreenda."
+"com as normas. Active esta opção de modo a enviar os convites de 'groupware' "
+"de forma que o Microsoft Exchange compreenda."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Nomeação de anexos compatível com o Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Envio automático de convites "
@@ -3019,24 +2988,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Os convites são normalmente enviados como anexos de uma mensagem. Esta "
 "opção muda as mensagens dos convites para dentro do texto da mensagem "
-"propriamente dita; isto é necessário para enviar os convites e respostas para o "
-"Microsoft Outlook."
-"<br>Mas, se o fizer, nunca mais poderá obter o texto descritivo que os "
-"programas de e-mail podem ler; como tal, para as pessoas que tenham programas "
-"de correio electrónico que não compreendam os convites, as mensagens "
-"resultantes irão parecer bastante esquisitas."
-"<br>As pessoas que tiverem programas de correio electrónico que compreendam os "
+"propriamente dita; isto é necessário para enviar os convites e respostas "
+"para o Microsoft Outlook.<br>Mas, se o fizer, nunca mais poderá obter o "
+"texto descritivo que os programas de e-mail podem ler; como tal, para as "
+"pessoas que tenham programas de correio electrónico que não compreendam os "
+"convites, as mensagens resultantes irão parecer bastante esquisitas.<br>As "
+"pessoas que tiverem programas de correio electrónico que compreendam os "
 "convites serão capazes à mesma de trabalhar com isto.</qt>"
 
 #: configuredialog.cpp:5048
@@ -3142,31 +3110,28 @@ msgstr "Encaminhamento"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui poderá adicionar, editar e remover os modelos personalizados das "
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Aqui poderá adicionar, editar e remover os modelos personalizados das "
 "mensagens, que poderá usar quando compor uma mensagem de resposta ou de "
 "encaminhamento. Crie o modelo personalizado, seleccionando-o com o botão "
 "direito do rato ou com o menu da barra de ferramentas. Do mesmo modo, poderá "
 "associar uma combinação de teclas ao modelo, para as operações serem mais "
-"rápidas.</p>"
-"<p>Os modelos de mensagens suportam os comandos de substituição, bastando para "
-"tal escrevê-los ou seleccionando-os no menu <i>Inserir um comando</i>.</p>"
-"<p>Existem quatro tipos de modelos personalizados: usados para a <i>Resposta</i>"
-", <i>Resposta para Todos</i>, <i>Encaminhamento</i> e <i>Universal</i>"
-", que podem ser usados para todos os tipos de operações. Não poderá associar "
-"combinações de teclas aos modelos <i>Universais</i>.</p></qt>"
+"rápidas.</p><p>Os modelos de mensagens suportam os comandos de substituição, "
+"bastando para tal escrevê-los ou seleccionando-os no menu <i>Inserir um "
+"comando</i>.</p><p>Existem quatro tipos de modelos personalizados: usados "
+"para a <i>Resposta</i>, <i>Resposta para Todos</i>, <i>Encaminhamento</i> e "
+"<i>Universal</i>, que podem ser usados para todos os tipos de operações. Não "
+"poderá associar combinações de teclas aos modelos <i>Universais</i>.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3183,15 +3148,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3256,8 +3221,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Já existe uma lista de distribuição com o nome <b>%1</b>"
-". Por favor seleccione um nome diferente.</qt>"
+"<qt>Já existe uma lista de distribuição com o nome <b>%1</b>. Por favor "
+"seleccione um nome diferente.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3266,8 +3231,8 @@ msgstr "Editar a Identidade"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3370,8 +3335,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Não é possível expirar as mensagens da pasta %1: a pasta de destino %2 não foi "
-"encontrada"
+"Não é possível expirar as mensagens da pasta %1: a pasta de destino %2 não "
+"foi encontrada"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3447,7 +3412,8 @@ msgstr "Apagar permanentemente"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Nota: A acção de expirar será aplicada imediatamente após confirmar as opções."
+"Nota: A acção de expirar será aplicada imediatamente após confirmar as "
+"opções."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3530,6 +3496,11 @@ msgstr "Seleccione a Pasta"
 msgid "Filters"
 msgstr "Filtro %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Seleccionar Todo o Texto"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3561,11 +3532,11 @@ msgstr "Registar as actividades do fi&ltro"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Você poderá activar ou desactivar as actividades do filtro aqui. Obviamente, os "
-"dados do registo são reunidos e mostrados apenas quando o registo fora "
+"Você poderá activar ou desactivar as actividades do filtro aqui. Obviamente, "
+"os dados do registo são reunidos e mostrados apenas quando o registo fora "
 "activado."
 
 #: filterlogdlg.cpp:83
@@ -3582,15 +3553,17 @@ msgstr "Registar a avaliação da &regra de filtragem"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Você poderá controlar o resultado no registo, no que respeita às regras de "
-"filtragem dos filtros aplicados: se tiver esta opção assinalada, irá ter algum "
-"resultado detalhado para cada regra de filtragem individual; em alternativa, só "
-"será dado o resultado da avaliação de todas as regras num único filtro."
+"filtragem dos filtros aplicados: se tiver esta opção assinalada, irá ter "
+"algum resultado detalhado para cada regra de filtragem individual; em "
+"alternativa, só será dado o resultado da avaliação de todas as regras num "
+"único filtro."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3610,15 +3583,15 @@ msgstr "ilimitado"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "A reunião dos dados de registo usa a memória para guardar temporariamente os "
 "dados do registo; aqui, você poderá limitar a quantidade máxima de memória a "
-"usar: se o tamanho dos dados de registo reunidos exceder este limite, os dados "
-"anteriores serão eliminados até que o limite não seja mais excedido."
+"usar: se o tamanho dos dados de registo reunidos exceder este limite, os "
+"dados anteriores serão eliminados até que o limite não seja mais excedido."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3628,7 +3601,7 @@ msgstr ""
 "Não foi possível gravar o ficheiro %1:\n"
 "A \"%2\" é a descrição detalhada do erro."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Erro do KMail"
@@ -3669,13 +3642,14 @@ msgstr "Identificador do &utilizador:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"O Identificador do Utilizador é o nome do utilizador no servidor de IMAP. Este "
-"poderá ser um simples nome de utilizador ou então o endereço de e-mail completo "
-"do utilizador; o nome da sua conta no servidor dir-lhe-á qual é que é."
+"O Identificador do Utilizador é o nome do utilizador no servidor de IMAP. "
+"Este poderá ser um simples nome de utilizador ou então o endereço de e-mail "
+"completo do utilizador; o nome da sua conta no servidor dir-lhe-á qual é que "
+"é."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3726,11 +3700,11 @@ msgstr "Não tem permissões de leitura/escrita na sua pasta de lixo."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"A informação ainda não foi transferida do servidor, use por favor o \"Verificar "
-"o Correio\"."
+"A informação ainda não foi transferida do servidor, use por favor o "
+"\"Verificar o Correio\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3740,8 +3714,7 @@ msgstr "Erro: não está nenhuma conta de IMAP definida para esta pasta"
 msgid "Connecting to server %1, please wait..."
 msgstr "A ligar ao servidor %1, espere por favor..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Erro ao ligar ao servidor %1"
@@ -3771,11 +3744,11 @@ msgstr "Adicionar Permissões"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Deseja mesmo remover as suas próprias permissões para esta pasta? Você não será "
-"mais capaz de aceder a ela depois."
+"Deseja mesmo remover as suas próprias permissões para esta pasta? Você não "
+"será mais capaz de aceder a ela depois."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3806,7 +3779,7 @@ msgstr "Utilização:"
 msgid "Select Folder"
 msgstr "Seleccione a Pasta"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Pastas Locais"
@@ -3830,13 +3803,13 @@ msgstr "Seleccionar o Atalho da Pasta"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Para seleccionar uma tecla ou uma combinação de teclas que seleccionam a "
-"pasta actual, carregue no botão abaixo e carregue depois na tecla ou teclas que "
-"deseja associar a esta pasta.</qt>"
+"pasta actual, carregue no botão abaixo e carregue depois na tecla ou teclas "
+"que deseja associar a esta pasta.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3857,13 +3830,22 @@ msgstr "C&ancelar"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>A pasta que removeu foi associada à conta <b>%1</b> "
-"que entregou correio nela. A pasta onde a conta passa a entregar o correio novo "
-"voltou a ser a pasta Recebido principal.</qt>"
+"<qt>A pasta que removeu foi associada à conta <b>%1</b> que entregou correio "
+"nela. A pasta onde a conta passa a entregar o correio novo voltou a ser a "
+"pasta Recebido principal.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3885,7 +3867,8 @@ msgid ""
 "Resets the quick search so that all messages are shown again."
 msgstr ""
 "Reiniciar a Procura Rápida.\n"
-"Repõe a pesquisa rápida, de modo que todas as mensagens são mostradas de novo."
+"Repõe a pesquisa rápida, de modo que todas as mensagens são mostradas de "
+"novo."
 
 #: headerlistquicksearch.cpp:69
 msgid "Stat&us:"
@@ -3988,77 +3971,18 @@ msgstr "Estado de Lixo:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e"
-"<br>m"
-"<br> "
-"<br>e"
-"<br>m"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br></b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>M<br>e<br>n<br>s<br>a<br>g<br>e<br>m<br> <br>e<br>m<br> "
+"<br>H<br>T<br>M<br>L<br></b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt><b>"
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e"
-"<br>m"
-"<br> "
-"<br>s"
-"<br>e"
-"<br>m"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br></b></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><b><br>M<br>e<br>n<br>s<br>a<br>g<br>e<br>m<br> <br>s<br>e<br>m<br> "
+"<br>H<br>T<br>M<br>L<br></b></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4070,19 +3994,14 @@ msgstr "O seu &nome:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>O seu nome</h3>"
-"<p>Este campo deverá conter o seu nome, tal como deseja que apareça no "
-"cabeçalho do e-mail que é enviado;</p>"
-"<p>se o deixar em branco, o seu nome real não irá aparecer, somente o endereço "
-"de e-mail.</p></qt>"
+"<qt><h3>O seu nome</h3><p>Este campo deverá conter o seu nome, tal como "
+"deseja que apareça no cabeçalho do e-mail que é enviado;</p><p>se o deixar "
+"em branco, o seu nome real não irá aparecer, somente o endereço de e-mail.</"
+"p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4090,17 +4009,13 @@ msgstr "Organi&zação:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organização</h3>"
-"<p>Este campo deverá conter o nome da sua organização, tal como quer que seja "
-"mostrado no cabeçalho do e-mail que é enviado.</p>"
-"<p>É seguro (e normal) deixar isto em branco.</p></qt>"
+"<qt><h3>Organização</h3><p>Este campo deverá conter o nome da sua "
+"organização, tal como quer que seja mostrado no cabeçalho do e-mail que é "
+"enviado.</p><p>É seguro (e normal) deixar isto em branco.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4109,20 +4024,15 @@ msgstr "&Endereço de e-mail:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Endereço de e-mail</h3>"
-"<p>Este campo deverá conter o seu endereço completo de e-mail.</p>"
-"<p>Se você o deixar em branco ou o tiver errado, as pessoas terão problemas a "
-"responder-lhe.</p></qt>"
+"<qt><h3>Endereço de e-mail</h3><p>Este campo deverá conter o seu endereço "
+"completo de e-mail.</p><p>Se você o deixar em branco ou o tiver errado, as "
+"pessoas terão problemas a responder-lhe.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4131,21 +4041,12 @@ msgstr "&Endereço de e-mail:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4165,24 +4066,22 @@ msgstr "A Sua Chave de Assinatura OpenPGP"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Seleccione a chave de OpenPGP que deve ser usada para assinar digitalmente as "
-"suas mensagens."
+"Seleccione a chave de OpenPGP que deve ser usada para assinar digitalmente "
+"as suas mensagens."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>A chave de OpenPGP que você escolher aqui será usada para assinar "
-"digitalmente as mensagens. Você também poderá usar as chaves do GnuPG.</p>"
-"Você poderá deixar isto em branco, mas o KMail não conseguirá assinar "
-"digitalmente os e-mails; as funções normais de e-mail não serão afectadas.</p>"
-"Você poderá saber mais sobre as chaves em <a>http://www.gnupg.org</a></qt>"
+"<qt><p>A chave de OpenPGP que você escolher aqui será usada para assinar "
+"digitalmente as mensagens. Você também poderá usar as chaves do GnuPG.</"
+"p>Você poderá deixar isto em branco, mas o KMail não conseguirá assinar "
+"digitalmente os e-mails; as funções normais de e-mail não serão afectadas.</"
+"p>Você poderá saber mais sobre as chaves em <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4194,31 +4093,28 @@ msgstr "A Sua Chave de Encriptação OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Seleccione a chave de OpenPGP que deve ser usada para cifrar para si próprio e "
-"para a funcionalidade de \"Anexar a Minha Chave Pública\" no compositor."
+"Seleccione a chave de OpenPGP que deve ser usada para cifrar para si próprio "
+"e para a funcionalidade de \"Anexar a Minha Chave Pública\" no compositor."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>A chave de OpenPGP que você escolher aqui será usada para cifrar as "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>A chave de OpenPGP que você escolher aqui será usada para cifrar as "
 "mensagens para si próprio e para a funcionalidade de \"Anexar a Minha Chave "
-"Pública\". Você também poderá usar as chaves do GnuPG.</p>"
-"<p>Você poderá deixar isto em branco, mas o KMail não conseguirá cifrar as "
-"cópias das mensagens enviadas para si com o OpenPGP; as funções normais de "
-"e-mail não serão afectadas.</p>"
-"<p>Você poderá saber mais sobre as chaves em <a>http://www.gnupg.org</a></qt>"
+"Pública\". Você também poderá usar as chaves do GnuPG.</p><p>Você poderá "
+"deixar isto em branco, mas o KMail não conseguirá cifrar as cópias das "
+"mensagens enviadas para si com o OpenPGP; as funções normais de e-mail não "
+"serão afectadas.</p><p>Você poderá saber mais sobre as chaves em <a>http://"
+"www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4233,23 +4129,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Seleccione o certificado de S/MIME que deve ser usado para assinar digitalmente "
-"as suas mensagens."
+"Seleccione o certificado de S/MIME que deve ser usado para assinar "
+"digitalmente as suas mensagens."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O certificado de S/MIME (X.509) que você escolher aqui será usado para "
-"assinar digitalmente as mensagens.</p>"
-"<p>Você poderá deixar isto em branco, mas o KMail não conseguirá assinar "
-"digitalmente os e-mails com o S/MIME; as funções normais de e-mail não serão "
-"afectadas.</p></qt>"
+"<qt><p>O certificado de S/MIME (X.509) que você escolher aqui será usado "
+"para assinar digitalmente as mensagens.</p><p>Você poderá deixar isto em "
+"branco, mas o KMail não conseguirá assinar digitalmente os e-mails com o S/"
+"MIME; as funções normais de e-mail não serão afectadas.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4261,27 +4154,25 @@ msgstr "O Seu Certificado de Cifra S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Seleccione o certificado de S/MIME que deverá ser usado ao cifrar para si "
 "próprio e para a funcionalidade \"Anexar o Meu Certificado\" do compositor."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O certificado de S/MIME que escolher aqui será usado para cifrar as "
+"<qt><p>O certificado de S/MIME que escolher aqui será usado para cifrar as "
 "mensagens para si próprio e para a funcionalidade de \"Anexar o Meu "
-"Certificado\" no compositor.</p>Você poderá deixar isto em branco, mas o KMail "
-"não conseguirá cifrar as mensagens enviadas para si com o S/MIME; as funções "
-"normais de e-mail não serão afectadas.</p></qt>"
+"Certificado\" no compositor.</p>Você poderá deixar isto em branco, mas o "
+"KMail não conseguirá cifrar as mensagens enviadas para si com o S/MIME; as "
+"funções normais de e-mail não serão afectadas.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4301,24 +4192,20 @@ msgstr "Endereço de res&posta:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Endereços de Resposta</h3>"
-"<p>Isto define o cabeçalho de <tt>Reply-to:</tt> para conter um endereço de "
-"e-mail diferente do endereço normal <tt>From:</tt>.</p>"
-"<p>Isto pode ser útil se você tiver um grupo de pessoas que trabalhem em "
-"conjunto com papéis semelhantes. Por exemplo, você poderá querer que os e-mails "
-"enviados contenham o seu endereço no campo <tt>From:</tt>"
-", mas que as resposta vão para o endereço de um grupo.</p></p>"
-"Se tiver dúvidas, deixe este campo em branco.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Endereços de Resposta</h3><p>Isto define o cabeçalho de <tt>Reply-to:"
+"</tt> para conter um endereço de e-mail diferente do endereço normal "
+"<tt>From:</tt>.</p><p>Isto pode ser útil se você tiver um grupo de pessoas "
+"que trabalhem em conjunto com papéis semelhantes. Por exemplo, você poderá "
+"querer que os e-mails enviados contenham o seu endereço no campo <tt>From:</"
+"tt>, mas que as resposta vão para o endereço de um grupo.</p></p>Se tiver "
+"dúvidas, deixe este campo em branco.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4326,25 +4213,20 @@ msgstr "Endereços de &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Endereços BCC (Blind Carbon Copy)</h3>"
-"<p>Os endereços que indicar aqui serão adicionados a cada mensagem enviada com "
-"esta identidade. Elas não serão visíveis para os outros destinatários.</p>"
-"<p>Esta é vulgarmente usada para enviar uma cópia de cada mensagem enviada para "
-"outra conta sua.</p>"
-"<p>Para indicar mais do que um endereço, use vírgulas para separar a lista de "
-"destinatários do BCC.</p>"
-"<p>Se tiver dúvidas, deixe este campo em branco.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Endereços BCC (Blind Carbon Copy)</h3><p>Os endereços que indicar "
+"aqui serão adicionados a cada mensagem enviada com esta identidade. Elas não "
+"serão visíveis para os outros destinatários.</p><p>Esta é vulgarmente usada "
+"para enviar uma cópia de cada mensagem enviada para outra conta sua.</"
+"p><p>Para indicar mais do que um endereço, use vírgulas para separar a lista "
+"de destinatários do BCC.</p><p>Se tiver dúvidas, deixe este campo em branco."
+"</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4382,7 +4264,7 @@ msgstr "A&ssinatura"
 msgid "&Picture"
 msgstr "I&magem"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Endereço de E-mail Inválido"
 
@@ -4398,15 +4280,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Uma das chaves de assinatura do OpenPGP não contém nenhum ID de utilizador com "
-"o endereço de e-mail configurado para esta identidade (%1).\n"
-"Isto poderá resultar em mensagens de aviso do lado do destinatário, ao tentar "
-"verificar as assinaturas feitas com esta configuração."
+"Uma das chaves de assinatura do OpenPGP não contém nenhum ID de utilizador "
+"com o endereço de e-mail configurado para esta identidade (%1).\n"
+"Isto poderá resultar em mensagens de aviso do lado do destinatário, ao "
+"tentar verificar as assinaturas feitas com esta configuração."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Uma das chaves de cifra do OpenPGP não contém nenhum ID de utilizador com o "
 "endereço de e-mail configurado para esta identidade (%1)."
@@ -4418,18 +4300,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Um dos certificados de assinatura do S/MIME não contém nenhum ID de utilizador "
-"com o endereço de e-mail configurado para esta identidade (%1).\n"
-"Isto poderá resultar em mensagens de aviso do lado do destinatário, ao tentar "
-"verificar as assinaturas feitas com esta configuração."
+"Um dos certificados de assinatura do S/MIME não contém nenhum ID de "
+"utilizador com o endereço de e-mail configurado para esta identidade (%1).\n"
+"Isto poderá resultar em mensagens de aviso do lado do destinatário, ao "
+"tentar verificar as assinaturas feitas com esta configuração."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Um dos certificados de cifra do S/MIME não contém nenhum ID de utilizador com o "
-"endereço de e-mail configurado para esta identidade (%1)."
+"Um dos certificados de cifra do S/MIME não contém nenhum ID de utilizador "
+"com o endereço de e-mail configurado para esta identidade (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4448,16 +4330,16 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"A pasta de enviados personalizada para a identidade \"%1\" (já) não existe; por "
-"isso, será usada a pasta de enviados por omissão."
+"A pasta de enviados personalizada para a identidade \"%1\" (já) não existe; "
+"por isso, será usada a pasta de enviados por omissão."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"A pasta de modelos personalizada para a identidade \"%1\" (já) não existe; por "
-"isso, será usada a pasta de modelos por omissão."
+"A pasta de modelos personalizada para a identidade \"%1\" (já) não existe; "
+"por isso, será usada a pasta de modelos por omissão."
 
 #: identitydialog.cpp:662
 msgid ""
@@ -4469,8 +4351,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Por omissão)"
 
@@ -4514,23 +4396,23 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"O KMail detectou um item de prefixo na configuração da conta \"%1\", o qual é "
-"obsoleto com o suporte de espaços de nomes do IMAP."
+"O KMail detectou um item de prefixo na configuração da conta \"%1\", o qual "
+"é obsoleto com o suporte de espaços de nomes do IMAP."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "A configuração foi migrada automaticamente mas você deverá verificá-la."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Não foi possível migrar automaticamente a sua configuração, como tal verifique "
-"a configuração da sua conta."
+"Não foi possível migrar automaticamente a sua configuração, como tal "
+"verifique a configuração da sua conta."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4570,14 +4452,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Erro: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "A ligação ao servidor %1 foi fechada ou expirou inesperadamente. Será "
 "restabelecida automaticamente, se possível."
@@ -4729,14 +4616,14 @@ msgstr "Arquivos da Lista"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4765,228 +4652,182 @@ msgstr "Chaves de Cifra Não Utilizáveis"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> "
-"(ID 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> "
-"(ID 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> (ID 0x"
+"%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> (ID 0x"
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p><p>expira em "
+"menos de um dia.</p>\n"
+"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p><p>expira em "
+"menos de %n dias.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>O seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
+"(número de série 0x%2)</p><p>expira em menos de um dia.</p>\n"
 "<p>O seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"(número de série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>O certificado S/MIME de</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado S/MIME de</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>O certificado S/MIME de</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado S/MIME de</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5000,217 +4841,171 @@ msgstr "Certificado S/MIME Expira Brevemente"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> "
-"(ID 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> "
-"(ID 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> (ID 0x"
+"%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>A sua chave de assinatura do OpenPGP</p><p align=center><b>%1</b> (ID 0x"
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>A sua chave de cifra do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p><p>expira em "
+"menos de um dia.</p>\n"
+"<p>A chave do OpenPGP</p><p align=center><b>%1</b> (ID 0x%2)</p><p>expira em "
+"menos de %n dias.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o seu "
+"certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado de raiz</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado de raiz</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p>"
-"<p>para o certificado S/MIME</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado intermédio da AC</p><p align=center><b>%3</b></p><p>para o "
+"certificado S/MIME</p><p align=center><b>%1</b> (número de série 0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>O seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
+"(número de série 0x%2)</p><p>expira em menos de um dia.</p>\n"
 "<p>O seu certificado S/MIME de assinatura</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"(número de série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O seu certificado S/MIME de cifra</p><p align=center><b>%1</b> (número de "
+"série 0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>O certificado S/MIME de</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>O certificado S/MIME de</p><p align=center><b>%1</b> "
-"(número de série 0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>O certificado S/MIME de</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>O certificado S/MIME de</p><p align=center><b>%1</b> (número de série 0x"
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5222,16 +5017,17 @@ msgstr "Certificado S/MIME Expira Brevemente"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Uma ou mais chaves configuradas para si de OpenPGP ou algum certificado de "
-"S/MIME não pode ser usado para a cifra. Por favor, configure de novo as suas "
-"chaves e certificados de cifra para esta identidade na janela de configuração "
-"da identidade.\n"
+"Uma ou mais chaves configuradas para si de OpenPGP ou algum certificado de S/"
+"MIME não pode ser usado para a cifra. Por favor, configure de novo as suas "
+"chaves e certificados de cifra para esta identidade na janela de "
+"configuração da identidade.\n"
 "Se optar por continuar e as chaves forem necessárias mais tarde, você será "
 "avisado para indicar as chaves a usar."
 
@@ -5247,8 +5043,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Uma ou mais chaves configuradas para si de OpenPGP ou algum certificado de "
-"S/MIME não pode ser usado para a assinatura. Por favor, configure de novo as "
+"Uma ou mais chaves configuradas para si de OpenPGP ou algum certificado de S/"
+"MIME não pode ser usado para a assinatura. Por favor, configure de novo as "
 "suas chaves e certificados de assinatura para esta identidade na janela de "
 "configuração da identidade.\n"
 "Se optar por continuar e as chaves forem necessárias mais tarde, você será "
@@ -5262,15 +5058,15 @@ msgstr "Chaves de Assinatura Não Utilizáveis"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"A verificação das preferências dos destinatários concluiu que a mensagem deverá "
-"ser cifrada com o OpenPGP, pelo menos para alguns destinatários;\n"
-"contudo, você não configurou nenhumas chaves de cifra de OpenPGP de confiança "
-"para esta identidade.\n"
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"A verificação das preferências dos destinatários concluiu que a mensagem "
+"deverá ser cifrada com o OpenPGP, pelo menos para alguns destinatários;\n"
+"contudo, você não configurou nenhumas chaves de cifra de OpenPGP de "
+"confiança para esta identidade.\n"
 "Você poderá continuar sem cifrar para si, mas tenha em atenção que não será "
 "capaz de ler as suas próprias mensagens se o fizer."
 
@@ -5278,13 +5074,13 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"A verificação das preferências dos destinatários concluiu que a mensagem deverá "
-"ser cifrada com o S/MIME, pelo menos para alguns destinatários;\n"
+"A verificação das preferências dos destinatários concluiu que a mensagem "
+"deverá ser cifrada com o S/MIME, pelo menos para alguns destinatários;\n"
 "contudo, você não configurou nenhuns certificados de cifra de S/MIME de "
 "confiança para esta identidade.\n"
 "Você poderá continuar sem cifrar para si, mas tenha em atenção que não será "
@@ -5292,15 +5088,15 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"A verificação das preferências dos destinatários concluiu que a mensagem deverá "
-"ser assinada com o OpenPGP, pelo menos para alguns destinatários;\n"
-"contudo, você não configurou nenhuns certificados de assinatura de OpenPGP de "
-"confiança para esta identidade."
+"A verificação das preferências dos destinatários concluiu que a mensagem "
+"deverá ser assinada com o OpenPGP, pelo menos para alguns destinatários;\n"
+"contudo, você não configurou nenhuns certificados de assinatura de OpenPGP "
+"de confiança para esta identidade."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5308,13 +5104,13 @@ msgstr "Não Assinar com o OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"A verificação das preferências de assinatura dos destinatários concluiu que a "
-"mensagem deverá ser assinada com o S/MIME, pelo menos para alguns "
+"A verificação das preferências de assinatura dos destinatários concluiu que "
+"a mensagem deverá ser assinada com o S/MIME, pelo menos para alguns "
 "destinatários;\n"
 "contudo, você não configurou nenhuns certificados de assinatura de S/MIME "
 "válidos para esta identidade."
@@ -5329,9 +5125,9 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"A verificação das preferências de assinatura do destinatário concluiu que você "
-"não tem qualquer tipo comum de assinatura que corresponda às suas chaves de "
-"assinatura disponíveis.\n"
+"A verificação das preferências de assinatura do destinatário concluiu que "
+"você não tem qualquer tipo comum de assinatura que corresponda às suas "
+"chaves de assinatura disponíveis.\n"
 "Deseja enviar a mensagem sem a assinar?"
 
 #: keyresolver.cpp:1335
@@ -5340,11 +5136,11 @@ msgstr "Não é possível assinar"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Não seleccionou nenhuma chave de cifra para si próprio (cifrar para o próprio). "
-"Você não conseguirá decifrar a mensagem se a cifrar."
+"Não seleccionou nenhuma chave de cifra para si próprio (cifrar para o "
+"próprio). Você não conseguirá decifrar a mensagem se a cifrar."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5365,11 +5161,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"O utilizador não seleccionou uma chave de cifra para nenhum dos destinatários "
-"desta mensagem. Como tal, a mensagem não vai ser cifrada."
+"O utilizador não seleccionou uma chave de cifra para nenhum dos "
+"destinatários desta mensagem. Como tal, a mensagem não vai ser cifrada."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5380,8 +5176,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Não seleccionou nenhuma chave de cifra para um dos destinatários: esta pessoa "
-"não conseguirá decifrar a mensagem se você a cifrar."
+"Não seleccionou nenhuma chave de cifra para um dos destinatários: esta "
+"pessoa não conseguirá decifrar a mensagem se você a cifrar."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5413,11 +5209,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Não foi encontrada nenhuma chave de cifra válida e fiável para o \"%1\".\n"
 "\n"
@@ -5466,10 +5262,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Erro crítico: Não foi possível receber correio: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Erro ao adicionar a mensagem:\n"
+msgid "Failed to add message:\n"
+msgstr "Erro ao adicionar a mensagem:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5514,8 +5308,8 @@ msgstr "A mover a mensagem %3 de %2 a partir de %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Não foi possível remover correio da caixa de correio <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Não foi possível remover correio da caixa de correio <b>%1</b>:<br>%2</"
+"qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5561,6 +5355,52 @@ msgstr "IMAP &Desligado"
 msgid "&Maildir mailbox"
 msgstr "Caixa de correio '&Maildir'"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Definir o assunto da mensagem"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Enviar o CC: para o 'endereço'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Enviar o BCC: para o 'endereço'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Adicionar o 'cabeçalho' à mensagem"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Ler o corpo da mensagem do 'ficheiro'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Definir o corpo da mensagem"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Adicionar um anexo à mensagem. Pode ser repetido"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Verificar só se há correio novo"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Abrir só a janela do compositor"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Ver o ficheiro de mensagem dado"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Enviar a mensagem para o 'endereço' e anexar o ficheiro para o qual o 'URL' "
+"aponta."
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "E-mail"
@@ -5620,13 +5460,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>O KMail descobriu as seguintes pastas de 'groupware' em %1 e necessita de "
-"efectuar as seguintes operações: %2"
-"<br>Se não quiser isto, cancele para o recurso de IMAP ser desactivado"
+"<qt>O KMail descobriu as seguintes pastas de 'groupware' em %1 e necessita "
+"de efectuar as seguintes operações: %2<br>Se não quiser isto, cancele para o "
+"recurso de IMAP ser desactivado"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5675,11 +5515,11 @@ msgstr "O URL foi copiado para a área de transferência."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>O ficheiro <b>%1</b> já existe.<br>Deseja substituí-lo?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Gravar para um Ficheiro"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Substitui&r"
 
@@ -5699,7 +5539,7 @@ msgstr ""
 "A mensagem foi removida enquanto estava a ser gravada. Como tal, não foi "
 "gravada."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5719,118 +5559,118 @@ msgstr "O ficheiro não contém nenhuma mensagem."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "O ficheiro contém várias mensagens. Somente a primeira será mostrada."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Esta é a redirecção de um 'digest' de MIME. O conteúdo da mensagem está no(s) "
-"anexo(s).\n"
+"Esta é a redirecção de um 'digest' de MIME. O conteúdo da mensagem está "
+"no(s) anexo(s).\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "A filtrar as mensagens"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "A filtrar a mensagem %1 de %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Não existe espaço em disco suficiente?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mover Para Esta Pasta"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copiar Para Esta Pasta"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
-"Foi detectada uma 'cache' de IMAP corrompida na pasta %1. A cópia das mensagens "
-"foi interrompida."
+"Foi detectada uma 'cache' de IMAP corrompida na pasta %1. A cópia das "
+"mensagens foi interrompida."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "A mover mensagens"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "A apagar mensagens"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "A aceder ao URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Deseja mesmo executar o <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Executar"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Não foram encontrados anexos para gravar."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Gravar os Anexos Para"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "anexo.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "anexo.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Já existe um ficheiro %1. Deseja substituí-lo?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "O Ficheiro Já Existe"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "S&obrepor"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "A componente %1 da mensagem está cifrada. Deseja manter a cifra ao gravar?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Pergunta do KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Manter Cifra"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Não Manter"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5838,11 +5678,11 @@ msgstr ""
 "A componente %1 da mensagem está assinada. Deseja manter a assinatura ao "
 "gravar?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Manter Assinatura"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5851,105 +5691,105 @@ msgstr ""
 "Não foi possível gravar o ficheiro %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Não foi possível gravar o ficheiro %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Não existe nenhum item do Livro de Endereços para este endereço de e-mail. "
 "Adicione-o ao Livro de Endereços e adicione então endereços do mensageiro "
 "instantâneo com o seu cliente de mensagens preferido."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Existe mais do que um item do Livro de Endereços a usar este endereço de "
-"e-mail: %1\n"
+"Existe mais do que um item do Livro de Endereços a usar este endereço de e-"
+"mail: %1\n"
 " não é possível determinar com quem falar."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"A infra-estrutura do Chiasmus não suporta a função \"x-obtain-keys\". Por favor "
-"comunique este erro."
+"A infra-estrutura do Chiasmus não suporta a função \"x-obtain-keys\". Por "
+"favor comunique este erro."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Erro na Infra-Estrutura do Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Foi devolvido um valor inesperado da infra-estrutura do Chiasmus: A função "
 "\"x-obtain-keys\" não devolveu uma lista de cadeias de caracteres. Por favor "
 "comunique este erro."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Não foram encontradas chaves. Verifique por favor se foi definida uma "
 "localização correcta das chaves na configuração do Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Selecção da Chave de Cifra do Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "A infra-estrutura do Chiasmus não suporta a função \"x-decrypt\". Por favor "
 "comunique este erro."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"A função \"x-decrypt\" não aceita os parâmetros esperados. Comunique por favor "
-"este erro."
+"A função \"x-decrypt\" não aceita os parâmetros esperados. Comunique por "
+"favor este erro."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Erro de Descodificação do Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Foi devolvido um valor inesperado da infra-estrutura do Chiasmus: A função "
-"\"x-decrypt\" não devolveu uma sequência de 'bytes'. Por favor comunique este "
-"erro."
+"\"x-decrypt\" não devolveu uma sequência de 'bytes'. Por favor comunique "
+"este erro."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "E-mail"
@@ -6048,7 +5888,7 @@ msgstr "Tamanho"
 msgid "Encoding"
 msgstr "Codificação"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comprimir"
 
@@ -6060,7 +5900,7 @@ msgstr "Cifrar"
 msgid "Sign"
 msgstr "Assinar"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nome do anexo:"
 
@@ -6082,10 +5922,11 @@ msgstr "Destinatários Primários"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Os endereços de e-mail que você colocar neste campo irão receber uma cópia "
-"da mensagem.</qt>"
+"<qt>Os endereços de e-mail que você colocar neste campo irão receber uma "
+"cópia da mensagem.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6094,14 +5935,14 @@ msgstr "Destinatários Adicionais"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Os endereços de e-mail que colocar neste campo irão receber uma cópia da "
-"mensagem. Tecnicamente, é a mesma coisa que colocar todos os endereços no campo "
-"<b>Para:</b>, só que difere no facto de simbolizar que o destinatário de uma "
-"Carbon Copy (CC) é um participante, não o destinatário principal.</qt>"
+"mensagem. Tecnicamente, é a mesma coisa que colocar todos os endereços no "
+"campo <b>Para:</b>, só que difere no facto de simbolizar que o destinatário "
+"de uma Carbon Copy (CC) é um participante, não o destinatário principal.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6109,12 +5950,11 @@ msgstr "Destinatários Escondidos"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>É essencialmente a mesma coisa que o campo <b>Copiar Para:</b> "
-"mas é diferente, na medida em que os outros destinatários não vêem quem é que "
+"<qt>É essencialmente a mesma coisa que o campo <b>Copiar Para:</b> mas é "
+"diferente, na medida em que os outros destinatários não vêem quem é que "
 "recebe uma cópia invisível.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -6125,7 +5965,7 @@ msgstr "En&viar um E-mail"
 msgid "&Send Mail Via"
 msgstr "En&viar um E-mail Via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Enviar Mais &Tarde"
@@ -6190,8 +6030,7 @@ msgstr "Re&mover os Caracteres de Citação"
 msgid "Cl&ean Spaces"
 msgstr "Limpar os &Espaços"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Usar um Tipo de &Letra Monoespaçado"
@@ -6334,31 +6173,31 @@ msgstr "Formato de &Cifra da Mensagem"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Normal"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Lista com Pontos (Disco)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Lista com Pontos (Círculos)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Lista com Pontos (Quadrados)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Lista Ordenada (Decimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Lista Ordenada (Alfabética minúscula)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Lista Ordenada (Alfabética maiúscula)"
 
@@ -6450,8 +6289,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Grava esta mensagem na pasta de Rascunhos. Poderá então ser editada e enviada "
-"posteriormente."
+"Grava esta mensagem na pasta de Rascunhos. Poderá então ser editada e "
+"enviada posteriormente."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6463,8 +6302,8 @@ msgstr "Fechar o Compositor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "A mensagem que você compôs parece falar de um ficheiro anexado mas você não "
@@ -6475,50 +6314,50 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Aviso de Anexo de Ficheiros"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Enviar como E&stá"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O KMail não conseguiu reconhecer a localização do anexo (%1);</p>"
-"<p>você tem que indicar a localização completa se quiser anexar um ficheiro.</p>"
-"</qt>"
+"<qt><p>O KMail não conseguiu reconhecer a localização do anexo (%1);</"
+"p><p>você tem que indicar a localização completa se quiser anexar um "
+"ficheiro.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Anexar um Ficheiro"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Anexar"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Inserir um Ficheiro"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Inserir um Ficheiro"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ocorreu um erro ao tentar exportar a chave da infra-estrutura:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Ocorreu um erro ao tentar exportar a chave da infra-estrutura:</"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6557,98 +6396,109 @@ msgid ""
 "View"
 msgstr "Ver"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Editar..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Editar o 'Script'..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Gr&avar Como..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Propriedades"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Adicionar um Anexo..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Não foi possível ao KMail comprimir o ficheiro."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "O ficheiro comprimido é maior que o original. Deseja manter o original?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Manter"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Não foi possível ao KMail descomprimir o ficheiro."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Gravar o Anexo Como"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Adicionar como Texto"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Adicionar como Anexo"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Colar como A&nexo"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "sem nome"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Você pediu para cifrar as mensagens para si próprio, mas a identidade "
-"seleccionada de momento não define nenhuma chave de cifra (OpenPGP ou S/MIME) "
-"para usar nesta função.</p>"
-"<p>Por favor seleccione as chaves a usar na configuração da identidade.</p></qt>"
+"<qt><p>Você pediu para cifrar as mensagens para si próprio, mas a identidade "
+"seleccionada de momento não define nenhuma chave de cifra (OpenPGP ou S/"
+"MIME) para usar nesta função.</p><p>Por favor seleccione as chaves a usar na "
+"configuração da identidade.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Chave de Cifra Indefinida"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Para poder assinar esta mensagem, primeiro o utilizador deve definir a chave "
-"(de OpenPGP ou de S/MIME) que será usada para o fazer.</p>"
-"<p>Por favor seleccione a chave que deve ser usada na configuração de "
-"identidade.</p></qt>"
+"<qt><p>Para poder assinar esta mensagem, primeiro o utilizador deve definir "
+"a chave (de OpenPGP ou de S/MIME) que será usada para o fazer.</p><p>Por "
+"favor seleccione a chave que deve ser usada na configuração de identidade.</"
+"p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Chave de Assinatura Indefinida"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6656,202 +6506,201 @@ msgstr ""
 "O KMail está de momento no modo desligado, como tal as suas mensagens irão "
 "ficar na pasta 'a enviar' até que se ligue."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Ligado/Desligado"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Você precisa de indicar o seu endereço de e-mail no campo De:. Você precisa "
-"também de definir o seu endereço de e-mail para todas as identidades, para que "
-"não o tenha de indicar para cada mensagem."
+"também de definir o seu endereço de e-mail para todas as identidades, para "
+"que não o tenha de indicar para cada mensagem."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Tem que indicar pelo menos um destinatário no campo, quer no campo Para: ou "
 "como CC ou BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "O campo Para: está vazio. Enviar de qualquer forma?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Nenhum Para: indicado"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Não foi indicado o assunto da mensagem. Enviar de qualquer forma?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Assunto Não Indicado"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Enviar como Está"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "Indicar o A&ssunto"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Manter a &formatação, não assinar/cifrar"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Manter a &formatação, não cifrar"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Manter a &formatação, não assinar"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Assinar/Cifrar (apagar a formatação)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Cifrar (apagar a formatação)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Assinar (apagar a formatação)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A cifra/assinatura incorporada das mensagens em HTML não é possível;</p>"
-"<p>deseja apagar a sua formatação?</p></qt>"
+"<qt><p>A cifra/assinatura incorporada das mensagens em HTML não é possível;</"
+"p><p>deseja apagar a sua formatação?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Assinar/Cifrar a Mensagem?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"A pasta de rascunhos ou modelos personalizada para a identidade \"%1\" (já) não "
-"existe; por isso, será usada a pasta de rascunhos ou modelos por omissão."
+"A pasta de rascunhos ou modelos personalizada para a identidade \"%1\" (já) "
+"não existe; por isso, será usada a pasta de rascunhos ou modelos por omissão."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Por favor crie uma conta de envio e tente de novo."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Prestes a enviar a mensagem..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Confirmação do Envio"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "E&nviar Agora"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Sem destinatários"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinatários Adicionais"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Ortografia: ligada"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Ortografia: desligada"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Verificação ortográfica cancelada."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Verificação ortográfica interrompida."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Verificação ortográfica completa."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Verificador ortográfico"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Configure por favor primeiro uma infra-estrutura de cifra a usar para a "
 "encriptação do Chiasmus.\n"
-"Podê-lo-á fazer na página de Infra-Estruturas de Cifra da página de Segurança "
-"da janela de configuração."
+"Podê-lo-á fazer na página de Infra-Estruturas de Cifra da página de "
+"Segurança da janela de configuração."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Parece que a 'libkleopatra' foi compilada sem suporte para o Chiasmus. Poderá "
-"querer compilar de novo a 'libkleopatra' com a opção '--enable-chiasmus'."
+"Parece que a 'libkleopatra' foi compilada sem suporte para o Chiasmus. "
+"Poderá querer compilar de novo a 'libkleopatra' com a opção '--enable-"
+"chiasmus'."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Infra-Estrutura do Chiasmus Sem Configuração"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Não Foram Encontradas Chaves do Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Selecção da Chave de Cifra do Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "A mensagem foi assinada por %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "A mensagem foi assinada por %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Mensagem do OpenPGP - Cifrada"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Mensagem com assunto: "
@@ -6902,8 +6751,8 @@ msgstr "Verificação Ortográfica - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "O ISpell/Aspell não foi iniciado. Por favor verifique se o ISpell ou Aspell "
 "está bem configurado e se está na sua PATH."
@@ -6940,13 +6789,11 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>A acção de filtro <b>%1</b> é desconhecida"
-"<br>na regra de filtragem <b>%2</b>."
-"<br>Será ignorada.</qt>"
+"<qt>A acção de filtro <b>%1</b> é desconhecida<br>na regra de filtragem <b>"
+"%2</b>.<br>Será ignorada.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7166,163 +7013,132 @@ msgstr "Tocar um Som"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Esta é a lista de filtros definidos. Eles são processados de cima para "
-"baixo.</p>"
-"<p>Carregue em qualquer filtro para o editar usando as opções na parte direita "
-"da janela.</p></qt>"
+"<qt><p>Esta é a lista de filtros definidos. Eles são processados de cima "
+"para baixo.</p><p>Carregue em qualquer filtro para o editar usando as opções "
+"na parte direita da janela.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Carregue neste botão para criar um novo filtro.</p>"
-"<p>Será inserido antes do actualmente seleccionado, mas poderá sempre alterar "
-"isso depois.</p>"
-"<p>Se carregou neste botão por engano, poderá anular isto carregando no botão "
-"<em>Apagar</em>.</p></qt>"
+"<qt><p>Carregue neste botão para criar um novo filtro.</p><p>Será inserido "
+"antes do actualmente seleccionado, mas poderá sempre alterar isso depois.</"
+"p><p>Se carregou neste botão por engano, poderá anular isto carregando no "
+"botão <em>Apagar</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Carregue neste botão para criar um novo filtro.</p>"
-"<p>Se carregou neste botão por engano, poderá anular isto carregando no botão "
-"<em>Apagar</em>.</p></qt>"
+"<qt><p>Carregue neste botão para criar um novo filtro.</p><p>Se carregou "
+"neste botão por engano, poderá anular isto carregando no botão <em>Apagar</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Carregue neste botão para <em>apagar</em> o filtro actualmente seleccionado "
-"da lista acima.</p>"
-"<p>Não existe maneira de voltar a obter o filtro assim que seja apagado, mas "
-"poderá sempre <em>Cancelar</em> a janela para anular as alterações feitas.</p>"
-"</qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Carregue neste botão para <em>apagar</em> o filtro actualmente "
+"seleccionado da lista acima.</p><p>Não existe maneira de voltar a obter o "
+"filtro assim que seja apagado, mas poderá sempre <em>Cancelar</em> a janela "
+"para anular as alterações feitas.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Carregue neste botão para mover o filtro seleccionado para <em>cima</em> "
-"uma posição na lista.</p>"
-"<p>Isto é útil dado que a ordem dos filtros na lista determina a ordem pela "
-"qual actuam nas mensagens: o filtro do topo é o primeiro a actuar.</p></qt>"
+"<qt><p>Carregue neste botão para mover o filtro seleccionado para <em>cima</"
+"em> uma posição na lista.</p><p>Isto é útil dado que a ordem dos filtros na "
+"lista determina a ordem pela qual actuam nas mensagens: o filtro do topo é o "
+"primeiro a actuar.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Carregue neste botão para mover o filtro seleccionado para <em>cima</em> "
-"uma posição na lista.</p>"
-"<p>Isto é útil dado que a ordem dos filtros na lista determina a ordem pela "
-"qual actuam nas mensagens: o filtro do topo é o primeiro a actuar.</p>"
-"<p>Se carregou neste botão por engano poderá anular a acção carregando no botão "
-"<em>Abaixo</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Carregue neste botão para mover o filtro seleccionado para <em>cima</"
+"em> uma posição na lista.</p><p>Isto é útil dado que a ordem dos filtros na "
+"lista determina a ordem pela qual actuam nas mensagens: o filtro do topo é o "
+"primeiro a actuar.</p><p>Se carregou neste botão por engano poderá anular a "
+"acção carregando no botão <em>Abaixo</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Carregue neste botão para mover o filtro seleccionado para <em>baixo</em> "
-"uma posição na lista.</p>"
-"<p>Isto é útil dado que a ordem dos filtros na lista determina a ordem pela "
-"qual actuam nas mensagens: o filtro do topo é o primeiro a actuar.</p>"
-"<p>Se carregou neste botão por engano poderá anular a acção carregando no botão "
-"<em>Acima</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Carregue neste botão para mover o filtro seleccionado para <em>baixo</"
+"em> uma posição na lista.</p><p>Isto é útil dado que a ordem dos filtros na "
+"lista determina a ordem pela qual actuam nas mensagens: o filtro do topo é o "
+"primeiro a actuar.</p><p>Se carregou neste botão por engano poderá anular a "
+"acção carregando no botão <em>Acima</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Carregue neste botão para mover o filtro seleccionado para <em>baixo</em> "
-"uma posição na lista.</p>"
-"<p>Isto é útil dado que a ordem dos filtros na lista determina a ordem pela "
-"qual actuam nas mensagens: o filtro do topo é o primeiro a actuar.</p></qt>"
+"<qt><p>Carregue neste botão para mover o filtro seleccionado para <em>baixo</"
+"em> uma posição na lista.</p><p>Isto é útil dado que a ordem dos filtros na "
+"lista determina a ordem pela qual actuam nas mensagens: o filtro do topo é o "
+"primeiro a actuar.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Carregue neste botão para mudar o nome do filtro seleccionado.</p>"
-"<p>Os filtros são denominados automaticamente, desde que sejam iniciados com o "
-"\"&lt;\".</p>"
-"<p>Se carregou neste botão por engano e deseja a nomeação automática de volta, "
-"carregue neste botão e seleccione <em>Limpar</em> e depois em <em>OK</em> "
-"na janela que aparece.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Carregue neste botão para mudar o nome do filtro seleccionado.</"
+"p><p>Os filtros são denominados automaticamente, desde que sejam iniciados "
+"com o \"&lt;\".</p><p>Se carregou neste botão por engano e deseja a nomeação "
+"automática de volta, carregue neste botão e seleccione <em>Limpar</em> e "
+"depois em <em>OK</em> na janela que aparece.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Assinale este botão para forçar o aparecimento da janela de confirmação.</p>"
-"<p>Isto é útil se tiver definido um conjunto de regras que marque as mensagens "
-"a serem transferidas posteriormente. Sem a possibilidade de forçar o "
-"aparecimento da janela, estas mensagens podiam nunca ser transferidas se não "
-"existissem outras mensagens grandes em espera, ou se quisesse mudar o conjunto "
-"de regras para marcar as mensagens de uma forma diferente.</p></qt>"
+"<qt><p>Assinale este botão para forçar o aparecimento da janela de "
+"confirmação.</p><p>Isto é útil se tiver definido um conjunto de regras que "
+"marque as mensagens a serem transferidas posteriormente. Sem a possibilidade "
+"de forçar o aparecimento da janela, estas mensagens podiam nunca ser "
+"transferidas se não existissem outras mensagens grandes em espera, ou se "
+"quisesse mudar o conjunto de regras para marcar as mensagens de uma forma "
+"diferente.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7332,6 +7148,16 @@ msgstr "Regras de Filtragem de POP3"
 msgid "Filter Rules"
 msgstr "Regras de Filtragem"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importar"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importar"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtros Disponíveis"
@@ -7414,6 +7240,11 @@ msgstr "Adicionar também este filtro à pasta de ferramentas"
 msgid "Icon for this filter:"
 msgstr "Ícone para este filtro:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Para"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Subir"
@@ -7422,16 +7253,29 @@ msgstr "Subir"
 msgid "Down"
 msgstr "Descer"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Mudar o Nome..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nova"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copiar Para"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Removido"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7440,20 +7284,20 @@ msgstr "Seleccionar o Atalho da Pasta"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Pelo menos um dos filtros referencia uma pasta numa conta de IMAP ligada. Esses "
-"filtros só serão aplicados ao filtrar manualmente e ao filtrar o correio deIMAP "
-"ligado que for recebido."
+"Pelo menos um dos filtros referencia uma pasta numa conta de IMAP ligada. "
+"Esses filtros só serão aplicados ao filtrar manualmente e ao filtrar o "
+"correio deIMAP ligado que for recebido."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Os seguintes filtros não foram gravados porque eram inválidos (p.ex. sem conter "
-"nenhumas acções ou regras de procura)."
+"Os seguintes filtros não foram gravados porque eram inválidos (p.ex. sem "
+"conter nenhumas acções ou regras de procura)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7526,36 +7370,31 @@ msgstr "Resolução de Problemas na 'Cache' do IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Resolução de problemas na 'cache' do IMAP.</b></p>"
-"<p>Se você tiver problemas ao sincronizar uma pasta de IMAP, você deverá tentar "
-"primeiro reconstruir o ficheiro de índice. Isto poderá levar algum tempo a "
-"reconstruir, mas não irá causar nenhuns problemas.</p>"
-"<p>Se isto não for suficiente, você poderá actualizar a 'cache' do IMAP. Se o "
-"fizer, irá perder as suas alterações locais para esta pasta e as suas "
-"subpastas.</p>\n"
-"<p><b>Resolução de problemas na 'cache' do IMAP.</b></p>"
-"<p>Se você tiver problemas ao sincronizar uma pasta de IMAP, você deverá tentar "
-"primeiro reconstruir o ficheiro de índice. Isto poderá levar algum tempo a "
-"reconstruir, mas não irá causar nenhuns problemas.</p>"
-"<p>Se isto não for suficiente, você poderá actualizar a 'cache' do IMAP. Se o "
-"fizer, irá perder as suas alterações locais para esta pasta e as suas "
-"subpastas.</p>"
+"<p><b>Resolução de problemas na 'cache' do IMAP.</b></p><p>Se você tiver "
+"problemas ao sincronizar uma pasta de IMAP, você deverá tentar primeiro "
+"reconstruir o ficheiro de índice. Isto poderá levar algum tempo a "
+"reconstruir, mas não irá causar nenhuns problemas.</p><p>Se isto não for "
+"suficiente, você poderá actualizar a 'cache' do IMAP. Se o fizer, irá perder "
+"as suas alterações locais para esta pasta e as suas subpastas.</p>\n"
+"<p><b>Resolução de problemas na 'cache' do IMAP.</b></p><p>Se você tiver "
+"problemas ao sincronizar uma pasta de IMAP, você deverá tentar primeiro "
+"reconstruir o ficheiro de índice. Isto poderá levar algum tempo a "
+"reconstruir, mas não irá causar nenhuns problemas.</p><p>Se isto não for "
+"suficiente, você poderá actualizar a 'cache' do IMAP. Se o fizer, irá perder "
+"as suas alterações locais para esta pasta e as suas subpastas.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7586,23 +7425,23 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"O ficheiro de 'cache' de UIDs da pasta %1 não pôde ser lido. Poderá ocorrer um "
-"problema com as permissões do sistema de ficheiros ou o ficheiro poderá estar "
-"corrompido."
+"O ficheiro de 'cache' de UIDs da pasta %1 não pôde ser lido. Poderá ocorrer "
+"um problema com as permissões do sistema de ficheiros ou o ficheiro poderá "
+"estar corrompido."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"O ficheiro de 'cache' de UIDs da pasta %1 não pôde ser gravado. Poderá ocorrer "
-"um problema com as permissões do sistema de ficheiros."
+"O ficheiro de 'cache' de UIDs da pasta %1 não pôde ser gravado. Poderá "
+"ocorrer um problema com as permissões do sistema de ficheiros."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
-"Você precisa de sincronizar com o servidor antes de mudar o nome às pastas de "
-"IMAP."
+"Você precisa de sincronizar com o servidor antes de mudar o nome às pastas "
+"de IMAP."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7636,12 +7475,12 @@ msgstr "O índice desta pasta foi criado de novo."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "A pasta %1 não está no estado inicial de sincronização (o estado era %2). "
-"Deseja reinicializá-lo para o estado de sincronização inicial e sincronizar à "
-"mesma?"
+"Deseja reinicializá-lo para o estado de sincronização inicial e sincronizar "
+"à mesma?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7746,8 +7585,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Os seus direitos de acesso à pasta <b>%1</b> foram restringidos, não sendo "
-"mais possível adicionar mensagens a esta pasta.</p>"
+"<p>Os seus direitos de acesso à pasta <b>%1</b> foram restringidos, não "
+"sendo mais possível adicionar mensagens a esta pasta.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7768,15 +7607,11 @@ msgstr "A criar as subpastas no servidor"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>As mensagens do servidor na pasta <b>%1</b> foram removidas. Deseja "
-"removê-las localmente?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>As mensagens do servidor na pasta <b>%1</b> foram removidas. Deseja "
+"removê-las localmente?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7797,13 +7632,11 @@ msgstr "A obter as pastas do espaço de nomes %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Parece que a pasta <b>%1</b> foi removida. Deseja removê-la do servidor?</p>"
-"</qt>"
+"<qt><p>Parece que a pasta <b>%1</b> foi removida. Deseja removê-la do "
+"servidor?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7811,21 +7644,21 @@ msgstr "Interrompido"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"O servidor de IMAP %1 não tem suporte para anotações de IMAP. O armazenamento "
-"em XML não pode ser usado neste servidor; por favor configure de novo o KMail "
-"de forma diferente."
+"O servidor de IMAP %1 não tem suporte para anotações de IMAP. O "
+"armazenamento em XML não pode ser usado neste servidor; por favor configure "
+"de novo o KMail de forma diferente."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"O servidor de IMAP %1 não tem suporte para anotações de IMAP. O armazenamento "
-"em XML não pode ser usado neste servidor; por favor configure de novo o KMail "
-"de forma diferente"
+"O servidor de IMAP %1 não tem suporte para anotações de IMAP. O "
+"armazenamento em XML não pode ser usado neste servidor; por favor configure "
+"de novo o KMail de forma diferente"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7838,17 +7671,16 @@ msgstr "perdidos+achados"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Existem mensagens novas nesta pasta <b>%1</b>, que ainda não foram enviadas "
-"para o servidor, mas não parece que você tenha permissões de acesso suficientes "
-"na pasta para as enviar.</p>"
-"<p>Todas as mensagens afectadas irão então passar para a pasta <b>%2</b>"
-", de modo a evitar a perda de dados.</p>"
+"<p>Existem mensagens novas nesta pasta <b>%1</b>, que ainda não foram "
+"enviadas para o servidor, mas não parece que você tenha permissões de acesso "
+"suficientes na pasta para as enviar.</p><p>Todas as mensagens afectadas irão "
+"então passar para a pasta <b>%2</b>, de modo a evitar a perda de dados.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7857,20 +7689,25 @@ msgstr "Permissões de acesso insuficientes"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Existem mensagens novas nesta pasta (%1), que ainda não foram enviadas para "
-"o servidor, mas não parece que você tenha permissões de acesso suficientes na "
-"pasta para as enviar. Contacte por favor o seu administrador para poder enviar "
-"as mensagens novas para si ou então tire-as desta pasta.</p> "
-"<p>Deseja mover estas mensagens para outra pasta agora?</p>"
+"<p>Existem mensagens novas nesta pasta (%1), que ainda não foram enviadas "
+"para o servidor, mas não parece que você tenha permissões de acesso "
+"suficientes na pasta para as enviar. Contacte por favor o seu administrador "
+"para poder enviar as mensagens novas para si ou então tire-as desta pasta.</"
+"p> <p>Deseja mover estas mensagens para outra pasta agora?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Mover para:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Não Mover"
 
@@ -7882,8 +7719,7 @@ msgstr "Mover as Mensagens para a Pasta"
 msgid "Permissions (ACL)"
 msgstr "Permissões (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Geral"
@@ -7907,8 +7743,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Utilizar &ícones personalizados"
@@ -7927,23 +7762,21 @@ msgstr "Actuar no correio novo/não-lido desta pasta"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Se esta opção estiver activa, então você será notificado se existir correio "
-"novo/não-lido nesta pasta. Para além disso, se passar para a pasta "
-"anterior/seguinte com mensagens por ler, irá parar nesta pasta.</p>"
-"<p>Desligue esta opção se não quiser ser notificado e se quiser que esta pasta "
-"seja ignorada ao ir para a pasta anterior/seguinte com mensagens por ler. Isto "
-"é útil para ignorar o correio novo/não-lido na sua pasta de lixo ('spam' ou "
-"geral).</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Se esta opção estiver activa, então você será notificado se existir "
+"correio novo/não-lido nesta pasta. Para além disso, se passar para a pasta "
+"anterior/seguinte com mensagens por ler, irá parar nesta pasta.</"
+"p><p>Desligue esta opção se não quiser ser notificado e se quiser que esta "
+"pasta seja ignorada ao ir para a pasta anterior/seguinte com mensagens por "
+"ler. Isto é útil para ignorar o correio novo/não-lido na sua pasta de lixo "
+"('spam' ou geral).</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7955,13 +7788,13 @@ msgstr "Manter as respostas nesta pasta"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Assinale esta opção se quiser que as resposta que escrever às mensagens nesta "
-"pasta sejam colocadas na mesma pasta depois de as enviar, em vez de ficar na "
-"pasta de enviados configurada para tal."
+"Assinale esta opção se quiser que as resposta que escrever às mensagens "
+"nesta pasta sejam colocadas na mesma pasta depois de as enviar, em vez de "
+"ficar na pasta de enviados configurada para tal."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7971,17 +7804,21 @@ msgstr "Mostrar a Coluna do Remetente/Destinatário na Lista de Mensagens"
 msgid "Sho&w column:"
 msgstr "Mostrar a col&una:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Mudar a Predefinição"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Remetente"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Destinatário"
@@ -7992,18 +7829,18 @@ msgstr "&Identidade do remetente:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Seleccione a identidade do remetente a usar quando escrever alguma mensagem "
-"nova ou a responder ao correio nesta pasta. Isto significa que, se estiver numa "
-"das suas pastas de trabalho, poderá fazer com que o KMail use o endereço de "
-"e-mail, as chaves de assinatura e cifra do remetente correspondente "
-"automaticamente. As identidades poderão ser configuradas na janela de "
-"configuração principal (Configuração -> Configurar o KMail)"
+"nova ou a responder ao correio nesta pasta. Isto significa que, se estiver "
+"numa das suas pastas de trabalho, poderá fazer com que o KMail use o "
+"endereço de e-mail, as chaves de assinatura e cifra do remetente "
+"correspondente automaticamente. As identidades poderão ser configuradas na "
+"janela de configuração principal (Configuração -> Configurar o KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -8021,22 +7858,22 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Esta opção define quais os utilizadores que partilham esta pasta é que deverão "
-"receber os períodos de \"ocupado\" nas suas listas de livre/ocupado e deverão "
-"ver os alarmes para os eventos ou tarefas nesta pasta. A opção aplica-se apenas "
-"às pastas de Calendário e Tarefas (para as tarefas, esta opção é só usada para "
-"os alarmes).\n"
-"Casos de uso de exemplo: se o patrão partilhar uma pasta com a sua secretária, "
-"só o patrão é que deverá ser marcado como ocupado para as suas reuniões, como "
-"tal deveria escolher o \"Admins\", dado que a secretária não tem permissões de "
-"administração sobre a pasta.\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Esta opção define quais os utilizadores que partilham esta pasta é que "
+"deverão receber os períodos de \"ocupado\" nas suas listas de livre/ocupado "
+"e deverão ver os alarmes para os eventos ou tarefas nesta pasta. A opção "
+"aplica-se apenas às pastas de Calendário e Tarefas (para as tarefas, esta "
+"opção é só usada para os alarmes).\n"
+"Casos de uso de exemplo: se o patrão partilhar uma pasta com a sua "
+"secretária, só o patrão é que deverá ser marcado como ocupado para as suas "
+"reuniões, como tal deveria escolher o \"Admins\", dado que a secretária não "
+"tem permissões de administração sobre a pasta.\n"
 "Por outro lado, se um grupo de trabalho partilhar um Calendário para as "
 "reuniões do grupo, todos os leitores das pastas deverão ser marcados como "
 "ocupados nas reuniões.\n"
@@ -8072,23 +7909,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Configurou esta pasta para conter informações de 'groupware' e a opção geral de "
-"configuração para esconder pastas de 'groupware' está activada. Isto significa "
-"que esta pasta vai desaparecer após a janela de configuração ser fechada. Se "
-"desejar remover a pasta, terá que desactivar temporariamente a opção de "
-"esconder pasta de 'groupware' para a conseguir ver."
+"Configurou esta pasta para conter informações de 'groupware' e a opção geral "
+"de configuração para esconder pastas de 'groupware' está activada. Isto "
+"significa que esta pasta vai desaparecer após a janela de configuração ser "
+"fechada. Se desejar remover a pasta, terá que desactivar temporariamente a "
+"opção de esconder pasta de 'groupware' para a conseguir ver."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8157,12 +7994,13 @@ msgstr "Erro ao obter informações da pasta."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "O índice do '%1' pertence a uma versão anterior do KMail (%2).\n"
 "Este índice pode ser recriado para a sua pasta de correio, mas algumas "
-"informações, como o estado das mensagens, poder-se-ão perder. Deseja converter "
-"o seu ficheiro de índice?"
+"informações, como o estado das mensagens, poder-se-ão perder. Deseja "
+"converter o seu ficheiro de índice?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8187,8 +8025,8 @@ msgstr "Erro ao abrir %1; esta pasta não foi encontrada."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Erro ao abrir %1; ou esta não é uma pasta 'maildir' válida ou então você não "
 "tem permissões de acesso suficientes."
@@ -8204,13 +8042,14 @@ msgstr "Não foi possível sincronizar a pasta 'maildir'."
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"A mensagem não pôde ser adicionada à pasta, talvez devido à falta de espaço em "
-"disco."
+"A mensagem não pôde ser adicionada à pasta, talvez devido à falta de espaço "
+"em disco."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: a terminar anormalmente para evitar a perda de dados."
+"KMFolderMaildir::addMsg: a terminar anormalmente para evitar a perda de "
+"dados."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8235,21 +8074,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>O índice da pasta '%2' parece estar desactualizado. Para evitar a corrupção "
-"de mensagens, o índice vai ser gerado de novo. Em resultado disso, as mensagens "
-"apagadas poderão reaparecer e as marcações do estado poder-se-ão perder.</p>"
-"<p>Leia por favor o tópico correspondente na <a href=\"%1\">"
-"secção da FAQ do manual do KMail</a> para mais informações de como prevenir uma "
-"nova ocorrência deste problema.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>O índice da pasta '%2' parece estar desactualizado. Para evitar a "
+"corrupção de mensagens, o índice vai ser gerado de novo. Em resultado disso, "
+"as mensagens apagadas poderão reaparecer e as marcações do estado poder-se-"
+"ão perder.</p><p>Leia por favor o tópico correspondente na <a href="
+"\"%1\">secção da FAQ do manual do KMail</a> para mais informações de como "
+"prevenir uma nova ocorrência deste problema.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8311,7 +8147,7 @@ msgstr ""
 "A '%1' não parece ser uma pasta.\n"
 "Por favor, tire o ficheiro do local."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8319,7 +8155,7 @@ msgstr ""
 "As permissões da pasta '%1' estão incorrectas;\n"
 "verifique por favor se pode ver e modificar o conteúdo desta pasta."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8329,8 +8165,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8338,7 +8174,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Não foi possível criar a pasta"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8438,12 +8274,12 @@ msgstr "Resolução de &Problemas na 'Cache' do IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Não é possível criar a pasta <b>%1</b> devido a permissões insuficientes no "
-"servidor. Se pensa que devia poder criar subpastas aqui, peça ao seu "
+"<qt>Não é possível criar a pasta <b>%1</b> devido a permissões insuficientes "
+"no servidor. Se pensa que devia poder criar subpastas aqui, peça ao seu "
 "administrador para lhe dar privilégios para tal.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8461,23 +8297,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Não foi possível mover ou copiar a pasta <b>%1</b> "
-"para aqui, porque já existe uma pasta com o mesmo nome.</qt>"
+"<qt>Não foi possível mover ou copiar a pasta <b>%1</b> para aqui, porque já "
+"existe uma pasta com o mesmo nome.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Não foi possível mover ou copiar a pasta <b>%1</b>"
-", porque não pode ser copiada por completo para si mesma.</qt>"
+"<qt>Não foi possível mover ou copiar a pasta <b>%1</b>, porque não pode ser "
+"copiada por completo para si mesma.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Não foi possível mover ou copiar a pasta <b>%1</b> "
-"para uma sub-pasta da mesma.</qt>"
+"<qt>Não foi possível mover ou copiar a pasta <b>%1</b> para uma sub-pasta da "
+"mesma.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8584,15 +8420,15 @@ msgstr "A pasta com %1 está apenas para leitura."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Deseja mesmo apagar a mensagem seleccionada?"
-"<br>Uma vez apagada, não pode ser recuperada.</qt>\n"
-"<qt>Deseja mesmo apagar as %n mensagens seleccionadas?"
-"<br>Uma vez apagadas, não podem ser recuperadas.</qt>"
+"<qt>Deseja mesmo apagar a mensagem seleccionada?<br>Uma vez apagada, não "
+"pode ser recuperada.</qt>\n"
+"<qt>Deseja mesmo apagar as %n mensagens seleccionadas?<br>Uma vez apagadas, "
+"não podem ser recuperadas.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8644,135 +8480,133 @@ msgstr ""
 "Erro ao modificar o %1\n"
 "(Falta de espaço no dispositivo?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Pedido de Assinatura do Certificado"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Por favor crie um certificado do anexo e devolva-o ao remetente."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "O KMail está configurado como desligado; todas as tarefas de rede estão "
 "suspensas"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "O KMail está configurado como ligado; todas as tarefas de rede vão prosseguir"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "O KMail está de momento no modo desligado. Como deseja prosseguir?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Funcionar Ligado"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Funcionar Desligado"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Não tem permissões de leitura/escrita na sua caixa de entrada local."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "a enviar"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Não tem permissões de leitura/escrita na sua pasta de a enviar."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "enviado"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Não tem permissões de leitura/escrita na sua pasta de enviados."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "lixo"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Não tem permissões de leitura/escrita na sua pasta de lixo."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "rascunhos"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Não tem permissões de leitura/escrita na sua pasta de rascunhos."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "modelos"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Não tem permissões de leitura/escrita na sua pasta de modelos."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Última Procura"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>A pasta <i>%4</i> existe. O %1 usa agora a pasta <i>%5</i> "
-"para as suas mensagens. O %2 poderá mover o conteúdo da <i>%6</i> "
-"para esta pasta por si, ainda que possa substituir os ficheiros existentes com "
-"o mesmo nome em <i>%7</i>."
-"<p><strong>Deseja que o %3 mova os ficheiros de correio agora?</strong></qt>"
+"<qt>A pasta <i>%4</i> existe. O %1 usa agora a pasta <i>%5</i> para as suas "
+"mensagens. O %2 poderá mover o conteúdo da <i>%6</i> para esta pasta por si, "
+"ainda que possa substituir os ficheiros existentes com o mesmo nome em <i>"
+"%7</i>.<p><strong>Deseja que o %3 mova os ficheiros de correio agora?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>A pasta <i>%4</i> existe. O %1 usa agora a pasta <i>%5</i> "
-"para as suas mensagens. O %2 poderá mover o conteúdo da <i>%6</i> "
-"para esta pasta por si."
+"<qt>A pasta <i>%4</i> existe. O %1 usa agora a pasta <i>%5</i> para as suas "
+"mensagens. O %2 poderá mover o conteúdo da <i>%6</i> para esta pasta por si."
 "<p><strong>Deseja que o %3 mova os ficheiros de correio agora?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrar os Ficheiros de Correio?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "O KMail obteve um erro fatal e irá terminar agora"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8783,11 +8617,11 @@ msgstr ""
 "O erro foi:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Esvaziar o Lixo"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Tem a certeza que quer esvaziar as pasta de lixo de todas as contas?"
 
@@ -8862,8 +8696,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Chegou novo e-mail</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8901,11 +8734,11 @@ msgstr "Tem a certeza que quer esvaziar a pasta do lixo?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Tem a certeza que quer mover todas as mensagens da pasta <b>%1</b> "
-"para o lixo?</qt>"
+"<qt>Tem a certeza que quer mover todas as mensagens da pasta <b>%1</b> para "
+"o lixo?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8929,12 +8762,12 @@ msgstr "Remover a Procura"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Tem a certeza que deseja remover a pasta de procura <b>%1</b>"
-"? As mensagens nela apresentadas irão permanecer à mesma na sua pasta "
-"original.</qt>"
+"<qt>Tem a certeza que deseja remover a pasta de procura <b>%1</b>? As "
+"mensagens nela apresentadas irão permanecer à mesma na sua pasta original.</"
+"qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8946,41 +8779,42 @@ msgstr "<qt>Tem a certeza que quer remover a pasta vazia <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Tem a certeza que quer remover a pasta vazia <b>%1</b>"
-", e todas as suas subpastas? Estas subpastas podem não estar vazias e o seu "
-"conteúdo será também perdido."
-"<p><b>Tenha em atenção</b> que as mensagens removidas não são gravadas na sua "
-"pasta de Lixo, sendo removidas de forma permanente.</qt>"
+"<qt>Tem a certeza que quer remover a pasta vazia <b>%1</b>, e todas as suas "
+"subpastas? Estas subpastas podem não estar vazias e o seu conteúdo será "
+"também perdido.<p><b>Tenha em atenção</b> que as mensagens removidas não são "
+"gravadas na sua pasta de Lixo, sendo removidas de forma permanente.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Tem a certeza que quer remover a pasta <b>%1</b>"
-", eliminando o seu conteúdo?"
-"<p><b>Tenha em atenção</b> que as mensagens eliminadas não são gravadas na sua "
-"pasta de Lixo, sendo removidas de forma permanente.</qt>"
+"<qt>Tem a certeza que quer remover a pasta <b>%1</b>, eliminando o seu "
+"conteúdo?<p><b>Tenha em atenção</b> que as mensagens eliminadas não são "
+"gravadas na sua pasta de Lixo, sendo removidas de forma permanente.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Tem a certeza que quer remover a pasta <b>%1</b>"
-", e todas as suas subpastas, eliminando o seu conteúdo?"
-"<p><b>Tenha em atenção</b> que as mensagens removidas não são gravadas na sua "
-"pasta de Lixo e são apagadas em definitivo.</qt>"
+"<qt>Tem a certeza que quer remover a pasta <b>%1</b>, e todas as suas "
+"subpastas, eliminando o seu conteúdo?<p><b>Tenha em atenção</b> que as "
+"mensagens removidas não são gravadas na sua pasta de Lixo e são apagadas em "
+"definitivo.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Removido"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8988,7 +8822,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Tem a certeza que quer limpar e actualizar a 'cache' do IMAP?\n"
-"Isto irá remover todas as alterações que fez localmente às suas pastas de IMAP."
+"Isto irá remover todas as alterações que fez localmente às suas pastas de "
+"IMAP."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8996,9 +8831,9 @@ msgstr "Quer mesmo expirar todas as mensagens antigas?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Se usar HTML no seu e-mail, tornas-se mais vulnerável a \"spam\" e pode "
 "aumentar o nível de susceptibilidade do seu sistema a ataques externos e "
@@ -9015,8 +8850,8 @@ msgstr "Usar o HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "O carregamento de referências externas no correio em HTML torna-o mais "
 "vulnerável a \"spam\" e pode aumentar o nível de susceptibilidade do seu "
@@ -9036,14 +8871,14 @@ msgstr "Filtro na 'Mailing-List' %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "A funcionalidade de Fora-do-Escritório do KMail baseia-se na filtragem do "
 "servidor. Você ainda não configurou nenhum servidor de IMAP para isto.\n"
-"O utilizador poderá fazê-lo na página \"Filtragem\" na configuração da conta de "
-"IMAP."
+"O utilizador poderá fazê-lo na página \"Filtragem\" na configuração da conta "
+"de IMAP."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -9055,14 +8890,16 @@ msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
 msgstr ""
-"Não foi possível iniciar o gestor de certificados; verifique a sua instalação."
+"Não foi possível iniciar o gestor de certificados; verifique a sua "
+"instalação."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Não foi possível iniciar o visualizador de registos do GnuPG (kwatchgnupg); por "
-"favor verifique a sua instalação."
+"Não foi possível iniciar o visualizador de registos do GnuPG (kwatchgnupg); "
+"por favor verifique a sua instalação."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9384,8 +9221,7 @@ msgstr "&Gravar os Anexos..."
 msgid "Appl&y All Filters"
 msgstr "Apl&icar Todos os Filtros"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&plicar o Filtro"
@@ -9503,7 +9339,6 @@ msgstr "Próxima Mensagem Não-L&ida"
 msgid "Go to the next unread message"
 msgstr "Vai para a próxima mensagem não lida"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Mensagem &Anterior"
@@ -9643,74 +9478,74 @@ msgstr " A inicializar..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensagem contém um pedido para enviar uma notificação da sua recepção da "
-"mensagem.\n"
-"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta de "
-"\"recusa\" ou uma resposta normal."
+"Esta mensagem contém um pedido para enviar uma notificação da sua recepção "
+"da mensagem.\n"
+"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta "
+"de \"recusa\" ou uma resposta normal."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Esta mensagem contém um pedido para enviar uma notificação da sua recepção da "
-"mensagem.\n"
-"Esta contém uma instrução de processamento que é marcada como \"obrigatória\", "
-"mas que é desconhecida para o KMail.\n"
-"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta de "
-"\"falha\"."
+"Esta mensagem contém um pedido para enviar uma notificação da sua recepção "
+"da mensagem.\n"
+"Esta contém uma instrução de processamento que é marcada como \"obrigatória"
+"\", mas que é desconhecida para o KMail.\n"
+"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta "
+"de \"falha\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensagem contém um pedido para enviar uma notificação da sua recepção da "
-"mensagem,\n"
+"Esta mensagem contém um pedido para enviar uma notificação da sua recepção "
+"da mensagem,\n"
 "mas é pedido para enviar a notificação para mais do que um endereço.\n"
-"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta de "
-"\"recusado\" ou resposta normal."
+"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta "
+"de \"recusado\" ou resposta normal."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensagem contém um pedido para enviar uma notificação da sua recepção da "
-"mensagem,\n"
+"Esta mensagem contém um pedido para enviar uma notificação da sua recepção "
+"da mensagem,\n"
 "mas não existe um caminho de regresso definido.\n"
-"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta de "
-"\"recusado\" ou resposta normal."
+"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta "
+"de \"recusado\" ou resposta normal."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensagem contém um pedido para enviar uma notificação da sua recepção da "
-"mensagem,\n"
+"Esta mensagem contém um pedido para enviar uma notificação da sua recepção "
+"da mensagem,\n"
 "mas o endereço do caminho de regresso é diferente do endereço para o qual a "
 "notificação foi pedida para ser enviada.\n"
-"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta de "
-"\"recusado\" ou resposta normal."
+"Você tanto poderá ignorar o pedido ou deixar que o KMail envie uma resposta "
+"de \"recusado\" ou resposta normal."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9736,17 +9571,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Recebido: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Anexo: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Mostra os anexos tal como foi sugerido pelo remetente."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9796,47 +9631,40 @@ msgstr "Propriedades da Componente de Mensagem"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O <em>tipo MIME</em> do ficheiro:</p>"
-"<p>normalmente, não é necessário alterar esta opção, dado que o tipo do "
-"ficheiro é verificado automaticamente. Porém, em alguns dos casos, o %1 pode "
-"não detectar o tipo correctamente -- aqui é o local onde o utilizador poderá "
-"corrigir isso.</p></qt>"
+"<qt><p>O <em>tipo MIME</em> do ficheiro:</p><p>normalmente, não é necessário "
+"alterar esta opção, dado que o tipo do ficheiro é verificado "
+"automaticamente. Porém, em alguns dos casos, o %1 pode não detectar o tipo "
+"correctamente -- aqui é o local onde o utilizador poderá corrigir isso.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O tamanho da componente:</p>"
-"<p>algumas das vezes, o %1 só dá um tamanho estimado aqui, porque o cálculo do "
-"tamanho exacto tomaria demasiado tempo; quando é este o caso, tornar-se-á "
-"visível adicionando \"(est.)\" ao tamanho mostrado.</p></qt>"
+"<qt><p>O tamanho da componente:</p><p>algumas das vezes, o %1 só dá um "
+"tamanho estimado aqui, porque o cálculo do tamanho exacto tomaria demasiado "
+"tempo; quando é este o caso, tornar-se-á visível adicionando \"(est.)\" ao "
+"tamanho mostrado.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O nome do ficheiro da componente:</p>"
-"<p>ainda que este corresponda por omissão ao nome do ficheiro anexado, não "
-"indica o ficheiro a ser anexado; em vez disso, sugere um nome de ficheiro a ser "
-"usado pelo agente de e-mail do destinatário ao gravar a componente para o "
-"disco.</p></qt>"
+"<qt><p>O nome do ficheiro da componente:</p><p>ainda que este corresponda "
+"por omissão ao nome do ficheiro anexado, não indica o ficheiro a ser "
+"anexado; em vez disso, sugere um nome de ficheiro a ser usado pelo agente de "
+"e-mail do destinatário ao gravar a componente para o disco.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9844,18 +9672,15 @@ msgstr "&Descrição:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Uma descrição da componente:</p>"
-"<p>esta é apenas uma descrição informativa da componente, mais ou menos como é "
-"o Assunto para a mensagem inteira; a maioria dos agentes de e-mail irão mostrar "
-"esta informação na antevisão das suas mensagens, ao lado do ícone do anexo.</p>"
-"</qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
+msgstr ""
+"<qt><p>Uma descrição da componente:</p><p>esta é apenas uma descrição "
+"informativa da componente, mais ou menos como é o Assunto para a mensagem "
+"inteira; a maioria dos agentes de e-mail irão mostrar esta informação na "
+"antevisão das suas mensagens, ao lado do ícone do anexo.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9863,23 +9688,21 @@ msgstr "&Codificação:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A codificação de transporte desta componente:</p>"
-"<p>normalmente, não é necessário alterar isto, dado que o %1 irá usar uma "
-"codificação aceitável, dependendo do tipo MIME; mesmo assim, em alguns dos "
-"casos, o utilizador poderá reduzir o tamanho da mensagem resultante, p.ex., se "
-"um ficheiro PostScript não conter dados binários mas consistir de texto puro -- "
-"neste caso, a escolha de \"quoted-printable\" em vez de \"base64\" irá poupar "
-"até 25% do tamanho da mensagem resultante.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>A codificação de transporte desta componente:</p><p>normalmente, não "
+"é necessário alterar isto, dado que o %1 irá usar uma codificação aceitável, "
+"dependendo do tipo MIME; mesmo assim, em alguns dos casos, o utilizador "
+"poderá reduzir o tamanho da mensagem resultante, p.ex., se um ficheiro "
+"PostScript não conter dados binários mas consistir de texto puro -- neste "
+"caso, a escolha de \"quoted-printable\" em vez de \"base64\" irá poupar até "
+"25% do tamanho da mensagem resultante.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9887,21 +9710,17 @@ msgstr "Sugerir a &apresentação automática"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Assinale esta opção se desejar sugerir ao destinatário a apresentação "
-"automática (incorporada) desta componente na antevisão da mensagem, em vez do "
-"ícone por omissão;</p>"
-"<p>tecnicamente, isto é indicado através do cabeçalho <em>"
-"Content-Disposition</em> da componente configurado para o valor \"inline\" em "
-"vez de \"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Assinale esta opção se desejar sugerir ao destinatário a apresentação "
+"automática (incorporada) desta componente na antevisão da mensagem, em vez "
+"do ícone por omissão;</p><p>tecnicamente, isto é indicado através do "
+"cabeçalho <em>Content-Disposition</em> da componente configurado para o "
+"valor \"inline\" em vez de \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9909,16 +9728,13 @@ msgstr "A&ssinar esta componente"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Assinale esta opção se desejar que esta componente da mensagem seja "
-"assinada;</p>"
-"<p>a assinatura será feita com a chave que associou à identidade seleccionada "
-"actualmente.</p></qt>"
+"<qt><p>Assinale esta opção se desejar que esta componente da mensagem seja "
+"assinada;</p><p>a assinatura será feita com a chave que associou à "
+"identidade seleccionada actualmente.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9926,13 +9742,11 @@ msgstr "Ci&frar esta componente"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Assinale esta opção se desejar que esta componente seja cifrada;</p>"
-"<p>a componente será cifrada para os destinatários desta mensagem</p></qt>"
+"<qt><p>Assinale esta opção se desejar que esta componente seja cifrada;</"
+"p><p>a componente será cifrada para os destinatários desta mensagem</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9946,17 +9760,14 @@ msgstr "Filtro POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Mensagens a filtrar encontradas na conta POP: <b>%1</b>"
-"<p>As mensagens mostradas excedem o limite de tamanho máximo definido pelo "
-"utilizador para esta conta."
-"<br>Poderá seleccionar o que deseja fazer com elas carregando no botão "
-"apropriado."
+"Mensagens a filtrar encontradas na conta POP: <b>%1</b><p>As mensagens "
+"mostradas excedem o limite de tamanho máximo definido pelo utilizador para "
+"esta conta.<br>Poderá seleccionar o que deseja fazer com elas carregando no "
+"botão apropriado."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10211,40 +10022,39 @@ msgstr "O cliente de e-mail do Ambiente de Trabalho TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>A Obter o Conteúdo da Pasta</h2>"
-"<p>Espere por favor . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>A Obter o Conteúdo da Pasta</h2><p>Espere por "
+"favor . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Desligado</h2>"
-"<p>O KMail está de momento no modo desligado. Carregue <a "
-"href=\"kmail:goOnline\">aqui</a> para se ligar . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Desligado</h2><p>O KMail está de momento no "
+"modo desligado. Carregue <a href=\"kmail:goOnline\">aqui</a> para se "
+"ligar . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10252,15 +10062,14 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Bem-vindo ao KMail %1</h2>"
-"<p>O KMail é um cliente de e-mail para o Ambiente de Trabalho K. Foi concebido "
-"para ser compatível com as normas de correio electrónico da Internet que "
-"incluem o MIME, o SMTP, o POP3 e o IMAP.</p>\n"
-"<ul>"
-"<li>O KMail tem muitas funcionalidades poderosas que são descritas na <a "
+"<h2 style='margin-top: 0px;'>Bem-vindo ao KMail %1</h2><p>O KMail é um "
+"cliente de e-mail para o Ambiente de Trabalho K. Foi concebido para ser "
+"compatível com as normas de correio electrónico da Internet que incluem o "
+"MIME, o SMTP, o POP3 e o IMAP.</p>\n"
+"<ul><li>O KMail tem muitas funcionalidades poderosas que são descritas na <a "
 "href=\"%2\">documentação</a></li>\n"
-"<li>A <a href=\"%3\">página do KMail</A> disponibiliza informações acerca das "
-"novas versões do KMail</li></ul>\n"
+"<li>A <a href=\"%3\">página do KMail</A> disponibiliza informações acerca "
+"das novas versões do KMail</li></ul>\n"
 "%8\n"
 "<p>Algumas das novas funcionalidades desta versão do KMail incluem (em "
 "comparação com o KMail %4, que faz parte do TDE %5):</p>\n"
@@ -10272,15 +10081,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; A Equipa do KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10294,8 +10101,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Mudanças importantes</span> "
-"(comparado com o KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Mudanças importantes</"
+"span> (comparado com o KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10326,7 +10133,8 @@ msgstr "Ver o Anexo: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: O anexo contém dados binários. Tentativa de mostrar o primeiro "
@@ -10357,12 +10165,14 @@ msgstr "Abrir o Anexo?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10384,6 +10194,58 @@ msgstr "(condizer qualquer um dos seguintes)"
 msgid "(match all of the following)"
 msgstr "(condizer todos os seguintes)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lida"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Antiga"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Removido"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Respondida"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Reenviada"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Em espera"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Enviado"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Vigiados"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "'Spam'"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "'Ham'"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "A Fazer"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Tem Anexo"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10468,21 +10330,22 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"A passagem da mensagem enviada \"%1\" da pasta \"A Enviar\" para a \"Enviado\" "
-"falhou.\n"
-"As razões possíveis poderão ser a falta de espaço em disco ou as permissões de "
-"escrita. Por favor tente resolver o problema e mova a mensagem manualmente."
+"A passagem da mensagem enviada \"%1\" da pasta \"A Enviar\" para a \"Enviado"
+"\" falhou.\n"
+"As razões possíveis poderão ser a falta de espaço em disco ou as permissões "
+"de escrita. Por favor tente resolver o problema e mova a mensagem "
+"manualmente."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Não é possível enviar mensagem sem indicar o endereço do remetente.\n"
 "Por favor configure o endereço de e-mail da identidade '%1' na secção "
@@ -10511,11 +10374,11 @@ msgstr "A iniciar o processo de envio..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Optou por enviar todo o e-mail em fila de espera por um transporte "
-"não-encriptado; deseja continuar?"
+"Optou por enviar todo o e-mail em fila de espera por um transporte não-"
+"encriptado; deseja continuar?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10540,8 +10403,9 @@ msgstr "Impossível enviar (algumas) mensagens em espera."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10558,20 +10422,17 @@ msgstr "O envio foi interrompido."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>O envio falhou:</p>"
-"<p>%1</p>A"
-"<p> mensagem vai permanecer na pasta de saída até que o utilizador resolva o "
-"problema (p.ex. um endereço errado) ou remova a mensagem da pasta de saída.</p>"
-"<p>Foi usado o seguinte protocolo de transporte:  %2</p>"
-"<p>Deseja que se continue o envio das restantes mensagens?</p>"
+"<p>O envio falhou:</p><p>%1</p>A<p> mensagem vai permanecer na pasta de "
+"saída até que o utilizador resolva o problema (p.ex. um endereço errado) ou "
+"remova a mensagem da pasta de saída.</p><p>Foi usado o seguinte protocolo de "
+"transporte:  %2</p><p>Deseja que se continue o envio das restantes mensagens?"
+"</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10589,8 +10450,9 @@ msgstr "C&ancelar o Envio"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10640,39 +10502,40 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "O %1 já parece estar a correr noutro ambiente de trabalho desta máquina. Se "
-"correr o %2 mais do que uma vez, poderá provocar a perda de mensagens. Você não "
-"deverá iniciar o %1 a menos que tenha a certeza que não está já a correr."
+"correr o %2 mais do que uma vez, poderá provocar a perda de mensagens. Você "
+"não deverá iniciar o %1 a menos que tenha a certeza que não está já a correr."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "O %1 já parece estar a correr noutro ambiente de trabalho desta máquina. Se "
-"correr o %1 e o %2 ao mesmo tempo, poderá provocar a perda de mensagens. Você "
-"não deverá iniciar o %2 a menos que tenha a certeza que o %1 não está a correr."
+"correr o %1 e o %2 ao mesmo tempo, poderá provocar a perda de mensagens. "
+"Você não deverá iniciar o %2 a menos que tenha a certeza que o %1 não está a "
+"correr."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"O %1 já parece estar a correr no %2. Se correr o %1 mais do que uma vez, poderá "
-"provocar a perda de mensagens. Você não deverá iniciar o %1 neste computador a "
-"menos que tenha a certeza que não está já a correr no %2."
+"O %1 já parece estar a correr no %2. Se correr o %1 mais do que uma vez, "
+"poderá provocar a perda de mensagens. Você não deverá iniciar o %1 neste "
+"computador a menos que tenha a certeza que não está já a correr no %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "O %1 já parece estar a correr no %3. Se correr o %1 e o %2 ao mesmo tempo, "
 "poderá provocar a perda de mensagens. Você não deverá iniciar o %2 neste "
@@ -10687,6 +10550,10 @@ msgstr "Iniciar %1"
 msgid "Exit"
 msgstr "Sair"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Novas Mensagens Em"
@@ -10713,16 +10580,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "O TDEWallet não está disponível. É recomendado que utilize o TDEWallet para "
 "gerir as suas senhas.\n"
 "No entanto, o KMail pode em vez disso guardar a senha no ficheiro de "
 "configuração. A senha é guardada numa forma obscura, mas não deve ser "
-"considerada segura contra descodificações se for obtido o acesso ao ficheiro de "
-"configuração.\n"
+"considerada segura contra descodificações se for obtido o acesso ao ficheiro "
+"de configuração.\n"
 "Deseja guardar a senha da conta '%1' no ficheiro de configuração?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10781,8 +10649,8 @@ msgstr "O nome do domínio ou o endereço numérico do servidor de STMP."
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
 msgstr ""
-"O número do porto onde o servidor de SMTP está à espera. O porto por omissão é "
-"o 25."
+"O número do porto onde o servidor de SMTP está à espera. O porto por omissão "
+"é o 25."
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10793,9 +10661,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Um comando a executar localmente antes de enviar o e-mail. Isto pode ser usado "
-"para configurar os túneis de ssh, por exemplo. Deixe-o em branco se não for "
-"necessário executar nenhum comando."
+"Um comando a executar localmente antes de enviar o e-mail. Isto pode ser "
+"usado para configurar os túneis de ssh, por exemplo. Deixe-o em branco se "
+"não for necessário executar nenhum comando."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10803,12 +10671,12 @@ msgstr "O servidor necessita de &autenticação"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Assinale esta opção se o seu servidor necessitar de autenticação antes de "
-"aceitar o correio. Isto é conhecido como o 'STMP Autenticado' ou simplesmente "
-"ASMTP."
+"aceitar o correio. Isto é conhecido como o 'STMP Autenticado' ou "
+"simplesmente ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10828,15 +10696,14 @@ msgstr "Enviar um nome &de máquina específico para o servidor"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Assinale esta opção para que o KMail utilize um nome alternativo da máquina ao "
-"identificar-se no servidor de correio."
-"<p>Isto é útil quando o nome da sua máquina não está configurado correctamente "
-"ou para mascarar o nome verdadeiro do seu sistema."
+"Assinale esta opção para que o KMail utilize um nome alternativo da máquina "
+"ao identificar-se no servidor de correio.<p>Isto é útil quando o nome da sua "
+"máquina não está configurado correctamente ou para mascarar o nome "
+"verdadeiro do seu sistema."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10846,7 +10713,8 @@ msgstr "Má&quina:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Indique o nome da máquina que o KMail deve usar ao identificar-se no servidor."
+"Indique o nome da máquina que o KMail deve usar ao identificar-se no "
+"servidor."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10866,8 +10734,8 @@ msgstr "Só são permitidos ficheiros locais."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "O campo da Máquina não pode estar em branco. Indique por favor o nome ou "
 "endereço IP do servidor de SMTP."
@@ -10882,15 +10750,16 @@ msgstr "Erro ao listar a pasta %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "A remoção da subscrição das pastas irá remover toda a informação presente, a "
 "nível local, que está localizada em torno destas pastas. As pastas não serão "
-"alteradas no servidor. Carregue em Cancelar agora se quiser ter a certeza que "
-"todas as alterações foram gravadas no servidor, verificando primeiro o correio."
+"alteradas no servidor. Carregue em Cancelar agora se quiser ter a certeza "
+"que todas as alterações foram gravadas no servidor, verificando primeiro o "
+"correio."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11111,35 +10980,28 @@ msgstr "&Editar a Mensagem"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A informação de estruturação devolvida pelo 'Plugin' de Cifra não pôde ser "
-"processada correctamente; o 'plugin' poderá estar danificado.</p>"
-"<p>Contacte por favor o seu administrador de sistemas.</p></qt>"
+"<qt><p>A informação de estruturação devolvida pelo 'Plugin' de Cifra não "
+"pôde ser processada correctamente; o 'plugin' poderá estar danificado.</"
+"p><p>Contacte por favor o seu administrador de sistemas.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Não existe nenhum módulo de cifra e o código de OpenPGP incorporado não foi "
-"executado com sucesso.</p>"
-"<p>Pode fazer duas coisas para alterar isto:</p>"
-"<ul>"
-"<li><em>tanto pode</em> activar um 'plugin' com a janela Configuração->"
-"Configurar o KMail->Plugin</li>"
-"<li><em>ou</em> indicar as opções tradicionais do OpenPGP na página Identidade->"
-"Avançado da mesma janela.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Não existe nenhum módulo de cifra e o código de OpenPGP incorporado não "
+"foi executado com sucesso.</p><p>Pode fazer duas coisas para alterar isto:</"
+"p><ul><li><em>tanto pode</em> activar um 'plugin' com a janela Configuração-"
+">Configurar o KMail->Plugin</li><li><em>ou</em> indicar as opções "
+"tradicionais do OpenPGP na página Identidade->Avançado da mesma janela.</"
+"li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11151,8 +11013,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "A infra-estrutura do Chiasmus não suporta a função \"x-encrypt\". Por favor "
 "comunique este erro."
@@ -11162,8 +11024,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"A função \"x-encrypt\" não aceita os parâmetros esperados. Por favor comunique "
-"este erro."
+"A função \"x-encrypt\" não aceita os parâmetros esperados. Por favor "
+"comunique este erro."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11171,17 +11033,17 @@ msgstr "Erro de Encriptação do Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Foi devolvido um valor inesperado da infra-estrutura do Chiasmus: A função "
-"\"x-encrypt\" não devolveu uma sequência de 'bytes'. Por favor comunique este "
-"erro."
+"\"x-encrypt\" não devolveu uma sequência de 'bytes'. Por favor comunique "
+"este erro."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "O formato de mensagens cifrado incorporado do OpenPGP não suporta a cifra ou "
@@ -11206,8 +11068,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"A verificação das preferências de assinatura do destinatário concluiu que você "
-"deverá ser questionado se deve ou não assinar esta mensagem.\n"
+"A verificação das preferências de assinatura do destinatário concluiu que "
+"você deverá ser questionado se deve ou não assinar esta mensagem.\n"
 "Deseja assinar esta mensagem?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11255,8 +11117,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Algumas partes desta mensagem não serão assinadas.\n"
-"Se enviar mensagens apenas parcialmente assinadas, poderá violar a política do "
-"'site'.\n"
+"Se enviar mensagens apenas parcialmente assinadas, poderá violar a política "
+"do 'site'.\n"
 "Deseja assinar todas as partes em alternativa?"
 
 #: messagecomposer.cpp:827
@@ -11296,8 +11158,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "A verificação das preferências de cifra do destinatário concluíram que você "
@@ -11325,8 +11187,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"Existem preferências de cifra em conflito para estes destinatários. Cifrar esta "
-"mensagem?"
+"Existem preferências de cifra em conflito para estes destinatários. Cifrar "
+"esta mensagem?"
 
 #: messagecomposer.cpp:909
 msgid "Do &Not Encrypt"
@@ -11334,12 +11196,13 @@ msgstr "&Não Cifrar"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Você pediu para cifrar esta mensagem e para cifrar uma cópia para si próprio, "
-"mas não estão configuradas chaves de cifra válidas e fiáveis para esta "
-"identidade."
+"Você pediu para cifrar esta mensagem e para cifrar uma cópia para si "
+"próprio, mas não estão configuradas chaves de cifra válidas e fiáveis para "
+"esta identidade."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11348,13 +11211,13 @@ msgstr "Enviar Sem Cifrar?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Algumas partes desta mensagem não serão cifradas.\n"
-"Se enviar mensagens apenas parcialmente cifradas, poderá violar a política do "
-"'site' e/ou criar fugas de informação importante.\n"
+"Se enviar mensagens apenas parcialmente cifradas, poderá violar a política "
+"do 'site' e/ou criar fugas de informação importante.\n"
 "Deseja cifrar todas as partes em alternativa?"
 
 #: messagecomposer.cpp:950
@@ -11365,8 +11228,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Esta mensagem não será cifrada.\n"
-"O envio de mensagens não cifradas poderá violar a política do 'site' e/ou criar "
-"fugas de informação importante.\n"
+"O envio de mensagens não cifradas poderá violar a política do 'site' e/ou "
+"criar fugas de informação importante.\n"
 "Deseja cifrar a mensagem em alternativa?"
 
 #: messagecomposer.cpp:955
@@ -11377,93 +11240,88 @@ msgstr "C&ifrar Todas as Componentes"
 msgid "Unencrypted Message Warning"
 msgstr "Aviso de Mensagem Não Cifrada"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Erro: A infra-estrutura não devolveu quaisquer dados codificados.</p>"
-"<p>Comunique por favor este erro:"
-"<br>%2</p></qt>"
+"<qt><p>Erro: A infra-estrutura não devolveu quaisquer dados codificados.</"
+"p><p>Comunique por favor este erro:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Nem todos os caracteres cabem na codificação escolhida."
-"<br>"
-"<br>Quer enviar a mensagem de qualquer das maneiras?</qt>"
+"<qt>Nem todos os caracteres cabem na codificação escolhida.<br><br>Quer "
+"enviar a mensagem de qualquer das maneiras?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Alguns Caracteres Serão Perdidos"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Perder Caracteres"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Escolher a Codificação"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Esta mensagem não pôde ser assinada, dado que a infra-estrutura escolhida não "
-"parece suportar a assinatura; isto não deveria acontecer, de facto, como tal "
-"comunique por favor este erro."
+"Esta mensagem não pôde ser assinada, dado que a infra-estrutura escolhida "
+"não parece suportar a assinatura; isto não deveria acontecer, de facto, como "
+"tal comunique por favor este erro."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Esta mensagem não pôde ser assinada, dado que a infra-estrutura escolhida não "
-"parece suportar a assinatura; isto não deveria acontecer, de facto, como tal "
-"comunique por favor este erro."
+"Esta mensagem não pôde ser assinada, dado que a infra-estrutura escolhida "
+"não parece suportar a assinatura; isto não deveria acontecer, de facto, como "
+"tal comunique por favor este erro."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"A operação de assinatura falhou. Certifique-se por favor se o programa "
-"'gpg-agent' está a correr."
+"A operação de assinatura falhou. Certifique-se por favor se o programa 'gpg-"
+"agent' está a correr."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Esta mensagem não pôde ser cifrada, dado que a infra-estrutura escolhida não "
 "parece suportar a cifra; isto não deveria acontecer, de facto, como tal "
 "comunique por favor este erro."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Esta mensagem não pôde ser cifrada e assinada, dado que a infra-estrutura "
-"escolhida não parece suportar a cifra e assinatura combinadas; isto não deveria "
-"acontecer, de facto, como tal comunique por favor este erro."
+"escolhida não parece suportar a cifra e assinatura combinadas; isto não "
+"deveria acontecer, de facto, como tal comunique por favor este erro."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11484,15 +11342,15 @@ msgstr "For&mato da caixa de correio:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Escolha se deseja guardar as mensagens nesta pasta com um ficheiro por mensagem "
-"(maildir) ou como um ficheiro grande (mbox). O KMail utiliza maildir por "
-"omissão e isto só necessita de ser alterado em raras ocasiões. Se não tem a "
-"certeza, deixe a opção como está."
+"Escolha se deseja guardar as mensagens nesta pasta com um ficheiro por "
+"mensagem (maildir) ou como um ficheiro grande (mbox). O KMail utiliza "
+"maildir por omissão e isto só necessita de ser alterado em raras ocasiões. "
+"Se não tem a certeza, deixe a opção como está."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11501,12 +11359,12 @@ msgstr "&Conteúdo da pasta:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Escolha se deseja que a nova pasta seja utilizada para guardar e-mail ou para "
-"guardar itens de 'groupware' tais como tarefas e notas. O valor por omissão é "
-"e-mail. Se não tem a certeza, deixe a opção como está."
+"Escolha se deseja que a nova pasta seja utilizada para guardar e-mail ou "
+"para guardar itens de 'groupware' tais como tarefas e notas. O valor por "
+"omissão é e-mail. Se não tem a certeza, deixe a opção como está."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11544,8 +11402,7 @@ msgstr "Resultados diferentes para as assinaturas"
 msgid "The crypto engine returned no cleartext data."
 msgstr "O motor de cifra não devolveu quaisquer dados não-cifrados."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Estado: "
 
@@ -11574,8 +11431,8 @@ msgstr "Não foi encontrado nenhum 'plugin' de %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "A mensagem está assinada, mas validade da assinatura não pode ser verificada."
 "<br/>Razão: %1"
@@ -11614,23 +11471,23 @@ msgstr "O 'plugin' de cifra \"%1\" não consegue decifrar mensagens."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b> Esta mensagem em HTML pode conter referências externas a imagens, "
-"etc. Por razões de segurança, só é mostrado o código de HTML em bruto. Se "
-"confiar no remetente desta mensagem, então poderá activar a apresentação do "
-"HTML formatado para esta mensagem carregando <a href=\"kmail:loadExternal\">"
-"aqui</a>."
+"<b>Nota:</b> Esta mensagem em HTML pode conter referências externas a "
+"imagens, etc. Por razões de segurança, só é mostrado o código de HTML em "
+"bruto. Se confiar no remetente desta mensagem, então poderá activar a "
+"apresentação do HTML formatado para esta mensagem carregando <a href=\"kmail:"
+"loadExternal\">aqui</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Nota:</b> Esta é uma mensagem em HTML. Por razões de segurança, só é "
 "mostrado o código de HTML em bruto. Se confiar no remetente desta mensagem, "
@@ -11894,11 +11751,11 @@ msgstr "gravado: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Não está gravado nenhum endereço de e-mail na %1 usada para assinar, como tal "
-"não é possível compará-lo com o endereço do remetente %2."
+"Não está gravado nenhum endereço de e-mail na %1 usada para assinar, como "
+"tal não é possível compará-lo com o endereço do remetente %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -12014,14 +11871,15 @@ msgstr "Mensagem de Erro do Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"O seu servidor de POP3 (Conta: %1) não suporta o comando UIDL: este comando é "
-"necessário para determinar de uma forma fiável qual das mensagens no servidor o "
-"KMail já viu anteriormente;\n"
+"O seu servidor de POP3 (Conta: %1) não suporta o comando UIDL: este comando "
+"é necessário para determinar de uma forma fiável qual das mensagens no "
+"servidor o KMail já viu anteriormente;\n"
 "a funcionalidade de deixar as mensagens no servidor não irá, deste modo, "
 "funcionar convenientemente."
 
@@ -12043,7 +11901,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "A obter a mensagem %1 de %2 (%3 de %4 KB) de %5@%6 (%7 KB permanecem no "
 "servidor)."
@@ -12062,1884 +11921,15 @@ msgstr "Resposta Inválida do Servidor"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "O seu servidor não suporta o comando TOP. Deste modo não é possível obter os "
 "cabeçalhos das mensagens grandes em primeiro lugar, antes de as transferir."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Ir"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Pasta"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mensagem"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Resposta Especial"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Reencaminhar"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barra de Ferramentas de HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Assinar"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "A&ssinar automaticamente as mensagens"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Quando esta opção estiver activa, todas as mensagens que enviar serão assinadas "
-"por omissão; claro que é possível à mesma desactivar a assinatura para cada "
-"mensagem individualmente."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Cifra"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Quando esta opção está activa, o ficheiro/mensagem não só ser cifrado com a "
-"chave pública do destinatário, como também com a sua chave. Isto permitir-lhe-á "
-"decifrar o ficheiro/mensagem posteriormente. Esta é normalmente uma boa ideia."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Mostrar o texto c&ifrado/assinado depois de escrito"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Quando esta opção estiver activada, o texto assinado/cifrado será mostrado numa "
-"janela em separado, o que lhe permite saber como é que irá ficar antes de ser "
-"enviada. Esta é uma boa ideia quando você está a verificar se o seu sistema de "
-"cifra está a funcionar."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Guardar as mensagens &enviadas cifradas"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Assinale para guardar as mensagens sem estarem cifradas "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Guardar as Mensagens Cifradas</h1>\n"
-"Se esta opção estiver assinalada, as mensagens enviadas serão guardadas "
-"cifradas como foram enviadas. Isto não é recomendado, porque o utilizador "
-"poderá não conseguir mais ler as mensagens se um dos certificados obrigatórios "
-"expirar.\n"
-"<p>\n"
-"Contudo, poderão existir regras locais que necessitem que o utilizador active "
-"esta opção. Quando tiver dúvidas confirme com o seu administrador local.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Mostrar sempre as chaves de ci&fra para aprovação"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Quando esta opção estiver activa, a aplicação irá mostrar-lhe sempre uma lista "
-"de chaves públicas onde poderá escolher a que irá usar para a cifra. Se estiver "
-"desligada, a aplicação só irá mostrar a mensagem se não encontrar a chave certa "
-"ou se tiver várias que possam ser usadas."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "C&ifrar automaticamente as mensagens sempre que possível"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Quando esta opção estiver activa, todas as mensagens que enviar serão cifradas "
-"sempre que a cifra for possível e desejada; claro que é possível à mesma "
-"desactivar a cifra automática para cada mensagem individual."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nunca assinar/cifrar ao gra&var como rascunho"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Como é que isto funciona?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Para: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universal"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Resposta"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Resposta para Todos"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Encaminhamento"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "A&talho:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "Tipo de &modelo:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Propriedades da Pasta"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "A pasta contém uma '&mailing list'"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Endereço d&a lista:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Não-&lidas:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Expiração das Mensagens"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "E&xpirar após:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Expi&rar as mensagens lidas"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Ex&pirar após:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Expirar as mensagens &não-lidas"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dias"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Semanas"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Meses"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avançado"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Identidade do remetente:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Formato do &armazenamento::"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Apresentações de &lista:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validar os certificados com as CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Se esta opção estiver seleccionada, os certificados do S/MIME são validados com "
-"as Listas de Revogação de Certificados (CRLs)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validar os 'certificados' a nível 'online' (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Se esta opção estiver seleccionada, os certificados de S/MIME serão validados a "
-"nível 'online', usando o protocolo Online Certificates Status Protocol (OCSP). "
-"Preencha o URL do atendedor de OCSP em baixo."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Validação 'Online' do Certificado"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL do atendedor de OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Indique aqui o endereço do servidor para a validação 'online' dos certificados "
-"(o atendedor do OCSP). O URL começa normalmente por http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Assinatura da resposta do OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorar o URL de serviço dos certificados"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Não verificar políticas de certificados"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Por omissão, o GnuPG usa o ficheiro ~/.gnupg/policies.txt para verificar se uma "
-"dada política de certificados é permitida. Se esta opção estiver seleccionada, "
-"as políticas não são verificadas."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nunca consultar uma CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Se esta opção estiver assinalada, as Listas de Revogação de Certificados não "
-"são usadas nunca para validar os certificados do S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Obter os certificados do emissor em falta"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Se esta opção estiver assinalada, os certificados do emissor em falta são "
-"obtidos, logo que forem necessários (isto aplica-se a ambos os métodos de "
-"validação, as CRLs e o OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Pedidos HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Não efectuar pedidos HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Desactiva completamente a utilização de HTTP no S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Utilizar este 'proxy' para pedidos HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Utilizar o 'proxy' HTTP do sistema:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Se esta opção estiver seleccionada, o valor do 'proxy' de HTTP mostrado à "
-"direita (que vem na variável de ambiente 'http_proxy') será usado para qualquer "
-"pedido de HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Indique aqui a localização do seu 'proxy' de HTTP que será usado para todos os "
-"pedidos de HTTP relacionados com o S/MIME. A sintaxe é máquina:porto, como por "
-"exemplo meu_proxy.nenhures.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorar o ponto de distribuição CRL HTTP dos certificados"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Ao olhar para a localização de uma CRL, o certificado a testar contém os itens "
-"DP (CRL Distribution Points - Pontos de Distribuição de CRLs), que são URLs que "
-"descrevem a forma a aceder o URL. O primeiro DP encontrado será utilizado. Com "
-"esta opção, todos os itens que usem o esquema de HTTP são ignorados ao procurar "
-"por um DP adequado."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Pedidos LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Não efectuar pedidos LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Desactiva completamente a utilização de LDAP no S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorar o ponto de distribuição CRL LDAP dos certificados"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Ao olhar para a localização de uma CRL, o certificado a testar contém os itens "
-"DP (CRL Distribution Points - Pontos de Distribuição de CRLs), que são URLs que "
-"descrevem a forma a aceder o URL. O primeiro DP encontrado será utilizado. Com "
-"esta opção, todos os itens que usem o esquema de LDAP são ignorados ao procurar "
-"por um DP adequado."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Servidor primário para pedidos LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"A indicação aqui de um servidor de LDAP irá fazer com que todos os pedidos de "
-"LDAP vão primeiro a esse servidor. Mais precisamente, esta opção sobrepõe-se a "
-"todas as máquinas e portos indicadas num URL de LDAP e serão também usados se a "
-"máquina e o porto tiverem sido omitidos do URL. Os outros servidores de LDAP só "
-"serão usados se a ligação ao 'proxy' falhar.\n"
-"A sintaxe é igual a \"MÁQUINA\" ou \"MÁQUINA:PORTO\". Se o PORTO for omitido, "
-"será usado o porto 389 (o porto-padrão do LDAP)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Adicionar..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "'&Groupware'"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Repor o Tipo de Letra"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "ilimitado"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Resposta ao Remetente"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Resposta a Todos / à Lista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Mensagem Reencaminhada"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Avisar ao tentar enviar mensagens não a&ssinadas"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Assinale para ser avisado se enviar mensagens não assinadas."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar ao Tentar Enviar Mensagens Não Assinadas</h1>\n"
-"Se esta opção estiver assinalada, o utilizador será notificado quando tentar "
-"enviar a mensagem ou componentes da mesma não assinadas.\n"
-"<p>\n"
-"É recomendado que deixe esta opção activa para o máximo de integridade.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "A&visar ao tentar enviar mensagens não cifradas"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Assinale para ser avisado quando envia mensagens não-cifradas."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar ao Tentar Enviar Mensagens Não-Cifradas</h1>\n"
-"Se esta opção estiver assinalada, o utilizador será notificado quando tentar "
-"enviar a mensagem ou componentes da mesma não cifradas.\n"
-"<p>\n"
-"É recomendado que deixe esta opção activa para o máximo de integridade.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Avisa&r se o Endereço de E-Mail do Destinatário não Estiver no Certificado"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Assinale para ser avisado se o endereço não estiver no certificado"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se o Endereço de E-mail do Destinatário Não Estiver no "
-"Certificado</h1>\n"
-"Se esta opção estiver assinalada, será apresentado um aviso se o endereço de "
-"e-mail do destinatário não estiver contido no certificado usado para a cifra.\n"
-"<p>\n"
-"Recomenda-se que esta opção esteja ligada para o máximo de segurança.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Avisar se os certificado/chaves expirarem em breve (configurar os limites em "
-"baixo)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Para assinar"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Para cifrar"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dias"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Seleccione aqui o número de dias"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se o Certificado de Assinatura Expirar</h1>\n"
-"Seleccione o número mínimo de dias que o certificado de assinatura deverá ser "
-"válido sem que seja emitido um aviso.\n"
-"<p>\n"
-"A configuração recomendada pela SPHINX é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se o Certificado de Cifra Expirar</h1>\n"
-"Seleccione o número mínimo de dias que o certificado de cifra deverá ser válido "
-"sem que seja emitido um aviso.\n"
-"<p>\n"
-"A configuração recomendada pela SPHINX é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se um Certificado da Sequência Expirar</h1>\n"
-"Seleccione o número máximo de dias em que todos os certificados da sequência "
-"deverão ser válidos antes de apresentar um aviso.\n"
-"<p>\n"
-"A configuração recomendada pela SPHINX é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se o Certificado da AC Expirar</h1>\n"
-"Seleccione o número mínimo de dias durante os quais o certificado da AC deverá "
-"ser válido sem que seja emitido um aviso.\n"
-"<p>\n"
-"A configuração recomendada pela SPHINX é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se o Certificado da Raiz Expirar</h1>\n"
-"Seleccione o número mínimo de dias durante os quais o certificado da raiz "
-"deverá ser válido sem que seja emitido um aviso.\n"
-"<p>\n"
-"A configuração recomendada pela SPHINX é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Para certificados raiz:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Para certificados CA intermédios:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Para certificados/chaves de utilizadores finais:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Reactivar Todos os Avisos \"Não Perguntar de Novo\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Conteúdo do modelo"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Atalho do modelo"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Tipo do modelo"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Enviar as mensagens em espera ao verificar o correio"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Seleccione se deseja que o KMail envie todas as mensagens da pasta a-enviar "
-"nas verificações manuais ou em todas, ou se não deseja enviar as mensagens "
-"automaticamente de todo.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Move automaticamente as mensagens não sincronizadas das pastas com permissões "
-"de acesso insuficientes"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Se existirem mensagens novas numa pasta que não tenham sido enviadas ainda para "
-"o servidor, mas se você não tiver permissões de acesso suficientes na pasta "
-"para as enviar agora, estas mensagens irão passar para uma pasta de 'perdidos e "
-"achados'."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Esta opção permite aos administradores definirem um atraso mínimo entre duas "
-"verificações de correio.\n"
-"O utilizador não será capaz de escolher um valor menor que o definido aqui."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"A pasta seleccionada mais recentemente na janela de selecção de pastas."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Ignora a configuração do 'umask' dos utilizadores e usa apenas "
-"\"leitura-escrita apenas para o utilizador\""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Política para mostrar o ícone na bandeja do sistema"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Notificação de correio novo extensa"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Se esta opção estiver activa, então para cada pasta o número de mensagens "
-"recebidas é mostrado na notificação de correio novo; caso contrário, você só "
-"irá obter uma mensagem de 'Chegou correio novo'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Escolher o e&ditor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Usar um editor e&xterno em vez do compositor"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Activar a funcionalidade de 'groupware'"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Baralhar os cabeçalhos From:/To: nas respostas a respostas"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"O Microsoft Outlook tem um conjunto de problemas na sua implementação da norma "
-"iCalendar; esta opção resolve um deles.  Se tiver problemas com os utilizadores "
-"do Outlook a não conseguirem obter as suas respostas, tente activar esta opção."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Enviar convites de 'groupware' no corpo do e-mail"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"O Microsoft Outlook tem um conjunto de problemas na sua implementação da norma "
-"iCalendar; esta opção resolve um deles.  Se tiver problemas com os utilizadores "
-"do Outlook a não conseguirem obter os seus convites, tente activar esta opção."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Nomenclatura de convites compatível com o Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"O Microsoft Outlook, ao ser usado en conjunto com um servidor Microsoft "
-"Exchange, tem um problema na compreensão do e-mail de 'groupware' compatível "
-"com as normas. Active esta opção de modo a enviar os convites de 'groupware' de "
-"forma que o Microsoft Exchange compreenda."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Quando esta opção estiver seleccionada, não verá a janela de composição da "
-"mensagem. Em vez disso, todas as mensagens de convites são enviadas "
-"automaticamente. Se quiser ver a mensagem antes de a enviar, poderá desligar "
-"esta opção. Contudo, tenha em atenção que o texto na janela de composição está "
-"na sintaxe iCalendar, pelo que não deverá tentar modificá-la à mão."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Se activar isto tornará possível a gravação dos itens das aplicações do "
-"Kontact (KOrganizer, KAddressBook e KNotes.)</p>"
-"<p>Se deseja activar esta opção, você deverá também configurar as aplicações "
-"para usarem o recurso de IMAP; isto é feito no Centro de Controlo do TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Normalmente, você não terá nenhuma razão para ver as pastas que contêm os "
-"recursos de IMAP, mas se precisar de os ver, poderá definir isso aqui.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Se a conta usada para guardar a informação de 'groupware' não for usada\n"
-"para guardar correio normal, active esta opção para que o KMail só mostre\n"
-"as pastas de 'groupware' nela. Isto é útil se estiver a lidar com correio\n"
-"normal numa conta 'online' de IMAP adicional.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Escolha o formato de armazenamento das pastas de 'groupware'. "
-"<ul>"
-"<li>O formato a usar por omissão é o 'ical' (para as pastas de calendário) e o "
-"'vcard' (para as pastas do livro de endereços). Estes formatos oferecem todas "
-"as funcionalidades do Kontact.</li>"
-"<li>O formato XML do Kolab usa um modelo personalizado que corresponde de certa "
-"forma ao usado no Outlook. Este formato oferece uma melhor compatibilidade com "
-"o Outlook, ao usar um servidor de Kolab ou uma solução compatível.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Isto escolhe a 'mãe' de todas as pastas de recursos do IMAP.</p>"
-"<p>Por omissão, o servidor Kolab configura a caixa de entrada ('recebido') do "
-"IMAP como sendo a mãe.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Este é o ID da conta que contem as pastas de recursos IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Se quiser definir os nomes das pastas para o armazenamento de IMAP na sua "
-"língua local, você poderá optar entre estas línguas disponíveis.</p>"
-"<p>Lembre-se que a única razão para o fazer é apenas para compatibilidade com o "
-"Microsoft Outlook. É considerada uma má ideia fazer isto, dado que poderá "
-"tornar a mudança de línguas impossível.</p>"
-"<p>Por isso, não defina isto a não ser que não haja outro remédio.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Este valor é usado para decidir se a Introdução ao KMail deverá ser mostrada."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Número máximo de ligações por servidor"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Isto pode ser utiliza para limitar o número de ligações por servidor ao "
-"procurar novo e-mail. Por omissão o número de ligações é ilimitado (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Mostrar o campo de de procura rápida"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Esta opção activa ou desactiva o campo de procura rápida por cima da lista de "
-"mensagens, o qual poderá ser usado para procurar rapidamente pela informação "
-"mostrada na lista de mensagens."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Manter a codificação original ao responder ou ao reencaminhar se possível"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Adicionar a assinatura a&utomaticamente"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Recordar esta identidade, para que possa também ser usada nas futuras janelas "
-"de composição.\n"
-"         "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Recordar esta pasta para os itens enviados, para que possa também ser usada nas "
-"futuras janelas de composição."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Recordar este método de transporte de correio, para que possa também ser usada "
-"nas futuras janelas de composição."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Recordar esta identidade, para que possa também ser usada nas futuras janelas "
-"de composição.\n"
-"         "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Mudança de linha na coluna:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Avisar se o certificado de raiz expirar em &menos de:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Active esta opção para fazer com que o Outlook &#8482; compreenda os nomes de "
-"anexos que contenham caracteres não Ingleses"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Pedir automaticamente as notificações de disposição das &mensagens"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Active esta opção se quiser que o KMail processe as Notificações de "
-"Disposição de Mensagens (MDNs) para cada uma das suas mensagens enviadas.</p>"
-"<p>Esta opção só afecta as predefinições; você pode à mesma activar ou "
-"desactivar o pedido de MDNs por cada mensagem no compositor, no item do menu "
-"<em>Opções</em>-><em>Pedir a Notificação de Disposição</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Usar os endereços recentes na completação automática"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Desactive esta opção se não quiser que os endereços recentes apareçam na lista "
-"de completação automática dos campos de endereços do compositor."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Gravar automaticamente a cada:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Pode-se criar uma cópia de segurança do texto na janela do compositor "
-"regularmente. O intervalo usado para criar as cópias de segurança é definido "
-"aqui. Você poderá desactivar a gravação automática se configurar este valor "
-"como 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Substituir o prefi&xo reconhecido por \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Substituir o prefixo reconhecido por \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Usar a citação inteli&gente"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "A assinatura expirou."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tipo do selector de destinatários"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Define o tipo de janela para seleccionar os destinatários do Para, CC e BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Editor de tipo de destinatário"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "Define o tipo de janela de edição de destinatários do Para, CC e BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Número máximo de linhas do editor de destinatários."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Manter a codificação original ao responder ou ao reencaminhar se possível"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Alguns e-mails, especialmente os que são gerados automaticamente, não indicam a "
-"codificação de caracteres que deverá ser usada para os mostrar correctamente. "
-"Nesses casos, será usada uma codificação alternativa que poderá configurar "
-"aqui. Configure com a codificação que for mais usada na sua parte do mundo. Por "
-"omissão, será usada a codificação configurada para todo o sistema."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Se alterar o valor disto para algo que não o 'Auto', será obrigado o uso da "
-"codificação indicada para todas as mensagens de e-mail, independentemente do "
-"que elas indicarem."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Active isto se quiser que os 'smileys' como :-) que aparecem no texto das "
-"mensagens sejam substituídos por 'emoticons' (pequenas imagens)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Active esta opção para mostrar os diferentes níveis do texto citado. Desactive "
-"para esconder os níveis do texto citado."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Nível de recolhimento automático:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reduzir o tamanho da letra do texto citado"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Active esta opção para mostrar o texto citado com um tamanho mais pequeno."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Guardar as mensagens &enviadas cifradas"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Mostrar o agente do utilizador nos cabeçalhos bonitos"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Active esta opção para mostrar as linhas de cabeçalho 'User-Agent' (agente de "
-"utilizador) e 'X-Mailer' (cliente de e-mail) ao usar os cabeçalhos bonitos."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Envia as Notificações de Entrega da Mensagem com um remetente vazio."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Enviar as Notificações de Disposição de Mensagens com um texto de remetente "
-"vazio. Alguns servidores poderão estar configurados para rejeitar essas "
-"mensagens, por isso, se estiver a ter problemas ao enviar MDNs, desligue esta "
-"opção."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "As frases foram convertidas para modelos"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Significa que as frases antigas foram convertidas para modelos"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Modelo das mensagens novas"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Modelo da mensagem de resposta"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Modelo da mensagem de resposta para todos"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Modelo da mensagem de encaminhamento"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Caracteres de citação"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 de %2 %3 usada"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14049,6 +12039,11 @@ msgstr "Adicionar como CC"
 msgid "Add as BCC"
 msgstr "Adicionar como BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "C&ancelar"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14064,10 +12059,10 @@ msgstr "Destinatários Escolhidos"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Escolheu 1 destinatário. O número máximo de destinatários é %1. Por favor "
 "altere a escolha.\n"
@@ -14088,11 +12083,11 @@ msgstr "Usar a Janela de Selecção de Endereços"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Este botão abre uma janela separada onde poderá seleccionar os destinatários, a "
-"partir de todos os endereços disponíveis."
+"Este botão abre uma janela separada onde poderá seleccionar os "
+"destinatários, a partir de todos os endereços disponíveis."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14194,10 +12189,19 @@ msgstr "é maior ou igual a"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dias"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Para executar a sua procura, todas as mensagens da pasta '%1' terão de ser "
 "obtidas do servidor. Isto poderá levar algum tempo. Deseja continuar a sua "
@@ -14349,16 +12353,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"A recolher os dados da conta '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "A recolher os dados da conta '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14377,10 +12377,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Conteúdo do 'script' '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Conteúdo do 'script' '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14403,20 +12401,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Capacidades do Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Capacidades do Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Sem capacidades especiais disponíveis)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"'Scripts' de Sieve disponíveis:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "'Scripts' de Sieve disponíveis:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14465,7 +12459,8 @@ msgstr ""
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
 msgstr ""
-"Carregue nos itens abaixo para obter alguma ajuda sobre os métodos de entrada."
+"Carregue nos itens abaixo para obter alguma ajuda sobre os métodos de "
+"entrada."
 
 #: signatureconfigurator.cpp:72
 msgid ""
@@ -14495,12 +12490,12 @@ msgstr "Utilize este campo para indicar uma assinatura estática."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Use este selector para indicar um ficheiro de texto que contenha a sua "
-"assinatura. Ele será lido sempre que criar uma nova mensagem ou adicionar uma "
-"assinatura nova."
+"assinatura. Ele será lido sempre que criar uma nova mensagem ou adicionar "
+"uma assinatura nova."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14516,22 +12511,27 @@ msgstr "Abre o ficheiro indicado num editor de texto."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Você poderá indicar aqui um comando arbitrário, tenha ou não a sua localização, "
-"dependendo do facto de o comando estar ou não na sua PATH. Para cada mensagem "
-"nova, o KMail irá executar o comando e usar o seu resultado (no 'standard "
-"output') como assinatura. Os comandos normais para usar neste mecanismo são o "
-"\"fortune\" ou o \"ksig -random\"."
+"Você poderá indicar aqui um comando arbitrário, tenha ou não a sua "
+"localização, dependendo do facto de o comando estar ou não na sua PATH. Para "
+"cada mensagem nova, o KMail irá executar o comando e usar o seu resultado "
+"(no 'standard output') como assinatura. Os comandos normais para usar neste "
+"mecanismo são o \"fortune\" ou o \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "E&specifique o comando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Localização"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Novo registo:"
@@ -14568,6 +12568,11 @@ msgstr "Adicionar uma Conta"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Deseja mesmo remover a identidade chamada <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "A&plicar a:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14582,6 +12587,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Editar o 'Script'..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14621,9 +12630,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14660,6 +12669,16 @@ msgstr "Não Activar"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Não foi possível inserir o conteúdo do ficheiro %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Para: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14689,61 +12708,53 @@ msgstr "Não é possível iniciar o comando do canal a partir do modelo: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui poderá criar modelos de mensagens para usar quando compõe novas "
-"mensagens ou respostas ou quando encaminha as mensagens.</p>"
-"<p>Os modelos de mensagens suportam os comandos de substituição, bastando para "
-"tal escrevê-los ou seleccioná-los no menu <i>Inserir um comando</i>.</p>"
-"<p>Os modelos aqui indicados são específicos para as pastas. Estes substituem "
-"tanto os modelos globais como os modelos por identidade, se estes estiverem "
-"definidos.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aqui poderá criar modelos de mensagens para usar quando compõe novas "
+"mensagens ou respostas ou quando encaminha as mensagens.</p><p>Os modelos de "
+"mensagens suportam os comandos de substituição, bastando para tal escrevê-"
+"los ou seleccioná-los no menu <i>Inserir um comando</i>.</p><p>Os modelos "
+"aqui indicados são específicos para as pastas. Estes substituem tanto os "
+"modelos globais como os modelos por identidade, se estes estiverem definidos."
+"</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui poderá criar modelos de mensagens para usar quando compõe novas "
-"mensagens ou respostas ou quando encaminha as mensagens.</p>"
-"<p>Os modelos de mensagens suportam os comandos de substituição, bastando para "
-"tal escrevê-los ou seleccioná-los no menu <i>Inserir um comando</i>.</p>"
-"<p>Os modelos aqui indicados são específicos para uma dada identidades de "
-"correio. Estes substituem tanto os modelos globais como os modelos por pasta, "
-"se estes estiverem definidos.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aqui poderá criar modelos de mensagens para usar quando compõe novas "
+"mensagens ou respostas ou quando encaminha as mensagens.</p><p>Os modelos de "
+"mensagens suportam os comandos de substituição, bastando para tal escrevê-"
+"los ou seleccioná-los no menu <i>Inserir um comando</i>.</p><p>Os modelos "
+"aqui indicados são específicos para uma dada identidades de correio. Estes "
+"substituem tanto os modelos globais como os modelos por pasta, se estes "
+"estiverem definidos.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui poderá criar modelos de mensagens para usar quando compõe novas "
-"mensagens ou respostas ou quando encaminha as mensagens.</p>"
-"<p>Os modelos de mensagens suportam os comandos de substituição, bastando para "
-"tal escrevê-los ou seleccioná-los no menu <i>Inserir um comando</i>.</p>"
-"<p>Os modelos aqui indicados são os modelos globais, que substituem tanto os "
-"modelos globais como os modelos por pasta, se estes estiverem definidos.</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aqui poderá criar modelos de mensagens para usar quando compõe novas "
+"mensagens ou respostas ou quando encaminha as mensagens.</p><p>Os modelos de "
+"mensagens suportam os comandos de substituição, bastando para tal escrevê-"
+"los ou seleccioná-los no menu <i>Inserir um comando</i>.</p><p>Os modelos "
+"aqui indicados são os modelos globais, que substituem tanto os modelos "
+"globais como os modelos por pasta, se estes estiverem definidos.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14984,7 +12995,8 @@ msgstr ""
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
-"Canalizar o Conteúdo da Mensagem Original e Inserir o Resultado sem Alterações"
+"Canalizar o Conteúdo da Mensagem Original e Inserir o Resultado sem "
+"Alterações"
 
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
@@ -15001,6 +13013,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Canalizar o Conteúdo da Mensagem Actual e Substituir pelo Resultado"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Mudar a Posição do Cursor"
@@ -15033,112 +13049,6 @@ msgstr "Activar a Depuração"
 msgid "Turn Debug Off"
 msgstr "Desactivar a Depuração"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...pode ir para a mensagem anterior e para a seguinte com as teclas\n"
-"de cursores para a esquerda e para a direita, respectivamente?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...pode criar rapidamente filtros para o remetente, o destinatário, o "
-"assunto e para as listas de correio com as opções em <em>"
-"Ferramentas-&gt;Criar um&nbsp;Filtro</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...pode ver-se livre do &quot;[nome da 'mailing list']&quot;\n"
-"adicionado ao assunto de algumas 'mailing lists' usando a acção do\n"
-"filtro <em>reescrever o cabeçalho</em>? Basta usar\n"
-"<pre>reescrever o cabeçalho &quot;Assunto&quot;\n"
-"   replace &quot;\\s*\\[nome da mailing list\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...pode associar as listas de correio com as pastas na janela\n"
-"<em>Pasta-&gt;Gestão da Lista de Correio</em>? Pode então usar a opção\n"
-"<em>Mensagem-&gt;Nova&nbsp;Mensagem&nbsp;na&nbsp;'Mailing&nbsp;List'...</em>\n"
-"para abrir o compositor com o endereço da lista de correio predefinido.\n"
-"Em alternativa, pode carregar com o botão do meio na pasta.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...pode atribuir ícones personalizados a cada pasta individualmente?\n"
-"Veja em <em>Pasta-&gt;Propriedades</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...o KMail pode mostrar uma barra colorida a indicar o tipo de mensagem\n"
-"(Texto simples/HTML/OpenPGP) visualizada no momento?</p>\n"
-"<p>Isto impede as tentativas de falsificar as verificações bem sucedidas\n"
-"de verificação da assinatura ao enviar as mensagens em HTML a imitar as\n"
-"barras de estado da assinatura do KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...pode filtrar qualquer cabeçalho bastando para tal indicar o seu nome no "
-"primeiro campo de edição de uma regra de procura?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...pode filtrar as mensagens apenas em HTML com a regra\n"
-"<pre>&quot;Content-type&quot; contém &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...ao responder, só a componente seleccionada da mensagem é citada?</p>\n"
-"<p>Se não for seleccionado nada, é citada a mensagem completa.</p>\n"
-"<p>Isto até funciona com o texto dos anexos quando você seleccionou\n"
-"<em>Ver-&gt;Anexos-&gt;Incorporados</em>.</p>\n"
-"<p>Esta funcionalidade está disponível com todos os comandos de resposta\n"
-"excepto o <em>Mensagem-&gt;Responder Sem Citar</em>.</p>\n"
-"<p align=\"right\"><em>contribuído por David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Não existe nada para desfazer."
@@ -15192,7 +13102,8 @@ msgstr "Recolher o texto citado."
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
-"Não foi possível iniciar o gestor de certificados. Verifique a sua instalação."
+"Não foi possível iniciar o gestor de certificados. Verifique a sua "
+"instalação."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -15207,6 +13118,17 @@ msgstr "Anexo #%1 (sem nome)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Já existe um ficheiro com o nome \"%1\". Tem a certeza que o deseja "
+"substituir?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Sobrepor o Ficheiro?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15238,8 +13160,8 @@ msgid ""
 "without it, KMail cannot install out-of-office replies for you.\n"
 "Please contact you system administrator."
 msgstr ""
-"O seu servidor não indicou as \"férias\" na sua lista de extensões suportadas "
-"do Sieve.\n"
+"O seu servidor não indicou as \"férias\" na sua lista de extensões "
+"suportadas do Sieve.\n"
 "Sem ele, o KMail não consegue instalar as respostas de 'fora do escritório' "
 "para si.\n"
 "Contacte por favor o seu administrador de sistemas."
@@ -15324,13 +13246,14 @@ msgstr "Enviar a imagem com todas a&s mensagens"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Assinale esta opção se quiser que o KMail adicione um cabeçalho X-Face às "
-"mensagens escritas com esta identidade. Uma X-Face é uma pequena (48x48 pontos) "
-"imagem a preto-e-branco que alguns clientes de e-mail poderão mostrar."
+"mensagens escritas com esta identidade. Uma X-Face é uma pequena (48x48 "
+"pontos) imagem a preto-e-branco que alguns clientes de e-mail poderão "
+"mostrar."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15358,9 +13281,9 @@ msgstr "Seleccionar o Ficheiro..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Use isto para seleccionar um ficheiro de imagem de onde criar a imagem. A "
 "imagem deverá ser de alto contraste e praticamente quadrado. Um fundo claro "
@@ -15372,21 +13295,22 @@ msgstr "Escolher do Livro de Endereços"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Poderá usar uma versão reduzida da imagem que tenha definido no seu item do "
 "livro de endereços."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>O KMail poderá enviar uma imagem a preto-e-branco e pequena (48x48 pontos) "
-"com cada mensagem. Por exemplo, esta poderá ser uma fotografia sua ou um "
-"símbolo. É mostrada no cliente de e-mail do destinatário (se este o suportar)."
+"<qt>O KMail poderá enviar uma imagem a preto-e-branco e pequena (48x48 "
+"pontos) com cada mensagem. Por exemplo, esta poderá ser uma fotografia sua "
+"ou um símbolo. É mostrada no cliente de e-mail do destinatário (se este o "
+"suportar)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15394,11 +13318,11 @@ msgstr "Utilize este campo para indicar um texto X-Face arbitrário."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Exemplos disponíveis em <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Exemplos disponíveis em <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15413,131 +13337,1788 @@ msgstr "Sem Imagem"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Não tem o seu próprio contacto definido no livro de endereços."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Assinar"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "A&ssinar automaticamente as mensagens"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Quando esta opção estiver activa, todas as mensagens que enviar serão "
+"assinadas por omissão; claro que é possível à mesma desactivar a assinatura "
+"para cada mensagem individualmente."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Cifra"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Definir o assunto da mensagem"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Quando esta opção está activa, o ficheiro/mensagem não só ser cifrado com a "
+"chave pública do destinatário, como também com a sua chave. Isto permitir-"
+"lhe-á decifrar o ficheiro/mensagem posteriormente. Esta é normalmente uma "
+"boa ideia."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Enviar o CC: para o 'endereço'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Mostrar o texto c&ifrado/assinado depois de escrito"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Enviar o BCC: para o 'endereço'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Quando esta opção estiver activada, o texto assinado/cifrado será mostrado "
+"numa janela em separado, o que lhe permite saber como é que irá ficar antes "
+"de ser enviada. Esta é uma boa ideia quando você está a verificar se o seu "
+"sistema de cifra está a funcionar."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Adicionar o 'cabeçalho' à mensagem"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Guardar as mensagens &enviadas cifradas"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Ler o corpo da mensagem do 'ficheiro'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Assinale para guardar as mensagens sem estarem cifradas "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Definir o corpo da mensagem"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Guardar as Mensagens Cifradas</h1>\n"
+"Se esta opção estiver assinalada, as mensagens enviadas serão guardadas "
+"cifradas como foram enviadas. Isto não é recomendado, porque o utilizador "
+"poderá não conseguir mais ler as mensagens se um dos certificados "
+"obrigatórios expirar.\n"
+"<p>\n"
+"Contudo, poderão existir regras locais que necessitem que o utilizador "
+"active esta opção. Quando tiver dúvidas confirme com o seu administrador "
+"local.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Adicionar um anexo à mensagem. Pode ser repetido"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Mostrar sempre as chaves de ci&fra para aprovação"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Verificar só se há correio novo"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Quando esta opção estiver activa, a aplicação irá mostrar-lhe sempre uma "
+"lista de chaves públicas onde poderá escolher a que irá usar para a cifra. "
+"Se estiver desligada, a aplicação só irá mostrar a mensagem se não encontrar "
+"a chave certa ou se tiver várias que possam ser usadas."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Abrir só a janela do compositor"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "C&ifrar automaticamente as mensagens sempre que possível"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Ver o ficheiro de mensagem dado"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Quando esta opção estiver activa, todas as mensagens que enviar serão "
+"cifradas sempre que a cifra for possível e desejada; claro que é possível à "
+"mesma desactivar a cifra automática para cada mensagem individual."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nunca assinar/cifrar ao gra&var como rascunho"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Como é que isto funciona?"
+
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universal"
+
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Resposta"
+
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Resposta para Todos"
+
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Encaminhamento"
+
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "A&talho:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "Tipo de &modelo:"
+
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Conteúdo do modelo"
+
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Atalho do modelo"
+
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Tipo do modelo"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Propriedades da Pasta"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "A pasta contém uma '&mailing list'"
+
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Endereço d&a lista:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Não-&lidas:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Expiração das Mensagens"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "E&xpirar após:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Expi&rar as mensagens lidas"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Ex&pirar após:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Expirar as mensagens &não-lidas"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dias"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Semanas"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Meses"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avançado"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Identidade do remetente:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Formato do &armazenamento::"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Apresentações de &lista:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Enviar as mensagens em espera ao verificar o correio"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Enviar a mensagem para o 'endereço' e anexar o ficheiro para o qual o 'URL' "
-"aponta."
+"<qt><p>Seleccione se deseja que o KMail envie todas as mensagens da pasta a-"
+"enviar nas verificações manuais ou em todas, ou se não deseja enviar as "
+"mensagens automaticamente de todo.</p></qt>"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lida"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Move automaticamente as mensagens não sincronizadas das pastas com "
+"permissões de acesso insuficientes"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Antiga"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Se existirem mensagens novas numa pasta que não tenham sido enviadas ainda "
+"para o servidor, mas se você não tiver permissões de acesso suficientes na "
+"pasta para as enviar agora, estas mensagens irão passar para uma pasta de "
+"'perdidos e achados'."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Removido"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Respondida"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Esta opção permite aos administradores definirem um atraso mínimo entre duas "
+"verificações de correio.\n"
+"O utilizador não será capaz de escolher um valor menor que o definido aqui."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Reenviada"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"A pasta seleccionada mais recentemente na janela de selecção de pastas."
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Em espera"
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Ignora a configuração do 'umask' dos utilizadores e usa apenas \"leitura-"
+"escrita apenas para o utilizador\""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Enviado"
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Política para mostrar o ícone na bandeja do sistema"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Vigiados"
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorado"
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Notificação de correio novo extensa"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "'Spam'"
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Se esta opção estiver activa, então para cada pasta o número de mensagens "
+"recebidas é mostrado na notificação de correio novo; caso contrário, você só "
+"irá obter uma mensagem de 'Chegou correio novo'."
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "'Ham'"
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Escolher o e&ditor:"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "A Fazer"
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Usar um editor e&xterno em vez do compositor"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Tem Anexo"
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 de %2 %3 usada"
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Activar a funcionalidade de 'groupware'"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Localização"
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Baralhar os cabeçalhos From:/To: nas respostas a respostas"
 
-#: util.h:208
+#: kmail.kcfg:173
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
 msgstr ""
-"Já existe um ficheiro com o nome \"%1\". Tem a certeza que o deseja substituir?"
+"O Microsoft Outlook tem um conjunto de problemas na sua implementação da "
+"norma iCalendar; esta opção resolve um deles.  Se tiver problemas com os "
+"utilizadores do Outlook a não conseguirem obter as suas respostas, tente "
+"activar esta opção."
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Sobrepor o Ficheiro?"
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Enviar convites de 'groupware' no corpo do e-mail"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"O Microsoft Outlook tem um conjunto de problemas na sua implementação da "
+"norma iCalendar; esta opção resolve um deles.  Se tiver problemas com os "
+"utilizadores do Outlook a não conseguirem obter os seus convites, tente "
+"activar esta opção."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Nomenclatura de convites compatível com o Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"O Microsoft Outlook, ao ser usado en conjunto com um servidor Microsoft "
+"Exchange, tem um problema na compreensão do e-mail de 'groupware' compatível "
+"com as normas. Active esta opção de modo a enviar os convites de 'groupware' "
+"de forma que o Microsoft Exchange compreenda."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Quando esta opção estiver seleccionada, não verá a janela de composição da "
+"mensagem. Em vez disso, todas as mensagens de convites são enviadas "
+"automaticamente. Se quiser ver a mensagem antes de a enviar, poderá desligar "
+"esta opção. Contudo, tenha em atenção que o texto na janela de composição "
+"está na sintaxe iCalendar, pelo que não deverá tentar modificá-la à mão."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Se activar isto tornará possível a gravação dos itens das aplicações do "
+"Kontact (KOrganizer, KAddressBook e KNotes.)</p><p>Se deseja activar esta "
+"opção, você deverá também configurar as aplicações para usarem o recurso de "
+"IMAP; isto é feito no Centro de Controlo do TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Normalmente, você não terá nenhuma razão para ver as pastas que contêm os "
+"recursos de IMAP, mas se precisar de os ver, poderá definir isso aqui.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Se a conta usada para guardar a informação de 'groupware' não for usada\n"
+"para guardar correio normal, active esta opção para que o KMail só mostre\n"
+"as pastas de 'groupware' nela. Isto é útil se estiver a lidar com correio\n"
+"normal numa conta 'online' de IMAP adicional.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Escolha o formato de armazenamento das pastas de 'groupware'. <ul><li>O "
+"formato a usar por omissão é o 'ical' (para as pastas de calendário) e o "
+"'vcard' (para as pastas do livro de endereços). Estes formatos oferecem "
+"todas as funcionalidades do Kontact.</li><li>O formato XML do Kolab usa um "
+"modelo personalizado que corresponde de certa forma ao usado no Outlook. "
+"Este formato oferece uma melhor compatibilidade com o Outlook, ao usar um "
+"servidor de Kolab ou uma solução compatível.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Isto escolhe a 'mãe' de todas as pastas de recursos do IMAP.</p><p>Por "
+"omissão, o servidor Kolab configura a caixa de entrada ('recebido') do IMAP "
+"como sendo a mãe.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Este é o ID da conta que contem as pastas de recursos IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Se quiser definir os nomes das pastas para o armazenamento de IMAP na sua "
+"língua local, você poderá optar entre estas línguas disponíveis.</"
+"p><p>Lembre-se que a única razão para o fazer é apenas para compatibilidade "
+"com o Microsoft Outlook. É considerada uma má ideia fazer isto, dado que "
+"poderá tornar a mudança de línguas impossível.</p><p>Por isso, não defina "
+"isto a não ser que não haja outro remédio.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Este valor é usado para decidir se a Introdução ao KMail deverá ser mostrada."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Número máximo de ligações por servidor"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Isto pode ser utiliza para limitar o número de ligações por servidor ao "
+"procurar novo e-mail. Por omissão o número de ligações é ilimitado (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Mostrar o campo de de procura rápida"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Esta opção activa ou desactiva o campo de procura rápida por cima da lista "
+"de mensagens, o qual poderá ser usado para procurar rapidamente pela "
+"informação mostrada na lista de mensagens."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Manter a codificação original ao responder ou ao reencaminhar se possível"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Adicionar a assinatura a&utomaticamente"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Recordar esta identidade, para que possa também ser usada nas futuras "
+"janelas de composição.\n"
+"         "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Recordar esta pasta para os itens enviados, para que possa também ser usada "
+"nas futuras janelas de composição."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Recordar este método de transporte de correio, para que possa também ser "
+"usada nas futuras janelas de composição."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Recordar esta identidade, para que possa também ser usada nas futuras "
+"janelas de composição.\n"
+"         "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Mudança de linha na coluna:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Avisar se o certificado de raiz expirar em &menos de:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Active esta opção para fazer com que o Outlook &#8482; compreenda os nomes "
+"de anexos que contenham caracteres não Ingleses"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Pedir automaticamente as notificações de disposição das &mensagens"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Active esta opção se quiser que o KMail processe as Notificações de "
+"Disposição de Mensagens (MDNs) para cada uma das suas mensagens enviadas.</"
+"p><p>Esta opção só afecta as predefinições; você pode à mesma activar ou "
+"desactivar o pedido de MDNs por cada mensagem no compositor, no item do menu "
+"<em>Opções</em>-><em>Pedir a Notificação de Disposição</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Usar os endereços recentes na completação automática"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Desactive esta opção se não quiser que os endereços recentes apareçam na "
+"lista de completação automática dos campos de endereços do compositor."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Gravar automaticamente a cada:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Pode-se criar uma cópia de segurança do texto na janela do compositor "
+"regularmente. O intervalo usado para criar as cópias de segurança é definido "
+"aqui. Você poderá desactivar a gravação automática se configurar este valor "
+"como 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Substituir o prefi&xo reconhecido por \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Substituir o prefixo reconhecido por \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Usar a citação inteli&gente"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "A assinatura expirou."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tipo do selector de destinatários"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Define o tipo de janela para seleccionar os destinatários do Para, CC e BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Editor de tipo de destinatário"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "Define o tipo de janela de edição de destinatários do Para, CC e BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Número máximo de linhas do editor de destinatários."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Manter a codificação original ao responder ou ao reencaminhar se possível"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Alguns e-mails, especialmente os que são gerados automaticamente, não "
+"indicam a codificação de caracteres que deverá ser usada para os mostrar "
+"correctamente. Nesses casos, será usada uma codificação alternativa que "
+"poderá configurar aqui. Configure com a codificação que for mais usada na "
+"sua parte do mundo. Por omissão, será usada a codificação configurada para "
+"todo o sistema."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Se alterar o valor disto para algo que não o 'Auto', será obrigado o uso da "
+"codificação indicada para todas as mensagens de e-mail, independentemente do "
+"que elas indicarem."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Active isto se quiser que os 'smileys' como :-) que aparecem no texto das "
+"mensagens sejam substituídos por 'emoticons' (pequenas imagens)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Active esta opção para mostrar os diferentes níveis do texto citado. "
+"Desactive para esconder os níveis do texto citado."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Nível de recolhimento automático:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reduzir o tamanho da letra do texto citado"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Active esta opção para mostrar o texto citado com um tamanho mais pequeno."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Guardar as mensagens &enviadas cifradas"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Mostrar o agente do utilizador nos cabeçalhos bonitos"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Active esta opção para mostrar as linhas de cabeçalho 'User-Agent' (agente "
+"de utilizador) e 'X-Mailer' (cliente de e-mail) ao usar os cabeçalhos "
+"bonitos."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Envia as Notificações de Entrega da Mensagem com um remetente vazio."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Enviar as Notificações de Disposição de Mensagens com um texto de remetente "
+"vazio. Alguns servidores poderão estar configurados para rejeitar essas "
+"mensagens, por isso, se estiver a ter problemas ao enviar MDNs, desligue "
+"esta opção."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "As frases foram convertidas para modelos"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Significa que as frases antigas foram convertidas para modelos"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Modelo das mensagens novas"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Modelo da mensagem de resposta"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Modelo da mensagem de resposta para todos"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Modelo da mensagem de encaminhamento"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Caracteres de citação"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Editar o &Ficheiro"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Editar..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Ir"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Pasta"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mensagem"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Resposta Especial"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Reencaminhar"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Repor o Tipo de Letra"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra de Ferramentas de HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opções Comuns"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barra de Ferramentas de HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validar os certificados com as CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Se esta opção estiver seleccionada, os certificados do S/MIME são validados "
+"com as Listas de Revogação de Certificados (CRLs)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validar os 'certificados' a nível 'online' (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Se esta opção estiver seleccionada, os certificados de S/MIME serão "
+"validados a nível 'online', usando o protocolo Online Certificates Status "
+"Protocol (OCSP). Preencha o URL do atendedor de OCSP em baixo."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Validação 'Online' do Certificado"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL do atendedor de OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Indique aqui o endereço do servidor para a validação 'online' dos "
+"certificados (o atendedor do OCSP). O URL começa normalmente por http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Assinatura da resposta do OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorar o URL de serviço dos certificados"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Não verificar políticas de certificados"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Por omissão, o GnuPG usa o ficheiro ~/.gnupg/policies.txt para verificar se "
+"uma dada política de certificados é permitida. Se esta opção estiver "
+"seleccionada, as políticas não são verificadas."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nunca consultar uma CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Se esta opção estiver assinalada, as Listas de Revogação de Certificados não "
+"são usadas nunca para validar os certificados do S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Obter os certificados do emissor em falta"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Se esta opção estiver assinalada, os certificados do emissor em falta são "
+"obtidos, logo que forem necessários (isto aplica-se a ambos os métodos de "
+"validação, as CRLs e o OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Pedidos HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Não efectuar pedidos HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Desactiva completamente a utilização de HTTP no S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Utilizar este 'proxy' para pedidos HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Utilizar o 'proxy' HTTP do sistema:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Se esta opção estiver seleccionada, o valor do 'proxy' de HTTP mostrado à "
+"direita (que vem na variável de ambiente 'http_proxy') será usado para "
+"qualquer pedido de HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Indique aqui a localização do seu 'proxy' de HTTP que será usado para todos "
+"os pedidos de HTTP relacionados com o S/MIME. A sintaxe é máquina:porto, "
+"como por exemplo meu_proxy.nenhures.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorar o ponto de distribuição CRL HTTP dos certificados"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Ao olhar para a localização de uma CRL, o certificado a testar contém os "
+"itens DP (CRL Distribution Points - Pontos de Distribuição de CRLs), que são "
+"URLs que descrevem a forma a aceder o URL. O primeiro DP encontrado será "
+"utilizado. Com esta opção, todos os itens que usem o esquema de HTTP são "
+"ignorados ao procurar por um DP adequado."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Pedidos LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Não efectuar pedidos LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Desactiva completamente a utilização de LDAP no S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorar o ponto de distribuição CRL LDAP dos certificados"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Ao olhar para a localização de uma CRL, o certificado a testar contém os "
+"itens DP (CRL Distribution Points - Pontos de Distribuição de CRLs), que são "
+"URLs que descrevem a forma a aceder o URL. O primeiro DP encontrado será "
+"utilizado. Com esta opção, todos os itens que usem o esquema de LDAP são "
+"ignorados ao procurar por um DP adequado."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Servidor primário para pedidos LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"A indicação aqui de um servidor de LDAP irá fazer com que todos os pedidos "
+"de LDAP vão primeiro a esse servidor. Mais precisamente, esta opção sobrepõe-"
+"se a todas as máquinas e portos indicadas num URL de LDAP e serão também "
+"usados se a máquina e o porto tiverem sido omitidos do URL. Os outros "
+"servidores de LDAP só serão usados se a ligação ao 'proxy' falhar.\n"
+"A sintaxe é igual a \"MÁQUINA\" ou \"MÁQUINA:PORTO\". Se o PORTO for "
+"omitido, será usado o porto 389 (o porto-padrão do LDAP)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Adicionar..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "'&Groupware'"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Repor o Tipo de Letra"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "ilimitado"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Resposta ao Remetente"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Resposta a Todos / à Lista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Mensagem Reencaminhada"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Avisar ao tentar enviar mensagens não a&ssinadas"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Assinale para ser avisado se enviar mensagens não assinadas."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar ao Tentar Enviar Mensagens Não Assinadas</h1>\n"
+"Se esta opção estiver assinalada, o utilizador será notificado quando tentar "
+"enviar a mensagem ou componentes da mesma não assinadas.\n"
+"<p>\n"
+"É recomendado que deixe esta opção activa para o máximo de integridade.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "A&visar ao tentar enviar mensagens não cifradas"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Assinale para ser avisado quando envia mensagens não-cifradas."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar ao Tentar Enviar Mensagens Não-Cifradas</h1>\n"
+"Se esta opção estiver assinalada, o utilizador será notificado quando tentar "
+"enviar a mensagem ou componentes da mesma não cifradas.\n"
+"<p>\n"
+"É recomendado que deixe esta opção activa para o máximo de integridade.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Avisa&r se o Endereço de E-Mail do Destinatário não Estiver no Certificado"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Assinale para ser avisado se o endereço não estiver no certificado"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se o Endereço de E-mail do Destinatário Não Estiver no "
+"Certificado</h1>\n"
+"Se esta opção estiver assinalada, será apresentado um aviso se o endereço de "
+"e-mail do destinatário não estiver contido no certificado usado para a "
+"cifra.\n"
+"<p>\n"
+"Recomenda-se que esta opção esteja ligada para o máximo de segurança.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Avisar se os certificado/chaves expirarem em breve (configurar os limites em "
+"baixo)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Para assinar"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Para cifrar"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Seleccione aqui o número de dias"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se o Certificado de Assinatura Expirar</h1>\n"
+"Seleccione o número mínimo de dias que o certificado de assinatura deverá "
+"ser válido sem que seja emitido um aviso.\n"
+"<p>\n"
+"A configuração recomendada pela SPHINX é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se o Certificado de Cifra Expirar</h1>\n"
+"Seleccione o número mínimo de dias que o certificado de cifra deverá ser "
+"válido sem que seja emitido um aviso.\n"
+"<p>\n"
+"A configuração recomendada pela SPHINX é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se um Certificado da Sequência Expirar</h1>\n"
+"Seleccione o número máximo de dias em que todos os certificados da sequência "
+"deverão ser válidos antes de apresentar um aviso.\n"
+"<p>\n"
+"A configuração recomendada pela SPHINX é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se o Certificado da AC Expirar</h1>\n"
+"Seleccione o número mínimo de dias durante os quais o certificado da AC "
+"deverá ser válido sem que seja emitido um aviso.\n"
+"<p>\n"
+"A configuração recomendada pela SPHINX é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se o Certificado da Raiz Expirar</h1>\n"
+"Seleccione o número mínimo de dias durante os quais o certificado da raiz "
+"deverá ser válido sem que seja emitido um aviso.\n"
+"<p>\n"
+"A configuração recomendada pela SPHINX é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Para certificados raiz:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Para certificados CA intermédios:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Para certificados/chaves de utilizadores finais:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Reactivar Todos os Avisos \"Não Perguntar de Novo\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...pode ir para a mensagem anterior e para a seguinte com as teclas\n"
+"de cursores para a esquerda e para a direita, respectivamente?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...pode criar rapidamente filtros para o remetente, o destinatário, o "
+"assunto e para as listas de correio com as opções em <em>Ferramentas-&gt;"
+"Criar um&nbsp;Filtro</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...pode ver-se livre do &quot;[nome da 'mailing list']&quot;\n"
+"adicionado ao assunto de algumas 'mailing lists' usando a acção do\n"
+"filtro <em>reescrever o cabeçalho</em>? Basta usar\n"
+"<pre>reescrever o cabeçalho &quot;Assunto&quot;\n"
+"   replace &quot;\\s*\\[nome da mailing list\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...pode associar as listas de correio com as pastas na janela\n"
+"<em>Pasta-&gt;Gestão da Lista de Correio</em>? Pode então usar a opção\n"
+"<em>Mensagem-&gt;Nova&nbsp;Mensagem&nbsp;na&nbsp;'Mailing&nbsp;List'...</"
+"em>\n"
+"para abrir o compositor com o endereço da lista de correio predefinido.\n"
+"Em alternativa, pode carregar com o botão do meio na pasta.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...pode atribuir ícones personalizados a cada pasta individualmente?\n"
+"Veja em <em>Pasta-&gt;Propriedades</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...o KMail pode mostrar uma barra colorida a indicar o tipo de mensagem\n"
+"(Texto simples/HTML/OpenPGP) visualizada no momento?</p>\n"
+"<p>Isto impede as tentativas de falsificar as verificações bem sucedidas\n"
+"de verificação da assinatura ao enviar as mensagens em HTML a imitar as\n"
+"barras de estado da assinatura do KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...pode filtrar qualquer cabeçalho bastando para tal indicar o seu nome "
+"no primeiro campo de edição de uma regra de procura?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...pode filtrar as mensagens apenas em HTML com a regra\n"
+"<pre>&quot;Content-type&quot; contém &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...ao responder, só a componente seleccionada da mensagem é citada?</p>\n"
+"<p>Se não for seleccionado nada, é citada a mensagem completa.</p>\n"
+"<p>Isto até funciona com o texto dos anexos quando você seleccionou\n"
+"<em>Ver-&gt;Anexos-&gt;Incorporados</em>.</p>\n"
+"<p>Esta funcionalidade está disponível com todos os comandos de resposta\n"
+"excepto o <em>Mensagem-&gt;Responder Sem Citar</em>.</p>\n"
+"<p align=\"right\"><em>contribuído por David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15625,38 +15206,50 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgstr "C&ifrar todas as componentes da mensagem"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Assinale para que todas as componentes da mensagem sejam cifradas por omissão"
+#~ msgstr ""
+#~ "Assinale para que todas as componentes da mensagem sejam cifradas por "
+#~ "omissão"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cifrar Todas as Componentes da Mensagem por Omissão</h1>\n"
-#~ "Se esta opção estiver seleccionada, todas as componentes de uma mensagem (i.e., o corpo da mensagem assim como todos os anexos) são cifradas por omissão.\n"
+#~ "Se esta opção estiver seleccionada, todas as componentes de uma mensagem "
+#~ "(i.e., o corpo da mensagem assim como todos os anexos) são cifradas por "
+#~ "omissão.\n"
 #~ "<p>\n"
-#~ "Esta é uma configuração por omissão, mas que pode ser sobreposta por cada mensagem individualmente.\n"
+#~ "Esta é uma configuração por omissão, mas que pode ser sobreposta por cada "
+#~ "mensagem individualmente.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "&Perguntar antes de cifrar cada componente"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Assinale para que lhe sejam perguntadas quais as componentes a cifrar"
+#~ msgstr ""
+#~ "Assinale para que lhe sejam perguntadas quais as componentes a cifrar"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perguntar Antes de Cifrar Cada Componente</h1>\n"
-#~ "Quando esta opção está seleccionada, ser-lhe-á perguntada, para cada componente da mensagem (i.e., o corpo da mensagem assim como todos os anexos) individual, se a quer cifrar ou não.\n"
+#~ "Quando esta opção está seleccionada, ser-lhe-á perguntada, para cada "
+#~ "componente da mensagem (i.e., o corpo da mensagem assim como todos os "
+#~ "anexos) individual, se a quer cifrar ou não.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15670,14 +15263,17 @@ msgstr "Sobrepor o Ficheiro?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Não Cifrar as Mensagens</h1>\n"
-#~ "Se esta opção estiver seleccionada, as mensagens não são cifradas por omissão.\n"
+#~ "Se esta opção estiver seleccionada, as mensagens não são cifradas por "
+#~ "omissão.\n"
 #~ "<p>\n"
-#~ "Esta é uma opção por omissão, mas pode sobrepô-la nas várias configurações individuais.\n"
+#~ "Esta é uma opção por omissão, mas pode sobrepô-la nas várias "
+#~ "configurações individuais.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15689,41 +15285,65 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo de Cifra</h1>\n"
-#~ "Um algoritmo é uma descrição para o computador de como ele deve efectuar uma dada tarefa. O algoritmo de cifra descreve como é que o computador aplica a chave do seu destinatário à sua mensagem de modo a que só o destinatário pretendido consiga ler a mensagem.\n"
+#~ "Um algoritmo é uma descrição para o computador de como ele deve efectuar "
+#~ "uma dada tarefa. O algoritmo de cifra descreve como é que o computador "
+#~ "aplica a chave do seu destinatário à sua mensagem de modo a que só o "
+#~ "destinatário pretendido consiga ler a mensagem.\n"
 #~ "<p>\n"
-#~ "A selecção de um dado algoritmo de cifra determina quão fácil ou difícil será interceptar e ler uma mensagem. Contudo, todos os algoritmos fornecidos com o ambiente SPHINX são considerados como muito seguros. Na generalidade, o predefinido irá funcionar perfeitamente.\n"
+#~ "A selecção de um dado algoritmo de cifra determina quão fácil ou difícil "
+#~ "será interceptar e ler uma mensagem. Contudo, todos os algoritmos "
+#~ "fornecidos com o ambiente SPHINX são considerados como muito seguros. Na "
+#~ "generalidade, o predefinido irá funcionar perfeitamente.\n"
 #~ "<p>\n"
-#~ "Esta opção está predefinida, mas pode sobrepô-la para cada mensagem individual.\n"
+#~ "Esta opção está predefinida, mas pode sobrepô-la para cada mensagem "
+#~ "individual.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
-#~ msgstr "A &verificação pode terminar no caso de ser um certificado gravado localmente"
+#~ msgstr ""
+#~ "A &verificação pode terminar no caso de ser um certificado gravado "
+#~ "localmente"
 
 #~ msgid "Check to end with locally saved certificate."
-#~ msgstr "Assinale para parar a verificação no caso de ser um certificado gravado localmente."
+#~ msgstr ""
+#~ "Assinale para parar a verificação no caso de ser um certificado gravado "
+#~ "localmente."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>A Verificação do Certificado Pode Terminar Num Certificado Local</h1>\n"
-#~ "Se esta opção estiver assinalada, a verificação da sequência de certificação poderá terminar num certificado guardado localmente.\n"
+#~ "<h1>A Verificação do Certificado Pode Terminar Num Certificado Local</"
+#~ "h1>\n"
+#~ "Se esta opção estiver assinalada, a verificação da sequência de "
+#~ "certificação poderá terminar num certificado guardado localmente.\n"
 #~ "<p>\n"
-#~ "Os certificados locais são os seus próprios certificados, assim como os dos parceiros de comunicação e os das autoridades de certificação (ACs).\n"
+#~ "Os certificados locais são os seus próprios certificados, assim como os "
+#~ "dos parceiros de comunicação e os das autoridades de certificação (ACs).\n"
 #~ "</qt>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15735,33 +15355,43 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Verificar Sempre o Caminho do Certificado Até ao Certificado de Raiz</h1>\n"
-#~ "Se esta opção estiver assinalada, o caminho do certificado que pertence ao do destinatário será verificado até ao certificado de raiz.\n"
+#~ "<h1>Verificar Sempre o Caminho do Certificado Até ao Certificado de Raiz</"
+#~ "h1>\n"
+#~ "Se esta opção estiver assinalada, o caminho do certificado que pertence "
+#~ "ao do destinatário será verificado até ao certificado de raiz.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
 #~ msgstr "Verificar o &caminho do certificado"
 
 #~ msgid "Check here to have the whole certificate path checked"
-#~ msgstr "Assinale esta opção para que o caminho completo do certificado seja verificado"
+#~ msgstr ""
+#~ "Assinale esta opção para que o caminho completo do certificado seja "
+#~ "verificado"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Verificar a Localização do Certificado</h1>\n"
-#~ "Se esta opção estiver assinalada, o caminho completo do certificado do destinatário até à raiz será verificado.\n"
+#~ "Se esta opção estiver assinalada, o caminho completo do certificado do "
+#~ "destinatário até à raiz será verificado.\n"
 #~ "<p>\n"
-#~ "Lembre-se que não é possível desligar a verificação do certificado do destinatário em si.\n"
+#~ "Lembre-se que não é possível desligar a verificação do certificado do "
+#~ "destinatário em si.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15773,33 +15403,48 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Usar as Listas de Revogação de Certificados (CRLs)</h1>\n"
-#~ "Uma lista de revogação de certificados contém os certificados que foram descartados e que já não devem ser usados mais para fins de cifra. Um utilizador pode ter optado por revogar o seu certificado porque suspeita que a integridade do certificado foi comprometida (p.ex. alguém adivinhou o PIN).\n"
+#~ "Uma lista de revogação de certificados contém os certificados que foram "
+#~ "descartados e que já não devem ser usados mais para fins de cifra. Um "
+#~ "utilizador pode ter optado por revogar o seu certificado porque suspeita "
+#~ "que a integridade do certificado foi comprometida (p.ex. alguém adivinhou "
+#~ "o PIN).\n"
 #~ "<p>\n"
-#~ "Recomenda-se que use as CRLs para um máximo de segurança. Na janela de configuração da gestão de certificados e de CRLs, pode seleccionar a partir de onde pode obter as CRLs.\n"
+#~ "Recomenda-se que use as CRLs para um máximo de segurança. Na janela de "
+#~ "configuração da gestão de certificados e de CRLs, pode seleccionar a "
+#~ "partir de onde pode obter as CRLs.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Avisar se a CRL e&xpirar em menos de:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Assinale para ser notificado de cada vez que um CRL expirar em breve"
+#~ msgstr ""
+#~ "Assinale para ser notificado de cada vez que um CRL expirar em breve"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar se a CRL Expirar em Menos de</h1>\n"
-#~ "Se esta opção estiver assinalada, o utilizador será avisado se uma das CRLs que está usar estiver prestes a expirar nos tempos mais próximos.\n"
+#~ "Se esta opção estiver assinalada, o utilizador será avisado se uma das "
+#~ "CRLs que está usar estiver prestes a expirar nos tempos mais próximos.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15808,14 +15453,16 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar se a CRL Expirar em Menos de</h1>\n"
-#~ "Neste campo pode indicar o período de tempo antes de uma CRL expirar, a partir do qual será avisado dessa expiração.\n"
+#~ "Neste campo pode indicar o período de tempo antes de uma CRL expirar, a "
+#~ "partir do qual será avisado dessa expiração.\n"
 #~ "<p>\n"
 #~ "A configuração recomendada para o ambiente SPHINX são 7 dias.\n"
 #~ "</qt>"
@@ -15824,21 +15471,26 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgstr "Cifrar sempre para o &próprio"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Assinale para ter as mensagens cifradas também com a sua própria chave."
+#~ msgstr ""
+#~ "Assinale para ter as mensagens cifradas também com a sua própria chave."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Cifrar sempre para o próprio</h1>\n"
-#~ "Se esta opção estiver assinalada, as mensagens cifradas que forem enviadas por si serão também cifradas com a sua própria chave.\n"
+#~ "Se esta opção estiver assinalada, as mensagens cifradas que forem "
+#~ "enviadas por si serão também cifradas com a sua própria chave.\n"
 #~ "<p>\n"
-#~ "É recomendado que deixe esta opção para lhe permitir ler as mensagens que enviou.\n"
+#~ "É recomendado que deixe esta opção para lhe permitir ler as mensagens que "
+#~ "enviou.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15850,23 +15502,29 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar Se o Certificado Expirar</h1>\n"
-#~ "Se esta opção estiver activa, o utilizador será avisado ao tentar usar um certificado para cifrar que expira dentro do número de dias indicado.\n"
+#~ "Se esta opção estiver activa, o utilizador será avisado ao tentar usar um "
+#~ "certificado para cifrar que expira dentro do número de dias indicado.\n"
 #~ "<p>\n"
-#~ "Recomenda-se que mantenha esta opção activa para evitar usar certificados que expirem em breve.\n"
+#~ "Recomenda-se que mantenha esta opção activa para evitar usar certificados "
+#~ "que expirem em breve.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
 #~ msgstr "Avisar se o certificado do destinatário expi&rar em menos de:"
 
 #~ msgid "Warn if receiver's email address is &not in certificate"
-#~ msgstr "Avisar se o endereço de e-mail do destinatário &não estiver no certificado"
+#~ msgstr ""
+#~ "Avisar se o endereço de e-mail do destinatário &não estiver no certificado"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Configuração da Assinatura"
@@ -15880,8 +15538,29 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Selecciona quais os certificados a enviar"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Envio de Certificados</h1> Sem o seu certificado, o destinatário não poderá determinar se foi mesmo você que enviou a mensagem ou se a mensagem foi alterada por terceiros.<p>O destinatário poderá obter o seu certificado de um servidor central, mas também poderá optar por juntar o seu certificado com a sua mensagem. O utilizador poderá seleccionar se não quer adicionar o certificado de todo, apenas o seu certificado ou toda a cadeia de certificados que certificam o seu próprio certificado, incluindo ou excluindo o certificado de raiz.<p> Recomenda-se que inclua pelo menos o seu próprio certificado com a mensagem.<p>Esta opção está predefinida, mas pode sobrepô-la para cada mensagem individual.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Envio de Certificados</h1> Sem o seu certificado, o destinatário "
+#~ "não poderá determinar se foi mesmo você que enviou a mensagem ou se a "
+#~ "mensagem foi alterada por terceiros.<p>O destinatário poderá obter o seu "
+#~ "certificado de um servidor central, mas também poderá optar por juntar o "
+#~ "seu certificado com a sua mensagem. O utilizador poderá seleccionar se "
+#~ "não quer adicionar o certificado de todo, apenas o seu certificado ou "
+#~ "toda a cadeia de certificados que certificam o seu próprio certificado, "
+#~ "incluindo ou excluindo o certificado de raiz.<p> Recomenda-se que inclua "
+#~ "pelo menos o seu próprio certificado com a mensagem.<p>Esta opção está "
+#~ "predefinida, mas pode sobrepô-la para cada mensagem individual.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Enviar o &seu próprio certificado"
@@ -15896,38 +15575,49 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgstr "Assinar todas as com&ponentes da mensagem"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Assinale para ter todas as componentes das mensagens assinadas por omissão"
+#~ msgstr ""
+#~ "Assinale para ter todas as componentes das mensagens assinadas por omissão"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Assinar Todas as Componentes da Mensagem por Omissão</h1>\n"
-#~ "Se esta opção estiver seleccionada, todas as componentes de uma mensagem (i.e., a componente assim como todos os anexos) são assinadas por omissão.\n"
+#~ "Se esta opção estiver seleccionada, todas as componentes de uma mensagem "
+#~ "(i.e., a componente assim como todos os anexos) são assinadas por "
+#~ "omissão.\n"
 #~ "<p>\n"
-#~ "Esta é uma configuração por omissão, mas que pode ser sobreposta por cada mensagem individualmente.\n"
+#~ "Esta é uma configuração por omissão, mas que pode ser sobreposta por cada "
+#~ "mensagem individualmente.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
 #~ msgstr "Perguntar &antes de assinar cada componente"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Assinale para lhe serem pedidas quais as componentes que deseja assinar"
+#~ msgstr ""
+#~ "Assinale para lhe serem pedidas quais as componentes que deseja assinar"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perguntar Antes de Assinar Cada Componente</h1>\n"
-#~ "Quando esta opção estiver assinalada, ser-lhe-á perguntada, para cada componente da mensagem (i.e., o conteúdo principal da mensagem assim como todos os anexos) individual, se quer que essa componente seja assinada.\n"
+#~ "Quando esta opção estiver assinalada, ser-lhe-á perguntada, para cada "
+#~ "componente da mensagem (i.e., o conteúdo principal da mensagem assim como "
+#~ "todos os anexos) individual, se quer que essa componente seja assinada.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15941,18 +15631,24 @@ msgstr "Sobrepor o Ficheiro?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Não Assinar as Mensagens</h1>\n"
-#~ "Se esta opção estiver seleccionada, as mensagens não são assinadas por omissão.\n"
+#~ "Se esta opção estiver seleccionada, as mensagens não são assinadas por "
+#~ "omissão.\n"
 #~ "<p>\n"
-#~ "Esta é uma opção por omissão, mas pode sobrepô-la nas várias configurações individuais.\n"
+#~ "Esta é uma opção por omissão, mas pode sobrepô-la nas várias "
+#~ "configurações individuais.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "O certificado de assinatura é configurado na página de <em>Certificados</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "O certificado de assinatura é configurado na página de <em>Certificados</"
+#~ "em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15963,20 +15659,34 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo de Cifra</h1>\n"
-#~ "Um algoritmo é uma descrição para o computador de como ele deve efectuar uma dada tarefa. O algoritmo de assinatura descreve como é que o computador aplica a sua chave à sua mensagem de modo a que o destinatário possa determinar se a mensagem veio de facto de si.\n"
+#~ "Um algoritmo é uma descrição para o computador de como ele deve efectuar "
+#~ "uma dada tarefa. O algoritmo de assinatura descreve como é que o "
+#~ "computador aplica a sua chave à sua mensagem de modo a que o destinatário "
+#~ "possa determinar se a mensagem veio de facto de si.\n"
 #~ "<p>\n"
-#~ "A selecção de um dado algoritmo de assinatura determina quão fácil ou difícil será interceptar e ler uma mensagem. Contudo, todos os algoritmos fornecidos com o ambiente SPHINX são considerados como muito seguros. Na generalidade, o predefinido irá funcionar perfeitamente.\n"
+#~ "A selecção de um dado algoritmo de assinatura determina quão fácil ou "
+#~ "difícil será interceptar e ler uma mensagem. Contudo, todos os algoritmos "
+#~ "fornecidos com o ambiente SPHINX são considerados como muito seguros. Na "
+#~ "generalidade, o predefinido irá funcionar perfeitamente.\n"
 #~ "<p>\n"
-#~ "Esta opção está predefinida, mas pode sobrepô-la para cada mensagem individual.\n"
+#~ "Esta opção está predefinida, mas pode sobrepô-la para cada mensagem "
+#~ "individual.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15991,12 +15701,17 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Gravar as Mensagens com as Assinaturas</h1>\n"
-#~ "Quando esta opção estiver assinalada, as mensagens enviadas são guardadas em conjunto com as suas assinaturas aplicadas. Isto é recomendado, porque permite-lhe verificar posteriormente se assinou uma mensagem ou apenas uma componente da mesma.\n"
+#~ "Quando esta opção estiver assinalada, as mensagens enviadas são guardadas "
+#~ "em conjunto com as suas assinaturas aplicadas. Isto é recomendado, porque "
+#~ "permite-lhe verificar posteriormente se assinou uma mensagem ou apenas "
+#~ "uma componente da mesma.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -16011,12 +15726,19 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Uma assinatura separada num Multipart</h1>\n"
-#~ "Quando esta opção estiver assinalada, a assinatura e os dados assinados serão componentes separadas de um componente de mensagem Multipart/Signed. Os dados da mensagem assinados serão legíveis mesmo pelos Agentes do Utilizador de E-mail que não suportem o algoritmo de assinatura e que não suportem a descodificação ASN.1.\n"
+#~ "Quando esta opção estiver assinalada, a assinatura e os dados assinados "
+#~ "serão componentes separadas de um componente de mensagem Multipart/"
+#~ "Signed. Os dados da mensagem assinados serão legíveis mesmo pelos Agentes "
+#~ "do Utilizador de E-mail que não suportem o algoritmo de assinatura e que "
+#~ "não suportem a descodificação ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -16028,12 +15750,17 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Assinaturas assinadas de forma opaca</h1>\n"
-#~ "Quando esta opção estiver assinalada, tanto a assinatura como os dados assinados estarão codificados num único bloco de ASN.1. As mensagens serão legíveis apenas para os Agentes de Utilizador de E-mail que suportem a descodificação ASN.1.\n"
+#~ "Quando esta opção estiver assinalada, tanto a assinatura como os dados "
+#~ "assinados estarão codificados num único bloco de ASN.1. As mensagens "
+#~ "serão legíveis apenas para os Agentes de Utilizador de E-mail que "
+#~ "suportem a descodificação ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -16045,8 +15772,24 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Seleccione quando é que o PIN deve ser introduzido"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Indicação do PIN</h1> Aqui, o utilizador poderá definir com que frequência terá de introduzir o PIN de modo a aceder ao seu ambiente de segurança pessoa (PSE), o qual contém os seus certificados.<p> Quanto mais vezes necessitar de introduzir o seu PIN, mais protegido estará contra as mensagens de e-mail que forem forjadas em seu nome, mas mais inconvenientes se tornarão as operações.<p> Se não tiver a certeza sobre o que seleccionar aqui, deixe esta opção como está.<p>Lembre-se que não é possível desligar a introdução do PIN por completo por razões de segurança.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Indicação do PIN</h1> Aqui, o utilizador poderá definir com que "
+#~ "frequência terá de introduzir o PIN de modo a aceder ao seu ambiente de "
+#~ "segurança pessoa (PSE), o qual contém os seus certificados.<p> Quanto "
+#~ "mais vezes necessitar de introduzir o seu PIN, mais protegido estará "
+#~ "contra as mensagens de e-mail que forem forjadas em seu nome, mas mais "
+#~ "inconvenientes se tornarão as operações.<p> Se não tiver a certeza sobre "
+#~ "o que seleccionar aqui, deixe esta opção como está.<p>Lembre-se que não é "
+#~ "possível desligar a introdução do PIN por completo por razões de "
+#~ "segurança.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "A cada sessão"
@@ -16063,35 +15806,45 @@ msgstr "Sobrepor o Ficheiro?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar Se o Certificado Expirar</h1>\n"
-#~ "Se esta opção estiver activa, o utilizador será avisado ao tentar usar um certificado para assinar que expira dentro do número de dias indicado.\n"
+#~ "Se esta opção estiver activa, o utilizador será avisado ao tentar usar um "
+#~ "certificado para assinar que expira dentro do número de dias indicado.\n"
 #~ "<p>\n"
-#~ "Recomenda-se que mantenha esta opção activa para evitar usar certificados que expirem em breve.\n"
+#~ "Recomenda-se que mantenha esta opção activa para evitar usar certificados "
+#~ "que expirem em breve.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Avisar se o cert&ificado de assinatura expirar em menos de:"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Avisar se o endereço de e-mail do assinante &não estiver no certificado"
+#~ msgstr ""
+#~ "Avisar se o endereço de e-mail do assinante &não estiver no certificado"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Avisar se o Endereço de E-mail do Assinante Não Estiver no Certificado</h1>\n"
-#~ "Se esta opção estiver assinalada, será apresentado um aviso se o endereço de e-mail do assinante não estiver contido no certificado usado para a assinatura.\n"
+#~ "<h1>Avisar se o Endereço de E-mail do Assinante Não Estiver no "
+#~ "Certificado</h1>\n"
+#~ "Se esta opção estiver assinalada, será apresentado um aviso se o endereço "
+#~ "de e-mail do assinante não estiver contido no certificado usado para a "
+#~ "assinatura.\n"
 #~ "<p>\n"
 #~ "Recomenda-se que esta opção esteja ligada para o máximo de segurança.\n"
 #~ "</qt>"
diff --git a/tde-i18n-pt_BR/messages/tdepim/kmail.po b/tde-i18n-pt_BR/messages/tdepim/kmail.po
index a340ee39844..a190c224631 100644
--- a/tde-i18n-pt_BR/messages/tdepim/kmail.po
+++ b/tde-i18n-pt_BR/messages/tdepim/kmail.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-11-27 17:21-0200\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -30,14 +30,14 @@ msgstr ""
 "Teixeira, Eduardo Pereira Habkost, Henrique Pinto, Felipe Arruda, Diniz "
 "Bortolotto"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
 "lisiane@conectiva.com.br, asergioz@bol.com.br, roberto@kde.org, "
-"ehabkost@conectiva.com.br, henrique.pinto@kdemail.net, felipemiguel@gmail.com, "
-"diniz.bb@gmail.com"
+"ehabkost@conectiva.com.br, henrique.pinto@kdemail.net, felipemiguel@gmail."
+"com, diniz.bb@gmail.com"
 
 #: aboutdata.cpp:53
 msgid "Maintainer"
@@ -181,6 +181,12 @@ msgstr "N&enhum (use com cuidado)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Conta para manipulação semi-automática de fontes de dados"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Limpar Passado"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -197,8 +203,8 @@ msgstr "Limpar Passado"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Remove todas as alocações desatualizadas para a fonte de dados representada por "
-"esta conta."
+"Remove todas as alocações desatualizadas para a fonte de dados representada "
+"por esta conta."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -259,13 +265,13 @@ msgstr "&Login:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Seu Provedor forneceu a você um <em>nome de usuário</em>"
-", que é usado para autenticar-se com seus servidores. Ele é, geralmente, a "
-"primeira parte do seu endereço de e-mail  (a parte antes do <em>@</em>)."
+"Seu Provedor forneceu a você um <em>nome de usuário</em>, que é usado para "
+"autenticar-se com seus servidores. Ele é, geralmente, a primeira parte do "
+"seu endereço de e-mail  (a parte antes do <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -286,20 +292,20 @@ msgstr "A&rmazenar a senha do servidor POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Marque esta opção para fazer com que o KMail armazene a sua senha.\n"
-"Se o TDEWallet estiver disponível, a senha será armazenada no TDEWallet, que é "
-"considerado seguro.\n"
-"Entretanto, se o TDEWallet não estiver disponível, a senha será armazenada no "
-"arquivo de configuração do KMail. A senha é armazenada em um formato obscuro, "
-"mas não deve ser considerado seguro contra esforços para a descriptografá-la se "
-"alguém tiver acesso ao arquivo de configuração."
+"Se o TDEWallet estiver disponível, a senha será armazenada no TDEWallet, que "
+"é considerado seguro.\n"
+"Entretanto, se o TDEWallet não estiver disponível, a senha será armazenada "
+"no arquivo de configuração do KMail. A senha é armazenada em um formato "
+"obscuro, mas não deve ser considerado seguro contra esforços para a "
+"descriptografá-la se alguém tiver acesso ao arquivo de configuração."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -327,12 +333,13 @@ msgstr "&Filtrar mensagens que forem maiores que"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Se você selecionar esta opção, os Filtros POP serão usados para decidir o que "
-"fazer com as mensagens. Você pode então selecionar para baixar, remover ou "
-"manter as mensagens no servidor."
+"Se você selecionar esta opção, os Filtros POP serão usados para decidir o "
+"que fazer com as mensagens. Você pode então selecionar para baixar, remover "
+"ou manter as mensagens no servidor."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -381,13 +388,15 @@ msgstr "Te&xto puro"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -430,19 +439,20 @@ msgstr "Espaços de Nomes:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Aqui você ve os diferentes espaços de nome que o servidor IMAP suporta. Cada "
-"espaço de nome representa um prefixo que separa os grupos de pastas. Os espaços "
-"de nome permitem que o KMail, por exemplo, exiba suas pastas pessoais e "
-"compartilhadas em uma única conta."
+"espaço de nome representa um prefixo que separa os grupos de pastas. Os "
+"espaços de nome permitem que o KMail, por exemplo, exiba suas pastas "
+"pessoais e compartilhadas em uma única conta."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
 msgstr ""
-"Recarregar os espaços de nome do servidor. Isto sobrescreve quaisquer mudanças."
+"Recarregar os espaços de nome do servidor. Isto sobrescreve quaisquer "
+"mudanças."
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -495,13 +505,13 @@ msgstr "Carregar ane&xos conforme requerido"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Ative isto para carregar anexos, não  automaticamente quando você selecionar o "
-"e-mail, mas somente quando você clicar no anexo. Desta maneira, e-mails grandes "
-"também serão mostrados instantaneamente."
+"Ative isto para carregar anexos, não  automaticamente quando você selecionar "
+"o e-mail, mas somente quando você clicar no anexo. Desta maneira, e-mails "
+"grandes também serão mostrados instantaneamente."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -541,7 +551,7 @@ msgstr "<nenhum>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "caixa de entrada"
 
@@ -549,47 +559,49 @@ msgstr "caixa de entrada"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "O servidor não parece suportar números únicos de mensagens, mas isto é um "
 "requisito para que as mensagens sejam deixadas no servidor.\n"
-"Visto que alguns servidores não anunciam corretamente suas capacidades, existe "
-"ainda a possibilidade de habilitar a opção de deixar as mensagens baixadas no "
-"servidor."
+"Visto que alguns servidores não anunciam corretamente suas capacidades, "
+"existe ainda a possibilidade de habilitar a opção de deixar as mensagens "
+"baixadas no servidor."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"O servidor não parece suportar a busca por  cabeçalhos de mensagens, mas isto é "
-"um requisito para que as mensagens sejam filtradas no servidor.\n"
-"Visto que alguns servidores não anunciam corretamente suas capacidades, existe "
-"ainda a possibilidade de habilitar a opção de filtrar as mensagens no servidor."
+"O servidor não parece suportar a busca por  cabeçalhos de mensagens, mas "
+"isto é um requisito para que as mensagens sejam filtradas no servidor.\n"
+"Visto que alguns servidores não anunciam corretamente suas capacidades, "
+"existe ainda a possibilidade de habilitar a opção de filtrar as mensagens no "
+"servidor."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Por favor, note que este recurso pode fazer com que alguns servidores POP3, que "
-"não suportam pipelining, enviem mensagens corrompidas.\n"
+"Por favor, note que este recurso pode fazer com que alguns servidores POP3, "
+"que não suportam pipelining, enviem mensagens corrompidas.\n"
 "Isto é configurável, pois alguns servidores suportam pipelining mas não "
 "anunciam suas capacidades. Para verificar se seu servidor POP3 tem suporte a "
 "pipelining, use o botão \"Verificar o Que o Servidor Suporta \" na parte de "
 "baixo deste diálogo.\n"
-"Se seu servidor não anuncia suporte pipelining, mas você quer mais velocidade, "
-"você deve fazer alguns testes enviando um lote de mensagens para você mesmo e "
-"tentar baixá-las."
+"Se seu servidor não anuncia suporte pipelining, mas você quer mais "
+"velocidade, você deve fazer alguns testes enviando um lote de mensagens para "
+"você mesmo e tentar baixá-las."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -597,53 +609,54 @@ msgstr "Por favor, especifique um servidor e porta na aba Geral primeiramente."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "O servidor parece não suportar pipelining, e por isso, esta opção foi "
 "desabilitada.\n"
 "Visto que alguns servidores suportam pipelining mas não anunciam suas "
 "capacidades corretamente, existe a possibilidade de habilitar o pipelining. "
 "Note, entretanto, que este recurso pode fazer com que alguns servidores POP, "
-"que não suportam pipelining, enviem mensagens corrompidas. Assim, antes de usar "
-"este recurso com e-mails importantes, teste-o primeiramente enviando a você "
-"mesmo um grande número de mensagens de teste, que você deverá baixar de uma vez "
-"do servidor POP."
+"que não suportam pipelining, enviem mensagens corrompidas. Assim, antes de "
+"usar este recurso com e-mails importantes, teste-o primeiramente enviando a "
+"você mesmo um grande número de mensagens de teste, que você deverá baixar de "
+"uma vez do servidor POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "O servidor não parece suportar números de mensagens únicos, mas isto é um "
 "requisito para que as mensagens sejam deixadas no servidor, e portanto, esta "
 "opção foi desabilitada.\n"
-"Visto que alguns servidores não anunciam corretamente suas capacidades, existe "
-"ainda a possibilidade de habilitar a opção de deixar as mensagens baixadas no "
-"servidor."
+"Visto que alguns servidores não anunciam corretamente suas capacidades, "
+"existe ainda a possibilidade de habilitar a opção de deixar as mensagens "
+"baixadas no servidor."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
-msgstr ""
-"O servidor não parece suportar a busca por  cabeçalhos de mensagens, mas isto é "
-"um requisito para que as mensagens sejam filtradas no servidor. Portanto, esta "
-"opção foi desabilitada.\n"
-"Visto que alguns servidores não anunciam corretamente suas capacidades, existe "
-"ainda a possibilidade de habilitar a opção de filtrar as mensagens no servidor."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
+msgstr ""
+"O servidor não parece suportar a busca por  cabeçalhos de mensagens, mas "
+"isto é um requisito para que as mensagens sejam filtradas no servidor. "
+"Portanto, esta opção foi desabilitada.\n"
+"Visto que alguns servidores não anunciam corretamente suas capacidades, "
+"existe ainda a possibilidade de habilitar a opção de filtrar as mensagens no "
+"servidor."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -723,8 +736,8 @@ msgstr "Conta IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Você deve adicionar uma conta na seção de rede das configurações para poder "
 "receber correio."
@@ -763,14 +776,14 @@ msgstr "Bem-vindo ao KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Parece que esta é a primeira vez que você usa o KMail. Você pode usar esse "
-"assistente para configurar suas contas de correio eletrônico. Tudo o que será "
-"preciso é que você forneça os dados de conexão que você obteve de seu provedor "
-"de e-mail. </qt>"
+"<qt>Parece que esta é a primeira vez que você usa o KMail. Você pode usar "
+"esse assistente para configurar suas contas de correio eletrônico. Tudo o "
+"que será preciso é que você forneça os dados de conexão que você obteve de "
+"seu provedor de e-mail. </qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -832,8 +845,7 @@ msgstr "Utilizar entrega local"
 msgid "Server Information"
 msgstr "Informações do Servidor"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nenhum"
@@ -955,8 +967,8 @@ msgstr ""
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>A pasta para mensagens classificadas como incerteza (provavelmente spam) é "
-"<i>"
+"<p>A pasta para mensagens classificadas como incerteza (provavelmente spam) "
+"é <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -976,31 +988,29 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Aqui você pode conseguir alguma ajuda para definir as regras de filtragem do "
-"KMail para usar algumas ferramentas, normalmente conhecidas, como ferramentas "
-"de anti-vírus.</p>"
-"<p>Este assistente pode detectar as ferramentas, bem como criar regras de "
-"filtragem para classificar as mensagens através destas ferramentas, e também "
-"separar as mensagens classificadas como mensagens com vírus. O assistente não "
-"tomará em consideração nenhuma regra de filtragem existente, mas sim anexará "
-"novas regras em qualquer caso.</p>"
-"<p><b>Aviso:</b> Como o KMail fica bloqueado durante a procura de mensagens com "
-"vírus, você pode encontrar problemas de resposta do KMail, pois as operações da "
-"ferramenta de anti-vírus geralmente consomem recursos; por favor, considere a "
-"remoção das regras de filtragem através do assistente, para voltar ao "
-"comportamento inicial."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Aqui você pode conseguir alguma ajuda para definir as regras de filtragem "
+"do KMail para usar algumas ferramentas, normalmente conhecidas, como "
+"ferramentas de anti-vírus.</p><p>Este assistente pode detectar as "
+"ferramentas, bem como criar regras de filtragem para classificar as "
+"mensagens através destas ferramentas, e também separar as mensagens "
+"classificadas como mensagens com vírus. O assistente não tomará em "
+"consideração nenhuma regra de filtragem existente, mas sim anexará novas "
+"regras em qualquer caso.</p><p><b>Aviso:</b> Como o KMail fica bloqueado "
+"durante a procura de mensagens com vírus, você pode encontrar problemas de "
+"resposta do KMail, pois as operações da ferramenta de anti-vírus geralmente "
+"consomem recursos; por favor, considere a remoção das regras de filtragem "
+"através do assistente, para voltar ao comportamento inicial."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1027,8 +1037,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"A pasta padrão para as mensagem de spam é a Lixeira, mas você pode alterar esta "
-"definição na visão de pasta abaixo."
+"A pasta padrão para as mensagem de spam é a Lixeira, mas você pode alterar "
+"esta definição na visão de pasta abaixo."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1036,16 +1046,14 @@ msgstr "Mover &provável spam para:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "A pasta padrão é a caixa de entrada, mas você pode trocar esta definição na "
-"visualização de pasta abaixo. "
-"<p> Nem todas as ferramentas podem classificar uma mensagem como um provável "
-"spam. Se você não selecionou uma ferramenta capaz de fazer isso, você não pode "
-"selecionar uma pasta para este propósito."
+"visualização de pasta abaixo. <p> Nem todas as ferramentas podem classificar "
+"uma mensagem como um provável spam. Se você não selecionou uma ferramenta "
+"capaz de fazer isso, você não pode selecionar uma pasta para este propósito."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1055,13 +1063,13 @@ msgstr "Verifica as mensagens usando as ferramentas anti-vírus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Deixa as ferramentas de anti-vírus classificar suas mensagens. O assistente "
 "criará os filtros apropriados. As mensagens são usualmente marcadas pelas "
-"ferramentas, e assim, os filtros seguintes podem trabalhar com elas, como por "
-"exemplo mover as mensagens que contenham vírus para uma pasta especial."
+"ferramentas, e assim, os filtros seguintes podem trabalhar com elas, como "
+"por exemplo mover as mensagens que contenham vírus para uma pasta especial."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1070,12 +1078,12 @@ msgstr "Mover as mensagens que contenham vírus para a pasta selecionada"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"É criado um filtro para detectar as mensagens infectadas com vírus e movê-las "
-"para uma pasta predefinida. A pasta padrão é o Lixo, mas você pode modificar na "
-"visão de pastas."
+"É criado um filtro para detectar as mensagens infectadas com vírus e movê-"
+"las para uma pasta predefinida. A pasta padrão é o Lixo, mas você pode "
+"modificar na visão de pastas."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1083,11 +1091,11 @@ msgstr "Adicionalmente, marcar as mensagens infectadas com vírus como lidas"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Marca as mensagens que foram classificadas como contendo vírus como já lidas, "
-"bem como move-as para a pasta selecionada."
+"Marca as mensagens que foram classificadas como contendo vírus como já "
+"lidas, bem como move-as para a pasta selecionada."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1282,8 +1290,8 @@ msgstr "Erro ao ler a pasta %1 no servidor:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1303,8 +1311,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1335,17 +1343,17 @@ msgstr "Excluída"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Nenhuma de suas identidades corresponde ao receptor desta mensagem, "
 "<br>por favor, escolha qual dos seguintes endereços é o seu:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Várias das suas identidades corresponde ao receptor desta mensagem, "
 "<br>por favor, escolha qual dos seguintes endereços é o seu:"
@@ -1377,19 +1385,21 @@ msgstr "Ocorreu um erro ao compactar \"%1\". Compactação interrompida."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Esta configuração foi corrigida pelo seu administrador.</p>"
-"<p>Se você pensa que isto é um erro, por favor, entre em contato com ele.</p>"
-"</qt>"
+"<qt><p>Esta configuração foi corrigida pelo seu administrador.</p><p>Se você "
+"pensa que isto é um erro, por favor, entre em contato com ele.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Carregar Perfil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configurar Conta"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Adicionar..."
@@ -1420,6 +1430,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Remover Identidade"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Re&mover"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Adicionar..."
@@ -1428,6 +1443,11 @@ msgstr "Adicionar..."
 msgid "Modify..."
 msgstr "Modificar..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Re&mover"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Define como padrão"
@@ -1444,17 +1464,15 @@ msgstr "&Enviando"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contas de saída (adicione ao menos uma):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nome"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tipo"
@@ -1476,8 +1494,7 @@ msgstr "Define como Padrão"
 msgid "Common Options"
 msgstr "Opções usuais"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Confirmar antes de enviar"
@@ -1528,17 +1545,16 @@ msgstr "&Domínio padrão:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O domínio padrão é usado para endereços de e-mail completos que consistem "
-"somente do nome do usuário.</p></qt>"
+"<qt><p>O domínio padrão é usado para endereços de e-mail completos que "
+"consistem somente do nome do usuário.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 "nomes\n"
@@ -1558,9 +1574,9 @@ msgstr "Adicionar transporte"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Padrão)"
 
@@ -1643,6 +1659,10 @@ msgstr "Modificar conta"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Não foi possível localizar a conta <b> %1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Co&res"
@@ -1751,8 +1771,7 @@ msgstr "Link seguido"
 msgid "Misspelled Words"
 msgstr "Palavras incorretas"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nova mensagem"
@@ -1941,8 +1960,8 @@ msgstr "Discussões fechadas por padrão"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Abrir discussões que contenham mensagens &novas, não-lidas ou importantes e "
 "abrir discussões observadas."
@@ -1953,64 +1972,54 @@ msgstr "Exibição da Data"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt> "
-"<p><strong>Estas expressões pode ser usadas para a data:</strong> </p>"
-"<ul><LI>d - o dia, sem o zero adicional (1-31)</li> <LI>"
-"dd - o dia, com um zero adicional (01-31) </li><LI>ddd - o nome do dia "
-"abreviado (Dom - Seg) </li><LI>dddd - o nome longo do dia (Domingo - Segunda) "
-"</li><LI>M -  o número do mês, sem o zero adicional (1-12) </li><LI>"
-"MM -  o número do mês, com o zero adicional (01-12) </li><LI>"
-"MMM - o nome do mês abreviado (Jan - Dez) </li><LI>MMMM - o nome longo do mês "
-"(Janeiro - Dezembro) </li><LI>aa - o ano, com dois dígitos (00-99) </li><LI>"
-"aaaa - o ano, com quatro dígitos (0000-9999) </li></UL> "
-"<p><strong>Estas expressões podem ser usadas para o tempo:</string></p> <UL><LI>"
-"h - a hora, sem o zero adicional (0-23 ou 1-12 para o formato AM/PM) </li><LI>"
-"hh - a hora, com o zero adicional (00-23 ou 01-12 para o formato AM/PM)</li><LI>"
-"m - os minutos, sem o zero adicional (0-59) </li><LI>"
-"mm- os minutos, com o zero adicional (00-59) </li><LI>"
-"s - os segundos, sem o zero adicional (0-59) </li><LI>"
-"ss - os segundos, com o zero adicional (00-59)</li><LI>"
-"ms - os milisegundos,  sem o zero adicional (0-999)</li> <LI>"
-"mms - os milisegundos,  com o zero adicional (000-999) </li><LI>"
-"AP - alterna para o formato AM/PM. AP será substituído por  \"AM\" ou \"PM\". "
-"</li><LI>ap - alterna para o formato AM/PM. ap será substituído por  \"am\" ou "
-"\"pm\". </li><LI>Z - fuso horário no formato numérico (-0500) </li></UL> "
-"<p><strong>Todos os outros caracteres de entrada serão ignorados.</strong> </p>"
-"</qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt> <p><strong>Estas expressões pode ser usadas para a data:</strong> </"
+"p><ul><LI>d - o dia, sem o zero adicional (1-31)</li> <LI>dd - o dia, com um "
+"zero adicional (01-31) </li><LI>ddd - o nome do dia abreviado (Dom - Seg) </"
+"li><LI>dddd - o nome longo do dia (Domingo - Segunda) </li><LI>M -  o número "
+"do mês, sem o zero adicional (1-12) </li><LI>MM -  o número do mês, com o "
+"zero adicional (01-12) </li><LI>MMM - o nome do mês abreviado (Jan - Dez) </"
+"li><LI>MMMM - o nome longo do mês (Janeiro - Dezembro) </li><LI>aa - o ano, "
+"com dois dígitos (00-99) </li><LI>aaaa - o ano, com quatro dígitos "
+"(0000-9999) </li></UL> <p><strong>Estas expressões podem ser usadas para o "
+"tempo:</string></p> <UL><LI>h - a hora, sem o zero adicional (0-23 ou 1-12 "
+"para o formato AM/PM) </li><LI>hh - a hora, com o zero adicional (00-23 ou "
+"01-12 para o formato AM/PM)</li><LI>m - os minutos, sem o zero adicional "
+"(0-59) </li><LI>mm- os minutos, com o zero adicional (00-59) </li><LI>s - os "
+"segundos, sem o zero adicional (0-59) </li><LI>ss - os segundos, com o zero "
+"adicional (00-59)</li><LI>ms - os milisegundos,  sem o zero adicional "
+"(0-999)</li> <LI>mms - os milisegundos,  com o zero adicional (000-999) </"
+"li><LI>AP - alterna para o formato AM/PM. AP será substituído por  \"AM\" ou "
+"\"PM\". </li><LI>ap - alterna para o formato AM/PM. ap será substituído por  "
+"\"am\" ou \"pm\". </li><LI>Z - fuso horário no formato numérico (-0500) </"
+"li></UL> <p><strong>Todos os outros caracteres de entrada serão ignorados.</"
+"strong> </p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Mudar a configuração global de discussões irá sobrescrever todos os valores "
 "específicos das pastas."
@@ -2027,8 +2036,7 @@ msgstr "Mostrar barra de stat&us HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Mostrar o status de s&pam nos cabeçalhos bonitos"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Substituir smileys por emoticons"
@@ -2037,8 +2045,7 @@ msgstr "Substituir smileys por emoticons"
 msgid "Use smaller font for quoted text"
 msgstr "Usar fontes menores para citações"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Mostrar opção expandir/encolher marcas de citação"
@@ -2064,8 +2071,7 @@ msgstr "Automática"
 msgid "&Override character encoding:"
 msgstr "S&obrescrever codificação de caracteres:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Habilitar ícone no painel do sistema"
@@ -2169,24 +2175,20 @@ msgstr "<b>%f</b> será substituído pelo nome de arquivo a ser editado."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>Os seguintes espaços reservados são suportados nas frases de resposta:"
-"<br><b>%D</b>: data, <b>%S</b>: assunto,"
-"<br><b>%e</b>: endereço do remetente, <b>%F</b>: nome do remetente, <b>%f</b>"
-":iniciais do remetente,"
+"<br><b>%D</b>: data, <b>%S</b>: assunto,<br><b>%e</b>: endereço do "
+"remetente, <b>%F</b>: nome do remetente, <b>%f</b>:iniciais do remetente,"
 "<br><b>%T</b>: nome do destinatário, <b>%t</b>: nome e endereço do "
-"destinatário,"
-"<br><b>%C</b>: nomes das cópias carbono, <b>%c</b>: nomes e endereços das "
-"cópias carbono,"
-"<br><b>%%</b>: sinal de porcentagem, <b>%_</b>: espaço, <b>%L</b>"
-": quebra de linha</qt>"
+"destinatário,<br><b>%C</b>: nomes das cópias carbono, <b>%c</b>: nomes e "
+"endereços das cópias carbono,<br><b>%%</b>: sinal de porcentagem, <b>%_</b>: "
+"espaço, <b>%L</b>: quebra de linha</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2209,21 +2211,20 @@ msgstr "Responder p&ara todos:"
 msgid "&Forward:"
 msgstr "&Reenviar:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Indicador de &Citação:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Em %D, você escreveu:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Em %D, %F escreveu:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Mensagem reenviada"
 
@@ -2259,11 +2260,11 @@ msgstr "Digite o novo prefixo de reenvio:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"Esta lista é verificada para cada mensagem enviada, do início ao fim , para um "
-"conjunto de caracteres que contenha todos os caracteres necessários."
+"Esta lista é verificada para cada mensagem enviada, do início ao fim , para "
+"um conjunto de caracteres que contenha todos os caracteres necessários."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2272,7 +2273,8 @@ msgstr "Digite o conj. de caracteres:"
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"&Manter conjunto de caracteres original ao responder ou reenviar (se possível)."
+"&Manter conjunto de caracteres original ao responder ou reenviar (se "
+"possível)."
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2298,10 +2300,9 @@ msgstr "Valor"
 msgid "Ne&w"
 msgstr "No&va"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nome:"
@@ -2310,16 +2311,15 @@ msgstr "&Nome:"
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Compatibilidade dos nomes de anexos com Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Habilite esta opção a fim de fazer com que o Outlook(tm) compreenda os "
 "caracteres diferentes do inglês contidos nos nomes dos anexos."
@@ -2331,8 +2331,8 @@ msgstr "&Habilitar detecção de anexos faltando"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Reconhecer qualquer uma das seguintes palavras-chave como intenção de anexar um "
-"arquivo:"
+"Reconhecer qualquer uma das seguintes palavras-chave como intenção de anexar "
+"um arquivo:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2350,22 +2350,22 @@ msgstr "anexado"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Você escolheu codificar os nomes dos anexos contendo caracteres diferentes do "
-"inglês, de maneira que seja compreendido pelo Outlook(tm) e por outros cliente "
-"s de e-mail que não suportem os nomes de anexos compatíveis com a codificação "
-"padrão.\n"
-"Note que o KMail pode criar mensagens compatíveis com este padrão diferente, e "
-"conseqüentemente, é possível que suas mensagens não sejam entendidas por "
-"clientes que sigam o padrão; assim, a menos que você não tenha outra escolha, "
-"você não deve habilitar esta opção."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Você escolheu codificar os nomes dos anexos contendo caracteres diferentes "
+"do inglês, de maneira que seja compreendido pelo Outlook(tm) e por outros "
+"cliente s de e-mail que não suportem os nomes de anexos compatíveis com a "
+"codificação padrão.\n"
+"Note que o KMail pode criar mensagens compatíveis com este padrão diferente, "
+"e conseqüentemente, é possível que suas mensagens não sejam entendidas por "
+"clientes que sigam o padrão; assim, a menos que você não tenha outra "
+"escolha, você não deve habilitar esta opção."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2389,116 +2389,102 @@ msgstr "Ferramentas de Criptografia"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p> Algumas mensagens podem vir em ambos os formatos. Esta opção indica se você "
-"deseja que a parte HTML ou a parte texto seja visualizada.</p> "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p> Algumas mensagens podem vir em ambos os formatos. Esta opção indica "
+"se você deseja que a parte HTML ou a parte texto seja visualizada.</p> "
 "<p>Visualizar a parte HTML faz a mensagem parecer mais bonita, mas ao mesmo "
 "tempo aumenta o risco de que falhas de segurança sejam exploradas.</p> "
 "<p>Mostrar a parte em texto puro perde muito da formatação da mensagem, mas "
-"torna <em>impossível</em> explorar falhas de segurança no visualizador de HTML "
-"(Konqueror).</p>"
-"<p>A opção abaixo evita maus usos dos e-mails HTML, mas não pode protegê-lo de "
-"problemas de segurança desconhecidos na época em que esta versão do KMail foi "
-"escrita.</p>"
-"<p>Portanto é aconselhável <em>não</em> preferir HTML em vez de puro texto.</p> "
-"<p><b>Nota:</b> Você pode definir esta opção em do menu <i>Pasta</i> "
-"da janela principal do KMail.</p></qt>"
+"torna <em>impossível</em> explorar falhas de segurança no visualizador de "
+"HTML (Konqueror).</p><p>A opção abaixo evita maus usos dos e-mails HTML, mas "
+"não pode protegê-lo de problemas de segurança desconhecidos na época em que "
+"esta versão do KMail foi escrita.</p><p>Portanto é aconselhável <em>não</em> "
+"preferir HTML em vez de puro texto.</p> <p><b>Nota:</b> Você pode definir "
+"esta opção em do menu <i>Pasta</i> da janela principal do KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Algumas propagandas por e-mail são em HTML e contém referências para, por "
-"exemplo,imagens que os anunciantes empregam para descobrir que você leu a "
-"mensagem (&quot;web bugs&quot;).</p>"
-"<p>Não há qualquer razão válida para descarregar imagens da Internet desta "
-"maneira, já que o remetente pode sempre anexar as imagens requeridas "
-"diretamente à mensagem.</p>"
-"<p>Para se proteger deste mau uso do recurso de exibição de HTML do KMail, esta "
-"opção é <em>desabilitada</em> por padrão.</p>"
-"<p>Entretanto, se você desejar, por exemplo, visualizar imagens em mensagens "
-"HTML que  não foram anexadas, você pode habilitar esta opção, mas você deve "
-"estar ciente dos problemas possíveis.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Algumas propagandas por e-mail são em HTML e contém referências para, "
+"por exemplo,imagens que os anunciantes empregam para descobrir que você leu "
+"a mensagem (&quot;web bugs&quot;).</p><p>Não há qualquer razão válida para "
+"descarregar imagens da Internet desta maneira, já que o remetente pode "
+"sempre anexar as imagens requeridas diretamente à mensagem.</p><p>Para se "
+"proteger deste mau uso do recurso de exibição de HTML do KMail, esta opção é "
+"<em>desabilitada</em> por padrão.</p><p>Entretanto, se você desejar, por "
+"exemplo, visualizar imagens em mensagens HTML que  não foram anexadas, você "
+"pode habilitar esta opção, mas você deve estar ciente dos problemas "
+"possíveis.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Política de Notificação de Recebimento de Mensagem (MDN)</h3>"
-"<p>Notificações de Recebimento de Mensagens (<em>Message Disposition "
-"Notifications</em> ou MDNs) são generalizações do que é comumente chamado <b>"
-"recibo de leitura</b>. O autor da mensagem requisita uma notificação de "
-"recebimento a ser enviada e o programa de e-mail do receptor gera uma resposta "
-"a partir da qual o autor pode saber o que aconteceu com a sua mensagem. Tipos "
-"comuns de recebimento incluem <b>exibida</b> (isto é, lida), <b>removida</b> "
-"e <b>despachada</b> (isto é, reenviada).</p>"
-"<p>As seguintes opções estão disponíveis para controlar o envio de MDNs no "
-"KMail:</p>"
-"<ul>"
-"<li><em>Ignorar</em>: Ignora qualquer requisição de notificação de recebimento. "
-"Nenhum MDN será enviando automaticamente (recomendado).</li>"
-"<li><em>Perguntar</em>: Responde requisições somente depois de solicitar "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Política de Notificação de Recebimento de Mensagem (MDN)</"
+"h3><p>Notificações de Recebimento de Mensagens (<em>Message Disposition "
+"Notifications</em> ou MDNs) são generalizações do que é comumente chamado "
+"<b>recibo de leitura</b>. O autor da mensagem requisita uma notificação de "
+"recebimento a ser enviada e o programa de e-mail do receptor gera uma "
+"resposta a partir da qual o autor pode saber o que aconteceu com a sua "
+"mensagem. Tipos comuns de recebimento incluem <b>exibida</b> (isto é, lida), "
+"<b>removida</b> e <b>despachada</b> (isto é, reenviada).</p><p>As seguintes "
+"opções estão disponíveis para controlar o envio de MDNs no KMail:</"
+"p><ul><li><em>Ignorar</em>: Ignora qualquer requisição de notificação de "
+"recebimento. Nenhum MDN será enviando automaticamente (recomendado).</"
+"li><li><em>Perguntar</em>: Responde requisições somente depois de solicitar "
 "permissão ao usuário. Deste modo, você pode enviar MDNs para as mensagens "
-"selecionadas enquanto bloqueia ou ignora para outras.</li>"
-"<li><em>Negar</em>: Envia sempre uma notificação de <b>negado</b>"
-". Isto é apenas <em>um pouco</em> melhor do que sempre enviar MDNs. O autor "
-"ainda saberá que as mensagens sofreram alguma ação, ele apenas não pode dizer "
-"se elas foram removidas ou lidas, etc.</li>"
-"<li><em>Sempre enviar</em>: Sempre envia a notificação de recebimento "
-"requisitada. Isto significa que o autor da mensagem saberá quando a mensagem "
-"sofreu alguma ação e, além disso, o que aconteceu com ela (exibida, removida, "
-"etc.). Esta opção é fortemente desencorajada, mas já que ela faz muito sentido, "
-"por exemplo, para o gerenciamento de relacionamento com o cliente, ela foi "
-"mantida disponível.</li></ul></qt>"
+"selecionadas enquanto bloqueia ou ignora para outras.</li><li><em>Negar</"
+"em>: Envia sempre uma notificação de <b>negado</b>. Isto é apenas <em>um "
+"pouco</em> melhor do que sempre enviar MDNs. O autor ainda saberá que as "
+"mensagens sofreram alguma ação, ele apenas não pode dizer se elas foram "
+"removidas ou lidas, etc.</li><li><em>Sempre enviar</em>: Sempre envia a "
+"notificação de recebimento requisitada. Isto significa que o autor da "
+"mensagem saberá quando a mensagem sofreu alguma ação e, além disso, o que "
+"aconteceu com ela (exibida, removida, etc.). Esta opção é fortemente "
+"desencorajada, mas já que ela faz muito sentido, por exemplo, para o "
+"gerenciamento de relacionamento com o cliente, ela foi mantida disponível.</"
+"li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2514,15 +2500,15 @@ msgstr "Permitir e-mails &carregando referências externas da rede"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>AVISO:</b> Permitir HTML em e-mail pode aumentar o risco de que seu sistema "
-"seja comprometido por furos de segurança presentes e futuros. <a "
-"href=\"whatsthis:%1\">Mais sobre e-mails HTML...</a> e <a href=\"whatsthis:%2\">"
-"Mais sobre referências externas...</a>"
+"<b>AVISO:</b> Permitir HTML em e-mail pode aumentar o risco de que seu "
+"sistema seja comprometido por furos de segurança presentes e futuros. <a "
+"href=\"whatsthis:%1\">Mais sobre e-mails HTML...</a> e <a href=\"whatsthis:"
+"%2\">Mais sobre referências externas...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2583,8 +2569,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>AVISO:</b> Retornar confirmações incondicionalmente mina sua privacidade. <a "
-"href=\"whatsthis:%1\">Mais...</a>"
+"<b>AVISO:</b> Retornar confirmações incondicionalmente mina sua privacidade. "
+"<a href=\"whatsthis:%1\">Mais...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2605,8 +2591,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Esta opção requer dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "sem proxy"
@@ -2635,8 +2620,8 @@ msgstr "E&xcluir mensagens importantes da expiração"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Quando tentar encontrar mensagens não lidas:"
 
@@ -2660,8 +2645,8 @@ msgstr "Circular em Todas as Pastas"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Ao entrar em uma pasta:"
 
@@ -2730,28 +2715,24 @@ msgstr "Pastas (formato \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt> "
-"<p>Esta opção seleciona o formato de caixa de mensagens a ser utilizada para as "
-"pastas locais:</P> "
-"<p><b>mbox:</b> as pastas do KMail são representadas por um único arquivo. "
-"Mensagens individuais são separadas umas das outras por uma linha iniciando com "
-"\"De\" (From). Isto economiza espaço em disco, mas será menos robusto, por "
-"exemplo, quando mover e-mails entre pastas.</p> "
-"<p><b>maildir:</b> as pastas do KMail são representadas por pastas reais no "
-"disco. Cada mensagem é um arquivo separado. Isto pode ocupar um pouco mais de "
-"espaço em disco, mas é mais robusto, quando, por exemplo, mover mensagens entre "
-"as pastas.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt> <p>Esta opção seleciona o formato de caixa de mensagens a ser utilizada "
+"para as pastas locais:</P> <p><b>mbox:</b> as pastas do KMail são "
+"representadas por um único arquivo. Mensagens individuais são separadas umas "
+"das outras por uma linha iniciando com \"De\" (From). Isto economiza espaço "
+"em disco, mas será menos robusto, por exemplo, quando mover e-mails entre "
+"pastas.</p> <p><b>maildir:</b> as pastas do KMail são representadas por "
+"pastas reais no disco. Cada mensagem é um arquivo separado. Isto pode ocupar "
+"um pouco mais de espaço em disco, mas é mais robusto, quando, por exemplo, "
+"mover mensagens entre as pastas.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2784,56 +2765,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ao pular para a próxima mensagem não lida, pode acontecer que não existam "
-"outras mensagens não lidas abaixo da mensagem atual.</p> "
-"<p><b>Não circular:</b> A pesquisa vai parar na última mensagem na pasta "
-"atual.</p> "
-"<p><b>Circular na pasta atual:</b> A pesquisa vai continuar no topo da lista de "
-"mensagens, mas não vai para outra pasta.</p>"
-"<p><b>Circular em todas as pastas:</b> A pesquisa vai continuar no topo da "
-"lista de mensagens. Se não for encontrada qualquer mensagem não lida, ela vai "
-"continuar na próxima pasta.</p>"
-"<p>Similarmente, quando procurar alguma mensagem não lida anterior, a pesquisa "
-"vai iniciar do fundo da lista de mensagens e continuar na pasta anterior, "
-"dependendo de qual opção esta selecionada.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Ao pular para a próxima mensagem não lida, pode acontecer que não "
+"existam outras mensagens não lidas abaixo da mensagem atual.</p> <p><b>Não "
+"circular:</b> A pesquisa vai parar na última mensagem na pasta atual.</p> "
+"<p><b>Circular na pasta atual:</b> A pesquisa vai continuar no topo da lista "
+"de mensagens, mas não vai para outra pasta.</p><p><b>Circular em todas as "
+"pastas:</b> A pesquisa vai continuar no topo da lista de mensagens. Se não "
+"for encontrada qualquer mensagem não lida, ela vai continuar na próxima "
+"pasta.</p><p>Similarmente, quando procurar alguma mensagem não lida "
+"anterior, a pesquisa vai iniciar do fundo da lista de mensagens e continuar "
+"na pasta anterior, dependendo de qual opção esta selecionada.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A indexação de texto completo permite buscas muito rápidas no conteúdo de "
-"suas mensagens. Quando habilitado, a janela de busca irá trabalhar muito "
-"rápido. E a barra de buscas selecionará mensagens com base nos seus "
-"conteúdos.</p>"
-"<p>É necessário uma certa quantidade de espaço em disco (cerca de metade do "
-"espaço ocupado pelas mensagens).</p>"
-"<p>Após habilitar esta opção, o índice precisará ser criado, mas você pode "
-"continuar a utilizar o  KMail enquanto esta operação estiver sendo "
-"executada.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>A indexação de texto completo permite buscas muito rápidas no "
+"conteúdo de suas mensagens. Quando habilitado, a janela de busca irá "
+"trabalhar muito rápido. E a barra de buscas selecionará mensagens com base "
+"nos seus conteúdos.</p><p>É necessário uma certa quantidade de espaço em "
+"disco (cerca de metade do espaço ocupado pelas mensagens).</p><p>Após "
+"habilitar esta opção, o índice precisará ser criado, mas você pode continuar "
+"a utilizar o  KMail enquanto esta operação estiver sendo executada.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2899,8 +2869,8 @@ msgstr "&Oculta as pastas do groupware"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Quando estiver marcado, você não verá as pastas da fonte de dados IMAP na "
 "árvore de pastas."
@@ -2911,8 +2881,8 @@ msgstr "M&ostrar apenas pastas de groupware para esta conta"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Quando estiver marcado, você não verá pastas normais de e-mail na árvore de "
 "pastas da conta configurada como groupware."
@@ -2971,24 +2941,23 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"O Microsoft Outlook, quando usado junto com um servidor Microsoft Exchange, tem "
-"um problema para entender e-mail de groupware que seguem alguns padrões. "
+"O Microsoft Outlook, quando usado junto com um servidor Microsoft Exchange, "
+"tem um problema para entender e-mail de groupware que seguem alguns padrões. "
 "Habilite esta opção para enviar convites groupware de forma que o Microsoft "
 "Exchange possa entender."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Compatibilidade dos nomes de anexos com Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Envio automático de convite"
@@ -2998,28 +2967,27 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Quando ativada esta opção, o usuário não vai ver a janela do compositor de "
-"e-mails. Os e-mails de convites serão enviados automaticamente"
+"Quando ativada esta opção, o usuário não vai ver a janela do compositor de e-"
+"mails. Os e-mails de convites serão enviados automaticamente"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Convites são normalmente enviados como anexos de um e-mail. Isto faz com "
 "que os convites sejem enviadas no texto do e-mail; isto é necessário para "
-"enviar convites e respostas ao Microsoft Outlook."
-"<br>Mas, ao fazer isto, você não obterá mais um texto descritivo que alguns "
-"programas de e-mail podem ler, e assim, algumas pessoas não vão entender o "
-"convite, e as mensagens parecerão muito estranhas."
-"<br>Pessoas que possuem programas de e-mail que compreendem convites serão "
-"capazes de trabalhar com isto.</qt>"
+"enviar convites e respostas ao Microsoft Outlook.<br>Mas, ao fazer isto, "
+"você não obterá mais um texto descritivo que alguns programas de e-mail "
+"podem ler, e assim, algumas pessoas não vão entender o convite, e as "
+"mensagens parecerão muito estranhas.<br>Pessoas que possuem programas de e-"
+"mail que compreendem convites serão capazes de trabalhar com isto.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3124,29 +3092,27 @@ msgstr "Encaminhar"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui você pode adicionar, editar, e remover modelos personalizados de "
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Aqui você pode adicionar, editar, e remover modelos personalizados de "
 "mensagem para usar quando você cria uma resposta ou encaminha uma mensagem. "
 "Crie o modelo personalizado selecionando-o no menu acessado através do botão "
 "direto do mouse ou na barra de menu. É também possível atribuir uma "
-"configuração de teclado a um modelo para operações mais rápidas.</p>"
-"<p>Modelos de mensagem suportam substituição de comandos ao simplemente "
-"digitá-los ou selecionando-os através do menu <i>Inserir comando</i>.</p>"
-"<p>Há quatro tipos de modelos personalizados: utilizado para <i>Responder</i>"
-", <i>Responder para Todos</i>, <i>Encaminhar</i>, e <i>Universal</i> "
-"que pode ser utilizado para todos os tipos de operações. Você não pode atribuir "
+"configuração de teclado a um modelo para operações mais rápidas.</"
+"p><p>Modelos de mensagem suportam substituição de comandos ao simplemente "
+"digitá-los ou selecionando-os através do menu <i>Inserir comando</i>.</"
+"p><p>Há quatro tipos de modelos personalizados: utilizado para <i>Responder</"
+"i>, <i>Responder para Todos</i>, <i>Encaminhar</i>, e <i>Universal</i> que "
+"pode ser utilizado para todos os tipos de operações. Você não pode atribuir "
 "atalhos de teclado para modelos do tipo <i>Universal</i>.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3164,15 +3130,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3190,8 +3156,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"O atalho selecionado já está sendo utilizado para outro modelo personalizado, "
-"você gostaria de continuar mesmo assim com esta atribuição?"
+"O atalho selecionado já está sendo utilizado para outro modelo "
+"personalizado, você gostaria de continuar mesmo assim com esta atribuição?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3238,8 +3204,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>A lista de distribuição com o nome fornecido <b>%1</b> "
-"já existe. Por favor, escolha outro nome.</qt>"
+"<qt>A lista de distribuição com o nome fornecido <b>%1</b> já existe. Por "
+"favor, escolha outro nome.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3248,8 +3214,8 @@ msgstr "Editar Identidade"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3394,7 +3360,8 @@ msgstr "A remoção de mensagens antigas da pasta %1 foi cancelada."
 #: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr ""
-"A movimentação de mensagens antigas da pasta %1 para a pasta %2 foi cancelada."
+"A movimentação de mensagens antigas da pasta %1 para a pasta %2 foi "
+"cancelada."
 
 #: expirypropertiesdialog.cpp:31
 msgid "Mail Expiry Properties"
@@ -3516,6 +3483,11 @@ msgstr "Selecionar Pasta"
 msgid "Filters"
 msgstr "Filtro %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Selecionar Todo o Texto"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3547,11 +3519,12 @@ msgstr "&Registrar atividades do filtro"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Você pode (des)habilitar o registro das atividades do filtro aqui. Os dados do "
-"registro são coletados e mostrados quando isto estiver habilitado, é claro."
+"Você pode (des)habilitar o registro das atividades do filtro aqui. Os dados "
+"do registro são coletados e mostrados quando isto estiver habilitado, é "
+"claro."
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3567,16 +3540,17 @@ msgstr "Registrar avaliação da &regra do filtro"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Você pode controlar o retorno do registro, de acordo com a avaliação das regras "
-"de filtragem dos filtros aplicados: se esta opção estiver marcada será "
-"fornecido o retorno detalhado para cada regra de filtragem em particular; "
-"alternativamente, poderá ser fornecido somente o retorno sobre o resultado da "
-"avaliação de todas as regras de um filtro."
+"Você pode controlar o retorno do registro, de acordo com a avaliação das "
+"regras de filtragem dos filtros aplicados: se esta opção estiver marcada "
+"será fornecido o retorno detalhado para cada regra de filtragem em "
+"particular; alternativamente, poderá ser fornecido somente o retorno sobre o "
+"resultado da avaliação de todas as regras de um filtro."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3596,15 +3570,16 @@ msgstr "sem limite"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"A coleta de dados do registro usa a memória para armazenar temporariamente os "
-"dados; aqui, você pode limitar a quantidade máxima de memória a ser usada: se o "
-"tamanho dos dados de registros coletados exceder este limite, então os dados "
-"mais antigos serão descartados, até que o limite não seja mais excedido."
+"A coleta de dados do registro usa a memória para armazenar temporariamente "
+"os dados; aqui, você pode limitar a quantidade máxima de memória a ser "
+"usada: se o tamanho dos dados de registros coletados exceder este limite, "
+"então os dados mais antigos serão descartados, até que o limite não seja "
+"mais excedido."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3614,7 +3589,7 @@ msgstr ""
 "Não foi possível gravar no arquivo %1:\n"
 "\"%2\" é a descrição detalhada do erro."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Erro  do KMail"
@@ -3655,13 +3630,13 @@ msgstr "&Identificador do Usuário:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"O Identificador do Usuário é o login do usuário no servidor IMAP, podendo ser "
-"um nome de usuário simples ou o endereço completo do usuário. O login de sua "
-"conta no servidor dirá qual destes é."
+"O Identificador do Usuário é o login do usuário no servidor IMAP, podendo "
+"ser um nome de usuário simples ou o endereço completo do usuário. O login de "
+"sua conta no servidor dirá qual destes é."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3712,11 +3687,11 @@ msgstr "Você não tem permissões de leitura/escrita em sua pasta Lixo."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"As informações ainda não foram recuperadas do servidor; por favor, use a opção "
-"\"Verificar E-mail\"."
+"As informações ainda não foram recuperadas do servidor; por favor, use a "
+"opção \"Verificar E-mail\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3726,8 +3701,7 @@ msgstr "Erro: nenhuma conta IMAP definida para esta pasta"
 msgid "Connecting to server %1, please wait..."
 msgstr "Conectando ao servidor %1, por favor, aguarde..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Erro ao conectar-se ao servidor %1"
@@ -3756,8 +3730,8 @@ msgstr "Adicionar Permissões"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Você realmente deseja remover suas próprias permissões desta pasta? Você não "
 "será mais capaz de acessá-la depois."
@@ -3791,7 +3765,7 @@ msgstr "Uso:"
 msgid "Select Folder"
 msgstr "Selecionar Pasta"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Pastas Locais"
@@ -3815,9 +3789,9 @@ msgstr "Selecionar Atalha para Pasta"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Para escolher uma tecla ou combinação de teclas para selecionar a pasta "
 "atual, clique o botão abaixo e então pressione a(s) tecla(s) que você quer "
@@ -3841,14 +3815,23 @@ msgstr "C&ancelar"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>A pasta que você apagou estava associada com a conta <b>%1</b> "
-"que entregava e-mails nela. A pasta para a qual a conta entrega novas mensagens "
+"<qt>A pasta que você apagou estava associada com a conta <b>%1</b> que "
+"entregava e-mails nela. A pasta para a qual a conta entrega novas mensagens "
 "foi reiniciada para a Caixa de Entrada.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -3869,7 +3852,8 @@ msgid ""
 "Resets the quick search so that all messages are shown again."
 msgstr ""
 "Reiniciar Procura Rápida\n"
-"Reinicia a busca rápida, e assim, todas as mensagens serão mostradas novamente."
+"Reinicia a busca rápida, e assim, todas as mensagens serão mostradas "
+"novamente."
 
 #: headerlistquicksearch.cpp:69
 msgid "Stat&us:"
@@ -3972,73 +3956,18 @@ msgstr "Estado de Spam:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b> "
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e"
-"<br>m"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b> <br>M<br>e<br>n<br>s<br>a<br>g<br>e<br>m<br> <br>H<br>T<br>M<br>L</"
+"b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt> "
-"<br>S"
-"<br>e"
-"<br>m"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>n"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e"
-"<br>m"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt> <br>S<br>e<br>m<br> <br>M<br>e<br>n<br>s<br>a<br>g<br>e<br>m<br> "
+"<br>H<br>T<br>M<br>L<br></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4050,19 +3979,14 @@ msgstr "&Seu nome:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Seu nome</h3>"
-"<p>Este campo deve conter o seu nome, na forma que você gostaria que aparecesse "
-"no cabeçalho do e-mail que é enviado.</p>"
-"<p>Se você deixar em branco, seu nome real não vai aparecer, somente o endereço "
-"de e-mail.</p></qt>"
+"<qt><h3>Seu nome</h3><p>Este campo deve conter o seu nome, na forma que você "
+"gostaria que aparecesse no cabeçalho do e-mail que é enviado.</p><p>Se você "
+"deixar em branco, seu nome real não vai aparecer, somente o endereço de e-"
+"mail.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4070,17 +3994,13 @@ msgstr "Organi&zação:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organização</h3>"
-"<p>Este campo deve conter o nome da sua organização, se você gostaria que ele "
-"fosse exibido no cabeçalho do e-mail que é enviado.</p>"
-"<p>É seguro (e normal) deixar este campo em branco.</p></qt>"
+"<qt><h3>Organização</h3><p>Este campo deve conter o nome da sua organização, "
+"se você gostaria que ele fosse exibido no cabeçalho do e-mail que é enviado."
+"</p><p>É seguro (e normal) deixar este campo em branco.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4089,20 +4009,15 @@ msgstr "Endereço de E-&mail:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Endereço de e-mail</h3>"
-"<p>Este campo deve conter o seu endereço de e-mail completo.</p>"
-"<p>Se você deixá-lo em branco ou não digitá-lo corretamente, as pessoas terão "
-"problemas para responder a você.</p></qt>"
+"<qt><h3>Endereço de e-mail</h3><p>Este campo deve conter o seu endereço de e-"
+"mail completo.</p><p>Se você deixá-lo em branco ou não digitá-lo "
+"corretamente, as pessoas terão problemas para responder a você.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4111,21 +4026,12 @@ msgstr "Endereço de E-&mail:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4149,19 +4055,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>A chave OpenPGP que você escolheu aqui será usada para assinar suas "
-"mensagens mensagens. Você também pode usar chaves GnuPG.</p>"
-"<p>Você pode deixar este campo em branco, mas KMail não será capaz de assinar "
-"e-mails usando o OpenPGP. As funções normais de correio não serão afetadas.</p> "
-"<p>Você pode aprender mais sobre chaves em <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>A chave OpenPGP que você escolheu aqui será usada para assinar suas "
+"mensagens mensagens. Você também pode usar chaves GnuPG.</p><p>Você pode "
+"deixar este campo em branco, mas KMail não será capaz de assinar e-mails "
+"usando o OpenPGP. As funções normais de correio não serão afetadas.</p> "
+"<p>Você pode aprender mais sobre chaves em <a>http://www.gnupg.org</a></p></"
+"qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4173,32 +4078,29 @@ msgstr "Sua Chave de Criptografia OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Selecione a chave OpenPGP que deve ser usada para  criptografar para você mesmo "
-"suas mensagens, e para o recurso do compositor chamado  \"Anexar Minha Chave "
-"Pública\"."
+"Selecione a chave OpenPGP que deve ser usada para  criptografar para você "
+"mesmo suas mensagens, e para o recurso do compositor chamado  \"Anexar Minha "
+"Chave Pública\"."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>A chave OpenPGP que você escolheu aqui será usada para para criptografar "
-"mensagens para si mesmo e para o recurso \"Anexar Minha Chave Pública\" do "
-"compositor. Você também pode usar chaves GnuPG.</p>"
-"<p>Você pode deixar este campo em branco, mas KMail não será capaz de "
-"criptografar as cópias das mensagens de saída para você usando o OpenPGP. As "
-"funções normais de correio não serão afetadas.</p> "
-"<p>Você pode aprender mais sobre chaves em <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>A chave OpenPGP que você escolheu aqui será usada para para "
+"criptografar mensagens para si mesmo e para o recurso \"Anexar Minha Chave "
+"Pública\" do compositor. Você também pode usar chaves GnuPG.</p><p>Você pode "
+"deixar este campo em branco, mas KMail não será capaz de criptografar as "
+"cópias das mensagens de saída para você usando o OpenPGP. As funções normais "
+"de correio não serão afetadas.</p> <p>Você pode aprender mais sobre chaves "
+"em <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4218,18 +4120,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>O certificado S/MIME (X.509)  que você escolheu aqui será usado para assinar "
-"mensagens.</p>"
-"<p>Você pode deixar este campo em branco, mas KMail não será capaz de assinar "
-"e-mails usando o S/MIME. As funções normais de correio não serão afetadas.</p> "
-"</qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
+msgstr ""
+"<qt><p>O certificado S/MIME (X.509)  que você escolheu aqui será usado para "
+"assinar mensagens.</p><p>Você pode deixar este campo em branco, mas KMail "
+"não será capaz de assinar e-mails usando o S/MIME. As funções normais de "
+"correio não serão afetadas.</p> </qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4241,8 +4140,8 @@ msgstr "Seu Certificado de Criptografia S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Selecione o seu certificado S/MIME que deve ser usado para criptografar para "
 "você mesmo suas mensagens, e para o recurso do compositor chamado  \"Anexar "
@@ -4250,20 +4149,17 @@ msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>O certificado S/MIME que você escolheu aqui será usado para criptografar "
-"mensagens para si mesmo e para o recurso \"Anexar Minha Chave Pública\" do "
-"compositor.</p>"
-"<p>Você pode deixar este campo em branco, mas KMail não será capaz de "
-"criptografar as cópias de e-mails enviados usando o S/MIME. As funções normais "
-"de correio não serão afetadas.</p> </qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>O certificado S/MIME que você escolheu aqui será usado para "
+"criptografar mensagens para si mesmo e para o recurso \"Anexar Minha Chave "
+"Pública\" do compositor.</p><p>Você pode deixar este campo em branco, mas "
+"KMail não será capaz de criptografar as cópias de e-mails enviados usando o "
+"S/MIME. As funções normais de correio não serão afetadas.</p> </qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4283,24 +4179,20 @@ msgstr "Endereço para &Respostas (Reply-To):"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Endereços de resposta</h3>"
-"<p>Isto faz com que o cabeçalho <tt>Responder-para:</tt> "
-"contenha um endereço de e-mail diferente do endereço <tt>De:</tt> normal.</p>"
-"<p>Isto pode ser útil quando você tem um grupo de pessoas trabalhando juntas em "
-"funções similares. Por exemplo, você poderia querer que qualquer mensagem fosse "
-"para seu e-mail no campo <tt>De:</tt>, mas que qualquer resposta fosse para um "
-"endereço de grupo.</p></p>Se está em dúvida, deixe este campo em branco.</p>"
-"</qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Endereços de resposta</h3><p>Isto faz com que o cabeçalho "
+"<tt>Responder-para:</tt> contenha um endereço de e-mail diferente do "
+"endereço <tt>De:</tt> normal.</p><p>Isto pode ser útil quando você tem um "
+"grupo de pessoas trabalhando juntas em funções similares. Por exemplo, você "
+"poderia querer que qualquer mensagem fosse para seu e-mail no campo <tt>De:</"
+"tt>, mas que qualquer resposta fosse para um endereço de grupo.</p></p>Se "
+"está em dúvida, deixe este campo em branco.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4308,26 +4200,20 @@ msgstr "&Endereços de Cópia Oculta:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Endereços de Cópia Oculta (BCC ou Cópia de Carbono Blindada)</h3>"
-"<p>Os endereços que você digitou aqui serão adicionados em cada e-mail de "
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Endereços de Cópia Oculta (BCC ou Cópia de Carbono Blindada)</"
+"h3><p>Os endereços que você digitou aqui serão adicionados em cada e-mail de "
 "saída, que é enviado com esta identidade. Eles não são visíveis a outros "
-"destinatários.</p>"
-"<p>Isto é usado geralmente para enviar uma cópia para cada mensagem enviada a "
-"outra conta.</p> "
-"<p>Para especificar mais de um endereço, use uma lista separada por vírgulas, "
-"nos destinatários do campo BCC.</p>"
-"<p>Na dúvida, deixe este campo em branco.</p></qt>"
+"destinatários.</p><p>Isto é usado geralmente para enviar uma cópia para cada "
+"mensagem enviada a outra conta.</p> <p>Para especificar mais de um endereço, "
+"use uma lista separada por vírgulas, nos destinatários do campo BCC.</"
+"p><p>Na dúvida, deixe este campo em branco.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4365,7 +4251,7 @@ msgstr "A&ssinatura"
 msgid "&Picture"
 msgstr "&Imagem"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Endereço de E-mail Inválido"
 
@@ -4383,13 +4269,13 @@ msgid ""
 msgstr ""
 "Uma das chaves de assinatura OpenPGP configuradas não contém nenhum ID de "
 "usuário, com o endereço de e-mail configurado para esta identidade (%1).\n"
-"Isto pode resultar em mensagens de alerta, no lado de quem está recebendo, ao "
-"tentar verificar as assinaturas feitas com esta configuração."
+"Isto pode resultar em mensagens de alerta, no lado de quem está recebendo, "
+"ao tentar verificar as assinaturas feitas com esta configuração."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Uma das chaves de criptografia OpenPGP configuradas não contém nenhum ID de "
 "usuário, com o endereço de e-mail configurado para esta identidade (%1)."
@@ -4403,8 +4289,8 @@ msgid ""
 msgstr ""
 "Um dos certificados de assinatura S/MIME configurados não contém nenhum "
 "endereço de e-mail, configurado para esta identidade (%1).\n"
-"Isto pode resultar em mensagens de alerta, no lado de quem está recebendo, ao "
-"tentar verificar as assinaturas feitas com esta configuração."
+"Isto pode resultar em mensagens de alerta, no lado de quem está recebendo, "
+"ao tentar verificar as assinaturas feitas com esta configuração."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4447,13 +4333,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"A pasta de modelos personalizados para a identidade \"%1\" não existe; então a "
-"pasta padrão de modelo será utilizada."
+"A pasta de modelos personalizados para a identidade \"%1\" não existe; então "
+"a pasta padrão de modelo será utilizada."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 padrão"
 
@@ -4468,8 +4354,8 @@ msgstr "Endereço de E-mail:"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Você necessita informar um nome de usuário e uma senha para acessar esta caixa "
-"de correio."
+"Você necessita informar um nome de usuário e uma senha para acessar esta "
+"caixa de correio."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4497,21 +4383,21 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"O KMail detectou um prefixo na configuração da conta \"%1\" que é obsoleto com "
-"o suporte de espaços de nome IMAP."
+"O KMail detectou um prefixo na configuração da conta \"%1\" que é obsoleto "
+"com o suporte de espaços de nome IMAP."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "A configuração foi migrada automaticamente, mas você deve verificar a "
 "configuração da sua conta."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Não foi possível migrar sua configuração automaticamente, então por favor, "
 "verifique a configuração da sua conta."
@@ -4554,17 +4440,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Erro: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"A conexão ao servidor %1 foi fechada inesperadamente ou atingiu o tempo limite. "
-"Ela será restabelecida automaticamente se possível."
+"A conexão ao servidor %1 foi fechada inesperadamente ou atingiu o tempo "
+"limite. Ela será restabelecida automaticamente se possível."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4715,14 +4606,14 @@ msgstr "Listar Arquivos"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4751,230 +4642,182 @@ msgstr "Chave de Criptografia Não Usadas"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de 1 dia.</p>\n"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de criptografia S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de 1 dia.</p>\n"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de criptografia S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o "
+"certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número serial %2)</"
+"p><p>expira em menos de 1 dia.</p>\n"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o "
+"certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número serial %2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>"
+"%1</b> (número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>"
+"%1</b> (número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
 "<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"%1</b> (número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
 "<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"%1</b> (número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "Seu certificado de assinatura S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"(número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "Seu certificado de assinatura S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"(número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "Seu certificado de criptografia S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"(número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "Seu certificado de criptografia S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"(número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> (número serial "
+"%2)</p><p>expira em menos de 1 dia.</p>\n"
+"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> (número serial "
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4988,219 +4831,171 @@ msgstr "O Certificado S/MIME Expira Logo"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>Sua chave de assinatura OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> "
-"(ID da chave0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de um dia.</p>\n"
+"<p>Sua chave de criptografia OpenPGP</p><p align=\"center\"><b>%1</b> (ID da "
+"chave0x%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</p>"
-"<p>expira em menos de um dia.</p>\n"
-"<p>A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</"
+"p><p>expira em menos de um dia.</p>\n"
+"<p>A chave OpenPGP</p><p align=\"center\"><b>%1</b> (ID da chave0x%2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de 1 dia.</p>\n"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de criptografia S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de 1 dia.</p>\n"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o seu "
+"certificado de criptografia S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado raiz</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o "
+"certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número serial %2)</"
+"p><p>expira em menos de 1 dia.</p>\n"
+"O certificado raiz</p><p align=\"center\"><b>%3</b></p> <p>para o "
+"certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número serial %2)</"
+"p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>"
+"%1</b> (número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>para o seu certificado de assinatura S/MIME</p> <p align=\"center\"><b>"
+"%1</b> (número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
 "<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"%1</b> (número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
 "<p>para o seu certificado de criptografia S/MIME</p> <p align=\"center\"><b>"
-"%1</b> (número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"%1</b> (número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "O certificado da AC intermediária</p><p align=\"center\"><b>%3</b></p> "
-"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"<p>para o certificado S/MIME</p> <p align=\"center\"><b>%1</b> (número "
+"serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "Seu certificado de assinatura S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"(número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "Seu certificado de assinatura S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"(número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "Seu certificado de criptografia S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
+"(número serial %2)</p><p>expira em menos de 1 dia.</p>\n"
 "Seu certificado de criptografia S/MIME</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"(número serial %2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de 1 dia.</p>\n"
-"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> "
-"(número serial %2)</p>"
-"<p>expira em menos de %n dias.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> (número serial "
+"%2)</p><p>expira em menos de 1 dia.</p>\n"
+"O certificado S/MIME para</p><p align=\"center\"><b>%1</b> (número serial "
+"%2)</p><p>expira em menos de %n dias.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5212,14 +5007,15 @@ msgstr "O Certificado S/MIME Expira Logo"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Uma ou mais chaves de criptografia OpenPGP configuradas, ou certificados "
-"S/MIME, não estão sendo usados para criptografia. Por favor, reconfigure suas "
+"Uma ou mais chaves de criptografia OpenPGP configuradas, ou certificados S/"
+"MIME, não estão sendo usados para criptografia. Por favor, reconfigure suas "
 "chaves e certificados para esta identidade, no diálogo de configurações de "
 "identidade.\n"
 "Se você escolher continuar, e as chaves forem necessárias mais tarde, será "
@@ -5237,9 +5033,10 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Uma ou mais chaves de assinatura OpenPGP configuradas, ou certificados S/MIME, "
-"não estão sendo usados para assinatura. Por favor, reconfigure suas chaves e "
-"certificados para esta identidade, no diálogo de configurações de identidade.\n"
+"Uma ou mais chaves de assinatura OpenPGP configuradas, ou certificados S/"
+"MIME, não estão sendo usados para assinatura. Por favor, reconfigure suas "
+"chaves e certificados para esta identidade, no diálogo de configurações de "
+"identidade.\n"
 "Se você escolher continuar, e as chaves forem necessárias mais tarde, será "
 "pedido a você para especificar as chaves para o uso."
 
@@ -5251,43 +5048,46 @@ msgstr "Chave de Assinatura Não Usadas"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"O exame das preferências de criptografia do destinatário relatou que a mensagem "
-"deve ser criptografada usando o OpenPGP, no mínimo para alguns destinatários;\n"
-"no entanto, você ainda não configurou chaves de criptografia OpenPGP válidas e "
-"confiáveis, para esta identidade.\n"
-"Você pode continuar sem a criptografia, mas esteja ciente de que não será capaz "
-"de ler suas próprias mensagens, se fizer assim."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"O exame das preferências de criptografia do destinatário relatou que a "
+"mensagem deve ser criptografada usando o OpenPGP, no mínimo para alguns "
+"destinatários;\n"
+"no entanto, você ainda não configurou chaves de criptografia OpenPGP válidas "
+"e confiáveis, para esta identidade.\n"
+"Você pode continuar sem a criptografia, mas esteja ciente de que não será "
+"capaz de ler suas próprias mensagens, se fizer assim."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"O exame das preferências de criptografia do destinatário relatou que a mensagem "
-"deve ser criptografada usando o S/MIME, no mínimo para alguns destinatários;\n"
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"O exame das preferências de criptografia do destinatário relatou que a "
+"mensagem deve ser criptografada usando o S/MIME, no mínimo para alguns "
+"destinatários;\n"
 "no entanto, você ainda não configurou certificados de criptografia S/MIME "
 "válidos e confiáveis, para esta identidade.\n"
-"Você pode continuar sem a criptografia, mas esteja ciente de que não será capaz "
-"de ler suas próprias mensagens, se fizer assim."
+"Você pode continuar sem a criptografia, mas esteja ciente de que não será "
+"capaz de ler suas próprias mensagens, se fizer assim."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"O exame das preferências de assinatura do destinatário relatou que a mensagem "
-"deve ser assinada usando o OpenPGP, no mínimo para alguns destinatários;\n"
+"O exame das preferências de assinatura do destinatário relatou que a "
+"mensagem deve ser assinada usando o OpenPGP, no mínimo para alguns "
+"destinatários;\n"
 "no entanto, você ainda não configurou certificados de assinatura OpenPGP "
 "válidas e confiáveis, para esta identidade."
 
@@ -5297,15 +5097,16 @@ msgstr "Não assinar com OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"O exame das preferências de assinatura do destinatário relatou que a mensagem "
-"deve ser assinada usando o S/MIME, no mínimo para alguns destinatários;\n"
-"no entanto, você ainda não configurou certificados de assinatura S/MIME válidas "
-"e confiáveis, para esta identidade."
+"O exame das preferências de assinatura do destinatário relatou que a "
+"mensagem deve ser assinada usando o S/MIME, no mínimo para alguns "
+"destinatários;\n"
+"no entanto, você ainda não configurou certificados de assinatura S/MIME "
+"válidas e confiáveis, para esta identidade."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5317,8 +5118,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"O exame das preferências de assinatura do destinatário não mostrou um tipo de "
-"assinatura em comum com as suas chaves de assinatura disponíveis.\n"
+"O exame das preferências de assinatura do destinatário não mostrou um tipo "
+"de assinatura em comum com as suas chaves de assinatura disponíveis.\n"
 "Enviar esta mensagem sem assinar?"
 
 #: keyresolver.cpp:1335
@@ -5327,8 +5128,8 @@ msgstr "Não é possível assinar"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Você não selecionou uma chave de criptografia para você mesmo. Você não será "
 "capaz de decriptografar suas próprias mensagens, se você criptografá-las."
@@ -5352,8 +5153,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Você não selecionou uma chave de criptografia para os destinatários desta "
 "mensagem, e portanto, ela não será criptografada."
@@ -5401,13 +5202,14 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
-msgstr ""
-"Nenhuma chave de criptografia válida e confiável foi encontrada para \"%1\".\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
+msgstr ""
+"Nenhuma chave de criptografia válida e confiável foi encontrada para "
+"\"%1\".\n"
 "\n"
 "Selecione a(s) chave(s) que devem ser usadas para este destinatário."
 
@@ -5452,10 +5254,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Erro crítico: não foi possível coletar e-mail "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Falha ao adicionar mensagem:\n"
+msgid "Failed to add message:\n"
+msgstr "Falha ao adicionar mensagem:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5545,6 +5345,50 @@ msgstr "&IMAP Desconectado"
 msgid "&Maildir mailbox"
 msgstr "Caixa de correio &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Ajustar o assunto da mensagem"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Enviar CC para 'endereço'."
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Enviar BCC para 'endereço'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Adicionar 'cabeçalho' à mensagem"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Lê o corpo da mensagem de 'arquivo'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Ajusta o corpo da mensagem"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Adiciona um anexo ao e-mail. Isto pode ser repetido"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Verifica somente por novos e-mails"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Abre somente a janela do compositor"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Visualiza o arquivo de mensagem fornecido"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Envia mensagem para 'endereço', e anexar o arquivo indicado na 'URL'"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "E-Mail"
@@ -5588,8 +5432,9 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"O KMail criará agora as pastas requeridas para groupware como subpastas de %1, "
-"se você não deseja isto, cancele e a fonte de dados IMAP será desabilitada"
+"O KMail criará agora as pastas requeridas para groupware como subpastas de "
+"%1, se você não deseja isto, cancele e a fonte de dados IMAP será "
+"desabilitada"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5603,14 +5448,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>O KMail encontrou as seguintes pastas de groupware em %1 e precisa realizar "
-"as seguintes operações: %2"
-"<br>Se você não quiser isto, cancele e a fonte de recursos IMAP será "
-"desabilitada"
+"<qt>O KMail encontrou as seguintes pastas de groupware em %1 e precisa "
+"realizar as seguintes operações: %2<br>Se você não quiser isto, cancele e a "
+"fonte de recursos IMAP será desabilitada"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5659,11 +5503,11 @@ msgstr "URL copiado para a área de transferência"
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt> O Arquivo <b>%1</b> existe. <br>Quer substituí-lo ?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Salvar para arquivo"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Substituir"
 
@@ -5682,7 +5526,7 @@ msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 "A mensagem não foi salva porque foi removida durante o processo de gravação."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5704,98 +5548,98 @@ msgstr ""
 "O arquivo contém múltiplas mensagens. Somente a primeira mensagem será "
 "mostrada."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Este é um reenvio em formato de seleção MIME.  O conteúdo deste mensagem está "
-"contido no anexo(s).\n"
+"Este é um reenvio em formato de seleção MIME.  O conteúdo deste mensagem "
+"está contido no anexo(s).\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrando mensagens"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrando mensagens %1 of %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Espaço em disco insuficiente?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mover para Esta Pasta"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copiar para Esta Pasta"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Cache IMAP corrompido detectado na pasta %1. Cópia de mensagem foi abortada."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Excluindo mensagens"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Abrindo URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Você realmente quer executar <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Executar"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nenhum anexo encontrado para salvar."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Salvar Anexo Em"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "anexo.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "anexo.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Um arquivo chamado %1 já existe. Deseja sobrescrevê-lo?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "O Arquivo Já Existe"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Sobrescrever"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5803,19 +5647,19 @@ msgstr ""
 "A parte %1 da mensagem está criptografada. Deseja manter a criptografia "
 "enquanto salva?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Pergunta do KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Manter Criptografia"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Não Manter"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5823,11 +5667,11 @@ msgstr ""
 "A parte %1 da mensagem está assinada. Deseja manter a assinatura enquanto "
 "salva?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Manter Assinatura"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5836,22 +5680,22 @@ msgstr ""
 "Não foi possível gravar para o arquivo %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Não foi possível gravar o arquivo %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "Não existe entrada no Livro de Endereços para este endereço de e-mail. "
-"Adicione-o no Livro de Endereços e então, adicione os endereços dos mensageiros "
-"instantâneos, usando seu cliente de IM preferido."
+"Adicione-o no Livro de Endereços e então, adicione os endereços dos "
+"mensageiros instantâneos, usando seu cliente de IM preferido."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5861,78 +5705,78 @@ msgstr ""
 "%1\n"
 "Não é possível determinar qual usar."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"O backend Chiasmus não oferece a função \"x-obtain-keys\". Por favor, reporte "
-"este erro."
+"O backend Chiasmus não oferece a função \"x-obtain-keys\". Por favor, "
+"reporte este erro."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Erro do Backend do Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Backend do Chiasmus retornou um valor inesperado: A função \"x-obtain-keys\" "
 "não retornou uma lista de caracteres. Por favor, reporte este erro."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Chaves não encontradas. Por favor, verifique se um caminho válido para as "
 "chaves foi definido nas configurações do Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Seleção da Chave de Decodificação Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "O backend do Chiasmus não oferece a função \"x-decrypt\". Por favor, reporte "
 "este erro."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"A função \"x-decrypt\" não aceita os parâmetros esperados. Por favor, reporte "
-"este erro."
+"A função \"x-decrypt\" não aceita os parâmetros esperados. Por favor, "
+"reporte este erro."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Erro de Decodificação do Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Backend Chiasmus retornou um valor não esperado: A função \"x-decrypt\" não "
 "retornou um array de byte. Por favor, reporte este erro."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "E-Mail"
@@ -6031,7 +5875,7 @@ msgstr "Tamanho"
 msgid "Encoding"
 msgstr "Codificação"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Compactar"
 
@@ -6043,7 +5887,7 @@ msgstr "Criptografar"
 msgid "Sign"
 msgstr "Assinar"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Nome do anexo:"
 
@@ -6065,10 +5909,11 @@ msgstr "Destinatários Primários"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Os endereços de e-mail que você colocar neste campo receberão uma cópia da "
-"mensagem.</qt>"
+"<qt>Os endereços de e-mail que você colocar neste campo receberão uma cópia "
+"da mensagem.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6077,15 +5922,15 @@ msgstr "Destinatários Adicionais"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
-msgstr ""
-"<qt>Os endereços de e-mail que você colocar neste campo receberão uma cópia do "
-"e-mail. Tecnicamente, é a mesma coisa que você colocar todos os endereços no "
-"campo <b>Para:</b>, mas difere daquele porque usualmente simboliza que o "
-"remetente da Cópia Carbono (CC) é um ouvinte, e não o destinatário "
-"principal.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
+msgstr ""
+"<qt>Os endereços de e-mail que você colocar neste campo receberão uma cópia "
+"do e-mail. Tecnicamente, é a mesma coisa que você colocar todos os endereços "
+"no campo <b>Para:</b>, mas difere daquele porque usualmente simboliza que o "
+"remetente da Cópia Carbono (CC) é um ouvinte, e não o destinatário principal."
+"</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6093,13 +5938,12 @@ msgstr "Destinatários Ocultos"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Essencialmente a mesma coisa que o campo <b>Copiar para:</b>"
-", mas difere daquele porque todos os destinatários não vêem quem recebe a cópia "
-"oculta.</qt>"
+"<qt>Essencialmente a mesma coisa que o campo <b>Copiar para:</b>, mas difere "
+"daquele porque todos os destinatários não vêem quem recebe a cópia oculta.</"
+"qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6109,7 +5953,7 @@ msgstr "&Enviar Mensagem"
 msgid "&Send Mail Via"
 msgstr "&Enviar Mensagem Via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Enviar &depois"
@@ -6174,8 +6018,7 @@ msgstr "&Remover Caracteres de Citação"
 msgid "Cl&ean Spaces"
 msgstr "L&impar espaços"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Usar Fontes de Largura Fi&xa"
@@ -6318,31 +6161,31 @@ msgstr "Formato da Mensagem &Criptografada"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Padrão"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Lista de Itens (Disco)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Lista de Itens (Círculo)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Lista de Itens (Quadrado)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Lista Ordenada (Decimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Lista Ordenada (alfabético minúsculo)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Lista Ordenada (alfabético maiúsculo)"
 
@@ -6447,62 +6290,62 @@ msgstr "Fechar Compositor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"A mensagem que você compôs parece se referir a um arquivo anexado, mas você não "
-"anexou qualquer coisa.\n"
+"A mensagem que você compôs parece se referir a um arquivo anexado, mas você "
+"não anexou qualquer coisa.\n"
 "Você quer anexar um arquivo à sua mensagem?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Lembrete de Anexação de Arquivo"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Enviar &como está"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O KMail não conseguiu reconhecer a localização do anexo (%1).</p>"
-"<p>Você deve especificar o caminho completo, se desejar anexar um arquivo.</p>"
-"</qt>"
+"<qt><p>O KMail não conseguiu reconhecer a localização do anexo (%1).</"
+"p><p>Você deve especificar o caminho completo, se desejar anexar um arquivo."
+"</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Anexar Arquivo"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Anexar"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Inserir Arquivo"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Inserir Arquivo"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ocorreu um erro ao tentar exportar a chave da infra-estrutura: </p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Ocorreu um erro ao tentar exportar a chave da infra-estrutura: </"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6541,20 +6384,35 @@ msgid ""
 "View"
 msgstr "Visualização"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Editar..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Editar Script..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Salvar &Como..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Propriedades"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Adicionar Anexo ..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "O KMail não pode compactar o arquivo."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6562,248 +6420,240 @@ msgstr ""
 "O arquivo compactado é maior que o original. Você deseja manter o arquivo "
 "original?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Manter"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "O KMail não pôde descompactar o arquivo."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Salvar Anexo como"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Adicionar como Texto"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Adicionar como Anexo"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Colar como A&nexo"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "sem-nome"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Você requisitou que as mensagens fosse criptografadas para você mesmo, mas a "
-"identidade atualmente selecionada não define uma chave de criptografia (OpenPGP "
-"ou S/MIME) para isto.</p>"
-"<p>Por favor, selecione a(s) chave(s) para o uso, da configuração de "
-"identidade.</p></qt>"
+"<qt><p>Você requisitou que as mensagens fosse criptografadas para você "
+"mesmo, mas a identidade atualmente selecionada não define uma chave de "
+"criptografia (OpenPGP ou S/MIME) para isto.</p><p>Por favor, selecione a(s) "
+"chave(s) para o uso, da configuração de identidade.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Chave de Criptografia Indefinida"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>A fim de habilitar a assinatura para esta mensagem, você deve primeiro "
-"definir a chave de assinatura (OpenPGP ou S/MIME), que deve ser usada para "
-"isto.</p>"
-"<p>Você pode definir a chave, que deve ser usada com a identidade atual, na "
-"configuração da identidade.</p></qt>"
+"<qt><p>A fim de habilitar a assinatura para esta mensagem, você deve "
+"primeiro definir a chave de assinatura (OpenPGP ou S/MIME), que deve ser "
+"usada para isto.</p><p>Você pode definir a chave, que deve ser usada com a "
+"identidade atual, na configuração da identidade.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Chave de Assinatura Indefinida"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"O Kmail está no modo offline, suas mensagens serão mantidas na caixa de saída "
-"até que você fique online."
+"O Kmail está no modo offline, suas mensagens serão mantidas na caixa de "
+"saída até que você fique online."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "On-line/Off-line"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Você deve digitar o seu endereço de e-mail no campo De:. Você deve também "
-"definir o seu endereço de e-mail para todas as identidades, e assim, você não "
-"precisará digitá-la para cada mensagem."
+"definir o seu endereço de e-mail para todas as identidades, e assim, você "
+"não precisará digitá-la para cada mensagem."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Você deve especificar pelo menos um destinatário no campo Para:."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 "Você não especificou um destinatário (campo Para:). Mandar a mensagem assim "
 "mesmo?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Nenhum Destinatário especificado"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Você não especificou um assunto. Mandar a mensagem assim mesmo?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nenhum assunto especificado"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Enviar &como está"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Especificar o assunto"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Manter marcação, não assinar/criptografar"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Manter marc&ação, não criptografar"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Manter marcação, não a&ssinar"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Assinar/Criptografar (remover marcação)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Criptografar (remover marcação)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Assinar (remover marcação)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Não é possível a criptografia/assinatura integrada para mensagens HTML .</p>"
-"<p>Deseja remover sua marcação?</p></qt>"
+"<qt><p>Não é possível a criptografia/assinatura integrada para mensagens "
+"HTML .</p><p>Deseja remover sua marcação?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Assinar/Criptografar mensagem?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"A pasta rascunhos ou modelos personalizados para identificar \"%1\" não existe "
-"(mais); portanto, a pasta padrão de rascunhos ou modelos será usada."
+"A pasta rascunhos ou modelos personalizados para identificar \"%1\" não "
+"existe (mais); portanto, a pasta padrão de rascunhos ou modelos será usada."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Por favor crie uma conta para envio e tente outra vez."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Pronto para mandar e-mail..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Enviar Confirmação"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Envia agora"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Sem destinatários"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinatários Adicionais"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Verificador Ortográfico: ligado"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Verificador Ortográfico: desligado"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Verificação ortográfica cancelada."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Verificação ortográfica parada."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Verificação ortográfica completa."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Verificador Ortográfico..."
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Por favor, configure o Backend Crypto para usar a criptografia Chiasmus "
 "primeiro.\n"
-"Você pode fazer isto na aba do Backend Crypto na página Segurança da janela de "
-"configuração."
+"Você pode fazer isto na aba do Backend Crypto na página Segurança da janela "
+"de configuração."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6811,34 +6661,34 @@ msgstr ""
 "Parece que a libkleopatra foi compilada sem suporte a Chiasmus. Você pode "
 "querer recompilar a libkleopatra com a opção --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Backend Chiasmus não foi configurado"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nenhuma Chave de Assinatura Chiasmus foi Encontrada"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Seleção da Chave de Criptografia Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "A mensagem foi assinada por %1"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "A mensagem foi assinada por %1"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Mensagem OpenPGP - criptografada "
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Mensagem com assunto:"
@@ -6890,11 +6740,12 @@ msgstr "Verificador Ortográfico - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "O corretor ortográfico não pôde ser iniciado.\n"
-" Verifique se o ISpell ou o Aspell está corretamente configurado e em seu PATH."
+" Verifique se o ISpell ou o Aspell está corretamente configurado e em seu "
+"PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6927,13 +6778,11 @@ msgstr "<qt>Número excessivo de ações na regra de filtragem <b>%1</b></qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Ação de filtro desconhecida <b>%1</b>"
-"<br>na regra de filtragem <b>%2</b>. "
-"<br>Ignorada.</qt>"
+"<qt>Ação de filtro desconhecida <b>%1</b><br>na regra de filtragem <b>%2</"
+"b>. <br>Ignorada.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7153,163 +7002,131 @@ msgstr "Reproduzir som"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Esta é a lista de filtros definidos. Eles são processados de cima para "
-"baixo.</p>"
-"<p>Clique em um filtro para editá-lo usando os controles na parte direita do "
-"diálogo.</p></qt>"
+"<qt><p>Esta é a lista de filtros definidos. Eles são processados de cima "
+"para baixo.</p><p>Clique em um filtro para editá-lo usando os controles na "
+"parte direita do diálogo.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Clique neste botão para criar um novo filtro.</p>"
-"<p>Ele será inserido antes do filtro selecionado, mas você pode mudar esta "
-"posição mais tarde.</p> "
-"<p>Se você clicar neste botão acidentalmente, pode desfazer isto clicando no "
-"botão <em>Excluir</em>.</p></qt>"
+"<qt><p>Clique neste botão para criar um novo filtro.</p><p>Ele será inserido "
+"antes do filtro selecionado, mas você pode mudar esta posição mais tarde.</"
+"p> <p>Se você clicar neste botão acidentalmente, pode desfazer isto clicando "
+"no botão <em>Excluir</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Clique neste botão para copiar um filtro.</p>"
-"<p>Se você clicar neste botão acidentalmente, pode desfazer isto clicando no "
-"botão <em>Excluir</em>.</p></qt>"
+"<qt><p>Clique neste botão para copiar um filtro.</p><p>Se você clicar neste "
+"botão acidentalmente, pode desfazer isto clicando no botão <em>Excluir</em>."
+"</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> Clique neste botão para <em>excluir</em> o filtro selecionado da lista "
-"acima.</p> "
-"<p>Não é possível recuperar um filtro após este ter sido excluído, mas você "
-"sempre pode deixar o diálogo clicando em <em>Cancelar</em> "
-"para desistir das modificações feitas.</p></qt>"
+"<qt><p> Clique neste botão para <em>excluir</em> o filtro selecionado da "
+"lista acima.</p> <p>Não é possível recuperar um filtro após este ter sido "
+"excluído, mas você sempre pode deixar o diálogo clicando em <em>Cancelar</"
+"em> para desistir das modificações feitas.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Clique neste botão para mover o filtro selecionado para o <em>topo</em> "
-"na lista acima.</p>"
-"<p>Isto é útil, pois a ordem dos filtros determina a ordem na qual os mesmos "
-"serão executados. O filtro mais acima será executado antes.</p></qt>"
+"<qt><p>Clique neste botão para mover o filtro selecionado para o <em>topo</"
+"em> na lista acima.</p><p>Isto é útil, pois a ordem dos filtros determina a "
+"ordem na qual os mesmos serão executados. O filtro mais acima será executado "
+"antes.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Clique neste botão para mover o filtro selecionado para <em>cima</em> "
-"na lista acima.</p>"
-"<p>Isto é útil, pois a ordem dos filtros determina a ordem na qual os mesmos "
-"serão executados. O filtro mais acima será executado antes.</p>"
-"<p>Se você clicar sobre este botão acidentalmente, pode desfazer isto clicando "
-"no botão <em>Para baixo</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Clique neste botão para mover o filtro selecionado para <em>cima</em> "
+"na lista acima.</p><p>Isto é útil, pois a ordem dos filtros determina a "
+"ordem na qual os mesmos serão executados. O filtro mais acima será executado "
+"antes.</p><p>Se você clicar sobre este botão acidentalmente, pode desfazer "
+"isto clicando no botão <em>Para baixo</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Clique neste botão para mover o filtro selecionado para <em>baixo</em> "
-"na lista acima.</p>"
-"<p>Isto é útil, pois a ordem dos filtros determina a ordem na qual os mesmos "
-"serão executados. O filtro mais acima será executado antes.</p>"
-"<p>Se você clicar sobre este botão acidentalmente, pode desfazer isto clicando "
-"no botão <em>Para cima</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Clique neste botão para mover o filtro selecionado para <em>baixo</"
+"em> na lista acima.</p><p>Isto é útil, pois a ordem dos filtros determina a "
+"ordem na qual os mesmos serão executados. O filtro mais acima será executado "
+"antes.</p><p>Se você clicar sobre este botão acidentalmente, pode desfazer "
+"isto clicando no botão <em>Para cima</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Clique neste botão para mover o filtro selecionado para <em>baixo</em> "
-"na lista acima.</p>"
-"<p>Isto é útil, pois a ordem dos filtros determina a ordem na qual os mesmos "
-"serão executados. O filtro mais acima será executado antes.</p></qt>"
+"<qt><p>Clique neste botão para mover o filtro selecionado para <em>baixo</"
+"em> na lista acima.</p><p>Isto é útil, pois a ordem dos filtros determina a "
+"ordem na qual os mesmos serão executados. O filtro mais acima será executado "
+"antes.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Clique neste botão para renomear o filtro selecionado.</p>"
-"<p>Filtros são nomeados automaticamente, desde que eles comecem com "
-"\"&lt;\".</p>"
-"<p>Se você renomeou um filtro acidentalmente e deseja o nome automático de "
-"volta, clique este botão e selecione <em>Limpar</em> e então em <em>OK</em> "
-"no diálogo que surgir.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Clique neste botão para renomear o filtro selecionado.</p><p>Filtros "
+"são nomeados automaticamente, desde que eles comecem com \"&lt;\".</p><p>Se "
+"você renomeou um filtro acidentalmente e deseja o nome automático de volta, "
+"clique este botão e selecione <em>Limpar</em> e então em <em>OK</em> no "
+"diálogo que surgir.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marque esta opção para forçar que o diálogo de confirmação seja mostrado.</p>"
-"<p>Isto é útil se você definiu um conjunto de regras que marca mensagens para "
-"serem baixadas posteriormente. Sem a possibilidade de forçar o diálogo, estas "
-"mensagens nunca poderiam ser baixadas se mais mensagens grandes estivessem "
-"esperando no servidor ou você desejasse mudar as regras de maneira "
-"diferente.</p> </qt>"
+"<qt><p>Marque esta opção para forçar que o diálogo de confirmação seja "
+"mostrado.</p><p>Isto é útil se você definiu um conjunto de regras que marca "
+"mensagens para serem baixadas posteriormente. Sem a possibilidade de forçar "
+"o diálogo, estas mensagens nunca poderiam ser baixadas se mais mensagens "
+"grandes estivessem esperando no servidor ou você desejasse mudar as regras "
+"de maneira diferente.</p> </qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7319,6 +7136,16 @@ msgstr "Regras de Filtragem POP3"
 msgid "Filter Rules"
 msgstr "Regras de Filtragem"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importar"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importar"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtros disponíveis"
@@ -7401,6 +7228,11 @@ msgstr "Também adicionar este filtro à barra de ferramentas"
 msgid "Icon for this filter:"
 msgstr "Ícone para este filtro:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Para"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Acima"
@@ -7409,16 +7241,29 @@ msgstr "Acima"
 msgid "Down"
 msgstr "Abaixo"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Renomear..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nova"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "C&opiar para"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Excluída"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7427,8 +7272,8 @@ msgstr "Selecionar Atalha para Pasta"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Pelo menos um filtro age sobre uma pasta de uma conta online IMAP. Estes "
 "filtros serão aplicados apenas na filtragem manual e ao filtrar mensagens "
@@ -7439,8 +7284,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Os seguintes filtros não foram salvos, pois eram inválidos (por exemplo,  sem "
-"ações ou sem regras de busca)."
+"Os seguintes filtros não foram salvos, pois eram inválidos (por exemplo,  "
+"sem ações ou sem regras de busca)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7488,24 +7333,24 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Nomes de pasta não podem conter o caracter / (barra). Por favor, escolha outro "
-"nome."
+"Nomes de pasta não podem conter o caracter / (barra). Por favor, escolha "
+"outro nome."
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Nomes de pasta não pode começar com o caracter '.' (ponto). Por favor, escolha "
-"outro nome."
+"Nomes de pasta não pode começar com o caracter '.' (ponto). Por favor, "
+"escolha outro nome."
 
 #: kmfolder.cpp:932
 msgid ""
 "Your IMAP server does not allow the character '%1'; please choose another "
 "folder name."
 msgstr ""
-"O seu servidor IMAP não permite o caractere '%1'; por favor, escolha um outro "
-"nome de pasta."
+"O seu servidor IMAP não permite o caractere '%1'; por favor, escolha um "
+"outro nome de pasta."
 
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
@@ -7513,36 +7358,31 @@ msgstr "Perguntas e Respostas sobre Cache IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Perguntas e Respostas sobre Cache IMAP.</b></p>"
-"<p>Se você tem problemas com a sincronização de uma pasta IMAP , você deve "
-"primeiramente tentar reconstruir o arquivo de índice. Isto levará algum tempo, "
-"mas não lhe causará mais problemas.</p>"
-"<p>Se isto não for suficiente, você pode tentar atualizar a cache do IMAP. Se "
-"fizer isto, perderá todas as suas modificações locais para esta pasta, bem como "
-"as sub-pastas.</p>\n"
-"<p><b>Perguntas e Respostas sobre Cache IMAP.</b></p>"
-"<p>Se você tem problemas com a sincronização de uma pasta IMAP , você deve "
-"primeiramente tentar reconstruir o arquivo de índice. Isto levará algum tempo, "
-"mas não lhe causará mais problemas.</p>"
-"<p>Se isto não for suficiente, você pode tentar atualizar a cache do IMAP. Se "
-"fizer isto, perderá todas as suas modificações locais para esta pasta, bem como "
-"as sub-pastas.</p>"
+"<p><b>Perguntas e Respostas sobre Cache IMAP.</b></p><p>Se você tem "
+"problemas com a sincronização de uma pasta IMAP , você deve primeiramente "
+"tentar reconstruir o arquivo de índice. Isto levará algum tempo, mas não lhe "
+"causará mais problemas.</p><p>Se isto não for suficiente, você pode tentar "
+"atualizar a cache do IMAP. Se fizer isto, perderá todas as suas modificações "
+"locais para esta pasta, bem como as sub-pastas.</p>\n"
+"<p><b>Perguntas e Respostas sobre Cache IMAP.</b></p><p>Se você tem "
+"problemas com a sincronização de uma pasta IMAP , você deve primeiramente "
+"tentar reconstruir o arquivo de índice. Isto levará algum tempo, mas não lhe "
+"causará mais problemas.</p><p>Se isto não for suficiente, você pode tentar "
+"atualizar a cache do IMAP. Se fizer isto, perderá todas as suas modificações "
+"locais para esta pasta, bem como as sub-pastas.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7578,8 +7418,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "O arquivo de cache UID para a pasta %1 não pôde ser gravado. Pode haver um "
 "problema com permissões no sistema de arquivo."
@@ -7602,8 +7442,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Você tem certeza de que deseja atualizar o cache do IMAP da pasta %1 e de todas "
-"as sub-pastas?\n"
+"Você tem certeza de que deseja atualizar o cache do IMAP da pasta %1 e de "
+"todas as sub-pastas?\n"
 "Isto removerá todas as modificações que você fez localmente nas suas pastas."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7620,11 +7460,11 @@ msgstr "O índice desta pasta foi recriado."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"A pasta %1 não é o estado inicial de sincronismo (o estado era %2). Você deseja "
-"reiniciá-lo para o estado inicial e de qualquer modo sincronizá-lo?"
+"A pasta %1 não é o estado inicial de sincronismo (o estado era %2). Você "
+"deseja reiniciá-lo para o estado inicial e de qualquer modo sincronizá-lo?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7729,8 +7569,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Suas permissões de acesso à pasta <b>%1</b> foram reduzidas, não será mais "
-"possível adicionar mensagens nesta pasta.</p>"
+"<p>Suas permissões de acesso à pasta <b>%1</b> foram reduzidas, não será "
+"mais possível adicionar mensagens nesta pasta.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7751,15 +7591,11 @@ msgstr "Criando sub-pastas no servidor"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mensaens nas pasta <b>%1</b> do servidor foram removidas. Você deseja "
-"removê-las localmente?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mensaens nas pasta <b>%1</b> do servidor foram removidas. Você deseja "
+"removê-las localmente?<br>UIDs: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7780,12 +7616,10 @@ msgstr "Recuperando pastas para o espaço de nomes %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Parece que a pasta <b>%1</b> foi removida. Você deseja removê-la do "
+"<qt><p>Parece que a pasta <b>%1</b> foi removida. Você deseja removê-la do "
 "servidor?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7794,21 +7628,21 @@ msgstr "Interrompido"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"O servidor IMAP %1 não suporta anotações IMAP. O armazenamento XML não pode ser "
-"utilizado neste servidor. Por favor, utilize uma configuração diferente do "
-"KMail."
+"O servidor IMAP %1 não suporta anotações IMAP. O armazenamento XML não pode "
+"ser utilizado neste servidor. Por favor, utilize uma configuração diferente "
+"do KMail."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"O servidor IMAP %1 não suporta anotações imap. O armazenamento XML não pode ser "
-"utilizado neste servidor. Por favor, utilize uma configuração diferente do "
-"KMail."
+"O servidor IMAP %1 não suporta anotações imap. O armazenamento XML não pode "
+"ser utilizado neste servidor. Por favor, utilize uma configuração diferente "
+"do KMail."
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7821,17 +7655,16 @@ msgstr "lost+found"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Há novas mensagens na pasta <b>%1</b>, que não foram enviadas para o "
-"servidor ainda, mas você não parece ter as permissões necessárias para "
-"enviá-las.</p>"
-"<p>Todas as mensagens afetadas por este problema serão então movidas para <b>"
-"%2</b>para evitar perda de dados.</p>"
+"servidor ainda, mas você não parece ter as permissões necessárias para enviá-"
+"las.</p><p>Todas as mensagens afetadas por este problema serão então movidas "
+"para <b>%2</b>para evitar perda de dados.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7840,20 +7673,25 @@ msgstr "Direitos de acesso insuficientes"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Há novas mensagens nesta pasta (%1), que não foram enviadas para o servidor "
-"ainda, mas você não parece ter permissões necessárias nesta pasta para "
-"enviá-las. Por favor, contate o seu administrador para permitir o envio de "
-"novas mensagens para você, ou movê-las para fora desta pasta.</p> "
-"<p>Você deseja mover estas mensagens para outra pasta agora?</p>"
+"<p>Há novas mensagens nesta pasta (%1), que não foram enviadas para o "
+"servidor ainda, mas você não parece ter permissões necessárias nesta pasta "
+"para enviá-las. Por favor, contate o seu administrador para permitir o envio "
+"de novas mensagens para você, ou movê-las para fora desta pasta.</p> <p>Você "
+"deseja mover estas mensagens para outra pasta agora?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Mover para:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Não Mover"
 
@@ -7865,8 +7703,7 @@ msgstr "Mover Mensagem para a Pasta"
 msgid "Permissions (ACL)"
 msgstr "Permissões (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Geral"
@@ -7890,8 +7727,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Usa ícones &personalizados"
@@ -7910,24 +7746,22 @@ msgstr "Atuar na mensagem nova/não lida nesta pasta"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Se esta opção estiver habilitada você será notificado de todamensagem "
-"nova/não lida que chegar nesta pasta. Além disso, ir para a próxima pasta com "
-"mensagens não lidas, ou pasta anterior, fará parar nesta pasta.</p>"
-"<p>Desmarque esta opção caso você não queira ser notificado sobre mensagens "
-"novas/não lidas nesta pasta e se você deseja que esta pasta seja ignorada "
-"durante a opração de ir para a próxima pasta/pasta anterior com mensagens não "
-"lidas. Isto é útil para ignorar mensagens não lidas na Lixeira ou na pasta de "
-"Spam.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Se esta opção estiver habilitada você será notificado de todamensagem "
+"nova/não lida que chegar nesta pasta. Além disso, ir para a próxima pasta "
+"com mensagens não lidas, ou pasta anterior, fará parar nesta pasta.</"
+"p><p>Desmarque esta opção caso você não queira ser notificado sobre "
+"mensagens novas/não lidas nesta pasta e se você deseja que esta pasta seja "
+"ignorada durante a opração de ir para a próxima pasta/pasta anterior com "
+"mensagens não lidas. Isto é útil para ignorar mensagens não lidas na Lixeira "
+"ou na pasta de Spam.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7939,13 +7773,13 @@ msgstr "Manter respostas nesta pasta"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Marque esta opção se você desejar respostas que você escreveu para e-mails "
-"nesta pasta, para serem colocadas nesta mesma pasta após o envio, em vez de na "
-"pasta de enviados configurada."
+"nesta pasta, para serem colocadas nesta mesma pasta após o envio, em vez de "
+"na pasta de enviados configurada."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7955,17 +7789,21 @@ msgstr "Mostrar Coluna 'Remetente/Destinatário' na Lista de Mensagens"
 msgid "Sho&w column:"
 msgstr "Mo&strar coluna:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Define como Padrão"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Remetente"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Destinatário"
@@ -7976,18 +7814,18 @@ msgstr "&Identidade do remetente:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Selecione a identidade de remetente a ser usada quando escrever novas mensagens "
-"ou responder a mensagens nessa pasta. Isso significa que se você estiver em uma "
-"de suas pastas de trabalho, você pode fazer o KMail usar a identidade de "
-"remetente, assinatura e chaves de assinatura ou encriptação correspondentes "
-"automaticamente. As Identidades podem ser definidas na janela de configuração "
-"principal (Configurações -> Configurar KMail)."
+"Selecione a identidade de remetente a ser usada quando escrever novas "
+"mensagens ou responder a mensagens nessa pasta. Isso significa que se você "
+"estiver em uma de suas pastas de trabalho, você pode fazer o KMail usar a "
+"identidade de remetente, assinatura e chaves de assinatura ou encriptação "
+"correspondentes automaticamente. As Identidades podem ser definidas na "
+"janela de configuração principal (Configurações -> Configurar KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -8005,27 +7843,27 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Esta configuração define quais usuários compartilhando esta pasta devem ter "
-"períodos  \"ocupados\" nas suas listas de Livre/Ocupado e devem ver os alarmes "
-"para os eventos e tarefas nesta pasta. As configurações se aplicam a pastas de "
-"Calendário e Tarefas, apenas (para tarefas, esta configuração é utilizada "
-"apenas para alarmes).\n"
+"períodos  \"ocupados\" nas suas listas de Livre/Ocupado e devem ver os "
+"alarmes para os eventos e tarefas nesta pasta. As configurações se aplicam a "
+"pastas de Calendário e Tarefas, apenas (para tarefas, esta configuração é "
+"utilizada apenas para alarmes).\n"
 "\n"
-"Casos de uso de exemplo: se o chefe compartilha uma pasta com sua "
-"secretária,apenas o chefe deve ser marcado como ocupado para suas reuniões, "
-"então ele deve selecionar \"Administradores\", já que a secretária não possui "
+"Casos de uso de exemplo: se o chefe compartilha uma pasta com sua secretária,"
+"apenas o chefe deve ser marcado como ocupado para suas reuniões, então ele "
+"deve selecionar \"Administradores\", já que a secretária não possui "
 "permissões de administração na pasta.\n"
-"Por outro lado, se uma equipe compartilha um calendário para reuniões, todos os "
-"leitores das pastas deverão ser marcados como ocupados para as reuniões.\n"
-"Uma pasta geral para a companhia com eventos opcionais utilizaria \"Ninguém\", "
-"já que não se sabe quem irá para os eventos."
+"Por outro lado, se uma equipe compartilha um calendário para reuniões, todos "
+"os leitores das pastas deverão ser marcados como ocupados para as reuniões.\n"
+"Uma pasta geral para a companhia com eventos opcionais utilizaria \"Ninguém"
+"\", já que não se sabe quem irá para os eventos."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8056,23 +7894,24 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr ""
-"Você configurou esta pasta para armazenar informações de groupware, e a opção "
-"geral de configuração para ocultar pastas de groupware está marcada. Isto "
-"significa que esta pasta irá desaparecer uma vez que o diálogo de configuração "
-"for fechado. Se você quiser remover a pasta novamente, você precisará desativar "
-"temporariamente a ocultação de pastas de groupware para poder vê-la."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"Você configurou esta pasta para armazenar informações de groupware, e a "
+"opção geral de configuração para ocultar pastas de groupware está marcada. "
+"Isto significa que esta pasta irá desaparecer uma vez que o diálogo de "
+"configuração for fechado. Se você quiser remover a pasta novamente, você "
+"precisará desativar temporariamente a ocultação de pastas de groupware para "
+"poder vê-la."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8141,7 +7980,8 @@ msgstr "Erro ao obter informações das pastas."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "O índice de e-mail para '%1' é de uma versão desconhecida do KMail (%2) \n"
 "Este índice pode ser regerado para sua pasta de mensagens, mas algumas "
@@ -8162,8 +8002,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"O índice de e-mail para '%1' está corrompido e será recriado agora, mas algumas "
-"informações, incluindo marcas de status, serão perdidas."
+"O índice de e-mail para '%1' está corrompido e será recriado agora, mas "
+"algumas informações, incluindo marcas de status, serão perdidas."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8171,11 +8011,11 @@ msgstr "Erro ao abrir %1; esta pasta está faltando."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Erro ao abrir %1: não é uma pasta maildir válida, ou você não possui permissões "
-"suficientes para o acesso."
+"Erro ao abrir %1: não é uma pasta maildir válida, ou você não possui "
+"permissões suficientes para o acesso."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8194,8 +8034,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: terminando abruptamente, para se prevenir contra perda "
-"de dados."
+"KMFolderMaildir::addMsg: terminando abruptamente, para se prevenir contra "
+"perda de dados."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8220,21 +8060,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>O índice da pasta '%2' parece estar desatualizado. Para prevenir-se contra "
-"corrupção de mensagens, o índice será regerado. Como resultado, mensagens "
-"apagadas podem reaparecer, e as flags de status podem ser perdidas.</p>"
-"<p>Leia por favor a entrada correspondente na <a href=\"%1\">"
-"seção de FAQ do manual do KMail</a> para informações sobre como prevenir que "
-"este problema aconteça novamente.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>O índice da pasta '%2' parece estar desatualizado. Para prevenir-se "
+"contra corrupção de mensagens, o índice será regerado. Como resultado, "
+"mensagens apagadas podem reaparecer, e as flags de status podem ser perdidas."
+"</p><p>Leia por favor a entrada correspondente na <a href=\"%1\">seção de "
+"FAQ do manual do KMail</a> para informações sobre como prevenir que este "
+"problema aconteça novamente.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8272,7 +8109,8 @@ msgstr "Não foi possível adicionar a mensagem para a pasta:"
 #: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr ""
-"Não foi possível adicionar a mensagem para a pasta (falta de espaço em disco?)"
+"Não foi possível adicionar a mensagem para a pasta (falta de espaço em "
+"disco?)"
 
 #: kmfoldermgr.cpp:68
 msgid "Are you sure you want to expire old messages?"
@@ -8294,7 +8132,7 @@ msgstr ""
 "'%1' não parece ser uma pasta.\n"
 "Por favor, mova o arquivo para outro lugar."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8303,19 +8141,19 @@ msgstr ""
 "Por favor, certifique-se de que você pode visualizar e modificar o conteúdo "
 "desta pasta."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
 msgstr ""
 "O KMail não pode criar a pasta '%1'.\n"
-"Por favor, certifique-se de que você pode visualizar e modificar o conteúdo da "
-"pasta '%2'."
+"Por favor, certifique-se de que você pode visualizar e modificar o conteúdo "
+"da pasta '%2'."
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8323,7 +8161,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Não foi possível criar a pasta"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8422,13 +8260,13 @@ msgstr "&Perguntas e Respostas sobre Cache do IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Não foi possível criar pasta <b>%1</b> devido a permissões insuficientes no "
-"servidor. Se você acha que você deve poder criar sub-pastas aqui, peça ao seu "
-"administrador para dar-lhe permissões para isso.</qt>"
+"<qt>Não foi possível criar pasta <b>%1</b> devido a permissões insuficientes "
+"no servidor. Se você acha que você deve poder criar sub-pastas aqui, peça ao "
+"seu administrador para dar-lhe permissões para isso.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8445,23 +8283,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Não foi possível copiar ou mover a pasta <b>%1</b> "
-"para cá porque já existe uma pasta com o mesmo nome.</qt>"
+"<qt>Não foi possível copiar ou mover a pasta <b>%1</b> para cá porque já "
+"existe uma pasta com o mesmo nome.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Não é possível mover ou copiar a pasta <b>%1</b> "
-"por que ela ainda não foi completamente copiada.</qt>"
+"<qt>Não é possível mover ou copiar a pasta <b>%1</b> por que ela ainda não "
+"foi completamente copiada.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Não é possível copiar ou mover a pasta <b>%1</b> "
-"para dentro dela mesmo.</qt>"
+"<qt>Não é possível copiar ou mover a pasta <b>%1</b> para dentro dela mesmo."
+"</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8568,15 +8406,15 @@ msgstr "A pasta %1 é somente para leitura"
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Você quer realmente excluir a mensagem  selecionada?"
-"<br>Uma vez excluída, ela não pode ser restaurada.</qt>\n"
-"<qt>Deseja realmente excluir as %n mensagens  selecionadas?"
-"<br>Uma vez excluídas, elas não podem ser restauradas.</qt>"
+"<qt>Você quer realmente excluir a mensagem  selecionada?<br>Uma vez "
+"excluída, ela não pode ser restaurada.</qt>\n"
+"<qt>Deseja realmente excluir as %n mensagens  selecionadas?<br>Uma vez "
+"excluídas, elas não podem ser restauradas.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8628,138 +8466,135 @@ msgstr ""
 "Não foi possível modificar %1\n"
 "(Falta espaço em disco?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Solicitação de Assinatura do Certificado "
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Por favor, crie um certificado como anexo e retorne para o remetente."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "O KMail está marcado como offline; todas as tarefas de rede estão suspensas"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "O KMail está marcado como online; todas as tarefas de redes reiniciaram"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "O KMail está em modo off-line. O que você deseja fazer?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Trabalhar On-Line"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Trabalhar Off-line"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 "Você não tem permissões de leitura/escrita em sua pasta Caixa de entrada."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "caixa de saída"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "Você não tem permissões de leitura/escrita em sua pasta Caixa de saída."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "enviados"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Você não tem permissões de leitura/escrita em sua pasta Enviados."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "lixo"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Você não tem permissões de leitura/escrita em sua pasta Lixo."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "rascunhos"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Você não tem permissões de leitura/escrita em sua pasta Rascunho."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "modelos"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Você não tem permissões de leitura/escrita em sua pasta de modelos."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Última Procura"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>A pasta <i>%4</i> existe. %1 agora usa a pasta <i>%5</i> "
-"para armazenar suas mensagens. "
-"<p>%2 pode mover o conteúdo de <i>%6</i> para essa pasta por você, porém isso "
-"poderia substituir arquivos existentes com o mesmo nome em <i>%7</i>."
-"<p><strong>Você gostaria que o %3 movesse os arquivos de mensagens "
+"<qt>A pasta <i>%4</i> existe. %1 agora usa a pasta <i>%5</i> para armazenar "
+"suas mensagens. <p>%2 pode mover o conteúdo de <i>%6</i> para essa pasta por "
+"você, porém isso poderia substituir arquivos existentes com o mesmo nome em "
+"<i>%7</i>.<p><strong>Você gostaria que o %3 movesse os arquivos de mensagens "
 "agora?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>A pasta <i>%4</i> existe. %1 agora usa a pasta <i>%5</i> "
-"para armazenar suas mensagens. %2 pode mover o conteúdo de <i>%6</i> "
-"para essa pasta por você."
-"<p><strong>Você gostaria que o %3 movesse os arquivos de mensagens "
+"<qt>A pasta <i>%4</i> existe. %1 agora usa a pasta <i>%5</i> para armazenar "
+"suas mensagens. %2 pode mover o conteúdo de <i>%6</i> para essa pasta por "
+"você.<p><strong>Você gostaria que o %3 movesse os arquivos de mensagens "
 "agora?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrar Arquivos de Email?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "O KMail encontrou um erro fatal e irá fechar agora."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8770,11 +8605,11 @@ msgstr ""
 "O erro foi:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Esvaziar Lixeira"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Você realmente quer esvaziar a pasta Lixeira de todas as suas contas?"
 
@@ -8849,8 +8684,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Chegou um novo e-mail</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8888,11 +8722,11 @@ msgstr "Você realmente quer esvaziar a pasta Lixeira?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Você realmente quer mover todas as mensagens da pasta <b>%1</b> "
-"para o Lixo?</qt>"
+"<qt>Você realmente quer mover todas as mensagens da pasta <b>%1</b> para o "
+"Lixo?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8916,12 +8750,11 @@ msgstr "Remover Busca"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Tem certeza de que deseja remover a busca <b>%1</b>?"
-"<br>Quaisquer mensagens exibidas continuarão disponíveis na pasta original "
-"delas.</qt>"
+"<qt>Tem certeza de que deseja remover a busca <b>%1</b>?<br>Quaisquer "
+"mensagens exibidas continuarão disponíveis na pasta original delas.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8933,41 +8766,41 @@ msgstr "<qt>Você realmente que deseja remover a pasta vazia <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Tem certeza de que deseja remover a pasta vazia <b>%1</b> "
-"e todas as suas sub-pastas? Aquelas sub-pastas podem não estar vazias e seus "
-"conteúdos serão descartados também. "
-"<p><b>Note</b> que as mensagens descartadas não são movidas para a sua Lixeira, "
-"e sim apagadas permanentemente.</qt>"
+"<qt>Tem certeza de que deseja remover a pasta vazia <b>%1</b> e todas as "
+"suas sub-pastas? Aquelas sub-pastas podem não estar vazias e seus conteúdos "
+"serão descartados também. <p><b>Note</b> que as mensagens descartadas não "
+"são movidas para a sua Lixeira, e sim apagadas permanentemente.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Tem certeza de que deseja remover a pasta <b>%1</b>"
-", independentemente do seu conteúdo? "
-"<p><b>Note</b> que as mensagens não são armazenadas na Lixeira, e sim apagadas "
-"permanentemente.</qt>"
+"<qt>Tem certeza de que deseja remover a pasta <b>%1</b>, independentemente "
+"do seu conteúdo? <p><b>Note</b> que as mensagens não são armazenadas na "
+"Lixeira, e sim apagadas permanentemente.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Tem certeza de que deseja remover a pasta <b>%1</b> "
-"e todas as suas subpastas, descartando seu conteúdo? "
-"<p><b>Note</b> que as mensagens não são armazenadas na Lixeira, e sim apagadas "
-"permanentemente.</qt>"
+"<qt>Tem certeza de que deseja remover a pasta <b>%1</b> e todas as suas "
+"subpastas, descartando seu conteúdo? <p><b>Note</b> que as mensagens não são "
+"armazenadas na Lixeira, e sim apagadas permanentemente.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Excluída"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8984,9 +8817,9 @@ msgstr "Você realmente quer expirar todas as mensagens antigas?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "O uso de e-mail HTML irá torná-lo vulnerável a\n"
 "\"spam\" e pode aumentar a possibilidade de que seu sistema será\n"
@@ -9003,8 +8836,8 @@ msgstr "Usar HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Carregando referências externas em e-mail HTML o deixará mais vulnerável a "
 "\"spam\" e pode aumentar a probabilidade de seu sistema ser comprometido por "
@@ -9024,12 +8857,12 @@ msgstr "Filtro na lista de mensagens %1"
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"A funcionalidade de Resposta Automática do KMail conta com a filtragem do lado "
-"do servidor. Você ainda não configurou o seu servidor IMAP para isto.\n"
+"A funcionalidade de Resposta Automática do KMail conta com a filtragem do "
+"lado do servidor. Você ainda não configurou o seu servidor IMAP para isto.\n"
 "Você pode fazer isto na aba \"Filtragem\" na configuração de conta do IMAP."
 
 #: kmmainwidget.cpp:1743
@@ -9042,15 +8875,16 @@ msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
 msgstr ""
-"Não foi possível iniciar o gerenciador de certificado. Por favor, verifique sua "
-"instalação."
+"Não foi possível iniciar o gerenciador de certificado. Por favor, verifique "
+"sua instalação."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Não foi possível iniciar o visualizador de registros GnuPG (kwatchgnupg). Por "
-"favor, verifique sua instalação."
+"Não foi possível iniciar o visualizador de registros GnuPG (kwatchgnupg). "
+"Por favor, verifique sua instalação."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9372,8 +9206,7 @@ msgstr "Salvar &Anexos..."
 msgid "Appl&y All Filters"
 msgstr "Apl&icar Todos os Fitlros"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Apl&icar Filtro"
@@ -9410,7 +9243,8 @@ msgstr "Coluna &Total"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Alterna a exibição da coluna, mostrando o número total de mensagens nas Pastas."
+"Alterna a exibição da coluna, mostrando o número total de mensagens nas "
+"Pastas."
 
 #: kmmainwidget.cpp:3026
 #, fuzzy
@@ -9423,7 +9257,8 @@ msgstr "Coluna &Total"
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Alterna a exibição da coluna, mostrando o número total de mensagens nas Pastas."
+"Alterna a exibição da coluna, mostrando o número total de mensagens nas "
+"Pastas."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9489,7 +9324,6 @@ msgstr "Próxima Mensagem &Não-lida"
 msgid "Go to the next unread message"
 msgstr "Ir para a próxima mensagem não-lida"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Mensagem &Anterior"
@@ -9537,8 +9371,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Percorre a mensagem atual para baixo. Se for o fim da mensagem, dirige-se para "
-"a próxima mensagem não-lida."
+"Percorre a mensagem atual para baixo. Se for o fim da mensagem, dirige-se "
+"para a próxima mensagem não-lida."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9629,69 +9463,72 @@ msgstr " Inicializando..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Esta mensagem contém um pedido de notificação do recebimento da mensagem.\n"
-"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal ou "
-"de \"negado\"."
+"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal "
+"ou de \"negado\"."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Esta mensagem contém um pedido de envio de notificação de recebimento.\n"
-"Ela contém uma instrução de processamento que está marcada como \"necessária\", "
-"mas que é desconhecida para o KMail.\n"
+"Ela contém uma instrução de processamento que está marcada como \"necessária"
+"\", mas que é desconhecida para o KMail.\n"
 "Você pode ignorar o pedido ou deixar que o KMail envie uma resposta de "
 "\"falha\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensagem contém um pedido de confirmação do recebimento desta mensagem,\n"
+"Esta mensagem contém um pedido de confirmação do recebimento desta "
+"mensagem,\n"
 "mas é necessário enviar a notificação para mais de um endereço.\n"
-"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal ou "
-"de \"negado\"."
+"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal "
+"ou de \"negado\"."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensagem contém um pedido de confirmação do recebimento desta mensagem,\n"
+"Esta mensagem contém um pedido de confirmação do recebimento desta "
+"mensagem,\n"
 "mas não tem um endereço de retorno configurado.\n"
-"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal ou "
-"de \"negado\"."
+"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal "
+"ou de \"negado\"."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Esta mensagem contém um pedido de confirmação do recebimento desta mensagem,\n"
+"Esta mensagem contém um pedido de confirmação do recebimento desta "
+"mensagem,\n"
 "mas o endereço de retorno é diferente do endereço para o qual a notificação "
 "deveria ser enviada.\n"
-"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal ou "
-"de \"negado\"."
+"Você pode ignorar o pedido ou deixar que o KMail envie uma resposta normal "
+"ou de \"negado\"."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9717,17 +9554,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Recebido: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Anexo: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Mostra os anexos como sugerido pelo remetente."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9777,45 +9614,39 @@ msgstr "Propriedades da Parte de Mensagem"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O <em>tipo MIME</em> do arquivo.</p> "
-"<p>Normalmente não é necessário mudar esta configuração, já que o tipo do "
-"arquivo é verificado automaticamente. Mas algumas vezes, %1 pode não detectar o "
-"tipo corretamente. Aqui é o lugar para corrigir isso.</p></qt>"
+"<qt><p>O <em>tipo MIME</em> do arquivo.</p> <p>Normalmente não é necessário "
+"mudar esta configuração, já que o tipo do arquivo é verificado "
+"automaticamente. Mas algumas vezes, %1 pode não detectar o tipo "
+"corretamente. Aqui é o lugar para corrigir isso.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tamanho da parte.</p>"
-"<p>Algumas vezes, %1 irá apenas dar o tamanho estimado, porque calcular o "
-"tamanho exato demandaria muito tempo. Quando este for o caso, isso será "
-"indicado pela adição de \"(est.)\" ao tamanho mostrado.</p></qt>"
+"<qt><p>Tamanho da parte.</p><p>Algumas vezes, %1 irá apenas dar o tamanho "
+"estimado, porque calcular o tamanho exato demandaria muito tempo. Quando "
+"este for o caso, isso será indicado pela adição de \"(est.)\" ao tamanho "
+"mostrado.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O nome do arquivo da parte.</p> "
-"<p>Embora o padrão seja o nome do arquivo anexado, o arquivo não é "
-"especificado. Ao invés disso, apenas é sugerido o nome do arquivo a ser usado "
-"pelo agente de e-mail do destinatário ao salvar o a parte no disco.</p></qt>"
+"<qt><p>O nome do arquivo da parte.</p> <p>Embora o padrão seja o nome do "
+"arquivo anexado, o arquivo não é especificado. Ao invés disso, apenas é "
+"sugerido o nome do arquivo a ser usado pelo agente de e-mail do destinatário "
+"ao salvar o a parte no disco.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9823,17 +9654,14 @@ msgstr "&Descrição:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Descrição da parte.</p> "
-"<p>Isto é apenas uma descrição da parte, mais ou menos como o assunto da "
-"mensagem. A maioria dos agentes de e-mail irá mostrar esta informação junto ao "
-"ícone do anexo.</P></qt>"
+"<qt><p>Descrição da parte.</p> <p>Isto é apenas uma descrição da parte, mais "
+"ou menos como o assunto da mensagem. A maioria dos agentes de e-mail irá "
+"mostrar esta informação junto ao ícone do anexo.</P></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9841,19 +9669,17 @@ msgstr "&Codificação:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>A codificação do transporte desta parte.</p>"
-"<p>Normalmente você não precisa mudar isso, já que %1 irá usar uma codificação "
-"padrão decente, dependendo do tipo MIME. Porém, algumas vezes você pode reduzir "
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>A codificação do transporte desta parte.</p><p>Normalmente você não "
+"precisa mudar isso, já que %1 irá usar uma codificação padrão decente, "
+"dependendo do tipo MIME. Porém, algumas vezes você pode reduzir "
 "significativamente o tamanho da mensagem resultante, quando o arquivo "
 "PostScript não contém dados binários, mas apenas texto puro. Neste caso, "
 "escolher \"quoted-printable\" ao invés de \"base64\" irá diminuir a mensagem "
@@ -9865,21 +9691,17 @@ msgstr "Sugerir resposta &automática"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Marque esta opção caso você deseje sugerir ao destinatário mostrar "
-"automaticamente (inline) esta parte na pré-visualização da mensagem, ao invés "
-"da visão padrão de ícones.</p>"
-"<p>Tecnicamente, isto é feito ao se configurar a parte <em>"
-"Content-Disposition</em> do cabeçalho para \"inline\" ao invés do  padrão "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Marque esta opção caso você deseje sugerir ao destinatário mostrar "
+"automaticamente (inline) esta parte na pré-visualização da mensagem, ao "
+"invés da visão padrão de ícones.</p><p>Tecnicamente, isto é feito ao se "
+"configurar a parte <em>Content-Disposition</em> do cabeçalho para \"inline\" "
+"ao invés do  padrão \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9887,14 +9709,12 @@ msgstr "&Assinar esta parte"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Marque esta opção se quer que esta parte da mensagem seja assinada.</p>"
-"<p>A assinatura será feita com a chave que você associou com a identidade "
+"<qt><p>Marque esta opção se quer que esta parte da mensagem seja assinada.</"
+"p><p>A assinatura será feita com a chave que você associou com a identidade "
 "atualmente selecionada.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9903,14 +9723,12 @@ msgstr "Cr&iptografar esta parte"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Marque esta opção se você quer que esta parte da mensagem seja "
-"criptografada.</p> "
-"<p>A parte será criptografada para os destinatários da mensagem</p></qt>"
+"<qt> <p>Marque esta opção se você quer que esta parte da mensagem seja "
+"criptografada.</p> <p>A parte será criptografada para os destinatários da "
+"mensagem</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9924,15 +9742,13 @@ msgstr "Filtro POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Mensagens a serem filtradas na conta de POP: <b>%1</b> "
-"<p>As mensagens mostradas excedem o tamanho máximo definido para esta conta. "
-"<br> Você pode selecionar o que deseja fazer com elas no botão apropriado."
+"Mensagens a serem filtradas na conta de POP: <b>%1</b> <p>As mensagens "
+"mostradas excedem o tamanho máximo definido para esta conta. <br> Você pode "
+"selecionar o que deseja fazer com elas no botão apropriado."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10186,40 +10002,38 @@ msgstr "O cliente de e-mail pra o Ambiente de Trabalho K."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Recuperando o Conteúdo da Pasta</h2>"
-"<p>Por favor, aguarde . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Recuperando o Conteúdo da Pasta</h2><p>Por "
+"favor, aguarde . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>O KMail está no modo offline. Clique <a href=\"kmail:goOnline\">aqui</a> "
-"para ficar online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>O KMail está no modo offline. "
+"Clique <a href=\"kmail:goOnline\">aqui</a> para ficar online . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10227,13 +10041,12 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Bem-Vindo ao KMail %1</h2>"
-"<p>O KMail é um cliente de e-mail para o Ambiente de Trabalho TDE. Ele foi "
-"projetado para ser completamente compatível com os padrões de correio da "
-"Internet, incluindo MIME, SMTP, POP3 e IMAP.</p>\n"
-"<ul>"
-"<li>O KMail tem características poderosas que são descritas na <a href=\"%2\">"
-"documentação</a></li>\n"
+"<h2 style='margin-top: 0px;'>Bem-Vindo ao KMail %1</h2><p>O KMail é um "
+"cliente de e-mail para o Ambiente de Trabalho TDE. Ele foi projetado para "
+"ser completamente compatível com os padrões de correio da Internet, "
+"incluindo MIME, SMTP, POP3 e IMAP.</p>\n"
+"<ul><li>O KMail tem características poderosas que são descritas na <a href="
+"\"%2\">documentação</a></li>\n"
 "<li>A <a href=\"%3\">página web do KMail</a> oferece informação sobre novas "
 "versões do KMail</li></ul>\n"
 "%8\n"
@@ -10247,30 +10060,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; O Time do KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Por favor, preencha o painel de configurações em "
-"Configurações-&gt;Configurar o KMail.\n"
-"Você precisa no mínimo criar uma identidade primária e uma conta de e-mail de "
-"saída e entrada.</p>\n"
+"<p>Por favor, preencha o painel de configurações em Configurações-&gt;"
+"Configurar o KMail.\n"
+"Você precisa no mínimo criar uma identidade primária e uma conta de e-mail "
+"de saída e entrada.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Mudanças Importantes</span> "
-"(comparado ao KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Mudanças Importantes</"
+"span> (comparado ao KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10301,7 +10112,8 @@ msgstr "Ver Anexos: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Anexo contém dados binários. Tentando mostrar %n caracter inicial.]\n"
@@ -10330,12 +10142,14 @@ msgstr "Abrir arquivo anexo?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10357,6 +10171,58 @@ msgstr "(casar com qualquer uma das seguintes regras)"
 msgid "(match all of the following)"
 msgstr "(casar com todas as seguintes regras)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lida"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Antiga"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Excluída"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Respondida"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Encaminhada"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Enfileirada"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Enviada"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Observada"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorada"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Não-spam"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Pendente"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Possui um Anexo"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10441,25 +10307,26 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Falha ao mover a mensagem enviada \"%1\" da pasta \"caixa de saída\" para  "
 "\"enviados\" .\n"
-"As possíveis razões são problemas de espaço em disco ou permissões de escrita. "
-"Por favor, tente consertar o problema e mova a mensagem manualmente."
+"As possíveis razões são problemas de espaço em disco ou permissões de "
+"escrita. Por favor, tente consertar o problema e mova a mensagem manualmente."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
-"Não é possível enviar mensagens sem especificar um endereço de destinatário.\n"
-"Por favor, defina o endereço de e-mail da identidade '%1' na seção Identidades "
-"do diálogo de configuração, e  tente novamente."
+"Não é possível enviar mensagens sem especificar um endereço de "
+"destinatário.\n"
+"Por favor, defina o endereço de e-mail da identidade '%1' na seção "
+"Identidades do diálogo de configuração, e  tente novamente."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10484,11 +10351,11 @@ msgstr "Iniciando o processo de envio..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Você escolheu enviar todos os e-mails na fila utilizando um meio criptografado, "
-"você deseja continuar?"
+"Você escolheu enviar todos os e-mails na fila utilizando um meio "
+"criptografado, você deseja continuar?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10512,16 +10379,17 @@ msgstr "Não foi possível mandar (algumas) mensagens em espera."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Envio interrompido:\n"
 "%1\n"
-"A mensagem ficará na pasta 'caixa de saída' até que o problema seja corrigido "
-"(por exemplo, endereço errado) ou a mensagem seja removida da pasta 'caixa de "
-"saída'.\n"
+"A mensagem ficará na pasta 'caixa de saída' até que o problema seja "
+"corrigido (por exemplo, endereço errado) ou a mensagem seja removida da "
+"pasta 'caixa de saída'.\n"
 "O seguinte protocolo de transporte foi usado:\n"
 "%2"
 
@@ -10531,21 +10399,17 @@ msgstr "Envio interrompido."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Falha no Envio</p>"
-"<p>%1</p>"
-"<p>A mensagem ficará na pasta 'caixa de saída' até que o problema seja "
-"corrigido (por exemplo, endereço errado) ou a mensagem seja removida da pasta "
-"'caixa de saída'.</p>"
-"<p>O seguinte protocolo de transporte foi usado: %2</p> "
-"<p>Deseja continuar o envio das mensagens restantes?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Falha no Envio</p><p>%1</p><p>A mensagem ficará na pasta 'caixa de saída' "
+"até que o problema seja corrigido (por exemplo, endereço errado) ou a "
+"mensagem seja removida da pasta 'caixa de saída'.</p><p>O seguinte protocolo "
+"de transporte foi usado: %2</p> <p>Deseja continuar o envio das mensagens "
+"restantes?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10563,16 +10427,17 @@ msgstr "&Interromper Envio"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Envio interrompido:\n"
 "%1\n"
-"A mensagem ficará na pasta 'caixa de saída' até que o problema seja corrigido "
-"(por exemplo, endereço errado) ou a mensagem seja removida da pasta   'caixa de "
-"saída'.\n"
+"A mensagem ficará na pasta 'caixa de saída' até que o problema seja "
+"corrigido (por exemplo, endereço errado) ou a mensagem seja removida da "
+"pasta   'caixa de saída'.\n"
 "O seguinte protocolo de transporte foi usado:\n"
 "%2"
 
@@ -10592,9 +10457,9 @@ msgid ""
 msgstr ""
 "Envio interrompido:\n"
 "%1\n"
-"A mensagem ficará na pasta 'caixa de saída' até que o problema seja corrigido "
-"(por exemplo, endereço errado) ou a mensagem seja removida da pasta  'caixa de "
-"saída'.\n"
+"A mensagem ficará na pasta 'caixa de saída' até que o problema seja "
+"corrigido (por exemplo, endereço errado) ou a mensagem seja removida da "
+"pasta  'caixa de saída'.\n"
 "O seguinte protocolo de transporte foi usado:\n"
 "%2"
 
@@ -10610,48 +10475,49 @@ msgstr "O Sendmail finalizou de modo anormal."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Você necessita informar um nome de usuário e uma senha para usar este servidor "
-"SMTP."
+"Você necessita informar um nome de usuário e uma senha para usar este "
+"servidor SMTP."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 parece já estar rodando em outra tela desta máquina. Ao executar %2 mais de "
-"uma vez, poderá ocorrer perda de mensagens. Você não deve iniciar  %1 a menos "
-"que você tenha certeza de que ele já não esteja sendo executado."
+"%1 parece já estar rodando em outra tela desta máquina. Ao executar %2 mais "
+"de uma vez, poderá ocorrer perda de mensagens. Você não deve iniciar  %1 a "
+"menos que você tenha certeza de que ele já não esteja sendo executado."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 parece já estar rodando em outra tela desta máquina. Ao executar %1 e %2 ao "
-"mesmo tempo, poderá ocorrer perda de mensagens. Você não deve iniciar  %2 a "
-"menos que você tenha certeza de que %1 já não esteja sendo executado."
+"%1 parece já estar rodando em outra tela desta máquina. Ao executar %1 e %2 "
+"ao mesmo tempo, poderá ocorrer perda de mensagens. Você não deve iniciar  %2 "
+"a menos que você tenha certeza de que %1 já não esteja sendo executado."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 parece já estar rodando em %2. Ao executar %1 mais de uma vez, poderá "
-"ocorrer perda de mensagens. Você não deve iniciar  %1 neste computador a menos "
-"que você tenha certeza de que já não esteja sendo executado em %2."
+"ocorrer perda de mensagens. Você não deve iniciar  %1 neste computador a "
+"menos que você tenha certeza de que já não esteja sendo executado em %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 parece já estar rodando em %3. Ao executar %1 e %2 mais de uma vez, poderá "
-"ocorrer perda de mensagens. Você não deve iniciar  %2 neste computador a menos "
-"que você tenha certeza de que %1 não esteja sendo executado em %3."
+"%1 parece já estar rodando em %3. Ao executar %1 e %2 mais de uma vez, "
+"poderá ocorrer perda de mensagens. Você não deve iniciar  %2 neste "
+"computador a menos que você tenha certeza de que %1 não esteja sendo "
+"executado em %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10662,6 +10528,10 @@ msgstr "Iniciar %1"
 msgid "Exit"
 msgstr "Sair"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Novas mensagens em"
@@ -10688,16 +10558,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"O TDEWallet não está disponível. É fortemente recomendado utilizar o TDEWallet "
-"para gerenciar suas senhas.\n"
+"O TDEWallet não está disponível. É fortemente recomendado utilizar o "
+"TDEWallet para gerenciar suas senhas.\n"
 "Entretanto, o KMail pode armazenar a senha no seu arquivo de configuração. A "
 "senha é armazenada num formato obscuro, mas não deve ser considerada segura "
-"contra esforços para descriptografá-la se alguém conseguir acesso ao arquivo de "
-"configuração.\n"
+"contra esforços para descriptografá-la se alguém conseguir acesso ao arquivo "
+"de configuração.\n"
 "Você quer armazenar a senha para a conta '%1' no arquivo de configuração?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10767,9 +10638,9 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Um comando que é executado localmente, primeiramente para enviar e-mail. Isto "
-"pode ser usado para configurar túneis SSH, por exemplo. Deixe-o vazio se nenhum "
-"comando deve ser executado."
+"Um comando que é executado localmente, primeiramente para enviar e-mail. "
+"Isto pode ser usado para configurar túneis SSH, por exemplo. Deixe-o vazio "
+"se nenhum comando deve ser executado."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10777,8 +10648,8 @@ msgstr "O Servidor &Necessita de Autenticação"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Marque esta opção se seu servidor SMTP requer autenticação antes de aceitar "
 "e-mails. Isto é conhecido como 'SMTP Autenticado' ou, simplesmente, ASMTP."
@@ -10801,15 +10672,14 @@ msgstr "&Enviar nome de arquivo personalizado ao servidor"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Marque esta opção para fazer com que o KMail use um nome de máquina "
-"personalizado ao identificá-lo no servidor de e-mail. "
-"<p> Isto é útil quando o nome da máquina do seu sistema pode não estar "
-"corretamente ajustado, ou para mascarar o nome verdadeiro de seu sistema."
+"personalizado ao identificá-lo no servidor de e-mail. <p> Isto é útil quando "
+"o nome da máquina do seu sistema pode não estar corretamente ajustado, ou "
+"para mascarar o nome verdadeiro de seu sistema."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10839,11 +10709,11 @@ msgstr "Somente arquivos locais são permitidos."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"O campo Máquina não pode ficar vazio. Por favor, informe o nome do domínio ou "
-"endereço IP do servidor SMTP."
+"O campo Máquina não pode ficar vazio. Por favor, informe o nome do domínio "
+"ou endereço IP do servidor SMTP."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10855,15 +10725,15 @@ msgstr "Erro ao listar a pasta %1:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"Cancelar localmente a inscrição das pastas removerá toda a informação que está "
-"presente localmente nestas pastas. As pastas não serão alteradas no servidor. "
-"Clique agora em Cancelar se você quer ter certeza de qie todas as alterações "
-"foram escritas no servidor ao verificar os e-mails."
+"Cancelar localmente a inscrição das pastas removerá toda a informação que "
+"está presente localmente nestas pastas. As pastas não serão alteradas no "
+"servidor. Clique agora em Cancelar se você quer ter certeza de qie todas as "
+"alterações foram escritas no servidor ao verificar os e-mails."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11084,35 +10954,28 @@ msgstr "&Editar Mensagem"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>A informação retornada pelo Plug-in de criptografia pode não sido processada "
-"corretamente; o plug-in pode estar  danificado</p>"
-"<p>Por favor, contate o administrador do seu sistema.</p></qt>"
+"<qt> <p>A informação retornada pelo Plug-in de criptografia pode não sido "
+"processada corretamente; o plug-in pode estar  danificado</p><p>Por favor, "
+"contate o administrador do seu sistema.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Nenhum plug-in de criptografia ativo foi encontrado, e o  código integrado "
-"ao OpenPGP não foi executado com sucesso</p>"
-"<p>Você pode fazer duas coisas para mudar isto</p>"
-"<ul>"
-"<li>Ativar um plug-in usando o diálogo Configurações -> Configurar KMail -> "
-"Plug-in OU</li>"
-"<li>Especificar as configurações tradicionais do OpenPGP no mesmo diálogo, na "
-"aba Identidade -> Avançado.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Nenhum plug-in de criptografia ativo foi encontrado, e o  código "
+"integrado ao OpenPGP não foi executado com sucesso</p><p>Você pode fazer "
+"duas coisas para mudar isto</p><ul><li>Ativar um plug-in usando o diálogo "
+"Configurações -> Configurar KMail -> Plug-in OU</li><li>Especificar as "
+"configurações tradicionais do OpenPGP no mesmo diálogo, na aba Identidade -> "
+"Avançado.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11124,8 +10987,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Backend Chiasmus não oferece a função \"x-encrypt\". Por favor, reporte este "
 "erro."
@@ -11135,8 +10998,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"A função \"x-encrypt\" não aceita os parâmetros experados. Por favor, reporte "
-"este erro."
+"A função \"x-encrypt\" não aceita os parâmetros experados. Por favor, "
+"reporte este erro."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11144,16 +11007,16 @@ msgstr "Erro de Criptografia do Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Backend Chiasmus retornou um valor inesperado: A função \"x-encrypt\" não "
 "retornou um array de byte. Por favor, reporte este erro."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "O formato de criptografia integrado do OpenPGP não suporta a criptografia e "
@@ -11178,8 +11041,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"O exame das preferências de assinatura do destinatário retornou que você deve "
-"ser perguntado se deseja ou não assinar a mensagem.\n"
+"O exame das preferências de assinatura do destinatário retornou que você "
+"deve ser perguntado se deseja ou não assinar a mensagem.\n"
 "Assinar esta mensagem?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11209,8 +11072,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Você pediu para assinar esta mensagem, mas nenhuma chave válida de assinatura "
-"foi configurada para esta identidade."
+"Você pediu para assinar esta mensagem, mas nenhuma chave válida de "
+"assinatura foi configurada para esta identidade."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11268,12 +11131,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"O exame das preferências de criptografia do destinatário retornou que você deve "
-"ser perguntado se deseja ou não criptografar esta mensagem.\n"
+"O exame das preferências de criptografia do destinatário retornou que você "
+"deve ser perguntado se deseja ou não criptografar esta mensagem.\n"
 "Criptografar esta mensagem?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11306,12 +11169,13 @@ msgstr "&Não criptografar"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Você requisitou a criptografia desta mensagem, além de criptografar uma cópia "
-"para você mesmo,  mas não existem chaves válidas e confiáveis configuradas para "
-"esta identidade."
+"Você requisitou a criptografia desta mensagem, além de criptografar uma "
+"cópia para você mesmo,  mas não existem chaves válidas e confiáveis "
+"configuradas para esta identidade."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11320,13 +11184,13 @@ msgstr "Enviar Não Criptografada?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Algumas partes desta mensagem não serão criptografadas.\n"
-"O envio de mensagens parcialmente criptografadas pode violar a política do site "
-"e/ou perder informações importantes.\n"
+"O envio de mensagens parcialmente criptografadas pode violar a política do "
+"site e/ou perder informações importantes.\n"
 "Criptografar mesmo assim todas as partes?"
 
 #: messagecomposer.cpp:950
@@ -11337,8 +11201,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Esta mensagem não será criptografada.\n"
-"O envio de mensagens parcialmente criptografadas pode violar a política do site "
-"e/ou perder informações importantes.\n"
+"O envio de mensagens parcialmente criptografadas pode violar a política do "
+"site e/ou perder informações importantes.\n"
 "Criptografar mensagens mesmo assim?"
 
 #: messagecomposer.cpp:955
@@ -11349,92 +11213,87 @@ msgstr "Criptografar &todos os componentes"
 msgid "Unencrypted Message Warning"
 msgstr "Aviso de Mensagem Não Criptografada"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Erro: a infra-estrutura não retornou nenhum  dado codificado.</p>"
-"<p>Por favor, reporte este erro: "
-"<br>%2</p></qt>"
+"<qt> <p>Erro: a infra-estrutura não retornou nenhum  dado codificado.</"
+"p><p>Por favor, reporte este erro: <br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Nem todos os caracteres cabem na codificação escolhida."
-"<br>"
-"<br>Mandar a mensagem assim mesmo ? </qt>"
+"<qt>Nem todos os caracteres cabem na codificação escolhida.<br><br>Mandar a "
+"mensagem assim mesmo ? </qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Alguns Caracteres Serão Perdidos"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Caracteres de Citação"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Modificar Codificação"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Esta mensagem não pode ser assinada, visto que a infra-estrutura escolhida não "
-"parece suportar assinatura; isto na verdade não deveria ter acontecido, e "
-"portanto relate este erro."
+"Esta mensagem não pode ser assinada, visto que a infra-estrutura escolhida "
+"não parece suportar assinatura; isto na verdade não deveria ter acontecido, "
+"e portanto relate este erro."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Esta mensagem não pode ser assinada, visto que a infra-estrutura escolhida não "
-"parece suportar assinatura; isto na verdade não deveria ter acontecido, e "
-"portanto relate este erro."
+"Esta mensagem não pode ser assinada, visto que a infra-estrutura escolhida "
+"não parece suportar assinatura; isto na verdade não deveria ter acontecido, "
+"e portanto relate este erro."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"A operação de assinatura falhou. Por favor, verifique se o programa gpg-agent "
-"está em execução."
+"A operação de assinatura falhou. Por favor, verifique se o programa gpg-"
+"agent está em execução."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Esta mensagem não pode ser criptografada, visto que a infra-estrutura escolhida "
-"não parece suportar criptografia; isto na verdade não deveria ter acontecido, e "
-"portanto relate este erro."
+"Esta mensagem não pode ser criptografada, visto que a infra-estrutura "
+"escolhida não parece suportar criptografia; isto na verdade não deveria ter "
+"acontecido, e portanto relate este erro."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Esta mensagem não pode ser assinada e criptografada, visto que a "
-"infra-estrutura escolhida não parece suportar assinatura combinada com a "
+"Esta mensagem não pode ser assinada e criptografada, visto que a infra-"
+"estrutura escolhida não parece suportar assinatura combinada com a "
 "criptografia; isto na verdade não deveria ter acontecido, e portanto relate "
 "este erro."
 
@@ -11457,15 +11316,15 @@ msgstr "&Formato da caixa de correio:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Selecione se você quer armazenar as mensagens nesta pasta como um arquivo por "
-"mensagem (maildir) ou como um arquivo grande, com todas as mensagens (mbox). O "
-"KMail usa maildir por padrão, e isto só precisa ser mudado em raras "
-"circunstâncias. Se você não tem certeza, deixe esta opção como está."
+"Selecione se você quer armazenar as mensagens nesta pasta como um arquivo "
+"por mensagem (maildir) ou como um arquivo grande, com todas as mensagens "
+"(mbox). O KMail usa maildir por padrão, e isto só precisa ser mudado em "
+"raras circunstâncias. Se você não tem certeza, deixe esta opção como está."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11474,12 +11333,12 @@ msgstr "Pasta &contém:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Selecione se você quer que a nova pasta seja usada para armazenamento de e-mail "
-"ou para armazenamento de ítens de groupware, como tarefas ou notas. O padrão é "
-"e-mail. Se você não tem certeza, deixe esta opção como está."
+"Selecione se você quer que a nova pasta seja usada para armazenamento de e-"
+"mail ou para armazenamento de ítens de groupware, como tarefas ou notas. O "
+"padrão é e-mail. Se você não tem certeza, deixe esta opção como está."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11517,8 +11376,7 @@ msgstr "Resultados diferentes para as assinaturas"
 msgid "The crypto engine returned no cleartext data."
 msgstr "O mecanismo de criptografia retornou dados sem texto puro."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Estado:"
 
@@ -11548,11 +11406,11 @@ msgstr "Nenhum plug-in %1 foi encontrado."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"A mensagem está assinada, mas a validade da assinatura não pode ser verificada. "
-"<br />Razão: %1"
+"A mensagem está assinada, mas a validade da assinatura não pode ser "
+"verificada. <br />Razão: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11589,27 +11447,28 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Note:</b> Esta mensagem HTML pode ter referências externas a imagens, etc. "
-"Por razões de segurança/privacidade, as referências externas não estão "
-"carregadas. Se você confia no remetente desta mensagem, você pode carregar as "
-"referências externas da mensagem <a href=\"kmail:loadExternal\">"
-"clicando aqui</a>."
+"<b>Note:</b> Esta mensagem HTML pode ter referências externas a imagens, "
+"etc. Por razões de segurança/privacidade, as referências externas não estão "
+"carregadas. Se você confia no remetente desta mensagem, você pode carregar "
+"as referências externas da mensagem <a href=\"kmail:loadExternal\">clicando "
+"aqui</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Nota:</b>Esta é uma mensagem HTML. Por razões de segurança, somente o código "
-"HTML bruto é mostrado. Se você confia no destinatário desta mensagem, então "
-"pode ativar a exibição em HTML, clicando <a href=\"kmail:showHTML\"> aqui</a>."
+"<b>Nota:</b>Esta é uma mensagem HTML. Por razões de segurança, somente o "
+"código HTML bruto é mostrado. Se você confia no destinatário desta mensagem, "
+"então pode ativar a exibição em HTML, clicando <a href=\"kmail:showHTML\"> "
+"aqui</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11854,8 +11713,8 @@ msgstr "Aviso:"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"O endereço de e-mail do remetente, usado para assinatura,  não está armazenado "
-"em %1."
+"O endereço de e-mail do remetente, usado para assinatura,  não está "
+"armazenado em %1."
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11867,11 +11726,11 @@ msgstr "armazenado:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Nenhum e-mail, usado para assinatura,  é armazenado em %1; assim, não pode-se "
-"compará-lo ao endereço de remetente %2."
+"Nenhum e-mail, usado para assinatura,  é armazenado em %1; assim, não pode-"
+"se compará-lo ao endereço de remetente %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11986,10 +11845,11 @@ msgstr "Mensagem de erro de protocolo TDEIO"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Seu servidor POP3 (Conta: %1) não suporta o comando UIDL: este comando é "
 "necessário para se determinar, de maneira confiável, quais mensagens no "
@@ -12015,7 +11875,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Buscando mensagem %1 de %2 (%3 de %4 KB) de %5@%6 (%7KB permanecem no "
 "servidor)."
@@ -12034,1901 +11895,15 @@ msgstr "Resposta inválida do servidor"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "O servidor não suporta o comando TOP. Assim, não será possível buscar os "
 "cabeçalhos de e-mails grandes antes de baixar as mensagens."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Ir"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Pasta"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mensagem"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Responder Especial"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Reenviar"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Barra de Ferramentas HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Assinatura"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automaticamente assina men&sagens"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Quando esta opção estiver habilitada, todas as mensagens que você enviar serão "
-"assinadas, por padrão. Ainda é possível, é claro desabilitar a assinatura para "
-"cada mensagem  individualmente."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Criptografia"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Quando esta opção estiver habilitada, as mensagens/arquivos não serão somente "
-"criptografadas com a chave pública do destinatário, mas também com sua chave. "
-"Isto habilitará a decriptografia do arquivo/mensagem mais tarde, e isto é em "
-"geral uma boa idéia."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Mostrar texto assinado/criptografado após &escrever"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Quando esta opção estiver habilitada, o texto assinado/criptografado será "
-"mostrado em uma janela separada, para que você saiba como ele se parecerá, "
-"antes de enviá-lo. Esta é uma boa idéia quando você estiver verificando que se "
-"o seu sistema de criptografia funciona."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Armazenar mensagens enviadas &criptografadas"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Marque para armazenar mensagens criptografadas"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Armazenar Mensagens Criptografadas</h1>\n"
-"Quando esta caixa está marcada, as mensagens são armazenadas criptografadas, na "
-"mesma forma em que foram enviadas. Isto não é recomendado, pois você não será "
-"conseguirá ler as mensagens se um certificado necessário expirar.\n"
-"<p>\n"
-"No entanto, pode existir regras locais que requeiram que você habilite esta "
-"opção. Na dúvida, verifique com o seu administrador local. \n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Sempre mostrar as chaves de criptografia para &aprovação"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Quando estiver habilitada, o aplicativo mostrará sempre a você uma lista das "
-"chaves públicas, que você pode escolher qual usar para criptografia. Se isto "
-"estiver desabilitado, o aplicativo mostrará somente o diálogo, se ele não puder "
-"achar a chave correta, ou se existirem várias que poderão ser usadas."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "&Criptografar automaticamente mensagens se possível"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Quando esta opção estiver habilitada, cada mensagem que você enviar será "
-"criptografada, se a criptografia for desejada e possível. É possível ainda, é "
-"claro, desabilitar a criptografia automática para cada mensagem "
-"individualmente."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nunca criptografar ao salvar como &rascunho"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Como isto funciona?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Para: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universal"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Responder"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Responder Para Todos"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Encaminhar"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Atal&ho:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Tipo de Modelo:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Propriedades da Pasta"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Pasta contém uma lista de discussão"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Endereço da Lista:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Normal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Não lida:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Mensagem Expirando"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "E&xpirar após:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Expirar mensagens &lidas"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Expirar &após:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Expirar mensagens &não-lidas"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dia(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Semana(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mês(es)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avançado"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Identidade do Remetente:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Formato de Armazenamento:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listar Exibições:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validar certificados usando CRLs"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Quando esta opção estiver habilitada, os certificados S/MIME serão validados "
-"usando as Listas de Revogação de Certificados, ou CRLs.cada mensagem que você "
-"enviar será criptografada, se a criptografia for desejada e possível. "
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Validar certificados on-line (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Se esta opção estiver marcada, os certificados S/MIME serão validados on-line, "
-"usando o Protocolo de Status de Certificados On-line (OCSP). Preencha a URL do "
-"consultor OCSP abaixo."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Validação do Certificado On-line"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL do Consultor OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Digite aqui o endereço do servidor para a validação on-line de certificados "
-"(consultor OCSP). A URL geralmente se inicia com um http://"
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Assinatura do consultor OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorar URL de Serviço de certificados"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Não verificar políticas do certificado"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Por padrão, o GnuPG usa o arquivo ~/.gnupg/policies.txt para verificar se uma "
-"política de certificado é de permissão. Se esta opção estiver selecionada, as "
-"políticas não serão verificadas."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nunca consultar uma CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Se esta opção estiver marcada, as Listas de Revogação de Certificados nunca "
-"serão usadas para validar certificados S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Buscar certificados faltantes do emissor"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Se esta opção estiver marcada, os certificados faltantes do emissor serão "
-"buscados quando necessário (isto se aplica para os métodos de validação por "
-"CRLs e OCSP)."
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Requisições HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Não realizar nenhuma requisição HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Desativar totalmente o uso de HTTP para S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Usar este proxy para requisições HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Usar proxy HTTP do sistema:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Se esta opção for selecionada, o proxy HTTP mostrado à direita (que vem da "
-"variável de ambiente http_proxy) será usado para qualquer requisição HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Digite aqui a localização do seu proxy HTTP, que será usado para todas as "
-"requisições HTTP relacionadas a S/MIME. A sintaxe é \"host:porta\", por "
-"exemplo: meuproxy.lugarnenhum.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorar Ponto de Distribuição HTTP CRL dos certificados"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Quando procurando a localização de um CRL, o certificado a ser testado "
-"geralmente contém elementos geralmente conhecidos como \"Ponto de Distribuição "
-"CRL\" (\"CRL Distribution Point\", ou DP), que são URLs descrevendo como a CRL "
-"pode ser acessada. O primeiro elemento DP encontrado é usado. Com esta opção, "
-"todos os elementos utilizando o esquema HTTP serão ignorados quando se estiver "
-"procurando por um DP adequado."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Requisições LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Não realizar nenhuma requisição LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Desativar totalmente o uso de LDAP para S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorar Pontos de Distribuição CRL que usem LDAP, nos certificados"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Quando procurando a localização de um CRL, o certificado a ser testado "
-"geralmente contém elementos geralmente conhecidos como \"Ponto de Distribuição "
-"CRL\" (\"CRL Distribution Point\", ou DP), que são URLs descrevendo como a CRL "
-"pode ser acessada. O primeiro elemento DP encontrado é usado. Com esta opção, "
-"todos os elementos utilizando o esquema LDAP serão ignorados quando se estiver "
-"procurando por um DP adequado."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Host primário para requisições LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Colocando um servidor LDAP aqui vai fazer com que todas as requisições vão para "
-"este servidor primeiro. Mais precisamente, esta configuração sobrepõe qualquer "
-"host e porta especificados em uma URL LDAP e também será usado se o host e a "
-"porta forem omitidos na URL. Outros servidores LDAP serão utilizados apenas se "
-"a conexão para este \"proxy\" falhar.\n"
-"A sintaxe é \"HOST\" ou \"HOST:PORTA\". Se a porta for omitida, a porta 389 "
-"(porta padrão do LDAP) será usada."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Adicionar..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Groupware"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Redefinir Configurações de Fonte"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "sem limite"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Responder para o Remetente"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Responder para Todos / Responder para a Lista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Encaminhar Mensagem"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "A&visar ao tentar enviar mensagens não-assinadas"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Marque isto para ser avisado ao enviar mensagens não-assinadas."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar ao Tentar Enviar Mensagens Não-Assinadas</h1>\n"
-"Se esta caixa estiver marcada, você será avisado ao tentar enviar partes de ou "
-"a mensagem inteira não-assinada.\n"
-"<p>\n"
-"É recomendado deixar esta opção ligada para melhor integridade.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Avisar ao tentar enviar mensagens não-criptografadas"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Marque isto para ser avisado ao enviar mensagens não-criptografadas."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar Ao Tentar Enviar Mensagens Não-criptografadas</h1>\n"
-"Se esta caixa estiver marcada, você será avisado quando tentar enviar partes de "
-"ou a mensagem inteira não-criptografada.\n"
-"<p>\n"
-"É recomendado deixar esta opção ligada, para maior integridade.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"Avisar Se o Endereço de E-mail do &Destinatário Não Estiver no Certificado"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Marque isto para ser avisado se o endereço não estiver no certificado"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se o Endereço de E-mail do Destinatário Não Estiver no "
-"Certificado</h1>\n"
-"Se esta opção estiver marcada, um aviso é emitido se o endereço de e-mail do "
-"destinatário não estiver contido no certificado usado para criptografia.\n"
-"<p>\n"
-"É recomendado deixar esta opção ligada, para maior segurança.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Avisa se os certificados/chaves expirarem logo (configure os limites abaixo)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Para Assinatura"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Para criptografia"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dias"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Selecione o número de dias aqui"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar Se o Certificado de Assinatura Expira</h1>\n"
-"Selecione o número mínimo de dias em que o certificado de assinatura deve ser "
-"válido, sem emitir um aviso.\n"
-"<p>\n"
-"A configuração SPHINX recomendada é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se um Certificado De Criptografia Expira</h1>\n"
-"Selecione o número mínimo de dias em que o certificado de criptografia deve ser "
-"válido, sem emitir um aviso.\n"
-"<p>\n"
-"A configuração SPHINX recomendada é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar se Um Certificado na Cadeia Expirar</h1>\n"
-"Selecione o número mínimo de dias em que todos os certificados na cadeia devem "
-"estar válidos sem emitir um aviso.\n"
-"<p>\n"
-"A configuração SPHINX recomendada é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Avisar Se um Certificado de AC Expirar</h1>\n"
-"Selecione o número mínimo de dias em que um certificado de AC deve ser válido "
-"sem emitir um aviso.\n"
-"<p>\n"
-"A configuração SPHINX recomendada é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Visar se um Certificado Raiz Expirar</h1>\n"
-"Selecione o número de dias em que o certificado raiz deve ser válido sem emitir "
-"um aviso.\n"
-"<p>\n"
-"A configuração SPHINX recomendada é de 14 dias.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Para certificados raiz:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Para certificados de AC de intermediários:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Para certificados/chaves do usuário final:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Reabilitar Todos os Alertas do tipo \"Não perguntar novamente\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Conteúdos do modelo"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Atalho do modelo"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Tipo de modelo"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Enviar e-mails da fila na verificação de e-mails"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p>Selecione se você deseja que o KMail envie todas as mensagens de sua caixa "
-"de saída durante todas as verificações por e-mails automáticas ou manuais, ou "
-"se você não quer que as mensagens sejam enviadas automaticamente, de nenhuma "
-"maneira.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Mover automaticamente as mensagens não sincronizadas de pastas com permissões "
-"de acesso insuficientes"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Se há novas mensagens em uma pasta, que não foram enviadas ao servidor ainda, "
-"mas você não tem as permissões necessárias na pasta para enviá-las, estas "
-"mensagens serão movidas automaticamente para uma pasta de achados e perdidos."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Esta configuração permite que os administradores configurem um atraso mínimo "
-"entre duas verificações de e-mails.\"\n"
-"           \"O usuário não poderá escolher um valor menor do que o valor "
-"configurado aqui."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"As pastas selecionadas mais recentemente, no diálogo de seleção de pastas."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Ignorar a configuração de umask dos usuários e utilizar no lugar "
-"\"leitura-escrita apenas para o usuário\" "
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Política para exibição do ícone do painel do sistema"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Detalhar notificação de e-mail novo"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Se esta opção estiver habilitada, então para cada pasta, o número de mensagens "
-"novas que chegarem é mostrado na notificação de e-mail novo; caso contrário, "
-"você obterá somente mensagens simples do tipo 'Chegou um novo e-mail'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "E&specificar editor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Uso editor externo ao invés do padrão"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Habilitar funcionalidade do groupware"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Modo Legado. Cabeçalhos De:/Para: em respostas para respostas"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"O Microsoft Outlook possui um número de faltas em sua implementação do "
-"iCalendar padrão; esta opção é uma alternativa. Se você tem problemas com os "
-"usuários do Outlook, por eles não serem capazes de ver suas respostas, tente "
-"configurar esta opção."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Enviar convites do groupware no corpo do e-mail"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"O Microsoft Outlook possui um número de faltas em sua implementação do "
-"iCalendar padrão; esta opção é uma alternativa. Se você tem problemas com os "
-"usuários do Outlook, por eles não serem capazes de ver seus convites, tente "
-"configurar esta opção."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Trocar nomeação de convite compatível"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"O Microsoft Outlook, quando usado junto com um servidor Microsoft Exchange, tem "
-"um problema para entender e-mail de groupware que seguem alguns padrões. "
-"Habilite esta opção para enviar convites groupware de forma que o Microsoft "
-"Exchange possa entender."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Quando esta opção estiver marcada, você não vai ver a janela do compositor de "
-"mensagens, e todos os e-mails de convite serão enviados automaticamente. Se "
-"você quer ver a mensagem antes de enviá-la, você pode desmarcar esta opção. "
-"Entretanto, esteja ciente de que o texto na janela do compositor está na "
-"sintaxe do iCalendar, e você não deve tentar modificá-lo manualmente."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Habilitar isto faz com que seja possível armazenar as entradas dos "
-"aplicativos do Kontact (KOrganizer, KAddressBook e KNotes).</p>"
-"<p>Se você deseja definir esta opção, deve também configurar os aplicativos "
-"para usar a fonte de dados  IMAP; isto pode ser feito pelo Centro de Controle "
-"do TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Geralmente, você não terá razões para ver as pastas que contéma fonte de "
-"dados IMAP. Mas, se você precisar visualizá-las, você pode configurar isto "
-"aqui.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Se a conta é usada para armazenar informações de groupware \"\n"
-"          \"não está sendo usada para gerenciar mensagens normais, habilite "
-"esta opção para fazer o KMail exibir \"\n"
-"          \"apenas as pastas de groupware. Isto é útil caso você esteja lidando "
-"com mensagens\"\n"
-"          \"nomais através de uma conta IMAP online adicional.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Escolha o formato de armazenamento das pastas de groupware. "
-"<ul> "
-"<li>O formato padrão usa os padrões iCal (para pastas de calendário) e vCard "
-"(para pastas de livro de endereços). Este formato torna todos os recursos do "
-"Kontact disponíveis.</li>"
-"<li>O formato XML do Kolab usa um modelo especial que é mais parecido com o "
-"utilizado no Outlook. Este formato fornece melhor compatibilidade com o "
-"Outlook, quando utilizando um servidor Kolab ou alguma solução compatível.</li>"
-"</ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Isto escolhe o pai das pastas de fonte de dados IMAP.</p> "
-"Por padrão, o servidor Kolab configura a caixa de entrada IMAP para ser o pai."
-"<p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Este é o ID da conta que contém as pastas da fonte de dados IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Se você quiser configurar os nomes das pastas do armazenamento IMAP para o "
-"seu idioma local, você pode escolher entre estes idiomas disponíveis.</p> "
-"<p>Note que a única razão para fazer isto é para a compatibilidade com o "
-"Microsoft Outlook. Geralmente é uma má idéia configurar isto, pois torna a "
-"modificação de idiomas impossível.</p> "
-"<p>Assim,  não habilite isto, a menos que necessário.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Este valor é usado para decidir se a introdução do KMail deve ser exibida."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Número máximo de conexões por máquina"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Isto pode ser usado para restringir o número de conexões por máquina, ao "
-"verificar novos e-mails. Por padrão, este número é ilimitado (zero)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Mostrar edição de linha da procura rápida"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Esta opção habilita ou desabilita a linha de procura acima da lista de "
-"mensagens, que pode ser usada para procurar rapidamente por informações "
-"mostradas na lista."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Manter o conjunto de caracteres original quando respondendo ou encaminhando, se "
-"possível"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Adicionar assinatura &automaticamente"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Lembrar desta identidade, para que ela também seja utilizada em futuras janelas "
-"do compositor de e-mails.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Lembrar desta pasta para os itens enviados, e assim, ela será usada nas janelas "
-"futuras do compositor."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Lembrar deste transporte de e-mail, e assim, ele será usado nas janelas futuras "
-"do compositor."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Lembrar desta identidade, para que ela também seja utilizada em futuras janelas "
-"do compositor de e-mails.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Quebrar linha na coluna:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Avisar se o &certificado raiz expira em menos de:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Habilite esta opção para fazer com que o Outlook&#8482; compreenda os nomes de "
-"anexos que contenham caracteres que não são do inglês"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Requisitar automaticamente notificações de recebimento de &mensagens"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Habilite esta opção se você quiser fazer com que o KMail solicite "
-"Notificações de Recebimento de Mensagens (\"Message Disposition Notifications\" "
-"ou MDNs) para cada mensagem enviada sua.</p> "
-"<p> Esta opção apenas muda o comportamento padrão; você ainda pode ativar ou "
-"desativar solicitações de MDN para cada mensagem no compositor de mensagens, no "
-"item <em>Opções</em>-><em>Solicitar Notificação de Recebimento</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Autocompletar com endereços recentes"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Desabilite esta opção caso você não queira que os endereços utilizados "
-"recentemente apareçam como opção de autocomplemento nos campos de endereços do "
-"compositor de mensagem."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Intervalo de salvamento automático:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Uma cópia de segurança do texto da janela do compositor pode ser criada "
-"regularmente.O intervalo usado para criar cópias de segurança é configurado "
-"aqui. Você pode desabilitar isto configurando o valor para zero."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "&Substituir prefixo reconhecido com \"Re\":"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Substitui&r prefixo reconhecido com \"Fwd\":"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Use citações inteligentes"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "A assinatura expirou."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tipo de seletor de endereços"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Define o tipo do diálogo de seleção de destinatários para os campos 'Para', "
-"'CC' e 'Bcc'."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Tipo de editor de destinatários"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Define o tipo do editor de destinatários para editar os campos 'Para', 'Cc' e "
-"'Bcc'."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Número máximo de linhas do editor de destinatários."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Manter o conjunto de caracteres original quando respondendo ou encaminhando, se "
-"possível"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Alguns e-mails, principalmente os gerados automaticamente, não especificam a "
-"codificação de caracteres que deve ser utilizada para mostrá-los. Nestes casos "
-"uma codificação de fallback, que você pode definir aqui, será usada. Defina-a "
-"para a codificação de caracteres mais comumente usada na sua região. Por "
-"padrão, a codificação configurada para o sistema todo é usada."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Mudar esta opção para diferente da opção padrão, 'Auto', vai forçar o uso da "
-"codificação especificada para todas as mensagens, independentemente do que "
-"estiver especificado dentro da própria mensagem."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Habilite esta opção se você quiser que simleys como :-) aparecendo no texto da "
-"mensagem sejam substituídos por emoticons (pequenas imagens)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Habilite esta opção para exibir níveis diferentes de citações. Desabilite para "
-"ocultar os níveis de citações."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Nível de Encolher Automático:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reduzir o tamanho da fonte em citações"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Habilite esta opção para exibir uma citação com uma fonte menor."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Armazenar mensagens enviadas &criptografadas"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Mostrar agente de usuário nos cabeçalhos bonitos"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Habilite esta opção para exibir as linhas User-Agent e X-Mailer nos cabeçalhos "
-"bonitos."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-"Enviar Notificações de Recebimento de Mensagem com um remetente em branco."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Enviar Notificações de Recebimento de Mensagem com a string de remetente vazio. "
-"Alguns servidores podem estar configurados para rejeitarem estas mensagens, "
-"portanto caso você esteja enfrentando problemas ao enviar MDNs, desmarque esta "
-"opção."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Frases foram convertidas para os modelos"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Frases antigas foram convertidas para os modelos"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Modelo de mensagem para mensagem nova"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Modelo para responder"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Modelo para responder para todos"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Modelo de mensagem para encaminhar"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Caracteres de citação"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 de %2 %3 utilizados"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14038,6 +12013,11 @@ msgstr "Adicionar como CC"
 msgid "Add as BCC"
 msgstr "Adicionar como BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "C&ancelar"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14053,15 +12033,15 @@ msgstr "Destinatários Selecionados"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Você selecionou um destinatário. O número máximo suportado de destinatários é "
-"%1. Por favor, adapte a seleção.\n"
-"Você selecionou %n destinatários. O número máximo suportado de destinatários é "
-"%1. Por favor, adapte a seleção."
+"Você selecionou um destinatário. O número máximo suportado de destinatários "
+"é %1. Por favor, adapte a seleção.\n"
+"Você selecionou %n destinatários. O número máximo suportado de destinatários "
+"é %1. Por favor, adapte a seleção."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -14077,11 +12057,11 @@ msgstr "Usar o Diálogo de Seleção de Endereço"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Este botão abre um diálogo separado onde você pode selecionar destinatários a "
-"partir dos endereços disponíveis."
+"Este botão abre um diálogo separado onde você pode selecionar destinatários "
+"a partir dos endereços disponíveis."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14183,10 +12163,19 @@ msgstr "é maior que ou igual a"
 msgid " bytes"
 msgstr " bytes"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dias"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Para executar a sua busca, todas as mensagens da pasta %1 precisarão ser "
 "baixadas do servidor. Isto pode levar algum tempo. Você quer continuar a sua "
@@ -14338,16 +12327,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Coletando informações para a conta '%1 ...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Coletando informações para a conta '%1 ...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14366,10 +12351,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Conteúdo do script '%1' :\n"
+msgid "Contents of script '%1':\n"
+msgstr "Conteúdo do script '%1' :\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14392,20 +12375,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Capacidades do Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Capacidades do Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Capacidades especiais não estão disponíveis)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Scripts Sieve disponíveis:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Scripts Sieve disponíveis:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14448,8 +12427,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Marque esta caixa se você desejar que o KMail anexe uma assinatura aos e-mails "
-"escritos por esta identidade."
+"Marque esta caixa se você desejar que o KMail anexe uma assinatura aos e-"
+"mails escritos por esta identidade."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14484,11 +12463,11 @@ msgstr "Use este campo para digitar uma assinatura estática arbitrária."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Use este para especificar um arquivo de texto que contenha sua assinatura. Ele "
-"será lido cada vez que você criar um novo e-mail, ou anexar uma nova "
+"Use este para especificar um arquivo de texto que contenha sua assinatura. "
+"Ele será lido cada vez que você criar um novo e-mail, ou anexar uma nova "
 "assinatura."
 
 #: signatureconfigurator.cpp:126
@@ -14505,22 +12484,27 @@ msgstr "Abre o arquivo especificado em um editor de textos."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Você pode adicionar um comando arbitrário aqui, com ou sem o caminho, "
-"dependendo se o comando estiver ou não em seu caminho (PATH). Para cada e-mail "
-"novo, o KMail executará o comando, e usará a saída mostrada (na saída padrão) "
-"como assinatura (geralmente um texto ou frase genérica). Os comandos usuais "
-"para este mecanismo são o \"fortune\" ou \"ksig -random\"."
+"dependendo se o comando estiver ou não em seu caminho (PATH). Para cada e-"
+"mail novo, o KMail executará o comando, e usará a saída mostrada (na saída "
+"padrão) como assinatura (geralmente um texto ou frase genérica). Os comandos "
+"usuais para este mecanismo são o \"fortune\" ou \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Especificar &comando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Caminho"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nova entrada:"
@@ -14558,6 +12542,11 @@ msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 "<qt>Você realmente quer remover a identidade denominada <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Aplicar &para: "
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14572,6 +12561,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Editar Script..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14611,9 +12604,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14650,6 +12643,16 @@ msgstr "Não Habilitar"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Não é possível inserir conteúdo de um arquivo %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Para: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14679,59 +12682,51 @@ msgstr "Não foi possível iniciar o comando pipe do modelo: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui você pode criar modelos de mensagem para usar quando você compor ou "
-"responder mensagens, ou quando você encaminhar mensagens.</p>"
-"<p>Os modelos de mensagem possuem suporte à substituição de comandos enquanto "
-"os comandos são digitados ou selecionando uma das opções no menu <i>"
-"Inserir comando</i>.</p>"
-"<p>Os modelos especificados aqui são específicos para pastas. Eles sobrescrevem "
-"os modelos globais e modelos por identidade caso sejam especificados.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aqui você pode criar modelos de mensagem para usar quando você compor "
+"ou responder mensagens, ou quando você encaminhar mensagens.</p><p>Os "
+"modelos de mensagem possuem suporte à substituição de comandos enquanto os "
+"comandos são digitados ou selecionando uma das opções no menu <i>Inserir "
+"comando</i>.</p><p>Os modelos especificados aqui são específicos para "
+"pastas. Eles sobrescrevem os modelos globais e modelos por identidade caso "
+"sejam especificados.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui você pode criar modelos de mensagens para serem utilizados ao compor ou "
-"reponder novas mensagens, ou para encaminhar mensagens.</p>"
-"<p>Os modelos de mensagem suportam a substituição de comandos digitando-os ou "
-"selecionando uma dos opções no menu <i>Inserir comando</i>.</p>"
-"<p>Os modelos especificados aqui são utilizados de acordo com a identidade. "
-"Eles sobrescrevem modelos globais ou por pasta, caso sejam especificados.</p>"
-"</qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aqui você pode criar modelos de mensagens para serem utilizados ao "
+"compor ou reponder novas mensagens, ou para encaminhar mensagens.</p><p>Os "
+"modelos de mensagem suportam a substituição de comandos digitando-os ou "
+"selecionando uma dos opções no menu <i>Inserir comando</i>.</p><p>Os modelos "
+"especificados aqui são utilizados de acordo com a identidade. Eles "
+"sobrescrevem modelos globais ou por pasta, caso sejam especificados.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aqui você pode criar modelos de mensagens para serem utilizados ao compor ou "
-"reponder novas mensagens, ou para encaminhar mensagens.</p>"
-"<p>Os modelos de mensagem suportam a substituição de comandos digitando-os ou "
-"selecionando uma dos opções no menu <i>Inserir comando</i>.</p>"
-"<p>Este é um modelo global (padrão). Eles podem ser sobrescritos por modelos de "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Aqui você pode criar modelos de mensagens para serem utilizados ao "
+"compor ou reponder novas mensagens, ou para encaminhar mensagens.</p><p>Os "
+"modelos de mensagem suportam a substituição de comandos digitando-os ou "
+"selecionando uma dos opções no menu <i>Inserir comando</i>.</p><p>Este é um "
+"modelo global (padrão). Eles podem ser sobrescritos por modelos de "
 "identidade ou modelos por pasta, caso sejam especificados.</p></qt>"
 
 #: templatesconfiguration.cpp:343
@@ -14967,7 +12962,8 @@ msgstr "Inserir Resultado do Comando"
 #: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
-"Fazer Pipe do Corpo da Mensagem Original e Inserir Resultado como Texto Citado"
+"Fazer Pipe do Corpo da Mensagem Original e Inserir Resultado como Texto "
+"Citado"
 
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
@@ -14985,6 +12981,10 @@ msgstr "Fazer Pipe do Corpo da Mensagem Original e Inserir Resultado"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Fazer Pipe do Corpo da Mensagem Original e Substituir com o Resultado"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Definir Posição do Cursor"
@@ -15017,118 +13017,6 @@ msgstr "Habilitar Depuração"
 msgid "Turn Debug Off"
 msgstr "Desabilitar Depuração"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...que você pode ir para a próxima mensagem ou para a anterior, usando\n"
-"as flechas direita e esquerda respectivamente></p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...que você pode criar rapidamente filtros de remetente, destinatário,\n"
-"assunto e listas de discussão em <em>Ferramentas-&gt;Criar&nbsp;Filtro</em>?</p>"
-"\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que você pode livrar-se do &quot;[nome da lista de discussão]&quot;\n"
-"adicionado ao assunto de algumas listas, usando a ação de filtro \n"
-"<em>reescrever cabeçalho</em>? Basta usar\n"
-"<pre>reescrever cabeçalho &quot;Assunto&quot;\n"
-"   e substitua &quot;\\s*\\[nome da lista\\]\\s*&quot;\n"
-"   por &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...que você pode associar listas de discussões com pastas no\n"
-"diálogo <em>Pasta-&gt;Gerenciamento de Listas de Discussão</em>"
-"? Você pode então\n"
-"acessar <em>Mensagem-&gt;Nova&nbsp;Mensagem&nbsp;para a&nbsp;Lista "
-"de&nbsp;Discussão...</em>\n"
-"para abrir o compositor com o endereço da lista de discussão já pré-definido.\n"
-"E como outra alternativa, você também pode clicar com o botão do meio do mouse "
-"na pasta.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...que você pode atribuir ícones personalizados a cada individualmente?\n"
-"Veja em <em>Pasta-&gt;Propriedades...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>... que o KMail pode mostrar uma barra colorida indicando o tipo da "
-"mensagem\n"
-"(Texto puro/HTML/OpenPGP) atualmente exibido?</p>\n"
-"<p>Esta configuração tenta falsificar a verificação de assinatura com sucesso "
-"por\n"
-"um envio de e-mails HTML que imitam quadros com status da assinatura do "
-"KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...que você pode filtrar qualquer cabeçalho simplesmente digitando seu nome\n"
-"no primeiro campo de edição de uma regra de busca?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...que você pode filtrar somente mensagens HTML com a regra \n"
-"<pre>&quot;Tipo de Conteúdo&quot; contém &quot;texto/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...ao responder, somente a parte selecionada da mensagem é citada?</p>\n"
-"<p>Se nada estiver selecionado, a mensagem inteira é citada.</p>\n"
-"<p>Isto funciona até mesmo com texto de anexos, quando você selecionar\n"
-"<em>Ver-&gt;Anexos-&gt;Inseridos</em>.</p>\n"
-"<p>Esta característica está disponível para todos os comandos de resposta, "
-"exceto\n"
-"<em>Mensagem -&gt;Resposta sem Citação</em>.</p>\n"
-"<p align=\"right\"><em>contribuição de David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Não há nada para desfazer."
@@ -15182,8 +13070,8 @@ msgstr "Ocultar todo o texto citado."
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
-"Não foi possível iniciar o gerenciador de certificado. Por favor, verifique sua "
-"instalação."
+"Não foi possível iniciar o gerenciador de certificado. Por favor, verifique "
+"sua instalação."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -15198,6 +13086,16 @@ msgstr "Anexo: #%1 (sem nome)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Um arquivo chamado %1 já existe. Você tem certeza que quer sobrescrevê-lo?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Sobrescrever Arquivo?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15213,8 +13111,8 @@ msgid ""
 msgstr ""
 "Eu estou fora do escritório até %1.\n"
 "\n"
-"Por favor, em casos urgentes entre em contato com Sr(a). <substituto durante as "
-"férias>\n"
+"Por favor, em casos urgentes entre em contato com Sr(a). <substituto durante "
+"as férias>\n"
 "\n"
 "e-mail: <endereço de e-mail do substituto>\n"
 "telefone: 111 1111-1111\n"
@@ -15316,14 +13214,14 @@ msgstr "&Enviar imagem com toda mensagem"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Marce esta caixa se você quer que o KMail adicione o cabeçalho conhecido como "
-"X-Face para as mensagens escritas com esta identidade. Uma X-Face é uma pequena "
-"(48x48 pixels) imagem preto e branco que alguns clientes de e-mail são capazes "
-"de mostrar."
+"Marce esta caixa se você quer que o KMail adicione o cabeçalho conhecido "
+"como X-Face para as mensagens escritas com esta identidade. Uma X-Face é uma "
+"pequena (48x48 pixels) imagem preto e branco que alguns clientes de e-mail "
+"são capazes de mostrar."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15351,13 +13249,13 @@ msgstr "Selecionar Arquivo..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Use esta opção para selecionar um arquivo de imagem a partir do qual a figura "
-"será gerada. A imagem deverá ser de alto contraste e de forma mais ou menos "
-"quadrada. Um fundo claro também melhora o resultado."
+"Use esta opção para selecionar um arquivo de imagem a partir do qual a "
+"figura será gerada. A imagem deverá ser de alto contraste e de forma mais ou "
+"menos quadrada. Um fundo claro também melhora o resultado."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15365,21 +13263,21 @@ msgstr "Definir A Partir do Livro de Endereços"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Você pode usar uma versào reduzida da imagem que você definiu na sua entrada do "
-"livro de endereços."
+"Você pode usar uma versào reduzida da imagem que você definiu na sua entrada "
+"do livro de endereços."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>O KMail pode enviar uma uma imagem pequena (48x48 pixels), de baixa "
-"resolução junto com cada mensagem. Por exemplo, a imagem pode ser uma foto sua "
-"ou um símbolo. Ela é mostrada no cliente de e-mail do destinatário (se "
+"resolução junto com cada mensagem. Por exemplo, a imagem pode ser uma foto "
+"sua ou um símbolo. Ela é mostrada no cliente de e-mail do destinatário (se "
 "suportado)."
 
 #: xfaceconfigurator.cpp:180
@@ -15388,11 +13286,11 @@ msgstr "Use este campo para fornecer uma string X-Face arbitrária."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Há exemplos disponíveis em <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Há exemplos disponíveis em <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15407,129 +13305,1804 @@ msgstr "Sem Imagem"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Você não possui o seu próprio contato definido no livro de endereços."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Assinatura"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automaticamente assina men&sagens"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Quando esta opção estiver habilitada, todas as mensagens que você enviar "
+"serão assinadas, por padrão. Ainda é possível, é claro desabilitar a "
+"assinatura para cada mensagem  individualmente."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Criptografia"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Ajustar o assunto da mensagem"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Quando esta opção estiver habilitada, as mensagens/arquivos não serão "
+"somente criptografadas com a chave pública do destinatário, mas também com "
+"sua chave. Isto habilitará a decriptografia do arquivo/mensagem mais tarde, "
+"e isto é em geral uma boa idéia."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Enviar CC para 'endereço'."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Mostrar texto assinado/criptografado após &escrever"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Enviar BCC para 'endereço'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Quando esta opção estiver habilitada, o texto assinado/criptografado será "
+"mostrado em uma janela separada, para que você saiba como ele se parecerá, "
+"antes de enviá-lo. Esta é uma boa idéia quando você estiver verificando que "
+"se o seu sistema de criptografia funciona."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Adicionar 'cabeçalho' à mensagem"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Armazenar mensagens enviadas &criptografadas"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Lê o corpo da mensagem de 'arquivo'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Marque para armazenar mensagens criptografadas"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Ajusta o corpo da mensagem"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Armazenar Mensagens Criptografadas</h1>\n"
+"Quando esta caixa está marcada, as mensagens são armazenadas criptografadas, "
+"na mesma forma em que foram enviadas. Isto não é recomendado, pois você não "
+"será conseguirá ler as mensagens se um certificado necessário expirar.\n"
+"<p>\n"
+"No entanto, pode existir regras locais que requeiram que você habilite esta "
+"opção. Na dúvida, verifique com o seu administrador local. \n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Adiciona um anexo ao e-mail. Isto pode ser repetido"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Sempre mostrar as chaves de criptografia para &aprovação"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Verifica somente por novos e-mails"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Quando estiver habilitada, o aplicativo mostrará sempre a você uma lista das "
+"chaves públicas, que você pode escolher qual usar para criptografia. Se isto "
+"estiver desabilitado, o aplicativo mostrará somente o diálogo, se ele não "
+"puder achar a chave correta, ou se existirem várias que poderão ser usadas."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Abre somente a janela do compositor"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "&Criptografar automaticamente mensagens se possível"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Visualiza o arquivo de mensagem fornecido"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Quando esta opção estiver habilitada, cada mensagem que você enviar será "
+"criptografada, se a criptografia for desejada e possível. É possível ainda, "
+"é claro, desabilitar a criptografia automática para cada mensagem "
+"individualmente."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Envia mensagem para 'endereço', e anexar o arquivo indicado na 'URL'"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nunca criptografar ao salvar como &rascunho"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lida"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Como isto funciona?"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Antiga"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universal"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Excluída"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Responder"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Respondida"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Responder Para Todos"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Encaminhada"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Encaminhar"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Enfileirada"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Atal&ho:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Enviada"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Tipo de Modelo:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Observada"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Conteúdos do modelo"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorada"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Atalho do modelo"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Tipo de modelo"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Não-spam"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Propriedades da Pasta"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Pendente"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Pasta contém uma lista de discussão"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Possui um Anexo"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Endereço da Lista:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 de %2 %3 utilizados"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Normal:"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Caminho"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Não lida:"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Mensagem Expirando"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "E&xpirar após:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Expirar mensagens &lidas"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Expirar &após:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Expirar mensagens &não-lidas"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dia(s)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Semana(s)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mês(es)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avançado"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Identidade do Remetente:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Formato de Armazenamento:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listar Exibições:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Enviar e-mails da fila na verificação de e-mails"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"Um arquivo chamado %1 já existe. Você tem certeza que quer sobrescrevê-lo?"
+"<qt> <p>Selecione se você deseja que o KMail envie todas as mensagens de sua "
+"caixa de saída durante todas as verificações por e-mails automáticas ou "
+"manuais, ou se você não quer que as mensagens sejam enviadas "
+"automaticamente, de nenhuma maneira.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Sobrescrever Arquivo?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Mover automaticamente as mensagens não sincronizadas de pastas com "
+"permissões de acesso insuficientes"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Se há novas mensagens em uma pasta, que não foram enviadas ao servidor "
+"ainda, mas você não tem as permissões necessárias na pasta para enviá-las, "
+"estas mensagens serão movidas automaticamente para uma pasta de achados e "
+"perdidos."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Esta configuração permite que os administradores configurem um atraso mínimo "
+"entre duas verificações de e-mails.\"\n"
+"           \"O usuário não poderá escolher um valor menor do que o valor "
+"configurado aqui."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"As pastas selecionadas mais recentemente, no diálogo de seleção de pastas."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Ignorar a configuração de umask dos usuários e utilizar no lugar \"leitura-"
+"escrita apenas para o usuário\" "
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Política para exibição do ícone do painel do sistema"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Detalhar notificação de e-mail novo"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Se esta opção estiver habilitada, então para cada pasta, o número de "
+"mensagens novas que chegarem é mostrado na notificação de e-mail novo; caso "
+"contrário, você obterá somente mensagens simples do tipo 'Chegou um novo e-"
+"mail'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "E&specificar editor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Uso editor externo ao invés do padrão"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Habilitar funcionalidade do groupware"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Modo Legado. Cabeçalhos De:/Para: em respostas para respostas"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"O Microsoft Outlook possui um número de faltas em sua implementação do "
+"iCalendar padrão; esta opção é uma alternativa. Se você tem problemas com os "
+"usuários do Outlook, por eles não serem capazes de ver suas respostas, tente "
+"configurar esta opção."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Enviar convites do groupware no corpo do e-mail"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"O Microsoft Outlook possui um número de faltas em sua implementação do "
+"iCalendar padrão; esta opção é uma alternativa. Se você tem problemas com os "
+"usuários do Outlook, por eles não serem capazes de ver seus convites, tente "
+"configurar esta opção."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Trocar nomeação de convite compatível"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"O Microsoft Outlook, quando usado junto com um servidor Microsoft Exchange, "
+"tem um problema para entender e-mail de groupware que seguem alguns padrões. "
+"Habilite esta opção para enviar convites groupware de forma que o Microsoft "
+"Exchange possa entender."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Quando esta opção estiver marcada, você não vai ver a janela do compositor "
+"de mensagens, e todos os e-mails de convite serão enviados automaticamente. "
+"Se você quer ver a mensagem antes de enviá-la, você pode desmarcar esta "
+"opção. Entretanto, esteja ciente de que o texto na janela do compositor está "
+"na sintaxe do iCalendar, e você não deve tentar modificá-lo manualmente."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Habilitar isto faz com que seja possível armazenar as entradas dos "
+"aplicativos do Kontact (KOrganizer, KAddressBook e KNotes).</p><p>Se você "
+"deseja definir esta opção, deve também configurar os aplicativos para usar a "
+"fonte de dados  IMAP; isto pode ser feito pelo Centro de Controle do TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Geralmente, você não terá razões para ver as pastas que contéma fonte de "
+"dados IMAP. Mas, se você precisar visualizá-las, você pode configurar isto "
+"aqui.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Se a conta é usada para armazenar informações de groupware \"\n"
+"          \"não está sendo usada para gerenciar mensagens normais, habilite "
+"esta opção para fazer o KMail exibir \"\n"
+"          \"apenas as pastas de groupware. Isto é útil caso você esteja "
+"lidando com mensagens\"\n"
+"          \"nomais através de uma conta IMAP online adicional.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Escolha o formato de armazenamento das pastas de groupware. <ul> <li>O "
+"formato padrão usa os padrões iCal (para pastas de calendário) e vCard (para "
+"pastas de livro de endereços). Este formato torna todos os recursos do "
+"Kontact disponíveis.</li><li>O formato XML do Kolab usa um modelo especial "
+"que é mais parecido com o utilizado no Outlook. Este formato fornece melhor "
+"compatibilidade com o Outlook, quando utilizando um servidor Kolab ou alguma "
+"solução compatível.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Isto escolhe o pai das pastas de fonte de dados IMAP.</p> Por padrão, o "
+"servidor Kolab configura a caixa de entrada IMAP para ser o pai.<p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Este é o ID da conta que contém as pastas da fonte de dados IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Se você quiser configurar os nomes das pastas do armazenamento IMAP para "
+"o seu idioma local, você pode escolher entre estes idiomas disponíveis.</p> "
+"<p>Note que a única razão para fazer isto é para a compatibilidade com o "
+"Microsoft Outlook. Geralmente é uma má idéia configurar isto, pois torna a "
+"modificação de idiomas impossível.</p> <p>Assim,  não habilite isto, a menos "
+"que necessário.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Este valor é usado para decidir se a introdução do KMail deve ser exibida."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Número máximo de conexões por máquina"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Isto pode ser usado para restringir o número de conexões por máquina, ao "
+"verificar novos e-mails. Por padrão, este número é ilimitado (zero)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Mostrar edição de linha da procura rápida"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Esta opção habilita ou desabilita a linha de procura acima da lista de "
+"mensagens, que pode ser usada para procurar rapidamente por informações "
+"mostradas na lista."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Manter o conjunto de caracteres original quando respondendo ou encaminhando, "
+"se possível"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Adicionar assinatura &automaticamente"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Lembrar desta identidade, para que ela também seja utilizada em futuras "
+"janelas do compositor de e-mails.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Lembrar desta pasta para os itens enviados, e assim, ela será usada nas "
+"janelas futuras do compositor."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Lembrar deste transporte de e-mail, e assim, ele será usado nas janelas "
+"futuras do compositor."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Lembrar desta identidade, para que ela também seja utilizada em futuras "
+"janelas do compositor de e-mails.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Quebrar linha na coluna:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Avisar se o &certificado raiz expira em menos de:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Habilite esta opção para fazer com que o Outlook&#8482; compreenda os nomes "
+"de anexos que contenham caracteres que não são do inglês"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Requisitar automaticamente notificações de recebimento de &mensagens"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt> <p>Habilite esta opção se você quiser fazer com que o KMail solicite "
+"Notificações de Recebimento de Mensagens (\"Message Disposition Notifications"
+"\" ou MDNs) para cada mensagem enviada sua.</p> <p> Esta opção apenas muda o "
+"comportamento padrão; você ainda pode ativar ou desativar solicitações de "
+"MDN para cada mensagem no compositor de mensagens, no item <em>Opções</em>-"
+"><em>Solicitar Notificação de Recebimento</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Autocompletar com endereços recentes"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Desabilite esta opção caso você não queira que os endereços utilizados "
+"recentemente apareçam como opção de autocomplemento nos campos de endereços "
+"do compositor de mensagem."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Intervalo de salvamento automático:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Uma cópia de segurança do texto da janela do compositor pode ser criada "
+"regularmente.O intervalo usado para criar cópias de segurança é configurado "
+"aqui. Você pode desabilitar isto configurando o valor para zero."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "&Substituir prefixo reconhecido com \"Re\":"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Substitui&r prefixo reconhecido com \"Fwd\":"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Use citações inteligentes"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "A assinatura expirou."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tipo de seletor de endereços"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Define o tipo do diálogo de seleção de destinatários para os campos 'Para', "
+"'CC' e 'Bcc'."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Tipo de editor de destinatários"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Define o tipo do editor de destinatários para editar os campos 'Para', 'Cc' "
+"e 'Bcc'."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Número máximo de linhas do editor de destinatários."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Manter o conjunto de caracteres original quando respondendo ou encaminhando, "
+"se possível"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Alguns e-mails, principalmente os gerados automaticamente, não especificam a "
+"codificação de caracteres que deve ser utilizada para mostrá-los. Nestes "
+"casos uma codificação de fallback, que você pode definir aqui, será usada. "
+"Defina-a para a codificação de caracteres mais comumente usada na sua "
+"região. Por padrão, a codificação configurada para o sistema todo é usada."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Mudar esta opção para diferente da opção padrão, 'Auto', vai forçar o uso da "
+"codificação especificada para todas as mensagens, independentemente do que "
+"estiver especificado dentro da própria mensagem."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Habilite esta opção se você quiser que simleys como :-) aparecendo no texto "
+"da mensagem sejam substituídos por emoticons (pequenas imagens)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Habilite esta opção para exibir níveis diferentes de citações. Desabilite "
+"para ocultar os níveis de citações."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Nível de Encolher Automático:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reduzir o tamanho da fonte em citações"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Habilite esta opção para exibir uma citação com uma fonte menor."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Armazenar mensagens enviadas &criptografadas"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Mostrar agente de usuário nos cabeçalhos bonitos"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Habilite esta opção para exibir as linhas User-Agent e X-Mailer nos "
+"cabeçalhos bonitos."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+"Enviar Notificações de Recebimento de Mensagem com um remetente em branco."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Enviar Notificações de Recebimento de Mensagem com a string de remetente "
+"vazio. Alguns servidores podem estar configurados para rejeitarem estas "
+"mensagens, portanto caso você esteja enfrentando problemas ao enviar MDNs, "
+"desmarque esta opção."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Frases foram convertidas para os modelos"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Frases antigas foram convertidas para os modelos"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Modelo de mensagem para mensagem nova"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Modelo para responder"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Modelo para responder para todos"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Modelo de mensagem para encaminhar"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Caracteres de citação"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Editar &arquivo"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Editar..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Ir"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Pasta"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mensagem"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Responder Especial"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Reenviar"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Redefinir Configurações de Fonte"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barra de Ferramentas HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opções usuais"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Barra de Ferramentas HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validar certificados usando CRLs"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Quando esta opção estiver habilitada, os certificados S/MIME serão validados "
+"usando as Listas de Revogação de Certificados, ou CRLs.cada mensagem que "
+"você enviar será criptografada, se a criptografia for desejada e possível. "
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Validar certificados on-line (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Se esta opção estiver marcada, os certificados S/MIME serão validados on-"
+"line, usando o Protocolo de Status de Certificados On-line (OCSP). Preencha "
+"a URL do consultor OCSP abaixo."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Validação do Certificado On-line"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL do Consultor OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Digite aqui o endereço do servidor para a validação on-line de certificados "
+"(consultor OCSP). A URL geralmente se inicia com um http://"
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Assinatura do consultor OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorar URL de Serviço de certificados"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Não verificar políticas do certificado"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Por padrão, o GnuPG usa o arquivo ~/.gnupg/policies.txt para verificar se "
+"uma política de certificado é de permissão. Se esta opção estiver "
+"selecionada, as políticas não serão verificadas."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nunca consultar uma CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Se esta opção estiver marcada, as Listas de Revogação de Certificados nunca "
+"serão usadas para validar certificados S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Buscar certificados faltantes do emissor"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Se esta opção estiver marcada, os certificados faltantes do emissor serão "
+"buscados quando necessário (isto se aplica para os métodos de validação por "
+"CRLs e OCSP)."
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Requisições HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Não realizar nenhuma requisição HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Desativar totalmente o uso de HTTP para S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Usar este proxy para requisições HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Usar proxy HTTP do sistema:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Se esta opção for selecionada, o proxy HTTP mostrado à direita (que vem da "
+"variável de ambiente http_proxy) será usado para qualquer requisição HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Digite aqui a localização do seu proxy HTTP, que será usado para todas as "
+"requisições HTTP relacionadas a S/MIME. A sintaxe é \"host:porta\", por "
+"exemplo: meuproxy.lugarnenhum.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorar Ponto de Distribuição HTTP CRL dos certificados"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Quando procurando a localização de um CRL, o certificado a ser testado "
+"geralmente contém elementos geralmente conhecidos como \"Ponto de "
+"Distribuição CRL\" (\"CRL Distribution Point\", ou DP), que são URLs "
+"descrevendo como a CRL pode ser acessada. O primeiro elemento DP encontrado "
+"é usado. Com esta opção, todos os elementos utilizando o esquema HTTP serão "
+"ignorados quando se estiver procurando por um DP adequado."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Requisições LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Não realizar nenhuma requisição LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Desativar totalmente o uso de LDAP para S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorar Pontos de Distribuição CRL que usem LDAP, nos certificados"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Quando procurando a localização de um CRL, o certificado a ser testado "
+"geralmente contém elementos geralmente conhecidos como \"Ponto de "
+"Distribuição CRL\" (\"CRL Distribution Point\", ou DP), que são URLs "
+"descrevendo como a CRL pode ser acessada. O primeiro elemento DP encontrado "
+"é usado. Com esta opção, todos os elementos utilizando o esquema LDAP serão "
+"ignorados quando se estiver procurando por um DP adequado."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Host primário para requisições LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Colocando um servidor LDAP aqui vai fazer com que todas as requisições vão "
+"para este servidor primeiro. Mais precisamente, esta configuração sobrepõe "
+"qualquer host e porta especificados em uma URL LDAP e também será usado se o "
+"host e a porta forem omitidos na URL. Outros servidores LDAP serão "
+"utilizados apenas se a conexão para este \"proxy\" falhar.\n"
+"A sintaxe é \"HOST\" ou \"HOST:PORTA\". Se a porta for omitida, a porta 389 "
+"(porta padrão do LDAP) será usada."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Adicionar..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Groupware"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Redefinir Configurações de Fonte"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "sem limite"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Responder para o Remetente"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Responder para Todos / Responder para a Lista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Encaminhar Mensagem"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "A&visar ao tentar enviar mensagens não-assinadas"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Marque isto para ser avisado ao enviar mensagens não-assinadas."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar ao Tentar Enviar Mensagens Não-Assinadas</h1>\n"
+"Se esta caixa estiver marcada, você será avisado ao tentar enviar partes de "
+"ou a mensagem inteira não-assinada.\n"
+"<p>\n"
+"É recomendado deixar esta opção ligada para melhor integridade.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Avisar ao tentar enviar mensagens não-criptografadas"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Marque isto para ser avisado ao enviar mensagens não-criptografadas."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar Ao Tentar Enviar Mensagens Não-criptografadas</h1>\n"
+"Se esta caixa estiver marcada, você será avisado quando tentar enviar partes "
+"de ou a mensagem inteira não-criptografada.\n"
+"<p>\n"
+"É recomendado deixar esta opção ligada, para maior integridade.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+"Avisar Se o Endereço de E-mail do &Destinatário Não Estiver no Certificado"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Marque isto para ser avisado se o endereço não estiver no certificado"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se o Endereço de E-mail do Destinatário Não Estiver no "
+"Certificado</h1>\n"
+"Se esta opção estiver marcada, um aviso é emitido se o endereço de e-mail do "
+"destinatário não estiver contido no certificado usado para criptografia.\n"
+"<p>\n"
+"É recomendado deixar esta opção ligada, para maior segurança.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Avisa se os certificados/chaves expirarem logo (configure os limites abaixo)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Para Assinatura"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Para criptografia"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Selecione o número de dias aqui"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar Se o Certificado de Assinatura Expira</h1>\n"
+"Selecione o número mínimo de dias em que o certificado de assinatura deve "
+"ser válido, sem emitir um aviso.\n"
+"<p>\n"
+"A configuração SPHINX recomendada é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se um Certificado De Criptografia Expira</h1>\n"
+"Selecione o número mínimo de dias em que o certificado de criptografia deve "
+"ser válido, sem emitir um aviso.\n"
+"<p>\n"
+"A configuração SPHINX recomendada é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar se Um Certificado na Cadeia Expirar</h1>\n"
+"Selecione o número mínimo de dias em que todos os certificados na cadeia "
+"devem estar válidos sem emitir um aviso.\n"
+"<p>\n"
+"A configuração SPHINX recomendada é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Avisar Se um Certificado de AC Expirar</h1>\n"
+"Selecione o número mínimo de dias em que um certificado de AC deve ser "
+"válido sem emitir um aviso.\n"
+"<p>\n"
+"A configuração SPHINX recomendada é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Visar se um Certificado Raiz Expirar</h1>\n"
+"Selecione o número de dias em que o certificado raiz deve ser válido sem "
+"emitir um aviso.\n"
+"<p>\n"
+"A configuração SPHINX recomendada é de 14 dias.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Para certificados raiz:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Para certificados de AC de intermediários:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Para certificados/chaves do usuário final:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Reabilitar Todos os Alertas do tipo \"Não perguntar novamente\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...que você pode ir para a próxima mensagem ou para a anterior, usando\n"
+"as flechas direita e esquerda respectivamente></p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...que você pode criar rapidamente filtros de remetente, destinatário,\n"
+"assunto e listas de discussão em <em>Ferramentas-&gt;Criar&nbsp;Filtro</em>?"
+"</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que você pode livrar-se do &quot;[nome da lista de discussão]&quot;\n"
+"adicionado ao assunto de algumas listas, usando a ação de filtro \n"
+"<em>reescrever cabeçalho</em>? Basta usar\n"
+"<pre>reescrever cabeçalho &quot;Assunto&quot;\n"
+"   e substitua &quot;\\s*\\[nome da lista\\]\\s*&quot;\n"
+"   por &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...que você pode associar listas de discussões com pastas no\n"
+"diálogo <em>Pasta-&gt;Gerenciamento de Listas de Discussão</em>? Você pode "
+"então\n"
+"acessar <em>Mensagem-&gt;Nova&nbsp;Mensagem&nbsp;para a&nbsp;Lista de&nbsp;"
+"Discussão...</em>\n"
+"para abrir o compositor com o endereço da lista de discussão já pré-"
+"definido.\n"
+"E como outra alternativa, você também pode clicar com o botão do meio do "
+"mouse na pasta.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...que você pode atribuir ícones personalizados a cada individualmente?\n"
+"Veja em <em>Pasta-&gt;Propriedades...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>... que o KMail pode mostrar uma barra colorida indicando o tipo da "
+"mensagem\n"
+"(Texto puro/HTML/OpenPGP) atualmente exibido?</p>\n"
+"<p>Esta configuração tenta falsificar a verificação de assinatura com "
+"sucesso por\n"
+"um envio de e-mails HTML que imitam quadros com status da assinatura do "
+"KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...que você pode filtrar qualquer cabeçalho simplesmente digitando seu "
+"nome\n"
+"no primeiro campo de edição de uma regra de busca?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...que você pode filtrar somente mensagens HTML com a regra \n"
+"<pre>&quot;Tipo de Conteúdo&quot; contém &quot;texto/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...ao responder, somente a parte selecionada da mensagem é citada?</p>\n"
+"<p>Se nada estiver selecionado, a mensagem inteira é citada.</p>\n"
+"<p>Isto funciona até mesmo com texto de anexos, quando você selecionar\n"
+"<em>Ver-&gt;Anexos-&gt;Inseridos</em>.</p>\n"
+"<p>Esta característica está disponível para todos os comandos de resposta, "
+"exceto\n"
+"<em>Mensagem -&gt;Resposta sem Citação</em>.</p>\n"
+"<p align=\"right\"><em>contribuição de David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15617,21 +15190,27 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgstr "Criptografar todas as partes da &Mensagem"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Marque isto para fazer com que todas as partes da mensagem sejam criptografadas por padrão"
+#~ msgstr ""
+#~ "Marque isto para fazer com que todas as partes da mensagem sejam "
+#~ "criptografadas por padrão"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Criptografar todas as partes da Mensagem por Padrão</h1>\n"
-#~ "Se esta opção estiver selecionada, todas as partes de uma mensagem (isto é, o corpo principal e todos os anexos) são criptografados por padrão.\n"
+#~ "Se esta opção estiver selecionada, todas as partes de uma mensagem (isto "
+#~ "é, o corpo principal e todos os anexos) são criptografados por padrão.\n"
 #~ "<p>\n"
-#~ "Esta é a configuração padrão, você ainda pode substituí-la para cada mensagem individual.\n"
+#~ "Esta é a configuração padrão, você ainda pode substituí-la para cada "
+#~ "mensagem individual.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15643,12 +15222,16 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perguntar antes de criptografar cada parte</h1>\n"
-#~ "Quando esta opção estiver selecionada, você será perguntado para cada parte da mensagem (isto é, o corpo principal e todos os anexos) individualmente se você quer que aquela parte seja criptografada.\n"
+#~ "Quando esta opção estiver selecionada, você será perguntado para cada "
+#~ "parte da mensagem (isto é, o corpo principal e todos os anexos) "
+#~ "individualmente se você quer que aquela parte seja criptografada.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15662,14 +15245,17 @@ msgstr "Sobrescrever Arquivo?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Não criptografar mensagens</h1>\n"
-#~ "Se esta opção for selecionada, as mensagens não serão criptografadas por padrão.\n"
+#~ "Se esta opção for selecionada, as mensagens não serão criptografadas por "
+#~ "padrão.\n"
 #~ "<p>\n"
-#~ "Esta é a configuração padrão,você pode ainda substituí-la para cada configuração individualmente.\n"
+#~ "Esta é a configuração padrão,você pode ainda substituí-la para cada "
+#~ "configuração individualmente.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15681,20 +15267,34 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo de Criptografia</h1>\n"
-#~ "Um algoritmo é uma descrição para o computador de como ele deve executar uma certa tarefa. O algoritmo de criptografia descreve como o computador aplica sua chave de destinatário à sua mensagem, de modo que somente o destinatário previsto pode ler a mensagem.\n"
+#~ "Um algoritmo é uma descrição para o computador de como ele deve executar "
+#~ "uma certa tarefa. O algoritmo de criptografia descreve como o computador "
+#~ "aplica sua chave de destinatário à sua mensagem, de modo que somente o "
+#~ "destinatário previsto pode ler a mensagem.\n"
 #~ "<p>\n"
-#~ "A seleção de um certo algoritmo de criptografia determina a facilidade ou dificuldade de se interceptar e ler uma mensagem. No entanto, todos os algoritmos fornecidos no ambiente SPHINX são considerados muito seguros. Geralmente, a opção padrão funcionará muito bem.\n"
+#~ "A seleção de um certo algoritmo de criptografia determina a facilidade ou "
+#~ "dificuldade de se interceptar e ler uma mensagem. No entanto, todos os "
+#~ "algoritmos fornecidos no ambiente SPHINX são considerados muito seguros. "
+#~ "Geralmente, a opção padrão funcionará muito bem.\n"
 #~ "<p>\n"
-#~ "Esta é a configuração padrão, você pode substituí-la para cada mensagem individual.\n"
+#~ "Esta é a configuração padrão, você pode substituí-la para cada mensagem "
+#~ "individual.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15706,16 +15306,23 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Verificação de certificados pode finalizar com certificado salvo localmente</h1>\n"
-#~ "Se esta opção estiver marcada, a verificação da cadeia de certificados pode finalizar com um certificado salvo localmente.\n"
+#~ "<h1>Verificação de certificados pode finalizar com certificado salvo "
+#~ "localmente</h1>\n"
+#~ "Se esta opção estiver marcada, a verificação da cadeia de certificados "
+#~ "pode finalizar com um certificado salvo localmente.\n"
 #~ "<p>\n"
-#~ "Certificados salvos localmente são seus próprios certificados, bem como os certificados de parceiros de comunicação e de autoridades certificadoras (ACs).\n"
+#~ "Certificados salvos localmente são seus próprios certificados, bem como "
+#~ "os certificados de parceiros de comunicação e de autoridades "
+#~ "certificadoras (ACs).\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15727,12 +15334,17 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Sempre Verificar o Caminho do Certificado até o Certificado Raiz</h1>\n"
-#~ "Se esta opção estiver ligada, o caminho do certificado pertencente ao certificado do destinatário será sempre verificado até o certificado raiz.\n"
+#~ "<h1>Sempre Verificar o Caminho do Certificado até o Certificado Raiz</"
+#~ "h1>\n"
+#~ "Se esta opção estiver ligada, o caminho do certificado pertencente ao "
+#~ "certificado do destinatário será sempre verificado até o certificado "
+#~ "raiz.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15744,16 +15356,20 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Verificar caminho do certificado</h1>\n"
-#~ "Se esta opção estiver ligada, o caminho inteiro do certificado do destinatário, até a raiz, será verificado.\n"
+#~ "Se esta opção estiver ligada, o caminho inteiro do certificado do "
+#~ "destinatário, até a raiz, será verificado.\n"
 #~ "<p>\n"
-#~ "Note que não é possível desabilitar a verificação do certificado do destinatário propriamente dito.\n"
+#~ "Note que não é possível desabilitar a verificação do certificado do "
+#~ "destinatário propriamente dito.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15765,16 +15381,28 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Usar listas de revogação de certificado (CRLs)</h1>\n"
-#~ "Uma lista de revogação de certificado contém certificados que foram removidos e não devem ser mais usados para propósitos de criptografia. Um usuário pode desejar ter seu certificado revogado porque ele ou ela suspeita que a integridade do certificado foi comprometida (por exemplo, alguém conseguiu o seu PIN).\n"
+#~ "Uma lista de revogação de certificado contém certificados que foram "
+#~ "removidos e não devem ser mais usados para propósitos de criptografia. Um "
+#~ "usuário pode desejar ter seu certificado revogado porque ele ou ela "
+#~ "suspeita que a integridade do certificado foi comprometida (por exemplo, "
+#~ "alguém conseguiu o seu PIN).\n"
 #~ "<p>\n"
-#~ "É recomendado usar CRLs para maior segurança. No diálogo de configuração para gerenciamento de certificados e CRL, você pode selecionar de onde recuperar as CRLs.\n"
+#~ "É recomendado usar CRLs para maior segurança. No diálogo de configuração "
+#~ "para gerenciamento de certificados e CRL, você pode selecionar de onde "
+#~ "recuperar as CRLs.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15786,12 +15414,14 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar se a CRL expira em um futuro próximo </h1>\n"
-#~ "Se esta caixa estiver marcada, você será avisado se uma das CRLs que você está usando está para expirar em um futuro próximo.\n"
+#~ "Se esta caixa estiver marcada, você será avisado se uma das CRLs que você "
+#~ "está usando está para expirar em um futuro próximo.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15800,14 +15430,16 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar se a CRL expira em um Futuro Próximo</h1>\n"
-#~ "Neste campo você pode especificar o tempo necessário para o aviso antes da CRL expirar.\n"
+#~ "Neste campo você pode especificar o tempo necessário para o aviso antes "
+#~ "da CRL expirar.\n"
 #~ "<p>\n"
 #~ "A configuração recomendada para o ambiente SPHINX é de 7 dias.\n"
 #~ "</qt>"
@@ -15816,21 +15448,27 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgstr "Sempre &criptografar para si"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Marque isto para ter as mensagens criptografadas também criptografadas com sua própria chave."
+#~ msgstr ""
+#~ "Marque isto para ter as mensagens criptografadas também criptografadas "
+#~ "com sua própria chave."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Sempre criptografar para si</h1>\n"
-#~ "Se esta caixa estiver marcada, mensagens criptografadas enviadas por você também serão criptografadas usando sua própria chave.\n"
+#~ "Se esta caixa estiver marcada, mensagens criptografadas enviadas por você "
+#~ "também serão criptografadas usando sua própria chave.\n"
 #~ "<p>\n"
-#~ "É recomendado deixar esta opção ligada para que você possa ler as mensagens que você enviou.\n"
+#~ "É recomendado deixar esta opção ligada para que você possa ler as "
+#~ "mensagens que você enviou.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15842,23 +15480,30 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar se o Certificado Expira</h1>\n"
-#~ "Se esta opção estiver marcada, então você será avisado quando tentar usar um certificado para criptografia que expira dentro da quantidade de dias especificada.\n"
+#~ "Se esta opção estiver marcada, então você será avisado quando tentar usar "
+#~ "um certificado para criptografia que expira dentro da quantidade de dias "
+#~ "especificada.\n"
 #~ "<p>\n"
-#~ "É recomendado manter esta opção ligada para evitar usar certificados que expiram em um futuro próximo.\n"
+#~ "É recomendado manter esta opção ligada para evitar usar certificados que "
+#~ "expiram em um futuro próximo.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
 #~ msgstr "Avisar se o &certificado do destinatário expira em menos de:"
 
 #~ msgid "Warn if receiver's email address is &not in certificate"
-#~ msgstr "Avisar se o endereço de e-mail do &destinatário não estiver no certificado"
+#~ msgstr ""
+#~ "Avisar se o endereço de e-mail do &destinatário não estiver no certificado"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Configuração de Assinatura"
@@ -15872,8 +15517,29 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Seleciona quais certificados enviar"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Enviando Certificados</h1> Sem seu certificado, o destinatário não será capaz de determinar se foi realmente você quem enviou a mensagem ou se a mensagem foi alterado por um terceiro. <p>O destinatário pode obter seu certificado de um servidor central, mas você também pode optar por anexar seu certificado em sua mensagem. Você pode selecionar se não deseja incluir um certificado, se deseja incluir somente o seu ou incluir a cadeia inteira de certificados que podem certificar o seu, incluindo ou excluindo o certificado raiz. <p>É recomendado incluir sempre, no mínimo, o seu próprio certificado na mensagem. <p> Esta é a configuração padrão, e você pode sobrescrevê-la em cada mensagem individual.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Enviando Certificados</h1> Sem seu certificado, o destinatário "
+#~ "não será capaz de determinar se foi realmente você quem enviou a mensagem "
+#~ "ou se a mensagem foi alterado por um terceiro. <p>O destinatário pode "
+#~ "obter seu certificado de um servidor central, mas você também pode optar "
+#~ "por anexar seu certificado em sua mensagem. Você pode selecionar se não "
+#~ "deseja incluir um certificado, se deseja incluir somente o seu ou incluir "
+#~ "a cadeia inteira de certificados que podem certificar o seu, incluindo ou "
+#~ "excluindo o certificado raiz. <p>É recomendado incluir sempre, no mínimo, "
+#~ "o seu próprio certificado na mensagem. <p> Esta é a configuração padrão, "
+#~ "e você pode sobrescrevê-la em cada mensagem individual.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "&Enviar seu próprio certificado"
@@ -15893,16 +15559,20 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Assinar Todas as Partes da Mensagem Por Padrão</h1>\n"
-#~ "Se esta opção estiver selecionada, todas as partes de uma mensagem (isto é, o corpo principal e todos os anexos) são assinados por padrão.\n"
+#~ "Se esta opção estiver selecionada, todas as partes de uma mensagem (isto "
+#~ "é, o corpo principal e todos os anexos) são assinados por padrão.\n"
 #~ "<p>\n"
-#~ "Esta é uma configuração padrão, você ainda pode substituí-la para cada mensagem individual.\n"
+#~ "Esta é uma configuração padrão, você ainda pode substituí-la para cada "
+#~ "mensagem individual.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15914,12 +15584,16 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Perguntar Antes de Assinar Cada Parte</h1>\n"
-#~ "Quando esta opção estiver selecionada, será perguntado a você, para cada parte individual da mensagem (isto é, o corpo principal e todos os anexos), se você quer que aquela parte seja assinada.\n"
+#~ "Quando esta opção estiver selecionada, será perguntado a você, para cada "
+#~ "parte individual da mensagem (isto é, o corpo principal e todos os "
+#~ "anexos), se você quer que aquela parte seja assinada.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15933,18 +15607,23 @@ msgstr "Sobrescrever Arquivo?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Não Assinar Mensagens</h1>\n"
-#~ "Se esta opção estiver selecionada, as mensagens não serão assinadas por padrão.\n"
+#~ "Se esta opção estiver selecionada, as mensagens não serão assinadas por "
+#~ "padrão.\n"
 #~ "<p>\n"
-#~ "Esta é uma configuração padrão, você ainda pode substituí-la para cada configuração individualmente.\n"
+#~ "Esta é uma configuração padrão, você ainda pode substituí-la para cada "
+#~ "configuração individualmente.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "O certificado de assinatura é configurado na página <em>Certificados</em>."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "O certificado de assinatura é configurado na página <em>Certificados</em>."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15955,20 +15634,34 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmo de Assinatura</h1>\n"
-#~ "Um algoritmo é uma descrição, para o computador, de como ele deve executar uma certa tarefa. O algoritmo de assinatura descreve como o computador aplica sua chave de assinatura à sua mensagem, de modo que o destinatário pode determinar se a mensagem realmente é sua.\n"
+#~ "Um algoritmo é uma descrição, para o computador, de como ele deve "
+#~ "executar uma certa tarefa. O algoritmo de assinatura descreve como o "
+#~ "computador aplica sua chave de assinatura à sua mensagem, de modo que o "
+#~ "destinatário pode determinar se a mensagem realmente é sua.\n"
 #~ "<p>\n"
-#~ "A seleção de um certo algoritmo de assinatura determina a facilidade ou dificuldade de forjar uma mensagem. No entanto, todos os algoritmos fornecidos no ambiente SPHINX são considerados muito seguros. Geralmente a configuração padrão funcionará bem aqui.\n"
+#~ "A seleção de um certo algoritmo de assinatura determina a facilidade ou "
+#~ "dificuldade de forjar uma mensagem. No entanto, todos os algoritmos "
+#~ "fornecidos no ambiente SPHINX são considerados muito seguros. Geralmente "
+#~ "a configuração padrão funcionará bem aqui.\n"
 #~ "<p>\n"
-#~ "Esta é uma configuração padrão, você pode substituí-la para cada mensagem individual.\n"
+#~ "Esta é uma configuração padrão, você pode substituí-la para cada mensagem "
+#~ "individual.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15983,12 +15676,17 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Armazenar Mensagens com Assinaturas</h1>\n"
-#~ "Quando esta caixa estiver marcada, as mensagens enviadas serão armazenadas junto com as assinaturas aplicadas a elas. Isto é recomendado, porque habilita o a verificar posteriormente se você assinou uma mensagem ou uma certa parte dela.\n"
+#~ "Quando esta caixa estiver marcada, as mensagens enviadas serão "
+#~ "armazenadas junto com as assinaturas aplicadas a elas. Isto é "
+#~ "recomendado, porque habilita o a verificar posteriormente se você assinou "
+#~ "uma mensagem ou uma certa parte dela.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15998,17 +15696,26 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgstr "&MIME-padrão"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Uma mensagem com várias partes e assinada, abrangendo a assinatura e os dados assinados"
+#~ msgstr ""
+#~ "Uma mensagem com várias partes e assinada, abrangendo a assinatura e os "
+#~ "dados assinados"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Assinatura em Múltiplas Partes Separadas</h1>\n"
-#~ "Quando esta opção estiver selecionada, a assinatura e os dados assinados serão partes separadas de um componente de mensagem Multipart/Signed (Múltiplas partes/Assinado). Os dados da mensagem assinada serão legíveis até mesmo por Agentes de E-mail do Usuário que não suportam o algoritmo de assinatura e a decodificação ASN.1.\n"
+#~ "Quando esta opção estiver selecionada, a assinatura e os dados assinados "
+#~ "serão partes separadas de um componente de mensagem Multipart/Signed "
+#~ "(Múltiplas partes/Assinado). Os dados da mensagem assinada serão legíveis "
+#~ "até mesmo por Agentes de E-mail do Usuário que não suportam o algoritmo "
+#~ "de assinatura e a decodificação ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -16020,12 +15727,17 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Mensagens assinadas em modo Opaco</h1>\n"
-#~ "Quando esta opção estiver selecionada, tanto a assinatura quando os dados assinados serão codificados em um bloco ASN.1. As mensagens serão legíveis somente por Agentes de E-mail do Usuário que suportam a decodificação ASN.1.\n"
+#~ "Quando esta opção estiver selecionada, tanto a assinatura quando os dados "
+#~ "assinados serão codificados em um bloco ASN.1. As mensagens serão "
+#~ "legíveis somente por Agentes de E-mail do Usuário que suportam a "
+#~ "decodificação ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -16037,8 +15749,24 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Selecione a freqüência com que o PIN deve ser digitado"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt><h1>Entrada PIN</h1> Aqui você pode selecionar a freqüência com que você precisa digitar o PIN a fim de obter acesso ao seu ambiente de segurança pessoal (PSE), que contém seus certificados. <p>Isto será a maior freqüência com que você precisa digitar o PIN, o mais protegido que você deseja estar contra mensagens sendo forjadas em seu nome, mais as inconvenientes operações que serão feitas. <p> Se você está inseguro sobre o que selecionar aqui, deixe esta opção como está. <p>Note que não é possível retirar completamente a entrada PIN, por razões de seguranças. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>Entrada PIN</h1> Aqui você pode selecionar a freqüência com que "
+#~ "você precisa digitar o PIN a fim de obter acesso ao seu ambiente de "
+#~ "segurança pessoal (PSE), que contém seus certificados. <p>Isto será a "
+#~ "maior freqüência com que você precisa digitar o PIN, o mais protegido que "
+#~ "você deseja estar contra mensagens sendo forjadas em seu nome, mais as "
+#~ "inconvenientes operações que serão feitas. <p> Se você está inseguro "
+#~ "sobre o que selecionar aqui, deixe esta opção como está. <p>Note que não "
+#~ "é possível retirar completamente a entrada PIN, por razões de seguranças. "
+#~ "</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Uma vez por sessão"
@@ -16055,35 +15783,45 @@ msgstr "Sobrescrever Arquivo?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Avisar se o Certificado Expirar</h1>\n"
-#~ "Se esta opção estiver marcada, então você será avisado ao tentar usar um certificado de assinatura que expira dentro de uma quantidade de dias especificada.\n"
+#~ "Se esta opção estiver marcada, então você será avisado ao tentar usar um "
+#~ "certificado de assinatura que expira dentro de uma quantidade de dias "
+#~ "especificada.\n"
 #~ "<p>\n"
-#~ "É recomendado manter esta opção ligada, para evitar usar certificados que expirem em um futuro próximo.\n"
+#~ "É recomendado manter esta opção ligada, para evitar usar certificados que "
+#~ "expirem em um futuro próximo.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Avisar se um certificado de assinatura e&xpirar em menos de:"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "&Avisar se o endereço de e-mail do assinante não estiver no certificado"
+#~ msgstr ""
+#~ "&Avisar se o endereço de e-mail do assinante não estiver no certificado"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Avisar se o Endereço de E-mail do Assinante não Estiver no Certificado</h1>\n"
-#~ "Se esta opção estiver marcada, um aviso é emitido se o endereço de e-mail do assinante não estiver contido no certificado usado para assinatura.\n"
+#~ "<h1>Avisar se o Endereço de E-mail do Assinante não Estiver no "
+#~ "Certificado</h1>\n"
+#~ "Se esta opção estiver marcada, um aviso é emitido se o endereço de e-mail "
+#~ "do assinante não estiver contido no certificado usado para assinatura.\n"
 #~ "<p>\n"
 #~ "É recomendado deixar esta opção ligada para uma maior integridade.\n"
 #~ "</qt>"
diff --git a/tde-i18n-ro/messages/tdepim/kmail.po b/tde-i18n-ro/messages/tdepim/kmail.po
index 60543aa01e0..ef6c3bd849a 100644
--- a/tde-i18n-ro/messages/tdepim/kmail.po
+++ b/tde-i18n-ro/messages/tdepim/kmail.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2005-06-25 01:38+0300\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "claudiuc@kde.org\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Claudiu Costin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -172,6 +172,12 @@ msgstr "&Nici una (utilizaţi cu grijă)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Cont pentru control semiautomat de resursă"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Şterge trecutul"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -247,14 +253,14 @@ msgstr "&Nume cont:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Furnizorul dumneavoastră de servicii Internet va dat un <em>"
-"nume de utilizator</em> care este utilizat la autentificarea cu serverele lui. "
-"În mod uzual este prima parte a adresei dumneavoastră de email (partea "
-"din-naintea  caracterului <em>@</em>)."
+"Furnizorul dumneavoastră de servicii Internet va dat un <em>nume de "
+"utilizator</em> care este utilizat la autentificarea cu serverele lui. În "
+"mod uzual este prima parte a adresei dumneavoastră de email (partea din-"
+"naintea  caracterului <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -275,20 +281,20 @@ msgstr "&Memorează parola POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Selectaţi această opţiune pentru a salva parola.\n"
-"Dacă Portofelul TDE este disponibil, parola va fi stocată în el. În acest mod "
-"este în siguranţă.\n"
+"Dacă Portofelul TDE este disponibil, parola va fi stocată în el. În acest "
+"mod este în siguranţă.\n"
 "Dacă Portofelul TDE nu funcţionează, parola va fi stocată în fişierul de "
-"configurare KMail. Este salvată într-un format semi-criptat, dar nu trebuie să "
-"consideraţi că este o metodă sigură împotriva încercărilor de decriptare odată "
-"ce fişierul de configurare a fost obţinut."
+"configurare KMail. Este salvată într-un format semi-criptat, dar nu trebuie "
+"să consideraţi că este o metodă sigură împotriva încercărilor de decriptare "
+"odată ce fişierul de configurare a fost obţinut."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -317,11 +323,12 @@ msgstr "&Filtrează mesajele dacă sînt mai mari decît"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Dacă selectaţi această opţiune, atunci vor fi utilizate filtrele POP pentru a "
-"decide soarta mesajelor. Le puteţi transfera, şterge sau să le ţineţi pe "
+"Dacă selectaţi această opţiune, atunci vor fi utilizate filtrele POP pentru "
+"a decide soarta mesajelor. Le puteţi transfera, şterge sau să le ţineţi pe "
 "server."
 
 #: accountdialog.cpp:737
@@ -371,13 +378,15 @@ msgstr "&Text clar"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -421,9 +430,9 @@ msgstr "Înlocuieşte:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -483,12 +492,13 @@ msgstr "Încarcă &ataşamentele la cerere"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Cu această opţiune activată, ataşamentele sînt încărcate numai cînd daţi clic "
-"pe ele. În acest mod chiar mesajele foarte mari sînt afişate instantaneu."
+"Cu această opţiune activată, ataşamentele sînt încărcate numai cînd daţi "
+"clic pe ele. În acest mod chiar mesajele foarte mari sînt afişate "
+"instantaneu."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -528,7 +538,7 @@ msgstr "<nimic>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "intrare"
 
@@ -536,46 +546,47 @@ msgstr "intrare"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Se pare că serverul nu suportă numere unice pentru mesaje, dar acest lucru este "
-"necesar dacă doriţi să păstraţi mesaje pe server.\n"
-"Deoarece anumite implementări nu-şi anunţă corect capabilităţile, aveţi totuşi "
-"posibilitatea să activaţi păstrarea mesajelor transferate pe server."
+"Se pare că serverul nu suportă numere unice pentru mesaje, dar acest lucru "
+"este necesar dacă doriţi să păstraţi mesaje pe server.\n"
+"Deoarece anumite implementări nu-şi anunţă corect capabilităţile, aveţi "
+"totuşi posibilitatea să activaţi păstrarea mesajelor transferate pe server."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Se pare că serverul nu suportă numere transferul antetelor mesajelor, dar acest "
-"lucru necesar dacă doriţi să filtraţi mesajele direct de pe server.\n"
-"Deoarece anumite implementări nu-şi anunţă corect capabilităţile, aveţi totuşi "
-"posibilitatea să activaţi filtrarea mesajelor."
+"Se pare că serverul nu suportă numere transferul antetelor mesajelor, dar "
+"acest lucru necesar dacă doriţi să filtraţi mesajele direct de pe server.\n"
+"Deoarece anumite implementări nu-şi anunţă corect capabilităţile, aveţi "
+"totuşi posibilitatea să activaţi filtrarea mesajelor."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Observaţie: această caracteristică poate determina unele servere POP3 care nu "
-"suportă înlănţuire (\"pipelining\") să trimită mesaje defecte.\n"
-"Opţiunea este configurabilă deoarece unele servere suportă înlănţuire dar nu-şi "
-"anunţă această funcţionalitate. Pentru a verifica dacă serverul dumneavoastră "
-"POP3 suportă opţiunea amintită mai sus, utilizaţi butonul din partea de jos a "
-"căsuţei de dialog.\n"
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Observaţie: această caracteristică poate determina unele servere POP3 care "
+"nu suportă înlănţuire (\"pipelining\") să trimită mesaje defecte.\n"
+"Opţiunea este configurabilă deoarece unele servere suportă înlănţuire dar nu-"
+"şi anunţă această funcţionalitate. Pentru a verifica dacă serverul "
+"dumneavoastră POP3 suportă opţiunea amintită mai sus, utilizaţi butonul din "
+"partea de jos a căsuţei de dialog.\n"
 "Dacă serverul nu-şi anunţă această caracteristică şi doriţi totuşi o viteză "
-"mare de transfer, faceţi cîteva teste trimiţîndu-vă un grup de mai multe mesaje "
-"şi verificaţi dacă le recepţionaţi corect."
+"mare de transfer, faceţi cîteva teste trimiţîndu-vă un grup de mai multe "
+"mesaje şi verificaţi dacă le recepţionaţi corect."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -585,35 +596,35 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"Se pare că serverul nu suportă înlănţuire (\"pipelining\") şi de aceea opţiunea "
-"a fost dezactivată.\n"
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"Se pare că serverul nu suportă înlănţuire (\"pipelining\") şi de aceea "
+"opţiunea a fost dezactivată.\n"
 "Deoarece unele servere suportă înlănţuire, dar nu-şi anunţă această  "
 "funcţionalitate, aveţi totuşi posibilitatea să o activaţi. Aveţi grijă că în "
 "caz contrar vă va trimite mesaje defecte. Astfel, înainte a folosi această "
-"funcţionalitate pentru e-mail-uri importante, testaţi-o suficient cu un număr "
-"mare de mesaje de test pe care să le transferaţi într-o singură sesiune cu "
-"serverul POP."
+"funcţionalitate pentru e-mail-uri importante, testaţi-o suficient cu un "
+"număr mare de mesaje de test pe care să le transferaţi într-o singură "
+"sesiune cu serverul POP."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Se pare că serverul nu suportă numere unice de mesaj, dar această "
-"funcţionalitate este obligatorie pentru a putea lăsa mesaje pe server. De aceea "
-"opţiunea a fost dezactivată.\n"
+"funcţionalitate este obligatorie pentru a putea lăsa mesaje pe server. De "
+"aceea opţiunea a fost dezactivată.\n"
 "Deoarece unele implementări nu îşi anunţă corect funcţionalităţile, aveţi "
 "totuşi posibilitatea să activaţi lăsarea mesajelor pe server."
 
@@ -622,12 +633,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Se pare că serverul nu suportă transferul antetelor mesajelor, dar această "
-"funcţionalitate este obligatorie pentru a putea filtra mesajele pe server. De "
-"aceea opţiunea a fost dezactivată.\n"
+"funcţionalitate este obligatorie pentru a putea filtra mesajele pe server. "
+"De aceea opţiunea a fost dezactivată.\n"
 "Deoarece unele implementări nu îşi anunţă corect funcţionalităţile, aveţi "
 "totuşi posibilitatea să activaţi filtrarea mesajelor pe server."
 
@@ -708,8 +719,8 @@ msgstr "Cont IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Pentru a recepţiona e-mail-uri trebuie să adăugaţi un cont în secţiunea "
 "\"Reţea\" a dialogul de setări."
@@ -755,9 +766,9 @@ msgstr "Ortografie KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -829,8 +840,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Operare server"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "&Nimic"
@@ -933,15 +943,15 @@ msgstr "Căutarea utilitarelor antivirus s-a terminat."
 #, fuzzy
 msgid "<p>Messages classified as spam are marked as read."
 msgstr ""
-"Pe lîngă mutarea lor în folderul selectat, mesajele spam sînt marcate automat "
-"ca fiind citite."
+"Pe lîngă mutarea lor în folderul selectat, mesajele spam sînt marcate "
+"automat ca fiind citite."
 
 #: antispamwizard.cpp:562
 #, fuzzy
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr ""
-"Pe lîngă mutarea lor în folderul selectat, mesajele spam sînt marcate automat "
-"ca fiind citite."
+"Pe lîngă mutarea lor în folderul selectat, mesajele spam sînt marcate "
+"automat ca fiind citite."
 
 #: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
@@ -971,30 +981,28 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Aici puteţi primi ajutor pentru setarea regulilor de filtrare KMail ce vor "
-"fi utilizate cu unele utilitare antivirus binecunoscute.</p>"
-"<p>Expertul poate detecta aceste utilitare instalate pe calculatorul "
-"dumneavoastră, precum şi să creeze reguli de filtrare care să clasifice "
-"mesajele astfel să le separe de cele marcate ca virusate. Nu vor fi luate în "
-"considerare filtrele existente. De fiecare dată vor fi adăugate ca reguli noi "
-"de filtrare.</p>"
-"<p><b>Atenţie:</b> Deoarece KMail este blocat în timpul operaţiei de scanare a "
-"mesajelor, s-ar putea să vă loviţi de lipsa de interactivitate din partea lui "
-"deoarece operaţiile antivirus sînt în general consumatoare de timp. Dacă doriţi "
-"să reveniţi la situaţia anterioară, ştergeţi regulile antivirus create de "
-"expert."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Aici puteţi primi ajutor pentru setarea regulilor de filtrare KMail ce "
+"vor fi utilizate cu unele utilitare antivirus binecunoscute.</p><p>Expertul "
+"poate detecta aceste utilitare instalate pe calculatorul dumneavoastră, "
+"precum şi să creeze reguli de filtrare care să clasifice mesajele astfel să "
+"le separe de cele marcate ca virusate. Nu vor fi luate în considerare "
+"filtrele existente. De fiecare dată vor fi adăugate ca reguli noi de "
+"filtrare.</p><p><b>Atenţie:</b> Deoarece KMail este blocat în timpul "
+"operaţiei de scanare a mesajelor, s-ar putea să vă loviţi de lipsa de "
+"interactivitate din partea lui deoarece operaţiile antivirus sînt în general "
+"consumatoare de timp. Dacă doriţi să reveniţi la situaţia anterioară, "
+"ştergeţi regulile antivirus create de expert."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1011,8 +1019,8 @@ msgstr "Marchează mesajele selectate ca citite"
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
 msgstr ""
-"Pe lîngă mutarea lor în folderul selectat, mesajele spam sînt marcate automat "
-"ca fiind citite."
+"Pe lîngă mutarea lor în folderul selectat, mesajele spam sînt marcate "
+"automat ca fiind citite."
 
 #: antispamwizard.cpp:950
 msgid "Move &known spam to:"
@@ -1030,10 +1038,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1044,13 +1051,13 @@ msgstr "Verifică mesajele cu utilitarele antivirus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Permite utilitarelor antivirus să verifice mesajele dumneavoastră. Expertul va "
-"crea filtrele corespunzătoare. În realitate e-mail-urile sînt numai marcate, "
-"astfel încît filtrele ce urmează să reacţioneze la ele şi, de exemplu, să mute "
-"mesajele virusate într-un folder special."
+"Permite utilitarelor antivirus să verifice mesajele dumneavoastră. Expertul "
+"va crea filtrele corespunzătoare. În realitate e-mail-urile sînt numai "
+"marcate, astfel încît filtrele ce urmează să reacţioneze la ele şi, de "
+"exemplu, să mute mesajele virusate într-un folder special."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1059,8 +1066,8 @@ msgstr "Mută în folderul selectat toate mesajele detectate ca virusate"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Va fi creat un filtru pentru detectarea mesajelor clasificate ca virusate şi "
 "vor fi mutate într-un folder predefinit. Folderul implicit este \"Coşul de "
@@ -1072,8 +1079,8 @@ msgstr "În plus, marchează mesajele virusate ca citite"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Pe lîngă mutarea lor în folderul selectat, mesajele virusate sînt marcate "
 "automat ca fiind citite."
@@ -1270,8 +1277,8 @@ msgstr "Eroare la citirea folderului %1 de pe server:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1291,8 +1298,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1323,23 +1330,23 @@ msgstr "Şters"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Niciuna dintre identităţile dumneavoastră nu se potriveşte cu destinatarul "
-"mesajului. "
-"<br>Alegeţi care dintre următoarele adrese este a dumneavoastră:"
+"<qt>Niciuna dintre identităţile dumneavoastră nu se potriveşte cu "
+"destinatarul mesajului. <br>Alegeţi care dintre următoarele adrese este a "
+"dumneavoastră:"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Niciuna dintre identităţile dumneavoastră nu se potriveşte cu destinatarul "
-"mesajului. "
-"<br>Alegeţi care dintre următoarele adrese este a dumneavoastră:"
+"<qt>Niciuna dintre identităţile dumneavoastră nu se potriveşte cu "
+"destinatarul mesajului. <br>Alegeţi care dintre următoarele adrese este a "
+"dumneavoastră:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1369,18 +1376,21 @@ msgstr "A apărut o eroare la compatarea \"%1\". Operaţia a fost anulată."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Această setare a fost corectată de administratorul dumneavoastră.</p>"
-"<p>Dacă credeţi că este o eroare, contactaţi-l.</p></qt>"
+"<qt><p>Această setare a fost corectată de administratorul dumneavoastră.</"
+"p><p>Dacă credeţi că este o eroare, contactaţi-l.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Încarcă &profilul..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Configurează &KMail..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Adaugă..."
@@ -1410,6 +1420,11 @@ msgstr "<qt>Doriţi într-adevăr să şterg identitatea cu numele <b>%1</b>?</q
 msgid "Remove Identity"
 msgstr "Ştergere identitate"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Ş&terge"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Adaugă..."
@@ -1418,6 +1433,11 @@ msgstr "Adaugă..."
 msgid "Modify..."
 msgstr "Modifică..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Ş&terge"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Setează ca implicită"
@@ -1434,17 +1454,15 @@ msgstr "&Trimitere"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Conturi trimitere (adăugaţi cel puţin unul):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nume"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tip"
@@ -1467,8 +1485,7 @@ msgstr "Setează ca implicită"
 msgid "Common Options"
 msgstr "Opţiuni comune"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Confirmă înainte de a trimite"
@@ -1519,17 +1536,16 @@ msgstr "Domeniu &implicit:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Domeniul implicit este utilizat pentru a completa adresele de e-mail care "
-"sînt formate numai din numele de utilizator.</p></qt>"
+"<qt><p>Domeniul implicit este utilizat pentru a completa adresele de e-mail "
+"care sînt formate numai din numele de utilizator.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1549,9 +1565,9 @@ msgstr "Adăugare transport"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Implicit)"
 
@@ -1630,6 +1646,10 @@ msgstr "Modificare cont"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Nu am găsit contul <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Culori"
@@ -1739,8 +1759,7 @@ msgstr "Legătură URL vizitată"
 msgid "Misspelled Words"
 msgstr "Cuvinte ortografiate greşit"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Mesaj nou"
@@ -1930,8 +1949,8 @@ msgstr "Fire implicit închise"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "&Deschide firele care conţin mesaje noi, necitite sau importante şi fire "
 "urmărite."
@@ -1942,68 +1961,53 @@ msgstr "Afişare dată"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Expresiile de mai jos pot fi utilizate pentru dată:</strong></p> "
-"<ul>"
-"<li>d - ziua ca număr fără zero în faţă (1-31)</li> "
-"<li>dd - ziua ca număr cu un zero în faţă (01-31)</li> "
-"<li>ddd - numele abreviat al zilei (Lun - Dum).</li> "
-"<li>dddd - numele lung al zilei (Luni - Duminică).</li> "
-"<li>M - luna ca număr fără zero în faţă (1-12)</li> "
-"<li>MM - luna ca număr cu un zero în faţă (01-12)</li> "
-"<li>MMM - numele abreviat al lunii (Ian - Dec).</li> "
-"<li>MMMM - numele lung al lunii (Ianuarie - Decembrie).</li> "
-"<li>yy - anul ca număr de două cifre (00-99)</li> "
-"<li>yyyy - anul ca număr de patru cifre (0000-9999)</li> </ul> "
-"<p><strong>Expresiile de mai jos pot fi utilizate pentru timp:</strong></p> "
-"<ul>"
-"<li>h - ora fără zero în faţă (0-23 sau 1-12 dacă se afişează AM/PM)</li> "
-"<li>hh - ora cu zero în faţă (00-23 sau 01-12 dacă se afişează AM/PM)</li> "
-"<li>m - minutul fără zero în faţă (0-59)</li> "
-"<li>mm - minutul cu zero în faţă (00-59)</li> "
-"<li>s - secunda fără zero în faţă (0-59)</li> "
-"<li>ss - secunda cu zero în faţă (00-59)</li> "
-"<li>z - milisecunde fără zerouri în faţă (0-999)</li> "
-"<li>zzz - milisecunde cu zerouri în faţă (000-999)</li> "
-"<li>AP - comută la afişare AM/PM. AP va fi înlocuit prin \"AM\" sau \"PM\".</li>"
-"<li>ap - comută la afişare AM/PM. ap va fi înlocuit prin \"am\" sau \"pm\".</li> "
-"<li>Z - zona în forma numerică (-0500)</li> </ul> "
-"<p><strong>Toate celelalte caractere introduse vor fi ignorate.</strong></p> "
-"</qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Expresiile de mai jos pot fi utilizate pentru dată:</strong></"
+"p> <ul><li>d - ziua ca număr fără zero în faţă (1-31)</li> <li>dd - ziua ca "
+"număr cu un zero în faţă (01-31)</li> <li>ddd - numele abreviat al zilei "
+"(Lun - Dum).</li> <li>dddd - numele lung al zilei (Luni - Duminică).</li> "
+"<li>M - luna ca număr fără zero în faţă (1-12)</li> <li>MM - luna ca număr "
+"cu un zero în faţă (01-12)</li> <li>MMM - numele abreviat al lunii (Ian - "
+"Dec).</li> <li>MMMM - numele lung al lunii (Ianuarie - Decembrie).</li> "
+"<li>yy - anul ca număr de două cifre (00-99)</li> <li>yyyy - anul ca număr "
+"de patru cifre (0000-9999)</li> </ul> <p><strong>Expresiile de mai jos pot "
+"fi utilizate pentru timp:</strong></p> <ul><li>h - ora fără zero în faţă "
+"(0-23 sau 1-12 dacă se afişează AM/PM)</li> <li>hh - ora cu zero în faţă "
+"(00-23 sau 01-12 dacă se afişează AM/PM)</li> <li>m - minutul fără zero în "
+"faţă (0-59)</li> <li>mm - minutul cu zero în faţă (00-59)</li> <li>s - "
+"secunda fără zero în faţă (0-59)</li> <li>ss - secunda cu zero în faţă "
+"(00-59)</li> <li>z - milisecunde fără zerouri în faţă (0-999)</li> <li>zzz - "
+"milisecunde cu zerouri în faţă (000-999)</li> <li>AP - comută la afişare AM/"
+"PM. AP va fi înlocuit prin \"AM\" sau \"PM\".</li><li>ap - comută la afişare "
+"AM/PM. ap va fi înlocuit prin \"am\" sau \"pm\".</li> <li>Z - zona în forma "
+"numerică (-0500)</li> </ul> <p><strong>Toate celelalte caractere introduse "
+"vor fi ignorate.</strong></p> </qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Modificarea setărilor globale pentru fire va anula toate valorile specifice "
 "fiecărui folder."
@@ -2020,8 +2024,7 @@ msgstr "Afişează bara de &stare HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Afişează starea &spam în antetul mesajului"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Înlocuieşte \"smiley\"-urile cu iconiţe"
@@ -2030,8 +2033,7 @@ msgstr "Înlocuieşte \"smiley\"-urile cu iconiţe"
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2057,8 +2059,7 @@ msgstr "Automat"
 msgid "&Override character encoding:"
 msgstr "&Forţează codarea caracterelor:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Activează iconiţa din tava de sistem"
@@ -2164,23 +2165,20 @@ msgstr "<b>%f</b> va fi înlocuit cu numele fişierului editat."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Sînt suportate următoarele formatări pentru răspunsuri:"
-"<br><b>%D</b>: data, <b>%S</b>: subiect, "
-"<br><b>%e</b>: adresa expeditorului, <b>%F</b>: numele expeditorului, "
-"<br><b>%f</b>: iniţialele expeditorului, <b>%T</b>: numele destinatarului, "
-"<br><b>%t</b>: numele şi adresa destinatarului, "
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Sînt suportate următoarele formatări pentru răspunsuri:<br><b>%D</b>: "
+"data, <b>%S</b>: subiect, <br><b>%e</b>: adresa expeditorului, <b>%F</b>: "
+"numele expeditorului, <br><b>%f</b>: iniţialele expeditorului, <b>%T</b>: "
+"numele destinatarului, <br><b>%t</b>: numele şi adresa destinatarului, "
 "<br><b>%C</b>: nume în cîmpul \"CC:\", <b>%c</b>: nume şi adrese în cîmpul "
-"\"CC:\", "
-"<br><b>%%</b>: semnul procent, <b>%_</b>: spaţiu, "
-"<br><b>%L</b>: rupere linie </qt>"
+"\"CC:\", <br><b>%%</b>: semnul procent, <b>%_</b>: spaţiu, <br><b>%L</b>: "
+"rupere linie </qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2203,21 +2201,20 @@ msgstr "Răspunde &tuturor:"
 msgid "&Forward:"
 msgstr "Î&naintează:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Indicator &citare:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Pe data de %D, a-ţi scris:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Pe data de %D, %F a scris:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Mesaj înaintat"
 
@@ -2255,8 +2252,8 @@ msgstr "Introduceţi noul prefix pentru înaintare:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Această listă este verificată pentru fiecare e-mail care este trimis, de sus "
 "pînă jos, pentru un set de caractere care conţine toate caracterele necesare "
@@ -2296,10 +2293,9 @@ msgstr "Valoare"
 msgid "Ne&w"
 msgstr "N&ou"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nume:"
@@ -2308,16 +2304,15 @@ msgstr "&Nume:"
 msgid "&Value:"
 msgstr "&Valoare:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Ataşamente denumite în mod compatibil cu Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Activaţi această opţiune pentru a permite Outlook(tm) să înţeleagă numele de "
 "ataşamente ce conţin caractere non-ASCII"
@@ -2329,7 +2324,8 @@ msgstr "Activează &detecţia ataşamentelor lipsă"
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"Recunoaşte oricare dintre cuvintele cheie ca intenţie de ataşare a unui fişier:"
+"Recunoaşte oricare dintre cuvintele cheie ca intenţie de ataşare a unui "
+"fişier:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2347,21 +2343,21 @@ msgstr "ataşat"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Aţi ales să codaţi numele ataşamentelor conţinînd caractere non-ASCII într-un "
-"mod în care este înţeles de Outlook(tm) şi alte aplicaţii client de mail care "
-"nu suportă ataşamente cu nume codate în mod standardizat.\n"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Aţi ales să codaţi numele ataşamentelor conţinînd caractere non-ASCII într-"
+"un mod în care este înţeles de Outlook(tm) şi alte aplicaţii client de mail "
+"care nu suportă ataşamente cu nume codate în mod standardizat.\n"
 "Observaţie: KMail poate crea mesaje compliante non-standard şi în consecinţă "
-"este posibil ca mesajele dumneavoastră să nu fie interpretată de aplicaţii de "
-"mail ce respectă standardele. De aceea, activaţi această opţiune numai dacă nu "
-"aveţi încotro."
+"este posibil ca mesajele dumneavoastră să nu fie interpretată de aplicaţii "
+"de mail ce respectă standardele. De aceea, activaţi această opţiune numai "
+"dacă nu aveţi încotro."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2385,116 +2381,104 @@ msgstr "Subsisteme &criptografice"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Uneori mesajele vin în ambele formate. Această opţiune controlează dacă "
-"doriţi să afişaţi componenta HTML sau cea text a mesajului.</p>"
-"<p>Afişarea părţii HTML face ca mesajele să arate mult mai atrăgător, dar în "
-"acelaşi timp creşte riscul ca posibile slăbiciuni de securitate să fie "
-"exploatate de persoane răuvoitoare.</p>"
-"<p>Afişarea componentei text a mesajului determină pierderea formatărilor "
-"mesajului, dar face aproape <em>imposibilă</em> specularea eventualelor "
-"probleme de securitate în motorul de randare HTML (Konqueror).</p>"
-"<p>Ultima opţiune vă protejează de una dintre cele mai comune probleme ale "
-"mesajelor HTML, dar nu neapărat vă protejează şi de problemele necunoscute la "
-"momentul cînd această versiune de KMail a fost realizată.</p>"
-"<p>De aceea <em>nu</em> este recomandabilă utilizarea afişării HTML a "
-"mesajelor.</p>"
-"<p><b>Observaţie:</b> Puteţi seta această opţiune per folder din meniul <i>"
-"Folder</i> al ferestrei principale KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Uneori mesajele vin în ambele formate. Această opţiune controlează "
+"dacă doriţi să afişaţi componenta HTML sau cea text a mesajului.</"
+"p><p>Afişarea părţii HTML face ca mesajele să arate mult mai atrăgător, dar "
+"în acelaşi timp creşte riscul ca posibile slăbiciuni de securitate să fie "
+"exploatate de persoane răuvoitoare.</p><p>Afişarea componentei text a "
+"mesajului determină pierderea formatărilor mesajului, dar face aproape "
+"<em>imposibilă</em> specularea eventualelor probleme de securitate în "
+"motorul de randare HTML (Konqueror).</p><p>Ultima opţiune vă protejează de "
+"una dintre cele mai comune probleme ale mesajelor HTML, dar nu neapărat vă "
+"protejează şi de problemele necunoscute la momentul cînd această versiune de "
+"KMail a fost realizată.</p><p>De aceea <em>nu</em> este recomandabilă "
+"utilizarea afişării HTML a mesajelor.</p><p><b>Observaţie:</b> Puteţi seta "
+"această opţiune per folder din meniul <i>Folder</i> al ferestrei principale "
+"KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Unele e-mail-uri cu caracter comercial sînt în format HTML şi conţin "
-"referinţe externe, de exemplu imagini, pe care cei care le trimit le introduc "
-"ca să vadă dacă le-aţi citit mesajul trimis (&quot;spioni web&quot;).</p>"
-"<p>Nu există nici un motiv rezonabil pentru a încărca imaginile direct din "
-"Internet, deoarece expeditorul poate întotdeauna să ataşeze imaginile necesare "
-"direct la email.</p>"
-"<p>Pentru a vă proteja împotriva acestei slăbiciuni a afişării HTML, opţiunea "
-"este implicit <em>dezactivată</em>.</p>"
-"<p>Totuşi, dacă doriţi această caracteristică, o puteţi activa, dar trebuie să "
-"aveţi grijă la consecinţele posibile.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Unele e-mail-uri cu caracter comercial sînt în format HTML şi conţin "
+"referinţe externe, de exemplu imagini, pe care cei care le trimit le "
+"introduc ca să vadă dacă le-aţi citit mesajul trimis (&quot;spioni "
+"web&quot;).</p><p>Nu există nici un motiv rezonabil pentru a încărca "
+"imaginile direct din Internet, deoarece expeditorul poate întotdeauna să "
+"ataşeze imaginile necesare direct la email.</p><p>Pentru a vă proteja "
+"împotriva acestei slăbiciuni a afişării HTML, opţiunea este implicit "
+"<em>dezactivată</em>.</p><p>Totuşi, dacă doriţi această caracteristică, o "
+"puteţi activa, dar trebuie să aveţi grijă la consecinţele posibile.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Politică notificare prelucrare mesaj</h3>"
-"<p>MDN-urile (Message Disposition Notification) reprezintă o generalizare a "
-"ceea ce este de obicei numit <b>confirmare de citire</b>"
-". Autorul cere ca o notificare a prelucrării mesajului să-i fie trimisă şi "
-"programul de mail al destinatarului va genera un răspuns din care autorul poate "
-"să afle ce s-a întîmplat cu mesajul lui. Tipurile de prelucrare cele mai "
-"cunoscute sînt: <b>afişare</b> (adică citire), <b>ştergere</b> şi <b>"
-"răspîndire</b> (de exemplu mesajul a fost înaintat către altcineva).</p>"
-"<p>Pentru a controla trimiterea MDN-urilor de către KMail, aveţi la dispoziţie "
-"următoarele opţiuni:</p>"
-"<ul>"
-"<li><em>Ignoră</em>: Ignoră orice cerere de notificare a prelucrării. Nu va fi "
-"trimis nici un MDN automat (recomandat).</li>"
-"<li><em>Întreabă</em>: Răspunde la cereri numai după ce cere permisiunea "
-"utilizatorului. În acest fel puteţi trimite MDN-uri pentru mesajele selectate, "
-"iar pentru altele să ignoraţi sau să refuzaţi.</li>"
-"<li><em>Refuză</em>: Întotdeauna trimite notificarea <b>refuzat</b>"
-". Această metodă este numai <em>cu un pic</em> mai bună decît cea în care "
-"trimiteţi întotdeauna MDN-uri. Autorul va şti că mesajele au fost prelucrate, "
-"dar nu poate să afle dacă au fost citite sau şterse etc.</li>"
-"<li><em>Trimite întotdeauna</em>: Trimite întotdeauna notificarea de primire "
-"cerută. Asta înseamnă că autorul mesajului va afla cînd a fost prelucrat "
-"mesajul şi în plus ce s-a întîmplat cu el (afişat, şters, etc.). Folosirea "
-"acestei opţiuni este puternic descurajată, dar a fost pusă la dispoziţie "
-"deoarece are sens pentru administrarea relaţiilor cu clienţii.</li> </ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Politică notificare prelucrare mesaj</h3><p>MDN-urile (Message "
+"Disposition Notification) reprezintă o generalizare a ceea ce este de obicei "
+"numit <b>confirmare de citire</b>. Autorul cere ca o notificare a "
+"prelucrării mesajului să-i fie trimisă şi programul de mail al "
+"destinatarului va genera un răspuns din care autorul poate să afle ce s-a "
+"întîmplat cu mesajul lui. Tipurile de prelucrare cele mai cunoscute sînt: "
+"<b>afişare</b> (adică citire), <b>ştergere</b> şi <b>răspîndire</b> (de "
+"exemplu mesajul a fost înaintat către altcineva).</p><p>Pentru a controla "
+"trimiterea MDN-urilor de către KMail, aveţi la dispoziţie următoarele "
+"opţiuni:</p><ul><li><em>Ignoră</em>: Ignoră orice cerere de notificare a "
+"prelucrării. Nu va fi trimis nici un MDN automat (recomandat).</"
+"li><li><em>Întreabă</em>: Răspunde la cereri numai după ce cere permisiunea "
+"utilizatorului. În acest fel puteţi trimite MDN-uri pentru mesajele "
+"selectate, iar pentru altele să ignoraţi sau să refuzaţi.</"
+"li><li><em>Refuză</em>: Întotdeauna trimite notificarea <b>refuzat</b>. "
+"Această metodă este numai <em>cu un pic</em> mai bună decît cea în care "
+"trimiteţi întotdeauna MDN-uri. Autorul va şti că mesajele au fost "
+"prelucrate, dar nu poate să afle dacă au fost citite sau şterse etc.</"
+"li><li><em>Trimite întotdeauna</em>: Trimite întotdeauna notificarea de "
+"primire cerută. Asta înseamnă că autorul mesajului va afla cînd a fost "
+"prelucrat mesajul şi în plus ce s-a întîmplat cu el (afişat, şters, etc.). "
+"Folosirea acestei opţiuni este puternic descurajată, dar a fost pusă la "
+"dispoziţie deoarece are sens pentru administrarea relaţiilor cu clienţii.</"
+"li> </ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2510,16 +2494,16 @@ msgstr "&Permite mesajelor să încarce referinţe externe din Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>AVERTIZARE:</b> Utilizarea HTML în email poate creşte posibilitatea ca "
 "sistemul dumneavoastră să fie compromis de exploatări ale slăbiciunilor de "
-"securitate prezente şi viitoare. <a href=\"whatsthis:%1\">"
-"Mai multe despre mesajele HTML...</a> <a href=\"whatsthis:%2\">"
-"Mai multe despre referinţele externe...</a>"
+"securitate prezente şi viitoare. <a href=\"whatsthis:%1\">Mai multe despre "
+"mesajele HTML...</a> <a href=\"whatsthis:%2\">Mai multe despre referinţele "
+"externe...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2602,8 +2586,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Această opţiune are nevoie dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2632,8 +2615,8 @@ msgstr "E&xclude mesajele importante din procesul de expirare"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "La căutarea mesajelor necitite:"
 
@@ -2657,8 +2640,8 @@ msgstr "Ciclează în toate folderele"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Cînd intră într-un folder:"
 
@@ -2727,28 +2710,25 @@ msgstr "Directoare (format \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Această opţiune selectează ce format de căsuţă de mail să fie implicit "
-"pentru folderele locale:</p>"
-"<p><b>mbox:</b> folderele KMail sînt reprezentate de cîte un singur fişier. "
-"Mesajele individuale sînt separate unul de celălalt printr-o linie care începe "
-"cu \"From \". Această modalitate salvează spaţiu pe disc dar este mai puţin "
-"robustă, de exemplu cînd sînt mutate mesaje dintr-un folder în altul.</p>"
-"<p><b>maildir:</b> folderele sînt reprezentate prin directoare reale pe disc. "
-"Mesajele individuale sînt separate ca fişiere. Acest lucru s-ar putea să "
-"consume ceva mai mult spaţiu de disc, dar este o metodă mult mai bună cînd "
-"mutaţi mesaje între foldere.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Această opţiune selectează ce format de căsuţă de mail să fie "
+"implicit pentru folderele locale:</p><p><b>mbox:</b> folderele KMail sînt "
+"reprezentate de cîte un singur fişier. Mesajele individuale sînt separate "
+"unul de celălalt printr-o linie care începe cu \"From \". Această modalitate "
+"salvează spaţiu pe disc dar este mai puţin robustă, de exemplu cînd sînt "
+"mutate mesaje dintr-un folder în altul.</p><p><b>maildir:</b> folderele sînt "
+"reprezentate prin directoare reale pe disc. Mesajele individuale sînt "
+"separate ca fişiere. Acest lucru s-ar putea să consume ceva mai mult spaţiu "
+"de disc, dar este o metodă mult mai bună cînd mutaţi mesaje între foldere.</"
+"p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2782,45 +2762,37 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cînd treceţi la următorul mesaj necitit se poate întîmpla să nu mai existe "
-"mesaje necitite după cel curent.</p>"
-"<p><b>Nu ciclează:</b> Căutarea se va încheia la ultimul mesaj din folderul "
-"curent.</p>"
-"<p><b>Ciclează în folderul curent:</b> Căutarea va continua de la începutul "
-"listei de mesaje, dar nu va continua în alt folder.</p>"
-"<p><b>Ciclează în toate folderele:</b> Căutarea va continua de la începutul "
-"listei de mesaje. Dacă nu sînt găsite mesaje necitite, va continua în folderul "
-"următor.</p>"
-"<p>Similar, atunci cînd căutaţi mesajul precedent necitit, căutarea va începe "
-"de la sfîrşitul listei de mesaje şi continuă la folderul precedent în funcţie "
-"de ce opţiune este selectată.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Cînd treceţi la următorul mesaj necitit se poate întîmpla să nu mai "
+"existe mesaje necitite după cel curent.</p><p><b>Nu ciclează:</b> Căutarea "
+"se va încheia la ultimul mesaj din folderul curent.</p><p><b>Ciclează în "
+"folderul curent:</b> Căutarea va continua de la începutul listei de mesaje, "
+"dar nu va continua în alt folder.</p><p><b>Ciclează în toate folderele:</b> "
+"Căutarea va continua de la începutul listei de mesaje. Dacă nu sînt găsite "
+"mesaje necitite, va continua în folderul următor.</p><p>Similar, atunci cînd "
+"căutaţi mesajul precedent necitit, căutarea va începe de la sfîrşitul listei "
+"de mesaje şi continuă la folderul precedent în funcţie de ce opţiune este "
+"selectată.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2889,8 +2861,8 @@ msgstr "A&scunde folderele de colaborare"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Dacă opţiunea este selectată, nu veţi vedea folderele de resursă IMAP în "
 "arborele de foldere."
@@ -2903,8 +2875,8 @@ msgstr "Folderele &resursă sînt în contul:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Dacă opţiunea este selectată, nu veţi vedea folderele de resursă IMAP în "
 "arborele de foldere."
@@ -2936,8 +2908,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Activaţi această opţiune pentru a permite Outlook(tm) să înţeleagă răspunsurile "
-"pe care le daţi la invitaţii."
+"Activaţi această opţiune pentru a permite Outlook(tm) să înţeleagă "
+"răspunsurile pe care le daţi la invitaţii."
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2948,8 +2920,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Activaţi această opţiune pentru a permite Outlook(tm) să înţeleagă răspunsurile "
-"la invitaţii."
+"Activaţi această opţiune pentru a permite Outlook(tm) să înţeleagă "
+"răspunsurile la invitaţii."
 
 #: configuredialog.cpp:4963
 #, fuzzy
@@ -2964,19 +2936,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Ataşamente denumite în mod compatibil cu Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Trimitere automată a invitaţiilor"
@@ -2986,28 +2957,28 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Cînd opţiunea este activată, utilizatorul nu va vedea fereastra de compunere a "
-"mesajelor. Mesajele invitaţie sînt trimise automat."
+"Cînd opţiunea este activată, utilizatorul nu va vedea fereastra de compunere "
+"a mesajelor. Mesajele invitaţie sînt trimise automat."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>În mod normal invitaţiile sînt trimise ca ataşamente la mesaj. Această "
 "opţiune face ca pentru Microsoft Outlook invitaţiile şi răspunsurile la "
-"invitaţii să fie trimise ca text în corpul mesajului."
-"<br>Totuşi, cînd faceţi acest lucru, nu veţi mai obţine un text descriptiv ce "
-"poate fi interpretat de aplicaţiile de mail. Pentru persoanele care au programe "
-"de mail incompatibile, mesajele vor arăta foarte ciudat."
-"<br>Cei care au aplicaţii client de mail care înţeleg formatul invitaţiilor vor "
-"putea să lucreze mesajele generate de KMail.</qt>"
+"invitaţii să fie trimise ca text în corpul mesajului.<br>Totuşi, cînd faceţi "
+"acest lucru, nu veţi mai obţine un text descriptiv ce poate fi interpretat "
+"de aplicaţiile de mail. Pentru persoanele care au programe de mail "
+"incompatibile, mesajele vor arăta foarte ciudat.<br>Cei care au aplicaţii "
+"client de mail care înţeleg formatul invitaţiilor vor putea să lucreze "
+"mesajele generate de KMail.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3115,17 +3086,16 @@ msgstr "Î&naintează"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3143,15 +3113,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3215,8 +3185,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Lista de distribuţie cu numele <b>%1</b> există deja. Vă rog să alegeţi un "
-"nume diferit.</qt>"
+"<qt>Lista de distribuţie cu numele <b>%1</b> există deja. Vă rog să alegeţi "
+"un nume diferit.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3225,8 +3195,8 @@ msgstr "Editare identitate"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3330,7 +3300,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Nu am putut expira mesajele din folderul %1: nu am găsit folderul destinaţie %2"
+"Nu am putut expira mesajele din folderul %1: nu am găsit folderul destinaţie "
+"%2"
 
 #: expirejob.cpp:199
 #, fuzzy
@@ -3407,7 +3378,8 @@ msgstr "Şterge permanent"
 msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
-"Observaţie: Acţiunea de expirare va fi aplicată imediat ce confirmaţi setările."
+"Observaţie: Acţiunea de expirare va fi aplicată imediat ce confirmaţi "
+"setările."
 
 #: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
@@ -3490,6 +3462,11 @@ msgstr "Selectare folder"
 msgid "Filters"
 msgstr "Filtrul %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Selectează &toate mesajele"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3521,8 +3498,8 @@ msgstr "&Jurnalizează activităţile filtrului"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Aici puteţi activa sau dezactiva înregistrarea activităţilor filtrului. "
 "Bineînţeles că datele înregistrate sînt colectate şi afişate numai dacă "
@@ -3542,10 +3519,11 @@ msgstr "Înregistrează evaluarea &regulii de filtrare"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Aici puteţi controla informaţiile din jurnal despre evaluarea regulilor de "
 "filtrare ale filtrelor aplicate. Cînd activaţi această opţiune veţi obţine "
@@ -3570,10 +3548,10 @@ msgstr "nelimitat"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Colectarea datelor de jurnalizare utilizează memorie pentru a le stoca "
 "temporar. Aici puteţi limita cantitatea maximă de memorie de utilizat. Dacă "
@@ -3587,7 +3565,7 @@ msgstr ""
 "Nu am putut scrie în fişierul %1:\n"
 "\"%2\" este descrierea detaliată a erorii."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Eroare KMail"
@@ -3628,13 +3606,13 @@ msgstr "Identificator &utilizator:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Identificatorul de utilizator reprezintă contul de utilizator pe serverul IMAP. "
-"Acesta poate fi un simplu nume de utilizator sau adresa completă de e-mail. "
-"Logarea pentru contul dumneavoastră vă va spune care din ele este."
+"Identificatorul de utilizator reprezintă contul de utilizator pe serverul "
+"IMAP. Acesta poate fi un simplu nume de utilizator sau adresa completă de e-"
+"mail. Logarea pentru contul dumneavoastră vă va spune care din ele este."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3685,8 +3663,8 @@ msgstr "Nu aveţi drepturi de citire/scriere în folderul \"gunoi\"."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Informaţiile nu a fost încă obţinute de la server. Utilizaţi vă rog comanda "
 "\"Verifică pentru mesaje noi\"."
@@ -3699,8 +3677,7 @@ msgstr "Eroare: nu există un cont IMAP definit pentru acest folder"
 msgid "Connecting to server %1, please wait..."
 msgstr "Conectez la server %1. Vă rog să aşteptaţi..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Eroare de conectare la server %1"
@@ -3729,8 +3706,8 @@ msgstr "Adaugă permisiuni"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Doriţi într-adevăr să dezactivaţi propriile permisiuni pentru acest folder? "
 "După aceea nu-l veţi mai putea accesa."
@@ -3764,7 +3741,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Selectare folder"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Foldere locale"
@@ -3790,13 +3767,13 @@ msgstr "Selectaţi acceleratorul pentru folder"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Pentru a alege o tastă sau o combinaţie de taste care selectează folderul "
-"curent, daţi clic pe butonul de mai jos şi apăsaţi tasta(ele) pe care doriţi să "
-"le asociaţi cu acest folder.</qt>"
+"<qt>Pentru a alege o tastă sau o combinaţie de taste care selectează "
+"folderul curent, daţi clic pe butonul de mai jos şi apăsaţi tasta(ele) pe "
+"care doriţi să le asociaţi cu acest folder.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3816,11 +3793,20 @@ msgstr "&Anulează"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Necunoscut"
@@ -3944,59 +3930,16 @@ msgstr "Stare spam:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>M<br>e<br>s<br>a<br>j<br> <br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>u"
-"<br> "
-"<br>e"
-"<br>s"
-"<br>t"
-"<br>e"
-"<br> "
-"<br>m"
-"<br>e"
-"<br>s"
-"<br>a"
-"<br>j"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>u<br> <br>e<br>s<br>t<br>e<br> <br>m<br>e<br>s<br>a<br>j<br> "
+"<br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4008,18 +3951,14 @@ msgstr "&Numele dumneavoastră:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Numele dumneavoastră</h3>"
-"<p>Acest cîmp ar trebui să conţină numele dumneavoastră aşa cum doriţi să apară "
-"în antetul mesajului pe care îl trimiteţi.</p>"
-"<p>Dacă nu îl completaţi, atunci va fi afişată numai adresa de e-mail.</p></qt>"
+"<qt><h3>Numele dumneavoastră</h3><p>Acest cîmp ar trebui să conţină numele "
+"dumneavoastră aşa cum doriţi să apară în antetul mesajului pe care îl "
+"trimiteţi.</p><p>Dacă nu îl completaţi, atunci va fi afişată numai adresa de "
+"e-mail.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4027,17 +3966,13 @@ msgstr "Organi&zaţia:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizaţia</h3>"
-"<p>Acest cîmp ar trebui să conţină numele organizaţiei dumneavoastră aşa cum "
-"doriţi să apară în antetul mesajelor trimise.</p>"
-"<p>Nu este nici o problemă să îl lăsaţi necompletat.</p></qt>"
+"<qt><h3>Organizaţia</h3><p>Acest cîmp ar trebui să conţină numele "
+"organizaţiei dumneavoastră aşa cum doriţi să apară în antetul mesajelor "
+"trimise.</p><p>Nu este nici o problemă să îl lăsaţi necompletat.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4046,20 +3981,16 @@ msgstr "Adresa de &e-mail:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Adresa de e-mail</h3>"
-"<p>Acest cîmp trebuie să conţină adresa dumneavoastră de e-mail completă.</p>"
-"<p>Dacă nu completaţi acest cîmp sau îl introduceţi greşit, cei care vă scriu "
-"vor avea probleme să comunice cu dumneavoastră.</p></qt>"
+"<qt><h3>Adresa de e-mail</h3><p>Acest cîmp trebuie să conţină adresa "
+"dumneavoastră de e-mail completă.</p><p>Dacă nu completaţi acest cîmp sau îl "
+"introduceţi greşit, cei care vă scriu vor avea probleme să comunice cu "
+"dumneavoastră.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4068,21 +3999,12 @@ msgstr "Adresa de &e-mail:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4107,20 +4029,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cheia OpenPGP pe care o alegeţi aici va fi utilizată la semnarea digitală a "
-"mesajelor. Puteţi folosi şi chei GnuPG.</p>"
-"<p>Dacă lăsaţi necompletat acest cîmp, KMail nu va putea semna mesajele cu "
-"OpenPGP. Funcţiile normale de mail nu vor fi afectate.</p>"
-"<p>La <a href=\"http://www.gnupg.org\">http://www.gnupg.org</a> "
-"puteţi afla mai multe despre chei.</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Cheia OpenPGP pe care o alegeţi aici va fi utilizată la semnarea "
+"digitală a mesajelor. Puteţi folosi şi chei GnuPG.</p><p>Dacă lăsaţi "
+"necompletat acest cîmp, KMail nu va putea semna mesajele cu OpenPGP. "
+"Funcţiile normale de mail nu vor fi afectate.</p><p>La <a href=\"http://www."
+"gnupg.org\">http://www.gnupg.org</a> puteţi afla mai multe despre chei.</p></"
+"qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4132,34 +4052,30 @@ msgstr "Cheia dumnevoastră OpenPGP pentru criptare"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Selectaţi cheia OpenPGP care trebuie utilizată la criptarea mesajelor trimise "
-"către dumneavoastră şi pentru funcţia \"Ataşează cheia mea publică\" din "
-"fereastra de compunere."
+"Selectaţi cheia OpenPGP care trebuie utilizată la criptarea mesajelor "
+"trimise către dumneavoastră şi pentru funcţia \"Ataşează cheia mea publică\" "
+"din fereastra de compunere."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Cheia OpenPGP pe care o alegeţi aici va fi utilizată la criptarea mesajelor "
-"trimise către dumneavoastră. De asemenea ea va fi folosită cu funcţia "
-"\"Ataşează cheia mea publică\" din  fereastra de compunere. Puteţi alege şi "
-"chei GnuPG.</p>"
-"<p>Dacă lăsaţi cîmpul necompletat, KMail nu va putea să cripteze cu OpenPGP "
-"copii ale mesajelor trimise către dumneavoastră. Funcţiile normale de mail nu "
-"sînt afectate.</p>"
-"<p>La <a href=\"http://www.gnupg.org\">http://www.gnupg.org</a> "
-"puteţi afla mai multe despre chei.</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Cheia OpenPGP pe care o alegeţi aici va fi utilizată la criptarea "
+"mesajelor trimise către dumneavoastră. De asemenea ea va fi folosită cu "
+"funcţia \"Ataşează cheia mea publică\" din  fereastra de compunere. Puteţi "
+"alege şi chei GnuPG.</p><p>Dacă lăsaţi cîmpul necompletat, KMail nu va putea "
+"să cripteze cu OpenPGP copii ale mesajelor trimise către dumneavoastră. "
+"Funcţiile normale de mail nu sînt afectate.</p><p>La <a href=\"http://www."
+"gnupg.org\">http://www.gnupg.org</a> puteţi afla mai multe despre chei.</p></"
+"qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4179,17 +4095,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Certificatul S/MIME (X.509) pe care-l alegeţi aici va fi utilizat la "
-"semnarea digitală a mesajelor.</p>"
-"<p>Dacă lăsaţi cîmpul necompletat, KMail nu va putea să semneze mesajele "
-"digital cu S/MIME. Funcţiile normale de mail nu sînt afectate.</p></qt>"
+"<qt><p>Certificatul S/MIME (X.509) pe care-l alegeţi aici va fi utilizat la "
+"semnarea digitală a mesajelor.</p><p>Dacă lăsaţi cîmpul necompletat, KMail "
+"nu va putea să semneze mesajele digital cu S/MIME. Funcţiile normale de mail "
+"nu sînt afectate.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4201,29 +4115,27 @@ msgstr "Certificatul dumneavoastră de semnare S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Selectaţi certificatul S/MIME care trebuie de utilizat la criptarea mesajelor "
-"către dumneavoastră şi pentru funcţia \"Ataşează certificatul meu\" din "
-"fereastra de compunere."
+"Selectaţi certificatul S/MIME care trebuie de utilizat la criptarea "
+"mesajelor către dumneavoastră şi pentru funcţia \"Ataşează certificatul meu"
+"\" din fereastra de compunere."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Certificatul S/MIME pe care îl alegeţi aici va fi utilizat la criptarea "
-"mesajelor către dumneavoastră şi pentru funcţia \"Ataşează certificatul meu\" "
-"din fereastra de compunere.</p>"
-"<p>Dacă lăsaţi cîmpul necompletat, KMail nu va putea să cripteze cu S/MIME "
-"copii ale mesajele trimise către dumneavoastră. Funcţiile normale de mail nu "
-"sînt afectate.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>Certificatul S/MIME pe care îl alegeţi aici va fi utilizat la "
+"criptarea mesajelor către dumneavoastră şi pentru funcţia \"Ataşează "
+"certificatul meu\" din fereastra de compunere.</p><p>Dacă lăsaţi cîmpul "
+"necompletat, KMail nu va putea să cripteze cu S/MIME copii ale mesajele "
+"trimise către dumneavoastră. Funcţiile normale de mail nu sînt afectate.</"
+"p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4243,24 +4155,20 @@ msgstr "Adresă de &răspuns:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adrese de răspuns</h3>"
-"<p>Setează antetul <tt>Reply-to:</tt> să conţină o adresă de e-mail diferită de "
-"cea din antetul <tt>From:</tt>.</p>"
-"<p>Poate fi util cînd aveţi un grup de personae ce lucrează împreună în roluri "
-"similare. De exemplu, aţi putea dori care orice mesaje trimise să aibă adresa "
-"dumneavoastră în cîmpul <tt>From:</tt>, dar orice răspuns să se ducă către o "
-"adresăd de grup.</p> "
-"<p>Dacă nu ştiţi ce să faceţi, lăsaţi cîmpul necompletat.</p> </qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adrese de răspuns</h3><p>Setează antetul <tt>Reply-to:</tt> să "
+"conţină o adresă de e-mail diferită de cea din antetul <tt>From:</tt>.</"
+"p><p>Poate fi util cînd aveţi un grup de personae ce lucrează împreună în "
+"roluri similare. De exemplu, aţi putea dori care orice mesaje trimise să "
+"aibă adresa dumneavoastră în cîmpul <tt>From:</tt>, dar orice răspuns să se "
+"ducă către o adresăd de grup.</p> <p>Dacă nu ştiţi ce să faceţi, lăsaţi "
+"cîmpul necompletat.</p> </qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4268,25 +4176,20 @@ msgstr "Adrese &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adrese BCC (Blind Carbon Copy)</h3>"
-"<p>Adresele pe care le introduceţi aici vor fi adăugate la fiecare mesaj trimis "
-"cu această identitate. Ele nu vor fi vizibile destinatarilor.</p>"
-"<p>De obicei această facilitate este utilizată pentru a trimite o copie a "
-"mesajelor la un alt cont de-al dumnevoastră.</p>"
-"<p>Pentru a specifica mai mult de o adresă, utilizaţi virgula pentru a separa "
-"lista de destinatari BCC.</p> "
-"<p>Dacă nu ştiţi ce să faceţi, lăsaţi cîmpul necompletat.</p> </qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adrese BCC (Blind Carbon Copy)</h3><p>Adresele pe care le "
+"introduceţi aici vor fi adăugate la fiecare mesaj trimis cu această "
+"identitate. Ele nu vor fi vizibile destinatarilor.</p><p>De obicei această "
+"facilitate este utilizată pentru a trimite o copie a mesajelor la un alt "
+"cont de-al dumnevoastră.</p><p>Pentru a specifica mai mult de o adresă, "
+"utilizaţi virgula pentru a separa lista de destinatari BCC.</p> <p>Dacă nu "
+"ştiţi ce să faceţi, lăsaţi cîmpul necompletat.</p> </qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4326,7 +4229,7 @@ msgstr "&Semnătură"
 msgid "&Picture"
 msgstr "&Imagine"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Adresă de e-mail eronată"
 
@@ -4345,13 +4248,13 @@ msgstr ""
 "Una din cheile OpenPGP configurate pentru semnare nu conţine nici un "
 "identificator de utilizator cu adresa de e-mail configurată pentru această "
 "identitate (%1).\n"
-"Acest lucru poate să genereze mesaje de avertizare la primirea mesajelor de la "
-"dumneavoastră atunci cînd destinatarul încearcă să verifice semnătura."
+"Acest lucru poate să genereze mesaje de avertizare la primirea mesajelor de "
+"la dumneavoastră atunci cînd destinatarul încearcă să verifice semnătura."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Una din cheile OpenPGP configurate pentru criptare nu conţine nici un "
 "identificator de utilizator cu adresa de e-mail configurată pentru această "
@@ -4367,8 +4270,8 @@ msgstr ""
 "Unul din certificatele S/MIME configurate pentru semnare nu conţine nici un "
 "identificator de utilizator cu adresa de e-mail configurată pentru această "
 "identitate (%1).\n"
-"Acest lucru poate să genereze mesaje de avertizare la primirea mesajelor de la "
-"dumneavoastră atunci cînd destinatarul încearcă să verifice semnătura."
+"Acest lucru poate să genereze mesaje de avertizare la primirea mesajelor de "
+"la dumneavoastră atunci cînd destinatarul încearcă să verifice semnătura."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4404,8 +4307,8 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Folderul \"ciorne\" al identităţii \"%1\" nu mai există. De aceea pentru ciorne "
-"va fi utilizat folderul implicit."
+"Folderul \"ciorne\" al identităţii \"%1\" nu mai există. De aceea pentru "
+"ciorne va fi utilizat folderul implicit."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4413,13 +4316,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Folderul \"ciorne\" al identităţii \"%1\" nu mai există. De aceea pentru ciorne "
-"va fi utilizat folderul implicit."
+"Folderul \"ciorne\" al identităţii \"%1\" nu mai există. De aceea pentru "
+"ciorne va fi utilizat folderul implicit."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Implicit)"
 
@@ -4434,8 +4337,8 @@ msgstr "Adresă de e-mail"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Trebuie să furnizaţi un nume de utilizator şi o parolă pentru a accesa această "
-"căsuţă de mail."
+"Trebuie să furnizaţi un nume de utilizator şi o parolă pentru a accesa "
+"această căsuţă de mail."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4467,14 +4370,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4491,7 +4394,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Nu am putut încărca pe server mesajul cu data de %1 de la %2, cu subiectul %3."
+"Nu am putut încărca pe server mesajul cu data de %1 de la %2, cu subiectul "
+"%3."
 
 #: imapaccountbase.cpp:888
 #, fuzzy
@@ -4514,14 +4418,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Eroare: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4672,14 +4581,14 @@ msgstr "Arhivele listei"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4708,228 +4617,182 @@ msgstr "Chei de criptare inutilizabile"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> "
-"(ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> "
-"(ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</"
+"p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</"
+"p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4944,228 +4807,182 @@ msgstr "Certificatul S/MIME va expira curînd"
 #: keyresolver.cpp:750
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Cheia OpenPGP pentru semnare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:755
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> "
-"(ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> "
-"(ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Cheia OpenPGP pentru criptare</p><p align=center><b>%1</b> (ID cheie 0x"
+"%2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:760
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</"
+"p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Cheia OpenPGP pentru</p><p align=center><b>%1</b> (ID cheie 0x%2)</"
+"p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:770
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:777
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:784
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul rădăcină</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:792
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:799
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:806
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p>"
-"<p>pentru certificatul S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul CA intermediar</p><p align=center><b>%3</b></p><p>pentru "
+"certificatul S/MIME</p><p align=center><b>%1</b> (cu numărul serial %2)</"
+"p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:815
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul de semnare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:820
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul de criptare S/MIME</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:825
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de o zi.</p>\n"
-"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> "
-"(cu numărul serial %2)</p>"
-"<p>expiră în mai puţin de %n zile.</p>"
+"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de o zi.</p>\n"
+"<p>Certificatul S/MIME pentru</p><p align=center><b>%1</b> (cu numărul "
+"serial %2)</p><p>expiră în mai puţin de %n zile.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5177,18 +4994,19 @@ msgstr "Certificatul S/MIME va expira curînd"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Una sau mai multe chei de criptare OpenPGP sau certificate S/MIME configurate "
-"nu pot fi utilizate la criptare. Vă rog să reconfiguraţi cheile de criptare şi "
-"certificatele pentru această identitate din dialogul de configurare a "
-"identităţii.\n"
-"Dacă alegeţi să continuaţi şi cheile sînt necesare mai tîrziu, veţi fi pus să "
-"specificaţi cheile de utilizat."
+"Una sau mai multe chei de criptare OpenPGP sau certificate S/MIME "
+"configurate nu pot fi utilizate la criptare. Vă rog să reconfiguraţi cheile "
+"de criptare şi certificatele pentru această identitate din dialogul de "
+"configurare a identităţii.\n"
+"Dacă alegeţi să continuaţi şi cheile sînt necesare mai tîrziu, veţi fi pus "
+"să specificaţi cheile de utilizat."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5203,11 +5021,11 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Una sau mai multe chei de semnare OpenPGP sau certificate de semnare S/MIME "
-"configurate nu pot fi utilizate la semnarea mesajelor. Vă rog să reconfiguraţi "
-"cheile de semnare şi certificatele pentru această identitate din dialogul de "
-"configurare a identităţii.\n"
-"Dacă alegeţi să continuaţi şi cheile sînt necesare mai tîrziu, veţi fi pus să "
-"specificaţi cheile de utilizat."
+"configurate nu pot fi utilizate la semnarea mesajelor. Vă rog să "
+"reconfiguraţi cheile de semnare şi certificatele pentru această identitate "
+"din dialogul de configurare a identităţii.\n"
+"Dacă alegeţi să continuaţi şi cheile sînt necesare mai tîrziu, veţi fi pus "
+"să specificaţi cheile de utilizat."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5217,15 +5035,15 @@ msgstr "Chei de semnare inutilizabile"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Examinarea preferinţelor de criptare ale destinatarului arată că mesajul ar "
 "trebui criptat cu OpenPGP, cel puţin pentru unii dintre ei.\n"
-"Totuşi nu aţi configurat chei de criptare OpenPGP de încredere pentru această "
-"identitate.\n"
+"Totuşi nu aţi configurat chei de criptare OpenPGP de încredere pentru "
+"această identitate.\n"
 "Puteţi continua fără criptaţi pentru dumneavoastră, dar aveţi grijă că nu vă "
 "veţi putea citi propriile mesaje dacă o faceţi."
 
@@ -5233,10 +5051,10 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Examinarea preferinţelor de criptare ale destinatarului arată că mesajul ar "
 "trebui criptat cu S/MIME, cel puţin pentru unii dintre ei.\n"
@@ -5247,15 +5065,15 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Din examinarea preferinţelor de semnare ale destinatarului rezultă că mesajul "
-"trebuie semnat cu OpenPGP, cel puţin pentru unii dintre ei.\n"
-"Cu toate aceastea, pentru această identitate nu aţi configurat certificate de "
-"semnare OpenPGP valide."
+"Din examinarea preferinţelor de semnare ale destinatarului rezultă că "
+"mesajul trebuie semnat cu OpenPGP, cel puţin pentru unii dintre ei.\n"
+"Cu toate aceastea, pentru această identitate nu aţi configurat certificate "
+"de semnare OpenPGP valide."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5263,15 +5081,15 @@ msgstr "Nu semnează cu OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Din examinarea preferinţelor de semnare ale destinatarului rezultă că mesajul "
-"trebuie semnat cu S/MIME, cel puţin pentru unii dintre ei.\n"
-"Cu toate aceastea, pentru această identitate nu aţi configurat certificate de "
-"semnare S/MIME valide."
+"Din examinarea preferinţelor de semnare ale destinatarului rezultă că "
+"mesajul trebuie semnat cu S/MIME, cel puţin pentru unii dintre ei.\n"
+"Cu toate aceastea, pentru această identitate nu aţi configurat certificate "
+"de semnare S/MIME valide."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5284,8 +5102,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"La examinarea preferinţelor de semnare ale destinatarului a reieşit că trebuie "
-"să fiţi întrebat dacă doriţi să semnaţi sau nu acest mesaj.\n"
+"La examinarea preferinţelor de semnare ale destinatarului a reieşit că "
+"trebuie să fiţi întrebat dacă doriţi să semnaţi sau nu acest mesaj.\n"
 "Doriţi să semnaţi acest mesaj?"
 
 #: keyresolver.cpp:1335
@@ -5295,11 +5113,11 @@ msgstr "&Trimitere"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Nu aţi selectat o cheie de criptare proprie (criptare pentru dumnneavoastră). "
-"Nu veţi putea decripta propriile mesaje criptate."
+"Nu aţi selectat o cheie de criptare proprie (criptare pentru "
+"dumnneavoastră). Nu veţi putea decripta propriile mesaje criptate."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5315,16 +5133,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Nu aţi selectat o cheie de criptare pentru destinatarul acestui mesaj. De aceea "
-"mesajul nu va fi criptat."
+"Nu aţi selectat o cheie de criptare pentru destinatarul acestui mesaj. De "
+"aceea mesajul nu va fi criptat."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Nu aţi selectat o cheie de criptare pentru nici unul din destinatarii acestui "
-"mesaj. De aceea mesajul nu va fi criptat."
+"Nu aţi selectat o cheie de criptare pentru nici unul din destinatarii "
+"acestui mesaj. De aceea mesajul nu va fi criptat."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5335,8 +5153,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nu aţi selectat o cheie de criptare pentru unul din destinatarii acestui mesaj. "
-"Acea persoană nu va putea citi mesajul dacă îl criptaţi."
+"Nu aţi selectat o cheie de criptare pentru unul din destinatarii acestui "
+"mesaj. Acea persoană nu va putea citi mesajul dacă îl criptaţi."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5368,11 +5186,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Nu am găsit o cheie de criptare validă şi de încredere pentru \"%1\".\n"
 "\n"
@@ -5421,10 +5239,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Eroare critică: Nu am putut colecta mesajele:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Eşec la adăugarea mesajului:\n"
+msgid "Failed to add message:\n"
+msgstr "Eşec la adăugarea mesajului:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5469,8 +5285,7 @@ msgstr "Mut mesajul %3 din %2 din %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Nu am putut să şterg mesajul din căsuţa de mail <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Nu am putut să şterg mesajul din căsuţa de mail <b>%1</b>:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 #, fuzzy
@@ -5518,6 +5333,51 @@ msgstr "IMAP &deconectat"
 msgid "&Maildir mailbox"
 msgstr "Căsuţă &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Setează subiectul mesajului"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Trimite CC: la 'adresă'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Trimite BCC: la 'adresă'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Adaugă 'antet' la mesaj"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Citeşte corpul mesajului dintr-un 'fişier'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Setează corpul mesajului"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Adaugă un ataşament la mesaj. Această acţiune poate fi repetată"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Verifică dacă există mesaje noi"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Deschide numai fereastra de compunere"
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "Mut mesajul %3 din %2 din %1."
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mesaje"
@@ -5561,8 +5421,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail va crea acum folderele necesare pentru resursele IMAP, ca subfoldere ale "
-"%1. Dacă nu este ceea ce doriţi, apăsaţi \"Nu\" şi resursa IMAP va fi "
+"KMail va crea acum folderele necesare pentru resursele IMAP, ca subfoldere "
+"ale %1. Dacă nu este ceea ce doriţi, apăsaţi \"Nu\" şi resursa IMAP va fi "
 "dezactivată."
 
 #: kmailicalifaceimpl.cpp:1787
@@ -5576,12 +5436,12 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"KMail va crea acum folderele necesare pentru resursele IMAP, ca subfoldere ale "
-"%1. Dacă nu este ceea ce doriţi, apăsaţi \"Nu\" şi resursa IMAP va fi "
+"KMail va crea acum folderele necesare pentru resursele IMAP, ca subfoldere "
+"ale %1. Dacă nu este ceea ce doriţi, apăsaţi \"Nu\" şi resursa IMAP va fi "
 "dezactivată."
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5632,11 +5492,11 @@ msgstr "Am copiat URL-ul în clipboard."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Fişierul <b>%1</b> există.<br>Doriţi să îl înlocuiesc?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Salvează în fişier"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "În&locuieşte"
 
@@ -5654,7 +5514,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5674,11 +5534,11 @@ msgstr "Fişierul nu conţine un mesaj."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fişierul conţine mesaje multiple. Va fi afişat numai primul."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5688,86 +5548,86 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Şterg mesajele"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Mut mesajul %3 din %2 din %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Nu există suficient spaţiu liber de disc?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Mută în acest folder"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copiază în acest folder"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Mut mesajele"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Şterg mesajele"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Deschid URL-ul..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Doriţi într-adevăr să executaţi <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "Execută comanda"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nu am găsit nici un ataşament de salvat."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Salvează ataşamentele în"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "atasament.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "atasament.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Cu acest nume există deja fişierul %1. Doriţi să îl suprascriu?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fişierul există deja"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Suprascrie"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5775,21 +5635,21 @@ msgstr ""
 "Parte %1 a mesajului este criptată. Doriţi să păstrez criptarea la salvarea "
 "mesajului?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Întrebare KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Criptare"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "&Nu cripta"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5797,12 +5657,12 @@ msgstr ""
 "Parte %1 a mesajului este semnată. Doriţi să păstrez semnătura la salvarea "
 "mesajului?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Semnătură"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5811,93 +5671,93 @@ msgstr ""
 "Nu am putut scrie în fişierul %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Nu am putut scrie în fişierul %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Nu există o înregistrare în Cartea de Adrese pentru această adresă de e-mail. "
-"Adăugaţi-o la Cartea de Adrese şi apoi adăugaţi adresele de mesagerie "
+"Nu există o înregistrare în Cartea de Adrese pentru această adresă de e-"
+"mail. Adăugaţi-o la Cartea de Adrese şi apoi adăugaţi adresele de mesagerie "
 "instantanee utilizînd aplicaţia client preferată."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
-"Pentru această adresă de e-mail există mai mult de o înregistrare în Cartea de "
-"Adrese:\n"
+"Pentru această adresă de e-mail există mai mult de o înregistrare în Cartea "
+"de Adrese:\n"
 " %1\n"
 " nu este posibil să determin cu cine doriţi să conversaţi."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Selectare cheie de criptare"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Mesaje"
@@ -5996,7 +5856,7 @@ msgstr "Mărime"
 msgid "Encoding"
 msgstr "Codificare"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Comprimă"
 
@@ -6008,7 +5868,7 @@ msgstr "Criptează"
 msgid "Sign"
 msgstr "Semnează"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Numele ataşamentului:"
 
@@ -6030,10 +5890,11 @@ msgstr "Destinatari principali"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>Adresele de e-mail pe care le puneţi aici vor primi o copie a "
-"mesajului.</qt>"
+"<qt>Adresele de e-mail pe care le puneţi aici vor primi o copie a mesajului."
+"</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6042,14 +5903,14 @@ msgstr "Destinatari adiţionali"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Adresele de e-mail pe care le puneţi aici vor primi o copie a mesajului. "
-"Din punct de vedere tehnic este acelaşi lucru cu a pune adresele în cîmpul <b>"
-"Către:</b>, dar diferă deoarece simbolizează că destinatarul din Carbon Copy "
-"(CC) este un \"ascultător\", şi nu destinatarul principal.</qt>"
+"Din punct de vedere tehnic este acelaşi lucru cu a pune adresele în cîmpul "
+"<b>Către:</b>, dar diferă deoarece simbolizează că destinatarul din Carbon "
+"Copy (CC) este un \"ascultător\", şi nu destinatarul principal.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6057,13 +5918,11 @@ msgstr "Destinatari ascunşi"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>În esenţă este acelaşi lucru cu cîmpul <b>Copie la:</b>"
-", dar diferă prin faptul că ceilalţi destinatari nu văd cine primeşte o copie "
-"oarbă.</qt>"
+"<qt>În esenţă este acelaşi lucru cu cîmpul <b>Copie la:</b>, dar diferă prin "
+"faptul că ceilalţi destinatari nu văd cine primeşte o copie oarbă.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
@@ -6075,7 +5934,7 @@ msgstr "&Sendmail"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "T&rimite mai tîrziu"
@@ -6143,8 +6002,7 @@ msgstr "Elimină caracterele de &citare"
 msgid "Cl&ean Spaces"
 msgstr "Elimină &spaţiile"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Utilizează font de lăţime fi&xă"
@@ -6287,31 +6145,31 @@ msgstr "Format mesaj &criptografic"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Listă de itemi (disc)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Listă de itemi (cerc)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Listă de itemi (pătrat)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Listă ordonată (zecimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Listă ordonată (alfabetic minuscule)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Listă ordonată (alfabetic majuscule)"
 
@@ -6420,62 +6278,61 @@ msgstr "Închide fereastra de compunere"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Mesajul pe care l-aţi compus pare să facă referire la un fişier ataşat, dar nu "
-"aţi ataşat nimic.\n"
+"Mesajul pe care l-aţi compus pare să facă referire la un fişier ataşat, dar "
+"nu aţi ataşat nimic.\n"
 "Doriţi să ataşaţi un fişier la mesajul dumneavoastră?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Indicaţie ataşare fişier"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "T&rimite aşa cum este"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail nu a putut recunoaşte locaţia ataşamentului (%1);</p>"
-"<p>Trebuie să specificaţi calea completă dacă doriţi să ataşaţi un fişier.</p>"
-"</qt>"
+"<qt><p>KMail nu a putut recunoaşte locaţia ataşamentului (%1);</p><p>Trebuie "
+"să specificaţi calea completă dacă doriţi să ataşaţi un fişier.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Ataşare fişier"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Ataşează"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Inserează fişier"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Inserează fişier"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>A apărut o eroare la exportarea cheii din subsistem: </p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>A apărut o eroare la exportarea cheii din subsistem: </p><p><b>%1</"
+"b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6514,302 +6371,310 @@ msgid ""
 "View"
 msgstr "Vizualizează"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Editează..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Editează..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "S&alvează ca..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Proprietăţi..."
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Adaugă ataşament..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Nu am putut comprima fişierul."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"Fişierul comprimat este mai mare decît cel original. Doriţi să-l păstrez pe cel "
-"original?"
+"Fişierul comprimat este mai mare decît cel original. Doriţi să-l păstrez pe "
+"cel original?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "&Bip"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Nu am putut decomprima fişierul."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Salvează ataşamentul ca"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Adaugă ca text"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Adaugă ca ataşament"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Lipeşte ca &ataşament"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nedenumit"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aţi cerut ca mesajele să fie criptate pentru dumneavoastră, dar identitatea "
-"curentă selectată nu defineşte o cheie (OpenPGP sau S/MIME) de criptare.</p>"
-"<p>Vă rog să selectaţi cheia/cheile de utilizat în dialogul de configurare a "
-"identităţii.</p></qt>"
+"<qt><p>Aţi cerut ca mesajele să fie criptate pentru dumneavoastră, dar "
+"identitatea curentă selectată nu defineşte o cheie (OpenPGP sau S/MIME) de "
+"criptare.</p><p>Vă rog să selectaţi cheia/cheile de utilizat în dialogul de "
+"configurare a identităţii.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Cheie de criptare nedefinită"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pentru a putea semna acest mesaj, trebuie să definiţi o cheie (OpenPGP sau "
-"S/MIME) de semnare.</p>"
-"<p>Vă rog să selectaţi cheia de utilizat în dialogul de configurare a "
-"identităţii.</p></qt>"
+"<qt><p>Pentru a putea semna acest mesaj, trebuie să definiţi o cheie "
+"(OpenPGP sau S/MIME) de semnare.</p><p>Vă rog să selectaţi cheia de utilizat "
+"în dialogul de configurare a identităţii.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Cheie de semnare nedefinită"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Trebuie să introduceţi în cîmpul \"De la:\" adresa dumneavoastră de e-mail. De "
-"asemenea ar trebui să setaţi adresa de e-mail pentru toate identităţiile astfel "
-"încît să nu fiţi întrebat de ea pentru fiecare mesaj de trimis."
+"Trebuie să introduceţi în cîmpul \"De la:\" adresa dumneavoastră de e-mail. "
+"De asemenea ar trebui să setaţi adresa de e-mail pentru toate identităţiile "
+"astfel încît să nu fiţi întrebat de ea pentru fiecare mesaj de trimis."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Trebuie să specificaţi cel puţin un destinatar, cel puţin în cîmpul \"Către:\" "
-"sau în \"CC:\" sau \"BCC:\"."
+"Trebuie să specificaţi cel puţin un destinatar, cel puţin în cîmpul \"Către:"
+"\" sau în \"CC:\" sau \"BCC:\"."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Nu aţi specificat un subiect. Trimit mesajul?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Nu aţi specificat un nume"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nu aţi specificat un subiect. Trimit mesajul?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nu aţi specificat un subiect"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "T&rimite"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Specifică subiectul"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Păstrează marcarea, nu semna/cripta"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Păstrează marcarea, nu cripta"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Păstrează marcarea, nu semna"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Semnează/Criptează (şterge marcarea)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Criptează (şterge marcarea)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Semnează (şterge marcarea)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Semnarea/criptarea mesajelor direct HTML nu este posibilă.</p>"
-"<p>Doriţi să şterg marcarea ?</p></qt>"
+"<qt><p>Semnarea/criptarea mesajelor direct HTML nu este posibilă.</"
+"p><p>Doriţi să şterg marcarea ?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Semnez/Criptez mesajul?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Folderul \"ciorne\" al identităţii \"%1\" nu mai există. De aceea pentru ciorne "
-"va fi utilizat folderul implicit."
+"Folderul \"ciorne\" al identităţii \"%1\" nu mai există. De aceea pentru "
+"ciorne va fi utilizat folderul implicit."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 "Vă rog să creaţi un cont pentru trimiterea mesajelor şi să încercaţi din nou."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Urmează trimiterea mesajului..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Confirmare de trimitere"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Trimite &acum"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Destinatari ascunşi"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Destinatari adiţionali"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Verificator ortografic"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Verificator ortografic"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Verificare ortografică anulată."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Verificare ortografică oprită."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Verificare ortografică completă."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Verificator ortografic"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Nu am găsit un sfîrşit."
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Selectare cheie de criptare"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Mesajul a fost semnat de"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Mesajul a fost semnat de"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Mesaj OpenPGP - Criptat"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Mesaj cu subiectul:"
@@ -6859,8 +6724,8 @@ msgstr "Ortografie KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Nu am putut porni ISpell/Aspell. Asiguraţi-vă că aveţi ISpell sau ASpell "
 "configurat corespunzător şi că este accesibil prin intermediul variabilei de "
@@ -6898,13 +6763,11 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Acţiune de filtru necunoscută <b>%1<b>"
-"<br>în regula de filtrare <b>%2</b>."
-"<br>O ignor.</qt>"
+"<qt>Acţiune de filtru necunoscută <b>%1<b><br>în regula de filtrare <b>%2</"
+"b>.<br>O ignor.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7124,169 +6987,138 @@ msgstr "Redă sunetul"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aceasta este lista de filtre definite. Ele sînt procesate de sus în jos.</p>"
-"<p>Daţi clic pe oricare din filtre pentru a-l edita utilizînd interfaţa grafică "
-"din partea dreaptă a dialogului.</p></qt>"
+"<qt><p>Aceasta este lista de filtre definite. Ele sînt procesate de sus în "
+"jos.</p><p>Daţi clic pe oricare din filtre pentru a-l edita utilizînd "
+"interfaţa grafică din partea dreaptă a dialogului.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru a crea un filtru nou.</p>"
-"<p>El va fi inserat imediat după cel curent selectat, dar îi puteţi schimba mai "
-"tîrziu poziţia.</p>"
-"<p>Dacă aţi apăsat accidental acest buton, atunci puteţi reveni la starea de "
-"mai înainte dînd clic pe butonul <em>Şterge</em>.</p></qt>"
+"<qt><p>Daţi clic pe acest buton pentru a crea un filtru nou.</p><p>El va fi "
+"inserat imediat după cel curent selectat, dar îi puteţi schimba mai tîrziu "
+"poziţia.</p><p>Dacă aţi apăsat accidental acest buton, atunci puteţi reveni "
+"la starea de mai înainte dînd clic pe butonul <em>Şterge</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru a copia un filtru.</p>"
-"<p>Dacă aţi apăsat accidental acest buton, atunci puteţi reveni la starea de "
-"mai înainte dînd clic pe butonul <em>Şterge</em>.</p></qt>"
+"<qt><p>Daţi clic pe acest buton pentru a copia un filtru.</p><p>Dacă aţi "
+"apăsat accidental acest buton, atunci puteţi reveni la starea de mai înainte "
+"dînd clic pe butonul <em>Şterge</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru <em>şterge</em> filtrul curent selectat din "
-"lista de mai sus.</p>"
-"<p>Nu există nici o posibilitate să recuperaţi filtrul după ce l-aţi şters, dar "
-"în orice moment puteţi părăsi dialogul de configurare filtre apăsînd butonul "
-"<em>Renunţă</em>. În acest mod sînt eliminate modificările pe care le-aţi "
-"făcut.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Daţi clic pe acest buton pentru <em>şterge</em> filtrul curent "
+"selectat din lista de mai sus.</p><p>Nu există nici o posibilitate să "
+"recuperaţi filtrul după ce l-aţi şters, dar în orice moment puteţi părăsi "
+"dialogul de configurare filtre apăsînd butonul <em>Renunţă</em>. În acest "
+"mod sînt eliminate modificările pe care le-aţi făcut.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai <em>"
-"jos</em> în listă.</p>"
-"<p>Acest lucru este util deoarece ordinea filtrelor determină ordinea în care "
-"sînt aplicate mesajelor. Cel mai de sus filtru este încercat primul.</p>"
-"<p>Dacă aţi apăsat accidental acest buton, atunci puteţi reveni la starea "
-"iniţială apăsînd butonul <em>Sus</em></p></qt>"
+"<qt><p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai "
+"<em>jos</em> în listă.</p><p>Acest lucru este util deoarece ordinea "
+"filtrelor determină ordinea în care sînt aplicate mesajelor. Cel mai de sus "
+"filtru este încercat primul.</p><p>Dacă aţi apăsat accidental acest buton, "
+"atunci puteţi reveni la starea iniţială apăsînd butonul <em>Sus</em></p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai <em>"
-"sus</em> în listă.</p>"
-"<p>Acest lucru este util deoarece ordinea filtrelor determină ordinea în care "
-"sînt aplicate mesajelor. Cel mai de sus filtru este încercat primul.</p>"
-"<p>Dacă aţi apăsat accidental acest buton, atunci puteţi reveni la starea "
-"iniţială apăsînd butonul <em>Jos</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai "
+"<em>sus</em> în listă.</p><p>Acest lucru este util deoarece ordinea "
+"filtrelor determină ordinea în care sînt aplicate mesajelor. Cel mai de sus "
+"filtru este încercat primul.</p><p>Dacă aţi apăsat accidental acest buton, "
+"atunci puteţi reveni la starea iniţială apăsînd butonul <em>Jos</em></p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai <em>"
-"jos</em> în listă.</p>"
-"<p>Acest lucru este util deoarece ordinea filtrelor determină ordinea în care "
-"sînt aplicate mesajelor. Cel mai de sus filtru este încercat primul.</p>"
-"<p>Dacă aţi apăsat accidental acest buton, atunci puteţi reveni la starea "
-"iniţială apăsînd butonul <em>Sus</em></p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai "
+"<em>jos</em> în listă.</p><p>Acest lucru este util deoarece ordinea "
+"filtrelor determină ordinea în care sînt aplicate mesajelor. Cel mai de sus "
+"filtru este încercat primul.</p><p>Dacă aţi apăsat accidental acest buton, "
+"atunci puteţi reveni la starea iniţială apăsînd butonul <em>Sus</em></p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai <em>"
-"jos</em> în listă.</p>"
-"<p>Acest lucru este util deoarece ordinea filtrelor determină ordinea în care "
-"sînt aplicate mesajelor. Cel mai de sus filtru este încercat primul.</p>"
-"<p>Dacă aţi apăsat accidental acest buton, atunci puteţi reveni la starea "
-"iniţială apăsînd butonul <em>Sus</em></p></qt>"
+"<qt><p>Daţi clic pe acest buton pentru a muta filtrul selectat o poziţie mai "
+"<em>jos</em> în listă.</p><p>Acest lucru este util deoarece ordinea "
+"filtrelor determină ordinea în care sînt aplicate mesajelor. Cel mai de sus "
+"filtru este încercat primul.</p><p>Dacă aţi apăsat accidental acest buton, "
+"atunci puteţi reveni la starea iniţială apăsînd butonul <em>Sus</em></p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Daţi clic pe acest buton pentru a redenumi filtrul selectat.</p>"
-"<p>Filtrele sînt denumite automat, atîta timp cît încep cu \"<<\".</p>"
-"<p>Dacă aţi redenumit accidental un filtru şi doriţi din nou să fie denumit "
-"automat, daţi clic pe acest buton, selectaţi <em>Şterge</em> "
-"iar apoi apăsaţi <em>OK</em> în dialogul ce va apare.</p></qt>"
+"<qt><p>Daţi clic pe acest buton pentru a redenumi filtrul selectat.</"
+"p><p>Filtrele sînt denumite automat, atîta timp cît încep cu \"<<\".</"
+"p><p>Dacă aţi redenumit accidental un filtru şi doriţi din nou să fie "
+"denumit automat, daţi clic pe acest buton, selectaţi <em>Şterge</em> iar "
+"apoi apăsaţi <em>OK</em> în dialogul ce va apare.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selectaţi acest buton pentru a forţa afişarea dialogului de confirmare.</p>"
-"<p>Acest lucru este util dacă aţi definit o regulă care marchează mesajele să "
-"fie transferate mai tîrziu. Fără posibilitatea de a forţa apariţia dialogului, "
-"aceste mesaje nu vor fi aduse niciodată dacă nu mai există alte mesaje mari "
-"care să aştepte pe server. Acest lucru se poate întîmpla şi dacă doriţi să "
-"modificaţi regula aşa încît să marcaţi diferit mesajele.</p></qt>"
+"<qt><p>Selectaţi acest buton pentru a forţa afişarea dialogului de "
+"confirmare.</p><p>Acest lucru este util dacă aţi definit o regulă care "
+"marchează mesajele să fie transferate mai tîrziu. Fără posibilitatea de a "
+"forţa apariţia dialogului, aceste mesaje nu vor fi aduse niciodată dacă nu "
+"mai există alte mesaje mari care să aştepte pe server. Acest lucru se poate "
+"întîmpla şi dacă doriţi să modificaţi regula aşa încît să marcaţi diferit "
+"mesajele.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7296,6 +7128,16 @@ msgstr "Reguli filtre POP3"
 msgid "Filter Rules"
 msgstr "Reguli filtre"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importă"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importă"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtre disponibile"
@@ -7384,6 +7226,11 @@ msgstr "Adaugă acest filtru şi în bara de unelte"
 msgid "Icon for this filter:"
 msgstr "Iconiţa pentru acest filtru:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Către"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Sus"
@@ -7392,16 +7239,29 @@ msgstr "Sus"
 msgid "Down"
 msgstr "Jos"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Redenumeşte..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nou"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copiază în"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Şters"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7410,8 +7270,8 @@ msgstr "Selectaţi acceleratorul pentru folder"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7488,29 +7348,25 @@ msgstr "Depanare cache IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Depanarea cache-ului IMAP.</b></p>"
-"<p> Dacă aveţi probleme cu sincronizarea unui folder IMAP, mai întîi ar trebuie "
-"să încercaţi recontruirea fişierului index. Operaţia durează ceva timp, dar nu "
-"creează probleme.</p>"
-"<p>Dacă acest lucru nu e suficient, aţi putea încearca reactualizarea "
-"cache-ului IMAP. Asta înseamnă că veţi pierde toate modificările locale din "
-"acest folder şi subfolderele sale.</p>"
+"<p><b>Depanarea cache-ului IMAP.</b></p><p> Dacă aveţi probleme cu "
+"sincronizarea unui folder IMAP, mai întîi ar trebuie să încercaţi "
+"recontruirea fişierului index. Operaţia durează ceva timp, dar nu creează "
+"probleme.</p><p>Dacă acest lucru nu e suficient, aţi putea încearca "
+"reactualizarea cache-ului IMAP. Asta înseamnă că veţi pierde toate "
+"modificările locale din acest folder şi subfolderele sale.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7547,14 +7403,15 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
-"Trebuie să faceţi sincronizarea cu serverul înainte de a redenumi foldere IMAP."
+"Trebuie să faceţi sincronizarea cu serverul înainte de a redenumi foldere "
+"IMAP."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7588,8 +7445,8 @@ msgstr "Indexul acestui folder a fost recreat."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Folderul %1 nu este în starea iniţială de sincronizare (starea a fost %2). "
 "Doriţi să o resetez la starea iniţială şi să fac sincronizarea în aceste "
@@ -7720,14 +7577,11 @@ msgstr "Creez subfoldere pe server"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Se pare că folderul <b>%1</b> a fost şters. Doriţi să-l ştergeţi şi de pe "
-"server?</p></qt>"
+"<qt><p>Se pare că folderul <b>%1</b> a fost şters. Doriţi să-l ştergeţi şi "
+"de pe server?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7748,13 +7602,11 @@ msgstr "Transfer lista de foldere"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Se pare că folderul <b>%1</b> a fost şters. Doriţi să-l ştergeţi şi de pe "
-"server?</p></qt>"
+"<qt><p>Se pare că folderul <b>%1</b> a fost şters. Doriţi să-l ştergeţi şi "
+"de pe server?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7762,8 +7614,8 @@ msgstr "Anulat"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "Serverul IMAP %1 nu are suport pentru adnotări IMAP. Zona de stocare XML nu "
 "poate fi utilizată pe acest server. Reconfiguraţi diferit KMail."
@@ -7771,8 +7623,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "Serverul IMAP %1 nu are suport pentru adnotări IMAP. Zona de stocare XML nu "
 "poate fi utilizată pe acest server. Reconfiguraţi diferit KMail."
@@ -7787,11 +7639,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7800,15 +7652,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Mută în:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "&Nu semna"
@@ -7822,8 +7679,7 @@ msgstr "Mută mesajul în folder"
 msgid "Permissions (ACL)"
 msgstr "Permisiuni (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "General"
@@ -7848,8 +7704,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Utilizează &iconiţe personalizate"
@@ -7869,14 +7724,13 @@ msgstr "Notifică cînd există mesaje noi în acest folder"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7889,9 +7743,9 @@ msgstr "Păstrează răspunsurile la mesaje în acest folder"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Dacă selectaţi opţiunea, răspunsurile pe care le daţi la mesajele din acest "
 "folder vor fi salvate direct în el. De regulă ele sînt salvate în folderul "
@@ -7905,17 +7759,21 @@ msgstr "Afişează în lista de mesaje coloana Expeditor/Destinatar"
 msgid "Sho&w column:"
 msgstr "Afişează &coloana:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Setează ca implicită"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Expeditor"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Destinatar"
@@ -7926,11 +7784,11 @@ msgstr "Identitate e&xpeditor:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Selectaţi identitatea expeditorului ce va fi utilizată la scrierea de mesaje "
 "noi sau cînd răspundeţi la mesaje din acest folder. Asta înseamnă că dacă nu "
@@ -7955,26 +7813,26 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Această setare defineşte care din utilizatorii care partajează acest folder vor "
-"primi perioade \"ocupate\" în listele lor liber-ocupat şi vor vedea alarmele "
-"pentru evenimentele sau activităţile din acest folder. Această setare se aplică "
-"numai folderelor Calendar şi Activităţi (pentru activităţi, această setare este "
-"utilizată numai la alarme).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Această setare defineşte care din utilizatorii care partajează acest folder "
+"vor primi perioade \"ocupate\" în listele lor liber-ocupat şi vor vedea "
+"alarmele pentru evenimentele sau activităţile din acest folder. Această "
+"setare se aplică numai folderelor Calendar şi Activităţi (pentru activităţi, "
+"această setare este utilizată numai la alarme).\n"
 "\n"
-"Exemple de utilizări: dacă şeful partajează un folder cu secretara lui, numai "
-"şeful va fi marcat ca ocupat pentru şedinţe. El trebuie să selecteze "
-"\"Administratori\" deoarece secretara nu are permisiuni de administrare pentru "
-"folder.\n"
-"Pe de altă parte, dacă un grup de lucru partajează un Calendar pentru şedinţele "
-"de grup, toţi cei care pot citi folderul ar trebui marcaţi ca ocupaţi la "
-"şedinţe.\n"
+"Exemple de utilizări: dacă şeful partajează un folder cu secretara lui, "
+"numai şeful va fi marcat ca ocupat pentru şedinţe. El trebuie să selecteze "
+"\"Administratori\" deoarece secretara nu are permisiuni de administrare "
+"pentru folder.\n"
+"Pe de altă parte, dacă un grup de lucru partajează un Calendar pentru "
+"şedinţele de grup, toţi cei care pot citi folderul ar trebui marcaţi ca "
+"ocupaţi la şedinţe.\n"
 "Un folder la nivel de firmă cu evenimente opţionale în el va trebuie să "
 "folosească \"Nimeni\" deoarece nu se ştie cine va veni la acele evenimente."
 
@@ -8007,23 +7865,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Aţi configurat acest folder să conţine informaţii de colaborare. Am setat "
 "opţiunea generală de configurare de a ascunde acest tip de foldere. Asta "
-"înseamnă că folderul va dispare imediat ce dialogul va fi închis. Dacă doriţi "
-"să ştergeţi folderul, trebuie să dezactivaţi temporar ascunderea lor pentru a "
-"le putea vedea."
+"înseamnă că folderul va dispare imediat ce dialogul va fi închis. Dacă "
+"doriţi să ştergeţi folderul, trebuie să dezactivaţi temporar ascunderea lor "
+"pentru a le putea vedea."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8093,13 +7951,14 @@ msgstr "Eroare la obţinerea de informaţii despre folder."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
-"Indexul de mesaje pentru '%1' este generat de o versiune necunoscută de KMail "
-"(%2).\n"
+"Indexul de mesaje pentru '%1' este generat de o versiune necunoscută de "
+"KMail (%2).\n"
 "Acest index poate fi regenerat pe baza folderului de mesaje, dar unele "
-"informaţii, printre care cele de stare, ar putea fi pierdute. Doriţi să recreez "
-"fişierul index?"
+"informaţii, printre care cele de stare, ar putea fi pierdute. Doriţi să "
+"recreez fişierul index?"
 
 #: kmfolderindex.cpp:372
 #, fuzzy
@@ -8116,11 +7975,11 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"Indexul de mesaje pentru '%1' este generat de o versiune necunoscută de KMail "
-"(%2).\n"
+"Indexul de mesaje pentru '%1' este generat de o versiune necunoscută de "
+"KMail (%2).\n"
 "Acest index poate fi regenerat pe baza folderului de mesaje, dar unele "
-"informaţii, printre care cele de stare, ar putea fi pierdute. Doriţi să recreez "
-"fişierul index?"
+"informaţii, printre care cele de stare, ar putea fi pierdute. Doriţi să "
+"recreez fişierul index?"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8128,11 +7987,11 @@ msgstr "Eroare la deschiderea %1. Folderul lipseşte."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Eroare la deschiderea %1. Acestea nu este un folder maildir valid sau nu aveţi "
-"suficiente permisiuni de acces."
+"Eroare la deschiderea %1. Acestea nu este un folder maildir valid sau nu "
+"aveţi suficiente permisiuni de acces."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8149,7 +8008,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: s-a terminat anormal pentru a evita pierderi de date."
+"KMFolderMaildir::addMsg: s-a terminat anormal pentru a evita pierderi de "
+"date."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8174,21 +8034,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Se pare că indexul folderului '%2' nu este la zi. Pentru a preveni coruperea "
-"mesajelor, indexul va fi regenerat. Din această cauză s-ar putea să reapară "
-"mesaje şterse, iar informaţiile de stare ale mesajelor ar putea fi pierdute.</p> "
-"<p>Citiţi secţiunea <a href=\"%1\">Răspunsuri la întrebări frecvente</a> "
-"din manualul KMail pentru a afla cum să evitaţi reapariţia acestei probleme.</p>"
-"</qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Se pare că indexul folderului '%2' nu este la zi. Pentru a preveni "
+"coruperea mesajelor, indexul va fi regenerat. Din această cauză s-ar putea "
+"să reapară mesaje şterse, iar informaţiile de stare ale mesajelor ar putea "
+"fi pierdute.</p> <p>Citiţi secţiunea <a href=\"%1\">Răspunsuri la întrebări "
+"frecvente</a> din manualul KMail pentru a afla cum să evitaţi reapariţia "
+"acestei probleme.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8205,7 +8062,8 @@ msgstr "Nu am putut sincroniza fişierul index <b>%1</b>: %2"
 #: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr ""
-"Eroare internă. Vă rog să copiaţi detaliile de mai jos şi să raportaţi eroarea."
+"Eroare internă. Vă rog să copiaţi detaliile de mai jos şi să raportaţi "
+"eroarea."
 
 #: kmfoldermbox.cpp:602
 #, fuzzy, c-format
@@ -8248,7 +8106,7 @@ msgstr ""
 "'%1' nu pare să fie un folder.\n"
 "Vă rog să mutaţi fişierul în altă parte."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8256,7 +8114,7 @@ msgstr ""
 "Permisiunile folderului '%1' sînt incorecte.\n"
 "Verificaţi că puteţi modifica şi vedea conţinutul din acest folder."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8266,8 +8124,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8275,7 +8133,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Eroare la crearea folderului"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8379,13 +8237,14 @@ msgstr "&Depanează cache-ul IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Nu am putut crea folderul <b>%1</b> deoarece nu aveţi suficiente permisiuni "
-"pe server. Dacă credeţi că ar trebui să puteţi crea aici subfoldere, cereţi "
-"administratorului serverului să vă dea drepturile necesare.</qt> "
+"<qt>Nu am putut crea folderul <b>%1</b> deoarece nu aveţi suficiente "
+"permisiuni pe server. Dacă credeţi că ar trebui să puteţi crea aici "
+"subfoldere, cereţi administratorului serverului să vă dea drepturile "
+"necesare.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8523,15 +8382,15 @@ msgstr "În folderul %1 se pot face numai citiri."
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Doriţi într-adevăr să ştergeţi mesajul selectat?"
-"<br>Odată şters nu mai poate fi recuperat.</qt>\n"
-"<qt>Doriţi într-adevăr să ştergeţi cele %n mesaje selectate?"
-"<br>Odată şterse nu mai pot fi recuperate.</qt>"
+"<qt>Doriţi într-adevăr să ştergeţi mesajul selectat?<br>Odată şters nu mai "
+"poate fi recuperat.</qt>\n"
+"<qt>Doriţi într-adevăr să ştergeţi cele %n mesaje selectate?<br>Odată şterse "
+"nu mai pot fi recuperate.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8583,137 +8442,134 @@ msgstr ""
 "Eroare la modificarea %1\n"
 "(Nu mai există spaţiu de disc?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Cerere semnătură certificat"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Vă rog să creaţi un certificat din ataşament şi să-l trimiteţi expeditorului."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nu aveţi drepturi de citire/scriere în folderul \"intrare\"."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "ieşire"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nu aveţi drepturi de citire/scriere în folderul \"ieşire\"."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "trimise"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Nu aveţi drepturi de citire/scriere în folderul \"trimise\"."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "gunoi"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nu aveţi drepturi de citire/scriere în folderul \"gunoi\"."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "ciorne"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nu aveţi drepturi de citire/scriere în folderul \"ciorne\"."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "În&locuieşte"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nu aveţi drepturi de citire/scriere în folderul \"gunoi\"."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Ultima căutare"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Folderul <i>%4</i> există deja. %1 foloseşte acum pentru mesajele sale "
-"folderul <i>%5</i>. "
-"<p>%2 poate muta conţinutul <i>%6<i> în acest folder, dar e posibil să "
-"suprascrie fişiere cu acelaşi nume ca în <i>%7</i>. "
+"folderul <i>%5</i>. <p>%2 poate muta conţinutul <i>%6<i> în acest folder, "
+"dar e posibil să suprascrie fişiere cu acelaşi nume ca în <i>%7</i>. "
 "<p><strong>Doriţi într-adevăr ca %3 să mute aceste mesaje?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 #, fuzzy
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Folderul <i>%4</i> există deja. %1 foloseşte acum pentru mesajele sale "
-"folderul <i>%5</i>. %2 poate muta conţinutul <i>%6<i> "
-"în acest folder, dar e posibil să suprascrie fişiere cu acelaşi nume ca în <i>"
-"%7</i>. "
+"folderul <i>%5</i>. %2 poate muta conţinutul <i>%6<i> în acest folder, dar e "
+"posibil să suprascrie fişiere cu acelaşi nume ca în <i>%7</i>. "
 "<p><strong>Doriţi într-adevăr ca %3 să mute aceste mesaje?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrare mesaje"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail a întîlnit o eroare fatală şi se va termina acum"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8724,11 +8580,11 @@ msgstr ""
 "Eroarea a fost:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Golire gunoi"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Doriţi într-adevăr să golesc folderele gunoi pentru toate conturile?"
 
@@ -8805,8 +8661,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Mesaje noi sosite</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8844,11 +8699,11 @@ msgstr "Doriţi într-adevăr să golesc coşul de gunoi?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Doriţi într-adevăr să mut toate mesajele folderului <b>%1</b> "
-"în coşul de gunoi?</qt>"
+"<qt>Doriţi într-adevăr să mut toate mesajele folderului <b>%1</b> în coşul "
+"de gunoi?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8874,12 +8729,11 @@ msgstr "Ştergere folder"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Doriţi într-adevăr să ştergeţi folderul de căutare <b>%1</b>"
-"? Mesajele afişate în el nu vor fi şterse deoarece sînt stocate în alte "
-"foldere.</qt>"
+"<qt>Doriţi într-adevăr să ştergeţi folderul de căutare <b>%1</b>? Mesajele "
+"afişate în el nu vor fi şterse deoarece sînt stocate în alte foldere.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8892,23 +8746,21 @@ msgstr "<qt>Doriţi într-adevăr să şterg folderul gol <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Doriţi într-adevăr să şterg folderul gol <b>%1</b> "
-"şi toate subfolderele sale? Acele subfoldere s-ar putea să nu fie goale şi "
-"conţintul lor va fi de asemenea şters.</qt>"
+"<qt>Doriţi într-adevăr să şterg folderul gol <b>%1</b> şi toate subfolderele "
+"sale? Acele subfoldere s-ar putea să nu fie goale şi conţintul lor va fi de "
+"asemenea şters.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Doriţi într-adevăr să şterg folderul <b>%1</b> împreună cu conţinutul "
 "lui?</qt>"
@@ -8916,13 +8768,18 @@ msgstr ""
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Doriţi într-adevăr să şterg folderul <b>%1</b> şi toate subfolderele sale, "
-"inclusiv conţinutul?</qt>"
+"<qt>Doriţi într-adevăr să şterg folderul <b>%1</b> şi toate subfolderele "
+"sale, inclusiv conţinutul?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Şters"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8938,13 +8795,13 @@ msgstr "Doriţi într-adevăr să expir toate mesajele vechi?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Utilizarea HTML în mesaje vă va face mult mai vulnerabil la \"spam\" şi poate "
-"creşte posibilitatea ca sistemul dumneavoastră să fie compromis de exploatări "
-"ale slăbiciunilor de securitate prezente şi anticipate."
+"Utilizarea HTML în mesaje vă va face mult mai vulnerabil la \"spam\" şi "
+"poate creşte posibilitatea ca sistemul dumneavoastră să fie compromis de "
+"exploatări ale slăbiciunilor de securitate prezente şi anticipate."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8957,12 +8814,13 @@ msgstr "Foloseşte HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Încărcarea referinţelor externe în mesajele HTML vă va face mult mai vulnerabil "
-"la \"spam\" şi poate creşte posibilitatea ca sistemul dumneavoastră să fie "
-"compromis de exploatări ale slăbiciunilor de securitate prezente şi anticipate."
+"Încărcarea referinţelor externe în mesajele HTML vă va face mult mai "
+"vulnerabil la \"spam\" şi poate creşte posibilitatea ca sistemul "
+"dumneavoastră să fie compromis de exploatări ale slăbiciunilor de securitate "
+"prezente şi anticipate."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8978,8 +8836,8 @@ msgstr "Filtrează după lista de discuţii %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8997,10 +8855,11 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Nu pot porni vizualizorul de jurnal GnuPG (kwatchgnupg). Verificaţi instalarea "
-"programului."
+"Nu pot porni vizualizorul de jurnal GnuPG (kwatchgnupg). Verificaţi "
+"instalarea programului."
 
 #: kmmainwidget.cpp:2508
 #, fuzzy
@@ -9337,8 +9196,7 @@ msgstr "Salvează a&taşamentele..."
 msgid "Appl&y All Filters"
 msgstr "Aplică t&oate filtrele"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Aplică filtrul"
@@ -9452,7 +9310,6 @@ msgstr "Mesajul următor &necitit"
 msgid "Go to the next unread message"
 msgstr "Salt la următorul mesaj necitit"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Mesajul &precedent"
@@ -9500,8 +9357,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Derulează în jos mesajul curent. Dacă a ajuns la sfîrşitul mesajului, trece la "
-"următorul mesaj necitit."
+"Derulează în jos mesajul curent. Dacă a ajuns la sfîrşitul mesajului, trece "
+"la următorul mesaj necitit."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9595,8 +9452,8 @@ msgstr " Iniţializez..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9607,23 +9464,23 @@ msgstr ""
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Acest mesaj conţine o cerere de a trimite o notificare a livrării.\n"
-"Cererea are o instrucţiune de procesare marcată ca \"obligatoriu\", dar care nu "
-"este cunoscută de KMail.\n"
+"Cererea are o instrucţiune de procesare marcată ca \"obligatoriu\", dar care "
+"nu este cunoscută de KMail.\n"
 "Puteţi ignora cererea sau să lăsaţi KMail să trimită un răspuns de tipul "
 "\"eşec\"."
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9636,8 +9493,8 @@ msgstr ""
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9651,8 +9508,8 @@ msgstr ""
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9681,24 +9538,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Cîmpul \"Disposition-Notification-Options\" conţine valoarea \"required\" "
-"(obligatoriu), dar cu un parametru necunoscut"
+"Cîmpul \"Disposition-Notification-Options\" conţine valoarea \"required"
+"\" (obligatoriu), dar cu un parametru necunoscut"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Recipisă: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Ataşament: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Afişează ataşamentele aşa cum este sugerat de către expeditor."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9748,45 +9605,39 @@ msgstr "Proprietăţile părţii mesajului"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Tipul MIME</em> al fişierului:</p> "
-"<p>în mod normal nu  e nevoie să vă atingeţi de această setare deoarece tipul "
-"mesajului este verificat automat. Totuşi, uneori %1 nu poate detecta corect "
-"tipul -- aici puteţi corecta acest lucru.</p></qt>"
+"<qt><p><em>Tipul MIME</em> al fişierului:</p> <p>în mod normal nu  e nevoie "
+"să vă atingeţi de această setare deoarece tipul mesajului este verificat "
+"automat. Totuşi, uneori %1 nu poate detecta corect tipul -- aici puteţi "
+"corecta acest lucru.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Mărimea părţii:</p>"
-"<p>uneori %1 va reuşi să dea numai o estimare a mărimii deoarece calcularea "
-"exactă ar dura foarte mult timp. Cînd se întîmplă acest lucru, va evidenţia "
-"acest fapt adăugînd  \"(est.)\" la dimensiunea afişată.</p></qt>"
+"<qt><p>Mărimea părţii:</p><p>uneori %1 va reuşi să dea numai o estimare a "
+"mărimii deoarece calcularea exactă ar dura foarte mult timp. Cînd se "
+"întîmplă acest lucru, va evidenţia acest fapt adăugînd  \"(est.)\" la "
+"dimensiunea afişată.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Numele fişierului părţii:</p>"
-"<p>deşi implicit este numele fişierului ataşat, nu specifică fişierul ce va fi "
-"ataşat. Mai degrabă sugerează un nume ce va fi folosit la salvarea pe disc a "
-"părţii de către programul de mail al destinatarului.</p></qt>"
+"<qt><p>Numele fişierului părţii:</p><p>deşi implicit este numele fişierului "
+"ataşat, nu specifică fişierul ce va fi ataşat. Mai degrabă sugerează un nume "
+"ce va fi folosit la salvarea pe disc a părţii de către programul de mail al "
+"destinatarului.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9794,17 +9645,15 @@ msgstr "&Descrierea:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>O descriere a părţii:</p>"
-"<p>Aceasta reprezintă o descriere informativă a părţii, aşa cum este subiectul "
-"pentru întregul mesak. Majoritatea programelor de mail o vor afişa în "
-"previzualizările mesajelor împreună cu iconiţa de ataşament.</p></qt>"
+"<qt><p>O descriere a părţii:</p><p>Aceasta reprezintă o descriere "
+"informativă a părţii, aşa cum este subiectul pentru întregul mesak. "
+"Majoritatea programelor de mail o vor afişa în previzualizările mesajelor "
+"împreună cu iconiţa de ataşament.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9812,21 +9661,19 @@ msgstr "&Codificarea:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Codificarea la transport a acestei părţi:</p>"
-"<p> În mod normal nu trebuie să o schimbaţi deoarece %1 va utiliza implicit o "
-"codare corespunzătoare în funcţie de tipul MIME. Cu toate acestea, uneori "
-"puteţi reduce semnificativ mărimea mesajului rezultat, de exemplu dacă un "
-"fişier PostScript nu conţine date binare ci numai text pur -- în acest caz dacă "
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Codificarea la transport a acestei părţi:</p><p> În mod normal nu "
+"trebuie să o schimbaţi deoarece %1 va utiliza implicit o codare "
+"corespunzătoare în funcţie de tipul MIME. Cu toate acestea, uneori puteţi "
+"reduce semnificativ mărimea mesajului rezultat, de exemplu dacă un fişier "
+"PostScript nu conţine date binare ci numai text pur -- în acest caz dacă "
 "alegeţi \"text tipăribil\" în loc \"baza 64\" veţi economisi 25% din mărimea "
 "rezultată a mesajului.</p></qt>"
 
@@ -9836,19 +9683,17 @@ msgstr "Sugerează afişare &automată"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selectaţi această opţiune dacă doriţi să sugeraţi destinatarului afişarea "
-"automată (în corpul mesajului) a acestei părţi în loc de iconiţă.</p>"
-"<p>Tehnic, acest efect se obţine setînd cîmpul <em>Content-Disposition</em> "
-"al părţii la valoarea \"inline\" în loc de \"attachment\" (implicit).</p></qt>"
+"<qt><p>Selectaţi această opţiune dacă doriţi să sugeraţi destinatarului "
+"afişarea automată (în corpul mesajului) a acestei părţi în loc de iconiţă.</"
+"p><p>Tehnic, acest efect se obţine setînd cîmpul <em>Content-Disposition</"
+"em> al părţii la valoarea \"inline\" în loc de \"attachment\" (implicit).</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9856,16 +9701,13 @@ msgstr "&Semnează această parte"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selectaţi această opţiune dacă doriţi ca această parte de mesaj să fie "
-"semnată.</p>"
-"<p>Semnarea va fi făcută cu cheia pe care aţi asociat-o identităţii curente.</p>"
-"</qt>"
+"<qt><p>Selectaţi această opţiune dacă doriţi ca această parte de mesaj să "
+"fie semnată.</p><p>Semnarea va fi făcută cu cheia pe care aţi asociat-o "
+"identităţii curente.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9873,14 +9715,12 @@ msgstr "&Criptează această parte"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selectaţi această opţiune dacă doriţi ca această parte de mesaj să fie "
-"criptată.</p>"
-"<p>Această parte va fi criptată pentru destinatarii acestui mesaj.</p></qt>"
+"<qt><p>Selectaţi această opţiune dacă doriţi ca această parte de mesaj să "
+"fie criptată.</p><p>Această parte va fi criptată pentru destinatarii acestui "
+"mesaj.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9894,15 +9734,12 @@ msgstr "Filtru POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Mesaje de filtrat găsite pentru contul POP: <b>%1</b>"
-"<p>Mesajele afişate depăşesc limita maximă a mărimii pe care aţi definit-o la "
-"acest cont."
+"Mesaje de filtrat găsite pentru contul POP: <b>%1</b><p>Mesajele afişate "
+"depăşesc limita maximă a mărimii pe care aţi definit-o la acest cont."
 "<br>Puteţi selecta ce să faceţi cu ele selectînd butonul corespunzător."
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9916,8 +9753,8 @@ msgstr "Mesaje filtrate de regulă: nici unul"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Afişează mesajele ce se potrivesc cu o regulă şi sînt marcate \"Transferă\" sau "
-"\"Şterge\""
+"Afişează mesajele ce se potrivesc cu o regulă şi sînt marcate \"Transferă\" "
+"sau \"Şterge\""
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10158,15 +9995,14 @@ msgstr "Clientul de e-mail pentru Mediul Grafic K"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -10176,18 +10012,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10195,17 +10030,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Bun venit în KMail %1</h2> "
-"<p>KMail este clientul de email pentru Mediul Grafic K. El este proiectat să "
-"fie în întregime compatibil cu standardele de e-mail Internet, inclusiv MIME, "
-"SMTP, POP3 şi IMAP.</p>\n"
-"<ul>"
-"<li>KMail are multe caracteristici puternice care sînt descrise în <a "
+"<h2 style='margin-top: 0px;'>Bun venit în KMail %1</h2> <p>KMail este "
+"clientul de email pentru Mediul Grafic K. El este proiectat să fie în "
+"întregime compatibil cu standardele de e-mail Internet, inclusiv MIME, SMTP, "
+"POP3 şi IMAP.</p>\n"
+"<ul><li>KMail are multe caracteristici puternice care sînt descrise în <a "
 "href=\"%2\">documentaţie</a></li>\n"
-"<li><a href=\"%3\">Pagina de web KMail</a> oferă informaţii despre noi versiuni "
-"de KMail</li></ul>\n"
-"<p>Unele funcţii noi în această versiune de KMail sînt (comparativ cu KMail %4 "
-"din TDE %5):</p>\n"
+"<li><a href=\"%3\">Pagina de web KMail</a> oferă informaţii despre noi "
+"versiuni de KMail</li></ul>\n"
+"<p>Unele funcţii noi în această versiune de KMail sînt (comparativ cu KMail "
+"%4 din TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10214,22 +10048,20 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Echipa KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Completaţi panoul de configurare KMail activînd meniul "
-"Setări-&gt;Configurează KMail.\n"
-"Trebuie să creaţi cel puţin o identitate primară şi un cont de mail de intrare "
-"şi unul de ieşire.</p>\n"
+"<p>Completaţi panoul de configurare KMail activînd meniul Setări-&gt;"
+"Configurează KMail.\n"
+"Trebuie să creaţi cel puţin o identitate primară şi un cont de mail de "
+"intrare şi unul de ieşire.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10268,7 +10100,8 @@ msgstr "Vizualizează ataşamentul: %1"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Ataşamentul conţine date binare. Încerc să afişez primul caracter.]\n"
@@ -10289,8 +10122,8 @@ msgid ""
 "Note that opening an attachment may compromise your system's security."
 msgstr ""
 "Deschid ataşamentul '%1'?\n"
-"Observaţie: deschiderea unui ataşament poate compromite securitatea sistemului "
-"dumneavoastră."
+"Observaţie: deschiderea unui ataşament poate compromite securitatea "
+"sistemului dumneavoastră."
 
 #: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
@@ -10298,12 +10131,14 @@ msgstr "Deschidere ataşament"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10325,6 +10160,59 @@ msgstr "(se potriveşte cu oricare din următoarele)"
 msgid "(match all of the following)"
 msgstr "(se potriveşte cu toate din următoarele)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Citit"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Vechi"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Şters"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Răspuns"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Înaintat"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "În coadă"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Trimis"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Urmărit"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorat"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Către: "
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Are ataşament"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10408,10 +10296,10 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Mutarea mesajului trimis \"%1\" din folderul \"ieşire\" în \"trimise\" a "
 "eşuat.\n"
@@ -10421,13 +10309,13 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Nu este posibil să trimiteţi mesaje fără să specificaţi o adresa "
 "expeditorului.\n"
-"Setaţi adresa de e-mail a identităţii '%1' în secţiunea Identităţi a dialogului "
-"de configurare şi încercaţi din nou."
+"Setaţi adresa de e-mail a identităţii '%1' în secţiunea Identităţi a "
+"dialogului de configurare şi încercaţi din nou."
 
 #: kmsender.cpp:454
 #, fuzzy, c-format
@@ -10452,8 +10340,8 @@ msgstr "Iniţializez procesul de trimitere..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10479,15 +10367,16 @@ msgstr "Trimiterea unor mesaje a eşuat."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Trimitere eşuată:\n"
 "%1\n"
-"Mesajul va rămîne în folderul \"ieşire\" pînă cînd rezolvaţi problema (de ex: o "
-"adresă greşită) sau ştergeţi mesajul din acest folder.\n"
+"Mesajul va rămîne în folderul \"ieşire\" pînă cînd rezolvaţi problema (de "
+"ex: o adresă greşită) sau ştergeţi mesajul din acest folder.\n"
 "A fost utilizat următorul protocol de transport:\n"
 "  %2"
 
@@ -10497,20 +10386,16 @@ msgstr "Trimitere anulată."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Trimitere eşuată:</p>"
-"<p>%1</p>"
-"<p>Mesajul va rămîne în folderul \"ieşire\" pînă cînd rezolvaţi problema (de "
-"ex: o adresă greşită) sau ştergeţi mesajul din acest folder.</p>"
-"<p>A fost utilizat următorul protocol de transport: %2</p> "
-"<p>Doriţi să continui să trimit mesajele rămase?</p>"
+"<p>Trimitere eşuată:</p><p>%1</p><p>Mesajul va rămîne în folderul \"ieşire\" "
+"pînă cînd rezolvaţi problema (de ex: o adresă greşită) sau ştergeţi mesajul "
+"din acest folder.</p><p>A fost utilizat următorul protocol de transport: %2</"
+"p> <p>Doriţi să continui să trimit mesajele rămase?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10528,15 +10413,16 @@ msgstr "&Anulează trimiterea"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Trimitere eşuată:\n"
 "%1\n"
-"Mesajul va rămîne în folderul \"ieşire\" pînă cînd rezolvaţi problema (de ex: o "
-"adresă greşită) sau ştergeţi mesajul din acest folder.\n"
+"Mesajul va rămîne în folderul \"ieşire\" pînă cînd rezolvaţi problema (de "
+"ex: o adresă greşită) sau ştergeţi mesajul din acest folder.\n"
 "A fost utilizat următorul protocol de transport:\n"
 "  %2"
 
@@ -10572,14 +10458,14 @@ msgstr "Sendmail s-a terminat anormal."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Trebuie să daţi un nume de utilizator şi o parolă pentru a utiliza acest server "
-"SMTP."
+"Trebuie să daţi un nume de utilizator şi o parolă pentru a utiliza acest "
+"server SMTP."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "Se pare că %1 rulează deja în altă sesiune X ale a acestui calculator. Dacă "
 "rulaţi %2 mai mult de o dată, riscaţi să pierdeţi mesaje. Nu ar trebui să "
@@ -10587,9 +10473,9 @@ msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "Se pare că %1 rulează deja în altă sesiune X ale a acestui calculator. Dacă "
 "rulaţi %1 şi %2 în aceleaşi timp riscaţi să pierdeţi mesaje. Nu ar trebui să "
@@ -10597,23 +10483,23 @@ msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"Se pare că %1 rulează deja pe %2. Dacă rulaţi %1 mai mult de o dată, riscaţi să "
-"pierdeţi mesaje. Nu ar trebui să porniţi %1 pe acest calculator dacă nu sînteţi "
-"sigur că nu rulează deja pe %2."
+"Se pare că %1 rulează deja pe %2. Dacă rulaţi %1 mai mult de o dată, riscaţi "
+"să pierdeţi mesaje. Nu ar trebui să porniţi %1 pe acest calculator dacă nu "
+"sînteţi sigur că nu rulează deja pe %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"Se pare că %1 rulează deja pe %3. Dacă rulaţi %1 şi %2 în acelaşi timp, riscaţi "
-"să pierdeţi mesaje. Nu ar trebui să porniţi %2 pe acest calculator dacă nu "
-"sînteţi sigur că %1 nu rulează deja pe %3."
+"Se pare că %1 rulează deja pe %3. Dacă rulaţi %1 şi %2 în acelaşi timp, "
+"riscaţi să pierdeţi mesaje. Nu ar trebui să porniţi %2 pe acest calculator "
+"dacă nu sînteţi sigur că %1 nu rulează deja pe %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10624,6 +10510,10 @@ msgstr "Porneşte %1"
 msgid "Exit"
 msgstr "Iese"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Mesaje noi în"
@@ -10650,15 +10540,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"Portofelul TDE nu este disponibil. Este extrem de indicat să-l folosiţi pentru "
-"administrarea parolelor dumneavoastră.\n"
+"Portofelul TDE nu este disponibil. Este extrem de indicat să-l folosiţi "
+"pentru administrarea parolelor dumneavoastră.\n"
 "Totuşi KMail poate să salveze parola şi în fişierul de configurare. Ea este "
-"scrisă într-un format anagramat, dar nu trebuie să-l consideraţi sigur contra "
-"decriptării odată ce a fost obţinut accesul la fişierul de configurare.\n"
+"scrisă într-un format anagramat, dar nu trebuie să-l consideraţi sigur "
+"contra decriptării odată ce a fost obţinut accesul la fişierul de "
+"configurare.\n"
 "Doriţi să salvaţi parola pentru contul '%1' în fişierul de configurare?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10728,8 +10620,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "O comandă de rulat local, înainte de a trimite mesajele. Aceasta poate fi "
-"utilizată de exemplu la setarea tunelelor SSH. Lăsaţi cîmpul gol dacă nu doriţi "
-"să rulaţi o comandă."
+"utilizată de exemplu la setarea tunelelor SSH. Lăsaţi cîmpul gol dacă nu "
+"doriţi să rulaţi o comandă."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10737,8 +10629,8 @@ msgstr "Serverul &cere autentificare"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Selectaţi această opţiune dacă serverul dumneavoastră SMTP cere să vă "
 "autentificaţi înainte de a accepta mesaje. Este cunoscut sub numele de "
@@ -10762,15 +10654,14 @@ msgstr "&Trimite un nume personalizat de gazdă către server"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Selectaţi această opţiune pentru a utiliza un nume personalizat de gazdă cînd "
-"KMail se indentifică la serverul de e-mail."
-"<p>Este util cînd numele sistemului dumneavoastră nu este setat corect sau "
-"doriţi să-i ascundeţi numele real."
+"Selectaţi această opţiune pentru a utiliza un nume personalizat de gazdă "
+"cînd KMail se indentifică la serverul de e-mail.<p>Este util cînd numele "
+"sistemului dumneavoastră nu este setat corect sau doriţi să-i ascundeţi "
+"numele real."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10801,8 +10692,8 @@ msgstr "Sînt permise numai fişiere locale."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Numele de domeniu sau adresa numerică a serverului SMTP."
 
 #: kmtransport.cpp:788
@@ -10816,10 +10707,10 @@ msgstr "Eroare la listarea folderului %1:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -11050,35 +10941,28 @@ msgstr "&Editează mesajul"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Informaţiile de structură generate de modulul Criptografie nu pot fi "
-"procesate corect. Probabil modulul este defect.</p>"
-"<p>Contactaţi administratorul dumneavoastră de sistem.</p></qt>"
+"<qt><p>Informaţiile de structură generate de modulul Criptografie nu pot fi "
+"procesate corect. Probabil modulul este defect.</p><p>Contactaţi "
+"administratorul dumneavoastră de sistem.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Nu am găsit un modul de criptografie activ şi modulul intern OpenPGP nu a "
-"pornit cu succes.</p>"
-"<p>Puteţi face două lucruri pentru a rezolva situaţia:</p>"
-"<ul>"
-"<li><em>fie</em> activaţi un modul utilizînd dialogul de configurare KMail "
-"Setări->&gt;Configurează KMail->&gt;Module.</li>"
-"<li><em>sau</em> specificaţi setările tradiţionale OpenPGP în acelaşi dialog în "
-"subfereastra Identitate->&gt;Avansat</li> </ul>."
+"pornit cu succes.</p><p>Puteţi face două lucruri pentru a rezolva situaţia:</"
+"p><ul><li><em>fie</em> activaţi un modul utilizînd dialogul de configurare "
+"KMail Setări->&gt;Configurează KMail->&gt;Module.</li><li><em>sau</em> "
+"specificaţi setările tradiţionale OpenPGP în acelaşi dialog în subfereastra "
+"Identitate->&gt;Avansat</li> </ul>."
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11090,8 +10974,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -11106,18 +10990,18 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Formatul de mesaj criptografic OpenPGP în-linie nu suport criptare sau semnarea "
-"ataşamentelor.\n"
+"Formatul de mesaj criptografic OpenPGP în-linie nu suport criptare sau "
+"semnarea ataşamentelor.\n"
 "Doriţi într-adevăr să folosiţi vechiul format OpenPGP în-linie?"
 
 #: messagecomposer.cpp:640
@@ -11139,8 +11023,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"La examinarea preferinţelor de semnare ale destinatarului a reieşit că trebuie "
-"să fiţi întrebat dacă doriţi să semnaţi sau nu acest mesaj.\n"
+"La examinarea preferinţelor de semnare ale destinatarului a reieşit că "
+"trebuie să fiţi întrebat dacă doriţi să semnaţi sau nu acest mesaj.\n"
 "Doriţi să semnaţi acest mesaj?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11227,12 +11111,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"La examinarea preferinţelor de criptare ale destinatarului a reieşit că trebuie "
-"să fiţi întrebat dacă doriţi să criptaţi sau nu acest mesaj.\n"
+"La examinarea preferinţelor de criptare ale destinatarului a reieşit că "
+"trebuie să fiţi întrebat dacă doriţi să criptaţi sau nu acest mesaj.\n"
 "Doriţi să criptaţi acest mesaj?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11265,8 +11149,9 @@ msgstr "&Nu cripta"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Aţi cerut să criptez acest mesaj şi să criptez o copie pentru dumneavoastră, "
 "dar pentru această identitate nu aţi configurat chei de criptare valide de "
@@ -11279,13 +11164,13 @@ msgstr "Trimitere necriptată"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Unele părţi ale acestui mesaj nu vor fi criptate.\n"
-"Trimiterea de mesaje criptate parţial ar putea viola politica site-ului şi/sau "
-"să permită scurgerea de informaţii confidenţiale.\n"
+"Trimiterea de mesaje criptate parţial ar putea viola politica site-ului şi/"
+"sau să permită scurgerea de informaţii confidenţiale.\n"
 "Doriţi să criptez toate părţile?"
 
 #: messagecomposer.cpp:950
@@ -11308,78 +11193,73 @@ msgstr "&Criptează toate părţile"
 msgid "Unencrypted Message Warning"
 msgstr "Avertizare mesaj necriptat"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Eroare: Subsistemul nu a returnat nici un fel de date codate.</p>"
-"<p>Vă rugăm să raportaţi această eroare: "
-"<br>%2</p></qt>"
+"<qt><p>Eroare: Subsistemul nu a returnat nici un fel de date codate.</"
+"p><p>Vă rugăm să raportaţi această eroare: <br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Nu toate caracterele se potrivesc în codarea aleasă. "
-"<br>"
-"<br>Trimit mesajul în aceste condiţii?</qt>"
+"<qt>Nu toate caracterele se potrivesc în codarea aleasă. <br><br>Trimit "
+"mesajul în aceste condiţii?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Unele caractere vor fi pierdute"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Pierde caractere"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Schimbă codarea"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -11401,10 +11281,10 @@ msgstr "&Format căsuţă mail:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11414,8 +11294,8 @@ msgstr "Folderul &conţine:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11456,8 +11336,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stare: "
 
@@ -11489,8 +11368,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -11528,18 +11407,18 @@ msgstr "Nu pot să decriptez mesajul:"
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -11621,8 +11500,7 @@ msgstr ""
 #: objecttreeparser.cpp:2112
 #, fuzzy
 msgid "Error: Signature not verified"
-msgstr ""
-"Nu pot salva cartea de adrese!\n"
+msgstr "Nu pot salva cartea de adrese!\n"
 
 #: objecttreeparser.cpp:2115
 #, fuzzy
@@ -11803,8 +11681,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -11933,14 +11811,15 @@ msgstr "Mesaj de eroare de I/E TDE"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Serverul dumneavoastră POP3 nu suportă comanda UIDL. Această comandă este "
-"necesară pentru a determina în mod sigur ce mesaje au mai fost deja transferate "
-"de KMail.\n"
+"necesară pentru a determina în mod sigur ce mesaje au mai fost deja "
+"transferate de KMail.\n"
 "Din această cauză funcţia de păstrare a mesajelor pe server nu poate lucra "
 "corespunzător."
 
@@ -11965,7 +11844,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Transfer mesajul %1 din %2 (%3 din %4 KO) din %5 (%6 KO rămîn pe server)."
 
@@ -11984,1671 +11864,15 @@ msgstr "Răspuns eronat de la server"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Serverul dumneavoastră nu suportă comanda TOP. De aceea nu este posibil să "
 "transfer mai întîi antetele mesajelor mari, înainte de a le transfera în "
 "întregime."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "&Go"
-msgstr "Căt&re"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Director"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Mesaj"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, fuzzy, no-c-format
-msgid "&Forward"
-msgstr "Î&naintează:"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "Semnătură"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Semnează automat mesajele cu OpenPGP"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Criptare"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Mesaj criptat OpenPGP"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Mesaj criptat OpenPGP"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "&Criptează automat mesajele oricînd este posibil"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Către: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "General"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Răspunde la"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Răspunde &tuturor..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "Î&naintează:"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Accelerator:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "În&locuieşte"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, fuzzy, no-c-format
-msgid "Folder Properties"
-msgstr "Proprietăţi..."
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, fuzzy, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Directorul conţine o listă de discuţii"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "List &address:"
-msgstr "&Adresă publicare:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, fuzzy, no-c-format
-msgid "N&ormal:"
-msgstr "Normal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, fuzzy, no-c-format
-msgid "Unr&ead:"
-msgstr "Necitit:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "Expirare mesaj vechi"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, fuzzy, no-c-format
-msgid "E&xpire after:"
-msgstr "Expirare folder"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "Expir mesajele vechi?"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, fuzzy, no-c-format
-msgid "Expire a&fter:"
-msgstr "Expirare folder"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "&Expiră mesajele vechi"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, fuzzy, no-c-format
-msgid "Day(s)"
-msgstr "zi(le)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, fuzzy, no-c-format
-msgid "Week(s)"
-msgstr "săptămînă(i)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, fuzzy, no-c-format
-msgid "Month(s)"
-msgstr "lună(i)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Advanced"
-msgstr "A&vansat"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identitate nouă"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "Normal:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "&Adresă publicare:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Opţiuni securitate"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "&Semnătură"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Adaugă..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Colaborare"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Setează setările de font"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "nelimitat"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Trimite confirmare"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Răspunde expeditorului:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Răspunde &tuturor..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Mesaj înaintat"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, fuzzy, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Mesaj criptat"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, fuzzy, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Mesaj criptat"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Adresa de e-mail nu există în cheie/certificat"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "&Avertizare înainte de expirarea mesajelor"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "&Trimitere"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Criptare"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, fuzzy, no-c-format
-msgid " days"
-msgstr "zi(le)"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Selectaţi un profil GUI"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Conţinut &folder:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "În&locuieşte"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "În&locuieşte"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, fuzzy, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Afişează în&totdeauna"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Notificare e-mail nou"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Specificaţi e&ditorul:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Utilizează un editor extern"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, fuzzy, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Opţiuni globale"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Trimitere automată a invitaţiilor"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"&La răspuns sau înaintare păstrează setul de caractere original (dacă e "
-"posibil)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Adaugă automat semnătura"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, fuzzy, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ţine minte această identitate, astfel încît să fie utilizată în ferestrele de "
-"compunere viitoare."
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ţine minte acest folder pentru itemii trimişi, astfel încît să fie utilizat în "
-"ferestrele de compunere viitoare."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ţine minte acest transport de e-mail, astfel încît să fie utilizat în "
-"ferestrele de compunere viitoare."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ţine minte această identitate, astfel încît să fie utilizată în ferestrele de "
-"compunere viitoare."
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Limitează textul la coloana:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "&Avertizare înainte de expirarea mesajelor"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Activaţi această opţiune pentru a permite Outlook(tm) să înţeleagă numele de "
-"ataşamente ce conţin caractere non-ASCII"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Cerere automat notificare pentru starea transmiterii &mesajului"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Activaţi această opţiune dacă doriţi ca KMail să ceară o notificare de "
-"recepţionare a m sajului (Message Disposition Notification - MDN) pentru "
-"fiecare din mesajele trimise.</p>"
-"<p>Această opţiune afectează în mod implicit toate mesajele, dar o puteţi "
-"totuşi dezactiva în fereastra de compunere pentru fiecare mesaj în parte. "
-"Utilizaţi itemul de meniu <em>Opţiuni</em>->&gt;<em>"
-"Cerere notificare primire mesaj</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Interval salvare automată:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Este posibil să aveţi o copie de siguranţă a textului din fereastra de "
-"compunere la intervale regulate de timp. Aici este setat acest interval. Puteţi "
-"dezactiva salvarea automată dacă setaţi valoarea lui la 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Înlocuieşte prefi&xul recunoscut cu \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Înlocuieşte prefixul recunoscut cu \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Utilizează &citare inteligentă"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Atenţie: Semnătură eronată de la"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"&La răspuns sau înaintare păstrează setul de caractere original (dacă e "
-"posibil)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Mesaj criptat OpenPGP"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Afişează starea &spam în antetul mesajului"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Notificări prelucrare mesaj"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Lista de mesaje - Mesaje noi"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "Marchează me&sajul ca neînaintat"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Adaugă caractere de &citare"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13765,6 +11989,11 @@ msgstr "Adăugare cont"
 msgid "Add as BCC"
 msgstr "Adăugare cont"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Anulează"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13780,10 +12009,10 @@ msgstr "Destinatari selectaţi"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13800,8 +12029,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13904,10 +12133,19 @@ msgstr "este mai mare sau egal cu"
 msgid " bytes"
 msgstr " octeţi"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, fuzzy, no-c-format
+msgid " days"
+msgstr "zi(le)"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -14063,13 +12301,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -14087,8 +12323,7 @@ msgid ""
 msgstr "Tip de cont: Cont IMAP"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -14106,8 +12341,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -14116,8 +12350,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Filtre disponibile"
 
 #: sievedebugdialog.cpp:358
@@ -14187,8 +12420,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -14205,17 +12438,22 @@ msgstr "Deschide fişierul specificat într-un editor de text."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Comanda specificată:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Înregistrare nouă:"
@@ -14252,6 +12490,11 @@ msgstr "Adăugare cont"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Doriţi într-adevăr să şterg identitatea cu numele <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Aplică la:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14266,6 +12509,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Editează..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14305,9 +12552,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14346,6 +12593,16 @@ msgstr ""
 "Nu pot deschide fişierul \"%1\":\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Către: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14381,36 +12638,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14645,6 +12898,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14681,76 +12938,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nu există nimic de des-făcut."
@@ -14803,7 +12990,8 @@ msgstr ""
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
-"Nu am putut porni managerul de certificate. Verificaţi instalarea programului."
+"Nu am putut porni managerul de certificate. Verificaţi instalarea "
+"programului."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -14818,6 +13006,17 @@ msgstr "Ataşamentul nr. %1 (nedenumit)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Cu acest nume există deja fişierul %1. Doriţi să îl suprascriu?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "&Suprascrie"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14918,9 +13117,9 @@ msgstr "&Trimite imaginea în fiecare mesaj"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14949,9 +13148,9 @@ msgstr "Selectează fişierul..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14960,15 +13159,15 @@ msgstr "Setează din cartea de adrese"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14977,11 +13176,11 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Exemplele sînt disponibile la <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Exemplele sînt disponibile la <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14997,132 +13196,1532 @@ msgid "You do not have your own contact defined in the address book."
 msgstr ""
 "Informaţiile dumneavoastră de contact nu sînt definite în cartea de adrese."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "Semnătură"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Semnează automat mesajele cu OpenPGP"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Criptare"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Setează subiectul mesajului"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Trimite CC: la 'adresă'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Trimite BCC: la 'adresă'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Adaugă 'antet' la mesaj"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Mesaj criptat OpenPGP"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Citeşte corpul mesajului dintr-un 'fişier'"
+#: composercryptoconfiguration.ui:87
+#, fuzzy, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Mesaj criptat OpenPGP"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Setează corpul mesajului"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Adaugă un ataşament la mesaj. Această acţiune poate fi repetată"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Verifică dacă există mesaje noi"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Deschide numai fereastra de compunere"
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "&Criptează automat mesajele oricînd este posibil"
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "Mut mesajul %3 din %2 din %1."
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Citit"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Vechi"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "General"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Şters"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Răspunde la"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Răspuns"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Răspunde &tuturor..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Înaintat"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "Î&naintează:"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "În coadă"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Accelerator:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Trimis"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "În&locuieşte"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Urmărit"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Conţinut &folder:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorat"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "În&locuieşte"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "În&locuieşte"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: folderpropertiesdialog.ui:16
+#, fuzzy, no-c-format
+msgid "Folder Properties"
+msgstr "Proprietăţi..."
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "Către: "
+#: folderpropertiesdialog.ui:63
+#, fuzzy, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Directorul conţine o listă de discuţii"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Are ataşament"
+#: folderpropertiesdialog.ui:91
+#, fuzzy, no-c-format
+msgid "List &address:"
+msgstr "&Adresă publicare:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, fuzzy, no-c-format
+msgid "N&ormal:"
+msgstr "Normal:"
+
+#: folderpropertiesdialog.ui:215
+#, fuzzy, no-c-format
+msgid "Unr&ead:"
+msgstr "Necitit:"
+
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "Expirare mesaj vechi"
+
+#: folderpropertiesdialog.ui:283
+#, fuzzy, no-c-format
+msgid "E&xpire after:"
+msgstr "Expirare folder"
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "Expir mesajele vechi?"
+
+#: folderpropertiesdialog.ui:339
+#, fuzzy, no-c-format
+msgid "Expire a&fter:"
+msgstr "Expirare folder"
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "&Expiră mesajele vechi"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, fuzzy, no-c-format
+msgid "Day(s)"
+msgstr "zi(le)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, fuzzy, no-c-format
+msgid "Week(s)"
+msgstr "săptămînă(i)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, fuzzy, no-c-format
+msgid "Month(s)"
+msgstr "lună(i)"
+
+#: folderpropertiesdialog.ui:451
+#, fuzzy, no-c-format
+msgid "Advanced"
+msgstr "A&vansat"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identitate nouă"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "Normal:"
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "&Adresă publicare:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: util.h:208
-#, fuzzy
+#: kmail.kcfg:72
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Cu acest nume există deja fişierul %1. Doriţi să îl suprascriu?"
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "&Suprascrie"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, fuzzy, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Afişează în&totdeauna"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Notificare e-mail nou"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Specificaţi e&ditorul:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Utilizează un editor extern"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, fuzzy, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Opţiuni globale"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Trimitere automată a invitaţiilor"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"&La răspuns sau înaintare păstrează setul de caractere original (dacă e "
+"posibil)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Adaugă automat semnătura"
+
+#: kmail.kcfg:336
+#, fuzzy, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ţine minte această identitate, astfel încît să fie utilizată în ferestrele "
+"de compunere viitoare."
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Ţine minte acest folder pentru itemii trimişi, astfel încît să fie utilizat "
+"în ferestrele de compunere viitoare."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Ţine minte acest transport de e-mail, astfel încît să fie utilizat în "
+"ferestrele de compunere viitoare."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ţine minte această identitate, astfel încît să fie utilizată în ferestrele "
+"de compunere viitoare."
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Limitează textul la coloana:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "&Avertizare înainte de expirarea mesajelor"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Activaţi această opţiune pentru a permite Outlook(tm) să înţeleagă numele de "
+"ataşamente ce conţin caractere non-ASCII"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Cerere automat notificare pentru starea transmiterii &mesajului"
+
+#: kmail.kcfg:417
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Activaţi această opţiune dacă doriţi ca KMail să ceară o notificare "
+"de recepţionare a m sajului (Message Disposition Notification - MDN) pentru "
+"fiecare din mesajele trimise.</p><p>Această opţiune afectează în mod "
+"implicit toate mesajele, dar o puteţi totuşi dezactiva în fereastra de "
+"compunere pentru fiecare mesaj în parte. Utilizaţi itemul de meniu "
+"<em>Opţiuni</em>->&gt;<em>Cerere notificare primire mesaj</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Interval salvare automată:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Este posibil să aveţi o copie de siguranţă a textului din fereastra de "
+"compunere la intervale regulate de timp. Aici este setat acest interval. "
+"Puteţi dezactiva salvarea automată dacă setaţi valoarea lui la 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Înlocuieşte prefi&xul recunoscut cu \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Înlocuieşte prefixul recunoscut cu \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Utilizează &citare inteligentă"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Atenţie: Semnătură eronată de la"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"&La răspuns sau înaintare păstrează setul de caractere original (dacă e "
+"posibil)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Mesaj criptat OpenPGP"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Afişează starea &spam în antetul mesajului"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Notificări prelucrare mesaj"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Lista de mesaje - Mesaje noi"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "Marchează me&sajul ca neînaintat"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Adaugă caractere de &citare"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Editează fişier"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Editează..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, fuzzy, no-c-format
+msgid "&Go"
+msgstr "Căt&re"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Director"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Mesaj"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, fuzzy, no-c-format
+msgid "&Forward"
+msgstr "Î&naintează:"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Setează setările de font"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Opţiuni comune"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Opţiuni securitate"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "&Semnătură"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Selectaţi un profil GUI"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Selectaţi un profil GUI"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Selectaţi un profil GUI"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Selectaţi un profil GUI"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Selectaţi un profil GUI"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Adaugă..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Colaborare"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Setează setările de font"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "nelimitat"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Trimite confirmare"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Răspunde expeditorului:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Răspunde &tuturor..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Mesaj înaintat"
+
+#: warningconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Mesaj criptat"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, fuzzy, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Mesaj criptat"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Adresa de e-mail nu există în cheie/certificat"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "&Avertizare înainte de expirarea mesajelor"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "&Trimitere"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Criptare"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Selectaţi un profil GUI"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Selectaţi un profil GUI"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Selectaţi un profil GUI"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15310,10 +14909,6 @@ msgstr "&Suprascrie"
 #~ msgstr "Salvează în folderul \"&ciorne\""
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "Configurează &KMail..."
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Deschide cu..."
 
@@ -15478,8 +15073,10 @@ msgstr "&Suprascrie"
 #~ msgstr "[%1] %2"
 
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
 #~ "Transmisie completă. %n mesaj nou în %1 KO (%2 KO rămaşi pe server).\n"
 #~ "Transmisie completă. %n mesaje noi în %1 KO (%2 KO rămaşi pe server)."
@@ -15502,11 +15099,15 @@ msgstr "&Suprascrie"
 #~ msgstr "Transmisie completă. Nu există mesaje noi."
 
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "Transmisie completă pentru contul %3. %n mesaj nou în %1 KO (%2 KO rămaşi pe server).\n"
-#~ "Transmisie completă pentru contul %3. %n mesaje noi în %1 KO (%2 KO rămaşi pe server)."
+#~ "Transmisie completă pentru contul %3. %n mesaj nou în %1 KO (%2 KO rămaşi "
+#~ "pe server).\n"
+#~ "Transmisie completă pentru contul %3. %n mesaje noi în %1 KO (%2 KO "
+#~ "rămaşi pe server)."
 
 #~ msgid ""
 #~ "_n: Transmission for account %2 complete. %n message in %1 KB.\n"
@@ -15540,14 +15141,50 @@ msgstr "&Suprascrie"
 #~ msgid "Mark Thread as &Ham"
 #~ msgstr "Marchează firul ca &ham"
 
-#~ msgid "<qt>The destination folder of the account <b>%1</b> was restored to the inbox.</qt>"
-#~ msgstr "<qt>Folderul destinaţie al contului <b>%1</b> a fost refăcut în \"intrare\".</qt>"
+#~ msgid ""
+#~ "<qt>The destination folder of the account <b>%1</b> was restored to the "
+#~ "inbox.</qt>"
+#~ msgstr ""
+#~ "<qt>Folderul destinaţie al contului <b>%1</b> a fost refăcut în \"intrare"
+#~ "\".</qt>"
 
-#~ msgid "<p>Here you can get some assistance in setting up KMail's filter rules to use some commonly-known anti-spam tools.</p><p>The wizard can detect those tools on your computer as well as create filter rules to classify messages using these tools and to separate messages classified as spam. The wizard will not take any existing filter rules into consideration: it will always append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen during the scan of the messages for spam, you may encounter problems with the responsiveness of KMail because anti-spam tool operations are usually time consuming; please consider deleting the filter rules created by the wizard to get back to the former behavior."
-#~ msgstr "<p>Aici puteţi primi ajutor pentru setarea regulilor de filtrare KMail ce vor fi utilizate cu unele utilitare antispam binecunoscute.</p><p>Expertul poate detecta aceste utilitare instalate pe calculatorul dumneavoastră, precum şi să creeze reguli de filtrare care să clasifice mesajele astfel să le separe de cele marcate ca spam. Nu vor fi luate în considerare filtrele existente. De fiecare dată vor fi adăugate ca reguli noi de filtrare.</p><p><b>Atenţie:</b> Deoarece KMail este blocat în timpul operaţiei de scanare a mesajelor, s-ar putea să vă loviţi de lipsa de interactivitate din partea lui deoarece operaţiile antispam sînt în general consumatoare de timp. Dacă doriţi să reveniţi la situaţia anterioară, ştergeţi regulile antispam create de expert."
+#~ msgid ""
+#~ "<p>Here you can get some assistance in setting up KMail's filter rules to "
+#~ "use some commonly-known anti-spam tools.</p><p>The wizard can detect "
+#~ "those tools on your computer as well as create filter rules to classify "
+#~ "messages using these tools and to separate messages classified as spam. "
+#~ "The wizard will not take any existing filter rules into consideration: it "
+#~ "will always append the new rules.</p><p><b>Warning:</b> As KMail appears "
+#~ "to be frozen during the scan of the messages for spam, you may encounter "
+#~ "problems with the responsiveness of KMail because anti-spam tool "
+#~ "operations are usually time consuming; please consider deleting the "
+#~ "filter rules created by the wizard to get back to the former behavior."
+#~ msgstr ""
+#~ "<p>Aici puteţi primi ajutor pentru setarea regulilor de filtrare KMail ce "
+#~ "vor fi utilizate cu unele utilitare antispam binecunoscute.</"
+#~ "p><p>Expertul poate detecta aceste utilitare instalate pe calculatorul "
+#~ "dumneavoastră, precum şi să creeze reguli de filtrare care să clasifice "
+#~ "mesajele astfel să le separe de cele marcate ca spam. Nu vor fi luate în "
+#~ "considerare filtrele existente. De fiecare dată vor fi adăugate ca reguli "
+#~ "noi de filtrare.</p><p><b>Atenţie:</b> Deoarece KMail este blocat în "
+#~ "timpul operaţiei de scanare a mesajelor, s-ar putea să vă loviţi de lipsa "
+#~ "de interactivitate din partea lui deoarece operaţiile antispam sînt în "
+#~ "general consumatoare de timp. Dacă doriţi să reveniţi la situaţia "
+#~ "anterioară, ştergeţi regulile antispam create de expert."
 
-#~ msgid "<p>For these tools it is possible to let the wizard create filter rules. KMail tried to find the tools in the PATH of your system; the wizard does not allow you to create rules for tools which were not found: this is to keep your configuration consistent and to minimize the risk of unpredicted behavior.</p>"
-#~ msgstr "<p>Pentru aceste utilitare este posibil să lăsaţi expertul să creeze regulile de filtrare. KMail a încercat să găsească utilitare prin intermediul variabilei de mediu PATH. Expertul nu vă permite să creaţi reguli pentru utilitare care nu sînt instalate pe sistem pentru a păstra o configurare consistentă şi a minimiza riscul unui comportament neprevăzut.</p>"
+#~ msgid ""
+#~ "<p>For these tools it is possible to let the wizard create filter rules. "
+#~ "KMail tried to find the tools in the PATH of your system; the wizard does "
+#~ "not allow you to create rules for tools which were not found: this is to "
+#~ "keep your configuration consistent and to minimize the risk of "
+#~ "unpredicted behavior.</p>"
+#~ msgstr ""
+#~ "<p>Pentru aceste utilitare este posibil să lăsaţi expertul să creeze "
+#~ "regulile de filtrare. KMail a încercat să găsească utilitare prin "
+#~ "intermediul variabilei de mediu PATH. Expertul nu vă permite să creaţi "
+#~ "reguli pentru utilitare care nu sînt instalate pe sistem pentru a păstra "
+#~ "o configurare consistentă şi a minimiza riscul unui comportament "
+#~ "neprevăzut.</p>"
 
 #~ msgid "(found on this system)"
 #~ msgstr "(găsit pe acest sistem)"
@@ -15558,17 +15195,43 @@ msgstr "&Suprascrie"
 #~ msgid "Classify messages manually as spam"
 #~ msgstr "Clasifică manual mesajele ca spam"
 
-#~ msgid "Sometimes messages are classified wrongly or even not at all; the latter might be by intention, because you perhaps filter out messages from mailing lists before you let the anti-spam tools classify the rest of the messages. You can correct these wrong or missing classifications manually by using the appropriate toolbar buttons which trigger special filters created by this wizard."
-#~ msgstr "Uneori mesajele sînt clasificate greşit sau chiar deloc. Probabil cel din urmă caz este cu intenţie, deoarece este posibil să filtraţi mesaje de la liste de discuţii înainte de permite utilitarelor antispam să clasifice restul mesajelor. Puteţi corecta manual aceste clasificări greşite sau lipsă utilizînd butoanele corespunzătoare din bara de unelte. El vor declanşa filtre speciale create de acest expert."
+#~ msgid ""
+#~ "Sometimes messages are classified wrongly or even not at all; the latter "
+#~ "might be by intention, because you perhaps filter out messages from "
+#~ "mailing lists before you let the anti-spam tools classify the rest of the "
+#~ "messages. You can correct these wrong or missing classifications manually "
+#~ "by using the appropriate toolbar buttons which trigger special filters "
+#~ "created by this wizard."
+#~ msgstr ""
+#~ "Uneori mesajele sînt clasificate greşit sau chiar deloc. Probabil cel din "
+#~ "urmă caz este cu intenţie, deoarece este posibil să filtraţi mesaje de la "
+#~ "liste de discuţii înainte de permite utilitarelor antispam să clasifice "
+#~ "restul mesajelor. Puteţi corecta manual aceste clasificări greşite sau "
+#~ "lipsă utilizînd butoanele corespunzătoare din bara de unelte. El vor "
+#~ "declanşa filtre speciale create de acest expert."
 
 #~ msgid "Classify messages using the anti-spam tools"
 #~ msgstr "Clasifică mesajele utilizînd utilitare antispam"
 
-#~ msgid "Let the anti-spam tools classify your messages. The wizard will create appropriate filters. The messages are usually marked by the tools so that following filters can react on this and, for example, move spam messages to a special folder."
-#~ msgstr "Permite utilitarelor antispam să clasifice mesajele dumneavoastră. Expertul va crea filtrele corespunzătoare. Mesajele sînt de fapt numai marcate de către aceste utilitare, astfel încît filtrele ce urmează vor reacţiona şi, de exemplu, vor muta mesajele spam într-un folder special."
+#~ msgid ""
+#~ "Let the anti-spam tools classify your messages. The wizard will create "
+#~ "appropriate filters. The messages are usually marked by the tools so that "
+#~ "following filters can react on this and, for example, move spam messages "
+#~ "to a special folder."
+#~ msgstr ""
+#~ "Permite utilitarelor antispam să clasifice mesajele dumneavoastră. "
+#~ "Expertul va crea filtrele corespunzătoare. Mesajele sînt de fapt numai "
+#~ "marcate de către aceste utilitare, astfel încît filtrele ce urmează vor "
+#~ "reacţiona şi, de exemplu, vor muta mesajele spam într-un folder special."
 
-#~ msgid "A filter to detect messages classified as spam and to move those messages into a predefined folder is created. The default folder is the trash folder, but you may change that in the folder view."
-#~ msgstr "Va fi creat un filtru pentru detectarea mesajelor clasificate ca spam şi vor fi mutate într-un folder predefinit. Folderul implicit este \"Coşul de gunoi\", dar puteţi să-l modificaţi în arborele de foldere."
+#~ msgid ""
+#~ "A filter to detect messages classified as spam and to move those messages "
+#~ "into a predefined folder is created. The default folder is the trash "
+#~ "folder, but you may change that in the folder view."
+#~ msgstr ""
+#~ "Va fi creat un filtru pentru detectarea mesajelor clasificate ca spam şi "
+#~ "vor fi mutate într-un folder predefinit. Folderul implicit este \"Coşul "
+#~ "de gunoi\", dar puteţi să-l modificaţi în arborele de foldere."
 
 #~ msgid "Additionally, mark detected spam messages as read"
 #~ msgstr "În plus, marchează mesajele spam ca citite"
@@ -15585,11 +15248,19 @@ msgstr "&Suprascrie"
 #~ msgid "Prefix to fol&ders:"
 #~ msgstr "&Prefixul folderelor:"
 
-#~ msgid "Check this option if you want to be notified about new mail that is moved to this folder; unchecking this is useful, for example, for ignoring spam folders."
-#~ msgstr "Selectaţi această opţiune dacă doriţi să fiţi notificat atunci cînd este mutat un mesaj nou în acest folder. Este util să lăsaţi opţiunea dezactivată cînd folderul stochează mesaje spam."
+#~ msgid ""
+#~ "Check this option if you want to be notified about new mail that is moved "
+#~ "to this folder; unchecking this is useful, for example, for ignoring spam "
+#~ "folders."
+#~ msgstr ""
+#~ "Selectaţi această opţiune dacă doriţi să fiţi notificat atunci cînd este "
+#~ "mutat un mesaj nou în acest folder. Este util să lăsaţi opţiunea "
+#~ "dezactivată cînd folderul stochează mesaje spam."
 
-#~ msgid "Optional columns in the message list: status, attachment, important, etc."
-#~ msgstr "Coloane opţionale în lista de mesaje: stare, ataşament, important etc."
+#~ msgid ""
+#~ "Optional columns in the message list: status, attachment, important, etc."
+#~ msgstr ""
+#~ "Coloane opţionale în lista de mesaje: stare, ataşament, important etc."
 
 #~ msgid "Load external references for certain folders and on request"
 #~ msgstr "Încarcă referinţele externe pentru anumite foldere şi la cerere"
@@ -15615,8 +15286,12 @@ msgstr "&Suprascrie"
 #~ msgid "TDEWallet support"
 #~ msgstr "Suport pentru Portofelul TDE"
 
-#~ msgid "New authentication methods for IMAP, POP3, SMTP: NTLM (Microsoft Windows) and GSSAPI (Kerberos)"
-#~ msgstr "Noi metode de autentificare pentru IMAP, POP3, SMTP: NTLM (Microsoft Windows) şi GSSAPI (Kerberos)"
+#~ msgid ""
+#~ "New authentication methods for IMAP, POP3, SMTP: NTLM (Microsoft Windows) "
+#~ "and GSSAPI (Kerberos)"
+#~ msgstr ""
+#~ "Noi metode de autentificare pentru IMAP, POP3, SMTP: NTLM (Microsoft "
+#~ "Windows) şi GSSAPI (Kerberos)"
 
 #~ msgid "Optional compression of attachments"
 #~ msgstr "Compresia opţională a ataşamentelor"
diff --git a/tde-i18n-ru/messages/tdepim/kmail.po b/tde-i18n-ru/messages/tdepim/kmail.po
index a0ff8aca34e..491716e355e 100644
--- a/tde-i18n-ru/messages/tdepim/kmail.po
+++ b/tde-i18n-ru/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-06-10 18:04+0400\n"
 "Last-Translator: Andrey Cherepanov <skull@kde.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"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"
+"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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -27,13 +27,13 @@ msgstr ""
 "Сергей Житомирский,Григорий Мохин,Андрей Черепанов,Альберт Валиев,Леонид "
 "Кантер,Николай Шафоростов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"szh@chat.ru,mok@kde.ru,sibskull@mail.ru,darkstar@altlinux.ru,leon@asplinux.ru,"
-"shafff@ukr.net"
+"szh@chat.ru,mok@kde.ru,sibskull@mail.ru,darkstar@altlinux.ru,leon@asplinux."
+"ru,shafff@ukr.net"
 
 #: aboutdata.cpp:53
 msgid "Maintainer"
@@ -176,6 +176,12 @@ msgstr "&Нет (использовать осторожно)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Почтовый ящик для полуавтоматической обработки источников"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Очистить устаревшие"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -253,12 +259,12 @@ msgstr "&Учётное имя:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Ваш Интернет-провайдер предоставил вам учётную запись с <em>именем</em>"
-", которое используется для авторизации с почтовыми серверами. Обычно это часть "
+"Ваш Интернет-провайдер предоставил вам учётную запись с <em>именем</em>, "
+"которое используется для авторизации с почтовыми серверами. Обычно это часть "
 "почтового адреса, которая находится перед символом <em>@</em>."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -280,18 +286,18 @@ msgstr "Сохранить пароль &POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Включите данный параметр для сохранения пароля.\n"
 "Если доступен Бумажник TDE, пароль будет сохранён в нём.\n"
 "Если Бумажник TDE недоступен, пароль будет сохранён в файле конфигурации "
-"KMail.Пароль будет сохранен в нечитаемом формате, однако при получении доступа "
-"к файлу конфигурации возможна расшифровка вашего пароля."
+"KMail.Пароль будет сохранен в нечитаемом формате, однако при получении "
+"доступа к файлу конфигурации возможна расшифровка вашего пароля."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -319,11 +325,13 @@ msgstr "Ф&ильтровать сообщения, размер которых
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Включив данный параметр, вы сможете фильтровать сообщения прямо на сервере, при "
-"это вы сможете скачать сообщения, удалить сообщения или оставить их на сервере."
+"Включив данный параметр, вы сможете фильтровать сообщения прямо на сервере, "
+"при это вы сможете скачать сообщения, удалить сообщения или оставить их на "
+"сервере."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -372,13 +380,15 @@ msgstr "Открытый &текст"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -421,9 +431,9 @@ msgstr "Области имён:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Здесь представлены области имён вашего сервера IMAP. Каждая область имён "
 "является префиксом группы папок. Области имён позволяют показывать ваши "
@@ -432,8 +442,8 @@ msgstr ""
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
 msgstr ""
-"Загрузка областей имён с сервера. Все локальные изменения областей имён будут "
-"потеряны."
+"Загрузка областей имён с сервера. Все локальные изменения областей имён "
+"будут потеряны."
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -486,12 +496,12 @@ msgstr "Загружать вложения по &требованию"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Активируйте это чтобы не загружать вложения автоматически, а по щелчку на нём. "
-"Это ускорит работу с большими сообщениями."
+"Активируйте это чтобы не загружать вложения автоматически, а по щелчку на "
+"нём. Это ускорит работу с большими сообщениями."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -531,7 +541,7 @@ msgstr "<нет>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Входящие"
 
@@ -539,11 +549,11 @@ msgstr "Входящие"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Сервер не поддерживает уникальные идентификаторы сообщений, но это обязательное "
-"условие оставления писем на сервере.\n"
+"Сервер не поддерживает уникальные идентификаторы сообщений, но это "
+"обязательное условие оставления писем на сервере.\n"
 "Поскольку не все серверы правильно анонсируют свои возможности, можно "
 "попробовать оставлять письма на сервере, несмотря на это."
 
@@ -551,29 +561,30 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Сервер не поддерживает запрос заголовков сообщений, но это обязательное условие "
-"фильтрации писем на сервере.\n"
+"Сервер не поддерживает запрос заголовков сообщений, но это обязательное "
+"условие фильтрации писем на сервере.\n"
 "Поскольку не все серверы правильно анонсируют свои возможности, можно "
 "попробовать фильтровать письма на сервере, несмотря на это."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Учтите, что некоторые серверы POP3, не поддерживающие конвейерную доставку "
 "почты, могут присылать испорченные сообщения.\n"
-"Некоторые из серверов поддерживают эту возможность, но не анонсируют её. Чтобы "
-"проверить ваш POP3-сервер, используйте кнопку внизу диалога.\n"
+"Некоторые из серверов поддерживают эту возможность, но не анонсируют её. "
+"Чтобы проверить ваш POP3-сервер, используйте кнопку внизу диалога.\n"
 "Если сервер не анонсирует возможность конвейерной отправки почты, следует "
 "сначала отправить ему несколько сообщений и попробовать их получить."
 
@@ -583,34 +594,35 @@ msgstr "Укажите сервер и порт в настройках."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Похоже, сервер не поддерживает конвейерную доставку почты, поэтому этот "
 "параметр будет недоступен.\n"
-"В связи с тем, что некоторые серверы неправильно сообщают о своих возможностях, "
-"вы всё ещё можете включить конвейерную доставку почты. Однако помните, что при "
-"включении этой возможности некоторые серверы POP, не поддерживающие конвейерную "
-"доставку, могут прислать повреждённые сообщения. Поэтому сначала проведите "
-"проверку правильности работы этой возможности, послав самому себе большое "
-"количество сообщений."
+"В связи с тем, что некоторые серверы неправильно сообщают о своих "
+"возможностях, вы всё ещё можете включить конвейерную доставку почты. Однако "
+"помните, что при включении этой возможности некоторые серверы POP, не "
+"поддерживающие конвейерную доставку, могут прислать повреждённые сообщения. "
+"Поэтому сначала проведите проверку правильности работы этой возможности, "
+"послав самому себе большое количество сообщений."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Сервер не поддерживает уникальные идентификаторы сообщений, но это обязательное "
-"условие оставления писем на сервере. Поэтому данная опция отключена.\n"
+"Сервер не поддерживает уникальные идентификаторы сообщений, но это "
+"обязательное условие оставления писем на сервере. Поэтому данная опция "
+"отключена.\n"
 "Поскольку не все серверы правильно анонсируют свои возможности, можно "
 "попробовать оставлять письма на сервере, несмотря на это."
 
@@ -619,11 +631,11 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Сервер не поддерживает запрос заголовков сообщений, но это обязательное условие "
-"фильтрации писем на сервере. Поэтому данная опция отключена.\n"
+"Сервер не поддерживает запрос заголовков сообщений, но это обязательное "
+"условие фильтрации писем на сервере. Поэтому данная опция отключена.\n"
 "Поскольку не все серверы правильно анонсируют свои возможности, можно "
 "попробовать фильтровать письма на сервере, несмотря на это."
 
@@ -708,8 +720,8 @@ msgstr "Учётная запись IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Чтобы получать почту, вам необходимо добавить почтовый ящик в разделе Сеть "
 "настроек программы."
@@ -748,9 +760,9 @@ msgstr "Добро пожаловать в KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Вы впервые запускаете KMail. Мастер поможет вам настроить учётные записи "
 "для приёма и отправки почты. Укажите параметры подключения к почтовому "
@@ -816,8 +828,7 @@ msgstr "Использовать локальную доставку"
 msgid "Server Information"
 msgstr "Сведения о сервере"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Нет"
@@ -910,8 +921,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Не найдена ни одна программа обнаружения спама. Установите любую программу "
-"этого типа и запустите мастер снова.</p>"
+"<p>Не найдена ни одна программа обнаружения спама. Установите любую "
+"программу этого типа и запустите мастер снова.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -954,27 +965,25 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Мастер поможет вам настроить фильтры для использования антивирусных программ "
-"в KMail.</p>"
-"<p>Мастер найдёт эти программы в системе и поможет создать правила, позволяющие "
-"выявлять сообщения с вирусами. Существующие фильтры не будут использоваться "
-"мастером, он только добавит новые фильтры.</p>"
-"<p><b>Предупреждение:</b> При поиске вирусов работа KMail может затормозиться, "
-"поскольку обычно поиск вирусов занимает немало времени. Если такое поведение "
-"программы вас не устраивает, удалите вновь созданные фильтры, чтобы "
-"восстановить прежнюю конфигурацию."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Мастер поможет вам настроить фильтры для использования антивирусных "
+"программ в KMail.</p><p>Мастер найдёт эти программы в системе и поможет "
+"создать правила, позволяющие выявлять сообщения с вирусами. Существующие "
+"фильтры не будут использоваться мастером, он только добавит новые фильтры.</"
+"p><p><b>Предупреждение:</b> При поиске вирусов работа KMail может "
+"затормозиться, поскольку обычно поиск вирусов занимает немало времени. Если "
+"такое поведение программы вас не устраивает, удалите вновь созданные "
+"фильтры, чтобы восстановить прежнюю конфигурацию."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1009,16 +1018,14 @@ msgstr "Перемещать &вероятный спам в:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "По умолчанию вероятный спам остаётся в папке Входящие, но вы можете указать "
-"другую папку. "
-"<p>Не все программы определения спама определяют вероятный спам. Если выбранная "
-"программа не поддерживает такую возможность, вы не сможете выбрать папку для "
-"вероятного спама."
+"другую папку. <p>Не все программы определения спама определяют вероятный "
+"спам. Если выбранная программа не поддерживает такую возможность, вы не "
+"сможете выбрать папку для вероятного спама."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1028,8 +1035,8 @@ msgstr "Проверять сообщения антивирусными сре�
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Сообщения будут обрабатываться антивирусными программами. Соответствующие "
 "фильтры будут созданы мастером. Обычно эти программы отмечают подозрительные "
@@ -1042,12 +1049,13 @@ msgstr "Перемещать почту с вирусами в указанну�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Будет создан фильтр, определяющий письма, отмеченные как содержащие вирусы, и "
-"перемещающий эти письма в специальную папку. По умолчанию будет использоваться "
-"папка корзины, но можно указать и другую папку в представлении папок."
+"Будет создан фильтр, определяющий письма, отмеченные как содержащие вирусы, "
+"и перемещающий эти письма в специальную папку. По умолчанию будет "
+"использоваться папка корзины, но можно указать и другую папку в "
+"представлении папок."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1055,11 +1063,11 @@ msgstr "Также отметить сообщения с вирусами ка�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Отметить сообщения, классифицированные как инфицированные, как прочитанные, а "
-"также переместить их в указанную папку"
+"Отметить сообщения, классифицированные как инфицированные, как прочитанные, "
+"а также переместить их в указанную папку"
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1240,8 +1248,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Возможно, у вас недостаточно прав на выполнение этого действия, или папка уже "
-"существует на сервере. Сообщение сервера:"
+"Возможно, у вас недостаточно прав на выполнение этого действия, или папка "
+"уже существует на сервере. Сообщение сервера:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1254,8 +1262,8 @@ msgstr "Ошибка при чтении папки %1 на сервере: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1275,8 +1283,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1307,20 +1315,20 @@ msgstr "Удалённое"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Невозможно определить профиль для отправляемого сообщения."
-"<br>Выберите используемый адрес:"
+"<qt>Невозможно определить профиль для отправляемого сообщения.<br>Выберите "
+"используемый адрес:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Невозможно определить профиль для отправляемого сообщения."
-"<br>Выберите используемый адрес:"
+"<qt>Невозможно определить профиль для отправляемого сообщения.<br>Выберите "
+"используемый адрес:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1349,15 +1357,19 @@ msgstr "При сжатии \"%1\" произошла ошибка. Сжатие
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr "<qt><p>Этот параметр заблокирован администратором.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Загрузить профиль..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Настройка почтового ящика"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Добавить..."
@@ -1387,6 +1399,11 @@ msgstr "<qt>Удалить профиль <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Удалить профиль"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Удалить"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Добавить..."
@@ -1395,6 +1412,11 @@ msgstr "Добавить..."
 msgid "Modify..."
 msgstr "Изменить..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Удалить"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Сделать основным"
@@ -1411,17 +1433,15 @@ msgstr "О&тправка"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Исходящие (добавьте по крайней мере одну запись):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Имя"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Тип"
@@ -1443,8 +1463,7 @@ msgstr "Сделать основным"
 msgid "Common Options"
 msgstr "Общие параметры"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Подтвер&ждение перед отправкой"
@@ -1495,17 +1514,16 @@ msgstr "Имя &домена по умолчанию:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Имя домена по умолчанию будет использовано для дополнения адреса e-mail, "
-"содержащего только имя пользователя.</p></qt>"
+"<qt><p>Имя домена по умолчанию будет использовано для дополнения адреса e-"
+"mail, содержащего только имя пользователя.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1523,9 +1541,9 @@ msgstr "Добавить почтовый транспорт"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (по умолчанию)"
 
@@ -1610,6 +1628,10 @@ msgstr "Изменить параметры учётной записи"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Невозможно найти учётную запись <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Цвета"
@@ -1718,8 +1740,7 @@ msgstr "Посещённая ссылка"
 msgid "Misspelled Words"
 msgstr "Слова с ошибками"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Создать сообщение"
@@ -1907,10 +1928,11 @@ msgstr "Сворачивать по умолчанию"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Разворачивать с &новыми, важными или непрочитанными и наблюдаемыми сообщениями"
+"Разворачивать с &новыми, важными или непрочитанными и наблюдаемыми "
+"сообщениями"
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1918,72 +1940,56 @@ msgstr "Формат вывода даты"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Данные выражения могут быть использованы для указания даты:</strong>"
-"</p>"
-"<ul>"
-"<li>d - номер дня в месяце без предшествующего нуля (1-31)</li>"
-"<li>dd - номер дня в месяце вместе с  предшествующим нулём (01-31)</li>"
-"<li>ddd - укороченное название дня недели (Пнд - Вск)</li>"
-"<li>dddd - полное название дня недели (Понедельник - Воскресенье)</li>"
-"<li>M - номер месяца без предшествующего нуля (1-12)</li>"
-"<li>MM - номер месяца вместе с предшествующим нулём (01-12)</li>"
-"<li>MMM - укороченное название месяца (Янв - Дек)</li>"
-"<li>MMMM -Полное название месяца (Январь - Декабрь)</li>"
-"<li>yy - год в виде двузначного числа (00-99)</li>"
-"<li>yyyy - год в виде четырёхзначного числа (0000-9999)</li></ul>"
-"<p><strong>Данные выражения могут быть использованы для указания "
-"времени:</string></p> "
-"<ul>"
-"<li>h - час без предшествующего нуля (0-23 или 1-12 в 12 часовом формате)</li>"
-"<li>hh - час вместе с предшествующим нулём (00-23 или 01-12 в 12-часовом "
-"формате)</li>"
-"<li>m - минуты без предшествующего нуля (0-59)</li>"
-"<li>mm - минуты вместе с предшествующим нулём (00-59)</li>"
-"<li>s - секунды без предшествующего нуля (0-59)</li>"
-"<li>ss - секунды вместе с предшествующим нулём (00-59)</li>"
-"<li>z - миллисекунды без предшествующего нуля (0-999)</li>"
-"<li>zzz - миллисекунды вместе с предшествующим нулём (000-999)</li>"
-"<li>AP - переключить в 12-часовой формат. AP будет заменён на соответствующие "
-"\"AM\" или \"PM\".</li>"
-"<li>ap - переключить в 12-часовой формат. ap будет заменён на соответствующие "
-"\"am\" или \"pm\".</li>"
-"<li>Z - временная зона в числовом формате (-0500)</li></ul>"
-"<p><strong>Другие символы буду проигнорированы.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Данные выражения могут быть использованы для указания даты:</"
+"strong></p><ul><li>d - номер дня в месяце без предшествующего нуля (1-31)</"
+"li><li>dd - номер дня в месяце вместе с  предшествующим нулём (01-31)</"
+"li><li>ddd - укороченное название дня недели (Пнд - Вск)</li><li>dddd - "
+"полное название дня недели (Понедельник - Воскресенье)</li><li>M - номер "
+"месяца без предшествующего нуля (1-12)</li><li>MM - номер месяца вместе с "
+"предшествующим нулём (01-12)</li><li>MMM - укороченное название месяца (Янв "
+"- Дек)</li><li>MMMM -Полное название месяца (Январь - Декабрь)</li><li>yy - "
+"год в виде двузначного числа (00-99)</li><li>yyyy - год в виде "
+"четырёхзначного числа (0000-9999)</li></ul><p><strong>Данные выражения могут "
+"быть использованы для указания времени:</string></p> <ul><li>h - час без "
+"предшествующего нуля (0-23 или 1-12 в 12 часовом формате)</li><li>hh - час "
+"вместе с предшествующим нулём (00-23 или 01-12 в 12-часовом формате)</"
+"li><li>m - минуты без предшествующего нуля (0-59)</li><li>mm - минуты вместе "
+"с предшествующим нулём (00-59)</li><li>s - секунды без предшествующего нуля "
+"(0-59)</li><li>ss - секунды вместе с предшествующим нулём (00-59)</li><li>z "
+"- миллисекунды без предшествующего нуля (0-999)</li><li>zzz - миллисекунды "
+"вместе с предшествующим нулём (000-999)</li><li>AP - переключить в 12-"
+"часовой формат. AP будет заменён на соответствующие \"AM\" или \"PM\".</"
+"li><li>ap - переключить в 12-часовой формат. ap будет заменён на "
+"соответствующие \"am\" или \"pm\".</li><li>Z - временная зона в числовом "
+"формате (-0500)</li></ul><p><strong>Другие символы буду проигнорированы.</"
+"strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Изменение глобальных настроек дискуссий скажется на параметрах всех папок."
 
@@ -1999,8 +2005,7 @@ msgstr "&Строка состояния для HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Показать признак &спама в заголовке"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Показывать графические смайлики"
@@ -2009,8 +2014,7 @@ msgstr "Показывать графические смайлики"
 msgid "Use smaller font for quoted text"
 msgstr "Использовать для цитат шрифт меньшего размера"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Показ/скрытие блоков цитирования"
@@ -2036,8 +2040,7 @@ msgstr "Авто"
 msgid "&Override character encoding:"
 msgstr "&Принудительная кодировка:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Значок в системном лотке"
@@ -2139,23 +2142,19 @@ msgstr "<b>%f</b> будет заменено именем файла для р�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>В заготовках для ответов возможны следующие подстановки:"
-"<br><b>%D</b>: дата, <b>%S</b>: тема,"
-"<br><b>%e</b>: адрес отправителя, <b>%F</b>: имя отправителя, <b>%f</b>"
-": инициалы отправителя,"
-"<br><b>%T</b>: имя получателя, <b>%t</b>: имя и адрес получателя,"
-"<br><b>%C</b>: имена получателей копий, <b>%c</b>: имена и адреса получателей "
-"копий,"
-"<br><b>%%</b>: знак процента, <b>%_</b>: пробел, <b>%L</b>"
-": начало новой строки</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>В заготовках для ответов возможны следующие подстановки:<br><b>%D</b>: "
+"дата, <b>%S</b>: тема,<br><b>%e</b>: адрес отправителя, <b>%F</b>: имя "
+"отправителя, <b>%f</b>: инициалы отправителя,<br><b>%T</b>: имя получателя, "
+"<b>%t</b>: имя и адрес получателя,<br><b>%C</b>: имена получателей копий, <b>"
+"%c</b>: имена и адреса получателей копий,<br><b>%%</b>: знак процента, <b>"
+"%_</b>: пробел, <b>%L</b>: начало новой строки</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2178,21 +2177,20 @@ msgstr "Ответ &всем:"
 msgid "&Forward:"
 msgstr "&Пересылка:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Цитирование:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "В сообщении от %D вы написали:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "В сообщении от %D %F написал(a):"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Пересланное сообщение"
 
@@ -2230,8 +2228,8 @@ msgstr "Введите новый префикс пересылки:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Этот список будет проверяться для каждого исходящего сообщения, чтобы в "
 "сообщении содержались все символы одной из указанных кодировок (начиная с "
@@ -2270,10 +2268,9 @@ msgstr "Значение"
 msgid "Ne&w"
 msgstr "Соз&дать"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Имя:"
@@ -2282,16 +2279,15 @@ msgstr "&Имя:"
 msgid "&Value:"
 msgstr "&Значение:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Имена вложений, совместимые с Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Включите этот режим, чтобы Outlook(tm) понимал имена вложений, содержащих "
 "кириллические символы"
@@ -2320,18 +2316,19 @@ msgstr "высылаю"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"Вы включили кодирование имён вложенных файлов в нестандартным формате, понятном "
-"Outlook(TM) и Outlook Express(TM).\n"
-"Такое сообщение может быть не распознано почтовыми клиентами, совместимыми со "
-"стандартами. Поэтому используйте этот параметр, только если у вас нет выбора."
+"Вы включили кодирование имён вложенных файлов в нестандартным формате, "
+"понятном Outlook(TM) и Outlook Express(TM).\n"
+"Такое сообщение может быть не распознано почтовыми клиентами, совместимыми "
+"со стандартами. Поэтому используйте этот параметр, только если у вас нет "
+"выбора."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2355,109 +2352,94 @@ msgstr "М&одули криптографии"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Иногда электронные сообщения приходят в обоих форматах. Эта опция "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Иногда электронные сообщения приходят в обоих форматах. Эта опция "
 "устанавливает, в каком виде показать сообщение - как HTML или как обычный "
-"текст.</p>"
-"<p>Показ в виде HTML делает сообщение более красивым, но в то же время "
-"увеличивает риск нарушения безопасности.</p>"
-"<p>При показе простого текста форматирование теряется, однако становится <em>"
-"невозможным</em> нарушение безопасности при использовании движка HTML "
-"(Konqueror).</p>"
-"<p>Данный параметр защищает от наиболее частого неправильного использования "
-"сообщений в формате HTML. Но он не может сохранить против способов нарушения "
-"безопасности, которые были неизвестны на момент выпуска этой версии KMail.</p>"
-"<p>Поэтому рекомендуется использовать <em>не</em> HTML, а обычный текст.</p>"
-"</qt>"
+"текст.</p><p>Показ в виде HTML делает сообщение более красивым, но в то же "
+"время увеличивает риск нарушения безопасности.</p><p>При показе простого "
+"текста форматирование теряется, однако становится <em>невозможным</em> "
+"нарушение безопасности при использовании движка HTML (Konqueror).</"
+"p><p>Данный параметр защищает от наиболее частого неправильного "
+"использования сообщений в формате HTML. Но он не может сохранить против "
+"способов нарушения безопасности, которые были неизвестны на момент выпуска "
+"этой версии KMail.</p><p>Поэтому рекомендуется использовать <em>не</em> "
+"HTML, а обычный текст.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Некоторые рекламные сообщения приходят в формате HTML и содержат ссылки на "
-"изображения, которые отправители используют для получения уведомления того, что "
-"вы прочли их сообщение (&quot;web bugs&quot;).</p>"
-"<p>Нет никаких причин, чтобы загружать изображения прямо из сети, так как "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Некоторые рекламные сообщения приходят в формате HTML и содержат "
+"ссылки на изображения, которые отправители используют для получения "
+"уведомления того, что вы прочли их сообщение (&quot;web bugs&quot;).</"
+"p><p>Нет никаких причин, чтобы загружать изображения прямо из сети, так как "
 "отправитель может всегда вставить нужные изображения непосредственно в "
-"сообщение.</p>"
-"<p>Для защиты от злоупотребления HTML, этот параметр <em>выключен</em> "
-"по умолчанию.</p>"
-"<p>Если вы, несмотря ни на что, хотите просматривать сообщения с изображениями, "
-"которые не идут в самом сообщении, включите эту опцию, но помните о возможных "
-"проблемах.</p></qt>"
+"сообщение.</p><p>Для защиты от злоупотребления HTML, этот параметр "
+"<em>выключен</em> по умолчанию.</p><p>Если вы, несмотря ни на что, хотите "
+"просматривать сообщения с изображениями, которые не идут в самом сообщении, "
+"включите эту опцию, но помните о возможных проблемах.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Правила для уведомлений об обработке сообщений</h3>"
-"<p>Уведомления об обработке сообщений (MDN) - это обобщение хорошо известных <b>"
-"подтверждений о прочтении</b>. Автор  сообщения запрашивает уведомление об "
-"обработке, а программа адресата отправляет ответ, из которого автор узнаёт о "
-"судьбе сообщения. Обычно  уведомления могут включать такую информацию: <b>"
-"просмотрено</b> (т.е.  прочитано),<b>удалено</b> и <b>обработано</b> "
-"(например, перенаправлено).</p>"
-"<p>KMail может осуществлять следующие виды обработки:</p>"
-"<ul>"
-"<li><em>Игнорировать</em>: никакие уведомления не будут отправляться "
-"(рекомендуется).</li>"
-"<li><em>Спрашивать</em>: запрашивать разрешение на отправку уведомлений. Таким "
-"способом вы можете контролировать отправку уведомлений.</li>"
-"<li><em>Отказать</em>: всегда отправлять уведомление об <b>отказе</b>"
-". Автор сообщения тем самым узнаёт, что сообщение обработано, но не будет "
-"знать, каким именно образом.</li>"
-"<li><em>Всегда отправлять</em>: Автор сообщения тем самым узнаёт, что сообщение "
-"обработано, и будет знать, каким именно образом. Не рекомендуется устанавливать "
-"этот параметр, если этого не требуется для вашей бизнес-логики.</li></ul> </qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Правила для уведомлений об обработке сообщений</h3><p>Уведомления об "
+"обработке сообщений (MDN) - это обобщение хорошо известных <b>подтверждений "
+"о прочтении</b>. Автор  сообщения запрашивает уведомление об обработке, а "
+"программа адресата отправляет ответ, из которого автор узнаёт о судьбе "
+"сообщения. Обычно  уведомления могут включать такую информацию: "
+"<b>просмотрено</b> (т.е.  прочитано),<b>удалено</b> и <b>обработано</b> "
+"(например, перенаправлено).</p><p>KMail может осуществлять следующие виды "
+"обработки:</p><ul><li><em>Игнорировать</em>: никакие уведомления не будут "
+"отправляться (рекомендуется).</li><li><em>Спрашивать</em>: запрашивать "
+"разрешение на отправку уведомлений. Таким способом вы можете контролировать "
+"отправку уведомлений.</li><li><em>Отказать</em>: всегда отправлять "
+"уведомление об <b>отказе</b>. Автор сообщения тем самым узнаёт, что "
+"сообщение обработано, но не будет знать, каким именно образом.</"
+"li><li><em>Всегда отправлять</em>: Автор сообщения тем самым узнаёт, что "
+"сообщение обработано, и будет знать, каким именно образом. Не рекомендуется "
+"устанавливать этот параметр, если этого не требуется для вашей бизнес-логики."
+"</li></ul> </qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2473,10 +2455,10 @@ msgstr "&Загружать внешние ссылки"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>ВНИМАНИЕ!</b> Включение обработки HTML в почте увеличивает подверженность "
 "вашей системы взломам.<a href=\"whatsthis:%1\">Подробнее о почте в формате "
@@ -2561,8 +2543,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Этот параметр требует установленного пакета dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "нет прокси-сервера"
@@ -2591,8 +2572,8 @@ msgstr "Исключить &важные при удалении устарев�
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Поиск непрочитанных сообщений:"
 
@@ -2616,8 +2597,8 @@ msgstr "Циклично по всем папкам"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "При входе в папку:"
 
@@ -2686,27 +2667,23 @@ msgstr "Каталогах (формат \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Формат почтовых папок по умолчанию:</p>"
-"<p><b>mbox:</b> Все почтовые папки KMail хранятся в отдельных файлах каждая. "
-"Сообщения отделяются друг от друга строкой \"From \". Это экономит место на "
-"диске, но может быть менее надёжно, например, при перемещении сообщений из "
-"одной папки в другую.</p>"
-"<p><b>maildir:</b> Все папки KMail хранятся в отдельных папках на диске. Каждое "
-"сообщение представляет собой отдельный файл. Это занимает немного больше места "
-"на диске, но более надёжно, например, при перемещении сообщения из одной папки "
-"в другую.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Формат почтовых папок по умолчанию:</p><p><b>mbox:</b> Все почтовые "
+"папки KMail хранятся в отдельных файлах каждая. Сообщения отделяются друг от "
+"друга строкой \"From \". Это экономит место на диске, но может быть менее "
+"надёжно, например, при перемещении сообщений из одной папки в другую.</"
+"p><p><b>maildir:</b> Все папки KMail хранятся в отдельных папках на диске. "
+"Каждое сообщение представляет собой отдельный файл. Это занимает немного "
+"больше места на диске, но более надёжно, например, при перемещении сообщения "
+"из одной папки в другую.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2739,52 +2716,43 @@ msgstr "Гб"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>При переходе к следующему непрочитанному сообщению может оказаться так, что "
-"их больше нет в списке.</p>"
-"<p><b>Без цикла:</b> По достижении последнего сообщения поиск прекратится.</p>"
-"<p><b>Циклично по текущей папке:</b>По достижении последнего сообщения поиск "
-"продолжится с начала папки.</p>"
-"<p><b>Циклично по всем папкам:</b> По достижении последнего сообщения поиск "
-"продолжится в других папках.</p> "
-"<p>Точно так же это работает при поиске предыдущего непрочитанного "
-"сообщения.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>При переходе к следующему непрочитанному сообщению может оказаться "
+"так, что их больше нет в списке.</p><p><b>Без цикла:</b> По достижении "
+"последнего сообщения поиск прекратится.</p><p><b>Циклично по текущей папке:</"
+"b>По достижении последнего сообщения поиск продолжится с начала папки.</"
+"p><p><b>Циклично по всем папкам:</b> По достижении последнего сообщения "
+"поиск продолжится в других папках.</p> <p>Точно так же это работает при "
+"поиске предыдущего непрочитанного сообщения.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Полнотекстовый поиск позволяет ускорить поиск по содержимому сообщений. При "
-"включении этого параметра поиск по телу сообщений будет работать намного "
-"быстрее. Кроме того, через панель поиска над списком сообщений вы можете "
-"отбирать сообщения в том числе и по их содержимому.</p>"
-"<p>Эта возможность требует дополнительного пространства на диске (примерно "
-"половину от объёма, занимаемого непосредственно сообщениями).</p>"
-"<p>После включения параметра, будет построен индекс. Во время этой операции вы "
-"можете использовать KMail как обычно.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Полнотекстовый поиск позволяет ускорить поиск по содержимому "
+"сообщений. При включении этого параметра поиск по телу сообщений будет "
+"работать намного быстрее. Кроме того, через панель поиска над списком "
+"сообщений вы можете отбирать сообщения в том числе и по их содержимому.</"
+"p><p>Эта возможность требует дополнительного пространства на диске (примерно "
+"половину от объёма, занимаемого непосредственно сообщениями).</p><p>После "
+"включения параметра, будет построен индекс. Во время этой операции вы можете "
+"использовать KMail как обычно.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2851,8 +2819,8 @@ msgstr "&Скрыть папки совместной работы"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "Не показывать папки совместной работы в общем списке папок."
 
 #: configuredialog.cpp:4909
@@ -2861,8 +2829,8 @@ msgstr "Показывать только со&вместные папки"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "Показывать только папки совместной работы в общем списке папок."
 
 #: configuredialog.cpp:4921
@@ -2874,8 +2842,8 @@ msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
-"Синхронизировать изменения с сервером в отсоединённых папках IMAP сразу же при "
-"подключении к сети."
+"Синхронизировать изменения с сервером в отсоединённых папках IMAP сразу же "
+"при подключении к сети."
 
 #: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
@@ -2920,22 +2888,22 @@ msgid ""
 "compatible way."
 msgstr ""
 "Microsoft Outlook при работе с сервером Microsoft Exchange имеет проблемы "
-"обработки сообщений электронной почты других систем совместной работы. Включите "
-"эту опцию для отправки приглашений в виде, понятном Microsoft Exchange."
+"обработки сообщений электронной почты других систем совместной работы. "
+"Включите эту опцию для отправки приглашений в виде, понятном Microsoft "
+"Exchange."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Имена вложений, совместимые с Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Автоматическое отправление приглашений"
@@ -2945,26 +2913,26 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"При включении этого параметра приглашения будут отправляться автоматически, без "
-"показа окна редактора сообщения"
+"При включении этого параметра приглашения будут отправляться автоматически, "
+"без показа окна редактора сообщения"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Приглашения обычно отправляются в формате почтовых вложений. При включении "
-"этой опции приглашения и ответы на них будут отправляться непосредственно в "
-"тексте письма, чтобы Microsoft Outlook был способен их воспринимать."
-"<br>Учтите, что при этом пропадает описание, которое способны читать почтовые "
-"программы, и ваши адресаты, почтовые программы которых не смогут прочитать эти "
-"приглашения, будут удивлены странным видом сообщений."
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Приглашения обычно отправляются в формате почтовых вложений. При "
+"включении этой опции приглашения и ответы на них будут отправляться "
+"непосредственно в тексте письма, чтобы Microsoft Outlook был способен их "
+"воспринимать.<br>Учтите, что при этом пропадает описание, которое способны "
+"читать почтовые программы, и ваши адресаты, почтовые программы которых не "
+"смогут прочитать эти приглашения, будут удивлены странным видом сообщений."
 "<br>Адресаты с почтовыми программами, способными прочитать такие сообщения, "
 "смогут работать с ними.</qt>"
 
@@ -3070,29 +3038,27 @@ msgstr "Пересылка"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Здесь вы можете создавать, изменять и удалять собственные шаблоны ответных и "
-"пересылаемых сообщений. Чтобы создать новый шаблон, нажмите правую кнопку мыши "
-"или кнопку на панели инструментов. Вы можете также назначить комбинацию клавиш "
-"для создания сообщения на базе выбранного шаблона.</p>"
-"<p>Шаблоны поддерживают команды подстановки: введите их или выберите из меню  "
-"<i>Вставить команду</i>.</p>"
-"<p>Поддерживаются четыре типа шаблонов пользователя: <i>Ответ отправителю</i>"
-", <i>Ответ всем</i>, <i>Пересылка</i> и <i>Обычное сообщение</i>"
-". Вы не можете назначить комбинацию клавиш для создания <i>"
-"обычного сообщения</i> на базе шаблона.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Здесь вы можете создавать, изменять и удалять собственные шаблоны "
+"ответных и пересылаемых сообщений. Чтобы создать новый шаблон, нажмите "
+"правую кнопку мыши или кнопку на панели инструментов. Вы можете также "
+"назначить комбинацию клавиш для создания сообщения на базе выбранного "
+"шаблона.</p><p>Шаблоны поддерживают команды подстановки: введите их или "
+"выберите из меню  <i>Вставить команду</i>.</p><p>Поддерживаются четыре типа "
+"шаблонов пользователя: <i>Ответ отправителю</i>, <i>Ответ всем</i>, "
+"<i>Пересылка</i> и <i>Обычное сообщение</i>. Вы не можете назначить "
+"комбинацию клавиш для создания <i>обычного сообщения</i> на базе шаблона.</"
+"p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3109,15 +3075,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3143,8 +3109,8 @@ msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
-"Выбранная комбинация клавиш уже используется. Вы хотите использовать комбинацию "
-"для этого шаблона?"
+"Выбранная комбинация клавиш уже используется. Вы хотите использовать "
+"комбинацию для этого шаблона?"
 
 #: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
@@ -3193,11 +3159,11 @@ msgstr "Редактировать в:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
-"Невозможно определить, что выбранный редактор закрыт. Для предотвращения потери "
-"данных редактирование вложения будет прервано."
+"Невозможно определить, что выбранный редактор закрыт. Для предотвращения "
+"потери данных редактирование вложения будет прервано."
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3299,8 +3265,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Невозможно осуществить перемещение устаревших сообщений из папки %1: конечная "
-"папка %2 не найдена"
+"Невозможно осуществить перемещение устаревших сообщений из папки %1: "
+"конечная папка %2 не найдена"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3453,6 +3419,11 @@ msgstr "Выберите фильтр"
 msgid "Filters"
 msgstr "Фильтры"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Выделить весь текст"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3482,8 +3453,8 @@ msgstr "&Вести журнал фильтра"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Вести журнал работы фильтров. Конечно, данные в него будут заноситься только "
 "тогда, когда он включен."
@@ -3502,13 +3473,14 @@ msgstr "&Проверка по правилам"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Вы можете контролировать обработку писем фильтрами. При включении этой опции в "
-"журнале работы фильтров будет показаны результаты работы каждого фильтра."
+"Вы можете контролировать обработку писем фильтрами. При включении этой опции "
+"в журнале работы фильтров будет показаны результаты работы каждого фильтра."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3528,15 +3500,15 @@ msgstr "отсутствует"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Ведение журнала требует дополнительных затрат памяти для временного хранения "
-"данных. Здесь можно указать максимальный размер занимаемой памяти. Если размер "
-"журнала превышает указанный здесь предел, то старые данные будут удаляться из "
-"журнала, чтобы освободить место."
+"данных. Здесь можно указать максимальный размер занимаемой памяти. Если "
+"размер журнала превышает указанный здесь предел, то старые данные будут "
+"удаляться из журнала, чтобы освободить место."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3546,7 +3518,7 @@ msgstr ""
 "Невозможно сохранить файл %1:\n"
 "Сообщение об ошибке - %2."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Ошибка KMail"
@@ -3587,12 +3559,12 @@ msgstr "&Идентификатор пользователя:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Идентификатор пользователя (логин) для IMAP-сервера. Это может быть просто имя "
-"пользователя, или его почтовый адрес."
+"Идентификатор пользователя (логин) для IMAP-сервера. Это может быть просто "
+"имя пользователя, или его почтовый адрес."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3643,8 +3615,8 @@ msgstr "Отсутствуют права на чтение/запись в Ко
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Информация не получена с сервера, используйте пункт меню \"Проверить почту\"."
 
@@ -3656,8 +3628,7 @@ msgstr "Ошибка: нет учётной записи IMAP для указа�
 msgid "Connecting to server %1, please wait..."
 msgstr "Соединение с сервером %1, подождите..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Ошибка соединения с сервером %1"
@@ -3685,10 +3656,11 @@ msgstr "Добавить права доступа"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Запретить самому себе доступ к этой папке? После этого папка будет недоступна."
+"Запретить самому себе доступ к этой папке? После этого папка будет "
+"недоступна."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3719,7 +3691,7 @@ msgstr "Использование:"
 msgid "Select Folder"
 msgstr "Удалить папку"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Локальные папки"
@@ -3743,9 +3715,9 @@ msgstr "Выберите комбинацию клавиш"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Выберите клавишу или комбинацию клавиш, при нажатии на которую будет "
 "выбрана указанная папка. Нажмите на кнопку или укажите комбинацию клавиш, "
@@ -3769,14 +3741,23 @@ msgstr "О&тменить"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 "<qt>Папка, которую вы хотите удалить, является основной для входящих писем "
 "учётной записи <b>%1</b>. Все входящие сообщения этой учётной записи после "
 "удаления этой папки будут помещены в папку Входящие.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Всего: %2<br>Непрочитанных: %3<br>Размер: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Квота: %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "неизв."
@@ -3898,54 +3879,16 @@ msgstr "Признак спама:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>Н"
-"<br>е"
-"<br>т"
-"<br> "
-"<br>к "
-"<br>о "
-"<br>д "
-"<br>а "
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b> </qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>Н<br>е<br>т<br> <br>к <br>о <br>д <br>а <br><br>H<br>T<br>M<br>L</b> "
+"</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3957,19 +3900,14 @@ msgstr "&Ваше имя:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Ваше имя</h3>"
-"<p>Это поле должно содержать ваше имя, или псевдоним. Оно будет использовано в "
-"заголовках отправляемых сообщений.</p>"
-"<p>Если вы оставите это поле пустым, в отправляемых вами сообщениях будет виден "
-"только ваш e-mail.</p></qt>"
+"<qt><h3>Ваше имя</h3><p>Это поле должно содержать ваше имя, или псевдоним. "
+"Оно будет использовано в заголовках отправляемых сообщений.</p><p>Если вы "
+"оставите это поле пустым, в отправляемых вами сообщениях будет виден только "
+"ваш e-mail.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3977,17 +3915,13 @@ msgstr "&Организация:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Организация</h3>"
-"<p>Введите здесь название организации, в которой вы работаете, если вы хотите, "
-"чтобы оно добавлялось в заголовки писем, отправляемых вами.</p>"
-"<p>Можно оставить это поле пустым.</p></qt>"
+"<qt><h3>Организация</h3><p>Введите здесь название организации, в которой вы "
+"работаете, если вы хотите, чтобы оно добавлялось в заголовки писем, "
+"отправляемых вами.</p><p>Можно оставить это поле пустым.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3996,19 +3930,14 @@ msgstr "&Электронный адрес:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Электронный адрес</h3>"
-"<p>Если вы оставите это поле пустым или заполните его неправильно, у отвечающих "
-"вам возникнут трудности.</p></qt>"
+"<qt><h3>Электронный адрес</h3><p>Если вы оставите это поле пустым или "
+"заполните его неправильно, у отвечающих вам возникнут трудности.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4017,21 +3946,12 @@ msgstr "&Электронный адрес:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4056,19 +3976,17 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ключ OpenPGP будет использован для подписывания сообщений. Можно также "
-"использовать ключи GnuPG.</p>"
-"<p>Если оставить это поле пустым, то можно будет отправлять обычную почту, для "
-"которой не требуется шифрование.</p>"
-"<p>Подробнее о ключах можно прочитать на <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>Ключ OpenPGP будет использован для подписывания сообщений. Можно "
+"также использовать ключи GnuPG.</p><p>Если оставить это поле пустым, то "
+"можно будет отправлять обычную почту, для которой не требуется шифрование.</"
+"p><p>Подробнее о ключах можно прочитать на <a>http://www.gnupg.org</a></p></"
+"qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4080,30 +3998,26 @@ msgstr "Ваш ключ шифрования OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Выберите ключ OpenPGP, который будет использоваться для шифрования ваших "
 "сообщений и для команды \"Добавить открытый ключ\" в редакторе."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Ключ OpenPGP будет использован для шифрования ваших сообщений и для команды "
-"\"Добавить открытый ключ\" в редакторе. Можно также использовать ключи "
-"GnuPG.</p>"
-"<p>Если оставить это поле пустым, то можно будет отправлять обычную почту, для "
-"которой не требуется шифрование.</p>"
-"<p>Подробнее о ключах можно прочитать на <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Ключ OpenPGP будет использован для шифрования ваших сообщений и для "
+"команды \"Добавить открытый ключ\" в редакторе. Можно также использовать "
+"ключи GnuPG.</p><p>Если оставить это поле пустым, то можно будет отправлять "
+"обычную почту, для которой не требуется шифрование.</p><p>Подробнее о ключах "
+"можно прочитать на <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4118,20 +4032,19 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Выберите сертификат S/MIME, который будет использоваться для подписи сообщений."
+"Выберите сертификат S/MIME, который будет использоваться для подписи "
+"сообщений."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ключ S/MIME (X.509) будет использован для подписывания сообщений.</p>"
-"<p>Если оставить это поле пустым, то можно будет отправлять обычную почту, для "
-"которой не требуется шифрование.</p></qt>"
+"<qt><p>Ключ S/MIME (X.509) будет использован для подписывания сообщений.</"
+"p><p>Если оставить это поле пустым, то можно будет отправлять обычную почту, "
+"для которой не требуется шифрование.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4143,26 +4056,24 @@ msgstr "Ваш сертификат шифрования S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Выберите сертификат S/MIME, который будет использоваться для шифрования ваших "
-"сообщений и для команды \"Добавить открытый ключ\" в редакторе."
+"Выберите сертификат S/MIME, который будет использоваться для шифрования "
+"ваших сообщений и для команды \"Добавить открытый ключ\" в редакторе."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Сертификат S/MIME будет использован для шифрования ваших сообщений и для "
-"команды \"Добавить открытый ключ\" в редакторе.</p>"
-"<p>Если оставить это поле пустым, то можно будет отправлять обычную почту, для "
-"которой не требуется шифрование.</p></qt>"
+"<qt><p>Сертификат S/MIME будет использован для шифрования ваших сообщений и "
+"для команды \"Добавить открытый ключ\" в редакторе.</p><p>Если оставить это "
+"поле пустым, то можно будет отправлять обычную почту, для которой не "
+"требуется шифрование.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4182,22 +4093,18 @@ msgstr "Адрес &для ответов:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адреса для ответов</h3>"
-"<p>Определяет поле <tt>Reply-to:</tt> в заголовке письма. Указанный адрес будет "
-"использован при ответе на письмо.</p>"
-"<p>Это может быть полезно когда, например, группа людей работает вместе, "
-"выполняя одни обязанности. В таком случае в поле <tt>Reply-to:</tt> "
-"можно указывать общий адрес, а не личный, указываемый в поле <tt>From:</tt>.</p> "
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адреса для ответов</h3><p>Определяет поле <tt>Reply-to:</tt> в "
+"заголовке письма. Указанный адрес будет использован при ответе на письмо.</"
+"p><p>Это может быть полезно когда, например, группа людей работает вместе, "
+"выполняя одни обязанности. В таком случае в поле <tt>Reply-to:</tt> можно "
+"указывать общий адрес, а не личный, указываемый в поле <tt>From:</tt>.</p> "
 "<p>Если вам это не нужно, оставьте это пустым.</p></qt>"
 
 #: identitydialog.cpp:343
@@ -4206,24 +4113,19 @@ msgstr "&Адрес скрытой копии:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адреса скрытой копии (Blind Carbon Copy - скрытая копия)</h3>"
-"<p>Адреса, введённые в данном поле будут добавлены к каждому сообщению, "
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адреса скрытой копии (Blind Carbon Copy - скрытая копия)</"
+"h3><p>Адреса, введённые в данном поле будут добавлены к каждому сообщению, "
 "отправленному с использованием данного профиля и не будут видны другим "
-"получателям</p>"
-"<p>Обычно это используется для отправления копий сообщения на другие учётные "
-"записи.</p>"
-"<p>Если не уверены, оставьте данное поле пустым.</p></qt>"
+"получателям</p><p>Обычно это используется для отправления копий сообщения на "
+"другие учётные записи.</p><p>Если не уверены, оставьте данное поле пустым.</"
+"p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4261,7 +4163,7 @@ msgstr "П&одпись"
 msgid "&Picture"
 msgstr "&Картинка"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Неверный электронный адрес"
 
@@ -4279,13 +4181,13 @@ msgid ""
 msgstr ""
 "Один из настроенных ключей OpenPGP для подписи не содержит идентификатор "
 "пользователя с адресом электронной почты для этого профиля (%1).\n"
-"Это может вызвать появление предупреждающих сообщений у получателей при попытке "
-"проверки подписи."
+"Это может вызвать появление предупреждающих сообщений у получателей при "
+"попытке проверки подписи."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Один из настроенных ключей OpenPGP для подписи не содержит идентификатор "
 "пользователя с адресом электронной почты для этого профиля (%1)."
@@ -4299,8 +4201,8 @@ msgid ""
 msgstr ""
 "Один из настроенных сертификатов S/MIME для подписи не содержит адреса "
 "электронной почты для этого профиля (%1).\n"
-"Это может вызвать появление предупреждающих сообщений у получателей при попытке "
-"проверки подписи."
+"Это может вызвать появление предупреждающих сообщений у получателей при "
+"попытке проверки подписи."
 
 #: identitydialog.cpp:576
 msgid ""
@@ -4348,8 +4250,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (основной)"
 
@@ -4393,20 +4295,21 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"В учётной записи \"%1\" был обнаружен неиспользуемый префикс области имён IMAP."
+"В учётной записи \"%1\" был обнаружен неиспользуемый префикс области имён "
+"IMAP."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Настройка будет автоматически исправлена, однако проверьте учётную запись ещё "
-"раз."
+"Настройка будет автоматически исправлена, однако проверьте учётную запись "
+"ещё раз."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr "Невозможно исправить учётную запись. Измените её вручную."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4422,8 +4325,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Невозможно передать сообщение на сервер, датируемое %1 от <i>%2</i> с темой <i>"
-"%3</i>."
+"Невозможно передать сообщение на сервер, датируемое %1 от <i>%2</i> с темой "
+"<i>%3</i>."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4444,17 +4347,22 @@ msgstr "Квота по этой папке будет скоро превыше
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Если у вас нет прав на запись в эту папку, попросите владельца папки освободить "
-"место в этой папке."
+"Если у вас нет прав на запись в эту папку, попросите владельца папки "
+"освободить место в этой папке."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Ошибка: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Истекло ожидание ответа с сервера %1. Будет предпринята попытка повторного "
 "установления соединения с сервером."
@@ -4607,8 +4515,8 @@ msgstr "Архив"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 "Недостаточный уровень доверия для одного или нескольких указанных ключей "
 "OpenPGP или сертификатов S/MIME для шифрования."
@@ -4616,8 +4524,8 @@ msgstr ""
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 "Недостаточный уровень доверия для одного или нескольких указанных ключей "
 "OpenPGP или сертификатов S/MIME для шифрования."
@@ -4654,262 +4562,212 @@ msgstr "Недостаточно доверия ключам шифровани�
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Срок действия вашего ключа подписи OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
+"(KeyID 0x%2)</p><p>истекает менее чем через %n день.</p>\n"
 "<p>Срок действия вашего ключа подписи OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
+"(KeyID 0x%2)</p><p>истекает менее чем через %n дня.</p>\n"
 "<p>Срок действия вашего ключа подписи OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"(KeyID 0x%2)</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</"
+"b> (KeyID 0x%2)</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</"
+"b> (KeyID 0x%2)</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</"
+"b> (KeyID 0x%2)</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для подписи</p><p align=center><b>%1</b> (номер %2),</"
+"p><p>истекает менее чем через %n день.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для подписи</p><p align=center><b>%1</b> (номер %2),</"
+"p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для подписи</p><p align=center><b>%1</b> (номер %2),</"
+"p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для шифрования</p><p align=center><b>%1</b> (номер %2),"
+"</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для шифрования</p><p align=center><b>%1</b> (номер %2),"
+"</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для шифрования</p><p align=center><b>%1</b> (номер %2),"
+"</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает менее чем "
+"через %n день.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает менее чем "
+"через %n дня.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает менее чем "
+"через %n дней.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для подписи</p><p align=center><b>%1</b> "
+"(номер %2),</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для подписи</p><p align=center><b>%1</b> "
+"(номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для подписи</p><p align=center><b>%1</b> "
+"(номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n день.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дня.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Сертификат S/MIME, используемый для подписи</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
+"(номер %2),</p><p>истекает менее чем через %n день.</p>\n"
 "<p>Сертификат S/MIME, используемый для подписи</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
+"(номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
 "<p>Сертификат S/MIME, используемый для подписи</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"(номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n день.</p>\n"
+"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дня.</p>\n"
+"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4923,251 +4781,201 @@ msgstr "Срок действия сертификата S/MIME истекает
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Срок действия вашего ключа подписи OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
+"(KeyID 0x%2)</p><p>истекает менее чем через %n день.</p>\n"
 "<p>Срок действия вашего ключа подписи OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
+"(KeyID 0x%2)</p><p>истекает менее чем через %n дня.</p>\n"
 "<p>Срок действия вашего ключа подписи OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"(KeyID 0x%2)</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</"
+"b> (KeyID 0x%2)</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</"
+"b> (KeyID 0x%2)</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Срок действия вашего ключа шифрования OpenPGP </p><p align=center><b>%1</"
+"b> (KeyID 0x%2)</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Срок действия ключа OpenPGP для</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для подписи</p><p align=center><b>%1</b> (номер %2),</"
+"p><p>истекает менее чем через %n день.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для подписи</p><p align=center><b>%1</b> (номер %2),</"
+"p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для подписи</p><p align=center><b>%1</b> (номер %2),</"
+"p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для шифрования</p><p align=center><b>%1</b> (номер %2),"
+"</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для шифрования</p><p align=center><b>%1</b> (номер %2),"
+"</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME, используемого для шифрования</p><p align=center><b>%1</b> (номер %2),"
+"</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Корневой сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает менее чем "
+"через %n день.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает менее чем "
+"через %n дня.</p>\n"
+"<p>Корневой сертификат</p><p align=center><b>%3</b></p><p>вашего сертификата "
+"S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает менее чем "
+"через %n дней.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для подписи</p><p align=center><b>"
-"%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для подписи</p><p align=center><b>%1</b> "
+"(номер %2),</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для подписи</p><p align=center><b>%1</b> "
+"(номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для подписи</p><p align=center><b>%1</b> "
+"(номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME, используемого для шифрования</p><p align=center>"
-"<b>%1</b> (номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME, используемого для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p>"
-"<p>вашего сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n день.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дня.</p>\n"
+"<p>Вспомогательный сертификат</p><p align=center><b>%3</b></p><p>вашего "
+"сертификата S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Сертификат S/MIME, используемый для подписи</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
+"(номер %2),</p><p>истекает менее чем через %n день.</p>\n"
 "<p>Сертификат S/MIME, используемый для подписи</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
+"(номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
 "<p>Сертификат S/MIME, используемый для подписи</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"(номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</b> "
-"(номер %2),</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n день.</p>\n"
+"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дня.</p>\n"
+"<p>Сертификат S/MIME, используемый для шифрования</p><p align=center><b>%1</"
+"b> (номер %2),</p><p>истекает менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n день.</p>\n"
-"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дня.</p>\n"
-"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p>"
-"<p>истекает менее чем через %n дней.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n день.</p>\n"
+"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дня.</p>\n"
+"<p>Сертификат S/MIME</p><p align=center><b>%1</b> (номер %2)</p><p>истекает "
+"менее чем через %n дней.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5179,14 +4987,15 @@ msgstr "Срок действия сертификата S/MIME истекает
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Один или несколько ключей шифрования OpenPGP или сертификатов S/MIME не могут "
-"быть использованы для шифрования. Измените ваши ключи шифрования или "
+"Один или несколько ключей шифрования OpenPGP или сертификатов S/MIME не "
+"могут быть использованы для шифрования. Измените ваши ключи шифрования или "
 "сертификаты в диалоге изменения профиля.\n"
 "Если вы продолжите, у вас будут запрошены подходящие ключи."
 
@@ -5203,8 +5012,8 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Один или несколько ключей подписи OpenPGP или сертификатов подписи S/MIME не "
-"могут быть использованы для подписи сообщения. Измените ваши ключи подписи или "
-"сертификаты в диалоге изменения профиля.\n"
+"могут быть использованы для подписи сообщения. Измените ваши ключи подписи "
+"или сертификаты в диалоге изменения профиля.\n"
 "Если вы продолжите, у вас будут запрошены подходящие ключи."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
@@ -5215,36 +5024,36 @@ msgstr "Невозможно использовать ключи подписи"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Проверка параметров шифрования для получателей показала, что сообщение должно "
-"быть зашифровано с помощью OpenPGP, однако в текущем профиле нет настроенных "
-"проверенных ключей шифрования OpenPGP.\n"
-"Вы можете продолжить без шифрования самому себе, но тогда вы не сможете читать "
-"свои собственные сообщения."
+"Проверка параметров шифрования для получателей показала, что сообщение "
+"должно быть зашифровано с помощью OpenPGP, однако в текущем профиле нет "
+"настроенных проверенных ключей шифрования OpenPGP.\n"
+"Вы можете продолжить без шифрования самому себе, но тогда вы не сможете "
+"читать свои собственные сообщения."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Проверка параметров шифрования для получателей показала, что сообщение должно "
-"быть зашифровано с помощью S/MIME, однако в текущем профиле нет настроенных "
-"сертификатов шифрования S/MIME.\n"
-"Вы можете продолжить без шифрования самому себе, но тогда вы не сможете читать "
-"свои собственные сообщения."
+"Проверка параметров шифрования для получателей показала, что сообщение "
+"должно быть зашифровано с помощью S/MIME, однако в текущем профиле нет "
+"настроенных сертификатов шифрования S/MIME.\n"
+"Вы можете продолжить без шифрования самому себе, но тогда вы не сможете "
+"читать свои собственные сообщения."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5258,8 +5067,8 @@ msgstr "Не подписывать OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5286,11 +5095,11 @@ msgstr "Невозможно подписать"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Вы не выбрали ключ шифрования для себя. Вы не сможете прочитать сообщение если "
-"зашифруете его."
+"Вы не выбрали ключ шифрования для себя. Вы не сможете прочитать сообщение "
+"если зашифруете его."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5311,10 +5120,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Вы не выбрали ключ шифрования для получателей. Сообщение не будет зашифровано."
+"Вы не выбрали ключ шифрования для получателей. Сообщение не будет "
+"зашифровано."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5325,8 +5135,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Вы не выбрали ключ шифрования для одного из получателей. Он не сможет прочитать "
-"сообщение если вы зашифруете его."
+"Вы не выбрали ключ шифрования для одного из получателей. Он не сможет "
+"прочитать сообщение если вы зашифруете его."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5358,11 +5168,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Не найден допустимый и проверенный ключ шифрования для \"%1\".\n"
 "\n"
@@ -5412,10 +5222,8 @@ msgstr ""
 "Критическая ошибка: не удалось получить почту (недостаточно места на диске?):"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Ошибка при добавлении сообщения:\n"
+msgid "Failed to add message:\n"
+msgstr "Ошибка при добавлении сообщения:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5507,6 +5315,51 @@ msgstr "Отсоединённый &IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Ящик формата maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Тема сообщения"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Отправить копию на «address»"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Отправить скрытую копию на «address»"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Добавить поле заголовка «header» в сообщение"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Прочитать тело сообщения из «file»"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Задать тело сообщения"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Добавить одно или несколько вложений в сообщение"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Только проверить наличие новых сообщений"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Открыть только окно редактора"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Просмотреть файл с сообщением"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Отправить сообщение на «address» и вложить файл, на который ссылается «URL»"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Почту"
@@ -5565,14 +5418,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>Сейчас будут созданы требуемые папки для совместной работы как подпапки %1 "
-"и произведена операция: %2"
-"<br>Если вы не хотите этого делать, отмените операцию (при этом использование "
-"источника IMAP будет отключено)"
+"<qt>Сейчас будут созданы требуемые папки для совместной работы как подпапки "
+"%1 и произведена операция: %2<br>Если вы не хотите этого делать, отмените "
+"операцию (при этом использование источника IMAP будет отключено)"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5621,11 +5473,11 @@ msgstr "Ссылка скопирована в буфер обмена."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Файл <b>%1</b> существует. Хотите его заменить?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Сохранить в файл"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Заменить"
 
@@ -5643,7 +5495,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Сообщение было удалено при сохранении."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5663,11 +5515,11 @@ msgstr "Файл не содержит сообщение."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Этот файл содержит несколько сообщений. Показано только первое."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5677,112 +5529,112 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Фильтрация сообщений"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Фильтрация сообщения %1 из %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Недостаточно места на диске?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Переместить в эту папку"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Копировать в эту папку"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Обнаружен повреждённый кэш IMAP для папки %1. Копирование сообщений отменено."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Перемещение сообщений"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Удаление сообщений"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Открытие ссылки..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Вы действительно хотите выполнить <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Выполнить"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Не найдены вложения для сохранения."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Сохранить вложение в"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "вложение.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "вложение.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Файл с именем %1 уже существует. Хотите его перезаписать?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Файл уже существует"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Перезаписать"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "Часть %1 сообщения зашифрована. Сохранить сообщение зашифрованным?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Вопрос KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Зашифровать"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Не шифровать"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "Часть %1 сообщения подписана. Оставить сообщение подписанным?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Оставить подписанным"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5791,19 +5643,19 @@ msgstr ""
 "Невозможно сохранить файл %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Невозможно записать в файл %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr "Для этого адреса нет записи в адресной книге."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5813,71 +5665,71 @@ msgstr ""
 " %1\n"
 "невозможно определить с кем вести разговор."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Библиотека Chiasmus не содержит функции \"x-obtain-keys\". Сообщите об этой "
 "ошибке разработчикам."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Ошибка движка Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Функция \"x-obtain-keys\" библиотеки Chiasmus не вернула список строк. Сообщите "
-"об этой ошибке разработчикам."
+"Функция \"x-obtain-keys\" библиотеки Chiasmus не вернула список строк. "
+"Сообщите об этой ошибке разработчикам."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Ключи не найдены. Укажите правильный путь к ключам в параметрах настройки "
 "Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Выбор ключа расшифровывания Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Библиотека Chiasmus не содержит функции \"x-decrypt\". Сообщите об этой ошибке "
-"разработчикам."
+"Библиотека Chiasmus не содержит функции \"x-decrypt\". Сообщите об этой "
+"ошибке разработчикам."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Параметры вызова функции \"x-decrypt\" не соответствуют ожидаемым. Сообщите об "
-"этой ошибке разработчикам."
+"Параметры вызова функции \"x-decrypt\" не соответствуют ожидаемым. Сообщите "
+"об этой ошибке разработчикам."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Ошибка расшифровки Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Функция \"x-decrypt\" библиотеки Chiasmus не вернула массив байтов. Сообщите об "
-"этой ошибке разработчикам."
+"Функция \"x-decrypt\" библиотеки Chiasmus не вернула массив байтов. Сообщите "
+"об этой ошибке разработчикам."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5887,7 +5739,7 @@ msgstr ""
 "Получатель: %2\n"
 "Тема: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Почтовый ящик: %1"
@@ -5986,7 +5838,7 @@ msgstr "Размер"
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Сжатие"
 
@@ -5998,7 +5850,7 @@ msgstr "Шифрование"
 msgid "Sign"
 msgstr "Подпись"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Имя вложения:"
 
@@ -6020,7 +5872,8 @@ msgstr "Основные получатели"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>Адреса e-mail из этого поля получат копию сообщения.</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -6030,14 +5883,14 @@ msgstr "Дополнительные получатели"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Адреса e-mail из этого поля получат копию сообщения. Технически, это "
-"аналогично указанию всех адресов в поле <b>Получатель</b>"
-", но это символизирует, что адреса, указанные в поле <b>Копия</b> "
-"являются лишь слушателями дискуссии.</qt>"
+"аналогично указанию всех адресов в поле <b>Получатель</b>, но это "
+"символизирует, что адреса, указанные в поле <b>Копия</b> являются лишь "
+"слушателями дискуссии.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6045,9 +5898,8 @@ msgstr "Скрытые получатели"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>Это поле аналогично полю <b>Копия</b>, только остальные получатели не "
 "увидят получателей скрытой копии.</qt>"
@@ -6060,7 +5912,7 @@ msgstr "&Отправить письмо"
 msgid "&Send Mail Via"
 msgstr "О&тправить"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Отправить &позже"
@@ -6125,8 +5977,7 @@ msgstr "&Удалить символы цитирования"
 msgid "Cl&ean Spaces"
 msgstr "Убрать пр&обелы"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Фиксированный шрифт"
@@ -6267,31 +6118,31 @@ msgstr "&Формат шифрования/подписи"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандартный"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Маркированный список (диск)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Маркированный список (круг)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Маркированный список (квадрат)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Упорядоченный список (1)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Упорядоченный список (a)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Упорядоченный список (A)"
 
@@ -6382,8 +6233,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Сохранить в папке черновиков. Вы можете изменить это сообщение в любое время и "
-"отправить позднее."
+"Сохранить в папке черновиков. Вы можете изменить это сообщение в любое время "
+"и отправить позднее."
 
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
@@ -6395,8 +6246,8 @@ msgstr "Закрыть окно редактора"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Похоже, что написанное вами сообщение содержит упоминание о вложении, но его "
@@ -6407,47 +6258,47 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Напоминание о вложении"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Отправить &как есть"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Невозможно определить путь к вложению (%1).</p>"
-"<p>Укажите полный путь к нему.</p></qt>"
+"<qt><p>Невозможно определить путь к вложению (%1).</p><p>Укажите полный путь "
+"к нему.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Системный администратор запретил делать вложения больше %1 Мб.</p>"
+"<qt><p>Системный администратор запретил делать вложения больше %1 Мб.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Вложить файл"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "В&ложение"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Вставить файл"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Вставить файл"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr "<qt><p>Ошибка экспорта ключа:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
@@ -6487,96 +6338,107 @@ msgid ""
 "View"
 msgstr "Просмотреть"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Изменить..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Редактировать в..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Сохранить &как..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Свойства"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Добавить вложение..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Невозможно сжать файл."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"Размер сжатого файла оказался больше, чем у исходного файла. Вы хотите оставить "
-"файл несжатым?"
+"Размер сжатого файла оказался больше, чем у исходного файла. Вы хотите "
+"оставить файл несжатым?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Оставить несжатым"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Невозможно распаковать файл."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Сохранить вложение как"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Вставить как текст"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Вставить как вложение"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Вставить содержимое буфера обмена как текст или как вложение в виде файла."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Вставить как текст или как вложение"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "без имени"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Вы хотите зашифровать эти сообщения, однако в текущем профиле нет ключей для "
-"шифрования (OpenPGP или S/MIME).</p>"
-"<p>Выберите ключи в диалоге настройки профиля.</p></qt>"
+"<qt><p>Вы хотите зашифровать эти сообщения, однако в текущем профиле нет "
+"ключей для шифрования (OpenPGP или S/MIME).</p><p>Выберите ключи в диалоге "
+"настройки профиля.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Не указан ключ шифрования"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Укажите ваш ключ подписи OpenPGP или S/MIME для включения возможности "
-"подписывания ваших сообщений.</p>"
-"<p>Вы можете указать используемый ключ в конфигурации профиля.</p></qt>"
+"<qt> <p>Укажите ваш ключ подписи OpenPGP или S/MIME для включения "
+"возможности подписывания ваших сообщений.</p><p>Вы можете указать "
+"используемый ключ в конфигурации профиля.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Не указан ключ подписи"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6584,89 +6446,87 @@ msgstr ""
 "KMail работает в автономном режиме и все ваши исходящие сообщения будут "
 "находится в папке Исходящие до тех пор, пока вы не выйдете на связь."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "В сети/Автономный"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Вы должны указать свой адрес электронной почты в поле \"Отправитель:\". Кроме "
-"того, вы можете указать свой адрес отправителя во всех профилях, чтобы не "
-"вводить его вручную при составлении каждого письма."
+"Вы должны указать свой адрес электронной почты в поле \"Отправитель:\". "
+"Кроме того, вы можете указать свой адрес отправителя во всех профилях, чтобы "
+"не вводить его вручную при составлении каждого письма."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Следует указать хотя бы одного адресата."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Вы не указали получателя. Отправить сообщение?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Получатель не указан"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Вы не указали тему. Отправить сообщение без темы?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Тема не указана"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Отправить &как есть"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Указать тему"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Сохранить разметку, не подписывать/шифровать"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Сохранить разметку, не шифровать"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Сохранить разметку, не подписывать"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Подписать/Зашифровать (удалить разметку)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Зашифровать (удалить разметку)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Подписать (удалить разметку)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Встраиваемое шифрование/подпись HTML-сообщений невозможно.</p>"
-"<p>Удалить разметку?</p></qt>"
+"<qt><p>Встраиваемое шифрование/подпись HTML-сообщений невозможно.</"
+"p><p>Удалить разметку?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Зашифровать/Подписать сообщение?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6674,106 +6534,106 @@ msgstr ""
 "Выбранная для профиля \"%1\" папка черновиков или шаблонов больше не "
 "существует. Будет использована папка по умолчанию."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Создайте запись для отправки почты и попробуйте ещё раз."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Сообщение готово к отправке..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Подтверждение получение"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Отправить &немедленно"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Получатели не выбраны"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Дополнительные получатели"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Проверка орфографии включена"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Проверка орфографии выключена"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Проверка орфографии отменена."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Проверка орфографии остановлена"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Проверка орфографии завершена."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Программа проверки орфографии"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Настройте шифрование посредством Chiasmus.\n"
 "Вы можете сделать это на вкладке 'Модули криптографии' в разделе "
 "'Безопасность'."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Библиотека libkleopatra была собрана без поддержки Chiasmus. Для использования "
-"Chiasmus вам необходимо пересобрать libkleopatra с параметром "
+"Библиотека libkleopatra была собрана без поддержки Chiasmus. Для "
+"использования Chiasmus вам необходимо пересобрать libkleopatra с параметром "
 "--enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Движок Chiasmus не настроен"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Не найдены ключи Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Выбор ключа шифрования Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Сообщение подписано"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Сообщение не подписано"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Сообщение зашифровано"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Сообщение не зашифровано"
 
@@ -6822,11 +6682,11 @@ msgstr "Проверка орфографии - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Ошибка запуска ISpell/Aspell. Проверьте правильность настройки ISpell/Aspell и "
-"его наличие в PATH."
+"Ошибка запуска ISpell/Aspell. Проверьте правильность настройки ISpell/Aspell "
+"и его наличие в PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6859,12 +6719,10 @@ msgstr "<qt>Слишком много действий в правиле фил�
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Неизвестное действие <b>%1</b>"
-"<br>в правиле фильтрации <b>%2</b>."
+"<qt>Неизвестное действие <b>%1</b><br>в правиле фильтрации <b>%2</b>."
 "<br>Действие игнорируется.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7085,157 +6943,129 @@ msgstr "Проиграть звук"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Этот список содержит определённые пользователем фильтры. Они обрабатываются "
-"сверху вниз.</p>"
-"<p>Щёлкните на любом фильтре его для редактирования, используя кнопки с правой "
-"стороны диалога.</p></qt>"
+"<qt><p>Этот список содержит определённые пользователем фильтры. Они "
+"обрабатываются сверху вниз.</p><p>Щёлкните на любом фильтре его для "
+"редактирования, используя кнопки с правой стороны диалога.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Создание нового фильтра.</p>"
-"<p>Он будет вставлен перед выбранным ранее фильтром, но вы всегда сможете "
-"изменить его положение в списке.</p>"
-"<p>Если вы случайно нажали эту кнопку, можете отменить создание фильтра, нажав "
-"кнопку <em>Удалить</em>.</p></qt>"
+"<qt><p>Создание нового фильтра.</p><p>Он будет вставлен перед выбранным "
+"ранее фильтром, но вы всегда сможете изменить его положение в списке.</"
+"p><p>Если вы случайно нажали эту кнопку, можете отменить создание фильтра, "
+"нажав кнопку <em>Удалить</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Копирование фильтра.</p>"
-"<p>Если вы случайно нажали эту кнопку, можете отменить создание фильтра, нажав "
-"кнопку <em>Удалить</em>.</p></qt>"
+"<qt><p>Копирование фильтра.</p><p>Если вы случайно нажали эту кнопку, можете "
+"отменить создание фильтра, нажав кнопку <em>Удалить</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Нажатие на эту кнопку <em>удаляет</em> выбранный фильтр из списка.</p>"
-"<p>После этого удалённый фильтр нельзя восстановить, однако вы всегда можете "
-"выйти из диалога настроек фильтров, не внося изменений, нажав на кнопку <em>"
-"Отмена</em>.</p></qt>"
+"<qt><p>Нажатие на эту кнопку <em>удаляет</em> выбранный фильтр из списка.</"
+"p><p>После этого удалённый фильтр нельзя восстановить, однако вы всегда "
+"можете выйти из диалога настроек фильтров, не внося изменений, нажав на "
+"кнопку <em>Отмена</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Перемещение выбранного фильтра <em>наверх</em> списка фильтров.</p>"
-"<p>Порядок фильтров очень важен, поскольку определяет порядок их выполнения для "
-"сообщений: самый верхний фильтр в списке будет использован первым.</p></qt>"
+"<qt><p>Перемещение выбранного фильтра <em>наверх</em> списка фильтров.</"
+"p><p>Порядок фильтров очень важен, поскольку определяет порядок их "
+"выполнения для сообщений: самый верхний фильтр в списке будет использован "
+"первым.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Перемещение выбранного фильтра <em>выше</em> по списку фильтров.</p>"
-"<p>Порядок фильтров очень важен, поскольку определяет порядок их выполнения для "
-"сообщений: самый верхний фильтр в списке будет использован первым.</p>"
-"<p>Если вы случайно нажали эту кнопку, можете отменить перемещение, нажав "
-"кнопку <em>Ниже</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Перемещение выбранного фильтра <em>выше</em> по списку фильтров.</"
+"p><p>Порядок фильтров очень важен, поскольку определяет порядок их "
+"выполнения для сообщений: самый верхний фильтр в списке будет использован "
+"первым.</p><p>Если вы случайно нажали эту кнопку, можете отменить "
+"перемещение, нажав кнопку <em>Ниже</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Перемещение выбранного фильтра <em>ниже</em> по списку фильтров.</p>"
-"<p>Порядок фильтров очень важен, поскольку определяет порядок их выполнения для "
-"сообщений: самый верхний фильтр в списке будет использован первым.</p>"
-"<p>Если вы случайно нажали эту кнопку, можете отменить перемещение, нажав "
-"кнопку <em>Выше</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Перемещение выбранного фильтра <em>ниже</em> по списку фильтров.</"
+"p><p>Порядок фильтров очень важен, поскольку определяет порядок их "
+"выполнения для сообщений: самый верхний фильтр в списке будет использован "
+"первым.</p><p>Если вы случайно нажали эту кнопку, можете отменить "
+"перемещение, нажав кнопку <em>Выше</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Перемещение выбранного фильтра <em>вниз</em> списка фильтров.</p>"
-"<p>Порядок фильтров очень важен, поскольку определяет порядок их выполнения для "
-"сообщений: самый верхний фильтр в списке будет использован первым.</p></qt>"
+"<qt><p>Перемещение выбранного фильтра <em>вниз</em> списка фильтров.</"
+"p><p>Порядок фильтров очень важен, поскольку определяет порядок их "
+"выполнения для сообщений: самый верхний фильтр в списке будет использован "
+"первым.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Переименование выбранного фильтра.</p> "
-"<p>Фильтры именуются автоматически, если они начинаются с \"&lt;\".</p>"
-"<p>Если вы случайно переименовали фильтр вручную и хотите вернуть "
-"автоматическое присвоение имён, нажмите эту кнопку и выберите <em>Очистить</em>"
-", а затем <em>OK</em> в появившемся диалоге.</p></qt>"
+"<qt><p>Переименование выбранного фильтра.</p> <p>Фильтры именуются "
+"автоматически, если они начинаются с \"&lt;\".</p><p>Если вы случайно "
+"переименовали фильтр вручную и хотите вернуть автоматическое присвоение "
+"имён, нажмите эту кнопку и выберите <em>Очистить</em>, а затем <em>OK</em> в "
+"появившемся диалоге.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Вызов диалога подтверждения.</p>"
-"<p>Это бывает полезно, если вы выбрали набор правил для отложенной загрузки "
-"сообщений. Если этот диалог не будет показан, то эти сообщения так и остались "
-"бы на сервере, если бы не пришло новых больших сообщений или если бы вы "
-"захотели указать новый набор правил, который отмечал бы сообщения иначе.</p>"
-"</qt>"
+"<qt><p>Вызов диалога подтверждения.</p><p>Это бывает полезно, если вы "
+"выбрали набор правил для отложенной загрузки сообщений. Если этот диалог не "
+"будет показан, то эти сообщения так и остались бы на сервере, если бы не "
+"пришло новых больших сообщений или если бы вы захотели указать новый набор "
+"правил, который отмечал бы сообщения иначе.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7245,6 +7075,16 @@ msgstr "Правила фильтрации на сервере POP3"
 msgid "Filter Rules"
 msgstr "Правила фильтрации"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Импортировать"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Импортировать"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Доступные фильтры"
@@ -7327,6 +7167,11 @@ msgstr "Добавить этот фильтр на панель инструм�
 msgid "Icon for this filter:"
 msgstr "Значок для фильтра:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Получатель"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Выше"
@@ -7335,16 +7180,29 @@ msgstr "Выше"
 msgid "Down"
 msgstr "Ниже"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Переименовать..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Новое"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Копировать в"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Удалённое"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7353,8 +7211,8 @@ msgstr "Выберите комбинацию клавиш"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Обнаружен фильтр, пересылающий сообщения в папку IMAP. Этот фильтр будет "
 "работать только при ручном запуске в автономном режиме и автоматически при "
@@ -7433,28 +7291,24 @@ msgstr "Восстановление кэша IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Восстановление кэша IMAP.</b></p>"
-"<p>Если возникают проблемы с синхронизацией кэша IMAP, попробуйте прежде всего "
-"перестроить индекс папки. Это займёт какое-то время, но решит некоторые  "
-"проблемы.</p>"
-"<p>Если это не помогает, попробуйте обновить кэш IMAP. При этом все локальные "
-"изменения, сделанные в папках IMAP и их подпапках, будут утеряны.</p>"
+"<p><b>Восстановление кэша IMAP.</b></p><p>Если возникают проблемы с "
+"синхронизацией кэша IMAP, попробуйте прежде всего перестроить индекс папки. "
+"Это займёт какое-то время, но решит некоторые  проблемы.</p><p>Если это не "
+"помогает, попробуйте обновить кэш IMAP. При этом все локальные изменения, "
+"сделанные в папках IMAP и их подпапках, будут утеряны.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7485,13 +7339,13 @@ msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
-"Невозможно прочесть файл кэша для папки %1. Возможно, недостаточно прав доступа "
-"или файл повреждён."
+"Невозможно прочесть файл кэша для папки %1. Возможно, недостаточно прав "
+"доступа или файл повреждён."
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Невозможно сохранить файл кэша для папки %1. Возможно, недостаточно прав "
 "доступа."
@@ -7499,7 +7353,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
-"Для переименования папок IMAP необходимо вначале синхронизироваться с сервером."
+"Для переименования папок IMAP необходимо вначале синхронизироваться с "
+"сервером."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7532,8 +7387,8 @@ msgstr "Индекс папки обновлён."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Папка %1 не синхронизирована (находится в состоянии %2). Вы действительно\n"
 "хотите её синхронизировать по-новому?"
@@ -7642,8 +7497,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>У вас недостаточно прав доступа к папке <b>%1</b>"
-": вы не можете добавлять сообщения в эту папку.</p>"
+"<p>У вас недостаточно прав доступа к папке <b>%1</b>: вы не можете добавлять "
+"сообщения в эту папку.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7664,15 +7519,11 @@ msgstr "Создание подпапок на сервере"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>В папке <b>%1</b> на сервере были удалены сообщения. Уничтожить их локальные "
-"копии? "
-"<br>UIDs: %2</p></qt></p></qt>"
+"<qt><p>В папке <b>%1</b> на сервере были удалены сообщения. Уничтожить их "
+"локальные копии? <br>UIDs: %2</p></qt></p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7693,9 +7544,8 @@ msgstr "Получение списка папок области имён %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr "<qt><p>Папка <b>%1</b> была удалена. Удалить её с сервера?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7704,16 +7554,16 @@ msgstr "Прервано"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "Сервер IMAP %1 не поддерживает аннотации IMAP. Хранилище XML не может быть "
 "использовано на этом сервере. Исправьте настройки KMail."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "Сервер IMAP %1 не поддерживает аннотации IMAP. Хранилище XML не может быть "
 "использовано на этом сервере. Исправьте настройки KMail"
@@ -7728,15 +7578,15 @@ msgstr "Потерянные"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>В папке <b>%1</b> имеются новые сообщения, но они не могут быть сохранены на "
-"сервере, поскольку у вас недостаточно прав доступа.</p> "
-"<p>Все новые сообщения будут перенесены в папку <b>%2</b>.</p>"
+"<p>В папке <b>%1</b> имеются новые сообщения, но они не могут быть сохранены "
+"на сервере, поскольку у вас недостаточно прав доступа.</p> <p>Все новые "
+"сообщения будут перенесены в папку <b>%2</b>.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7744,20 +7594,25 @@ msgstr "Недостаточно прав"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>В папке имеются новые сообщения (%1), но они не могут быть сохранены на "
-"сервере, поскольку у вас недостаточно прав доступа для сохранения сообщений на "
-"сервере. Попросите вашего системного администратора дать доступ на сохранение "
-"сообщений на сервере или удалите новые сообщения из этой папки.</p> "
-"<p>Вы хотите переместить эти сообщения в другую папку?</p>"
+"сервере, поскольку у вас недостаточно прав доступа для сохранения сообщений "
+"на сервере. Попросите вашего системного администратора дать доступ на "
+"сохранение сообщений на сервере или удалите новые сообщения из этой папки.</"
+"p> <p>Вы хотите переместить эти сообщения в другую папку?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "переместить в:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Оставить в этой папке"
 
@@ -7769,8 +7624,7 @@ msgstr "Переместить"
 msgid "Permissions (ACL)"
 msgstr "Права доступа"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Общие"
@@ -7794,8 +7648,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Использовать собственные значки"
@@ -7814,23 +7667,20 @@ msgstr "Уведомлять о новых сообщениях в этой па
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>При включении этой опции вы будете уведомлены о появлении новых сообщений в "
-"этой папке.</p>"
-"<p>При выключении этой опции вы не будете уведомлены о новых сообщениях в этой "
-"папке и при переходе к следующему или предыдущему непрочитанному сообщению эта "
-"папка будет проигнорирована, даже если содержит непрочитанные сообщения. Это "
-"бывает полезно для игнорирования непрочитанных сообщений в Корзине или папке со "
-"спамом.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>При включении этой опции вы будете уведомлены о появлении новых "
+"сообщений в этой папке.</p><p>При выключении этой опции вы не будете "
+"уведомлены о новых сообщениях в этой папке и при переходе к следующему или "
+"предыдущему непрочитанному сообщению эта папка будет проигнорирована, даже "
+"если содержит непрочитанные сообщения. Это бывает полезно для игнорирования "
+"непрочитанных сообщений в Корзине или папке со спамом.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7842,9 +7692,9 @@ msgstr "Помещать ответы в эту папку"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Отметьте этот флажок, если вы хотите, чтобы ответы на письма из этой папки "
 "оставались в ней же вместо перемещения в папку \"Отправленные\"."
@@ -7857,17 +7707,21 @@ msgstr "Показать отправителя/получателя в спис
 msgid "Sho&w column:"
 msgstr "Показать &столбец:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Сделать основным"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Отправитель"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Получатель"
@@ -7878,17 +7732,17 @@ msgstr "Профиль &отправителя:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Выберете профиль отправителя, который будет использоваться для отправки новых "
-"писем или ответа на письма из этой папки. Это означает, что для определённой "
-"папки вы можете установить адрес электронной почты отправителя, его подпись и "
-"ключи подписи и шифрования. Профили настраиваются в диалоге настройки KMail "
-"(Настройка -> Настроить KMail)."
+"Выберете профиль отправителя, который будет использоваться для отправки "
+"новых писем или ответа на письма из этой папки. Это означает, что для "
+"определённой папки вы можете установить адрес электронной почты отправителя, "
+"его подпись и ключи подписи и шифрования. Профили настраиваются в диалоге "
+"настройки KMail (Настройка -> Настроить KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7906,17 +7760,18 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Этот параметр определяет пользователей, для кого события в этой папке будут "
-"помечены как занятое время и включены напоминания о событиях и задачах в этой "
-"папке. Параметр применим только к папкам календарей и задач. В случае папки со "
-"списком задам доступ устанавливается для просмотра напоминаний о задачах.\n"
+"помечены как занятое время и включены напоминания о событиях и задачах в "
+"этой папке. Параметр применим только к папкам календарей и задач. В случае "
+"папки со списком задам доступ устанавливается для просмотра напоминаний о "
+"задачах.\n"
 "\n"
 "Пример: если руководитель использует общую папку с секретарём и требуется, "
 "чтобы события в этой папке помечались в его календаре как занятое время, вы "
@@ -7924,10 +7779,10 @@ msgstr ""
 "секретарь не является администратором папки.\n"
 "Другой пример: при совместном использовании рабочей группой календаря для "
 "планирования встреч требуется, чтобы все встречи в этой папке помечались как "
-"занятое время для всех членов группы. В этом случае можно выбрать вариант \"Для "
-"всех пользователей папки\". Для папки, содержащий события компании, нужно "
-"выбрать вариант \"Нет\" поскольку заранее неизвестно кто может присутствовать "
-"на этих событиях."
+"занятое время для всех членов группы. В этом случае можно выбрать вариант "
+"\"Для всех пользователей папки\". Для папки, содержащий события компании, "
+"нужно выбрать вариант \"Нет\" поскольку заранее неизвестно кто может "
+"присутствовать на этих событиях."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7958,22 +7813,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Вы настроили эту папку для совместной работы и одновременно отключили показ "
-"папок для совместной работы. Это означает, что указанная папка будет скрыта при "
-"закрытии этого диалогового окна. Если вы хотите удалить её, вам нужно временно "
-"отключить скрытие папок для совместной работы чтобы снова увидеть её."
+"папок для совместной работы. Это означает, что указанная папка будет скрыта "
+"при закрытии этого диалогового окна. Если вы хотите удалить её, вам нужно "
+"временно отключить скрытие папок для совместной работы чтобы снова увидеть "
+"её."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8042,7 +7898,8 @@ msgstr "Ошибка при получении сведений о папке."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Индекс для папки '%1' создан неизвестной версией KMail (%2).\n"
 "Эта папка будет переиндексирована, однако какие-то сведения, включая статус "
@@ -8062,8 +7919,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"Индекс для папки '%1' повреждён и будет пересоздан, однако какие-то сведения, "
-"включая статус сообщений, могут быть утеряны."
+"Индекс для папки '%1' повреждён и будет пересоздан, однако какие-то "
+"сведения, включая статус сообщений, могут быть утеряны."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8071,8 +7928,8 @@ msgstr "Невозможно найти папку %1."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Ошибка открытия %1. Возможно, указанная папка не является почтовой или у вас "
 "недостаточно прав доступа."
@@ -8088,7 +7945,8 @@ msgstr "Невозможно синхронизировать папку maildir
 #: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
-"Невозможно поместить сообщение в папку. Возможно, на диске недостаточно места."
+"Невозможно поместить сообщение в папку. Возможно, на диске недостаточно "
+"места."
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
@@ -8118,22 +7976,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Индекс папки '%2' устарел. Индекс будет повторно создан для предотвращения "
-"потери сообщений. В результате в папках могут оказаться сообщения, раннее "
-"удалённые,а также может произойти сброс атрибутов сообщений.</p>"
-"<p>Прочитайте соответствующую запись в <a href=\"%1\">"
-"секции вопросов и ответов руководства программы KMail</a> "
-"для получения информации о предотвращении возникновения данной ситуации в "
-"будущем.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Индекс папки '%2' устарел. Индекс будет повторно создан для "
+"предотвращения потери сообщений. В результате в папках могут оказаться "
+"сообщения, раннее удалённые,а также может произойти сброс атрибутов "
+"сообщений.</p><p>Прочитайте соответствующую запись в <a href=\"%1\">секции "
+"вопросов и ответов руководства программы KMail</a> для получения информации "
+"о предотвращении возникновения данной ситуации в будущем.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8194,7 +8048,7 @@ msgstr ""
 "Похоже, что %1 не является папкой.\n"
 "Уберите этот файл с дороги."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8202,7 +8056,7 @@ msgstr ""
 "Нет доступа к папке '%1'.\n"
 "Проверьте, можете ли вы просматривать и изменять эту папку."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8212,17 +8066,17 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"Папка с таким же именем была удалена после последней проверки почты. Вам нужно "
-"проверить почту до того, как создавать новую папку с таким же именем."
+"Папка с таким же именем была удалена после последней проверки почты. Вам "
+"нужно проверить почту до того, как создавать новую папку с таким же именем."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Невозможно создать папку"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8320,14 +8174,14 @@ msgstr "&Устранения неполадок кэша IMAP"
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Невозможно создать папку <b>%1</b> в связи с ограничениями прав доступа на "
-"сервере. Если вы хотите иметь возможность создавать папки на сервере, "
-"обратитесь к вашему системному администратору для получения необходимых "
-"прав.</qt> "
+"<qt>Невозможно создать папку <b>%1</b> в связи с ограничениями прав доступа "
+"на сервере. Если вы хотите иметь возможность создавать папки на сервере, "
+"обратитесь к вашему системному администратору для получения необходимых прав."
+"</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8344,8 +8198,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Невозможно скопировать или переместить папку <b>%1</b>"
-". Папка с таким именем уже существует.</qt>"
+"<qt>Невозможно скопировать или переместить папку <b>%1</b>. Папка с таким "
+"именем уже существует.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -8358,8 +8212,8 @@ msgstr ""
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Невозможно скопировать или переместить папку <b>%1</b> "
-"в дочернюю папку.</qt>"
+"<qt>Невозможно скопировать или переместить папку <b>%1</b> в дочернюю папку."
+"</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8468,17 +8322,17 @@ msgstr "Папка %1 только для чтения."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Удалить %n выделенное сообщение?"
-"<br>Удалённые сообщения не могут быть восстановлены.</qt>\n"
-"<qt>Удалить %n выделенных сообщения?"
-"<br>Удалённые сообщения не могут быть восстановлены.</qt>\n"
-"<qt>Удалить %n выделенных сообщений?"
-"<br>Удалённые сообщения не могут быть восстановлены.</qt>"
+"<qt>Удалить %n выделенное сообщение?<br>Удалённые сообщения не могут быть "
+"восстановлены.</qt>\n"
+"<qt>Удалить %n выделенных сообщения?<br>Удалённые сообщения не могут быть "
+"восстановлены.</qt>\n"
+"<qt>Удалить %n выделенных сообщений?<br>Удалённые сообщения не могут быть "
+"восстановлены.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8530,134 +8384,131 @@ msgstr ""
 "Ошибка при изменении %1\n"
 "(Нет места на диске?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Запрос подписи сертификата"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Создайте этот сертификат из вложения и верните отправителю."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail переключен в автономный режим. Все сетевые операции отключены"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail переключен в режим работы в сети. Все сетевые операции доступны"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
-"KMail работает в автономном режиме. Переключиться на работу в сети или остаться "
-"в автономном режиме?"
+"KMail работает в автономном режиме. Переключиться на работу в сети или "
+"остаться в автономном режиме?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Работать в сети"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Работать автономно"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Отсутствуют права на чтение/запись в папку входящих сообщений."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Исходящие"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Отсутствуют права на чтение/запись в папку исходящих сообщений."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Отправленные"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Отсутствуют права на чтение/запись в папку отправленных сообщений."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Корзина"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Отсутствуют права на чтение/запись в Корзину."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Черновики"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Отсутствуют права на чтение/запись в папку черновиков."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "Шаблоны"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Отсутствуют права на чтение/запись в Шаблоны."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Последний поиск"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Папка <i>%4</i> уже существует. %1 теперь использует папку <i>%5</i> "
-"для сообщений."
-"<p>%2 может переместить письма из папки <i>%6<i> в эту папку. При этом будут "
-"заменены файлы с теми же именами в папке <i>%7</i>."
-"<p><strong>Вы хотите, чтобы %3 переместил файлы писем?</strong></qt>"
+"<qt>Папка <i>%4</i> уже существует. %1 теперь использует папку <i>%5</i> для "
+"сообщений.<p>%2 может переместить письма из папки <i>%6<i> в эту папку. При "
+"этом будут заменены файлы с теми же именами в папке <i>%7</i>.<p><strong>Вы "
+"хотите, чтобы %3 переместил файлы писем?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Папка <i>%4</i> уже существует. %1 теперь использует папку <i>%5</i> "
-"для сообщений."
-"<p>%2 может переместить письма из папки <i>%6<i> в эту папку."
+"<qt>Папка <i>%4</i> уже существует. %1 теперь использует папку <i>%5</i> для "
+"сообщений.<p>%2 может переместить письма из папки <i>%6<i> в эту папку."
 "<p><strong>Вы хотите, чтобы %3 переместил файлы писем?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Перенести файлы писем?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Аварийное завершение работы KMail"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8668,11 +8519,11 @@ msgstr ""
 "Причина:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Очистить корзину"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Очистить корзины для всех учётных записей?"
 
@@ -8748,8 +8599,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Принята новая почта</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8787,8 +8637,8 @@ msgstr "Очистить корзину?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr "<qt>Переместить сообщения из папки <b>%1</b> в корзину?</qt>"
 
 #: kmmainwidget.cpp:1173
@@ -8813,11 +8663,11 @@ msgstr "Удалить папку поиска"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Удалить папку поиска <b>%1</b>? Сообщения в ней не будут удалены, так как "
-"они расположены в других папках.</qt>"
+"<qt>Удалить папку поиска <b>%1</b>? Сообщения в ней не будут удалены, так "
+"как они расположены в других папках.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8829,39 +8679,42 @@ msgstr "<qt>Удалить пустую папку <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Удалить пустую папку <b>%1</b> со всеми её подпапками? Последние могут быть "
-"не пустыми и их содержимое также будет удалено. "
-"<p><b>Внимание!</b> Удалённые таким образом сообщения будет невозможно "
-"восстановить, так как они не сохраняются в Корзине.</qt>"
+"<qt>Удалить пустую папку <b>%1</b> со всеми её подпапками? Последние могут "
+"быть не пустыми и их содержимое также будет удалено. <p><b>Внимание!</b> "
+"Удалённые таким образом сообщения будет невозможно восстановить, так как они "
+"не сохраняются в Корзине.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Удалить папку <b>%1</b> со всем её содержимым? "
-"<p><b>Внимание!</b> Удалённые таким образом сообщения будет невозможно "
-"восстановить, так как они не сохраняются в Корзине.</qt>"
+"<qt>Удалить папку <b>%1</b> со всем её содержимым? <p><b>Внимание!</b> "
+"Удалённые таким образом сообщения будет невозможно восстановить, так как они "
+"не сохраняются в Корзине.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Удалить папку <b>%1</b> со всеми её подпапками и их содержимым? "
 "<p><b>Внимание!</b> Удалённые таким образом сообщения будет невозможно "
 "восстановить, так как они не сохраняются в Корзине.</qt>"
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Удалённое"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8876,9 +8729,9 @@ msgstr "Удалить все устаревшие сообщения?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Использование HTML в почте сделает вас более уязвимым к \"спаму\" и может "
 "увеличить вероятность того, что ваша система будет повреждена с помощью уже "
@@ -8895,12 +8748,12 @@ msgstr "Использовать HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Загрузка внешних ссылок из писем в формате HTML сделает вас более уязвимым к "
-"\"спаму\" и может увеличить вероятность того, что ваша система будет повреждена "
-"с помощью уже существующих и будущих методов взлома."
+"\"спаму\" и может увеличить вероятность того, что ваша система будет "
+"повреждена с помощью уже существующих и будущих методов взлома."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8916,12 +8769,12 @@ msgstr "Фильтр по списку рассылки %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Возможность уведомления об отсутствии зависит от настройки фильтров на сервере. "
-"Сервер IMAP ещё не настроен для этого.\n"
+"Возможность уведомления об отсутствии зависит от настройки фильтров на "
+"сервере. Сервер IMAP ещё не настроен для этого.\n"
 "Используйте вкладку \"Фильтры\" параметров настройки ящика IMAP."
 
 #: kmmainwidget.cpp:1743
@@ -8939,7 +8792,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Невозможно открыть журнал GnuPG. Проверьте правильность установки программы."
 
@@ -9260,8 +9114,7 @@ msgstr "&Сохранить все вложения..."
 msgid "Appl&y All Filters"
 msgstr "Применить все ф&ильтры"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Применить &фильтр"
@@ -9373,7 +9226,6 @@ msgstr "Следующее &непрочитанное"
 msgid "Go to the next unread message"
 msgstr "Перейти к следующему непрочитанному сообщению"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Предыдущее сообщение"
@@ -9513,59 +9365,59 @@ msgstr " Инициализация..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Сообщение содержит запрос на подтверждение получения.\n"
-"Вы можете проигнорировать запрос или же отправить ответ, содержащий уведомление "
-"или отказ от получения."
+"Вы можете проигнорировать запрос или же отправить ответ, содержащий "
+"уведомление или отказ от получения."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Сообщение содержит запрос на подтверждение получения.\n"
 "В запросе содержится параметр, отмеченный как \"требуемый\", но неизвестный "
 "KMail.\n"
-"Вы можете проигнорировать запрос или же отправить ответ, содержащий сообщение "
-"об ошибке получения."
+"Вы можете проигнорировать запрос или же отправить ответ, содержащий "
+"сообщение об ошибке получения."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Сообщение содержит запрос на подтверждение получения,\n"
 "однако ответ требуется отправить на несколько адресов.\n"
-"Вы можете проигнорировать запрос или же отправить ответ, содержащий уведомление "
-"или отказ от получения."
+"Вы можете проигнорировать запрос или же отправить ответ, содержащий "
+"уведомление или отказ от получения."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Сообщение содержит запрос на подтверждение получения,\n"
 "однако обратный адрес не указан.\n"
-"Вы можете проигнорировать запрос или же отправить ответ, содержащий уведомление "
-"или отказ от получения."
+"Вы можете проигнорировать запрос или же отправить ответ, содержащий "
+"уведомление или отказ от получения."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9574,8 +9426,8 @@ msgstr ""
 "Сообщение содержит запрос на подтверждение получения,\n"
 "однако обратный адрес отличается от того, куда требуется отправить "
 "уведомление.\n"
-"Вы можете проигнорировать запрос или же отправить ответ, содержащий уведомление "
-"или отказ от получения."
+"Вы можете проигнорировать запрос или же отправить ответ, содержащий "
+"уведомление или отказ от получения."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9601,16 +9453,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Получение: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Вложение: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Вложение удалено."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Вложение «%1» удалено."
 
@@ -9658,46 +9510,39 @@ msgstr "Свойства части сообщения"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Тип MIME</em> файла.</p>"
-"<p>Обычно вам не нужно менять эту настройку при автоматическом определении типа "
-"MIME файла. Однако иногда %1 может неверно определить тип файла. В этом поле вы "
-"можете исправить тип.</p></qt>"
+"<qt><p><em>Тип MIME</em> файла.</p><p>Обычно вам не нужно менять эту "
+"настройку при автоматическом определении типа MIME файла. Однако иногда %1 "
+"может неверно определить тип файла. В этом поле вы можете исправить тип.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Размер вложения.</p>"
-"<p>Иногда %1 показывает только приблизительный размер вложения, поскольку "
-"вычисление точного размера может занять длительное время. В этом случае вы "
-"можете указать это прямо в поле. добавив \"(прибл.)\" к приблизительному "
-"размеру файла.</p></qt>"
+"<qt><p>Размер вложения.</p><p>Иногда %1 показывает только приблизительный "
+"размер вложения, поскольку вычисление точного размера может занять "
+"длительное время. В этом случае вы можете указать это прямо в поле. добавив "
+"\"(прибл.)\" к приблизительному размеру файла.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Имя вложенного файла.</p>"
-"<p>Хотя здесь указывается по умолчанию имя вложенного файла, вы можете изменить "
-"имя файла во вложении. Иногда это бывает необходимо, если вложение с таким "
-"именем файла получатель не может прочесть или сохранить на диск.</p></qt>"
+"<qt><p>Имя вложенного файла.</p><p>Хотя здесь указывается по умолчанию имя "
+"вложенного файла, вы можете изменить имя файла во вложении. Иногда это "
+"бывает необходимо, если вложение с таким именем файла получатель не может "
+"прочесть или сохранить на диск.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9705,17 +9550,14 @@ msgstr "&Описание:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Описание вложения.</p>"
-"<p>Это всего лишь строка описания вложения подобная строке Тема: всего "
-"сообщения. Почти все почтовые клиенты показывают эту строку при показе "
-"сообщения около значка вложения.</p></qt>"
+"<qt><p>Описание вложения.</p><p>Это всего лишь строка описания вложения "
+"подобная строке Тема: всего сообщения. Почти все почтовые клиенты показывают "
+"эту строку при показе сообщения около значка вложения.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9723,23 +9565,21 @@ msgstr "К&одировка"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Кодировка вложения.</p>"
-"<p>Обычно не нужно изменять эту настройку - %1 будет использовать кодировку по "
-"умолчанию, основанную на типе MIME вложения. Однако в некоторых случаях вы "
-"можете уменьшить размер сообщения, выбрав нужную кодировку. Например, файлы "
-"PostScript не содержат бинарных данных и состоят из обычного текста. В этом "
-"случае предпочтительнее выбрать \"quoted-printable\" вместо \"base64\", что "
-"приведёт к экономии свыше  25% размера сообщения.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Кодировка вложения.</p><p>Обычно не нужно изменять эту настройку - %1 "
+"будет использовать кодировку по умолчанию, основанную на типе MIME вложения. "
+"Однако в некоторых случаях вы можете уменьшить размер сообщения, выбрав "
+"нужную кодировку. Например, файлы PostScript не содержат бинарных данных и "
+"состоят из обычного текста. В этом случае предпочтительнее выбрать \"quoted-"
+"printable\" вместо \"base64\", что приведёт к экономии свыше  25% размера "
+"сообщения.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9747,20 +9587,17 @@ msgstr "Предложить &автоматический показ"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Этот параметр предлагает пользователю показывать это вложение в тексте "
-"сообщения вместо просмотра в виде значков.</p>"
-"<p>С технической точки зрения это соответствует установке в поле <em>"
-"Content-Disposition</em> заголовка вложения значения \"inline\" вместо значения "
-"по умолчанию \"attachment\".</p></qt>"
+"<qt><p>Этот параметр предлагает пользователю показывать это вложение в "
+"тексте сообщения вместо просмотра в виде значков.</p><p>С технической точки "
+"зрения это соответствует установке в поле <em>Content-Disposition</em> "
+"заголовка вложения значения \"inline\" вместо значения по умолчанию "
+"\"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9768,14 +9605,12 @@ msgstr "&Подписать вложение"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Выберите эту опцию, если желаете подписать вложение.</p>"
-"<p>Для подписи будет использован ключ, выбранный в текущем профиле.</p></qt>"
+"<qt><p>Выберите эту опцию, если желаете подписать вложение.</p><p>Для "
+"подписи будет использован ключ, выбранный в текущем профиле.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9783,13 +9618,11 @@ msgstr "&Зашифровать данную часть"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Отметьте флажок, если хотите зашифровать данную часть сообщения.</p>"
-"<p>Оно будет зашифровано для получателей сообщения</p></qt>"
+"<qt><p>Отметьте флажок, если хотите зашифровать данную часть сообщения.</"
+"p><p>Оно будет зашифровано для получателей сообщения</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9803,16 +9636,13 @@ msgstr "POP-фильтр"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"В POP-ящике найдены сообщения, подлежащие отбору: <b>%1</b>"
-"<p>Размер этих сообщений превышает предельный размер, заданный для этого ящика."
-"<br>Вы можете сами распорядиться этими сообщениями, нажав на соответствующую "
-"кнопку."
+"В POP-ящике найдены сообщения, подлежащие отбору: <b>%1</b><p>Размер этих "
+"сообщений превышает предельный размер, заданный для этого ящика.<br>Вы "
+"можете сами распорядиться этими сообщениями, нажав на соответствующую кнопку."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10067,40 +9897,39 @@ msgstr "Почтовый клиент для TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Получение содержимого папки</h2>"
-"<p>Пожалуйста, подождите...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Получение содержимого папки</h2><p>Пожалуйста, "
+"подождите...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Автономный режим</h2>"
-"<p>KMail работает в автономном режиме. Нажмите <a href=\"kmail:goOnline\">"
-"здесь</a>, чтобы перейти в режим работы с сетью.</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Автономный режим</h2><p>KMail работает в "
+"автономном режиме. Нажмите <a href=\"kmail:goOnline\">здесь</a>, чтобы "
+"перейти в режим работы с сетью.</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10108,12 +9937,11 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Добро пожаловать в KMail %1</h2>"
-"<p>KMail - это почтовый клиент для TDE. Он создан для полной поддержки почтовых "
-"стандартов Интернета, включая MIME, SMTP, POP3 и IMAP.</p>\n"
-"<ul>"
-"<li>KMail включает в себя много полезных возможностей, которые подробно описаны "
-"в <a href=\"%2\">документации</a></li>\n"
+"<h2 style='margin-top: 0px;'>Добро пожаловать в KMail %1</h2><p>KMail - это "
+"почтовый клиент для TDE. Он создан для полной поддержки почтовых стандартов "
+"Интернета, включая MIME, SMTP, POP3 и IMAP.</p>\n"
+"<ul><li>KMail включает в себя много полезных возможностей, которые подробно "
+"описаны в <a href=\"%2\">документации</a></li>\n"
 "<li><a href=\"%3\">Домашняя страница KMail</a> содержит информацию о новых "
 "версиях KMail</li></ul>\n"
 "%8\n"
@@ -10127,15 +9955,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Команда разработчиков KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -10180,7 +10006,8 @@ msgstr "Просмотр вложения: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Вложение содержит двоичные данные. Показан первый %n символ.]\n"
@@ -10209,14 +10036,16 @@ msgstr "Открыть вложение?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Удаление вложения может сделать цифровую подпись этого сообщения "
 "недействительной."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Редактирование вложения может сделать цифровую подпись этого сообщения "
 "недействительной."
@@ -10239,6 +10068,58 @@ msgstr "(совпадает с любым условием)"
 msgid "(match all of the following)"
 msgstr "(совпадает со всеми условиями)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Прочитанное"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Устаревшее"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Удалённое"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Отвеченное"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Пересланное"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "В очереди"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Отправленное"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Наблюдаемое"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Игнорируемое"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Спам"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Полезное"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "В работе"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "С вложениями"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Всё сообщение"
@@ -10311,26 +10192,26 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Критическая ошибка: не удаётся обработать отправленные сообщения (нет места на "
-"диске?) Ошибка при перемещении сообщения в папку \"Отправленные\"."
+"Критическая ошибка: не удаётся обработать отправленные сообщения (нет места "
+"на диске?) Ошибка при перемещении сообщения в папку \"Отправленные\"."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Ошибка перемещения отправленного сообщения \"%1\" из папки \"Исходящие\" в "
 "папку \"Отправленные\".\n"
-"Возможно, отсутствует свободное место на диске или права на запись. Попробуйте "
-"исправить проблему и переместите сообщение вручную."
+"Возможно, отсутствует свободное место на диске или права на запись. "
+"Попробуйте исправить проблему и переместите сообщение вручную."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Невозможно отправить письмо без адреса отправителя.\n"
 "Укажите адрес электронной почты для '%1' в своём профиле и попробуйте снова."
@@ -10359,8 +10240,8 @@ msgstr "Начало отправки..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Вы пытаетесь отправить всю почту через незашифрованный транспорт. Вы хотите "
 "продолжить? "
@@ -10387,15 +10268,17 @@ msgstr "Ошибка отправки сообщений из очереди."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Отправка прервана:\n"
 "%1\n"
-"Сообщение останется в папке 'Исходящие' до тех пор, пока вы не исправите ошибку "
-"(например, неправильный адрес) или не уберёте сообщение из папки 'Исходящие'.\n"
+"Сообщение останется в папке 'Исходящие' до тех пор, пока вы не исправите "
+"ошибку (например, неправильный адрес) или не уберёте сообщение из папки "
+"'Исходящие'.\n"
 "Был использован следующий транспортный протокол:\n"
 "  %2"
 
@@ -10405,21 +10288,16 @@ msgstr "Отправка прервана."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Ошибка отправки:</p>"
-"<p>%1</p>"
-"<p>Сообщение останется в папке 'Исходящие' до тех пор, пока вы не исправите "
-"ошибку (например, неправильный адрес) или не уберёте сообщение из папки "
-"'Исходящие'.</p>"
-"<p>Был использован метод отправки: %2</p> "
-"<p>Отправить остальные сообщения?</p>"
+"<p>Ошибка отправки:</p><p>%1</p><p>Сообщение останется в папке 'Исходящие' "
+"до тех пор, пока вы не исправите ошибку (например, неправильный адрес) или "
+"не уберёте сообщение из папки 'Исходящие'.</p><p>Был использован метод "
+"отправки: %2</p> <p>Отправить остальные сообщения?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10437,15 +10315,17 @@ msgstr "&Прервать отправку"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Ошибка отправки:\n"
 "%1\n"
-"Сообщение останется в папке 'Исходящие' до тех пор, пока вы не исправите ошибку "
-"(например, неправильный адрес) или не уберёте сообщение из папки 'Исходящие'.\n"
+"Сообщение останется в папке 'Исходящие' до тех пор, пока вы не исправите "
+"ошибку (например, неправильный адрес) или не уберёте сообщение из папки "
+"'Исходящие'.\n"
 "Был использован метод отправки:\n"
 " %2"
 
@@ -10482,24 +10362,24 @@ msgstr "Аварийное завершение Sendmail."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Для отправки почты через этот сервер SMTP требуется указать имя пользователя и "
-"пароль."
+"Для отправки почты через этот сервер SMTP требуется указать имя пользователя "
+"и пароль."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 уже выполняется на другом мониторе на этом компьютере. Запуск более чем "
-"одного экземпляра %2 может привести к потере сообщений. Не запускайте %1, если "
-"вы не уверены, что эта программа не выполняется."
+"одного экземпляра %2 может привести к потере сообщений. Не запускайте %1, "
+"если вы не уверены, что эта программа не выполняется."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "%1 выполняется на другом мониторе на этом компьютере. Выполнение %1 и %2 "
 "одновременно может привести к потере сообщений. Не запускайте %2, если вы не "
@@ -10507,23 +10387,23 @@ msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 уже выполняется на %2. Запуск двух или более экземпляров %1 может привести к "
-"потере сообщений. Не запускайте %1 на этом компьютере, если вы не уверены, что "
-"эта программа не выполняется на %2."
+"%1 уже выполняется на %2. Запуск двух или более экземпляров %1 может "
+"привести к потере сообщений. Не запускайте %1 на этом компьютере, если вы не "
+"уверены, что эта программа не выполняется на %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 выполняется на %3. Выполнение %1 и %2 одновременно может привести к потере "
-"сообщений. Не запускайте %2 на этом компьютере если вы не уверены, что %1 не "
-"выполняется на %3."
+"%1 выполняется на %3. Выполнение %1 и %2 одновременно может привести к "
+"потере сообщений. Не запускайте %2 на этом компьютере если вы не уверены, "
+"что %1 не выполняется на %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10534,6 +10414,10 @@ msgstr "Запустить %1"
 msgid "Exit"
 msgstr "Выход"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Новые сообщения в"
@@ -10561,8 +10445,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Бумажник TDE недоступен. Мы настойчиво рекомендуем использовать Бумажник TDE "
@@ -10648,8 +10533,8 @@ msgstr "Сервер требует &пароль"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Включите данный параметр, если ваш SMTP-сервер требует авторизацию перед "
 "доставкой почты."
@@ -10672,15 +10557,14 @@ msgstr "&Отправить указанное имя узла на сервер
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Включите данный параметр для использования указанного имени узла для "
-"идентификации на почтовом сервере. "
-"<p>Обычно это используется для корректирования посылаемого имени узла или для "
-"маскировки реального имени вашего компьютера."
+"идентификации на почтовом сервере. <p>Обычно это используется для "
+"корректирования посылаемого имени узла или для маскировки реального имени "
+"вашего компьютера."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10709,8 +10593,8 @@ msgstr "Поддерживаются только локальные файлы.
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Поле домена не может быть пустым. Укажите доменное имя или IP-адрес сервера "
 "SMTP."
@@ -10725,10 +10609,10 @@ msgstr "Ошибка при запросе содержания папки на
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "При прекращении подписки все локальные изменения в папке будут удалены."
 
@@ -10948,35 +10832,28 @@ msgstr "&Редактировать сообщение"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Информация, возвращаемая модулем шифрования, не может быть прочитана. "
-"Возможно, модуль повреждён.</p>"
-"<p>Обратитесь к своему системному администратору.</p></qt>"
+"<qt> <p>Информация, возвращаемая модулем шифрования, не может быть "
+"прочитана. Возможно, модуль повреждён.</p><p>Обратитесь к своему системному "
+"администратору.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Не найдено активных модулей криптографии, а также невозможно использовать "
-"встроенный OpenPGP модуль.</p>"
-"<p>Существует два способа изменить данное положение:</p>"
-"<ul>"
-"<li><em>это</em> включить модуль криптографии, используя диалог Настройки->"
-"Настроить KMail->Модули</li>"
-"<li><em>или</em> указать настройки OpenPGP, используя вкладку Дополнительно в "
-"настройках профиля.</li></ul>"
+"встроенный OpenPGP модуль.</p><p>Существует два способа изменить данное "
+"положение:</p><ul><li><em>это</em> включить модуль криптографии, используя "
+"диалог Настройки->Настроить KMail->Модули</li><li><em>или</em> указать "
+"настройки OpenPGP, используя вкладку Дополнительно в настройках профиля.</"
+"li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10988,19 +10865,19 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Библиотека Chiasmus не содержит функции \"x-encrypt\". Сообщите об этой ошибке "
-"разработчикам."
+"Библиотека Chiasmus не содержит функции \"x-encrypt\". Сообщите об этой "
+"ошибке разработчикам."
 
 #: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"Параметры вызова функции \"x-encrypt\" не соответствуют ожидаемым. Сообщите об "
-"этой ошибке разработчикам."
+"Параметры вызова функции \"x-encrypt\" не соответствуют ожидаемым. Сообщите "
+"об этой ошибке разработчикам."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -11008,16 +10885,16 @@ msgstr "Ошибка шифрования Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Функция \"x-encrypt\" библиотеки Chiasmus не вернула массив байтов. Сообщите об "
-"этой ошибке разработчикам."
+"Функция \"x-encrypt\" библиотеки Chiasmus не вернула массив байтов. Сообщите "
+"об этой ошибке разработчикам."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Встраиваемая подпись/шифрование OpenPGP не распространяется на вложения.\n"
@@ -11041,8 +10918,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"В зависимости от предпочтений получателей использовать цифровую подпись у вас "
-"будет запрошено подписывать или не подписывать это сообщение.\n"
+"В зависимости от предпочтений получателей использовать цифровую подпись у "
+"вас будет запрошено подписывать или не подписывать это сообщение.\n"
 "Подписать сообщение?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11072,8 +10949,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Вы хотите подписать сообщение, однако у вас нет ни одного действительного ключа "
-"для подписи в текущем профиле."
+"Вы хотите подписать сообщение, однако у вас нет ни одного действительного "
+"ключа для подписи в текущем профиле."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11129,12 +11006,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"В зависимости от предпочтений получателей использовать шифрование у вас будет "
-"запрошено зашифровывать или не зашифровывать это сообщение.\n"
+"В зависимости от предпочтений получателей использовать шифрование у вас "
+"будет запрошено зашифровывать или не зашифровывать это сообщение.\n"
 "Зашифровать сообщение?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11167,11 +11044,12 @@ msgstr "&Не шифровать"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Вы хотите зашифровать сообщение, однако в текущем профиле у вас нет проверенных "
-"ключей шифрования."
+"Вы хотите зашифровать сообщение, однако в текущем профиле у вас нет "
+"проверенных ключей шифрования."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11180,8 +11058,8 @@ msgstr "Отправить незашифрованным?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Некоторые части сообщения не будут зашифрованы.\n"
@@ -11205,88 +11083,83 @@ msgstr "&Зашифровать все части сообщения"
 msgid "Unencrypted Message Warning"
 msgstr "Не зашифрованное сообщение"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ошибка: модуль криптографии не вернул каких-либо зашифрованных данных.</p>"
-"<p>Сообщите об этой ошибке:"
-"<br>%2</p></qt>"
+"<qt><p>Ошибка: модуль криптографии не вернул каких-либо зашифрованных данных."
+"</p><p>Сообщите об этой ошибке:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qr>Не все символы принадлежат выбранной кодировке."
-"<br>"
-"<br>Отправить сообщение как есть?</qt>"
+"<qr>Не все символы принадлежат выбранной кодировке.<br><br>Отправить "
+"сообщение как есть?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Некоторые символы будут потеряны"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Удалить символы"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Изменить кодировку"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Сообщение не может быть подписано, поскольку выбранный модуль не поддерживает "
-"цифровую подпись. Этого не должно было случиться поэтому сообщите об ошибке "
-"разработчикам."
+"Сообщение не может быть подписано, поскольку выбранный модуль не "
+"поддерживает цифровую подпись. Этого не должно было случиться поэтому "
+"сообщите об ошибке разработчикам."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Сообщение не может быть подписано, поскольку выбранный модуль не поддерживает "
-"цифровую подпись. Этого не должно было случиться поэтому сообщите об ошибке "
-"разработчикам."
+"Сообщение не может быть подписано, поскольку выбранный модуль не "
+"поддерживает цифровую подпись. Этого не должно было случиться поэтому "
+"сообщите об ошибке разработчикам."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Журнал аудита GnuPG (подписи)"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"Добавление подписи не выполнено. Для выполнения действия должна быть запущена "
-"программа gpg-agent."
+"Добавление подписи не выполнено. Для выполнения действия должна быть "
+"запущена программа gpg-agent."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Это сообщение невозможно зашифровать, так как выбранный модуль не поддерживает "
-"шифрование."
+"Это сообщение невозможно зашифровать, так как выбранный модуль не "
+"поддерживает шифрование."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Журнал аудита GnuPG (шифрование)"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Это сообщение невозможно подписать, так как выбранный модуль не поддерживает "
 "подпись и шифрование."
@@ -11310,16 +11183,16 @@ msgstr "Формат &почтового ящика:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Выберите формат хранения сообщений в почтовом ящике. Это может быть каталог "
-"(maildir), в котором каждое сообщение будет в отдельном файле, или один большой "
-"файл (mailbox). По умолчанию будет использовано хранение в каталогах. Обычно не "
-"требуется изменять формат почтового ящика. Если вы не уверены, не изменяйте "
-"параметр."
+"(maildir), в котором каждое сообщение будет в отдельном файле, или один "
+"большой файл (mailbox). По умолчанию будет использовано хранение в "
+"каталогах. Обычно не требуется изменять формат почтового ящика. Если вы не "
+"уверены, не изменяйте параметр."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11328,8 +11201,8 @@ msgstr "&Папка содержит:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Укажите содержимое папки: письма или записи для совместной работы (встречи и "
 "задачи). По умолчанию в папке будут храниться письма. Если вы не уверены, не "
@@ -11372,8 +11245,7 @@ msgstr "Разные результаты для подписей"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Программа шифрования не возвратила тестовых данных."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Статус: "
 
@@ -11402,8 +11274,8 @@ msgstr "Модуль %1 не найден."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "Невозможно установить подлинность подписи.<br />Причина: %1"
 
 #: objecttreeparser.cpp:737
@@ -11438,28 +11310,28 @@ msgstr "Модуль шифрования \"%1\" не может расшифр�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Примечание:</b> Сообщение в формате HTML может содержать ссылки на внешние "
-"ресурсы (картинки и т.д.). По соображениям безопасности загрузка внешних ссылок "
-"будет отключена.<br />Если вы доверяете отправителю этого сообщения, можете "
-"включить загрузку внешних ссылок, нажав <a href=\"kmail:loadExternal\">здесь</a>"
-"."
+"<b>Примечание:</b> Сообщение в формате HTML может содержать ссылки на "
+"внешние ресурсы (картинки и т.д.). По соображениям безопасности загрузка "
+"внешних ссылок будет отключена.<br />Если вы доверяете отправителю этого "
+"сообщения, можете включить загрузку внешних ссылок, нажав <a href=\"kmail:"
+"loadExternal\">здесь</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Примечание:</b> Это сообщение в формате HTML. По соображениям безопасности "
-"показывается код сообщения в текстовом виде.<br />Если вы доверяете отправителю "
-"этого сообщения, можете включить показ HTML, нажав <a href=\"kmail:showHTML\">"
-"здесь</a>."
+"<b>Примечание:</b> Это сообщение в формате HTML. По соображениям "
+"безопасности показывается код сообщения в текстовом виде.<br />Если вы "
+"доверяете отправителю этого сообщения, можете включить показ HTML, нажав <a "
+"href=\"kmail:showHTML\">здесь</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11712,11 +11584,11 @@ msgstr "сохранен:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Не указан адрес в %1, используемом для подписи, сравнение с адресом отправителя "
-"%2 невозможно."
+"Не указан адрес в %1, используемом для подписи, сравнение с адресом "
+"отправителя %2 невозможно."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11831,15 +11703,17 @@ msgstr "Сообщение об ошибке Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Ваш почтовый сервер POP3 (%1) не поддерживает команду UIDL. Она требуется для "
-"того, чтобы достоверно определить, какие из сообщений на сервере уже были "
-"скачаны.\n"
-"Вследствие этого возможность оставлять почту на сервере будет работать неверно."
+"Ваш почтовый сервер POP3 (%1) не поддерживает команду UIDL. Она требуется "
+"для того, чтобы достоверно определить, какие из сообщений на сервере уже "
+"были скачаны.\n"
+"Вследствие этого возможность оставлять почту на сервере будет работать "
+"неверно."
 
 #: popaccount.cpp:752
 msgid ""
@@ -11861,7 +11735,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Получение сообщения %1 из %2 (%3 из %4 кб) для %5@%6 (%7 кб осталось на "
 "сервере)."
@@ -11880,1869 +11755,15 @@ msgstr "Ошибка в ответе сервера"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Ваш сервер не поддерживает команду TOP. Поэтому будет невозможно скачать "
 "сначала только заголовки больших сообщений."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Пе&рейти"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "П&апка"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "С&ообщение"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Специальный ответ"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Переслать"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Панель HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Подпись"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Автоматически подписывать сообщения"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Если этот параметр включен, то все посылаемые сообщения будут подписаны по "
-"умолчанию. При желании вы можете отключить подпись отдельного сообщения."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Шифрование"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr "Ши&фровать сообщения также моим собственным сертификатом"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"При включении этой опции сообщение или файл будут зашифрованы не только "
-"открытым ключом получателя, но и вашим ключом. Рекомендуется так и делать, "
-"чтобы иметь возможность расшифровать сообщение или файл впоследствии."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Показывать зашифрованный/по&дписанный текст"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Результат шифрования и подписывания будет показан в отдельном окне перед "
-"отправкой сообщения. Таким образом, вы можете отменить отправку если не удалось "
-"зашифровать сообщение."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Хранить отправленные сообщения &зашифрованными"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Отметьте для хранения сообщений в зашифрованном виде"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Сохранять сообщения зашифрованными</h1>\n"
-"Если установлен этот параметр, отправленные сообщения сохраняются в "
-"зашифрованном виде, словно они были отправлены. Это не рекомендуется, поскольку "
-"вы не сможете прочитать отправленные сообщения после истечения срока действия "
-"сертификатов.\n"
-"<p>\n"
-"Несмотря на это, локальные правила могут требовать, чтобы этот параметр был "
-"установлен. Проконсультируйтесь со своим системным администратором.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Все&гда показывать ключи шифрования для подтверждения"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Если опция включена, вам всегда будет показан весь список ключей для "
-"шифрования. В противном случае, выбор ключа будет показан только в случае, если "
-"не удаётся найти правильный ключ или можно использовать любой ключ из "
-"нескольких возможных."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Автоматически &шифровать сообщения, если это возможно"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Если данный параметр включен, то все сообщения, посылаемые вами, будут "
-"зашифрованы (при условии, что шифрование доступно и настроено). При желании вы "
-"можете отключить шифрование отдельного сообщения."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Никогда не подписывать/шифровать &черновики"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Как это работает?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Получатель: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Копия: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Обычное сообщение"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Ответ отправителю"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Ответ всем"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Пересылка"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Комбинация клавиш:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Тип шаблона:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Свойства папки"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Папка содержит &список рассылки"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Почтовый адрес списка рассылки:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Обычное:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Непрочитанное:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Срок действия сообщений"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Освобождать &после:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Освобождать от &прочитанных сообщений"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Освобождат&ь после:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Освобождать от &непрочитанных сообщений"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "дней"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "недель"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "месяцев"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Дополнительно"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Профиль &отправителя:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Формат хранения:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Список показывает:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Проверять сертификаты с помощью списков CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Использовать списки отозванных сертификатов (CRL) при проверке сертификатов "
-"S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Проверять сертификаты (служба OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"При включении этой опции сертификаты S/MIME будут проверяться с помощью "
-"Протокола сетевого статуса сертификата (Online Certificates Status Protocol, "
-"OCSP). Укажите адрес службы OCSP в поле ввода."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Проверка сертификата"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Адрес службы OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Адрес сервера для проверки сертификата (служба OCSP). Обычно этот адрес "
-"начинается с http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Подпись службы OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Игнорировать адреса служб сертификатов"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Не проверять стратегии сертификатов"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"По умолчанию GnuPG использует файл ~/.gnupg/policies.txt для проверки, "
-"разрешено ли использовать стратегию сертификата. При включении этой опции "
-"стратегии проверяться не будут."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Не использовать CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Не использовать списки отозванных сертификатов (CRL) при проверке сертификатов "
-"S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Загружать отсутствующие сертификаты сертифицирующих компаний"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"При включении этой опции будут загружены отсутствующие сертификаты "
-"сертифицирующих компаний (применяется для обоих методов: CRLs и OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Запросы HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Не использовать HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Полностью отключить использование HTTP для S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Использовать прокси-сервер для запросов HTTP: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Использовать глобальные настройки прокси-сервера:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"При включении этого параметра, прокси-сервер для запросов HTTP, указанный "
-"справа (по умолчанию он берётся из переменной окружения http_proxy), будет "
-"использован для любого запроса по протоколу HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Укажите адрес прокси-сервера для запросов HTTP, используемых при работе с "
-"S/MIME в виде сервер:порт. Например, myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Не посылать запросы HTTP в центры распространения CRL сертификатов"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"При определении расположения списка аннулирования сертификатов (CRL) существуют "
-"так называемые \"центры распространения CRL\" (CRL Distribution Point, DP), "
-"которые являются ссылками, направляющими на реальные адреса CRL. Будет "
-"использована первая найденная ссылка DP. При включении этого параметра запросы "
-"HTTP в центры распространения CRL сертификатов посылаться не будут."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Запросы LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Не использовать LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Полностью отключить использование LDAP для S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Не посылать запросы LDAP в центры распространения CRL сертификатов"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"При определении расположения списка аннулирования сертификатов (CRL) существуют "
-"так называемые \"центры распространения CRL\" (CRL Distribution Point, DP), "
-"которые являются ссылками, направляющими на реальные адреса CRL. Будет "
-"использована первая найденная ссылка DP. При включении этого параметра запросы "
-"LDAP в центры распространения CRL сертификатов посылаться не будут."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Основной сервер LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"При указании сервера LDAP все запросы будут направляться на него. Этот параметр "
-"будет использован, если невозможно определить адрес сервера и порт из ссылки на "
-"сервер LDAP. Другие сервера LDAP будут использованы при невозможности "
-"соединения через прокси-сервер.\n"
-"Вы можете указать адрес сервера в виде \"адрес_сервера\" или "
-"\"адрес_сервера:порт\". Если порт не указан, подразумевается стандартный порт "
-"LDAP 389."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Добавить фразу"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Добавить"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Фраза:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Группа:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Настройка фраз"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Подсказки"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Показывать текст фразы во всплывающей &подсказке"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "Показывать текст фразы во всплывающей подсказке"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Поля"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Метод заполнения полей"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Отдельный диалог для каждого поля во фразе"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Отдельный диалог для каждого поля во фразе"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Один диалог для всех полей во фразе"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr "Один диалог для задания значений всех полей во фразе"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Разделитель:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "ПараметрыШаблонов"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Ответ отправителю"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Ответ всем"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Пересылка"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "&Предупреждать при отправке неподписанного сообщения"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Вывод предупреждения о попытке отправки неподписанных сообщений."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать при отправке неподписанного сообщения</h1>\n"
-"Если включен этот параметр, при попытке отправки неподписанного сообщения или "
-"частей сообщения будет выводиться предупреждение.\n"
-"<p>\n"
-"Для максимальной надёжности рекомендуется включить этот параметр.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Предупреждать при отправке незашифрованного сообщения"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Показ предупреждения при отправке незашифрованных сообщений."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать при попытке отправки незашифрованного сообщения</h1>\n"
-"Если установлен этот параметр, вы будете предупреждены о попытках\n"
-"отправить сообщение или его часть в незашифрованном виде.\n"
-"<p>\n"
-"Рекомендуется для максимальной целостности иметь этот параметр включенным.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Предупреждать, если адреса получателя &нет в сертификате"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Предупреждать, если адрес отсутствует в сертификате"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать, если в сертификате отсутствует адрес получателя</h1>\n"
-"Если установлен этот параметр, выводится предупреждение в случае,\n"
-"когда адрес получателя отсутствует в используемом для подписи\n"
-"сертификате.\n"
-"<p>\n"
-"Для максимальной безопасности рекомендуется держать этот параметр.\n"
-"включенным.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Предупреждать о скором истечении срока действия сертификатов и ключей"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Для подписи"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Для шифрования"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " дней"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Укажите количество дней"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать об истечении срока действия сертификата подписи</h1>\n"
-"Укажите количество дней до окончания срока действия сертификата, за которое "
-"должно выводиться предупреждение.\n"
-"<p>\n"
-"Рекомендуемое SPHINX значение - 14 дней.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать, если срок действия сертификата шифрования истекает</h1>\n"
-"Установите минимальное количество дней, в течении которых сертификат будет "
-"действительным без вывода предупреждения.\n"
-"<p>\n"
-"Рекомендуемое SPHINX значение - 14 дней.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать, если срок действия сертификата в цепочке истекает</h1>\n"
-"Выберите минимальное количество дней, в течении которых все сертификаты\n"
-"должны быть действительны без вывода предупреждения.\n"
-"<p>\n"
-"Рекомендуемый параметр SPHINX 14 дней.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать об истечении срока действия сертификата CA</h1>\n"
-"Укажите количество дней до окончания срока действия сертификата CA, за которое "
-"должно выводиться предупреждение.\n"
-"<p>\n"
-"Рекомендуемое SPHINX значение - 14 дней.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Предупреждать об истечении срока действия корневого сертификата</h1>\n"
-"Укажите количество дней до окончания срока действия корневого сертификата, за "
-"которое должно выводиться предупреждение.\n"
-"<p>\n"
-"Рекомендуемое SPHINX значение - 14 дней.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Для корневых сертификатов:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Для сертификатов промежуточных СА:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Для пользовательских сертификатов или ключей:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Включить все отключенные предупреждения"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Текст шаблона"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Комбинация клавиш шаблона"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Тип шаблона"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Отправлять сообщения из очереди при проверке почты"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Отправлять сообщения из очереди вручную, при проверке почты во всех ящиках "
-"или отправлять немедленно. </p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Автоматически перемещать несинхронизуемые сообщения из папок с ограниченными "
-"правами доступа"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"В папке есть новые сообщения, которые не могут быть сохранены на сервере из-за "
-"ограничений прав доступа. Эти сообщения будут перенесены в папку "
-"\"Потерянные\"."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Включить локальные флаги для папок только для чтения"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Минимальный период между проверками почты, задаваемый системным "
-"администратором. Пользователь не сможет установить период меньше, чем указанный "
-"в этом параметре."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Показывать часто используемые папки в списке выбора."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr "Установить доступность только для пользователя"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Значок в системном лотке"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Завершить работу приложения при закрытии главного окна даже если в системном "
-"лотке существует значок."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Подробное уведомление о приходе почты"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"При включении этого параметра у названия каждой папки будет показано количество "
-"новых сообщений. В противном случае будет показано простое сообщение о приходе "
-"новой почты."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Редактор:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Использовать &внешний редактор вместо встроенного"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr "Порог предупреждения о скором превышении квоты на папку."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Включить поддержку совместной работы"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Переписывать заголовки From:/To: в ответах на ответы (для Outlook)"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook содержит ряд недоработок, в частности в реализации стандарта "
-"iCalendar. Эта опция исправляет эту ошибку. Если вам приходится переписываться "
-"с пользователями Outlook и они не могут получить ваши ответы, включите её."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Отправлять приглашения в теле сообщения"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook содержит ряд недоработок, в частности, в реализации стандарта "
-"iCalendar. Эта опция исправляет эту ошибку. Если вам приходится переписываться "
-"с пользователями Outlook и они не могут получить ваши приглашения, включите её."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Совместимость именования приглашений с Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook при работе с сервером Microsoft Exchange имеет проблемы "
-"обработки сообщений электронной почты других систем совместной работы. Включите "
-"эту опцию для отправки приглашений в виде, понятном Microsoft Exchange."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"При включении этого параметра при отправке приглашения на встречу не будет "
-"показано окно создания письма. Если вы хотите изменить письмо перед его "
-"отправкой, отключите этот параметр, однако имейте ввиду, что в теле письма с "
-"приглашением будет находится текст в формате iCalendar, который довольно сложно "
-"изменить вручную."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Удалять сообщения с приглашениями после отправки ответа на них"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Если этот флажок установлен, при успешной отправке ответа на приглашение, само "
-"сообщение с приглашением перемещается в Корзину."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Эта опция позволяет сохранять данные приложений Kontact (KOrganizer, "
-"KAddressBook и KNotes) на сервере совместной работы.</p>"
-"<p>Кроме включения этой опции, вам необходимо указать источники IMAP для "
-"указанных приложений в Центре управления TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Обычно нет причин просматривать все папки источника IMAP. Но если вы их "
-"хотите видеть все, включите этот флажок.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr "<p>Показывать только папки совместной работы в списке.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Выберите формат сообщений в папках совместной работы. "
-"<ul>"
-"<li>Форматы сообщений по умолчанию - ical (для папок календарей) и vcard (для "
-"папок адресных книг). Эти форматы поддерживают все возможности Kontact.</li>"
-"<li>Формат Kolab XML использует собственную модель, похожую на формат Outlook. "
-"Этот формат обладает большей совместимостью с Outlook, работает с сервером "
-"Kolab или совместимыми с ним серверами.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Корневая папка источника IMAP.</p>"
-"<p>По умолчанию сервер Kolab использует папку IMAP Входящие в качестве "
-"родительской.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Идентификатор учётной записи папок IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Если вы хотите видеть названия папок IMAP на вашем родном языке, вы должны "
-"указать используемый вами язык из списка поддерживаемых языков.</p>"
-"<p>Помните, что данная возможность сделано только для совместимости с Microsoft "
-" Outlook. Вы должны обдумать этот шаг, поскольку повторное изменение языка "
-"невозможно.</p>"
-"<p>Не используйте эту опцию, если не уверены.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Также фильтровать новые сообщения в совместных папках."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Синхронизировать изменения с сервером в отсоединённых папках IMAP сразу же при "
-"подключении к сети."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Показ начальной страницы KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Максимальное число соединений с одним сервером"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ограничивает число соединений с сервером при проверке новой почты. По умолчанию "
-"оно не ограничено (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Показать поле быстрого поиска"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Включает или выключает показ поля для быстрого поиска информации в списке "
-"сообщений."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Скрыть локальную папку Входящие, если она не используется"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Пересылать в сообщении по умолчанию."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-"Использовать точку с запятой («;») в качестве разделителя в редакторе "
-"сообщения."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Сохранять кодировку сообщения при ответе или пересылке, если это возможно"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Автоматически вставлять подпись"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Использовать этот профиль при составлении писем по умолчанию.\n"
-"       "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr "Использовать эту папку для отправленных писем."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "Использовать этот метод для отправки писем по умолчанию."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Использовать этот профиль при составлении писем по умолчанию.\n"
-"       "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Перенос строки в позиции:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Количество строк ввода имён получателей."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Включите этот режим, чтобы Outlook& #8482; понимал имена вложений, содержащих "
-"кириллические символы"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Запрашивать уведомления об &обработке сообщений"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Запрашивать уведомление об обработке сообщения (Message Disposition "
-"Notification, MDN) с каждым отправляемым сообщением.</p>"
-"<p>Чтобы изменить это значение по умолчанию, выберите пункт меню <em>"
-"Параметры</em>-><em>Запросить уведомление об обработке</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Использовать недавние адреса в автозавершении"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"При выключении этого параметра при автозавершении адресов будет показан список "
-"вариантов."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Интервал автосохранения:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"При написании сообщения будет автоматически создаваться резервная копия. "
-"Укажите интервал, с которым будут создаваться резервные копии. Значение 0 "
-"отключает создание копий."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Вставить подпись над цитируемым текстом"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "За&менять распознанный префикс на «Re:»"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Зам&енять распознанный префикс на «Fwd:»"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Интеллектуальная правка цитат"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Подпись просрочена."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Тип диалога выбора адресов"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr "Укажите тип диалога выбора адресов."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Тип получателей"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "Укажите тип редактора получателей письма."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Количество строк ввода имён получателей."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Список частей сообщения, которые можно удалить при пересылке в сообщении."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Максимальный размер вложения (в Мб)."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Показывать панель вставки фраз в окне редакторе сообщения."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Показывать журнал аудита GnuPG даже если криптографические операции прошли "
-"успешно."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Сохранять кодировку сообщения при ответе или пересылке, если это возможно"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Некоторые письма, особенно создаваемые автоматически, не указывают кодировку, "
-"которая необходима для правильного показа письма. В этом случае будет "
-"использована указанная кодировка по умолчанию. По умолчанию будет "
-"использоваться текущая кодировка системы."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Изменение кодировки по умолчанию ('Авто') изменит кодировку показа содержимого "
-"всех писем игнорируя указанную в них кодировку."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Включите этот параметр, если хотите, чтобы смайлики типа :-) в тексте писем "
-"заменялись на графические смайлики."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Включите этот параметр для показа разного уровня цитирования разными цветами."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Автоматическое скрытие уровней цитирования больше:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Уменьшить размер шрифта для цитируемого текста"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Включите этот параметр для показа цитируемого текста шрифтом меньшего размера."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Хранить отправленные сообщения &зашифрованными"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Показывать название почтовой программы отправителя в заголовке"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr "Показывать поля User-Agent и X-Mailer отправителя в изящном заголовке"
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Позволить удалять вложения из существующих писем."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Позволить редактировать вложения в существующих письмах."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-"Всегда расшифровывать сообщения при просмотре или спрашивать об этом "
-"пользователя"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Посылать уведомления об обработке сообщений без указания отправителя"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Посылать уведомления об обработке сообщений без указания отправителя. Некоторые "
-"серверы могут не принимать такие сообщения, в таком случае отключите этот "
-"параметр."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Подстановки в шаблоне"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Старые подстановки, которые будут преобразованы в шаблоны"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Шаблон нового сообщения"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Шаблон ответа отправителю"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Шаблон ответа всем"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Шаблон пересылаемого сообщения"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Символы цитирования"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-"Позволить пользователю устанавливать автоматические ответы об отсутствии "
-"пользователя."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Позволить пользователям размещать на сервере скрипты Sieve для ответа об "
-"отсутствии, но запретить изменять любые параметры ответа, такие как поддержка "
-"только определённого домена или реакция на спам."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-"Отправлять ответ об отсутствии только на письма, приходящие с этого домена."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "Отправлять ответ об отсутствии в том числе и на письма со спамом."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr "Включить автоматические ответы об отсутствии пользователя."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "используется %1 из %2 %3"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13854,6 +11875,11 @@ msgstr "Копия"
 msgid "Add as BCC"
 msgstr "Скрытая копия"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "О&тменить"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13869,17 +11895,17 @@ msgstr "Выбранные получатели"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Вы указали %n получателя. Максимальное разрешённое количество получателей: %1. "
-"Измените количество получателей.\n"
-"Вы указали %n получателей. Максимальное разрешённое количество получателей: %1. "
-"Измените количество получателей.\n"
-"Вы указали %n получателей. Максимальное разрешённое количество получателей: %1. "
-"Измените количество получателей."
+"Вы указали %n получателя. Максимальное разрешённое количество получателей: "
+"%1. Измените количество получателей.\n"
+"Вы указали %n получателей. Максимальное разрешённое количество получателей: "
+"%1. Измените количество получателей.\n"
+"Вы указали %n получателей. Максимальное разрешённое количество получателей: "
+"%1. Измените количество получателей."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13895,8 +11921,8 @@ msgstr "Использовать адресную книгу"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr "Выбрать адреса из адресной книги."
 
 #: redirectdialog.cpp:116
@@ -13999,13 +12025,22 @@ msgstr "больше или равно"
 msgid " bytes"
 msgstr " байт"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " дней"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Для поиска во всех сообщениях в папке %1 они должны быть загружены с сервера. "
-"Это может занять некоторое время. Вы хотите продолжить поиск?"
+"Для поиска во всех сообщениях в папке %1 они должны быть загружены с "
+"сервера. Это может занять некоторое время. Вы хотите продолжить поиск?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14158,16 +12193,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Сбор данных об учётной записи '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Сбор данных об учётной записи '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14186,10 +12217,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Содержимое сценария '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Содержимое сценария '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14212,20 +12241,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Возможности Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Возможности Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(нет специальных возможностей)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Доступные сценарии Sieve:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Доступные сценарии Sieve:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14302,11 +12327,11 @@ msgstr "Укажите подпись, которая будет добавля�
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Укажите файл, текст из которого будет добавляться в качестве подписи в каждое "
-"создаваемое сообщение."
+"Укажите файл, текст из которого будет добавляться в качестве подписи в "
+"каждое создаваемое сообщение."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14322,20 +12347,25 @@ msgstr "Открыть файл в текстовом редакторе."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Здесь можно указать любую команду, с путём или без пути. Для каждого нового "
-"сообщения вывод этой команды будет добавляться в качестве подписи. Обычно здесь "
-"используют \"fortune\" или \"ksig -random\"."
+"сообщения вывод этой команды будет добавляться в качестве подписи. Обычно "
+"здесь используют \"fortune\" или \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Команда:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Путь"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Новая запись:"
@@ -14369,6 +12399,11 @@ msgstr "Добавить группу"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Удалить группу и все фразы, входящие в неё?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Использовать &для:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Изменить фразу"
@@ -14381,6 +12416,10 @@ msgstr "Группа фраз"
 msgid "Edit &group..."
 msgstr "Изменить &группу..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Изменить..."
@@ -14414,17 +12453,17 @@ msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
 msgstr ""
-"При установке этого флажка значение, введённое справа, будет использоваться для "
-"подстановки значения по умолчанию для этого поля"
+"При установке этого флажка значение, введённое справа, будет использоваться "
+"для подстановки значения по умолчанию для этого поля"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
-"При установке этого флажка значение, введённое справа, будет использоваться для "
-"подстановки значения по умолчанию для этого поля."
+"При установке этого флажка значение, введённое справа, будет использоваться "
+"для подстановки значения по умолчанию для этого поля."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14459,6 +12498,16 @@ msgstr "Не включать"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Невозможно вставить из файла %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Получатель: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Копия: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14488,59 +12537,48 @@ msgstr "Невозможно вызвать программу из шаблон
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>"
-"<p>Здесь вы можете создавать шаблоны новых, ответных и пересылаемых "
-"сообщений.</p>"
-"<p>Шаблоны поддерживают команды подстановки: введите их или выберите из меню  "
-"<i>Вставить команду</i>.</p>"
-"<p>Шаблоны, указанные здесь, привязаны к папкам. Они являются предпочтительными "
-"перед общими шаблонами и шаблонами профиля.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p><p>Здесь вы можете создавать шаблоны новых, ответных и пересылаемых "
+"сообщений.</p><p>Шаблоны поддерживают команды подстановки: введите их или "
+"выберите из меню  <i>Вставить команду</i>.</p><p>Шаблоны, указанные здесь, "
+"привязаны к папкам. Они являются предпочтительными перед общими шаблонами и "
+"шаблонами профиля.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Здесь вы можете создавать шаблоны новых, ответных и пересылаемых "
-"сообщений.</p>"
-"<p>Шаблоны поддерживают команды подстановки: введите их или выберите из меню  "
-"<i>Вставить команду</i>.</p>"
-"<p>Шаблоны, указанные здесь, привязаны к профилю. Они являются "
-"предпочтительными перед общими шаблонами и шаблонами папки.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Здесь вы можете создавать шаблоны новых, ответных и пересылаемых "
+"сообщений.</p><p>Шаблоны поддерживают команды подстановки: введите их или "
+"выберите из меню  <i>Вставить команду</i>.</p><p>Шаблоны, указанные здесь, "
+"привязаны к профилю. Они являются предпочтительными перед общими шаблонами и "
+"шаблонами папки.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Здесь вы можете создавать шаблоны новых, ответных и пересылаемых "
-"сообщений.</p>"
-"<p>Шаблоны поддерживают команды подстановки: введите их или выберите из меню  "
-"<i>Вставить команду</i>.</p>"
-"<p>Шаблоны, указанные здесь, являются общими. Они являются предпочтительными "
-"перед шаблонами папки и шаблонами профиля.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Здесь вы можете создавать шаблоны новых, ответных и пересылаемых "
+"сообщений.</p><p>Шаблоны поддерживают команды подстановки: введите их или "
+"выберите из меню  <i>Вставить команду</i>.</p><p>Шаблоны, указанные здесь, "
+"являются общими. Они являются предпочтительными перед шаблонами папки и "
+"шаблонами профиля.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14775,13 +12813,14 @@ msgstr "Вставить вывод программы"
 #: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
-"Обработать текст исходного сообщения во внешней программе и вставить результат "
-"как цитируемый текст"
+"Обработать текст исходного сообщения во внешней программе и вставить "
+"результат как цитируемый текст"
 
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
-"Обработать текст исходного сообщения во внешней программе и вставить результат"
+"Обработать текст исходного сообщения во внешней программе и вставить "
+"результат"
 
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
@@ -14796,8 +12835,12 @@ msgstr "Обработать текст сообщения во внешней �
 #: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
-"Обработать текст сообщения во внешней программе и заменить существующий текст "
-"полученным результатом"
+"Обработать текст сообщения во внешней программе и заменить существующий "
+"текст полученным результатом"
+
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
 
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
@@ -14831,110 +12874,6 @@ msgstr "Показывать сообщения отладки"
 msgid "Turn Debug Off"
 msgstr "Отключить сообщения отладки"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...что можно перемещаться по списку сообщений с помощью стрелок вправо и "
-"влево?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...что можно быстро создавать фильтры по получателю,\n"
-"отправителю, теме и спискам рассылки при помощи <em>Сервис->"
-"Создать&nbsp;фильтр</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...что можно избавиться от &quot;[имени списка рассылки]&quot;,\n"
-"добавляемого в тему некоторых списков рассылки, используя\n"
-"фильтр <em>rewrite header</em>? Просто используйте\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[имя списка рассылки\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...что можно связать списки рассылки с папками в\n"
-"диалоге <em>Папка-&gt;Список рассылки...</em>? После этого можно \n"
-"воспользоваться пунктом меню "
-"<em>Сообщение-&gt;Отправить&nbsp;в&nbsp;список&nbsp;рассылки...</em>,\n"
-"чтобы открыть редактор с адресом списка рассылки.\n"
-"То же самое произойдёт, если вы щёлкните средней кнопкой мыши на папке.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...что можно назначить свои значки каждой папке?\n"
-"Смотрите <em>Папка-&gt;Свойства...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...что KMail может показывать цветную полосу, соответствующую типу текущего "
-"сообщения (Обычный текст/HTML/OpenPGP)?</p>\n"
-"<p>это срывает различные попытки фальсифицировать успешную проверку подписи, "
-"когда почта HTML маскируется под формат подписей KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...что можно отфильтровать любой заголовок, просто введя имя заголовка\n"
-"в первое поле правила поиска?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...что можно отфильтровать сообщения в чистом HTML с помощью правила\n"
-"<pre>&quot;Content-type&quot; содержит &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...что при ответе цитируется только выделенный текст сообщения?</p>\n"
-"<p>Если ничего не выделено, цитируется всё сообщение.</p>\n"
-"<p>Это также работает если вы включили\n"
-"<em>Вид-&gt;Вложения-&gt;В тексте</em>.</p>\n"
-"<p align=\"right\"><em>прислал David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Отсутствуют действия для отмены."
@@ -15000,6 +12939,15 @@ msgstr "Вложение %1 (без имени)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Показать журнал аудита GnuPG для этой операции"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Файл с именем \"%1\" уже существует. Перезаписать его?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Перезаписать файл?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15046,7 +12994,8 @@ msgid ""
 "Default values will be used."
 msgstr ""
 "Параметры сценария уведомлений об отсутствии были изменены на сервере.\n"
-"Эти параметры не могут быть использованы для автоматических ответов в KMail.\n"
+"Эти параметры не могут быть использованы для автоматических ответов в "
+"KMail.\n"
 "Будут использованы параметры по умолчанию."
 
 #: vacation.cpp:657
@@ -15115,14 +13064,14 @@ msgstr "Посылать &картинку в каждом сообщении"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Включите этот параметр, если хотите добавлять в письма, создаваемые в этом "
-"профиле, так называемый заголовок X-Face. X-Face - это небольшая (48х48 точек) "
-"чёрно-белая картинка, которую могут показывать некоторые типы почтовых "
-"клиентов."
+"профиле, так называемый заголовок X-Face. X-Face - это небольшая (48х48 "
+"точек) чёрно-белая картинка, которую могут показывать некоторые типы "
+"почтовых клиентов."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15150,12 +13099,12 @@ msgstr "Выбор файла..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Нажмите на эту кнопку для выбора файла картинки. Картинка должна быть "
-"высоко-контрастной и квадратной. Светлый фон позволит улучшить показ картинки."
+"Нажмите на эту кнопку для выбора файла картинки. Картинка должна быть высоко-"
+"контрастной и квадратной. Светлый фон позволит улучшить показ картинки."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15163,19 +13112,20 @@ msgstr "Получить из адресной книги"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr "Будет использована картинка из адресной книги."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail может посылать в каждом письме небольшую (48х48 точек) чёрно-белую "
-"картинку.Например, это может быть ваш портрет или вензель. Эта картинка будет "
-"показана в почтовом клиенте получателя (если поддерживается эта возможность)."
+"картинку.Например, это может быть ваш портрет или вензель. Эта картинка "
+"будет показана в почтовом клиенте получателя (если поддерживается эта "
+"возможность)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15183,11 +13133,11 @@ msgstr "Укажите строку X-Face."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Примеры можно посмотреть на <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Примеры можно посмотреть на <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15202,129 +13152,1765 @@ msgstr "Нет картинки"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Нет такого контакта в вашей адресной книге."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Всего: %2<br>Непрочитанных: %3<br>Размер: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Подпись"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Квота: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Автоматически подписывать сообщения"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Тема сообщения"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Если этот параметр включен, то все посылаемые сообщения будут подписаны по "
+"умолчанию. При желании вы можете отключить подпись отдельного сообщения."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Отправить копию на «address»"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Шифрование"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Отправить скрытую копию на «address»"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "Ши&фровать сообщения также моим собственным сертификатом"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Добавить поле заголовка «header» в сообщение"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"При включении этой опции сообщение или файл будут зашифрованы не только "
+"открытым ключом получателя, но и вашим ключом. Рекомендуется так и делать, "
+"чтобы иметь возможность расшифровать сообщение или файл впоследствии."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Прочитать тело сообщения из «file»"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Показывать зашифрованный/по&дписанный текст"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Задать тело сообщения"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Результат шифрования и подписывания будет показан в отдельном окне перед "
+"отправкой сообщения. Таким образом, вы можете отменить отправку если не "
+"удалось зашифровать сообщение."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Добавить одно или несколько вложений в сообщение"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Хранить отправленные сообщения &зашифрованными"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Только проверить наличие новых сообщений"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Отметьте для хранения сообщений в зашифрованном виде"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Открыть только окно редактора"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Сохранять сообщения зашифрованными</h1>\n"
+"Если установлен этот параметр, отправленные сообщения сохраняются в "
+"зашифрованном виде, словно они были отправлены. Это не рекомендуется, "
+"поскольку вы не сможете прочитать отправленные сообщения после истечения "
+"срока действия сертификатов.\n"
+"<p>\n"
+"Несмотря на это, локальные правила могут требовать, чтобы этот параметр был "
+"установлен. Проконсультируйтесь со своим системным администратором.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Просмотреть файл с сообщением"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Все&гда показывать ключи шифрования для подтверждения"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Отправить сообщение на «address» и вложить файл, на который ссылается «URL»"
+"Если опция включена, вам всегда будет показан весь список ключей для "
+"шифрования. В противном случае, выбор ключа будет показан только в случае, "
+"если не удаётся найти правильный ключ или можно использовать любой ключ из "
+"нескольких возможных."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Прочитанное"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Автоматически &шифровать сообщения, если это возможно"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Устаревшее"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Если данный параметр включен, то все сообщения, посылаемые вами, будут "
+"зашифрованы (при условии, что шифрование доступно и настроено). При желании "
+"вы можете отключить шифрование отдельного сообщения."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Удалённое"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Никогда не подписывать/шифровать &черновики"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Отвеченное"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Как это работает?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Пересланное"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Обычное сообщение"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "В очереди"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Ответ отправителю"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Отправленное"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Ответ всем"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Наблюдаемое"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Пересылка"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Игнорируемое"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Комбинация клавиш:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Спам"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Тип шаблона:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Полезное"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Текст шаблона"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "В работе"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Комбинация клавиш шаблона"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "С вложениями"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Тип шаблона"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "используется %1 из %2 %3"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Свойства папки"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Путь"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Папка содержит &список рассылки"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Почтовый адрес списка рассылки:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Обычное:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Непрочитанное:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Срок действия сообщений"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Освобождать &после:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Освобождать от &прочитанных сообщений"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Освобождат&ь после:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Освобождать от &непрочитанных сообщений"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "дней"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "недель"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "месяцев"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Профиль &отправителя:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Формат хранения:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Список показывает:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Отправлять сообщения из очереди при проверке почты"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Файл с именем \"%1\" уже существует. Перезаписать его?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Отправлять сообщения из очереди вручную, при проверке почты во всех "
+"ящиках или отправлять немедленно. </p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Перезаписать файл?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Автоматически перемещать несинхронизуемые сообщения из папок с ограниченными "
+"правами доступа"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"В папке есть новые сообщения, которые не могут быть сохранены на сервере из-"
+"за ограничений прав доступа. Эти сообщения будут перенесены в папку "
+"\"Потерянные\"."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Включить локальные флаги для папок только для чтения"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Минимальный период между проверками почты, задаваемый системным "
+"администратором. Пользователь не сможет установить период меньше, чем "
+"указанный в этом параметре."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Показывать часто используемые папки в списке выбора."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr "Установить доступность только для пользователя"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Значок в системном лотке"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Завершить работу приложения при закрытии главного окна даже если в системном "
+"лотке существует значок."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Подробное уведомление о приходе почты"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"При включении этого параметра у названия каждой папки будет показано "
+"количество новых сообщений. В противном случае будет показано простое "
+"сообщение о приходе новой почты."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Редактор:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Использовать &внешний редактор вместо встроенного"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "Порог предупреждения о скором превышении квоты на папку."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Включить поддержку совместной работы"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Переписывать заголовки From:/To: в ответах на ответы (для Outlook)"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook содержит ряд недоработок, в частности в реализации "
+"стандарта iCalendar. Эта опция исправляет эту ошибку. Если вам приходится "
+"переписываться с пользователями Outlook и они не могут получить ваши ответы, "
+"включите её."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Отправлять приглашения в теле сообщения"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook содержит ряд недоработок, в частности, в реализации "
+"стандарта iCalendar. Эта опция исправляет эту ошибку. Если вам приходится "
+"переписываться с пользователями Outlook и они не могут получить ваши "
+"приглашения, включите её."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Совместимость именования приглашений с Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook при работе с сервером Microsoft Exchange имеет проблемы "
+"обработки сообщений электронной почты других систем совместной работы. "
+"Включите эту опцию для отправки приглашений в виде, понятном Microsoft "
+"Exchange."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"При включении этого параметра при отправке приглашения на встречу не будет "
+"показано окно создания письма. Если вы хотите изменить письмо перед его "
+"отправкой, отключите этот параметр, однако имейте ввиду, что в теле письма с "
+"приглашением будет находится текст в формате iCalendar, который довольно "
+"сложно изменить вручную."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Удалять сообщения с приглашениями после отправки ответа на них"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Если этот флажок установлен, при успешной отправке ответа на приглашение, "
+"само сообщение с приглашением перемещается в Корзину."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Эта опция позволяет сохранять данные приложений Kontact (KOrganizer, "
+"KAddressBook и KNotes) на сервере совместной работы.</p><p>Кроме включения "
+"этой опции, вам необходимо указать источники IMAP для указанных приложений в "
+"Центре управления TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Обычно нет причин просматривать все папки источника IMAP. Но если вы их "
+"хотите видеть все, включите этот флажок.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr "<p>Показывать только папки совместной работы в списке.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Выберите формат сообщений в папках совместной работы. <ul><li>Форматы "
+"сообщений по умолчанию - ical (для папок календарей) и vcard (для папок "
+"адресных книг). Эти форматы поддерживают все возможности Kontact.</"
+"li><li>Формат Kolab XML использует собственную модель, похожую на формат "
+"Outlook. Этот формат обладает большей совместимостью с Outlook, работает с "
+"сервером Kolab или совместимыми с ним серверами.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Корневая папка источника IMAP.</p><p>По умолчанию сервер Kolab использует "
+"папку IMAP Входящие в качестве родительской.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Идентификатор учётной записи папок IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Если вы хотите видеть названия папок IMAP на вашем родном языке, вы "
+"должны указать используемый вами язык из списка поддерживаемых языков.</"
+"p><p>Помните, что данная возможность сделано только для совместимости с "
+"Microsoft  Outlook. Вы должны обдумать этот шаг, поскольку повторное "
+"изменение языка невозможно.</p><p>Не используйте эту опцию, если не уверены."
+"</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Также фильтровать новые сообщения в совместных папках."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Синхронизировать изменения с сервером в отсоединённых папках IMAP сразу же "
+"при подключении к сети."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Показ начальной страницы KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Максимальное число соединений с одним сервером"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ограничивает число соединений с сервером при проверке новой почты. По "
+"умолчанию оно не ограничено (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Показать поле быстрого поиска"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Включает или выключает показ поля для быстрого поиска информации в списке "
+"сообщений."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Скрыть локальную папку Входящие, если она не используется"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Пересылать в сообщении по умолчанию."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+"Использовать точку с запятой («;») в качестве разделителя в редакторе "
+"сообщения."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Сохранять кодировку сообщения при ответе или пересылке, если это возможно"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Автоматически вставлять подпись"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Использовать этот профиль при составлении писем по умолчанию.\n"
+"       "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr "Использовать эту папку для отправленных писем."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "Использовать этот метод для отправки писем по умолчанию."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Использовать этот профиль при составлении писем по умолчанию.\n"
+"       "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Перенос строки в позиции:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Количество строк ввода имён получателей."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Включите этот режим, чтобы Outlook& #8482; понимал имена вложений, "
+"содержащих кириллические символы"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Запрашивать уведомления об &обработке сообщений"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Запрашивать уведомление об обработке сообщения (Message Disposition "
+"Notification, MDN) с каждым отправляемым сообщением.</p><p>Чтобы изменить "
+"это значение по умолчанию, выберите пункт меню <em>Параметры</em>-"
+"><em>Запросить уведомление об обработке</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Использовать недавние адреса в автозавершении"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"При выключении этого параметра при автозавершении адресов будет показан "
+"список вариантов."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Интервал автосохранения:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"При написании сообщения будет автоматически создаваться резервная копия. "
+"Укажите интервал, с которым будут создаваться резервные копии. Значение 0 "
+"отключает создание копий."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Вставить подпись над цитируемым текстом"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "За&менять распознанный префикс на «Re:»"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Зам&енять распознанный префикс на «Fwd:»"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Интеллектуальная правка цитат"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Подпись просрочена."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Тип диалога выбора адресов"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr "Укажите тип диалога выбора адресов."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Тип получателей"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "Укажите тип редактора получателей письма."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Количество строк ввода имён получателей."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Список частей сообщения, которые можно удалить при пересылке в сообщении."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Максимальный размер вложения (в Мб)."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Показывать панель вставки фраз в окне редакторе сообщения."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Показывать журнал аудита GnuPG даже если криптографические операции прошли "
+"успешно."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Сохранять кодировку сообщения при ответе или пересылке, если это возможно"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Некоторые письма, особенно создаваемые автоматически, не указывают "
+"кодировку, которая необходима для правильного показа письма. В этом случае "
+"будет использована указанная кодировка по умолчанию. По умолчанию будет "
+"использоваться текущая кодировка системы."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Изменение кодировки по умолчанию ('Авто') изменит кодировку показа "
+"содержимого всех писем игнорируя указанную в них кодировку."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Включите этот параметр, если хотите, чтобы смайлики типа :-) в тексте писем "
+"заменялись на графические смайлики."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Включите этот параметр для показа разного уровня цитирования разными цветами."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Автоматическое скрытие уровней цитирования больше:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Уменьшить размер шрифта для цитируемого текста"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Включите этот параметр для показа цитируемого текста шрифтом меньшего "
+"размера."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Хранить отправленные сообщения &зашифрованными"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Показывать название почтовой программы отправителя в заголовке"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr "Показывать поля User-Agent и X-Mailer отправителя в изящном заголовке"
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Позволить удалять вложения из существующих писем."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Позволить редактировать вложения в существующих письмах."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+"Всегда расшифровывать сообщения при просмотре или спрашивать об этом "
+"пользователя"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Посылать уведомления об обработке сообщений без указания отправителя"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Посылать уведомления об обработке сообщений без указания отправителя. "
+"Некоторые серверы могут не принимать такие сообщения, в таком случае "
+"отключите этот параметр."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Подстановки в шаблоне"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Старые подстановки, которые будут преобразованы в шаблоны"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Шаблон нового сообщения"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Шаблон ответа отправителю"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Шаблон ответа всем"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Шаблон пересылаемого сообщения"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Символы цитирования"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+"Позволить пользователю устанавливать автоматические ответы об отсутствии "
+"пользователя."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Позволить пользователям размещать на сервере скрипты Sieve для ответа об "
+"отсутствии, но запретить изменять любые параметры ответа, такие как "
+"поддержка только определённого домена или реакция на спам."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+"Отправлять ответ об отсутствии только на письма, приходящие с этого домена."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "Отправлять ответ об отсутствии в том числе и на письма со спамом."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr "Включить автоматические ответы об отсутствии пользователя."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Редактировать"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Изменить..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Пе&рейти"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "П&апка"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "С&ообщение"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Специальный ответ"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Переслать"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Подсказки"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Настройка фраз"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Панель HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Общие параметры"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Панель HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Проверять сертификаты с помощью списков CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Использовать списки отозванных сертификатов (CRL) при проверке сертификатов "
+"S/MIME."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Проверять сертификаты (служба OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"При включении этой опции сертификаты S/MIME будут проверяться с помощью "
+"Протокола сетевого статуса сертификата (Online Certificates Status Protocol, "
+"OCSP). Укажите адрес службы OCSP в поле ввода."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Проверка сертификата"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Адрес службы OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Адрес сервера для проверки сертификата (служба OCSP). Обычно этот адрес "
+"начинается с http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Подпись службы OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Игнорировать адреса служб сертификатов"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Не проверять стратегии сертификатов"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"По умолчанию GnuPG использует файл ~/.gnupg/policies.txt для проверки, "
+"разрешено ли использовать стратегию сертификата. При включении этой опции "
+"стратегии проверяться не будут."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Не использовать CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Не использовать списки отозванных сертификатов (CRL) при проверке "
+"сертификатов S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Загружать отсутствующие сертификаты сертифицирующих компаний"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"При включении этой опции будут загружены отсутствующие сертификаты "
+"сертифицирующих компаний (применяется для обоих методов: CRLs и OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Запросы HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Не использовать HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Полностью отключить использование HTTP для S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Использовать прокси-сервер для запросов HTTP: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Использовать глобальные настройки прокси-сервера:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"При включении этого параметра, прокси-сервер для запросов HTTP, указанный "
+"справа (по умолчанию он берётся из переменной окружения http_proxy), будет "
+"использован для любого запроса по протоколу HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Укажите адрес прокси-сервера для запросов HTTP, используемых при работе с S/"
+"MIME в виде сервер:порт. Например, myproxy.nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Не посылать запросы HTTP в центры распространения CRL сертификатов"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"При определении расположения списка аннулирования сертификатов (CRL) "
+"существуют так называемые \"центры распространения CRL\" (CRL Distribution "
+"Point, DP), которые являются ссылками, направляющими на реальные адреса CRL. "
+"Будет использована первая найденная ссылка DP. При включении этого параметра "
+"запросы HTTP в центры распространения CRL сертификатов посылаться не будут."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Запросы LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Не использовать LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Полностью отключить использование LDAP для S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Не посылать запросы LDAP в центры распространения CRL сертификатов"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"При определении расположения списка аннулирования сертификатов (CRL) "
+"существуют так называемые \"центры распространения CRL\" (CRL Distribution "
+"Point, DP), которые являются ссылками, направляющими на реальные адреса CRL. "
+"Будет использована первая найденная ссылка DP. При включении этого параметра "
+"запросы LDAP в центры распространения CRL сертификатов посылаться не будут."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Основной сервер LDAP:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"При указании сервера LDAP все запросы будут направляться на него. Этот "
+"параметр будет использован, если невозможно определить адрес сервера и порт "
+"из ссылки на сервер LDAP. Другие сервера LDAP будут использованы при "
+"невозможности соединения через прокси-сервер.\n"
+"Вы можете указать адрес сервера в виде \"адрес_сервера\" или \"адрес_сервера:"
+"порт\". Если порт не указан, подразумевается стандартный порт LDAP 389."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Добавить фразу"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Добавить"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Фраза:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Группа:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Настройка фраз"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Подсказки"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Показывать текст фразы во всплывающей &подсказке"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "Показывать текст фразы во всплывающей подсказке"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Поля"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Метод заполнения полей"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Отдельный диалог для каждого поля во фразе"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "Отдельный диалог для каждого поля во фразе"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Один диалог для всех полей во фразе"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr "Один диалог для задания значений всех полей во фразе"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Разделитель:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "ПараметрыШаблонов"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Ответ отправителю"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Ответ всем"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Пересылка"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "&Предупреждать при отправке неподписанного сообщения"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Вывод предупреждения о попытке отправки неподписанных сообщений."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать при отправке неподписанного сообщения</h1>\n"
+"Если включен этот параметр, при попытке отправки неподписанного сообщения "
+"или частей сообщения будет выводиться предупреждение.\n"
+"<p>\n"
+"Для максимальной надёжности рекомендуется включить этот параметр.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Предупреждать при отправке незашифрованного сообщения"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Показ предупреждения при отправке незашифрованных сообщений."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать при попытке отправки незашифрованного сообщения</h1>\n"
+"Если установлен этот параметр, вы будете предупреждены о попытках\n"
+"отправить сообщение или его часть в незашифрованном виде.\n"
+"<p>\n"
+"Рекомендуется для максимальной целостности иметь этот параметр включенным.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Предупреждать, если адреса получателя &нет в сертификате"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Предупреждать, если адрес отсутствует в сертификате"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать, если в сертификате отсутствует адрес получателя</h1>\n"
+"Если установлен этот параметр, выводится предупреждение в случае,\n"
+"когда адрес получателя отсутствует в используемом для подписи\n"
+"сертификате.\n"
+"<p>\n"
+"Для максимальной безопасности рекомендуется держать этот параметр.\n"
+"включенным.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Предупреждать о скором истечении срока действия сертификатов и ключей"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Для подписи"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Для шифрования"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Укажите количество дней"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать об истечении срока действия сертификата подписи</h1>\n"
+"Укажите количество дней до окончания срока действия сертификата, за которое "
+"должно выводиться предупреждение.\n"
+"<p>\n"
+"Рекомендуемое SPHINX значение - 14 дней.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать, если срок действия сертификата шифрования истекает</h1>\n"
+"Установите минимальное количество дней, в течении которых сертификат будет "
+"действительным без вывода предупреждения.\n"
+"<p>\n"
+"Рекомендуемое SPHINX значение - 14 дней.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать, если срок действия сертификата в цепочке истекает</h1>\n"
+"Выберите минимальное количество дней, в течении которых все сертификаты\n"
+"должны быть действительны без вывода предупреждения.\n"
+"<p>\n"
+"Рекомендуемый параметр SPHINX 14 дней.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать об истечении срока действия сертификата CA</h1>\n"
+"Укажите количество дней до окончания срока действия сертификата CA, за "
+"которое должно выводиться предупреждение.\n"
+"<p>\n"
+"Рекомендуемое SPHINX значение - 14 дней.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Предупреждать об истечении срока действия корневого сертификата</h1>\n"
+"Укажите количество дней до окончания срока действия корневого сертификата, "
+"за которое должно выводиться предупреждение.\n"
+"<p>\n"
+"Рекомендуемое SPHINX значение - 14 дней.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Для корневых сертификатов:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Для сертификатов промежуточных СА:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Для пользовательских сертификатов или ключей:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Включить все отключенные предупреждения"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...что можно перемещаться по списку сообщений с помощью стрелок вправо и "
+"влево?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...что можно быстро создавать фильтры по получателю,\n"
+"отправителю, теме и спискам рассылки при помощи <em>Сервис->Создать&nbsp;"
+"фильтр</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...что можно избавиться от &quot;[имени списка рассылки]&quot;,\n"
+"добавляемого в тему некоторых списков рассылки, используя\n"
+"фильтр <em>rewrite header</em>? Просто используйте\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[имя списка рассылки\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...что можно связать списки рассылки с папками в\n"
+"диалоге <em>Папка-&gt;Список рассылки...</em>? После этого можно \n"
+"воспользоваться пунктом меню <em>Сообщение-&gt;Отправить&nbsp;в&nbsp;"
+"список&nbsp;рассылки...</em>,\n"
+"чтобы открыть редактор с адресом списка рассылки.\n"
+"То же самое произойдёт, если вы щёлкните средней кнопкой мыши на папке.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...что можно назначить свои значки каждой папке?\n"
+"Смотрите <em>Папка-&gt;Свойства...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...что KMail может показывать цветную полосу, соответствующую типу "
+"текущего сообщения (Обычный текст/HTML/OpenPGP)?</p>\n"
+"<p>это срывает различные попытки фальсифицировать успешную проверку подписи, "
+"когда почта HTML маскируется под формат подписей KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...что можно отфильтровать любой заголовок, просто введя имя заголовка\n"
+"в первое поле правила поиска?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...что можно отфильтровать сообщения в чистом HTML с помощью правила\n"
+"<pre>&quot;Content-type&quot; содержит &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...что при ответе цитируется только выделенный текст сообщения?</p>\n"
+"<p>Если ничего не выделено, цитируется всё сообщение.</p>\n"
+"<p>Это также работает если вы включили\n"
+"<em>Вид-&gt;Вложения-&gt;В тексте</em>.</p>\n"
+"<p align=\"right\"><em>прислал David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Показать поле быстрого поиска"
diff --git a/tde-i18n-rw/messages/tdepim/kmail.po b/tde-i18n-rw/messages/tdepim/kmail.po
index c8b03ea6fbf..e8d8729d9cc 100644
--- a/tde-i18n-rw/messages/tdepim/kmail.po
+++ b/tde-i18n-rw/messages/tdepim/kmail.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 3.4\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2005-05-25 18:51-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -32,7 +32,7 @@ msgstr ""
 "Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
 "NSENGIYUMVA"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -204,6 +204,12 @@ msgstr "( Koresha Na: ) "
 msgid "Account for semiautomatic resource handling"
 msgstr "ya:  Bidahita byikoresha Ibikorana: "
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Inzira y'Urwego"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 #, fuzzy
@@ -291,9 +297,9 @@ msgstr "Kwinjira:"
 #: accountdialog.cpp:596 accountdialog.cpp:866
 #, fuzzy
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "A <em> Umukoresha Izina: </em> ni Byakoreshejwe Kuri Na: Amaseriveri . ni i "
 "Itangira Inzira %s Bya Imeli Aderesi: ( i Inzira %s Mbere <em> @ </em> ) . "
@@ -321,12 +327,12 @@ msgstr "Ijambobanga "
 #, fuzzy
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "iyi Ihitamo Kuri i Ijambobanga . \n"
 "ni Bihari i Ijambobanga ni . \n"
@@ -365,11 +371,12 @@ msgstr "Ubutumwa NIBA Biruta "
 #: accountdialog.cpp:726
 #, fuzzy
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Guhitamo iyi Ihitamo , Byakoreshejwe Kuri Kuri Na: Ubutumwa . Hanyuma Guhitamo "
-"Kuri Iyimura , Gusiba Cyangwa Gumana: ku i Seriveri: . "
+"Guhitamo iyi Ihitamo , Byakoreshejwe Kuri Kuri Na: Ubutumwa . Hanyuma "
+"Guhitamo Kuri Iyimura , Gusiba Cyangwa Gumana: ku i Seriveri: . "
 
 #: accountdialog.cpp:737
 #, fuzzy
@@ -428,13 +435,15 @@ msgstr "Umwandiko "
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 #, fuzzy
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "Ifashayinjira"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr ""
 
@@ -482,12 +491,13 @@ msgstr "Imyanyazina"
 #, fuzzy
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "i Imyanyazina Seriveri: . A Imbanziriza Amatsinda Bya Ububiko . Emera ya:  "
-"Urugero: Kuri Kugaragaza: Bwite Ububiko na Bisangiwe Ububiko in Rimwe Konti: . "
+"Urugero: Kuri Kugaragaza: Bwite Ububiko na Bisangiwe Ububiko in Rimwe "
+"Konti: . "
 
 #: accountdialog.cpp:914
 #, fuzzy
@@ -557,9 +567,9 @@ msgstr "Imigereka: ku "
 #: accountdialog.cpp:1001
 #, fuzzy
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "iyi Kuri Ibirimo Imigereka: OYA mu buryo bwikora: Ryari: Guhitamo i Imeli "
 "Ryari: Kanda ku i Umugereka . . "
@@ -575,8 +585,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Ububiko Gufungura ( Cyagutse ) in i Ububiko... &Igiti Ivivuwe ya:  . iyi NIBA "
-"Ububiko ku i Seriveri: . "
+"Ububiko Gufungura ( Cyagutse ) in i Ububiko... &Igiti Ivivuwe ya:  . iyi "
+"NIBA Ububiko ku i Seriveri: . "
 
 #: accountdialog.cpp:1044
 #, fuzzy
@@ -608,7 +618,7 @@ msgstr "<tacyo>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 #, fuzzy
 msgid "inbox"
 msgstr "Agasanduku k'Ibyinjiye"
@@ -618,8 +628,8 @@ msgstr "Agasanduku k'Ibyinjiye"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Seriveri: OYA Kuri Gushigikira Cyo nyine &Ubutumwa Imibare , iyi ni A ya:  "
 "Ubutumwa ku i Seriveri: . \n"
@@ -630,8 +640,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Seriveri: OYA Kuri Gushigikira &Ubutumwa Imitwe , iyi ni A ya:  Iyungurura "
 "Ubutumwa ku i Seriveri: . \n"
@@ -640,20 +650,22 @@ msgstr ""
 #: accountdialog.cpp:1485
 #, fuzzy
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Impugukirwa iyi Ikiranga Amaseriveri OYA Gushigikira Kuri Kohereza Ibaruwa ; \n"
+"Impugukirwa iyi Ikiranga Amaseriveri OYA Gushigikira Kuri Kohereza "
+"Ibaruwa ; \n"
 "iyi ni , , Amaseriveri Gushigikira OYA . Kugenzura Seriveri: Gushigikira "
 "Koresha i \" i \" Akabuto Ku i Hasi: Bya i Ikiganiro ; \n"
-"NIBA Seriveri: OYA , Birenzeho Umuvuduko , Hanyuma Igerageza, ... Itangira ku A "
-"Bya Ibaruwa na Iyimura . "
+"NIBA Seriveri: OYA , Birenzeho Umuvuduko , Hanyuma Igerageza, ... Itangira "
+"ku A Bya Ibaruwa na Iyimura . "
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 #, fuzzy
@@ -663,14 +675,14 @@ msgstr "Kugaragaza A Seriveri: na Umuyoboro: ku i tab Itangira . "
 #: accountdialog.cpp:1640
 #, fuzzy
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Seriveri: OYA Kuri Gushigikira ; , iyi Ihitamo Yahagaritswe . \n"
 "Amaseriveri OYA i Kuri ku . Impugukirwa iyi Ikiranga Amaseriveri OYA "
@@ -682,10 +694,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Seriveri: OYA Kuri Gushigikira Cyo nyine &Ubutumwa Imibare , iyi ni A ya:  "
 "Ubutumwa ku i Seriveri: ; , iyi Ihitamo Yahagaritswe . \n"
@@ -697,8 +709,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Seriveri: OYA Kuri Gushigikira &Ubutumwa Imitwe , iyi ni A ya:  Iyungurura "
 "Ubutumwa ku i Seriveri: ; , iyi Ihitamo Yahagaritswe . \n"
@@ -786,8 +798,8 @@ msgstr "Aderesi ya IMAP"
 #: accountmanager.cpp:343
 #, fuzzy
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Kuri &Ongera Konti: in i urusobe Icyiciro Bya i Igenamiterere in Itondekanya "
 "Kuri Akira Ibaruwa . "
@@ -833,9 +845,9 @@ msgstr "Kuri "
 #: accountwizard.cpp:195
 #, fuzzy
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt> Yatangiye: ya:  i Itangira Igihe . Koresha iyi Kuri Imikorere Ibaruwa "
 "Konti . Injiza i Ukwihuza Ibyatanzwe BYAKIRIWE Kuva: Imeli i Amapaji . </qt> "
@@ -908,8 +920,7 @@ msgstr "Bya hafi "
 msgid "Server Information"
 msgstr "Amakuru ya seriveri"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nta na kimwe"
@@ -1072,26 +1083,23 @@ msgstr ""
 #: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p> Kubona in Igenamiterere Hejuru Akayunguruzo: Kuri Koresha - - Ibikoresho . "
-"</p> "
-"<p> &Gutahura Ibikoresho ku Nka Nka Kurema Akayunguruzo: Kuri Ubutumwa ikoresha "
-"Ibikoresho na Kuri Ubutumwa . OYA Icyo ari cyo cyose Akayunguruzo: : Buri gihe "
-"Kongeraho... i Gishya . </p> "
-"<p> <b> : </b> Kuri i Gusikana Bya i Ubutumwa ya:  , Gicurasi Na: i Bya - "
-"Ibikorwa: Igihe ; Gusiba i Akayunguruzo: Byaremwe ku i Kuri Kubona Inyuma Kuri "
-"i &Imyifatire . "
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p> Kubona in Igenamiterere Hejuru Akayunguruzo: Kuri Koresha - - "
+"Ibikoresho . </p> <p> &Gutahura Ibikoresho ku Nka Nka Kurema Akayunguruzo: "
+"Kuri Ubutumwa ikoresha Ibikoresho na Kuri Ubutumwa . OYA Icyo ari cyo cyose "
+"Akayunguruzo: : Buri gihe Kongeraho... i Gishya . </p> <p> <b> : </b> Kuri i "
+"Gusikana Bya i Ubutumwa ya:  , Gicurasi Na: i Bya - Ibikorwa: Igihe ; Gusiba "
+"i Akayunguruzo: Byaremwe ku i Kuri Kubona Inyuma Kuri i &Imyifatire . "
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -1099,8 +1107,8 @@ msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p> Guhitamo i Ibikoresho Kuri Byakoreshejwe ya:  i na Gyayo Kuri i Ibikurikira "
-"> Ipaji: . "
+"<p> Guhitamo i Ibikoresho Kuri Byakoreshejwe ya:  i na Gyayo Kuri i "
+"Ibikurikira > Ipaji: . "
 
 #: antispamwizard.cpp:945
 #, fuzzy
@@ -1134,15 +1142,13 @@ msgstr "Kuri : "
 #: antispamwizard.cpp:968
 #, fuzzy
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Mburabuzi Ububiko... ni i Agasanduku k'Ibyinjiye Ububiko... , Gicurasi "
-"Guhindura... in i Ububiko... Reba munsi . "
-"<p> Byose Ibikoresho Gushigikira A Itondekanya: Nka . Byahiswemo A , Guhitamo A "
-"Ububiko... Nka . "
+"Guhindura... in i Ububiko... Reba munsi . <p> Byose Ibikoresho Gushigikira A "
+"Itondekanya: Nka . Byahiswemo A , Guhitamo A Ububiko... Nka . "
 
 #: antispamwizard.cpp:1068
 #, fuzzy
@@ -1154,12 +1160,12 @@ msgstr "Ubutumwa ikoresha i - Ibikoresho "
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"i - Ibikoresho Kugenzura Ubutumwa . Kurema Muyunguruzi . Ubutumwa cy/byagarajwe "
-"ku i Ibikoresho Muyunguruzi ku iyi na , ya:  Urugero: , Himura Ubutumwa Kuri A "
-"Bidasanzwe Ububiko... . "
+"i - Ibikoresho Kugenzura Ubutumwa . Kurema Muyunguruzi . Ubutumwa cy/"
+"byagarajwe ku i Ibikoresho Muyunguruzi ku iyi na , ya:  Urugero: , Himura "
+"Ubutumwa Kuri A Bidasanzwe Ububiko... . "
 
 #: antispamwizard.cpp:1076
 #, fuzzy
@@ -1170,8 +1176,8 @@ msgstr "Ubutumwa Kuri i Byahiswemo Ububiko... "
 #, fuzzy
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "A Akayunguruzo: Kuri &Gutahura Ubutumwa Bitondetswe Nka - na Kuri Himura "
 "Ubutumwa A Ububiko... ni Byaremwe . Mburabuzi Ububiko... ni i Agatebo "
@@ -1185,8 +1191,8 @@ msgstr ", Ikimenyetso Ubutumwa Nka Soma "
 #: antispamwizard.cpp:1087
 #, fuzzy
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Ubutumwa Bitondetswe Nka - Nka Soma , Nka Nka Kwimura Kuri i Byahiswemo "
 "Ububiko... . "
@@ -1372,8 +1378,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"OYA Kuri iyi , Cyangwa i Ububiko... ni ku i Seriveri: ; i Ikosa &Ubutumwa Kuva: "
-"i Seriveri: Itumanaho ni : "
+"OYA Kuri iyi , Cyangwa i Ububiko... ni ku i Seriveri: ; i Ikosa &Ubutumwa "
+"Kuva: i Seriveri: Itumanaho ni : "
 
 #: cachedimapjob.cpp:629
 #, fuzzy
@@ -1388,8 +1394,8 @@ msgstr "Ikosa Ububiko... %1 ku i Seriveri: : "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1409,8 +1415,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1441,21 +1447,21 @@ msgstr "Byasibwe"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt> Bya BIHUYE i Mwakirizi Bya iyi &Ubutumwa , "
-"<br> Hitamo... Bya i Amaderesi ni : "
+"<qt> Bya BIHUYE i Mwakirizi Bya iyi &Ubutumwa , <br> Hitamo... Bya i "
+"Amaderesi ni : "
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt> Bya BIHUYE i Mwakirizi Bya iyi &Ubutumwa , "
-"<br> Hitamo... Bya i Amaderesi ni : "
+"<qt> Bya BIHUYE i Mwakirizi Bya iyi &Ubutumwa , <br> Hitamo... Bya i "
+"Amaderesi ni : "
 
 #: callback.cpp:233
 #, fuzzy
@@ -1490,19 +1496,22 @@ msgstr "Ikosa \" %1 \" . Byahagaritswe . "
 #: configuredialog.cpp:156
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Igenamiterere BIHAMYE ku umuyobozi/uyobora . </p> "
-"<p> iyi ni Ikosa , Umuntu . </p> "
+"<qt> <p> Igenamiterere BIHAMYE ku umuyobozi/uyobora . </p> <p> iyi ni "
+"Ikosa , Umuntu . </p> "
 
 #: configuredialog.cpp:218
 #, fuzzy
 msgid "&Load Profile..."
 msgstr "Ibijyana Bishya..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Kuboneza Imeli..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Ongeraho"
@@ -1534,6 +1543,11 @@ msgstr "<qt> Kuri Gukuraho i Ikiranga &Cyitwa: <b> %1 </b> ? </qt> "
 msgid "Remove Identity"
 msgstr "Vanaho Umwinjizo"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Vanaho"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ongera..."
@@ -1542,6 +1556,11 @@ msgstr "Ongera..."
 msgid "Modify..."
 msgstr "Guhindura..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Vanaho"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Shyiraho nka Mburabuzi."
@@ -1561,17 +1580,15 @@ msgstr "ikijyejuru"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Konti ( &Ongera Ku Rimwe ) : "
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Izina"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Ubwoko"
@@ -1596,8 +1613,7 @@ msgstr "Shyiraho mburabuzi"
 msgid "Common Options"
 msgstr "Uburyo bwo Guteranya"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, fuzzy, no-c-format
 msgid "Confirm &before send"
 msgstr "Mbere Kohereza "
@@ -1659,18 +1675,17 @@ msgstr "Urubuga: : "
 #: configuredialog.cpp:720
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Mburabuzi Urubuga: ni Byakoreshejwe Kuri Byuzuye Imeli Amaderesi Bya i "
-"Izina: . </p> "
+"<qt> <p> Mburabuzi Urubuga: ni Byakoreshejwe Kuri Byuzuye Imeli Amaderesi "
+"Bya i Izina: . </p> "
 
 #: configuredialog.cpp:744
 #, fuzzy
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1%2"
 
@@ -1692,9 +1707,9 @@ msgstr "Bibonerana"
 #: configuredialog.cpp:832
 #, fuzzy
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1(Mburabuzi)"
 
@@ -1791,6 +1806,10 @@ msgstr "hindura imigaragarire"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt> Kuri Konti: <b> %1 </b> . </qt> "
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 #, fuzzy
 msgid "Color&s"
@@ -1920,8 +1939,7 @@ msgstr "Ihuza Rikurikiwe"
 msgid "Misspelled Words"
 msgstr "Amagambo yanditswe nabi:"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "Ubutumwa Bushya..."
@@ -2144,11 +2162,11 @@ msgstr "Mburabuzi Kuri "
 #: configuredialog.cpp:2045
 #, fuzzy
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Gufungura Igikorwa Gishya , Bidasomye: %S Cyangwa By'ingirakamaro Ubutumwa na "
-"Gufungura Igikorwa . "
+"Gufungura Igikorwa Gishya , Bidasomye: %S Cyangwa By'ingirakamaro Ubutumwa "
+"na Gufungura Igikorwa . "
 
 #: configuredialog.cpp:2055
 #, fuzzy
@@ -2158,70 +2176,54 @@ msgstr "Gusiba Iyerekana"
 #: configuredialog.cpp:2072
 #, fuzzy
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt> "
-"<p> <strong> Gicurasi Byakoreshejwe ya:  i Itariki: : </strong> </p> "
-"<ul> "
-"<li> d - i &Umunsi Nka A Umubare A Nyobora Zeru ( 1 - ) </li> "
-"<li> DD - i &Umunsi Nka A Umubare Na: A Nyobora Zeru ( 01 - ) </li> "
-"<li> - i &Umunsi Izina: ( - ) </li> "
-"<li> - i Birebire &Umunsi Izina: ( - ) </li> "
-"<li> - i ukwezi: Nka A Umubare A Nyobora Zeru ( 1 - 12 ) </li> "
-"<li> MM - i ukwezi: Nka A Umubare Na: A Nyobora Zeru ( 01 - 12 ) </li> "
-"<li> - i ukwezi: Izina: ( - ) </li> "
-"<li> - i Birebire ukwezi: Izina: ( - ) </li> "
-"<li> YY - i umwaka: Nka A Kabiri Umubarwa Umubare ( - ) </li> "
-"<li> YYYY - i umwaka: Nka A Umubarwa Umubare ( - ) </li> </ul> "
-"<p> <strong> Gicurasi Byakoreshejwe ya:  i Igihe : < /Ikurikiranyanyuguti > </p> "
-"<ul> "
-"<li> h - i ISAHA A Nyobora Zeru ( 0 %S - Cyangwa 1 - 12 NIBA /Kugaragaza: ) "
-"</li> "
-"<li> HH - i ISAHA Na: A Nyobora Zeru ( - Cyangwa 01 - 12 NIBA /Kugaragaza: ) "
-"</li> "
-"<li> M - i iminota A Nyobora Zeru ( 0 %S - ) </li> "
-"<li> mm - i iminota Na: A Nyobora Zeru ( - ) </li> "
-"<li> S - i amasogonda A Nyobora Zeru ( 0 %S - ) </li> "
-"<li> SS - i amasogonda Na: A Nyobora Zeru ( - ) </li> "
-"<li> z - i Nyobora ( 0 %S - ) </li> "
-"<li> - i Na: Nyobora ( 000 - ) </li> "
-"<li> - Hindura Kuri /Kugaragaza: . ku \" \" Cyangwa \" \" . </li> "
-"<li> - Hindura Kuri /Kugaragaza: . ku \" am \" Cyangwa \" pm \" . </li> "
-"<li> - Igihe in Bikurikije umubare Ifishi %S: ( - ) </li> </ul> "
-"<p> <strong> Ikindi Iyinjiza Inyuguti . </strong> </p> </qt> "
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt> <p> <strong> Gicurasi Byakoreshejwe ya:  i Itariki: : </strong> </p> "
+"<ul> <li> d - i &Umunsi Nka A Umubare A Nyobora Zeru ( 1 - ) </li> <li> DD - "
+"i &Umunsi Nka A Umubare Na: A Nyobora Zeru ( 01 - ) </li> <li> - i &Umunsi "
+"Izina: ( - ) </li> <li> - i Birebire &Umunsi Izina: ( - ) </li> <li> - i "
+"ukwezi: Nka A Umubare A Nyobora Zeru ( 1 - 12 ) </li> <li> MM - i ukwezi: "
+"Nka A Umubare Na: A Nyobora Zeru ( 01 - 12 ) </li> <li> - i ukwezi: Izina: "
+"( - ) </li> <li> - i Birebire ukwezi: Izina: ( - ) </li> <li> YY - i umwaka: "
+"Nka A Kabiri Umubarwa Umubare ( - ) </li> <li> YYYY - i umwaka: Nka A "
+"Umubarwa Umubare ( - ) </li> </ul> <p> <strong> Gicurasi Byakoreshejwe ya:  "
+"i Igihe : < /Ikurikiranyanyuguti > </p> <ul> <li> h - i ISAHA A Nyobora Zeru "
+"( 0 %S - Cyangwa 1 - 12 NIBA /Kugaragaza: ) </li> <li> HH - i ISAHA Na: A "
+"Nyobora Zeru ( - Cyangwa 01 - 12 NIBA /Kugaragaza: ) </li> <li> M - i "
+"iminota A Nyobora Zeru ( 0 %S - ) </li> <li> mm - i iminota Na: A Nyobora "
+"Zeru ( - ) </li> <li> S - i amasogonda A Nyobora Zeru ( 0 %S - ) </li> <li> "
+"SS - i amasogonda Na: A Nyobora Zeru ( - ) </li> <li> z - i Nyobora ( 0 %S "
+"- ) </li> <li> - i Na: Nyobora ( 000 - ) </li> <li> - Hindura Kuri /"
+"Kugaragaza: . ku \" \" Cyangwa \" \" . </li> <li> - Hindura Kuri /"
+"Kugaragaza: . ku \" am \" Cyangwa \" pm \" . </li> <li> - Igihe in "
+"Bikurikije umubare Ifishi %S: ( - ) </li> </ul> <p> <strong> Ikindi Iyinjiza "
+"Inyuguti . </strong> </p> </qt> "
 
 #: configuredialog.cpp:2185
 #, fuzzy
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "i &Rusange Igenamiterere Byose Ububiko... Uduciro . "
 
 #: configuredialog.cpp:2221
@@ -2238,8 +2240,7 @@ msgstr "Imimerere Umurongo "
 msgid "Show s&pam status in fancy headers"
 msgstr "Imimerere in Imitwe "
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, fuzzy, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "ku Amarangamutima "
@@ -2249,8 +2250,7 @@ msgstr "ku Amarangamutima "
 msgid "Use smaller font for quoted text"
 msgstr "Gitoya Imyandikire ya:  Umwandiko "
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, fuzzy, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Kwagura /Gusenyuka Gushyiraho akugarizo "
@@ -2278,8 +2278,7 @@ msgstr "mwi-/nyamwi-"
 msgid "&Override character encoding:"
 msgstr "Inyuguti: Imisobekere: : "
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "Sisitemu Agasanduku Agashushondanga "
@@ -2393,22 +2392,19 @@ msgstr "<b> %f </b> Na: i Izina ry'idosiye: Kuri Kwandika . "
 #: configuredialog.cpp:2930
 #, fuzzy
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
-"<qt> Uturindamwanya in i Subiza : "
-"<br> <b> %D </b> : Itariki: , <b> %S </b> : Ikivugwaho: , "
-"<br> <b> %e </b> : Aderesi: , <b> %F </b> : Izina: , <b> %f </b> : Izibanza , "
-"<br> <b> %T </b> : Izina: , <b> %t </b> : Izina: na Aderesi: , "
-"<br> <b> %C </b> : Gukoporora Amazina , <b> %c </b> : Gukoporora Amazina na "
-"Amaderesi , "
-"<br> <b> % % </b> : ku ijana Shyiraho Umukono , <b> % _ </b> : Umwanya , <b> "
-"%L </b> : </qt> "
+"<qt> Uturindamwanya in i Subiza : <br> <b> %D </b> : Itariki: , <b> %S </"
+"b> : Ikivugwaho: , <br> <b> %e </b> : Aderesi: , <b> %F </b> : Izina: , <b> "
+"%f </b> : Izibanza , <br> <b> %T </b> : Izina: , <b> %t </b> : Izina: na "
+"Aderesi: , <br> <b> %C </b> : Gukoporora Amazina , <b> %c </b> : Gukoporora "
+"Amazina na Amaderesi , <br> <b> % % </b> : ku ijana Shyiraho Umukono , <b> % "
+"_ </b> : Umwanya , <b> %L </b> : </qt> "
 
 #: configuredialog.cpp:2943
 #, fuzzy
@@ -2436,21 +2432,20 @@ msgstr "Gusubiza Bose"
 msgid "&Forward:"
 msgstr "Imbere"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, fuzzy, no-c-format
 msgid "&Quote indicator:"
 msgstr "Ikiranga impugukirwa"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Kohereza Ubutumwa"
@@ -2494,8 +2489,8 @@ msgstr "Gishya Imbere Imbanziriza : "
 #: configuredialog.cpp:3269
 #, fuzzy
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Urutonde ni Ivivuwe ya:  buri &Ubutumwa Kuva: i Hejuru: Kuri i Hasi: ya:  A "
 "KubonezaInyuguti: ifite Byose Bya ngombwa Inyuguti . "
@@ -2538,10 +2533,9 @@ msgstr "Agaciro"
 msgid "Ne&w"
 msgstr "Bishya"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "Izina:"
@@ -2550,8 +2544,7 @@ msgstr "Izina:"
 msgid "&Value:"
 msgstr "Agaciro:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, fuzzy, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "- Umugereka "
@@ -2559,8 +2552,8 @@ msgstr "- Umugereka "
 #: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr "iyi Ihitamo ku Kuri Ubwoko ( ) Umugereka Amazina - Inyuguti "
 
 #: configuredialog.cpp:3595
@@ -2594,13 +2587,13 @@ msgstr "gereka"
 #: configuredialog.cpp:3655
 #, fuzzy
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Kuri Umugereka Amazina - Inyuguti in A ni ku ( ) na Ikindi Ibaruwa OYA "
 "Gushigikira Bisanzwe - Umugereka Amazina . \n"
@@ -2634,84 +2627,73 @@ msgstr "Impera y'inyuma"
 #: configuredialog.cpp:3737
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> in Byombi Imiterere . Ihitamo Amagenzura i Inzira %s Cyangwa i Byuzuye "
-"Umwandiko Inzira %s Kuri . </p> "
-"<p> i Inzira %s i &Ubutumwa Kureba , Ku i Igihe i Bya Umutekano . </p> "
-"<p> i Byuzuye Umwandiko Inzira %s Bya i Ihinduramiterere , <em> </em> "
-"Kuri Umutekano in i Utanga ( ) . </p> "
-"<p> Ihitamo munsi Rimwe Bya Ubutumwa , Umutekano OYA Ku i Igihe iyi Verisiyo "
-"Bya . </p> "
-"<p> ni Kuri <em> OYA </em> Kuri Byuzuye Umwandiko . </p> "
-"<p> <b> icyitonderwa : </b> Gushyiraho iyi Ihitamo ku A - Ububiko... Ishingiro "
-"Kuva: i <i> </i> Ibikubiyemo Bya Idirishya . </p> </qt> "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt> <p> in Byombi Imiterere . Ihitamo Amagenzura i Inzira %s Cyangwa i "
+"Byuzuye Umwandiko Inzira %s Kuri . </p> <p> i Inzira %s i &Ubutumwa Kureba , "
+"Ku i Igihe i Bya Umutekano . </p> <p> i Byuzuye Umwandiko Inzira %s Bya i "
+"Ihinduramiterere , <em> </em> Kuri Umutekano in i Utanga ( ) . </p> <p> "
+"Ihitamo munsi Rimwe Bya Ubutumwa , Umutekano OYA Ku i Igihe iyi Verisiyo "
+"Bya . </p> <p> ni Kuri <em> OYA </em> Kuri Byuzuye Umwandiko . </p> <p> <b> "
+"icyitonderwa : </b> Gushyiraho iyi Ihitamo ku A - Ububiko... Ishingiro Kuva: "
+"i <i> </i> Ibikubiyemo Bya Idirishya . </p> </qt> "
 
 #: configuredialog.cpp:3754
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Ibaruwa in na Indango Kuri , ya:  Urugero: , Ishusho i Kuri Gushaka Inyuma "
-"Soma &Ubutumwa ( &quot; Urubuga ; ) . </p> "
-"<p> ni Oya Byemewe Impamvu Kuri Ibirimo Ishusho Bidakora i nka iyi , guhera i "
-"Uwohereza Buri gihe Kugerekaho i Bya ngombwa Ishusho Kuri i &Ubutumwa . </p> "
-"<p> Kuva: A Bya i Ikiranga Bya , iyi Ihitamo ni <em> Yahagaritswe </em> "
-"ku Mburabuzi . </p> "
-"<p> , NIBA Kuri , ya:  Urugero: , Reba Ishusho in Ubutumwa OYA Kuri , Gushoboza "
-"iyi Ihitamo , Bya i . </p> </qt> "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt> <p> Ibaruwa in na Indango Kuri , ya:  Urugero: , Ishusho i Kuri Gushaka "
+"Inyuma Soma &Ubutumwa ( &quot; Urubuga ; ) . </p> <p> ni Oya Byemewe Impamvu "
+"Kuri Ibirimo Ishusho Bidakora i nka iyi , guhera i Uwohereza Buri gihe "
+"Kugerekaho i Bya ngombwa Ishusho Kuri i &Ubutumwa . </p> <p> Kuva: A Bya i "
+"Ikiranga Bya , iyi Ihitamo ni <em> Yahagaritswe </em> ku Mburabuzi . </p> "
+"<p> , NIBA Kuri , ya:  Urugero: , Reba Ishusho in Ubutumwa OYA Kuri , "
+"Gushoboza iyi Ihitamo , Bya i . </p> </qt> "
 
 #: configuredialog.cpp:3767
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr "<qt><h3>e. G. Yongeye kwoherezwa. G."
 
 #: configuredialog.cpp:3800
@@ -2732,14 +2714,14 @@ msgstr "Ubutumwa Kuri Ibirimo external Indango Kuva: i "
 #: configuredialog.cpp:3812
 #, fuzzy
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b> : </b> in Imeli Gicurasi Kwongeraho i Sisitemu ku na Umutekano . <a "
-"href=\"whatsthis:%1\"> Bigyanye ... </a> <a href=\"whatsthis:%2\"> "
-"Bigyanye external Indango ... </a> "
+"<b> : </b> in Imeli Gicurasi Kwongeraho i Sisitemu ku na Umutekano . <a href="
+"\"whatsthis:%1\"> Bigyanye ... </a> <a href=\"whatsthis:%2\"> Bigyanye "
+"external Indango ... </a> "
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2832,8 +2814,7 @@ msgstr "i &Rusange Igenamiterere Byose Ububiko... Uduciro . "
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "9."
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, fuzzy, no-c-format
 msgid "no proxy"
 msgstr "Nta nyabubasha"
@@ -2868,8 +2849,8 @@ msgstr "By'ingirakamaro Ubutumwa Kuva: "
 #: configuredialog.cpp:4580
 #, fuzzy
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Kuri Gushaka Bidasomye: %S Ubutumwa : "
 
@@ -2897,8 +2878,8 @@ msgstr "in "
 #: configuredialog.cpp:4600
 #, fuzzy
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "A Ububiko... : "
 
@@ -2976,16 +2957,14 @@ msgstr "( \" \" Imiterere ) "
 #, fuzzy
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr "<qt><p>G. G."
 
 #: configuredialog.cpp:4679
@@ -3025,54 +3004,45 @@ msgstr ""
 #, fuzzy
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Kuri i Ibikurikira > Bidasomye: %S &Ubutumwa , Gicurasi Oya Birenzeho "
-"Bidasomye: %S Ubutumwa munsi i KIGEZWEHO &Ubutumwa . </p> "
-"<p> <b> OYA : </b> Shakisha Guhagarara Ku i Iheruka &Ubutumwa in i KIGEZWEHO "
-"Ububiko... . </p> "
-"<p> <b> in KIGEZWEHO Ububiko... : </b> Shakisha Gukomeza Ku i Hejuru: Bya i "
-"&Ubutumwa Urutonde , OYA Gyayo Kuri Ububiko... . </p> "
-"<p> <b> in Byose Ububiko : </b> Shakisha Gukomeza Ku i Hejuru: Bya i &Ubutumwa "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt> <p> Kuri i Ibikurikira > Bidasomye: %S &Ubutumwa , Gicurasi Oya "
+"Birenzeho Bidasomye: %S Ubutumwa munsi i KIGEZWEHO &Ubutumwa . </p> <p> <b> "
+"OYA : </b> Shakisha Guhagarara Ku i Iheruka &Ubutumwa in i KIGEZWEHO "
+"Ububiko... . </p> <p> <b> in KIGEZWEHO Ububiko... : </b> Shakisha Gukomeza "
+"Ku i Hejuru: Bya i &Ubutumwa Urutonde , OYA Gyayo Kuri Ububiko... . </p> <p> "
+"<b> in Byose Ububiko : </b> Shakisha Gukomeza Ku i Hejuru: Bya i &Ubutumwa "
 "Urutonde . Oya Bidasomye: %S Ubutumwa Byabonetse Hanyuma Gukomeza Kuri i "
-"Ibikurikira > Ububiko... . </p> "
-"<p> , Ryari: Gushakisha... ya:  i Ibanjirije Bidasomye: %S &Ubutumwa , i "
-"Shakisha Tangira &vendorShortName; Kuva: i Hasi: Bya i &Ubutumwa Urutonde na "
-"Gukomeza Kuri i Ibanjirije Ububiko... ku Ihitamo ni Byahiswemo . </p> </qt> "
+"Ibikurikira > Ububiko... . </p> <p> , Ryari: Gushakisha... ya:  i Ibanjirije "
+"Bidasomye: %S &Ubutumwa , i Shakisha Tangira &vendorShortName; Kuva: i Hasi: "
+"Bya i &Ubutumwa Urutonde na Gukomeza Kuri i Ibanjirije Ububiko... ku Ihitamo "
+"ni Byahiswemo . </p> </qt> "
 
 #: configuredialog.cpp:4735
 #, fuzzy
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Umwandiko gushyiraho umugereka Byihuta ku i Ibirimo: Bya Ubutumwa . Bikora "
-", i Shakisha Ikiganiro Akazi Byihuta . , i Shakisha Umurongo Guhitamo Ubutumwa "
-"ku Ibirimo: . </p> "
-"<p> Hejuru A Igiteranyo  Bya Disiki%1 Umwanya ( Bigyanye i Disiki%1 Umwanya ya: "
-" i Ubutumwa ) . </p> "
-"<p> , i Umubarendanga Kuri , Gukomeza Kuri Koresha iyi Igikorwa ni . </p> </qt> "
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt> <p> Umwandiko gushyiraho umugereka Byihuta ku i Ibirimo: Bya Ubutumwa . "
+"Bikora , i Shakisha Ikiganiro Akazi Byihuta . , i Shakisha Umurongo Guhitamo "
+"Ubutumwa ku Ibirimo: . </p> <p> Hejuru A Igiteranyo  Bya Disiki%1 Umwanya "
+"( Bigyanye i Disiki%1 Umwanya ya:  i Ubutumwa ) . </p> <p> , i Umubarendanga "
+"Kuri , Gukomeza Kuri Koresha iyi Igikorwa ni . </p> </qt> "
 
 #: configuredialog.cpp:4811
 #, fuzzy
@@ -3148,8 +3118,8 @@ msgstr "Ububiko "
 #: configuredialog.cpp:4902
 #, fuzzy
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "iyi ni Ivivuwe , OYA i Ibikorana: Ububiko in i Ububiko... &Igiti . "
 
 #: configuredialog.cpp:4909
@@ -3160,8 +3130,8 @@ msgstr "Ububiko in Konti: : "
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "iyi ni Ivivuwe , OYA i Ibikorana: Ububiko in i Ububiko... &Igiti . "
 
 #: configuredialog.cpp:4921
@@ -3220,19 +3190,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "- Umugereka "
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Isunika Ryikoresha"
@@ -3243,26 +3212,26 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"iyi ni ku , i Umukoresha OYA i Ibaruwa &Uhimba Idirishya . Yoherejwe: mu buryo "
-"bwikora: "
+"iyi ni ku , i Umukoresha OYA i Ibaruwa &Uhimba Idirishya . Yoherejwe: mu "
+"buryo bwikora: "
 
 #: configuredialog.cpp:4991
 #, fuzzy
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt> Yoherejwe: Nka Imigereka: Kuri A Ibaruwa . Hindura Amahinduka i Kuri "
 "Yoherejwe: in i Umwandiko Bya i Ibaruwa ; iyi ni Kuri Kohereza na Kuri . "
 "<br> , Ryari: iyi , Oya Kubona Umwandiko Ibaruwa Porogaramu Soma ; , Kuri "
-"Abantu Imeli Porogaramu OYA i , i Ubutumwa Kureba IGIHARWE . "
-"<br> Imeli Porogaramu Kuri Akazi Na: iyi . </qt> "
+"Abantu Imeli Porogaramu OYA i , i Ubutumwa Kureba IGIHARWE . <br> Imeli "
+"Porogaramu Kuri Akazi Na: iyi . </qt> "
 
 #: configuredialog.cpp:5048
 #, fuzzy
@@ -3386,17 +3355,16 @@ msgstr "Imbere"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3414,15 +3382,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3498,8 +3466,8 @@ msgstr "Ikiranga"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3777,6 +3745,11 @@ msgstr "Guhitamo Ububiko"
 msgid "Filters"
 msgstr "Akayunguruzo:"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Guhitamo Umwandiko"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3811,8 +3784,8 @@ msgstr "Akayunguruzo: "
 #: filterlogdlg.cpp:79
 #, fuzzy
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Kwinjira Bya Akayunguruzo: ku na Bidakora . , LOG Ibyatanzwe ni na Ryari: "
 "Kwinjira ni ku . "
@@ -3835,10 +3808,11 @@ msgstr "Akayunguruzo: "
 #: filterlogdlg.cpp:105
 #, fuzzy
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Igenzura i in i LOG i Bya i Akayunguruzo: Bya Byashyizweho Muyunguruzi : iyi "
 "Ihitamo Ivivuwe ya:  UMWE Akayunguruzo: ; , Bigyanye i Igisubizo Bya i Bya "
@@ -3866,14 +3840,14 @@ msgstr "bitagira imbibi"
 #: filterlogdlg.cpp:144
 #, fuzzy
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"LOG Ibyatanzwe Ububiko Kuri i LOG Ibyatanzwe ; i Kinini Igiteranyo  Bya Ububiko "
-"Kuri Byakoreshejwe : NIBA i Ingano: Bya i LOG Ibyatanzwe iyi Hanyuma i "
-"Ibyatanzwe &Kugeza i ni Oya . "
+"LOG Ibyatanzwe Ububiko Kuri i LOG Ibyatanzwe ; i Kinini Igiteranyo  Bya "
+"Ububiko Kuri Byakoreshejwe : NIBA i Ingano: Bya i LOG Ibyatanzwe iyi Hanyuma "
+"i Ibyatanzwe &Kugeza i ni Oya . "
 
 #: filterlogdlg.cpp:258
 #, fuzzy
@@ -3884,7 +3858,7 @@ msgstr ""
 "OYA Kwandika i Idosiye %1 : \n"
 "\" %2 \" ni i Ikosa Umwirondoro: . "
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 #, fuzzy
 msgid "KMail Error"
@@ -3933,13 +3907,13 @@ msgstr "Ikiranga : "
 #: folderdiaacltab.cpp:101
 #, fuzzy
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "ni i Ifashayinjira Bya i Umukoresha ku i Seriveri: . A Byoroheje Umukoresha "
-"Izina: Cyangwa i Cyuzuye Imeli Aderesi: Bya i Umukoresha ; i Ifashayinjira ya:  "
-"Konti: ku i Seriveri: Rimwe ni . "
+"Izina: Cyangwa i Cyuzuye Imeli Aderesi: Bya i Umukoresha ; i Ifashayinjira "
+"ya:  Konti: ku i Seriveri: Rimwe ni . "
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3996,8 +3970,8 @@ msgstr "OYA Soma /Kwandika Kuri Agatebo njyamwanda Ububiko... . "
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "OYA Kuva: Seriveri: , Koresha \" \" . "
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -4010,8 +3984,7 @@ msgstr "Ikosa : Oya Konti: ya:  iyi Ububiko... "
 msgid "Connecting to server %1, please wait..."
 msgstr "Kuri Seriveri: %1 , Tegereza ... "
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, fuzzy, c-format
 msgid "Error connecting to server %1"
 msgstr "Ikosa mu kwihuza kuri seriveri."
@@ -4041,8 +4014,8 @@ msgstr "Impushya zihanitse"
 #: folderdiaacltab.cpp:636
 #, fuzzy
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr "Kuri Gukuraho Uruhushya ya:  iyi Ububiko... ? OYA Kuri . "
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -4072,7 +4045,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Guhitamo Ububiko"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Ububiko bwo hafi"
@@ -4100,13 +4073,13 @@ msgstr "ya:  "
 #: foldershortcutdialog.cpp:65
 #, fuzzy
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt> Hitamo... A Urufunguzo Cyangwa A Ivanga Bya Utubuto Guhitamo i KIGEZWEHO "
-"Ububiko... , Kanda i Akabuto munsi na Hanyuma Kanda i Urufunguzo ( S ) Kuri Na: "
-"iyi Ububiko... . </qt> "
+"<qt> Hitamo... A Urufunguzo Cyangwa A Ivanga Bya Utubuto Guhitamo i "
+"KIGEZWEHO Ububiko... , Kanda i Akabuto munsi na Hanyuma Kanda i Urufunguzo "
+"( S ) Kuri Na: iyi Ububiko... . </qt> "
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 #, fuzzy
@@ -4128,12 +4101,21 @@ msgstr "Kureka"
 #: folderutil.cpp:93
 #, fuzzy
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt> Ububiko... Kyasibwe: %S Na: i Konti: <b> %1 </b> "
-"Ibaruwa . Ububiko... i Konti: Gishya Ibaruwa Kugarura Kuri i Ububiko... . </qt> "
+"<qt> Ububiko... Kyasibwe: %S Na: i Konti: <b> %1 </b> Ibaruwa . Ububiko... i "
+"Konti: Gishya Ibaruwa Kugarura Kuri i Ububiko... . </qt> "
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -4270,70 +4252,19 @@ msgstr "Imimerere:"
 #: htmlstatusbar.cpp:91
 #, fuzzy
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt> <b> "
-"<br> H "
-"<br> "
-"<br> "
-"<br> "
-"<br> "
-"<br> "
-"<br> e "
-"<br> S "
-"<br> S "
-"<br> A "
-"<br> G "
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt> <b> <br> H <br> <br> <br> <br> <br> <br> e <br> S <br> S <br> A <br> G "
 "<br> e </b> </qt> "
 
 #: htmlstatusbar.cpp:94
 #, fuzzy
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt> "
-"<br> "
-"<br> o "
-"<br> "
-"<br> H "
-"<br> "
-"<br> "
-"<br> "
-"<br> "
-"<br> "
-"<br> e "
-"<br> S "
-"<br> S "
-"<br> A "
-"<br> G "
-"<br> e </qt> "
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt> <br> <br> o <br> <br> H <br> <br> <br> <br> <br> <br> e <br> S <br> S "
+"<br> A <br> G <br> e </qt> "
 
 #: identitydialog.cpp:93
 #, fuzzy
@@ -4348,18 +4279,13 @@ msgstr "Izina ryawe:"
 #: identitydialog.cpp:123
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3> Izina: </h3> "
-"<p> Umwanya Izina: Nka nka Kuri Kugaragara in i Imeli Umutwe ni Yoherejwe: "
-"Inyuma ; </p> "
-"<p> NIBA iyi Ahatanditseho Izina: OYA Kugaragara , i Imeli Aderesi: . </p> </qt> "
+"<qt> <h3> Izina: </h3> <p> Umwanya Izina: Nka nka Kuri Kugaragara in i Imeli "
+"Umutwe ni Yoherejwe: Inyuma ; </p> <p> NIBA iyi Ahatanditseho Izina: OYA "
+"Kugaragara , i Imeli Aderesi: . </p> </qt> "
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4368,17 +4294,13 @@ msgstr "Ikigo:"
 #: identitydialog.cpp:137
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3> </h3> "
-"<p> Umwanya i Izina: Bya Ikigo: NIBA nka Kuri in i Imeli Umutwe ni Yoherejwe: "
-"Inyuma . </p> "
-"<p> ni ( na Bisanzwe ) Kuri iyi Ahatanditseho . </p> </qt> "
+"<qt> <h3> </h3> <p> Umwanya i Izina: Bya Ikigo: NIBA nka Kuri in i Imeli "
+"Umutwe ni Yoherejwe: Inyuma . </p> <p> ni ( na Bisanzwe ) Kuri iyi "
+"Ahatanditseho . </p> </qt> "
 
 #: identitydialog.cpp:149
 #, fuzzy
@@ -4388,19 +4310,14 @@ msgstr "Aderesi ya imeli:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3> Aderesi: </h3> "
-"<p> Umwanya Cyuzuye Imeli Aderesi: . </p> "
-"<p> iyi Ahatanditseho , Cyangwa Kubona , Abantu Kuri . </p> </qt> "
+"<qt> <h3> Aderesi: </h3> <p> Umwanya Cyuzuye Imeli Aderesi: . </p> <p> iyi "
+"Ahatanditseho , Cyangwa Kubona , Abantu Kuri . </p> </qt> "
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4409,21 +4326,12 @@ msgstr "Aderesi ya imeli:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4451,20 +4359,16 @@ msgstr "i Urufunguzo Byakoreshejwe Kuri Shyiraho Umukono Ubutumwa . "
 #: identitydialog.cpp:198
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt> "
-"<p> Urufunguzo Hitamo... Byakoreshejwe Kuri Shyiraho Umukono Ubutumwa . Koresha "
-"Utubuto . </p> "
-"<p> iyi Ahatanditseho , OYA Kuri Shyiraho Umukono ikoresha ; Bisanzwe Ibaruwa "
-"Imimaro OYA . </p> "
-"<p> Gushaka Inyuma Birenzeho Bigyanye Utubuto Ku < A > HTTP : //www . . org </a> "
-"</p> </qt> "
+"<qt> <p> Urufunguzo Hitamo... Byakoreshejwe Kuri Shyiraho Umukono Ubutumwa . "
+"Koresha Utubuto . </p> <p> iyi Ahatanditseho , OYA Kuri Shyiraho Umukono "
+"ikoresha ; Bisanzwe Ibaruwa Imimaro OYA . </p> <p> Gushaka Inyuma Birenzeho "
+"Bigyanye Utubuto Ku < A > HTTP : //www . . org </a> </p> </qt> "
 
 #: identitydialog.cpp:205
 #, fuzzy
@@ -4479,30 +4383,27 @@ msgstr "Urufunguzo rw'isobeka:"
 #: identitydialog.cpp:218
 #, fuzzy
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"i Urufunguzo Byakoreshejwe Ryari: Kuri na ya:  i \" \" Ikiranga in i &Uhimba . "
+"i Urufunguzo Byakoreshejwe Ryari: Kuri na ya:  i \" \" Ikiranga in i "
+"&Uhimba . "
 
 #: identitydialog.cpp:223
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt> "
-"<p> Urufunguzo Hitamo... Byakoreshejwe Kuri Shyiraho Umutekano Ubutumwa Kuri na "
-"ya:  i \" \" Ikiranga in i &Uhimba . Koresha Utubuto . </p> "
-"<p> iyi Ahatanditseho , OYA Kuri Shyiraho Umutekano Amakopi Bya Ubutumwa Kuri "
-"ikoresha ; Bisanzwe Ibaruwa Imimaro OYA . </p> "
-"<p> Gushaka Inyuma Birenzeho Bigyanye Utubuto Ku < A > HTTP : //www . . org </a> "
-"</qt> "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt> <p> Urufunguzo Hitamo... Byakoreshejwe Kuri Shyiraho Umutekano Ubutumwa "
+"Kuri na ya:  i \" \" Ikiranga in i &Uhimba . Koresha Utubuto . </p> <p> iyi "
+"Ahatanditseho , OYA Kuri Shyiraho Umutekano Amakopi Bya Ubutumwa Kuri "
+"ikoresha ; Bisanzwe Ibaruwa Imimaro OYA . </p> <p> Gushaka Inyuma Birenzeho "
+"Bigyanye Utubuto Ku < A > HTTP : //www . . org </a> </qt> "
 
 #: identitydialog.cpp:230
 #, fuzzy
@@ -4524,17 +4425,14 @@ msgstr "i S /Impamyabushobozi: Byakoreshejwe Kuri Shyiraho Umukono Ubutumwa . "
 #: identitydialog.cpp:247
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> S /( . ) Impamyabushobozi: Hitamo... Byakoreshejwe Kuri Shyiraho Umukono "
-"Ubutumwa . </p> "
-"<p> iyi Ahatanditseho , OYA Kuri Shyiraho Umukono ikoresha S /; Bisanzwe "
-"Ibaruwa Imimaro OYA . </p> </qt> "
+"<qt> <p> S /( . ) Impamyabushobozi: Hitamo... Byakoreshejwe Kuri Shyiraho "
+"Umukono Ubutumwa . </p> <p> iyi Ahatanditseho , OYA Kuri Shyiraho Umukono "
+"ikoresha S /; Bisanzwe Ibaruwa Imimaro OYA . </p> </qt> "
 
 #: identitydialog.cpp:252
 #, fuzzy
@@ -4549,26 +4447,24 @@ msgstr "S /"
 #: identitydialog.cpp:269
 #, fuzzy
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"i S /Impamyabushobozi: Byakoreshejwe Ryari: Kuri na ya:  i \" \" Ikiranga in i "
-"&Uhimba . "
+"i S /Impamyabushobozi: Byakoreshejwe Ryari: Kuri na ya:  i \" \" Ikiranga in "
+"i &Uhimba . "
 
 #: identitydialog.cpp:274
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> S /Impamyabushobozi: Hitamo... Byakoreshejwe Kuri Shyiraho Umutekano "
-"Ubutumwa Kuri na ya:  i \" \" Ikiranga in i &Uhimba . </p> "
-"<p> iyi Ahatanditseho , OYA Kuri Shyiraho Umutekano Amakopi Bya Ubutumwa Kuri "
+"<qt> <p> S /Impamyabushobozi: Hitamo... Byakoreshejwe Kuri Shyiraho "
+"Umutekano Ubutumwa Kuri na ya:  i \" \" Ikiranga in i &Uhimba . </p> <p> iyi "
+"Ahatanditseho , OYA Kuri Shyiraho Umutekano Amakopi Bya Ubutumwa Kuri "
 "ikoresha S /; Bisanzwe Ibaruwa Imimaro OYA . </p> </qt> "
 
 #: identitydialog.cpp:280
@@ -4593,23 +4489,18 @@ msgstr "Aderesi yo gusubirizaho:"
 #: identitydialog.cpp:326
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3> - Amaderesi </h3> "
-"<p> i <tt> - Kuri : </tt> Umutwe Kuri A Imeli Aderesi: Kuri i Bisanzwe <tt> "
-": </tt> Aderesi: . </p> "
-"<p> Ryari: A Itsinda Bya Abantu in . Urugero: , Icyo ari cyo cyose Yoherejwe: "
-"Kuri Imeli in i <tt> : </tt> Umwanya , Icyo ari cyo cyose Kuri Gyayo Kuri A "
-"Itsinda Aderesi: . </p> "
-"<p> in , iyi Umwanya Ahatanditseho . </p> </qt> "
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3> - Amaderesi </h3> <p> i <tt> - Kuri : </tt> Umutwe Kuri A Imeli "
+"Aderesi: Kuri i Bisanzwe <tt> : </tt> Aderesi: . </p> <p> Ryari: A Itsinda "
+"Bya Abantu in . Urugero: , Icyo ari cyo cyose Yoherejwe: Kuri Imeli in i "
+"<tt> : </tt> Umwanya , Icyo ari cyo cyose Kuri Gyayo Kuri A Itsinda "
+"Aderesi: . </p> <p> in , iyi Umwanya Ahatanditseho . </p> </qt> "
 
 #: identitydialog.cpp:343
 #, fuzzy
@@ -4619,25 +4510,19 @@ msgstr "Amaderesi : "
 #: identitydialog.cpp:345
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt> "
-"<h3> ( ) Amaderesi </h3> "
-"<p> Amaderesi Injiza Kyongewe Kuri Ibaruwa ni Yoherejwe: Na: iyi Ikiranga . OYA "
-"Kigaragara Kuri Ikindi Abandikiwe... . </p> "
-"<p> ni Byakoreshejwe Kuri Kohereza A Gukoporora Bya Yoherejwe: &Ubutumwa Kuri "
-"Konti: Bya . </p> "
-"<p> Kugaragaza Birenzeho Rimwe Aderesi: , Koresha Kuri i Urutonde Bya "
-"Abandikiwe... . </p> "
-"<p> in , iyi Umwanya Ahatanditseho . </p> </qt> "
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt> <h3> ( ) Amaderesi </h3> <p> Amaderesi Injiza Kyongewe Kuri Ibaruwa ni "
+"Yoherejwe: Na: iyi Ikiranga . OYA Kigaragara Kuri Ikindi Abandikiwe... . </"
+"p> <p> ni Byakoreshejwe Kuri Kohereza A Gukoporora Bya Yoherejwe: &Ubutumwa "
+"Kuri Konti: Bya . </p> <p> Kugaragaza Birenzeho Rimwe Aderesi: , Koresha "
+"Kuri i Urutonde Bya Abandikiwe... . </p> <p> in , iyi Umwanya "
+"Ahatanditseho . </p> </qt> "
 
 #: identitydialog.cpp:361
 #, fuzzy
@@ -4683,7 +4568,7 @@ msgstr "Isinya"
 msgid "&Picture"
 msgstr "Ishusho"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 #, fuzzy
 msgid "Invalid Email Address"
 msgstr "Imeli"
@@ -4701,18 +4586,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Bya i Ishirwaho umukono Utubuto OYA Icyo ari cyo cyose Umukoresha Na: i Imeli "
-"Aderesi: ya:  iyi Ikiranga ( %1 ) . \n"
+"Bya i Ishirwaho umukono Utubuto OYA Icyo ari cyo cyose Umukoresha Na: i "
+"Imeli Aderesi: ya:  iyi Ikiranga ( %1 ) . \n"
 "Igisubizo in Iburira Ubutumwa ku i Ryari: Kuri Gusuzuma: Na: iyi Iboneza . "
 
 #: identitydialog.cpp:560
 #, fuzzy
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Bya i Bishunzwe: Utubuto OYA Icyo ari cyo cyose Umukoresha Na: i Imeli Aderesi: "
-"ya:  iyi Ikiranga ( %1 ) . "
+"Bya i Bishunzwe: Utubuto OYA Icyo ari cyo cyose Umukoresha Na: i Imeli "
+"Aderesi: ya:  iyi Ikiranga ( %1 ) . "
 
 #: identitydialog.cpp:567
 #, fuzzy
@@ -4732,8 +4617,8 @@ msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Bya i S /Bishunzwe: Impamyabushobozi OYA i Imeli Aderesi: ya:  iyi Ikiranga ( "
-"%1 ) . "
+"Bya i S /Bishunzwe: Impamyabushobozi OYA i Imeli Aderesi: ya:  iyi Ikiranga "
+"( %1 ) . "
 
 #: identitydialog.cpp:584
 #, fuzzy
@@ -4765,8 +4650,8 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , i "
-"Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
+"Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , "
+"i Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4774,14 +4659,14 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , i "
-"Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
+"Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , "
+"i Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
 
 #: identitylistview.cpp:85
 #, fuzzy
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1(Mburabuzi)"
 
@@ -4836,15 +4721,15 @@ msgstr ""
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 #, fuzzy
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr "Iboneza mu buryo bwikora: Kugenzura Konti: Iboneza . "
 
 #: imapaccountbase.cpp:768
 #, fuzzy
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr "OYA Kuri Iboneza mu buryo bwikora: Kugenzura Konti: Iboneza . "
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4885,15 +4770,20 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Ikosa:%1"
+
 #: imapaccountbase.cpp:959
 #, fuzzy
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Ukwihuza Kuri i Seriveri: %1 Cyangwa Inyuma . - mu buryo bwikora: NIBA . "
 
@@ -5058,14 +4948,14 @@ msgstr "Ubushyinguro"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -5094,41 +4984,36 @@ msgstr "Urufunguzo rw'isobeka:"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p> Ishirwaho umukono Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"( %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
 "<p> Ishirwaho umukono Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"( %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </"
+"p> <p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </"
+"p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p> Urufunguzo ya:  </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
@@ -5138,184 +5023,158 @@ msgstr ""
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati "
+"> <b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati "
+"> <b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </"
+"p> "
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p> S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
 "<p> S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
+"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </"
+"p> "
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p> S /Impamyabushobozi: ya:  </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
 "<p> S /Impamyabushobozi: ya:  </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5330,41 +5189,36 @@ msgstr "S /"
 #: keyresolver.cpp:750
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p> Ishirwaho umukono Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"( %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
 "<p> Ishirwaho umukono Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"( %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:755
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </"
+"p> <p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> Bishunzwe: Urufunguzo </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </"
+"p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:760
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p> Urufunguzo ya:  </p> < p Itunganya = Hagati > <b> %1 </b> ( %2 ) </p> "
 "<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
@@ -5374,184 +5228,158 @@ msgstr ""
 #: keyresolver.cpp:770
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati "
+"> <b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati "
+"> <b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:777
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:784
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
 "<p> Imizi Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
 "<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:792
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
-"<b> %1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > "
+"<b> %1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:799
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </"
+"p> "
 
 #: keyresolver.cpp:806
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> "
-"<p> ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
+"<p> Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %3 </b> </p> <p> "
+"ya:  S /Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:815
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p> S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A "
+"&Umunsi . </p> \n"
 "<p> S /Ishirwaho umukono Impamyabushobozi: </p> < p Itunganya = Hagati > <b> "
-"%1 </b> ( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"%1 </b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n "
+"iminsi . </p> "
 
 #: keyresolver.cpp:820
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
-"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
+"<p> S /Bishunzwe: Impamyabushobozi: </p> < p Itunganya = Hagati > <b> %1 </"
+"b> ( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </"
+"p> "
 
 #: keyresolver.cpp:825
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p> S /Impamyabushobozi: ya:  </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa A &Umunsi . </p> \n"
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa A &Umunsi . </"
+"p> \n"
 "<p> S /Impamyabushobozi: ya:  </p> < p Itunganya = Hagati > <b> %1 </b> "
-"( Urujyano Umubare %2 ) </p> "
-"<p> Yarenze igihe: in Birutwa %n iminsi . </p> "
+"( Urujyano Umubare %2 ) </p> <p> Yarenze igihe: in Birutwa %n iminsi . </p> "
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5565,15 +5393,16 @@ msgstr "S /"
 #: keyresolver.cpp:867
 #, fuzzy
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Cyangwa Birenzeho Bya Bishunzwe: Utubuto Cyangwa S /Impamyabushobozi ni OYA ya: "
-" Bishunzwe: . Bishunzwe: Utubuto na Impamyabushobozi ya:  iyi Ikiranga in i "
-"Ikiranga Iboneza Ikiganiro . \n"
+"Cyangwa Birenzeho Bya Bishunzwe: Utubuto Cyangwa S /Impamyabushobozi ni OYA "
+"ya:  Bishunzwe: . Bishunzwe: Utubuto na Impamyabushobozi ya:  iyi Ikiranga "
+"in i Ikiranga Iboneza Ikiganiro . \n"
 "Hitamo... Kuri Gukomeza , na i Utubuto Nyuma ku , Kuri Kugaragaza i Utubuto "
 "Kuri Koresha . "
 
@@ -5592,8 +5421,8 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Cyangwa Birenzeho Bya Ishirwaho umukono Utubuto Cyangwa S /Ishirwaho umukono "
-"Impamyabushobozi ni OYA ya:  Ishirwaho umukono . Ishirwaho umukono Utubuto na "
-"Impamyabushobozi ya:  iyi Ikiranga in i Ikiranga Iboneza Ikiganiro . \n"
+"Impamyabushobozi ni OYA ya:  Ishirwaho umukono . Ishirwaho umukono Utubuto "
+"na Impamyabushobozi ya:  iyi Ikiranga in i Ikiranga Iboneza Ikiganiro . \n"
 "Hitamo... Kuri Gukomeza , na i Utubuto Nyuma ku , Kuri Kugaragaza i Utubuto "
 "Kuri Koresha . "
 
@@ -5607,10 +5436,10 @@ msgstr "Gutoranya Buto Ifungura"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Bya Bishunzwe: Ibya&hiswemo i &Ubutumwa Bishunzwe: ikoresha , Ku ya:  "
 "Abandikiwe... ; \n"
@@ -5622,10 +5451,10 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Bya Bishunzwe: Ibya&hiswemo i &Ubutumwa Bishunzwe: ikoresha S /, Ku ya:  "
 "Abandikiwe... ; \n"
@@ -5635,13 +5464,13 @@ msgstr ""
 #: keyresolver.cpp:1252
 #, fuzzy
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Bya Ishirwaho umukono Ibya&hiswemo i &Ubutumwa ikoresha , Ku ya:  Abandikiwe... "
-"; \n"
+"Bya Ishirwaho umukono Ibya&hiswemo i &Ubutumwa ikoresha , Ku ya:  "
+"Abandikiwe... ; \n"
 ", OYA Byemewe Ishirwaho umukono Impamyabushobozi ya:  iyi Ikiranga . "
 
 #: keyresolver.cpp:1259
@@ -5651,8 +5480,8 @@ msgstr ""
 #: keyresolver.cpp:1268
 #, fuzzy
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5684,11 +5513,11 @@ msgstr "Ishirwaho umukono "
 #: keyresolver.cpp:1490
 #, fuzzy
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"OYA Guhitamo Bishunzwe: Urufunguzo ya:  ( Shyiraho Umutekano Kuri ) . OYA Kuri "
-"&Ubutumwa NIBA Shyiraho Umutekano . "
+"OYA Guhitamo Bishunzwe: Urufunguzo ya:  ( Shyiraho Umutekano Kuri ) . OYA "
+"Kuri &Ubutumwa NIBA Shyiraho Umutekano . "
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 #, fuzzy
@@ -5713,11 +5542,11 @@ msgstr ""
 #: keyresolver.cpp:1514
 #, fuzzy
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"OYA Guhitamo Bishunzwe: Urufunguzo ya:  Icyo ari cyo cyose Bya i Abandikiwe... "
-"Bya iyi &Ubutumwa ; , i &Ubutumwa OYA Bishunzwe: . "
+"OYA Guhitamo Bishunzwe: Urufunguzo ya:  Icyo ari cyo cyose Bya i "
+"Abandikiwe... Bya iyi &Ubutumwa ; , i &Ubutumwa OYA Bishunzwe: . "
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 #, fuzzy
@@ -5739,8 +5568,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"OYA Guhitamo Bishunzwe: Utubuto ya:  Bya i Abandikiwe... : OYA Kuri i &Ubutumwa "
-"NIBA Shyiraho Umutekano . "
+"OYA Guhitamo Bishunzwe: Utubuto ya:  Bya i Abandikiwe... : OYA Kuri i "
+"&Ubutumwa NIBA Shyiraho Umutekano . "
 
 #: keyresolver.cpp:1585
 #, fuzzy
@@ -5765,11 +5594,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Byemewe na Bishunzwe: Urufunguzo Byabonetse ya:  \" %1 \" . \n"
 "\n"
@@ -5824,10 +5653,8 @@ msgstr "Ikosa : Kuri Ibaruwa : "
 
 #: kmaccount.cpp:277
 #, fuzzy
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Kuri &Ongera &Ubutumwa : \n"
+msgid "Failed to add message:\n"
+msgstr "Kuri &Ongera &Ubutumwa : \n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5880,8 +5707,8 @@ msgstr "&Ubutumwa %3 Bya %2 Kuva: %1 . "
 #, fuzzy
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt> Gukuraho Ibaruwa Kuva: Agasanduku k'ubutumwa <b> %1 </b> : "
-"<br> %2 </qt> "
+"<qt> Gukuraho Ibaruwa Kuva: Agasanduku k'ubutumwa <b> %1 </b> : <br> %2 </"
+"qt> "
 
 #: kmacctlocal.cpp:255
 #, fuzzy
@@ -5936,6 +5763,61 @@ msgstr "Byatandukanye"
 msgid "&Maildir mailbox"
 msgstr "Agasanduku k'ubutumwa "
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "Ikivugwaho: Bya &Ubutumwa "
+
+#: kmail_options.h:13
+#, fuzzy
+msgid "Send CC: to 'address'"
+msgstr ": Kuri ' "
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr ": Kuri ' "
+
+#: kmail_options.h:17
+#, fuzzy
+msgid "Add 'header' to message"
+msgstr "' Kuri &Ubutumwa "
+
+#: kmail_options.h:18
+#, fuzzy
+msgid "Read message body from 'file'"
+msgstr "&Ubutumwa Umubiri Kuva: ' "
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Umubiri Bya &Ubutumwa "
+
+#: kmail_options.h:20
+#, fuzzy
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Umugereka Kuri i Ibaruwa . byasubiyemo "
+
+#: kmail_options.h:21
+#, fuzzy
+msgid "Only check for new mail"
+msgstr "Kugenzura ya:  Gishya Ibaruwa "
+
+#: kmail_options.h:22
+#, fuzzy
+msgid "Only open composer window"
+msgstr "Gufungura &Uhimba Idirishya "
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "i &Ubutumwa Idosiye "
+
+#: kmail_options.h:24
+#, fuzzy
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "&Ubutumwa Kuri ' . Kugerekaho i Idosiye i ' Utudomo Kuri "
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Ibaruwa"
@@ -5996,12 +5878,12 @@ msgstr "%1 : Byabonetse Ububiko... %2 , Gushyiraho Nka Ububiko... "
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt> Byabonetse i Ububiko in %1 na Kuri i Ibikorwa: : %2 "
-"<br> OYA iyi , Kureka na i Ibikorana: Yahagaritswe "
+"<qt> Byabonetse i Ububiko in %1 na Kuri i Ibikorwa: : %2 <br> OYA iyi , "
+"Kureka na i Ibikorana: Yahagaritswe "
 
 #: kmailicalifaceimpl.cpp:1802
 #, fuzzy
@@ -6053,12 +5935,12 @@ msgstr "Kuri Ububikokoporora . "
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Urifuzakuyisimbura."
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 #, fuzzy
 msgid "Save to File"
 msgstr "Kubika Kuri Idosiye "
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Gusimbuza"
 
@@ -6077,7 +5959,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 #, fuzzy
 msgid ""
 "File %1 exists.\n"
@@ -6098,12 +5980,12 @@ msgstr "Idosiye OYA A &Ubutumwa . "
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Idosiye ifite Igikubo Ubutumwa . i Itangira &Ubutumwa ni . "
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 #, fuzzy
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -6112,120 +5994,120 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Amagambo y'Isiba"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "&Ubutumwa %3 Bya %2 Kuva: %1 . "
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 #, fuzzy
 msgid "Not enough free disk space?"
 msgstr "Nta mwanya uhagije kuri disiki uriho ubusa"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 #, fuzzy
 msgid "Move to This Folder"
 msgstr "Kuri "
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 #, fuzzy
 msgid "Copy to This Folder"
 msgstr "Kuri "
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "Ubutumwa "
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Amagambo y'Isiba"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 #, fuzzy
 msgid "Opening URL..."
 msgstr "Gufungura dosiye..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 #, fuzzy
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt> Kuri Gukora <b> %1 </b> ? </qt> "
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Gukora"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 #, fuzzy
 msgid "Found no attachments to save."
 msgstr "Oya Imigereka: Kuri Kubika . "
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Kubika "
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 #, fuzzy
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "Umugereka."
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 #, fuzzy
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "Umugereka . %1 "
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 #, fuzzy
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Idosiyeyahaweizinaisanzweho. Wifuzakurisimbura."
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Idosiye isanzwe ihari"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Gusimbuza"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"Inzira %s %1 Bya i &Ubutumwa ni Bishunzwe: . Kuri Gumana: i Bishunzwe: Ryari: "
-"Mu kubika ? "
+"Inzira %s %1 Bya i &Ubutumwa ni Bishunzwe: . Kuri Gumana: i Bishunzwe: "
+"Ryari: Mu kubika ? "
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "KMail Question"
 msgstr "Ikibazo ky'ibaruwa ya HTML"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Gushyira umutekano:"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Wihanagura"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -6233,12 +6115,12 @@ msgid ""
 msgstr ""
 "Inzira %s %1 Bya i &Ubutumwa ni . Kuri Gumana: i Isinya Ryari: Mu kubika ? "
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Isinya"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 #, fuzzy
 msgid ""
 "_: %2 is detailed error description\n"
@@ -6248,22 +6130,22 @@ msgstr ""
 "OYA Kwandika i Idosiye %1 : \n"
 "%2 "
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "OYA Kwandika i Idosiye %1 . "
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 #, fuzzy
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "ni Oya Icyinjijwe ya:  iyi Imeli Aderesi: . Kuri i na Hanyuma &Ongera By'ako "
 "kanya Amaderesi ikoresha Bikunzwe Umukiriya . "
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 #, fuzzy
 msgid ""
 "More than one Address Book entry uses this email address:\n"
@@ -6274,81 +6156,82 @@ msgstr ""
 "%1 \n"
 "ni OYA Kuri Kuri Na: . "
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 #, fuzzy
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr "Impera y'inyuma OYA i \" x - - Utubuto \" Umumaro . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 #, fuzzy
 msgid "Chiasmus Backend Error"
 msgstr "Ikosa "
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 #, fuzzy
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Garuka Agaciro: Kuva: Impera y'inyuma : \" x - - Utubuto \" Umumaro OYA Garuka "
-"A Ikurikiranyanyuguti Urutonde . Icyegeranyo iyi . "
+"Garuka Agaciro: Kuva: Impera y'inyuma : \" x - - Utubuto \" Umumaro OYA "
+"Garuka A Ikurikiranyanyuguti Urutonde . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 #, fuzzy
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Utubuto Byabonetse . Kugenzura A Byemewe Urufunguzo Inzira: Gushyiraho in i "
 "Iboneza . "
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 #, fuzzy
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr "Impera y'inyuma OYA i \" x - \" Umumaro . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 #, fuzzy
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\" x - \" Umumaro OYA Kwemera i Ikitezwe: $(ARG1) Ibigenga . Icyegeranyo iyi . "
+"\" x - \" Umumaro OYA Kwemera i Ikitezwe: $(ARG1) Ibigenga . Icyegeranyo "
+"iyi . "
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 #, fuzzy
 msgid "Chiasmus Decryption Error"
 msgstr "Ikosa "
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 #, fuzzy
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Garuka Agaciro: Kuva: Impera y'inyuma : \" x - \" Umumaro OYA Garuka A Bayite "
-"Imbonerahamwe . Icyegeranyo iyi . "
+"Garuka Agaciro: Kuva: Impera y'inyuma : \" x - \" Umumaro OYA Garuka A "
+"Bayite Imbonerahamwe . Icyegeranyo iyi . "
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Ibaruwa"
@@ -6455,7 +6338,7 @@ msgstr "Ingano"
 msgid "Encoding"
 msgstr "Imisobekere:"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Kwegeranya"
 
@@ -6467,7 +6350,7 @@ msgstr "Shyiraho Umutekano"
 msgid "Sign"
 msgstr "Shyiraho Umukono"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "Izina ry'umugereka"
@@ -6494,10 +6377,11 @@ msgstr "ingano y'ifatizo"
 #: kmcomposewin.cpp:1043
 #, fuzzy
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt> Imeli Amaderesi Gushyira in iyi Umwanya Akira A Gukoporora Bya i Imeli . "
-"</qt> "
+"<qt> Imeli Amaderesi Gushyira in iyi Umwanya Akira A Gukoporora Bya i "
+"Imeli . </qt> "
 
 #: kmcomposewin.cpp:1052
 #, fuzzy
@@ -6508,13 +6392,13 @@ msgstr "Ingingo Nyongera"
 #, fuzzy
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt> Imeli Amaderesi Gushyira in iyi Umwanya Akira A Gukoporora Bya i Imeli . "
-"ni i Nka Byose i Amaderesi in i <b> : </b> Umwanya in i Mwakirizi Bya i ( ) ni "
-"A , OYA i Uwandikiwe . </qt> "
+"<qt> Imeli Amaderesi Gushyira in iyi Umwanya Akira A Gukoporora Bya i "
+"Imeli . ni i Nka Byose i Amaderesi in i <b> : </b> Umwanya in i Mwakirizi "
+"Bya i ( ) ni A , OYA i Uwandikiwe . </qt> "
 
 #: kmcomposewin.cpp:1067
 #, fuzzy
@@ -6524,12 +6408,11 @@ msgstr "Impapuro zihishe"
 #: kmcomposewin.cpp:1068
 #, fuzzy
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt> i Nka i <b> : </b> Umwanya in Byose Ikindi Abandikiwe... OYA A Gukoporora "
-". </qt> "
+"<qt> i Nka i <b> : </b> Umwanya in Byose Ikindi Abandikiwe... OYA A "
+"Gukoporora . </qt> "
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
@@ -6541,7 +6424,7 @@ msgstr "Ohereza Ibaruwa"
 msgid "&Send Mail Via"
 msgstr "Ohereza Ibaruwa"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Hohereza nyuma"
@@ -6620,8 +6503,7 @@ msgstr "Gukuraho inyuguti"
 msgid "Cl&ean Spaces"
 msgstr "Amapaji ya Man"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, fuzzy, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Izina ry'imyandikire idahinduka"
@@ -6792,33 +6674,33 @@ msgstr "Imiterere Ihinduranya Gishushanyo (GIF)"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Bisanzwe"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 #, fuzzy
 msgid "Ordered List (Decimal)"
 msgstr "Bishyirwa ku Murongo (byihuta cyane)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 #, fuzzy
 msgid "Ordered List (Alpha lower)"
 msgstr "( Ntoya ) "
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 #, fuzzy
 msgid "Ordered List (Alpha upper)"
 msgstr "( Nkuru ) "
@@ -6911,7 +6793,8 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Kubika iyi &Ubutumwa in i Ububiko... . Hanyuma na Yoherejwe: Ku A Nyuma Igihe . "
+"Kubika iyi &Ubutumwa in i Ububiko... . Hanyuma na Yoherejwe: Ku A Nyuma "
+"Igihe . "
 
 #: kmcomposewin.cpp:2257
 #, fuzzy
@@ -6919,7 +6802,8 @@ msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
-"Kubika iyi &Ubutumwa in i Ububiko... . Hanyuma na Yoherejwe: Ku A Nyuma Igihe . "
+"Kubika iyi &Ubutumwa in i Ububiko... . Hanyuma na Yoherejwe: Ku A Nyuma "
+"Igihe . "
 
 #: kmcomposewin.cpp:2261
 #, fuzzy
@@ -6934,8 +6818,8 @@ msgstr "Funga "
 #: kmcomposewin.cpp:2333
 #, fuzzy
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "&Ubutumwa Kuri Kuri Idosiye OYA . \n"
@@ -6946,7 +6830,7 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Idosiye "
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Send as Is"
 msgstr "Nka "
@@ -6954,31 +6838,32 @@ msgstr "Nka "
 #: kmcomposewin.cpp:2415
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> OYA i Indanganturo Bya i Umugereka ( %1 ) ; </p> "
-"<p> Kuri Kugaragaza i Cyuzuye Inzira: NIBA Kuri Kugerekaho A Idosiye . </p> "
-"</qt> "
+"<qt> <p> OYA i Indanganturo Bya i Umugereka ( %1 ) ; </p> <p> Kuri "
+"Kugaragaza i Cyuzuye Inzira: NIBA Kuri Kugerekaho A Idosiye . </p> </qt> "
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Kugerekaho Idosiye"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, fuzzy, no-c-format
 msgid "&Attach"
 msgstr "Kugerekaho"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Kongeramo Idosiye"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Kongeramo Idosiye"
@@ -6986,13 +6871,11 @@ msgstr "Kongeramo Idosiye"
 #: kmcomposewin.cpp:3129
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt> "
-"<p> Ikosa Kuri Kwohereza hanze... i Urufunguzo Kuva: i Impera y'inyuma : </p> "
-"<p> <b> %1 "
+"<qt> <p> Ikosa Kuri Kwohereza hanze... i Urufunguzo Kuva: i Impera "
+"y'inyuma : </p> <p> <b> %1 "
 
 #: kmcomposewin.cpp:3133
 #, fuzzy
@@ -7035,336 +6918,345 @@ msgid ""
 "View"
 msgstr ""
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Kwandika..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Andika inyandiko- porogaramu"
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Kubika nka..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Indangabintu"
+
 #: kmcomposewin.cpp:3224
 #, fuzzy
 msgid "Add Attachment..."
 msgstr "Nk'umugereko"
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "OYA Kwegeranya i Idosiye . "
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"Byegeranijwe Idosiye ni Kinini i ~Umwimerere . Kuri Gumana: i ~Umwimerere Rimwe "
-"? "
+"Byegeranijwe Idosiye ni Kinini i ~Umwimerere . Kuri Gumana: i ~Umwimerere "
+"Rimwe ? "
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Kugumishaho"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "OYA i Idosiye . "
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 #, fuzzy
 msgid "Save Attachment As"
 msgstr "Kubika "
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 #, fuzzy
 msgid "Add as Text"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "Kitiswe"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Ubutumwa Bishunzwe: Kuri , i Byahiswemo Ikiranga OYA Kugaragaza... ( "
-"Cyangwa S /) Bishunzwe: Urufunguzo Kuri Koresha ya:  iyi . </p> "
-"<p> Guhitamo i Urufunguzo ( S ) Kuri Koresha in i Ikiranga Iboneza . </p> </qt> "
+"<qt> <p> Ubutumwa Bishunzwe: Kuri , i Byahiswemo Ikiranga OYA Kugaragaza... "
+"( Cyangwa S /) Bishunzwe: Urufunguzo Kuri Koresha ya:  iyi . </p> <p> "
+"Guhitamo i Urufunguzo ( S ) Kuri Koresha in i Ikiranga Iboneza . </p> </qt> "
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 #, fuzzy
 msgid "Undefined Encryption Key"
 msgstr "Urufunguzo rw'isobeka:"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Itondekanya Kuri Kuri Shyiraho Umukono iyi &Ubutumwa Itangira Kuri "
-"Kugaragaza... i ( Cyangwa S /) Ishirwaho umukono Urufunguzo Kuri Koresha . </p> "
-"<p> Guhitamo i Urufunguzo Kuri Koresha in i Ikiranga Iboneza . </p> </qt> "
+"<qt> <p> Itondekanya Kuri Kuri Shyiraho Umukono iyi &Ubutumwa Itangira Kuri "
+"Kugaragaza... i ( Cyangwa S /) Ishirwaho umukono Urufunguzo Kuri Koresha . </"
+"p> <p> Guhitamo i Urufunguzo Kuri Koresha in i Ikiranga Iboneza . </p> </qt> "
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 #, fuzzy
 msgid "Undefined Signing Key"
 msgstr "Gutoranya Buto Ifungura"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 #, fuzzy
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"ni in Ntibicometse kuri interineti Ubwoko , Ubutumwa in i Ibyasohotse &Kugeza "
-"Gyayo kiri kuri interineti . "
+"ni in Ntibicometse kuri interineti Ubwoko , Ubutumwa in i Ibyasohotse "
+"&Kugeza Gyayo kiri kuri interineti . "
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 #, fuzzy
 msgid "Online/Offline"
 msgstr "Interineti Funga: Yego/Oya"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 #, fuzzy
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Injiza Imeli Aderesi: in i : Umwanya . Gushyiraho Imeli Aderesi: ya:  Byose , "
-"OYA Kuri Injiza ya:  &Ubutumwa . "
+"Injiza Imeli Aderesi: in i : Umwanya . Gushyiraho Imeli Aderesi: ya:  "
+"Byose , OYA Kuri Injiza ya:  &Ubutumwa . "
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Kugaragaza Ku Rimwe Mwakirizi , in i : Umwanya Cyangwa Nka Cyangwa Nka . "
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "OYA Kugaragaza A Ikivugwaho: . &Ubutumwa ? "
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Bitaragaragazwa"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 #, fuzzy
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "OYA Kugaragaza A Ikivugwaho: . &Ubutumwa ? "
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 #, fuzzy
 msgid "No Subject Specified"
 msgstr "Bitaragaragazwa"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "S&end as Is"
 msgstr "Nka "
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "i "
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 #, fuzzy
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ", OYA Shyiraho Umukono /Shyiraho Umutekano "
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 #, fuzzy
 msgid "&Keep markup, do not encrypt"
 msgstr ", OYA Shyiraho Umutekano "
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 #, fuzzy
 msgid "&Keep markup, do not sign"
 msgstr ", OYA Shyiraho Umukono "
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "/( Gusiba ) "
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 #, fuzzy
 msgid "Encrypt (delete markup)"
 msgstr "( Gusiba ) "
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 #, fuzzy
 msgid "Sign (delete markup)"
 msgstr "( Gusiba ) "
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Ishirwaho umukono /Bya Ubutumwa ni OYA ; </p> "
-"<p> Kuri Gusiba ? </p> </qt> "
+"<qt> <p> Ishirwaho umukono /Bya Ubutumwa ni OYA ; </p> <p> Kuri Gusiba ? </"
+"p> </qt> "
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Shyiraho umutekano kuri iyi imeli"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , i "
-"Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
+"Guhanga Inyandiko z'agateganyo Ububiko... ya:  Ikiranga \" %1 \" OYA ( ) ; , "
+"i Mburabuzi Inyandiko z'agateganyo Ububiko... Byakoreshejwe . "
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 #, fuzzy
 msgid "Please create an account for sending and try again."
 msgstr "Kurema Konti: ya:  na Kugerageza Nanone . "
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 #, fuzzy
 msgid "About to send email..."
 msgstr "Kuri Kohereza Imeli ... "
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Kohereza iyemeza"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 #, fuzzy
 msgid "&Send Now"
 msgstr "Hohereza nonaha"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Abandikiwe... "
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Ingingo Nyongera"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Igenzuranyuguti"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Igenzuranyuguti"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 #, fuzzy
 msgid " Spell check canceled."
 msgstr "Kugenzura Kureka . "
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 #, fuzzy
 msgid " Spell check stopped."
 msgstr "Kugenzura Kyahagariswe . "
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 #, fuzzy
 msgid " Spell check complete."
 msgstr "Kugenzura Byuzuye . "
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 #, fuzzy
 msgid "Spellchecker"
 msgstr "Igenzuranyuguti"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 #, fuzzy
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Kugena Imiterere A Kuri Koresha ya:  Bishunzwe: Itangira . \n"
 "iyi in i tab Bya i Kugena Imiterere Ipaji: . "
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 #, fuzzy
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr "Nka Gushigikira . Kuri Na: - - Gushoboza - . "
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Nta bihuzagihe byabonetse"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Imimerere y'Ihitamo nyongerewe"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "ku %1 . "
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "ku %1 . "
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Ubutumwa buriho umutekano"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Na: Ikivugwaho: : "
@@ -7421,8 +7313,8 @@ msgstr "Igenzuranyandiko:"
 #: kmedit.cpp:884
 #, fuzzy
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr "/OYA Yatangiye: . Ubwoko Cyangwa na in . "
 
 #: kmedit.cpp:893
@@ -7462,12 +7354,10 @@ msgstr "<qt> Akayunguruzo: Ibikorwa in Akayunguruzo: <b> %1 </b> . </qt> "
 #: kmfilter.cpp:289
 #, fuzzy
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt> Akayunguruzo: Igikorwa <b> %1 </b> "
-"<br> in Akayunguruzo: <b> %2 </b> . "
+"<qt> Akayunguruzo: Igikorwa <b> %1 </b> <br> in Akayunguruzo: <b> %2 </b> . "
 "<br> Kwirengagiza "
 
 #: kmfilteraction.cpp:601
@@ -7718,166 +7608,140 @@ msgstr "Gukina ijwi"
 #: kmfilterdlg.cpp:55
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> ni i Urutonde Bya Muyunguruzi . Hejuru: - Kuri - Hasi: . </p> "
-"<p> ku Icyo ari cyo cyose Akayunguruzo: Kuri Kwandika ikoresha i Amagenzura in "
-"i Iburyo: - Bya i Ikiganiro . </p> </qt> "
+"<qt> <p> ni i Urutonde Bya Muyunguruzi . Hejuru: - Kuri - Hasi: . </p> <p> "
+"ku Icyo ari cyo cyose Akayunguruzo: Kuri Kwandika ikoresha i Amagenzura in i "
+"Iburyo: - Bya i Ikiganiro . </p> </qt> "
 
 #: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Kurema A Gishya Akayunguruzo: . </p> "
-"<p> Akayunguruzo: Byinjijwemo Mbere i - Byahiswemo Rimwe , Buri gihe "
-"Guhindura... Nyuma ku . </p> "
-"<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Kurema A Gishya Akayunguruzo: . </p> <p> "
+"Akayunguruzo: Byinjijwemo Mbere i - Byahiswemo Rimwe , Buri gihe "
+"Guhindura... Nyuma ku . </p> <p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> "
+"</em> Akabuto . </p> </qt> "
 
 #: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Gukoporora A Akayunguruzo: . </p> "
-"<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Gukoporora A Akayunguruzo: . </p> <p> iyi "
+"Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
 
 #: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri <em> Gusiba </em> i - Byahiswemo Akayunguruzo: Kuva: i "
-"Urutonde hejuru . </p> "
-"<p> ni Oya Kuri Kubona i Akayunguruzo: Inyuma Rimwe ni Kyasibwe: %S , Buri gihe "
-"i Ikiganiro ku <em> </em> Kuri Kwanga i Amahinduka . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri <em> Gusiba </em> i - Byahiswemo Akayunguruzo: "
+"Kuva: i Urutonde hejuru . </p> <p> ni Oya Kuri Kubona i Akayunguruzo: Inyuma "
+"Rimwe ni Kyasibwe: %S , Buri gihe i Ikiganiro ku <em> </em> Kuri Kwanga i "
+"Amahinduka . </p> </qt> "
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hasi </em> "
-"Rimwe in i Urutonde hejuru . </p> "
-"<p> ni guhera i Itondekanya Bya i Muyunguruzi in i Urutonde i Itondekanya in ku "
-"Ubutumwa : Akayunguruzo: Itangira . </p> "
-"<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hasi </"
+"em> Rimwe in i Urutonde hejuru . </p> <p> ni guhera i Itondekanya Bya i "
+"Muyunguruzi in i Urutonde i Itondekanya in ku Ubutumwa : Akayunguruzo: "
+"Itangira . </p> <p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> "
+"Akabuto . </p> </qt> "
 
 #: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hejuru </em> "
-"Rimwe in i Urutonde hejuru . </p> "
-"<p> ni guhera i Itondekanya Bya i Muyunguruzi in i Urutonde i Itondekanya in ku "
-"Ubutumwa : Akayunguruzo: Itangira . </p> "
-"<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hejuru </"
+"em> Rimwe in i Urutonde hejuru . </p> <p> ni guhera i Itondekanya Bya i "
+"Muyunguruzi in i Urutonde i Itondekanya in ku Ubutumwa : Akayunguruzo: "
+"Itangira . </p> <p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> "
+"Akabuto . </p> </qt> "
 
 #: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hasi </em> "
-"Rimwe in i Urutonde hejuru . </p> "
-"<p> ni guhera i Itondekanya Bya i Muyunguruzi in i Urutonde i Itondekanya in ku "
-"Ubutumwa : Akayunguruzo: Itangira . </p> "
-"<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hasi </"
+"em> Rimwe in i Urutonde hejuru . </p> <p> ni guhera i Itondekanya Bya i "
+"Muyunguruzi in i Urutonde i Itondekanya in ku Ubutumwa : Akayunguruzo: "
+"Itangira . </p> <p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> "
+"Akabuto . </p> </qt> "
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hasi </em> "
-"Rimwe in i Urutonde hejuru . </p> "
-"<p> ni guhera i Itondekanya Bya i Muyunguruzi in i Urutonde i Itondekanya in ku "
-"Ubutumwa : Akayunguruzo: Itangira . </p> "
-"<p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> Akabuto . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Himura i - Byahiswemo Akayunguruzo: <em> Hasi </"
+"em> Rimwe in i Urutonde hejuru . </p> <p> ni guhera i Itondekanya Bya i "
+"Muyunguruzi in i Urutonde i Itondekanya in ku Ubutumwa : Akayunguruzo: "
+"Itangira . </p> <p> iyi Akabuto , Isubiranyuma iyi ku ku i <em> </em> "
+"Akabuto . </p> </qt> "
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Guhindura izina i - Byahiswemo Akayunguruzo: . </p> "
-"<p> &Cyitwa: mu buryo bwikora: , Nka Birebire Nka Tangira &vendorShortName; Na: "
-"\" &lt; \" . </p> "
-"<p> A Akayunguruzo: na Kikoresha Inyuma , Kanda iyi Akabuto na Guhitamo <em> "
-"</em> ku <em> </em> in i Ikiganiro . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Guhindura izina i - Byahiswemo Akayunguruzo: . </"
+"p> <p> &Cyitwa: mu buryo bwikora: , Nka Birebire Nka Tangira "
+"&vendorShortName; Na: \" &lt; \" . </p> <p> A Akayunguruzo: na Kikoresha "
+"Inyuma , Kanda iyi Akabuto na Guhitamo <em> </em> ku <em> </em> in i "
+"Ikiganiro . </p> </qt> "
 
 #: kmfilterdlg.cpp:114
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Akabuto Kuri Gushyiraho Ingufu i Iyemeza Ikiganiro Kuri . </p> "
-"<p> ni NIBA A Ubutumwa Kuri Yimuwe Nyuma . i Kuri Gushyiraho Ingufu i Ikiganiro "
-"Byirambuye , Ubutumwa Nta na rimwe Yimuwe NIBA Oya Ikindi Kinini Ubutumwa "
-"Tegereza... ku i Seriveri: , Cyangwa NIBA Kuri Guhindura... i Kuri Itagi: i "
-"Ubutumwa . </p> </qt> "
+"<qt> <p> iyi Akabuto Kuri Gushyiraho Ingufu i Iyemeza Ikiganiro Kuri . </p> "
+"<p> ni NIBA A Ubutumwa Kuri Yimuwe Nyuma . i Kuri Gushyiraho Ingufu i "
+"Ikiganiro Byirambuye , Ubutumwa Nta na rimwe Yimuwe NIBA Oya Ikindi Kinini "
+"Ubutumwa Tegereza... ku i Seriveri: , Cyangwa NIBA Kuri Guhindura... i Kuri "
+"Itagi: i Ubutumwa . </p> </qt> "
 
 #: kmfilterdlg.cpp:133
 #, fuzzy
@@ -7888,6 +7752,16 @@ msgstr "Amategeko y'umuyunguruzi"
 msgid "Filter Rules"
 msgstr "Amategeko y'umuyunguruzi"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "Kuzana"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "Kuzana"
+
 #: kmfilterdlg.cpp:155
 #, fuzzy
 msgid "Available Filters"
@@ -7985,6 +7859,11 @@ msgstr "&Ongera iyi Akayunguruzo: Kuri i Umwanyabikoresho "
 msgid "Icon for this filter:"
 msgstr "ya:  iyi Akayunguruzo: : "
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Kuri"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Hejuru"
@@ -7993,16 +7872,29 @@ msgstr "Hejuru"
 msgid "Down"
 msgstr "Hasi"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Guhindura Izina..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Gishya"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Gukoporora kuri"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Byasibwe"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -8012,12 +7904,12 @@ msgstr "ya:  "
 #, fuzzy
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Rimwe Akayunguruzo: A Ububiko... ku kiri kuri interineti Konti: . Muyunguruzi "
-"Byashyizweho Ryari: N'intoki Iyungurura na Ryari: Iyungurura kiri kuri "
-"interineti Ibaruwa . "
+"Rimwe Akayunguruzo: A Ububiko... ku kiri kuri interineti Konti: . "
+"Muyunguruzi Byashyizweho Ryari: N'intoki Iyungurura na Ryari: Iyungurura "
+"kiri kuri interineti Ibaruwa . "
 
 #: kmfilterdlg.cpp:786
 #, fuzzy
@@ -8108,26 +8000,22 @@ msgstr "Gufasha mu gihe ky'ibibazo"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p> <b> i Ubwihisho . </b> </p> "
-"<p> Na: Ububiko... , Itangira Kugerageza i Umubarendanga Idosiye . Igihe Kuri "
-"Kubaka bushya , OYA Icyo ari cyo cyose . </p> "
-"<p> ni OYA , Kugerageza i Ubwihisho . iyi , Biregarega Byose Bya hafi "
+"<p> <b> i Ubwihisho . </b> </p> <p> Na: Ububiko... , Itangira Kugerageza i "
+"Umubarendanga Idosiye . Igihe Kuri Kubaka bushya , OYA Icyo ari cyo cyose . "
+"</p> <p> ni OYA , Kugerageza i Ubwihisho . iyi , Biregarega Byose Bya hafi "
 "Amahinduka ya:  iyi Ububiko... na Byose . </p> "
 
 #: kmfoldercachedimap.cpp:135
@@ -8167,8 +8055,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -8212,8 +8100,8 @@ msgstr "Umubarendanga Bya iyi Ububiko... . "
 #: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr "%1 ni OYA in Leta ( Leta %2 ) . Kuri Kugarura Kuri Leta na ? "
 
 #: kmfoldercachedimap.cpp:777
@@ -8364,14 +8252,11 @@ msgstr "ku Seriveri: "
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p> i Ububiko... <b> %1 </b> Kyasibwe: %S . Kuri Gusiba Kuva: i Seriveri: ? </p> "
-"</qt> "
+"<qt> <p> i Ububiko... <b> %1 </b> Kyasibwe: %S . Kuri Gusiba Kuva: i "
+"Seriveri: ? </p> </qt> "
 
 #: kmfoldercachedimap.cpp:1719
 #, fuzzy
@@ -8395,13 +8280,11 @@ msgstr "Ububiko ya:  %1 "
 #: kmfoldercachedimap.cpp:2300
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p> i Ububiko... <b> %1 </b> Kyasibwe: %S . Kuri Gusiba Kuva: i Seriveri: ? </p> "
-"</qt> "
+"<qt> <p> i Ububiko... <b> %1 </b> Kyasibwe: %S . Kuri Gusiba Kuva: i "
+"Seriveri: ? </p> </qt> "
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -8410,20 +8293,20 @@ msgstr "Byahagaritswe"
 #: kmfoldercachedimap.cpp:2812
 #, fuzzy
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
-"Seriveri: %1 OYA Gushigikira ya:  . Byakoreshejwe ku iyi Seriveri: ; - Kugena "
-"Imiterere . "
+"Seriveri: %1 OYA Gushigikira ya:  . Byakoreshejwe ku iyi Seriveri: ; - "
+"Kugena Imiterere . "
 
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
-"Seriveri: %1 OYA Gushigikira ya:  . Byakoreshejwe ku iyi Seriveri: ; - Kugena "
-"Imiterere . "
+"Seriveri: %1 OYA Gushigikira ya:  . Byakoreshejwe ku iyi Seriveri: ; - "
+"Kugena Imiterere . "
 
 #: kmfoldercachedimap.cpp:2951
 #, fuzzy
@@ -8437,17 +8320,16 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p> Gishya Ubutumwa in iyi Ububiko... , OYA Kuri i Seriveri: , OYA Kuri ku i "
 "Ububiko... NONEAHA Kuri Gushyiraho . Umuntu umuyobozi/uyobora Kuri Emera "
-"Gushyiraho Bya Gishya Ubutumwa Kuri , Cyangwa Himura Inyuma Bya iyi Ububiko... "
-". </p> "
-"<p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
+"Gushyiraho Bya Gishya Ubutumwa Kuri , Cyangwa Himura Inyuma Bya iyi "
+"Ububiko... . </p> <p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -8456,20 +8338,24 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p> Gishya Ubutumwa in iyi Ububiko... , OYA Kuri i Seriveri: , OYA Kuri ku i "
 "Ububiko... NONEAHA Kuri Gushyiraho . Umuntu umuyobozi/uyobora Kuri Emera "
-"Gushyiraho Bya Gishya Ubutumwa Kuri , Cyangwa Himura Inyuma Bya iyi Ububiko... "
-". </p> "
-"<p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
+"Gushyiraho Bya Gishya Ubutumwa Kuri , Cyangwa Himura Inyuma Bya iyi "
+"Ububiko... . </p> <p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Imura kuri:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "Ntubike"
@@ -8484,8 +8370,7 @@ msgstr "Kuri "
 msgid "Permissions (ACL)"
 msgstr "Uruhushya"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Rusange"
@@ -8511,8 +8396,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, fuzzy, no-c-format
 msgid "Use custom &icons"
 msgstr "Guhanga Udushushondanga "
@@ -8535,23 +8419,22 @@ msgstr "ku Gishya /Bidasomye: %S Ibaruwa in iyi Ububiko... "
 #: kmfolderdia.cpp:415
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> iyi Ihitamo ni Bikora Hanyuma Bigyanye Gishya /Bidasomye: %S Ibaruwa in iyi "
-"Ububiko... . , Kuri i Ibikurikira > /Ibanjirije Ububiko... Na: Bidasomye: %S "
-"Ubutumwa Guhagarara Ku iyi Ububiko... . </p> "
-"<p> iyi Ihitamo NIBA OYA Kuri Bigyanye Gishya /Bidasomye: %S Ibaruwa in iyi "
-"Ububiko... na NIBA iyi Ububiko... Kuri Ryari: Kuri i Ibikurikira > "
-"/Ibanjirije Ububiko... Na: Bidasomye: %S Ubutumwa . ni ya:  Icyo ari cyo cyose "
-"Gishya /Bidasomye: %S Ibaruwa in Agatebo njyamwanda na Ububiko... . </p> </qt> "
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt> <p> iyi Ihitamo ni Bikora Hanyuma Bigyanye Gishya /Bidasomye: %S "
+"Ibaruwa in iyi Ububiko... . , Kuri i Ibikurikira > /Ibanjirije Ububiko... "
+"Na: Bidasomye: %S Ubutumwa Guhagarara Ku iyi Ububiko... . </p> <p> iyi "
+"Ihitamo NIBA OYA Kuri Bigyanye Gishya /Bidasomye: %S Ibaruwa in iyi "
+"Ububiko... na NIBA iyi Ububiko... Kuri Ryari: Kuri i Ibikurikira > /"
+"Ibanjirije Ububiko... Na: Bidasomye: %S Ubutumwa . ni ya:  Icyo ari cyo "
+"cyose Gishya /Bidasomye: %S Ibaruwa in Agatebo njyamwanda na Ububiko... . </"
+"p> </qt> "
 
 #: kmfolderdia.cpp:431
 #, fuzzy
@@ -8566,9 +8449,9 @@ msgstr "in iyi Ububiko... "
 #: kmfolderdia.cpp:444
 #, fuzzy
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "iyi Ihitamo NIBA Kwandika Kuri in iyi Ububiko... Kuri Gushyira in iyi "
 "Ububiko... Nyuma , Bya in i Yoherejwe: - Ibaruwa Ububiko... . "
@@ -8583,17 +8466,21 @@ msgstr "/in Bya "
 msgid "Sho&w column:"
 msgstr "Kwerekana Inkingi"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Shyiraho mburabuzi"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Uwohereza"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Umwakirizi"
@@ -8606,16 +8493,17 @@ msgstr "Ikiranga : "
 #: kmfolderdia.cpp:486
 #, fuzzy
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "i Uwohereza Ikiranga Kuri Byakoreshejwe Ryari: Gishya Ibaruwa Cyangwa Kuri "
-"Ibaruwa in iyi Ububiko... . NIBA in Rimwe Bya Akazi Ububiko , Ubwoko Koresha i "
-"Uwohereza Imeli Aderesi: , Isinya na Ishirwaho umukono Cyangwa Bishunzwe: "
-"Utubuto mu buryo bwikora: . Gushyiraho Hejuru in i Iboneza Ikiganiro . ( - > ) "
+"Ibaruwa in iyi Ububiko... . NIBA in Rimwe Bya Akazi Ububiko , Ubwoko Koresha "
+"i Uwohereza Imeli Aderesi: , Isinya na Ishirwaho umukono Cyangwa Bishunzwe: "
+"Utubuto mu buryo bwikora: . Gushyiraho Hejuru in i Iboneza Ikiganiro . ( - "
+"> ) "
 
 #: kmfolderdia.cpp:500
 #, fuzzy
@@ -8636,24 +8524,24 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Igenamiterere Abakoresha Bisangiwe iyi Ububiko... Kubona \" Irahuze \" in "
 "Intonde na i Impuruza ya:  i Ibyabaye Cyangwa Ibikorwa in iyi Ububiko... . "
 "Igenamiterere Kuri na Ububiko ( ya:  Ibikorwa , iyi Igenamiterere ni "
 "Byakoreshejwe ya:  Impuruza ) . \n"
 "\n"
-"Urugero Koresha : NIBA i A Ububiko... Na: , i cy/byagarajwe Nka Irahuze ya:  , "
-"Guhitamo \" \" , guhera i Oya Umuyobozi ku i Ububiko... . \n"
-"i Ikindi NIBA A Itsinda A ya:  Itsinda , Byose Bya i Ububiko cy/byagarajwe Nka "
-"Irahuze ya:  . \n"
-"A Isosiyeti - Ububiko... Na: Bitari ngombwa Ibyabaye in Koresha \" \" guhera ni "
-"OYA Gyayo Kuri Ibyabaye . "
+"Urugero Koresha : NIBA i A Ububiko... Na: , i cy/byagarajwe Nka Irahuze "
+"ya:  , Guhitamo \" \" , guhera i Oya Umuyobozi ku i Ububiko... . \n"
+"i Ikindi NIBA A Itsinda A ya:  Itsinda , Byose Bya i Ububiko cy/byagarajwe "
+"Nka Irahuze ya:  . \n"
+"A Isosiyeti - Ububiko... Na: Bitari ngombwa Ibyabaye in Koresha \" \" guhera "
+"ni OYA Gyayo Kuri Ibyabaye . "
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8686,18 +8574,18 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 #, fuzzy
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "iyi Ububiko... Kuri Ibisobanuro: na i Rusange Iboneza Ihitamo Kuri Gushisha "
 "Ububiko ni Gushyiraho . iyi Ububiko... Kubura Rimwe i Iboneza Ikiganiro ni . "
@@ -8783,11 +8671,12 @@ msgstr "Ikosa Ububiko... Ibisobanuro: . "
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Ibaruwa Umubarendanga ya:  ' %1 ' ni Kuva: Kitazwi Verisiyo Bya ( %2 ) . \n"
-"Umubarendanga Kuva: Ibaruwa Ububiko... , Ibisobanuro: , Imimerere Amabendera , "
-"Gicurasi . Kuri Umubarendanga Idosiye ? "
+"Umubarendanga Kuva: Ibaruwa Ububiko... , Ibisobanuro: , Imimerere "
+"Amabendera , Gicurasi . Kuri Umubarendanga Idosiye ? "
 
 #: kmfolderindex.cpp:372
 #, fuzzy
@@ -8806,8 +8695,8 @@ msgid ""
 "information, like status flags, might get lost."
 msgstr ""
 "Ibaruwa Umubarendanga ya:  ' %1 ' ni Kuva: Kitazwi Verisiyo Bya ( %2 ) . \n"
-"Umubarendanga Kuva: Ibaruwa Ububiko... , Ibisobanuro: , Imimerere Amabendera , "
-"Gicurasi . Kuri Umubarendanga Idosiye ? "
+"Umubarendanga Kuva: Ibaruwa Ububiko... , Ibisobanuro: , Imimerere "
+"Amabendera , Gicurasi . Kuri Umubarendanga Idosiye ? "
 
 #: kmfoldermaildir.cpp:89
 #, fuzzy
@@ -8817,11 +8706,11 @@ msgstr "Ikosa Gufungura %S %1 ; iyi Ububiko... ni Ibuze . "
 #: kmfoldermaildir.cpp:92
 #, fuzzy
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Ikosa Gufungura %S %1 ; iyi ni OYA A Byemewe Ububiko... , Cyangwa OYA Uruhushya "
-". "
+"Ikosa Gufungura %S %1 ; iyi ni OYA A Byemewe Ububiko... , Cyangwa OYA "
+"Uruhushya . "
 
 #: kmfoldermaildir.cpp:124
 #, fuzzy
@@ -8869,19 +8758,17 @@ msgstr ""
 #: kmfoldermbox.cpp:129
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Umubarendanga Bya Ububiko... ' %2 ' Kuri Inyuma Bya Itariki: . &Ubutumwa i "
-"Umubarendanga . A Igisubizo Kyasibwe: %S Ubutumwa na Imimerere Amabendera . </p> "
-"<p> Soma i Icyinjijwe in i <a href=\"%1\"> Icyiciro Bya i Bikorwa Bya </a> "
-"ya:  Ibisobanuro: Bigyanye Kuri iyi Kuva: Nanone . </p> </qt> "
+"<qt> <p> Umubarendanga Bya Ububiko... ' %2 ' Kuri Inyuma Bya Itariki: . "
+"&Ubutumwa i Umubarendanga . A Igisubizo Kyasibwe: %S Ubutumwa na Imimerere "
+"Amabendera . </p> <p> Soma i Icyinjijwe in i <a href=\"%1\"> Icyiciro Bya i "
+"Bikorwa Bya </a> ya:  Ibisobanuro: Bigyanye Kuri iyi Kuva: Nanone . </p> </"
+"qt> "
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 #, fuzzy
@@ -8952,7 +8839,7 @@ msgstr ""
 "' %1 ' OYA Kugaragara Kuri A Ububiko... . \n"
 "Himura i Idosiye Inyuma Bya i . "
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 #, fuzzy
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
@@ -8961,7 +8848,7 @@ msgstr ""
 "Uruhushya Bya i Ububiko... ' %1 ' ; \n"
 "Ubwoko Reba na Guhindura i Ibirimo: Bya iyi Ububiko... . "
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 #, fuzzy
 msgid ""
 "KMail could not create folder '%1';\n"
@@ -8972,8 +8859,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8981,7 +8868,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Kuri Kurema Ububiko... "
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 #, fuzzy
 msgid ""
 "Cannot create file `%1' in %2.\n"
@@ -9033,8 +8920,8 @@ msgstr "Gushaka"
 #, fuzzy
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt> Kuri i Ibikurikira > Bidasomye: %S &Ubutumwa in Ububiko... <b> %1 </b> "
-"? </qt> "
+"<qt> Kuri i Ibikurikira > Bidasomye: %S &Ubutumwa in Ububiko... <b> %1 </"
+"b> ? </qt> "
 
 #: kmfoldertree.cpp:922
 #, fuzzy
@@ -9098,12 +8985,12 @@ msgstr "Gufasha mu gihe ky'ibibazo"
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt> Kurema Ububiko... <b> %1 </b> Bya Uruhushya ku i Seriveri: . Kuri Kurema , "
-"ask umuyobozi/uyobora Kuri Kuri . </qt> "
+"<qt> Kurema Ububiko... <b> %1 </b> Bya Uruhushya ku i Seriveri: . Kuri "
+"Kurema , ask umuyobozi/uyobora Kuri Kuri . </qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -9241,15 +9128,13 @@ msgstr "%1 ni Soma - . "
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt> Kuri Gusiba i Byahiswemo &Ubutumwa ? "
-"<br> Kyasibwe: %S , . </qt> \n"
-"<qt> Kuri Gusiba i %n Byahiswemo Ubutumwa ? "
-"<br> Kyasibwe: %S , . </qt> "
+"<qt> Kuri Gusiba i Byahiswemo &Ubutumwa ? <br> Kyasibwe: %S , . </qt> \n"
+"<qt> Kuri Gusiba i %n Byahiswemo Ubutumwa ? <br> Kyasibwe: %S , . </qt> "
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -9308,154 +9193,151 @@ msgstr ""
 "%1 \n"
 "( Umwanya Ibumoso: ku APAREYE ? ) "
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 #, fuzzy
 msgid "Certificate Signature Request"
 msgstr "Agaciro k'umukono w'impamyabushobozi"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Kurema A Impamyabushobozi: Kuva: Umugereka na Garuka Kuri Uwohereza . "
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 #, fuzzy
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "ni Gushyiraho Kuri Ntibicometse kuri interineti ; Byose urusobe Ibikorwa "
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 #, fuzzy
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "ni Gushyiraho Kuri kiri kuri interineti ; Byose urusobe Ibikorwa "
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 #, fuzzy
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "ni in Ntibicometse kuri interineti Ubwoko . Kuri ? "
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Korera hanze ya interneti"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Korera hanze ya interneti"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 #, fuzzy
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "OYA Soma /Kwandika Kuri Agasanduku k'Ibyinjiye Ububiko... . "
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 #, fuzzy
 msgid "outbox"
 msgstr "Ibyasohotse"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 #, fuzzy
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "OYA Soma /Kwandika Kuri Ibyasohotse Ububiko... . "
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 #, fuzzy
 msgid "sent-mail"
 msgstr "Ohereza Ibaruwa"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 #, fuzzy
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "OYA Soma /Kwandika Kuri Yoherejwe: - Ibaruwa Ububiko... . "
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 #, fuzzy
 msgid "trash"
 msgstr "Agatebo njyamwanda"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 #, fuzzy
 msgid "You do not have read/write permission to your trash folder."
 msgstr "OYA Soma /Kwandika Kuri Agatebo njyamwanda Ububiko... . "
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 #, fuzzy
 msgid "drafts"
 msgstr "Inyandiko z'agateganyo"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 #, fuzzy
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "OYA Soma /Kwandika Kuri Inyandiko z'agateganyo Ububiko... . "
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "Gusimbuza"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "OYA Soma /Kwandika Kuri Agatebo njyamwanda Ububiko... . "
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 #, fuzzy
 msgid "Last Search"
 msgstr "Gusibiramo Ishaka"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 #, fuzzy
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt> <i> %4 </i> Ububiko... . %1 NONEAHA i <i> %5 </i> "
-"Ububiko... ya:  Ubutumwa . "
-"<p> %2 Himura i Ibigize Bya <i> %6 <i> iyi Ububiko... ya:  , iyi Gicurasi "
-"Gusimbuza Icyo ari cyo cyose Idosiye Na: i Izina: in <i> %7 </i> . "
+"<qt> <i> %4 </i> Ububiko... . %1 NONEAHA i <i> %5 </i> Ububiko... ya:  "
+"Ubutumwa . <p> %2 Himura i Ibigize Bya <i> %6 <i> iyi Ububiko... ya:  , iyi "
+"Gicurasi Gusimbuza Icyo ari cyo cyose Idosiye Na: i Izina: in <i> %7 </i> . "
 "<p> <strong> nka %3 Kuri Himura i Ibaruwa Idosiye NONEAHA ? </strong> </qt> "
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 #, fuzzy
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt> <i> %4 </i> Ububiko... . %1 NONEAHA i <i> %5 </i> "
-"Ububiko... ya:  Ubutumwa . %2 Himura i Ibigize Bya <i> %6 </i> "
-"iyi Ububiko... ya:  . "
-"<p> <strong> nka %3 Kuri Himura i Ibaruwa Idosiye NONEAHA ? </strong> </qt> "
+"<qt> <i> %4 </i> Ububiko... . %1 NONEAHA i <i> %5 </i> Ububiko... ya:  "
+"Ubutumwa . %2 Himura i Ibigize Bya <i> %6 </i> iyi Ububiko... ya:  . <p> "
+"<strong> nka %3 Kuri Himura i Ibaruwa Idosiye NONEAHA ? </strong> </qt> "
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 #, fuzzy
 msgid "Migrate Mail Files?"
 msgstr "Imura ibiranga byose?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 #, fuzzy
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "A Ikosa na NONEAHA "
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, fuzzy, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -9466,12 +9348,12 @@ msgstr ""
 "Ikosa : \n"
 "%1 "
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 #, fuzzy
 msgid "Empty Trash"
 msgstr "&Gusiga ubusa mu Gatebo"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Kuri ubusa i Agatebo njyamwanda Ububiko Bya Byose Konti ? "
@@ -9563,8 +9445,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b> Ibaruwa </b> <br> %1 "
 
 #: kmmainwidget.cpp:971
@@ -9609,11 +9490,11 @@ msgstr "Kuri ubusa i Agatebo njyamwanda Ububiko... ? "
 #: kmmainwidget.cpp:1154
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt> Kuri Himura Byose Ubutumwa Kuva: Ububiko... <b> %1 </b> "
-"Kuri i Agatebo njyamwanda ? "
+"<qt> Kuri Himura Byose Ubutumwa Kuva: Ububiko... <b> %1 </b> Kuri i Agatebo "
+"njyamwanda ? "
 
 #: kmmainwidget.cpp:1173
 #, fuzzy
@@ -9640,11 +9521,11 @@ msgstr "Gusibiramo Ishaka"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt> Kuri Gusiba i Shakisha <b> %1 </b> ? "
-"<br> Ubutumwa Bihari in ~Umwimerere Ububiko... . "
+"<qt> Kuri Gusiba i Shakisha <b> %1 </b> ? <br> Ubutumwa Bihari in "
+"~Umwimerere Ububiko... . "
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -9658,33 +9539,36 @@ msgstr "<qt> Kuri Gusiba i ubusa Ububiko... <b> %1 </b> ? </qt> "
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt> Kuri Gusiba i ubusa Ububiko... <b> %1 </b> na Byose ? OYA ubusa na Ibigize "
-"Nka . </qt> "
+"<qt> Kuri Gusiba i ubusa Ububiko... <b> %1 </b> na Byose ? OYA ubusa na "
+"Ibigize Nka . </qt> "
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr "<qt> Kuri Gusiba i Ububiko... <b> %1 </b> , Ibigize ? </qt> "
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr "<qt> Kuri Gusiba i Ububiko... <b> %1 </b> na Byose , Ibigize ? </qt> "
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Byasibwe"
+
 #: kmmainwidget.cpp:1313
 #, fuzzy
 msgid ""
@@ -9702,12 +9586,12 @@ msgstr "Kuri Byose ki/bishaje Ubutumwa ? "
 #: kmmainwidget.cpp:1353
 #, fuzzy
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Bya in Ibaruwa Ubwoko Birenzeho Kuri \" \" na Gicurasi Kwongeraho i Sisitemu ku "
-"Ikindi na Umutekano . "
+"Bya in Ibaruwa Ubwoko Birenzeho Kuri \" \" na Gicurasi Kwongeraho i Sisitemu "
+"ku Ikindi na Umutekano . "
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -9722,8 +9606,8 @@ msgstr "Ongera HTML"
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "external Indango in HTML Ibaruwa Ubwoko Birenzeho Kuri \" \" na Gicurasi "
 "Kwongeraho i Sisitemu ku Ikindi na Umutekano . "
@@ -9746,8 +9630,8 @@ msgstr "ku - %1 ... "
 #: kmmainwidget.cpp:1738
 #, fuzzy
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "Bya ku Seriveri: - Iyungurura . OYA Seriveri: ya:  iyi . \n"
@@ -9770,7 +9654,8 @@ msgstr ""
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "OYA Tangira &vendorShortName; ( ) ; Kugenzura iyinjizaporogaramu . "
 
 #: kmmainwidget.cpp:2508
@@ -10157,8 +10042,7 @@ msgstr "Kubika ... "
 msgid "Appl&y All Filters"
 msgstr "Gukoresha Muyunguruzi"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Gukoresha Muyunguruzi"
@@ -10292,7 +10176,6 @@ msgstr "Ubutumwa Butasomwe Bukurikira"
 msgid "Go to the next unread message"
 msgstr "Kuri i Ibikurikira > Bidasomye: %S &Ubutumwa "
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 #, fuzzy
 msgid "&Previous Message"
@@ -10458,34 +10341,35 @@ msgstr "Gutangiza..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"&Ubutumwa ifite A Kubaza... Kuri Garuka A Ikimenyetso Bigyanye Bya i &Ubutumwa "
-". \n"
+"&Ubutumwa ifite A Kubaza... Kuri Garuka A Ikimenyetso Bigyanye Bya i "
+"&Ubutumwa . \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" \" Cyangwa Bisanzwe . "
 
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "&Ubutumwa ifite A Kubaza... Kuri Kohereza A Ikimenyetso Bigyanye Bya i "
 "&Ubutumwa . \n"
-"ifite A Inonosora ni cy/byagarajwe Nka \" Bya ngombwa \" , ni Kitazwi Kuri . \n"
+"ifite A Inonosora ni cy/byagarajwe Nka \" Bya ngombwa \" , ni Kitazwi "
+"Kuri . \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" Byanze \" . "
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -10498,8 +10382,8 @@ msgstr ""
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -10512,8 +10396,8 @@ msgstr ""
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -10521,8 +10405,8 @@ msgid ""
 msgstr ""
 "&Ubutumwa ifite A Kubaza... Kuri Kohereza A Ikimenyetso Bigyanye Bya i "
 "&Ubutumwa , \n"
-"i Garuka - Inzira: Aderesi: Kuva: i Aderesi: i Ikimenyetso Kuri Yoherejwe: Kuri "
-". \n"
+"i Garuka - Inzira: Aderesi: Kuva: i Aderesi: i Ikimenyetso Kuri Yoherejwe: "
+"Kuri . \n"
 "Kureka i Kubaza... Cyangwa Kohereza A \" \" Cyangwa Bisanzwe . "
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
@@ -10551,17 +10435,17 @@ msgstr "\" - - \" Bya ngombwa , Kitazwi Ikintu "
 msgid "Receipt: "
 msgstr "Umukoresha"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, fuzzy, c-format
 msgid "Attachment: %1"
 msgstr "Umugereka"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Imigereka: Nka ku Uwohereza . "
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -10618,45 +10502,39 @@ msgstr "Ibiranga Umutwempangano"
 #: kmmsgpartdlg.cpp:88
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> <em> Ubwoko: </em> Bya i Idosiye : </p> "
-"<p> , OYA Kuri iyi Igenamiterere , guhera i Ubwoko: Bya i Idosiye ni mu buryo "
-"bwikora: Ivivuwe ; , , %1 Gicurasi OYA &Gutahura i Ubwoko: - - ni . </p> </qt> "
+"<qt> <p> <em> Ubwoko: </em> Bya i Idosiye : </p> <p> , OYA Kuri iyi "
+"Igenamiterere , guhera i Ubwoko: Bya i Idosiye ni mu buryo bwikora: "
+"Ivivuwe ; , , %1 Gicurasi OYA &Gutahura i Ubwoko: - - ni . </p> </qt> "
 
 #: kmmsgpartdlg.cpp:100
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Ingano: Bya i Inzira %s : </p> "
-"<p> , %1 Ingano: , Ibara i NYACYO Ingano: Igihe ; Ryari: iyi ni i , Kigaragara "
-"ku Wongera \" ( . ) \" Kuri i Ingano: . </p> </qt> "
+"<qt> <p> Ingano: Bya i Inzira %s : </p> <p> , %1 Ingano: , Ibara i NYACYO "
+"Ingano: Igihe ; Ryari: iyi ni i , Kigaragara ku Wongera \" ( . ) \" Kuri i "
+"Ingano: . </p> </qt> "
 
 #: kmmsgpartdlg.cpp:114
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Idosiye Izina: Bya i Inzira %s : </p> "
-"<p> iyi Mburabuzi Kuri i Izina: Bya i Idosiye , OYA Kugaragaza i Idosiye Kuri ; "
-", A Idosiye Izina: Kuri Byakoreshejwe ku i Ibaruwa Umukozi Ryari: Mu kubika i "
-"Inzira %s Kuri Disiki%1 . </p> </qt> "
+"<qt> <p> Idosiye Izina: Bya i Inzira %s : </p> <p> iyi Mburabuzi Kuri i "
+"Izina: Bya i Idosiye , OYA Kugaragaza i Idosiye Kuri ; , A Idosiye Izina: "
+"Kuri Byakoreshejwe ku i Ibaruwa Umukozi Ryari: Mu kubika i Inzira %s Kuri "
+"Disiki%1 . </p> </qt> "
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -10665,17 +10543,15 @@ msgstr "Umwirondoro:"
 #: kmmsgpartdlg.cpp:128
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> A Umwirondoro: Bya i Inzira %s : </p> "
-"<p> iyi ni By'amakuru Umwirondoro: Bya i Inzira %s , nka i ni ya:  i &Ubutumwa "
-"; Ibaruwa abakozi/intandaro Herekana %S iyi Ibisobanuro: in &Ubutumwa i "
-"Agashushondanga . </p> </qt> "
+"<qt> <p> A Umwirondoro: Bya i Inzira %s : </p> <p> iyi ni By'amakuru "
+"Umwirondoro: Bya i Inzira %s , nka i ni ya:  i &Ubutumwa ; Ibaruwa abakozi/"
+"intandaro Herekana %S iyi Ibisobanuro: in &Ubutumwa i Agashushondanga . </p> "
+"</qt> "
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -10684,14 +10560,13 @@ msgstr "Isobeka:"
 #: kmmsgpartdlg.cpp:143
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr "<qt><p>G."
 
 #: kmmsgpartdlg.cpp:156
@@ -10702,20 +10577,17 @@ msgstr "Kikoresha Kugaragaza: "
 #: kmmsgpartdlg.cpp:159
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Ihitamo NIBA Kuri Gutanga ibyifuzo Kuri i Uwandikiwe i Kikoresha ( "
-"Mumurongo ) Kugaragaza: Bya iyi Inzira %s in i &Ubutumwa Ibibanjirije , Bya i "
-"Mburabuzi Agashushondanga Reba ; </p> "
-"<p> , iyi ni Inyuma ku Igenamiterere iyi <em> - </em> "
-"Umutwe Umwanya Kuri \" Mumurongo \" Bya i Mburabuzi \" Umugereka \" . </p> </qt> "
+"<qt> <p> iyi Ihitamo NIBA Kuri Gutanga ibyifuzo Kuri i Uwandikiwe i "
+"Kikoresha ( Mumurongo ) Kugaragaza: Bya iyi Inzira %s in i &Ubutumwa "
+"Ibibanjirije , Bya i Mburabuzi Agashushondanga Reba ; </p> <p> , iyi ni "
+"Inyuma ku Igenamiterere iyi <em> - </em> Umutwe Umwanya Kuri \" Mumurongo \" "
+"Bya i Mburabuzi \" Umugereka \" . </p> </qt> "
 
 #: kmmsgpartdlg.cpp:168
 #, fuzzy
@@ -10725,14 +10597,12 @@ msgstr "iyi Inzira %s "
 #: kmmsgpartdlg.cpp:171
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Ihitamo NIBA iyi &Ubutumwa Inzira %s Kuri ; </p> "
-"<p> i Isinya Na: i Urufunguzo Na: i - Byahiswemo Ikiranga . </p> </qt> "
+"<qt> <p> iyi Ihitamo NIBA iyi &Ubutumwa Inzira %s Kuri ; </p> <p> i Isinya "
+"Na: i Urufunguzo Na: i - Byahiswemo Ikiranga . </p> </qt> "
 
 #: kmmsgpartdlg.cpp:178
 #, fuzzy
@@ -10742,13 +10612,11 @@ msgstr "iyi Inzira %s "
 #: kmmsgpartdlg.cpp:181
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Ihitamo NIBA iyi &Ubutumwa Inzira %s Kuri Bishunzwe: ; </p> "
-"<p> i Inzira %s Bishunzwe: ya:  i Abandikiwe... Bya iyi &Ubutumwa </p> </qt> "
+"<qt> <p> iyi Ihitamo NIBA iyi &Ubutumwa Inzira %s Kuri Bishunzwe: ; </p> <p> "
+"i Inzira %s Bishunzwe: ya:  i Abandikiwe... Bya iyi &Ubutumwa </p> </qt> "
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -10764,15 +10632,12 @@ msgstr ": Muyunguruzi"
 #: kmpopfiltercnfrmdlg.cpp:293
 #, fuzzy
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Kuri Akayunguruzo: Byabonetse ku : <b> %1 </b> "
-"<p> Ubutumwa i Kinini Ingano: ya:  iyi Konti: . "
-"<br> Guhitamo Kuri Na: ku Kugenzura... i Akabuto . "
+"Kuri Akayunguruzo: Byabonetse ku : <b> %1 </b> <p> Ubutumwa i Kinini Ingano: "
+"ya:  iyi Konti: . <br> Guhitamo Kuri Na: ku Kugenzura... i Akabuto . "
 
 #: kmpopfiltercnfrmdlg.cpp:298
 #, fuzzy
@@ -11064,22 +10929,21 @@ msgstr "Imeli Umukiriya ya:  i . "
 #: kmreaderwin.cpp:1310
 #, fuzzy
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"< H2 Imisusire = ' Marije - Hejuru: : ; ' > </h2> "
-"<p> Tegereza . . . </p> &nbsp; "
+"< H2 Imisusire = ' Marije - Hejuru: : ; ' > </h2> <p> Tegereza . . . </p> "
+"&nbsp; "
 
 #: kmreaderwin.cpp:1318
 #, fuzzy
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"< H2 Imisusire = ' Marije - Hejuru: : ; ' > </h2> "
-"<p> ni in Ntibicometse kuri interineti Ubwoko . <a href=\"kmail:goOnline\"> </a> "
-"Kuri Gyayo kiri kuri interineti . . . </p> &nbsp; "
+"< H2 Imisusire = ' Marije - Hejuru: : ; ' > </h2> <p> ni in Ntibicometse "
+"kuri interineti Ubwoko . <a href=\"kmail:goOnline\"> </a> Kuri Gyayo kiri "
+"kuri interineti . . . </p> &nbsp; "
 
 #: kmreaderwin.cpp:1335
 #, fuzzy
@@ -11088,18 +10952,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -11107,15 +10970,14 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"< H2 Imisusire = ' Marije - Hejuru: : ; ' > Kuri %1 </h2> "
-"<p> ni i Imeli Umukiriya ya:  i . ni Kuri Na: , , na . </p> \n"
-"<ul> "
-"<li> Ibiranga in i <a href=\"%2\"> Inyandiko </a> </li> \n"
+"< H2 Imisusire = ' Marije - Hejuru: : ; ' > Kuri %1 </h2> <p> ni i Imeli "
+"Umukiriya ya:  i . ni Kuri Na: , , na . </p> \n"
+"<ul> <li> Ibiranga in i <a href=\"%2\"> Inyandiko </a> </li> \n"
 "<li> <a href=\"%3\"> Ipaji yo twinjira: </A> Ibisobanuro: Bigyanye Gishya "
 "Uburyo Bya </li> </ul> \n"
 "%8 \n"
-"<p> Bya i Gishya Ibiranga in iyi Irekura: Bya Gushyiramo ( Kuri %4 , ni Inzira "
-"%s Bya MukusanyaTDE %5 ) : </p> \n"
+"<p> Bya i Gishya Ibiranga in iyi Irekura: Bya Gushyiramo ( Kuri %4 , ni "
+"Inzira %s Bya MukusanyaTDE %5 ) : </p> \n"
 "<ul> \n"
 "%6 </ul> \n"
 "%7 \n"
@@ -11125,16 +10987,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 #, fuzzy
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 #, fuzzy
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -11181,7 +11041,8 @@ msgstr "Imigereka:"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[ : ifite Nyabibiri Ibyatanzwe . Kuri Herekana %S Itangira Inyuguti: . ] \n"
@@ -11211,12 +11072,14 @@ msgstr "Gufungura ? "
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -11241,6 +11104,63 @@ msgstr "( BIHUYE Icyo ari cyo cyose Bya i ) "
 msgid "(match all of the following)"
 msgstr "( BIHUYE Byose Bya i ) "
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Soma"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "ki/bishaje"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Byasibwe"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Yasubijwe"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Yongeye kwoherezwa"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Yashizwe ku murongo"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Byoherejwe"
+
+#: kmsearchpattern.h:228
+#, fuzzy
+msgid "Watched"
+msgstr "Isaha"
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "Kureka"
+
+#: kmsearchpattern.h:230
+#, fuzzy
+msgid "Spam"
+msgstr "Umwanya"
+
+#: kmsearchpattern.h:231
+#, fuzzy
+msgid "Ham"
+msgstr "am"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Gukora"
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "Ifite Imigereka"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -11331,22 +11251,22 @@ msgstr ""
 #: kmsender.cpp:386
 #, fuzzy
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"i Yoherejwe: &Ubutumwa \" %1 \" Kuva: i \" Ibyasohotse \" Kuri i \" Yoherejwe: "
-"- Ibaruwa \" Ububiko... Byanze . \n"
-"Bya Disiki%1 Umwanya Cyangwa Kwandika . Kugerageza Kuri i na Himura i &Ubutumwa "
-"N'intoki . "
+"i Yoherejwe: &Ubutumwa \" %1 \" Kuva: i \" Ibyasohotse \" Kuri i \" "
+"Yoherejwe: - Ibaruwa \" Ububiko... Byanze . \n"
+"Bya Disiki%1 Umwanya Cyangwa Kwandika . Kugerageza Kuri i na Himura i "
+"&Ubutumwa N'intoki . "
 
 #: kmsender.cpp:432
 #, fuzzy
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "OYA Kuri Kohereza Ubutumwa A Uwohereza Aderesi: . \n"
 "Gushyiraho i Imeli Aderesi: Bya Ikiranga ' %1 ' in i Icyiciro Bya i Iboneza "
@@ -11379,8 +11299,8 @@ msgstr "Uwohereza ... "
 #: kmsender.cpp:503
 #, fuzzy
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Kuri Kohereza Byose Yashizwe ku murongo Imeli ikoresha , Kuri Gukomeza ? "
 
@@ -11411,8 +11331,9 @@ msgstr "Kuri Kohereza ( ) Yashizwe ku murongo Ubutumwa . "
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr "G."
@@ -11425,13 +11346,11 @@ msgstr "Byahagaritswe . "
 #: kmsender.cpp:720
 #, fuzzy
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr "<p>G."
 
 #: kmsender.cpp:730
@@ -11454,8 +11373,9 @@ msgstr "Gushungura ubujyejuru"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr "G."
@@ -11500,9 +11420,9 @@ msgstr ""
 #: kmstartup.cpp:198
 #, fuzzy
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 Kuri ku Kugaragaza: ku iyi Imashini: . %2 Birenzeho Rimwe i Bya Ibaruwa . "
 "OYA Tangira &vendorShortName; %1 ni OYA . "
@@ -11510,19 +11430,19 @@ msgstr ""
 #: kmstartup.cpp:208
 #, fuzzy
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 Kuri ku Kugaragaza: ku iyi Imashini: . %1 na %2 Ku i Igihe i Bya Ibaruwa . "
-"OYA Tangira &vendorShortName; %2 %1 ni OYA . "
+"%1 Kuri ku Kugaragaza: ku iyi Imashini: . %1 na %2 Ku i Igihe i Bya "
+"Ibaruwa . OYA Tangira &vendorShortName; %2 %1 ni OYA . "
 
 #: kmstartup.cpp:216
 #, fuzzy
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 Kuri ku %2 . %1 Birenzeho Rimwe i Bya Ibaruwa . OYA Tangira "
 "&vendorShortName; %1 ku iyi ni OYA ku %2 . "
@@ -11530,9 +11450,9 @@ msgstr ""
 #: kmstartup.cpp:222
 #, fuzzy
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 Kuri ku %3 . %1 na %2 Ku i Igihe i Bya Ibaruwa . OYA Tangira "
 "&vendorShortName; %2 ku iyi %1 ni OYA ku %3 . "
@@ -11546,6 +11466,10 @@ msgstr "Gutangira..."
 msgid "Exit"
 msgstr "Gusohoka"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -11575,8 +11499,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "ni OYA Bihari . ni Kuri Koresha ya:  Amagambo banga . \n"
@@ -11674,8 +11599,8 @@ msgstr "Kwemeza "
 #: kmtransport.cpp:429
 #, fuzzy
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr "iyi Ihitamo NIBA Seriveri: Kwemeza Mbere Ibaruwa . ni Nka ' Cyangwa . "
 
 #: kmtransport.cpp:442
@@ -11701,15 +11626,13 @@ msgstr "Guhanga Izina ry'inturo: Kuri Seriveri: "
 #: kmtransport.cpp:478
 #, fuzzy
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "iyi Ihitamo Kuri Koresha A Guhanga Izina ry'inturo: Ryari: Kuri i Ibaruwa "
-"Seriveri: . "
-"<p> ni Ryari: Izina ry'inturo: Gicurasi OYA Gushyiraho Cyangwa Kuri nibyo Izina "
-"ry'inturo: . "
+"Seriveri: . <p> ni Ryari: Izina ry'inturo: Gicurasi OYA Gushyiraho Cyangwa "
+"Kuri nibyo Izina ry'inturo: . "
 
 #: kmtransport.cpp:485
 #, fuzzy
@@ -11744,8 +11667,8 @@ msgstr "Bya hafi Idosiye . "
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Umwanya ubusa . Injiza i Izina: Cyangwa i Aderesi: Bya i Seriveri: . "
 
 #: kmtransport.cpp:788
@@ -11760,10 +11683,10 @@ msgstr "Ikosa Ububiko... %1 : "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -12026,29 +11949,24 @@ msgstr "Hindura ubutumwa nki gishya"
 #: messagecomposer.cpp:223
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr "<qt><p>Shakishauyoboraurwungano."
 
 #: messagecomposer.cpp:227
 #, fuzzy
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p> Gikora - Byabonetse na i - in Inyandikoporogaramu OYA Gukoresha . </p> "
-"<p> Kabiri Kuri Guhindura... iyi : </p> "
-"<ul> "
-"<li> <em> </em> Kureka bigakora A - ikoresha i - > - > - Ikiganiro . </li> "
-"<li> <em> Cyangwa </em> Kugaragaza Igenamiterere ku i - > tab . </li> </ul> "
+"<p> Kabiri Kuri Guhindura... iyi : </p> <ul> <li> <em> </em> Kureka bigakora "
+"A - ikoresha i - > - > - Ikiganiro . </li> <li> <em> Cyangwa </em> "
+"Kugaragaza Igenamiterere ku i - > tab . </li> </ul> "
 
 #: messagecomposer.cpp:445
 #, fuzzy
@@ -12062,10 +11980,11 @@ msgstr ""
 #: messagecomposer.cpp:557
 #, fuzzy
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Impera y'inyuma OYA i \" x - Shyiraho Umutekano \" Umumaro . Icyegeranyo iyi . "
+"Impera y'inyuma OYA i \" x - Shyiraho Umutekano \" Umumaro . Icyegeranyo "
+"iyi . "
 
 #: messagecomposer.cpp:565
 #, fuzzy
@@ -12073,8 +11992,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\" x - Shyiraho Umutekano \" Umumaro OYA Kwemera i Ikitezwe: $(ARG1) Ibigenga . "
-"Icyegeranyo iyi "
+"\" x - Shyiraho Umutekano \" Umumaro OYA Kwemera i Ikitezwe: $(ARG1) "
+"Ibigenga . Icyegeranyo iyi "
 
 #: messagecomposer.cpp:573
 #, fuzzy
@@ -12084,8 +12003,8 @@ msgstr "Ikosa "
 #: messagecomposer.cpp:578
 #, fuzzy
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Garuka Agaciro: Kuva: Impera y'inyuma : \" x - Shyiraho Umutekano \" Umumaro "
 "OYA Garuka A Bayite Imbonerahamwe . Icyegeranyo iyi . "
@@ -12093,8 +12012,8 @@ msgstr ""
 #: messagecomposer.cpp:636
 #, fuzzy
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Mumurongo &Ubutumwa Imiterere OYA Gushigikira Bishunzwe: Cyangwa Ishirwaho "
@@ -12159,8 +12078,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Kuri Shyiraho Umukono iyi &Ubutumwa , Oya Byemewe Ishirwaho umukono Utubuto ya: "
-" iyi Ikiranga "
+"Kuri Shyiraho Umukono iyi &Ubutumwa , Oya Byemewe Ishirwaho umukono Utubuto "
+"ya:  iyi Ikiranga "
 
 #: messagecomposer.cpp:808
 #, fuzzy
@@ -12226,12 +12145,12 @@ msgstr ""
 #: messagecomposer.cpp:875
 #, fuzzy
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Bya i Bishunzwe: Ibya&hiswemo Cyangwa OYA Kuri Shyiraho Umutekano iyi &Ubutumwa "
-". \n"
+"Bya i Bishunzwe: Ibya&hiswemo Cyangwa OYA Kuri Shyiraho Umutekano iyi "
+"&Ubutumwa . \n"
 "iyi &Ubutumwa ? "
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -12271,11 +12190,12 @@ msgstr "Ntushireho umutekano kuri iyi imeli"
 #: messagecomposer.cpp:925
 #, fuzzy
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Kuri Shyiraho Umutekano iyi &Ubutumwa , na Kuri Shyiraho Umutekano A Gukoporora "
-"Kuri , Oya Byemewe Bishunzwe: Utubuto ya:  iyi Ikiranga . "
+"Kuri Shyiraho Umutekano iyi &Ubutumwa , na Kuri Shyiraho Umutekano A "
+"Gukoporora Kuri , Oya Byemewe Bishunzwe: Utubuto ya:  iyi Ikiranga . "
 
 #: messagecomposer.cpp:930
 #, fuzzy
@@ -12286,8 +12206,8 @@ msgstr "Kohereza ibidasobetse"
 #, fuzzy
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Bya iyi &Ubutumwa OYA Bishunzwe: . \n"
@@ -12316,89 +12236,85 @@ msgstr "Aligoritime y'ishirwaho ry'umutekano:"
 msgid "Unencrypted Message Warning"
 msgstr "Ubutumwa butoherejwe"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt> "
-"<p> Ikosa : Impera y'inyuma OYA Garuka Icyo ari cyo cyose Ibyatanzwe . </p> "
-"<p> Icyegeranyo iyi : "
-"<br> %2 </p> </qt> "
+"<qt> <p> Ikosa : Impera y'inyuma OYA Garuka Icyo ari cyo cyose Ibyatanzwe . "
+"</p> <p> Icyegeranyo iyi : <br> %2 </p> </qt> "
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 #, fuzzy
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr "<qt> Byose Inyuguti i Imisobekere: . <br> <br> i &Ubutumwa ? </qt> "
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Kwimura Inyuguti Ibumoso"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Lose Characters"
 msgstr "Kugera ku nyuguti"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Imisobekere y'Inyuguti"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"&Ubutumwa OYA , guhera i Impera y'inyuma OYA Kuri Gushigikira Ishirwaho umukono "
-"; iyi Nta na rimwe , Icyegeranyo iyi . "
+"&Ubutumwa OYA , guhera i Impera y'inyuma OYA Kuri Gushigikira Ishirwaho "
+"umukono ; iyi Nta na rimwe , Icyegeranyo iyi . "
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 #, fuzzy
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"&Ubutumwa OYA , guhera i Impera y'inyuma OYA Kuri Gushigikira Ishirwaho umukono "
-"; iyi Nta na rimwe , Icyegeranyo iyi . "
+"&Ubutumwa OYA , guhera i Impera y'inyuma OYA Kuri Gushigikira Ishirwaho "
+"umukono ; iyi Nta na rimwe , Icyegeranyo iyi . "
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 #, fuzzy
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "&Ubutumwa OYA Bishunzwe: , guhera i Impera y'inyuma OYA Kuri Gushigikira "
 "Bishunzwe: ; iyi Nta na rimwe , Icyegeranyo iyi . "
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 #, fuzzy
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "&Ubutumwa OYA na Bishunzwe: , guhera i Impera y'inyuma OYA Kuri Gushigikira "
 "Ishirwaho umukono na Bishunzwe: ; iyi Nta na rimwe , Icyegeranyo iyi . "
@@ -12425,14 +12341,14 @@ msgstr "Imiterere : "
 #: newfolderdialog.cpp:101
 #, fuzzy
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Kuri i Ubutumwa in iyi Ububiko... Nka Rimwe Idosiye &Ubutumwa ( ) Cyangwa Nka "
-"Rimwe Idosiye ( ) . ku Mburabuzi na iyi Kuri Byahinduwe in . , iyi Ihitamo Nka "
-"- ni . "
+"Kuri i Ubutumwa in iyi Ububiko... Nka Rimwe Idosiye &Ubutumwa ( ) Cyangwa "
+"Nka Rimwe Idosiye ( ) . ku Mburabuzi na iyi Kuri Byahinduwe in . , iyi "
+"Ihitamo Nka - ni . "
 
 #: newfolderdialog.cpp:124
 #, fuzzy
@@ -12443,11 +12359,12 @@ msgstr "ifite : "
 #, fuzzy
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "i Gishya Ububiko... Kuri Byakoreshejwe ya:  Ibaruwa Bya ya:  Bya Ibigize Nka "
-"Ibikorwa Cyangwa Ibisobanuro . Mburabuzi ni Ibaruwa . , iyi Ihitamo Nka - ni . "
+"Ibikorwa Cyangwa Ibisobanuro . Mburabuzi ni Ibaruwa . , iyi Ihitamo Nka - "
+"ni . "
 
 #: newfolderdialog.cpp:165
 #, fuzzy
@@ -12494,8 +12411,7 @@ msgstr "ibisubizo ya:  "
 msgid "The crypto engine returned no cleartext data."
 msgstr "Oya Ibyatanzwe . "
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 #, fuzzy
 msgid "Status: "
 msgstr "Imimerere:"
@@ -12529,8 +12445,8 @@ msgstr "%1 - in Byabonetse . "
 #: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "&Ubutumwa ni , i Ukugira agaciro Bya i Isinya Byagenzuwe . <br /> : %1 "
 
@@ -12572,27 +12488,27 @@ msgstr "- in \" %1 \" Ubutumwa . "
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b> icyitonderwa : </b> &Ubutumwa Gicurasi external Indango Kuri Ishusho . "
-"Umutekano /Agenga external Indango OYA . i Uwohereza Bya iyi &Ubutumwa Hanyuma "
-"Ibirimo i external Indango ya:  iyi &Ubutumwa <a href=\"kmail:loadExternal\"> "
-"ku </a> . "
+"Umutekano /Agenga external Indango OYA . i Uwohereza Bya iyi &Ubutumwa "
+"Hanyuma Ibirimo i external Indango ya:  iyi &Ubutumwa <a href=\"kmail:"
+"loadExternal\"> ku </a> . "
 
 #: objecttreeparser.cpp:1010
 #, fuzzy
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b> icyitonderwa : </b> ni &Ubutumwa . Umutekano , i Inyandikoporogaramu ni . i "
-"Uwohereza Bya iyi &Ubutumwa Hanyuma Kureka bigakora Byahanaguwe Kugaragaza: ya: "
-" iyi &Ubutumwa <a href=\"kmail:showHTML\"> ku </a> . "
+"<b> icyitonderwa : </b> ni &Ubutumwa . Umutekano , i Inyandikoporogaramu "
+"ni . i Uwohereza Bya iyi &Ubutumwa Hanyuma Kureka bigakora Byahanaguwe "
+"Kugaragaza: ya:  iyi &Ubutumwa <a href=\"kmail:showHTML\"> ku </a> . "
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -12878,8 +12794,8 @@ msgstr "bishunguwe"
 #: objecttreeparser.cpp:2513
 #, fuzzy
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Ibaruwa Aderesi: ni in i %1 Byakoreshejwe ya:  Ishirwaho umukono , Twebwe "
 "Kugereranya # Kuri i Aderesi: %2 . "
@@ -13019,13 +12935,14 @@ msgstr "Ikosa "
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Seriveri: OYA Gushigikira i command : iyi command ni Bya ngombwa Kuri , in A , "
-"Bya i ku i Seriveri: Mbere ; \n"
+"Seriveri: OYA Gushigikira i command : iyi command ni Bya ngombwa Kuri , in "
+"A , Bya i ku i Seriveri: Mbere ; \n"
 "i Ikiranga Kuri i ku i Seriveri: OYA Akazi . "
 
 #: popaccount.cpp:752
@@ -13049,9 +12966,11 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"&Ubutumwa %1 Bya %2 ( %3 Bya %4 ) ya:  %5 @ %6 ( %7 isigaye ku i Seriveri: ) . "
+"&Ubutumwa %1 Bya %2 ( %3 Bya %4 ) ya:  %5 @ %6 ( %7 isigaye ku i "
+"Seriveri: ) . "
 
 #: popaccount.cpp:912
 #, fuzzy
@@ -13073,1812 +12992,14 @@ msgstr ""
 #: popaccount.cpp:1026
 #, fuzzy
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Seriveri: OYA Gushigikira i command . ni OYA Kuri i Imitwe Bya Kinini Itangira "
-", Mbere Iyimura . "
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Gyayo"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, fuzzy, no-c-format
-msgid "F&older"
-msgstr "Ububiko"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Ubutumwa"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, fuzzy, no-c-format
-msgid "Reply Special"
-msgstr "Bidasanzwe"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "Gya Imbere"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "HTML Toolbar"
-msgstr "UmwanyaBikoresho w'ifasha"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Ishirwaho umukono"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Shyiraho Umukono Ubutumwa "
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"iyi Ihitamo ni Bikora , Byose Ubutumwa Kohereza ku Mburabuzi ; Bya , ni Kuri "
-"Kwangira Ishirwaho umukono ya:  &Ubutumwa . "
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Gushyira umutekano:"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"Seriveri: OYA Gushigikira i command . ni OYA Kuri i Imitwe Bya Kinini "
+"Itangira , Mbere Iyimura . "
 
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"iyi Ihitamo ni Bikora , i &Ubutumwa /Idosiye OYA Bishunzwe: Na: i public "
-"Urufunguzo , Na: Urufunguzo . Gushoboza Kuri i &Ubutumwa /Idosiye Ku A Nyuma "
-"Igihe . ni A . "
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, fuzzy, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "/Bishunzwe: Umwandiko Nyuma "
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"iyi Ihitamo ni Bikora , i /Bishunzwe: Umwandiko in A Idirishya , Kuri Kureba "
-"Mbere ni Yoherejwe: . ni A Ryari: Bishunzwe: Sisitemu . "
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Yoherejwe: Ubutumwa Bishunzwe: "
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Kuri Ubutumwa Bishunzwe: "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"iyi Agasanduku ni Ivivuwe , Yoherejwe: Ubutumwa Bishunzwe: nka Yoherejwe: . ni "
-"OYA , Nka OYA Kuri Soma i Ubutumwa Icyo ari cyo cyose NIBA A Impamyabushobozi: "
-"Yarenze igihe: . \n"
-"<p> \n"
-", Gicurasi Bya hafi Kuri iyi Ihitamo ku . in , Kugenzura Na: Bya hafi "
-"umuyobozi/uyobora . \n"
-"</qt> "
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, fuzzy, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Herekana %S i Bishunzwe: Utubuto ya:  "
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"iyi Ihitamo ni Bikora , i Porogaramu Buri gihe Herekana %S A Urutonde Bya "
-"public Utubuto Kuva: Hitamo... i Rimwe Koresha ya:  Bishunzwe: . ni Bidakora , "
-"i Porogaramu Herekana %S i Ikiganiro NIBA Gushaka i Iburyo: Urufunguzo Cyangwa "
-"NIBA Byakoreshejwe . "
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Shyiraho Umutekano Ubutumwa "
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"iyi Ihitamo ni Bikora , buri &Ubutumwa Kohereza Bishunzwe: Bishunzwe: ni na ; "
-"Bya , ni Kuri Kwangira i Kikoresha Bishunzwe: ya:  &Ubutumwa . "
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, fuzzy, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-"Shyiraho Umukono /Shyiraho Umutekano Ryari: Mu kubika Nka Inyandiko "
-"y'agateganyo "
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Kuri:"
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "KopiKubandi"
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Rusange"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "Subiza kanaka"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Gusubiza Bose"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "Gya Imbere"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Ihinanzira:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "Gusimbuza"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Ibiranga ububiko"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, fuzzy, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "A Urutonde "
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "List &address:"
-msgstr "Aderesi: : "
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, fuzzy, no-c-format
-msgid "N&ormal:"
-msgstr "Bisanzwe"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, fuzzy, no-c-format
-msgid "Unr&ead:"
-msgstr "Bidasomye:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "Ubutumwa bufunitse"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, fuzzy, no-c-format
-msgid "E&xpire after:"
-msgstr "Nyuma : "
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "Soma Ubutumwa "
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, fuzzy, no-c-format
-msgid "Expire a&fter:"
-msgstr "Nyuma : "
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "Bidasomye: %S Ubutumwa "
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "U(I)munsi"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, fuzzy, no-c-format
-msgid "Week(s)"
-msgstr "ibyumweru"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, fuzzy, no-c-format
-msgid "Month(s)"
-msgstr "amezi"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Urwego rwo hejuru"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "Ikiranga : "
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "Imiterere : "
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "URL yo kugaragaza"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, fuzzy, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Impamyabushobozi ikoresha "
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, fuzzy, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr "iyi Ihitamo ni Byahiswemo , S /Impamyabushobozi ikoresha ( ) . "
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, fuzzy, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Impamyabushobozi kiri kuri interineti ( ) "
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, fuzzy, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"iyi Ihitamo ni Byahiswemo , S /Impamyabushobozi kiri kuri interineti ikoresha i "
-"( ) . in i Bya i munsi . "
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Inyemeza (iyemeza: "
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, fuzzy, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"i Aderesi: Bya i Seriveri: ya:  kiri kuri interineti Kwemeza Bya "
-"Impamyabushobozi ( ) . ni Itangira... Na: HTTP : //. "
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Isinya : "
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Serivisi Bya Impamyabushobozi "
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "OYA Kugenzura Impamyabushobozi: Amategeko: "
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Mburabuzi i Idosiye ~ /. /Amategeko: . txt Kuri Kugenzura NIBA A "
-"Impamyabushobozi: Itegeko ni . iyi Ihitamo ni Byahiswemo , Amategeko: OYA "
-"Ivivuwe . "
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Never consult a CRL"
-msgstr "A "
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, fuzzy, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"iyi Ihitamo ni Ivivuwe , Nta na rimwe Byakoreshejwe Kuri validate S "
-"/Impamyabushobozi . "
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Ibuze Wasohoye Impamyabushobozi "
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, fuzzy, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"iyi Ihitamo ni Ivivuwe , Ibuze Wasohoye Impamyabushobozi Ryari: ( iyi Kuri "
-"Byombi Kwemeza , na ) "
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, fuzzy, no-c-format
-msgid "HTTP Requests"
-msgstr "Ibisabwa"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, fuzzy, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "OYA Icyo ari cyo cyose "
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, fuzzy, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "i Koresha Bya ya:  S /. "
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, fuzzy, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "iyi Porogisi ya:  : "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, fuzzy, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Sisitemu Porogisi : "
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, fuzzy, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"iyi Ihitamo ni Byahiswemo , i Agaciro: Bya i Porogisi ku i Iburyo: ( Kuva: i "
-"Impinduragaciro ) Byakoreshejwe ya:  Icyo ari cyo cyose Kubaza... . "
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, fuzzy, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr "Ubuhano."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ikwirakwiza Akadomo Bya Impamyabushobozi "
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, fuzzy, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"ya:  i Indanganturo Bya A , i Kuri - - Impamyabushobozi: ifite Nka \" \" ( ) "
-"Ibyinjijwe , i Kuri i . Itangira Byabonetse Icyinjijwe ni Byakoreshejwe . iyi "
-"Ihitamo Byose Ibyinjijwe ikoresha i Igishusho Ryari: ya:  A . "
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, fuzzy, no-c-format
-msgid "LDAP Requests"
-msgstr "Ibisabwa"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, fuzzy, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "OYA Icyo ari cyo cyose "
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, fuzzy, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "i Koresha Bya ya:  S /. "
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ikwirakwiza Akadomo Bya Impamyabushobozi "
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, fuzzy, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"ya:  i Indanganturo Bya A , i Kuri - - Impamyabushobozi: ifite Nka \" \" ( ) "
-"Ibyinjijwe , i Kuri i . Itangira Byabonetse Icyinjijwe ni Byakoreshejwe . iyi "
-"Ihitamo Byose Ibyinjijwe ikoresha i Igishusho Ryari: ya:  A . "
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, fuzzy, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Inturo: ya:  : "
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, fuzzy, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"A Seriveri: Ubwoko Byose Gyayo Kuri Seriveri: Itangira . , iyi Igenamiterere "
-"Icyo ari cyo cyose Inturo: na Umuyoboro: Inzira %s in A na Byakoreshejwe NIBA "
-"Inturo: na Umuyoboro: Kuva: i . Amaseriveri Byakoreshejwe NIBA i Ukwihuza Kuri "
-"i \" Porogisi \" Byanze . \n"
-"ni \" \" Cyangwa \" : \" . ni , Umuyoboro: ( Bisanzwe Umuyoboro: ) ni "
-"Byakoreshejwe . "
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "Ongeraho"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "Izina ry'Itsinda :"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Ongera utangire bushya Ibyashizweho"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "bitagira imbibi"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Iboneza ry'Ingano"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Subiza Uwohereje"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Gusubiza Bose"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Kohereza Ubutumwa"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, fuzzy, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Ryari: Kuri Kohereza Bitashizweho umukono Ubutumwa "
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, fuzzy, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Kuri Ryari: Bitashizweho umukono Ubutumwa . "
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"iyi Agasanduku ni Ivivuwe , Ryari: Kugerageza Kuri Kohereza Bya Cyangwa i "
-"&Ubutumwa Bitashizweho umukono . \n"
-"<p> \n"
-"ni Kuri iyi Ihitamo ku ya:  Kinini . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, fuzzy, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Ryari: Kuri Kohereza Ubutumwa "
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, fuzzy, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Kuri Ryari: Ubutumwa . "
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"iyi Agasanduku ni Ivivuwe , Ryari: Kugerageza Kuri Kohereza Bya Cyangwa i "
-"&Ubutumwa . \n"
-"<p> \n"
-"ni Kuri iyi Ihitamo ku ya:  Kinini . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "NIBA ni in "
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, fuzzy, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Kuri NIBA i Aderesi: ni OYA in i Impamyabushobozi: "
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"iyi Ihitamo ni Ivivuwe , A Iburira ni Byasohowe NIBA i Imeli Aderesi: Bya i "
-"Mwakirizi ni OYA in i Impamyabushobozi: Byakoreshejwe ya:  . \n"
-"<p> \n"
-"ni Kuri iyi Ihitamo ku ya:  Kinini Umutekano . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "NIBA Impamyabushobozi /Utubuto ( Kugena Imiterere munsi ) "
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "Ishirwaho umukono "
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Bishunzwe: "
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, fuzzy, no-c-format
-msgid " days"
-msgstr "iminsi"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, fuzzy, no-c-format
-msgid "Select the number of days here"
-msgstr "i Umubare Bya iminsi "
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"i Gito Umubare Bya iminsi i Isinya Impamyabushobozi: Byemewe A Iburira . \n"
-"<p> \n"
-"Igenamiterere ni 14 iminsi . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"i Gito Umubare Bya iminsi i Bishunzwe: Impamyabushobozi: Byemewe A Iburira . \n"
-"<p> \n"
-"Igenamiterere ni 14 iminsi . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> A </h1> \n"
-"i Gito Umubare Bya iminsi Byose Impamyabushobozi in i Umunyururu: Byemewe A "
-"Iburira . \n"
-"<p> \n"
-"Igenamiterere ni 14 iminsi . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"i Gito Umubare Bya iminsi i Impamyabushobozi: Byemewe A Iburira . \n"
-"<p> \n"
-"Igenamiterere ni 14 iminsi . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, fuzzy, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt> \n"
-"<h1> </h1> \n"
-"i Gito Umubare Bya iminsi i Imizi Impamyabushobozi: Byemewe A Iburira . \n"
-"<p> \n"
-"Igenamiterere ni 14 iminsi . \n"
-"</qt> "
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Imizi Impamyabushobozi : "
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Impamyabushobozi : "
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Impera - Umukoresha Impamyabushobozi /Utubuto : "
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, fuzzy, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "- Gushoboza \" \" "
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Ibigize : "
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "Gusimbuza"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "Gusimbuza"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, fuzzy, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Yashizwe ku murongo Ibaruwa ku Ibaruwa Kugenzura "
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p> Kuri Kohereza Byose Ubutumwa in i Ibyasohotse ku Bikorwa Cyangwa Byose "
-"Ibaruwa , Cyangwa OYA Ubutumwa Kuri Yoherejwe: mu buryo bwikora: Ku Byose . </p> "
-"</qt> "
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p> Gishya Ubutumwa in iyi Ububiko... , OYA Kuri i Seriveri: , OYA Kuri ku i "
-"Ububiko... NONEAHA Kuri Gushyiraho . Umuntu umuyobozi/uyobora Kuri Emera "
-"Gushyiraho Bya Gishya Ubutumwa Kuri , Cyangwa Himura Inyuma Bya iyi Ububiko... "
-". </p> "
-"<p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, fuzzy, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Byahiswemo Ububiko... in i Ububiko... Ihitamo Ikiganiro . "
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, fuzzy, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "ya:  i Sisitemu Agasanduku Agashushondanga "
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Gishya Ibaruwa Ikimenyetso "
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, fuzzy, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"iyi Ihitamo ni Bikora Hanyuma ya:  Ububiko... i Umubare Bya Ubutumwa ni in i "
-"Gishya Ibaruwa Ikimenyetso ; , Kubona A Byoroheje ' Ibaruwa &Ubutumwa . "
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, fuzzy, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Muhinduzi : "
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, fuzzy, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "external Muhinduzi Bya &Uhimba "
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, fuzzy, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Kubashisha ibonerana"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, fuzzy, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ": /: Imitwe in Kuri "
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, fuzzy, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"A Umubare Bya in Bya i Bisanzwe ; iyi Ihitamo Rimwe Bya . Na: Abakoresha OYA "
-"Kuri Kubona , Kugerageza Igenamiterere iyi Ihitamo . "
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, fuzzy, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "in i Ibaruwa Umubiri "
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, fuzzy, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"A Umubare Bya in Bya i Bisanzwe ; iyi Ihitamo Rimwe Bya . Na: Abakoresha OYA "
-"Kuri Kubona , Kugerageza Igenamiterere iyi Ihitamo . "
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Isunika Ryikoresha"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, fuzzy, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"iyi ni Ivivuwe , OYA i Ibaruwa &Uhimba Idirishya . , Byose Yoherejwe: mu buryo "
-"bwikora: . Kuri i Ibaruwa Mbere , Kuramo ivivura iyi Ihitamo . , i Umwandiko in "
-"i &Uhimba Idirishya ni in , na OYA Kugerageza ku . "
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, fuzzy, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p> iyi Kuri i Ibyinjijwe Kuva: i Porogaramu ( , , na . ) </p> "
-"<p> Kuri Gushyiraho iyi Ihitamo Gushyiraho i Porogaramu Kuri Koresha i "
-"Ibikorana: ; iyi ni Byakozwe in i MukusanyaTDE . </p> "
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, fuzzy, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p> OYA Icyo ari cyo cyose Impamvu Kuri i Ububiko Gufata i Ibikorana . NIBA "
-"Kuri , Gushyiraho "
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, fuzzy, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p> i Imiterere Bya i Ububiko . "
-"<ul> "
-"<li> Mburabuzi Imiterere ni Kuri Koresha i ( ya:  kalindari Ububiko ) na vCard "
-"( ya:  Ububiko ) . Imiterere Byose Ibiranga Bihari . </li> "
-"<li> Imiterere A Guhanga Urugero Birenzeho i Rimwe Byakoreshejwe in . Imiterere "
-"Bihuye neza , Ryari: ikoresha A Seriveri: Cyangwa A . </li> </ul> </p> "
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, fuzzy, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p> i Bya i Ibikorana: Ububiko . </p> "
-"<p> Mburabuzi , i Seriveri: i Agasanduku k'Ibyinjiye Kuri i . </p> "
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, fuzzy, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p> ni i Bya i Konti: i Ibikorana: Ububiko . </p> "
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, fuzzy, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p> Kuri Gushyiraho i Ububiko... Amazina Bya i Kuri Bya hafi Ururimi: , "
-"Hitamo... hagati Bihari Indimi . </p> "
-"<p> Impugukirwa , i Impamvu Kuri ni ya:  Bihuye neza Na: . ni A Kuri Gushyiraho "
-"iyi , guhera Indimi . </p> "
-"<p> OYA Gushyiraho iyi Kuri . </p> "
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, fuzzy, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Agaciro: ni Byakoreshejwe Kuri i . "
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, fuzzy, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Umubare Bya Ukwihuza Inturo: "
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, fuzzy, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Byakoreshejwe Kuri i Umubare Bya Ukwihuza Inturo: Kugenzura... ya:  Gishya "
-"Ibaruwa . Mburabuzi i Umubare Bya Ukwihuza ni Bitarangira ( 0 %S ) . "
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, fuzzy, no-c-format
-msgid "Show quick search line edit"
-msgstr "Shakisha Umurongo: Kwandika "
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, fuzzy, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ihitamo Cyangwa i Shakisha Umurongo: Kwandika hejuru i &Ubutumwa Urutonde "
-"Byakoreshejwe Kuri Shakisha i Ibisobanuro: in i &Ubutumwa Urutonde . "
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "~Umwimerere KubonezaInyuguti: Ryari: Cyangwa NIBA "
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Kongeraho... Isinya "
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, fuzzy, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"iyi Ikiranga , Byakoreshejwe in &Uhimba Windows Nka . \n"
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, fuzzy, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"iyi Ububiko... ya:  Yoherejwe: Ibigize , Byakoreshejwe in &Uhimba Windows Nka . "
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, fuzzy, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "iyi Ibaruwa , Byakoreshejwe in &Uhimba Windows Nka . "
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"iyi Ikiranga , Byakoreshejwe in &Uhimba Windows Nka . \n"
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, fuzzy, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Gufunika Ku Inkingi : "
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "NIBA Imizi Impamyabushobozi: Yarenze igihe: in Birutwa : "
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr "iyi Ihitamo ku Kuri Ubwoko & # ; Umugereka Amazina - Inyuguti "
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, fuzzy, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Kubaza... &Ubutumwa Ibimenyetso "
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> iyi Ihitamo NIBA Kuri Kubaza... ( ) ya:  Bya Ubutumwa . </p> "
-"<p> Ihitamo i Mburabuzi ; Gushoboza Cyangwa Kwangira ku A - &Ubutumwa Ishingiro "
-"in i &Uhimba , Ibikubiyemo Ikintu <em> </em> - > <em> </em> . </p> </qt> "
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, fuzzy, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Amaderesi ya:  Nyamwirangiza "
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, fuzzy, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"iyi Ihitamo NIBA OYA Byakoreshejwe Amaderesi Kuri Kugaragara in i Nyamwirangiza "
-"Urutonde in i Aderesi: Amashami: . "
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "Intera : "
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, fuzzy, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"A Inyibutsa Gukoporora Bya i Umwandiko in i &Uhimba Idirishya Byaremwe . Intera "
-"Byakoreshejwe Kuri Kurema i Ibyashyinguwe ni Gushyiraho . Kwangira ku "
-"Igenamiterere Kuri i Agaciro: 0 %S . "
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, fuzzy, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Imbanziriza Na: \" : \" "
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, fuzzy, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Imbanziriza Na: \" : \" "
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, fuzzy, no-c-format
-msgid "Use smart &quoting"
-msgstr "Cyiza "
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Isinya Byarengeje igihe . "
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, fuzzy, no-c-format
-msgid "Type of addressee selector"
-msgstr "Bya Uwandikiwe itoranya "
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, fuzzy, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"i Ubwoko: Bya i Ikiganiro ya:  Abandikiwe... ya:  , \n"
-"na . "
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, fuzzy, no-c-format
-msgid "Type of recipients editor"
-msgstr "Bya Abandikiwe... Muhinduzi "
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, fuzzy, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"i Ubwoko: Bya i Abandikiwe... Muhinduzi ya:  Guhindura , \n"
-"na . "
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Umubare Bya Uwandikiwe Muhinduzi Imirongo . "
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "~Umwimerere KubonezaInyuguti: Ryari: Cyangwa NIBA "
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, fuzzy, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-", mu buryo bwikora: , OYA Kugaragaza i Inyuguti: Imisobekere: Kuri "
-"Byakoreshejwe Kuri Kugaragaza: . A Inyuguti: Imisobekere: Byakoreshejwe , "
-"Kugena Imiterere . Kuri i Inyuguti: Imisobekere: Byakoreshejwe in Inzira %s Bya "
-"i . A Mburabuzi i Imisobekere: ya:  i Sisitemu ni Byakoreshejwe . "
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, fuzzy, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"iyi Kuva: Mburabuzi ' Gushyiraho Ingufu i Koresha Bya i Imisobekere: ya:  Byose "
-", Bya Kugaragaza . "
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, fuzzy, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"iyi NIBA nka : - ) in i &Ubutumwa Umwandiko Kuri ku Amarangamutima ( Gitoya "
-"Amashusho ) . "
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, fuzzy, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"iyi Ihitamo Kuri Herekana %S Intera Bya Umwandiko . Kuri Gushisha i Intera Bya "
-"Umwandiko . "
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, fuzzy, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Gusenyuka urwego : "
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, fuzzy, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Imyandikire Ingano: ya:  Umwandiko "
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, fuzzy, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "iyi Ihitamo Kuri Herekana %S Umwandiko Na: A Gitoya Imyandikire . "
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Yoherejwe: Ubutumwa Bishunzwe: "
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Imimerere in Imitwe "
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Name=Amamenyesha Sisitemu"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Kubona Ubutumwa bushya"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Inyuguti z'impugukirwa isoza"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -15001,6 +13122,11 @@ msgstr "Nka "
 msgid "Add as BCC"
 msgstr "Nka "
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Kureka"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -15019,15 +13145,15 @@ msgstr "Impapuro zatoranyijwe"
 #: recipientspicker.cpp:784
 #, fuzzy
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Byahiswemo 1 Uwandikiwe . Kinini Umubare Bya Abandikiwe... ni %1 . Guhuza i "
 "Ihitamo . \n"
-"Byahiswemo %n Abandikiwe... . Kinini Umubare Bya Abandikiwe... ni %1 . Guhuza i "
-"Ihitamo . "
+"Byahiswemo %n Abandikiwe... . Kinini Umubare Bya Abandikiwe... ni %1 . "
+"Guhuza i Ihitamo . "
 
 #: redirectdialog.cpp:57
 #, fuzzy
@@ -15047,10 +13173,11 @@ msgstr "i - "
 #: redirectdialog.cpp:73
 #, fuzzy
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Akabuto A Ikiganiro Guhitamo Abandikiwe... Inyuma Bya Byose Bihari Amaderesi . "
+"Akabuto A Ikiganiro Guhitamo Abandikiwe... Inyuma Bya Byose Bihari "
+"Amaderesi . "
 
 #: redirectdialog.cpp:116
 #, fuzzy
@@ -15169,11 +13296,20 @@ msgstr "Kiruta Cyangwa Kingana Na"
 msgid " bytes"
 msgstr "Bayite"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, fuzzy, no-c-format
+msgid " days"
+msgstr "iminsi"
+
 #: searchjob.cpp:253
 #, fuzzy
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Gukora Shakisha Byose Ubutumwa Bya i Ububiko... %1 Kuri Yimuwe Kuva: i "
 "Seriveri: . Gicurasi Igihe . Kuri Gukomeza Shakisha ? "
@@ -15341,14 +13477,11 @@ msgstr ""
 
 #: sievedebugdialog.cpp:256
 #, fuzzy
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Ibyatanzwe ya:  Konti: ' %1 ' ... \n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Ibyatanzwe ya:  Konti: ' %1 ' ... \n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -15371,10 +13504,8 @@ msgstr ""
 
 #: sievedebugdialog.cpp:298
 #, fuzzy
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Bya IYANDIKA ' %1 ' : \n"
+msgid "Contents of script '%1':\n"
+msgstr "Bya IYANDIKA ' %1 ' : \n"
 
 #: sievedebugdialog.cpp:320
 #, fuzzy
@@ -15395,8 +13526,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:341
 #, fuzzy
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr "Kubaza ubushobozi bwa seriveri"
 
 #: sievedebugdialog.cpp:345
@@ -15406,10 +13536,8 @@ msgstr "( Bidasanzwe Bihari ) "
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Inyandikoporogaramu : \n"
+msgid "Available Sieve scripts:\n"
+msgstr "Inyandikoporogaramu : \n"
 
 #: sievedebugdialog.cpp:358
 #, fuzzy
@@ -15498,11 +13626,11 @@ msgstr "iyi Umwanya Kuri Injiza Isinya . "
 #: signatureconfigurator.cpp:122
 #, fuzzy
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"iyi Kuri Kugaragaza A Umwandiko Idosiye ifite Isinya . Soma buri Igihe Kurema A "
-"Gishya Ibaruwa Cyangwa Kongeraho... A Gishya Isinya . "
+"iyi Kuri Kugaragaza A Umwandiko Idosiye ifite Isinya . Soma buri Igihe "
+"Kurema A Gishya Ibaruwa Cyangwa Kongeraho... A Gishya Isinya . "
 
 #: signatureconfigurator.cpp:126
 #, fuzzy
@@ -15522,21 +13650,27 @@ msgstr "i Idosiye in A Umwandiko Muhinduzi . "
 #: signatureconfigurator.cpp:149
 #, fuzzy
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "&Ongera command , Na: Cyangwa Inzira: ku Cyangwa OYA i command ni in . buri "
-"Gishya Ibaruwa , Gukora i command na Koresha ( Kuri Bisanzwe Ibisohoka ) Nka A "
-"Isinya . Amabwiriza ya:  Koresha Na: iyi \" \" Cyangwa \" - Bitunguranye \" . "
+"Gishya Ibaruwa , Gukora i command na Koresha ( Kuri Bisanzwe Ibisohoka ) Nka "
+"A Isinya . Amabwiriza ya:  Koresha Na: iyi \" \" Cyangwa \" - Bitunguranye "
+"\" . "
 
 #: signatureconfigurator.cpp:155
 #, fuzzy
 msgid "S&pecify command:"
 msgstr "command : "
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 #, fuzzy
 msgid "New entry:"
@@ -15576,6 +13710,11 @@ msgstr "Ongera konti..."
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt> Kuri Gukuraho i Ikiranga &Cyitwa: <b> %1 </b> ? </qt> "
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Gukoresha ku"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -15590,6 +13729,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Andika inyandiko- porogaramu"
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -15629,9 +13772,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -15673,6 +13816,16 @@ msgstr ""
 "Gufungura Idosiye \" %1 \" : \n"
 "%2 "
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Kuri:"
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "KopiKubandi"
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -15708,36 +13861,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -15972,6 +14121,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -16008,114 +14161,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-#, fuzzy
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p> ... Gyayo Kuri i Ibikurikira > na Ibanjirije &Ubutumwa ku ikoresha na "
-"Ibumoso: Akambi Utubuto ? </p> \n"
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p> ... Kurema Muyunguruzi ku Uwohereza , Uwandikiwe , \n"
-"Ikivugwaho: na Intonde Na: <em> - "
-
-#: tips.cpp:15
-#, fuzzy
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p> ... Kubona Bya i &quot; [ Urutonde Izina: ] &quot; \n"
-"Kyongewe Kuri i Ikivugwaho: Bya Intonde ku ikoresha i <em> </em> "
-"Akayunguruzo: Igikorwa ? < Byahawe imiterere mbere > Umutwe &quot; ; \n"
-"Gusimbuza &quot; \\s * \\[ Urutonde Izina: \\] \\s * &quot; \n"
-"Na: &quot; &quot; < /Byahawe imiterere mbere > \n"
-"</p> \n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p> ... Intonde Na: Ububiko in <em> - &gt; </em> Ikiganiro ? Hanyuma <em> "
-"- &gt; ; ; ; ; ... </em> \n"
-"Kuri Gufungura i &Uhimba Na: i Urutonde Aderesi: . \n"
-", Kanda Na: i Hagati Imbeba Akabuto ku i Ububiko... . </p> \n"
-
-#: tips.cpp:35
-#, fuzzy
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p> ... Kugenera... Guhanga Udushushondanga Kuri Ububiko... ? \n"
-"<em> - &gt; </em> </p> \n"
-
-#: tips.cpp:41
-#, fuzzy
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p> ... Herekana %S A Ibara: Umurongo i Ubwoko: Bya ( Umwandiko //) ? </p> \n"
-"<p> Kuri Byakunze Isinya Isinya Imimerere Amakadiri . </p> \n"
-
-#: tips.cpp:49
-#, fuzzy
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p> ... Akayunguruzo: ku Icyo ari cyo cyose Umutwe ku i Itangira Kwandika "
-"Umwanya Bya A Shakisha ? </p> \n"
-
-#: tips.cpp:55
-#, fuzzy
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p> ... Akayunguruzo: Inyuma Ubutumwa Na: i < Byahawe imiterere mbere > "
-"&quot; - ; ifite &quot; Umwandiko /; ? < /Byahawe imiterere mbere > \n"
-"</p> \n"
-
-#: tips.cpp:62
-#, fuzzy
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p> ... Ryari: , i Byahiswemo Inzira %s Bya i &Ubutumwa ni ? </p> \n"
-"<p> Nta na kimwe ni Byahiswemo , i Cyuzuye &Ubutumwa ni . </p> \n"
-"<p> ATARIIGIHARWE Na: Umwandiko Bya Imigereka: <em> - &gt; - &gt; </em> "
-"ni Byahiswemo . </p> \n"
-"<p> Ikiranga ni Bihari Na: Byose Subiza Amabwiriza <em> - &gt; </em> . </p> \n"
-"< p Itunganya = \" Iburyo: \" > <em> ku . </em> </p> \n"
-
 #: undostack.cpp:110
 #, fuzzy
 msgid "There is nothing to undo."
@@ -16190,6 +14235,15 @@ msgstr "# %1 ( Kitiswe ) "
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Idosiye yahawe izina\"%1\" isanzweho. Uzi neza ko ushaka kuyisimbura?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Gusimbuza Idosiye?"
+
 #: vacation.cpp:566
 #, fuzzy
 msgid ""
@@ -16316,12 +14370,13 @@ msgstr "(%PRODUCTNAME) y'Ishusho Na: buri &Ubutumwa "
 #: xfaceconfigurator.cpp:93
 #, fuzzy
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"iyi Agasanduku NIBA Kuri &Ongera A - - Umutwe Kuri Ubutumwa Na: iyi Ikiranga . "
-"- ni A Gitoya ( pigiseli ) umukara na Umweru Ishusho Ibaruwa Kuri Kugaragaza: . "
+"iyi Agasanduku NIBA Kuri &Ongera A - - Umutwe Kuri Ubutumwa Na: iyi "
+"Ikiranga . - ni A Gitoya ( pigiseli ) umukara na Umweru Ishusho Ibaruwa Kuri "
+"Kugaragaza: . "
 
 #: xfaceconfigurator.cpp:100
 #, fuzzy
@@ -16353,13 +14408,13 @@ msgstr "Guhitamo idosiye"
 #: xfaceconfigurator.cpp:149
 #, fuzzy
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"iyi Kuri Guhitamo Ishusho Idosiye Kuri Kurema i (%PRODUCTNAME) y'Ishusho Kuva: "
-". Ishusho Bya ejuru Inyuranyamigaragarire na Cya dogerekabiri Imisusire . A "
-"kimurika Mbuganyuma i Igisubizo . "
+"iyi Kuri Guhitamo Ishusho Idosiye Kuri Kurema i (%PRODUCTNAME) y'Ishusho "
+"Kuva: . Ishusho Bya ejuru Inyuranyamigaragarire na Cya dogerekabiri "
+"Imisusire . A kimurika Mbuganyuma i Igisubizo . "
 
 #: xfaceconfigurator.cpp:156
 #, fuzzy
@@ -16369,8 +14424,8 @@ msgstr "Inyandiko y'Igitabo ky'aderesi"
 #: xfaceconfigurator.cpp:158
 #, fuzzy
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Koresha A Yapimwe (%S%%) - Hasi Verisiyo Bya i (%PRODUCTNAME) y'Ishusho "
 "Gushyiraho in Aderesi: Igitabo Icyinjijwe . "
@@ -16378,13 +14433,14 @@ msgstr ""
 #: xfaceconfigurator.cpp:164
 #, fuzzy
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt> Kohereza A Gitoya ( pigiseli ) , hasi - Ubwiza , bararimwe (%PRODUCTNAME) "
-"y'Ishusho Na: buri &Ubutumwa . Urugero: , iyi A (%PRODUCTNAME) y'Ishusho Bya "
-"Cyangwa A . ni in i Ibaruwa Umukiriya ( NIBA ) . "
+"<qt> Kohereza A Gitoya ( pigiseli ) , hasi - Ubwiza , bararimwe "
+"(%PRODUCTNAME) y'Ishusho Na: buri &Ubutumwa . Urugero: , iyi A "
+"(%PRODUCTNAME) y'Ishusho Bya Cyangwa A . ni in i Ibaruwa Umukiriya "
+"( NIBA ) . "
 
 #: xfaceconfigurator.cpp:180
 #, fuzzy
@@ -16394,11 +14450,11 @@ msgstr "iyi Umwanya Kuri Injiza - Ikurikiranyanyuguti . "
 #: xfaceconfigurator.cpp:184
 #, fuzzy
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Bihari Ku <a href=\"http://www.xs4all.nl/~ace/X-Faces/\"> "
-"HTTP : //www . . //- /</a> . "
+"Bihari Ku <a href=\"http://www.xs4all.nl/~ace/X-Faces/\"> HTTP : //"
+"www . . //- /</a> . "
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 #, fuzzy
@@ -16417,144 +14473,1710 @@ msgstr "Nta shusho"
 msgid "You do not have your own contact defined in the address book."
 msgstr "OYA Umuntu in i Aderesi: Igitabo . "
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Ishirwaho umukono"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Shyiraho Umukono Ubutumwa "
+
+#: composercryptoconfiguration.ui:38
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"iyi Ihitamo ni Bikora , Byose Ubutumwa Kohereza ku Mburabuzi ; Bya , ni Kuri "
+"Kwangira Ishirwaho umukono ya:  &Ubutumwa . "
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Gushyira umutekano:"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
-msgstr "Ikivugwaho: Bya &Ubutumwa "
+#: composercryptoconfiguration.ui:62
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"iyi Ihitamo ni Bikora , i &Ubutumwa /Idosiye OYA Bishunzwe: Na: i public "
+"Urufunguzo , Na: Urufunguzo . Gushoboza Kuri i &Ubutumwa /Idosiye Ku A Nyuma "
+"Igihe . ni A . "
 
-#: kmail_options.h:13
-#, fuzzy
-msgid "Send CC: to 'address'"
-msgstr ": Kuri ' "
+#: composercryptoconfiguration.ui:70
+#, fuzzy, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "/Bishunzwe: Umwandiko Nyuma "
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
-msgstr ": Kuri ' "
+#: composercryptoconfiguration.ui:73
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"iyi Ihitamo ni Bikora , i /Bishunzwe: Umwandiko in A Idirishya , Kuri Kureba "
+"Mbere ni Yoherejwe: . ni A Ryari: Bishunzwe: Sisitemu . "
 
-#: kmail_options.h:17
-#, fuzzy
-msgid "Add 'header' to message"
-msgstr "' Kuri &Ubutumwa "
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Yoherejwe: Ubutumwa Bishunzwe: "
 
-#: kmail_options.h:18
-#, fuzzy
-msgid "Read message body from 'file'"
-msgstr "&Ubutumwa Umubiri Kuva: ' "
+#: composercryptoconfiguration.ui:87
+#, fuzzy, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Kuri Ubutumwa Bishunzwe: "
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Umubiri Bya &Ubutumwa "
+#: composercryptoconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"iyi Agasanduku ni Ivivuwe , Yoherejwe: Ubutumwa Bishunzwe: nka Yoherejwe: . "
+"ni OYA , Nka OYA Kuri Soma i Ubutumwa Icyo ari cyo cyose NIBA A "
+"Impamyabushobozi: Yarenze igihe: . \n"
+"<p> \n"
+", Gicurasi Bya hafi Kuri iyi Ihitamo ku . in , Kugenzura Na: Bya hafi "
+"umuyobozi/uyobora . \n"
+"</qt> "
 
-#: kmail_options.h:20
-#, fuzzy
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Umugereka Kuri i Ibaruwa . byasubiyemo "
+#: composercryptoconfiguration.ui:103
+#, fuzzy, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Herekana %S i Bishunzwe: Utubuto ya:  "
 
-#: kmail_options.h:21
-#, fuzzy
-msgid "Only check for new mail"
-msgstr "Kugenzura ya:  Gishya Ibaruwa "
+#: composercryptoconfiguration.ui:106
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"iyi Ihitamo ni Bikora , i Porogaramu Buri gihe Herekana %S A Urutonde Bya "
+"public Utubuto Kuva: Hitamo... i Rimwe Koresha ya:  Bishunzwe: . ni "
+"Bidakora , i Porogaramu Herekana %S i Ikiganiro NIBA Gushaka i Iburyo: "
+"Urufunguzo Cyangwa NIBA Byakoreshejwe . "
 
-#: kmail_options.h:22
-#, fuzzy
-msgid "Only open composer window"
-msgstr "Gufungura &Uhimba Idirishya "
+#: composercryptoconfiguration.ui:114
+#, fuzzy, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Shyiraho Umutekano Ubutumwa "
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "i &Ubutumwa Idosiye "
+#: composercryptoconfiguration.ui:117
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"iyi Ihitamo ni Bikora , buri &Ubutumwa Kohereza Bishunzwe: Bishunzwe: ni "
+"na ; Bya , ni Kuri Kwangira i Kikoresha Bishunzwe: ya:  &Ubutumwa . "
 
-#: kmail_options.h:24
-#, fuzzy
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "&Ubutumwa Kuri ' . Kugerekaho i Idosiye i ' Utudomo Kuri "
+#: composercryptoconfiguration.ui:125
+#, fuzzy, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
+"Shyiraho Umukono /Shyiraho Umutekano Ryari: Mu kubika Nka Inyandiko "
+"y'agateganyo "
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Soma"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "ki/bishaje"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Rusange"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Byasibwe"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "Subiza kanaka"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Yasubijwe"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Gusubiza Bose"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Yongeye kwoherezwa"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "Gya Imbere"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Yashizwe ku murongo"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Ihinanzira:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Byoherejwe"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "Gusimbuza"
 
-#: kmsearchpattern.h:228
-#, fuzzy
-msgid "Watched"
-msgstr "Isaha"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Ibigize : "
 
-#: kmsearchpattern.h:229
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "Gusimbuza"
+
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "Gusimbuza"
+
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Ibiranga ububiko"
+
+#: folderpropertiesdialog.ui:63
+#, fuzzy, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "A Urutonde "
+
+#: folderpropertiesdialog.ui:91
+#, fuzzy, no-c-format
+msgid "List &address:"
+msgstr "Aderesi: : "
+
+#: folderpropertiesdialog.ui:122
+#, fuzzy, no-c-format
+msgid "N&ormal:"
+msgstr "Bisanzwe"
+
+#: folderpropertiesdialog.ui:215
+#, fuzzy, no-c-format
+msgid "Unr&ead:"
+msgstr "Bidasomye:"
+
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "Ubutumwa bufunitse"
+
+#: folderpropertiesdialog.ui:283
+#, fuzzy, no-c-format
+msgid "E&xpire after:"
+msgstr "Nyuma : "
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "Soma Ubutumwa "
+
+#: folderpropertiesdialog.ui:339
+#, fuzzy, no-c-format
+msgid "Expire a&fter:"
+msgstr "Nyuma : "
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "Bidasomye: %S Ubutumwa "
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "U(I)munsi"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, fuzzy, no-c-format
+msgid "Week(s)"
+msgstr "ibyumweru"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, fuzzy, no-c-format
+msgid "Month(s)"
+msgstr "amezi"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Urwego rwo hejuru"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "Ikiranga : "
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "Imiterere : "
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "URL yo kugaragaza"
+
+#: kmail.kcfg:61
+#, fuzzy, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Yashizwe ku murongo Ibaruwa ku Ibaruwa Kugenzura "
+
+#: kmail.kcfg:62
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt> <p> Kuri Kohereza Byose Ubutumwa in i Ibyasohotse ku Bikorwa Cyangwa "
+"Byose Ibaruwa , Cyangwa OYA Ubutumwa Kuri Yoherejwe: mu buryo bwikora: Ku "
+"Byose . </p> </qt> "
+
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p> Gishya Ubutumwa in iyi Ububiko... , OYA Kuri i Seriveri: , OYA Kuri ku i "
+"Ububiko... NONEAHA Kuri Gushyiraho . Umuntu umuyobozi/uyobora Kuri Emera "
+"Gushyiraho Bya Gishya Ubutumwa Kuri , Cyangwa Himura Inyuma Bya iyi "
+"Ububiko... . </p> <p> Kuri Himura Ubutumwa Kuri Ububiko... NONEAHA ? </p> "
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, fuzzy, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Byahiswemo Ububiko... in i Ububiko... Ihitamo Ikiganiro . "
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, fuzzy, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "ya:  i Sisitemu Agasanduku Agashushondanga "
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Gishya Ibaruwa Ikimenyetso "
+
+#: kmail.kcfg:122
+#, fuzzy, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"iyi Ihitamo ni Bikora Hanyuma ya:  Ububiko... i Umubare Bya Ubutumwa ni in i "
+"Gishya Ibaruwa Ikimenyetso ; , Kubona A Byoroheje ' Ibaruwa &Ubutumwa . "
+
+#: kmail.kcfg:126
+#, fuzzy, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Muhinduzi : "
+
+#: kmail.kcfg:130
+#, fuzzy, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "external Muhinduzi Bya &Uhimba "
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, fuzzy, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Kubashisha ibonerana"
+
+#: kmail.kcfg:172
+#, fuzzy, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ": /: Imitwe in Kuri "
+
+#: kmail.kcfg:173
+#, fuzzy, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"A Umubare Bya in Bya i Bisanzwe ; iyi Ihitamo Rimwe Bya . Na: Abakoresha OYA "
+"Kuri Kubona , Kugerageza Igenamiterere iyi Ihitamo . "
+
+#: kmail.kcfg:178
+#, fuzzy, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "in i Ibaruwa Umubiri "
+
+#: kmail.kcfg:179
+#, fuzzy, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"A Umubare Bya in Bya i Bisanzwe ; iyi Ihitamo Rimwe Bya . Na: Abakoresha OYA "
+"Kuri Kubona , Kugerageza Igenamiterere iyi Ihitamo . "
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Isunika Ryikoresha"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, fuzzy, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"iyi ni Ivivuwe , OYA i Ibaruwa &Uhimba Idirishya . , Byose Yoherejwe: mu "
+"buryo bwikora: . Kuri i Ibaruwa Mbere , Kuramo ivivura iyi Ihitamo . , i "
+"Umwandiko in i &Uhimba Idirishya ni in , na OYA Kugerageza ku . "
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, fuzzy, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p> iyi Kuri i Ibyinjijwe Kuva: i Porogaramu ( , , na . ) </p> <p> Kuri "
+"Gushyiraho iyi Ihitamo Gushyiraho i Porogaramu Kuri Koresha i Ibikorana: ; "
+"iyi ni Byakozwe in i MukusanyaTDE . </p> "
+
+#: kmail.kcfg:238
+#, fuzzy, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p> OYA Icyo ari cyo cyose Impamvu Kuri i Ububiko Gufata i Ibikorana . NIBA "
+"Kuri , Gushyiraho "
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, fuzzy, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p> i Imiterere Bya i Ububiko . <ul> <li> Mburabuzi Imiterere ni Kuri "
+"Koresha i ( ya:  kalindari Ububiko ) na vCard ( ya:  Ububiko ) . Imiterere "
+"Byose Ibiranga Bihari . </li> <li> Imiterere A Guhanga Urugero Birenzeho i "
+"Rimwe Byakoreshejwe in . Imiterere Bihuye neza , Ryari: ikoresha A Seriveri: "
+"Cyangwa A . </li> </ul> </p> "
+
+#: kmail.kcfg:260
+#, fuzzy, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p> i Bya i Ibikorana: Ububiko . </p> <p> Mburabuzi , i Seriveri: i "
+"Agasanduku k'Ibyinjiye Kuri i . </p> "
+
+#: kmail.kcfg:265
+#, fuzzy, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p> ni i Bya i Konti: i Ibikorana: Ububiko . </p> "
+
+#: kmail.kcfg:270
+#, fuzzy, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p> Kuri Gushyiraho i Ububiko... Amazina Bya i Kuri Bya hafi Ururimi: , "
+"Hitamo... hagati Bihari Indimi . </p> <p> Impugukirwa , i Impamvu Kuri ni "
+"ya:  Bihuye neza Na: . ni A Kuri Gushyiraho iyi , guhera Indimi . </p> <p> "
+"OYA Gushyiraho iyi Kuri . </p> "
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, fuzzy, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Agaciro: ni Byakoreshejwe Kuri i . "
+
+#: kmail.kcfg:299
+#, fuzzy, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Umubare Bya Ukwihuza Inturo: "
+
+#: kmail.kcfg:300
+#, fuzzy, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Byakoreshejwe Kuri i Umubare Bya Ukwihuza Inturo: Kugenzura... ya:  Gishya "
+"Ibaruwa . Mburabuzi i Umubare Bya Ukwihuza ni Bitarangira ( 0 %S ) . "
+
+#: kmail.kcfg:308
+#, fuzzy, no-c-format
+msgid "Show quick search line edit"
+msgstr "Shakisha Umurongo: Kwandika "
+
+#: kmail.kcfg:309
+#, fuzzy, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ihitamo Cyangwa i Shakisha Umurongo: Kwandika hejuru i &Ubutumwa Urutonde "
+"Byakoreshejwe Kuri Shakisha i Ibisobanuro: in i &Ubutumwa Urutonde . "
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "~Umwimerere KubonezaInyuguti: Ryari: Cyangwa NIBA "
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Kongeraho... Isinya "
+
+#: kmail.kcfg:336
+#, fuzzy, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "iyi Ikiranga , Byakoreshejwe in &Uhimba Windows Nka . \n"
+
+#: kmail.kcfg:341
+#, fuzzy, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"iyi Ububiko... ya:  Yoherejwe: Ibigize , Byakoreshejwe in &Uhimba Windows "
+"Nka . "
+
+#: kmail.kcfg:345
+#, fuzzy, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "iyi Ibaruwa , Byakoreshejwe in &Uhimba Windows Nka . "
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "iyi Ikiranga , Byakoreshejwe in &Uhimba Windows Nka . \n"
+
+#: kmail.kcfg:354
+#, fuzzy, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Gufunika Ku Inkingi : "
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "NIBA Imizi Impamyabushobozi: Yarenze igihe: in Birutwa : "
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr "iyi Ihitamo ku Kuri Ubwoko & # ; Umugereka Amazina - Inyuguti "
+
+#: kmail.kcfg:416
+#, fuzzy, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Kubaza... &Ubutumwa Ibimenyetso "
+
+#: kmail.kcfg:417
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt> <p> iyi Ihitamo NIBA Kuri Kubaza... ( ) ya:  Bya Ubutumwa . </p> <p> "
+"Ihitamo i Mburabuzi ; Gushoboza Cyangwa Kwangira ku A - &Ubutumwa Ishingiro "
+"in i &Uhimba , Ibikubiyemo Ikintu <em> </em> - > <em> </em> . </p> </qt> "
+
+#: kmail.kcfg:421
+#, fuzzy, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Amaderesi ya:  Nyamwirangiza "
+
+#: kmail.kcfg:422
+#, fuzzy, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"iyi Ihitamo NIBA OYA Byakoreshejwe Amaderesi Kuri Kugaragara in i "
+"Nyamwirangiza Urutonde in i Aderesi: Amashami: . "
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "Intera : "
+
+#: kmail.kcfg:444
+#, fuzzy, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"A Inyibutsa Gukoporora Bya i Umwandiko in i &Uhimba Idirishya Byaremwe . "
+"Intera Byakoreshejwe Kuri Kurema i Ibyashyinguwe ni Gushyiraho . Kwangira ku "
+"Igenamiterere Kuri i Agaciro: 0 %S . "
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, fuzzy, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Imbanziriza Na: \" : \" "
+
+#: kmail.kcfg:462
+#, fuzzy, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Imbanziriza Na: \" : \" "
+
+#: kmail.kcfg:466
+#, fuzzy, no-c-format
+msgid "Use smart &quoting"
+msgstr "Cyiza "
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Isinya Byarengeje igihe . "
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, fuzzy, no-c-format
+msgid "Type of addressee selector"
+msgstr "Bya Uwandikiwe itoranya "
+
+#: kmail.kcfg:480
+#, fuzzy, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"i Ubwoko: Bya i Ikiganiro ya:  Abandikiwe... ya:  , \n"
+"na . "
+
+#: kmail.kcfg:489
+#, fuzzy, no-c-format
+msgid "Type of recipients editor"
+msgstr "Bya Abandikiwe... Muhinduzi "
+
+#: kmail.kcfg:490
+#, fuzzy, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"i Ubwoko: Bya i Abandikiwe... Muhinduzi ya:  Guhindura , \n"
+"na . "
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Umubare Bya Uwandikiwe Muhinduzi Imirongo . "
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "~Umwimerere KubonezaInyuguti: Ryari: Cyangwa NIBA "
+
+#: kmail.kcfg:572
+#, fuzzy, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+", mu buryo bwikora: , OYA Kugaragaza i Inyuguti: Imisobekere: Kuri "
+"Byakoreshejwe Kuri Kugaragaza: . A Inyuguti: Imisobekere: Byakoreshejwe , "
+"Kugena Imiterere . Kuri i Inyuguti: Imisobekere: Byakoreshejwe in Inzira %s "
+"Bya i . A Mburabuzi i Imisobekere: ya:  i Sisitemu ni Byakoreshejwe . "
+
+#: kmail.kcfg:578
+#, fuzzy, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"iyi Kuva: Mburabuzi ' Gushyiraho Ingufu i Koresha Bya i Imisobekere: ya:  "
+"Byose , Bya Kugaragaza . "
+
+#: kmail.kcfg:584
+#, fuzzy, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"iyi NIBA nka : - ) in i &Ubutumwa Umwandiko Kuri ku Amarangamutima ( Gitoya "
+"Amashusho ) . "
+
+#: kmail.kcfg:589
+#, fuzzy, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"iyi Ihitamo Kuri Herekana %S Intera Bya Umwandiko . Kuri Gushisha i Intera "
+"Bya Umwandiko . "
+
+#: kmail.kcfg:592
+#, fuzzy, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Gusenyuka urwego : "
+
+#: kmail.kcfg:600
+#, fuzzy, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Imyandikire Ingano: ya:  Umwandiko "
+
+#: kmail.kcfg:601
+#, fuzzy, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "iyi Ihitamo Kuri Herekana %S Umwandiko Na: A Gitoya Imyandikire . "
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Yoherejwe: Ubutumwa Bishunzwe: "
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Imimerere in Imitwe "
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Name=Amamenyesha Sisitemu"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Kubona Ubutumwa bushya"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Inyuguti z'impugukirwa isoza"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Guhindura Idosiye"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Kwandika..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Gyayo"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, fuzzy, no-c-format
+msgid "F&older"
+msgstr "Ububiko"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Ubutumwa"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, fuzzy, no-c-format
+msgid "Reply Special"
+msgstr "Bidasanzwe"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "Gya Imbere"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ongera utangire bushya Ibyashizweho"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "UmwanyaBikoresho w'ifasha"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Uburyo bwo Guteranya"
+
+#: kmcomposerui.rc:102
+#, fuzzy, no-c-format
+msgid "HTML Toolbar"
+msgstr "UmwanyaBikoresho w'ifasha"
+
+#: smimeconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Impamyabushobozi ikoresha "
+
+#: smimeconfiguration.ui:30
+#, fuzzy, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr "iyi Ihitamo ni Byahiswemo , S /Impamyabushobozi ikoresha ( ) . "
+
+#: smimeconfiguration.ui:38
+#, fuzzy, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Impamyabushobozi kiri kuri interineti ( ) "
+
+#: smimeconfiguration.ui:41
+#, fuzzy, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"iyi Ihitamo ni Byahiswemo , S /Impamyabushobozi kiri kuri interineti "
+"ikoresha i ( ) . in i Bya i munsi . "
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Inyemeza (iyemeza: "
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, fuzzy, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"i Aderesi: Bya i Seriveri: ya:  kiri kuri interineti Kwemeza Bya "
+"Impamyabushobozi ( ) . ni Itangira... Na: HTTP : //. "
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Isinya : "
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Serivisi Bya Impamyabushobozi "
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "OYA Kugenzura Impamyabushobozi: Amategeko: "
+
+#: smimeconfiguration.ui:139
+#, fuzzy, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Mburabuzi i Idosiye ~ /. /Amategeko: . txt Kuri Kugenzura NIBA A "
+"Impamyabushobozi: Itegeko ni . iyi Ihitamo ni Byahiswemo , Amategeko: OYA "
+"Ivivuwe . "
+
+#: smimeconfiguration.ui:147
+#, fuzzy, no-c-format
+msgid "Never consult a CRL"
+msgstr "A "
+
+#: smimeconfiguration.ui:150
+#, fuzzy, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"iyi Ihitamo ni Ivivuwe , Nta na rimwe Byakoreshejwe Kuri validate S /"
+"Impamyabushobozi . "
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Ibuze Wasohoye Impamyabushobozi "
+
+#: smimeconfiguration.ui:161
+#, fuzzy, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"iyi Ihitamo ni Ivivuwe , Ibuze Wasohoye Impamyabushobozi Ryari: ( iyi Kuri "
+"Byombi Kwemeza , na ) "
+
+#: smimeconfiguration.ui:169
+#, fuzzy, no-c-format
+msgid "HTTP Requests"
+msgstr "Ibisabwa"
+
+#: smimeconfiguration.ui:180
+#, fuzzy, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "OYA Icyo ari cyo cyose "
+
+#: smimeconfiguration.ui:183
+#, fuzzy, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "i Koresha Bya ya:  S /. "
+
+#: smimeconfiguration.ui:224
+#, fuzzy, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "iyi Porogisi ya:  : "
+
+#: smimeconfiguration.ui:232
+#, fuzzy, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Sisitemu Porogisi : "
+
+#: smimeconfiguration.ui:235
+#, fuzzy, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"iyi Ihitamo ni Byahiswemo , i Agaciro: Bya i Porogisi ku i Iburyo: ( Kuva: i "
+"Impinduragaciro ) Byakoreshejwe ya:  Icyo ari cyo cyose Kubaza... . "
+
+#: smimeconfiguration.ui:243
+#, fuzzy, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr "Ubuhano."
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ikwirakwiza Akadomo Bya Impamyabushobozi "
+
+#: smimeconfiguration.ui:256
+#, fuzzy, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"ya:  i Indanganturo Bya A , i Kuri - - Impamyabushobozi: ifite Nka \" \" ( ) "
+"Ibyinjijwe , i Kuri i . Itangira Byabonetse Icyinjijwe ni Byakoreshejwe . "
+"iyi Ihitamo Byose Ibyinjijwe ikoresha i Igishusho Ryari: ya:  A . "
+
+#: smimeconfiguration.ui:268
+#, fuzzy, no-c-format
+msgid "LDAP Requests"
+msgstr "Ibisabwa"
+
+#: smimeconfiguration.ui:279
+#, fuzzy, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "OYA Icyo ari cyo cyose "
+
+#: smimeconfiguration.ui:282
+#, fuzzy, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "i Koresha Bya ya:  S /. "
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ikwirakwiza Akadomo Bya Impamyabushobozi "
+
+#: smimeconfiguration.ui:310
+#, fuzzy, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"ya:  i Indanganturo Bya A , i Kuri - - Impamyabushobozi: ifite Nka \" \" ( ) "
+"Ibyinjijwe , i Kuri i . Itangira Byabonetse Icyinjijwe ni Byakoreshejwe . "
+"iyi Ihitamo Byose Ibyinjijwe ikoresha i Igishusho Ryari: ya:  A . "
+
+#: smimeconfiguration.ui:326
+#, fuzzy, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Inturo: ya:  : "
+
+#: smimeconfiguration.ui:334
+#, fuzzy, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"A Seriveri: Ubwoko Byose Gyayo Kuri Seriveri: Itangira . , iyi Igenamiterere "
+"Icyo ari cyo cyose Inturo: na Umuyoboro: Inzira %s in A na Byakoreshejwe "
+"NIBA Inturo: na Umuyoboro: Kuva: i . Amaseriveri Byakoreshejwe NIBA i "
+"Ukwihuza Kuri i \" Porogisi \" Byanze . \n"
+"ni \" \" Cyangwa \" : \" . ni , Umuyoboro: ( Bisanzwe Umuyoboro: ) ni "
+"Byakoreshejwe . "
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "Ongeraho"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "Izina ry'Itsinda :"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Ongera utangire bushya Ibyashizweho"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "bitagira imbibi"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Iboneza ry'Ingano"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Subiza Uwohereje"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Gusubiza Bose"
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Kohereza Ubutumwa"
+
+#: warningconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Ryari: Kuri Kohereza Bitashizweho umukono Ubutumwa "
+
+#: warningconfiguration.ui:30
+#, fuzzy, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Kuri Ryari: Bitashizweho umukono Ubutumwa . "
+
+#: warningconfiguration.ui:33
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"iyi Agasanduku ni Ivivuwe , Ryari: Kugerageza Kuri Kohereza Bya Cyangwa i "
+"&Ubutumwa Bitashizweho umukono . \n"
+"<p> \n"
+"ni Kuri iyi Ihitamo ku ya:  Kinini . \n"
+"</qt> "
+
+#: warningconfiguration.ui:46
+#, fuzzy, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Ryari: Kuri Kohereza Ubutumwa "
+
+#: warningconfiguration.ui:52
+#, fuzzy, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Kuri Ryari: Ubutumwa . "
+
+#: warningconfiguration.ui:55
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"iyi Agasanduku ni Ivivuwe , Ryari: Kugerageza Kuri Kohereza Bya Cyangwa i "
+"&Ubutumwa . \n"
+"<p> \n"
+"ni Kuri iyi Ihitamo ku ya:  Kinini . \n"
+"</qt> "
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "NIBA ni in "
+
+#: warningconfiguration.ui:74
+#, fuzzy, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Kuri NIBA i Aderesi: ni OYA in i Impamyabushobozi: "
+
+#: warningconfiguration.ui:77
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"iyi Ihitamo ni Ivivuwe , A Iburira ni Byasohowe NIBA i Imeli Aderesi: Bya i "
+"Mwakirizi ni OYA in i Impamyabushobozi: Byakoreshejwe ya:  . \n"
+"<p> \n"
+"ni Kuri iyi Ihitamo ku ya:  Kinini Umutekano . \n"
+"</qt> "
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "NIBA Impamyabushobozi /Utubuto ( Kugena Imiterere munsi ) "
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "Ishirwaho umukono "
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Bishunzwe: "
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, fuzzy, no-c-format
+msgid "Select the number of days here"
+msgstr "i Umubare Bya iminsi "
+
+#: warningconfiguration.ui:141
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"i Gito Umubare Bya iminsi i Isinya Impamyabushobozi: Byemewe A Iburira . \n"
+"<p> \n"
+"Igenamiterere ni 14 iminsi . \n"
+"</qt> "
+
+#: warningconfiguration.ui:169
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"i Gito Umubare Bya iminsi i Bishunzwe: Impamyabushobozi: Byemewe A "
+"Iburira . \n"
+"<p> \n"
+"Igenamiterere ni 14 iminsi . \n"
+"</qt> "
+
+#: warningconfiguration.ui:197
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> A </h1> \n"
+"i Gito Umubare Bya iminsi Byose Impamyabushobozi in i Umunyururu: Byemewe A "
+"Iburira . \n"
+"<p> \n"
+"Igenamiterere ni 14 iminsi . \n"
+"</qt> "
+
+#: warningconfiguration.ui:225
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"i Gito Umubare Bya iminsi i Impamyabushobozi: Byemewe A Iburira . \n"
+"<p> \n"
+"Igenamiterere ni 14 iminsi . \n"
+"</qt> "
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, fuzzy, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt> \n"
+"<h1> </h1> \n"
+"i Gito Umubare Bya iminsi i Imizi Impamyabushobozi: Byemewe A Iburira . \n"
+"<p> \n"
+"Igenamiterere ni 14 iminsi . \n"
+"</qt> "
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Imizi Impamyabushobozi : "
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Impamyabushobozi : "
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Impera - Umukoresha Impamyabushobozi /Utubuto : "
+
+#: warningconfiguration.ui:388
+#, fuzzy, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "- Gushoboza \" \" "
+
+#: tips:3
 #, fuzzy
-msgid "Ignored"
-msgstr "Kureka"
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p> ... Gyayo Kuri i Ibikurikira > na Ibanjirije &Ubutumwa ku ikoresha na "
+"Ibumoso: Akambi Utubuto ? </p> \n"
 
-#: kmsearchpattern.h:230
+#: tips:10
 #, fuzzy
-msgid "Spam"
-msgstr "Umwanya"
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p> ... Kurema Muyunguruzi ku Uwohereza , Uwandikiwe , \n"
+"Ikivugwaho: na Intonde Na: <em> - "
 
-#: kmsearchpattern.h:231
+#: tips:17
 #, fuzzy
-msgid "Ham"
-msgstr "am"
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p> ... Kubona Bya i &quot; [ Urutonde Izina: ] &quot; \n"
+"Kyongewe Kuri i Ikivugwaho: Bya Intonde ku ikoresha i <em> </em> "
+"Akayunguruzo: Igikorwa ? < Byahawe imiterere mbere > Umutwe &quot; ; \n"
+"Gusimbuza &quot; \\s * \\[ Urutonde Izina: \\] \\s * &quot; \n"
+"Na: &quot; &quot; < /Byahawe imiterere mbere > \n"
+"</p> \n"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Gukora"
+#: tips:29
+#, fuzzy
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p> ... Intonde Na: Ububiko in <em> - &gt; </em> Ikiganiro ? Hanyuma <em> - "
+"&gt; ; ; ; ; ... </em> \n"
+"Kuri Gufungura i &Uhimba Na: i Urutonde Aderesi: . \n"
+", Kanda Na: i Hagati Imbeba Akabuto ku i Ububiko... . </p> \n"
 
-#: kmsearchpattern.h:234
+#: tips:39
 #, fuzzy
-msgid "Has Attachment"
-msgstr "Ifite Imigereka"
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p> ... Kugenera... Guhanga Udushushondanga Kuri Ububiko... ? \n"
+"<em> - &gt; </em> </p> \n"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: tips:46
+#, fuzzy
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
 msgstr ""
+"<p> ... Herekana %S A Ibara: Umurongo i Ubwoko: Bya ( Umwandiko //) ? </p> \n"
+"<p> Kuri Byakunze Isinya Isinya Imimerere Amakadiri . </p> \n"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: tips:55
+#, fuzzy
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
 msgstr ""
+"<p> ... Akayunguruzo: ku Icyo ari cyo cyose Umutwe ku i Itangira Kwandika "
+"Umwanya Bya A Shakisha ? </p> \n"
 
-#: util.h:208
+#: tips:62
+#, fuzzy
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Idosiye yahawe izina\"%1\" isanzweho. Uzi neza ko ushaka kuyisimbura?"
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p> ... Akayunguruzo: Inyuma Ubutumwa Na: i < Byahawe imiterere mbere > "
+"&quot; - ; ifite &quot; Umwandiko /; ? < /Byahawe imiterere mbere > \n"
+"</p> \n"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Gusimbuza Idosiye?"
+#: tips:70
+#, fuzzy
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p> ... Ryari: , i Byahiswemo Inzira %s Bya i &Ubutumwa ni ? </p> \n"
+"<p> Nta na kimwe ni Byahiswemo , i Cyuzuye &Ubutumwa ni . </p> \n"
+"<p> ATARIIGIHARWE Na: Umwandiko Bya Imigereka: <em> - &gt; - &gt; </em> ni "
+"Byahiswemo . </p> \n"
+"<p> Ikiranga ni Bihari Na: Byose Subiza Amabwiriza <em> - &gt; </em> . </"
+"p> \n"
+"< p Itunganya = \" Iburyo: \" > <em> ku . </em> </p> \n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -16670,9 +16292,11 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -16690,7 +16314,9 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -16710,7 +16336,8 @@ msgstr "Gusimbuza Idosiye?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
@@ -16732,18 +16359,27 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "ni A Umwirondoro: ya:  i ku A Igikorwa . Bishunzwe: i Urufunguzo Kuri &Ubutumwa i Mwakirizi Soma i &Ubutumwa . \n"
+#~ "ni A Umwirondoro: ya:  i ku A Igikorwa . Bishunzwe: i Urufunguzo Kuri "
+#~ "&Ubutumwa i Mwakirizi Soma i &Ubutumwa . \n"
 #~ "<p> \n"
-#~ "Ihitamo Bya A Bishunzwe: Cyangwa ni Kuri GUHURA na Soma A &Ubutumwa . , Byose in i Kuri . , i Mburabuzi Akazi . \n"
+#~ "Ihitamo Bya A Bishunzwe: Cyangwa ni Kuri GUHURA na Soma A &Ubutumwa . , "
+#~ "Byose in i Kuri . , i Mburabuzi Akazi . \n"
 #~ "<p> \n"
 #~ "Igenamiterere ni A Mburabuzi , ya:  &Ubutumwa . \n"
 #~ "</qt> "
@@ -16763,16 +16399,21 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> Impera </h1> \n"
-#~ "iyi Ihitamo ni Ivivuwe , i Kugenzura Bya i Impamyabushobozi: Umunyururu: Impera Na: A Impamyabushobozi: . \n"
+#~ "iyi Ihitamo ni Ivivuwe , i Kugenzura Bya i Impamyabushobozi: Umunyururu: "
+#~ "Impera Na: A Impamyabushobozi: . \n"
 #~ "<p> \n"
-#~ "Impamyabushobozi Impamyabushobozi Nka Nka i Impamyabushobozi Bya Itumanaho na Abayobozi ( ) . \n"
+#~ "Impamyabushobozi Impamyabushobozi Nka Nka i Impamyabushobozi Bya "
+#~ "Itumanaho na Abayobozi ( ) . \n"
 #~ "</h1> "
 
 #, fuzzy
@@ -16787,12 +16428,15 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "iyi Ihitamo ni ku , i Impamyabushobozi: Inzira: Kuri i Impamyabushobozi: Buri gihe Ivivuwe Byose i Kuri i Imizi Impamyabushobozi: . \n"
+#~ "iyi Ihitamo ni ku , i Impamyabushobozi: Inzira: Kuri i Impamyabushobozi: "
+#~ "Buri gihe Ivivuwe Byose i Kuri i Imizi Impamyabushobozi: . \n"
 #~ "</qt> "
 
 #, fuzzy
@@ -16807,14 +16451,17 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "iyi Ihitamo ni ku , i Inzira: Bya i Impamyabushobozi: Hejuru Kuri i Imizi Ivivuwe . \n"
+#~ "iyi Ihitamo ni ku , i Inzira: Bya i Impamyabushobozi: Hejuru Kuri i Imizi "
+#~ "Ivivuwe . \n"
 #~ "<p> \n"
 #~ "icyitonderwa ni OYA Kuri Bidakora Kugenzura... i Impamyabushobozi: . \n"
 #~ "</qt> "
@@ -16831,9 +16478,15 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -16851,12 +16504,14 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "iyi Agasanduku ni Ivivuwe , NIBA Rimwe Bya i ikoresha ni Bigyanye Kuri in i "
+#~ "iyi Agasanduku ni Ivivuwe , NIBA Rimwe Bya i ikoresha ni Bigyanye Kuri in "
+#~ "i "
 
 #, fuzzy
 #~ msgid "Number of days before warning"
@@ -16866,7 +16521,8 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
@@ -16890,21 +16546,25 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> Shyiraho Umutekano Kuri </h1> \n"
-#~ "iyi Agasanduku ni Ivivuwe , Bishunzwe: Ubutumwa Yoherejwe: ku Bishunzwe: ikoresha Urufunguzo . \n"
+#~ "iyi Agasanduku ni Ivivuwe , Bishunzwe: Ubutumwa Yoherejwe: ku Bishunzwe: "
+#~ "ikoresha Urufunguzo . \n"
 #~ "<p> \n"
 #~ "ni Kuri iyi Ihitamo ku Kuri Gushoboza Kuri Soma i Ubutumwa Yoherejwe: . \n"
 #~ "</qt> "
 
 #, fuzzy
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
-#~ msgstr "NIBA A Impamyabushobozi: in i Umunyururu: Yarenze igihe: in Birutwa : "
+#~ msgstr ""
+#~ "NIBA A Impamyabushobozi: in i Umunyururu: Yarenze igihe: in Birutwa : "
 
 #, fuzzy
 #~ msgid "Check to be warned if the certificate expires soon"
@@ -16914,14 +16574,18 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "iyi Ihitamo ni Ivivuwe , Hanyuma Ryari: Kuri Koresha A Impamyabushobozi: ya:  Yarenze igihe: muri i Igiteranyo  Bya iminsi . \n"
+#~ "iyi Ihitamo ni Ivivuwe , Hanyuma Ryari: Kuri Koresha A Impamyabushobozi: "
+#~ "ya:  Yarenze igihe: muri i Igiteranyo  Bya iminsi . \n"
 #~ "<p> \n"
 #~ "ni Kuri Gumana: iyi Ihitamo ku Kuri ikoresha Impamyabushobozi in i . \n"
 #~ "</qt> "
@@ -16951,8 +16615,27 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgstr "Impamyabushobozi Kuri Kohereza "
 
 #, fuzzy
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1> </h1> Impamyabushobozi: , i Mwakirizi OYA Kuri Yoherejwe: i &Ubutumwa Cyangwa i &Ubutumwa ku A . <p> Mwakirizi Impamyabushobozi: Kuva: A Seriveri: , Kuri Impamyabushobozi: Na: &Ubutumwa . Guhitamo OYA Kuri Gushyiramo A Impamyabushobozi: Ku Byose , Impamyabushobozi: Cyangwa i Umunyururu: Bya Impamyabushobozi Impamyabushobozi: , Cyangwa i Imizi Impamyabushobozi: . <p> ni Kuri Buri gihe Gushyiramo Ku Impamyabushobozi: Na: i &Ubutumwa . <p> Igenamiterere ni A Mburabuzi , ya:  &Ubutumwa . </qt> "
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1> </h1> Impamyabushobozi: , i Mwakirizi OYA Kuri Yoherejwe: i "
+#~ "&Ubutumwa Cyangwa i &Ubutumwa ku A . <p> Mwakirizi Impamyabushobozi: "
+#~ "Kuva: A Seriveri: , Kuri Impamyabushobozi: Na: &Ubutumwa . Guhitamo OYA "
+#~ "Kuri Gushyiramo A Impamyabushobozi: Ku Byose , Impamyabushobozi: Cyangwa "
+#~ "i Umunyururu: Bya Impamyabushobozi Impamyabushobozi: , Cyangwa i Imizi "
+#~ "Impamyabushobozi: . <p> ni Kuri Buri gihe Gushyiramo Ku Impamyabushobozi: "
+#~ "Na: i &Ubutumwa . <p> Igenamiterere ni A Mburabuzi , ya:  &Ubutumwa . </"
+#~ "qt> "
 
 #, fuzzy
 #~ msgid "Send &your own certificate"
@@ -16978,9 +16661,11 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -16998,7 +16683,9 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -17018,7 +16705,8 @@ msgstr "Gusimbuza Idosiye?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
@@ -17029,7 +16717,8 @@ msgstr "Gusimbuza Idosiye?"
 #~ "</qt> "
 
 #, fuzzy
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Isinya Impamyabushobozi: ni ku i <em> </em> Ipaji: . "
 
 #, fuzzy
@@ -17044,18 +16733,27 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "ni A Umwirondoro: ya:  i ku A Igikorwa . Isinya i Isinya Urufunguzo Kuri &Ubutumwa i Mwakirizi i &Ubutumwa ni Kuva: . \n"
+#~ "ni A Umwirondoro: ya:  i ku A Igikorwa . Isinya i Isinya Urufunguzo Kuri "
+#~ "&Ubutumwa i Mwakirizi i &Ubutumwa ni Kuva: . \n"
 #~ "<p> \n"
-#~ "Ihitamo Bya A Isinya Cyangwa ni Kuri A &Ubutumwa . , Byose in i Kuri . , i Mburabuzi Akazi . \n"
+#~ "Ihitamo Bya A Isinya Cyangwa ni Kuri A &Ubutumwa . , Byose in i Kuri . , "
+#~ "i Mburabuzi Akazi . \n"
 #~ "<p> \n"
 #~ "Igenamiterere ni A Mburabuzi , ya:  &Ubutumwa . \n"
 #~ "</qt> "
@@ -17076,12 +16774,15 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "iyi Agasanduku ni Ivivuwe , Yoherejwe: Ubutumwa Na: i Byashyizweho Kuri . ni , Kuri Kugenzura Nyuma A &Ubutumwa Cyangwa A Inzira %s Bya . \n"
+#~ "iyi Agasanduku ni Ivivuwe , Yoherejwe: Ubutumwa Na: i Byashyizweho Kuri . "
+#~ "ni , Kuri Kugenzura Nyuma A &Ubutumwa Cyangwa A Inzira %s Bya . \n"
 #~ "</qt> "
 
 #, fuzzy
@@ -17100,12 +16801,16 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> Isinya </h1> \n"
-#~ "iyi Ihitamo ni Byahiswemo , i Isinya na i Ibyatanzwe Bya A /&Ubutumwa Inzira %s . &Ubutumwa Ibyatanzwe ATARIIGIHARWE ku OYA i na OYA . 1 . \n"
+#~ "iyi Ihitamo ni Byahiswemo , i Isinya na i Ibyatanzwe Bya A /&Ubutumwa "
+#~ "Inzira %s . &Ubutumwa Ibyatanzwe ATARIIGIHARWE ku OYA i na OYA . 1 . \n"
 #~ "</qt> "
 
 #, fuzzy
@@ -17120,12 +16825,15 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> Ubutumwa </h1> \n"
-#~ "iyi Ihitamo ni Byahiswemo , Byombi i Isinya na i Ibyatanzwe Rimwe . 1 Funga . ku . 1 . \n"
+#~ "iyi Ihitamo ni Byahiswemo , Byombi i Isinya na i Ibyatanzwe Rimwe . 1 "
+#~ "Funga . ku . 1 . \n"
 #~ "</qt> "
 
 #, fuzzy
@@ -17141,8 +16849,20 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgstr "i "
 
 #, fuzzy
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1> </h1> , Guhitamo Kuri Injiza i in Itondekanya Kuri Bwite Umutekano ( ) ifite Impamyabushobozi . <p> Birenzeho Kuri Injiza , i Birenzeho Birinzwe Imeli Ubutumwa in Izina: , i Birenzeho Ibikorwa: . <p> Kuri Guhitamo , iyi Ihitamo Nka ni . <p> icyitonderwa ni OYA Kuri Bidakora Icyinjijwe ya:  Umutekano . </qt> "
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1> </h1> , Guhitamo Kuri Injiza i in Itondekanya Kuri Bwite "
+#~ "Umutekano ( ) ifite Impamyabushobozi . <p> Birenzeho Kuri Injiza , i "
+#~ "Birenzeho Birinzwe Imeli Ubutumwa in Izina: , i Birenzeho Ibikorwa: . <p> "
+#~ "Kuri Guhitamo , iyi Ihitamo Nka ni . <p> icyitonderwa ni OYA Kuri "
+#~ "Bidakora Icyinjijwe ya:  Umutekano . </qt> "
 
 #~ msgid "Once per session"
 #~ msgstr "buri (mukoro)"
@@ -17162,14 +16882,18 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "iyi Ihitamo ni Ivivuwe , Hanyuma Ryari: Kuri Koresha A Impamyabushobozi: ya:  Ishirwaho umukono Yarenze igihe: muri i Igiteranyo  Bya iminsi . \n"
+#~ "iyi Ihitamo ni Ivivuwe , Hanyuma Ryari: Kuri Koresha A Impamyabushobozi: "
+#~ "ya:  Ishirwaho umukono Yarenze igihe: muri i Igiteranyo  Bya iminsi . \n"
 #~ "<p> \n"
 #~ "ni Kuri Gumana: iyi Ihitamo ku Kuri ikoresha Impamyabushobozi in i . \n"
 #~ "</qt> "
@@ -17186,14 +16910,16 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
 #~ "<h1> </h1> \n"
-#~ "iyi Ihitamo ni Ivivuwe , A Iburira ni Byasohowe NIBA i Imeli Aderesi: Bya i ni OYA in i Impamyabushobozi: Byakoreshejwe ya:  Ishirwaho umukono . \n"
+#~ "iyi Ihitamo ni Ivivuwe , A Iburira ni Byasohowe NIBA i Imeli Aderesi: Bya "
+#~ "i ni OYA in i Impamyabushobozi: Byakoreshejwe ya:  Ishirwaho umukono . \n"
 #~ "<p> \n"
 #~ "ni Kuri iyi Ihitamo ku ya:  Kinini . \n"
 #~ "</qt> "
@@ -17215,10 +16941,6 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgstr "Kubika in "
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "Kuboneza Imeli..."
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Fungura ukoresha..."
 
@@ -17330,24 +17052,38 @@ msgstr "Gusimbuza Idosiye?"
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "In a few easy steps, this wizard will help you with the creation of a certificate. You use your certificates in order to sign messages, to encrypt messages and to decrypt messages that other people send to you in encrypted form.\n"
+#~ "In a few easy steps, this wizard will help you with the creation of a "
+#~ "certificate. You use your certificates in order to sign messages, to "
+#~ "encrypt messages and to decrypt messages that other people send to you in "
+#~ "encrypted form.\n"
 #~ "<p>\n"
-#~ "The certificates can either be generated in a centralized or a decentralized manner. Please contact your local help desk if you are unsure how to create a certificate in your organization."
+#~ "The certificates can either be generated in a centralized or a "
+#~ "decentralized manner. Please contact your local help desk if you are "
+#~ "unsure how to create a certificate in your organization."
 #~ msgstr ""
 #~ "<b> Kuri i . </b> \n"
 #~ "<br> \n"
 #~ "<br> \n"
-#~ "A Intambwe , iyi Ifashayobora Na: i Bya A Impamyabushobozi: . Koresha Impamyabushobozi in Itondekanya Kuri Shyiraho Umukono Ubutumwa , Kuri Shyiraho Umutekano Ubutumwa na Kuri Ubutumwa Ikindi Abantu Kohereza Kuri in Bishunzwe: Ifishi %S: . \n"
+#~ "A Intambwe , iyi Ifashayobora Na: i Bya A Impamyabushobozi: . Koresha "
+#~ "Impamyabushobozi in Itondekanya Kuri Shyiraho Umukono Ubutumwa , Kuri "
+#~ "Shyiraho Umutekano Ubutumwa na Kuri Ubutumwa Ikindi Abantu Kohereza Kuri "
+#~ "in Bishunzwe: Ifishi %S: . \n"
 #~ "<p> \n"
-#~ "Impamyabushobozi in A Cyangwa A . Umuntu Bya hafi Ifashayobora NIBA Kuri Kurema A Impamyabushobozi: in Ikigo: . "
+#~ "Impamyabushobozi in A Cyangwa A . Umuntu Bya hafi Ifashayobora NIBA Kuri "
+#~ "Kurema A Impamyabushobozi: in Ikigo: . "
 
 #, fuzzy
 #~ msgid "Your Personal Data"
 #~ msgstr "Kuzana iby'umuntu ku giti cye"
 
 #, fuzzy
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "iyi Ipaji: , Injiza Bwite Ibyatanzwe in Impamyabushobozi: na Ifashayobora Ikindi Abantu Kuri ni ni A &Ubutumwa . "
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "iyi Ipaji: , Injiza Bwite Ibyatanzwe in Impamyabushobozi: na Ifashayobora "
+#~ "Ikindi Abantu Kuri ni ni A &Ubutumwa . "
 
 #, fuzzy
 #~ msgid "Enter your name here"
@@ -17362,7 +17098,9 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgstr "Ikigo: "
 
 #, fuzzy
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
 #~ msgstr "G."
 
 #, fuzzy
@@ -17370,8 +17108,11 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgstr "Imeli Aderesi: "
 
 #, fuzzy
-#~ msgid "Enter the email address here which you want to use in connection with the certificate."
-#~ msgstr "i Imeli Aderesi: Kuri Koresha in Ukwihuza Na: i Impamyabushobozi: . "
+#~ msgid ""
+#~ "Enter the email address here which you want to use in connection with the "
+#~ "certificate."
+#~ msgstr ""
+#~ "i Imeli Aderesi: Kuri Koresha in Ukwihuza Na: i Impamyabushobozi: . "
 
 #~ msgid "&Department:"
 #~ msgstr "Ishami:"
@@ -17384,8 +17125,13 @@ msgstr "Gusimbuza Idosiye?"
 #~ msgstr "Ibisobanuro by'impamyabushobozi"
 
 #, fuzzy
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "iyi Ipaji: , Guhitamo Impamyabushobozi: ni Byakozwe Cyangwa . Kugenzura Na: Bya hafi Ifashayobora NIBA Kuri Guhitamo . "
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "iyi Ipaji: , Guhitamo Impamyabushobozi: ni Byakozwe Cyangwa . Kugenzura "
+#~ "Na: Bya hafi Ifashayobora NIBA Kuri Guhitamo . "
 
 #, fuzzy
 #~ msgid "Certificate &Generation"
@@ -17410,15 +17156,24 @@ msgstr "Gusimbuza Idosiye?"
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt> \n"
-#~ "Isinya Urufunguzo ni NONEAHA Cyiteguye Kuri Yoherejwe: Kuri i ( ) A Impamyabushobozi: ya:  na Kohereza Inyuma Biturutse Imeli . Isubiramo i Impamyabushobozi: munsi . Kwandika Hasi i BIHUYE i Impamyabushobozi: Yoherejwe: Inyuma ku i . \n"
+#~ "Isinya Urufunguzo ni NONEAHA Cyiteguye Kuri Yoherejwe: Kuri i ( ) A "
+#~ "Impamyabushobozi: ya:  na Kohereza Inyuma Biturutse Imeli . Isubiramo i "
+#~ "Impamyabushobozi: munsi . Kwandika Hasi i BIHUYE i Impamyabushobozi: "
+#~ "Yoherejwe: Inyuma ku i . \n"
 #~ "<p> \n"
-#~ "Kuri Guhindura... , Kanda na Ubwoko Amahinduka . Kanda Kuri Kohereza i Isinya Urufunguzo Kuri i . \n"
+#~ "Kuri Guhindura... , Kanda na Ubwoko Amahinduka . Kanda Kuri Kohereza i "
+#~ "Isinya Urufunguzo Kuri i . \n"
 #~ "</qt> "
 
 #~ msgid "Extension"
diff --git a/tde-i18n-se/messages/tdepim/kmail.po b/tde-i18n-se/messages/tdepim/kmail.po
index 33e3ce41e95..6cb141e2ed4 100644
--- a/tde-i18n-se/messages/tdepim/kmail.po
+++ b/tde-i18n-se/messages/tdepim/kmail.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-03-06 22:56+0100\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\n"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Børre Gaup, Mákká Regnor"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "&Ii makkárge (leage várrogas)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Kontu bealleautomáhtalaš ressursagieđaheapmái"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Sálke historjjá"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,13 +254,13 @@ msgstr "&Geavaheaddjinamma:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Du interneahtta bálválusbukti attii dutnje <em>geavaheaddjinama</em> "
-"mainna iežat sisačálihat sin bálvái . Dávjá dat lea vuosttáš oasi "
-"e-boastačujuhusas (teaksta ovdal <em>@</em>)."
+"Du interneahtta bálválusbukti attii dutnje <em>geavaheaddjinama</em> mainna "
+"iežat sisačálihat sin bálvái . Dávjá dat lea vuosttáš oasi e-boastačujuhusas "
+"(teaksta ovdal <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -275,19 +281,19 @@ msgstr "&Vurke POP-beassansáni"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Merke dán bovssa jos háliidat ahte KMail gálgá vurket beassansáni.\n"
-"Jus TDEWallet lea olamutus, de beassansátni vurkejuvvo dan prográmmas. Dát lea "
-"sihkkaris vuohki.\n"
+"Jus TDEWallet lea olamutus, de beassansátni vurkejuvvo dan prográmmas. Dát "
+"lea sihkkaris vuohki.\n"
 "Muhto jus TDEWallet ii leat olamuttus, de beassansátni vurkejuvvo KMaila "
-"heivehusfillas. Beassansátni vurkejuvvo čiegus formáhtas, muhto ii leat sihkkar "
-"jus giinu sáhttá lohkat heivehusfiilla."
+"heivehusfillas. Beassansátni vurkejuvvo čiegus formáhtas, muhto ii leat "
+"sihkkar jus giinu sáhttá lohkat heivehusfiilla."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -315,12 +321,13 @@ msgstr "&Geavat dušše silli jos reive lea stuorát go"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Jos merket dán molssaeavttu, POP-silli mearrida mii dáhpáhuvvá reivviiguin. "
-"Vállje jos háliidat daid viežžat, sihkkut dahje diktit daid leat "
-"e-boastabálvás."
+"Vállje jos háliidat daid viežžat, sihkkut dahje diktit daid leat e-"
+"boastabálvás."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -369,13 +376,15 @@ msgstr "Čá&bu teaksta"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -418,9 +427,9 @@ msgstr "Nammalánjat:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -479,9 +488,9 @@ msgstr "Viečča &mildosiid go lea dárbu"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Geavat dán molssaeavttu vai mildosat eai vižžojuvvo automáhtalaččat, muhto "
 "baicce go ieš coahkkalat mildosii. Dán láhkái oainnát stuorra reivviid maid "
@@ -496,8 +505,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Iskka vuollemáhpaid dušše jus bajilmáhppa lea rahpon. Geavat dán molssaeavttu "
-"jus leat máŋga máhpa bálvvás."
+"Iskka vuollemáhpaid dušše jus bajilmáhppa lea rahpon. Geavat dán "
+"molssaeavttu jus leat máŋga máhpa bálvvás."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -525,7 +534,7 @@ msgstr "<ii oktage>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "boastaboksa"
 
@@ -533,28 +542,29 @@ msgstr "boastaboksa"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -563,23 +573,23 @@ msgstr "Meroštala vuos bálvá ja verrát «Oppalaš»-gilkoris."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -587,8 +597,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -664,8 +674,8 @@ msgstr "IMAP-kontu"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -702,9 +712,9 @@ msgstr "Bures boahttin KMailii"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -767,8 +777,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Bálvadieđut"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ii mihkiige"
@@ -902,17 +911,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -945,10 +953,9 @@ msgstr "Sirdde vejolaš &ruskareivviid deikke:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -959,8 +966,8 @@ msgstr "Dárkkis reivviid antivirusreaidduiguin"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -970,8 +977,8 @@ msgstr "Sirdde návdejuvvon virusreivviid válljejuvvon máhppii"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -980,8 +987,8 @@ msgstr "Dasalassin, merke návdejuvvon virusreivviid lohkon"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1174,8 +1181,8 @@ msgstr "Meattáhus logadettiin máhpa %1 bálvvás: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1195,8 +1202,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1226,15 +1233,15 @@ msgstr "Sihkkojuvvon"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1264,15 +1271,19 @@ msgstr "Filtii «%1» čoahkkáibahkkemin. Čoahkkáibahkken gaskkalduvvui."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Viečča profiilla"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Heivet konto"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "Lasi&t …"
@@ -1303,6 +1314,11 @@ msgstr ""
 msgid "Remove Identity"
 msgstr "Váldde eret identitehta"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Váldde eret"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Lasit …"
@@ -1311,6 +1327,11 @@ msgstr "Lasit …"
 msgid "Modify..."
 msgstr "Rievdat …"
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Váldde eret"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Geavat standárdan"
@@ -1327,17 +1348,15 @@ msgstr "&Sáddemin"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Manni kontuat (lasit unnimus ovtta):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Namma"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Šládja"
@@ -1359,8 +1378,7 @@ msgstr "Geavat standárdan"
 msgid "Common Options"
 msgstr "Dábálaš heivehusat"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "N&anne ovdal sáddema"
@@ -1411,17 +1429,16 @@ msgstr "S&tandárddomeana:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Standárddomena lasihuvvo smárfe-a:a máŋŋá («@») čujuhusain gos leat čállán "
-"dušše dan oasi mii lea ovdal smárfe-a:a.</p></qt>"
+"<qt> <p>Standárddomena lasihuvvo smárfe-a:a máŋŋá («@») čujuhusain gos leat "
+"čállán dušše dan oasi mii lea ovdal smárfe-a:a.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1439,9 +1456,9 @@ msgstr "Lasit fievrridanvuogi"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Standárda)"
 
@@ -1520,6 +1537,10 @@ msgstr "Rievdat kontu"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Kontu <b>%1</b> ii gávdnon.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Ivnnit"
@@ -1628,8 +1649,7 @@ msgstr "Čuovvujuvvon liŋka"
 msgid "Misspelled Words"
 msgstr "Boastotčállejuvvon sánit"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Ođđa reive"
@@ -1818,11 +1838,11 @@ msgstr "Gođđosat leat álgoálggus giddásat"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Raba gođđosiid mas leat ođđa, logakeahtes dahje dehálaš &reivvet ja gođđosiid "
-"mat gozihuvvojit."
+"Raba gođđosiid mas leat ođđa, logakeahtes dahje dehálaš &reivvet ja "
+"gođđosiid mat gozihuvvojit."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1830,66 +1850,50 @@ msgstr "Dáhtončájeheapmi"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt> "
-"<p><strong>Dá leat vejolaš dáhtondajáldagaid:</strong></p> "
-"<ul> "
-"<li>d – beaivi lohkun, nolla haga (1-31)</li> "
-"<li>dd – beavi lohkun, ovttain nollain (01-31)</li> "
-"<li>ddd – oaniduvvon beaivenamma (Vuos – Sotn)</li> "
-"<li>dddd – guhkes beaivenamma (Vuossárga – Sotnabeaivi)</li> "
-"<li>M – mánnu lohkun, nolla haga (1-12)</li> "
-"<li>MM – mánnu lohkun, ovttain nolla (01-12)</li> "
-"<li>MMM – oaniduvvon mánnonamma (Ođđj – Juov)</li> "
-"<li>MMMM – guhkes mánnonamma (Ođđajagemánnu – Juovlamánnu)</li> "
-"<li>yy – jahki guovtti loguin (00-99)</li> "
-"<li>yyyy – jahki njeallji loguin (0000-9999)</li> </ul> "
-"<p><strong>Dá leat vejolaš áigedajáldagaid:</strong></p> "
-"<ul> "
-"<li>h – diibmu, nolla haga (1-23 dahje 1-12 a.m./p.m.)</li> "
-"<li>hh – diibmu, ovttain nollain (00-23, dahje 01-12 a.m./p.m.)</li> "
-"<li>m – minuhtta, nolla haga (0-59)</li> "
-"<li>mm – minuhtta, ovttain nolla (00-59)</li> "
-"<li>s – sekunda, nolla haga (0-59)</li> "
-"<li>ss – sekundan, ovttain nollain (00-59)</li> "
-"<li>z – millisekunda, nolla haga (0-999)</li> "
-"<li>zzz – millisekunda, ovttain nolla (000-999)</li> "
-"<li>AP – 12 diibmosaš hápmi. AP buhttejuvvon «a.m»:ain dahje «p.m.»:ain.</li> "
-"<li>Z – áigeávadat numeralaš hámis (-0500)</li></ul> "
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt> <p><strong>Dá leat vejolaš dáhtondajáldagaid:</strong></p> <ul> <li>d – "
+"beaivi lohkun, nolla haga (1-31)</li> <li>dd – beavi lohkun, ovttain nollain "
+"(01-31)</li> <li>ddd – oaniduvvon beaivenamma (Vuos – Sotn)</li> <li>dddd – "
+"guhkes beaivenamma (Vuossárga – Sotnabeaivi)</li> <li>M – mánnu lohkun, "
+"nolla haga (1-12)</li> <li>MM – mánnu lohkun, ovttain nolla (01-12)</li> "
+"<li>MMM – oaniduvvon mánnonamma (Ođđj – Juov)</li> <li>MMMM – guhkes "
+"mánnonamma (Ođđajagemánnu – Juovlamánnu)</li> <li>yy – jahki guovtti loguin "
+"(00-99)</li> <li>yyyy – jahki njeallji loguin (0000-9999)</li> </ul> "
+"<p><strong>Dá leat vejolaš áigedajáldagaid:</strong></p> <ul> <li>h – "
+"diibmu, nolla haga (1-23 dahje 1-12 a.m./p.m.)</li> <li>hh – diibmu, ovttain "
+"nollain (00-23, dahje 01-12 a.m./p.m.)</li> <li>m – minuhtta, nolla haga "
+"(0-59)</li> <li>mm – minuhtta, ovttain nolla (00-59)</li> <li>s – sekunda, "
+"nolla haga (0-59)</li> <li>ss – sekundan, ovttain nollain (00-59)</li> <li>z "
+"– millisekunda, nolla haga (0-999)</li> <li>zzz – millisekunda, ovttain "
+"nolla (000-999)</li> <li>AP – 12 diibmosaš hápmi. AP buhttejuvvon «a.m»:ain "
+"dahje «p.m.»:ain.</li> <li>Z – áigeávadat numeralaš hámis (-0500)</li></ul> "
 "<p><strong>Buot eará mearkkát bádjelgehččojuvvojit.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Jos rievdadat oppalaš gođđosheivehusaid máhppaheivehusat badjegehččojuvvojit."
 
@@ -1905,8 +1909,7 @@ msgstr "Čájet &HTML-stáhtusholgga"
 msgid "Show s&pam status in fancy headers"
 msgstr "Čájet &ruskaboastastáhtusa fárddalaš reivebajilčállagiin"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1915,8 +1918,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1942,8 +1944,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Badjelgeahča mearkakodema:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Čájet govaža vuogádatgárccus"
@@ -2045,23 +2046,20 @@ msgstr "<b>«%f» molsojuvvo dainna fiilanamain maid háliidat doaimmahit."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Čuovvovaš kodat dorjojuvvojit vástádusteavssttain:"
-"<br><b>%D</b>: beaivi, <b>%S</b>: fáddá,"
-"<br><b>%e</b>: vuolggaheaddji čujuhus, <b>%F</b>: sáddejeaddji, <b>%f</b>"
-": sáddejeaddji ovdabustávat,"
-"<br><b>%T</b>: vuostáiváldi namma, <b>%t</b>: vuostáiváldi namma ja čujuhus,"
-"<br><b>%C</b>: máŋgosa vuostáiválddiid namat, <b>%c</b>"
-": máŋgosa vuostáiválddiid namat ja čujuhusat, "
-"<br><b>%%</b>: proseantamearka, <b>%_</b>: sátnegaska, <b>%L</b>"
-": linnjádoadjin</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Čuovvovaš kodat dorjojuvvojit vástádusteavssttain:<br><b>%D</b>: beaivi, "
+"<b>%S</b>: fáddá,<br><b>%e</b>: vuolggaheaddji čujuhus, <b>%F</b>: "
+"sáddejeaddji, <b>%f</b>: sáddejeaddji ovdabustávat,<br><b>%T</b>: "
+"vuostáiváldi namma, <b>%t</b>: vuostáiváldi namma ja čujuhus,<br><b>%C</b>: "
+"máŋgosa vuostáiválddiid namat, <b>%c</b>: máŋgosa vuostáiválddiid namat ja "
+"čujuhusat, <br><b>%%</b>: proseantamearka, <b>%_</b>: sátnegaska, <b>%L</b>: "
+"linnjádoadjin</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2084,21 +2082,20 @@ msgstr "Vástit &buohkaide:"
 msgid "&Forward:"
 msgstr "&Sádde viidáset:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Bájuhanmearka:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D don čállet:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D, %F čálii:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Viidásit sáddejuvvon reive"
 
@@ -2134,8 +2131,8 @@ msgstr "Attes ođđa «sádde viidáset» prefivssa:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2172,10 +2169,9 @@ msgstr "Arvu"
 msgid "Ne&w"
 msgstr "Ođđ&a"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Namma:"
@@ -2184,19 +2180,18 @@ msgstr "&Namma:"
 msgid "&Value:"
 msgstr "Á&rvu:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-heivvolaš mielddusnammadeapmi"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Vállje dán molssaeavttu vai Outlook™ ipmirda mielddusnamaid main leat mearkkat "
-"mat eai leat eŋgelasgielas"
+"Vállje dán molssaeavttu vai Outlook™ ipmirda mielddusnamaid main leat "
+"mearkkat mat eai leat eŋgelasgielas"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2222,13 +2217,13 @@ msgstr "melddustuvvon"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2253,70 +2248,61 @@ msgstr "Krypteren&mohtorat"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Muhtomin e-reivvet bohtet goabbašat formáhtain. Dát molssaeaktu mearrida "
-"jos čabu teaksta dahje HTML-oassi čájehuvvo.</p> "
-"<p>Jos HTML-oassi čájehuvvo, reivve šaddá fárddalaš, muhto seamma áiggis </p> "
-"<p>Jos čabu teaksta-oassi čájehuvvo, de šaddá <em></em></p> "
-"<p></p> "
-"<p><em></em></p> "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt> <p> Muhtomin e-reivvet bohtet goabbašat formáhtain. Dát molssaeaktu "
+"mearrida jos čabu teaksta dahje HTML-oassi čájehuvvo.</p> <p>Jos HTML-oassi "
+"čájehuvvo, reivve šaddá fárddalaš, muhto seamma áiggis </p> <p>Jos čabu "
+"teaksta-oassi čájehuvvo, de šaddá <em></em></p> <p></p> <p><em></em></p> "
 "<p><b></b><i></i></p> </qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2333,15 +2319,15 @@ msgstr "Soava reivviid viežžat &olgguldas bájuhusaid interneahtas"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<qt><b>VÁRUHUS:</b> Jos suovat HTML e-reivviid de lea álkkit vierisolbmuide "
-"atnit sihkarvuođaráiggiid ja beassat sisa du dihtorii. <a href=\"whatsthis:%1\">"
-"Eanet dieđuid HTML-e-boasttaid birra …</a> <a href=\"whatsthis:%2\">"
-"Eanet dieđuid olgguldas čujuhusaid birra …</a>"
+"atnit sihkarvuođaráiggiid ja beassat sisa du dihtorii. <a href=\"whatsthis:"
+"%1\">Eanet dieđuid HTML-e-boasttaid birra …</a> <a href=\"whatsthis:"
+"%2\">Eanet dieđuid olgguldas čujuhusaid birra …</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2415,14 +2401,14 @@ msgstr "A&utomáhtalaččat sisafievrrit čoavdagiid ja duođaštusaid"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Jos rievdadat oppalaš HTML-heivehusaid, máhppaheivehusat badjelgehččojuvvojit."
+"Jos rievdadat oppalaš HTML-heivehusaid, máhppaheivehusat "
+"badjelgehččojuvvojit."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2451,8 +2437,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Geahččalettiin logakeahtes reivviid gávdnat:"
 
@@ -2476,8 +2462,8 @@ msgstr "Máhcat buot máhpain"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2546,26 +2532,22 @@ msgstr "Ozut («maildir»-formáhtta)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt> "
-"<p>Dás válljet standárda boastaboksaformáhta:</p> "
-"<p><b>mbox:</b> Juohke boastamáhppa lea okta stuorra fiila mas buot reivvet "
-"leat. Reivvet sirrejuvvojit linnjáin mas lea «From» álggus. Dát formáhtta "
-"geavaha unnit saji, muhto dalle sáhttet meattáhusat čuoččuhit, omd. go sirddát "
-"reivviid máhpáid gaskkas.</p> "
-"<p><b>maildir:</b> Juohke boastamáhppa lea ohcu garraskearrus. Juohke reive lea "
-"fiila. Dát váldá eanet saji garraskearrus, muhto lea nannuseabbut, omd. go "
-"sirddát reivviid máhpaid gaskkas.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt> <p>Dás válljet standárda boastaboksaformáhta:</p> <p><b>mbox:</b> "
+"Juohke boastamáhppa lea okta stuorra fiila mas buot reivvet leat. Reivvet "
+"sirrejuvvojit linnjáin mas lea «From» álggus. Dát formáhtta geavaha unnit "
+"saji, muhto dalle sáhttet meattáhusat čuoččuhit, omd. go sirddát reivviid "
+"máhpáid gaskkas.</p> <p><b>maildir:</b> Juohke boastamáhppa lea ohcu "
+"garraskearrus. Juohke reive lea fiila. Dát váldá eanet saji garraskearrus, "
+"muhto lea nannuseabbut, omd. go sirddát reivviid máhpaid gaskkas.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2599,32 +2581,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2690,8 +2667,8 @@ msgstr "Č&iega joavkoprográmmamáhpaid"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Go dát lea válljejuvvon, de it oainne IMAP-resursamáhpaid máhppamuoras."
 
@@ -2703,8 +2680,8 @@ msgstr "Re&sursamáhpat leat konttus:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Go dát lea válljejuvvon, de it oainne IMAP-resursamáhpaid máhppamuoras."
 
@@ -2759,19 +2736,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-heivvolaš mielddusnammadeapmi"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automáhtalaš bovdehussádden"
@@ -2784,14 +2760,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2896,17 +2872,16 @@ msgstr "Sádde &viidáseabbut"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2924,15 +2899,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3001,8 +2976,8 @@ msgstr "Doaimmat identitehta"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3260,6 +3235,11 @@ msgstr "Vállje máhpa"
 msgid "Filters"
 msgstr "Silli %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Merke visot teavstta"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3291,8 +3271,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3309,10 +3289,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3333,10 +3314,10 @@ msgstr "rájahis"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3347,7 +3328,7 @@ msgstr ""
 "Ii sáhttán čállit fiilla %1:\n"
 "«%2» lea bienalaš meattáhusválddahus."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail-meattáhusdieđáhus"
@@ -3388,9 +3369,9 @@ msgstr "&Geavaheaddjiidentifikáhtor:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3442,8 +3423,8 @@ msgstr "Dus ii leat lohkan-/čállinvuoigatvuohta ruskalihttemáhppii."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "Dieđut eai leat vižžojuvvon bálvvás vel. Geavat «Iskka e-boastta»."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3454,8 +3435,7 @@ msgstr "Meattáhus: Ii makkárge IMAP-konttu meroštuvvon dán máhpas"
 msgid "Connecting to server %1, please wait..."
 msgstr "Laktašeamen %1 bálvái, vuorddes …"
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Meattáhus laktašettiin %1 bálvái"
@@ -3481,8 +3461,8 @@ msgstr "Lasit vuoigatvuođaid"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Háliidatgo duođas váldit eret iežat vuoigatvuođaid dán máhpas? Don it beasa "
 "deikke maŋŋileabbut."
@@ -3514,7 +3494,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Vállje máhpa"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Báikkalaš máhpat"
@@ -3538,9 +3518,9 @@ msgstr "Vállje máhpa njuolggobálggis"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3561,11 +3541,20 @@ msgstr "&Orustahte barggu"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Amas"
@@ -3686,39 +3675,13 @@ msgstr "Ruskaboastastáhtus: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br>–<br>r<br>e<br>i<br>v<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr "<qt><br>I<br>i<br>H<br>T<br>M<br>L<br>–<br>r<br>e<br>i<br>v<br>e</qt>"
 
 #: identitydialog.cpp:93
@@ -3731,18 +3694,13 @@ msgstr "&Du namma:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>Iežat namma</h3> "
-"<p>Dán giettis gálggašii du namma leat, nugo háliidat ahte dat gálgá leat "
-"reiveoaivvis mii sáddejuvvo.</p> "
-"<p>Jus guođát dán guorusin de čájehuvvo dušše du e-boastačujuhus.</p></qt>"
+"<qt> <h3>Iežat namma</h3> <p>Dán giettis gálggašii du namma leat, nugo "
+"háliidat ahte dat gálgá leat reiveoaivvis mii sáddejuvvo.</p> <p>Jus guođát "
+"dán guorusin de čájehuvvo dušše du e-boastačujuhus.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3750,16 +3708,13 @@ msgstr "Orga&nisašuvdna:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3> Organisašuvdna</h3> "
-"<p>Dása čálát du organisašuvnna nama nugo čájehuvvo reiveoaivvis.</p> "
-"<p>Lea dábálaš ja aibbas ortnegis guođđit dán gietti guorusin.</p></qt>"
+"<qt> <h3> Organisašuvdna</h3> <p>Dása čálát du organisašuvnna nama nugo "
+"čájehuvvo reiveoaivvis.</p> <p>Lea dábálaš ja aibbas ortnegis guođđit dán "
+"gietti guorusin.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3768,20 +3723,15 @@ msgstr "&E-boastačujuhus:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3> E-boastačujuhus</h3> "
-"<p>Dán gieđđái gálggašit čállit ollislaš e-boastačujuhusa</p> "
-"<p>Jus dát gieddi lea guorus, dahje du čujuhus lea boastot čállojuvvon, olbmot "
-"eai dáidde du reivviid vástidit.</p></qt>"
+"<qt> <h3> E-boastačujuhus</h3> <p>Dán gieđđái gálggašit čállit ollislaš e-"
+"boastačujuhusa</p> <p>Jus dát gieddi lea guorus, dahje du čujuhus lea "
+"boastot čállojuvvon, olbmot eai dáidde du reivviid vástidit.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -3790,21 +3740,12 @@ msgstr "&E-boastačujuhus:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3828,12 +3769,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3846,20 +3786,18 @@ msgstr "OpenPGP-krypterenčoavddat"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3878,11 +3816,10 @@ msgstr "Vállje S/MIME-duođaštusa mainna vuolláičálát iežat reivviid."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3895,18 +3832,17 @@ msgstr "Du S/MIME-krypterenduođaštus"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3927,14 +3863,12 @@ msgstr "&Vástidančujuhus:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3944,20 +3878,16 @@ msgstr "Č&iegusmáŋgusčujuhusat:"
 #: identitydialog.cpp:345
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
-"<qt> "
-"<h3>BCC (čiegus máŋgus) čujuhusat</h3> "
-"<p>Čujuhusaid maid čálát dása lasihuvvojit juohke vuolgi reivii mii sáddejuvvo "
-"dáinna identitehtain. Eará vuostáiváldit eai oainne dáid čujuhusaid.</p> "
+"<qt> <h3>BCC (čiegus máŋgus) čujuhusat</h3> <p>Čujuhusaid maid čálát dása "
+"lasihuvvojit juohke vuolgi reivii mii sáddejuvvo dáinna identitehtain. Eará "
+"vuostáiváldit eai oainne dáid čujuhusaid.</p> "
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -3995,7 +3925,7 @@ msgstr "&Vuolláičála"
 msgid "&Picture"
 msgstr "&Govva"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Gustohis e-boastačujuhus"
 
@@ -4014,8 +3944,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4064,8 +3994,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Standárda)"
 
@@ -4110,14 +4040,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4155,14 +4085,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Meattáhus: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4312,14 +4247,14 @@ msgstr "Listovuorkát"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4348,43 +4283,36 @@ msgstr "Eai geavahahtti krypterenčoavdagat"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> > "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> (Čoavdda-ID "
+"0x%2)</p> <p>boarásmuvvá otne</p>\n"
+"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> > (Čoavdda-"
+"ID 0x%2)</p> <p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> > "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> (Čoavdda-ID 0x"
+"%2)</p> <p>boarásmuvvá otne</p>\n"
+"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> > (Čoavdda-ID 0x"
+"%2)</p> <p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Du OpenPGP-čoavdda</p> <p align=center><b>%1</b> (Čoavdda-ID 0x%2)</p> "
 "<p>boarásmuvvá otne</p>\n"
@@ -4394,178 +4322,143 @@ msgstr ""
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá otne</"
+"p>\n"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá %n "
+"beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá otne</"
+"p>\n"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá %n "
+"beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Du S/MIME-vuolláičállinduođaštus</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du S/MIME-vuolláičállinduođaštus</p><p align=center><b>%1</b></p>"
-"(ráidonummir %2)"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"(ráidonummir %2)</p><p>boarásmuvvá otne</p>\n"
+"<p>Du S/MIME-vuolláičállinduođaštus</p><p align=center><b>%1</b></"
+"p>(ráidonummir %2)<p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b></p>"
-"(ráidonummir %2)"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b> (ráidonummir "
+"%2)</p><p>boarásmuvvá otne</p>\n"
+"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b></p>(ráidonummir "
+"%2)<p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b></p>(ráidonummir %2)"
-"<p>boarásmuvvá %n geahčen.</p>"
+"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b></p>(ráidonummir "
+"%2)<p>boarásmuvvá %n geahčen.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4579,41 +4472,34 @@ msgstr "S/MIME-duodaštus boarásmuvvá fargga"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> > "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> (Čoavdda-ID "
+"0x%2)</p> <p>boarásmuvvá otne</p>\n"
+"<p>Du OpenPGP-vuolláičállinčoavdda</p> <p align=center><b>%1</b> > (Čoavdda-"
+"ID 0x%2)</p> <p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> > "
-"(Čoavdda-ID 0x%2)</p> "
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> (Čoavdda-ID 0x"
+"%2)</p> <p>boarásmuvvá otne</p>\n"
+"<p>Du OpenPGP-krypterenčoavdda</p> <p align=center><b>%1</b> > (Čoavdda-ID 0x"
+"%2)</p> <p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Du OpenPGP-čoavdda</p> <p align=center><b>%1</b> (Čoavdda-ID 0x%2)</p> "
 "<p>boarásmuvvá otne</p>\n"
@@ -4622,170 +4508,135 @@ msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá otne</"
+"p>\n"
+"<p>Ruohtasduođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá %n "
+"beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"vuolláičállinduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-krypterenduođaštusa várás</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-"
+"krypterenduođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> "
-"<p>du S/MIME-duođaštusa várás</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá otne</"
+"p>\n"
+"<p>CA-duođaštuš</p><p align=center><b>%3</b></p> <p>du S/MIME-duođaštusa "
+"várás</p><p align=center><b>%1</b> (ráidonummir %2)</p><p>boarásmuvvá %n "
+"beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Du S/MIME-vuolláičállinduođaštus</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du S/MIME-vuolláičállinduođaštus</p><p align=center><b>%1</b></p>"
-"(ráidonummir %2)"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"(ráidonummir %2)</p><p>boarásmuvvá otne</p>\n"
+"<p>Du S/MIME-vuolláičállinduođaštus</p><p align=center><b>%1</b></"
+"p>(ráidonummir %2)<p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b> "
-"(ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b></p>"
-"(ráidonummir %2)"
-"<p>boarásmuvvá %n beaivvi geahčen.</p>"
+"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b> (ráidonummir "
+"%2)</p><p>boarásmuvvá otne</p>\n"
+"<p>Du S/MIME-krypterenduođaštus</p><p align=center><b>%1</b></p>(ráidonummir "
+"%2)<p>boarásmuvvá %n beaivvi geahčen.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b> (ráidonummir %2)</p>"
-"<p>boarásmuvvá otne</p>\n"
-"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b></p>(ráidonummir %2)"
-"<p>boarásmuvvá %n geahčen.</p>"
+"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b> (ráidonummir %2)</"
+"p><p>boarásmuvvá otne</p>\n"
+"<p>Du S/MIME-duođaštus</p><p align=center><b>%1</b></p>(ráidonummir "
+"%2)<p>boarásmuvvá %n geahčen.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -4797,9 +4648,10 @@ msgstr "S/MIME-duodaštus boarásmuvvá fargga"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4825,26 +4677,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4855,8 +4707,8 @@ msgstr "Ale vuolláičále OpenPGP:in"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4878,8 +4730,8 @@ msgstr ""
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4899,8 +4751,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4936,11 +4788,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4982,10 +4834,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Varalaš meattáhus: In sáhtán čohkket boastta: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"In sáhtán lasihit reivve:\n"
+msgid "Failed to add message:\n"
+msgstr "In sáhtán lasihit reivve:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5075,6 +4925,50 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr "&Maildir-boastaboksa"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Mearrit reivve fáttá"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Sáddes mángosa «čujuhussii»"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Sáddes čiegus máŋgosa «čujuhussii»"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Lasit «bajilčállaga» reivii"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Viečča reivesisdoalu «fiillas»"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Vállje reivve sisdoalu."
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Lasit mildusa reivii. Dát leat geardduhahtti."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Iskka dušše leago ođđa e-boasta"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Raba dušše čállinprográmma"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Čájet meroštuvvon reivefiilla"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "E-boasta"
@@ -5129,9 +5023,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5181,11 +5075,11 @@ msgstr "URL mángejuvvon čuohposgirjái."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Fiila <b>%1</b> gávdno juo.H<b>áliidatgo buhttet dan?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Vurke fiilii"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Buhtte"
 
@@ -5203,7 +5097,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5223,208 +5117,208 @@ msgstr "Fiila ii sisttisdoala reivve."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fiila sisttisdoallá máŋga reivviid. Dušše vuosttáš reive čájehuvvo."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Sillemin reivviid"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Sillemin reive %1 %2 reivves"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Ii leat doarvái saji skearrus?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Sirdde dán máhppii"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Máŋge dán máhppii"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Sirdimin reivviid"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Sihkomin reivviid"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Rahpamin URL …"
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Háliidat go duođaid vuodjit <b>«%1»</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Vuoje gohččuma"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Ii gávdnan mildosiid maid vurket."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Vurke mildosiid nugo"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "mielddus.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "mielddus.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Fiila nammaduvvon %1 gávdno juo. Háliidatgo buhttet dan?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fiila gávdno juo"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Buhtte"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Oassi %1 reivves lea krypterejuvvon. Háliidatgo vurket oasi krypterejuvvon?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-jearaldat"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Doalat krypterema"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ale doalat krypterema"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"Oassi %1 reivves lea vuolláičállon. Háliidatgo vurket vuolláičála vurkedettiin "
-"reivve?"
+"Oassi %1 reivves lea vuolláičállon. Háliidatgo vurket vuolláičála "
+"vurkedettiin reivve?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Doalat vuolláičállaga"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr "Ii sáhttán čállit fiilii %1:%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Ii sáhttán čállit fiilii %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Vállje krypterenčoavdaga Chiasmusii"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "E-boasta"
@@ -5523,7 +5417,7 @@ msgstr "Sturrodat"
 msgid "Encoding"
 msgstr "Koda"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Čoahkkáipáhke"
 
@@ -5535,7 +5429,7 @@ msgstr "Krypteren"
 msgid "Sign"
 msgstr "Vuolláičále"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Mildusa namma: "
 
@@ -5555,7 +5449,8 @@ msgstr "Váldovuostáiváldit"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5565,14 +5460,13 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>E-boastačujuhusaid maid čálát dán gieddái ožžot máŋgosiid dán reivves. "
-"Teknihkálaččat lea seamma go čállit čujuhusaid <b>Vuostáiváldi:</b>"
-"-gieđđái, muhto čájeha ahte máŋgus lea guldaleaddjái iige "
-"váldovuostáiváldái.</qt>"
+"Teknihkálaččat lea seamma go čállit čujuhusaid <b>Vuostáiváldi:</b>-gieđđái, "
+"muhto čájeha ahte máŋgus lea guldaleaddjái iige váldovuostáiváldái.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5580,9 +5474,8 @@ msgstr "Čiegus vuostáiválddit"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>Seammago <b>Máŋgos dása:</b>-gieddi, muhto eará vuostáiváldit eai oainne "
 "geat ožžot čiegus máŋgosa.</qt>"
@@ -5595,7 +5488,7 @@ msgstr "&Sádde e-boastta"
 msgid "&Send Mail Via"
 msgstr "&Sádde e-boastta dán bokte"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Sádde &maŋibut"
@@ -5660,8 +5553,7 @@ msgstr "Váldde eret &aisttonmearkkaid"
 msgid "Cl&ean Spaces"
 msgstr "&Čorge sátnegaskkaid"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Geavat &fontta mas lea giddes govdodat"
@@ -5803,31 +5695,31 @@ msgstr "&Kryptografálaš reiveformáhtta"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standárda"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Čuokkislistu (jorbu)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Čuokkislistu (gierdu)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Čuokkislistu (njeallječiehka)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Ortnejuvvon listu (desimála)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Ortnejuvvon listu (alfabehtalaš, smávva bustávat)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Ortnejuvvon listu (alfabehtalaš, stuorra bustávat)"
 
@@ -5929,56 +5821,58 @@ msgstr "Gidde čállinprográmma"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Du reive orro bájuheamen dihto mildosii, muhto ii leat mielddus dán reivves.\n"
+"Du reive orro bájuheamen dihto mildosii, muhto ii leat mielddus dán "
+"reivves.\n"
 "Háliidatgo mielddustahttit fiilla du reivii?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Mielddusmuittoheaddji"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Sádde &reivdadankeahttá"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>KMail ii gávdnan mildosa (%1).</p> "
-"<p>Fertet čállit olles bálgá fiilii jus háliidat dan mielddustahttit.</p></qt>"
+"<qt> <p>KMail ii gávdnan mildosa (%1).</p> <p>Fertet čállit olles bálgá "
+"fiilii jus háliidat dan mielddustahttit.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Bija fiilla fárrui"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Mielddus"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Bija sisa fiilla"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Bija sisa fiilla"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -6018,20 +5912,35 @@ msgid ""
 "View"
 msgstr "Čájet"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Doaimmat …"
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Doaimmat skripta …"
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Vurke &danin …"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Iešvuođat"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Bija fárrui …"
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail ii sáhttán čoahkkáipáhkket fiilla."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6039,262 +5948,258 @@ msgstr ""
 "Čoahkkáipáhkkejuvvon fiila lea stuoribut go álgovuolggálaš fiila. Háliidatgo "
 "doalahit álgovuolggálaš fiilla?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Doalat"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail ii sáhttán páhkket fiilla olggos."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Vurke mildosa nugo"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Lasit mielddusin"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Liibme &mielddusin"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "namahis"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Ii meroštuvvon krypterenčoavdda"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Ii meroštuvvon vuolláičállinčoavdda"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Fertet čállit du e-boastačujuhusa Sáddejeaddji:-gieddái. Galggašit bidjat "
-"e-boastačujuhusaid buot identitehtaid várás, vai it dárbbaš čállit dan sisa "
+"Fertet čállit du e-boastačujuhusa Sáddejeaddji:-gieddái. Galggašit bidjat e-"
+"boastačujuhusaid buot identitehtaid várás, vai it dárbbaš čállit dan sisa "
 "juohke reivii."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Don fertet deavddit unnimusat ovtta vuostáiválddi, Vuostáiváldi:, CC dahje "
 "BCC-giettis."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Fáddá lea guorus. Sádde dattege?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Ii makkárge namma"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Fáddá lea guorus. Sádde dattege?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ii makkár fáddá"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Sádde &reivdadankeahttá"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "Čá&le fáttá"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Doalat formáhta, &ale vuolláičále dahje kryptere"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Doalat &formáhta, ale kryptere"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Doalat formáhta, ale &vuolláičále"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Vuolláičállin/krypteren (sihko formatterema)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Krypteren (sihko formáhterema)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Vuolláičále (sihko formáhterema)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Ii leat vejolaš siskkildasat vuolláičállit dahje krypteret HTML-reivviid.</p> "
-"<p>Háliidatgo váldit formáhterema eret?</p></qt>"
+"<qt> <p>Ii leat vejolaš siskkildasat vuolláičállit dahje krypteret HTML-"
+"reivviid.</p> <p>Háliidatgo váldit formáhterema eret?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Vuolláicále/kryptere reivve?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Ráhkat geavaheaddjikontu sáddendihte ja geahččal ođđasit."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Sáddegoađán boastta …"
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Sádde nannema"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Sádde &dál"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Ii oktage vuostáiváldi"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Ii oktage vuostáiváldi"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Čállindárkkisteapmi: alde"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Čállindárkkisteapmi: eret"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Čállindárkkisteapmi gaskkalduvvon."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Čállindárkisteapmi bissehuvvon."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Čállindárkkisteapmi geargan."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Čállindárkkisteapmi"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Ii gávdnan Chiasmus-čoavdagiid"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Vállje krypterenčoavdaga Chiasmusii"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "%1 lea vuolláičállán reivve."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "%1 lea vuolláičállán reivve."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP-reive – krypterejuvvon"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Reivvet dáinna fáttáin: "
@@ -6345,11 +6250,11 @@ msgstr "Čállindárkkisteapmi – KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Ii lean vejolaš álggahit ISpell/ASpell. Dárkkis ahte ISpell dahje ASpell leat "
-"rievttesláhkái heivehuvvon ja ohcanbálgás (PATH)."
+"Ii lean vejolaš álggahit ISpell/ASpell. Dárkkis ahte ISpell dahje ASpell "
+"leat rievttesláhkái heivehuvvon ja ohcanbálgás (PATH)."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6382,12 +6287,10 @@ msgstr "<qt>Menddo máŋga sillendoaimma dán njuolggadusas: <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Amas sillendoaibma <b>%1</b>"
-"<br>dán sillennjuolggadusas: <b>%2</b>."
+"<qt>Amas sillendoaibma <b>%1</b><br>dán sillennjuolggadusas: <b>%2</b>."
 "<br>Badjelgeahččá dan.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -6605,162 +6508,128 @@ msgstr "Čuojat jiena"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Dá lea definerejuvvon silliid listu. Sillit čáđahuvvojit badjin \n"
-"vulos.</p>"
-"<p>Silli maid háliidat rievdadit válljet kontrollain mat \n"
+"<qt><p>Dá lea definerejuvvon silliid listu. Sillit čáđahuvvojit badjin \n"
+"vulos.</p><p>Silli maid háliidat rievdadit válljet kontrollain mat \n"
 "leat dialoga olgeš beale.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vállje dán boalu go áiggot ráhkadit ođđa silli.</p>"
-"<p>Ođđa silli biddjo listui dan silli bajábeallái mii dál lea válljejuvvon, "
-"muhto don sáhtat sirdit dan maŋŋá.</p>"
-"<p>Jos vahágis lea deattestan dán bollui, de sáhtat gáhtat go coahkkalat <em>"
-"Sihko</em> boalu .</p></qt>"
+"<qt><p>Vállje dán boalu go áiggot ráhkadit ođđa silli.</p><p>Ođđa silli "
+"biddjo listui dan silli bajábeallái mii dál lea válljejuvvon, muhto don "
+"sáhtat sirdit dan maŋŋá.</p><p>Jos vahágis lea deattestan dán bollui, de "
+"sáhtat gáhtat go coahkkalat <em>Sihko</em> boalu .</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vállje dán boalu go áiggot máŋget silli.</p>"
-"<p>Jos vahágis lea deattestan dán bollui, de sáhtat gáhtat go coahkkalat <em>"
-"Sihko</em> boalu (olgeš bealde).</p></qt>"
+"<qt><p>Vállje dán boalu go áiggot máŋget silli.</p><p>Jos vahágis lea "
+"deattestan dán bollui, de sáhtat gáhtat go coahkkalat <em>Sihko</em> boalu "
+"(olgeš bealde).</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Vállje dán boalu jos áiggot <em>sihkkut</em> válljejuvvon silli bajábeal "
-"listtus.</p> "
-"<p>Silli ii sáhte moktege oažžut ruovttoluotta go gearddi lea sihkkojuvvon, "
-"muhto don sáhtat beassat eret lásežis <em>Orustahte</em>"
-"-boaluin, ja nu gáhtat rievdadusaid.</p></qt>"
+"<qt> <p>Vállje dán boalu jos áiggot <em>sihkkut</em> válljejuvvon silli "
+"bajábeal listtus.</p> <p>Silli ii sáhte moktege oažžut ruovttoluotta go "
+"gearddi lea sihkkojuvvon, muhto don sáhtat beassat eret lásežis "
+"<em>Orustahte</em>-boaluin, ja nu gáhtat rievdadusaid.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki <em>"
-"bajás</em> listtus.</p> "
-"<p>Dat lea ávkkálaš daningo reivvet mannet silliid čáda listtu ortnegis: "
-"Bajimus silli geahččaluvvo vuosttamužžan.</p> "
-"<p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go válljet <em>"
-"vulos</em> boalu.</p></qt>"
+"<qt><p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki "
+"<em>bajás</em> listtus.</p> <p>Dat lea ávkkálaš daningo reivvet mannet "
+"silliid čáda listtu ortnegis: Bajimus silli geahččaluvvo vuosttamužžan.</p> "
+"<p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go válljet "
+"<em>vulos</em> boalu.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki <em>"
-"bajás</em> listtus.</p> "
-"<p>Dat lea ávkkálaš daningo reivvet mannet silliid čáda listtu ortnegis: "
-"Bajimus silli geahččaluvvo vuosttamužžan.</p> "
-"<p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go válljet <em>"
-"vulos</em> boalu.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki "
+"<em>bajás</em> listtus.</p> <p>Dat lea ávkkálaš daningo reivvet mannet "
+"silliid čáda listtu ortnegis: Bajimus silli geahččaluvvo vuosttamužžan.</p> "
+"<p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go válljet "
+"<em>vulos</em> boalu.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki <em>"
-"vulos</em> bajábeal listtus.</p>"
-"<p>Dat lea ávkkálaš daningo reivet mannet silliid čađa listtu ortnegis: Bajimus "
-"silli geahččaluvvo vuosttamužžan.</p>"
-"<p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go válljet <em>"
-"bajás</em> boalu.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki "
+"<em>vulos</em> bajábeal listtus.</p><p>Dat lea ávkkálaš daningo reivet "
+"mannet silliid čađa listtu ortnegis: Bajimus silli geahččaluvvo "
+"vuosttamužžan.</p><p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go "
+"válljet <em>bajás</em> boalu.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki <em>"
-"vulos</em> bajábeal listtus.</p>"
-"<p>Dat lea ávkkálaš daningo reivet mannet silliid čađa listtu ortnegis: Bajimus "
-"silli geahččaluvvo vuosttamužžan.</p>"
-"<p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go válljet <em>"
-"bajás</em> boalu.</p></qt>"
+"<qt><p>Vállje dán boalu jos áiggot sirdit válljejuvvon silli ovtta ceahki "
+"<em>vulos</em> bajábeal listtus.</p><p>Dat lea ávkkálaš daningo reivet "
+"mannet silliid čađa listtu ortnegis: Bajimus silli geahččaluvvo "
+"vuosttamužžan.</p><p>Jos vahágis leat válljen dán boalu, de sáhtat gáhtat go "
+"válljet <em>bajás</em> boalu.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vállje dán boalu jos áiggot bidjat ođđa nama válljejuvvon sillái.\n"
-"</p>"
-"<p>Sillit ožžot nama automáhtalaččat, go beare álget ná: «<<».</p>"
-"<p>\n"
+"<qt><p>Vállje dán boalu jos áiggot bidjat ođđa nama válljejuvvon sillái.\n"
+"</p><p>Sillit ožžot nama automáhtalaččat, go beare álget ná: «<<».</p><p>\n"
 "Jos vahágis leat bidjan ođđa nama sillái ja háliidat ahte namma fas galgá \n"
 "biddjojuvvot automáhtalaččat, de vállje dán boalu ja vállje \n"
 "<em>Sálke</em> ja dasto <em>OK</em> lásežis mii ihtá.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6772,6 +6641,16 @@ msgstr "POP3-sillennjuolggadusat"
 msgid "Filter Rules"
 msgstr "Sillennjuolggadusat"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Sisafievrrit"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Sisafievrrit"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filterčoakkáldat"
@@ -6852,6 +6731,11 @@ msgstr "Lasit dán silli vel reaidoholgii"
 msgid "Icon for this filter:"
 msgstr "Dán silli govaš:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Vuostáiváldi"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Bajás"
@@ -6860,16 +6744,29 @@ msgstr "Bajás"
 msgid "Down"
 msgstr "Vulos"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Bija ođđa nama …"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Ođđa"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Máŋge dása"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Sihkkojuvvon"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6878,8 +6775,8 @@ msgstr "Vállje máhpa njuolggobálggis"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6953,19 +6850,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -7005,8 +6899,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7041,8 +6935,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr "Máhppa dás gitta gitta ja?"
 
 #: kmfoldercachedimap.cpp:777
@@ -7170,14 +7064,11 @@ msgstr "Ráhkadeamen vuollemáhpaid bálvvás"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Orroleamen dego máhppa <b>%1</b> sihkojuvvui. Háliidatgo sihkkut dan bálvvás "
-"maid?</p></qt>"
+"<qt> <p>Orroleamen dego máhppa <b>%1</b> sihkojuvvui. Háliidatgo sihkkut dan "
+"bálvvás maid?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7198,13 +7089,11 @@ msgstr "Viežžamin máhppalisttu"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Orroleamen dego máhppa <b>%1</b> sihkojuvvui. Háliidatgo sihkkut dan bálvvás "
-"maid?</p></qt>"
+"<qt> <p>Orroleamen dego máhppa <b>%1</b> sihkojuvvui. Háliidatgo sihkkut dan "
+"bálvvás maid?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7212,14 +7101,14 @@ msgstr "Gaskkalduvvon"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7232,11 +7121,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7245,15 +7134,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Sirdde dása:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "&Ale sirdde"
 
@@ -7265,8 +7159,7 @@ msgstr "Sirdde reivve máhppii"
 msgid "Permissions (ACL)"
 msgstr "Vuoigatvuođat (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Oppalaš"
@@ -7290,8 +7183,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Geava&t iežat fonttaid"
@@ -7311,14 +7203,13 @@ msgstr "Badjelgeahča ođđa e-boastta dán máhpas"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7332,9 +7223,9 @@ msgstr "Vurke vástadusaid dán máhppii"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7346,17 +7237,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Linnját &máhcojuvvojit dán čuolddas:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Geavat standárdan"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Vuolggaheaddji"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Vuostáiváldi"
@@ -7367,11 +7262,11 @@ msgstr "&Sáddenidentitehta:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7390,12 +7285,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7427,17 +7322,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7507,7 +7402,8 @@ msgstr "Filtii vieččadettiin máhppadieđuid."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7530,8 +7426,8 @@ msgstr "Filtii rabadettiin %1; dát máhppa váilu."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Filtii rabadettiin %1. Máhppa sáhttá leat gustomeahttun maildir-máhppa dahje "
 "beassanvuoigatvuođat leat boastut."
@@ -7551,8 +7447,8 @@ msgstr ""
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: heaittihuvvomin eahpelunddolaččat vai dáhtat eai mana "
-"duššái."
+"KMFolderMaildir::addMsg: heaittihuvvomin eahpelunddolaččat vai dáhtat eai "
+"mana duššái."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -7576,13 +7472,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7642,7 +7536,7 @@ msgstr ""
 "«%1» ii oroleaman máhppa.\n"
 "Váldde eret fiilla, dat lea ovddas."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7650,7 +7544,7 @@ msgstr ""
 "Leat boasto vuoigatvuođat «%1» máhpas.\n"
 "Dárkkis ahte sáhttát lohkat ja rievdadit máhpa sisdoalu."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7660,8 +7554,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7669,7 +7563,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Filtii máhpa ráhkadettiin"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7769,9 +7663,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7909,10 +7803,10 @@ msgstr "%1 máhppii ii mana čállit."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7965,123 +7859,122 @@ msgstr ""
 "Filtii rievdadettiin %1\n"
 "(Sadji nogai?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Dus ii leat lohkan-/cállinvuoigatvuohta du sisaboksamáhppii."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "olggosboksa"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Dus ii leat lohkan-/čállinvuoigatvuohta du olggosboksamáhppii."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "sáddejuvvon e-boasta"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Dus ii leat lohkanvuoigatvuohta du sáddejuvvon e-boasta máhppii."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "ruskalihtti"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Dus ii leat lohkan-/čállinvuoigatvuohta ruskalihttemáhppii."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "álgodivodusat"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Dus ii leat lohkan-/čállinvuoigatvuohta álgodivodusat máhppii."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Dus ii leat lohkan-/čállinvuoigatvuohta mállemáhppii."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Ovddit ohcan"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8089,11 +7982,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Gurre ruskalihti"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Áiggotgo duođaid gurret buot kontuid ruskalihtiid?"
 
@@ -8169,8 +8062,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b> Ođđa e-boasta bođii</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8209,10 +8101,11 @@ msgstr "Áiggot go duođaid gurret ruskalihti?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Áiggot go duođaid sirdit buot reivviid «<b>%1</b>»-máhpas ruskalihttái?</qt>"
+"<qt>Áiggot go duođaid sirdit buot reivviid «<b>%1</b>»-máhpas ruskalihttái?</"
+"qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8237,8 +8130,8 @@ msgstr "Sihko ohcama"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt>Áiggotgo duođaid bálkestit máhpa «<b>%1</b>» ja dan vuollámáhpaid, ja de "
 "bálkestit daid sisdoalu?</qt>"
@@ -8255,20 +8148,18 @@ msgstr ""
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr "Áiggot go duođaid gurret máhpa «%1», ja de bálkestit dan sisdoalu?"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Áiggotgo duođaid bálkestit máhpa «<b>%1</b>», ja de bálkestit dan "
 "sisdoalu?</qt>"
@@ -8276,14 +8167,19 @@ msgstr ""
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Áiggotgo duođaid bálkestit máhpa «<b>%1</b>» ja dan vuollámáhpaid, ja de "
 "bálkestit daid sisdoalu?</qt>"
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Sihkkojuvvon"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8296,9 +8192,9 @@ msgstr "Háliidat go duođaid sihkkut buot boarásmuvvan reivviid?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8312,8 +8208,8 @@ msgstr "Geavat HTML:a"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8330,8 +8226,8 @@ msgstr "E-boastalisttu %1 sillen …"
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8349,7 +8245,8 @@ msgstr "Ii sáhttán álggahit duoštangieđahalli. Dárkkis sajáiduhttima."
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "Ii sáhttán álggahit duoštangieđahalli. Dárkkis sajáiduhttima."
 
 #: kmmainwidget.cpp:2508
@@ -8679,8 +8576,7 @@ msgstr "Vurke &mildosiid nugo …"
 msgid "Appl&y All Filters"
 msgstr "Bija visot silliid &atnui"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Bija atnui &silli"
@@ -8793,7 +8689,6 @@ msgstr "Mana &boahtte logakeahtes reivii"
 msgid "Go to the next unread message"
 msgstr "Mana boahtte logakeahtes reivii"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Ovddit reivii"
@@ -8932,25 +8827,25 @@ msgstr " Vuolgimin johtui …"
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8958,8 +8853,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8967,8 +8862,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8997,17 +8892,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Guite: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Mielddus: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Čájet mildosiid nugo sáddejeaddji evttoha."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9057,29 +8952,26 @@ msgstr "Reiveoasi iešvuogit"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9088,11 +8980,10 @@ msgstr "&Válddahus:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9101,14 +8992,13 @@ msgstr "&Koden:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9117,13 +9007,11 @@ msgstr "Evttot &automáhtalaš čájeheami"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9133,14 +9021,12 @@ msgstr "&Vuolláičále dán oasi"
 #: kmmsgpartdlg.cpp:171
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Merke dán bovssa jos háliidat krypteret reivve.</p> "
-"<p>Dát oassi krypterejuvvo "
+"<qt> <p>Merke dán bovssa jos háliidat krypteret reivve.</p> <p>Dát oassi "
+"krypterejuvvo "
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9149,13 +9035,11 @@ msgstr "&Kryptere dán oasi"
 #: kmmsgpartdlg.cpp:181
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Merke dán bovssa jos háliidat krypteret reivve.</p> "
-"<p>Dát oassi krypterejuvvo "
+"<qt> <p>Merke dán bovssa jos háliidat krypteret reivve.</p> <p>Dát oassi "
+"krypterejuvvo "
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9169,11 +9053,9 @@ msgstr "POP-silli"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9425,35 +9307,34 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9462,13 +9343,13 @@ msgid ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
 "Bure<h2 style='margin-top: 0px;'>s boahttin KMail:ii, veršuvdna %1</h2> "
-"<p>KMail lea K Dekstop Environment:a  e-boastaprográmma. Lea ráhkaduvvon leat "
-"aibbas heivvolaš interneahta e-boasta standárdaiguin, nugo MIME, SMTP, POP3 ja "
-"IMAP.</p>\n"
-"<ul>KMail:as leat máŋga buori doaimmat man logat eanet <a href=\"%2\">"
-"dokumentašuvnna</a></li>\n"
-"<li><a href=\"%3\">KMail:a ruovttosiiddus</A> gávnnat eanet dieđuid ođđa KMail "
-"veršuvnnaid birra.</li></ul>\n"
+"<p>KMail lea K Dekstop Environment:a  e-boastaprográmma. Lea ráhkaduvvon "
+"leat aibbas heivvolaš interneahta e-boasta standárdaiguin, nugo MIME, SMTP, "
+"POP3 ja IMAP.</p>\n"
+"<ul>KMail:as leat máŋga buori doaimmat man logat eanet <a href="
+"\"%2\">dokumentašuvnna</a></li>\n"
+"<li><a href=\"%3\">KMail:a ruovttosiiddus</A> gávnnat eanet dieđuid ođđa "
+"KMail veršuvnnaid birra.</li></ul>\n"
 "%8\n"
 "<p>Muhton ođđa doaimmat dán KMail-veršuvnnas (KMail %4 ektui, mii lea oassin "
 "TDE %5:s) lea earret eará:</p>\n"
@@ -9480,15 +9361,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail-joavku</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9528,13 +9407,14 @@ msgstr "Čájet mildosa: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Mielddus sisttisdoallá bineara dáhtaid. Geahččala čájehit vuosttáš "
 "merkka.]\n"
-"[KMail: Mielddus sisttisdoallá bineara dáhtaid. Geahččala čájehit vuosttáš %n "
-"merkkaid.]"
+"[KMail: Mielddus sisttisdoallá bineara dáhtaid. Geahččala čájehit vuosttáš "
+"%n merkkaid.]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -9558,12 +9438,14 @@ msgstr "Galgágo rahpat mildosa?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9585,6 +9467,58 @@ msgstr "(heive okta &dahje eanet čuovvuvaččain)"
 msgid "(match all of the following)"
 msgstr "(heive &buot čuovvuvaččain)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lohkon"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Boares"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Sihkkojuvvon"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Vástiduvvon"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Viidáseabbut sáddejuvvon"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Gárgaduvvon"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Sáddejuvvon e-boasta"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Gozihuvvon"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Badjelgeahččon"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Ruskaboasta"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ii ruskaboasta"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Vuostáiváldi: "
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Lea mielddus"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9670,20 +9604,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Ii sáhttán sirdit reivve «%1» «olggosbovssas» «sáddejuvvon e-boasta» máhppii.\n"
+"Ii sáhttán sirdit reivve «%1» «olggosbovssas» «sáddejuvvon e-boasta» "
+"máhppii.\n"
 "Vejolaš sivat leat unnán sadji garraskearrus dahje váilevaš "
 "čállinvuoigatvuođat. Geahččal čoavdit váttisvuođa ja sirdde reivve ieš."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9709,8 +9644,8 @@ msgstr "Vuolggaheamen sáddenproseassa …"
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9735,8 +9670,9 @@ msgstr "Ii meinnestuvvan sáddet (muhtin) gárgaduvvon reivviid."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9752,19 +9688,15 @@ msgstr "Sádden gaskkalduvvoi."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>Meattáhus sáddedettiin:</p>"
-"<p>%1</p> "
-"<p>Reive bissu «olggosbovssas» dassái go čoavddát váttisvuođaid (omd. gustuhis "
-"čujuhus) dahje válddát reive eret «olggosbovssas».</p>"
-"<p>%2 fievrridanprotokolla geavahuvvui.</p> "
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>Meattáhus sáddedettiin:</p><p>%1</p> <p>Reive bissu «olggosbovssas» "
+"dassái go čoavddát váttisvuođaid (omd. gustuhis čujuhus) dahje válddát reive "
+"eret «olggosbovssas».</p><p>%2 fievrridanprotokolla geavahuvvui.</p> "
 "<p>Háliidatgo geahččalit daid earáid reivviid sáddet?</p>"
 
 #: kmsender.cpp:730
@@ -9783,8 +9715,9 @@ msgstr "Gaskkalduhte &sáddema"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9809,7 +9742,8 @@ msgid ""
 msgstr ""
 "Sádden filtii:%1\n"
 "Reive bissu «olggosbovssas» ja sáddejuvvu ođđasit.\n"
-"Váldde dan eret «olggosbovssas» jus it hálit ahte galgá ođđasit sáddejuvvot.\n"
+"Váldde dan eret «olggosbovssas» jus it hálit ahte galgá ođđasit "
+"sáddejuvvot.\n"
 "%2 fievrridanprotokolla geavahuvvui."
 
 #: kmsender.cpp:980
@@ -9828,30 +9762,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9863,6 +9797,10 @@ msgstr "%1 álggahuvvo"
 msgid "Exit"
 msgstr "Heaittit"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Ođđa reivvet dáppe"
@@ -9887,8 +9825,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9965,11 +9904,11 @@ msgstr "Bálvá &gáibida autentiseren"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Merke dán jus SMTP-bálvá gáibida beassansáni ovdalgo sáhtát sáddet e-boastta. "
-"Dán gohččoduvvu «Autentiserejuvvon SMTP» dahje «ASMTP»."
+"Merke dán jus SMTP-bálvá gáibida beassansáni ovdalgo sáhtát sáddet e-"
+"boastta. Dán gohččoduvvu «Autentiserejuvvon SMTP» dahje «ASMTP»."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -9989,15 +9928,14 @@ msgstr "Sá&dde heivehuvvon guossoheaddjinama bálvái"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Merke dán vai sáhttit válljet makkár guossoheaddjenamma KMail galgá geavahit go "
-"váldá oktavuođa bálvváin. "
-"<p>Dát lea ávkkálaš jus vuogádaga bálvánamma ii leat rievttesláhkái heivehuvvon "
-"dahje jus leat vajálduhttán duohtta guossoheaddjenamma."
+"Merke dán vai sáhttit válljet makkár guossoheaddjenamma KMail galgá geavahit "
+"go váldá oktavuođa bálvváin. <p>Dát lea ávkkálaš jus vuogádaga bálvánamma ii "
+"leat rievttesláhkái heivehuvvon dahje jus leat vajálduhttán duohtta "
+"guossoheaddjenamma."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10028,8 +9966,8 @@ msgstr "Dušše báikkalaš fiillat."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Domenanamma dahje numeralaš čujuhus SMTP-bálvvái."
 
 #: kmtransport.cpp:788
@@ -10042,10 +9980,10 @@ msgstr "Meattáhus ráhkadeamen listtu %1 máhpas: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10267,22 +10205,18 @@ msgstr "&Doaimmat dieđáhusa"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10295,8 +10229,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10311,14 +10245,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10410,13 +10344,14 @@ msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"Luohttehahti ja gustojeaddji krypterenčoavdagat gávdnui buot vuostáiváldiide.\n"
+"Luohttehahti ja gustojeaddji krypterenčoavdagat gávdnui buot "
+"vuostáiváldiide.\n"
 "Kryptere dán čoavdaga?"
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10448,8 +10383,9 @@ msgstr "&Ale kryptere"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10459,8 +10395,8 @@ msgstr "Sádde krypterenkeahttá?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10480,73 +10416,70 @@ msgstr "&Kryptere buot osiid"
 msgid "Unencrypted Message Warning"
 msgstr "Váruhus krypterenkeahtes reivves"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Eai buot bustávat gávdno válljejuvvon mearkarádjosis."
-"<br>"
-"<br>Háliidatgo liikká sáddet reivve?</qt>"
+"<qt>Eai buot bustávat gávdno válljejuvvon mearkarádjosis.<br><br>Háliidatgo "
+"liikká sáddet reivve?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Muhton mearkkat mannet duššai"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Láhppon mearkkat"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Rievdat kodema"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10568,10 +10501,10 @@ msgstr "&Boastaboksaformáhtta:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10581,8 +10514,8 @@ msgstr "&Máhppasisdoallu:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10621,8 +10554,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr "Krypterenmohtor ii addán čabu teavstta ruovttoluotta."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stáhtus: "
 
@@ -10651,11 +10583,11 @@ msgstr "%1 lassemoduvla ii gávdnon."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Reive lea vuolláčállon, muhto ii sáhte geahččalit jos vuolláičála gusto.<br />"
-"Sivva lea: %1"
+"Reive lea vuolláčállon, muhto ii sáhte geahččalit jos vuolláičála gusto.<br /"
+">Sivva lea: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -10692,24 +10624,24 @@ msgstr "Krypterenlassemoduvla «%1» ii sáhte dekrypteret reivviid."
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Fuomáš:</b>Dát lea HTML-reive. Sihkkarvuođa dihte HTML-koda čájehuvvo čabu "
-"teakstan. Jos luohtát sáddejeaddjái sáhtát oaidnit formatterejuvvon "
+"<b>Fuomáš:</b>Dát lea HTML-reive. Sihkkarvuođa dihte HTML-koda čájehuvvo "
+"čabu teakstan. Jos luohtát sáddejeaddjái sáhtát oaidnit formatterejuvvon "
 "HTML-čájeheami jos coahkkalat <a href=\"kmail:showHTML\">dása</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Fuomáš:</b>Dát lea HTML-reive. Sihkkarvuođa dihte HTML-koda čájehuvvo čabu "
-"teakstan. Jos luohtát sáddejeaddjái sáhtát oaidnit formatterejuvvon "
+"<b>Fuomáš:</b>Dát lea HTML-reive. Sihkkarvuođa dihte HTML-koda čájehuvvo "
+"čabu teakstan. Jos luohtát sáddejeaddjái sáhtát oaidnit formatterejuvvon "
 "HTML-čájeheami jos coahkkalat <a href=\"kmail:showHTML\">dása</a>."
 
 #: objecttreeparser.cpp:1227
@@ -10956,8 +10888,8 @@ msgstr "vurkejuvvon: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -11073,10 +11005,11 @@ msgstr "Kiosláva meattáhus dieđáhus"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11093,7 +11026,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -11110,1659 +11044,12 @@ msgstr "Gustuhis vástádus bálvvás"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Mana"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Máhppa"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Reive"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Sádde viidáset:"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-neavvoholga"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Vuolláičállimin"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automáhtalaččat &vuolláičále reivviid"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Jos merket dán molssaeavttu, de buot reivvet automáhtalaččat vuolláičállojit. "
-"Dieđusge lea vejolaš válljet jos gálggat vuolláičállit juohke reivve vai ii."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Krypteren"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Čájet vuolláicállon/krypterejuvvon teavstta go leat geargan"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Vurke sáddejuvvon reivviid &kryperejuvvon"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Kryptere reivviid automáhtalaččat &go lea vejolaš."
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, fuzzy, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"<qt>"
-"<p>Go dát molssaeaktu lea válljejuvvon, de juohke reivve maid sáddet "
-"krypterejuvvo jos lea vejolaš ja jos dan háliidat. Sáhtát dieđusge ieš válljet "
-"guđe reivviid krypteret.</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Vuostáiváldi: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Máŋggus: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Universála"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Vástit"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Vástit buohkaide"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Sádde viidáseabbut"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Máhpa iešvuođat"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Máhppa sisttisdoalla e-boastalisttu"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Listtu e-&boastačujuhus:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Dábálaš:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Logakeahtes:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Reiveboarásmahttin"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "&Boarásmahte maŋŋá:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Boarásmahte &lohkon reivviid"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Boarásmahte &maŋŋá:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Boarásmahte &logakeahtes reivviid"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "beaivi/beaivvit"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "vahkku/vahkut"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "mánnu/mánut"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Erenoamáš"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Sáddejeaddji identi&tehta:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Vurkenformáhtta:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listočájeheamit:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Sáddes &iežat duođaštusa"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Ale goassege dárkkis CRL:a"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "Lasi&t …"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Joavkoprográmma"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Máhcat fontaheivehusaid"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "rájahis"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Vástit sáddejeaddjái"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Sádde reivve viidáseabbut"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Várre &ovdal go sádde reivviid mat eai leat vuolláičállon"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "4Várre jos vuolláičálli e-boastačujuhus &váilo duođaštusas"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Vuolláičállimii"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Kryperemii"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " beaivvit"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Vállje galle beaivvi dáppe"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Málle sisdoallu"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Muittuhus ođđa e-boasta boađedettiin"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Mearrit čállin&prográmma:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "G&eavat eará čállinprográmma go KMail:a iežas"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Automáhtalaš bovdehussádden"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Doalat álgovuolggalaš mearkaráiddu vástidettiin dahje viidáseabbut sáddedettiin "
-"(jos lea vejolaš)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomáhtalaččat lasit vuolláičállaga"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Muitte dán identitehta, vai geavahuvvo ođđasit «Ođđa reivve»-láses.\n"
-"          "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Muitte dán identitehta, vai geavahuvvo ođđasit «Ođđa reivve»-láses.\n"
-"          "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Linnját &máhcojuvvojit dán čuolddas:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Várre jos vuolláičálli e-boastačujuhus &váilo duođaštusas"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Vállje dán molssaeavttu vai Outlook™ ipmirda mielddusnamaid main leat mearkkat "
-"mat eai leat eŋgelasgielas"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Autovurkengaskkadat:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Buhtte oahpis &prefivssaid «Va:»:ain"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Buhtte oahpes prefivssaid «&SV:»:ain"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Geavat jierbmás bájuhusa"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Vuolláičála lea boarásmuvvan."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Doalat álgovuolggalaš mearkaráiddu vástidettiin dahje viidáseabbut sáddedettiin "
-"(jos lea vejolaš)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Vurke sáddejuvvon reivviid &kryperejuvvon"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Čájet &ruskaboastastáhtusa fárddalaš reivebajilčállagiin"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Reivemálle ođđa reivve várás"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12873,6 +11160,11 @@ msgstr "Lasit Máŋgosin"
 msgid "Add as BCC"
 msgstr "Lasit Čiegus máŋgosin"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Orustahte barggu"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12888,10 +11180,10 @@ msgstr "Válljejuvvon vuostáiváldit"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12908,8 +11200,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13012,10 +11304,19 @@ msgstr "lea seamma stuoris dahje stuorát go"
 msgid " bytes"
 msgstr " stávvala"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " beaivvit"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13156,13 +11457,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13178,8 +11477,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13197,8 +11495,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13206,10 +11503,8 @@ msgid "(No special capabilities available)"
 msgstr ""
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Olamuttus Sieve-skriptaid:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Olamuttus Sieve-skriptaid:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -13277,8 +11572,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13295,17 +11590,22 @@ msgstr "Rahpá meroštuvvon fiilla čállinprográmmas."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "A&tte gohččuma:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Bálggis"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Ođđa mearkkuš:"
@@ -13343,6 +11643,11 @@ msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 "<qt>Háliidat go duođaid váldit identitehta nammaduvvon <b>«%1»</b> eret?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Bija atnui &dása:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13357,6 +11662,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Doaimmat skripta …"
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13396,9 +11705,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13435,6 +11744,16 @@ msgstr ""
 "Ii sáhte rahpat «%1» fiilla:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Vuostáiváldi: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Máŋggus: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13467,36 +11786,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13729,6 +12044,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13765,81 +12084,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>… ahte sáhtát sillet sáddejeaddji, vuostáiválddi, fáttá ja e-boastalisttu "
-"doaimmain <em>Reaiddut-&gtRáhkat&nbsp;silli</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>… ahte sáhtát sillet HTML-reivviid njuolggadusain\n"
-"<pre>«Content-type» sisttisdoallá «text/html»?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Ii maidege maid gáhtat."
@@ -13906,6 +12150,15 @@ msgstr "Mielddus nr. %1 (namakeahttá)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Fiila nammaduvvon «%1» gávdno juo. Háliidatgo buhttet dan?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Buhttet?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14005,9 +12258,9 @@ msgstr "&Sádde gova juohke reivves"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14036,9 +12289,9 @@ msgstr "Vállje fiilla …"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14047,15 +12300,15 @@ msgstr "Lasit čujuhusgirjjis"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14064,8 +12317,8 @@ msgstr "Čális sáhtedohko X-Face-streaŋgga dán gieddái."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14081,128 +12334,1530 @@ msgstr "Ii leat govva"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Vuolláičállimin"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automáhtalaččat &vuolláičále reivviid"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Jos merket dán molssaeavttu, de buot reivvet automáhtalaččat "
+"vuolláičállojit. Dieđusge lea vejolaš válljet jos gálggat vuolláičállit "
+"juohke reivve vai ii."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Krypteren"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Mearrit reivve fáttá"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Sáddes mángosa «čujuhussii»"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Čájet vuolláicállon/krypterejuvvon teavstta go leat geargan"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Sáddes čiegus máŋgosa «čujuhussii»"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Lasit «bajilčállaga» reivii"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Vurke sáddejuvvon reivviid &kryperejuvvon"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Viečča reivesisdoalu «fiillas»"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Vállje reivve sisdoalu."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Lasit mildusa reivii. Dát leat geardduhahtti."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Iskka dušše leago ođđa e-boasta"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Raba dušše čállinprográmma"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Kryptere reivviid automáhtalaččat &go lea vejolaš."
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Čájet meroštuvvon reivefiilla"
+#: composercryptoconfiguration.ui:117
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"<qt><p>Go dát molssaeaktu lea válljejuvvon, de juohke reivve maid sáddet "
+"krypterejuvvo jos lea vejolaš ja jos dan háliidat. Sáhtát dieđusge ieš "
+"válljet guđe reivviid krypteret.</p></qt>"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lohkon"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Boares"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Universála"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Sihkkojuvvon"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Vástit"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Vástiduvvon"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Vástit buohkaide"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Viidáseabbut sáddejuvvon"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Sádde viidáseabbut"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Gárgaduvvon"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Sáddejuvvon e-boasta"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Gozihuvvon"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Málle sisdoallu"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Badjelgeahččon"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Ruskaboasta"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ii ruskaboasta"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Máhpa iešvuođat"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Vuostáiváldi: "
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Máhppa sisttisdoalla e-boastalisttu"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Lea mielddus"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Listtu e-&boastačujuhus:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Dábálaš:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Logakeahtes:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Reiveboarásmahttin"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "&Boarásmahte maŋŋá:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Boarásmahte &lohkon reivviid"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Boarásmahte &maŋŋá:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Boarásmahte &logakeahtes reivviid"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "beaivi/beaivvit"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "vahkku/vahkut"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "mánnu/mánut"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Erenoamáš"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Sáddejeaddji identi&tehta:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Vurkenformáhtta:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listočájeheamit:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Bálggis"
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:72
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Fiila nammaduvvon «%1» gávdno juo. Háliidatgo buhttet dan?"
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Buhttet?"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Muittuhus ođđa e-boasta boađedettiin"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Mearrit čállin&prográmma:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "G&eavat eará čállinprográmma go KMail:a iežas"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Automáhtalaš bovdehussádden"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Doalat álgovuolggalaš mearkaráiddu vástidettiin dahje viidáseabbut "
+"sáddedettiin (jos lea vejolaš)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomáhtalaččat lasit vuolláičállaga"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Muitte dán identitehta, vai geavahuvvo ođđasit «Ođđa reivve»-láses.\n"
+"          "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Muitte dán identitehta, vai geavahuvvo ođđasit «Ođđa reivve»-láses.\n"
+"          "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Linnját &máhcojuvvojit dán čuolddas:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Várre jos vuolláičálli e-boastačujuhus &váilo duođaštusas"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Vállje dán molssaeavttu vai Outlook™ ipmirda mielddusnamaid main leat "
+"mearkkat mat eai leat eŋgelasgielas"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Autovurkengaskkadat:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Buhtte oahpis &prefivssaid «Va:»:ain"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Buhtte oahpes prefivssaid «&SV:»:ain"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Geavat jierbmás bájuhusa"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Vuolláičála lea boarásmuvvan."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Doalat álgovuolggalaš mearkaráiddu vástidettiin dahje viidáseabbut "
+"sáddedettiin (jos lea vejolaš)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Vurke sáddejuvvon reivviid &kryperejuvvon"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Čájet &ruskaboastastáhtusa fárddalaš reivebajilčállagiin"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Reivemálle ođđa reivve várás"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Doaimmat &fiilla"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Doaimmat …"
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Mana"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Máhppa"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Reive"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Sádde viidáset:"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Máhcat fontaheivehusaid"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-neavvoholga"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Dábálaš heivehusat"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-neavvoholga"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Sáddes &iežat duođaštusa"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr ""
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Ale goassege dárkkis CRL:a"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "Lasi&t …"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Joavkoprográmma"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Máhcat fontaheivehusaid"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "rájahis"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Vástit sáddejeaddjái"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Sádde reivve viidáseabbut"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Várre &ovdal go sádde reivviid mat eai leat vuolláičállon"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "4Várre jos vuolláičálli e-boastačujuhus &váilo duođaštusas"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Vuolláičállimii"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Kryperemii"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Vállje galle beaivvi dáppe"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>… ahte sáhtát sillet sáddejeaddji, vuostáiválddi, fáttá ja e-boastalisttu "
+"doaimmain <em>Reaiddut-&gtRáhkat&nbsp;silli</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>… ahte sáhtát sillet HTML-reivviid njuolggadusain\n"
+"<pre>«Content-type» sisttisdoallá «text/html»?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
diff --git a/tde-i18n-sk/messages/tdepim/kmail.po b/tde-i18n-sk/messages/tdepim/kmail.po
index 1d1a4b756ae..7e7879489e3 100644
--- a/tde-i18n-sk/messages/tdepim/kmail.po
+++ b/tde-i18n-sk/messages/tdepim/kmail.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-05 22:30+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Juraj Bednár,Ferro,Stanislav Višňovský,Pavol Cvengroš,Jozef Říha"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "Žia&dny (používať opatrne)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Účet pre semi-automatickú správu zdrojov"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Vyčistiť minulosť"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,13 +254,13 @@ msgstr "&Prihlásenie:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Váš poskytovateľ Internetu (ISP) vám dodal <em>používateľské meno</em> "
-"s ktorým sa prihlásite na jeho serveroch. Normálne je to časť e-mailovej adresy "
-"(časť pred <em>@</em>)."
+"Váš poskytovateľ Internetu (ISP) vám dodal <em>používateľské meno</em> s "
+"ktorým sa prihlásite na jeho serveroch. Normálne je to časť e-mailovej "
+"adresy (časť pred <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -275,12 +281,12 @@ msgstr "&Ukladať POP heslo"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Zapnutím tejto voľby bude KMail ukladať heslo.\n"
 "Ak je dostupný TDEWallet heslo sa uloží tam, čo je považované za bezpečné.\n"
@@ -314,11 +320,12 @@ msgstr "&Filtrovať správy ak sú väčšie ako"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ak povolíte túto voľbu, POP filtre budú použité pre rozhodovanie čo spraviť s "
-"správami. Potom si môžete vybrať stiahnutie, zmazanie alebo ponechanie na "
+"Ak povolíte túto voľbu, POP filtre budú použité pre rozhodovanie čo spraviť "
+"s správami. Potom si môžete vybrať stiahnutie, zmazanie alebo ponechanie na "
 "serveri."
 
 #: accountdialog.cpp:737
@@ -368,13 +375,15 @@ msgstr "Čistý te&xt"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -417,14 +426,14 @@ msgstr "Priestory mien:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Tu vidíte rôzne priestory mien, ktoré podporuje IMAP server. Každý priestor "
-"mien reprezentuje predponu, ktorá oddeľuje skupiny priečinkov. Priestory mien "
-"umožňujú napr. KMail zobraziť Vaše osobné a zdieľané priečinky pod jedným "
-"účtom."
+"mien reprezentuje predponu, ktorá oddeľuje skupiny priečinkov. Priestory "
+"mien umožňujú napr. KMail zobraziť Vaše osobné a zdieľané priečinky pod "
+"jedným účtom."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -481,9 +490,9 @@ msgstr "Načítať &prílohy na požiadanie"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Ak zapnete túto voľbu, prílohy sa načítajú iba ak na ne kliknete, nie "
 "automaticky. Tak sa budú aj veľké správy zobrazovať okamžite."
@@ -497,8 +506,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Kontrola podpriečinkov sa vykonáva iba v priečinkoch, ktoré sú rozbalené. Toto "
-"sa dá využiť, ak máte na serveri veľa priečinkov."
+"Kontrola podpriečinkov sa vykonáva iba v priečinkoch, ktoré sú rozbalené. "
+"Toto sa dá využiť, ak máte na serveri veľa priečinkov."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -526,7 +535,7 @@ msgstr "<žiadny>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "inbox"
 
@@ -534,11 +543,11 @@ msgstr "inbox"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Server asi nepodporuje jednoznačené čísla správ. To je ale nutné pre nechávanie "
-"správ na serveri.\n"
+"Server asi nepodporuje jednoznačené čísla správ. To je ale nutné pre "
+"nechávanie správ na serveri.\n"
 "Pretože niektoré servery neoznamujú správne svoje podporované funkcie, "
 "nechávanie správ serveri máte aj tak možnosť zapnúť."
 
@@ -546,8 +555,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Server asi nepodporuje stiahutie hlavičiek správ. To je ale nutné pre "
 "filtrovanie správ na serveri.\n"
@@ -556,23 +565,24 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Prosím, uvedomte si, že táto funkcia môže spôsobiť, že niektoré servery POP3, "
-"ktoré ju nepodporujú, budú posielať poškodené správy.\n"
+"Prosím, uvedomte si, že táto funkcia môže spôsobiť, že niektoré servery "
+"POP3, ktoré ju nepodporujú, budú posielať poškodené správy.\n"
 "Pretože niektoré servery reťazenie podporujú, ale neoznamujú to, je táto "
 "možnosť nastaviteľná. Pomocou tlačidla \"Otestovať, čo podporuje server\" "
 "môžete otestovať, či vás server POP3 oznamuje podporu reťazenia.\n"
-"Ak váš server podporu neoznámi, môžete kvôli zrýchleniu reťazenie zapnúť, ale "
-"najprv by ste mali vyskúšať poslať si niekoľko správ sám sebe a potom ich "
-"skúsiť stiahnuť."
+"Ak váš server podporu neoznámi, môžete kvôli zrýchleniu reťazenie zapnúť, "
+"ale najprv by ste mali vyskúšať poslať si niekoľko správ sám sebe a potom "
+"ich skúsiť stiahnuť."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -580,33 +590,33 @@ msgstr "Prosím, nastavte server a port v karte Všeobecné."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Server asi nepodporuje zreťazenie. Preto táto voľba nie je prístupná.\n"
 "Pretože niektoré servery neoznamujú správne svoje podporované funkcie, "
 "zreťazenie máte aj tak možnosť zapnúť. Ale uvedomte si, že to môže spôsobiť "
-"poškodenie správ na serveroch POP, ktoré zreťazenie naozaj nepodporujú, Takže "
-"by ste mali pred použitím tejto voľby pre dôležitú poštu urobiť test. Napríklad "
-"si pošlite viacero testovacích správ, ktoré potom stiahnete naraz z POP "
-"serveru."
+"poškodenie správ na serveroch POP, ktoré zreťazenie naozaj nepodporujú, "
+"Takže by ste mali pred použitím tejto voľby pre dôležitú poštu urobiť test. "
+"Napríklad si pošlite viacero testovacích správ, ktoré potom stiahnete naraz "
+"z POP serveru."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Server asi nepodporuje jednoznačené čísla správ. To je ale nutné pre nechávanie "
-"správ na serveri. Preto táto voľba nie je prístupná.\n"
+"Server asi nepodporuje jednoznačené čísla správ. To je ale nutné pre "
+"nechávanie správ na serveri. Preto táto voľba nie je prístupná.\n"
 "Pretože niektoré servery neoznamujú správne svoje podporované funkcie, "
 "nechávanie správ serveri máte aj tak možnosť zapnúť."
 
@@ -615,8 +625,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Server asi nepodporuje stiahutie hlavičiek správ. To je ale nutné pre "
 "filtrovanie správ na serveri. Preto táto voľba nie je prístupná.\n"
@@ -704,8 +714,8 @@ msgstr "IMAP účet"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Musíte pridať účet v sekcii \"sieť\" nastavenia, aby ste mohli dostávať poštu"
 
@@ -743,13 +753,14 @@ msgstr "Vitajte v programe KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Zdá sa, že ste spustili KMail po prvý krát. Môžete použiť tohoto sprievodcu "
-"pre nastavenie poštových účtov. Na nasledujúcich stranách stačí zadať dáta pre "
-"pripojenie, ktoré ste dostali od Vášho poskytovateľa pošty.</qt>"
+"<qt>Zdá sa, že ste spustili KMail po prvý krát. Môžete použiť tohoto "
+"sprievodcu pre nastavenie poštových účtov. Na nasledujúcich stranách stačí "
+"zadať dáta pre pripojenie, ktoré ste dostali od Vášho poskytovateľa pošty.</"
+"qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -811,8 +822,7 @@ msgstr "Použiť lokálne odoslanie"
 msgid "Server Information"
 msgstr "Informácie o serveri"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Žiadne"
@@ -950,27 +960,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Tu môžete získať pomoc pri nastavení pravidiel filtrov KMail pre obvykle "
-"používané nástroje pre kontrolu vírusov.</p>"
-"<p>Sprievodca dokáže nájsť tieto nástroje, ak sú nainštalované, a vytvoriť "
-"filtre pre označenie správ ako spam pomocou týchto nástrojov a oddeliť ich od "
-"ostatných správ. Sprievodca nebude nijak meniť ani používať už existujúce "
-"pravidlá. Vždy pridá iba nové.</p>"
-"<p><b>Upozornenie:</b>Pretože je KMail zablokovaný počas hľadania infikovaných "
-"správ, môžete sa stretnúť s horšou odozvou počas kontroly, pretože tá obvykle "
-"chvíľu trvá. Vždy môžete pravidlá, ktoré sprievodca vytvoril, odstrániť."
+"používané nástroje pre kontrolu vírusov.</p><p>Sprievodca dokáže nájsť tieto "
+"nástroje, ak sú nainštalované, a vytvoriť filtre pre označenie správ ako "
+"spam pomocou týchto nástrojov a oddeliť ich od ostatných správ. Sprievodca "
+"nebude nijak meniť ani používať už existujúce pravidlá. Vždy pridá iba nové."
+"</p><p><b>Upozornenie:</b>Pretože je KMail zablokovaný počas hľadania "
+"infikovaných správ, môžete sa stretnúť s horšou odozvou počas kontroly, "
+"pretože tá obvykle chvíľu trvá. Vždy môžete pravidlá, ktoré sprievodca "
+"vytvoril, odstrániť."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -997,8 +1006,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Štandardný priečinok pre spamové správy je priečinok koša, ale môžete ho zmeniť "
-"v prehľade priečinkov dolu."
+"Štandardný priečinok pre spamové správy je priečinok koša, ale môžete ho "
+"zmeniť v prehľade priečinkov dolu."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1006,15 +1015,14 @@ msgstr "Presunúť &pravdepodobný spam do:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Štandardný priečinok je priečinok pre novú poštu, ale môžete ho zmeniť v "
-"prehľade priečinkov dolu. "
-"<p>Nie všetky nástroje podporujú klasifikáciu pravdepodobný spam. Ak ste "
-"nezvolili taký nástroj, nemôžete ani vybrať priečinok."
+"prehľade priečinkov dolu. <p>Nie všetky nástroje podporujú klasifikáciu "
+"pravdepodobný spam. Ak ste nezvolili taký nástroj, nemôžete ani vybrať "
+"priečinok."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1024,12 +1032,12 @@ msgstr "Kontrolova ť správy pomocou nástrojov pre hľadanie vírusov"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Nechať nástroje pre kontrolu vírusov určiť infikované správy. Sprievodca "
-"vytvorí vhodné filtre. Správy sa obvykle označujú pomocou nástrojov tak, aby sa "
-"filtre mohli podľa toho chovať, napríklad presunúť infikované správy do "
+"vytvorí vhodné filtre. Správy sa obvykle označujú pomocou nástrojov tak, aby "
+"sa filtre mohli podľa toho chovať, napríklad presunúť infikované správy do "
 "špeciálneho priečinku."
 
 #: antispamwizard.cpp:1076
@@ -1039,8 +1047,8 @@ msgstr "Presunúť správy označené ako vírusy do vybraného priečinku"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Vytvorí sa filter pre určenie správ považovaných za infikované vírusom a "
 "preddefinovaný priečinok pre tieto správy. Štandardný priečinok je kôš, ale "
@@ -1052,8 +1060,8 @@ msgstr "Označiť správy s vírusmi ako prečítané"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Označí správy, ktoré sú považované za infikované vírusmi, ako prečítané a "
 "zároveň ich presunie do vybraného priečinku."
@@ -1251,8 +1259,8 @@ msgstr "Chyba pri čítaní priečinku %1 zo serveru: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1272,8 +1280,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1304,20 +1312,20 @@ msgstr "Zmazané"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Žiadna z vašich identít nezodpovedá adresátovi tejto správy,"
-"<br>prosím, vyberte, ktorá z nasledujúcich adries je Vaša, ak vôbec niektorá:"
+"<qt>Žiadna z vašich identít nezodpovedá adresátovi tejto správy,<br>prosím, "
+"vyberte, ktorá z nasledujúcich adries je Vaša, ak vôbec niektorá:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Viacero z vašich identít zodpovedá adresátovi tejto správy,"
-"<br>prosím, vyberte, ktorá z nasledujúcich adries je Vaša:"
+"<qt>Viacero z vašich identít zodpovedá adresátovi tejto správy,<br>prosím, "
+"vyberte, ktorá z nasledujúcich adries je Vaša:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1346,18 +1354,21 @@ msgstr "Chyba pri zhusťovaní \"%1\". Zhustenie prerušené."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Toto nastavenie opravil váš administrátor.</p>"
-"<p>Ak si myslíte, že je to chyba, kontaktujte ho.</p></qt>"
+"<qt><p>Toto nastavenie opravil váš administrátor.</p><p>Ak si myslíte, že je "
+"to chyba, kontaktujte ho.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Načítať profil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Nastaviť účet"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Pridať..."
@@ -1387,6 +1398,11 @@ msgstr "<qt>Naozaj chcete odstrániť identitu <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Odstrániť identitu"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Odstrániť"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Pridať..."
@@ -1395,6 +1411,11 @@ msgstr "Pridať..."
 msgid "Modify..."
 msgstr "Upraviť..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Odstrániť"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Nastaviť ako štandardné"
@@ -1411,17 +1432,15 @@ msgstr "Po&sielanie"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Účty pre posielanie (zadajte aspoň jeden účet):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Meno"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Typ"
@@ -1443,8 +1462,7 @@ msgstr "Nastaviť štandard"
 msgid "Common Options"
 msgstr "Obvyklé možnosti"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Potvrdiť pred poslaním"
@@ -1495,17 +1513,16 @@ msgstr "Š&tandardná doména:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Štandardná doména bude použitá pre dopĺňanie e-mailových adries ktoré "
+"<qt><p>Štandardná doména bude použitá pre dopĺňanie e-mailových adries ktoré "
 "pozostávaju len z mena používateľa.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1523,9 +1540,9 @@ msgstr "Pridať prenos"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Štandard)"
 
@@ -1610,6 +1627,10 @@ msgstr "Zmeniť účet"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Nepodarilo sa nájsť účet <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Farby"
@@ -1718,8 +1739,7 @@ msgstr "Navštívený odkaz"
 msgid "Misspelled Words"
 msgstr "Chybné slová"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nová správa"
@@ -1908,8 +1928,8 @@ msgstr "Vlákna štandardne zabalené"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Otvoriť vlákna, ktoré obsahujú nové, &neprečítané alebo dôležité správy a "
 "otvoriť sledované vlákna."
@@ -1920,67 +1940,53 @@ msgstr "Zobrazenie dátumu"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Tieto výrazy môžu byť použité pre dátum:</strong></p>"
-"<ul>"
-"<li>d - deň ako číslo bez počiatočnej nuly (1-31)</li>"
-"<li>dd - deň ako číslo s počiatočnou nulou (01-31)</li>"
-"<li>ddd - skrátene meno dňa (Pon - Ned)</li>"
-"<li>dddd - dlhé meno dňa (Pondelok - Nedeľa)</li>"
-"<li>M - mesiac ako číslo bez počiatočnej nuly (1-12)</li>"
-"<li>MM - mesiac ako číslo s počiatočnou nulou (01-12)</li>"
-"<li>MMM - skrátene meno mesiaca (Jan - Dec)</li>"
-"<li>MMMM - dlhé meno mesiaca (Január - December)</li>"
-"<li>yy - rok ako dvojmiestne číslo (00-99)</li>"
-"<li>yyyy - rok ako štvormiestne číslo (0000-9999)</li></ul>"
-"<p><strong>Tieto výrazy môžu byť použité pre čas:</string></p> "
-"<ul>"
-"<li>h - hodina bez počiatočnej nuly (0-23 alebo 1-12 pri zobrazení AM/PM)</li>"
-"<li>hh - hodina s počiatočnou nulou (00-23 alebo 01-12 pro zobrazení AM/PM)</li>"
-"<li>m - minúty bez počiatočnej nuly (0-59)</li>"
-"<li>mm - minúty s počiatočnou nulou (00-59)</li>"
-"<li>s - sekundy bez počiatočnej nuly (0-59)</li>"
-"<li>ss - sekundy s počiatočnou nulou (00-59)</li>"
-"<li>z - milisekundy bez počiatočnej nuly (0-999)</li>"
-"<li>zzz - milisekundy s počiatočnými nulami (000-999)</li>"
-"<li>AP - zobraziť AM/PM. AP bude nahradené buď \"AM\" alebo \"PM\".</li>"
-"<li>ap - zobraziť AM/PM. ap bude nahradené buď \"am\" alebo \"pm\".</li>"
-"<li>Z - časové pásmo v číselnej forme (-0500)</li></ul>"
-"<p><strong>Všetky ostatné vstupné znaky budú ignorované.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Tieto výrazy môžu byť použité pre dátum:</strong></"
+"p><ul><li>d - deň ako číslo bez počiatočnej nuly (1-31)</li><li>dd - deň ako "
+"číslo s počiatočnou nulou (01-31)</li><li>ddd - skrátene meno dňa (Pon - "
+"Ned)</li><li>dddd - dlhé meno dňa (Pondelok - Nedeľa)</li><li>M - mesiac ako "
+"číslo bez počiatočnej nuly (1-12)</li><li>MM - mesiac ako číslo s "
+"počiatočnou nulou (01-12)</li><li>MMM - skrátene meno mesiaca (Jan - Dec)</"
+"li><li>MMMM - dlhé meno mesiaca (Január - December)</li><li>yy - rok ako "
+"dvojmiestne číslo (00-99)</li><li>yyyy - rok ako štvormiestne číslo "
+"(0000-9999)</li></ul><p><strong>Tieto výrazy môžu byť použité pre čas:</"
+"string></p> <ul><li>h - hodina bez počiatočnej nuly (0-23 alebo 1-12 pri "
+"zobrazení AM/PM)</li><li>hh - hodina s počiatočnou nulou (00-23 alebo 01-12 "
+"pro zobrazení AM/PM)</li><li>m - minúty bez počiatočnej nuly (0-59)</"
+"li><li>mm - minúty s počiatočnou nulou (00-59)</li><li>s - sekundy bez "
+"počiatočnej nuly (0-59)</li><li>ss - sekundy s počiatočnou nulou (00-59)</"
+"li><li>z - milisekundy bez počiatočnej nuly (0-999)</li><li>zzz - "
+"milisekundy s počiatočnými nulami (000-999)</li><li>AP - zobraziť AM/PM. AP "
+"bude nahradené buď \"AM\" alebo \"PM\".</li><li>ap - zobraziť AM/PM. ap bude "
+"nahradené buď \"am\" alebo \"pm\".</li><li>Z - časové pásmo v číselnej forme "
+"(-0500)</li></ul><p><strong>Všetky ostatné vstupné znaky budú ignorované.</"
+"strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Zmena globálneho nastavenia vlákien prepíše všetky hodnoty jednotlivých "
 "priečinkov."
@@ -1997,8 +2003,7 @@ msgstr "Zo&braziť stavový pruh HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Zobraziť stav s&pamu v hlavičky správy"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Nahradiť smajlíky emotívnymi ikonami"
@@ -2007,8 +2012,7 @@ msgstr "Nahradiť smajlíky emotívnymi ikonami"
 msgid "Use smaller font for quoted text"
 msgstr "Použiť menšie písmo pre citovaný text"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Zobraziť značky pre roztvorenie a zatvorenie citátov"
@@ -2034,8 +2038,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "Prepísať kód&ovanie znakov:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Povoliť ikonu v systémovej lište"
@@ -2137,22 +2140,20 @@ msgstr "<b>%f</b> bude nahradený menom súborom pre úpravu."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>Nasledujúce substitučné skratky sú podporované vo frázach odpovede:\n"
 "<br><b>%D</b>: dátum, <b>%S</b>: predmet, \n"
 "<br><b>%e</b>: odosieľateľova adresa, <b>%F</b>: odosielateľove meno,\n"
-"<b>%f</b>: odosielateľove iniciály, "
-"<br><b>%T</b>: príjmateľove meno, <b>%t</b>: príjmateľove meno a adresa,\n"
-"<br><b>%C</b>: mená v kópii, <b>%c</b>: mená a adresy v kópii,"
-"<br><b>%%</b>: označenie percenta, <b>%_</b>: medzera, <b>%L</b>"
-": koniec riadku</qt>"
+"<b>%f</b>: odosielateľove iniciály, <br><b>%T</b>: príjmateľove meno, <b>%t</"
+"b>: príjmateľove meno a adresa,\n"
+"<br><b>%C</b>: mená v kópii, <b>%c</b>: mená a adresy v kópii,<br><b>%%</b>: "
+"označenie percenta, <b>%_</b>: medzera, <b>%L</b>: koniec riadku</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2175,21 +2176,20 @@ msgstr "Odpovedať &všetkým:"
 msgid "&Forward:"
 msgstr "P&oslať ďalej:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Znak citácie:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Dňa %D ste napísali:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Dňa %D %F napísal:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Preposlaná správa"
 
@@ -2227,8 +2227,8 @@ msgstr "Zadajte novú predponu pre preposielanie ďalej:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Tento zoznam sa kontroluje pre každú posielanú správu od hora smerom dolu a "
 "hľadá sa znaková sada, ktorá obsahuje všetky požadované znaky."
@@ -2267,10 +2267,9 @@ msgstr "Hodnota"
 msgid "Ne&w"
 msgstr "&Nová"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "Me&no:"
@@ -2279,19 +2278,18 @@ msgstr "Me&no:"
 msgid "&Value:"
 msgstr "&Hodnota:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Mená príloh kompatibilné s Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Zapnutím tejto voľby bude Outlook (tm) podporovať vaše mená príloh, ak obsahujú "
-"aj iné než anglické písmená"
+"Zapnutím tejto voľby bude Outlook (tm) podporovať vaše mená príloh, ak "
+"obsahujú aj iné než anglické písmená"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2319,20 +2317,20 @@ msgstr "priložené"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Vybrali ste kódovanie mien príloh kompatibilné s Outlook a inými poštovými "
 "klientmi, ktorí nepodporujú štandardné kódovanie mien príloh.\n"
-"Uvedomte si, že KMail preto môže tiež vytvárať správy, ktoré nebudú zodpovedať "
-"štandardom pre mená príloh a niektorí klienti, ktorí podporujú iba štandardné "
-"mená, nemusia s prílohami správne pracovať. Túto voľbu by ste mali zapnúť iba v "
-"prípade, že nemáte inú možnosť."
+"Uvedomte si, že KMail preto môže tiež vytvárať správy, ktoré nebudú "
+"zodpovedať štandardom pre mená príloh a niektorí klienti, ktorí podporujú "
+"iba štandardné mená, nemusia s prílohami správne pracovať. Túto voľbu by ste "
+"mali zapnúť iba v prípade, že nemáte inú možnosť."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2356,107 +2354,92 @@ msgstr "Šifrovacie mo&duly"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Poštové správy niekedy prichádzajú v oboch formátoch. Táto voľba ovláda, či "
-"chcete zobraziť formát HTML alebo čistý text.</p>"
-"<p>Správa ako HTML bude zobrazená krajšie, ale zároveň to zvyšuje "
-"nebezpečenstvo využitia bezpečnostných dier. </p>"
-"<p>Zobrazenie čistého textu stráca časť formátovania správy, ale využitie "
-"bezpečnostných dier v zobrazovaní HTML (Konqueror) je <em>nemožné</em>.</p>"
-"<p>Voľba dole ovláda typické zneužitie HTML pošty. Ale nemôže chrániť proti "
-"problémom s bezpečnosťou, ktoré nie sú známe v dobe vytvárania tejto verzie "
-"KMail.</p>"
-"<p>Preto je doporučované <em>nepoužívať</em> HTML a dávať prednosť čistému "
-"textu.</p>"
-"<p><b>Poznámka:</b>Túto voľbu môžete ovládať aj pre jednotlivé priečinky z menu "
-"<i>Priečinok</i>.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Poštové správy niekedy prichádzajú v oboch formátoch. Táto voľba "
+"ovláda, či chcete zobraziť formát HTML alebo čistý text.</p><p>Správa ako "
+"HTML bude zobrazená krajšie, ale zároveň to zvyšuje nebezpečenstvo využitia "
+"bezpečnostných dier. </p><p>Zobrazenie čistého textu stráca časť "
+"formátovania správy, ale využitie bezpečnostných dier v zobrazovaní HTML "
+"(Konqueror) je <em>nemožné</em>.</p><p>Voľba dole ovláda typické zneužitie "
+"HTML pošty. Ale nemôže chrániť proti problémom s bezpečnosťou, ktoré nie sú "
+"známe v dobe vytvárania tejto verzie KMail.</p><p>Preto je doporučované "
+"<em>nepoužívať</em> HTML a dávať prednosť čistému textu.</p><p><b>Poznámka:</"
+"b>Túto voľbu môžete ovládať aj pre jednotlivé priečinky z menu <i>Priečinok</"
+"i>.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Niektoré reklamy posielané poštou sú v HTML a obsahujú odkazy na obrázky, "
-"takže sa dá zistiť, že ste si reklamu prečítali (&quot;web bugs&quot;).</p>"
-"<p>Neexistuje žiadny rozumný dôvod nahrávania takýchto obrázkov zo siete, "
-"pretože odosielateľ môže vždy obrázky poslať ako prílohu.</p>"
-"<p>Aby ste sa mohli chrániť pred týmto zneužívaním HTML, táto voľba je "
-"štandardne <em>vypnutá</em>.</p>"
-"<p>Ak chcete zobrazovať obrázky v HTML, môžete ju povoliť, ale uvedomte si "
-"prípadné problémy.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Niektoré reklamy posielané poštou sú v HTML a obsahujú odkazy na "
+"obrázky, takže sa dá zistiť, že ste si reklamu prečítali (&quot;web "
+"bugs&quot;).</p><p>Neexistuje žiadny rozumný dôvod nahrávania takýchto "
+"obrázkov zo siete, pretože odosielateľ môže vždy obrázky poslať ako prílohu."
+"</p><p>Aby ste sa mohli chrániť pred týmto zneužívaním HTML, táto voľba je "
+"štandardne <em>vypnutá</em>.</p><p>Ak chcete zobrazovať obrázky v HTML, "
+"môžete ju povoliť, ale uvedomte si prípadné problémy.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Politika pre potvrdenia o </h3>"
-"<p>MDN sú zovšeobecnením funkcie <b>potvrdenie o prečítaní</b>"
-". Autor správy požaduje poslanie potvrdenia o doručení a poštový klient "
-"príjemcu vygeneruje odpoveď, z ktorej autor môže zistiť, čo sa s jeho správou "
-"stalo. Obvyklé typy potvrdení sú <b>zobrazená</b> (čiže prečítaná), <b>"
-"odstránená</b> a <b>predaná ďalej</b>.</p>"
-"<p>Na ovládanie MDN v KMail máte tieto možnosti:</p>"
-"<ul>"
-"<li><em>Ignorovať</em>: Ignoruje všetky požiadavky na potvrdenia. Žiadne MDN sa "
-"nikdy nebude automaticky posielať (doporučené).</li>"
-"<li><em>Pýtať sa</em>: Posielať potvrdenia iba po získaní súhlasu od "
-"používateľa. Takto môžete pre vybrané správy MDN posielať a pre ostatné ich "
-"ignorovať alebo odmietnuť.</li>"
-"<li><em>Odmietnuť</em>: Vždy posielať potvrdenie <b>odmietnuté</b>"
-". To je len o <em>niečo málo </em> lepšie než vždy MDN posielať. Autor aj tak "
-"zistí, že sa so správou niečo stalo, iba nevie presne čo..</li>"
-"<li><em>Vždy poslať</em>: Vždy poslať požadované potvrdenie. To znamená, že "
-"autor správy zistí, kedy sa so správou čo dialo (či bola zobrazená, odstránená "
-"atď.). Táto voľba sa silne nedoporučuje, ale pretože má zmysel napríklad pri "
-"správe komunikácie s klientami, je k dispozícii.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Politika pre potvrdenia o </h3><p>MDN sú zovšeobecnením funkcie "
+"<b>potvrdenie o prečítaní</b>. Autor správy požaduje poslanie potvrdenia o "
+"doručení a poštový klient príjemcu vygeneruje odpoveď, z ktorej autor môže "
+"zistiť, čo sa s jeho správou stalo. Obvyklé typy potvrdení sú <b>zobrazená</"
+"b> (čiže prečítaná), <b>odstránená</b> a <b>predaná ďalej</b>.</p><p>Na "
+"ovládanie MDN v KMail máte tieto možnosti:</p><ul><li><em>Ignorovať</em>: "
+"Ignoruje všetky požiadavky na potvrdenia. Žiadne MDN sa nikdy nebude "
+"automaticky posielať (doporučené).</li><li><em>Pýtať sa</em>: Posielať "
+"potvrdenia iba po získaní súhlasu od používateľa. Takto môžete pre vybrané "
+"správy MDN posielať a pre ostatné ich ignorovať alebo odmietnuť.</"
+"li><li><em>Odmietnuť</em>: Vždy posielať potvrdenie <b>odmietnuté</b>. To je "
+"len o <em>niečo málo </em> lepšie než vždy MDN posielať. Autor aj tak zistí, "
+"že sa so správou niečo stalo, iba nevie presne čo..</li><li><em>Vždy poslať</"
+"em>: Vždy poslať požadované potvrdenie. To znamená, že autor správy zistí, "
+"kedy sa so správou čo dialo (či bola zobrazená, odstránená atď.). Táto voľba "
+"sa silne nedoporučuje, ale pretože má zmysel napríklad pri správe "
+"komunikácie s klientami, je k dispozícii.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2472,15 +2455,15 @@ msgstr "Načítať e&xterné referencie správ zo siete"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>VAROVANIE:</b>Použitie HTML v pošte vás robí zraniteľnejším a zvyšuje "
 "pravdepodobnosť, že váš systém bude napadnutý z hľadiska bezpečnosti. <a "
-"href=\"whatsthis:%1\">Viac o správach HTML...</a> <a href=\"whatsthis:%2\">"
-"Viac o externých odkazoch...</a>"
+"href=\"whatsthis:%1\">Viac o správach HTML...</a> <a href=\"whatsthis:"
+"%2\">Viac o externých odkazoch...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2541,8 +2524,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>VAROVANIE:</b>Nepodmienečné posielanie potvrdení podkopáva vaše súkromie. <a "
-"href=\"whatsthis:%1\">Viac...</a>"
+"<b>VAROVANIE:</b>Nepodmienečné posielanie potvrdení podkopáva vaše súkromie. "
+"<a href=\"whatsthis:%1\">Viac...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2562,8 +2545,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Táto možnosť si vyžaduje dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "žiadne proxy"
@@ -2592,8 +2574,8 @@ msgstr "&Vynechať dôležité správy z rušenia platnosti"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Hľadanie neprečítaných správ v priečinku:"
 
@@ -2617,8 +2599,8 @@ msgstr "Opakovať vo všetkých priečinkoch"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Pri vstupe do priečinku:"
 
@@ -2687,28 +2669,24 @@ msgstr "priečinky (formát \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Toto vyberá formát poštového priečinku, ktorý bude štandardný pre lokálne "
-"priečinky:</p>"
-"<p><b>mbox:</b> poštové priečinky KMail sú reprezentované každý ako jeden "
-"súbor. Jednotlivé správy sú oddelené riadkom, ktorý začína \"From \". Tým sa "
-"šetrí miesto na disku, ale môže to byť menej robustný systém, napríklad pri "
-"presune správ medzi priečinkami.</p>"
-"<p><b>maildir:</b> Poštové priečinky KMail sú reprezentované ako skutočné "
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Toto vyberá formát poštového priečinku, ktorý bude štandardný pre "
+"lokálne priečinky:</p><p><b>mbox:</b> poštové priečinky KMail sú "
+"reprezentované každý ako jeden súbor. Jednotlivé správy sú oddelené riadkom, "
+"ktorý začína \"From \". Tým sa šetrí miesto na disku, ale môže to byť menej "
+"robustný systém, napríklad pri presune správ medzi priečinkami.</"
+"p><p><b>maildir:</b> Poštové priečinky KMail sú reprezentované ako skutočné "
 "priečinky na disku. Jednotlivé správy sú samostatné súbory. To môže zaberať "
-"viac miesta na disku, ale je to bezpečnejšie, napríklad pri presune správ medzi "
-"priečinkami.</p></qt>"
+"viac miesta na disku, ale je to bezpečnejšie, napríklad pri presune správ "
+"medzi priečinkami.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2741,53 +2719,44 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pri prechode na nasledujúcu neprečítanú správu sa môže stať, že pod "
-"aktuálnou správou už nie sú žiadne neprečítané správy.</p>"
-"<p><b>Neopakovať:</b> Hľadanie sa zastaví na poslednej správe v aktuálnom "
-"priečinku.</p>"
-"<p><b>Opakovať v aktuálnom priečinku:</b>Po zapnutí tejto voľby bude hľadanie "
-"začínať na začiatku zoznamu správ v tomto priečinku, ale nebude sa hľadať v "
-"iných priečinkoch.</p>"
-"<p><b>Opakovať vo všetkých priečinkoch:</b> Hľadanie bude pokračovať na "
-"začiatku zoznamu správ. Ak žiadne neprečítané správy nebudú nájdené, bude sa "
-"pokračovať v nasledujúcom priečinku.</p>"
-"<p>Podobne pri hľadaní predchádzajúcej neprečítanej správy začne hľadanie na "
-"konci zoznamu správ v závislosti na vybranej voľbe.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Pri prechode na nasledujúcu neprečítanú správu sa môže stať, že pod "
+"aktuálnou správou už nie sú žiadne neprečítané správy.</p><p><b>Neopakovať:</"
+"b> Hľadanie sa zastaví na poslednej správe v aktuálnom priečinku.</"
+"p><p><b>Opakovať v aktuálnom priečinku:</b>Po zapnutí tejto voľby bude "
+"hľadanie začínať na začiatku zoznamu správ v tomto priečinku, ale nebude sa "
+"hľadať v iných priečinkoch.</p><p><b>Opakovať vo všetkých priečinkoch:</b> "
+"Hľadanie bude pokračovať na začiatku zoznamu správ. Ak žiadne neprečítané "
+"správy nebudú nájdené, bude sa pokračovať v nasledujúcom priečinku.</"
+"p><p>Podobne pri hľadaní predchádzajúcej neprečítanej správy začne hľadanie "
+"na konci zoznamu správ v závislosti na vybranej voľbe.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Celotextové indexovanie umožňuje veľmi rýchle hľadanie obsahu správ. Ak je "
-"povolené, vyhľadávací dialóg bude pracovať veľmi rýchlo. Taktiež, panel "
-"nástrojov hľadania vyberie správy podľa ich obsahu.</p>"
-"<p>Vyžaduje si to určité miesto na disku (asi polovicu miesta pre správy).</p>"
-"<p>Po  povolení je potrebné vytvoriť index, ale môžete pokračovať v používaní "
-"KMail kým táto operácia pobeží.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Celotextové indexovanie umožňuje veľmi rýchle hľadanie obsahu správ. "
+"Ak je povolené, vyhľadávací dialóg bude pracovať veľmi rýchlo. Taktiež, "
+"panel nástrojov hľadania vyberie správy podľa ich obsahu.</p><p>Vyžaduje si "
+"to určité miesto na disku (asi polovicu miesta pre správy).</p><p>Po  "
+"povolení je potrebné vytvoriť index, ale môžete pokračovať v používaní KMail "
+"kým táto operácia pobeží.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2855,10 +2824,11 @@ msgstr "&Skryť priečinky pracovných skupín"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Ak je toto zapnuté, v strome priečinkov nebudete vidieť priečinky zdrojov IMAP."
+"Ak je toto zapnuté, v strome priečinkov nebudete vidieť priečinky zdrojov "
+"IMAP."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2866,11 +2836,11 @@ msgstr "Zobraziť &iba groupware priečinky tohto účtu"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Ak je toto zapnuté, v strome priečinkov nebudete vidieť priečinky bežnej pošty "
-"pre účet nakonfigurovaný ako groupware."
+"Ak je toto zapnuté, v strome priečinkov nebudete vidieť priečinky bežnej "
+"pošty pre účet nakonfigurovaný ako groupware."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2924,23 +2894,22 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Ak je Microsoft Outlook používaný spolu s Microsoft Exchange serverom, tak má "
-"problém rozumieť štandartným skupinovým emailom. Zapnite túto možnosť pre "
+"Ak je Microsoft Outlook používaný spolu s Microsoft Exchange serverom, tak "
+"má problém rozumieť štandartným skupinovým emailom. Zapnite túto možnosť pre "
 "posielanie skupinových pozvánok spôsobom, akým Microsoft Exchange rozumie."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Mená príloh kompatibilné s Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatické poslanie pozvánky"
@@ -2950,28 +2919,27 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Ak je zapnuté, používateľ neuvidí okno novej správy. Poštová pozvánka sa pošle "
-"automaticky"
+"Ak je zapnuté, používateľ neuvidí okno novej správy. Poštová pozvánka sa "
+"pošle automaticky"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Pozvánky sa obvykle posielajú ako prílohy. Zapnutím tejto voľby sa budú "
 "posielať v tele správy. To je nutné pre podporu pozvánok kompatibilných s "
-"Microsoft Outlook."
-"<br>Ak ju ale zapnete, nebude možné získať popis správy, ktorý by si mohli "
-"prečítať ľudia s poštovými klientami bez podpory pozvánok. Výsledné správy "
-"vyzerajú totiž veľmi divne."
-"<br>Ľudia, ktorých poštový klienti pozvánky podporujú, budú môcť so správami "
-"ďalej bez problémov pracovať.</qt>"
+"Microsoft Outlook.<br>Ak ju ale zapnete, nebude možné získať popis správy, "
+"ktorý by si mohli prečítať ľudia s poštovými klientami bez podpory pozvánok. "
+"Výsledné správy vyzerajú totiž veľmi divne.<br>Ľudia, ktorých poštový "
+"klienti pozvánky podporujú, budú môcť so správami ďalej bez problémov "
+"pracovať.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3075,30 +3043,27 @@ msgstr "Poslať ďalej"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu môžete pridať, upraviť a odstrániť vlastné šablóny správ, ktoré sa "
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Tu môžete pridať, upraviť a odstrániť vlastné šablóny správ, ktoré sa "
 "použijú pre vytvorenie odpovede alebo poslanie správy ďalej. Vlastnú šablónu "
 "vytvoríte jej zvolením pravým tlačidlom myši, pomocou menu alebo cez panel "
-"nástrojov. Šablónu taktiež môžete previazať s kombináciou kláves pre rýchlejšie "
-"operácie.</p>"
-"<p>šablóny správ podporujú jednoduché nahrádzanie príkazov, stačí ich napísať "
-"alebo zvoliť v menu <i>Vložiť príkaz</i>.</p>"
-"<p>Existujú štyri typy vlastných šablôn: na použitie pre <i>Odpovedať</i>, <i>"
-"Odpovedať všetkým</i>, <i>Poslať ďalej</i> a <i>Univerzálna</i>"
-", ktoré môžu byť použité pre všetky druhy operácií. So šablónou typu <i>"
-"Univerzálna</i> nie je možné previazať klávesovú skratku.</p></qt>"
+"nástrojov. Šablónu taktiež môžete previazať s kombináciou kláves pre "
+"rýchlejšie operácie.</p><p>šablóny správ podporujú jednoduché nahrádzanie "
+"príkazov, stačí ich napísať alebo zvoliť v menu <i>Vložiť príkaz</i>.</"
+"p><p>Existujú štyri typy vlastných šablôn: na použitie pre <i>Odpovedať</i>, "
+"<i>Odpovedať všetkým</i>, <i>Poslať ďalej</i> a <i>Univerzálna</i>, ktoré "
+"môžu byť použité pre všetky druhy operácií. So šablónou typu <i>Univerzálna</"
+"i> nie je možné previazať klávesovú skratku.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3115,15 +3080,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3187,8 +3152,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Distribučný zoznam s daným menom <b>%1</b> už existuje. Prosím vyberte iné "
-"meno.</qt>"
+"<qt>Distribučný zoznam s daným menom <b>%1</b> už existuje. Prosím vyberte "
+"iné meno.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3197,8 +3162,8 @@ msgstr "Zmeniť identitu"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3463,6 +3428,11 @@ msgstr "Vybrať priečinok"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Vybrať všetok text"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3494,8 +3464,8 @@ msgstr "Zaz&namenávať aktivitu filtrov"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Týmto môžete zapnúť alebo vypnúť zaznamenávanie aktivity filtrov. Dáta o "
 "aktivite sa samozrejme ukladajú, iba ak je táto voľba zapnutá. "
@@ -3514,10 +3484,11 @@ msgstr "Zaznamenávať vyhodnotenie &pravidiel filtrov"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Tu môžete upraviť, koľko informácií o vyhodnocovaní pravidiel sa bude "
 "uchovávať. Ak túto voľbu zapnete, záznam sa vytvorí pre každé jednotlivé "
@@ -3541,14 +3512,14 @@ msgstr "bez obmedzenia"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Ukladanie záznamu vyžaduje miesto v pamäti pre dočasné dáta. Tu môžete nastaviť "
-"maximálnu veľkosti pamäti, ktorá sa má používať. Ak veľkosť dát túto hranicu "
-"presiahne, najstaršie dáta sa zahodia. "
+"Ukladanie záznamu vyžaduje miesto v pamäti pre dočasné dáta. Tu môžete "
+"nastaviť maximálnu veľkosti pamäti, ktorá sa má používať. Ak veľkosť dát "
+"túto hranicu presiahne, najstaršie dáta sa zahodia. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3558,7 +3529,7 @@ msgstr ""
 "Nepodarilo sa zapísať súbor %1:\n"
 "\"%2\" obsahuje detailný popis chyby."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Chybová správa KMail"
@@ -3599,12 +3570,12 @@ msgstr "Identifikácia po&užívateľa:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Používateľ je prihlasovacie meno na serveri IMAP. Môže to byť iba meno, alebo "
-"celá e-mailová adresa. Správnu hodnotu vám poradí tvar vášho vlastného "
+"Používateľ je prihlasovacie meno na serveri IMAP. Môže to byť iba meno, "
+"alebo celá e-mailová adresa. Správnu hodnotu vám poradí tvar vášho vlastného "
 "prihlasovacieho mena."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3656,8 +3627,8 @@ msgstr "Nemáte prístupové práva pre čítanie/zápis pre váš priečinok ko
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Informácie ešte nezískané zo serveru. Prosím, použite \"Skontrolovať poštu\"."
 
@@ -3669,8 +3640,7 @@ msgstr "Chyba: pre tento priečinok nie je definovaný účet IMAP"
 msgid "Connecting to server %1, please wait..."
 msgstr "Pripájam sa k serveru %1, prosím, čakajte..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Chyba pri pripojení k serveru %1"
@@ -3698,11 +3668,11 @@ msgstr "Pridať práva"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Naozaj chcete odstrániť vaše vlastné práva pre tento priečinok? Nebudete k nemu "
-"už mať prístup."
+"Naozaj chcete odstrániť vaše vlastné práva pre tento priečinok? Nebudete k "
+"nemu už mať prístup."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3733,7 +3703,7 @@ msgstr "Použitie:"
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
@@ -3757,12 +3727,12 @@ msgstr "Vybrať skratku pre priečinok"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Kliknite na tlačidlo dole a zvoľte kláves alebo kombináciu klávesov, ktoré "
-"vyberú aktuálny priečinok.</qt>"
+"<qt>Kliknite na tlačidlo dole a zvoľte kláves alebo kombináciu klávesov, "
+"ktoré vyberú aktuálny priečinok.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3782,13 +3752,21 @@ msgstr "&Zrušiť"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Priečinok, ktorý ste zmazali bol previazaný s účtom <b>%1</b>"
-", ktorý do neho doručoval poštu. Na doručenie pošty bol nastavený hlavný "
-"priečinok.</qt>"
+"<qt>Priečinok, ktorý ste zmazali bol previazaný s účtom <b>%1</b>, ktorý do "
+"neho doručoval poštu. Na doručenie pošty bol nastavený hlavný priečinok.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3913,68 +3891,17 @@ msgstr "Stav spamu:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>s"
-"<br>p"
-"<br>r"
-"<br>á"
-"<br>v"
-"<br>a</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>s<br>p<br>r<br>á<br>v<br>a</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>i"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>"
-"<br>p"
-"<br>r"
-"<br>á"
-"<br>v"
-"<br>a</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>i<br>e<br> <br>H<br>T<br>M<br>L<br> "
+"<br><br>p<br>r<br>á<br>v<br>a</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3986,19 +3913,13 @@ msgstr "Vaše me&no:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Vaše meno</h3>"
-"<p>Toto pole by malo obsahovať vaše meno tak, ako chcete, aby sa zobrazilo v "
-"hlavičke posielanej správy.</p>"
-"<p>Ak toto pole nevyplníte, vaše skutočné meno sa nezobrazí, iba e-mailová "
-"adresa.</p></qt>"
+"<qt><h3>Vaše meno</h3><p>Toto pole by malo obsahovať vaše meno tak, ako "
+"chcete, aby sa zobrazilo v hlavičke posielanej správy.</p><p>Ak toto pole "
+"nevyplníte, vaše skutočné meno sa nezobrazí, iba e-mailová adresa.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4006,17 +3927,13 @@ msgstr "Organi&zácia:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizácia</h3>"
-"<p>Toto pole by malo obsahovať meno vašej organizácie, ak ho chcete zobraziť v "
-"hlavičke posielanej správy.</p>"
-"<p>Je bezpečné (a normálne) toto nevyplniť.</p></qt>"
+"<qt><h3>Organizácia</h3><p>Toto pole by malo obsahovať meno vašej "
+"organizácie, ak ho chcete zobraziť v hlavičke posielanej správy.</p><p>Je "
+"bezpečné (a normálne) toto nevyplniť.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4025,20 +3942,15 @@ msgstr "&E-mailová adresa:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-mailová adresa</h3>"
-"<p>Toto pole by malo obsahovať vašu úplnú e-mailovú adresu.</p>"
-"<p>Ak ho nevyplníte alebo vyplníte nesprávne, ľudia vám nebudú môcť "
-"odpovedať.</p></qt>"
+"<qt><h3>E-mailová adresa</h3><p>Toto pole by malo obsahovať vašu úplnú e-"
+"mailovú adresu.</p><p>Ak ho nevyplníte alebo vyplníte nesprávne, ľudia vám "
+"nebudú môcť odpovedať.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4047,21 +3959,12 @@ msgstr "&E-mailová adresa:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4086,19 +3989,17 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kľúč OpenPGP, ktorý tu vyberiete, sa budete používať pre podpis správ "
-"posielaných sebe samému. Môžete použiť aj kľúče GnuPG.</p>"
-"<p>Môžete toto pole nechať prázdne, ale potom KMail nedokáže digitálne "
-"podpisovať správy. Normálne poštové funkcie to neovplyvní.</p>"
-"<p>Viac o kľúčoch nájdete na <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>Kľúč OpenPGP, ktorý tu vyberiete, sa budete používať pre podpis správ "
+"posielaných sebe samému. Môžete použiť aj kľúče GnuPG.</p><p>Môžete toto "
+"pole nechať prázdne, ale potom KMail nedokáže digitálne podpisovať správy. "
+"Normálne poštové funkcie to neovplyvní.</p><p>Viac o kľúčoch nájdete na "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4110,30 +4011,27 @@ msgstr "Váš šifrovací kľúč OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Vyberte kľúč OpenPGP, ktorý sa má použiť na šifrovanie správ, ktoré posielate "
-"sám sebe a pre funkciu \"Priložiť môj verejný kľúč\"."
+"Vyberte kľúč OpenPGP, ktorý sa má použiť na šifrovanie správ, ktoré "
+"posielate sám sebe a pre funkciu \"Priložiť môj verejný kľúč\"."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Kľúč OpenPGP, ktorý tu vyberiete, sa budete používať pre šifrovanie správ "
-"posielaných sebe samému a pre funkciu \"Priložiť môj verejný kľúč\". Môžete "
-"použiť aj kľúče GnuPG.</p>"
-"<p>Môžete toto pole nechať prázdne, ale potom KMail nedokáže digitálne "
-"podpisovať správy. Normálne poštové funkcie to neovplyvní.</p>"
-"<p>Viac o kľúčoch nájdete na <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Kľúč OpenPGP, ktorý tu vyberiete, sa budete používať pre šifrovanie "
+"správ posielaných sebe samému a pre funkciu \"Priložiť môj verejný kľúč\". "
+"Môžete použiť aj kľúče GnuPG.</p><p>Môžete toto pole nechať prázdne, ale "
+"potom KMail nedokáže digitálne podpisovať správy. Normálne poštové funkcie "
+"to neovplyvní.</p><p>Viac o kľúčoch nájdete na <a>http://www.gnupg.org</a></"
+"p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4152,17 +4050,14 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Certifikát S/MIME, ktorý tu vyberiete, sa budete používať pre podpis "
-"správ.</p>"
-"<p>Môžete toto pole nechať prázdne, ale potom KMail nedokáže digitálne "
-"podpisovať správy. Normálne poštové funkcie to neovplyvní.</p></qt>"
+"<qt><p>Certifikát S/MIME, ktorý tu vyberiete, sa budete používať pre podpis "
+"správ.</p><p>Môžete toto pole nechať prázdne, ale potom KMail nedokáže "
+"digitálne podpisovať správy. Normálne poštové funkcie to neovplyvní.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4174,27 +4069,25 @@ msgstr "Váš certifikát S/MIME pre šifrovanie"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Vyberte certifikát S/MIME, ktorý sa má použiť pre šifrovanie správ pre vás a "
 "funkciu \"Priložiť môj certifikát\"."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Certifikát S/MIE, ktorý tu vyberiete, sa budete používať pre šifrovanie "
-"správ posielaných sebe samému a pre funkciu \"Priložiť môj certifikát\".</p>"
-"<p>Môžete toto pole nechať prázdne, ale potom KMail nedokáže šifrovať "
-"odosielané správy pomocou S/MIME. Normálne poštové funkcie to neovplyvní.</p>"
-"</qt>>"
+"<qt><p>Certifikát S/MIE, ktorý tu vyberiete, sa budete používať pre "
+"šifrovanie správ posielaných sebe samému a pre funkciu \"Priložiť môj "
+"certifikát\".</p><p>Môžete toto pole nechať prázdne, ale potom KMail "
+"nedokáže šifrovať odosielané správy pomocou S/MIME. Normálne poštové funkcie "
+"to neovplyvní.</p></qt>>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4214,23 +4107,19 @@ msgstr "Ad&resa pre odpoveď:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adresy pre odpovede</h3>"
-"<p>Toto nastavuje hlavičku <tt>Reply-to:</tt>, ktorá obsahuje inú než normálnu "
-"adresu použitú v poli <tt>Od:</tt>.</p>"
-"<p>To sa hodí, ak máte skupinu ľudí, s ktorými pracujete na rovnakej pozícii. "
-"Napríklad chcete, aby všetky posielané správy mali vašu adresu ako "
-"odosielateľa, ale aby odpovede šli na skupinovú adresu.</p>"
-"<p>Ak neviete, nechajte toto pole prázdne.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adresy pre odpovede</h3><p>Toto nastavuje hlavičku <tt>Reply-to:</"
+"tt>, ktorá obsahuje inú než normálnu adresu použitú v poli <tt>Od:</tt>.</"
+"p><p>To sa hodí, ak máte skupinu ľudí, s ktorými pracujete na rovnakej "
+"pozícii. Napríklad chcete, aby všetky posielané správy mali vašu adresu ako "
+"odosielateľa, ale aby odpovede šli na skupinovú adresu.</p><p>Ak neviete, "
+"nechajte toto pole prázdne.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4238,23 +4127,18 @@ msgstr "&BCC adresa:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) adresy</h3>"
-"<p>Adresy tu zadané budú pridané ku každej odchádzajúcej správe zaslanej s "
-"touto identitou. Nebudú viditeľné pre ostatných príjímateľov.</p>"
-"<p>Toto je štandardne použité pre poslanie kópie každej správy na vaše iné "
-"konto.</p>"
-"<p>Ak to nepotrebujete, nechajte toto pole prázdne.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) adresy</h3><p>Adresy tu zadané budú pridané "
+"ku každej odchádzajúcej správe zaslanej s touto identitou. Nebudú viditeľné "
+"pre ostatných príjímateľov.</p><p>Toto je štandardne použité pre poslanie "
+"kópie každej správy na vaše iné konto.</p><p>Ak to nepotrebujete, nechajte "
+"toto pole prázdne.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4292,7 +4176,7 @@ msgstr "&Podpis"
 msgid "&Picture"
 msgstr "O&brázok"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Neplatná e-mailová adresa"
 
@@ -4315,8 +4199,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Jeden z nastavených šifrovacích kľúčov OpenPGP neobsahuje e-mailovú adresu "
 "nastavenú pre túto identitu (%1)."
@@ -4328,8 +4212,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Jeden z nastavených podpisových certifikátov S/MIME neobsahuje e-mailovú adresu "
-"nastavenú pre túto identitu (%1).\n"
+"Jeden z nastavených podpisových certifikátov S/MIME neobsahuje e-mailovú "
+"adresu nastavenú pre túto identitu (%1).\n"
 "To môže spôsobiť varovania pre prijímateľov správy pri pokuse o overenie "
 "podpisu."
 
@@ -4338,8 +4222,8 @@ msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Jeden z nastavených šifrovacích certifikátov S/MIME neobsahuje e-mailovú adresu "
-"nastavenú pre túto identitu (%1)."
+"Jeden z nastavených šifrovacích certifikátov S/MIME neobsahuje e-mailovú "
+"adresu nastavenú pre túto identitu (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4366,8 +4250,8 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Vlastný priečinok pre návrhy identity \"%1\" neexistuje. Preto bude pre návrhy "
-"použitý štandardný priečinok pre návrhy."
+"Vlastný priečinok pre návrhy identity \"%1\" neexistuje. Preto bude pre "
+"návrhy použitý štandardný priečinok pre návrhy."
 
 #: identitydialog.cpp:662
 msgid ""
@@ -4379,8 +4263,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (štandardná)"
 
@@ -4427,16 +4311,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Konfigurácia bola automaticky prenesená, ale mali by ste skontrolovať "
 "konfiguráciu Vášho účtu."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Nebolo možné automaticky preniesť konfiguráciu, takže prosím skontrolujte "
 "konfiguráciu Vášho účtu."
@@ -4478,14 +4362,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Chyba: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Pripojenie na server %1 bolo neočákavane zavreté alebo vypršal čas na "
 "pripojenie. Ak je to možné, pripojenie sa automaticky obnoví."
@@ -4638,14 +4527,14 @@ msgstr "Archívy konferencie"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4674,256 +4563,212 @@ msgstr "Nepoužiteľné šifrovacie kľúče"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n deň.</p>\n"
-"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dni.</p>\n"
-"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dní.</p>"
+"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n deň.</p>\n"
+"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dni.</p>\n"
+"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dní.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n deň.</p>\n"
-"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dni.</p>\n"
-"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dní.</p>"
+"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n deň.</p>\n"
+"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dni.</p>\n"
+"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dní.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n deň.</p>\n"
-"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dni.</p>\n"
-"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dní.</p>"
+"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p><p>vyprší za "
+"menej než %n deň.</p>\n"
+"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p><p>vyprší za "
+"menej než %n dni.</p>\n"
+"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p><p>vyprší za "
+"menej než %n dní.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n deň.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dni.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dní.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n deň.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dni.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dní.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4937,245 +4782,201 @@ msgstr "Certifikát S/MIME čoskoro prestane platiť"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n deň.</p>\n"
-"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dni.</p>\n"
-"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dní.</p>"
+"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n deň.</p>\n"
+"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dni.</p>\n"
+"<p>Váš podpisový kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dní.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n deň.</p>\n"
-"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dni.</p>\n"
-"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dní.</p>"
+"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n deň.</p>\n"
+"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dni.</p>\n"
+"<p>Váš šifrovací kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</"
+"p><p>vyprší za menej než %n dní.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n deň.</p>\n"
-"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dni.</p>\n"
-"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p>"
-"<p>vyprší za menej než %n dní.</p>"
+"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p><p>vyprší za "
+"menej než %n deň.</p>\n"
+"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p><p>vyprší za "
+"menej než %n dni.</p>\n"
+"<p>Kľúč OpenPGP</p><p align=center><b>%1</b>(ID kľúča 0x%2)</p><p>vyprší za "
+"menej než %n dní.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Koreňový certifikát</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n deň.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dni.</p>\n"
+"<p>Koreňový certifikát</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dní.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš podpisový "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre váš šifrovací "
+"certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p>"
-"<p>pre certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n deň.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dni.</p>\n"
+"<p>Medzi-certifikát CA</p><p align=center><b>%3</b></p><p>pre certifikát S/"
+"MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p><p>vyprší za menej "
+"ako %n dní.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Váš podpisový certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> "
-"(sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Váš šifrovací certifikát S/MIME</p><p align=center><b>%1</b> (sériové "
+"číslo %2)</p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n deň.</p>\n"
-"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dni.</p>\n"
-"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</p>"
-"<p>vyprší za menej ako %n dní.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n deň.</p>\n"
+"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dni.</p>\n"
+"<p>Certifikát S/MIME</p><p align=center><b>%1</b> (sériové číslo %2)</"
+"p><p>vyprší za menej ako %n dní.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5187,15 +4988,16 @@ msgstr "Certifikát S/MIME čoskoro prestane platiť"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Jeden aleb o viac nastavených šifrovacích kľúčov OpenPGP alebo certifikátov "
-"S/MIME nie je pre šifrovanie použiteľný. Prosím, upravte nastavenie šifrovacích "
-"kľúčov a certifikátov pre túto identitu.\n"
+"S/MIME nie je pre šifrovanie použiteľný. Prosím, upravte nastavenie "
+"šifrovacích kľúčov a certifikátov pre túto identitu.\n"
 "Ak budete pokračovať a kľúče budú neskôr potrebné, budete musieť zadať ručne "
 "kľúče, ktoré sa majú použiť."
 
@@ -5212,8 +5014,8 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Jeden aleb o viac nastavených podpisových kľúčov OpenPGP alebo certifikátov "
-"S/MIME nie je pre podpísanie použiteľný. Prosím, upravte nastavenie podpisových "
-"kľúčov a certifikátov pre túto identitu.\n"
+"S/MIME nie je pre podpísanie použiteľný. Prosím, upravte nastavenie "
+"podpisových kľúčov a certifikátov pre túto identitu.\n"
 "Ak budete pokračovať a kľúče budú neskôr potrebné, budete musieť zadať ručne "
 "kľúče, ktoré sa majú použiť."
 
@@ -5225,14 +5027,15 @@ msgstr "Nepoužiteľné podpisové kľúče"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Preskúmaním nastavenia pre podpisy adresáta sa ukázalo, že správa by sa mala "
 "podpísať pomocou OpenPGP, aspoň pre niektorých adresátov.\n"
-"Pre túto identitu ale nemáte nastavené žiadne platné podpisové kľúče OpenPGP.\n"
+"Pre túto identitu ale nemáte nastavené žiadne platné podpisové kľúče "
+"OpenPGP.\n"
 "Môžete pokračovať bez zašifrovania správy sebe samému, ale uvedomte si, že "
 "správu nebudete môcť už prečítať."
 
@@ -5240,22 +5043,22 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Preskúmaním nastavenia pre podpisy adresáta sa ukázalo, že správa by sa mala "
 "podpísať pomocou S/MIME, aspoň pre niektorých adresátov.\n"
-"Pre túto identitu ale nemáte nastavené žiadne platné podpisové certifikáty "
-"S/MIME.\n"
+"Pre túto identitu ale nemáte nastavené žiadne platné podpisové certifikáty S/"
+"MIME.\n"
 "Môžete pokračovať bez zašifrovania správy sebe samému, ale uvedomte si, že "
 "správu nebudete môcť už prečítať."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5269,15 +5072,15 @@ msgstr "Nepodpisovať pomocou OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "Preskúmaním nastavenia pre podpisy adresáta sa ukázalo, že správa by sa mala "
 "podpísať pomocou S/MIME, aspoň pre niektorých adresátov.\n"
-"Pre túto identitu ale nemáte nastavené žiadne platné podpisové certifikáty "
-"S/MIME."
+"Pre túto identitu ale nemáte nastavené žiadne platné podpisové certifikáty S/"
+"MIME."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5299,8 +5102,8 @@ msgstr "Podpísanie nie je možné"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Nevybrali ste šifrovací kľúč pre vás (šifrovanie pre vás samotných). Nebude "
 "možné dešifrovať vaše vlastné správy, ak ich zašifrujete."
@@ -5324,8 +5127,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Nevybrali ste šifrovací kľúč pre žiadneho z adresátov. Preto správa nebude "
 "zašifrovaná."
@@ -5347,8 +5150,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nevybrali ste šifrovacie kľúče pre niektorých adresátov. Ak správu zašifrujete, "
-"nebudú schopní správu dešifrovať."
+"Nevybrali ste šifrovacie kľúče pre niektorých adresátov. Ak správu "
+"zašifrujete, nebudú schopní správu dešifrovať."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5372,11 +5175,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Nenájdený platný a dôveryhodný šifrovací kľúč pre \"%1\".\n"
 "\n"
@@ -5425,10 +5228,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritická chyba: Nie je možné vyzdvihnúť poštu: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Nepodarilo sa pridať správu:\n"
+msgid "Failed to add message:\n"
+msgstr "Nepodarilo sa pridať správu:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5473,8 +5274,7 @@ msgstr "Presun správy %3 z %2 z %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Nie je možné odstrániť poštu z poštovej schránky <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Nie je možné odstrániť poštu z poštovej schránky <b>%1</b>:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5522,6 +5322,50 @@ msgstr "&Odpojený IMAP"
 msgid "&Maildir mailbox"
 msgstr "Poštová schránka &maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Nastaviť predmet správy"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Poslať kópiu: na 'adresa'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Poslať slepú kópiu: na 'adresa'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Pridaj 'hlavička' do správy"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Prečítať telo správy zo súboru 'súbor'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Nastaviť text správy"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Pridať prílohy k správe. Toto môžete urobiť opakovane"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Overiť len novú poštu"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Otvoriť len editor správ"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Zobraziť zadaný súbor správy"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Poslať správu na 'adresu' resp. priložiť súbor, kam ukazuje 'URL'"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Pošta"
@@ -5565,8 +5409,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail teraz vytvorí požadované priečinky pre pracovné skupiny ako podpriečinky "
-"v %1. Ak si to neprajete, stornujte a zdroje IMAP budú vypnuté"
+"KMail teraz vytvorí požadované priečinky pre pracovné skupiny ako "
+"podpriečinky v %1. Ak si to neprajete, stornujte a zdroje IMAP budú vypnuté"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5580,13 +5424,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail našiel nasledujúce priečinky pracovnej skupiny v %1 a potrebuje "
-"vykonať nasledujúce operácie: %2"
-"<br>Ak si to neprajete, stornujte a zdroje IMAP budú vypnuté"
+"vykonať nasledujúce operácie: %2<br>Ak si to neprajete, stornujte a zdroje "
+"IMAP budú vypnuté"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5636,11 +5480,11 @@ msgstr "URL skopírované do schránky."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Súbor <b>%1</b> existuje.<br>Prajete si ho prepísať?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Uložiť do súboru"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "Nahr&adiť..."
 
@@ -5658,7 +5502,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Správa bola počas ukladania odstránená a nebola uložená."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5678,11 +5522,11 @@ msgstr "Súbor neobsahuje správu."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Súbor obsahuje niekoľko správ. Zobrazí sa iba prvá z nich."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5691,114 +5535,114 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrujú sa správy"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtruje sa správa %1 z %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Nedostatok voľného miesta na disku?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Presunúť do tohto priečinku"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopírovať do tohto priečinku"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
-"Zistená poškodená vyrovnávacia pamäť pre IMAP v priečinku %1. Kopírovanie správ "
-"prerušené."
+"Zistená poškodená vyrovnávacia pamäť pre IMAP v priečinku %1. Kopírovanie "
+"správ prerušené."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Presun správ"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Odstraňovanie správ"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Otváram URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Naozaj chcete vykonať <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Vykonať"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Neboli nájdené žiadne prílohy, ktoré by bolo možné uložiť."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Uložiť prílohu ako"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "príloha.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "príloha.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Súbor s názvom %1 už existuje. Prajete si ho prepísať?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Súbor už existuje"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Prepísať"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Časť správy %1 je zašifrovaná. Chcete ponechať šifrovanie pri ukladaní?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail otázka"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Ponechať šifrovanie"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Neponechať"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "Časť správy %1 je podpísaná. Chcete ponechať podpis pri ukladaní?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Ponechať podpis"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5807,22 +5651,22 @@ msgstr ""
 "Nemôžem zapísať súbor %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Nemôžem zapísať súbor %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Pre túto e-mailovú adresu neexistuje záznam v adresári. Pridajte ich a potom k "
-"nim pridajte adresy pre rozhovor (instant messaging) pomocou vášho obľúbeného "
-"klienta pre rozhovory."
+"Pre túto e-mailovú adresu neexistuje záznam v adresári. Pridajte ich a potom "
+"k nim pridajte adresy pre rozhovor (instant messaging) pomocou vášho "
+"obľúbeného klienta pre rozhovory."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5832,73 +5676,73 @@ msgstr ""
 " %1\n"
 "Nie je jasné, s kým sa má začať rozhovor."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr "Chiasmus neposkytuje funkciu \"x-obtain-keys\". Prosím nahláste chybu."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chyba podpory Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Chiasmus vrátil neočákavanú hodnotu. Funkcia \"x-obtain-keys\" nevrátila zoznam "
-"reťazcov. Prosím nahláste chybu."
+"Chiasmus vrátil neočákavanú hodnotu. Funkcia \"x-obtain-keys\" nevrátila "
+"zoznam reťazcov. Prosím nahláste chybu."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Nenájdené žiadne kľúče. Prosím skontrolujte či bol platný kľúč nastavený v "
 "konfigurácii pre Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Výber šifrovacieho kľúča pre Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus neposkytuje funkciu \"x-decrypt\". Prosím nahláste chybu."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 "Funkcia \"x-decrypt\" neakceptuje očakávané parametre. Prosím nahláste chybu."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chyba šifrovania Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Neočakávaná návratová hodnota z Chiasmus. Funkcia \"x-decrypt\" nevrátila pole "
-"bajtov. Prosím nahláste chybu."
+"Neočakávaná návratová hodnota z Chiasmus. Funkcia \"x-decrypt\" nevrátila "
+"pole bajtov. Prosím nahláste chybu."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Pošta"
@@ -5997,7 +5841,7 @@ msgstr "Veľkosť"
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimovanie"
 
@@ -6009,7 +5853,7 @@ msgstr "Šifrovanie"
 msgid "Sign"
 msgstr "Podpis"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Meno prílohy:"
 
@@ -6031,7 +5875,8 @@ msgstr "Hlavní adresáti"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>E-mailové adresy, ktoré se zadáte, dostanú kópiu tejto správy.</qt>"
 
@@ -6042,13 +5887,13 @@ msgstr "Ďalší adresáti"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Emailové adresy, ktoré zadáte to tohto poľa, dostanú kópiu správy. "
-"Technicky to znamená to isté, aako by ste ich zadali do poľa <b>Komu:</b>"
-", ale obvykle to znamená, že adresát kópie (Carbon Copy - CC) iba pozoruje "
+"Technicky to znamená to isté, aako by ste ich zadali do poľa <b>Komu:</b>, "
+"ale obvykle to znamená, že adresát kópie (Carbon Copy - CC) iba pozoruje "
 "konverzáciu, nie je hlavným adresátorm.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6057,9 +5902,8 @@ msgstr "Skrytí adresáti"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>Vpodstate to isté, ako v <b>Kópia:</b>, ale ostatní adresáti neuvidia "
 "zoznam adresátov, ktorí dostanú slepú kópiu.</qt>"
@@ -6072,7 +5916,7 @@ msgstr "Po&slať poštu"
 msgid "&Send Mail Via"
 msgstr "Po&slať poštu cez"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Po&slať neskôr"
@@ -6137,8 +5981,7 @@ msgstr "O&dstrániť znaky citácie"
 msgid "Cl&ean Spaces"
 msgstr "Odstrániť &medzery"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Použiť písmo s pe&vnou šírkou"
@@ -6281,31 +6124,31 @@ msgstr "Šif&rovací formát ukladania"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Štandardné"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Odrážky (disky)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Odrážky (kruhy)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Odrážky (štvorce)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Utriedený zoznam (čísla)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Utriedený zoznam (malé písmená)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Utriedený zoznam (veľké písmená)"
 
@@ -6409,60 +6252,60 @@ msgstr "Zavrieť editor"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Správa, ktorú ste písali, asi má obsahovať prílohu, ale žiadnu ste nezadali.\n"
+"Správa, ktorú ste písali, asi má obsahovať prílohu, ale žiadnu ste "
+"nezadali.\n"
 "Chcete k správe priložiť súbor?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Upozornenie na prílohy"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Poslať ako je"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail nedokázal zistiť umiestnenie prílohy (%1).</p>"
-"<p>Ak chcete súbor priložiť, musíte zadať úplnú cestu.</p></qt>"
+"<qt><p>KMail nedokázal zistiť umiestnenie prílohy (%1).</p><p>Ak chcete "
+"súbor priložiť, musíte zadať úplnú cestu.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Priložiť súbor"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Priložiť"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Vložiť súbor"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Vložiť súbor"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Nastala chyba počas pokusu o export kľúča:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Nastala chyba počas pokusu o export kľúča:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6501,96 +6344,107 @@ msgid ""
 "View"
 msgstr "Zobraziť"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Upraviť..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Upraviť skript..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Uložiť &ako..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Vlastnosti"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Pridať prílohu..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail nevie tento súbor komprimovať."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Komprimovaný súbor je väčší ako originálny. Chcete ponechať originálny súbor?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Ponechať"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail nevie tento súbor dekomprimovať."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Uložiť prílohu ako"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Pridať ako text"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Pridať ako prílohu"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Vložiť ako prílo&hu"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "bez mena"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aby ste mohli túto správu zašifrovať sami sebe, musíte najprv definovať kľúč "
-"OpenPGP alebo S/MIME, ktorý sa má použiť pre túto identitu.</p>"
-"<p>Tento kľúč môžete definovať v nastavení identity.</p></qt>"
+"<qt><p>Aby ste mohli túto správu zašifrovať sami sebe, musíte najprv "
+"definovať kľúč OpenPGP alebo S/MIME, ktorý sa má použiť pre túto identitu.</"
+"p><p>Tento kľúč môžete definovať v nastavení identity.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Nedefinovaný šifrovací kľúč"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aby ste mohli túto správu podpísať, musíte najprv definovať kľúč OpenPGP "
-"alebo S/MIME, ktorý sa má použiť.</p>"
-"<p>Tento kľúč môžete definovať v nastavení identity.</p></qt>"
+"<qt><p>Aby ste mohli túto správu podpísať, musíte najprv definovať kľúč "
+"OpenPGP alebo S/MIME, ktorý sa má použiť.</p><p>Tento kľúč môžete definovať "
+"v nastavení identity.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nedefinovaný podpisový kľúč"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6598,91 +6452,89 @@ msgstr ""
 "KMail je momentálne v offline režime, správy budú ponechané v priečinku na "
 "odoslanie kým sa nepripojíte."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Do poľa Od: musíte zadať e-mailovú adresu. Mali by ste nastaviť aj e-mailovú "
 "adresu pre všetky identity, aby ste adresu nemuseli zadávať pre každú správu."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Je nutné špecifikovať aspoň jedného príjemcu v poli Komu:, Kópia alebo Slepá "
 "kópia."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Pole Pre: je prázdne. Poslať správu aj napriek tomu?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Pre: nie je uvedené"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Neuviedli ste predmet. Naozaj poslať?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Bez predmetu"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Poslať &ako je"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "Zadať &predmet"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Nechať značky, nepodpisovať ani šifrovať"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Nechať značky, nešifrovať"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Nechať značky, nepodpisovať"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "PodpísaťZašifrovať (odstrániť značky)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Zašifrovať (odstrániť značky)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Podpísať (odstrániť značky)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vložené podpísanie/zašifrovanie správ HTML nie je možné.</p>"
-"<p>Chcete značky odstrániť?</p></qt>"
+"<qt><p>Vložené podpísanie/zašifrovanie správ HTML nie je možné.</p><p>Chcete "
+"značky odstrániť?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Podpísať alebo zašifrovať správu?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6690,108 +6542,108 @@ msgstr ""
 "Vlastný priečinok pre návrhy alebo čablóny identity \"%1\" (už) neexistuje. "
 "Preto bude použitý štandardný priečinok pre návrhy alebo šablóny."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Prosím, vytvorte účet pre posielanie a skúste znova."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Posielam e-mail..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Poslať potvrdenie"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Po&slať teraz"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Žiadny adresáti"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Ďalší adresáti"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Kontrola pravopisu: zapnutá"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Kontrola pravopisu: vypnutá"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Kontrola pravopisu zrušená."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Kontrola pravopisu zastavená."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Kontrola pravopisu dokončená."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Kontrola pravopisu"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Prosím najprv nastavte podporu Crypto na použitie pre Chiasmus.\n"
 "Môžete to urobiť na karte podpory Crypto alebo v konfiguračnom dialógu na "
 "strane bezpečnosti."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Vyzerá to tak, že libkleopatra bola preložená bez podpory pre Chiasmus. Možno "
-"budete chcieť preložiť libkleopatra znova s použitím --enable-chiasmus."
+"Vyzerá to tak, že libkleopatra bola preložená bez podpory pre Chiasmus. "
+"Možno budete chcieť preložiť libkleopatra znova s použitím --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Nie je nastavená žiadna podpora pre Chiasmus"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nenájdený žiadny kľúč pre Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Výber šifrovacieho kľúča pre Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Správu podpísal %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Správu podpísal %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Hlavička správy OpenPGP - šifrované"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Správa s predmetom: "
@@ -6841,11 +6693,11 @@ msgstr "Kontrola pravopisu - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Chyba pri štarte kontroly pravopisu. Prosím, overte, že máte správne nastavený "
-"ISpell alebo ASpell a je v PATH."
+"Chyba pri štarte kontroly pravopisu. Prosím, overte, že máte správne "
+"nastavený ISpell alebo ASpell a je v PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6878,12 +6730,10 @@ msgstr "<qt>Príliš veľa akcií v pravidle filtra <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Neznáma akcia filtra <b>%1</b>"
-"<br>vo filtrovacom pravidle <b>%2</b>."
+"<qt>Neznáma akcia filtra <b>%1</b><br>vo filtrovacom pravidle <b>%2</b>."
 "<br>Ignorujem ju.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7104,155 +6954,126 @@ msgstr "Zahrať zvuk"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Toto je zoznam definovaných filtrov. Sú spracovávané zhora dolu.</p>"
-"<p>Kliknutím na filter ho môžete upraviť na pravej strane dialógu.</p></qt>"
+"<qt><p>Toto je zoznam definovaných filtrov. Sú spracovávané zhora dolu.</"
+"p><p>Kliknutím na filter ho môžete upraviť na pravej strane dialógu.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo vytvoríte nový filter.</p>"
-"<p>Filter bude vložený za aktuálne vybraný filter. Poradie samozrejme môžete "
-"zmeniť.</p>"
-"<p>Ak ste stlačili toto tlačidlo náhodou, použite pre odstránenie nového filtra "
-"tlačidlo <em>Odstrániť</em>.</p></qt>"
+"<qt><p>Kliknutím na toto tlačidlo vytvoríte nový filter.</p><p>Filter bude "
+"vložený za aktuálne vybraný filter. Poradie samozrejme môžete zmeniť.</"
+"p><p>Ak ste stlačili toto tlačidlo náhodou, použite pre odstránenie nového "
+"filtra tlačidlo <em>Odstrániť</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo skopírujete filter.</p>"
-"<p>Ak ste stlačili toto tlačidlo náhodou, použite pre odstránenie nového filtra "
-"tlačidlo <em>Odstrániť</em>.</p></qt>"
+"<qt><p>Kliknutím na toto tlačidlo skopírujete filter.</p><p>Ak ste stlačili "
+"toto tlačidlo náhodou, použite pre odstránenie nového filtra tlačidlo "
+"<em>Odstrániť</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo <em>odstránite</em> aktuálne vybraný filter z "
-"horného zoznamu.</p>"
-"<p>Neexistuje spôsob, ako vrátiť túto akciu, ale vždy môžete použiť <em>"
-"Zrušiť</em> pre opustenie tohto dialógu a zahodiť túto zmenu.</p></qt>"
+"<qt><p>Kliknutím na toto tlačidlo <em>odstránite</em> aktuálne vybraný "
+"filter z horného zoznamu.</p><p>Neexistuje spôsob, ako vrátiť túto akciu, "
+"ale vždy môžete použiť <em>Zrušiť</em> pre opustenie tohto dialógu a zahodiť "
+"túto zmenu.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter <em>navrch</em> "
-"v zozname.</p>"
-"<p>To sa hodí, pretože poradie filtrov určuje ich použitie, v ktorom sú "
-"aplikované na správy: najvyššie umiestnený filter je vyskúšaný prvý.</p></qt>"
+"<qt><p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter "
+"<em>navrch</em> v zozname.</p><p>To sa hodí, pretože poradie filtrov určuje "
+"ich použitie, v ktorom sú aplikované na správy: najvyššie umiestnený filter "
+"je vyskúšaný prvý.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter <em>vyššie</em> "
-"v zozname.</p>"
-"<p>To sa hodí, pretože poradie filtrov určuje ich použitie, v ktorom sú "
-"aplikované na správy: najvyššie umiestnený filter je vyskúšaný prvý.</p>"
-"<p>Ak ste stlačili toto tlačidlo náhodou, použite pre vrátenie tejto akcie "
-"tlačidlo <em>dolu</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter "
+"<em>vyššie</em> v zozname.</p><p>To sa hodí, pretože poradie filtrov určuje "
+"ich použitie, v ktorom sú aplikované na správy: najvyššie umiestnený filter "
+"je vyskúšaný prvý.</p><p>Ak ste stlačili toto tlačidlo náhodou, použite pre "
+"vrátenie tejto akcie tlačidlo <em>dolu</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter <em>nižšie</em> "
-"v zozname.</p>"
-"<p>To sa hodí, pretože poradie filtrov určuje ich použitie, v ktorom sú "
-"aplikované na správy: najvyššie umiestnený filter je vyskúšaný prvý.</p>"
-"<p>Ak ste stlačili toto tlačidlo náhodou, použite pre vrátenie tejto akcie "
-"tlačidlo <em>hore</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter "
+"<em>nižšie</em> v zozname.</p><p>To sa hodí, pretože poradie filtrov určuje "
+"ich použitie, v ktorom sú aplikované na správy: najvyššie umiestnený filter "
+"je vyskúšaný prvý.</p><p>Ak ste stlačili toto tlačidlo náhodou, použite pre "
+"vrátenie tejto akcie tlačidlo <em>hore</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter <em>"
-"naspodok</em> v zozname.</p>"
-"<p>To sa hodí, pretože poradie filtrov určuje ich použitie, v ktorom sú "
-"aplikované na správy: najvyššie umiestnený filter je vyskúšaný prvý.</p></qt>"
+"<qt><p>Kliknutím na toto tlačidlo posuniete aktuálne vybraný filter "
+"<em>naspodok</em> v zozname.</p><p>To sa hodí, pretože poradie filtrov "
+"určuje ich použitie, v ktorom sú aplikované na správy: najvyššie umiestnený "
+"filter je vyskúšaný prvý.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknutím na toto tlačidlo premenujete aktuálne vybraný filter.</p>"
-"<p>Filtre majú mená automatické, ak začínajú \"&lt;\".</p>"
-"<p>Ak ste náhodou premenovali filter a chcete znovu automatické mená, kliknite "
-"na toto tlačidlo a vyberte <em>Vyčistiť</em> a potom <em>OK</em> "
-"v zobrazenom dialógu.</p></qt>"
+"<qt><p>Kliknutím na toto tlačidlo premenujete aktuálne vybraný filter.</"
+"p><p>Filtre majú mená automatické, ak začínajú \"&lt;\".</p><p>Ak ste "
+"náhodou premenovali filter a chcete znovu automatické mená, kliknite na toto "
+"tlačidlo a vyberte <em>Vyčistiť</em> a potom <em>OK</em> v zobrazenom "
+"dialógu.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Touto voľbou vynútite zobrazenie dialógu pre potvrdenie.</p>"
-"<p>To sa hodí, ak máte definované pravidlá, ktoré označujú správy pre neskoršie "
+"<qt><p>Touto voľbou vynútite zobrazenie dialógu pre potvrdenie.</p><p>To sa "
+"hodí, ak máte definované pravidlá, ktoré označujú správy pre neskoršie "
 "stiahnutie. Bez možnosti vynútiť si potvrdenie by tieto správy neboli nikdy "
 "stiahnuté, ak na serveri nečakajú žiadne iné veľké správy alebo ak chcete "
 "zmeniť pravidlá pre označovanie správ.</p></qt>"
@@ -7265,6 +7086,16 @@ msgstr "Pravidlá filtra POP3"
 msgid "Filter Rules"
 msgstr "Pravidlá filtra"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importovať"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importovať"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Filtre k dispozícii"
@@ -7346,6 +7177,11 @@ msgstr "Dodatočne pridať tento filter do panelu nástrojov"
 msgid "Icon for this filter:"
 msgstr "Ikona pre tento filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Pre"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Hore"
@@ -7354,16 +7190,29 @@ msgstr "Hore"
 msgid "Down"
 msgstr "Dole"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Premenovať..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nový"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "S&kopírovať do"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Zmazané"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7372,8 +7221,8 @@ msgstr "Vybrať skratku pre priečinok"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Prinajmenšom cielové priečinky jedného filtra sú na online IMAP účte. Takéto "
 "filtre budú aplikované len pri manuálnom filtrovaní a pri filtrovaní "
@@ -7384,8 +7233,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Tieto filtre sa nepodarilo uložiť, pretože sú neplatné (napr. neobsahujú žiadne "
-"akcie alebo pravidlá pre hľadanie)."
+"Tieto filtre sa nepodarilo uložiť, pretože sú neplatné (napr. neobsahujú "
+"žiadne akcie alebo pravidlá pre hľadanie)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7456,29 +7305,25 @@ msgstr "Riešenie problémov s vyrovnávacou pamäťou pre IMAP"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Riešenie problémov s vyrovnávacou pamäťou pre IMAP.</b></p>"
-"<p>Ak máte problémy so synchronizáciou priečinku IMAP, mali by ste najprv "
-"skúsiť znovu vytvoriť súbor s indexom. To chvíľu potrvá, ale nespôsobí to "
-"žiadne problémy.</p>"
-"<p>Ak to nestačí, môžete skúsiť aktualizovať vyrovnávaciu pamäť IMAP. Tým ale "
-"stratíte všetky zmeny, ktoré ste v tomto priečinku alebo v jeho podpriečinkoch "
-"urobili.</p>"
+"<p><b>Riešenie problémov s vyrovnávacou pamäťou pre IMAP.</b></p><p>Ak máte "
+"problémy so synchronizáciou priečinku IMAP, mali by ste najprv skúsiť znovu "
+"vytvoriť súbor s indexom. To chvíľu potrvá, ale nespôsobí to žiadne problémy."
+"</p><p>Ak to nestačí, môžete skúsiť aktualizovať vyrovnávaciu pamäť IMAP. "
+"Tým ale stratíte všetky zmeny, ktoré ste v tomto priečinku alebo v jeho "
+"podpriečinkoch urobili.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7514,8 +7359,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "UID vyrovnávací súbor pre priečinok %1 sa nedá zapísať. Môže byť problém so "
 "systémovými právami k súboru."
@@ -7558,11 +7403,11 @@ msgstr "Index pre tento priečinok bol znovu vytvorený."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Priečinok %1 nie je v počiatočnom stave synchronizácie (stav je %2). Chcete ho "
-"vrátiť do tohto stavu a pokračovať v synchronizácii?"
+"Priečinok %1 nie je v počiatočnom stave synchronizácie (stav je %2). Chcete "
+"ho vrátiť do tohto stavu a pokračovať v synchronizácii?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7668,8 +7513,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Vaše prístupové práva ku priečinku <b>%1</b> boli obmedzené, už nebude viac "
-"možné pridávať správy do tohoto priečinku.</p>"
+"<p>Vaše prístupové práva ku priečinku <b>%1</b> boli obmedzené, už nebude "
+"viac možné pridávať správy do tohoto priečinku.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7690,15 +7535,11 @@ msgstr "Vytváram podpriečinky na serveri"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pošta na serveri v priečinku <b>%1</b> bola ostránená. Chcete ju odstrániť "
-"aj lokálne? "
-"<br>UID: %2</p></qt>"
+"<qt><p>Pošta na serveri v priečinku <b>%1</b> bola ostránená. Chcete ju "
+"odstrániť aj lokálne? <br>UID: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7719,13 +7560,11 @@ msgstr "Získavam priečinky pre priestor mien %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Vyzerá to, že priečinok <b>%1</b> bol ostránený. Chcete ho odstrániť zo "
-"serveru?</p></qt>"
+"<qt><p>Vyzerá to, že priečinok <b>%1</b> bol ostránený. Chcete ho odstrániť "
+"zo serveru?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7733,16 +7572,16 @@ msgstr "Prerušené"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP server %1 nemá podporu pre IMAP anotácie. XML ukladanie sa na tomto "
 "serveri nedá použiť, prosím nastavte KMail inak."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP server %1 nemá podporu pre IMAP anotácie. XML ukladanie sa na tomto "
 "serveri nedá použiť, prosím nastavte KMail inak"
@@ -7758,16 +7597,16 @@ msgstr "stratené a nájdené"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>V priečinku <b>%1</b> sa nachádzajú nové správy, ktoré zatiaľ neboli poslané "
-"na server, ale zdá sa, že nemáte teraz dostatočné práva na to aby ste to "
-"urobili. "
-"<p>Všetky správy sa preto presunú do <b>%2</b>, aby sa zabránilo strate dát.</p>"
+"<p>V priečinku <b>%1</b> sa nachádzajú nové správy, ktoré zatiaľ neboli "
+"poslané na server, ale zdá sa, že nemáte teraz dostatočné práva na to aby "
+"ste to urobili. <p>Všetky správy sa preto presunú do <b>%2</b>, aby sa "
+"zabránilo strate dát.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7776,20 +7615,25 @@ msgstr "Nedostatočné prístupové práva"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 "<p>V tomto (%1) priečinku sa nachádzajú nové správy, ktoré zatiaľ neboli "
-"poslané na server, ale zdá sa, že nemáte teraz dostatočné práva na to aby ste "
-"to urobili. Prosím kontaktujte správcu, aby Vám umožnil poslanie nových správ "
-"alebo ich premiestnenie mimo tento priečinok.</p> "
-"<p>Chcete teraz premiestniť tieto správy do iného priečinku?</p>"
+"poslané na server, ale zdá sa, že nemáte teraz dostatočné práva na to aby "
+"ste to urobili. Prosím kontaktujte správcu, aby Vám umožnil poslanie nových "
+"správ alebo ich premiestnenie mimo tento priečinok.</p> <p>Chcete teraz "
+"premiestniť tieto správy do iného priečinku?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Presunúť do:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Nepremiestniť"
 
@@ -7801,8 +7645,7 @@ msgstr "Premiestniť správy do priečinku"
 msgid "Permissions (ACL)"
 msgstr "Práva (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Všeobecné"
@@ -7826,8 +7669,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Použiť vlastné &ikony"
@@ -7846,23 +7688,22 @@ msgstr "Vykonať na novú/neprečítanú poštu v tomto priečinku"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ak je táto možnosť povolená budete upozornený na novú/neprečítanú poštu v "
-"tomto priečinku. Dokonca prechod na ďaľší/predchádzajúci priečinok s "
-"neprečítanými správami sa zastaví v tomto priečinku.</p>"
-"<p>Odznačte túto možnosť ak nechcete byť upozornený na novú/neprečítanú poštu v "
-"tomto priečinku a ak chcete, aby tento priečinok bol preskočený pri prechode do "
-"ďaľšieho/predchádzajúceho priečinku s neprečítanými správami. Toto je užitočné "
-"pre ignorovanie novej/neprečítanej pošty v koši a v spamovom priečinku.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Ak je táto možnosť povolená budete upozornený na novú/neprečítanú "
+"poštu v tomto priečinku. Dokonca prechod na ďaľší/predchádzajúci priečinok s "
+"neprečítanými správami sa zastaví v tomto priečinku.</p><p>Odznačte túto "
+"možnosť ak nechcete byť upozornený na novú/neprečítanú poštu v tomto "
+"priečinku a ak chcete, aby tento priečinok bol preskočený pri prechode do "
+"ďaľšieho/predchádzajúceho priečinku s neprečítanými správami. Toto je "
+"užitočné pre ignorovanie novej/neprečítanej pošty v koši a v spamovom "
+"priečinku.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7874,12 +7715,13 @@ msgstr "Nechať odpovede v tomto priečinku"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Zapnite túto voľbu, ak chcete vaše odpovede na správy v tomto priečinku "
-"umiestniť po poslaní do tohto priečinku a nie do priečinku pre odoslanú poštu."
+"umiestniť po poslaní do tohto priečinku a nie do priečinku pre odoslanú "
+"poštu."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7889,17 +7731,21 @@ msgstr "Zobraziť stĺpec Odosielateľ/Príjemca v zozname správ"
 msgid "Sho&w column:"
 msgstr "&Zobraziť stĺpec:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Nastaviť štandard"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Príjemca"
@@ -7910,17 +7756,17 @@ msgstr "Identita odo&sielateľa:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Zvoľte identitu odosielateľa, ktorá sa použije pri písaní novej správy alebo "
-"pri odpovede na poštu v tomto priečinku. Toto znamená, že ak ste v niektorom z "
-"pracovných priečinkov, KMail automaticky použije zodpovedajúcu poštovú adresu, "
-"podpis a podpisové alebo šifrovacie kľúče. Identity sa dajú nastaviť v hlavnom "
-"konfiguračnom dialógu. (Nastavenia -> Konfigurovať KMail)"
+"pri odpovede na poštu v tomto priečinku. Toto znamená, že ak ste v niektorom "
+"z pracovných priečinkov, KMail automaticky použije zodpovedajúcu poštovú "
+"adresu, podpis a podpisové alebo šifrovacie kľúče. Identity sa dajú nastaviť "
+"v hlavnom konfiguračnom dialógu. (Nastavenia -> Konfigurovať KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7938,21 +7784,21 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Toto nastavenie definuje, ktorý používatelia zdieľajúci tento priečinok majú "
-"dostať \"obsadený\" čas v ich zozname a mali by vidieť alarm pre udalosti alebo "
-"úlohy v tomto priečinku. Nastavenie sa aplikuje len pre priečinky kalendára a "
-"úloh (len pre alarmy).\n"
+"dostať \"obsadený\" čas v ich zozname a mali by vidieť alarm pre udalosti "
+"alebo úlohy v tomto priečinku. Nastavenie sa aplikuje len pre priečinky "
+"kalendára a úloh (len pre alarmy).\n"
 "\n"
-"Príklad použitia: ak šéf zdieľa priečinok so svojou sekretárkou, iba šéf by mal "
-"byť označený ako obsadený pre jeho stretnutia, takže si musí zvoliť \"Správca "
-"\", kedže sekretárka nemá na priečinok správcovské práva.\n"
+"Príklad použitia: ak šéf zdieľa priečinok so svojou sekretárkou, iba šéf by "
+"mal byť označený ako obsadený pre jeho stretnutia, takže si musí zvoliť "
+"\"Správca \", kedže sekretárka nemá na priečinok správcovské práva.\n"
 "Na druhú stranu ak pracovná skupina zdieľa kalendár pre skupinové porady, "
 "všetci čitatelia priečinku by mali byť označený ako obsadený.\n"
 "Celopodnikové priečinky s nepovinnými udalosťami by mali používať \"Nikto\", "
@@ -7987,23 +7833,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr ""
-"Nastavili ste, že tento priečinok obsahuje informácie o pracovných skupinách a "
-"že chcete skryť priečinky pre pracovné skupiny. To znamená, že tento priečinok "
-"zmizne po zatvorení dialógu pre nastavenie. Ak budete chcieť priečinok "
-"odstrániť, budete musieť dočasne vypnúť skrytie priečinkov pre pracovné "
-"skupiny."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"Nastavili ste, že tento priečinok obsahuje informácie o pracovných skupinách "
+"a že chcete skryť priečinky pre pracovné skupiny. To znamená, že tento "
+"priečinok zmizne po zatvorení dialógu pre nastavenie. Ak budete chcieť "
+"priečinok odstrániť, budete musieť dočasne vypnúť skrytie priečinkov pre "
+"pracovné skupiny."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8072,7 +7918,8 @@ msgstr "Chyba pri získavaní informácií o priečinku."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Poštový index pre '%1' je z neznámej verzie KMail (%2).\n"
 "Tento index je možné znovu vygenerovať z vášho poštového priečinku, ale "
@@ -8102,8 +7949,8 @@ msgstr "Chyba pri otváraní %1. Tento priečinok chýba."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Chyba pri otváraní %1. Buď to nie je platný priečinok typu maildir, alebo "
 "nemáte dostatočné práva pre prácu s ním."
@@ -8137,8 +7984,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"Váš priečinok pre posielané správy obsahuje správy, ktoré asi neboli vytvorené "
-"v KMail.\n"
+"Váš priečinok pre posielané správy obsahuje správy, ktoré asi neboli "
+"vytvorené v KMail.\n"
 "Prosím, odstráňte ich odtiaľ, ak nechcete, aby ich KMail poslal."
 
 #: kmfoldermbox.cpp:112
@@ -8151,21 +7998,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Index priečinku '%2' asi nie je aktuálny. Aby sa zabránilo poškodeniu správ, "
-"index sa vytvorí znovu. Môže sa stať, že už zmazané správy sa znovu objavia a "
-"že sa stratia niektoré príznaky.</p>"
-"<p>Prosím, prečítajte si odpovedajúcu časť <a href=\"%1\">"
-"kapitoly FAQ v manuáli KMail</a>, kde sa dozviete, ako zabrániť tomuto problému "
-"v budúcnosti.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Index priečinku '%2' asi nie je aktuálny. Aby sa zabránilo poškodeniu "
+"správ, index sa vytvorí znovu. Môže sa stať, že už zmazané správy sa znovu "
+"objavia a že sa stratia niektoré príznaky.</p><p>Prosím, prečítajte si "
+"odpovedajúcu časť <a href=\"%1\">kapitoly FAQ v manuáli KMail</a>, kde sa "
+"dozviete, ako zabrániť tomuto problému v budúcnosti.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8227,7 +8070,7 @@ msgstr ""
 "'%1' asi nie je priečinok.\n"
 "Prosím, odstráňte tento súbor."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8235,7 +8078,7 @@ msgstr ""
 "Práva pre priečinok '%1' nie sú správne.\n"
 "Overte, prosím, že môžete zobraziť a upravovať obsah tohto priečinku."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8245,8 +8088,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8254,7 +8097,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Nemôžem vytvoriť priečinok"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8354,9 +8197,9 @@ msgstr "&Riešiť problémy s vyrovnávacou pamäťou pre IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Nedá sa vytvoriť priečinok <b>%1</b> z dôvodu nedostatočných práv na "
 "serveri. Ak si nyslíte, že by ste mali byť schopný podpriečinok vytvoriť, "
@@ -8377,8 +8220,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Priečinok <b>%1</b> sa nedá presunúť alebo kopírovať, pretože už existuje "
-"priečinok s daným menom.</qt>"
+"<qt>Priečinok <b>%1</b> sa nedá presunúť alebo kopírovať, pretože už "
+"existuje priečinok s daným menom.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -8392,8 +8235,8 @@ msgstr ""
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Priečinok <b>%1</b> sa nedá presunúť alebo kopírovať do podpriečinku v ňom "
-"samotnom.</qt>"
+"<qt>Priečinok <b>%1</b> sa nedá presunúť alebo kopírovať do podpriečinku v "
+"ňom samotnom.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8503,17 +8346,17 @@ msgstr "Priečinok %1 je iba pre čítanie."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Naozaj chcete odstrániť %n vybranú správu?"
-"<br>Keď bude odstránená, nie je možné ju už obnoviť.</qt>\n"
-"<qt>Naozaj chcete odstrániť %n vybrané správy?"
-"<br>Keď budú odstránené, nie je možné ich už obnoviť.</qt>\n"
-"<qt>Naozaj chcete odstrániť %n vybraných správ?"
-"<br>Keď budú odstránené, nie je možné ich už obnoviť.</qt>"
+"<qt>Naozaj chcete odstrániť %n vybranú správu?<br>Keď bude odstránená, nie "
+"je možné ju už obnoviť.</qt>\n"
+"<qt>Naozaj chcete odstrániť %n vybrané správy?<br>Keď budú odstránené, nie "
+"je možné ich už obnoviť.</qt>\n"
+"<qt>Naozaj chcete odstrániť %n vybraných správ?<br>Keď budú odstránené, nie "
+"je možné ich už obnoviť.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8565,135 +8408,133 @@ msgstr ""
 "Nepodarilo sa zmeniť %1\n"
 "(Nedostatok miesta na disku?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Požiadavka na podpis certifikátu"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Prosím, vytvorte certifikát z prílohy a pošlite ho naspäť odosielateľovi."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail je nastavený offline, všetky sieťové úlohy sú odložené"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail je nastavený online, všetky sieťové úlohy sú obnovené"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail je aktuálne v offline móde. Ako chcete pokračovať?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Pracovať online"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Pracovať offline"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 "Nemáte prístupové práva pre čítanie/zápis pre váš priečinok novej pošty."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "odchádzajúca pošta"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "Nemáte prístupové práva pre čítanie/zápis pre váš priečinok odoslanej pošty."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "poslaná-pošta"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Nemáte prístupové práva pre čítanie/zápis pre váš priečinok odoslanej pošty."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "kôš"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nemáte prístupové práva pre čítanie/zápis pre váš priečinok koša."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "návrhy"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nemáte prístupové práva pre čítanie/zápis pre váš priečinok návrhov."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "šablóny"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nemáte prístupové práva pre čítanie/zápis pre priečinok so šablónami."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Posledné hľadanie"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Priečinok <i>%4</i> existuje. %1 teraz používa priečinok <i>%5</i> "
-"pre svoje správy."
-"<p>%2 môže presunúť obsah <i>%6<i> do tohoto priečinku, hoci to môže prepísať "
-"existujúce súbory s rovnakým menom v <i>%7</i>."
+"<qt>Priečinok <i>%4</i> existuje. %1 teraz používa priečinok <i>%5</i> pre "
+"svoje správy.<p>%2 môže presunúť obsah <i>%6<i> do tohoto priečinku, hoci to "
+"môže prepísať existujúce súbory s rovnakým menom v <i>%7</i>."
 "<p><strong>Chcete, aby %3 teraz premiestnil súbory pošty?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Priečinok <i>%4</i> existuje. %1 teraz používa priečinok <i>%5</i> "
-"pre svoje správy. %2 môže presunúť obsah <i>%6</i> do tohto priečinku."
+"<qt>Priečinok <i>%4</i> existuje. %1 teraz používa priečinok <i>%5</i> pre "
+"svoje správy. %2 môže presunúť obsah <i>%6</i> do tohto priečinku."
 "<p><strong>Chceli by ste aby %3 teraz presunul súbory pošty?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Migrovať súbory pošty?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail narazil na neopraviteľnú chybu a ukončí sa."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8704,11 +8545,11 @@ msgstr ""
 "Chyba:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Vyprázdniť kôš"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Naozaj chcete vyprázdniť priečinok koša pre všetky účty?"
 
@@ -8784,8 +8625,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Prišla nová správa</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8823,8 +8663,8 @@ msgstr "Naozaj chcete vyprázdniť priečinok koša?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Naozaj chcete presunúť všetky správy z priečinku <b>%1</b> do koša?</qt>"
 
@@ -8850,11 +8690,11 @@ msgstr "Zmazať hľadanie"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Ste si istý, že chcete zmazať hľadanie <b>%1</b>? "
-"<br>Zobrazené správy budú dostupné v ich pôvodnom priečinku.</qt>"
+"<qt>Ste si istý, že chcete zmazať hľadanie <b>%1</b>? <br>Zobrazené správy "
+"budú dostupné v ich pôvodnom priečinku.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8866,40 +8706,41 @@ msgstr "<qt>Naozaj chcete odstrániť prázdny priečinok <b>%1</b>?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ste si istý, že chcete odstrániť prázdny priečinok <b>%1</b> "
-"aj s jeho podpriečinkami? Tieto podpriečinky nemusia byť prázdne a ich obsah sa "
-"tým zahodí. "
-"<p><b>Berte na vedomie</b>, že odstránené správy sa neuložia v priečinku koša a "
-"budú natrvalo zmazané.</qt>"
+"<qt>Ste si istý, že chcete odstrániť prázdny priečinok <b>%1</b> aj s jeho "
+"podpriečinkami? Tieto podpriečinky nemusia byť prázdne a ich obsah sa tým "
+"zahodí. <p><b>Berte na vedomie</b>, že odstránené správy sa neuložia v "
+"priečinku koša a budú natrvalo zmazané.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Ste si istý, že chcete odstrániť priečinok <b>%1</b> aj s jeho obsahom? "
-"<p><b>Berte na vedomie</b>, že odstránené správy sa neuložia v priečinku koša a "
-"budú natrvalo zmazané.</qt>"
+"<p><b>Berte na vedomie</b>, že odstránené správy sa neuložia v priečinku "
+"koša a budú natrvalo zmazané.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ste si istý, že chcete odstrániť priečinok <b>%1</b> "
-"aj s jeho podpriečinkami, a tým zrušiť ich obsah? "
-"<p><b>Berte na vedomie</b>, že odstránené správy sa neuložia v piečinku koša a "
-"budú natrvalo zmazané.</qt>"
+"<qt>Ste si istý, že chcete odstrániť priečinok <b>%1</b> aj s jeho "
+"podpriečinkami, a tým zrušiť ich obsah? <p><b>Berte na vedomie</b>, že "
+"odstránené správy sa neuložia v piečinku koša a budú natrvalo zmazané.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Zmazané"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8915,9 +8756,9 @@ msgstr "Naozaj chcete zrušiť platnosť všetkých starých správ?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Použitie HTML v pošte Vás robí zraniteľnejším voči \"spamu\" a zvyšuje "
 "pravdepodobnosť, že Váš systém bude napadnutý z hľadiska bezpečnosti."
@@ -8933,11 +8774,12 @@ msgstr "Použiť HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Načítanie externých odkazov v html pošte Vás robí zraniteľnejším voči \"spamu\" "
-"a zvyšuje pravdepodobnosť, že Váš systém bude napadnutý z hľadiska bezpečnosti."
+"Načítanie externých odkazov v html pošte Vás robí zraniteľnejším voči \"spamu"
+"\" a zvyšuje pravdepodobnosť, že Váš systém bude napadnutý z hľadiska "
+"bezpečnosti."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8953,12 +8795,12 @@ msgstr "Filter na Mailing-List %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Funkcia \"Odpovede Mimo kancelárie\" vyžaduje filtrovanie na serveri. Ešte ste "
-"nenastavili váš IMAP server.\n"
+"Funkcia \"Odpovede Mimo kancelárie\" vyžaduje filtrovanie na serveri. Ešte "
+"ste nenastavili váš IMAP server.\n"
 "Je to možné v nastavení účtu IMAP v karte \"Filtrovanie\"."
 
 #: kmmainwidget.cpp:1743
@@ -8974,7 +8816,8 @@ msgstr "Nemôžem spustiť správcu certifikátov. Prosím overte si inštaláci
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Nemôžem spustiť prehliadač záznamu GnuPG. Prosím, skontrolujte si inštaláciu."
 
@@ -9298,8 +9141,7 @@ msgstr "&Uložiť prílohy..."
 msgid "Appl&y All Filters"
 msgstr "&Použiť všetky filtre"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Použiť filter"
@@ -9413,7 +9255,6 @@ msgstr "Nasled&ujúca neprečítaná správa"
 msgid "Go to the next unread message"
 msgstr "Prejsť na nasledujúcu neprečítanú správu"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Pre&dchádzajúca správa"
@@ -9461,8 +9302,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Posúvať sa dole v aktuálnej správe. Po dosiahnutí konca správy, presunúť sa na "
-"ďalšiu neprečítanú správu."
+"Posúvať sa dole v aktuálnej správe. Po dosiahnutí konca správy, presunúť sa "
+"na ďalšiu neprečítanú správu."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9554,8 +9395,8 @@ msgstr "Inicializujem..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9565,22 +9406,22 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Táto správa obsahuje požiadavku na potvrdenie prijatia.\n"
 "Obsahuje procesnú inštrukciu onzačenú ako \"vyžadovaná\", ktorú ale KMail "
 "nepozná.\n"
-"Požiadavku môžete ignorovať alebo nechať KMail, aby poslal odpoveď "
-"\"zlyhanie\"."
+"Požiadavku môžete ignorovať alebo nechať KMail, aby poslal odpoveď \"zlyhanie"
+"\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9592,8 +9433,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9605,8 +9446,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9635,24 +9476,24 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Hlavička \"Disposition-Notification-Options\" obsahuje požadovaný, ale neznámy "
-"parameter"
+"Hlavička \"Disposition-Notification-Options\" obsahuje požadovaný, ale "
+"neznámy parameter"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Prijaté: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Príloha: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Zobraziť prílohy ako boli navrhované odosielateľom."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9702,44 +9543,36 @@ msgstr "Vlastnosti súčastí správy"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Typ MIME</em> súboru:</p>"
-"<p>Normálne toto nastavenie nemusíte meniť, pretože typ súboru sa kontroluje "
-"automaticky. Ale niekedy %1 nemusí určiť typ súboru správne. Toto je miesto, "
-"kde to môžete napraviť.</p></qt>"
+"<qt><p><em>Typ MIME</em> súboru:</p><p>Normálne toto nastavenie nemusíte "
+"meniť, pretože typ súboru sa kontroluje automaticky. Ale niekedy %1 nemusí "
+"určiť typ súboru správne. Toto je miesto, kde to môžete napraviť.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Veľkosť časti:</p>"
-"<p>Niekedy %1 poskytne iba odhad veľkosti, pretože počítanie presnej hodnoty by "
-"trvalo príliš dlho. V tom prípade pridá text \"(odh.)\".</p></qt>"
+"<qt><p>Veľkosť časti:</p><p>Niekedy %1 poskytne iba odhad veľkosti, pretože "
+"počítanie presnej hodnoty by trvalo príliš dlho. V tom prípade pridá text "
+"\"(odh.)\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Meno súboru časti:</p>"
-"<p>Aj keď je ako štandardná hodnota meno priloženého súboru, neurčuje jeho "
-"meno. Iba navrhuje vhodné meno súboru poštovému klientovi adresáta pri ukladaní "
-"tejto časti na disk.</p></qt>"
+"<qt><p>Meno súboru časti:</p><p>Aj keď je ako štandardná hodnota meno "
+"priloženého súboru, neurčuje jeho meno. Iba navrhuje vhodné meno súboru "
+"poštovému klientovi adresáta pri ukladaní tejto časti na disk.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9747,17 +9580,14 @@ msgstr "&Popis:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Popis časti:</p>"
-"<p>Toto je iba neformálna informácia o časti, podobná predmetu celej správy. "
-"Väčšina poštových klientov zobrazí túto informáciu v náhľade správy vedľa ikony "
-"prílohy.</p></qt>"
+"<qt><p>Popis časti:</p><p>Toto je iba neformálna informácia o časti, podobná "
+"predmetu celej správy. Väčšina poštových klientov zobrazí túto informáciu v "
+"náhľade správy vedľa ikony prílohy.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9765,22 +9595,20 @@ msgstr "&Kódovanie:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kódovanie pri prenose tejto časti:</p>"
-"<p>Normálne toto nemusíte meniť, pretože %1 použije rozumné štandardné "
-"kódovanie v závislosti na type MIME. Niekedy je ale možné výrazne zmenšiť "
-"veľkosť správy, napríklad ak súbor PostScript neobsahuje binárne dáta, iba "
-"čistý text. V tom prípade voľbou \"quoted-printable\" namiesto štandardného "
-"\"base64\" ušetríte až 25% výslednej veľkosti správy.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Kódovanie pri prenose tejto časti:</p><p>Normálne toto nemusíte "
+"meniť, pretože %1 použije rozumné štandardné kódovanie v závislosti na type "
+"MIME. Niekedy je ale možné výrazne zmenšiť veľkosť správy, napríklad ak "
+"súbor PostScript neobsahuje binárne dáta, iba čistý text. V tom prípade "
+"voľbou \"quoted-printable\" namiesto štandardného \"base64\" ušetríte až 25% "
+"výslednej veľkosti správy.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9788,20 +9616,16 @@ msgstr "Navrhnúť &automatické zobrazenie"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Zapnutím tejto voľby bude adresátovi automaticky zobrazená táto časť v texte "
-"namiesto iba ikony.</p>"
-"<p>Technicky to znamená, že táto časť bude mať nastavenú hlavičku <em>"
-"Content-Disposition</em> na \"inline\"namiesto štandardného \"attachment\".</p>"
-"</qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Zapnutím tejto voľby bude adresátovi automaticky zobrazená táto časť "
+"v texte namiesto iba ikony.</p><p>Technicky to znamená, že táto časť bude "
+"mať nastavenú hlavičku <em>Content-Disposition</em> na \"inline\"namiesto "
+"štandardného \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9809,14 +9633,12 @@ msgstr "&Podpísať túto časť"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zapnutím tejto voľby podpíšete túto časť správy.</p>"
-"<p>Podpis bude vytvorený kľúčom asociovaným s aktuálnou identitou.</p></qt>"
+"<qt><p>Zapnutím tejto voľby podpíšete túto časť správy.</p><p>Podpis bude "
+"vytvorený kľúčom asociovaným s aktuálnou identitou.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9824,13 +9646,11 @@ msgstr "Zaši&frovať túto časť"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zapnite túto voľbu, ak chcete aby bola táto časť správy zašifrovaná.</p>"
-"<p>Časť bude zašifrovaná pre adresátov tejto správy.</p></qt>"
+"<qt><p>Zapnite túto voľbu, ak chcete aby bola táto časť správy zašifrovaná.</"
+"p><p>Časť bude zašifrovaná pre adresátov tejto správy.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9844,16 +9664,13 @@ msgstr "POP filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Nájdené správy pre filtrovanie pre účet POP: <b>%1</b> "
-"<p>Zobrazené správy presahujú hranicu veľkosti, ktorú ste pre tento účet "
-"definovali."
-"<br>Môžete si vybrať, čo chcete urobiť, pomocou odpovedajúcej voľby."
+"Nájdené správy pre filtrovanie pre účet POP: <b>%1</b> <p>Zobrazené správy "
+"presahujú hranicu veľkosti, ktorú ste pre tento účet definovali.<br>Môžete "
+"si vybrať, čo chcete urobiť, pomocou odpovedajúcej voľby."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10107,40 +9924,39 @@ msgstr "Poštový klient pre K Desktop Environment."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Získava sa obsah priečinku</h2>"
-"<p>Prosím čakajte . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Získava sa obsah priečinku</h2><p>Prosím "
+"čakajte . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail je momentálne v offline móde. Kliknite <a href=\"kmail:goOnline\">"
-"sem</a> pre prechod na online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail je momentálne v offline "
+"móde. Kliknite <a href=\"kmail:goOnline\">sem</a> pre prechod na online . . ."
+"</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10148,13 +9964,12 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Víta vás KMail %1</h2>"
-"<p>KMail je poštový klient pre K Desktop Environment. Je navrhnutý tak, aby bol "
-"úplne kompatibilný s internetovými štandardami vrátane MIME, SMTP, POP3 a "
-"IMAP.</p>\n"
-"<ul>"
-"<li>KMail má veľa užitočných funkcií, ktoré sú popísané v <a href=\"%2\">"
-"dokumentácii</a></li>\n"
+"<h2 style='margin-top: 0px;'>Víta vás KMail %1</h2><p>KMail je poštový "
+"klient pre K Desktop Environment. Je navrhnutý tak, aby bol úplne "
+"kompatibilný s internetovými štandardami vrátane MIME, SMTP, POP3 a IMAP.</"
+"p>\n"
+"<ul><li>KMail má veľa užitočných funkcií, ktoré sú popísané v <a href="
+"\"%2\">dokumentácii</a></li>\n"
 "<li><a href=\"%3\">Domovská stránka KMail</a> obsahuje informácie o nových "
 "verziách programu KMail.</li></ul>\n"
 "%8\n"
@@ -10168,30 +9983,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp;&nbsp; KMail tím</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Prosím, nájdite si chvíľu a vyplňte konfiguračný panel KMail v "
-"Nastavenie-&gt;Nastavenie.\n"
-"Musíte minimálne vytvoriť primárnu identitu a účet pre prijímanie a posielanie "
-"pošty</p>\n"
+"<p>Prosím, nájdite si chvíľu a vyplňte konfiguračný panel KMail v Nastavenie-"
+"&gt;Nastavenie.\n"
+"Musíte minimálne vytvoriť primárnu identitu a účet pre prijímanie a "
+"posielanie pošty</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Dôležité zmeny</span> "
-"(v porovnaní s KMail %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Dôležité zmeny</span> (v "
+"porovnaní s KMail %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10222,7 +10035,8 @@ msgstr "Zobraziť prílohu: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Príloha obsahuje binárne dáta. Skúšam zobraziť prvý %n znak.]\n"
@@ -10251,12 +10065,14 @@ msgstr "Otvoriť prílohu?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10278,6 +10094,58 @@ msgstr "(odpovedá niektorým)"
 msgid "(match all of the following)"
 msgstr "(odpovedá všetkým)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Čítanie"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Staré"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Zmazané"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Odpovedané"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Poslané ďalej"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Pozdržané"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Odoslané"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Sledované"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorované"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Úloha"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Má prílohu"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10362,25 +10230,25 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Presun poslanej správy \"%1\" z \"odchádzajúca pošta\" do \"sent-mail\" sa "
 "nepodaril.\n"
-"Je možné, že nemáte dostatok miesta na disku alebo dostatočné práva pre zápis. "
-"Prosím, skúste vyriešiť tento problém a presunúť správu ručne."
+"Je možné, že nemáte dostatok miesta na disku alebo dostatočné práva pre "
+"zápis. Prosím, skúste vyriešiť tento problém a presunúť správu ručne."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Bez zadanej adresy odosielateľa nie je možné správy poslať.\n"
-"Prosím, zadajte pre identitu '%1' emailovú adresu v dialógu nastavenia a potom "
-"skúste túto akciu znovu."
+"Prosím, zadajte pre identitu '%1' emailovú adresu v dialógu nastavenia a "
+"potom skúste túto akciu znovu."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10406,8 +10274,8 @@ msgstr "Inicializujem odosielanie..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Zvolili ste poslanie všetkej pošty vo fronte použitím nešifrovaného prenosu, "
 "naozaj chcete pokračovať?"
@@ -10434,8 +10302,9 @@ msgstr "Nepodarilo sa odoslať (niektoré) pozdržané správy."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10454,20 +10323,16 @@ msgstr "Poslanie prerušené."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Odoslanie zlyhalo:</p>"
-"<p>%1</p>"
-"<p>Správa zostane v priečinku 'odchádzajúca pošta' buď kým neodstránite problém "
-"(napr. nesprávna adresa), alebo ju z neho odstráňte.</p>"
-"<p>Bol použitý tento prenosový protokol: %2</p>"
-"<p>Chcete pokračovať v posielaní ostatných správ?</p>"
+"<p>Odoslanie zlyhalo:</p><p>%1</p><p>Správa zostane v priečinku "
+"'odchádzajúca pošta' buď kým neodstránite problém (napr. nesprávna adresa), "
+"alebo ju z neho odstráňte.</p><p>Bol použitý tento prenosový protokol: %2</"
+"p><p>Chcete pokračovať v posielaní ostatných správ?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10485,8 +10350,9 @@ msgstr "&Zrušiť posielanie"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10534,36 +10400,37 @@ msgstr "Musíte uviesť meno a heslo pre prístup k tomuto serveru SMTP."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 už asi beží na inom displeji tohto počítača. Spustenie %2 viac ako raz môže "
-"spôsobiť stratu pošty. Nemali by ste %1 spustiť, ak viete, že už beží."
+"%1 už asi beží na inom displeji tohto počítača. Spustenie %2 viac ako raz "
+"môže spôsobiť stratu pošty. Nemali by ste %1 spustiť, ak viete, že už beží."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 už asi beží na inom displeji tohto počítača. Spustenie %1 a %2 viac ako raz "
-"môže spôsobiť stratu pošty. Nemali by ste %2 spustiť, ak viete, že %1 už beží."
+"%1 už asi beží na inom displeji tohto počítača. Spustenie %1 a %2 viac ako "
+"raz môže spôsobiť stratu pošty. Nemali by ste %2 spustiť, ak viete, že %1 už "
+"beží."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 už asi beží na %2. Spustenie %1 viac ako raz môže spôsobiť stratu pošty. "
 "Nemali by ste %1 spustiť, ak viete, že už beží na %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 už asi beží na %3. Spustenie %1 a %2 viac ako raz môže spôsobiť stratu "
 "pošty. Nemali by ste %2 spustiť, ak viete, že %1 už beží na %3."
@@ -10577,6 +10444,10 @@ msgstr "Spustiť %1"
 msgid "Exit"
 msgstr "Koniec"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nové správy v"
@@ -10604,15 +10475,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEWallet nie je k dispozícii. Je silne odporúčané použiť TDEWallet pre správu "
-"hesiel.\n"
-"Napriek tomu, KMail môže ukladať heslo v konfiguračnom súbore. Heslo sa ukladá "
-"v kódovanom stave, ale nemali by ste ho považovať za zabezpečené v prípade, že "
-"sa niekto ku konfiguračnému súboru dostane.\n"
+"TDEWallet nie je k dispozícii. Je silne odporúčané použiť TDEWallet pre "
+"správu hesiel.\n"
+"Napriek tomu, KMail môže ukladať heslo v konfiguračnom súbore. Heslo sa "
+"ukladá v kódovanom stave, ale nemali by ste ho považovať za zabezpečené v "
+"prípade, že sa niekto ku konfiguračnému súboru dostane.\n"
 "Chcete uložiť heslo pre účet '%1' v konfiguračnom súbore?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10681,8 +10553,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Príkaz spúšťaný lokálne pred posielaním pošty. Môžete ho použiť napríklad pre "
-"nastavenie tunelov ssh. Ak sa žiadny príkaz spúšťať nemá, nechajte pole "
+"Príkaz spúšťaný lokálne pred posielaním pošty. Môžete ho použiť napríklad "
+"pre nastavenie tunelov ssh. Ak sa žiadny príkaz spúšťať nemá, nechajte pole "
 "prázdne."
 
 #: kmtransport.cpp:427
@@ -10691,11 +10563,11 @@ msgstr "Server &vyžaduje prihlásenie"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Zapnite túto voľbu ak váš SMTP server vyžaduje overenie pre prijatím pošty. To "
-"je známe ako 'Overený SMTP' alebo v skratke ASMTP."
+"Zapnite túto voľbu ak váš SMTP server vyžaduje overenie pre prijatím pošty. "
+"To je známe ako 'Overený SMTP' alebo v skratke ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10715,15 +10587,14 @@ msgstr "Posielať &iného hostiteľa serveru"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Zapnutím tejto voľby bude KMail používať iné meno hostiteľa pri posielaní "
 "svojej identifikácie poštovému serveru.\n"
-"<p>Hodí sa to v prípade, že nie je možné správne nastaviť meno vášho hostiteľa "
-"alebo ak potrebujete pravé meno skryť."
+"<p>Hodí sa to v prípade, že nie je možné správne nastaviť meno vášho "
+"hostiteľa alebo ak potrebujete pravé meno skryť."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10733,7 +10604,8 @@ msgstr "H&ostiteľ:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Zadajte hostiteľa, ktorého má KMail používať pre svoju identifikáciu u serveru."
+"Zadajte hostiteľa, ktorého má KMail používať pre svoju identifikáciu u "
+"serveru."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10753,8 +10625,8 @@ msgstr "Povolené sú iba lokálne súbory."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Meno počítača nemôže byť prázdne. Prosím zadajte meno alebo IP adresu SMTP "
 "serveru."
@@ -10769,10 +10641,10 @@ msgstr "Chyba pri výpise priečinku %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Lokálne odhlásenie sa z priečinkov odstrániť všetky informácie, ktoré sú "
 "lokálne prístupné pre tieto priečinky. Priečinky sa nezmenia na serveri. "
@@ -10848,8 +10720,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail nedokázal určiť konferenciu pre tento priečinok. Prosím, zadajte adresy "
-"ručne."
+"KMail nedokázal určiť konferenciu pre tento priečinok. Prosím, zadajte "
+"adresy ručne."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10998,35 +10870,27 @@ msgstr "&Upraviť správu"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Štrukturovacie informácie vrátené Crypto plug-inom nebolo možne správne "
-"spracovať; plug-in môže byť poškodený.</p>"
-"<p>Prosím kontaktujte administrátora vašeho systému.</p></qt>"
+"<qt><p>Štrukturovacie informácie vrátené Crypto plug-inom nebolo možne "
+"správne spracovať; plug-in môže byť poškodený.</p><p>Prosím kontaktujte "
+"administrátora vašeho systému.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Nepodarilo sa nájsť žiadny aktívny šifrovací modul a zabudovaná podpora "
-"OpenPGP nefunguje správne.</p>"
-"<p>Môžete urobiť dve veci:</p>"
-"<ul> "
-"<li><em>buď</em> aktivovať modul pomocou 'Nastavenia->Nastaviť KMail->"
-"Modul'</li>"
-"<li><em>alebo</em> zadať nastavenie pre OpenPGP v časti 'Identita->"
-"Pokročilé'.</li></ul>"
+"OpenPGP nefunguje správne.</p><p>Môžete urobiť dve veci:</p><ul> "
+"<li><em>buď</em> aktivovať modul pomocou 'Nastavenia->Nastaviť KMail-"
+">Modul'</li><li><em>alebo</em> zadať nastavenie pre OpenPGP v časti "
+"'Identita->Pokročilé'.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11038,10 +10902,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Podpora Chiasmus neposkytuje funkciu \"x-encrypt\". Prosím nahláste túto chybu."
+"Podpora Chiasmus neposkytuje funkciu \"x-encrypt\". Prosím nahláste túto "
+"chybu."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11057,20 +10922,20 @@ msgstr "Chyba Chiasmus šifrovania"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Neočákavaná návratová hodnota z podpory Chiasmus: Funkcia \"x-encrypt\" "
 "nevrátila pole bajtov. Prosím nahláste túto chybu."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"Formát vloženej šifrovanej správy OpenPGP nepodporuje šifrovanie alebo podpis "
-"príloh.\n"
+"Formát vloženej šifrovanej správy OpenPGP nepodporuje šifrovanie alebo "
+"podpis príloh.\n"
 "Naozaj chcete použiť tento zastaralý formát OpenPGP?"
 
 #: messagecomposer.cpp:640
@@ -11140,7 +11005,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Niektoré časti tejto správy nebudú podpísané.\n"
-"Posielanie čiastočne podpísaných správ môže porušovať politiku zabezpečenia.\n"
+"Posielanie čiastočne podpísaných správ môže porušovať politiku "
+"zabezpečenia.\n"
 "Chcete všetky časti podpísať?"
 
 #: messagecomposer.cpp:827
@@ -11179,12 +11045,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Kontrolou nastavenia šifrovania pre príjemcov sa zistilo, že má byť potvrdené "
-"šifrovanie tejto správy.\n"
+"Kontrolou nastavenia šifrovania pre príjemcov sa zistilo, že má byť "
+"potvrdené šifrovanie tejto správy.\n"
 "Chcete túto správu zašifrovať?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11217,8 +11083,9 @@ msgstr "&Nešifrovať"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Požadujete zašifrovanie tejto správy, aj kópie sebe. Ale pre túto identitu "
 "nemáte nastavené dôveryhodné kľúče pre šifrovanie."
@@ -11230,13 +11097,13 @@ msgstr "Poslať nešifrované?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Niektoré časti tejto správy nebudú zašifrované.\n"
-"Posielanie čiastočne nešifrovaných správ môže porušovať politiku zabezpečenia "
-"alebo spôsobiť únik citlivých informácií.\n"
+"Posielanie čiastočne nešifrovaných správ môže porušovať politiku "
+"zabezpečenia alebo spôsobiť únik citlivých informácií.\n"
 "Chcete zašifrovať všetky časti?"
 
 #: messagecomposer.cpp:950
@@ -11259,89 +11126,86 @@ msgstr "&Zašifrovať všetky časti"
 msgid "Unencrypted Message Warning"
 msgstr "Varovanie o nezašifrovanej správe"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Chyba: nástroj nevrátil žiadne zašifrované dáta.</p>"
-"<p>Prosím ohláste túto chybu:"
-"<br>%2</p></qt>"
+"<qt><p>Chyba: nástroj nevrátil žiadne zašifrované dáta.</p><p>Prosím ohláste "
+"túto chybu:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Niektoré znaky neodpovedajú vybranému kódovaniu."
-"<br>"
-"<br>Poslať správu aj napriek tomu?</qt>"
+"<qt>Niektoré znaky neodpovedajú vybranému kódovaniu.<br><br>Poslať správu aj "
+"napriek tomu?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Niektoré znaky budú stratené"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Zahodiť znaky"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Zmeniť kódovanie"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Túto správu nie je možné podpísať, pretože vybraný nástroj asi nepodporuje "
-"podpisy. To by sa v skutočnosti nemalo nikdy stať. Prosím, oznámte túto chybu."
+"podpisy. To by sa v skutočnosti nemalo nikdy stať. Prosím, oznámte túto "
+"chybu."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Túto správu nie je možné podpísať, pretože vybraný nástroj asi nepodporuje "
-"podpisy. To by sa v skutočnosti nemalo nikdy stať. Prosím, oznámte túto chybu."
+"podpisy. To by sa v skutočnosti nemalo nikdy stať. Prosím, oznámte túto "
+"chybu."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "Podpísanie zlyhalo. Prosím presvedčte sa, že program gpg-agent beží."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Túto správu nie je možné zašifrovať, pretože vybraný nástroj asi nepodporuje "
 "kombinovaný šifrovanie. To by sa v skutočnosti nemalo nikdy stať. Prosím, "
 "oznámte túto chybu."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
-"Túto správu nie je možné podpísať ani zašifrovať, pretože vybraný nástroj asi "
-"nepodporuje kombinovaný podpis a šifrovanie. To by sa v skutočnosti nemalo "
-"nikdy stať. Prosím, oznámte túto chybu."
+"Túto správu nie je možné podpísať ani zašifrovať, pretože vybraný nástroj "
+"asi nepodporuje kombinovaný podpis a šifrovanie. To by sa v skutočnosti "
+"nemalo nikdy stať. Prosím, oznámte túto chybu."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11362,15 +11226,15 @@ msgstr "&Formát poštovej schránky:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Zvoľte či chcete ukladať správy v tomto priečinku ako jeden súbor pre jednu "
-"správu (maildir) alebo ako jeden veľký súbor (mbox). KMail používa štandardne "
-"maildir a zmena je potrebná len v zriedkavých prípadoch. Ak si nie ste istý, "
-"nechajte túto možnosť tak ako je."
+"správu (maildir) alebo ako jeden veľký súbor (mbox). KMail používa "
+"štandardne maildir a zmena je potrebná len v zriedkavých prípadoch. Ak si "
+"nie ste istý, nechajte túto možnosť tak ako je."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11379,12 +11243,12 @@ msgstr "&Obsah priečinku:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Zvoľte či chcete, aby nový priečinok bol použitý na ukladanie správ alebo na "
-"ukladanie položiek groupware ako sú úlohy a poznámky. Štandardom sú správy. Ak "
-"si nie ste istý, nechajte túto možnosť tak ako je."
+"ukladanie položiek groupware ako sú úlohy a poznámky. Štandardom sú správy. "
+"Ak si nie ste istý, nechajte túto možnosť tak ako je."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11422,8 +11286,7 @@ msgstr "Rôzne výsledky pre podpisy"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Šifrovací nástroj nevrátil žiadne dešifrované dáta."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stav:"
 
@@ -11452,8 +11315,8 @@ msgstr "Nenájdený modul %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 "Správa je podpísaná, ale platnosť podpisu nie je možné overiť.<br />Dôvod: %1"
 
@@ -11491,27 +11354,27 @@ msgstr "Šifrovací modul \"%1\" nemôže dešifrovať správy."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Poznámka:</b> Táto HTML správa môže obsahovať externé odkazy na obrázky a "
 "pod. Z bezpečnostných dôvodov sa externé odkazy nenačítajú. Ak dôverujete "
-"odosielateľovi tejto správy tak môžete externé odkazy načítať <a "
-"href=\"kmail:loadExternal\">kliknutím sem</a>."
+"odosielateľovi tejto správy tak môžete externé odkazy načítať <a href="
+"\"kmail:loadExternal\">kliknutím sem</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Poznámka:</b> Toto je HTML správa. Z bezpečnostných dôvodov je zobrazený "
 "čistý HTML kód. Ak dôverujete odosielateľovi tejto správy tak aktivujte "
-"formátované HTML zobrazenie pre túto správu kliknutím <a "
-"href=\"kmail:showHTML\">na tento odkaz</a>."
+"formátované HTML zobrazenie pre túto správu kliknutím <a href=\"kmail:"
+"showHTML\">na tento odkaz</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11772,8 +11635,8 @@ msgstr "uložené:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "V %1, ktorý sa používa pre podpis, nie je uložená žiadna e-mailová adresa, "
 "preto nie je čo porovnať s adresou odosielateľa %2."
@@ -11891,10 +11754,11 @@ msgstr "Chybová správa Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "POP3 server (účet: %1) nepodporuje príkaz UIDL. Tento príkaz je nutný pre "
 "určenie bezpečného spôsobu, ktoré správy na serveri už KMail zobrazil.\n"
@@ -11920,7 +11784,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Sťahujem správu %1 z %2 (%3 z %4 KB) pre %5@%6 (%7 KB zostáva na serveri)."
 
@@ -11938,1872 +11803,15 @@ msgstr "Neplatná odpoveď zo serveru"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Ľutujem, váš server nepodporuje príkaz TOP. Preto nie je možné pre veľké správy "
-"stiahnuť iba ich hlavičku, pred ich samotným stiahnutím."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Choď"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "P&riečinok"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Správa"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Špeciálna odpoveď"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "P&oslať ďalej"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Panel nástrojov HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Podpis"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Automaticky &podpísať správy"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Ak je táto voľba povolená, všetky správy ktoré zašlete budú štandardne "
-"podpísané. Samozrejme, že je možné zakázať podpis pre každý správu osobitne."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Šifrovanie"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Ak je táto voľba zapnutá, správa/súbor bude zašifrovaný nielen verejným kľúčom "
-"adresáta, ale aj vašim kľúčom. To vám umožní správu/súbor neskôr dešifrovať. "
-"Obvykle je to dobrý nápad."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Zobraziť &podpísané/zašifrovaný text po vytvorení"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Ak je táto voľba zapnutá, podpísaný/zašifrovaný text sa zobrazí v samostatnom "
-"okne, takže sa môžete pozrieť, ako bude vyzerať predtým, než ho pošlete. To sa "
-"hodí, ak potrebujete skontrolovať, že systém šifrovania funguje."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "U&ložiť poslané správy šifrované"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Zaškrtnite pre ukladanie zašifrovaných správ"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Uložiť správy šifrované</h1>\n"
-"Ak je táto voľba zapnutá, poslané správy sa ukladajú šifrované tak, ako boli "
-"poslané. Nedoporučuje sa to, pretože nebudete môcť čítať správy v prípade, že "
-"potrebný certifikát stratí platnosť.\n"
-"<p>\n"
-"Je ale možné, že vaše miestne pravidlá vyžadujú zapnutie tejto voľby. Ak "
-"neviete, kontaktujte vášho administrátora.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Vždy požadovať &potvrdenie pre šifrovacie kľúče"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Ak je táto voľba zapnutá, aplikácia bude vždy zobrazovať zoznam verejných "
-"kľúčov, z ktorých si môžete vybrať ten, ktorým sa má šifrovať. Ak je toto "
-"vypnuté, aplikácia zobrazí dialóg iba v prípade, že nenájde správny kľúč alebo "
-"je možné použiť niekoľko z nich."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automaticky ši&frovať správy, ak je to možné"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Ak je táto voľba povolená, každá správa ktorú zašlete bude zašifrovaná vždy keď "
-"je šifrovanie možné a žiadúce. Samozrejme, že je možné vypnúť šifrovanie správ "
-"pre každú individuálne."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nikdy nepodpisovať/šifrovať pri ukladaní ako &návrhu"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Ako to funguje?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Pre: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Univerzálna"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Odpovedať"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Odpovedať všetkým"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Poslať ďalej"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Skrat&ka:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Typ šablóny:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Vlastnosti priečinku"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Priečinok obsahuje konferenciu"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "Zoznam &adries:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Normálne:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Neprečítané:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Platnosť správ"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Zrušiť platnosť p&o:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Zrušiť platnosť prečí&taných správ"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Zrušiť platnosť &po:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Zrušiť &platnosť starých správ"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dňa(í)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Týždeň(ou)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Mesiac(ov)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Pokročilé"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "&Identita odosielateľa:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Formát ukladania:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Zoznam zo&brazuje:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Kontrolvoať certifikáty pomocou CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Ak je táto voľba zapnutá, certifikáty S/MIME sa budú kontrolovať pomocou "
-"zoznamov zrušených certifikátov (CRL)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Kontrolovať certifikáty on-line (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Ak je táto voľba zapnutá, certifikáty S/MIME sú on-line skontrolované pomocou "
-"protokolu pre stav certifikátov (OCSP). Dole zadajte URL pre kontrolu pomocou "
-"OCSP."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "On-line kontrola certifikátu"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL pre OCSP odpovede:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Sem zadajte adresu serveru pre on-line kontrolu certifikátov (OCSP). URL "
-"obvykle začína http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Podpis odpovede OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorovať služobnú URL certifikátov"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Nekontrolovať politiky certifikátov"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Štandardne GnuPG používa súbor ~/.gnupg/policies.txt pre kontrolu, či je "
-"politika certifikátu povolená. Ak je voľba zapnutá, politiky sa nekontrolujú."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nikdy nekontrolovať CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ak je táto voľba zapnutá, zoznamy zrušených certifikátov sa nikdy nepoužívajú "
-"pre kontrolu certifikátov S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Zíksať chýbajúce certifikáty autorít"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Ak je táto voľba zapnutá, chýbajúce certifikáty sa získajú v prípade, že sú "
-"potrebné (to sa týka kontroly pomocou CRL aj OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP požiadavky"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Nevykonať žiadne HTTP požiadavky"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Celkovo zakázať použitie HTTP pre S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Použiť tento proxy pre HTTP požiadavky: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Použiť systémové HTTP proxy:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Ak je táto možnosť zvolená, hodnota HTTP proxy (pochádzajúca z premennej "
-"prostredia http_proxy) zobrazená vpravo sa použije pre HTTP požiadavky."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Zadajte umiestnenie HTTP proxy, ktoré bude použité pre všetky HTTP požiadavky v "
-"súvislosti s S/MIME. Syntax je počítač:port, napríklad proxy.niekde.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorovať HTTP CRL certifikačný distribučný bod"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Pri hľadaní miesta CRL, certifikát prichystaný na testovanie zvyčajne obsahuje "
-"takzvané položky \"CRL distribučný bod\" (DP), ktoré sú URL popisujúce spôsob "
-"ako pristúpiť na URL. Použije sa prvá nájdená položka. S touto možnosťou všetky "
-"položky používajúce HTTP schému sú igonorané pri hľadaní vhodnej DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP požiadavky"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Nevykonať žiadne LDAP požiadavky"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Celkovo zakázať použitie LDAP pre S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorovať LDAP CRL distribučný bod certifikátov"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Pri hľadaní miesta CRL, certifikát prichystaný na testovanie zvyčajne obsahuje "
-"takzvané položky \"CRL distribučný bod\" (DP), ktoré sú URL popisujúce spôsob "
-"ako pristúpiť na URL. Použije sa prvá nájdená položka. S touto možnosťou všetky "
-"položky používajúce LDAP schému sú igonorané pri hľadaní vhodnej DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primárny počítač pre LDAP požiadavky:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Zadanie LDAP servera spôsobí, že všetky LDAP požiadavky pôjdu najprv na tento "
-"server. Viac detailnejšie, toto nastavenie prepíše každý zadaný počítač a port "
-"v LDAP URL a bude tiež použitý ak počítač a port boli z URL vynechané. Iné LDAP "
-"serveri sa použijú len ak spojenie s \"proxy\" zlyhá.\n"
-"Syntax je \"POČÍTAČ\" alebo \"POČÍTAČ:PORT\". Ak PORT nie je zadaný, použije sa "
-"port 389 (štandardný LDAP port)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Pridať..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Pracovné skupiny"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Vrátiť nastavenie písma"
+"Ľutujem, váš server nepodporuje príkaz TOP. Preto nie je možné pre veľké "
+"správy stiahnuť iba ich hlavičku, pred ich samotným stiahnutím."
 
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "bez obmedzenia"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Nastavenie šablóny"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Odpovedať odosielateľovi"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Odpovedať všetkým / Odpovedať zoznamu"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Poslať správu ďalej"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Varovať pri pok&use o zaslanie nepodpísaných správ"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Zapnutím sa bude zobrazovať varovanie pri posielaní nepodpísaných správ."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať pri pokuse o zaslanie nepodpísaných správ</h1>\n"
-"Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že sa "
-"pokúšate poslať správu alebo jej časti nepodpísané.\n"
-"<p>\n"
-"Doporučuje sa nechať túto voľbu zapnutú pre dosiahnutie maximálnej integrity.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Varovať pri pokuse o zaslanie nešifrovaných správ"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Zapnutím sa bude zobrazovať varovanie ak budete posielať nezašifrované správy."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať pri pokuse o zaslanie nešifrovaných správ</h1>\n"
-"Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že sa "
-"pokúsite poslať časti alebo celú nezašifrovanú správu.\n"
-"<p>\n"
-"Doporučuje sa nechať túto voľbu zapnutú pre dosiahnutie maximálnej integrity.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Varovať, ak e-mailová adresa p&ríjemcu nie je v certifikáte"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Zapnutím sa zobrazí varovanie v prípade, že adresa nie je uložená v certifikáte"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať, ak e-mailová adresa príjemcu nie je v certifikáte</h1>\n"
-"Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že adresa "
-"príjemcu nie je uložená v certifikáte, ktorý sa používa pre šifrovanie.\n"
-"<p>\n"
-"Doporučuje sa nechať túto voľbu zapnutú pre dosiahnutie maximálnej integrity.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Varovať pred ukončením platnosti certifikátu alebo kľúča vopred (dole nastavte "
-"hranice pre varovania)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Pre podpis"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Pre šifrovanie"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dní"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Tu si vyberte počet dní"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať, ak podpisový certifikát vyprší</h1>\n"
-"Vyberte minimálny počet dní, po ktorom sa má zobraziť varovanie v prípade, že "
-"platnosť podpisového certifikátu čoskoro vyprší.\n"
-"<p>\n"
-"Doporučené nastavenie pre SPHINX je 14 dní.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať ak certifikát pre šifrovanie stratí platnosť</h1>\n"
-"Vyberte minimálny počet dní, ktoré ešte musí byť platný certifikát použitý pre "
-"šifrovanie. Inak sa zobrazí varovanie.\n"
-"<p>\n"
-"Doporučené nastavenie pre SPHINX je 14 dní.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať ak certifikát v reťazi stratí platnosť</h1>\n"
-"Vyberte minimálny počet dní, ktoré ešte musia byť všetky certifikáty reťaze "
-"platné. Inak sa zobrazí varovanie.\n"
-"<p>\n"
-"Doporučené nastavenie pre SPHINX je 14 dní.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať, ak certifikát certifikačnej autority vyprší</h1>\n"
-"Vyberte minimálny počet dní, po ktorom sa má zobraziť varovanie v prípade, že "
-"platnosť certifikátu certifikačnej autority čoskoro vyprší.\n"
-"<p>\n"
-"Doporučené nastavenie pre SPHINX je 14 dní.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varovať, ak koreňový certifikát vyprší</h1>\n"
-"Vyberte minimálny počet dní, po ktorom sa má zobraziť varovanie v prípade, že "
-"platnosť koreňového certifikátu čoskoro vyprší.\n"
-"<p>\n"
-"Doporučené nastavenie pre SPHINX je 14 dní.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Pre koreňové certifikáty:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Pre CA certifikáty medzičlánkov:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Pre koncové certifikáty/kľúče:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Znovu zapnúť varovania \"Už sa nepýtať\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Obsah šablóny"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Skratka šablóny"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Typ šablóny"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Poslať správy z frontu pri kontrole pošty"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Zapnutím tejto voľby bude KMail posielať všetky správy z priečinku "
-"odosielaných  správ pri ručnej alebo automatickej kontrole pošty, alebo či sa "
-"nemajú správy posielať automaticky nikdy.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Automaticky premiestniť nezosynchronizované správy z priečinkov s "
-"nedostatočnými prístupovými právami"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Ak sa v priečinku nachádzajú nové správy, ktoré zatiaľ neboli poslané na "
-"server, ale nemáte teraz dostatočné práva na to aby ste to urobili, potom sa "
-"tieto správy automaticky presunú do priečinku stratené a nájdené."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Toto nastavenie umožňuje správcom nastaviť minimálny odstup medzi dvoma "
-"kontrolami správ.\"\n"
-"\"Používateľ si nebude môcť zvoliť hodnotu menšiu ako je hodnota tu nastavená."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Naposledy vybraný priečinok v dialógu výberu priečinku."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Neberie na vedomie nastavenie umask používateľa a použije na miesto toho "
-"\"čítanie-zápis len pre používateľa\""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politika pre zobrazenie ikony v systémovej lište"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Hlasité upozornenie na novú poštu"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Ak je táto voľba zapnutá, pre každý priečinok je počet nových správ zobrazený "
-"pri upozornení na novú poštu. Inak sa zobrazí iba správa 'Prišla nová pošta'."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Zadajte editor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Použiť externý editor namiesto zabudovaného"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Povoliť funkcie pre pracovné skupiny"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Kódovať hlavičky From:/To: v odpovediach na pozvánky"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook obsahuje veľa obmedzení v implementácii štandardnu iCalendar. "
-"Táto voľba ich umožňuje obísť. Ak máte problémy s tím, že používatelia klienta "
-"Outlook nemôžu získať vaše odpovede, skúste zapnúť túto voľbu."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Posielať pozvania pre pracovné skupiny v tele správy"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook obsahuje veľa obmedzení v implementácii štandardnu iCalendar. "
-"Táto voľba ich umožňuje obísť. Ak máte problémy s tím, že používatelia klienta "
-"Outlook nemôžu získať vaše pozvania, skúste zapnúť túto voľbu."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Kompatibilné pomenovanie pozvánok s Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Ak je Microsoft Outlook používaný spolu s Microsoft Exchange serverom, tak má "
-"problém rozumieť štandartným skupinovým emailom. Zapnite túto možnosť pre "
-"posielanie skupinových pozvánok spôsobom, akým Microsoft Exchange rozumie."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Ak je zaškrtnuté, neuvidíte okno editora správy. Namiesto toho sa všetky "
-"pozvánky pošlú automaticky. Ak si chcete správu pozrieť pred jej poslaním, "
-"odškrtnite túto možnosť. Berte ale na vedomie, že text v editore správy bude v "
-"iCalendar syntaxe a nemali by ste sa pokúšať meniť ho ručne."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Povolením tejto voľby umožníte uložiť položky z aplikácií Kontact "
-"(KOrganizer, KAddressBook a KNotes).</p>"
-"<p>Ak túto voľbu chcete zapnúť, musíte nastaviť aj aplikácie, aby používali "
-"zdroj IMAP. To sa dá urobiť v Ovládacom centre TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Obvykle nie je dôvod pre zobrazenie priečinkov, ktoré obsahujú zdroje IMAP. "
-"Ale ak ich potrebujete vidieť, tu môžete zapnúť ich zobrazovanie.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Ak účet použitý na ukladanie groupware informácii \"\n"
-"          \"sa nepoužíva na organizovanie bežnej pošty, nastavte túto voľbu na "
-"vytvoriť iba KMail \"\n"
-"          \"zobrazuje jeho  groupware priečinky. Toto sa môže hodiť, ak pre "
-"bežnú poštu používate \"\n"
-"          \"dodatočný online IMAP účet.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Zvoľte formát ukladania groupware priečinkov. "
-"<ul>"
-"<li>Štandardný formát používa štandardy ical (pre priečinky kalendára) a vcard "
-"(pre priečinky adresára). Tento formát poskytuje dostupnosť pre všetky "
-"vlastnosti programu Kontact.</li>"
-"<li>Kolab XML formát používa vlastný model, ktorý je bližšie k tomu, ktorý je "
-"použitý v programe Outlook. Tento formát poskytuje lepšiu kompatibilitu s "
-"programom Outlook ak používate Kolab server alebo iné kompatibilné "
-"riešenie.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Toto vyberie rodičovský priečinok IMAP priečinkov pre zdroje.</p>"
-"<p>Štandardne server Kolab nastavuje ako rodiča IMAP inbox.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Toto je ID účtu obsahujúceho IMAP priečinky zdrojov.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Ak chcete nastaviť mená priečinkov IMAP vo vašom jazyku, môžete si vybrať z "
-"dostupných jazykov.</p>"
-"<p>Uvedomte si, že to má zmysel iba pre kompatibilitu s programom Microsoft "
-"Outlook. Obvykle to nie je dobrý nápad túto voľbu zapínať, pretože to zabráni "
-"zmene jazyka.</p>"
-"<p>Ak nemusíte, túto voľbu nezapínajte.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Táto hodnota sa používa pre určenie, či sa má zobraziť úvod do programu KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maximálny počet spojení s hostiteľom"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Toto je možné použiť pre obmedzenie počtu spojení s hostiteľom pri kontrole "
-"novej pošty. Štandardne je počet spojení bez obmedzenia (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Zobraziť pole rýchleho hľadania"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Táto voľba povolí alebo zakáže pole rýchleho hľadania nad zoznamom správ, "
-"pomocou ktorého môžete rýchlo nájsť informácie zobrazené v zozname správ."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Ponechať pôvodnú znakovú sadu pri odpovedi alebo preposielaní ďalej (ak je to "
-"možné)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Automaticky pripojiť podpis"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamätať si túto identitu, takže sa použije pri písaní nových správ v "
-"budúcnosti.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamätať si tento priečinok pre odoslané položky, takže sa použije pri písaní "
-"nových správ v budúcnosti."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamätať si tento spôsobo prenosu pošty, takže sa použije pri písaní nových "
-"správ v budúcnosti."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamätať si túto identitu, takže sa použije pri písaní nových správ v "
-"budúcnosti.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Zalomenie slov v stĺpci:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Varovať, ak koreňový certifikát stratí p&latnosť skôr ako:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Zapnutím tejto voľby bude Outlook &#8482; podporovať mená príloh, aj keď "
-"obsahujú iné než anglické písmená"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "&Automaticky požadovať potvrdenia o prijatí a prečítaní"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Zapnite túto voľbu, ak chcete, aby KMail požadoval Upozornenia na Doručenie "
-"Správy (MDN) pre každú posielanú správu.</p>"
-"<p>Táto voľba sa používa pre nastavenie štandardného správania, požadovanie MDN "
-"môžete nastaviť aj pre jednotlivé správy položkou menu <em>Možnosti</em>-><em>"
-"Požadovať potvrdenie o doručení</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Použiť nedávne adresy pre autoamtické dopĺnanie"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Zakážte túto možnosť ak nechcete, aby sa nedávne adresy objavili v zozname pre "
-"automatické dopĺnanie v políčku adresy prijímateľa."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Interval pre automatické ukladanie:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Text v editore správ je možné pravidelne zálohovať. Tu sa nastavuje interval, "
-"ako často sa má záloha vytvárať. Automatické zálohovanie vypnete nastavením "
-"hodnoty 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Na&hradiť rozoznanú predponu s \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Nahradiť rozoznanú predponu s \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Použiť inteligentnú citáciu"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Podpis stratil časovú platnosť."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Typ voľby adries prijímateľov"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Nastaví typ dialógu pre voľbu adries prijímateľov Pre,\n"
-"           CC a BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Typ editora prijímateľov"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Nastaví typ dialógu pre voľbu prijímateľov Pre,\n"
-"           CC a BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maximálny počet riadkov editora prijímateľov."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Ponechať pôvodnú znakovú sadu pri odpovedi alebo preposielaní ďalej (ak je to "
-"možné)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Niektoré emaily, špeciálne tie, ktoré sú generované automaticky, nemajú "
-"špecifikované kódovanie znakov, ktoré je potrebné pre ich správne zobrazenie. V "
-"týchto prípadoch sa použije záložné kódovanie, ktoré sa dá nastaviť tu. "
-"Nastavte kódovanie znakov, ktoré je najbežnejšie používané vo Vašej časti "
-"sveta. Ako štandard je použité kódovanie nastavené pre celý systém."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Zmena zo štandartného 'Automaticky' vynúti použitie špecifikovaného kódovania "
-"pre všetky emaily, bez ohľadu na to, čo majú špecifikované oni sami."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Povoľte toto ak chcete aby sa v texte správy namiesto smajlíkov ako napr. :-) "
-"zobrazili emotikony (malé obrázky)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Povoľte túto možnosť pre zobrazenie rôznych úrovní citovaného textu. Zakážte "
-"ju, ak chcete skryť úrovne citovaného textu."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Automatická úroveň zvinutia:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Zmenšiť veľkosť písma pre citovaný text"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Povoľte túto možnosť pre zobrazenie citovaného textu menším písmom."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "U&ložiť poslané správy šifrované"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Zobraziť údaj user agent v ozdobných hlavičkách"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Povoľte túto možnosť pre zobrazenie údajov User-Agent a X-Mailer v ozdobných "
-"hlavičkách."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Poslať požiadavku potvrdenia o doručení s nevyplneným odosielateľom."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Poslať požiadavku potvrdenia o doručení s prázdnymn reťazcom odosielateľa. "
-"Niektoré servre môžu byť nastavená tak, aby zamietli takéto správy, takže ak "
-"maté problémy s posielaním požiadaviek, odškrtnite túto možnosť."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Frázy boli skonvertované na šablóny"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Staré frázy boli skonvertované na šablóny"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Šablóna pre novú správu"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Šablóna pre odpoveď"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Šablóna pre odpoveď všetkým"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Šablóna pre poslať ďalej"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Znaky citácie"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 z %2 %3 použitých"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13915,6 +11923,11 @@ msgstr "Pridať ako CC"
 msgid "Add as BCC"
 msgstr "Pridať ako BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Zrušiť"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13930,17 +11943,17 @@ msgstr "Zvolený adresáti"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Zvolili ste 1 adresáta. Maximálny podporovaný počet adresátov je %1. Prosím "
 "zmente voľbu.\n"
-"Zvolili ste %n adresátov. Maximálny podporovaný počet adresátov je %1. Prosím "
-"zmente voľbu.\n"
-"Zvolili ste %n adresátov. Maximálny podporovaný počet adresátov je %1. Prosím "
-"zmente voľbu."
+"Zvolili ste %n adresátov. Maximálny podporovaný počet adresátov je %1. "
+"Prosím zmente voľbu.\n"
+"Zvolili ste %n adresátov. Maximálny podporovaný počet adresátov je %1. "
+"Prosím zmente voľbu."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13956,8 +11969,8 @@ msgstr "Použiť dialóg voľby adries"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Toto tlačidlo otvorí dialóg kde môžete zvoliť adresátov z dostupných adries."
 
@@ -14061,13 +12074,22 @@ msgstr "je väčšie alebo rovné"
 msgid " bytes"
 msgstr " bajtov"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dní"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Pre vykonanie hľadania je potrebné stiahnuť zo servera všetky správy priečinku "
-"%1. To môže chvíľu trvať. Chcete pokračovať v hľadaní?"
+"Pre vykonanie hľadania je potrebné stiahnuť zo servera všetky správy "
+"priečinku %1. To môže chvíľu trvať. Chcete pokračovať v hľadaní?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14220,16 +12242,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Zbierajú sa dáta pre účet '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Zbierajú sa dáta pre účet '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14248,10 +12266,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Obsah skriptu '%1'.\n"
+msgid "Contents of script '%1':\n"
+msgstr "Obsah skriptu '%1'.\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14274,20 +12290,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Schopnosti Sieve.\n"
+msgid "Sieve capabilities:\n"
+msgstr "Schopnosti Sieve.\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Nie sú dostupné žiadne špeciálne schopnosti)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Dostupné Sieve skripty.\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Dostupné Sieve skripty.\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14365,8 +12377,8 @@ msgstr "Použite toto poľe pre zadanie statického podpisu."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Tu môžete vybrať textový súbor, ktorý obsahuje váš podpis. Prečíta sa pri "
 "každom vytváraní novej správy alebo pri pridávaní nového podpisu."
@@ -14385,21 +12397,26 @@ msgstr "Otvorí zadaný súbor v textovom editore."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
-msgstr ""
-"Sem môžete zadať ľubovoľný príkaz, s cestou alebo bez, podľa toho, či je príkaz "
-"vo vašej premennej PATH. Pre každú novú správu KMail tento príkaz spustí a jeho "
-"(štandardný) výstup použije ako podpis. Obvyklé príkazy sú \"fortune\" alebo "
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
 "\"ksig -random\"."
+msgstr ""
+"Sem môžete zadať ľubovoľný príkaz, s cestou alebo bez, podľa toho, či je "
+"príkaz vo vašej premennej PATH. Pre každú novú správu KMail tento príkaz "
+"spustí a jeho (štandardný) výstup použije ako podpis. Obvyklé príkazy sú "
+"\"fortune\" alebo \"ksig -random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Zadajte &príkaz:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Cesta"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nová položka:"
@@ -14436,6 +12453,11 @@ msgstr "Pridať účet"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Naozaj chcete odstrániť identitu <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Použiť &pre:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14450,6 +12472,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Upraviť skript..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14489,9 +12515,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14528,6 +12554,16 @@ msgstr "Nepovoliť"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Nedá sa vložiť obsah zo súboru %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Pre: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14557,58 +12593,51 @@ msgstr "Nedá sa spustiť zreťazený príkaz zo šablóny: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu môžete vytvoriť šablóny správ, ktoré sa použijú pre vytvorenie novej "
-"správy, odpoveď alebo pre poslanie správy ďalej.</p>"
-"<p>Šablóny správ podporujú jednoduché nahrádzanie príkazov, stačí ich napísať "
-"alebo vybrať z menu <i>Vložiť príkaz</i>.</p>"
-"<p>Tu špecifikované šablóny sú len pre priečinok. Majú prednosť pred globálnymi "
-"šablónami a šablónami pre identitu.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tu môžete vytvoriť šablóny správ, ktoré sa použijú pre vytvorenie "
+"novej správy, odpoveď alebo pre poslanie správy ďalej.</p><p>Šablóny správ "
+"podporujú jednoduché nahrádzanie príkazov, stačí ich napísať alebo vybrať z "
+"menu <i>Vložiť príkaz</i>.</p><p>Tu špecifikované šablóny sú len pre "
+"priečinok. Majú prednosť pred globálnymi šablónami a šablónami pre identitu."
+"</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu môžete vytvoriť šablóny správ, ktoré sa použijú pre vytvorenie novej "
-"správy, odpoveď alebo pre poslanie správy ďalej.</p>"
-"<p>Šablóny správ podporujú jednoduché nahrádzanie príkazov, stačí ich napísať "
-"alebo vybrať z menu <i>Vložiť príkaz</i>.</p>"
-"<p>Tu špecifikované šablóny sú pre správu. Majú prednosť pred globálnymi "
-"šablónami ale nie pred šablónami pre priečinok.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tu môžete vytvoriť šablóny správ, ktoré sa použijú pre vytvorenie "
+"novej správy, odpoveď alebo pre poslanie správy ďalej.</p><p>Šablóny správ "
+"podporujú jednoduché nahrádzanie príkazov, stačí ich napísať alebo vybrať z "
+"menu <i>Vložiť príkaz</i>.</p><p>Tu špecifikované šablóny sú pre správu. "
+"Majú prednosť pred globálnymi šablónami ale nie pred šablónami pre priečinok."
+"</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Tu môžete vytvoriť šablóny správ, ktoré sa použijú pre vytvorenie novej "
-"správy, odpoveď alebo pre poslanie správy ďalej.</p>"
-"<p>Šablóny správ podporujú jednoduché nahrádzanie príkazov, stačí ich napísať "
-"alebo vybrať z menu <i>Vložiť príkaz</i>.</p>"
-"<p>Toto je globálna (štandardná) šablóna. Šablóny pre identitu a tiež šablóny "
-"pre priečinok majú pred ňou prednosť.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Tu môžete vytvoriť šablóny správ, ktoré sa použijú pre vytvorenie "
+"novej správy, odpoveď alebo pre poslanie správy ďalej.</p><p>Šablóny správ "
+"podporujú jednoduché nahrádzanie príkazov, stačí ich napísať alebo vybrať z "
+"menu <i>Vložiť príkaz</i>.</p><p>Toto je globálna (štandardná) šablóna. "
+"Šablóny pre identitu a tiež šablóny pre priečinok majú pred ňou prednosť.</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14860,6 +12889,10 @@ msgstr "Zreťaziť telo aktuálnej správy a vložiť výsledok tak ako je"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Zreťaziť telo aktuálnej správy a nahradiť výsledkom"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Nastaviť pozíciu kurzora"
@@ -14892,114 +12925,6 @@ msgstr "Zapnúť ladenie"
 msgid "Turn Debug Off"
 msgstr "Vypnúť ladenie"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...že môžete na nasledujúcu alebo predchádzajúcu správu\n"
-"prejsť pomocou šipiek vľavo a vpravo?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...že môžete rýchlo vytvoriť filtre pre odosielateľa, adresáta,\n"
-"predmet a distribučný zoznam pomocou <em>Nástroje-&gt;Vytvoriť&nbsp;filter</em>"
-"?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...že sa môžete zbaviť &quot;[mena konferencie]&quot;\n"
-"pridávaného automaticky na začiatok predmetu v niektorých\n"
-"konferenciách pomocou akcie filtra <em>prepísať hlavičku</em>?\n"
-"Jednoducho použite "
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...že môžete asociovať distribučné zoznamy s priečinkami v dialógu\n"
-"<em>Priečinok-&gt;Správa distribučných zoznamov</em>? Potom môžete používať\n"
-"<em>Správa-&gt;Nová&nbsp;správa&nbsp;do&nbsp;distrubučného&nbsp;zoznamu...</em>"
-"\n"
-" a otvorí sa okno pre písanie správy s prednastavenou adresou distribučného "
-"zoznamu.\n"
-"Alebo môžete v priečinku kliknúť stredným tlačidlom myši.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...že môžete priradiť vlastné ikony jednotlivým priečinkom?\n"
-"Nájdete ich v <em>Priečinok-&gt;Vlastnosti...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...že KMail dokáže zobraziť farebný pruh pre označenie typu správy\n"
-"(čistý text/HTML/OpenPGP), ktorá je momentálne zobrazená?</p>\n"
-"<p>Tým zabránite pokusom o predstieranie úspešného overenia podpisu\n"
-"poslaním správy v HTML, ktorá sa podobá rámcom stavu podpisu v KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...že môžete filtrovať pomocou ľubovoľnej hlavičky jednoduchým\n"
-"zadaním jej mena do prvého textového poľa v pravidle hľadania?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...že môžete filtrovať správy obsahujúce iba HTML pomocou pravidla\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...že pri odpovedi sa cituje iba označená časť textu správy?</p>\n"
-"<p>Ak nie je označené nič, citovaná je správa celá.</p>\n"
-"<p>To dokonca funguje s textom príloh, ak ste zapli\n"
-"<em>Zobraziť-&gt;Prílohy-&gt;Vložené</em>.</p>\n"
-"<p>Táto funkcia je dostupná pri každej odpovedi okrem\n"
-"<em>Správa-&gt;Odpovedať bez citovania</em>.</p>\n"
-"<p align=\"right\"><em>dodal David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nie je čo vrátiť späť."
@@ -15067,6 +12992,15 @@ msgstr "Príloha č.%1 (bez mena)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Súbor s názvom \"%1\" už existuje. Prajete si ho prepísať?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Prepísať súbor?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15100,8 +13034,8 @@ msgid ""
 "Please contact you system administrator."
 msgstr ""
 "Váš server nevrátil \"vacation\" v zozname podporovaných rozšírení Sieve.\n"
-"Bez tejto podpory KMail nemôže nainštalovať za vás automatické odpovede \"Mimo "
-"kancelárie\".\n"
+"Bez tejto podpory KMail nemôže nainštalovať za vás automatické odpovede "
+"\"Mimo kancelárie\".\n"
 "Prosím, kontaktujte administrátora systému."
 
 #: vacation.cpp:622
@@ -15184,13 +13118,13 @@ msgstr "Po&slať obrázok s každou správou"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Zaškrtnite túto možnosť ak chcete aby KMail pridal takzvanú X-Face hlavičku do "
-"správ napísaných s touto identitou. X-Face je malý (48x48 bodov) čiernobiely "
-"obrázok, ktorý niektorý poštový klienti vedia zobraziť."
+"Zaškrtnite túto možnosť ak chcete aby KMail pridal takzvanú X-Face hlavičku "
+"do správ napísaných s touto identitou. X-Face je malý (48x48 bodov) "
+"čiernobiely obrázok, ktorý niektorý poštový klienti vedia zobraziť."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15218,12 +13152,13 @@ msgstr "Vybrať súbor..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Použite toto pre voľbu súboru s obrázkom. Obrázok by mal byť vysokokontrastný a "
-"približne štvorcového tvaru. Svetlé pozadie výsledok zlepší."
+"Použite toto pre voľbu súboru s obrázkom. Obrázok by mal byť "
+"vysokokontrastný a približne štvorcového tvaru. Svetlé pozadie výsledok "
+"zlepší."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15231,16 +13166,17 @@ msgstr "Nastaviť z adresára"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
-"Môžete použiť zmenšenú verziu obrázku, ktorý máte nastavený v položke adresára."
+"Môžete použiť zmenšenú verziu obrázku, ktorý máte nastavený v položke "
+"adresára."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail môže poslať spolu so správou malý (48x48 bodov), nízkokvalitný, "
 "čiernobiely obrázok. Napríklad to môže byť Váš obrázok alebo glyph. Je "
@@ -15252,11 +13188,11 @@ msgstr "Použite toto poľe pre zadanie ľovoľného reťazca X-Face."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Príklady sú dostupné na <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Príklady sú dostupné na <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15271,128 +13207,1783 @@ msgstr "Žiadny obrázok"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Nemáte v adresári definovaný vlastný kontakt."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Podpis"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Automaticky &podpísať správy"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Ak je táto voľba povolená, všetky správy ktoré zašlete budú štandardne "
+"podpísané. Samozrejme, že je možné zakázať podpis pre každý správu osobitne."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Šifrovanie"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Nastaviť predmet správy"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Ak je táto voľba zapnutá, správa/súbor bude zašifrovaný nielen verejným "
+"kľúčom adresáta, ale aj vašim kľúčom. To vám umožní správu/súbor neskôr "
+"dešifrovať. Obvykle je to dobrý nápad."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Poslať kópiu: na 'adresa'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Zobraziť &podpísané/zašifrovaný text po vytvorení"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Poslať slepú kópiu: na 'adresa'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Ak je táto voľba zapnutá, podpísaný/zašifrovaný text sa zobrazí v "
+"samostatnom okne, takže sa môžete pozrieť, ako bude vyzerať predtým, než ho "
+"pošlete. To sa hodí, ak potrebujete skontrolovať, že systém šifrovania "
+"funguje."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Pridaj 'hlavička' do správy"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "U&ložiť poslané správy šifrované"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Prečítať telo správy zo súboru 'súbor'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Zaškrtnite pre ukladanie zašifrovaných správ"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Nastaviť text správy"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Uložiť správy šifrované</h1>\n"
+"Ak je táto voľba zapnutá, poslané správy sa ukladajú šifrované tak, ako boli "
+"poslané. Nedoporučuje sa to, pretože nebudete môcť čítať správy v prípade, "
+"že potrebný certifikát stratí platnosť.\n"
+"<p>\n"
+"Je ale možné, že vaše miestne pravidlá vyžadujú zapnutie tejto voľby. Ak "
+"neviete, kontaktujte vášho administrátora.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Pridať prílohy k správe. Toto môžete urobiť opakovane"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Vždy požadovať &potvrdenie pre šifrovacie kľúče"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Overiť len novú poštu"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Ak je táto voľba zapnutá, aplikácia bude vždy zobrazovať zoznam verejných "
+"kľúčov, z ktorých si môžete vybrať ten, ktorým sa má šifrovať. Ak je toto "
+"vypnuté, aplikácia zobrazí dialóg iba v prípade, že nenájde správny kľúč "
+"alebo je možné použiť niekoľko z nich."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Otvoriť len editor správ"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automaticky ši&frovať správy, ak je to možné"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Zobraziť zadaný súbor správy"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Ak je táto voľba povolená, každá správa ktorú zašlete bude zašifrovaná vždy "
+"keď je šifrovanie možné a žiadúce. Samozrejme, že je možné vypnúť šifrovanie "
+"správ pre každú individuálne."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Poslať správu na 'adresu' resp. priložiť súbor, kam ukazuje 'URL'"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nikdy nepodpisovať/šifrovať pri ukladaní ako &návrhu"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Čítanie"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Ako to funguje?"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Staré"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Univerzálna"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Zmazané"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Odpovedať"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Odpovedané"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Odpovedať všetkým"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Poslané ďalej"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Poslať ďalej"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Pozdržané"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Skrat&ka:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Odoslané"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Typ šablóny:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Sledované"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Obsah šablóny"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorované"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Skratka šablóny"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spam"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Typ šablóny"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Vlastnosti priečinku"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Úloha"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Priečinok obsahuje konferenciu"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Má prílohu"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "Zoznam &adries:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 z %2 %3 použitých"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Normálne:"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Cesta"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Neprečítané:"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Platnosť správ"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Zrušiť platnosť p&o:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Zrušiť platnosť prečí&taných správ"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Zrušiť platnosť &po:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Zrušiť &platnosť starých správ"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dňa(í)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Týždeň(ou)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Mesiac(ov)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "&Identita odosielateľa:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Formát ukladania:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Zoznam zo&brazuje:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Poslať správy z frontu pri kontrole pošty"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Súbor s názvom \"%1\" už existuje. Prajete si ho prepísať?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Zapnutím tejto voľby bude KMail posielať všetky správy z priečinku "
+"odosielaných  správ pri ručnej alebo automatickej kontrole pošty, alebo či "
+"sa nemajú správy posielať automaticky nikdy.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Prepísať súbor?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Automaticky premiestniť nezosynchronizované správy z priečinkov s "
+"nedostatočnými prístupovými právami"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Ak sa v priečinku nachádzajú nové správy, ktoré zatiaľ neboli poslané na "
+"server, ale nemáte teraz dostatočné práva na to aby ste to urobili, potom sa "
+"tieto správy automaticky presunú do priečinku stratené a nájdené."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Toto nastavenie umožňuje správcom nastaviť minimálny odstup medzi dvoma "
+"kontrolami správ.\"\n"
+"\"Používateľ si nebude môcť zvoliť hodnotu menšiu ako je hodnota tu "
+"nastavená."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Naposledy vybraný priečinok v dialógu výberu priečinku."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Neberie na vedomie nastavenie umask používateľa a použije na miesto toho "
+"\"čítanie-zápis len pre používateľa\""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politika pre zobrazenie ikony v systémovej lište"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Hlasité upozornenie na novú poštu"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Ak je táto voľba zapnutá, pre každý priečinok je počet nových správ "
+"zobrazený pri upozornení na novú poštu. Inak sa zobrazí iba správa 'Prišla "
+"nová pošta'."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Zadajte editor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Použiť externý editor namiesto zabudovaného"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Povoliť funkcie pre pracovné skupiny"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Kódovať hlavičky From:/To: v odpovediach na pozvánky"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook obsahuje veľa obmedzení v implementácii štandardnu "
+"iCalendar. Táto voľba ich umožňuje obísť. Ak máte problémy s tím, že "
+"používatelia klienta Outlook nemôžu získať vaše odpovede, skúste zapnúť túto "
+"voľbu."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Posielať pozvania pre pracovné skupiny v tele správy"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook obsahuje veľa obmedzení v implementácii štandardnu "
+"iCalendar. Táto voľba ich umožňuje obísť. Ak máte problémy s tím, že "
+"používatelia klienta Outlook nemôžu získať vaše pozvania, skúste zapnúť túto "
+"voľbu."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Kompatibilné pomenovanie pozvánok s Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Ak je Microsoft Outlook používaný spolu s Microsoft Exchange serverom, tak "
+"má problém rozumieť štandartným skupinovým emailom. Zapnite túto možnosť pre "
+"posielanie skupinových pozvánok spôsobom, akým Microsoft Exchange rozumie."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Ak je zaškrtnuté, neuvidíte okno editora správy. Namiesto toho sa všetky "
+"pozvánky pošlú automaticky. Ak si chcete správu pozrieť pred jej poslaním, "
+"odškrtnite túto možnosť. Berte ale na vedomie, že text v editore správy bude "
+"v iCalendar syntaxe a nemali by ste sa pokúšať meniť ho ručne."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Povolením tejto voľby umožníte uložiť položky z aplikácií Kontact "
+"(KOrganizer, KAddressBook a KNotes).</p><p>Ak túto voľbu chcete zapnúť, "
+"musíte nastaviť aj aplikácie, aby používali zdroj IMAP. To sa dá urobiť v "
+"Ovládacom centre TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Obvykle nie je dôvod pre zobrazenie priečinkov, ktoré obsahujú zdroje "
+"IMAP. Ale ak ich potrebujete vidieť, tu môžete zapnúť ich zobrazovanie.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Ak účet použitý na ukladanie groupware informácii \"\n"
+"          \"sa nepoužíva na organizovanie bežnej pošty, nastavte túto voľbu "
+"na vytvoriť iba KMail \"\n"
+"          \"zobrazuje jeho  groupware priečinky. Toto sa môže hodiť, ak pre "
+"bežnú poštu používate \"\n"
+"          \"dodatočný online IMAP účet.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Zvoľte formát ukladania groupware priečinkov. <ul><li>Štandardný formát "
+"používa štandardy ical (pre priečinky kalendára) a vcard (pre priečinky "
+"adresára). Tento formát poskytuje dostupnosť pre všetky vlastnosti programu "
+"Kontact.</li><li>Kolab XML formát používa vlastný model, ktorý je bližšie k "
+"tomu, ktorý je použitý v programe Outlook. Tento formát poskytuje lepšiu "
+"kompatibilitu s programom Outlook ak používate Kolab server alebo iné "
+"kompatibilné riešenie.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Toto vyberie rodičovský priečinok IMAP priečinkov pre zdroje.</"
+"p><p>Štandardne server Kolab nastavuje ako rodiča IMAP inbox.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Toto je ID účtu obsahujúceho IMAP priečinky zdrojov.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Ak chcete nastaviť mená priečinkov IMAP vo vašom jazyku, môžete si vybrať "
+"z dostupných jazykov.</p><p>Uvedomte si, že to má zmysel iba pre "
+"kompatibilitu s programom Microsoft Outlook. Obvykle to nie je dobrý nápad "
+"túto voľbu zapínať, pretože to zabráni zmene jazyka.</p><p>Ak nemusíte, túto "
+"voľbu nezapínajte.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Táto hodnota sa používa pre určenie, či sa má zobraziť úvod do programu "
+"KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maximálny počet spojení s hostiteľom"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Toto je možné použiť pre obmedzenie počtu spojení s hostiteľom pri kontrole "
+"novej pošty. Štandardne je počet spojení bez obmedzenia (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Zobraziť pole rýchleho hľadania"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Táto voľba povolí alebo zakáže pole rýchleho hľadania nad zoznamom správ, "
+"pomocou ktorého môžete rýchlo nájsť informácie zobrazené v zozname správ."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Ponechať pôvodnú znakovú sadu pri odpovedi alebo preposielaní ďalej (ak je "
+"to možné)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Automaticky pripojiť podpis"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamätať si túto identitu, takže sa použije pri písaní nových správ v "
+"budúcnosti.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Zapamätať si tento priečinok pre odoslané položky, takže sa použije pri "
+"písaní nových správ v budúcnosti."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Zapamätať si tento spôsobo prenosu pošty, takže sa použije pri písaní nových "
+"správ v budúcnosti."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamätať si túto identitu, takže sa použije pri písaní nových správ v "
+"budúcnosti.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Zalomenie slov v stĺpci:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Varovať, ak koreňový certifikát stratí p&latnosť skôr ako:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Zapnutím tejto voľby bude Outlook &#8482; podporovať mená príloh, aj keď "
+"obsahujú iné než anglické písmená"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "&Automaticky požadovať potvrdenia o prijatí a prečítaní"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Zapnite túto voľbu, ak chcete, aby KMail požadoval Upozornenia na "
+"Doručenie Správy (MDN) pre každú posielanú správu.</p><p>Táto voľba sa "
+"používa pre nastavenie štandardného správania, požadovanie MDN môžete "
+"nastaviť aj pre jednotlivé správy položkou menu <em>Možnosti</em>-"
+"><em>Požadovať potvrdenie o doručení</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Použiť nedávne adresy pre autoamtické dopĺnanie"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Zakážte túto možnosť ak nechcete, aby sa nedávne adresy objavili v zozname "
+"pre automatické dopĺnanie v políčku adresy prijímateľa."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Interval pre automatické ukladanie:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Text v editore správ je možné pravidelne zálohovať. Tu sa nastavuje "
+"interval, ako často sa má záloha vytvárať. Automatické zálohovanie vypnete "
+"nastavením hodnoty 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Na&hradiť rozoznanú predponu s \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Nahradiť rozoznanú predponu s \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Použiť inteligentnú citáciu"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Podpis stratil časovú platnosť."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Typ voľby adries prijímateľov"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Nastaví typ dialógu pre voľbu adries prijímateľov Pre,\n"
+"           CC a BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Typ editora prijímateľov"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Nastaví typ dialógu pre voľbu prijímateľov Pre,\n"
+"           CC a BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maximálny počet riadkov editora prijímateľov."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Ponechať pôvodnú znakovú sadu pri odpovedi alebo preposielaní ďalej (ak je "
+"to možné)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Niektoré emaily, špeciálne tie, ktoré sú generované automaticky, nemajú "
+"špecifikované kódovanie znakov, ktoré je potrebné pre ich správne "
+"zobrazenie. V týchto prípadoch sa použije záložné kódovanie, ktoré sa dá "
+"nastaviť tu. Nastavte kódovanie znakov, ktoré je najbežnejšie používané vo "
+"Vašej časti sveta. Ako štandard je použité kódovanie nastavené pre celý "
+"systém."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Zmena zo štandartného 'Automaticky' vynúti použitie špecifikovaného "
+"kódovania pre všetky emaily, bez ohľadu na to, čo majú špecifikované oni "
+"sami."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Povoľte toto ak chcete aby sa v texte správy namiesto smajlíkov ako "
+"napr. :-) zobrazili emotikony (malé obrázky)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Povoľte túto možnosť pre zobrazenie rôznych úrovní citovaného textu. Zakážte "
+"ju, ak chcete skryť úrovne citovaného textu."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Automatická úroveň zvinutia:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Zmenšiť veľkosť písma pre citovaný text"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Povoľte túto možnosť pre zobrazenie citovaného textu menším písmom."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "U&ložiť poslané správy šifrované"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Zobraziť údaj user agent v ozdobných hlavičkách"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Povoľte túto možnosť pre zobrazenie údajov User-Agent a X-Mailer v ozdobných "
+"hlavičkách."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Poslať požiadavku potvrdenia o doručení s nevyplneným odosielateľom."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Poslať požiadavku potvrdenia o doručení s prázdnymn reťazcom odosielateľa. "
+"Niektoré servre môžu byť nastavená tak, aby zamietli takéto správy, takže ak "
+"maté problémy s posielaním požiadaviek, odškrtnite túto možnosť."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Frázy boli skonvertované na šablóny"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Staré frázy boli skonvertované na šablóny"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Šablóna pre novú správu"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Šablóna pre odpoveď"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Šablóna pre odpoveď všetkým"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Šablóna pre poslať ďalej"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Znaky citácie"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Upraviť súbor"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Upraviť..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Choď"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "P&riečinok"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Správa"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Špeciálna odpoveď"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "P&oslať ďalej"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Vrátiť nastavenie písma"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Panel nástrojov HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Obvyklé možnosti"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Panel nástrojov HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Kontrolvoať certifikáty pomocou CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Ak je táto voľba zapnutá, certifikáty S/MIME sa budú kontrolovať pomocou "
+"zoznamov zrušených certifikátov (CRL)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Kontrolovať certifikáty on-line (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Ak je táto voľba zapnutá, certifikáty S/MIME sú on-line skontrolované "
+"pomocou protokolu pre stav certifikátov (OCSP). Dole zadajte URL pre "
+"kontrolu pomocou OCSP."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "On-line kontrola certifikátu"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL pre OCSP odpovede:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Sem zadajte adresu serveru pre on-line kontrolu certifikátov (OCSP). URL "
+"obvykle začína http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Podpis odpovede OCSP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorovať služobnú URL certifikátov"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Nekontrolovať politiky certifikátov"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Štandardne GnuPG používa súbor ~/.gnupg/policies.txt pre kontrolu, či je "
+"politika certifikátu povolená. Ak je voľba zapnutá, politiky sa nekontrolujú."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nikdy nekontrolovať CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ak je táto voľba zapnutá, zoznamy zrušených certifikátov sa nikdy "
+"nepoužívajú pre kontrolu certifikátov S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Zíksať chýbajúce certifikáty autorít"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Ak je táto voľba zapnutá, chýbajúce certifikáty sa získajú v prípade, že sú "
+"potrebné (to sa týka kontroly pomocou CRL aj OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP požiadavky"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Nevykonať žiadne HTTP požiadavky"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Celkovo zakázať použitie HTTP pre S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Použiť tento proxy pre HTTP požiadavky: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Použiť systémové HTTP proxy:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Ak je táto možnosť zvolená, hodnota HTTP proxy (pochádzajúca z premennej "
+"prostredia http_proxy) zobrazená vpravo sa použije pre HTTP požiadavky."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Zadajte umiestnenie HTTP proxy, ktoré bude použité pre všetky HTTP "
+"požiadavky v súvislosti s S/MIME. Syntax je počítač:port, napríklad proxy."
+"niekde.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorovať HTTP CRL certifikačný distribučný bod"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Pri hľadaní miesta CRL, certifikát prichystaný na testovanie zvyčajne "
+"obsahuje takzvané položky \"CRL distribučný bod\" (DP), ktoré sú URL "
+"popisujúce spôsob ako pristúpiť na URL. Použije sa prvá nájdená položka. S "
+"touto možnosťou všetky položky používajúce HTTP schému sú igonorané pri "
+"hľadaní vhodnej DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP požiadavky"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Nevykonať žiadne LDAP požiadavky"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Celkovo zakázať použitie LDAP pre S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorovať LDAP CRL distribučný bod certifikátov"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Pri hľadaní miesta CRL, certifikát prichystaný na testovanie zvyčajne "
+"obsahuje takzvané položky \"CRL distribučný bod\" (DP), ktoré sú URL "
+"popisujúce spôsob ako pristúpiť na URL. Použije sa prvá nájdená položka. S "
+"touto možnosťou všetky položky používajúce LDAP schému sú igonorané pri "
+"hľadaní vhodnej DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primárny počítač pre LDAP požiadavky:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Zadanie LDAP servera spôsobí, že všetky LDAP požiadavky pôjdu najprv na "
+"tento server. Viac detailnejšie, toto nastavenie prepíše každý zadaný "
+"počítač a port v LDAP URL a bude tiež použitý ak počítač a port boli z URL "
+"vynechané. Iné LDAP serveri sa použijú len ak spojenie s \"proxy\" zlyhá.\n"
+"Syntax je \"POČÍTAČ\" alebo \"POČÍTAČ:PORT\". Ak PORT nie je zadaný, použije "
+"sa port 389 (štandardný LDAP port)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Pridať..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Pracovné skupiny"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Vrátiť nastavenie písma"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "bez obmedzenia"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Nastavenie šablóny"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Odpovedať odosielateľovi"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Odpovedať všetkým / Odpovedať zoznamu"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Poslať správu ďalej"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Varovať pri pok&use o zaslanie nepodpísaných správ"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Zapnutím sa bude zobrazovať varovanie pri posielaní nepodpísaných správ."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať pri pokuse o zaslanie nepodpísaných správ</h1>\n"
+"Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že sa "
+"pokúšate poslať správu alebo jej časti nepodpísané.\n"
+"<p>\n"
+"Doporučuje sa nechať túto voľbu zapnutú pre dosiahnutie maximálnej "
+"integrity.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Varovať pri pokuse o zaslanie nešifrovaných správ"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Zapnutím sa bude zobrazovať varovanie ak budete posielať nezašifrované "
+"správy."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať pri pokuse o zaslanie nešifrovaných správ</h1>\n"
+"Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že sa "
+"pokúsite poslať časti alebo celú nezašifrovanú správu.\n"
+"<p>\n"
+"Doporučuje sa nechať túto voľbu zapnutú pre dosiahnutie maximálnej "
+"integrity.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Varovať, ak e-mailová adresa p&ríjemcu nie je v certifikáte"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Zapnutím sa zobrazí varovanie v prípade, že adresa nie je uložená v "
+"certifikáte"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať, ak e-mailová adresa príjemcu nie je v certifikáte</h1>\n"
+"Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že adresa "
+"príjemcu nie je uložená v certifikáte, ktorý sa používa pre šifrovanie.\n"
+"<p>\n"
+"Doporučuje sa nechať túto voľbu zapnutú pre dosiahnutie maximálnej "
+"integrity.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Varovať pred ukončením platnosti certifikátu alebo kľúča vopred (dole "
+"nastavte hranice pre varovania)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Pre podpis"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Pre šifrovanie"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Tu si vyberte počet dní"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať, ak podpisový certifikát vyprší</h1>\n"
+"Vyberte minimálny počet dní, po ktorom sa má zobraziť varovanie v prípade, "
+"že platnosť podpisového certifikátu čoskoro vyprší.\n"
+"<p>\n"
+"Doporučené nastavenie pre SPHINX je 14 dní.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať ak certifikát pre šifrovanie stratí platnosť</h1>\n"
+"Vyberte minimálny počet dní, ktoré ešte musí byť platný certifikát použitý "
+"pre šifrovanie. Inak sa zobrazí varovanie.\n"
+"<p>\n"
+"Doporučené nastavenie pre SPHINX je 14 dní.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať ak certifikát v reťazi stratí platnosť</h1>\n"
+"Vyberte minimálny počet dní, ktoré ešte musia byť všetky certifikáty reťaze "
+"platné. Inak sa zobrazí varovanie.\n"
+"<p>\n"
+"Doporučené nastavenie pre SPHINX je 14 dní.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať, ak certifikát certifikačnej autority vyprší</h1>\n"
+"Vyberte minimálny počet dní, po ktorom sa má zobraziť varovanie v prípade, "
+"že platnosť certifikátu certifikačnej autority čoskoro vyprší.\n"
+"<p>\n"
+"Doporučené nastavenie pre SPHINX je 14 dní.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varovať, ak koreňový certifikát vyprší</h1>\n"
+"Vyberte minimálny počet dní, po ktorom sa má zobraziť varovanie v prípade, "
+"že platnosť koreňového certifikátu čoskoro vyprší.\n"
+"<p>\n"
+"Doporučené nastavenie pre SPHINX je 14 dní.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Pre koreňové certifikáty:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Pre CA certifikáty medzičlánkov:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Pre koncové certifikáty/kľúče:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Znovu zapnúť varovania \"Už sa nepýtať\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...že môžete na nasledujúcu alebo predchádzajúcu správu\n"
+"prejsť pomocou šipiek vľavo a vpravo?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...že môžete rýchlo vytvoriť filtre pre odosielateľa, adresáta,\n"
+"predmet a distribučný zoznam pomocou <em>Nástroje-&gt;Vytvoriť&nbsp;filter</"
+"em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...že sa môžete zbaviť &quot;[mena konferencie]&quot;\n"
+"pridávaného automaticky na začiatok predmetu v niektorých\n"
+"konferenciách pomocou akcie filtra <em>prepísať hlavičku</em>?\n"
+"Jednoducho použite <pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...že môžete asociovať distribučné zoznamy s priečinkami v dialógu\n"
+"<em>Priečinok-&gt;Správa distribučných zoznamov</em>? Potom môžete používať\n"
+"<em>Správa-&gt;Nová&nbsp;správa&nbsp;do&nbsp;distrubučného&nbsp;zoznamu...</"
+"em>\n"
+" a otvorí sa okno pre písanie správy s prednastavenou adresou distribučného "
+"zoznamu.\n"
+"Alebo môžete v priečinku kliknúť stredným tlačidlom myši.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...že môžete priradiť vlastné ikony jednotlivým priečinkom?\n"
+"Nájdete ich v <em>Priečinok-&gt;Vlastnosti...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...že KMail dokáže zobraziť farebný pruh pre označenie typu správy\n"
+"(čistý text/HTML/OpenPGP), ktorá je momentálne zobrazená?</p>\n"
+"<p>Tým zabránite pokusom o predstieranie úspešného overenia podpisu\n"
+"poslaním správy v HTML, ktorá sa podobá rámcom stavu podpisu v KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...že môžete filtrovať pomocou ľubovoľnej hlavičky jednoduchým\n"
+"zadaním jej mena do prvého textového poľa v pravidle hľadania?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...že môžete filtrovať správy obsahujúce iba HTML pomocou pravidla\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...že pri odpovedi sa cituje iba označená časť textu správy?</p>\n"
+"<p>Ak nie je označené nič, citovaná je správa celá.</p>\n"
+"<p>To dokonca funguje s textom príloh, ak ste zapli\n"
+"<em>Zobraziť-&gt;Prílohy-&gt;Vložené</em>.</p>\n"
+"<p>Táto funkcia je dostupná pri každej odpovedi okrem\n"
+"<em>Správa-&gt;Odpovedať bez citovania</em>.</p>\n"
+"<p align=\"right\"><em>dodal David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15485,16 +15076,20 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Šifrovať všetky časti správy</h1>\n"
-#~ "Ak je táto voľba zapnutá, všetky časti správy (čiže telo správy a všetky prílohy) budú štandardne zašifrované.\n"
+#~ "Ak je táto voľba zapnutá, všetky časti správy (čiže telo správy a všetky "
+#~ "prílohy) budú štandardne zašifrované.\n"
 #~ "<p>\n"
-#~ "Toto je štandardné nastavenie, ale môžete ho zmeniť pre jednotlivé správy.\n"
+#~ "Toto je štandardné nastavenie, ale môžete ho zmeniť pre jednotlivé "
+#~ "správy.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15506,12 +15101,16 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Pýtať sa pred zašifrovaním každej časti</h1>\n"
-#~ "Ak je táto voľba zapnutá, pre každú časť správy (telo správy a jednotlivé prílohy) sa budete môcť rozhodnúť, či sa má táto časť zašifrovať, alebo nie.\n"
+#~ "Ak je táto voľba zapnutá, pre každú časť správy (telo správy a jednotlivé "
+#~ "prílohy) sa budete môcť rozhodnúť, či sa má táto časť zašifrovať, alebo "
+#~ "nie.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15525,7 +15124,8 @@ msgstr "Prepísať súbor?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15544,18 +15144,29 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Šifrovací algoritmus:</h1>\n"
-#~ "Algoritmus je popis toho, ako má počítač vykonať nejakú činnosť. Šifrovací algoritmus popisuje, ako má počítač použiť kľúč príjemcu pre vašu správu tak, že iba tento príjemca mohol správu prečítať.\n"
+#~ "Algoritmus je popis toho, ako má počítač vykonať nejakú činnosť. "
+#~ "Šifrovací algoritmus popisuje, ako má počítač použiť kľúč príjemcu pre "
+#~ "vašu správu tak, že iba tento príjemca mohol správu prečítať.\n"
 #~ "<p>\n"
-#~ "Výber šifrovacieho algoritmu určuje, ako ťažké bude zachytiť vašu správu a prečítať si jej obsah. Všetky algoritmy v prostredí SPHINX sa považujú za veľmi bezpečné. Obvykle bude štandardné nastavenie stačiť.\n"
+#~ "Výber šifrovacieho algoritmu určuje, ako ťažké bude zachytiť vašu správu "
+#~ "a prečítať si jej obsah. Všetky algoritmy v prostredí SPHINX sa považujú "
+#~ "za veľmi bezpečné. Obvykle bude štandardné nastavenie stačiť.\n"
 #~ "<p>\n"
 #~ "Toto nastavenie je štandardné, môžete ho pre jednotlivé správy zmeniť.\n"
 #~ "</qt>"
@@ -15569,16 +15180,22 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Kontrola certifikátu môže skončiť v lokálne uloženom certifikáte</h1>\n"
-#~ "Ak je táto voľba zapnutá, kontrola reťaze certifikátov môže skončiť v lokálne uloženom certifikáte.\n"
+#~ "<h1>Kontrola certifikátu môže skončiť v lokálne uloženom certifikáte</"
+#~ "h1>\n"
+#~ "Ak je táto voľba zapnutá, kontrola reťaze certifikátov môže skončiť v "
+#~ "lokálne uloženom certifikáte.\n"
 #~ "<p>\n"
-#~ "Lokálne uložené certifikáty sú vaše vlastné spolu s certifikátmi, s ktorými komunikujete a s certifikátmi certifikačných autorít.\n"
+#~ "Lokálne uložené certifikáty sú vaše vlastné spolu s certifikátmi, s "
+#~ "ktorými komunikujete a s certifikátmi certifikačných autorít.\n"
 #~ "</qt>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15590,12 +15207,15 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vždy kontrolovať cestu certifikátu ku koreňovému certifikátu</h1>\n"
-#~ "Ak je táto voľba zapnutá, cesta certifikátu patriaca certifikátu príjemcu sa vždy skontroluje až po koreňový certifikát.\n"
+#~ "Ak je táto voľba zapnutá, cesta certifikátu patriaca certifikátu príjemcu "
+#~ "sa vždy skontroluje až po koreňový certifikát.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15607,16 +15227,20 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Overiť cestu certifikátu</h1>\n"
-#~ "Ak je táto voľba zapnutá, kontroluje sa celá cesta certifikátu príjemcu až po koreňový certifikát.\n"
+#~ "Ak je táto voľba zapnutá, kontroluje sa celá cesta certifikátu príjemcu "
+#~ "až po koreňový certifikát.\n"
 #~ "<p>\n"
-#~ "Uvedomte si, že nie je možné vypnúť kontrolu samotného certifikátu príjemcu.\n"
+#~ "Uvedomte si, že nie je možné vypnúť kontrolu samotného certifikátu "
+#~ "príjemcu.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15628,33 +15252,47 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Používať zoznamy odvolaných certifikátov (CRL)</h1>\n"
-#~ "Zoznam zrušených (alebo odvolaných) certifikátov obsahuje tie certifikáty, ktoré sa už nemajú pre šifrovanie používať. Odvolať certifikát môže mať zmysel napríklad ak používateľ zistil, že jeho certifikát už nie je bezpečný (napr. niekto zistil PIN).\n"
+#~ "Zoznam zrušených (alebo odvolaných) certifikátov obsahuje tie "
+#~ "certifikáty, ktoré sa už nemajú pre šifrovanie používať. Odvolať "
+#~ "certifikát môže mať zmysel napríklad ak používateľ zistil, že jeho "
+#~ "certifikát už nie je bezpečný (napr. niekto zistil PIN).\n"
 #~ "<p>\n"
-#~ "Pre maximálnu bezpečnosť sa doporučuje tieto zoznamy používať. To, ako ich budete získavať, môžete nastaviť v ich dialógu nastavenia.\n"
+#~ "Pre maximálnu bezpečnosť sa doporučuje tieto zoznamy používať. To, ako "
+#~ "ich budete získavať, môžete nastaviť v ich dialógu nastavenia.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Varovať, ak CRL &stratí platnosť skôr ako:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Zapnutím sa bude zobrazovať varovanie, že platnosť zoznamu zrušených certifikátov čoskoro vyprší"
+#~ msgstr ""
+#~ "Zapnutím sa bude zobrazovať varovanie, že platnosť zoznamu zrušených "
+#~ "certifikátov čoskoro vyprší"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varovanie o strate platnosti CRL vopred</h1>\n"
-#~ "Ak je táto voľba zapnutá, zobrazí sa varovanie, v prípade, že jeden z vašich zoznamov zrušených certifikátov čoskoro stratí platnosť.\n"
+#~ "Ak je táto voľba zapnutá, zobrazí sa varovanie, v prípade, že jeden z "
+#~ "vašich zoznamov zrušených certifikátov čoskoro stratí platnosť.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15663,14 +15301,16 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varovanie o strate platnosti CRL vopred</h1>\n"
-#~ "Ak je táto voľba zapnutá, zobrazí sa varovanie, v prípade, že jeden z vašich zoznamov zrušených certifikátov čoskoro stratí platnosť.\n"
+#~ "Ak je táto voľba zapnutá, zobrazí sa varovanie, v prípade, že jeden z "
+#~ "vašich zoznamov zrušených certifikátov čoskoro stratí platnosť.\n"
 #~ "<p>\n"
 #~ "Doporučené nastavenie pre prostredie SPHINX je 7 dní.\n"
 #~ "</qt>"
@@ -15679,42 +15319,55 @@ msgstr "Prepísať súbor?"
 #~ msgstr "Vždy šifrovať kópiu &sebe"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Zaškrtnite ak chcete mať šifrované správy zašifrované aj vlastným kľúčom."
+#~ msgstr ""
+#~ "Zaškrtnite ak chcete mať šifrované správy zašifrované aj vlastným kľúčom."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vždy šifrovať kópiu sebe</h1>\n"
-#~ "Ak je táto voľba zapnutá, šifrované správy sa budú šifrovať aj vašom vlastným kľúčom.\n"
+#~ "Ak je táto voľba zapnutá, šifrované správy sa budú šifrovať aj vašom "
+#~ "vlastným kľúčom.\n"
 #~ "<p>\n"
-#~ "Doporučuje sa nechať túto voľbu zapnutá, aby ste mohli čítať správy, ktoré ste poslali.\n"
+#~ "Doporučuje sa nechať túto voľbu zapnutá, aby ste mohli čítať správy, "
+#~ "ktoré ste poslali.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
 #~ msgstr "Varovať, ak certifikát v reťazi s&tratí platnosť skôr ako:"
 
 #~ msgid "Check to be warned if the certificate expires soon"
-#~ msgstr "Zapnutím sa bude zobrazovať varovanie v prípade, že platnosť certifikátu čoskoro vyprší"
+#~ msgstr ""
+#~ "Zapnutím sa bude zobrazovať varovanie v prípade, že platnosť certifikátu "
+#~ "čoskoro vyprší"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varovať ak certifikát stratí platnosť</h1>\n"
-#~ "Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že sa pokúsite použiť pre šifrovanie certifikát, ktorého platnosť vyprší za daný počet dní.\n"
+#~ "Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že sa "
+#~ "pokúsite použiť pre šifrovanie certifikát, ktorého platnosť vyprší za "
+#~ "daný počet dní.\n"
 #~ "<p>\n"
-#~ "Doporučuje sa nechať túto voľbu zapnutú, aby ste nepoužívali certifikáty, ktoré prestanú čoskoro platiť.\n"
+#~ "Doporučuje sa nechať túto voľbu zapnutú, aby ste nepoužívali certifikáty, "
+#~ "ktoré prestanú čoskoro platiť.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15735,8 +15388,28 @@ msgstr "Prepísať súbor?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Vyberie, ktoré certifikáty sa pošlú"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Posielanie certifikátov</h1> Bez vášho certifikátu príjemca nebude môcť určiť, či je správa naozaj od vás, alebo či ju niekto cestou nezmenil. <p> Váš certifikát môže príjemca získať z centrálneho serveru, ale môžete sa rozhodnúť váš certifikát aj priložiť k správe. Môžete určiť, či sa nemá prikladať nikdy, že sa má priložiť iba váš certifikát, alebo že sa má priložiť celá reťaz certifikátov, ktoré certifikujú váš certifikát a to spolu alebo bez koreňového certifikátu. <p> Doporučuje sa vždy priložiť aspoň váš vlastný certifikát. <p> Toto nastavenie je štandardné a môžete ho pre jednotlivé správy zmeniť. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Posielanie certifikátov</h1> Bez vášho certifikátu príjemca "
+#~ "nebude môcť určiť, či je správa naozaj od vás, alebo či ju niekto cestou "
+#~ "nezmenil. <p> Váš certifikát môže príjemca získať z centrálneho serveru, "
+#~ "ale môžete sa rozhodnúť váš certifikát aj priložiť k správe. Môžete "
+#~ "určiť, či sa nemá prikladať nikdy, že sa má priložiť iba váš certifikát, "
+#~ "alebo že sa má priložiť celá reťaz certifikátov, ktoré certifikujú váš "
+#~ "certifikát a to spolu alebo bez koreňového certifikátu. <p> Doporučuje sa "
+#~ "vždy priložiť aspoň váš vlastný certifikát. <p> Toto nastavenie je "
+#~ "štandardné a môžete ho pre jednotlivé správy zmeniť. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Pos&lať váš vlastný certifikát"
@@ -15756,14 +15429,17 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Podpísať všetky časti správy</h1>\n"
-#~ "Ak je táto voľba zapnutá, všetky časti správy (telo správy a všetky prílohy) budú štandardne podpísané.\n"
+#~ "Ak je táto voľba zapnutá, všetky časti správy (telo správy a všetky "
+#~ "prílohy) budú štandardne podpísané.\n"
 #~ "<p>\n"
 #~ "Toto je štandardné nastavenie, môžete ho pre jednotlivé správy zmeniť.\n"
 #~ "</qt>"
@@ -15772,17 +15448,21 @@ msgstr "Prepísať súbor?"
 #~ msgstr "&Pýtať sa pred podpísaním každej časti"
 
 #~ msgid "Check to be asked for each part whether to sign"
-#~ msgstr "Zapnutím sa bude zobrazovať otázka pre každú časť, či sa má podpísať"
+#~ msgstr ""
+#~ "Zapnutím sa bude zobrazovať otázka pre každú časť, či sa má podpísať"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Pýtať sa pred podpísaním každej časti</h1>\n"
-#~ "Ak je táto voľba zapnutá, pre každú časť správy (telo a všetky prílohy) sa zobrazí dialóg, či chcete danú časť podpísať.\n"
+#~ "Ak je táto voľba zapnutá, pre každú časť správy (telo a všetky prílohy) "
+#~ "sa zobrazí dialóg, či chcete danú časť podpísať.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15796,7 +15476,8 @@ msgstr "Prepísať súbor?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15806,7 +15487,8 @@ msgstr "Prepísať súbor?"
 #~ "Toto je štandardné nastavenie, môžete ho pre jednotlivé správy zmeniť.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "Certifikáty pre podpisy sa nastavujú v časti <em>Certifikáty</em>."
 
 #~ msgid "RSA + SHA-1"
@@ -15818,18 +15500,30 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritmus podpisu:</h1>\n"
-#~ "Algoritmus je popis toho, ako má počítač vykonať nejakú činnosť. Algoritmus podpisu určuje, ako má počítač použiť váš podpisový kľúč pre vašu správu tak, že iba príjemca mohol overiť, či číta naozaj správu od vás.\n"
+#~ "Algoritmus je popis toho, ako má počítač vykonať nejakú činnosť. "
+#~ "Algoritmus podpisu určuje, ako má počítač použiť váš podpisový kľúč pre "
+#~ "vašu správu tak, že iba príjemca mohol overiť, či číta naozaj správu od "
+#~ "vás.\n"
 #~ "<p>\n"
-#~ "Výber algoritmu podpisu určuje, ako ťažké bude sfalšovať vašu správu. Všetky algoritmy v prostredí SPHINX sa považujú za veľmi bezpečné. Obvykle bude štandardné nastavenie stačiť.\n"
+#~ "Výber algoritmu podpisu určuje, ako ťažké bude sfalšovať vašu správu. "
+#~ "Všetky algoritmy v prostredí SPHINX sa považujú za veľmi bezpečné. "
+#~ "Obvykle bude štandardné nastavenie stačiť.\n"
 #~ "<p>\n"
 #~ "Toto nastavenie je štandardné, môžete ho pre jednotlivé správy zmeniť.\n"
 #~ "</qt>"
@@ -15846,12 +15540,16 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Uložiť správy s podpismi</h1>\n"
-#~ "Ak je táto voľba zapnutá, poslané správy sa ukladajú aj s podpisom. Doporučuje sa to, pretože to umožňuje neskôr overiť, či ste správu alebo jej časť podpísali.\n"
+#~ "Ak je táto voľba zapnutá, poslané správy sa ukladajú aj s podpisom. "
+#~ "Doporučuje sa to, pretože to umožňuje neskôr overiť, či ste správu alebo "
+#~ "jej časť podpísali.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15866,12 +15564,18 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Oddelený podpis</h1>\n"
-#~ "Ak je táto voľba zapnutá, podpis a podpísané dáta budú v samostatných častiach správy Multipart/Signed. Dáta budú čitateľný aj v prípade, že poštový agent príjemcu nepodporuje podpisový algoritmus a dekódovanie ASN.1.\n"
+#~ "Ak je táto voľba zapnutá, podpis a podpísané dáta budú v samostatných "
+#~ "častiach správy Multipart/Signed. Dáta budú čitateľný aj v prípade, že "
+#~ "poštový agent príjemcu nepodporuje podpisový algoritmus a dekódovanie "
+#~ "ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15883,12 +15587,16 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Podpisovať správy nepriehľadne</h1>\n"
-#~ "Ak je táto voľba zapnutá, podpis aj podpísané dáta sa budú kódovať do jediného bloku ASN.1. Takéto správy dokáže prečítať iba poštový klient, ktorý\n"
+#~ "Ak je táto voľba zapnutá, podpis aj podpísané dáta sa budú kódovať do "
+#~ "jediného bloku ASN.1. Takéto správy dokáže prečítať iba poštový klient, "
+#~ "ktorý\n"
 #~ "podporuje dekódovanie ASN.1.\n"
 #~ "</qt>"
 
@@ -15901,8 +15609,22 @@ msgstr "Prepísať súbor?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Vyberte si ako často sa musí zadávať PIN"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Zadanie PIN</h1> Tu si môžete vybrať, ako často musíte zadávať PIN, aby ste získali prístup k vášmu osobnému bezpečnostnému prostrediu (PSE), ktoré obsahuje certifikáty. <p> Čím častejšie ho budete musieť zadávať, tým viac budete chránený pred správami, ktoré by zneužili vaše meno. Je to ale menej príjemné.<p> Ak neviete, čo si máte vybrať, nemeňte túto voľbu. <p> Uvedomte si, že nie je možné z bezpečnostných dôvodov zadávanie PIN vypnúť. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Zadanie PIN</h1> Tu si môžete vybrať, ako často musíte zadávať "
+#~ "PIN, aby ste získali prístup k vášmu osobnému bezpečnostnému prostrediu "
+#~ "(PSE), ktoré obsahuje certifikáty. <p> Čím častejšie ho budete musieť "
+#~ "zadávať, tým viac budete chránený pred správami, ktoré by zneužili vaše "
+#~ "meno. Je to ale menej príjemné.<p> Ak neviete, čo si máte vybrať, nemeňte "
+#~ "túto voľbu. <p> Uvedomte si, že nie je možné z bezpečnostných dôvodov "
+#~ "zadávanie PIN vypnúť. </qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Raz cez sedenie"
@@ -15919,16 +15641,21 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Varovať, ak certifikát vyprší</h1>\n"
-#~ "Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že platnosť certifikátu, ktorý chcete použiť pre podpis, čoskoro vyprší.\n"
+#~ "Ak je táto voľba zapnutá, bude sa zobrazovať varovanie v prípade, že "
+#~ "platnosť certifikátu, ktorý chcete použiť pre podpis, čoskoro vyprší.\n"
 #~ "<p>\n"
-#~ "Doporučuje sa nechať túto voľbu zapnutá, aby sa zabránilo používaniu certifikátov, ktoré čoskoro prestanú platiť.\n"
+#~ "Doporučuje sa nechať túto voľbu zapnutá, aby sa zabránilo používaniu "
+#~ "certifikátov, ktoré čoskoro prestanú platiť.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15940,7 +15667,8 @@ msgstr "Prepísať súbor?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
diff --git a/tde-i18n-sl/messages/tdepim/kmail.po b/tde-i18n-sl/messages/tdepim/kmail.po
index 70c9c493d4e..ddccaabe790 100644
--- a/tde-i18n-sl/messages/tdepim/kmail.po
+++ b/tde-i18n-sl/messages/tdepim/kmail.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2007-09-15 02:43+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Jure Repinc,Gregor Rakar,Andrej Vernekar"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "Nob&en (uporabljajte previdno)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Račun za polsamodejno upravljanje virov"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Počisti preteklo"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,12 +254,12 @@ msgstr "&Prijava:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Vaš ponudnik internetnih storitev (ISP) vam je dal <em>uporabniško ime>/em>"
-", ki se uporablja za vašo identifikacijo. Običajno je to prvi del vašega "
+"Vaš ponudnik internetnih storitev (ISP) vam je dal <em>uporabniško ime>/em>, "
+"ki se uporablja za vašo identifikacijo. Običajno je to prvi del vašega "
 "poštnega naslova (del pred <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -275,18 +281,19 @@ msgstr "Sh&rani geslo za POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Izberite to možnost, da KMail shrani geslo.\n"
 "Če je TDEListnica voljo, bo geslo shranjeno tam, kar je mišljeno kot varno.\n"
 "Če pa TDEListnica ni na voljo, lahko KMail shrani geslo v svojo nastavitveno "
-"datoteko. Geslo je shranjeno v pomešani obliki, vendar to ni mišljeno kot varno "
-"pred poskusi dešifriranja, če je pridobljen dostop do nastavitvene datoteke."
+"datoteko. Geslo je shranjeno v pomešani obliki, vendar to ni mišljeno kot "
+"varno pred poskusi dešifriranja, če je pridobljen dostop do nastavitvene "
+"datoteke."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -314,12 +321,13 @@ msgstr "&Filtriraj sporočila, če so večja od"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Če ste izbrali to možnost, bo na osnovi POP filtrov odločeno, kaj naj se zgodi "
-"s sporočili. Izberete lahko, naj se naložijo, zbrišejo ali pa pustijo na "
-"strežniku."
+"Če ste izbrali to možnost, bo na osnovi POP filtrov odločeno, kaj naj se "
+"zgodi s sporočili. Izberete lahko, naj se naložijo, zbrišejo ali pa pustijo "
+"na strežniku."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -368,13 +376,15 @@ msgstr "Počis&ti besedilo"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -417,14 +427,14 @@ msgstr "Imenski prostori:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Tu vidite različne imenske prostore, ki jih podpira vaš strežnik IMAP. Vsak "
-"imenski prostor predstavlja predpono, po kateri se ločijo skupine map. Imenski "
-"prostori vam omogočajo prikaz svojih zasebnih in map v skupni rabi v enem "
-"računu."
+"imenski prostor predstavlja predpono, po kateri se ločijo skupine map. "
+"Imenski prostori vam omogočajo prikaz svojih zasebnih in map v skupni rabi v "
+"enem računu."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -482,12 +492,12 @@ msgstr "Naloži prilo&ge na zahtevo"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Aktivirajte to, da se priloge ne naložijo samodejno ampak šele, kadar kliknete "
-"nanje. Na ta način so tudi velika e-sporočila prikazana takoj."
+"Aktivirajte to, da se priloge ne naložijo samodejno ampak šele, kadar "
+"kliknete nanje. Na ta način so tudi velika e-sporočila prikazana takoj."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -527,7 +537,7 @@ msgstr "<brez>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "prejeto"
 
@@ -535,43 +545,44 @@ msgstr "prejeto"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Strežnik očitno ne podpira edinstvenih številk sporočil, kar pa je zahteva za "
-"puščanje sporočil na strežniku.\n"
-"Ker nekateri strežniki ne objavljajo pravilno svojih zmožnosti, imate še vedno "
-"možnost, da pustite omogočeno puščanje pobranih sporočil na strežniku."
+"Strežnik očitno ne podpira edinstvenih številk sporočil, kar pa je zahteva "
+"za puščanje sporočil na strežniku.\n"
+"Ker nekateri strežniki ne objavljajo pravilno svojih zmožnosti, imate še "
+"vedno možnost, da pustite omogočeno puščanje pobranih sporočil na strežniku."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Videti je, da strežnik ne podpira pridobivanja glav sporočil, to pa je pogoj za "
-"filtriranje sporočil na strežniku.\n"
-"Ker nekateri strežniki ne oglašujejo pravilno svojih zmožnosti imate še vedno "
-"možnost da vklopite filtriranje sporočil na strežniku."
+"Videti je, da strežnik ne podpira pridobivanja glav sporočil, to pa je pogoj "
+"za filtriranje sporočil na strežniku.\n"
+"Ker nekateri strežniki ne oglašujejo pravilno svojih zmožnosti imate še "
+"vedno možnost da vklopite filtriranje sporočil na strežniku."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Prosimo upoštevajte, da lahko ta zmožnost povzroči, da nekateri strežniki POP3, "
-"ki cevovodenja ne podpirajo, pokvarijo sporočila.\n"
-"To je nastavljivo, ker nekateri strežniki podpirajo cevovodenje, vendar pa tega "
-"ne najavljajo. Da vidite, ali vaš strežnik POP3 najavlja podporo cevovodenju, "
-"uporabite gumb »Preveri, kaj podpira strežnik«, ki se nahaja na dnu pogovornega "
-"okna.\n"
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Prosimo upoštevajte, da lahko ta zmožnost povzroči, da nekateri strežniki "
+"POP3, ki cevovodenja ne podpirajo, pokvarijo sporočila.\n"
+"To je nastavljivo, ker nekateri strežniki podpirajo cevovodenje, vendar pa "
+"tega ne najavljajo. Da vidite, ali vaš strežnik POP3 najavlja podporo "
+"cevovodenju, uporabite gumb »Preveri, kaj podpira strežnik«, ki se nahaja na "
+"dnu pogovornega okna.\n"
 "Če vaš strežnik te storitve ne oglašuje, radi pa bi vseeno večjo hitrost, jo "
 "najprej preizkusite tako, da si pošljete nekaj sporočil in jih naložite."
 
@@ -581,31 +592,31 @@ msgstr "Prosim najprej navedite strežnik in vrata na zavihku Splošno."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Videti je, da ta strežnik ne podpira cevovodenja, zato je bila ta možnost "
 "onemogočena.\n"
 "Ker mekateri strežniki svojih zmožnosti ne oglašujejo pravilno, vam še vedno "
 "ostane možnost, da vklopite cevovodenje. Vendar prosim upoštevaje,  lahko ta "
 "zmožnost povzroči, da nekateri strežniki POP, ki ne podpirajo cevovodenja, "
-"pošiljajo uničena sporočila. Preden uporabite to zmožnost s pomembno pošto, jo "
-"preizkusite tako, da sebi pošljete večje število testnih sporočil, ki jih s "
-"strežnika POP naložite v eni potezi."
+"pošiljajo uničena sporočila. Preden uporabite to zmožnost s pomembno pošto, "
+"jo preizkusite tako, da sebi pošljete večje število testnih sporočil, ki jih "
+"s strežnika POP naložite v eni potezi."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Videti je, da strežnik ne podpira enkratnih števil za sporčila, to pa je "
 "zahteva za puščanje sporočil na strežniku; zaradi tega je bila ta možnost "
@@ -618,13 +629,13 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Videti je, da strežnik ne podpira pridobivanja glav sporočil, to pa je pogoj za "
-"filtriranje sporočil na strežniku; zato je bila ta možnost izklopljena.\n"
-"Ker nekateri strežniki ne oglašujejo pravilno svojih zmožnosti imate še vedno "
-"možnost da vklopite filtriranje sporočil na strežniku."
+"Videti je, da strežnik ne podpira pridobivanja glav sporočil, to pa je pogoj "
+"za filtriranje sporočil na strežniku; zato je bila ta možnost izklopljena.\n"
+"Ker nekateri strežniki ne oglašujejo pravilno svojih zmožnosti imate še "
+"vedno možnost da vklopite filtriranje sporočil na strežniku."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -710,8 +721,8 @@ msgstr "Račun IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Da lahko prejemate pošto, morate dodati račun v omrežni razdelek nastavitev."
 
@@ -749,9 +760,9 @@ msgstr "Dobrodošli v KMailu"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Videti je, da ste KMail pognali prvič. Ta čarovnik lahko uporabite za "
 "nastavitev vaših poštnih računov. Na naslednjih straneh morate vnesti le "
@@ -817,8 +828,7 @@ msgstr "Uporabi krajevno dostavo"
 msgid "Server Information"
 msgstr "Informacije o strežniku"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Brez"
@@ -911,8 +921,9 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Orodja za zaznavanje neželene pošte niso bil najdena. Namestite programsko "
-"opremo za zaznavanje neželene pošte in ponovno poženite tega čarovnika.</p>"
+"<p>Orodja za zaznavanje neželene pošte niso bil najdena. Namestite "
+"programsko opremo za zaznavanje neželene pošte in ponovno poženite tega "
+"čarovnika.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -937,8 +948,8 @@ msgstr "<br>Neželjena sporočila niso premaknjena v določeno mapo.</p>"
 #: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
-"<p>Mapa za sporočila ki so razvrščena kot negotova (najverjetneje so neželjena) "
-"je <i>"
+"<p>Mapa za sporočila ki so razvrščena kot negotova (najverjetneje so "
+"neželjena) je <i>"
 
 #: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
@@ -958,28 +969,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Tu lahko dobite nekaj pomoči pri nastavljanju KMailovih filtrirnih pravil za "
-"uporabo nekaj splošno znanih protivirusnih orodij.</p> "
-"<p>Čarovnik lahko zazna ta orodja na vašem računalniku kot tudi ustvari "
-"filtrirna pravila za razporejanje sporočil z uporabo teh orodij in ločevanje "
-"sporočil, ki vsebujejo viruse. Čarovnik obstoječih filtrirnih pravil ne bo "
-"upošteval: vedno bo dodal nova pravila.</p> "
-"<p><b>Opozorilo:</b> Ker je KMail med pregledovanjem sporočil blokiran, boste "
-"morda naleteli na težave z odzivnostjo KMaila, saj so protivirusne operacije "
-"običajno dolgotrajne. Prosim razmislite o brisanju pravil, ki jih je ustvaril "
-"čarovnik, da se povrnete k prejšnjemu obnašanju."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Tu lahko dobite nekaj pomoči pri nastavljanju KMailovih filtrirnih pravil "
+"za uporabo nekaj splošno znanih protivirusnih orodij.</p> <p>Čarovnik lahko "
+"zazna ta orodja na vašem računalniku kot tudi ustvari filtrirna pravila za "
+"razporejanje sporočil z uporabo teh orodij in ločevanje sporočil, ki "
+"vsebujejo viruse. Čarovnik obstoječih filtrirnih pravil ne bo upošteval: "
+"vedno bo dodal nova pravila.</p> <p><b>Opozorilo:</b> Ker je KMail med "
+"pregledovanjem sporočil blokiran, boste morda naleteli na težave z "
+"odzivnostjo KMaila, saj so protivirusne operacije običajno dolgotrajne. "
+"Prosim razmislite o brisanju pravil, ki jih je ustvaril čarovnik, da se "
+"povrnete k prejšnjemu obnašanju."
 
 #: antispamwizard.cpp:919
 #, fuzzy
@@ -1007,8 +1017,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Privzeta mapa za neželeno pošto je mapa  Smeti. Lahko pa po želji izberete kako "
-"drugo mapo iz spodnjega seznama."
+"Privzeta mapa za neželeno pošto je mapa  Smeti. Lahko pa po želji izberete "
+"kako drugo mapo iz spodnjega seznama."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1016,15 +1026,13 @@ msgstr "Premakni &verjetno neželeno pošto v:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Privzeta mapa je Prejeto. Če želite spremeniti mapo, jo lahko izberete v "
-"spodnjem seznamu. "
-"<p>Vsa orodja ne podpirajo klasifikacije negotovo. Če orodje tega ne podpira, "
-"ne morete izbrati mape."
+"spodnjem seznamu. <p>Vsa orodja ne podpirajo klasifikacije negotovo. Če "
+"orodje tega ne podpira, ne morete izbrati mape."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1034,12 +1042,13 @@ msgstr "Preveri sporočila z uporabo protivirusnih orodij"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Pustite preverjanje vaših sporočil protivirusnim orodjem. Čarovnik bo ustvaril "
-"primerne filtre. Sporočila so običajno označijo orodja, tako da se lahko filtri "
-"ustrezno odzovejo in na primer premaknejo okužena sporočila v posebno mapo."
+"Pustite preverjanje vaših sporočil protivirusnim orodjem. Čarovnik bo "
+"ustvaril primerne filtre. Sporočila so običajno označijo orodja, tako da se "
+"lahko filtri ustrezno odzovejo in na primer premaknejo okužena sporočila v "
+"posebno mapo."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1048,12 +1057,12 @@ msgstr "Premakni zaznana okužena sporočila v izbrano mapo"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Filter, ki zazna sporočila, ki so označena kot okužena in jih premakne v naprej "
-"določeno mapo. Privzeti mapa je mapa Smeti, vendar lahko to spremenite v "
-"pogledu map."
+"Filter, ki zazna sporočila, ki so označena kot okužena in jih premakne v "
+"naprej določeno mapo. Privzeti mapa je mapa Smeti, vendar lahko to "
+"spremenite v pogledu map."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1061,11 +1070,11 @@ msgstr "Dodatno, označi zaznana okužena sporočila kot prebrana"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Označi sporočila, ki so bila označena kot okužena, kot prebrana in jih premakni "
-"v izbrano mapo."
+"Označi sporočila, ki so bila označena kot okužena, kot prebrana in jih "
+"premakni v izbrano mapo."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1247,8 +1256,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Do tega je lahko prišlo, ker nimate dovoljenj za to dejanje ali ker je mapa na "
-"strežniku že prisotna. Strežnik je sporočil naslednjo napako:"
+"Do tega je lahko prišlo, ker nimate dovoljenj za to dejanje ali ker je mapa "
+"na strežniku že prisotna. Strežnik je sporočil naslednjo napako:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1261,8 +1270,8 @@ msgstr "Napaka med branjem mape %1 na strežniku:"
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1282,8 +1291,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1314,20 +1323,20 @@ msgstr "Zbrisano"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Nobena izmed identitet ne ustreza prejemniku tega sporočila."
-"<br>Prosim, izberite kateri izmed naslednjih naslovov je vaš:"
+"<qt>Nobena izmed identitet ne ustreza prejemniku tega sporočila.<br>Prosim, "
+"izberite kateri izmed naslednjih naslovov je vaš:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Več vaših identitet ustreza prejemniku tega sporočila."
-"<br>Prosim, izberite kateri izmed naslednjih naslovov je vaš:"
+"<qt>Več vaših identitet ustreza prejemniku tega sporočila.<br>Prosim, "
+"izberite kateri izmed naslednjih naslovov je vaš:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1356,18 +1365,21 @@ msgstr "Napaka med stiskanjem »%1«. Stiskanje je prekinjeno."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>To nastavitej je popravil vaš skrbnik.</p>\n"
+"<qt><p>To nastavitej je popravil vaš skrbnik.</p>\n"
 "<p>Če ste mnenja da gre za napako, prosim stopite v stik z njim.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Na&loži profil ..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Nastavi račun"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Dodaj ..."
@@ -1397,6 +1409,11 @@ msgstr "<qt>Ali zares želite odstraniti identiteto z imenom <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Odstrani identiteto"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Odstrani"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Dodaj ..."
@@ -1405,6 +1422,11 @@ msgstr "Dodaj ..."
 msgid "Modify..."
 msgstr "Spremeni ..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Odstrani"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Nastavi kot privzeto"
@@ -1421,17 +1443,15 @@ msgstr "&Pošiljanje"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Računi za pošiljanje (dodajte vsaj en račun):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Vrsta"
@@ -1453,8 +1473,7 @@ msgstr "Nastavi privzeto"
 msgid "Common Options"
 msgstr "Splošne možnosti"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Pot&rdi pred pošiljanjem"
@@ -1505,17 +1524,16 @@ msgstr "Privze&ta domena:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Privzeta domena se uporabi za dopolnjevanje poštnih naslovov, ki jih "
+"<qt> <p>Privzeta domena se uporabi za dopolnjevanje poštnih naslovov, ki jih "
 "sestavlja le uporabniško ime.</p></qt> "
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1533,9 +1551,9 @@ msgstr "Dodaj prenos"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (privzeto)"
 
@@ -1622,6 +1640,10 @@ msgstr "Spremeni račun"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ni moč najti računa <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Barve"
@@ -1730,8 +1752,7 @@ msgstr "Obiskana povezava"
 msgid "Misspelled Words"
 msgstr "Narobe črkovane besede"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Novo sporočilo"
@@ -1920,8 +1941,8 @@ msgstr "Niti privzeto na zaprto"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Odpri niti, ki vsebujejo nov&a, neprebrana ali pomembna sporočila in odpri "
 "opazovane niti."
@@ -1932,69 +1953,53 @@ msgstr "Prikaz datuma"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Za datum so lahko uporabljeni naslednji izrazi:</strong></p>"
-"<ul>"
-"<li>d - dan kot številka brez vodilne ničle (1-31)</li>"
-"<li>dd - dan kot dvomestna številka z vodilno ničlo (01-31)</li>"
-"<li>ddd - okrajšano ime dneva (pon -ned)</li>"
-"<li>dddd - dolgo polno dneva (ponedeljek - nedelja)</li>"
-"<li>M - mesec kot številka brez vodilne ničle (1-12)</li>"
-"<li>MM - mesec kot številka z vodilno ničlo (01-12)</li>"
-"<li>MMM - okrajšano ime meseca (jan -dec)</li>"
-"<li>MMMM - polno ime meseca (januar-december)</li>"
-"<li>ll - leto kot dvomestno število (00-99)</li>"
-"<li>llll - leto kot štirimestno število (0000-9999)</li></ul>"
-"<p><strong>Za čas so lahko uporabljeni naslednji izrazi:</string></p> "
-"<ul>"
-"<li>h - ura brez vodilne ničle (0-23 ali 1-12 pri prikazu AM/PM)</li>"
-"<li>hh - ura z vodilno ničlo (00-23 ali 01-12 pri prikazu AM/PM)</li>"
-"<li>m - minute brez vodilne ničle (0-59)</li>"
-"<li>mm - minute z vodilno ničlo (00-59)</li>"
-"<li>s - sekunde brez vodilne ničle (0-59)</li>"
-"<li>ss - sekunde z vodilno ničlo (00-59)</li>"
-"<li>z - milisekunde brez vodilne ničle (0-999)</li>"
-"<li>zzz - milisekunde z vodilno ničlo (000-999)</li>"
-"<li>AP - preklop v ameriški način prikaza (AM/PM). AP bo nadomeščen z »AM« "
-"oziroma »PM«.</li>"
-"<li>ap - preklop v ameriški način prikaza (AM/PM). ap bo nadomeščen z »am« "
-"oziroma »pm«.</li>"
-"<li>časovno območje v numerični obliki (-0500)</li></ul>"
-"<p><strong>Katerikoli drugi znaki ne bodo upoštevani.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Za datum so lahko uporabljeni naslednji izrazi:</strong></"
+"p><ul><li>d - dan kot številka brez vodilne ničle (1-31)</li><li>dd - dan "
+"kot dvomestna številka z vodilno ničlo (01-31)</li><li>ddd - okrajšano ime "
+"dneva (pon -ned)</li><li>dddd - dolgo polno dneva (ponedeljek - nedelja)</"
+"li><li>M - mesec kot številka brez vodilne ničle (1-12)</li><li>MM - mesec "
+"kot številka z vodilno ničlo (01-12)</li><li>MMM - okrajšano ime meseca (jan "
+"-dec)</li><li>MMMM - polno ime meseca (januar-december)</li><li>ll - leto "
+"kot dvomestno število (00-99)</li><li>llll - leto kot štirimestno število "
+"(0000-9999)</li></ul><p><strong>Za čas so lahko uporabljeni naslednji izrazi:"
+"</string></p> <ul><li>h - ura brez vodilne ničle (0-23 ali 1-12 pri prikazu "
+"AM/PM)</li><li>hh - ura z vodilno ničlo (00-23 ali 01-12 pri prikazu AM/PM)</"
+"li><li>m - minute brez vodilne ničle (0-59)</li><li>mm - minute z vodilno "
+"ničlo (00-59)</li><li>s - sekunde brez vodilne ničle (0-59)</li><li>ss - "
+"sekunde z vodilno ničlo (00-59)</li><li>z - milisekunde brez vodilne ničle "
+"(0-999)</li><li>zzz - milisekunde z vodilno ničlo (000-999)</li><li>AP - "
+"preklop v ameriški način prikaza (AM/PM). AP bo nadomeščen z »AM« oziroma "
+"»PM«.</li><li>ap - preklop v ameriški način prikaza (AM/PM). ap bo "
+"nadomeščen z »am« oziroma »pm«.</li><li>časovno območje v numerični obliki "
+"(-0500)</li></ul><p><strong>Katerikoli drugi znaki ne bodo upoštevani.</"
+"strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Spreminjanje globalnih nastavitev nitenja bo povozilo vse nastavitve v "
 "posameznih mapah."
@@ -2011,8 +2016,7 @@ msgstr "Prikaži vrstico stan&ja HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Prikaži stanje &neželenih sporočil v razkošnih glavah"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Zamenjaj smeškote z čustvenimi ikonami"
@@ -2021,8 +2025,7 @@ msgstr "Zamenjaj smeškote z čustvenimi ikonami"
 msgid "Use smaller font for quoted text"
 msgstr "Uporabi manjšo pisavo za navedeno besedilo"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Prikaži oznake za (ra)zvijanje citatov"
@@ -2048,8 +2051,7 @@ msgstr "Samodejno"
 msgid "&Override character encoding:"
 msgstr "P&ovozi kodiranje znakov:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Omogoči ikono v sistemski vrstici"
@@ -2154,23 +2156,20 @@ msgstr "<b>%f</b> bo zamenjan z imenom datoteke, ki naj se ureja."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>V frazah namenjenih odgovorom so podprte naslednje zamenjave:"
-"<br><b>%D</b>: datum, <b>%S</b>: zadeva,"
-"<br><b>%e</b>: naslov pošiljatelja, <b>%F</b>: ime pošiljatelja, <b>%f</b>"
-": začetnice pošiljatelja,"
-"<br><b>%T</b>: ime prejemnika, <b>%t</b>: ime in naslov prejemnika,"
-"<br><b>%C</b>: imena prejemnikov slepe kopije, <b>%c</b>"
-": imena in naslovi prejemnikov slepe kopije,"
-"<br><b>%%</b>: znak »%«, <b>%_</b>: presledek, <b>%L</b>"
-": prehod v nov vrsto</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>V frazah namenjenih odgovorom so podprte naslednje zamenjave:<br><b>%D</"
+"b>: datum, <b>%S</b>: zadeva,<br><b>%e</b>: naslov pošiljatelja, <b>%F</b>: "
+"ime pošiljatelja, <b>%f</b>: začetnice pošiljatelja,<br><b>%T</b>: ime "
+"prejemnika, <b>%t</b>: ime in naslov prejemnika,<br><b>%C</b>: imena "
+"prejemnikov slepe kopije, <b>%c</b>: imena in naslovi prejemnikov slepe "
+"kopije,<br><b>%%</b>: znak »%«, <b>%_</b>: presledek, <b>%L</b>: prehod v "
+"nov vrsto</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2193,21 +2192,20 @@ msgstr "Odgovori &vsem:"
 msgid "&Forward:"
 msgstr "&Posreduj:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Oznaka &citiranja:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Dne %D ste napisali:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Dne %D je %F napisal(a):"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Posredovano sporočilo"
 
@@ -2245,8 +2243,8 @@ msgstr "Vnesite novo predpono za posredovanje:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Ta seznam se preverja za vsako odhajajočo sporočilo z vrha na dno po naboru "
 "znakov, ki vsebuje vse potrebne znake."
@@ -2284,10 +2282,9 @@ msgstr "Vrednost"
 msgid "Ne&w"
 msgstr "No&va"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Ime:"
@@ -2296,16 +2293,15 @@ msgstr "&Ime:"
 msgid "&Value:"
 msgstr "&Vrednost:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Poimenovanje priloge združljivo z Outlookom"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Vklopite to možnost, da bo Outlook(tm) razumel imena prilog, ki vsebujejo "
 "neangleške znake"
@@ -2335,19 +2331,19 @@ msgstr "priloženo"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Izbrali ste način kodiranja imen prilog, ki vsebujejo neangleške znake, na "
-"način ki ga razumejo Outlook(tm) in drugi poštni odjemalci, ki ne podpirajo s "
-"standardi združljiva imena prilog.\n"
-"Upoštevajte, da bo KMail morda ustvaril s standardi nezdružljiva sporočila in "
-"posledični s standardi združljivi poštni odjemalci teh sporočil ne bodo "
+"način ki ga razumejo Outlook(tm) in drugi poštni odjemalci, ki ne podpirajo "
+"s standardi združljiva imena prilog.\n"
+"Upoštevajte, da bo KMail morda ustvaril s standardi nezdružljiva sporočila "
+"in posledični s standardi združljivi poštni odjemalci teh sporočil ne bodo "
 "razumeli; tako da razen če res nimate druge možnosti ne uporabčjajte te "
 "možnosti."
 
@@ -2373,113 +2369,98 @@ msgstr "Kriptogra&fski vmesniki"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Sporočila včasih prihajajo v obeh oblikah. Ta izbira nadzoruje, če želite "
-"imeti prikazan del v HTML ali del v navadnem besedilu.</p>"
-"<p>Prikaz dela v HTML olepša izgled sporočila, vendar pa tudi poveča nevarnost "
-"za izrabo varnostnih lukenj.</p>"
-"<p>Prikaz navadnega besedila izgubi večino oblikovanja sporočila, vendar pa "
-"skoraj <em>onemogoči</em> izrabo varnostnih lukenj v upodabljalniku HTML "
-"(Konqueror).</p>"
-"<p>Izbira spodaj varuje pred pogosto zlorabo sporočil v HTML. Ne more pa "
-"varovati pred varnostnimi zadevami, ki še niso bile znane v času, ko je bil "
-"napisan KMail.</p>"
-"<p>Zato je priporočljivo <em>ne</em> uporabljati HTML namestno navadnega "
-"besedila.</p>"
-"<p><b>Vedite:</b> To možnost lahko nastavite za vsako mapo posebej iz menuja <i>"
-"Mapa</i> glavnega okna KMail.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Sporočila včasih prihajajo v obeh oblikah. Ta izbira nadzoruje, če "
+"želite imeti prikazan del v HTML ali del v navadnem besedilu.</p><p>Prikaz "
+"dela v HTML olepša izgled sporočila, vendar pa tudi poveča nevarnost za "
+"izrabo varnostnih lukenj.</p><p>Prikaz navadnega besedila izgubi večino "
+"oblikovanja sporočila, vendar pa skoraj <em>onemogoči</em> izrabo varnostnih "
+"lukenj v upodabljalniku HTML (Konqueror).</p><p>Izbira spodaj varuje pred "
+"pogosto zlorabo sporočil v HTML. Ne more pa varovati pred varnostnimi "
+"zadevami, ki še niso bile znane v času, ko je bil napisan KMail.</p><p>Zato "
+"je priporočljivo <em>ne</em> uporabljati HTML namestno navadnega besedila.</"
+"p><p><b>Vedite:</b> To možnost lahko nastavite za vsako mapo posebej iz "
+"menuja <i>Mapa</i> glavnega okna KMail.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Nekateri oglasi so v obliki HTML in vsebujejo na primer povezave na slike, "
-"ki jih oglaševalci uporabljajo za to, da ugotovijo da ste prebrali njihovo "
-"sporočilo (tako imenovane &quot;spletne hrošče&quot; ali web bugs).</p>"
-"<p>Ni pravega razloga da bi se slike na tak način nalagale iz interneta, saj "
-"lahko pošiljatelj vedno pripne slike neposredno k sporočilu.</p>"
-"<p>Da se zavarujete pred takšno zlorabo prikazovanja HTML v KMailu je ta "
-"možnost privzeto <em>izklopljena</em>.</p>"
-"<p>Če pa si vseeno želite ogledovati nepripete slike v sporočilih oblike HTML, "
-"lahko omogočite to možnost vendar se morate zavedati morebitnih težav povezanih "
-"s tem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Nekateri oglasi so v obliki HTML in vsebujejo na primer povezave na "
+"slike, ki jih oglaševalci uporabljajo za to, da ugotovijo da ste prebrali "
+"njihovo sporočilo (tako imenovane &quot;spletne hrošče&quot; ali web bugs).</"
+"p><p>Ni pravega razloga da bi se slike na tak način nalagale iz interneta, "
+"saj lahko pošiljatelj vedno pripne slike neposredno k sporočilu.</p><p>Da se "
+"zavarujete pred takšno zlorabo prikazovanja HTML v KMailu je ta možnost "
+"privzeto <em>izklopljena</em>.</p><p>Če pa si vseeno želite ogledovati "
+"nepripete slike v sporočilih oblike HTML, lahko omogočite to možnost vendar "
+"se morate zavedati morebitnih težav povezanih s tem.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Ravnanje z obvestili o razporeditvi sporočil</h3>"
-"<p>Obvestila o razporeditvi sporočil so posplošitev tega, kar se v splošnem "
-"imenuje <b>potrdilo o branju</b>. Avtor sporočila povprašuje po obvestilu o "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Ravnanje z obvestili o razporeditvi sporočil</h3><p>Obvestila o "
+"razporeditvi sporočil so posplošitev tega, kar se v splošnem imenuje "
+"<b>potrdilo o branju</b>. Avtor sporočila povprašuje po obvestilu o "
 "razporeditvi sporočila in prejemnikov poštni program ustvari odgovor iz "
 "katerega lahko avtor izve, kaj se je zgodilo z njegovim sporočilom. Splošne "
-"vrste razporeditev vključujejo <b>prikazano</b> (prebrano), <b>izbrisano</b>"
-", in <b>odposlano</b> (posredovano naprej).</p>"
-"<p>Za nadzor nad pošiljanjem obvestil o razporeditvi so na voljo naslednje "
-"možnosti:</p>"
-"<ul>"
-"<li><em>Prezri</em>: Prezre vse zahteve za obvestila o razporeditvi. Obvestila "
-"ne bodo nikoli poslana samodejno (ta možnost je priporočena).</li> "
-"<li><em>Vprašaj</em>:Odgovori na zahteve le potem, ko je uporabnika vprašal za "
-"dovoljenje. Na ta načina lahko pošljete obvestila za izbrana sporočila, medtem "
-"ko zavrnete ali prezrete ostala.</li>"
-"<li><em>Zavrni</em>: Vedno pošlje <em>zavrnjeno</em>. To je samo <b>malo</b> "
-"bolje kot pošiljanje obvestil. Avtor še vedno ve, da je njegovo sporočilo "
-"sprožilo odziv, le tega ne ve, ali je bilo izbrisano ali prebrano.</li>"
-"<li><em>Vedno pošlji</em>: Vedno pošlje zahtevno obvestilo. To pomeni, da avtor "
-"sporočila zve, kdaj ste se odzvali na sporočilo in povrhu vsega še celo to, kaj "
-"se je z njim zgodilo. To možnost močno odsvetujemo, ker pa je lahko v nekaterih "
-"primerih zelo koristna, na primer pri odnosih s strankami, je vseeno na "
-"voljo.</li></ul></qt>"
+"vrste razporeditev vključujejo <b>prikazano</b> (prebrano), <b>izbrisano</"
+"b>, in <b>odposlano</b> (posredovano naprej).</p><p>Za nadzor nad "
+"pošiljanjem obvestil o razporeditvi so na voljo naslednje možnosti:</"
+"p><ul><li><em>Prezri</em>: Prezre vse zahteve za obvestila o razporeditvi. "
+"Obvestila ne bodo nikoli poslana samodejno (ta možnost je priporočena).</li> "
+"<li><em>Vprašaj</em>:Odgovori na zahteve le potem, ko je uporabnika vprašal "
+"za dovoljenje. Na ta načina lahko pošljete obvestila za izbrana sporočila, "
+"medtem ko zavrnete ali prezrete ostala.</li><li><em>Zavrni</em>: Vedno "
+"pošlje <em>zavrnjeno</em>. To je samo <b>malo</b> bolje kot pošiljanje "
+"obvestil. Avtor še vedno ve, da je njegovo sporočilo sprožilo odziv, le tega "
+"ne ve, ali je bilo izbrisano ali prebrano.</li><li><em>Vedno pošlji</em>: "
+"Vedno pošlje zahtevno obvestilo. To pomeni, da avtor sporočila zve, kdaj ste "
+"se odzvali na sporočilo in povrhu vsega še celo to, kaj se je z njim "
+"zgodilo. To možnost močno odsvetujemo, ker pa je lahko v nekaterih primerih "
+"zelo koristna, na primer pri odnosih s strankami, je vseeno na voljo.</li></"
+"ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2495,15 +2476,15 @@ msgstr "&Dovoli sporočilomi, da naložijo zunanje reference iz interneta"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>OPOZORILO:</b> Če dovolite uporabo sporočil HTML, s tem povečate tveganje "
-"vdora v vaš sistem preko znanih in pričakovanih varnostnih razpok.<a "
-"href=\"whatsthis:%1\">Več o sporočilih HTML ...</a> <a href=\"whatsthis:%2\">"
-"Več o zunanjih referencah ...</a>"
+"vdora v vaš sistem preko znanih in pričakovanih varnostnih razpok.<a href="
+"\"whatsthis:%1\">Več o sporočilih HTML ...</a> <a href=\"whatsthis:%2\">Več "
+"o zunanjih referencah ...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2564,8 +2545,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>OPOZORILO:</b> Brezpogojno pošiljanje potrditev načenja vašo zasebnost. <a "
-"href=\"whatsthis:%1\">Več o tem ...</a>"
+"<b>OPOZORILO:</b> Brezpogojno pošiljanje potrditev načenja vašo zasebnost. "
+"<a href=\"whatsthis:%1\">Več o tem ...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2586,8 +2567,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Ta možnost zahteva dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "brez posrednika"
@@ -2616,8 +2596,8 @@ msgstr "Iz&vzemi pomembna sporočila iz preteka"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Med iskanjem neprebranih sporočil:"
 
@@ -2641,8 +2621,8 @@ msgstr "išči v zanki v vseh mapah"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Ko vstopiš v mapo:"
 
@@ -2711,26 +2691,23 @@ msgstr "imeniki oblike »maildir«"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>To izbere, katero obliko poštnega predala bo privzeto uporabljena za "
-"krajevne mape:</p>"
-"<p><b>mbox:</b> KMailove mape so iz ene same datoteke. Posamezna sporočila so "
-"med seboj ločena z vrstico, ki se začne z »From «. To varčuje s prostorom na "
-"disku, vendar pa ni tako robustno, npr. pri premikanju pošte med mapami.</p>"
-"<p><b>maildir:</b> KMailove mape so prave mape na disku. Posamezna sporočila so "
-"ločene datoteke. To sicer porabi nekaj dodatnega prostora na disku, vendar je "
-"bolj robustno, npr. pri premikanju pošte med mapami.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>To izbere, katero obliko poštnega predala bo privzeto uporabljena za "
+"krajevne mape:</p><p><b>mbox:</b> KMailove mape so iz ene same datoteke. "
+"Posamezna sporočila so med seboj ločena z vrstico, ki se začne z »From «. To "
+"varčuje s prostorom na disku, vendar pa ni tako robustno, npr. pri "
+"premikanju pošte med mapami.</p><p><b>maildir:</b> KMailove mape so prave "
+"mape na disku. Posamezna sporočila so ločene datoteke. To sicer porabi nekaj "
+"dodatnega prostora na disku, vendar je bolj robustno, npr. pri premikanju "
+"pošte med mapami.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2765,54 +2742,44 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pri skoku na naslednje neprebrano sporočilo se lahko zgodi, da pod trenutnim "
-"sporočilom ni več neprebranih sporočil.</p>"
-"<p><b>Ne išči v zanki:</b> Iskanje se bo ustavilo na zadnjem sporočilu v "
-"trenutni mapi.</p>"
-"<p><b>Išči v zanki:</b> Iskanje se bo nadaljevalo na vrhu seznama sporočil, "
-"vendar ne v naslednji mapi.</p>"
-"<p><b>Išči v zanki v vseh mapah:</b>.Iskanje se bo nadaljevalo na vrhu seznama "
-"sporočil, vendar ne v naslednji mapi. Če ne bo najdeno nobeno sporočilo, se bo "
-"iskanje nadaljevalo v naslednji mapi.</p> "
-"<p>Podobno se bo iskanje za prejšnje neprebrano sporočilo začelo na dnu seznama "
-"sporočil in nadaljevalo v prejšnji mapi v odvisnosti od tega, katera možnost je "
-"izbrana.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Pri skoku na naslednje neprebrano sporočilo se lahko zgodi, da pod "
+"trenutnim sporočilom ni več neprebranih sporočil.</p><p><b>Ne išči v zanki:</"
+"b> Iskanje se bo ustavilo na zadnjem sporočilu v trenutni mapi.</"
+"p><p><b>Išči v zanki:</b> Iskanje se bo nadaljevalo na vrhu seznama "
+"sporočil, vendar ne v naslednji mapi.</p><p><b>Išči v zanki v vseh mapah:</"
+"b>.Iskanje se bo nadaljevalo na vrhu seznama sporočil, vendar ne v naslednji "
+"mapi. Če ne bo najdeno nobeno sporočilo, se bo iskanje nadaljevalo v "
+"naslednji mapi.</p> <p>Podobno se bo iskanje za prejšnje neprebrano "
+"sporočilo začelo na dnu seznama sporočil in nadaljevalo v prejšnji mapi v "
+"odvisnosti od tega, katera možnost je izbrana.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Indeksiranje celotnega besedila omogoča zelo hitro iskanje vsebine vaših "
-"sporočil. Ko je omogočena ta možnost, bo orodjarna za iskanje izbrala sporočila "
-"glede na vsebino.</p> "
-"<p>Indeksiranje potrebuje nekaj prostora na disku (približno pol toliko kot "
-"sporočila).</p> "
-"<p>Po tem ko omogočite to možnost, se bo pričel graditi indeks. Med tem lahko "
-"nadaljujete z uporabo KMail.</p> </qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt> <p>Indeksiranje celotnega besedila omogoča zelo hitro iskanje vsebine "
+"vaših sporočil. Ko je omogočena ta možnost, bo orodjarna za iskanje izbrala "
+"sporočila glede na vsebino.</p> <p>Indeksiranje potrebuje nekaj prostora na "
+"disku (približno pol toliko kot sporočila).</p> <p>Po tem ko omogočite to "
+"možnost, se bo pričel graditi indeks. Med tem lahko nadaljujete z uporabo "
+"KMail.</p> </qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2880,8 +2847,8 @@ msgstr "S&krij imenike skupinskega programja"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "Ko je to označeno, v devesu map ne boste videli map z viri IMAP."
 
 #: configuredialog.cpp:4909
@@ -2892,8 +2859,8 @@ msgstr "Mape z viri &so v računu:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "Ko je to označeno, v devesu map ne boste videli map z viri IMAP."
 
 #: configuredialog.cpp:4921
@@ -2950,19 +2917,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Poimenovanje priloge združljivo z Outlookom"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Samodejno pošiljanje povabil"
@@ -2977,23 +2943,22 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Povabila se običajno pošiljajo kot priloge k sporočilom. To stikalo "
-"povzroči da se povabila pošljejo znotraj sporočil; to je potrebno za pošiljanje "
-"povabil in odgovarjanje Microsoft Outlooku."
-"<br>Vendar pa potem ne prejmete več opisnega besedila, ki ga lahko berejo "
-"poštni programi; ljudem, ki imajo e-poštne programe, ki ne razumejo povabil, se "
-"zdijo sporočila zelo čudna."
-"<br>Ljudje, ki imajo e-poštne programe, ki razumejo povabila, bodo s temi lahko "
-"vseeno delali.</qt>"
+"povzroči da se povabila pošljejo znotraj sporočil; to je potrebno za "
+"pošiljanje povabil in odgovarjanje Microsoft Outlooku.<br>Vendar pa potem ne "
+"prejmete več opisnega besedila, ki ga lahko berejo poštni programi; ljudem, "
+"ki imajo e-poštne programe, ki ne razumejo povabil, se zdijo sporočila zelo "
+"čudna.<br>Ljudje, ki imajo e-poštne programe, ki razumejo povabila, bodo s "
+"temi lahko vseeno delali.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3101,17 +3066,16 @@ msgstr "&Posreduj"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3129,15 +3093,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3201,8 +3165,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Distribucijski seznam z danim imenom <b>%1</b> že obstaja. Prosim, izberite "
-"drugo ime.</qt>"
+"<qt>Distribucijski seznam z danim imenom <b>%1</b> že obstaja. Prosim, "
+"izberite drugo ime.</qt>"
 
 #: editorwatcher.cpp:76
 #, fuzzy
@@ -3211,8 +3175,8 @@ msgstr "Uredi identiteto"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3480,6 +3444,11 @@ msgstr "Izberi mapo"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Izberi vso besedilo"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3511,8 +3480,8 @@ msgstr "Bele&ži dejanja filtrov"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Tu lahko vklopite in izklopite beleženje dejanj filtrov. Seveda se podatki "
 "zbirajo in prikažjo le, če je beleženje vključeno."
@@ -3531,10 +3500,11 @@ msgstr "Vrednostenje filtrnega pravila beleženja"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3555,15 +3525,15 @@ msgstr "neomejeno"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Zbiranje dnevniških zapisov prablja pomnilnik za začasno shranjevanje podatkov; "
-"tu lahko nastavite količino pomilnika, ki se naj uporabi: če velikost zbranih "
-"zapisov preseže to mejo, potem bodo najstarejši zapisi zavrženi dokler meja ni "
-"več presežena."
+"Zbiranje dnevniških zapisov prablja pomnilnik za začasno shranjevanje "
+"podatkov; tu lahko nastavite količino pomilnika, ki se naj uporabi: če "
+"velikost zbranih zapisov preseže to mejo, potem bodo najstarejši zapisi "
+"zavrženi dokler meja ni več presežena."
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3573,7 +3543,7 @@ msgstr ""
 "Ni bilo moč pisati v datoteko %1:\n"
 "»%2« je podroben opis napake."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Napaka KMaila"
@@ -3614,13 +3584,13 @@ msgstr "&Uporabniški določilnik:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Uporabniški določilnik je prijava uporabnika na strežnik IMAP. To je lahko "
-"preprosto uporabniško ime ali poln elektronski naslov uporabnika, kar vam lahko "
-"pove prijava vašega računa na strežnik."
+"preprosto uporabniško ime ali poln elektronski naslov uporabnika, kar vam "
+"lahko pove prijava vašega računa na strežnik."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3671,8 +3641,8 @@ msgstr "Nimate dovoljenja za branje/pisanje v vaši mapi s smetmi."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Podatki še niso pridobljeni s strežnika, prosimo, uporabite »Preveri pošto«."
 
@@ -3684,8 +3654,7 @@ msgstr "Napaka: za to mapo račun IMAP ni določen"
 msgid "Connecting to server %1, please wait..."
 msgstr "Povezovanje na strežnik %1, prosim počakajte  ..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Napaka pri povezovanju na strežnik %1"
@@ -3713,11 +3682,11 @@ msgstr "Dodaj dovoljenja"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Ali res želite odstraniti vaša lastna dovoljenja s te mape? Zate je do nje ne "
-"boste mogli dostopati."
+"Ali res želite odstraniti vaša lastna dovoljenja s te mape? Zate je do nje "
+"ne boste mogli dostopati."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3748,7 +3717,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Krajevne mape"
@@ -3773,9 +3742,9 @@ msgstr "Izberite bližnjico za mapo"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Da izberete ključ ali kombinacijo ključev, ki izberejo trenutno mapo, "
 "kliknite na spodnji gumb in nato pritisnite ključ(e), ki ga(jih) želite "
@@ -3800,11 +3769,20 @@ msgstr "&Prekliči"
 #: folderutil.cpp:93
 #, fuzzy
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr "<qt> mapa izbrisano račun<b></b> mapa račun novo do mapa</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Neznan"
@@ -3929,77 +3907,18 @@ msgstr "Stanje neželene pošte:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>S"
-"<br>p"
-"<br>o"
-"<br>r"
-"<br>o"
-"<br>č"
-"<br>i"
-"<br>l"
-"<br>o"
-"<br> "
-"<br>v"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>S<br>p<br>o<br>r<br>o<br>č<br>i<br>l<br>o<br> <br>v<br> "
+"<br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>i"
-"<br> "
-"<br>s"
-"<br>p"
-"<br>o"
-"<br>r"
-"<br>o"
-"<br>č"
-"<br>i"
-"<br>l"
-"<br>o"
-"<br> "
-"<br>v"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>i<br> <br>s<br>p<br>o<br>r<br>o<br>č<br>i<br>l<br>o<br> "
+"<br>v<br> <br>H<br>T<br>M<br>L</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4011,19 +3930,14 @@ msgstr "&Vaše ime"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Vaše ime</h3>"
-"<p>To polje naj vsebuje vaše ime, kot naj se pojavi v glavi sporočila ki ga "
-"boste odposlali.</p>"
-"<p>Če boste pustili to polje prazno, se vaše resnično ime ne bo pojavilo, "
-"temveč le e-poštni naslov.</p></qt>"
+"<qt><h3>Vaše ime</h3><p>To polje naj vsebuje vaše ime, kot naj se pojavi v "
+"glavi sporočila ki ga boste odposlali.</p><p>Če boste pustili to polje "
+"prazno, se vaše resnično ime ne bo pojavilo, temveč le e-poštni naslov.</p></"
+"qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4031,17 +3945,13 @@ msgstr "Organizacija:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizacija</h3>"
-"<p>To polje naj vsebuje ime vaše organizacije, če želite da naj bo prikazano v "
-"glavi sporočila, ki je poslano.</p>"
-"<p>Popolnoma varno (in običajno) je, da pustite to polje prazno.</p></qt>"
+"<qt><h3>Organizacija</h3><p>To polje naj vsebuje ime vaše organizacije, če "
+"želite da naj bo prikazano v glavi sporočila, ki je poslano.</p><p>Popolnoma "
+"varno (in običajno) je, da pustite to polje prazno.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4050,20 +3960,15 @@ msgstr "&E-poštni naslov:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-poštni naslov</h3>"
-"<p>To polje naj vsebuje vaš polni e-poštni naslov.</p>"
-"<p>Če pustite to polje prazno ali pa ga napačno izpolnite bodo ljudje imeli "
-"težave pri odgovarjanju na vaša sporočila.</p></qt>"
+"<qt><h3>E-poštni naslov</h3><p>To polje naj vsebuje vaš polni e-poštni "
+"naslov.</p><p>Če pustite to polje prazno ali pa ga napačno izpolnite bodo "
+"ljudje imeli težave pri odgovarjanju na vaša sporočila.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4072,21 +3977,12 @@ msgstr "&E-poštni naslov:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4106,23 +4002,22 @@ msgstr "Vaš podpisni ključ OpenPGP"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Izberite ključ OpenPGP, s katerim bi radi digitalno podpisovali vaša sporočila."
+"Izberite ključ OpenPGP, s katerim bi radi digitalno podpisovali vaša "
+"sporočila."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ključ OpenPGP, ki ga boste izbrali tukaj bo uporabljen za digitalno "
-"podpisovanje. Uporabite lahko tudi ključe GnuPG.</p><qt>"
-"To polje lahko pustite prazno, vendar pa KMail ne bo mogel digitalno podpisati "
-"e-pošte z OpenPGP; običajne poštne zmožnosti ne bodo prizadete.</p>"
-"<p>Več o ključih lahko izveste na <a>http://www.gnupg.org</a></qt>"
+"<qt><p>Ključ OpenPGP, ki ga boste izbrali tukaj bo uporabljen za digitalno "
+"podpisovanje. Uporabite lahko tudi ključe GnuPG.</p><qt>To polje lahko "
+"pustite prazno, vendar pa KMail ne bo mogel digitalno podpisati e-pošte z "
+"OpenPGP; običajne poštne zmožnosti ne bodo prizadete.</p><p>Več o ključih "
+"lahko izveste na <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4134,30 +4029,27 @@ msgstr "Vaš šifrirni ključ OpenPGP"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Izberite ključ OpenPGP, ki naj se uporabi za šifriranje vam samim in za "
 "sestavljalnikovo zmožnost »Priloži moj javni ključ«."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Ključ OpenPGP ki ga boste izbrali tukaj bo uporabljen za šifriranje sporočil "
-"samemu sebi in za sestavljalnikovo zmožnost »Priloži moj javni ključ«. "
-"Uporabite lahko tudi ključe PGP.</p>"
-"<p>To polje lahko pustite prazno, vendar pa KMail ne bo mogel šifrirati "
-"sporočil z uporabo OpenPGP. Običajne poštne zmožnosti ne bodo prizadete.</p>"
-"<p>Več o ključih lahko izveste na <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Ključ OpenPGP ki ga boste izbrali tukaj bo uporabljen za šifriranje "
+"sporočil samemu sebi in za sestavljalnikovo zmožnost »Priloži moj javni "
+"ključ«. Uporabite lahko tudi ključe PGP.</p><p>To polje lahko pustite "
+"prazno, vendar pa KMail ne bo mogel šifrirati sporočil z uporabo OpenPGP. "
+"Običajne poštne zmožnosti ne bodo prizadete.</p><p>Več o ključih lahko "
+"izveste na <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4172,22 +4064,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Izberite certifikat S/MIME, ki naj se uporablja za digitalni podpisovanje vaših "
-"sporočil."
+"Izberite certifikat S/MIME, ki naj se uporablja za digitalni podpisovanje "
+"vaših sporočil."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Certifikat S/MIME (X.509) ki ga boste izbrali tukaj bo uporabljen za "
-"digitalno podpisovanje sporočil.</p><qt>To polje lahko pustite prazno, vendar "
-"pa KMail ne bo mogel digitalno podpisati sporočil z uporabo S/MIME; običajne "
-"poštne zmožnosti ne bodo prizadete.</p></qt>"
+"<qt><p>Certifikat S/MIME (X.509) ki ga boste izbrali tukaj bo uporabljen za "
+"digitalno podpisovanje sporočil.</p><qt>To polje lahko pustite prazno, "
+"vendar pa KMail ne bo mogel digitalno podpisati sporočil z uporabo S/MIME; "
+"običajne poštne zmožnosti ne bodo prizadete.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4199,26 +4089,24 @@ msgstr "Vaš šifrirni certifikat S/MIME"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Izberite certifikat S/MIME, ki naj se uporabi med širiranjem vam samim in za "
 "sestavljalnikovo možnost »Priloži moj certifikat«."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Certifikat S/MIME ki ga boste izbrali tukaj bo uporabljen za podpisovanje "
-"sporočil samemu sebi.</p><qt>To polje lahko pustite prazno, vendar pa KMail ne "
-"bo mogel šifrirati odhajajočih sporočil z uporabo S/MIME; običajne poštne "
-"zmožnosti ne bodo prizadete.</p></qt>"
+"<qt><p>Certifikat S/MIME ki ga boste izbrali tukaj bo uporabljen za "
+"podpisovanje sporočil samemu sebi.</p><qt>To polje lahko pustite prazno, "
+"vendar pa KMail ne bo mogel šifrirati odhajajočih sporočil z uporabo S/MIME; "
+"običajne poštne zmožnosti ne bodo prizadete.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4238,23 +4126,19 @@ msgstr "Nas&lov za odgovor:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Naslovi za odgovor</h3>"
-"<p>Vrstica <tt>Odgovori:</tt> vsebuje naslov, ki se razlikuje od običajnega <tt>"
-"Od:</tt>.</p>"
-"<p>To je lahko uporabno če ne primer delate v skupini s podobnimi vlogami. Tako "
-"boste morda želeli, da imajo vsa sporočila, ki jih pošiljate v polju <tt>"
-"Od:</tt> vaš naslov, odgovori pa naj se pošiljajo na naslov skupine.</p>"
-"<p>Če ste v dvomih, pustite to polje prazno.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Naslovi za odgovor</h3><p>Vrstica <tt>Odgovori:</tt> vsebuje naslov, "
+"ki se razlikuje od običajnega <tt>Od:</tt>.</p><p>To je lahko uporabno če ne "
+"primer delate v skupini s podobnimi vlogami. Tako boste morda želeli, da "
+"imajo vsa sporočila, ki jih pošiljate v polju <tt>Od:</tt> vaš naslov, "
+"odgovori pa naj se pošiljajo na naslov skupine.</p><p>Če ste v dvomih, "
+"pustite to polje prazno.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4262,24 +4146,19 @@ msgstr "Naslovi &BBC (slepa kopija):"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Naslovi skp (slepo kopijo naj prejme)</h3>"
-"<p>Naslovi, ki jih vnesete tu, bodo dodani k vsakemu odhajajočemu sporočilu, ki "
-"bo poslano s to identiteto. Drugi prejemniki ga ne bodo videli.</p>"
-"<p>Ta možnost se pogosto uporablja za pošiljanje kopije poslanega sporočila na "
-"kak drug račun, ki ga imate.</p> "
-"<p>Če podate več kot en naslov, jih ločite z vejicami.</p>"
-"<p>Če ste v dvomih, pustite to polje prazno.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Naslovi skp (slepo kopijo naj prejme)</h3><p>Naslovi, ki jih vnesete "
+"tu, bodo dodani k vsakemu odhajajočemu sporočilu, ki bo poslano s to "
+"identiteto. Drugi prejemniki ga ne bodo videli.</p><p>Ta možnost se pogosto "
+"uporablja za pošiljanje kopije poslanega sporočila na kak drug račun, ki ga "
+"imate.</p> <p>Če podate več kot en naslov, jih ločite z vejicami.</p><p>Če "
+"ste v dvomih, pustite to polje prazno.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4319,7 +4198,7 @@ msgstr "&Podpis"
 msgid "&Picture"
 msgstr "S&lika"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Nepravilen e-poštni naslov"
 
@@ -4335,18 +4214,18 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Eden izmed nastavljenih šifrirnih ključev OpenPGP ne vsebuje uporabiškega ID z "
-"nastavljenim e-poštnim naslovom za to identiteto (%1).\n"
-"To bo morda povzročilo, da bo prejemna stran naletela na opozorilo pri poskusu "
-"preverjanja podpisov narejenih s temi nastavitvami."
+"Eden izmed nastavljenih šifrirnih ključev OpenPGP ne vsebuje uporabiškega ID "
+"z nastavljenim e-poštnim naslovom za to identiteto (%1).\n"
+"To bo morda povzročilo, da bo prejemna stran naletela na opozorilo pri "
+"poskusu preverjanja podpisov narejenih s temi nastavitvami."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Eden izmed nastavljenih šifrirnih ključev OpenPGP ne vsebuje uporabiškega ID z "
-"nastavljenim e-poštnim naslovom za to identiteto (%1)."
+"Eden izmed nastavljenih šifrirnih ključev OpenPGP ne vsebuje uporabiškega ID "
+"z nastavljenim e-poštnim naslovom za to identiteto (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4357,16 +4236,16 @@ msgid ""
 msgstr ""
 "Eden izmed nastavljenih certifikatov za podpisovanje S/MIME ne vsebuje "
 "nastavljenega e-poštnega naslova za to identiteto (%1).\n"
-"To bo morda povzročilo, da bo prejemna stran naletela na opozorilo pri poskusu "
-"preverjanja podpisov narejenih s temi nastavitvami."
+"To bo morda povzročilo, da bo prejemna stran naletela na opozorilo pri "
+"poskusu preverjanja podpisov narejenih s temi nastavitvami."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Eden izmed nastavljenih šifrirnih certifikatov S/MIME ne vsebuje nastavljenega "
-"e-poštnega naslova za to identiteto (%1)."
+"Eden izmed nastavljenih šifrirnih certifikatov S/MIME ne vsebuje "
+"nastavljenega e-poštnega naslova za to identiteto (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4385,8 +4264,8 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"Prilagojena mapa za poslano pošto identitete »%1« ne obstaja (več). Zaradi tega "
-"bo uporabljen privzeta mapa za poslano pošto."
+"Prilagojena mapa za poslano pošto identitete »%1« ne obstaja (več). Zaradi "
+"tega bo uporabljen privzeta mapa za poslano pošto."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4407,8 +4286,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (privzeta)"
 
@@ -4455,8 +4334,8 @@ msgstr "KMail a predpona vnos v od račun je od IMAP."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Nastavitve so bile samodejno prenesene, vendar vseeno preverite nastavitve "
 "vašega računa."
@@ -4464,8 +4343,8 @@ msgstr ""
 #: imapaccountbase.cpp:768
 #, fuzzy
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr "do račun."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4504,15 +4383,20 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Napaka: %1"
+
 #: imapaccountbase.cpp:959
 #, fuzzy
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr "do ali."
 
 #: imapaccountbase.cpp:965
@@ -4664,14 +4548,14 @@ msgstr "Arhiv seznama"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4700,300 +4584,242 @@ msgstr "Neuporabni šifrirni kluči"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dneh.</p>\n"
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dnevu.</p>\n"
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dneh.</p>\n"
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dnevu.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dneh.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dneh.</p>\n"
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dnevu.</p>\n"
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dneh.</p>\n"
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dneh.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dnevu.</p>\n"
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dnevu.</p>\n"
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dnevu.</p>\n"
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dneh.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5007,289 +4833,231 @@ msgstr "Certifikat S/MIME kmalu poteče"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> "
-"(ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš ključ OpenPGP za podpisovanje</p><p align=center><b>%1</b> (ID "
+"ključa0x%2)</p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vaš šifrirni ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dneh.</p>\n"
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dnevu.</p>\n"
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dneh.</p>\n"
+"<p>Ključ OpenPGP</p><p align=center><b>%1</b> (ID ključa0x%2)</p><p>poteče v "
+"manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Korenski certifikat</p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dnevu.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dneh.</p>\n"
+"<p>Korenski certifikat</p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska števika %2)</p><p>poteče v manj "
+"kot %n dneh.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš podpisni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dnevu.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>\n"
-"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p>"
-"<p>za vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska števika %2)</p>"
-"<p>poteče v manj kot %n dneh.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dnevu.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>\n"
+"<p>Vmesni certifikat CA</p><p align=center><b>%3</b></p><p>za vaš šifrirni "
+"certifikat S/MIME</p><p align=center><b>%1</b> (serijska števika %2)</"
+"p><p>poteče v manj kot %n dneh.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p>"
-"<p>za certifikat S/MIME</p><p align=center><b>%1</b> (serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dneh.</p>\n"
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dnevu.</p>\n"
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dneh.</p>\n"
+"<p>Vmesni certifikat CA </p><p align=center><b>%3</b></p><p>za certifikat S/"
+"MIME</p><p align=center><b>%1</b> (serijska številka %2)</p><p>poteče v %n "
+"dneh.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dnevu.</p>\n"
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš podpisni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dnevu.</p>\n"
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš šifrirni certifikat S/MIME</p><p align=center><b>%1</b> (serijska "
+"številka %2)</p><p>poteče v %n dneh.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dnevu.</p>\n"
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>\n"
-"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> "
-"(serijska številka %2)</p>"
-"<p>poteče v %n dneh.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dnevu.</p>\n"
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dneh.</p>\n"
+"<p>Vaš certifikat S/MIME za</p><p align=center><b>%1</b> (serijska številka "
+"%2)</p><p>poteče v %n dneh.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5301,17 +5069,18 @@ msgstr "Certifikat S/MIME kmalu poteče"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Eden ali več izmed vaših nastavljenih šifrirnih ključev OpenPGP ali "
 "certifikatov S/MIME ni uporaben. Prosimo, v nastavitvenem pogovornem oknu "
 "ponovno nastavite vaše šifrirne ključe in certifikate za to identiteto.\n"
-"Če boste izbrali nadaljevanje, in ključi so pozneje potrebni, boste vprašani, "
-"kateri ključi se naj uporabijo."
+"Če boste izbrali nadaljevanje, in ključi so pozneje potrebni, boste "
+"vprašani, kateri ključi se naj uporabijo."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5328,8 +5097,8 @@ msgstr ""
 "Eden ali več izmed vaših nastavljenih podpisnih ključev OpenPGP ali "
 "certifikatov S/MIME ni uporaben. Prosimo, v nastavitvenem pogovornem oknu "
 "ponovno nastavite vaše podpisne ključe in certifikate za to identiteto.\n"
-"Če boste izbrali nadaljevanje, in ključi so pozneje potrebni, boste vprašani, "
-"kateri ključi se naj uporabijo."
+"Če boste izbrali nadaljevanje, in ključi so pozneje potrebni, boste "
+"vprašani, kateri ključi se naj uporabijo."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5339,10 +5108,10 @@ msgstr "Neuporabni podpisni ključi"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Pregled lastnosti podpisa prejemnika kaže, da bi moralo biti sporočilo "
 "podpisano z uporabo OpenPGP, vsaj za nekatere prejemnike.\n"
@@ -5355,27 +5124,29 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Pregled lastnosti podpisa prejemnika kaže, da bi moralo biti sporočilo "
 "podpisano z uporabo S/MIME, vsaj za nekatere prejemnike.\n"
-"Kaže, da niste nastavili veljaven podpisni certifikat S/MIME za to identiteto.\n"
+"Kaže, da niste nastavili veljaven podpisni certifikat S/MIME za to "
+"identiteto.\n"
 "Lahko nadaljujete brez šifriranja sebi, vendar vedite, da ne boste mogli "
 "prebrati lastnih sporočil, če naredite tako."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
 "Pregled lastnosti podpisa prejemnika kaže, da bi moralo biti sporočilo "
 "podpisano z uporabo OpenPGP, vsaj za nekatere prejemnike.\n"
-"Kaže, da niste nastavili veljaven podpisni certifikat OpenPGP za to identiteto."
+"Kaže, da niste nastavili veljaven podpisni certifikat OpenPGP za to "
+"identiteto."
 
 #: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
@@ -5383,14 +5154,15 @@ msgstr "Ne podpiši z OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "Pregled lastnosti podpisa prejemnika kaže, da bi moralo biti sporočilo "
 "podpisano z uporabo S/MIME, vsaj za nekatere prejemnike.\n"
-"Kaže, da niste nastavili veljaven podpisni certifikat S/MIME za to identiteto."
+"Kaže, da niste nastavili veljaven podpisni certifikat S/MIME za to "
+"identiteto."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5413,11 +5185,11 @@ msgstr "Podpisovanje ni možno"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Niste izbrali šifrirnega ključa zase (šifriraj sebi). Če ga šifrirate, ne boste "
-"mogli dešifrirati vašega lastnega sporočila."
+"Niste izbrali šifrirnega ključa zase (šifriraj sebi). Če ga šifrirate, ne "
+"boste mogli dešifrirati vašega lastnega sporočila."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5433,16 +5205,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Niste izbrali šifrirnega ključa za prejemnika tega sporočila. Sporočilo ne bo "
-"šifrirano."
+"Niste izbrali šifrirnega ključa za prejemnika tega sporočila. Sporočilo ne "
+"bo šifrirano."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Niste izbrali šifrirnega ključa za kateregakoli od prejemnikov tega sporočila. "
-"Sporočilo ne bo šifrirano."
+"Niste izbrali šifrirnega ključa za kateregakoli od prejemnikov tega "
+"sporočila. Sporočilo ne bo šifrirano."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5461,8 +5233,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Niste izbrali šifrirnega ključa za nekatere izmed prejemnikov: te osebe ne bodo "
-"mogle dešifrirati sporočila, če ga šifrirate."
+"Niste izbrali šifrirnega ključa za nekatere izmed prejemnikov: te osebe ne "
+"bodo mogle dešifrirati sporočila, če ga šifrirate."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5479,18 +5251,19 @@ msgid ""
 msgstr ""
 "Prišlo je do težave s šifrirnim(i) ključ(i) za »%1«.\n"
 "\n"
-"Prosim znova izberite ključ(e), ki naj bo(do) uporabljen(i) za tega prejemnika."
+"Prosim znova izberite ključ(e), ki naj bo(do) uporabljen(i) za tega "
+"prejemnika."
 
 #: keyresolver.cpp:1678
 #, fuzzy
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Ni bilo najdenega in zaupanega šifrirnega ključa za »%1«.\n"
 "\n"
@@ -5539,10 +5312,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritična napaka: Ni moč pobrati pošte: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Ni uspelo dodati sporočila:\n"
+msgid "Failed to add message:\n"
+msgstr "Ni uspelo dodati sporočila:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5587,8 +5358,7 @@ msgstr "Premikanje sporočila %3 od %2 iz %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Ni moč odstraniti sporočila iz poštnega predala <b>%1</b>:"
-"<br>%2</qt>"
+"<qt>Ni moč odstraniti sporočila iz poštnega predala <b>%1</b>:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 msgid ""
@@ -5638,6 +5408,51 @@ msgstr "N&epovezan IMAP"
 msgid "&Maildir mailbox"
 msgstr "Poštni predal &Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Nastavi zadevo sporočila"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Nastavi Kp: na »naslov«"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Nastavi Skp: na »naslov«"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Dodaj »glavo« sporočilu"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Preberi glavo sporočila iz »datoteke«"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Nastavi telo sporočila"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Dodaj prilogo k pošti. To se lahko ponovi"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Preveri le za novo pošto"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Odpri le okno sestavljalnika"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Poglej dano datoteko sporočila"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Pošlji sporočilo na »naslov« oziroma prloži datoteko, na katero kaže »URL«"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Pošta"
@@ -5681,8 +5496,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail bo sedaj ustvaril zahtevane mape za skupinsko delo kot podmape v %1; če "
-"tega ne želite, prekinite dejanje in vir IMAP bo onemogočen"
+"KMail bo sedaj ustvaril zahtevane mape za skupinsko delo kot podmape v %1; "
+"če tega ne želite, prekinite dejanje in vir IMAP bo onemogočen"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5697,12 +5512,12 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"KMail bo sedaj ustvaril zahtevane mape za vire IMAP kot podmape v %1. Če tega "
-"ne želite, kliknite »Ne« in vir IMAP bo onemogočen"
+"KMail bo sedaj ustvaril zahtevane mape za vire IMAP kot podmape v %1. Če "
+"tega ne želite, kliknite »Ne« in vir IMAP bo onemogočen"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5753,11 +5568,11 @@ msgstr "URL kopiran v odložišče."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Datoteka <b>%1</b> že obstaja.<br>Jo želite zamenjati?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Shrani v datoteko"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Zamenjaj"
 
@@ -5775,7 +5590,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5795,128 +5610,130 @@ msgstr "Datoteka ne vsebuje sporočila."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Datoteka vsebuje več sporočil. Prikazano je le prvo sporočilo."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"To je posredovan povzetek MIME. Vsebina sporočila je vsebovana v priponki(ah).\n"
+"To je posredovan povzetek MIME. Vsebina sporočila je vsebovana v "
+"priponki(ah).\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Brisanje sporočil"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Premikanje sporočila %3 od %2 iz %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Je na disku premalo prostora?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Premakni v to mapo"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiraj v to mapo"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Premikanje sporočil"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Brisanje sporočil"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Odpiranje URL-ja ..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ali res želite izvesti <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Izvedi"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nobenih prilog za shranjevanje ni bilo moč najti."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Shrani prilogo v"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "priloga.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "priloga.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Datoteka z imenom %1 že obstaja. Jo želite nadomestiti?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Datoteka že obstaja"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Nadomesti"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"Del %1 sporočila je šifriran. Ali želite pri shranjevanju ohraniti šifriranje?"
+"Del %1 sporočila je šifriran. Ali želite pri shranjevanju ohraniti "
+"šifriranje?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "VPrašanje KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Obdrži šifriranje"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ne obdrži"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Del %1 sporočila je podpisan. Ali želite pri shranjevanju ohraniti podpis?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Obdrži podpis"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5925,22 +5742,22 @@ msgstr ""
 "Ni moč pisati datoteke %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Ni moč pisati datoteke %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Za ta vnos v adresarju ne obstaja e-poštni naslov. Dodajte ga v adresar in nato "
-"z uporabo vašega željenega odjemalca za sporočanje dodajte naslov za sprotno "
-"sporočanje."
+"Za ta vnos v adresarju ne obstaja e-poštni naslov. Dodajte ga v adresar in "
+"nato z uporabo vašega željenega odjemalca za sporočanje dodajte naslov za "
+"sprotno sporočanje."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5950,74 +5767,74 @@ msgstr ""
 " %1\n"
 " ni moč ugotoviti s kom naj poteka klepet."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 #, fuzzy
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr "Chiasmus x funkcija."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Napaka vmesnika Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 #, fuzzy
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr "od Chiasmus x funkcija a niz seznam."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 #, fuzzy
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr "Ne a ključ pot set v Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Izbira šifrirnaga ključa"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 #, fuzzy
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus x funkcija."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 #, fuzzy
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr "x funkcija."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 #, fuzzy
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus Dešifriranje Napaka"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 #, fuzzy
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr "od Chiasmus x funkcija a."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Pošta"
@@ -6116,7 +5933,7 @@ msgstr "Velikost"
 msgid "Encoding"
 msgstr "Kodni nabor"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Stisni"
 
@@ -6128,7 +5945,7 @@ msgstr "Šifriraj"
 msgid "Sign"
 msgstr "Podpiši"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Ime priloge:"
 
@@ -6150,10 +5967,11 @@ msgstr "Glavni prejemniki"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>E-poštni naslovi, ki jih navedete v tem polju prejmejo kopijo "
-"e-sporočila.</qt>"
+"<qt>E-poštni naslovi, ki jih navedete v tem polju prejmejo kopijo e-"
+"sporočila.</qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6162,13 +5980,13 @@ msgstr "Dodatni prejemniki"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>E-poštni naslovi, ki jih navedete v tem polju prejmejo kopijo sporočila. "
-"Tehnični gre za isto stvar kot če bi navedli naslove v polje <b>Za:</b>"
-"m vendar se razlikuje v tem, da simbolizira, da je prejemnik kopuje (Kp) "
+"Tehnični gre za isto stvar kot če bi navedli naslove v polje <b>Za:</b>m "
+"vendar se razlikuje v tem, da simbolizira, da je prejemnik kopuje (Kp) "
 "poslušalec in ne glavni prejemnik.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6177,12 +5995,11 @@ msgstr "Skriti prejemniki"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>V bistvu enako kot pri polju <b>Kopija za:</b>, vendar se razlikuje v tem, "
-"da ostali prejemniki ne vidijo, kdo je prejel slepo kopijo.</qt>"
+"<qt>V bistvu enako kot pri polju <b>Kopija za:</b>, vendar se razlikuje v "
+"tem, da ostali prejemniki ne vidijo, kdo je prejel slepo kopijo.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6192,7 +6009,7 @@ msgstr "Pošl&ji pošto"
 msgid "&Send Mail Via"
 msgstr "Pošlji poš&to preko"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Pošlji &kasneje"
@@ -6259,8 +6076,7 @@ msgstr "O&dstrani zanke za citiranje"
 msgid "Cl&ean Spaces"
 msgstr "Po&briši presledke"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Uporabi pisavo s&talne širine"
@@ -6403,31 +6219,31 @@ msgstr "&Kriptografska oblika spročil"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standarden"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Označen seznam (disk)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Označen seznam (krog)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Označen seznam (kvadrat)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Razvrščen seznam (števila)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Razvrščen seznam (male črke)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Razvršen seznam (velike črke)"
 
@@ -6536,61 +6352,61 @@ msgstr "&Zapri Sestavljalnik"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Sporočilo, ki ste ga sestavili se sklicuje na pripeto datoteko, vendar mu niste "
-"pripeli ničesar.\n"
+"Sporočilo, ki ste ga sestavili se sklicuje na pripeto datoteko, vendar mu "
+"niste pripeli ničesar.\n"
 "Želite temu sporočilu pripeti datoteko?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Opomnik za pripenjanje datotek"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Pošlji kot je"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail ni uspel prepoznati lokacije priloge (%1).</p>"
-"<p>Določiti morate polno pot, če želite priložiti datoteko.</p></qt>"
+"<qt><p>KMail ni uspel prepoznati lokacije priloge (%1).</p><p>Določiti "
+"morate polno pot, če želite priložiti datoteko.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Priloži datoteko"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Priloži"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Vstavi datoteko"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Prišlo je do napake pri izvažanju ključa iz vmesnika:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Prišlo je do napake pri izvažanju ključa iz vmesnika:</p><p><b>%1</"
+"b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6629,189 +6445,198 @@ msgid ""
 "View"
 msgstr "Ogled"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Uredi ..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Uredi skript ..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Shrani &kot ..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Lastnosti"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Dodaj prilogo ..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail ni mogel stisniti datoteke."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Stisnjena datoteka je večja od prvotne. Želite ohraniti prvotno datoteko?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Ohrani"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail ni mogel razširiti datoteke."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Shrani prilogo kot"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Dodaj ko besedilo"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Dodaj kot prilogo"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Prilepi kot prilo&go"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "neimenovano"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zahtevali ste, da se sporočila šifrirajo samim sebi, vendar pa trenutno "
-"izbrana identiteta ne določa šifrirnega ključa (OpenPGP ali S/MIME) za to.</p>"
-"<p>Prosim izberite ključ(e) za uporabo pri nastavitvi identitete.</p></qt>"
+"<qt><p>Zahtevali ste, da se sporočila šifrirajo samim sebi, vendar pa "
+"trenutno izbrana identiteta ne določa šifrirnega ključa (OpenPGP ali S/MIME) "
+"za to.</p><p>Prosim izberite ključ(e) za uporabo pri nastavitvi identitete.</"
+"p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Nedefiniran šifrirni ključ"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Da bi lahko podpisali to sporočilo, morate najprej določiti ključ (OpenPGP "
-"ali S/MIME), ki se naj uporablja za to.</p> "
-"<p>Prosimo, izberite ključ,  ki naj se uporablja pri nastavitvi identitete.</p>"
-"</qt>"
+"<qt> <p>Da bi lahko podpisali to sporočilo, morate najprej določiti ključ "
+"(OpenPGP ali S/MIME), ki se naj uporablja za to.</p> <p>Prosimo, izberite "
+"ključ,  ki naj se uporablja pri nastavitvi identitete.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nedefiniran podpišujoči ključ"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"KMail trenutno deluje v nepovezanem načinu, vaša sporočila bodo ostala v mapi "
-"odhajajočih dokler se ne povežete."
+"KMail trenutno deluje v nepovezanem načinu, vaša sporočila bodo ostala v "
+"mapi odhajajočih dokler se ne povežete."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Povezan/nepovezan"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "V polje Od: morate vnesti vaš e-poštni naslov. Prav tako nastavite e-poštne "
 "naslove za vse identite, tako da vam jih ne boste trea vnašati za vsako "
 "sporočilo."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Določiti morate vsaj enega prejemnika v polju »Za« ali »Kp« ali »Skp«."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Niste vpisali zadeve. Vseeno pošljem sporočilo?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Ime ni navedeno"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste vpisali zadeve. Vseeno pošljem sporočilo?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Brez »Zadeve«"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "P&ošlji kot je"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Navedi »Zadevo«."
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "P&usti označevanje, ne podpiši ali šifriraj"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "P&usti označevanje, ne šifriraj"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "P&usti označevanje, ne podpiši"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Podpiši/Šifriraj (zbriši označevanje)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Šifriraj (zbriši označevanje)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Podpiši (zbriši označevanje)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Notranje šifriranje oz. podpisovanje sporočil HTML ni možno;</p>"
-"<p>Želite zbrisati vašo označbo?</p></qt>"
+"<qt><p>Notranje šifriranje oz. podpisovanje sporočil HTML ni možno;</"
+"p><p>Želite zbrisati vašo označbo?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Podpišem/Šifriram sporočilo?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6820,110 +6645,110 @@ msgstr ""
 "Prilagojena mapa za osnutke identitete »%1« ne obstaja (več). Zaradi tega bo "
 "uporabljen privzeta mapa za osnutke."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Prosim ustvarite račun in poskusite znova."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Poslana bo e-pošta ..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Pošlji potrdilo"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Pošlji &zdaj"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Brez prejemnikov"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Dodatni prejemniki"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Črkovalnik"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Črkovalnik"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Preverjanje črkovanja preklicano."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Preverjanje črkovanja ustavljeno."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Preverjanje črkovanja končano."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Črkovalnik"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 #, fuzzy
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr "a Vmesnik do za Chiasmus prva v od s Varnost stran."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 #, fuzzy
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr "Chiasmus Vi do."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 #, fuzzy
 msgid "No Chiasmus Backend Configured"
 msgstr "Ne Chiasmus Vmesnik"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Ni najdenega podpisa"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Izbira šifrirnega ključa"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Sporočilo je podpisal %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Sporočilo je podpisal %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Sporočilo z OpenPGP - šifrirano"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Sporočilo z zadevo: "
@@ -6973,11 +6798,11 @@ msgstr "Preveranje črkovanja - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"ISpella/Aspella ni mogoče pognati. Preverite, da je ISpell ali Aspell pravilno "
-"nastavljen in v vaši PATH."
+"ISpella/Aspella ni mogoče pognati. Preverite, da je ISpell ali Aspell "
+"pravilno nastavljen in v vaši PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -7010,13 +6835,11 @@ msgstr "<qt>Preveč dejanj filtra v pravilu <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Neznano dejanje filtra <b>%1</b>"
-"<br>v pravilu <b>%2</b>."
-"<br>Dejanje bom prezrl.</qt>"
+"<qt>Neznano dejanje filtra <b>%1</b><br>v pravilu <b>%2</b>.<br>Dejanje bom "
+"prezrl.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7235,166 +7058,135 @@ msgstr "Zaigraj zvok"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>To je seznam definiranih filtrov. Uporabljajo se z vrha navzdol.</p>"
-"<p>Kliknite na katerikoli filter za urejanje z uporabo gumbov na desni polovici "
-"pogovornega okna.</p></qt>"
+"<qt><p>To je seznam definiranih filtrov. Uporabljajo se z vrha navzdol.</"
+"p><p>Kliknite na katerikoli filter za urejanje z uporabo gumbov na desni "
+"polovici pogovornega okna.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za ustvarjanje novega filtra.</p>"
-"<p>Vstavljen bo pred trenutno izbranim, vendar ga lahko kasneje premaknete.</p>"
-"<p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s klikom na "
-"gumb <em>Izbriši</em>.</p></qt>"
+"<qt><p>Kliknite ta gumb za ustvarjanje novega filtra.</p><p>Vstavljen bo "
+"pred trenutno izbranim, vendar ga lahko kasneje premaknete.</p><p>Če ste ta "
+"gumb kliknili pomotoma, potem lahko to razveljavite s klikom na gumb "
+"<em>Izbriši</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za kopiranje novega filtra.</p>"
-"<p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s klikom na "
-"gumb <em>Izbriši</em>.</p></qt>"
+"<qt><p>Kliknite ta gumb za kopiranje novega filtra.</p><p>Če ste ta gumb "
+"kliknili pomotoma, potem lahko to razveljavite s klikom na gumb <em>Izbriši</"
+"em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za <em>izbris</em> trenutno izbranega filtra iz zgornjega "
-"seznama.</p>"
-"<p>Ko enkrat izbrišete filter, ga ne morete več dobiti nazaj, vendar pa lahko "
-"pogovorno okno zapustite z gumbom <em>Prekliči</em>, da bi zavrgli narejene "
-"spremembe.</p></qt>"
+"<qt><p>Kliknite ta gumb za <em>izbris</em> trenutno izbranega filtra iz "
+"zgornjega seznama.</p><p>Ko enkrat izbrišete filter, ga ne morete več dobiti "
+"nazaj, vendar pa lahko pogovorno okno zapustite z gumbom <em>Prekliči</em>, "
+"da bi zavrgli narejene spremembe.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za premik trenutno izbranega filtra <em>dol</em> "
-"v zgornjem seznamu.</p>"
-"<p>To je uporabno, ker vrstni red fitrov v seznamu določa vrstni red uporabe "
-"filtrov na sporočilih; najvišji filter poskuša prvi.</p>"
-"<p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s klikom na "
-"gumb <em>Gor</em>.</p></qt>"
+"<qt><p>Kliknite ta gumb za premik trenutno izbranega filtra <em>dol</em> v "
+"zgornjem seznamu.</p><p>To je uporabno, ker vrstni red fitrov v seznamu "
+"določa vrstni red uporabe filtrov na sporočilih; najvišji filter poskuša "
+"prvi.</p><p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s "
+"klikom na gumb <em>Gor</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za premik trenutno izbranega filtra <em>gor</em> "
-"v zgornjem seznamu.</p>"
-"<p>To je uporabno, ker vrstni red fitrov v seznamu določa vrstni red uporabe "
-"filtrov na sporočilih; najvišji filter poskuša prvi.</p>"
-"<p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s klikom na "
-"gumb <em>Dol</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Kliknite ta gumb za premik trenutno izbranega filtra <em>gor</em> v "
+"zgornjem seznamu.</p><p>To je uporabno, ker vrstni red fitrov v seznamu "
+"določa vrstni red uporabe filtrov na sporočilih; najvišji filter poskuša "
+"prvi.</p><p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s "
+"klikom na gumb <em>Dol</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za premik trenutno izbranega filtra <em>dol</em> "
-"v zgornjem seznamu.</p>"
-"<p>To je uporabno, ker vrstni red fitrov v seznamu določa vrstni red uporabe "
-"filtrov na sporočilih; najvišji filter poskuša prvi.</p>"
-"<p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s klikom na "
-"gumb <em>Gor</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Kliknite ta gumb za premik trenutno izbranega filtra <em>dol</em> v "
+"zgornjem seznamu.</p><p>To je uporabno, ker vrstni red fitrov v seznamu "
+"določa vrstni red uporabe filtrov na sporočilih; najvišji filter poskuša "
+"prvi.</p><p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s "
+"klikom na gumb <em>Gor</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za premik trenutno izbranega filtra <em>dol</em> "
-"v zgornjem seznamu.</p>"
-"<p>To je uporabno, ker vrstni red fitrov v seznamu določa vrstni red uporabe "
-"filtrov na sporočilih; najvišji filter poskuša prvi.</p>"
-"<p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s klikom na "
-"gumb <em>Gor</em>.</p></qt>"
+"<qt><p>Kliknite ta gumb za premik trenutno izbranega filtra <em>dol</em> v "
+"zgornjem seznamu.</p><p>To je uporabno, ker vrstni red fitrov v seznamu "
+"določa vrstni red uporabe filtrov na sporočilih; najvišji filter poskuša "
+"prvi.</p><p>Če ste ta gumb kliknili pomotoma, potem lahko to razveljavite s "
+"klikom na gumb <em>Gor</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb za preimenovanje trenutno izbranega filtra.</p>"
-"<p>Filtri so imenovani samodejno, dokler se začnejo z » << «.</p>"
-"<p>Če ste ta gumb kliknili pomotoma in spet želite samodejno poimenovanje, "
-"kliknite ta gumb in izberite <em>Počisti</em> in nato <em>V redu</em> "
-"v pogovornem oknu, ki se zatem prikaže.</p></qt>"
+"<qt><p>Kliknite ta gumb za preimenovanje trenutno izbranega filtra.</"
+"p><p>Filtri so imenovani samodejno, dokler se začnejo z » << «.</p><p>Če ste "
+"ta gumb kliknili pomotoma in spet želite samodejno poimenovanje, kliknite ta "
+"gumb in izberite <em>Počisti</em> in nato <em>V redu</em> v pogovornem oknu, "
+"ki se zatem prikaže.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite ta gumb, da bi prisilili potrditveno okno k prikazu.</p>"
-"<p>To je uporabno, če ste določili niz pravil, ki označi sporočila za kasnejše "
-"pobiranje. Brez te možnosti bi se ta sporočila nikoli ne mogla pobrati, če ne "
-"bi na strežniku čakala druga velika sporočila, ali pa bi hoteli spremeniti niz "
-"pravil za označevanje sporočil.</p></qt>"
+"<qt><p>Kliknite ta gumb, da bi prisilili potrditveno okno k prikazu.</"
+"p><p>To je uporabno, če ste določili niz pravil, ki označi sporočila za "
+"kasnejše pobiranje. Brez te možnosti bi se ta sporočila nikoli ne mogla "
+"pobrati, če ne bi na strežniku čakala druga velika sporočila, ali pa bi "
+"hoteli spremeniti niz pravil za označevanje sporočil.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7404,6 +7196,16 @@ msgstr "Pravila za filtriranje POP3"
 msgid "Filter Rules"
 msgstr "Pravila za filtriranje"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Uvozi"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Uvozi"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Dostopni filtri"
@@ -7485,6 +7287,11 @@ msgstr "Dodatno dodaj ta filter v orodjarno"
 msgid "Icon for this filter:"
 msgstr "Ikona za ta filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Do"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Gor"
@@ -7493,16 +7300,29 @@ msgstr "Gor"
 msgid "Down"
 msgstr "Dol"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Preimenuj ..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Novo"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopiraj v"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Zbrisano"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7512,8 +7332,8 @@ msgstr "Izberite bližnjico za mapo"
 #, fuzzy
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr "eden filter a mapa vključeno na zvezi IMAP račun in na zvezi IMAP."
 
 #: kmfilterdlg.cpp:786
@@ -7592,28 +7412,25 @@ msgstr "Odpravljanje napak predpomnilnika IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Odpravljanje težav predpomnilnika IMAP.</b></p>"
-"<p>Če imate težave z usklajevanjem mape IMAP, poskusite najprej ponovno "
-"zgraditi indeksno datoteko. To bo morda vzelo nekaj časa, vendat ne bo "
-"povzročilo nobenih težav.</p>"
-"<p>Če to ne zadošča, lahko poizkusite z osveževanjem predpomnilnika IMAP. Pri "
-"tem boste izgubili vse krajevne spremembe v tej mapi in vse njene podmape.</p>"
+"<p><b>Odpravljanje težav predpomnilnika IMAP.</b></p><p>Če imate težave z "
+"usklajevanjem mape IMAP, poskusite najprej ponovno zgraditi indeksno "
+"datoteko. To bo morda vzelo nekaj časa, vendat ne bo povzročilo nobenih "
+"težav.</p><p>Če to ne zadošča, lahko poizkusite z osveževanjem "
+"predpomnilnika IMAP. Pri tem boste izgubili vse krajevne spremembe v tej "
+"mapi in vse njene podmape.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7650,14 +7467,15 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
-"Preden želite preimenovati mapo, se morate opraviti usklajevanje s strežnikom."
+"Preden želite preimenovati mapo, se morate opraviti usklajevanje s "
+"strežnikom."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7691,8 +7509,8 @@ msgstr "Indeks te mape je bil ponovno ustvarjen."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 "Mapa %1 ni v začetnem usklajenem stanju (stanje je bilo %2). Jo želite "
 "ponastaviti v prvotno stanje in vseeno opraviti usklajevanje?"
@@ -7825,14 +7643,11 @@ msgstr "Ustvarjanje podmap na strežniku"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kaže, da je bila mapa <b>%1</b> zbrisana. Jo želite zbrisati s strežnika?</p>"
-"</qt>"
+"<qt><p>Kaže, da je bila mapa <b>%1</b> zbrisana. Jo želite zbrisati s "
+"strežnika?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7853,13 +7668,11 @@ msgstr "Pridobivanje seznama map"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kaže, da je bila mapa <b>%1</b> zbrisana. Jo želite zbrisati s strežnika?</p>"
-"</qt>"
+"<qt><p>Kaže, da je bila mapa <b>%1</b> zbrisana. Jo želite zbrisati s "
+"strežnika?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7867,8 +7680,8 @@ msgstr "Prekinjeno"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "Strežnik IMAP %1 ne podpira zaznamkov IMAP. Shranjevanje XML ne more biti "
 "uporabljeno na tem strežniku. Prosim, nastavite KMail drugače."
@@ -7876,8 +7689,8 @@ msgstr ""
 #: kmfoldercachedimap.cpp:2840
 #, fuzzy
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "Strežnik IMAP %1 ne podpira zaznamkov IMAP. Shranjevanje XML ne more biti "
 "uporabljeno na tem strežniku. Prosim, nastavite KMail drugače."
@@ -7893,14 +7706,14 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p> novo v mapa do do vključeno mapa sedaj do do od novo do ali od mapa</p>"
-"<p> do do mapa sedaj</p>"
+"<p> novo v mapa do do vključeno mapa sedaj do do od novo do ali od mapa</"
+"p><p> do do mapa sedaj</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7909,17 +7722,22 @@ msgstr ""
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p> novo v mapa do do vključeno mapa sedaj do do od novo do ali od mapa</p>"
-"<p> do do mapa sedaj</p>"
+"<p> novo v mapa do do vključeno mapa sedaj do do od novo do ali od mapa</"
+"p><p> do do mapa sedaj</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Premakni v:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ne premakni"
 
@@ -7931,8 +7749,7 @@ msgstr "Premakni sporočila v mapo"
 msgid "Permissions (ACL)"
 msgstr "Dovoljenja (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Splošno"
@@ -7957,8 +7774,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Uporabi &ikone po meri"
@@ -7977,23 +7793,21 @@ msgstr "Reagiraj ob novi/neprebrani pošti v tej mapi"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Če je ta možnost omogočena, boste obveščeni o novi/neprebrani pošti v tej "
-"mapi. Poleg tega se bo pomikanje na naslednjo/predhodno mapo z neprebranimi "
-"sporočili ustavilo pri tej mapi.</p> "
-"<p>Če ne želite biti obveščeni o novi/neprebrani pošti, ali če želite "
-"preskočiti to mapo pri premikanju na naslednjo/prdhodno mapo z neprebranimi "
-"sporočili, te možnosti ne omogočite. To je uporabno, če želite spregledati "
-"novo/neprebrano pošto v Smeteh ali mapi z neželeno pošto</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Če je ta možnost omogočena, boste obveščeni o novi/neprebrani pošti v "
+"tej mapi. Poleg tega se bo pomikanje na naslednjo/predhodno mapo z "
+"neprebranimi sporočili ustavilo pri tej mapi.</p> <p>Če ne želite biti "
+"obveščeni o novi/neprebrani pošti, ali če želite preskočiti to mapo pri "
+"premikanju na naslednjo/prdhodno mapo z neprebranimi sporočili, te možnosti "
+"ne omogočite. To je uporabno, če želite spregledati novo/neprebrano pošto v "
+"Smeteh ali mapi z neželeno pošto</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -8005,12 +7819,12 @@ msgstr "Pusti odgovore v tej mapi"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Označite to možnost če želite, da so odgovori na sporočila v tej mapi, potem ko "
-"so poslani, prav tako shranjeni v tej mapi namesto v nastavljeni mapi "
+"Označite to možnost če želite, da so odgovori na sporočila v tej mapi, potem "
+"ko so poslani, prav tako shranjeni v tej mapi namesto v nastavljeni mapi "
 "»poslano«."
 
 #: kmfolderdia.cpp:459
@@ -8021,17 +7835,21 @@ msgstr "Prikaži stolpec Pošiljatelj/Prejemnik v seznamu sporočil"
 msgid "Sho&w column:"
 msgstr "Pri&kaži stolpec:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Nastavi privzeto"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Prejemnik"
@@ -8042,17 +7860,17 @@ msgstr "Identiteta pošil&jatelja:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Izberite identiteto pošiljatelja, ki se uporabi pri pisanju novih sporočil ali "
-"odgovarjanju sporočilom v tej mapi. To pomeni, da če ste v eni izmed delovnih "
-"map, lahko KMail samodejno uporabi ustrezne elektronske naslove pošiljatelja, "
-"podpis in ključe podpisovanja in šifriranja. Identitete se lahko nastavijo v "
-"glavnem nastavitvenem okn (Nastavitve -> Nastavi KMail)"
+"Izberite identiteto pošiljatelja, ki se uporabi pri pisanju novih sporočil "
+"ali odgovarjanju sporočilom v tej mapi. To pomeni, da če ste v eni izmed "
+"delovnih map, lahko KMail samodejno uporabi ustrezne elektronske naslove "
+"pošiljatelja, podpis in ključe podpisovanja in šifriranja. Identitete se "
+"lahko nastavijo v glavnem nastavitvenem okn (Nastavitve -> Nastavi KMail)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -8071,16 +7889,16 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
-"mapa v in za ali opravila v mapa do Koledar in Opravilo za opravila je za n a "
-"mapa za Skrbniki ne vključeno mapa a skupina a Koledar za skupina vse od za "
-"mapa v Nihče je do."
+"mapa v in za ali opravila v mapa do Koledar in Opravilo za opravila je za n "
+"a mapa za Skrbniki ne vključeno mapa a skupina a Koledar za skupina vse od "
+"za mapa v Nihče je do."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8111,18 +7929,18 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 #, fuzzy
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Vi mapa do vsebujejo in splošno do je set mapa je do mapa do onemogoči od do "
 "do."
@@ -8195,7 +8013,8 @@ msgstr "Napaka pri pridobivanju informacij o mapi."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Poštni indeks za »%1« je od neznane različice KMaila (%2).\n"
 "Ta indeks je možno ponovno ustvariti iz vaše poštne mape, vendar pa so lahko "
@@ -8227,8 +8046,8 @@ msgstr "Napaka pri odpiranju %1; te mape ni."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Napaka pri odpiranju %1. To ni veljavna poštna mapa ali pa nimate zadostnih "
 "dovoljenj."
@@ -8249,7 +8068,8 @@ msgstr "Sporočilo do mapa disk je."
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
-"KMFolderMaildir::addMsg: neobičajna prekinitev, da se prepreči izguba podatkov."
+"KMFolderMaildir::addMsg: neobičajna prekinitev, da se prepreči izguba "
+"podatkov."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8273,21 +8093,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Indeks mape »%2« je očitno potekel. Da se sporočila ne bi okvarila, bo "
-"indeks ponovno ustvarjen. Posledica tega je lahko, da se zbrisana sporočila "
-"znova pojavijo, zastavice stanja pa lahko izgubijo.</p> "
-"<p>Prosim preberite pripadajoč vnos v oddelku <a href=\"%1\">"
-"Vprašanja in odgovori priročnika KMail</a> za informacije o tem, kako "
-"preprečiti ponovitev tega problema.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt> <p>Indeks mape »%2« je očitno potekel. Da se sporočila ne bi okvarila, "
+"bo indeks ponovno ustvarjen. Posledica tega je lahko, da se zbrisana "
+"sporočila znova pojavijo, zastavice stanja pa lahko izgubijo.</p> <p>Prosim "
+"preberite pripadajoč vnos v oddelku <a href=\"%1\">Vprašanja in odgovori "
+"priročnika KMail</a> za informacije o tem, kako preprečiti ponovitev tega "
+"problema.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8350,7 +8167,7 @@ msgstr ""
 "Videti je, da »%1« ni mapa.\n"
 "Prosim, odstranite datoteko s poti."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8358,7 +8175,7 @@ msgstr ""
 "Dovoljenja za mapo »%1« niso pravilna.\n"
 "Prosimo, poskrbite da lahko vidite in spreminjate vsebino te mape."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8368,8 +8185,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8377,7 +8194,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Ni moč ustvariti mape"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8480,13 +8297,13 @@ msgstr "Odpravi napa&ke v predpomnilniku IMAP ..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Ni moč ustvariti mape <b>%1</b> zaradi nezadostnih dovoljenj na strežniku. "
-"Če menite, da bi smeli ustvarjati podmape, vprašajte vašega skrbnika, da vam "
-"dodeli ustrezne pravice.</qt> "
+"<qt>Ni moč ustvariti mape <b>%1</b> zaradi nezadostnih dovoljenj na "
+"strežniku. Če menite, da bi smeli ustvarjati podmape, vprašajte vašega "
+"skrbnika, da vam dodeli ustrezne pravice.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8629,19 +8446,19 @@ msgstr "%1 Mapo je moč samo brati."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ali res želite izbrisati %n izbranih sporočil? "
-"<br>Ko so enkrat izbrisana, jih ni več moč obnoviti.</qt>\n"
-"<qt>Ali res želite izbrisati %n izbrano sporočilo? "
-"<br>Ko je enkrat izbrisano, ga ni več moč obnoviti.</qt>\n"
-"<qt>Ali res želite izbrisati %n izbrani sporočili? "
-"<br>Ko sta enkrat izbrisani, ju ni več moč obnoviti.</qt>\n"
-"<qt>Ali res želite izbrisati %n izbrana sporočila? "
-"<br>Ko so enkrat izbrisana, jih ni več moč obnoviti.</qt>"
+"<qt>Ali res želite izbrisati %n izbranih sporočil? <br>Ko so enkrat "
+"izbrisana, jih ni več moč obnoviti.</qt>\n"
+"<qt>Ali res želite izbrisati %n izbrano sporočilo? <br>Ko je enkrat "
+"izbrisano, ga ni več moč obnoviti.</qt>\n"
+"<qt>Ali res želite izbrisati %n izbrani sporočili? <br>Ko sta enkrat "
+"izbrisani, ju ni več moč obnoviti.</qt>\n"
+"<qt>Ali res želite izbrisati %n izbrana sporočila? <br>Ko so enkrat "
+"izbrisana, jih ni več moč obnoviti.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8693,137 +8510,136 @@ msgstr ""
 "Napaka pri spreminjanju %1\n"
 "(Mogoče ni več prostora na napravi?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Prošnja za podpis certifikata"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Prosim, ustvarite ta certifikat iz priloge in ga vrnite pošiljatelju."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
-"KMail je pripravljen za delo v odklopljenem načinu. Vsa opravila so ustavljena"
+"KMail je pripravljen za delo v odklopljenem načinu. Vsa opravila so "
+"ustavljena"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail je pripravljen za delo v priklopljenem načinu; vsa omrežna opravila se "
 "nadaljujejo"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail deluje v nepovezanem načinu. Kako želite nadaljevati?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Delaj povezano"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Delaj nepovezano"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nimate dovoljenja za branje/pisanje vaše mape prejete pošte (inbox)."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "odhajajoče"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "Nimate dovoljenja za branje/pisanje vaše mape odhajajoče pošte (outbox)."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "poslano"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Nimate dovoljenja za branje/pisanje v vaši mapi sent-mail."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "smeti"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nimate dovoljenja za branje/pisanje v vaši mapi s smetmi."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "osnutki"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nimate dovoljenja za branje/pisanje v vaši mapi z osnutki."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Zamenjaj"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nimate dovoljenja za branje/pisanje v vaši mapi s smetmi."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Zadnje iskanje"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Mapa <i>%4</i> obstaja. %1 sedaj uporablja mapo <i>%5</i> "
-"za svoja sporočila."
-"<p>%2 lahko premakne vsebino mape <i>%6<i> v to mapo, vendar pa to lahko "
-"zamenja obstoječe datoteke z enakim imenom v <i>%7</i>."
-"<p><strong>Ali želite, da %3 sedaj premakne poštne datoteke?</strong></qt>"
+"<qt>Mapa <i>%4</i> obstaja. %1 sedaj uporablja mapo <i>%5</i> za svoja "
+"sporočila.<p>%2 lahko premakne vsebino mape <i>%6<i> v to mapo, vendar pa to "
+"lahko zamenja obstoječe datoteke z enakim imenom v <i>%7</i>.<p><strong>Ali "
+"želite, da %3 sedaj premakne poštne datoteke?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Mapa <i>%4</i> obstaja. %1 sedaj uporablja mapo <i>%5</i> "
-"za svoja sporočila. %2 lahko premakne vsebino mape <i>%6<i> v to mapo."
-"<p><strong>Ali želite, da %3 sedaj premakne poštne datoteke?</strong></qt>"
+"<qt>Mapa <i>%4</i> obstaja. %1 sedaj uporablja mapo <i>%5</i> za svoja "
+"sporočila. %2 lahko premakne vsebino mape <i>%6<i> v to mapo.<p><strong>Ali "
+"želite, da %3 sedaj premakne poštne datoteke?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Preselim datoteke s pošto?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail je naletel na kritično napako in bo končal"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8834,11 +8650,11 @@ msgstr ""
 "Napaka je bila:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Izprazni smeti"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ali zares želite izprazniti mapo s smetmi za vse račune?"
 
@@ -8916,8 +8732,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Prispela je nova pošta</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8955,11 +8770,11 @@ msgstr "Ali zares želite izprazniti mapo s smetmi?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Ste prepričani, da želite premakniti vsa sporočila iz mape <b>%1</b> "
-"v smeti?</qt>"
+"<qt>Ste prepričani, da želite premakniti vsa sporočila iz mape <b>%1</b> v "
+"smeti?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8983,11 +8798,12 @@ msgstr "Izbriši mapo iskanja"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt>Ste prepričani, da želite izbrisati iskalno mapo <b>%1</b>? "
-"<br>Sporočila ki so prikazana v njej so še vedno na voljo v prvotni mapi.</qt>"
+"<br>Sporočila ki so prikazana v njej so še vedno na voljo v prvotni mapi.</"
+"qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -9000,37 +8816,40 @@ msgstr "<qt>Ste prepričani, da želite izbrisati prazno mapo <b>%1</b>?"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ste prepričani, da želite izbrisati prazno mapo <b>%1</b> "
-"in vse njene podmape? Te podmape morda niso prazne in njihova vsebina bo prav "
-"tako zavržena.</qt>"
+"<qt>Ste prepričani, da želite izbrisati prazno mapo <b>%1</b> in vse njene "
+"podmape? Te podmape morda niso prazne in njihova vsebina bo prav tako "
+"zavržena.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ste prepričani, da želite izbrisati mapo <b>%1</b> "
-"ter s tem zavreči njeno vsebino?</qt>"
+"<qt>Ste prepričani, da želite izbrisati mapo <b>%1</b> ter s tem zavreči "
+"njeno vsebino?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ste prepričani, da želite izbrisati mapo <b>%1</b> "
-"in vse njene podmape ter s tem zavreči njihovo vsebino?</qt>"
+"<qt>Ste prepričani, da želite izbrisati mapo <b>%1</b> in vse njene podmape "
+"ter s tem zavreči njihovo vsebino?</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Zbrisano"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -9047,9 +8866,9 @@ msgstr "Ali zares želite, naj pretečejo stara sporočila?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Z uporabo HTML-ja v sporočilih boste bolj dovzetni za zasipanje z neželeno "
 "pošto (angl. spam). Poveča se tudi verjetnost, da bo vaš sistem izkoriščen z "
@@ -9066,12 +8885,13 @@ msgstr "Uporabi HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Zaradi nalaganja zunanjih virov v pošti s HTML-jem boste bolj dovzetni za "
-"»zasipanje« z neželeno pošto (angl. spam). Povečala se bo tudi verjetnost, da "
-"bo vaš sistem izkoriščen z obstoječimi in prihodnjimi varnostnimi zlorabami."
+"»zasipanje« z neželeno pošto (angl. spam). Povečala se bo tudi verjetnost, "
+"da bo vaš sistem izkoriščen z obstoječimi in prihodnjimi varnostnimi "
+"zlorabami."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -9087,8 +8907,8 @@ msgstr "Filter za dopisni seznam %1 ..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMailova funkcionalnost »Nisem v pisarni« se zanaša na filtriranje s strani "
@@ -9108,10 +8928,11 @@ msgstr "Ni moč pognati upravitelja certifikatov. Prosim, preverite namestitev."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Ni moč pognati Pregledovalnika dnevnika GnuPG (kwatchgnupg); prosim, preverite "
-"namestitev."
+"Ni moč pognati Pregledovalnika dnevnika GnuPG (kwatchgnupg); prosim, "
+"preverite namestitev."
 
 #: kmmainwidget.cpp:2508
 #, fuzzy
@@ -9446,8 +9267,7 @@ msgstr "Shrani prilo&ge ..."
 msgid "Appl&y All Filters"
 msgstr "Uvel&javi vse filtre"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Upora&bi filtre"
@@ -9561,7 +9381,6 @@ msgstr "Naslednje &neprebrano sporočilo"
 msgid "Go to the next unread message"
 msgstr "Pojdi k naslednjemu neprebranemu sporočilu"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Pre&jšnje sporočilo"
@@ -9705,8 +9524,8 @@ msgstr " Inicializacija ..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9718,10 +9537,10 @@ msgstr ""
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "To sporočilo vsebuje zahtevek za pošiljanje obvestila o razporeditvi "
@@ -9733,8 +9552,8 @@ msgstr ""
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9748,8 +9567,8 @@ msgstr ""
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9763,8 +9582,8 @@ msgstr ""
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9801,17 +9620,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Potrdilo: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Priloga: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Prikaži priloge tako, kot je predlagal pošiljatelj."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9861,45 +9680,38 @@ msgstr "Nastavitve sporočilnega dela"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Zvrst MIME</em> datoteke</p>"
-"<p>Običajno ne potrebujete spreminjati te nastavitve, ker je vrsta datoteke "
-"samodejno preverjena. Vendar včasih %1 ne zazna pravilno vrste datoteke. Tu "
-"lahko to popravite.</p></qt>"
+"<qt><p><em>Zvrst MIME</em> datoteke</p><p>Običajno ne potrebujete "
+"spreminjati te nastavitve, ker je vrsta datoteke samodejno preverjena. "
+"Vendar včasih %1 ne zazna pravilno vrste datoteke. Tu lahko to popravite.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Velikost dela</p>"
-"<p>Včasih bo %1 podal ocenjeno velikost, kajti izračun natančne velikosti bi "
-"vzel preveč časa. Ko bo tako, bo to vidno z dodanim »(ocena)« zraven prikazane "
-"velikosti.</p></qt>"
+"<qt><p>Velikost dela</p><p>Včasih bo %1 podal ocenjeno velikost, kajti "
+"izračun natančne velikosti bi vzel preveč časa. Ko bo tako, bo to vidno z "
+"dodanim »(ocena)« zraven prikazane velikosti.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Datotečno ime datoteke</p>"
-"<p>Čeprav je to privzeto kot ime priložene datoteke, ne navaja datoteke, ki je "
-"priložena. Raje predlaga ime datoteke, ki ga uporablja poštni odjemalec "
-"prejemnika, ko se shranjuje ta del na disk.</p></qt>"
+"<qt><p>Datotečno ime datoteke</p><p>Čeprav je to privzeto kot ime priložene "
+"datoteke, ne navaja datoteke, ki je priložena. Raje predlaga ime datoteke, "
+"ki ga uporablja poštni odjemalec prejemnika, ko se shranjuje ta del na disk."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9907,17 +9719,14 @@ msgstr "&Opis:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Opis dela</p>"
-"<p>To je samo informacijski opis dela, podobno kot je »Zadeva« za celotno "
-"sporočilo. Večina poštnih odjemnikov bo prikazalo to informacijo v svojih "
-"ogledih sporočil poleg ikone priloge.</p></qt>"
+"<qt><p>Opis dela</p><p>To je samo informacijski opis dela, podobno kot je "
+"»Zadeva« za celotno sporočilo. Večina poštnih odjemnikov bo prikazalo to "
+"informacijo v svojih ogledih sporočil poleg ikone priloge.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9925,22 +9734,20 @@ msgstr "&Kodiranje:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kodiranje prenosa za ta del</p>"
-"<p>Običajno ne potrebujete spreminjati tega, ker %1 uporablja primerno privzeto "
-"kodiranje, odvisno od zvrsti MIME. Vendar včasih lahko znatno zmanjšate "
-"velikost sporočila, npr. če datoteka PostScript ne vsebuje binarnih podatkov, "
-"ampak je iz čistega besedila. V tem primeru bo izbira »quoted-printable« preko "
-"privzetega »base64« prihranila do 25 % v velikosti sporočila.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Kodiranje prenosa za ta del</p><p>Običajno ne potrebujete spreminjati "
+"tega, ker %1 uporablja primerno privzeto kodiranje, odvisno od zvrsti MIME. "
+"Vendar včasih lahko znatno zmanjšate velikost sporočila, npr. če datoteka "
+"PostScript ne vsebuje binarnih podatkov, ampak je iz čistega besedila. V tem "
+"primeru bo izbira »quoted-printable« preko privzetega »base64« prihranila do "
+"25 % v velikosti sporočila.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9948,20 +9755,16 @@ msgstr "Predlagaj &samodejni prikaz"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Izberite to možnost, če bi radi predlagali prejemniku samodejni (notranji) "
-"prikaz tega dela sporočila v pregledu sporočila namesto privzetega ogleda "
-"ikon.</p>"
-"<p>Tehnično gledano je to narejeno z nastavitvijo glave <em>"
-"Content-Disposition</em> tega dela v »inline« namesto privzetega "
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Izberite to možnost, če bi radi predlagali prejemniku samodejni "
+"(notranji) prikaz tega dela sporočila v pregledu sporočila namesto "
+"privzetega ogleda ikon.</p><p>Tehnično gledano je to narejeno z nastavitvijo "
+"glave <em>Content-Disposition</em> tega dela v »inline« namesto privzetega "
 "»attachment«.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
@@ -9970,14 +9773,12 @@ msgstr "&Podpiši ta del"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Izberite to možnost, če bi radi podpisali ta del sporočila.</p>"
-"<p>Podpis bo narejen s ključem, ki ste ga povezali s trenutno izbrano "
+"<qt><p>Izberite to možnost, če bi radi podpisali ta del sporočila.</"
+"p><p>Podpis bo narejen s ključem, ki ste ga povezali s trenutno izbrano "
 "identiteto.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9986,13 +9787,11 @@ msgstr "Ši&friraj ta del"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Izberite to možnost, če bi radi šifrirali ta del sporočila.</p>"
-"<p>Del bo šifriran za prejemnika tega sporočila</p></qt>"
+"<qt><p>Izberite to možnost, če bi radi šifrirali ta del sporočila.</p><p>Del "
+"bo šifriran za prejemnika tega sporočila</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -10006,16 +9805,14 @@ msgstr "Filtri za POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Sporočila za filtriranje, ki so bila najdena na računu POP: <b>%1</b>"
-"<p>Tukaj prikazana sporočila presegajo največjo dovoljeno velikost, ki ste jo "
-"določili v računu."
-"<br>S primernim gumbom lahko izberete, kaj boste storili z njimi."
+"Sporočila za filtriranje, ki so bila najdena na računu POP: <b>%1</"
+"b><p>Tukaj prikazana sporočila presegajo največjo dovoljeno velikost, ki ste "
+"jo določili v računu.<br>S primernim gumbom lahko izberete, kaj boste "
+"storili z njimi."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10028,8 +9825,8 @@ msgstr "Sporočila, ki se ujemajo z nizom filtrnih pravil: brez"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Prikaži sporočila, ki se ujemajo z nizom pravil in so označena kot »Naloži« ali "
-"»Zbriši«"
+"Prikaži sporočila, ki se ujemajo z nizom pravil in so označena kot »Naloži« "
+"ali »Zbriši«"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10271,21 +10068,20 @@ msgstr "Odjemalec e-pošte za Namizno okolje K."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Pridobivanje vsebine mape</h2>"
-"<p>Prosim, počakajte . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Pridobivanje vsebine mape</h2><p>Prosim, "
+"počakajte . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Odklopljeno</h2>"
-"<p>KMail je trenutno odklopljen. Kliknite <a href=\"kmail:goOnline\">tukaj</a> "
-"da znova vzpostavite povezavo . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Odklopljeno</h2><p>KMail je trenutno "
+"odklopljen. Kliknite <a href=\"kmail:goOnline\">tukaj</a> da znova "
+"vzpostavite povezavo . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
 #, fuzzy
@@ -10294,18 +10090,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10313,13 +10108,11 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Dobrodošli v KMailu %1</h2>"
-"<p>KMail je poštni odjemalec za namizno okolje TDE. Zasnovan je za polno "
-"združljivost z internetnimi poštnimi standardi, kot so MIME, SMTP, POP3 in "
-"IMAP.</p>\n"
-"<ul>"
-"<li>KMail ponuja vrsto zmogljivih zmožnosti, ki so opisane v <a href=\"%2\">"
-"dokumentaciji</a></li>\n"
+"<h2 style='margin-top: 0px;'>Dobrodošli v KMailu %1</h2><p>KMail je poštni "
+"odjemalec za namizno okolje TDE. Zasnovan je za polno združljivost z "
+"internetnimi poštnimi standardi, kot so MIME, SMTP, POP3 in IMAP.</p>\n"
+"<ul><li>KMail ponuja vrsto zmogljivih zmožnosti, ki so opisane v <a href="
+"\"%2\">dokumentaciji</a></li>\n"
 "<li><a href=\"%3\">Domača stran KMaila</A> ponuja podatke o novih različicah "
 "KMaila</li></ul>\n"
 "%8\n"
@@ -10333,20 +10126,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp;&nbsp;Ekipa KMaila</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Prosimo vzemite si trenutek, da bi si nastavili KMail v "
-"Nastavitve-&gt;Nastavi KMail.\n"
+"<p>Prosimo vzemite si trenutek, da bi si nastavili KMail v Nastavitve-&gt;"
+"Nastavi KMail.\n"
 "Ustvariti morate vsaj glavno identiteto in poštni račun za  prihajajočo in "
 "odhajajočo pošto.</p>\n"
 
@@ -10388,12 +10179,15 @@ msgstr "Poglej prilogo: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
-"[KMail: Priloga vsebuje binarne podatke. Poizkušam prikazati prvih %n znakov.]\n"
+"[KMail: Priloga vsebuje binarne podatke. Poizkušam prikazati prvih %n "
+"znakov.]\n"
 "[KMail: Priloga vsebuje binarne podatke. Poizkušam prikazati prvi znak.]\n"
-"[KMail: Priloga vsebuje binarne podatke. Poizkušam prikazati prva %n znaka.]\n"
+"[KMail: Priloga vsebuje binarne podatke. Poizkušam prikazati prva %n "
+"znaka.]\n"
 "[KMail: Priloga vsebuje binarne podatke. Poizkušam prikazati prve %n znake.]"
 
 #: kmreaderwin.cpp:2353
@@ -10418,12 +10212,14 @@ msgstr "Odprem prilogo?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10445,6 +10241,58 @@ msgstr "(ujemaj se s katerikolim sledečim)"
 msgid "(match all of the following)"
 msgstr "(ujemaj se z vsem sledečim)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Prebrano"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Staro"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Zbrisano"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Odgovorjeno"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Posredovano"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "V čakalni vrsti"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Poslano"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Opazovano"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Prezrto"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Neželena pošta"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Želeno"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Za narediti"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Ima prilogo"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10529,10 +10377,10 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Premikanje poslanega sporočila »%1« iz mape »outbox« v mapo »sent-mail« ni "
 "uspelo.\n"
@@ -10542,8 +10390,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Ni moč poslati sporočil, ne da bi določili naslov pošiljatelja.\n"
 "Prosimo, nastavite e-poštni naslov identitete »%1« v razdelku Identitete "
@@ -10575,8 +10423,8 @@ msgstr "Pripravljanje procesa pošiljanja ..."
 #: kmsender.cpp:503
 #, fuzzy
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr "Vi do vse e-pošta do "
 
 #: kmsender.cpp:505
@@ -10601,8 +10449,9 @@ msgstr "Ni uspelo poslati (nekaterih) čakajočih sporočil."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10619,20 +10468,16 @@ msgstr "Pošiljanje je bilo prekinjeno."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Pošiljanje ni uspelo:</p>"
-"<p>%1</p>"
-"<p>Sporočilo bo ostalo v mapi »odhajajoče« dokler ne odpravite težave (npr. "
-"napačen naslov) ali odstranite sporočila iz mape »odhajajoče«.</p>"
-"<p>Uporabljen je bil naslednji prenosni protokol:  %2</p>"
-"<p>Ali naj nadaljujem s pošiljanjem preostalih sporočil?</p>"
+"<p>Pošiljanje ni uspelo:</p><p>%1</p><p>Sporočilo bo ostalo v mapi "
+"»odhajajoče« dokler ne odpravite težave (npr. napačen naslov) ali odstranite "
+"sporočila iz mape »odhajajoče«.</p><p>Uporabljen je bil naslednji prenosni "
+"protokol:  %2</p><p>Ali naj nadaljujem s pošiljanjem preostalih sporočil?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10650,8 +10495,9 @@ msgstr "P&rekini pošiljanje"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10697,43 +10543,43 @@ msgstr "Za dostop do strežnika SMTP morate podati uporabniško ime in geslo."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"Videti je, da %1 teče na drugem zaslonu tega računalnika. Poganjanje %2 več kot "
-"enkrat lahko povzroči izgubo sporočila. Na tem računalniku ne poženite %1, "
-"razen če ste prepričani da še ne teče."
+"Videti je, da %1 teče na drugem zaslonu tega računalnika. Poganjanje %2 več "
+"kot enkrat lahko povzroči izgubo sporočila. Na tem računalniku ne poženite "
+"%1, razen če ste prepričani da še ne teče."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"Videti je, da %1 teče na drugem zaslonu  na tem računalniku. Poganjanje %1 in "
-"%2 hkrati lahko povzroči izgubo sporočila. Na tem računalniku ne poženite %2, "
-"razen če ste prepričani da %1 ne teče."
+"Videti je, da %1 teče na drugem zaslonu  na tem računalniku. Poganjanje %1 "
+"in %2 hkrati lahko povzroči izgubo sporočila. Na tem računalniku ne poženite "
+"%2, razen če ste prepričani da %1 ne teče."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"Videti je, da %1 teče na %2. Poganjanje %1 več kot enkrat lahko povzroči izgubo "
-"sporočila. Na tem računalniku ne poganjajte %1, razen če ste prepričani da še "
-"ne teče na %2."
+"Videti je, da %1 teče na %2. Poganjanje %1 več kot enkrat lahko povzroči "
+"izgubo sporočila. Na tem računalniku ne poganjajte %1, razen če ste "
+"prepričani da še ne teče na %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"Videti je, da %1 teče na %3. Poganjanje %1 in %2 hkrati lahko povzroči izgubo "
-"sporočila. Na tem računalniku ne poganjajte %2, razen če ste prepričani da %1 "
-"ne teče na %3."
+"Videti je, da %1 teče na %3. Poganjanje %1 in %2 hkrati lahko povzroči "
+"izgubo sporočila. Na tem računalniku ne poganjajte %2, razen če ste "
+"prepričani da %1 ne teče na %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10744,6 +10590,10 @@ msgstr "Zaženi %1"
 msgid "Exit"
 msgstr "Izhod"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nova sporočila v"
@@ -10772,15 +10622,16 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEListnica ni na voljo. Močno je priporočena uporaba TDEListnice za "
 "upravljanje z gesli.\n"
-"Lahko pa KMail shrani geslo v svojo nastavitveno datoteko. Geslo je shranjeno v "
-"pomešani obliki, vendar to ni mišljeno kot varno pred poskusi dešifriranja, če "
-"je pridobljen dostop do nastavitvene datoteke.\n"
+"Lahko pa KMail shrani geslo v svojo nastavitveno datoteko. Geslo je "
+"shranjeno v pomešani obliki, vendar to ni mišljeno kot varno pred poskusi "
+"dešifriranja, če je pridobljen dostop do nastavitvene datoteke.\n"
 "Ali želite shraniti geslo za račun »%1« v nastavitveno datoteko?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10850,8 +10701,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"Ukaz, ki se izvede lokalno, še pred pošiljanjem e-pošte. To se lahko uporabi za "
-"npr. nastavljanje cevi ssh. Pustite prazno, če naj se tak ukaz ne izvede."
+"Ukaz, ki se izvede lokalno, še pred pošiljanjem e-pošte. To se lahko uporabi "
+"za npr. nastavljanje cevi ssh. Pustite prazno, če naj se tak ukaz ne izvede."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10859,11 +10710,11 @@ msgstr "Strežnik &potrebuje overovitev"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Označite to možnost, če vaš strežnik SMTP potrebuje overovitev pred sprejemom "
-"pošte. To je znano kot »Authenticated SMTP« ali preprosto ASMTP."
+"Označite to možnost, če vaš strežnik SMTP potrebuje overovitev pred "
+"sprejemom pošte. To je znano kot »Authenticated SMTP« ali preprosto ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10883,15 +10734,14 @@ msgstr "Po&šlji lastno gostiteljsko ime na strežnik"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Izberite to možnost, da naj KMail uporabi lastno gostiteljsko ime, ko se "
-"predstavlja poštnemu strežniku. "
-"<p>To je uporabno, če vaše sistemsko gostiteljsko ime ni pravilno nastavljeno "
-"ali da bi zakrili vaše pravo sistemsko gostiteljsko ime."
+"predstavlja poštnemu strežniku. <p>To je uporabno, če vaše sistemsko "
+"gostiteljsko ime ni pravilno nastavljeno ali da bi zakrili vaše pravo "
+"sistemsko gostiteljsko ime."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10923,8 +10773,8 @@ msgstr "Dovoljene le krajevne datoteke."
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Ime domene ali številčni naslov SMTP strežnika."
 
 #: kmtransport.cpp:788
@@ -10937,10 +10787,10 @@ msgstr "Napaka pri nalaganju mape %1:"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -11012,8 +10862,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"KMail ni uspel zaznati dopisnega seznama v tej mapi. Prosimo, izpolnite naslove "
-"ročno."
+"KMail ni uspel zaznati dopisnega seznama v tej mapi. Prosimo, izpolnite "
+"naslove ročno."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -11166,35 +11016,27 @@ msgstr "&Uredi sporočilo"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Strukturne informacije, ki jih je vrnil kriptografski  vstavek, niso bile "
-"pravilno obdelane; vstavek je mogoče poškodovan.</p>"
-"<p>Prosim obvestite vašega sistemskega upravitelja.</p></qt>"
+"<qt><p>Strukturne informacije, ki jih je vrnil kriptografski  vstavek, niso "
+"bile pravilno obdelane; vstavek je mogoče poškodovan.</p><p>Prosim obvestite "
+"vašega sistemskega upravitelja.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Ni najdenega aktivnega kriptografskega vstavka, vgrajena koda OpenPGP  pa ni "
-"tekla uspešno.</p>"
-"<p>Lahko storite dve stvari:</p>"
-"<ul>"
-"<li><em>ali</em> aktivirate vstavek z uporabo pogovornega okna »Nastavitve->"
-"Nastavi KMail->Vstavki«</li>"
-"<li><em>ali</em> navedete tradicionalne nastavitve OpenPGP v istem oknu na "
-"zavihku »Identitete->Napredno«.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Ni najdenega aktivnega kriptografskega vstavka, vgrajena koda OpenPGP  pa "
+"ni tekla uspešno.</p><p>Lahko storite dve stvari:</p><ul><li><em>ali</em> "
+"aktivirate vstavek z uporabo pogovornega okna »Nastavitve->Nastavi KMail-"
+">Vstavki«</li><li><em>ali</em> navedete tradicionalne nastavitve OpenPGP v "
+"istem oknu na zavihku »Identitete->Napredno«.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11207,8 +11049,8 @@ msgstr ""
 #: messagecomposer.cpp:557
 #, fuzzy
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus x funkcija."
 
 #: messagecomposer.cpp:565
@@ -11226,14 +11068,14 @@ msgstr "Chiasmus Šifriranje Napaka"
 #: messagecomposer.cpp:578
 #, fuzzy
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr "od Chiasmus x funkcija a."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Oblika šifrirnega sporočila notranjega OpenPGP-ja ne podpira šifriranja ali "
@@ -11346,12 +11188,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Pregled lastnosti šifriranja prejemnika kaže, da boste vprašani za šifriranje "
-"tega sporočila.\n"
+"Pregled lastnosti šifriranja prejemnika kaže, da boste vprašani za "
+"šifriranje tega sporočila.\n"
 "Ali naj šifriram sporočilo?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11384,12 +11226,13 @@ msgstr "&Ne šifriraj"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Zahtevali ste šifriranje tega sporočila in šifriranje kopije, ki je namenjena "
-"vam, vendar pa ni bilo nastavljenega nobenega zaupanega šifrirnega ključa za to "
-"identiteto."
+"Zahtevali ste šifriranje tega sporočila in šifriranje kopije, ki je "
+"namenjena vam, vendar pa ni bilo nastavljenega nobenega zaupanega šifrirnega "
+"ključa za to identiteto."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11398,8 +11241,8 @@ msgstr "Pošljem nešifrirano?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Deli tega sporočila ne bodo šifrirani.\n"
@@ -11415,8 +11258,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Sporočilo ne bo šifrirano.\n"
-"Pošiljanje nešifriranih sporočil morda krši varnostno politiko in/ali omogoča "
-"pronicanje zaupnih podatkov.\n"
+"Pošiljanje nešifriranih sporočil morda krši varnostno politiko in/ali "
+"omogoča pronicanje zaupnih podatkov.\n"
 "Naj je sporočilo raje šifrirano?"
 
 #: messagecomposer.cpp:955
@@ -11427,91 +11270,86 @@ msgstr "Ši&friraj vse dele"
 msgid "Unencrypted Message Warning"
 msgstr "Opozorilo nešifriranega sporočila"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Napaka: Vmesnik ni vrnil šifriranih podatkov.</p> "
-"<p>Prosim sporočite ta hrošč:"
-"<br>%2</p></qt>"
+"<qt><p>Napaka: Vmesnik ni vrnil šifriranih podatkov.</p> <p>Prosim sporočite "
+"ta hrošč:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>S tem kodiranjem ni moč zapisati vseh znakov."
-"<br>"
-"<br>Vseeno pošljem sporočilo?</qt>"
+"<qt>S tem kodiranjem ni moč zapisati vseh znakov.<br><br>Vseeno pošljem "
+"sporočilo?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Nekateri znaki bodo izgubljeni"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Izgubi znake"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Spremeni kodiranje"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Sporočila ni bilo moč podpisati ker, kot je videti, izbrano orodje ne podpira "
-"podisovanja; to se pravzaprav ne bi smelo zgoditi, prosim poročajte o tem "
-"hrošču."
+"Sporočila ni bilo moč podpisati ker, kot je videti, izbrano orodje ne "
+"podpira podisovanja; to se pravzaprav ne bi smelo zgoditi, prosim poročajte "
+"o tem hrošču."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Sporočila ni bilo moč podpisati ker, kot je videti, izbrano orodje ne podpira "
-"podisovanja; to se pravzaprav ne bi smelo zgoditi, prosim poročajte o tem "
-"hrošču."
+"Sporočila ni bilo moč podpisati ker, kot je videti, izbrano orodje ne "
+"podpira podisovanja; to se pravzaprav ne bi smelo zgoditi, prosim poročajte "
+"o tem hrošču."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Tega sporočila ni bilo moč šifrirati ker, kot je videti, izbran program ne "
-"podpira šifriranja; to se pravzaprav ne bi smelo zgoditi, prosimo, poročajte o "
-"tem hrošču."
+"podpira šifriranja; to se pravzaprav ne bi smelo zgoditi, prosimo, poročajte "
+"o tem hrošču."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Tega sporočila ni bilo moč podpisati in šifrirati ker, kot je videti, izbran "
-"program ne podpira združenega podpisovanja in šifriranja; to se pravzaprav ne "
-"bi smelo zgoditi, prosimo, poročajte o tem hrošču."
+"program ne podpira združenega podpisovanja in šifriranja; to se pravzaprav "
+"ne bi smelo zgoditi, prosimo, poročajte o tem hrošču."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11533,10 +11371,10 @@ msgstr "Oblika po&štnega predala:"
 #: newfolderdialog.cpp:101
 #, fuzzy
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 "Izberi do v mapa eden datoteka ali eden velika datoteka KMail privzeto in do "
 "spremenjeno v je."
@@ -11549,8 +11387,8 @@ msgstr "&Mapa vsebuje:"
 #, fuzzy
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr "Izberi novo mapa do za od za od opravila ali privzeto je je."
 
 #: newfolderdialog.cpp:165
@@ -11591,8 +11429,7 @@ msgstr "Različni rezultati za podpise"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Kriptografski pogon ni vrnil nobenih podatkov čistega besedila."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Stanje: "
 
@@ -11621,11 +11458,11 @@ msgstr "Vstavka za %1 ni bilo moč najti."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Sporočilo je podpisano, vendar veljavnosti podpisa ni moč preveriti. <br />"
-"Razlog: %1"
+"Sporočilo je podpisano, vendar veljavnosti podpisa ni moč preveriti. <br /"
+">Razlog: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11661,26 +11498,27 @@ msgstr "Kriptografski vstavek »%1« ne more dešifrirati sporočil."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Vedite:</b>  To sporočilo oblike HTML lahko vsebuje povezave k zunanjim "
-"slikam in podobno. Iz varnostnih razlogov razlogov zasebnosti zunanju viri niso "
-"naloženi. Če zaupate pošiljatelju, lahko naložite zunanje vire za to sporočilo "
-"tako, da <a href=\"kmail:showHTML\">kliknete tukaj</a>."
+"slikam in podobno. Iz varnostnih razlogov razlogov zasebnosti zunanju viri "
+"niso naloženi. Če zaupate pošiljatelju, lahko naložite zunanje vire za to "
+"sporočilo tako, da <a href=\"kmail:showHTML\">kliknete tukaj</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Vedite:</b>To sporočilo je oblike HTML. Iz varnostnih razlogov je prikazana "
-"samo koda HTML. Če zaupate pošiljatelju, lahko aktivirate prikaz oblikovanega "
-"HTML za to sporočilo tako, da <a href=\"kmail:showHTML\">kliknete tukaj</a>."
+"<b>Vedite:</b>To sporočilo je oblike HTML. Iz varnostnih razlogov je "
+"prikazana samo koda HTML. Če zaupate pošiljatelju, lahko aktivirate prikaz "
+"oblikovanega HTML za to sporočilo tako, da <a href=\"kmail:showHTML"
+"\">kliknete tukaj</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11945,11 +11783,11 @@ msgstr "shranjeno: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Ni shranjene pošte v %1, shranjene za podpisovanje, zato je ni možno primerjati "
-"s pošiljateljevim naslovom %2."
+"Ni shranjene pošte v %1, shranjene za podpisovanje, zato je ni možno "
+"primerjati s pošiljateljevim naslovom %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -12065,10 +11903,11 @@ msgstr "Sporočila o napakah Kioslave"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Vaš strežnik POP3 ne podpira ukaza UIDL. Ta ukaz je potreben za zanesljivo "
 "ugotavljanje, katero pošto na strežniku je KMail videl že prej.\n"
@@ -12096,7 +11935,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Pobiranje sporočila %1 od %2 (%3 od %4 kB) od %5@%6 (%7 kB ostaja na "
 "strežniku)."
@@ -12115,1825 +11955,14 @@ msgstr "Neveljaven odgovor strežnika"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Vaš strežnik ne podpira ukaza TOP. Zato ni možno pobrati glav velikih sporočil "
-"pred njihovim nalaganjem."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Pojdi"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Mapa"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Sporočilo"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, fuzzy, no-c-format
-msgid "Reply Special"
-msgstr "Odgovori Posebno"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Posreduj"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Orodjarna za HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Podpisovanje"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Samo&dejno podpiši sporočila"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Ko je ta možnost omogočena, bodo vsa sporočila, ki jih boste poslali privzeto "
-"podpisana. Še vedno pa lahko pri vsakem sporočilu posebej onemogočite "
-"podpisovanje."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Šifriranje"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Ko je izbrana ta možnost, bo sporočilo/datoteka šifrirano ne samo s "
-"prejemnikovim javnim ključem, ampak tudi z vašim. To bo omogočilo dešifriranje "
-"sporočila/datoteke ob kasnejšem času. V splošnem je to dobra zamisel."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Prikaži po&dpisano/šifrirano besedilo potem, ko je sestavljeno"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Ko je izbrana ta možnost, bo podpisano ali šifrirano besedilo prikazano v "
-"ločenem oknu, da boste lahko videli, kako izgleda, preden ga pošljete. V "
-"splošnem je to dobra zamisel, če preverjate delovanje vašega šifrirnega "
-"sistema."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Poslana sporočila hrani ši&frirana"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Izberite to za shranjevanje sporočil šifrirano"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Sporočila hrani šifrirana</h1>\n"
-"Ko je omogočena ta možnost, so poslana sporočila hranjena šifrirana tako, kot "
-"so bila poslana. To ni priporočeno, saj ne boste mogli več brati sporočil po "
-"preteku potrebnega certifikata.\n"
-"<p>\n"
-"Vseeno pa lahko obstajajo krajevna pravila, ki zahtevajo, da je ta možnost "
-"omogočena. Če niste prepričani, vprašajte vašega krajevnega skrbnika.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Vedno prikaži šifrirne ključe &za odobritev"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Če je izbrana ta možnost, bo program vedno prikazal seznam javnih ključev, iz "
-"katerega lahko izberete enega za šifriranje. Če je to izključeno, bo program "
-"prikazal samo pogovorno okno, če ne najde pravega ključa ali pa je več ključev, "
-"ki jih lahko uporabi."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Samodejno &šifriraj sporočila, če je le možno"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Ko je izbrana ta možnost, bo vsako sporočilo, ki ga pošljete, šifrirano "
-"kadarkoli je šifriranje možno in zaželjeno; seveda pa je še vedno moč izklopiti "
-"samodejno šifriranje za vsako sporočilo posebej."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nikoli ne podpiši/šifriraj, ko se s&hranjuje za osnutek"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Za: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kp: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Splošno"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "O&dgovori"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Odgovori &vsem ..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Posreduj"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Bližnjica:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Zamenjaj"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Lastnosti mape"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Mapa vsebuje &dopisni seznam"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "N&aslov dopisnega seznama:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Običajno:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "N&eprebrano:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Pretek sporočil"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Naj pre&teče po:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "P&rebrana sporočila naj pretečejo"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Sporočila naj pre&tečejo po:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "&Neprebrana sporočila naj pretečejo"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "dneh"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "tednih"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "mesecih"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Napredno"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identiteta pošil&jatelja:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Oblika shranjevanja:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Prikaz se&znamov:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Potrdi certifikate z uporabo CLR-jev"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Če je izbrana ta možnost, so certifikati S/MIME potrjeni z uporabo "
-"certifikatnih preklicnih seznamov (CPS-jev ali CLR-jev)"
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Preveri certifikat na zvezi (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Če je izbrana ta možnost, bodo certifikati S/MIME preverjeni preko zveze z "
-"uporabo protokola Online Certificates Status Protocol (OCSP). Zapolnite spodnji "
-"URL odzivnika OCSP."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Preverjanje certifikata na zvezi"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL odzivnika OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Tukaj vnesite naslov strežnika za potrjevanje na zvezi za certifikate (odzivnik "
-"OCSP). URL se običajno začne z http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Podpis odzivnika OSCP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Prezri servisni URL certifikatov"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Ne preveri certifikatne politike"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Privzeto GnuPG uporablja datoteko ~/.gnupg/policies.txt za preverjanje, če je "
-"dovoljena certifikatna politika. Če je ta možnost izbrana, politike niso "
-"preverjene."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nikoli se ne posvetuj s CLR"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Če je izbrana ta možnost, potem certifikacijski preklicni seznami niso nikoli "
-"uporabljeni za potrjevanje certifikatov S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Pridobi manjkajoče certifikate izdajatelja"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Če je ta možnost izbrana, se mankajoči certifikati izdajatelja poberejo po "
-"potrebi (to velja za obe potrditveni metodi, CPS-ji in OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "Zahteve HTTP"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Ne izvedi nobenih zahtev HTTP"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Popolnoma onemogoči uporabo HTTP za S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Uporabi ta posrednik za zahteve HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Uporabi sistemskega posrednika HTTP:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Če je izbrana ta možnost, bo vrednost posrednika HTTP, ki je prikazana na desni "
-"strani (in pride iz okoljske spremenljivke http_proxy), uporabljena za vsako "
-"zahtevo HTTP."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Tukaj vnesite lokacijo vašega posrednika HTTP, ki se uporabi za vse zahteve "
-"HTTP, ki se tičejo S/MIME. Skladnja je naslednja: gostitelj:vrata, npr. "
-"mojposrednik.nekje.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Prezri distribucijske točke CPS-jev prek HTTP "
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, fuzzy, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"za od a do vsebuje Distribucija Točka URL-ji do URL prva vnos je vse HTTP za a."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "Zahteve LDAP"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Ne izvedi nobenih zahtev LDAP"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Popolnoma onemogoči uporabo LDAP za S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Prezri distribucijske točke CPS-jev prek LDAP"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, fuzzy, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"za od a do vsebuje Distribucija Točka URL-ji do URL prva vnos je vse LDAP za a."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Glaven gostitelj za zahteve LDAP:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, fuzzy, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"a LDAP vse LDAP do prva Več katerikoli in del v a LDAP URL in in od URL Drugo "
-"LDAP do neuspešno je ali je LDAP je."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Dodaj ..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "S&kupinsko delo"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Ponastavi nastavitve pisav"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "neomejeno"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Prilagoditev podpisovanja"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "Odgovori &pošiljatelju:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Odgovori &vsem ..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Posredovano sporočilo"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "&Opozori pri poskusu pošiljanja nešifriranih sporočil"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Opozori pri poskusu pošiljanja nepodpisanih sporočil"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori pri poskusu pošiljanja nešifriranih sporočil</h1>\n"
-"Če je ta možnost omogočena, boste opozorjeni, ko boste hoteli poslati dele "
-"sporočila ali celo sporočilo nepodpisano.\n"
-"<p>\n"
-"Priporočeno je, da pustite to možnost vključeno za največjo integriteto.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Opozori pri poskusu pošiljanja nešifriranih sporočil"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Označite, da boste opozorjeni ob pošiljanju nešifriranih sporočil."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori pri poskusu pošiljanja nešifriranih sporočil</h1>\n"
-"Če je ta možnost izbrana, boste opozorjeni pred pošiljanjem delov sporočila ali "
-"celega sporočila nešifrirano.\n"
-"<p>\n"
-"Priporočeno je, da pustite to možnost omogočeno za največjo integriteto.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Opozori, če prejemnikovega naslova &ni v certifikatu"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Označite, da boste opozorjeni, če naslova ni v certifikatu"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori, če pošiljateljevega naslova ni v certifikatu</h1>\n"
-"če je ta možnost vključena, se izda opozorilo, če e-poštni naslov prejemnika ni "
-"vsebovan v certifikatu, uporabljenemu za šifriranje.\n"
-"<p>\n"
-"Priporočeno je, da je ta možnost vključena za največjo varnost.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Opo&zori, če certifikati/ključi pretečejo v kratkem (spodaj nastavite nivoje)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Za podpisovanje"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Za šifriranje"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dni"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Tukaj izberite število dni"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori, če podpisovalni certifikat poteče</h1>\n"
-"Izberite najmanjše število dni, ko mora biti podpisovalni certifikat veljaven "
-"brez podajanja opozorila.\n"
-"<p>\n"
-"Priporočena nastavitev SPHINX je 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori, če šifrirni certifikat poteče</h1>\n"
-"Izberite najmanjše število dni, ko mora biti šifrirni certifikat veljaven brez "
-"podajanja opozorila.\n"
-"<p>\n"
-"Priporočena nastavitev SPHINX je 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori, če kakšen certifikat v verigi poteče</h1>\n"
-"Izberite najmanjše število dni, ko morajo biti vsi certifikati v verigi "
-"veljavni, ne da bi podano opozorilo.\n"
-"<p>\n"
-"Priporočena nastavitev SPHINX je 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori, če certifikat CA poteče</h1>\n"
-"Izberite najmanjše število dni, ko mora biti certifikat CA veljaven brez "
-"podajanja opozorila.\n"
-"<p>\n"
-"Priporočena nastavitev SPHINX je 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Opozori, če korenski certifikat poteče</h1>\n"
-"Izberite najmanjše število dni, ko mora biti korenski certifikat veljaven brez "
-"podajanja opozorila.\n"
-"<p>\n"
-"Priporočena nastavitev SPHINX je 14 dni.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Za korenske certifikate:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Za vmesne certifikate CA:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Za certifikate/ključe končnih uporabnikov:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Znova omogoči vsa opozorila »Ne vprašaj več«"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Mapa vsebuje:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Zamenjaj"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Zamenjaj"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Ob preverjanju pošte pošlji čakajočo pošto"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Izberite ali naj KMail ob ročnem ali ob vseh preverjanjih sporočil pošlje "
-"vsa sporočila iz mape »odhajajoče« ali pa sploh ne želite samodejno odpošiljati "
-"sporočil.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p> novo v mapa do do vključeno mapa sedaj do do od novo do ali od mapa</p>"
-"<p> do do mapa sedaj</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Najbolj nedavno izbrana mapa v oknu za izbiranje map."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politika prikazovanja sistemske vrstice"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Izčrpno obvestilo o novi pošti"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Če je izbrana ta možnost, se za vsako mapo, kjer je prispela nova pošta, zapiše "
-"v obvestilu o novi pošti tudi število novih sporočil za na vsako mapo posebej. "
-"V nasprotnem primeru dobite samo preprosto sporočilo »Prispela je nova pošta«."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Nave&dite urejevalnik:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Uporabljaj &zunanji urejevalnik namesto sestavljalnika"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Oogoči funkcionalnost za skupinsko delo"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Pri odzivu na odgovore spremeni vrstice Od:/Za: v glavi sporočil"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook ima številne pomankljivosti pri svoji izvedbi standarda "
-"iCalendar. Ta rešitev zaobide eno od njih. Če imate težave z uporabniki "
-"Outlooka, ker ne morejo dobiti vaših odgovorov, poskusite nastaviti to možnost."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Pošlji povabila skupinskega programja v telesu sporočila"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook ima številne pomankljivosti pri svoji izvedbi standarda "
-"iCalendar. Ta rešitev zaobide eno od njih. Če imate težave z uporabniki "
-"Outlooka, ker ne morejo dobiti vaših povabil, poskusite nastaviti to možnost."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Samodejno pošiljanje povabil"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Ko je izbrana ta možnost, ne boste videli okna sestavljalnika pošte. Namesto "
-"tega podo vsa sporočila o povabilih poslana samodejno. Če želite videti pošto, "
-"preden se odpošlje, lahko to možnost odizberete. Vendar pa vedite, da je "
-"besedilo v oknu sestavljalnika v skladnji iCalendar, zato ga ne poskusite "
-"popraviti ročno."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Omogočanje tega naredi, da se vnosi s programov zbirke Kontact (KOrganizer, "
-"KAddressBook (Adresar) in KNotes) shranijo.</p>"
-"<p>Če želite nastaviti to možnost, morate tudi nastaviti programe, da "
-"uporabljajo vire IMAP. To se naredi v Nadzornem središču TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Običajno ni potrebe, da bi videli mape, ki vsebujejo vire IMAP. Če pa jih "
-"vseeno morate, lahko to nastavite tu.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, fuzzy, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p> od"
-"<ul>"
-"<li> privzeto je do za koledar in za adresar vse Kontact</li>"
-"<li> Kolab XML a več eden v Outlook Outlook a Kolab ali a</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>To določi matično mapo od map z viri IMAP.</p>"
-"<p>Privzeto strežnik Kolab nastavi mapo IMAP inbox za matično.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>To je ID računa, ki vsebuje mape z viri IMAP.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Če želite nastaviti imena map shranjevanja IMAP v vaš krajevni jezik, lahko "
-"izberete med naslednjimi razpoložljivimi jeziki.</p> "
-"<p>Prosim vedite, da je edini razlog za to združljivost s programom Microsoft "
-"Outlook. Smatra se kot slaba zamisel, ker zaradi tega ne morete spreminjati "
-"jezika.</p> "
-"<p>Zato tega ne nastavite, razen če morate.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "Ta vrednost je uporabljena, če naj se prikaže Uvod v KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Največje število povezav na gostitelja"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"To se lahko med uporabi za omejitev števila povezav na gostitelja med "
-"preverjanjem pošte. Privzeto je število povezav neomejeno (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Prikaži vrstico urejanja hitrega iskanja"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ta možnost omogoči ali onemogoči vrstico iskanja nad seznamom sporočil, ki se "
-"lahko uporabi za hitro iskanje informacij, prikazanih v seznamu sporočil."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Pri odgovarjanju ali posredovanju uporabi prvotni nabor znakov (če je možno)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Samodejno dodaj podpis"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapomni si to identiteto, tako da bo uporabljena tudi za prihodnja okna "
-"sestavljalnika.\n"
-"   "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapomni si to mapo za poslane postavke, tako da bo uporabljena tudi za "
-"prihodnja okna sestavljalnika."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapomni si ta poštni transport, da bo uporabljen tudi v prihodnjih oknih "
-"sestavljalnika."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapomni si to identiteto, tako da bo uporabljena tudi za prihodnja okna "
-"sestavljalnika.\n"
-"   "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Pre&lomi vrstico pri stolpcu:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Opo&zori, če korenski certifikat prej kot v:"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Vklopite to možnost, da bo Outlook&#8482; razumel imena prilog, ki vsebujejo "
-"neangleške znake"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Samodejno zahtevaj obvestila o razpore&ditvi sporočil"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Omogočite to možnost, če želite da KMail zahteva obvestilo o razporeditvi "
-"sporočila (MDN) za vsako odhodno sporočilo.</p>"
-"<p>Ta možnost vpliva le na privzeto. Še vedno lahko omogočite ali onemogočite "
-"MDN za vsako sporočilo posebej v sestavljalniku, menijski izbiri <em>"
-"Možnosti</em>-&gt;<em>Zahtevaj obvestilo o razporeditvi</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Za samodejno dopolnjevanje uporabi nedavne naslove"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, fuzzy, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr "Onemogoči do v seznam v s naslov."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Samodejno shrani vsakih:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Varnostno kopijo besedila v sestacljalniku je moč narediti v enakomernih "
-"presledkih. Interval med njimi lahko nastavite tu. Samodejno shranjevanje "
-"onemogočite, le postavite vrednost na 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Nadomesti prepo&znano predpono z »Re:«"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Nadomesti prepoznano predpono s »&Fwd:«"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Uporabi pametno citiranje"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Podpis je potekel."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Vrsta izbirnika naslovov"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Nastavi vrsto pogovornega okna za izbiranje prejemnikov polja Za,\n"
-"Kp in Skp."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Vrsta urejevalnika prejemnikov"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Nastavi vrsto urejevalnika prejemnikov za urejanje polj Za,\n"
-"Kp in Skp."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Največje število vrstic urejevalnika prejemnikov."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Pri odgovarjanju ali posredovanju uporabi prvotni nabor znakov (če je možno)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, fuzzy, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr "do do Znotraj a Nastavi do v del od a privzeto za je."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Spreminjanje tega iz privzete vrednosti »Samodejno« bo prisililo uporabo "
-"navedenega kodiranja za vso e-pošto, ne glede na to, kakor se določa sama."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Omogočite to, če želite, da se oznake kot je :-) zamenjajo z ikonami čustev "
-"(majhnimi slikami)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, fuzzy, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr "Omogoči do od besedilo Onemogoči do od besedilo."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, fuzzy, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Samodejno:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Zmanjšaj velikost pisave za citirano besedilo"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Omogočite to možnost, da prikažete besdilo z manjšo pisavo."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Poslana sporočila hrani ši&frirana"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Prikaži stanje &neželenih sporočil v razkošnih glavah"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Obvestila o razporeditvi sporočil"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, fuzzy, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr "Pošlji Sporočilo Obvestila prazno niz do."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Seznam sporočil - nova sporočila"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "Dodaj znake za &citat"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"Vaš strežnik ne podpira ukaza TOP. Zato ni možno pobrati glav velikih "
+"sporočil pred njihovim nalaganjem."
 
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -14048,6 +12077,11 @@ msgstr "Dodaj kot Kp"
 msgid "Add as BCC"
 msgstr "Dodaj kot Skp"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Prekliči"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14063,19 +12097,19 @@ msgstr "Izbrani prejemniki"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Izbrali ste %n prejemnikov. Največje podprto število prejemnikov je %1. Prosim "
-"prilagodite izbiro.\n"
-"Izbrali ste %n prejemnika. Največje podprto število prejemnikov je %1. Prosim "
-"prilagodite izbiro.\n"
-"Izbrali ste %n prejemnika. Največje podprto število prejemnikov je %1. Prosim "
-"prilagodite izbiro.\n"
-"Izbrali ste %n prejemnike. Največje podprto število prejemnikov je %1. Prosim "
-"prilagodite izbiro."
+"Izbrali ste %n prejemnikov. Največje podprto število prejemnikov je %1. "
+"Prosim prilagodite izbiro.\n"
+"Izbrali ste %n prejemnika. Največje podprto število prejemnikov je %1. "
+"Prosim prilagodite izbiro.\n"
+"Izbrali ste %n prejemnika. Največje podprto število prejemnikov je %1. "
+"Prosim prilagodite izbiro.\n"
+"Izbrali ste %n prejemnike. Največje podprto število prejemnikov je %1. "
+"Prosim prilagodite izbiro."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -14091,8 +12125,8 @@ msgstr "Uporabi okno za izbiranje naslovov"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Ta gumb odpre posebno okno, kjer lahko izberete prejemnike iz razpoložljivih "
 "naslovov."
@@ -14197,10 +12231,19 @@ msgstr "je več ali enako kot"
 msgid " bytes"
 msgstr " bajtov"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dni"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "Da izvedete iskanje, morate presneti vsa sporočila mape %1 s strežnika. To "
 "lahko traja nekaj časa. Ali želite nadaljevatri iskanje?"
@@ -14365,16 +12408,12 @@ msgid ""
 msgstr "n n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Zbiranje podatkov za račun »%1« ...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Zbiranje podatkov za račun »%1« ...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 #, fuzzy
@@ -14392,10 +12431,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Vsebina skripta »%1«:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Vsebina skripta »%1«:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14419,8 +12456,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:341
 #, fuzzy
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr "n"
 
 #: sievedebugdialog.cpp:345
@@ -14429,8 +12465,7 @@ msgstr "(Posebne zmožnosti niso na voljo)"
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Dostopni filtri"
 
 #: sievedebugdialog.cpp:358
@@ -14473,8 +12508,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Izberite to možnost, če želite, da KMail doda podpis sporočilom, napisanih s to "
-"identiteto."
+"Izberite to možnost, če želite, da KMail doda podpis sporočilom, napisanih s "
+"to identiteto."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14508,8 +12543,8 @@ msgstr "Uporabite to polje, da vneste poljuben statičen podpis."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Uporabite ta zahtevalnik za določitev besedilne datoteke, ki vsebuje vaš "
 "podpis. Prebrana bo vsakič, ko boste ustvarili novo sporočilo ali dodali nov "
@@ -14529,21 +12564,27 @@ msgstr "Odpre navedeno datoteko v urejevalniku besedil."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Tu lahko dodate poljuben ukaz, z ali brez poti, odvisno od tega ali je ukaz v "
-"vaši poti. KMail bo izvedel ukaz in uporabil njegov izhod (na standarden izhod) "
-"kot podpis. Običajna ukaza ki se uporabljajata s tem mehanizmom sta »fortune« "
-"ali »ksig -random«."
+"Tu lahko dodate poljuben ukaz, z ali brez poti, odvisno od tega ali je ukaz "
+"v vaši poti. KMail bo izvedel ukaz in uporabil njegov izhod (na standarden "
+"izhod) kot podpis. Običajna ukaza ki se uporabljajata s tem mehanizmom sta "
+"»fortune« ali »ksig -random«."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Navedite ukaz:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+#, fuzzy
+msgid "Path"
+msgstr "Pot"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nov vnos:"
@@ -14580,6 +12621,11 @@ msgstr "Dodaj račun"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Ali zares želite odstraniti identiteto z imenom <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Odgovor &na:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14594,6 +12640,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Uredi skript ..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14633,9 +12683,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14673,6 +12723,16 @@ msgstr ""
 "Ni moč odpreti datoteke »%1«:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Za: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kp: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14708,36 +12768,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14747,8 +12803,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -14764,8 +12819,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -14807,8 +12861,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -14978,6 +13031,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -15014,112 +13071,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>... da se lahko premaknete na naslednje ali prejšnje sporočilo z\n"
-"uporabo desne in leve tipke?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>... da lahko na hitro ustvarite filtre za pošiljatelja, prejemnika,\n"
-"zadevo sporočila in dopisne sezname z <em>Orodja-&gt;Ustvari&nbsp;filter</em>?\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... da se lahko znebite &quot;[ime dopisnega seznama]&quot;,\n"
-"ki je dodan zadevi nekaterih dopisnih seznamov z uporabo\n"
-"filtrirnega dejanja <em>rewrite header</em>? Uporabite\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"  replace &quot;\\s*\\[ime dopisnega seznama\\]\\s*&quot;\n"
-"  z &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>... da lahko poovežete dopisne sezname z mapami v\n"
-"pogovornem oknu <em>Mapa-&gt;Lastnosti</em>? Nato\n"
-"lahko uporabite "
-"<em>Sporočilo-&gt;Novo&nbsp;sporočilo&nbsp;v&nbsp;dopisni&nbsp;seznam</em> "
-"da odprete sestavljalnik s prednastavljenim naslovom dopisnega seznama.\n"
-"Alternativno lahko na mapo kliknete s srednjim gumbom miške.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>... da lahko določite ikono vsaki mapi posebej?\n"
-"Poglejte v meni <em>Mapa-&gt;Lastnosti</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>... da KMail lahko prikazuje barvno črto, ki nakazuje vrsto \n"
-"trenutno prikazanega sporočila (navadno besedilo, HTML, OpenPGP)?</p>\n"
-"<p>To izniči poskuse poneverbe verodostojnega podpisovanja s\n"
-"pošiljanjem pošte v HTML, ki posnema KMailove okvire stanja podpisa.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>... da lahko filtrirate katerokoli glavo s preprostim vnosom \n"
-"njenega imena v prvem urejevalnem polju iskalnega pravila?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>... da lahko filtrirate HTML sporočila s pravilom\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>... je pri odgovarjanju naveden samo izbrani del sporočila?</p>\n"
-"<p>Če ni izbrano ničesar, je navedeno celotno sporočilo.</p>\n"
-"<p>To deluje celo z besedilnimi prilogami v primeru, da ste izbrali \n"
-"<em>Videz-&gt;Priloge-&gt;Vgnezdeno</em>.</p>\n"
-"<p>Ta možnost je dosegljiva z vsemi ukazi za odgovarjanje, razen z \n"
-"<em>Sporočilo-&gt;Odgovori brez citatov</em>.</p>\n"
-"<p align=\"right\"><em>prispeval David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Ničesar ni za razveljaviti."
@@ -15187,6 +13138,15 @@ msgstr "Priloga #%1 (neimenovana)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Datoteka z imenom »%1« že obstaja. Jo zares želite nadomestiti?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Nadomestim datoteko?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15302,13 +13262,13 @@ msgstr "&Pošlji sliko z vsakim sporočilom"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Označite to polje, če želite, da KMail sporočilom, ki so napisana s to "
-"istovetnostjo, doda takoimenovane glave X-Face. X-Face je majhna (48x48 točk), "
-"črnobela slika, ki jo lahko prikažejo nekateri poštni odjemalci."
+"istovetnostjo, doda takoimenovane glave X-Face. X-Face je majhna (48x48 "
+"točk), črnobela slika, ki jo lahko prikažejo nekateri poštni odjemalci."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15336,12 +13296,12 @@ msgstr "Izberite datoteko ..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Uporabite to, da izberete datoteko iz katere se bo ustavrila slika. Slika naj "
-"bo čimmbolj kontrastna in skoraj kvadratne oblike. Svetlo ozadje pomaga "
+"Uporabite to, da izberete datoteko iz katere se bo ustavrila slika. Slika "
+"naj bo čimmbolj kontrastna in skoraj kvadratne oblike. Svetlo ozadje pomaga "
 "izboljšati rezultat."
 
 #: xfaceconfigurator.cpp:156
@@ -15350,20 +13310,20 @@ msgstr "Nastavi z adresarja"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Uporabite lahko pomanjšano različico slike, ki ste jo nastavili v adresarju."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail lahko pošlje z vsakim sporočilom majhno (48x48 točk), črnobelo sliko "
-"slabše kakovosti. To je lahko na primer vaša slika ali pa znak. Prikazana je v "
-"naslovnikovem poštnem odjemalcu (če ta to podpira)."
+"<qt>KMail lahko pošlje z vsakim sporočilom majhno (48x48 točk), črnobelo "
+"sliko slabše kakovosti. To je lahko na primer vaša slika ali pa znak. "
+"Prikazana je v naslovnikovem poštnem odjemalcu (če ta to podpira)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15371,11 +13331,11 @@ msgstr "Uporabite to polje da vnesete poljuben niz X-Face."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Primeri so na voljo na <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Primeri so na voljo na <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
+"www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15390,130 +13350,1726 @@ msgstr "Brez slike"
 msgid "You do not have your own contact defined in the address book."
 msgstr "V adresarju nimate določenega svojega lastnega stika"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Podpisovanje"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Samo&dejno podpiši sporočila"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Ko je ta možnost omogočena, bodo vsa sporočila, ki jih boste poslali "
+"privzeto podpisana. Še vedno pa lahko pri vsakem sporočilu posebej "
+"onemogočite podpisovanje."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Šifriranje"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Nastavi zadevo sporočila"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Ko je izbrana ta možnost, bo sporočilo/datoteka šifrirano ne samo s "
+"prejemnikovim javnim ključem, ampak tudi z vašim. To bo omogočilo "
+"dešifriranje sporočila/datoteke ob kasnejšem času. V splošnem je to dobra "
+"zamisel."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Nastavi Kp: na »naslov«"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Prikaži po&dpisano/šifrirano besedilo potem, ko je sestavljeno"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Nastavi Skp: na »naslov«"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Ko je izbrana ta možnost, bo podpisano ali šifrirano besedilo prikazano v "
+"ločenem oknu, da boste lahko videli, kako izgleda, preden ga pošljete. V "
+"splošnem je to dobra zamisel, če preverjate delovanje vašega šifrirnega "
+"sistema."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Dodaj »glavo« sporočilu"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Poslana sporočila hrani ši&frirana"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Preberi glavo sporočila iz »datoteke«"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Izberite to za shranjevanje sporočil šifrirano"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Nastavi telo sporočila"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Sporočila hrani šifrirana</h1>\n"
+"Ko je omogočena ta možnost, so poslana sporočila hranjena šifrirana tako, "
+"kot so bila poslana. To ni priporočeno, saj ne boste mogli več brati "
+"sporočil po preteku potrebnega certifikata.\n"
+"<p>\n"
+"Vseeno pa lahko obstajajo krajevna pravila, ki zahtevajo, da je ta možnost "
+"omogočena. Če niste prepričani, vprašajte vašega krajevnega skrbnika.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Dodaj prilogo k pošti. To se lahko ponovi"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Vedno prikaži šifrirne ključe &za odobritev"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Preveri le za novo pošto"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Če je izbrana ta možnost, bo program vedno prikazal seznam javnih ključev, "
+"iz katerega lahko izberete enega za šifriranje. Če je to izključeno, bo "
+"program prikazal samo pogovorno okno, če ne najde pravega ključa ali pa je "
+"več ključev, ki jih lahko uporabi."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Odpri le okno sestavljalnika"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Samodejno &šifriraj sporočila, če je le možno"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Poglej dano datoteko sporočila"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Ko je izbrana ta možnost, bo vsako sporočilo, ki ga pošljete, šifrirano "
+"kadarkoli je šifriranje možno in zaželjeno; seveda pa je še vedno moč "
+"izklopiti samodejno šifriranje za vsako sporočilo posebej."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nikoli ne podpiši/šifriraj, ko se s&hranjuje za osnutek"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
-"Pošlji sporočilo na »naslov« oziroma prloži datoteko, na katero kaže »URL«"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Prebrano"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Splošno"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Staro"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "O&dgovori"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Zbrisano"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Odgovori &vsem ..."
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Odgovorjeno"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Posreduj"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Posredovano"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Bližnjica:"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "V čakalni vrsti"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Zamenjaj"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Poslano"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Mapa vsebuje:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Opazovano"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Zamenjaj"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Prezrto"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Zamenjaj"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Neželena pošta"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Lastnosti mape"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Želeno"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Mapa vsebuje &dopisni seznam"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Za narediti"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "N&aslov dopisnega seznama:"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Ima prilogo"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Običajno:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "N&eprebrano:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Pretek sporočil"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Naj pre&teče po:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "P&rebrana sporočila naj pretečejo"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Sporočila naj pre&tečejo po:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "&Neprebrana sporočila naj pretečejo"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "dneh"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "tednih"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "mesecih"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Napredno"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identiteta pošil&jatelja:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Oblika shranjevanja:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Prikaz se&znamov:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Ob preverjanju pošte pošlji čakajočo pošto"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt><p>Izberite ali naj KMail ob ročnem ali ob vseh preverjanjih sporočil "
+"pošlje vsa sporočila iz mape »odhajajoče« ali pa sploh ne želite samodejno "
+"odpošiljati sporočil.</p></qt>"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p> novo v mapa do do vključeno mapa sedaj do do od novo do ali od mapa</"
+"p><p> do do mapa sedaj</p>"
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Najbolj nedavno izbrana mapa v oknu za izbiranje map."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politika prikazovanja sistemske vrstice"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Izčrpno obvestilo o novi pošti"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Če je izbrana ta možnost, se za vsako mapo, kjer je prispela nova pošta, "
+"zapiše v obvestilu o novi pošti tudi število novih sporočil za na vsako mapo "
+"posebej. V nasprotnem primeru dobite samo preprosto sporočilo »Prispela je "
+"nova pošta«."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Nave&dite urejevalnik:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Uporabljaj &zunanji urejevalnik namesto sestavljalnika"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Oogoči funkcionalnost za skupinsko delo"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Pri odzivu na odgovore spremeni vrstice Od:/Za: v glavi sporočil"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook ima številne pomankljivosti pri svoji izvedbi standarda "
+"iCalendar. Ta rešitev zaobide eno od njih. Če imate težave z uporabniki "
+"Outlooka, ker ne morejo dobiti vaših odgovorov, poskusite nastaviti to "
+"možnost."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Pošlji povabila skupinskega programja v telesu sporočila"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook ima številne pomankljivosti pri svoji izvedbi standarda "
+"iCalendar. Ta rešitev zaobide eno od njih. Če imate težave z uporabniki "
+"Outlooka, ker ne morejo dobiti vaših povabil, poskusite nastaviti to možnost."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Samodejno pošiljanje povabil"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Ko je izbrana ta možnost, ne boste videli okna sestavljalnika pošte. Namesto "
+"tega podo vsa sporočila o povabilih poslana samodejno. Če želite videti "
+"pošto, preden se odpošlje, lahko to možnost odizberete. Vendar pa vedite, da "
+"je besedilo v oknu sestavljalnika v skladnji iCalendar, zato ga ne poskusite "
+"popraviti ročno."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Omogočanje tega naredi, da se vnosi s programov zbirke Kontact "
+"(KOrganizer, KAddressBook (Adresar) in KNotes) shranijo.</p><p>Če želite "
+"nastaviti to možnost, morate tudi nastaviti programe, da uporabljajo vire "
+"IMAP. To se naredi v Nadzornem središču TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Običajno ni potrebe, da bi videli mape, ki vsebujejo vire IMAP. Če pa jih "
+"vseeno morate, lahko to nastavite tu.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, fuzzy, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p> od<ul><li> privzeto je do za koledar in za adresar vse Kontact</li><li> "
+"Kolab XML a več eden v Outlook Outlook a Kolab ali a</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>To določi matično mapo od map z viri IMAP.</p><p>Privzeto strežnik Kolab "
+"nastavi mapo IMAP inbox za matično.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>To je ID računa, ki vsebuje mape z viri IMAP.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Če želite nastaviti imena map shranjevanja IMAP v vaš krajevni jezik, "
+"lahko izberete med naslednjimi razpoložljivimi jeziki.</p> <p>Prosim vedite, "
+"da je edini razlog za to združljivost s programom Microsoft Outlook. Smatra "
+"se kot slaba zamisel, ker zaradi tega ne morete spreminjati jezika.</p> "
+"<p>Zato tega ne nastavite, razen če morate.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "Ta vrednost je uporabljena, če naj se prikaže Uvod v KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Največje število povezav na gostitelja"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"To se lahko med uporabi za omejitev števila povezav na gostitelja med "
+"preverjanjem pošte. Privzeto je število povezav neomejeno (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Prikaži vrstico urejanja hitrega iskanja"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ta možnost omogoči ali onemogoči vrstico iskanja nad seznamom sporočil, ki "
+"se lahko uporabi za hitro iskanje informacij, prikazanih v seznamu sporočil."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Pri odgovarjanju ali posredovanju uporabi prvotni nabor znakov (če je možno)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Samodejno dodaj podpis"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapomni si to identiteto, tako da bo uporabljena tudi za prihodnja okna "
+"sestavljalnika.\n"
+"   "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Zapomni si to mapo za poslane postavke, tako da bo uporabljena tudi za "
+"prihodnja okna sestavljalnika."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Zapomni si ta poštni transport, da bo uporabljen tudi v prihodnjih oknih "
+"sestavljalnika."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapomni si to identiteto, tako da bo uporabljena tudi za prihodnja okna "
+"sestavljalnika.\n"
+"   "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Pre&lomi vrstico pri stolpcu:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Opo&zori, če korenski certifikat prej kot v:"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Vklopite to možnost, da bo Outlook&#8482; razumel imena prilog, ki vsebujejo "
+"neangleške znake"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Samodejno zahtevaj obvestila o razpore&ditvi sporočil"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Omogočite to možnost, če želite da KMail zahteva obvestilo o "
+"razporeditvi sporočila (MDN) za vsako odhodno sporočilo.</p><p>Ta možnost "
+"vpliva le na privzeto. Še vedno lahko omogočite ali onemogočite MDN za vsako "
+"sporočilo posebej v sestavljalniku, menijski izbiri <em>Možnosti</em>-&gt;"
+"<em>Zahtevaj obvestilo o razporeditvi</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Za samodejno dopolnjevanje uporabi nedavne naslove"
+
+#: kmail.kcfg:422
+#, fuzzy, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr "Onemogoči do v seznam v s naslov."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Samodejno shrani vsakih:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Varnostno kopijo besedila v sestacljalniku je moč narediti v enakomernih "
+"presledkih. Interval med njimi lahko nastavite tu. Samodejno shranjevanje "
+"onemogočite, le postavite vrednost na 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Nadomesti prepo&znano predpono z »Re:«"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Nadomesti prepoznano predpono s »&Fwd:«"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Uporabi pametno citiranje"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Podpis je potekel."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Vrsta izbirnika naslovov"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Nastavi vrsto pogovornega okna za izbiranje prejemnikov polja Za,\n"
+"Kp in Skp."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Vrsta urejevalnika prejemnikov"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Nastavi vrsto urejevalnika prejemnikov za urejanje polj Za,\n"
+"Kp in Skp."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Največje število vrstic urejevalnika prejemnikov."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Pri odgovarjanju ali posredovanju uporabi prvotni nabor znakov (če je možno)"
+
+#: kmail.kcfg:572
+#, fuzzy, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr "do do Znotraj a Nastavi do v del od a privzeto za je."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Spreminjanje tega iz privzete vrednosti »Samodejno« bo prisililo uporabo "
+"navedenega kodiranja za vso e-pošto, ne glede na to, kakor se določa sama."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Omogočite to, če želite, da se oznake kot je :-) zamenjajo z ikonami čustev "
+"(majhnimi slikami)."
+
+#: kmail.kcfg:589
+#, fuzzy, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr "Omogoči do od besedilo Onemogoči do od besedilo."
+
+#: kmail.kcfg:592
+#, fuzzy, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Samodejno:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Zmanjšaj velikost pisave za citirano besedilo"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Omogočite to možnost, da prikažete besdilo z manjšo pisavo."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Poslana sporočila hrani ši&frirana"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Prikaži stanje &neželenih sporočil v razkošnih glavah"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Obvestila o razporeditvi sporočil"
+
+#: kmail.kcfg:648
+#, fuzzy, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr "Pošlji Sporočilo Obvestila prazno niz do."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Seznam sporočil - nova sporočila"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "Dodaj znake za &citat"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Ured&i datoteko"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Uredi ..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Pojdi"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Mapa"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Sporočilo"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, fuzzy, no-c-format
+msgid "Reply Special"
+msgstr "Odgovori Posebno"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Posreduj"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ponastavi nastavitve pisav"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Orodjarna za HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Splošne možnosti"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Orodjarna za HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Potrdi certifikate z uporabo CLR-jev"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Če je izbrana ta možnost, so certifikati S/MIME potrjeni z uporabo "
+"certifikatnih preklicnih seznamov (CPS-jev ali CLR-jev)"
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Preveri certifikat na zvezi (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Če je izbrana ta možnost, bodo certifikati S/MIME preverjeni preko zveze z "
+"uporabo protokola Online Certificates Status Protocol (OCSP). Zapolnite "
+"spodnji URL odzivnika OCSP."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Preverjanje certifikata na zvezi"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL odzivnika OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Tukaj vnesite naslov strežnika za potrjevanje na zvezi za certifikate "
+"(odzivnik OCSP). URL se običajno začne z http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Podpis odzivnika OSCP:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Prezri servisni URL certifikatov"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Ne preveri certifikatne politike"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Privzeto GnuPG uporablja datoteko ~/.gnupg/policies.txt za preverjanje, če "
+"je dovoljena certifikatna politika. Če je ta možnost izbrana, politike niso "
+"preverjene."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nikoli se ne posvetuj s CLR"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Če je izbrana ta možnost, potem certifikacijski preklicni seznami niso "
+"nikoli uporabljeni za potrjevanje certifikatov S/MIME."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Pridobi manjkajoče certifikate izdajatelja"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Če je ta možnost izbrana, se mankajoči certifikati izdajatelja poberejo po "
+"potrebi (to velja za obe potrditveni metodi, CPS-ji in OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "Zahteve HTTP"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Ne izvedi nobenih zahtev HTTP"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Popolnoma onemogoči uporabo HTTP za S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Uporabi ta posrednik za zahteve HTTP:"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Uporabi sistemskega posrednika HTTP:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Če je izbrana ta možnost, bo vrednost posrednika HTTP, ki je prikazana na "
+"desni strani (in pride iz okoljske spremenljivke http_proxy), uporabljena za "
+"vsako zahtevo HTTP."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Tukaj vnesite lokacijo vašega posrednika HTTP, ki se uporabi za vse zahteve "
+"HTTP, ki se tičejo S/MIME. Skladnja je naslednja: gostitelj:vrata, npr. "
+"mojposrednik.nekje.com:3128."
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Prezri distribucijske točke CPS-jev prek HTTP "
+
+#: smimeconfiguration.ui:256
+#, fuzzy, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"za od a do vsebuje Distribucija Točka URL-ji do URL prva vnos je vse HTTP za "
+"a."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "Zahteve LDAP"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Ne izvedi nobenih zahtev LDAP"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Popolnoma onemogoči uporabo LDAP za S/MIME."
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Prezri distribucijske točke CPS-jev prek LDAP"
+
+#: smimeconfiguration.ui:310
+#, fuzzy, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"za od a do vsebuje Distribucija Točka URL-ji do URL prva vnos je vse LDAP za "
+"a."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Glaven gostitelj za zahteve LDAP:"
+
+#: smimeconfiguration.ui:334
+#, fuzzy, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"a LDAP vse LDAP do prva Več katerikoli in del v a LDAP URL in in od URL "
+"Drugo LDAP do neuspešno je ali je LDAP je."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Dodaj ..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "S&kupinsko delo"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Ponastavi nastavitve pisav"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "neomejeno"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Prilagoditev podpisovanja"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "Odgovori &pošiljatelju:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Odgovori &vsem ..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Posredovano sporočilo"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "&Opozori pri poskusu pošiljanja nešifriranih sporočil"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Opozori pri poskusu pošiljanja nepodpisanih sporočil"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori pri poskusu pošiljanja nešifriranih sporočil</h1>\n"
+"Če je ta možnost omogočena, boste opozorjeni, ko boste hoteli poslati dele "
+"sporočila ali celo sporočilo nepodpisano.\n"
+"<p>\n"
+"Priporočeno je, da pustite to možnost vključeno za največjo integriteto.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Opozori pri poskusu pošiljanja nešifriranih sporočil"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Označite, da boste opozorjeni ob pošiljanju nešifriranih sporočil."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori pri poskusu pošiljanja nešifriranih sporočil</h1>\n"
+"Če je ta možnost izbrana, boste opozorjeni pred pošiljanjem delov sporočila "
+"ali celega sporočila nešifrirano.\n"
+"<p>\n"
+"Priporočeno je, da pustite to možnost omogočeno za največjo integriteto.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Opozori, če prejemnikovega naslova &ni v certifikatu"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Označite, da boste opozorjeni, če naslova ni v certifikatu"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori, če pošiljateljevega naslova ni v certifikatu</h1>\n"
+"če je ta možnost vključena, se izda opozorilo, če e-poštni naslov prejemnika "
+"ni vsebovan v certifikatu, uporabljenemu za šifriranje.\n"
+"<p>\n"
+"Priporočeno je, da je ta možnost vključena za največjo varnost.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Opo&zori, če certifikati/ključi pretečejo v kratkem (spodaj nastavite nivoje)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Za podpisovanje"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Za šifriranje"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Tukaj izberite število dni"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori, če podpisovalni certifikat poteče</h1>\n"
+"Izberite najmanjše število dni, ko mora biti podpisovalni certifikat "
+"veljaven brez podajanja opozorila.\n"
+"<p>\n"
+"Priporočena nastavitev SPHINX je 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori, če šifrirni certifikat poteče</h1>\n"
+"Izberite najmanjše število dni, ko mora biti šifrirni certifikat veljaven "
+"brez podajanja opozorila.\n"
+"<p>\n"
+"Priporočena nastavitev SPHINX je 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori, če kakšen certifikat v verigi poteče</h1>\n"
+"Izberite najmanjše število dni, ko morajo biti vsi certifikati v verigi "
+"veljavni, ne da bi podano opozorilo.\n"
+"<p>\n"
+"Priporočena nastavitev SPHINX je 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori, če certifikat CA poteče</h1>\n"
+"Izberite najmanjše število dni, ko mora biti certifikat CA veljaven brez "
+"podajanja opozorila.\n"
+"<p>\n"
+"Priporočena nastavitev SPHINX je 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Opozori, če korenski certifikat poteče</h1>\n"
+"Izberite najmanjše število dni, ko mora biti korenski certifikat veljaven "
+"brez podajanja opozorila.\n"
+"<p>\n"
+"Priporočena nastavitev SPHINX je 14 dni.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Za korenske certifikate:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Za vmesne certifikate CA:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Za certifikate/ključe končnih uporabnikov:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Znova omogoči vsa opozorila »Ne vprašaj več«"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>... da se lahko premaknete na naslednje ali prejšnje sporočilo z\n"
+"uporabo desne in leve tipke?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>... da lahko na hitro ustvarite filtre za pošiljatelja, prejemnika,\n"
+"zadevo sporočila in dopisne sezname z <em>Orodja-&gt;Ustvari&nbsp;filter</"
+"em>?\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... da se lahko znebite &quot;[ime dopisnega seznama]&quot;,\n"
+"ki je dodan zadevi nekaterih dopisnih seznamov z uporabo\n"
+"filtrirnega dejanja <em>rewrite header</em>? Uporabite\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"  replace &quot;\\s*\\[ime dopisnega seznama\\]\\s*&quot;\n"
+"  z &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
 #, fuzzy
-msgid "Path"
-msgstr "Pot"
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>... da lahko poovežete dopisne sezname z mapami v\n"
+"pogovornem oknu <em>Mapa-&gt;Lastnosti</em>? Nato\n"
+"lahko uporabite <em>Sporočilo-&gt;Novo&nbsp;sporočilo&nbsp;v&nbsp;"
+"dopisni&nbsp;seznam</em> da odprete sestavljalnik s prednastavljenim "
+"naslovom dopisnega seznama.\n"
+"Alternativno lahko na mapo kliknete s srednjim gumbom miške.</p>\n"
 
-#: util.h:208
+#: tips:39
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Datoteka z imenom »%1« že obstaja. Jo zares želite nadomestiti?"
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>... da lahko določite ikono vsaki mapi posebej?\n"
+"Poglejte v meni <em>Mapa-&gt;Lastnosti</em></p>\n"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Nadomestim datoteko?"
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>... da KMail lahko prikazuje barvno črto, ki nakazuje vrsto \n"
+"trenutno prikazanega sporočila (navadno besedilo, HTML, OpenPGP)?</p>\n"
+"<p>To izniči poskuse poneverbe verodostojnega podpisovanja s\n"
+"pošiljanjem pošte v HTML, ki posnema KMailove okvire stanja podpisa.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>... da lahko filtrirate katerokoli glavo s preprostim vnosom \n"
+"njenega imena v prvem urejevalnem polju iskalnega pravila?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>... da lahko filtrirate HTML sporočila s pravilom\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>... je pri odgovarjanju naveden samo izbrani del sporočila?</p>\n"
+"<p>Če ni izbrano ničesar, je navedeno celotno sporočilo.</p>\n"
+"<p>To deluje celo z besedilnimi prilogami v primeru, da ste izbrali \n"
+"<em>Videz-&gt;Priloge-&gt;Vgnezdeno</em>.</p>\n"
+"<p>Ta možnost je dosegljiva z vsemi ukazi za odgovarjanje, razen z \n"
+"<em>Sporočilo-&gt;Odgovori brez citatov</em>.</p>\n"
+"<p align=\"right\"><em>prispeval David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15609,33 +15165,41 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Šifriraj vse dele sporočila privzeto</h1>\n"
-#~ "Če je ta možnost izbrana, se vsi deli sporočila (t.j. glavno sporočilo in vse priloge) privzeto šifrirajo.\n"
+#~ "Če je ta možnost izbrana, se vsi deli sporočila (t.j. glavno sporočilo in "
+#~ "vse priloge) privzeto šifrirajo.\n"
 #~ "<p>\n"
-#~ "To je privzeta nastavitev, še vedno jo lahko povozite za vsako posamezno sporočilo.\n"
+#~ "To je privzeta nastavitev, še vedno jo lahko povozite za vsako posamezno "
+#~ "sporočilo.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
 #~ msgstr "Vprašaj &pred šifriranjem vsakega dela"
 
 #~ msgid "Check to be asked for each part whether to encrypt"
-#~ msgstr "Označite, da boste vprašani za vsak del posebej, ali naj bo šifriran"
+#~ msgstr ""
+#~ "Označite, da boste vprašani za vsak del posebej, ali naj bo šifriran"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vprašaj pred šifriranjem vsakega dela</h1>\n"
-#~ "Ko je ta možnost izbrana, boste vprašani za vsak del sporočila posebej (t.j. telo sporočila in vse priloge), ali želite posamezen del šifrirati.\n"
+#~ "Ko je ta možnost izbrana, boste vprašani za vsak del sporočila posebej (t."
+#~ "j. telo sporočila in vse priloge), ali želite posamezen del šifrirati.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15649,14 +15213,16 @@ msgstr "Nadomestim datoteko?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ne šifriraj sporočil</h1>\n"
 #~ "Če je izbrana ta možnost, se sporočila privzeto ne šifrirajo.\n"
 #~ "<p>\n"
-#~ "To je privzeta nastavitev. Še vedno jo lahko spremenite za vsako posamezno nastavitev.\n"
+#~ "To je privzeta nastavitev. Še vedno jo lahko spremenite za vsako "
+#~ "posamezno nastavitev.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15668,20 +15234,33 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritem šifriranja</h1>\n"
-#~ "Algoritem je opis za računalnik, kako naj izvaja določena opravila. Algoritem šifriranja opiše, kako naj računalnik uporabi vaš prejemnikov ključ vašemu sporočilu, da lahko samo željeni prejemnik bere sporočilo.\n"
+#~ "Algoritem je opis za računalnik, kako naj izvaja določena opravila. "
+#~ "Algoritem šifriranja opiše, kako naj računalnik uporabi vaš prejemnikov "
+#~ "ključ vašemu sporočilu, da lahko samo željeni prejemnik bere sporočilo.\n"
 #~ "<p>\n"
-#~ "Izbor nekega algoritma šifriranja določa, kako lahko ali težko je prestreči in prebrati sporočilo. Vseeno pa so vsi algoritmi, ki jih podaja okolje SPHINX, priznani kot zelo varni. V splošnem bo privzet način deloval čisto v redu.\n"
+#~ "Izbor nekega algoritma šifriranja določa, kako lahko ali težko je "
+#~ "prestreči in prebrati sporočilo. Vseeno pa so vsi algoritmi, ki jih "
+#~ "podaja okolje SPHINX, priznani kot zelo varni. V splošnem bo privzet "
+#~ "način deloval čisto v redu.\n"
 #~ "<p>\n"
-#~ "Ta mastavitve je privzeta, lahko jo povozite za vsako posamezno sporočilo.\n"
+#~ "Ta mastavitve je privzeta, lahko jo povozite za vsako posamezno "
+#~ "sporočilo.\n"
 #~ "</qt>"
 
 #~ msgid "Check can end with locally sa&ved certificate"
@@ -15693,16 +15272,21 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Preverjanje se lahko konča s krajevno shranjenim certifikatom</h1>\n"
-#~ "Če je ta možnost ozančena, se lahko preverjanje verige certifikatov konča z lokalno shranjenim certifikatom.\n"
+#~ "Če je ta možnost ozančena, se lahko preverjanje verige certifikatov konča "
+#~ "z lokalno shranjenim certifikatom.\n"
 #~ "<p>\n"
-#~ "Krajevno shranjeni certifikati so vaši lastni certifikati kot tudi certifikati komunikacijskih partnerjev in certifikatskih avtoritet (CA).\n"
+#~ "Krajevno shranjeni certifikati so vaši lastni certifikati kot tudi "
+#~ "certifikati komunikacijskih partnerjev in certifikatskih avtoritet (CA).\n"
 #~ "</p>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15714,12 +15298,15 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vedno preveri pot certifikata do korenskega certifikata</h1>\n"
-#~ "Če je ta možnost omogočena, se preveri pot prejemnikovega certifikata vse do korenskega certifikata.\n"
+#~ "Če je ta možnost omogočena, se preveri pot prejemnikovega certifikata vse "
+#~ "do korenskega certifikata.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15731,16 +15318,20 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Preveri pot certifikata</h1>\n"
-#~ "Če je ta možnost vključena, se preveri cela pot prejemnikovega certifikata gor do korena.\n"
+#~ "Če je ta možnost vključena, se preveri cela pot prejemnikovega "
+#~ "certifikata gor do korena.\n"
 #~ "<p>\n"
-#~ "Vedite, da ni možno izključiti preverjanje prejemnikovega certifikata samega.\n"
+#~ "Vedite, da ni možno izključiti preverjanje prejemnikovega certifikata "
+#~ "samega.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15752,33 +15343,47 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Uporabi certifikatne preklicne sezname (CPS-je)</h1>\n"
-#~ "Certifikacijski preklicni seznam vsebuje certifikate, ki so bili umaknjeni in se naj ne bi več uporabljali za šifriranje. Uporabnik bi mogoče rad preklical certifikat, ker dvomi v integriteto certifikata (npr. nekdo je ugotovil kodo PIN).\n"
+#~ "Certifikacijski preklicni seznam vsebuje certifikate, ki so bili "
+#~ "umaknjeni in se naj ne bi več uporabljali za šifriranje. Uporabnik bi "
+#~ "mogoče rad preklical certifikat, ker dvomi v integriteto certifikata "
+#~ "(npr. nekdo je ugotovil kodo PIN).\n"
 #~ "<p>\n"
-#~ "Priporočeno je uporabljati CPS-je za največjo varnost. V pogovornem oknu z nastavitvami certifikatov in uporavljanjem s CPS-ji lahko izberete, kje dobiti CPS-je.\n"
+#~ "Priporočeno je uporabljati CPS-je za največjo varnost. V pogovornem oknu "
+#~ "z nastavitvami certifikatov in uporavljanjem s CPS-ji lahko izberete, kje "
+#~ "dobiti CPS-je.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
 #~ msgstr "Opo&zori, če CPS poteče prej kot v:"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Označite to, da boste opozorjeni na potek CPS-ja v bližnji prihodnosti"
+#~ msgstr ""
+#~ "Označite to, da boste opozorjeni na potek CPS-ja v bližnji prihodnosti"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Opozori, če CPS poteče v bližnji prihodnosti</h1>\n"
-#~ "Če je ta možnost izbrana, boste opozorjeni, če kateri od uporabljenih CPS-jev poteče v bližnji prihodnosti.\n"
+#~ "Če je ta možnost izbrana, boste opozorjeni, če kateri od uporabljenih CPS-"
+#~ "jev poteče v bližnji prihodnosti.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15787,7 +15392,8 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
@@ -15803,21 +15409,27 @@ msgstr "Nadomestim datoteko?"
 #~ msgstr "Vedno šifriraj se&bi"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Označite to, da bi imeli šifrirana sporočila šifrirana tudi z vašim lastnim ključem."
+#~ msgstr ""
+#~ "Označite to, da bi imeli šifrirana sporočila šifrirana tudi z vašim "
+#~ "lastnim ključem."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vedno šifriraj sebi</h1>\n"
-#~ "Če je to označeno, bodo šifrirana sporočila, ki ste jih poslali, tudi šifrirana z vašim lastnim ključem.\n"
+#~ "Če je to označeno, bodo šifrirana sporočila, ki ste jih poslali, tudi "
+#~ "šifrirana z vašim lastnim ključem.\n"
 #~ "<p>\n"
-#~ "Priporočeno je imeti to možnost vklopljeno, da lahko berete sporočila, ki ste jih poslali.\n"
+#~ "Priporočeno je imeti to možnost vklopljeno, da lahko berete sporočila, ki "
+#~ "ste jih poslali.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15829,16 +15441,21 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Opozori, če certifikat poteče</h1>\n"
-#~ "Če je ta možnost omogočena, boste opozorjeni, če boste hoteli uporabiti certifikat za šifriranje, ki poteče v navedenem številu dni.\n"
+#~ "Če je ta možnost omogočena, boste opozorjeni, če boste hoteli uporabiti "
+#~ "certifikat za šifriranje, ki poteče v navedenem številu dni.\n"
 #~ "<p>\n"
-#~ "Priporočeno je, da pustite to možnost omogočeno, da bi se izognili uporabi certifikatov, ki potečejo v bližnji prihodnosti.\n"
+#~ "Priporočeno je, da pustite to možnost omogočeno, da bi se izognili "
+#~ "uporabi certifikatov, ki potečejo v bližnji prihodnosti.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15859,8 +15476,29 @@ msgstr "Nadomestim datoteko?"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Izbere, kateri certifikati naj bodo poslani"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Pošiljanje certifikatov</h1> Brez vašega certifikata prejemnik ne bo mogel ugotoviti, ali ste res bili vi, ki je poslal sporočilo, ali pa je bilo spremenjeno od koga drugega. <p> Prejemnik lahko pridobi vaš certifikat iz centralnega strežnika, lahko pa tudi pošljete certifikat zrave vašega sporočila. Izberete lahko, da sporočilo ne vsebuje certifikata, vsebuje samo vaš certifikat ali celo ferigo certifikastov, ki certificirajo vaš certifikat, vključno ali brez korenskega certifikata. <p> Priporočeno je, da s sporočilom vedno vključite vsaj svoj certifikat. <p> Ta nastavitev je privzeta, lahko jo povozite za vsako posamezno sporočilo. </qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Pošiljanje certifikatov</h1> Brez vašega certifikata prejemnik "
+#~ "ne bo mogel ugotoviti, ali ste res bili vi, ki je poslal sporočilo, ali "
+#~ "pa je bilo spremenjeno od koga drugega. <p> Prejemnik lahko pridobi vaš "
+#~ "certifikat iz centralnega strežnika, lahko pa tudi pošljete certifikat "
+#~ "zrave vašega sporočila. Izberete lahko, da sporočilo ne vsebuje "
+#~ "certifikata, vsebuje samo vaš certifikat ali celo ferigo certifikastov, "
+#~ "ki certificirajo vaš certifikat, vključno ali brez korenskega "
+#~ "certifikata. <p> Priporočeno je, da s sporočilom vedno vključite vsaj "
+#~ "svoj certifikat. <p> Ta nastavitev je privzeta, lahko jo povozite za "
+#~ "vsako posamezno sporočilo. </qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Pošlji &svoj certifikat"
@@ -15880,16 +15518,20 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Podpiši vse dele sporočila privzeto</h1>\n"
-#~ "Če je ta možnost izbrana, so vsi deli sporočila (t.j. telo sporočila in vse priloge) privzeto podpisani.\n"
+#~ "Če je ta možnost izbrana, so vsi deli sporočila (t.j. telo sporočila in "
+#~ "vse priloge) privzeto podpisani.\n"
 #~ "<p>\n"
-#~ "To je privzeta nastavitve, še vedno jo lahko povozite za vsako posamezno sporočilo.\n"
+#~ "To je privzeta nastavitve, še vedno jo lahko povozite za vsako posamezno "
+#~ "sporočilo.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before signing each part"
@@ -15901,12 +15543,15 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Vprašaj, preden popišeš vsak del</h1>\n"
-#~ "Ko je izbrana ta možnost, boste za vsak del sporočila (t.j. telo sporočila in vse priloge) vprašani, če jih želite podpisati.\n"
+#~ "Ko je izbrana ta možnost, boste za vsak del sporočila (t.j. telo "
+#~ "sporočila in vse priloge) vprašani, če jih želite podpisati.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15920,18 +15565,22 @@ msgstr "Nadomestim datoteko?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ne podpiši sporočila</h1>\n"
 #~ "Če je ta možnost izbrana, se sporočila privzeto ne podpišejo.\n"
 #~ "<p>\n"
-#~ "To je privzeta nastavitve, še vedno jo lahko povozite za vsako posamezno sporočilo.\n"
+#~ "To je privzeta nastavitve, še vedno jo lahko povozite za vsako posamezno "
+#~ "sporočilo.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Certifikat za podpisovanje se nastavlja na strani <em>Cerifikati</em>!"
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Certifikat za podpisovanje se nastavlja na strani <em>Cerifikati</em>!"
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15942,20 +15591,34 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Algoritem podpisovanja</h1>\n"
-#~ "Algoritem je opis za računalnik, kako naj izvaja določena opravila. Algoritem podpisovanja opiše, kako naj računalnik uporabi vaš podpisovalni ključ vašemu sporočilu, da lahko prejemnik ugotovi, ali je sporočilo res vaše.\n"
+#~ "Algoritem je opis za računalnik, kako naj izvaja določena opravila. "
+#~ "Algoritem podpisovanja opiše, kako naj računalnik uporabi vaš "
+#~ "podpisovalni ključ vašemu sporočilu, da lahko prejemnik ugotovi, ali je "
+#~ "sporočilo res vaše.\n"
 #~ "<p>\n"
-#~ "Izbor nekega algoritma podpisovanja določa, kako lahko ali težko je poneveriti in prebrati sporočilo. Vseeno pa so vsi algoritmi, ki jih podaja okolje SPHINX, priznani kot zelo varni. V splošnem bo privzet način deloval čisto v redu.\n"
+#~ "Izbor nekega algoritma podpisovanja določa, kako lahko ali težko je "
+#~ "poneveriti in prebrati sporočilo. Vseeno pa so vsi algoritmi, ki jih "
+#~ "podaja okolje SPHINX, priznani kot zelo varni. V splošnem bo privzet "
+#~ "način deloval čisto v redu.\n"
 #~ "<p>\n"
-#~ "Ta mastavitve je privzeta, lahko jo povozite za vsako posamezno sporočilo.\n"
+#~ "Ta mastavitve je privzeta, lahko jo povozite za vsako posamezno "
+#~ "sporočilo.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15970,12 +15633,17 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Shrani sporočila s podpisi</h1>\n"
-#~ "Ko je ta možnost izbrana, so poslana sporočila shranjena skupaj s podpisi, ki so uveljavnjeni nanje. To je priporočeno, ker vam omogoča, da kasnenje preverite, ali ste podpisali sporočilo ali določen del sporočila.\n"
+#~ "Ko je ta možnost izbrana, so poslana sporočila shranjena skupaj s "
+#~ "podpisi, ki so uveljavnjeni nanje. To je priporočeno, ker vam omogoča, da "
+#~ "kasnenje preverite, ali ste podpisali sporočilo ali določen del "
+#~ "sporočila.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15990,12 +15658,18 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Večdelen ločen podpis</h1>\n"
-#~ "Ko je izbrana ta možnost, so podpis in podpisani podatki ločeni med seboj kot dva dela večdelnega-podpisanega sporočila. Podpisani podatki sporočila bodo lahko prebrani tudi s poštnimi programi, ki ne podpirajo podpisovalnega algoritma in ne podpirajo dešifriranja ASN.1.\n"
+#~ "Ko je izbrana ta možnost, so podpis in podpisani podatki ločeni med seboj "
+#~ "kot dva dela večdelnega-podpisanega sporočila. Podpisani podatki "
+#~ "sporočila bodo lahko prebrani tudi s poštnimi programi, ki ne podpirajo "
+#~ "podpisovalnega algoritma in ne podpirajo dešifriranja ASN.1.\n"
 #~ " "
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -16007,12 +15681,16 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Prosojno podpisana sporočila</h1>\n"
-#~ "Ko je izbrana ta možnost, bosta tako podpis in podpisani podatki šifrirana kot en blok ASN.1. Sporočila bodo lahko prebrana le s poštnimi programi, ki podpirajo dešifriranje s ASN.1.\n"
+#~ "Ko je izbrana ta možnost, bosta tako podpis in podpisani podatki "
+#~ "šifrirana kot en blok ASN.1. Sporočila bodo lahko prebrana le s poštnimi "
+#~ "programi, ki podpirajo dešifriranje s ASN.1.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -16024,8 +15702,22 @@ msgstr "Nadomestim datoteko?"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "Izberite, kolikokrat mora biti vnešen PIN"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt><h1>Vnos PIN</h1> Tukaj lahko izberete, kako pogosto boste morali vnesti PIN za dostop do vašega osebnega varnostnega okolja (PSE), ki vsebuje certifikate.<p>Večkrat kot je treba vnesti PIN, bolj ste zaščiteni pred tem, da bi bila v vašem imenu poslana ponarejena sporočila, vendar pa operacije postanejo nepriročne.<p>Če ne veste, kaj bi, potem pustite to možnost takšno kot je.<p>Vedite, da vnosa PIN iz varnostnih razlogov ni moč povsem .</qt>izključiti ."
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt><h1>Vnos PIN</h1> Tukaj lahko izberete, kako pogosto boste morali "
+#~ "vnesti PIN za dostop do vašega osebnega varnostnega okolja (PSE), ki "
+#~ "vsebuje certifikate.<p>Večkrat kot je treba vnesti PIN, bolj ste "
+#~ "zaščiteni pred tem, da bi bila v vašem imenu poslana ponarejena "
+#~ "sporočila, vendar pa operacije postanejo nepriročne.<p>Če ne veste, kaj "
+#~ "bi, potem pustite to možnost takšno kot je.<p>Vedite, da vnosa PIN iz "
+#~ "varnostnih razlogov ni moč povsem .</qt>izključiti ."
 
 #~ msgid "Once per session"
 #~ msgstr "Enkrat na sejo"
@@ -16042,16 +15734,21 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Opozori, če certifikat poteče</h1>\n"
-#~ "Če je ta možnost omogočena, boste opozorjeni, če boste hoteli uporabiti certifikat za podpisovanje, ki poteče v navedenem številu dni.\n"
+#~ "Če je ta možnost omogočena, boste opozorjeni, če boste hoteli uporabiti "
+#~ "certifikat za podpisovanje, ki poteče v navedenem številu dni.\n"
 #~ "<p>\n"
-#~ "Priporočeno je, da pustite to možnost omogočeno, da bi se izognili uporabi certifikatov, ki potečejo v bližnji prihodnosti.\n"
+#~ "Priporočeno je, da pustite to možnost omogočeno, da bi se izognili "
+#~ "uporabi certifikatov, ki potečejo v bližnji prihodnosti.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -16063,14 +15760,16 @@ msgstr "Nadomestim datoteko?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Opozori, če e-poštni naslov podpisnika ni v certifikatu</h1>\n"
-#~ "Če je ta možnost vključena, se poda opozorilo, če e-poštni naslov podpisnika ni vsebovan v certifikatu za podpisovanje.\n"
+#~ "Če je ta možnost vključena, se poda opozorilo, če e-poštni naslov "
+#~ "podpisnika ni vsebovan v certifikatu za podpisovanje.\n"
 #~ "<p>\n"
 #~ "Priporočeno je, da imate to možnost vključeno za največjo integriteto.\n"
 #~ "</qt>"
diff --git a/tde-i18n-sr/messages/tdepim/kmail.po b/tde-i18n-sr/messages/tdepim/kmail.po
index 6e17f4610f9..f51a3d7ba55 100644
--- a/tde-i18n-sr/messages/tdepim/kmail.po
+++ b/tde-i18n-sr/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-16 13:31+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"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"
+"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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Топлица Танасковић,Слободан Симић"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "Ниј&едан (користити са опрезом)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Налог за полуатоматско руковање ресурсима"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Обриши прошле"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,13 +254,13 @@ msgstr "&Корисник:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Ваш интернет провајдер вам је дао <em>корисничко име</em> "
-"које се користи за ваше пријављивање на њихове сервере. То је обично део "
-"е-адресе (део пре <em>@</em>)."
+"Ваш интернет провајдер вам је дао <em>корисничко име</em> које се користи за "
+"ваше пријављивање на њихове сервере. То је обично део е-адресе (део пре "
+"<em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -275,20 +281,20 @@ msgstr "Пох&рани POP лозинку"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Укључите ову опцију ако желите да KMail похрани лозинку.\n"
 "Ако је TDEWallet доступан лозинка ће бити похрањена у њему, што се сматра "
 "безбедним.\n"
 "Међутим, ако TDEWallet није доступан, лозинка ће бити похрањена у фајл са "
-"подешавањима KMail-а. Лозинка се похрањује у замућеном облику, али се не треба "
-"сматрати безбедном против дешифровања ако неко успе да се домогне фајла са "
-"подешавањима."
+"подешавањима KMail-а. Лозинка се похрањује у замућеном облику, али се не "
+"треба сматрати безбедном против дешифровања ако неко успе да се домогне "
+"фајла са подешавањима."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -316,12 +322,13 @@ msgstr "&Филтрирај поруке ако су веће од"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ако изаберете ову опцију, POP филтери ће бити коришћени за одлучивање шта да се "
-"ради са порукама. Можете их тада означити за преузимање, брисање или држање на "
-"серверу."
+"Ако изаберете ову опцију, POP филтери ће бити коришћени за одлучивање шта да "
+"се ради са порукама. Можете их тада означити за преузимање, брисање или "
+"држање на серверу."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -370,13 +377,15 @@ msgstr "Обичан те&кст"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -419,14 +428,14 @@ msgstr "Именски простори:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Овде можете видети различите именске просторе које ваш IMAP сервер подржава. "
-"Сваки именски простор представља префикс који издваја групе фасцикли. Именски "
-"простор омогућава KMail-у да прикаже вашу личну фасциклу и дељене фасцикле у "
-"једном налогу."
+"Сваки именски простор представља префикс који издваја групе фасцикли. "
+"Именски простор омогућава KMail-у да прикаже вашу личну фасциклу и дељене "
+"фасцикле у једном налогу."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -484,12 +493,12 @@ msgstr "Учитај при&логе на захтев"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Активирајте ово да се прилози не би аутоматски учитавали када изаберете "
-"е-поруку, већ тек када кликнете на прилог. Овако се и велике е-поруке могу "
+"Активирајте ово да се прилози не би аутоматски учитавали када изаберете е-"
+"поруку, већ тек када кликнете на прилог. Овако се и велике е-поруке могу "
 "тренутно приказати."
 
 #: accountdialog.cpp:1009
@@ -501,8 +510,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Само у фасциклама које су отворене (раширене) у стаблу фасцикли проверавају се "
-"подфасцикле. Користите ово ако има много фасцикли на серверу."
+"Само у фасциклама које су отворене (раширене) у стаблу фасцикли проверавају "
+"се подфасцикле. Користите ово ако има много фасцикли на серверу."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -530,7 +539,7 @@ msgstr "<нема>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "пристигле"
 
@@ -538,8 +547,8 @@ msgstr "пристигле"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Сервер изгледа не подржава јединствене бројеве порука, а то је неопходно за "
 "остављање порука на серверу.\n"
@@ -550,8 +559,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Сервер изгледа не подржава преузимање заглавља порука, а то је неопходно за "
 "филтрирање порука на серверу.\n"
@@ -560,21 +569,22 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Имајте на уму да ова могућност може проузроковати да неки POP3 сервери који не "
-"подржавају проточну обраду могу слати неисправне поруке.\n"
+"Имајте на уму да ова могућност може проузроковати да неки POP3 сервери који "
+"не подржавају проточну обраду могу слати неисправне поруке.\n"
 "Ово је подесиво зато што неки сервери подржавају проточну обраду али не "
-"објављују своје способности. Да бисте проверили да ли ваш POP3 сервер објављује "
-"да подржава проточну обраду, употребите дугме „Провери шта сервер подржава“ у "
-"дну дијалога.\n"
+"објављују своје способности. Да бисте проверили да ли ваш POP3 сервер "
+"објављује да подржава проточну обраду, употребите дугме „Провери шта сервер "
+"подржава“ у дну дијалога.\n"
 "Ако ваш сервер не објављује подршку, а ви ипак желите већу брзину, онда би "
 "требало да пробате слањем пар порука сами себи и њиховим преузимањем."
 
@@ -584,30 +594,30 @@ msgstr "Назначите прво сервер и порт у језичку �
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Сервер изгледа не подржава проточну обраду, стога је ова опција искључена.\n"
 "Пошто неки сервери не објављују исправно своје способности, и даље можете "
-"укључити проточну обраду. Само пазите, ова могућност може проузроковати да неки "
-"POP сервери који не подржавају проточну обраду шаљу искварене поруке. Зато пре "
-"коришћења ове могућности за важну пошту, требало би да је испробате слањем "
-"већег броја пробних порука сами себи и њиховим преузимањем са POP сервера у "
-"једном потезу."
+"укључити проточну обраду. Само пазите, ова могућност може проузроковати да "
+"неки POP сервери који не подржавају проточну обраду шаљу искварене поруке. "
+"Зато пре коришћења ове могућности за важну пошту, требало би да је испробате "
+"слањем већег броја пробних порука сами себи и њиховим преузимањем са POP "
+"сервера у једном потезу."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Сервер изгледа не подржава јединствене бројеве порука, а то је неопходно за "
 "остављање порука на серверу; стога је ова опција искључена.\n"
@@ -619,8 +629,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Сервер изгледа не подржава преузимање заглавља порука, а то је неопходно за "
 "филтрирање порука на серверу; стога је ова опција искључена.\n"
@@ -708,8 +718,8 @@ msgstr "IMAP налог"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "Морате додати налог у мрежном одељку поставки да бисте примали пошту."
 
 #: accountwizard.cpp:87
@@ -746,13 +756,13 @@ msgstr "Добродошли у KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Изгледа да сте KMail покренули по први пут. Можете користити овог чаробњака "
-"да подесите ваше поштанске налоге. Само унесите податке о вези које сте добили "
-"од вашег провајдера е-поште у наредним страницама.</qt>"
+"<qt>Изгледа да сте KMail покренули по први пут. Можете користити овог "
+"чаробњака да подесите ваше поштанске налоге. Само унесите податке о вези "
+"које сте добили од вашег провајдера е-поште у наредним страницама.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -814,8 +824,7 @@ msgstr "Користи локално испоручивање"
 msgid "Server Information"
 msgstr "Подаци о серверу"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ниједан"
@@ -908,8 +917,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Није нађен алат за откривање спама. Инсталирајте програме за откривање спама "
-"и поново покрените овај чаробњак.</p>"
+"<p>Није нађен алат за откривање спама. Инсталирајте програме за откривање "
+"спама и поново покрените овај чаробњак.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -953,29 +962,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Овде можете добити помоћ у постављању филтерских правила KMail-а ради "
-"коришћења неких познатијих против вирусних алата.</p>"
-"<p>Чаробњак може да детектује те алате на вашем рачунару, као и да направи "
-"филтерска правила за разврставање порука употребом тих алата и одвајање порука "
-"означених да садрже вирус. Чаробњак неће узети у обзир постојећа филтерска "
-"правила, само ће евентуално додати нова.</p>"
-"<p><b>Упозорење:</b> Пошто KMail делује блокирано током скенирања порука у "
-"потрази за вирусима, можете сусрести проблеме са одзивом KMail-а зато што "
-"операције противвирусних алата обично дуго трају. Ако желите да вратите "
-"претходно понашање, можете обрисати филтерска правила која је чаробњак "
-"направио."
+"коришћења неких познатијих против вирусних алата.</p><p>Чаробњак може да "
+"детектује те алате на вашем рачунару, као и да направи филтерска правила за "
+"разврставање порука употребом тих алата и одвајање порука означених да "
+"садрже вирус. Чаробњак неће узети у обзир постојећа филтерска правила, само "
+"ће евентуално додати нова.</p><p><b>Упозорење:</b> Пошто KMail делује "
+"блокирано током скенирања порука у потрази за вирусима, можете сусрести "
+"проблеме са одзивом KMail-а зато што операције противвирусних алата обично "
+"дуго трају. Ако желите да вратите претходно понашање, можете обрисати "
+"филтерска правила која је чаробњак направио."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1011,15 +1018,13 @@ msgstr "Премести &могући спам у:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Подразумевана фасцикла је Пристигле али ви можете то изменити у приказу "
-"фасцикли испод. "
-"<p>Не посржавају сви алати разврставање као могући спам. Ако нисте изабрали "
-"алат који то може нећете моћи ни да изаберете фасциклу."
+"фасцикли испод. <p>Не посржавају сви алати разврставање као могући спам. Ако "
+"нисте изабрали алат који то може нећете моћи ни да изаберете фасциклу."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1029,13 +1034,13 @@ msgstr "Провери поруке помоћу против вирусних �
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Пустите против вирусне алате да разврстају ваше поруке. Чаробњак ће направити "
-"одговарајуће филтере. Алати обично прво означе поруке тако да филтери могу да "
-"реагују на основу тога, и, на пример, преместе поруке означене као да садрже "
-"вирус у посебну фасциклу."
+"Пустите против вирусне алате да разврстају ваше поруке. Чаробњак ће "
+"направити одговарајуће филтере. Алати обично прво означе поруке тако да "
+"филтери могу да реагују на основу тога, и, на пример, преместе поруке "
+"означене као да садрже вирус у посебну фасциклу."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1044,8 +1049,8 @@ msgstr "Премести поруке детектоване као зараже
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Напревљен је филтер за детектовање порука сврстаних у заражене и њихово "
 "премештање у предефинисану фасциклу. Подразумевана фасцикла је Смеће, али "
@@ -1057,8 +1062,8 @@ msgstr "Додатно, означи прочитаним поруке дете�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Означава поруке детектоване као заражене прочитаним и премешта их у изабрану "
 "фасциклу."
@@ -1242,8 +1247,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Ово може бити зато што немата дозволе да то урадите, или зато што је фасцикла "
-"већ присутна на серверу. Порука о грешци из комуникације са сервером је овде:"
+"Ово може бити зато што немата дозволе да то урадите, или зато што је "
+"фасцикла већ присутна на серверу. Порука о грешци из комуникације са "
+"сервером је овде:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1256,8 +1262,8 @@ msgstr "Грешка приликом читања фасцикле %1 на се
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1277,8 +1283,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1309,20 +1315,20 @@ msgstr "обрисана"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Ниједан од ваших идентитета не одговара примаоцу ове поруке, "
 "<br>изаберите која је од следећих адреса ваша (ако иједна):"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Неколико ваших идентитета одговара примаоцу ове поруке, "
-"<br>изаберите која је од следећих адреса ваша:"
+"<qt>Неколико ваших идентитета одговара примаоцу ове поруке, <br>изаберите "
+"која је од следећих адреса ваша:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1351,18 +1357,21 @@ msgstr "Дошло је до грешке у току слагања фасци�
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ову поставку је наместио ваш администратор.</p>"
-"<p>Ако мислите да је ово грешка, контактирајте га.</p></qt>"
+"<qt><p>Ову поставку је наместио ваш администратор.</p><p>Ако мислите да је "
+"ово грешка, контактирајте га.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Учитај профил..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Подеси налог"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Додај..."
@@ -1392,6 +1401,11 @@ msgstr "<qt>Желите ли заиста да уклоните идентит�
 msgid "Remove Identity"
 msgstr "Уклони идентитет"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Уклони"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Додај..."
@@ -1400,6 +1414,11 @@ msgstr "Додај..."
 msgid "Modify..."
 msgstr "Измени..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Уклони"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Постави као подразумеван"
@@ -1416,17 +1435,15 @@ msgstr "&Слање"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Одлазећи налози (додајте барем један):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Име"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Врста"
@@ -1448,8 +1465,7 @@ msgstr "Постави подразумевано"
 msgid "Common Options"
 msgstr "Уобичајене опције"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Потврди &пре слања"
@@ -1500,17 +1516,16 @@ msgstr "Подра&зумевани домен:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Подразумевани домен се користи за довршавање е-адреса које се састоје само "
-"од корисничког имена.</p></qt>"
+"<qt><p>Подразумевани домен се користи за довршавање е-адреса које се састоје "
+"само од корисничког имена.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1528,9 +1543,9 @@ msgstr "Додај транспорт"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (подразумевани)"
 
@@ -1615,6 +1630,10 @@ msgstr "Измени налог"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Не могу да нађем налог <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Боје"
@@ -1723,8 +1742,7 @@ msgstr "Испраћена веза"
 msgid "Misspelled Words"
 msgstr "Погрешно написане речи"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Нова порука"
@@ -1912,8 +1930,8 @@ msgstr "Ланци су подразумевано затворени"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Отвори ланце који садрже нове, непрочитане или важне &поруке и отвори ланце "
 "који се прате."
@@ -1924,67 +1942,52 @@ msgstr "Приказ датума"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>За датум могу бити коришћени ови изрази:</strong></p>"
-"<ul>"
-"<li>d — дан као број без водеће нуле (1-31)</li>"
-"<li>dd — дан као број са водећом нулом (01-31)</li>"
-"<li>ddd — скраћено име дана (пон - нед)</li>"
-"<li>dddd — пуно име дана (понедељак - недеља)</li>"
-"<li>M — месец као број без водеће нуле (1-12)</li>"
-"<li>MM — датум као број са водећом нулом (01-12)</li>"
-"<li>MMM — скраћено име месеца (јан - дец)</li>"
-"<li>MMMM — пуно име месеца (јануар - децембар)</li>"
-"<li>yy — година као двоцифрени број (00-99)</li>"
-"<li>yyyy — година као четвороцифрени број (0000-9999)</li></ul>"
-"<p><strong>За време могу бити коришћени ови изрази:</string></p> "
-"<ul>"
-"<li>h — час без водеће нуле (0-23 или 1-12 ако је AM/PM приказ)</li>"
-"<li>hh — час са водећим нулом (00-23 или 01-12 ако је AM/PM приказ)</li>"
-"<li>m — минути без водеће нуле (0-59)</li>"
-"<li>mm — минути са водећом нулом (00-59)</li>"
-"<li>s — секунде без водеће нуле (0-59)</li>"
-"<li>ss — секунде са водећом нулом (00-59)</li>"
-"<li>z — милисекунде без водећих нула (0-999)</li>"
-"<li>zzz — милисекунде са водећим нулама (000-999)</li>"
-"<li>AP — пребаци на AM/PM приказ. AP ће бити замењено са „AM“ или „PM“.</li>"
-"<li>ap — пребаци на AM/PM приказ. ap ће бити замењено са „am“ или „pm“.</li>"
-"<li>Z — временска зона у бројевној форми (-0500)</li></ul>"
-"<p><strong>Сви остали знаци ће бити игнорисани.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>За датум могу бити коришћени ови изрази:</strong></"
+"p><ul><li>d — дан као број без водеће нуле (1-31)</li><li>dd — дан као број "
+"са водећом нулом (01-31)</li><li>ddd — скраћено име дана (пон - нед)</"
+"li><li>dddd — пуно име дана (понедељак - недеља)</li><li>M — месец као број "
+"без водеће нуле (1-12)</li><li>MM — датум као број са водећом нулом (01-12)</"
+"li><li>MMM — скраћено име месеца (јан - дец)</li><li>MMMM — пуно име месеца "
+"(јануар - децембар)</li><li>yy — година као двоцифрени број (00-99)</"
+"li><li>yyyy — година као четвороцифрени број (0000-9999)</li></"
+"ul><p><strong>За време могу бити коришћени ови изрази:</string></p> "
+"<ul><li>h — час без водеће нуле (0-23 или 1-12 ако је AM/PM приказ)</"
+"li><li>hh — час са водећим нулом (00-23 или 01-12 ако је AM/PM приказ)</"
+"li><li>m — минути без водеће нуле (0-59)</li><li>mm — минути са водећом "
+"нулом (00-59)</li><li>s — секунде без водеће нуле (0-59)</li><li>ss — "
+"секунде са водећом нулом (00-59)</li><li>z — милисекунде без водећих нула "
+"(0-999)</li><li>zzz — милисекунде са водећим нулама (000-999)</li><li>AP — "
+"пребаци на AM/PM приказ. AP ће бити замењено са „AM“ или „PM“.</li><li>ap — "
+"пребаци на AM/PM приказ. ap ће бити замењено са „am“ или „pm“.</li><li>Z — "
+"временска зона у бројевној форми (-0500)</li></ul><p><strong>Сви остали "
+"знаци ће бити игнорисани.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Мењање глобалних поставки повезивања у ланце ће прегазити све вредности "
 "специфичне за фасцикле."
@@ -2001,8 +2004,7 @@ msgstr "Прикажи HTML статусну трак&у"
 msgid "Show s&pam status in fancy headers"
 msgstr "Прикажи &статус спама у помодним заглављима"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Замени смешкове емотиконима"
@@ -2011,8 +2013,7 @@ msgstr "Замени смешкове емотиконима"
 msgid "Use smaller font for quoted text"
 msgstr "Користи мањи фонт за цитирани текст"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Прикажи отворене/затворене наводнике"
@@ -2038,8 +2039,7 @@ msgstr "Аутоматски"
 msgid "&Override character encoding:"
 msgstr "Пре&гази кодирањем знакова:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Укључи икону у системској касети"
@@ -2141,21 +2141,19 @@ msgstr "<b>%f</b> ће бити замењено именом фајла за у
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>У фразама за одговор подржани су следећи симболи:\n"
-"<br><b>%D</b>: датум, <b>%S</b>: тема, "
-"<br><b>%e</b>: адреса пошиљаоца, <b>%F</b>: име пошиљаоца, <b>%f</b>"
-": иницијали пошиљаоца,"
-"<br><b>%T</b>: име примаоца, <b>%t</b>: име и адреса примаоца"
-"<br><b>%C</b>: имена за копије, <b>%c</b>: имена и адресе за копије"
-"<br><b>%%</b>: знак за проценат, <b>%_</b>: размак, <b>%L</b>: крај линије</qt>"
+"<br><b>%D</b>: датум, <b>%S</b>: тема, <br><b>%e</b>: адреса пошиљаоца, <b>"
+"%F</b>: име пошиљаоца, <b>%f</b>: иницијали пошиљаоца,<br><b>%T</b>: име "
+"примаоца, <b>%t</b>: име и адреса примаоца<br><b>%C</b>: имена за копије, <b>"
+"%c</b>: имена и адресе за копије<br><b>%%</b>: знак за проценат, <b>%_</b>: "
+"размак, <b>%L</b>: крај линије</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2178,21 +2176,20 @@ msgstr "Одговори &свима:"
 msgid "&Forward:"
 msgstr "&Проследи:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Знак &цитата:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Дана %D, написали сте:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Дана %D, %F је написао(ла):"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Прослеђена порука"
 
@@ -2230,8 +2227,8 @@ msgstr "Унесите нови префикс за прослеђивање:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Ова листа се проверава одозго на доле за сваку одлазећу поруку, ради "
 "проналажења скупа знакова који садржи све захтеване знаке."
@@ -2270,10 +2267,9 @@ msgstr "Вредност"
 msgid "Ne&w"
 msgstr "&Нов"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Име:"
@@ -2282,19 +2278,18 @@ msgstr "&Име:"
 msgid "&Value:"
 msgstr "&Вредност:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Именовање прилога компатибилно са Outlook-ом"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Укључите ову опцију ако желите да Outlook(tm) разуме имена прилога која садрже "
-"неенглеска слова"
+"Укључите ову опцију ако желите да Outlook(tm) разуме имена прилога која "
+"садрже неенглеска слова"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2321,20 +2316,20 @@ msgstr "приложен"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Изабрали сте да кодирате имена прилога која садрже неенглеска слова на начин "
 "који ће разумети Outlook(tm) и други поштански клијенти који не подржавају "
 "имена прилога у складу са стандардом.\n"
-"KMail може направити поруке које нису по стандарду, због чега је могуће да ваше "
-"поруке неће разумети поштански клијенти у складу са стандардом. Зато, осим "
-"уколико немате другог избора, не би требало да укључите ову опцију."
+"KMail може направити поруке које нису по стандарду, због чега је могуће да "
+"ваше поруке неће разумети поштански клијенти у складу са стандардом. Зато, "
+"осим уколико немате другог избора, не би требало да укључите ову опцију."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2358,112 +2353,97 @@ msgstr "&Позадински шифранти"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Понекад поруке стижу у оба формата. Ова опција контролише да ли желите да се "
-"прикаже HTML део или обичан текст.</p>"
-"<p>Приказивање HTML делова чини да порука изгледа лепше, али то понекад "
-"повећава ризик да се безбедносне рупе искористе.</p>"
-"<p>Приказивањем обичног текста губи се много од форматирања поруке, али то чини "
-"коришћење безбедносних рупа у HTML исцртавачу (Konqueror) готово <em>"
-"немогућим</em>.</p>"
-"<p>Опција испод штити од једне уобичајене злоупотребе HTML порука, али вас не "
-"може заштити од безбедоносних пропуста који нису били познати у време писања "
-"ове верзије KMail-а.</p>"
-"<p>Због свега наведеног саветује се да <em>не</em> дајете предност HTML-у у "
-"односу на обичан текст.</p>"
-"<p><b>Напомена:</b>Ову опцију можете поставити за сваку фасциклу посебно из "
-"менија <i>Фасцикла</i> KMail-овог главног прозора.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Понекад поруке стижу у оба формата. Ова опција контролише да ли "
+"желите да се прикаже HTML део или обичан текст.</p><p>Приказивање HTML "
+"делова чини да порука изгледа лепше, али то понекад повећава ризик да се "
+"безбедносне рупе искористе.</p><p>Приказивањем обичног текста губи се много "
+"од форматирања поруке, али то чини коришћење безбедносних рупа у HTML "
+"исцртавачу (Konqueror) готово <em>немогућим</em>.</p><p>Опција испод штити "
+"од једне уобичајене злоупотребе HTML порука, али вас не може заштити од "
+"безбедоносних пропуста који нису били познати у време писања ове верзије "
+"KMail-а.</p><p>Због свега наведеног саветује се да <em>не</em> дајете "
+"предност HTML-у у односу на обичан текст.</p><p><b>Напомена:</b>Ову опцију "
+"можете поставити за сваку фасциклу посебно из менија <i>Фасцикла</i> KMail-"
+"овог главног прозора.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Неке рекламе су у HTML формату и садрже референце ка, на пример, сликама "
-"које оглашавачи користе да би сазнали да ли сте прочитали њихове поруке („web "
-"bugs“).</p>"
-"<p>Нема ваљаног разлога за учитавање оваквих слике са Интернета, пошто "
-"пошиљалац увек може приложити захтеване слике директно у поруци.</p>"
-"<p>Ради заштите од такве злоупотребе KMail-ове особине да може да приказује "
-"HTML, ова опција је подразумевано <em>искључена</em>.</p>"
-"<p>Ако ипак желите, на пример, да видите слике у HTML порукама које нису "
-"прикачене уз њу, можете укључити ову опцију, али будите свесни могућих "
-"проблема.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Неке рекламе су у HTML формату и садрже референце ка, на пример, "
+"сликама које оглашавачи користе да би сазнали да ли сте прочитали њихове "
+"поруке („web bugs“).</p><p>Нема ваљаног разлога за учитавање оваквих слике "
+"са Интернета, пошто пошиљалац увек може приложити захтеване слике директно у "
+"поруци.</p><p>Ради заштите од такве злоупотребе KMail-ове особине да може да "
+"приказује HTML, ова опција је подразумевано <em>искључена</em>.</p><p>Ако "
+"ипак желите, на пример, да видите слике у HTML порукама које нису прикачене "
+"уз њу, можете укључити ову опцију, али будите свесни могућих проблема.</p></"
+"qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Политика обавештавања о распоређивању порука</h3>"
-"<p>MDN-ови су уопштење онога што се обично зове <b>потврда о читању</b>"
-". Писац поруке захтева да се пошаље обавештење о распоређивању поруке и "
-"примаочев програм за пошту прави одговор из кога писац може да сазна шта се "
-"десило са његовом поруком. Уобичајене врсте распоређивања укључују <b>"
-"приказана</b> (нпр. прочитана), <b>обрисана</b> и <b>послата</b> "
-"(нпр. прослеђена).</p>"
-"<p>За контролу KMail-овог слања MDN-ова служе следеће опције:</p>"
-"<ul>"
-"<li><em>Игнориши</em>: Игнорише било какве захтеве за обавештавање. Ниједан MDN "
-"никада аутоматски неће бити послат (препоручљиво).</li>"
-"<li><em>Питај</em>: Одговара на захтев тек пошто упита корисника за дозволу. На "
-"овај начин можете слати MDN-ове за одабране поруке, док ћете их игнорисати или "
-"одбијати за остале.</li>"
-"<li><em>Одбиј</em>: Увек шаље <b>одбијено</b> обавештење. Ово је само <em>"
-"мало</em> боље од слања MDN-ова увек. Писац ће још увек знати да је нешто "
-"рађено са поруком, али не може рећи да ли је обрисана, прочитана итд.</li>"
-"<li><em>Шаљи увек</em>: Увек шаље обавештење о распоређивању. Ово значи да "
-"писац поруке сазнаје када је нешто рађено са поруком и још шта јој се догодило "
-"(приказана, обрисана, итд.) Ова опција се никако не препоручује, али пошто има "
-"смисла за рецимо управљање односа према муштеријама, учињена је доступном.</li>"
-"</ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Политика обавештавања о распоређивању порука</h3><p>MDN-ови су "
+"уопштење онога што се обично зове <b>потврда о читању</b>. Писац поруке "
+"захтева да се пошаље обавештење о распоређивању поруке и примаочев програм "
+"за пошту прави одговор из кога писац може да сазна шта се десило са његовом "
+"поруком. Уобичајене врсте распоређивања укључују <b>приказана</b> (нпр. "
+"прочитана), <b>обрисана</b> и <b>послата</b> (нпр. прослеђена).</p><p>За "
+"контролу KMail-овог слања MDN-ова служе следеће опције:</"
+"p><ul><li><em>Игнориши</em>: Игнорише било какве захтеве за обавештавање. "
+"Ниједан MDN никада аутоматски неће бити послат (препоручљиво).</"
+"li><li><em>Питај</em>: Одговара на захтев тек пошто упита корисника за "
+"дозволу. На овај начин можете слати MDN-ове за одабране поруке, док ћете их "
+"игнорисати или одбијати за остале.</li><li><em>Одбиј</em>: Увек шаље "
+"<b>одбијено</b> обавештење. Ово је само <em>мало</em> боље од слања MDN-ова "
+"увек. Писац ће још увек знати да је нешто рађено са поруком, али не може "
+"рећи да ли је обрисана, прочитана итд.</li><li><em>Шаљи увек</em>: Увек шаље "
+"обавештење о распоређивању. Ово значи да писац поруке сазнаје када је нешто "
+"рађено са поруком и још шта јој се догодило (приказана, обрисана, итд.) Ова "
+"опција се никако не препоручује, али пошто има смисла за рецимо управљање "
+"односа према муштеријама, учињена је доступном.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2479,15 +2459,15 @@ msgstr "Дозволи порукама да учитају &спољне реф
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>УПОЗОРЕЊЕ:</b> Дозвољавање HTML-а у е-порукама повећава ризик да ће ваш "
-"систем бити компримитован садашњим или очекиваним безбедоносним искоришћавањима "
-"(exploits). <a href=\"whatsthis:%1\">Више о HTML пошти...</a> "
-"<a href=\"whatsthis:%2\">Више о спољним референцама...</a>"
+"систем бити компримитован садашњим или очекиваним безбедоносним "
+"искоришћавањима (exploits). <a href=\"whatsthis:%1\">Више о HTML пошти...</"
+"a> <a href=\"whatsthis:%2\">Више о спољним референцама...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2546,8 +2526,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>УПОЗОРЕЊЕ:</b> Безусловно слање потврда подрива вашу приватност <a "
-"href=\"whatsthis:%1\">Више о овоме...</a>"
+"<b>УПОЗОРЕЊЕ:</b> Безусловно слање потврда подрива вашу приватност <a href="
+"\"whatsthis:%1\">Више о овоме...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2561,15 +2541,14 @@ msgstr "Аутоматски увози кључеве и сертификате
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Промена глобалне HTML поставке ће прегазити све вредности поставки специфичне "
-"за фасцикле."
+"Промена глобалне HTML поставке ће прегазити све вредности поставки "
+"специфичне за фасцикле."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Ова опција захтева dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "без проксија"
@@ -2598,8 +2577,8 @@ msgstr "&Искључи важне поруке из застаревања"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Приликом покушаја проналажења непрочитаних порука:"
 
@@ -2623,8 +2602,8 @@ msgstr "Кружи у свим фасциклама"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Приликом уласка у фасциклу:"
 
@@ -2693,25 +2672,21 @@ msgstr "Директоријуми (формат „maildir“)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Ово одређује који ће се формат поштанског сандучета подразумевано користит "
-"за локалне фасцикле:</p>"
-"<p><b>mbox:</b> KMail-ове поштанске фасцикле се представљају свака једним "
-"фајлом. Поруке су одвојене једна од друге линијом која почиње са „From “. Ово "
-"штеди простор на диску, али може бити мање робусно, на пример када премештате "
-"поруке из фасцикле у фасциклу.</p>"
-"<p><b>maildir:</b>  KMail-ове поштанске фасцикле се представљају стварним "
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Ово одређује који ће се формат поштанског сандучета подразумевано "
+"користит за локалне фасцикле:</p><p><b>mbox:</b> KMail-ове поштанске "
+"фасцикле се представљају свака једним фајлом. Поруке су одвојене једна од "
+"друге линијом која почиње са „From “. Ово штеди простор на диску, али може "
+"бити мање робусно, на пример када премештате поруке из фасцикле у фасциклу.</"
+"p><p><b>maildir:</b>  KMail-ове поштанске фасцикле се представљају стварним "
 "директоријумима на диску. Свака порука је у засебном фајлу. Ово можда траћи "
 "мало простора, али би требало да буде робусније, на пример када премештате "
 "поруке из фасцикле у фасциклу.</p></qt>"
@@ -2747,54 +2722,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Када скачете на следећу непрочитану поруку, може се десити да нема више "
-"непрочитаних порука испод текуће.</p>"
-"<p><b>Немој да кружиш:</b> Претрага ће стати код последње поруке у текућој "
-"фасцикли.</p>"
-"<p><b>Кружи у текућој фасцикли:</b> Претрага ће бити настављена од врха листе "
-"порука, али неће ићи у другу фасциклу.</p>"
-"<p><b>Кружи у свим фасциклама:</b> Претрага ће бири настављена од врха листе "
-"порука. Ако нема више непрочитаних порука онда ће се наставити у следећој "
-"фасцикли.</p>"
-"<p>Слично овоме, када тражите претходну непрочитану поруку, претрага ће почети "
-"од дна листе порука и наставиће се у претходној фасцикли, у зависности од тога "
-"која је опција одабрана.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Када скачете на следећу непрочитану поруку, може се десити да нема "
+"више непрочитаних порука испод текуће.</p><p><b>Немој да кружиш:</b> "
+"Претрага ће стати код последње поруке у текућој фасцикли.</p><p><b>Кружи у "
+"текућој фасцикли:</b> Претрага ће бити настављена од врха листе порука, али "
+"неће ићи у другу фасциклу.</p><p><b>Кружи у свим фасциклама:</b> Претрага ће "
+"бири настављена од врха листе порука. Ако нема више непрочитаних порука онда "
+"ће се наставити у следећој фасцикли.</p><p>Слично овоме, када тражите "
+"претходну непрочитану поруку, претрага ће почети од дна листе порука и "
+"наставиће се у претходној фасцикли, у зависности од тога која је опција "
+"одабрана.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Пуно индексирање текста омогућава веома брзу претрагу садржаја ваших порука. "
-"Када је укључено, дијалог претраге ће радити веома брзо. Такође, трака алата "
-"претраге ће означавати поруке на основу садржаја.</p>"
-"<p>Индексирање захтева извесну количину простора на диску (отприлике половину "
-"колико заузимају поруке).</p>"
-"<p>Након укључења, индекс ће почети да се прави али ви можете наставити да "
-"користите KMail док се ова операција обавља.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Пуно индексирање текста омогућава веома брзу претрагу садржаја ваших "
+"порука. Када је укључено, дијалог претраге ће радити веома брзо. Такође, "
+"трака алата претраге ће означавати поруке на основу садржаја.</"
+"p><p>Индексирање захтева извесну количину простора на диску (отприлике "
+"половину колико заузимају поруке).</p><p>Након укључења, индекс ће почети да "
+"се прави али ви можете наставити да користите KMail док се ова операција "
+"обавља.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2860,8 +2826,8 @@ msgstr "&Сакриј groupware фасцикле"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 "Када је ово попуњено, нећете видети IMAP ресурсне фасцикле у стаблу фасцикли."
 
@@ -2871,8 +2837,8 @@ msgstr "Прикажи &само groupware фасцикле за овај нал
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Ако је ово попуњено, нећете видети нормалне поштанске фасцикле у стаблу "
 "фасцикли код налога подешених за groupware."
@@ -2906,8 +2872,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Укључите ову опцију ако желите да Outlook(tm) разуме ваше одговоре на одговоре "
-"на позивнице"
+"Укључите ову опцију ако желите да Outlook(tm) разуме ваше одговоре на "
+"одговоре на позивнице"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2918,7 +2884,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Укључите ову опцију ако желите да Outlook(tm) разуме ваше одговоре на позивнице"
+"Укључите ову опцију ако желите да Outlook(tm) разуме ваше одговоре на "
+"позивнице"
 
 #: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
@@ -2933,23 +2900,22 @@ msgid ""
 "compatible way."
 msgstr ""
 "Microsoft-ов Outlook, када се користе заједно са Microsoft-овим Exchange "
-"сервером, има проблема са разумевањем стандарду-сагласним groupware е-порукама. "
-"Укључите ову опцију да би се groupware позивнице слале на начин који Exchange "
-"сигурно разуме."
+"сервером, има проблема са разумевањем стандарду-сагласним groupware е-"
+"порукама. Укључите ову опцију да би се groupware позивнице слале на начин "
+"који Exchange сигурно разуме."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Именовање прилога компатибилно са Outlook-ом"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Аутоматско слање позивница"
@@ -2964,23 +2930,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Позивнице се нормално шаљу као прилози у порукама. Овај прекидач поставља "
-"да се уместо тога позивнице шаљу у тексту поруке, што је неопходно за слање "
-"позивница за и примање одговора од Microsoft-овог Outlook-а."
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Позивнице се нормално шаљу као прилози у порукама. Овај прекидач "
+"поставља да се уместо тога позивнице шаљу у тексту поруке, што је неопходно "
+"за слање позивница за и примање одговора од Microsoft-овог Outlook-а."
 "<br>Али, када урадите ово, више нећете добијати описни текст који поштански "
 "програми могу да читају. Људима који имају е-поштанске програме који не "
-"разумеју позивнице резултујуће поруке изгледаће врло чудно."
-"<br>Људи који имају е-поштанске програме који разумеју позивнице и даље ће моћи "
-"да раде са овим.</qt>"
+"разумеју позивнице резултујуће поруке изгледаће врло чудно.<br>Људи који "
+"имају е-поштанске програме који разумеју позивнице и даље ће моћи да раде са "
+"овим.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3085,29 +3051,27 @@ msgstr "Прослеђена"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Овде можете додавати, уређивати и брисати посебне шаблоне за поруке, које "
-"користите при састављању одговора или прослеђивању поруке. Посебан шаблон "
-"правите бирајући га у контекстном или главном менију. Такође можете повезати "
-"шаблон са комбинацијом тастера, како бисте убрзали позивање.</p>"
-"<p>Шаблони порука подржавају наредбе за смену тако што их једноставно укуцате "
-"или изаберете их из менија <i>Уметни наредбу</i>.</p>"
-"<p>Постоје четири врсте посебних шаблона: за поруке типа <i>Одговор</i>, <i>"
-"Одговор свима</i>, <i>Прослеђена</i>, и <i>Универзална</i>"
-", које можете користити за све врсте радњи. Не можете задати комбинацију "
-"тастера за универзалне шаблоне.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Овде можете додавати, уређивати и брисати посебне шаблоне за поруке, "
+"које користите при састављању одговора или прослеђивању поруке. Посебан "
+"шаблон правите бирајући га у контекстном или главном менију. Такође можете "
+"повезати шаблон са комбинацијом тастера, како бисте убрзали позивање.</"
+"p><p>Шаблони порука подржавају наредбе за смену тако што их једноставно "
+"укуцате или изаберете их из менија <i>Уметни наредбу</i>.</p><p>Постоје "
+"четири врсте посебних шаблона: за поруке типа <i>Одговор</i>, <i>Одговор "
+"свима</i>, <i>Прослеђена</i>, и <i>Универзална</i>, које можете користити за "
+"све врсте радњи. Не можете задати комбинацију тастера за универзалне шаблоне."
+"</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3124,15 +3088,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3150,8 +3114,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Изабрана пречица се већ користи за други посебан шаблон, желите ли ипак да је "
-"доделите овом?"
+"Изабрана пречица се већ користи за други посебан шаблон, желите ли ипак да "
+"је доделите овом?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3180,8 +3144,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"Нема прималаца у вашој листи. Прво изаберите неколико прималаца, па покушајте "
-"поново."
+"Нема прималаца у вашој листи. Прво изаберите неколико прималаца, па "
+"покушајте поново."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3206,8 +3170,8 @@ msgstr "Уреди помоћу:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "KMail не може да открије када се изабрани уређивач затвори. Да би се избегао "
 "губитак података, уређивање прилога се обуставља."
@@ -3312,8 +3276,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Не могу да избацим старе поруке из фасцикле %1: одредишни директоријум %2 није "
-"пронађен"
+"Не могу да избацим старе поруке из фасцикле %1: одредишни директоријум %2 "
+"није пронађен"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3464,6 +3428,11 @@ msgstr "Изаберите филтере"
 msgid "Filters"
 msgstr "Филтери"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Одабери сав текст"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3493,8 +3462,8 @@ msgstr "&Бележи филтерске активности"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Овде можете укључити и искључити бележење филтерских активности. Наравно, "
 "дневнички подаци се сакупљају и приказују само када је бележење укључено. "
@@ -3513,15 +3482,16 @@ msgstr "Бележи &евалуацију филтерских правила"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Можете контролисати упис у дневник информација о евалуацији филтерских правила "
-"примењених филтера. Ако је ова опција укључена, имаћете детаљано бележење за "
-"свако појединачно филтерско правило. У супротном, биће бележен само резултат "
-"евалуације свих правила једног филтера."
+"Можете контролисати упис у дневник информација о евалуацији филтерских "
+"правила примењених филтера. Ако је ова опција укључена, имаћете детаљано "
+"бележење за свако појединачно филтерско правило. У супротном, биће бележен "
+"само резултат евалуације свих правила једног филтера."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3541,15 +3511,15 @@ msgstr "неограничено"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Сакупљање дневничких података користи меморију за привремено складиштење "
-"података. Овде можете ограничити максималну количину меморије која се користи: "
-"ако величина сакупљених података премаши ово ограничење, онда ће најстари "
-"подаци бити одбацивани све док ограничење више не буде премашено. "
+"података. Овде можете ограничити максималну количину меморије која се "
+"користи: ако величина сакупљених података премаши ово ограничење, онда ће "
+"најстари подаци бити одбацивани све док ограничење више не буде премашено. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3559,7 +3529,7 @@ msgstr ""
 "Нисам могао да запишем фајл %1:\n"
 "Детаљни опис грешке је „%2“."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Грешка KMail-а"
@@ -3600,13 +3570,13 @@ msgstr "&Кориснички идентификатор:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Кориснички идентификатор је пријавно име корисника на IMAP серверу. То може "
-"бити једноставно корисничко име или пуна е-поштанска адреса корисника; пријавно "
-"име за ваш сопствени налог на серверу рећиће вам које је."
+"бити једноставно корисничко име или пуна е-поштанска адреса корисника; "
+"пријавно име за ваш сопствени налог на серверу рећиће вам које је."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3657,8 +3627,8 @@ msgstr "Немате дозволе за читање/упис у вашу фа�
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Информације још увек нису добављење са сервера, употребите „Провери пошту“."
 
@@ -3670,8 +3640,7 @@ msgstr "Грешка: IMAP налог није дефинисан за ову ф
 msgid "Connecting to server %1, please wait..."
 msgstr "Повезујем се са сервером %1, сачекајте..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Грешка приликом повезивања на сервер %1"
@@ -3699,8 +3668,8 @@ msgstr "Додај дозволе"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Желите ли заиста да уклоните сопствене дозволе за ову фасциклу? После тога "
 "нећете више моћи да јој приступите."
@@ -3734,7 +3703,7 @@ msgstr "Искоришћеност:"
 msgid "Select Folder"
 msgstr "Изаберите фасциклу"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Локалне фасцикле"
@@ -3758,9 +3727,9 @@ msgstr "Изаберите пречицу за фасциклу"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Да бисте изабрали тастер или комбинацију тастера којом се бира текућа "
 "фасцикла, кликните на дугме испод а затим притисните тастер или тастере које "
@@ -3784,14 +3753,23 @@ msgstr "Отк&ажи"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Фасцикла коју сте избрисали је била придружена налогу <b>%1</b> "
-"који је у њу испоручивао пошту. Фасцикла у коју налог испоручује пошту сада је "
+"<qt>Фасцикла коју сте избрисали је била придружена налогу <b>%1</b> који је "
+"у њу испоручивао пошту. Фасцикла у коју налог испоручује пошту сада је "
 "ресетована на главну фасциклу „пристигле“.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Укупно: %2<br>Непрочитано: %3<br>Величина: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Квота: %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Непознат"
@@ -3913,69 +3891,17 @@ msgstr "Статус спама:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>п"
-"<br>о"
-"<br>р"
-"<br>у"
-"<br>к"
-"<br>а</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>п<br>о<br>р<br>у<br>к<br>а</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>Н "
-"<br>и"
-"<br>ј"
-"<br>е"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>п"
-"<br>о"
-"<br>р"
-"<br>у"
-"<br>к"
-"<br>а</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>Н <br>и<br>ј<br>е<br> <br>H<br>T<br>M<br>L<br> "
+"<br>п<br>о<br>р<br>у<br>к<br>а</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3987,19 +3913,14 @@ msgstr "&Ваше име:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Ваше име</h3>"
-"<p>Ово поље би требало да садржи ваше име, онако како желите да се појављује у "
-"заглављу поруке која је послата.</p>"
-"<p>Ако ово поље оставите празно, неће се појављивати ваше право име, већ само "
-"е-адреса.</p></qt>"
+"<qt><h3>Ваше име</h3><p>Ово поље би требало да садржи ваше име, онако како "
+"желите да се појављује у заглављу поруке која је послата.</p><p>Ако ово поље "
+"оставите празно, неће се појављивати ваше право име, већ само е-адреса.</p></"
+"qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4007,17 +3928,13 @@ msgstr "Ор&ганизација:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Организација</h3>"
-"<p>Ово поље би требало да садржи име ваше организације, ако желите да оно буде "
-"приказано у заглављу послате поруке.</p>"
-"<p>Безбедно је (и уобичајено) да ово оставите непопуњено.</p></qt>"
+"<qt><h3>Организација</h3><p>Ово поље би требало да садржи име ваше "
+"организације, ако желите да оно буде приказано у заглављу послате поруке.</"
+"p><p>Безбедно је (и уобичајено) да ово оставите непопуњено.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4026,20 +3943,15 @@ msgstr "&Е-адреса:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Е-адреса</h3>"
-"<p>Ово поље би требало да садржи вашу пуну е-адресу.</p>"
-"<p>Ако ово оставите празно, или погрешно попуните, људи ће имати проблема да "
-"вам одговоре.</p></qt>"
+"<qt><h3>Е-адреса</h3><p>Ово поље би требало да садржи вашу пуну е-адресу.</"
+"p><p>Ако ово оставите празно, или погрешно попуните, људи ће имати проблема "
+"да вам одговоре.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4048,21 +3960,12 @@ msgstr "&Е-адреса:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4082,24 +3985,21 @@ msgstr "Ваш OpenPGP кључ за потписе"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Одаберите OpenPGP кључ који би требало користити за дигитално потписивање ваших "
-"порука."
+"Одаберите OpenPGP кључ који би требало користити за дигитално потписивање "
+"ваших порука."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP кључ који одаберете овде ће бити коришћен за потписивање порука. "
-"Такође можете користити и GnuPG кључеве.</p> "
-"<p>Можете оставити ово поље непопуњено, али онда KMail неће моћи да дигитално "
-"потписује ваше поруке користећи OpenPGP. Ово неће утицати на уобичајене "
-"поштанске функције.</p> "
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>OpenPGP кључ који одаберете овде ће бити коришћен за потписивање "
+"порука. Такође можете користити и GnuPG кључеве.</p> <p>Можете оставити ово "
+"поље непопуњено, али онда KMail неће моћи да дигитално потписује ваше поруке "
+"користећи OpenPGP. Ово неће утицати на уобичајене поштанске функције.</p> "
 "<p>О кључевима можете сазнати више на <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
@@ -4112,31 +4012,27 @@ msgstr "Ваш OpenPGP кључ за шифровање"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Одаберите OpenPGP кључ који би требало користити за ваше поруке када се шифрују "
-"вама самима и за могућност „Приложи мој јавни кључ“ у састављачу."
+"Одаберите OpenPGP кључ који би требало користити за ваше поруке када се "
+"шифрују вама самима и за могућност „Приложи мој јавни кључ“ у састављачу."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP кључ који одаберете овде ће бити коришћен за шифровање порука вама "
-"самима и за могућност „Приложи мој јавни кључ“ у састављачу. Такође можете "
-"користити и GnuPG кључеве.</p> "
-"<p>Можете оставити ово поље непопуњено, али онда KMail неће моћи да шифрује "
-"копије одлазећих порука вама самима користећи OpenPGP. Ово неће утицати на "
-"уобичајене поштанске функције.</p> "
-"<p>О кључевима можете сазнати више на <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>OpenPGP кључ који одаберете овде ће бити коришћен за шифровање порука "
+"вама самима и за могућност „Приложи мој јавни кључ“ у састављачу. Такође "
+"можете користити и GnuPG кључеве.</p> <p>Можете оставити ово поље "
+"непопуњено, али онда KMail неће моћи да шифрује копије одлазећих порука вама "
+"самима користећи OpenPGP. Ово неће утицати на уобичајене поштанске функције."
+"</p> <p>О кључевима можете сазнати више на <a>http://www.gnupg.org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4151,23 +4047,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Изаберите S/MIME сертификат који би требало користити за дигитално потписивање "
-"ваших порука."
+"Изаберите S/MIME сертификат који би требало користити за дигитално "
+"потписивање ваших порука."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) сертификат који изаберете овде биће коришћен за дигитално "
-"потписивање ваших порука.</p>"
-"<p>Можете оставити ово непопуњено, али KMail неће моћи да дигитално потписује "
-"ваше поруке користећи S/MIME. Ово неће утицати на уобичајене поштанске "
-"функције.</p></qt>"
+"<qt><p>S/MIME (X.509) сертификат који изаберете овде биће коришћен за "
+"дигитално потписивање ваших порука.</p><p>Можете оставити ово непопуњено, "
+"али KMail неће моћи да дигитално потписује ваше поруке користећи S/MIME. Ово "
+"неће утицати на уобичајене поштанске функције.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4179,24 +4072,22 @@ msgstr "Ваш S/MIME сертификат за шифровање"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Изаберите S/MIME сертификат који би требало користити за ваше поруке када се "
 "шифрују вама самима и за могућност „Приложи мој јавни кључ“ у састављачу."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME сертификат који одаберете овде ће бити коришћен за шифровање порука "
-"вама самима и за могућност „Приложи мој јавни кључ“ у састављачу.</p> "
+"<qt><p>S/MIME сертификат који одаберете овде ће бити коришћен за шифровање "
+"порука вама самима и за могућност „Приложи мој јавни кључ“ у састављачу.</p> "
 "<p>Можете оставити ово поље непопуњено, али онда KMail неће моћи да шифрује "
 "копије одлазећих порука вама самима користећи S/MIME. Ово неће утицати на "
 "уобичајене поштанске функције.</p></qt>"
@@ -4219,23 +4110,19 @@ msgstr "Ад&реса за одговоре:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адреса за одговоре</h3>"
-"<p>Ово поставља заглавље <tt>Одговори на:</tt> тако да садржи другачију адресу "
-"од уобичајене <tt>Од:</tt> адресе.</p>"
-"<p>Ово може бити корисно када имате групу људи која ради заједно са сличним "
-"улогама. На пример, можда желите да све поруке које шаљете имају вашу адресу у "
-"пољу <tt>Од:</tt>, а да одговори иду на групну адресу.</p></p>"
-"Ако нисте сигурни, оставите ово поље празно.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адреса за одговоре</h3><p>Ово поставља заглавље <tt>Одговори на:</"
+"tt> тако да садржи другачију адресу од уобичајене <tt>Од:</tt> адресе.</"
+"p><p>Ово може бити корисно када имате групу људи која ради заједно са "
+"сличним улогама. На пример, можда желите да све поруке које шаљете имају "
+"вашу адресу у пољу <tt>Од:</tt>, а да одговори иду на групну адресу.</p></"
+"p>Ако нисте сигурни, оставите ово поље празно.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4243,25 +4130,19 @@ msgstr "BCC а&дресе:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) адресе</h3>"
-"<p>Адресе које унесете овде ће бити придодате одлазећој пошти која се шаље са "
-"овим идентитетом. Ове адресе неће бити видљиве за остале примаоце.</p>"
-"<p>Ово се обично користи за слање копије сваке поруке на неки други ваш "
-"налог.</p> "
-"<p>Да бисте навели више од једне адресе, користите зарезе за раздвајање листе "
-"BCC прималаца.</p>"
-"<p>Ако сте у недоумици онда оставите ово поље празним.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) адресе</h3><p>Адресе које унесете овде ће "
+"бити придодате одлазећој пошти која се шаље са овим идентитетом. Ове адресе "
+"неће бити видљиве за остале примаоце.</p><p>Ово се обично користи за слање "
+"копије сваке поруке на неки други ваш налог.</p> <p>Да бисте навели више од "
+"једне адресе, користите зарезе за раздвајање листе BCC прималаца.</p><p>Ако "
+"сте у недоумици онда оставите ово поље празним.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4299,7 +4180,7 @@ msgstr "&Потпис"
 msgid "&Picture"
 msgstr "&Слика"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Неисправна е-адреса"
 
@@ -4315,15 +4196,15 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Један од подешених OpenPGP кључева за потписивање не садржи ниједан кориснички "
-"ид. са подешеном е-адресом за овај идентитет (%1).\n"
+"Један од подешених OpenPGP кључева за потписивање не садржи ниједан "
+"кориснички ид. са подешеном е-адресом за овај идентитет (%1).\n"
 "Ово може резултовати упозоравајућим порукама на страни примаоца приликом "
 "покушаја овере потписа направљених помоћу оваквих подешавања."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Један од подешених OpenPGP кључева за шифровање не садржи ниједан кориснички "
 "ид. са подешеном е-адресом за овај идентитет (%1)."
@@ -4373,21 +4254,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Посебна фасцикла за недовршене поруке за идентитет „%1“ не постоји (више). Због "
-"тога ће се користити подразумевана фасцикла за недовршене поруке."
+"Посебна фасцикла за недовршене поруке за идентитет „%1“ не постоји (више). "
+"Због тога ће се користити подразумевана фасцикла за недовршене поруке."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Фасцикла посебних шаблона за идентитет „%1“ не постоји (више). Због тога ће се "
-"користити подразумевана фасцикла за шаблоне."
+"Фасцикла посебних шаблона за идентитет „%1“ не постоји (више). Због тога ће "
+"се користити подразумевана фасцикла за шаблоне."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (подразумевани)"
 
@@ -4431,24 +4312,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail је пронашао префиксни унос у подешавањима налога „%1“ који је застарео у "
-"односу на подршку за именске просторе IMAP-а."
+"KMail је пронашао префиксни унос у подешавањима налога „%1“ који је застарео "
+"у односу на подршку за именске просторе IMAP-а."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
-"Подешавања су аутоматски пресељена али би требало да проверите подешавања вашег "
-"налога."
+"Подешавања су аутоматски пресељена али би требало да проверите подешавања "
+"вашег налога."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Није било могуће аутоматски преселити ваша подешавања па проверите подешавања "
-"подешавања вашег налога."
+"Није било могуће аутоматски преселити ваша подешавања па проверите "
+"подешавања подешавања вашег налога."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4463,7 +4344,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Није било могуће послати на сервер поруку датирану %1 из <i>%2</i> са темом %3."
+"Није било могуће послати на сервер поруку датирану %1 из <i>%2</i> са темом "
+"%3."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4484,17 +4366,22 @@ msgstr "Фасцикла је врло близу ограничењу квот�
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Пошто немате дозволу писања у ову фасциклу, питајте њеног власника да ослободи "
-"нешто простора у њој."
+"Пошто немате дозволу писања у ову фасциклу, питајте њеног власника да "
+"ослободи нешто простора у њој."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Грешка: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Веза са сервером %1 је неочекивано затворена или је истекла. Ако је могуће, "
 "биће поново успостављена аутоматски."
@@ -4647,20 +4534,20 @@ msgstr "Архиве листе"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Једном или више подешених OpenPGP кључева за шифровање или S/MIME сертификата "
-"не верује се у потпуности за шифровање."
+"Једном или више подешених OpenPGP кључева за шифровање или S/MIME "
+"сертификата не верује се у потпуности за шифровање."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Једном или више подешених OpenPGP кључева за шифровање или S/MIME сертификата "
-"не верује се у потпуности за шифровање."
+"Једном или више подешених OpenPGP кључева за шифровање или S/MIME "
+"сертификата не верује се у потпуности за шифровање."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4694,262 +4581,212 @@ msgstr "Кључеви за шифровање не у потпуности од
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за потписивање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за потписивање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за потписивање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за шифровање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за шифровање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за шифровање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за потписивање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за потписивање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за потписивање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
+"(серијски број %2)</p><p>истиче за мање од %n дана.</p>\n"
 "<p>Ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
+"(серијски број %2)</p><p>истиче за мање од %n дана.</p>\n"
 "<p>Ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"(серијски број %2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски "
+"број %2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски "
+"број %2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски "
+"број %2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4963,251 +4800,201 @@ msgstr "S/MIME сертификат ускоро истиче"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за потписивање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> "
-"(ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ за шифровање</p><p align=center><b>%1</b> (ид. кључа 0x"
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш OpenPGP кључ</p><p align=center><b>%1</b> (ид. кључа 0x%2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за потписивање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за потписивање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за потписивање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за шифровање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за шифровање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за ваш S/MIME "
+"сертификат за шифровање</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Корени сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Корени сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за потписивање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за потписивање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за потписивање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за ваш S/"
+"MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски број "
+"%2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p>"
-"<p>за S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>\n"
+"<p>Посреднички CA сертификат</p><p align=center><b>%3</b></p><p>за S/MIME "
+"сертификат</p><p align=center><b>%1</b> (серијски број %2)</p><p>истиче за "
+"мање од %n дана.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
+"(серијски број %2)</p><p>истиче за мање од %n дана.</p>\n"
 "<p>Ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
+"(серијски број %2)</p><p>истиче за мање од %n дана.</p>\n"
 "<p>Ваш S/MIME сертификат за потписивање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"(серијски број %2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> "
-"(серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски "
+"број %2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски "
+"број %2)</p><p>истиче за мање од %n дана.</p>\n"
+"<p>Ваш S/MIME сертификат за шифровање</p><p align=center><b>%1</b> (серијски "
+"број %2)</p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>\n"
-"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</p>"
-"<p>истиче за мање од %n дана.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>\n"
+"<p>S/MIME сертификат</p><p align=center><b>%1</b> (серијски број %2)</"
+"p><p>истиче за мање од %n дана.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5219,9 +5006,10 @@ msgstr "S/MIME сертификат ускоро истиче"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5229,8 +5017,8 @@ msgstr ""
 "сертификата није употребљиво за шифровање. Подесите поново кључеве и "
 "сертификате за шифровање за овај идентитет у дијалогу за подешавање "
 "идентитета.\n"
-"Ако изаберете да наставите, и кључеви касније буду потребни, бићете упитани да "
-"наведете кључеве које треба користити."
+"Ако изаберете да наставите, и кључеви касније буду потребни, бићете упитани "
+"да наведете кључеве које треба користити."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5246,10 +5034,10 @@ msgid ""
 msgstr ""
 "Један или више ваших подешених OpenPGP кључева за потписивање или S/MIME "
 "сертификата за потписивање није употребљиво за потписивање. Подесите поново "
-"кључеве и сертификате за шифровање за овај идентитет у дијалогу за подешавање "
-"идентитета.\n"
-"Ако изаберете да наставите, и кључеви касније буду потребни, бићете упитани да "
-"наведете кључеве које треба користити."
+"кључеве и сертификате за шифровање за овај идентитет у дијалогу за "
+"подешавање идентитета.\n"
+"Ако изаберете да наставите, и кључеви касније буду потребни, бићете упитани "
+"да наведете кључеве које треба користити."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5259,43 +5047,43 @@ msgstr "Неупотребљиви кључеви за потписивање"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Испитивање личних подешавања прималаца за шировање испоставило је да поруке "
 "треба шифровати користећи OpenPGP, бар за неке примаоце.\n"
-"Међутим, нисте подесили важеће OpenPGP кључеве од поверења за шифровање за овај "
-"идентитет.\n"
-"Можете наставити без шифровања себи, али пазите, јер тада нећете моћи да читате "
-"сопствене поруке које сте послали."
+"Међутим, нисте подесили важеће OpenPGP кључеве од поверења за шифровање за "
+"овај идентитет.\n"
+"Можете наставити без шифровања себи, али пазите, јер тада нећете моћи да "
+"читате сопствене поруке које сте послали."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Испитивање личних подешавања прималаца за шировање испоставило је да поруке "
 "треба шифровати користећи S/MIME, бар за неке примаоце.\n"
 "Међутим, нисте подесили важеће S/MIME сертификате за шифровање за овај "
 "идентитет.\n"
-"Можете наставити без шифровања себи, али пазите, јер тада нећете моћи да читате "
-"сопствене поруке које сте послали."
+"Можете наставити без шифровања себи, али пазите, јер тада нећете моћи да "
+"читате сопствене поруке које сте послали."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"Испитивање личних подешавања прималаца за потписивање испоставило је да поруке "
-"треба потписивати користећи OpenPGP, бар за неке примаоце.\n"
+"Испитивање личних подешавања прималаца за потписивање испоставило је да "
+"поруке треба потписивати користећи OpenPGP, бар за неке примаоце.\n"
 "Међутим, нисте подесили важеће OpenPGP кључеве за потписивање за овај "
 "идентитет."
 
@@ -5305,13 +5093,13 @@ msgstr "Не потписуј OpenPGP-ом"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"Испитивање личних подешавања прималаца за потписивање испоставило је да поруке "
-"треба потписивати користећи S/MIME, бар за неке примаоце.\n"
+"Испитивање личних подешавања прималаца за потписивање испоставило је да "
+"поруке треба потписивати користећи S/MIME, бар за неке примаоце.\n"
 "Међутим, нисте подесили важеће S/MIME сертификате за потписивање за овај "
 "идентитет."
 
@@ -5335,8 +5123,8 @@ msgstr "Није могуће потписивање"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Нисте изабрали сопствени кључ за шифровање. Нећете моћи да дешифрујете "
 "сопствене поруке које сте шифровали и послали."
@@ -5355,16 +5143,16 @@ msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Нисте изабрали кључ за шифровање за примаоца ове поруке; зато, порука неће бити "
-"шифрована."
+"Нисте изабрали кључ за шифровање за примаоца ове поруке; зато, порука неће "
+"бити шифрована."
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Нисте изабрали кључ за шифровање ни за једног примаоца ове поруке; зато, порука "
-"неће бити шифрована."
+"Нисте изабрали кључ за шифровање ни за једног примаоца ове поруке; зато, "
+"порука неће бити шифрована."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5375,8 +5163,8 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Нисте изабрали кључ за шифровање за једног од прималаца; та особа неће моћи да "
-"дешифрује поруку ако је шифрујете."
+"Нисте изабрали кључ за шифровање за једног од прималаца; та особа неће моћи "
+"да дешифрује поруку ако је шифрујете."
 
 #: keyresolver.cpp:1527
 msgid ""
@@ -5408,11 +5196,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Није пронађен ниједан важећи и од поверења кључ за „%1“.\n"
 "\n"
@@ -5461,10 +5249,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Критична грешка: Не могу да скупим пошту: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Нисам успео да додам поруку:\n"
+msgid "Failed to add message:\n"
+msgstr "Нисам успео да додам поруку:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5556,6 +5342,50 @@ msgstr "&Неповезани IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir сандуче"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Постави тему поруке"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Пошаљи CC: на „адресу“"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Пошаљи BCC: на „адресу“"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Додај „заглавље“ поруци"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Читај тело поруке из „фајла“"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Постави тело поруке"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Додај прилог поруци. Ово се може понављати"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Само провери да ли има нове поште"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Само отвори прозор састављача"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Прикажи дати фајл поруке"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Пошаљи поруку на „адресу“ и приложи фајл на који „URL“ указује."
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Пошта"
@@ -5598,8 +5428,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail ће сада направити потребне groupware фасцикле као подфасцикле од %1. Ако "
-"не желите ово, откажите и IMAP ресурс ће бити искључен"
+"KMail ће сада направити потребне groupware фасцикле као подфасцикле од %1. "
+"Ако не желите ово, откажите и IMAP ресурс ће бити искључен"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5611,13 +5441,13 @@ msgstr "%1: нађена фасцикла %2. Биће постављена ка
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail је пронашао следеће groupware фасцикле у %1 и треба да уради следеће "
-"операције: %2"
-"<br>Ако не желите ово да радите, откажите и IMAP ресурс ће бити искључен"
+"<qt>KMail је пронашао следеће groupware фасцикле у %1 и треба да уради "
+"следеће операције: %2<br>Ако не желите ово да радите, откажите и IMAP ресурс "
+"ће бити искључен"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5666,11 +5496,11 @@ msgstr "URL је копиран у клипборд."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Фајл <b>%1</b> постоји.<br>Желите ли да га замените?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Сними у фајл"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Замени"
 
@@ -5688,7 +5518,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Порука је уклоњена у току снимања, стога није снимљена."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5708,11 +5538,11 @@ msgstr "Фајл не садржи поруку."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Фајл садржи више порука, приказана је само прва."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5721,114 +5551,114 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Филтрирам поруке"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Филтрирам поруку %1 од %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Нема довољно слободног простора на диску?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Премести у ову фасциклу"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Копирај у ову фасциклу"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Оштећени IMAP кеш је пронађен у фасцикли %1. Копирање порука је прекинуто."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Премештам поруке"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Бришем поруке"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Отварам URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Да ли заиста желите да извршите <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Изврши"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Нема прилога за снимање."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Сними прилоге у"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "prilog.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "prilog.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Фајл са именом %1 већ постоји. Желите ли да га пребришете?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Фајл већ постоји"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Пре&бриши"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Део %1 поруке је шифрован. Желите ли да га задржите таквим приликом снимања?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-ово питање"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Очувај шифровање"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Не чувај"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Део %1 поруке је потписан. Желите ли да задржите потпис приликом снимања?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Задржи потпис"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5837,21 +5667,21 @@ msgstr ""
 "Нисам могао да запишем фајл %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Нисам могао да запишем фајл %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Нема уноса у адресару за ову е-поштанску адресу. Додајте их у адресар, а затим "
-"додајте брзогласничке адресе користећи свој омиљени гласнички клијент."
+"Нема уноса у адресару за ову е-поштанску адресу. Додајте их у адресар, а "
+"затим додајте брзогласничке адресе користећи свој омиљени гласнички клијент."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5861,70 +5691,70 @@ msgstr ""
 " %1\n"
 " није могуће утврдити са ким треба ћаскати."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Chiasmus-ов позадински програм не нуди функцију „x-obtain-keys“. Пријавите ову "
-"грешку."
+"Chiasmus-ов позадински програм не нуди функцију „x-obtain-keys“. Пријавите "
+"ову грешку."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Грешка позадинског програма Chiasmus-а"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Позадински програм Chiasmus-а је вратио неочекивану вредност: Функција "
-"„x-obtain-keys“ није вратила листу знаковног низа. Пријавите ову грешку."
+"Позадински програм Chiasmus-а је вратио неочекивану вредност: Функција „x-"
+"obtain-keys“ није вратила листу знаковног низа. Пријавите ову грешку."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Нису пронађени никакви кључеви. Проверите да ли је постављена исправна путања "
-"кључа у подешавањима Chiasmus-а."
+"Нису пронађени никакви кључеви. Проверите да ли је постављена исправна "
+"путања кључа у подешавањима Chiasmus-а."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Избор Chiasmus-овог кључа за дешифровање"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Позадински програм Chiasmus-а не нуди „x-decrypt“ функцију. Пријавите ову "
 "грешку."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 "Функција „x-decrypt“ не прихвата очекиване параметре. Пријавите ову грешку."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus-ова грешка дешифровања"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Позадински програм Chiasmus-а је вратио неочекивану вредност: Функција "
-"„x-decrypt“ није вратила бајтни низ. Пријавите ову грешку."
+"Позадински програм Chiasmus-а је вратио неочекивану вредност: Функција „x-"
+"decrypt“ није вратила бајтни низ. Пријавите ову грешку."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5934,7 +5764,7 @@ msgstr ""
 "За: %2\n"
 "Тема: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Пошта: %1"
@@ -6033,7 +5863,7 @@ msgstr "Величина"
 msgid "Encoding"
 msgstr "Кодирање"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Компресуј"
 
@@ -6045,7 +5875,7 @@ msgstr "Шифруј"
 msgid "Sign"
 msgstr "Потпиши"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Име прилога:"
 
@@ -6067,7 +5897,8 @@ msgstr "Примарни примаоци"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>Е-адресе које ставите у ово поље примају копију поруке.</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -6077,13 +5908,14 @@ msgstr "Додатни примаоци"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>Е-адресе које ставите у ово поље примају копију поруке. Технички то је исто "
-"као када ставите све адресе у поље <b>За:</b>, али се разликује по томе што "
-"обично имплицира да је прималац копије само „слушач“, а не главни прималац.</qt>"
+"<qt>Е-адресе које ставите у ово поље примају копију поруке. Технички то је "
+"исто као када ставите све адресе у поље <b>За:</b>, али се разликује по томе "
+"што обично имплицира да је прималац копије само „слушач“, а не главни "
+"прималац.</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -6091,12 +5923,11 @@ msgstr "Скривени примаоци"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>У суштини исто као поље <b>Копирај за:</b> али се разликује по томе што сви "
-"други примаоци не виде ко прима слепу копију.</qt>"
+"<qt>У суштини исто као поље <b>Копирај за:</b> али се разликује по томе што "
+"сви други примаоци не виде ко прима слепу копију.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6106,7 +5937,7 @@ msgstr "&Пошаљи пошту"
 msgid "&Send Mail Via"
 msgstr "Пошаљи пошту п&реко"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Пошаљи &касније"
@@ -6171,8 +6002,7 @@ msgstr "Уклони знакове за цити&рање"
 msgid "Cl&ean Spaces"
 msgstr "Очисти пра&знине"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Користи фонт фиксне ширине"
@@ -6313,31 +6143,31 @@ msgstr "&Криптографски формат порука"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандардни"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Листа по ставкама (диск)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Листа по ставкама (круг)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Листа по ставкама (квадрат)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Уређена листа (декадно)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Уређена листа (мала слова)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Уређена листа (велика слова)"
 
@@ -6421,7 +6251,8 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Поново сними ову поруку у фасцикли за шаблоне. Тада се може употребити касније."
+"Поново сними ову поруку у фасцикли за шаблоне. Тада се може употребити "
+"касније."
 
 #: kmcomposewin.cpp:2257
 msgid ""
@@ -6441,64 +6272,62 @@ msgstr "Затвори састављач"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Чини се да порука коју сте саставили указује на приложени фајл, али ништа нисте "
-"приложили.\n"
+"Чини се да порука коју сте саставили указује на приложени фајл, али ништа "
+"нисте приложили.\n"
 "Желите ли да приложите фајл уз вашу поруку?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Подсетник за прилагање фајла"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Пош&аљи тако како јесте"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail не може да препозна локацију прилога (%1).</p>"
-"<p>Морате назначити пуну путању ако желите да приложите фајл.</p></qt>"
+"<qt><p>KMail не може да препозна локацију прилога (%1).</p><p>Морате "
+"назначити пуну путању ако желите да приложите фајл.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Ваш администратор није дозволио прилагање фајлова већих од %1 MB.</p>"
+"<qt><p>Ваш администратор није дозволио прилагање фајлова већих од %1 MB.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Приложи фајл"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Приложи"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Уметни фајл"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Уметни фајл"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Дошло је до грешке приликом покушаја извожења кључа из позадинског "
-"система:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Дошло је до грешке приликом покушаја извожења кључа из позадинског "
+"система:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6537,97 +6366,107 @@ msgid ""
 "View"
 msgstr "Прикажи"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Уреди..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Уреди помоћу..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Сними к&ао..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Својства"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Додај прилог..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail не може да компресује фајл."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Компресовани фајл већи је од оригиналног. Желите ли да задржите оригинални?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Задржи"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail не може да декомпресује фајл."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Сними прилог као"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Додај као текст"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Додај као прилог"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Изаберите желите ли да уметнете садржај текста у уређивач, или додате фајл у "
 "питању као прилог."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Пренети као текст или прилог?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "без имена"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Захтевали сте да се поруке шифрују вама самима, али тренутно изабрани "
-"идентитет не дефинише кључ за шифровање (OpenPGP или S/MIME) за ову сврху.</p>"
-"<p>Изаберите кључеве за ово у подешавању идентитета.</p></qt>"
+"<qt><p>Захтевали сте да се поруке шифрују вама самима, али тренутно изабрани "
+"идентитет не дефинише кључ за шифровање (OpenPGP или S/MIME) за ову сврху.</"
+"p><p>Изаберите кључеве за ово у подешавању идентитета.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Недефинисан кључ за шифровање"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Да бисте били у могућности да потпишете ову поруку, прво морате да "
+"<qt><p>Да бисте били у могућности да потпишете ову поруку, прво морате да "
 "дефинишете кључ (OpenPGP или S/MIME) који би требало да се користи за ову "
-"сврху.</p>"
-"<p>Изаберите кључ за ово у подешавању идентитета.</p></qt>"
+"сврху.</p><p>Изаберите кључ за ово у подешавању идентитета.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Недефинисан кључ за потписивање"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6635,163 +6474,161 @@ msgstr ""
 "KMail је тренутно ван везе, ваше поруке ће бити чуване у одлазнима док се не "
 "повежете."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "На вези/ван везе"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Морате унети своју е-адресу у пољу Од:. Такође би требало да поставите своју "
 "е-адресу за све идентитете, тако да не морате да је уносите за сваку поруку."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Морате назначити бар једног примаоца, или у пољу За: или као CC или BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Поље За: недостаје. Да ипак пошаљем поруку?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "За: није наведено"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Нисте назначили тему. Да ипак пошаљем поруку?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Није назначена тема"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Пошаљи тако како јесте"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Назначи тему"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Задржи обележавање, не потписуј/шифруј"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Задржи обележавање, не шифруј"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Задржи обележавање, не потписуј"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Потпиши/шифруј (обриши обележавање)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Шифруј (обриши обележавање)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Потпиши (обриши обележавање)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Потписивање/шифровање у линији HTML порука није могуће.</p>"
-"<p>Желите ли да избришете своје обележавање?</p></qt>"
+"<qt><p>Потписивање/шифровање у линији HTML порука није могуће.</p><p>Желите "
+"ли да избришете своје обележавање?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Да потпишем/шифрујем поруку?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Фасцикла посебних шаблона за идентитет „%1“ не постоји (више). Због тога ће се "
-"користити подразумевана фасцикла за шаблоне."
+"Фасцикла посебних шаблона за идентитет „%1“ не постоји (више). Због тога ће "
+"се користити подразумевана фасцикла за шаблоне."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Направите налог за слање па покушајте поново."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Управо спремам слање поште..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Пошаљи потврду"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Пошаљи &одмах"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Нема прималаца"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Додатни примаоци"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Провера правописа: укључена"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Провера правописа: искључена"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Провера правописа је отказана."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Провера правописа је заустављена."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Провера правописа је завршена."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Проверавач правописа"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Прво подесите позадинске шифранте који се користе за Chiasmus шифровања.\n"
 "Ово можете урадити у језичку Позадински шифранти, на страни Безбедност, "
 "дијалога подешавања."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6799,31 +6636,31 @@ msgstr ""
 "Изгледа да је libkleopatra компајлирана без подршке за Chiasmus. Можда бисте "
 "желели да прекомпајлирате libkleopatra са опсијом --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Није подешен позадински програм Chiasmus-а"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Нису пронађени кључеви Chiasmus-а"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Избор Chiasmus кључа за шифровање"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Порука ће бити потписана"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Порука неће бити потписана"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Порука ће бити шифрована"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Порука неће бити шифрована"
 
@@ -6872,8 +6709,8 @@ msgstr "Провера правописа — KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell није могао бити покренут. Проверите да ли је ISpell или Aspell "
 "исправно подешен и да ли се налази у вашој путањи."
@@ -6910,12 +6747,10 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Непозната филтерска акција <b>%1</b>"
-"<br>у филтерском правилу <b>%2</b>."
+"<qt>Непозната филтерска акција <b>%1</b><br>у филтерском правилу <b>%2</b>."
 "<br>Игноришем је.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7136,161 +6971,129 @@ msgstr "Пусти звук"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ово је листа дефинисаних филтера. Они се користе одозго на доле.</p>"
-"<p>Кликните на неки од филтера како бисте га уредили користећи десну половину "
-"дијалога.</p></qt>"
+"<qt><p>Ово је листа дефинисаних филтера. Они се користе одозго на доле.</"
+"p><p>Кликните на неки од филтера како бисте га уредили користећи десну "
+"половину дијалога.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликните на ово дугме да бисте направили нови филтер.</p>"
-"<p>Филтер ће бити уметнут испред тренутно означеног, али ово увек можете "
-"касније променити.</p>"
-"<p>Ако сте случајно кликнули на ово дугме, ову акцију можете опозвати кликом на "
-"дугме <em>Обриши</em>.</p></qt>"
+"<qt><p>Кликните на ово дугме да бисте направили нови филтер.</p><p>Филтер ће "
+"бити уметнут испред тренутно означеног, али ово увек можете касније "
+"променити.</p><p>Ако сте случајно кликнули на ово дугме, ову акцију можете "
+"опозвати кликом на дугме <em>Обриши</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликните на ово дугме да бисте копирали филтер.</p>"
-"<p>Ако сте случајно кликнули на ово дугме, ову акцију можете опозвати кликом на "
-"дугме <em>Обриши</em>.</p></qt>"
+"<qt><p>Кликните на ово дугме да бисте копирали филтер.</p><p>Ако сте "
+"случајно кликнули на ово дугме, ову акцију можете опозвати кликом на дугме "
+"<em>Обриши</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Притисните ово дугме да <em>обришете</em> тренутно изабрани филтер из "
-"листе.</p>"
-"<p>Када се филтер обрише нема начина да се поврати, али увек можете напустити "
-"дијалог кликом на дугме <em>Откажи</em> да бисте одбацили измене које сте "
-"направили.</p></qt>"
+"<qt><p>Притисните ово дугме да <em>обришете</em> тренутно изабрани филтер из "
+"листе.</p><p>Када се филтер обрише нема начина да се поврати, али увек "
+"можете напустити дијалог кликом на дугме <em>Откажи</em> да бисте одбацили "
+"измене које сте направили.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Клик на ово дугме ће померити тренутно одабрани филтер на <em>врх</em> "
-"листе.</p>"
-"<p>Ово је корисно пошто редослед филтера одређује којим ће се редом они "
-"примењивати на поруке. Највиши филтер се примењује први.</p></qt>"
+"<qt><p>Клик на ово дугме ће померити тренутно одабрани филтер на <em>врх</"
+"em> листе.</p><p>Ово је корисно пошто редослед филтера одређује којим ће се "
+"редом они примењивати на поруке. Највиши филтер се примењује први.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Клик на ово дугме ће померити тренутно одабрани филтер једно место <em>"
-"горе</em> у листи.</p>"
-"<p>Ово је корисно пошто редослед филтера одређује којим ће се редом они "
-"примењивати на поруке. Највиши филтер се примењује први.</p>"
-"<p>Ако сте грешком кликнули на ово дугме, можете опозвати ову акцију кликом на "
-"дугме <em>Доле</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Клик на ово дугме ће померити тренутно одабрани филтер једно место "
+"<em>горе</em> у листи.</p><p>Ово је корисно пошто редослед филтера одређује "
+"којим ће се редом они примењивати на поруке. Највиши филтер се примењује "
+"први.</p><p>Ако сте грешком кликнули на ово дугме, можете опозвати ову "
+"акцију кликом на дугме <em>Доле</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Клик на ово дугме ће померити тренутно одабрани филтер једно место <em>"
-"доле</em> у листи.</p>"
-"<p>Ово је корисно пошто редослед филтера одређује којим ће се редом они "
-"примењивати на поруке. Највиши филтер се примењује први.</p>"
-"<p>Ако сте грешком кликнули на ово дугме, можете опозвати ову акцију притиском "
-"на дугме <em>Горе</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Клик на ово дугме ће померити тренутно одабрани филтер једно место "
+"<em>доле</em> у листи.</p><p>Ово је корисно пошто редослед филтера одређује "
+"којим ће се редом они примењивати на поруке. Највиши филтер се примењује "
+"први.</p><p>Ако сте грешком кликнули на ово дугме, можете опозвати ову "
+"акцију притиском на дугме <em>Горе</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Клик на ово дугме ће померити тренутно одабрани филтер на <em>дно</em> "
-"листе.</p>"
-"<p>Ово је корисно пошто редослед филтера одређује којим ће се редом они "
-"примењивати на поруке. Највиши филтер се примењује први.</p></qt>"
+"<qt><p>Клик на ово дугме ће померити тренутно одабрани филтер на <em>дно</"
+"em> листе.</p><p>Ово је корисно пошто редослед филтера одређује којим ће се "
+"редом они примењивати на поруке. Највиши филтер се примењује први.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кликните на ово дугме да промените име тренутно одабраном филтеру.</p>"
-"<p>Све док почињу са „&lt;“, филтери аутоматски добијају имена.</p>"
-"<p>Ако сте грешком променили име филтеру и желите  да вратите аутоматско "
-"именовање, кликните на ово дугме и одаберите <em>Очисти</em>, па затим <em>"
-"У реду</em> у приказаном дијалогу.</p></qt>"
+"<qt><p>Кликните на ово дугме да промените име тренутно одабраном филтеру.</"
+"p><p>Све док почињу са „&lt;“, филтери аутоматски добијају имена.</p><p>Ако "
+"сте грешком променили име филтеру и желите  да вратите аутоматско именовање, "
+"кликните на ово дугме и одаберите <em>Очисти</em>, па затим <em>У реду</em> "
+"у приказаном дијалогу.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Притисните ово дугме да бисте форсирали појављивање дијалога за потврду.</p>"
-"<p>Ово је корисно ако сте дефинисали скуп правила који означава поруке за "
-"касније преузимање. Без могућности да форсирате појаву дијалога, ове поруке "
-"можда никада не би биле преузете ако нема других великих порука које чекају на "
-"серверу, или ако сте желели да промените скуп правила да другачије означава "
-"поруке.</p></qt>"
+"<qt><p>Притисните ово дугме да бисте форсирали појављивање дијалога за "
+"потврду.</p><p>Ово је корисно ако сте дефинисали скуп правила који означава "
+"поруке за касније преузимање. Без могућности да форсирате појаву дијалога, "
+"ове поруке можда никада не би биле преузете ако нема других великих порука "
+"које чекају на серверу, или ако сте желели да промените скуп правила да "
+"другачије означава поруке.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7300,6 +7103,16 @@ msgstr "Правила POP3 филтера"
 msgid "Filter Rules"
 msgstr "Правила филтера"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "Увез&и"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "Увез&и"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Доступни филтери"
@@ -7381,6 +7194,11 @@ msgstr "Такође додај овај филтер у траку са ала�
 msgid "Icon for this filter:"
 msgstr "Икона за овај филтер:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "За"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Горе"
@@ -7389,16 +7207,29 @@ msgstr "Горе"
 msgid "Down"
 msgstr "Доле"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Преименуј..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Нови"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Копирај у"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "обрисана"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7407,20 +7238,20 @@ msgstr "Изаберите пречицу за фасциклу"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Најмање један филтер указује на фасциклу на IMAP налогу на вези. Такви филтери "
-"ће бити примењени само при ручном филтрирању и када се филтрира долазећа IMAP "
-"пошта на вези."
+"Најмање један филтер указује на фасциклу на IMAP налогу на вези. Такви "
+"филтери ће бити примењени само при ручном филтрирању и када се филтрира "
+"долазећа IMAP пошта на вези."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Следећи филтери нису снимљени зато што су неисправни (нпр. не садрже ни једну "
-"акцију или правила за претрагу)."
+"Следећи филтери нису снимљени зато што су неисправни (нпр. не садрже ни "
+"једну акцију или правила за претрагу)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7487,36 +7318,31 @@ msgstr "Отклањање проблема у IMAP кешу"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Отклањање проблема у IMAP кешу</b></p>"
-"<p>Ако имате проблема са синхронизацијом IMAP фасцикле, прво би требало да "
-"поново изградите индексни фајл. Требаће неко време да се поново изгради, али "
-"неће изазвати никакве проблеме.</p>"
-"<p>Ако то не буде довољно, можете покушати да освежите IMAP кеш. Ако урадите "
-"то, изгубићете све ваше локалне измене за ову фасциклу и све његове "
-"подфасцикле.</p>\n"
-"<p><b>Отклањање проблема у IMAP кешу</b></p>"
-"<p>Ако имате проблема са синхронизацијом IMAP фасцикле, прво би требало да "
-"поново изградите индексни фајл. Требаће неко време да се поново изгради, али "
-"неће изазвати никакве проблеме.</p>"
-"<p>Ако то не буде довољно, можете покушати да освежите IMAP кеш. Ако урадите "
-"то, изгубићете све ваше локалне измене за ову фасциклу и све његове "
-"подфасцикле.</p>"
+"<p><b>Отклањање проблема у IMAP кешу</b></p><p>Ако имате проблема са "
+"синхронизацијом IMAP фасцикле, прво би требало да поново изградите индексни "
+"фајл. Требаће неко време да се поново изгради, али неће изазвати никакве "
+"проблеме.</p><p>Ако то не буде довољно, можете покушати да освежите IMAP "
+"кеш. Ако урадите то, изгубићете све ваше локалне измене за ову фасциклу и "
+"све његове подфасцикле.</p>\n"
+"<p><b>Отклањање проблема у IMAP кешу</b></p><p>Ако имате проблема са "
+"синхронизацијом IMAP фасцикле, прво би требало да поново изградите индексни "
+"фајл. Требаће неко време да се поново изгради, али неће изазвати никакве "
+"проблеме.</p><p>Ако то не буде довољно, можете покушати да освежите IMAP "
+"кеш. Ако урадите то, изгубићете све ваше локалне измене за ову фасциклу и "
+"све његове подфасцикле.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7552,8 +7378,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Није било могуће снимити UID кеш фајл за фасциклу %1. Проблем може бити у "
 "дозволама фајл-система."
@@ -7594,11 +7420,11 @@ msgstr "Индекс ове фасцикле је поново направље�
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Фасцикла %1 није у почетном синхронизационом стању (стање је било %2). Желите "
-"ли да ресетујете стање на почетно или да ипак урадите синхронизацију?"
+"Фасцикла %1 није у почетном синхронизационом стању (стање је било %2). "
+"Желите ли да ресетујете стање на почетно или да ипак урадите синхронизацију?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7726,15 +7552,11 @@ msgstr "Правим подфасцикле на серверу"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Поруке на сервер у фасцикли <b>%1</b> су обрисане. Желите ли да их обришете "
-"и локално?"
-"<br>UID-ови: %2</p></qt>"
+"<qt><p>Поруке на сервер у фасцикли <b>%1</b> су обрисане. Желите ли да их "
+"обришете и локално?<br>UID-ови: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7755,13 +7577,11 @@ msgstr "Добављам фасцикле за именски простор %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Изгледа да је фасцикла <b>%1</b> обрисана. Желите ли да је обришете са "
-"сервера?</p></qt>"
+"<qt><p>Изгледа да је фасцикла <b>%1</b> обрисана. Желите ли да је обришете "
+"са сервера?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7769,16 +7589,16 @@ msgstr "Прекинуто"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP сервер %1 нема подршку за IMAP белешке. XML складиштење не може се "
 "користити на овом серверу, подесите KMail другачије."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP сервер %1 нема подршку за IMAP белешке. XML складиштење се не може "
 "користити на овом серверу, подесите KMail другачије."
@@ -7793,17 +7613,16 @@ msgstr "изгубљено+нађено"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>У фасцикли <b>%1</b> има нових порука које још нису послате на сервер, али "
-"је фасцикла на серверу обрисана или немате потребна права приступа фасцикли да "
-"бисте их послали.</p>"
-"<p>Све поруке на које ово утиче биће премештене у <b>%2</b>"
-", како би се избегао губитак података.</p>"
+"<p>У фасцикли <b>%1</b> има нових порука које још нису послате на сервер, "
+"али је фасцикла на серверу обрисана или немате потребна права приступа "
+"фасцикли да бисте их послали.</p><p>Све поруке на које ово утиче биће "
+"премештене у <b>%2</b>, како би се избегао губитак података.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7811,20 +7630,25 @@ msgstr "Недовољна права приступа"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>У овој фасцикли (%1) има нових порука које још нису послате на сервер, али "
-"је фасцикла на серверу обрисана или немате потребна права приступа фасцикли да "
-"бисте их послали. Контактирајте свог администратора да би вам дозволио слање "
-"нових порука, или их преместите из ове фасцикле.</p> "
-"<p>Да ли сада желите да преместите ове поруке у другу фасцилу?</p>"
+"<p>У овој фасцикли (%1) има нових порука које још нису послате на сервер, "
+"али је фасцикла на серверу обрисана или немате потребна права приступа "
+"фасцикли да бисте их послали. Контактирајте свог администратора да би вам "
+"дозволио слање нових порука, или их преместите из ове фасцикле.</p> <p>Да ли "
+"сада желите да преместите ове поруке у другу фасцилу?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Премести у:"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Не премештај"
 
@@ -7836,8 +7660,7 @@ msgstr "Премести поруке у фасциклу"
 msgid "Permissions (ACL)"
 msgstr "Дозволе (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Опште"
@@ -7861,8 +7684,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Користи посебне &иконе"
@@ -7881,22 +7703,19 @@ msgstr "Обавести о новој/непрочитаној пошти у о
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ако је ова опција укључена, бићете обавештени о новој/непрочитаној пошти у "
-"овој фасцикли.</p>"
-"<p>Оставите неозначено ако не желите обавештења о новој/непрочитаној пошти у "
-"овој фасцикли и ако хоћете да ова фасцикла буде прескочена при кретању "
-"следеће/претходне непрочитане поруке. Ово је корисно за игнорисање поште у "
-"фасциклама смећа или спама.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Ако је ова опција укључена, бићете обавештени о новој/непрочитаној "
+"пошти у овој фасцикли.</p><p>Оставите неозначено ако не желите обавештења о "
+"новој/непрочитаној пошти у овој фасцикли и ако хоћете да ова фасцикла буде "
+"прескочена при кретању следеће/претходне непрочитане поруке. Ово је корисно "
+"за игнорисање поште у фасциклама смећа или спама.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7908,13 +7727,13 @@ msgstr "Чувај одговоре у овој фасцикли"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Укључите ову опцију ако желите да одговори које пишете на поруке у овој "
-"фасцикли буду такође стављењи у њу после слања, уместо у подешену фасциклу за "
-"одлазну пошту."
+"фасцикли буду такође стављењи у њу после слања, уместо у подешену фасциклу "
+"за одлазну пошту."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7924,17 +7743,21 @@ msgstr "Прикажи колону пошиљаоца/примаоца у ли�
 msgid "Sho&w column:"
 msgstr "При&кажи колону:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Постави подразумевано"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Пошиљалац"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Прималац"
@@ -7945,17 +7768,17 @@ msgstr "Идентитет пошиљао&ца:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Изаберите идентитет пошиљаоца који се користи када пишете нову поруку или "
-"одговарате на поруку из ове фасцикле. Ово значи да ће, према фасцикли у којој "
-"се налазите, KMail аутоматски користити одговарајућу е-адресу пошиљаоца, потпис "
-"и дигитално потписивање. Идентитети се могу поставити у главном дијалогу за "
-"подешавање (Подешавања -> Подеси KMail)."
+"одговарате на поруку из ове фасцикле. Ово значи да ће, према фасцикли у "
+"којој се налазите, KMail аутоматски користити одговарајућу е-адресу "
+"пошиљаоца, потпис и дигитално потписивање. Идентитети се могу поставити у "
+"главном дијалогу за подешавање (Подешавања -> Подеси KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7973,25 +7796,27 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Ово подешавање дефинише који корисници који деле ову фасциклу треба да добију "
-"„заузете“ периоде у својој слободно/заузето листи и виде аларме за догађаје или "
-"задатке у овој фасцикли. Подешавање се примењује само на фасцикле календара и "
-"задатака (за задатке, ово подешавање користи се само за аларме).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Ово подешавање дефинише који корисници који деле ову фасциклу треба да "
+"добију „заузете“ периоде у својој слободно/заузето листи и виде аларме за "
+"догађаје или задатке у овој фасцикли. Подешавање се примењује само на "
+"фасцикле календара и задатака (за задатке, ово подешавање користи се само за "
+"аларме).\n"
 "\n"
-"Пример употребе: Ако шеф дели фасциклу са својом секретарицом, само шеф треба "
-"да буде означен као заузет током састанака. Зато би требало да изабере "
-"„Администратори“, пошто секретарица нема администраторских права за фасциклу.\n"
+"Пример употребе: Ако шеф дели фасциклу са својом секретарицом, само шеф "
+"треба да буде означен као заузет током састанака. Зато би требало да изабере "
+"„Администратори“, пошто секретарица нема администраторских права за "
+"фасциклу.\n"
 "С друге стране, ако радна група дели календар за састанке групе, сви читаоци "
 "фасцикле треба да буду означени као заузети током састанака.\n"
-"Фасцикла за целу компанију са опционим догађајима у себи би користила „Нико“, "
-"пошто није познато ко ће ићи на те догађаје."
+"Фасцикла за целу компанију са опционим догађајима у себи би користила "
+"„Нико“, пошто није познато ко ће ићи на те догађаје."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8022,23 +7847,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Подесили сте да ова фасцикла садржи groupware информације, а постављена је "
-"општа опција сакривања groupware фасцикли. То значи да ће ова фасцикла нестати "
-"чим се дијалог за подешавање затвори. Ако желите поново да уклоните ову "
-"фасциклу, мораћете привремено да искључите сакривање groupware фасцикли да "
-"бисте могли да је видите."
+"општа опција сакривања groupware фасцикли. То значи да ће ова фасцикла "
+"нестати чим се дијалог за подешавање затвори. Ако желите поново да уклоните "
+"ову фасциклу, мораћете привремено да искључите сакривање groupware фасцикли "
+"да бисте могли да је видите."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8107,7 +7932,8 @@ msgstr "Грешка приликом добављања информација
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Индекс поште за %1 је од непознате верзије KMail-а (%2).\n"
 "Овај индекс може бити поновно направљен из ваше поштанске фасцикле, али неке "
@@ -8128,8 +7954,8 @@ msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
 msgstr ""
-"Индекс поште за „%1“ је искварен и управо ће бити обновљен, али ће неки подаци, "
-"укључујући ознаке статуса, бити изгубљени."
+"Индекс поште за „%1“ је искварен и управо ће бити обновљен, али ће неки "
+"подаци, укључујући ознаке статуса, бити изгубљени."
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8137,8 +7963,8 @@ msgstr "Грешка приликом отварања %1. Ова фасцикл
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Грешка приликом отварања %1. Или ово није исправнa „maildir“ фасцикла или "
 "немате довољна права приступа."
@@ -8184,21 +8010,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Индекс фасцикле „%2“ изгледа застарело. Да би се спречило оштећивање порука "
-"индекс ће бити поново направљен. Као резултат овога може се догодити да се "
-"обрисане поруке поново појаве и да се ознаке статуса изгубе.</p>"
-"<p>Прочитајте одговарајућу ставку у <a href=\"%1\">одељку „Често постављана "
-"питања„ приручника за KMail</a> ради информације како спречити овај проблем да "
-"се понови.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Индекс фасцикле „%2“ изгледа застарело. Да би се спречило оштећивање "
+"порука индекс ће бити поново направљен. Као резултат овога може се догодити "
+"да се обрисане поруке поново појаве и да се ознаке статуса изгубе.</"
+"p><p>Прочитајте одговарајућу ставку у <a href=\"%1\">одељку „Често "
+"постављана питања„ приручника за KMail</a> ради информације како спречити "
+"овај проблем да се понови.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8258,7 +8081,7 @@ msgstr ""
 "„%1“ не изгледа као фасцикла.\n"
 "Склоните фајл са пута."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8266,7 +8089,7 @@ msgstr ""
 "Дозволе за фасциклу „%1“ нису исправне.\n"
 "Уверите се да можете мењати и гледати садржај ове фасцикле."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8276,17 +8099,17 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"Истоимена фасцикла је обрисана од последње провере поште. Морате прво проверити "
-"пошту пре стварања нове фасцикле са истим именом."
+"Истоимена фасцикла је обрисана од последње провере поште. Морате прво "
+"проверити пошту пре стварања нове фасцикле са истим именом."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Не могу да направим фасциклу"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8383,13 +8206,13 @@ msgstr "&Отклони проблеме у IMAP кешу..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Не могу да направим фасциклу <b>%1</b> због недовољних дозвола на серверу. "
-"Ако мислите да би требало да можете да правите фасцикле овде, затражите од свог "
-"администратора да вам то омогући.</qt> "
+"<qt>Не могу да направим фасциклу <b>%1</b> због недовољних дозвола на "
+"серверу. Ако мислите да би требало да можете да правите фасцикле овде, "
+"затражите од свог администратора да вам то омогући.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8406,23 +8229,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Не могу овде да преместим или копирам фасциклу <b>%1</b>"
-", јер истоимена фасцикла већ постоји.</qt>"
+"<qt>Не могу овде да преместим или копирам фасциклу <b>%1</b>, јер истоимена "
+"фасцикла већ постоји.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Не могу да преместим или копирам фасциклу <b>%1</b> "
-"јер и сама није потпуно копирана.</qt>"
+"<qt>Не могу да преместим или копирам фасциклу <b>%1</b> јер и сама није "
+"потпуно копирана.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Не могу да преместим или копирам фасциклу <b>%1</b> "
-"у њену сопствену подфасциклу.</qt>"
+"<qt>Не могу да преместим или копирам фасциклу <b>%1</b> у њену сопствену "
+"подфасциклу.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8531,17 +8354,17 @@ msgstr "%1 Фасцикла је само-за-читање."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Да ли заиста желите да обришете %n означену поруку?"
-"<br>Када их једном обришете више их не можете вратити!</qt>\n"
-"<qt>Да ли заиста желите да обришете %n означене поруке?"
-"<br>Када их једном обришете више их не можете вратити!</qt>\n"
-"<qt>Да ли заиста желите да обришете %n означених порука?"
-"<br>Када их једном обришете више их не можете вратити!</qt>"
+"<qt>Да ли заиста желите да обришете %n означену поруку?<br>Када их једном "
+"обришете више их не можете вратити!</qt>\n"
+"<qt>Да ли заиста желите да обришете %n означене поруке?<br>Када их једном "
+"обришете више их не можете вратити!</qt>\n"
+"<qt>Да ли заиста желите да обришете %n означених порука?<br>Када их једном "
+"обришете више их не можете вратити!</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8593,131 +8416,129 @@ msgstr ""
 "Грешка при измени %1\n"
 "(Нема више простора на уређају?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Захтев за потпис сертификата"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Направите сертификат из прилога и вратите пошиљаоцу."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail је подешен да буде ван везе; сви мрежни послови су суспендовани"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail је подешен да буде на вези; сви мрежни послови су настављени"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail је тренутно ван везе. Како желите да се настави?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Ради на вези"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Ради ван везе"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Немате дозволе за читање/упис у вашу фасциклу за пристиглу пошту."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "одлазно"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Немате дозволе за читање/упис у вашу фасциклу за одлазећу пошту."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "послато"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Немате дозволе за читање/упис у вашу фасциклу за послату пошту."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "смеће"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Немате дозволе за читање/упис у вашу фасциклу за смеће."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "недовршено"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Немате дозволе за читање/упис у вашу фасциклу за недовршену пошту."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "шаблони"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Немате дозволе за читање/упис у вашу фасциклу за шаблоне."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Последња претрага"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Фасцикла <i>%4</i> постоји. %1 сада користи фасциклу <i>%5</i> "
-"за своје поруке."
-"<p>%2 може за вас да премести садржај <i>%6<i> у ову фасциклу, мада то може "
-"заменити евентуално постојеће истоимене фајлове из <i>%7</i>."
+"<qt>Фасцикла <i>%4</i> постоји. %1 сада користи фасциклу <i>%5</i> за своје "
+"поруке.<p>%2 може за вас да премести садржај <i>%6<i> у ову фасциклу, мада "
+"то може заменити евентуално постојеће истоимене фајлове из <i>%7</i>."
 "<p><strong>Желите ли да %3 сада премести поштанске фајлове?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Фасцикла <i>%4</i> постоји. %1 сада користи фасциклу <i>%5</i> "
-"за своје поруке. %2 може за вас да премести садржај <i>%6<i> у ову фасциклу."
+"<qt>Фасцикла <i>%4</i> постоји. %1 сада користи фасциклу <i>%5</i> за своје "
+"поруке. %2 може за вас да премести садржај <i>%6<i> у ову фасциклу."
 "<p><strong>Желите ли да %3 сада премести поштанске фајлове?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Да преселим фајлове поште?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail је наишао на кобну грешку и одмах ће завршити са радом"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8728,11 +8549,11 @@ msgstr ""
 "Грешка је била:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Испразни смеће"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Да ли сте сигурни да желите да испразните фасцикле за смеће за све налоге?"
@@ -8809,8 +8630,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Стигла вам је пошта</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8830,8 +8650,8 @@ msgstr ""
 #: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Да ли сте сигурни да желите да избаците старе поруке из фасцикле <b>%1</b>"
-"?</qt>"
+"<qt>Да ли сте сигурни да желите да избаците старе поруке из фасцикле <b>%1</"
+"b>?</qt>"
 
 #: kmmainwidget.cpp:1133
 msgid "Expire Folder"
@@ -8851,11 +8671,11 @@ msgstr "Да ли сте сигурни да желите да испразни�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Да ли сте сигурни да желите да преместите све поруке из фасцикле <b>%1</b> "
-"у смеће?</qt>"
+"<qt>Да ли сте сигурни да желите да преместите све поруке из фасцикле <b>%1</"
+"b> у смеће?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8879,12 +8699,12 @@ msgstr "Обриши претрагу"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Да ли сте сигурни да желите да обришете претрагу <b>%1</b>? "
-"<br>Поруке приказане унутар ње неће бити обрисане пошто су похрањене у својој "
-"изворној фасцикли.</qt>"
+"<qt>Да ли сте сигурни да желите да обришете претрагу <b>%1</b>? <br>Поруке "
+"приказане унутар ње неће бити обрисане пошто су похрањене у својој изворној "
+"фасцикли.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8897,41 +8717,41 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Да ли сте сигурни да желите да обришете празну фасциклу <b>%1</b> "
-"и све њене подфасцикле? Ове подфасцикле можда нису празне и њихов садржај ће "
-"такође бити одбачене. "
-"<p><b>Пазите</b>, одбачене поруке не смештају се у фасциклу за смеће, већ се "
-"трајно бришу.</qt>"
+"<qt>Да ли сте сигурни да желите да обришете празну фасциклу <b>%1</b> и све "
+"њене подфасцикле? Ове подфасцикле можда нису празне и њихов садржај ће "
+"такође бити одбачене. <p><b>Пазите</b>, одбачене поруке не смештају се у "
+"фасциклу за смеће, већ се трајно бришу.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Да ли сте сигурни да желите да обришете фасциклу <b>%1</b>"
-", одбацујући њен садржај? "
-"<p><b>Пазите</b>, одбачене поруке не смештају се у фасциклу за смеће, већ се "
-"трајно бришу.</qt>"
+"<qt>Да ли сте сигурни да желите да обришете фасциклу <b>%1</b>, одбацујући "
+"њен садржај? <p><b>Пазите</b>, одбачене поруке не смештају се у фасциклу за "
+"смеће, већ се трајно бришу.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Да ли сте сигурни да желите да обришете фасциклу <b>%1</b> "
-"и све њене подфасцикле, одбацујући њихов садржај? "
-"<p><b>Пазите</b>, одбачене поруке не смештају се у фасциклу за смеће, већ се "
-"трајно бришу.</qt>"
+"<qt>Да ли сте сигурни да желите да обришете фасциклу <b>%1</b> и све њене "
+"подфасцикле, одбацујући њихов садржај? <p><b>Пазите</b>, одбачене поруке не "
+"смештају се у фасциклу за смеће, већ се трајно бришу.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "обрисана"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8939,7 +8759,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Да ли сте сигурни да желите да освежите IMAP кеш?\n"
-"Ово ће уклонити све измене које сте радили над вашим IMAP фасциклама у локалу."
+"Ово ће уклонити све измене које сте радили над вашим IMAP фасциклама у "
+"локалу."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8947,13 +8768,13 @@ msgstr "Да ли сте сигурни да желите да избаците
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Коришћење HTML-а у пошти ће вас учинити рањивијим на „спам“ и може повећати "
-"вероватноћу да ће ваш систем бити компромитован другим присутним и очекиваним "
-"безбедоносним злоупотребама."
+"вероватноћу да ће ваш систем бити компромитован другим присутним и "
+"очекиваним безбедоносним злоупотребама."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8966,12 +8787,12 @@ msgstr "Користи HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Учитавање спољних референци у HTML пошти ће вас учинити рањивијим на „спам“ и "
-"може повећати вероватноћу да ће ваш систем бити компромитован другим присутним "
-"и очекиваним безбедоносним злоупотребама."
+"Учитавање спољних референци у HTML пошти ће вас учинити рањивијим на „спам“ "
+"и може повећати вероватноћу да ће ваш систем бити компромитован другим "
+"присутним и очекиваним безбедоносним злоупотребама."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8987,13 +8808,14 @@ msgstr "Филтер по дискусионој листи %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMail-ова функционалност да одговара ван канцеларије зависи од филтрирања на "
 "страни сервера. Ви још увек нисте подесили IMAP сервер за тако нешто.\n"
-"Ово можете учинити у језичку „Филтрирање“, дијалога за подешавање IMAP налога."
+"Ово можете учинити у језичку „Филтрирање“, дијалога за подешавање IMAP "
+"налога."
 
 #: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
@@ -9009,7 +8831,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Нисам могао да покренем приказивач дневника GnuPG-а. Проверите вашу "
 "инсталацију."
@@ -9331,8 +9154,7 @@ msgstr "Сними &прилоге..."
 msgid "Appl&y All Filters"
 msgstr "Примени с&ве филтере"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Пр&имени филтере"
@@ -9447,7 +9269,6 @@ msgstr "Следећа &непрочитана порука"
 msgid "Go to the next unread message"
 msgstr "Иди на следећу непрочитану поруку"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Претходна порука"
@@ -9587,21 +9408,21 @@ msgstr " Иницијализујем..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ова порука садржи захтев за враћање обавештења о вашем пријему поруке.\n"
-"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или обичан "
-"одговор."
+"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или "
+"обичан одговор."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Ова порука садржи захтев за слањем обавештења о вашем пријему поруке.\n"
@@ -9611,34 +9432,34 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ова порука садржи захтев за слањем обавештења о вашем пријему поруке,\n"
 "али је захтевано да се извештај пошаље на више од једне адресе.\n"
-"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или обичан "
-"одговор."
+"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или "
+"обичан одговор."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ова порука садржи захтев за слањем обавештења о вашем пријему поруке,\n"
 "али нема постављену повратну путању.\n"
-"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или обичан "
-"одговор."
+"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или "
+"обичан одговор."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9647,8 +9468,8 @@ msgstr ""
 "Ова порука садржи захтев за слањем обавештења о вашем пријему поруке,\n"
 "али повратна путања се разликује од адресе на коју је захтевано слање "
 "извештаја.\n"
-"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или обичан "
-"одговор."
+"Можете или игнорисати захтев или пустити KMail да пошаље „одбијен“ или "
+"обичан одговор."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9674,16 +9495,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Потврда: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Прилог: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Овај прилог је обрисан."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Прилог „%1“ је обрисан."
 
@@ -9731,45 +9552,38 @@ msgstr "Својства дела поруке"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME тип</em> фајла.</p>"
-"<p>Обично не морате да дирате ову поставку, пошто се врста фајла аутоматски "
-"проверава. Међутим, понекад %1 не може да одреди врсту како ваља. Овде то "
-"можете поправити.</p></qt>"
+"<qt><p><em>MIME тип</em> фајла.</p><p>Обично не морате да дирате ову "
+"поставку, пошто се врста фајла аутоматски проверава. Међутим, понекад %1 не "
+"може да одреди врсту како ваља. Овде то можете поправити.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Величина дела.</p>"
-"<p>Понекад ће %1 овде дати само предвиђену величину зато што би израчунавање "
-"тачне величине исувише дуго трајало. Ако се ово догоди, биће јасно назначено "
-"додавањем „(пред.)“ величини која је приказана.</p></qt>"
+"<qt><p>Величина дела.</p><p>Понекад ће %1 овде дати само предвиђену величину "
+"зато што би израчунавање тачне величине исувише дуго трајало. Ако се ово "
+"догоди, биће јасно назначено додавањем „(пред.)“ величини која је приказана."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Име фајла дела.</p>"
-"<p>Иако је ово подразумевано исто као и име приложеног фајла, оно не назначава "
-"име фајла који се прилаже. Боље речено, оно предлаже име фајла примаочевом "
-"поштанском агенту када снима део на диск.</p></qt>"
+"<qt><p>Име фајла дела.</p><p>Иако је ово подразумевано исто као и име "
+"приложеног фајла, оно не назначава име фајла који се прилаже. Боље речено, "
+"оно предлаже име фајла примаочевом поштанском агенту када снима део на диск."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9777,17 +9591,14 @@ msgstr "&Опис:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Опис дела.</p>"
-"<p>Ово је само информативни опис дела, слично као што је тема за целу поруку. "
-"Већина поштанских агената ће приказати ову информацију у својим прегледима "
-"порука, одмах поред иконе прилога.</p></qt>"
+"<qt><p>Опис дела.</p><p>Ово је само информативни опис дела, слично као што "
+"је тема за целу поруку. Већина поштанских агената ће приказати ову "
+"информацију у својим прегледима порука, одмах поред иконе прилога.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9795,23 +9606,20 @@ msgstr "&Кодирање:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Транспортно кодирање за овај део.</p>"
-"<p>Обично ово не морате да мењате, пошто ће %1 користити пристојно "
-"подразумевано кодирање, у зависности од MIME типа. Ипак, понекад значајно "
-"можете смањити величину резултујуће поруке, нпр. ако PostScript фајл не садржи "
-"бинарне податке, већ само обичан текст. У овом случају избор „цитираног за "
-"штампу“ (quoted printable) уместо „основе 64“ ће смањити коначну величину и до "
-"25%.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Транспортно кодирање за овај део.</p><p>Обично ово не морате да "
+"мењате, пошто ће %1 користити пристојно подразумевано кодирање, у зависности "
+"од MIME типа. Ипак, понекад значајно можете смањити величину резултујуће "
+"поруке, нпр. ако PostScript фајл не садржи бинарне податке, већ само обичан "
+"текст. У овом случају избор „цитираног за штампу“ (quoted printable) уместо "
+"„основе 64“ ће смањити коначну величину и до 25%.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9819,19 +9627,17 @@ msgstr "Предложи &аутоматски приказ"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Укључите ову опцију ако желите да предложите примаоцу аутоматски (уграђен) "
-"приказ овог дела поруке у прегледу, уместо подразумеваног приказа иконе.</p>"
-"<p>Технички, ово се изводи постављањем поља <em>Content-Disposition</em> "
-"заглавља на „inline“ уместо на подразумевано „attachment“.</p></qt>"
+"<qt><p>Укључите ову опцију ако желите да предложите примаоцу аутоматски "
+"(уграђен) приказ овог дела поруке у прегледу, уместо подразумеваног приказа "
+"иконе.</p><p>Технички, ово се изводи постављањем поља <em>Content-"
+"Disposition</em> заглавља на „inline“ уместо на подразумевано „attachment“.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9839,14 +9645,12 @@ msgstr "&Потпиши овај део"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Укључите ову опцију ако желите да овај део поруке буде потписан.</p>"
-"<p>Потпис ће бити начињен кључем који је придружен тренутно одабраном "
+"<qt><p>Укључите ову опцију ако желите да овај део поруке буде потписан.</"
+"p><p>Потпис ће бити начињен кључем који је придружен тренутно одабраном "
 "идентитету.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9855,13 +9659,11 @@ msgstr "Шифр&уј овај део"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Укључите ову опцију ако желите да овај део поруке буде шифрован.</p>"
-"<p>Део ће бити шифрован за примаоце ове поруке.</p></qt>"
+"<qt><p>Укључите ову опцију ако желите да овај део поруке буде шифрован.</"
+"p><p>Део ће бити шифрован за примаоце ове поруке.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9875,15 +9677,12 @@ msgstr "POP филтер"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Поруке за филтрирање су пронађене на POP налогу: <b>%1</b>"
-"<p>Приказане поруке прекорачују максималну величину коју сте дефинисали за овај "
-"налог."
+"Поруке за филтрирање су пронађене на POP налогу: <b>%1</b><p>Приказане "
+"поруке прекорачују максималну величину коју сте дефинисали за овај налог."
 "<br>Можете одабрати шта желите да урадите са њима укључивањем одговарајуће "
 "дугмади."
 
@@ -10137,40 +9936,39 @@ msgstr "TDE-ов клијент за електронску пошту."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Добављам садржај фасцикле</h2>"
-"<p>Сачекајте . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Добављам садржај фасцикле</h2><p>Сачекајте . . ."
+"</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Ван везе</h2>"
-"<p>KMail је тренутно ван везе. Кликните <a href=\"kmail:goOnline\">овде</a> "
-"да би се повезали . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Ван везе</h2><p>KMail је тренутно ван везе. "
+"Кликните <a href=\"kmail:goOnline\">овде</a> да би се повезали . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10178,13 +9976,11 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Добродошли у  KMail %1</h2>"
-"<p>KMail клијент електронске поште за TDE. Направљен је да буде у потпуности у "
-"складу са стандардима за интернет пошту, укључујући MIME, SMTP, POP3 и IMAP.</p>"
-"\n"
-"<ul>"
-"<li>KMail има пуно добрих могућности које су описане у <a href=\"%2\">"
-"документацији</a></li>\n"
+"<h2 style='margin-top: 0px;'>Добродошли у  KMail %1</h2><p>KMail клијент "
+"електронске поште за TDE. Направљен је да буде у потпуности у складу са "
+"стандардима за интернет пошту, укључујући MIME, SMTP, POP3 и IMAP.</p>\n"
+"<ul><li>KMail има пуно добрих могућности које су описане у <a href="
+"\"%2\">документацији</a></li>\n"
 "<li><a href=\"%3\">Почетна страна KMail-а</A> вам даје податке о новим "
 "верзијама KMail-а</li></ul>\n"
 "%8\n"
@@ -10198,30 +9994,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail тим</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Одвојите нешто времена за подешавање KMail-a користећи Поставке->"
-"Подеси KMail.\n"
-"Морате направити барем један подразумевани идентитет као и по један одлазећи и "
-"долазећи поштански налог.</p>\n"
+"<p>Одвојите нешто времена за подешавање KMail-a користећи Поставке->Подеси "
+"KMail.\n"
+"Морате направити барем један подразумевани идентитет као и по један одлазећи "
+"и долазећи поштански налог.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Важне измене</span> "
-"(у поређењу са KMail-ом %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Важне измене</span> (у "
+"поређењу са KMail-ом %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10252,7 +10046,8 @@ msgstr "Погледај прилог: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Прилог садржи бинарне податке. Покушај приказа %n знака.]\n"
@@ -10281,12 +10076,14 @@ msgstr "Да отворим прилог?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Брисање прилога може искварити дигитални потпис поруке, ако постоји."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Измена прилога може искварити дигитални потпис поруке, ако постоји."
 
 #: kmreaderwin.cpp:2956
@@ -10307,6 +10104,58 @@ msgstr "(уклопи било шта од следећег)"
 msgid "(match all of the following)"
 msgstr "(уклопи све од следећег)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "прочитана"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "стара"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "обрисана"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "одговорена"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "прослеђена"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "стављена у ред"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "послата"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "посматрана"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "игнорисана"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "спам"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "хам"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "посао"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "садржи прилог"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Целокупна порука"
@@ -10379,15 +10228,15 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Критична грешка: Н могу да обрадим послату пошту (нема места?) Премештам поруку "
-"у фасциклу за „послату пошту“."
+"Критична грешка: Н могу да обрадим послату пошту (нема места?) Премештам "
+"поруку у фасциклу за „послату пошту“."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Премештање послате поруке „%1“ из „одлазеће“ у фасциклу „послате поште“ није "
 "успело.\n"
@@ -10397,12 +10246,12 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Није могуће слати поруке без навођења адресе примаоца.\n"
-"Поставите е-адресу идентитета „%1“ у одељку Идентитети дијалога за подешавање, "
-"па покушајте поново."
+"Поставите е-адресу идентитета „%1“ у одељку Идентитети дијалога за "
+"подешавање, па покушајте поново."
 
 #: kmsender.cpp:454
 #, c-format
@@ -10428,11 +10277,11 @@ msgstr "Иницирам процес слања..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Изабрали сте да пошаљете све поруке у реду помоћу нешифрованог преноса. Желите "
-"ли да наставите?"
+"Изабрали сте да пошаљете све поруке у реду помоћу нешифрованог преноса. "
+"Желите ли да наставите?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10456,8 +10305,9 @@ msgstr "Нисам успео да пошаљем (неке) поруке кој
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10474,18 +10324,15 @@ msgstr "Слање је отказано."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Слање није успело:</p>"
-"<p>%1</p>"
-"<p>Порука ће остати у фасцикли за одлазећу пошту све док или не решите проблем "
-"(нпр. лоша адреса) или уклоните поруку из фасцикле за одлазећу пошту.\n"
+"<p>Слање није успело:</p><p>%1</p><p>Порука ће остати у фасцикли за одлазећу "
+"пошту све док или не решите проблем (нпр. лоша адреса) или уклоните поруку "
+"из фасцикле за одлазећу пошту.\n"
 "Коришћен је следећи транспортни протокол:  %2\n"
 "<p>Да ли желите да наставим са слањем преосталих порука?</p>"
 
@@ -10505,8 +10352,9 @@ msgstr "&Прекини слање"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10554,39 +10402,39 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 изгледа да већ ради на другом приказу на овој машини. Покретање %2 више од "
-"једном може изазвати губитак поште. Не би требало да покрећете %1, осим ако сте "
-"сигурни да ипак тренутно не ради."
+"%1 изгледа да већ ради на другом приказу на овој машини. Покретање %2 више "
+"од једном може изазвати губитак поште. Не би требало да покрећете %1, осим "
+"ако сте сигурни да ипак тренутно не ради."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 "%1 изгледа да већ ради на другом приказу на овој машини. Покретање %1 и %2 у "
-"исто време може изазвати губитак поште. Не би требало да покрећете %2, осим ако "
-"сте сигурни да %1 ипак тренутно не ради."
+"исто време може изазвати губитак поште. Не би требало да покрећете %2, осим "
+"ако сте сигурни да %1 ипак тренутно не ради."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 изгледа да већ ради на %2. Покретање %1 више од једном може изазвати губитак "
-"поште. Не би требало да покрећете %1 на овом рачунару, осим ако сте сигурни да "
-"ипак тренутно не ради на %2."
+"%1 изгледа да већ ради на %2. Покретање %1 више од једном може изазвати "
+"губитак поште. Не би требало да покрећете %1 на овом рачунару, осим ако сте "
+"сигурни да ипак тренутно не ради на %2."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 изгледа да већ ради на %3. Покретање %1 и %2 у исто време може изазвати "
 "губитак поште. Не би требало да покрећете %2 на овом рачунару, осим ако сте "
@@ -10601,6 +10449,10 @@ msgstr "Покрени %1"
 msgid "Exit"
 msgstr "Изађи"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Нове поруке у"
@@ -10628,8 +10480,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet није доступан. Јако вам препоручујемо да користите TDEWallet за "
@@ -10715,8 +10568,8 @@ msgstr "Се&рвер захтева пријављивање"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Укључите ову опцију ако ваш SMTP сервер захтева да се пријавите пре него што "
 "прихвати пошту. Ово је познато под именом „Authenticated SMTP“ или просто "
@@ -10740,15 +10593,13 @@ msgstr "Пош&аљи посебно име домаћина серверу"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Укључите ову опцију ако желите да KMail шаље посебно име домаћина када се "
-"представља серверу за пошту."
-"<p>Ово је корисно ако име вашег система није постављено како треба или ако "
-"маскирате право име вашег система."
+"представља серверу за пошту.<p>Ово је корисно ако име вашег система није "
+"постављено како треба или ако маскирате право име вашег система."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10779,8 +10630,8 @@ msgstr "Дозвољени су само локални фајлови."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Поље Домаћин не може бити празно. Унесите име или IP адресу SMTP сервера."
 
@@ -10794,15 +10645,15 @@ msgstr "Грешка приликом листања фасцикле %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Локално отказивање претплате са фасцикли ће уклонити све податке који су "
-"локално присутни за те фасцикле. Фасцикле неће бити измењене на серверу. Можете "
-"сада одустати ако желите да потврдите да су све локалне измене записане на "
-"серверу, тако што ћете прво проверити пошту."
+"локално присутни за те фасцикле. Фасцикле неће бити измењене на серверу. "
+"Можете сада одустати ако желите да потврдите да су све локалне измене "
+"записане на серверу, тако што ћете прво проверити пошту."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11021,35 +10872,28 @@ msgstr "Ур&еди поруку"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Структурне информације враћене од прикључка за шифровање не могу бити "
-"исправно обрађене; постоји могућност да је прикључак оштећен.</p>"
-"<p>Контактирајте вашег администратора система.</p></qt>"
+"<qt><p>Структурне информације враћене од прикључка за шифровање не могу бити "
+"исправно обрађене; постоји могућност да је прикључак оштећен.</"
+"p><p>Контактирајте вашег администратора система.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Није пронађен ниједан активан прикључак за шифровање, а уграђени OpenPGP кôд "
-"се није успешно извршио.</p>"
-"<p>Да бисте ово променили можете урадити две ствари:</p>"
-"<ul>"
-"<li><em>или</em> активирајте прикључак користећи Поставке->Подеси KMail->"
-"Дијалог за прикључке.</li>"
-"<li><em>или</em> назначите традиционалне OpenPGP поставке у језичку Идентитет->"
-"Напредно у истом дијалогу.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Није пронађен ниједан активан прикључак за шифровање, а уграђени OpenPGP "
+"кôд се није успешно извршио.</p><p>Да бисте ово променили можете урадити две "
+"ствари:</p><ul><li><em>или</em> активирајте прикључак користећи Поставке-"
+">Подеси KMail->Дијалог за прикључке.</li><li><em>или</em> назначите "
+"традиционалне OpenPGP поставке у језичку Идентитет->Напредно у истом "
+"дијалогу.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11061,8 +10905,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Позадински програм Chiasmus-а не нуди функцију „x-encrypt“. Пријавите ову "
 "грешку."
@@ -11080,16 +10924,16 @@ msgstr "Грешка шифровања Chiasmus-а"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Позадински програм Chiasmus-а је вратио неочекивану вредност: Функција "
-"„x-encrypt“ није вратила бајтни низ. Пријавите ову грешку."
+"Позадински програм Chiasmus-а је вратио неочекивану вредност: Функција „x-"
+"encrypt“ није вратила бајтни низ. Пријавите ову грешку."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Криптоформат поруке OpenPGP у линији не подржава шифровање или потписивање "
@@ -11202,8 +11046,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Испитивање примаочевих подешавања за потписивање испоставило је да будете "
@@ -11240,11 +11084,12 @@ msgstr "&Не шифруј"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Тражили сте шифровање ове поруке, и шифровање вама самима, али ниједан важећи "
-"кључ за шифровање није подешен за овај идентитет."
+"Тражили сте шифровање ове поруке, и шифровање вама самима, али ниједан "
+"важећи кључ за шифровање није подешен за овај идентитет."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11253,13 +11098,13 @@ msgstr "Да ли да пошаљем нешифровано?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Неки делови ове поруке неће бити шифровани.\n"
-"Слање делимично шифрованих порука може нарушити политику сајта и/или процурети "
-"осетљиве информације.\n"
+"Слање делимично шифрованих порука може нарушити политику сајта и/или "
+"процурети осетљиве информације.\n"
 "Да уместо тога шифрујем све делове?"
 
 #: messagecomposer.cpp:950
@@ -11270,8 +11115,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Ова порука неће бити шифрована.\n"
-"Слање нешифрованих порука може нарушити политику сајта и/или процурети осетљиве "
-"информације.\n"
+"Слање нешифрованих порука може нарушити политику сајта и/или процурети "
+"осетљиве информације.\n"
 "Да уместо тога шифрујем поруку?"
 
 #: messagecomposer.cpp:955
@@ -11282,92 +11127,87 @@ msgstr "Шифруј св&е делове"
 msgid "Unencrypted Message Warning"
 msgstr "Упозорење о нешифрованој поруци"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Грешка: Позадински систем није вратио никакве кодиране податке.</p>"
-"<p>Пријавите ову грешку:"
-"<br>%2</p></qt>"
+"<qt><p>Грешка: Позадински систем није вратио никакве кодиране податке.</"
+"p><p>Пријавите ову грешку:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Не уклапају се сви знакови у изабрано кодирање."
-"<br>"
-"<br>Да ипак пошаљем поруку?</qt>"
+"<qt>Не уклапају се сви знакови у изабрано кодирање.<br><br>Да ипак пошаљем "
+"поруку?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Неки знаци ће бити изгубљени"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Избаци знакове"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Промени кодирање"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Ова порука није могла бити потписана, пошто изабрани позадински систем изгледа "
-"да не подржава потписивање. Ово у ствари никада не би требало да се деси, "
-"пријавите као грешку."
+"Ова порука није могла бити потписана, пошто изабрани позадински систем "
+"изгледа да не подржава потписивање. Ово у ствари никада не би требало да се "
+"деси, пријавите као грешку."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Ова порука није могла бити потписана, пошто изабрани позадински систем изгледа "
-"да не подржава потписивање. Ово у ствари никада не би требало да се деси, "
-"пријавите као грешку."
+"Ова порука није могла бити потписана, пошто изабрани позадински систем "
+"изгледа да не подржава потписивање. Ово у ствари никада не би требало да се "
+"деси, пријавите као грешку."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Дневник ревизије GnuPG-а за потписивање"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "Потписивање није успело. Проверите да ли је наредба gpg-agent покренута."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Ова порука није могла бити шифрована, пошто изабрани позадински систем изгледа "
-"да не подржава шифровање. Ово у ствари никада не би требало да се деси, "
-"пријавите као грешку."
+"Ова порука није могла бити шифрована, пошто изабрани позадински систем "
+"изгледа да не подржава шифровање. Ово у ствари никада не би требало да се "
+"деси, пријавите као грешку."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Дневник ревизије GnuPG-а за шифровање"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Ова порука није могла бити потписана и шифрована, пошто изабрани позадински "
-"систем изгледа да не подржава комбиновано потписивање и шифровање. Ово у ствари "
-"никада не би требало да се деси, пријавите као грешку."
+"систем изгледа да не подржава комбиновано потписивање и шифровање. Ово у "
+"ствари никада не би требало да се деси, пријавите као грешку."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11388,15 +11228,15 @@ msgstr "Фор&мат сандучета:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Изаберите да ли желите да складиштите поруке у овој фасцикли као један фајл по "
-"поруци (maildir) или као један велики фајл (mbox). KMail подразумевано користи "
-"maildir и то треба променити само у ретким околностима. Ако нисте сигурни, "
-"оставите тако како је."
+"Изаберите да ли желите да складиштите поруке у овој фасцикли као један фајл "
+"по поруци (maildir) или као један велики фајл (mbox). KMail подразумевано "
+"користи maildir и то треба променити само у ретким околностима. Ако нисте "
+"сигурни, оставите тако како је."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11405,8 +11245,8 @@ msgstr "Фасцикла &садржи:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Изаберите да ли желите да се нова фасцикла користи за складиштење поште или "
 "groupware ставки као што су задаци и забелешке. Подразумевано је пошта. Ако "
@@ -11449,8 +11289,7 @@ msgstr "Различити резултати за потписе"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Мотор за шифровање није вратио чисто текстуалне податке."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Статус: "
 
@@ -11479,11 +11318,11 @@ msgstr "Није пронађен ниједан %1 прикључак."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Порука је потписана, али исправност потписа не може бити проверена.<br />"
-"Разлог: %1"
+"Порука је потписана, али исправност потписа не може бити проверена.<br /"
+">Разлог: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11517,26 +11356,27 @@ msgstr "Прикључак за шифровање „%1“ не може деш
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Напомена:</b> Ова HTML порука може садржати спољне референце ка сликама и "
 "сл. Из разлога безбедности и приватности спољне референце нису учитане. Ако "
-"верујете пошиљаоцу ове поруке, можете учитати спољне референце <a "
-"href=\"kmail:loadExternal\">кликом овде</a>."
+"верујете пошиљаоцу ове поруке, можете учитати спољне референце <a href="
+"\"kmail:loadExternal\">кликом овде</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Напомена:</b> Ово је HTML порука. Из безбедносних разлога, приказан је само "
-"чист HTML код. Ако верујете пошиљаоцу ове поруке, можете активирати форматирани "
-"HTML приказ ове поруке <a href=\"kmail:showHTML\">кликом овде</a>."
+"<b>Напомена:</b> Ово је HTML порука. Из безбедносних разлога, приказан је "
+"само чист HTML код. Ако верујете пошиљаоцу ове поруке, можете активирати "
+"форматирани HTML приказ ове поруке <a href=\"kmail:showHTML\">кликом овде</"
+"a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11791,11 +11631,11 @@ msgstr "похрањен: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Нема поштанских адреса похрањених у %1 који се користи за потписивање, тако да "
-"поређење са адресом пошиљаоца %2; није могуће."
+"Нема поштанских адреса похрањених у %1 који се користи за потписивање, тако "
+"да поређење са адресом пошиљаоца %2; није могуће."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11910,13 +11750,15 @@ msgstr "Kioslave-ова порука о грешци"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Ваш POP3 сервер (налог: %1) не подржава наредбу UIDL. Ова наредба је неопходна "
-"за поуздано одређивање које су поруке на серверу већ раније виђене.\n"
+"Ваш POP3 сервер (налог: %1) не подржава наредбу UIDL. Ова наредба је "
+"неопходна за поуздано одређивање које су поруке на серверу већ раније "
+"виђене.\n"
 "Због тога могућност остављања порука на серверу неће радити исправно."
 
 #: popaccount.cpp:752
@@ -11939,9 +11781,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Преузимам поруку %1 од %2 (%3 од %4 KB) за %5@%6 (%7 KB преостало на серверу)."
+"Преузимам поруку %1 од %2 (%3 од %4 KB) за %5@%6 (%7 KB преостало на "
+"серверу)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11957,1884 +11801,15 @@ msgstr "Неисправан одговор од сервера"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Ваш сервер не подржава наредбу TOP. Због тога није могуће преузети заглавља "
 "великих порука пре њиховог преузимања."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Иди"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Фасцикла"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Порука"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Одговори посебно"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Проследи"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML трака"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Потписивање"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Аутоматски потписуј поруке"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Када је ова опција укључена, подразумевано ће све поруке које шаљете поруке "
-"бити потписане. Наравно, још увек је могуће искључити потписивање за сваку "
-"поруку понаособ."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Шифровање"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr "Када се шифрују поруке, увек ш&ифруј и сертификат мог идентитета"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Када је ова опција укључена, порука/фајл неће бити шифрована само примаочевим "
-"јавним кључем, већ и вашим. Ово ће вам омогућити да дешифрујете поруку/фајл у "
-"неком каснијем тренутку, што је обично добра идеја."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Прикажи &потписан/шифрован текст после састављања"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Када је ова опција укључена, потписан/шифрован текст ће бити приказан у "
-"одвојеном прозору, омогућавајући вам да знате како ће изгледати пре слања. Ово "
-"је добра идеја када проверавате да ли ваш систем за шифровање ради."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Похрани послате поруке ши&фровано"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Кликните овде да бисте похрањивали поруке у шифрованом облику "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Похрањивање порука у шифрованом облику</h1>\n"
-"Када је ова опција укључена, послате поруке се похрањују шифроване. Ово није "
-"препоручљиво пошто нећете моћи да читате поруке када потребни сертификат "
-"истекне.\n"
-"<p>\n"
-"Ипак, можда постоје локална правила која налажу да укључите ову опцију. Ако "
-"нисте сигурни, питајте вашег локалног администратора.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Увек прикажи кључеве за шифровање &ради одобрења"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Када је ова опција укључена, програм ће вам увек приказати листу јавних кључева "
-"из које можете изабрати онај који ћете користити за шифровање. Ако је "
-"искључена, програм ће приказати дијалог само ако не може да нађе прави кључ или "
-"ако их има неколико који могу бити употребљени."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Аутоматски шифруј поруке &кад год је то могуће"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Када је ова опција укључена, све ће поруке подразумевано бити шифроване кад год "
-"је то могуће и пожељно. Наравно, још увек је могуће искључити аутоматско "
-"шифровање за сваку поруку понаособ."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Никад не потписуј/шифруј приликом снимања као не&довршено"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Како ово ради?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "За: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Универзална"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Одговор"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Одговор свима"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Прослеђена"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Пречица:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Тип шаблона:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Својства фасцикле"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Фасцикла садржи &дискусиону листу"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Адреса листе:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "У&обичајена:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Непрочитана:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Застаревање порука"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "И&збаци после:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Избаци п&рочитане поруке"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Избаци по&сле:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Избаци &непрочитане поруке"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Дана"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Седмица"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Месеци"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Напредно"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Идентитет пошиљао&ца:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Формат похрањивања:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Прикази &листа:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Проверавај сертификате помоћу CRL-ова"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Ако је ова опција изабрана, S/MIME сертификати проверавају се користећи листе "
-"опозивања сертификата (CRL-ове)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Провери сертификате на вези (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Ако је ова опција изабрана, S/MIME сертификати проверавају се на вези користећи "
-"протокол за статус сертификата на вези (OCSP). Попуните испод URL OCSP "
-"респондера."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Провера сертификата на вези"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL OCSP респондера:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Овде унесите адресу сервера за проверу сертификата на вези (OCSP респондера). "
-"URL обично почиње са http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Потпис OCSP респондера:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Игнориши сервисни URL сертификата"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Немој да провераваш политике сертификата"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Подразумевано GnuPG користи фајл ~/.gnupg/policies.txt да провери да ли је "
-"политика сертификата дозвољена. Ако је ова опција изабрана, политике неће бити "
-"провераване."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Никада не разматрај CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ако је ова опција укључена, листе опозивања сертификата никада се не користе за "
-"проверу S/MIME сертификата."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Преузми недостајуће сертификате издавача"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Ако је ова опција укључена, недостајући сертификати издавача се преузимају када "
-"је потребно (ово важи за оба метода провере, CRL-ове и OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP захтеви"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Не извршавај ниједан HTTP захтев"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Потпуно искључује употребу HTTP-а за S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Користи овај прокси за HTTP захтеве: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Користи системски HTTP прокси:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Ако је ова опција изабрана, вредност HTTP проксија приказана лево (долази из "
-"променљиве окружења http_proxy) биће коришћена за све HTTP захтеве."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Унесите овде локацију HTTP проксија који треба користити за све HTTP захтеве у "
-"вези са S/MIME-овима. Синтакса је domacin:port, нпр. mojproksi.nigde.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Игнориши дистрибуциону тачку HTTP CRL-ова сертификата"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"При тражењу локације CRL-а, сертификат који ће бити тестиран обично садржи "
-"уносе за  такозване „дистрибуционе тачке CRL-ова“ (DP); то су URL-ови који "
-"описују начин приступа до CRL-ова. Користи се први пронађени DP унос. Овом "
-"опцијом игноришу се сви уноси који користе HTTP шему при тражењу погодне DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP захтеви"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Не извршавај ниједан LDAP захтев"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Потпуно искључује употребу LDAP-а за S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Игнориши дистрибуциону тачку LDAP CRL-ова сертификата"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"При тражењу локације CRL-а, сертификат који ће бити тестиран обично садржи "
-"уносе за  такозване „дистрибуционе тачке CRL-ова“ (DP); то су URL-ови који "
-"описују начин приступа до CRL-ова. Користи се први пронађени DP унос. Овом "
-"опцијом игноришу се сви уноси који користе LDAP шему при тражењу погодне DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Примарни домаћин за LDAP захтеве:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Сви LDAP захтеви ће прво ићи на LDAP сервер који овде унесете. Прецизније, ово "
-"подешавање гази било који домаћин и порт наведен у LDAP URL-у, а користи се и "
-"ако су домаћин и порт изостављени у URL-у. Други LDAP сервери користе се само "
-"ако веза са проксијем не успе.\n"
-"Синтакса је „DOMACIN“ или „DOMACIN:PORT“. Ако се порт изостави, користиће се "
-"389 (стандардни LDAP порт)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Додај исечак"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Додај"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Исечак:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Група:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Поставке исечка"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Облачићи"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Прикажи текст исечка у &облачићу"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "Одређује да ли се даје облачић са текстом из маркиране линије"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Променљиве"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Метод уноса за променљиве"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Јединствени дијалог за сваку променљиву у исечку"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "За сваку променљиву у оквиру исечка даје се дијалог за унос"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Један дијалог за све променљиве у исечку"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Даје се један једини дијалог у коме можете унети вредности свих променљивих у "
-"оквиру исечка."
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Раздвајач:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Одговор пошиљаоцу"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Одговор свима / одговор на листу"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Прослеђена порука"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Упозори при покушају слања &непотписаних порука"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Укључите ово ако желите да будете упозорени при слању непотписаних порука."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење при покушају слања непотписаних порука</h1>\n"
-"Ако је ова опција укључена, бићете упозорени када покушате да пошаљете делове "
-"или целу поруку непотписану.\n"
-"<p>\n"
-"Препоручљиво је оставити ову опцију укључену за максимални интегритет.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Упозори при покушају слања нешифрованих порука"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Укључите ову опцију ако желите да будете упозорени при слању нешифрованих "
-"порука."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење при слању нешифрованих порука</h1>\n"
-"Ако је ова опција укључена, бићете упозорени када покушате да пошаљете делове "
-"или целу поруку нешифровану.\n"
-"<p>\n"
-"Препоручљиво је оставити ову опцију укључену за максимални интегритет.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Упозори ако е-адреса п&римаоца није у сертификату"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Укључите ову опцију ако желите да будете упозорени ако адреса није у "
-"сертификату"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење ако примаочева е-адреса није у сертификату</h1>\n"
-"Ако је ова опција укључена, бићете упозорени ако е-адреса примаоца није "
-"садржана у сертификату који се користи за шифровање.\n"
-"<p>\n"
-"Ради максималне безбедности препоручује се да ову опцију држите укљученом.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Упозори ако сертификати/кључеви ускоро истичу (испод подесите прагове)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "За потписивање"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "За шифровање"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " дана"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Овде одаберите број дана"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење ако сертификат за потписивање истиче</h1>\n"
-"Одаберите најмањи број дана за које би сертификат за потписивање требало да "
-"буде важећи пре давања обавештења.\n"
-"<p>\n"
-"Препоручена поставка за SPHINX је четрнаест дана.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење ако сертификат за шифровање истиче</h1>\n"
-"Одаберите најмањи број дана за које би сертификат за шифровање требало да буде "
-"важећи пре давања обавештења.\n"
-"<p>\n"
-"Препоручена поставка за SPHINX је четрнаест дана.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење ако сертификат у ланцу истиче</h1>\n"
-"Одаберите најмањи број дана за које би сви сертификати у ланцу требало да буду "
-"важећи пре давања упозорења.\n"
-"<p>\n"
-"Препоручена поставка за SPHINX је четрнаест дана.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење ако CA сертификат истиче</h1>\n"
-"Одаберите најмањи број дана за које би CA сертификат требало да буде важећи пре "
-"давања обавештења.\n"
-"<p>\n"
-"Препоручена поставка за SPHINX је четрнаест дана.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Упозорење ако корени сертификат истиче</h1>\n"
-"Одаберите најмањи број дана за које би корени сертификат требало да буде важећи "
-"пре давања обавештења.\n"
-"<p>\n"
-"Препоручена поставка за SPHINX је четрнаест дана.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "За корене сертификате:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "За посредничке CA сертификате:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "За крајње корисничке сертификате/кључеве:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Поново укључи сва искључена упозорења"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Садржај шаблона"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Пречица шаблона"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Тип шаблона"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Пошаљи спремљену пошту при провери поште"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Изаберите да ли желите да KMail шаље све поруке у одлазном сандучету при "
-"ручној или при свим проверама поште, или чак да уопште не желите аутоматско "
-"слање порука.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Аутоматски премести несинхорнизовану пошту из фасцикли са недовољним правима "
-"приступа"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Ако у фасцикли има нових порука које још увек нису послате на сервер, али "
-"немате довољна права приступа за фасциклу да бисте их послали, те поруке ће "
-"бити аутоматски премештене у фасциклу изгубљеног и нађеног."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Локалне заставице могуће у фасциклама само-за-читање"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Ова поставка омогућава администраторима да подесе најмањи период између две "
-"провере поште. Корисник неће моћи да изабере мању вредност од овде наведене."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Најскорије изабрана фасцикла у дијалогу за избор фасцикли."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Занемари корисников umask и користи „читање-писање само за корисника“ уместо "
-"тога"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Политика приказивања иконе у системској касети"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Затвори програм када се затвори главни прозор, чак и ако је активна икона у "
-"системској касети."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Опширно обавештење о новој пошти"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Ако је ова опција укључена, у обавештењу о новој пошти биће приказан број "
-"новопристиглих порука за сваку фасциклу. У супротном, добићете само једноставну "
-"поруку „Стигла вам је пошта“."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Наведите у&ређивач:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Користи &спољни уређивач уместо састављача"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr "Праг упозоравања корисника да се фасцикла ближи ограничењу квоте."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Укључи groupware функционалност"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Обрни „Од:/За:“ заглавља у одговорима на одговоре"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft-ов Outlook има бројне недостатке у својој имплементацији iCalendar "
-"стандарда; ова опција је ту да заобиђе један од њих. Ако имате проблема са "
-"корисницима Outlook-а који не могу да добију ваше одговоре, покушајте да "
-"укључите ову опцију."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Пошаљи groupware позивнице у телу поруке"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft-ов Outlook има бројне недостатке у својој имплементацији iCalendar "
-"стандарда; ова опција је ту да заобиђе један од њих. Ако имате проблема са "
-"корисницима Outlook-а који не могу да добију ваше позивнице, покушајте да "
-"укључите ову опцију."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Именовање позивница компатибилно са Exchange-ом"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft-ов Outlook, када се користе заједно са Microsoft-овим Exchange "
-"сервером, има проблема са разумевањем стандарду-сагласним groupware е-порукама. "
-"Укључите ову опцију да би се groupware позивнице слале на начин који Exchange "
-"сигурно разуме."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Када је ово укључено, нећете видети прозор састављача поруке. Уместо тога, све "
-"поруке са позивницама шаљу се аутоматски. Ако желите да видите поруку пре "
-"слања, можете искључити ову опцију. Међутим, будите свесни да је текст у "
-"прозору састављача написан по синтакси iCalendar-а, због чега не би требало "
-"ручно да га мењате."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Обриши позивнице пошто се пошаље одговор на њих"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Ако је укључено, примљене е-поруке позивница на које се се одговори премештају "
-"се у фасциклу смећа, чим се одговор успешно пошаље."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Укључивање овога чини могућим складиштење ставки из контакт-програма "
-"(KOrganizer, KAddressBook и KNotes.)</p>"
-"<p>Ако желите да користите ову опцију, морате такође подесити програме да "
-"користе IMAP ресурс; ово се ради у Контролном центру TDE-а.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Обично нема разлога да видите фасцикле које садрже IMAP ресурсе. Али ако је "
-"потребно да их видите, можете то поставити овде.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Ако се налог за складиштење groupware података не користи за управљање "
-"обичном поштом, укључите ову опцију да би се за њега приказивале само groupware "
-"фасцикле. Ово је корисно када обичном поштом управљате преко додатног IMAP "
-"налога на вези.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Изаберите формат складиштења за groupware фасцикле. "
-"<ul>"
-"<li>Подразумевани формати су ical (за календарске фасцикле) и vcard (за "
-"адресарске фасцикле). Ови формати чине доступним све могућности Kontact-а.</li>"
-"<li>Формат Kolab XML користи посебан модел који ближе одговара ономе који се "
-"користи у Outlook-у. Овај формат даје већу компатибилност са Outlook-ом, "
-"приликом употребе Kolab сервера или компатибилног решења.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Ово бира родитеља IMAP ресурсних фасцикли.</p>"
-"<p>Подразумевано, Kolab сервер поставља да долазно IMAP сандуче буде "
-"родитељ.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Ово је ид. налога који садржи IMAP ресурсне фасцикле.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Ако желите да поставите имена фасцикли IMAP складиштења на свој језик, "
-"можете изабрати између доступних језика.</p>"
-"<p>Једини разлог за овако нешто је очување компатибилности са Microsoft-овим "
-"Outlook-ом. Постављање овога сматра се лошом идејом, пошто чини промену језика "
-"немогућом.</p>"
-"<p>Зато не користите ово ако не морате.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Такође филтрирај нову пошту примљену у groupware фасциклама."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr "Синхорнизуј groupware измене у IMAP фасциклама чим се пређе на везу."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Ова вредност се користи да би се назначило да ли приказивати „Увод у KMail“."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Максималан број веза по домаћину"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ово се може користити за ограничавање броја веза по домаћину док се добавља "
-"нова пошта. Подразумевно је број веза неограничен (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Прикажи линију за брзу претрагу"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ова опција укључује или искључује линију за претрагу изнад листе порука, помоћу "
-"које се може брзо потражити информација приказана у листи порука."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Сакриј локално пријемно сандуче ако се не користи"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Прослеђивање у линији као подразумевано."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "Тачка-зарез (;) дозвољена као раздвајач у састављачу порука."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Задржи оригинални скуп знакова приликом одговарања или прослеђивања (ако је "
-"могуће)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "А&утоматски уметни потпис"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Запамти овај идентитет, како би се користио и у будућим прозорима састављача.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Запамти ову фасциклу за послате поруке, како би се користила и у будућим "
-"прозорима састављача."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Запамти овај транспорт поште, како би се користио и у будућим прозорима "
-"састављача."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Запамти овај идентитет, како би се користио и у будућим прозорима састављача.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Прелом &текста на колони:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Максималан број линија уређивача прималаца."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Укључите ову опцију ако желите да Outlook &#8482; разуме имена прилога која "
-"садрже неенглеска слова"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Ауто&матски захтевај обавештења о распоређивању поруке"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Укључите ову опцију ако желите да KMail захтева обавештења о распоређивању "
-"поруке (MDN) за сваку вашу одлазећу поруку.</p>"
-"<p>Ова опција утиче само на подразумевано; у састављачу увек можете укључити "
-"или искључити захтевање MDN-a за сваку поруку преко ставке у менију <em>"
-"Опције</em>-&gt;<em>Захтевај овавештење о распоређивању</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Користи скорашње е-дресе за самодовршавање"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Искључите ову опцију ако не желите да се скоро коришћене адресе појављују на "
-"листи за самодовршавање у пољу адресе састављача."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Период аутоматског снимања:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Резервна копија текста у прозору састављача може се регуларно правити. Овде се "
-"поставља период после кога се прави резерва. Можете искључити аутоматско "
-"снимање постављањем периода на 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Умећи потписе изнад цитираног текста"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Замени препознати префи&кс са „Одг. :“"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Замени препознати префикс са „&Прос. :“"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Користи паметно &цитирање"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Потпис је истекао."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Врста избора примаоца"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr "Поставља врсту дијалога за избор прималаца у пољима За, CC и BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Врста уређивача прималаца"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "Поставља врсту уређивача прималаца, за уређивање поља За, CC и BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Максималан број линија уређивача прималаца."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Листа типова делова порука које треба уклонити када се порука прослеђује у "
-"линији."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Највећа величина у мегабајтима коју могу имати прилози."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Прикажи панел за уметање и управљање исечцима текста у састављачу."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Прикажи дневник ревизије GnuPG-а чак и када је шифрарски поступак успешно "
-"довршен."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Задржи оригинални скуп знакова приликом одговарања или прослеђивања (ако је "
-"могуће)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Неке е-поруке, посебно оне аутоматски генерисане, не наводе кодирање знакова "
-"које се мора користити да би се правилно приказале. У таквим случајевима "
-"користи се одступно кодирање, које можете задати овде. Поставите га на кодирање "
-"које се најчешће користи у вашем крају света. Као подразумевано, користи се "
-"кодирање подешено на нивоу целог система."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Промена овог са подразумеваног, „аутоматски“, условиће коришћење наведеног "
-"кодирања за све е-поруке, без обзира шта оне саме наводе."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Укључите ово ако желите да се смешко као :-) који се појављују у тексту замене "
-"емотиконима (малим сликама)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Укључите ову опцију да би се приказивали различити нивои цитираног текста. "
-"Искључите да бисте их сакрили."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Ниво аутоматског сажимања:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Смањи величину фонта за цитиран текст"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Укључите ову опцију да би се цитирани текст приказивао са мањим фонтом."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Похрани послате поруке ши&фровано"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Прикажи кориснички агент у помодним заглављима"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Укључите ову опцију ако желите да се линије заглавља User-Agent и X-Mailer "
-"приказују у помодним заглављима."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Омогући брисање прилога постојећих порука."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Омогући уређивање прилога постојећих порука."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Увек дешифровати поруке при прегледу или питати претходно"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Шаљи обавештења о распоређивању порука са празним пошиљаоцем."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Шаљи обавештења о распоређивању порука са празним знаковним низом пошиљаоца. "
-"Неки сервери могу бити подешени да одбацују такве поруке, тако да ако имате "
-"проблема са слањем MDN-ова, искључите ову опцију."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Фразе су претворене у шаблоне"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Старе фразе су претворене у шаблоне"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Шаблон поруке за нову поруку"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Шаблон поруке за одговор"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Шаблон поруке за одговор свима"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Шаблон поруке за прослеђивање"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Знакови цитирања"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Дозволи кориснику да мења поставке „ван канцеларије“."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Дозволи кориснику да шаље сито-скрипте „ван канцеларије“, али забрани промену "
-"поставки, као нпр. домен на који се реагује и прекидач за спам."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "Шаљи „ван канцеларије“ само на поруке пристигле са овог домена."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "Дозволи слање „ван канцеларије“ на поруке означене као спам."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Провери да ли је и даље постављен одговор „ван канцеларије“ при покретању "
-"KMail-а."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 од %2 %3 искоришћено"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13945,6 +11920,11 @@ msgstr "Додај као CC"
 msgid "Add as BCC"
 msgstr "Додај као BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Отк&ажи"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13960,14 +11940,17 @@ msgstr "Изабрани примаоци"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Изабрали сте %n примаоца, а подржано је максимално %1. Прилагодите свој избор.\n"
-"Изабрали сте %n примаоца, а подржано је максимално %1. Прилагодите свој избор.\n"
-"Изабрали сте %n примаоца, а подржано је максимално %1. Прилагодите свој избор."
+"Изабрали сте %n примаоца, а подржано је максимално %1. Прилагодите свој "
+"избор.\n"
+"Изабрали сте %n примаоца, а подржано је максимално %1. Прилагодите свој "
+"избор.\n"
+"Изабрали сте %n примаоца, а подржано је максимално %1. Прилагодите свој "
+"избор."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13983,8 +11966,8 @@ msgstr "Употреби дијалог за избор адреса"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Ово дугме отвара посебан дијалог у коме можете изабрати примаоце из свих "
 "доступних адреса."
@@ -14089,13 +12072,22 @@ msgstr "је веће или једнако од"
 msgid " bytes"
 msgstr " бајтова"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " дана"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Да би се ваша претрага извршила, све поруке из фасцикле %1 морају бити преузете "
-"са сервера. То може потрајати. Желите ли да наставите са претрагом?"
+"Да би се ваша претрага извршила, све поруке из фасцикле %1 морају бити "
+"преузете са сервера. То може потрајати. Желите ли да наставите са претрагом?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14246,16 +12238,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Прикупљам податке за налог „%1“...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Прикупљам податке за налог „%1“...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14274,10 +12262,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Садржај скрипте „%1“:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Садржај скрипте „%1“:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14300,20 +12286,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve могућности:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve могућности:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Нису доступне поосебне могућности)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Доступне Sieve скрипте:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Доступне Sieve скрипте:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14391,8 +12373,8 @@ msgstr "Користите ово поље да бисте унели произ
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Користите овај бирач да бисте навели текстуални фајл који садржи ваш потпис. "
 "Биће читан сваки пут када направите нову поруку или додате нови потпис."
@@ -14411,21 +12393,27 @@ msgstr "Отвара назначени фајл у уређивачу текс�
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Овде можете додати произвољну наредбу, са или без путање у зависности од тога "
-"да ли је наредба у вашој променљивој PATH. За сваку нову поруку, KMail ће "
-"извршити наредбу и употребити оно што она избаци (на стандардни излаз) као "
-"потпис. Уобичајене наредбе за овај механизам су „fortune“ или „ksig -random“."
+"Овде можете додати произвољну наредбу, са или без путање у зависности од "
+"тога да ли је наредба у вашој променљивој PATH. За сваку нову поруку, KMail "
+"ће извршити наредбу и употребити оно што она избаци (на стандардни излаз) "
+"као потпис. Уобичајене наредбе за овај механизам су „fortune“ или „ksig -"
+"random“."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Н&азначите наредбу:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Путања"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Нов унос:"
@@ -14459,6 +12447,11 @@ msgstr "Додај групу"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Желите ли заиста да уклоните ову групу и све њене исечке?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Примени &на:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Уреди исечак"
@@ -14471,6 +12464,10 @@ msgstr "Уреди групу"
 msgid "Edit &group..."
 msgstr "Уреди &групу..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Уреди..."
@@ -14509,9 +12506,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Ако укључите ову опцију, вредност унета десно биће сачувана. Када се касније "
 "поново јави иста променљива, чак и у другом исечку, ова вредност ће бити "
@@ -14550,6 +12547,16 @@ msgstr "Не укључуј"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Не могу да уметнем садржај из фајла %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "За: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14579,58 +12586,51 @@ msgstr "Не могу да покренем цев-наредбу из шабл�
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Овде можете правити шаблоне за поруке, које користите при састављању "
-"одговора или прослеђивању поруке.</p>"
-"<p>Шаблони порука подржавају наредбе за смену тако што их једноставно укуцате "
-"или изаберете их из менија <i>Уметни наредбу</i>.</p>"
-"<p>Овде наведени шаблони су посебни за ову фасциклу. Они имају приоритет и над "
-"глобалним шаблонима и над шаблонима према идентитету.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Овде можете правити шаблоне за поруке, које користите при састављању "
+"одговора или прослеђивању поруке.</p><p>Шаблони порука подржавају наредбе за "
+"смену тако што их једноставно укуцате или изаберете их из менија <i>Уметни "
+"наредбу</i>.</p><p>Овде наведени шаблони су посебни за ову фасциклу. Они "
+"имају приоритет и над глобалним шаблонима и над шаблонима према идентитету.</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Овде можете правити шаблоне за поруке, које користите при састављању "
-"одговора или прослеђивању поруке.</p>"
-"<p>Шаблони порука подржавају наредбе за смену тако што их једноставно укуцате "
-"или изаберете их из менија <i>Уметни наредбу</i>.</p>"
-"<p>Овде наведени шаблони важе за дати идентитет. Они имају приоритет над "
-"глобалним шаблонима, али их потискују шаблони посебни за фасцикле.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Овде можете правити шаблоне за поруке, које користите при састављању "
+"одговора или прослеђивању поруке.</p><p>Шаблони порука подржавају наредбе за "
+"смену тако што их једноставно укуцате или изаберете их из менија <i>Уметни "
+"наредбу</i>.</p><p>Овде наведени шаблони важе за дати идентитет. Они имају "
+"приоритет над глобалним шаблонима, али их потискују шаблони посебни за "
+"фасцикле.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Овде можете правити шаблоне за поруке, које користите при састављању "
-"одговора или прослеђивању поруке.</p>"
-"<p>Шаблони порука подржавају наредбе за смену тако што их једноставно укуцате "
-"или изаберете их из менија <i>Уметни наредбу</i>.</p>"
-"<p>Ово је глобални (подразумевани) шаблон. Има мањи приоритет и од шаблона "
-"према идентитету и од шаблона посебних за фасцикле.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Овде можете правити шаблоне за поруке, које користите при састављању "
+"одговора или прослеђивању поруке.</p><p>Шаблони порука подржавају наредбе за "
+"смену тако што их једноставно укуцате или изаберете их из менија <i>Уметни "
+"наредбу</i>.</p><p>Ово је глобални (подразумевани) шаблон. Има мањи "
+"приоритет и од шаблона према идентитету и од шаблона посебних за фасцикле.</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14882,6 +12882,10 @@ msgstr "Провуци тело текуће поруке и уметни рез
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Провуци тело текуће поруке и замени резултатом"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Постави положај курсора"
@@ -14914,111 +12918,6 @@ msgstr "Укључи исправљање"
 msgid "Turn Debug Off"
 msgstr "Искључи исправљање"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...да можете ићи на следећу или претходну поруку користећи леву или десну "
-"стрелицу на тастатури?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...да можете брзо да направите филтере по пошиљаоцу,\n"
-"примаоцу и дискусионој листи користећи <em>Алати-&gt;Направи&nbsp;филтер</em>"
-"?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...да се можете отарасити „[имена дискусионе листе]“\n"
-"које се додаје теми у неким литама користећи филтерску\n"
-"акцију <em>поново напиши заглавље</em>? Само искористите\n"
-"<pre>rewrite header &quot;Тема&quot;\n"
-"   replace &quot;\\s*\\[име дискусионе листе\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...да можете да придружите дискусиону листу фасцикли у дијалогу\n"
-"<em>Фасцикла-&gt;Управљање дискусионом листом...</em>? Онда можете користити\n"
-"<em>Порука-&gt;Нова&nbsp;порука&nbsp;у&nbsp; дискусионој&nbsp;листи...</em>\n"
-"да отворите састављач са постављеном адресом дискусионе листе.\n"
-"Другачије, можете кликнути средњим тастером миша на фасциклу.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...да можете доделите посебне иконе свакој фасцикли?\n"
-"Погледајте <em>Фасцикла-&gt;Својства...</em>.</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...да KMail може да прикаже траку са бојом која означава врсту\n"
-"поруке (обичан текст/HTML/OpenPGP) која је тренутно приказана?</p>\n"
-"<p>Ово осујећује покушаје да се лажира успешна провера потписа\n"
-"слањем HTML порука које глуме KMail-ове статусне оквире.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...да можете филтрирати по било ком заглављу једноставно\n"
-"уносећи његово име у прво поље за уређивање правила претраге?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...да можете исфилтрирати само-HTML поруке правилом\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...да је када одговарате само означени део поруке цитиран?</p>\n"
-"<p>Ако ништа није означено цела порука је цитирана.</p>\n"
-"<p>Ово ради чак и за текстуалне прилоге када користите\n"
-"<em>Приказ-&gt;Прилози-&gt;Уграђено</em>.</p>\n"
-"<p>Ова опција је доступна за све наредбе одговора сем за\n"
-"<em>Порука-&gt;Одговори без цитата</em>.</p>\n"
-"<p align=\"right\"><em>послао Дејвид Ф. Њуман (David F. Newman)</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Нема акција за опозивање."
@@ -15083,6 +12982,15 @@ msgstr "Прилог: #%1 (без имена)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Прикажи дневник ревизије GnuPG-а за ову операцију"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Фајл са именом „%1“ већ постоји. Желите ли да га пребришете?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Пребриши фајл?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15200,13 +13108,13 @@ msgstr "Пошаљи &слику са сваком поруком"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Укључите ово ако желите да KMail дода тзв. заглавље X-Face порукама писаним под "
-"овим идентитетом. X-Face је мала (48x48 пиксела) црно-бела слика коју неки "
-"е-поштански клијенти могу да прикажу."
+"Укључите ово ако желите да KMail дода тзв. заглавље X-Face порукама писаним "
+"под овим идентитетом. X-Face је мала (48x48 пиксела) црно-бела слика коју "
+"неки е-поштански клијенти могу да прикажу."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15234,13 +13142,14 @@ msgstr "Изаберите фајл..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Употребите ово да бисте изабрали фајл са сликом према коме ће црно-бела слика "
-"бити направљена. Слика у фајлу би требало да буде са високим контрастом и скоро "
-"квадратним обликом. Светла позадина такође побољшава резултат."
+"Употребите ово да бисте изабрали фајл са сликом према коме ће црно-бела "
+"слика бити направљена. Слика у фајлу би требало да буде са високим "
+"контрастом и скоро квадратним обликом. Светла позадина такође побољшава "
+"резултат."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15248,21 +13157,21 @@ msgstr "Постави из адресара"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Можете употребити умањену верзију слике коју сте поставили уз свој унос у "
 "адресару."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail може да шаље мале слике (48x48 пиксела), ниског квалитета и "
-"црно-беле, са сваком поруком. На пример, то може бити ваша слика или неки "
-"симбол. Приказује се у поштанском клијенту примаоца (ако је подржано)."
+"<qt>KMail може да шаље мале слике (48x48 пиксела), ниског квалитета и црно-"
+"беле, са сваком поруком. На пример, то може бити ваша слика или неки симбол. "
+"Приказује се у поштанском клијенту примаоца (ако је подржано)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15270,11 +13179,11 @@ msgstr "Употребите ово поље да бисте унели прои
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Примери су доступни на <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Примери су доступни на <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
+"www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15289,128 +13198,1781 @@ msgstr "Нема слике"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Нисте дефинисали сопствени контакт у адресару."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Укупно: %2<br>Непрочитано: %3<br>Величина: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Потписивање"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Квота: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Аутоматски потписуј поруке"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Постави тему поруке"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Када је ова опција укључена, подразумевано ће све поруке које шаљете поруке "
+"бити потписане. Наравно, још увек је могуће искључити потписивање за сваку "
+"поруку понаособ."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Пошаљи CC: на „адресу“"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Шифровање"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Пошаљи BCC: на „адресу“"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "Када се шифрују поруке, увек ш&ифруј и сертификат мог идентитета"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Додај „заглавље“ поруци"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Када је ова опција укључена, порука/фајл неће бити шифрована само "
+"примаочевим јавним кључем, већ и вашим. Ово ће вам омогућити да дешифрујете "
+"поруку/фајл у неком каснијем тренутку, што је обично добра идеја."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Читај тело поруке из „фајла“"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Прикажи &потписан/шифрован текст после састављања"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Постави тело поруке"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Када је ова опција укључена, потписан/шифрован текст ће бити приказан у "
+"одвојеном прозору, омогућавајући вам да знате како ће изгледати пре слања. "
+"Ово је добра идеја када проверавате да ли ваш систем за шифровање ради."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Додај прилог поруци. Ово се може понављати"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Похрани послате поруке ши&фровано"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Само провери да ли има нове поште"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Кликните овде да бисте похрањивали поруке у шифрованом облику "
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Само отвори прозор састављача"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Похрањивање порука у шифрованом облику</h1>\n"
+"Када је ова опција укључена, послате поруке се похрањују шифроване. Ово није "
+"препоручљиво пошто нећете моћи да читате поруке када потребни сертификат "
+"истекне.\n"
+"<p>\n"
+"Ипак, можда постоје локална правила која налажу да укључите ову опцију. Ако "
+"нисте сигурни, питајте вашег локалног администратора.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Прикажи дати фајл поруке"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Увек прикажи кључеве за шифровање &ради одобрења"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Пошаљи поруку на „адресу“ и приложи фајл на који „URL“ указује."
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Када је ова опција укључена, програм ће вам увек приказати листу јавних "
+"кључева из које можете изабрати онај који ћете користити за шифровање. Ако "
+"је искључена, програм ће приказати дијалог само ако не може да нађе прави "
+"кључ или ако их има неколико који могу бити употребљени."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "прочитана"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Аутоматски шифруј поруке &кад год је то могуће"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "стара"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Када је ова опција укључена, све ће поруке подразумевано бити шифроване кад "
+"год је то могуће и пожељно. Наравно, још увек је могуће искључити аутоматско "
+"шифровање за сваку поруку понаособ."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "обрисана"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Никад не потписуј/шифруј приликом снимања као не&довршено"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "одговорена"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Како ово ради?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "прослеђена"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Универзална"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "стављена у ред"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Одговор"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "послата"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Одговор свима"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "посматрана"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Прослеђена"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "игнорисана"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Пречица:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "спам"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Тип шаблона:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "хам"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Садржај шаблона"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "посао"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Пречица шаблона"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "садржи прилог"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Тип шаблона"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 од %2 %3 искоришћено"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Својства фасцикле"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Путања"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Фасцикла садржи &дискусиону листу"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Адреса листе:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "У&обичајена:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Непрочитана:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Застаревање порука"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "И&збаци после:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Избаци п&рочитане поруке"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Избаци по&сле:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Избаци &непрочитане поруке"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Дана"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Седмица"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Месеци"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Напредно"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Идентитет пошиљао&ца:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Формат похрањивања:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Прикази &листа:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Пошаљи спремљену пошту при провери поште"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Фајл са именом „%1“ већ постоји. Желите ли да га пребришете?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Изаберите да ли желите да KMail шаље све поруке у одлазном сандучету "
+"при ручној или при свим проверама поште, или чак да уопште не желите "
+"аутоматско слање порука.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Пребриши фајл?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Аутоматски премести несинхорнизовану пошту из фасцикли са недовољним правима "
+"приступа"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Ако у фасцикли има нових порука које још увек нису послате на сервер, али "
+"немате довољна права приступа за фасциклу да бисте их послали, те поруке ће "
+"бити аутоматски премештене у фасциклу изгубљеног и нађеног."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Локалне заставице могуће у фасциклама само-за-читање"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Ова поставка омогућава администраторима да подесе најмањи период између две "
+"провере поште. Корисник неће моћи да изабере мању вредност од овде наведене."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Најскорије изабрана фасцикла у дијалогу за избор фасцикли."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Занемари корисников umask и користи „читање-писање само за корисника“ уместо "
+"тога"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Политика приказивања иконе у системској касети"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Затвори програм када се затвори главни прозор, чак и ако је активна икона у "
+"системској касети."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Опширно обавештење о новој пошти"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Ако је ова опција укључена, у обавештењу о новој пошти биће приказан број "
+"новопристиглих порука за сваку фасциклу. У супротном, добићете само "
+"једноставну поруку „Стигла вам је пошта“."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Наведите у&ређивач:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Користи &спољни уређивач уместо састављача"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "Праг упозоравања корисника да се фасцикла ближи ограничењу квоте."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Укључи groupware функционалност"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Обрни „Од:/За:“ заглавља у одговорима на одговоре"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft-ов Outlook има бројне недостатке у својој имплементацији iCalendar "
+"стандарда; ова опција је ту да заобиђе један од њих. Ако имате проблема са "
+"корисницима Outlook-а који не могу да добију ваше одговоре, покушајте да "
+"укључите ову опцију."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Пошаљи groupware позивнице у телу поруке"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft-ов Outlook има бројне недостатке у својој имплементацији iCalendar "
+"стандарда; ова опција је ту да заобиђе један од њих. Ако имате проблема са "
+"корисницима Outlook-а који не могу да добију ваше позивнице, покушајте да "
+"укључите ову опцију."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Именовање позивница компатибилно са Exchange-ом"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft-ов Outlook, када се користе заједно са Microsoft-овим Exchange "
+"сервером, има проблема са разумевањем стандарду-сагласним groupware е-"
+"порукама. Укључите ову опцију да би се groupware позивнице слале на начин "
+"који Exchange сигурно разуме."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Када је ово укључено, нећете видети прозор састављача поруке. Уместо тога, "
+"све поруке са позивницама шаљу се аутоматски. Ако желите да видите поруку "
+"пре слања, можете искључити ову опцију. Међутим, будите свесни да је текст у "
+"прозору састављача написан по синтакси iCalendar-а, због чега не би требало "
+"ручно да га мењате."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Обриши позивнице пошто се пошаље одговор на њих"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Ако је укључено, примљене е-поруке позивница на које се се одговори "
+"премештају се у фасциклу смећа, чим се одговор успешно пошаље."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Укључивање овога чини могућим складиштење ставки из контакт-програма "
+"(KOrganizer, KAddressBook и KNotes.)</p><p>Ако желите да користите ову "
+"опцију, морате такође подесити програме да користе IMAP ресурс; ово се ради "
+"у Контролном центру TDE-а.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Обично нема разлога да видите фасцикле које садрже IMAP ресурсе. Али ако "
+"је потребно да их видите, можете то поставити овде.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Ако се налог за складиштење groupware података не користи за управљање "
+"обичном поштом, укључите ову опцију да би се за њега приказивале само "
+"groupware фасцикле. Ово је корисно када обичном поштом управљате преко "
+"додатног IMAP налога на вези.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Изаберите формат складиштења за groupware фасцикле. <ul><li>Подразумевани "
+"формати су ical (за календарске фасцикле) и vcard (за адресарске фасцикле). "
+"Ови формати чине доступним све могућности Kontact-а.</li><li>Формат Kolab "
+"XML користи посебан модел који ближе одговара ономе који се користи у "
+"Outlook-у. Овај формат даје већу компатибилност са Outlook-ом, приликом "
+"употребе Kolab сервера или компатибилног решења.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Ово бира родитеља IMAP ресурсних фасцикли.</p><p>Подразумевано, Kolab "
+"сервер поставља да долазно IMAP сандуче буде родитељ.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Ово је ид. налога који садржи IMAP ресурсне фасцикле.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Ако желите да поставите имена фасцикли IMAP складиштења на свој језик, "
+"можете изабрати између доступних језика.</p><p>Једини разлог за овако нешто "
+"је очување компатибилности са Microsoft-овим Outlook-ом. Постављање овога "
+"сматра се лошом идејом, пошто чини промену језика немогућом.</p><p>Зато не "
+"користите ово ако не морате.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Такође филтрирај нову пошту примљену у groupware фасциклама."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr "Синхорнизуј groupware измене у IMAP фасциклама чим се пређе на везу."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Ова вредност се користи да би се назначило да ли приказивати „Увод у KMail“."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Максималан број веза по домаћину"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ово се може користити за ограничавање броја веза по домаћину док се добавља "
+"нова пошта. Подразумевно је број веза неограничен (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Прикажи линију за брзу претрагу"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ова опција укључује или искључује линију за претрагу изнад листе порука, "
+"помоћу које се може брзо потражити информација приказана у листи порука."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Сакриј локално пријемно сандуче ако се не користи"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Прослеђивање у линији као подразумевано."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "Тачка-зарез (;) дозвољена као раздвајач у састављачу порука."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Задржи оригинални скуп знакова приликом одговарања или прослеђивања (ако је "
+"могуће)"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "А&утоматски уметни потпис"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Запамти овај идентитет, како би се користио и у будућим прозорима "
+"састављача.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Запамти ову фасциклу за послате поруке, како би се користила и у будућим "
+"прозорима састављача."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Запамти овај транспорт поште, како би се користио и у будућим прозорима "
+"састављача."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Запамти овај идентитет, како би се користио и у будућим прозорима "
+"састављача.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Прелом &текста на колони:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Максималан број линија уређивача прималаца."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Укључите ову опцију ако желите да Outlook &#8482; разуме имена прилога која "
+"садрже неенглеска слова"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Ауто&матски захтевај обавештења о распоређивању поруке"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Укључите ову опцију ако желите да KMail захтева обавештења о "
+"распоређивању поруке (MDN) за сваку вашу одлазећу поруку.</p><p>Ова опција "
+"утиче само на подразумевано; у састављачу увек можете укључити или искључити "
+"захтевање MDN-a за сваку поруку преко ставке у менију <em>Опције</em>-&gt;"
+"<em>Захтевај овавештење о распоређивању</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Користи скорашње е-дресе за самодовршавање"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Искључите ову опцију ако не желите да се скоро коришћене адресе појављују на "
+"листи за самодовршавање у пољу адресе састављача."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Период аутоматског снимања:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Резервна копија текста у прозору састављача може се регуларно правити. Овде "
+"се поставља период после кога се прави резерва. Можете искључити аутоматско "
+"снимање постављањем периода на 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Умећи потписе изнад цитираног текста"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Замени препознати префи&кс са „Одг. :“"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Замени препознати префикс са „&Прос. :“"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Користи паметно &цитирање"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Потпис је истекао."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Врста избора примаоца"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr "Поставља врсту дијалога за избор прималаца у пољима За, CC и BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Врста уређивача прималаца"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "Поставља врсту уређивача прималаца, за уређивање поља За, CC и BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Максималан број линија уређивача прималаца."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Листа типова делова порука које треба уклонити када се порука прослеђује у "
+"линији."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Највећа величина у мегабајтима коју могу имати прилози."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Прикажи панел за уметање и управљање исечцима текста у састављачу."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Прикажи дневник ревизије GnuPG-а чак и када је шифрарски поступак успешно "
+"довршен."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Задржи оригинални скуп знакова приликом одговарања или прослеђивања (ако је "
+"могуће)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Неке е-поруке, посебно оне аутоматски генерисане, не наводе кодирање знакова "
+"које се мора користити да би се правилно приказале. У таквим случајевима "
+"користи се одступно кодирање, које можете задати овде. Поставите га на "
+"кодирање које се најчешће користи у вашем крају света. Као подразумевано, "
+"користи се кодирање подешено на нивоу целог система."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Промена овог са подразумеваног, „аутоматски“, условиће коришћење наведеног "
+"кодирања за све е-поруке, без обзира шта оне саме наводе."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Укључите ово ако желите да се смешко као :-) који се појављују у тексту "
+"замене емотиконима (малим сликама)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Укључите ову опцију да би се приказивали различити нивои цитираног текста. "
+"Искључите да бисте их сакрили."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Ниво аутоматског сажимања:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Смањи величину фонта за цитиран текст"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Укључите ову опцију да би се цитирани текст приказивао са мањим фонтом."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Похрани послате поруке ши&фровано"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Прикажи кориснички агент у помодним заглављима"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Укључите ову опцију ако желите да се линије заглавља User-Agent и X-Mailer "
+"приказују у помодним заглављима."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Омогући брисање прилога постојећих порука."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Омогући уређивање прилога постојећих порука."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Увек дешифровати поруке при прегледу или питати претходно"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Шаљи обавештења о распоређивању порука са празним пошиљаоцем."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Шаљи обавештења о распоређивању порука са празним знаковним низом пошиљаоца. "
+"Неки сервери могу бити подешени да одбацују такве поруке, тако да ако имате "
+"проблема са слањем MDN-ова, искључите ову опцију."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Фразе су претворене у шаблоне"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Старе фразе су претворене у шаблоне"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Шаблон поруке за нову поруку"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Шаблон поруке за одговор"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Шаблон поруке за одговор свима"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Шаблон поруке за прослеђивање"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Знакови цитирања"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Дозволи кориснику да мења поставке „ван канцеларије“."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Дозволи кориснику да шаље сито-скрипте „ван канцеларије“, али забрани "
+"промену поставки, као нпр. домен на који се реагује и прекидач за спам."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "Шаљи „ван канцеларије“ само на поруке пристигле са овог домена."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "Дозволи слање „ван канцеларије“ на поруке означене као спам."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Провери да ли је и даље постављен одговор „ван канцеларије“ при покретању "
+"KMail-а."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Уреди &фајл"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Уреди..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Иди"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Фасцикла"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Порука"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Одговори посебно"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Проследи"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Облачићи"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Поставке исечка"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML трака"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Уобичајене опције"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML трака"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Проверавај сертификате помоћу CRL-ова"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Ако је ова опција изабрана, S/MIME сертификати проверавају се користећи "
+"листе опозивања сертификата (CRL-ове)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Провери сертификате на вези (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Ако је ова опција изабрана, S/MIME сертификати проверавају се на вези "
+"користећи протокол за статус сертификата на вези (OCSP). Попуните испод URL "
+"OCSP респондера."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Провера сертификата на вези"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL OCSP респондера:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Овде унесите адресу сервера за проверу сертификата на вези (OCSP "
+"респондера). URL обично почиње са http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Потпис OCSP респондера:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Игнориши сервисни URL сертификата"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Немој да провераваш политике сертификата"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Подразумевано GnuPG користи фајл ~/.gnupg/policies.txt да провери да ли је "
+"политика сертификата дозвољена. Ако је ова опција изабрана, политике неће "
+"бити провераване."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Никада не разматрај CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ако је ова опција укључена, листе опозивања сертификата никада се не користе "
+"за проверу S/MIME сертификата."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Преузми недостајуће сертификате издавача"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Ако је ова опција укључена, недостајући сертификати издавача се преузимају "
+"када је потребно (ово важи за оба метода провере, CRL-ове и OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP захтеви"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Не извршавај ниједан HTTP захтев"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Потпуно искључује употребу HTTP-а за S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Користи овај прокси за HTTP захтеве: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Користи системски HTTP прокси:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Ако је ова опција изабрана, вредност HTTP проксија приказана лево (долази из "
+"променљиве окружења http_proxy) биће коришћена за све HTTP захтеве."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Унесите овде локацију HTTP проксија који треба користити за све HTTP захтеве "
+"у вези са S/MIME-овима. Синтакса је domacin:port, нпр. mojproksi.nigde."
+"com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Игнориши дистрибуциону тачку HTTP CRL-ова сертификата"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"При тражењу локације CRL-а, сертификат који ће бити тестиран обично садржи "
+"уносе за  такозване „дистрибуционе тачке CRL-ова“ (DP); то су URL-ови који "
+"описују начин приступа до CRL-ова. Користи се први пронађени DP унос. Овом "
+"опцијом игноришу се сви уноси који користе HTTP шему при тражењу погодне DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP захтеви"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Не извршавај ниједан LDAP захтев"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Потпуно искључује употребу LDAP-а за S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Игнориши дистрибуциону тачку LDAP CRL-ова сертификата"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"При тражењу локације CRL-а, сертификат који ће бити тестиран обично садржи "
+"уносе за  такозване „дистрибуционе тачке CRL-ова“ (DP); то су URL-ови који "
+"описују начин приступа до CRL-ова. Користи се први пронађени DP унос. Овом "
+"опцијом игноришу се сви уноси који користе LDAP шему при тражењу погодне DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Примарни домаћин за LDAP захтеве:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Сви LDAP захтеви ће прво ићи на LDAP сервер који овде унесете. Прецизније, "
+"ово подешавање гази било који домаћин и порт наведен у LDAP URL-у, а користи "
+"се и ако су домаћин и порт изостављени у URL-у. Други LDAP сервери користе "
+"се само ако веза са проксијем не успе.\n"
+"Синтакса је „DOMACIN“ или „DOMACIN:PORT“. Ако се порт изостави, користиће се "
+"389 (стандардни LDAP порт)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Додај исечак"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Додај"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Исечак:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Група:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Поставке исечка"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Облачићи"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Прикажи текст исечка у &облачићу"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "Одређује да ли се даје облачић са текстом из маркиране линије"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Променљиве"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Метод уноса за променљиве"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Јединствени дијалог за сваку променљиву у исечку"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "За сваку променљиву у оквиру исечка даје се дијалог за унос"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Један дијалог за све променљиве у исечку"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Даје се један једини дијалог у коме можете унети вредности свих променљивих "
+"у оквиру исечка."
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Раздвајач:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Одговор пошиљаоцу"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Одговор свима / одговор на листу"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Прослеђена порука"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Упозори при покушају слања &непотписаних порука"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Укључите ово ако желите да будете упозорени при слању непотписаних порука."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење при покушају слања непотписаних порука</h1>\n"
+"Ако је ова опција укључена, бићете упозорени када покушате да пошаљете "
+"делове или целу поруку непотписану.\n"
+"<p>\n"
+"Препоручљиво је оставити ову опцију укључену за максимални интегритет.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Упозори при покушају слања нешифрованих порука"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Укључите ову опцију ако желите да будете упозорени при слању нешифрованих "
+"порука."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење при слању нешифрованих порука</h1>\n"
+"Ако је ова опција укључена, бићете упозорени када покушате да пошаљете "
+"делове или целу поруку нешифровану.\n"
+"<p>\n"
+"Препоручљиво је оставити ову опцију укључену за максимални интегритет.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Упозори ако е-адреса п&римаоца није у сертификату"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Укључите ову опцију ако желите да будете упозорени ако адреса није у "
+"сертификату"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење ако примаочева е-адреса није у сертификату</h1>\n"
+"Ако је ова опција укључена, бићете упозорени ако е-адреса примаоца није "
+"садржана у сертификату који се користи за шифровање.\n"
+"<p>\n"
+"Ради максималне безбедности препоручује се да ову опцију држите укљученом.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Упозори ако сертификати/кључеви ускоро истичу (испод подесите прагове)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "За потписивање"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "За шифровање"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Овде одаберите број дана"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење ако сертификат за потписивање истиче</h1>\n"
+"Одаберите најмањи број дана за које би сертификат за потписивање требало да "
+"буде важећи пре давања обавештења.\n"
+"<p>\n"
+"Препоручена поставка за SPHINX је четрнаест дана.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење ако сертификат за шифровање истиче</h1>\n"
+"Одаберите најмањи број дана за које би сертификат за шифровање требало да "
+"буде важећи пре давања обавештења.\n"
+"<p>\n"
+"Препоручена поставка за SPHINX је четрнаест дана.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење ако сертификат у ланцу истиче</h1>\n"
+"Одаберите најмањи број дана за које би сви сертификати у ланцу требало да "
+"буду важећи пре давања упозорења.\n"
+"<p>\n"
+"Препоручена поставка за SPHINX је четрнаест дана.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење ако CA сертификат истиче</h1>\n"
+"Одаберите најмањи број дана за које би CA сертификат требало да буде важећи "
+"пре давања обавештења.\n"
+"<p>\n"
+"Препоручена поставка за SPHINX је четрнаест дана.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Упозорење ако корени сертификат истиче</h1>\n"
+"Одаберите најмањи број дана за које би корени сертификат требало да буде "
+"важећи пре давања обавештења.\n"
+"<p>\n"
+"Препоручена поставка за SPHINX је четрнаест дана.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "За корене сертификате:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "За посредничке CA сертификате:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "За крајње корисничке сертификате/кључеве:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Поново укључи сва искључена упозорења"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...да можете ићи на следећу или претходну поруку користећи леву или десну "
+"стрелицу на тастатури?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...да можете брзо да направите филтере по пошиљаоцу,\n"
+"примаоцу и дискусионој листи користећи <em>Алати-&gt;Направи&nbsp;филтер</"
+"em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...да се можете отарасити „[имена дискусионе листе]“\n"
+"које се додаје теми у неким литама користећи филтерску\n"
+"акцију <em>поново напиши заглавље</em>? Само искористите\n"
+"<pre>rewrite header &quot;Тема&quot;\n"
+"   replace &quot;\\s*\\[име дискусионе листе\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...да можете да придружите дискусиону листу фасцикли у дијалогу\n"
+"<em>Фасцикла-&gt;Управљање дискусионом листом...</em>? Онда можете "
+"користити\n"
+"<em>Порука-&gt;Нова&nbsp;порука&nbsp;у&nbsp; дискусионој&nbsp;листи...</em>\n"
+"да отворите састављач са постављеном адресом дискусионе листе.\n"
+"Другачије, можете кликнути средњим тастером миша на фасциклу.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...да можете доделите посебне иконе свакој фасцикли?\n"
+"Погледајте <em>Фасцикла-&gt;Својства...</em>.</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...да KMail може да прикаже траку са бојом која означава врсту\n"
+"поруке (обичан текст/HTML/OpenPGP) која је тренутно приказана?</p>\n"
+"<p>Ово осујећује покушаје да се лажира успешна провера потписа\n"
+"слањем HTML порука које глуме KMail-ове статусне оквире.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...да можете филтрирати по било ком заглављу једноставно\n"
+"уносећи његово име у прво поље за уређивање правила претраге?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...да можете исфилтрирати само-HTML поруке правилом\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...да је када одговарате само означени део поруке цитиран?</p>\n"
+"<p>Ако ништа није означено цела порука је цитирана.</p>\n"
+"<p>Ово ради чак и за текстуалне прилоге када користите\n"
+"<em>Приказ-&gt;Прилози-&gt;Уграђено</em>.</p>\n"
+"<p>Ова опција је доступна за све наредбе одговора сем за\n"
+"<em>Порука-&gt;Одговори без цитата</em>.</p>\n"
+"<p align=\"right\"><em>послао Дејвид Ф. Њуман (David F. Newman)</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Прикажи линију за брзу претрагу фасцикли"
diff --git a/tde-i18n-sr@Latn/messages/tdepim/kmail.po b/tde-i18n-sr@Latn/messages/tdepim/kmail.po
index 88c6eb581d3..e70ea8805fc 100644
--- a/tde-i18n-sr@Latn/messages/tdepim/kmail.po
+++ b/tde-i18n-sr@Latn/messages/tdepim/kmail.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-16 13:31+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"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"
+"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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Toplica Tanasković,Slobodan Simić"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "Nij&edan (koristiti sa oprezom)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Nalog za poluatomatsko rukovanje resursima"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Obriši prošle"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -248,13 +254,13 @@ msgstr "&Korisnik:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Vaš internet provajder vam je dao <em>korisničko ime</em> "
-"koje se koristi za vaše prijavljivanje na njihove servere. To je obično deo "
-"e-adrese (deo pre <em>@</em>)."
+"Vaš internet provajder vam je dao <em>korisničko ime</em> koje se koristi za "
+"vaše prijavljivanje na njihove servere. To je obično deo e-adrese (deo pre "
+"<em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -275,20 +281,20 @@ msgstr "Poh&rani POP lozinku"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Uključite ovu opciju ako želite da KMail pohrani lozinku.\n"
 "Ako je TDEWallet dostupan lozinka će biti pohranjena u njemu, što se smatra "
 "bezbednim.\n"
 "Međutim, ako TDEWallet nije dostupan, lozinka će biti pohranjena u fajl sa "
 "podešavanjima KMail-a. Lozinka se pohranjuje u zamućenom obliku, ali se ne "
-"treba smatrati bezbednom protiv dešifrovanja ako neko uspe da se domogne fajla "
-"sa podešavanjima."
+"treba smatrati bezbednom protiv dešifrovanja ako neko uspe da se domogne "
+"fajla sa podešavanjima."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -316,11 +322,12 @@ msgstr "&Filtriraj poruke ako su veće od"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Ako izaberete ovu opciju, POP filteri će biti korišćeni za odlučivanje šta da "
-"se radi sa porukama. Možete ih tada označiti za preuzimanje, brisanje ili "
+"Ako izaberete ovu opciju, POP filteri će biti korišćeni za odlučivanje šta "
+"da se radi sa porukama. Možete ih tada označiti za preuzimanje, brisanje ili "
 "držanje na serveru."
 
 #: accountdialog.cpp:737
@@ -370,13 +377,15 @@ msgstr "Običan te&kst"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -419,14 +428,14 @@ msgstr "Imenski prostori:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Ovde možete videti različite imenske prostore koje vaš IMAP server podržava. "
-"Svaki imenski prostor predstavlja prefiks koji izdvaja grupe fascikli. Imenski "
-"prostor omogućava KMail-u da prikaže vašu ličnu fasciklu i deljene fascikle u "
-"jednom nalogu."
+"Svaki imenski prostor predstavlja prefiks koji izdvaja grupe fascikli. "
+"Imenski prostor omogućava KMail-u da prikaže vašu ličnu fasciklu i deljene "
+"fascikle u jednom nalogu."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -484,12 +493,12 @@ msgstr "Učitaj pri&loge na zahtev"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Aktivirajte ovo da se prilozi ne bi automatski učitavali kada izaberete "
-"e-poruku, već tek kada kliknete na prilog. Ovako se i velike e-poruke mogu "
+"Aktivirajte ovo da se prilozi ne bi automatski učitavali kada izaberete e-"
+"poruku, već tek kada kliknete na prilog. Ovako se i velike e-poruke mogu "
 "trenutno prikazati."
 
 #: accountdialog.cpp:1009
@@ -501,8 +510,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Samo u fasciklama koje su otvorene (raširene) u stablu fascikli proveravaju se "
-"podfascikle. Koristite ovo ako ima mnogo fascikli na serveru."
+"Samo u fasciklama koje su otvorene (raširene) u stablu fascikli proveravaju "
+"se podfascikle. Koristite ovo ako ima mnogo fascikli na serveru."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -530,7 +539,7 @@ msgstr "<nema>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "pristigle"
 
@@ -538,8 +547,8 @@ msgstr "pristigle"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Server izgleda ne podržava jedinstvene brojeve poruka, a to je neophodno za "
 "ostavljanje poruka na serveru.\n"
@@ -550,27 +559,28 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Server izgleda ne podržava preuzimanje zaglavlja poruka, a to je neophodno za "
-"filtriranje poruka na serveru.\n"
+"Server izgleda ne podržava preuzimanje zaglavlja poruka, a to je neophodno "
+"za filtriranje poruka na serveru.\n"
 "Pošto neki serveri ne objavljuju ispravno svoje sposobnosti, i dalje možete "
 "uključiti filtriranje poruka na serveru."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
-"Imajte na umu da ova mogućnost može prouzrokovati da neki POP3 serveri koji ne "
-"podržavaju protočnu obradu mogu slati neispravne poruke.\n"
+"Imajte na umu da ova mogućnost može prouzrokovati da neki POP3 serveri koji "
+"ne podržavaju protočnu obradu mogu slati neispravne poruke.\n"
 "Ovo je podesivo zato što neki serveri podržavaju protočnu obradu ali ne "
 "objavljuju svoje sposobnosti. Da biste proverili da li vaš POP3 server "
 "objavljuje da podržava protočnu obradu, upotrebite dugme „Proveri šta server "
@@ -584,30 +594,30 @@ msgstr "Naznačite prvo server i port u jezičku Opšte."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Server izgleda ne podržava protočnu obradu, stoga je ova opcija isključena.\n"
 "Pošto neki serveri ne objavljuju ispravno svoje sposobnosti, i dalje možete "
 "uključiti protočnu obradu. Samo pazite, ova mogućnost može prouzrokovati da "
 "neki POP serveri koji ne podržavaju protočnu obradu šalju iskvarene poruke. "
-"Zato pre korišćenja ove mogućnosti za važnu poštu, trebalo bi da je isprobate "
-"slanjem većeg broja probnih poruka sami sebi i njihovim preuzimanjem sa POP "
-"servera u jednom potezu."
+"Zato pre korišćenja ove mogućnosti za važnu poštu, trebalo bi da je "
+"isprobate slanjem većeg broja probnih poruka sami sebi i njihovim "
+"preuzimanjem sa POP servera u jednom potezu."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Server izgleda ne podržava jedinstvene brojeve poruka, a to je neophodno za "
 "ostavljanje poruka na serveru; stoga je ova opcija isključena.\n"
@@ -619,11 +629,11 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Server izgleda ne podržava preuzimanje zaglavlja poruka, a to je neophodno za "
-"filtriranje poruka na serveru; stoga je ova opcija isključena.\n"
+"Server izgleda ne podržava preuzimanje zaglavlja poruka, a to je neophodno "
+"za filtriranje poruka na serveru; stoga je ova opcija isključena.\n"
 "Pošto neki serveri ne objavljuju ispravno svoje sposobnosti, i dalje možete "
 "uključiti filtriranje poruka na serveru."
 
@@ -708,8 +718,8 @@ msgstr "IMAP nalog"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "Morate dodati nalog u mrežnom odeljku postavki da biste primali poštu."
 
 #: accountwizard.cpp:87
@@ -746,13 +756,13 @@ msgstr "Dobrodošli u KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>Izgleda da ste KMail pokrenuli po prvi put. Možete koristiti ovog "
-"čarobnjaka da podesite vaše poštanske naloge. Samo unesite podatke o vezi koje "
-"ste dobili od vašeg provajdera e-pošte u narednim stranicama.</qt>"
+"čarobnjaka da podesite vaše poštanske naloge. Samo unesite podatke o vezi "
+"koje ste dobili od vašeg provajdera e-pošte u narednim stranicama.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -814,8 +824,7 @@ msgstr "Koristi lokalno isporučivanje"
 msgid "Server Information"
 msgstr "Podaci o serveru"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nijedan"
@@ -953,29 +962,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Ovde možete dobiti pomoć u postavljanju filterskih pravila KMail-a radi "
-"korišćenja nekih poznatijih protiv virusnih alata.</p>"
-"<p>Čarobnjak može da detektuje te alate na vašem računaru, kao i da napravi "
-"filterska pravila za razvrstavanje poruka upotrebom tih alata i odvajanje "
-"poruka označenih da sadrže virus. Čarobnjak neće uzeti u obzir postojeća "
-"filterska pravila, samo će eventualno dodati nova.</p>"
-"<p><b>Upozorenje:</b> Pošto KMail deluje blokirano tokom skeniranja poruka u "
-"potrazi za virusima, možete susresti probleme sa odzivom KMail-a zato što "
-"operacije protivvirusnih alata obično dugo traju. Ako želite da vratite "
-"prethodno ponašanje, možete obrisati filterska pravila koja je čarobnjak "
-"napravio."
+"korišćenja nekih poznatijih protiv virusnih alata.</p><p>Čarobnjak može da "
+"detektuje te alate na vašem računaru, kao i da napravi filterska pravila za "
+"razvrstavanje poruka upotrebom tih alata i odvajanje poruka označenih da "
+"sadrže virus. Čarobnjak neće uzeti u obzir postojeća filterska pravila, samo "
+"će eventualno dodati nova.</p><p><b>Upozorenje:</b> Pošto KMail deluje "
+"blokirano tokom skeniranja poruka u potrazi za virusima, možete susresti "
+"probleme sa odzivom KMail-a zato što operacije protivvirusnih alata obično "
+"dugo traju. Ako želite da vratite prethodno ponašanje, možete obrisati "
+"filterska pravila koja je čarobnjak napravio."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1011,15 +1018,13 @@ msgstr "Premesti &mogući spam u:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Podrazumevana fascikla je Pristigle ali vi možete to izmeniti u prikazu "
-"fascikli ispod. "
-"<p>Ne posržavaju svi alati razvrstavanje kao mogući spam. Ako niste izabrali "
-"alat koji to može nećete moći ni da izaberete fasciklu."
+"fascikli ispod. <p>Ne posržavaju svi alati razvrstavanje kao mogući spam. "
+"Ako niste izabrali alat koji to može nećete moći ni da izaberete fasciklu."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1029,13 +1034,13 @@ msgstr "Proveri poruke pomoću protiv virusnih alata"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"Pustite protiv virusne alate da razvrstaju vaše poruke. Čarobnjak će napraviti "
-"odgovarajuće filtere. Alati obično prvo označe poruke tako da filteri mogu da "
-"reaguju na osnovu toga, i, na primer, premeste poruke označene kao da sadrže "
-"virus u posebnu fasciklu."
+"Pustite protiv virusne alate da razvrstaju vaše poruke. Čarobnjak će "
+"napraviti odgovarajuće filtere. Alati obično prvo označe poruke tako da "
+"filteri mogu da reaguju na osnovu toga, i, na primer, premeste poruke "
+"označene kao da sadrže virus u posebnu fasciklu."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1044,8 +1049,8 @@ msgstr "Premesti poruke detektovane kao zaražene u izabranu fasciklu"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Naprevljen je filter za detektovanje poruka svrstanih u zaražene i njihovo "
 "premeštanje u predefinisanu fasciklu. Podrazumevana fascikla je Smeće, ali "
@@ -1057,8 +1062,8 @@ msgstr "Dodatno, označi pročitanim poruke detektovane kao zaražene"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Označava poruke detektovane kao zaražene pročitanim i premešta ih u izabranu "
 "fasciklu."
@@ -1242,8 +1247,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Ovo može biti zato što nemata dozvole da to uradite, ili zato što je fascikla "
-"već prisutna na serveru. Poruka o grešci iz komunikacije sa serverom je ovde:"
+"Ovo može biti zato što nemata dozvole da to uradite, ili zato što je "
+"fascikla već prisutna na serveru. Poruka o grešci iz komunikacije sa "
+"serverom je ovde:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1256,8 +1262,8 @@ msgstr "Greška prilikom čitanja fascikle %1 na serveru: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1277,8 +1283,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1309,20 +1315,20 @@ msgstr "obrisana"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Nijedan od vaših identiteta ne odgovara primaocu ove poruke, "
 "<br>izaberite koja je od sledećih adresa vaša (ako ijedna):"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Nekoliko vaših identiteta odgovara primaocu ove poruke, "
-"<br>izaberite koja je od sledećih adresa vaša:"
+"<qt>Nekoliko vaših identiteta odgovara primaocu ove poruke, <br>izaberite "
+"koja je od sledećih adresa vaša:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1352,18 +1358,21 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ovu postavku je namestio vaš administrator.</p>"
-"<p>Ako mislite da je ovo greška, kontaktirajte ga.</p></qt>"
+"<qt><p>Ovu postavku je namestio vaš administrator.</p><p>Ako mislite da je "
+"ovo greška, kontaktirajte ga.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Učitaj profil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Podesi nalog"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Dodaj..."
@@ -1393,6 +1402,11 @@ msgstr "<qt>Želite li zaista da uklonite identitet sa imenom <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Ukloni identitet"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Ukloni"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Dodaj..."
@@ -1401,6 +1415,11 @@ msgstr "Dodaj..."
 msgid "Modify..."
 msgstr "Izmeni..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Ukloni"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Postavi kao podrazumevan"
@@ -1417,17 +1436,15 @@ msgstr "&Slanje"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Odlazeći nalozi (dodajte barem jedan):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Ime"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Vrsta"
@@ -1449,8 +1466,7 @@ msgstr "Postavi podrazumevano"
 msgid "Common Options"
 msgstr "Uobičajene opcije"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Potvrdi &pre slanja"
@@ -1501,17 +1517,16 @@ msgstr "Podra&zumevani domen:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Podrazumevani domen se koristi za dovršavanje e-adresa koje se sastoje samo "
-"od korisničkog imena.</p></qt>"
+"<qt><p>Podrazumevani domen se koristi za dovršavanje e-adresa koje se "
+"sastoje samo od korisničkog imena.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1529,9 +1544,9 @@ msgstr "Dodaj transport"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (podrazumevani)"
 
@@ -1616,6 +1631,10 @@ msgstr "Izmeni nalog"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Ne mogu da nađem nalog <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Boje"
@@ -1724,8 +1743,7 @@ msgstr "Ispraćena veza"
 msgid "Misspelled Words"
 msgstr "Pogrešno napisane reči"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nova poruka"
@@ -1913,8 +1931,8 @@ msgstr "Lanci su podrazumevano zatvoreni"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Otvori lance koji sadrže nove, nepročitane ili važne &poruke i otvori lance "
 "koji se prate."
@@ -1925,67 +1943,52 @@ msgstr "Prikaz datuma"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Za datum mogu biti korišćeni ovi izrazi:</strong></p>"
-"<ul>"
-"<li>d — dan kao broj bez vodeće nule (1-31)</li>"
-"<li>dd — dan kao broj sa vodećom nulom (01-31)</li>"
-"<li>ddd — skraćeno ime dana (pon - ned)</li>"
-"<li>dddd — puno ime dana (ponedeljak - nedelja)</li>"
-"<li>M — mesec kao broj bez vodeće nule (1-12)</li>"
-"<li>MM — datum kao broj sa vodećom nulom (01-12)</li>"
-"<li>MMM — skraćeno ime meseca (jan - dec)</li>"
-"<li>MMMM — puno ime meseca (januar - decembar)</li>"
-"<li>yy — godina kao dvocifreni broj (00-99)</li>"
-"<li>yyyy — godina kao četvorocifreni broj (0000-9999)</li></ul>"
-"<p><strong>Za vreme mogu biti korišćeni ovi izrazi:</string></p> "
-"<ul>"
-"<li>h — čas bez vodeće nule (0-23 ili 1-12 ako je AM/PM prikaz)</li>"
-"<li>hh — čas sa vodećim nulom (00-23 ili 01-12 ako je AM/PM prikaz)</li>"
-"<li>m — minuti bez vodeće nule (0-59)</li>"
-"<li>mm — minuti sa vodećom nulom (00-59)</li>"
-"<li>s — sekunde bez vodeće nule (0-59)</li>"
-"<li>ss — sekunde sa vodećom nulom (00-59)</li>"
-"<li>z — milisekunde bez vodećih nula (0-999)</li>"
-"<li>zzz — milisekunde sa vodećim nulama (000-999)</li>"
-"<li>AP — prebaci na AM/PM prikaz. AP će biti zamenjeno sa „AM“ ili „PM“.</li>"
-"<li>ap — prebaci na AM/PM prikaz. ap će biti zamenjeno sa „am“ ili „pm“.</li>"
-"<li>Z — vremenska zona u brojevnoj formi (-0500)</li></ul>"
-"<p><strong>Svi ostali znaci će biti ignorisani.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Za datum mogu biti korišćeni ovi izrazi:</strong></"
+"p><ul><li>d — dan kao broj bez vodeće nule (1-31)</li><li>dd — dan kao broj "
+"sa vodećom nulom (01-31)</li><li>ddd — skraćeno ime dana (pon - ned)</"
+"li><li>dddd — puno ime dana (ponedeljak - nedelja)</li><li>M — mesec kao "
+"broj bez vodeće nule (1-12)</li><li>MM — datum kao broj sa vodećom nulom "
+"(01-12)</li><li>MMM — skraćeno ime meseca (jan - dec)</li><li>MMMM — puno "
+"ime meseca (januar - decembar)</li><li>yy — godina kao dvocifreni broj "
+"(00-99)</li><li>yyyy — godina kao četvorocifreni broj (0000-9999)</li></"
+"ul><p><strong>Za vreme mogu biti korišćeni ovi izrazi:</string></p> "
+"<ul><li>h — čas bez vodeće nule (0-23 ili 1-12 ako je AM/PM prikaz)</"
+"li><li>hh — čas sa vodećim nulom (00-23 ili 01-12 ako je AM/PM prikaz)</"
+"li><li>m — minuti bez vodeće nule (0-59)</li><li>mm — minuti sa vodećom "
+"nulom (00-59)</li><li>s — sekunde bez vodeće nule (0-59)</li><li>ss — "
+"sekunde sa vodećom nulom (00-59)</li><li>z — milisekunde bez vodećih nula "
+"(0-999)</li><li>zzz — milisekunde sa vodećim nulama (000-999)</li><li>AP — "
+"prebaci na AM/PM prikaz. AP će biti zamenjeno sa „AM“ ili „PM“.</li><li>ap — "
+"prebaci na AM/PM prikaz. ap će biti zamenjeno sa „am“ ili „pm“.</li><li>Z — "
+"vremenska zona u brojevnoj formi (-0500)</li></ul><p><strong>Svi ostali "
+"znaci će biti ignorisani.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Menjanje globalnih postavki povezivanja u lance će pregaziti sve vrednosti "
 "specifične za fascikle."
@@ -2002,8 +2005,7 @@ msgstr "Prikaži HTML statusnu trak&u"
 msgid "Show s&pam status in fancy headers"
 msgstr "Prikaži &status spama u pomodnim zaglavljima"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Zameni smeškove emotikonima"
@@ -2012,8 +2014,7 @@ msgstr "Zameni smeškove emotikonima"
 msgid "Use smaller font for quoted text"
 msgstr "Koristi manji font za citirani tekst"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Prikaži otvorene/zatvorene navodnike"
@@ -2039,8 +2040,7 @@ msgstr "Automatski"
 msgid "&Override character encoding:"
 msgstr "Pre&gazi kodiranjem znakova:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Uključi ikonu u sistemskoj kaseti"
@@ -2142,21 +2142,19 @@ msgstr "<b>%f</b> će biti zamenjeno imenom fajla za uređivanje."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 "<qt>U frazama za odgovor podržani su sledeći simboli:\n"
-"<br><b>%D</b>: datum, <b>%S</b>: tema, "
-"<br><b>%e</b>: adresa pošiljaoca, <b>%F</b>: ime pošiljaoca, <b>%f</b>"
-": inicijali pošiljaoca,"
-"<br><b>%T</b>: ime primaoca, <b>%t</b>: ime i adresa primaoca"
-"<br><b>%C</b>: imena za kopije, <b>%c</b>: imena i adrese za kopije"
-"<br><b>%%</b>: znak za procenat, <b>%_</b>: razmak, <b>%L</b>: kraj linije</qt>"
+"<br><b>%D</b>: datum, <b>%S</b>: tema, <br><b>%e</b>: adresa pošiljaoca, <b>"
+"%F</b>: ime pošiljaoca, <b>%f</b>: inicijali pošiljaoca,<br><b>%T</b>: ime "
+"primaoca, <b>%t</b>: ime i adresa primaoca<br><b>%C</b>: imena za kopije, <b>"
+"%c</b>: imena i adrese za kopije<br><b>%%</b>: znak za procenat, <b>%_</b>: "
+"razmak, <b>%L</b>: kraj linije</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2179,21 +2177,20 @@ msgstr "Odgovori &svima:"
 msgid "&Forward:"
 msgstr "&Prosledi:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Znak &citata:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Dana %D, napisali ste:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Dana %D, %F je napisao(la):"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Prosleđena poruka"
 
@@ -2231,8 +2228,8 @@ msgstr "Unesite novi prefiks za prosleđivanje:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Ova lista se proverava odozgo na dole za svaku odlazeću poruku, radi "
 "pronalaženja skupa znakova koji sadrži sve zahtevane znake."
@@ -2244,8 +2241,8 @@ msgstr "Unesite skup znakova:"
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"&Zadrži originalni skup znakova prilikom odgovaranja ili prosleđivanja (ako je "
-"moguće)"
+"&Zadrži originalni skup znakova prilikom odgovaranja ili prosleđivanja (ako "
+"je moguće)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2271,10 +2268,9 @@ msgstr "Vrednost"
 msgid "Ne&w"
 msgstr "&Nov"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Ime:"
@@ -2283,19 +2279,18 @@ msgstr "&Ime:"
 msgid "&Value:"
 msgstr "&Vrednost:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Imenovanje priloga kompatibilno sa Outlook-om"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Uključite ovu opciju ako želite da Outlook(tm) razume imena priloga koja sadrže "
-"neengleska slova"
+"Uključite ovu opciju ako želite da Outlook(tm) razume imena priloga koja "
+"sadrže neengleska slova"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2322,20 +2317,20 @@ msgstr "priložen"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Izabrali ste da kodirate imena priloga koja sadrže neengleska slova na način "
 "koji će razumeti Outlook(tm) i drugi poštanski klijenti koji ne podržavaju "
 "imena priloga u skladu sa standardom.\n"
-"KMail može napraviti poruke koje nisu po standardu, zbog čega je moguće da vaše "
-"poruke neće razumeti poštanski klijenti u skladu sa standardom. Zato, osim "
-"ukoliko nemate drugog izbora, ne bi trebalo da uključite ovu opciju."
+"KMail može napraviti poruke koje nisu po standardu, zbog čega je moguće da "
+"vaše poruke neće razumeti poštanski klijenti u skladu sa standardom. Zato, "
+"osim ukoliko nemate drugog izbora, ne bi trebalo da uključite ovu opciju."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2359,112 +2354,97 @@ msgstr "&Pozadinski šifranti"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ponekad poruke stižu u oba formata. Ova opcija kontroliše da li želite da se "
-"prikaže HTML deo ili običan tekst.</p>"
-"<p>Prikazivanje HTML delova čini da poruka izgleda lepše, ali to ponekad "
-"povećava rizik da se bezbednosne rupe iskoriste.</p>"
-"<p>Prikazivanjem običnog teksta gubi se mnogo od formatiranja poruke, ali to "
-"čini korišćenje bezbednosnih rupa u HTML iscrtavaču (Konqueror) gotovo <em>"
-"nemogućim</em>.</p>"
-"<p>Opcija ispod štiti od jedne uobičajene zloupotrebe HTML poruka, ali vas ne "
-"može zaštiti od bezbedonosnih propusta koji nisu bili poznati u vreme pisanja "
-"ove verzije KMail-a.</p>"
-"<p>Zbog svega navedenog savetuje se da <em>ne</em> dajete prednost HTML-u u "
-"odnosu na običan tekst.</p>"
-"<p><b>Napomena:</b>Ovu opciju možete postaviti za svaku fasciklu posebno iz "
-"menija <i>Fascikla</i> KMail-ovog glavnog prozora.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Ponekad poruke stižu u oba formata. Ova opcija kontroliše da li "
+"želite da se prikaže HTML deo ili običan tekst.</p><p>Prikazivanje HTML "
+"delova čini da poruka izgleda lepše, ali to ponekad povećava rizik da se "
+"bezbednosne rupe iskoriste.</p><p>Prikazivanjem običnog teksta gubi se mnogo "
+"od formatiranja poruke, ali to čini korišćenje bezbednosnih rupa u HTML "
+"iscrtavaču (Konqueror) gotovo <em>nemogućim</em>.</p><p>Opcija ispod štiti "
+"od jedne uobičajene zloupotrebe HTML poruka, ali vas ne može zaštiti od "
+"bezbedonosnih propusta koji nisu bili poznati u vreme pisanja ove verzije "
+"KMail-a.</p><p>Zbog svega navedenog savetuje se da <em>ne</em> dajete "
+"prednost HTML-u u odnosu na običan tekst.</p><p><b>Napomena:</b>Ovu opciju "
+"možete postaviti za svaku fasciklu posebno iz menija <i>Fascikla</i> KMail-"
+"ovog glavnog prozora.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Neke reklame su u HTML formatu i sadrže reference ka, na primer, slikama "
-"koje oglašavači koriste da bi saznali da li ste pročitali njihove poruke („web "
-"bugs“).</p>"
-"<p>Nema valjanog razloga za učitavanje ovakvih slike sa Interneta, pošto "
-"pošiljalac uvek može priložiti zahtevane slike direktno u poruci.</p>"
-"<p>Radi zaštite od takve zloupotrebe KMail-ove osobine da može da prikazuje "
-"HTML, ova opcija je podrazumevano <em>isključena</em>.</p>"
-"<p>Ako ipak želite, na primer, da vidite slike u HTML porukama koje nisu "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Neke reklame su u HTML formatu i sadrže reference ka, na primer, "
+"slikama koje oglašavači koriste da bi saznali da li ste pročitali njihove "
+"poruke („web bugs“).</p><p>Nema valjanog razloga za učitavanje ovakvih slike "
+"sa Interneta, pošto pošiljalac uvek može priložiti zahtevane slike direktno "
+"u poruci.</p><p>Radi zaštite od takve zloupotrebe KMail-ove osobine da može "
+"da prikazuje HTML, ova opcija je podrazumevano <em>isključena</em>.</"
+"p><p>Ako ipak želite, na primer, da vidite slike u HTML porukama koje nisu "
 "prikačene uz nju, možete uključiti ovu opciju, ali budite svesni mogućih "
 "problema.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Politika obaveštavanja o raspoređivanju poruka</h3>"
-"<p>MDN-ovi su uopštenje onoga što se obično zove <b>potvrda o čitanju</b>"
-". Pisac poruke zahteva da se pošalje obaveštenje o raspoređivanju poruke i "
-"primaočev program za poštu pravi odgovor iz koga pisac može da sazna šta se "
-"desilo sa njegovom porukom. Uobičajene vrste raspoređivanja uključuju <b>"
-"prikazana</b> (npr. pročitana), <b>obrisana</b> i <b>poslata</b> "
-"(npr. prosleđena).</p>"
-"<p>Za kontrolu KMail-ovog slanja MDN-ova služe sledeće opcije:</p>"
-"<ul>"
-"<li><em>Ignoriši</em>: Ignoriše bilo kakve zahteve za obaveštavanje. Nijedan "
-"MDN nikada automatski neće biti poslat (preporučljivo).</li>"
-"<li><em>Pitaj</em>: Odgovara na zahtev tek pošto upita korisnika za dozvolu. Na "
-"ovaj način možete slati MDN-ove za odabrane poruke, dok ćete ih ignorisati ili "
-"odbijati za ostale.</li>"
-"<li><em>Odbij</em>: Uvek šalje <b>odbijeno</b> obaveštenje. Ovo je samo <em>"
-"malo</em> bolje od slanja MDN-ova uvek. Pisac će još uvek znati da je nešto "
-"rađeno sa porukom, ali ne može reći da li je obrisana, pročitana itd.</li>"
-"<li><em>Šalji uvek</em>: Uvek šalje obaveštenje o raspoređivanju. Ovo znači da "
-"pisac poruke saznaje kada je nešto rađeno sa porukom i još šta joj se dogodilo "
-"(prikazana, obrisana, itd.) Ova opcija se nikako ne preporučuje, ali pošto ima "
-"smisla za recimo upravljanje odnosa prema mušterijama, učinjena je "
-"dostupnom.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Politika obaveštavanja o raspoređivanju poruka</h3><p>MDN-ovi su "
+"uopštenje onoga što se obično zove <b>potvrda o čitanju</b>. Pisac poruke "
+"zahteva da se pošalje obaveštenje o raspoređivanju poruke i primaočev "
+"program za poštu pravi odgovor iz koga pisac može da sazna šta se desilo sa "
+"njegovom porukom. Uobičajene vrste raspoređivanja uključuju <b>prikazana</b> "
+"(npr. pročitana), <b>obrisana</b> i <b>poslata</b> (npr. prosleđena).</"
+"p><p>Za kontrolu KMail-ovog slanja MDN-ova služe sledeće opcije:</"
+"p><ul><li><em>Ignoriši</em>: Ignoriše bilo kakve zahteve za obaveštavanje. "
+"Nijedan MDN nikada automatski neće biti poslat (preporučljivo).</"
+"li><li><em>Pitaj</em>: Odgovara na zahtev tek pošto upita korisnika za "
+"dozvolu. Na ovaj način možete slati MDN-ove za odabrane poruke, dok ćete ih "
+"ignorisati ili odbijati za ostale.</li><li><em>Odbij</em>: Uvek šalje "
+"<b>odbijeno</b> obaveštenje. Ovo je samo <em>malo</em> bolje od slanja MDN-"
+"ova uvek. Pisac će još uvek znati da je nešto rađeno sa porukom, ali ne može "
+"reći da li je obrisana, pročitana itd.</li><li><em>Šalji uvek</em>: Uvek "
+"šalje obaveštenje o raspoređivanju. Ovo znači da pisac poruke saznaje kada "
+"je nešto rađeno sa porukom i još šta joj se dogodilo (prikazana, obrisana, "
+"itd.) Ova opcija se nikako ne preporučuje, ali pošto ima smisla za recimo "
+"upravljanje odnosa prema mušterijama, učinjena je dostupnom.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2480,15 +2460,15 @@ msgstr "Dozvoli porukama da učitaju &spoljne reference sa Interneta"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>UPOZORENJE:</b> Dozvoljavanje HTML-a u e-porukama povećava rizik da će vaš "
-"sistem biti komprimitovan sadašnjim ili očekivanim bezbedonosnim "
-"iskorišćavanjima (exploits). <a href=\"whatsthis:%1\">Više o HTML pošti...</a> "
-"<a href=\"whatsthis:%2\">Više o spoljnim referencama...</a>"
+"<b>UPOZORENJE:</b> Dozvoljavanje HTML-a u e-porukama povećava rizik da će "
+"vaš sistem biti komprimitovan sadašnjim ili očekivanim bezbedonosnim "
+"iskorišćavanjima (exploits). <a href=\"whatsthis:%1\">Više o HTML pošti...</"
+"a> <a href=\"whatsthis:%2\">Više o spoljnim referencama...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2547,8 +2527,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>UPOZORENJE:</b> Bezuslovno slanje potvrda podriva vašu privatnost <a "
-"href=\"whatsthis:%1\">Više o ovome...</a>"
+"<b>UPOZORENJE:</b> Bezuslovno slanje potvrda podriva vašu privatnost <a href="
+"\"whatsthis:%1\">Više o ovome...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2562,15 +2542,14 @@ msgstr "Automatski uvozi ključeve i sertifikate"
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Promena globalne HTML postavke će pregaziti sve vrednosti postavki specifične "
-"za fascikle."
+"Promena globalne HTML postavke će pregaziti sve vrednosti postavki "
+"specifične za fascikle."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Ova opcija zahteva dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "bez proksija"
@@ -2599,8 +2578,8 @@ msgstr "&Isključi važne poruke iz zastarevanja"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Prilikom pokušaja pronalaženja nepročitanih poruka:"
 
@@ -2624,8 +2603,8 @@ msgstr "Kruži u svim fasciklama"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Prilikom ulaska u fasciklu:"
 
@@ -2694,28 +2673,24 @@ msgstr "Direktorijumi (format „maildir“)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Ovo određuje koji će se format poštanskog sandučeta podrazumevano koristit "
-"za lokalne fascikle:</p>"
-"<p><b>mbox:</b> KMail-ove poštanske fascikle se predstavljaju svaka jednim "
-"fajlom. Poruke su odvojene jedna od druge linijom koja počinje sa „From “. Ovo "
-"štedi prostor na disku, ali može biti manje robusno, na primer kada premeštate "
-"poruke iz fascikle u fasciklu.</p>"
-"<p><b>maildir:</b>  KMail-ove poštanske fascikle se predstavljaju stvarnim "
-"direktorijumima na disku. Svaka poruka je u zasebnom fajlu. Ovo možda traći "
-"malo prostora, ali bi trebalo da bude robusnije, na primer kada premeštate "
-"poruke iz fascikle u fasciklu.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Ovo određuje koji će se format poštanskog sandučeta podrazumevano "
+"koristit za lokalne fascikle:</p><p><b>mbox:</b> KMail-ove poštanske "
+"fascikle se predstavljaju svaka jednim fajlom. Poruke su odvojene jedna od "
+"druge linijom koja počinje sa „From “. Ovo štedi prostor na disku, ali može "
+"biti manje robusno, na primer kada premeštate poruke iz fascikle u fasciklu."
+"</p><p><b>maildir:</b>  KMail-ove poštanske fascikle se predstavljaju "
+"stvarnim direktorijumima na disku. Svaka poruka je u zasebnom fajlu. Ovo "
+"možda traći malo prostora, ali bi trebalo da bude robusnije, na primer kada "
+"premeštate poruke iz fascikle u fasciklu.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2748,54 +2723,45 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kada skačete na sledeću nepročitanu poruku, može se desiti da nema više "
-"nepročitanih poruka ispod tekuće.</p>"
-"<p><b>Nemoj da kružiš:</b> Pretraga će stati kod poslednje poruke u tekućoj "
-"fascikli.</p>"
-"<p><b>Kruži u tekućoj fascikli:</b> Pretraga će biti nastavljena od vrha liste "
-"poruka, ali neće ići u drugu fasciklu.</p>"
-"<p><b>Kruži u svim fasciklama:</b> Pretraga će biri nastavljena od vrha liste "
-"poruka. Ako nema više nepročitanih poruka onda će se nastaviti u sledećoj "
-"fascikli.</p>"
-"<p>Slično ovome, kada tražite prethodnu nepročitanu poruku, pretraga će početi "
-"od dna liste poruka i nastaviće se u prethodnoj fascikli, u zavisnosti od toga "
-"koja je opcija odabrana.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Kada skačete na sledeću nepročitanu poruku, može se desiti da nema "
+"više nepročitanih poruka ispod tekuće.</p><p><b>Nemoj da kružiš:</b> "
+"Pretraga će stati kod poslednje poruke u tekućoj fascikli.</p><p><b>Kruži u "
+"tekućoj fascikli:</b> Pretraga će biti nastavljena od vrha liste poruka, ali "
+"neće ići u drugu fasciklu.</p><p><b>Kruži u svim fasciklama:</b> Pretraga će "
+"biri nastavljena od vrha liste poruka. Ako nema više nepročitanih poruka "
+"onda će se nastaviti u sledećoj fascikli.</p><p>Slično ovome, kada tražite "
+"prethodnu nepročitanu poruku, pretraga će početi od dna liste poruka i "
+"nastaviće se u prethodnoj fascikli, u zavisnosti od toga koja je opcija "
+"odabrana.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Puno indeksiranje teksta omogućava veoma brzu pretragu sadržaja vaših "
-"poruka. Kada je uključeno, dijalog pretrage će raditi veoma brzo. Takođe, traka "
-"alata pretrage će označavati poruke na osnovu sadržaja.</p>"
-"<p>Indeksiranje zahteva izvesnu količinu prostora na disku (otprilike polovinu "
-"koliko zauzimaju poruke).</p>"
-"<p>Nakon uključenja, indeks će početi da se pravi ali vi možete nastaviti da "
-"koristite KMail dok se ova operacija obavlja.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Puno indeksiranje teksta omogućava veoma brzu pretragu sadržaja vaših "
+"poruka. Kada je uključeno, dijalog pretrage će raditi veoma brzo. Takođe, "
+"traka alata pretrage će označavati poruke na osnovu sadržaja.</"
+"p><p>Indeksiranje zahteva izvesnu količinu prostora na disku (otprilike "
+"polovinu koliko zauzimaju poruke).</p><p>Nakon uključenja, indeks će početi "
+"da se pravi ali vi možete nastaviti da koristite KMail dok se ova operacija "
+"obavlja.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2861,10 +2827,11 @@ msgstr "&Sakrij groupware fascikle"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Kada je ovo popunjeno, nećete videti IMAP resursne fascikle u stablu fascikli."
+"Kada je ovo popunjeno, nećete videti IMAP resursne fascikle u stablu "
+"fascikli."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2872,8 +2839,8 @@ msgstr "Prikaži &samo groupware fascikle za ovaj nalog"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Ako je ovo popunjeno, nećete videti normalne poštanske fascikle u stablu "
 "fascikli kod naloga podešenih za groupware."
@@ -2907,8 +2874,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na odgovore "
-"na pozivnice"
+"Uključite ovu opciju ako želite da Outlook(tm) razume vaše odgovore na "
+"odgovore na pozivnice"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2935,23 +2902,22 @@ msgid ""
 "compatible way."
 msgstr ""
 "Microsoft-ov Outlook, kada se koriste zajedno sa Microsoft-ovim Exchange "
-"serverom, ima problema sa razumevanjem standardu-saglasnim groupware "
-"e-porukama. Uključite ovu opciju da bi se groupware pozivnice slale na način "
+"serverom, ima problema sa razumevanjem standardu-saglasnim groupware e-"
+"porukama. Uključite ovu opciju da bi se groupware pozivnice slale na način "
 "koji Exchange sigurno razume."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Imenovanje priloga kompatibilno sa Outlook-om"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatsko slanje pozivnica"
@@ -2966,23 +2932,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Pozivnice se normalno šalju kao prilozi u porukama. Ovaj prekidač postavlja "
-"da se umesto toga pozivnice šalju u tekstu poruke, što je neophodno za slanje "
-"pozivnica za i primanje odgovora od Microsoft-ovog Outlook-a."
-"<br>Ali, kada uradite ovo, više nećete dobijati opisni tekst koji poštanski "
-"programi mogu da čitaju. Ljudima koji imaju e-poštanske programe koji ne "
-"razumeju pozivnice rezultujuće poruke izgledaće vrlo čudno."
-"<br>Ljudi koji imaju e-poštanske programe koji razumeju pozivnice i dalje će "
-"moći da rade sa ovim.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Pozivnice se normalno šalju kao prilozi u porukama. Ovaj prekidač "
+"postavlja da se umesto toga pozivnice šalju u tekstu poruke, što je "
+"neophodno za slanje pozivnica za i primanje odgovora od Microsoft-ovog "
+"Outlook-a.<br>Ali, kada uradite ovo, više nećete dobijati opisni tekst koji "
+"poštanski programi mogu da čitaju. Ljudima koji imaju e-poštanske programe "
+"koji ne razumeju pozivnice rezultujuće poruke izgledaće vrlo čudno.<br>Ljudi "
+"koji imaju e-poštanske programe koji razumeju pozivnice i dalje će moći da "
+"rade sa ovim.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3087,29 +3053,27 @@ msgstr "Prosleđena"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ovde možete dodavati, uređivati i brisati posebne šablone za poruke, koje "
-"koristite pri sastavljanju odgovora ili prosleđivanju poruke. Poseban šablon "
-"pravite birajući ga u kontekstnom ili glavnom meniju. Takođe možete povezati "
-"šablon sa kombinacijom tastera, kako biste ubrzali pozivanje.</p>"
-"<p>Šabloni poruka podržavaju naredbe za smenu tako što ih jednostavno ukucate "
-"ili izaberete ih iz menija <i>Umetni naredbu</i>.</p>"
-"<p>Postoje četiri vrste posebnih šablona: za poruke tipa <i>Odgovor</i>, <i>"
-"Odgovor svima</i>, <i>Prosleđena</i>, i <i>Univerzalna</i>"
-", koje možete koristiti za sve vrste radnji. Ne možete zadati kombinaciju "
-"tastera za univerzalne šablone.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Ovde možete dodavati, uređivati i brisati posebne šablone za poruke, "
+"koje koristite pri sastavljanju odgovora ili prosleđivanju poruke. Poseban "
+"šablon pravite birajući ga u kontekstnom ili glavnom meniju. Takođe možete "
+"povezati šablon sa kombinacijom tastera, kako biste ubrzali pozivanje.</"
+"p><p>Šabloni poruka podržavaju naredbe za smenu tako što ih jednostavno "
+"ukucate ili izaberete ih iz menija <i>Umetni naredbu</i>.</p><p>Postoje "
+"četiri vrste posebnih šablona: za poruke tipa <i>Odgovor</i>, <i>Odgovor "
+"svima</i>, <i>Prosleđena</i>, i <i>Univerzalna</i>, koje možete koristiti za "
+"sve vrste radnji. Ne možete zadati kombinaciju tastera za univerzalne "
+"šablone.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3126,15 +3090,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3152,8 +3116,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Izabrana prečica se već koristi za drugi poseban šablon, želite li ipak da je "
-"dodelite ovom?"
+"Izabrana prečica se već koristi za drugi poseban šablon, želite li ipak da "
+"je dodelite ovom?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3182,8 +3146,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"Nema primalaca u vašoj listi. Prvo izaberite nekoliko primalaca, pa pokušajte "
-"ponovo."
+"Nema primalaca u vašoj listi. Prvo izaberite nekoliko primalaca, pa "
+"pokušajte ponovo."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3208,8 +3172,8 @@ msgstr "Uredi pomoću:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "KMail ne može da otkrije kada se izabrani uređivač zatvori. Da bi se izbegao "
 "gubitak podataka, uređivanje priloga se obustavlja."
@@ -3314,8 +3278,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Ne mogu da izbacim stare poruke iz fascikle %1: odredišni direktorijum %2 nije "
-"pronađen"
+"Ne mogu da izbacim stare poruke iz fascikle %1: odredišni direktorijum %2 "
+"nije pronađen"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3467,6 +3431,11 @@ msgstr "Izaberite filtere"
 msgid "Filters"
 msgstr "Filteri"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Odaberi sav tekst"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3496,8 +3465,8 @@ msgstr "&Beleži filterske aktivnosti"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Ovde možete uključiti i isključiti beleženje filterskih aktivnosti. Naravno, "
 "dnevnički podaci se sakupljaju i prikazuju samo kada je beleženje uključeno. "
@@ -3516,15 +3485,16 @@ msgstr "Beleži &evaluaciju filterskih pravila"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Možete kontrolisati upis u dnevnik informacija o evaluaciji filterskih pravila "
-"primenjenih filtera. Ako je ova opcija uključena, imaćete detaljano beleženje "
-"za svako pojedinačno filtersko pravilo. U suprotnom, biće beležen samo rezultat "
-"evaluacije svih pravila jednog filtera."
+"Možete kontrolisati upis u dnevnik informacija o evaluaciji filterskih "
+"pravila primenjenih filtera. Ako je ova opcija uključena, imaćete detaljano "
+"beleženje za svako pojedinačno filtersko pravilo. U suprotnom, biće beležen "
+"samo rezultat evaluacije svih pravila jednog filtera."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3544,15 +3514,15 @@ msgstr "neograničeno"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Sakupljanje dnevničkih podataka koristi memoriju za privremeno skladištenje "
-"podataka. Ovde možete ograničiti maksimalnu količinu memorije koja se koristi: "
-"ako veličina sakupljenih podataka premaši ovo ograničenje, onda će najstari "
-"podaci biti odbacivani sve dok ograničenje više ne bude premašeno. "
+"podataka. Ovde možete ograničiti maksimalnu količinu memorije koja se "
+"koristi: ako veličina sakupljenih podataka premaši ovo ograničenje, onda će "
+"najstari podaci biti odbacivani sve dok ograničenje više ne bude premašeno. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3562,7 +3532,7 @@ msgstr ""
 "Nisam mogao da zapišem fajl %1:\n"
 "Detaljni opis greške je „%2“."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Greška KMail-a"
@@ -3603,13 +3573,13 @@ msgstr "&Korisnički identifikator:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Korisnički identifikator je prijavno ime korisnika na IMAP serveru. To može "
-"biti jednostavno korisničko ime ili puna e-poštanska adresa korisnika; prijavno "
-"ime za vaš sopstveni nalog na serveru rećiće vam koje je."
+"biti jednostavno korisničko ime ili puna e-poštanska adresa korisnika; "
+"prijavno ime za vaš sopstveni nalog na serveru rećiće vam koje je."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3660,8 +3630,8 @@ msgstr "Nemate dozvole za čitanje/upis u vašu fasciklu za smeće."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Informacije još uvek nisu dobavljenje sa servera, upotrebite „Proveri poštu“."
 
@@ -3673,8 +3643,7 @@ msgstr "Greška: IMAP nalog nije definisan za ovu fasciklu"
 msgid "Connecting to server %1, please wait..."
 msgstr "Povezujem se sa serverom %1, sačekajte..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Greška prilikom povezivanja na server %1"
@@ -3702,8 +3671,8 @@ msgstr "Dodaj dozvole"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Želite li zaista da uklonite sopstvene dozvole za ovu fasciklu? Posle toga "
 "nećete više moći da joj pristupite."
@@ -3737,7 +3706,7 @@ msgstr "Iskorišćenost:"
 msgid "Select Folder"
 msgstr "Izaberite fasciklu"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokalne fascikle"
@@ -3761,9 +3730,9 @@ msgstr "Izaberite prečicu za fasciklu"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Da biste izabrali taster ili kombinaciju tastera kojom se bira tekuća "
 "fascikla, kliknite na dugme ispod a zatim pritisnite taster ili tastere koje "
@@ -3787,14 +3756,23 @@ msgstr "Otk&aži"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Fascikla koju ste izbrisali je bila pridružena nalogu <b>%1</b> "
-"koji je u nju isporučivao poštu. Fascikla u koju nalog isporučuje poštu sada je "
+"<qt>Fascikla koju ste izbrisali je bila pridružena nalogu <b>%1</b> koji je "
+"u nju isporučivao poštu. Fascikla u koju nalog isporučuje poštu sada je "
 "resetovana na glavnu fasciklu „pristigle“.</qt>"
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Ukupno: %2<br>Nepročitano: %3<br>Veličina: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Kvota: %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Nepoznat"
@@ -3916,69 +3894,17 @@ msgstr "Status spama:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>p"
-"<br>o"
-"<br>r"
-"<br>u"
-"<br>k"
-"<br>a</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>p<br>o<br>r<br>u<br>k<br>a</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N "
-"<br>i"
-"<br>j"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>p"
-"<br>o"
-"<br>r"
-"<br>u"
-"<br>k"
-"<br>a</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N <br>i<br>j<br>e<br> <br>H<br>T<br>M<br>L<br> "
+"<br>p<br>o<br>r<br>u<br>k<br>a</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3990,19 +3916,14 @@ msgstr "&Vaše ime:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Vaše ime</h3>"
-"<p>Ovo polje bi trebalo da sadrži vaše ime, onako kako želite da se pojavljuje "
-"u zaglavlju poruke koja je poslata.</p>"
-"<p>Ako ovo polje ostavite prazno, neće se pojavljivati vaše pravo ime, već samo "
-"e-adresa.</p></qt>"
+"<qt><h3>Vaše ime</h3><p>Ovo polje bi trebalo da sadrži vaše ime, onako kako "
+"želite da se pojavljuje u zaglavlju poruke koja je poslata.</p><p>Ako ovo "
+"polje ostavite prazno, neće se pojavljivati vaše pravo ime, već samo e-"
+"adresa.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4010,17 +3931,13 @@ msgstr "Or&ganizacija:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organizacija</h3>"
-"<p>Ovo polje bi trebalo da sadrži ime vaše organizacije, ako želite da ono bude "
-"prikazano u zaglavlju poslate poruke.</p>"
-"<p>Bezbedno je (i uobičajeno) da ovo ostavite nepopunjeno.</p></qt>"
+"<qt><h3>Organizacija</h3><p>Ovo polje bi trebalo da sadrži ime vaše "
+"organizacije, ako želite da ono bude prikazano u zaglavlju poslate poruke.</"
+"p><p>Bezbedno je (i uobičajeno) da ovo ostavite nepopunjeno.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4029,20 +3946,15 @@ msgstr "&E-adresa:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-adresa</h3>"
-"<p>Ovo polje bi trebalo da sadrži vašu punu e-adresu.</p>"
-"<p>Ako ovo ostavite prazno, ili pogrešno popunite, ljudi će imati problema da "
-"vam odgovore.</p></qt>"
+"<qt><h3>E-adresa</h3><p>Ovo polje bi trebalo da sadrži vašu punu e-adresu.</"
+"p><p>Ako ovo ostavite prazno, ili pogrešno popunite, ljudi će imati problema "
+"da vam odgovore.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4051,21 +3963,12 @@ msgstr "&E-adresa:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4090,20 +3993,18 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP ključ koji odaberete ovde će biti korišćen za potpisivanje poruka. "
-"Takođe možete koristiti i GnuPG ključeve.</p> "
-"<p>Možete ostaviti ovo polje nepopunjeno, ali onda KMail neće moći da digitalno "
-"potpisuje vaše poruke koristeći OpenPGP. Ovo neće uticati na uobičajene "
-"poštanske funkcije.</p> "
-"<p>O ključevima možete saznati više na <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>OpenPGP ključ koji odaberete ovde će biti korišćen za potpisivanje "
+"poruka. Takođe možete koristiti i GnuPG ključeve.</p> <p>Možete ostaviti ovo "
+"polje nepopunjeno, ali onda KMail neće moći da digitalno potpisuje vaše "
+"poruke koristeći OpenPGP. Ovo neće uticati na uobičajene poštanske funkcije."
+"</p> <p>O ključevima možete saznati više na <a>http://www.gnupg.org</a></p></"
+"qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4115,31 +4016,28 @@ msgstr "Vaš OpenPGP ključ za šifrovanje"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Odaberite OpenPGP ključ koji bi trebalo koristiti za vaše poruke kada se "
 "šifruju vama samima i za mogućnost „Priloži moj javni ključ“ u sastavljaču."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP ključ koji odaberete ovde će biti korišćen za šifrovanje poruka vama "
-"samima i za mogućnost „Priloži moj javni ključ“ u sastavljaču. Takođe možete "
-"koristiti i GnuPG ključeve.</p> "
-"<p>Možete ostaviti ovo polje nepopunjeno, ali onda KMail neće moći da šifruje "
-"kopije odlazećih poruka vama samima koristeći OpenPGP. Ovo neće uticati na "
-"uobičajene poštanske funkcije.</p> "
-"<p>O ključevima možete saznati više na <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>OpenPGP ključ koji odaberete ovde će biti korišćen za šifrovanje "
+"poruka vama samima i za mogućnost „Priloži moj javni ključ“ u sastavljaču. "
+"Takođe možete koristiti i GnuPG ključeve.</p> <p>Možete ostaviti ovo polje "
+"nepopunjeno, ali onda KMail neće moći da šifruje kopije odlazećih poruka "
+"vama samima koristeći OpenPGP. Ovo neće uticati na uobičajene poštanske "
+"funkcije.</p> <p>O ključevima možete saznati više na <a>http://www.gnupg."
+"org</a></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4154,23 +4052,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Izaberite S/MIME sertifikat koji bi trebalo koristiti za digitalno potpisivanje "
-"vaših poruka."
+"Izaberite S/MIME sertifikat koji bi trebalo koristiti za digitalno "
+"potpisivanje vaših poruka."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) sertifikat koji izaberete ovde biće korišćen za digitalno "
-"potpisivanje vaših poruka.</p>"
-"<p>Možete ostaviti ovo nepopunjeno, ali KMail neće moći da digitalno potpisuje "
-"vaše poruke koristeći S/MIME. Ovo neće uticati na uobičajene poštanske "
-"funkcije.</p></qt>"
+"<qt><p>S/MIME (X.509) sertifikat koji izaberete ovde biće korišćen za "
+"digitalno potpisivanje vaših poruka.</p><p>Možete ostaviti ovo nepopunjeno, "
+"ali KMail neće moći da digitalno potpisuje vaše poruke koristeći S/MIME. Ovo "
+"neće uticati na uobičajene poštanske funkcije.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4182,27 +4077,25 @@ msgstr "Vaš S/MIME sertifikat za šifrovanje"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Izaberite S/MIME sertifikat koji bi trebalo koristiti za vaše poruke kada se "
 "šifruju vama samima i za mogućnost „Priloži moj javni ključ“ u sastavljaču."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME sertifikat koji odaberete ovde će biti korišćen za šifrovanje poruka "
-"vama samima i za mogućnost „Priloži moj javni ključ“ u sastavljaču.</p> "
-"<p>Možete ostaviti ovo polje nepopunjeno, ali onda KMail neće moći da šifruje "
-"kopije odlazećih poruka vama samima koristeći S/MIME. Ovo neće uticati na "
-"uobičajene poštanske funkcije.</p></qt>"
+"<qt><p>S/MIME sertifikat koji odaberete ovde će biti korišćen za šifrovanje "
+"poruka vama samima i za mogućnost „Priloži moj javni ključ“ u sastavljaču.</"
+"p> <p>Možete ostaviti ovo polje nepopunjeno, ali onda KMail neće moći da "
+"šifruje kopije odlazećih poruka vama samima koristeći S/MIME. Ovo neće "
+"uticati na uobičajene poštanske funkcije.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4222,23 +4115,19 @@ msgstr "Ad&resa za odgovore:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adresa za odgovore</h3>"
-"<p>Ovo postavlja zaglavlje <tt>Odgovori na:</tt> tako da sadrži drugačiju "
-"adresu od uobičajene <tt>Od:</tt> adrese.</p>"
-"<p>Ovo može biti korisno kada imate grupu ljudi koja radi zajedno sa sličnim "
-"ulogama. Na primer, možda želite da sve poruke koje šaljete imaju vašu adresu u "
-"polju <tt>Od:</tt>, a da odgovori idu na grupnu adresu.</p></p>"
-"Ako niste sigurni, ostavite ovo polje prazno.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adresa za odgovore</h3><p>Ovo postavlja zaglavlje <tt>Odgovori na:</"
+"tt> tako da sadrži drugačiju adresu od uobičajene <tt>Od:</tt> adrese.</"
+"p><p>Ovo može biti korisno kada imate grupu ljudi koja radi zajedno sa "
+"sličnim ulogama. Na primer, možda želite da sve poruke koje šaljete imaju "
+"vašu adresu u polju <tt>Od:</tt>, a da odgovori idu na grupnu adresu.</p></"
+"p>Ako niste sigurni, ostavite ovo polje prazno.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4246,25 +4135,19 @@ msgstr "BCC a&drese:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) adrese</h3>"
-"<p>Adrese koje unesete ovde će biti pridodate odlazećoj pošti koja se šalje sa "
-"ovim identitetom. Ove adrese neće biti vidljive za ostale primaoce.</p>"
-"<p>Ovo se obično koristi za slanje kopije svake poruke na neki drugi vaš "
-"nalog.</p> "
-"<p>Da biste naveli više od jedne adrese, koristite zareze za razdvajanje liste "
-"BCC primalaca.</p>"
-"<p>Ako ste u nedoumici onda ostavite ovo polje praznim.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) adrese</h3><p>Adrese koje unesete ovde će "
+"biti pridodate odlazećoj pošti koja se šalje sa ovim identitetom. Ove adrese "
+"neće biti vidljive za ostale primaoce.</p><p>Ovo se obično koristi za slanje "
+"kopije svake poruke na neki drugi vaš nalog.</p> <p>Da biste naveli više od "
+"jedne adrese, koristite zareze za razdvajanje liste BCC primalaca.</p><p>Ako "
+"ste u nedoumici onda ostavite ovo polje praznim.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4302,7 +4185,7 @@ msgstr "&Potpis"
 msgid "&Picture"
 msgstr "&Slika"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Neispravna e-adresa"
 
@@ -4325,11 +4208,11 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Jedan od podešenih OpenPGP ključeva za šifrovanje ne sadrži nijedan korisnički "
-"id. sa podešenom e-adresom za ovaj identitet (%1)."
+"Jedan od podešenih OpenPGP ključeva za šifrovanje ne sadrži nijedan "
+"korisnički id. sa podešenom e-adresom za ovaj identitet (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4376,21 +4259,21 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Posebna fascikla za nedovršene poruke za identitet „%1“ ne postoji (više). Zbog "
-"toga će se koristiti podrazumevana fascikla za nedovršene poruke."
+"Posebna fascikla za nedovršene poruke za identitet „%1“ ne postoji (više). "
+"Zbog toga će se koristiti podrazumevana fascikla za nedovršene poruke."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Fascikla posebnih šablona za identitet „%1“ ne postoji (više). Zbog toga će se "
-"koristiti podrazumevana fascikla za šablone."
+"Fascikla posebnih šablona za identitet „%1“ ne postoji (više). Zbog toga će "
+"se koristiti podrazumevana fascikla za šablone."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (podrazumevani)"
 
@@ -4434,24 +4317,24 @@ msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
-"KMail je pronašao prefiksni unos u podešavanjima naloga „%1“ koji je zastareo u "
-"odnosu na podršku za imenske prostore IMAP-a."
+"KMail je pronašao prefiksni unos u podešavanjima naloga „%1“ koji je "
+"zastareo u odnosu na podršku za imenske prostore IMAP-a."
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Podešavanja su automatski preseljena ali bi trebalo da proverite podešavanja "
 "vašeg naloga."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Nije bilo moguće automatski preseliti vaša podešavanja pa proverite podešavanja "
-"podešavanja vašeg naloga."
+"Nije bilo moguće automatski preseliti vaša podešavanja pa proverite "
+"podešavanja podešavanja vašeg naloga."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4466,7 +4349,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Nije bilo moguće poslati na server poruku datiranu %1 iz <i>%2</i> sa temom %3."
+"Nije bilo moguće poslati na server poruku datiranu %1 iz <i>%2</i> sa temom "
+"%3."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4487,17 +4371,22 @@ msgstr "Fascikla je vrlo blizu ograničenju kvote. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "Pošto nemate dozvolu pisanja u ovu fasciklu, pitajte njenog vlasnika da "
 "oslobodi nešto prostora u njoj."
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Greška: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "Veza sa serverom %1 je neočekivano zatvorena ili je istekla. Ako je moguće, "
 "biće ponovo uspostavljena automatski."
@@ -4650,20 +4539,20 @@ msgstr "Arhive liste"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Jednom ili više podešenih OpenPGP ključeva za šifrovanje ili S/MIME sertifikata "
-"ne veruje se u potpunosti za šifrovanje."
+"Jednom ili više podešenih OpenPGP ključeva za šifrovanje ili S/MIME "
+"sertifikata ne veruje se u potpunosti za šifrovanje."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Jednom ili više podešenih OpenPGP ključeva za šifrovanje ili S/MIME sertifikata "
-"ne veruje se u potpunosti za šifrovanje."
+"Jednom ili više podešenih OpenPGP ključeva za šifrovanje ili S/MIME "
+"sertifikata ne veruje se u potpunosti za šifrovanje."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4697,262 +4586,212 @@ msgstr "Ključevi za šifrovanje ne u potpunosti od poverenja"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (id. "
+"ključa 0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (id. "
+"ključa 0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (id. "
+"ključa 0x%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (id. ključa "
+"0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (id. ključa "
+"0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (id. ključa "
+"0x%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4966,251 +4805,201 @@ msgstr "S/MIME sertifikat uskoro ističe"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (id. "
+"ključa 0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (id. "
+"ključa 0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za potpisivanje</p><p align=center><b>%1</b> (id. "
+"ključa 0x%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> "
-"(id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (id. ključa "
+"0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (id. ključa "
+"0x%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ za šifrovanje</p><p align=center><b>%1</b> (id. ključa "
+"0x%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Vaš OpenPGP ključ</p><p align=center><b>%1</b> (id. ključa 0x%2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/MIME "
+"sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Koreni sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Koreni sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za vaš S/"
+"MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> (serijski broj "
+"%2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p>"
-"<p>za S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>\n"
+"<p>Posrednički CA sertifikat</p><p align=center><b>%3</b></p><p>za S/MIME "
+"sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p><p>ističe za "
+"manje od %n dana.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za potpisivanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>\n"
 "<p>Vaš S/MIME sertifikat za šifrovanje</p><p align=center><b>%1</b> "
-"(serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"(serijski broj %2)</p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>\n"
-"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</p>"
-"<p>ističe za manje od %n dana.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>\n"
+"<p>S/MIME sertifikat</p><p align=center><b>%1</b> (serijski broj %2)</"
+"p><p>ističe za manje od %n dana.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5222,9 +5011,10 @@ msgstr "S/MIME sertifikat uskoro ističe"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -5232,8 +5022,8 @@ msgstr ""
 "sertifikata nije upotrebljivo za šifrovanje. Podesite ponovo ključeve i "
 "sertifikate za šifrovanje za ovaj identitet u dijalogu za podešavanje "
 "identiteta.\n"
-"Ako izaberete da nastavite, i ključevi kasnije budu potrebni, bićete upitani da "
-"navedete ključeve koje treba koristiti."
+"Ako izaberete da nastavite, i ključevi kasnije budu potrebni, bićete upitani "
+"da navedete ključeve koje treba koristiti."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5248,11 +5038,11 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 "Jedan ili više vaših podešenih OpenPGP ključeva za potpisivanje ili S/MIME "
-"sertifikata za potpisivanje nije upotrebljivo za potpisivanje. Podesite ponovo "
-"ključeve i sertifikate za šifrovanje za ovaj identitet u dijalogu za "
+"sertifikata za potpisivanje nije upotrebljivo za potpisivanje. Podesite "
+"ponovo ključeve i sertifikate za šifrovanje za ovaj identitet u dijalogu za "
 "podešavanje identiteta.\n"
-"Ako izaberete da nastavite, i ključevi kasnije budu potrebni, bićete upitani da "
-"navedete ključeve koje treba koristiti."
+"Ako izaberete da nastavite, i ključevi kasnije budu potrebni, bićete upitani "
+"da navedete ključeve koje treba koristiti."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5262,15 +5052,15 @@ msgstr "Neupotrebljivi ključevi za potpisivanje"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
-msgstr ""
-"Ispitivanje ličnih podešavanja primalaca za širovanje ispostavilo je da poruke "
-"treba šifrovati koristeći OpenPGP, bar za neke primaoce.\n"
-"Međutim, niste podesili važeće OpenPGP ključeve od poverenja za šifrovanje za "
-"ovaj identitet.\n"
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
+msgstr ""
+"Ispitivanje ličnih podešavanja primalaca za širovanje ispostavilo je da "
+"poruke treba šifrovati koristeći OpenPGP, bar za neke primaoce.\n"
+"Međutim, niste podesili važeće OpenPGP ključeve od poverenja za šifrovanje "
+"za ovaj identitet.\n"
 "Možete nastaviti bez šifrovanja sebi, ali pazite, jer tada nećete moći da "
 "čitate sopstvene poruke koje ste poslali."
 
@@ -5278,13 +5068,13 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Ispitivanje ličnih podešavanja primalaca za širovanje ispostavilo je da poruke "
-"treba šifrovati koristeći S/MIME, bar za neke primaoce.\n"
+"Ispitivanje ličnih podešavanja primalaca za širovanje ispostavilo je da "
+"poruke treba šifrovati koristeći S/MIME, bar za neke primaoce.\n"
 "Međutim, niste podesili važeće S/MIME sertifikate za šifrovanje za ovaj "
 "identitet.\n"
 "Možete nastaviti bez šifrovanja sebi, ali pazite, jer tada nećete moći da "
@@ -5292,8 +5082,8 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5308,8 +5098,8 @@ msgstr "Ne potpisuj OpenPGP-om"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5338,8 +5128,8 @@ msgstr "Nije moguće potpisivanje"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Niste izabrali sopstveni ključ za šifrovanje. Nećete moći da dešifrujete "
 "sopstvene poruke koje ste šifrovali i poslali."
@@ -5363,8 +5153,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Niste izabrali ključ za šifrovanje ni za jednog primaoca ove poruke; zato, "
 "poruka neće biti šifrovana."
@@ -5378,16 +5168,16 @@ msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Niste izabrali ključ za šifrovanje za jednog od primalaca; ta osoba neće moći "
-"da dešifruje poruku ako je šifrujete."
+"Niste izabrali ključ za šifrovanje za jednog od primalaca; ta osoba neće "
+"moći da dešifruje poruku ako je šifrujete."
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Niste izabrali ključ za šifrovanje za neke od primalaca; te osobe neće moći da "
-"dešifruju poruku ako je šifrujete."
+"Niste izabrali ključ za šifrovanje za neke od primalaca; te osobe neće moći "
+"da dešifruju poruku ako je šifrujete."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5411,11 +5201,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Nije pronađen nijedan važeći i od poverenja ključ za „%1“.\n"
 "\n"
@@ -5464,10 +5254,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritična greška: Ne mogu da skupim poštu: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Nisam uspeo da dodam poruku:\n"
+msgid "Failed to add message:\n"
+msgstr "Nisam uspeo da dodam poruku:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5559,6 +5347,50 @@ msgstr "&Nepovezani IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir sanduče"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Postavi temu poruke"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Pošalji CC: na „adresu“"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Pošalji BCC: na „adresu“"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Dodaj „zaglavlje“ poruci"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Čitaj telo poruke iz „fajla“"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Postavi telo poruke"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Dodaj prilog poruci. Ovo se može ponavljati"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Samo proveri da li ima nove pošte"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Samo otvori prozor sastavljača"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Prikaži dati fajl poruke"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "Pošalji poruku na „adresu“ i priloži fajl na koji „URL“ ukazuje."
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Pošta"
@@ -5601,8 +5433,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"KMail će sada napraviti potrebne groupware fascikle kao podfascikle od %1. Ako "
-"ne želite ovo, otkažite i IMAP resurs će biti isključen"
+"KMail će sada napraviti potrebne groupware fascikle kao podfascikle od %1. "
+"Ako ne želite ovo, otkažite i IMAP resurs će biti isključen"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5615,13 +5447,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>KMail je pronašao sledeće groupware fascikle u %1 i treba da uradi sledeće "
-"operacije: %2"
-"<br>Ako ne želite ovo da radite, otkažite i IMAP resurs će biti isključen"
+"<qt>KMail je pronašao sledeće groupware fascikle u %1 i treba da uradi "
+"sledeće operacije: %2<br>Ako ne želite ovo da radite, otkažite i IMAP resurs "
+"će biti isključen"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5670,11 +5502,11 @@ msgstr "URL je kopiran u klipbord."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Fajl <b>%1</b> postoji.<br>Želite li da ga zamenite?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Snimi u fajl"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Zameni"
 
@@ -5692,7 +5524,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Poruka je uklonjena u toku snimanja, stoga nije snimljena."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5712,11 +5544,11 @@ msgstr "Fajl ne sadrži poruku."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fajl sadrži više poruka, prikazana je samo prva."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5725,114 +5557,114 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtriram poruke"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtriram poruku %1 od %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Nema dovoljno slobodnog prostora na disku?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Premesti u ovu fasciklu"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiraj u ovu fasciklu"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Oštećeni IMAP keš je pronađen u fascikli %1. Kopiranje poruka je prekinuto."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Premeštam poruke"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Brišem poruke"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Otvaram URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Da li zaista želite da izvršite <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Izvrši"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Nema priloga za snimanje."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Snimi priloge u"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "prilog.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "prilog.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Fajl sa imenom %1 već postoji. Želite li da ga prebrišete?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fajl već postoji"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Pre&briši"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Deo %1 poruke je šifrovan. Želite li da ga zadržite takvim prilikom snimanja?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail-ovo pitanje"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Očuvaj šifrovanje"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Ne čuvaj"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Deo %1 poruke je potpisan. Želite li da zadržite potpis prilikom snimanja?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Zadrži potpis"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5841,21 +5673,21 @@ msgstr ""
 "Nisam mogao da zapišem fajl %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Nisam mogao da zapišem fajl %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Nema unosa u adresaru za ovu e-poštansku adresu. Dodajte ih u adresar, a zatim "
-"dodajte brzoglasničke adrese koristeći svoj omiljeni glasnički klijent."
+"Nema unosa u adresaru za ovu e-poštansku adresu. Dodajte ih u adresar, a "
+"zatim dodajte brzoglasničke adrese koristeći svoj omiljeni glasnički klijent."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5865,70 +5697,70 @@ msgstr ""
 " %1\n"
 " nije moguće utvrditi sa kim treba ćaskati."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Chiasmus-ov pozadinski program ne nudi funkciju „x-obtain-keys“. Prijavite ovu "
-"grešku."
+"Chiasmus-ov pozadinski program ne nudi funkciju „x-obtain-keys“. Prijavite "
+"ovu grešku."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Greška pozadinskog programa Chiasmus-a"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Pozadinski program Chiasmus-a je vratio neočekivanu vrednost: Funkcija "
-"„x-obtain-keys“ nije vratila listu znakovnog niza. Prijavite ovu grešku."
+"Pozadinski program Chiasmus-a je vratio neočekivanu vrednost: Funkcija „x-"
+"obtain-keys“ nije vratila listu znakovnog niza. Prijavite ovu grešku."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Nisu pronađeni nikakvi ključevi. Proverite da li je postavljena ispravna "
 "putanja ključa u podešavanjima Chiasmus-a."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Izbor Chiasmus-ovog ključa za dešifrovanje"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Pozadinski program Chiasmus-a ne nudi „x-decrypt“ funkciju. Prijavite ovu "
 "grešku."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 "Funkcija „x-decrypt“ ne prihvata očekivane parametre. Prijavite ovu grešku."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus-ova greška dešifrovanja"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Pozadinski program Chiasmus-a je vratio neočekivanu vrednost: Funkcija "
-"„x-decrypt“ nije vratila bajtni niz. Prijavite ovu grešku."
+"Pozadinski program Chiasmus-a je vratio neočekivanu vrednost: Funkcija „x-"
+"decrypt“ nije vratila bajtni niz. Prijavite ovu grešku."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5938,7 +5770,7 @@ msgstr ""
 "Za: %2\n"
 "Tema: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Pošta: %1"
@@ -6037,7 +5869,7 @@ msgstr "Veličina"
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Kompresuj"
 
@@ -6049,7 +5881,7 @@ msgstr "Šifruj"
 msgid "Sign"
 msgstr "Potpiši"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Ime priloga:"
 
@@ -6071,7 +5903,8 @@ msgstr "Primarni primaoci"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>E-adrese koje stavite u ovo polje primaju kopiju poruke.</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -6081,13 +5914,13 @@ msgstr "Dodatni primaoci"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>E-adrese koje stavite u ovo polje primaju kopiju poruke. Tehnički to je "
-"isto kao kada stavite sve adrese u polje <b>Za:</b>, ali se razlikuje po tome "
-"što obično implicira da je primalac kopije samo „slušač“, a ne glavni "
+"isto kao kada stavite sve adrese u polje <b>Za:</b>, ali se razlikuje po "
+"tome što obično implicira da je primalac kopije samo „slušač“, a ne glavni "
 "primalac.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6096,9 +5929,8 @@ msgstr "Skriveni primaoci"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 "<qt>U suštini isto kao polje <b>Kopiraj za:</b> ali se razlikuje po tome što "
 "svi drugi primaoci ne vide ko prima slepu kopiju.</qt>"
@@ -6111,7 +5943,7 @@ msgstr "&Pošalji poštu"
 msgid "&Send Mail Via"
 msgstr "Pošalji poštu p&reko"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Pošalji &kasnije"
@@ -6176,8 +6008,7 @@ msgstr "Ukloni znakove za citi&ranje"
 msgid "Cl&ean Spaces"
 msgstr "Očisti pra&znine"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "&Koristi font fiksne širine"
@@ -6318,31 +6149,31 @@ msgstr "&Kriptografski format poruka"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standardni"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Lista po stavkama (disk)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Lista po stavkama (krug)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Lista po stavkama (kvadrat)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Uređena lista (dekadno)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Uređena lista (mala slova)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Uređena lista (velika slova)"
 
@@ -6426,7 +6257,8 @@ msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
-"Ponovo snimi ovu poruku u fascikli za šablone. Tada se može upotrebiti kasnije."
+"Ponovo snimi ovu poruku u fascikli za šablone. Tada se može upotrebiti "
+"kasnije."
 
 #: kmcomposewin.cpp:2257
 msgid ""
@@ -6446,64 +6278,62 @@ msgstr "Zatvori sastavljač"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Čini se da poruka koju ste sastavili ukazuje na priloženi fajl, ali ništa niste "
-"priložili.\n"
+"Čini se da poruka koju ste sastavili ukazuje na priloženi fajl, ali ništa "
+"niste priložili.\n"
 "Želite li da priložite fajl uz vašu poruku?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Podsetnik za prilaganje fajla"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Poš&alji tako kako jeste"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail ne može da prepozna lokaciju priloga (%1).</p>"
-"<p>Morate naznačiti punu putanju ako želite da priložite fajl.</p></qt>"
+"<qt><p>KMail ne može da prepozna lokaciju priloga (%1).</p><p>Morate "
+"naznačiti punu putanju ako želite da priložite fajl.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Vaš administrator nije dozvolio prilaganje fajlova većih od %1 MB.</p>"
+"<qt><p>Vaš administrator nije dozvolio prilaganje fajlova većih od %1 MB.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Priloži fajl"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Priloži"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Umetni fajl"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Umetni fajl"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Došlo je do greške prilikom pokušaja izvoženja ključa iz pozadinskog "
-"sistema:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Došlo je do greške prilikom pokušaja izvoženja ključa iz pozadinskog "
+"sistema:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6542,97 +6372,107 @@ msgid ""
 "View"
 msgstr "Prikaži"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Uredi..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Uredi pomoću..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Snimi k&ao..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Svojstva"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Dodaj prilog..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail ne može da kompresuje fajl."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Kompresovani fajl veći je od originalnog. Želite li da zadržite originalni?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Zadrži"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail ne može da dekompresuje fajl."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Snimi prilog kao"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Dodaj kao tekst"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Dodaj kao prilog"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Izaberite želite li da umetnete sadržaj teksta u uređivač, ili dodate fajl u "
 "pitanju kao prilog."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Preneti kao tekst ili prilog?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "bez imena"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Zahtevali ste da se poruke šifruju vama samima, ali trenutno izabrani "
-"identitet ne definiše ključ za šifrovanje (OpenPGP ili S/MIME) za ovu svrhu.</p>"
-"<p>Izaberite ključeve za ovo u podešavanju identiteta.</p></qt>"
+"<qt><p>Zahtevali ste da se poruke šifruju vama samima, ali trenutno izabrani "
+"identitet ne definiše ključ za šifrovanje (OpenPGP ili S/MIME) za ovu svrhu."
+"</p><p>Izaberite ključeve za ovo u podešavanju identiteta.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Nedefinisan ključ za šifrovanje"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Da biste bili u mogućnosti da potpišete ovu poruku, prvo morate da "
+"<qt><p>Da biste bili u mogućnosti da potpišete ovu poruku, prvo morate da "
 "definišete ključ (OpenPGP ili S/MIME) koji bi trebalo da se koristi za ovu "
-"svrhu.</p>"
-"<p>Izaberite ključ za ovo u podešavanju identiteta.</p></qt>"
+"svrhu.</p><p>Izaberite ključ za ovo u podešavanju identiteta.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Nedefinisan ključ za potpisivanje"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6640,163 +6480,162 @@ msgstr ""
 "KMail je trenutno van veze, vaše poruke će biti čuvane u odlaznima dok se ne "
 "povežete."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Na vezi/van veze"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Morate uneti svoju e-adresu u polju Od:. Takođe bi trebalo da postavite svoju "
-"e-adresu za sve identitete, tako da ne morate da je unosite za svaku poruku."
+"Morate uneti svoju e-adresu u polju Od:. Takođe bi trebalo da postavite "
+"svoju e-adresu za sve identitete, tako da ne morate da je unosite za svaku "
+"poruku."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Morate naznačiti bar jednog primaoca, ili u polju Za: ili kao CC ili BCC."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Polje Za: nedostaje. Da ipak pošaljem poruku?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Za: nije navedeno"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste naznačili temu. Da ipak pošaljem poruku?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Nije naznačena tema"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Pošalji tako kako jeste"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Naznači temu"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Zadrži obeležavanje, ne potpisuj/šifruj"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Zadrži obeležavanje, ne šifruj"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Zadrži obeležavanje, ne potpisuj"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Potpiši/šifruj (obriši obeležavanje)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Šifruj (obriši obeležavanje)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Potpiši (obriši obeležavanje)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Potpisivanje/šifrovanje u liniji HTML poruka nije moguće.</p>"
-"<p>Želite li da izbrišete svoje obeležavanje?</p></qt>"
+"<qt><p>Potpisivanje/šifrovanje u liniji HTML poruka nije moguće.</"
+"p><p>Želite li da izbrišete svoje obeležavanje?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Da potpišem/šifrujem poruku?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Fascikla posebnih šablona za identitet „%1“ ne postoji (više). Zbog toga će se "
-"koristiti podrazumevana fascikla za šablone."
+"Fascikla posebnih šablona za identitet „%1“ ne postoji (više). Zbog toga će "
+"se koristiti podrazumevana fascikla za šablone."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Napravite nalog za slanje pa pokušajte ponovo."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Upravo spremam slanje pošte..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Pošalji potvrdu"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Pošalji &odmah"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Nema primalaca"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Dodatni primaoci"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Provera pravopisa: uključena"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Provera pravopisa: isključena"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Provera pravopisa je otkazana."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Provera pravopisa je zaustavljena."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Provera pravopisa je završena."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Proveravač pravopisa"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Prvo podesite pozadinske šifrante koji se koriste za Chiasmus šifrovanja.\n"
 "Ovo možete uraditi u jezičku Pozadinski šifranti, na strani Bezbednost, "
 "dijaloga podešavanja."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6804,31 +6643,31 @@ msgstr ""
 "Izgleda da je libkleopatra kompajlirana bez podrške za Chiasmus. Možda biste "
 "želeli da prekompajlirate libkleopatra sa opsijom --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Nije podešen pozadinski program Chiasmus-a"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Nisu pronađeni ključevi Chiasmus-a"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Izbor Chiasmus ključa za šifrovanje"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Poruka će biti potpisana"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Poruka neće biti potpisana"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Poruka će biti šifrovana"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Poruka neće biti šifrovana"
 
@@ -6877,8 +6716,8 @@ msgstr "Provera pravopisa — KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell nije mogao biti pokrenut. Proverite da li je ISpell ili Aspell "
 "ispravno podešen i da li se nalazi u vašoj putanji."
@@ -6915,12 +6754,10 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Nepoznata filterska akcija <b>%1</b>"
-"<br>u filterskom pravilu <b>%2</b>."
+"<qt>Nepoznata filterska akcija <b>%1</b><br>u filterskom pravilu <b>%2</b>."
 "<br>Ignorišem je.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7141,162 +6978,129 @@ msgstr "Pusti zvuk"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ovo je lista definisanih filtera. Oni se koriste odozgo na dole.</p>"
-"<p>Kliknite na neki od filtera kako biste ga uredili koristeći desnu polovinu "
-"dijaloga.</p></qt>"
+"<qt><p>Ovo je lista definisanih filtera. Oni se koriste odozgo na dole.</"
+"p><p>Kliknite na neki od filtera kako biste ga uredili koristeći desnu "
+"polovinu dijaloga.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da biste napravili novi filter.</p>"
-"<p>Filter će biti umetnut ispred trenutno označenog, ali ovo uvek možete "
-"kasnije promeniti.</p>"
-"<p>Ako ste slučajno kliknuli na ovo dugme, ovu akciju možete opozvati klikom na "
-"dugme <em>Obriši</em>.</p></qt>"
+"<qt><p>Kliknite na ovo dugme da biste napravili novi filter.</p><p>Filter će "
+"biti umetnut ispred trenutno označenog, ali ovo uvek možete kasnije "
+"promeniti.</p><p>Ako ste slučajno kliknuli na ovo dugme, ovu akciju možete "
+"opozvati klikom na dugme <em>Obriši</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da biste kopirali filter.</p>"
-"<p>Ako ste slučajno kliknuli na ovo dugme, ovu akciju možete opozvati klikom na "
-"dugme <em>Obriši</em>.</p></qt>"
+"<qt><p>Kliknite na ovo dugme da biste kopirali filter.</p><p>Ako ste "
+"slučajno kliknuli na ovo dugme, ovu akciju možete opozvati klikom na dugme "
+"<em>Obriši</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pritisnite ovo dugme da <em>obrišete</em> trenutno izabrani filter iz "
-"liste.</p>"
-"<p>Kada se filter obriše nema načina da se povrati, ali uvek možete napustiti "
-"dijalog klikom na dugme <em>Otkaži</em> da biste odbacili izmene koje ste "
-"napravili.</p></qt>"
+"<qt><p>Pritisnite ovo dugme da <em>obrišete</em> trenutno izabrani filter iz "
+"liste.</p><p>Kada se filter obriše nema načina da se povrati, ali uvek "
+"možete napustiti dijalog klikom na dugme <em>Otkaži</em> da biste odbacili "
+"izmene koje ste napravili.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik na ovo dugme će pomeriti trenutno odabrani filter na <em>vrh</em> "
-"liste.</p>"
-"<p>Ovo je korisno pošto redosled filtera određuje kojim će se redom oni "
-"primenjivati na poruke. Najviši filter se primenjuje prvi.</p></qt>"
+"<qt><p>Klik na ovo dugme će pomeriti trenutno odabrani filter na <em>vrh</"
+"em> liste.</p><p>Ovo je korisno pošto redosled filtera određuje kojim će se "
+"redom oni primenjivati na poruke. Najviši filter se primenjuje prvi.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik na ovo dugme će pomeriti trenutno odabrani filter jedno mesto <em>"
-"gore</em> u listi.</p>"
-"<p>Ovo je korisno pošto redosled filtera određuje kojim će se redom oni "
-"primenjivati na poruke. Najviši filter se primenjuje prvi.</p>"
-"<p>Ako ste greškom kliknuli na ovo dugme, možete opozvati ovu akciju klikom na "
-"dugme <em>Dole</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klik na ovo dugme će pomeriti trenutno odabrani filter jedno mesto "
+"<em>gore</em> u listi.</p><p>Ovo je korisno pošto redosled filtera određuje "
+"kojim će se redom oni primenjivati na poruke. Najviši filter se primenjuje "
+"prvi.</p><p>Ako ste greškom kliknuli na ovo dugme, možete opozvati ovu "
+"akciju klikom na dugme <em>Dole</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klik na ovo dugme će pomeriti trenutno odabrani filter jedno mesto <em>"
-"dole</em> u listi.</p>"
-"<p>Ovo je korisno pošto redosled filtera određuje kojim će se redom oni "
-"primenjivati na poruke. Najviši filter se primenjuje prvi.</p>"
-"<p>Ako ste greškom kliknuli na ovo dugme, možete opozvati ovu akciju pritiskom "
-"na dugme <em>Gore</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klik na ovo dugme će pomeriti trenutno odabrani filter jedno mesto "
+"<em>dole</em> u listi.</p><p>Ovo je korisno pošto redosled filtera određuje "
+"kojim će se redom oni primenjivati na poruke. Najviši filter se primenjuje "
+"prvi.</p><p>Ako ste greškom kliknuli na ovo dugme, možete opozvati ovu "
+"akciju pritiskom na dugme <em>Gore</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klik na ovo dugme će pomeriti trenutno odabrani filter na <em>dno</em> "
-"liste.</p>"
-"<p>Ovo je korisno pošto redosled filtera određuje kojim će se redom oni "
-"primenjivati na poruke. Najviši filter se primenjuje prvi.</p></qt>"
+"<qt><p>Klik na ovo dugme će pomeriti trenutno odabrani filter na <em>dno</"
+"em> liste.</p><p>Ovo je korisno pošto redosled filtera određuje kojim će se "
+"redom oni primenjivati na poruke. Najviši filter se primenjuje prvi.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kliknite na ovo dugme da promenite ime trenutno odabranom filteru.</p>"
-"<p>Sve dok počinju sa „&lt;“, filteri automatski dobijaju imena.</p>"
-"<p>Ako ste greškom promenili ime filteru i želite  da vratite automatsko "
-"imenovanje, kliknite na ovo dugme i odaberite <em>Očisti</em>, pa zatim <em>"
-"U redu</em> u prikazanom dijalogu.</p></qt>"
+"<qt><p>Kliknite na ovo dugme da promenite ime trenutno odabranom filteru.</"
+"p><p>Sve dok počinju sa „&lt;“, filteri automatski dobijaju imena.</p><p>Ako "
+"ste greškom promenili ime filteru i želite  da vratite automatsko "
+"imenovanje, kliknite na ovo dugme i odaberite <em>Očisti</em>, pa zatim "
+"<em>U redu</em> u prikazanom dijalogu.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pritisnite ovo dugme da biste forsirali pojavljivanje dijaloga za "
-"potvrdu.</p>"
-"<p>Ovo je korisno ako ste definisali skup pravila koji označava poruke za "
-"kasnije preuzimanje. Bez mogućnosti da forsirate pojavu dijaloga, ove poruke "
-"možda nikada ne bi bile preuzete ako nema drugih velikih poruka koje čekaju na "
-"serveru, ili ako ste želeli da promenite skup pravila da drugačije označava "
-"poruke.</p></qt>"
+"<qt><p>Pritisnite ovo dugme da biste forsirali pojavljivanje dijaloga za "
+"potvrdu.</p><p>Ovo je korisno ako ste definisali skup pravila koji označava "
+"poruke za kasnije preuzimanje. Bez mogućnosti da forsirate pojavu dijaloga, "
+"ove poruke možda nikada ne bi bile preuzete ako nema drugih velikih poruka "
+"koje čekaju na serveru, ili ako ste želeli da promenite skup pravila da "
+"drugačije označava poruke.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7306,6 +7110,16 @@ msgstr "Pravila POP3 filtera"
 msgid "Filter Rules"
 msgstr "Pravila filtera"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "Uvez&i"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "Uvez&i"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Dostupni filteri"
@@ -7387,6 +7201,11 @@ msgstr "Takođe dodaj ovaj filter u traku sa alatom"
 msgid "Icon for this filter:"
 msgstr "Ikona za ovaj filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Za"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Gore"
@@ -7395,16 +7214,29 @@ msgstr "Gore"
 msgid "Down"
 msgstr "Dole"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Preimenuj..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Novi"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopiraj u"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "obrisana"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7413,20 +7245,20 @@ msgstr "Izaberite prečicu za fasciklu"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Najmanje jedan filter ukazuje na fasciklu na IMAP nalogu na vezi. Takvi filteri "
-"će biti primenjeni samo pri ručnom filtriranju i kada se filtrira dolazeća IMAP "
-"pošta na vezi."
+"Najmanje jedan filter ukazuje na fasciklu na IMAP nalogu na vezi. Takvi "
+"filteri će biti primenjeni samo pri ručnom filtriranju i kada se filtrira "
+"dolazeća IMAP pošta na vezi."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Sledeći filteri nisu snimljeni zato što su neispravni (npr. ne sadrže ni jednu "
-"akciju ili pravila za pretragu)."
+"Sledeći filteri nisu snimljeni zato što su neispravni (npr. ne sadrže ni "
+"jednu akciju ili pravila za pretragu)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7493,36 +7325,31 @@ msgstr "Otklanjanje problema u IMAP kešu"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Otklanjanje problema u IMAP kešu</b></p>"
-"<p>Ako imate problema sa sinhronizacijom IMAP fascikle, prvo bi trebalo da "
-"ponovo izgradite indeksni fajl. Trebaće neko vreme da se ponovo izgradi, ali "
-"neće izazvati nikakve probleme.</p>"
-"<p>Ako to ne bude dovoljno, možete pokušati da osvežite IMAP keš. Ako uradite "
-"to, izgubićete sve vaše lokalne izmene za ovu fasciklu i sve njegove "
-"podfascikle.</p>\n"
-"<p><b>Otklanjanje problema u IMAP kešu</b></p>"
-"<p>Ako imate problema sa sinhronizacijom IMAP fascikle, prvo bi trebalo da "
-"ponovo izgradite indeksni fajl. Trebaće neko vreme da se ponovo izgradi, ali "
-"neće izazvati nikakve probleme.</p>"
-"<p>Ako to ne bude dovoljno, možete pokušati da osvežite IMAP keš. Ako uradite "
-"to, izgubićete sve vaše lokalne izmene za ovu fasciklu i sve njegove "
-"podfascikle.</p>"
+"<p><b>Otklanjanje problema u IMAP kešu</b></p><p>Ako imate problema sa "
+"sinhronizacijom IMAP fascikle, prvo bi trebalo da ponovo izgradite indeksni "
+"fajl. Trebaće neko vreme da se ponovo izgradi, ali neće izazvati nikakve "
+"probleme.</p><p>Ako to ne bude dovoljno, možete pokušati da osvežite IMAP "
+"keš. Ako uradite to, izgubićete sve vaše lokalne izmene za ovu fasciklu i "
+"sve njegove podfascikle.</p>\n"
+"<p><b>Otklanjanje problema u IMAP kešu</b></p><p>Ako imate problema sa "
+"sinhronizacijom IMAP fascikle, prvo bi trebalo da ponovo izgradite indeksni "
+"fajl. Trebaće neko vreme da se ponovo izgradi, ali neće izazvati nikakve "
+"probleme.</p><p>Ako to ne bude dovoljno, možete pokušati da osvežite IMAP "
+"keš. Ako uradite to, izgubićete sve vaše lokalne izmene za ovu fasciklu i "
+"sve njegove podfascikle.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7558,8 +7385,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Nije bilo moguće snimiti UID keš fajl za fasciklu %1. Problem može biti u "
 "dozvolama fajl-sistema."
@@ -7600,11 +7427,11 @@ msgstr "Indeks ove fascikle je ponovo napravljen."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Fascikla %1 nije u početnom sinhronizacionom stanju (stanje je bilo %2). Želite "
-"li da resetujete stanje na početno ili da ipak uradite sinhronizaciju?"
+"Fascikla %1 nije u početnom sinhronizacionom stanju (stanje je bilo %2). "
+"Želite li da resetujete stanje na početno ili da ipak uradite sinhronizaciju?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7732,15 +7559,11 @@ msgstr "Pravim podfascikle na serveru"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Poruke na server u fascikli <b>%1</b> su obrisane. Želite li da ih obrišete "
-"i lokalno?"
-"<br>UID-ovi: %2</p></qt>"
+"<qt><p>Poruke na server u fascikli <b>%1</b> su obrisane. Želite li da ih "
+"obrišete i lokalno?<br>UID-ovi: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7761,13 +7584,11 @@ msgstr "Dobavljam fascikle za imenski prostor %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Izgleda da je fascikla <b>%1</b> obrisana. Želite li da je obrišete sa "
-"servera?</p></qt>"
+"<qt><p>Izgleda da je fascikla <b>%1</b> obrisana. Želite li da je obrišete "
+"sa servera?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7775,16 +7596,16 @@ msgstr "Prekinuto"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP server %1 nema podršku za IMAP beleške. XML skladištenje ne može se "
 "koristiti na ovom serveru, podesite KMail drugačije."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP server %1 nema podršku za IMAP beleške. XML skladištenje se ne može "
 "koristiti na ovom serveru, podesite KMail drugačije."
@@ -7799,17 +7620,16 @@ msgstr "izgubljeno+nađeno"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>U fascikli <b>%1</b> ima novih poruka koje još nisu poslate na server, ali "
-"je fascikla na serveru obrisana ili nemate potrebna prava pristupa fascikli da "
-"biste ih poslali.</p>"
-"<p>Sve poruke na koje ovo utiče biće premeštene u <b>%2</b>"
-", kako bi se izbegao gubitak podataka.</p>"
+"<p>U fascikli <b>%1</b> ima novih poruka koje još nisu poslate na server, "
+"ali je fascikla na serveru obrisana ili nemate potrebna prava pristupa "
+"fascikli da biste ih poslali.</p><p>Sve poruke na koje ovo utiče biće "
+"premeštene u <b>%2</b>, kako bi se izbegao gubitak podataka.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7817,20 +7637,25 @@ msgstr "Nedovoljna prava pristupa"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>U ovoj fascikli (%1) ima novih poruka koje još nisu poslate na server, ali "
-"je fascikla na serveru obrisana ili nemate potrebna prava pristupa fascikli da "
-"biste ih poslali. Kontaktirajte svog administratora da bi vam dozvolio slanje "
-"novih poruka, ili ih premestite iz ove fascikle.</p> "
-"<p>Da li sada želite da premestite ove poruke u drugu fascilu?</p>"
+"<p>U ovoj fascikli (%1) ima novih poruka koje još nisu poslate na server, "
+"ali je fascikla na serveru obrisana ili nemate potrebna prava pristupa "
+"fascikli da biste ih poslali. Kontaktirajte svog administratora da bi vam "
+"dozvolio slanje novih poruka, ili ih premestite iz ove fascikle.</p> <p>Da "
+"li sada želite da premestite ove poruke u drugu fascilu?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Premesti u:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Ne premeštaj"
 
@@ -7842,8 +7667,7 @@ msgstr "Premesti poruke u fasciklu"
 msgid "Permissions (ACL)"
 msgstr "Dozvole (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Opšte"
@@ -7867,8 +7691,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Koristi posebne &ikone"
@@ -7887,22 +7710,19 @@ msgstr "Obavesti o novoj/nepročitanoj pošti u ovoj fascikli"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ako je ova opcija uključena, bićete obavešteni o novoj/nepročitanoj pošti u "
-"ovoj fascikli.</p>"
-"<p>Ostavite neoznačeno ako ne želite obaveštenja o novoj/nepročitanoj pošti u "
-"ovoj fascikli i ako hoćete da ova fascikla bude preskočena pri kretanju "
-"sledeće/prethodne nepročitane poruke. Ovo je korisno za ignorisanje pošte u "
-"fasciklama smeća ili spama.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Ako je ova opcija uključena, bićete obavešteni o novoj/nepročitanoj "
+"pošti u ovoj fascikli.</p><p>Ostavite neoznačeno ako ne želite obaveštenja o "
+"novoj/nepročitanoj pošti u ovoj fascikli i ako hoćete da ova fascikla bude "
+"preskočena pri kretanju sledeće/prethodne nepročitane poruke. Ovo je korisno "
+"za ignorisanje pošte u fasciklama smeća ili spama.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7914,13 +7734,13 @@ msgstr "Čuvaj odgovore u ovoj fascikli"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Uključite ovu opciju ako želite da odgovori koje pišete na poruke u ovoj "
-"fascikli budu takođe stavljenji u nju posle slanja, umesto u podešenu fasciklu "
-"za odlaznu poštu."
+"fascikli budu takođe stavljenji u nju posle slanja, umesto u podešenu "
+"fasciklu za odlaznu poštu."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7930,17 +7750,21 @@ msgstr "Prikaži kolonu pošiljaoca/primaoca u listi poruka"
 msgid "Sho&w column:"
 msgstr "Pri&kaži kolonu:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Postavi podrazumevano"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Pošiljalac"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Primalac"
@@ -7951,17 +7775,17 @@ msgstr "Identitet pošiljao&ca:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Izaberite identitet pošiljaoca koji se koristi kada pišete novu poruku ili "
-"odgovarate na poruku iz ove fascikle. Ovo znači da će, prema fascikli u kojoj "
-"se nalazite, KMail automatski koristiti odgovarajuću e-adresu pošiljaoca, "
-"potpis i digitalno potpisivanje. Identiteti se mogu postaviti u glavnom "
-"dijalogu za podešavanje (Podešavanja -> Podesi KMail)."
+"odgovarate na poruku iz ove fascikle. Ovo znači da će, prema fascikli u "
+"kojoj se nalazite, KMail automatski koristiti odgovarajuću e-adresu "
+"pošiljaoca, potpis i digitalno potpisivanje. Identiteti se mogu postaviti u "
+"glavnom dijalogu za podešavanje (Podešavanja -> Podesi KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7979,25 +7803,27 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"Ovo podešavanje definiše koji korisnici koji dele ovu fasciklu treba da dobiju "
-"„zauzete“ periode u svojoj slobodno/zauzeto listi i vide alarme za događaje ili "
-"zadatke u ovoj fascikli. Podešavanje se primenjuje samo na fascikle kalendara i "
-"zadataka (za zadatke, ovo podešavanje koristi se samo za alarme).\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"Ovo podešavanje definiše koji korisnici koji dele ovu fasciklu treba da "
+"dobiju „zauzete“ periode u svojoj slobodno/zauzeto listi i vide alarme za "
+"događaje ili zadatke u ovoj fascikli. Podešavanje se primenjuje samo na "
+"fascikle kalendara i zadataka (za zadatke, ovo podešavanje koristi se samo "
+"za alarme).\n"
 "\n"
-"Primer upotrebe: Ako šef deli fasciklu sa svojom sekretaricom, samo šef treba "
-"da bude označen kao zauzet tokom sastanaka. Zato bi trebalo da izabere "
-"„Administratori“, pošto sekretarica nema administratorskih prava za fasciklu.\n"
+"Primer upotrebe: Ako šef deli fasciklu sa svojom sekretaricom, samo šef "
+"treba da bude označen kao zauzet tokom sastanaka. Zato bi trebalo da izabere "
+"„Administratori“, pošto sekretarica nema administratorskih prava za "
+"fasciklu.\n"
 "S druge strane, ako radna grupa deli kalendar za sastanke grupe, svi čitaoci "
 "fascikle treba da budu označeni kao zauzeti tokom sastanaka.\n"
-"Fascikla za celu kompaniju sa opcionim događajima u sebi bi koristila „Niko“, "
-"pošto nije poznato ko će ići na te događaje."
+"Fascikla za celu kompaniju sa opcionim događajima u sebi bi koristila "
+"„Niko“, pošto nije poznato ko će ići na te događaje."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8029,23 +7855,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 "Podesili ste da ova fascikla sadrži groupware informacije, a postavljena je "
-"opšta opcija sakrivanja groupware fascikli. To znači da će ova fascikla nestati "
-"čim se dijalog za podešavanje zatvori. Ako želite ponovo da uklonite ovu "
-"fasciklu, moraćete privremeno da isključite sakrivanje groupware fascikli da "
-"biste mogli da je vidite."
+"opšta opcija sakrivanja groupware fascikli. To znači da će ova fascikla "
+"nestati čim se dijalog za podešavanje zatvori. Ako želite ponovo da uklonite "
+"ovu fasciklu, moraćete privremeno da isključite sakrivanje groupware "
+"fascikli da biste mogli da je vidite."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8114,12 +7940,13 @@ msgstr "Greška prilikom dobavljanja informacija o fascikli."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Indeks pošte za %1 je od nepoznate verzije KMail-a (%2).\n"
-"Ovaj indeks može biti ponovno napravljen iz vaše poštanske fascikle, ali neke "
-"informacije, uključujući i oznake statusa, mogu biti izgubljene. Želite li da "
-"razgradite vaš indeksni fajl?"
+"Ovaj indeks može biti ponovno napravljen iz vaše poštanske fascikle, ali "
+"neke informacije, uključujući i oznake statusa, mogu biti izgubljene. Želite "
+"li da razgradite vaš indeksni fajl?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8144,8 +7971,8 @@ msgstr "Greška prilikom otvaranja %1. Ova fascikla nedostaje."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 "Greška prilikom otvaranja %1. Ili ovo nije ispravna „maildir“ fascikla ili "
 "nemate dovoljna prava pristupa."
@@ -8191,21 +8018,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Indeks fascikle „%2“ izgleda zastarelo. Da bi se sprečilo oštećivanje poruka "
-"indeks će biti ponovo napravljen. Kao rezultat ovoga može se dogoditi da se "
-"obrisane poruke ponovo pojave i da se oznake statusa izgube.</p>"
-"<p>Pročitajte odgovarajuću stavku u <a href=\"%1\">odeljku „Često postavljana "
-"pitanja„ priručnika za KMail</a> radi informacije kako sprečiti ovaj problem da "
-"se ponovi.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Indeks fascikle „%2“ izgleda zastarelo. Da bi se sprečilo oštećivanje "
+"poruka indeks će biti ponovo napravljen. Kao rezultat ovoga može se dogoditi "
+"da se obrisane poruke ponovo pojave i da se oznake statusa izgube.</"
+"p><p>Pročitajte odgovarajuću stavku u <a href=\"%1\">odeljku „Često "
+"postavljana pitanja„ priručnika za KMail</a> radi informacije kako sprečiti "
+"ovaj problem da se ponovi.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8265,7 +8089,7 @@ msgstr ""
 "„%1“ ne izgleda kao fascikla.\n"
 "Sklonite fajl sa puta."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8273,7 +8097,7 @@ msgstr ""
 "Dozvole za fasciklu „%1“ nisu ispravne.\n"
 "Uverite se da možete menjati i gledati sadržaj ove fascikle."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8283,8 +8107,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 "Istoimena fascikla je obrisana od poslednje provere pošte. Morate prvo "
 "proveriti poštu pre stvaranja nove fascikle sa istim imenom."
@@ -8293,7 +8117,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Ne mogu da napravim fasciklu"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8390,13 +8214,13 @@ msgstr "&Otkloni probleme u IMAP kešu..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Ne mogu da napravim fasciklu <b>%1</b> zbog nedovoljnih dozvola na serveru. "
-"Ako mislite da bi trebalo da možete da pravite fascikle ovde, zatražite od svog "
-"administratora da vam to omogući.</qt> "
+"<qt>Ne mogu da napravim fasciklu <b>%1</b> zbog nedovoljnih dozvola na "
+"serveru. Ako mislite da bi trebalo da možete da pravite fascikle ovde, "
+"zatražite od svog administratora da vam to omogući.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8413,23 +8237,23 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Ne mogu ovde da premestim ili kopiram fasciklu <b>%1</b>"
-", jer istoimena fascikla već postoji.</qt>"
+"<qt>Ne mogu ovde da premestim ili kopiram fasciklu <b>%1</b>, jer istoimena "
+"fascikla već postoji.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Ne mogu da premestim ili kopiram fasciklu <b>%1</b> "
-"jer i sama nije potpuno kopirana.</qt>"
+"<qt>Ne mogu da premestim ili kopiram fasciklu <b>%1</b> jer i sama nije "
+"potpuno kopirana.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Ne mogu da premestim ili kopiram fasciklu <b>%1</b> "
-"u njenu sopstvenu podfasciklu.</qt>"
+"<qt>Ne mogu da premestim ili kopiram fasciklu <b>%1</b> u njenu sopstvenu "
+"podfasciklu.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8538,17 +8362,17 @@ msgstr "%1 Fascikla je samo-za-čitanje."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Da li zaista želite da obrišete %n označenu poruku?"
-"<br>Kada ih jednom obrišete više ih ne možete vratiti!</qt>\n"
-"<qt>Da li zaista želite da obrišete %n označene poruke?"
-"<br>Kada ih jednom obrišete više ih ne možete vratiti!</qt>\n"
-"<qt>Da li zaista želite da obrišete %n označenih poruka?"
-"<br>Kada ih jednom obrišete više ih ne možete vratiti!</qt>"
+"<qt>Da li zaista želite da obrišete %n označenu poruku?<br>Kada ih jednom "
+"obrišete više ih ne možete vratiti!</qt>\n"
+"<qt>Da li zaista želite da obrišete %n označene poruke?<br>Kada ih jednom "
+"obrišete više ih ne možete vratiti!</qt>\n"
+"<qt>Da li zaista želite da obrišete %n označenih poruka?<br>Kada ih jednom "
+"obrišete više ih ne možete vratiti!</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8600,131 +8424,129 @@ msgstr ""
 "Greška pri izmeni %1\n"
 "(Nema više prostora na uređaju?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Zahtev za potpis sertifikata"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Napravite sertifikat iz priloga i vratite pošiljaocu."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail je podešen da bude van veze; svi mrežni poslovi su suspendovani"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail je podešen da bude na vezi; svi mrežni poslovi su nastavljeni"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail je trenutno van veze. Kako želite da se nastavi?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Radi na vezi"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Radi van veze"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nemate dozvole za čitanje/upis u vašu fasciklu za pristiglu poštu."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "odlazno"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nemate dozvole za čitanje/upis u vašu fasciklu za odlazeću poštu."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "poslato"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Nemate dozvole za čitanje/upis u vašu fasciklu za poslatu poštu."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "smeće"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nemate dozvole za čitanje/upis u vašu fasciklu za smeće."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "nedovršeno"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nemate dozvole za čitanje/upis u vašu fasciklu za nedovršenu poštu."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "šabloni"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nemate dozvole za čitanje/upis u vašu fasciklu za šablone."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Poslednja pretraga"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Fascikla <i>%4</i> postoji. %1 sada koristi fasciklu <i>%5</i> "
-"za svoje poruke."
-"<p>%2 može za vas da premesti sadržaj <i>%6<i> u ovu fasciklu, mada to može "
-"zameniti eventualno postojeće istoimene fajlove iz <i>%7</i>."
+"<qt>Fascikla <i>%4</i> postoji. %1 sada koristi fasciklu <i>%5</i> za svoje "
+"poruke.<p>%2 može za vas da premesti sadržaj <i>%6<i> u ovu fasciklu, mada "
+"to može zameniti eventualno postojeće istoimene fajlove iz <i>%7</i>."
 "<p><strong>Želite li da %3 sada premesti poštanske fajlove?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Fascikla <i>%4</i> postoji. %1 sada koristi fasciklu <i>%5</i> "
-"za svoje poruke. %2 može za vas da premesti sadržaj <i>%6<i> u ovu fasciklu."
+"<qt>Fascikla <i>%4</i> postoji. %1 sada koristi fasciklu <i>%5</i> za svoje "
+"poruke. %2 može za vas da premesti sadržaj <i>%6<i> u ovu fasciklu."
 "<p><strong>Želite li da %3 sada premesti poštanske fajlove?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Da preselim fajlove pošte?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail je naišao na kobnu grešku i odmah će završiti sa radom"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8735,11 +8557,11 @@ msgstr ""
 "Greška je bila:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Da li ste sigurni da želite da ispraznite fascikle za smeće za sve naloge?"
@@ -8816,8 +8638,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Stigla vam je pošta</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8837,8 +8658,8 @@ msgstr ""
 #: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite da izbacite stare poruke iz fascikle <b>%1</b>"
-"?</qt>"
+"<qt>Da li ste sigurni da želite da izbacite stare poruke iz fascikle <b>%1</"
+"b>?</qt>"
 
 #: kmmainwidget.cpp:1133
 msgid "Expire Folder"
@@ -8858,11 +8679,11 @@ msgstr "Da li ste sigurni da želite da ispraznite fasciklu za smeće?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite da premestite sve poruke iz fascikle <b>%1</b> "
-"u smeće?</qt>"
+"<qt>Da li ste sigurni da želite da premestite sve poruke iz fascikle <b>%1</"
+"b> u smeće?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8886,11 +8707,11 @@ msgstr "Obriši pretragu"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite da obrišete pretragu <b>%1</b>? "
-"<br>Poruke prikazane unutar nje neće biti obrisane pošto su pohranjene u svojoj "
+"<qt>Da li ste sigurni da želite da obrišete pretragu <b>%1</b>? <br>Poruke "
+"prikazane unutar nje neće biti obrisane pošto su pohranjene u svojoj "
 "izvornoj fascikli.</qt>"
 
 #: kmmainwidget.cpp:1214
@@ -8904,41 +8725,41 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite da obrišete praznu fasciklu <b>%1</b> "
-"i sve njene podfascikle? Ove podfascikle možda nisu prazne i njihov sadržaj će "
-"takođe biti odbačene. "
-"<p><b>Pazite</b>, odbačene poruke ne smeštaju se u fasciklu za smeće, već se "
-"trajno brišu.</qt>"
+"<qt>Da li ste sigurni da želite da obrišete praznu fasciklu <b>%1</b> i sve "
+"njene podfascikle? Ove podfascikle možda nisu prazne i njihov sadržaj će "
+"takođe biti odbačene. <p><b>Pazite</b>, odbačene poruke ne smeštaju se u "
+"fasciklu za smeće, već se trajno brišu.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite da obrišete fasciklu <b>%1</b>"
-", odbacujući njen sadržaj? "
-"<p><b>Pazite</b>, odbačene poruke ne smeštaju se u fasciklu za smeće, već se "
-"trajno brišu.</qt>"
+"<qt>Da li ste sigurni da želite da obrišete fasciklu <b>%1</b>, odbacujući "
+"njen sadržaj? <p><b>Pazite</b>, odbačene poruke ne smeštaju se u fasciklu za "
+"smeće, već se trajno brišu.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Da li ste sigurni da želite da obrišete fasciklu <b>%1</b> "
-"i sve njene podfascikle, odbacujući njihov sadržaj? "
-"<p><b>Pazite</b>, odbačene poruke ne smeštaju se u fasciklu za smeće, već se "
-"trajno brišu.</qt>"
+"<qt>Da li ste sigurni da želite da obrišete fasciklu <b>%1</b> i sve njene "
+"podfascikle, odbacujući njihov sadržaj? <p><b>Pazite</b>, odbačene poruke ne "
+"smeštaju se u fasciklu za smeće, već se trajno brišu.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "obrisana"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8946,7 +8767,8 @@ msgid ""
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 "Da li ste sigurni da želite da osvežite IMAP keš?\n"
-"Ovo će ukloniti sve izmene koje ste radili nad vašim IMAP fasciklama u lokalu."
+"Ovo će ukloniti sve izmene koje ste radili nad vašim IMAP fasciklama u "
+"lokalu."
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8954,13 +8776,13 @@ msgstr "Da li ste sigurni da želite da izbacite sve stare poruke?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Korišćenje HTML-a u pošti će vas učiniti ranjivijim na „spam“ i može povećati "
-"verovatnoću da će vaš sistem biti kompromitovan drugim prisutnim i očekivanim "
-"bezbedonosnim zloupotrebama."
+"Korišćenje HTML-a u pošti će vas učiniti ranjivijim na „spam“ i može "
+"povećati verovatnoću da će vaš sistem biti kompromitovan drugim prisutnim i "
+"očekivanim bezbedonosnim zloupotrebama."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8973,12 +8795,12 @@ msgstr "Koristi HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Učitavanje spoljnih referenci u HTML pošti će vas učiniti ranjivijim na „spam“ "
-"i može povećati verovatnoću da će vaš sistem biti kompromitovan drugim "
-"prisutnim i očekivanim bezbedonosnim zloupotrebama."
+"Učitavanje spoljnih referenci u HTML pošti će vas učiniti ranjivijim na "
+"„spam“ i može povećati verovatnoću da će vaš sistem biti kompromitovan "
+"drugim prisutnim i očekivanim bezbedonosnim zloupotrebama."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8994,12 +8816,12 @@ msgstr "Filter po diskusionoj listi %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMail-ova funkcionalnost da odgovara van kancelarije zavisi od filtriranja na "
-"strani servera. Vi još uvek niste podesili IMAP server za tako nešto.\n"
+"KMail-ova funkcionalnost da odgovara van kancelarije zavisi od filtriranja "
+"na strani servera. Vi još uvek niste podesili IMAP server za tako nešto.\n"
 "Ovo možete učiniti u jezičku „Filtriranje“, dijaloga za podešavanje IMAP "
 "naloga."
 
@@ -9017,7 +8839,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Nisam mogao da pokrenem prikazivač dnevnika GnuPG-a. Proverite vašu "
 "instalaciju."
@@ -9339,8 +9162,7 @@ msgstr "Snimi &priloge..."
 msgid "Appl&y All Filters"
 msgstr "Primeni s&ve filtere"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Pr&imeni filtere"
@@ -9377,7 +9199,8 @@ msgstr "&Kolone ukupnih"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Uključuje ili isključuje kolonu koja prikazuje ukupan broj poruka u fasciklama."
+"Uključuje ili isključuje kolonu koja prikazuje ukupan broj poruka u "
+"fasciklama."
 
 #: kmmainwidget.cpp:3026
 msgid ""
@@ -9455,7 +9278,6 @@ msgstr "Sledeća &nepročitana poruka"
 msgid "Go to the next unread message"
 msgstr "Idi na sledeću nepročitanu poruku"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Prethodna poruka"
@@ -9595,21 +9417,21 @@ msgstr " Inicijalizujem..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ova poruka sadrži zahtev za vraćanje obaveštenja o vašem prijemu poruke.\n"
-"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Ova poruka sadrži zahtev za slanjem obaveštenja o vašem prijemu poruke.\n"
@@ -9619,34 +9441,34 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ova poruka sadrži zahtev za slanjem obaveštenja o vašem prijemu poruke,\n"
 "ali je zahtevano da se izveštaj pošalje na više od jedne adrese.\n"
-"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Ova poruka sadrži zahtev za slanjem obaveštenja o vašem prijemu poruke,\n"
 "ali nema postavljenu povratnu putanju.\n"
-"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9655,8 +9477,8 @@ msgstr ""
 "Ova poruka sadrži zahtev za slanjem obaveštenja o vašem prijemu poruke,\n"
 "ali povratna putanja se razlikuje od adrese na koju je zahtevano slanje "
 "izveštaja.\n"
-"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili običan "
-"odgovor."
+"Možete ili ignorisati zahtev ili pustiti KMail da pošalje „odbijen“ ili "
+"običan odgovor."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9682,16 +9504,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Potvrda: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Prilog: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Ovaj prilog je obrisan."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Prilog „%1“ je obrisan."
 
@@ -9739,45 +9561,38 @@ msgstr "Svojstva dela poruke"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>MIME tip</em> fajla.</p>"
-"<p>Obično ne morate da dirate ovu postavku, pošto se vrsta fajla automatski "
-"proverava. Međutim, ponekad %1 ne može da odredi vrstu kako valja. Ovde to "
-"možete popraviti.</p></qt>"
+"<qt><p><em>MIME tip</em> fajla.</p><p>Obično ne morate da dirate ovu "
+"postavku, pošto se vrsta fajla automatski proverava. Međutim, ponekad %1 ne "
+"može da odredi vrstu kako valja. Ovde to možete popraviti.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Veličina dela.</p>"
-"<p>Ponekad će %1 ovde dati samo predviđenu veličinu zato što bi izračunavanje "
-"tačne veličine isuviše dugo trajalo. Ako se ovo dogodi, biće jasno naznačeno "
-"dodavanjem „(pred.)“ veličini koja je prikazana.</p></qt>"
+"<qt><p>Veličina dela.</p><p>Ponekad će %1 ovde dati samo predviđenu veličinu "
+"zato što bi izračunavanje tačne veličine isuviše dugo trajalo. Ako se ovo "
+"dogodi, biće jasno naznačeno dodavanjem „(pred.)“ veličini koja je prikazana."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ime fajla dela.</p>"
-"<p>Iako je ovo podrazumevano isto kao i ime priloženog fajla, ono ne naznačava "
-"ime fajla koji se prilaže. Bolje rečeno, ono predlaže ime fajla primaočevom "
-"poštanskom agentu kada snima deo na disk.</p></qt>"
+"<qt><p>Ime fajla dela.</p><p>Iako je ovo podrazumevano isto kao i ime "
+"priloženog fajla, ono ne naznačava ime fajla koji se prilaže. Bolje rečeno, "
+"ono predlaže ime fajla primaočevom poštanskom agentu kada snima deo na disk."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9785,17 +9600,14 @@ msgstr "&Opis:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Opis dela.</p>"
-"<p>Ovo je samo informativni opis dela, slično kao što je tema za celu poruku. "
-"Većina poštanskih agenata će prikazati ovu informaciju u svojim pregledima "
-"poruka, odmah pored ikone priloga.</p></qt>"
+"<qt><p>Opis dela.</p><p>Ovo je samo informativni opis dela, slično kao što "
+"je tema za celu poruku. Većina poštanskih agenata će prikazati ovu "
+"informaciju u svojim pregledima poruka, odmah pored ikone priloga.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9803,23 +9615,20 @@ msgstr "&Kodiranje:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Transportno kodiranje za ovaj deo.</p>"
-"<p>Obično ovo ne morate da menjate, pošto će %1 koristiti pristojno "
-"podrazumevano kodiranje, u zavisnosti od MIME tipa. Ipak, ponekad značajno "
-"možete smanjiti veličinu rezultujuće poruke, npr. ako PostScript fajl ne sadrži "
-"binarne podatke, već samo običan tekst. U ovom slučaju izbor „citiranog za "
-"štampu“ (quoted printable) umesto „osnove 64“ će smanjiti konačnu veličinu i do "
-"25%.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Transportno kodiranje za ovaj deo.</p><p>Obično ovo ne morate da "
+"menjate, pošto će %1 koristiti pristojno podrazumevano kodiranje, u "
+"zavisnosti od MIME tipa. Ipak, ponekad značajno možete smanjiti veličinu "
+"rezultujuće poruke, npr. ako PostScript fajl ne sadrži binarne podatke, već "
+"samo običan tekst. U ovom slučaju izbor „citiranog za štampu“ (quoted "
+"printable) umesto „osnove 64“ će smanjiti konačnu veličinu i do 25%.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9827,19 +9636,17 @@ msgstr "Predloži &automatski prikaz"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Uključite ovu opciju ako želite da predložite primaocu automatski (ugrađen) "
-"prikaz ovog dela poruke u pregledu, umesto podrazumevanog prikaza ikone.</p>"
-"<p>Tehnički, ovo se izvodi postavljanjem polja <em>Content-Disposition</em> "
-"zaglavlja na „inline“ umesto na podrazumevano „attachment“.</p></qt>"
+"<qt><p>Uključite ovu opciju ako želite da predložite primaocu automatski "
+"(ugrađen) prikaz ovog dela poruke u pregledu, umesto podrazumevanog prikaza "
+"ikone.</p><p>Tehnički, ovo se izvodi postavljanjem polja <em>Content-"
+"Disposition</em> zaglavlja na „inline“ umesto na podrazumevano „attachment“."
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9847,14 +9654,12 @@ msgstr "&Potpiši ovaj deo"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Uključite ovu opciju ako želite da ovaj deo poruke bude potpisan.</p>"
-"<p>Potpis će biti načinjen ključem koji je pridružen trenutno odabranom "
+"<qt><p>Uključite ovu opciju ako želite da ovaj deo poruke bude potpisan.</"
+"p><p>Potpis će biti načinjen ključem koji je pridružen trenutno odabranom "
 "identitetu.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9863,13 +9668,11 @@ msgstr "Šifr&uj ovaj deo"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Uključite ovu opciju ako želite da ovaj deo poruke bude šifrovan.</p>"
-"<p>Deo će biti šifrovan za primaoce ove poruke.</p></qt>"
+"<qt><p>Uključite ovu opciju ako želite da ovaj deo poruke bude šifrovan.</"
+"p><p>Deo će biti šifrovan za primaoce ove poruke.</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9883,17 +9686,14 @@ msgstr "POP filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Poruke za filtriranje su pronađene na POP nalogu: <b>%1</b>"
-"<p>Prikazane poruke prekoračuju maksimalnu veličinu koju ste definisali za ovaj "
-"nalog."
-"<br>Možete odabrati šta želite da uradite sa njima uključivanjem odgovarajuće "
-"dugmadi."
+"Poruke za filtriranje su pronađene na POP nalogu: <b>%1</b><p>Prikazane "
+"poruke prekoračuju maksimalnu veličinu koju ste definisali za ovaj nalog."
+"<br>Možete odabrati šta želite da uradite sa njima uključivanjem "
+"odgovarajuće dugmadi."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10145,40 +9945,39 @@ msgstr "TDE-ov klijent za elektronsku poštu."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Dobavljam sadržaj fascikle</h2>"
-"<p>Sačekajte . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Dobavljam sadržaj fascikle</"
+"h2><p>Sačekajte . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Van veze</h2>"
-"<p>KMail je trenutno van veze. Kliknite <a href=\"kmail:goOnline\">ovde</a> "
-"da bi se povezali . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Van veze</h2><p>KMail je trenutno van veze. "
+"Kliknite <a href=\"kmail:goOnline\">ovde</a> da bi se povezali . . .</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10186,18 +9985,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Dobrodošli u  KMail %1</h2>"
-"<p>KMail klijent elektronske pošte za TDE. Napravljen je da bude u potpunosti u "
-"skladu sa standardima za internet poštu, uključujući MIME, SMTP, POP3 i "
-"IMAP.</p>\n"
-"<ul>"
-"<li>KMail ima puno dobrih mogućnosti koje su opisane u <a href=\"%2\">"
-"dokumentaciji</a></li>\n"
+"<h2 style='margin-top: 0px;'>Dobrodošli u  KMail %1</h2><p>KMail klijent "
+"elektronske pošte za TDE. Napravljen je da bude u potpunosti u skladu sa "
+"standardima za internet poštu, uključujući MIME, SMTP, POP3 i IMAP.</p>\n"
+"<ul><li>KMail ima puno dobrih mogućnosti koje su opisane u <a href="
+"\"%2\">dokumentaciji</a></li>\n"
 "<li><a href=\"%3\">Početna strana KMail-a</A> vam daje podatke o novim "
 "verzijama KMail-a</li></ul>\n"
 "%8\n"
-"<p>Neke od novih mogućnosti uovom izdanju KMail-a (u poređenju sa KMail-om %4, "
-"koji je deo TDE-a %5):</p>\n"
+"<p>Neke od novih mogućnosti uovom izdanju KMail-a (u poređenju sa KMail-om "
+"%4, koji je deo TDE-a %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10206,30 +10003,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail tim</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Odvojite nešto vremena za podešavanje KMail-a koristeći Postavke->"
-"Podesi KMail.\n"
-"Morate napraviti barem jedan podrazumevani identitet kao i po jedan odlazeći i "
-"dolazeći poštanski nalog.</p>\n"
+"<p>Odvojite nešto vremena za podešavanje KMail-a koristeći Postavke->Podesi "
+"KMail.\n"
+"Morate napraviti barem jedan podrazumevani identitet kao i po jedan odlazeći "
+"i dolazeći poštanski nalog.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Važne izmene</span> "
-"(u poređenju sa KMail-om %1):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Važne izmene</span> (u "
+"poređenju sa KMail-om %1):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -10260,7 +10055,8 @@ msgstr "Pogledaj prilog: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Prilog sadrži binarne podatke. Pokušaj prikaza %n znaka.]\n"
@@ -10289,12 +10085,14 @@ msgstr "Da otvorim prilog?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Brisanje priloga može iskvariti digitalni potpis poruke, ako postoji."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr "Izmena priloga može iskvariti digitalni potpis poruke, ako postoji."
 
 #: kmreaderwin.cpp:2956
@@ -10315,6 +10113,58 @@ msgstr "(uklopi bilo šta od sledećeg)"
 msgid "(match all of the following)"
 msgstr "(uklopi sve od sledećeg)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "pročitana"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "stara"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "obrisana"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "odgovorena"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "prosleđena"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "stavljena u red"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "poslata"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "posmatrana"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "ignorisana"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "spam"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "posao"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "sadrži prilog"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Celokupna poruka"
@@ -10387,26 +10237,26 @@ msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr ""
-"Kritična greška: N mogu da obradim poslatu poštu (nema mesta?) Premeštam poruku "
-"u fasciklu za „poslatu poštu“."
+"Kritična greška: N mogu da obradim poslatu poštu (nema mesta?) Premeštam "
+"poruku u fasciklu za „poslatu poštu“."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Premeštanje poslate poruke „%1“ iz „odlazeće“ u fasciklu „poslate pošte“ nije "
-"uspelo.\n"
+"Premeštanje poslate poruke „%1“ iz „odlazeće“ u fasciklu „poslate pošte“ "
+"nije uspelo.\n"
 "Mogući razlozi su nedostatak prostora na disku ili pravo upisa. Pokušajte da "
 "ispravite problem i da premestite poruku ručno."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Nije moguće slati poruke bez navođenja adrese primaoca.\n"
 "Postavite e-adresu identiteta „%1“ u odeljku Identiteti dijaloga za "
@@ -10436,11 +10286,11 @@ msgstr "Iniciram proces slanja..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
-"Izabrali ste da pošaljete sve poruke u redu pomoću nešifrovanog prenosa. Želite "
-"li da nastavite?"
+"Izabrali ste da pošaljete sve poruke u redu pomoću nešifrovanog prenosa. "
+"Želite li da nastavite?"
 
 #: kmsender.cpp:505
 msgid "Send Unencrypted"
@@ -10464,8 +10314,9 @@ msgstr "Nisam uspeo da pošaljem (neke) poruke koje su čekale."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10482,18 +10333,15 @@ msgstr "Slanje je otkazano."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Slanje nije uspelo:</p>"
-"<p>%1</p>"
-"<p>Poruka će ostati u fascikli za odlazeću poštu sve dok ili ne rešite problem "
-"(npr. loša adresa) ili uklonite poruku iz fascikle za odlazeću poštu.\n"
+"<p>Slanje nije uspelo:</p><p>%1</p><p>Poruka će ostati u fascikli za "
+"odlazeću poštu sve dok ili ne rešite problem (npr. loša adresa) ili uklonite "
+"poruku iz fascikle za odlazeću poštu.\n"
 "Korišćen je sledeći transportni protokol:  %2\n"
 "<p>Da li želite da nastavim sa slanjem preostalih poruka?</p>"
 
@@ -10513,8 +10361,9 @@ msgstr "&Prekini slanje"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10562,29 +10411,29 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 izgleda da već radi na drugom prikazu na ovoj mašini. Pokretanje %2 više od "
-"jednom može izazvati gubitak pošte. Ne bi trebalo da pokrećete %1, osim ako ste "
-"sigurni da ipak trenutno ne radi."
+"%1 izgleda da već radi na drugom prikazu na ovoj mašini. Pokretanje %2 više "
+"od jednom može izazvati gubitak pošte. Ne bi trebalo da pokrećete %1, osim "
+"ako ste sigurni da ipak trenutno ne radi."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 izgleda da već radi na drugom prikazu na ovoj mašini. Pokretanje %1 i %2 u "
-"isto vreme može izazvati gubitak pošte. Ne bi trebalo da pokrećete %2, osim ako "
-"ste sigurni da %1 ipak trenutno ne radi."
+"%1 izgleda da već radi na drugom prikazu na ovoj mašini. Pokretanje %1 i %2 "
+"u isto vreme može izazvati gubitak pošte. Ne bi trebalo da pokrećete %2, "
+"osim ako ste sigurni da %1 ipak trenutno ne radi."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 izgleda da već radi na %2. Pokretanje %1 više od jednom može izazvati "
 "gubitak pošte. Ne bi trebalo da pokrećete %1 na ovom računaru, osim ako ste "
@@ -10592,9 +10441,9 @@ msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 izgleda da već radi na %3. Pokretanje %1 i %2 u isto vreme može izazvati "
 "gubitak pošte. Ne bi trebalo da pokrećete %2 na ovom računaru, osim ako ste "
@@ -10609,6 +10458,10 @@ msgstr "Pokreni %1"
 msgid "Exit"
 msgstr "Izađi"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nove poruke u"
@@ -10636,8 +10489,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet nije dostupan. Jako vam preporučujemo da koristite TDEWallet za "
@@ -10714,8 +10568,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "Naredba za lokalno izvršavanje, pre slanja pošte. Ona se može koristiti za "
-"otvaranje ssh tunela na primer. Ostavite ovo polje praznim ako ništa ne treba "
-"izvršiti."
+"otvaranje ssh tunela na primer. Ostavite ovo polje praznim ako ništa ne "
+"treba izvršiti."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10723,12 +10577,12 @@ msgstr "Se&rver zahteva prijavljivanje"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Uključite ovu opciju ako vaš SMTP server zahteva da se prijavite pre nego što "
-"prihvati poštu. Ovo je poznato pod imenom „Authenticated SMTP“ ili prosto "
-"ASMTP."
+"Uključite ovu opciju ako vaš SMTP server zahteva da se prijavite pre nego "
+"što prihvati poštu. Ovo je poznato pod imenom „Authenticated SMTP“ ili "
+"prosto ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10748,15 +10602,13 @@ msgstr "Poš&alji posebno ime domaćina serveru"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Uključite ovu opciju ako želite da KMail šalje posebno ime domaćina kada se "
-"predstavlja serveru za poštu."
-"<p>Ovo je korisno ako ime vašeg sistema nije postavljeno kako treba ili ako "
-"maskirate pravo ime vašeg sistema."
+"predstavlja serveru za poštu.<p>Ovo je korisno ako ime vašeg sistema nije "
+"postavljeno kako treba ili ako maskirate pravo ime vašeg sistema."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10787,8 +10639,8 @@ msgstr "Dozvoljeni su samo lokalni fajlovi."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Polje Domaćin ne može biti prazno. Unesite ime ili IP adresu SMTP servera."
 
@@ -10802,15 +10654,15 @@ msgstr "Greška prilikom listanja fascikle %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 "Lokalno otkazivanje pretplate sa fascikli će ukloniti sve podatke koji su "
 "lokalno prisutni za te fascikle. Fascikle neće biti izmenjene na serveru. "
-"Možete sada odustati ako želite da potvrdite da su sve lokalne izmene zapisane "
-"na serveru, tako što ćete prvo proveriti poštu."
+"Možete sada odustati ako želite da potvrdite da su sve lokalne izmene "
+"zapisane na serveru, tako što ćete prvo proveriti poštu."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -11029,35 +10881,28 @@ msgstr "Ur&edi poruku"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Strukturne informacije vraćene od priključka za šifrovanje ne mogu biti "
-"ispravno obrađene; postoji mogućnost da je priključak oštećen.</p>"
-"<p>Kontaktirajte vašeg administratora sistema.</p></qt>"
+"<qt><p>Strukturne informacije vraćene od priključka za šifrovanje ne mogu "
+"biti ispravno obrađene; postoji mogućnost da je priključak oštećen.</"
+"p><p>Kontaktirajte vašeg administratora sistema.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Nije pronađen nijedan aktivan priključak za šifrovanje, a ugrađeni OpenPGP "
-"kôd se nije uspešno izvršio.</p>"
-"<p>Da biste ovo promenili možete uraditi dve stvari:</p>"
-"<ul>"
-"<li><em>ili</em> aktivirajte priključak koristeći Postavke->Podesi KMail->"
-"Dijalog za priključke.</li>"
-"<li><em>ili</em> naznačite tradicionalne OpenPGP postavke u jezičku Identitet->"
-"Napredno u istom dijalogu.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Nije pronađen nijedan aktivan priključak za šifrovanje, a ugrađeni "
+"OpenPGP kôd se nije uspešno izvršio.</p><p>Da biste ovo promenili možete "
+"uraditi dve stvari:</p><ul><li><em>ili</em> aktivirajte priključak koristeći "
+"Postavke->Podesi KMail->Dijalog za priključke.</li><li><em>ili</em> "
+"naznačite tradicionalne OpenPGP postavke u jezičku Identitet->Napredno u "
+"istom dijalogu.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11069,8 +10914,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Pozadinski program Chiasmus-a ne nudi funkciju „x-encrypt“. Prijavite ovu "
 "grešku."
@@ -11088,16 +10933,16 @@ msgstr "Greška šifrovanja Chiasmus-a"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
-"Pozadinski program Chiasmus-a je vratio neočekivanu vrednost: Funkcija "
-"„x-encrypt“ nije vratila bajtni niz. Prijavite ovu grešku."
+"Pozadinski program Chiasmus-a je vratio neočekivanu vrednost: Funkcija „x-"
+"encrypt“ nije vratila bajtni niz. Prijavite ovu grešku."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Kriptoformat poruke OpenPGP u liniji ne podržava šifrovanje ili potpisivanje "
@@ -11153,8 +10998,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"Tražili ste potpisivanje poruke, ali nijedan važeći ključ za potpisivanje nije "
-"podešen za ovaj identitet."
+"Tražili ste potpisivanje poruke, ali nijedan važeći ključ za potpisivanje "
+"nije podešen za ovaj identitet."
 
 #: messagecomposer.cpp:808
 msgid "Send Unsigned?"
@@ -11210,8 +11055,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Ispitivanje primaočevih podešavanja za potpisivanje ispostavilo je da budete "
@@ -11248,11 +11093,12 @@ msgstr "&Ne šifruj"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Tražili ste šifrovanje ove poruke, i šifrovanje vama samima, ali nijedan važeći "
-"ključ za šifrovanje nije podešen za ovaj identitet."
+"Tražili ste šifrovanje ove poruke, i šifrovanje vama samima, ali nijedan "
+"važeći ključ za šifrovanje nije podešen za ovaj identitet."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11261,13 +11107,13 @@ msgstr "Da li da pošaljem nešifrovano?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Neki delovi ove poruke neće biti šifrovani.\n"
-"Slanje delimično šifrovanih poruka može narušiti politiku sajta i/ili procureti "
-"osetljive informacije.\n"
+"Slanje delimično šifrovanih poruka može narušiti politiku sajta i/ili "
+"procureti osetljive informacije.\n"
 "Da umesto toga šifrujem sve delove?"
 
 #: messagecomposer.cpp:950
@@ -11290,88 +11136,83 @@ msgstr "Šifruj sv&e delove"
 msgid "Unencrypted Message Warning"
 msgstr "Upozorenje o nešifrovanoj poruci"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Greška: Pozadinski sistem nije vratio nikakve kodirane podatke.</p>"
-"<p>Prijavite ovu grešku:"
-"<br>%2</p></qt>"
+"<qt><p>Greška: Pozadinski sistem nije vratio nikakve kodirane podatke.</"
+"p><p>Prijavite ovu grešku:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Ne uklapaju se svi znakovi u izabrano kodiranje."
-"<br>"
-"<br>Da ipak pošaljem poruku?</qt>"
+"<qt>Ne uklapaju se svi znakovi u izabrano kodiranje.<br><br>Da ipak pošaljem "
+"poruku?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Neki znaci će biti izgubljeni"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Izbaci znakove"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Promeni kodiranje"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Ova poruka nije mogla biti potpisana, pošto izabrani pozadinski sistem izgleda "
-"da ne podržava potpisivanje. Ovo u stvari nikada ne bi trebalo da se desi, "
-"prijavite kao grešku."
+"Ova poruka nije mogla biti potpisana, pošto izabrani pozadinski sistem "
+"izgleda da ne podržava potpisivanje. Ovo u stvari nikada ne bi trebalo da se "
+"desi, prijavite kao grešku."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Ova poruka nije mogla biti potpisana, pošto izabrani pozadinski sistem izgleda "
-"da ne podržava potpisivanje. Ovo u stvari nikada ne bi trebalo da se desi, "
-"prijavite kao grešku."
+"Ova poruka nije mogla biti potpisana, pošto izabrani pozadinski sistem "
+"izgleda da ne podržava potpisivanje. Ovo u stvari nikada ne bi trebalo da se "
+"desi, prijavite kao grešku."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "Dnevnik revizije GnuPG-a za potpisivanje"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 "Potpisivanje nije uspelo. Proverite da li je naredba gpg-agent pokrenuta."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Ova poruka nije mogla biti šifrovana, pošto izabrani pozadinski sistem izgleda "
-"da ne podržava šifrovanje. Ovo u stvari nikada ne bi trebalo da se desi, "
-"prijavite kao grešku."
+"Ova poruka nije mogla biti šifrovana, pošto izabrani pozadinski sistem "
+"izgleda da ne podržava šifrovanje. Ovo u stvari nikada ne bi trebalo da se "
+"desi, prijavite kao grešku."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "Dnevnik revizije GnuPG-a za šifrovanje"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Ova poruka nije mogla biti potpisana i šifrovana, pošto izabrani pozadinski "
 "sistem izgleda da ne podržava kombinovano potpisivanje i šifrovanje. Ovo u "
@@ -11396,15 +11237,15 @@ msgstr "For&mat sandučeta:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Izaberite da li želite da skladištite poruke u ovoj fascikli kao jedan fajl po "
-"poruci (maildir) ili kao jedan veliki fajl (mbox). KMail podrazumevano koristi "
-"maildir i to treba promeniti samo u retkim okolnostima. Ako niste sigurni, "
-"ostavite tako kako je."
+"Izaberite da li želite da skladištite poruke u ovoj fascikli kao jedan fajl "
+"po poruci (maildir) ili kao jedan veliki fajl (mbox). KMail podrazumevano "
+"koristi maildir i to treba promeniti samo u retkim okolnostima. Ako niste "
+"sigurni, ostavite tako kako je."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11413,8 +11254,8 @@ msgstr "Fascikla &sadrži:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Izaberite da li želite da se nova fascikla koristi za skladištenje pošte ili "
 "groupware stavki kao što su zadaci i zabeleške. Podrazumevano je pošta. Ako "
@@ -11457,8 +11298,7 @@ msgstr "Različiti rezultati za potpise"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Motor za šifrovanje nije vratio čisto tekstualne podatke."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status: "
 
@@ -11487,11 +11327,11 @@ msgstr "Nije pronađen nijedan %1 priključak."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Poruka je potpisana, ali ispravnost potpisa ne može biti proverena.<br />"
-"Razlog: %1"
+"Poruka je potpisana, ali ispravnost potpisa ne može biti proverena.<br /"
+">Razlog: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11525,26 +11365,27 @@ msgstr "Priključak za šifrovanje „%1“ ne može dešifrovati poruke."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Napomena:</b> Ova HTML poruka može sadržati spoljne reference ka slikama i "
-"sl. Iz razloga bezbednosti i privatnosti spoljne reference nisu učitane. Ako "
-"verujete pošiljaocu ove poruke, možete učitati spoljne reference <a "
-"href=\"kmail:loadExternal\">klikom ovde</a>."
+"<b>Napomena:</b> Ova HTML poruka može sadržati spoljne reference ka slikama "
+"i sl. Iz razloga bezbednosti i privatnosti spoljne reference nisu učitane. "
+"Ako verujete pošiljaocu ove poruke, možete učitati spoljne reference <a href="
+"\"kmail:loadExternal\">klikom ovde</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Napomena:</b> Ovo je HTML poruka. Iz bezbednosnih razloga, prikazan je samo "
-"čist HTML kod. Ako verujete pošiljaocu ove poruke, možete aktivirati "
-"formatirani HTML prikaz ove poruke <a href=\"kmail:showHTML\">klikom ovde</a>."
+"<b>Napomena:</b> Ovo je HTML poruka. Iz bezbednosnih razloga, prikazan je "
+"samo čist HTML kod. Ako verujete pošiljaocu ove poruke, možete aktivirati "
+"formatirani HTML prikaz ove poruke <a href=\"kmail:showHTML\">klikom ovde</"
+"a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11799,11 +11640,11 @@ msgstr "pohranjen: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Nema poštanskih adresa pohranjenih u %1 koji se koristi za potpisivanje, tako "
-"da poređenje sa adresom pošiljaoca %2; nije moguće."
+"Nema poštanskih adresa pohranjenih u %1 koji se koristi za potpisivanje, "
+"tako da poređenje sa adresom pošiljaoca %2; nije moguće."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11918,13 +11759,15 @@ msgstr "Kioslave-ova poruka o grešci"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Vaš POP3 server (nalog: %1) ne podržava naredbu UIDL. Ova naredba je neophodna "
-"za pouzdano određivanje koje su poruke na serveru već ranije viđene.\n"
+"Vaš POP3 server (nalog: %1) ne podržava naredbu UIDL. Ova naredba je "
+"neophodna za pouzdano određivanje koje su poruke na serveru već ranije "
+"viđene.\n"
 "Zbog toga mogućnost ostavljanja poruka na serveru neće raditi ispravno."
 
 #: popaccount.cpp:752
@@ -11947,9 +11790,11 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"Preuzimam poruku %1 od %2 (%3 od %4 KB) za %5@%6 (%7 KB preostalo na serveru)."
+"Preuzimam poruku %1 od %2 (%3 od %4 KB) za %5@%6 (%7 KB preostalo na "
+"serveru)."
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11965,1885 +11810,15 @@ msgstr "Neispravan odgovor od servera"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Vaš server ne podržava naredbu TOP. Zbog toga nije moguće preuzeti zaglavlja "
 "velikih poruka pre njihovog preuzimanja."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Idi"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Fascikla"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Poruka"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Odgovori posebno"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Prosledi"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML traka"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Potpisivanje"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Automatski potpisuj poruke"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Kada je ova opcija uključena, podrazumevano će sve poruke koje šaljete poruke "
-"biti potpisane. Naravno, još uvek je moguće isključiti potpisivanje za svaku "
-"poruku ponaosob."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Šifrovanje"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr "Kada se šifruju poruke, uvek š&ifruj i sertifikat mog identiteta"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Kada je ova opcija uključena, poruka/fajl neće biti šifrovana samo primaočevim "
-"javnim ključem, već i vašim. Ovo će vam omogućiti da dešifrujete poruku/fajl u "
-"nekom kasnijem trenutku, što je obično dobra ideja."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Prikaži &potpisan/šifrovan tekst posle sastavljanja"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Kada je ova opcija uključena, potpisan/šifrovan tekst će biti prikazan u "
-"odvojenom prozoru, omogućavajući vam da znate kako će izgledati pre slanja. Ovo "
-"je dobra ideja kada proveravate da li vaš sistem za šifrovanje radi."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Pohrani poslate poruke ši&frovano"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Kliknite ovde da biste pohranjivali poruke u šifrovanom obliku "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Pohranjivanje poruka u šifrovanom obliku</h1>\n"
-"Kada je ova opcija uključena, poslate poruke se pohranjuju šifrovane. Ovo nije "
-"preporučljivo pošto nećete moći da čitate poruke kada potrebni sertifikat "
-"istekne.\n"
-"<p>\n"
-"Ipak, možda postoje lokalna pravila koja nalažu da uključite ovu opciju. Ako "
-"niste sigurni, pitajte vašeg lokalnog administratora.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Uvek prikaži ključeve za šifrovanje &radi odobrenja"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Kada je ova opcija uključena, program će vam uvek prikazati listu javnih "
-"ključeva iz koje možete izabrati onaj koji ćete koristiti za šifrovanje. Ako je "
-"isključena, program će prikazati dijalog samo ako ne može da nađe pravi ključ "
-"ili ako ih ima nekoliko koji mogu biti upotrebljeni."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Automatski šifruj poruke &kad god je to moguće"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Kada je ova opcija uključena, sve će poruke podrazumevano biti šifrovane kad "
-"god je to moguće i poželjno. Naravno, još uvek je moguće isključiti automatsko "
-"šifrovanje za svaku poruku ponaosob."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Nikad ne potpisuj/šifruj prilikom snimanja kao ne&dovršeno"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Kako ovo radi?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Za: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Univerzalna"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Odgovor"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Odgovor svima"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Prosleđena"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Prečica:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Tip šablona:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Svojstva fascikle"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Fascikla sadrži &diskusionu listu"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Adresa liste:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "U&običajena:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Nepročitana:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Zastarevanje poruka"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "I&zbaci posle:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Izbaci p&ročitane poruke"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Izbaci po&sle:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Izbaci &nepročitane poruke"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Dana"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Sedmica"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Meseci"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Napredno"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Identitet pošiljao&ca:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Format pohranjivanja:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Prikazi &lista:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Proveravaj sertifikate pomoću CRL-ova"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Ako je ova opcija izabrana, S/MIME sertifikati proveravaju se koristeći liste "
-"opozivanja sertifikata (CRL-ove)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Proveri sertifikate na vezi (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Ako je ova opcija izabrana, S/MIME sertifikati proveravaju se na vezi koristeći "
-"protokol za status sertifikata na vezi (OCSP). Popunite ispod URL OCSP "
-"respondera."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Provera sertifikata na vezi"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL OCSP respondera:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Ovde unesite adresu servera za proveru sertifikata na vezi (OCSP respondera). "
-"URL obično počinje sa http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Potpis OCSP respondera:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignoriši servisni URL sertifikata"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Nemoj da proveravaš politike sertifikata"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Podrazumevano GnuPG koristi fajl ~/.gnupg/policies.txt da proveri da li je "
-"politika sertifikata dozvoljena. Ako je ova opcija izabrana, politike neće biti "
-"proveravane."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Nikada ne razmatraj CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ako je ova opcija uključena, liste opozivanja sertifikata nikada se ne koriste "
-"za proveru S/MIME sertifikata."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Preuzmi nedostajuće sertifikate izdavača"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Ako je ova opcija uključena, nedostajući sertifikati izdavača se preuzimaju "
-"kada je potrebno (ovo važi za oba metoda provere, CRL-ove i OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP zahtevi"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Ne izvršavaj nijedan HTTP zahtev"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Potpuno isključuje upotrebu HTTP-a za S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Koristi ovaj proksi za HTTP zahteve: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Koristi sistemski HTTP proksi:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Ako je ova opcija izabrana, vrednost HTTP proksija prikazana levo (dolazi iz "
-"promenljive okruženja http_proxy) biće korišćena za sve HTTP zahteve."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Unesite ovde lokaciju HTTP proksija koji treba koristiti za sve HTTP zahteve u "
-"vezi sa S/MIME-ovima. Sintaksa je domacin:port, npr. mojproksi.nigde.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignoriši distribucionu tačku HTTP CRL-ova sertifikata"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Pri traženju lokacije CRL-a, sertifikat koji će biti testiran obično sadrži "
-"unose za  takozvane „distribucione tačke CRL-ova“ (DP); to su URL-ovi koji "
-"opisuju način pristupa do CRL-ova. Koristi se prvi pronađeni DP unos. Ovom "
-"opcijom ignorišu se svi unosi koji koriste HTTP šemu pri traženju pogodne DP."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP zahtevi"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Ne izvršavaj nijedan LDAP zahtev"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Potpuno isključuje upotrebu LDAP-a za S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignoriši distribucionu tačku LDAP CRL-ova sertifikata"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Pri traženju lokacije CRL-a, sertifikat koji će biti testiran obično sadrži "
-"unose za  takozvane „distribucione tačke CRL-ova“ (DP); to su URL-ovi koji "
-"opisuju način pristupa do CRL-ova. Koristi se prvi pronađeni DP unos. Ovom "
-"opcijom ignorišu se svi unosi koji koriste LDAP šemu pri traženju pogodne DP."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Primarni domaćin za LDAP zahteve:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Svi LDAP zahtevi će prvo ići na LDAP server koji ovde unesete. Preciznije, ovo "
-"podešavanje gazi bilo koji domaćin i port naveden u LDAP URL-u, a koristi se i "
-"ako su domaćin i port izostavljeni u URL-u. Drugi LDAP serveri koriste se samo "
-"ako veza sa proksijem ne uspe.\n"
-"Sintaksa je „DOMACIN“ ili „DOMACIN:PORT“. Ako se port izostavi, koristiće se "
-"389 (standardni LDAP port)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Dodaj isečak"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Dodaj"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Isečak:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Grupa:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Postavke isečka"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Oblačići"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Prikaži tekst isečka u &oblačiću"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "Određuje da li se daje oblačić sa tekstom iz markirane linije"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Promenljive"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Metod unosa za promenljive"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Jedinstveni dijalog za svaku promenljivu u isečku"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "Za svaku promenljivu u okviru isečka daje se dijalog za unos"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Jedan dijalog za sve promenljive u isečku"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Daje se jedan jedini dijalog u kome možete uneti vrednosti svih promenljivih u "
-"okviru isečka."
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Razdvajač:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "TemplatesConfiguration"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Odgovor pošiljaocu"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Odgovor svima / odgovor na listu"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Prosleđena poruka"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Upozori pri pokušaju slanja &nepotpisanih poruka"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Uključite ovo ako želite da budete upozoreni pri slanju nepotpisanih poruka."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje pri pokušaju slanja nepotpisanih poruka</h1>\n"
-"Ako je ova opcija uključena, bićete upozoreni kada pokušate da pošaljete delove "
-"ili celu poruku nepotpisanu.\n"
-"<p>\n"
-"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Upozori pri pokušaju slanja nešifrovanih poruka"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Uključite ovu opciju ako želite da budete upozoreni pri slanju nešifrovanih "
-"poruka."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje pri slanju nešifrovanih poruka</h1>\n"
-"Ako je ova opcija uključena, bićete upozoreni kada pokušate da pošaljete delove "
-"ili celu poruku nešifrovanu.\n"
-"<p>\n"
-"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Upozori ako e-adresa p&rimaoca nije u sertifikatu"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"Uključite ovu opciju ako želite da budete upozoreni ako adresa nije u "
-"sertifikatu"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako primaočeva e-adresa nije u sertifikatu</h1>\n"
-"Ako je ova opcija uključena, bićete upozoreni ako e-adresa primaoca nije "
-"sadržana u sertifikatu koji se koristi za šifrovanje.\n"
-"<p>\n"
-"Radi maksimalne bezbednosti preporučuje se da ovu opciju držite uključenom.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Upozori ako sertifikati/ključevi uskoro ističu (ispod podesite pragove)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Za potpisivanje"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Za šifrovanje"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dana"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Ovde odaberite broj dana"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako sertifikat za potpisivanje ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi sertifikat za potpisivanje trebalo da "
-"bude važeći pre davanja obaveštenja.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako sertifikat za šifrovanje ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi sertifikat za šifrovanje trebalo da "
-"bude važeći pre davanja obaveštenja.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako sertifikat u lancu ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi svi sertifikati u lancu trebalo da budu "
-"važeći pre davanja upozorenja.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako CA sertifikat ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi CA sertifikat trebalo da bude važeći "
-"pre davanja obaveštenja.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Upozorenje ako koreni sertifikat ističe</h1>\n"
-"Odaberite najmanji broj dana za koje bi koreni sertifikat trebalo da bude "
-"važeći pre davanja obaveštenja.\n"
-"<p>\n"
-"Preporučena postavka za SPHINX je četrnaest dana.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Za korene sertifikate:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Za posredničke CA sertifikate:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Za krajnje korisničke sertifikate/ključeve:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Ponovo uključi sva isključena upozorenja"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Sadržaj šablona"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Prečica šablona"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Tip šablona"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Pošalji spremljenu poštu pri proveri pošte"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Izaberite da li želite da KMail šalje sve poruke u odlaznom sandučetu pri "
-"ručnoj ili pri svim proverama pošte, ili čak da uopšte ne želite automatsko "
-"slanje poruka.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Automatski premesti nesinhornizovanu poštu iz fascikli sa nedovoljnim pravima "
-"pristupa"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Ako u fascikli ima novih poruka koje još uvek nisu poslate na server, ali "
-"nemate dovoljna prava pristupa za fasciklu da biste ih poslali, te poruke će "
-"biti automatski premeštene u fasciklu izgubljenog i nađenog."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Lokalne zastavice moguće u fasciklama samo-za-čitanje"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Ova postavka omogućava administratorima da podese najmanji period između dve "
-"provere pošte. Korisnik neće moći da izabere manju vrednost od ovde navedene."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Najskorije izabrana fascikla u dijalogu za izbor fascikli."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Zanemari korisnikov umask i koristi „čitanje-pisanje samo za korisnika“ umesto "
-"toga"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Politika prikazivanja ikone u sistemskoj kaseti"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Zatvori program kada se zatvori glavni prozor, čak i ako je aktivna ikona u "
-"sistemskoj kaseti."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Opširno obaveštenje o novoj pošti"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Ako je ova opcija uključena, u obaveštenju o novoj pošti biće prikazan broj "
-"novopristiglih poruka za svaku fasciklu. U suprotnom, dobićete samo jednostavnu "
-"poruku „Stigla vam je pošta“."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Navedite u&ređivač:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Koristi &spoljni uređivač umesto sastavljača"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr "Prag upozoravanja korisnika da se fascikla bliži ograničenju kvote."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Uključi groupware funkcionalnost"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Obrni „Od:/Za:“ zaglavlja u odgovorima na odgovore"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft-ov Outlook ima brojne nedostatke u svojoj implementaciji iCalendar "
-"standarda; ova opcija je tu da zaobiđe jedan od njih. Ako imate problema sa "
-"korisnicima Outlook-a koji ne mogu da dobiju vaše odgovore, pokušajte da "
-"uključite ovu opciju."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Pošalji groupware pozivnice u telu poruke"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft-ov Outlook ima brojne nedostatke u svojoj implementaciji iCalendar "
-"standarda; ova opcija je tu da zaobiđe jedan od njih. Ako imate problema sa "
-"korisnicima Outlook-a koji ne mogu da dobiju vaše pozivnice, pokušajte da "
-"uključite ovu opciju."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Imenovanje pozivnica kompatibilno sa Exchange-om"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft-ov Outlook, kada se koriste zajedno sa Microsoft-ovim Exchange "
-"serverom, ima problema sa razumevanjem standardu-saglasnim groupware "
-"e-porukama. Uključite ovu opciju da bi se groupware pozivnice slale na način "
-"koji Exchange sigurno razume."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Kada je ovo uključeno, nećete videti prozor sastavljača poruke. Umesto toga, "
-"sve poruke sa pozivnicama šalju se automatski. Ako želite da vidite poruku pre "
-"slanja, možete isključiti ovu opciju. Međutim, budite svesni da je tekst u "
-"prozoru sastavljača napisan po sintaksi iCalendar-a, zbog čega ne bi trebalo "
-"ručno da ga menjate."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Obriši pozivnice pošto se pošalje odgovor na njih"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"Ako je uključeno, primljene e-poruke pozivnica na koje se se odgovori "
-"premeštaju se u fasciklu smeća, čim se odgovor uspešno pošalje."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Uključivanje ovoga čini mogućim skladištenje stavki iz kontakt-programa "
-"(KOrganizer, KAddressBook i KNotes.)</p>"
-"<p>Ako želite da koristite ovu opciju, morate takođe podesiti programe da "
-"koriste IMAP resurs; ovo se radi u Kontrolnom centru TDE-a.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Obično nema razloga da vidite fascikle koje sadrže IMAP resurse. Ali ako je "
-"potrebno da ih vidite, možete to postaviti ovde.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Ako se nalog za skladištenje groupware podataka ne koristi za upravljanje "
-"običnom poštom, uključite ovu opciju da bi se za njega prikazivale samo "
-"groupware fascikle. Ovo je korisno kada običnom poštom upravljate preko "
-"dodatnog IMAP naloga na vezi.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Izaberite format skladištenja za groupware fascikle. "
-"<ul>"
-"<li>Podrazumevani formati su ical (za kalendarske fascikle) i vcard (za "
-"adresarske fascikle). Ovi formati čine dostupnim sve mogućnosti Kontact-a.</li>"
-"<li>Format Kolab XML koristi poseban model koji bliže odgovara onome koji se "
-"koristi u Outlook-u. Ovaj format daje veću kompatibilnost sa Outlook-om, "
-"prilikom upotrebe Kolab servera ili kompatibilnog rešenja.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Ovo bira roditelja IMAP resursnih fascikli.</p>"
-"<p>Podrazumevano, Kolab server postavlja da dolazno IMAP sanduče bude "
-"roditelj.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Ovo je id. naloga koji sadrži IMAP resursne fascikle.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Ako želite da postavite imena fascikli IMAP skladištenja na svoj jezik, "
-"možete izabrati između dostupnih jezika.</p>"
-"<p>Jedini razlog za ovako nešto je očuvanje kompatibilnosti sa Microsoft-ovim "
-"Outlook-om. Postavljanje ovoga smatra se lošom idejom, pošto čini promenu "
-"jezika nemogućom.</p>"
-"<p>Zato ne koristite ovo ako ne morate.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Takođe filtriraj novu poštu primljenu u groupware fasciklama."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr "Sinhornizuj groupware izmene u IMAP fasciklama čim se pređe na vezu."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Ova vrednost se koristi da bi se naznačilo da li prikazivati „Uvod u KMail“."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maksimalan broj veza po domaćinu"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ovo se može koristiti za ograničavanje broja veza po domaćinu dok se dobavlja "
-"nova pošta. Podrazumevno je broj veza neograničen (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Prikaži liniju za brzu pretragu"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ova opcija uključuje ili isključuje liniju za pretragu iznad liste poruka, "
-"pomoću koje se može brzo potražiti informacija prikazana u listi poruka."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Sakrij lokalno prijemno sanduče ako se ne koristi"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Prosleđivanje u liniji kao podrazumevano."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "Tačka-zarez (;) dozvoljena kao razdvajač u sastavljaču poruka."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Zadrži originalni skup znakova prilikom odgovaranja ili prosleđivanja (ako je "
-"moguće)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "A&utomatski umetni potpis"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamti ovaj identitet, kako bi se koristio i u budućim prozorima sastavljača.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamti ovu fasciklu za poslate poruke, kako bi se koristila i u budućim "
-"prozorima sastavljača."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Zapamti ovaj transport pošte, kako bi se koristio i u budućim prozorima "
-"sastavljača."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Zapamti ovaj identitet, kako bi se koristio i u budućim prozorima sastavljača.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Prelom &teksta na koloni:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Maksimalan broj linija uređivača primalaca."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Uključite ovu opciju ako želite da Outlook &#8482; razume imena priloga koja "
-"sadrže neengleska slova"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Auto&matski zahtevaj obaveštenja o raspoređivanju poruke"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Uključite ovu opciju ako želite da KMail zahteva obaveštenja o "
-"raspoređivanju poruke (MDN) za svaku vašu odlazeću poruku.</p>"
-"<p>Ova opcija utiče samo na podrazumevano; u sastavljaču uvek možete uključiti "
-"ili isključiti zahtevanje MDN-a za svaku poruku preko stavke u meniju <em>"
-"Opcije</em>-&gt;<em>Zahtevaj ovaveštenje o raspoređivanju</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Koristi skorašnje e-drese za samodovršavanje"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Isključite ovu opciju ako ne želite da se skoro korišćene adrese pojavljuju na "
-"listi za samodovršavanje u polju adrese sastavljača."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Period automatskog snimanja:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Rezervna kopija teksta u prozoru sastavljača može se regularno praviti. Ovde se "
-"postavlja period posle koga se pravi rezerva. Možete isključiti automatsko "
-"snimanje postavljanjem perioda na 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Umeći potpise iznad citiranog teksta"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Zameni prepoznati prefi&ks sa „Odg. :“"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Zameni prepoznati prefiks sa „&Pros. :“"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Koristi pametno &citiranje"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Potpis je istekao."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Vrsta izbora primaoca"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr "Postavlja vrstu dijaloga za izbor primalaca u poljima Za, CC i BCC."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Vrsta uređivača primalaca"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "Postavlja vrstu uređivača primalaca, za uređivanje polja Za, CC i BCC."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maksimalan broj linija uređivača primalaca."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Lista tipova delova poruka koje treba ukloniti kada se poruka prosleđuje u "
-"liniji."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Najveća veličina u megabajtima koju mogu imati prilozi."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Prikaži panel za umetanje i upravljanje isečcima teksta u sastavljaču."
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Prikaži dnevnik revizije GnuPG-a čak i kada je šifrarski postupak uspešno "
-"dovršen."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Zadrži originalni skup znakova prilikom odgovaranja ili prosleđivanja (ako je "
-"moguće)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Neke e-poruke, posebno one automatski generisane, ne navode kodiranje znakova "
-"koje se mora koristiti da bi se pravilno prikazale. U takvim slučajevima "
-"koristi se odstupno kodiranje, koje možete zadati ovde. Postavite ga na "
-"kodiranje koje se najčešće koristi u vašem kraju sveta. Kao podrazumevano, "
-"koristi se kodiranje podešeno na nivou celog sistema."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Promena ovog sa podrazumevanog, „automatski“, usloviće korišćenje navedenog "
-"kodiranja za sve e-poruke, bez obzira šta one same navode."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Uključite ovo ako želite da se smeško kao :-) koji se pojavljuju u tekstu "
-"zamene emotikonima (malim slikama)."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Uključite ovu opciju da bi se prikazivali različiti nivoi citiranog teksta. "
-"Isključite da biste ih sakrili."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Nivo automatskog sažimanja:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Smanji veličinu fonta za citiran tekst"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Uključite ovu opciju da bi se citirani tekst prikazivao sa manjim fontom."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Pohrani poslate poruke ši&frovano"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Prikaži korisnički agent u pomodnim zaglavljima"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Uključite ovu opciju ako želite da se linije zaglavlja User-Agent i X-Mailer "
-"prikazuju u pomodnim zaglavljima."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Omogući brisanje priloga postojećih poruka."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Omogući uređivanje priloga postojećih poruka."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Uvek dešifrovati poruke pri pregledu ili pitati prethodno"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Šalji obaveštenja o raspoređivanju poruka sa praznim pošiljaocem."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Šalji obaveštenja o raspoređivanju poruka sa praznim znakovnim nizom "
-"pošiljaoca. Neki serveri mogu biti podešeni da odbacuju takve poruke, tako da "
-"ako imate problema sa slanjem MDN-ova, isključite ovu opciju."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Fraze su pretvorene u šablone"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Stare fraze su pretvorene u šablone"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Šablon poruke za novu poruku"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Šablon poruke za odgovor"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Šablon poruke za odgovor svima"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Šablon poruke za prosleđivanje"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Znakovi citiranja"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Dozvoli korisniku da menja postavke „van kancelarije“."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Dozvoli korisniku da šalje sito-skripte „van kancelarije“, ali zabrani promenu "
-"postavki, kao npr. domen na koji se reaguje i prekidač za spam."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "Šalji „van kancelarije“ samo na poruke pristigle sa ovog domena."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "Dozvoli slanje „van kancelarije“ na poruke označene kao spam."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Proveri da li je i dalje postavljen odgovor „van kancelarije“ pri pokretanju "
-"KMail-a."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 od %2 %3 iskorišćeno"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13954,6 +11929,11 @@ msgstr "Dodaj kao CC"
 msgid "Add as BCC"
 msgstr "Dodaj kao BCC"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "Otk&aži"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13969,14 +11949,17 @@ msgstr "Izabrani primaoci"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Izabrali ste %n primaoca, a podržano je maksimalno %1. Prilagodite svoj izbor.\n"
-"Izabrali ste %n primaoca, a podržano je maksimalno %1. Prilagodite svoj izbor.\n"
-"Izabrali ste %n primaoca, a podržano je maksimalno %1. Prilagodite svoj izbor."
+"Izabrali ste %n primaoca, a podržano je maksimalno %1. Prilagodite svoj "
+"izbor.\n"
+"Izabrali ste %n primaoca, a podržano je maksimalno %1. Prilagodite svoj "
+"izbor.\n"
+"Izabrali ste %n primaoca, a podržano je maksimalno %1. Prilagodite svoj "
+"izbor."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13992,8 +11975,8 @@ msgstr "Upotrebi dijalog za izbor adresa"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Ovo dugme otvara poseban dijalog u kome možete izabrati primaoce iz svih "
 "dostupnih adresa."
@@ -14098,13 +12081,22 @@ msgstr "je veće ili jednako od"
 msgid " bytes"
 msgstr " bajtova"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dana"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Da bi se vaša pretraga izvršila, sve poruke iz fascikle %1 moraju biti preuzete "
-"sa servera. To može potrajati. Želite li da nastavite sa pretragom?"
+"Da bi se vaša pretraga izvršila, sve poruke iz fascikle %1 moraju biti "
+"preuzete sa servera. To može potrajati. Želite li da nastavite sa pretragom?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14255,16 +12247,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Prikupljam podatke za nalog „%1“...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Prikupljam podatke za nalog „%1“...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14283,10 +12271,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Sadržaj skripte „%1“:\n"
+msgid "Contents of script '%1':\n"
+msgstr "Sadržaj skripte „%1“:\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14309,20 +12295,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve mogućnosti:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve mogućnosti:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Nisu dostupne poosebne mogućnosti)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Dostupne Sieve skripte:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Dostupne Sieve skripte:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14400,8 +12382,8 @@ msgstr "Koristite ovo polje da biste uneli proizvoljni statički potpis."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Koristite ovaj birač da biste naveli tekstualni fajl koji sadrži vaš potpis. "
 "Biće čitan svaki put kada napravite novu poruku ili dodate novi potpis."
@@ -14420,21 +12402,27 @@ msgstr "Otvara naznačeni fajl u uređivaču teksta."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Ovde možete dodati proizvoljnu naredbu, sa ili bez putanje u zavisnosti od toga "
-"da li je naredba u vašoj promenljivoj PATH. Za svaku novu poruku, KMail će "
-"izvršiti naredbu i upotrebiti ono što ona izbaci (na standardni izlaz) kao "
-"potpis. Uobičajene naredbe za ovaj mehanizam su „fortune“ ili „ksig -random“."
+"Ovde možete dodati proizvoljnu naredbu, sa ili bez putanje u zavisnosti od "
+"toga da li je naredba u vašoj promenljivoj PATH. Za svaku novu poruku, KMail "
+"će izvršiti naredbu i upotrebiti ono što ona izbaci (na standardni izlaz) "
+"kao potpis. Uobičajene naredbe za ovaj mehanizam su „fortune“ ili „ksig -"
+"random“."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "N&aznačite naredbu:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Putanja"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Nov unos:"
@@ -14468,6 +12456,11 @@ msgstr "Dodaj grupu"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Želite li zaista da uklonite ovu grupu i sve njene isečke?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Primeni &na:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Uredi isečak"
@@ -14480,6 +12473,10 @@ msgstr "Uredi grupu"
 msgid "Edit &group..."
 msgstr "Uredi &grupu..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Uredi..."
@@ -14518,13 +12515,13 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
-"Ako uključite ovu opciju, vrednost uneta desno biće sačuvana. Kada se kasnije "
-"ponovo javi ista promenljiva, čak i u drugom isečku, ova vrednost će biti "
-"podrazumevana za tu promenljivu."
+"Ako uključite ovu opciju, vrednost uneta desno biće sačuvana. Kada se "
+"kasnije ponovo javi ista promenljiva, čak i u drugom isečku, ova vrednost će "
+"biti podrazumevana za tu promenljivu."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14559,6 +12556,16 @@ msgstr "Ne uključuj"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Ne mogu da umetnem sadržaj iz fajla %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Za: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14588,58 +12595,51 @@ msgstr "Ne mogu da pokrenem cev-naredbu iz šablona: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ovde možete praviti šablone za poruke, koje koristite pri sastavljanju "
-"odgovora ili prosleđivanju poruke.</p>"
-"<p>Šabloni poruka podržavaju naredbe za smenu tako što ih jednostavno ukucate "
-"ili izaberete ih iz menija <i>Umetni naredbu</i>.</p>"
-"<p>Ovde navedeni šabloni su posebni za ovu fasciklu. Oni imaju prioritet i nad "
-"globalnim šablonima i nad šablonima prema identitetu.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Ovde možete praviti šablone za poruke, koje koristite pri "
+"sastavljanju odgovora ili prosleđivanju poruke.</p><p>Šabloni poruka "
+"podržavaju naredbe za smenu tako što ih jednostavno ukucate ili izaberete ih "
+"iz menija <i>Umetni naredbu</i>.</p><p>Ovde navedeni šabloni su posebni za "
+"ovu fasciklu. Oni imaju prioritet i nad globalnim šablonima i nad šablonima "
+"prema identitetu.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ovde možete praviti šablone za poruke, koje koristite pri sastavljanju "
-"odgovora ili prosleđivanju poruke.</p>"
-"<p>Šabloni poruka podržavaju naredbe za smenu tako što ih jednostavno ukucate "
-"ili izaberete ih iz menija <i>Umetni naredbu</i>.</p>"
-"<p>Ovde navedeni šabloni važe za dati identitet. Oni imaju prioritet nad "
-"globalnim šablonima, ali ih potiskuju šabloni posebni za fascikle.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Ovde možete praviti šablone za poruke, koje koristite pri "
+"sastavljanju odgovora ili prosleđivanju poruke.</p><p>Šabloni poruka "
+"podržavaju naredbe za smenu tako što ih jednostavno ukucate ili izaberete ih "
+"iz menija <i>Umetni naredbu</i>.</p><p>Ovde navedeni šabloni važe za dati "
+"identitet. Oni imaju prioritet nad globalnim šablonima, ali ih potiskuju "
+"šabloni posebni za fascikle.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ovde možete praviti šablone za poruke, koje koristite pri sastavljanju "
-"odgovora ili prosleđivanju poruke.</p>"
-"<p>Šabloni poruka podržavaju naredbe za smenu tako što ih jednostavno ukucate "
-"ili izaberete ih iz menija <i>Umetni naredbu</i>.</p>"
-"<p>Ovo je globalni (podrazumevani) šablon. Ima manji prioritet i od šablona "
-"prema identitetu i od šablona posebnih za fascikle.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Ovde možete praviti šablone za poruke, koje koristite pri "
+"sastavljanju odgovora ili prosleđivanju poruke.</p><p>Šabloni poruka "
+"podržavaju naredbe za smenu tako što ih jednostavno ukucate ili izaberete ih "
+"iz menija <i>Umetni naredbu</i>.</p><p>Ovo je globalni (podrazumevani) "
+"šablon. Ima manji prioritet i od šablona prema identitetu i od šablona "
+"posebnih za fascikle.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14891,6 +12891,10 @@ msgstr "Provuci telo tekuće poruke i umetni rezultat kakav jeste"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Provuci telo tekuće poruke i zameni rezultatom"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Postavi položaj kursora"
@@ -14923,111 +12927,6 @@ msgstr "Uključi ispravljanje"
 msgid "Turn Debug Off"
 msgstr "Isključi ispravljanje"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...da možete ići na sledeću ili prethodnu poruku koristeći levu ili desnu "
-"strelicu na tastaturi?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...da možete brzo da napravite filtere po pošiljaocu,\n"
-"primaocu i diskusionoj listi koristeći <em>Alati-&gt;Napravi&nbsp;filter</em>"
-"?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...da se možete otarasiti „[imena diskusione liste]“\n"
-"koje se dodaje temi u nekim litama koristeći filtersku\n"
-"akciju <em>ponovo napiši zaglavlje</em>? Samo iskoristite\n"
-"<pre>rewrite header &quot;Tema&quot;\n"
-"   replace &quot;\\s*\\[ime diskusione liste\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...da možete da pridružite diskusionu listu fascikli u dijalogu\n"
-"<em>Fascikla-&gt;Upravljanje diskusionom listom...</em>? Onda možete koristiti\n"
-"<em>Poruka-&gt;Nova&nbsp;poruka&nbsp;u&nbsp; diskusionoj&nbsp;listi...</em>\n"
-"da otvorite sastavljač sa postavljenom adresom diskusione liste.\n"
-"Drugačije, možete kliknuti srednjim tasterom miša na fasciklu.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...da možete dodelite posebne ikone svakoj fascikli?\n"
-"Pogledajte <em>Fascikla-&gt;Svojstva...</em>.</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...da KMail može da prikaže traku sa bojom koja označava vrstu\n"
-"poruke (običan tekst/HTML/OpenPGP) koja je trenutno prikazana?</p>\n"
-"<p>Ovo osujećuje pokušaje da se lažira uspešna provera potpisa\n"
-"slanjem HTML poruka koje glume KMail-ove statusne okvire.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...da možete filtrirati po bilo kom zaglavlju jednostavno\n"
-"unoseći njegovo ime u prvo polje za uređivanje pravila pretrage?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...da možete isfiltrirati samo-HTML poruke pravilom\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...da je kada odgovarate samo označeni deo poruke citiran?</p>\n"
-"<p>Ako ništa nije označeno cela poruka je citirana.</p>\n"
-"<p>Ovo radi čak i za tekstualne priloge kada koristite\n"
-"<em>Prikaz-&gt;Prilozi-&gt;Ugrađeno</em>.</p>\n"
-"<p>Ova opcija je dostupna za sve naredbe odgovora sem za\n"
-"<em>Poruka-&gt;Odgovori bez citata</em>.</p>\n"
-"<p align=\"right\"><em>poslao Dejvid F. Njuman (David F. Newman)</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Nema akcija za opozivanje."
@@ -15092,6 +12991,15 @@ msgstr "Prilog: #%1 (bez imena)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Prikaži dnevnik revizije GnuPG-a za ovu operaciju"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Fajl sa imenom „%1“ već postoji. Želite li da ga prebrišete?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Prebriši fajl?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15209,13 +13117,13 @@ msgstr "Pošalji &sliku sa svakom porukom"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Uključite ovo ako želite da KMail doda tzv. zaglavlje X-Face porukama pisanim "
-"pod ovim identitetom. X-Face je mala (48x48 piksela) crno-bela slika koju neki "
-"e-poštanski klijenti mogu da prikažu."
+"Uključite ovo ako želite da KMail doda tzv. zaglavlje X-Face porukama "
+"pisanim pod ovim identitetom. X-Face je mala (48x48 piksela) crno-bela slika "
+"koju neki e-poštanski klijenti mogu da prikažu."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15243,13 +13151,14 @@ msgstr "Izaberite fajl..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Upotrebite ovo da biste izabrali fajl sa slikom prema kome će crno-bela slika "
-"biti napravljena. Slika u fajlu bi trebalo da bude sa visokim kontrastom i "
-"skoro kvadratnim oblikom. Svetla pozadina takođe poboljšava rezultat."
+"Upotrebite ovo da biste izabrali fajl sa slikom prema kome će crno-bela "
+"slika biti napravljena. Slika u fajlu bi trebalo da bude sa visokim "
+"kontrastom i skoro kvadratnim oblikom. Svetla pozadina takođe poboljšava "
+"rezultat."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15257,21 +13166,21 @@ msgstr "Postavi iz adresara"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Možete upotrebiti umanjenu verziju slike koju ste postavili uz svoj unos u "
 "adresaru."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail može da šalje male slike (48x48 piksela), niskog kvaliteta i "
-"crno-bele, sa svakom porukom. Na primer, to može biti vaša slika ili neki "
-"simbol. Prikazuje se u poštanskom klijentu primaoca (ako je podržano)."
+"<qt>KMail može da šalje male slike (48x48 piksela), niskog kvaliteta i crno-"
+"bele, sa svakom porukom. Na primer, to može biti vaša slika ili neki simbol. "
+"Prikazuje se u poštanskom klijentu primaoca (ako je podržano)."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -15280,11 +13189,11 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Primeri su dostupni na <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Primeri su dostupni na <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
+"www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15299,128 +13208,1782 @@ msgstr "Nema slike"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Niste definisali sopstveni kontakt u adresaru."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Ukupno: %2<br>Nepročitano: %3<br>Veličina: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Potpisivanje"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Kvota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Automatski potpisuj poruke"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Postavi temu poruke"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Kada je ova opcija uključena, podrazumevano će sve poruke koje šaljete "
+"poruke biti potpisane. Naravno, još uvek je moguće isključiti potpisivanje "
+"za svaku poruku ponaosob."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Pošalji CC: na „adresu“"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Šifrovanje"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Pošalji BCC: na „adresu“"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "Kada se šifruju poruke, uvek š&ifruj i sertifikat mog identiteta"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Dodaj „zaglavlje“ poruci"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Kada je ova opcija uključena, poruka/fajl neće biti šifrovana samo "
+"primaočevim javnim ključem, već i vašim. Ovo će vam omogućiti da dešifrujete "
+"poruku/fajl u nekom kasnijem trenutku, što je obično dobra ideja."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Čitaj telo poruke iz „fajla“"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Prikaži &potpisan/šifrovan tekst posle sastavljanja"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Postavi telo poruke"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Kada je ova opcija uključena, potpisan/šifrovan tekst će biti prikazan u "
+"odvojenom prozoru, omogućavajući vam da znate kako će izgledati pre slanja. "
+"Ovo je dobra ideja kada proveravate da li vaš sistem za šifrovanje radi."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Dodaj prilog poruci. Ovo se može ponavljati"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Pohrani poslate poruke ši&frovano"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Samo proveri da li ima nove pošte"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Kliknite ovde da biste pohranjivali poruke u šifrovanom obliku "
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Samo otvori prozor sastavljača"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Pohranjivanje poruka u šifrovanom obliku</h1>\n"
+"Kada je ova opcija uključena, poslate poruke se pohranjuju šifrovane. Ovo "
+"nije preporučljivo pošto nećete moći da čitate poruke kada potrebni "
+"sertifikat istekne.\n"
+"<p>\n"
+"Ipak, možda postoje lokalna pravila koja nalažu da uključite ovu opciju. Ako "
+"niste sigurni, pitajte vašeg lokalnog administratora.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Prikaži dati fajl poruke"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Uvek prikaži ključeve za šifrovanje &radi odobrenja"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "Pošalji poruku na „adresu“ i priloži fajl na koji „URL“ ukazuje."
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Kada je ova opcija uključena, program će vam uvek prikazati listu javnih "
+"ključeva iz koje možete izabrati onaj koji ćete koristiti za šifrovanje. Ako "
+"je isključena, program će prikazati dijalog samo ako ne može da nađe pravi "
+"ključ ili ako ih ima nekoliko koji mogu biti upotrebljeni."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "pročitana"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Automatski šifruj poruke &kad god je to moguće"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "stara"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Kada je ova opcija uključena, sve će poruke podrazumevano biti šifrovane kad "
+"god je to moguće i poželjno. Naravno, još uvek je moguće isključiti "
+"automatsko šifrovanje za svaku poruku ponaosob."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "obrisana"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Nikad ne potpisuj/šifruj prilikom snimanja kao ne&dovršeno"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "odgovorena"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Kako ovo radi?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "prosleđena"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Univerzalna"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "stavljena u red"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Odgovor"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "poslata"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Odgovor svima"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "posmatrana"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Prosleđena"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "ignorisana"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Prečica:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "spam"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Tip šablona:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "ham"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Sadržaj šablona"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "posao"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Prečica šablona"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "sadrži prilog"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Tip šablona"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 od %2 %3 iskorišćeno"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Svojstva fascikle"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Putanja"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Fascikla sadrži &diskusionu listu"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Adresa liste:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "U&običajena:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Nepročitana:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Zastarevanje poruka"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "I&zbaci posle:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Izbaci p&ročitane poruke"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Izbaci po&sle:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Izbaci &nepročitane poruke"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Dana"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Sedmica"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Meseci"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Napredno"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Identitet pošiljao&ca:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Format pohranjivanja:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Prikazi &lista:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Pošalji spremljenu poštu pri proveri pošte"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Fajl sa imenom „%1“ već postoji. Želite li da ga prebrišete?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Izaberite da li želite da KMail šalje sve poruke u odlaznom sandučetu "
+"pri ručnoj ili pri svim proverama pošte, ili čak da uopšte ne želite "
+"automatsko slanje poruka.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Prebriši fajl?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Automatski premesti nesinhornizovanu poštu iz fascikli sa nedovoljnim "
+"pravima pristupa"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Ako u fascikli ima novih poruka koje još uvek nisu poslate na server, ali "
+"nemate dovoljna prava pristupa za fasciklu da biste ih poslali, te poruke će "
+"biti automatski premeštene u fasciklu izgubljenog i nađenog."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Lokalne zastavice moguće u fasciklama samo-za-čitanje"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Ova postavka omogućava administratorima da podese najmanji period između dve "
+"provere pošte. Korisnik neće moći da izabere manju vrednost od ovde navedene."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Najskorije izabrana fascikla u dijalogu za izbor fascikli."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Zanemari korisnikov umask i koristi „čitanje-pisanje samo za korisnika“ "
+"umesto toga"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Politika prikazivanja ikone u sistemskoj kaseti"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Zatvori program kada se zatvori glavni prozor, čak i ako je aktivna ikona u "
+"sistemskoj kaseti."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Opširno obaveštenje o novoj pošti"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Ako je ova opcija uključena, u obaveštenju o novoj pošti biće prikazan broj "
+"novopristiglih poruka za svaku fasciklu. U suprotnom, dobićete samo "
+"jednostavnu poruku „Stigla vam je pošta“."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Navedite u&ređivač:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Koristi &spoljni uređivač umesto sastavljača"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "Prag upozoravanja korisnika da se fascikla bliži ograničenju kvote."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Uključi groupware funkcionalnost"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Obrni „Od:/Za:“ zaglavlja u odgovorima na odgovore"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft-ov Outlook ima brojne nedostatke u svojoj implementaciji iCalendar "
+"standarda; ova opcija je tu da zaobiđe jedan od njih. Ako imate problema sa "
+"korisnicima Outlook-a koji ne mogu da dobiju vaše odgovore, pokušajte da "
+"uključite ovu opciju."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Pošalji groupware pozivnice u telu poruke"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft-ov Outlook ima brojne nedostatke u svojoj implementaciji iCalendar "
+"standarda; ova opcija je tu da zaobiđe jedan od njih. Ako imate problema sa "
+"korisnicima Outlook-a koji ne mogu da dobiju vaše pozivnice, pokušajte da "
+"uključite ovu opciju."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Imenovanje pozivnica kompatibilno sa Exchange-om"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft-ov Outlook, kada se koriste zajedno sa Microsoft-ovim Exchange "
+"serverom, ima problema sa razumevanjem standardu-saglasnim groupware e-"
+"porukama. Uključite ovu opciju da bi se groupware pozivnice slale na način "
+"koji Exchange sigurno razume."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Kada je ovo uključeno, nećete videti prozor sastavljača poruke. Umesto toga, "
+"sve poruke sa pozivnicama šalju se automatski. Ako želite da vidite poruku "
+"pre slanja, možete isključiti ovu opciju. Međutim, budite svesni da je tekst "
+"u prozoru sastavljača napisan po sintaksi iCalendar-a, zbog čega ne bi "
+"trebalo ručno da ga menjate."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Obriši pozivnice pošto se pošalje odgovor na njih"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"Ako je uključeno, primljene e-poruke pozivnica na koje se se odgovori "
+"premeštaju se u fasciklu smeća, čim se odgovor uspešno pošalje."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Uključivanje ovoga čini mogućim skladištenje stavki iz kontakt-programa "
+"(KOrganizer, KAddressBook i KNotes.)</p><p>Ako želite da koristite ovu "
+"opciju, morate takođe podesiti programe da koriste IMAP resurs; ovo se radi "
+"u Kontrolnom centru TDE-a.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Obično nema razloga da vidite fascikle koje sadrže IMAP resurse. Ali ako "
+"je potrebno da ih vidite, možete to postaviti ovde.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Ako se nalog za skladištenje groupware podataka ne koristi za upravljanje "
+"običnom poštom, uključite ovu opciju da bi se za njega prikazivale samo "
+"groupware fascikle. Ovo je korisno kada običnom poštom upravljate preko "
+"dodatnog IMAP naloga na vezi.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Izaberite format skladištenja za groupware fascikle. "
+"<ul><li>Podrazumevani formati su ical (za kalendarske fascikle) i vcard (za "
+"adresarske fascikle). Ovi formati čine dostupnim sve mogućnosti Kontact-a.</"
+"li><li>Format Kolab XML koristi poseban model koji bliže odgovara onome koji "
+"se koristi u Outlook-u. Ovaj format daje veću kompatibilnost sa Outlook-om, "
+"prilikom upotrebe Kolab servera ili kompatibilnog rešenja.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Ovo bira roditelja IMAP resursnih fascikli.</p><p>Podrazumevano, Kolab "
+"server postavlja da dolazno IMAP sanduče bude roditelj.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Ovo je id. naloga koji sadrži IMAP resursne fascikle.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Ako želite da postavite imena fascikli IMAP skladištenja na svoj jezik, "
+"možete izabrati između dostupnih jezika.</p><p>Jedini razlog za ovako nešto "
+"je očuvanje kompatibilnosti sa Microsoft-ovim Outlook-om. Postavljanje ovoga "
+"smatra se lošom idejom, pošto čini promenu jezika nemogućom.</p><p>Zato ne "
+"koristite ovo ako ne morate.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Takođe filtriraj novu poštu primljenu u groupware fasciklama."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr "Sinhornizuj groupware izmene u IMAP fasciklama čim se pređe na vezu."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Ova vrednost se koristi da bi se naznačilo da li prikazivati „Uvod u KMail“."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maksimalan broj veza po domaćinu"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ovo se može koristiti za ograničavanje broja veza po domaćinu dok se "
+"dobavlja nova pošta. Podrazumevno je broj veza neograničen (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Prikaži liniju za brzu pretragu"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ova opcija uključuje ili isključuje liniju za pretragu iznad liste poruka, "
+"pomoću koje se može brzo potražiti informacija prikazana u listi poruka."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Sakrij lokalno prijemno sanduče ako se ne koristi"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Prosleđivanje u liniji kao podrazumevano."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "Tačka-zarez (;) dozvoljena kao razdvajač u sastavljaču poruka."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Zadrži originalni skup znakova prilikom odgovaranja ili prosleđivanja (ako "
+"je moguće)"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "A&utomatski umetni potpis"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamti ovaj identitet, kako bi se koristio i u budućim prozorima "
+"sastavljača.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Zapamti ovu fasciklu za poslate poruke, kako bi se koristila i u budućim "
+"prozorima sastavljača."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Zapamti ovaj transport pošte, kako bi se koristio i u budućim prozorima "
+"sastavljača."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Zapamti ovaj identitet, kako bi se koristio i u budućim prozorima "
+"sastavljača.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Prelom &teksta na koloni:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Maksimalan broj linija uređivača primalaca."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Uključite ovu opciju ako želite da Outlook &#8482; razume imena priloga koja "
+"sadrže neengleska slova"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Auto&matski zahtevaj obaveštenja o raspoređivanju poruke"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Uključite ovu opciju ako želite da KMail zahteva obaveštenja o "
+"raspoređivanju poruke (MDN) za svaku vašu odlazeću poruku.</p><p>Ova opcija "
+"utiče samo na podrazumevano; u sastavljaču uvek možete uključiti ili "
+"isključiti zahtevanje MDN-a za svaku poruku preko stavke u meniju "
+"<em>Opcije</em>-&gt;<em>Zahtevaj ovaveštenje o raspoređivanju</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Koristi skorašnje e-drese za samodovršavanje"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Isključite ovu opciju ako ne želite da se skoro korišćene adrese pojavljuju "
+"na listi za samodovršavanje u polju adrese sastavljača."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Period automatskog snimanja:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Rezervna kopija teksta u prozoru sastavljača može se regularno praviti. Ovde "
+"se postavlja period posle koga se pravi rezerva. Možete isključiti "
+"automatsko snimanje postavljanjem perioda na 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Umeći potpise iznad citiranog teksta"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Zameni prepoznati prefi&ks sa „Odg. :“"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Zameni prepoznati prefiks sa „&Pros. :“"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Koristi pametno &citiranje"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Potpis je istekao."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Vrsta izbora primaoca"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr "Postavlja vrstu dijaloga za izbor primalaca u poljima Za, CC i BCC."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Vrsta uređivača primalaca"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "Postavlja vrstu uređivača primalaca, za uređivanje polja Za, CC i BCC."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maksimalan broj linija uređivača primalaca."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Lista tipova delova poruka koje treba ukloniti kada se poruka prosleđuje u "
+"liniji."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Najveća veličina u megabajtima koju mogu imati prilozi."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Prikaži panel za umetanje i upravljanje isečcima teksta u sastavljaču."
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Prikaži dnevnik revizije GnuPG-a čak i kada je šifrarski postupak uspešno "
+"dovršen."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Zadrži originalni skup znakova prilikom odgovaranja ili prosleđivanja (ako "
+"je moguće)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Neke e-poruke, posebno one automatski generisane, ne navode kodiranje "
+"znakova koje se mora koristiti da bi se pravilno prikazale. U takvim "
+"slučajevima koristi se odstupno kodiranje, koje možete zadati ovde. "
+"Postavite ga na kodiranje koje se najčešće koristi u vašem kraju sveta. Kao "
+"podrazumevano, koristi se kodiranje podešeno na nivou celog sistema."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Promena ovog sa podrazumevanog, „automatski“, usloviće korišćenje navedenog "
+"kodiranja za sve e-poruke, bez obzira šta one same navode."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Uključite ovo ako želite da se smeško kao :-) koji se pojavljuju u tekstu "
+"zamene emotikonima (malim slikama)."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Uključite ovu opciju da bi se prikazivali različiti nivoi citiranog teksta. "
+"Isključite da biste ih sakrili."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Nivo automatskog sažimanja:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Smanji veličinu fonta za citiran tekst"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Uključite ovu opciju da bi se citirani tekst prikazivao sa manjim fontom."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Pohrani poslate poruke ši&frovano"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Prikaži korisnički agent u pomodnim zaglavljima"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Uključite ovu opciju ako želite da se linije zaglavlja User-Agent i X-Mailer "
+"prikazuju u pomodnim zaglavljima."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Omogući brisanje priloga postojećih poruka."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Omogući uređivanje priloga postojećih poruka."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Uvek dešifrovati poruke pri pregledu ili pitati prethodno"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Šalji obaveštenja o raspoređivanju poruka sa praznim pošiljaocem."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Šalji obaveštenja o raspoređivanju poruka sa praznim znakovnim nizom "
+"pošiljaoca. Neki serveri mogu biti podešeni da odbacuju takve poruke, tako "
+"da ako imate problema sa slanjem MDN-ova, isključite ovu opciju."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Fraze su pretvorene u šablone"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Stare fraze su pretvorene u šablone"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Šablon poruke za novu poruku"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Šablon poruke za odgovor"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Šablon poruke za odgovor svima"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Šablon poruke za prosleđivanje"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Znakovi citiranja"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Dozvoli korisniku da menja postavke „van kancelarije“."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Dozvoli korisniku da šalje sito-skripte „van kancelarije“, ali zabrani "
+"promenu postavki, kao npr. domen na koji se reaguje i prekidač za spam."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "Šalji „van kancelarije“ samo na poruke pristigle sa ovog domena."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "Dozvoli slanje „van kancelarije“ na poruke označene kao spam."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Proveri da li je i dalje postavljen odgovor „van kancelarije“ pri pokretanju "
+"KMail-a."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Uredi &fajl"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Uredi..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Idi"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Fascikla"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Poruka"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Odgovori posebno"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Prosledi"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Oblačići"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Postavke isečka"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML traka"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Uobičajene opcije"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML traka"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Proveravaj sertifikate pomoću CRL-ova"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Ako je ova opcija izabrana, S/MIME sertifikati proveravaju se koristeći "
+"liste opozivanja sertifikata (CRL-ove)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Proveri sertifikate na vezi (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Ako je ova opcija izabrana, S/MIME sertifikati proveravaju se na vezi "
+"koristeći protokol za status sertifikata na vezi (OCSP). Popunite ispod URL "
+"OCSP respondera."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Provera sertifikata na vezi"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL OCSP respondera:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Ovde unesite adresu servera za proveru sertifikata na vezi (OCSP "
+"respondera). URL obično počinje sa http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Potpis OCSP respondera:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignoriši servisni URL sertifikata"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Nemoj da proveravaš politike sertifikata"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Podrazumevano GnuPG koristi fajl ~/.gnupg/policies.txt da proveri da li je "
+"politika sertifikata dozvoljena. Ako je ova opcija izabrana, politike neće "
+"biti proveravane."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Nikada ne razmatraj CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ako je ova opcija uključena, liste opozivanja sertifikata nikada se ne "
+"koriste za proveru S/MIME sertifikata."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Preuzmi nedostajuće sertifikate izdavača"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Ako je ova opcija uključena, nedostajući sertifikati izdavača se preuzimaju "
+"kada je potrebno (ovo važi za oba metoda provere, CRL-ove i OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP zahtevi"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Ne izvršavaj nijedan HTTP zahtev"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Potpuno isključuje upotrebu HTTP-a za S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Koristi ovaj proksi za HTTP zahteve: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Koristi sistemski HTTP proksi:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Ako je ova opcija izabrana, vrednost HTTP proksija prikazana levo (dolazi iz "
+"promenljive okruženja http_proxy) biće korišćena za sve HTTP zahteve."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Unesite ovde lokaciju HTTP proksija koji treba koristiti za sve HTTP zahteve "
+"u vezi sa S/MIME-ovima. Sintaksa je domacin:port, npr. mojproksi.nigde."
+"com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignoriši distribucionu tačku HTTP CRL-ova sertifikata"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Pri traženju lokacije CRL-a, sertifikat koji će biti testiran obično sadrži "
+"unose za  takozvane „distribucione tačke CRL-ova“ (DP); to su URL-ovi koji "
+"opisuju način pristupa do CRL-ova. Koristi se prvi pronađeni DP unos. Ovom "
+"opcijom ignorišu se svi unosi koji koriste HTTP šemu pri traženju pogodne DP."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP zahtevi"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Ne izvršavaj nijedan LDAP zahtev"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Potpuno isključuje upotrebu LDAP-a za S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignoriši distribucionu tačku LDAP CRL-ova sertifikata"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Pri traženju lokacije CRL-a, sertifikat koji će biti testiran obično sadrži "
+"unose za  takozvane „distribucione tačke CRL-ova“ (DP); to su URL-ovi koji "
+"opisuju način pristupa do CRL-ova. Koristi se prvi pronađeni DP unos. Ovom "
+"opcijom ignorišu se svi unosi koji koriste LDAP šemu pri traženju pogodne DP."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Primarni domaćin za LDAP zahteve:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Svi LDAP zahtevi će prvo ići na LDAP server koji ovde unesete. Preciznije, "
+"ovo podešavanje gazi bilo koji domaćin i port naveden u LDAP URL-u, a "
+"koristi se i ako su domaćin i port izostavljeni u URL-u. Drugi LDAP serveri "
+"koriste se samo ako veza sa proksijem ne uspe.\n"
+"Sintaksa je „DOMACIN“ ili „DOMACIN:PORT“. Ako se port izostavi, koristiće se "
+"389 (standardni LDAP port)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Dodaj isečak"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Dodaj"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Isečak:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Grupa:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Postavke isečka"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Oblačići"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Prikaži tekst isečka u &oblačiću"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "Određuje da li se daje oblačić sa tekstom iz markirane linije"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Promenljive"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Metod unosa za promenljive"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Jedinstveni dijalog za svaku promenljivu u isečku"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "Za svaku promenljivu u okviru isečka daje se dijalog za unos"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Jedan dijalog za sve promenljive u isečku"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Daje se jedan jedini dijalog u kome možete uneti vrednosti svih promenljivih "
+"u okviru isečka."
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Razdvajač:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "TemplatesConfiguration"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Odgovor pošiljaocu"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Odgovor svima / odgovor na listu"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Prosleđena poruka"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Upozori pri pokušaju slanja &nepotpisanih poruka"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Uključite ovo ako želite da budete upozoreni pri slanju nepotpisanih poruka."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje pri pokušaju slanja nepotpisanih poruka</h1>\n"
+"Ako je ova opcija uključena, bićete upozoreni kada pokušate da pošaljete "
+"delove ili celu poruku nepotpisanu.\n"
+"<p>\n"
+"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Upozori pri pokušaju slanja nešifrovanih poruka"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Uključite ovu opciju ako želite da budete upozoreni pri slanju nešifrovanih "
+"poruka."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje pri slanju nešifrovanih poruka</h1>\n"
+"Ako je ova opcija uključena, bićete upozoreni kada pokušate da pošaljete "
+"delove ili celu poruku nešifrovanu.\n"
+"<p>\n"
+"Preporučljivo je ostaviti ovu opciju uključenu za maksimalni integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Upozori ako e-adresa p&rimaoca nije u sertifikatu"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+"Uključite ovu opciju ako želite da budete upozoreni ako adresa nije u "
+"sertifikatu"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako primaočeva e-adresa nije u sertifikatu</h1>\n"
+"Ako je ova opcija uključena, bićete upozoreni ako e-adresa primaoca nije "
+"sadržana u sertifikatu koji se koristi za šifrovanje.\n"
+"<p>\n"
+"Radi maksimalne bezbednosti preporučuje se da ovu opciju držite uključenom.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Upozori ako sertifikati/ključevi uskoro ističu (ispod podesite pragove)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Za potpisivanje"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Za šifrovanje"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Ovde odaberite broj dana"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako sertifikat za potpisivanje ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi sertifikat za potpisivanje trebalo "
+"da bude važeći pre davanja obaveštenja.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako sertifikat za šifrovanje ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi sertifikat za šifrovanje trebalo da "
+"bude važeći pre davanja obaveštenja.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako sertifikat u lancu ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi svi sertifikati u lancu trebalo da "
+"budu važeći pre davanja upozorenja.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako CA sertifikat ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi CA sertifikat trebalo da bude važeći "
+"pre davanja obaveštenja.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Upozorenje ako koreni sertifikat ističe</h1>\n"
+"Odaberite najmanji broj dana za koje bi koreni sertifikat trebalo da bude "
+"važeći pre davanja obaveštenja.\n"
+"<p>\n"
+"Preporučena postavka za SPHINX je četrnaest dana.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Za korene sertifikate:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Za posredničke CA sertifikate:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Za krajnje korisničke sertifikate/ključeve:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Ponovo uključi sva isključena upozorenja"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...da možete ići na sledeću ili prethodnu poruku koristeći levu ili desnu "
+"strelicu na tastaturi?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...da možete brzo da napravite filtere po pošiljaocu,\n"
+"primaocu i diskusionoj listi koristeći <em>Alati-&gt;Napravi&nbsp;filter</"
+"em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...da se možete otarasiti „[imena diskusione liste]“\n"
+"koje se dodaje temi u nekim litama koristeći filtersku\n"
+"akciju <em>ponovo napiši zaglavlje</em>? Samo iskoristite\n"
+"<pre>rewrite header &quot;Tema&quot;\n"
+"   replace &quot;\\s*\\[ime diskusione liste\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...da možete da pridružite diskusionu listu fascikli u dijalogu\n"
+"<em>Fascikla-&gt;Upravljanje diskusionom listom...</em>? Onda možete "
+"koristiti\n"
+"<em>Poruka-&gt;Nova&nbsp;poruka&nbsp;u&nbsp; diskusionoj&nbsp;listi...</em>\n"
+"da otvorite sastavljač sa postavljenom adresom diskusione liste.\n"
+"Drugačije, možete kliknuti srednjim tasterom miša na fasciklu.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...da možete dodelite posebne ikone svakoj fascikli?\n"
+"Pogledajte <em>Fascikla-&gt;Svojstva...</em>.</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...da KMail može da prikaže traku sa bojom koja označava vrstu\n"
+"poruke (običan tekst/HTML/OpenPGP) koja je trenutno prikazana?</p>\n"
+"<p>Ovo osujećuje pokušaje da se lažira uspešna provera potpisa\n"
+"slanjem HTML poruka koje glume KMail-ove statusne okvire.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...da možete filtrirati po bilo kom zaglavlju jednostavno\n"
+"unoseći njegovo ime u prvo polje za uređivanje pravila pretrage?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...da možete isfiltrirati samo-HTML poruke pravilom\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...da je kada odgovarate samo označeni deo poruke citiran?</p>\n"
+"<p>Ako ništa nije označeno cela poruka je citirana.</p>\n"
+"<p>Ovo radi čak i za tekstualne priloge kada koristite\n"
+"<em>Prikaz-&gt;Prilozi-&gt;Ugrađeno</em>.</p>\n"
+"<p>Ova opcija je dostupna za sve naredbe odgovora sem za\n"
+"<em>Poruka-&gt;Odgovori bez citata</em>.</p>\n"
+"<p align=\"right\"><em>poslao Dejvid F. Njuman (David F. Newman)</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Prikaži liniju za brzu pretragu fascikli"
diff --git a/tde-i18n-ss/messages/tdepim/kmail.po b/tde-i18n-ss/messages/tdepim/kmail.po
index 864fce138b8..b8c6c3793ac 100644
--- a/tde-i18n-ss/messages/tdepim/kmail.po
+++ b/tde-i18n-ss/messages/tdepim/kmail.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2002-11-10 00:41+0200\n"
 "Last-Translator: Adam Mathebula <adam@translate.org.za>\n"
 "Language-Team: Siswati <siswati@translate.org.za>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Adam Mathebula"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -164,6 +164,11 @@ msgstr ""
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+msgid "Clear"
+msgstr ""
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -238,9 +243,9 @@ msgstr ""
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -262,12 +267,12 @@ msgstr ""
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -296,8 +301,9 @@ msgstr ""
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -347,13 +353,15 @@ msgstr ""
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr ""
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr ""
 
@@ -397,9 +405,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -456,9 +464,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -497,7 +505,7 @@ msgstr "<none>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr ""
 
@@ -505,28 +513,29 @@ msgstr ""
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -535,23 +544,23 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -559,8 +568,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -632,8 +641,8 @@ msgstr ""
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -671,9 +680,9 @@ msgstr ""
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -736,8 +745,7 @@ msgstr ""
 msgid "Server Information"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "<none>"
@@ -871,17 +879,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -914,10 +921,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -928,8 +934,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -939,8 +945,8 @@ msgstr ""
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -949,8 +955,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1123,8 +1129,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1144,8 +1150,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1174,15 +1180,15 @@ msgstr ""
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1212,15 +1218,18 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr ""
 
+#: configuredialog.cpp:219
+msgid "Configure"
+msgstr ""
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr ""
@@ -1250,6 +1259,10 @@ msgstr ""
 msgid "Remove Identity"
 msgstr ""
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+msgid "&Remove"
+msgstr ""
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr ""
@@ -1258,6 +1271,10 @@ msgstr ""
 msgid "Modify..."
 msgstr ""
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+msgid "Remove"
+msgstr ""
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr ""
@@ -1274,17 +1291,15 @@ msgstr ""
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr ""
@@ -1306,8 +1321,7 @@ msgstr ""
 msgid "Common Options"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr ""
@@ -1358,14 +1372,14 @@ msgstr ""
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1383,9 +1397,9 @@ msgstr ""
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr ""
 
@@ -1464,6 +1478,10 @@ msgstr ""
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr ""
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr ""
@@ -1572,8 +1590,7 @@ msgstr ""
 msgid "Misspelled Words"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr ""
@@ -1761,8 +1778,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1771,40 +1788,33 @@ msgstr ""
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1819,8 +1829,7 @@ msgstr ""
 msgid "Show s&pam status in fancy headers"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1829,8 +1838,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1856,8 +1864,7 @@ msgstr ""
 msgid "&Override character encoding:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr ""
@@ -1956,13 +1963,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -1986,21 +1992,20 @@ msgstr ""
 msgid "&Forward:"
 msgstr ""
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr ""
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr ""
 
@@ -2036,8 +2041,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2072,10 +2077,9 @@ msgstr ""
 msgid "Ne&w"
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr ""
@@ -2084,16 +2088,15 @@ msgstr ""
 msgid "&Value:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2120,13 +2123,13 @@ msgstr ""
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2151,62 +2154,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2223,10 +2220,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2304,8 +2301,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2334,8 +2330,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2359,8 +2355,8 @@ msgstr ""
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2427,16 +2423,14 @@ msgstr ""
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2470,32 +2464,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2561,8 +2550,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2571,8 +2560,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2625,19 +2614,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2650,14 +2638,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2762,17 +2750,16 @@ msgstr ""
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2789,15 +2776,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2864,8 +2851,8 @@ msgstr ""
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3104,6 +3091,10 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#: filterimporterexporter.cpp:65
+msgid "Select All"
+msgstr ""
+
 #: filterimporterexporter.cpp:67
 msgid "Unselect All"
 msgstr ""
@@ -3132,8 +3123,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3150,10 +3141,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3174,10 +3166,10 @@ msgstr ""
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3186,7 +3178,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr ""
@@ -3227,9 +3219,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3279,8 +3271,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3291,8 +3283,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
@@ -3318,8 +3309,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3349,7 +3340,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr ""
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr ""
@@ -3373,9 +3364,9 @@ msgstr ""
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3396,11 +3387,20 @@ msgstr ""
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr ""
@@ -3514,39 +3514,13 @@ msgstr ""
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr ""
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr ""
 
 #: identitydialog.cpp:93
@@ -3559,12 +3533,9 @@ msgstr ""
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3573,11 +3544,9 @@ msgstr ""
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3586,14 +3555,11 @@ msgstr ""
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3602,21 +3568,12 @@ msgstr ""
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3639,12 +3596,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3657,20 +3613,18 @@ msgstr ""
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3689,11 +3643,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3706,18 +3659,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3738,14 +3690,12 @@ msgstr ""
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3754,15 +3704,12 @@ msgstr ""
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3801,7 +3748,7 @@ msgstr ""
 msgid "&Picture"
 msgstr ""
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr ""
 
@@ -3819,8 +3766,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -3869,8 +3816,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr ""
 
@@ -3915,14 +3862,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -3959,14 +3906,18 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
+msgstr ""
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+msgid "Error"
 msgstr ""
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4103,14 +4054,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4137,136 +4088,110 @@ msgstr ""
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4279,136 +4204,110 @@ msgstr ""
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4421,9 +4320,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4449,26 +4349,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4479,8 +4379,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4502,8 +4402,8 @@ msgstr ""
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4523,8 +4423,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4560,11 +4460,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4604,8 +4504,7 @@ msgid "Critical error: Unable to collect mail: "
 msgstr ""
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
 msgstr ""
 
 #: kmacctimap.cpp:300
@@ -4692,6 +4591,50 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr ""
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr ""
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr ""
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr ""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr ""
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr ""
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr ""
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr ""
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr ""
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr ""
@@ -4745,9 +4688,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4793,11 +4736,11 @@ msgstr ""
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr ""
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr ""
 
@@ -4815,7 +4758,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4833,205 +4776,205 @@ msgstr ""
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr ""
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr ""
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr ""
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr ""
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr ""
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr ""
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr ""
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr ""
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr ""
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr ""
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr ""
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr ""
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr ""
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr ""
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr ""
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr ""
@@ -5128,7 +5071,7 @@ msgstr ""
 msgid "Encoding"
 msgstr ""
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr ""
 
@@ -5140,7 +5083,7 @@ msgstr ""
 msgid "Sign"
 msgstr ""
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr ""
 
@@ -5160,7 +5103,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5170,9 +5114,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5181,9 +5125,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5194,7 +5137,7 @@ msgstr ""
 msgid "&Send Mail Via"
 msgstr ""
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr ""
@@ -5259,8 +5202,7 @@ msgstr ""
 msgid "Cl&ean Spaces"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr ""
@@ -5401,31 +5343,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr ""
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5523,8 +5465,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5532,42 +5474,43 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr ""
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr ""
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr ""
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr ""
 
+#: kmcomposewin.cpp:2958
+msgid "&Insert"
+msgstr ""
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr ""
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5607,264 +5550,273 @@ msgid ""
 "View"
 msgstr ""
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+msgid "Edit"
+msgstr ""
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr ""
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+msgid "Save As..."
+msgstr ""
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+msgid "Properties"
+msgstr ""
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr ""
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr ""
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr ""
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr ""
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr ""
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr ""
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr ""
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr ""
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr ""
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr ""
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr ""
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr ""
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr ""
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 msgid "Too many receipients"
 msgstr ""
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 msgid "&Edit Recipients"
 msgstr ""
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr ""
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr ""
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr ""
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr ""
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr ""
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr ""
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr ""
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr ""
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr ""
 
@@ -5908,8 +5860,8 @@ msgstr ""
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -5942,9 +5894,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6161,102 +6112,86 @@ msgstr ""
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6268,6 +6203,14 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: kmfilterdlg.cpp:140
+msgid "Import"
+msgstr ""
+
+#: kmfilterdlg.cpp:141
+msgid "Export"
+msgstr ""
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr ""
@@ -6348,6 +6291,10 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr ""
 
+#: kmfilterdlg.cpp:611
+msgid "Top"
+msgstr ""
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr ""
@@ -6356,16 +6303,27 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr ""
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr ""
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+msgid "Copy"
+msgstr ""
+
+#: kmfilterdlg.cpp:635
+msgid "Delete"
+msgstr ""
+
 #: kmfilterdlg.cpp:645
 msgid "Select Source Folders"
 msgstr ""
@@ -6373,8 +6331,8 @@ msgstr ""
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6445,19 +6403,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6494,8 +6449,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6529,8 +6484,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6654,10 +6609,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -6679,9 +6632,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -6690,14 +6642,14 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6710,11 +6662,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6723,15 +6675,19 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+msgid "Move"
+msgstr ""
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr ""
 
@@ -6743,8 +6699,7 @@ msgstr ""
 msgid "Permissions (ACL)"
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr ""
@@ -6768,8 +6723,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr ""
@@ -6788,14 +6742,13 @@ msgstr ""
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -6808,9 +6761,9 @@ msgstr ""
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -6821,17 +6774,20 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+msgid "Default"
+msgstr ""
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr ""
@@ -6842,11 +6798,11 @@ msgstr ""
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -6865,12 +6821,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -6901,17 +6857,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -6981,7 +6937,8 @@ msgstr ""
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7004,8 +6961,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7042,13 +6999,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7104,13 +7059,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7118,15 +7073,15 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr ""
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7219,9 +7174,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7348,10 +7303,10 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 
 #: kmheaders.cpp:1600
@@ -7402,123 +7357,122 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr ""
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr ""
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr ""
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr ""
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr ""
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr ""
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7526,11 +7480,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr ""
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
@@ -7603,8 +7557,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -7642,8 +7595,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1173
@@ -7667,8 +7620,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7681,27 +7634,29 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
+msgstr ""
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+msgid "&Delete"
 msgstr ""
 
 #: kmmainwidget.cpp:1313
@@ -7716,9 +7671,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -7732,8 +7687,8 @@ msgstr ""
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -7750,8 +7705,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -7767,7 +7722,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8086,8 +8042,7 @@ msgstr ""
 msgid "Appl&y All Filters"
 msgstr ""
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr ""
@@ -8199,7 +8154,6 @@ msgstr ""
 msgid "Go to the next unread message"
 msgstr ""
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr ""
@@ -8334,25 +8288,25 @@ msgstr ""
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8360,8 +8314,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8369,8 +8323,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8399,16 +8353,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr ""
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr ""
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr ""
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8456,29 +8410,26 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8487,11 +8438,10 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8500,14 +8450,13 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8516,13 +8465,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8531,9 +8478,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8543,9 +8489,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8560,11 +8505,9 @@ msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -8812,15 +8755,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -8829,18 +8771,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -8850,14 +8791,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr ""
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -8896,7 +8836,8 @@ msgstr ""
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -8920,12 +8861,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -8946,6 +8889,58 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr ""
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr ""
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr ""
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr ""
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr ""
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr ""
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr ""
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr ""
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr ""
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr ""
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr ""
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr ""
@@ -9018,17 +9013,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9052,8 +9047,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9078,8 +9073,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9090,13 +9086,11 @@ msgstr ""
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9115,8 +9109,9 @@ msgstr ""
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9150,30 +9145,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9185,6 +9180,10 @@ msgstr ""
 msgid "Exit"
 msgstr ""
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr ""
@@ -9209,8 +9208,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9287,8 +9287,8 @@ msgstr ""
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9309,10 +9309,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9342,8 +9341,8 @@ msgstr ""
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9356,10 +9355,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9576,22 +9575,18 @@ msgstr ""
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9602,8 +9597,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9618,14 +9613,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -9720,8 +9715,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -9753,8 +9748,9 @@ msgstr ""
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -9764,8 +9760,8 @@ msgstr ""
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -9785,70 +9781,68 @@ msgstr ""
 msgid "Unencrypted Message Warning"
 msgstr ""
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr ""
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -9870,10 +9864,10 @@ msgstr ""
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -9883,8 +9877,8 @@ msgstr ""
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -9923,8 +9917,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr ""
 
@@ -9953,8 +9946,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -9988,18 +9981,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10236,8 +10229,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10353,10 +10346,11 @@ msgstr ""
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10373,7 +10367,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -10390,1643 +10385,12 @@ msgstr ""
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr ""
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, no-c-format
-msgid "To:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, no-c-format
-msgid "CC:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, no-c-format
-msgid "Remove the signature when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, no-c-format
-msgid "Show current message sender time"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12132,6 +10496,11 @@ msgstr ""
 msgid "Add as BCC"
 msgstr ""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12147,10 +10516,10 @@ msgstr ""
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12167,8 +10536,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12271,10 +10640,19 @@ msgstr ""
 msgid " bytes"
 msgstr ""
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr ""
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12410,13 +10788,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -12432,8 +10808,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -12451,8 +10826,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -12460,8 +10834,7 @@ msgid "(No special capabilities available)"
 msgstr ""
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:358
@@ -12530,8 +10903,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12548,17 +10921,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr ""
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr ""
@@ -12592,6 +10970,10 @@ msgstr ""
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+msgid "&Apply"
+msgstr ""
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr ""
@@ -12604,6 +10986,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr ""
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr ""
@@ -12640,9 +11026,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -12675,6 +11061,16 @@ msgstr ""
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr ""
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, no-c-format
+msgid "CC:"
+msgstr ""
+
 #: templateparser.cpp:970
 #, c-format
 msgid "Attachment %1"
@@ -12704,36 +11100,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -12944,6 +11336,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -12976,76 +11372,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13107,6 +11433,15 @@ msgstr ""
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr ""
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13204,9 +11539,9 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13235,9 +11570,9 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13246,15 +11581,15 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13263,8 +11598,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13280,127 +11615,1508 @@ msgstr ""
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
 msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:19
-msgid "Set body of message"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
 msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
 msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
 msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
 msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#: kmsearchpattern.h:224
-msgid "Replied"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
 msgstr ""
 
-#: kmsearchpattern.h:226
-msgid "Queued"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
 msgstr ""
 
-#: kmsearchpattern.h:227
-msgid "Sent"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
 msgstr ""
 
-#: kmsearchpattern.h:228
-msgid "Watched"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
 msgstr ""
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
 msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
 msgstr ""
 
-#: kmsearchpattern.h:232
-msgid "To Do"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
 msgstr ""
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
 msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
 msgstr ""
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr ""
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr ""
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr ""
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr ""
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr ""
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr ""
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, no-c-format
+msgid "Remove the signature when replying"
+msgstr ""
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, no-c-format
+msgid "Show current message sender time"
+msgstr ""
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr ""
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr ""
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, no-c-format
+msgid "&File"
+msgstr ""
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr ""
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr ""
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr ""
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr ""
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, no-c-format
+msgid "&Settings"
+msgstr ""
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kmcomposerui.rc:34
+#, no-c-format
+msgid "&Options"
+msgstr ""
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr ""
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr ""
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr ""
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr ""
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr ""
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr ""
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr ""
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr ""
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr ""
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr ""
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr ""
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
 msgstr ""
 
 #, fuzzy
diff --git a/tde-i18n-sv/messages/tdepim/kmail.po b/tde-i18n-sv/messages/tdepim/kmail.po
index b8098b8abd0..5d6d5dccf21 100644
--- a/tde-i18n-sv/messages/tdepim/kmail.po
+++ b/tde-i18n-sv/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-07-25 09:34+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mattias Newzella,Anders Widell,Karl Backström"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -174,6 +174,12 @@ msgstr "Ing&en (använd med varsamhet)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Konto för halvautomatisk resurshantering"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Rensa tidigare"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -190,8 +196,8 @@ msgstr "Rensa tidigare"
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
 msgstr ""
-"Ta bort alla föråldrade tilldelningar för resursen som representeras av det här "
-"kontot."
+"Ta bort alla föråldrade tilldelningar för resursen som representeras av det "
+"här kontot."
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -251,13 +257,13 @@ msgstr "Anv&ändarnamn:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Din Internetleverantör gav dig ett <em>användarnamn</em> "
-"som används för att identifiera dig på leverantörens servrar. Det är oftast den "
-"första delen av din e-postadress (delen innan <em>@</em>)."
+"Din Internetleverantör gav dig ett <em>användarnamn</em> som används för att "
+"identifiera dig på leverantörens servrar. Det är oftast den första delen av "
+"din e-postadress (delen innan <em>@</em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -278,12 +284,12 @@ msgstr "Lag&ra Pop-lösenord"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Markera det här alternativet för att Kmail ska lagra lösenordet.\n"
 "Om TDEwallet är tillgänglig lagras lösenordet där, vilket anses säkert.\n"
@@ -317,12 +323,13 @@ msgstr "&Filtrera brev om de är större än"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Om du väljer det här alternativet kommer Pop-filter att användas för att avgöra "
-"vad som ska hända med breven. Du kan välja att ladda ner dem, ta bort dem eller "
-"behålla dem på servern."
+"Om du väljer det här alternativet kommer Pop-filter att användas för att "
+"avgöra vad som ska hända med breven. Du kan välja att ladda ner dem, ta bort "
+"dem eller behålla dem på servern."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -371,13 +378,15 @@ msgstr "Klarte&xt"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "LO&GIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "PLA&IN"
 
@@ -420,14 +429,14 @@ msgstr "Namnrymder"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Här ser du de olika namnrymderna som IMAP-servern stöder. Varje namnrymd "
-"representerar ett prefix som skiljer grupper av korgar åt. Namnrymder gör det "
-"till exempel möjligt för Kmail att visa dina personliga korgar och delade "
-"korgar i ett konto."
+"representerar ett prefix som skiljer grupper av korgar åt. Namnrymder gör "
+"det till exempel möjligt för Kmail att visa dina personliga korgar och "
+"delade korgar i ett konto."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -485,13 +494,13 @@ msgstr "Ladda bilagor p&å begäran"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Aktivera det här för att inte ladda bilagor automatiskt när du väljer brevet, "
-"utan bara när du klickar på bilagan. På så sätt visas också stora brev "
-"omedelbart."
+"Aktivera det här för att inte ladda bilagor automatiskt när du väljer "
+"brevet, utan bara när du klickar på bilagan. På så sätt visas också stora "
+"brev omedelbart."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -531,7 +540,7 @@ msgstr "<ingen>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Inkorg"
 
@@ -539,46 +548,47 @@ msgstr "Inkorg"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Servern verkar inte stödja unika brevnummer, som är ett krav för att kunna "
 "lämna brev på servern.\n"
-"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har du "
-"fortfarande möjlighet att aktivera att hämtade brev lämnas på servern."
+"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har "
+"du fortfarande möjlighet att aktivera att hämtade brev lämnas på servern."
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Servern verkar inte stödja att hämta brevhuvuden, som är ett krav för att kunna "
-"filtrera brev på servern.\n"
-"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har du "
-"fortfarande möjlighet att aktivera filtrering av brev på servern."
+"Servern verkar inte stödja att hämta brevhuvuden, som är ett krav för att "
+"kunna filtrera brev på servern.\n"
+"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har "
+"du fortfarande möjlighet att aktivera filtrering av brev på servern."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Observera att den här funktionen kan göra att vissa Pop3-servrar som inte "
 "stödjer slussning kan skicka förstörda brev.\n"
-"Det här kan dock ställas in, eftersom vissa servrar stödjer slussning men inte "
-"meddelar sin förmåga. För att kontrollera om Pop3-servern meddelar att den "
-"stödjer slussning, använd knappen \"Kontrollera vad servern stödjer\" längst "
-"ner i den här dialogrutan.\n"
-"Om servern inte meddelar att den gör det, men du vill ha högre hastighet bör du "
-"göra några tester först genom att skicka ett antal brev till dig själv och "
-"ladda ner dem."
+"Det här kan dock ställas in, eftersom vissa servrar stödjer slussning men "
+"inte meddelar sin förmåga. För att kontrollera om Pop3-servern meddelar att "
+"den stödjer slussning, använd knappen \"Kontrollera vad servern stödjer\" "
+"längst ner i den här dialogrutan.\n"
+"Om servern inte meddelar att den gör det, men du vill ha högre hastighet bör "
+"du göra några tester först genom att skicka ett antal brev till dig själv "
+"och ladda ner dem."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -586,48 +596,48 @@ msgstr "Ange först en server och port under fliken Allmänt."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Servern verkar inte stödja slussning. Därför har alternativet inaktiverats.\n"
-"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har du "
-"fortfarande möjlighet att aktivera slussning. Men observera att den här "
-"funktionen kan göra att vissa POP-servrar som inte stödjer slussning kan skicka "
-"förstörda brev. Så innan du använder funktionen med viktiga brev, bör du först "
-"testa den genom att skicka ett stort antal testbrev och ladda ner dem alla på "
-"en gång från POP-servern."
+"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har "
+"du fortfarande möjlighet att aktivera slussning. Men observera att den här "
+"funktionen kan göra att vissa POP-servrar som inte stödjer slussning kan "
+"skicka förstörda brev. Så innan du använder funktionen med viktiga brev, bör "
+"du först testa den genom att skicka ett stort antal testbrev och ladda ner "
+"dem alla på en gång från POP-servern."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Servern verkar inte stödja unika brevnummer, som är ett krav för att kunna "
 "lämna brev på servern. Därför har alternativet inaktiverats.\n"
-"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har du "
-"fortfarande möjlighet att aktivera att hämtade brev lämnas på servern."
+"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har "
+"du fortfarande möjlighet att aktivera att hämtade brev lämnas på servern."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Servern verkar inte stödja att hämta brevhuvuden, som är ett krav för att kunna "
-"filtrera brev på servern. Därför har alternativet inaktiverats.\n"
-"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har du "
-"fortfarande möjlighet att aktivera filtrering av brev på servern."
+"Servern verkar inte stödja att hämta brevhuvuden, som är ett krav för att "
+"kunna filtrera brev på servern. Därför har alternativet inaktiverats.\n"
+"Eftersom vissa servrar inte anger sina möjligheter på ett riktigt sätt, har "
+"du fortfarande möjlighet att aktivera filtrering av brev på servern."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -707,11 +717,11 @@ msgstr "IMAP-konto"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Du måste lägga till ett konto under nätverkssektionen i inställningarna för att "
-"kunna ta emot post."
+"Du måste lägga till ett konto under nätverkssektionen i inställningarna för "
+"att kunna ta emot post."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -747,14 +757,14 @@ msgstr "Välkommen till Kmail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Det verkar som om det här är första gången du startar Kmail. Du kan använda "
-"den här guiden för att ställa in dina e-postkonton. Skriv bara in "
-"anslutningsdata som du har fått från din e-postleverantör på följande "
-"sidor.</qt>"
+"<qt>Det verkar som om det här är första gången du startar Kmail. Du kan "
+"använda den här guiden för att ställa in dina e-postkonton. Skriv bara in "
+"anslutningsdata som du har fått från din e-postleverantör på följande sidor."
+"</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -816,8 +826,7 @@ msgstr "Använd lokal leverans"
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Ingen"
@@ -956,35 +965,35 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Här får du viss hjälp med att ställa in Kmails filterregler för att använda "
-"några vanliga kända verktyg för eliminering av virus.</p>"
-"<p>Guiden kan identifiera dessa verktyg på datorn, samt skapa filterregler för "
-"att klassificera brev med hjälp av verktygen och skilja ut brev som innehåller "
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Här får du viss hjälp med att ställa in Kmails filterregler för att "
+"använda några vanliga kända verktyg för eliminering av virus.</p><p>Guiden "
+"kan identifiera dessa verktyg på datorn, samt skapa filterregler för att "
+"klassificera brev med hjälp av verktygen och skilja ut brev som innehåller "
 "virus. Guiden tar inte hänsyn till eventuella befintliga filterregler, utan "
-"lägger till nya regler ändå.</p>"
-"<p><b>Varning:</b> Eftersom Kmail verkar vara fryst under tiden breven avsöks "
-"efter virus, kan du få problem med svarstider hos Kmail eftersom användning av "
-"verktyg för eliminering av virus ofta tar lång tid. Överväg då att ta bort "
-"filterreglerna som guiden skapat för att återfå tidigare beteende.</p>"
+"lägger till nya regler ändå.</p><p><b>Varning:</b> Eftersom Kmail verkar "
+"vara fryst under tiden breven avsöks efter virus, kan du få problem med "
+"svarstider hos Kmail eftersom användning av verktyg för eliminering av virus "
+"ofta tar lång tid. Överväg då att ta bort filterreglerna som guiden skapat "
+"för att återfå tidigare beteende.</p>"
 
 #: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
-"<p>Välj verktygen som ska användas för detektering och gå till nästa sida.</p>"
+"<p>Välj verktygen som ska användas för detektering och gå till nästa sida.</"
+"p>"
 
 #: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
@@ -1012,13 +1021,12 @@ msgstr "Flytta &trolig skräppost till:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"Förvald korg är inkorgen, men du kan ändra det i korgvyn nedan."
-"<p>Alla verktyg stöder inte klassificering som osäker. Om du inte har valt ett "
+"Förvald korg är inkorgen, men du kan ändra det i korgvyn nedan.<p>Alla "
+"verktyg stöder inte klassificering som osäker. Om du inte har valt ett "
 "verktyg med möjligheten, kan du inte heller välja en korg."
 
 #: antispamwizard.cpp:1068
@@ -1029,12 +1037,13 @@ msgstr "Kontrollera brev med verktyg för borttag av virus"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Låt verktygen för att eliminera virus kontrollera dina brev. Guiden skapar "
-"lämpliga filter. Breven markeras ofta av verktygen så att efterföljande filter "
-"kan reagera på detta, och t.ex. flytta brev med virus till en särskild korg."
+"lämpliga filter. Breven markeras ofta av verktygen så att efterföljande "
+"filter kan reagera på detta, och t.ex. flytta brev med virus till en "
+"särskild korg."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1043,11 +1052,11 @@ msgstr "Flytta upptäckta brev med virus till vald korg"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Ett filter för att identifiera som klassificerats som infekterade av virus och "
-"flytta breven till en fördefinierad korg skapas. Standardkorgen är "
+"Ett filter för att identifiera som klassificerats som infekterade av virus "
+"och flytta breven till en fördefinierad korg skapas. Standardkorgen är "
 "papperskorgen, men du kan ändra det i korgvyn."
 
 #: antispamwizard.cpp:1084
@@ -1056,11 +1065,11 @@ msgstr "Markera dessutom upptäckta brev med virus som lästa"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Markera brev klassificerade som infekterade av virus som lästa, samt flytta dem "
-"till vald korg."
+"Markera brev klassificerade som infekterade av virus som lästa, samt flytta "
+"dem till vald korg."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1240,9 +1249,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Det här kan orsakas av att du inte har behörighet att göra det eller på grund "
-"av att katalogen redan finns på servern. Felmeddelandet från kommunikation med "
-"servern följer:"
+"Det här kan orsakas av att du inte har behörighet att göra det eller på "
+"grund av att katalogen redan finns på servern. Felmeddelandet från "
+"kommunikation med servern följer:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1255,8 +1264,8 @@ msgstr "Fel vid läsningen av korgen %1 på servern: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1276,8 +1285,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1308,20 +1317,20 @@ msgstr "Borttaget"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Inga av dina identiteter passar ihop med mottagaren av brevet,"
-"<br>välj vilken av följande adresser som är din, om någon:"
+"<qt>Inga av dina identiteter passar ihop med mottagaren av brevet,<br>välj "
+"vilken av följande adresser som är din, om någon:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Flera av dina identiteter passar ihop med mottagaren av brevet,"
-"<br>välj vilken av följande adresser som är din:"
+"<qt>Flera av dina identiteter passar ihop med mottagaren av brevet,<br>välj "
+"vilken av följande adresser som är din:"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1350,18 +1359,21 @@ msgstr "Ett fel uppstod vid komprimering av \"%1\". Komprimering avbruten."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Den här inställningen har rättats av systemadministratören.</p>"
-"<p>Om du tycker den är felaktig, kontakta honom eller henne.</p></qt>"
+"<qt><p>Den här inställningen har rättats av systemadministratören.</p><p>Om "
+"du tycker den är felaktig, kontakta honom eller henne.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Ladda profil..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Anpassa konto"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "L&ägg till..."
@@ -1391,6 +1403,11 @@ msgstr "<qt>Vill du verkligen ta bort identiteten med namnet <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Ta bort identitet"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Ta bort"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Lägg till..."
@@ -1399,6 +1416,11 @@ msgstr "Lägg till..."
 msgid "Modify..."
 msgstr "Ändra..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Ta bort"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Använd som standard"
@@ -1415,17 +1437,15 @@ msgstr "&Skicka"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Utgående konton (lägg till minst ett konto):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Namn"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Typ"
@@ -1447,8 +1467,7 @@ msgstr "Ange standardvärden"
 msgid "Common Options"
 msgstr "Vanliga alternativ"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Bekräfta &före skickning"
@@ -1499,17 +1518,16 @@ msgstr "F&örvald domän:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Den förvalda domänen används för att komplettera e-postadresser som endast "
-"består av användarens namn.</p></qt>"
+"<qt><p>Den förvalda domänen används för att komplettera e-postadresser som "
+"endast består av användarens namn.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1527,9 +1545,9 @@ msgstr "Lägg till brevöverföring"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (förval)"
 
@@ -1612,6 +1630,10 @@ msgstr "Ändra konto"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Kan inte hitta kontot <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Fä&rger"
@@ -1720,8 +1742,7 @@ msgstr "Besökt länk"
 msgid "Misspelled Words"
 msgstr "Felstavade ord"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Nytt brev"
@@ -1909,11 +1930,11 @@ msgstr "Trådar stängs som standard"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"Öppna trådar som innehåller nya, olästa eller viktiga &brev och öppna bevakade "
-"trådar."
+"Öppna trådar som innehåller nya, olästa eller viktiga &brev och öppna "
+"bevakade trådar."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1921,72 +1942,57 @@ msgstr "Datumvisning"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Följande uttryck kan användas för datumet:</strong></p>"
-"<ul>"
-"<li>d - dagen som ett tal utan inledande nolla (1-31)</li>"
-"<li>dd - dagen som ett tal med inledande nolla (01-31)</li>"
-"<li>ddd - det förkortade namnet på dagen (mån-sön).</li>"
-"<li>dddd - det fullständiga namnet på dagen (måndag-söndag).</li>"
-"<li>M - månaden som ett tal utan inledande nolla (1-12)</li>"
-"<li>MM - månaden som ett tal med inledande nolla (01-12)</li>"
-"<li>MMM - det förkortade namnet på månaden (jan-dec).</li>"
-"<li>MMMM - det fullständiga namnet på månaden (januari - december).</li>"
-"<li>yy - året som ett tal med två siffror (00-99)</li>"
-"<li>yyyy - året som ett tal med fyra siffror (0000-9999)</li></ul>"
-"<p><strong>Följande uttryck kan användas för tiden:</strong></p>"
-"<ul>"
-"<li>h - timmar utan en inledande nolla (0-23 eller 1-12 om FM/EM visas)</li>"
-"<li>hh - timmar med en inledande nolla (00-23 eller 01-12 om FM/EM visas)</li>"
-"<li>m - minuter utan en inledande nolla (0-59)</li>"
-"<li>mm - minuter med en inledande nolla (00-59)</li>"
-"<li>s - sekunder utan en inledande nolla (0-59)</li>"
-"<li>ss - sekunder med en inledande nolla (00-59)</li>"
-"<li>z - millisekunder utan inledande nollor (0-999)</li>"
-"<li>zzz - millisekunder med inledande nollor (000-999)</li>"
-"<li>AP - byt till visning av FM/EM. AP byts antingen ut mot \"FM\" eller "
-"\"EM\".</li>"
-"<li>ap - byt till visning av FM/EM. ap byts antingen ut mot \"fm\" eller "
-"\"em\".</li>"
-"<li>Z - zon på numerisk form ( -0500 )</li></ul>"
-"<p><strong>Alla andra tecken som matas in ignoreras.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Följande uttryck kan användas för datumet:</strong></"
+"p><ul><li>d - dagen som ett tal utan inledande nolla (1-31)</li><li>dd - "
+"dagen som ett tal med inledande nolla (01-31)</li><li>ddd - det förkortade "
+"namnet på dagen (mån-sön).</li><li>dddd - det fullständiga namnet på dagen "
+"(måndag-söndag).</li><li>M - månaden som ett tal utan inledande nolla "
+"(1-12)</li><li>MM - månaden som ett tal med inledande nolla (01-12)</"
+"li><li>MMM - det förkortade namnet på månaden (jan-dec).</li><li>MMMM - det "
+"fullständiga namnet på månaden (januari - december).</li><li>yy - året som "
+"ett tal med två siffror (00-99)</li><li>yyyy - året som ett tal med fyra "
+"siffror (0000-9999)</li></ul><p><strong>Följande uttryck kan användas för "
+"tiden:</strong></p><ul><li>h - timmar utan en inledande nolla (0-23 eller "
+"1-12 om FM/EM visas)</li><li>hh - timmar med en inledande nolla (00-23 eller "
+"01-12 om FM/EM visas)</li><li>m - minuter utan en inledande nolla (0-59)</"
+"li><li>mm - minuter med en inledande nolla (00-59)</li><li>s - sekunder utan "
+"en inledande nolla (0-59)</li><li>ss - sekunder med en inledande nolla "
+"(00-59)</li><li>z - millisekunder utan inledande nollor (0-999)</li><li>zzz "
+"- millisekunder med inledande nollor (000-999)</li><li>AP - byt till visning "
+"av FM/EM. AP byts antingen ut mot \"FM\" eller \"EM\".</li><li>ap - byt till "
+"visning av FM/EM. ap byts antingen ut mot \"fm\" eller \"em\".</li><li>Z - "
+"zon på numerisk form ( -0500 )</li></ul><p><strong>Alla andra tecken som "
+"matas in ignoreras.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
-"Ändring av de allmänna trådningsinställningarna överskrider alla korgspecifika "
-"värden."
+"Ändring av de allmänna trådningsinställningarna överskrider alla "
+"korgspecifika värden."
 
 #: configuredialog.cpp:2221
 msgid "Close message window after replying or forwarding"
@@ -2000,8 +2006,7 @@ msgstr "Visa HTML-&statusrad"
 msgid "Show s&pam status in fancy headers"
 msgstr "Visa status för skräp&post i snygga brevhuvuden"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Ersätt smilisar med bilder"
@@ -2010,8 +2015,7 @@ msgstr "Ersätt smilisar med bilder"
 msgid "Use smaller font for quoted text"
 msgstr "Använd mindre teckensnitt för citerad text"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Visa citationstecken för expandera och komprimera"
@@ -2037,8 +2041,7 @@ msgstr "Automatisk"
 msgid "&Override character encoding:"
 msgstr "Överskrid teckenk&odning:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Aktivera ikon i systembrickan"
@@ -2141,21 +2144,19 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Följande alias är tillåtna i svarstexten:"
-"<br><b>%D</b>: datum, <b>%S</b>: rubrik,"
-"<br><b>%e</b>: avsändarens adress, <b>%F</b>: avsändarens namn, <b>%f</b>"
-": avsändarens initialer,"
-"<br><b>%T</b>: mottagarens namn, <b>%t</b>: mottagarens namn och adress,"
-"<br><b>%C</b>: namn för kopior, <b>%c</b>: namn och adresser för kopior,"
-"<br><b>%%</b>: procenttecken, <b>%_</b>: mellanslag, <b>%L</b>: radbrytning</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Följande alias är tillåtna i svarstexten:<br><b>%D</b>: datum, <b>%S</"
+"b>: rubrik,<br><b>%e</b>: avsändarens adress, <b>%F</b>: avsändarens namn, "
+"<b>%f</b>: avsändarens initialer,<br><b>%T</b>: mottagarens namn, <b>%t</b>: "
+"mottagarens namn och adress,<br><b>%C</b>: namn för kopior, <b>%c</b>: namn "
+"och adresser för kopior,<br><b>%%</b>: procenttecken, <b>%_</b>: mellanslag, "
+"<b>%L</b>: radbrytning</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2178,21 +2179,20 @@ msgstr "&Svara till alla:"
 msgid "&Forward:"
 msgstr "&Vidarebefordra:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Citeringsindikator:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D skrev du:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D skrev %F:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat brev"
 
@@ -2230,11 +2230,11 @@ msgstr "Ange nytt vidarebefordringsprefix:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"För varje brev som skickas kontrolleras den här listan uppifrån och ner efter "
-"en teckenuppsättning som innehåller alla tecken som krävs."
+"För varje brev som skickas kontrolleras den här listan uppifrån och ner "
+"efter en teckenuppsättning som innehåller alla tecken som krävs."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2270,10 +2270,9 @@ msgstr "Värde"
 msgid "Ne&w"
 msgstr "N&ytt"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Namn:"
@@ -2282,16 +2281,15 @@ msgstr "&Namn:"
 msgid "&Value:"
 msgstr "&Värde:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Namngivning av bilagor som fungerar med Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Aktivera det här alternativet för att få Outlook™ att förstå dina svar på "
 "inbjudningar som innehåller andra tecken än engelska"
@@ -2320,20 +2318,21 @@ msgstr "bifogad"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Du har valt att koda bilagor med namn som innehåller andra tecken än engelska "
-"på ett sätt som kan förstås av Outlook™ och andra e-postklienter som inte "
-"stöder kodning av namn på bilagor enligt standard.\n"
-"Observera att Kmail kan skapa brev som inte följer standard, och följaktligen "
-"är det möjligt att ditt brev inte förstås av e-postklienter som gör det. Alltså "
-"ska du inte aktivera det här alternativet om du inte har något annat val."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Du har valt att koda bilagor med namn som innehåller andra tecken än "
+"engelska på ett sätt som kan förstås av Outlook™ och andra e-postklienter "
+"som inte stöder kodning av namn på bilagor enligt standard.\n"
+"Observera att Kmail kan skapa brev som inte följer standard, och "
+"följaktligen är det möjligt att ditt brev inte förstås av e-postklienter som "
+"gör det. Alltså ska du inte aktivera det här alternativet om du inte har "
+"något annat val."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2357,112 +2356,98 @@ msgstr "&Kryptoinsticksprogram"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>E-post skickas ibland i båda formaten. Detta alternativ bestämmer om du vill "
-"att HTML-delen eller ren text ska visas.</p>"
-"<p>Att visa HTML-delen gör att brevet ser bättre ut, men ökar på samma gång "
-"risken att säkerhetsluckor utnyttjas.</p>"
-"<p>Att visa ren text gör att mycket av brevets formatering går förlorad, men "
-"gör det nästan <em>omöjligt</em> att utnyttja säkerhetsluckor i "
-"HTML-återgivningen (Konqueror).</p>"
-"<p>Alternativet nedan övervakar ett vanligt missbruk av HTML-post. Men det kan "
-"inte övervaka säkerhetsluckor som inte var kända när den här versionen av Kmail "
-"skrevs.</p>"
-"<p>Det är därför lämpligt att <em>inte</em> föredra HTML framför ren text.</p> "
-"<p><b>Observera:</b> Du kan ställa in det här alternativet för varje korg i "
-"menyn <i>Korg</i> i Kmails huvudfönster.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>E-post skickas ibland i båda formaten. Detta alternativ bestämmer om "
+"du vill att HTML-delen eller ren text ska visas.</p><p>Att visa HTML-delen "
+"gör att brevet ser bättre ut, men ökar på samma gång risken att "
+"säkerhetsluckor utnyttjas.</p><p>Att visa ren text gör att mycket av brevets "
+"formatering går förlorad, men gör det nästan <em>omöjligt</em> att utnyttja "
+"säkerhetsluckor i HTML-återgivningen (Konqueror).</p><p>Alternativet nedan "
+"övervakar ett vanligt missbruk av HTML-post. Men det kan inte övervaka "
+"säkerhetsluckor som inte var kända när den här versionen av Kmail skrevs.</"
+"p><p>Det är därför lämpligt att <em>inte</em> föredra HTML framför ren text."
+"</p> <p><b>Observera:</b> Du kan ställa in det här alternativet för varje "
+"korg i menyn <i>Korg</i> i Kmails huvudfönster.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>En del brevreklam är i HTML och innehåller referenser till exempelvis bilder "
-"som den här reklamen använder för att ta reda på att du har läst deras brev "
-"(&quot;web bugs&quot;).</p>"
-"<p>Det finns inget giltigt skäl att ladda bilder från nätet på det här sättet, "
-"eftersom avsändaren alltid kan bifoga nödvändiga bilder direkt.</p>"
-"<p>För att förhindra ett sådant missbruk av HTML-visningsfunktionen i Kmail, är "
-"det här alternativet som standard <em>inaktiverat</em>.</p>"
-"<p>Om du i alla fall vill t ex visa bilder i HTML-brev som inte var bifogade, "
-"kan du aktivera det här alternativet, men du bör vara medveten om det möjliga "
-"problemet.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>En del brevreklam är i HTML och innehåller referenser till exempelvis "
+"bilder som den här reklamen använder för att ta reda på att du har läst "
+"deras brev (&quot;web bugs&quot;).</p><p>Det finns inget giltigt skäl att "
+"ladda bilder från nätet på det här sättet, eftersom avsändaren alltid kan "
+"bifoga nödvändiga bilder direkt.</p><p>För att förhindra ett sådant missbruk "
+"av HTML-visningsfunktionen i Kmail, är det här alternativet som standard "
+"<em>inaktiverat</em>.</p><p>Om du i alla fall vill t ex visa bilder i HTML-"
+"brev som inte var bifogade, kan du aktivera det här alternativet, men du bör "
+"vara medveten om det möjliga problemet.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Princip för brevhanteringsbekräftelser</h3>"
-"<p>Brevhanteringsbekräftelser är en generalisering av vad som oftast kallas <b>"
-"läskvitton</b>. Brevskrivaren begär att en hanteringsbekräftelse ska skickas, "
-"och mottagarens e-postprogram skapar ett svar som gör att brevskrivaren kan se "
-"vad som hände med brevet. Vanliga hanteringstyper omfattar <b>visat</b> "
-"(dvs. läst), <b>borttaget</b> och <b>skickat</b> (t ex vidarebefordrat).</p>"
-"<p>Följande alternativ är tillgängliga för att styra hur Kmail skickar "
-"hanteringsbekräftelser:</p>"
-"<ul> "
-"<li><em>Ignorera</em>: Ignorerar varje begäran om en bekräftelse. Ingen "
-"bekräftelse skickas någonsin automatiskt (rekommenderas).</li>"
-"<li><em>Fråga</em>: Svara på en begäran först efter att ha frågat användaren om "
-"lov. På detta sätt kan du skicka bekräftelser för valda brev, medan du nekar "
-"eller ignorerar dem för andra.</li>"
-"<li><em>Neka</em>: Skickar alltid en <b>nekande</b> bekräftelse. Det är <em>"
-"något</em> bättre än att alltid skicka bekräftelser. Brevskrivaren får reda på "
-"att brevet har behandlats, men kan inte avgöra om det togs bort eller lästes, "
-"etc.</li>"
-"<li><em>Skicka alltid</em>: Skicka alltid den begärda bekräftelsen. Det betyder "
-"att brevskrivaren får reda på att brevet hanterades, och dessutom vad som hände "
-"med det (visades, togs bort, etc.). Det här alternativet avråds starkt ifrån, "
-"men eftersom det kan vara helt rimligt för t ex hantering av kundrelationer, "
-"finns det tillgängligt.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Princip för brevhanteringsbekräftelser</"
+"h3><p>Brevhanteringsbekräftelser är en generalisering av vad som oftast "
+"kallas <b>läskvitton</b>. Brevskrivaren begär att en hanteringsbekräftelse "
+"ska skickas, och mottagarens e-postprogram skapar ett svar som gör att "
+"brevskrivaren kan se vad som hände med brevet. Vanliga hanteringstyper "
+"omfattar <b>visat</b> (dvs. läst), <b>borttaget</b> och <b>skickat</b> (t ex "
+"vidarebefordrat).</p><p>Följande alternativ är tillgängliga för att styra "
+"hur Kmail skickar hanteringsbekräftelser:</p><ul> <li><em>Ignorera</em>: "
+"Ignorerar varje begäran om en bekräftelse. Ingen bekräftelse skickas "
+"någonsin automatiskt (rekommenderas).</li><li><em>Fråga</em>: Svara på en "
+"begäran först efter att ha frågat användaren om lov. På detta sätt kan du "
+"skicka bekräftelser för valda brev, medan du nekar eller ignorerar dem för "
+"andra.</li><li><em>Neka</em>: Skickar alltid en <b>nekande</b> bekräftelse. "
+"Det är <em>något</em> bättre än att alltid skicka bekräftelser. "
+"Brevskrivaren får reda på att brevet har behandlats, men kan inte avgöra om "
+"det togs bort eller lästes, etc.</li><li><em>Skicka alltid</em>: Skicka "
+"alltid den begärda bekräftelsen. Det betyder att brevskrivaren får reda på "
+"att brevet hanterades, och dessutom vad som hände med det (visades, togs "
+"bort, etc.). Det här alternativet avråds starkt ifrån, men eftersom det kan "
+"vara helt rimligt för t ex hantering av kundrelationer, finns det "
+"tillgängligt.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2478,15 +2463,15 @@ msgstr "Tillåt brev att ladda e&xterna referenser från Internet"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>VARNING:</b> Om du tillåter HTML i e-post ökar risken för att nuvarande och "
-"möjliga framtida säkerhetsluckor utnyttjas för intrång i ditt system. <a "
-"href=\"whatsthis:%1\">Mer om HTML-post...</a> <a href=\"whatsthis:%2\">"
-"Mer om externa referenser...</a>"
+"<b>VARNING:</b> Om du tillåter HTML i e-post ökar risken för att nuvarande "
+"och möjliga framtida säkerhetsluckor utnyttjas för intrång i ditt system. <a "
+"href=\"whatsthis:%1\">Mer om HTML-post...</a> <a href=\"whatsthis:%2\">Mer "
+"om externa referenser...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2545,8 +2530,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>VARNING:</b> Att skicka tillbaka bekräftelser utan villkor undergräver din "
-"integritet. <a href=\"whatsthis:%1\">Mer information...</a>"
+"<b>VARNING:</b> Att skicka tillbaka bekräftelser utan villkor undergräver "
+"din integritet. <a href=\"whatsthis:%1\">Mer information...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2567,8 +2552,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Det här alternativet kräver dirmngr 0.9.0 eller senare"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "ingen proxy"
@@ -2597,8 +2581,8 @@ msgstr "Undanta &viktiga brev från att utgå"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Vid försök att hitta olästa brev:"
 
@@ -2622,8 +2606,8 @@ msgstr "Upprepa i alla korgar"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "När en korg öppnas:"
 
@@ -2692,27 +2676,23 @@ msgstr "Kataloger (\"maildir\"-format)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>Här väljs vilket brevkorgsformat som ska användas som standard för lokala "
-"korgar:</p>"
-"<p><b>mbox:</b> Kmails brevkorgar representeras av en enda fil vardera. "
-"Enskilda brev skiljs åt med en rad som börjar med \"From \". Det här sparar "
-"plats på disken, men kan vara mindre robust, t ex om brev flyttas mellan "
-"korgar.</p>"
-"<p><b>maildir:</b> Kmails brevkorgar representeras av riktiga kataloger på "
-"disken. Enskilda brev är olika filer. Det här kanske slösar en del diskutrymme, "
-"men bör vara robustare, t ex när brev flyttas mellan korgar.</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>Här väljs vilket brevkorgsformat som ska användas som standard för "
+"lokala korgar:</p><p><b>mbox:</b> Kmails brevkorgar representeras av en enda "
+"fil vardera. Enskilda brev skiljs åt med en rad som börjar med \"From \". "
+"Det här sparar plats på disken, men kan vara mindre robust, t ex om brev "
+"flyttas mellan korgar.</p><p><b>maildir:</b> Kmails brevkorgar representeras "
+"av riktiga kataloger på disken. Enskilda brev är olika filer. Det här kanske "
+"slösar en del diskutrymme, men bör vara robustare, t ex när brev flyttas "
+"mellan korgar.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2745,53 +2725,43 @@ msgstr "Gibyte"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Vid hopp till nästa olästa brev, kan det hända att det inte finns några "
-"olästa brev under det aktuella brevet.</p>"
-"<p><b>Upprepa inte:</b> Sökningen stoppar vid det sista brevet i aktuell "
-"korg.</p>"
-"<p><b>Upprepa i aktuell korg:</b> Sökningen fortsätter överst i brevlistan, men "
-"går inte vidare i någon annan korg.</p>"
-"<p><b>Upprepa i alla korgar:</b> Sökningen fortsätter överst i brevlistan. Om "
-"inga olästa brev hittas fortsätter den därefter i nästa korg.</p>"
-"<p>På liknande sätt, vid sökning efter föregående olästa brev, börjar sökningen "
-"längst ner i brevlistan och fortsätter i föregående korg, beroende på vilket "
-"alternativ som är valt.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Vid hopp till nästa olästa brev, kan det hända att det inte finns "
+"några olästa brev under det aktuella brevet.</p><p><b>Upprepa inte:</b> "
+"Sökningen stoppar vid det sista brevet i aktuell korg.</p><p><b>Upprepa i "
+"aktuell korg:</b> Sökningen fortsätter överst i brevlistan, men går inte "
+"vidare i någon annan korg.</p><p><b>Upprepa i alla korgar:</b> Sökningen "
+"fortsätter överst i brevlistan. Om inga olästa brev hittas fortsätter den "
+"därefter i nästa korg.</p><p>På liknande sätt, vid sökning efter föregående "
+"olästa brev, börjar sökningen längst ner i brevlistan och fortsätter i "
+"föregående korg, beroende på vilket alternativ som är valt.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Fulltextindexering möjliggör mycket snabb sökning i brevens innehåll. När "
-"den är aktiverad, fungerar sökdialogrutan mycket snabbt. Dessutom väljer "
-"sökraden också brev baserat på innehåll.</p>"
-"<p>Den tar upp en viss mängd diskutrymme (omkring halva diskutrymmet för "
-"breven).</p> "
-"<p>Efter den har aktiverats måste indexet byggas, men du kan fortsätta att "
-"använda Kmail medan åtgärden pågår.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Fulltextindexering möjliggör mycket snabb sökning i brevens innehåll. "
+"När den är aktiverad, fungerar sökdialogrutan mycket snabbt. Dessutom väljer "
+"sökraden också brev baserat på innehåll.</p><p>Den tar upp en viss mängd "
+"diskutrymme (omkring halva diskutrymmet för breven).</p> <p>Efter den har "
+"aktiverats måste indexet byggas, men du kan fortsätta att använda Kmail "
+"medan åtgärden pågår.</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2858,8 +2828,8 @@ msgstr "&Dölj grupprogramkorgar"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "När det här är markerat, ser du inte IMAP-resurskorgarna i korgträdet."
 
 #: configuredialog.cpp:4909
@@ -2868,11 +2838,11 @@ msgstr "Visa &bara grupprogramkorgar för kontot"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"När det här är markerat, ser du inte normala brevkorgar i korgträdet för kontot "
-"som är inställt för grupprogram."
+"När det här är markerat, ser du inte normala brevkorgar i korgträdet för "
+"kontot som är inställt för grupprogram."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2931,23 +2901,22 @@ msgid ""
 "compatible way."
 msgstr ""
 "Microsoft Outlook har problem att förstå e-post från grupprogram som följer "
-"standard, vid användning tillsammans med en Microsoft Exchange server. Aktivera "
-"det här alternativet för att skicka inbjudningar på ett sätt som Microsoft "
-"Exchange förstår."
+"standard, vid användning tillsammans med en Microsoft Exchange server. "
+"Aktivera det här alternativet för att skicka inbjudningar på ett sätt som "
+"Microsoft Exchange förstår."
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Namngivning av bilagor som fungerar med Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatisk skickning av inbjudning"
@@ -2962,23 +2931,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>En inbjudan skickas normalt som en bilaga till brevet. Det här alternativet "
-"ändrar det så att inbjudan istället skickas i brevets text. Det behövs för att "
-"skicka inbjudan och svar till Microsoft Outlook."
-"<br>Men när du gör det, får du inte längre beskrivande text som e-postprogram "
-"kan läsa, så för personer som har e-postprogram som inte förstår inbjudan ser "
-"de resulterande breven mycket underliga ut."
-"<br>Personer som har e-postprogram som inte förstår inbjudan, kommer dock "
-"fortfarande kunna hantera det här.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>En inbjudan skickas normalt som en bilaga till brevet. Det här "
+"alternativet ändrar det så att inbjudan istället skickas i brevets text. Det "
+"behövs för att skicka inbjudan och svar till Microsoft Outlook.<br>Men när "
+"du gör det, får du inte längre beskrivande text som e-postprogram kan läsa, "
+"så för personer som har e-postprogram som inte förstår inbjudan ser de "
+"resulterande breven mycket underliga ut.<br>Personer som har e-postprogram "
+"som inte förstår inbjudan, kommer dock fortfarande kunna hantera det här.</"
+"qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3082,30 +3051,27 @@ msgstr "Vidarebefordra"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Här kan du lägga till, redigera och ta bort egna brevmallar som kan användas "
-"när du skriver ett svar eller vidarebefordrar ett brev. Skapa en egen mall "
-"genom att markera den med menyn som visas med höger musknapp eller med "
-"verktygsradens meny. Du kan också tilldela mallen en tangentbordskombination "
-"för snabbare användning.</p>"
-"<p>Brevmallar stöder ersättningskommandon genom att helt enkelt skriva in dem "
-"eller välja dem i menyn <i>Infoga kommando</i>.</p>"
-"<p>Det finns fyra typer av egna mallar som används för <i>Svara</i>, <i>"
-"Svara till alla</i>, <i>Vidarebefordran</i> och <i>Generell</i> "
-"som kan användas för alla sorters åtgärder. Du kan inte tilldela snabbtangenter "
-"till <i>Generella</i> mallar.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Här kan du lägga till, redigera och ta bort egna brevmallar som kan "
+"användas när du skriver ett svar eller vidarebefordrar ett brev. Skapa en "
+"egen mall genom att markera den med menyn som visas med höger musknapp eller "
+"med verktygsradens meny. Du kan också tilldela mallen en "
+"tangentbordskombination för snabbare användning.</p><p>Brevmallar stöder "
+"ersättningskommandon genom att helt enkelt skriva in dem eller välja dem i "
+"menyn <i>Infoga kommando</i>.</p><p>Det finns fyra typer av egna mallar som "
+"används för <i>Svara</i>, <i>Svara till alla</i>, <i>Vidarebefordran</i> och "
+"<i>Generell</i> som kan användas för alla sorters åtgärder. Du kan inte "
+"tilldela snabbtangenter till <i>Generella</i> mallar.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3122,15 +3088,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3148,8 +3114,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Den valda snabbtangenten används redan av en annan egendefinierad mall Vill du "
-"ändå fortsätta med tilldelningen?"
+"Den valda snabbtangenten används redan av en annan egendefinierad mall Vill "
+"du ändå fortsätta med tilldelningen?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3196,8 +3162,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt>Distributionslista med det angivna namnet <b>%1</b> "
-"finns redan. Välj ett annat namn.</qt>"
+"<qt>Distributionslista med det angivna namnet <b>%1</b> finns redan. Välj "
+"ett annat namn.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3206,8 +3172,8 @@ msgstr "Redigera med:"
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 "Kmail kan inte detektera när den valda editorn stängs. För att undvika "
 "dataförlust, avbryts redigering av bilagan."
@@ -3460,6 +3426,11 @@ msgstr "Välj filter"
 msgid "Filters"
 msgstr "Filter"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Markera all text"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3491,8 +3462,8 @@ msgstr "&Logga filteraktivitet"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Du kan stänga av eller sätta på loggning av filteraktiviteter här. Loggdata "
 "samlas bara in och visas när loggning är aktiverad. "
@@ -3511,15 +3482,16 @@ msgstr "Logga filter&regelutvärdering"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Du kan styra återmatning i loggen avseende utvärderingen av filterreglerna för "
-"tillämpade filter. Lämnas alternativet markerat erhålls detaljerad återmatning "
-"för varje enskild filterregel. Alternativt ges bara återmatning om resultat "
-"efter utvärdering av ett enstaka filter."
+"Du kan styra återmatning i loggen avseende utvärderingen av filterreglerna "
+"för tillämpade filter. Lämnas alternativet markerat erhålls detaljerad "
+"återmatning för varje enskild filterregel. Alternativt ges bara återmatning "
+"om resultat efter utvärdering av ett enstaka filter."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3539,13 +3511,13 @@ msgstr "obegränsad"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Att samla in loggdata använder minne för att tillfällig lagra loggdata. Här kan "
-"du begränsa maximal minnesstorlek som ska användas. Om insamlad loggdata "
+"Att samla in loggdata använder minne för att tillfällig lagra loggdata. Här "
+"kan du begränsa maximal minnesstorlek som ska användas. Om insamlad loggdata "
 "överskrider gränsen, kastas äldsta data till gränsen inte längre överskrids. "
 
 #: filterlogdlg.cpp:258
@@ -3556,7 +3528,7 @@ msgstr ""
 "Kunde inte skriva till filen %1:\n"
 "Den detaljerade felbeskrivningen är \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Kmail-fel"
@@ -3597,13 +3569,13 @@ msgstr "An&vändaridentifiering:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Användaridentifieringen är inloggningsnamnet för användaren på IMAP-servern. "
-"Den kan vara ett enkelt användarnamn eller användarens fullständiga "
-"e-postadress. Inloggningen till ditt eget konto på servern anger vilket den är."
+"Den kan vara ett enkelt användarnamn eller användarens fullständiga e-"
+"postadress. Inloggningen till ditt eget konto på servern anger vilket den är."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3654,10 +3626,11 @@ msgstr "Du har inte behörighet att läsa och skriva i papperskorgen."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Informationen har inte ännu hämtats från servern. Använd \"Kontrollera brev\"."
+"Informationen har inte ännu hämtats från servern. Använd \"Kontrollera brev"
+"\"."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3667,8 +3640,7 @@ msgstr "Fel: Inget IMAP-konto definierat för korgen"
 msgid "Connecting to server %1, please wait..."
 msgstr "Ansluter till servern %1. Vänta..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Fel vid anslutning till servern %1"
@@ -3696,11 +3668,11 @@ msgstr "Lägg till behörigheter"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Vill du verkligen ta bort dina egna behörigheter för korgen? Du kan inte längre "
-"komma åt den efteråt."
+"Vill du verkligen ta bort dina egna behörigheter för korgen? Du kan inte "
+"längre komma åt den efteråt."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3731,7 +3703,7 @@ msgstr "Användning:"
 msgid "Select Folder"
 msgstr "Markera korg"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokala korgar"
@@ -3755,13 +3727,13 @@ msgstr "Välj genväg för korg"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>För att ange en tangent eller tangentkombination som väljer aktuell korg, "
-"klicka på knappen nedan och tryck därefter på tangenten eller tangenterna som "
-"du vill ska höra ihop med korgen.</qt>"
+"<qt>För att ange en tangent eller tangentkombination som väljer aktuell "
+"korg, klicka på knappen nedan och tryck därefter på tangenten eller "
+"tangenterna som du vill ska höra ihop med korgen.</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3781,13 +3753,22 @@ msgstr "&Avbryt"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Korgen du tog bort hörde ihop med kontot <b>%1</b> "
-"som levererade brev till den. Korgen som kontot levererar nya brev till har "
-"återställts till huvudinkorgen.</qt>"
+"<qt>Korgen du tog bort hörde ihop med kontot <b>%1</b> som levererade brev "
+"till den. Korgen som kontot levererar nya brev till har återställts till "
+"huvudinkorgen.</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Totalt: %2<br>Olästa: %3<br>Storlek: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Kvot: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3910,75 +3891,18 @@ msgstr "Skräppoststatus:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>m"
-"<br>e"
-"<br>d"
-"<br>d"
-"<br>e"
-"<br>l"
-"<br>a"
-"<br>n"
-"<br>d"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> "
+"<br>m<br>e<br>d<br>d<br>e<br>l<br>a<br>n<br>d<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>E"
-"<br>j"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>m"
-"<br>e"
-"<br>d"
-"<br>d"
-"<br>e"
-"<br>l"
-"<br>a"
-"<br>n"
-"<br>d"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>E<br>j<br> <br>H<br>T<br>M<br>L<br> "
+"<br>m<br>e<br>d<br>d<br>e<br>l<br>a<br>n<br>d<br>e</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3990,19 +3914,13 @@ msgstr "&Ditt namn:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Ditt namn</h3>"
-"<p>Det här fältet ska innehålla ditt namn, som du vill att det ska visas i "
-"e-posthuvudet som skickas.</p>"
-"<p>Om du lämnar det tomt, visas inte ditt riktiga namn, utan bara "
-"e-postadressen.</p></qt>"
+"<qt><h3>Ditt namn</h3><p>Det här fältet ska innehålla ditt namn, som du vill "
+"att det ska visas i e-posthuvudet som skickas.</p><p>Om du lämnar det tomt, "
+"visas inte ditt riktiga namn, utan bara e-postadressen.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4010,17 +3928,13 @@ msgstr "Organi&sation:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Organisation</h3>"
-"<p>Det här fältet ska innehålla namnet på din organisation, om du vill att det "
-"ska visas i e-posthuvudet som skickas.</p>"
-"<p>Det är ofarligt (och normalt) att lämna det tomt.</p></qt>"
+"<qt><h3>Organisation</h3><p>Det här fältet ska innehålla namnet på din "
+"organisation, om du vill att det ska visas i e-posthuvudet som skickas.</"
+"p><p>Det är ofarligt (och normalt) att lämna det tomt.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4029,20 +3943,15 @@ msgstr "&E-postadress:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-postadress</h3>"
-"<p>Det här fältet ska innehålla hela din e-postadress.</p>"
-"<p>Om du lämnar det tomt, eller skriver in det fel, får andra svårt att svara "
-"dig.</p></qt>"
+"<qt><h3>E-postadress</h3><p>Det här fältet ska innehålla hela din e-"
+"postadress.</p><p>Om du lämnar det tomt, eller skriver in det fel, får andra "
+"svårt att svara dig.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4051,21 +3960,12 @@ msgstr "&E-postadress:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4089,19 +3989,17 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>OpenPGP-nyckeln som du väljer här, kommer att användas för digital signatur "
-"av brev. Du kan också använda GnuPG-nycklar.</p>"
-"<p>Du kan lämna det tomt, men då kan inte Kmail signera e-post med OpenPGP. "
-"Normala e-postfunktioner påverkas inte.</p>"
-"<p>Du kan ta reda på mer om nycklar på <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>OpenPGP-nyckeln som du väljer här, kommer att användas för digital "
+"signatur av brev. Du kan också använda GnuPG-nycklar.</p><p>Du kan lämna det "
+"tomt, men då kan inte Kmail signera e-post med OpenPGP. Normala e-"
+"postfunktioner påverkas inte.</p><p>Du kan ta reda på mer om nycklar på "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4113,30 +4011,27 @@ msgstr "Din OpenPGP-krypteringsnyckel"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Välj OpenPGP-nyckeln som ska användas för att kryptera brev till dig själv, och "
-"för funktionen \"Bifoga min öppna nyckel\" i brevfönstret."
+"Välj OpenPGP-nyckeln som ska användas för att kryptera brev till dig själv, "
+"och för funktionen \"Bifoga min öppna nyckel\" i brevfönstret."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>OpenPGP-nyckeln som du väljer här, kommer att användas för att kryptera brev "
-"till dig själv och för funktionen \"Bifoga min öppna nyckel\" i brevfönstret. "
-"Du kan också använda GnuPG-nycklar.</p>"
-"<p>Du kan lämna det tomt, men då kan inte Kmail kryptera kopior av utgående "
-"brev till dig själv med OpenPGP. Normala e-postfunktioner påverkas inte.</p>"
-"<p>Du kan ta reda på mer om nycklar på <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>OpenPGP-nyckeln som du väljer här, kommer att användas för att "
+"kryptera brev till dig själv och för funktionen \"Bifoga min öppna nyckel\" "
+"i brevfönstret. Du kan också använda GnuPG-nycklar.</p><p>Du kan lämna det "
+"tomt, men då kan inte Kmail kryptera kopior av utgående brev till dig själv "
+"med OpenPGP. Normala e-postfunktioner påverkas inte.</p><p>Du kan ta reda på "
+"mer om nycklar på <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4155,17 +4050,15 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509)-certifikatet som du väljer här, kommer att användas för "
-"digital signatur av brev.</p>"
-"<p>Du kan lämna det tomt, men då kan inte Kmail signera e-post med S/MIME. "
-"Normala e-postfunktioner påverkas inte.</p></qt>"
+"<qt><p>S/MIME (X.509)-certifikatet som du väljer här, kommer att användas "
+"för digital signatur av brev.</p><p>Du kan lämna det tomt, men då kan inte "
+"Kmail signera e-post med S/MIME. Normala e-postfunktioner påverkas inte.</"
+"p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4177,27 +4070,25 @@ msgstr "Ditt S/MIME-krypteringscertifikat"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Välj S/MIME-certifikatet som ska användas vid kryptering till dig själv och för "
-"funktionen \"Bifoga mitt certifikat\" i brevfönstret."
+"Välj S/MIME-certifikatet som ska användas vid kryptering till dig själv och "
+"för funktionen \"Bifoga mitt certifikat\" i brevfönstret."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME-certifikatet som du väljer här, kommer att användas för att kryptera "
-"brev till dig själv, och för funktionen \"Bifoga mitt certifikat\" i "
-"brevfönstret.</p>"
-"<p>Du kan lämna det tomt, men då kan inte Kmail kryptera kopior av utgående "
-"brev till dig själv med S/MIME. Normala e-postfunktioner påverkas inte.</p></qt>"
+"<qt><p>S/MIME-certifikatet som du väljer här, kommer att användas för att "
+"kryptera brev till dig själv, och för funktionen \"Bifoga mitt certifikat\" "
+"i brevfönstret.</p><p>Du kan lämna det tomt, men då kan inte Kmail kryptera "
+"kopior av utgående brev till dig själv med S/MIME. Normala e-postfunktioner "
+"påverkas inte.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4217,24 +4108,19 @@ msgstr "Sva&rsadress:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Svarsadress</h3>"
-"<p>Det här anger att huvudet <tt>Reply-to:</tt> ska innehålla en annan adress "
-"än den vanliga adressen efter <tt>From:</tt>.</p>"
-"<p>Det kan vara användbart när en grupp arbetar tillsammans med liknande "
-"roller. Du kan till exempel vilja att all e-post som skickas ska ha din "
-"e-postadress i fältet <tt>From:</tt>, men eventuella svar ska gå till en "
-"gruppadress.</p>"
-"<p>Om du tvekar, lämna fältet tomt.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Svarsadress</h3><p>Det här anger att huvudet <tt>Reply-to:</tt> ska "
+"innehålla en annan adress än den vanliga adressen efter <tt>From:</tt>.</"
+"p><p>Det kan vara användbart när en grupp arbetar tillsammans med liknande "
+"roller. Du kan till exempel vilja att all e-post som skickas ska ha din e-"
+"postadress i fältet <tt>From:</tt>, men eventuella svar ska gå till en "
+"gruppadress.</p><p>Om du tvekar, lämna fältet tomt.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4242,26 +4128,20 @@ msgstr "Adresser med dold &kopia:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adresser med dold kopia</h3>"
-"<p>Adresserna som du skriver in här läggs till i varje utskickat brev som "
-"skickas med den här identiteten. De kommer inte vara synliga för andra "
-"mottagare.</p>"
-"<p>Detta används ofta för att skicka en kopia av varje utskickat brev till ett "
-"annat av dina konton.</p> "
-"<p>För att ange mer än en adress, använd kommatecken för att åtskilja "
-"mottagarna av dolda kopior.</p>"
-"<p>Om du är osäker, lämna fältet tomt.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adresser med dold kopia</h3><p>Adresserna som du skriver in här "
+"läggs till i varje utskickat brev som skickas med den här identiteten. De "
+"kommer inte vara synliga för andra mottagare.</p><p>Detta används ofta för "
+"att skicka en kopia av varje utskickat brev till ett annat av dina konton.</"
+"p> <p>För att ange mer än en adress, använd kommatecken för att åtskilja "
+"mottagarna av dolda kopior.</p><p>Om du är osäker, lämna fältet tomt.</p></"
+"qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4299,7 +4179,7 @@ msgstr "&Brevfot"
 msgid "&Picture"
 msgstr "B&ild"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Ogiltig e-postadress"
 
@@ -4322,8 +4202,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "En av de inställda OpenPGP-nycklarna innehåller inte någon "
 "användaridentifikation med identitetens inställda e-postadress (%1)."
@@ -4335,8 +4215,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"Ett av de inställda S/MIME-signeringscertifikaten innehåller inte identitetens "
-"inställda e-postadress (%1).\n"
+"Ett av de inställda S/MIME-signeringscertifikaten innehåller inte "
+"identitetens inställda e-postadress (%1).\n"
 "Det kan orsaka varningsmeddelanden på mottagarsidan vid försök att verifiera "
 "signaturer som skapats med denna inställning."
 
@@ -4345,8 +4225,8 @@ msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Ett av de inställda S/MIME-signeringscertifikaten innehåller inte identitetens "
-"inställda e-postadress (%1)."
+"Ett av de inställda S/MIME-signeringscertifikaten innehåller inte "
+"identitetens inställda e-postadress (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4365,29 +4245,29 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"Den egna korgen för skickade brev finns inte (längre) för identiteten \"%1\". "
-"Därför används den förvalda korgen för skickade brev."
+"Den egna korgen för skickade brev finns inte (längre) för identiteten "
+"\"%1\". Därför används den förvalda korgen för skickade brev."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Den egna korgen för utkast finns inte (längre) för identiteten \"%1\". Därför "
-"används den förvalda korgen för utkast."
+"Den egna korgen för utkast finns inte (längre) för identiteten \"%1\". "
+"Därför används den förvalda korgen för utkast."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Den korgen för egna mallar finns inte (längre) för identiteten \"%1\". Därför "
-"används den förvalda mallkorgen."
+"Den korgen för egna mallar finns inte (längre) för identiteten \"%1\". "
+"Därför används den förvalda mallkorgen."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (förvald)"
 
@@ -4436,16 +4316,16 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Inställningen har överförts automatiskt, men du bör kontrollera din "
 "kontoinställning."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 "Det var inte möjligt att överföra din inställning automatiskt, kontrollera "
 "därför din kontoinställning."
@@ -4485,20 +4365,25 @@ msgstr "Korgen är för nära sin kvotgräns (%1)."
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
-"Eftersom du inte verkar ha skrivrättigheter för korgen, be korgens ägare om att "
-"frigöra ett visst utrymme i den."
+"Eftersom du inte verkar ha skrivrättigheter för korgen, be korgens ägare om "
+"att frigöra ett visst utrymme i den."
+
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Fel: %1"
 
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"Anslutningen till servern %1 stängdes oväntat eller överskred en tidsgräns. Den "
-"återställs automatiskt om möjligt."
+"Anslutningen till servern %1 stängdes oväntat eller överskred en tidsgräns. "
+"Den återställs automatiskt om möjligt."
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4647,20 +4532,20 @@ msgstr "Listarkiv"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
-"Ett eller flera av de inställda OpenPGP-krypteringsnycklarna eller "
-"S/MIME-certifikaten är inte pålitliga."
+"Ett eller flera av de inställda OpenPGP-krypteringsnycklarna eller S/MIME-"
+"certifikaten är inte pålitliga."
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
-"Ett eller flera av de inställda OpenPGP-krypteringsnycklarna eller "
-"S/MIME-certifikaten är inte pålitliga."
+"Ett eller flera av de inställda OpenPGP-krypteringsnycklarna eller S/MIME-"
+"certifikaten är inte pålitliga."
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4694,224 +4579,182 @@ msgstr "Inte pålitliga krypteringsnycklar"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än en dag.</p>\n"
+"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än en dag.</p>\n"
+"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går "
+"ut om mindre än en dag.</p>\n"
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går "
+"ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för S/MIME-certifikat</"
+"p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut om mindre än en "
+"dag.</p>\n"
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för S/MIME-certifikat</"
+"p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut om mindre än %n "
+"dagar.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för S/"
+"MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre än en dag.</p>\n"
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för S/"
+"MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre än en dag.</p>\n"
 "<p>Ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre än en dag.</p>\n"
 "<p>Ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4925,213 +4768,171 @@ msgstr "S/MIME-certifikat går snart ut"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än en dag.</p>\n"
+"<p>Din OpenPGP-signeringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> "
-"(Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än en dag.</p>\n"
+"<p>Din OpenPGP-krypteringsnyckel</p><p align=center><b>%1</b> (Nyckel-id 0x"
+"%2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>OpenPGP-nyckeln för</p><p align=center><b>%1</b> (Nyckel-id 0x%2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går "
+"ut om mindre än en dag.</p>\n"
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går "
+"ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för ditt S/MIME-"
+"krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Rotcertifikatet</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för S/MIME-certifikat</"
+"p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut om mindre än en "
+"dag.</p>\n"
+"<p>Rotcertifikatet</p><p align=center><b>%3</b></p><p>för S/MIME-certifikat</"
+"p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut om mindre än %n "
+"dagar.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-signeringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för ditt "
+"S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p>"
-"<p>för S/MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för S/"
+"MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre än en dag.</p>\n"
+"<p>Mellanliggande CA-certifikat</p><p align=center><b>%3</b></p><p>för S/"
+"MIME-certifikat</p><p align=center><b>%1</b> (serienummer %2)</p><p>går ut "
+"om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre än en dag.</p>\n"
 "<p>Ditt S/MIME-signeringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
+"(serienummer %2)</p><p>går ut om mindre än en dag.</p>\n"
 "<p>Ditt S/MIME-krypteringscertifikat</p><p align=center><b>%1</b> "
-"(serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"(serienummer %2)</p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än en dag.</p>\n"
-"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</p>"
-"<p>går ut om mindre än %n dagar.</p>"
+"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än en dag.</p>\n"
+"<p>S/MIME-certifikatet för</p><p align=center><b>%1</b> (serienummer %2)</"
+"p><p>går ut om mindre än %n dagar.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5143,18 +4944,19 @@ msgstr "S/MIME-certifikat går snart ut"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"En eller flera av dina inställda OpenPGP-krypteringsnycklar eller "
-"S/MIME-cetifikat är inte användbara för kryptering. Ställ in dina "
+"En eller flera av dina inställda OpenPGP-krypteringsnycklar eller S/MIME-"
+"cetifikat är inte användbara för kryptering. Ställ in dina "
 "krypteringsnycklar och certifikat för den här identiteten i identitetens "
 "inställningsdialogruta.\n"
-"Om du väljer att fortsätta, och nycklarna senare behövs, blir du tillfrågad om "
-"att ange nycklarna som ska användas."
+"Om du väljer att fortsätta, och nycklarna senare behövs, blir du tillfrågad "
+"om att ange nycklarna som ska användas."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5168,12 +4970,12 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"En eller flera av dina inställda OpenPGP-signeringsnycklar eller "
-"S/MIME-signeringscetifikat är inte användbara för signering. Ställ in dina "
+"En eller flera av dina inställda OpenPGP-signeringsnycklar eller S/MIME-"
+"signeringscetifikat är inte användbara för signering. Ställ in dina "
 "signeringsnycklar och certifikat för den här identiteten i identitetens "
 "inställningsdialogruta.\n"
-"Om du väljer att fortsätta, och nycklarna senare behövs, blir du tillfrågad om "
-"att ange nycklarna som ska användas."
+"Om du väljer att fortsätta, och nycklarna senare behövs, blir du tillfrågad "
+"om att ange nycklarna som ska användas."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5183,38 +4985,38 @@ msgstr "Oanvändbara signeringsnycklar"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Undersökning av mottagarnas krypteringspreferenser gav resultatet att brevet "
 "borde krypteras med OpenPGP, åtminstone för vissa mottagare.\n"
 "Du har dock inte ställt in giltiga, pålitliga OpenPGP-krypteringsnycklar för "
 "identiteten.\n"
-"Du kan fortsätta utan att kryptera till dig själv, men var medveten om att du "
-"inte kan läsa dina egna brev om du gör det."
+"Du kan fortsätta utan att kryptera till dig själv, men var medveten om att "
+"du inte kan läsa dina egna brev om du gör det."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "Undersökning av mottagarnas krypteringspreferenser gav resultatet att brevet "
 "borde krypteras med S/MIME, åtminstone för vissa mottagare.\n"
 "Du har dock inte ställt in giltiga S/MIME-krypteringscertifikat för "
 "identiteten.\n"
-"Du kan fortsätta utan att kryptera till dig själv, men var medveten om att du "
-"inte kan läsa dina egna brev om du gör det."
+"Du kan fortsätta utan att kryptera till dig själv, men var medveten om att "
+"du inte kan läsa dina egna brev om du gör det."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5229,14 +5031,15 @@ msgstr "Signera inte med OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "Undersökning av mottagarnas signeringspreferenser gav resultatet att brevet "
 "borde signeras med S/MIME, åtminstone för vissa mottagare.\n"
-"Du har dock inte ställt in giltiga S/MIME-signeringscertifikat för identiteten."
+"Du har dock inte ställt in giltiga S/MIME-signeringscertifikat för "
+"identiteten."
 
 #: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
@@ -5258,11 +5061,11 @@ msgstr "Signering inte möjlig"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Du har inte valt en krypteringsnyckel för dig själv (kryptera till dig själv). "
-"Du kommer inte att kunna avkoda ditt eget brev om du krypterar det."
+"Du har inte valt en krypteringsnyckel för dig själv (kryptera till dig "
+"själv). Du kommer inte att kunna avkoda ditt eget brev om du krypterar det."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5283,8 +5086,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Du valde inte en krypteringsnyckel för någon av mottagarna av brevet. Därför "
 "krypteras inte brevet."
@@ -5306,8 +5109,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du valde inte en krypteringsnyckel för några av mottagarna. De här personerna "
-"kommer inte att kunna läsa brevet om du krypterar det."
+"Du valde inte en krypteringsnyckel för några av mottagarna. De här "
+"personerna kommer inte att kunna läsa brevet om du krypterar det."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5331,11 +5134,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Ingen giltig och pålitlig krypteringsnyckel hittades för \"%1\".\n"
 "\n"
@@ -5384,10 +5187,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Kritiskt fel: Kunde inte samla in brev: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Misslyckades med att lägga till brev:\n"
+msgid "Failed to add message:\n"
+msgstr "Misslyckades med att lägga till brev:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5477,6 +5278,51 @@ msgstr "&Nerkopplad IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir-brevlåda"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Ange rubrik för brevet"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Skicka kopia: till \"adress\""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Skicka dold kopia: till \"adress\""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Lägg till \"huvud\" till brevet"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Läs brevtext från \"fil\""
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Ange text för brevet"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Lägg till en bilaga till brevet, detta kan upprepas"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Titta endast efter nya brev"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Öppna endast brevfönstret"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Visa angiven brevfil"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Skicka brev till \"adress\", eller bifoga filen som \"webbadress\" pekar på"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Brev"
@@ -5533,13 +5379,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"<qt>Kmail hittade följande grupprogramkorgar i %1 och behöver utföra följande "
-"åtgärder: %2."
-"<br>Om du inte vill göra detta, avbryt så inaktiveras IMAP-resursen."
+"<qt>Kmail hittade följande grupprogramkorgar i %1 och behöver utföra "
+"följande åtgärder: %2.<br>Om du inte vill göra detta, avbryt så inaktiveras "
+"IMAP-resursen."
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5587,11 +5433,11 @@ msgstr "Webbadressen kopierad till klippbordet."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Filen <b>%1</b> existerar.<br>Vill du ersätta den?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Spara till fil"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Ersätt"
 
@@ -5609,7 +5455,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Brevet togs bort medan det sparades. Det har inte sparats."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5629,11 +5475,11 @@ msgstr "Filen innehåller inte ett brev."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Filen innehåller flera brev. Bara det första brevet visas."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5643,114 +5489,114 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Filtrerar brev"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerar brev %1 av %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Inte tillräckligt med ledigt diskutrymme?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Flytta till den här korgen"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Kopiera till den här korgen"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Förstörd IMAP-cache detekterades i korgen %1. Kopiering av brev avbruten."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Flyttar brev"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Tar bort brev"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Öppnar webbadress..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Vill du verkligen köra <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Kör"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Hittade inga bilagor att spara."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Spara bilagor som"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "bilaga.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "bilaga.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "En fil med namnet %1 finns redan. Vill du skriva över den?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Filen finns redan"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Skriv &över"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Del %1 av brevet är krypterad. Vill du behålla krypteringen när du sparar?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Kmail-fråga"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Behåll kryptering"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Behåll inte"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Del %1 av brevet är signerad. Vill du behålla signaturen när du sparar?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Behåll signatur"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5759,22 +5605,22 @@ msgstr ""
 "Kunde inte skriva till filen %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Kunde inte skriva till filen %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
-"Det finns ingen post i adressboken för den här e-postadressen. Lägg till den i "
-"adressboken och lägg därefter till adresser för direktmeddelanden med "
+"Det finns ingen post i adressboken för den här e-postadressen. Lägg till den "
+"i adressboken och lägg därefter till adresser för direktmeddelanden med "
 "meddelandeklienten du föredrar."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5784,51 +5630,51 @@ msgstr ""
 " %1\n"
 "Det är inte möjligt att avgöra vem du vill chatta med."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Chiasmus-gränssnittet tillhandahåller inte funktionen \"x-obtain-keys\". "
 "Rapportera felet."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Fel i Chiasmus-gränssnitt"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Oväntat returvärde från Chiasmus-gränssnittet. Funktionen \"x-obtain-keys\" "
 "returnerade inte en stränglista. Rapportera felet."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
-"Inga nycklar hittades. Kontrollera att en giltig nyckelsökväg har ställts in i "
-"Chiasmus inställningar."
+"Inga nycklar hittades. Kontrollera att en giltig nyckelsökväg har ställts in "
+"i Chiasmus inställningar."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Val av Chiasmus avkodningsnyckel"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus-gränssnittet tillhandahåller inte funktionen \"x-decrypt\". Rapportera "
-"felet."
+"Chiasmus-gränssnittet tillhandahåller inte funktionen \"x-decrypt\". "
+"Rapportera felet."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5836,19 +5682,19 @@ msgstr ""
 "Funktionen \"x-decrypt\" accepterar inte förväntade parametrar. Rapportera "
 "felet."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus avkodningsfel"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Oväntat returvärde från Chiasmus-gränssnittet. Funktionen \"x-decrypt\" "
 "returnerade inte ett bytefält. Rapportera felet."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5858,7 +5704,7 @@ msgstr ""
 "Till: %2\n"
 "Rubrik: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Brev: %1"
@@ -5957,7 +5803,7 @@ msgstr "Storlek"
 msgid "Encoding"
 msgstr "Kodning"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Komprimera"
 
@@ -5969,7 +5815,7 @@ msgstr "Kryptera"
 msgid "Sign"
 msgstr "Signera"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Bilagans namn:"
 
@@ -5991,9 +5837,11 @@ msgstr "Huvudmottagare"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
-"<qt>E-postadressen som skrivs in i det här fältet får en kopia av brevet.</qt>"
+"<qt>E-postadressen som skrivs in i det här fältet får en kopia av brevet.</"
+"qt>"
 
 #: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
@@ -6002,13 +5850,13 @@ msgstr "Ytterligare mottagare"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>E-postadresserna som skrivs in i det här fältet får en kopia av brevet. "
-"Tekniskt sett är det samma sak som att skriva alla adresser i fältet <b>"
-"Till:</b>, men skiljer sig i att det oftast betyder att mottagaren av kopian är "
+"Tekniskt sett är det samma sak som att skriva alla adresser i fältet <b>Till:"
+"</b>, men skiljer sig i att det oftast betyder att mottagaren av kopian är "
 "en intressent, inte den huvudsakliga mottagaren.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6017,13 +5865,11 @@ msgstr "Dolda mottagare"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>I stort sett samma sak som fältet <b>Kopiera till:</b> "
-"men skiljer sig i att alla andra mottagare inte ser vem som tar emot en dold "
-"kopia.</qt>"
+"<qt>I stort sett samma sak som fältet <b>Kopiera till:</b> men skiljer sig i "
+"att alla andra mottagare inte ser vem som tar emot en dold kopia.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6033,7 +5879,7 @@ msgstr "&Skicka brev"
 msgid "&Send Mail Via"
 msgstr "&Skicka brev via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Skicka s&enare"
@@ -6098,8 +5944,7 @@ msgstr "Ta &bort citattecken"
 msgid "Cl&ean Spaces"
 msgstr "&Rensa mellanslag"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Använd teckensnitt med fast &breddsteg"
@@ -6240,31 +6085,31 @@ msgstr "&Krypterat brevformat"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Punktlista (fylld cirkel)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Punktlista (cirkel)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Punktlista (fyrkant)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Ordnad lista (siffror)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Ordnad lista (små bokstäver)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Ordnad lista (stora bokstäver)"
 
@@ -6369,8 +6214,8 @@ msgstr "Stäng brevfönster"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Brevet du har författat verkar hänvisa till en bilagd fil, men du har inte "
@@ -6381,52 +6226,51 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Påminnelse filbilaga"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Ski&cka som det är"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kmail kände inte igen bilagans plats (%1).</p>"
-"<p>Du måste ange fullständig sökväg om du vill bifoga en fil.</p></qt>"
+"<qt><p>Kmail kände inte igen bilagans plats (%1).</p><p>Du måste ange "
+"fullständig sökväg om du vill bifoga en fil.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Administratören tillåter inte större filer än %1 Mibyte som bilagor,</p>"
+"<qt><p>Administratören tillåter inte större filer än %1 Mibyte som bilagor,</"
+"p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Bifoga fil"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Bifoga"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Infoga fil"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Infoga fil"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ett fel uppstod vid försök att exportera nyckeln från "
-"bakgrundsprogrammet:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Ett fel uppstod vid försök att exportera nyckeln från "
+"bakgrundsprogrammet:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6465,190 +6309,198 @@ msgid ""
 "View"
 msgstr "Visa"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Redigera..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Redigera med..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Spara s&om..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "E&genskaper"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Bifoga..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Kmail kunde inte komprimera filen."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 "Den komprimerade filen är större än originalet. Vill du behålla originalet?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Behåll"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Kmail kunde inte packa upp filen."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Spara bilaga som"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Lägg till som text"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Lägg till som bilaga"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 "Välj om du vill infoga innehållet som text i editorn, eller lägga till filen "
 "som hänvisas till som en bilaga."
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Klistra in som text eller bilaga?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "namnlös"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Du har begärt att brev ska krypteras till dig själv, men identiteten som för "
-"närvarande är vald definierar inte en OpenPGP- eller S/MIME-krypteringsnyckel "
-"att använda för detta.</p>"
-"<p>Välj nyckel eller nycklar som ska användas i identitetsinställningen.</p>"
-"</qt>"
+"<qt><p>Du har begärt att brev ska krypteras till dig själv, men identiteten "
+"som för närvarande är vald definierar inte en OpenPGP- eller S/MIME-"
+"krypteringsnyckel att använda för detta.</p><p>Välj nyckel eller nycklar som "
+"ska användas i identitetsinställningen.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Odefinierad krypteringsnyckel"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>För att kunna signera det här brevet måste du först ange OpenPGP- eller "
-"S/MIME-signeringsnyckel som ska användas.</p>"
-"<p>Välj nyckeln som ska användas i identitetsinställningarna.</p></qt>"
+"<qt><p>För att kunna signera det här brevet måste du först ange OpenPGP- "
+"eller S/MIME-signeringsnyckel som ska användas.</p><p>Välj nyckeln som ska "
+"användas i identitetsinställningarna.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Odefinierad signeringsnyckel"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"Kmail är för närvarande i nerkopplat läge. Dina brev hålls i utkorgen till du "
-"kopplar upp."
+"Kmail är för närvarande i nerkopplat läge. Dina brev hålls i utkorgen till "
+"du kopplar upp."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Uppkopplad/nerkopplad"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Du måste skriva in din e-postadress i fältet Från:. Du bör också ange din "
-"e-postadress för alla identiteter, så att du inte behöver skriva in den för "
+"Du måste skriva in din e-postadress i fältet Från:. Du bör också ange din e-"
+"postadress för alla identiteter, så att du inte behöver skriva in den för "
 "varje brev."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 "Du måste ange minst en mottagare i fältet Till:, eller som kopia eller dold "
 "kopia."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Till-fältet saknas. Skicka brevet ändå?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Till: inte angivet"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du angav inte någon rubrik. Skicka brevet i alla fall?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Ingen rubrik angiven"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Ski&cka som det är"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "A&nge rubriken"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Behåll taggar, signera eller kryptera inte"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Behåll taggar, kryptera inte"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Behåll taggar, signera inte"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Signera och kryptera (ta bort taggar)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Kryptera (ta bort taggar)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Signera (ta bort taggar)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Signering eller kryptering av HTML-brev är inte möjlig på plats.</p>"
-"<p>Vill du ta bort taggar?</p></qt>"
+"<qt><p>Signering eller kryptering av HTML-brev är inte möjlig på plats.</"
+"p><p>Vill du ta bort taggar?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Signera eller kryptera brevet?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6656,106 +6508,106 @@ msgstr ""
 "Den egna korgen för utkast eller mallar finns inte (längre) för identiteten "
 "\"%1\". Därför används den förvalda korgen för utkast eller mallar."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Skapa ett konto för att skicka, och försök sedan igen."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "På väg att skicka e-post..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Skicka bekräftelse"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Skicka nu"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Inga mottagare"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Ytterligare mottagare"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Stavningskontroll: på"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Stavningskontroll: av"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Stavningskontroll avbruten."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Stavningskontroll stoppad."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Stavningskontroll klar."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Stavningskontroll"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "Ställ först in ett kryptoinsticksprogram att använda för kryptering med "
 "Chiasmius.\n"
 "Du kan göra det under fliken Kryptoinsticksprogram på sidan Säkerhet i "
 "inställningsdialogrutan."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"Det verkar som om libkleopatra kompilerades utan stöd för Chiasmus. Du skulle "
-"kunna vilja kompilera om libkleopatra med --enable-chiasmus."
+"Det verkar som om libkleopatra kompilerades utan stöd för Chiasmus. Du "
+"skulle kunna vilja kompilera om libkleopatra med --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Inget Chiasmus-gränssnitt anpassat"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Inga Chiasmus-nycklar hittades"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Val av Chiasmus-krypteringsnyckel"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "Brevet kommer att signeras"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Brevet kommer inte att signeras"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Brevet kommer att krypteras"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Brevet kommer inte att krypteras"
 
@@ -6804,8 +6656,8 @@ msgstr "Stavningskontroll - Kmail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Ispell/Aspell kunde inte startas. Kontrollera att Ispell eller Aspell är "
 "ordentligt installerade och att de ligger i din sökväg."
@@ -6841,13 +6693,11 @@ msgstr "<qt>För många filterkommandon i filterregeln %1<b>. </b></qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Okänt filterkommando <b>%1</b>"
-"<br>i filterregeln <b>%2</b>."
-"<br>Ignorerar det.</qt>"
+"<qt>Okänt filterkommando <b>%1</b><br>i filterregeln <b>%2</b>.<br>Ignorerar "
+"det.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7067,164 +6917,132 @@ msgstr "Spela ett ljud"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Detta är en lista över definierade filter. De behandlas från toppen till "
-"botten.</p>"
-"<p>Klicka på ett filter för att redigera det med hjälp av kontrollerna på högra "
-"halvan av dialogrutan.</p></qt>"
+"<qt><p>Detta är en lista över definierade filter. De behandlas från toppen "
+"till botten.</p><p>Klicka på ett filter för att redigera det med hjälp av "
+"kontrollerna på högra halvan av dialogrutan.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att skapa ett nytt filter.</p>"
-"<p>Filtret läggs till precis framför det aktuella valda filtret, men du kan "
-"ändra ordningen senare.</p>"
-"<p>Om du klickade på knappen av misstag, kan du ångra detta genom att klicka på "
-"knappen <em>Ta bort</em>.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
+msgstr ""
+"<qt><p>Klicka på denna knapp för att skapa ett nytt filter.</p><p>Filtret "
+"läggs till precis framför det aktuella valda filtret, men du kan ändra "
+"ordningen senare.</p><p>Om du klickade på knappen av misstag, kan du ångra "
+"detta genom att klicka på knappen <em>Ta bort</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att kopiera ett filter.</p>"
-"<p>Om du klickade på knappen av misstag, kan du ångra detta genom att klicka på "
+"<qt><p>Klicka på denna knapp för att kopiera ett filter.</p><p>Om du "
+"klickade på knappen av misstag, kan du ångra detta genom att klicka på "
 "knappen <em>Ta bort</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att <em>ta bort</em> aktuella valda filter från "
-"listan ovan.</p>"
-"<p>Det går inte att få tillbaka filtret när du tagit bort det, men du kan "
-"alltid lämna dialogrutan genom att välja <em>Avbryt</em> "
-"utan att några ändringar görs.</p></qt>"
+"<qt><p>Klicka på denna knapp för att <em>ta bort</em> aktuella valda filter "
+"från listan ovan.</p><p>Det går inte att få tillbaka filtret när du tagit "
+"bort det, men du kan alltid lämna dialogrutan genom att välja <em>Avbryt</"
+"em> utan att några ändringar görs.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att flytta aktuella valda filter <em>"
-"längst upp</em> i listan ovan.</p>"
-"<p>Detta är användbart eftersom filtrens ordning i listan avgör i vilken "
-"ordning de provas på brev: det översta filtret provas först.</p></qt>"
+"<qt><p>Klicka på denna knapp för att flytta aktuella valda filter <em>längst "
+"upp</em> i listan ovan.</p><p>Detta är användbart eftersom filtrens ordning "
+"i listan avgör i vilken ordning de provas på brev: det översta filtret "
+"provas först.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att flytta aktuella valda filter <em>uppåt</em> "
-"ett steg i listan ovan.</p>"
-"<p>Detta är användbart eftersom filtrens ordning i listan avgör i vilken "
-"ordning de provas på brev: det översta filtret provas först.</p>"
-"<p>Om du klickade på denna knapp av misstag, kan du ångra ändringen genom att "
-"klicka på knappen <em>Ner</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Klicka på denna knapp för att flytta aktuella valda filter <em>uppåt</"
+"em> ett steg i listan ovan.</p><p>Detta är användbart eftersom filtrens "
+"ordning i listan avgör i vilken ordning de provas på brev: det översta "
+"filtret provas först.</p><p>Om du klickade på denna knapp av misstag, kan du "
+"ångra ändringen genom att klicka på knappen <em>Ner</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att flytta aktuella valda filter <em>neråt</em> "
-"ett steg i listan ovan.</p>"
-"<p>Detta är användbart eftersom filtrens ordning i listan avgör i vilken "
-"ordning de provas på brev: det översta filtret provas först.</p>"
-"<p>Om du klickade på denna knapp av misstag, kan du ångra detta genom att "
-"klicka på knappen <em>Upp</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Klicka på denna knapp för att flytta aktuella valda filter <em>neråt</"
+"em> ett steg i listan ovan.</p><p>Detta är användbart eftersom filtrens "
+"ordning i listan avgör i vilken ordning de provas på brev: det översta "
+"filtret provas först.</p><p>Om du klickade på denna knapp av misstag, kan du "
+"ångra detta genom att klicka på knappen <em>Upp</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att flytta aktuella valda filter <em>"
-"längst ner</em> i listan ovan.</p>"
-"<p>Detta är användbart eftersom filtrens ordning i listan avgör i vilken "
-"ordning de provas på brev: det översta filtret provas först.</p></qt>"
+"<qt><p>Klicka på denna knapp för att flytta aktuella valda filter <em>längst "
+"ner</em> i listan ovan.</p><p>Detta är användbart eftersom filtrens ordning "
+"i listan avgör i vilken ordning de provas på brev: det översta filtret "
+"provas först.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Klicka på denna knapp för att byta namn på filtret som för närvarande är "
-"valt.</p>"
-"<p>Filter tilldelas namn automatiskt om de börjar med \"&lt;\".</p>"
-"<p>Om du har bytt namn på ett filter av misstag och vill ha tillbaka den "
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Klicka på denna knapp för att byta namn på filtret som för närvarande "
+"är valt.</p><p>Filter tilldelas namn automatiskt om de börjar med \"&lt;\".</"
+"p><p>Om du har bytt namn på ett filter av misstag och vill ha tillbaka den "
 "automatiska namngivningen, klicka på denna knapp och välj <em>Rensa</em> "
 "följt av <em>Ok</em> i dialogrutan som visas.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Markera den här knappen för att tvinga fram dialogrutan för att bekräfta "
-"åtgärden.</p>"
-"<p>Det här är användbart om du har definierat en regeluppsättning som markerar "
-"brev för att laddas ner senare. Utan möjligheten att tvinga fram dialogrutan, "
-"skulle dessa brev aldrig kunna laddas ner om inte ett annat stort brev väntade "
-"på servern, eller om du skulle vilja ändra regeluppsättningen för att markera "
-"breven på ett annat sätt.</p></qt>"
+"<qt><p>Markera den här knappen för att tvinga fram dialogrutan för att "
+"bekräfta åtgärden.</p><p>Det här är användbart om du har definierat en "
+"regeluppsättning som markerar brev för att laddas ner senare. Utan "
+"möjligheten att tvinga fram dialogrutan, skulle dessa brev aldrig kunna "
+"laddas ner om inte ett annat stort brev väntade på servern, eller om du "
+"skulle vilja ändra regeluppsättningen för att markera breven på ett annat "
+"sätt.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7234,6 +7052,16 @@ msgstr "Filterregler för Pop3"
 msgid "Filter Rules"
 msgstr "Filterregler"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Importera"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Importera"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Tillgängliga filter"
@@ -7316,6 +7144,11 @@ msgstr "Lägg dessutom till detta filter i verktygsraden"
 msgid "Icon for this filter:"
 msgstr "Ikon för detta filter:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Till"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Upp"
@@ -7324,16 +7157,29 @@ msgstr "Upp"
 msgid "Down"
 msgstr "Ner"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Byt namn..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Nytt"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "Ko&piera till"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Borttaget"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7342,20 +7188,20 @@ msgstr "Välj genväg för korg"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
-"Åtminstone ett filter har en korg i ett uppkopplat IMAP-konto som mål. Sådana "
-"filter används vid manuell filtrering och vid filtrering av inkommande brev i "
-"uppkopplad IMAP."
+"Åtminstone ett filter har en korg i ett uppkopplat IMAP-konto som mål. "
+"Sådana filter används vid manuell filtrering och vid filtrering av "
+"inkommande brev i uppkopplad IMAP."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Följande filter har inte sparats, eftersom de var ogiltiga (t ex inte innehöll "
-"några åtgärder eller sökregler)."
+"Följande filter har inte sparats, eftersom de var ogiltiga (t ex inte "
+"innehöll några åtgärder eller sökregler)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7425,28 +7271,24 @@ msgstr "Felsökning av IMAP-cache"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Felsökning av IMAP-cache.</b></p>"
-"<p>Om du har problem med synkronisering av en IMAP-korg, ska du först försöka "
-"bygga om indexfilen. Den tar en viss tid att bygga om, men orsakar inga "
-"problem.</p>"
-"<p>Om det inte räcker, kan du försöka att uppdatera IMAP-cachen. Om du gör det, "
-"går alla lokala ändringar förlorade för korgen och alla dess underkorgar.</p>"
+"<p><b>Felsökning av IMAP-cache.</b></p><p>Om du har problem med "
+"synkronisering av en IMAP-korg, ska du först försöka bygga om indexfilen. "
+"Den tar en viss tid att bygga om, men orsakar inga problem.</p><p>Om det "
+"inte räcker, kan du försöka att uppdatera IMAP-cachen. Om du gör det, går "
+"alla lokala ändringar förlorade för korgen och alla dess underkorgar.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7482,11 +7324,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
-"UID-cachefilen för korgen %1 kunde inte skrivas. Det kan vara ett problem med "
-"rättigheter i filsystemet."
+"UID-cachefilen för korgen %1 kunde inte skrivas. Det kan vara ett problem "
+"med rättigheter i filsystemet."
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
@@ -7525,11 +7367,12 @@ msgstr "Korgens index har skapats om."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Korgen %1 är inte i ursprungligt synkroniseringsläge (tillståndet är %2). Vill "
-"du återställa till ursprungligt synkroniseringsläge och synkronisera ändå?"
+"Korgen %1 är inte i ursprungligt synkroniseringsläge (tillståndet är %2). "
+"Vill du återställa till ursprungligt synkroniseringsläge och synkronisera "
+"ändå?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7634,8 +7477,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Dina åtkomsträttigheter för korgen <b>%1</b> har begränsats. Det kommer inte "
-"längre att vara möjligt att lägga till brev i korgen.</p>"
+"<p>Dina åtkomsträttigheter för korgen <b>%1</b> har begränsats. Det kommer "
+"inte längre att vara möjligt att lägga till brev i korgen.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7656,15 +7499,11 @@ msgstr "Skapar underkorg på servern"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Brev i korgen <b>%1</b> på servern har tagits bort. Vill du ta bort dem "
-"lokalt?"
-"<br>UID:er: %2</p></qt>"
+"<qt><p>Brev i korgen <b>%1</b> på servern har tagits bort. Vill du ta bort "
+"dem lokalt?<br>UID:er: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7685,13 +7524,11 @@ msgstr "Hämtar korglista för namnrymden %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Det verkar som om korgen <b>%1</b> har tagits bort. Vill du ta bort den från "
-"servern?</p></qt>"
+"<qt><p>Det verkar som om korgen <b>%1</b> har tagits bort. Vill du ta bort "
+"den från servern?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7699,16 +7536,16 @@ msgstr "Avbruten"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "IMAP-servern %1 har inte stöd för IMAP-anmärkningar. XML-lagringkan inte "
 "användas på servern. Anpassa Kmail på ett annat sätt."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "IMAP-servern %1 har inte stöd för IMAP-anmärkningar. XML-lagring kan inte "
 "användas på servern. Anpassa Kmail på ett annat sätt."
@@ -7723,17 +7560,17 @@ msgstr "Upphittat"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 "<p>Det finns nya brev i korgen <b>%1</b> som inte ännu har laddats upp till "
-"servern, men korgen har tagits bort på servern eller har du inte tillräckliga "
-"åtkomsträttigheter till korgen för att ladda upp dem.</p>"
-"<p>Alla brev som påverkas kommer därför att flyttas till <b>%2</b> "
-"för att undvika förlust av data.</p>"
+"servern, men korgen har tagits bort på servern eller har du inte "
+"tillräckliga åtkomsträttigheter till korgen för att ladda upp dem.</"
+"p><p>Alla brev som påverkas kommer därför att flyttas till <b>%2</b> för att "
+"undvika förlust av data.</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7741,21 +7578,26 @@ msgstr "Otillräckliga åtkomsträttigheter"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
-msgstr ""
-"<p>Det finns nya brev i korgen (%1) som inte ännu har laddats upp till servern, "
-"men korgen har tagits bort på servern eller har du inte tillräckliga "
-"åtkomsträttigheter till korgen för att ladda upp dem. Kontakta "
-"systemadministratören för att tillåta uppladdning av nya brev till dig, eller "
-"flytta dem från korgen.</p>"
-"<p>Vill du flytta breven till en annan korg nu?</p>"
-
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
+msgstr ""
+"<p>Det finns nya brev i korgen (%1) som inte ännu har laddats upp till "
+"servern, men korgen har tagits bort på servern eller har du inte "
+"tillräckliga åtkomsträttigheter till korgen för att ladda upp dem. Kontakta "
+"systemadministratören för att tillåta uppladdning av nya brev till dig, "
+"eller flytta dem från korgen.</p><p>Vill du flytta breven till en annan korg "
+"nu?</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Flytta till:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Flytta inte"
 
@@ -7767,8 +7609,7 @@ msgstr "Flytta brev till korg"
 msgid "Permissions (ACL)"
 msgstr "Behörigheter (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Allmänt"
@@ -7792,8 +7633,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Använd egna &ikoner"
@@ -7812,23 +7652,21 @@ msgstr "Agera vid nya olästa brev i korgen"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Om det här alternativet är aktiverat blir du underrättad om nya olästa brev "
-"i korgen. Dessutom stannar funktionerna som går till nästa eller föregående "
-"korg med olästa brev i korgen.</p>"
-"<p>Avmarkera alternativet om du inte vill bli underrättad om nya olästa brev i "
-"korgen och om du vill att korgen ska hoppas över när nästa eller föregående "
-"korg med olästa brev visas. Det är användbart för att ignorera eventuella nya "
-"eller olästa brev i papperskorgen och korgen med skräppost.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Om det här alternativet är aktiverat blir du underrättad om nya "
+"olästa brev i korgen. Dessutom stannar funktionerna som går till nästa eller "
+"föregående korg med olästa brev i korgen.</p><p>Avmarkera alternativet om du "
+"inte vill bli underrättad om nya olästa brev i korgen och om du vill att "
+"korgen ska hoppas över när nästa eller föregående korg med olästa brev "
+"visas. Det är användbart för att ignorera eventuella nya eller olästa brev i "
+"papperskorgen och korgen med skräppost.</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7840,9 +7678,9 @@ msgstr "Behåll svar i den här korgen"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 "Markera alternativet om du vill att svar som du skriver för brev i den här "
 "korgen att läggas i samma korg efter de skickats, istället för den inställda "
@@ -7856,17 +7694,21 @@ msgstr "Visa kolumn med avsändare och mottagare i brevlistan"
 msgid "Sho&w column:"
 msgstr "&Visa kolumn:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Ange standardvärden"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Avsändare"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Mottagare"
@@ -7877,17 +7719,18 @@ msgstr "A&vsändaridentitet:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"Välj avsändaridentiteten som ska användas när nya brev skrivs eller vid svar på "
-"brev för den här korgen. Det betyder att om du är i en av dina arbetskorgar, "
-"kan du få Kmail att använda motsvarande avsändares e-postadress, brevfot och "
-"signerings- eller krypteringsnycklar automatiskt. Identiteter kan ställas in i "
-"den vanliga inställningsdialogrutan (Inställningar -> Anpassa Kmail)."
+"Välj avsändaridentiteten som ska användas när nya brev skrivs eller vid svar "
+"på brev för den här korgen. Det betyder att om du är i en av dina "
+"arbetskorgar, kan du få Kmail att använda motsvarande avsändares e-"
+"postadress, brevfot och signerings- eller krypteringsnycklar automatiskt. "
+"Identiteter kan ställas in i den vanliga inställningsdialogrutan "
+"(Inställningar -> Anpassa Kmail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7905,26 +7748,28 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Den här inställningen anger vilka användare som delar korgen ska får "
 "\"upptagna\" perioder i sina ledig-upptagen listor och ska se alarmen för "
-"händelserna eller aktiviteterna i korgen. Inställningen gäller bara kalender- "
-"och aktivitetskorgar (för aktiviteter används inställningen bara för alarm).\n"
+"händelserna eller aktiviteterna i korgen. Inställningen gäller bara "
+"kalender- och aktivitetskorgar (för aktiviteter används inställningen bara "
+"för alarm).\n"
 "\n"
-"Exempel på användarfall: Om chefen delar en korg med sin sekreterare, ska bara "
-"chefen markeras som upptagen för sina möten, så han ska välja "
-"\"Administratörer\", eftersom sekreteraren inte har administratörsbehörigheter "
-"för korgen.\n"
+"Exempel på användarfall: Om chefen delar en korg med sin sekreterare, ska "
+"bara chefen markeras som upptagen för sina möten, så han ska välja "
+"\"Administratörer\", eftersom sekreteraren inte har "
+"administratörsbehörigheter för korgen.\n"
 "Om en arbetsgrupp å andra sidan delar en kalender för gruppmöten, ska alla "
 "läsare av korgen markeras som upptagna vid möten.\n"
-"En korg för ett helt företag som innehåller valfria aktiviteter skulle använda "
-"\"Ingen\", eftersom det inte är känt vem som kommer att delta i aktiviteterna."
+"En korg för ett helt företag som innehåller valfria aktiviteter skulle "
+"använda \"Ingen\", eftersom det inte är känt vem som kommer att delta i "
+"aktiviteterna."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7956,23 +7801,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Du har ställt in den här korgen att innehålla information från grupprogram och "
-"det allmänna inställningsalternativet att dölja grupprogramkorgar är aktiverat. "
-"Det betyder att korgen kommer att försvinna så fort inställningsdialogrutan "
-"stängs. Om du vill ta bort korgen igen, måste du tillfälligt inaktivera att "
-"dölja grupprogramkorgar för att kunna se den."
+"Du har ställt in den här korgen att innehålla information från grupprogram "
+"och det allmänna inställningsalternativet att dölja grupprogramkorgar är "
+"aktiverat. Det betyder att korgen kommer att försvinna så fort "
+"inställningsdialogrutan stängs. Om du vill ta bort korgen igen, måste du "
+"tillfälligt inaktivera att dölja grupprogramkorgar för att kunna se den."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8041,7 +7886,8 @@ msgstr "Fel vid hämtning av korginformation."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Brevindexet för \"%1\" är från en okänd version av Kmail (%2).\n"
 "Det här indexet kan omgenereras från din brevkorg men viss information "
@@ -8070,11 +7916,11 @@ msgstr "Fel när %1 skulle öppnas. Katalogen saknas."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Fel när %1 skulle öppnas. Antingen är detta inte en giltig maildir-korg, eller "
-"så har du inte tillräcklig åtkomstbehörighet."
+"Fel när %1 skulle öppnas. Antingen är detta inte en giltig maildir-korg, "
+"eller så har du inte tillräcklig åtkomstbehörighet."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8117,21 +7963,17 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Index för korgen \"%2\" verkar vara för gammalt. För att förhindra att brev "
-"förstörs, kommer indexet att skapas om. Detta kan resultera i att borttagna "
-"brev kan återkomma och statusflaggor kan gå förlorade.</p>"
-"<p>Läs motsvarande avsnitt bland <a href=\"%1\">vanliga frågor i Kmails "
-"handbok</a> för information om hur man förhindrar att problemet upprepas.</p>"
-"</qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Index för korgen \"%2\" verkar vara för gammalt. För att förhindra "
+"att brev förstörs, kommer indexet att skapas om. Detta kan resultera i att "
+"borttagna brev kan återkomma och statusflaggor kan gå förlorade.</p><p>Läs "
+"motsvarande avsnitt bland <a href=\"%1\">vanliga frågor i Kmails handbok</a> "
+"för information om hur man förhindrar att problemet upprepas.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8190,7 +8032,7 @@ msgstr ""
 "\"%1\" verkar inte vara en katalog.\n"
 "Flytta undan filen."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8198,7 +8040,7 @@ msgstr ""
 "Behörigheterna på katalogen \"%1\" är felaktiga.\n"
 "Försäkra dig om att du kan visa och ändra innehållet i den här katalogen."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8208,17 +8050,18 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
-"En katalog med samma namn har tagits bort sedan den senaste brevkontrollen. Du "
-"måste först göra en brevkontroll innan en ny katalog med samma namn kan skapas."
+"En katalog med samma namn har tagits bort sedan den senaste brevkontrollen. "
+"Du måste först göra en brevkontroll innan en ny katalog med samma namn kan "
+"skapas."
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Kunde inte skapa korg"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8315,12 +8158,12 @@ msgstr "&Felsök IMAP-cache..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>Kan inte skapa korgen <b>%1</b> på grund av otillräckliga behörigheter på "
-"servern. Om du tycker att du borde kunna skapa underkorgar här, be din "
+"<qt>Kan inte skapa korgen <b>%1</b> på grund av otillräckliga behörigheter "
+"på servern. Om du tycker att du borde kunna skapa underkorgar här, be din "
 "systemadministratör att ge dig behörigheter att göra det.</qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8346,15 +8189,15 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Kan inte flytta eller kopiera korgen <b>%1</b> eftersom den inte själv är "
-"fullständigt kopierad.</qt>"
+"<qt>Kan inte flytta eller kopiera korgen <b>%1</b> eftersom den inte själv "
+"är fullständigt kopierad.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt>Kan inte flytta eller kopiera korgen <b>%1</b> till en underkorg under sig "
-"själv.</qt>"
+"<qt>Kan inte flytta eller kopiera korgen <b>%1</b> till en underkorg under "
+"sig själv.</qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -8460,15 +8303,15 @@ msgstr "%1 Korgen är skrivskyddad."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Vill du verkligen ta bort det markerade brevet?"
-"<br>När det väl har tagits bort, kan det inte återställas.</qt>\n"
-"<qt>Vill du verkligen ta bort de %n markerade breven?"
-"<br>När de väl har tagits bort, kan de inte återställas.</qt>"
+"<qt>Vill du verkligen ta bort det markerade brevet?<br>När det väl har "
+"tagits bort, kan det inte återställas.</qt>\n"
+"<qt>Vill du verkligen ta bort de %n markerade breven?<br>När de väl har "
+"tagits bort, kan de inte återställas.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8520,131 +8363,129 @@ msgstr ""
 "Misslyckades med att ändra %1.\n"
 "(Inget utrymme kvar på enheten?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Begäran om certifikatsignatur"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Skapa ett certifikat från bilagan och skicka tillbaka till avsändaren."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "Kmail är inställt att vara nerkopplad. Alla nätverksjobb är vilande."
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "Kmail är inställt att vara uppkopplad. Alla nätverksjobb återupptas."
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "Kmail är för närvarande i nerkopplat läge. Hur vill du fortsätta?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Arbeta uppkopplad"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Arbeta nerkopplad"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Du har inte behörighet att läsa och skriva i din inkorg."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Utkorg"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Du har inte behörighet att läsa och skriva i din utkorg."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Skickat"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Du har inte behörighet att läsa och skriva i korgen med skickade brev."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Papperskorg"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Du har inte behörighet att läsa och skriva i papperskorgen."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Utkast"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Du har inte behörighet att läsa och skriva i korgen utkast."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "mallar"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Du har inte behörighet att läsa och skriva i mallkorgen."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Senaste sökning"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Korgen <i>%4</i> finns redan. %1 använder nu korgen <i>%5</i> "
-"för sina brev. "
-"<p>%2 kan flytta innehållet i <i>%6</i> till korgen åt dig, även om det kan "
-"ersätta eventuella befintliga filer med samma namn i <i>%7</i>. "
+"<qt>Korgen <i>%4</i> finns redan. %1 använder nu korgen <i>%5</i> för sina "
+"brev. <p>%2 kan flytta innehållet i <i>%6</i> till korgen åt dig, även om "
+"det kan ersätta eventuella befintliga filer med samma namn i <i>%7</i>. "
 "<p><strong>Vill du att %3 ska flytta brevfilerna nu?</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>Korgen <i>%4</i> finns redan. %1 använder nu korgen <i>%5</i> "
-"för sina brev. %2 kan flytta innehållet i <i>%6</i> till korgen åt dig. "
+"<qt>Korgen <i>%4</i> finns redan. %1 använder nu korgen <i>%5</i> för sina "
+"brev. %2 kan flytta innehållet i <i>%6</i> till korgen åt dig. "
 "<p><strong>Vill du att %3 ska flytta brevfilerna nu?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Konvertera brevfiler?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Kmail har påträffat ett allvarligt fel och kommer att avslutas."
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8655,11 +8496,11 @@ msgstr ""
 "Felet var:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Töm papperskorgen"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Vill du verkligen tömma papperskorgarna för alla konton?"
 
@@ -8734,8 +8575,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Ny post ankom</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8773,11 +8613,11 @@ msgstr "Vill du verkligen tömma papperskorgen?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Vill du verkligen flytta alla brev från korgen <b>%1</b> "
-"till papperskorgen?</qt>"
+"<qt>Vill du verkligen flytta alla brev från korgen <b>%1</b> till "
+"papperskorgen?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8801,12 +8641,12 @@ msgstr "Ta bort sökning"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Är du säker att du vill ta bort sökkorgen <b>%1</b>"
-"<br>Breven som  visas i den kommer fortfarande att vara tillgängliga i sina "
-"ursprungliga korgar.</qt>"
+"<qt>Är du säker att du vill ta bort sökkorgen <b>%1</b><br>Breven som  visas "
+"i den kommer fortfarande att vara tillgängliga i sina ursprungliga korgar.</"
+"qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8819,40 +8659,41 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Är du säker att du vill ta bort den tomma korgen <b>%1</b> "
-"och alla underkorgar? Underkorgarna kanske inte är tomma och deras innehåll "
-"kastas också. "
-"<p><b>Varning</b> för att breven som kastas inte sparas i papperskorgen utan "
-"tas bort permanent.</qt>"
+"<qt>Är du säker att du vill ta bort den tomma korgen <b>%1</b> och alla "
+"underkorgar? Underkorgarna kanske inte är tomma och deras innehåll kastas "
+"också. <p><b>Varning</b> för att breven som kastas inte sparas i "
+"papperskorgen utan tas bort permanent.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Är du säker på att du vill ta bort korgen <b>%1</b> och kasta innehållet? "
-"<p><b>Varning</b> för att breven som kastas inte sparas i papperskorgen utan "
-"tas bort permanent.</qt>"
+"<qt>Är du säker på att du vill ta bort korgen <b>%1</b> och kasta "
+"innehållet? <p><b>Varning</b> för att breven som kastas inte sparas i "
+"papperskorgen utan tas bort permanent.</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Är du säker att du vill ta bort korgen <b>%1</b> "
-"och alla underkorgar, och kasta innehållet? "
-"<p><b>Varning</b> för att breven som kastas inte sparas i papperskorgen utan "
-"tas bort permanent.</qt>"
+"<qt>Är du säker att du vill ta bort korgen <b>%1</b> och alla underkorgar, "
+"och kasta innehållet? <p><b>Varning</b> för att breven som kastas inte "
+"sparas i papperskorgen utan tas bort permanent.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Borttaget"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8868,13 +8709,13 @@ msgstr "Vill du verkligen att alla gamla brev ska utgå?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Om du tillåter HTML i e-post blir du mer sårbar för skräppost och dessutom ökar "
-"risken att du till följd av säkerhetsluckor råkar ut för obehörigt intrång i "
-"ditt system."
+"Om du tillåter HTML i e-post blir du mer sårbar för skräppost och dessutom "
+"ökar risken att du till följd av säkerhetsluckor råkar ut för obehörigt "
+"intrång i ditt system."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8887,8 +8728,8 @@ msgstr "Använd HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Att ladda externa referenser i HTML-brev gör att du blir mer sårbar för "
 "skräppost och dessutom ökar sannolikheten för att nuvarande och möjliga "
@@ -8908,12 +8749,12 @@ msgstr "Filtrera på sändlista %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Kmails funktion för frånvarosvar förlitar sig på filtrering på servern. Du har "
-"inte ännu anpassat IMAP-servern för det.\n"
+"Kmails funktion för frånvarosvar förlitar sig på filtrering på servern. Du "
+"har inte ännu anpassat IMAP-servern för det.\n"
 "Du kan göra det under fliken \"Filtrering\" i inställningarna av IMAP-kontot."
 
 #: kmmainwidget.cpp:1743
@@ -8929,9 +8770,11 @@ msgstr "Kunde inte starta certifikathanteraren. Kontrollera installationen."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Kunde inte starta GnuPG-loggvisning (kwatchgnupg). Kontrollera installationen."
+"Kunde inte starta GnuPG-loggvisning (kwatchgnupg). Kontrollera "
+"installationen."
 
 #: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
@@ -9250,8 +9093,7 @@ msgstr "Spara &bilagor..."
 msgid "Appl&y All Filters"
 msgstr "&Filtrera"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Välj filt&er"
@@ -9364,7 +9206,6 @@ msgstr "Nästa &olästa brev"
 msgid "Go to the next unread message"
 msgstr "Gå till nästa olästa brev"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Föregående brev"
@@ -9503,74 +9344,74 @@ msgstr " Initierar..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du har "
-"tagit emot brevet.\n"
-"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" eller "
-"normalt svar."
+"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du "
+"har tagit emot brevet.\n"
+"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
-"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du har "
-"tagit emot brevet.\n"
+"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du "
+"har tagit emot brevet.\n"
 "Det innehåller en behandlingsinstruktion som markeras som \"nödvändig\", men "
 "som Kmail inte känner till.\n"
-"Du kan antingen ignorera begäran, eller låta Kmail skicka svaret "
-"\"misslyckad\"."
+"Du kan antingen ignorera begäran, eller låta Kmail skicka svaret \"misslyckad"
+"\"."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du har "
-"tagit emot brevet,\n"
+"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du "
+"har tagit emot brevet,\n"
 "men begäran anger att bekräftelsen ska skickas till mer än en adress.\n"
-"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" eller "
-"normalt svar."
+"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du har "
-"tagit emot brevet,\n"
+"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du "
+"har tagit emot brevet,\n"
 "men ingen returadress är angiven.\n"
-"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" eller "
-"normalt svar."
+"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
-"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du har "
-"tagit emot brevet,\n"
+"Brevet innehåller en begäran om att skicka en hanteringsbekräftelse att du "
+"har tagit emot brevet,\n"
 "men returadressen skiljer sig från adressen som begärs att "
 "hanteringsbekräftelsen ska skickas till.\n"
-"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" eller "
-"normalt svar."
+"Du kan antingen ignorera begäran, eller låta Kmail skicka ett \"nekande\" "
+"eller normalt svar."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9596,16 +9437,16 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Kvitto: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Bilaga: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Bilagan har tagits bort."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Bilagan '%1' har tagits bort."
 
@@ -9653,45 +9494,38 @@ msgstr "Brevdelsegenskaper"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Filens <em>Mime-typ</em>.</p>"
-"<p>Normalt behöver du inte röra den här inställningen, eftersom filens typ "
-"kontrolleras automatiskt. Men ibland kanske %1 inte hanterar typen riktigt. Här "
-"kan du korrigera detta.</p></qt>"
+"<qt><p>Filens <em>Mime-typ</em>.</p><p>Normalt behöver du inte röra den här "
+"inställningen, eftersom filens typ kontrolleras automatiskt. Men ibland "
+"kanske %1 inte hanterar typen riktigt. Här kan du korrigera detta.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Delens storlek.</p>"
-"<p>Ibland ger %1 endast en uppskattad storlek här, eftersom det skulle ta för "
-"lång tid att beräkna den exakta storleken. Om så är fallet, syns det genom att "
-"lägga till \"(uppskattad)\" till storleken som visas.</p></qt>"
+"<qt><p>Delens storlek.</p><p>Ibland ger %1 endast en uppskattad storlek här, "
+"eftersom det skulle ta för lång tid att beräkna den exakta storleken. Om så "
+"är fallet, syns det genom att lägga till \"(uppskattad)\" till storleken som "
+"visas.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Delens filnamn.</p>"
-"<p>Även om det här som standard får namnet på den bifogade filen, anger det "
-"inte filen som ska bifogas, utan föreslår i stället ett filnamn som ska "
-"användas av mottagarens e-postklient när delen sparas till disk.</p></qt>"
+"<qt><p>Delens filnamn.</p><p>Även om det här som standard får namnet på den "
+"bifogade filen, anger det inte filen som ska bifogas, utan föreslår i "
+"stället ett filnamn som ska användas av mottagarens e-postklient när delen "
+"sparas till disk.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9699,17 +9533,15 @@ msgstr "&Beskrivning:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>En beskrivning av delen.</p>"
-"<p>Det här är endast en beskrivning med information om delen, som liknar "
-"rubriken för hela brevet. De flesta e-postklienter visar den här informationen "
-"vid förhandsgranskning av brevet, intill bilagans ikon.</p></qt>"
+"<qt><p>En beskrivning av delen.</p><p>Det här är endast en beskrivning med "
+"information om delen, som liknar rubriken för hela brevet. De flesta e-"
+"postklienter visar den här informationen vid förhandsgranskning av brevet, "
+"intill bilagans ikon.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9717,23 +9549,21 @@ msgstr "&Kodning:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Överföringskodningen av den här delen.</p>"
-"<p>Normalt behöver du inte ändra den här, eftersom %1 använder en rätt bra "
-"förvald kodning, beroende på Mime-typen. Men ibland kan du minska storleken på "
-"resultatet avsevärt, t ex om en Postscript-fil inte innehåller binärdata, utan "
-"endast består av ren text. I detta fall sparas upp till 25 % av resultatets "
-"storlek genom att välja \"quoted-printable\" i stället för den normala "
-"kodningen \"base64\".</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Överföringskodningen av den här delen.</p><p>Normalt behöver du inte "
+"ändra den här, eftersom %1 använder en rätt bra förvald kodning, beroende på "
+"Mime-typen. Men ibland kan du minska storleken på resultatet avsevärt, t ex "
+"om en Postscript-fil inte innehåller binärdata, utan endast består av ren "
+"text. I detta fall sparas upp till 25 % av resultatets storlek genom att "
+"välja \"quoted-printable\" i stället för den normala kodningen \"base64\".</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9741,21 +9571,17 @@ msgstr "Föreslå &automatisk visning"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Markera det här alternativet om du vill föreslå för mottagaren att den här "
-"delen av brevet ska visas automatiskt (inne i brevet) i stället för den normala "
-"ikonen.</p>"
-"<p>Tekniskt sett utförs det här genom att ställa in den här delens huvudfält "
-"<em>Content-Disposition</em> till \"inline\" istället för det normala värdet "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Markera det här alternativet om du vill föreslå för mottagaren att "
+"den här delen av brevet ska visas automatiskt (inne i brevet) i stället för "
+"den normala ikonen.</p><p>Tekniskt sett utförs det här genom att ställa in "
+"den här delens huvudfält <em>Content-Disposition</em> till \"inline\" "
+"istället för det normala värdet \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9763,16 +9589,13 @@ msgstr "&Signera den här delen"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Markera det här alternativet om du vill att den här delen av brevet ska "
-"signeras.</p>"
-"<p>Signaturen görs med nyckeln som hör ihop med identiteten som är vald för "
-"närvarande.</p></qt>"
+"<qt><p>Markera det här alternativet om du vill att den här delen av brevet "
+"ska signeras.</p><p>Signaturen görs med nyckeln som hör ihop med identiteten "
+"som är vald för närvarande.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9780,14 +9603,12 @@ msgstr "Kr&yptera den här delen"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Markera det här alternativet om du vill att den här delen av brevet ska "
-"krypteras.</p>"
-"<p>Den här delen krypteras för mottagarna av brevet.</p></qt>"
+"<qt><p>Markera det här alternativet om du vill att den här delen av brevet "
+"ska krypteras.</p><p>Den här delen krypteras för mottagarna av brevet.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9801,16 +9622,14 @@ msgstr "POP-filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Brev att filtrera hittades på Pop-konto: <b>%1</b>"
-"<p>Breven som visas överskrider den maximala storleksgränsen som du har "
-"definierat för det här kontot."
-"<br>Du kan välja vad du vill göra med dem genom att markera passande knapp."
+"Brev att filtrera hittades på Pop-konto: <b>%1</b><p>Breven som visas "
+"överskrider den maximala storleksgränsen som du har definierat för det här "
+"kontot.<br>Du kan välja vad du vill göra med dem genom att markera passande "
+"knapp."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9823,8 +9642,8 @@ msgstr "Brev filtrerade av regeluppsättningar: inga"
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
 msgstr ""
-"Visa brev som matchas av en uppsättning filterregler och som är markerade för "
-"nerladdning eller borttag"
+"Visa brev som matchas av en uppsättning filterregler och som är markerade "
+"för nerladdning eller borttag"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10062,40 +9881,39 @@ msgstr "E-postklienten för skrivbordsmiljön TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Hämtar korgens innehåll</h2>"
-"<p>Vänta...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Hämtar korgens innehåll</h2><p>Vänta...</"
+"p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Nerkopplad</h2>"
-"<p>Kmail är för närvarande i nerkopplat läge. Klicka <a href=\"kmail:goOnline\">"
-"här</a> för att koppla upp...</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Nerkopplad</h2><p>Kmail är för närvarande i "
+"nerkopplat läge. Klicka <a href=\"kmail:goOnline\">här</a> för att koppla "
+"upp...</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10103,15 +9921,14 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Välkommen till Kmail %1</h2>"
-"<p>Kmail är e-postklienten för skrivbordsmiljön TDE. Den är gjord för att vara "
-"helt kompatibel med Internetstandarder för e-post, inklusive Mime, SMTP, Pop3 "
-"och IMAP.</p>.\n"
-"<ul>"
-"<li>Kmail har många kraftfulla funktioner som beskrivs i <a href=\"%2\">"
-"dokumentationen</a></li>\n"
-"<li><a href=\"%3\">Kmails hemsida</a> erbjuder information om nya versioner av "
-"Kmail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Välkommen till Kmail %1</h2><p>Kmail är e-"
+"postklienten för skrivbordsmiljön TDE. Den är gjord för att vara helt "
+"kompatibel med Internetstandarder för e-post, inklusive Mime, SMTP, Pop3 och "
+"IMAP.</p>.\n"
+"<ul><li>Kmail har många kraftfulla funktioner som beskrivs i <a href="
+"\"%2\">dokumentationen</a></li>\n"
+"<li><a href=\"%3\">Kmails hemsida</a> erbjuder information om nya versioner "
+"av Kmail</li></ul>\n"
 "%8\n"
 "<p>Några nya funktioner som den här utgåvan av Kmail innehåller (jämfört med "
 "Kmail %4, som ingår i TDE %5):</p>\n"
@@ -10123,20 +9940,18 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Kmail-gruppen</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Fyll i uppgifterna i Kmails inställningspanel under "
-"Inställningar-&gt;Anpassa Kmail.\n"
+"<p>Fyll i uppgifterna i Kmails inställningspanel under Inställningar-&gt;"
+"Anpassa Kmail.\n"
 "Du måste åtminstone skapa en primär identitet och ett e-postkonto för både "
 "inkommande och utgående brev.</p>\n"
 
@@ -10177,7 +9992,8 @@ msgstr "Visa bilaga: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[Kmail: Bilagan innehåller binär data. Försöker visa det första tecknet.]\n"
@@ -10205,13 +10021,15 @@ msgstr "Öppna bilaga?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Att ta bort en bilaga kan göra eventuell digital signatur av brevet ogiltig."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Att ändra en bilaga kan göra eventuell digital signatur av brevet ogiltig."
 
@@ -10233,6 +10051,58 @@ msgstr "(matcha någon av följande)"
 msgid "(match all of the following)"
 msgstr "(matcha alla följande)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Läst"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Gammalt"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Borttaget"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Besvarat"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Vidarebefordrat"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Köat"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Skickat"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Bevakat"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Ignorerat"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Skräp"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Önskat"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Uppgift"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Har en bilaga"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Hela brevet"
@@ -10310,10 +10180,10 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Förflyttning av det skickade brevet \"%1\" från \"utkorg\" till \"skickade "
 "brev\" misslyckades.\n"
@@ -10323,8 +10193,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Det är inte möjligt att skicka brev utan att ange en avsändaradress.\n"
 "Ställ in e-postadressen för identiteten \"%1\" under identitetsdelen i "
@@ -10353,8 +10223,8 @@ msgstr "Initierar skickningsprocess..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Du har valt att skicka alla köade brev med okrypterad överföring. Vill du "
 "fortsätta?"
@@ -10381,15 +10251,17 @@ msgstr "Misslyckades med att skicka (vissa) köade brev."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Misslyckades med att skicka:\n"
 "%1\n"
 "Brevet kommer att lämnas kvar i \"utkorgen\" tills du antingen korrigerar "
-"problemet (t ex en felaktig adress) eller tar bort brevet från \"utkorgen\".\n"
+"problemet (t ex en felaktig adress) eller tar bort brevet från \"utkorgen"
+"\".\n"
 "Följande överföringsprotokoll användes:\n"
 "  %2"
 
@@ -10399,20 +10271,17 @@ msgstr "Skicka avbruten."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Misslyckades med att skicka:</p>"
-"<p>%1</p>"
-"<p>Brevet kommer att lämnas kvar i \"utkorgen\" tills du antingen korrigerar "
-"problemet (t ex en felaktig adress) eller tar bort brevet från \"utkorgen\".</p>"
-"<p>Följande överföringsprotokoll användes:  %2</p>"
-"<p>Vill du att återstående brev ska fortsätta skickas?</p>"
+"<p>Misslyckades med att skicka:</p><p>%1</p><p>Brevet kommer att lämnas kvar "
+"i \"utkorgen\" tills du antingen korrigerar problemet (t ex en felaktig "
+"adress) eller tar bort brevet från \"utkorgen\".</p><p>Följande "
+"överföringsprotokoll användes:  %2</p><p>Vill du att återstående brev ska "
+"fortsätta skickas?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10430,15 +10299,17 @@ msgstr "&Avbryt skicka"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Misslyckades med att skicka:\n"
 "%1\n"
 "Brevet kommer att lämnas kvar i \"utkorgen\" tills du antingen korrigerar "
-"problemet (t ex en felaktig adress) eller tar bort brevet från \"utkorgen\".\n"
+"problemet (t ex en felaktig adress) eller tar bort brevet från \"utkorgen"
+"\".\n"
 "Följande överföringsprotokoll användes:\n"
 " %2"
 
@@ -10474,34 +10345,34 @@ msgstr "Sendmail avslutades onormalt."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Du måste ange ett användarnamn och ett lösenord för att använda den här "
-"SMTP-servern."
+"Du måste ange ett användarnamn och ett lösenord för att använda den här SMTP-"
+"servern."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 "%1 verkar redan köra på en annan skärm på datorn. Att köra %2 mer än en gång "
-"kan orsaka förlust av brev. Du bör endast starta %1 om du är säker på att det "
-"inte redan kör."
+"kan orsaka förlust av brev. Du bör endast starta %1 om du är säker på att "
+"det inte redan kör."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 verkar redan köra på en annan skärm på datorn. Att köra %1 och %2 samtidigt "
-"kan orsaka förlust av brev. Du bör endast starta %2 om du är säker på att %1 "
-"inte kör."
+"%1 verkar redan köra på en annan skärm på datorn. Att köra %1 och %2 "
+"samtidigt kan orsaka förlust av brev. Du bör endast starta %2 om du är säker "
+"på att %1 inte kör."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 verkar redan köra på %2. Att köra %1 mer än en gång kan orsaka förlust av "
 "brev. Du bör endast starta %1 på datorn om du är säker på att det inte redan "
@@ -10509,13 +10380,13 @@ msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 verkar redan köra på %3. Att köra %1 och %2 samtidigt kan orsaka förlust av "
-"brev. Du bör endast starta %2 på datorn om du är säker på att %1 inte kör på "
-"%3."
+"%1 verkar redan köra på %3. Att köra %1 och %2 samtidigt kan orsaka förlust "
+"av brev. Du bör endast starta %2 på datorn om du är säker på att %1 inte kör "
+"på %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10526,6 +10397,10 @@ msgstr "Starta %1"
 msgid "Exit"
 msgstr "Avsluta"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Nya brev i"
@@ -10552,12 +10427,13 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"TDEwallet är inte tillgängligt. Du rekommenderas starkt att använda TDEwallet "
-"för att hantera lösenord.\n"
+"TDEwallet är inte tillgängligt. Du rekommenderas starkt att använda "
+"TDEwallet för att hantera lösenord.\n"
 "Kmail kan dock lagra lösenordet i sin inställningsfil istället. Lösenordet "
 "lagras i en förvanskad form, men kan inte anses säkert för dekryptering om "
 "tillgång till inställningsfilen erhålls.\n"
@@ -10630,8 +10506,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "Ett kommando som körs lokalt, innan e-post skickas. Det här kan till exempel "
-"användas för att ställa in tunnling med SSH. Lämna det tomt om inget kommando "
-"ska köras."
+"användas för att ställa in tunnling med SSH. Lämna det tomt om inget "
+"kommando ska köras."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10639,11 +10515,12 @@ msgstr "Servern k&räver autentisering"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Markera det här alternativet om SMTP-servern kräver autentisering innan e-post "
-"accepteras. Det här kallas för \"Autentiserad SMTP\" eller helt enkelt ASMTP."
+"Markera det här alternativet om SMTP-servern kräver autentisering innan e-"
+"post accepteras. Det här kallas för \"Autentiserad SMTP\" eller helt enkelt "
+"ASMTP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10663,15 +10540,14 @@ msgstr "Skicka eget värd&datornamn till servern"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"Markera det här alternativet för att låta Kmail använda ett eget värddatornamn "
-"vid identifiering på e-postservern. "
-"<p>Det här är användbart när systemets värddatornamn inte är korrekt inställt, "
-"eller för att dölja systemets riktiga värddatornamn."
+"Markera det här alternativet för att låta Kmail använda ett eget "
+"värddatornamn vid identifiering på e-postservern. <p>Det här är användbart "
+"när systemets värddatornamn inte är korrekt inställt, eller för att dölja "
+"systemets riktiga värddatornamn."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10701,8 +10577,8 @@ msgstr "Endast lokala filer är tillåtna."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Värddatorfältet kan inte vara tomt. Ange SMTP-serverns namn eller IP-adress.."
 
@@ -10716,15 +10592,15 @@ msgstr "Fel vid listning av korgen %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"Att säga upp lokal prenumeration av korgar tar bort all information om korgarna "
-"som är lagrad lokalt. Korgarna ändras inte på servern. Klicka på avbryt nu, om "
-"du vill försäkra dig om att alla lokala ändringar har skrivits till servern "
-"genom att först titta efter e-post."
+"Att säga upp lokal prenumeration av korgar tar bort all information om "
+"korgarna som är lagrad lokalt. Korgarna ändras inte på servern. Klicka på "
+"avbryt nu, om du vill försäkra dig om att alla lokala ändringar har skrivits "
+"till servern genom att först titta efter e-post."
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10795,8 +10671,8 @@ msgid ""
 "KMail was unable to detect a mailing list in this folder. Please fill the "
 "addresses by hand."
 msgstr ""
-"Kmail kunde inte identifiera en e-postlista i den här korgen. Fyll i adresserna "
-"manuellt."
+"Kmail kunde inte identifiera en e-postlista i den här korgen. Fyll i "
+"adresserna manuellt."
 
 #: mailinglistpropertiesdialog.cpp:228
 msgid "Not available."
@@ -10943,35 +10819,28 @@ msgstr "R&edigera brev"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Strukturinformation som returnerades av kryptoinsticksprogrammet kunde inte "
-"behandlas på ett riktigt sätt. Insticksprogrammet kan vara skadat.</p> "
-"<p>Kontakta systemadministratören.</p></qt>"
+"<qt><p>Strukturinformation som returnerades av kryptoinsticksprogrammet "
+"kunde inte behandlas på ett riktigt sätt. Insticksprogrammet kan vara skadat."
+"</p> <p>Kontakta systemadministratören.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Inget aktivt kryptoinsticksprogram hittades, och den inbyggda OpenPGP-koden "
-"kunde inte köras med lyckat resultat.</p>"
-"<p>Du skulle kunna göra två saker för att ändra detta:</p> "
-"<ul>"
-"<li>Aktivera <em>antingen</em> ett insticksprogram i dialogrutan "
-"Inställningar/Anpassa Kmail/Insticksprogram.</li>"
-"<li><em>eller</em> ange istället inställningar för det traditionella OpenPGP "
-"under samma dialogrutas flik Identitet/Avancerat.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Inget aktivt kryptoinsticksprogram hittades, och den inbyggda OpenPGP-"
+"koden kunde inte köras med lyckat resultat.</p><p>Du skulle kunna göra två "
+"saker för att ändra detta:</p> <ul><li>Aktivera <em>antingen</em> ett "
+"insticksprogram i dialogrutan Inställningar/Anpassa Kmail/Insticksprogram.</"
+"li><li><em>eller</em> ange istället inställningar för det traditionella "
+"OpenPGP under samma dialogrutas flik Identitet/Avancerat.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10983,11 +10852,11 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
-"Chiasmus-gränssnittet tillhandahåller inte funktionen \"x-encrypt\". Rapportera "
-"felet."
+"Chiasmus-gränssnittet tillhandahåller inte funktionen \"x-encrypt\". "
+"Rapportera felet."
 
 #: messagecomposer.cpp:565
 msgid ""
@@ -11003,20 +10872,20 @@ msgstr "Chiasmus krypteringsfel"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Oväntat returvärde från Chiasmus-gränssnittet. Funktionen \"x-encrypt\" "
 "returnerade inte ett bytefält. Rapportera felet."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"OpenPGP-direktkryptoformatet för brev stöder inte kryptering eller signering av "
-"bilagor.\n"
+"OpenPGP-direktkryptoformatet för brev stöder inte kryptering eller signering "
+"av bilagor.\n"
 "Ska OpenPGP verkligen användas?"
 
 #: messagecomposer.cpp:640
@@ -11037,8 +10906,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"Undersökning av mottagarens signeringspreferenser gav resultatet att du ska bli "
-"tillfrågad om du vill signera brevet eller inte.\n"
+"Undersökning av mottagarens signeringspreferenser gav resultatet att du ska "
+"bli tillfrågad om du vill signera brevet eller inte.\n"
 "Ska brevet signeras?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11125,8 +10994,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "Undersökning av mottagarens krypteringspreferenser gav resultatet att du ska "
@@ -11163,8 +11032,9 @@ msgstr "&Kryptera inte"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Du har begärt att kryptera brevet, och kryptera en kopia till dig själv, men "
 "inga giltiga pålitliga krypteringsnycklar har ställts in för identiteten."
@@ -11176,8 +11046,8 @@ msgstr "Skicka okrypterat?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Vissa delar av brevet kommer inte att krypteras.\n"
@@ -11193,8 +11063,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "Brevet kommer inte att krypteras.\n"
-"Att skicka okrypterade brev kan bryta mot platspolicyn och/eller orsaka läckage "
-"av känslig information.\n"
+"Att skicka okrypterade brev kan bryta mot platspolicyn och/eller orsaka "
+"läckage av känslig information.\n"
 "Kryptera breven istället?"
 
 #: messagecomposer.cpp:955
@@ -11205,92 +11075,88 @@ msgstr "Kryptera a&lla delar"
 msgid "Unencrypted Message Warning"
 msgstr "Varning för okrypterat brev"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Fel: Bakgrundsprogrammet returnerade inte någon kodad data.</p>"
-"<p>Rapportera det här felet:"
-"<br>%2</p></qt>"
+"<qt><p>Fel: Bakgrundsprogrammet returnerade inte någon kodad data.</"
+"p><p>Rapportera det här felet:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Alla tecken kan inte kodas med den valda teckenkodningen."
-"<br>"
-"<br>Skicka brevet ändå?</qt>"
+"<qt>Alla tecken kan inte kodas med den valda teckenkodningen.<br><br>Skicka "
+"brevet ändå?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Vissa tecken kommer att gå förlorade"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Låt tecken gå förlorade"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Ändra kodning"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"Brevet kunde inte signeras, eftersom det valda bakgrundsprogrammet inte verkar "
-"stöda signering. Det här ska i själva verket aldrig kunna inträffa. Rapportera "
-"gärna felet."
+"Brevet kunde inte signeras, eftersom det valda bakgrundsprogrammet inte "
+"verkar stöda signering. Det här ska i själva verket aldrig kunna inträffa. "
+"Rapportera gärna felet."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"Brevet kunde inte signeras, eftersom det valda bakgrundsprogrammet inte verkar "
-"stöda signering. Det här ska i själva verket aldrig kunna inträffa. Rapportera "
-"gärna felet."
+"Brevet kunde inte signeras, eftersom det valda bakgrundsprogrammet inte "
+"verkar stöda signering. Det här ska i själva verket aldrig kunna inträffa. "
+"Rapportera gärna felet."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "GnuPG-granskningslogg för signeringsåtgärd"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
-"Signeringsåtgärden misslyckades. Försäkra dig om att programmet gpg-agent kör."
+"Signeringsåtgärden misslyckades. Försäkra dig om att programmet gpg-agent "
+"kör."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Brevet kunde inte krypteras, eftersom det valda bakgrundsprogrammet inte verkar "
-"stöda kryptering. Det här ska i själva verket aldrig kunna inträffa. Rapportera "
-"gärna felet."
+"Brevet kunde inte krypteras, eftersom det valda bakgrundsprogrammet inte "
+"verkar stöda kryptering. Det här ska i själva verket aldrig kunna inträffa. "
+"Rapportera gärna felet."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "GnuPG-granskningslogg för krypteringsåtgärd"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Brevet kunde inte signeras och krypteras, eftersom det valda "
-"bakgrundsprogrammet inte verkar stöda kombinerad signering och kryptering. Det "
-"här ska i själva verket aldrig kunna inträffa. Rapportera gärna felet."
+"bakgrundsprogrammet inte verkar stöda kombinerad signering och kryptering. "
+"Det här ska i själva verket aldrig kunna inträffa. Rapportera gärna felet."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11311,14 +11177,14 @@ msgstr "For&mat på brevlåda:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Välj om du vill lagra breven i korgen som en fil per brev (maildir) eller som "
-"en stor fil (mbox). Kmail använder normalt maildir, och det behöver bara ändras "
-"i sällsynta fall. Om du är osäker, lämna alternativet som det är."
+"Välj om du vill lagra breven i korgen som en fil per brev (maildir) eller "
+"som en stor fil (mbox). Kmail använder normalt maildir, och det behöver bara "
+"ändras i sällsynta fall. Om du är osäker, lämna alternativet som det är."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11327,12 +11193,12 @@ msgstr "&Korginnehåll:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 "Välj om du vill att den nya korgen ska användas för att lagra brev eller för "
-"att lagra grupprogramobjekt som uppgifter eller anteckningar. Normalvärdet är "
-"brev. Om du är osäker, lämna alternativet som det är."
+"att lagra grupprogramobjekt som uppgifter eller anteckningar. Normalvärdet "
+"är brev. Om du är osäker, lämna alternativet som det är."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11371,8 +11237,7 @@ msgstr "Olika resultat för signaturerna"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Kryptoprogrammet returnerade inte någon data i klartext."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Status:"
 
@@ -11401,11 +11266,11 @@ msgstr "Inget %1-insticksprogram hittades."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Brevet är signerat, men signaturens giltighet kan inte kontrolleras."
-"<br/> Orsak: %1"
+"Brevet är signerat, men signaturens giltighet kan inte kontrolleras.<br/> "
+"Orsak: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11439,27 +11304,27 @@ msgstr "Kryptoinsticksprogrammet \"%1\" kan inte dekryptera några brev."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Observera:</b> Det här HTML-brevet kan innehålla externa referenser till "
-"bilder, etc. Av säkerhets- och integritetsskäl laddas inte externa referenser. "
-"Om du litar på avsändaren av brevet kan du ladda externa referenser i brevet <a "
-"href=\"kmail:loadExternal\">genom att klicka här</a>."
+"bilder, etc. Av säkerhets- och integritetsskäl laddas inte externa "
+"referenser. Om du litar på avsändaren av brevet kan du ladda externa "
+"referenser i brevet <a href=\"kmail:loadExternal\">genom att klicka här</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>Observera:</b> Det här är ett HTML-brev. Av säkerhetsskäl visas endast den "
-"obehandlade HTML-koden. Om du litar på avsändaren av brevet kan du aktivera "
-"formaterad HTML-visning för brevet <a href=\"kmail:showHTML\">"
-"genom att klicka här</a>."
+"<b>Observera:</b> Det här är ett HTML-brev. Av säkerhetsskäl visas endast "
+"den obehandlade HTML-koden. Om du litar på avsändaren av brevet kan du "
+"aktivera formaterad HTML-visning för brevet <a href=\"kmail:showHTML\">genom "
+"att klicka här</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11710,11 +11575,11 @@ msgstr "lagrad: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Ingen e-postadress är lagrad i %1 som används för signering, det går inte att "
-"jämföra den med avsändarens adress %2."
+"Ingen e-postadress är lagrad i %1 som används för signering, det går inte "
+"att jämföra den med avsändarens adress %2."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11829,14 +11694,15 @@ msgstr "I/O-slav-felmeddelande"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Pop3-servern (konto: %1) stödjer inte UIDL-kommandot. Kommandot krävs för att "
-"på ett tillförlitligt sätt kunna avgöra vilka av breven på servern som Kmail "
-"redan har sett.\n"
+"Pop3-servern (konto: %1) stödjer inte UIDL-kommandot. Kommandot krävs för "
+"att på ett tillförlitligt sätt kunna avgöra vilka av breven på servern som "
+"Kmail redan har sett.\n"
 "Funktionen att lämna breven på servern kommer därför inte att fungera på ett "
 "korrekt sätt."
 
@@ -11858,7 +11724,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Hämtar brev %1 av %2 (%3 av %4 Kibyte) från %5@%6 (%7 Kibyte finns kvar på "
 "servern)."
@@ -11877,1903 +11744,15 @@ msgstr "Ogiltigt svar från server"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-"Servern stödjer inte kommandot TOP. Det är därför inte möjligt att först bara "
-"hämta rubrikerna för stora brev, innan de laddas ner."
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Gå"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "K&org"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "Br&ev"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Svara speciellt"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Vidarebefordra"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML-verktygsrad"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Signering"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Sig&nera automatiskt brev"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"När det här alternativet är aktiverat signeras alla brev du skickar som "
-"standard. Det är förstås fortfarande möjligt att stänga av signering för varje "
-"individuellt brev."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Kryptering"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-"Vid kr&yptering av e-post, kryptera också alltid till min egen identitets "
-"certifikat"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"När det här alternativet är aktiverat, kommer brevet eller filen inte bara "
-"krypteras med mottagarens öppna nyckel, utan också med din nyckel. Det gör det "
-"möjligt för dig att avkoda brevet eller filen vid ett senare tillfälle. Det är "
-"i allmänhet en god idé."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Visa s&ignerad eller krypterad text efter brevet har skrivits"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"När det här alternativet är aktiverat, visas den signerade eller krypterade "
-"texten i ett separat fönster, som gör det möjligt för dig att veta hur det ser "
-"ut innan det skickas. Det är en god idé när du verifierar att "
-"krypteringssystemet fungerar."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "S&para skickade brev krypterade"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Markera för att spara brev krypterade"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Spara brev krypterade</h1>\n"
-"När den här rutan är markerad lagras skickade brev krypterade som de skickades. "
-"Det här rekommenderas inte, eftersom du inte längre kan läsa brevet om ett "
-"nödvändigt certifikat går ut.\n"
-"<p>\n"
-"Dock kan det finnas lokala regler som kräver att du aktiverar det här "
-"alternativet. Om du tvekar, kontrollera med den lokala administratören.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Visa alltid krypteringsnycklarna &för godkännande"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"När det här alternativet är aktiverat, visar programmet alltid en lista med "
-"öppna nycklar, där du kan välja den som ska användas för kryptering. Om det "
-"inte är aktiverat, visar programmet bara dialogrutan om det inte kan hitta rätt "
-"nyckel, eller om det finns flera som skulle kunna användas."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Kryptera a&utomatiskt breven om möjligt"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"När det här alternativet är aktiverat krypteras alla brev du skickar så fort "
-"kryptering är möjlig och önskad. Det är förstås fortfarande möjligt att stänga "
-"av den automatiska krypteringen för varje individuellt brev."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Signera eller kryptera aldrig när du sparar som &utkast"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Hur fungerar det här?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Till: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Kopia: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Generell"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Svara"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Svara till alla"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Vidarebefordra"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Gen&väg:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Malltyp:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Korgegenskaper"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Kor&gen innehåller en sändlista"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "List&adress:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "N&ormal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Ol&äst:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Brev utgår"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Utg&å efter:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Låt lästa b&rev utgå"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Utgå e&fter:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Låt &olästa brev utgå"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "dag(ar)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "vecka/veckor"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "månad(er)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Avancerat"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "A&vsändaridentitet:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "Lagring&sformat:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Listan visar:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Validera certifikat med CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Om det här alternativet är markerat, valideras S/MIME-certifikat med "
-"certifikatåterkallningslistor (CRL:er)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Direktvalidera certifikat (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Om det här alternativet är markerat, valideras S/MIME-certifikat direkt med "
-"Online Certificates Status Protocol (OCSP). Fyll i webbadressen till "
-"OCSP-besvararen nedan."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Direktvalidera certifikat"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Webbadress för OCSP-besvarare:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Skriv in adressen till servern för direktvalidering av certifikat "
-"(OCSP-besvarare). Webbadressen börjar oftast med http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Signatur för OCSP-besvarare:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ignorera tjänstwebbadress för certifikat"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Kontrollera inte certifikatpolicy"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Normalt använder GnuPG filen ~/.gnupg/policies.txt för att kontrollera om en "
-"certifikatpolicy tillåts. Om alternativet är markerat, kontrolleras inte någon "
-"policy."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Konsultera aldrig en CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Om det här alternativet är markerat, används certifikatåterkallningslistor "
-"aldrig för att validera S/MIME-certifikat."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Hämta saknade utgivarcertifikat"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Om det här alternativet är markerat, hämtas saknade utgivarcertifikat om "
-"nödvändigt (detta gäller båda valideringsmetoderna, CRL och OCSP)."
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP-begäran"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Utför inte någon HTTP-begäran"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Inaktiverar användning av HTTP för S/MIME helt och hållet."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Använd denna proxy för HTTP-begäran: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Använd systemets HTTP-proxy:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Om det här alternativet markeras, används värdet på HTTP-proxyn som visas till "
-"höger (som kommer från miljövariabeln http_proxy) för varje HTTP-begäran."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Skriv in platsen för HTTP-proxyn som ska användas för varje HTTP-begäran som "
-"har med S/MIME att göra. Syntaxen är värddator:port, till exempel "
-"minproxy.någonstans.se:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ignorera HTTP CRL-distributionsställe för certifikat"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Vid sökning efter platsen för en CRL, innehåller certifikatet som ska testas "
-"oftast poster med så kallade \"CRL-distributionsställen\" (DS) vilka är "
-"webbadresser som beskriver sättet att komma åt webbadressen. Den första "
-"DS-posten som hittas används. Med det här alternativet ignoreras alla poster "
-"som använder HTTP-metoden vid sökning efter en lämplig DS."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP-begäran"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Utför inte någon LDAP-begäran"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Inaktivera användning av LDAP för S/MIME helt och hållet."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ignorera LDAP CRL-distributionsställe för certifikat"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Vid sökning efter platsen för en CRL, innehåller certifikatet som ska testas "
-"oftast poster med så kallade \"CRL-distributionsställen\" (DS) vilka är "
-"webbadresser som beskriver sättet att komma åt webbadressen. Den första "
-"DS-posten som hittas används. Med det här alternativet ignoreras alla poster "
-"som använder LDAP-metoden vid sökning efter en lämplig DS."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Huvudvärddator för LDAP-begäran:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Att skriva in en LDAP-server här gör att varje LDAP-begäran först går till "
-"denna server. Mer exakt överskrider inställningen värddator och port som anges "
-"i LDAP-webbadressen, och används också om värddator och port har utelämnats "
-"från adressen. Andra LDAP-servrar används bara om anslutningen till \"proxyn\" "
-"misslyckas.\n"
-"Syntaxen är \"VÄRDDATOR\" eller \"VÄRDDATOR:PORT\". Om PORT utelämnas, används "
-"port 389 (den vanliga LDAP-porten)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Lägg till textsnutt"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Lägg till"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "Text&snutt:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Grupp:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Inställning av textsnuttar"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Verktygstips"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Visa &textsnuttens innehåll i ett verktygstips"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-"Avgör om ett verktygstips ska visas som innehåller text från raden med "
-"bokmärket"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Variabler"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Inmatningsmetod för variabler"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "En dialogruta för varje variabel i en textsnutt"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "En inmatningsruta visas för varje variabel i en textsnutt"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "En dialogruta för alla variabler i en textsnutt"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"En enda dialogruta visas där du kan skriva in värden för alla variabler i en "
-"textsnutt"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Avgränsare:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Mallinställning"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Svara till avsändaren"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Svara till alla, Svara till lista"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Vidarebefordra brev"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "&Varna vid försök att skicka osignerade brev"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Markera för att få en varning när osignerade brev skickas."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna vid försök att skicka osignerade brev</h1>\n"
-"Om den här rutan är markerad blir du varnad när du försöker skicka delar eller "
-"hela brevet osignerade.\n"
-"<p>\n"
-"Det rekommenderas att behålla det här alternativet aktiverat för maximal "
-"integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Varna vid försök att skicka okrypterade brev"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Markera för att få en varning när okrypterade brev skickas."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna vid försök att skicka okrypterade brev</h1>\n"
-"Om den här rutan är markerad blir du varnad när du försöker skicka delar eller "
-"hela brevet utan kryptering.\n"
-"<p>\n"
-"Det rekommenderas att behålla det här alternativet aktiverat för maximal "
-"integritet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Varna om mottagarens &e-postadress inte finns i certifikatet"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Markera för att få en varning om adressen inte finns i certifikatet"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna om mottagarens e-postadress inte finns i certifikatet</h1>\n"
-"Om det här alternativet är markerat blir du varnad om e-postadressen för "
-"mottagaren inte finns med i certifikatet som används för kryptering.\n"
-"<p>\n"
-"Det rekommenderas att behålla det här alternativet aktiverat för maximal "
-"säkerhet.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Varna om certifikat eller nycklar snart går ut (anpassa tröskeln nedan)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "För signering"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "För kryptering"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " dagar"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Välj antal dagar här"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna om signaturcertifikat går ut</h1>\n"
-"Välj det minimala antal dagar som signaturcertifikatet ska vara giltigt utan "
-"att en varning visas.\n"
-"<p>\n"
-"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna om krypteringscertifikat går ut</h1>\n"
-"Välj det minimala antal dagar som krypteringscertifikatet ska vara giltigt utan "
-"att en varning visas.\n"
-"<p>\n"
-"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna om ett certifikat i kedjan går ut</h1>\n"
-"Välj det minimala antal dagar som alla certifikatet i kedjan ska vara giltiga "
-"utan att en varning visas.\n"
-"<p>\n"
-"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna om CA-certifikat går ut</h1>\n"
-"Välj det minimala antal dagar som CA-certifikatet ska vara giltigt utan att en "
-"varning visas.\n"
-"<p>\n"
-"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Varna om rotcertifikat går ut</h1>\n"
-"Välj det minimala antal dagar som rotcertifikatet ska vara giltigt utan att en "
-"varning visas.\n"
-"<p>\n"
-"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "För rotcertifikat:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "För mellanliggande CA-certifikat:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "För slutanvändarcertifikat och -nycklar:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Aktivera alla varningar med \"Fråga inte igen\""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Mallinnehåll"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Mallgenväg"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Malltyp"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Skicka köad post vid kontroll av post"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Välj om du vill att Kmail ska skicka alla brev i utkorgen vid manuell "
-"kontroll av post eller alla kontroller, eller om du inte vill att brev ska "
-"skickas automatiskt alls.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-"Flytta automatiskt inte synkroniserade brev från kataloger med otillräckliga "
-"åtkomsträttigheter"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"Om det finns nya brev i en korg som inte ännu har laddats upp till servern, men "
-"du inte nu har tillräckliga åtkomsträttigheter till korgen för att ladda upp "
-"dem, kommer breven automatiskt att flyttas till en korg för upphittade brev."
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Tillåt lokala flaggor i skrivskyddade korgar"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"Inställningen låter administratörer ställa in ett minimalt tidsintervall mellan "
-"två brevkontroller.\n"
-"Användaren kommer inte att kunna välja ett mindre värde än det som ställs in "
-"här."
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Den senast valda korgen i dialogrutan för korgval."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-"Bortse från användarens inställning av umask och använd istället \"läs-skriv "
-"bara för användaren\"."
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Policy för att visa ikon i systembrickan"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-"Stäng programmet när huvudfönstret stängs, även om en ikon i systembrickan är "
-"aktiv."
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Detaljrik underrättelse vid ny post"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Om alternativet är aktiverat så visas antal nyanlända brev för varje korg i "
-"meddelandet om nya brev. Annars får du ett enkelt meddelande att nya brev har "
-"anlänt."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "A&nge editor:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Använd en e&xtern editor i stället för den interna"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-"Tröskel då användaren ska varnas för att en korg närmar sig sin kvotgräns."
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Aktivera grupprogramfuntioner"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Behandla Från:/Till:-huvuden i svar på inbjudningar"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook har ett antal tillkortakommanden i sin implementering av "
-"iCalendar-standarden. Det här alternativet gör att det går att komma förbi ett "
-"av dem. Om du har problem med att användare av Outlook inte kan ta emot dina "
-"svar, pröva att aktivera alternativet."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Skicka grupprograminbjudan i brevets text"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook har ett antal tillkortakommanden i sin implementering av "
-"iCalendar-standarden. Det här alternativet gör att det går att komma förbi ett "
-"av dem. Om du har problem med att användare av Outlook inte kan ta emot dina "
-"svar, pröva att aktivera alternativet."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Namngivning av inbjudningar som fungerar med Exchange"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook har problem att förstå e-post från grupprogram som följer "
-"standard, vid användning tillsammans med en Microsoft Exchange server. Aktivera "
-"det här alternativet för att skicka inbjudningar på ett sätt som Microsoft "
-"Exchange förstår."
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"När det här är markerat ser du inte brevfönstret. Istället skickas alla "
-"inbjudningsbrev automatiskt. Om du vill se brevet innan det skickas, kan du "
-"avmarkera alternativet. Var dock medveten om att texten i brevfönstret har "
-"kalendersyntax, och du bör inte försöka ändra det manuellt."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "Ta bort inbjudningsbrev efter svaret till dem har skickats"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-"När det här är markerat, flyttas mottagna inbjudningsbrev som har besvarats "
-"till papperskorgen, så fort svaret har skickats med lyckat resultat."
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Genom att aktivera det här blir det möjligt att lagra poster från "
-"Kontact-programmen (Korganizer, adressboken och Knotes).</p> "
-"<p>Om du vill använda det här alternativet måste du dessutom ställa in "
-"programmen att använda IMAP-resursen. Det görs i TDE:s Inställningscentral.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Oftast har du ingen anledning att se korgarna som innehåller "
-"IMAP-resurserna, men om du behöver se dem, kan du ange det här.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>Om kontot som används för att lagra information om grupprogram inte används "
-"för att hantera vanliga brev, markera alternativet för att Kmail bara ska visa "
-"grupprogramkorgar i det. Det är användbart om du hanterar vanliga brev via ett "
-"ytterligare uppkopplat IMAP-konto.</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Välj lagringsformat för grupprogramkorgarna. "
-"<ul>"
-"<li>Förvalda format som används är standardformaten ical (för kalenderkorgar) "
-"och vcard (för adressbokskorgar). Formaten gör att alla funktioner i Kontact är "
-"tillgängliga.</li>"
-"<li>Kolab XML-formatet använder en egen modell som närmare motsvarar den som "
-"används av Outlook. Formatet ger bättre funktion tillsammans med Outlook, när "
-"en Kolab-server eller liknande lösning används.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Det här väljer överliggande korg för IMAP-resurskorgarna.</p>"
-"<p>Normalt ställer Kolab-servern in IMAP-inkorgen som överliggande korg.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Det här är identifikationen för kontot som innehåller "
-"IMAP-resurskatalogerna.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Om du vill ställa in korgnamn för IMAP-lagring till ditt eget språk, kan du "
-"välja bland följande tillgängliga språk.</p>"
-"<p>Observera att den enda anledningen att göra det är för att fungera "
-"tillsammans med Microsoft Outlook. Det anses inte en god idé att använda det, "
-"eftersom det gör det omöjligt att byta språk.</p>"
-"<p>Använd alltså inte det om du inte måste.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "Filtrera också nya brev som tas emot i grupprogramkorgar."
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-"Synkronisera grupprogramändringar i DIMAP-korgar omedelbart om uppkopplad."
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Värdet används för att bestämma om introduktionen till Kmail ska visas."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Maximalt antal anslutningar per värddator"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Det här kan användas för att begränsa antal anslutningar per värddator vid "
-"kontroll av ny post. Normalt är antalet anslutningar obegränsat (0)."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Visa redigeringsraden för snabbsökning"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Det här alternativet aktiverar eller inaktiverar redigeringsraden ovanför "
-"brevlistan, som kan användas för att snabbt söka i informationen som visas i "
-"brevlistan."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Dölj lokal inkorg om oanvänd"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Vidarebefordra normalt på plats."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "Tillåt att semikolon (';') används som avskiljare i brevfönstret."
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Behåll ursprunglig teckenuppsättning vid svar eller vidarebefordran om möjligt"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Infoga brevfot a&utomatiskt"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Kommer ihåg identiteten, så att den också används i framtida brevfönster.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Kommer ihåg korgen för skickade brev, så att den också används i framtida "
-"brevfönster."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Kommer ihåg brevöverföringsprotokollet, så att det också används i framtida "
-"brevfönster."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Kommer ihåg identiteten, så att den också används i framtida brevfönster.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Radbr&ytning vid kolumn:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Maximalt antal rader i editor för mottagare."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Aktivera det här alternativet för att få Outlook&#8482; att förstå dina svar på "
-"inbjudningar som innehåller andra tecken än engelska"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Kräv automatiskt &brevhanteringsbekräftelser"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aktivera det här alternativet om du vill att Kmail ska begära "
-"brevhanteringsbekräftelser för vart och ett av dina utgående brev.</p>"
-"<p>Det här alternativet påverkar bara standardvärdet. Du kan fortfarande "
-"inaktivera begäran av brevhanteringsbekräftelse för varje brev i brevfönstret, "
-"med menyalternativet <em>Alternativ</em>->><em>Begär hanteringsbekräftelse</em>"
-".</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Använd senaste adresser för automatisk komplettering"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Inaktivera alternativet om du inte vill att senast använda adresser ska visas i "
-"listan för automatisk komplettering i brevfönstrets adressfält."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Spara automatiskt var:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"En säkerhetskopia av texten i brevfönstret kan skapas regelbundet. Intervallet "
-"som används mellan säkerhetskopiorna skapas ställs in här. Du kan inaktivera "
-"spara automatiskt genom att ställa in värdet 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Infoga brevfot ovanför citerad text"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Ersätt identifierade prefi&x med \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Ersätt identifierade &prefix med \"Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "Använd smart &citering"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Den här signaturen har gått ut."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Typ av adressatväljare"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"Anger typ av dialogruta för att välja mottagare för Till,\n"
-"Kopia och Dold kopia."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Editor för typ av mottagare"
+"Servern stödjer inte kommandot TOP. Det är därför inte möjligt att först "
+"bara hämta rubrikerna för stora brev, innan de laddas ner."
 
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Anger typ av editor för att välja mottagare för Till,\n"
-"Kopia och Dold kopia."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Maximalt antal rader i editor för mottagare."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-"Lista med typer av brevdelar som ska klippas bort från brev som vidarebefordras "
-"på plats."
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "Maximal storlek i Mibyte som e-postbilagor tillåts ha."
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "Visa rutan för att infoga och hantera textsnuttar i brevfönstret"
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-"Visa GnuPG-granskningslogg även för krypteringsåtgärder som slutfördes med "
-"lyckat resultat."
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Behåll ursprunglig teckenuppsättning vid svar eller vidarebefordran om möjligt"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"Vissa brev, särskilt de som skapas automatiskt, anger inte teckenkodning som "
-"behövs för att visa dem på ett riktigt sätt. I sådan fall används en "
-"reservteckenkodning, som du kan ställa in här. Ställ in den till "
-"teckenkodningen som oftast används i din del av världen. Som förval används "
-"teckenkodningen som är inställd för hela systemet."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Att ändra den från det förvalda värde \"Automatisk\" tvingar användning av den "
-"angivna kodningen för alla brev, oavsett om vad de själva anger."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Aktivera det här om du vill att smilisar som :-) som ingår i brevtexten ska "
-"ersättas av små bilder."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Aktivera alternativet för att visa olika nivåer av citerad text. Inaktivera för "
-"att dölja nivåerna med citerad text."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Komprimera automatiskt nivå:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Reducera teckenstorlek för citerad text"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Aktivera alternativet för att visa citerad text med ett mindre teckensnitt."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "S&para skickade brev krypterade"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Visa e-postprogram i snygga brevhuvuden"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-"Aktivera alternativet för att visa raderna för e-postprogram och X-Mailer när "
-"snygga brevhuvuden används."
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Tillåt borttagning av bilagor till befintliga brev."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Tillåt redigering av bilagor till befintliga brev."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "Avkoda alltid brev när de visas, eller fråga innan avkodning"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Skicka brevhanteringsbekräftelser med en tom avsändare."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Skicka brevhanteringsbekräftelser med en tom avsändarsträng. Vissa servrar kan "
-"vara inställda att förkasta sådana brev, så om du upplever problem när "
-"brevhanteringsbekräftelser skickas, avmarkera då alternativet."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Meningar har konverterats till mallar"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Gamla meningar har konverterats till mallar"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Brevmall för nya brev"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Brevmall för svar"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Brevmall för svar till alla"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Brevmall för vidarebefordran"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Citattecken"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "Tillåt att inställning av frånvarosvar ändras av användaren."
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-"Tillåt att användare laddar upp Sieve-skript för frånvarosvar, men låt dem inte "
-"ändra några inställningar, som domänen att reagera på eller inställningen av "
-"reaktion för skräppost."
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "Skicka bara frånvarosvar till brev som kommer från den här domänen."
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "Tillåt att frånvarosvar skickas till brev markerade som skräppost."
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
-"Kontrollera om det fortfarande finns ett aktivt frånvarosvar inställt när Kmail "
-"startas."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 av %2 %3 används"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13882,6 +11861,11 @@ msgstr "Lägg till som Kopia"
 msgid "Add as BCC"
 msgstr "Lägg till som Dold kopia"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Avbryt"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13897,13 +11881,15 @@ msgstr "Valda mottagare"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
-"Du valde 1 mottagare. Maximalt antal mottagare som stöds är %1. Anpassa valet.\n"
-"Du valde %n mottagare. Maximalt antal mottagare som stöds är %1. Anpassa valet."
+"Du valde 1 mottagare. Maximalt antal mottagare som stöds är %1. Anpassa "
+"valet.\n"
+"Du valde %n mottagare. Maximalt antal mottagare som stöds är %1. Anpassa "
+"valet."
 
 #: redirectdialog.cpp:57
 msgid "Redirect Message"
@@ -13919,8 +11905,8 @@ msgstr "Använd dialogrutan för adressval"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 "Den här knappen visar en separat dialogruta där du kan välja mottagare bland "
 "alla tillgängliga adresser."
@@ -14025,10 +12011,19 @@ msgstr "är större än eller lika med"
 msgid " bytes"
 msgstr " byte"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " dagar"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "För att utföra sökningen måste alla brev i katalogen %1 ha laddats ner från "
 "servern. Det kan ta en viss tid. Vill du fortsätta sökningen?"
@@ -14177,16 +12172,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Samlar in data för kontot '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Samlar in data för kontot '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14205,10 +12196,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Innehåll i skriptet '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Innehåll i skriptet '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14231,20 +12220,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve-möjligheter:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve-möjligheter:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Inga särskilda möjligheter tillgängliga)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Tillgängliga Sieve-skript.\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Tillgängliga Sieve-skript.\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14287,8 +12272,8 @@ msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
 msgstr ""
-"Markera rutan om du vill att Kmail ska lägga till en brevfot i brev som skrivs "
-"med den här identiteten."
+"Markera rutan om du vill att Kmail ska lägga till en brevfot i brev som "
+"skrivs med den här identiteten."
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -14322,8 +12307,8 @@ msgstr "Använd det här fältet för att skriva in en godtycklig statisk brevfo
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "Använd den här begäran för att ange en textfil som innehåller brevfoten. Den "
 "läses varje gång du skapar ett nytt brev eller lägger till en ny brevfot."
@@ -14342,22 +12327,27 @@ msgstr "Öppnar angiven fil i en texteditor."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"Du kan lägga till ett godtyckligt kommando här, antingen med eller utan sökväg "
-"beroende på om kommandot finns i din sökväg eller inte. Kmail kör kommandot för "
-"varje nytt brev och använder vad det matar ut (på standardutmatningen) som en "
-"brevfot. Vanliga kommandon att använda med mekanismen är \"fortune\" eller "
-"\"ksig-random\"."
+"Du kan lägga till ett godtyckligt kommando här, antingen med eller utan "
+"sökväg beroende på om kommandot finns i din sökväg eller inte. Kmail kör "
+"kommandot för varje nytt brev och använder vad det matar ut (på "
+"standardutmatningen) som en brevfot. Vanliga kommandon att använda med "
+"mekanismen är \"fortune\" eller \"ksig-random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "An&ge kommando:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Sökväg"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Ny post:"
@@ -14391,6 +12381,11 @@ msgstr "Lägg till grupp"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Vill du verkligen ta bort gruppen och alla dess textsnuttar?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Verk&ställ för:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Redigera textsnutt"
@@ -14403,6 +12398,10 @@ msgstr "Redigera grupp"
 msgid "Edit &group..."
 msgstr "Redigera &grupp..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Redigera..."
@@ -14436,18 +12435,18 @@ msgid ""
 "Enable this to save the value entered to the right as the default value for "
 "this variable"
 msgstr ""
-"Aktivera det här för att spara värdet som skrivs in till höger som variabelns "
-"förvalda värde"
+"Aktivera det här för att spara värdet som skrivs in till höger som "
+"variabelns förvalda värde"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 "Om du aktiverar alternativet, sparas värdet som skrivs in till höger. Om du "
-"senare använder samma variabel, till och med i en annan textsnutt, blir värdet "
-"som skrivs in till höger variabelns förvalda värde."
+"senare använder samma variabel, till och med i en annan textsnutt, blir "
+"värdet som skrivs in till höger variabelns förvalda värde."
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -14482,6 +12481,16 @@ msgstr "Aktivera inte"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Kan inte infoga innehåll från filen %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Till: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Kopia: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14511,58 +12520,51 @@ msgstr "Kan inte starta kommando från mall: %1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Här kan du skapa brevmallar som kan användas när du skriver nya brev eller "
-"svarar, eller när du vidarebefordrar ett brev.</p>"
-"<p>Brevmallarna stöder ersättningskommandon genom att helt enkelt skriva in "
-"dem, eller genom att välja dem i menyn <i>Infoga kommando</i>.</p>"
-"<p>Mallar som anges här är specifika för en korg. De överskrider både allmänna "
-"mallar och mallar per identitet om de anges.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Här kan du skapa brevmallar som kan användas när du skriver nya brev "
+"eller svarar, eller när du vidarebefordrar ett brev.</p><p>Brevmallarna "
+"stöder ersättningskommandon genom att helt enkelt skriva in dem, eller genom "
+"att välja dem i menyn <i>Infoga kommando</i>.</p><p>Mallar som anges här är "
+"specifika för en korg. De överskrider både allmänna mallar och mallar per "
+"identitet om de anges.</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Här kan du skapa brevmallar som kan användas när du skriver nya brev eller "
-"svarar, eller när du vidarebefordrar brev.</p>"
-"<p>Brevmallarna stöder ersättningskommandon genom att helt enkelt skriva in "
-"dem, eller genom att välja dem i menyn <i>Infoga kommando</i>.</p>"
-"<p>Mallar som anges här gäller för en hel brevidentitet. De överskrider "
-"allmänna mallar, och överskrids av mallar per korg om de anges.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Här kan du skapa brevmallar som kan användas när du skriver nya brev "
+"eller svarar, eller när du vidarebefordrar brev.</p><p>Brevmallarna stöder "
+"ersättningskommandon genom att helt enkelt skriva in dem, eller genom att "
+"välja dem i menyn <i>Infoga kommando</i>.</p><p>Mallar som anges här gäller "
+"för en hel brevidentitet. De överskrider allmänna mallar, och överskrids av "
+"mallar per korg om de anges.</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Här kan du skapa brevmallar som kan användas när du skriver nya brev eller "
-"svarar, eller när du vidarebefordrar brev.</p>"
-"<p>Brevmallarna stöder ersättningskommandon genom att helt enkelt skriva in "
-"dem, eller genom att välja dem i menyn <i>Infoga kommando</i>.</p>"
-"<p>Det här är allmänna mallar (standardmallar). De kan överskridas av mallar "
-"per identitet och mallar per korg, om de anges.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Här kan du skapa brevmallar som kan användas när du skriver nya brev "
+"eller svarar, eller när du vidarebefordrar brev.</p><p>Brevmallarna stöder "
+"ersättningskommandon genom att helt enkelt skriva in dem, eller genom att "
+"välja dem i menyn <i>Infoga kommando</i>.</p><p>Det här är allmänna mallar "
+"(standardmallar). De kan överskridas av mallar per identitet och mallar per "
+"korg, om de anges.</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -14814,6 +12816,10 @@ msgstr "Skicka nuvarande brevtext och infoga resultatet som det är"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Skicka nuvarande brevtext och ersätt den med resultatet"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Ställ in markörpositionen"
@@ -14846,111 +12852,6 @@ msgstr "Aktivera felsökning"
 msgid "Turn Debug Off"
 msgstr "Stäng av felsökning"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...att du kan gå till nästa eller föregående brev genom att använda\n"
-"höger och vänster piltangent?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...att du snabbt kan skapa filter för avsändare, mottagare,\n"
-"rubrik och e-postlista med <em>Verktyg->Skapa&nbsp;filter</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...att du kan bli av med &quot;[namn på e-postlista]&quot;\n"
-"som läggs till i rubriken på vissa e-postlistor genom att använda\n"
-"filteråtgärden <em>skriv om huvud</em>? Använd\n"
-"<pre>skriv om huvud &quot;Rubrik&quot;\n"
-"   ersätt &quot;\\s*\\[namn på e-postlista\\]\\s*&quot;\n"
-"   med &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...att du kan associera en e-postlista med korgar i dialogrutan\n"
-"<em>Korg-&gt;Hantering av e-postlistor</em>? Därefter kan du använda\n"
-"<em>Brev-&gt;Nytt&nbsp;brev&nbsp;till&nbsp;sändlista...</em> för att öppna\n"
-"brevfönstret med e-postlistans adress förinställd.\n"
-"Som ett alternativ kan du klicka med musens mittknappen på korgen."
-"<p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...att du kan tilldela egna ikoner till varje individuell korg?\n"
-"Se <em>Korg-&gt;Egenskaper</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...att Kmail kan visa en färgrad som anger brevtypen\n"
-"(vanlig text, HTML, OpenPGP) som för närvarande visas?</p>\n"
-"<p>Det här förhindrar försök att förfalska riktig signaturkontroll genom\n"
-"att skicka HTML-brev som härmar Kmails visning av signaturstatus.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...att du kan filtrera med vilket huvudfält som helst genom att\n"
-"ange dess namn i första redigeringsfältet för en sökregel?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...att du kan filtrera brev med enbart HTML med regeln\n"
-"<pre>&quot;Innehåll&quot; innehåller &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...att när du svarar, citeras bara den markerade delen av brevet?</p>\n"
-"<p>Om ingenting är markerat, citeras hela brevet.</p>\n"
-"<p>Det här fungerar till och med för text i bilagor, när du valt\n"
-"<em>Visa-&gt;Bilagor-&gt;På plats</em>.</p>\n"
-"<p>Funktionen är tillgänglig med alla svarskommandon utom\n"
-"<em>Brev-&gt;Svara utan citering</em>.</p>\n"
-"<p align=\"right\"><em>Tipset kommer från David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Det finns ingenting att ångra."
@@ -15014,6 +12915,17 @@ msgstr "Bilaga nummer %1 (namnlös)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "Visa GnuPG-granskningslogg för åtgärden"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"En fil med namnet \"%1\" finns redan. Är du säker på att du vill skriva över "
+"den?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Skriv över fil?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15129,13 +13041,14 @@ msgstr "&Skicka bild med varje brev"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Markera den här rutan om du vill att Kmail ska lägga till ett huvud med ett så "
-"kallat x-ansikte till brev som skrivs med den här identiteten. Ett x-ansikte är "
-"en liten (48 x 48 bildpunkter) svartvit bild som vissa e-postprogram kan visa."
+"Markera den här rutan om du vill att Kmail ska lägga till ett huvud med ett "
+"så kallat x-ansikte till brev som skrivs med den här identiteten. Ett x-"
+"ansikte är en liten (48 x 48 bildpunkter) svartvit bild som vissa e-"
+"postprogram kan visa."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -15164,12 +13077,12 @@ msgstr "Välj fil..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Använd detta för att välja en bildfil som bilden skapas från. Bilden ska ha hög "
-"kontrast och vara nästan kvadratisk. En ljus bakgrund hjälper till att "
+"Använd detta för att välja en bildfil som bilden skapas från. Bilden ska ha "
+"hög kontrast och vara nästan kvadratisk. En ljus bakgrund hjälper till att "
 "förbättra resultatet."
 
 #: xfaceconfigurator.cpp:156
@@ -15178,16 +13091,16 @@ msgstr "Välj från adressbok"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Du kan använda en nerskalad version av bilden du har angivit i adressboken."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>Kmail kan skicka en liten (48 x 48 bildpunkter), svartvit bild med låg "
 "kvalitet med varje brev. Det kan till exempel vara en bild av dig eller en "
@@ -15199,11 +13112,11 @@ msgstr "Använd fältet för att ange en godtycklig X-ansiktessträng."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Exempel finns tillgängliga på <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Exempel finns tillgängliga på <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15218,131 +13131,1800 @@ msgstr "Ingen bild"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Du har inte din egen kontakt definierad i adressboken."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Totalt: %2<br>Olästa: %3<br>Storlek: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Signering"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Kvot: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Sig&nera automatiskt brev"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Ange rubrik för brevet"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"När det här alternativet är aktiverat signeras alla brev du skickar som "
+"standard. Det är förstås fortfarande möjligt att stänga av signering för "
+"varje individuellt brev."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Skicka kopia: till \"adress\""
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Kryptering"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Skicka dold kopia: till \"adress\""
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
+"Vid kr&yptering av e-post, kryptera också alltid till min egen identitets "
+"certifikat"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Lägg till \"huvud\" till brevet"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"När det här alternativet är aktiverat, kommer brevet eller filen inte bara "
+"krypteras med mottagarens öppna nyckel, utan också med din nyckel. Det gör "
+"det möjligt för dig att avkoda brevet eller filen vid ett senare tillfälle. "
+"Det är i allmänhet en god idé."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Läs brevtext från \"fil\""
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Visa s&ignerad eller krypterad text efter brevet har skrivits"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Ange text för brevet"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"När det här alternativet är aktiverat, visas den signerade eller krypterade "
+"texten i ett separat fönster, som gör det möjligt för dig att veta hur det "
+"ser ut innan det skickas. Det är en god idé när du verifierar att "
+"krypteringssystemet fungerar."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Lägg till en bilaga till brevet, detta kan upprepas"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "S&para skickade brev krypterade"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Titta endast efter nya brev"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Markera för att spara brev krypterade"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Öppna endast brevfönstret"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Spara brev krypterade</h1>\n"
+"När den här rutan är markerad lagras skickade brev krypterade som de "
+"skickades. Det här rekommenderas inte, eftersom du inte längre kan läsa "
+"brevet om ett nödvändigt certifikat går ut.\n"
+"<p>\n"
+"Dock kan det finnas lokala regler som kräver att du aktiverar det här "
+"alternativet. Om du tvekar, kontrollera med den lokala administratören.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Visa angiven brevfil"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Visa alltid krypteringsnycklarna &för godkännande"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Skicka brev till \"adress\", eller bifoga filen som \"webbadress\" pekar på"
+"När det här alternativet är aktiverat, visar programmet alltid en lista med "
+"öppna nycklar, där du kan välja den som ska användas för kryptering. Om det "
+"inte är aktiverat, visar programmet bara dialogrutan om det inte kan hitta "
+"rätt nyckel, eller om det finns flera som skulle kunna användas."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Läst"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Kryptera a&utomatiskt breven om möjligt"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Gammalt"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"När det här alternativet är aktiverat krypteras alla brev du skickar så fort "
+"kryptering är möjlig och önskad. Det är förstås fortfarande möjligt att "
+"stänga av den automatiska krypteringen för varje individuellt brev."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Borttaget"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Signera eller kryptera aldrig när du sparar som &utkast"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Besvarat"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Hur fungerar det här?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Vidarebefordrat"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Generell"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Köat"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Svara"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Skickat"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Svara till alla"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Bevakat"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Vidarebefordra"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Ignorerat"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Gen&väg:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Skräp"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Malltyp:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Önskat"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Mallinnehåll"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Uppgift"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Mallgenväg"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Har en bilaga"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Malltyp"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 av %2 %3 används"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Korgegenskaper"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Sökväg"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Kor&gen innehåller en sändlista"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "List&adress:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "N&ormal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Ol&äst:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Brev utgår"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Utg&å efter:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Låt lästa b&rev utgå"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Utgå e&fter:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Låt &olästa brev utgå"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "dag(ar)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "vecka/veckor"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "månad(er)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "A&vsändaridentitet:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "Lagring&sformat:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Listan visar:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Skicka köad post vid kontroll av post"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
-"En fil med namnet \"%1\" finns redan. Är du säker på att du vill skriva över "
-"den?"
+"<qt><p>Välj om du vill att Kmail ska skicka alla brev i utkorgen vid manuell "
+"kontroll av post eller alla kontroller, eller om du inte vill att brev ska "
+"skickas automatiskt alls.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Skriv över fil?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+"Flytta automatiskt inte synkroniserade brev från kataloger med otillräckliga "
+"åtkomsträttigheter"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"Om det finns nya brev i en korg som inte ännu har laddats upp till servern, "
+"men du inte nu har tillräckliga åtkomsträttigheter till korgen för att ladda "
+"upp dem, kommer breven automatiskt att flyttas till en korg för upphittade "
+"brev."
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Tillåt lokala flaggor i skrivskyddade korgar"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"Inställningen låter administratörer ställa in ett minimalt tidsintervall "
+"mellan två brevkontroller.\n"
+"Användaren kommer inte att kunna välja ett mindre värde än det som ställs in "
+"här."
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Den senast valda korgen i dialogrutan för korgval."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+"Bortse från användarens inställning av umask och använd istället \"läs-skriv "
+"bara för användaren\"."
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Policy för att visa ikon i systembrickan"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+"Stäng programmet när huvudfönstret stängs, även om en ikon i systembrickan "
+"är aktiv."
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Detaljrik underrättelse vid ny post"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Om alternativet är aktiverat så visas antal nyanlända brev för varje korg i "
+"meddelandet om nya brev. Annars får du ett enkelt meddelande att nya brev "
+"har anlänt."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "A&nge editor:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Använd en e&xtern editor i stället för den interna"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+"Tröskel då användaren ska varnas för att en korg närmar sig sin kvotgräns."
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Aktivera grupprogramfuntioner"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Behandla Från:/Till:-huvuden i svar på inbjudningar"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook har ett antal tillkortakommanden i sin implementering av "
+"iCalendar-standarden. Det här alternativet gör att det går att komma förbi "
+"ett av dem. Om du har problem med att användare av Outlook inte kan ta emot "
+"dina svar, pröva att aktivera alternativet."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Skicka grupprograminbjudan i brevets text"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook har ett antal tillkortakommanden i sin implementering av "
+"iCalendar-standarden. Det här alternativet gör att det går att komma förbi "
+"ett av dem. Om du har problem med att användare av Outlook inte kan ta emot "
+"dina svar, pröva att aktivera alternativet."
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Namngivning av inbjudningar som fungerar med Exchange"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook har problem att förstå e-post från grupprogram som följer "
+"standard, vid användning tillsammans med en Microsoft Exchange server. "
+"Aktivera det här alternativet för att skicka inbjudningar på ett sätt som "
+"Microsoft Exchange förstår."
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"När det här är markerat ser du inte brevfönstret. Istället skickas alla "
+"inbjudningsbrev automatiskt. Om du vill se brevet innan det skickas, kan du "
+"avmarkera alternativet. Var dock medveten om att texten i brevfönstret har "
+"kalendersyntax, och du bör inte försöka ändra det manuellt."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "Ta bort inbjudningsbrev efter svaret till dem har skickats"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+"När det här är markerat, flyttas mottagna inbjudningsbrev som har besvarats "
+"till papperskorgen, så fort svaret har skickats med lyckat resultat."
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Genom att aktivera det här blir det möjligt att lagra poster från Kontact-"
+"programmen (Korganizer, adressboken och Knotes).</p> <p>Om du vill använda "
+"det här alternativet måste du dessutom ställa in programmen att använda IMAP-"
+"resursen. Det görs i TDE:s Inställningscentral.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Oftast har du ingen anledning att se korgarna som innehåller IMAP-"
+"resurserna, men om du behöver se dem, kan du ange det här.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>Om kontot som används för att lagra information om grupprogram inte "
+"används för att hantera vanliga brev, markera alternativet för att Kmail "
+"bara ska visa grupprogramkorgar i det. Det är användbart om du hanterar "
+"vanliga brev via ett ytterligare uppkopplat IMAP-konto.</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Välj lagringsformat för grupprogramkorgarna. <ul><li>Förvalda format som "
+"används är standardformaten ical (för kalenderkorgar) och vcard (för "
+"adressbokskorgar). Formaten gör att alla funktioner i Kontact är "
+"tillgängliga.</li><li>Kolab XML-formatet använder en egen modell som närmare "
+"motsvarar den som används av Outlook. Formatet ger bättre funktion "
+"tillsammans med Outlook, när en Kolab-server eller liknande lösning används."
+"</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Det här väljer överliggande korg för IMAP-resurskorgarna.</p><p>Normalt "
+"ställer Kolab-servern in IMAP-inkorgen som överliggande korg.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Det här är identifikationen för kontot som innehåller IMAP-"
+"resurskatalogerna.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Om du vill ställa in korgnamn för IMAP-lagring till ditt eget språk, kan "
+"du välja bland följande tillgängliga språk.</p><p>Observera att den enda "
+"anledningen att göra det är för att fungera tillsammans med Microsoft "
+"Outlook. Det anses inte en god idé att använda det, eftersom det gör det "
+"omöjligt att byta språk.</p><p>Använd alltså inte det om du inte måste.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "Filtrera också nya brev som tas emot i grupprogramkorgar."
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+"Synkronisera grupprogramändringar i DIMAP-korgar omedelbart om uppkopplad."
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Värdet används för att bestämma om introduktionen till Kmail ska visas."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Maximalt antal anslutningar per värddator"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Det här kan användas för att begränsa antal anslutningar per värddator vid "
+"kontroll av ny post. Normalt är antalet anslutningar obegränsat (0)."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Visa redigeringsraden för snabbsökning"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Det här alternativet aktiverar eller inaktiverar redigeringsraden ovanför "
+"brevlistan, som kan användas för att snabbt söka i informationen som visas i "
+"brevlistan."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Dölj lokal inkorg om oanvänd"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Vidarebefordra normalt på plats."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "Tillåt att semikolon (';') används som avskiljare i brevfönstret."
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Behåll ursprunglig teckenuppsättning vid svar eller vidarebefordran om "
+"möjligt"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Infoga brevfot a&utomatiskt"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Kommer ihåg identiteten, så att den också används i framtida brevfönster.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Kommer ihåg korgen för skickade brev, så att den också används i framtida "
+"brevfönster."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Kommer ihåg brevöverföringsprotokollet, så att det också används i framtida "
+"brevfönster."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Kommer ihåg identiteten, så att den också används i framtida brevfönster.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Radbr&ytning vid kolumn:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Maximalt antal rader i editor för mottagare."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Aktivera det här alternativet för att få Outlook&#8482; att förstå dina svar "
+"på inbjudningar som innehåller andra tecken än engelska"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Kräv automatiskt &brevhanteringsbekräftelser"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Aktivera det här alternativet om du vill att Kmail ska begära "
+"brevhanteringsbekräftelser för vart och ett av dina utgående brev.</p><p>Det "
+"här alternativet påverkar bara standardvärdet. Du kan fortfarande inaktivera "
+"begäran av brevhanteringsbekräftelse för varje brev i brevfönstret, med "
+"menyalternativet <em>Alternativ</em>->><em>Begär hanteringsbekräftelse</em>."
+"</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Använd senaste adresser för automatisk komplettering"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Inaktivera alternativet om du inte vill att senast använda adresser ska "
+"visas i listan för automatisk komplettering i brevfönstrets adressfält."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Spara automatiskt var:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"En säkerhetskopia av texten i brevfönstret kan skapas regelbundet. "
+"Intervallet som används mellan säkerhetskopiorna skapas ställs in här. Du "
+"kan inaktivera spara automatiskt genom att ställa in värdet 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Infoga brevfot ovanför citerad text"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Ersätt identifierade prefi&x med \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Ersätt identifierade &prefix med \"Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "Använd smart &citering"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Den här signaturen har gått ut."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Typ av adressatväljare"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Anger typ av dialogruta för att välja mottagare för Till,\n"
+"Kopia och Dold kopia."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Editor för typ av mottagare"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Anger typ av editor för att välja mottagare för Till,\n"
+"Kopia och Dold kopia."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Maximalt antal rader i editor för mottagare."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+"Lista med typer av brevdelar som ska klippas bort från brev som "
+"vidarebefordras på plats."
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "Maximal storlek i Mibyte som e-postbilagor tillåts ha."
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "Visa rutan för att infoga och hantera textsnuttar i brevfönstret"
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+"Visa GnuPG-granskningslogg även för krypteringsåtgärder som slutfördes med "
+"lyckat resultat."
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Behåll ursprunglig teckenuppsättning vid svar eller vidarebefordran om "
+"möjligt"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"Vissa brev, särskilt de som skapas automatiskt, anger inte teckenkodning som "
+"behövs för att visa dem på ett riktigt sätt. I sådan fall används en "
+"reservteckenkodning, som du kan ställa in här. Ställ in den till "
+"teckenkodningen som oftast används i din del av världen. Som förval används "
+"teckenkodningen som är inställd för hela systemet."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Att ändra den från det förvalda värde \"Automatisk\" tvingar användning av "
+"den angivna kodningen för alla brev, oavsett om vad de själva anger."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Aktivera det här om du vill att smilisar som :-) som ingår i brevtexten ska "
+"ersättas av små bilder."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Aktivera alternativet för att visa olika nivåer av citerad text. Inaktivera "
+"för att dölja nivåerna med citerad text."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Komprimera automatiskt nivå:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Reducera teckenstorlek för citerad text"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Aktivera alternativet för att visa citerad text med ett mindre teckensnitt."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "S&para skickade brev krypterade"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Visa e-postprogram i snygga brevhuvuden"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"Aktivera alternativet för att visa raderna för e-postprogram och X-Mailer "
+"när snygga brevhuvuden används."
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Tillåt borttagning av bilagor till befintliga brev."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Tillåt redigering av bilagor till befintliga brev."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "Avkoda alltid brev när de visas, eller fråga innan avkodning"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Skicka brevhanteringsbekräftelser med en tom avsändare."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Skicka brevhanteringsbekräftelser med en tom avsändarsträng. Vissa servrar "
+"kan vara inställda att förkasta sådana brev, så om du upplever problem när "
+"brevhanteringsbekräftelser skickas, avmarkera då alternativet."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Meningar har konverterats till mallar"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Gamla meningar har konverterats till mallar"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Brevmall för nya brev"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Brevmall för svar"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Brevmall för svar till alla"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Brevmall för vidarebefordran"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Citattecken"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "Tillåt att inställning av frånvarosvar ändras av användaren."
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"Tillåt att användare laddar upp Sieve-skript för frånvarosvar, men låt dem "
+"inte ändra några inställningar, som domänen att reagera på eller "
+"inställningen av reaktion för skräppost."
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "Skicka bara frånvarosvar till brev som kommer från den här domänen."
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "Tillåt att frånvarosvar skickas till brev markerade som skräppost."
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+"Kontrollera om det fortfarande finns ett aktivt frånvarosvar inställt när "
+"Kmail startas."
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Redigera &fil"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Redigera..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Gå"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "K&org"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "Br&ev"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Svara speciellt"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Vidarebefordra"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Verktygstips"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Inställning av textsnuttar"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML-verktygsrad"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Vanliga alternativ"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML-verktygsrad"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Validera certifikat med CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Om det här alternativet är markerat, valideras S/MIME-certifikat med "
+"certifikatåterkallningslistor (CRL:er)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Direktvalidera certifikat (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Om det här alternativet är markerat, valideras S/MIME-certifikat direkt med "
+"Online Certificates Status Protocol (OCSP). Fyll i webbadressen till OCSP-"
+"besvararen nedan."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Direktvalidera certifikat"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Webbadress för OCSP-besvarare:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Skriv in adressen till servern för direktvalidering av certifikat (OCSP-"
+"besvarare). Webbadressen börjar oftast med http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Signatur för OCSP-besvarare:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ignorera tjänstwebbadress för certifikat"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Kontrollera inte certifikatpolicy"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Normalt använder GnuPG filen ~/.gnupg/policies.txt för att kontrollera om en "
+"certifikatpolicy tillåts. Om alternativet är markerat, kontrolleras inte "
+"någon policy."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Konsultera aldrig en CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Om det här alternativet är markerat, används certifikatåterkallningslistor "
+"aldrig för att validera S/MIME-certifikat."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Hämta saknade utgivarcertifikat"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Om det här alternativet är markerat, hämtas saknade utgivarcertifikat om "
+"nödvändigt (detta gäller båda valideringsmetoderna, CRL och OCSP)."
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP-begäran"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Utför inte någon HTTP-begäran"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Inaktiverar användning av HTTP för S/MIME helt och hållet."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Använd denna proxy för HTTP-begäran: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Använd systemets HTTP-proxy:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Om det här alternativet markeras, används värdet på HTTP-proxyn som visas "
+"till höger (som kommer från miljövariabeln http_proxy) för varje HTTP-"
+"begäran."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Skriv in platsen för HTTP-proxyn som ska användas för varje HTTP-begäran som "
+"har med S/MIME att göra. Syntaxen är värddator:port, till exempel minproxy."
+"någonstans.se:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ignorera HTTP CRL-distributionsställe för certifikat"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Vid sökning efter platsen för en CRL, innehåller certifikatet som ska testas "
+"oftast poster med så kallade \"CRL-distributionsställen\" (DS) vilka är "
+"webbadresser som beskriver sättet att komma åt webbadressen. Den första DS-"
+"posten som hittas används. Med det här alternativet ignoreras alla poster "
+"som använder HTTP-metoden vid sökning efter en lämplig DS."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP-begäran"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Utför inte någon LDAP-begäran"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Inaktivera användning av LDAP för S/MIME helt och hållet."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ignorera LDAP CRL-distributionsställe för certifikat"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Vid sökning efter platsen för en CRL, innehåller certifikatet som ska testas "
+"oftast poster med så kallade \"CRL-distributionsställen\" (DS) vilka är "
+"webbadresser som beskriver sättet att komma åt webbadressen. Den första DS-"
+"posten som hittas används. Med det här alternativet ignoreras alla poster "
+"som använder LDAP-metoden vid sökning efter en lämplig DS."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Huvudvärddator för LDAP-begäran:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Att skriva in en LDAP-server här gör att varje LDAP-begäran först går till "
+"denna server. Mer exakt överskrider inställningen värddator och port som "
+"anges i LDAP-webbadressen, och används också om värddator och port har "
+"utelämnats från adressen. Andra LDAP-servrar används bara om anslutningen "
+"till \"proxyn\" misslyckas.\n"
+"Syntaxen är \"VÄRDDATOR\" eller \"VÄRDDATOR:PORT\". Om PORT utelämnas, "
+"används port 389 (den vanliga LDAP-porten)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Lägg till textsnutt"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Lägg till"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "Text&snutt:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Grupp:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Inställning av textsnuttar"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Verktygstips"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Visa &textsnuttens innehåll i ett verktygstips"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+"Avgör om ett verktygstips ska visas som innehåller text från raden med "
+"bokmärket"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Variabler"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Inmatningsmetod för variabler"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "En dialogruta för varje variabel i en textsnutt"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "En inmatningsruta visas för varje variabel i en textsnutt"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "En dialogruta för alla variabler i en textsnutt"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"En enda dialogruta visas där du kan skriva in värden för alla variabler i en "
+"textsnutt"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Avgränsare:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Mallinställning"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Svara till avsändaren"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Svara till alla, Svara till lista"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Vidarebefordra brev"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "&Varna vid försök att skicka osignerade brev"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Markera för att få en varning när osignerade brev skickas."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna vid försök att skicka osignerade brev</h1>\n"
+"Om den här rutan är markerad blir du varnad när du försöker skicka delar "
+"eller hela brevet osignerade.\n"
+"<p>\n"
+"Det rekommenderas att behålla det här alternativet aktiverat för maximal "
+"integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Varna vid försök att skicka okrypterade brev"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Markera för att få en varning när okrypterade brev skickas."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna vid försök att skicka okrypterade brev</h1>\n"
+"Om den här rutan är markerad blir du varnad när du försöker skicka delar "
+"eller hela brevet utan kryptering.\n"
+"<p>\n"
+"Det rekommenderas att behålla det här alternativet aktiverat för maximal "
+"integritet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Varna om mottagarens &e-postadress inte finns i certifikatet"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Markera för att få en varning om adressen inte finns i certifikatet"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna om mottagarens e-postadress inte finns i certifikatet</h1>\n"
+"Om det här alternativet är markerat blir du varnad om e-postadressen för "
+"mottagaren inte finns med i certifikatet som används för kryptering.\n"
+"<p>\n"
+"Det rekommenderas att behålla det här alternativet aktiverat för maximal "
+"säkerhet.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Varna om certifikat eller nycklar snart går ut (anpassa tröskeln nedan)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "För signering"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "För kryptering"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Välj antal dagar här"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna om signaturcertifikat går ut</h1>\n"
+"Välj det minimala antal dagar som signaturcertifikatet ska vara giltigt utan "
+"att en varning visas.\n"
+"<p>\n"
+"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna om krypteringscertifikat går ut</h1>\n"
+"Välj det minimala antal dagar som krypteringscertifikatet ska vara giltigt "
+"utan att en varning visas.\n"
+"<p>\n"
+"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna om ett certifikat i kedjan går ut</h1>\n"
+"Välj det minimala antal dagar som alla certifikatet i kedjan ska vara "
+"giltiga utan att en varning visas.\n"
+"<p>\n"
+"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna om CA-certifikat går ut</h1>\n"
+"Välj det minimala antal dagar som CA-certifikatet ska vara giltigt utan att "
+"en varning visas.\n"
+"<p>\n"
+"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Varna om rotcertifikat går ut</h1>\n"
+"Välj det minimala antal dagar som rotcertifikatet ska vara giltigt utan att "
+"en varning visas.\n"
+"<p>\n"
+"Den rekommenderade inställningen för SPHINX är 14 dagar.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "För rotcertifikat:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "För mellanliggande CA-certifikat:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "För slutanvändarcertifikat och -nycklar:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Aktivera alla varningar med \"Fråga inte igen\""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...att du kan gå till nästa eller föregående brev genom att använda\n"
+"höger och vänster piltangent?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...att du snabbt kan skapa filter för avsändare, mottagare,\n"
+"rubrik och e-postlista med <em>Verktyg->Skapa&nbsp;filter</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...att du kan bli av med &quot;[namn på e-postlista]&quot;\n"
+"som läggs till i rubriken på vissa e-postlistor genom att använda\n"
+"filteråtgärden <em>skriv om huvud</em>? Använd\n"
+"<pre>skriv om huvud &quot;Rubrik&quot;\n"
+"   ersätt &quot;\\s*\\[namn på e-postlista\\]\\s*&quot;\n"
+"   med &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...att du kan associera en e-postlista med korgar i dialogrutan\n"
+"<em>Korg-&gt;Hantering av e-postlistor</em>? Därefter kan du använda\n"
+"<em>Brev-&gt;Nytt&nbsp;brev&nbsp;till&nbsp;sändlista...</em> för att öppna\n"
+"brevfönstret med e-postlistans adress förinställd.\n"
+"Som ett alternativ kan du klicka med musens mittknappen på korgen.<p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...att du kan tilldela egna ikoner till varje individuell korg?\n"
+"Se <em>Korg-&gt;Egenskaper</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...att Kmail kan visa en färgrad som anger brevtypen\n"
+"(vanlig text, HTML, OpenPGP) som för närvarande visas?</p>\n"
+"<p>Det här förhindrar försök att förfalska riktig signaturkontroll genom\n"
+"att skicka HTML-brev som härmar Kmails visning av signaturstatus.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...att du kan filtrera med vilket huvudfält som helst genom att\n"
+"ange dess namn i första redigeringsfältet för en sökregel?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...att du kan filtrera brev med enbart HTML med regeln\n"
+"<pre>&quot;Innehåll&quot; innehåller &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...att när du svarar, citeras bara den markerade delen av brevet?</p>\n"
+"<p>Om ingenting är markerat, citeras hela brevet.</p>\n"
+"<p>Det här fungerar till och med för text i bilagor, när du valt\n"
+"<em>Visa-&gt;Bilagor-&gt;På plats</em>.</p>\n"
+"<p>Funktionen är tillgänglig med alla svarskommandon utom\n"
+"<em>Brev-&gt;Svara utan citering</em>.</p>\n"
+"<p align=\"right\"><em>Tipset kommer från David F. Newman</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Visa fältet för snabbsökning i korgar"
diff --git a/tde-i18n-ta/messages/tdepim/kmail.po b/tde-i18n-ta/messages/tdepim/kmail.po
index e5d75a2230c..2e3ee02922d 100644
--- a/tde-i18n-ta/messages/tdepim/kmail.po
+++ b/tde-i18n-ta/messages/tdepim/kmail.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2005-03-24 00:56-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -30,19 +30,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
-"சிவகுமார் சண்முகசுந்தரம்,கோமதி சிவகுமார்,துரையப்பா வசீகரன்,மா சிவகுமார் "
+msgstr "சிவகுமார் சண்முகசுந்தரம்,கோமதி சிவகுமார்,துரையப்பா வசீகரன்,மா சிவகுமார் "
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"sshanmu@yahoo.com,omathiss@hotmail.com,tvasee@usa.net,ma_sivakumar@hotmail.com"
+"sshanmu@yahoo.com,omathiss@hotmail.com,tvasee@usa.net,ma_sivakumar@hotmail."
+"com"
 
 #: aboutdata.cpp:53
 msgid "Maintainer"
@@ -185,6 +185,12 @@ msgstr "எதுவும் இல்லாத (கவனமாகப் ப�
 msgid "Account for semiautomatic resource handling"
 msgstr "பாதி தானியங்கிய மூலத்தை கையாளும் கணக்கு"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "கடந்ததை துடை"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -199,8 +205,7 @@ msgstr "கடந்ததை துடை"
 #: accountdialog.cpp:1036
 msgid ""
 "Delete all outdated allocations for the resource represented by this account."
-msgstr ""
-"இந்த கணக்கு குறிப்பிடும் மூலத்தின் எல்லா காலம்கடந்த ஒதுக்கீடுகளையும் அழி"
+msgstr "இந்த கணக்கு குறிப்பிடும் மூலத்தின் எல்லா காலம்கடந்த ஒதுக்கீடுகளையும் அழி"
 
 #: accountdialog.cpp:424
 msgid "Include in m&anual mail check"
@@ -261,13 +266,13 @@ msgstr "பயனர்பெயர்:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"உங்கள் இணைய சேவை வழங்குநர் உங்களுக்கு கொடுத்த <em>பயனர் பெயர்</em> "
-"ஐ சேவையகத்திடம் அனுமதி பெற பயன்படுத்தப்படுகிறது. வழக்கமாக பயனர் பெயர் உங்கள் "
-"மின்னஞ்சல் முகவரியின் <em>@ </em> க்குமுன் இருக்கும் பகுதியாக இருக்கும்."
+"உங்கள் இணைய சேவை வழங்குநர் உங்களுக்கு கொடுத்த <em>பயனர் பெயர்</em> ஐ சேவையகத்திடம் "
+"அனுமதி பெற பயன்படுத்தப்படுகிறது. வழக்கமாக பயனர் பெயர் உங்கள் மின்னஞ்சல் முகவரியின் <em>@ "
+"</em> க்குமுன் இருக்கும் பகுதியாக இருக்கும்."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -288,17 +293,17 @@ msgstr "POP கடவுச்சொல்லை சேமிக்கவும�
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "SMTP கடவுச்சொல்லை உருவாக்க கோப்பில் Kஅஞ்சல் சேமிக்க\n"
 "இதை தேர். கடவுச்சொல் குழப்ப வார்த்தையாக சேமிக்கப்படும்,\n"
-"ஆனால் திறக்குறியீட்டு வினைகளிலிருந்து பாதுகாக்கப்பட்டதாக கருத முடியாது, "
-"உருவாக்க கோப்பினை அணுக முடிந்தால்."
+"ஆனால் திறக்குறியீட்டு வினைகளிலிருந்து பாதுகாக்கப்பட்டதாக கருத முடியாது, உருவாக்க "
+"கோப்பினை அணுக முடிந்தால்."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -327,12 +332,13 @@ msgstr "&செய்தி அதிகமாக இருந்தால் �
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"இந்த விருப்பத்தை நீங்கள் தேர்தெடுத்தால், POP வடிகட்டிகள் கொண்டு செய்திகளை என்ன "
-"செய்ய வேண்டுமென்று முடிவு செய்யப்படும். நீங்கள் அதன் பிறகு சேவையத்தின் மேல் "
-"இறக்கவோ, அழிக்கவோ அல்லது வைத்து கொள்ளவோ செய்யலாம்."
+"இந்த விருப்பத்தை நீங்கள் தேர்தெடுத்தால், POP வடிகட்டிகள் கொண்டு செய்திகளை என்ன செய்ய "
+"வேண்டுமென்று முடிவு செய்யப்படும். நீங்கள் அதன் பிறகு சேவையத்தின் மேல் இறக்கவோ, அழிக்கவோ "
+"அல்லது வைத்து கொள்ளவோ செய்யலாம்."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -381,13 +387,15 @@ msgstr "&உரையை நீக்கு"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -431,9 +439,9 @@ msgstr "இடம்மாற்று:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -494,9 +502,9 @@ msgstr "தேவைக்கேற்ப இனணப்புகளை சே�
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -535,7 +543,7 @@ msgstr "<எதுவும் இல்லை>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "உட்பெட்டி"
 
@@ -543,45 +551,46 @@ msgstr "உட்பெட்டி"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"சேவையகத்தால் தகவல் எண்ணுக்கு ஆதரவு தர முடியவில்லை, ஆனால் இந்த தகவலை "
-"சேவையகத்தில் விடுவதற்கான செய்தி.\n"
-"சில சேவையகங்கள் அவற்றின் கொள்ளளவை தற்போது தெரியப்படுத்தவில்லை என்றாலும் "
-"உள்ளிடப்பட்ட செய்திகளை சேவையகத்திலேயே சேமிக்கும். "
+"சேவையகத்தால் தகவல் எண்ணுக்கு ஆதரவு தர முடியவில்லை, ஆனால் இந்த தகவலை சேவையகத்தில் "
+"விடுவதற்கான செய்தி.\n"
+"சில சேவையகங்கள் அவற்றின் கொள்ளளவை தற்போது தெரியப்படுத்தவில்லை என்றாலும் உள்ளிடப்பட்ட "
+"செய்திகளை சேவையகத்திலேயே சேமிக்கும். "
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"சேவையகம் தகவல் தலைப்புகளுக்கு ஆதரவு தரவில்லை, ஆனால் இது சேவையகத்தில் உள்ள "
-"தகவல்களை வடிகட்ட பயன்படும் செய்தி.\n"
-"சில சேவையகங்கள் தங்கள் தகுதிகளை முழுமையாக வெளிப்படுத்தாததால் அவைகளில் உள்ள "
-"செய்திகளை மட்டுமே வடிகட்ட முடியும்."
+"சேவையகம் தகவல் தலைப்புகளுக்கு ஆதரவு தரவில்லை, ஆனால் இது சேவையகத்தில் உள்ள தகவல்களை "
+"வடிகட்ட பயன்படும் செய்தி.\n"
+"சில சேவையகங்கள் தங்கள் தகுதிகளை முழுமையாக வெளிப்படுத்தாததால் அவைகளில் உள்ள செய்திகளை "
+"மட்டுமே வடிகட்ட முடியும்."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "குழாய்வழிப்படுதலுக்கு ஆதரவில்லாத POP3 சேவையகங்கள் பாதிக்கப்பட்ட மின்னஞ்சல்களை "
 "அனுப்பலாமென்பதை கவனத்தில் கொள்க. \n"
 "இது கட்டமைக்ககூடியது, ஏனென்றால் சில சேவையகங்கள் குழாய்வழிப்படுத்தலுக்கு ஆதரவு "
-"கொடுத்தாலும் அதை அறிவிப்பதில்லை. உங்கள் POP3  சேவையகம்  குழாய்வழிப்படுத்தலுக்கு "
-"ஆதரவு கொடுக்கிறதா என்று பரிசோதிக்க .\"சேவையகம் எதற்கெல்லாம் ஆதரவு கொடுக்கிறது "
-"\" என்று உரையாடலின் கீழிருக்கும் பொத்தானை உபயோகிக்கவும்.  உங்கள் சேவையகம் "
-"அறிவிக்கவில்லையென்றால், ஆனால் உங்களுக்கு அதிகமான வேகம் வேண்டுமென்றால், நீங்களே "
-"உங்களுக்கு ஒரு மின்னஞ்சல் தொகுதி அனுப்பி இறக்கி பார்க்கவும்."
+"கொடுத்தாலும் அதை அறிவிப்பதில்லை. உங்கள் POP3  சேவையகம்  குழாய்வழிப்படுத்தலுக்கு ஆதரவு "
+"கொடுக்கிறதா என்று பரிசோதிக்க .\"சேவையகம் எதற்கெல்லாம் ஆதரவு கொடுக்கிறது \" என்று "
+"உரையாடலின் கீழிருக்கும் பொத்தானை உபயோகிக்கவும்.  உங்கள் சேவையகம் அறிவிக்கவில்லையென்றால், "
+"ஆனால் உங்களுக்கு அதிகமான வேகம் வேண்டுமென்றால், நீங்களே உங்களுக்கு ஒரு மின்னஞ்சல் தொகுதி "
+"அனுப்பி இறக்கி பார்க்கவும்."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -589,47 +598,46 @@ msgstr "ஒரு சேவையகம் மற்றும் துறைய
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
-msgstr ""
-"இந்த சேவையகத்தில் தேக்க நீக்கத்துக்கான ஆதரவு இல்லை. அதனால் இந்த விருப்பம் "
-"செயலில் இல்லை.\n"
-"சில சேவையகங்கள் தங்கள் தகுதிகளை அறிவிக்காத காரணத்தால் உங்களால் தேக்க நீக்கத்தை "
-"தற்போது பயன்படுத்த முடியும். ஆனால் சில பாப் சேவையகங்கள் பழுதான செய்திகளை "
-"அனுப்பும். இந்த வசதியை பயன்படுத்தும் முன் நீங்க ஒரு பாப் சேவையகம் வழியாக அதிக "
-"செய்திகள் அனுப்பி சோதித்திருக்க வேண்டும்,"
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
+msgstr ""
+"இந்த சேவையகத்தில் தேக்க நீக்கத்துக்கான ஆதரவு இல்லை. அதனால் இந்த விருப்பம் செயலில் இல்லை.\n"
+"சில சேவையகங்கள் தங்கள் தகுதிகளை அறிவிக்காத காரணத்தால் உங்களால் தேக்க நீக்கத்தை தற்போது "
+"பயன்படுத்த முடியும். ஆனால் சில பாப் சேவையகங்கள் பழுதான செய்திகளை அனுப்பும். இந்த வசதியை "
+"பயன்படுத்தும் முன் நீங்க ஒரு பாப் சேவையகம் வழியாக அதிக செய்திகள் அனுப்பி சோதித்திருக்க "
+"வேண்டும்,"
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"சேவையகம் தனித்தன்மையான செய்திகளுக்கு ஆதரவு தரவில்லை, ஆனால் இது சேவையகத்தில் "
-"செய்தியை விட்டு வைப்பதற்கான தகவல். அதனால் இந்த விருப்பம் செயலில் இல்லை.\n"
-"சில சேவையகங்கள் தங்கள் கொள்ளளவை சரியாக அறிவிப்பதில்லை இருந்தாலும், உங்களால் "
-"உள்ளிடப்பட்ட செய்திகளை சேவையகத்தில் சேமிக்க முடியும்."
+"சேவையகம் தனித்தன்மையான செய்திகளுக்கு ஆதரவு தரவில்லை, ஆனால் இது சேவையகத்தில் செய்தியை "
+"விட்டு வைப்பதற்கான தகவல். அதனால் இந்த விருப்பம் செயலில் இல்லை.\n"
+"சில சேவையகங்கள் தங்கள் கொள்ளளவை சரியாக அறிவிப்பதில்லை இருந்தாலும், உங்களால் உள்ளிடப்பட்ட "
+"செய்திகளை சேவையகத்தில் சேமிக்க முடியும்."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "இந்த சேவையகம் உள்வாங்கும் செய்தி தலைப்புகளுக்கு ஆதரவு தரவில்லை. ஆனால் செய்திகளை "
 "வடிகட்டுவதற்கு இது தேவை; அதனால் இந்த விருப்பம் செயலில் இல்லை.\n"
-"சில சேவையகங்கள் தங்கள் கொள்ளளவை சரியாக அறிவிப்பதில்லை இருந்தாலும்,  உங்களால் "
-"வடிகட்டப்பட்ட செய்திகளை சேவையகத்தில் சேமிக்க முடியும்."
+"சில சேவையகங்கள் தங்கள் கொள்ளளவை சரியாக அறிவிப்பதில்லை இருந்தாலும்,  உங்களால் வடிகட்டப்பட்ட "
+"செய்திகளை சேவையகத்தில் சேமிக்க முடியும்."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -709,8 +717,8 @@ msgstr "IMAP கணக்கு"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "இந்த அஞ்சல் பெற, நீங்கள் பிணைய பகுதியில் ஒரு கணக்கு சேர்க்க வேண்டும்"
 
 #: accountwizard.cpp:87
@@ -747,9 +755,9 @@ msgstr "கேஅஞ்சலுக்கு நல்வரவு"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -812,8 +820,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "சேவக தகவல்"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "எதுவும் இல்லை"
@@ -916,15 +923,13 @@ msgstr "தேவையற்ற நச்சுநிரல் தடுத்�
 #, fuzzy
 msgid "<p>Messages classified as spam are marked as read."
 msgstr ""
-"தேவையற்றவை என வகைப்படுத்தப்பட்ட செய்திகளை படிக்கப்பட்டதாக்கி தனி அடைவிற்கு "
-"நகர்த்து,"
+"தேவையற்றவை என வகைப்படுத்தப்பட்ட செய்திகளை படிக்கப்பட்டதாக்கி தனி அடைவிற்கு நகர்த்து,"
 
 #: antispamwizard.cpp:562
 #, fuzzy
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr ""
-"தேவையற்றவை என வகைப்படுத்தப்பட்ட செய்திகளை படிக்கப்பட்டதாக்கி தனி அடைவிற்கு "
-"நகர்த்து,"
+"தேவையற்றவை என வகைப்படுத்தப்பட்ட செய்திகளை படிக்கப்பட்டதாக்கி தனி அடைவிற்கு நகர்த்து,"
 
 #: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
@@ -954,28 +959,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>கேமெயில் வடிகட்டிகளை  அமைக்கும் விதிமுறைகள் பழக்கத்தில் உள்ள வடிகட்டியை "
-"சாதாரண தேவையற்ற நச்சுநிரல் கருவியைப் பயன்படுத்தி அமைக்கப்படும்.</p> "
-"இந்த வழிகாட்டி உங்கள் கணினியில் உள்ள தேவையற்ற மின்னஞ்சல்களை நீக்குவதற்கான "
-"விதிகளை அமைக்கும். இது ஏற்கனவே உள்ள விதிமுறைகளை கணக்கில் எடுத்துக்கொள்ளாமல் "
-"புதிய விதிகளை சேர்க்கும்.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>கேமெயில் வடிகட்டிகளை  அமைக்கும் விதிமுறைகள் பழக்கத்தில் உள்ள வடிகட்டியை சாதாரண "
+"தேவையற்ற நச்சுநிரல் கருவியைப் பயன்படுத்தி அமைக்கப்படும்.</p> இந்த வழிகாட்டி உங்கள் "
+"கணினியில் உள்ள தேவையற்ற மின்னஞ்சல்களை நீக்குவதற்கான விதிகளை அமைக்கும். இது ஏற்கனவே உள்ள "
+"விதிமுறைகளை கணக்கில் எடுத்துக்கொள்ளாமல் புதிய விதிகளை சேர்க்கும்.</p><p><b>Warning:</"
+"b> As KMail appears to be frozen during the scan of the messages for "
+"viruses, you may encounter problems with the responsiveness of KMail because "
+"anti-virus tool operations are usually time consuming; please consider "
+"deleting the filter rules created by the wizard to get back to the former "
+"behavior."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -992,8 +995,7 @@ msgstr "Mark selected messages as read"
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
 msgstr ""
-"தேவையற்றவை என வகைப்படுத்தப்பட்ட செய்திகளை படிக்கப்பட்டதாக்கி தனி அடைவிற்கு "
-"நகர்த்து,"
+"தேவையற்றவை என வகைப்படுத்தப்பட்ட செய்திகளை படிக்கப்பட்டதாக்கி தனி அடைவிற்கு நகர்த்து,"
 
 #: antispamwizard.cpp:950
 msgid "Move &known spam to:"
@@ -1011,10 +1013,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1025,12 +1026,12 @@ msgstr "எதிர்-நச்சுநிரல் கருவி மூல
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"எதிர்-நச்சுநிரல் கருவி உங்கள் செய்திகளை வகைப்படுத்தட்டும். ஒவ்வொரு செய்தியில் "
-"கருவியால் குறிக்கப்பட்டிருக்கும் அதனால் தொடர்புடைய வடிகட்டிகள் அவைகளின் மேல் "
-"வேலை செய்யும். உதாரணமாக தேவையற்ற மின்னஞ்சல்களை தனி அடைவில் நகர்த்தலாம்."
+"எதிர்-நச்சுநிரல் கருவி உங்கள் செய்திகளை வகைப்படுத்தட்டும். ஒவ்வொரு செய்தியில் கருவியால் "
+"குறிக்கப்பட்டிருக்கும் அதனால் தொடர்புடைய வடிகட்டிகள் அவைகளின் மேல் வேலை செய்யும். "
+"உதாரணமாக தேவையற்ற மின்னஞ்சல்களை தனி அடைவில் நகர்த்தலாம்."
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -1039,12 +1040,12 @@ msgstr "தேர்வு செய்யபட்ட அடைவின் ந
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"வடிகட்டிகள் செய்திகளை கண்டறிந்து அவற்றிற்காக நச்சுநிரல் மற்றும் அதை சார்ந்த "
-"செய்தியை அடைவுகளில் உருவாக்கி சேர்க்கும். இயல்பாக குப்பை தொட்டியில் போடும், "
-"ஆனால் அடைவில் இவைகள் மாற்றப்படும்."
+"வடிகட்டிகள் செய்திகளை கண்டறிந்து அவற்றிற்காக நச்சுநிரல் மற்றும் அதை சார்ந்த செய்தியை "
+"அடைவுகளில் உருவாக்கி சேர்க்கும். இயல்பாக குப்பை தொட்டியில் போடும், ஆனால் அடைவில் இவைகள் "
+"மாற்றப்படும்."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1052,11 +1053,11 @@ msgstr "கூடுதலாக, நச்சுநிரல் செய்த
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"குறிக்கப்பட்ட செய்திகளை நச்சு பாதிக்கப்பட்டது என வகைப்படுத்தப்படுத்தி "
-"படிக்கப்பட்டதாக்கி, தனி அடைவிற்கு நகர்த்து."
+"குறிக்கப்பட்ட செய்திகளை நச்சு பாதிக்கப்பட்டது என வகைப்படுத்தப்படுத்தி படிக்கப்பட்டதாக்கி, "
+"தனி அடைவிற்கு நகர்த்து."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1236,8 +1237,8 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"இதற்கு காரணம் உங்களுக்கு இதை செய்ய உங்களுக்கு அனுமதி இல்லாமல் இருக்கலாம் அல்லது "
-"ஆவணம் ஏற்கனவே சேவையகத்தில் இருக்கலாம். சேவையகம் கொடுக்கும் பிழை செய்தி:."
+"இதற்கு காரணம் உங்களுக்கு இதை செய்ய உங்களுக்கு அனுமதி இல்லாமல் இருக்கலாம் அல்லது ஆவணம் "
+"ஏற்கனவே சேவையகத்தில் இருக்கலாம். சேவையகம் கொடுக்கும் பிழை செய்தி:."
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1250,8 +1251,8 @@ msgstr "சேவகனில் அடைவு %1ஐ அழிக்கும�
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1271,8 +1272,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1303,23 +1304,21 @@ msgstr "அழிக்கப்பட்டது"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>உங்களின் எந்த அடையாளமும் இச்செய்தியின் பெறுநருடன் ஒத்துப்போகவில்லை,"
-"<br> கீழ்க்கண்டவற்றில் எது உங்கள் முகவரியென்று தயவு செய்து "
-"தேர்ந்தெடுக்கிறீர்களா?"
+"<qt>உங்களின் எந்த அடையாளமும் இச்செய்தியின் பெறுநருடன் ஒத்துப்போகவில்லை,<br> கீழ்க்கண்டவற்றில் "
+"எது உங்கள் முகவரியென்று தயவு செய்து தேர்ந்தெடுக்கிறீர்களா?"
 
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>உங்களின் எந்த அடையாளமும் இச்செய்தியின் பெறுநருடன் ஒத்துப்போகவில்லை,"
-"<br> கீழ்க்கண்டவற்றில் எது உங்கள் முகவரியென்று தயவு செய்து "
-"தேர்ந்தெடுக்கிறீர்களா?"
+"<qt>உங்களின் எந்த அடையாளமும் இச்செய்தியின் பெறுநருடன் ஒத்துப்போகவில்லை,<br> கீழ்க்கண்டவற்றில் "
+"எது உங்கள் முகவரியென்று தயவு செய்து தேர்ந்தெடுக்கிறீர்களா?"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1328,8 +1327,7 @@ msgstr "முகவரியை தேர்வு செய்யவும்"
 #: chiasmuskeyselector.cpp:19
 #, fuzzy
 msgid "Please select the Chiasmus key file to use:"
-msgstr ""
-"தயவுசெய்து KMail குள் உருவாக்கப்படவேண்டிய நச்சு வடிகட்டிகளை தேர்வுசெய்."
+msgstr "தயவுசெய்து KMail குள் உருவாக்கப்படவேண்டிய நச்சு வடிகட்டிகளை தேர்வுசெய்."
 
 #: chiasmuskeyselector.cpp:29
 msgid "Additional arguments for chiasmus:"
@@ -1350,18 +1348,21 @@ msgstr "%1 யை குறுக்கும் போது பிழை ந�
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>இந்த அமைப்பு உங்கள் நிர்வாகியால் சரிசெய்யப்பட்டது. </p>"
-"<p> இது பிழையென்றால், அவரை அணுகவும்</p></qt>"
+"<qt><p>இந்த அமைப்பு உங்கள் நிர்வாகியால் சரிசெய்யப்பட்டது. </p><p> இது பிழையென்றால், "
+"அவரை அணுகவும்</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "வரலாற்றை ஏற்று"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "கேமெயிலை கட்டமை "
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&சேர்..."
@@ -1391,6 +1392,11 @@ msgstr "<qt>பெயரிட்ட அடையாளத்தை நிச்
 msgid "Remove Identity"
 msgstr "உள்ளீ¨டு நீக்கு."
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "நீக்கு"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "சேர்..."
@@ -1399,6 +1405,11 @@ msgstr "சேர்..."
 msgid "Modify..."
 msgstr "மாற்றியமை..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "நீக்கு"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "முன்னிருப்பாக அமை"
@@ -1415,17 +1426,15 @@ msgstr "அனுப்புகிறது"
 msgid "Outgoing accounts (add at least one):"
 msgstr "வெளி செல்லும் கணக்குகள்: (ஒரு கணக்காவது உள்ளிடவும்!)"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "பெயர்"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "வகை"
@@ -1448,8 +1457,7 @@ msgstr "முன்னிருப்பாக அமை"
 msgid "Common Options"
 msgstr "பொது விருப்பம்"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&அனுப்பு முன் உறுதிசெய்"
@@ -1500,17 +1508,15 @@ msgstr "முன்னிருப்பு களம்:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>முன்னிருப்பின் களத்தின் முழுமையான மின்னஞ்சலில் பயன்படுத்துபவர் பெயரை "
-"செலுத்தவும்"
+"<qt><p>முன்னிருப்பின் களத்தின் முழுமையான மின்னஞ்சலில் பயன்படுத்துபவர் பெயரை செலுத்தவும்"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1530,9 +1536,9 @@ msgstr "போக்குவரத்தை சேர்"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (முன்னிருப்பு)"
 
@@ -1611,6 +1617,10 @@ msgstr "கணக்கை மாற்றியமை"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>கணக்கை<b>%1</b> காண முடியவில்லை</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "நிறங்கள்."
@@ -1720,8 +1730,7 @@ msgstr "தொடரந்துவரும் இணைப்பு"
 msgid "Misspelled Words"
 msgstr "தவறாக வார்த்தைகள்"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "புதிய செய்தி"
@@ -1760,8 +1769,7 @@ msgstr "PGP செய்தி திறக்க- மோசமான கைய�
 
 #: configuredialog.cpp:1723
 msgid "Border Around Warning Prepending HTML Messages"
-msgstr ""
-"HTML அஞ்சல்களுக்கு முன்னால் காண்பிக்கப்படும் எச்சரிக்கையின் விளிம்பிட்ட தகவல்"
+msgstr "HTML அஞ்சல்களுக்கு முன்னால் காண்பிக்கப்படும் எச்சரிக்கையின் விளிம்பிட்ட தகவல்"
 
 #: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
@@ -1911,11 +1919,11 @@ msgstr "இழைகளை முன்னிருப்பாக - &மூட�
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"புது, படிக்கப்படாத அல்லது முக்கியமான செய்திகளை கொண்ட இழையை திற மற்றும் "
-"கண்காணிக்கப்பட்ட இழைகளை திற."
+"புது, படிக்கப்படாத அல்லது முக்கியமான செய்திகளை கொண்ட இழையை திற மற்றும் கண்காணிக்கப்பட்ட "
+"இழைகளை திற."
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1923,70 +1931,51 @@ msgstr "நாள் காட்டு"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>இந்த கூற்றுக்கள் இந்த தேதிக்கு உபயோகிக்கலாம்:</strong></p>"
-"<ul>"
-"<li>d-நாள் ஒரு எண்ணாக முன்சைபர் இல்லாமல் (1-31)</li>"
-"<li>dd-நாள் ஒரு எண்ணாக முன்சைபருடன்(01-31)</li>"
-"<li>ddd-சுருக்கப்பட்ட நாள் பெயர்(திங்-ஞாயி)</li>"
-"<li>dddd - முழு நாள் பெயர் (திங்கள்-ஞாயிறு)</li>"
-"<li>M-மாதம் ஒரு எண்ணாக முன்சைபர் இல்லாமல் (1-12)</li>"
-"<li>MM - மாதம் ஒரு எண்ணாக முன்சைபருடன் (01-12)</li>"
-"<li>MMM சுருக்கப்பட்ட மாத பெயர்(சன-டிச)</li>"
-"<li>MMMM - முழு மாதப்பெயர் (சனவரி- டிசம்பர்)</li>"
-"<li>yy- ஆண்டு இரு இலக்க எண்ணாக (00-99)</li>"
-"<li>yyyy -ஆண்டு நான்கு இலக்க எண்ணாக(0000-9999)</li></ul>"
-"<p><strong>இந்த கூற்றுகள் இந்த நேரத்திற்கு பயன்படுத்தலாம்:</strong></p>"
-"<ul>"
-"<li>h-மணிநேரம் முன்பூஜ்ஜியம் இல்லாமல் (0-23 or 1-12 காலை/மாலை தெரிந்தால்)</li>"
-"<li>hh- மணிநேரம் முன்பூஜ்ஜியத்துடன்(00-23 or 01-12 காலை/மாலை தெரிந்தால்)</li>"
-"<li>m-நிமிடங்கள் முன்பூஜ்ஜியம் இல்லாமல் (0-59)</li>"
-"<li>mm -நிமிடங்கள் முன்பூஜ்ஜியத்துடன்  (00-59)</li>"
-"<li>s - விநாடிகள் முன்பூஜ்ஜியம் இல்லாமல் (0-59)</li>"
-"<li>ss -விநாடிகள் முன்பூஜ்ஜியத்துடன்(00-59)</li>"
-"<li>z -மில்லி விநாடிகள் முன்பூஜ்ஜியம் இல்லாமல் (0-999)</li>"
-"<li>zzz - மில்லி விநாடிகள் முன்பூஜ்ஜியத்துடன்(000-999)</li>"
-"<li>AP- காலை/மாலை தோற்றத்திற்கு மாற்று.  \"காலை\" அல்லது \"மாலை\"  AP க்கு "
-"பதிலாக மாற்றும்</li>"
-"<li>apகாலை/மாலை தோற்றத்திற்கு மாற்று.  \"கா\" அல்லது \"மா\"  ap க்கு பதிலாக "
-"மாற்றும்</li>"
-"<li>Z வட்டார நேரம் எண்ணாக (-0500)</li></ul>"
-"<p>மற்ற எல்லா உள்ளீட்ட உருக்களெல்லாம் கவனத்தில் கொள்ளப்படமாட்டாது</strong></p>"
-"</qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>இந்த கூற்றுக்கள் இந்த தேதிக்கு உபயோகிக்கலாம்:</strong></p><ul><li>d-"
+"நாள் ஒரு எண்ணாக முன்சைபர் இல்லாமல் (1-31)</li><li>dd-நாள் ஒரு எண்ணாக "
+"முன்சைபருடன்(01-31)</li><li>ddd-சுருக்கப்பட்ட நாள் பெயர்(திங்-ஞாயி)</li><li>dddd - "
+"முழு நாள் பெயர் (திங்கள்-ஞாயிறு)</li><li>M-மாதம் ஒரு எண்ணாக முன்சைபர் இல்லாமல் (1-12)</"
+"li><li>MM - மாதம் ஒரு எண்ணாக முன்சைபருடன் (01-12)</li><li>MMM சுருக்கப்பட்ட மாத "
+"பெயர்(சன-டிச)</li><li>MMMM - முழு மாதப்பெயர் (சனவரி- டிசம்பர்)</li><li>yy- ஆண்டு "
+"இரு இலக்க எண்ணாக (00-99)</li><li>yyyy -ஆண்டு நான்கு இலக்க எண்ணாக(0000-9999)</li></"
+"ul><p><strong>இந்த கூற்றுகள் இந்த நேரத்திற்கு பயன்படுத்தலாம்:</strong></p><ul><li>h-"
+"மணிநேரம் முன்பூஜ்ஜியம் இல்லாமல் (0-23 or 1-12 காலை/மாலை தெரிந்தால்)</li><li>hh- "
+"மணிநேரம் முன்பூஜ்ஜியத்துடன்(00-23 or 01-12 காலை/மாலை தெரிந்தால்)</li><li>m-நிமிடங்கள் "
+"முன்பூஜ்ஜியம் இல்லாமல் (0-59)</li><li>mm -நிமிடங்கள் முன்பூஜ்ஜியத்துடன்  (00-59)</"
+"li><li>s - விநாடிகள் முன்பூஜ்ஜியம் இல்லாமல் (0-59)</li><li>ss -விநாடிகள் "
+"முன்பூஜ்ஜியத்துடன்(00-59)</li><li>z -மில்லி விநாடிகள் முன்பூஜ்ஜியம் இல்லாமல் (0-999)</"
+"li><li>zzz - மில்லி விநாடிகள் முன்பூஜ்ஜியத்துடன்(000-999)</li><li>AP- காலை/மாலை "
+"தோற்றத்திற்கு மாற்று.  \"காலை\" அல்லது \"மாலை\"  AP க்கு பதிலாக மாற்றும்</"
+"li><li>apகாலை/மாலை தோற்றத்திற்கு மாற்று.  \"கா\" அல்லது \"மா\"  ap க்கு பதிலாக "
+"மாற்றும்</li><li>Z வட்டார நேரம் எண்ணாக (-0500)</li></ul><p>மற்ற எல்லா உள்ளீட்ட "
+"உருக்களெல்லாம் கவனத்தில் கொள்ளப்படமாட்டாது</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "முழு இழை அமைவை மாற்றுவது அனைத்து அடைவுகளின் குறிப்பிட்ட மதிப்புகளை மேலாணை "
 "செய்துவிடும்."
@@ -2003,8 +1992,7 @@ msgstr "HTML நிலைப்பட்டையைக் காட்டு"
 msgid "Show s&pam status in fancy headers"
 msgstr "தலைப்புகளில் வேண்டாத அஞ்சல் நிலையைக் காட்டு"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -2013,8 +2001,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2040,8 +2027,7 @@ msgstr "தானே"
 msgid "&Override character encoding:"
 msgstr "&எழுத்து குறியீட்டாக்கத்தை மாற்று."
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "அமைப்பு தட்டு சின்னத்தை செயல்படுத்து "
@@ -2147,22 +2133,19 @@ msgstr "<b>%f</b> என்பது தொகுக்க வேண்டிய
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>கீழ்கண்ட இடப்பயனர்கள் பதில் சொற்றொடர்களில் ஆதரிக்கப்படுகிறது:"
-"<br><b>%D</b>:தேதி, <b>%S</b>:பொருள்"
-"<br><b>%e</b>: அனுப்புநர் முகவரி, <b>%F</b>:அனுப்புநர் பெயர், <b>%f</b>"
-": அனுப்புநர் முதல்பெயர்,"
-"<br><b>%T</b>:பெறுபவர் பெயர், <b>%t</b>:பெறுபவர் பெயர் மற்றும் முகவரி,"
-"<br><b>%C</b>: மறை நகல் பெயர்கள், <b>%c</b>:மறை நகல் பெயர்கள் மற்றும் "
-"முகவரிகள்,"
-"<br><b>%%</b>:சதவிகித குறி, <b>%_</b>:வெற்று, <b>%L</b>:வரிமுடிவு</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>கீழ்கண்ட இடப்பயனர்கள் பதில் சொற்றொடர்களில் ஆதரிக்கப்படுகிறது:<br><b>%D</b>:தேதி, <b>"
+"%S</b>:பொருள்<br><b>%e</b>: அனுப்புநர் முகவரி, <b>%F</b>:அனுப்புநர் பெயர், <b>%f</"
+"b>: அனுப்புநர் முதல்பெயர்,<br><b>%T</b>:பெறுபவர் பெயர், <b>%t</b>:பெறுபவர் பெயர் "
+"மற்றும் முகவரி,<br><b>%C</b>: மறை நகல் பெயர்கள், <b>%c</b>:மறை நகல் பெயர்கள் மற்றும் "
+"முகவரிகள்,<br><b>%%</b>:சதவிகித குறி, <b>%_</b>:வெற்று, <b>%L</b>:வரிமுடிவு</"
+"qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2185,21 +2168,20 @@ msgstr "அனைவருக்கும் பதிலனுப்பு:"
 msgid "&Forward:"
 msgstr "&வழியனுப்பு:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "& மேற்கோள்குறி காட்டி "
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D யில், நீங்கள் எழுதியது:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D யில், %F எழுதியது:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "வழியனுப்பப்பட்ட செய்தி"
 
@@ -2237,12 +2219,11 @@ msgstr "Enter new forward prefix:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
-"வேண்டப்பட்ட எல்லா உருக்களும் கொண்ட ஒரு எழுத்துக்கோவைக்காக இந்த "
-"பட்டியலிலிருக்கும் ஒவ்வொரு வெளிவரும் செய்தியையும் மேலிருந்து கீழ் "
-"சோதிக்கப்படும்."
+"வேண்டப்பட்ட எல்லா உருக்களும் கொண்ட ஒரு எழுத்துக்கோவைக்காக இந்த பட்டியலிலிருக்கும் ஒவ்வொரு "
+"வெளிவரும் செய்தியையும் மேலிருந்து கீழ் சோதிக்கப்படும்."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2251,8 +2232,8 @@ msgstr "எழுத்துக்கோவையை உள்ளிடவு�
 #: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"பதிலளிக்கும் போதோ அல்லது வேறொருவருக்கு அனுப்பும் போதோ முன்னிருந்த "
-"எழுத்துக்கோவையை வைத்திருக்கவும் (முடிந்தால்)"
+"பதிலளிக்கும் போதோ அல்லது வேறொருவருக்கு அனுப்பும் போதோ முன்னிருந்த எழுத்துக்கோவையை "
+"வைத்திருக்கவும் (முடிந்தால்)"
 
 #: configuredialog.cpp:3318
 msgid "This charset is not supported."
@@ -2278,10 +2259,9 @@ msgstr "மதிப்பு"
 msgid "Ne&w"
 msgstr "புதிய"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "பெயர்:"
@@ -2290,19 +2270,17 @@ msgstr "பெயர்:"
 msgid "&Value:"
 msgstr "மதிப்பு:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "அவுட்லுக்கில் வேலை செய்யக்கூடிய இணைப்புப் பெயர்"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Outlook(tm) அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த விருப்பத்தை "
-"செயலாக்கு."
+"Outlook(tm) அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த விருப்பத்தை செயலாக்கு."
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2311,8 +2289,7 @@ msgstr "தொலைந்துபோன இணைப்புகளை கண�
 #: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
-"பின்வரும் ஏதாவது முக்கியச் சொற்களை, கோப்பினை இணைக்க விரும்புவதற்கு அடையாளமாக "
-"கொள்:"
+"பின்வரும் ஏதாவது முக்கியச் சொற்களை, கோப்பினை இணைக்க விரும்புவதற்கு அடையாளமாக கொள்:"
 
 #: configuredialog.cpp:3613
 msgid "Enter new key word:"
@@ -2330,19 +2307,18 @@ msgstr "இணைக்கப்பட்ட"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"அவுட்லுக்கால் புரிந்துகொள்ள முடியாத ஆங்கிலம் அல்லாத செய்திகளை கொண்ட "
-"இணைப்புகளுக்கான எழுத்துருவை தேர்வு செய்து, மற்ற புரவலன்களில் அதற்கான ஆதரவு "
-"உண்டா என்பதைப் பார்க்கவும்.\n"
-"கேமெயில் தரமில்லா செய்திகளுக்கான தகவலையும், உங்கள் செய்தி புரிந்து கொள்ள "
-"முடியாத செய்திகளை தரும். "
+"அவுட்லுக்கால் புரிந்துகொள்ள முடியாத ஆங்கிலம் அல்லாத செய்திகளை கொண்ட இணைப்புகளுக்கான "
+"எழுத்துருவை தேர்வு செய்து, மற்ற புரவலன்களில் அதற்கான ஆதரவு உண்டா என்பதைப் பார்க்கவும்.\n"
+"கேமெயில் தரமில்லா செய்திகளுக்கான தகவலையும், உங்கள் செய்தி புரிந்து கொள்ள முடியாத "
+"செய்திகளை தரும். "
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2366,111 +2342,91 @@ msgstr "க்ரிப்டோ பின்நிலைகள்."
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>சில மின்னஞ்சல்கள் இரு வடிவிலும் வரலாம். இந்த விருப்பம் மூலம் காட்டப்படுவது "
-"உரை வடிவமா அல்லது HTML வடிவமா என்பதைக் கட்டுப்படுத்தலாம். </p>"
-"<p>HTML பகுதிகளைக் காட்டினால் தகவல்களின் தோற்றம் அழகூட்டப்படும் அதே "
-"நேரத்தில்பாதுகாப்புக் குறைகள் தாக்கப்படும் அபாயமும அதிகரிக்கும். </p>"
-"<p>உரை வடிவில் காட்டும்போது தகவலின் பெரும்பான்மை வடிவமைப்பு போனாலும் HTML "
-"காட்சியகத்தில் (கான்கொரர்) உள்ள பாதுகாப்புக குறைகள் தாக்கப்படுவது "
-"குறைந்துவிடும். </p>"
-"<p>கீழ்க்காணும் விருப்பம் HTML அஞ்சலில் வழக்கமான ஒரு முறைகேட்டைத் தவிர்க்க "
-"உதவும். ஆனால், தற்போது நமக்குத் தெரியாத பாதுகாப்புக் பிரச்சினைகளைத் தவிர்ப்பது "
-"முடியாது. </p> "
-"<p>எனவே உரையை விட்டு HTML ஐப் பயன்படுத்தும் விருப்பத்தை<em>தவிர்க்கவும்.</em>"
-"</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>சில மின்னஞ்சல்கள் இரு வடிவிலும் வரலாம். இந்த விருப்பம் மூலம் காட்டப்படுவது உரை "
+"வடிவமா அல்லது HTML வடிவமா என்பதைக் கட்டுப்படுத்தலாம். </p><p>HTML பகுதிகளைக் "
+"காட்டினால் தகவல்களின் தோற்றம் அழகூட்டப்படும் அதே நேரத்தில்பாதுகாப்புக் குறைகள் தாக்கப்படும் "
+"அபாயமும அதிகரிக்கும். </p><p>உரை வடிவில் காட்டும்போது தகவலின் பெரும்பான்மை வடிவமைப்பு "
+"போனாலும் HTML காட்சியகத்தில் (கான்கொரர்) உள்ள பாதுகாப்புக குறைகள் தாக்கப்படுவது "
+"குறைந்துவிடும். </p><p>கீழ்க்காணும் விருப்பம் HTML அஞ்சலில் வழக்கமான ஒரு முறைகேட்டைத் "
+"தவிர்க்க உதவும். ஆனால், தற்போது நமக்குத் தெரியாத பாதுகாப்புக் பிரச்சினைகளைத் தவிர்ப்பது "
+"முடியாது. </p> <p>எனவே உரையை விட்டு HTML ஐப் பயன்படுத்தும் விருப்பத்தை<em>தவிர்க்கவும்."
+"</em></p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>சில HTML ல் அஞ்சல் விளம்பரங்கள், நீங்கள் அஞ்சலைப் படித்து விட்டீர்களா என்று "
-"அறிய உதவும் உருவங்களுடன் இந்த குறியீடுகளைக் கொண்டுள்ளன. (\"பிழைகள்\").</p>"
-"<p> வேண்டுமானால் அனுப்புநர் நேரடியாகவே உருவங்களை ஏற்றலாம். எனவே "
-"இணையத்திலிருந்து இப்படி உருவங்களை ஏற்றுவதற்கு நேர்மையான காரணம் எதுவுமில்லை.</p>"
-"<p> முறைகேட்டைத் தவிர்க்க kmail இன் HTML காட்டும் அமைப்பில் இந்த விருப்பம் "
-"முன்னிருப்பாக<em>செயலிழக்கப்பட்டுள்ளது.</em> </p>"
-"<p>HTML ல் அஞ்சலில் படங்களை நீங்கள் பார்க்க விரும்பினால், இந்த விருப்பத்திற்கு "
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>சில HTML ல் அஞ்சல் விளம்பரங்கள், நீங்கள் அஞ்சலைப் படித்து விட்டீர்களா என்று அறிய "
+"உதவும் உருவங்களுடன் இந்த குறியீடுகளைக் கொண்டுள்ளன. (\"பிழைகள்\").</p><p> வேண்டுமானால் "
+"அனுப்புநர் நேரடியாகவே உருவங்களை ஏற்றலாம். எனவே இணையத்திலிருந்து இப்படி உருவங்களை "
+"ஏற்றுவதற்கு நேர்மையான காரணம் எதுவுமில்லை.</p><p> முறைகேட்டைத் தவிர்க்க kmail இன் HTML "
+"காட்டும் அமைப்பில் இந்த விருப்பம் முன்னிருப்பாக<em>செயலிழக்கப்பட்டுள்ளது.</em> </"
+"p><p>HTML ல் அஞ்சலில் படங்களை நீங்கள் பார்க்க விரும்பினால், இந்த விருப்பத்திற்கு "
 "உயிரூட்டலாம். ஆனால், விளைவுகளை நன்குப் புரிந்து கொள்ளுங்கள்.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>செய்தி விருப்பநிலை அறிவிப்பு கொள்கை</h3>"
-"<p>MDNகள் பொதுவாக <b>படித்த ரசீது</b> என்றழைக்கப்படும் பொதுப்படுத்தல். இந்த "
-"விருப்பநிலை செய்தியை எழுதுபவர் அனுப்ப வேண்டி மற்றும் பெறுநரின் அஞ்சல் பயன்பாடு "
-"ஒரு பதிலை உருவாக்குகிறது, எழுதியவர் இச்செய்திக்கு என்னவாயிற்று என்பதை அறிந்து "
-"கொள்ள. பொது விருப்பநிலை வகைகள் <b>காட்சியளிக்கப்பட்டது</b> "
-"(அதாவது படிக்கப்படாது), <b>அழிக்கப்பட்டது</b>மற்றும் <b>அனுப்பப்பட்டது</b> "
-"(அதாவது முன்வழிக்கப்பட்டது).</p>"
-"<p>Kஅஞ்சல் MDNகள் அனுப்ப கீழ்கண்ட விருப்பங்கள் இருக்கின்றன:</p>"
-"<ul>"
-"<li><em>அலட்சியப்படுத்து</em>: விருப்பநிலை அறிவிப்பு வேண்டுதலை "
-"அலட்சியப்படுத்து. எந்தவொரு MDNம் தானாக அனுப்பப்பட மாட்டாது "
-"(பரிந்துரைக்கப்படுகிறது).</li>"
-"<li><em>கேள்</em>:பயனர் அனுமதித்த பின் வேண்டுதலுக்கு பதிலளி. இவ்வழியில் சில் "
-"தேர்ந்தெடுக்கப்பட்ட செய்திகளுக்கு மட்டும் MDNகள் அனுப்பி, மற்றவர்களை "
-"அலட்சியப்படுத்தியோ, நிராகரிக்கவோ செய்யலாம்.</li>"
-"<li><em>நிராகரி</em>:எப்பொழுதும் <b>நிராகரிக்கப்பட்டது</b> "
-"அறிவிப்பை அனுப்பும். இது எப்போதும் MDN அனுப்பும் வழியைவிட <em>சிறிதே</em> "
-"சிறந்தது. அனுப்புநருக்கு செய்திகள் மேல் நடவடிக்கை எடுக்கப்பட்டது என்று "
-"தெரியும், ஆனால் அவரால் படிக்கப்பட்டதா அல்லது அழிக்கப்பட்டதா போன்றதை "
-"சொல்லமுடியாது.</li>"
-"<li><em>எப்பொழுதும் அனுப்பு</em> எப்பொழுதும் வேண்டப்பட்ட விருப்பநிலை அறிவிப்பு "
-"அனுப்பும்.  இதனால் அனுப்புநருக்கு எப்போது செய்தியின் மேல் நடவடிக்கை "
-"எடுக்கப்பட்டது என்பதை தவிர என்னவாயிற்று (காட்டப்பட்டது, அழிக்கப்பட்டது, "
-"போன்றவை). என்ற தகவலும் அறியப்படுத்தும். இந்த விரப்பம் வன்மையாக "
-"பயன்படுத்தக்கூடாது, ஆனால் பயனர் உறவு மேலாண்மை போன்ற காரணங்களுக்காக "
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>செய்தி விருப்பநிலை அறிவிப்பு கொள்கை</h3><p>MDNகள் பொதுவாக <b>படித்த ரசீது</"
+"b> என்றழைக்கப்படும் பொதுப்படுத்தல். இந்த விருப்பநிலை செய்தியை எழுதுபவர் அனுப்ப வேண்டி "
+"மற்றும் பெறுநரின் அஞ்சல் பயன்பாடு ஒரு பதிலை உருவாக்குகிறது, எழுதியவர் இச்செய்திக்கு "
+"என்னவாயிற்று என்பதை அறிந்து கொள்ள. பொது விருப்பநிலை வகைகள் <b>காட்சியளிக்கப்பட்டது</b> "
+"(அதாவது படிக்கப்படாது), <b>அழிக்கப்பட்டது</b>மற்றும் <b>அனுப்பப்பட்டது</b> (அதாவது "
+"முன்வழிக்கப்பட்டது).</p><p>Kஅஞ்சல் MDNகள் அனுப்ப கீழ்கண்ட விருப்பங்கள் இருக்கின்றன:</"
+"p><ul><li><em>அலட்சியப்படுத்து</em>: விருப்பநிலை அறிவிப்பு வேண்டுதலை "
+"அலட்சியப்படுத்து. எந்தவொரு MDNம் தானாக அனுப்பப்பட மாட்டாது (பரிந்துரைக்கப்படுகிறது).</"
+"li><li><em>கேள்</em>:பயனர் அனுமதித்த பின் வேண்டுதலுக்கு பதிலளி. இவ்வழியில் சில் "
+"தேர்ந்தெடுக்கப்பட்ட செய்திகளுக்கு மட்டும் MDNகள் அனுப்பி, மற்றவர்களை அலட்சியப்படுத்தியோ, "
+"நிராகரிக்கவோ செய்யலாம்.</li><li><em>நிராகரி</em>:எப்பொழுதும் <b>நிராகரிக்கப்பட்டது</"
+"b> அறிவிப்பை அனுப்பும். இது எப்போதும் MDN அனுப்பும் வழியைவிட <em>சிறிதே</em> "
+"சிறந்தது. அனுப்புநருக்கு செய்திகள் மேல் நடவடிக்கை எடுக்கப்பட்டது என்று தெரியும், ஆனால் "
+"அவரால் படிக்கப்பட்டதா அல்லது அழிக்கப்பட்டதா போன்றதை சொல்லமுடியாது.</"
+"li><li><em>எப்பொழுதும் அனுப்பு</em> எப்பொழுதும் வேண்டப்பட்ட விருப்பநிலை அறிவிப்பு "
+"அனுப்பும்.  இதனால் அனுப்புநருக்கு எப்போது செய்தியின் மேல் நடவடிக்கை எடுக்கப்பட்டது என்பதை "
+"தவிர என்னவாயிற்று (காட்டப்பட்டது, அழிக்கப்பட்டது, போன்றவை). என்ற தகவலும் அறியப்படுத்தும். "
+"இந்த விரப்பம் வன்மையாக பயன்படுத்தக்கூடாது, ஆனால் பயனர் உறவு மேலாண்மை போன்ற காரணங்களுக்காக "
 "கொடுக்கப்பட்டுள்ளது.</li></ul></qt>"
 
 #: configuredialog.cpp:3800
@@ -2487,15 +2443,14 @@ msgstr "இணையத்திலிருந்து வெளி இணை�
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>எச்சரிக்கை</b> மின்னஞ்சலில் HTML பயன், இப்போதிருக்கும் மற்றும் "
-"எதிர்பார்க்கப்பட்ட பாதுகாப்பு குறைபாடுகளால் உங்கள் அமைப்பை பாதிக்கலாம்.<a "
-"href=\"என்ன இது:%1\">HTML  மின்னஞ்சல்கள் பற்றி...</a> <a href=\"என்ன இது%2\">"
-"வெளி குறியீட்டுக்கள் பற்றி...</a>"
+"<b>எச்சரிக்கை</b> மின்னஞ்சலில் HTML பயன், இப்போதிருக்கும் மற்றும் எதிர்பார்க்கப்பட்ட "
+"பாதுகாப்பு குறைபாடுகளால் உங்கள் அமைப்பை பாதிக்கலாம்.<a href=\"என்ன இது:%1\">HTML  "
+"மின்னஞ்சல்கள் பற்றி...</a> <a href=\"என்ன இது%2\">வெளி குறியீட்டுக்கள் பற்றி...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2556,8 +2511,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<p><b>எச்சரிக்கை:</b> நிபந்தனையின்றி மதிப்புச் சான்றுகளை அனுப்புதல் உங்கள் "
-"பிரத்யேகத்தைப் பாதிக்கக்கலாம். <a href=\"whatsthis=\"இது என்ன?%1\">கூடுதல் </a>"
+"<p><b>எச்சரிக்கை:</b> நிபந்தனையின்றி மதிப்புச் சான்றுகளை அனுப்புதல் உங்கள் பிரத்யேகத்தைப் "
+"பாதிக்கக்கலாம். <a href=\"whatsthis=\"இது என்ன?%1\">கூடுதல் </a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2578,8 +2533,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "பதிலாள் இல்லை"
@@ -2608,8 +2562,8 @@ msgstr "காலம் கடந்த முக்கிய தகவல்க
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "படிக்காத அஞ்சல்களை தேட முயலும் போது"
 
@@ -2633,8 +2587,8 @@ msgstr "எல்லா அடைவுகளிலும் சுற்றி
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2716,27 +2670,22 @@ msgstr "அடைவுகள் (\"maildir\" வடிவம்)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>எந்த அஞ்சல் பெட்டி வடிவம் உள்ளமை ஆவணங்களுக்கு பயன்படும் என்பதை தேர்வு "
-"செய்கிறது:</p>"
-"<p><b>அபெட்டி:</b>KMail ன் அஞ்சல் ஆவணங்கள் ஒவ்வொன்றும் ஒரு கோப்பால் "
-"குறிப்பிடப்படும். தனி செய்திகள் \"அனுப்புநர்\" என்று ஆரம்பிக்கும் வரிகளால் "
-"பிரிக்கப்படுகிறது. இது வட்டில் இடம் சேமிக்கிறது, ஆனால் குறைந்த பலத்தை "
-"கொடுக்கலாம், உதாரணத்திற்கு செய்திகளை ஆவணங்களிடையே நகர்த்தும் பொழுது.</p>"
-"<p><b>அஞ்சல்அடைவு:</b>வட்டில் உண்மையான ஆவணங்கள் KMail  மின் ஆவணங்களை "
-"குறிக்கின்றன. தனி செய்தி தனி கோப்புகளாகும். கொஞ்சம் வட்டின் இடத்தை விரயம் "
-"செய்யலாம், ஆனால் அதிக பலத்தை கொடுக்கலாம், உதாரணத்திற்கு செய்திகளை ஆவணங்களிடையே "
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>எந்த அஞ்சல் பெட்டி வடிவம் உள்ளமை ஆவணங்களுக்கு பயன்படும் என்பதை தேர்வு செய்கிறது:</"
+"p><p><b>அபெட்டி:</b>KMail ன் அஞ்சல் ஆவணங்கள் ஒவ்வொன்றும் ஒரு கோப்பால் குறிப்பிடப்படும். "
+"தனி செய்திகள் \"அனுப்புநர்\" என்று ஆரம்பிக்கும் வரிகளால் பிரிக்கப்படுகிறது. இது வட்டில் "
+"இடம் சேமிக்கிறது, ஆனால் குறைந்த பலத்தை கொடுக்கலாம், உதாரணத்திற்கு செய்திகளை "
+"ஆவணங்களிடையே நகர்த்தும் பொழுது.</p><p><b>அஞ்சல்அடைவு:</b>வட்டில் உண்மையான ஆவணங்கள் "
+"KMail  மின் ஆவணங்களை குறிக்கின்றன. தனி செய்தி தனி கோப்புகளாகும். கொஞ்சம் வட்டின் இடத்தை "
+"விரயம் செய்யலாம், ஆனால் அதிக பலத்தை கொடுக்கலாம், உதாரணத்திற்கு செய்திகளை ஆவணங்களிடையே "
 "நகர்த்தும் பொழுது.</p></qt>."
 
 #: configuredialog.cpp:4679
@@ -2771,44 +2720,35 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>அடுத்த படிக்கப்படாத செய்திக்கு செல்லும் பொழுது, படிக்காத செய்திகள் எதுவும் "
-"இந்த செய்திக்கு கீழ் இல்லாமல் இருக்கலாம். </p>"
-"<p><b>சுற்ற வேண்டாம்</b>தேடுதல் இந்த ஆவணத்தின் கடைசி செய்தியில் நிற்கும்.</p>"
-"<p><b>இந்த ஆவணத்தில் சுற்று:</b> தேடுதல் செய்தி பட்டியலின் முதலிருந்து தொடரும், "
-"இன்னொரு ஆவணத்திற்கு போகாது.</p>"
-"<p><b>எல்லா ஆவணங்களையும் சுற்று:</b> தேடுதல் செய்தி பட்டியலின் முதலிருந்து "
-"தொடரும். படிக்கப்படாத செய்திகள் எதுவும் கண்டுபிடிக்கவில்லையென்றால் அடுத்த "
-"ஆவணத்திற்க்கு தொடரும்.</p>"
-"<p>அதே போல், முந்தய படிக்கப்படாத செய்திக்காக தேடும் பொழுது, தேடுதல் செய்தி "
-"பட்டியலில் அடியிலிருந்து தேடி ஆரம்பித்து, தேர்ந்த தேர்வைப் பொருத்து முந்தைய "
-"ஆவணத்தில் தொடரும்.</p></qt>."
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>அடுத்த படிக்கப்படாத செய்திக்கு செல்லும் பொழுது, படிக்காத செய்திகள் எதுவும் இந்த "
+"செய்திக்கு கீழ் இல்லாமல் இருக்கலாம். </p><p><b>சுற்ற வேண்டாம்</b>தேடுதல் இந்த ஆவணத்தின் "
+"கடைசி செய்தியில் நிற்கும்.</p><p><b>இந்த ஆவணத்தில் சுற்று:</b> தேடுதல் செய்தி பட்டியலின் "
+"முதலிருந்து தொடரும், இன்னொரு ஆவணத்திற்கு போகாது.</p><p><b>எல்லா ஆவணங்களையும் சுற்று:</"
+"b> தேடுதல் செய்தி பட்டியலின் முதலிருந்து தொடரும். படிக்கப்படாத செய்திகள் எதுவும் "
+"கண்டுபிடிக்கவில்லையென்றால் அடுத்த ஆவணத்திற்க்கு தொடரும்.</p><p>அதே போல், முந்தய "
+"படிக்கப்படாத செய்திக்காக தேடும் பொழுது, தேடுதல் செய்தி பட்டியலில் அடியிலிருந்து தேடி "
+"ஆரம்பித்து, தேர்ந்த தேர்வைப் பொருத்து முந்தைய ஆவணத்தில் தொடரும்.</p></qt>."
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2875,8 +2815,8 @@ msgstr "குழு அடைவுகளை மறை"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "இதை தேர்வு செய்வதால் IMAP அடைவுகளை கிளை அடைவில் காண முடியாது."
 
 #: configuredialog.cpp:4909
@@ -2887,8 +2827,8 @@ msgstr "&கணக்கில் உள்ள மூல ஆவணங்கள�
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "இதை தேர்வு செய்வதால் IMAP அடைவுகளை கிளை அடைவில் காண முடியாது."
 
 #: configuredialog.cpp:4921
@@ -2911,16 +2851,14 @@ msgstr "குழு செயல்பாடுகளை செயலாக்�
 
 #: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
-msgstr ""
-"பாரம்பரிய வகை: அனுப்புநர்:/பெறுநர்:அழைப்புகளுக்கு தலைப்புகளின் பதில்கள்."
+msgstr "பாரம்பரிய வகை: அனுப்புநர்:/பெறுநர்:அழைப்புகளுக்கு தலைப்புகளின் பதில்கள்."
 
 #: configuredialog.cpp:4949
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Outlook(tm) அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த விருப்பத்தை "
-"செயலாக்கு"
+"Outlook(tm) அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த விருப்பத்தை செயலாக்கு"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2931,8 +2869,7 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Outlook(tm) அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த விருப்பத்தை "
-"செயலாக்கு"
+"Outlook(tm) அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த விருப்பத்தை செயலாக்கு"
 
 #: configuredialog.cpp:4963
 #, fuzzy
@@ -2947,19 +2884,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "அவுட்லுக்கில் வேலை செய்யக்கூடிய இணைப்புப் பெயர்"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "தானாகவே அழைப்பிதழ் அனுப்புதல்"
@@ -2972,14 +2908,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -3088,17 +3024,16 @@ msgstr "வழியனுப்பப்பட்ட"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3116,15 +3051,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3193,8 +3128,8 @@ msgstr "அடையாளத்தை மாற்று"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3296,8 +3231,7 @@ msgstr ""
 
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
-msgstr ""
-" அடைவு%1ல் உள்ள  செய்திகள் காலாவதியாக முடியாது: சேரும் அடைவு %2-ஐ காணவில்லை"
+msgstr " அடைவு%1ல் உள்ள  செய்திகள் காலாவதியாக முடியாது: சேரும் அடைவு %2-ஐ காணவில்லை"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3453,6 +3387,11 @@ msgstr "அடைவை தேர்ந்தெடு"
 msgid "Filters"
 msgstr "வடிகட்டி %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "&அனைத்து செய்திகளையும் தேர்வுசெய்"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3484,10 +3423,9 @@ msgstr "&பதிவேடு வடிகட்டி செயல்கள்
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
-msgstr ""
-"பதிவு தரம் அனைத்தையும் சேகரிக்கும் மற்றும் காட்சிகள் அனைத்தையும் காட்டும்"
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
+msgstr "பதிவு தரம் அனைத்தையும் சேகரிக்கும் மற்றும் காட்சிகள் அனைத்தையும் காட்டும்"
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3503,13 +3441,14 @@ msgstr "பதிவேடு வடிகட்டியின் விதி
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"இதற்கு காரணம் உங்களுக்கு இதை செய்ய உங்களுக்கு அனுமதி இல்லாமல் இருக்கலாம்.  "
-"சேவையகம் கொடுக்கும் பிழை செய்தி:"
+"இதற்கு காரணம் உங்களுக்கு இதை செய்ய உங்களுக்கு அனுமதி இல்லாமல் இருக்கலாம்.  சேவையகம் "
+"கொடுக்கும் பிழை செய்தி:"
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3529,10 +3468,10 @@ msgstr "எண்ணிலடங்காத"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "குழாய்வழிப்படுதலுக்கு ஆதரவில்லாத POP3 சேவையகங்கள் பாதிக்கப்பட்ட மின்னஞ்சல்களை "
 "அனுப்பலாமென்பதை கவனத்தில் கொள்க. \n"
@@ -3547,7 +3486,7 @@ msgstr ""
 "கோப்பினை எழுத முடியவில்லை %1:\n"
 "\"%2\" தான் விரிவான பிழை விவரம் ."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Kஅஞ்சல் பிழை"
@@ -3603,13 +3542,13 @@ msgstr "பயனர் அடையாளம்"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3660,11 +3599,11 @@ msgstr "நீங்கள் குப்பை கோப்புரையை
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"விவரம் இதுவரை சேவையகத்திலிருந்து நீக்கப்படவில்லை,  தயவுசெய்து \"அஞ்சலை "
-"சரிபார்\"ரை பயன்படுத்தவும்."
+"விவரம் இதுவரை சேவையகத்திலிருந்து நீக்கப்படவில்லை,  தயவுசெய்து \"அஞ்சலை சரிபார்\"ரை "
+"பயன்படுத்தவும்."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3674,8 +3613,7 @@ msgstr "பிழை: IMAPயின் கணக்கு இந்த ஆவண
 msgid "Connecting to server %1, please wait..."
 msgstr " %1 சேவையகத்துக்கு இணைக்கப்படுகிறது, தயவு செய்து காக்கவும்..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "%1 இன் சேவையகத்துக்கு இணைக்கப்படுவதில் பிழை."
@@ -3683,8 +3621,7 @@ msgstr "%1 இன் சேவையகத்துக்கு இணைக்�
 #: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr ""
-"இந்த IMAP சேவையகம் செயல்படும் கட்டுப்பாடு பட்டியல்களின் செயல்பாட்டிற்கு ஆதரவு "
-"இல்லை (ACL)"
+"இந்த IMAP சேவையகம் செயல்படும் கட்டுப்பாடு பட்டியல்களின் செயல்பாட்டிற்கு ஆதரவு இல்லை (ACL)"
 
 #: folderdiaacltab.cpp:524
 #, c-format
@@ -3705,11 +3642,11 @@ msgstr "அனுமதிகளை சேர்"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"இந்த அடைவிற்கான உங்களது அனுமதியை நீங்கள் நீக்க வேண்டுமா? பிறகு உங்களால் "
-"மீண்டும் இயக்க முடியாது."
+"இந்த அடைவிற்கான உங்களது அனுமதியை நீங்கள் நீக்க வேண்டுமா? பிறகு உங்களால் மீண்டும் இயக்க "
+"முடியாது."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3740,7 +3677,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "அடைவை தேர்ந்தெடு"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "உள்ளமை அடைவுகள்"
@@ -3766,9 +3703,9 @@ msgstr "அடைவுக்கான குறுக்குவழியை�
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3789,11 +3726,20 @@ msgstr "நிறுத்தப்பட்டது"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "தெரியாத"
@@ -3914,69 +3860,17 @@ msgstr "வேண்டாத மின்னஞ்சல் நிலை:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3988,19 +3882,13 @@ msgstr "& உன் பெயர்:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>உங்கள் பெயர்</h3>"
-"<p>இந்த புலத்தில் உங்கள் பெயர் இருக்க வேண்டும், அது வெளியேறும் மின்னஞ்சலின் "
-"தலைப்பில் தெரியும்.</p>"
-"<p>இது காலியாக இருந்தால், உங்கள் பெயர் தெரியாது, மின்னஞ்சல் முகவரி மட்டுமே "
-"தெரியும்.</p></qt>."
+"<qt><h3>உங்கள் பெயர்</h3><p>இந்த புலத்தில் உங்கள் பெயர் இருக்க வேண்டும், அது வெளியேறும் "
+"மின்னஞ்சலின் தலைப்பில் தெரியும்.</p><p>இது காலியாக இருந்தால், உங்கள் பெயர் தெரியாது, "
+"மின்னஞ்சல் முகவரி மட்டுமே தெரியும்.</p></qt>."
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4008,17 +3896,13 @@ msgstr "நிறுவனம் "
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>நிறுவனம்</h3>"
-"<p>இந்த புலத்தில் உங்கள் நிறுவனத்தின் பெயர் இருக்க வேண்டும்,  மின்னஞ்சலின் "
-"தலைப்பில் தெரியவேண்டுமென்றால்.</p>"
-"<p>இதை வெற்றாக விட்டுவிடுவது பாதுகாப்பு (வழக்கம் கூட)</p></qt>"
+"<qt><h3>நிறுவனம்</h3><p>இந்த புலத்தில் உங்கள் நிறுவனத்தின் பெயர் இருக்க வேண்டும்,  "
+"மின்னஞ்சலின் தலைப்பில் தெரியவேண்டுமென்றால்.</p><p>இதை வெற்றாக விட்டுவிடுவது பாதுகாப்பு "
+"(வழக்கம் கூட)</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4027,19 +3911,14 @@ msgstr "மின்அஞ்சல் முகவரி:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>மின்னஞ்சல் முகவரி</h3>"
-"<p>இந்தப் புலத்தில் உங்கள் முழு மின்னஞ்சல் முகவரி இருக்க வேண்டும்.</p>"
-"<p>இது வெற்றாகவோ, தவறாகவோ இருந்தால், மக்கள் உங்களுக்கு பதிலளிப்பதில் "
+"<qt><h3>மின்னஞ்சல் முகவரி</h3><p>இந்தப் புலத்தில் உங்கள் முழு மின்னஞ்சல் முகவரி இருக்க "
+"வேண்டும்.</p><p>இது வெற்றாகவோ, தவறாகவோ இருந்தால், மக்கள் உங்களுக்கு பதிலளிப்பதில் "
 "சிரமப்படுவார்கள்.</p></qt>"
 
 #: identitydialog.cpp:165
@@ -4049,21 +3928,12 @@ msgstr "மின்அஞ்சல் முகவரி:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4083,25 +3953,21 @@ msgstr "Your OpenPGP Signature Key"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"திறPGP விசையை தேர்வு செய் அது நவீன முறையில் உங்கள் தகவலை கையெழுத்திட "
-"பயன்படுத்த."
+"திறPGP விசையை தேர்வு செய் அது நவீன முறையில் உங்கள் தகவலை கையெழுத்திட பயன்படுத்த."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், "
-"உங்களுக்கே செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG "
-"சாவிகளையும் நீங்கள் உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் "
-"Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் "
-"செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் <a>http://www.gnupg.org</a>"
-"அறியலாம்</qt>."
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், உங்களுக்கே "
+"செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG சாவிகளையும் நீங்கள் "
+"உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு "
+"கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் "
+"<a>http://www.gnupg.org</a>அறியலாம்</qt>."
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4113,30 +3979,26 @@ msgstr "நீங்கள் PGPவிசை திற "
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "OpenPGP விசையை தேர்ந்தெடு அது கண்டிப்பாக தானாக மற்றும் \"எண் பொது விசையை இணை\" "
 "பண்புகளை தொகுப்பியில் தேர்ந்தெடுக்கவும்."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், "
-"உங்களுக்கே செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG "
-"சாவிகளையும் நீங்கள் உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் "
-"Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் "
-"செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் <a>http://www.gnupg.org</a>"
-"அறியலாம்</qt>."
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், உங்களுக்கே "
+"செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG சாவிகளையும் நீங்கள் "
+"உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு "
+"கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் "
+"<a>http://www.gnupg.org</a>அறியலாம்</qt>."
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4150,24 +4012,20 @@ msgstr "பிழை: கையொப்பம் சரிப்பார்க
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
-msgstr ""
-"S/MIME சான்றிதழ் அவை கண்டிப்பாக இலக்க முறையாக உங்கள் செய்திகளை தேர்ந்தெடு."
+msgstr "S/MIME சான்றிதழ் அவை கண்டிப்பாக இலக்க முறையாக உங்கள் செய்திகளை தேர்ந்தெடு."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், "
-"உங்களுக்கே செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG "
-"சாவிகளையும் நீங்கள் உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் "
-"Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் "
-"செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் <a>http://www.gnupg.org</a>"
-"அறியலாம்</qt>."
+"<qt><p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், உங்களுக்கே "
+"செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG சாவிகளையும் நீங்கள் "
+"உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு "
+"கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் "
+"<a>http://www.gnupg.org</a>அறியலாம்</qt>."
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4179,28 +4037,25 @@ msgstr "உங்களின் S/MIME மறையாக்க சான்ற
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், "
-"உங்களுக்கே செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG "
-"சாவிகளையும் நீங்கள் உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் "
-"Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் "
-"செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் <a>http://www.gnupg.org</a>"
-"அறியலாம்</qt>."
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
+msgstr ""
+"<qt><p>நீங்கள் இங்கு தேர்ந்தெடுத்த OpenPGP சாவி, செய்திகளை கையெழுத்திடவும், உங்களுக்கே "
+"செய்திகள் மறைக்குறீயிட்டவும் உபயோகப்படுத்தப்படும்.  க்னூPG சாவிகளையும் நீங்கள் "
+"உபயோகப்படுத்தலாம். </p>இதை வெற்றாக விடலாம், ஆனால் Kமின்னஞ்சலால் செய்திகளை மறைக்குறியீட்டு "
+"கையெழுத்திட முடியாது. வழக்கமான அஞ்சல் செயல்கள் பாதிக்கப்படாது</p>சாவிகள் பற்றி மேலும் "
+"<a>http://www.gnupg.org</a>அறியலாம்</qt>."
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4220,25 +4075,19 @@ msgstr "அஞ்சலுக்கு பதில்"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>பதிலளிக்க வேண்டிய முகவரிகள்</h3>"
-"<p>இது<tt> பதிலளிக்க வேண்டிய முகவரி</tt>அமைவை <tt>அனுப்புநர்:</tt> "
-"முகவரியின்றி வேறொரு மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் தலைப்பில் இருக்கும்படி "
-"செய்யும். </p>"
-"<p>இது ஒரே பணியை ஒரு குழுவினர் சேர்ந்து ஆற்றிக் கொண்டிருந்தால் உபயோகமாக "
-"இருக்கும். உதாரணத்திற்கு, அனுப்பப்பட்ட மின்னஞ்சல்களின் <tt>அனுப்புநர்</tt> "
-"புலத்தில் உங்கள் மின்னஞ்சல் முகவரியும், வரும் பதில்கள் குழு முகவரிக்கு போக "
-"வைக்கலாம். </p>"
-"<p>சந்தேகமிருந்தால், இந்த புலத்தை வெற்றாக விடவும்.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>பதிலளிக்க வேண்டிய முகவரிகள்</h3><p>இது<tt> பதிலளிக்க வேண்டிய முகவரி</"
+"tt>அமைவை <tt>அனுப்புநர்:</tt> முகவரியின்றி வேறொரு மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் "
+"தலைப்பில் இருக்கும்படி செய்யும். </p><p>இது ஒரே பணியை ஒரு குழுவினர் சேர்ந்து ஆற்றிக் "
+"கொண்டிருந்தால் உபயோகமாக இருக்கும். உதாரணத்திற்கு, அனுப்பப்பட்ட மின்னஞ்சல்களின் "
+"<tt>அனுப்புநர்</tt> புலத்தில் உங்கள் மின்னஞ்சல் முகவரியும், வரும் பதில்கள் குழு முகவரிக்கு "
+"போக வைக்கலாம். </p><p>சந்தேகமிருந்தால், இந்த புலத்தை வெற்றாக விடவும்.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4246,25 +4095,19 @@ msgstr "&BCC முகவரிகள்:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4304,7 +4147,7 @@ msgstr "&கையொப்பம்:"
 msgid "&Picture"
 msgstr "&படம்"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "செல்லாத மின்னஞ்சல் முகவரி"
 
@@ -4327,11 +4170,11 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"கட்டமைக்கப்பட்ட OpenPGP மறையாக்க விசைகள் பயனர் அடையாளத்தை மின்னஞ்சல் முகவரியோடு "
-"இந்த அடையாளத்திற்காக கட்டமைக்கப்படவில்லை (%1)."
+"கட்டமைக்கப்பட்ட OpenPGP மறையாக்க விசைகள் பயனர் அடையாளத்தை மின்னஞ்சல் முகவரியோடு இந்த "
+"அடையாளத்திற்காக கட்டமைக்கப்படவில்லை (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4340,8 +4183,8 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"ஒரு கட்டமைக்கப்பட்ட S/MIME கையெழுத்து சான்றிதழில் கட்டமைக்கப்பட்ட மின்னஞ்சல் "
-"முகவரி அடையாளத்திற்காக இருக்காது (%1).\n"
+"ஒரு கட்டமைக்கப்பட்ட S/MIME கையெழுத்து சான்றிதழில் கட்டமைக்கப்பட்ட மின்னஞ்சல் முகவரி "
+"அடையாளத்திற்காக இருக்காது (%1).\n"
 "இது கட்டமைப்பு உருவாக்கிய கையெழுத்தை பரிசோதிக்கும் போது எச்சரிக்கை செய்தியை பெற "
 "விளைவிக்கும்."
 
@@ -4350,8 +4193,8 @@ msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"ஒரு கட்டமைக்கப்பட்ட S/MIME கையெழுத்து சான்றிதழில் கட்டமைக்கப்பட்ட மின்னஞ்சல் "
-"முகவரி அடையாளத்திற்காக இருக்காது (%1)."
+"ஒரு கட்டமைக்கப்பட்ட S/MIME கையெழுத்து சான்றிதழில் கட்டமைக்கப்பட்ட மின்னஞ்சல் முகவரி "
+"அடையாளத்திற்காக இருக்காது (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4370,16 +4213,16 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் அனுப்பிய-அஞ்சல் ஆவணம் இல்லை (இப்போது). "
-"ஆகையால் முன்னிருப்பு அனுப்பிய-அஞ்சல் ஆவணம் உபயோகப்படுத்தப்படும்."
+"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் அனுப்பிய-அஞ்சல் ஆவணம் இல்லை (இப்போது). ஆகையால் "
+"முன்னிருப்பு அனுப்பிய-அஞ்சல் ஆவணம் உபயோகப்படுத்தப்படும்."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் வரைவு ஆவணம் இல்லை (இப்போது). ஆகையால் "
-"முன்னிருப்பு வரைவு ஆவணம் உபயோகப்படுத்தப்படும்."
+"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் வரைவு ஆவணம் இல்லை (இப்போது). ஆகையால் முன்னிருப்பு "
+"வரைவு ஆவணம் உபயோகப்படுத்தப்படும்."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4387,13 +4230,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் வரைவு ஆவணம் இல்லை (இப்போது). ஆகையால் "
-"முன்னிருப்பு வரைவு ஆவணம் உபயோகப்படுத்தப்படும்."
+"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் வரைவு ஆவணம் இல்லை (இப்போது). ஆகையால் முன்னிருப்பு "
+"வரைவு ஆவணம் உபயோகப்படுத்தப்படும்."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1(முன்னிருப்பு)."
 
@@ -4407,9 +4250,7 @@ msgstr "மின்னஞ்சல் முகவரி"
 
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
-msgstr ""
-"அஞ்சல் பெட்டியை அணுக நீங்கள் ஒரு பயனர் பெயர் மற்றும் கடவுச்சொல்லாவது தர "
-"வேண்டும்."
+msgstr "அஞ்சல் பெட்டியை அணுக நீங்கள் ஒரு பயனர் பெயர் மற்றும் கடவுச்சொல்லாவது தர வேண்டும்."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4441,14 +4282,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4464,8 +4305,7 @@ msgstr "செய்தியை மேலேற்றும் போது
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
-msgstr ""
-"அடைவு %2 ல் உள்ள %3 என்ற URL உடைய அஞ்சல் %1ஐ சேவையகத்தை மேலேற்ற முடியவில்லை."
+msgstr "அடைவு %2 ல் உள்ள %3 என்ற URL உடைய அஞ்சல் %1ஐ சேவையகத்தை மேலேற்ற முடியவில்லை."
 
 #: imapaccountbase.cpp:888
 #, fuzzy
@@ -4488,14 +4328,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "பிழை: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4646,14 +4491,14 @@ msgstr "பட்டியலின் கருவூலம் "
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4682,221 +4527,179 @@ msgstr "பயன்படுத்தாத மறைகுறீயிடு �
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p> %n நாளுக்குள் காலாவதியாகும்.</p>"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p> %n நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p> %n நாளுக்குள் காலாவதியாகும்.</p>"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p> %n நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (serial number %2)</p><p>ஒரு "
+"நாளுக்குள் காலாவதியாகும்.</p>\n"
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (serial number %2)</p><p>%n "
+"நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME மறையாக்க "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளுக்குள் "
+"காலாவதியாகிறது.</p>\n"
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME மறையாக்க "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளுக்குள் "
+"காலாவதியாகிறது.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>ஒரு நாளிள் காலாவதியாகும்.</p>\n"
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>%n நாளிள் காலாவதியாகும்.</p>"
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME சான்றிதழுக்காக</p><p "
+"align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளிள் காலாவதியாகும்.</p>\n"
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME சான்றிதழுக்காக</p><p "
+"align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளிள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளில் காலாவதியாகும்.</p>\n"
-"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளில் காலாவதியாகும்.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளில் "
+"காலாவதியாகும்.</p>\n"
+"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளில் "
+"காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p> நாளுக்குள் காலாவதியாகும்.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME மறையாக்க "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளுக்குள் "
+"காலாவதியாகும்.</p>\n"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் "
+"%2)</p><p>%n நாளுக்குள் காலாவதியாகும்.</p> நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p>/p>"
+"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளுக்குள் "
+"காலாவதியாகும்.</p>\n"
+"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளுக்குள் "
+"காலாவதியாகும்.</p>/p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p>"
+"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
+"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>%n நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4910,211 +4713,169 @@ msgstr "S/MIME விரைவில் காலாவதியாகும்"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p> %n நாளுக்குள் காலாவதியாகும்.</p>"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p> %n நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
-"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p> %n நாளுக்குள் காலாவதியாகும்.</p>"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>ஒரு நாளைக்குள் காலாவதியாகிவிடும்.</p>\n"
+"<p>உங்கள் OpenPGP கையெழுத்து விசை</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p> %n நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (serial number %2)</p><p>ஒரு "
+"நாளுக்குள் காலாவதியாகும்.</p>\n"
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (serial number %2)</p><p>%n "
+"நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME மறையாக்க "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளுக்குள் "
+"காலாவதியாகிறது.</p>\n"
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME மறையாக்க "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளுக்குள் "
+"காலாவதியாகிறது.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>ஒரு நாளிள் காலாவதியாகும்.</p>\n"
-"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>%n நாளிள் காலாவதியாகும்.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME சான்றிதழுக்காக</p><p "
+"align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளிள் காலாவதியாகும்.</p>\n"
+"<p>மூல சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME சான்றிதழுக்காக</p><p "
+"align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளிள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளில் காலாவதியாகும்.</p>\n"
-"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளில் காலாவதியாகும்.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளில் "
+"காலாவதியாகும்.</p>\n"
+"<p>உடனடி CA சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME கையெழுத்து "
+"சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளில் "
+"காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:799
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p> நாளுக்குள் காலாவதியாகும்.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p><p>உங்கள் S/MIME மறையாக்க "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளுக்குள் "
+"காலாவதியாகும்.</p>\n"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் "
+"%2)</p><p>%n நாளுக்குள் காலாவதியாகும்.</p> நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p>"
-"<p> S/MIME சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p>/p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>ஒரு நாளுக்குள் "
+"காலாவதியாகும்.</p>\n"
+"<p>இடைமுக CA சான்றிதழ்</p><p align=center><b>%3</b></p><p> S/MIME "
+"சான்றிதழுக்காக</p><p align=center><b>%1</b> (வரிசை எண் %2)</p><p>%n நாளுக்குள் "
+"காலாவதியாகும்.</p>/p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
-"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகும்.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>ஒரு நாளுக்குள் காலாவதியாகும்.</p>\n"
+"<p>உங்கள் S/MIME கையெழுத்து சான்றிதழ்</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>%n நாளுக்குள் காலாவதியாகும்.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
-"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> "
-"(வரிசை எண் %2)</p>"
-"<p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>ஒரு நாளுக்குள் காலாவதியாகிறது.</p>\n"
+"<p>உங்கள் S/MIME மறையாக்க சான்றிதழ்</p><p align=center><b>%1</b> (வரிசை எண் %2)</"
+"p><p>%n நாளுக்குள் காலாவதியாகிறது.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5126,18 +4887,18 @@ msgstr "S/MIME விரைவில் காலாவதியாகும்"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"உங்கள் கட்டமைக்கப்பட்ட OpenPGP மறையாக்க விசைகள் ஒன்று அல்லது அதிகம் அல்லது "
-"S/MIME சான்றிதழ் மறையாக்கத்திற்கு பயன்படும். தயவுசெய்து உங்கள் மறையாக்க விசை "
-"மற்றும் சான்றிதழ் அடையாளத்திற்காக அடையாள கட்டமைப்பு உரையாடலுக்கு திரும்ப "
-"கட்டமைக்கவும்.\n"
-"நீங்கள் தொடர தேர்வு செய்தால், மற்றும் விசைகள் திரும்ப தேவைப்பட்டால், நீங்கள் "
-"விசையை பயன்படுத்த மேம்படுத்தப்படுவர்."
+"உங்கள் கட்டமைக்கப்பட்ட OpenPGP மறையாக்க விசைகள் ஒன்று அல்லது அதிகம் அல்லது S/MIME "
+"சான்றிதழ் மறையாக்கத்திற்கு பயன்படும். தயவுசெய்து உங்கள் மறையாக்க விசை மற்றும் சான்றிதழ் "
+"அடையாளத்திற்காக அடையாள கட்டமைப்பு உரையாடலுக்கு திரும்ப கட்டமைக்கவும்.\n"
+"நீங்கள் தொடர தேர்வு செய்தால், மற்றும் விசைகள் திரும்ப தேவைப்பட்டால், நீங்கள் விசையை பயன்படுத்த "
+"மேம்படுத்தப்படுவர்."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5165,26 +4926,26 @@ msgstr "பயன்படுத்தாத குறியீடு விச�
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5195,8 +4956,8 @@ msgstr "OpenPGP-கையெழுத்து இல்லை"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5212,8 +4973,8 @@ msgid ""
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
-"பெறுநரின் கையொப்பம் என்பது அவர் செய்தியினைக் கேட்க விரும்புகிறாரா அல்லது "
-"கையொப்பமிட விரும்புகிறாரா என்னும் முன்னுரிமையின் தகவல்கலைக் குறிப்பிடுகிறது.\n"
+"பெறுநரின் கையொப்பம் என்பது அவர் செய்தியினைக் கேட்க விரும்புகிறாரா அல்லது கையொப்பமிட "
+"விரும்புகிறாரா என்னும் முன்னுரிமையின் தகவல்கலைக் குறிப்பிடுகிறது.\n"
 "இச்செய்தியைக் கையொப்பமிடு?"
 
 #: keyresolver.cpp:1335
@@ -5223,11 +4984,11 @@ msgstr "ஒப்பிடுதலின் பயன்பாடு"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"தங்களுக்கான மறைவிடக்க விசையைத் தேர்ந்தெடுக்க இயலாது(தனக்காக மறைவிடக்கு). "
-"தாங்கள் மறைவிடக்கமாக்கினால் தங்களால் அவற்றை காண இயலாது."
+"தங்களுக்கான மறைவிடக்க விசையைத் தேர்ந்தெடுக்க இயலாது(தனக்காக மறைவிடக்கு). தாங்கள் "
+"மறைவிடக்கமாக்கினால் தங்களால் அவற்றை காண இயலாது."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5248,11 +5009,11 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
@@ -5298,11 +5059,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 ": தங்களின் மொழியில் சில சமயத்தில் விசைகள் இல்லையெனில் தயவுச் செய்து பன்மையினை "
 "மொழிப்பெயர்க்கும் பொழுது பயன்படுத்தவும்.\n"
@@ -5355,10 +5116,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "சிக்கலான பிழை: அஞ்சல் சேகரிக்க முடியவில்லை:லை?)"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"செய்தியை சேர்க்க முடியவில்லை:\n"
+msgid "Failed to add message:\n"
+msgstr "செய்தியை சேர்க்க முடியவில்லை:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5402,9 +5161,7 @@ msgstr "தகவலை நகர்த்து %3  யில்  %2  இரு
 
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
-msgstr ""
-"<qt>அஞ்சல்பெட்டி <b>%1</b> லிருந்து அஞ்சலை நீக்க முடியவில்லை:"
-"<br>%2</qt>"
+msgstr "<qt>அஞ்சல்பெட்டி <b>%1</b> லிருந்து அஞ்சலை நீக்க முடியவில்லை:<br>%2</qt>"
 
 #: kmacctlocal.cpp:255
 #, fuzzy
@@ -5451,6 +5208,50 @@ msgstr "&IMAP  இணைக்க முடியவில்லை"
 msgid "&Maildir mailbox"
 msgstr "&Maildir அஞ்சல் பொட்டி"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "செய்தியின் பொருளை அமை"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "CC யை 'முகவரிக்கு'  அனுப்பு"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "BBC யை அனுப்பு: 'முகவரி' க்கு"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "செய்திக்கு 'தலைப்பு' சேர்க்கவும்"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "கோப்பிலிருந்து செய்தியின் கருத்தைப் படி."
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "செய்தியின் கருத்தை அமை"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "ஒரு இணைப்பை அஞ்சலுடன் சேர்க்கவும். இது மறுபடியும் செய்யப்படும்."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "புதிய அஞ்சலை மட்டும் பரிசோதி"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "உருவாக்கி சாளரத்தை மட்டும் திற"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "கொடுக்கப்பட்ட செய்தி கோப்பை பார்"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "செய்தியை 'முகவரி'க்கு அனுப்பு. 'URL' காட்டும் இடத்தில் கோப்பை இணை."
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "அஞ்சல்"
@@ -5495,9 +5296,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"IMAP மூலத்திற்க்கு %1 ன் உப ஆவணங்களாக Kஅஞ்சல் வேண்டிய ஆவணங்களை உருவாக்கும். "
-"உங்களுக்கு இது தேவையில்லையென்றால் \"வேண்டாம்\" என அழுத்தவும், IMAP மூலம் "
-"செயலிழக்கச் செய்யப்படும்."
+"IMAP மூலத்திற்க்கு %1 ன் உப ஆவணங்களாக Kஅஞ்சல் வேண்டிய ஆவணங்களை உருவாக்கும். உங்களுக்கு "
+"இது தேவையில்லையென்றால் \"வேண்டாம்\" என அழுத்தவும், IMAP மூலம் செயலிழக்கச் செய்யப்படும்."
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5510,13 +5310,12 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
-"IMAP மூலத்திற்க்கு %1 ன் உப ஆவணங்களாக Kஅஞ்சல் வேண்டிய ஆவணங்களை உருவாக்கும். "
-"உங்களுக்கு இது தேவையில்லையென்றால் \"வேண்டாம்\" என அழுத்தவும், IMAP மூலம் "
-"செயலிழக்கச் செய்யப்படும்."
+"IMAP மூலத்திற்க்கு %1 ன் உப ஆவணங்களாக Kஅஞ்சல் வேண்டிய ஆவணங்களை உருவாக்கும். உங்களுக்கு "
+"இது தேவையில்லையென்றால் \"வேண்டாம்\" என அழுத்தவும், IMAP மூலம் செயலிழக்கச் செய்யப்படும்."
 
 #: kmailicalifaceimpl.cpp:1802
 #, fuzzy
@@ -5534,14 +5333,12 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:2019
 msgid "You do not have read/write permission to your %1 folder."
-msgstr ""
-"%1 அடைவுக்கு வாசிக்க மற்றும் எழுத உங்களுக்கு அனுமதிகள் கொடுக்கப்படவில்லை."
+msgstr "%1 அடைவுக்கு வாசிக்க மற்றும் எழுத உங்களுக்கு அனுமதிகள் கொடுக்கப்படவில்லை."
 
 #: kmailicalifaceimpl.cpp:2073
 #, fuzzy
 msgid "You do not have read/write permission to your folder."
-msgstr ""
-"%1 அடைவுக்கு வாசிக்க மற்றும் எழுத உங்களுக்கு அனுமதிகள் கொடுக்கப்படவில்லை."
+msgstr "%1 அடைவுக்கு வாசிக்க மற்றும் எழுத உங்களுக்கு அனுமதிகள் கொடுக்கப்படவில்லை."
 
 #: kmcommands.cpp:304
 msgid "Please wait"
@@ -5568,11 +5365,11 @@ msgstr "பிடிபலகைக்கு URL நகலாக்கப்ப�
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>கோப்பு <b>%1</b> ஏற்கனவே உள்ளது.<br>அதன் மேல் எழுதவா?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "கோப்பில் சேமிக்கவும்"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "மேலெழுது"
 
@@ -5590,7 +5387,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5608,14 +5405,13 @@ msgstr "கோப்பில் ஒரு செய்தியும் இல
 
 #: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
-msgstr ""
-"கோப்பில் பல செய்திகள் உள்ளன. முதல் செய்தி மட்டும் காண்பிக்கப்பட்டுள்ளது"
+msgstr "கோப்பில் பல செய்திகள் உள்ளன. முதல் செய்தி மட்டும் காண்பிக்கப்பட்டுள்ளது"
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5624,121 +5420,121 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "நீக்கப்பட்ட செய்திகள்"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "தகவலை நகர்த்து %3  யில்  %2  இருந்து %1 ."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "வட்டில் தேவையான காலி இடம் இல்லை?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "இந்த அடைவுக்கு நகர்த்துக"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "இந்த அடைவுக்கு நகல் எடுக்கவும்"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Moving messages failed."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "நீக்கப்பட்ட செய்திகள்"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL திறக்கப்படுகிறது"
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt><b>%1</b>ஐ இயக்குவதை உறுதி செய்யவும்?</qt>தியை நீக்க தயாரா?"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "கட்டளையை இயக்கு"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "சேமிக்க இணைப்புகளெதுவும் கண்டுப்பிடிக்கப்படவில்லை"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "இணைப்புகளை இப்படி சேமி"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "þ¨½ôÒ 1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "þ¨½ôÒ. %1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "கோப்பு %1 ஏற்கனவே உள்ளது. அதன் மேல் எழுதவா?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "கோப்பு முன்பே உள்ளது"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&மேல்எழுது"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"செய்தியின் இந்த %1 பகுதி மறைகுறியீட்டப்பட்டிருக்கிறது. சேமிக்கு பொழுது "
-"மறைக்குறியீட்டை வைத்து கொள்ள விரும்புகிறீர்களா?."
+"செய்தியின் இந்த %1 பகுதி மறைகுறியீட்டப்பட்டிருக்கிறது. சேமிக்கு பொழுது மறைக்குறியீட்டை "
+"வைத்து கொள்ள விரும்புகிறீர்களா?."
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "கேமெயில் கேள்வி"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "மறையாக்கம்"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "மொழிபெயர்க்க வேண்டாம்"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
-"செய்தியின் இந்த பகுதி %1 கையெழுத்திடப்பட்டிருக்கிறது. சேமிக்கு பொழுது "
-"கையெழுத்தை வைத்து கொள்ள விரும்புகிறீர்களா?."
+"செய்தியின் இந்த பகுதி %1 கையெழுத்திடப்பட்டிருக்கிறது. சேமிக்கு பொழுது கையெழுத்தை "
+"வைத்து கொள்ள விரும்புகிறீர்களா?."
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "கையொப்பம்"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5747,86 +5543,86 @@ msgstr ""
 "கோப்பினை எழுதழுடியாது%1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "%1கோப்பை எழுதமுடியாது"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Encryption Key Selection"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "அஞ்சல்"
@@ -5925,7 +5721,7 @@ msgstr "அளவு"
 msgid "Encoding"
 msgstr "குறியீட்டாக்கம்"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "அழுத்துதல்"
 
@@ -5937,7 +5733,7 @@ msgstr "மறையாக்கம்"
 msgid "Sign"
 msgstr "குறி"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "இணைப்பின் பெயர்:"
 
@@ -5959,7 +5755,8 @@ msgstr "முதல் பெறுநர்கள்"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5969,9 +5766,9 @@ msgstr ""
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5980,12 +5777,11 @@ msgstr "மறைந்த பெறுநர்கள்"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>உண்மையிலே சரியானதாக இருக்கும்<b>Copy To:</b>.</qt>"
-"இந்த நகலும் உண்மையிலே சரியானதாக இருக்கும்</qt>"
+"<qt>உண்மையிலே சரியானதாக இருக்கும்<b>Copy To:</b>.</qt>இந்த நகலும் உண்மையிலே "
+"சரியானதாக இருக்கும்</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
@@ -5997,7 +5793,7 @@ msgstr "&அஞ்சல் அனுப்பு"
 msgid "&Send Mail Via"
 msgstr "&அஞ்சல் அனுப்பு"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&பிறகு அனுப்பு"
@@ -6065,8 +5861,7 @@ msgstr "மேற்கோள் எழுத்துக்களை நீக�
 msgid "Cl&ean Spaces"
 msgstr "இடைவெளியைத் துடை"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "நிலையான எழுத்துருவை பயன்படுத்துக."
@@ -6209,31 +6004,31 @@ msgstr "&பாதுகாக்கப்படாத செய்தி வட
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "நிலையான"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "அடையாள குறி பட்டியல் (வட்டு)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "அடையாள குறி பட்டியல்(வட்டம்)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "அடையாள குறி பட்டியல்(சதுரம்)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "வரிசை பட்டியல் (பதின்மம்)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "வரிசை பட்டியல் (தொடக்கத்தின் கீழ்)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "வரிசை பட்டியல்((தொடக்கத்தின் மேல்)"
 
@@ -6337,61 +6132,61 @@ msgstr "அமைப்பாளரை மூடு"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"நீங்கள் உருவாக்கிய செய்தி ஒரு இணைப்பு பற்றி கூறுவது போலிருக்கிறது, ஆனால் "
-"நீங்கள் எதையும் இணைக்கவில்லை\n"
+"நீங்கள் உருவாக்கிய செய்தி ஒரு இணைப்பு பற்றி கூறுவது போலிருக்கிறது, ஆனால் நீங்கள் எதையும் "
+"இணைக்கவில்லை\n"
 "உங்கள் செய்தியுடன் கோப்பு ஏதும் இணைக்க வேண்டுகிறீர்களா?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "கோப்பு இணைப்பு நினைவூட்டி: "
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&அப்படியே அனுப்பு."
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kஅஞ்சல் இணைப்பிருக்கும்(%1) இடத்தை அறிய முடியவில்லை. </p>"
-"<p> ஒரு கோப்பினை இணைக்க வேண்டுமானால், முழு பாதையும் நீங்கள் குறிப்பிடவேண்டும்."
+"<qt><p>Kஅஞ்சல் இணைப்பிருக்கும்(%1) இடத்தை அறிய முடியவில்லை. </p><p> ஒரு கோப்பினை "
+"இணைக்க வேண்டுமானால், முழு பாதையும் நீங்கள் குறிப்பிடவேண்டும்."
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "கோப்பினை இணை"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "இணைப்பு"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "கோப்பினை செருகு"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "கோப்பினை செருகு"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>பின்நிலை விசையை மேலேற்ற முயற்சிக்கும் பொழுது பிழை ஏற்பட்டுள்ளது:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>பின்நிலை விசையை மேலேற்ற முயற்சிக்கும் பொழுது பிழை ஏற்பட்டுள்ளது:</p><p><b>%1</"
+"b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6433,301 +6228,307 @@ msgid ""
 "View"
 msgstr "பார்வை"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "தொகு..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "தொகு..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&இப்படி சேமிக்கவும்..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&பண்புகள்"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "இணைப்பை சேர்."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "கேஅஞ்சலால் கோப்பை விரிவாக்க முடியாது."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr ""
-"அழுத்தப்பட்ட கோப்பு மூலக்கோப்பை விட பெரியது. மூலக்கோப்பை வைத்துக் கொள்ளலாமா?"
+msgstr "அழுத்தப்பட்ட கோப்பு மூலக்கோப்பை விட பெரியது. மூலக்கோப்பை வைத்துக் கொள்ளலாமா?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "&பீப்"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "கேஅஞ்சலால் கோப்பை விரிவாக்க முடியாது."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "இணைப்புகளை இப்படி சேமி"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "உரையாக சேர்"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "இணைப்பாகச் சேர்"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "இணைப்பாக ஒட்டு"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "பெயரிடப்படாத"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "வரையறுக்காத குறீயிடு விசை"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>இந்த செய்தியில் கையெழுத்திட, முதலில் இதில் பயன்படுத்த போகும் OpenPGP சாவியை "
-"விவரிக்க வேண்டும்.</p>"
-"<p>இந்த அடையாள கட்டமைப்பில், தற்போதைய அடையாளத்திற்கு, OpenPGP சாவியை தேர்வு "
-"செய்யலாம்.</p></qt>"
+"<qt><p>இந்த செய்தியில் கையெழுத்திட, முதலில் இதில் பயன்படுத்த போகும் OpenPGP சாவியை "
+"விவரிக்க வேண்டும்.</p><p>இந்த அடையாள கட்டமைப்பில், தற்போதைய அடையாளத்திற்கு, OpenPGP "
+"சாவியை தேர்வு செய்யலாம்.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "வரையறுக்க முடியாத குறீயிடு விசை"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"தாங்கள் தங்களின் மின்னஞ்சலின் முகவரியை அனுப்புநர் புலத்தில் உள்ளிடவும். தாங்கள் "
-"தங்களின் முகவரியில் குறியீட்டுகளை அமைக்கலாம், ஆகவே ஒவ்வொரு முறையும் செய்தியை "
-"உள்ளிட வேண்டிய அவசியமில்லை"
+"தாங்கள் தங்களின் மின்னஞ்சலின் முகவரியை அனுப்புநர் புலத்தில் உள்ளிடவும். தாங்கள் தங்களின் "
+"முகவரியில் குறியீட்டுகளை அமைக்கலாம், ஆகவே ஒவ்வொரு முறையும் செய்தியை உள்ளிட வேண்டிய "
+"அவசியமில்லை"
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"தாங்கள் குறைந்தபட்சம் ஒரு பெறுநரையாவது குறிப்பிட்டிருக்க வேண்டும் அவைகள் "
-"To:என்ற புலனிலோ CC யிலோ அல்லது BCCயிலோ அமையலாம்."
+"தாங்கள் குறைந்தபட்சம் ஒரு பெறுநரையாவது குறிப்பிட்டிருக்க வேண்டும் அவைகள் To:என்ற புலனிலோ "
+"CC யிலோ அல்லது BCCயிலோ அமையலாம்."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "நீங்கள் பொருள் குறிக்கவில்லை. அஞ்சலை அனுப்பவா?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "பெயர் எதுவும் குறிப்பிடவில்லை"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "நீங்கள் பொருள் குறிக்கவில்லை. அஞ்சலை அனுப்பவா?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "பொருள் எதுவும் குறிப்பிடவில்லை"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&அப்படியே அனுப்பு."
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "பொருளை குறிப்பிடவும்."
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&குறித்துவை, சின்னமிடாதே/மறைவிடக்காக்காதே"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&குறித்து வை,மறைவிடக்கமாக்காதே"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&குறித்து வை, கையெழுத்திடாதே"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "கையெழுத்திடு/மறைவிடக்கு(குறித்தவற்றை அழித்துவிடு)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "மறைவிடக்கு(குறித்தவற்றை அழித்துவிடு)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "குறி(குறித்தவற்றை அழித்துவிடு)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>HTML செய்திகள் இதற்கு சரியானது அல்ல<qt>"
-"<p> குறித்தவற்றை அழிக்கப் போகிறீர்களா?</p></qt>"
+"<qt><p>HTML செய்திகள் இதற்கு சரியானது அல்ல<qt><p> குறித்தவற்றை அழிக்கப் போகிறீர்களா?</"
+"p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "தகவலை மறையாக்கு?."
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் வரைவு ஆவணம் இல்லை (இப்போது). ஆகையால் "
-"முன்னிருப்பு வரைவு ஆவணம் உபயோகப்படுத்தப்படும்."
+"\"%1\" என்ற அடையாளத்திற்கான தனிப்பயன் வரைவு ஆவணம் இல்லை (இப்போது). ஆகையால் முன்னிருப்பு "
+"வரைவு ஆவணம் உபயோகப்படுத்தப்படும்."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
-msgstr ""
-"அனுப்ப வேண்டிய முறையை அமைப்புகளில் குறிப்பிட்ட பிறகு மறுபடியும் முயற்சிக்கவும்."
+msgstr "அனுப்ப வேண்டிய முறையை அமைப்புகளில் குறிப்பிட்ட பிறகு மறுபடியும் முயற்சிக்கவும்."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "மின்னஞ்சலை அனுப்புவதை பற்றி..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "உறுதிபடுத்துதலை அனுப்பு"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "இப்போது அனுப்பு"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "பெறுநர்கள் இல்லை"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "பெறுநர்கள் இல்லை"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "சொல்திருத்தி"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "சொல்திருத்தி"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "சொல்திருத்தம் ரத்தானது."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "சொல்திருத்தம் நிறுத்தப்பட்டது"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "சொல்திருத்தம் முடிந்தது."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "சொல்திருத்தி"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "கையொப்பம் கண்டுபிடிக்க முடியவில்லை"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Encryption Key Selection"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "தகவல் %1 ஆல் கையெழுத்திடப்பட்டுள்ளது."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "தகவல் %1 ஆல் கையெழுத்திடப்பட்டுள்ளது."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "PGP செய்தி திற-மறையாக்கம் செய்யப்பட்டது"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "செய்தி கொண்ட பொருள்:"
@@ -6777,8 +6578,8 @@ msgstr "சொல்திருத்தி - Kஅஞ்சல்"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell/Aspell துவக்க முடியவில்லை. தயவு செய்து ISpell or Aspell  ஒழுங்காக "
 "கட்டமைக்கப்பட்டுள்ளதா மற்றும் PATH[பாதையை] சரிபார்க்கவும்."
@@ -6814,12 +6615,10 @@ msgstr "<qt><b>%1</b> வடிகட்டி விதியில் அத�
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>தெரியாத வடிகட்டி செயல் <b>%1</b> "
-"<br><b>%2</b> வடிகட்டி நெறியில் உள்ளது.</qt>"
+"<qt>தெரியாத வடிகட்டி செயல் <b>%1</b> <br><b>%2</b> வடிகட்டி நெறியில் உள்ளது.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -7039,176 +6838,139 @@ msgstr "சத்தம் எழுப்பு"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>இது விவரிக்கப்பட்ட வடிகட்டிகளின் பட்டியல். மேலிருந்து கீழாக "
-"செயலாக்கப்படும்.</p>"
-"<p>வடிகட்டியை சொடுக்கும் போது, உரையாடலின் வலது பாதியில் இருக்கும் இயக்கங்களை "
-"கொண்டு மாற்றலாம்.</p></qt>"
+"<qt><p>இது விவரிக்கப்பட்ட வடிகட்டிகளின் பட்டியல். மேலிருந்து கீழாக செயலாக்கப்படும்.</"
+"p><p>வடிகட்டியை சொடுக்கும் போது, உரையாடலின் வலது பாதியில் இருக்கும் இயக்கங்களை கொண்டு "
+"மாற்றலாம்.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>."
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>."
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>."
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>."
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>மேற்கண்ட பட்டியலிலிருந்து தற்போது தேர்தெடுக்கப்பட்ட வடிகட்டியை <em>அழி</em>"
-"க்க இந்த பொத்தானை சொடுக்கவும்.</p>"
-"<p> வடிகட்டி அழிக்கப்பட்டவுடன் அதை திரும்ப பெற எவ்வழியிலும் முடியாது, ஆனால் "
-"நீங்கள் நிகழ்த்திய மாற்றங்களை புறக்கணிக்க உரையாடலின் <em>ரத்து</em>"
-"என்பதை சொடுக்கவும்"
+"<qt><p>மேற்கண்ட பட்டியலிலிருந்து தற்போது தேர்தெடுக்கப்பட்ட வடிகட்டியை <em>அழி</em>க்க "
+"இந்த பொத்தானை சொடுக்கவும்.</p><p> வடிகட்டி அழிக்கப்பட்டவுடன் அதை திரும்ப பெற "
+"எவ்வழியிலும் முடியாது, ஆனால் நீங்கள் நிகழ்த்திய மாற்றங்களை புறக்கணிக்க உரையாடலின் "
+"<em>ரத்து</em>என்பதை சொடுக்கவும்"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>கீழே</em>"
-"நகர்த்த இந்தப் பொத்தானைச் சொடுக்கவும்.</p>"
-"<p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் செயல்படுத்தப்படும் என முடிவு "
-"செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள வடிகட்டி முதலில் "
-"செயல்படுத்தப்படும். </p>"
-"<p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி இருந்தால், வலப்புறம் உள்ள <em>மேலே</em> "
-"என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></qt>"
+"<qt><p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>கீழே</em>நகர்த்த இந்தப் "
+"பொத்தானைச் சொடுக்கவும்.</p><p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் "
+"செயல்படுத்தப்படும் என முடிவு செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள "
+"வடிகட்டி முதலில் செயல்படுத்தப்படும். </p><p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி "
+"இருந்தால், வலப்புறம் உள்ள <em>மேலே</em> என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>மேலே </em>"
-"நகர்த்த இந்தப் பொத்தானைச் சொடுக்கவும்.</p>"
-"<p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் செயல்படுத்தப்படும் என முடிவு "
-"செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள வடிகட்டி முதலில் "
-"செயல்படுத்தப்படும். </p>"
-"<p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி இருந்தால், வலப்புறம் உள்ள <em>கீழே</em> "
-"என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>மேலே </em>நகர்த்த "
+"இந்தப் பொத்தானைச் சொடுக்கவும்.</p><p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் "
+"செயல்படுத்தப்படும் என முடிவு செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள "
+"வடிகட்டி முதலில் செயல்படுத்தப்படும். </p><p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி "
+"இருந்தால், வலப்புறம் உள்ள <em>கீழே</em> என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>கீழே</em>"
-"நகர்த்த இந்தப் பொத்தானைச் சொடுக்கவும்.</p>"
-"<p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் செயல்படுத்தப்படும் என முடிவு "
-"செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள வடிகட்டி முதலில் "
-"செயல்படுத்தப்படும். </p>"
-"<p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி இருந்தால், வலப்புறம் உள்ள <em>மேலே</em> "
-"என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>கீழே</em>நகர்த்த இந்தப் "
+"பொத்தானைச் சொடுக்கவும்.</p><p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் "
+"செயல்படுத்தப்படும் என முடிவு செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள "
+"வடிகட்டி முதலில் செயல்படுத்தப்படும். </p><p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி "
+"இருந்தால், வலப்புறம் உள்ள <em>மேலே</em> என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>கீழே</em>"
-"நகர்த்த இந்தப் பொத்தானைச் சொடுக்கவும்.</p>"
-"<p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் செயல்படுத்தப்படும் என முடிவு "
-"செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள வடிகட்டி முதலில் "
-"செயல்படுத்தப்படும். </p>"
-"<p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி இருந்தால், வலப்புறம் உள்ள <em>மேலே</em> "
-"என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></qt>"
+"<qt><p>தேரந்தெடுக்கப்பட்டுள்ள வடிகட்டியைப் பட்டியலில் ஒரு படி .<m>கீழே</em>நகர்த்த இந்தப் "
+"பொத்தானைச் சொடுக்கவும்.</p><p>வடிகட்டிகளின் வரிசை, எந்த வடிகட்டி முதலில் "
+"செயல்படுத்தப்படும் என முடிவு செய்யப் பயன்படுத்தப்படுவதால், இது பயனுடையது. மேலே உள்ள "
+"வடிகட்டி முதலில் செயல்படுத்தப்படும். </p><p>தெரியாமல் இந்தப் பொத்தானைச் சொடுக்கி "
+"இருந்தால், வலப்புறம் உள்ள <em>மேலே</em> என்ற பொத்தானைச் சொடுக்கி மீண்டும் செல்லலாம்</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>தேர்ந்தெடுக்கப்பட்டுள்ள வடிகட்டிக்குப் பெயர் மாற்றம் செய்ய இந்தப் பொத்தானில் "
-"சொடுக்கவும்.</p>"
-"<p>\"<<\" வடிகட்டிகள் ஆரம்பிக்கும் போது தானே பெயரிடப்படுகின்றன. </p>"
-"<p>நீங்கள் தெரியாமல் பெயர் மாற்றம் செய்து விட்ட ஒரு வடிகட்டிக்கு தானியக்க "
-"பெயரிடுதலை திரும்பப்பெற, இந்தப் பொத்தானைச் சொடுக்கி, வரும் உரையாடல் பெட்டியில் "
-"<em>துடை</em> என்பதைத் தேரந்தெடுத்தப் பிறகு <em>சரி </em> "
-"என்பதைத் தேரந்தெடுக்கவும்.</p></qt>."
+"<qt><p>தேர்ந்தெடுக்கப்பட்டுள்ள வடிகட்டிக்குப் பெயர் மாற்றம் செய்ய இந்தப் பொத்தானில் சொடுக்கவும்."
+"</p><p>\"<<\" வடிகட்டிகள் ஆரம்பிக்கும் போது தானே பெயரிடப்படுகின்றன. </p><p>நீங்கள் "
+"தெரியாமல் பெயர் மாற்றம் செய்து விட்ட ஒரு வடிகட்டிக்கு தானியக்க பெயரிடுதலை திரும்பப்பெற, "
+"இந்தப் பொத்தானைச் சொடுக்கி, வரும் உரையாடல் பெட்டியில் <em>துடை</em> என்பதைத் "
+"தேரந்தெடுத்தப் பிறகு <em>சரி </em> என்பதைத் தேரந்தெடுக்கவும்.</p></qt>."
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>\". "
 
 #: kmfilterdlg.cpp:133
@@ -7219,6 +6981,16 @@ msgstr "POP3 வடிகட்டி நெறிகள்"
 msgid "Filter Rules"
 msgstr "வடிகட்டி நெறிகள்"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&இறக்குமதி செய்"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&இறக்குமதி செய்"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "இருக்கும் வடிகட்டிகள்"
@@ -7305,6 +7077,11 @@ msgstr "கருவிப்பட்டியலில் இந்த அல�
 msgid "Icon for this filter:"
 msgstr "இந்த வடிகட்டிக்கான சின்னம்"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "பெறுநர்"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "மேலே"
@@ -7313,16 +7090,29 @@ msgstr "மேலே"
 msgid "Down"
 msgstr "கீழே"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "மறுபெயரிடு..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "புதிய"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&இதற்கு நகலெடுக்கவும்"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "அழிக்கப்பட்டது"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7331,8 +7121,8 @@ msgstr "அடைவுக்கான குறுக்குவழியை�
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7340,8 +7130,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"பின்வரும் கோப்புகள் சேமிக்கப்பட்டுள்ளது ஏனென்றால் அது முறையற்றது.(எ.கா. "
-"செயல்கள் அல்லது தேடுதல் நெறி எதுவும் இல்லை)"
+"பின்வரும் கோப்புகள் சேமிக்கப்பட்டுள்ளது ஏனென்றால் அது முறையற்றது.(எ.கா. செயல்கள் அல்லது "
+"தேடுதல் நெறி எதுவும் இல்லை)"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7407,29 +7197,25 @@ msgstr "IMAP தற்காலிக சேமிப்பு பிரச்�
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>IMAP தற்காலிக சேமிப்பு பிரச்சனைக்கு வழி கண்டுபிடிக்கப்படுகிறது.</b></p>"
-"<p>உங்களுக்கு ஒரு IMAP ஆவணத்தை ஒத்திசைக்க பிரச்னைகள் இருந்தால்,நீங்கள் முதலில் "
-"சுட்டுக்கோப்பை திரும்ப உருவாக்க முயற்சிக்க வேண்டும். இது உருவாக்க நேரமாகும், "
-"ஆனால் பிரச்சனை எதற்கும் காரணமாகாது.</p>"
-"<p>இது போதாதென்றால், IMAP தற்காலிக சேமிப்பைப் புதுப்பிக்கலாம். இதை செய்தால், "
-"உள்ளாமையின் இந்த ஆவணம் மற்றும் இதன் உப ஆவணங்களுக்கு நீங்கள் நிகழ்த்திய "
-"மாற்றங்கள் எல்லாவற்றையும் இழந்துவிடுவீர்கள்.</p>"
+"<p><b>IMAP தற்காலிக சேமிப்பு பிரச்சனைக்கு வழி கண்டுபிடிக்கப்படுகிறது.</b></"
+"p><p>உங்களுக்கு ஒரு IMAP ஆவணத்தை ஒத்திசைக்க பிரச்னைகள் இருந்தால்,நீங்கள் முதலில் "
+"சுட்டுக்கோப்பை திரும்ப உருவாக்க முயற்சிக்க வேண்டும். இது உருவாக்க நேரமாகும், ஆனால் "
+"பிரச்சனை எதற்கும் காரணமாகாது.</p><p>இது போதாதென்றால், IMAP தற்காலிக சேமிப்பைப் "
+"புதுப்பிக்கலாம். இதை செய்தால், உள்ளாமையின் இந்த ஆவணம் மற்றும் இதன் உப ஆவணங்களுக்கு நீங்கள் "
+"நிகழ்த்திய மாற்றங்கள் எல்லாவற்றையும் இழந்துவிடுவீர்கள்.</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -7466,14 +7252,13 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
-msgstr ""
-"சேவையகத்தில் பெயர் மாற்றுவதற்கு முன் IMAP அடைவுகளை ஒத்திசைக்க வேண்டும்."
+msgstr "சேவையகத்தில் பெயர் மாற்றுவதற்கு முன் IMAP அடைவுகளை ஒத்திசைக்க வேண்டும்."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7489,10 +7274,9 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"நீங்கள் நிச்சயமாக %1 ஆவணம் மற்றும் இதன் உப ஆவணங்களின் IMAP தற்காலிக சேமிப்பை "
-"புதிப்பிக்க விரும்புகிறீர்களா?\n"
-"இது உள்ளாமையாக உங்கள் ஆவணங்களுக்கு நீங்கள் செய்த எல்லா மாற்றங்களையும் "
-"நீக்கிவிடும்."
+"நீங்கள் நிச்சயமாக %1 ஆவணம் மற்றும் இதன் உப ஆவணங்களின் IMAP தற்காலிக சேமிப்பை புதிப்பிக்க "
+"விரும்புகிறீர்களா?\n"
+"இது உள்ளாமையாக உங்கள் ஆவணங்களுக்கு நீங்கள் செய்த எல்லா மாற்றங்களையும் நீக்கிவிடும்."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -7508,11 +7292,11 @@ msgstr "இந்த ஆவணத்தில் சுட்டு திரு
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"அடைவு %1 என்பது துவக்க ஒத்திசை நிலையில் இல்லை( %2நிலையில்).தாங்கள் அந்த துவக்க "
-"ஒத்திசை நிலைக்கு மாற்ற விரும்புகிறீர்களா அல்லது ஏதேனும் ஒத்திசையையா?"
+"அடைவு %1 என்பது துவக்க ஒத்திசை நிலையில் இல்லை( %2நிலையில்).தாங்கள் அந்த துவக்க ஒத்திசை "
+"நிலைக்கு மாற்ற விரும்புகிறீர்களா அல்லது ஏதேனும் ஒத்திசையையா?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7639,14 +7423,11 @@ msgstr "Creating subfolders on server"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>அடைவு அழிக்கப்பட்டதாக தெரிகிறது.<b>%1</b>சேவையகத்திலிருந்து அழிக்க "
-"வேண்டாமா?</p></qt>"
+"<qt><p>அடைவு அழிக்கப்பட்டதாக தெரிகிறது.<b>%1</b>சேவையகத்திலிருந்து அழிக்க வேண்டாமா?"
+"</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7667,13 +7448,11 @@ msgstr "அடைவு பட்டியலை திரும்பப்ப�
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>அடைவு அழிக்கப்பட்டதாக தெரிகிறது.<b>%1</b>சேவையகத்திலிருந்து அழிக்க "
-"வேண்டாமா?</p></qt>"
+"<qt><p>அடைவு அழிக்கப்பட்டதாக தெரிகிறது.<b>%1</b>சேவையகத்திலிருந்து அழிக்க வேண்டாமா?"
+"</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7681,14 +7460,14 @@ msgstr "முறிக்கப்பட்டது."
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7701,11 +7480,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7714,15 +7493,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "இங்கு நகர்த்தவும்"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "குறியிடாதே"
@@ -7736,8 +7520,7 @@ msgstr "செய்தியை இந்த அடைவுக்கு நக
 msgid "Permissions (ACL)"
 msgstr "அனுமதிகள் (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "பொது"
@@ -7762,8 +7545,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "தனிப்பயன் எழுத்துருக்களைப் பயன்படுத்து"
@@ -7783,14 +7565,13 @@ msgstr "இந்த அடைவில் உள்ள புதிய அஞ�
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7803,13 +7584,12 @@ msgstr "இந்த அடைவில் பதிலளிக்கவும�
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"இந்த விருப்பத்தைத் தேர்ந்தெடுப்பதன் மூலம் இந்த அடைவில் கொண்டு செல்ல போது "
-"உங்களுக்கு அஞ்சலின் மூலம் பதிலளிக்கும், அதற்கு பதிலாக அனுப்பும்-அஞ்சல் அடைவை "
-"உள்ளமைக்கலாம்."
+"இந்த விருப்பத்தைத் தேர்ந்தெடுப்பதன் மூலம் இந்த அடைவில் கொண்டு செல்ல போது உங்களுக்கு அஞ்சலின் "
+"மூலம் பதிலளிக்கும், அதற்கு பதிலாக அனுப்பும்-அஞ்சல் அடைவை உள்ளமைக்கலாம்."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7819,17 +7599,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "நெடுவரிசையைக் காட்டு:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "முன்னிருப்பாக அமை"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "அனுப்புநர்"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "பெறுநர்"
@@ -7840,11 +7624,11 @@ msgstr "&அனுப்புநர் அடையாளம்:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7863,12 +7647,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7899,17 +7683,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7980,11 +7764,12 @@ msgstr "அடைவு விவரங்களை பெறும் போத
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "'%1' செய்தியின் சுட்டு, தெரியாத பதிப்பின் Kஅஞ்சல்(%2) லிருந்து வந்தது .\n"
-"இந்த சுட்டை திரும்பவும் உருவாக்க முடியும், ஆனால் சில தகவல்கள், நிலை கொடிகள் "
-"உட்பட தொலைந்து போகலாம். உங்கள் சுட்டை நிலைகுறைக்க வேண்டுகிறீர்களா?"
+"இந்த சுட்டை திரும்பவும் உருவாக்க முடியும், ஆனால் சில தகவல்கள், நிலை கொடிகள் உட்பட "
+"தொலைந்து போகலாம். உங்கள் சுட்டை நிலைகுறைக்க வேண்டுகிறீர்களா?"
 
 #: kmfolderindex.cpp:372
 #, fuzzy
@@ -8002,8 +7787,8 @@ msgid ""
 "information, like status flags, might get lost."
 msgstr ""
 "'%1' செய்தியின் சுட்டு, தெரியாத பதிப்பின் Kஅஞ்சல்(%2) லிருந்து வந்தது .\n"
-"இந்த சுட்டை திரும்பவும் உருவாக்க முடியும், ஆனால் சில தகவல்கள், நிலை கொடிகள் "
-"உட்பட தொலைந்து போகலாம். உங்கள் சுட்டை நிலைகுறைக்க வேண்டுகிறீர்களா?"
+"இந்த சுட்டை திரும்பவும் உருவாக்க முடியும், ஆனால் சில தகவல்கள், நிலை கொடிகள் உட்பட "
+"தொலைந்து போகலாம். உங்கள் சுட்டை நிலைகுறைக்க வேண்டுகிறீர்களா?"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -8011,8 +7796,8 @@ msgstr "Error opening %1; this folder is missing."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr "திறப்பதில் பிழை %1. இது ஏற்றுக்கொள்ளப்படாத அஞ்சல் அடைவு."
 
 #: kmfoldermaildir.cpp:124
@@ -8029,8 +7814,7 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
-msgstr ""
-"KMFolderMaildir::addMsg: தரவு இழப்பை தடுக்க அசாதாரணமாக முடிக்கப்படுகிறது."
+msgstr "KMFolderMaildir::addMsg: தரவு இழப்பை தடுக்க அசாதாரணமாக முடிக்கப்படுகிறது."
 
 #: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
@@ -8052,20 +7836,17 @@ msgstr "%1 கோப்பினை திறக்க முடியவில�
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>'%2' ஆவணத்தின் சுட்டு காலம் கடந்துவிட்டது போல் தெரிகிறது. செயல் பழுதை தடுக்க "
-"சுட்டு மீண்டும் உருவாக்கப்படும். இதனால் அழித்த செய்திகள் மீண்டும் தெரியக்கூடும் "
-"மற்றும் நிலைக்கொடிகள் இழக்ககூடும்.</p>"
-"<p> இந்தப் பிரச்சனை திரும்பவும் நிகழாமல் தடுக்க அஞ்சல் உதவிப்புத்தகத்தின் <aFAQ "
-"பகுதியில் இருக்கும்  href=\"%1\"> </a>தகவலை தயவு செய்து படிக்கவும்  "
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>'%2' ஆவணத்தின் சுட்டு காலம் கடந்துவிட்டது போல் தெரிகிறது. செயல் பழுதை தடுக்க "
+"சுட்டு மீண்டும் உருவாக்கப்படும். இதனால் அழித்த செய்திகள் மீண்டும் தெரியக்கூடும் மற்றும் "
+"நிலைக்கொடிகள் இழக்ககூடும்.</p><p> இந்தப் பிரச்சனை திரும்பவும் நிகழாமல் தடுக்க அஞ்சல் "
+"உதவிப்புத்தகத்தின் <aFAQ பகுதியில் இருக்கும்  href=\"%1\"> </a>தகவலை தயவு செய்து "
+"படிக்கவும்  "
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8124,28 +7905,27 @@ msgstr ""
 "'%1'  ஒரு ஆவணமாக தோன்றவில்லை.\n"
 "வழியைவிட்டு கோப்பினை மாற்றுங்கள்."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 "ஆவணம் '%1'  ன் அனுமதிகள் தவறு.\n"
-"தயவு செய்து இந்த ஆவண அடக்கங்களை பார்க்கவும், மாற்றவும் உங்களால் முடிகிறது "
-"என்பதை உறுதிபடுத்தி கொள்ளுங்கள்"
+"தயவு செய்து இந்த ஆவண அடக்கங்களை பார்க்கவும், மாற்றவும் உங்களால் முடிகிறது என்பதை "
+"உறுதிபடுத்தி கொள்ளுங்கள்"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
 msgstr ""
 "'%1' ஆவணத்தை Kஅஞ்சலால் உருவாக்க முடியவில்லை.\n"
-"'%2' ஆவண அடக்கங்களை உங்களால் பார்க்க மற்றும் மாற்ற முடிகிறதென்று "
-"உறுதிபடுத்திக்கொள்ளவும்.."
+"'%2' ஆவண அடக்கங்களை உங்களால் பார்க்க மற்றும் மாற்ற முடிகிறதென்று உறுதிபடுத்திக்கொள்ளவும்.."
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8153,12 +7933,11 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "அடைவு உருவாக்க இயலவில்லை"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
-msgstr ""
-"%2 ல் %1 கோப்பினை உருவாக்க முடியவில்லை. கே மெயில் இது இல்லாமல் துவங்காது."
+msgstr "%2 ல் %1 கோப்பினை உருவாக்க முடியவில்லை. கே மெயில் இது இல்லாமல் துவங்காது."
 
 #: kmfolderseldlg.cpp:25 kmfolderseldlg.cpp:47 kmfoldertree.cpp:1091
 #: kmfoldertree.cpp:1112 treebase.cpp:99
@@ -8255,9 +8034,9 @@ msgstr "IMAP தற்காலிக சேமிப்பினை பிழ�
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8275,8 +8054,7 @@ msgstr "மொத்தம்"
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
-msgstr ""
-"<qt><b>%1</b> அடைவினை உருவாக்க முடியவில்லை, அடைவு முன்பே இருக்கிறது.</qt>"
+msgstr "<qt><b>%1</b> அடைவினை உருவாக்க முடியவில்லை, அடைவு முன்பே இருக்கிறது.</qt>"
 
 #: kmfoldertree.cpp:2000
 #, fuzzy
@@ -8396,15 +8174,15 @@ msgstr "%1 ஆவணங்கள் படிக்க மட்டுமே."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>நீங்கள் தேர்வு செய்த செய்திகளை நீக்க தயாரா? "
-"<br>நீக்கிய பிறகு திரும்ப கிடைக்காது! </qt>.\n"
-"<qt>நீங்கள் தேர்வு செய்த %n செய்திகளை நீக்க தயாரா? "
-"<br>நீக்கிய பிறகு திரும்ப கிடைக்காது! </qt>."
+"<qt>நீங்கள் தேர்வு செய்த செய்திகளை நீக்க தயாரா? <br>நீக்கிய பிறகு திரும்ப கிடைக்காது! </"
+"qt>.\n"
+"<qt>நீங்கள் தேர்வு செய்த %n செய்திகளை நீக்க தயாரா? <br>நீக்கிய பிறகு திரும்ப கிடைக்காது! "
+"</qt>."
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8456,126 +8234,124 @@ msgstr ""
 "%1 மாற்றும்பொழுது தோல்வி\n"
 "(சாதனத்தில் இடமில்லை?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "சான்றிதழ் கையொப்ப கோரிக்கை"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "இந்த சான்றிதழை கையப்பமிடு."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
-msgstr ""
-"பணி அடைவுக்கு வாசிக்க மற்றும் எழுத உங்களுக்கு அனுமதிகள் கொடுக்கப்படவில்லை"
+msgstr "பணி அடைவுக்கு வாசிக்க மற்றும் எழுத உங்களுக்கு அனுமதிகள் கொடுக்கப்படவில்லை"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "வெளிப்பெட்டி"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "நீங்கள் அடைவை வாசிக்கவோ/படிக்கவோ அதிகாரம் இல்லை."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "அனுப்பிய-அஞ்சல்"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "உங்கள் அனுப்பிய அஞ்சல்பெட்டிக்கு படிக்க/எழுத உங்களுக்கு அனுமதியில்லை."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "குப்பை"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "நீங்கள் குப்பை கோப்புரையை வாசிக்கவோ/படிக்கவோ அதிகாரம் இல்லை."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "வரைவுகள்"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "நீங்கள் வரைவு அடைவினை வாசிக்கவோ/படிக்கவோ அதிகாரம் இல்லை."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "மேலெழுது"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "நீங்கள் குப்பை கோப்புரையை வாசிக்கவோ/படிக்கவோ அதிகாரம் இல்லை."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "கடைசி தேடுதல்"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail encountered a fatal error and will terminate now"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8586,11 +8362,11 @@ msgstr ""
 "The error was:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "காலியான குப்பை"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Are you sure you want to empty the trash folders of all accounts?"
 
@@ -8666,8 +8442,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>புதிய அஞ்சல் வந்துள்ளது</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8705,11 +8480,11 @@ msgstr "Are you sure you want to empty the trash folder?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8735,12 +8510,12 @@ msgstr "தேர்ந்தெடுக்கபட்ட பெறுநர�
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt><b>%1</b> தேடு ஆவணத்தை அழிப்பதில் உறுதியாக இருக்கிறீர்களா? அப்படி "
-"செய்தாலும் காண்பிக்கப்படும் செய்திகள் அழிக்கப்பட மாட்டா, அவை வேறோரு ஆவணத்தில் "
-"சேமிக்கப்பட்டிருப்பதால்.</qt>"
+"<qt><b>%1</b> தேடு ஆவணத்தை அழிப்பதில் உறுதியாக இருக்கிறீர்களா? அப்படி செய்தாலும் "
+"காண்பிக்கப்படும் செய்திகள் அழிக்கப்பட மாட்டா, அவை வேறோரு ஆவணத்தில் சேமிக்கப்பட்டிருப்பதால்.</"
+"qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8753,37 +8528,39 @@ msgstr "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt><b>%1</b> வெற்று ஆவணம் மற்றும் அதன் எல்லா உப ஆவணங்களை அழிப்பதில் உறுதியாக "
-"இருக்கிறீர்களா? அந் த உப ஆவணங்கள் வெற்றாக இல்லாமல் இருக்கலாம், அவையும் "
-"அழியலாம்.</qt>"
+"இருக்கிறீர்களா? அந் த உப ஆவணங்கள் வெற்றாக இல்லாமல் இருக்கலாம், அவையும் அழியலாம்.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents?</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents?</qt>"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt><b>%1</b> ஆவணம் மற்றும் அதன் எல்லா உப ஆவணங்களை அழித்து, இவற்றின் "
-"அடக்கங்களையும் அழிப்பதில் உறுதியாக இருக்கிறீர்களா? </qt>"
+"<qt><b>%1</b> ஆவணம் மற்றும் அதன் எல்லா உப ஆவணங்களை அழித்து, இவற்றின் அடக்கங்களையும் "
+"அழிப்பதில் உறுதியாக இருக்கிறீர்களா? </qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "அழிக்கப்பட்டது"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8799,13 +8576,13 @@ msgstr "Are you sure you want to expire all old messages?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"அஞ்சலில் HTML உபயோகம் உங்களை \"spam\" ன் பயனாளிக்கிவிடும், மற்றும் "
-"இப்போதிருக்கும்/வரவிருக்கும் பாதுகாப்பு விளையாட்டுகளினால் உங்கள் அமைப்பை "
-"பாதிப்பு ஏற்படுத்தும் சாத்தியக்கூற்றை அதிகமாக்குகின்றன."
+"அஞ்சலில் HTML உபயோகம் உங்களை \"spam\" ன் பயனாளிக்கிவிடும், மற்றும் இப்போதிருக்கும்/"
+"வரவிருக்கும் பாதுகாப்பு விளையாட்டுகளினால் உங்கள் அமைப்பை பாதிப்பு ஏற்படுத்தும் "
+"சாத்தியக்கூற்றை அதிகமாக்குகின்றன."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8818,12 +8595,12 @@ msgstr " HTMLயை பயன்படுத்து"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"அஞ்சலில் HTML உபயோகம் உங்களை \"spam\" ன் பயனாளிக்கிவிடும், மற்றும் "
-"இப்போதிருக்கும்/வரவிருக்கும் பாதுகாப்பு விளையாட்டுகளினால் உங்கள் அமைப்பை "
-"பாதிப்பு ஏற்படுத்தும் சாத்தியக்கூற்றை அதிகமாக்குகின்றன."
+"அஞ்சலில் HTML உபயோகம் உங்களை \"spam\" ன் பயனாளிக்கிவிடும், மற்றும் இப்போதிருக்கும்/"
+"வரவிருக்கும் பாதுகாப்பு விளையாட்டுகளினால் உங்கள் அமைப்பை பாதிப்பு ஏற்படுத்தும் "
+"சாத்தியக்கூற்றை அதிகமாக்குகின்றன."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8839,12 +8616,12 @@ msgstr "அஞ்சல் குழுவில் வடிகட்டி %1.
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 
 #: kmmainwidget.cpp:1743
@@ -8860,7 +8637,8 @@ msgstr "சான்றிதழ் மேலாளரை துவக்க ம
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "சான்றிதழ் மேலாளரை துவக்க முடியவில்லை. உங்கள் நிறுவியை சோதியுங்கள்."
 
 #: kmmainwidget.cpp:2508
@@ -9198,8 +8976,7 @@ msgstr "இணைப்புகளை இப்படிச் சேமி..."
 msgid "Appl&y All Filters"
 msgstr "எல்லா அலங்காரங்களையும் பயன்படுத்து"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "வடிகட்டிகளை பயன்படுத்து ."
@@ -9313,7 +9090,6 @@ msgstr "அடுத்த வாசிக்கப்படாத செய்�
 msgid "Go to the next unread message"
 msgstr "அடுத்த வாசிக்கப்படாத செய்திக்கு செல்லவும்"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "முந்தைய செய்தி"
@@ -9361,8 +9137,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"தற்போதைய செய்தியை கீழ் உருள். தற்போதய செய்தியின் முடிவில் இருந்தால், அடுத்த "
-"செய்திக்கு போகவும்."
+"தற்போதைய செய்தியை கீழ் உருள். தற்போதய செய்தியின் முடிவில் இருந்தால், அடுத்த செய்திக்கு "
+"போகவும்."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9456,60 +9232,59 @@ msgstr " தொடங்குகிறது..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "இந்த செய்தியில் விருப்பநிலை அறிவிப்பு அனுப்ப ஒரு வேண்டுகோள் இருக்கிறது.\n"
-"நீங்கள் இந்த வேண்டுகோளை நிராகரிக்கலாம் அல்லது Kஅஞ்சல் \"மறுத்தது\" அல்லது சாதரண "
-"பதில் அனுப்ப அனுமதிக்கலாம்."
+"நீங்கள் இந்த வேண்டுகோளை நிராகரிக்கலாம் அல்லது Kஅஞ்சல் \"மறுத்தது\" அல்லது சாதரண பதில் "
+"அனுப்ப அனுமதிக்கலாம்."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "இந்த செய்தியில் விருப்பநிலை அறிவிப்பு அனுப்ப ஒரு வேண்டுகோள் இருக்கிறது.\n"
-"இதில் \"வேண்டும்\" என்று குறிக்கப்பட்ட செயல்படுத்தும் கட்டளை இருக்கிறது, ஆனால் "
-"Kஅஞ்சல் அறியாதது.\n"
-"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் "
-"\"தோல்வியடைந்தது\" என்ற பதிலை கொடுக்க வைக்கலாம்."
+"இதில் \"வேண்டும்\" என்று குறிக்கப்பட்ட செயல்படுத்தும் கட்டளை இருக்கிறது, ஆனால் Kஅஞ்சல் "
+"அறியாதது.\n"
+"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் \"தோல்வியடைந்தது\" என்ற "
+"பதிலை கொடுக்க வைக்கலாம்."
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "இந்த செய்தியில் விருப்பநிலை அறிவிப்பு அனுப்ப ஒரு வேண்டுகோள் இருக்கிறது.\n"
-"ஆனால் இந்த அறிவிப்பு ஒன்றிற்க்கும் மேலான முகவரிக்கு அனுப்புமாறு "
-"வேண்டப்படுகிறது.\n"
-"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் "
-"\"மறுக்கப்பட்டது\" என்ற பதிலை அல்லது சாதரண பதில் கொடுக்க வைக்கலாம்."
+"ஆனால் இந்த அறிவிப்பு ஒன்றிற்க்கும் மேலான முகவரிக்கு அனுப்புமாறு வேண்டப்படுகிறது.\n"
+"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் \"மறுக்கப்பட்டது\" என்ற "
+"பதிலை அல்லது சாதரண பதில் கொடுக்க வைக்கலாம்."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "இந்த செய்தியில் விருப்பநிலை அறிவிப்பு அனுப்ப ஒரு வேண்டுகோள் இருக்கிறது.\n"
 "ஆனால் திருப்பு-பாதை ஏதுமில்லை.\n"
-"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் "
-"\"மறுக்கப்பட்டது\" என்ற பதிலை அல்லது சாதாரண பதில் கொடுக்க வைக்கலாம்."
+"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் \"மறுக்கப்பட்டது\" என்ற "
+"பதிலை அல்லது சாதாரண பதில் கொடுக்க வைக்கலாம்."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9518,8 +9293,8 @@ msgstr ""
 "இந்த செய்தியில் விருப்பநிலை அறிவிப்பு அனுப்ப ஒரு வேண்டுகோள் இருக்கிறது.\n"
 "ஆனால் அறிவிப்பு செல்லவேண்டிய முகவரி  திருப்பு-பாதை முகவரியிலிருந்து "
 "மாறுப்பட்டிருக்கிறது.\n"
-"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் "
-"\"மறுக்கப்பட்டது\" என்ற பதிலை அல்லது சாதரண பதில் கொடுக்க வைக்கலாம்."
+"நீங்கள் இந்த வேண்டுகோளை சட்டை செய்யாமல் இருக்கலாம் அல்லது Kஅஞ்சல் \"மறுக்கப்பட்டது\" என்ற "
+"பதிலை அல்லது சாதரண பதில் கொடுக்க வைக்கலாம்."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9538,24 +9313,23 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-" \"விருப்பநிலை- அறிவிப்பு- தேர்வுகள்\"  கொண்ட தலைப்பு வேண்டும், ஆனால் தெரியாத "
-"காரணி"
+" \"விருப்பநிலை- அறிவிப்பு- தேர்வுகள்\"  கொண்ட தலைப்பு வேண்டும், ஆனால் தெரியாத காரணி"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Receipt: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "இணைப்பு: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "இணைப்புகளை அனுப்புநர் விரும்புவது போல் காண்பி"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9605,46 +9379,36 @@ msgstr "அஞ்சல் பகுதி பண்புகள்:"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>கோப்பின் <em>MIME வகை</em> .</p>"
-"<p>  தானாக கோப்பின் வகை சோதிக்கப்படுவதால் சாதரணமாக, நீங்கள் இந்த அமைப்பை தொட "
-"வேண்டியதில்லை. ஆனால் சிலநேரம் %1 கோப்பின் வகை சரியாக கண்டுப்பிடிக்காது. இங்கே "
-"அதை சரி செய்யலாம்.</p></qt>."
+"<qt><p>கோப்பின் <em>MIME வகை</em> .</p><p>  தானாக கோப்பின் வகை சோதிக்கப்படுவதால் "
+"சாதரணமாக, நீங்கள் இந்த அமைப்பை தொட வேண்டியதில்லை. ஆனால் சிலநேரம் %1 கோப்பின் வகை சரியாக "
+"கண்டுப்பிடிக்காது. இங்கே அதை சரி செய்யலாம்.</p></qt>."
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>பகுதியின் அளவு</p>"
-"<p>சில நேரம், அனுமானிக்கப்பட்ட அளவே %1  கொடுக்கும், ஏனென்றால் சரியான அளவு "
-"கணக்கிட நிறைய நேரமாகும். இப்படிப்பட்ட சூழ்நிலையில், \"(அனு)\" என்ற பதம் அளவுடன் "
-"தென்படும்.</p></qt>."
+"<qt><p>பகுதியின் அளவு</p><p>சில நேரம், அனுமானிக்கப்பட்ட அளவே %1  கொடுக்கும், "
+"ஏனென்றால் சரியான அளவு கணக்கிட நிறைய நேரமாகும். இப்படிப்பட்ட சூழ்நிலையில், \"(அனு)\" "
+"என்ற பதம் அளவுடன் தென்படும்.</p></qt>."
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>பகுதியின் விவரம்.</p>"
-"<p>முழு செய்தியின் பொருள் போலவே, இது பகுதியின் தகவல் விபரம். பெரும்பாலான அஞ்சல் "
-"தரகர்கள் இந்த தகவலை செய்தி முன்னோடியில் காண்பிப்பார்கள், இணைப்பு "
-"சின்னத்துடன்.</p></qt><qt>"
-"<p>"
+"<qt><p>பகுதியின் விவரம்.</p><p>முழு செய்தியின் பொருள் போலவே, இது பகுதியின் தகவல் "
+"விபரம். பெரும்பாலான அஞ்சல் தரகர்கள் இந்த தகவலை செய்தி முன்னோடியில் காண்பிப்பார்கள், இணைப்பு "
+"சின்னத்துடன்.</p></qt><qt><p>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9652,16 +9416,13 @@ msgstr "&விவரிப்பு:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>பகுதியின் விவரம்.</p>"
-"<p>முழு செய்தியின் பொருள் போலவே, இது பகுதியின் தகவல் விவரம். பெரும்பாலான அஞ்சல் "
-"தரகர்கள் இந்த தகவலை செய்தி முன்னோடியில் காண்பிப்பார்கள், இணைப்பு "
+"<qt><p>பகுதியின் விவரம்.</p><p>முழு செய்தியின் பொருள் போலவே, இது பகுதியின் தகவல் "
+"விவரம். பெரும்பாலான அஞ்சல் தரகர்கள் இந்த தகவலை செய்தி முன்னோடியில் காண்பிப்பார்கள், இணைப்பு "
 "சின்னத்துடன்.</p></qt>."
 
 #: kmmsgpartdlg.cpp:139
@@ -9670,23 +9431,20 @@ msgstr "குறியீட்டாக்கம்"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>பகுதியின் இடம்பெயர் குறியீடு.</p>"
-"<p>சாதாரணமாக இதை நீங்கள் மாற்ற வேண்டாம், ஏனென்றால் %1 MIME  வகை பொறுத்து "
-"முன்னிருப்பு குறியீட்டை உபயோகிக்கும். ஆனாலும் சிலநேரங்களில், உங்கள் செய்தியின் "
-"அளவை கணிசமாக குறைக்க முடியும், உதாரணத்திற்க்கு ஒரு PostScript கோப்பில் இரும "
-"தரவு இல்லாமல், சுத்தமாக உரையாக இருக்கும் பொழுது. இந்த சூழ்நிலையில் "
-"\"மேற்கோள்-அச்செடுக்கதக்க\" என்பதை \"அடி64\" க்கு பதிலாக தேர்வு செய்தால், 25% "
-"வரை செய்தியின் அளவை குறைக்கலாம்.</p></qt>."
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>பகுதியின் இடம்பெயர் குறியீடு.</p><p>சாதாரணமாக இதை நீங்கள் மாற்ற வேண்டாம், "
+"ஏனென்றால் %1 MIME  வகை பொறுத்து முன்னிருப்பு குறியீட்டை உபயோகிக்கும். ஆனாலும் "
+"சிலநேரங்களில், உங்கள் செய்தியின் அளவை கணிசமாக குறைக்க முடியும், உதாரணத்திற்க்கு ஒரு "
+"PostScript கோப்பில் இரும தரவு இல்லாமல், சுத்தமாக உரையாக இருக்கும் பொழுது. இந்த "
+"சூழ்நிலையில் \"மேற்கோள்-அச்செடுக்கதக்க\" என்பதை \"அடி64\" க்கு பதிலாக தேர்வு செய்தால், "
+"25% வரை செய்தியின் அளவை குறைக்கலாம்.</p></qt>."
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9694,20 +9452,16 @@ msgstr "&a தானியக்க காட்சியகம் பரிந�
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>முன்னிருப்பு சின்ன பார்வைக்குப்பதில், தானியக்க (உள்கம்பி) பார்வை பெறுநருக்கு "
-"பரிந்துரைக்க வேண்டினால் இதை தேர்வு செய். </p>"
-"<p>தொழில்நுட்ப ரீதியாக, இது இப்பகுதியின் <em>பொருளடக்க விருப்பநிலை</em> "
-"தலைப்பை முன்னுருப்பு \"இணைப்பு\" க்கு பதிலாக \"உள்கம்பி\" ஆக மாற்றி "
-"செயல்படுத்தும்.</p></qt>."
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>முன்னிருப்பு சின்ன பார்வைக்குப்பதில், தானியக்க (உள்கம்பி) பார்வை பெறுநருக்கு "
+"பரிந்துரைக்க வேண்டினால் இதை தேர்வு செய். </p><p>தொழில்நுட்ப ரீதியாக, இது இப்பகுதியின் "
+"<em>பொருளடக்க விருப்பநிலை</em> தலைப்பை முன்னுருப்பு \"இணைப்பு\" க்கு பதிலாக \"உள்கம்பி"
+"\" ஆக மாற்றி செயல்படுத்தும்.</p></qt>."
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9715,15 +9469,13 @@ msgstr "இந்த பகுதியை  குறியீடு "
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>இச்செய்தி பகுதி கையெழுத்திடப்படவேண்டும் என்றால் இதை தேர்வு செய்.</p>"
-"<p>தற்போது தேர்ந்தெடுத்த அடையாளத்துடன் நீங்கள் இணையாக அளித்த சாவியை கொண்டு இந்த "
-"கையெழுத்து உருவாக்கப்படும்.</p></qt>."
+"<qt><p>இச்செய்தி பகுதி கையெழுத்திடப்படவேண்டும் என்றால் இதை தேர்வு செய்.</p><p>தற்போது "
+"தேர்ந்தெடுத்த அடையாளத்துடன் நீங்கள் இணையாக அளித்த சாவியை கொண்டு இந்த கையெழுத்து "
+"உருவாக்கப்படும்.</p></qt>."
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9731,13 +9483,11 @@ msgstr "இப்பகுதியை மறையாக்கு"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>இச்செய்தி பகுதி மறைகுறியீடப்பட வேண்டுமென்றால் இதை தேர்வு செய். </p>"
-"<p>இச்செய்தியை பெறுநர்களுக்காக இந்த பகுதி மறைகுறியீடும்.</p></qt>/"
+"<qt><p>இச்செய்தி பகுதி மறைகுறியீடப்பட வேண்டுமென்றால் இதை தேர்வு செய். </"
+"p><p>இச்செய்தியை பெறுநர்களுக்காக இந்த பகுதி மறைகுறியீடும்.</p></qt>/"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9751,16 +9501,13 @@ msgstr "POP வடிகட்டிகள்."
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"POP கணக்கில் கண்டெடுத்த வடிகட்டப்படவேண்டிய செய்திகள்:<b>%1</b>"
-"<p>காண்பிக்கப்பட்ட செய்திகள் அதிகபட்ச அளவு வரம்பை மீறிவிட்டன."
-"<br>சரியான பொத்தானை அழுத்தி இவற்றோடு என்ன செய்ய விரும்புகிறீர்களென்று "
-"தேர்ந்தெடுக்கலாம்."
+"POP கணக்கில் கண்டெடுத்த வடிகட்டப்படவேண்டிய செய்திகள்:<b>%1</b><p>காண்பிக்கப்பட்ட செய்திகள் "
+"அதிகபட்ச அளவு வரம்பை மீறிவிட்டன.<br>சரியான பொத்தானை அழுத்தி இவற்றோடு என்ன செய்ய "
+"விரும்புகிறீர்களென்று தேர்ந்தெடுக்கலாம்."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9772,9 +9519,7 @@ msgstr "விதிகணம் வடிகட்டிய செய்தி�
 
 #: kmpopfiltercnfrmdlg.cpp:305
 msgid "Show messages matched by a ruleset and tagged 'Download' or 'Delete'"
-msgstr ""
-"விதிகணத்துடன் ஒத்துபோன மற்றும் 'இறக்கு' அல்லது 'அழி' ஒட்ட்ப்பட்ட செய்திகளை "
-"காண்பி"
+msgstr "விதிகணத்துடன் ஒத்துபோன மற்றும் 'இறக்கு' அல்லது 'அழி' ஒட்ட்ப்பட்ட செய்திகளை காண்பி"
 
 #: kmpopfiltercnfrmdlg.cpp:306
 msgid "Show messages matched by a filter ruleset"
@@ -10014,15 +9759,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -10032,18 +9776,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10051,21 +9794,19 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2>Kஅஞ்சல் %1 க்கு நல்வரவு</h2>"
-"<p>Kஅஞ்சல் Kமேசைச் சூழலைச் சேர்ந்த ஒரு மின்னஞ்சல் கருவி. இது MIME, SMTP, POP3 "
-"IMAP போன்ற இணைய அஞ்சல் தகுதரங்களுடன் முற்றிலும் ஒத்துப்போகும் வகையில் "
-"வடிவமைக்கப்பட்டுள்ளது. </p>\n"
-"<ul>"
-"<li>Kஅஞ்சலில் அடங்கி உள்ள பலவிதமான பலன் நிறை பண்புக் கூறுகள் <A HREF=\"%2\">"
-"விளக்கவுரையில்</A>விவரிக்கப்பட்டுள்ளன.</li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2>Kஅஞ்சல் %1 க்கு நல்வரவு</h2><p>Kஅஞ்சல் Kமேசைச் சூழலைச் சேர்ந்த ஒரு மின்னஞ்சல் கருவி. "
+"இது MIME, SMTP, POP3 IMAP போன்ற இணைய அஞ்சல் தகுதரங்களுடன் முற்றிலும் ஒத்துப்போகும் "
+"வகையில் வடிவமைக்கப்பட்டுள்ளது. </p>\n"
+"<ul><li>Kஅஞ்சலில் அடங்கி உள்ள பலவிதமான பலன் நிறை பண்புக் கூறுகள் <A HREF="
+"\"%2\">விளக்கவுரையில்</A>விவரிக்கப்பட்டுள்ளன.</li>\n"
+"<li>The <a href=\"%3\">KMail homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %8):</p>\n"
 "<ul>\n"
 "%9</ul>\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10074,20 +9815,18 @@ msgstr ""
 "<p>&nbsp; &nbsp; The KMail Team</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>சிறிது நேரம் ஒதுக்கி அமைப்புகள்-&gt;வடிவமைப்பில் உள்ள K அஞ்சல் வடிவமைப்புப் "
-"பலகையை நிரப்பவும். .\n"
+"<p>சிறிது நேரம் ஒதுக்கி அமைப்புகள்-&gt;வடிவமைப்பில் உள்ள K அஞ்சல் வடிவமைப்புப் பலகையை "
+"நிரப்பவும். .\n"
 "குறைந்தது ஒரு முதன்மை அடையாளமும் ஒரு அஞ்சல் கணக்கும் படைக்கப்பட வேண்டும்.</p>\n"
 
 #: kmreaderwin.cpp:1375
@@ -10125,13 +9864,13 @@ msgstr "இணைப்பை பார்: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
-"[Kஅஞ்சல்: இணைப்பில் இரும தேர்வு இருக்கிறது. முதலெழுத்தை காண்பிக்க முயற்சி "
-"நடக்கிறது.]\n"
-"[Kஅஞ்சல்: இணைப்பில் இரும தேர்வு இருக்கிறது. முதல் %n எழுத்துக்களை காண்பிக்க "
-"முயற்சி நடக்கிறது]"
+"[Kஅஞ்சல்: இணைப்பில் இரும தேர்வு இருக்கிறது. முதலெழுத்தை காண்பிக்க முயற்சி நடக்கிறது.]\n"
+"[Kஅஞ்சல்: இணைப்பில் இரும தேர்வு இருக்கிறது. முதல் %n எழுத்துக்களை காண்பிக்க முயற்சி "
+"நடக்கிறது]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -10155,12 +9894,14 @@ msgstr "இணைப்பை திறக்கவா?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10182,6 +9923,58 @@ msgstr "கீழுள்ளவை &எல்லாவற்றையும்
 msgid "(match all of the following)"
 msgstr "கீழுள்ளவை &எல்லாவற்றையும் பொருத்தவும்"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "படி"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "பழைய"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "அழிக்கப்பட்டது"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "பதிலளித்தது"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "திருப்பி அனுப்பப்பட்டது"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "வரிசையாக்கப்பட்டது"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "அனுப்பப்பட்டது"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "பார்க்கப்பட்டது"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "தவிர்க்கப்பட்டது"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "தவறான அஞ்சல்"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "தேவையற்ற மின்னஞ்சல்"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "செய்யவேண்டியது"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "இணைப்பு உள்ளது"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10266,21 +10059,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"அனுப்பிய அஞ்சல்  \"%1\" \"வெளிபெட்டி\" யிலிருந்து  \"அனுப்பிய-அஞ்சல்l\"  "
-"ஆவணத்திற்க்கு நகர்த்திய முயற்சி தோல்வியுற்றது.\n"
-"காரணங்கள் இட பற்றாக்குறை அல்லது எழு அனுமதியாக இருக்கலாம். தயவு செய்து "
-"அப்பிரச்சனையை சரிசெய்ய முயன்று மற்றும் நீங்களாக அச்செய்தியை நகர்த்துங்கள்"
+"அனுப்பிய அஞ்சல்  \"%1\" \"வெளிபெட்டி\" யிலிருந்து  \"அனுப்பிய-அஞ்சல்l\"  ஆவணத்திற்க்கு "
+"நகர்த்திய முயற்சி தோல்வியுற்றது.\n"
+"காரணங்கள் இட பற்றாக்குறை அல்லது எழு அனுமதியாக இருக்கலாம். தயவு செய்து அப்பிரச்சனையை "
+"சரிசெய்ய முயன்று மற்றும் நீங்களாக அச்செய்தியை நகர்த்துங்கள்"
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "பெறுநரின் முகவரியைக் குறிப்பிடாமல் செய்தியை அனுப்ப இயலாது.\n"
 "தயவுச் செய்து மின்னஞ்சலின் அறிமுகத்தின் முகவரியோடு '%1' என்ற அறிமுக பகுதியில் "
@@ -10309,8 +10102,8 @@ msgstr "அனுப்புதல் தொடங்குகிறது..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10336,16 +10129,16 @@ msgstr "(சில) வரிசையில் இருக்கும் ச�
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "அனுப்புதல் முறிக்கப்பட்டது\n"
 "%1\n"
 "பிரச்சனையை நீங்கள் தீர்க்கும்வரையோ (உதாரணமாக உடைந்த முகவரி) அல்லது செய்தியை "
-"'வெளிப்பெட்டி' யிலிருந்து நீக்குவது வரையோ, இந்த செய்தி 'வெளிப்பெட்டி' யில் "
-"இருக்கும்.\n"
+"'வெளிப்பெட்டி' யிலிருந்து நீக்குவது வரையோ, இந்த செய்தி 'வெளிப்பெட்டி' யில் இருக்கும்.\n"
 "கீழ்கண்ட இடம்பெயர் நெறிமுறை உபயோகப்படுத்தப்பட்டது:\n"
 "  %2"
 
@@ -10355,21 +10148,16 @@ msgstr "அனுப்புதல் முறிக்கப்பட்ட�
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>அனுப்புதல் தோல்வியடைந்தது:</p>"
-"<p>%1</p>"
-"<p>பிரச்சனையை நீங்கள் தீர்க்கும் வரையோ (உதாரணமாக உடைந்த முகவரி) அல்லது செய்தியை "
-"'வெளிப்பெட்டி' யிலிருந்து நீக்குவது வரையோ, இந்த செய்தி 'வெளிப்பெட்டி' யில் "
-"இருக்கும்.</p>"
-"<p>கீழ்கண்ட இடம் பெயர் நெறிமுறை உபயோகப்படுத்தப்பட்டது:  %2</p>"
-"<p>மிச்சமிருக்கும் செய்திகளை அனுப்புவதை தொடரவா?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>அனுப்புதல் தோல்வியடைந்தது:</p><p>%1</p><p>பிரச்சனையை நீங்கள் தீர்க்கும் வரையோ "
+"(உதாரணமாக உடைந்த முகவரி) அல்லது செய்தியை 'வெளிப்பெட்டி' யிலிருந்து நீக்குவது வரையோ, "
+"இந்த செய்தி 'வெளிப்பெட்டி' யில் இருக்கும்.</p><p>கீழ்கண்ட இடம் பெயர் நெறிமுறை "
+"உபயோகப்படுத்தப்பட்டது:  %2</p><p>மிச்சமிருக்கும் செய்திகளை அனுப்புவதை தொடரவா?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10387,16 +10175,16 @@ msgstr "அனுப்புதல் முறிக்கப்பட்ட�
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "அனுப்புதல் தோல்வியடைந்தது:\n"
 "%1\n"
 "பிரச்சனையை நீங்கள் தீர்க்கும்வரையோ (உதாரணமாக உடைந்த முகவரி) அல்லது செய்தியை "
-"'வெளிப்பெட்டி' யிலிருந்து நீக்குவது வரையோ, இந்த செய்தி 'வெளிப்பெட்டி' யில் "
-"இருக்கும்.\n"
+"'வெளிப்பெட்டி' யிலிருந்து நீக்குவது வரையோ, இந்த செய்தி 'வெளிப்பெட்டி' யில் இருக்கும்.\n"
 "கீழ்கண்ட இடம் பெயர் நெறிமுறை உபயோகப்படுத்தப்பட்டது:\n"
 "  %2"
 
@@ -10418,8 +10206,7 @@ msgstr ""
 "அனுப்புதல் தோல்வியடைந்தது:\n"
 "%1\n"
 "இந்த செய்தி 'வெளிப்பெட்டி' யில் இருக்கும் மற்றும் திரும்ப அனுப்பப்படும்.\n"
-"நீங்கள் இச்செய்தியை திரும்ப அனுப்பவேண்டாமென்றால் அங்கிருந்து தயவு செய்து "
-"நீக்கவும்\n"
+"நீங்கள் இச்செய்தியை திரும்ப அனுப்பவேண்டாமென்றால் அங்கிருந்து தயவு செய்து நீக்கவும்\n"
 "கீழ்கண்ட இடம்பெயர் நெறிமுறை உபயோகப்படுத்தப்பட்டது:\n"
 "  %2"
 
@@ -10434,48 +10221,47 @@ msgstr "அஞ்சலனுப்பு அசாதாரணமாக வெ�
 
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
-msgstr ""
-"அஞ்சல் பெட்டியை அணுக நீங்கள் ஒரு பயனர்பெயர்/ கடவுச்சொல்லாவது தர வேண்டும்."
+msgstr "அஞ்சல் பெட்டியை அணுக நீங்கள் ஒரு பயனர்பெயர்/ கடவுச்சொல்லாவது தர வேண்டும்."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 இந்த கணினியில் மற்றொரு காட்சியில் செயல்படுத்தப்பட்டு கொண்டிருக்கிறது. %2 னை "
-"ஒன்றுக்கு மேல் செயல்படுத்தினால் அஞ்சலை இழக்க வாய்ப்புள்ளது. நீங்கள் உறுதியாக "
-"இருக்கும்வரை %1 னை துவங்க கூடாது."
+"%1 இந்த கணினியில் மற்றொரு காட்சியில் செயல்படுத்தப்பட்டு கொண்டிருக்கிறது. %2 னை ஒன்றுக்கு "
+"மேல் செயல்படுத்தினால் அஞ்சலை இழக்க வாய்ப்புள்ளது. நீங்கள் உறுதியாக இருக்கும்வரை %1 னை "
+"துவங்க கூடாது."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 இந்த கணினியில் மற்றொரு காட்சியில் செயல்படுத்தப்படுகிறதாம்.  %1 மற்றும் %2 வை "
-"ஒரெ நேரத்தில் செயல்ப்படுத்தினால் அஞ்சலை இழக்க வாய்ப்புண்டு . நீங்கள்  %1  "
-"செயல்படவில்லை என்று உறுதியாக இருக்கும்வரை இந்த கணினியில் %2 னை துவங்க கூடாது."
+"%1 இந்த கணினியில் மற்றொரு காட்சியில் செயல்படுத்தப்படுகிறதாம்.  %1 மற்றும் %2 வை ஒரெ "
+"நேரத்தில் செயல்ப்படுத்தினால் அஞ்சலை இழக்க வாய்ப்புண்டு . நீங்கள்  %1  செயல்படவில்லை என்று "
+"உறுதியாக இருக்கும்வரை இந்த கணினியில் %2 னை துவங்க கூடாது."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 முன்பே %2யில் செயல்பட்டதாம்.  %1 னை ஒன்றுக்கு மேல் செயல்ப்படுத்தினால் அஞ்சலை "
-"இழக்க வாய்ப்புள்ளது. %2. செயல்படவில்லை என்று உறுதியாக இருக்கும்வரை இந்த "
-"கணினியில் %1 னை துவங்க கூடாது"
+"%1 முன்பே %2யில் செயல்பட்டதாம்.  %1 னை ஒன்றுக்கு மேல் செயல்ப்படுத்தினால் அஞ்சலை இழக்க "
+"வாய்ப்புள்ளது. %2. செயல்படவில்லை என்று உறுதியாக இருக்கும்வரை இந்த கணினியில் %1 னை "
+"துவங்க கூடாது"
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1னை %3யில் செயல்படுத்தப்படுகிறதாம்.%1 மற்றும் %2 வை ஒரே நேரத்தில் "
-"செயல்படுத்தினால் அஞ்சலை இழக்க வாய்ப்புண்டு. நீங்கள் %1னை %3யில் செயல்படவில்லை "
-"என்று உறுதியாக இருக்கும்வரை இந்த கணினியில் %2 னை துவங்க கூடாது. "
+"%1னை %3யில் செயல்படுத்தப்படுகிறதாம்.%1 மற்றும் %2 வை ஒரே நேரத்தில் செயல்படுத்தினால் "
+"அஞ்சலை இழக்க வாய்ப்புண்டு. நீங்கள் %1னை %3யில் செயல்படவில்லை என்று உறுதியாக இருக்கும்வரை "
+"இந்த கணினியில் %2 னை துவங்க கூடாது. "
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10486,6 +10272,10 @@ msgstr "நிலை%1:"
 msgid "Exit"
 msgstr "வெளியேறு"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "புதிய செய்திகள்..."
@@ -10513,13 +10303,14 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "SMTP கடவுச்சொல்லை உருவாக்க கோப்பில் Kஅஞ்சல் சேமிக்க இதை தேர். கடவுச்சொல் குழப்ப "
-"வார்த்தையாக சேமிக்கப்படும், ஆனால் திறக்குறியீட்டு வினைகளிலிருந்து "
-"பாதுகாக்கப்பட்டதாக கருத முடியாது, உருவாக்க கோப்பினை அணுக முடிந்தால்."
+"வார்த்தையாக சேமிக்கப்படும், ஆனால் திறக்குறியீட்டு வினைகளிலிருந்து பாதுகாக்கப்பட்டதாக கருத "
+"முடியாது, உருவாக்க கோப்பினை அணுக முடிந்தால்."
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
 msgid "TDEWallet Not Available"
@@ -10576,8 +10367,7 @@ msgstr "SMTP சேவையக கள பெயர் அல்லது எண
 #: kmtransport.cpp:406
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
-msgstr ""
-"SMTP சேவையகத்துக்கான துறை எண்ணை பட்டியலிட்டுள்ளது. முன்னிருப்பு துரை 25."
+msgstr "SMTP சேவையகத்துக்கான துறை எண்ணை பட்டியலிட்டுள்ளது. முன்னிருப்பு துரை 25."
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -10588,9 +10378,8 @@ msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
-"அஞ்சல் அனுப்புவதற்கு முன், ஒரு ஆணை உள்ளாமையில் ஒடவேண்டும். உதாரணத்திற்கு ssh  "
-"சுரங்கங்கள் அமைக்க உபயோகிக்கலாம். ஆணை எதுவும் நிறைவேற்ற வேண்டாமென்றால் வெற்றாக "
-"விடவும்."
+"அஞ்சல் அனுப்புவதற்கு முன், ஒரு ஆணை உள்ளாமையில் ஒடவேண்டும். உதாரணத்திற்கு ssh  சுரங்கங்கள் "
+"அமைக்க உபயோகிக்கலாம். ஆணை எதுவும் நிறைவேற்ற வேண்டாமென்றால் வெற்றாக விடவும்."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10598,11 +10387,11 @@ msgstr "சேவையக உறுதிப்படுத்தல் &தே
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"அஞ்சல் வாங்குவதற்கு முன் உங்கள் SMTP சேவையக உறுதிபடுத்துதல் வேண்டினால் இதை "
-"தேர்வு செய். இது 'உறுதிப்படுத்தியSMTP' அல்லது சுருக்கமாக ASMTP என வழங்கப்படும்."
+"அஞ்சல் வாங்குவதற்கு முன் உங்கள் SMTP சேவையக உறுதிபடுத்துதல் வேண்டினால் இதை தேர்வு செய். "
+"இது 'உறுதிப்படுத்தியSMTP' அல்லது சுருக்கமாக ASMTP என வழங்கப்படும்."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10622,15 +10411,13 @@ msgstr "தன்விருப்ப புரவன் பெயரை &அ�
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-" Kஅஞ்சல் தனிப்பயன் விருந்தொம்பல் பெயர் கொண்டு அஞ்சல் சேவையகத்திடம் தன்னை "
-"அடையாளம் காட்ட இதை தேர்வு செய்."
-"<p> இது பயன்பாடின் விருந்தோம்பல் பெயர் சரியாக அமைக்க பெறாமலோ அல்லது உண்மையான "
-"விருதோம்பல் பெயரை மறைக்கவோ பயன்படும்."
+" Kஅஞ்சல் தனிப்பயன் விருந்தொம்பல் பெயர் கொண்டு அஞ்சல் சேவையகத்திடம் தன்னை அடையாளம் காட்ட இதை "
+"தேர்வு செய்.<p> இது பயன்பாடின் விருந்தோம்பல் பெயர் சரியாக அமைக்க பெறாமலோ அல்லது "
+"உண்மையான விருதோம்பல் பெயரை மறைக்கவோ பயன்படும்."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10660,8 +10447,8 @@ msgstr "உள்ளமை கோப்புகள் மட்டுமே ஆ
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "SMTP சேவையக கள பெயர் அல்லது எண் முகவரி"
 
 #: kmtransport.cpp:788
@@ -10675,10 +10462,10 @@ msgstr "%1 அடைவை பட்டியலிடும் போது ப
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10910,34 +10697,26 @@ msgstr "செய்தியை தோகு"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Crypto செருகுநிரல் திருப்பிக்கொடுத்த முறைபடுத்தும் தகவலை சரியாக செயல்படுத்த "
-"முடியவில்லை; செருகுநிரல் காயப்பட்டிருக்கலாம்.</p>"
-"<p>தயவு செய்து உங்கள் அமைப்பு நிர்வாகியை அணுகவும்</p></qt>"
+"<qt><p>Crypto செருகுநிரல் திருப்பிக்கொடுத்த முறைபடுத்தும் தகவலை சரியாக செயல்படுத்த "
+"முடியவில்லை; செருகுநிரல் காயப்பட்டிருக்கலாம்.</p><p>தயவு செய்து உங்கள் அமைப்பு "
+"நிர்வாகியை அணுகவும்</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p> செயலிலிருக்கும் செருகு நிரலெதுவும் கண்டுப்பிடிக்கப்படவில்லை மற்றும் "
-"உள்ளிருக்கும் OpenPGP ஆணை வெற்றிகரமாக ஓடவில்லை. </p>"
-"<p> இதை மாற்ற நீங்கள் இரண்டு வேலைகள் செய்யலாம்:</p>"
-"<ul>"
-"<li> செருகு நிரலை செயலாக்கலாம் அமைப்புகள்->Kஅஞ்சலை அமை->"
-"செருகுநிரல் உரையாடல்</li>"
-"<li><em>அல்லது</em> அதே உரையாடலின் அடையாளம்->அலாதியான தத்தல் யில் பாரம்பரிய "
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p> செயலிலிருக்கும் செருகு நிரலெதுவும் கண்டுப்பிடிக்கப்படவில்லை மற்றும் உள்ளிருக்கும் "
+"OpenPGP ஆணை வெற்றிகரமாக ஓடவில்லை. </p><p> இதை மாற்ற நீங்கள் இரண்டு வேலைகள் செய்யலாம்:</"
+"p><ul><li> செருகு நிரலை செயலாக்கலாம் அமைப்புகள்->Kஅஞ்சலை அமை->செருகுநிரல் உரையாடல்</"
+"li><li><em>அல்லது</em> அதே உரையாடலின் அடையாளம்->அலாதியான தத்தல் யில் பாரம்பரிய "
 "OpenPGP அமைப்புகளை குறிக்கலாம்</li></ul>"
 
 #: messagecomposer.cpp:445
@@ -10950,8 +10729,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10966,18 +10745,18 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Use OpenPGP/MIME instead?"
 
 #: messagecomposer.cpp:640
@@ -10999,8 +10778,8 @@ msgid ""
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
-"பெறுநரின் கையொப்பம் என்பது அவர் செய்தியினைக் கேட்க விரும்புகிறாரா அல்லது "
-"கையொப்பமிட விரும்புகிறாரா என்னும் முன்னுரிமையின் தகவல்கலைக் குறிப்பிடுகிறது.\n"
+"பெறுநரின் கையொப்பம் என்பது அவர் செய்தியினைக் கேட்க விரும்புகிறாரா அல்லது கையொப்பமிட "
+"விரும்புகிறாரா என்னும் முன்னுரிமையின் தகவல்கலைக் குறிப்பிடுகிறது.\n"
 "இச்செய்தியைக் கையொப்பமிடு?"
 
 #: messagecomposer.cpp:763 messagecomposer.cpp:786
@@ -11031,8 +10810,8 @@ msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
-"தாங்கள் இங்கு கையொப்பமிட வேண்டப்படுகிறீர்கள், ஆனால் கையொப்பமிடுவதற்கான விசை "
-"இங்கு உள்ளமைக்கப்படவில்லை.\n"
+"தாங்கள் இங்கு கையொப்பமிட வேண்டப்படுகிறீர்கள், ஆனால் கையொப்பமிடுவதற்கான விசை இங்கு "
+"உள்ளமைக்கப்படவில்லை.\n"
 "தாங்கள் தொடர விரும்பினால், கையொப்பமிடுவது செயல்படாது."
 
 #: messagecomposer.cpp:808
@@ -11084,18 +10863,17 @@ msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"அனைத்துப் பெறுநருக்கான தகுந்த மேலும் நம்பக்கூடிய மறைவிடக்க விசைகள் "
-"கிடைக்கப்பட்டுள்ளன.\n"
+"அனைத்துப் பெறுநருக்கான தகுந்த மேலும் நம்பக்கூடிய மறைவிடக்க விசைகள் கிடைக்கப்பட்டுள்ளன.\n"
 "இச்செய்தியினை மறைவிடக்கமாக்கு?"
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"பெறுநரின் மறைவிடக்க முன்னுரிமைகள் சோதித்தல் என்பது நீங்கள் கேட்க "
-"விரும்புகிறீர்களா அல்லது அச்செய்தியினை மறைவிடக்க விரும்புகிறீர்களா என்பதாகும்.\n"
+"பெறுநரின் மறைவிடக்க முன்னுரிமைகள் சோதித்தல் என்பது நீங்கள் கேட்க விரும்புகிறீர்களா அல்லது "
+"அச்செய்தியினை மறைவிடக்க விரும்புகிறீர்களா என்பதாகும்.\n"
 "இச்செய்தியினை மறைவிடக்கமாக்கு?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11128,12 +10906,13 @@ msgstr "மொழிபெயர்க்க வேண்டாம்"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"தாங்கள் இச்செய்தியினை மறைவிடக்குமாறுக் கேட்டுக் கொள்ளப்படுகிறீர்கள், மேலும் "
-"தங்களின் ஒர் நகலையும் மறைவிடக்கவும், ஆனால் இங்கு தகுந்த நம்பத்தக்க தெரிந்துக் "
-"கொள்ளுவதற்கான மறைவிடக்க விசைகள் உள்ளமைக்கப்படவில்லை."
+"தாங்கள் இச்செய்தியினை மறைவிடக்குமாறுக் கேட்டுக் கொள்ளப்படுகிறீர்கள், மேலும் தங்களின் ஒர் "
+"நகலையும் மறைவிடக்கவும், ஆனால் இங்கு தகுந்த நம்பத்தக்க தெரிந்துக் கொள்ளுவதற்கான மறைவிடக்க "
+"விசைகள் உள்ளமைக்கப்படவில்லை."
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -11142,13 +10921,13 @@ msgstr "மறையாக்கமற்றதாக அனுப்பு"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "செய்தியின் சிலப் பகுதிகள் மறைவிடக்கப்படாது.\n"
-"ஒரளவு மறைவிடக்கப்பட்டச் செய்தியினை அனுப்புதல் என்பது தளத்தின் விதிகளை "
-"மீறுவதற்காகவோ மேலும்/அல்லது நுட்பமானத் தகவல்களை இழப்பதற்கோ காரணமாகும்.\n"
+"ஒரளவு மறைவிடக்கப்பட்டச் செய்தியினை அனுப்புதல் என்பது தளத்தின் விதிகளை மீறுவதற்காகவோ "
+"மேலும்/அல்லது நுட்பமானத் தகவல்களை இழப்பதற்கோ காரணமாகும்.\n"
 "இல்லையேல் அனைத்து பகுதிகளையும் மறைவிடக்கமாக்கு?"
 
 #: messagecomposer.cpp:950
@@ -11159,8 +10938,8 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 "இச்செய்தி மறையாக்கம் செய்ய இயலாது\n"
-"ஓரளவு மறையாக்கம் செய்யப்பட்ட செய்தியினை அனுப்புதல் என்பது தளத்தின் விதிகளை "
-"மீறுவதற்காகவோ மேலும்/அல்லது நுட்பமானத் தகவல்களை இழப்பதற்கோ காரணமாகும்.\n"
+"ஓரளவு மறையாக்கம் செய்யப்பட்ட செய்தியினை அனுப்புதல் என்பது தளத்தின் விதிகளை மீறுவதற்காகவோ "
+"மேலும்/அல்லது நுட்பமானத் தகவல்களை இழப்பதற்கோ காரணமாகும்.\n"
 "இல்லையேல் அனைத்து செய்திகளையும் மறையாக்கமாக்கு?"
 
 #: messagecomposer.cpp:955
@@ -11171,92 +10950,84 @@ msgstr "&செய்தியை மறைக்குறியேற்று"
 msgid "Unencrypted Message Warning"
 msgstr "Unencrypted Message Warning"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>பிழை: பின் நிரை எந்த மறையாக்கப்பட்ட தரவையும் திருப்பவில்லை</p>"
-"<p> இந்த பிழை பற்றி அறிக்கையளிக்கவும்"
-"<br>%2</p></qt>"
+"<qt><p>பிழை: பின் நிரை எந்த மறையாக்கப்பட்ட தரவையும் திருப்பவில்லை</p><p> இந்த பிழை "
+"பற்றி அறிக்கையளிக்கவும்<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "சில எழுத்துக்கள் தொலைந்து போகலாம்"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "மேற்கோள் எழுத்துக்கள்."
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "குறியீட்டாக்கத்தை மாற்று."
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
-"இச்செய்திக் கையெழுத்திடப்பட இயலாது, ஏனெனில் பின் தேர்ந்தெடுக்கப்பட்டது "
-"கையெழுத்துக்காகத் துணைப்புரியாது. இவை நிகழ இயலாது ஏனெனில் தயவுச் செய்து வழுவின் "
-"அறிக்கையைக் கொடுக்கவும்."
+"இச்செய்திக் கையெழுத்திடப்பட இயலாது, ஏனெனில் பின் தேர்ந்தெடுக்கப்பட்டது கையெழுத்துக்காகத் "
+"துணைப்புரியாது. இவை நிகழ இயலாது ஏனெனில் தயவுச் செய்து வழுவின் அறிக்கையைக் கொடுக்கவும்."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
-"இச்செய்திக் கையெழுத்திடப்பட இயலாது, ஏனெனில் பின் தேர்ந்தெடுக்கப்பட்டது "
-"கையெழுத்துக்காகத் துணைப்புரியாது. இவை நிகழ இயலாது ஏனெனில் தயவுச் செய்து வழுவின் "
-"அறிக்கையைக் கொடுக்கவும்."
+"இச்செய்திக் கையெழுத்திடப்பட இயலாது, ஏனெனில் பின் தேர்ந்தெடுக்கப்பட்டது கையெழுத்துக்காகத் "
+"துணைப்புரியாது. இவை நிகழ இயலாது ஏனெனில் தயவுச் செய்து வழுவின் அறிக்கையைக் கொடுக்கவும்."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "செய்திக் மறைவிடக்க இயலாது, ஏனெனில் பின் தேர்ந்தெடுக்கப்பட்டது கையெழுத்துக்காகத் "
-"துணைப்புரியாது. இவை நிகழ இயலாது ஏனெனில் தயவுச் செய்து வழுவின் அறிக்கையைக் "
-"கொடுக்கவும்."
+"துணைப்புரியாது. இவை நிகழ இயலாது ஏனெனில் தயவுச் செய்து வழுவின் அறிக்கையைக் கொடுக்கவும்."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "செய்திக் கையெழுத்திடப்படவோ அல்லது மறைவிடக்கப்படவோ இயலாது, ஏனெனில் பின் "
-"தேர்ந்தெடுக்கப்பட்டது கையெழுத்துக்காகவோ அல்லது மறைவிடக்கவோ துணைப்புரியாது. இவை "
-"நிகழ இயலாது ஏனெனில் தயவுச் செய்து வழுவின் அறிக்கையைக் கொடுக்கவும்."
+"தேர்ந்தெடுக்கப்பட்டது கையெழுத்துக்காகவோ அல்லது மறைவிடக்கவோ துணைப்புரியாது. இவை நிகழ "
+"இயலாது ஏனெனில் தயவுச் செய்து வழுவின் அறிக்கையைக் கொடுக்கவும்."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11277,10 +11048,10 @@ msgstr "அஞ்சல் பெட்டியின் &அமைப்பு
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11290,8 +11061,8 @@ msgstr "அடைவு உள்ளடக்கங்கள்:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11313,8 +11084,7 @@ msgstr "பெயர் எதுவும் குறிப்பிடவி�
 
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
-msgstr ""
-"<qt><b>%1</b> அடைவினை உருவாக்க முடியவில்லை, அடைவு முன்பே இருக்கிறது.</qt>"
+msgstr "<qt><b>%1</b> அடைவினை உருவாக்க முடியவில்லை, அடைவு முன்பே இருக்கிறது.</qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -11332,8 +11102,7 @@ msgstr "கையொப்பத்திற்கு வெவ்வேறு �
 msgid "The crypto engine returned no cleartext data."
 msgstr "குறியீட்டு பொறி சுத்த உரை தரவு அதுவும் கொடுக்கவில்லை"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "நிலை:"
 
@@ -11362,8 +11131,8 @@ msgstr "செருகு நிரல் %1 கண்டுபிடிக்�
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "கையொப்பத்தின் செல்லுபடி சரிபார்க்க முடியவில்லை.<br />காரணம்: %1."
 
 #: objecttreeparser.cpp:737
@@ -11400,27 +11169,27 @@ msgstr "மறை செருகி \"%1\" செய்திகளை மற�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>குறிப்பு:</b> இது ஒரு HTML செய்தி. பாதுகாப்பு காரணங்களுக்காக பச்சை HTML  "
-"குறி மட்டும் காட்டப்படுகிறது. அனுப்புநர் மீது நம்பிக்கை வைத்திருந்தால், நீங்கள் "
-"பகுக்கப்பட்ட் HTML  காட்சியை இந்த செய்திக்கு, இங்கு சொடுக்கி <a "
-"href=\"kmail:showHTML\"></a>  செயல்படுத்தலாம்."
+"<b>குறிப்பு:</b> இது ஒரு HTML செய்தி. பாதுகாப்பு காரணங்களுக்காக பச்சை HTML  குறி "
+"மட்டும் காட்டப்படுகிறது. அனுப்புநர் மீது நம்பிக்கை வைத்திருந்தால், நீங்கள் பகுக்கப்பட்ட் HTML  "
+"காட்சியை இந்த செய்திக்கு, இங்கு சொடுக்கி <a href=\"kmail:showHTML\"></a>  "
+"செயல்படுத்தலாம்."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>குறிப்பு:</b> இது ஒரு HTML செய்தி. பாதுகாப்பு காரணங்களுக்காக பச்சை HTML  "
-"குறி மட்டும் காட்டப்படுகிறது. அனுப்புநர் மீது நம்பிக்கை வைத்திருந்தால், நீங்கள் "
-"பகுக்கப்பட்ட் HTML  காட்சியை இந்த செய்திக்கு, இங்கு சொடுக்கி <a "
-"href=\"kmail:showHTML\"></a>  செயல்படுத்தலாம்."
+"<b>குறிப்பு:</b> இது ஒரு HTML செய்தி. பாதுகாப்பு காரணங்களுக்காக பச்சை HTML  குறி "
+"மட்டும் காட்டப்படுகிறது. அனுப்புநர் மீது நம்பிக்கை வைத்திருந்தால், நீங்கள் பகுக்கப்பட்ட் HTML  "
+"காட்சியை இந்த செய்திக்கு, இங்கு சொடுக்கி <a href=\"kmail:showHTML\"></a>  "
+"செயல்படுத்தலாம்."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11676,11 +11445,11 @@ msgstr "சேர்க்கப்பட்டது:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"கையெழுத்துக்கு உபயோகிக்கும் %1 ல் மின்னஞ்சல் முகவரி எதுவும் சேமிக்கப்படவில்லை, "
-"ஆகவே அதை பெறுநர் முகவரி %2 உடன் ஒப்பிட முடியாது."
+"கையெழுத்துக்கு உபயோகிக்கும் %1 ல் மின்னஞ்சல் முகவரி எதுவும் சேமிக்கப்படவில்லை, ஆகவே அதை "
+"பெறுநர் முகவரி %2 உடன் ஒப்பிட முடியாது."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11796,13 +11565,14 @@ msgstr "Kioslaveசல் பிழை தகவல்"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"UIDL ஆணையை உங்கள் POP3 சேவையகம் ஆதரிக்கவில்லை. Kஅஞ்சல் சேவையகத்தில், எந்தெந்த "
-"அஞ்சல்கள் பார்க்கப்பட்டுவிட்டன என்பதை அறிய இந்த ஆணை தேவைப்படும்\n"
+"UIDL ஆணையை உங்கள் POP3 சேவையகம் ஆதரிக்கவில்லை. Kஅஞ்சல் சேவையகத்தில், எந்தெந்த அஞ்சல்கள் "
+"பார்க்கப்பட்டுவிட்டன என்பதை அறிய இந்த ஆணை தேவைப்படும்\n"
 "ஆகவே அஞ்சல்களை சேவையகத்தில் விடும். இந்த பண்புக்கூறு சரியாக வேலை செய்யாது."
 
 #: popaccount.cpp:752
@@ -11820,10 +11590,11 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
-"மொத்த செய்திகள் %2  இருந்து %5 லிருந்து %1 பெற்றுத்தரப்படுகிறது (மொத்த %4 KB "
-"லிருந்து %3  ) (%6 KB சேவையகத்தில் மீதம் இருக்கிறது)"
+"மொத்த செய்திகள் %2  இருந்து %5 லிருந்து %1 பெற்றுத்தரப்படுகிறது (மொத்த %4 KB லிருந்து "
+"%3  ) (%6 KB சேவையகத்தில் மீதம் இருக்கிறது)"
 
 #: popaccount.cpp:912
 #, fuzzy
@@ -11840,1787 +11611,14 @@ msgstr "செல்லுபடியாகாத பதில் சேவை�
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "TOP ஆணையை உங்கள் சேவையகம் ஆதரிக்கவில்லை. ஆகையால் முதலில் கீழிறக்காமல், பெரிய "
 "மின்னஞ்சல்களின் தலைப்புகளை பெறுவதற்கான சாத்தியம் இல்லை. "
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&போ"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&ஆவணம்"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&செய்தி"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&வழியனுப்பு"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML கருவிப்பெட்டி"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "குறியிடுதல்"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&தானாக குறியிடும் செய்திகள் "
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"<qt>"
-"<p>  விருப்பத்தேர்வு  செயல்படும் பொழுது,  நீங்கள் அனுப்பிய அனைத்து செய்திகளும் "
-"புகுபதிகையாகிவிடும். சில நேரம் ஒவ்வொருவரது செய்தியையும் வெளியேறிவிடும்</p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "மறையாக்கம்"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"இந்த விருப்பத்தேர்வுகள் செயல்படுத்தப்பட்டால், செய்தி/கோப்பு காண்பவரின் கண்களில் "
-"இருந்து மறைவிடக்கப்பட இயலாது, மேலும் தங்களின் விசையிலும் இவ்வாறே நிகழும். "
-"இவ்வாறு செய்வதன் மூலம் தாங்கள் செய்தி/கோப்பினை பிற்காலத்தில் காணச்செய்யலாம். "
-"இவையே பொதுவாக நல்ல யோசனையாக அமையும்."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "குறியிட்ட/மறையாக்கப்பட்ட உரைக்கு பிறகு தொகுப்பதை காட்டும்"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"இந்த விருப்பத்தேர்வுகள் செயலாக்கப்பட்டால், கையெழுத்திடப்பட்ட/மறைவிடக்கப்பட்ட "
-"எழுத்துருக்கள் தனி சாளரத்தில் காண்பிக்கப்படும், அதன் மூலம் தாங்கள் "
-"அனுப்புவதற்கு முன்னரே அவை எவ்வாறு வெளியிடப்படும் என்பதை அறிந்துக் கொள்ளலாம்."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "&அனுப்பிய செய்திகளை மறைத்து சேமி"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Check to store messages encrypted "
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>செய்திகளை மறைக்குறியீட்டி சேமி</h1>\n"
-"இந்தப் பெட்டியை தேர்வு செய்தால்,  அனுப்பப்பட்ட செய்திகள், அனுப்பியபடியே "
-"மறைகுறியீட்டபடி சேமிக்கப்படும்.  இது பரிந்துரைக்கப்படுவதில்லை, ஏனென்றால் "
-"தேவையான ஒரு சான்றிதழ் காலம் கடந்துவிட்டால் அச்செய்திகளை உங்களால் படிக்க "
-"முடியாது.\n"
-"<p>\n"
-"ஆனாலும், உங்கள் உள்ளாமை விதிகள் உங்களை இதை தேர்வு செய்ய சொல்லலாம். "
-"சந்தேகமிருந்தால், உங்கள் உள்ளாமை நிர்வாகியிடம் கேட்கவும்.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "மறையாக்க விசைகளை ஏற்பதற்காக எப்போதும் காட்டு"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"இந்த விருப்பத்தேர்வுகள் செயலாக்கப்பட்டால், இந்தப் பயன்பாடு தங்களுக்கு  "
-"மறைவிடக்கச் செய்ய உதவும் அனைத்து பொது விசைகளின் பட்டியலைக் காண்பிக்கும். அவைகள் "
-"செயல் நிறுத்தப்பட்டால் தாங்கள் உரையாடல் பெட்டியை மட்டுமே காண இயலும் சரியான "
-"விசையையோ அல்லது பலவற்றையோ செயல்படுத்த இயலாது."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "இயலும்போதெல்லாம் செய்திகளை தானாகவே மறையாக்கம் செய்க"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"<qt>"
-"<p> இந்த விருப்பத்தேர்வு செயல்படும் பொழுது, நீஙகள் அனுப்பிய அனைத்து செய்திகளும் "
-"மறையாக்கமாகி மாறிவிடும்.  சிலசமயம் தானாக அனைத்து செய்திகளும் ஒவ்வொன்றாக தானாக "
-"மறையாக்கமாக முடக்க வாய்ப்பு உள்ளது </p></qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "மறையாக்கும் போது குறியாக்காதே"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "பெறுநர்: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "பொது"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "& பதிலளி"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "&அனைவருக்கும் பதிலளி..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&வழியனுப்பு"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "குறுக்குவழி"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "மேலெழுது"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "ஆவண பணபுகள்"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "அடைவு ஒரு அஞ்சற்குழுவைக் கொண்டுள்ளது"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "முகவரியை பட்டியலிடு:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "சாதாரண:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "படிக்காதது:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "பழைய செய்தி"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "பிறகு நீக்கு:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "படித்த செய்திகளை நீக்கு"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "பிறகு நீக்கு:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "படிக்காத செய்திகளை நீக்கு"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "நாள்(கள்)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "வாரம்(கள்)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "மாதம்(கள்)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "மேம்பட்ட"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "புதிய அடையாளம்"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Sசேமிப்பு வடிவம்"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Lபட்டியல் காட்சிகள்:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "CRL களை பயன்படுத்தி சான்றிதழை பரிசோதி"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"இந்த விருப்பம் தேர்ந்தெடுக்கப்படுமேயானால், S/MIME சான்றிதழ் என்பது சான்றிதழ் "
-"மறுகுறிப்பு பட்டியலில் தகுதியிடு(CRLs)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "சான்றிதழை நிகழ்நிலையில் பரிசோதி (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"இந்த விருப்பம் தேர்ந்தெடுக்கப்படுமேயானால், S/MIME சான்றிதழ் என்பது நிகழ்நிலை "
-"சான்றிதழ் நிலை நெறிமுறை(OCSP). URLலை நிரப்பு OCSP கீழுள்ள மறுமொழியில் செய்."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "சான்றிதழ் ஏற்கப்படாதது."
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP ரெஸ்பாண்டர் URL:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"நிகழ்நிலை சான்றிதழ் மதிப்புரைக்கானச் சேவையக முகவரியை இங்கு நுழைக்கவும்(OCSP "
-"மறுமொழிப்பான்). URL என்பது இயல்பாக http:// கொண்டுத் துவங்குகிறது."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP நல்ல கையொப்பம்"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "சான்றிதழ்களின் வலைமனை சேவையைத் தவிர்"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "சான்றிதழ்களை அனுப்பாதே."
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"முன்னிருப்பாக ஜிஎன்யுPG கோப்புக்களைப் பயன்படுத்தவும் "
-"~/.ஜினுப்ஜி/விதிகள்.டிஎக்ஸ்டி சோதிக்க சான்றிதழின் விதிகளை அனுமதிக்கவும். இந்த "
-"விருப்பம் தேர்ந்தெடுக்கப்பட்டால், விதிகள் சோதிக்கப்படாது."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "CRL லை ஆலோசனை செய்யாதே"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"இந்த விருப்பம் சோதிக்கப்படுமேயானால், தேவைப்பட்டு கொடுக்கப்படும் சான்றிதழ்களைக் "
-"பட்டியலிடு S/MIME பொருந்தும்."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "கொணர் சான்றிதழை சேர்க்கும் போது"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"இந்த விருப்பம் சோதிக்கப்படுமேயானால், தேவைப்பட்டு கொடுக்கப்படும் சான்றிதழ்களைக் "
-"கொணர்(இவைகள் மற்ற இரு வகைகளுக்கும் பொருந்தும், CRLs மற்றும் OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP கோரிக்கைகள்"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "எந்த HTTP கோரிக்கைகளையும் செயல்படுத்தாதே"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "சான்றிதழ்களின் வலைமனை சேவையைத் தவிர்"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP கோரிக்கைகள்"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "சான்றிதழ்களின் வலைமனை சேவையைத் தவிர்"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&சேர்..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&குழுகலன்"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "எழுத்துரு அமைவுகளை மாற்றியமை"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "எண்ணிலடங்காத"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "கையொப்ப கட்டமைப்பு"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "அனுப்பியவருக்கு பதில் அனுப்பவும்: "
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "&அனைவருக்கும் பதிலளி..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "வழியனுப்பப்பட்ட செய்தி"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "கையெழுத்திடாத தகவல்களை அனுப்பும் போது எச்சரிக்கை செய்"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "கையெழுத்திடாத தகவல்களை அனுப்பும்போது பரிசோதி"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>கையெழுத்திடாத தகவலை அனுப்ப முயன்றால் எச்சரி</h1>\n"
-"இந்த பெட்டி தேர்ந்தெடுத்திருந்தால், அனைத்து தகவலும் கையெழுத்திடாதவையை அனுப்ப "
-"முயன்றால் எச்சரிக்கை செய்.\n"
-"<p>\n"
-"அதிக சவுகரியத்திற்கு இந்தப் பெட்டியை தேர்ந்தெடுப்பது பரிந்துரைக்கப்படுகிறது.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&மறைக்கப்படாத செய்திகளை அனுப்ப முற்படும் போது எச்சரிக்கை செய்"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "மறைகுறியீடில்லா செய்திகள் அனுப்பும் போது எச்சரிக்க, இங்கு தேர்."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>மறைகுறியீடப்படா செய்திகளை அனுப்ப முயற்சிக்கும் பொழுது எச்சரி</h1>\n"
-"இப்பெட்டி தேர்ந்தெடுக்கப்பட்டால், நீங்கள் பகுதிகளோ, முழு செய்தியோ "
-"மறைக்குறியீடப்படாமல் அனுப்ப முயற்சித்தால் எச்சரிக்கப்படுவீர்கள்.\n"
-"<p>\n"
-"அதிகபட்ச சுத்தமிருக்க இந்த தேர்வு இருக்க பரிந்துரைக்கப்படுகிறது.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-"பெறுநர் மின்னஞ்சல் முகவரி சான்றிதழில் இல்லையென்றால் எச்சரிக்கை செய்யவும்"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-"முகவரி சான்றிதழில் இல்லையென்றால் எச்சரிக்கை செய்கின்றதா என்று சோதனை செய்"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>சான்றிதழலில் பெறுநரின் மின்னஞ்சல் முகவரி இல்லையென்றால் எச்சரி</h1>\n"
-"இதை தேர்ந்தால், பெறுநரின் மின்னஞ்சல் முகவரி மறைக்குறியீட்டுக்கு "
-"பயன்படுத்தப்படும் சான்றிதழில் இல்லையென்றால் எச்சரிக்கை அளிக்கப்படும்.\n"
-"<p>\n"
-"அதிகபட்ச பாதுகாப்பிற்கு இத்தேர்வு செயலாக்கத்தின் விட பரிந்துரைக்கப்படுகிறது.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr " சான்றிதழ் குறைந்த நிலையில் காலாவதியானால் எச்சரிக்கை செய்"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "ஒப்பிடுதலின் பயன்பாடு"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "மறையாக்கத்திற்கான"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr "தினங்கள்"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "தினங்களின் எண்ணிக்கையை இங்கே தேர்வு செய்யவும்"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>கையெழுத்து சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
-"குறைந்தபட்ச நாளை தேர்ந்தெடுத்தால் எச்சரிக்காமல் ஏற்றுக் கொள்ளவும்.\n"
-"<p>\n"
-"SPHINX அமைப்புகள் 14 நாளுக்குப் பரிந்துரைக்கப்படுகிறது.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>மறைக்குறியீடு சான்றிதழ் காலம் கடந்தால் எச்சரி</h1>\n"
-"எச்சரிக்கை கொடுக்காமல் மறைக்குறியீட்டு சான்றிதழ் செல்லுபடியாக இருக்க வேண்டிய "
-"குறைந்தபட்ச நாட்களை தேர்வு செய்யுங்கள்.\n"
-"<p>\n"
-"பரிந்துரைக்கப்பட்ட SPHINX  அமைப்பு - 14 நாட்கள்.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>கையெழுத்து சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
-"குறைந்தபட்ச நாளை தேர்ந்தெடுத்தால் எச்சரிக்காமல் ஏற்றுக்கொள்ளவும்.\n"
-"<p>\n"
-"SPHINX அமைப்புகள் 14 நாளுக்கு பரிந்துரைக்கப்படுகிறது.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>கையெழுத்து சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
-"குறைந்தபட்ச நாளை தேர்ந்தெடுத்தால் எச்சரிக்காமல் ஏற்றுக்கொள்ளவும்.\n"
-"<p>\n"
-"SPHINX அமைப்புகள் 14 நாளுக்கு பரிந்துரைக்கப்படுகிறது.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>மூல சான்றிதழ் காலம் கடந்தால் எச்சரி</h1>\n"
-"எச்சரிக்கை அளிக்காமல் குறைந்தபட்சம் எத்தனை நாட்கள் மூலச் சான்றிதழ் "
-"செல்லுப்படியாக வேண்டும்.\n"
-"<p>\n"
-"SPHINX  அமைப்பு பரிந்துரை- 14  நாட்கள்.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "For root certificates:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "For intermediate CA certificates:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "For end-user certificates/keys:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "அனைத்தையும் மீண்டும் செயல்படச்செய் \"Don't Ask Again\" எச்சரிக்கைகள்"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&அடைவு உள்ளடக்கங்கள்:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "மேலெழுது"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "மேலெழுது"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Send queued mail on mail check"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"ஆவணத் தேர்ந்தெடுப்பு உரையாடல் பெட்டியில் இருந்து மிக அண்மையில் "
-"தேர்ந்தெடுக்கப்பட்ட அடைவு"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "அமைப்பு தட்டை எப்போதும் காட்டு"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "வேர்பிராஸ் புதிய அஞ்சல் அறிவிப்பு"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"இந்த தேர்வு ஓவ்வொரு கோப்பினையும் செயல்பட செய்யும். புதிதாக வரபட்ட செய்தி புதிய "
-"அஞ்சல் அறிவிப்பில் காட்டும்; இல்லையென்றால், உங்களுக்கு சாதாரண 'புதிய அஞ்சல் "
-"வந்துள்ளது'  செய்தி கிடைக்கும்."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "தொகுப்பானை குறிப்பிடுக:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "அமைப்பானுக்கு பதில் வெளியார்ந்த தொகுப்பானை பயன்படுத்து"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "குழு பொருள் செயல்பாடுகளை செயலாக்கச் செய்யவும்."
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-"பாரம்பரிய வகை: அனுப்புநர்/பெறுநர்:தலைப்புகளின் அழைப்புகளுக்குப் பதில் "
-"அழைப்புகள்."
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"மைக்ரோசாஃப்ட் அவுட்லுக்கில் எளியமுறையில் எண்ணிக்கைகளைக் காணலாம் \"\n"
-"\"in இயல்பான நடைமுறையில் உள்ள  நாள் அட்டவணை ; \"\n"
-"   \"  ஒன்றை மட்டும் எடுத்து தேர்வு செய்யும், இருந்தால் மட்டும்  \"\n"
-"          \"பிரச்சினை இருந்தால் மட்டுமே அவுட்லுக் என்பது \"\n"
-"          \"தங்களின் மறுமொழியைக் கூறும், இந்த விருப்பத்தை அமைக்க முயற்சி."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "தானாகவே அழைப்பிதழ் அனுப்புதல்"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>This chooses the parent of the IMAP resource \"\n"
-"          \"folders.</p>"
-"<p>By default, the Kolab server sets \"\n"
-"          \"the IMAP inbox to be the parent.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"இந்த மதிப்பு கேமெயில் துவக்கத்தில் வெளியிடுவதா \"\n"
-"          \"என்பதை முடிவெடுக்கப் பயன்படுகிறது."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "வேக தேடல் வரி திருத்தியை காட்டு"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"பதிலளிக்கும் போதோ அல்லது வேறொருவருக்கு அனுப்பும் போதோ முன்னிருந்த "
-"எழுத்துக்கோவையை முடியுமானால் வைத்திருக்கவும்"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "கையழுத்தை தானாக கூட்டு"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"அடையாளத்தை நினைவில் வைக்கவும்,,இதனால் பிற்காலத்தில் தொகுப்பி சாளரத்தில் "
-"உபையோகிக்கலாம்"
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"இந்த ஆவணம் உருப்படிகளை அனுப்பியது என்று நினைவில் வைக்கவும்,,இதனால் "
-"பிற்காலத்தில் தொகுப்பி சாளரத்தில் உபையோகிக்கலாம்"
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"இந்த அஞ்சல் போக்குவரத்தை நினைவில் வைக்கவும்,இதனால் பிற்காலத்தில் தொகுப்பி "
-"சாளரத்தில் உபையோகிக்கலாம் "
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"அடையாளத்தை நினைவில் வைக்கவும்,,இதனால் பிற்காலத்தில் தொகுப்பி சாளரத்தில் "
-"உபையோகிக்கலாம்"
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "நிரலில் வார்த்தை மடிப்பு:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "மூல சான்றிதழ் குறைந்த நாளில் காலாவதியானால் எச்சரிக்கை செய்"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Outlook &#8482;  அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த "
-"விருப்பத்தை செயலாக்கு."
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "தானியக்கமாக அஞ்சல் கையாளல் அறிவிப்புகள் கேட்டல்"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>ஒவ்வொரு வெளிவரும் செய்திக்கும் செய்தி அணி அறிவிப்புகள் (MDNs) KMail  "
-"வேண்டுமென்றால் இந்த விருப்பத்தை தேர்ந்தெடுங்கள்..</p>"
-"<p>இந்த விருப்பம் முன்னிருப்பை பாதிக்கும்; வகைப்பட்டியில் அமைப்பாளர் தேர்வு "
-"கொண்டு நீங்கள் MDN வேண்டுதலை செய்தி வாரியாக செயலாக்க செயலிழக்க செய்ய உங்களால் "
-"செய்யமுடியும்.<em>விருப்பங்கள்</em>->&gt;<em>அணி அறிவிப்பு கேட்டல்</em>.</p>"
-"</qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "தானாகச் சேமிக்கும் இடைவெளி:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "கண்டு கொண்ட முன்னொட்டுகளை Re: என மாற்றியமை"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Replace recognized prefix with \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "சூட்டிகையாக மேற்கோளிடு "
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "கையொப்பம் காலாவதியானது"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"பதிலளிக்கும் போதோ அல்லது வேறொருவருக்கு அனுப்பும் போதோ முன்னிருந்த "
-"எழுத்துக்கோவையை முடியுமானால் வைத்திருக்கவும்"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "&அனுப்பிய செய்திகளை மறைத்து சேமி"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "தலைப்புகளில் வேண்டாத அஞ்சல் நிலையைக் காட்டு"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "புதிய அஞ்சல் அறிவிப்பு"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "செய்தி பட்டியல் - புதிய செய்திகள்"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, fuzzy, no-c-format
-msgid "Message template for forward"
-msgstr "செய்தி திருப்பி அனுப்பட்டதாக குறி"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "&மேற்கோள் எழுத்துக்களை சேர்"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -13731,6 +11729,11 @@ msgstr "CC ஆகச் சேர்"
 msgid "Add as BCC"
 msgstr "BCC ஆகச் சேர்"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "நிறுத்தப்பட்டது"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13746,10 +11749,10 @@ msgstr "தேர்ந்தெடுக்கபட்ட பெறுநர�
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13766,8 +11769,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13870,10 +11873,19 @@ msgstr "அதிகமான அல்லது சமமான"
 msgid " bytes"
 msgstr "பைட்"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr "தினங்கள்"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -14026,13 +12038,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -14050,8 +12060,7 @@ msgid ""
 msgstr "கணக்கு வகை: IMAP கணக்கு"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -14069,8 +12078,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -14079,8 +12087,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "இருக்கும் வடிகட்டிகள்"
 
 #: sievedebugdialog.cpp:358
@@ -14153,8 +12160,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -14171,17 +12178,22 @@ msgstr ""
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "ஆணையை குறிப்பிடு"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "புதிய உள்ளீடு:"
@@ -14218,6 +12230,11 @@ msgstr "கணக்குச் சேர்"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>பெயரிட்ட அடையாளத்தை நிச்சயமாக நீக்க வேண்டுமா?<b>%1</b> "
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "பதிலை இங்கே அனுப்பவும்: "
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14232,6 +12249,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "தொகு..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14271,9 +12292,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14310,6 +12331,16 @@ msgstr "மொழிபெயர்க்க வேண்டாம்"
 msgid "Cannot insert content from file %1: %2"
 msgstr "%1 கோப்பினை திறக்க முடியவில்லை %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "பெறுநர்: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14345,36 +12376,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14608,6 +12635,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14644,114 +12675,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...அடுத்த செய்திகளைக் காண இடது பொத்தான் மற்றும் வலது \n"
-" பொத்தானை பயன்படுத்தவும்?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...அங்கு நீங்கள் வடிகட்டியை அனுப்புவரிடம் உருவாக்க முடியும்,\n"
-"பொருள் மற்றும் அஞ்சல் பட்டியலில் <em>கருவிகள்-&gt;உருவாக்கு&nbsp;வடிகட்டி</em>"
-"?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...<em>திரும்ப எழுதும் தலைப்பு</em> வடிகட்டி செயல் கொண்டு\n"
-"நீங்கள் அஞ்சல் பட்டியல்களின் பொருளுடன் சேர்க்கப்பட்ட &quot;[\n"
-"அஞ்சல் பட்டியல் பெயர் ]&quot;ஐ அழிக்க முடியுமென்று? \n"
-"<pre>திரும்ப எழுதும் தலைப்பு&quot;பொருள்&quot;\n"
-"மாற்று &quot;\\s*\\[அஞ்சல் பட்டியல் பெயர்\\]\\s*&quot;\n"
-"&quot;&quot; கொண்டு;</pre>\n"
-"பயன்படுத்தவும்</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...<em>ஆவண-&gt;  தன்மைகள்</em>உரையாடலில் அஞ்சல்\n"
-"பட்டியல்களுடன் ஆவணங்களுடன் சம்பந்தப்படுத்தலாம் என்று?\n"
-"அதன் பிறகு நீங்கள் <em>செய்தி-&gt;புது&nbsp;செய்தி&nbsp;பெறுநர்&nbsp;\n"
-"அஞ்சல்&nbsp;பட்டியல்...</em> பயன்படுத்தி முன் அமைத்த அஞ்சல் பட்டியலுடன்\n"
-"தொகுப்பாளரை திறக்கலாம். மாற்றாக, ஆவணத்தின் மேல் சுட்டியின் நடு\n"
-"பொத்தனை சொடுக்கலாம்.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...நீங்கள் உங்கள் விருப்ப சின்னங்களை ஒவ்வொரு அடைவுக்கும் குறியிடமுடியும்\n"
-"<em>அடைவு-&gt;பண்புகளை...</em> பார்</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...பதிலளிக்கும்போது, செய்தியில் தேர்ந்தெடுக்கப்பட்ட பகுதியை மட்டும் "
-"மேற்கோளிடலாம் என்று?</p>\n"
-"<p>எதுவும் தேர்ந்தெடுக்கப்படாவிட்டால், முழு செய்தியும் மேற்கோளிடப்படும்.</p>\n"
-"<p><em>இணைப்புகள்-&gt;பார்-&gt ஐ நீங்கள் உள்ளே தேர்ந்தெடுக்கும் போது "
-"இணைப்புகளின்\n"
-"உரைகளுடனும் இது வேலை செய்யும். /em>.</p>\n"
-"<p><em>செய்தி-&gt;மேற்கோளிடாமல் பதிலளி</em> தவிர எல்லா\n"
-"பதிலளிக்கும் ஆணைகளுக்கும் இந்த பண்பு உண்டு.</p>\n"
-"<p align=\"வலது\"><em> கொடுத்தவர் David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "மீட்க ஒன்றும் இல்லை."
@@ -14818,6 +12741,17 @@ msgstr "இணைப்பு #%1 (பெயரில்லா)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "கோப்பு %1 ஏற்கனவே உள்ளது. அதன் மேல் எழுதவா?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "&மேல்எழுது"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14863,8 +12797,7 @@ msgid ""
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
 "Default values will be used."
 msgstr ""
-"யாரோ( நீங்களாக இருக்கலாம்) சேவையகத்தின் விடுமுறை விவரத்தை "
-"மாற்றியிருக்கிறார்கள்.\n"
+"யாரோ( நீங்களாக இருக்கலாம்) சேவையகத்தின் விடுமுறை விவரத்தை மாற்றியிருக்கிறார்கள்.\n"
 "Kஅஞ்சலால் தானியங்கும் பதில்களுக்கான காரணிகளை இனிமேலும் நிர்ணயக்க முடியவில்லை.\n"
 "முன்னிருப்பு மதிப்புகள் பயன்படுத்தப்படும்."
 
@@ -14934,9 +12867,9 @@ msgstr "&ஒவ்வொரு செய்தியுடன் படத்த
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14971,9 +12904,9 @@ msgstr "கோப்பைத் தேர்ந்தெடு..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14982,15 +12915,15 @@ msgstr "முகவரிபுத்தகத்தில் இருந்�
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14999,8 +12932,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -15016,130 +12949,1673 @@ msgstr "படம் இல்லை"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "குறியிடுதல்"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&தானாக குறியிடும் செய்திகள் "
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"<qt><p>  விருப்பத்தேர்வு  செயல்படும் பொழுது,  நீங்கள் அனுப்பிய அனைத்து செய்திகளும் "
+"புகுபதிகையாகிவிடும். சில நேரம் ஒவ்வொருவரது செய்தியையும் வெளியேறிவிடும்</p></qt>"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "மறையாக்கம்"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "செய்தியின் பொருளை அமை"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"இந்த விருப்பத்தேர்வுகள் செயல்படுத்தப்பட்டால், செய்தி/கோப்பு காண்பவரின் கண்களில் இருந்து "
+"மறைவிடக்கப்பட இயலாது, மேலும் தங்களின் விசையிலும் இவ்வாறே நிகழும். இவ்வாறு செய்வதன் மூலம் "
+"தாங்கள் செய்தி/கோப்பினை பிற்காலத்தில் காணச்செய்யலாம். இவையே பொதுவாக நல்ல யோசனையாக "
+"அமையும்."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "CC யை 'முகவரிக்கு'  அனுப்பு"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "குறியிட்ட/மறையாக்கப்பட்ட உரைக்கு பிறகு தொகுப்பதை காட்டும்"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "BBC யை அனுப்பு: 'முகவரி' க்கு"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"இந்த விருப்பத்தேர்வுகள் செயலாக்கப்பட்டால், கையெழுத்திடப்பட்ட/மறைவிடக்கப்பட்ட எழுத்துருக்கள் "
+"தனி சாளரத்தில் காண்பிக்கப்படும், அதன் மூலம் தாங்கள் அனுப்புவதற்கு முன்னரே அவை எவ்வாறு "
+"வெளியிடப்படும் என்பதை அறிந்துக் கொள்ளலாம்."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "செய்திக்கு 'தலைப்பு' சேர்க்கவும்"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "&அனுப்பிய செய்திகளை மறைத்து சேமி"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "கோப்பிலிருந்து செய்தியின் கருத்தைப் படி."
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Check to store messages encrypted "
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "செய்தியின் கருத்தை அமை"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>செய்திகளை மறைக்குறியீட்டி சேமி</h1>\n"
+"இந்தப் பெட்டியை தேர்வு செய்தால்,  அனுப்பப்பட்ட செய்திகள், அனுப்பியபடியே மறைகுறியீட்டபடி "
+"சேமிக்கப்படும்.  இது பரிந்துரைக்கப்படுவதில்லை, ஏனென்றால் தேவையான ஒரு சான்றிதழ் காலம் "
+"கடந்துவிட்டால் அச்செய்திகளை உங்களால் படிக்க முடியாது.\n"
+"<p>\n"
+"ஆனாலும், உங்கள் உள்ளாமை விதிகள் உங்களை இதை தேர்வு செய்ய சொல்லலாம். சந்தேகமிருந்தால், உங்கள் "
+"உள்ளாமை நிர்வாகியிடம் கேட்கவும்.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "ஒரு இணைப்பை அஞ்சலுடன் சேர்க்கவும். இது மறுபடியும் செய்யப்படும்."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "மறையாக்க விசைகளை ஏற்பதற்காக எப்போதும் காட்டு"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "புதிய அஞ்சலை மட்டும் பரிசோதி"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"இந்த விருப்பத்தேர்வுகள் செயலாக்கப்பட்டால், இந்தப் பயன்பாடு தங்களுக்கு  மறைவிடக்கச் செய்ய "
+"உதவும் அனைத்து பொது விசைகளின் பட்டியலைக் காண்பிக்கும். அவைகள் செயல் நிறுத்தப்பட்டால் தாங்கள் "
+"உரையாடல் பெட்டியை மட்டுமே காண இயலும் சரியான விசையையோ அல்லது பலவற்றையோ செயல்படுத்த "
+"இயலாது."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "உருவாக்கி சாளரத்தை மட்டும் திற"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "இயலும்போதெல்லாம் செய்திகளை தானாகவே மறையாக்கம் செய்க"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "கொடுக்கப்பட்ட செய்தி கோப்பை பார்"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"<qt><p> இந்த விருப்பத்தேர்வு செயல்படும் பொழுது, நீஙகள் அனுப்பிய அனைத்து செய்திகளும் "
+"மறையாக்கமாகி மாறிவிடும்.  சிலசமயம் தானாக அனைத்து செய்திகளும் ஒவ்வொன்றாக தானாக "
+"மறையாக்கமாக முடக்க வாய்ப்பு உள்ளது </p></qt>"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "செய்தியை 'முகவரி'க்கு அனுப்பு. 'URL' காட்டும் இடத்தில் கோப்பை இணை."
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "மறையாக்கும் போது குறியாக்காதே"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "படி"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "பழைய"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "பொது"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "அழிக்கப்பட்டது"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "& பதிலளி"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "பதிலளித்தது"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "&அனைவருக்கும் பதிலளி..."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "திருப்பி அனுப்பப்பட்டது"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&வழியனுப்பு"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "வரிசையாக்கப்பட்டது"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "குறுக்குவழி"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "அனுப்பப்பட்டது"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "மேலெழுது"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "பார்க்கப்பட்டது"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&அடைவு உள்ளடக்கங்கள்:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "தவிர்க்கப்பட்டது"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "மேலெழுது"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "தவறான அஞ்சல்"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "மேலெழுது"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "தேவையற்ற மின்னஞ்சல்"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "ஆவண பணபுகள்"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "செய்யவேண்டியது"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "அடைவு ஒரு அஞ்சற்குழுவைக் கொண்டுள்ளது"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "இணைப்பு உள்ளது"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "முகவரியை பட்டியலிடு:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "சாதாரண:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "படிக்காதது:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "பழைய செய்தி"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "பிறகு நீக்கு:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "படித்த செய்திகளை நீக்கு"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "பிறகு நீக்கு:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "படிக்காத செய்திகளை நீக்கு"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "நாள்(கள்)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "வாரம்(கள்)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "மாதம்(கள்)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "மேம்பட்ட"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "புதிய அடையாளம்"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Sசேமிப்பு வடிவம்"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Lபட்டியல் காட்சிகள்:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Send queued mail on mail check"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: util.h:208
-#, fuzzy
+#: kmail.kcfg:73
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "கோப்பு %1 ஏற்கனவே உள்ளது. அதன் மேல் எழுதவா?"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
 
-#: util.h:210
-#, fuzzy
-msgid "Overwrite File?"
-msgstr "&மேல்எழுது"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"ஆவணத் தேர்ந்தெடுப்பு உரையாடல் பெட்டியில் இருந்து மிக அண்மையில் தேர்ந்தெடுக்கப்பட்ட அடைவு"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "அமைப்பு தட்டை எப்போதும் காட்டு"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "வேர்பிராஸ் புதிய அஞ்சல் அறிவிப்பு"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"இந்த தேர்வு ஓவ்வொரு கோப்பினையும் செயல்பட செய்யும். புதிதாக வரபட்ட செய்தி புதிய அஞ்சல் "
+"அறிவிப்பில் காட்டும்; இல்லையென்றால், உங்களுக்கு சாதாரண 'புதிய அஞ்சல் வந்துள்ளது'  செய்தி "
+"கிடைக்கும்."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "தொகுப்பானை குறிப்பிடுக:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "அமைப்பானுக்கு பதில் வெளியார்ந்த தொகுப்பானை பயன்படுத்து"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "குழு பொருள் செயல்பாடுகளை செயலாக்கச் செய்யவும்."
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "பாரம்பரிய வகை: அனுப்புநர்/பெறுநர்:தலைப்புகளின் அழைப்புகளுக்குப் பதில் அழைப்புகள்."
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"மைக்ரோசாஃப்ட் அவுட்லுக்கில் எளியமுறையில் எண்ணிக்கைகளைக் காணலாம் \"\n"
+"\"in இயல்பான நடைமுறையில் உள்ள  நாள் அட்டவணை ; \"\n"
+"   \"  ஒன்றை மட்டும் எடுத்து தேர்வு செய்யும், இருந்தால் மட்டும்  \"\n"
+"          \"பிரச்சினை இருந்தால் மட்டுமே அவுட்லுக் என்பது \"\n"
+"          \"தங்களின் மறுமொழியைக் கூறும், இந்த விருப்பத்தை அமைக்க முயற்சி."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "தானாகவே அழைப்பிதழ் அனுப்புதல்"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>This chooses the parent of the IMAP resource \"\n"
+"          \"folders.</p><p>By default, the Kolab server sets \"\n"
+"          \"the IMAP inbox to be the parent.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"இந்த மதிப்பு கேமெயில் துவக்கத்தில் வெளியிடுவதா \"\n"
+"          \"என்பதை முடிவெடுக்கப் பயன்படுகிறது."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "வேக தேடல் வரி திருத்தியை காட்டு"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"பதிலளிக்கும் போதோ அல்லது வேறொருவருக்கு அனுப்பும் போதோ முன்னிருந்த எழுத்துக்கோவையை "
+"முடியுமானால் வைத்திருக்கவும்"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "கையழுத்தை தானாக கூட்டு"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"அடையாளத்தை நினைவில் வைக்கவும்,,இதனால் பிற்காலத்தில் தொகுப்பி சாளரத்தில் உபையோகிக்கலாம்"
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"இந்த ஆவணம் உருப்படிகளை அனுப்பியது என்று நினைவில் வைக்கவும்,,இதனால் பிற்காலத்தில் தொகுப்பி "
+"சாளரத்தில் உபையோகிக்கலாம்"
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"இந்த அஞ்சல் போக்குவரத்தை நினைவில் வைக்கவும்,இதனால் பிற்காலத்தில் தொகுப்பி சாளரத்தில் "
+"உபையோகிக்கலாம் "
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"அடையாளத்தை நினைவில் வைக்கவும்,,இதனால் பிற்காலத்தில் தொகுப்பி சாளரத்தில் உபையோகிக்கலாம்"
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "நிரலில் வார்த்தை மடிப்பு:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "மூல சான்றிதழ் குறைந்த நாளில் காலாவதியானால் எச்சரிக்கை செய்"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Outlook &#8482;  அழைப்புகளுக்கான உங்கள் பதில்களை புரிந்து கொள்ள இந்த விருப்பத்தை "
+"செயலாக்கு."
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "தானியக்கமாக அஞ்சல் கையாளல் அறிவிப்புகள் கேட்டல்"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>ஒவ்வொரு வெளிவரும் செய்திக்கும் செய்தி அணி அறிவிப்புகள் (MDNs) KMail  "
+"வேண்டுமென்றால் இந்த விருப்பத்தை தேர்ந்தெடுங்கள்..</p><p>இந்த விருப்பம் முன்னிருப்பை "
+"பாதிக்கும்; வகைப்பட்டியில் அமைப்பாளர் தேர்வு கொண்டு நீங்கள் MDN வேண்டுதலை செய்தி வாரியாக "
+"செயலாக்க செயலிழக்க செய்ய உங்களால் செய்யமுடியும்.<em>விருப்பங்கள்</em>->&gt;<em>அணி "
+"அறிவிப்பு கேட்டல்</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "தானாகச் சேமிக்கும் இடைவெளி:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "கண்டு கொண்ட முன்னொட்டுகளை Re: என மாற்றியமை"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Replace recognized prefix with \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "சூட்டிகையாக மேற்கோளிடு "
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "கையொப்பம் காலாவதியானது"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"பதிலளிக்கும் போதோ அல்லது வேறொருவருக்கு அனுப்பும் போதோ முன்னிருந்த எழுத்துக்கோவையை "
+"முடியுமானால் வைத்திருக்கவும்"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "&அனுப்பிய செய்திகளை மறைத்து சேமி"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "தலைப்புகளில் வேண்டாத அஞ்சல் நிலையைக் காட்டு"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "புதிய அஞ்சல் அறிவிப்பு"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "செய்தி பட்டியல் - புதிய செய்திகள்"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, fuzzy, no-c-format
+msgid "Message template for forward"
+msgstr "செய்தி திருப்பி அனுப்பட்டதாக குறி"
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "&மேற்கோள் எழுத்துக்களை சேர்"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "கோப்பினை தொகு"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "தொகு..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&போ"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&ஆவணம்"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&செய்தி"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&வழியனுப்பு"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "எழுத்துரு அமைவுகளை மாற்றியமை"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML கருவிப்பெட்டி"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "பொது விருப்பம்"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML கருவிப்பெட்டி"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "CRL களை பயன்படுத்தி சான்றிதழை பரிசோதி"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"இந்த விருப்பம் தேர்ந்தெடுக்கப்படுமேயானால், S/MIME சான்றிதழ் என்பது சான்றிதழ் மறுகுறிப்பு "
+"பட்டியலில் தகுதியிடு(CRLs)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "சான்றிதழை நிகழ்நிலையில் பரிசோதி (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"இந்த விருப்பம் தேர்ந்தெடுக்கப்படுமேயானால், S/MIME சான்றிதழ் என்பது நிகழ்நிலை சான்றிதழ் "
+"நிலை நெறிமுறை(OCSP). URLலை நிரப்பு OCSP கீழுள்ள மறுமொழியில் செய்."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "சான்றிதழ் ஏற்கப்படாதது."
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP ரெஸ்பாண்டர் URL:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"நிகழ்நிலை சான்றிதழ் மதிப்புரைக்கானச் சேவையக முகவரியை இங்கு நுழைக்கவும்(OCSP "
+"மறுமொழிப்பான்). URL என்பது இயல்பாக http:// கொண்டுத் துவங்குகிறது."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP நல்ல கையொப்பம்"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "சான்றிதழ்களின் வலைமனை சேவையைத் தவிர்"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "சான்றிதழ்களை அனுப்பாதே."
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"முன்னிருப்பாக ஜிஎன்யுPG கோப்புக்களைப் பயன்படுத்தவும் ~/.ஜினுப்ஜி/விதிகள்.டிஎக்ஸ்டி சோதிக்க "
+"சான்றிதழின் விதிகளை அனுமதிக்கவும். இந்த விருப்பம் தேர்ந்தெடுக்கப்பட்டால், விதிகள் "
+"சோதிக்கப்படாது."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "CRL லை ஆலோசனை செய்யாதே"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"இந்த விருப்பம் சோதிக்கப்படுமேயானால், தேவைப்பட்டு கொடுக்கப்படும் சான்றிதழ்களைக் பட்டியலிடு S/"
+"MIME பொருந்தும்."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "கொணர் சான்றிதழை சேர்க்கும் போது"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"இந்த விருப்பம் சோதிக்கப்படுமேயானால், தேவைப்பட்டு கொடுக்கப்படும் சான்றிதழ்களைக் கொணர்(இவைகள் "
+"மற்ற இரு வகைகளுக்கும் பொருந்தும், CRLs மற்றும் OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP கோரிக்கைகள்"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "எந்த HTTP கோரிக்கைகளையும் செயல்படுத்தாதே"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "சான்றிதழ்களின் வலைமனை சேவையைத் தவிர்"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP கோரிக்கைகள்"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "சான்றிதழ்களின் வலைமனை சேவையைத் தவிர்"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&சேர்..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&குழுகலன்"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "எழுத்துரு அமைவுகளை மாற்றியமை"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "எண்ணிலடங்காத"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "கையொப்ப கட்டமைப்பு"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "அனுப்பியவருக்கு பதில் அனுப்பவும்: "
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "&அனைவருக்கும் பதிலளி..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "வழியனுப்பப்பட்ட செய்தி"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "கையெழுத்திடாத தகவல்களை அனுப்பும் போது எச்சரிக்கை செய்"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "கையெழுத்திடாத தகவல்களை அனுப்பும்போது பரிசோதி"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>கையெழுத்திடாத தகவலை அனுப்ப முயன்றால் எச்சரி</h1>\n"
+"இந்த பெட்டி தேர்ந்தெடுத்திருந்தால், அனைத்து தகவலும் கையெழுத்திடாதவையை அனுப்ப முயன்றால் "
+"எச்சரிக்கை செய்.\n"
+"<p>\n"
+"அதிக சவுகரியத்திற்கு இந்தப் பெட்டியை தேர்ந்தெடுப்பது பரிந்துரைக்கப்படுகிறது.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&மறைக்கப்படாத செய்திகளை அனுப்ப முற்படும் போது எச்சரிக்கை செய்"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "மறைகுறியீடில்லா செய்திகள் அனுப்பும் போது எச்சரிக்க, இங்கு தேர்."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>மறைகுறியீடப்படா செய்திகளை அனுப்ப முயற்சிக்கும் பொழுது எச்சரி</h1>\n"
+"இப்பெட்டி தேர்ந்தெடுக்கப்பட்டால், நீங்கள் பகுதிகளோ, முழு செய்தியோ மறைக்குறியீடப்படாமல் அனுப்ப "
+"முயற்சித்தால் எச்சரிக்கப்படுவீர்கள்.\n"
+"<p>\n"
+"அதிகபட்ச சுத்தமிருக்க இந்த தேர்வு இருக்க பரிந்துரைக்கப்படுகிறது.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "பெறுநர் மின்னஞ்சல் முகவரி சான்றிதழில் இல்லையென்றால் எச்சரிக்கை செய்யவும்"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "முகவரி சான்றிதழில் இல்லையென்றால் எச்சரிக்கை செய்கின்றதா என்று சோதனை செய்"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>சான்றிதழலில் பெறுநரின் மின்னஞ்சல் முகவரி இல்லையென்றால் எச்சரி</h1>\n"
+"இதை தேர்ந்தால், பெறுநரின் மின்னஞ்சல் முகவரி மறைக்குறியீட்டுக்கு பயன்படுத்தப்படும் சான்றிதழில் "
+"இல்லையென்றால் எச்சரிக்கை அளிக்கப்படும்.\n"
+"<p>\n"
+"அதிகபட்ச பாதுகாப்பிற்கு இத்தேர்வு செயலாக்கத்தின் விட பரிந்துரைக்கப்படுகிறது.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr " சான்றிதழ் குறைந்த நிலையில் காலாவதியானால் எச்சரிக்கை செய்"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "ஒப்பிடுதலின் பயன்பாடு"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "மறையாக்கத்திற்கான"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "தினங்களின் எண்ணிக்கையை இங்கே தேர்வு செய்யவும்"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>கையெழுத்து சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
+"குறைந்தபட்ச நாளை தேர்ந்தெடுத்தால் எச்சரிக்காமல் ஏற்றுக் கொள்ளவும்.\n"
+"<p>\n"
+"SPHINX அமைப்புகள் 14 நாளுக்குப் பரிந்துரைக்கப்படுகிறது.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>மறைக்குறியீடு சான்றிதழ் காலம் கடந்தால் எச்சரி</h1>\n"
+"எச்சரிக்கை கொடுக்காமல் மறைக்குறியீட்டு சான்றிதழ் செல்லுபடியாக இருக்க வேண்டிய குறைந்தபட்ச "
+"நாட்களை தேர்வு செய்யுங்கள்.\n"
+"<p>\n"
+"பரிந்துரைக்கப்பட்ட SPHINX  அமைப்பு - 14 நாட்கள்.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>கையெழுத்து சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
+"குறைந்தபட்ச நாளை தேர்ந்தெடுத்தால் எச்சரிக்காமல் ஏற்றுக்கொள்ளவும்.\n"
+"<p>\n"
+"SPHINX அமைப்புகள் 14 நாளுக்கு பரிந்துரைக்கப்படுகிறது.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>கையெழுத்து சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
+"குறைந்தபட்ச நாளை தேர்ந்தெடுத்தால் எச்சரிக்காமல் ஏற்றுக்கொள்ளவும்.\n"
+"<p>\n"
+"SPHINX அமைப்புகள் 14 நாளுக்கு பரிந்துரைக்கப்படுகிறது.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>மூல சான்றிதழ் காலம் கடந்தால் எச்சரி</h1>\n"
+"எச்சரிக்கை அளிக்காமல் குறைந்தபட்சம் எத்தனை நாட்கள் மூலச் சான்றிதழ் செல்லுப்படியாக வேண்டும்.\n"
+"<p>\n"
+"SPHINX  அமைப்பு பரிந்துரை- 14  நாட்கள்.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "For root certificates:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "For intermediate CA certificates:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "For end-user certificates/keys:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "அனைத்தையும் மீண்டும் செயல்படச்செய் \"Don't Ask Again\" எச்சரிக்கைகள்"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...அடுத்த செய்திகளைக் காண இடது பொத்தான் மற்றும் வலது \n"
+" பொத்தானை பயன்படுத்தவும்?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...அங்கு நீங்கள் வடிகட்டியை அனுப்புவரிடம் உருவாக்க முடியும்,\n"
+"பொருள் மற்றும் அஞ்சல் பட்டியலில் <em>கருவிகள்-&gt;உருவாக்கு&nbsp;வடிகட்டி</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...<em>திரும்ப எழுதும் தலைப்பு</em> வடிகட்டி செயல் கொண்டு\n"
+"நீங்கள் அஞ்சல் பட்டியல்களின் பொருளுடன் சேர்க்கப்பட்ட &quot;[\n"
+"அஞ்சல் பட்டியல் பெயர் ]&quot;ஐ அழிக்க முடியுமென்று? \n"
+"<pre>திரும்ப எழுதும் தலைப்பு&quot;பொருள்&quot;\n"
+"மாற்று &quot;\\s*\\[அஞ்சல் பட்டியல் பெயர்\\]\\s*&quot;\n"
+"&quot;&quot; கொண்டு;</pre>\n"
+"பயன்படுத்தவும்</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...<em>ஆவண-&gt;  தன்மைகள்</em>உரையாடலில் அஞ்சல்\n"
+"பட்டியல்களுடன் ஆவணங்களுடன் சம்பந்தப்படுத்தலாம் என்று?\n"
+"அதன் பிறகு நீங்கள் <em>செய்தி-&gt;புது&nbsp;செய்தி&nbsp;பெறுநர்&nbsp;\n"
+"அஞ்சல்&nbsp;பட்டியல்...</em> பயன்படுத்தி முன் அமைத்த அஞ்சல் பட்டியலுடன்\n"
+"தொகுப்பாளரை திறக்கலாம். மாற்றாக, ஆவணத்தின் மேல் சுட்டியின் நடு\n"
+"பொத்தனை சொடுக்கலாம்.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...நீங்கள் உங்கள் விருப்ப சின்னங்களை ஒவ்வொரு அடைவுக்கும் குறியிடமுடியும்\n"
+"<em>அடைவு-&gt;பண்புகளை...</em> பார்</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...பதிலளிக்கும்போது, செய்தியில் தேர்ந்தெடுக்கப்பட்ட பகுதியை மட்டும் மேற்கோளிடலாம் என்று?"
+"</p>\n"
+"<p>எதுவும் தேர்ந்தெடுக்கப்படாவிட்டால், முழு செய்தியும் மேற்கோளிடப்படும்.</p>\n"
+"<p><em>இணைப்புகள்-&gt;பார்-&gt ஐ நீங்கள் உள்ளே தேர்ந்தெடுக்கும் போது இணைப்புகளின்\n"
+"உரைகளுடனும் இது வேலை செய்யும். /em>.</p>\n"
+"<p><em>செய்தி-&gt;மேற்கோளிடாமல் பதிலளி</em> தவிர எல்லா\n"
+"பதிலளிக்கும் ஆணைகளுக்கும் இந்த பண்பு உண்டு.</p>\n"
+"<p align=\"வலது\"><em> கொடுத்தவர் David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15226,14 +14702,17 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
 #~ "இது ஒரு முன்னிருப்பின்படி அமைப்பு, தனியமைப்பாக ஒவ்வொன்றையும் மாற்ற முடியும். \n"
 #~ "</qt>"
@@ -15247,12 +14726,16 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>ஒவ்வொரு பகுதியையும் மறைகுறியீடும் பொழுது கேட்கவும்</h1>\n"
-#~ "இந்த விருப்பம் தேர்ந்தெடுக்கப்டும் பொழுது,  செய்தியின் ஒவ்வொரு பகுதிக்கும் (அதாவது, செய்தியின் உடல் மற்றும் இணைப்புகள்)  தனித்தனியாக மறைக்குறியீட வேண்டுமா என்று கேட்கப்படும்.\n"
+#~ "இந்த விருப்பம் தேர்ந்தெடுக்கப்டும் பொழுது,  செய்தியின் ஒவ்வொரு பகுதிக்கும் (அதாவது, "
+#~ "செய்தியின் உடல் மற்றும் இணைப்புகள்)  தனித்தனியாக மறைக்குறியீட வேண்டுமா என்று "
+#~ "கேட்கப்படும்.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15266,7 +14749,8 @@ msgstr "&மேல்எழுது"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15285,18 +14769,30 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>மறைக்குறியீட்டு நெறிமுறை</h1>\n"
-#~ "நெறிமுறை என்பது ஒரு வினையை எப்படி செய்வது என்று கணிணிக்கு சொல்லப்படும் விவரம். மறைக்குறியீட்டு நெறிமுறை கணிணி எப்படி பெறுநரின் உங்கள் அஞ்சலுக்கான  சாவியை உபயோகிக்கிறது சேரவேண்டிய பெறுநர் மட்டும் செய்தியை படிக்க வைக்கும்.\n"
+#~ "நெறிமுறை என்பது ஒரு வினையை எப்படி செய்வது என்று கணிணிக்கு சொல்லப்படும் விவரம். "
+#~ "மறைக்குறியீட்டு நெறிமுறை கணிணி எப்படி பெறுநரின் உங்கள் அஞ்சலுக்கான  சாவியை "
+#~ "உபயோகிக்கிறது சேரவேண்டிய பெறுநர் மட்டும் செய்தியை படிக்க வைக்கும்.\n"
 #~ "<p>\n"
-#~ "மறைக்குறியீட்டு நெறிமுறையின் தேர்வு எவ்வளவு சுலபமாக அல்லது கடினமாக ஒரு செய்தியில் தலையீட்டு படிக்க முடியும் என்பதை நிர்ணயிக்கிறது. ஆனாலும்,  SPHINX சூழல் கொடுக்கும் எல்லா நெறிமுறைகளும் பாதுகாப்பானவை என்று கருதப்படுகின்றன. பொதுவாக, முன்னிருப்பு இங்கு செம்மையாக வேலை செய்யும்.\n"
+#~ "மறைக்குறியீட்டு நெறிமுறையின் தேர்வு எவ்வளவு சுலபமாக அல்லது கடினமாக ஒரு செய்தியில் "
+#~ "தலையீட்டு படிக்க முடியும் என்பதை நிர்ணயிக்கிறது. ஆனாலும்,  SPHINX சூழல் கொடுக்கும் "
+#~ "எல்லா நெறிமுறைகளும் பாதுகாப்பானவை என்று கருதப்படுகின்றன. பொதுவாக, முன்னிருப்பு "
+#~ "இங்கு செம்மையாக வேலை செய்யும்.\n"
 #~ "<p>\n"
 #~ "இந்த அமைப்பு முன்னிருப்பு, நீங்கள் தனி செய்திக்கு மாற்றலாம்.\n"
 #~ "</qt>"
@@ -15313,16 +14809,20 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>சான்றிதழ் சோதனை உள்ளாமையில் சேமித்த சான்றிதழுடன் முடியலாம்</h1>\n"
 #~ "இதை தேர்ந்தால், சான்றிதழ் பின்னலின் சோதனை உள்ளாமை சான்றிதழுடன் முடியலாம்.\n"
 #~ "<p>\n"
-#~ "உள்ளாமையில் சேமிக்கப்பட்ட சான்றிதழ்கள் என்பன உங்களுடைய , தொடர்பு பங்காளிகளுடைய மற்றும் சான்றிதழ் அதாரிட்டிகளுடைய (CAs) சான்றிதழ்களாகும்.\n"
+#~ "உள்ளாமையில் சேமிக்கப்பட்ட சான்றிதழ்கள் என்பன உங்களுடைய , தொடர்பு பங்காளிகளுடைய மற்றும் "
+#~ "சான்றிதழ் அதாரிட்டிகளுடைய (CAs) சான்றிதழ்களாகும்.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
@@ -15334,12 +14834,15 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>எப்போதும் சான்றிதழ் பாதையிலிருந்து வேர் சான்றிதழ் வரை சோதனை செய்யவேண்டும்</h1>\n"
-#~ "இதை தேர்ந்தால், பெறுநரின் சான்றிதழுக்குரிய சான்றிதழ் பாதை எப்போதும் வேர் சான்றிதழ் வரை சோதிக்கப்படும்.\n"
+#~ "இதை தேர்ந்தால், பெறுநரின் சான்றிதழுக்குரிய சான்றிதழ் பாதை எப்போதும் வேர் சான்றிதழ் வரை "
+#~ "சோதிக்கப்படும்.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
@@ -15351,9 +14854,11 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15372,16 +14877,27 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>கைவிடப்பட்ட சான்றிதழ் பட்டியல்களை(CRLs) உபயோகி</h1>\n"
-#~ "திரும்ப பெற்ற சான்றிதழ்கள் ஒரு கைவிடப்பட்ட சான்றிதழ் பட்டியலில் இடம்பெறுகின்றன, ஆகவே  அவை மறைகுறியீட்டுக்கு இனிமேலும் பயன்படுத்தக் கூடாது.  ஒரு பயனர் அவரது சான்றிதழை கைவிட வேண்டாம், அவர் சான்றிதழின் மதிப்புக்கு குந்தகம் விளைந்ததாக சந்தேகப்பட்டால் (உதா. PIN ஐ ஊகித்து விட்டார்கள்).\n"
+#~ "திரும்ப பெற்ற சான்றிதழ்கள் ஒரு கைவிடப்பட்ட சான்றிதழ் பட்டியலில் இடம்பெறுகின்றன, ஆகவே  "
+#~ "அவை மறைகுறியீட்டுக்கு இனிமேலும் பயன்படுத்தக் கூடாது.  ஒரு பயனர் அவரது சான்றிதழை "
+#~ "கைவிட வேண்டாம், அவர் சான்றிதழின் மதிப்புக்கு குந்தகம் விளைந்ததாக சந்தேகப்பட்டால் (உதா. "
+#~ "PIN ஐ ஊகித்து விட்டார்கள்).\n"
 #~ "<p>\n"
-#~ "CRLகள் உச்சக்கட்ட பாதுகாப்பிற்காக உபயோகப்படுத்த பரிந்துரைக்கப்படுகிறது. சான்றிதழ் மற்றும் CRL மேலாண்மை அமைப்பு உரையாடலில் , எங்கிருந்து நீங்கள் CRLகளை மீளலாமென்று தேர்வு செய்யலாம்.\n"
+#~ "CRLகள் உச்சக்கட்ட பாதுகாப்பிற்காக உபயோகப்படுத்த பரிந்துரைக்கப்படுகிறது. சான்றிதழ் "
+#~ "மற்றும் CRL மேலாண்மை அமைப்பு உரையாடலில் , எங்கிருந்து நீங்கள் CRLகளை மீளலாமென்று "
+#~ "தேர்வு செய்யலாம்.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if CRL e&xpires in less than:"
@@ -15393,12 +14909,14 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>சில நாட்களில் CRL காலம் கடக்கவிருந்தால் எச்சரி</h1>\n"
-#~ "இந்த பெட்டி தேர்ந்தெடுக்கப்பட்டிருந்தால், நீங்கள் உபயோகிக்கும் CRLகள் சில நாட்களில் காலம் கடக்கவிருந்தால் எச்சரிக்கும்\n"
+#~ "இந்த பெட்டி தேர்ந்தெடுக்கப்பட்டிருந்தால், நீங்கள் உபயோகிக்கும் CRLகள் சில நாட்களில் காலம் "
+#~ "கடக்கவிருந்தால் எச்சரிக்கும்\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15407,14 +14925,16 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>சில நாட்களில் CRL காலம் கடக்கவிருந்தால் எச்சரி</h1>\n"
-#~ "இந்த புலத்தில் எவ்வளவு சீக்கிரம் ஒரு CRL காலம் கடக்கப்ப்போகிறது என்று எச்சரிக்கை கொடுக்க வேண்டும் என்று குறிக்கலாம்.\n"
+#~ "இந்த புலத்தில் எவ்வளவு சீக்கிரம் ஒரு CRL காலம் கடக்கப்ப்போகிறது என்று எச்சரிக்கை கொடுக்க "
+#~ "வேண்டும் என்று குறிக்கலாம்.\n"
 #~ "<p>\n"
 #~ "SPHINX  சூழலுக்கு 7 நாட்களென்பது பரிந்துரைக்கப்பட்ட அமைப்பு\n"
 #~ "</qt>"
@@ -15428,16 +14948,20 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>எப்போதும் தனக்கே மறைகுறியீட்டுக் கொள்</h1>\n"
-#~ "இப்பெட்டி தேர்ந்தெடுக்கப்பட்டால், உங்களால் அனுப்பப்பட்ட மறைக்குறியீட்டப்பட்ட செய்திகளும் உங்கள் சாவி கொண்டு மறைகுறியீடப்படும்.\n"
+#~ "இப்பெட்டி தேர்ந்தெடுக்கப்பட்டால், உங்களால் அனுப்பப்பட்ட மறைக்குறியீட்டப்பட்ட செய்திகளும் உங்கள் "
+#~ "சாவி கொண்டு மறைகுறியீடப்படும்.\n"
 #~ "<p>\n"
-#~ "நீங்கள் அனுப்பிய செய்திகளை நீங்கள் படிக்க இத்தேர்வை செயல்படுத்தி இருப்பது பரிந்துரைக்கப்படுகிறது.\n"
+#~ "நீங்கள் அனுப்பிய செய்திகளை நீங்கள் படிக்க இத்தேர்வை செயல்படுத்தி இருப்பது "
+#~ "பரிந்துரைக்கப்படுகிறது.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
@@ -15449,16 +14973,21 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
-#~ "இந்த விருப்பத்தை தேர்ந்தெடுத்தால், நீங்கள் சான்றிதழ் காலாவதியாக இருக்கும் போது மீதமுள்ள நாட்களை எச்சரிக்கும்.\n"
+#~ "இந்த விருப்பத்தை தேர்ந்தெடுத்தால், நீங்கள் சான்றிதழ் காலாவதியாக இருக்கும் போது மீதமுள்ள "
+#~ "நாட்களை எச்சரிக்கும்.\n"
 #~ "<p>\n"
-#~ "இந்த விருப்பத்தை தேர்ந்தெடுப்பது சான்றிதழ் காலாவதி ஆகுவதில் நாட்களை காட்டாமல் தவிர்ப்பதை தடுக்கமுடியும்.\n"
+#~ "இந்த விருப்பத்தை தேர்ந்தெடுப்பது சான்றிதழ் காலாவதி ஆகுவதில் நாட்களை காட்டாமல் "
+#~ "தவிர்ப்பதை தடுக்கமுடியும்.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -15479,8 +15008,27 @@ msgstr "&மேல்எழுது"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "எந்த சான்றிதழை அனுப்ப வேண்டுமென்று தேர்வு செய்யும்"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>சான்றிதழ்கள் அனுப்பப்படுகின்றன</h1>உங்கள் சான்றிதழில்லாமல், பெறுநரால் நீங்கள்தான் செய்தியை அனுப்பியவரா அல்லது மூன்றாம் மனித செய்தியை மாற்றியதா என்பது தெரியாது.<p> நடுவன் சேவையகத்திடமிருந்து பெறுநர் உங்கள் சான்றிதழ் பெற முடியும், ஆனால் உங்கள் செய்தியுடன் உங்கள் சான்றிதழையும் அனுப்ப நீங்கள் முடிவு செய்யக்கூடும். ஒரு சான்றிதழ் அனுப்பவோ, உங்கள் சான்றிதழ் மட்டும் அனுப்பவோ, உங்கள் சான்றிதழை சான்றளிக்கும் சான்றிதழ் சங்கிலியோ , உங்கள் வேர் சான்றிதழ் உட்படவோ,வேறுபடவோ நீங்கள் தேர்ந்தெடுக்கலாம்.<p> உங்கள் சான்றிதழையாவது செய்தியுடன் அனுப்பவது பரிந்துரைக்கப்படுகிறது.<p> இது முன்னிருப்பு அமைப்பு, ஒவ்வொரு செய்திக்கும் இதை மாற்றலாம்.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>சான்றிதழ்கள் அனுப்பப்படுகின்றன</h1>உங்கள் சான்றிதழில்லாமல், பெறுநரால் "
+#~ "நீங்கள்தான் செய்தியை அனுப்பியவரா அல்லது மூன்றாம் மனித செய்தியை மாற்றியதா என்பது "
+#~ "தெரியாது.<p> நடுவன் சேவையகத்திடமிருந்து பெறுநர் உங்கள் சான்றிதழ் பெற முடியும், "
+#~ "ஆனால் உங்கள் செய்தியுடன் உங்கள் சான்றிதழையும் அனுப்ப நீங்கள் முடிவு செய்யக்கூடும். ஒரு "
+#~ "சான்றிதழ் அனுப்பவோ, உங்கள் சான்றிதழ் மட்டும் அனுப்பவோ, உங்கள் சான்றிதழை சான்றளிக்கும் "
+#~ "சான்றிதழ் சங்கிலியோ , உங்கள் வேர் சான்றிதழ் உட்படவோ,வேறுபடவோ நீங்கள் தேர்ந்தெடுக்கலாம்."
+#~ "<p> உங்கள் சான்றிதழையாவது செய்தியுடன் அனுப்பவது பரிந்துரைக்கப்படுகிறது.<p> இது "
+#~ "முன்னிருப்பு அமைப்பு, ஒவ்வொரு செய்திக்கும் இதை மாற்றலாம்.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "&உன்னுடைய சான்றிதழை அனுப்பு"
@@ -15495,19 +15043,23 @@ msgstr "&மேல்எழுது"
 #~ msgstr "&செய்திப் பகுதிகளை கையொப்பமிடு"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "எல்லா செய்திப் பகுதிகளும் முன்னிருப்பின்படி கையொப்பமிடபட்டுள்ளதா என்று சோதனையிடு"
+#~ msgstr ""
+#~ "எல்லா செய்திப் பகுதிகளும் முன்னிருப்பின்படி கையொப்பமிடபட்டுள்ளதா என்று சோதனையிடு"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>எல்லா செய்தி பகுதிகளையும் கையெழுத்திடு முன்னிருப்பில்</h1>\n"
-#~ "இதை தேர்ந்தால், செய்தியின் எல்லாப் பகுதியும் (அதாவது முக்கிய செய்தி உடல் மற்றும் இணைப்புகள்) முன்னிருப்பில் கையெழுத்திடப்படுகின்றன.\n"
+#~ "இதை தேர்ந்தால், செய்தியின் எல்லாப் பகுதியும் (அதாவது முக்கிய செய்தி உடல் மற்றும் "
+#~ "இணைப்புகள்) முன்னிருப்பில் கையெழுத்திடப்படுகின்றன.\n"
 #~ "<p>\n"
 #~ "இது முன்னிருப்பு, ஒவ்வொரு செய்திக்கும் நீங்கள் மாற்றலாம்\n"
 #~ "</qt>"
@@ -15521,12 +15073,15 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>ஒவ்வொரு பகுதியையும் கையெழுத்திடும் முன் கேள்</h1>\n"
-#~ "இத்தேர்வில், செய்தியின் ஒவ்வொரு பாகத்திற்கும் ( அதாவது, முக்கிய செய்தி உடல் மற்றும் எல்லா இணைப்புகள்) ஒவ்வொன்றாக கையெழுத்திட வேண்டுமா என்று.\n"
+#~ "இத்தேர்வில், செய்தியின் ஒவ்வொரு பாகத்திற்கும் ( அதாவது, முக்கிய செய்தி உடல் மற்றும் "
+#~ "எல்லா இணைப்புகள்) ஒவ்வொன்றாக கையெழுத்திட வேண்டுமா என்று.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -15540,7 +15095,8 @@ msgstr "&மேல்எழுது"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15550,7 +15106,8 @@ msgstr "&மேல்எழுது"
 #~ "இது ஒரு முன்னிருப்பின்படி அமைப்பு, தனியமைப்பாக ஒவ்வொன்றையும் மாற்ற முடியும். \n"
 #~ "</qt>."
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "<em>சான்றிதழ்கள்</em> தாளிலே கையெழுத்து சான்றிதழ் கட்டமைக்கப்பட்டுள்ளது"
 
 #~ msgid "RSA + SHA-1"
@@ -15562,18 +15119,30 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>கையெழுத்து நெறிமுறை/h1>\n"
-#~ "நெறிமுறை என்பது ஒரு வினையை எப்படி செய்வது என்று கணிணிக்கு சொல்லப்படும் விவரம். >கையெழுத்து நெறிமுறை, கணிணி எப்படி உங்கள் செய்தியின் மேல் உங்கள் சாவியை உபயோகித்து எப்படி பெறுநர் வரும் செய்தி உங்களிடமிருந்துதான் வருகிறது என்று நிர்ணயக்க முடியும்.\n"
+#~ "நெறிமுறை என்பது ஒரு வினையை எப்படி செய்வது என்று கணிணிக்கு சொல்லப்படும் விவரம். "
+#~ ">கையெழுத்து நெறிமுறை, கணிணி எப்படி உங்கள் செய்தியின் மேல் உங்கள் சாவியை உபயோகித்து "
+#~ "எப்படி பெறுநர் வரும் செய்தி உங்களிடமிருந்துதான் வருகிறது என்று நிர்ணயக்க முடியும்.\n"
 #~ "<p>\n"
-#~ "கையெழுத்து நெறிமுறையின் தேர்வு எவ்வளவு சுலபமாக அல்லது கடினமாக ஒரு செய்தியை கள்ளத்தனமாக ஆக்க முடியும் என்பதை நிர்ணயிக்கிறது. ஆனாலும்,  SPHINX சூழல் கொடுக்கும் எல்லா நெறிமுறைகளும் பாதுகாப்பானவை என்று கருதப்படுகின்றன. பொதுவாக, முன்னிருப்பு இங்கு செம்மையாக வேலை செய்யும்.\n"
+#~ "கையெழுத்து நெறிமுறையின் தேர்வு எவ்வளவு சுலபமாக அல்லது கடினமாக ஒரு செய்தியை "
+#~ "கள்ளத்தனமாக ஆக்க முடியும் என்பதை நிர்ணயிக்கிறது. ஆனாலும்,  SPHINX சூழல் கொடுக்கும் "
+#~ "எல்லா நெறிமுறைகளும் பாதுகாப்பானவை என்று கருதப்படுகின்றன. பொதுவாக, முன்னிருப்பு "
+#~ "இங்கு செம்மையாக வேலை செய்யும்.\n"
 #~ "<p>\n"
 #~ "இந்த அமைப்பு முன்னிருப்பு, நீங்கள் தனி செய்திக்கு மாற்றலாம்.\n"
 #~ "</qt>"
@@ -15590,7 +15159,9 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15610,29 +15181,39 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>பலஉறுப்பு பிரிக்கும் கையெழுத்து</h1>\n"
-#~ "இந்த விருப்பத்தேர்வு தேர்ந்தெடுக்கும் போது,  பல உறுப்பு/கையெழுத்திட்ட தகவல் உறுப்பு கையெழுத்து மற்றும் கையெழுத்திட்ட தரவு பிரிக்கும். ASN.1 உள்ளீடு துணைபுரியும் அஞ்சல் முகவர் படிக்கக்கூடிய கையெழுத்திட்ட தகவல் தரவு .\n"
+#~ "இந்த விருப்பத்தேர்வு தேர்ந்தெடுக்கும் போது,  பல உறுப்பு/கையெழுத்திட்ட தகவல் உறுப்பு "
+#~ "கையெழுத்து மற்றும் கையெழுத்திட்ட தரவு பிரிக்கும். ASN.1 உள்ளீடு துணைபுரியும் அஞ்சல் "
+#~ "முகவர் படிக்கக்கூடிய கையெழுத்திட்ட தகவல் தரவு .\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
 #~ msgstr "திடமான (SPHINX க்கு பரிந்துரைப்பது)"
 
 #~ msgid "Signature and signed data encoded in one ASN.1 block."
-#~ msgstr "ஒரு ASN னில் கையெழுத்து மற்றும் கையெழுத்திட்ட தரவு உள்குறியிட்டுள்ளது.1 தொகுதி."
+#~ msgstr ""
+#~ "ஒரு ASN னில் கையெழுத்து மற்றும் கையெழுத்திட்ட தரவு உள்குறியிட்டுள்ளது.1 தொகுதி."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>திட கையெழுத்திட்ட தகவல்கள்</h1>\n"
-#~ "இந்த விருப்பத்தை தேர்ந்தெடுத்தால்,  ASN.1 தொகுதியில் குறியிடப்பட்ட இரண்டு கையெழுத்தையும் தேர்ந்தெடுக்கும். ASN.1 குறியீட்டு துணைபுரியும் அஞ்சல் முகவர் தகவலை படிக்க முடியும்.\n"
+#~ "இந்த விருப்பத்தை தேர்ந்தெடுத்தால்,  ASN.1 தொகுதியில் குறியிடப்பட்ட இரண்டு "
+#~ "கையெழுத்தையும் தேர்ந்தெடுக்கும். ASN.1 குறியீட்டு துணைபுரியும் அஞ்சல் முகவர் தகவலை "
+#~ "படிக்க முடியும்.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15644,8 +15225,21 @@ msgstr "&மேல்எழுது"
 #~ msgid "Select how often the PIN must be entered"
 #~ msgstr "எப்பொழுதும் PIN  உள்ளிடும் வகையில் தேர்ந்தெடு"
 
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN குறிப்பு</h1> இங்கு, உங்கள் சான்றிதழ்கள் தாங்கியிருக்கும் சொந்த பாதுகாப்பு சூழலை (PSE) அணுக எவ்வளவு முறை உங்கள் PIN கொடுக்க வேண்டும் என்று தேர்வு செய்யலாம்.<p>எவ்வளவு அதிகமுறை PIN கொடுக்கிறீர்களோ, அவ்வளவு முறை உங்கள் மின்னஞ்சல் செய்திகள் உங்கள் பேரில் களவாடப்படாது, ஆனால் செயல்கள் சுலபமாகா.<p>எதை தேர்ந்தெடுக்க வேண்டுமென்பதில் தெளிவில்லை என்றால் அப்படியே விடவும்.<p>  பாதுகாப்பு காரணங்களினால் PIN சோதனையை மொத்தமாக நிறுத்த முடியாது.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN குறிப்பு</h1> இங்கு, உங்கள் சான்றிதழ்கள் தாங்கியிருக்கும் சொந்த "
+#~ "பாதுகாப்பு சூழலை (PSE) அணுக எவ்வளவு முறை உங்கள் PIN கொடுக்க வேண்டும் என்று தேர்வு "
+#~ "செய்யலாம்.<p>எவ்வளவு அதிகமுறை PIN கொடுக்கிறீர்களோ, அவ்வளவு முறை உங்கள் மின்னஞ்சல் "
+#~ "செய்திகள் உங்கள் பேரில் களவாடப்படாது, ஆனால் செயல்கள் சுலபமாகா.<p>எதை தேர்ந்தெடுக்க "
+#~ "வேண்டுமென்பதில் தெளிவில்லை என்றால் அப்படியே விடவும்.<p>  பாதுகாப்பு காரணங்களினால் "
+#~ "PIN சோதனையை மொத்தமாக நிறுத்த முடியாது.</qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "அமர்வுக்கு ஒருமுறை"
@@ -15662,16 +15256,21 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>சான்றிதழ் காலாவதியானால் எச்சரி</h1>\n"
-#~ "இந்த விருப்பத்தை தேர்ந்தெடுத்தால், நீங்கள் சான்றிதழ் காலாவதியாக இருக்கும் போது மீதமுள்ள நாட்களை எச்சரிக்கும்.\n"
+#~ "இந்த விருப்பத்தை தேர்ந்தெடுத்தால், நீங்கள் சான்றிதழ் காலாவதியாக இருக்கும் போது மீதமுள்ள "
+#~ "நாட்களை எச்சரிக்கும்.\n"
 #~ "<p>\n"
-#~ "இந்த விருப்பத்தை தேர்ந்தெடுப்பது சான்றிதழ் காலாவதி ஆகுவதில் நாட்களை காட்டாமல் தவிர்ப்பதை தடுக்கமுடியும்.\n"
+#~ "இந்த விருப்பத்தை தேர்ந்தெடுப்பது சான்றிதழ் காலாவதி ஆகுவதில் நாட்களை காட்டாமல் "
+#~ "தவிர்ப்பதை தடுக்கமுடியும்.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if s&ignature certificate expires in less than:"
@@ -15683,14 +15282,16 @@ msgstr "&மேல்எழுது"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>கையெழுத்திடுபவர் மின்னஞ்சல் முகவரி சான்றிதழில் இல்லை என்றால் எச்சரி</h1>\n"
-#~ "இதை தேர்ந்தெடுத்தால், கையெழுத்திடுபவர் மின்னஞ்சல் முகவரி கையெழுத்துக்கு பயன்படும் சான்றிதழில் இல்லை என்றால் ஒரு எச்சரிக்கை அளிக்கப்படும்.\n"
+#~ "இதை தேர்ந்தெடுத்தால், கையெழுத்திடுபவர் மின்னஞ்சல் முகவரி கையெழுத்துக்கு பயன்படும் "
+#~ "சான்றிதழில் இல்லை என்றால் ஒரு எச்சரிக்கை அளிக்கப்படும்.\n"
 #~ "<p>\n"
 #~ "அதிகபட்ச பாதுகாப்புக்கு இதை இப்படியே விட்டுவிடுமாறு பரிந்துரைக்கப்படுகிறது.\n"
 #~ "</qt>"
@@ -15706,10 +15307,6 @@ msgstr "&மேல்எழுது"
 #~ msgstr "&வரைவுகள் அடைவில் சேமி"
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "கேமெயிலை கட்டமை "
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "இதனால் திற..."
 
@@ -15784,21 +15381,36 @@ msgstr "&மேல்எழுது"
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "In a few easy steps, this wizard will help you with the creation of a certificate. You use your certificates in order to sign messages, to encrypt messages and to decrypt messages that other people send to you in encrypted form.\n"
+#~ "In a few easy steps, this wizard will help you with the creation of a "
+#~ "certificate. You use your certificates in order to sign messages, to "
+#~ "encrypt messages and to decrypt messages that other people send to you in "
+#~ "encrypted form.\n"
 #~ "<p>\n"
-#~ "The certificates can either be generated in a centralized or a decentralized manner. Please contact your local help desk if you are unsure how to create a certificate in your organization."
+#~ "The certificates can either be generated in a centralized or a "
+#~ "decentralized manner. Please contact your local help desk if you are "
+#~ "unsure how to create a certificate in your organization."
 #~ msgstr ""
 #~ "<b>சான்றிதழ் வழிகாட்டிக்கு வருக!</b><br>\n"
 #~ "<br>\n"
-#~ "சில சுலப படிகளில், இந்த வழிகாட்டி நீங்கள் ஒரு சான்றிதழ் உருவாக்குவதற்கு உதவும். சான்றிதழ்கள் கொண்டு செய்திகளை கையெழுத்திடுவது, செய்திகளை மறைக்குறியீடுவதும் மற்றும் மற்றவர்கள் அனுப்பிய மறைக்குறியீட்டு செய்திகளை விடைகுறியீடுவதற்க்கு உபயோகிக்கலாம்.\n"
+#~ "சில சுலப படிகளில், இந்த வழிகாட்டி நீங்கள் ஒரு சான்றிதழ் உருவாக்குவதற்கு உதவும். "
+#~ "சான்றிதழ்கள் கொண்டு செய்திகளை கையெழுத்திடுவது, செய்திகளை மறைக்குறியீடுவதும் மற்றும் "
+#~ "மற்றவர்கள் அனுப்பிய மறைக்குறியீட்டு செய்திகளை விடைகுறியீடுவதற்க்கு உபயோகிக்கலாம்.\n"
 #~ "<p>\n"
-#~ "சான்றிதழ்கள் நடுவண்ணாகவோ அல்லது பலவண்ணாகவோ உருவாக்கலாம். உங்களுக்கு எப்படி உங்கள் நிறுவனத்தில் சான்றிதழ் உருவாக்குவது என்பது பற்றி தெரியாதென்றால் உங்கள் உள்ளாமை உதவி மேசையில் விசாரிக்கவும்."
+#~ "சான்றிதழ்கள் நடுவண்ணாகவோ அல்லது பலவண்ணாகவோ உருவாக்கலாம். உங்களுக்கு எப்படி உங்கள் "
+#~ "நிறுவனத்தில் சான்றிதழ் உருவாக்குவது என்பது பற்றி தெரியாதென்றால் உங்கள் உள்ளாமை உதவி "
+#~ "மேசையில் விசாரிக்கவும்."
 
 #~ msgid "Your Personal Data"
 #~ msgstr "உங்கள் தனிப்பட்ட விவரம்"
 
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "இந்தத் தாளில், நீங்கள் சான்றிதழில் சேமிக்கப்படவேண்டிய சில தனிப்பட்ட விவரங்களை உள்ளிட வேண்டும் மற்றும் மற்றவர்களுக்கு நீங்கள் தான் அந்த செய்தியை அனுப்புகின்றீர் என்று புரியவைக்க உதவும். "
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "இந்தத் தாளில், நீங்கள் சான்றிதழில் சேமிக்கப்படவேண்டிய சில தனிப்பட்ட விவரங்களை உள்ளிட "
+#~ "வேண்டும் மற்றும் மற்றவர்களுக்கு நீங்கள் தான் அந்த செய்தியை அனுப்புகின்றீர் என்று புரியவைக்க "
+#~ "உதவும். "
 
 #~ msgid "Enter your name here"
 #~ msgstr "உங்கள் பெயரை இங்கே உள்ளிடுங்கள்"
@@ -15809,14 +15421,21 @@ msgstr "&மேல்எழுது"
 #~ msgid "Enter your organization here"
 #~ msgstr "உங்கள் நிறுவனத்தை இங்கே உள்ளிடுங்கள்"
 
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
-#~ msgstr "சான்றிதழில் காட்சியளிக்க வேண்டியது போல உங்கள் பெயரை இங்கே உள்ளிடுங்கள்(எடுத்துக்காட்டாக உங்கள் நிறுவனம், பிரிவு, அல்லது உங்கள் பதவி)."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
+#~ msgstr ""
+#~ "சான்றிதழில் காட்சியளிக்க வேண்டியது போல உங்கள் பெயரை இங்கே உள்ளிடுங்கள்(எடுத்துக்காட்டாக "
+#~ "உங்கள் நிறுவனம், பிரிவு, அல்லது உங்கள் பதவி)."
 
 #~ msgid "Enter your email address here"
 #~ msgstr "மின்னஞ்சல் முகவரியை இங்கே உள்ளிடவும்"
 
-#~ msgid "Enter the email address here which you want to use in connection with the certificate."
-#~ msgstr "இந்த சான்றிதழுடன் நீங்கள் உபயோகப்படுத்தப்போகும் மின்னஞ்சல் முகவரியை இங்கே கொடுங்கள்."
+#~ msgid ""
+#~ "Enter the email address here which you want to use in connection with the "
+#~ "certificate."
+#~ msgstr ""
+#~ "இந்த சான்றிதழுடன் நீங்கள் உபயோகப்படுத்தப்போகும் மின்னஞ்சல் முகவரியை இங்கே கொடுங்கள்."
 
 #~ msgid "&Department:"
 #~ msgstr "&பிரிவு:"
@@ -15827,8 +15446,14 @@ msgstr "&மேல்எழுது"
 #~ msgid "Certificate Generation"
 #~ msgstr "சான்றிதழ் உருவாக்கம்"
 
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "இந்த பக்கத்தில், சான்றிதழ் உருவாக்கம் நடுவண்ணாகவா அல்லது பலவண்ணாகவா என்பதை தேர்வு செய்வீர்கள். எதை தேர்தெடுப்பது என்பது உங்களுக்கு தெரியவில்லை என்றால் உங்கள் உள்ளாமை மேசையின் உதவியை தயவு செய்து நாடுங்கள்."
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "இந்த பக்கத்தில், சான்றிதழ் உருவாக்கம் நடுவண்ணாகவா அல்லது பலவண்ணாகவா என்பதை தேர்வு "
+#~ "செய்வீர்கள். எதை தேர்தெடுப்பது என்பது உங்களுக்கு தெரியவில்லை என்றால் உங்கள் உள்ளாமை "
+#~ "மேசையின் உதவியை தயவு செய்து நாடுங்கள்."
 
 #~ msgid "Certificate &Generation"
 #~ msgstr "&சான்றிதழ் உற்பத்தி"
@@ -15847,15 +15472,24 @@ msgstr "&மேல்எழுது"
 
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "உங்கள் கையெழுத்து-சாவி ஜோடி CA (சான்றிதழ் ஆதரிட்டி) க்கு அனுப்ப தயாரக இருக்கிறது. CA உங்களுக்காக சான்றிதழ் உருவாக்கி அஞ்சல் வழியாக உங்களிடம் திரும்ப அனுப்பிவிடும். கீழ்கண்ட சான்றிதழை மீள்பார்வையிடுங்கள்.  மொத்த சோதனை எண்னை எழுதி வைத்து கொள்ளவேண்டும். CA  திருப்பி அனுப்பும் சான்றிதழடன் ஒப்பிடலாமில்லையா?\n"
+#~ "உங்கள் கையெழுத்து-சாவி ஜோடி CA (சான்றிதழ் ஆதரிட்டி) க்கு அனுப்ப தயாரக இருக்கிறது. "
+#~ "CA உங்களுக்காக சான்றிதழ் உருவாக்கி அஞ்சல் வழியாக உங்களிடம் திரும்ப அனுப்பிவிடும். "
+#~ "கீழ்கண்ட சான்றிதழை மீள்பார்வையிடுங்கள்.  மொத்த சோதனை எண்னை எழுதி வைத்து கொள்ளவேண்டும். "
+#~ "CA  திருப்பி அனுப்பும் சான்றிதழடன் ஒப்பிடலாமில்லையா?\n"
 #~ "<p>\n"
-#~ "மாற்றமெதும் செய்ய வேண்டுமென்றால், பின் பொத்தானை அழுத்தி உங்கள் மாற்றங்களை செய்யுங்கள். இல்லாவிடில் முடிவை அழுத்தி CA க்கு உங்கள் கையெழுத்து-சாவி ஜோடியை அனுப்புங்கள்.\n"
+#~ "மாற்றமெதும் செய்ய வேண்டுமென்றால், பின் பொத்தானை அழுத்தி உங்கள் மாற்றங்களை செய்யுங்கள். "
+#~ "இல்லாவிடில் முடிவை அழுத்தி CA க்கு உங்கள் கையெழுத்து-சாவி ஜோடியை அனுப்புங்கள்.\n"
 #~ "</qt>"
 
 #~ msgid "Extension"
@@ -15932,8 +15566,10 @@ msgstr "&மேல்எழுது"
 #~ msgstr "[%1] %2."
 
 #~ msgid ""
-#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission complete. %n new message in %1 KB (%2 KB remaining on "
+#~ "the server).\n"
+#~ "Transmission complete. %n new messages in %1 KB (%2 KB remaining on the "
+#~ "server)."
 #~ msgstr ""
 #~ "பரப்புகை முடிந்தது. %n புதிய தகவல் %1 KBல் (%2 KB சேவையகத்தில் உள்ளது)\n"
 #~ "பரப்புகை முடிந்தது. %n புதிய தகவல்கள் %1 KBல் (%2 KB சேவையகத்தில் உள்ளது)."
@@ -15956,11 +15592,15 @@ msgstr "&மேல்எழுது"
 #~ msgstr "பரப்புகை முடிந்தது. புதிய அஞ்சல்கள் ஏதும் இல்லை."
 
 #~ msgid ""
-#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB remaining on the server).\n"
-#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB remaining on the server)."
+#~ "_n: Transmission for account %3 complete. %n new message in %1 KB (%2 KB "
+#~ "remaining on the server).\n"
+#~ "Transmission for account %3 complete. %n new messages in %1 KB (%2 KB "
+#~ "remaining on the server)."
 #~ msgstr ""
-#~ "%3 கணக்கின் செலுத்தம் முடிந்தது. %n புது செய்திகள் %1 KB ல் (%2 KB மீதம் சேவையகத்தில் இருப்பு)\n"
-#~ "%3 கணக்கின் செலுத்தம் முடிந்தது. %n புது செய்திகள் %1 KB ல் (%2 KB மீதம் சேவையகத்தில் இருப்பு)."
+#~ "%3 கணக்கின் செலுத்தம் முடிந்தது. %n புது செய்திகள் %1 KB ல் (%2 KB மீதம் சேவையகத்தில் "
+#~ "இருப்பு)\n"
+#~ "%3 கணக்கின் செலுத்தம் முடிந்தது. %n புது செய்திகள் %1 KB ல் (%2 KB மீதம் சேவையகத்தில் "
+#~ "இருப்பு)."
 
 #~ msgid ""
 #~ "_n: Transmission for account %2 complete. %n message in %1 KB.\n"
@@ -15994,14 +15634,39 @@ msgstr "&மேல்எழுது"
 #~ msgid "Mark Thread as &Ham"
 #~ msgstr "Mark Thread as &Ham"
 
-#~ msgid "<qt>The destination folder of the account <b>%1</b> was restored to the inbox.</qt>"
+#~ msgid ""
+#~ "<qt>The destination folder of the account <b>%1</b> was restored to the "
+#~ "inbox.</qt>"
 #~ msgstr "<qt>கணக்கு<b>%1</b> ன் சேருமிட ஆவணம் உட்பெட்டிக்கு மீட்கப்பட்டது.</qt>"
 
-#~ msgid "<p>Here you can get some assistance in setting up KMail's filter rules to use some commonly-known anti-spam tools.</p><p>The wizard can detect those tools on your computer as well as create filter rules to classify messages using these tools and to separate messages classified as spam. The wizard will not take any existing filter rules into consideration: it will always append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen during the scan of the messages for spam, you may encounter problems with the responsiveness of KMail because anti-spam tool operations are usually time consuming; please consider deleting the filter rules created by the wizard to get back to the former behavior."
-#~ msgstr "<p>கேமெயில் வடிகட்டிகளை  அமைக்கும் விதிமுறைகள் பழக்கத்தில் உள்ள வடிகட்டியை சாதாரண தேவையற்ற நச்சுநிரல் கருவியைப் பயன்படுத்தி அமைக்கப்படும்.</p> இந்த வழிகாட்டி உங்கள் கணினியில் உள்ள தேவையற்ற மின்னஞ்சல்களை நீக்குவதற்கான விதிகளை அமைக்கும். இது ஏற்கனவே உள்ள விதிமுறைகளை கணக்கில் எடுத்துக்கொள்ளாமல் புதிய விதிகளை சேர்க்கும்.</p>"
+#~ msgid ""
+#~ "<p>Here you can get some assistance in setting up KMail's filter rules to "
+#~ "use some commonly-known anti-spam tools.</p><p>The wizard can detect "
+#~ "those tools on your computer as well as create filter rules to classify "
+#~ "messages using these tools and to separate messages classified as spam. "
+#~ "The wizard will not take any existing filter rules into consideration: it "
+#~ "will always append the new rules.</p><p><b>Warning:</b> As KMail appears "
+#~ "to be frozen during the scan of the messages for spam, you may encounter "
+#~ "problems with the responsiveness of KMail because anti-spam tool "
+#~ "operations are usually time consuming; please consider deleting the "
+#~ "filter rules created by the wizard to get back to the former behavior."
+#~ msgstr ""
+#~ "<p>கேமெயில் வடிகட்டிகளை  அமைக்கும் விதிமுறைகள் பழக்கத்தில் உள்ள வடிகட்டியை சாதாரண "
+#~ "தேவையற்ற நச்சுநிரல் கருவியைப் பயன்படுத்தி அமைக்கப்படும்.</p> இந்த வழிகாட்டி உங்கள் "
+#~ "கணினியில் உள்ள தேவையற்ற மின்னஞ்சல்களை நீக்குவதற்கான விதிகளை அமைக்கும். இது ஏற்கனவே "
+#~ "உள்ள விதிமுறைகளை கணக்கில் எடுத்துக்கொள்ளாமல் புதிய விதிகளை சேர்க்கும்.</p>"
 
-#~ msgid "<p>For these tools it is possible to let the wizard create filter rules. KMail tried to find the tools in the PATH of your system; the wizard does not allow you to create rules for tools which were not found: this is to keep your configuration consistent and to minimize the risk of unpredicted behavior.</p>"
-#~ msgstr "<p>இந்த கருவிகளுக்காக வடிகட்டல் விதிகளை கருவிகளால் அமைக்க முடியும். KMail  உங்கள் கணினியில் பாதைகளை கண்டுபிடிக்கும்; இல்லாத கருவிகளுக்காக விதிமுறைகள் அமைக்க வழிகாட்டியால் முடியாது: இது உங்கள் கணினி அமைப்பை நிலையாக வைப்பதோடு அதிக சிக்கல் இல்லாமல் பார்த்துக்கொள்ளும்.</p>"
+#~ msgid ""
+#~ "<p>For these tools it is possible to let the wizard create filter rules. "
+#~ "KMail tried to find the tools in the PATH of your system; the wizard does "
+#~ "not allow you to create rules for tools which were not found: this is to "
+#~ "keep your configuration consistent and to minimize the risk of "
+#~ "unpredicted behavior.</p>"
+#~ msgstr ""
+#~ "<p>இந்த கருவிகளுக்காக வடிகட்டல் விதிகளை கருவிகளால் அமைக்க முடியும். KMail  உங்கள் "
+#~ "கணினியில் பாதைகளை கண்டுபிடிக்கும்; இல்லாத கருவிகளுக்காக விதிமுறைகள் அமைக்க "
+#~ "வழிகாட்டியால் முடியாது: இது உங்கள் கணினி அமைப்பை நிலையாக வைப்பதோடு அதிக சிக்கல் "
+#~ "இல்லாமல் பார்த்துக்கொள்ளும்.</p>"
 
 #~ msgid "(found on this system)"
 #~ msgstr "(இந்த கணினியில் கண்டுபிடிக்கப்பட்டது)"
@@ -16012,17 +15677,39 @@ msgstr "&மேல்எழுது"
 #~ msgid "Classify messages manually as spam"
 #~ msgstr "செய்திகளை கைமுறையாக வகைப்படுத்து"
 
-#~ msgid "Sometimes messages are classified wrongly or even not at all; the latter might be by intention, because you perhaps filter out messages from mailing lists before you let the anti-spam tools classify the rest of the messages. You can correct these wrong or missing classifications manually by using the appropriate toolbar buttons which trigger special filters created by this wizard."
-#~ msgstr "சில சமயம் செய்திகள் தவறாக வகைப்படுத்தப்பட்டிருக்கும் அல்லது வகைப்படுத்தப்படாமல் இருக்கும். வகைப்படுத்தப்படாதற்கு காரணம் கருவிகள் தேவையற்ற மின்னஞ்சல் வடிகட்டி இவைகளை வகைப்படுத்த வேண்டும் என்பதற்காகவே, சரியான கருவிப்பட்டியை பயன்படுத்தி தவறான வகைப்படுத்தலை கைமுறையாக திருத்தலாம்"
+#~ msgid ""
+#~ "Sometimes messages are classified wrongly or even not at all; the latter "
+#~ "might be by intention, because you perhaps filter out messages from "
+#~ "mailing lists before you let the anti-spam tools classify the rest of the "
+#~ "messages. You can correct these wrong or missing classifications manually "
+#~ "by using the appropriate toolbar buttons which trigger special filters "
+#~ "created by this wizard."
+#~ msgstr ""
+#~ "சில சமயம் செய்திகள் தவறாக வகைப்படுத்தப்பட்டிருக்கும் அல்லது வகைப்படுத்தப்படாமல் "
+#~ "இருக்கும். வகைப்படுத்தப்படாதற்கு காரணம் கருவிகள் தேவையற்ற மின்னஞ்சல் வடிகட்டி இவைகளை "
+#~ "வகைப்படுத்த வேண்டும் என்பதற்காகவே, சரியான கருவிப்பட்டியை பயன்படுத்தி தவறான "
+#~ "வகைப்படுத்தலை கைமுறையாக திருத்தலாம்"
 
 #~ msgid "Classify messages using the anti-spam tools"
 #~ msgstr "தேவையற்ற நச்சுநிரல் கருவி மூலம் செய்திகளை வகைப்படுத்து"
 
-#~ msgid "Let the anti-spam tools classify your messages. The wizard will create appropriate filters. The messages are usually marked by the tools so that following filters can react on this and, for example, move spam messages to a special folder."
-#~ msgstr "தேவையற்ற நச்சுநிரல் வடிகட்டி உங்கள் செய்திகளை வகைப்படுத்தட்டும். ஒவ்வொரு செய்தியில் கருவியால் குறிக்கப்பட்டிருக்கும் அதனால் தொடர்புடைய வடிகட்டிகள் அவைகளின் மேல் வேலை செய்யும். உதாரணமாக, தேவையற்ற மின்னஞ்சல்களை தனி அடைவில் நகர்த்தலாம்."
+#~ msgid ""
+#~ "Let the anti-spam tools classify your messages. The wizard will create "
+#~ "appropriate filters. The messages are usually marked by the tools so that "
+#~ "following filters can react on this and, for example, move spam messages "
+#~ "to a special folder."
+#~ msgstr ""
+#~ "தேவையற்ற நச்சுநிரல் வடிகட்டி உங்கள் செய்திகளை வகைப்படுத்தட்டும். ஒவ்வொரு செய்தியில் "
+#~ "கருவியால் குறிக்கப்பட்டிருக்கும் அதனால் தொடர்புடைய வடிகட்டிகள் அவைகளின் மேல் வேலை "
+#~ "செய்யும். உதாரணமாக, தேவையற்ற மின்னஞ்சல்களை தனி அடைவில் நகர்த்தலாம்."
 
-#~ msgid "A filter to detect messages classified as spam and to move those messages into a predefined folder is created. The default folder is the trash folder, but you may change that in the folder view."
-#~ msgstr "வடிகட்டிகள் செய்திகளை கண்டறிந்து அவற்றிற்காக அடைவுகளில் சேர்க்கும். இயல்பாக குப்பை தொட்டியில் போடும்,ஆனால் அடைவில் இவைகள் மாற்றப்படும்."
+#~ msgid ""
+#~ "A filter to detect messages classified as spam and to move those messages "
+#~ "into a predefined folder is created. The default folder is the trash "
+#~ "folder, but you may change that in the folder view."
+#~ msgstr ""
+#~ "வடிகட்டிகள் செய்திகளை கண்டறிந்து அவற்றிற்காக அடைவுகளில் சேர்க்கும். இயல்பாக குப்பை "
+#~ "தொட்டியில் போடும்,ஆனால் அடைவில் இவைகள் மாற்றப்படும்."
 
 #~ msgid "Additionally, mark detected spam messages as read"
 #~ msgstr "Mark selected messages as read."
@@ -16048,8 +15735,13 @@ msgstr "&மேல்எழுது"
 #~ msgid "Loading Namespaces from server %1"
 #~ msgstr "சேவையகத்தில் அஞ்சல்களை ஏற்று"
 
-#~ msgid "Check this option if you want to be notified about new mail that is moved to this folder; unchecking this is useful, for example, for ignoring spam folders."
-#~ msgstr "இந்த விருப்பத்தை தேர்ந்தெடுப்பதன் மூலம் இந்த அடைவில் இருந்து நகர்த்தும் போது உங்களுக்கு அஞ்சல் அறிவிப்பு கொடுக்கும்; இது பயனுள்ளது,உதாரணத்திற்கு, தேவையற்றதைத் தவிர்க்கவும்."
+#~ msgid ""
+#~ "Check this option if you want to be notified about new mail that is moved "
+#~ "to this folder; unchecking this is useful, for example, for ignoring spam "
+#~ "folders."
+#~ msgstr ""
+#~ "இந்த விருப்பத்தை தேர்ந்தெடுப்பதன் மூலம் இந்த அடைவில் இருந்து நகர்த்தும் போது உங்களுக்கு "
+#~ "அஞ்சல் அறிவிப்பு கொடுக்கும்; இது பயனுள்ளது,உதாரணத்திற்கு, தேவையற்றதைத் தவிர்க்கவும்."
 
 #~ msgid "Load external references for certain folders and on request"
 #~ msgstr "இணையத்திலிருந்து வெளி இணைப்புகளை ஏற்ற விடவும்"
diff --git a/tde-i18n-tg/messages/tdepim/kmail.po b/tde-i18n-tg/messages/tdepim/kmail.po
index 22edb1f2d68..745474cb86c 100644
--- a/tde-i18n-tg/messages/tdepim/kmail.po
+++ b/tde-i18n-tg/messages/tdepim/kmail.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2005-09-17 13:29+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -23,14 +23,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"Tajik TDE Teams: Роҷер Ковакс, Марина Колючева, Виктор Ибрагимов, Акмал Саломов"
+"Tajik TDE Teams: Роҷер Ковакс, Марина Колючева, Виктор Ибрагимов, Акмал "
+"Саломов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -179,6 +180,12 @@ msgstr "&Не (эҳтиёткорона истифода кунед)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Қуттии хатнависӣ барои нимахудкоронакоркарди манбаъ"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Пок кардани кӯҳнашуда"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -261,12 +268,12 @@ msgstr "&Номи баҳисобгирӣ:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Internet-провайдер ба шумо имконияти қайди баҳисобгириро бо <em>номе</em>"
-", кибарои авторизатсия бо серверҳои почтавӣ истифода мешавад, дод. Одатан ин "
+"Internet-провайдер ба шумо имконияти қайди баҳисобгириро бо <em>номе</em>, "
+"кибарои авторизатсия бо серверҳои почтавӣ истифода мешавад, дод. Одатан ин "
 "қисми адреси почтавӣ мебошад, ки пеш аз ишораи<em>@</em> ҷойгир шудааст."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -290,17 +297,17 @@ msgstr "Нигоҳ доштани гузарвожаи &POP дар файли т
 #, fuzzy
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Барои захира кардани гузарвожа ба сервери SMTP дар файли танзимоти KMail, "
-"параметри зеринро фаъол созед. Гузарвожа ба формати хонда намешуда захира карда "
-"мешавад, аммо ҳангоми қабул намудани дастрасӣ ба файли танзимот, шояд рамзҳои "
-"гузарвожаи шуморо хонда шавад."
+"параметри зеринро фаъол созед. Гузарвожа ба формати хонда намешуда захира "
+"карда мешавад, аммо ҳангоми қабул намудани дастрасӣ ба файли танзимот, шояд "
+"рамзҳои гузарвожаи шуморо хонда шавад."
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -330,12 +337,13 @@ msgstr "&Филтронидани маълумот, ки андозааш зиё
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Бо фаъол сохтани ин параметр, метавонед маълумотҳоро дар худи сервер филтр "
-"кунед, дар ин сурат метавонед маълумотҳоро кашида гиред, ҳузф ё дар худи сервер "
-"мононед."
+"кунед, дар ин сурат метавонед маълумотҳоро кашида гиред, ҳузф ё дар худи "
+"сервер мононед."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -385,13 +393,15 @@ msgstr "&Матни бозшуда"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&ВОРИД"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -436,9 +446,9 @@ msgstr "Тағйир додан:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -501,12 +511,12 @@ msgstr "Пурбор кардани замимот аз рӯи &талабот"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
-"Инро барои худкорона пурбор накардани замимот балки ба рӯи он клик намудан низ "
-"фаъол созед. Ин кор бо маълумотҳои калонро тезтар мекунад."
+"Инро барои худкорона пурбор накардани замимот балки ба рӯи он клик намудан "
+"низ фаъол созед. Ин кор бо маълумотҳои калонро тезтар мекунад."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -547,7 +557,7 @@ msgstr "<none>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Воридшаванда"
 
@@ -555,11 +565,11 @@ msgstr "Воридшаванда"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Ин сервер пуштибони намекунад ахбороти рақамҳои беҳамторо,аммо ин талабот барои "
-"гузоштани ахборотҳоро дар сервер.\n"
+"Ин сервер пуштибони намекунад ахбороти рақамҳои беҳамторо,аммо ин талабот "
+"барои гузоштани ахборотҳоро дар сервер.\n"
 "Аз вақте ,ки якчанд серверҳо хато эълон мекунанд қобилиятҳояшонро шумо ҳоло "
 "қобилият доред дар гирондан ахборотҳои гирифтагиро дар сервер."
 
@@ -567,8 +577,8 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Сервер пуштибони намекунад сарлаваҳои ахбороти гирифтагиро,аммо ин "
 "талаботест,ки барои филтер кардани ахборотҳоро дар сервер.\n"
@@ -577,20 +587,22 @@ msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Дар хотир доред, ки баъзе серверҳои POP3, ки расонидани почтаро ба тарзи "
-"конвейери пуштибонӣ намекунад, метавонанд иттилооти харобгаштаро бифиристанд.\n"
+"конвейери пуштибонӣ намекунад, метавонанд иттилооти харобгаштаро "
+"бифиристанд.\n"
 "Баъзеи аз серверҳо ин имконотро пуштибонӣ мекунанд, аммо огоҳӣ намекунанд. "
-"Барои озмоиши сервери POP3-и худ, тугмаи дар поёни диалог мавҷудбударо истифода "
-"кунед.\n"
+"Барои озмоиши сервери POP3-и худ, тугмаи дар поёни диалог мавҷудбударо "
+"истифода кунед.\n"
 "Агар сервер имконияти фиристодани почтаро ба тарзи конвейерӣ огоҳӣ накунад, "
 "аввало бояд якчанд иттилоотроба он бифиристед ва баъд сайъ кунед онро қабул "
 "кунед."
@@ -601,35 +613,36 @@ msgstr "Сервер ва портро дар танзимот ишора кун
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Ин пардозишгар, маълум мешавад,ки луламаҷроро дастгирӣ намекунад, бинобар ин "
 "вариант корношоям шуд.\n"
 "То он вақте ки пардозишгарҳо лаёқатҳои худро дуруст эълон накардаанд, шумо "
-"ҳанӯз ҳам имконияти ба кор даровардани луламаҷроро доред.Лекин дар хотир нигоҳ "
-"доред, ин хусусият баъзе пардозишгарони POP-ро ба вуҷуд меорад, ки луламаҷроро "
-"барои фиристондани мактубчаҳои вайрон дастгирӣ намекунад. Ҳамин тариқ пеш аз "
-"истифодаи ин хусусият бо почтаи муҳим шуморо лозим меояд, дар аввал вайро бо "
-"фиристондани шумораи калони мактубчаҳо, ки шумо ҳамаи онро фаровир "
-"кардед,санҷед аз пардозишгари POP сар кунед."
+"ҳанӯз ҳам имконияти ба кор даровардани луламаҷроро доред.Лекин дар хотир "
+"нигоҳ доред, ин хусусият баъзе пардозишгарони POP-ро ба вуҷуд меорад, ки "
+"луламаҷроро барои фиристондани мактубчаҳои вайрон дастгирӣ намекунад. Ҳамин "
+"тариқ пеш аз истифодаи ин хусусият бо почтаи муҳим шуморо лозим меояд, дар "
+"аввал вайро бо фиристондани шумораи калони мактубчаҳо, ки шумо ҳамаи онро "
+"фаровир кардед,санҷед аз пардозишгари POP сар кунед."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Сервер рақамҳои мактубҳои ягонаро дастгирӣ намекунад, лекин ин талаботи мондани "
-"мактубҳо дар сервер мебошад,барои ҳамин ҳам ин қобилияти ин вариант қатъ шуд.\n"
+"Сервер рақамҳои мактубҳои ягонаро дастгирӣ намекунад, лекин ин талаботи "
+"мондани мактубҳо дар сервер мебошад,барои ҳамин ҳам ин қобилияти ин вариант "
+"қатъ шуд.\n"
 "Ҳанӯз, ки баъзе серверҳо қувватнокии худро эълон накардаанд шумо имконият "
 "доред, ки мактубҳоро ба сервер баргардонед."
 
@@ -638,12 +651,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "Сервер ҷаҳиши мактубҳои овардашударо дастгирӣ намекунад, лекин ин талаботи "
-"филтркунонии мактубҳо дар сервер мебошад; барои ҳамин ҳам қобилияти ин вариант "
-"қатъ шуд.\n"
+"филтркунонии мактубҳо дар сервер мебошад; барои ҳамин ҳам қобилияти ин "
+"вариант қатъ шуд.\n"
 "То он вақте ки баъзе серверҳо қувватнокии худро дуруст эълон накардаанд шумо "
 "имконияти баргардондани мактубҳои филтршавандаро ба сервер доред."
 
@@ -728,8 +741,8 @@ msgstr "Афзудани қуттии хатфиристӣ"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Барои қабул намудани почта, шумо бояд қуттии хатнависиро ба қисмати Шабақаи "
 "танзимоти барнома илова кунед."
@@ -775,9 +788,9 @@ msgstr "Тафтиши имлои - KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -849,8 +862,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Амалиёти серверӣ"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "&Ғайри"
@@ -993,30 +1005,29 @@ msgstr ""
 #: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Дар инҷо шумо метавонед гирифтан як чанд мадад дар барқароркунии қоидаҳои "
-"филтери KMail барои истифода бурдани як чанд асбобҳои анти-вируси "
-"умумӣ-машҳур.</p>"
-"<p>Устод метавонад дидан он асбобҳоеро,ки дар компютери шумо, ҳато сохтан "
-"қоидаҳои филтерро барои ба гуруҳо ҷудо намудани ахборотро бо истифодаи ин "
-"асбобҳо ва ҷудо кардани ахбротҳое,ки дорои вирусҳо мебошанд.Устод намегирад "
-"қоидаҳои филтери вуҷуд бударо ба ҳисоб: ӯ доимо якҷо мекунад қоидаҳои навро.</p>"
-"<p><b>Эҳтиёт бошед:</b> Азбаски KMail маҳкам аст дар вақте,ки аз назар "
-"гузаронидан ахборотҳо барои вирус, шумо метавонед вохуред ба як чанд душвориҳо "
-"бо ҷавоб надиҳии KMail барои он ,ки амалиётҳои асбоби анти-вирус доимо вақтро "
-"сарф мекунанд;ба ҳисоб гиред барои нест кардани қоидаҳо аз тарафи устод сохта "
-"шудаи филтер барои баргаштан ба интизоми пешакӣ."
+"филтери KMail барои истифода бурдани як чанд асбобҳои анти-вируси умумӣ-"
+"машҳур.</p><p>Устод метавонад дидан он асбобҳоеро,ки дар компютери шумо, "
+"ҳато сохтан қоидаҳои филтерро барои ба гуруҳо ҷудо намудани ахборотро бо "
+"истифодаи ин асбобҳо ва ҷудо кардани ахбротҳое,ки дорои вирусҳо мебошанд."
+"Устод намегирад қоидаҳои филтери вуҷуд бударо ба ҳисоб: ӯ доимо якҷо мекунад "
+"қоидаҳои навро.</p><p><b>Эҳтиёт бошед:</b> Азбаски KMail маҳкам аст дар "
+"вақте,ки аз назар гузаронидан ахборотҳо барои вирус, шумо метавонед вохуред "
+"ба як чанд душвориҳо бо ҷавоб надиҳии KMail барои он ,ки амалиётҳои асбоби "
+"анти-вирус доимо вақтро сарф мекунанд;ба ҳисоб гиред барои нест кардани "
+"қоидаҳо аз тарафи устод сохта шудаи филтер барои баргаштан ба интизоми "
+"пешакӣ."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1054,10 +1065,9 @@ msgstr "Ҷойгир кардани иттилоот ба:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1068,8 +1078,8 @@ msgstr "Озмоиши иттилоот бо васоитҳои зидди ви�
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Бигузор анти-вируси абзорҳо мактуби шуморо тафтиш  кунад.Афсунгар филтрҳои "
 "мувофиқро эҷод мекунад. Мактубҳо одатан аз тарафи абзорҳо чунон ишорат карда "
@@ -1083,8 +1093,8 @@ msgstr "Гузаронидани почта бо вирусҳояш ба пап�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Филтере, ки мактубҳоро пайдо мекунад, ҳамчун випуси-инфексиядор тасниф карда "
 "мешавад ва он мактубҳоро ба пӯшае, ки пеш ёфта шуда  буд мекӯчонад. Ин пӯша "
@@ -1096,11 +1106,11 @@ msgstr "Иттилооти вирусдорро ҳамчун хондашуда
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
-"Иттилоотро, ки ҳамчун сироятшуда тасниф карда шудааст, ҳамчун хондашуда ишора "
-"намудан ва ҳамчунин онҳоро ба папкаи ишорашуда ҷойгир кардан."
+"Иттилоотро, ки ҳамчун сироятшуда тасниф карда шудааст, ҳамчун хондашуда "
+"ишора намудан ва ҳамчунин онҳоро ба папкаи ишорашуда ҷойгир кардан."
 
 #: archivefolderdialog.cpp:48
 msgid ""
@@ -1294,8 +1304,8 @@ msgstr "Хатогӣ ҳангоми хондани папкаи %1 дар сер
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1315,8 +1325,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1347,9 +1357,9 @@ msgstr "ҳузфшуда"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Ягон яки аз профили шумо ба қабулкунандаи, мактуби шумо мутобиқ нест. "
 "<br>Интихоб кунед, ки кадом яки адресҳои зерин азони шумост:"
@@ -1357,8 +1367,8 @@ msgstr ""
 #: callback.cpp:222
 #, fuzzy
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Ягон яки аз профили шумо ба қабулкунандаи, мактуби шумо мутобиқ нест. "
 "<br>Интихоб кунед, ки кадом яки адресҳои зерин азони шумост:"
@@ -1388,23 +1398,26 @@ msgstr "Папкаи \"%1\" бомуваффақият майдаи зич ка�
 #: compactionjob.cpp:180 compactionjob.cpp:261
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr ""
-"Ҳангоми майдаи зич кадани \"%1\" хатогӣ рӯй дод. Майдаи зич кардан қатъ карда "
-"шуд."
+"Ҳангоми майдаи зич кадани \"%1\" хатогӣ рӯй дод. Майдаи зич кардан қатъ "
+"карда шуд."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ин барпосозӣ аз тарафи мудирият устувор шудааст.</p>"
-"<p>Агар ба фикри шумо ин хато бошад, марҳамат бо вай алоқа кунед.</p></qt>"
+"<qt><p>Ин барпосозӣ аз тарафи мудирият устувор шудааст.</p><p>Агар ба фикри "
+"шумо ин хато бошад, марҳамат бо вай алоқа кунед.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Пурбор кардани профил..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "&Танзими KMail..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Афзудан..."
@@ -1434,6 +1447,11 @@ msgstr "<qt>Оё ҳақиқатан мехоҳед профили <b>%1</b>-ро
 msgid "Remove Identity"
 msgstr "Ҳузфи профил"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Ҳузф кардан"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Афзудан..."
@@ -1442,6 +1460,11 @@ msgstr "Афзудан..."
 msgid "Modify..."
 msgstr "Таъғир додан..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Ҳузф кардан"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Ҳамчун асосӣ кардан"
@@ -1458,17 +1481,15 @@ msgstr "Ф&иристодан"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Фиристодашаванда (ҳеҷ набошад як қайдоте илова кунед):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Ном"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Навъ"
@@ -1491,8 +1512,7 @@ msgstr "Ҳамчун асосӣ кардан"
 msgid "Common Options"
 msgstr "Параметрҳои умумӣ"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Тас&диқот пеш аз фиристодан"
@@ -1543,17 +1563,16 @@ msgstr "Номи &домени пешфарзӣ:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Номи домени пешфарзӣ барои илова намудани адреси e-mail, ки дорои танҳо номи "
-"истифодакунанда мебошад, истифода карда мешавад.</p></qt>"
+"<qt><p>Номи домени пешфарзӣ барои илова намудани адреси e-mail, ки дорои "
+"танҳо номи истифодакунанда мебошад, истифода карда мешавад.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1574,9 +1593,9 @@ msgstr "Афзудани нақлиёти почтавӣ"
 #: configuredialog.cpp:832
 #, fuzzy
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (пешфарзӣ)"
 
@@ -1655,6 +1674,10 @@ msgstr "Таъғири параметрҳои қайдоти баҳисобги�
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Наметавонам қайдоти баҳисобгирии <b>%1</b>-ро эҷод кунам.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Рангҳо"
@@ -1770,8 +1793,7 @@ msgstr "Истинодоти хабаргирифташуда"
 msgid "Misspelled Words"
 msgstr "Калимаҳои хатодор"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Иттилооти нав"
@@ -1964,8 +1986,8 @@ msgstr "Печонидани пешфарзӣ"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Бо иттилоотҳои &нав, муҳим ё хонда нашуда ва мушоҳида карда истода низ боз "
 "кардан."
@@ -1976,71 +1998,54 @@ msgstr "Формати хурӯҷи сана"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Ифодаҳои зерин метавонанд барои ишора намудани санаи зайл истифода "
-"шаванд:</strong></p>"
-"<ul>"
-"<li>d - рақами рӯз дар моҳ ғайри нули пешина (1-31)</li>"
-"<li>dd - рақами рӯз дар моҳ бо ҳамроҳи нули пешина (01-31)</li>"
-"<li>ddd - номи кӯтоҳи рӯзи ҳафта (Душ - Якш)</li>"
-"<li>dddd - номи пурраи рӯзи ҳафта (Душанбе - Якшанбе)</li>"
-"<li>M - рақами моҳ ғайри нули пешина (1-12)</li>"
-"<li>MM - рақами моҳ бо ҳамроҳи рақами пешина (01-12)</li>"
-"<li>MMM - номи кӯтоҳи моҳ (Янв - Дек)</li>"
-"<li>MMMM -номи пурраи моҳ (Январ - Декабр)</li>"
-"<li>yy - сол ба монанди рақами дуадада (00-99)</li>"
-"<li>yyyy - сол ба монанди чаҳор адада (0000-9999)</li></ul>"
-"<p><strong>Ифодаи зерин метавонад барои ишора намудани вақт истифода "
-"шавад:</string></p> "
-"<ul>"
-"<li>h - соат ғайри нули пешистода (0-23 ё 1-12 дар 12 соат)</li>"
-"<li>hh - соат бо ҳамроҳи нули пешина(00-23 ё 01-12 дар 12-соат)</li>"
-"<li>m - дақиқот ғайри нули пешистода (0-59)</li>"
-"<li>mm - дақиқот ҳамроҳи нул (00-59)</li>"
-"<li>s - сония ғайри нули пешистода (0-59)</li>"
-"<li>ss - сония ҳамроҳи нули пешистода (00-59)</li>"
-"<li>z - миллисония ғайри нули пешистода (0-999)</li>"
-"<li>zzz - миллисония ҳамроҳи нули пешистода (000-999)</li>"
-"<li>AP - Ба формати 12-соат таъғир додан. AP ба мувофиқати \"AM\" ё \"PM\" "
-"ивваз мешавад.</li>"
-"<li>ap - ба формати 12-соат таъғир додан. ap ба мувофиқоти \"am\" ё \"pm\" "
-"ивваз карда мешавад.</li>"
-"<li>Z - минтақаи вақт ба формати ададии (-0500)</li></ul>"
-"<p><strong>Ишораҳои дигар ба эътибор гирифта намешаванд.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Ифодаҳои зерин метавонанд барои ишора намудани санаи зайл "
+"истифода шаванд:</strong></p><ul><li>d - рақами рӯз дар моҳ ғайри нули "
+"пешина (1-31)</li><li>dd - рақами рӯз дар моҳ бо ҳамроҳи нули пешина "
+"(01-31)</li><li>ddd - номи кӯтоҳи рӯзи ҳафта (Душ - Якш)</li><li>dddd - номи "
+"пурраи рӯзи ҳафта (Душанбе - Якшанбе)</li><li>M - рақами моҳ ғайри нули "
+"пешина (1-12)</li><li>MM - рақами моҳ бо ҳамроҳи рақами пешина (01-12)</"
+"li><li>MMM - номи кӯтоҳи моҳ (Янв - Дек)</li><li>MMMM -номи пурраи моҳ "
+"(Январ - Декабр)</li><li>yy - сол ба монанди рақами дуадада (00-99)</"
+"li><li>yyyy - сол ба монанди чаҳор адада (0000-9999)</li></"
+"ul><p><strong>Ифодаи зерин метавонад барои ишора намудани вақт истифода "
+"шавад:</string></p> <ul><li>h - соат ғайри нули пешистода (0-23 ё 1-12 дар "
+"12 соат)</li><li>hh - соат бо ҳамроҳи нули пешина(00-23 ё 01-12 дар 12-"
+"соат)</li><li>m - дақиқот ғайри нули пешистода (0-59)</li><li>mm - дақиқот "
+"ҳамроҳи нул (00-59)</li><li>s - сония ғайри нули пешистода (0-59)</li><li>ss "
+"- сония ҳамроҳи нули пешистода (00-59)</li><li>z - миллисония ғайри нули "
+"пешистода (0-999)</li><li>zzz - миллисония ҳамроҳи нули пешистода (000-999)</"
+"li><li>AP - Ба формати 12-соат таъғир додан. AP ба мувофиқати \"AM\" ё \"PM"
+"\" ивваз мешавад.</li><li>ap - ба формати 12-соат таъғир додан. ap ба "
+"мувофиқоти \"am\" ё \"pm\" ивваз карда мешавад.</li><li>Z - минтақаи вақт ба "
+"формати ададии (-0500)</li></ul><p><strong>Ишораҳои дигар ба эътибор гирифта "
+"намешаванд.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Таъғироти танзимоти глобалии мунозирот ба параметрҳои тамоми папкаҳо амал "
 "мекунад."
@@ -2058,8 +2063,7 @@ msgstr "&Сатри вазъият барои HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Намоиши тамоми унвонот"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -2068,8 +2072,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2097,8 +2100,7 @@ msgstr "Худкор"
 msgid "&Override character encoding:"
 msgstr "Тағйири рамзгузорӣ"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Ишора дар новаи системавӣ"
@@ -2204,23 +2206,20 @@ msgstr "<b>%f</b> бо номи файл барои таъғирдиҳӣ ивв�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Дар унвоноти барои ҷавобҳо гузоришҳои зайл имконпазиранд:"
-"<br><b>%D</b>: сана, <b>%S</b>: мавзӯъ,"
-"<br><b>%e</b>: адреси фиристанда, <b>%F</b>: номифиристанда, <b>%f</b>"
-": инитсиалҳои фиристанда"
-"<br><b>%T</b>: номи қабулкунанда, <b>%t</b>: ном ва нишони қабулкунанда"
-"<br><b>%C</b>: номҳои қабулкунандаҳои нусхот, <b>%c</b>"
-": ном ва нишонаҳои қабулкунандаҳои нусхот,"
-"<br><b>%%</b>: аломати фоиз, <b>%_</b>: фосила, <b>%L</b>"
-": ибтидои сатри нав</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Дар унвоноти барои ҷавобҳо гузоришҳои зайл имконпазиранд:<br><b>%D</b>: "
+"сана, <b>%S</b>: мавзӯъ,<br><b>%e</b>: адреси фиристанда, <b>%F</b>: "
+"номифиристанда, <b>%f</b>: инитсиалҳои фиристанда<br><b>%T</b>: номи "
+"қабулкунанда, <b>%t</b>: ном ва нишони қабулкунанда<br><b>%C</b>: номҳои "
+"қабулкунандаҳои нусхот, <b>%c</b>: ном ва нишонаҳои қабулкунандаҳои нусхот,"
+"<br><b>%%</b>: аломати фоиз, <b>%_</b>: фосила, <b>%L</b>: ибтидои сатри "
+"нав</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2243,21 +2242,20 @@ msgstr "Ҷавоб ба &ҳама:"
 msgid "&Forward:"
 msgstr "&Фиристониш:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Нишондоди иқтибосот:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Дар иттилооти аз %D шумо чунин навиштед:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Дар иттилооти аз %D, %F чунин навишт:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Иттилооти фиристодашуда"
 
@@ -2295,8 +2293,8 @@ msgstr "Префикси нави фиристонишро ворид кунед
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Ин рӯйхат барои ҳар як иттилооти ибтидоӣ озмоида мешавад барои онки дар "
 "иттилоот тамоми ишораҳои яке аз рамзгузории ишорашуда низ мавҷуд бошад (аз "
@@ -2336,10 +2334,9 @@ msgstr "Аҳамият"
 msgid "Ne&w"
 msgstr "Э&ҷод кардан"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Ном:"
@@ -2348,16 +2345,15 @@ msgstr "&Ном:"
 msgid "&Value:"
 msgstr "&Аҳамият:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Номҳои замимоти мутобиқ бо Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Ин тартиботро барои онки Outlook(tm) номҳои замимотро, ки дорои аломатҳои "
 "кириллӣ мебошад, бифаҳмад фаъол созед"
@@ -2387,19 +2383,19 @@ msgstr "фиристода истодаам"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 "Шумо кодонии номҳои файлҳои замимашударо ба формати ғайристандартӣ, ки ба "
 "Outlook(tm) ва Outlook Express(TM) фаҳмо аст, фаъол сохтед.\n"
-"Чунин иттилоот метавон бо клиентҳои почтавӣ, ки бо стандартҳо мутобиқ мешавад, "
-"дарёфт нахоҳад шуд. Барои ҳамин агар шумо ягон илоҷ надошта бошед, ин "
-"параметрро истифода кунед."
+"Чунин иттилоот метавон бо клиентҳои почтавӣ, ки бо стандартҳо мутобиқ "
+"мешавад, дарёфт нахоҳад шуд. Барои ҳамин агар шумо ягон илоҷ надошта бошед, "
+"ин параметрро истифода кунед."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2423,110 +2419,95 @@ msgstr "М&одули хати рамзӣ"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Баъзан иттилоотҳои электронӣ ба ду формат рост меоянд. Ин интихобот муайян "
-"мекунад, ки бо кадом намуд иттилоотро тасвир диҳад - чун HTML ё ҳамчун матни "
-"оддӣ.</p>"
-"<p>Намоиш ба намуди HTML, иттилоотро боз ҳам зеботар мекунад, аммо дар чунин "
-"маврид хавфи риоя накардани амниятро зиёдтар мекунад.</p>"
-"<p>Ҳангоми намоиши матни оддӣ, форматонӣ гум мешавад, лекин ҳангоми истифодаи "
-"даваки HTML (Konqueror), риоя накардани амният <em>имконнопазир</em> "
-"мешавад.</p>"
-"<p>Параметри зерин аз истифодаи нодурусти иттилоот дар формати HTML, ки "
-"мутассилона рӯй дода меистад, муҳофизат мекунад. Аммо он наметавонад баръакси "
-"тарзи риоя накардани амниятро, ки ҳангоми барориши ин раванди KMail ношинос "
-"буданд, нигоҳ дорад.</p>"
-"<p>Барои ҳамин тавсияи истифодаи<em>на</em> HTML, балки матни оддӣ низ дода "
-"мешавад.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Баъзан иттилоотҳои электронӣ ба ду формат рост меоянд. Ин интихобот "
+"муайян мекунад, ки бо кадом намуд иттилоотро тасвир диҳад - чун HTML ё "
+"ҳамчун матни оддӣ.</p><p>Намоиш ба намуди HTML, иттилоотро боз ҳам зеботар "
+"мекунад, аммо дар чунин маврид хавфи риоя накардани амниятро зиёдтар мекунад."
+"</p><p>Ҳангоми намоиши матни оддӣ, форматонӣ гум мешавад, лекин ҳангоми "
+"истифодаи даваки HTML (Konqueror), риоя накардани амният <em>имконнопазир</"
+"em> мешавад.</p><p>Параметри зерин аз истифодаи нодурусти иттилоот дар "
+"формати HTML, ки мутассилона рӯй дода меистад, муҳофизат мекунад. Аммо он "
+"наметавонад баръакси тарзи риоя накардани амниятро, ки ҳангоми барориши ин "
+"раванди KMail ношинос буданд, нигоҳ дорад.</p><p>Барои ҳамин тавсияи "
+"истифодаи<em>на</em> HTML, балки матни оддӣ низ дода мешавад.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Якчанд иттилоотҳои рекламавӣ ба формати HTML меоянд ва дорои истинодот ба "
-"тасвирот мебошанд, ки фиристандаҳо барои қабул намудани хабари онки шумо ин "
-"иттилоотҳоро (&quot;web bugs&quot;) хондаед, истифода мекунанд.</p>"
-"<p>Сабабе нест, ки тасвиротро аз худи шабақа пурбор кунед, чунки фиристанда "
-"доимо метавонад тасвироти лозимиро ба худи иттилоот гузорад.</p>"
-"<p>Барои ҳифз аз суиистифодаи HTML, инпараметр ба тарзи пешфарзӣ <em>"
-"ғайрифаъол</em> аст.</p>"
-"<p>Агар шумо ба ҳеҷ чиз нигоҳ накарда хоҳед, ки иттилоотро бо тасвироте, ки ба "
-"худи иттилоот намераванд аз назар гузаронед, ин интихоботро фаъол созед, лекин "
-"оиди масъалаҳои имконпазир дар хотир доред.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Якчанд иттилоотҳои рекламавӣ ба формати HTML меоянд ва дорои "
+"истинодот ба тасвирот мебошанд, ки фиристандаҳо барои қабул намудани хабари "
+"онки шумо ин иттилоотҳоро (&quot;web bugs&quot;) хондаед, истифода мекунанд."
+"</p><p>Сабабе нест, ки тасвиротро аз худи шабақа пурбор кунед, чунки "
+"фиристанда доимо метавонад тасвироти лозимиро ба худи иттилоот гузорад.</"
+"p><p>Барои ҳифз аз суиистифодаи HTML, инпараметр ба тарзи пешфарзӣ "
+"<em>ғайрифаъол</em> аст.</p><p>Агар шумо ба ҳеҷ чиз нигоҳ накарда хоҳед, ки "
+"иттилоотро бо тасвироте, ки ба худи иттилоот намераванд аз назар гузаронед, "
+"ин интихоботро фаъол созед, лекин оиди масъалаҳои имконпазир дар хотир доред."
+"</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Дастур барои маълумот оиди коркарди иттилоот</h3>"
-"<p>Маълумот оиди коркарди иттилоот (MDN) - ин иттилооти маълуми ҳамчун <b>"
-"тасдиқоти оиди хондан</b> мебошад. Муаллифи иттилоот маълумоти оиди коркардро "
-"пурсида истодааст, балки барномаи адресат бошад ҷавобро мефиристад, ки аз он "
-"муаллиф оиди тақдири иттилоот бифаҳмад. Одатан маълумотҳо метавонанд дорои "
-"чунин иттилоот бошанд: <b>намоиш дода шуд</b> (яънехонда шуд), <b>"
-"ҳузф карда шуд</b> ва <b>кор карда шуд</b> (мисол, аз нав фиристодан).</p>"
-"<p>KMail метавонад якчанд намуди коркардро амалӣ гардонад:</p>"
-"<ul>"
-"<li><em>Эътибор надодан</em>: ягон маълумот фиристода нахоҳад шуд (тавсия карда "
-"мешавад).</li>"
-"<li><em>Пурсиш</em>: пурсиши иҷозот ба фиристодани иттилоот. Бо чунин тарз "
-"метавонед фиристодани иттилоотро идора кунед.</li>"
-"<li><em>Рад кардан</em>: доим иттилооти оиди <b>рад кардан</b>"
-"-ро фиристодан. Муаллифи иттилоот бо чунин тарз мефаҳмад, ки иттилоот кор карда "
-"шудааст, аммо намефаҳмад, ки бо чӣ тарз.</li>"
-"<li><em>Доим фиристодан</em>: Муаллифи иттилоот бо чунин тарз мефаҳмад, ки "
-"иттилоот кор карда шудааст, ва мефаҳмад, ки бо чӣ тарз шудааст. Агар ин дар "
-"корчаллонии мантиқии шумо лозим набошад, ин параметрро сабт намудан тавсия "
-"намешавад.</li></ul> </qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Дастур барои маълумот оиди коркарди иттилоот</h3><p>Маълумот оиди "
+"коркарди иттилоот (MDN) - ин иттилооти маълуми ҳамчун <b>тасдиқоти оиди "
+"хондан</b> мебошад. Муаллифи иттилоот маълумоти оиди коркардро пурсида "
+"истодааст, балки барномаи адресат бошад ҷавобро мефиристад, ки аз он муаллиф "
+"оиди тақдири иттилоот бифаҳмад. Одатан маълумотҳо метавонанд дорои чунин "
+"иттилоот бошанд: <b>намоиш дода шуд</b> (яънехонда шуд), <b>ҳузф карда шуд</"
+"b> ва <b>кор карда шуд</b> (мисол, аз нав фиристодан).</p><p>KMail метавонад "
+"якчанд намуди коркардро амалӣ гардонад:</p><ul><li><em>Эътибор надодан</em>: "
+"ягон маълумот фиристода нахоҳад шуд (тавсия карда мешавад).</"
+"li><li><em>Пурсиш</em>: пурсиши иҷозот ба фиристодани иттилоот. Бо чунин "
+"тарз метавонед фиристодани иттилоотро идора кунед.</li><li><em>Рад кардан</"
+"em>: доим иттилооти оиди <b>рад кардан</b>-ро фиристодан. Муаллифи иттилоот "
+"бо чунин тарз мефаҳмад, ки иттилоот кор карда шудааст, аммо намефаҳмад, ки "
+"бо чӣ тарз.</li><li><em>Доим фиристодан</em>: Муаллифи иттилоот бо чунин "
+"тарз мефаҳмад, ки иттилоот кор карда шудааст, ва мефаҳмад, ки бо чӣ тарз "
+"шудааст. Агар ин дар корчаллонии мантиқии шумо лозим набошад, ин параметрро "
+"сабт намудан тавсия намешавад.</li></ul> </qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2542,15 +2523,15 @@ msgstr "&Иҷозаи пурбор кардани истинодотҳои зо�
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>ТАВАҶҶӮЪ!</b> Фаъол сохтани коркарди HTML ба почта, мубталошавии системаи "
-"шуморо ба шикаст карда дармадан низ боз ҳам зиёдтар мекунад.<a "
-"href=\"whatsthis:%1\">Муфассалтар оиди почта ба формати HTML...</a> "
-"<a href=\"whatsthis:%2\">Муфассалтар оиди манбаъҳои зоҳирӣ...</a>"
+"шуморо ба шикаст карда дармадан низ боз ҳам зиёдтар мекунад.<a href="
+"\"whatsthis:%1\">Муфассалтар оиди почта ба формати HTML...</a> <a href="
+"\"whatsthis:%2\">Муфассалтар оиди манбаъҳои зоҳирӣ...</a>"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2613,8 +2594,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>ТАВАҶҶӮЪ!</b> Ба тарзи худкор фиристоданитасдиқот, ғайрирасмияти мукотибаи "
-"шуморо вайрон мекунад. <a href=\"whatsthis:%1\">Муфассал...</a>"
+"<b>ТАВАҶҶӮЪ!</b> Ба тарзи худкор фиристоданитасдиқот, ғайрирасмияти "
+"мукотибаи шуморо вайрон мекунад. <a href=\"whatsthis:%1\">Муфассал...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2635,8 +2616,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2666,8 +2646,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Ҷустуҷӯи иттилоотҳои хонданашуда:"
 
@@ -2691,8 +2671,8 @@ msgstr "Доиравӣ аз рӯи тамоми папка"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2764,39 +2744,35 @@ msgstr "Дар каталогҳо (формати \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 "Ин ёрӣ чист?\n"
-"<qt>"
-"<p>Ин шакли қуттии почтаро, ки барои пӯшаҳои маҳаллӣ пешфарз мешавад, интихоб "
-"мекунад.:</p>"
-"<p><b>mқуттӣ:</b> Пӯшаҳои почтаи KMail, ҳар яктаашон бо файли алоҳида муаррифӣ "
-"мешаванд. Мактубчаҳои ҷудогона аз якдигар бо хате, ки бо \"From \"сар мешавад "
-"ҷудо карда мешаванд. Ин ҷойро дар диск нигоҳ медорад,лекин мумкин тавоноияш кам "
-"шавад, мисол дар вақти кӯчондани мактубчаҳо аз мобайни пӯшаҳо. </p>"
-"<p><b>maildir:</b> пӯшаҳои почтаи KMail бо пӯшаҳои ҳақиқӣ дар диск муаррифӣ "
-"мешаванд. Мактубчаҳои ҷудогона файлҳои алоҳида мебошанд. Ин метавонад дар диск "
-"каме ҷойро гирад, лекин тавоноияш зиёд хоҳад шуд, мисол дар вақти кӯчондани "
-"мактубчаҳо аз мобайни пӯшаҳо.</p></qt>файлҳоиҷудо (якто-якто) нигоҳ дошта "
-"шудаанд. Ҳар як иттилоот файли ҷудоро ифода мекунад. Ин каме ҷои зиёдро дар "
-"диск ишғол мекунад, лекин хеле боэътимодноктар, мисол, ҳангоми гузаронидани "
-"иттилоот аз як папка ба папкаи дигар низ хизмат мекунад.хранятся в отдельных "
-"файлах каждая. Сообщения отделяются друг от друга строкой \"From \". Это "
-"экономит место на диске, но может быть менее надёжно, например, при перемещении "
-"сообщений из одной папки в другую.</p>"
-"<p><b>maildir:</b> Все папки KMail хранятся в отдельных папках на диске. Каждое "
-"сообщение представляет собой отдельный файл. Это занимает немного больше места "
-"на диске, но более надёжно, например, при перемещении сообщения из одной папки "
-"в другую.</p></qt>"
+"<qt><p>Ин шакли қуттии почтаро, ки барои пӯшаҳои маҳаллӣ пешфарз мешавад, "
+"интихоб мекунад.:</p><p><b>mқуттӣ:</b> Пӯшаҳои почтаи KMail, ҳар яктаашон бо "
+"файли алоҳида муаррифӣ мешаванд. Мактубчаҳои ҷудогона аз якдигар бо хате, ки "
+"бо \"From \"сар мешавад ҷудо карда мешаванд. Ин ҷойро дар диск нигоҳ медорад,"
+"лекин мумкин тавоноияш кам шавад, мисол дар вақти кӯчондани мактубчаҳо аз "
+"мобайни пӯшаҳо. </p><p><b>maildir:</b> пӯшаҳои почтаи KMail бо пӯшаҳои "
+"ҳақиқӣ дар диск муаррифӣ мешаванд. Мактубчаҳои ҷудогона файлҳои алоҳида "
+"мебошанд. Ин метавонад дар диск каме ҷойро гирад, лекин тавоноияш зиёд хоҳад "
+"шуд, мисол дар вақти кӯчондани мактубчаҳо аз мобайни пӯшаҳо.</p></"
+"qt>файлҳоиҷудо (якто-якто) нигоҳ дошта шудаанд. Ҳар як иттилоот файли ҷудоро "
+"ифода мекунад. Ин каме ҷои зиёдро дар диск ишғол мекунад, лекин хеле "
+"боэътимодноктар, мисол, ҳангоми гузаронидани иттилоот аз як папка ба папкаи "
+"дигар низ хизмат мекунад.хранятся в отдельных файлах каждая. Сообщения "
+"отделяются друг от друга строкой \"From \". Это экономит место на диске, но "
+"может быть менее надёжно, например, при перемещении сообщений из одной папки "
+"в другую.</p><p><b>maildir:</b> Все папки KMail хранятся в отдельных папках "
+"на диске. Каждое сообщение представляет собой отдельный файл. Это занимает "
+"немного больше места на диске, но более надёжно, например, при перемещении "
+"сообщения из одной папки в другую.</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2831,43 +2807,35 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ҳангоми гузаштан ба иттилооти хонданашудаи навбатӣ, метавон чунин шавад, ки "
-"онҳо дар рӯйхат набошанд.</p>"
-"<p><b>Ғайри доира:</b> Бо муваффақоти иттилооти охирин, ҷустуҷӯӣ хотима хоҳад "
-"ёфт.</p>"
-"<p><b>Доиравӣ аз рӯи папкаи ҷорӣ:</b>Бо муваффақоти иттилооти охирин, ҷустуҷӯӣ "
-"аз ибтидои папка идома хоҳад шуд.</p>"
-"<p><b>Доиравӣ аз рӯи тамоми папкаҳо:</b> Бо муваффақоти иттилооти охирин, "
-"ҷустуҷӯӣ дар дигар папкаҳо идома хоҳад шуд.</p> "
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>Ҳангоми гузаштан ба иттилооти хонданашудаи навбатӣ, метавон чунин "
+"шавад, ки онҳо дар рӯйхат набошанд.</p><p><b>Ғайри доира:</b> Бо муваффақоти "
+"иттилооти охирин, ҷустуҷӯӣ хотима хоҳад ёфт.</p><p><b>Доиравӣ аз рӯи папкаи "
+"ҷорӣ:</b>Бо муваффақоти иттилооти охирин, ҷустуҷӯӣ аз ибтидои папка идома "
+"хоҳад шуд.</p><p><b>Доиравӣ аз рӯи тамоми папкаҳо:</b> Бо муваффақоти "
+"иттилооти охирин, ҷустуҷӯӣ дар дигар папкаҳо идома хоҳад шуд.</p> "
 "<p>Ҳамчунин ин ҳангоми ҷустуҷӯи иттилооти хонданашудаи пештара амал хоҳад "
 "кард.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2934,11 +2902,11 @@ msgstr "&Пинҳон кардани папкаҳои ҳамфаъолиятно
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Вақто,ки ин тафтиш карда шуд шумо наметавонед воситаи папкаҳои IMAP дар дарахти "
-"папкаро бинед."
+"Вақто,ки ин тафтиш карда шуд шумо наметавонед воситаи папкаҳои IMAP дар "
+"дарахти папкаро бинед."
 
 #: configuredialog.cpp:4909
 #, fuzzy
@@ -2948,11 +2916,11 @@ msgstr "Папкаи &IMAP дорои зерпапкаи зерин аст:"
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Вақто,ки ин тафтиш карда шуд шумо наметавонед воситаи папкаҳои IMAP дар дарахти "
-"папкаро бинед."
+"Вақто,ки ин тафтиш карда шуд шумо наметавонед воситаи папкаҳои IMAP дар "
+"дарахти папкаро бинед."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -3008,19 +2976,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Номҳои замимоти мутобиқ бо Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Худмуайяноти рӯйхати фиристониш"
@@ -3033,24 +3000,23 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt>Даъватномаҳо ба тарзи оддӣ ба монанди гузоришот ба почта фиристода "
 "мешаванд.Ин шоха даъватномаҳоро ба матни почта мефиристад: фиристодани "
-"даъватномаҳо ва ҷавобҳо ба Microsoft Outlook зарур ҳаст. "
-"<br>Лекин вақте ки шумо ин корро мекунед, минбаъд матни баёниро, ки барномаҳои "
-"матн хонда метавонанд гирифта наметавонед ҳамин тариқ одамоне,ки барномаҳои "
-"эмейл доранд даъватномаҳоро намефаҳманд,мактубҳои натиҷавӣ бисёр ноаниқ "
-"менамонянд. "
-"<br>Одамоне,ки барномаҳои эмейл доранд ва даъватномаҳоро фаҳмиданд бо ин кор "
-"карда метавонанд.</qt>"
+"даъватномаҳо ва ҷавобҳо ба Microsoft Outlook зарур ҳаст. <br>Лекин вақте ки "
+"шумо ин корро мекунед, минбаъд матни баёниро, ки барномаҳои матн хонда "
+"метавонанд гирифта наметавонед ҳамин тариқ одамоне,ки барномаҳои эмейл "
+"доранд даъватномаҳоро намефаҳманд,мактубҳои натиҷавӣ бисёр ноаниқ "
+"менамонянд. <br>Одамоне,ки барномаҳои эмейл доранд ва даъватномаҳоро "
+"фаҳмиданд бо ин кор карда метавонанд.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3160,17 +3126,16 @@ msgstr "&Фиристониш"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3189,15 +3154,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3271,8 +3236,8 @@ msgstr "Тағйири ихтисосот"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3375,8 +3340,8 @@ msgstr ""
 #: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
-"Натавонистам иттилоотҳои кӯҳнашударо аз папкаи %1 гузаронам: папкаи охирини %2 "
-"ёфт нашуд"
+"Натавонистам иттилоотҳои кӯҳнашударо аз папкаи %1 гузаронам: папкаи охирини "
+"%2 ёфт нашуд"
 
 #: expirejob.cpp:199
 msgid ""
@@ -3543,6 +3508,11 @@ msgstr "Ҳузфи феҳрист"
 msgid "Filters"
 msgstr "Филтри %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Ҷудо кардани &тамоми иттилоот"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3574,12 +3544,12 @@ msgstr "&Ворид кардани маҷалаи филтр"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Шумо метавонед фаъолиятҳои филтерро ба ин ҷо дароред ё ин ки бароред Албатта "
-"санади воридкунӣ  дода шудааст ва танҳо вақте ки воридкунӣ кушода мешавад нишон "
-"дода мешавад. "
+"санади воридкунӣ  дода шудааст ва танҳо вақте ки воридкунӣ кушода мешавад "
+"нишон дода мешавад. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3595,10 +3565,11 @@ msgstr "&Озмоиш аз рӯи дастур"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 "Шумо метавонед баргаштро дар сабти воқеъӣ, ки ба арзёбии қоидаҳои филтри "
 "филтрҳои қабулшуда тааллуқ дорад, назорат кунед:баъд аз оне ки ин вариант "
@@ -3624,14 +3595,14 @@ msgstr "мавҷуд нест"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Ҷамъоварии санади сабти воқеъӣ хотираро барои муввақатан нигоҳ доштани санади "
-"сабти воқеъӣ истифода мебарад; дар ин ҷо шумо метавонед миқдори ҳади аксари "
-"хотираи истифодабурдашударо кам кунед;"
+"Ҷамъоварии санади сабти воқеъӣ хотираро барои муввақатан нигоҳ доштани "
+"санади сабти воқеъӣ истифода мебарад; дар ин ҷо шумо метавонед миқдори ҳади "
+"аксари хотираи истифодабурдашударо кам кунед;"
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3641,7 +3612,7 @@ msgstr ""
 "Натавонистам файли %1 захира кунам:\n"
 "%2."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Хатои KMail"
@@ -3687,9 +3658,9 @@ msgstr "&Идентификатори истифодабаранда:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 "Идентификатори истифодабаранда (логин) барои IMAP-сервер. Ин метавон номи "
 "истифодабаранда ва ё нишонаи почтавии он бошад."
@@ -3746,11 +3717,11 @@ msgstr "Ҳуқуқ ба хондан/қайд кардан дар сабад, м
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
-"Иттилоот ҳоло аз сервер қабул нашудааст, лутфан \"Почтаи озмоянда\"-ро истифода "
-"кунед."
+"Иттилоот ҳоло аз сервер қабул нашудааст, лутфан \"Почтаи озмоянда\"-ро "
+"истифода кунед."
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
@@ -3760,8 +3731,7 @@ msgstr "Хатоги:ягон ҳисоби IMAP дар ин папка муай�
 msgid "Connecting to server %1, please wait..."
 msgstr "Васл кардан ба сервери %1, лутфан интизор шавед..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Хатогии васл кардан ба сервери %1"
@@ -3776,7 +3746,8 @@ msgid ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 msgstr ""
-"Бозёби кардани хатоги,ба даст овардани руйхати танзим мекарда (ACL) аз сервер\n"
+"Бозёби кардани хатоги,ба даст овардани руйхати танзим мекарда (ACL) аз "
+"сервер\n"
 "%1"
 
 #: folderdiaacltab.cpp:569
@@ -3789,8 +3760,8 @@ msgstr "Афзудани ҳуқуқи дастрасӣ"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 "Оё дар ҳақиқат мехоҳед,ки иҷозатномаҳои шахсиатонро барои ин пӯша бардоред? "
 "Баъдтар наметавонед вайро ба даст оред."
@@ -3805,7 +3776,8 @@ msgid ""
 "Error retrieving quota information from server\n"
 "%1"
 msgstr ""
-"Бозёби кардани хатоги,ба даст овардани руйхати танзим мекарда (ACL) аз сервер\n"
+"Бозёби кардани хатоги,ба даст овардани руйхати танзим мекарда (ACL) аз "
+"сервер\n"
 "%1"
 
 #: folderdiaquotatab.cpp:184
@@ -3825,7 +3797,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Ҳузфи феҳрист"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Папкаҳои маҳаллӣ"
@@ -3852,9 +3824,9 @@ msgstr "<папка интихоб кунед>"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3875,11 +3847,20 @@ msgstr "&Барҳам додан"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Номаълум"
@@ -4001,80 +3982,18 @@ msgstr "Вазъият: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>И"
-"<br>т"
-"<br>т"
-"<br>и"
-"<br>л"
-"<br>о"
-"<br>о"
-"<br>т"
-"<br>и"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>И<br>т<br>т<br>и<br>л<br>о<br>о<br>т<br>и<br> "
+"<br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt> "
-"<br>И"
-"<br>т"
-"<br>т"
-"<br>и"
-"<br>л"
-"<br>о"
-"<br>о"
-"<br>т"
-"<br>и"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>ҳ"
-"<br>о"
-"<br>л"
-"<br>о"
-"<br> "
-"<br>н"
-"<br>е"
-"<br>с"
-"<br>т</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt> <br>И<br>т<br>т<br>и<br>л<br>о<br>о<br>т<br>и<br> "
+"<br>H<br>T<br>M<br>L<br> <br>ҳ<br>о<br>л<br>о<br> <br>н<br>е<br>с<br>т</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4086,19 +4005,14 @@ msgstr "&Номи шумо:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Номи шумо</h3>"
-"<p>Ин замина бояд дорои номи замина ё тахаллус бошад. Ин дар унвоноти иттилооти "
-"фиристодашаванда истифода карда мешавад.</p>"
-"<p>Агар ин заминаро холӣ бимонед, дар иттилоотҳои фиристодашавандаатон танҳо "
-"e-mail-и шумо низ зоҳир хоҳад шуд.</p></qt>"
+"<qt><h3>Номи шумо</h3><p>Ин замина бояд дорои номи замина ё тахаллус бошад. "
+"Ин дар унвоноти иттилооти фиристодашаванда истифода карда мешавад.</"
+"p><p>Агар ин заминаро холӣ бимонед, дар иттилоотҳои фиристодашавандаатон "
+"танҳо e-mail-и шумо низ зоҳир хоҳад шуд.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4106,17 +4020,13 @@ msgstr "&Ташкилот:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Ташкилот</h3>"
-"<p>Агар хоҳед, ки номи ташкилот дар унвоноти хат, ки бо шумо фиристода мешавад, "
-"афзуда шавад, дар инҷо номи ташкилотро, ки дар он кор мекунед, ворид кунед.</p>"
-"<p>Метавон ин заминаро холӣ бимонд.</p></qt>"
+"<qt><h3>Ташкилот</h3><p>Агар хоҳед, ки номи ташкилот дар унвоноти хат, ки бо "
+"шумо фиристода мешавад, афзуда шавад, дар инҷо номи ташкилотро, ки дар он "
+"кор мекунед, ворид кунед.</p><p>Метавон ин заминаро холӣ бимонд.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4125,19 +4035,14 @@ msgstr "&Адреси e-mail:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Адреси E-mail</h3>"
-"<p>Агар ин заминаро холӣ бимонед ё онро нодуруст пур кунед ба ҷавобдиҳандаҳои "
-"шумо мушкилият рӯй медиҳад.</p></qt>"
+"<qt><h3>Адреси E-mail</h3><p>Агар ин заминаро холӣ бимонед ё онро нодуруст "
+"пур кунед ба ҷавобдиҳандаҳои шумо мушкилият рӯй медиҳад.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4146,21 +4051,12 @@ msgstr "&Адреси e-mail:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4180,24 +4076,22 @@ msgstr "Калиди имзоии шумо OpenPGP аст"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Калиди OpenPGP-ро, ки барои имзоии рақамии иттилоот истифода мешавад, интихоб "
-"кунед."
+"Калиди OpenPGP-ро, ки барои имзоии рақамии иттилоот истифода мешавад, "
+"интихоб кунед."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Калиди OpenPGP барои имзогузории иттилоот истифода карда мешавад. Ҳамчунин "
-"метавон калиди GnuPG-ро истифода бурд.</p>"
-"<p>Агар ин заминаро холӣ бимонед, дар он сурат метавон почтаи оддиро, ки барои "
-"он рамзгузорӣ лозим нест, бифиристед.</p>"
-"<p>Муфассалтар оиди калид метавон дар<a>http://www.gnupg.org</a></p> бихонд</qt>"
+"<qt><p>Калиди OpenPGP барои имзогузории иттилоот истифода карда мешавад. "
+"Ҳамчунин метавон калиди GnuPG-ро истифода бурд.</p><p>Агар ин заминаро холӣ "
+"бимонед, дар он сурат метавон почтаи оддиро, ки барои он рамзгузорӣ лозим "
+"нест, бифиристед.</p><p>Муфассалтар оиди калид метавон дар<a>http://www."
+"gnupg.org</a></p> бихонд</qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4209,30 +4103,26 @@ msgstr "Калиди рамзгузории шумо OpenPGP аст"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Калиди OpenPGP-ро, ки барои рамзгузории иттилооти шумо ва барои дастури "
 "\"Афзудани калиди кушод\" ба муҳаррир истифода мешавад, интихоб кунед."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Калиди OpenPGP барои рамзгузории иттилоотҳои шумо ва барои дастури "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Калиди OpenPGP барои рамзгузории иттилоотҳои шумо ва барои дастури "
 "\"Афзудани калиди нав\" дар муҳаррир истифода мешавад. Ҳамчунин метавон "
-"калидҳои GnuPG-ро истифода кард.</p>"
-"<p>Агар ин заминаро холӣ бимонед дар ин сурат метавон почтаи оддиро, ки барои "
-"он рамзгузорӣ лозим нест, бифиристед.</p>"
-"<p>Муфассалтар оиди калидҳо метавон дар<a>http://www.gnupg.org</a></p> "
+"калидҳои GnuPG-ро истифода кард.</p><p>Агар ин заминаро холӣ бимонед дар ин "
+"сурат метавон почтаи оддиро, ки барои он рамзгузорӣ лозим нест, бифиристед.</"
+"p><p>Муфассалтар оиди калидҳо метавон дар<a>http://www.gnupg.org</a></p> "
 "бихонд</qt>"
 
 #: identitydialog.cpp:230
@@ -4248,20 +4138,19 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Сертификати S/MIME-ро, ки барои имзои иттилоот истифода мешавад, интихоб кунед."
+"Сертификати S/MIME-ро, ки барои имзои иттилоот истифода мешавад, интихоб "
+"кунед."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Калиди S/MIME (X.509) барои имзои иттилоот истифода мешавад.</p>"
-"<p>Агар ин заминаро холӣ бимонед дар ин сурат метавон почтаи оддиро, ки барои "
-"он рамзгузорӣ лозим нест, бифиристед.</p></qt>"
+"<qt><p>Калиди S/MIME (X.509) барои имзои иттилоот истифода мешавад.</"
+"p><p>Агар ин заминаро холӣ бимонед дар ин сурат метавон почтаи оддиро, ки "
+"барои он рамзгузорӣ лозим нест, бифиристед.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4273,26 +4162,24 @@ msgstr "Сертификати рамзгузории шумо S/MIME аст"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Сертификати S/MIME-ро, ки барои рамзгузории иттилооти шумо ва барои дастури "
 "\"Афзудани калиди кушод\" дар муҳаррир истифода мешавад, интихоб кунед."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Сертификати S/MIME барои рамзгузории иттилооти шумо ва барои дастури "
-"\"Афзудани калиди кушод\" дар муҳаррир истифода бурда мешавад.</p>"
-"<p>Агар ин заминаро холӣ бимонед, дар ин сурат метавон почтаи оддиро, ки барои "
-"он рамзгузорӣ лозим нест, бифиристед.</p></qt>"
+"<qt><p>Сертификати S/MIME барои рамзгузории иттилооти шумо ва барои дастури "
+"\"Афзудани калиди кушод\" дар муҳаррир истифода бурда мешавад.</p><p>Агар ин "
+"заминаро холӣ бимонед, дар ин сурат метавон почтаи оддиро, ки барои он "
+"рамзгузорӣ лозим нест, бифиристед.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4312,24 +4199,20 @@ msgstr "Адреси &Reply-To:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адресҳои Reply-To</h3>"
-"<p>Заминаи <tt>Reply-to:</tt>-ро дар унвони хат муайян мекунад. Адреси "
-"ишорашуда ҳангоми ҷавоб дар хат истифода мешавад.</p>"
-"<p>Ин метавон ҳангоме, ки (мисол) гурӯҳи одамон бо ҳам як амалро иҷро намудан "
-"низ фоиданок бошад.Ин маврид дар заминаи <tt>Reply-to:</tt>"
-", метавон адреси умумиро (на инки шахсиро), ки дар заминаи <tt>From:</tt> "
-"ишора карда истодааст, муқаррар кард.</p> "
-"<p>Агар ин ба шумо лозим набошад, инро холӣ бимонед.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адресҳои Reply-To</h3><p>Заминаи <tt>Reply-to:</tt>-ро дар унвони "
+"хат муайян мекунад. Адреси ишорашуда ҳангоми ҷавоб дар хат истифода мешавад."
+"</p><p>Ин метавон ҳангоме, ки (мисол) гурӯҳи одамон бо ҳам як амалро иҷро "
+"намудан низ фоиданок бошад.Ин маврид дар заминаи <tt>Reply-to:</tt>, метавон "
+"адреси умумиро (на инки шахсиро), ки дар заминаи <tt>From:</tt> ишора карда "
+"истодааст, муқаррар кард.</p> <p>Агар ин ба шумо лозим набошад, инро холӣ "
+"бимонед.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4337,24 +4220,19 @@ msgstr "&Адреси нусхаи пинҳонӣ (BCC):"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Адресҳои BCC (Blind Carbon Copy - нусхаипинҳонӣ)</h3>"
-"<p>Адресҳое, ки дар заминаи зерин ворид шудаанд ба ҳар як иттилооте, ки бо "
-"истифодаи профили додашуда фиристода шудааст, илова карда мешавад ва ба дигар "
-"қабулкунандаҳо зоҳир нахоҳад шуд</p>"
-"<p>Одатан ин барои фиристодани нусхаи иттилоот ба дигар қайдоти баҳисобгирӣ низ "
-"истифода мешавад.</p>"
-"<p>Агар шумо мутмаин набошед, ин заминаро холӣ бимонед.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Адресҳои BCC (Blind Carbon Copy - нусхаипинҳонӣ)</h3><p>Адресҳое, ки "
+"дар заминаи зерин ворид шудаанд ба ҳар як иттилооте, ки бо истифодаи профили "
+"додашуда фиристода шудааст, илова карда мешавад ва ба дигар қабулкунандаҳо "
+"зоҳир нахоҳад шуд</p><p>Одатан ин барои фиристодани нусхаи иттилоот ба дигар "
+"қайдоти баҳисобгирӣ низ истифода мешавад.</p><p>Агар шумо мутмаин набошед, "
+"ин заминаро холӣ бимонед.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4395,7 +4273,7 @@ msgstr "&Имзоот"
 msgid "&Picture"
 msgstr "&Имзоот"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Адреси нодурусти e-mail"
 
@@ -4413,17 +4291,18 @@ msgid ""
 msgstr ""
 "Яке аз танзимкардашудаи OpenPGP калидҳои нишонкуни надорад ягон ID "
 "истифодабарандаро бо адреси номаи электронӣ барои ин шахс (%1).\n"
-"Дар натиҷа дар огоҳ намудани ахборотҳоро дар бораи гирифтани тараф дар вақте,ки "
-"шумо кушиш карда истодаед барои қабули имзоҳое,ки бо ин танзим карда шудаанд."
+"Дар натиҷа дар огоҳ намудани ахборотҳоро дар бораи гирифтани тараф дар вақте,"
+"ки шумо кушиш карда истодаед барои қабули имзоҳое,ки бо ин танзим карда "
+"шудаанд."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Яке аз танзимкардашудаи OpenPGP калидҳои рамзгузорӣ надоранд ягон ID ягон "
-"истифодабарандаро бо адреси номаи электронии танзимкардашударо барои шахсияти "
-"(%1)."
+"истифодабарандаро бо адреси номаи электронии танзимкардашударо барои "
+"шахсияти (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4434,16 +4313,17 @@ msgid ""
 msgstr ""
 "Яке аз танзимкардашудаи S/MIME сертифекатҳои имзои надоранд адреси номаи "
 "электрони барои шахсият (%1).\n"
-"Дар натиҷа дар огоҳ намудани ахборотҳоро дар бораи гирифтани тараф дар вақте,ки "
-"шумо кушиш карда истодаед барои қабули имзоҳое,ки бо ин танзим карда шудаанд."
+"Дар натиҷа дар огоҳ намудани ахборотҳоро дар бораи гирифтани тараф дар вақте,"
+"ки шумо кушиш карда истодаед барои қабули имзоҳое,ки бо ин танзим карда "
+"шудаанд."
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
-"Яке аз сертификатҳои  навиштаҷоти S/MIME шаклӣ суроғаи эмейли шаклиро барои ин "
-"шабоҳат дар бар намегирад  (%1)."
+"Яке аз сертификатҳои  навиштаҷоти S/MIME шаклӣ суроғаи эмейли шаклиро барои "
+"ин шабоҳат дар бар намегирад  (%1)."
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4471,8 +4351,8 @@ msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"Мизоҷон нақшаҳои папкаро барои ҳамони \"%1\"вуҷуд надорад(ягон вақт); Барои ин "
-"нақшаҳои зикр нагаштаи папка метавонад истифода бурда шавад."
+"Мизоҷон нақшаҳои папкаро барои ҳамони \"%1\"вуҷуд надорад(ягон вақт); Барои "
+"ин нақшаҳои зикр нагаштаи папка метавонад истифода бурда шавад."
 
 #: identitydialog.cpp:662
 #, fuzzy
@@ -4480,13 +4360,13 @@ msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"Мизоҷон нақшаҳои папкаро барои ҳамони \"%1\"вуҷуд надорад(ягон вақт); Барои ин "
-"нақшаҳои зикр нагаштаи папка метавонад истифода бурда шавад."
+"Мизоҷон нақшаҳои папкаро барои ҳамони \"%1\"вуҷуд надорад(ягон вақт); Барои "
+"ин нақшаҳои зикр нагаштаи папка метавонад истифода бурда шавад."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (асосӣ)"
 
@@ -4501,8 +4381,8 @@ msgstr "Адреси e-mail"
 #: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
-"Шумо бояд номи истифодабарандаро ва гузарвожаро барои онки почтаро аз ин қуттӣ "
-"қабул кунед, ишора кунед."
+"Шумо бояд номи истифодабарандаро ва гузарвожаро барои онки почтаро аз ин "
+"қуттӣ қабул кунед, ишора кунед."
 
 #: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
@@ -4534,14 +4414,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4582,14 +4462,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Хатогӣ: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4740,14 +4625,14 @@ msgstr "Бойгонӣ"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4776,233 +4661,182 @@ msgstr "Калиди рамзгузориро истифода бурдан им
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Мӯҳлати амали калиди имзоии OpenPGP-и шумо</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯз ба итмом мерасад.</p>\n"
+"(KeyID 0x%2)</p><p>кам аз %n рӯз ба итмом мерасад.</p>\n"
 "<p>Мӯҳлати амали калиди имзоии OpenPGP-и шумо </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯзҳо ба итмом мерасад.</p>"
+"(KeyID 0x%2)</p><p>кам аз %n рӯзҳо ба итмом мерасад.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯз ба итмом мерасад.</p>\n"
-"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯз ба итмом мерасад.</p>"
+"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>"
+"%1</b> (KeyID 0x%2)</p><p>кам аз %n рӯз ба итмом мерасад.</p>\n"
+"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>"
+"%1</b> (KeyID 0x%2)</p><p>кам аз %n рӯз ба итмом мерасад.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Калиди OpenPGP барои </p><p ба саф баровардани=марказ><b>%1</b> "
-"(КалидID 0x%2)</p>"
-"<p>дар муддати як рӯз нест мешавад.</p>\n"
-"<p>Калиди OpenPGP барои</p><p ба саф баровардани=марказ><b>%1</b> "
-"(КалидID 0x%2)</p>"
-"<p>дар муддати рӯзҳо %n нест мешавад.</p>"
+"<p>Калиди OpenPGP барои </p><p ба саф баровардани=марказ><b>%1</b> (КалидID "
+"0x%2)</p><p>дар муддати як рӯз нест мешавад.</p>\n"
+"<p>Калиди OpenPGP барои</p><p ба саф баровардани=марказ><b>%1</b> (КалидID 0x"
+"%2)</p><p>дар муддати рӯзҳо %n нест мешавад.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>"
-"%1</b> (рақами серявӣ%2)</p>"
-"<p>дар мудатти як рӯз  нест мешавад.</p>\n"
-"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>"
-"%1</b> (рақами серявӣ %2)</p>"
-"<p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>%1</b> "
+"(рақами серявӣ%2)</p><p>дар мудатти як рӯз  нест мешавад.</p>\n"
+"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>%1</b> "
+"(рақами серявӣ %2)</p><p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>"
-"%1</b> (рақами серявӣ%2)</p>"
-"<p>дар мудатти як рӯз  нест мешавад.</p>\n"
-"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>"
-"%1</b> (рақами серявӣ %2)</p>"
-"<p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>%1</b> "
+"(рақами серявӣ%2)</p><p>дар мудатти як рӯз  нест мешавад.</p>\n"
+"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>%1</b> "
+"(рақами серявӣ %2)</p><p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>"
-"%1</b> (рақами серявӣ%2)</p>"
-"<p>дар мудатти як рӯз  нест мешавад.</p>\n"
-"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>"
-"%1</b> (рақами серявӣ %2)</p>"
-"<p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
+"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>%1</b> "
+"(рақами серявӣ%2)</p><p>дар мудатти як рӯз  нест мешавад.</p>\n"
+"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>%1</b> "
+"(рақами серявӣ %2)</p><p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</b> "
-"(рақамисерявӣ %2)</p>"
-"<p>дар муддати як рӯз нест мешавад.</p>\n"
-"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</b> "
-"(рақамисерявӣ %2)</p>"
-"<p>дар муддати рӯзҳо %n нест мешавад.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></"
+"p><p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</"
+"b> (рақамисерявӣ %2)</p><p>дар муддати як рӯз нест мешавад.</p>\n"
+"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></"
+"p><p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</"
+"b> (рақамисерявӣ %2)</p><p>дар муддати рӯзҳо %n нест мешавад.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Сертификати CA миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>барои сертификати S/MIME-и шумо </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар як рӯз тамом мешавад.</p>\n"
-"<p>Сертификати CA-и миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>барои сертификати S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат%2)</p>"
-"<p>тамом шудан дар рӯзҳои %n. </p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Сертификати CA миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>барои "
+"сертификати S/MIME-и шумо </p><p ба саф овардан=марказ><b>%1</b> (шумораи "
+"бонавбат %2)</p><p>дар як рӯз тамом мешавад.</p>\n"
+"<p>Сертификати CA-и миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>барои "
+"сертификати S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b> (шумораи "
+"бонавбат%2)</p><p>тамом шудан дар рӯзҳои %n. </p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Сертификати СА-и миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>Барои сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар як рӯз ба охир мерасад</p>\n"
-"<p>Сертификати CA -и миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>барои сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар рӯзҳои %n ба охир мерасад.</p>"
+"<p>Сертификати СА-и миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>Барои "
+"сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> (шумораи бонавбат "
+"%2)</p><p>дар як рӯз ба охир мерасад</p>\n"
+"<p>Сертификати CA -и миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>барои "
+"сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> (шумораи бонавбат "
+"%2)</p><p>дар рӯзҳои %n ба охир мерасад.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Сертификати аломатии S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b>  "
-"шумораи бонавбати %2)</p>"
-"<p> тамом шудан шудан камтар аз як рӯз.</p>\n"
+"<p>Сертификати аломатии S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</"
+"b>  шумораи бонавбати %2)</p><p> тамом шудан шудан камтар аз як рӯз.</p>\n"
 "<pСертификати аломатии S/MIME -и шумо</p><p ба саф овардан=марказ><b>%1</b> "
-"( шумораи  бонавбати %2)</p>"
-"<p> тамом шудан камтар аз рӯзҳои%2)</p>"
-"<p>"
+"( шумораи  бонавбати %2)</p><p> тамом шудан камтар аз рӯзҳои%2)</p><p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Сертификати навиштаҷоти S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат  %2)</p>"
-"<p>дар як рӯз ба охир мерасад.</p>\n"
+"<p>Сертификати навиштаҷоти S/MIME -и шумо </p><p ба саф овардан=марказ><b>"
+"%1</b> (шумораи бонавбат  %2)</p><p>дар як рӯз ба охир мерасад.</p>\n"
 "<p>Сертификати навиштаҷоти S/MIME-и шумо  </p><p ба саф овардан =марказ><b>"
-"%1</b> (шумораи бонавбат %2)</p>"
-"<p>дар рӯзҳои %n тамом мешавад.</p>"
+"%1</b> (шумораи бонавбат %2)</p><p>дар рӯзҳои %n тамом мешавад.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Сертификати  S/MIME </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар як рӯз ба охир мерасад.</p>\n"
-"<p>Сертификати S/MIME барои </p><p ба саф овардан=марказ ><b>%1</b> "
-"(шумораи бонавбат) %2)</p>"
-"<p>дар рӯзҳои %n ба охир мерасад.</p>"
+"<p>Сертификати  S/MIME </p><p ба саф овардан=марказ><b>%1</b> (шумораи "
+"бонавбат %2)</p><p>дар як рӯз ба охир мерасад.</p>\n"
+"<p>Сертификати S/MIME барои </p><p ба саф овардан=марказ ><b>%1</b> (шумораи "
+"бонавбат) %2)</p><p>дар рӯзҳои %n ба охир мерасад.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5016,223 +4850,172 @@ msgstr "Мӯҳлати амали сертификати S/MIME гузашта �
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Мӯҳлати амали калиди имзоии OpenPGP-и шумо</p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯз ба итмом мерасад.</p>\n"
+"(KeyID 0x%2)</p><p>кам аз %n рӯз ба итмом мерасад.</p>\n"
 "<p>Мӯҳлати амали калиди имзоии OpenPGP-и шумо </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯзҳо ба итмом мерасад.</p>"
+"(KeyID 0x%2)</p><p>кам аз %n рӯзҳо ба итмом мерасад.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯз ба итмом мерасад.</p>\n"
-"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>кам аз %n рӯз ба итмом мерасад.</p>"
+"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>"
+"%1</b> (KeyID 0x%2)</p><p>кам аз %n рӯз ба итмом мерасад.</p>\n"
+"<p>Мӯҳлати амали калиди рамзгузории OpenPGP-и шумо </p><p align=center><b>"
+"%1</b> (KeyID 0x%2)</p><p>кам аз %n рӯз ба итмом мерасад.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Калиди OpenPGP барои </p><p ба саф баровардани=марказ><b>%1</b> "
-"(КалидID 0x%2)</p>"
-"<p>дар муддати як рӯз нест мешавад.</p>\n"
-"<p>Калиди OpenPGP барои</p><p ба саф баровардани=марказ><b>%1</b> "
-"(КалидID 0x%2)</p>"
-"<p>дар муддати рӯзҳо %n нест мешавад.</p>"
+"<p>Калиди OpenPGP барои </p><p ба саф баровардани=марказ><b>%1</b> (КалидID "
+"0x%2)</p><p>дар муддати як рӯз нест мешавад.</p>\n"
+"<p>Калиди OpenPGP барои</p><p ба саф баровардани=марказ><b>%1</b> (КалидID 0x"
+"%2)</p><p>дар муддати рӯзҳо %n нест мешавад.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>"
-"%1</b> (рақами серявӣ%2)</p>"
-"<p>дар мудатти як рӯз  нест мешавад.</p>\n"
-"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>"
-"%1</b> (рақами серявӣ %2)</p>"
-"<p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>%1</b> "
+"(рақами серявӣ%2)</p><p>дар мудатти як рӯз  нест мешавад.</p>\n"
+"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>%1</b> "
+"(рақами серявӣ %2)</p><p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>"
-"%1</b> (рақами серявӣ%2)</p>"
-"<p>дар мудатти як рӯз  нест мешавад.</p>\n"
-"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>"
-"%1</b> (рақами серявӣ %2)</p>"
-"<p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>%1</b> "
+"(рақами серявӣ%2)</p><p>дар мудатти як рӯз  нест мешавад.</p>\n"
+"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>%1</b> "
+"(рақами серявӣ %2)</p><p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>"
-"%1</b> (рақами серявӣ%2)</p>"
-"<p>дар мудатти як рӯз  нест мешавад.</p>\n"
-"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>"
-"%1</b> (рақами серявӣ %2)</p>"
-"<p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Решаи сертификат/p><p ба саф баровардан=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардан=марказ><b>%1</b> "
+"(рақами серявӣ%2)</p><p>дар мудатти як рӯз  нест мешавад.</p>\n"
+"<p>Решаи сертификат</p><p ба саф баровардани=марказ><b>%3</b></p><p>барои S/"
+"MIME сертификати рамзгузориатон</p><p ба саф баровардани=марказ><b>%1</b> "
+"(рақами серявӣ %2)</p><p>дар мудатти %n рӯзҳо ба нест мешавад.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</b> "
-"(рақамисерявӣ %2)</p>"
-"<p>дар муддати як рӯз нест мешавад.</p>\n"
-"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></p>"
-"<p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</b> "
-"(рақамисерявӣ %2)</p>"
-"<p>дар муддати рӯзҳо %n нест мешавад.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></"
+"p><p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</"
+"b> (рақамисерявӣ %2)</p><p>дар муддати як рӯз нест мешавад.</p>\n"
+"<p>Фосилаи CA сертификат</p><p ба саф баромадани=марказ><b>%3</b></"
+"p><p>барои S/MIME сертификати имзоятон</p><p ба саф баромадани=марказ><b>%1</"
+"b> (рақамисерявӣ %2)</p><p>дар муддати рӯзҳо %n нест мешавад.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Сертификати CA миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>барои сертификати S/MIME-и шумо </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар як рӯз тамом мешавад.</p>\n"
-"<p>Сертификати CA-и миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>барои сертификати S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат%2)</p>"
-"<p>тамом шудан дар рӯзҳои %n. </p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Сертификати CA миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>барои "
+"сертификати S/MIME-и шумо </p><p ба саф овардан=марказ><b>%1</b> (шумораи "
+"бонавбат %2)</p><p>дар як рӯз тамом мешавад.</p>\n"
+"<p>Сертификати CA-и миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>барои "
+"сертификати S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b> (шумораи "
+"бонавбат%2)</p><p>тамом шудан дар рӯзҳои %n. </p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Сертификати СА-и миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>Барои сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар як рӯз ба охир мерасад</p>\n"
-"<p>Сертификати CA -и миёна</p><p ба саф овардан=марказ><b>%3</b></p>"
-"<p>барои сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар рӯзҳои %n ба охир мерасад.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Сертификати СА-и миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>Барои "
+"сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> (шумораи бонавбат "
+"%2)</p><p>дар як рӯз ба охир мерасад</p>\n"
+"<p>Сертификати CA -и миёна</p><p ба саф овардан=марказ><b>%3</b></p><p>барои "
+"сертификати S/MIME </p><p ба саф овардан=марказ><b>%1</b> (шумораи бонавбат "
+"%2)</p><p>дар рӯзҳои %n ба охир мерасад.</p>"
 
 #: keyresolver.cpp:815
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>Сертификати аломатии S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b>  "
-"шумораи бонавбати %2)</p>"
-"<p> тамом шудан шудан камтар аз як рӯз.</p>\n"
+"<p>Сертификати аломатии S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</"
+"b>  шумораи бонавбати %2)</p><p> тамом шудан шудан камтар аз як рӯз.</p>\n"
 "<pСертификати аломатии S/MIME -и шумо</p><p ба саф овардан=марказ><b>%1</b> "
-"( шумораи  бонавбати %2)</p>"
-"<p> тамом шудан камтар аз рӯзҳои%2)</p>"
-"<p>"
+"( шумораи  бонавбати %2)</p><p> тамом шудан камтар аз рӯзҳои%2)</p><p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Сертификати навиштаҷоти S/MIME -и шумо </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат  %2)</p>"
-"<p>дар як рӯз ба охир мерасад.</p>\n"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Сертификати навиштаҷоти S/MIME -и шумо </p><p ба саф овардан=марказ><b>"
+"%1</b> (шумораи бонавбат  %2)</p><p>дар як рӯз ба охир мерасад.</p>\n"
 "<p>Сертификати навиштаҷоти S/MIME-и шумо  </p><p ба саф овардан =марказ><b>"
-"%1</b> (шумораи бонавбат %2)</p>"
-"<p>дар рӯзҳои %n тамом мешавад.</p>"
+"%1</b> (шумораи бонавбат %2)</p><p>дар рӯзҳои %n тамом мешавад.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Сертификати  S/MIME </p><p ба саф овардан=марказ><b>%1</b> "
-"(шумораи бонавбат %2)</p>"
-"<p>дар як рӯз ба охир мерасад.</p>\n"
-"<p>Сертификати S/MIME барои </p><p ба саф овардан=марказ ><b>%1</b> "
-"(шумораи бонавбат) %2)</p>"
-"<p>дар рӯзҳои %n ба охир мерасад.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Сертификати  S/MIME </p><p ба саф овардан=марказ><b>%1</b> (шумораи "
+"бонавбат %2)</p><p>дар як рӯз ба охир мерасад.</p>\n"
+"<p>Сертификати S/MIME барои </p><p ба саф овардан=марказ ><b>%1</b> (шумораи "
+"бонавбат) %2)</p><p>дар рӯзҳои %n ба охир мерасад.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5244,18 +5027,19 @@ msgstr "Мӯҳлати амали сертификати S/MIME гузашта �
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Як ё бисёртар калидҳои навиштаҷоти OpenPGP-и ташаккулёфта ё ин ки сертификатҳои "
-"S/MIME барои навиштаҷот лоиқ нестанд.Марҳамат карда калиддҳои навиштаҷотро ва "
-"сертификатро барои шабоҳат дар муколамаи шабоҳатии пайкарбандӣ аз сари нав "
-"пайкарбандӣ кунед.\n"
-"Агар шумо хоҳиши давом додан дошта  бошед ва калидҳо баъдтар лозиманд ба шумо "
-"мусоидат мекунанд,ки калидҳоро барои истифода бурдан тасниф диҳед."
+"Як ё бисёртар калидҳои навиштаҷоти OpenPGP-и ташаккулёфта ё ин ки "
+"сертификатҳои S/MIME барои навиштаҷот лоиқ нестанд.Марҳамат карда калиддҳои "
+"навиштаҷотро ва сертификатро барои шабоҳат дар муколамаи шабоҳатии "
+"пайкарбандӣ аз сари нав пайкарбандӣ кунед.\n"
+"Агар шумо хоҳиши давом додан дошта  бошед ва калидҳо баъдтар лозиманд ба "
+"шумо мусоидат мекунанд,ки калидҳоро барои истифода бурдан тасниф диҳед."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5269,12 +5053,12 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"Як ё зиёдтар калидҳои ишоратии OpenPGP ташаккулёфтаи шумо ё ин ки сертификатҳои "
-"ишоратии S/MIME барои ишорат лоиқ нестанд.Марҳамат карда калидҳои ишоратӣ ва "
-"сертификатҳоро барои ин шабоҳат дар муколамаи шабоҳатӣ аз сари нав пайкар "
-"бандед..\n"
-"Агар шумо давом доданро интихоб кунед, калидҳо баъдтар лозим мешаванд, ба шумо "
-"барои таснифоти калидҳо барои истифода бурдан мусоидат хоҳанд кард."
+"Як ё зиёдтар калидҳои ишоратии OpenPGP ташаккулёфтаи шумо ё ин ки "
+"сертификатҳои ишоратии S/MIME барои ишорат лоиқ нестанд.Марҳамат карда "
+"калидҳои ишоратӣ ва сертификатҳоро барои ин шабоҳат дар муколамаи шабоҳатӣ "
+"аз сари нав пайкар бандед..\n"
+"Агар шумо давом доданро интихоб кунед, калидҳо баъдтар лозим мешаванд, ба "
+"шумо барои таснифоти калидҳо барои истифода бурдан мусоидат хоҳанд кард."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5284,13 +5068,13 @@ msgstr "Калиди имзоиро истифода бурдан имконпа
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Озмоиши параметрҳои рамзгузорӣ барои қабулкунандаҳо нишон дод, ки иттилоот бояд "
-"бо ёрии OpenPGP рамзгузорӣ карда шавад, аммо дар профили ҷорӣ, калидҳои "
+"Озмоиши параметрҳои рамзгузорӣ барои қабулкунандаҳо нишон дод, ки иттилоот "
+"бояд бо ёрии OpenPGP рамзгузорӣ карда шавад, аммо дар профили ҷорӣ, калидҳои "
 "рамзгузории OpenPGP-и озмоида танзимшудае нест.\n"
 "Шумо метавонед ғайри рамзгузорӣ, худ низ идома диҳед, аммо баъд наметавонед "
 "иттилооти худро бихонед."
@@ -5299,21 +5083,21 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"Озмоиши параметрҳои рамзгузорӣ барои қабулкунандаҳо нишон дод, ки иттилоот бояд "
-"бо ёрии S/MIME рамзгузорӣ карда шавад, аммо дар профили ҷорӣ, калидҳои "
+"Озмоиши параметрҳои рамзгузорӣ барои қабулкунандаҳо нишон дод, ки иттилоот "
+"бояд бо ёрии S/MIME рамзгузорӣ карда шавад, аммо дар профили ҷорӣ, калидҳои "
 "рамзгузории S/MIME-и озмоида танзимшудае нест. \n"
 "Шумо метавонед ғайри рамзгузорӣ, худ низ идома диҳед, аммо баъд наметавонед "
 "иттилооти худро бихонед."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5328,8 +5112,8 @@ msgstr "Имзо накардани OpenPGP"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -5360,11 +5144,11 @@ msgstr "Барои имзо"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
-"Шумо калиди рамзгузориро барои худ интихоб накардаед.Агар иттилоотро рамзгузорӣ "
-"кунед, онро хонда наметавонед."
+"Шумо калиди рамзгузориро барои худ интихоб накардаед.Агар иттилоотро "
+"рамзгузорӣ кунед, онро хонда наметавонед."
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -5385,8 +5169,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Шумо калиди рамзгузориро барои қабулкунандаҳоинтихоб накардаед. Иттилоот "
 "рамзгузорӣ нахоҳад шуд."
@@ -5408,8 +5192,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Шумо калидҳои рамзгузориро барои якчанд қабулкунандаҳо интихоб накардаед. Агар "
-"шумо иттилоотро рамзгузорӣ кунед, онҳо иттилоотро натавонанд хонд."
+"Шумо калидҳои рамзгузориро барои якчанд қабулкунандаҳо интихоб накардаед. "
+"Агар шумо иттилоотро рамзгузорӣ кунед, онҳо иттилоотро натавонанд хонд."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -5433,11 +5217,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Калиди рамзгузории иҷозавӣ ва озмоидашуда барои \"%1\" ёфт нашуд.\n"
 "\n"
@@ -5490,10 +5274,8 @@ msgstr ""
 "набудам: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Хатогӣ ҳангоми афзудани иттилоот:\n"
+msgid "Failed to add message:\n"
+msgstr "Хатогӣ ҳангоми афзудани иттилоот:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -5539,8 +5321,8 @@ msgstr "Гузаронидани иттилооти %3 аз %2 аз %1."
 #: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Наметавонам почтаро аз қуттии хатии <b>%1<b>-и зерин ҳузф кунам:"
-"<br>%2</qt>"
+"<qt>Наметавонам почтаро аз қуттии хатии <b>%1<b>-и зерин ҳузф кунам:<br>%2</"
+"qt>"
 
 #: kmacctlocal.cpp:255
 #, fuzzy
@@ -5588,6 +5370,52 @@ msgstr "&IMAP-и ғайриваслшуда"
 msgid "&Maildir mailbox"
 msgstr "&Қуттии формати Maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Мавзӯи маълумотро ишора кунед"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Фиристодани CC: ба 'address'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Фиристодани BCC: ба 'address'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Афзудани 'header' ба иттилооти"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Тани иттилоотро аз 'file' хондан"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Танзими тани иттилоот"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Афзудани як ё якчанд замимот ба иттилоот"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Танҳо озмоиши ҳозир будани иттилооти нав"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Танҳо тирезаи муҳаррирро кушодан"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "аз назар гузаронидани файл бо маълумотҳо"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Фиристодани маълумот ба 'address' ва замима кардани файле, ки'URL' истинод "
+"мекунад"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Почта"
@@ -5646,9 +5474,9 @@ msgstr ""
 #: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "Дарҳол папкаҳои дархостӣ барои мапбаъи IMAP ҳамчун зерпапкаи %1 эҷод карда "
 "мешавад. Агар инро иҷро кардани набошед, ба рӯи \"Не\" пахш кунед"
@@ -5701,11 +5529,11 @@ msgstr "URL дар буфери тағйирот копӣ карда шудаа�
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Файли <b>%1</b> мавҷуд аст. Оё мехоҳед онро тағйир диҳед?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Ба файл захира кардан"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Ивваз кардан"
 
@@ -5723,7 +5551,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5744,101 +5572,101 @@ msgstr "Файл дорои иттилоот намебошад."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Ин файл дорои якчанд иттилоот мебошад. Танҳо якеаш намоиш шудааст."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"Ин фиристониш ба формати MIME дайджест аст.Оканоти иттилоот дар замимот ҷойгир "
-"аст.\n"
+"Ин фиристониш ба формати MIME дайджест аст.Оканоти иттилоот дар замимот "
+"ҷойгир аст.\n"
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Ҳузфи иттилоот"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Гузаронидани иттилооти %3 аз %2 аз %1."
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Ҷой дар диск нокифоя аст?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Ба ин папка ҷойгир кардан"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Ба ин папка копӣ кардан"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Гузаронидани иттилоот"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Ҳузфи иттилоот"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Боз кардани URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Оё дар ҳақиқат мехоҳед <b>%1</b>-ро иҷро кунед?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "Иҷрои дастур"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Замимот барои захира ёфт нашуд."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Захира кардани замимот ба"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "Часпонидан.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "Часпонидан.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Файл бо номи %1 аллакай мавҷуд аст. Оё мехоҳед онро тағйир диҳед?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Файл аллакай мавҷуд аст"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 #, fuzzy
 msgid "&Overwrite"
 msgstr "Тағйир додан"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
@@ -5846,33 +5674,33 @@ msgstr ""
 "Қисми иттилооти %1 рамзгузорӣ шудааст. Иттилоотро ба тарзи рамзгузоришуда "
 "захира кунам?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Саволи KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Рамзгузорӣ"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "&Рамзгузорӣ накардан"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 "Қисми иттилооти %1 имзо шудааст. Иттилоотро ба тарзи имзошуда захира кунам?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Имзоот"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5881,19 +5709,19 @@ msgstr ""
 "Натавонистам файли %1-ро захира кунам:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Наметавонам ба файли %1 қайд кунам."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr "Барои ин адрес қайдоте дар китоби адресӣ мавҷуд нест."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5903,67 +5731,67 @@ msgstr ""
 " %1\n"
 "Бо кӣ гуфтугӯӣ бурданро муайян намудан имконпазир нест."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Интихоби калиди рамзгузорӣ"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Почта"
@@ -6064,7 +5892,7 @@ msgstr "Андоза"
 msgid "Encoding"
 msgstr "Рамзгузорӣ"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "Муҳаррир"
@@ -6077,7 +5905,7 @@ msgstr "Рамзгузорӣ"
 msgid "Sign"
 msgstr "Имзо"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "ғайри замимот"
@@ -6100,7 +5928,8 @@ msgstr "Қабулкунандаҳои асосӣ"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>Адресҳои e-mail аз ин замина нусхаи иттилоотро қабул мекунанд.</qt>"
 
@@ -6111,14 +5940,14 @@ msgstr "Қабулкунандаҳои иловагӣ"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>Адресҳои e-mail аз ин замина нусхаи иттилоотро қабул мекунанд. из этого "
-"поля получат копию сообщения. Техникӣ, ин ба ишора намудани тамоми адресҳо дар "
-"заминаи <b>Қабулкунанда</b> монанд аст, аммо рамзияти онро мефаҳмонад, ки "
-"адресҳои дар заминаи <b>Нусха</b> ишорашуда, шунавандаи мубоҳисот низ "
+"поля получат копию сообщения. Техникӣ, ин ба ишора намудани тамоми адресҳо "
+"дар заминаи <b>Қабулкунанда</b> монанд аст, аммо рамзияти онро мефаҳмонад, "
+"ки адресҳои дар заминаи <b>Нусха</b> ишорашуда, шунавандаи мубоҳисот низ "
 "мебошад.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6127,12 +5956,11 @@ msgstr "Қабулкунандаҳои пинҳонӣ"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Чунини заминаи <b>Нусха</b>, аммо танҳо қабулкунандаҳои дигар намебинанд, "
-"ки кӣ нусхаи нобиноро қабул мекунад.</qt>"
+"<qt>Чунини заминаи <b>Нусха</b>, аммо танҳо қабулкунандаҳои дигар "
+"намебинанд, ки кӣ нусхаи нобиноро қабул мекунад.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 #, fuzzy
@@ -6144,7 +5972,7 @@ msgstr "&Sendmail"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Баъдтар &фиристодан"
@@ -6216,8 +6044,7 @@ msgstr "&Ҳузфи ишоротҳои иқтибосот"
 msgid "Cl&ean Spaces"
 msgstr "&Пок кардани фосилот"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Истифода аз &ҳуруфи қалбакӣ"
@@ -6362,31 +6189,31 @@ msgstr "&Формати рамзгузорӣ/имзо"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандартӣ"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Рӯйхати маркершуда (диск)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Рӯйхати маркершуда (давра)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Рӯйхати маркершуда (чаҳоркунҷа)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Рӯйхати тартибдодашуда (1)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Рӯйхати тартибдодашуда (а)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Рӯйхати тартибдодашуда (А)"
 
@@ -6490,61 +6317,61 @@ msgstr "Пӯшидани тирезаи муҳаррир"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Аз афташ, ки иттилооти қайдшудаи шумо дорои хотиррасонӣ оиди замимот аст, аммо "
-"он дар хати шумо вуҷуд надорад.\n"
+"Аз афташ, ки иттилооти қайдшудаи шумо дорои хотиррасонӣ оиди замимот аст, "
+"аммо он дар хати шумо вуҷуд надорад.\n"
 "Оё мехоҳед ягон файлро ба хат замима кунед?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Хотиррасонӣ оиди замимот"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Фиристодан &чуноне, ки ҳаст"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натавонистам роҳ ба замимоти (%1) муайян кунам.</p> "
-"<p>Роҳи пурраи онро ишора кунед.</p></qt>"
+"<qt><p>Натавонистам роҳ ба замимоти (%1) муайян кунам.</p> <p>Роҳи пурраи "
+"онро ишора кунед.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Замима кардани файл"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Замимот"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Гузоштани файл"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Гузоштани файл"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Хатогӣ ҳангоми сайъи содир кардани калид аз лағжандаи зерин рӯй дод:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Хатогӣ ҳангоми сайъи содир кардани калид аз лағжандаи зерин рӯй дод:</"
+"p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6584,21 +6411,36 @@ msgid ""
 "View"
 msgstr "Намуд"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Тағйир кардан..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Тағйир кардан..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Нигоҳ доштан &ҳамчун..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Хусусиятҳо"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Афзудани замимот..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Наметавонам ба файли %1 қайд кунам."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -6606,284 +6448,279 @@ msgid ""
 msgstr ""
 "Қисми иттилооти %1 имзо шудааст. Иттилоотро ба тарзи имзошуда захира кунам?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Keep"
 msgstr "&Садо"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Наметавонам ба файли %1 қайд кунам."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Захира намудани замимот ҳамчун"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Афзудани замимот..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "бо замимот"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "беном"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Шумо талаб кардед, ки мактубчаҳо ба худатон навишта шаванд лекин шабоҳати "
-"интихобшудаи ҷорӣ калиди навиштаҷоти (OpenPGP or S/MIME) -ро барои истифода "
-"бурдан барои ин муайян намекунад.</p></p>Марҳамат карда калидҳоро барои "
-"истифода бурдан дар пайкарбандии шабоҳат интихоб кунед.</p></qt>"
+"<qt><p>Шумо талаб кардед, ки мактубчаҳо ба худатон навишта шаванд лекин "
+"шабоҳати интихобшудаи ҷорӣ калиди навиштаҷоти (OpenPGP or S/MIME) -ро барои "
+"истифода бурдан барои ин муайян намекунад.</p></p>Марҳамат карда калидҳоро "
+"барои истифода бурдан дар пайкарбандии шабоҳат интихоб кунед.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Калиди рамзгузорӣ ишора нашудааст"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Калиди имзоии OpenPGP ё S/MIME-и худро барои дохил кардани имконоти имзо "
-"кардани иттилоотҳои худ, ишора кунед.</p>"
-"<p>Шумо метавонед калиди истифодашавандаро дар танзимоти ихтисос ишора "
-"кунед.</p></qt>"
+"<qt> <p>Калиди имзоии OpenPGP ё S/MIME-и худро барои дохил кардани имконоти "
+"имзо кардани иттилоотҳои худ, ишора кунед.</p><p>Шумо метавонед калиди "
+"истифодашавандаро дар танзимоти ихтисос ишора кунед.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Калиди имзоӣ ишора нашудааст"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Шумо бояд суроғаи эмейлатонро дар ҳавзаи From ворид кунед. Шумо бояд суроғаи "
 "эмейлатонро барои ҳамаи шабоҳатҳо муайян кунед, ҳамин тариқ ба шумо лозим "
 "намеояд, ки вайро барои ҳар як мактубча ворид кунед."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Бояд ақалан як муштариро ишора намудан лозим аст."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr ""
-"Шумо мавзӯъотро ишора накардаед. Оё мехоҳед иттилооро ғайри мавзӯъ бифиристед?"
+"Шумо мавзӯъотро ишора накардаед. Оё мехоҳед иттилооро ғайри мавзӯъ "
+"бифиристед?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Мавзӯъ ишора нашудааст"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
-"Шумо мавзӯъотро ишора накардаед. Оё мехоҳед иттилооро ғайри мавзӯъ бифиристед?"
+"Шумо мавзӯъотро ишора накардаед. Оё мехоҳед иттилооро ғайри мавзӯъ "
+"бифиристед?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Мавзӯъ ишора нашудааст"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Фиристо&дан чӣ тавре, ки ҳаст"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Ишора намудани мавзӯъ"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Нигоҳ доштани нишона, имзо/рамзгузорӣ накардан"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Нигоҳ доштани нишона, рамзгузорӣ накардан"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Нигоҳ доштани нишона, имзо накардан"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Имзо/рамзгузорӣ кардан (ҳузф кардани нишона)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Рамзгузорӣ кардан (ҳузф кардани нишона)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Имзо кардан (ҳузфи нишона)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Рамзгузории/имзои иттилооти HTML имконпазир нест.</p>"
-"<p>Нишонаро ҳузф кунам?</p></qt>"
+"<qt><p>Рамзгузории/имзои иттилооти HTML имконпазир нест.</p><p>Нишонаро ҳузф "
+"кунам?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Иттилоотро рамзгузорӣ/имзо кунам?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"Мизоҷон нақшаҳои папкаро барои ҳамони \"%1\"вуҷуд надорад(ягон вақт); Барои ин "
-"нақшаҳои зикр нагаштаи папка метавонад истифода бурда шавад."
+"Мизоҷон нақшаҳои папкаро барои ҳамони \"%1\"вуҷуд надорад(ягон вақт); Барои "
+"ин нақшаҳои зикр нагаштаи папка метавонад истифода бурда шавад."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 "Ҳисоботро барои фиристодани почта эҷод кунед ва боз як бори дигар сайъ кунед."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Иттилоот ба фиристодан тайёр аст..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 #, fuzzy
 msgid "Send Confirmation"
 msgstr "Тасдиқоти фиристониш"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Дарҳол &фиристодан"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<recipients>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Қабулкунандаҳои иловагӣ"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Барномаи тафтиши имло"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Барномаи тафтиши имло"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "Тафтиши имло барҳам дода шуд."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "Тафтиши имло боздошта шуд."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "Тафтиши имло хотима ёфт."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Барномаи тафтиши имло"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Имзо ёфт нашуд"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Интихоби калиди рамзгузорӣ"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Иттилоот бо %1 имзо шудааст."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Иттилоот бо %1 имзо шудааст."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Иттилооти OpenPGP - рамзгузошташуда"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Иттилоот бо мавзӯъи: "
@@ -6933,11 +6770,11 @@ msgstr "Тафтиши имлои - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Хатои оғози ISpell/Aspell. Тасҳеҳоти танзимоти ISpell/Aspell-ро ва вуҷудияти он "
-"дар PATH буданашро низ биозмоед."
+"Хатои оғози ISpell/Aspell. Тасҳеҳоти танзимоти ISpell/Aspell-ро ва вуҷудияти "
+"он дар PATH буданашро низ биозмоед."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6970,12 +6807,10 @@ msgstr "<qt>Дар дастури филтратсияи <b>%1</b>, амали �
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Амали номаълуми <b>%1</b>,"
-"<br>дар дастури филтратсияи <b>%2</b>. "
+"<qt>Амали номаълуми <b>%1</b>,<br>дар дастури филтратсияи <b>%2</b>. "
 "<br>Амал ба эътибор гирифта намешавад.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7197,170 +7032,140 @@ msgstr "Навозиши садо"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ин рӯйхат дорои филтр мебошад, ки бо корванд муайян шудааст. Онҳо аз боло ба "
-"поён коркарда мешаванд.</p>"
-"<p>Бо истифодаи тугмаи дар диалоги аз тарафи ростбуда, ба рӯи ягон филтр барои "
-"таҳрир кардан клик кунед.</p></qt>"
+"<qt><p>Ин рӯйхат дорои филтр мебошад, ки бо корванд муайян шудааст. Онҳо аз "
+"боло ба поён коркарда мешаванд.</p><p>Бо истифодаи тугмаи дар диалоги аз "
+"тарафи ростбуда, ба рӯи ягон филтр барои таҳрир кардан клик кунед.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Эҷоди филтри нав.</p>"
-"<p>Он пеш аз филтри каме пештар интихобшуда гузошта мешавад, аммо шумо доим "
-"метавонед макони онро дар рӯйхат тағйир диҳед.</p>"
-"<p>Агар шумо тассодуфан ин тугмаро пахш карда бошед, метавонед ҷоди филтрро бо "
-"пахши тугмаи <em>Ҳузф кардан</em> барҳам диҳед.</p></qt>"
+"<qt><p>Эҷоди филтри нав.</p><p>Он пеш аз филтри каме пештар интихобшуда "
+"гузошта мешавад, аммо шумо доим метавонед макони онро дар рӯйхат тағйир "
+"диҳед.</p><p>Агар шумо тассодуфан ин тугмаро пахш карда бошед, метавонед "
+"ҷоди филтрро бо пахши тугмаи <em>Ҳузф кардан</em> барҳам диҳед.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Копӣ кардани филтр.</p>"
-"<p>Агар шумо тассодуфан ин тугмаро пахш карда бошед, бо пахши тугмаи <em>"
-"Ҳузф кардан</em> метавонед эҷоди филтрро барҳам диҳед.</p></qt>"
+"<qt><p>Копӣ кардани филтр.</p><p>Агар шумо тассодуфан ин тугмаро пахш карда "
+"бошед, бо пахши тугмаи <em>Ҳузф кардан</em> метавонед эҷоди филтрро барҳам "
+"диҳед.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Бо пахши ин тугма, филтри интихобшудааз рӯйхат <em>ҳузф</em> мешавад.</p>"
-"<p>Баъди ин филтри ҳузфшударо аз нав барқарор намудан имконпазир нест, аммо "
-"шумо доим метавонед аз диалоги танзимоти филтр (тағйир надода) бо пахши тугмаи "
-"<em>Барҳам додан</em> низ бароед.</p></qt>"
+"<qt><p>Бо пахши ин тугма, филтри интихобшудааз рӯйхат <em>ҳузф</em> мешавад."
+"</p><p>Баъди ин филтри ҳузфшударо аз нав барқарор намудан имконпазир нест, "
+"аммо шумо доим метавонед аз диалоги танзимоти филтр (тағйир надода) бо пахши "
+"тугмаи <em>Барҳам додан</em> низ бароед.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Гузаронидани филтри интихобшуда<em>ба поён</em> аз рӯи рӯйхати филтрҳо.</p>"
-"<p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро барои иттилооти "
-"зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, якӯм истифода карда "
-"мешавад.</p>"
-"<p>Агар шумо тассодуфан ин тугмаро зер карда бошед, метавонед гузаронишро бо "
-"пахши тугмаи <em>Ба боло</em> онро барҳам диҳед.</p></qt>"
+"<qt><p>Гузаронидани филтри интихобшуда<em>ба поён</em> аз рӯи рӯйхати "
+"филтрҳо.</p><p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро "
+"барои иттилооти зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, "
+"якӯм истифода карда мешавад.</p><p>Агар шумо тассодуфан ин тугмаро зер карда "
+"бошед, метавонед гузаронишро бо пахши тугмаи <em>Ба боло</em> онро барҳам "
+"диҳед.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Гузаронидани филтри интихобшуда<em>ба боло</em> аз рӯи рӯйхати филтрҳо.</p>"
-"<p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро барои иттилооти "
-"зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, якӯм истифода карда "
-"мешавад.</p>"
-"<p>Агар шумо тассодуфан ин тугмаро зер карда бошед, метавонед гузаронишро бо "
-"пахши тугмаи <em>Ба поён</em> онро барҳам диҳед.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Гузаронидани филтри интихобшуда<em>ба боло</em> аз рӯи рӯйхати "
+"филтрҳо.</p><p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро "
+"барои иттилооти зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, "
+"якӯм истифода карда мешавад.</p><p>Агар шумо тассодуфан ин тугмаро зер карда "
+"бошед, метавонед гузаронишро бо пахши тугмаи <em>Ба поён</em> онро барҳам "
+"диҳед.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Гузаронидани филтри интихобшуда<em>ба поён</em> аз рӯи рӯйхати филтрҳо.</p>"
-"<p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро барои иттилооти "
-"зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, якӯм истифода карда "
-"мешавад.</p>"
-"<p>Агар шумо тассодуфан ин тугмаро зер карда бошед, метавонед гузаронишро бо "
-"пахши тугмаи <em>Ба боло</em> онро барҳам диҳед.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Гузаронидани филтри интихобшуда<em>ба поён</em> аз рӯи рӯйхати "
+"филтрҳо.</p><p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро "
+"барои иттилооти зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, "
+"якӯм истифода карда мешавад.</p><p>Агар шумо тассодуфан ин тугмаро зер карда "
+"бошед, метавонед гузаронишро бо пахши тугмаи <em>Ба боло</em> онро барҳам "
+"диҳед.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Гузаронидани филтри интихобшуда<em>ба поён</em> аз рӯи рӯйхати филтрҳо.</p>"
-"<p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро барои иттилооти "
-"зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, якӯм истифода карда "
-"мешавад.</p>"
-"<p>Агар шумо тассодуфан ин тугмаро зер карда бошед, метавонед гузаронишро бо "
-"пахши тугмаи <em>Ба боло</em> онро барҳам диҳед.</p></qt>"
+"<qt><p>Гузаронидани филтри интихобшуда<em>ба поён</em> аз рӯи рӯйхати "
+"филтрҳо.</p><p>Тартиби филтрҳо хеле муҳим аст, чанде тартиботи иҷроии онро "
+"барои иттилооти зерин муайян мекунад: филтри дар рӯйхат аз ҳама болобуда, "
+"якӯм истифода карда мешавад.</p><p>Агар шумо тассодуфан ин тугмаро зер карда "
+"бошед, метавонед гузаронишро бо пахши тугмаи <em>Ба боло</em> онро барҳам "
+"диҳед.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Гузаронидани филтри интихобшуда.</p>"
-"<p>Агар филтрҳо аз \"<<\" оғоз шаванд, онҳо ба тарзи худкор номгузорӣ "
-"мешаванд.</p>"
-"<p>Агар шумо тассодуфан номи филтрро ба тариқи дастӣ тағйир дода бошед ва хоҳед "
-"соҳибшавии худкори номро бар гардонед ба рӯи тугмаи зерин пахш кунед ва <em>"
-"Пок кардан</em>-ро ва баъд <em>OK</em>-ро дар диалоги зоҳиршуда интихоб "
-"кунед.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Гузаронидани филтри интихобшуда.</p><p>Агар филтрҳо аз \"<<\" оғоз "
+"шаванд, онҳо ба тарзи худкор номгузорӣ мешаванд.</p><p>Агар шумо тассодуфан "
+"номи филтрро ба тариқи дастӣ тағйир дода бошед ва хоҳед соҳибшавии худкори "
+"номро бар гардонед ба рӯи тугмаи зерин пахш кунед ва <em>Пок кардан</em>-ро "
+"ва баъд <em>OK</em>-ро дар диалоги зоҳиршуда интихоб кунед.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Озмоиши диалоги тасдиқот.</p>"
-"<p>Ин хеле фоиданок аст, агар шумо маҷмӯъи дастурҳоро барои пурборкунии "
-"иттилооти монондашуда интихоб карда бошед. Агар ин диалог намоиш нашавад, дар "
-"ин сурат ин иттилоотҳо дар ин сервер мемонданд, агар иттилоотҳои нави калон "
-"намерасид ёки шумо мехостед, ки маҷмӯъи дастури навро, ки вагарна иттилоотро "
-"нишон медод, ишора кунед.</p></qt>"
+"<qt><p>Озмоиши диалоги тасдиқот.</p><p>Ин хеле фоиданок аст, агар шумо "
+"маҷмӯъи дастурҳоро барои пурборкунии иттилооти монондашуда интихоб карда "
+"бошед. Агар ин диалог намоиш нашавад, дар ин сурат ин иттилоотҳо дар ин "
+"сервер мемонданд, агар иттилоотҳои нави калон намерасид ёки шумо мехостед, "
+"ки маҷмӯъи дастури навро, ки вагарна иттилоотро нишон медод, ишора кунед.</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7370,6 +7175,16 @@ msgstr "Дастури филтратсия кардан дар сервери P
 msgid "Filter Rules"
 msgstr "Дастури филтратсия"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Воридот"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Воридот"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Филтрҳои дастрас"
@@ -7459,6 +7274,11 @@ msgstr "Афзудани ин филтр ба менюи 'Истифодаи ф�
 msgid "Icon for this filter:"
 msgstr "Ишора барои филтр:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "&Қабулкунанда"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Ба боло"
@@ -7467,16 +7287,29 @@ msgstr "Ба боло"
 msgid "Down"
 msgstr "Ба поён"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Тағйири ном..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Эҷод кардан"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Копӣ кардан ба"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "ҳузфшуда"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7485,8 +7318,8 @@ msgstr "<папка интихоб кунед>"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7494,8 +7327,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Нигоҳ доштани маълумотҳои филтр имконпазир нест, чунки онҳо дорои хатогӣ (яъне "
-"амале ё дастури ҷустуҷӯӣ низ надорад) мебошад."
+"Нигоҳ доштани маълумотҳои филтр имконпазир нест, чунки онҳо дорои хатогӣ "
+"(яъне амале ё дастури ҷустуҷӯӣ низ надорад) мебошад."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7561,27 +7394,23 @@ msgstr "Барқарор кардани кеши IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Барқарор кардани кеши IMAP.</b></p>"
-"<p>Агар масъала бо синхронизатсияи кеши IMAP рӯй диҳад, кӯшиш кунед пеш аз ҳама "
-"папкаро аз нав индексгузорӣ кунед. Ин каме вақтро мегирад, аммо ягон масъалае "
-"рӯй намедиҳад</p>"
-"<p>Агар ин ёрӣ надиҳад, сайъ кунед кеши IMAP-ро нав кунед. Дар ин сурат тамоми "
+"<p><b>Барқарор кардани кеши IMAP.</b></p><p>Агар масъала бо синхронизатсияи "
+"кеши IMAP рӯй диҳад, кӯшиш кунед пеш аз ҳама папкаро аз нав индексгузорӣ "
+"кунед. Ин каме вақтро мегирад, аммо ягон масъалае рӯй намедиҳад</p><p>Агар "
+"ин ёрӣ надиҳад, сайъ кунед кеши IMAP-ро нав кунед. Дар ин сурат тамоми "
 "тағйиротҳое, ки дар папкаи локалӣ ва зерпапкаҳои он карда буд, нест хоҳанд "
 "шуд.</p>"
 
@@ -7620,15 +7449,15 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
-"Барои тағйир додани номи папкаҳои IMAP, бояд дар аввал бо сервер синхронизатсия "
-"кардан лозим аст."
+"Барои тағйир додани номи папкаҳои IMAP, бояд дар аввал бо сервер "
+"синхронизатсия кардан лозим аст."
 
 #: kmfoldercachedimap.cpp:735
 msgid ""
@@ -7645,8 +7474,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"Оё мутмаинед, ки мехоҳед кеши папкаи IMAP-и %1-ро бо тамоми зерпапкаҳо бозсозӣ "
-"кунед?\n"
+"Оё мутмаинед, ки мехоҳед кеши папкаи IMAP-и %1-ро бо тамоми зерпапкаҳо "
+"бозсозӣ кунед?\n"
 "Тамоми тағйиротҳое, ки дар папкаи локалӣ бо шумо иҷро шуда буд, гум мешаванд"
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7663,11 +7492,11 @@ msgstr "Индекси папка нав карда шуд."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Папкаи %1 синхронизатсия нашудааст (дар ҳолати %2 аст). Оё дар ҳақиқат мехоҳед "
-"онро аз рӯи нав синхронизатсия кунед?"
+"Папкаи %1 синхронизатсия нашудааст (дар ҳолати %2 аст). Оё дар ҳақиқат "
+"мехоҳед онро аз рӯи нав синхронизатсия кунед?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7797,13 +7626,10 @@ msgstr "Эҷоди зерпапкаҳо ба сервер"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Папкаи <b>%1</b> ҳузф шуда буд. Онро аз сервер ҳузф кунам?</p></qt>"
+"<qt><p>Папкаи <b>%1</b> ҳузф шуда буд. Онро аз сервер ҳузф кунам?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7824,12 +7650,10 @@ msgstr "Қабул намудани рӯйхати папкаҳо"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Папкаи <b>%1</b> ҳузф шуда буд. Онро аз сервер ҳузф кунам?</p></qt>"
+"<qt><p>Папкаи <b>%1</b> ҳузф шуда буд. Онро аз сервер ҳузф кунам?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7837,14 +7661,14 @@ msgstr "Хароб гашт"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7858,11 +7682,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7871,15 +7695,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "&Ҷойгир кардан ба"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "&Имзо накардан"
@@ -7894,8 +7723,7 @@ msgstr "Гузаронидани иттилоот - интихоби папка"
 msgid "Permissions (ACL)"
 msgstr "Ҳуқуқҳои дастрасӣ"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Умумӣ"
@@ -7920,8 +7748,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Истифода аз ишоротҳои инфиродӣ"
@@ -7941,14 +7768,13 @@ msgstr "Оиди почтаи нав дар ин қуттӣ маълумот н�
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7962,12 +7788,12 @@ msgstr "Ҷойгир кардани ҷавобҳо ба ин папка"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Агар хоҳед, ки ҷавобҳои хат аз ин папкаба папкаи \"Фиристодашуда\" нагузаранд "
-"(дар дохилаш монад), ин нишонаро фаъол созед."
+"Агар хоҳед, ки ҷавобҳои хат аз ин папкаба папкаи \"Фиристодашуда\" "
+"нагузаранд (дар дохилаш монад), ин нишонаро фаъол созед."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7978,17 +7804,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr " Сутун: %1 "
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Ҳамчун асосӣ кардан"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Фиристонанда"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Қабулкунанда"
@@ -8000,11 +7830,11 @@ msgstr "Ихтисоси &фиристонанда:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -8023,12 +7853,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -8062,24 +7892,24 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr ""
-"Шумо ин пӯшаро барои фаро гирифтани иттилооти якгурӯҳа пайкарбандӣ  кардед ва "
-"варианти асосии пайкарбандӣ барои пинҳон кардани пӯшаҳои якгурӯҳа муайян шуд.Ин "
-"маънои онро дорад, ки ин пӯша нохост гум мешавад, муколамаи пайкарбандӣ пӯшида "
-"мешавад. Агар хоҳед, ки ин пӯшаро аз сари нав нест кунед, шуморо лозим меояд,ки "
-"муваққатан пинҳоншавии пӯшаҳои якхеларо  барои дида тавониста шавад корношоям "
-"кунед."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"Шумо ин пӯшаро барои фаро гирифтани иттилооти якгурӯҳа пайкарбандӣ  кардед "
+"ва варианти асосии пайкарбандӣ барои пинҳон кардани пӯшаҳои якгурӯҳа муайян "
+"шуд.Ин маънои онро дорад, ки ин пӯша нохост гум мешавад, муколамаи "
+"пайкарбандӣ пӯшида мешавад. Агар хоҳед, ки ин пӯшаро аз сари нав нест кунед, "
+"шуморо лозим меояд,ки муваққатан пинҳоншавии пӯшаҳои якхеларо  барои дида "
+"тавониста шавад корношоям кунед."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8149,7 +7979,8 @@ msgstr "Хатогӣ ҳангоми қабул намудани маълумот
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Индекс барои папкаи '%1', бо раванди номаълуми KMail (%2) эҷод шудааст.\n"
 "Ин папка аз нав индексонида мешавад, аммо якхел маълумотҳо ҳамчунин вазъияти "
@@ -8180,11 +8011,11 @@ msgstr "Натавонистам папкаи %1-ро дарёфт кунам."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Хатои боз кардани %1. Мумкин, ки папкаи ишорашуда почтавӣ набошад ё шумо ҳуқуқи "
-"дастрасии кофӣ надоред."
+"Хатои боз кардани %1. Мумкин, ки папкаи ишорашуда почтавӣ набошад ё шумо "
+"ҳуқуқи дастрасии кофӣ надоред."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8226,22 +8057,19 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Индекси папкаи '%2' кӯҳна шуд. Индекс такроран барои пешгирӣ намудани "
+"<qt><p>Индекси папкаи '%2' кӯҳна шуд. Индекс такроран барои пешгирӣ намудани "
 "гумшавии иттилоот, эҷод карда мешавад. Дар натиҷа дар дохили папкаҳо метавон "
 "иттилоотҳое, ки пештар ҳузф карда шуда буданд, бошанд ва ҳамчунин метавон "
-"партофти мушаххасотҳои иттилоот рӯй диҳад.</p>"
-"<p>Қайди мутобиқро дар <a href=\"%1\">қисми савол ва ҷавоби мудирияти барномаи "
-"KMail </a> барои гирифтани иттилоот оиди пешгирӣ намудани пайдоиши воқеъоти "
-"зерин дар ояндаро низ бихонед.</p></qt>"
+"партофти мушаххасотҳои иттилоот рӯй диҳад.</p><p>Қайди мутобиқро дар <a href="
+"\"%1\">қисми савол ва ҷавоби мудирияти барномаи KMail </a> барои гирифтани "
+"иттилоот оиди пешгирӣ намудани пайдоиши воқеъоти зерин дар ояндаро низ "
+"бихонед.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8301,16 +8129,16 @@ msgstr ""
 "Шояд, ки '%1' папка набошад.\n"
 "Лутфан ин папкаро аз роҳ бигиред."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 "Иҷозатномаҳои пӯшаи '%1' нодуруст ҳастанд;\n"
-"Марҳамат карда боварӣ ҳосил кунед,ки шумо метавонед мундариҷаи ин пӯшаро тағйир "
-"диҳед ва ба вай намуд диҳед."
+"Марҳамат карда боварӣ ҳосил кунед,ки шумо метавонед мундариҷаи ин пӯшаро "
+"тағйир диҳед ва ба вай намуд диҳед."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8320,8 +8148,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -8329,7 +8157,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Натавонистам папка эҷод кунам"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8433,9 +8261,9 @@ msgstr "&Дур кардани норасоиҳои кеши IMAP..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8454,8 +8282,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Қодир ба эҷод кардани папкаи <b>%1</b> нестам. Чунин папка аллакай мавҷуд "
-"аст.</qt>"
+"<qt>Қодир ба эҷод кардани папкаи <b>%1</b> нестам. Чунин папка аллакай "
+"мавҷуд аст.</qt>"
 
 #: kmfoldertree.cpp:2000
 #, fuzzy
@@ -8582,10 +8410,10 @@ msgstr "%1 Папка танҳо брои хондан."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 "<qt>Оё мутмаинед, ки мохоҳед %n иттилоот интихобшударо ҳузф кунед?"
 "<br>Иттилоотҳои ҳузфшуда, барқарор карда намешаванд.</qt>\n"
@@ -8647,128 +8475,127 @@ msgstr ""
 "Хатогӣ ҳангоми тағйир додани %1\n"
 "(Оё дар диск ҷой нест?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Дархости имзои сертификат"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Ин сертификатро аз замимот эҷод кунед ва ба фиристонанда бар гардонед."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 "Ҳуқуқ ба хондан/қайд кардан дар папкаи иттилоотҳои дохилшаванда мавҷуд нест."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Хурӯҷшаванда"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 "Ҳуқуқ ба хондан/қайд кардан дар папкаи иттилоотҳои хурӯҷшаванда мавҷуд нест."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Фиристодашуда"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Ҳуқуқ ба хондан/қайд кардан дар папкаи иттилоотҳои фиристодашуда мавҷуд нест."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Сабад"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Ҳуқуқ ба хондан/қайд кардан дар сабад, мавҷуд нест."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "Мусаввадот"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Ҳуқуқ ба хондан/қайд кардан дар папкаи мусаввадот мавҷуд нест."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Ивваз кардан"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Ҳуқуқ ба хондан/қайд кардан дар сабад, мавҷуд нест."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Ҷустуҷӯи охирин"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Садамавӣ хотима ёфтани амали KMail"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8779,11 +8606,11 @@ msgstr ""
 "Сабаб:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Пок кардани сабад"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Сабадро барои тамоми қайдоти баҳисобгирӣ пок кунам?"
 
@@ -8865,8 +8692,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Почтаи нав қабул шуд</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8906,8 +8732,8 @@ msgstr "Сабадро пок кунам?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr "<qt>Иттилоотро аз папкаи <b>%1</b> ба сабад гузаронам?</qt>"
 
 #: kmmainwidget.cpp:1173
@@ -8934,12 +8760,12 @@ msgstr "Қабулкунандаҳои пинҳонӣ"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Оё мутмаинед, ки мехоҳед папкаи ҷустуҷӯии <b>%1</b>"
-"-ро ҳузф кунед? Иттилоотҳое, ки дар он тасвир мешаванд мемонанд, чунки онҳо дар "
-"папкаҳои дигар ҷойгир шудаанд.</qt>"
+"<qt>Оё мутмаинед, ки мехоҳед папкаи ҷустуҷӯии <b>%1</b>-ро ҳузф кунед? "
+"Иттилоотҳое, ки дар он тасвир мешаванд мемонанд, чунки онҳо дар папкаҳои "
+"дигар ҷойгир шудаанд.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8953,23 +8779,21 @@ msgstr ""
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Оё мутмаинед, ки мехоҳед папкаи холии <b>%1</b>-ро бо тамоми зерпапкаҳояш "
-"ҳузф кунед?Он зерпапкаҳо метавон холӣ набошанд ва дохили онҳо низ ҳамчунин ҳузф "
-"хоҳад шуд.</qt>"
+"<qt>Оё мутмаинед, ки мехоҳед папкаи холии <b>%1</b>-ро бо тамоми "
+"зерпапкаҳояш ҳузф кунед?Он зерпапкаҳо метавон холӣ набошанд ва дохили онҳо "
+"низ ҳамчунин ҳузф хоҳад шуд.</qt>"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Оё мутмаинед, ки мехоҳед папкаи <b>%1</b>-ро бо тамоми дохили он ҳузф "
 "кунед?</qt>"
@@ -8977,14 +8801,19 @@ msgstr ""
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Оё мехоҳед папкаи <b>%1</b>-ро бо тамоми зерпапка ва дохили онро ҳузф "
 "кунед?</qt>"
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "ҳузфшуда"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -9000,9 +8829,9 @@ msgstr "Оё мехоҳед аз тамоми иттилоотҳои кӯҳна�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "Истифода аз HTML дар почта, шуморо ба \"спам\" боз ҳам нозуктар мекунад ва "
 "метавонад эҳтимолоти онро, ки системаи шумо бо ёрии тарзи шикасти аллакай "
@@ -9020,8 +8849,8 @@ msgstr "Истифода аз HTML"
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "Истифода аз HTML дар почта, шуморо ба \"спам\" боз ҳам нозуктар мекунад ва "
 "метавонад эҳтимолоти онро, ки системаи шумо бо ёрии тарзи шикасти аллакай "
@@ -9041,8 +8870,8 @@ msgstr "Филтри аз рӯи рӯйхати фиристониши %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "Имконияти маълумот оиди ҳозир набудан, аз танзимоти филтр дар сервер вобаста "
@@ -9064,9 +8893,11 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
-"Натавонистам маҷалаи GnuPG-ро боз кунам. Тасҳеҳ сабт шудани барномаро биозмоед."
+"Натавонистам маҷалаи GnuPG-ро боз кунам. Тасҳеҳ сабт шудани барномаро "
+"биозмоед."
 
 #: kmmainwidget.cpp:2508
 #, fuzzy
@@ -9408,8 +9239,7 @@ msgstr "&Захира кардани тамоми замимот..."
 msgid "Appl&y All Filters"
 msgstr "Истифода аз &филтрҳо"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Истифода аз &филтр"
@@ -9446,8 +9276,8 @@ msgstr "&Ҷамъбасти иттилоот"
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
-"Фаъол ё ғайрифаъол сохтани тасвироти сутуне, ки мақодири умумии иттилоотро ба "
-"папкаҳо намоиш медиҳад."
+"Фаъол ё ғайрифаъол сохтани тасвироти сутуне, ки мақодири умумии иттилоотро "
+"ба папкаҳо намоиш медиҳад."
 
 #: kmmainwidget.cpp:3026
 #, fuzzy
@@ -9460,8 +9290,8 @@ msgstr "&Ҷамъбасти иттилоот"
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
-"Фаъол ё ғайрифаъол сохтани тасвироти сутуне, ки мақодири умумии иттилоотро ба "
-"папкаҳо намоиш медиҳад."
+"Фаъол ё ғайрифаъол сохтани тасвироти сутуне, ки мақодири умумии иттилоотро "
+"ба папкаҳо намоиш медиҳад."
 
 #: kmmainwidget.cpp:3032
 msgid ""
@@ -9528,7 +9358,6 @@ msgstr "Хонданашудаи &навбатӣ"
 msgid "Go to the next unread message"
 msgstr "Гузаштан ба иттилооти хонданашудаи навбатӣ"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Иттилооти қаблӣ"
@@ -9672,8 +9501,8 @@ msgstr " Инитсиализатсия..."
 #: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9684,61 +9513,61 @@ msgstr ""
 #: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Иттилоот дорои дархост ба тасдиқоти коркард мебошад.\n"
 "Дар дархост параметре, ки ҳамчун \"дархостӣ\" ишора шудааст, аммо KMail-и "
 "номаълум аст, мебошад.\n"
-"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои иттилоот "
-"оиди хатогии коркард мебошад, бифиристед."
+"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои "
+"иттилоот оиди хатогии коркард мебошад, бифиристед."
 
 #: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Иттилоот дорои дархост ба тасдиқоти\n"
 "коркард мебошад, аммо ҷавобро ба якчанд адресҳо фиристодан лозим аст.\n"
-"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои инкор ё "
-"иттилоот оиди коркард мебошад, бифиристед."
+"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои инкор "
+"ё иттилоот оиди коркард мебошад, бифиристед."
 
 #: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Иттилоот дорои дархост ба тасдиқоти\n"
 "коркард мебошад, аммо адреси фиристанда ишора нашудааст.\n"
-"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои инкор ё "
-"иттилоот оиди коркард мебошад, бифиристед."
+"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои инкор "
+"ё иттилоот оиди коркард мебошад, бифиристед."
 
 #: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Иттилоот дорои дархост ба тасдиқоти\n"
-"коркард мебошад, аммо адреси фиристанда аз онки ба куҷо маълумотро фиристодан "
-"лозим аст, фарқ мекунад.\n"
-"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои инкор ё "
-"иттилоот оиди коркард мебошад, бифиристед."
+"коркард мебошад, аммо адреси фиристанда аз онки ба куҷо маълумотро "
+"фиристодан лозим аст, фарқ мекунад.\n"
+"Шумо метавонед дархостро ба эътибор нагиред ё инки ҷавоберо, ки дорои инкор "
+"ё иттилоот оиди коркард мебошад, бифиристед."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9757,25 +9586,26 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Унвоноти \"Disposition-Notification-Options\" дороипараметри ба барнома лозимӣ "
-"аммо номаълум мебошад"
+"Унвоноти \"Disposition-Notification-Options\" дороипараметри ба барнома "
+"лозимӣ аммо номаълум мебошад"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Қабулкунӣ: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Замимот: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr ""
-"Намоиш додани замимот ба намуде, ки ин бо фиристонанда тасмим гирифта шудааст."
+"Намоиш додани замимот ба намуде, ки ин бо фиристонанда тасмим гирифта "
+"шудааст."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9825,47 +9655,39 @@ msgstr "Хусусиятҳои қисми иттилоот"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Навъи файли</em> MIME:</p>"
-"<p>Одатан ҳангоми ба тарзи худкор муайян намудани навъи файли MIME, шумо ин "
-"танзимотро набояд тағйир диҳед. Аммо баъзан %1 метавонад навъи файлро нодуруст "
-"муайян кунад.Дар ин замина метавонед навъро ислоҳ кунед.</p></qt>"
+"<qt><p><em>Навъи файли</em> MIME:</p><p>Одатан ҳангоми ба тарзи худкор "
+"муайян намудани навъи файли MIME, шумо ин танзимотро набояд тағйир диҳед. "
+"Аммо баъзан %1 метавонад навъи файлро нодуруст муайян кунад.Дар ин замина "
+"метавонед навъро ислоҳ кунед.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Андозаи замимот.</p>"
-"<p>Баъзан %1, танҳо андозаи тассодуфии замимотро намоиш медиҳад, чанде ҳисоб "
-"намудани андозаи дақиқ метавон вақти зиёдеро бигирад. Дар ин сурат метавонед "
-"инро дар худи замина бо афзудани \"(тақр.)\"ба андозаи файли тақрибӣ низ ишора "
-"кунед.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
+msgstr ""
+"<qt><p>Андозаи замимот.</p><p>Баъзан %1, танҳо андозаи тассодуфии замимотро "
+"намоиш медиҳад, чанде ҳисоб намудани андозаи дақиқ метавон вақти зиёдеро "
+"бигирад. Дар ин сурат метавонед инро дар худи замина бо афзудани "
+"\"(тақр.)\"ба андозаи файли тақрибӣ низ ишора кунед.</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Номи файли замимашуда.</p>"
-"<p>Чунончӣ дар инҷо ба тарзи пешфарзӣ номи файли замимашуда ишора мешавад, шумо "
-"метавонед номи файлро ҳангоми замима кардан тағйир кунед. Баъзан ин хеле муҳим "
-"аст, агар замимоти бо чунин номи файлро қабулкунанда наметавон хонд ё дар диск "
-"нигоҳ дошт.</p></qt>"
+"<qt><p>Номи файли замимашуда.</p><p>Чунончӣ дар инҷо ба тарзи пешфарзӣ номи "
+"файли замимашуда ишора мешавад, шумо метавонед номи файлро ҳангоми замима "
+"кардан тағйир кунед. Баъзан ин хеле муҳим аст, агар замимоти бо чунин номи "
+"файлро қабулкунанда наметавон хонд ё дар диск нигоҳ дошт.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9873,17 +9695,15 @@ msgstr "&Тасвирот:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Тасвироти замимот.</p>"
-"<p>Ин фақат сатри тасвироти замимот ба монанди сатри Мавзӯъ аст: ҷамъбасти "
-"иттилоот.Қариб тамоми клиентҳои почтавӣ, ин сатрро ҳангоми намоиши иттилоот "
-"назди нишонаи замимот намоиш медиҳанд.</p></qt>"
+"<qt><p>Тасвироти замимот.</p><p>Ин фақат сатри тасвироти замимот ба монанди "
+"сатри Мавзӯъ аст: ҷамъбасти иттилоот.Қариб тамоми клиентҳои почтавӣ, ин "
+"сатрро ҳангоми намоиши иттилоот назди нишонаи замимот намоиш медиҳанд.</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9891,24 +9711,21 @@ msgstr "&Рамзгузорӣ:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Рамзгузории замимот.</p>"
-"<p>Одатан танзимоти зеринро тағйир додан лозим нест - %1 рамзгузории "
-"пешфарзиро, ки дар навъи замимоти MIME асос ёфтааст, истифода мекунад. Аммо дар "
-"баъзе ҳолатҳо метавонед андозаи иттилоотро бо интихоби рамзгузории лозимӣ, хурд "
-"кунед. Мисол, файлҳои PostScript дорои маълумотҳои бинарӣ мебошанд ва аз матни "
-"оддӣ иборатанд. Дар ин сурат беҳтараш \"quoted-printable\"-ро ба ҷои \"base64\" "
-"интихоб намудан лозим аст, ки ба сарфаҷӯии зиёд аз 25% андозаи иттилоот "
-"меорад.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Рамзгузории замимот.</p><p>Одатан танзимоти зеринро тағйир додан "
+"лозим нест - %1 рамзгузории пешфарзиро, ки дар навъи замимоти MIME асос "
+"ёфтааст, истифода мекунад. Аммо дар баъзе ҳолатҳо метавонед андозаи "
+"иттилоотро бо интихоби рамзгузории лозимӣ, хурд кунед. Мисол, файлҳои "
+"PostScript дорои маълумотҳои бинарӣ мебошанд ва аз матни оддӣ иборатанд. Дар "
+"ин сурат беҳтараш \"quoted-printable\"-ро ба ҷои \"base64\" интихоб намудан "
+"лозим аст, ки ба сарфаҷӯии зиёд аз 25% андозаи иттилоот меорад.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9916,20 +9733,17 @@ msgstr "Дастури &намоиши худкор"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ин параметр ба корванд пешкаш мекунад, ки ба ҷои намоиш додан ба намуди "
-"ишорот, ин замимотро ба матни иттилоот намоиш диҳад.</p>"
-"<p>Аз нуқтаи назари техникӣ, ин ба танзимоти дар заминаи <em>"
-"Content-Disposition</em> унвоноти замимоти аҳамияти \"inline\" ба ҷои аҳамияти "
-"пешфарзии \"attachment\" мутобиқ аст.</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Ин параметр ба корванд пешкаш мекунад, ки ба ҷои намоиш додан ба "
+"намуди ишорот, ин замимотро ба матни иттилоот намоиш диҳад.</p><p>Аз нуқтаи "
+"назари техникӣ, ин ба танзимоти дар заминаи <em>Content-Disposition</em> "
+"унвоноти замимоти аҳамияти \"inline\" ба ҷои аҳамияти пешфарзии \"attachment"
+"\" мутобиқ аст.</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9937,14 +9751,12 @@ msgstr "&Имзоиши замимот"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Агар хоҳед замимотро имзо кунед, ин интихоботро интихоб кунед.</p>"
-"<p>Барои имзо калиде, ки дар профили ҷорӣ интихоб шуда буд, истифода "
+"<qt><p>Агар хоҳед замимотро имзо кунед, ин интихоботро интихоб кунед.</"
+"p><p>Барои имзо калиде, ки дар профили ҷорӣ интихоб шуда буд, истифода "
 "мешавад.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9953,14 +9765,12 @@ msgstr "&Рамзгузории қисми зерин"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Агар хоҳед, ки қисми зерини иттилоотро рамзгузорӣ кунед, нишонаро фаъол "
-"созед.</p>"
-"<p>Он барои қабулкунандагони иттилоот рамзгузорӣ карда мешавад</p></qt>"
+"<qt><p>Агар хоҳед, ки қисми зерини иттилоотро рамзгузорӣ кунед, нишонаро "
+"фаъол созед.</p><p>Он барои қабулкунандагони иттилоот рамзгузорӣ карда "
+"мешавад</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9974,17 +9784,14 @@ msgstr "Филтри POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"Дар қуттии POP иттилоотҳое, ки ба интихоб воҷиб аст, ёфт шудаанд: <b>%1</b>"
-"<p>Андозаи ин иттилоотҳо, андозаи ҳудудро, ки барои ин қуттӣ дархост шудааст, "
-"мегузаронад."
-"<br>Шумо худ метавонед бо пахш намудани тугмаи мутобиқ, бо ин иттилоотҳо идора "
-"кунед."
+"Дар қуттии POP иттилоотҳое, ки ба интихоб воҷиб аст, ёфт шудаанд: <b>%1</"
+"b><p>Андозаи ин иттилоотҳо, андозаи ҳудудро, ки барои ин қуттӣ дархост "
+"шудааст, мегузаронад.<br>Шумо худ метавонед бо пахш намудани тугмаи мутобиқ, "
+"бо ин иттилоотҳо идора кунед."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10124,7 +9931,8 @@ msgstr "&Зеҳнӣ"
 #: kmreaderwin.cpp:554
 msgid "Show attachments as suggested by sender."
 msgstr ""
-"Намоиш додани замимот ба намуде, ки ин бо фиристонанда тасмим гирифта шудааст."
+"Намоиш додани замимот ба намуде, ки ин бо фиристонанда тасмим гирифта "
+"шудааст."
 
 #: kmreaderwin.cpp:558
 msgid ""
@@ -10135,8 +9943,8 @@ msgstr "&Дар матн"
 #: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr ""
-"Намоиши замимот ҳамчун матн, ки бо иттилоот эҷод шуда буд (агар ин имконпазир "
-"аст)"
+"Намоиши замимот ҳамчун матн, ки бо иттилоот эҷод шуда буд (агар ин "
+"имконпазир аст)"
 
 #: kmreaderwin.cpp:565
 msgid ""
@@ -10245,15 +10053,14 @@ msgstr ""
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -10263,18 +10070,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10282,20 +10088,19 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2>Хуш омадед ба KMail %1</h2>"
-"<p>KMail - ин коргири почтавӣ барои TDE. Он барои дастгирии пурраи почтаҳои "
-"стандартии Интернет, аз он ҷумла MIME, SMTP, POP3 ва IMAP эҷод шудааст.</p>\n"
-"<ul>"
-"<li>KMail хеле имкониятҳои фоидаоварро, ки поёнтар қайд шудааст, дар бар "
+"<h2>Хуш омадед ба KMail %1</h2><p>KMail - ин коргири почтавӣ барои TDE. Он "
+"барои дастгирии пурраи почтаҳои стандартии Интернет, аз он ҷумла MIME, SMTP, "
+"POP3 ва IMAP эҷод шудааст.</p>\n"
+"<ul><li>KMail хеле имкониятҳои фоидаоварро, ки поёнтар қайд шудааст, дар бар "
 "мегирад<a href=\"%2\">Санадотҳои</a></li>\n"
-"<li><a href=\"%3\">Санадоти хонагии KMail</a> дорои иттилоотҳои оиди равандҳои "
-"нави KMail мебошад</li></ul>\n"
+"<li><a href=\"%3\">Санадоти хонагии KMail</a> дорои иттилоотҳои оиди "
+"равандҳои нави KMail мебошад</li></ul>\n"
 "<p><span style='font-size:125%; font-weight:bold;'>Тағйиротҳои муҳим</span> "
 "(нисбат ба KMail %8):</p>\n"
 "<ul>\n"
 "%9</ul>\n"
-"<p>Поёнтар якчанд имкониятҳои нави ин раванди KMail (нисбат ба KMail %4, ки ба "
-"таркиби TDE %5 ворид мешавад) номбар шудаанд:</p>\n"
+"<p>Поёнтар якчанд имкониятҳои нави ин раванди KMail (нисбат ба KMail %4, ки "
+"ба таркиби TDE %5 ворид мешавад) номбар шудаанд:</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10304,22 +10109,20 @@ msgstr ""
 "<p>&nbsp; &nbsp; дастаи тайёркунандагони KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
 "<p>Коргири почтавии худро бо истифодаи Танзимот-&gt танзим кунед;Танзими "
 "KMail.\n"
-"Бояд профили асосиро ва ақалан як навиштаҷотро барои почтаи фиристодашаванда ва "
-"дохилшаванда ишора намудан лозим аст.</p>\n"
+"Бояд профили асосиро ва ақалан як навиштаҷотро барои почтаи фиристодашаванда "
+"ва дохилшаванда ишора намудан лозим аст.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10356,7 +10159,8 @@ msgstr "Намоиши замимот: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Замимот дорои маълумотҳои дубора мебошад.Ишораи %n намоиш шудааст.]\n"
@@ -10385,12 +10189,14 @@ msgstr "Замимотро кушоям?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10412,6 +10218,71 @@ msgstr "(бо ҳар дастур мутобиқ меояд)"
 msgid "(match all of the following)"
 msgstr "(бо тамоми дастур мутобиқ меояд)"
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "Иҷро шуд."
+
+#: kmsearchpattern.h:222
+#, fuzzy
+msgid "Old"
+msgstr "кӯҳна"
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "ҳузфшуда"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "посух додашуда"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "ирсол кардашуда"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "&Навбат"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "фиристодашуда"
+
+#: kmsearchpattern.h:228
+#, fuzzy
+msgid "Watched"
+msgstr "мушоҳидашуда"
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "ба эътибор нагирифтан"
+
+#: kmsearchpattern.h:230
+#, fuzzy
+msgid "Spam"
+msgstr "спам"
+
+#: kmsearchpattern.h:231
+#, fuzzy
+msgid "Ham"
+msgstr "муфид"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Қабулкунанда: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "бо замимот"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10494,25 +10365,26 @@ msgid ""
 "message to \"sent-mail\" folder."
 msgstr ""
 "Хатои меъёрӣ: қодир ба коркарди иттилоотҳои фиристодашуда (дар диск фосила "
-"нест?) нестам Хатогӣ ҳангоми гузаронидани иттилоот ба папкаи \"Фиристодашуда\"."
+"нест?) нестам Хатогӣ ҳангоми гузаронидани иттилоот ба папкаи \"Фиристодашуда"
+"\"."
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Хатои гузаронидани иттилооти фиристодашудаи \"%1\" аз папкаи \"Хориҷшаванда\" "
-"бапапкаи \"Фиристодашуда\".\n"
+"Хатои гузаронидани иттилооти фиристодашудаи \"%1\" аз папкаи \"Хориҷшаванда"
+"\" бапапкаи \"Фиристодашуда\".\n"
 "Шояд, ҷои холӣ дар диск ё ҳуқуқ ба қайдкунӣ набошад. Сайъи кунед масъаларо "
 "ислоҳ кунед ва иттилоотро ба тариқи муқаррар гузаронед."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Агар нишонаи фиристонанда ишора нашуда бошад, хатро фиристодан имконпазир "
 "нест.\n"
@@ -10542,8 +10414,8 @@ msgstr "Оғози фиристониш..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10569,15 +10441,17 @@ msgstr "Хатои фиристодани иттилоот аз қатор."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Фиристониш хароб шуд:\n"
 "%1\n"
-"Иттилоот дар папкаи 'Хориҷшаванда' мемонад то, ки шумо хатогиро (мисол, адреси "
-"нодуруст) ислоҳ кунед ёки иттилоотро аз папкаи 'Хориҷшаванда' ҳузф созед.\n"
+"Иттилоот дар папкаи 'Хориҷшаванда' мемонад то, ки шумо хатогиро (мисол, "
+"адреси нодуруст) ислоҳ кунед ёки иттилоотро аз папкаи 'Хориҷшаванда' ҳузф "
+"созед.\n"
 "Протоколи интиқолии зерин истифода шуда буд:\n"
 "  %2"
 
@@ -10587,21 +10461,17 @@ msgstr "Фиристониш канда шуд."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Хатои фиристониш:</p>"
-"<p>%1</p>"
-"<p>Иттилоот дар папкаи 'Хориҷшаванда' мемонад то, ки шумо хатогиро (мисол, "
-"адреси нодуруст) ислоҳ кунед ёки иттилоотро аз папкаи 'Хориҷшаванда' ҳузф "
-"созед.</p>\n"
-"<p>Тарзи фиристониши зерин истифода шуда буд: %2</p> "
-"<p>Иттилоотҳои боқимондаро бифиристам?</p>"
+"<p>Хатои фиристониш:</p><p>%1</p><p>Иттилоот дар папкаи 'Хориҷшаванда' "
+"мемонад то, ки шумо хатогиро (мисол, адреси нодуруст) ислоҳ кунед ёки "
+"иттилоотро аз папкаи 'Хориҷшаванда' ҳузф созед.</p>\n"
+"<p>Тарзи фиристониши зерин истифода шуда буд: %2</p> <p>Иттилоотҳои "
+"боқимондаро бифиристам?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10619,15 +10489,17 @@ msgstr "&Хотима додани фиристониш"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Хатои фиристониш:\n"
 "%1\n"
-"Иттилоот дар папкаи 'Хориҷшаванда' мемонад то, ки шумо хатогиро (мисол, адреси "
-"нодуруст) ислоҳ кунед ёки иттилоотро аз папкаи 'Хориҷшаванда' ҳузф созед.\n"
+"Иттилоот дар папкаи 'Хориҷшаванда' мемонад то, ки шумо хатогиро (мисол, "
+"адреси нодуруст) ислоҳ кунед ёки иттилоотро аз папкаи 'Хориҷшаванда' ҳузф "
+"созед.\n"
 "Тарзи фиристониши зерин истифода шуда буд:\n"
 " %2"
 
@@ -10647,8 +10519,8 @@ msgstr ""
 "Хатои фиристониш:\n"
 "%1\n"
 "Иттилоот дар папкаи 'Хориҷшаванда' мемонад ва баъдтар фиристода мешавад.\n"
-"Агар хоҳед, ки иттилоот умуман фиристода нашавад, онро ба папкаи дигар ҷойгир "
-"кунед.\n"
+"Агар хоҳед, ки иттилоот умуман фиристода нашавад, онро ба папкаи дигар "
+"ҷойгир кунед.\n"
 "Тарзи фиристониши зерин истифода шуда буд:\n"
 " %2"
 
@@ -10669,43 +10541,43 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 аллакай дар дигар монитори ин компютер иҷро шуда истодааст. Оғози %2 зиёд аз "
-"як маротиба, метавонад ба нест шудани иттилоот орад. Агар мутмаин набошед, ки "
-"аллакай иҷро нашуда истодааст, %1-ро оғоз накунед."
+"%1 аллакай дар дигар монитори ин компютер иҷро шуда истодааст. Оғози %2 зиёд "
+"аз як маротиба, метавонад ба нест шудани иттилоот орад. Агар мутмаин "
+"набошед, ки аллакай иҷро нашуда истодааст, %1-ро оғоз накунед."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 аллакай дар дигар монитори ин компютер иҷро шуда истодааст. Иҷроияи якбора "
-"%1 ва %2, метавонад ба нест шудани иттилоот орад. Агар мутмаин набошед, ки %2 "
-"аллакай иҷро нашуда истодааст, %1-ро оғоз накунед."
+"%1 аллакай дар дигар монитори ин компютер иҷро шуда истодааст. Иҷроияи "
+"якбора %1 ва %2, метавонад ба нест шудани иттилоот орад. Агар мутмаин "
+"набошед, ки %2 аллакай иҷро нашуда истодааст, %1-ро оғоз накунед."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
-"%1 аллакай дар %2 иҷро шуда истодааст. Оғози %1 зиёд аз як маротиба, метавонад "
-"ба нест шудани иттилоот орад. Агар мутмаин набошед, ки %1 аллакай дар  иҷро "
-"нашуда истодааст, %2-ро дар ин компютер оғоз накунед."
+"%1 аллакай дар %2 иҷро шуда истодааст. Оғози %1 зиёд аз як маротиба, "
+"метавонад ба нест шудани иттилоот орад. Агар мутмаин набошед, ки %1 аллакай "
+"дар  иҷро нашуда истодааст, %2-ро дар ин компютер оғоз накунед."
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 аллакай дар %3 иҷро шуда истодааст. Оғози якбора %1 ва %2, метавонад ба нест "
-"шудани иттилоот орад. Агар мутмаин набошед, ки %1 дар %3 иҷро нашуда истодааст, "
-"%2-ро дар ин компютер оғоз накунед."
+"%1 аллакай дар %3 иҷро шуда истодааст. Оғози якбора %1 ва %2, метавонад ба "
+"нест шудани иттилоот орад. Агар мутмаин набошед, ки %1 дар %3 иҷро нашуда "
+"истодааст, %2-ро дар ин компютер оғоз накунед."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10716,6 +10588,10 @@ msgstr "Оғози %1"
 msgid "Exit"
 msgstr "Баромадан"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Иттилоотҳои нав дар"
@@ -10744,14 +10620,15 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "Барои захира кардани гузарвожа ба сервери SMTP дар файли танзимоти KMail, "
-"параметри зеринро фаъол созед. Гузарвожа ба формати хонда намешуда захира карда "
-"мешавад, аммо ҳангоми қабул намудани дастрасӣ ба файли танзимот, шояд рамзҳои "
-"гузарвожаи шуморо хонда шавад."
+"параметри зеринро фаъол созед. Гузарвожа ба формати хонда намешуда захира "
+"карда мешавад, аммо ҳангоми қабул намудани дастрасӣ ба файли танзимот, шояд "
+"рамзҳои гузарвожаи шуморо хонда шавад."
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
 #, fuzzy
@@ -10798,7 +10675,8 @@ msgstr "Фиристониш: SMTP"
 #: kmtransport.cpp:387
 msgid "The name that KMail will use when referring to this server."
 msgstr ""
-"Номе, ки бо барномаи KMail ҳангоми ба сервер муроҷиат намудан истифода мешавад."
+"Номе, ки бо барномаи KMail ҳангоми ба сервер муроҷиат намудан истифода "
+"мешавад."
 
 #: kmtransport.cpp:392
 msgid "&Host:"
@@ -10823,8 +10701,8 @@ msgid ""
 "ssh tunnels, for example. Leave it empty if no command should be run."
 msgstr ""
 "Дастуре, ки локалӣ пеш аз фиристодани почта иҷро мешавад. Шояд барои фаъол "
-"сохтани нақби ssh истифода шавад. Агар дар замина заруроте набошад, онро холӣ "
-"бимонед."
+"сохтани нақби ssh истифода шавад. Агар дар замина заруроте набошад, онро "
+"холӣ бимонед."
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -10832,11 +10710,11 @@ msgstr "Сервер &гузарвожаро пурсида истодааст"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Агар сервери SMTP-и шумо пеш аз расонидани почта авторизатсияро пурсида истода "
-"бошад, параметри зеринро фаъол созед."
+"Агар сервери SMTP-и шумо пеш аз расонидани почта авторизатсияро пурсида "
+"истода бошад, параметри зеринро фаъол созед."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10857,15 +10735,14 @@ msgstr "&Фиристодани номи ишорашудаи узел ба се
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Барои истифода бурдани номи ишорашудаи узел барои идентификатсия дар сервери "
-"почтавӣ, параметри зеринро фаъол созед. "
-"<p>Одатан ин барои тасҳеҳкунии номи фиристодашавандаи узел ё барои маскировкаи "
-"номи ҳақиқии компютери шумо низ истифода мешавад."
+"почтавӣ, параметри зеринро фаъол созед. <p>Одатан ин барои тасҳеҳкунии номи "
+"фиристодашавандаи узел ё барои маскировкаи номи ҳақиқии компютери шумо низ "
+"истифода мешавад."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10875,7 +10752,8 @@ msgstr "Номи &узел:"
 msgid ""
 "Enter the hostname KMail should use when identifying itself to the server."
 msgstr ""
-"Номи узелро, ки мавриди идентификатсия ба сервер истифода мешавад, ворид кунед."
+"Номи узелро, ки мавриди идентификатсия ба сервер истифода мешавад, ворид "
+"кунед."
 
 #: kmtransport.cpp:506
 msgid "&SSL"
@@ -10896,8 +10774,8 @@ msgstr "Танҳо файлҳои локалӣ пуштибонӣ мешаван
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "Номи доменӣ ё IP-адреси сервери SMTP."
 
 #: kmtransport.cpp:788
@@ -10911,10 +10789,10 @@ msgstr "Хатогӣ ҳангоми дархости оканоти папка �
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -11147,35 +11025,28 @@ msgstr "&Тағйири иттилоот"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Иттилооте, ки бо модули рамзгузорӣ баргардонида мешавад, хонда нахоҳад шуд. "
-"Шояд модул хароб гашта бошад.</p>"
-"<p>Ба мудири системавии худ муроҷиат кунед.</p></qt>"
+"<qt> <p>Иттилооте, ки бо модули рамзгузорӣ баргардонида мешавад, хонда "
+"нахоҳад шуд. Шояд модул хароб гашта бошад.</p><p>Ба мудири системавии худ "
+"муроҷиат кунед.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 "<p>Модулҳои фаъоли хати рамзӣ ёфт нашуд ва ҳамчунин модули сохташудаи "
-"OpenPGP-ро истифода бурдан имконпазир нест.</p>"
-"<p>Ду тарзи тағйир додани ҳолати зерин мавҷуд аст:</p>"
-"<ul>"
-"<li><em>ин</em> фаъол сохтани модули хати рамз бо истифодаи диалоги Танзимотҳо->"
-"ТанзимиKMail->Модулҳо</li>"
-"<li><em>ё</em> ишора намудани танзимотҳои OpenPGP бо истифодаи гузориши Иловагӣ "
-"ба танзимоти профил.</li></ul>"
+"OpenPGP-ро истифода бурдан имконпазир нест.</p><p>Ду тарзи тағйир додани "
+"ҳолати зерин мавҷуд аст:</p><ul><li><em>ин</em> фаъол сохтани модули хати "
+"рамз бо истифодаи диалоги Танзимотҳо->ТанзимиKMail->Модулҳо</li><li><em>ё</"
+"em> ишора намудани танзимотҳои OpenPGP бо истифодаи гузориши Иловагӣ ба "
+"танзимоти профил.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11187,8 +11058,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -11203,14 +11074,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "Имзооти/рамзгузории сохташудаи OpenPGP, ба гузоришот дахл надорад.\n"
@@ -11325,12 +11196,12 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
-"Имтиҳони имтиёзҳои навиштаҷоти таъсирпазир гузашт мекунад, ки шуморо пурсанд, "
-"ки оё мехоҳед ин мактубро нависед? \n"
+"Имтиҳони имтиёзҳои навиштаҷоти таъсирпазир гузашт мекунад, ки шуморо "
+"пурсанд, ки оё мехоҳед ин мактубро нависед? \n"
 "Мактуб навишта шавад?"
 
 #: messagecomposer.cpp:880 messagecomposer.cpp:907
@@ -11363,8 +11234,9 @@ msgstr "&Рамзгузорӣ накардан"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Шумо талаб кардед, ки  ин мактуб навишта шавад ва нусхаеро барои худатон "
 "нависед, лекин барои ин шабоҳат ягон навиштаҷоти бовариноки боэътибор "
@@ -11378,8 +11250,8 @@ msgstr "Ғайрирамзгузорӣ &фиристониш"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Якчанд қисмҳои иттилоот рамзгузорӣ нахоҳанд шуд\n"
@@ -11403,52 +11275,46 @@ msgstr "&Рамзгузории тамоми қисмҳои иттилоот"
 msgid "Unencrypted Message Warning"
 msgstr "Иттилооти рамзгузошта нашуда"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Хатогӣ: модули хати рамз ягон маълумоти рамзгузошташударо барнагардонд.</p>"
-"<p>Оиди ин хатогӣ иттилоъ диҳед:"
-"<br>%2</p></qt>"
+"<qt><p>Хатогӣ: модули хати рамз ягон маълумоти рамзгузошташударо "
+"барнагардонд.</p><p>Оиди ин хатогӣ иттилоъ диҳед:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 "<qr>На тамоми аломатҳо ба рамзгузории интихобшуда тааллуқ доранд."
-"<br>"
-"<br>Иттилоотро чӣ тавре ҳаст бифиристам?</qt>"
+"<br><br>Иттилоотро чӣ тавре ҳаст бифиристам?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Баъзе аломатҳо метавонанд нест шаванд"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Ҳузфи аломатҳо"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Тағйири рамзгузорӣ"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Ин мактубча наметавонад имзо карда шавад то он вақте ки модули интихобшуда "
 "маълум нашавад, ки имзокуниро дастгирӣ мекунад; ин дар ҳақиқат на бояд рӯй "
 "диҳад, марҳамат карда ин хатогии техникиро  гузориш диҳед."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
@@ -11457,33 +11323,34 @@ msgstr ""
 "маълум нашавад, ки имзокуниро дастгирӣ мекунад; ин дар ҳақиқат на бояд рӯй "
 "диҳад, марҳамат карда ин хатогии техникиро  гузориш диҳед."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 "Ин иттилоотро рамзгузорӣ кардан имконпазир нест чунки модули интихобшуда, "
 "рамзгузориро пуштибонӣ намекунад."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Ин иттилоотро рамзгузорӣ кардан имконпазир нест чунки модули интихобшуда, "
 "имзоот ва рамзгузориро пуштибонӣ намекунад."
@@ -11509,10 +11376,10 @@ msgstr "Формати &қуттии хатнависӣ:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -11523,8 +11390,8 @@ msgstr "&Папка дорои:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -11549,8 +11416,8 @@ msgstr "Мавзӯъ ишора нашудааст"
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
-"<qt>Қодир ба эҷод кардани папкаи <b>%1</b> нестам. Чунин папка аллакай мавҷуд "
-"аст.</qt>"
+"<qt>Қодир ба эҷод кардани папкаи <b>%1</b> нестам. Чунин папка аллакай "
+"мавҷуд аст.</qt>"
 
 #: newfolderdialog.cpp:222
 #, fuzzy
@@ -11569,8 +11436,7 @@ msgstr "Натиҷаҳои гуногун барои имзо"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Барномаи рамзгузорӣ маълумоти озмоиширо барнагардонд."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Вазъият: "
 
@@ -11599,8 +11465,8 @@ msgstr "Модули %1 ёфт нашуд."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "Наметавонам ҳақиқияти имзоотро муайян кунам. <br />Сабаб: %1"
 
 #: objecttreeparser.cpp:737
@@ -11638,27 +11504,27 @@ msgstr "Модули рамзгузории %1 иттилоотҳорорамз�
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Эзоҳот:</b> Ин иттилоот дар форматиHTML аст. Аз рӯи андешаи амният, коди "
-"иттилоот ба намуди матнӣ тасвир шуда истодааст. Агар шумо ба фиристонандаи ин "
-"иттилоот бовар кунед, метавонед тасвироти HTML-ро бо пахши <a "
-"href=\"kmail:showHTML\">инҷо, фаъол созед</a>."
+"иттилоот ба намуди матнӣ тасвир шуда истодааст. Агар шумо ба фиристонандаи "
+"ин иттилоот бовар кунед, метавонед тасвироти HTML-ро бо пахши <a href="
+"\"kmail:showHTML\">инҷо, фаъол созед</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Эзоҳот:</b> Ин иттилоот дар форматиHTML аст. Аз рӯи андешаи амният, коди "
-"иттилоот ба намуди матнӣ тасвир шуда истодааст. Агар шумо ба фиристонандаи ин "
-"иттилоот бовар кунед, метавонед тасвироти HTML-ро бо пахши <a "
-"href=\"kmail:showHTML\">инҷо, фаъол созед</a>."
+"иттилоот ба намуди матнӣ тасвир шуда истодааст. Агар шумо ба фиристонандаи "
+"ин иттилоот бовар кунед, метавонед тасвироти HTML-ро бо пахши <a href="
+"\"kmail:showHTML\">инҷо, фаъол созед</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11846,7 +11712,8 @@ msgstr "Дастрас нест"
 #, fuzzy, c-format
 msgid "Error Retrieving Audit Log: %1"
 msgstr ""
-"Бозёби кардани хатоги,ба даст овардани руйхати танзим мекарда (ACL) аз сервер\n"
+"Бозёби кардани хатоги,ба даст овардани руйхати танзим мекарда (ACL) аз "
+"сервер\n"
 "%1"
 
 #: objecttreeparser.cpp:2320
@@ -11903,7 +11770,8 @@ msgstr "Огоҳӣ:"
 #: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
-"Адреси фиристонанда дар %1, ки барои имзоот истифода мешавад, ишора нашудааст."
+"Адреси фиристонанда дар %1, ки барои имзоот истифода мешавад, ишора "
+"нашудааст."
 
 #: objecttreeparser.cpp:2491
 msgid "sender: "
@@ -11915,11 +11783,11 @@ msgstr "захира шудааст: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"Адрес дар %1, ки барои имзо истифода мешавад, ишора нашудааст, бо чунин тариқ "
-"муқоисакунӣ бо адреси фиристонандаи %2 имконпазир нест."
+"Адрес дар %1, ки барои имзо истифода мешавад, ишора нашудааст, бо чунин "
+"тариқ муқоисакунӣ бо адреси фиристонандаи %2 имконпазир нест."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -12035,14 +11903,15 @@ msgstr "Маълумот оиди хатогии Kioslave"
 #: popaccount.cpp:495
 #, fuzzy
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 "Сервери почтавии POP3-и шумо, дастури UIDL-ро пуштибонӣ намекунад. Ин барои "
-"саҳеҳтар муайян намудан, ки кадом аз иттилоот дар сервер аллакай фаровир карда "
-"шудааст, лозим аст.\n"
+"саҳеҳтар муайян намудан, ки кадом аз иттилоот дар сервер аллакай фаровир "
+"карда шудааст, лозим аст.\n"
 "Дар натиҷаи ин имконоти монондани почта дар сервер, саҳеҳ амал нахоҳад кард."
 
 #: popaccount.cpp:752
@@ -12064,7 +11933,8 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Қабул намудани иттилооти %1 аз %2 (%3 аз %4 КБ) аз %5 (ҳамагӣ %6 КБ дар "
 "сервер)."
@@ -12084,1813 +11954,14 @@ msgstr "Хатогӣ дар ҷавоби сервер"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Сервери шумо дастури TOP-ро пуштибонӣ намекунад. Барои ҳамин фаровири танҳо "
 "аввали унвоноти иттилоотҳои калон, имконпазир нест."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Гузаштан"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "П&апка"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Иттилоот"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Фиристониш"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Панели HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Имзо"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "&Ба тарзи худкор имзо кардани иттилоот"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Агар ин параметр фаъол бошад, ин маврид тамоми иттилоотҳои фиристодашаванда "
-"пешфарзӣ имзо карда мешаванд. Ҳангоми хоҳиш, метавонед имзои иттилооти ҷудоро "
-"ғайрифаъол созед."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Рамзгузорӣ"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Вақте ки ин вариант имконият дорад, ин мактубча/файл на танҳо  бо калиди умумии "
-"қабулгар, балки бо калиди шумо навишта мешавад.  Ин ба шумо имконият медиҳад, "
-"ки баъдтар мактубча/файл-ро ошкор созед. Ин умуман фикри хубест."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Намоиши матни рамзгузошташуда/им&зошуда"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Натиҷаи рамзгузорӣ ва имзоиш дар тирезаи ҷудо пеш аз фиристодани иттилоот "
-"тасвир мешавад. Ҳамин тавр агар иттилоотро рамзгузорӣ карда нашавад, метавонед "
-"фиристонишро барҳам диҳед."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Иттилоотҳои фиристодашударо ба тарзи &рамзгузошташуда захира кардан"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Иттилоотро ба намуди рамзгузошташуда барои захира кардан ишора кунед"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Иттилоотро ба намуди рамзгузошташуда захира кардан</h1>\n"
-"Агар ин параметр танзим шуда бошад,иттилоотҳои фиристодашуда ба намуди "
-"рамзгузошташуда (мисли онки онҳо фиристода шуда буданд) захира мешаванд. Ин "
-"тавсия намешавад, чанде шумо иттилоотҳои фиристодашударо баъди гузаштани "
-"мӯҳлати амали сертификат хонда наметавонед.\n"
-"<p>\n"
-"Ба ин нигоҳ накарда, дастурҳои маҳаллӣ метавонанд талаб кунанд, ки ин параметр "
-"танзим шуда бошад. Аз мудири системаи худ маслиҳат бипурсед.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "До&им калиди рамзгузориро барои тасдиқот нишон додан"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Вақте ки ба ин вариант имконият дода мешавад ин барнома ҳамеша рӯйхати калидҳои "
-"ҷамъиятиро ба шумо нишон медиҳад, ки аз он якеро метавонед барои навиштаҷот "
-"истифода баред  Агар вай тамом шавад, барнома фақат муколамаро нишон хоҳад дод, "
-"агар вай калиди дурустро ёфта натавонад ё якчандтое ҳастанд,ки метавонанд "
-"истифода бурда шаванд."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-"Агар ин имконпазир бошад, иттилоотро ба таври худкор &рамзгузорӣ кардан"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Агар параметри зерин фаъол бошад, дар ин сурат тамоми иттилоотҳое, ки бо шумо "
-"фиристода мешаванд, рамзгузорӣ (ҳангоми шарте, ки рамзгузорӣ дастрас ва танзим "
-"шудааст) мешавад. Ҳангоми Ҳангоми хоҳиш метавонед рамзгузории иттилооти ҷудоро "
-"ғайрифаъол созед."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Ҳеҷгоҳ &мусаввадаро имзо/рамзгузорӣ накардан"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Қабулкунанда: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Умумӣ"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Адреси бозгашт"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Ба ҳама &ҷавоб додан..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Фиристониш"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Ивваз кардан"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Хосиятҳои папка"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Папка дорои &рӯйхати фиристониш мебошад"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Адреси почтавии рӯйхати фиристониш:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Оддӣ:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Хонданашуда:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Мӯҳлати амали сертификат"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Хориҷ кардан &баъди:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Хориҷ кардан аз &иттилоотҳои хондашуда"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Хориҷ кардан &баъди:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Хориҷ кардан аз &иттилоотҳои хонданашуда"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Рӯз"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Ҳафта"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Моҳ"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Иловагӣ"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Ихтисоси &фиристонанда:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Формати захиракунӣ:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Намоиши рӯйхатҳо:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Озмоиши сертификатҳо бо ёрии рӯйхати CRL"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Агар ин вариант интихоб шуда бошад, сертификатҳои S/MIME қудрати истифодаи "
-"Рӯйхати Сертификати Қатъшударо (CRLs)-ро дорад."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Озмоиши сертификатҳои онлайн (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Агар ин вариант интихоб шуда бошад,сертификатҳои S/MIME қудрати истифодабарии "
-"OCSP-ро доранд. URL-и OCSP-ро, ки дар поён дода шудааст пур кунед."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Озмоиши сертификат"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "URL-и ҷавобгари OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Ба инҷо суроғаи серверро барои тасдиқи ғайрихудмухтори шаҳодатномаҳо(OCSP "
-"уҳдадор)дохил шавад.URL ҳарвақта бо http:// сар мешавад."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Имзои ҷавобгари OCSP:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Барои сертификатҳои решагӣ:"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Дастури сертификатҳоро наозмоидан"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Аз рӯи пешфарзӣ GnuPG, файли ~/.gnupg/policies.txt-ро барои он, ки дастури "
-"сертификат иҷоза шудааст, истифода мекунад."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Истифода набурдани CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Ҳангоми озмоиши сертификатҳои S/MIME, истифода набурдани рӯйхати сертификатҳои "
-"(Certificate Revocation Lists) лағв кардашуда."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Пурбор кардани сертификатҳои ғоиббудаи паҳнкунандаҳо"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Агар ин вариант тафтиш карда шуда бошад, сертификатҳои партофташуда дар вақти "
-"зарурӣ пайдо карда мешаванд. (ин ҷавоб барои ҳарду методҳои тасдиқшуда,CRLs ва "
-"OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, fuzzy, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Барои сертификатҳои решагӣ:"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Барои сертификатҳои решагӣ:"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Афзудан..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "&Кори муштарак"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Барқарор кардани танзимотҳои стандартии ҳуруфот"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "мавҷуд нест"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Параметрҳои имзо"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Ҷавоби фиристанда:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Ба ҳама &ҷавоб додан..."
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Иттилооти фиристодашуда"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "&Хабардор кардан ҳангоми сайъи фиристодани иттилооти имзонашуда"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Барои хурӯҷи огоҳӣ оиди фиристодани иттилооти имзонашуда, инро сабт кунед."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Огоҳонидан ҳангоми сайъи фиристодани иттилоотҳои имзонашуда</h1>\n"
-"Агар ин параметр сабт шуда бошад, ҳангоми сайъи фиристодани иттилоотҳои "
-"имзонашуда ё қисмҳои иттилоот, огоҳӣ хурӯҷ мешавад.\n"
-"<p>\n"
-"Барои комилии максимум, ин параметрро фаъол мондан тавсия мешавад.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "&Ҳангоми фиристодани иттилоотҳои рамзгузошта нашуда, огоҳӣ кардан"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "Намоиши огоҳӣ ҳангоми фиристодани иттилоотҳои рамзгузошта нашуда."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Ҳангоми сайъи фиристодани иттилоотҳои рамзгузошта нашуда, огоҳӣ кардан</h1>"
-"\n"
-"Агар ин параметр сабт шуда бошад, шумо оиди сайъи фиристодани иттилоот ё қисми "
-"он\n"
-"ба намуди рамзгузошташуда низ хабардор карда мешавед.\n"
-"<p>\n"
-"Барои бутунии максималӣ, ин параметрро фаъол сохтан тавсия карда мешавад.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Огоҳонидан, агар &нишони қабулкунандаҳо дар сертификат мавҷуд нест"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Огоҳӣ кардан, агар адрес дар сертификат ҳозир нест"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Огоҳонидан, агар дар сертификат нишони қабулкунанда мавҷуд нест</h1>\n"
-"Агар ин параметр сабт шуда бошад, мавриди нишони қабулкунанда дар сертификати\n"
-"барои имзо истифодашаванда мавҷуд набошад, огоҳнома хурӯҷ мешавад.\n"
-"<p>\n"
-"Барои амнияти ниҳоят баланд, ин параметрро фаъол сохтан\n"
-"тавсия мешавад.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "Огоҳонидан оиди зуд гузаштани мӯҳлати амали сертификатҳо/калидҳо"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Барои имзо"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Барои рамзгузорӣ"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " рӯз"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Мақодири рӯзро ишора кунед"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Огоҳонидан оиди гузаштани мӯҳлати амали сертификати имзо</h1>\n"
-"Мақодири рӯзро то хотима ёфтани мӯҳлати амали сертификат, ки дар он муддат бояд "
-"огоҳӣ хурӯҷ шавад, ишора кунед.\n"
-"<p>\n"
-"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Огоҳонидан, агар мӯҳлати амали сертификати рамзгузорӣ гузашта истодааст</h1>"
-"\n"
-"Мақодири рӯзи камро, ки дар он сертификат ғайри хурӯҷи огоҳӣ ҳақиқӣ мешавад, "
-"сабт кунед.\n"
-"<p>\n"
-"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Агар мӯҳлати амали сертификат дар силсила гузашта истода бошад, огоҳӣ "
-"кардан</h1>\n"
-"Мақодири рӯзи минималиро, ки дар мӯҳлати он тамоми сертификатҳо бояд ғайри "
-"хурӯҷиогоҳӣ ҳақиқӣ шаванд, интихоб кунед.\n"
-"<p>\n"
-"Параметри тавсияшаванда SPHINX 14 рӯз аст.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Огоҳонидан оиди гузаштани мӯҳлати амали сертификати СА</h1>\n"
-"Мақодири рӯзро то хотима ёфтани мӯҳлати амали сертификати СА, ки дар он муддат "
-"бояд огоҳӣ хурӯҷ шавад, ишора кунед.\n"
-"<p>\n"
-"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Огоҳонидан оиди гузаштани мӯҳлати амали сертификати решавӣ</h1>\n"
-"Мақодири рӯзро то хотима ёфтани мӯҳлати амали сертификати решавӣ, ки дар он "
-"муддат бояд огоҳӣ хурӯҷ шавад, ишора кунед.\n"
-"<p>\n"
-"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Барои сертификатҳои решагӣ:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Барои бевосита сертификатҳои СА:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Барои сертификатҳои/калидҳои истифодашаванда:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, fuzzy, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Фаъол сохтани тамоми огоҳиҳои ғайрифаъол сохташуда"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Папка дорои:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Ивваз кардан"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Ивваз кардан"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Ҳангоми озмоиши почта, иттилоотҳоро аз катор фиристодан"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt> "
-"<p>Интихоб кунед, оё шумо мехоҳед,ки  KMail ҳамаи мактубҳоро фиристад ё ин ки "
-"шумо намехоҳед, ки мактубҳо тамоман ба таври автоматикӣ фиристонда шаванд."
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-"Аксарияти пӯшаҳои бори охирин интихобшуда дар пӯшаи муколламаи интихобӣ "
-"мебошанд."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Ишора дар новаи системавӣ"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Маълумоти муфассал оиди расидани почта"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Агар ин вариант имкон дошта бошад, сипас барои ҳар як пӯша рақами нави "
-"гирифташуда дар огоҳиномаи нави почта нишон дода мешавад;дар дигар ҳолат шумо "
-"мактуби оддии 'New mail arrived' мегиред."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "&Муҳаррир:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Ба ҷои муҳаррири &сохташуда, зоҳириро истифода бурдан"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "Фаъол сохтани амали муштарак"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Вайрон кардани унвоноти From:/To: аз ҷавоб ба ҷавоб (барои Outlook)"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook мақодири беҳад зиёд норасоӣ дорад, аз ҷумла стандарти "
-"iCalendar; ин интихобот сайъи ислоҳ кардани яке аз онҳоро аз тарафи худ карда "
-"истодааст. Агар ба шумо воҷиб ояд, ки бо корвандони Outlook хатнависӣ кунед ва "
-"онҳо натавонанд даъвати шуморо қабул кунанд, онро фаъол созед."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Фиристодани даъватот дар тани иттилоот"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-";Microsoft Outlook мақодири беҳад зиёд норасоӣ дорад,аз ҷумла стандарти "
-"iCalendar; ин интихобот сайъи ислоҳ кардани яке аз онҳоро аз тарафи худ карда "
-"истодааст. Агар ба шумо воҷиб ояд, ки бо корвандони Outlook хатнависӣ кунед ва "
-"онҳо натавонанд даъвати шуморо қабул кунанд, онро фаъол созед."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Худмуайяноти рӯйхати фиристониш"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Ин имкониятдиҳӣ ба нигоҳ доштани сабтҳо аз барномаҳои Kontact (KOrganiser, "
-"KAaddressBook, ва KNotes.)</p> </p> Агар хоҳед,ки ин вариантро барқарор кунед "
-"шумо бояд инчунин барои истифодаи сарчашмаҳои IMAP барномаҳоро барқарор кунед; "
-"ин дар Trinity Control Center. иҷро карда шудааст </p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Ҳарвақта шумо наметавонед ягон баҳона барои дидани папкаҳо,ки манбаъи IMAP "
-"нигоҳ медорад бинед.Вале агар шумо ба дидани он муҳтоҷ бошед шумо метавонед "
-"онро дар ин ҷо гузоред.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Ин сарчашмаи пӯшаҳои IMAP-ро интихоб мекунад</p>"
-"<p>Дар ҳолати иҷро накардан, сервери Колаб қуттии дарунаи IMAP-ро сарчашма "
-"таъин мекунад. </p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-"<p>Ин ID мустаҳкам кардани манбаъи папкаҳои IMAP -и қуттии хатнависи.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Агар шумо хоҳед,ки номҳои пӯшаҳои IMAP-нигаҳбонро ба забони модариатон "
-"гардонед,метавонед дар мобайни инҳо забонҳои ба шумо дастрасро интихоб "
-"кунед.</p> "
-"<p> Илтимос дар хотир гиред,ки сабаби ягонаи ин корро иҷро кардан мутобиқат "
-"кардан бо Microsoft Outlook мебошад.То он вақте ки вай иваз кардани забонҳоро "
-"ғайриимкон месозад,муайян кардани ин фикри хуб нест. </p>"
-"То он вақте ки лозим нашудааст, муайян накунед.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Ин арзиш барои қарор додан,ки кадоме аз ин ду KMail гузнриш мумкин,ки намоиш "
-"дода шуда шавад."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Воҳиди зиёди пайвасткунӣ бо як сервер"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Ин барои кам кардани миқдори шиносҳо барои хӯҷаин дар вақти тафтиши почтаи нав  "
-"истифода бурда мешавад.Дар ҳолати иҷро накардан миқдори шиносҳо камкарда "
-"намешавад."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Намоиши заминаи ҷустуҷӯи тез"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, fuzzy, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Ин вариант ба ҷустуҷӯи сатри чопи рӯйхати мактуб, ки барои ба зудӣ кофтани "
-"итилооти нишододашуда дар рӯйхати мактуб истифода бурда мешавад имконият "
-"медиҳад ё ин ки имконият намедиҳад."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"&Нигоҳ доштани рамзоти иттилоот ҳангоми ҷавоб додан ё фиристониш (агар ин "
-"имконпазир бошад)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Ба тарзи худкор афзидани имзоот"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, fuzzy, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ин шахсиятро дар хотир доред,ки он метавонад дар оянда дар тирезаи "
-"тартибдиҳанда истифода бурда шавад."
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ин папкаро барои равон кардани қаламҳо дар хотир доред,ки он метавонад дар "
-"оянда дар тирезаи тартибдиҳанда истифода бурда шавад."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Ин почтаикучонданро дар хотир доред, ки он метавонад дар оянда дар тирезаи "
-"тартибдиҳанда истифода бурда шавад."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Ин шахсиятро дар хотир доред,ки он метавонад дар оянда дар тирезаи "
-"тартибдиҳанда истифода бурда шавад."
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Гузаронидани сатр ба сутуни:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Огоҳонидан &оиди гузаштани мӯҳлати амали сертификати решавӣ кам аз"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, fuzzy, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Ин тартиботро барои онки Outlook(tm) номҳои замимотро, ки дорои аломатҳои "
-"кириллӣ мебошад, бифаҳмад фаъол созед"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "Пурсиши ахборот оиди &коркарди иттилоот"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Инро барои пурсиши маълумот оиди коркарди иттилоот (Message Disposition "
-"Notification, MDN) бо ҳар як иттилооти фиристодашуда, фаъол созед.</p>"
-"<p>Барои тағйир додани ин аҳамияти пешфарзӣ, пункти менюи <em>Танзимот</em>->"
-"&gt;<em>Хабардиҳӣ оиди коркарди иттилоот</em>-ро интихоб кунед.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Фосилаи худнигоҳдорӣ:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Нусхаи захираи текст дар тирезаи эҷодкор ҳамавақт сохта мешавад. Интервал "
-"истифода бурда мешавад барои сохтани нусхаи захирави барқарор кардан дар ин ҷо. "
-"Шумо метавонед аз кор бароред ауто-хотиргузориро ӯро мондан ба қиммати 0."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Тағйир додани &префикси шинохташуда ба \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Тағйири префикси шинохташуда ба \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Аз паи иқтибосоварӣ мушоҳида кардан"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Имзо таъхир карда шудааст."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Воҳиди зиёди пайвасткунӣ бо як сервер"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"&Нигоҳ доштани рамзоти иттилоот ҳангоми ҷавоб додан ё фиристониш (агар ин "
-"имконпазир бошад)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Иттилоотҳои фиристодашударо ба тарзи &рамзгузошташуда захира кардан"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Намоиши тамоми унвонот"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Маълумот оиди коркарди иттилоот"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Рӯйхати иттилоот - заминаи сана"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "&Афзудани ишоротҳои иқтибосот"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -14013,6 +12084,11 @@ msgstr "Афзудани қуттии хатфиристӣ"
 msgid "Add as BCC"
 msgstr "Афзудани қуттии хатфиристӣ"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Барҳам додан"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14030,10 +12106,10 @@ msgstr "Қабулкунандаҳои пинҳонӣ"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -14051,8 +12127,8 @@ msgstr ""
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -14156,10 +12232,19 @@ msgstr "калон ё баробар"
 msgid " bytes"
 msgstr " байт"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " рӯз"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -14315,13 +12400,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -14339,8 +12422,7 @@ msgid ""
 msgstr "Навъи қуттии хатнависӣ: IMAP"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -14358,8 +12440,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -14368,8 +12449,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Филтрҳои дастрас"
 
 #: sievedebugdialog.cpp:358
@@ -14442,12 +12522,12 @@ msgstr "Ин файлро барои дохил кардани довари им
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Истифода бурдани ин хоҳиш дар назар доштани тексти файл,ки имзои шуморо дар бар "
-"мегирад.Ин метавонад ҳар вақт эҷод кардан почтаи нав ё имзои илова кардаро "
-"хонад."
+"Истифода бурдани ин хоҳиш дар назар доштани тексти файл,ки имзои шуморо дар "
+"бар мегирад.Ин метавонад ҳар вақт эҷод кардан почтаи нав ё имзои илова "
+"кардаро хонад."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14463,22 +12543,27 @@ msgstr "Кушодани файл дар муҳаррири матнӣ."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Шумо метавонед коммандаи ихтиёриро дар ин ҷо илова кунед,ё бо ё бе роҳи "
-"вобасташуда ба ҳар ҳол комманда дар роҳи шумост.Барои ҳар як почтаи нав KMail "
-"коммандаро иҷро хоҳад кард ва ҳосили вайро  ҳамчун имзо истифода мебарад. "
-"Коммандаҳои оддӣ барои истифода бо ин механизм \"Хушбахтӣ\" ё \"ksig "
-"-тасодуфӣ\" мебошанд."
+"вобасташуда ба ҳар ҳол комманда дар роҳи шумост.Барои ҳар як почтаи нав "
+"KMail коммандаро иҷро хоҳад кард ва ҳосили вайро  ҳамчун имзо истифода "
+"мебарад. Коммандаҳои оддӣ барои истифода бо ин механизм \"Хушбахтӣ\" ё "
+"\"ksig -тасодуфӣ\" мебошанд."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Дастур:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Қайди нав:"
@@ -14515,6 +12600,11 @@ msgstr "Афзудани қуттии хатфиристӣ"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Оё ҳақиқатан мехоҳед профили <b>%1</b>-ро ҳузф кунед?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Истифода намудан &барои:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14529,6 +12619,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Тағйир кардан..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -14568,9 +12662,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14609,6 +12703,16 @@ msgstr ""
 "Наметавонам файли \"%1\"-ро боз кунам:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Қабулкунанда: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14644,36 +12748,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14908,6 +13008,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -14944,117 +13048,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...ки метавонед аз рӯи рӯйхати иттилоот бо ёрии нишондодҳои ба рост ва ба "
-"чап гузаред?</p>\n"
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"\n"
-"<p>...ки метавон филтрҳоро аз рӯи қабулкунанда, фиристонанда,\n"
-"мавзӯъ ва рӯйхати фиристониш бо ёрии <em>Хизматгузорӣ->Эҷод&nbsp;филтр</em>"
-"эҷод кард?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ки метавон аз &quot;[номи рӯйхати фиристониш]&quot; раҳо шавем, ки\n"
-"ба мавзӯи баъзе рӯйхатҳои фиристониш бо истифодаи\n"
-"филтри <em>rewrite header</em>, илова кард? Танҳо\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[номи рӯйхати фиристониш\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>-ро истифода кунед\n"
-"</p>\n"
-
-#: tips.cpp:26
-#, fuzzy
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...ки мумкин аст рӯйхатҳои ба ҳар тараф фиристодашавандаро бо папкаҳо дар "
-"мусоҳибаи <em>Папка-&gt;Хусусият...</em> фикран монанд кунем? Баъд аз ин "
-"метавон аз менюи<em>Иттилоот-&gt;Равона кардан&nbsp;ба&nbsp;рӯйхати&nbsp; "
-"фиристониш... </em>,\n"
-"барои кушодани муҳаррир бо нишони рӯйхати фиристониш, истифода кард.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...ки мумкин аст ишораҳои худро дар ҳар папка муқаррар кард?\n"
-"Ба <em>Папка-&gt;Хусусият</em> нигаред</p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...ки KMail метавонад хати рангиро, ки ба намуди иттилооти ҷорӣ (Plain "
-"text/HTML/OpenPGP) мутобиқ аст, нишон диҳад?</p>\n"
-"<p>Вақте ки почтаи HTML ба формати навиштаҷотҳои KMail пардапӯш мешавад, ин "
-"ҳаргуна кӯшишҳои қалбакӣ кардани санҷишҳои имзои муваффақиро хароб "
-"мегардонад.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...ки метавон тамоми унвонотро фақат бо вориди номи унвонот дар заминаи "
-"ибтидоии дастури ҷустуҷӯӣ софӣ кард?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...ки метавон иттилоотро дар HTML-и тоза бо ёрии қоидаи \n"
-"<pre>&quot;Content-type&quot;, ки дорои &quot;text/html&quot;аст, соф "
-"кард?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...ки дар вақти ҷавоб фақат қисми ҷудокардашудаи иттилоот иқтибос оварда "
-"мешавад?</p>\n"
-"<p>Агар ягон чиз ҷудо кардашуда набошад, тамоми иттилоот иқтибос карда "
-"мешавад.</p>\n"
-"<p>Агар шумо\n"
-"<em>Намуд-&gt;Замима-&gt;Дар матн</em>-ро фаъол сохта бошед, ин ҳамчунин амал "
-"хоҳад кард.</p>\n"
-"<p align=\"right\"><em>David F. Newman равона кард</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Амалиёт барои барҳамдиҳӣ, мавҷуд нест."
@@ -15108,7 +13101,8 @@ msgstr ""
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
-"Мудири сертификатҳоро ба кор андохта нашуд. Дурустии гузориши барномаро санҷед."
+"Мудири сертификатҳоро ба кор андохта нашуд. Дурустии гузориши барномаро "
+"санҷед."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -15123,6 +13117,17 @@ msgstr "Замима #%1 (бе ном)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Файл бо номи %1 аллакай мавҷуд аст. Оё мехоҳед онро тағйир диҳед?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "Тағйир додан"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15240,9 +13245,9 @@ msgstr "Ҳузфи иттилоот"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -15275,9 +13280,9 @@ msgstr "Ҳузфи феҳрист"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -15287,15 +13292,15 @@ msgstr "Ба китоби адресӣ илова кардан"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -15305,8 +13310,8 @@ msgstr "Ин файлро барои дохил кардани довари им
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -15323,145 +13328,1719 @@ msgstr "&Имзоот"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Имзо"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "&Ба тарзи худкор имзо кардани иттилоот"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
+"Агар ин параметр фаъол бошад, ин маврид тамоми иттилоотҳои фиристодашаванда "
+"пешфарзӣ имзо карда мешаванд. Ҳангоми хоҳиш, метавонед имзои иттилооти "
+"ҷудоро ғайрифаъол созед."
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Рамзгузорӣ"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Мавзӯи маълумотро ишора кунед"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Вақте ки ин вариант имконият дорад, ин мактубча/файл на танҳо  бо калиди "
+"умумии қабулгар, балки бо калиди шумо навишта мешавад.  Ин ба шумо имконият "
+"медиҳад, ки баъдтар мактубча/файл-ро ошкор созед. Ин умуман фикри хубест."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Фиристодани CC: ба 'address'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Намоиши матни рамзгузошташуда/им&зошуда"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Фиристодани BCC: ба 'address'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Натиҷаи рамзгузорӣ ва имзоиш дар тирезаи ҷудо пеш аз фиристодани иттилоот "
+"тасвир мешавад. Ҳамин тавр агар иттилоотро рамзгузорӣ карда нашавад, "
+"метавонед фиристонишро барҳам диҳед."
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Афзудани 'header' ба иттилооти"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Иттилоотҳои фиристодашударо ба тарзи &рамзгузошташуда захира кардан"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Тани иттилоотро аз 'file' хондан"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Иттилоотро ба намуди рамзгузошташуда барои захира кардан ишора кунед"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Танзими тани иттилоот"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Иттилоотро ба намуди рамзгузошташуда захира кардан</h1>\n"
+"Агар ин параметр танзим шуда бошад,иттилоотҳои фиристодашуда ба намуди "
+"рамзгузошташуда (мисли онки онҳо фиристода шуда буданд) захира мешаванд. Ин "
+"тавсия намешавад, чанде шумо иттилоотҳои фиристодашударо баъди гузаштани "
+"мӯҳлати амали сертификат хонда наметавонед.\n"
+"<p>\n"
+"Ба ин нигоҳ накарда, дастурҳои маҳаллӣ метавонанд талаб кунанд, ки ин "
+"параметр танзим шуда бошад. Аз мудири системаи худ маслиҳат бипурсед.\n"
+"</qt>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Афзудани як ё якчанд замимот ба иттилоот"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "До&им калиди рамзгузориро барои тасдиқот нишон додан"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Танҳо озмоиши ҳозир будани иттилооти нав"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Вақте ки ба ин вариант имконият дода мешавад ин барнома ҳамеша рӯйхати "
+"калидҳои ҷамъиятиро ба шумо нишон медиҳад, ки аз он якеро метавонед барои "
+"навиштаҷот истифода баред  Агар вай тамом шавад, барнома фақат муколамаро "
+"нишон хоҳад дод, агар вай калиди дурустро ёфта натавонад ё якчандтое ҳастанд,"
+"ки метавонанд истифода бурда шаванд."
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Танҳо тирезаи муҳаррирро кушодан"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr ""
+"Агар ин имконпазир бошад, иттилоотро ба таври худкор &рамзгузорӣ кардан"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "аз назар гузаронидани файл бо маълумотҳо"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Агар параметри зерин фаъол бошад, дар ин сурат тамоми иттилоотҳое, ки бо "
+"шумо фиристода мешаванд, рамзгузорӣ (ҳангоми шарте, ки рамзгузорӣ дастрас ва "
+"танзим шудааст) мешавад. Ҳангоми Ҳангоми хоҳиш метавонед рамзгузории "
+"иттилооти ҷудоро ғайрифаъол созед."
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Ҳеҷгоҳ &мусаввадаро имзо/рамзгузорӣ накардан"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
-"Фиристодани маълумот ба 'address' ва замима кардани файле, ки'URL' истинод "
-"мекунад"
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "Иҷро шуд."
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Умумӣ"
 
-#: kmsearchpattern.h:222
-#, fuzzy
-msgid "Old"
-msgstr "кӯҳна"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Адреси бозгашт"
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "ҳузфшуда"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Ба ҳама &ҷавоб додан..."
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
-msgstr "посух додашуда"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Фиристониш"
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
-msgstr "ирсол кардашуда"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr ""
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "&Навбат"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Ивваз кардан"
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "фиристодашуда"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Папка дорои:"
 
-#: kmsearchpattern.h:228
-#, fuzzy
-msgid "Watched"
-msgstr "мушоҳидашуда"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Ивваз кардан"
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "ба эътибор нагирифтан"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Ивваз кардан"
 
-#: kmsearchpattern.h:230
-#, fuzzy
-msgid "Spam"
-msgstr "спам"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Хосиятҳои папка"
 
-#: kmsearchpattern.h:231
-#, fuzzy
-msgid "Ham"
-msgstr "муфид"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Папка дорои &рӯйхати фиристониш мебошад"
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "Қабулкунанда: "
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Адреси почтавии рӯйхати фиристониш:"
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "бо замимот"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Оддӣ:"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Хонданашуда:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Мӯҳлати амали сертификат"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Хориҷ кардан &баъди:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Хориҷ кардан аз &иттилоотҳои хондашуда"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Хориҷ кардан &баъди:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Хориҷ кардан аз &иттилоотҳои хонданашуда"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Рӯз"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Ҳафта"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Моҳ"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Иловагӣ"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Ихтисоси &фиристонанда:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Формати захиракунӣ:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Намоиши рӯйхатҳо:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Ҳангоми озмоиши почта, иттилоотҳоро аз катор фиристодан"
+
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
+"<qt> <p>Интихоб кунед, оё шумо мехоҳед,ки  KMail ҳамаи мактубҳоро фиристад ё "
+"ин ки шумо намехоҳед, ки мактубҳо тамоман ба таври автоматикӣ фиристонда "
+"шаванд."
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+"Аксарияти пӯшаҳои бори охирин интихобшуда дар пӯшаи муколламаи интихобӣ "
+"мебошанд."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Ишора дар новаи системавӣ"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Маълумоти муфассал оиди расидани почта"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Агар ин вариант имкон дошта бошад, сипас барои ҳар як пӯша рақами нави "
+"гирифташуда дар огоҳиномаи нави почта нишон дода мешавад;дар дигар ҳолат "
+"шумо мактуби оддии 'New mail arrived' мегиред."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "&Муҳаррир:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Ба ҷои муҳаррири &сохташуда, зоҳириро истифода бурдан"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "Фаъол сохтани амали муштарак"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Вайрон кардани унвоноти From:/To: аз ҷавоб ба ҷавоб (барои Outlook)"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook мақодири беҳад зиёд норасоӣ дорад, аз ҷумла стандарти "
+"iCalendar; ин интихобот сайъи ислоҳ кардани яке аз онҳоро аз тарафи худ "
+"карда истодааст. Агар ба шумо воҷиб ояд, ки бо корвандони Outlook хатнависӣ "
+"кунед ва онҳо натавонанд даъвати шуморо қабул кунанд, онро фаъол созед."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Фиристодани даъватот дар тани иттилоот"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+";Microsoft Outlook мақодири беҳад зиёд норасоӣ дорад,аз ҷумла стандарти "
+"iCalendar; ин интихобот сайъи ислоҳ кардани яке аз онҳоро аз тарафи худ "
+"карда истодааст. Агар ба шумо воҷиб ояд, ки бо корвандони Outlook хатнависӣ "
+"кунед ва онҳо натавонанд даъвати шуморо қабул кунанд, онро фаъол созед."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Худмуайяноти рӯйхати фиристониш"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Ин имкониятдиҳӣ ба нигоҳ доштани сабтҳо аз барномаҳои Kontact "
+"(KOrganiser, KAaddressBook, ва KNotes.)</p> </p> Агар хоҳед,ки ин вариантро "
+"барқарор кунед шумо бояд инчунин барои истифодаи сарчашмаҳои IMAP "
+"барномаҳоро барқарор кунед; ин дар Trinity Control Center. иҷро карда "
+"шудааст </p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Ҳарвақта шумо наметавонед ягон баҳона барои дидани папкаҳо,ки манбаъи "
+"IMAP нигоҳ медорад бинед.Вале агар шумо ба дидани он муҳтоҷ бошед шумо "
+"метавонед онро дар ин ҷо гузоред.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Ин сарчашмаи пӯшаҳои IMAP-ро интихоб мекунад</p><p>Дар ҳолати иҷро "
+"накардан, сервери Колаб қуттии дарунаи IMAP-ро сарчашма таъин мекунад. </p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+"<p>Ин ID мустаҳкам кардани манбаъи папкаҳои IMAP -и қуттии хатнависи.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Агар шумо хоҳед,ки номҳои пӯшаҳои IMAP-нигаҳбонро ба забони модариатон "
+"гардонед,метавонед дар мобайни инҳо забонҳои ба шумо дастрасро интихоб кунед."
+"</p> <p> Илтимос дар хотир гиред,ки сабаби ягонаи ин корро иҷро кардан "
+"мутобиқат кардан бо Microsoft Outlook мебошад.То он вақте ки вай иваз "
+"кардани забонҳоро ғайриимкон месозад,муайян кардани ин фикри хуб нест. </"
+"p>То он вақте ки лозим нашудааст, муайян накунед.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Ин арзиш барои қарор додан,ки кадоме аз ин ду KMail гузнриш мумкин,ки намоиш "
+"дода шуда шавад."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Воҳиди зиёди пайвасткунӣ бо як сервер"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Ин барои кам кардани миқдори шиносҳо барои хӯҷаин дар вақти тафтиши почтаи "
+"нав  истифода бурда мешавад.Дар ҳолати иҷро накардан миқдори шиносҳо "
+"камкарда намешавад."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Намоиши заминаи ҷустуҷӯи тез"
+
+#: kmail.kcfg:309
+#, fuzzy, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Ин вариант ба ҷустуҷӯи сатри чопи рӯйхати мактуб, ки барои ба зудӣ кофтани "
+"итилооти нишододашуда дар рӯйхати мактуб истифода бурда мешавад имконият "
+"медиҳад ё ин ки имконият намедиҳад."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"&Нигоҳ доштани рамзоти иттилоот ҳангоми ҷавоб додан ё фиристониш (агар ин "
+"имконпазир бошад)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Ба тарзи худкор афзидани имзоот"
+
+#: kmail.kcfg:336
+#, fuzzy, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ин шахсиятро дар хотир доред,ки он метавонад дар оянда дар тирезаи "
+"тартибдиҳанда истифода бурда шавад."
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Ин папкаро барои равон кардани қаламҳо дар хотир доред,ки он метавонад дар "
+"оянда дар тирезаи тартибдиҳанда истифода бурда шавад."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Ин почтаикучонданро дар хотир доред, ки он метавонад дар оянда дар тирезаи "
+"тартибдиҳанда истифода бурда шавад."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Ин шахсиятро дар хотир доред,ки он метавонад дар оянда дар тирезаи "
+"тартибдиҳанда истифода бурда шавад."
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Гузаронидани сатр ба сутуни:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Огоҳонидан &оиди гузаштани мӯҳлати амали сертификати решавӣ кам аз"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, fuzzy, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Ин тартиботро барои онки Outlook(tm) номҳои замимотро, ки дорои аломатҳои "
+"кириллӣ мебошад, бифаҳмад фаъол созед"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "Пурсиши ахборот оиди &коркарди иттилоот"
+
+#: kmail.kcfg:417
+#, fuzzy, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Инро барои пурсиши маълумот оиди коркарди иттилоот (Message "
+"Disposition Notification, MDN) бо ҳар як иттилооти фиристодашуда, фаъол "
+"созед.</p><p>Барои тағйир додани ин аҳамияти пешфарзӣ, пункти менюи "
+"<em>Танзимот</em>->&gt;<em>Хабардиҳӣ оиди коркарди иттилоот</em>-ро интихоб "
+"кунед.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Фосилаи худнигоҳдорӣ:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Нусхаи захираи текст дар тирезаи эҷодкор ҳамавақт сохта мешавад. Интервал "
+"истифода бурда мешавад барои сохтани нусхаи захирави барқарор кардан дар ин "
+"ҷо. Шумо метавонед аз кор бароред ауто-хотиргузориро ӯро мондан ба қиммати 0."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Тағйир додани &префикси шинохташуда ба \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Тағйири префикси шинохташуда ба \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Аз паи иқтибосоварӣ мушоҳида кардан"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Имзо таъхир карда шудааст."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Воҳиди зиёди пайвасткунӣ бо як сервер"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"&Нигоҳ доштани рамзоти иттилоот ҳангоми ҷавоб додан ё фиристониш (агар ин "
+"имконпазир бошад)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Иттилоотҳои фиристодашударо ба тарзи &рамзгузошташуда захира кардан"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Намоиши тамоми унвонот"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, fuzzy, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Маълумот оиди коркарди иттилоот"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Рӯйхати иттилоот - заминаи сана"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "&Афзудани ишоротҳои иқтибосот"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Тағйири файл"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Тағйир кардан..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Гузаштан"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "П&апка"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Иттилоот"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Фиристониш"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Барқарор кардани танзимотҳои стандартии ҳуруфот"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Панели HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Параметрҳои умумӣ"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Панели HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Озмоиши сертификатҳо бо ёрии рӯйхати CRL"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Агар ин вариант интихоб шуда бошад, сертификатҳои S/MIME қудрати истифодаи "
+"Рӯйхати Сертификати Қатъшударо (CRLs)-ро дорад."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Озмоиши сертификатҳои онлайн (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Агар ин вариант интихоб шуда бошад,сертификатҳои S/MIME қудрати "
+"истифодабарии OCSP-ро доранд. URL-и OCSP-ро, ки дар поён дода шудааст пур "
+"кунед."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Озмоиши сертификат"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "URL-и ҷавобгари OCSP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Ба инҷо суроғаи серверро барои тасдиқи ғайрихудмухтори шаҳодатномаҳо(OCSP "
+"уҳдадор)дохил шавад.URL ҳарвақта бо http:// сар мешавад."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Имзои ҷавобгари OCSP:"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Барои сертификатҳои решагӣ:"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Дастури сертификатҳоро наозмоидан"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Аз рӯи пешфарзӣ GnuPG, файли ~/.gnupg/policies.txt-ро барои он, ки дастури "
+"сертификат иҷоза шудааст, истифода мекунад."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Истифода набурдани CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Ҳангоми озмоиши сертификатҳои S/MIME, истифода набурдани рӯйхати "
+"сертификатҳои (Certificate Revocation Lists) лағв кардашуда."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Пурбор кардани сертификатҳои ғоиббудаи паҳнкунандаҳо"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Агар ин вариант тафтиш карда шуда бошад, сертификатҳои партофташуда дар "
+"вақти зарурӣ пайдо карда мешаванд. (ин ҷавоб барои ҳарду методҳои тасдиқшуда,"
+"CRLs ва OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, fuzzy, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Барои сертификатҳои решагӣ:"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, fuzzy, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Барои сертификатҳои решагӣ:"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Афзудан..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "&Кори муштарак"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Барқарор кардани танзимотҳои стандартии ҳуруфот"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "мавҷуд нест"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Параметрҳои имзо"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Ҷавоби фиристанда:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Ба ҳама &ҷавоб додан..."
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Иттилооти фиристодашуда"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "&Хабардор кардан ҳангоми сайъи фиристодани иттилооти имзонашуда"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Барои хурӯҷи огоҳӣ оиди фиристодани иттилооти имзонашуда, инро сабт кунед."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Огоҳонидан ҳангоми сайъи фиристодани иттилоотҳои имзонашуда</h1>\n"
+"Агар ин параметр сабт шуда бошад, ҳангоми сайъи фиристодани иттилоотҳои "
+"имзонашуда ё қисмҳои иттилоот, огоҳӣ хурӯҷ мешавад.\n"
+"<p>\n"
+"Барои комилии максимум, ин параметрро фаъол мондан тавсия мешавад.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "&Ҳангоми фиристодани иттилоотҳои рамзгузошта нашуда, огоҳӣ кардан"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "Намоиши огоҳӣ ҳангоми фиристодани иттилоотҳои рамзгузошта нашуда."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Ҳангоми сайъи фиристодани иттилоотҳои рамзгузошта нашуда, огоҳӣ кардан</"
+"h1>\n"
+"Агар ин параметр сабт шуда бошад, шумо оиди сайъи фиристодани иттилоот ё "
+"қисми он\n"
+"ба намуди рамзгузошташуда низ хабардор карда мешавед.\n"
+"<p>\n"
+"Барои бутунии максималӣ, ин параметрро фаъол сохтан тавсия карда мешавад.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Огоҳонидан, агар &нишони қабулкунандаҳо дар сертификат мавҷуд нест"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Огоҳӣ кардан, агар адрес дар сертификат ҳозир нест"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Огоҳонидан, агар дар сертификат нишони қабулкунанда мавҷуд нест</h1>\n"
+"Агар ин параметр сабт шуда бошад, мавриди нишони қабулкунанда дар "
+"сертификати\n"
+"барои имзо истифодашаванда мавҷуд набошад, огоҳнома хурӯҷ мешавад.\n"
+"<p>\n"
+"Барои амнияти ниҳоят баланд, ин параметрро фаъол сохтан\n"
+"тавсия мешавад.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "Огоҳонидан оиди зуд гузаштани мӯҳлати амали сертификатҳо/калидҳо"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Барои имзо"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Барои рамзгузорӣ"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Мақодири рӯзро ишора кунед"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Огоҳонидан оиди гузаштани мӯҳлати амали сертификати имзо</h1>\n"
+"Мақодири рӯзро то хотима ёфтани мӯҳлати амали сертификат, ки дар он муддат "
+"бояд огоҳӣ хурӯҷ шавад, ишора кунед.\n"
+"<p>\n"
+"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Огоҳонидан, агар мӯҳлати амали сертификати рамзгузорӣ гузашта истодааст</"
+"h1>\n"
+"Мақодири рӯзи камро, ки дар он сертификат ғайри хурӯҷи огоҳӣ ҳақиқӣ мешавад, "
+"сабт кунед.\n"
+"<p>\n"
+"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Агар мӯҳлати амали сертификат дар силсила гузашта истода бошад, огоҳӣ "
+"кардан</h1>\n"
+"Мақодири рӯзи минималиро, ки дар мӯҳлати он тамоми сертификатҳо бояд ғайри "
+"хурӯҷиогоҳӣ ҳақиқӣ шаванд, интихоб кунед.\n"
+"<p>\n"
+"Параметри тавсияшаванда SPHINX 14 рӯз аст.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Огоҳонидан оиди гузаштани мӯҳлати амали сертификати СА</h1>\n"
+"Мақодири рӯзро то хотима ёфтани мӯҳлати амали сертификати СА, ки дар он "
+"муддат бояд огоҳӣ хурӯҷ шавад, ишора кунед.\n"
+"<p>\n"
+"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Огоҳонидан оиди гузаштани мӯҳлати амали сертификати решавӣ</h1>\n"
+"Мақодири рӯзро то хотима ёфтани мӯҳлати амали сертификати решавӣ, ки дар он "
+"муддат бояд огоҳӣ хурӯҷ шавад, ишора кунед.\n"
+"<p>\n"
+"Аҳамияти SPHINX-и тавсияшаванда - 14 рӯз аст.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Барои сертификатҳои решагӣ:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Барои бевосита сертификатҳои СА:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Барои сертификатҳои/калидҳои истифодашаванда:"
+
+#: warningconfiguration.ui:388
+#, fuzzy, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Фаъол сохтани тамоми огоҳиҳои ғайрифаъол сохташуда"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...ки метавонед аз рӯи рӯйхати иттилоот бо ёрии нишондодҳои ба рост ва ба "
+"чап гузаред?</p>\n"
+
+#: tips:10
 #, fuzzy
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Файл бо номи %1 аллакай мавҷуд аст. Оё мехоҳед онро тағйир диҳед?"
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"\n"
+"<p>...ки метавон филтрҳоро аз рӯи қабулкунанда, фиристонанда,\n"
+"мавзӯъ ва рӯйхати фиристониш бо ёрии <em>Хизматгузорӣ->Эҷод&nbsp;филтр</"
+"em>эҷод кард?</p>\n"
 
-#: util.h:210
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ки метавон аз &quot;[номи рӯйхати фиристониш]&quot; раҳо шавем, ки\n"
+"ба мавзӯи баъзе рӯйхатҳои фиристониш бо истифодаи\n"
+"филтри <em>rewrite header</em>, илова кард? Танҳо\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[номи рӯйхати фиристониш\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>-ро истифода кунед\n"
+"</p>\n"
+
+#: tips:29
 #, fuzzy
-msgid "Overwrite File?"
-msgstr "Тағйир додан"
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...ки мумкин аст рӯйхатҳои ба ҳар тараф фиристодашавандаро бо папкаҳо дар "
+"мусоҳибаи <em>Папка-&gt;Хусусият...</em> фикран монанд кунем? Баъд аз ин "
+"метавон аз менюи<em>Иттилоот-&gt;Равона кардан&nbsp;ба&nbsp;рӯйхати&nbsp; "
+"фиристониш... </em>,\n"
+"барои кушодани муҳаррир бо нишони рӯйхати фиристониш, истифода кард.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...ки мумкин аст ишораҳои худро дар ҳар папка муқаррар кард?\n"
+"Ба <em>Папка-&gt;Хусусият</em> нигаред</p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...ки KMail метавонад хати рангиро, ки ба намуди иттилооти ҷорӣ (Plain "
+"text/HTML/OpenPGP) мутобиқ аст, нишон диҳад?</p>\n"
+"<p>Вақте ки почтаи HTML ба формати навиштаҷотҳои KMail пардапӯш мешавад, ин "
+"ҳаргуна кӯшишҳои қалбакӣ кардани санҷишҳои имзои муваффақиро хароб "
+"мегардонад.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...ки метавон тамоми унвонотро фақат бо вориди номи унвонот дар заминаи "
+"ибтидоии дастури ҷустуҷӯӣ софӣ кард?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...ки метавон иттилоотро дар HTML-и тоза бо ёрии қоидаи \n"
+"<pre>&quot;Content-type&quot;, ки дорои &quot;text/html&quot;аст, соф кард?</"
+"pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...ки дар вақти ҷавоб фақат қисми ҷудокардашудаи иттилоот иқтибос оварда "
+"мешавад?</p>\n"
+"<p>Агар ягон чиз ҷудо кардашуда набошад, тамоми иттилоот иқтибос карда "
+"мешавад.</p>\n"
+"<p>Агар шумо\n"
+"<em>Намуд-&gt;Замима-&gt;Дар матн</em>-ро фаъол сохта бошед, ин ҳамчунин "
+"амал хоҳад кард.</p>\n"
+"<p align=\"right\"><em>David F. Newman равона кард</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -15540,27 +15119,34 @@ msgstr "Тағйир додан"
 #~ msgstr "&Алгоритми рамзгузорӣ:"
 
 #~ msgid "Store sent messages &encrypted"
-#~ msgstr "Иттилоотҳои фиристодашударо &ба монанди рамзгузошташуда захира кардан"
+#~ msgstr ""
+#~ "Иттилоотҳои фиристодашударо &ба монанди рамзгузошташуда захира кардан"
 
 #~ msgid "Encr&ypt all message parts"
 #~ msgstr "&Рамзгузории тамоми қисмҳои иттилоот"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Барои рамзгузории тамоми қисмҳои иттилоот ба таври пешфарзӣ инро пахш кунед"
+#~ msgstr ""
+#~ "Барои рамзгузории тамоми қисмҳои иттилоот ба таври пешфарзӣ инро пахш "
+#~ "кунед"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Рамзгузории тамоми қисмҳои иттилоот аз рӯ пешфарзӣ</h1>\n"
-#~ "Ҳангоми фаъол сохтани ин параметр, тамоми қисмҳои иттилоот рамзгузорӣ мешаванд.\n"
+#~ "Ҳангоми фаъол сохтани ин параметр, тамоми қисмҳои иттилоот рамзгузорӣ "
+#~ "мешаванд.\n"
 #~ "<p>\n"
-#~ "Албатта шумо метавонед параметрҳоро барои ҳар иттилоот ҷудо тағйир диҳед.\n"
+#~ "Албатта шумо метавонед параметрҳоро барои ҳар иттилоот ҷудо тағйир "
+#~ "диҳед.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -15572,12 +15158,17 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Пурсидан пеш аз рамзгузории ҳар қисми иттилоот.</h1>\n"
-#~ "Ҳангоми интихоб намудани ин интихобот, аз шумо лавозимоти рамзгузории ҳар қисми иттилооти ҷудо (ба монанди тани иттилоот ва замимот) пурсида мешавад. Дар ин маврид метавонед рамзгузориро барои қисмҳои ҷудои иттилоот сабт кунед.\n"
+#~ "Ҳангоми интихоб намудани ин интихобот, аз шумо лавозимоти рамзгузории ҳар "
+#~ "қисми иттилооти ҷудо (ба монанди тани иттилоот ва замимот) пурсида "
+#~ "мешавад. Дар ин маврид метавонед рамзгузориро барои қисмҳои ҷудои "
+#~ "иттилоот сабт кунед.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -15591,14 +15182,17 @@ msgstr "Тағйир додан"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Ғайри рамзгузории иттилоот</h1>\n"
-#~ "Ҳангоми интихоби ин интихобот, иттилоотҳои пешфарзӣ рамзгузорӣ карда намешаванд.\n"
+#~ "Ҳангоми интихоби ин интихобот, иттилоотҳои пешфарзӣ рамзгузорӣ карда "
+#~ "намешаванд.\n"
 #~ "<p>\n"
-#~ "Ин интихобот пешфарзӣ фаъол сохта шудааст ва шумо метавонед онро барои ҳар танзимоти инфиродӣ муайян кунед.\n"
+#~ "Ин интихобот пешфарзӣ фаъол сохта шудааст ва шумо метавонед онро барои "
+#~ "ҳар танзимоти инфиродӣ муайян кунед.\n"
 #~ "</qt>"
 
 #~ msgid "Triple-DES"
@@ -15610,18 +15204,33 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Алгоритми рамзгузорӣ</h1>\n"
-#~ "Алгоритм - ин дастур барои компютер аст, ки бо чӣ тарз компютер бояд вазифаи муайянро иҷро карданаш лозим аст, тасвир мекунад. Алгоритми рамзгузорӣ тасвир мекунад, ки чӣ тавр компютер бояд калиди қабулкунандаи иттилоотроба иттилоот, ки иттилоотро танҳо қабулкунанда тавонист хонд, истифода кунад.\n"
+#~ "Алгоритм - ин дастур барои компютер аст, ки бо чӣ тарз компютер бояд "
+#~ "вазифаи муайянро иҷро карданаш лозим аст, тасвир мекунад. Алгоритми "
+#~ "рамзгузорӣ тасвир мекунад, ки чӣ тавр компютер бояд калиди қабулкунандаи "
+#~ "иттилоотроба иттилоот, ки иттилоотро танҳо қабулкунанда тавонист хонд, "
+#~ "истифода кунад.\n"
 #~ "<p>\n"
-#~ "Интихоби алгоритми рамзгузорӣ муайян мекунад, ки то чӣ андоза иттилооти шуморо дастгир кардан ва хондан мушкил мешавад. Дар он сурат тамоми алгоритмҳое, ки бо муҳити SPHINX имкон дода мешаванд, хеле устувор шуморида мешаванд. Аз рӯи дастур, параметре, ки пешфарзӣ сабт шудааст, хеле хуб амал хоҳад кард.\n"
+#~ "Интихоби алгоритми рамзгузорӣ муайян мекунад, ки то чӣ андоза иттилооти "
+#~ "шуморо дастгир кардан ва хондан мушкил мешавад. Дар он сурат тамоми "
+#~ "алгоритмҳое, ки бо муҳити SPHINX имкон дода мешаванд, хеле устувор "
+#~ "шуморида мешаванд. Аз рӯи дастур, параметре, ки пешфарзӣ сабт шудааст, "
+#~ "хеле хуб амал хоҳад кард.\n"
 #~ "<p>\n"
 #~ "Ин параметри пешфарзӣ барои ҳар иттилоот инфиродӣ тағйир дода мешавад.\n"
 #~ "</qt>"
@@ -15630,62 +15239,83 @@ msgstr "Тағйир додан"
 #~ msgstr "Сертификатҳо"
 
 #~ msgid "Check can end with locally sa&ved certificate"
-#~ msgstr "Ин параметрро бо сертификати &захирашуда барои имкони хотима додани маҳаллӣ, танзим кунед"
+#~ msgstr ""
+#~ "Ин параметрро бо сертификати &захирашуда барои имкони хотима додани "
+#~ "маҳаллӣ, танзим кунед"
 
 #~ msgid "Check to end with locally saved certificate."
-#~ msgstr "Ин параметрро бо сертификати захирашуда барои хотима додани маҳаллӣ, танзим кунед."
+#~ msgstr ""
+#~ "Ин параметрро бо сертификати захирашуда барои хотима додани маҳаллӣ, "
+#~ "танзим кунед."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Озмоиши сертификат метавон локалӣ бо сертификати озмоидашуда, хотима ёбад</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, озмоиши занҷираи сертификатҳо метавон бо сертикати озмоидашуда локалӣ хотима ёбад.\n"
+#~ "<h1>Озмоиши сертификат метавон локалӣ бо сертификати озмоидашуда, хотима "
+#~ "ёбад</h1>\n"
+#~ "Агар ин параметр сабт шуда бошад, озмоиши занҷираи сертификатҳо метавон "
+#~ "бо сертикати озмоидашуда локалӣ хотима ёбад.\n"
 #~ "<p>\n"
-#~ "Сертификатҳои захирашудаи маҳаллӣ - ин сертификатҳои инфиродӣ, сертификатҳои шарикон аз рӯи мукотиба ва Хизматгоҳи сертификатҳо (СА)-и шумо низх мебошад.\n"
+#~ "Сертификатҳои захирашудаи маҳаллӣ - ин сертификатҳои инфиродӣ, "
+#~ "сертификатҳои шарикон аз рӯи мукотиба ва Хизматгоҳи сертификатҳо (СА)-и "
+#~ "шумо низх мебошад.\n"
 #~ "</h1>"
 
 #~ msgid "Always c&heck to root certificate"
 #~ msgstr "Доим &то дохили сертификати решавӣ озмоидан"
 
 #~ msgid "Check here to check up to the root certificate"
-#~ msgstr "Ин параметрро барои то дохили сертификати решавӣ озмоидан, танзим кунед"
+#~ msgstr ""
+#~ "Ин параметрро барои то дохили сертификати решавӣ озмоидан, танзим кунед"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Доим роҳи сертификатро то дохили сертификати решавӣ озмоидан</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, роҳи сертификат, ки ба сертификати қабулкунанда тааллуқ дорад, доим пурра то дохили сертификати решавӣ озмоида мешавад.\n"
+#~ "Агар ин параметр сабт шуда бошад, роҳи сертификат, ки ба сертификати "
+#~ "қабулкунанда тааллуқ дорад, доим пурра то дохили сертификати решавӣ "
+#~ "озмоида мешавад.\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
 #~ msgstr "Озмоиши ро&ҳи сертификат"
 
 #~ msgid "Check here to have the whole certificate path checked"
-#~ msgstr "Барои онки тамоми роҳи сертификат озмоида шавад, ин параметрро сабт кунед"
+#~ msgstr ""
+#~ "Барои онки тамоми роҳи сертификат озмоида шавад, ин параметрро сабт кунед"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Озмоидани роҳи сертификат</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, тамоми роҳи сертификати қабулкунанда то дохили решавӣ озмоида мешавад.\n"
+#~ "Агар ин параметр сабт шуда бошад, тамоми роҳи сертификати қабулкунанда то "
+#~ "дохили решавӣ озмоида мешавад.\n"
 #~ "<p>\n"
-#~ "Дар хотир доред, ки озмоиши худи сертификати қабулкунандаро ғайрифаъол сохтан имконпазир нест.\n"
+#~ "Дар хотир доред, ки озмоиши худи сертификати қабулкунандаро ғайрифаъол "
+#~ "сохтан имконпазир нест.\n"
 #~ "</qt>"
 
 #~ msgid "&Use certificate revocation lists (CRLs)"
@@ -15697,17 +15327,28 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Истифода аз рӯйхати лағвисертификатҳо (CRL)</h1>\n"
-#~ "Рӯйхатҳои лағви сертификат дорои сертификатҳое мебошад, ки бекор карда шуданд ва бинобар ин набояд барои рамзи хатӣ истифода шаванд. Агар корванд гумон кунад, ки истифодаи минбаъдаи он хавфнок аст (мисол, агар ягон кас ҳуруфи PIN-ро чинда бошад), он метавонад сертификати худро лағв кунад.\n"
+#~ "Рӯйхатҳои лағви сертификат дорои сертификатҳое мебошад, ки бекор карда "
+#~ "шуданд ва бинобар ин набояд барои рамзи хатӣ истифода шаванд. Агар "
+#~ "корванд гумон кунад, ки истифодаи минбаъдаи он хавфнок аст (мисол, агар "
+#~ "ягон кас ҳуруфи PIN-ро чинда бошад), он метавонад сертификати худро лағв "
+#~ "кунад.\n"
 #~ "<p>\n"
 #~ "Барои амнияти зиёд, истифодаи CRL тавсия мешавад.\n"
-#~ "Манбаъи қабул намудани CRL-ро метавон дар диалоги танзимоти сертификат ва қабул намудани CRL ишора кард.\n"
+#~ "Манбаъи қабул намудани CRL-ро метавон дар диалоги танзимоти сертификат ва "
+#~ "қабул намудани CRL ишора кард.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15715,17 +15356,22 @@ msgstr "Тағйир додан"
 #~ msgstr "Огоҳӣ кардан, &агар мӯҳлати амали CRL кам аз зерин мегузарад"
 
 #~ msgid "Check to be warned if a CRL expires in the near future"
-#~ msgstr "Барои қабул намудани огоҳӣ оиди мӯҳлати таъҷилӣ гузаштани амали CRL, инро сабт кунед"
+#~ msgstr ""
+#~ "Барои қабул намудани огоҳӣ оиди мӯҳлати таъҷилӣ гузаштани амали CRL, инро "
+#~ "сабт кунед"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Огоҳонидан, агар мӯҳлати амали CRL дар наздикӣ итмом шуда истодааст</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, шумо огоҳонида мешавед, ки мӯҳлати амали яке аз CRL-ҳои бо шумо истифода шаванда дар оянда хоҳад гузашт.\n"
+#~ "<h1>Огоҳонидан, агар мӯҳлати амали CRL дар наздикӣ итмом шуда истодааст</"
+#~ "h1>\n"
+#~ "Агар ин параметр сабт шуда бошад, шумо огоҳонида мешавед, ки мӯҳлати "
+#~ "амали яке аз CRL-ҳои бо шумо истифода шаванда дар оянда хоҳад гузашт.\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -15734,14 +15380,16 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Огоҳӣ кардан, агар мӯҳлати амали CRL дар наздикӣ мегузарад.</h1>\n"
-#~ "Дар ин замина метавон мақодири рӯзҳоро, ки дар ин вақт огоҳӣ оиди гузаштани мӯҳлати амали CRL хурӯҷ мешавад, ишора кард.\n"
+#~ "Дар ин замина метавон мақодири рӯзҳоро, ки дар ин вақт огоҳӣ оиди "
+#~ "гузаштани мӯҳлати амали CRL хурӯҷ мешавад, ишора кард.\n"
 #~ "<p>\n"
 #~ "Аҳамияти тавсия барои муҳити SPHINX - 7 рӯз аст.\n"
 #~ "</qt>"
@@ -15750,26 +15398,34 @@ msgstr "Тағйир додан"
 #~ msgstr "Доим &барои худ рамзгузорӣ кардан"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Тамоми иттилоотҳои рамзгузошташударо ҳамчунин бо калиди худ рамзгузорӣ кардан."
+#~ msgstr ""
+#~ "Тамоми иттилоотҳои рамзгузошташударо ҳамчунин бо калиди худ рамзгузорӣ "
+#~ "кардан."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Доим барои худ рамзгузорӣ кардан</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, иттилоотҳои рамзгузошташудаи бо шумо фиристодашуда, ҳамчунин бо калиди шумо рамз гузошта мешаванд.\n"
+#~ "Агар ин параметр сабт шуда бошад, иттилоотҳои рамзгузошташудаи бо шумо "
+#~ "фиристодашуда, ҳамчунин бо калиди шумо рамз гузошта мешаванд.\n"
 #~ "<p>\n"
-#~ "Ин параметрро барои онки шумо иттилоотҳои бо худ фиристодаро тавонед хонд, фаъол сохтан тавсия мешавад.\n"
+#~ "Ин параметрро барои онки шумо иттилоотҳои бо худ фиристодаро тавонед "
+#~ "хонд, фаъол сохтан тавсия мешавад.\n"
 #~ "</qt>"
 
 #, fuzzy
 #~ msgid "Warn if a certificate in &the chain expires in less than:"
-#~ msgstr "Огоҳӣ кардан, агар &мӯҳлати амали сертификат кам аз муддати зерин мегузарад"
+#~ msgstr ""
+#~ "Огоҳӣ кардан, агар &мӯҳлати амали сертификат кам аз муддати зерин "
+#~ "мегузарад"
 
 #~ msgid "Check to be warned if the certificate expires soon"
 #~ msgstr "Огоҳӣ кардан оиди гузаштани мӯҳлати таъҷилии сертификат"
@@ -15777,24 +15433,32 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Огоҳӣ кардан оиди мӯҳлати гузаштани сертификат</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, шумо оиди мӯҳлати гузаштани амали сертификат дар мақодири рӯзи ишорашуда хабардор карда мешавед.\n"
+#~ "Агар ин параметр сабт шуда бошад, шумо оиди мӯҳлати гузаштани амали "
+#~ "сертификат дар мақодири рӯзи ишорашуда хабардор карда мешавед.\n"
 #~ "<p>\n"
-#~ "Барои канора гирифтани истифодаи сертификат, ки мӯҳлати амали он дар оянда мегузарад, ин параметрро фаъол сохтан тавсия мешавад.\n"
+#~ "Барои канора гирифтани истифодаи сертификат, ки мӯҳлати амали он дар "
+#~ "оянда мегузарад, ин параметрро фаъол сохтан тавсия мешавад.\n"
 #~ "</qt>"
 
 #, fuzzy
 #~ msgid "Warn if &receiver certificate expires in less than:"
-#~ msgstr "Огоҳӣ &кардан, агар мӯҳлати амали сертификати қабулкунанда кам аз муддати зерин мегузарад"
+#~ msgstr ""
+#~ "Огоҳӣ &кардан, агар мӯҳлати амали сертификати қабулкунанда кам аз муддати "
+#~ "зерин мегузарад"
 
 #~ msgid "Warn if receiver's email address is &not in certificate"
-#~ msgstr "Огоҳӣ кардан, агар адресҳои қабулкунанда дар сертификат мавҷуд &нест"
+#~ msgstr ""
+#~ "Огоҳӣ кардан, агар адресҳои қабулкунанда дар сертификат мавҷуд &нест"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Параметрҳои имзо"
@@ -15808,8 +15472,29 @@ msgstr "Тағйир додан"
 #~ msgid "Selects which certificates to send"
 #~ msgstr "Сертификатро барои фиристониш интихоб кунед"
 
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt> <h1>Фиристониши сертификатҳо</h1> Ғайри сертификати шумо, қабулкунандаи иттилоот наметавонад мутобиқати комилии имзои рақамии шуморо биозмояд.<p> Қабулкунанда метавонад сертификати шуморо аз сервери марказӣ қабул кунад, аммо шумо низ ҳамчунин метавонед сертификати худро дар иттилоот дохил кунед. Шумо метавонед интихоб кунед, ки сертификатро ба иттилоот фаъол созед ё на, танҳо сертификати худро ё тамоми силсилаи сертификатҳоро фаъол созед, дар силсила сертификати решагиро фаъол сохтан лозим аст ё на.<p> Тавсия мешавад, ки доим дар иттилоот ақалан сертификати худро низ фаъол сохтан лозим аст.<p> Ин параметри пешфарзӣ метавон барои ҳар иттилоот ҷудо тағйир шавад.</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Фиристониши сертификатҳо</h1> Ғайри сертификати шумо, "
+#~ "қабулкунандаи иттилоот наметавонад мутобиқати комилии имзои рақамии "
+#~ "шуморо биозмояд.<p> Қабулкунанда метавонад сертификати шуморо аз сервери "
+#~ "марказӣ қабул кунад, аммо шумо низ ҳамчунин метавонед сертификати худро "
+#~ "дар иттилоот дохил кунед. Шумо метавонед интихоб кунед, ки сертификатро "
+#~ "ба иттилоот фаъол созед ё на, танҳо сертификати худро ё тамоми силсилаи "
+#~ "сертификатҳоро фаъол созед, дар силсила сертификати решагиро фаъол сохтан "
+#~ "лозим аст ё на.<p> Тавсия мешавад, ки доим дар иттилоот ақалан "
+#~ "сертификати худро низ фаъол сохтан лозим аст.<p> Ин параметри пешфарзӣ "
+#~ "метавон барои ҳар иттилоот ҷудо тағйир шавад.</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Фиристодани &сертификати инфиродии шумо"
@@ -15824,19 +15509,24 @@ msgstr "Тағйир додан"
 #~ msgstr "&Имзо кардани тамоми қисмҳои иттилоот"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Барои тамоми қисмҳои иттилоот ба тарзи пешфарзӣ имзо шаванд, инро сабт кунед"
+#~ msgstr ""
+#~ "Барои тамоми қисмҳои иттилоот ба тарзи пешфарзӣ имзо шаванд, инро сабт "
+#~ "кунед"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Тамоми қисмҳои иттилоотро пешфарзӣ имзо кардан</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, тамоми қисмҳои иттилоот (яъне тани асосии иттилоот ва тамоми гузоришҳо) пешфарзӣ имзо мешаванд.\n"
+#~ "Агар ин параметр сабт шуда бошад, тамоми қисмҳои иттилоот (яъне тани "
+#~ "асосии иттилоот ва тамоми гузоришҳо) пешфарзӣ имзо мешаванд.\n"
 #~ "<p>\n"
 #~ "Ин аҳамияти пешфарзӣ шояд барои ҳар иттилоот ҷудо-ҷудо тағйир хоҳад шуд.\n"
 #~ "</qt>"
@@ -15850,37 +15540,46 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Пурсиши иҷоза оиди имзо намудани ҳар қисм</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, шумо бояд лавозимоти ҳар қисми иттилоотро (яъне тани асосии иттилоот ва тамоми гузоришҳо) ҷудо тасдиқ кунед.\n"
+#~ "Агар ин параметр сабт шуда бошад, шумо бояд лавозимоти ҳар қисми "
+#~ "иттилоотро (яъне тани асосии иттилоот ва тамоми гузоришҳо) ҷудо тасдиқ "
+#~ "кунед.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
 #~ msgstr "&Имзо накардани иттилоот"
 
 #~ msgid "Check for not signing a message by default"
-#~ msgstr "Барои онки иттилоот ба таври пешфарзӣ имзо нашаванд, инро сабт кунед"
+#~ msgstr ""
+#~ "Барои онки иттилоот ба таври пешфарзӣ имзо нашаванд, инро сабт кунед"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Имзо накардани иттилоот</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, иттилоотҳо пешфарзӣ имзо карда намешаванд.\n"
+#~ "Агар ин параметр сабт шуда бошад, иттилоотҳо пешфарзӣ имзо карда "
+#~ "намешаванд.\n"
 #~ "<p>\n"
 #~ "Ин параметри пешфарзӣ шояд барои ҳар иттилоот ҷудо-ҷудо тағйир шавад.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
-#~ msgstr "Сертификати имзоот дар саҳифаи <em>Сертификатҳо</em> танзим карда мешавад."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgstr ""
+#~ "Сертификати имзоот дар саҳифаи <em>Сертификатҳо</em> танзим карда мешавад."
 
 #~ msgid "RSA + SHA-1"
 #~ msgstr "RSA + SHA-1"
@@ -15891,20 +15590,35 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Алгоритми имзо</h1>\n"
-#~ "Алгоритм - ин дастур барои компютерест, ки чӣ тавр бояд компютер вазифаи муайянро иҷро кунад, тасвир шудааст. Алгоритми имзоот тасвир мекунад, ки чӣ тавр компютер бояд калиди имзооти шуморо ба иттилоотатон истифода кунад, ки қабулкунандаи иттилоот мутмаин шавад ки фиристандаи иттилоот айнан шумо мебошед.\n"
+#~ "Алгоритм - ин дастур барои компютерест, ки чӣ тавр бояд компютер вазифаи "
+#~ "муайянро иҷро кунад, тасвир шудааст. Алгоритми имзоот тасвир мекунад, ки "
+#~ "чӣ тавр компютер бояд калиди имзооти шуморо ба иттилоотатон истифода "
+#~ "кунад, ки қабулкунандаи иттилоот мутмаин шавад ки фиристандаи иттилоот "
+#~ "айнан шумо мебошед.\n"
 #~ "<p>\n"
-#~ "Интихоби алгоритми рамзгузорӣ муайян мекунад, ки то чӣ андоза иттилоотро қалбакӣ кардан мушкил аст. Дар ин замон тамоми алгоритмҳое, ки бо муҳити SPHINX имкон дода мешаванд, хеле устувор ҳисобида мешаванд. Аз рӯи дастур, параметри пешфарзӣ сабтшуда хеле хуб амал хоҳад кард.\n"
+#~ "Интихоби алгоритми рамзгузорӣ муайян мекунад, ки то чӣ андоза иттилоотро "
+#~ "қалбакӣ кардан мушкил аст. Дар ин замон тамоми алгоритмҳое, ки бо муҳити "
+#~ "SPHINX имкон дода мешаванд, хеле устувор ҳисобида мешаванд. Аз рӯи "
+#~ "дастур, параметри пешфарзӣ сабтшуда хеле хуб амал хоҳад кард.\n"
 #~ "<p>\n"
-#~ "Ин параметри пешфарзӣ шояд барои ҳар иттилоот ҷудо, тағйир карда мешавад.\n"
+#~ "Ин параметри пешфарзӣ шояд барои ҳар иттилоот ҷудо, тағйир карда "
+#~ "мешавад.\n"
 #~ "</qt>"
 
 #~ msgid "Signature &algorithm:"
@@ -15919,12 +15633,16 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Захира кардани иттилоот бо имзоот</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, иттилоотҳои фиристодашуда бо имзоот захира мешаванд. Ин параметрро сабт кардан тавсия мешавад, чанде ин имкон медиҳад, ки баъдтар мутмаин шавед ки иттилоот ҳақиқатан имзо шуда буд.\n"
+#~ "Агар ин параметр сабт шуда бошад, иттилоотҳои фиристодашуда бо имзоот "
+#~ "захира мешаванд. Ин параметрро сабт кардан тавсия мешавад, чанде ин имкон "
+#~ "медиҳад, ки баъдтар мутмаин шавед ки иттилоот ҳақиқатан имзо шуда буд.\n"
 #~ "</qt>"
 
 #~ msgid "Compound mode:"
@@ -15934,17 +15652,24 @@ msgstr "Тағйир додан"
 #~ msgstr "&Стандарти MIME"
 
 #~ msgid "A Multipart/Signed holding Signature and signed data."
-#~ msgstr "Multipart/Signed, ки дорои имзо ва маълумотҳои имзошуда низ мебошад."
+#~ msgstr ""
+#~ "Multipart/Signed, ки дорои имзо ва маълумотҳои имзошуда низ мебошад."
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Имзо ҳамчун замимоти ҷудо</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, имзо ва маълумотҳои имзошуда, қисми ҷудои иттилоот ба намуди Multipart/Signed мешаванд. Маълумотҳои имзошуда ҳатто дар мавриде, ки барномаи почтавии корванд, алгоритми имзо ва аз нав рамзгузории ASN.1 низ пуштибонӣ намешаванд\n"
+#~ "Агар ин параметр сабт шуда бошад, имзо ва маълумотҳои имзошуда, қисми "
+#~ "ҷудои иттилоот ба намуди Multipart/Signed мешаванд. Маълумотҳои имзошуда "
+#~ "ҳатто дар мавриде, ки барномаи почтавии корванд, алгоритми имзо ва аз нав "
+#~ "рамзгузории ASN.1 низ пуштибонӣ намешаванд\n"
 #~ "</qt>"
 
 #~ msgid "Opa&que (only recommended for SPHINX)"
@@ -15956,12 +15681,16 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Иттилоотҳои имзошудаи ғайришаффоф</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, имзо ва маълумотҳои имзошуда дар як блоки ASN.1 рамзгузорӣмешаванд. Иттилоотро метавон танҳо бо он барномаи почтавӣ бихонд, ки он аз нав рамзгузории ASN.1-ро пуштибонӣ кунад.\n"
+#~ "Агар ин параметр сабт шуда бошад, имзо ва маълумотҳои имзошуда дар як "
+#~ "блоки ASN.1 рамзгузорӣмешаванд. Иттилоотро метавон танҳо бо он барномаи "
+#~ "почтавӣ бихонд, ки он аз нав рамзгузории ASN.1-ро пуштибонӣ кунад.\n"
 #~ "</qt>"
 
 #~ msgid "Entering PIN is required:"
@@ -15974,8 +15703,23 @@ msgstr "Тағйир додан"
 #~ msgstr "Интихоб кунед, ки чӣ мутассил коди PIN-ро ворид намудан лозим аст"
 
 #, fuzzy
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>Вориди PIN-код</h1> Дар инҷо метавон, чӣ мутассил шумо бояд PIN-кодро барои гирифтани дастрасӣ ба муҳити бехавфии инфиродӣ (PSE, Personal Security Environment), ки дорои сертификати шумо мебошад, ворди кунед.<p>Чӣ зиёд ба шумо вориди PIN-код лозим шавад, ҳамон қадар устувортар аз имконоти \"қалбакӣ кардани\" почтаатон муҳофизат карда мешавед, аммо дар ин сурат кор бо барнома каме мусоид мешавад.<p>Агар шумо мутмаин набошед, ин параметрро ҳамин тавр бимонед.<p>Аз рӯи тасаввуроти амният, пурра ғайрифаъол сохтани вориди PIN-код имконпазир нест.</qt><"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>Вориди PIN-код</h1> Дар инҷо метавон, чӣ мутассил шумо бояд PIN-"
+#~ "кодро барои гирифтани дастрасӣ ба муҳити бехавфии инфиродӣ (PSE, Personal "
+#~ "Security Environment), ки дорои сертификати шумо мебошад, ворди кунед."
+#~ "<p>Чӣ зиёд ба шумо вориди PIN-код лозим шавад, ҳамон қадар устувортар аз "
+#~ "имконоти \"қалбакӣ кардани\" почтаатон муҳофизат карда мешавед, аммо дар "
+#~ "ин сурат кор бо барнома каме мусоид мешавад.<p>Агар шумо мутмаин набошед, "
+#~ "ин параметрро ҳамин тавр бимонед.<p>Аз рӯи тасаввуроти амният, пурра "
+#~ "ғайрифаъол сохтани вориди PIN-код имконпазир нест.</qt><"
 
 #~ msgid "Once per session"
 #~ msgstr "Як маротиба дар оғози сеанс"
@@ -15993,16 +15737,22 @@ msgstr "Тағйир додан"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Огоҳонидан оиди гузаштани мӯҳлати амали сертификат</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, шумо ҳангоми сайъи истифодаи сертификат, ки мӯҳлати амали он кам аз мақодири рӯзи ишорашуда мегузарад, огоҳӣ қабул мекунед.\n"
+#~ "Агар ин параметр сабт шуда бошад, шумо ҳангоми сайъи истифодаи "
+#~ "сертификат, ки мӯҳлати амали он кам аз мақодири рӯзи ишорашуда мегузарад, "
+#~ "огоҳӣ қабул мекунед.\n"
 #~ "<p>\n"
-#~ "Барои истифода набурдани сертификат, ки мӯҳлати амали он дар оянда хоҳад гузашт, ин параметрро фаъол сохтан тавсия мешавад.\n"
+#~ "Барои истифода набурдани сертификат, ки мӯҳлати амали он дар оянда хоҳад "
+#~ "гузашт, ин параметрро фаъол сохтан тавсия мешавад.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -16010,19 +15760,23 @@ msgstr "Тағйир додан"
 #~ msgstr "Огоҳонидан &оиди гузаштани мӯҳлати амали сертификати имзоот кам аз"
 
 #~ msgid "Warn if signer's email address is &not in certificate"
-#~ msgstr "Огоҳонидан, &агар нишони e-mail-и соҳиби имзо дар сертификат ғоиб аст"
+#~ msgstr ""
+#~ "Огоҳонидан, &агар нишони e-mail-и соҳиби имзо дар сертификат ғоиб аст"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1>Огоҳонидан, агар нишони e-mail-и соҳиби имзо дар сертификат ғоиб аст</h1>\n"
-#~ "Агар ин параметр сабт шуда бошад, ҳангоми набудани нишони почтаи электронии соҳиби имзоот дар сертификат, огоҳӣ хурӯҷ мешавад.\n"
+#~ "<h1>Огоҳонидан, агар нишони e-mail-и соҳиби имзо дар сертификат ғоиб аст</"
+#~ "h1>\n"
+#~ "Агар ин параметр сабт шуда бошад, ҳангоми набудани нишони почтаи "
+#~ "электронии соҳиби имзоот дар сертификат, огоҳӣ хурӯҷ мешавад.\n"
 #~ "<p>\n"
 #~ "Барои комилият, ин параметрро фаъол сохтан тавсия мешавад.\n"
 #~ "</qt>"
@@ -16039,10 +15793,6 @@ msgstr "Тағйир додан"
 #~ msgstr "Захира кардан дар папкаи &Сиёҳнавис"
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "&Танзими KMail..."
-
-#, fuzzy
 #~ msgid "Open with..."
 #~ msgstr "Кушодан бо ёрии..."
 
@@ -16058,7 +15808,9 @@ msgstr "Тағйир додан"
 #~ msgstr "Ҳузфи вурудот"
 
 #~ msgid "Forward selected messages as a MIME digest?"
-#~ msgstr "Фиристодани иттилоотҳои интихобшуда ба намуди замимот (формати MIME дайджест)?"
+#~ msgstr ""
+#~ "Фиристодани иттилоотҳои интихобшуда ба намуди замимот (формати MIME "
+#~ "дайджест)?"
 
 #, fuzzy
 #~ msgid "Send Digest"
@@ -16122,40 +15874,64 @@ msgstr "Тағйир додан"
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "In a few easy steps, this wizard will help you with the creation of a certificate. You use your certificates in order to sign messages, to encrypt messages and to decrypt messages that other people send to you in encrypted form.\n"
+#~ "In a few easy steps, this wizard will help you with the creation of a "
+#~ "certificate. You use your certificates in order to sign messages, to "
+#~ "encrypt messages and to decrypt messages that other people send to you in "
+#~ "encrypted form.\n"
 #~ "<p>\n"
-#~ "The certificates can either be generated in a centralized or a decentralized manner. Please contact your local help desk if you are unsure how to create a certificate in your organization."
+#~ "The certificates can either be generated in a centralized or a "
+#~ "decentralized manner. Please contact your local help desk if you are "
+#~ "unsure how to create a certificate in your organization."
 #~ msgstr ""
 #~ "<b>Ба устоди танзимоти сертификатҳо хуш омадед!</b>\n"
 #~ "<br>\n"
 #~ "<br>\n"
-#~ "Устоди танзимоти сертификатҳо ба шумо барои эҷоди сертификат кӯмак мерасонад. Сертификатҳо барои рамзгузорӣ, имзо ва рамзкушоии иттилоот, ки ба намуди рамзгузошташуда фиристода шудааст, истифода мешаванд.\n"
+#~ "Устоди танзимоти сертификатҳо ба шумо барои эҷоди сертификат кӯмак "
+#~ "мерасонад. Сертификатҳо барои рамзгузорӣ, имзо ва рамзкушоии иттилоот, ки "
+#~ "ба намуди рамзгузошташуда фиристода шудааст, истифода мешаванд.\n"
 #~ "<p>\n"
-#~ "Сертификатҳо ба тарзи мутамарказӣ ё ғайримарказӣ ҳосил карда мешаванд. Агар мутмаин набошед, ки чӣ тавр сертификатро барои ташкилоти худ эҷод кунед, кӯмакрасонии маҳаллии худ маслиҳат бипурсед."
+#~ "Сертификатҳо ба тарзи мутамарказӣ ё ғайримарказӣ ҳосил карда мешаванд. "
+#~ "Агар мутмаин набошед, ки чӣ тавр сертификатро барои ташкилоти худ эҷод "
+#~ "кунед, кӯмакрасонии маҳаллии худ маслиҳат бипурсед."
 
 #~ msgid "Your Personal Data"
 #~ msgstr "Маълумотҳои инфиродии худ"
 
-#~ msgid "On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message."
-#~ msgstr "Дар ин саҳифа шумо бояд маълумотҳои худро, ки дар сертификати шумо захира карда мешаванд ва ба дигар одамон кӯмак мерасонад, ки иттилооти маҳз аз шумо расидаро муайян кунанд."
+#~ msgid ""
+#~ "On this page, you will enter some personal data that will be stored in "
+#~ "your certificate and that will help other people to determine that it is "
+#~ "actually you who is sending a message."
+#~ msgstr ""
+#~ "Дар ин саҳифа шумо бояд маълумотҳои худро, ки дар сертификати шумо захира "
+#~ "карда мешаванд ва ба дигар одамон кӯмак мерасонад, ки иттилооти маҳз аз "
+#~ "шумо расидаро муайян кунанд."
 
 #~ msgid "Enter your name here"
 #~ msgstr "Номи худро ворид кунед"
 
 #~ msgid "Enter your name here as it should be shown in the certificate."
-#~ msgstr "Номи худро чунине, ки бояд дар сертификат тасвир шавад, ворид кунед."
+#~ msgstr ""
+#~ "Номи худро чунине, ки бояд дар сертификат тасвир шавад, ворид кунед."
 
 #~ msgid "Enter your organization here"
 #~ msgstr "Номи ташкилоти худро ворид кунед"
 
-#~ msgid "Enter your organization (e.g. your company, your department, or your authority) here as it should appear on the certificate."
-#~ msgstr "Номи ташкилотро (ширкат, шӯъба) чунине, ки он бояд дар сертификат дида шавад, ворид кунед."
+#~ msgid ""
+#~ "Enter your organization (e.g. your company, your department, or your "
+#~ "authority) here as it should appear on the certificate."
+#~ msgstr ""
+#~ "Номи ташкилотро (ширкат, шӯъба) чунине, ки он бояд дар сертификат дида "
+#~ "шавад, ворид кунед."
 
 #~ msgid "Enter your email address here"
 #~ msgstr "Адреси e-mail-и худро ворид кунед"
 
-#~ msgid "Enter the email address here which you want to use in connection with the certificate."
-#~ msgstr "Адреси e-mail-ро, ки мехоҳед ба пайвасткунии сертификат истифода баред, ворид кунед."
+#~ msgid ""
+#~ "Enter the email address here which you want to use in connection with the "
+#~ "certificate."
+#~ msgstr ""
+#~ "Адреси e-mail-ро, ки мехоҳед ба пайвасткунии сертификат истифода баред, "
+#~ "ворид кунед."
 
 #~ msgid "&Department:"
 #~ msgstr "&Шӯъба:"
@@ -16166,8 +15942,15 @@ msgstr "Тағйир додан"
 #~ msgid "Certificate Generation"
 #~ msgstr "Генератсияи сертификат"
 
-#~ msgid "On this page, you will select whether certificate generation is done centralized or decentralized. Please check with your local help desk if you are unsure what to select here."
-#~ msgstr "Дар ин саҳифа шумо бояд тарзи генератсияи сертификатро интихоб кунед. Шумо метавонед сертификати мутамарказӣ ва ғайримарказиро эҷод кунед. Агар мутмаин набошед, ки чиро интихоб намудан лозим аст, ба мудирияти маълумотдиҳӣ барои кӯмак муроҷиат кунед."
+#~ msgid ""
+#~ "On this page, you will select whether certificate generation is done "
+#~ "centralized or decentralized. Please check with your local help desk if "
+#~ "you are unsure what to select here."
+#~ msgstr ""
+#~ "Дар ин саҳифа шумо бояд тарзи генератсияи сертификатро интихоб кунед. "
+#~ "Шумо метавонед сертификати мутамарказӣ ва ғайримарказиро эҷод кунед. Агар "
+#~ "мутмаин набошед, ки чиро интихоб намудан лозим аст, ба мудирияти "
+#~ "маълумотдиҳӣ барои кӯмак муроҷиат кунед."
 
 #~ msgid "Certificate &Generation"
 #~ msgstr "&Генератсияи сертификат"
@@ -16186,15 +15969,26 @@ msgstr "Тағйир додан"
 
 #~ msgid ""
 #~ "<qt>\n"
-#~ "Your signature key pair is now ready to be sent to the CA (certification authority) which will generate a certificate for you and send it back via email. Please review the certificate shown below. You should also write down the checksum so that you can match it against the certificate sent back by the CA.\n"
+#~ "Your signature key pair is now ready to be sent to the CA (certification "
+#~ "authority) which will generate a certificate for you and send it back via "
+#~ "email. Please review the certificate shown below. You should also write "
+#~ "down the checksum so that you can match it against the certificate sent "
+#~ "back by the CA.\n"
 #~ "<p>\n"
-#~ "If you want to change anything, press Back and make your changes. Otherwise press Finish to send the signature key pair to the CA.\n"
+#~ "If you want to change anything, press Back and make your changes. "
+#~ "Otherwise press Finish to send the signature key pair to the CA.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "Калиди ҷуфти шумо фиристодан ба CA (хизматгоҳи сертификатҳо), ки сертификатро эҷод мекунад ва ба шумо бо почта мефиристад, омода аст. Маълумотҳои сертификатро, ки поёнтар нишон дода шудааст, биозмоед. Ҳамчунин ҷамъи идоракуниро барои озмоиши сертификат, ки ба шумо бо почта бо хизматгоҳи сертификатсия фиристода мешавад, қайд кунед.\n"
+#~ "Калиди ҷуфти шумо фиристодан ба CA (хизматгоҳи сертификатҳо), ки "
+#~ "сертификатро эҷод мекунад ва ба шумо бо почта мефиристад, омода аст. "
+#~ "Маълумотҳои сертификатро, ки поёнтар нишон дода шудааст, биозмоед. "
+#~ "Ҳамчунин ҷамъи идоракуниро барои озмоиши сертификат, ки ба шумо бо почта "
+#~ "бо хизматгоҳи сертификатсия фиристода мешавад, қайд кунед.\n"
 #~ "<p>\n"
-#~ "Агар шумо хоҳед ягон чизро тағйир диҳед, тугмаи Ақиб-ро пахш кунед. Вагарна ба рӯи тугмаи Хотима барои калиди ҷуфтро ба хизматгоҳи сертификатҳо фиристодан пахш кунед.\n"
+#~ "Агар шумо хоҳед ягон чизро тағйир диҳед, тугмаи Ақиб-ро пахш кунед. "
+#~ "Вагарна ба рӯи тугмаи Хотима барои калиди ҷуфтро ба хизматгоҳи "
+#~ "сертификатҳо фиристодан пахш кунед.\n"
 #~ "</qt>"
 
 #~ msgid "Extension"
diff --git a/tde-i18n-th/messages/tdepim/kmail.po b/tde-i18n-th/messages/tdepim/kmail.po
index a062bfc3bba..e914a4a1126 100644
--- a/tde-i18n-th/messages/tdepim/kmail.po
+++ b/tde-i18n-th/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2006-10-17 12:43+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ถนอมทรัพย์ นพบูรณ์,สหชาติ อนุกูลกิจ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -170,6 +170,12 @@ msgstr "ไม่มี (โปรดใช้อย่างระมัดร�
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "ลบอดีต"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -245,13 +251,13 @@ msgstr "ล็อกอิน:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "ผู้ให้บริการอินเตอร์เน็ตของคุณจะให้ <em>ชื่อผู้ใช้งาน</em> "
-"ที่ใช้ในการตรวจสอบสิทธิ์กับเซิร์ฟเวอร์ของเขา ซึ่งมันมักจะเป็นส่วนแรก "
-"ของที่อยู่จดหมายของคุณ (ส่วนที่อยู่ก่อนเครื่องหมาย <em>@</em> )"
+"ที่ใช้ในการตรวจสอบสิทธิ์กับเซิร์ฟเวอร์ของเขา ซึ่งมันมักจะเป็นส่วนแรก ของที่อยู่จดหมายของคุณ "
+"(ส่วนที่อยู่ก่อนเครื่องหมาย <em>@</em> )"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -272,12 +278,12 @@ msgstr "เก็บรหัสผ่าน POP ไว้ด้วย"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -306,8 +312,9 @@ msgstr "กรองจดหมายหากมีขนาดใหญ่เ
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "หากเลือกตัวเลือกนี้ ตัวกรองของ POP จะพิจารณาว่า จะทำอะไรกับจดหมายบ้าง "
 "คุณสามารถเลือกที่จะดาวน์โหลด, ลบหรือเก็บจดหมายไว้ที่เซิร์ฟเวอร์ก็ได้"
@@ -359,13 +366,15 @@ msgstr "ล้างข้อความ"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "ล็อ&กอิน"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "ข้อ&ความธรรมดา"
 
@@ -408,9 +417,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -472,9 +481,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -513,7 +522,7 @@ msgstr "<ไม่มี>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "จดหมายเข้า"
 
@@ -521,28 +530,29 @@ msgstr "จดหมายเข้า"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -552,23 +562,23 @@ msgstr "โปรดระบุโปรแกรมส่งจดหมาย
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -576,8 +586,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -657,8 +667,8 @@ msgstr "บัญชีผู้ใช้ IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "คุณต้องการเพิ่มบัญชีผู้ใช้ในส่วนของเครือข่าย\n"
 "ของการตั้งค่าลำดับที่จะให้รับจดหมาย"
@@ -699,9 +709,9 @@ msgstr "ยินดีต้อนรับสู่โปรแกรมจั
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -764,8 +774,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "ข้อมูลของเซิร์ฟเวอร์"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "ไม่มี"
@@ -902,17 +911,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -947,10 +955,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -961,8 +968,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -973,8 +980,8 @@ msgstr "ทิ้งจดหมายทั้งหมดลงถังขย
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -984,8 +991,8 @@ msgstr "ตั้งค่าฉบับที่เลือกเป็นจ
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1179,8 +1186,8 @@ msgstr "มีข้อผิดพลาด ขณะอ่านโฟลเ�
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1200,8 +1207,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1231,15 +1238,15 @@ msgstr "ลบ"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1270,15 +1277,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "โหลดโปรไฟล์..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "ปรับแต่งโปรแกรมจัดการจดหมาย - K..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "เพิ่ม..."
@@ -1308,6 +1319,11 @@ msgstr "<qt>คุณต้องการลบรายการแสดง�
 msgid "Remove Identity"
 msgstr "ลบการแสดงตัว"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "ลบ"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "เพิ่ม..."
@@ -1316,6 +1332,11 @@ msgstr "เพิ่ม..."
 msgid "Modify..."
 msgstr "แก้ไข..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "ลบ"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "ตั้งเป็นค่าปริยาย"
@@ -1332,17 +1353,15 @@ msgstr "การส่งจดหมาย"
 msgid "Outgoing accounts (add at least one):"
 msgstr "บัญชีผู้ใช้สำหรับส่งจดหมาย (ต้องมีอย่างน้อยหนึ่งตัว):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "ชื่อ"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "ประเภท"
@@ -1364,8 +1383,7 @@ msgstr "ตั้งเป็นค่าปริยาย"
 msgid "Common Options"
 msgstr "ตัวเลือกทั่วไป"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "ถามยืนยันก่อนทำการส่ง"
@@ -1416,17 +1434,15 @@ msgstr "โดเมนปริยาย:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>โดเมนปริยายจะใช้สำหรับการเติมที่อยู่อีเมลให้สมบูรณ์โดยจะใช้ประกอบกับชื่อผู้ใช"
-"้</p></qt>"
+"<qt><p>โดเมนปริยายจะใช้สำหรับการเติมที่อยู่อีเมลให้สมบูรณ์โดยจะใช้ประกอบกับชื่อผู้ใช้</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1444,9 +1460,9 @@ msgstr "เพิ่มการรับส่งจดหมาย"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (ค่าปริยาย)"
 
@@ -1525,6 +1541,10 @@ msgstr "แก้ไขบัญชีผู้ใช้"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>ไม่สามารถหาตำแหน่งของบัญชีผู้ใช้ <b>%1</b> ได้</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "สี"
@@ -1633,8 +1653,7 @@ msgstr "ตำแหน่งเชื่อมโยงที่เรียก
 msgid "Misspelled Words"
 msgstr "คำที่สะกดผิด"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "จดหมายใหม่"
@@ -1823,11 +1842,10 @@ msgstr "ให้ปิดการแสดงแบบเธรดเป็น
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"เปิดเธรดที่มีจดหมายใหม่, จดหมายที่ยังไม่ได้อ่าน หรือจดหมายที่สำคัญมาก "
-"และเปิดเธรดที่ต้องติดตามด้วย"
+"เปิดเธรดที่มีจดหมายใหม่, จดหมายที่ยังไม่ได้อ่าน หรือจดหมายที่สำคัญมาก และเปิดเธรดที่ต้องติดตามด้วย"
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1835,40 +1853,33 @@ msgstr "แสดงวันที่"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "กำลังเปลี่ยนการตั้งค่าทั่วไปของการทำเธรด ที่จะกำหนดใช้กับทุกโฟลเดอร์"
 
 #: configuredialog.cpp:2221
@@ -1883,8 +1894,7 @@ msgstr "แสดงแถบสถานะ HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "แสดงสถานะสแปมในส่วนหัวแบบแฟนซี"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "แทนที่การพิมพ์หน้ายิ้มด้วยไอคอนแสดงอารมณ์"
@@ -1893,8 +1903,7 @@ msgstr "แทนที่การพิมพ์หน้ายิ้มด้
 msgid "Use smaller font for quoted text"
 msgstr "ใช้ตัวอักษรที่เล็กลงสำหรับข้อความที่อ้างถึง"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "แสดงเครื่องหมายขยาย/ยุบส่วนที่อ้างถึง"
@@ -1920,8 +1929,7 @@ msgstr "อัตโนมัติ"
 msgid "&Override character encoding:"
 msgstr "ชุดรหัสภาษาที่บังคับให้ใช้:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "เปิดใช้การแสดงไอคอนในถาดระบบ"
@@ -1936,8 +1944,7 @@ msgstr "แสดงโปรแกรมจัดการจดหมาย -
 
 #: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
-msgstr ""
-"แสดงโปรแกรมจัดการจดหมาย - K ในถาดระบบเฉพาะเมื่อมีจดหมายที่ยังไม่ได้อ่าน"
+msgstr "แสดงโปรแกรมจัดการจดหมาย - K ในถาดระบบเฉพาะเมื่อมีจดหมายที่ยังไม่ได้อ่าน"
 
 #: configuredialog.cpp:2563 identitydialog.cpp:408
 #, fuzzy
@@ -2026,22 +2033,18 @@ msgstr "ตัวแปร <b>%f</b> จะถูกแทนที่ด้ว�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>สนับสนุนการใช้ตัวแปรในสำนวน/กลุ่มคำต่อไปนี้:"
-"<br><b>%D</b>: วันที่, <b>%S</b>: เรื่อง,"
-"<br><b>%e</b>: ที่อยู่ผู้ส่ง, <b>%F</b>: ชื่อผู้ส่ง, <b>%f</b>"
-": คำนำหน้าชื่อผู้ส่ง,"
-"<br><b>%T</b>: ชื่อผู้รับ, <b>%t</b>: ชื่อผู้รับและที่อยู่"
-"<br><b>%C</b>: ชื่อผู้รับสำเนา, <b>%c</b>: ชื่อผู้รับสำเนาและที่อยู่,"
-"<br><b>%%</b>: เครื่องหมายเปอร์เซ็น, <b>%_</b>: ช่องว่าง, <b>%L</b>"
-": จบบรรทัด</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>สนับสนุนการใช้ตัวแปรในสำนวน/กลุ่มคำต่อไปนี้:<br><b>%D</b>: วันที่, <b>%S</b>: เรื่อง,"
+"<br><b>%e</b>: ที่อยู่ผู้ส่ง, <b>%F</b>: ชื่อผู้ส่ง, <b>%f</b>: คำนำหน้าชื่อผู้ส่ง,<br><b>%T</"
+"b>: ชื่อผู้รับ, <b>%t</b>: ชื่อผู้รับและที่อยู่<br><b>%C</b>: ชื่อผู้รับสำเนา, <b>%c</b>: "
+"ชื่อผู้รับสำเนาและที่อยู่,<br><b>%%</b>: เครื่องหมายเปอร์เซ็น, <b>%_</b>: ช่องว่าง, <b>%L</"
+"b>: จบบรรทัด</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2064,21 +2067,20 @@ msgstr "ตอบกลับไปยังทั้งหมด:"
 msgid "&Forward:"
 msgstr "ส่งต่อ:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "ตัวแสดงถึงส่วนที่อ้างถึง:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "เมื่อวันที่ %D คุณได้ส่งข้อความ:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "เมื่อ %D, %F ได้ส่งข้อความ:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "ส่งต่อข้อความแล้ว"
 
@@ -2116,8 +2118,8 @@ msgstr "เติมคำนำหน้าการส่งต่อใหม
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "รายการนี้จะใช้ตรวจสอบกับจดหมายออกจากบนลงล่างทุกฉบับ "
 "เพื่อหาชุดอักขระที่มีอักขระครบทุกตัวที่จดหมายต้องการ"
@@ -2154,10 +2156,9 @@ msgstr "ค่า"
 msgid "Ne&w"
 msgstr "ใหม่"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "ชื่อ:"
@@ -2166,19 +2167,17 @@ msgstr "ชื่อ:"
 msgid "&Value:"
 msgstr "ค่า:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "ตั้งชื่อสิ่งที่แนบมาด้วยให้ใช้กันได้กับ Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"เปิดใช้งานตัวเลือกนี้เพื่อให้โปรแกรม Outlook "
-"สามารถเข้าใจถึงชื่อสิ่งที่แนบมาด้วยที่ไม่ใช่ภาษาอังกฤษ"
+"เปิดใช้งานตัวเลือกนี้เพื่อให้โปรแกรม Outlook สามารถเข้าใจถึงชื่อสิ่งที่แนบมาด้วยที่ไม่ใช่ภาษาอังกฤษ"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2204,13 +2203,13 @@ msgstr "แนบ"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2235,89 +2234,74 @@ msgstr "กลไกเข้ารหัส"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>บางครั้ง อีเมล์ก็มาเป็นรูปแบบทั้งคู่ ตัวเลือกนี้ "
-"จะทำให้คุณสามารถเลือกที่จะแสดง HTML เป็นบางส่วน หรือเป็นข้อความธรรมดาบางส่วน "
-"</p>"
-"<p>การแสดงผลเป็น HTML นั้น จะทำให้อ่านได้ง่ายและดูดีกว่า "
-"แต่บางครั้งก็เพิ่มความเสี่ยงในเรื่องความปลอดภัยของระบบเช่นกัน </p>"
-"<p>ส่วนการแสดงผลเป็นข้อความธรรมดานั้น จะทำให้สูญเสียเนื้อความบางส่วนไป "
-"แต่มันก็<em>ไม่มีปัญหา</em> ในเรื่องความปลอดภัยบนระบบของคุณ เหมือน การแสดงผลแบบ "
-"HTML (คอนเควอร์เรอร์)</p>"
-"<p>ตัวเลือกด้านล่างนี้ จะป้องกันการแสดงผลจดหมายในรูปแบบ HTML "
-"แต่มันไม่ได้ป้องกัน หากมีปัญหาความปลอดภัย ซึ่งไม่สามารถทราบได้ ใน KMail "
-"รุ่นนี้</p>"
-"<p> แต่ถึงอย่างไร ก็ขอแนะนำ ่ให้แสดงเนื้อหา HTML เป็นข้อความธรรมดา</p> "
-"<p><b>ข้อควรจำ:</b> คุณสามารถตั้งค่าตัวเลือกนี้สำหรับแต่ละโฟลเดอร์ ได้จากเมนู "
-"<i>โฟลเดอร์</i> ของหน้าต่างหลักจัดการจดหมาย K</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>บางครั้ง อีเมล์ก็มาเป็นรูปแบบทั้งคู่ ตัวเลือกนี้ จะทำให้คุณสามารถเลือกที่จะแสดง HTML "
+"เป็นบางส่วน หรือเป็นข้อความธรรมดาบางส่วน </p><p>การแสดงผลเป็น HTML นั้น "
+"จะทำให้อ่านได้ง่ายและดูดีกว่า แต่บางครั้งก็เพิ่มความเสี่ยงในเรื่องความปลอดภัยของระบบเช่นกัน </"
+"p><p>ส่วนการแสดงผลเป็นข้อความธรรมดานั้น จะทำให้สูญเสียเนื้อความบางส่วนไป "
+"แต่มันก็<em>ไม่มีปัญหา</em> ในเรื่องความปลอดภัยบนระบบของคุณ เหมือน การแสดงผลแบบ HTML "
+"(คอนเควอร์เรอร์)</p><p>ตัวเลือกด้านล่างนี้ จะป้องกันการแสดงผลจดหมายในรูปแบบ HTML "
+"แต่มันไม่ได้ป้องกัน หากมีปัญหาความปลอดภัย ซึ่งไม่สามารถทราบได้ ใน KMail รุ่นนี้</p><p> "
+"แต่ถึงอย่างไร ก็ขอแนะนำ ่ให้แสดงเนื้อหา HTML เป็นข้อความธรรมดา</p> <p><b>ข้อควรจำ:</b> "
+"คุณสามารถตั้งค่าตัวเลือกนี้สำหรับแต่ละโฟลเดอร์ ได้จากเมนู <i>โฟลเดอร์</i> "
+"ของหน้าต่างหลักจัดการจดหมาย K</p></qt>"
 
 #: configuredialog.cpp:3754
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>จดหมายบางฉบับ จะมีโฆษณา ซึ่งมาในรูปแบบ HTML "
-"และจะมีส่วนอ้างอิงไปยังรูปภาพที่ใช้โฆษณา เพื่อให้แน่ใจว่าคุณได้อ่านโฆษณาแล้ว "
-"(\"web bugs\")</p>"
-"<p>มันไม่มีความจำเป็นเลยที่จะต้องเรียกรูปภาพจากเน็ต "
-"ทั้งที่ผู้ส่งสามารถรวมมันเข้าไปในเนื้อหาจดหมายได้โดยตรง</p>"
-"<p> เพื่อป้องกันการแสดงผลส่วน HTML ที่เกี่ยวกับโฆษณาใน kmail ตัวเลือกเหล่านี้ "
-"คือ <em>ปิดการใช้งาน</em>โดยปริยาย</p>"
-"<p>อย่างไรก็ตาม หากคุณต้องการ เช่น แสดงภาพในจดหมายแบบ HTML "
-"ที่ไม่ได้รวมเข้ากับจดหมาย คุณสามารถเลือกตัวเลือกนี้ได้ แต่คุณอาจจะได้รับคำเตือน "
-"เกี่ยวกับปัญหาที่อาจจะเกิดขึ้น</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>จดหมายบางฉบับ จะมีโฆษณา ซึ่งมาในรูปแบบ HTML "
+"และจะมีส่วนอ้างอิงไปยังรูปภาพที่ใช้โฆษณา เพื่อให้แน่ใจว่าคุณได้อ่านโฆษณาแล้ว (\"web bugs\")</"
+"p><p>มันไม่มีความจำเป็นเลยที่จะต้องเรียกรูปภาพจากเน็ต "
+"ทั้งที่ผู้ส่งสามารถรวมมันเข้าไปในเนื้อหาจดหมายได้โดยตรง</p><p> เพื่อป้องกันการแสดงผลส่วน HTML "
+"ที่เกี่ยวกับโฆษณาใน kmail ตัวเลือกเหล่านี้ คือ <em>ปิดการใช้งาน</em>โดยปริยาย</"
+"p><p>อย่างไรก็ตาม หากคุณต้องการ เช่น แสดงภาพในจดหมายแบบ HTML ที่ไม่ได้รวมเข้ากับจดหมาย "
+"คุณสามารถเลือกตัวเลือกนี้ได้ แต่คุณอาจจะได้รับคำเตือน เกี่ยวกับปัญหาที่อาจจะเกิดขึ้น</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2334,16 +2318,15 @@ msgstr "อนุญาตให้จดหมาย โหลดส่วน�
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>คำเตือน:</b> การเปิดใช้ภาษา HTML ในจดหมาย "
-"อาจจะเป็นการเพิ่มความเสี่ยงต่อความปลอดภัยของระบบ หากระบบของคุณมีช่องโหว่ "
-"โปรดดู<a href=\"whatsthis:%1\">เกี่ยวกับจดหมายแบบ HTML</a> "
-"และดู<a href=\"whatsthis:%2\">รายละเอียดเกี่ยวกับการอ้างถึงสิ่งที่อยู่ภายนอก</a>"
-"เพิ่มเติม"
+"อาจจะเป็นการเพิ่มความเสี่ยงต่อความปลอดภัยของระบบ หากระบบของคุณมีช่องโหว่ โปรดดู<a href="
+"\"whatsthis:%1\">เกี่ยวกับจดหมายแบบ HTML</a> และดู<a href=\"whatsthis:"
+"%2\">รายละเอียดเกี่ยวกับการอ้างถึงสิ่งที่อยู่ภายนอก</a>เพิ่มเติม"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2406,8 +2389,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<qt><b>คำเตือน:</b> การยอมรับโดยไม่มีเงื่อนไข อาจส่งผลต่อความปลอดภัย ใช้ "
-"\"นี่คืออะไร\" (หรือกด Shift-F1) เพื่อดูรายละเอียด</qt>"
+"<qt><b>คำเตือน:</b> การยอมรับโดยไม่มีเงื่อนไข อาจส่งผลต่อความปลอดภัย ใช้ \"นี่คืออะไร"
+"\" (หรือกด Shift-F1) เพื่อดูรายละเอียด</qt>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2426,8 +2409,7 @@ msgstr "การเปลี่ยนการตั้งค่า HTML ทั
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2456,8 +2438,8 @@ msgstr "ไม่รวมจดหมายที่สำคัญมากไ
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "เมื่อพยายามค้นหาจดหมายที่ยังไม่ได้อ่าน:"
 
@@ -2481,8 +2463,8 @@ msgstr "วนรอบในโฟลเดอร์ทั้งหมด"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "เมื่อเข้าไปยังโฟลเดอร์:"
 
@@ -2551,16 +2533,14 @@ msgstr "ไดเร็กทอรี (รูปแบบ \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2596,32 +2576,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2687,8 +2662,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2697,8 +2672,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2752,19 +2727,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "ตั้งชื่อสิ่งที่แนบมาด้วยให้ใช้กันได้กับ Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
@@ -2777,14 +2751,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2894,17 +2868,16 @@ msgstr "ส่งต่อ"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2922,15 +2895,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3002,8 +2975,8 @@ msgstr "แก้ไขการแสดงตัว"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3257,6 +3230,11 @@ msgstr "เลือกโฟลเดอร์"
 msgid "Filters"
 msgstr "ตัวกรอง %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "เลือกข้อความทั้งหมด"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3289,8 +3267,8 @@ msgstr "หาใบรับรองอื่น ๆ"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3308,10 +3286,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3333,10 +3312,10 @@ msgstr "ไม่จำกัด"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3347,7 +3326,7 @@ msgstr ""
 "ไม่สามารถเขียนแฟ้ม %1 ได้:\n"
 "\"%2\" มีส่วนรายละเอียดที่ผิดพลาด"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "ข้อผิดพลาดของ Kmail"
@@ -3388,9 +3367,9 @@ msgstr "ส่วนแสดงตัวผู้ใช้:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3441,8 +3420,8 @@ msgstr "คุณยังไม่สิทธิ์ในการอ่าน
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3453,8 +3432,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr "กำลังเชื่อมต่อไปยังเซิร์ฟเวอร์ %1, โปรดรอสักครู่..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "เกิดข้อผิดพลาดในเชื่อมต่อกับเซิร์ฟเวอร์ %1"
@@ -3480,8 +3458,8 @@ msgstr "เพิ่มสิทธิ์ที่อนุญาต"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3511,7 +3489,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "เลือกโฟลเดอร์"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "โฟลเดอร์ภายใน"
@@ -3536,9 +3514,9 @@ msgstr "เลือกปุ่มพิมพ์ลัดสำหรับโ
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3559,11 +3537,20 @@ msgstr "ยกเลิก"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "ไม่ทราบ"
@@ -3683,56 +3670,16 @@ msgstr "สถานะ: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>จ<br>ด<br>ห<br>ม<br>า<br>ย<br><br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt><b>"
-"<br>ไ"
-"<br>ม่"
-"<br>ใ"
-"<br>ช่"
-"<br>จ"
-"<br>ด"
-"<br>ห"
-"<br>ม"
-"<br>า"
-"<br>ย"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><b><br>ไ<br>ม่<br>ใ<br>ช่<br>จ<br>ด<br>ห<br>ม<br>า<br>ย<br><br>H<br>T<br>M<br>L</"
+"b></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3744,12 +3691,9 @@ msgstr "ชื่อของคุณ:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3758,11 +3702,9 @@ msgstr "องค์กร:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3771,14 +3713,11 @@ msgstr "ที่อยู่อีเมล:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3788,21 +3727,12 @@ msgstr "ที่อยู่อีเมล:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3825,12 +3755,11 @@ msgstr "เลือกกุญแจ OpenPGP ที่จะใช้ในก
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3844,20 +3773,18 @@ msgstr "กุญแจ OpenPGP ของคุณสำหรับเข้า
 #: identitydialog.cpp:218
 #, fuzzy
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr "เลือกกุญแจ OpenPGP ที่ควรใช้ในการเซ็นจดหมายของคุณ และใช้ในการเข้ารหัส"
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3878,11 +3805,10 @@ msgstr "เลือกกุญแจ OpenPGP ที่ควรใช้ใน
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3896,18 +3822,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3929,14 +3854,12 @@ msgstr "ที่อยู่สำหรับตอบกลับ:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3945,15 +3868,12 @@ msgstr "ที่อยู่ ซ่อนสำเนาถึง:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3994,7 +3914,7 @@ msgstr "ลายเซ็น"
 msgid "&Picture"
 msgstr "รูปภาพ"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 #, fuzzy
 msgid "Invalid Email Address"
 msgstr "เพิ่มที่อยู่อีเมล์"
@@ -4014,8 +3934,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4065,8 +3985,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (ค่าปริยาย)"
 
@@ -4117,14 +4037,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4166,17 +4086,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "ผิดพลาด: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"การเชื่อมต่อไปยังเซิร์ฟเวอร์ %1 ถูกยุติการเชื่อมต่ออย่างไม่คาดคิด "
-"หรืออาจจะหมดเวลาเชื่อมต่อ และจะพยายามทำการเชื่อมต่อใหม่หากเป็นไปได้"
+"การเชื่อมต่อไปยังเซิร์ฟเวอร์ %1 ถูกยุติการเชื่อมต่ออย่างไม่คาดคิด หรืออาจจะหมดเวลาเชื่อมต่อ "
+"และจะพยายามทำการเชื่อมต่อใหม่หากเป็นไปได้"
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4322,14 +4247,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4357,136 +4282,110 @@ msgstr "กุญแจการเข้ารหัสยังไม่มี
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4501,136 +4400,110 @@ msgstr "การส่งใบรับรอง"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4644,9 +4517,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4674,26 +4548,26 @@ msgstr "ยังไม่ได้กำหนดกุญแจการเซ
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4704,8 +4578,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4728,8 +4602,8 @@ msgstr "ใช้สำหรับการเซ็น"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4750,8 +4624,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4789,11 +4663,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4838,10 +4712,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "ข้อผิดพลาดร้ายแรง: ไม่สามารถเก็บจดหมายไว้ได้ (พื้นที่เต็มหรือเปล่า ?)"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"ล้มเหลวในการเพิ่มจดหมาย:\n"
+msgid "Failed to add message:\n"
+msgstr "ล้มเหลวในการเพิ่มจดหมาย:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -4935,6 +4807,50 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr "ไดเร็กทอรี กล่องจดหมาย"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "ตั้งชื่อเรื่องจดหมาย"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "ส่ง สำเนาถึง: ไปยัง 'ที่อยู่'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "ส่ง ซ่อนสำเนาถึง: ไปยัง 'ที่อยู่'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "เพิ่ม 'ส่วนหัว' ไปยังจดหมาย"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "อ่านเนื้อความจดหมายจาก 'แฟ้ม'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "ตั้งค่าเนื้อความจดหมาย"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "เพิ่มสิ่งที่แนบมาด้วยไปยังจดหมาย ซึ่งสามารถทำซ้ำได้อีก"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "ตรวจจดหมายใหม่เท่านั้น"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "เปิดหน้าต่างเขียนจดหมายเท่านั้น"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "แสดงแฟ้มจดหมายที่ให้"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "จดหมาย"
@@ -4990,9 +4906,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5044,11 +4960,11 @@ msgstr ""
 "มีแฟ้ม %1 อยู่แล้ว\n"
 "คุณต้องการแทนที่มันหรือไม่ ?"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "บันทึกลงแฟ้ม"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "แทนที่"
 
@@ -5066,7 +4982,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5087,234 +5003,229 @@ msgstr ""
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 #, fuzzy
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"นี่เป็นการส่งต่อ โดยแยกเป็นแบบ MIME ซึ่งเนื้อหาของจดหมายจะถูกบรรจุไว้ใน "
-"ส่ิงที่แนบไปด้วย\n"
+"นี่เป็นการส่งต่อ โดยแยกเป็นแบบ MIME ซึ่งเนื้อหาของจดหมายจะถูกบรรจุไว้ใน ส่ิงที่แนบไปด้วย\n"
 "\n"
 "\n"
 "--\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "ลบจดหมาย"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "กำลังย้ายจดหมาย %3 ของ %2 จาก %1"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 #, fuzzy
 msgid "Not enough free disk space?"
 msgstr "พื้นที่บนดิสก์มีไม่เพียงพอ"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 #, fuzzy
 msgid "Move to This Folder"
 msgstr "ย้ายไปยังโฟลเดอร์นี้"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 #, fuzzy
 msgid "Copy to This Folder"
 msgstr "สำเนาไปยังโฟลเดอร์นี้"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "ย้ายจดหมาย"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "ลบจดหมาย"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "กำลังเปิด URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 #, fuzzy
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>คุณต้องการลบรายการแสดงตัว <b>\"%1\"</b> จริงหรือไม่ ?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "ประมวลผลคำสั่ง"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 #, fuzzy
 msgid "Found no attachments to save."
 msgstr "ไม่ให้แสดงสิ่งที่แนบมาด้วยในช่องเนื้อหาจดหมาย"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 #, fuzzy
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุณต้องการเขียนทับมันหรือไม่ ?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
-msgstr ""
-"ส่วนนี้ของข้อความถูกเข้ารหัสไว้ คุณต้องการรักษาการเข้ารหัสนี้ "
-"เมื่อมีการบันทึกหรือไม่ ?"
+msgstr "ส่วนนี้ของข้อความถูกเข้ารหัสไว้ คุณต้องการรักษาการเข้ารหัสนี้ เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "คำถามของ KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "การเข้ารหัส"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "ไม่เข้ารหัส"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
-msgstr ""
-"ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการรักษาลายเซ็นนี้ไว้ "
-"เมื่อมีการบันทึกหรือไม่ ?"
+msgstr "ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการรักษาลายเซ็นนี้ไว้ เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "ลายเซ็น"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "ตั้งค่าการเข้ารหัส"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "จดหมาย"
@@ -5415,7 +5326,7 @@ msgstr "ขนาด"
 msgid "Encoding"
 msgstr "ชุดรหัสอักขระ"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "เขียนจดหมาย"
@@ -5428,7 +5339,7 @@ msgstr "การเข้ารหัส"
 msgid "Sign"
 msgstr "เซ็น"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "ลบสิ่งที่แนบมาด้วย"
@@ -5450,7 +5361,8 @@ msgstr "<ผู้รับ>"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5461,9 +5373,9 @@ msgstr "ผู้รับไม่ถูกต้อง"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5473,9 +5385,8 @@ msgstr "ผู้รับไม่ถูกต้อง"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5486,7 +5397,7 @@ msgstr "ส่งจดหมาย"
 msgid "&Send Mail Via"
 msgstr "ส่งจดหมายผ่านทาง"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "ส่งภายหลัง"
@@ -5553,8 +5464,7 @@ msgstr "ลบอักขระอ้างถึง"
 msgid "Cl&ean Spaces"
 msgstr "ล้างช่องว่าง"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "ใช้ตัวอักษรความกว้างคงที่"
@@ -5697,31 +5607,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "มาตรฐาน"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5827,8 +5737,8 @@ msgstr "เครื่องมือเขียนจดหมายใหม
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5837,43 +5747,45 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "แสดงสิ่งที่แนบมาด้วย: "
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Send as Is"
 msgstr "ทำการส่ง"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "แนบแฟ้ม"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "แนบ"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "แทรกแฟ้ม"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "แทรกแฟ้ม"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5913,287 +5825,297 @@ msgid ""
 "View"
 msgstr "แสดง"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "แก้ไข..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "แก้ไข..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "บันทึกเป็น..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "คุณสมบัติ..."
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "เพิ่มสิ่งที่แนบมาด้วย..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr ""
-"ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการคงลายเซ็นนี้ไว้ "
-"เมื่อมีการบันทึกหรือไม่ ?"
+msgstr "ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการคงลายเซ็นนี้ไว้ เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "คงไว้"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "เพิ่มสิ่งที่แนบมาด้วย..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "วางเป็นสิ่งที่แนบมาด้วย"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ยังไม่มีชื่อ"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "กุญแจการเข้ารหัสยังไม่มีการนิยาม"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "ยังไม่ได้กำหนดกุญแจการเซ็น"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "ออนไลน์/ออฟไลน์"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "คุณต้องระบุผู้รับอย่างน้อยหนึ่งตัวในช่อง ถึง:"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "คุณยังไม่ได้ระบุชื่อเรื่อง ทำการส่งหรือไม่ ?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "ไม่ยังได้กำหนดชื่อเรื่อง"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "คุณยังไม่ได้ระบุชื่อเรื่อง ทำการส่งหรือไม่ ?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "ไม่ยังได้กำหนดชื่อเรื่อง"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "S&end as Is"
 msgstr "ทำการส่ง"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "ไม่ ให้กำหนดชื่อเรื่องก่อน"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "ลายเซ็น/การเข้ารหัส"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "เข้ารหัสจดหมายหรือไม่ ?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "โปรดสร้างบัญชีผู้ใช้งานสำหรับการส่ง แล้วลองใหม่อีกครั้ง"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "เกี่ยวกับการส่งจดหมาย..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "ยืนยันการส่ง"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "ส่งเดี๋ยวนี้"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "ไม่มีผู้รับ"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "ผู้รับไม่ถูกต้อง"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " การตรวจคำสะกดถูกยกเลิก"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " หยุดตรวจคำสะกดแล้ว"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " ตรวจคำสะกดเรียบร้อยแล้ว"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "ไม่พบลายเซ็น"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "ตั้งค่าการเข้ารหัส"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "จดหมายถูกเซ็นกำกับโดย %1"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "จดหมายถูกเซ็นกำกับโดย %1"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "จดหมายแบบ OpenPGP - มีการเข้ารหัสไว้"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "จดหมายที่มีชื่อเรื่อง: "
@@ -6241,8 +6163,8 @@ msgstr "ตรวจคำสะกด - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ไม่สามารถเริ่มการทำงาน ISpell ได้\n"
 " โปรดตรวจสอบว่า คุณได้ตั้งค่าพาธไปยัง ISpell ถูกต้องแล้ว"
@@ -6281,9 +6203,8 @@ msgstr "มีการกระทำเมื่อกรองมากเก
 #: kmfilter.cpp:289
 #, fuzzy
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 "ไม่รู้จักการกระทำเมื่อกรอง `%1'\n"
 " ในกฎการกรอง `%2'\n"
@@ -6527,165 +6448,128 @@ msgstr ""
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>นี่เป็นรายการของตัวกรองที่กำหนดไว้ ซึ่งจะถูกประมวลผล 'จากบนลงล่าง'</p>"
-"<p>คลิ้กที่ตัวกรองตัวใดตัวหนึ่ง เพื่อแก้ไขมัน โดยใช้ การควบคุม "
-"ที่อยู่ทางด้านขวาของไดอะล็อกซ์</p></qt>"
+"<qt><p>นี่เป็นรายการของตัวกรองที่กำหนดไว้ ซึ่งจะถูกประมวลผล 'จากบนลงล่าง'</"
+"p><p>คลิ้กที่ตัวกรองตัวใดตัวหนึ่ง เพื่อแก้ไขมัน โดยใช้ การควบคุม ที่อยู่ทางด้านขวาของไดอะล็อกซ์</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p>"
-"<p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง "
-"</p>"
-"<p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม <em>ลบ</em> "
-"(ซึ่งอยู่ด้านขวา)</p></qt>"
+"<qt><p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p><p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน "
+"แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง </p><p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม "
+"<em>ลบ</em> (ซึ่งอยู่ด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p>"
-"<p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง "
-"</p>"
-"<p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม <em>ลบ</em> "
-"(ซึ่งอยู่ด้านขวา)</p></qt>"
+"<qt><p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p><p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน "
+"แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง </p><p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม "
+"<em>ลบ</em> (ซึ่งอยู่ด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อ <em>ลบ</em> ตัวกรองที่เลือกไว้ จากรายการด้านบน</p>"
-"<p>ซึ่งหากมันถูกลบแล้ว ก็จะไม่สามารถเรียกมันกลับมาได้ "
-"แต่คุณก็สามารถจะออกจากกล่องโต้ตอบนี้ได้ โดย <em>ยกเลิก</em> "
-"เพื่อละทิ้งการเปลี่ยนแปลงที่ทำไว้</p></qt>"
+"<qt><p>คลิ้กปุ่มนี้ เพื่อ <em>ลบ</em> ตัวกรองที่เลือกไว้ จากรายการด้านบน</"
+"p><p>ซึ่งหากมันถูกลบแล้ว ก็จะไม่สามารถเรียกมันกลับมาได้ แต่คุณก็สามารถจะออกจากกล่องโต้ตอบนี้ได้ "
+"โดย <em>ยกเลิก</em> เพื่อละทิ้งการเปลี่ยนแปลงที่ทำไว้</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
-"ไปหนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
+"ไปหนึ่งระดับในรายการด้านบน</p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ "
+"ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</"
+"p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
 "(อยู่ทางด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
-"ไปหนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
+"ไปหนึ่งระดับในรายการด้านบน</p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ "
+"ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</"
+"p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
 "(อยู่ทางด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> "
-"หนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>"
-"เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> หนึ่งระดับในรายการด้านบน</"
+"p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
+"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม "
+"<em>เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> "
-"หนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>"
-"เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> หนึ่งระดับในรายการด้านบน</"
+"p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
+"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม "
+"<em>เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กที่ปุ่มนี้ เพื่อเปลี่ยนชื่อตัวกรองที่เลือกไว้ในปัจจุบัน </p>"
-"<p>ปกติแล้ว ตัวกรองจะถูกกำหนดชื่อโดยอัตโนมัติ หากมันเริ่มด้วย \"<<\"</p>"
-"<p>หากคุณเผลอเปลี่ยนชื่อมัน คุณสามารถกลับไปให้มัน ใช้ชื่ออัตโนมัติได้ "
-"โดยคลิ้กที่ปุ่มนี้ แล้วเลือก <em>ล้าง</em> จากนั้นกด <em>ตกลง</em> "
-"ในกล่องโต้ตอบที่ปรากฎ</p></qt>"
+"<qt><p>คลิ้กที่ปุ่มนี้ เพื่อเปลี่ยนชื่อตัวกรองที่เลือกไว้ในปัจจุบัน </p><p>ปกติแล้ว "
+"ตัวกรองจะถูกกำหนดชื่อโดยอัตโนมัติ หากมันเริ่มด้วย \"<<\"</p><p>หากคุณเผลอเปลี่ยนชื่อมัน "
+"คุณสามารถกลับไปให้มัน ใช้ชื่ออัตโนมัติได้ โดยคลิ้กที่ปุ่มนี้ แล้วเลือก <em>ล้าง</em> จากนั้นกด "
+"<em>ตกลง</em> ในกล่องโต้ตอบที่ปรากฎ</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6697,6 +6581,16 @@ msgstr "กฎการกรอง POP3"
 msgid "Filter Rules"
 msgstr "กฎการกรอง"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "นำเข้า"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "นำเข้า"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "การกรองที่มี"
@@ -6781,6 +6675,11 @@ msgstr "ทำการเพิ่มตัวกรองนี้ไปยั
 msgid "Icon for this filter:"
 msgstr "ภาพไอคอนสำหรับตัวกรองนี้:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "ถึง"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "เลื่อนขึ้น"
@@ -6789,16 +6688,29 @@ msgstr "เลื่อนขึ้น"
 msgid "Down"
 msgstr "เลื่อนลง"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "เปลี่ยนชื่อ..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "ใหม่"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "ทำสำเนาไปยัง"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "ลบ"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6807,8 +6719,8 @@ msgstr "เลือกปุ่มพิมพ์ลัดสำหรับโ
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6882,19 +6794,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6933,8 +6842,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6954,8 +6863,7 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -6971,8 +6879,8 @@ msgstr "สร้างดัชนีสำหรับโฟลเดอร์
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7098,10 +7006,8 @@ msgstr "กำลังสร้างโฟลเดอร์ย่อยบน
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7123,9 +7029,8 @@ msgstr "การตั้งค่าโฟลเดอร์"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7134,14 +7039,14 @@ msgstr "ยกเลิกแล้ว"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7157,11 +7062,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7170,15 +7075,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "ย้ายไปยัง:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "ไม่ต้องย้าย"
 
@@ -7190,8 +7100,7 @@ msgstr "ย้ายจดหมายไปยังโฟลเดอร์"
 msgid "Permissions (ACL)"
 msgstr "สิทธิ์ที่อนุญาต (แบบ ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, fuzzy, no-c-format
 msgid "General"
 msgstr "ทั่วไป"
@@ -7216,8 +7125,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "ใช้ไอคอนที่กำหนดเอง"
@@ -7237,14 +7145,13 @@ msgstr "ทำเครื่องหมายจดหมายในโฟล
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7258,9 +7165,9 @@ msgstr "ให้จดหมายเก่าในโฟลเดอร์น
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7271,17 +7178,21 @@ msgstr "แสดงคอลัมน์ผู้ส่ง/ผู้รับ�
 msgid "Sho&w column:"
 msgstr "แสดงคอลัมน์:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "ตั้งเป็นค่าปริยาย"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "ผู้ส่ง"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "ผู้รับ"
@@ -7292,11 +7203,11 @@ msgstr "การแสดงตัวของผู้ส่ง:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7315,12 +7226,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7351,17 +7262,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7434,7 +7345,8 @@ msgstr "เกิดข้อผิดพลาดระหว่างขอข
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "ดัชนีจดหมายสำหรับ '%1' มาจาก KMail (%2) ที่ไม่ทราบรุ่น\n"
 "ดัชนีนี้ สามารถสร้างใหม่ได้ จากโฟลเดอร์จดหมายของคุณ \n"
@@ -7467,11 +7379,10 @@ msgstr ""
 #: kmfoldermaildir.cpp:92
 #, fuzzy
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"เกิดข้อผิดพลาดระหว่างเปิด %1 "
-"อาจเป็นไปได้ว่ามันไม่ได้เป็นไดเร็กทอรีจดหมายที่ถูกต้อง "
+"เกิดข้อผิดพลาดระหว่างเปิด %1 อาจเป็นไปได้ว่ามันไม่ได้เป็นไดเร็กทอรีจดหมายที่ถูกต้อง "
 "หรือคุณอาจจะยังไม่มีสิทธิ์เข้าใช้งานมัน"
 
 #: kmfoldermaildir.cpp:124
@@ -7501,8 +7412,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"กล่องจดหมายออกของคุณมีจดหมายที่ไม่ได้ถูกสร้างจาก Kmail โปรดลบมันจากที่นั่น "
-"หากคุณไม่ต้องการให้ Kmail ทำการส่งมันด้วย"
+"กล่องจดหมายออกของคุณมีจดหมายที่ไม่ได้ถูกสร้างจาก Kmail โปรดลบมันจากที่นั่น หากคุณไม่ต้องการให้ "
+"Kmail ทำการส่งมันด้วย"
 
 #: kmfoldermbox.cpp:112
 msgid ""
@@ -7514,13 +7425,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7556,8 +7465,7 @@ msgstr "ไม่สามารถเพิ่มจดหมายไปยั
 
 #: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
-msgstr ""
-"ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์ได้ (มีเนื้อที่บนดิสก์เหลือเพียงพอหรือไม่ ?)"
+msgstr "ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์ได้ (มีเนื้อที่บนดิสก์เหลือเพียงพอหรือไม่ ?)"
 
 #: kmfoldermgr.cpp:68
 msgid "Are you sure you want to expire old messages?"
@@ -7577,13 +7485,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7591,8 +7499,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7600,7 +7508,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7645,8 +7553,7 @@ msgstr "ค้นหา"
 
 #: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
-msgstr ""
-"<qt>ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไปในโฟลเดอร์ <b>%1</b> หรือไม่ ?</qt>"
+msgstr "<qt>ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไปในโฟลเดอร์ <b>%1</b> หรือไม่ ?</qt>"
 
 #: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
@@ -7702,9 +7609,9 @@ msgstr "แก้ไปปัญหาแคชของ IMAP..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7836,13 +7743,13 @@ msgstr "%1 โฟลเดอร์อ่านได้อย่างเดี
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>คุณแน่ใจหรือว่า ต้องการจะลบจดหมายที่เลือกไว้ทั้ง %n ฉบับนี้ ?"
-"<br>หากมันถูกลบไปแล้ว จะไม่สามารถกู้คืนมาได้ !</qt>"
+"<qt>คุณแน่ใจหรือว่า ต้องการจะลบจดหมายที่เลือกไว้ทั้ง %n ฉบับนี้ ?<br>หากมันถูกลบไปแล้ว "
+"จะไม่สามารถกู้คืนมาได้ !</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -7894,145 +7801,142 @@ msgstr ""
 "ล้มเหลวในการแก้ไข %1\n"
 "(พื้นที่บนดิสก์มีพอหรือไม่ ?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "ร้องขอลายเซ็นของใบรับรอง"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "โปรดสร้างใบรับรองจากสิ่งที่แนบมาด้วยและส่งกลับไปยังผู้ส่ง"
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "ทำงานออนไลน์"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายเข้าของคุณ"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "จดหมายออก"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายออกของคุณ"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "จดหมายที่ส่งแล้ว"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายที่ส่งแล้วของคุณ"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "ถังขยะ"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ถังขยะของคุณ"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "ฉบับร่าง"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ฉบับร่างของคุณ"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ถังขยะของคุณ"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "ค้นหาล่าสุด"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 #, fuzzy
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
-"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K "
-"และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
+"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
 "ข้อผิดพลาดคือ:\n"
 "%1"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
 "The error was:\n"
 "%1"
 msgstr ""
-"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K "
-"และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
+"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
 "ข้อผิดพลาดคือ:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "เทถังขยะทิ้ง"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "คุณแน่ใจหรือว่าต้องการจะเทถังขยะทิ้ง ?"
 
@@ -8109,8 +8013,7 @@ msgstr "จดหมายใหม่ %n ฉบับใน %1"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>ได้รับจดหมายใหม่</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8148,11 +8051,10 @@ msgstr "คุณแน่ใจหรือว่าต้องการจะ
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>คุณแน่ใจหรือว่า ต้องการจะทิ้งจดหมายทั้งหมดจากโฟลเดอร์ <b>%1</b> "
-"ลงถังขยะ ?</qt>"
+"<qt>คุณแน่ใจหรือว่า ต้องการจะทิ้งจดหมายทั้งหมดจากโฟลเดอร์ <b>%1</b> ลงถังขยะ ?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8176,8 +8078,8 @@ msgstr "ลบการค้นหา"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt>คุณแน่ใจหรือว่าต้องการจะลบการค้นหา <b>%1</b> ? "
 "<br>จดหมายที่แสดงอยู่ในผลการค้นหาจะยังคงอยู่ในโฟลเดอร์เดิมของมัน</qt>"
@@ -8194,36 +8096,36 @@ msgstr "<qt>คุณต้องการลบรายการแสดง�
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "ลบ"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8237,9 +8139,9 @@ msgstr "คุณแน่ใจหรือไม่ ที่จะให้�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "การใช้ HTML ในจดหมาย อาจจะทำให้คุณได้รับ จดหมาย\n"
 "\"ขยะ\" และอาจทำให้ระบบของคุณ มีปัญหาเรื่องความปลอดภัยได้"
@@ -8256,8 +8158,8 @@ msgstr "ใช้ HTML"
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "การใช้ HTML ในจดหมาย อาจจะทำให้คุณได้รับ จดหมาย\n"
 "\"ขยะ\" และอาจทำให้ระบบของคุณ มีปัญหาเรื่องความปลอดภัยได้"
@@ -8276,8 +8178,8 @@ msgstr "กรองบนจดหมายเวียน %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8295,7 +8197,8 @@ msgstr "ไม่สามารถเริ่มตัวจัดการใ
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "ไม่สามารถเริ่มตัวจัดการใบรับรองได้ โปรดตรวจสอบการติดตั้งของคุณ !"
 
 #: kmmainwidget.cpp:2508
@@ -8630,8 +8533,7 @@ msgstr "บันทึกสิ่งที่แนบมาด้วย..."
 msgid "Appl&y All Filters"
 msgstr "ปรับใช้ตัวกรองทั้งหมด"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "ปรับใช้ตัวกรอง"
@@ -8747,7 +8649,6 @@ msgstr "ฉบับที่ยังไม่ได้อ่านถัดไ
 msgid "Go to the next unread message"
 msgstr "ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไป"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "ฉบับก่อนหน้านี้"
@@ -8795,8 +8696,7 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"เลื่อนจดหมายฉบับปัจจุบันลง หากอยู่ที่ส่วนท้ายของฉบับปัจจุบันแล้ว "
-"ให้ไปยังฉบับที่ยังไม่ได้อ่านฉบับถัดไป"
+"เลื่อนจดหมายฉบับปัจจุบันลง หากอยู่ที่ส่วนท้ายของฉบับปัจจุบันแล้ว ให้ไปยังฉบับที่ยังไม่ได้อ่านฉบับถัดไป"
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -8886,25 +8786,25 @@ msgstr " กำลังเริ่มการทำงาน..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8912,8 +8812,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8921,8 +8821,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8952,17 +8852,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "ผู้รับ: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, fuzzy, c-format
 msgid "Attachment: %1"
 msgstr "สิ่งที่แนบมาด้วย: "
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "แสดงสิ่งที่แนบมาด้วยตามคำแนะนำของผู้ส่ง"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9013,29 +8913,26 @@ msgstr "คุณสมบัติส่วนของจดหมาย"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9044,11 +8941,10 @@ msgstr "รายละเอียด:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9057,14 +8953,13 @@ msgstr "ชุดรหัสอักขระ:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9073,13 +8968,11 @@ msgstr "แสดงคำแนะนำอัตโนมัติ"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9089,14 +8982,12 @@ msgstr "เซ็นส่วนนี้"
 #: kmmsgpartdlg.cpp:171
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</p>"
-"<p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
+"<qt><p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</"
+"p><p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9105,13 +8996,11 @@ msgstr "เข้ารหัสจดหมายส่วนนี้"
 #: kmmsgpartdlg.cpp:181
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</p>"
-"<p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
+"<qt><p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</"
+"p><p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9126,15 +9015,13 @@ msgstr "ตัวกรอง POP ของ KMail"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"พบจดหมายที่กรองบนบัญชีผู้ใช้แบบ POP: <b>%1</b>"
-"<p>จดหมายที่แสดงอยู่นี้ มีขนาดใหญ่กว่าขนาดใหญ่สุดที่จำกัดไว้สำหรับบัญชีนี้"
-"<br>คุณสามารถเลือกว่า ต้องการจะให้ทำอะไรกับจดหมาย โดยการเลือกปุ่มนี้"
+"พบจดหมายที่กรองบนบัญชีผู้ใช้แบบ POP: <b>%1</b><p>จดหมายที่แสดงอยู่นี้ "
+"มีขนาดใหญ่กว่าขนาดใหญ่สุดที่จำกัดไว้สำหรับบัญชีนี้<br>คุณสามารถเลือกว่า "
+"ต้องการจะให้ทำอะไรกับจดหมาย โดยการเลือกปุ่มนี้"
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9390,21 +9277,20 @@ msgstr "โปรแกรมจัดการจดหมายสำหรั
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>กำลังรับข้อมูลเนื้อหาของโฟลเดอร์จดหมาย</h2>"
-"<p>กรุณารอสักครู่ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>กำลังรับข้อมูลเนื้อหาของโฟลเดอร์จดหมาย</"
+"h2><p>กรุณารอสักครู่ . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>ออฟไลน์</h2>"
-"<p>โปรแกรมจัดการจดหมาย - K ทำงานอยู่ในโหมดออฟไลน์ <a href=\"kmail:goOnline\">"
-"คลิกที่นี่</a> เพื่อเปลี่ยนเป็นโหมดออนไลน์ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>ออฟไลน์</h2><p>โปรแกรมจัดการจดหมาย - K "
+"ทำงานอยู่ในโหมดออฟไลน์ <a href=\"kmail:goOnline\">คลิกที่นี่</a> "
+"เพื่อเปลี่ยนเป็นโหมดออนไลน์ . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
 #, fuzzy
@@ -9413,18 +9299,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9435,15 +9320,14 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>ยินดีต้อนรับสู่โปรแกรมจัดการจดหมาย - K รุ่น %1</h2> "
 "<p>โปรแกรมจัดการจดหมาย - K เป็นโปรแกรมสำหรับอ่าน/เขียนและจัดการจดหมาย "
 "สำหรับสภาพแวดล้อมพื้นที่ทำงาน K (TDE) "
-"ซึ่งถูกออกแบบมาให้เหมาะกับการใช้งานกับจดหมายมาตรฐานบนอินเตอร์เน็ต รวมทั้งรูปแบบ "
-"MIME, SMTP, POP3 และ IMAP</p>\n"
-"<ul>"
-"<li>โปรแกรมจัดการจดหมาย - K นั้น มีคุณสมบัติมากมายซึ่งได้อธิบายไว้ใน<a "
-"href=\"%2\">เอกสาร</a></li>\n"
+"ซึ่งถูกออกแบบมาให้เหมาะกับการใช้งานกับจดหมายมาตรฐานบนอินเตอร์เน็ต รวมทั้งรูปแบบ MIME, "
+"SMTP, POP3 และ IMAP</p>\n"
+"<ul><li>โปรแกรมจัดการจดหมาย - K นั้น มีคุณสมบัติมากมายซึ่งได้อธิบายไว้ใน<a href="
+"\"%2\">เอกสาร</a></li>\n"
 "<li>ลองแวะมาเยี่ยมที่<a href=\"%3\">โฮมเพจของโปรแกรมจัดการจดหมาย - K</a> "
 "เพื่อติดตามการพัฒนารวมถึงข้อมูลของโปรแกรมจัดการจดหมาย - K รุ่นใหม่</li></ul>\n"
-"<p>คุณสมบัติใหม่ในโปรแกรมจัดการจดหมาย - K รุ่นนี้ (โดยเปรียบเทียบกับ "
-"โปรแกรมจัดการจดหมาย - K %4 ซึ่งเป็นส่วนหนึ่งของ TDE %5):</p>\n"
+"<p>คุณสมบัติใหม่ในโปรแกรมจัดการจดหมาย - K รุ่นนี้ (โดยเปรียบเทียบกับ โปรแกรมจัดการจดหมาย "
+"- K %4 ซึ่งเป็นส่วนหนึ่งของ TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9453,20 +9337,17 @@ msgstr ""
 "โปรแกรมจัดการจดหมาย - K</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>โปรดสละเวลาสักครู่ เพื่อปรับแต่งพาเนลของ KMail ที่ ตั้งค่า-&gt;ปรับแต่ง "
-"KMail\n"
+"<p>โปรดสละเวลาสักครู่ เพื่อปรับแต่งพาเนลของ KMail ที่ ตั้งค่า-&gt;ปรับแต่ง KMail\n"
 "คุณต้องใส่รายละเอียด อย่างน้อยก็ส่วนแสดงตัว และบัญชีผู้ใช้จดหมาย</p>\n"
 
 #: kmreaderwin.cpp:1375
@@ -9507,12 +9388,12 @@ msgstr "แสดงสิ่งที่แนบมาด้วย: %1"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "\n"
-"[KMail: สิ่งที่แนบมาด้วย มีส่วนที่เป็นข้อมูลไบนารี กำลังพยายามแสดงอักขระ %1 "
-"ตัวแรก]"
+"[KMail: สิ่งที่แนบมาด้วย มีส่วนที่เป็นข้อมูลไบนารี กำลังพยายามแสดงอักขระ %1 ตัวแรก]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -9536,12 +9417,14 @@ msgstr "เปิดสิ่งที่แนบมาด้วยหรือ
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9563,6 +9446,67 @@ msgstr "(ถูกต้องตรงกันบางส่วนกับ�
 msgid "(match all of the following)"
 msgstr "(ถูกต้องตรงกันทั้งหมดกับเงื่อนไขต่อไปนี้)"
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "อ่านแล้ว"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr ""
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "ลบ"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "ตอบกลับแล้ว"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "ส่งต่อ:"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "อยู่ในคิวแล้ว"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "ส่งแล้ว"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr ""
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "ยังไม่ได้อ่าน"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "ถึง: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "เปิดสิ่งที่แนบมาด้วยหรือไม่ ?"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9647,17 +9591,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9683,8 +9627,8 @@ msgstr "เริ่มโปรเซสการส่ง..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9711,8 +9655,9 @@ msgstr "ล้มเหลวในการส่งจดหมายไปย
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9734,13 +9679,11 @@ msgstr "ส่งภายหลัง"
 #: kmsender.cpp:720
 #, fuzzy
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 "การส่งล้มเหลว:\n"
 "%1\n"
@@ -9771,8 +9714,9 @@ msgstr "การส่ง"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9826,30 +9770,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9862,6 +9806,10 @@ msgstr "สถานะ: "
 msgid "Exit"
 msgstr "แก้ไข"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -9888,8 +9836,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9950,8 +9899,7 @@ msgstr "ชื่อโดเมนหรือหมายเลขไอพี
 #: kmtransport.cpp:406
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
-msgstr ""
-"หมายเลขพอร์ตที่เซิร์ฟเวอร์ SMTP รอรับการเชื่อมต่ออยู่ ซึ่งค่าปริยายคือ 25"
+msgstr "หมายเลขพอร์ตที่เซิร์ฟเวอร์ SMTP รอรับการเชื่อมต่ออยู่ ซึ่งค่าปริยายคือ 25"
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -9969,8 +9917,8 @@ msgstr "เซิร์ฟเวอร์ต้องการตรวจสอ
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9992,10 +9940,9 @@ msgstr "ส่งชื่อโฮสต์ที่กำหนดเองไ
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -10027,8 +9974,8 @@ msgstr "อนุญาตให้ใช้เฉพาะแฟ้มภาย
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "ชื่อโดเมนหรือหมายเลขไอพีของเซิร์ฟเวอร์ SMTP"
 
 #: kmtransport.cpp:788
@@ -10045,10 +9992,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10287,22 +10234,18 @@ msgstr "แก้ไขจดหมาย"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10315,8 +10258,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10331,14 +10274,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10439,8 +10382,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10475,8 +10418,9 @@ msgstr "ไม่เข้ารหัส"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10487,8 +10431,8 @@ msgstr "บันทึกแบบไม่เข้ารหัส"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10509,74 +10453,72 @@ msgstr "เข้ารหัสทุกส่วน"
 msgid "Unencrypted Message Warning"
 msgstr "จดหมายถูกเข้ารหัสไว้"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>มีอักขระบางตัว ไม่ใช่ชุดรหัสอักขระที่เลือกไว้"
-"<br>คุณต้องการทำการส่งจดหมายต่อไปหรือไม่ ?</qt>"
+"<qt>มีอักขระบางตัว ไม่ใช่ชุดรหัสอักขระที่เลือกไว้<br>คุณต้องการทำการส่งจดหมายต่อไปหรือไม่ ?</"
+"qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "มีบางอักขระสูญหายไป"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "ตั้งค่าชุดรหัสอักขระ"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10600,10 +10542,10 @@ msgstr "รูปแบบกล่องจดหมาย:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10614,8 +10556,8 @@ msgstr "ไอคอนโฟลเดอร์"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10660,8 +10602,7 @@ msgstr "ได้ผลลัพธ์ที่แตกต่างกันส
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "สถานะ: "
 
@@ -10693,8 +10634,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "ไม่สามารถตรวจสอบลายเซ็นได้"
 
 #: objecttreeparser.cpp:737
@@ -10733,27 +10674,25 @@ msgstr "ปลั๊กอินเข้ารหัส %1 ไม่สาม�
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย "
-"จะแสดงเฉพาะส่วนที่เป็น HTML แท้ ๆ เท่านั้น "
-"หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
+"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย จะแสดงเฉพาะส่วนที่เป็น HTML "
+"แท้ ๆ เท่านั้น หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
 "อย่างเต็มรูปแบบได้ โดยการ <a href=\"kmail:showHTML\">คลิ้กที่นี่</a>."
 
 #: objecttreeparser.cpp:1010
 #, fuzzy
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย "
-"จะแสดงเฉพาะส่วนที่เป็น HTML แท้ ๆ เท่านั้น "
-"หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
+"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย จะแสดงเฉพาะส่วนที่เป็น HTML "
+"แท้ ๆ เท่านั้น หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
 "อย่างเต็มรูปแบบได้ โดยการ <a href=\"kmail:showHTML\">คลิ้กที่นี่</a>."
 
 #: objecttreeparser.cpp:1227
@@ -11006,8 +10945,8 @@ msgstr "ที่เก็บไว้: "
 #: objecttreeparser.cpp:2513
 #, fuzzy
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "ไม่มีที่อยู่อีเมล์ที่ถูกเก็บไว้ใน %1 ซึ่งใช้สำหรับการเซ็น ดังนั้น "
 "เราจึงไม่สามารถเปรียบเทียบมันกับที่อยู่ผู้ส่ง &lt;%2&gt; ได้"
@@ -11129,10 +11068,11 @@ msgstr "ข้อความผิดพลาดจาก Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11150,9 +11090,9 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
-msgstr ""
-"กำลังดึงจดหมาย %1 จาก %2 (%3 จาก %4 KB) จาก %5 (คงเหลือบนเซิร์ฟเวอร์ %6 KB)"
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
+msgstr "กำลังดึงจดหมาย %1 จาก %2 (%3 จาก %4 KB) จาก %5 (คงเหลือบนเซิร์ฟเวอร์ %6 KB)"
 
 #: popaccount.cpp:912
 #, fuzzy
@@ -11170,1647 +11110,14 @@ msgstr "การตอบกลับของเซิร์ฟเวอร์
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "เซิร์ฟเวอร์ของคุณไม่สนับสนุนคำสั่ง TOP ซึ่งจะทำให้ไม่สามารถดึง "
 "หัวจดหมายออกจากจดหมายขนาดใหญ่ก่อนได้ ก่อนที่จะทำการดาวน์โหลดมัน"
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "ไปยัง"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "โฟลเดอร์"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "จดหมาย"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "ตอบกลับแบบพิเศษ"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "ส่งต่อ"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "แถบเครื่องมือ HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "ลงลายเซ็น"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "เซ็นจดหมายโดยอัตโนมัติ"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "การเข้ารหัส"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "แสดงข้อความลายเซ็น/การเข้ารหัสหลังจากเขียนจดหมาย"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "เลือกเพื่อให้มีการจัดเก็บจดหมายที่เข้ารหัสไว้"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "แสดงกุญแจเข้ารหัสสำหรับการอนุญาตเสมอ"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "ทำการเข้ารหัสจดหมายหากสามารถทำได้โดยอัตโนมัติ"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "ไม่ต้องเซ็น/เข้ารหัสเมื่อบันทึกเป็นจดหมายฉบับร่าง"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "ถึง: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "สำเนาถึง: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "ทั่วไป"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "ตอบกลับไปยัง"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "ตอบกลับทั้งหมด..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "ส่งต่อ"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "ปุ่มพิมพ์ลัด:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, fuzzy, no-c-format
-msgid "Folder Properties"
-msgstr "ตำแหน่งโฟลเดอร์"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, fuzzy, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "โฟลเดอร์เก็บจดหมายเวียน"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "List &address:"
-msgstr "ที่อยู่ทางไปรษณีย์:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, fuzzy, no-c-format
-msgid "N&ormal:"
-msgstr "ธรรมดา:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, fuzzy, no-c-format
-msgid "Unr&ead:"
-msgstr "ยังไม่ได้อ่าน:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "ให้จดหมายเก่าหมดอายุ"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, fuzzy, no-c-format
-msgid "E&xpire after:"
-msgstr "หมดอายุ"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "ให้จดหมายเก่าหมดอายุ ?"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, fuzzy, no-c-format
-msgid "Expire a&fter:"
-msgstr "โฟลเดอร์์หมดอายุ"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "ให้จดหมายเก่าหมดอายุ ?"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "วัน"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "สัปดาห์"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "เดือน"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Advanced"
-msgstr "ตัวเลือกเพิ่มเติม"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "การแสดงตัวใหม่:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "ปรับเปลี่ยนรูปแบบวันที่ใหม่"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "สร้างใบรับรอง"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "ลายเซ็นใช้ได้"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "หาใบรับรองอื่น ๆ"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "อย่าส่งใบรับรอง"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "เมื่อมีการเพิ่มใบรับรอง"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "เพิ่ม..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "กรุ๊ปแวร์"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "ไม่จำกัด"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "ปรับแต่งลายเซ็น"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "ตอบกลับไปยังผู้ส่ง:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "ส่งต่อข้อความแล้ว"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "แจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "เลือกเพื่อให้มีการแจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "แจ้งเตือนเมื่อพยายามส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "เช็คเพื่อให้มีการเตือนเมื่อมีการส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "แจ้งเตือนหากที่อยู่อีเมล์ของผู้เซ็นไม่อยู่ในใบรับรอง"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "แจ้งเตือน หากองค์กรผู้ออกใบรับรองจะหมดอายุภายใน"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "ใช้สำหรับการเซ็น"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "การเข้ารหัส"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " วัน"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "เลือกจำนวนของวันที่นี่"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "หาใบรับรองอื่น ๆ"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "หาใบรับรองอื่น ๆ"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "อย่าส่งใบรับรอง"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "เนื้อหาในโฟลเดอร์:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "การแจ้งเตือนเมื่อมีจดหมายใหม่"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "เครื่องมือแก้ไขข้อความ: "
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "ใช้เครื่องมือแก้ไขข้อความภายนอกแทนเครื่องมือเขียนจดหมายมาตรฐาน"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "เพิ่มลายเซ็นท้ายจดหมายอัตโนมัติ"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "ตัดคำที่คอลัมน์:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "แจ้งเตือน หากรากของใบรับรองจะหมดอายุภายใน"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "ใช้ที่อยู่ล่าสุดสำหรับการทำให้สมบูรณ์"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "บันทึกอัตโนมัติทุกช่วงเวลา:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "แทนที่คำนำหน้าที่เลือกด้วย  \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "แทนที่คำนำหน้าที่เลือกด้วย \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "ใช้การอ้างถึงแบบฉลาด"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "ลายเซ็นหมดอายุ"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, fuzzy, no-c-format
-msgid "Type of recipients editor"
-msgstr "ไม่มีผู้รับ"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "ไม่มีผู้รับ"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "ระดับการยุบอัตโนมัติ:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "ลดขนาดอักษรสำหรับส่วนข้อความที่อ้างถึง"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "เปิดใช้ตัวเลือกนี้เพื่อให้แสดงส่วนที่อ้างถึงด้วยตัวอักษรขนาดเล็กลง"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "แสดงสถานะสแปมในส่วนหัวแบบแฟนซี"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "รายการจดหมาย - จดหมายใหม่"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "เพิ่มอักขระอ้างถึง"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12918,6 +11225,11 @@ msgstr "เพิ่มในส่วนสำเนาถึง"
 msgid "Add as BCC"
 msgstr "เพิ่มในส่วนซ่อนสำเนาถึง"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "ยกเลิก"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12934,10 +11246,10 @@ msgstr "เลือกผู้รับ"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12954,8 +11266,8 @@ msgstr "ใช้กล่องการเลือกที่อยู่"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13058,10 +11370,19 @@ msgstr "มากกว่าหรือเท่ากับ"
 msgid " bytes"
 msgstr " ไบต์"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " วัน"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13203,16 +11524,12 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"กำลังรวบรวมข้อมูลสำหรับบัญชีผู้ใช้ '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "กำลังรวบรวมข้อมูลสำหรับบัญชีผู้ใช้ '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -13231,10 +11548,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"เนื้อหาของสคริปต์ '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "เนื้อหาของสคริปต์ '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13257,20 +11572,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"ความสามารถของสคริปต์กรอง:\n"
+msgid "Sieve capabilities:\n"
+msgstr "ความสามารถของสคริปต์กรอง:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(ไม่มีคุณสมบัติพิเศษ)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"สคริปต์กรองที่มีอยู่:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "สคริปต์กรองที่มีอยู่:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -13346,8 +11657,8 @@ msgstr "กรอกลายเซ็นที่ต้องการใช้
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13364,17 +11675,22 @@ msgstr "เปิดแฟ้มที่ระบุในเครื่อง
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "คำสั่งที่จะใช้:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "รายการใหม่:"
@@ -13411,6 +11727,11 @@ msgstr "เพิ่มบัญชีผู้ใช้"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>คุณต้องการลบรายการแสดงตัว <b>%1</b> นี้ จริงหรือไม่ ?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "ปรับให้มีผลใช้กับ:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13425,6 +11746,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "แก้ไข..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13464,9 +11789,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13504,6 +11829,16 @@ msgstr ""
 "ไม่สามารถเปิดแฟ้ม: \"%1\" ได้:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "ถึง: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "สำเนาถึง: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13536,36 +11871,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13575,8 +11906,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -13592,8 +11922,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -13635,8 +11964,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -13796,6 +12124,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13831,88 +12163,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"\n"
-"<p>...คุณสามารถสร้างตัวกรองของผู้ส่ง, ผู้รับ, ชื่อเรื่อง และรายการจดหมายเวียน\n"
-"ได้อย่างรวดเร็ว โดยเลือกจาก <em>เครื่องมือ->สร้างตัวกรองใหม่</em> ?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-#, fuzzy
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...คุณสามารถกำหนดไอคอนสำหรับแต่ละโฟลเดอร์ของคุณเองได้ ?\n"
-"ดูที่ <em>โฟลเดอร์->คุณสมบัติ...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...คุณสามารถจะทำการกรองจดหมายได้จากส่วนหัว \n"
-"ด้วยการเติมชื่อของมันในช่องกรอกข้อมูลช่องแรกของกฏการค้นหา ?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...คุณสามารถจะกรองให้แสดงจดหมาย HTML เฉพาะฉบับที่เข้ากับกฏเท่านั้นได้\n"
-"<pre>&quot;Content-type&quot; บรรจุ &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "ไม่มีรายการที่จะเลิกทำ"
@@ -13982,6 +12232,17 @@ msgstr "สิ่งที่แนบมาด้วย #1 (ยังไม่�
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุณต้องการเขียนทับมันหรือไม่ ?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "แทรกแฟ้ม"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14087,9 +12348,9 @@ msgstr "ส่งรูปภาพไปพร้อมกับจดหมา
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14118,9 +12379,9 @@ msgstr "เลือกแฟ้ม..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14129,20 +12390,19 @@ msgstr "ใช้จากสมุดที่อยู่"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>โปรแกรมจัดการจดหมาย - K สามารถส่งรูปภาพขนาดเล็ก (48x48 พิกเซล), คุณภาพต่ำ, "
-"และเป็นภาพขาวดำ ไปพร้อมกับจดหมายทุกฉบับได้ ตัวอย่างเช่น "
-"นี่อาจจะเป็นภาพหรือสัญลักษณ์ของคุณ ซึ่งจะถูกแสดงในโปรแกรมอ่านจดหมายของผู้รับ "
-"(ถ้าโปรมแกรมของผู้รับรองรับคุณสมบัตินี้)"
+"และเป็นภาพขาวดำ ไปพร้อมกับจดหมายทุกฉบับได้ ตัวอย่างเช่น นี่อาจจะเป็นภาพหรือสัญลักษณ์ของคุณ "
+"ซึ่งจะถูกแสดงในโปรแกรมอ่านจดหมายของผู้รับ (ถ้าโปรมแกรมของผู้รับรองรับคุณสมบัตินี้)"
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14150,8 +12410,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14167,139 +12427,1521 @@ msgstr "ไม่มีรูปภาพ"
 msgid "You do not have your own contact defined in the address book."
 msgstr "คุณยังไม่มีการกำหนดที่อยู่ติดต่อของคุณเองในสมุดที่อยู่"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "ลงลายเซ็น"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "เซ็นจดหมายโดยอัตโนมัติ"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "การเข้ารหัส"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "ตั้งชื่อเรื่องจดหมาย"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "ส่ง สำเนาถึง: ไปยัง 'ที่อยู่'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "แสดงข้อความลายเซ็น/การเข้ารหัสหลังจากเขียนจดหมาย"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "ส่ง ซ่อนสำเนาถึง: ไปยัง 'ที่อยู่'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "เพิ่ม 'ส่วนหัว' ไปยังจดหมาย"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "อ่านเนื้อความจดหมายจาก 'แฟ้ม'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "เลือกเพื่อให้มีการจัดเก็บจดหมายที่เข้ารหัสไว้"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "ตั้งค่าเนื้อความจดหมาย"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "เพิ่มสิ่งที่แนบมาด้วยไปยังจดหมาย ซึ่งสามารถทำซ้ำได้อีก"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "แสดงกุญแจเข้ารหัสสำหรับการอนุญาตเสมอ"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "ตรวจจดหมายใหม่เท่านั้น"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "เปิดหน้าต่างเขียนจดหมายเท่านั้น"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "ทำการเข้ารหัสจดหมายหากสามารถทำได้โดยอัตโนมัติ"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "แสดงแฟ้มจดหมายที่ให้"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "ไม่ต้องเซ็น/เข้ารหัสเมื่อบันทึกเป็นจดหมายฉบับร่าง"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "อ่านแล้ว"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "ทั่วไป"
 
-#: kmsearchpattern.h:222
-msgid "Old"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "ตอบกลับไปยัง"
+
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "ตอบกลับทั้งหมด..."
+
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "ส่งต่อ"
+
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "ปุ่มพิมพ์ลัด:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
 msgstr ""
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "ลบ"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "เนื้อหาในโฟลเดอร์:"
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
-msgstr "ตอบกลับแล้ว"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
-msgstr "ส่งต่อ:"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "อยู่ในคิวแล้ว"
+#: folderpropertiesdialog.ui:16
+#, fuzzy, no-c-format
+msgid "Folder Properties"
+msgstr "ตำแหน่งโฟลเดอร์"
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "ส่งแล้ว"
+#: folderpropertiesdialog.ui:63
+#, fuzzy, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "โฟลเดอร์เก็บจดหมายเวียน"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
+#: folderpropertiesdialog.ui:91
+#, fuzzy, no-c-format
+msgid "List &address:"
+msgstr "ที่อยู่ทางไปรษณีย์:"
+
+#: folderpropertiesdialog.ui:122
+#, fuzzy, no-c-format
+msgid "N&ormal:"
+msgstr "ธรรมดา:"
+
+#: folderpropertiesdialog.ui:215
+#, fuzzy, no-c-format
+msgid "Unr&ead:"
+msgstr "ยังไม่ได้อ่าน:"
+
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "ให้จดหมายเก่าหมดอายุ"
+
+#: folderpropertiesdialog.ui:283
+#, fuzzy, no-c-format
+msgid "E&xpire after:"
+msgstr "หมดอายุ"
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "ให้จดหมายเก่าหมดอายุ ?"
+
+#: folderpropertiesdialog.ui:339
+#, fuzzy, no-c-format
+msgid "Expire a&fter:"
+msgstr "โฟลเดอร์์หมดอายุ"
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "ให้จดหมายเก่าหมดอายุ ?"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "วัน"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "สัปดาห์"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "เดือน"
+
+#: folderpropertiesdialog.ui:451
+#, fuzzy, no-c-format
+msgid "Advanced"
+msgstr "ตัวเลือกเพิ่มเติม"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "การแสดงตัวใหม่:"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "ปรับเปลี่ยนรูปแบบวันที่ใหม่"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
 msgstr ""
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "ยังไม่ได้อ่าน"
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "ถึง: "
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "เปิดสิ่งที่แนบมาด้วยหรือไม่ ?"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "การแจ้งเตือนเมื่อมีจดหมายใหม่"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "เครื่องมือแก้ไขข้อความ: "
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "ใช้เครื่องมือแก้ไขข้อความภายนอกแทนเครื่องมือเขียนจดหมายมาตรฐาน"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "เพิ่มลายเซ็นท้ายจดหมายอัตโนมัติ"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "ตัดคำที่คอลัมน์:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "แจ้งเตือน หากรากของใบรับรองจะหมดอายุภายใน"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "ใช้ที่อยู่ล่าสุดสำหรับการทำให้สมบูรณ์"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "บันทึกอัตโนมัติทุกช่วงเวลา:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "แทนที่คำนำหน้าที่เลือกด้วย  \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "แทนที่คำนำหน้าที่เลือกด้วย \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "ใช้การอ้างถึงแบบฉลาด"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "ลายเซ็นหมดอายุ"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, fuzzy, no-c-format
+msgid "Type of recipients editor"
+msgstr "ไม่มีผู้รับ"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "ไม่มีผู้รับ"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "ระดับการยุบอัตโนมัติ:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "ลดขนาดอักษรสำหรับส่วนข้อความที่อ้างถึง"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "เปิดใช้ตัวเลือกนี้เพื่อให้แสดงส่วนที่อ้างถึงด้วยตัวอักษรขนาดเล็กลง"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "แสดงสถานะสแปมในส่วนหัวแบบแฟนซี"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "รายการจดหมาย - จดหมายใหม่"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "เพิ่มอักขระอ้างถึง"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "แก้ไขแฟ้ม"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "แก้ไข..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "ไปยัง"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "โฟลเดอร์"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "จดหมาย"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "ตอบกลับแบบพิเศษ"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "ส่งต่อ"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "แถบเครื่องมือ HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "ตัวเลือกทั่วไป"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "แถบเครื่องมือ HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "สร้างใบรับรอง"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "ลายเซ็นใช้ได้"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "หาใบรับรองอื่น ๆ"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "อย่าส่งใบรับรอง"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "เมื่อมีการเพิ่มใบรับรอง"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "เพิ่ม..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "กรุ๊ปแวร์"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "ไม่จำกัด"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "ปรับแต่งลายเซ็น"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "ตอบกลับไปยังผู้ส่ง:"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "ส่งต่อข้อความแล้ว"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "แจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "เลือกเพื่อให้มีการแจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "แจ้งเตือนเมื่อพยายามส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "เช็คเพื่อให้มีการเตือนเมื่อมีการส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "แจ้งเตือนหากที่อยู่อีเมล์ของผู้เซ็นไม่อยู่ในใบรับรอง"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "แจ้งเตือน หากองค์กรผู้ออกใบรับรองจะหมดอายุภายใน"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "ใช้สำหรับการเซ็น"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "การเข้ารหัส"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "เลือกจำนวนของวันที่นี่"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "หาใบรับรองอื่น ๆ"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "หาใบรับรองอื่น ๆ"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "อย่าส่งใบรับรอง"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
 #, fuzzy
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุณต้องการเขียนทับมันหรือไม่ ?"
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"\n"
+"<p>...คุณสามารถสร้างตัวกรองของผู้ส่ง, ผู้รับ, ชื่อเรื่อง และรายการจดหมายเวียน\n"
+"ได้อย่างรวดเร็ว โดยเลือกจาก <em>เครื่องมือ->สร้างตัวกรองใหม่</em> ?</p>\n"
 
-#: util.h:210
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
 #, fuzzy
-msgid "Overwrite File?"
-msgstr "แทรกแฟ้ม"
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...คุณสามารถกำหนดไอคอนสำหรับแต่ละโฟลเดอร์ของคุณเองได้ ?\n"
+"ดูที่ <em>โฟลเดอร์->คุณสมบัติ...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...คุณสามารถจะทำการกรองจดหมายได้จากส่วนหัว \n"
+"ด้วยการเติมชื่อของมันในช่องกรอกข้อมูลช่องแรกของกฏการค้นหา ?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...คุณสามารถจะกรองให้แสดงจดหมาย HTML เฉพาะฉบับที่เข้ากับกฏเท่านั้นได้\n"
+"<pre>&quot;Content-type&quot; บรรจุ &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -14489,7 +14131,8 @@ msgstr "แทรกแฟ้ม"
 #~ msgstr "เลือกเพื่อไม่ให้มีการเซ็นจดหมายเป็นค่าปริยาย"
 
 #, fuzzy
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "ใบรับรองลายเซ็น ถูกปรับแต่งบนหน้า <em>ใบรับรอง</em> !"
 
 #~ msgid "Selects the signature algorithm"
@@ -14569,10 +14212,6 @@ msgstr "แทรกแฟ้ม"
 #~ msgstr "เก็บไว้ในโฟลเดอร์ฉบับร่าง"
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "ปรับแต่งโปรแกรมจัดการจดหมาย - K..."
-
-#, fuzzy
 #~ msgid "Go Online"
 #~ msgstr "ทำงานออนไลน์"
 
diff --git a/tde-i18n-tr/messages/tdepim/kmail.po b/tde-i18n-tr/messages/tdepim/kmail.po
index 402475e197f..5fc7e3bfb96 100644
--- a/tde-i18n-tr/messages/tdepim/kmail.po
+++ b/tde-i18n-tr/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-02-29 16:01+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@lists.kde.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: LoKalize 0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -30,7 +30,7 @@ msgstr ""
 "Serdar Soytetir, Sinan-Halis Yalçınkaya, Görkem Çetin, Barış Metin, Yaşar "
 "Şentürk"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -179,6 +179,12 @@ msgstr "&Yok (dikkatli kullanın)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Yarı-otomatik kaynak yönetimi için hesap"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Geçmişi Temizle"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -253,13 +259,13 @@ msgstr "&Giriş:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Kimliğinizi sınamak üzere internet servis sağlayıcınızın size vermiş olduğu <em>"
-"kullanıcı adı</em>  genellikle e-posta adresinizin ilk kısmıdır.(<em>@</em> "
-"işaretinden önceki kısmı)."
+"Kimliğinizi sınamak üzere internet servis sağlayıcınızın size vermiş olduğu "
+"<em>kullanıcı adı</em>  genellikle e-posta adresinizin ilk kısmıdır.(<em>@</"
+"em> işaretinden önceki kısmı)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -280,12 +286,12 @@ msgstr "POP paralosını &sakla"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "KMail'ın parolayı kaydetmesi için bu seçeneği tıklayın.\n"
 "Eğer TDEWallet sistemde varsa, parola güvenli bir şekilde kaydedilecektir.\n"
@@ -320,8 +326,9 @@ msgstr "&Boyu"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Bu seçeneği seçerseniz, POP filtreleri iletiye ne yapılacağına karar verir. "
 "Sunucudan iletiyi indirmeyi, silmeyi veya saklamayı ayarlıyabilirsiniz."
@@ -373,13 +380,15 @@ msgstr "&Düz metin"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&GİRİŞ"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&YALIN"
 
@@ -422,15 +431,16 @@ msgstr "İsimlendirmeler:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
 msgstr ""
-"İsimlendirmeleri sunucudan yeniden yükle. Bu tüm değişikliklerin üzerine yazar."
+"İsimlendirmeleri sunucudan yeniden yükle. Bu tüm değişikliklerin üzerine "
+"yazar."
 
 #: accountdialog.cpp:919 accountdialog.cpp:2290
 msgid "Personal"
@@ -483,13 +493,13 @@ msgstr "İstek &halinde eklentileri yükle"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "E-posta eklerini, e-posta göründülendiğinde değil de, eke tıkladığınızda "
-"yüklemek için bu özelliği aktif hale getirin. Bu şekilde büyük e-postalar daha "
-"hızlı bir şekilde yüklenecektir."
+"yüklemek için bu özelliği aktif hale getirin. Bu şekilde büyük e-postalar "
+"daha hızlı bir şekilde yüklenecektir."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -530,7 +540,7 @@ msgstr "<none>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "gelen"
 
@@ -538,11 +548,11 @@ msgstr "gelen"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Sunucu benzersiz (tekil) ileti numaralarını desteklemiyor, fakat bu iletileri "
-"sunucuda bırakmak için gereklidir.\n"
+"Sunucu benzersiz (tekil) ileti numaralarını desteklemiyor, fakat bu "
+"iletileri sunucuda bırakmak için gereklidir.\n"
 "Bazı sunucular yeteneklerini doğru olarak bildirmedikleri için, siz yine de "
 "alınan iletilerin sunucuda bırakılmasını seçebilirsiniz."
 
@@ -550,34 +560,35 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Sunucu ileti başlıklarının alınmasını desteklemiyor, fakat bu iletileri sunucu "
-"üzerindeyken filtrelenmeleri için gereklidir.\n"
+"Sunucu ileti başlıklarının alınmasını desteklemiyor, fakat bu iletileri "
+"sunucu üzerindeyken filtrelenmeleri için gereklidir.\n"
 "Bazı sunucular yeteneklerini doğru olarak bildirmedikleri için, siz yine de "
 "iletilerin sunucu üzerindeyken filtrelenmelerini seçebilirsiniz."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
-msgstr ""
-"Lütfen dikkat bu başarım borulamayı desteklemeyen bazı POP3 sunucularda bozuk "
-"posta gönderilmesine neden olmaktadır;\n"
-"bu yapılandırılabilirdir, çünkü bazı sunucular borulamayı desteklerler fakat bu "
-"becerilerini bildirmezler. POP3 sunucunuzun borulamayı destekleyip "
-"desteklemediğini kontrol etmek için iletişim kutusunun aşağısındaki \"Sunucunun "
-"neyi desteklediğini kontrol et\" düğmesine basın;\n"
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
+msgstr ""
+"Lütfen dikkat bu başarım borulamayı desteklemeyen bazı POP3 sunucularda "
+"bozuk posta gönderilmesine neden olmaktadır;\n"
+"bu yapılandırılabilirdir, çünkü bazı sunucular borulamayı desteklerler fakat "
+"bu becerilerini bildirmezler. POP3 sunucunuzun borulamayı destekleyip "
+"desteklemediğini kontrol etmek için iletişim kutusunun aşağısındaki "
+"\"Sunucunun neyi desteklediğini kontrol et\" düğmesine basın;\n"
 "eğer sunucunuz bu özelliği bildirmiyor ise, fakat siz daha fazla hız "
-"istiyorsanız ilk önce kendinize toplu postalar göndererek ve onları indirerek "
-"bazı testler yapabilirsiniz."
+"istiyorsanız ilk önce kendinize toplu postalar göndererek ve onları "
+"indirerek bazı testler yapabilirsiniz."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -586,50 +597,51 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Sunucu borulamayı desteklemiyor; bu yüzden, bu özellik kullanılmayacak.\n"
 "Bazı sunucular özelliklerini doğru olarak bildirmedikleri için, yine de "
 "borulama özelliğini aktif hale getirebilirsiniz. Fakat bu özelliğin bazı POP "
-"sunucularının hatalı (bozuk) iletiler göndermelerine neden olabileceğine dikkat "
-"edin. Bu yüzden bu özelliği önemli iletileriniz ile kullanmadan önce kendinize "
-"büyük sayıda test iletileri göndererek ve POP sunucusundan bunları indirerek "
-"test edin."
+"sunucularının hatalı (bozuk) iletiler göndermelerine neden olabileceğine "
+"dikkat edin. Bu yüzden bu özelliği önemli iletileriniz ile kullanmadan önce "
+"kendinize büyük sayıda test iletileri göndererek ve POP sunucusundan bunları "
+"indirerek test edin."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"Bu sunucu benzersiz (tekil) ileti numaralarını desteklemiyor, fakat bu özellik "
-"iletileri sunucu üzerinde bırakmak için gereklidir; bu yüzden özellik "
-"kullanılmayacak.\n"
-"Bazı sunucular yeteneklerini doğru olarak bildirmedikleri için, yine de alınmış "
-"iletileri sunucuda bırakma özelliğini aktif hale getireblirsiniz."
+"Bu sunucu benzersiz (tekil) ileti numaralarını desteklemiyor, fakat bu "
+"özellik iletileri sunucu üzerinde bırakmak için gereklidir; bu yüzden "
+"özellik kullanılmayacak.\n"
+"Bazı sunucular yeteneklerini doğru olarak bildirmedikleri için, yine de "
+"alınmış iletileri sunucuda bırakma özelliğini aktif hale getireblirsiniz."
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Sunucu ileti başlıklarının alınmasını desteklemiyor, fakat bu özellik iletileri "
-"sunucu üzerinde filtreleyebilmek için gereklidir; bu yüzden özellik "
-"kullanılmayacak.\n"
+"Sunucu ileti başlıklarının alınmasını desteklemiyor, fakat bu özellik "
+"iletileri sunucu üzerinde filtreleyebilmek için gereklidir; bu yüzden "
+"özellik kullanılmayacak.\n"
 "Bazı sunucular yeteneklerini doğru olarak bildirmedikleri için, yine de "
-"iletilerin sunucu üzerinde filtrelenme özelliğini aktif hale getirebilirsiniz."
+"iletilerin sunucu üzerinde filtrelenme özelliğini aktif hale "
+"getirebilirsiniz."
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -703,8 +715,8 @@ msgstr "IMAP Hesapları"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Posta alabilmek için ağ ayarları bölümünde bir kullanıcı hesabı belirtmiş "
 "olmanız gerekiyor."
@@ -743,9 +755,9 @@ msgstr "KMail Uygulamasına Hoşgeldiniz"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 "<qt>KMail'ı ilk defa çalıştırdığınız anlaşılıyor. E-posta hesaplarınızı "
 "ayarlamak için bu sihirbazı kullanabilirsiniz. Bunun için e-posta servisi "
@@ -812,8 +824,7 @@ msgstr "Yerel gönderim kullan"
 msgid "Server Information"
 msgstr "Sunucu Bilgisi"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Hiçbiri"
@@ -953,28 +964,26 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Buradan KMail'in filtre kurallarını bazı bilinen anti-virüs araçlarını "
-"kullanacak şekilde yapılandırmak için yardım alabilirsiniz.</p>"
-"<p>Sihirbaz bilgisayarınızdaki bu araçları bulabilir ve bu araçların "
-"kullanıldığı filtre kuralları tanımlayabilir; aynı zamanda virüslü iletileri "
-"ayırabilir. Sihirbaz hiçbir mevcut filtre kuralını dikkate almayacaktır: yeni "
-"kuralları her zaman sona ekler.</p>"
-"<p><b>Uyarı:</b> Virüslü iletiler taranırken KMail erişilemez olabilir, çünkü "
-"anti-virüs araçlarının işlemleri genellikle çok zaman harcayan işlemlerdir. "
-"KMail'in eski davranışına geri dönmek için sihirbaz tarafından eklenen "
-"kuralları silebilirsiniz."
+"kullanacak şekilde yapılandırmak için yardım alabilirsiniz.</p><p>Sihirbaz "
+"bilgisayarınızdaki bu araçları bulabilir ve bu araçların kullanıldığı filtre "
+"kuralları tanımlayabilir; aynı zamanda virüslü iletileri ayırabilir. "
+"Sihirbaz hiçbir mevcut filtre kuralını dikkate almayacaktır: yeni kuralları "
+"her zaman sona ekler.</p><p><b>Uyarı:</b> Virüslü iletiler taranırken KMail "
+"erişilemez olabilir, çünkü anti-virüs araçlarının işlemleri genellikle çok "
+"zaman harcayan işlemlerdir. KMail'in eski davranışına geri dönmek için "
+"sihirbaz tarafından eklenen kuralları silebilirsiniz."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1008,15 +1017,14 @@ msgstr "Muhtemel çöp &postalarını buraya taşı:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 "Varsayılan dizin gelen kutusu, ancak isterseniz aşağıdaki dizin görünümünden "
-"bunu değiştirebilirsiniz"
-"<p>Unutmayın tüm araçlar emin olmadan sınıflandırma yaparlar. Eğer yetenekli "
-"bir araç seçmediyseniz tabii ki bir dizin de seçemesiniz."
+"bunu değiştirebilirsiniz<p>Unutmayın tüm araçlar emin olmadan sınıflandırma "
+"yaparlar. Eğer yetenekli bir araç seçmediyseniz tabii ki bir dizin de "
+"seçemesiniz."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1026,8 +1034,8 @@ msgstr "İletileri anti-virüs araçları ile kontrol et"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Anti-virüs araçlarının iletilerinizi kontrol etmesine izin verin. Sihirbaz "
 "gerekli filtreleri oluşturacaktır. İletiler genellikle uygun filtreler "
@@ -1040,12 +1048,12 @@ msgstr "Bulunan virüslü iletileri seçilen klasöre taşı"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 "Virüslü olarak sınıflandırılmış iletileri bulmak ve önceden belirlenen bir "
-"klasöre taşımak içn bir filtre oluşturuldu. Ön tanımlı klasör çöp klasörüdür, "
-"fakat bunu klasör görünümünde değiştirebilirsiniz."
+"klasöre taşımak içn bir filtre oluşturuldu. Ön tanımlı klasör çöp "
+"klasörüdür, fakat bunu klasör görünümünde değiştirebilirsiniz."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1053,8 +1061,8 @@ msgstr "Ek olarak, virüslü mesajları okunmamış olarak işaretle"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Virüslü olarak sınıflandırılmış iletileri seçilen klasöre taşımanın yanında "
 "okunmuş olarak da işaretle."
@@ -1235,9 +1243,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Bu, işlemi yapmak için gerekli izniniz olmadığından ya da sunucuda zaten böyle "
-"bir klasör olmasından kaynaklanıyor olabilir; sunucudan gelen hata mesajı ise "
-"şöyle:"
+"Bu, işlemi yapmak için gerekli izniniz olmadığından ya da sunucuda zaten "
+"böyle bir klasör olmasından kaynaklanıyor olabilir; sunucudan gelen hata "
+"mesajı ise şöyle:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1250,8 +1258,8 @@ msgstr "Sunucu üzerindeki %1 klasörü okunurken hata: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1271,8 +1279,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1303,20 +1311,20 @@ msgstr "Silinmiş"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
-"<qt>Kimliklerinizden hiçbiri bu iletinin alıcısı ile uyuşmuyor,<br />"
-"Lütfen şu adreslerden hangilerinin sizin olduğunu seçin:</qt>"
+"<qt>Kimliklerinizden hiçbiri bu iletinin alıcısı ile uyuşmuyor,<br />Lütfen "
+"şu adreslerden hangilerinin sizin olduğunu seçin:</qt>"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
-"<qt>Kimliklerinizden hiçbiri bu iletinin alıcısı ile uyuşmuyor,<br />"
-"Lütfen şu adreslerden hangilerinin sizin olduğunu seçin:</qt>"
+"<qt>Kimliklerinizden hiçbiri bu iletinin alıcısı ile uyuşmuyor,<br />Lütfen "
+"şu adreslerden hangilerinin sizin olduğunu seçin:</qt>"
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1345,19 +1353,22 @@ msgstr "\"%1\" klasörü sıkıştırılırken hata oluştu. Sıkıştırma yap�
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Bu ayarlar sistem yöneticiniz tarafından sabitlenmiştir</p> "
-"<p>Bunun bir hata olduğunu düşünüyorsanız, lütfen kendisiyle iletişime "
-"geçiniz.</p></qt>"
+"<qt> <p>Bu ayarlar sistem yöneticiniz tarafından sabitlenmiştir</p> <p>Bunun "
+"bir hata olduğunu düşünüyorsanız, lütfen kendisiyle iletişime geçiniz.</p></"
+"qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Profili Yükle..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Hesabı Yapılandır"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Ekle..."
@@ -1387,6 +1398,11 @@ msgstr "<qt><b>%1</b> isimli kimliği gerçekten silmek istiyor musunuz?</qt>"
 msgid "Remove Identity"
 msgstr "Girdiyi Sil"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Sil"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ekle..."
@@ -1395,6 +1411,11 @@ msgstr "Ekle..."
 msgid "Modify..."
 msgstr "Değiştir..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Sil"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Öntanımlı olarak ayarla"
@@ -1411,17 +1432,15 @@ msgstr "&Gönderme"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Giden Hesaplar (en az bir hesap ekleyin):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "İsim"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Tip"
@@ -1443,8 +1462,7 @@ msgstr "Öntanımlı olarak Ayarla"
 msgid "Common Options"
 msgstr "Genel Seçenekler"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Göndermeden önce onayla"
@@ -1495,17 +1513,16 @@ msgstr "Öntanımlı &alan:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Öntanımlı alan. Kullanıcı adını tamamlamak için e-posta adreslerinin "
+"<qt> <p>Öntanımlı alan. Kullanıcı adını tamamlamak için e-posta adreslerinin "
 "tamamınından meydana gelir.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1523,9 +1540,9 @@ msgstr "Gönderim Ekle"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Öntanımlı)"
 
@@ -1604,6 +1621,10 @@ msgstr "Hesabı Düzenle"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt><b>%1</b> hesabı bulunamadı.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Renkler"
@@ -1712,8 +1733,7 @@ msgstr "İzlenmiş Bağlantı"
 msgid "Misspelled Words"
 msgstr "Hatalı Yazılan Sözcükler"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Yeni İeti"
@@ -1901,8 +1921,8 @@ msgstr "Öntanımlı olarak tartışmaları &kapalı tut"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "&Yeni, okunmamış veya önemli iletiler içeren tartışmaları ve izlenen "
 "tartışmaları aç."
@@ -1913,68 +1933,51 @@ msgstr "Tarih Biçimi"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Bu ifadeler tarih için kullanılır:</p>"
-"<ul>"
-"<li> d - rakam ile gün, sıfır yok (1-31)</li>"
-"<li> dd - rakam ile gün, sıfır var (01-31)</li>"
-"<li>ddd - yazı ile gün, kısaltmalı (Pzt-Cmt)</li>"
-"<li>dddd - yazı ile gün, kısaltmasız (Pazartesi - Cumartesi)</li>"
-"<li>M - rakam ile ay, sıfır yok (1-12)</li>"
-"<li> MM - rakam ile ay, sıfır var (01-12)</li>"
-"<li>MMM - yazı ile ay, kısaltmalı (Ock-Arl)</li>"
-"<li>MMMM - yazı ile ay, kısaltmasız (Ocak-Aralık)</li>"
-"<li> yy - yıl, İki haneli (00-99)</li>"
-"<li> yyyy - yıl, dört haneli (0000-9999)</li> </ul>"
-"<p><strong>Bu ifadeler saat için kullanılır:</string></p> "
-"<ul>"
-"<li>h - saat, sıfır yok (0-23, veya  ÖÖ/ÖS Gösteriminde1-12)</li>"
-"<li>hh - saat, sıfır var (00-23, veya ÖÖ/ÖS Gösteriminde 01-12)</li>"
-"<li>m - dakika, sıfır yok (0-59)</li>"
-"<li>mm - dakika, sıfır var (00-59)</li>"
-"<li>s - saniye, sıfır yok (0-59)</li>"
-"<li>ss - saniye, sıfır var (00-59)</li>"
-"<li>z - milisaniye, sıfır yok (0-999)</li>"
-"<li>zzz - milisaniye, sıfır var (000-999)</li>"
-"<li>AP - ÖÖ/ÖS gösterimini değiştirir. AP \"ÖÖ\" yi \"ÖS\" ile değiştirir.</li>"
-"<li>ap - ÖÖ/ÖS gösterimini değiştirir. ap \"öö\" yi \"ös\" ile değiştirir.</li>"
-"<li> Z - saat aralığını rakamsal biimde gösterir (-0500)</li></ul>"
-"<p><strong>Diğer bütün girdi karakterlerini görmemezlikten gelir.</strong></p>"
-"</qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Bu ifadeler tarih için kullanılır:</p><ul><li> d - rakam ile "
+"gün, sıfır yok (1-31)</li><li> dd - rakam ile gün, sıfır var (01-31)</"
+"li><li>ddd - yazı ile gün, kısaltmalı (Pzt-Cmt)</li><li>dddd - yazı ile gün, "
+"kısaltmasız (Pazartesi - Cumartesi)</li><li>M - rakam ile ay, sıfır yok "
+"(1-12)</li><li> MM - rakam ile ay, sıfır var (01-12)</li><li>MMM - yazı ile "
+"ay, kısaltmalı (Ock-Arl)</li><li>MMMM - yazı ile ay, kısaltmasız (Ocak-"
+"Aralık)</li><li> yy - yıl, İki haneli (00-99)</li><li> yyyy - yıl, dört "
+"haneli (0000-9999)</li> </ul><p><strong>Bu ifadeler saat için kullanılır:</"
+"string></p> <ul><li>h - saat, sıfır yok (0-23, veya  ÖÖ/ÖS "
+"Gösteriminde1-12)</li><li>hh - saat, sıfır var (00-23, veya ÖÖ/ÖS "
+"Gösteriminde 01-12)</li><li>m - dakika, sıfır yok (0-59)</li><li>mm - "
+"dakika, sıfır var (00-59)</li><li>s - saniye, sıfır yok (0-59)</li><li>ss - "
+"saniye, sıfır var (00-59)</li><li>z - milisaniye, sıfır yok (0-999)</"
+"li><li>zzz - milisaniye, sıfır var (000-999)</li><li>AP - ÖÖ/ÖS gösterimini "
+"değiştirir. AP \"ÖÖ\" yi \"ÖS\" ile değiştirir.</li><li>ap - ÖÖ/ÖS "
+"gösterimini değiştirir. ap \"öö\" yi \"ös\" ile değiştirir.</li><li> Z - "
+"saat aralığını rakamsal biimde gösterir (-0500)</li></ul><p><strong>Diğer "
+"bütün girdi karakterlerini görmemezlikten gelir.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Genel tartışma ayarlarını değiştirmek tüm klasöre özel değerleri "
 "değiştirecektir."
@@ -1991,8 +1994,7 @@ msgstr "HT&ML durum çubuğunu göster"
 msgid "Show s&pam status in fancy headers"
 msgstr "S&pam durumunu süslü başlıklarda göster"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Gülen yüzler yerine gülen yüz simgeleri kullan"
@@ -2001,8 +2003,7 @@ msgstr "Gülen yüzler yerine gülen yüz simgeleri kullan"
 msgid "Use smaller font for quoted text"
 msgstr "Aktarılan metin için daha küçük bir font kullan"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Aktarılan metni genişlet/daralt"
@@ -2028,8 +2029,7 @@ msgstr "Otomatik"
 msgid "&Override character encoding:"
 msgstr "Karakter kodlamasının üzerine yaz:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Sistem çekmecesini etkinleştir"
@@ -2131,22 +2131,19 @@ msgstr "<b>%f</b> düzenlenecek dosya adıyla değiştirilecektir."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>Aşağıdaki yer tutucular yanıtla bölümünde kullanılabilir:"
-"<br><b>%D</b>: tarih, <b>%S</b>: konu,"
-"<br><b>%e</b>: gönderenin adresi, <b>%F</b>: gönderenin adı, <b>%f</b>"
-": gönderenin baş harleri,"
-"<br><b>%T</b>: alıcının adı, <b>%t</b>: gönderenin adı ve adresi,"
-"<br><b>%C</b>: karbon kopya (CC) isimleri, <b>%c</b>"
-": karbon kopya isimleri ve adresleri,"
-"<br><b>%%</b>: yüzde işareti, <b>%_</b>: boşluk, <b>%L</b>: satırsonu</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>Aşağıdaki yer tutucular yanıtla bölümünde kullanılabilir:<br><b>%D</b>: "
+"tarih, <b>%S</b>: konu,<br><b>%e</b>: gönderenin adresi, <b>%F</b>: "
+"gönderenin adı, <b>%f</b>: gönderenin baş harleri,<br><b>%T</b>: alıcının "
+"adı, <b>%t</b>: gönderenin adı ve adresi,<br><b>%C</b>: karbon kopya (CC) "
+"isimleri, <b>%c</b>: karbon kopya isimleri ve adresleri,<br><b>%%</b>: yüzde "
+"işareti, <b>%_</b>: boşluk, <b>%L</b>: satırsonu</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2169,21 +2166,20 @@ msgstr "&Herkese yanıtla:"
 msgid "&Forward:"
 msgstr "&Yönlendir:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Alıntı karakteri:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D tarihinde şunları yazmıştınız:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D tarihinde, %F şunları yazmıştı: "
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Yönlendirilmiş İleti"
 
@@ -2221,8 +2217,8 @@ msgstr "Yeni iletim önekini girin:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Bu liste, giden her e-posta için yukarıdan aşağıya doğru denetlenecektir."
 
@@ -2258,10 +2254,9 @@ msgstr "Değer"
 msgid "Ne&w"
 msgstr "Ye&ni"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "İsi&m:"
@@ -2270,19 +2265,18 @@ msgstr "İsi&m:"
 msgid "&Value:"
 msgstr "&Kaynak:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-uyumlu eklenti isimlendirmesi"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"Outlook'un İngilizce-Olmayan eklenti isimlerini anlayabilmesi için bu seçeneği "
-"aktif hale getirin"
+"Outlook'un İngilizce-Olmayan eklenti isimlerini anlayabilmesi için bu "
+"seçeneği aktif hale getirin"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2309,13 +2303,13 @@ msgstr "ekli"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2340,74 +2334,66 @@ msgstr "Şi&freleme Eklentileri"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> İletiler bazen iki biçimde gelir. Bu ayarı isterseniz görüntülenebilir HTML "
-"parçası veya düz yazı olarak kontrol edebilirsiniz.</p> "
-"<p>HTML parçasının görüntülenmesi iletiyi daha iyi gösterilmesini sağlar, fakat "
-"aynı zamanda güvenlik açıklarına sebep olabilir.</p>"
-"<p>İletileri düz metin olarak görüntülemek, ileti içindeki bazı biçim "
-"özelliklerinin kaybolmasına neden olurken güvenlik açısından neredeyse tam "
-"güvenilir bir ortam sunar. </p>"
-"<p>Bu nedenle HTML e-postalarını görüntülemeyi önermiyoruz. Bu e-postaları düz "
-"metin olarak görüntülemek en iyi yöntemdir.</p>"
-"<p><b>Not:</b> Bu seçeneği klasör bazında (Kmail'ın Klasör menüsünden) "
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt> <p> İletiler bazen iki biçimde gelir. Bu ayarı isterseniz "
+"görüntülenebilir HTML parçası veya düz yazı olarak kontrol edebilirsiniz.</"
+"p> <p>HTML parçasının görüntülenmesi iletiyi daha iyi gösterilmesini sağlar, "
+"fakat aynı zamanda güvenlik açıklarına sebep olabilir.</p><p>İletileri düz "
+"metin olarak görüntülemek, ileti içindeki bazı biçim özelliklerinin "
+"kaybolmasına neden olurken güvenlik açısından neredeyse tam güvenilir bir "
+"ortam sunar. </p><p>Bu nedenle HTML e-postalarını görüntülemeyi önermiyoruz. "
+"Bu e-postaları düz metin olarak görüntülemek en iyi yöntemdir.</p><p><b>Not:"
+"</b> Bu seçeneği klasör bazında (Kmail'ın Klasör menüsünden) "
 "ayarlayabilirsiniz. </p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2424,16 +2410,16 @@ msgstr "D&ışarıdan gönderilen iletilerin internetten yüklenmesine izin ver"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<qt><b>UYARI: </b>E-posta içinde HTML'e izin vermek, güvenlik açıklarını "
 "tarayan ve kullanan programlar tarafından sisteminizin açıklarının tespit "
 "edilmesi riskini artırır. Her bir seçenek üzerinde ayrıntılı bilgi için <a "
-"href=\"whatsthis:%1\">HTML iletiler hakkında</a> ve <a href=\"whatsthis:%2\">"
-"Harici referanslar hakkında</a> bağlantılarına tıklayın."
+"href=\"whatsthis:%1\">HTML iletiler hakkında</a> ve <a href=\"whatsthis:"
+"%2\">Harici referanslar hakkında</a> bağlantılarına tıklayın."
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2512,8 +2498,7 @@ msgstr "Genel HTML ayarları tüm klasörlere özel değerleri değiştirecek."
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Bu seçenek dirmngr >= 0.9.0 gerektirir"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "vekil sunucus yok"
@@ -2542,8 +2527,8 @@ msgstr "Önemli iletiler için süre bitimini iptal &et"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "Okunmamış e-postaları bulurken:"
 
@@ -2567,8 +2552,8 @@ msgstr "Tüm Klasörlerde Döngü Kur"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "Bir Klasöre girildiği zaman:"
 
@@ -2637,16 +2622,14 @@ msgstr "Klasörler (\"maildir\" biçimi) olarak saklansın"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2680,45 +2663,37 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> Bir sonraki okunmamış iletiye geçerken, açık iletiden sonra başka bir "
-"okunmamış ileti olmayabilir.</p>"
-"<p><b>Döngü kurma:</b> Geçerli klasördeki arama işlemi son iletide "
-"duracaktır.</p> "
-"<p><b>Geçerli klasörde döngü kur:</b> Arama işlemi ileti listesinin en üstünden "
-"tekrar devam edecektir. Ancak başka bir klasöre geçilmeyecektir.</p> "
-"<p><b>Tüm klasörlerde döngü kur:</b> Arama işlemi ileti listesinin en üstünden "
-"tekrar devam edecektir. Eğer okunmamış ileti bulunamazsa bir sonraki klasörden "
-"devam edilecektir.</p> "
-"<p>Benzer bir şekilde, önceki okunmamış ileti arandığında da arama işlemi ileti "
-"listesinin en altından başlar ve seçilen arama şekline göre bir önceki "
-"klasörden devam eder.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt> <p> Bir sonraki okunmamış iletiye geçerken, açık iletiden sonra başka "
+"bir okunmamış ileti olmayabilir.</p><p><b>Döngü kurma:</b> Geçerli "
+"klasördeki arama işlemi son iletide duracaktır.</p> <p><b>Geçerli klasörde "
+"döngü kur:</b> Arama işlemi ileti listesinin en üstünden tekrar devam "
+"edecektir. Ancak başka bir klasöre geçilmeyecektir.</p> <p><b>Tüm "
+"klasörlerde döngü kur:</b> Arama işlemi ileti listesinin en üstünden tekrar "
+"devam edecektir. Eğer okunmamış ileti bulunamazsa bir sonraki klasörden "
+"devam edilecektir.</p> <p>Benzer bir şekilde, önceki okunmamış ileti "
+"arandığında da arama işlemi ileti listesinin en altından başlar ve seçilen "
+"arama şekline göre bir önceki klasörden devam eder.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2785,10 +2760,11 @@ msgstr "Gru&p çalışması klasörlerini gizle"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Bu işaretlendiğinde, klasör ağacında IMAP kaynak klasörlerini görmeyeceksiniz."
+"Bu işaretlendiğinde, klasör ağacında IMAP kaynak klasörlerini "
+"görmeyeceksiniz."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2796,8 +2772,8 @@ msgstr "Bu hesap için sadece &grup paylaşımı dizinlerini göster"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 "Bu işaretlendiğinde, grup çalışması için yapılandırılan hesaplar için "
 "dizinağacında normal posta dizinlerini görmeyeceksiniz."
@@ -2856,19 +2832,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-uyumlu eklenti isimlendirmesi"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Otomatik davet gönderimi"
@@ -2878,28 +2853,26 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Bu seçenek açıkken, kullanıcı ileti yazma penceresini görmeyecektir. Davetiye "
-"iletileri otomatik olarak gönderilir."
+"Bu seçenek açıkken, kullanıcı ileti yazma penceresini görmeyecektir. "
+"Davetiye iletileri otomatik olarak gönderilir."
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 "<qt> Davetler, e-postaya ekli olarak gönderilirler. Bu değişiklik, davetleri "
 "artık e-postanın gövdesinde iletilmesini sağlayacaktır. Özellikle Outlook "
 "kullanan kişilere davet yazarken ve yanıt alırken bu değişikliğin yapılması "
-"gereklidir. "
-"<br>Ancak, bu işlem, gönderdiğiniz davetleri okuyamayan e-posta programlarında "
-"hatalı gösterimlere neden olacaktır. "
-"<br>Davetleri okuyabilen e-posta programları bu seçenek ile sorun "
-"yaşamayacaktır. </qt>"
+"gereklidir. <br>Ancak, bu işlem, gönderdiğiniz davetleri okuyamayan e-posta "
+"programlarında hatalı gösterimlere neden olacaktır. <br>Davetleri okuyabilen "
+"e-posta programları bu seçenek ile sorun yaşamayacaktır. </qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3004,17 +2977,16 @@ msgstr "Yönlendir"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3032,15 +3004,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3102,8 +3074,8 @@ msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
-"<qt><b>%1</b> adına sahip bir gönderim listesi zaten var. Lütfen başka bir isim "
-"seçiniz.</qt>"
+"<qt><b>%1</b> adına sahip bir gönderim listesi zaten var. Lütfen başka bir "
+"isim seçiniz.</qt>"
 
 #: editorwatcher.cpp:76
 msgid "Edit with:"
@@ -3111,8 +3083,8 @@ msgstr "Şununla düzenle:"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3356,6 +3328,11 @@ msgstr "Filtreleri Seç"
 msgid "Filters"
 msgstr "Filtreler"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "&Tüm Metinleri Seç"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3386,8 +3363,8 @@ msgstr "Filtre aktivitesinin günlüğünü &tut"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Filtre aktivitesinin günlüğünün tutulması seçeneğini buradan "
 "düzenleyebilirsiniz. Günlük verisi yalnızca günlük tutma seçeneği aktif "
@@ -3407,10 +3384,11 @@ msgstr "Günlük filtresi kural değerlendirmesi"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3431,10 +3409,10 @@ msgstr "sınırsız"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Günlük verisi toplamak, veriyi geçici olarak bellekte tutmayı gerektirir; "
 "buradan kullanılacak en fazla bellek boyutunu seçebilirsiniz: eğer toplanan "
@@ -3449,7 +3427,7 @@ msgstr ""
 "%1 dosyasına yazılamıyor:\n"
 "detaylı hata tanımı şöyle \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail Hatası"
@@ -3490,9 +3468,9 @@ msgstr "&Kullanıcı kimliği:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3544,8 +3522,8 @@ msgstr "Çöp klasörüne okumak/yazmak için izniniz yok."
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Henüz sunucudan bilgi alınmadı, lütfen \"E-postayı kontrol et\"i kullanın."
 
@@ -3557,8 +3535,7 @@ msgstr "Hata: Bu klasör için IMAP hesabı tanımlanmadı"
 msgid "Connecting to server %1, please wait..."
 msgstr "%1 sunucusuna bağlantı kuruluyor, lütfen bekleyiniz..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "%1 sunucusuna bağlantıda hata."
@@ -3586,11 +3563,11 @@ msgstr "İzin Ekle"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Bu klasör için kendi izinlerinizi silmek istediğinize emin misiniz? Daha sonra "
-"klasöre erişim yetkiniz olmayacak."
+"Bu klasör için kendi izinlerinizi silmek istediğinize emin misiniz? Daha "
+"sonra klasöre erişim yetkiniz olmayacak."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3621,7 +3598,7 @@ msgstr "Kullanım:"
 msgid "Select Folder"
 msgstr "Klasörü Seç"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Yerel Klasörler"
@@ -3645,12 +3622,12 @@ msgstr "Klasör için Kısayol Seç"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
-"<qt>Geçerli klasörü seçecek bir tuş veya tuş kombinasonu atamak için, aşağıdaki "
-"düğmeye tıklayın ve bu klasöre atayacağınız tuş(lar)a basın."
+"<qt>Geçerli klasörü seçecek bir tuş veya tuş kombinasonu atamak için, "
+"aşağıdaki düğmeye tıklayın ve bu klasöre atayacağınız tuş(lar)a basın."
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3670,11 +3647,20 @@ msgstr "İ&ptal"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Toplam: %2<br>Okunmamış: %3<br>Boyut: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Kota: %1"
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -3797,70 +3783,17 @@ msgstr "Çöp Posta Durumu:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>İ"
-"<br>l"
-"<br>e"
-"<br>t"
-"<br>i"
-"<br>s"
-"<br>i</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>İ<br>l<br>e<br>t<br>i<br>s<br>i</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>İ"
-"<br>l"
-"<br>e"
-"<br>t"
-"<br>i"
-"<br> "
-"<br>D"
-"<br>e"
-"<br>ğ"
-"<br>i"
-"<br>l</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>H<br>T<br>M<br>L<br> <br>İ<br>l<br>e<br>t<br>i<br> "
+"<br>D<br>e<br>ğ<br>i<br>l</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3872,19 +3805,13 @@ msgstr "&Adınız:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Adınız</h3>"
-"<p>Bu alan gönderilen iletilerde gözükmesini istediğiniz adınızı "
-"içermelidir;</p>"
-"<p>eğer bu alanı boş bırakırsanız, gerçek adınız gösterilmeyecek, yalnızca "
-"e-posta adresiniz gösterilecektir.</p></qt>"
+"<qt><h3>Adınız</h3><p>Bu alan gönderilen iletilerde gözükmesini istediğiniz "
+"adınızı içermelidir;</p><p>eğer bu alanı boş bırakırsanız, gerçek adınız "
+"gösterilmeyecek, yalnızca e-posta adresiniz gösterilecektir.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3892,17 +3819,13 @@ msgstr "&Kurum:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Kurum</h3>"
-"<p>Bu alan gönderilen iletilerde gözlükmesini isterseniz, kurumunuzun adını "
-"içermelidir.</p>"
-"<p>Genellikle bu alanı boş bırakmak normaldir..</p></qt>"
+"<qt><h3>Kurum</h3><p>Bu alan gönderilen iletilerde gözlükmesini isterseniz, "
+"kurumunuzun adını içermelidir.</p><p>Genellikle bu alanı boş bırakmak "
+"normaldir..</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3911,20 +3834,15 @@ msgstr "&E-posta Adresi:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>E-posta adresi</h3>"
-"<p>Bu alan tam e-posta adresinizi içermelidir.</p>"
-"<p>Bu alanı boş bırakır ya da hatalı yazarsanız, insanlar size yanıt yazmakta "
-"sorun yaşayacaklardır.</p></qt>"
+"<qt><h3>E-posta adresi</h3><p>Bu alan tam e-posta adresinizi içermelidir.</"
+"p><p>Bu alanı boş bırakır ya da hatalı yazarsanız, insanlar size yanıt "
+"yazmakta sorun yaşayacaklardır.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -3933,21 +3851,12 @@ msgstr "&E-posta Adresi:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3970,12 +3879,11 @@ msgstr "İletilerinizi imzalamak için kullanılacak OpenPGP anahtarını seçin
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3988,31 +3896,27 @@ msgstr "OpenPGP Şifreleme Anahtarınız"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 "Kendinizi şifrelemek ve Düzenleyicide \"Açık Anahtarımı Ekle\" özelliğinde "
 "kullanmak için OpenPGP anahtarını seçin."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Kendinizi şifrelemek ve Düzenleyicide \"Açık Anahtarımı Ekle\" özelliğinde "
-"kullanmak için OpenPGP anahtarını seçin. Ayrıca GnuPG anahtarlarını da "
-"kullanabilirsiniz.</p>"
-"<p>Bu alanı boş bırakabilirsiniz ama KMail giden iletilerinizi "
-"şifreleyemeyecektir. Bu durumdan normal ileti gönderme süreci etkilenmez.</p>"
-"<p>Anahtarlar hakkında daha geniş bilgiyi <a>http://www.gnupg.org</a> "
-"adresinden edinebilirsiniz.</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Kendinizi şifrelemek ve Düzenleyicide \"Açık Anahtarımı Ekle\" "
+"özelliğinde kullanmak için OpenPGP anahtarını seçin. Ayrıca GnuPG "
+"anahtarlarını da kullanabilirsiniz.</p><p>Bu alanı boş bırakabilirsiniz ama "
+"KMail giden iletilerinizi şifreleyemeyecektir. Bu durumdan normal ileti "
+"gönderme süreci etkilenmez.</p><p>Anahtarlar hakkında daha geniş bilgiyi "
+"<a>http://www.gnupg.org</a> adresinden edinebilirsiniz.</qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4031,11 +3935,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -4048,20 +3951,19 @@ msgstr "S/MIME Şifreleme Sertifikanız"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Kendinizi şifrelemek ve Düzenleyicide \"Sertifikamı Ekle\" özelliğinde "
 "kullanmak için S/MIME sertifikasını seçin."
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -4082,24 +3984,20 @@ msgstr "&Yanıt adresi:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Adreslere Yanıtla</h3>"
-"<p>Bu<tt>Yanıtla:</tt> başlıklarını farklı e-posta adresleri içeren biçimden "
-"normal <tt>Kimden:</tt> adresleri biçimine dönüştürür.</p>"
-"<p>Bu benzer rolleri olan insanlarla birlikte çalışılan grup çalışmalarında "
-"kullanışlıdır. Örneğin, <tt>Kimden</tt> alanında kendi e-posta adresiniz olan "
-"fakat grup adresinden yanıt alamadığınız tüm iletileri göndermek "
-"isteyebilirsiniz.</p>"
-"<p>Eğer emin değilseniz bu alanı boş bırakın.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Adreslere Yanıtla</h3><p>Bu<tt>Yanıtla:</tt> başlıklarını farklı e-"
+"posta adresleri içeren biçimden normal <tt>Kimden:</tt> adresleri biçimine "
+"dönüştürür.</p><p>Bu benzer rolleri olan insanlarla birlikte çalışılan grup "
+"çalışmalarında kullanışlıdır. Örneğin, <tt>Kimden</tt> alanında kendi e-"
+"posta adresiniz olan fakat grup adresinden yanıt alamadığınız tüm iletileri "
+"göndermek isteyebilirsiniz.</p><p>Eğer emin değilseniz bu alanı boş bırakın."
+"</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4107,25 +4005,19 @@ msgstr "&BCC adresi:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (Fotokopi Kopya) adresleri</h3>"
-"<p>Buraya girdiğiniz adreslere bu kimlik ile gönderilen her iletinin bir "
-"kopyası gönderilecektir. Bu iletiler diğer alıcılara gösterilmeyecektir.</p>"
-"<p>Bu genellikle göndeilen her iletiyi kendinize ait başka ir hesaba da "
-"göndermek için kullanılır.</p>"
-"<p>Birden fazla BCC alıcısı belirlemek için e-posta adreslerinin arasına virgül "
-"koyun.</p>"
-"<p>Eğer emin değilseniz bu alanı boş bırakın.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (Fotokopi Kopya) adresleri</h3><p>Buraya girdiğiniz adreslere bu "
+"kimlik ile gönderilen her iletinin bir kopyası gönderilecektir. Bu iletiler "
+"diğer alıcılara gösterilmeyecektir.</p><p>Bu genellikle göndeilen her "
+"iletiyi kendinize ait başka ir hesaba da göndermek için kullanılır.</"
+"p><p>Birden fazla BCC alıcısı belirlemek için e-posta adreslerinin arasına "
+"virgül koyun.</p><p>Eğer emin değilseniz bu alanı boş bırakın.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4163,7 +4055,7 @@ msgstr "İ&mza"
 msgid "&Picture"
 msgstr "&Resim"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Geçersiz E-posta Adresi"
 
@@ -4186,11 +4078,11 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
-"Yapılandırılan OpenPGP şifreleme anahtarları, bu kimlik için tanımlanan e-posta "
-"adresine sahip hiç bir kimlik bilgisi (ID) içermiyor (%1)."
+"Yapılandırılan OpenPGP şifreleme anahtarları, bu kimlik için tanımlanan e-"
+"posta adresine sahip hiç bir kimlik bilgisi (ID) içermiyor (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4225,29 +4117,29 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"\"%1\" kimliği için tanımlanmış olan gönderilmiş iletiler dizini (artık) yok; "
-"Bu nedenle öntanımlı gönderilmiş iletiler dizini kullanılacak."
+"\"%1\" kimliği için tanımlanmış olan gönderilmiş iletiler dizini (artık) "
+"yok; Bu nedenle öntanımlı gönderilmiş iletiler dizini kullanılacak."
 
 #: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
-"\"%1\" kimliği için tanımlanmış olan taslak klasörü mevcut değil. Bundan böyle "
-"öntanımlı taslaklar kutusu klasörü kullanılacak."
+"\"%1\" kimliği için tanımlanmış olan taslak klasörü mevcut değil. Bundan "
+"böyle öntanımlı taslaklar kutusu klasörü kullanılacak."
 
 #: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
 msgstr ""
-"\"%1\" kimliği için tanımlanmış olan şablonlar dizini (artık) yok; Bu nedenle "
-"öntanımlı şablonlar dizini kullanılacak."
+"\"%1\" kimliği için tanımlanmış olan şablonlar dizini (artık) yok; Bu "
+"nedenle öntanımlı şablonlar dizini kullanılacak."
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Öntanımlı)"
 
@@ -4293,14 +4185,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4338,14 +4230,19 @@ msgstr "Dizin kota sınırına çok yakın. (%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Hata: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4493,14 +4390,14 @@ msgstr "Liste Arşivleri"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4527,136 +4424,110 @@ msgstr "Tam Olarak Güvenilmeyen Şifreleme Anahtarları"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4671,136 +4542,110 @@ msgstr "S/MIME Sertifikasının Süresi Doluyor"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4813,9 +4658,10 @@ msgstr "S/MIME Sertifikasının Süresi Doluyor"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4841,26 +4687,26 @@ msgstr "Kullanılamaz İmzalama Anahtarları"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4871,8 +4717,8 @@ msgstr "OpenPGP-Sign Kullanma"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4894,8 +4740,8 @@ msgstr "İmzalama mümkün değil"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4917,8 +4763,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Bu iletinin hiçbir alıcısı için şifreleme anahtarı belirlemediniz; bu yüzden "
 "ileti şifrelenmeyecek."
@@ -4940,8 +4786,8 @@ msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Bu iletinin alıcılarından bazıları için şifreleme anahtarı belirlemediniz:; bu "
-"yüzden ilgili kişiler şifreli gönderirseniz iletinin şifresiniçözemeyecek."
+"Bu iletinin alıcılarından bazıları için şifreleme anahtarı belirlemediniz:; "
+"bu yüzden ilgili kişiler şifreli gönderirseniz iletinin şifresiniçözemeyecek."
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -4965,11 +4811,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "\"%1\" için geçerli ve güvenilir bir şifreleme anahtarı yok.\n"
 "\n"
@@ -5018,10 +4864,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Önemli hata: E-postalar alınamıyor:"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Bu ileti eklenemedi:\n"
+msgid "Failed to add message:\n"
+msgstr "Bu ileti eklenemedi:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5107,6 +4951,50 @@ msgstr "&Bağlı Olmayan IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Posta klasörü posta kutusu"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "İletinin konusunu belirleyin"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "'adres'e CC: gönder"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "'adres'e BCC: gönder."
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "İletiye 'başlık' ekle"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "'Dosya'dan ileti gövdesini oku."
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "İletinin gövdesini belirleyin"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Postaya bir eklenti yerleştir. Bu işlemi tekrar edebilirsiniz"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Sadece yeni e-postaları denetle"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Sadece düzenleyici penceresini aç"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Verilen ileti dosyasını göster"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "İletiyi 'adres'e gönder. 'URL'nin işaret ettiği dosyayı da ekle"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Posta"
@@ -5165,14 +5053,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>Kmail, Grup çalışması için gerekli dizinleri %1 buldu ve şu işlemleri "
-"yapması gerekiyor: %2"
-"<br>Eğer bunu yapmak istemiyorsanız iptal edin, IMAP kaynakları "
-"pasifleştirilecektir"
+"yapması gerekiyor: %2<br>Eğer bunu yapmak istemiyorsanız iptal edin, IMAP "
+"kaynakları pasifleştirilecektir"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5217,14 +5104,13 @@ msgstr "URL panoya kopyalandı."
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
-"<qt><b>%1</b> dosyası mevcut. "
-"<br>Bunun üzerine yazmak istiyor musunuz?</qt>"
+"<qt><b>%1</b> dosyası mevcut. <br>Bunun üzerine yazmak istiyor musunuz?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Dosyaya kaydet"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Değiştir"
 
@@ -5242,7 +5128,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "İleti kaydedilirken silindi. Kaydedilmedi."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5262,11 +5148,11 @@ msgstr "Dosya bir ileti içermiyor."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Dosya birden fazla ileti içeriyor. Yalnızca ilk ileti gösteriliyor."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5275,105 +5161,105 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "İletiler filtreleniyor"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "İletiler filtreleniyor %2 iletinin %1 tanesi"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Yeterli disk alanınız olmayabilir."
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Bu Klasöre Taşı"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Bu Klasöre Kopyala"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
-"%1 dizininde bozuk IMAP önbelleği tespit edildi. İletilerin kopyalanması iptal "
-"edildi."
+"%1 dizininde bozuk IMAP önbelleği tespit edildi. İletilerin kopyalanması "
+"iptal edildi."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "İletiler taşınıyor"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "İletiler siliniyor"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL açılıyor..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Gerçekten <b>%1</b> programını çalıştırmak istiyor musunuz?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Komut Çalıştır"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Kaydedilecek eklenti yok."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Ekleri Farklı Kaydet"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "eklenti.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "eklenti.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "%1 isminde bir dosya mevcut. Üzerine yazılsın mı?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Dosya Zaten Var"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Üzerine &Yaz"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
-"İletinin %1 kısmı şifrelenmiş. Kaydederken şifrelemeyi muhafaza etmek istiyor "
-"musunuz?"
+"İletinin %1 kısmı şifrelenmiş. Kaydederken şifrelemeyi muhafaza etmek "
+"istiyor musunuz?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail Sorusu"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Şifrelemeyi Koru"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Koruma"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
@@ -5381,11 +5267,11 @@ msgstr ""
 "İletinin %1 kısmı imzalanmış. Kaydederken imzayı muhafaza etmek istiyor "
 "musunuz?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "İmzayı Koru"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5394,19 +5280,19 @@ msgstr ""
 "%1 dosyası yazılamıyor:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "%1 dosyasına yazılamıyor."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5416,65 +5302,65 @@ msgstr ""
 " %1\n"
 " kiminle iletişim kurulacağına karar vermek imkansız."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
-"Chiasmus arka ucu \"x-obtain-keys\" fonksiyonunu sağlamıyor. Lütfen bu hatayı "
-"bildirin."
+"Chiasmus arka ucu \"x-obtain-keys\" fonksiyonunu sağlamıyor. Lütfen bu "
+"hatayı bildirin."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus Arka Uç Hatası"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
-"Chiasmus arka ucundan geçersiz dönüş değeri: \"x-obtain-keys\" fonksiyonu bir "
-"sözcük listesi ile dönmedi. Lütfen bu hatayı bildirin."
+"Chiasmus arka ucundan geçersiz dönüş değeri: \"x-obtain-keys\" fonksiyonu "
+"bir sözcük listesi ile dönmedi. Lütfen bu hatayı bildirin."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus Şifre Çözücü Anahtar Seçimi"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\"x-decrypt\" işlevi aşağıdaki giriş değişkenlerini beklemiyordu. Lütfen hatayı "
-"bildiriniz."
+"\"x-decrypt\" işlevi aşağıdaki giriş değişkenlerini beklemiyordu. Lütfen "
+"hatayı bildiriniz."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus Şifre Çözme Hatası"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5484,7 +5370,7 @@ msgstr ""
 "Kime: %2\n"
 "Konu: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "E-posta: %1"
@@ -5583,7 +5469,7 @@ msgstr "Boyut"
 msgid "Encoding"
 msgstr "Şifreleme"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Sıkıştır"
 
@@ -5595,7 +5481,7 @@ msgstr "Şifrele"
 msgid "Sign"
 msgstr "İmzala"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Eklenti adı:"
 
@@ -5617,7 +5503,8 @@ msgstr "Birincil Alıcılar"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>Bu alan yazdığınız e-posta adresleri, e-posta iletisinin bir kopyasını "
 "alır.</qt>"
@@ -5629,12 +5516,12 @@ msgstr "Diğer Alıcılar"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"x<qt> e-posta in field a kopyala e-posta hepsi in<b> Kime</b> "
-"field in Karbon Kopyala CC a</qt>"
+"x<qt> e-posta in field a kopyala e-posta hepsi in<b> Kime</b> field in "
+"Karbon Kopyala CC a</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5642,9 +5529,8 @@ msgstr "Gizli Alıcılar"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5655,7 +5541,7 @@ msgstr "İletiyi &Gönder"
 msgid "&Send Mail Via"
 msgstr "Şunu Kullanarak G&önder"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Son&ra Gönder"
@@ -5720,8 +5606,7 @@ msgstr "Alı&ntı Karakterlerini Sil"
 msgid "Cl&ean Spaces"
 msgstr "B&oşlukları Temizle"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "S&abit Yazıtipi Kullan"
@@ -5862,31 +5747,31 @@ msgstr "&Şifreli İleti Biçimi"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Standart"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "İmli Liste (Daire)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "İmli Liste (Çember)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "İmli Liste (Kare)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Sıralı Liste (Ondalık)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Sıralı Liste (Küçük Harf)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Sıralı Liste (Büyük Harf)"
 
@@ -5982,7 +5867,8 @@ msgstr ""
 #: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
-"Mesajı silmek mi, yoksa daha sonra düzenlemek üzere kaydetmek mi istiyorsunuz?"
+"Mesajı silmek mi, yoksa daha sonra düzenlemek üzere kaydetmek mi "
+"istiyorsunuz?"
 
 #: kmcomposewin.cpp:2262
 msgid "Close Composer"
@@ -5990,8 +5876,8 @@ msgstr "Düzenleyiciyi Kapat"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "Yazdığınız ileti bir ek dosyasına bağlı gibi görünüyor. Ama herhangi bir şey "
@@ -6002,49 +5888,49 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Dosya Eklenti Hatırlatıcı"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Bu şekilde gönder"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>KMail (%1) ekinin konumunu onaylamadı;</p> "
-"<p>eğer bir dosya eklemek istiyorsanız tam yolunu belirtmelisiniz.</p></qt>"
+"<qt> <p>KMail (%1) ekinin konumunu onaylamadı;</p> <p>eğer bir dosya eklemek "
+"istiyorsanız tam yolunu belirtmelisiniz.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Dosyayı Ekle"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Ekle"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Dosyayı Araya Ekle"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Dosyayı Araya Ekle"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Eklentiden anahtar aktarılırken bir hata oluştu: </p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Eklentiden anahtar aktarılırken bir hata oluştu: </p><p><b>%1</b></"
+"p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6083,95 +5969,106 @@ msgid ""
 "View"
 msgstr "Göster"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Düzenle..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Şununla Düzenle..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "&Farklı Kaydet..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "Ö&zellikler"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Eklenti Yerleştir..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail dosyayı sıkıştıramıyor."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
-"Sıkıştırılmış dosya orjinalinden daha büyük. Orjinal dosyayı kullanmayı ister "
-"misiniz?"
+"Sıkıştırılmış dosya orjinalinden daha büyük. Orjinal dosyayı kullanmayı "
+"ister misiniz?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Koru>"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail sıkıştırılmış dosyayı açamıyor."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Ekleri Farklı Kaydet"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Metin olarak Ekle"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Eklenti olarak Ekle"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Eklenti olarak eklensin mi, metin olarak yapıştırılsın mı?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "isimsiz"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>İletinin kendi kendine şifrelenmesini istediniz, ancak bu işlem için bir "
-"şifreleme yöntemi (OpenPGP ya da S/MIME) belirtmediniz. </p>"
-"<p>Lütfen bu kimlik için kullanılacak anahtarları seçin.</p></qt>"
+"<qt><p>İletinin kendi kendine şifrelenmesini istediniz, ancak bu işlem için "
+"bir şifreleme yöntemi (OpenPGP ya da S/MIME) belirtmediniz. </p><p>Lütfen bu "
+"kimlik için kullanılacak anahtarları seçin.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Tanımlanmamış Şifre Açma Anahtarı"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bu iletiyi imzalayabilmek için öncelikle kullanmak için bir (OpenPGP veyar "
-"S/MIME) imzalama anahtarı belirlemelisiniz.</p>"
-"<p>Lütfen kimli yapılandırmanızdan kullanmak istediğiniz anahtarı seçin</p></qt>"
+"<qt><p>Bu iletiyi imzalayabilmek için öncelikle kullanmak için bir (OpenPGP "
+"veyar S/MIME) imzalama anahtarı belirlemelisiniz.</p><p>Lütfen kimli "
+"yapılandırmanızdan kullanmak istediğiniz anahtarı seçin</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Tanımlanmamış İmzalama Anahtarı"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6179,187 +6076,187 @@ msgstr ""
 "KMail şu anda çevrimdışı kipte, çevrimiçi olana kadar iletileriniz giden "
 "kutusunda tutulacak."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Çevrimiçi/Çevrimdışı"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
-"Kimden: alanına e-posta adresinizi girmelisiniz. Aynı zamanda tüm kimlikleriniz "
-"için e-posta adresinizi belirlemelisiniz. Bu işlemden sonra her ileti için "
-"e-posta adresi girmek zorunda kalmayacaksınız."
+"Kimden: alanına e-posta adresinizi girmelisiniz. Aynı zamanda tüm "
+"kimlikleriniz için e-posta adresinizi belirlemelisiniz. Bu işlemden sonra "
+"her ileti için e-posta adresi girmek zorunda kalmayacaksınız."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "Bu ileti için en az bir alıcı belirtmeniz gereklidir."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Kime alanı boş.İleti yine de gönderilsin mi?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Kime: alanı belirtilmemiş"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Bir konu belirtmediniz. İleti yine de gönderilsin mi?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Bir Konu Belirtilmedi"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "&Bu şekliyle gönder"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Bir Konu Belirteyim"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "Biçimlemeyi &koru, imzalama/şifreleme"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "Biçimlemeyi &koru, şifreleme"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "Biçimlemeyi &koru, imzalama"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "İmzala/Şifrele (biçimlemeyi yoket)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Şifrele (biçimlemeyi yoket)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "İmzala (biçimlemeyi yoket)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "İletiyi İmzala/Şifrele?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
-"\"%1\" kimliği için tanımlanmış olan taslaklar ya da şablonlar dizini (artık) "
-"yok; Bu nedenle öntanımlı taslaklar ya da şablonlar dizini kullanılacak."
+"\"%1\" kimliği için tanımlanmış olan taslaklar ya da şablonlar dizini "
+"(artık) yok; Bu nedenle öntanımlı taslaklar ya da şablonlar dizini "
+"kullanılacak."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Lütfen gönderme için yeni bir hesap açın ve tekrar deneyin."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "E-posta göndermek hakkında..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Onay Gönder"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Şimdi Gö&nder"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<alıcı yok>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Diğer Alıcılar"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Yazım denetimi: açık"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Yazım denetimi: kapalı"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Yazım denetimi iptal edildi."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Yazım denetimi durduruldu."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Yazım denetimi tamamlandı."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Yazım Denetleyici..."
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Hiç Chaismus Arka Ucu Yapılandırılmamış"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Hiç Chiasmus İmzası Bulunamadı"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus Şifreleme Anahtarı Seçimi"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "İleti imzalanacak"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "İleti imzalanmayacak"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "İleti şifrelenecek"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "İleti şifrelenmeyecek"
 
@@ -6408,8 +6305,8 @@ msgstr "Yazım denetimi - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "Aspell/ISpell başlatılamadı. Lütfen Aspell/ISpell ayarlarının doğru olarak "
 "yapıldığını kontrol edin."
@@ -6445,13 +6342,11 @@ msgstr "`%1' filtre kuralında çok fazla filtre eylemi var "
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt><b>%2</b> filtre kuralında "
-"<br> bilinmeyen filtre kuralı: <b>%1</b>"
-"<br> Yoksayılıyor.</qt>"
+"<qt><b>%2</b> filtre kuralında <br> bilinmeyen filtre kuralı: <b>%1</b><br> "
+"Yoksayılıyor.</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6671,155 +6566,123 @@ msgstr "Ses Çal"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bu tanımlı filtrelerin listesidir. Bu filtreler yukarıdan aşağıya doğru "
-"işlenir.</p>"
-"<p>Herhangi bir filtreyi düzenlemek için üzerinde tıklayın ve pencerenin sağ "
-"tarafındaki kontrolleri kullanın.</p></qt>"
+"<qt><p>Bu tanımlı filtrelerin listesidir. Bu filtreler yukarıdan aşağıya "
+"doğru işlenir.</p><p>Herhangi bir filtreyi düzenlemek için üzerinde tıklayın "
+"ve pencerenin sağ tarafındaki kontrolleri kullanın.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Yeni bir filtre oluşturmak için bu düğmeye tıklayın.</p>"
-"<p>Kullanılan filtre şu anda seçili olandan önce eklenecektir, fakat daha sonra "
-"bunu değiştirebilirsiniz.</p>"
-"<p>Eğer bu düğmeye yanlışlıkla bastıysanız <em>Sil</em> "
-"düğmesine tıklayarak işlemi geri alabilirsiniz.</p></qt>"
+"<qt><p>Yeni bir filtre oluşturmak için bu düğmeye tıklayın.</p><p>Kullanılan "
+"filtre şu anda seçili olandan önce eklenecektir, fakat daha sonra bunu "
+"değiştirebilirsiniz.</p><p>Eğer bu düğmeye yanlışlıkla bastıysanız <em>Sil</"
+"em> düğmesine tıklayarak işlemi geri alabilirsiniz.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bir filtreyi kopyalamak için bu düğmeye tıklayın.</p>"
-"<p>Eğer bu düğmeye yanlışlıkla bastıysanız <em>Sil</em> "
-"düğmesine tıklayarak işlemi geri alabilirsiniz.</p></qt>"
+"<qt><p>Bir filtreyi kopyalamak için bu düğmeye tıklayın.</p><p>Eğer bu "
+"düğmeye yanlışlıkla bastıysanız <em>Sil</em> düğmesine tıklayarak işlemi "
+"geri alabilirsiniz.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Seçili filtreyi silmek için <em>Sil</em> düğmesine tıklayın.</p>"
-"<p> Eğer silerseniz artık geri dönüşü olmayacaktır. Ancak bu pencereyi <em>"
-"İptal</em> düğmesine tıklayarak hiçbir işlem uygulamadan da "
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
+msgstr ""
+"<qt><p>Seçili filtreyi silmek için <em>Sil</em> düğmesine tıklayın.</p><p> "
+"Eğer silerseniz artık geri dönüşü olmayacaktır. Ancak bu pencereyi "
+"<em>İptal</em> düğmesine tıklayarak hiçbir işlem uygulamadan da "
 "kapatabilirsiniz.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bu düğmeye basmak seçili süzgeçi yukarıdaki liste içinde bir <em>Yukarı</em> "
-"taşır.</p>"
-"<p>Süzgeçlerin liste içindeki sıraları onların iletilerle uğraşma sıralarını "
-"belirlediği için kullanışlıdır: En üstteki süzgeç ilk önce denenir.</p>"
-"<p>"
+"<qt><p>Bu düğmeye basmak seçili süzgeçi yukarıdaki liste içinde bir "
+"<em>Yukarı</em> taşır.</p><p>Süzgeçlerin liste içindeki sıraları onların "
+"iletilerle uğraşma sıralarını belirlediği için kullanışlıdır: En üstteki "
+"süzgeç ilk önce denenir.</p><p>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bu düğmeye basmak seçili süzgeçi yukarıdaki liste içinde bir <em>yukarı</em> "
-"taşır.</p>"
-"<p>Süzgeçlerin liste içindeki sıraları onların iletilerle uğraşma sıralarını "
-"belirlediği için kullanışlıdır: En üstteki süzgeç ilk önce denenir.</p>"
-"<p>Eğer bu düğmeye yanlışlıkla bastıysanız <em>Aşağı</em> "
-"düğmesine basarak işlemi geri alabilirsiniz.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Bu düğmeye basmak seçili süzgeçi yukarıdaki liste içinde bir "
+"<em>yukarı</em> taşır.</p><p>Süzgeçlerin liste içindeki sıraları onların "
+"iletilerle uğraşma sıralarını belirlediği için kullanışlıdır: En üstteki "
+"süzgeç ilk önce denenir.</p><p>Eğer bu düğmeye yanlışlıkla bastıysanız "
+"<em>Aşağı</em> düğmesine basarak işlemi geri alabilirsiniz.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bu düğmeye basmak seçili süzgeçi yukarıdaki liste içinde bir <em>Aşağı</em> "
-"taşır.</p>"
-"<p>Süzgeçlerin liste içindeki sıraları onların iletilerle uğraşma sıralarını "
-"belirlediği için kullanışlıdır: En üstteki süzgeç ilk önce denenir.</p>"
-"<p>Eğer bu düğmeye yanlışlıkla bastıysanız <em>Yukarı</em> "
-"düğmesine basarak geri alabilirsiniz.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Bu düğmeye basmak seçili süzgeçi yukarıdaki liste içinde bir "
+"<em>Aşağı</em> taşır.</p><p>Süzgeçlerin liste içindeki sıraları onların "
+"iletilerle uğraşma sıralarını belirlediği için kullanışlıdır: En üstteki "
+"süzgeç ilk önce denenir.</p><p>Eğer bu düğmeye yanlışlıkla bastıysanız "
+"<em>Yukarı</em> düğmesine basarak geri alabilirsiniz.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bu düğmeye basmak seçili filtreyi yukarıdaki listenin en <em>aşağısına</em> "
-"taşır.</p>"
-"<p>Filtrelerin liste içindeki sıraları onların iletilere uygulanma sıralarını "
-"belirlediği için kullanışlıdır: En üstteki filtre ilk önce denenir.</p>"
-"<p>"
+"<qt><p>Bu düğmeye basmak seçili filtreyi yukarıdaki listenin en "
+"<em>aşağısına</em> taşır.</p><p>Filtrelerin liste içindeki sıraları onların "
+"iletilere uygulanma sıralarını belirlediği için kullanışlıdır: En üstteki "
+"filtre ilk önce denenir.</p><p>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Seçili süzgeçi yeniden isimlendirmek için bu düğmeye basın.</p>"
-"<p>Süzgeçler otomatik olarak, \"<<\" ile başlayacak şekilde "
-"isimlendirilirler.</p>"
-"<p>Eğer bir süzgeçi yanlışlıkla yeniden isimlendirdiyseniz ve geri almak "
-"istiyorsanız, bu düğmeye basın ve görünen pencerede <em>Temizle</em> ve <em>"
-"Tamam</em> düğmelerine tıklayın.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>Seçili süzgeçi yeniden isimlendirmek için bu düğmeye basın.</"
+"p><p>Süzgeçler otomatik olarak, \"<<\" ile başlayacak şekilde "
+"isimlendirilirler.</p><p>Eğer bir süzgeçi yanlışlıkla yeniden "
+"isimlendirdiyseniz ve geri almak istiyorsanız, bu düğmeye basın ve görünen "
+"pencerede <em>Temizle</em> ve <em>Tamam</em> düğmelerine tıklayın.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6831,6 +6694,16 @@ msgstr "Filtre Kuralları"
 msgid "Filter Rules"
 msgstr "Süzgeç Kuralları"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Ekle"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Ekle"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Kullanılabilir Filtreler"
@@ -6912,6 +6785,11 @@ msgstr "Ek olarak bu filtreyi araç çubuğuna ekle"
 msgid "Icon for this filter:"
 msgstr "Bu filtre için simge:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Kime"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Yukarı"
@@ -6920,16 +6798,29 @@ msgstr "Yukarı"
 msgid "Down"
 msgstr "Aşağı"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Yeniden adlandır..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Yeni"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Kopyala"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Silinmiş"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6938,8 +6829,8 @@ msgstr "Klasör için Kısayol Seç"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6947,8 +6838,8 @@ msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Geçersiz takip eden filtreler saklanmadı (mesela içeriğinde arama kuralları ve "
-"işlev olmayabilir)."
+"Geçersiz takip eden filtreler saklanmadı (mesela içeriğinde arama kuralları "
+"ve işlev olmayabilir)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7004,8 +6895,8 @@ msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Klasör adları . (nokta) karakteri ile başlayamaz; lütfen başka bir klasör adı "
-"seçiniz."
+"Klasör adları . (nokta) karakteri ile başlayamaz; lütfen başka bir klasör "
+"adı seçiniz."
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7021,19 +6912,16 @@ msgstr "IMAP Önbelleği Sorunu Gideriliyor"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -7070,8 +6958,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7093,8 +6981,8 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"%1 klasörünün ve alt klasörlerinin IMAP önbelleğini tazelemek istediğinize emin "
-"misiniz?\n"
+"%1 klasörünün ve alt klasörlerinin IMAP önbelleğini tazelemek istediğinize "
+"emin misiniz?\n"
 "Bu işlem yerel olarak yaptığınız tüm klasör işlemlerini silecektir."
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
@@ -7111,8 +6999,8 @@ msgstr "Bu klasör için indeks yeniden oluşturuldu."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7238,10 +7126,8 @@ msgstr "Sunucu üzerinde alt klasörler açılıyor"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7263,14 +7149,11 @@ msgstr "%1 isimlendirmesi için dizin listesi alınıyor"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt> "
-"<p>"
-"<br>%1</b> klasörü silinmiş gibi görünüyor. Klasörü sunucudan da silmek ister "
-"misniz?</p></qt>"
+"<qt> <p><br>%1</b> klasörü silinmiş gibi görünüyor. Klasörü sunucudan da "
+"silmek ister misniz?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7278,14 +7161,14 @@ msgstr "İptal edildi"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7298,11 +7181,11 @@ msgstr "kayıp+bulunan"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7311,15 +7194,20 @@ msgstr "Yetersiz erişim hakkı"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Taşı:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Taşıma"
 
@@ -7331,8 +7219,7 @@ msgstr "İletiyi Klasöre Taşı"
 msgid "Permissions (ACL)"
 msgstr "İzinler (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Genel"
@@ -7356,8 +7243,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Ö&zel simgeleri kullan"
@@ -7376,14 +7262,13 @@ msgstr "Bu klasöre yeni/okunmamış posta geldiğinde uyar"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7396,13 +7281,13 @@ msgstr "Cevapları bu klasör içerisinde tut"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Bu klasördeki postalara verdiğiniz cevapların gönderildikten sonra ayarlanmış "
-"giden posta klasörü yerine aynı klasörde tutulmalarını istiyorsanız bu seçeneği "
-"işaretleyin."
+"Bu klasördeki postalara verdiğiniz cevapların gönderildikten sonra "
+"ayarlanmış giden posta klasörü yerine aynı klasörde tutulmalarını "
+"istiyorsanız bu seçeneği işaretleyin."
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7412,17 +7297,21 @@ msgstr "İleti Listesinde Gönderen/Alıcı Sütununu Göster"
 msgid "Sho&w column:"
 msgstr "Sütünu &göster:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Öntanımlı olarak Ayarla"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Gönderen"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Alıcı"
@@ -7433,17 +7322,17 @@ msgstr "Gönderici &kimliği:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Yeni posta yazarken veya bu klasördeki postaya cevap yazarken kullanılacak "
 "gönderen kimliğini seçin. Böylelikle eğer çalışma klasörlerinden "
 "birisindeyseniz, KMail' in gönderen e-posta adresine uyan, imza ve imza veya "
-"şifreleme anahtarları otomatik olarak kullanabilir. Kimlikler ana yapılandırma "
-"diyaloğundan ayarlanabilir. (Ayarlar -> KMail' i Yapılandır)"
+"şifreleme anahtarları otomatik olarak kullanabilir. Kimlikler ana "
+"yapılandırma diyaloğundan ayarlanabilir. (Ayarlar -> KMail' i Yapılandır)"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7461,12 +7350,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7498,17 +7387,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7578,7 +7467,8 @@ msgstr "Klasör bilgisi alınırken hata oluştu."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7601,11 +7491,11 @@ msgstr "%1 açılırken hata oluştu; böyle bir klasör yok."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Açılış hatası %1. Yeterli erişim izinlerine sahipdeğilsiniz veya bu geçerli bir "
-"klasör olmayabilir."
+"Açılış hatası %1. Yeterli erişim izinlerine sahipdeğilsiniz veya bu geçerli "
+"bir klasör olmayabilir."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -7647,13 +7537,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7711,7 +7599,7 @@ msgstr ""
 "'%1' bir klasör değil.\n"
 "Lütfen bu dosyayı başka bir yere yerleştirin."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7720,7 +7608,7 @@ msgstr ""
 "lütfen bu klasörün içeriğini görüntüleyip düzenleyebiliyor musunuz, kontrol "
 "edin."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7730,15 +7618,15 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Dizin Oluşturulamadı"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7836,9 +7724,9 @@ msgstr "IMAP Önbelleğini Tazele..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Sunucudaki yetersiz izinler nedeniyle <b>%1</b> klasörü oluşturulamadı. "
 "Eğer burada alt klasör oluşturabilmeniz gerektiğini düşünüyorsanız, size "
@@ -7969,13 +7857,13 @@ msgstr "%1 klasör salt okunur."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Seçili %n iletiyi gerçekten silmek istiyor musunuz?"
-"<br>Bir kez silinirse, bunları geri getiremezsiniz.</qt>"
+"<qt>Seçili %n iletiyi gerçekten silmek istiyor musunuz?<br>Bir kez "
+"silinirse, bunları geri getiremezsiniz.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8027,128 +7915,128 @@ msgstr ""
 "%1 düzenlenirken hata\n"
 "(diskte yer kalmamış olabilir mi?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Sertifika İmzalama Talebi"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Lütfen eklentiden bir sertifika oluşturun ve gönderene geri gönderin."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail çevrimdışı olarak ayarlanmış, tüm ağ işleri beklemede"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail çevrimiçi olarak ayarlandı; tüm ağ işlemleri devam ettiriliyor"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
-"KMail şu anda çevrim dışı çalışıyor. İşlemi nasıl gerçekleştirmek istiyorsunuz?"
+"KMail şu anda çevrim dışı çalışıyor. İşlemi nasıl gerçekleştirmek "
+"istiyorsunuz?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Çevrimiçi Çalış"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Gelen klasörüne okumak/yazmak için izniniz yok."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "giden kutusu"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Gönderilen klasörüne okumak/yazmak için izniniz yok."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "gönderilen iletiler"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Giden klasörüne okumak/yazmak için izniniz yok."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "çöp"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Çöp klasörüne okumak/yazmak için izniniz yok."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "taslaklar"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Taslak klasörüne okumak/yazmak için izniniz yok."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "şablonlar"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Şablonlar dizininiz için okuma/yazma izniniz yok."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Son Arama"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i> klasörü zaten var. %1 iletiler için <i>%5</i> "
-"klasörünü kullanıyor %2, %6 içeriğini sizin için bu klasöre taşıyabilir."
-"<p><strong>Posta dosyalarının %3 tarafından taşınmasını istiyor "
-"musunuz?</strong></qt>"
+"<qt><i>%4</i> klasörü zaten var. %1 iletiler için <i>%5</i> klasörünü "
+"kullanıyor %2, %6 içeriğini sizin için bu klasöre taşıyabilir."
+"<p><strong>Posta dosyalarının %3 tarafından taşınmasını istiyor musunuz?</"
+"strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Posta Dosyaları Aktarılsın mı?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail'de çözülemeyen bir hata oluştu ve program kapatılıyor"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8159,11 +8047,11 @@ msgstr ""
 "Oluşan hata:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Çöp kutusunu Boşalt"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Gerçekten tüm hesapların çöp kutularındaki iletileri silmek istiyor musunuz?"
@@ -8237,8 +8125,7 @@ msgstr "%1 içinde %n yeni ileti"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Yeni bir iletiniz var</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8276,11 +8163,11 @@ msgstr "Çöp kutusu klasörünü gerçekten silmek istiyor musunuz?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Gerçekten <b>%1</b> klasöründeki tüm iletileri çöp kutusuna taşımak istiyor "
-"musunuz?</qt>"
+"<qt>Gerçekten <b>%1</b> klasöründeki tüm iletileri çöp kutusuna taşımak "
+"istiyor musunuz?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8304,8 +8191,8 @@ msgstr "Aramayı Sil"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt>Arama klasörü <b>%1</b>'i silmek istediğinize emin misiniz? Bu klasör "
 "içerisindeki iletiler aslında başka klasörlerde saklandığı için "
@@ -8321,29 +8208,32 @@ msgstr "<qt><b>%1</b> boş klasörünü gerçekten silmek istiyor musunuz?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Silinmiş"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8359,13 +8249,13 @@ msgstr "Tüm eski iletilerin süresinin dolmasını istiyor musunuz?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"İletilerde HTML kullanımı sizi \"spam\" mesajlara karşı daha savunmasız yapar "
-"ve sisteminizin güvenlik açıklarını sezen programlarla saldırıya uğramasına "
-"sebep olabilir."
+"İletilerde HTML kullanımı sizi \"spam\" mesajlara karşı daha savunmasız "
+"yapar ve sisteminizin güvenlik açıklarını sezen programlarla saldırıya "
+"uğramasına sebep olabilir."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8378,8 +8268,8 @@ msgstr "HTML Kullan"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "HTML mesajlarda harici referansları kullanmak sizi çöp postalara karşı daha "
 "savunmasız yapar ve sisteminizin güvenlik açıklarını sezen programlarla "
@@ -8399,12 +8289,12 @@ msgstr "%1 E-posta listesinde"
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"Kmail'ın \"Ofis Dışındayım\" cevap özelliği sunucuya bağlıdır. Bunun için bir "
-"IMAP sunucu ayarı gereklidir. \n"
+"Kmail'ın \"Ofis Dışındayım\" cevap özelliği sunucuya bağlıdır. Bunun için "
+"bir IMAP sunucu ayarı gereklidir. \n"
 "Bu işlemi IMAP hesap yapılandırması altındaki \"Filtreleme\" sekmesinden "
 "tamamlayabilirsiniz."
 
@@ -8421,7 +8311,8 @@ msgstr "Sertifika yöneticisi başlatılamıyor; kurulumunuzu kontrol edin."
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "GnuPG Gönlük göstericisi (kwatchgnupg) başlatılamıyor; kurulumunuzu kontrol "
 "edin."
@@ -8743,8 +8634,7 @@ msgstr "E&klentileri Kaydet..."
 msgid "Appl&y All Filters"
 msgstr "Tüm &Filtreleri Uygula"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "&Filtreyi Uygula"
@@ -8856,7 +8746,6 @@ msgstr "Sonraki Ok&unmayan"
 msgid "Go to the next unread message"
 msgstr "Sonraki okunmayan iletiye git"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Önceki İleti"
@@ -8904,8 +8793,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Eğer okuduğunuz iletinin sonundaysanız, aşağı ok tuşuyla bir sonraki okunmamış "
-"iletiye geçebilirsiniz."
+"Eğer okuduğunuz iletinin sonundaysanız, aşağı ok tuşuyla bir sonraki "
+"okunmamış iletiye geçebilirsiniz."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -8993,8 +8882,8 @@ msgstr " Başlatılıyor..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -9004,10 +8893,10 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Bu ileti okundu bilgisi göndermek istiyor.\n"
@@ -9018,8 +8907,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9031,8 +8920,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9044,8 +8933,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9073,23 +8962,23 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"\"Disposition-Notification-Options\" e-posta başlığı gerekli, fakat bilinmeyen "
-"parametre içeriyor"
+"\"Disposition-Notification-Options\" e-posta başlığı gerekli, fakat "
+"bilinmeyen parametre içeriyor"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Alındı: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Eklenti: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Eklenti silindi."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "'%1' eklentisi silindi."
 
@@ -9137,35 +9026,30 @@ msgstr "İleti Kısmı Özellikleri"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Dosyanın <em>MIME tipi:</em></p>"
-"<p>Normal olarak bu ayarlara dokunmanıza gerek yoktur. Dosya türü otomatik "
-"olarak algılanmaktadır. Ancak bazen %1 uygulaması dosya türünü otomatik olarak "
-"bulamayabilir -- böyle durumlarda dosya türünü buradan ayarlayabilirsiniz.</p>"
-"</qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
+msgstr ""
+"<qt><p>Dosyanın <em>MIME tipi:</em></p><p>Normal olarak bu ayarlara "
+"dokunmanıza gerek yoktur. Dosya türü otomatik olarak algılanmaktadır. Ancak "
+"bazen %1 uygulaması dosya türünü otomatik olarak bulamayabilir -- böyle "
+"durumlarda dosya türünü buradan ayarlayabilirsiniz.</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9174,11 +9058,10 @@ msgstr "&Açıklama:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9187,14 +9070,13 @@ msgstr "Şif&releme:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9203,13 +9085,11 @@ msgstr "Otom&atik görüntülemeyi öner"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9218,16 +9098,13 @@ msgstr "&Bu bölümü imzala"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Eğer bu ileti parçasının imzalanmasını istiyorsanız bu seçeneği "
-"etkinleştirin;</p>"
-"<p>şu anda seçili kimlik ile ilişkilendirilen anahtar ile imzalama işlemi "
-"yapılacak.</p></qt>"
+"<qt><p>Eğer bu ileti parçasının imzalanmasını istiyorsanız bu seçeneği "
+"etkinleştirin;</p><p>şu anda seçili kimlik ile ilişkilendirilen anahtar ile "
+"imzalama işlemi yapılacak.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9235,14 +9112,12 @@ msgstr "B&u bölümü şifrele"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Eğer bu ileti parçasının şifrelenmesini istiyorsanız bu seçeneği "
-"etkinleştirin;</p>"
-"<p>bu iletinin alıcıları için bu parça şifrelenmiş olacaktır</p></qt>"
+"<qt><p>Eğer bu ileti parçasının şifrelenmesini istiyorsanız bu seçeneği "
+"etkinleştirin;</p><p>bu iletinin alıcıları için bu parça şifrelenmiş "
+"olacaktır</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9256,15 +9131,13 @@ msgstr "POP Filtresi"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"POP hesabında iltei süzgeci bulundu:<b>%1</b> "
-"<p>Bu hesap için tanımlanan boyut sınırını aşmıştır."
-"<br> Bununla ne yapacağınızı ayırma tuşuyla seçebilirsiniz."
+"POP hesabında iltei süzgeci bulundu:<b>%1</b> <p>Bu hesap için tanımlanan "
+"boyut sınırını aşmıştır.<br> Bununla ne yapacağınızı ayırma tuşuyla "
+"seçebilirsiniz."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9518,40 +9391,39 @@ msgstr "TDE Masaüstü için e-posta istemcisi."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Dizin içeriği okunuyor</h2>"
-"<p>Lütfen bekleyiniz . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Dizin içeriği okunuyor</h2><p>Lütfen "
+"bekleyiniz . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Çevrimdışı</h2>"
-"<p>KMail şu anda çevrimdışı kipinde çalışıyor. Çevrimiçi kipine geçmek için <a "
-"href=\"kmail:goOnline\">tıklayınız</a> . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Çevrimdışı</h2><p>KMail şu anda çevrimdışı "
+"kipinde çalışıyor. Çevrimiçi kipine geçmek için <a href=\"kmail:goOnline"
+"\">tıklayınız</a> . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9559,17 +9431,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>KMail %1 sürümüne Hoşgeldiniz</h2>"
-"TDE masaüstü ortamı için geliştirilen Kmail e-posta programı, tüm internet "
-"e-posta standartları, MIME, SMTP, POP3 ve IMAP ile tam uyumlu çalışır.</p>\n"
-"<ul>"
-"<li><a href=\"%2\">KMail belgelerinde</a> bu programla ilgili pek çok ayar ve "
-"özelliği bulabilirsiniz. </li>\n"
+"<h2 style='margin-top: 0px;'>KMail %1 sürümüne Hoşgeldiniz</h2>TDE masaüstü "
+"ortamı için geliştirilen Kmail e-posta programı, tüm internet e-posta "
+"standartları, MIME, SMTP, POP3 ve IMAP ile tam uyumlu çalışır.</p>\n"
+"<ul><li><a href=\"%2\">KMail belgelerinde</a> bu programla ilgili pek çok "
+"ayar ve özelliği bulabilirsiniz. </li>\n"
 "<li><a href=\"%3\">KMail web sayfası</A> yeni KMail sürümleri hakkında bilgi "
 "verir. </li></ul>\n"
 "%8\n"
-"<p>KMailuygulamasına eklenen bazı yeni özellikler (TDE %5 sürümü ile birlikte "
-"gelen Kmail %4 ile kıyaslanırsa):</p>\n"
+"<p>KMailuygulamasına eklenen bazı yeni özellikler (TDE %5 sürümü ile "
+"birlikte gelen Kmail %4 ile kıyaslanırsa):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9577,29 +9448,28 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail Takımı</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Lütfen bir kaç dakikanızı ayırıp Ayarlar-&gt;Kmail'ı Yapılandır menüsünden "
-"KMail ayarlarınızı yapın.\n"
-"En azından bir kullanıcı adı ve e-posta hesabını oluşturmak zorundasınız.</p>\n"
+"<p>Lütfen bir kaç dakikanızı ayırıp Ayarlar-&gt;Kmail'ı Yapılandır "
+"menüsünden KMail ayarlarınızı yapın.\n"
+"En azından bir kullanıcı adı ve e-posta hesabını oluşturmak zorundasınız.</"
+"p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>Önemli değişiklikler</span> "
-"(KMail %1 ile karşılaştırıldığında):</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>Önemli değişiklikler</"
+"span> (KMail %1 ile karşılaştırıldığında):</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -9630,7 +9500,8 @@ msgstr "%1 Eklentisini göster"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Ek ikilik düzende veri içeriyor. İlk %n karakteri görüntülemeye "
@@ -9658,15 +9529,18 @@ msgstr "Eklenti Açılsın mı?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 "Bir eklentiyi silmek o iletide kullanılan tüm imzaları geçersiz kılabilir."
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
-"Bir eklentiyi düzenlemek o iletide kullanılan tüm imzaları geçersiz kılabilir."
+"Bir eklentiyi düzenlemek o iletide kullanılan tüm imzaları geçersiz "
+"kılabilir."
 
 #: kmreaderwin.cpp:2956
 msgid "Attachments:"
@@ -9686,6 +9560,58 @@ msgstr "(aşağıdakilerin herhangi birisini eşle)"
 msgid "(match all of the following)"
 msgstr "(aşağıdakilerin hepsini eşle)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Okunmuş"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Eski"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Silinmiş"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Cevaplanmış"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Yönlendirildi"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Kuyruğa eklendi"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Gönderilen"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "İzlenen"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Görmezden gelinen"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Çöp posta"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Yapılacaklar"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Eklentisi Var"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "İletinin Tamamı"
@@ -9763,10 +9689,10 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "Gönderilen \"%1\" iletisini \"Gönderilen\" klasöründen \"Giden Posta\" "
 "klasörüne taşıma işlemi başarısız.\n"
@@ -9776,8 +9702,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9801,8 +9727,8 @@ msgstr "Gönderme işlemi başlıyor..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Kuyruktaki bütün iletileri şifrelenmemiş olarak göndermeyi seçtiniz, devam "
 "etmek istiyor musunuz?"
@@ -9829,8 +9755,9 @@ msgstr "Kuyruktaki bazı iletiler gönderilemedi."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9849,20 +9776,16 @@ msgstr "Gönderim iptal edildi."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Gönderme işlemi başarısız oldu:</p>"
-"<p>%1</p><"
-"<p>Sorun giderilene veya siz iletiyi 'giden' klasöründen silene kadar bu mesaj "
-"'giden' klasöründe kalacaktır.</p>"
-"<p>Kullanılan iletişim protokolü: %2</p>"
-"<p>Diğer iletileri göndermeye devam etmemi istiyor musunuz?</p>"
+"<p>Gönderme işlemi başarısız oldu:</p><p>%1</p><<p>Sorun giderilene veya siz "
+"iletiyi 'giden' klasöründen silene kadar bu mesaj 'giden' klasöründe "
+"kalacaktır.</p><p>Kullanılan iletişim protokolü: %2</p><p>Diğer iletileri "
+"göndermeye devam etmemi istiyor musunuz?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -9880,8 +9803,9 @@ msgstr "Göndermeyi &İptal et"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9925,44 +9849,47 @@ msgstr "Sendmail normal olmayan bir şekilde çıktı"
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Bu SMTP sunucusuna erişim için bir kullanıcı adı ve parola girmeniz gerekiyor."
+"Bu SMTP sunucusuna erişim için bir kullanıcı adı ve parola girmeniz "
+"gerekiyor."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"Bu makine üzerinde %1 programı çalışıyor görünüyor. %2 programının birden fazla "
-"sayıda çalıştırılması, e-posta bilgilerinin kaybına neden olabilir. Bu nedenle "
-"%1 programını aynı anda birden çok kez çalıştırmayınız."
+"Bu makine üzerinde %1 programı çalışıyor görünüyor. %2 programının birden "
+"fazla sayıda çalıştırılması, e-posta bilgilerinin kaybına neden olabilir. Bu "
+"nedenle %1 programını aynı anda birden çok kez çalıştırmayınız."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"Bu makine üzerinde %1 programı çalışıyor görünüyor. %1 ve %2 programının aynı "
-"anda çalıştırılması, e-posta bilgilerinin kaybına neden olabilir. Bu nedenle %2 "
-"programını çalıştırmadan önce %1 programının çalışmadığından emin olun."
+"Bu makine üzerinde %1 programı çalışıyor görünüyor. %1 ve %2 programının "
+"aynı anda çalıştırılması, e-posta bilgilerinin kaybına neden olabilir. Bu "
+"nedenle %2 programını çalıştırmadan önce %1 programının çalışmadığından emin "
+"olun."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 "%1 uygulaması %3 üzerinde çalışıyor. %1 ile %2 uygulamasını aynı anda "
 "çalıştırmak ileti kaybetmenize neden olabilir. %1 uygulamasının %3 üzerinde "
-"çalışmadığından emin olmadan bu bilgisayarda %2 uygulamasını başlatmamalısınız."
+"çalışmadığından emin olmadan bu bilgisayarda %2 uygulamasını "
+"başlatmamalısınız."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -9973,6 +9900,10 @@ msgstr "%1 uygulamasını çalıştır"
 msgid "Exit"
 msgstr "Çık"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Yeni İleti"
@@ -9997,12 +9928,13 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
-"Sistemde TDEWallet bulunamadı. Parolanızı saklamak için TDEWallet kullanmanızı "
-"öneriyoruz.\n"
+"Sistemde TDEWallet bulunamadı. Parolanızı saklamak için TDEWallet "
+"kullanmanızı öneriyoruz.\n"
 "Eğer TDEWallet sistemde varsa, parola güvenli bir şekilde kaydedilecektir.\n"
 "TDEWallet yok ise, parolanız KMail'ın yapılandırma dosyalarında saklanır ve "
 "güvenli olmayabilir. Eğer bir kişi bu yapılandırma dosyalarına erişirse "
@@ -10085,11 +10017,12 @@ msgstr "Sunucu kimlik &denetimi istiyor"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 "Eğer SMTP sunucnuz iletileri kabul etmeden önce kimlik denetimi istiyorsa bu "
-"seçeneği işaretleyin. Bu 'Authenticated SMTP' veya kısaca ASMTP olarak bilinir."
+"seçeneği işaretleyin. Bu 'Authenticated SMTP' veya kısaca ASMTP olarak "
+"bilinir."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10109,15 +10042,14 @@ msgstr "&Sunucuya farklı bir makine ismini gönder"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"KMail kendini ileti sunucusuna tanıtmak için özel bir alan adı kullanıyorsa bu "
-"seçeneği işaretleyin."
-"<p>Kullandığınız sistemin host adı doğru bir şekilde ayarlanmamışsa veya gerçek "
-"host adınızı gizlemek istiyorsanız bu seçenek çok kullanışlıdır."
+"KMail kendini ileti sunucusuna tanıtmak için özel bir alan adı kullanıyorsa "
+"bu seçeneği işaretleyin.<p>Kullandığınız sistemin host adı doğru bir şekilde "
+"ayarlanmamışsa veya gerçek host adınızı gizlemek istiyorsanız bu seçenek çok "
+"kullanışlıdır."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10147,11 +10079,11 @@ msgstr "Sadece yerel dosyalara izin var."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
-"Sunucunun alan adı boş bırakılamaz. Lütfen  SMTP sunucusunun IP adresini ya da "
-"adını girin."
+"Sunucunun alan adı boş bırakılamaz. Lütfen  SMTP sunucusunun IP adresini ya "
+"da adını girin."
 
 #: kmtransport.cpp:788
 msgid "Invalid Hostname or Address"
@@ -10163,10 +10095,10 @@ msgstr "%1 klasörü listelenirken hata oluştu: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10385,30 +10317,25 @@ msgstr "İletiyi Dü&zenle"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Etkin şifreleme eklentisi bulunamadı ve OpenPGP kodu düzgün çalışmadı.</p>"
-"<p>Bunu değiştirmek için iki şey yapmalısınız:</p> "
-"<ul>"
-"<li><em>ya</em>eklentiyi etkinleştirmek için 'Ayarlar->KMail'i ayarla->"
-"Eklentiler' iletişim kutusundan.</li>"
-"<li><em>yada</em> geleneksel OpenPGP ayarlarını aynı iletişim kutusundaki "
-"Tanımlama->Gelişmiş sayfasından tanımlayabilirsiniz.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Etkin şifreleme eklentisi bulunamadı ve OpenPGP kodu düzgün çalışmadı.</"
+"p><p>Bunu değiştirmek için iki şey yapmalısınız:</p> <ul><li><em>ya</"
+"em>eklentiyi etkinleştirmek için 'Ayarlar->KMail'i ayarla->Eklentiler' "
+"iletişim kutusundan.</li><li><em>yada</em> geleneksel OpenPGP ayarlarını "
+"aynı iletişim kutusundaki Tanımlama->Gelişmiş sayfasından "
+"tanımlayabilirsiniz.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10420,8 +10347,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Chiasmus arka ucu \"x-encrypt\" işlevini sağlamıyor. Lütfen hatayı bildirin."
 
@@ -10430,8 +10357,8 @@ msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
-"\"x-encrypt\" işlevi aşağıdaki giriş değişkenlerini beklemiyordu. Lütfen hatayı "
-"bildiriniz."
+"\"x-encrypt\" işlevi aşağıdaki giriş değişkenlerini beklemiyordu. Lütfen "
+"hatayı bildiriniz."
 
 #: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
@@ -10439,14 +10366,14 @@ msgstr "Chiasmus Şifreleme Hatası"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10548,8 +10475,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10583,8 +10510,9 @@ msgstr "Şi&freleme"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 "Bu iletiyi şifrelemek istediniz ve şifreli bir kopyasını da kaydetmek "
 "istediniz. Ancak bu hesap için geçerli ve güvenilir bir şifreleme anahtarı "
@@ -10597,8 +10525,8 @@ msgstr "Ş&ifrelenmemiş Olarak Gönder?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10618,77 +10546,72 @@ msgstr "&Tüm Bölümleri Şifrele"
 msgid "Unencrypted Message Warning"
 msgstr "Şifrelenmemiş İleti Uyarısı"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hata: Arka uç kodlanmış bir veri döndürmedi.</p>"
-"<p>Lütfen bu hatayı raporlayın:"
-"<br>%2</p></qt>"
+"<qt><p>Hata: Arka uç kodlanmış bir veri döndürmedi.</p><p>Lütfen bu hatayı "
+"raporlayın:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Seçilen karakter kümesi ile tüm karakterler gösterilemiyor."
-"<br>"
-"<br>Mesaj yine de gönderilsin mi?</qt>"
+"<qt>Seçilen karakter kümesi ile tüm karakterler gösterilemiyor.<br><br>Mesaj "
+"yine de gönderilsin mi?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Bazı Karakterler Kaybolabilir"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Karakterleri Kaybet"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Kodlamayı Değiştir"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10710,10 +10633,10 @@ msgstr "Posta kutusu biçi&mi:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10723,8 +10646,8 @@ msgstr "&Klasör içeriği:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10763,8 +10686,7 @@ msgstr "İmzalama için farklı sonuçlar"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Şifreleme motoru, hiçbir düzmetin geri döndürmedi."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Durum: "
 
@@ -10793,11 +10715,10 @@ msgstr "%1 eklentisi bulunamadı."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Bu mesaj imzalanmış, ancak imzanın geçerliliği onaylanamadı."
-"<br/>Neden: %1"
+"Bu mesaj imzalanmış, ancak imzanın geçerliliği onaylanamadı.<br/>Neden: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -10831,26 +10752,26 @@ msgstr "\"%1\" şifreleme eklentisi iletileri deşifre edemiyor."
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 "<b>Not:</b> Bu bir HTML iletisidir. Güvenlik nedenleriyle harici kaynaklar "
 "(örn. resimler) gösterilmeyecektir. Bu iletiyi gönderen kişi ya da kuruma "
-"güveniyorsanız <a href=\"kmail:loadExternal\">buraya</a> "
-"tıklayarak harici kaynakların gösterimini etkin hale getirebilirsiniz."
+"güveniyorsanız <a href=\"kmail:loadExternal\">buraya</a> tıklayarak harici "
+"kaynakların gösterimini etkin hale getirebilirsiniz."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Not:</b> Bu bir HTML iletisidir. Güvenlik nedenleriyle sadece ham HTML "
-"gösterilecektir. Gönderene güveniyorsanız HTML biçimli gösterimi <a "
-"href=\"kmail:showHTML\">buraya</a> tıklayarak etkin hale getirebilirsiniz."
+"gösterilecektir. Gönderene güveniyorsanız HTML biçimli gösterimi <a href="
+"\"kmail:showHTML\">buraya</a> tıklayarak etkin hale getirebilirsiniz."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11091,11 +11012,11 @@ msgstr "kayıtlı:"
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
-"%1 de imzalamak için hiç posta adresi yok, dolayısıyla gönderenin %2 adresiyle "
-"karşılaştıramıyoruz."
+"%1 de imzalamak için hiç posta adresi yok, dolayısıyla gönderenin %2 "
+"adresiyle karşılaştıramıyoruz."
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11210,15 +11131,17 @@ msgstr "Kioslave Hata İletisi"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"POP3 sunucunuz (Hesap: %1) UIDL komutunu desteklemiyor: Bu komut KMail sunucu "
-"üzerindeki iletileri görmeden önce güvenli bir yol belirlemek için gereklidir;\n"
-"bu özellik düzgün çalışmadığı zaman iletileri sunucu üzerinde bırakır ve düzgün "
-"çalışmaz."
+"POP3 sunucunuz (Hesap: %1) UIDL komutunu desteklemiyor: Bu komut KMail "
+"sunucu üzerindeki iletileri görmeden önce güvenli bir yol belirlemek için "
+"gereklidir;\n"
+"bu özellik düzgün çalışmadığı zaman iletileri sunucu üzerinde bırakır ve "
+"düzgün çalışmaz."
 
 #: popaccount.cpp:752
 msgid ""
@@ -11234,7 +11157,8 @@ msgstr "%1'den toplam %n ileti alındı. İletişim sonlandırılıyor..."
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "%5@%6 adresinden mesajlar alınıyor: %1/%2 (%3/%4 Kb). Sunucuda %7 KB dosya "
 "kaldı."
@@ -11253,1738 +11177,15 @@ msgstr "Sunucudan Geçersiz Yanıt"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Üzgünüm, sunucunuz TOP komutunu anlamıyor. Bu nedenle en büyük e-postaların "
 "başlıklarını önden alamıyorum. Önce indirmek gerekiyor."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Git"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "Kl&asör"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "İ&leti"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Özel Yanıtla"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Yönlendir"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML Araç Çubuğu"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "İmzalama İşlemleri"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "İletileri &otomatik olarak imzala"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Şifreleme"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-">Bu seçenek etkinleştirildiğinde, ileti/dosya sadece karşı tarafın açık "
-"anahtarıyla değil, aynı zamanda Sizinkiyle de şifrelenecektir. Bu Size ileride "
-"ileti/dosya şifresinin çözebilme olasılığı sunar. Bu genelde iyi bir fikirdir>"
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "İ&mzalanmış/şifrelenmiş metini düzenledikten sonra göster"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-">Bu seçenek etkinleştirildiğinde, imzalanan/şifrelenen metin, gönderilmeden "
-"önceki halini bilmeniz için ayrı bir pencerede görüntülenecektir. Bu şifreleme "
-"düzeneğinizi sınamak için iyi bir fikirdir>"
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Gönderilen ile&tileri şifreli sakla"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Kayıtlı, şifrelenmiş iletileri denetle"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Onaylamak için şifreleme anahtarlarını &herzaman göster"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Bu seçenek etkinleştirildiğinde, uygulama şifreleme için kullanabileceğiniz "
-"anahtarların bir listesini onlardan birini seçmeniz için gösterir. Eğer etkin "
-"değilse; uygulama doğru anahtarı bulamazsa veya kullanılabileceği birden fazla "
-"anahtar varsa iletişim penceresi görüntüleyecektir."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "&Mümkünse iletileri otomatik şifrele"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Taslak olarak kaydederken hiç bir zaman imzalama/şifreleme"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Bu nasıl çalışır?"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Alıcı: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "CC: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Genel"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Yanıtla"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Hepsine Gönder"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Yönlendir"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "&Kısayol:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Şablon tipi:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Klasör Özellikleri"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Bu klasör bir e-posta listesi tutuyor"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Liste adresi:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Normal:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Okunmamış:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Eski İletilerin Silinmesi"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Süresini &doldur:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Okunan mesajla&rın süresini doldur"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Süresini do&ldur:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "&Okunmayan mesajların süresini doldur"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Gün"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Hafta"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Ay"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Gelişmiş"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Gönderici &Kimliği:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Depolama Biçimi:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "&Liste görüntüsü:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Sertifikaları CRL'ler kullanarak doğrula"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Sertifikaları çevirim içi doğrula (OSCP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Çevirim İçi Sertifika Doğrulması"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP cevap URLsi:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP cevaplayıcı imzası:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Sertifikaların servis adreslerini yoksay"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Sertifika politikalarını kontrol etme"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Hiç bir zaman bir CRL'e danışma"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Yayınlanan kayıp sertifikaları getir"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP İstemi"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Hiçbir HTTP istemini gerçekleştirme"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "S/MIME için HTTP kullanımını tamamen kapatır."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP istemleri için bu vekil sunucusunu kullan: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Sistem HTTP vekil sunucusunu kullan:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"S/MIME ile ilgili tüm HTTP istemleri için kullanılacak olan HTTP verkil "
-"sunucuznuzun konumunu buraya girin. makine_adı:bağlantı_noktası şeklinde "
-"yazılır, örneğin vekilsunucum.biryer.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP İstemleri"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "LDAP istemlerini gerçekleştirme"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "S/MIME için LDAP kullanımını tamamen kapatır."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP istemleri için birincil makine:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "Parçacık Ekle"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Ekle"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "&Parçacık:"
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Grup:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "Parçacık Ayarları"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "İpuçları"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "Parçacık metnini &ipucunda göster"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Değişkenler"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Değişkenler için Girdi Yöntemi"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "Bir parçacık içerisindeki tüm değişkenler için ayrı birer pencere"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-"Bir parçacık içerisindeki değişkenlerin herbiri için bir girdi penceresi "
-"gösterilir"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "Bir parçacık içerisindeki tüm değişkenler için bir pencere"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-"Bir parçacık içerisindeki tüm değişkenler için değerleri gireceğiniz bir "
-"pencere gösterilir"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Sınırlayıcı:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Şablon Yapılandırması"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Gönderene Yanıtla"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Hepsine / Listeye Gönder"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "İletiyi Yönlendir"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "İm&zasız ileti gönderilmeye çalışıldığında uyar"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "İmzasız ileti gönderirken uyarılmak için işaretle."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>İmzasız İleti Gönderilmeye Çalışıldığında Uyar</h1>\n"
-"Bu kutucuk seçildiğinde, imzalanmamış ileti veya ileti parçası göndermeyi "
-"denediğinizde sizi uyaracaktır.\n"
-"<p>\n"
-"En yüksek düzeyde uyumluluk sağlamak için bu kutucuğun işaretli olması tavsiye "
-"edilir.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Şi&frelenmemiş ileti gönderilmeye çalışıldığında uyar."
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Şifrelenmemiş ileti gönderilmeye çalışıldığında uyarılmak için işaretle."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Şifrelenmemiş İleti Göndermeye Çalıştığında Uyar</h1>\n"
-"Bu kutu seçildiğinde, iletinin bir bölümünü veya tamamını imzasız olarak "
-"göndermeye kalktığınızda sizi uyarır.\n"
-"<p>\n"
-"Bu seçeneğin işaretli olması güvenlik için tavsiye edilir.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Alıcının &e-posta adresi sertifikada yoksa uyar"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Adres sertifikada yoksa uyar"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1> Alıcı'nın E-Posta Adresi Sertifikada Yoksa Uyar</h1>\n"
-"Bu seçenek işaretlendiğinde, alıcının e-posta adresi sertifikada yoksa uyarı "
-"yayınlanacaktır.\n"
-"<p>\n"
-"Güvenlik için bu seçeneğin işaretli olması tavsiye edilir.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"Sertifika yakın tarihte sona eriyorsa uyar (aşağıdan tarihleri ayarlayın)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "İ&mzalamak için"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Şifreleme için"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " gün boyunca sunucuda bırak"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Burada kaç gün olduğunu seç"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>İmzalama Sertifikası Sona Eriyorsa Uyar</h1>\n"
-"Uyarı yayınlanmadan önce en az ne kadar gün imzalamasertifikasının geçerli "
-"olduğunu seç\n"
-"<p>\n"
-"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Şifreleme Sertifika Sona Eriyorsa Uyar</h1>\n"
-"Uyarı yayınlamadan önce sertifikanın en az kaç gün daha geçerli olduğunu seçin\n"
-"<p>\n"
-"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1> Zincirdeki Sertifika Sona Eriyorsa Uyar</h1>\n"
-"Sertifika zincirindeki sertifikaların uyarı yayınlanmadan önce ne kadar geçerli "
-"olduğunu seç.\n"
-"<p>\n"
-"Tavsiye edilen SPHINX değeri 14 gündür.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1> CA Sertifikası Sona Eriyorsa Uyar</h1>\n"
-"Uyarı yayınlanmadan önce en az ne kadar gün CA sertifikasının geçerli olduğunu "
-"seç\n"
-"<p>\n"
-"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1> Root Sertifikası Sona Eriyorsa Uyar</h1>\n"
-"Uyarı yayınlanmadan önce en az ne kadar gün root sertifikasının geçerli "
-"olduğunu seç\n"
-"<p>\n"
-"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Kök sertifikalar için:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Orta seviye CA sertivikaları için:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Son-kullanıcı sertifikaları/anahtarları için:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Tüm \"Bir Daha Sorma\" Uyarılarını Yeniden Etkinleştir"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Şalon içeriği"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Şablon kısayolu"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Şablon tipi"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Kuyruktaki e-postayı, e-posta kontrolünde gönder"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "Salt okunur dizinlerde yerel işaretlemelere izin ver"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Klasör seçim ekranında en çok seçilen klasör."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Panel çubuğu simgesini göstermek için politika"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Yeni E-Posta uyarısı"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Bir düzenleyici &belirtin:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "&Harici düzenleyici kullan"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "G&rup çalışması özelliğini etkinleştir"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Posta gövdesinde grup çalışması daveti gönder"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Exchange ile uyumlu davet isimlendirmesi"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Bu IMAP ana kaynak dizinlerini seçer.</p>"
-"<p>Öntanımlı olarak; Kolab sunucusu IMAP gelen kutusunu ana dizin olarak "
-"seçer.</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Bu IMAP kaynak klasörlerini tutan hesabın kimliğidir.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Bu değer KMail Karşılaması'nın gösterilip gösterilmeyeceğine karar vermek için "
-"kullanılır."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Her istemci için izin verilen en fazla bağlantı sayısı"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Hızlı arama satırını göster"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "Kullanılmıyorsa yerel gelen kutusunu sakla"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "Öntanımlı Olarak Alıntı Yaparak Yönlendir."
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "&Cevaplarken ya da iletirken asıl karakter kümesini koru (mümkünse)."
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "İmzayı oto&matik olarak ekle"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Bu kimliği, daha sonraki düzenleme pencerelerinde de kullanması için hatırla.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Gönderilen öğeler için bu klasörü, daha sonraki düzenleme pencerelerinde de "
-"kullanılması için hatırla."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Bu iletişim yöntemini, daha sonraki düzenleme pencerelerinde de kullanılması "
-"için hatırla."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Bu kimliği, daha sonraki düzenleme pencerelerinde de kullanması için hatırla.\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "&Kelimeleri bu sütunda kaydır:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "R&oot sertifikası bu gün sayısından önce sona eriyorsa uyar"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "İleti okundu uyarılarını oto&matik olarak gönder"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Otomatik tamamlama için güncel adresleri kullan"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Otomatik kaydetme aralığı:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "İmzaları alıntılanan metnin üzerine ekle"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Ta&nınan öneki \"Ynt:\" ile değiştir"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Tanınan önekleri \"&İlt: \"ile değiştir:"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "&Akıllı alıntılamayı kullan"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "İmzanın zamanı doldu."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Adres seçim tipi"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Alıcının düzenleyici tipi"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Alıcı düzenleme satırlarının en çok sayısı."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "&Cevaplarken ya da iletirken asıl karakter kümesini koru (mümkünse)."
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"İleti metni içerisinde geçen :-) benzeri gülen yüzler yerine gülen yüz "
-"simgeleri (küçük resimler) kullanmak istiyorsanız, bunu aktif hale getirin."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Otomatik genişletme düzeyi:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Alıntılanan metnin yazıtipini küçült"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-"Alıntılanan metni daha küçük yazıtipi ile göstermek için bu seçeneği "
-"işaretleyin."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Gönderilen ile&tileri şifreli sakla"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Süslü başlıklarda kullanıcı istemcisini göster"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "Varolan iletilerin eklentilerinin silinmsine izin ver."
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "Varolan iletilerin eklentilerinin düzenlenmesine izin ver."
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "İfadeler şablonlara dönüştürüldü"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Eski ifadeler şablonlara dönüştürüldü"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Yeni iletiler için şablonlar"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Yanıtlamak için ileti şablonu"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Tümünü yanıtlamak için ileti şablonu"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Yönlendirmek için ileti şablonu"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Alıntı karakterleri"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%2 %3 alanın %1 kadarı kullanılıyor"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13090,6 +11291,11 @@ msgstr "CC olarak Ekle"
 msgid "Add as BCC"
 msgstr "BCC olarak Ekle"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "İ&ptal"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13105,10 +11311,10 @@ msgstr "Seçili Alıcılar"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13125,11 +11331,11 @@ msgstr "Adres-Seçim İletişim Kutusunu Kullanın"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Bu düğme tüm kullanılabilir adresler içerisinden alıcıları seçebileceğiniz bir "
-"iletişim kutusu açar."
+"Bu düğme tüm kullanılabilir adresler içerisinden alıcıları seçebileceğiniz "
+"bir iletişim kutusu açar."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -13231,10 +11437,19 @@ msgstr "büyük ya da eşit"
 msgid " bytes"
 msgstr " bayt"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " gün boyunca sunucuda bırak"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 "%1 klasörü içerisindeki iletilerde arama işleminizi çalıştırabilmek için "
 "iletilerin sunucudan indirilmesi gerekir. Bu biraz zaman alabilir. Arama "
@@ -13374,16 +11589,12 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"'%1' hesabı için veri toplanıyor...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "'%1' hesabı için veri toplanıyor...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -13402,10 +11613,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Betiğin içeriği: '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "Betiğin içeriği: '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13428,20 +11637,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Sieve özellikleri:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Sieve özellikleri:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Kullanılabilir özel bir özellik yok)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Kullanılabilir Sieve betikleri:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Kullanılabilir Sieve betikleri:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -13521,8 +11726,8 @@ msgstr "Bu alanı sabit bir imza tanımlamak için kullanın."
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 "İmzanızı içeren bir metin dosyası belirtmek için bu isteği kullanın. Bu her "
 "yeni ileti oluşturduğunuzda ya da yeni bir imza eklediğinizde yeniden okunur."
@@ -13541,23 +11746,28 @@ msgstr "Belirtilen dosyayı bir metin düzenleyicide açar."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Buradan herhangi bir komut ekleyebilirsiniz; komutun PATH değeriniz "
-"içerisindeki klasörlerde olup olmadığına göre komutun tam yolunu veya yalnızca "
-"adını yazabilirsiniz. Her yeni gönderilen ileti için, KMail bu komut "
-"çalıştıracak ve komutun çıktısını e-posta imzanız olarak kullanacaktır. Bu "
-"yöntemi kullananlar genellikle \"fortune\" veya \"ksig -random\" programlarını "
-"tercih ediyorlar."
+"içerisindeki klasörlerde olup olmadığına göre komutun tam yolunu veya "
+"yalnızca adını yazabilirsiniz. Her yeni gönderilen ileti için, KMail bu "
+"komut çalıştıracak ve komutun çıktısını e-posta imzanız olarak "
+"kullanacaktır. Bu yöntemi kullananlar genellikle \"fortune\" veya \"ksig -"
+"random\" programlarını tercih ediyorlar."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "K&omut belirt:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Yol"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Yeni girdi:"
@@ -13591,6 +11801,11 @@ msgstr "Grup Ekle"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "Bu grubu ve tüm parçacıklarını gerçekten silmek istiyor musunuz?"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Uygula:"
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "Parçacığı Düzenle"
@@ -13603,6 +11818,10 @@ msgstr "Grubu Düzenle"
 msgid "Edit &group..."
 msgstr "&Grubu Düzenle..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "Dü&zenle..."
@@ -13639,9 +11858,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13674,6 +11893,16 @@ msgstr "Etkinleştirme"
 msgid "Cannot insert content from file %1: %2"
 msgstr "%1 dosyasından içerik eklenemedi: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Alıcı: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13703,36 +11932,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13988,6 +12213,10 @@ msgstr "Geçerli İletinin Gövdesini borula ve Sonucu Olduğu gibi Ekle"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "Geçerli İletinin Gövdesini borula ve Sonuç ile Değiştir"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "İmleç Konumunu Ayarla"
@@ -14020,106 +12249,6 @@ msgstr "Hata Ayıklamayı Aç"
 msgid "Turn Debug Off"
 msgstr "Hata Ayıklamayı Kapat"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...önceki ve sonraki iletilere geçmek için sol ve sağ\n"
-"ok tuşlarını kullanabileceğinizi?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...gönderen, alıcı, konu ve e-posta listesi ögelerine göre,\n"
-"<em>İleti-&gt;Filtre Oluştur</em> yolunu izleyerek kolayca filtreler "
-"oluşturabileceğinizi biliyor muydunuz?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...E-posta listeleri ile dizinleri ilişkilendirebileceğinizi biliyor "
-"muydunuz?\n"
-"<em>Dizin-&gt;E-posta Listesi Yönetimi</em> yolunu izleyip şu şekilde "
-"kullanabilirsiniz;\n"
-"<em>İleti-&gt;Yeni&nbsp;İleti&nbsp;-&nbsp;E-posta&nbsp;Listesi...</em>\n"
-"Bu yolu takip ettiğinizde düzenleyici, e-posta listesinin adresini alarak "
-"açılır.\n"
-"Ayrıca dizin üzerindeyken farenin orta düğmesine de basabilirsiniz.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...her dizin için özel bir simge atayabileceğinizi biliyor muydunuz?\n"
-"Bkz: <em>Dizin-&gt;Özellikler</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...Kmail'ın ileti türünü (düz metin/HTML/OpenPGP) gösterebileceğini biliyor "
-"musunuz?</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...Arama kuralındaki ilk düzenleme alanında herhangi bir başlığı girerek "
-"filtreleyebileceğinizi biliyor musunuz?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>..."
-"<pre>&quot;Contnet-type&quot; içerir &quot;text/html&quot;</pre>\n"
-"kuralı ile yalnızca HTML içeren mesajları filtreyelebileceğinizi?\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...cevap verirken yalnızca mesajın seçilen bölümünün alıntı olarak "
-"kullanılacağını?</p>\n"
-"<p>Eğer hiçbir bölüm seçili değilse, tüm mesaj alıntılanır.</p>\n"
-"<p>Bu özellik <em>Görünüm-&gt;Eklentiler-&gt;Dosyanın İçinde özelliği \n"
-"seçiliyken, eklentilerin metinleri için de kullanılabilir.</p>\n"
-"<p>Bu özellik <em>İleti-&gt;Alıntısız Yanıtla</em> dışında\n"
-"tüm yanıtlama komutları için geçerlidir.</p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Geri alınacak bir şey yok."
@@ -14183,6 +12312,15 @@ msgstr "Eklenti: #%1 (isimsiz)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "%1 isminde bir dosya mevcut. Üzerine yazılsın mı?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Dosyanın Üzerine Yazılsın mı?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14299,13 +12437,14 @@ msgstr "Her ileti ile &resim gönder"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"Eğer KMail'in bu kimlik için iletilerinize X-Face olarak adlandırılan e-posta "
-"başlığını eklemesini istiyorsanız bu kutuyu işaretleyin. X-Face bazı e-posta "
-"istemcilerinin desteklediği küçük (48x48 piksel) siyah-beyaz bir resimdir."
+"Eğer KMail'in bu kimlik için iletilerinize X-Face olarak adlandırılan e-"
+"posta başlığını eklemesini istiyorsanız bu kutuyu işaretleyin. X-Face bazı e-"
+"posta istemcilerinin desteklediği küçük (48x48 piksel) siyah-beyaz bir "
+"resimdir."
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -14333,13 +12472,13 @@ msgstr "Dosya Seç..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 "Bir görüntü dosyasından resim oluşturmak için bunu kullanın. Görüntü yüksek "
-"kontrasta ve dörtgene yakın şekle sahip olmalıdır. Açık renkli bir arkaplan iyi "
-"sonuç olmanıza yardımcı olur."
+"kontrasta ve dörtgene yakın şekle sahip olmalıdır. Açık renkli bir arkaplan "
+"iyi sonuç olmanıza yardımcı olur."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14347,21 +12486,21 @@ msgstr "Adres Defterinden Tanımla"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Adres defteri girişinizdeki resmin küçültülmüş bir halini kullanabilirsiniz."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail her mesaj ile (48x48 piksel), düşük-kaliteli, tek renkli (monochrome) "
-"resimleri her ileti ile birlikte gönderebilir. Örneğin, bu sizin küçük bir "
-"resminiz olabilir. Bu (eğer destekleniyorsa) kullanıcının e-posta istemcisinde "
-"gösterilecektir."
+"<qt>KMail her mesaj ile (48x48 piksel), düşük-kaliteli, tek renkli "
+"(monochrome) resimleri her ileti ile birlikte gönderebilir. Örneğin, bu "
+"sizin küçük bir resminiz olabilir. Bu (eğer destekleniyorsa) kullanıcının e-"
+"posta istemcisinde gösterilecektir."
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14369,11 +12508,11 @@ msgstr "Bu alanı keyfi X-Face metini için kullanın."
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Örnekler <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a> adresinden bulunabilir."
+"Örnekler <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/"
+"~ace/X-Faces/</a> adresinden bulunabilir."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14388,128 +12527,1633 @@ msgstr "Resim Yok"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Kendi bilgilerinizin adres defterinde bulunmasına gerek yok."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Toplam: %2<br>Okunmamış: %3<br>Boyut: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "İmzalama İşlemleri"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Kota: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "İletileri &otomatik olarak imzala"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "İletinin konusunu belirleyin"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "'adres'e CC: gönder"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Şifreleme"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "'adres'e BCC: gönder."
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "İletiye 'başlık' ekle"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+">Bu seçenek etkinleştirildiğinde, ileti/dosya sadece karşı tarafın açık "
+"anahtarıyla değil, aynı zamanda Sizinkiyle de şifrelenecektir. Bu Size "
+"ileride ileti/dosya şifresinin çözebilme olasılığı sunar. Bu genelde iyi bir "
+"fikirdir>"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "'Dosya'dan ileti gövdesini oku."
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "İ&mzalanmış/şifrelenmiş metini düzenledikten sonra göster"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "İletinin gövdesini belirleyin"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+">Bu seçenek etkinleştirildiğinde, imzalanan/şifrelenen metin, gönderilmeden "
+"önceki halini bilmeniz için ayrı bir pencerede görüntülenecektir. Bu "
+"şifreleme düzeneğinizi sınamak için iyi bir fikirdir>"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Postaya bir eklenti yerleştir. Bu işlemi tekrar edebilirsiniz"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Gönderilen ile&tileri şifreli sakla"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Sadece yeni e-postaları denetle"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Kayıtlı, şifrelenmiş iletileri denetle"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Sadece düzenleyici penceresini aç"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Verilen ileti dosyasını göster"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Onaylamak için şifreleme anahtarlarını &herzaman göster"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "İletiyi 'adres'e gönder. 'URL'nin işaret ettiği dosyayı da ekle"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"Bu seçenek etkinleştirildiğinde, uygulama şifreleme için kullanabileceğiniz "
+"anahtarların bir listesini onlardan birini seçmeniz için gösterir. Eğer "
+"etkin değilse; uygulama doğru anahtarı bulamazsa veya kullanılabileceği "
+"birden fazla anahtar varsa iletişim penceresi görüntüleyecektir."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Okunmuş"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "&Mümkünse iletileri otomatik şifrele"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Eski"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Silinmiş"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Taslak olarak kaydederken hiç bir zaman imzalama/şifreleme"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Cevaplanmış"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Bu nasıl çalışır?"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Yönlendirildi"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Genel"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Kuyruğa eklendi"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Yanıtla"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Gönderilen"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Hepsine Gönder"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "İzlenen"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Yönlendir"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Görmezden gelinen"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "&Kısayol:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Çöp posta"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Şablon tipi:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Ham"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Şalon içeriği"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Yapılacaklar"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Şablon kısayolu"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Eklentisi Var"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Şablon tipi"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%2 %3 alanın %1 kadarı kullanılıyor"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Klasör Özellikleri"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Yol"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Bu klasör bir e-posta listesi tutuyor"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Liste adresi:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Normal:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Okunmamış:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Eski İletilerin Silinmesi"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Süresini &doldur:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Okunan mesajla&rın süresini doldur"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Süresini do&ldur:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "&Okunmayan mesajların süresini doldur"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Gün"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Hafta"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Ay"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Gönderici &Kimliği:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Depolama Biçimi:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "&Liste görüntüsü:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Kuyruktaki e-postayı, e-posta kontrolünde gönder"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "%1 isminde bir dosya mevcut. Üzerine yazılsın mı?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Dosyanın Üzerine Yazılsın mı?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "Salt okunur dizinlerde yerel işaretlemelere izin ver"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Klasör seçim ekranında en çok seçilen klasör."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Panel çubuğu simgesini göstermek için politika"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Yeni E-Posta uyarısı"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Bir düzenleyici &belirtin:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "&Harici düzenleyici kullan"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "G&rup çalışması özelliğini etkinleştir"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Posta gövdesinde grup çalışması daveti gönder"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Exchange ile uyumlu davet isimlendirmesi"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Bu IMAP ana kaynak dizinlerini seçer.</p><p>Öntanımlı olarak; Kolab "
+"sunucusu IMAP gelen kutusunu ana dizin olarak seçer.</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Bu IMAP kaynak klasörlerini tutan hesabın kimliğidir.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Bu değer KMail Karşılaması'nın gösterilip gösterilmeyeceğine karar vermek "
+"için kullanılır."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Her istemci için izin verilen en fazla bağlantı sayısı"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Hızlı arama satırını göster"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "Kullanılmıyorsa yerel gelen kutusunu sakla"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "Öntanımlı Olarak Alıntı Yaparak Yönlendir."
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "&Cevaplarken ya da iletirken asıl karakter kümesini koru (mümkünse)."
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "İmzayı oto&matik olarak ekle"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Bu kimliği, daha sonraki düzenleme pencerelerinde de kullanması için "
+"hatırla.\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Gönderilen öğeler için bu klasörü, daha sonraki düzenleme pencerelerinde de "
+"kullanılması için hatırla."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Bu iletişim yöntemini, daha sonraki düzenleme pencerelerinde de kullanılması "
+"için hatırla."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Bu kimliği, daha sonraki düzenleme pencerelerinde de kullanması için "
+"hatırla.\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "&Kelimeleri bu sütunda kaydır:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "R&oot sertifikası bu gün sayısından önce sona eriyorsa uyar"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "İleti okundu uyarılarını oto&matik olarak gönder"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Otomatik tamamlama için güncel adresleri kullan"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Otomatik kaydetme aralığı:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "İmzaları alıntılanan metnin üzerine ekle"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Ta&nınan öneki \"Ynt:\" ile değiştir"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Tanınan önekleri \"&İlt: \"ile değiştir:"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "&Akıllı alıntılamayı kullan"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "İmzanın zamanı doldu."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Adres seçim tipi"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Alıcının düzenleyici tipi"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Alıcı düzenleme satırlarının en çok sayısı."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "&Cevaplarken ya da iletirken asıl karakter kümesini koru (mümkünse)."
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"İleti metni içerisinde geçen :-) benzeri gülen yüzler yerine gülen yüz "
+"simgeleri (küçük resimler) kullanmak istiyorsanız, bunu aktif hale getirin."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Otomatik genişletme düzeyi:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Alıntılanan metnin yazıtipini küçült"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+"Alıntılanan metni daha küçük yazıtipi ile göstermek için bu seçeneği "
+"işaretleyin."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Gönderilen ile&tileri şifreli sakla"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Süslü başlıklarda kullanıcı istemcisini göster"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "Varolan iletilerin eklentilerinin silinmsine izin ver."
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "Varolan iletilerin eklentilerinin düzenlenmesine izin ver."
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "İfadeler şablonlara dönüştürüldü"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Eski ifadeler şablonlara dönüştürüldü"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Yeni iletiler için şablonlar"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Yanıtlamak için ileti şablonu"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Tümünü yanıtlamak için ileti şablonu"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Yönlendirmek için ileti şablonu"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Alıntı karakterleri"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "D&osya Düzenle"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Dü&zenle..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Git"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "Kl&asör"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "İ&leti"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Özel Yanıtla"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Yönlendir"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "İpuçları"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Parçacık Ayarları"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML Araç Çubuğu"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Genel Seçenekler"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML Araç Çubuğu"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Sertifikaları CRL'ler kullanarak doğrula"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Sertifikaları çevirim içi doğrula (OSCP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Çevirim İçi Sertifika Doğrulması"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP cevap URLsi:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP cevaplayıcı imzası:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Sertifikaların servis adreslerini yoksay"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Sertifika politikalarını kontrol etme"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Hiç bir zaman bir CRL'e danışma"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Yayınlanan kayıp sertifikaları getir"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP İstemi"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Hiçbir HTTP istemini gerçekleştirme"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "S/MIME için HTTP kullanımını tamamen kapatır."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP istemleri için bu vekil sunucusunu kullan: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Sistem HTTP vekil sunucusunu kullan:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"S/MIME ile ilgili tüm HTTP istemleri için kullanılacak olan HTTP verkil "
+"sunucuznuzun konumunu buraya girin. makine_adı:bağlantı_noktası şeklinde "
+"yazılır, örneğin vekilsunucum.biryer.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP İstemleri"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "LDAP istemlerini gerçekleştirme"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "S/MIME için LDAP kullanımını tamamen kapatır."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP istemleri için birincil makine:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "Parçacık Ekle"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Ekle"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "&Parçacık:"
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Grup:"
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "Parçacık Ayarları"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "İpuçları"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "Parçacık metnini &ipucunda göster"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Değişkenler"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Değişkenler için Girdi Yöntemi"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "Bir parçacık içerisindeki tüm değişkenler için ayrı birer pencere"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+"Bir parçacık içerisindeki değişkenlerin herbiri için bir girdi penceresi "
+"gösterilir"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "Bir parçacık içerisindeki tüm değişkenler için bir pencere"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+"Bir parçacık içerisindeki tüm değişkenler için değerleri gireceğiniz bir "
+"pencere gösterilir"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Sınırlayıcı:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Şablon Yapılandırması"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Gönderene Yanıtla"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Hepsine / Listeye Gönder"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "İletiyi Yönlendir"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "İm&zasız ileti gönderilmeye çalışıldığında uyar"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "İmzasız ileti gönderirken uyarılmak için işaretle."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>İmzasız İleti Gönderilmeye Çalışıldığında Uyar</h1>\n"
+"Bu kutucuk seçildiğinde, imzalanmamış ileti veya ileti parçası göndermeyi "
+"denediğinizde sizi uyaracaktır.\n"
+"<p>\n"
+"En yüksek düzeyde uyumluluk sağlamak için bu kutucuğun işaretli olması "
+"tavsiye edilir.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Şi&frelenmemiş ileti gönderilmeye çalışıldığında uyar."
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Şifrelenmemiş ileti gönderilmeye çalışıldığında uyarılmak için işaretle."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Şifrelenmemiş İleti Göndermeye Çalıştığında Uyar</h1>\n"
+"Bu kutu seçildiğinde, iletinin bir bölümünü veya tamamını imzasız olarak "
+"göndermeye kalktığınızda sizi uyarır.\n"
+"<p>\n"
+"Bu seçeneğin işaretli olması güvenlik için tavsiye edilir.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Alıcının &e-posta adresi sertifikada yoksa uyar"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Adres sertifikada yoksa uyar"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1> Alıcı'nın E-Posta Adresi Sertifikada Yoksa Uyar</h1>\n"
+"Bu seçenek işaretlendiğinde, alıcının e-posta adresi sertifikada yoksa uyarı "
+"yayınlanacaktır.\n"
+"<p>\n"
+"Güvenlik için bu seçeneğin işaretli olması tavsiye edilir.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"Sertifika yakın tarihte sona eriyorsa uyar (aşağıdan tarihleri ayarlayın)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "İ&mzalamak için"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Şifreleme için"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Burada kaç gün olduğunu seç"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>İmzalama Sertifikası Sona Eriyorsa Uyar</h1>\n"
+"Uyarı yayınlanmadan önce en az ne kadar gün imzalamasertifikasının geçerli "
+"olduğunu seç\n"
+"<p>\n"
+"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Şifreleme Sertifika Sona Eriyorsa Uyar</h1>\n"
+"Uyarı yayınlamadan önce sertifikanın en az kaç gün daha geçerli olduğunu "
+"seçin\n"
+"<p>\n"
+"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1> Zincirdeki Sertifika Sona Eriyorsa Uyar</h1>\n"
+"Sertifika zincirindeki sertifikaların uyarı yayınlanmadan önce ne kadar "
+"geçerli olduğunu seç.\n"
+"<p>\n"
+"Tavsiye edilen SPHINX değeri 14 gündür.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1> CA Sertifikası Sona Eriyorsa Uyar</h1>\n"
+"Uyarı yayınlanmadan önce en az ne kadar gün CA sertifikasının geçerli "
+"olduğunu seç\n"
+"<p>\n"
+"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1> Root Sertifikası Sona Eriyorsa Uyar</h1>\n"
+"Uyarı yayınlanmadan önce en az ne kadar gün root sertifikasının geçerli "
+"olduğunu seç\n"
+"<p>\n"
+"Tavsiye edilen SPHINX ayarı 14 gündür.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Kök sertifikalar için:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Orta seviye CA sertivikaları için:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Son-kullanıcı sertifikaları/anahtarları için:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Tüm \"Bir Daha Sorma\" Uyarılarını Yeniden Etkinleştir"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...önceki ve sonraki iletilere geçmek için sol ve sağ\n"
+"ok tuşlarını kullanabileceğinizi?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...gönderen, alıcı, konu ve e-posta listesi ögelerine göre,\n"
+"<em>İleti-&gt;Filtre Oluştur</em> yolunu izleyerek kolayca filtreler "
+"oluşturabileceğinizi biliyor muydunuz?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...E-posta listeleri ile dizinleri ilişkilendirebileceğinizi biliyor "
+"muydunuz?\n"
+"<em>Dizin-&gt;E-posta Listesi Yönetimi</em> yolunu izleyip şu şekilde "
+"kullanabilirsiniz;\n"
+"<em>İleti-&gt;Yeni&nbsp;İleti&nbsp;-&nbsp;E-posta&nbsp;Listesi...</em>\n"
+"Bu yolu takip ettiğinizde düzenleyici, e-posta listesinin adresini alarak "
+"açılır.\n"
+"Ayrıca dizin üzerindeyken farenin orta düğmesine de basabilirsiniz.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...her dizin için özel bir simge atayabileceğinizi biliyor muydunuz?\n"
+"Bkz: <em>Dizin-&gt;Özellikler</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...Kmail'ın ileti türünü (düz metin/HTML/OpenPGP) gösterebileceğini "
+"biliyor musunuz?</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...Arama kuralındaki ilk düzenleme alanında herhangi bir başlığı girerek "
+"filtreleyebileceğinizi biliyor musunuz?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...<pre>&quot;Contnet-type&quot; içerir &quot;text/html&quot;</pre>\n"
+"kuralı ile yalnızca HTML içeren mesajları filtreyelebileceğinizi?\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...cevap verirken yalnızca mesajın seçilen bölümünün alıntı olarak "
+"kullanılacağını?</p>\n"
+"<p>Eğer hiçbir bölüm seçili değilse, tüm mesaj alıntılanır.</p>\n"
+"<p>Bu özellik <em>Görünüm-&gt;Eklentiler-&gt;Dosyanın İçinde özelliği \n"
+"seçiliyken, eklentilerin metinleri için de kullanılabilir.</p>\n"
+"<p>Bu özellik <em>İleti-&gt;Alıntısız Yanıtla</em> dışında\n"
+"tüm yanıtlama komutları için geçerlidir.</p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "Hızlı dizin aAram alanını gGöster"
@@ -14600,21 +14244,26 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgstr "Bütün i&leti bölümlerini şifrele"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "İletilerin bütün bölümlerinin öntanımlı şekilde şifrelenmesini denetle"
+#~ msgstr ""
+#~ "İletilerin bütün bölümlerinin öntanımlı şekilde şifrelenmesini denetle"
 
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encrypt All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are encrypted by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>İletilerin Bütün Parçalarını Öntanımlı Şekilde Şifrele</h1>\n"
-#~ "Bu seçenek seçildiğinde, iletilerin bütün bölümleri (örn. gövde veya eklentiler) öntanımlı olarak şifreleyecektir.\n"
-#~ "<p>Bu öntanımlı bir değerdir, özel iletiler için bu kuralı çiğneyebilirsiniz.\n"
+#~ "Bu seçenek seçildiğinde, iletilerin bütün bölümleri (örn. gövde veya "
+#~ "eklentiler) öntanımlı olarak şifreleyecektir.\n"
+#~ "<p>Bu öntanımlı bir değerdir, özel iletiler için bu kuralı "
+#~ "çiğneyebilirsiniz.\n"
 #~ "</qt>"
 
 #~ msgid "Ask &before encrypting each part"
@@ -14626,12 +14275,15 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Encrypting Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be encrypted.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be encrypted.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Her Parçayı Şifrelemeden Önce Sor</h1>\n"
-#~ "Bu seçenek seçildiğinde, iletinin her bir parçasını (örn, gövde ve eklentiler) şifrelemeden önce soracaktır.\n"
+#~ "Bu seçenek seçildiğinde, iletinin her bir parçasını (örn, gövde ve "
+#~ "eklentiler) şifrelemeden önce soracaktır.\n"
 #~ "</qt>"
 
 #~ msgid "&Do not encrypt messages"
@@ -14645,7 +14297,8 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ "<h1>Do Not Encrypt Messages</h1>\n"
 #~ "If this option is selected, messages are not encrypted by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14665,11 +14318,18 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Encryption Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The encryption algorithm describes how the computer applies your recipient's key to your message so that only the intended receiver can read the message.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The encryption algorithm describes how the computer applies "
+#~ "your recipient's key to your message so that only the intended receiver "
+#~ "can read the message.\n"
 #~ "<p>\n"
-#~ "The selection of a certain encryption algorithm determines how easy or how difficult it is to intercept and read a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain encryption algorithm determines how easy or "
+#~ "how difficult it is to intercept and read a message. However, all "
+#~ "algorithms provided in the SPHINX environment are considered to be very "
+#~ "safe. Generally, the default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14685,9 +14345,12 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Certificate Check Can End With Locally Saved Certificate</h1>\n"
-#~ "If this option is checked, the check of the certificate chain can end with a locally saved certificate.\n"
+#~ "If this option is checked, the check of the certificate chain can end "
+#~ "with a locally saved certificate.\n"
 #~ "<p>\n"
-#~ "Locally saved certificates are your own certificates as well as the certificates of communication partners and certification authorities (CAs).\n"
+#~ "Locally saved certificates are your own certificates as well as the "
+#~ "certificates of communication partners and certification authorities "
+#~ "(CAs).\n"
 #~ "</h1>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14705,26 +14368,32 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always Check Certificate Path To Root Certificate</h1>\n"
-#~ "If this option is turned on, the certificate path belonging to the receiver's certificate will always be checked all the way to the root certificate.\n"
+#~ "If this option is turned on, the certificate path belonging to the "
+#~ "receiver's certificate will always be checked all the way to the root "
+#~ "certificate.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1> Her zaman Sertifika Yol Kime Root Sertifika</h1> açık yol için s her zaman hepsi için kök\n"
+#~ "<h1> Her zaman Sertifika Yol Kime Root Sertifika</h1> açık yol için s her "
+#~ "zaman hepsi için kök\n"
 #~ "</qt>"
 
 #~ msgid "Check certificate &path"
 #~ msgstr "Sertifika Yolunu De&netle"
 
 #~ msgid "Check here to have the whole certificate path checked"
-#~ msgstr "Sahip olduğunuz bütün sertifikalarınızı buradan işaretleyebilirsiniz"
+#~ msgstr ""
+#~ "Sahip olduğunuz bütün sertifikalarınızı buradan işaretleyebilirsiniz"
 
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Check Certificate Path</h1>\n"
-#~ "If this option is turned on, the whole path of the receiver's certificate up to the root will be checked.\n"
+#~ "If this option is turned on, the whole path of the receiver's certificate "
+#~ "up to the root will be checked.\n"
 #~ "<p>\n"
-#~ "Note that it is not possible to turn off checking the receiver's certificate itself.\n"
+#~ "Note that it is not possible to turn off checking the receiver's "
+#~ "certificate itself.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14742,13 +14411,20 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Use Certificate Revocation Lists (CRLs)</h1>\n"
-#~ "A certificate revocation list contains certificates that have been withdrawn and should not be used for encryption purposes any longer. A user may wish to have his or her certificate revoked because he or she suspects that the certificate's integrity has been compromised (e.g. somebody has guessed the PIN).\n"
+#~ "A certificate revocation list contains certificates that have been "
+#~ "withdrawn and should not be used for encryption purposes any longer. A "
+#~ "user may wish to have his or her certificate revoked because he or she "
+#~ "suspects that the certificate's integrity has been compromised (e.g. "
+#~ "somebody has guessed the PIN).\n"
 #~ "<p>\n"
-#~ "It is recommended to use CRLs for maximum security. In the configuration dialog for certificate and CRL management, you can select where to retrieve the CRLs from.\n"
+#~ "It is recommended to use CRLs for maximum security. In the configuration "
+#~ "dialog for certificate and CRL management, you can select where to "
+#~ "retrieve the CRLs from.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
-#~ "<h1> Kullan Sertifika Listeler</h1> içerir ve için herhangi biri A kullanıcı için veya veya s e g\n"
+#~ "<h1> Kullan Sertifika Listeler</h1> içerir ve için herhangi biri A "
+#~ "kullanıcı için veya veya s e g\n"
 #~ "<p> için için Yukarı için ve yönetim için\n"
 #~ "</qt>"
 
@@ -14761,12 +14437,14 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "If this box is checked, you will be warned if one of the CRLs you are using is about to expire in the near future.\n"
+#~ "If this box is checked, you will be warned if one of the CRLs you are "
+#~ "using is about to expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>CRL Yakında Sona Eriyorsa Uyar</h1>\n"
-#~ "Bu kutu seçildiğinde, kullandığınız CRL'ler yakında sona eriyorsa uyarılırsınız\n"
+#~ "Bu kutu seçildiğinde, kullandığınız CRL'ler yakında sona eriyorsa "
+#~ "uyarılırsınız\n"
 #~ "</qt>"
 
 #~ msgid "Number of days before warning"
@@ -14775,14 +14453,16 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If CRL Expires In The Near Future</h1>\n"
-#~ "In this field you can specify how soon before a CRL expires you are warned about this expiry.\n"
+#~ "In this field you can specify how soon before a CRL expires you are "
+#~ "warned about this expiry.\n"
 #~ "<p>\n"
 #~ "The recommended setting for the SPHINX environment is 7 days.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>CRL Yakında Sona Eriyorsa Uyar</h1>\n"
-#~ "Bu alanda CRL sona ermeden ne kadar önce uyarılmak istediğinizi belirtmelisiniz.\n"
+#~ "Bu alanda CRL sona ermeden ne kadar önce uyarılmak istediğinizi "
+#~ "belirtmelisiniz.\n"
 #~ "<p>\n"
 #~ "Tavsiye edilen SPHINX değeri 7 gündür.\n"
 #~ "</qt>"
@@ -14791,20 +14471,25 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgstr "Her zaman için kendine şifrele"
 
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Şifrelenen iletilerin sizin şifreleme anahtarınızla şifrelenip şifrelenmediğini denetle."
+#~ msgstr ""
+#~ "Şifrelenen iletilerin sizin şifreleme anahtarınızla şifrelenip "
+#~ "şifrelenmediğini denetle."
 
 #, fuzzy
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Şifrelenmemiş İleti Göndermeye Çalıştığında Uyar</h1>\n"
-#~ "Bu kutu seçildiğinde, iletinin bir bölümünü veya tamamını imzasız olarak göndermeye kalktığınızda sizi uyarır.\n"
+#~ "Bu kutu seçildiğinde, iletinin bir bölümünü veya tamamını imzasız olarak "
+#~ "göndermeye kalktığınızda sizi uyarır.\n"
 #~ "<p>\n"
 #~ "Bu seçeneğin işaretli olması güvenlik için tavsiye edilir.\n"
 #~ "</qt>"
@@ -14818,16 +14503,21 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1> Sertifika Sona Eriyorsa Uyar</h1>\n"
-#~ "Bu seçenek işaretlendiğinde, Sertifika belirtilen sürede sona eriyorsa uyarılırsınız.\n"
+#~ "Bu seçenek işaretlendiğinde, Sertifika belirtilen sürede sona eriyorsa "
+#~ "uyarılırsınız.\n"
 #~ "<p>\n"
-#~ "Yakın gelecekte sona eren sertifikaları kullanmaktan kaçının. Bu seçeneğin işaretli olması tavsiye edilir.\n"
+#~ "Yakın gelecekte sona eren sertifikaları kullanmaktan kaçının. Bu "
+#~ "seçeneğin işaretli olması tavsiye edilir.\n"
 #~ "</qt>"
 
 #~ msgid "Warn if &receiver certificate expires in less than:"
@@ -14849,8 +14539,22 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgstr "Hangi sertifikaların gönderileceğini seç"
 
 #, fuzzy
-#~ msgid "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver will not be able to determine whether it was really you who sent the message or whether the message was altered by a third party. <p> The receiver can obtain your certificate from a central server, but you can also opt to enclose your certificate with your message. You can select whether you do not want to include a certificate at all, only your own certificate or the whole chain of certificates that certify your own certificate, including or excluding the root certificate. <p> It is recommended to always include at least your own certificate with the message. <p> This setting is a default, you can override it for each individual message. </qt>"
-#~ msgstr "<qt><h1> Gönderiliyor Sertifikalar</h1> için veya a<p> a için Sen için içerik a hepsi veya veya kök<p> için her zaman içerik<p> a öntanımlı için</qt>"
+#~ msgid ""
+#~ "<qt> <h1>Sending Certificates</h1> Without your certificate, the receiver "
+#~ "will not be able to determine whether it was really you who sent the "
+#~ "message or whether the message was altered by a third party. <p> The "
+#~ "receiver can obtain your certificate from a central server, but you can "
+#~ "also opt to enclose your certificate with your message. You can select "
+#~ "whether you do not want to include a certificate at all, only your own "
+#~ "certificate or the whole chain of certificates that certify your own "
+#~ "certificate, including or excluding the root certificate. <p> It is "
+#~ "recommended to always include at least your own certificate with the "
+#~ "message. <p> This setting is a default, you can override it for each "
+#~ "individual message. </qt>"
+#~ msgstr ""
+#~ "<qt><h1> Gönderiliyor Sertifikalar</h1> için veya a<p> a için Sen için "
+#~ "içerik a hepsi veya veya kök<p> için her zaman içerik<p> a öntanımlı "
+#~ "için</qt>"
 
 #~ msgid "Send &your own certificate"
 #~ msgstr "Kendi sertifikanı g&önder"
@@ -14865,19 +14569,23 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgstr "İletilerin bütün bölümlerini imz&ala"
 
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Bütün ileti bölümlerinin öntanımlı biçimde imzalanması için işaretle"
+#~ msgstr ""
+#~ "Bütün ileti bölümlerinin öntanımlı biçimde imzalanması için işaretle"
 
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Sign All Message Parts By Default</h1>\n"
-#~ "If this option is selected, all parts of a message (i.e. the main message body and all attachments) are signed by default.\n"
+#~ "If this option is selected, all parts of a message (i.e. the main message "
+#~ "body and all attachments) are signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual message.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1> İletinin Bütün Bölümlerini Öntanımlı Şekilde İmzala</h1>\n"
-#~ "Bu seçenek seçildiğinde, iletinin bütün kısımları (örn. gövde ve bütün eklentiler) öntanımlı biçimde imzalanır.\n"
+#~ "Bu seçenek seçildiğinde, iletinin bütün kısımları (örn. gövde ve bütün "
+#~ "eklentiler) öntanımlı biçimde imzalanır.\n"
 #~ "<p>\n"
 #~ "Bu öntanımlı bir ayardır, özel iletiler için bu ayarı çiğneyebilirsiniz.\n"
 #~ "</qt>"
@@ -14891,12 +14599,15 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Ask Before Signing Each Part</h1>\n"
-#~ "When this option is selected, you will be asked for each part of the message (i.e. the main message body as well as all attachments) individually whether you want the part to be signed.\n"
+#~ "When this option is selected, you will be asked for each part of the "
+#~ "message (i.e. the main message body as well as all attachments) "
+#~ "individually whether you want the part to be signed.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>Her Bir Parçayı İmzalamadan Önce Sor</h1>\n"
-#~ "Bu seçenek seçildiğinde, iletinin her bir parçasını (örn. gövde, eklentiler...) imzalarken size soracaktır.\n"
+#~ "Bu seçenek seçildiğinde, iletinin her bir parçasını (örn. gövde, "
+#~ "eklentiler...) imzalarken size soracaktır.\n"
 #~ "</qt>"
 
 #~ msgid "Do no&t sign messages"
@@ -14910,7 +14621,8 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ "<h1>Do Not Sign Messages</h1>\n"
 #~ "If this option is selected, messages are not signed by default.\n"
 #~ "<p>\n"
-#~ "This is a default setting, you can still override it for each individual setting.\n"
+#~ "This is a default setting, you can still override it for each individual "
+#~ "setting.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14920,7 +14632,8 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ "Bu öntanımlı bir ayardır, her özel ayar için bunu çiğneyebilirsiniz.\n"
 #~ "</qt>"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "İmzalama sertifikası <em>Seritfika</em> sayfasında ayarlanır."
 
 #~ msgid "RSA + SHA-1"
@@ -14933,11 +14646,18 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Signature Algorithm</h1>\n"
-#~ "An algorithm is a description for the computer on how it should perform a certain task. The signature algorithm describes how the computer applies your signature key to your message so that the receiver can determine whether the message really is from you.\n"
+#~ "An algorithm is a description for the computer on how it should perform a "
+#~ "certain task. The signature algorithm describes how the computer applies "
+#~ "your signature key to your message so that the receiver can determine "
+#~ "whether the message really is from you.\n"
 #~ "<p>\n"
-#~ "The selection of a certain signature algorithm determines how easy or how difficult it is to forge a message. However, all algorithms provided in the SPHINX environment are considered to be very safe. Generally, the default will work just fine here.\n"
+#~ "The selection of a certain signature algorithm determines how easy or how "
+#~ "difficult it is to forge a message. However, all algorithms provided in "
+#~ "the SPHINX environment are considered to be very safe. Generally, the "
+#~ "default will work just fine here.\n"
 #~ "<p>\n"
-#~ "This setting is a default, you can override it for each individual message.\n"
+#~ "This setting is a default, you can override it for each individual "
+#~ "message.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14958,12 +14678,16 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Store Messages With Signatures</h1>\n"
-#~ "When this box is checked, sent messages are stored together with the signatures applied to them. This is recommended, because it enables you to check later whether you signed a message or a certain part of it.\n"
+#~ "When this box is checked, sent messages are stored together with the "
+#~ "signatures applied to them. This is recommended, because it enables you "
+#~ "to check later whether you signed a message or a certain part of it.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>İletileri İmzalarıyla Kaydet</h1>\n"
-#~ "Bu kutucuk seçildiğinde, gönderilen iletiler uygulanan imza ile saklanacaktır. Tavsiye edilen bir seçenektir, çünkü daha sonra dilediğiniz kısmının imzalanıp imzalanmadığını kontrol edebilirsiniz.\n"
+#~ "Bu kutucuk seçildiğinde, gönderilen iletiler uygulanan imza ile "
+#~ "saklanacaktır. Tavsiye edilen bir seçenektir, çünkü daha sonra "
+#~ "dilediğiniz kısmının imzalanıp imzalanmadığını kontrol edebilirsiniz.\n"
 #~ "</qt> "
 
 #~ msgid "Compound mode:"
@@ -14976,7 +14700,10 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Multipart detached signature</h1>\n"
-#~ "When this option is selected, the signature and the signed data will be separate parts of a Multipart/Signed message part. Signed message data will be readable even by Mail User Agents not supporting the signaturing algorithm and not supporting ASN.1 decoding.\n"
+#~ "When this option is selected, the signature and the signed data will be "
+#~ "separate parts of a Multipart/Signed message part. Signed message data "
+#~ "will be readable even by Mail User Agents not supporting the signaturing "
+#~ "algorithm and not supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14994,7 +14721,9 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Opaque signed messages</h1>\n"
-#~ "When this option is selected, both the signature and the signed data will be encoded into one ASN.1 block. Messages will be readable only by Mail User Agents supporting ASN.1 decoding.\n"
+#~ "When this option is selected, both the signature and the signed data will "
+#~ "be encoded into one ASN.1 block. Messages will be readable only by Mail "
+#~ "User Agents supporting ASN.1 decoding.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -15012,8 +14741,18 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgstr "PIN kodunun ne sıklıkta girilmek zorunda olduğunu seç"
 
 #, fuzzy
-#~ msgid "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter the PIN in order to access your personal security environment (PSE) that contains your certificates. <p> The more often you need to enter your PIN, the more protected you are against email messages being forged in your name, but the more inconvenient operations will be. <p> If you are unsure what to select here, leave this option as it is. <p> Note that it is not possible to turn off PIN entry entirely for security reasons. </qt>"
-#~ msgstr "<qt> <h1>PIN Girişi</h1> Sertifikalarınızıda kapsayan kişisel çevre güvenliğine erişmek için. Burada, PIN kodunun ne sıklıkla girileceğini seçmelisiniz. <p> <p><p></qt>"
+#~ msgid ""
+#~ "<qt> <h1>PIN Entry</h1> Here, you can select how often you need to enter "
+#~ "the PIN in order to access your personal security environment (PSE) that "
+#~ "contains your certificates. <p> The more often you need to enter your "
+#~ "PIN, the more protected you are against email messages being forged in "
+#~ "your name, but the more inconvenient operations will be. <p> If you are "
+#~ "unsure what to select here, leave this option as it is. <p> Note that it "
+#~ "is not possible to turn off PIN entry entirely for security reasons. </qt>"
+#~ msgstr ""
+#~ "<qt> <h1>PIN Girişi</h1> Sertifikalarınızıda kapsayan kişisel çevre "
+#~ "güvenliğine erişmek için. Burada, PIN kodunun ne sıklıkla girileceğini "
+#~ "seçmelisiniz. <p> <p><p></qt>"
 
 #~ msgid "Once per session"
 #~ msgstr "Her oturumda bir kez"
@@ -15030,16 +14769,21 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1> Sertifika Sona Eriyorsa Uyar</h1>\n"
-#~ "Bu seçenek işaretlendiğinde, Belirtilen günde sona eren bir sertifika kullanmak istediğinizde sizi uyaracaktır.\n"
+#~ "Bu seçenek işaretlendiğinde, Belirtilen günde sona eren bir sertifika "
+#~ "kullanmak istediğinizde sizi uyaracaktır.\n"
 #~ "<p>\n"
-#~ "Bu seçeneğin seçili olması tavsiye edilir. Yakında sona eren sertifika kullanmaktan kaçınmanız gerekir.\n"
+#~ "Bu seçeneğin seçili olması tavsiye edilir. Yakında sona eren sertifika "
+#~ "kullanmaktan kaçınmanız gerekir.\n"
 #~ "</qt>"
 
 #, fuzzy
@@ -15053,7 +14797,8 @@ msgstr "Dosyanın Üzerine Yazılsın mı?"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
diff --git a/tde-i18n-uk/messages/tdepim/kmail.po b/tde-i18n-uk/messages/tdepim/kmail.po
index 2a49cc9fda6..90ce414ba1f 100644
--- a/tde-i18n-uk/messages/tdepim/kmail.po
+++ b/tde-i18n-uk/messages/tdepim/kmail.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-01-27 17:42-0800\n"
 "Last-Translator: Ivan Petrouchtchak <fr.ivan@ukrainian-orthodox.org>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -21,16 +21,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"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"
+"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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Andriy Rysin,Євген Онищенко,о. Іван Петрущак"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -177,6 +177,12 @@ msgstr "&відсутнє (будьте обережні)"
 msgid "Account for semiautomatic resource handling"
 msgstr "Рахунок для напівавтоматичного опрацювання ресурсів"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Очистити застарілі"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -252,14 +258,14 @@ msgstr "&Ім'я користувача:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Ваш провайдер Інтернет видав вам <em>ім'я користувача</em>"
-", яке використовується для автентифікації вас на його серверах. За звичай це "
-"перша частина електронної адреси (та частина адреси, що знаходиться перед <em>"
-"@</em>)."
+"Ваш провайдер Інтернет видав вам <em>ім'я користувача</em>, яке "
+"використовується для автентифікації вас на його серверах. За звичай це перша "
+"частина електронної адреси (та частина адреси, що знаходиться перед <em>@</"
+"em>)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -280,19 +286,19 @@ msgstr "Збе&рігати пароль для POP"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "Ввімкніть цей параметр, щоб вказати KMail зберігати пароль.\n"
 "Якщо ввімкнено систему торбинок, то пароль буде збережено там, що вважається "
 "безпечним.\n"
 "Але, якщо систему торбинок вимкнено, то пароль зберігається у файлі "
-"конфігурації Kmail. Там пароль знаходиться у затемненому форматі, але це формат "
-"не можна назвати безпечним. Його легко розшифрувати тому, хто має "
+"конфігурації Kmail. Там пароль знаходиться у затемненому форматі, але це "
+"формат не можна назвати безпечним. Його легко розшифрувати тому, хто має "
 "конфігураційний файл."
 
 #: accountdialog.cpp:640
@@ -321,11 +327,13 @@ msgstr "&Фільтрувати листи, якщо їх розмір біль�
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Якщо ввімкнуто, то до листів буде застосовано фільтри POP, щоб вирішити долю "
-"цих листів. Ви зможете вибрати звантажити, видалити чи залишити їх на сервері."
+"цих листів. Ви зможете вибрати звантажити, видалити чи залишити їх на "
+"сервері."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -374,13 +382,15 @@ msgstr "Звичайний те&кст"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -423,14 +433,14 @@ msgstr "Простори назв:"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 "Тут ви бачите різні простори назв, які підтримуються вашим сервером IMAP. "
-"Кожний простір назв представляє префікс, який розділяє групи тек. Простори назв "
-"дають змогу KMail, наприклад, показувати ваші особисті теки і спільні теки в "
-"одному рахунку."
+"Кожний простір назв представляє префікс, який розділяє групи тек. Простори "
+"назв дають змогу KMail, наприклад, показувати ваші особисті теки і спільні "
+"теки в одному рахунку."
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -488,14 +498,14 @@ msgstr "Заванта&жувати долучення при потребі"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 "Активуйте цей параметр, та при виборі листа електронної пошти долучення не "
 "будуть завантажуватися автоматично, звантаження долучення буде відбуватися "
-"тільки коли ви клацнули на ньому. Це дозволяє швидко відображати навіть великі "
-"листи."
+"тільки коли ви клацнули на ньому. Це дозволяє швидко відображати навіть "
+"великі листи."
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -506,8 +516,8 @@ msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
 msgstr ""
-"Перевірка на підтеки буде виконуватися тільки для відкритих (розгорнутих) тек. "
-"Вживайте цей параметр якщо на сервері багато тек."
+"Перевірка на підтеки буде виконуватися тільки для відкритих (розгорнутих) "
+"тек. Вживайте цей параметр якщо на сервері багато тек."
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -535,7 +545,7 @@ msgstr "<немає>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "вхідні"
 
@@ -543,8 +553,8 @@ msgstr "вхідні"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Схоже що сервер не підтримує функцію унікальних номерів повідомлень, але ця "
 "функція потрібна для того, щоб залишати повідомлення на сервері.\n"
@@ -555,35 +565,37 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Схоже що сервер не підтримує функцію витягування заголовків повідомлень, але ця "
-"функція потрібна для того, щоб фільтрувати повідомлення на сервері.\n"
+"Схоже що сервер не підтримує функцію витягування заголовків повідомлень, але "
+"ця функція потрібна для того, щоб фільтрувати повідомлення на сервері.\n"
 "Деякі сервери неправильно оголошують свої можливості, тому ви все ще можете "
 "ввімкнути фільтрування повідомлень на сервері."
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "Будь ласка, зверніть увагу на те, що використання цієї можливості може "
 "призвести до отримання пошкоджених листів, якщо POP3 сервер не підтримує "
 "конвеєрне звантаження.\n"
 "Цей параметр існує тільки тому, що деякі сервери підтримують конвеєрне "
 "звантаження, але не оголошують цей факт. Щоб перевірити, чи ваш POP3 сервер "
-"заявляє про підтримку конвеєрного звантаження, ви можете скористатись кнопкою "
-"\"Перевірити, які методи підтримуються сервером\", яка розташована нижче.\n"
-"Якщо ваш сервер не заявляє про підтримку, але ви хочете прискорити звантаження "
-"листів, то вам потрібно провести тест: відішліть собі декілька листів та "
-"спробуйте звантажити їх."
+"заявляє про підтримку конвеєрного звантаження, ви можете скористатись "
+"кнопкою \"Перевірити, які методи підтримуються сервером\", яка розташована "
+"нижче.\n"
+"Якщо ваш сервер не заявляє про підтримку, але ви хочете прискорити "
+"звантаження листів, то вам потрібно провести тест: відішліть собі декілька "
+"листів та спробуйте звантажити їх."
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -591,30 +603,30 @@ msgstr "Будь ласка, спочатку вкажіть сервер та �
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "Цей параметр вимкнено тому, що сервер не підтримує конвеєрне звантаження.\n"
-"Оскільки деякі сервери неправильно оголошують про власні можливості, ви все ще "
-"можете ввімкнути конвеєрне звантаження. Але якщо POP3 сервер дійсно не "
+"Оскільки деякі сервери неправильно оголошують про власні можливості, ви все "
+"ще можете ввімкнути конвеєрне звантаження. Але якщо POP3 сервер дійсно не "
 "підтримує конвеєрне звантаження, то, у цьому випадку, сервер буде віддавати "
 "пошкоджені листи. Таким чином перед використанням цієї функції вам потрібно "
-"провести тест: відішліть собі велику кількість листів та спробуйте звантажити "
-"їх всіх відразу з POP сервера."
+"провести тест: відішліть собі велику кількість листів та спробуйте "
+"звантажити їх всіх відразу з POP сервера."
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "Схоже що сервер не підтримує функцію унікальних номерів повідомлень, але ця "
 "функція потрібна для того, щоб залишати повідомлення на сервері, тому цей "
@@ -627,12 +639,12 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"Схоже що сервер не підтримує функцію витягування заголовків повідомлень, але ця "
-"функція потрібна для того, щоб фільтрувати повідомлення на сервері, тому цей "
-"параметр було вимкнено.\n"
+"Схоже що сервер не підтримує функцію витягування заголовків повідомлень, але "
+"ця функція потрібна для того, щоб фільтрувати повідомлення на сервері, тому "
+"цей параметр було вимкнено.\n"
 "Деякі сервери неправильно оголошують свої можливості, тому ви все ще можете "
 "ввімкнути фільтрування повідомлень на сервері."
 
@@ -717,10 +729,11 @@ msgstr "Рахунок IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
-"Вам потрібно додати рахунок в параметрах мережі для того, щоб отримувати пошту."
+"Вам потрібно додати рахунок в параметрах мережі для того, щоб отримувати "
+"пошту."
 
 #: accountwizard.cpp:87
 msgid "Local mailbox"
@@ -756,13 +769,14 @@ msgstr "Ласкаво просимо до KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Схоже, що це перший запуск KMail. Для налаштування ваших поштових рахунків "
-"можете скористатись майстром. Просто введіть у наступні сторінки дані про "
-"з'єднання, що ви отримали від вашого провайдера електронної пошти.</qt>"
+"<qt>Схоже, що це перший запуск KMail. Для налаштування ваших поштових "
+"рахунків можете скористатись майстром. Просто введіть у наступні сторінки "
+"дані про з'єднання, що ви отримали від вашого провайдера електронної пошти.</"
+"qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -824,8 +838,7 @@ msgstr "Вживати локальну доставку"
 msgid "Server Information"
 msgstr "Інформація про сервер"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Немає"
@@ -918,8 +931,8 @@ msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
-"<p>Не знайдено засобів виявлення спаму. Встановіть програму виявлення спаму і "
-"повторно запустіть цей майстер.</p>"
+"<p>Не знайдено засобів виявлення спаму. Встановіть програму виявлення спаму "
+"і повторно запустіть цей майстер.</p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -964,28 +977,27 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 "<p>Тут ви можете отримати допомогу в налаштуванні фільтрів KMail, що "
-"використовують деякі загально відомі антивірусні засоби.</p>"
-"<p>Цей майстер може знаходити такі засоби на вашому комп'ютері та створювати "
-"фільтри, що будуть використовувати ці засоби, для відокремлення повідомлень "
-"визначених, як ті, що містять віруси. Але цей майстер не буде нічого робити з "
-"вже існуючими правилами (він завжди додаватиме нові правила).</p>"
-"<p><b>Увага:</b> при скануванні повідомлень на віруси буде здаватися, що "
-"програма KMail зависла. Робота антивірусних засобів, типово, займає багато "
-"часу, тому можуть виникати проблеми з реакцією KMail на ваші дії. Для "
-"повернення до звичайної поведінки видалить фільтри створені цим майстром."
+"використовують деякі загально відомі антивірусні засоби.</p><p>Цей майстер "
+"може знаходити такі засоби на вашому комп'ютері та створювати фільтри, що "
+"будуть використовувати ці засоби, для відокремлення повідомлень визначених, "
+"як ті, що містять віруси. Але цей майстер не буде нічого робити з вже "
+"існуючими правилами (він завжди додаватиме нові правила).</p><p><b>Увага:</"
+"b> при скануванні повідомлень на віруси буде здаватися, що програма KMail "
+"зависла. Робота антивірусних засобів, типово, займає багато часу, тому "
+"можуть виникати проблеми з реакцією KMail на ваші дії. Для повернення до "
+"звичайної поведінки видалить фільтри створені цим майстром."
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -1012,8 +1024,8 @@ msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
-"Типова тека для спам-повідомлень -- це смітник, але нижче можна вказати й іншу "
-"теку."
+"Типова тека для спам-повідомлень -- це смітник, але нижче можна вказати й "
+"іншу теку."
 
 #: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
@@ -1021,14 +1033,13 @@ msgstr "Пересувати &ймовірний спам у:"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"Типова тека -- \"вхідні\", але нижче можна вказати іншу теку."
-"<p>Не всі засоби підтримують класифікацію як імовірний спам. Ви не зможете "
-"вибрати теку, якщо ваш засіб не має цієї функціональності."
+"Типова тека -- \"вхідні\", але нижче можна вказати іншу теку.<p>Не всі "
+"засоби підтримують класифікацію як імовірний спам. Ви не зможете вибрати "
+"теку, якщо ваш засіб не має цієї функціональності."
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -1038,8 +1049,8 @@ msgstr "Перевіряти повідомлення засобами блок�
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 "Дозволити антивірусним засобам перевіряти повідомлення. Цей майстер створить "
 "відповідні фільтри. Зазвичай, повідомлення позначаються засобами, створені "
@@ -1053,12 +1064,12 @@ msgstr "Пересувати виявлені повідомлення з вір
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
-"Створюється фільтр для виявлення повідомлень класифікованих як уражені вірусом "
-"та пересування цих повідомлень у вказану теку. Типова тека - це тека смітника, "
-"але ви можете вказати іншу у перегляді тек."
+"Створюється фільтр для виявлення повідомлень класифікованих як уражені "
+"вірусом та пересування цих повідомлень у вказану теку. Типова тека - це тека "
+"смітника, але ви можете вказати іншу у перегляді тек."
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -1066,8 +1077,8 @@ msgstr "Додатково позначати виявлені повідомл�
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 "Позначити виявлені повідомлення з вірусами як прочитані та пересувати їх у "
 "вказану теку."
@@ -1251,8 +1262,9 @@ msgid ""
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
-"Це могло статися тому, що у вас не вистачає прав доступу, або тому, що тека з "
-"такою назвою вже існує на сервері. Повідомлення про помилку надіслане сервером:"
+"Це могло статися тому, що у вас не вистачає прав доступу, або тому, що тека "
+"з такою назвою вже існує на сервері. Повідомлення про помилку надіслане "
+"сервером:"
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1265,8 +1277,8 @@ msgstr "Помилка при зчитуванні теки %1 з сервера
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1286,8 +1298,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1318,17 +1330,17 @@ msgstr "Видалено"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 "<qt>Жодний з ваших профілів не відповідає отримувачу цього повідомлення,"
 "<br>виберіть яка з наступних адрес є вашою, якщо вона там є:"
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 "<qt>Декілька ваших профілів відповідає отримувачу цього повідомлення,"
 "<br>будь ласка, виберіть яка з наступних адрес є вашою:"
@@ -1360,19 +1372,22 @@ msgstr "Виникла помилка при ущільненні \"%1\". Ущі
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Значення цього параметра було встановлено вашим системним "
-"адміністратором.</p>"
-"<p>Якщо ви вважаєте це за помилку, то зверніться, будь ласка, до нього.</p></qt>"
+"<qt><p>Значення цього параметра було встановлено вашим системним "
+"адміністратором.</p><p>Якщо ви вважаєте це за помилку, то зверніться, будь "
+"ласка, до нього.</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Завантажити &профіль..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Налаштувати рахунок"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Додати..."
@@ -1402,6 +1417,11 @@ msgstr "<qt>Ви дійсно хочете видалити профіль з н
 msgid "Remove Identity"
 msgstr "Видалити профіль"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "Вида&лити"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Додати..."
@@ -1410,6 +1430,11 @@ msgstr "Додати..."
 msgid "Modify..."
 msgstr "Змінити..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "Вида&лити"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Встановити як типовий"
@@ -1426,17 +1451,15 @@ msgstr "Відс&илання пошти"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Рахунки (утворіть хоча б один рахунок):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Назва"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Тип"
@@ -1458,8 +1481,7 @@ msgstr "Встановити як типовий"
 msgid "Common Options"
 msgstr "Спільні параметри"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "&Підтверджувати перед відсиланням"
@@ -1510,17 +1532,16 @@ msgstr "Тип&овий домен:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Типовий домен використовується, щоб завершити адресу електронної пошти, якщо "
-"вона складається тільки з ім'я користувача.</p></qt>"
+"<qt><p>Типовий домен використовується, щоб завершити адресу електронної "
+"пошти, якщо вона складається тільки з ім'я користувача.</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1538,9 +1559,9 @@ msgstr "Додати транспорт"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (типовий)"
 
@@ -1625,6 +1646,10 @@ msgstr "Змінити рахунок"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Не вдається знайти рахунок <b>%1</b>.</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Кольори"
@@ -1733,8 +1758,7 @@ msgstr "Відвідане посилання"
 msgid "Misspelled Words"
 msgstr "Слова з помилками"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Нове повідомлення"
@@ -1758,14 +1782,14 @@ msgstr "OpenPGP повідомлення -яке зашифроване"
 #: configuredialog.cpp:1719
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr ""
-"OpenPGP повідомлення -яке має вірний OpenPGP підпис зроблений ключем, який має "
-"довіру"
+"OpenPGP повідомлення -яке має вірний OpenPGP підпис зроблений ключем, який "
+"має довіру"
 
 #: configuredialog.cpp:1720
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr ""
-"OpenPGP повідомлення - яке має вірний OpenPGP підпис зроблений ключем, який не "
-"має довіри"
+"OpenPGP повідомлення - яке має вірний OpenPGP підпис зроблений ключем, який "
+"не має довіри"
 
 #: configuredialog.cpp:1721
 msgid "OpenPGP Message - Unchecked Signature"
@@ -1926,8 +1950,8 @@ msgstr "За уставом - гілки закриті"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 "Розкривати гілки, що містять нові, &непрочитані або важливі повідомлення."
 
@@ -1937,71 +1961,51 @@ msgstr "Відображення дати"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>Можна використовувати наступні вирази для відображення дати:</strong>"
-"</p>"
-"<ul>"
-"<li>d - день місяця без нуля (1-31)</li>"
-"<li>dd - день місяця з нулем (01-31)</li>"
-"<li>ddd - скорочена назва дня тижня (пн - нд)</li>"
-"<li>dddd - повна назва дня тижня (понеділок - неділя)</li>"
-"<li>M - номер місяця без нуля (1-12)</li>"
-"<li>MM - номер місяця з нулем (01-12)</li>"
-"<li>MMM - скорочена назва місяця (січ - гру)</li>"
-"<li>MMMM - повна назва місяця (січень - грудень)</li>"
-"<li>yy - рік дві цифри (00-99)</li>"
-"<li>yyyy - рік чотири цифри (0000-9999)</li></ul>"
-"<p><strong>Можна використовувати наступні вирази для відображення часу:</string>"
-"</p> "
-"<ul>"
-"<li>h - година без нуля (0-23 або 1-12 якщо ввімкнено відображення AM/PM)</li>"
-"<li>hh - година з нулем (00-23 або 01-12 якщо ввімкнено відображення AM/PM)</li>"
-"<li>m - хвилини без нуля (0-59)</li>"
-"<li>mm - хвилини з нулем (00-59)</li>"
-"<li>s - секунди без нуля (0-59)</li>"
-"<li>ss - секунди з нулем (00-59)</li>"
-"<li>z - мілісекунди без нулів (0-999)</li>"
-"<li>zzz - мілісекунди з нулями (000-999)</li>"
-"<li>AP - перемикнути до відображення AM/PM. AP буде замінено на \"AM\" або "
-"\"PM\".</li>"
-"<li>ap - перемикнути до відображення AM/PM. ap буде замінено на \"am\" або "
-"\"pm\".</li>"
-"<li>Z - часовий пояс (-0500)</li></ul>"
-"<p><strong>Всі інші введені символи буде проігноровано.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>Можна використовувати наступні вирази для відображення дати:</"
+"strong></p><ul><li>d - день місяця без нуля (1-31)</li><li>dd - день місяця "
+"з нулем (01-31)</li><li>ddd - скорочена назва дня тижня (пн - нд)</"
+"li><li>dddd - повна назва дня тижня (понеділок - неділя)</li><li>M - номер "
+"місяця без нуля (1-12)</li><li>MM - номер місяця з нулем (01-12)</li><li>MMM "
+"- скорочена назва місяця (січ - гру)</li><li>MMMM - повна назва місяця "
+"(січень - грудень)</li><li>yy - рік дві цифри (00-99)</li><li>yyyy - рік "
+"чотири цифри (0000-9999)</li></ul><p><strong>Можна використовувати наступні "
+"вирази для відображення часу:</string></p> <ul><li>h - година без нуля (0-23 "
+"або 1-12 якщо ввімкнено відображення AM/PM)</li><li>hh - година з нулем "
+"(00-23 або 01-12 якщо ввімкнено відображення AM/PM)</li><li>m - хвилини без "
+"нуля (0-59)</li><li>mm - хвилини з нулем (00-59)</li><li>s - секунди без "
+"нуля (0-59)</li><li>ss - секунди з нулем (00-59)</li><li>z - мілісекунди без "
+"нулів (0-999)</li><li>zzz - мілісекунди з нулями (000-999)</li><li>AP - "
+"перемикнути до відображення AM/PM. AP буде замінено на \"AM\" або \"PM\".</"
+"li><li>ap - перемикнути до відображення AM/PM. ap буде замінено на \"am\" "
+"або \"pm\".</li><li>Z - часовий пояс (-0500)</li></ul><p><strong>Всі інші "
+"введені символи буде проігноровано.</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 "Зміна глобальних параметрів гілок замінить всі окремі параметри для кожної "
 "теки."
@@ -2018,8 +2022,7 @@ msgstr "Показувати &смужку стану HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "Показувати стан &спаму у вишуканих заголовках"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Заміна символьних посмішок на піктограми"
@@ -2028,8 +2031,7 @@ msgstr "Заміна символьних посмішок на піктогра
 msgid "Use smaller font for quoted text"
 msgstr "Для цитат вживати менший шрифт"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Показувати розкриття/згортання блоків цитат"
@@ -2055,8 +2057,7 @@ msgstr "Автоматично"
 msgid "&Override character encoding:"
 msgstr "&Примусово вживане кодування:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Ввімкнути піктограму у системному лотку"
@@ -2159,21 +2160,19 @@ msgstr "<b>%f</b> буде замінено назвою файла, що ред
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>У фразах відповіді підтримуються наступні підміни :"
-"<br><b>%D</b>: дата, <b>%S</b>: тема,"
-"<br><b>%e</b>: адреса відправника, <b>%F</b>: відправник, <b>%f</b>"
-": ініціали відправника,"
-"<br><b>%T</b>: адресат, <b>%t</b>: ім'я та адреса адресата,"
-"<br><b>%C</b>: отримувачі копії, <b>%c</b>: імена та адреси отримувачів копії,"
-"<br><b>%%</b>: знак відсотків, <b>%_</b>: пропуск, <b>%L</b>: новий рядок</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>У фразах відповіді підтримуються наступні підміни :<br><b>%D</b>: дата, "
+"<b>%S</b>: тема,<br><b>%e</b>: адреса відправника, <b>%F</b>: відправник, <b>"
+"%f</b>: ініціали відправника,<br><b>%T</b>: адресат, <b>%t</b>: ім'я та "
+"адреса адресата,<br><b>%C</b>: отримувачі копії, <b>%c</b>: імена та адреси "
+"отримувачів копії,<br><b>%%</b>: знак відсотків, <b>%_</b>: пропуск, <b>%L</"
+"b>: новий рядок</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2196,21 +2195,20 @@ msgstr "Відповісти в&сім:"
 msgid "&Forward:"
 msgstr "&Переслати:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "Ознака &цитати:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D Ви написали:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D, %F написав(ла):"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Переслане повідомлення"
 
@@ -2248,12 +2246,12 @@ msgstr "Введіть новий префікс пересилки:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "Вказані у цьому списку кодування перевіряться з верху до низу для кожного "
-"листа, поки не буде знайдено кодування, що містить всі символи, які є у цьому "
-"листі."
+"листа, поки не буде знайдено кодування, що містить всі символи, які є у "
+"цьому листі."
 
 #: configuredialog.cpp:3278
 msgid "Enter charset:"
@@ -2289,10 +2287,9 @@ msgstr "Значення"
 msgid "Ne&w"
 msgstr "Н&овий"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Назва:"
@@ -2301,16 +2298,15 @@ msgstr "&Назва:"
 msgid "&Value:"
 msgstr "&Значення:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Присвоювання назв долученням сумісне з Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 "Ввімкніть цей параметр, щоб програма Outlook(tm) могла зрозуміти назви "
 "долучень, що містять не латинські літери"
@@ -2339,23 +2335,23 @@ msgstr "долучений"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
-msgstr ""
-"Ви обрали таке кодування назв долучень (що містять не латинські символи), яке "
-"дозволить закодованим назвам бути зрозумілими програмі Outlook(tm) та іншим "
-"поштовим програмам, які не підтримують закодовані за загальним стандартом назви "
-"долучень.\n"
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
+msgstr ""
+"Ви обрали таке кодування назв долучень (що містять не латинські символи), "
+"яке дозволить закодованим назвам бути зрозумілими програмі Outlook(tm) та "
+"іншим поштовим програмам, які не підтримують закодовані за загальним "
+"стандартом назви долучень.\n"
 "Хоча KMail може створювати повідомлення, які не відповідають загальним "
-"стандартам; але в результаті цього може статися, що ваші повідомлення не будуть "
-"зрозумілі програмам-поштярям, які вміють працювати с загальними стандартами. "
-"Тому ви не повинні вмикати цей параметр, якщо немає нагальної потреби зробити "
-"це."
+"стандартам; але в результаті цього може статися, що ваші повідомлення не "
+"будуть зрозумілі програмам-поштярям, які вміють працювати с загальними "
+"стандартами. Тому ви не повинні вмикати цей параметр, якщо немає нагальної "
+"потреби зробити це."
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2379,116 +2375,100 @@ msgstr "Втул&ки шифрування"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Інколи електронна пошта приходить у двох форматах. Цей параметр дозволяє "
-"вибрати який з двох форматів відображати: HTML або звичайний текст.</p>"
-"<p>Відображення HTML робить повідомлення більш гарним на вигляд, але в той же "
-"час збільшує вірогідність використання дірок безпеки.</p>"
-"<p>Відображення простим текстом втрачає привабливість, але робить <em>"
-"неможливим</em> використовувати помилки безпеки у відтворювачі HTML "
-"(Konqueror).</p>"
-"<p>Параметр внизу захищає проти загального зловживання поштою HTML. Але це не "
-"може захистити вас від помилок, які не були відомі під час написання цієї "
-"версії KMail.</p>"
-"<p>Тому краще <em>не</em> надавати перевагу HTML.</p> "
-"<p><b>Примітка:</b> У меню <i>Тека</i> ви можете встановити значення цього "
-"параметру для кожної теки окремо.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>Інколи електронна пошта приходить у двох форматах. Цей параметр "
+"дозволяє вибрати який з двох форматів відображати: HTML або звичайний текст."
+"</p><p>Відображення HTML робить повідомлення більш гарним на вигляд, але в "
+"той же час збільшує вірогідність використання дірок безпеки.</"
+"p><p>Відображення простим текстом втрачає привабливість, але робить "
+"<em>неможливим</em> використовувати помилки безпеки у відтворювачі HTML "
+"(Konqueror).</p><p>Параметр внизу захищає проти загального зловживання "
+"поштою HTML. Але це не може захистити вас від помилок, які не були відомі "
+"під час написання цієї версії KMail.</p><p>Тому краще <em>не</em> надавати "
+"перевагу HTML.</p> <p><b>Примітка:</b> У меню <i>Тека</i> ви можете "
+"встановити значення цього параметру для кожної теки окремо.</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Іноді реклама приходить у форматі HTML та містить посилання на зображення в "
-"Мережі. Вони використовуються, щоб перевірити, чи прочитали ви це повідомлення "
-"(&quot;жучки Тенет&quot;).</p>"
-"<p>Завантажувати такі зображення немає потреби, тому що відправник завжди може "
-"їх долучити, якщо вони потрібні.</p>"
-"<p>Щоб захиститися від такого зловживання цієї функції HTML в KMail, цей "
-"параметр типово <em>вимкнено</em>.</p>"
-"<p>Якщо ви все ж таки хочете, відображати такі зображення в пошті HTML, то "
-"можете увімкнути цей параметр, але не забувайте про можливі проблеми.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>Іноді реклама приходить у форматі HTML та містить посилання на "
+"зображення в Мережі. Вони використовуються, щоб перевірити, чи прочитали ви "
+"це повідомлення (&quot;жучки Тенет&quot;).</p><p>Завантажувати такі "
+"зображення немає потреби, тому що відправник завжди може їх долучити, якщо "
+"вони потрібні.</p><p>Щоб захиститися від такого зловживання цієї функції "
+"HTML в KMail, цей параметр типово <em>вимкнено</em>.</p><p>Якщо ви все ж "
+"таки хочете, відображати такі зображення в пошті HTML, то можете увімкнути "
+"цей параметр, але не забувайте про можливі проблеми.</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>Правила відсилання сповіщень про долю повідомлення</h3>"
-"<p>Сповіщення про долю повідомлення - це узагальнення <b>"
-"квитанцій про прочитання</b>. Автор листа може запитати на отримання такого "
-"сповіщення, тоді поштова програма адресата створює і відсилає сповіщення до "
-"автора в якому міститься інформація про те, що сталося з його листом. Звичайно, "
-"сповіщення мають один з наступних типів: <b>показано</b> "
-"(напр. повідомлення прочитане), <b>видалено</b> та <b>переслане</b> "
-"(напр. переслане до іншої скриньки).</p>"
-"<p>Наступні параметри дозволяють налаштувати поведінку KMail про відсиланні "
-"сповіщень:</p>"
-"<ul>"
-"<li><em>Ігнорувати</em>: всі запити на сповіщення про долю повідомлення буде "
-"проігноровано. Жодного сповіщення не буде відіслано автоматично (рекомендоване "
-"значення).</li>"
-"<li><em>Питати</em>: сповіщення відсилатиметься тільки після того, як ви "
-"погодитесь на це. Тобто, ви матимете можливість відсилати сповіщення для одних "
-"повідомлень, та ігноруватимете інші.</li>"
-"<li><em>Відмовити</em>: завжди будуть відсилатись сповіщення з <b>відмовою</b> "
-"надати інформацію про долю повідомлення. Це <em>трохи</em> "
-"краще за безумовне відсилання сповіщення, але автор листа буде знати, що його "
-"повідомлення не загубилося. Він, тільки, не зможе визначити, що саме сталося з "
-"повідомленням.</li>"
-"<li><em>Завжди відсилати</em>: програма буде завжди відсилати правильні "
-"сповіщення про долю повідомлення. Це значить, що автор листа буде точно знати, "
-"що і коли трапилось з його повідомленням. Було воно показане, чи відразу "
-"видалене. Розробники наполегливо не рекомендують вживати це значення. Воно "
-"присутнє тут тому, що таке значення може стати в нагоді для служби "
-"підтримки.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>Правила відсилання сповіщень про долю повідомлення</h3><p>Сповіщення "
+"про долю повідомлення - це узагальнення <b>квитанцій про прочитання</b>. "
+"Автор листа може запитати на отримання такого сповіщення, тоді поштова "
+"програма адресата створює і відсилає сповіщення до автора в якому міститься "
+"інформація про те, що сталося з його листом. Звичайно, сповіщення мають один "
+"з наступних типів: <b>показано</b> (напр. повідомлення прочитане), "
+"<b>видалено</b> та <b>переслане</b> (напр. переслане до іншої скриньки).</"
+"p><p>Наступні параметри дозволяють налаштувати поведінку KMail про "
+"відсиланні сповіщень:</p><ul><li><em>Ігнорувати</em>: всі запити на "
+"сповіщення про долю повідомлення буде проігноровано. Жодного сповіщення не "
+"буде відіслано автоматично (рекомендоване значення).</li><li><em>Питати</"
+"em>: сповіщення відсилатиметься тільки після того, як ви погодитесь на це. "
+"Тобто, ви матимете можливість відсилати сповіщення для одних повідомлень, та "
+"ігноруватимете інші.</li><li><em>Відмовити</em>: завжди будуть відсилатись "
+"сповіщення з <b>відмовою</b> надати інформацію про долю повідомлення. Це "
+"<em>трохи</em> краще за безумовне відсилання сповіщення, але автор листа "
+"буде знати, що його повідомлення не загубилося. Він, тільки, не зможе "
+"визначити, що саме сталося з повідомленням.</li><li><em>Завжди відсилати</"
+"em>: програма буде завжди відсилати правильні сповіщення про долю "
+"повідомлення. Це значить, що автор листа буде точно знати, що і коли "
+"трапилось з його повідомленням. Було воно показане, чи відразу видалене. "
+"Розробники наполегливо не рекомендують вживати це значення. Воно присутнє "
+"тут тому, що таке значення може стати в нагоді для служби підтримки.</li></"
+"ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2504,15 +2484,16 @@ msgstr "Дозволити завантаження зовні&шніх поси
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>УВАГА:</b> використання HTML у пошті робить вас більш незахищеним і підвищує "
-"ймовірність використання інших присутніх та відомих вад в безпеці вашої "
-"системи. Дивіться <a href=\"whatsthis:%1\">більш докладно про HTML листи</a> "
-"та <a href=\"whatsthis:%2\">більш докладно про зовнішні посилання</a>."
+"<b>УВАГА:</b> використання HTML у пошті робить вас більш незахищеним і "
+"підвищує ймовірність використання інших присутніх та відомих вад в безпеці "
+"вашої системи. Дивіться <a href=\"whatsthis:%1\">більш докладно про HTML "
+"листи</a> та <a href=\"whatsthis:%2\">більш докладно про зовнішні посилання</"
+"a>."
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2587,14 +2568,14 @@ msgstr "Автоматично імпортувати ключі та серти
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
-"Зміна глобальних параметрів HTML замінить всі окремі параметри для кожної теки."
+"Зміна глобальних параметрів HTML замінить всі окремі параметри для кожної "
+"теки."
 
 #: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "Цей параметр потребує наявності dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "без проксі"
@@ -2623,8 +2604,8 @@ msgstr "Ви&ключити важливі повідомлення з вилу�
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "При спробі знайти не прочитані повідомлення:"
 
@@ -2648,8 +2629,8 @@ msgstr "робити циклічний пошук у всіх теках"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "При переході до теки:"
 
@@ -2718,24 +2699,21 @@ msgstr "каталогів (формат \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt> "
-"<p>Тут встановлюється типовий формат для локальних тек:</p> "
-"<p><b>mbox:</b> Кожна тека зберігається у окремому файлі. Листи відділені один "
-"від одного рядком, який починається з \"From \". Це зберігає місце на диску, "
-"але менш надійно, напр. при пересуванні листів між теками.</p> "
-"<p><b>maildir:</b> Кожна тека KMail зберігається у вигляді каталогу на диску. "
-"Листи це - окремі файли. Такі теки займають більше місця на диску, але це більш "
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt> <p>Тут встановлюється типовий формат для локальних тек:</p> <p><b>mbox:"
+"</b> Кожна тека зберігається у окремому файлі. Листи відділені один від "
+"одного рядком, який починається з \"From \". Це зберігає місце на диску, але "
+"менш надійно, напр. при пересуванні листів між теками.</p> <p><b>maildir:</"
+"b> Кожна тека KMail зберігається у вигляді каталогу на диску. Листи це - "
+"окремі файли. Такі теки займають більше місця на диску, але це більш "
 "надійно, напр. при пересуванні листів між теками.</p></qt>"
 
 #: configuredialog.cpp:4679
@@ -2769,54 +2747,46 @@ msgstr "ГБ"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>При виборі наступного непрочитаного листа може статися так, що нижче "
-"поточного листа немає непрочитаних повідомлень.</p>"
-"<p><b>Не робити циклічний пошук</b> - пошук буде зупинено на останньому "
-"повідомленні в теці.</p>"
-"<p><b>Робити циклічний пошук в поточній теці</b> - пошук буде продовжено з "
-"початку списку повідомлень в поточній теці.</p> "
-"<p><b>Робити циклічний пошук у всіх теках</b> - пошук буде продовжено з початку "
-"списку повідомлень. Якщо і в цьому випадку не знайдено непрочитаних "
-"повідомлень, то пошук буде продовжено у наступній теці.</p>"
-"<p>При пошуку попереднього непрочитаного листа, буде схожа поведінка. Тільки "
-"пошук буде продовжено з низу списку повідомлень, а потім, можливо, в попередній "
-"теці, якщо вибране відповідне значення.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>При виборі наступного непрочитаного листа може статися так, що нижче "
+"поточного листа немає непрочитаних повідомлень.</p><p><b>Не робити циклічний "
+"пошук</b> - пошук буде зупинено на останньому повідомленні в теці.</"
+"p><p><b>Робити циклічний пошук в поточній теці</b> - пошук буде продовжено з "
+"початку списку повідомлень в поточній теці.</p> <p><b>Робити циклічний пошук "
+"у всіх теках</b> - пошук буде продовжено з початку списку повідомлень. Якщо "
+"і в цьому випадку не знайдено непрочитаних повідомлень, то пошук буде "
+"продовжено у наступній теці.</p><p>При пошуку попереднього непрочитаного "
+"листа, буде схожа поведінка. Тільки пошук буде продовжено з низу списку "
+"повідомлень, а потім, можливо, в попередній теці, якщо вибране відповідне "
+"значення.</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Повнотекстова індексація дає змогу робити дуже швидкий пошук у вмісті ваших "
-"повідомлень. Якщо увімкнено, вікно пошуку буде працювати дуже швидко. Також, "
-"пенал пошуку буде вибирати повідомлення за вмістом.</p>"
-"<p>Це вимагає трохи дискового простору (приблизно половину місця від того, що "
-"займають повідомлення).</p>"
-"<p>Після увімкнення, має бути створено індекс, але ви можете продовжувати "
-"використовувати KMail під час виконання цієї дії.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>Повнотекстова індексація дає змогу робити дуже швидкий пошук у вмісті "
+"ваших повідомлень. Якщо увімкнено, вікно пошуку буде працювати дуже швидко. "
+"Також, пенал пошуку буде вибирати повідомлення за вмістом.</p><p>Це вимагає "
+"трохи дискового простору (приблизно половину місця від того, що займають "
+"повідомлення).</p><p>Після увімкнення, має бути створено індекс, але ви "
+"можете продовжувати використовувати KMail під час виконання цієї дії.</p></"
+"qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2883,10 +2853,11 @@ msgstr "&Ховати теки для групової роботи"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
-"Коли ввімкнено, то ви не будете бачити теки ресурсів серед тек на IMAP сервері."
+"Коли ввімкнено, то ви не будете бачити теки ресурсів серед тек на IMAP "
+"сервері."
 
 #: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
@@ -2895,10 +2866,11 @@ msgstr "Для цього рахунку показувати &тільки те
 #: configuredialog.cpp:4913
 #, fuzzy
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
-"Коли ввімкнено, то ви не будете бачити теки ресурсів серед тек на IMAP сервері."
+"Коли ввімкнено, то ви не будете бачити теки ресурсів серед тек на IMAP "
+"сервері."
 
 #: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
@@ -2927,8 +2899,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
-"Ввімкніть цей параметр, щоб програма Outlook(tm) могла зрозуміти ваші відповіді "
-"на запрошення"
+"Ввімкніть цей параметр, щоб програма Outlook(tm) могла зрозуміти ваші "
+"відповіді на запрошення"
 
 #: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
@@ -2939,8 +2911,8 @@ msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
-"Ввімкніть цей параметр, щоб програма Outlook(tm) могла зрозуміти ваші відповіді "
-"на запрошення"
+"Ввімкніть цей параметр, щоб програма Outlook(tm) могла зрозуміти ваші "
+"відповіді на запрошення"
 
 #: configuredialog.cpp:4963
 #, fuzzy
@@ -2955,19 +2927,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Присвоювання назв долученням сумісне з Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Автоматичне відсилання запрошень"
@@ -2977,28 +2948,28 @@ msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
-"Якщо ввімкнено, то користувач не буде бачити вікно редактора повідомлень. Листи "
-"з запрошеннями відсилатимуться автоматично"
+"Якщо ввімкнено, то користувач не буде бачити вікно редактора повідомлень. "
+"Листи з запрошеннями відсилатимуться автоматично"
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
-msgstr ""
-"<qt>Типово запрошення відсилаються як долучення в середині листа. Цей параметр "
-"змушує відсилати запрошення в тілі листа; це потрібно для відсилання запрошень "
-"та відповідей на запрошення до програми Microsoft Outlook."
-"<br>При вмиканні цього параметра, листи не будуть містити текст описом, якій "
-"можна прочитати. Тому ті, хто користується поштовими програмами, що не "
-"розуміють запрошення, будуть бачити повідомлення, яке виглядає дуже дивно."
-"<br>А ті, хто використовує поштові програми, що розуміють запрошення, зможуть "
-"працювати з вашими запрошеннями.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
+msgstr ""
+"<qt>Типово запрошення відсилаються як долучення в середині листа. Цей "
+"параметр змушує відсилати запрошення в тілі листа; це потрібно для "
+"відсилання запрошень та відповідей на запрошення до програми Microsoft "
+"Outlook.<br>При вмиканні цього параметра, листи не будуть містити текст "
+"описом, якій можна прочитати. Тому ті, хто користується поштовими "
+"програмами, що не розуміють запрошення, будуть бачити повідомлення, яке "
+"виглядає дуже дивно.<br>А ті, хто використовує поштові програми, що "
+"розуміють запрошення, зможуть працювати з вашими запрошеннями.</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -3063,7 +3034,8 @@ msgstr "Опис"
 #: configuredialog_p.cpp:302
 msgid "&Select a profile and click 'OK' to load its settings:"
 msgstr ""
-"&Виберіть профіль і натисніть \"Застосувати\", щоб завантажити його параметри:"
+"&Виберіть профіль і натисніть \"Застосувати\", щоб завантажити його "
+"параметри:"
 
 #: configuredialog_p.cpp:342
 msgid ""
@@ -3103,31 +3075,28 @@ msgstr "Пересилання"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тут можна додавати, редагувати та видаляти власні шаблони повідомлень, які "
-"використовуються при створенні, відповіді та пересиланні повідомлень. Створення "
-"повідомлення за власним шаблоном відбувається шляхом вибору назви шаблону у "
-"контекстному меню або звичайному меню. Також, можна прив'язати комбінацію "
-"клавіш до шаблону для більш швидкого його виклику.</p>"
-"<p>В шаблони повідомлень можна вставляти команди для підстановки тексту, це "
-"робиться шляхом введення цих команд вручну або вибору команди через кнопку <i>"
-"Вставити команду</i>.</p>"
-"<p>Існує чотири типи шаблонів, які вживаються для <i>відповіді</i>, <i>"
-"відповіді всім</i>, <i>пересилання</i> та <i>універсальний шаблон</i>"
-", яким можна користуватися для будь якої дії. До універсальних шаблонів не "
-"можна прив'язати комбінації клавіш.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>Тут можна додавати, редагувати та видаляти власні шаблони "
+"повідомлень, які використовуються при створенні, відповіді та пересиланні "
+"повідомлень. Створення повідомлення за власним шаблоном відбувається шляхом "
+"вибору назви шаблону у контекстному меню або звичайному меню. Також, можна "
+"прив'язати комбінацію клавіш до шаблону для більш швидкого його виклику.</"
+"p><p>В шаблони повідомлень можна вставляти команди для підстановки тексту, "
+"це робиться шляхом введення цих команд вручну або вибору команди через "
+"кнопку <i>Вставити команду</i>.</p><p>Існує чотири типи шаблонів, які "
+"вживаються для <i>відповіді</i>, <i>відповіді всім</i>, <i>пересилання</i> "
+"та <i>універсальний шаблон</i>, яким можна користуватися для будь якої дії. "
+"До універсальних шаблонів не можна прив'язати комбінації клавіш.</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -3144,15 +3113,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3170,8 +3139,8 @@ msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
-"Вказане скорочення вже задіяно для іншого шаблону, чи ви все ще хочете залишити "
-"це скорочення?"
+"Вказане скорочення вже задіяно для іншого шаблону, чи ви все ще хочете "
+"залишити це скорочення?"
 
 #: customtemplates.cpp:438
 msgid ""
@@ -3202,8 +3171,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"У списку немає жодного адресата. Спочатку виберіть адресатів, а потім спробуйте "
-"знову."
+"У списку немає жодного адресата. Спочатку виберіть адресатів, а потім "
+"спробуйте знову."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3227,8 +3196,8 @@ msgstr "Редагувати з:"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3485,6 +3454,11 @@ msgstr "Виберіть фільтри"
 msgid "Filters"
 msgstr "Фільтри"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Вибрати увесь текст"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3514,11 +3488,11 @@ msgstr "Вести &журнал діяльності фільтру"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
-"Тут можна вмикати чи вимикати ведення журналу діяльності фільтру. Звісно, дані "
-"в журнал будуть збиратися та відображатися тільки, якщо ведення журналу "
+"Тут можна вмикати чи вимикати ведення журналу діяльності фільтру. Звісно, "
+"дані в журнал будуть збиратися та відображатися тільки, якщо ведення журналу "
 "ввімкнено."
 
 #: filterlogdlg.cpp:83
@@ -3535,16 +3509,17 @@ msgstr "Заносити оцінювання &правил фільтру"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Можна контролювати, як були оцінені правила застосованих фільтрів, за допомогою "
-"журналу. Якщо ввімкнено цей параметр, то в журнал буде заноситися детальна "
-"інформація про кожне окреме правило фільтру. Інакше, для кожного окремого "
-"фільтру буде надано тільки результат оцінки всіх правил, з яких складається цей "
-"фільтр."
+"Можна контролювати, як були оцінені правила застосованих фільтрів, за "
+"допомогою журналу. Якщо ввімкнено цей параметр, то в журнал буде заноситися "
+"детальна інформація про кожне окреме правило фільтру. Інакше, для кожного "
+"окремого фільтру буде надано тільки результат оцінки всіх правил, з яких "
+"складається цей фільтр."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3564,13 +3539,13 @@ msgstr "без обмежень"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"Ведення журналу забирає пам'ять для тимчасового збереження даних журналу. Тут "
-"можна обмежити максимальну кількість пам'яті, що використовується на ці "
+"Ведення журналу забирає пам'ять для тимчасового збереження даних журналу. "
+"Тут можна обмежити максимальну кількість пам'яті, що використовується на ці "
 "потреби. Якщо розмір накопичених даних перевищить вказане обмеження, то "
 "найбільш старі дані будуть викидатися поки розмір даних не буде перевищувати "
 "обмеження."
@@ -3583,7 +3558,7 @@ msgstr ""
 "Не вдається записати у файл %1.\n"
 "Детальний звіт про помилку \"%2\"."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Помилка Kmail"
@@ -3624,13 +3599,14 @@ msgstr "&Ідентифікатор користувача:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"Ідентифікатор користувача - це логін користувача на сервері IMAP. Він може бути "
-"іменем користувача або повною адресою електронної пошти користувача. Логін для "
-"вашого рахунку на сервері повинен вказати, що потрібно використовувати."
+"Ідентифікатор користувача - це логін користувача на сервері IMAP. Він може "
+"бути іменем користувача або повною адресою електронної пошти користувача. "
+"Логін для вашого рахунку на сервері повинен вказати, що потрібно "
+"використовувати."
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3681,8 +3657,8 @@ msgstr "У вас немає прав для читання/запису в фа
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 "Інформацію все же не отримано з сервера, будь ласка скористайтеся командою "
 "\"Перевірити пошту\"."
@@ -3695,8 +3671,7 @@ msgstr "Помилка: для цієї теки не визначено рах�
 msgid "Connecting to server %1, please wait..."
 msgstr "Зачекайте, триває з'єднання з сервером %1..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Помилка при з'єднанні з сервером %1"
@@ -3724,11 +3699,11 @@ msgstr "Додавання дозволів"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
-"Ви дійсно бажаєте видалити власні дозволи для цієї теки? Після цього ви більше "
-"не зможете отримати доступ до неї."
+"Ви дійсно бажаєте видалити власні дозволи для цієї теки? Після цього ви "
+"більше не зможете отримати доступ до неї."
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
 msgid "This account does not have support for quota information."
@@ -3759,7 +3734,7 @@ msgstr "Вжиток:"
 msgid "Select Folder"
 msgstr "Виберіть теку"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Локальні теки"
@@ -3783,9 +3758,9 @@ msgstr "Виберіть скорочення для теки"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 "<qt>Натисніть кнопку розташовану нижче та вкажіть клавішу або комбінацію "
 "клавіш, яку ви бажаєте асоціювати с цією текою. Натискання цієї клавіші чи "
@@ -3809,13 +3784,22 @@ msgstr "&Скасувати"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
-"<qt>Тека, яку було видалено, була текою для доставки листів з рахунку <b>%1</b>"
-". Тепер, текою для доставки листів цього рахунку буде головна тека "
-"\"вхідні\".</qt>"
+"<qt>Тека, яку було видалено, була текою для доставки листів з рахунку <b>%1</"
+"b>. Тепер, текою для доставки листів цього рахунку буде головна тека \"вхідні"
+"\".</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>Всього: %2<br>Непрочитано: %3<br>Розмір: %4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>Квота: %1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3939,80 +3923,18 @@ msgstr "Стан спаму: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>П"
-"<br>о"
-"<br>в"
-"<br>і"
-"<br>д"
-"<br>о"
-"<br>м"
-"<br>л"
-"<br>е"
-"<br>н"
-"<br>н"
-"<br>я</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<qt><b><br>H<br>T<br>M<br>L<br> "
+"<br>П<br>о<br>в<br>і<br>д<br>о<br>м<br>л<br>е<br>н<br>н<br>я</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt>"
-"<br>Т"
-"<br>е"
-"<br>к"
-"<br>с"
-"<br>т"
-"<br>о"
-"<br>в"
-"<br>е"
-"<br> "
-"<br>П"
-"<br>о"
-"<br>в"
-"<br>і"
-"<br>д"
-"<br>о"
-"<br>м"
-"<br>л"
-"<br>е"
-"<br>н"
-"<br>н"
-"<br>я</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><br>Т<br>е<br>к<br>с<br>т<br>о<br>в<br>е<br> "
+"<br>П<br>о<br>в<br>і<br>д<br>о<br>м<br>л<br>е<br>н<br>н<br>я</qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -4024,19 +3946,14 @@ msgstr "&Ваше ім'я:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Ваше ім'я</h3>"
-"<p>У це поле потрібно ввести ваше ім'я. Рядок, що введено тут, буде "
-"використовуватись у заголовках відісланих вами листів.</p>"
-"<p>Якщо залишити пустим, то заголовок буде містити тільки адресу електронної "
-"пошти.</p></qt>"
+"<qt><h3>Ваше ім'я</h3><p>У це поле потрібно ввести ваше ім'я. Рядок, що "
+"введено тут, буде використовуватись у заголовках відісланих вами листів.</"
+"p><p>Якщо залишити пустим, то заголовок буде містити тільки адресу "
+"електронної пошти.</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -4044,18 +3961,14 @@ msgstr "&Організація:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Організація</h3>"
-"<p>У це поле потрібно ввести назву вашої організації. Рядок, що введено тут, "
-"буде використовуватись у заголовках відісланих вами листів.</p>"
-"<p>Нічого поганого не станеться (та за звичай це типова ситуація), якщо "
-"залишити це поле пустим.</p></qt>"
+"<qt><h3>Організація</h3><p>У це поле потрібно ввести назву вашої "
+"організації. Рядок, що введено тут, буде використовуватись у заголовках "
+"відісланих вами листів.</p><p>Нічого поганого не станеться (та за звичай це "
+"типова ситуація), якщо залишити це поле пустим.</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -4064,20 +3977,15 @@ msgstr "&Адреса пошти:"
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>Адреса пошти</h3>"
-"<p>У це поле потрібно ввести повну адресу електронної пошти.</p>"
-"<p>Якщо залишити це поле пустим або ввести неправильне значення, то у інших "
-"будуть проблеми при відповіді на ваші листи.</p></qt>"
+"<qt><h3>Адреса пошти</h3><p>У це поле потрібно ввести повну адресу "
+"електронної пошти.</p><p>Якщо залишити це поле пустим або ввести неправильне "
+"значення, то у інших будуть проблеми при відповіді на ваші листи.</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -4086,21 +3994,12 @@ msgstr "&Адреса пошти:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4120,26 +4019,23 @@ msgstr "Ваш ключ OpenPGP для підписів"
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
-"Виберіть ключ OpenPGP, який буде використовуватись для цифрового підписування "
-"ваших повідомлень."
+"Виберіть ключ OpenPGP, який буде використовуватись для цифрового "
+"підписування ваших повідомлень."
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ключ OpenPGP, який ви виберете тут, буде вживатись для цифрового "
-"підписування повідомлень. Тут, також, можна вказувати ключі GnuPG.</p>"
-"<p>Ви можете залишити значення цього параметра порожнім, але тоді KMail не "
-"зможе робити цифровий підпис для повідомлень; це не впливає на всі інші функції "
-"зі створення листів.</p>"
-"<p>Більш докладно про ключі можна прочитати на <a>http://www.gnupg.org</a></p>"
-"</qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
+"<qt><p>Ключ OpenPGP, який ви виберете тут, буде вживатись для цифрового "
+"підписування повідомлень. Тут, також, можна вказувати ключі GnuPG.</p><p>Ви "
+"можете залишити значення цього параметра порожнім, але тоді KMail не зможе "
+"робити цифровий підпис для повідомлень; це не впливає на всі інші функції зі "
+"створення листів.</p><p>Більш докладно про ключі можна прочитати на "
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -4151,32 +4047,28 @@ msgstr "Ваш ключ OpenPGP для шифрування"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
-"Виберіть ключ OpenPGP, який буде використовуватись для шифрування повідомлень "
-"для себе та у команді редактора \"Долучити мій відкритий ключ\"."
+"Виберіть ключ OpenPGP, який буде використовуватись для шифрування "
+"повідомлень для себе та у команді редактора \"Долучити мій відкритий ключ\"."
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
-msgstr ""
-"<qt>"
-"<p>Ключ OpenPGP, який ви виберете тут, буде вживатись для шифрування "
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
+msgstr ""
+"<qt><p>Ключ OpenPGP, який ви виберете тут, буде вживатись для шифрування "
 "повідомлень для себе та у команді редактора \"Долучити мій відкритий ключ\". "
-"Тут, також, можна вказувати ключі GnuPG.</p>"
-"<p>Ви можете залишити значення цього параметра порожнім, але тоді KMail не "
-"зможе шифрувати копії відісланих повідомлень для вас використовуючи OpenPGP; це "
-"не впливає на всі інші функції зі створення листів.</p>"
-"<p>Більш докладно про ключі можна прочитати на <a>http://www.gnupg.org</a></p>"
-"</qt>"
+"Тут, також, можна вказувати ключі GnuPG.</p><p>Ви можете залишити значення "
+"цього параметра порожнім, але тоді KMail не зможе шифрувати копії відісланих "
+"повідомлень для вас використовуючи OpenPGP; це не впливає на всі інші "
+"функції зі створення листів.</p><p>Більш докладно про ключі можна прочитати "
+"на <a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -4191,23 +4083,20 @@ msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr ""
-"Виберіть S/MIME сертифікат, який буде використовуватись для підписування ваших "
-"повідомлень."
+"Виберіть S/MIME сертифікат, який буде використовуватись для підписування "
+"ваших повідомлень."
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>S/MIME (X.509) сертифікат, який ви виберете тут, буде вживатись для "
-"цифрового підписування повідомлень.</p>"
-"<p>Ви можете залишити значення цього параметра порожнім, але тоді KMail не "
-"зможе робити цифровий підпис для повідомлень; це не впливає на всі інші функції "
-"зі створення листів.</p></qt>"
+"<qt><p>S/MIME (X.509) сертифікат, який ви виберете тут, буде вживатись для "
+"цифрового підписування повідомлень.</p><p>Ви можете залишити значення цього "
+"параметра порожнім, але тоді KMail не зможе робити цифровий підпис для "
+"повідомлень; це не впливає на всі інші функції зі створення листів.</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -4219,27 +4108,26 @@ msgstr "Ваш S/MIME сертифікат для шифрування"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 "Виберіть S/MIME сертифікат який потрібно використовувати для шифрування "
 "повідомлень до себе та у команді редактора \"Долучити мій сертифікат\". "
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Сертифікат S/MIME, який ви виберете тут, буде вживатись для шифрування "
-"повідомлень для себе та у команді редактора \"Долучити мій сертифікат\".</p>"
-"<p>Ви можете залишити значення цього параметра порожнім, але тоді KMail не "
-"зможе шифрувати копії відісланих повідомлень для вас використовуючи OpenPGP; це "
-"не впливає на всі інші функції зі створення листів.</p></qt>"
+"<qt><p>Сертифікат S/MIME, який ви виберете тут, буде вживатись для "
+"шифрування повідомлень для себе та у команді редактора \"Долучити мій "
+"сертифікат\".</p><p>Ви можете залишити значення цього параметра порожнім, "
+"але тоді KMail не зможе шифрувати копії відісланих повідомлень для вас "
+"використовуючи OpenPGP; це не впливає на всі інші функції зі створення "
+"листів.</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -4259,24 +4147,20 @@ msgstr "Зво&ротна адреса:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Зворотна адреса</h3>"
-"<p>Дозволяє встановити заголовок <tt>Reply-to:</tt> у значення відмінне від "
-"вашої адреси електронної пошти, що вказана у заголовку <tt>From:</tt>.</p>"
-"<p>Це зручно коли є декілька людей, що виконують одну ї ту же роботу. "
-"Наприклад, ви можете бажати, щоб всі листи відіслані вами містили ваше ім'я та "
-"вашу адресу в заголовку <tt>From:</tt>, але всі відповіді на них надходили до "
-"адреси групи.</p>"
-"<p>Якщо не знаєте, що тут ввести, то залиште це поле пустим.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Зворотна адреса</h3><p>Дозволяє встановити заголовок <tt>Reply-to:</"
+"tt> у значення відмінне від вашої адреси електронної пошти, що вказана у "
+"заголовку <tt>From:</tt>.</p><p>Це зручно коли є декілька людей, що "
+"виконують одну ї ту же роботу. Наприклад, ви можете бажати, щоб всі листи "
+"відіслані вами містили ваше ім'я та вашу адресу в заголовку <tt>From:</tt>, "
+"але всі відповіді на них надходили до адреси групи.</p><p>Якщо не знаєте, що "
+"тут ввести, то залиште це поле пустим.</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -4284,25 +4168,20 @@ msgstr "&Потайні адреси:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>Потайні адреси (BCC)</h3>"
-"<p>Кожний відісланий лист для цього профілю буде, також, надіслано до адрес, "
-"які вказано тут. Ці адреси не будуть видимі іншим адресатам.</p>"
-"<p>Цей параметр часто використовується для того, щоб відсилати копію кожного "
-"відісланого повідомлення самому собі на іншу поштову скриньку.</p> "
-"<p>Введіть адреси розділені комами, якщо потрібно ввести декілька адрес "
-"отримувачів потайних копій.</p>"
-"<p>Якщо не знаєте, що тут ввести, то залиште це поле пустим.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>Потайні адреси (BCC)</h3><p>Кожний відісланий лист для цього профілю "
+"буде, також, надіслано до адрес, які вказано тут. Ці адреси не будуть видимі "
+"іншим адресатам.</p><p>Цей параметр часто використовується для того, щоб "
+"відсилати копію кожного відісланого повідомлення самому собі на іншу поштову "
+"скриньку.</p> <p>Введіть адреси розділені комами, якщо потрібно ввести "
+"декілька адрес отримувачів потайних копій.</p><p>Якщо не знаєте, що тут "
+"ввести, то залиште це поле пустим.</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4340,7 +4219,7 @@ msgstr "Підп&ис"
 msgid "&Picture"
 msgstr "&Малюнок"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Неправильна адреса електронної пошти"
 
@@ -4357,19 +4236,19 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 "Один з налаштованих OpenPGP ключів для підпису не містить жодного "
-"ідентифікатора користувача, який би містив адресу електронної пошти для цього "
-"профілю (%1).\n"
+"ідентифікатора користувача, який би містив адресу електронної пошти для "
+"цього профілю (%1).\n"
 "Така конфігурація призведе до того, що отримувачі повідомлень будуть бачити "
 "попередження при спробі перевірити зроблені підписи."
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 "Один з налаштованих OpenPGP ключів для шифрування не містить жодного "
-"ідентифікатора користувача, який би містив адресу електронної пошти для цього "
-"профілю (%1)."
+"ідентифікатора користувача, який би містив адресу електронної пошти для "
+"цього профілю (%1)."
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4408,8 +4287,8 @@ msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
-"Власна тека відісланих повідомлень для профілю \"%1\" (більше) не існує. Тому "
-"буде використана типова тека для відісланих повідомлень."
+"Власна тека відісланих повідомлень для профілю \"%1\" (більше) не існує. "
+"Тому буде використана типова тека для відісланих повідомлень."
 
 #: identitydialog.cpp:651
 msgid ""
@@ -4429,8 +4308,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Типовий)"
 
@@ -4479,19 +4358,19 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 "Конфігурацію було автоматично перенесено, але вам потрібно перевірити "
 "налаштування вашого рахунка."
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
-"Не вдалося автоматично мігрувати вашу конфігурацію, тому перевірте налаштування "
-"вашого рахунка."
+"Не вдалося автоматично мігрувати вашу конфігурацію, тому перевірте "
+"налаштування вашого рахунка."
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
@@ -4507,8 +4386,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Не вдається вивантажити повідомлення змінене %1, з теки %2 яке має тему %3 на "
-"сервер."
+"Не вдається вивантажити повідомлення змінене %1, з теки %2 яке має тему %3 "
+"на сервер."
 
 #: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
@@ -4529,14 +4408,19 @@ msgstr "Тека дуже близько до вичерпання квоти. (
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Помилка: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 "З'єднання з сервером %1 було несподівано закрито або вийшов час очікування. "
 "Якщо можливо, його буде автоматично відновлено."
@@ -4689,14 +4573,14 @@ msgstr "Архіви списку розсилки"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4725,277 +4609,212 @@ msgstr "Непридатні ключі для шифрування"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>OpenPGP ключ </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>застаріє "
+"менше ніж через %n день.</p>\n"
+"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>застаріє "
+"менше ніж через %n дні.</p>\n"
+"<p>OpenPGP ключ </p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>застаріє "
+"менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для підписування</p><p align=center><b>%1</b> (серійний номер "
+"%2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для підписування</p><p align=center><b>%1</b> (серійний номер "
+"%2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для підписування</p><p align=center><b>%1</b> (серійний номер "
+"%2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для шифрування</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для шифрування</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для шифрування</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
+msgstr ""
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката</p><p align=center><b>%1</b> (серійний номер %2)</p><p>застаріє "
+"менше ніж через %n день.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката</p><p align=center><b>%1</b> (серійний номер %2)</p><p>застаріє "
+"менше ніж через %n дні.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката</p><p align=center><b>%1</b> (серійний номер %2)</p><p>застаріє "
+"менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>"
+"%1</b> (серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>"
+"%1</b> (серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>"
+"%1</b> (серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</"
+"b> (серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</"
+"b> (серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</"
+"b> (серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
-msgstr ""
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
+msgstr ""
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> (серійний "
+"номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> (серійний "
+"номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> (серійний "
+"номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ваш S/MIME сертифікат для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
 "<p>Ваш S/MIME сертифікат для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
 "<p>Ваш S/MIME сертифікат для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 "<p>Ваш S/MIME сертифікат для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
 "<p>Ваш S/MIME сертифікат для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
 "<p>Ваш S/MIME сертифікат для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -5009,266 +4828,201 @@ msgstr "S/MIME сертифікат скоро застаріє"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Ваш OpenPGP ключ для підписування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> "
-"(KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Ваш OpenPGP ключ для шифрування </p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>OpenPGP ключ </p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>застаріє "
+"менше ніж через %n день.</p>\n"
+"<p>OpenPGP ключ</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>застаріє "
+"менше ніж через %n дні.</p>\n"
+"<p>OpenPGP ключ </p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>застаріє "
+"менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для підписування</p><p align=center><b>%1</b> (серійний номер "
+"%2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для підписування</p><p align=center><b>%1</b> (серійний номер "
+"%2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для підписування</p><p align=center><b>%1</b> (серійний номер "
+"%2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для шифрування</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для шифрування</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката для шифрування</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
+msgstr ""
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката</p><p align=center><b>%1</b> (серійний номер %2)</p><p>застаріє "
+"менше ніж через %n день.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката</p><p align=center><b>%1</b> (серійний номер %2)</p><p>застаріє "
+"менше ніж через %n дні.</p>\n"
+"<p>Кореневий сертифікат</p><p align=center><b>%3</b></p><p>Вашого S/MIME "
+"сертифіката</p><p align=center><b>%1</b> (серійний номер %2)</p><p>застаріє "
+"менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>"
+"%1</b> (серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>"
+"%1</b> (серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для підписування</p><p align=center><b>"
+"%1</b> (серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</"
+"b> (серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</"
+"b> (серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката для шифрування</p><p align=center><b>%1</"
+"b> (серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</b>"
-"</p>"
-"<p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> (серійний "
+"номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> (серійний "
+"номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Проміжний сертифікат гаранта сертифікації (CA)</p><p align=center><b>%3</"
+"b></p><p>Вашого S/MIME сертифіката</p><p align=center><b>%1</b> (серійний "
+"номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ваш S/MIME сертифікат для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
 "<p>Ваш S/MIME сертифікат для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
 "<p>Ваш S/MIME сертифікат для підписування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 "<p>Ваш S/MIME сертифікат для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n день.</p>\n"
 "<p>Ваш S/MIME сертифікат для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n дні.</p>\n"
 "<p>Ваш S/MIME сертифікат для шифрування</p><p align=center><b>%1</b> "
-"(серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"(серійний номер %2)</p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
-msgstr ""
-"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n день.</p>\n"
-"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n дні.</p>\n"
-"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</p>"
-"<p>застаріє менше ніж через %n днів.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
+msgstr ""
+"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n день.</p>\n"
+"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n дні.</p>\n"
+"<p>Ваш S/MIME сертифікат</p><p align=center><b>%1</b> (серійний номер %2)</"
+"p><p>застаріє менше ніж через %n днів.</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -5280,18 +5034,19 @@ msgstr "S/MIME сертифікат скоро застаріє"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
 "Один або більше з налаштованих OpenPGP ключів для шифрування чи S/MIME "
-"сертифікатів не придатні для шифрування. Будь ласка, налаштуйте ваші ключі для "
-"шифрування та сертифікати для цього профілю у діалоговому вікні для "
+"сертифікатів не придатні для шифрування. Будь ласка, налаштуйте ваші ключі "
+"для шифрування та сертифікати для цього профілю у діалоговому вікні для "
 "налаштування профілів.\n"
-"Якщо ви оберете продовжити, а ключі знадобляться пізніше, вас запитають вказати "
-"ключі, які потрібно буде вжити."
+"Якщо ви оберете продовжити, а ключі знадобляться пізніше, вас запитають "
+"вказати ключі, які потрібно буде вжити."
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
@@ -5309,8 +5064,8 @@ msgstr ""
 "сертифікатів не придатні для підписування. Будь ласка, налаштуйте ваші ключі "
 "для шифрування та сертифікати для цього профілю у діалоговому вікні для "
 "налаштування профілів.\n"
-"Якщо ви оберете продовжити, а ключі знадобляться пізніше, вас запитають вказати "
-"ключі, які потрібно буде вжити."
+"Якщо ви оберете продовжити, а ключі знадобляться пізніше, вас запитають "
+"вказати ключі, які потрібно буде вжити."
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
@@ -5320,39 +5075,39 @@ msgstr "Непридатні ключі для підписування"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "В результаті дослідження вподобань з шифрування повідомлень для адресатів "
-"виявлено, що повідомлення потрібно зашифрувати за допомогою OpenPGP (принаймні "
-"для декількох адресатів).\n"
+"виявлено, що повідомлення потрібно зашифрувати за допомогою OpenPGP "
+"(принаймні для декількох адресатів).\n"
 "Але для цього профілю ви не налаштували правильних OpenPGP ключів, що мають "
 "довіру.\n"
-"Можна продовжити не зашифрував повідомлення для себе; якщо це зробити, то ви не "
-"зможете прочитати власні зашифровані повідомлення."
+"Можна продовжити не зашифрував повідомлення для себе; якщо це зробити, то ви "
+"не зможете прочитати власні зашифровані повідомлення."
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "В результаті дослідження вподобань з шифрування повідомлень для адресатів "
-"виявлено, що повідомлення потрібно зашифрувати за допомогою S/MIME (принаймні "
-"для декількох адресатів).\n"
+"виявлено, що повідомлення потрібно зашифрувати за допомогою S/MIME "
+"(принаймні для декількох адресатів).\n"
 "Але для цього профілю ви не налаштували правильних сертифікатів S/MIME.\n"
-"Можна продовжити не зашифрувавши повідомлення для себе; якщо це зробити, то ви "
-"не зможете прочитати власні зашифровані повідомлення."
+"Можна продовжити не зашифрувавши повідомлення для себе; якщо це зробити, то "
+"ви не зможете прочитати власні зашифровані повідомлення."
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -5368,14 +5123,14 @@ msgstr "Не робити OpenPGP підписування"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
 "В результаті дослідження вподобань з підписування повідомлень для адресатів "
-"виявлено, що повідомлення потрібно підписати за допомогою S/MIME (принаймні для "
-"декількох адресатів).\n"
+"виявлено, що повідомлення потрібно підписати за допомогою S/MIME (принаймні "
+"для декількох адресатів).\n"
 "Але для цього профілю ви не налаштували правильних сертифікатів S/MIME для "
 "підписування."
 
@@ -5400,8 +5155,8 @@ msgstr "Неможливо підписати"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 "Ви не вибрали ключ для шифрування для себе. Це не дозволить вам розшифрувати "
 "ваше власне повідомлення, якщо ви не зашифруєте його."
@@ -5425,8 +5180,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Ви не вибрати ключ шифрування для жодного з адресатів, тому повідомлення не "
 "буде зашифроване."
@@ -5473,11 +5228,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "Немає дійсних ключів шифрування, які б мали довіру, для \"%1\".\n"
 "\n"
@@ -5526,10 +5281,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "Критична помилка: не вдається зібрати пошту: "
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"Помилка додавання повідомлення:\n"
+msgid "Failed to add message:\n"
+msgstr "Помилка додавання повідомлення:\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5621,6 +5374,52 @@ msgstr "&Автономний IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Скринька maildir"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Встановити тему повідомлення"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "Відіслати копію до вказаної адреси"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "Відіслати потайну копію до вказаної адреси"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Додати вказаний заголовок до повідомлення"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Зчитати тіло повідомлення з вказаного файла"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "Встановити тіло повідомлення"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Додати долучення до листа. Можна вказати декілька раз"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Тільки перевірити на нову пошту"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Тільки відкрити вікно редактора"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "Переглянути вказаний файл з повідомленням"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+"Відіслати повідомлення на \"address\" або долучити\n"
+"файл на який вказує \"URL\""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Пошта"
@@ -5664,8 +5463,8 @@ msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
-"Зараз KMail створить потрібні теки групової роботи, як підтеки до %1. Якщо ви "
-"цього не бажаєте робити, то скасуйте, і ресурси IMAP буде вимкнено"
+"Зараз KMail створить потрібні теки групової роботи, як підтеки до %1. Якщо "
+"ви цього не бажаєте робити, то скасуйте, і ресурси IMAP буде вимкнено"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5678,13 +5477,13 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 "<qt>KMail знайшла наступні теки групової роботи в %1 і потребує виконати "
-"наступні дії: %2"
-"<br>Якщо ви цього не бажаєте робити, то скасуйте, і ресурси IMAP буде вимкнено"
+"наступні дії: %2<br>Якщо ви цього не бажаєте робити, то скасуйте, і ресурси "
+"IMAP буде вимкнено"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5733,11 +5532,11 @@ msgstr "URL скопійовано до кишені."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Файл <b>%1</b> існує.<br>Хочете його перезаписати?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Зберегти у файл"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Замінити"
 
@@ -5755,7 +5554,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "Повідомлення було вилучене під час збереження. Його не збережено."
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5775,11 +5574,11 @@ msgstr "Файл не містить повідомлення."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Файл містить декілька повідомлень. Показано тільки перше повідомлення."
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5788,113 +5587,113 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "Фільтрування повідомлень"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "Фільтрування повідомлення %1 з %2"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Не достатньо вільного місця на диску?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Пересунути в цю теку"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Скопіювати в цю теку"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 "Виявлено пошкоджений кеш IMAP у теці %1. Копіювання повідомлено перервано."
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Пересування повідомлень"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Видалення повідомлень"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Відкриття адреси..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ви дійсно хочете запустити <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Виконати"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Не знайдено долучень для збереження."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Зберегти долучення до"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "долучення1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "долучення%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "Файл з назвою %1 вже існує. Хочете його перезаписати?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Файл вже існує"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Перезаписати"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 "Частину %1 повідомлення зашифровано. Зберегти шифрування при збереженні?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "Питання KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "Зашифрувати"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Не шифрувати"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "Частину %1 повідомлення підписано. Зберегти підпис при збереженні?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Підписати"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5903,22 +5702,22 @@ msgstr ""
 "Не вдається записати в файл %1:\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "Не вдається записати в файл %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 "В адресній книзі немає запису для цих адрес електронної пошти. Додайте їх до "
 "адресної книги, та додайте адреси миттєвого зв'язку за допомогою відповідної "
 "програми."
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5928,51 +5727,51 @@ msgstr ""
 " %1\n"
 " невідомо як визначити з ким почати розмову."
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 "Рушій Chiasmus не надає функцію \"x-obtain-keys\". Будь ласка, повідомте "
 "розробників про цю помилку."
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Помилка рушія Chiasmus"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 "Рушій Chiasmus повернув неочікуване значення: Функція \"x-obtain-keys\" не "
 "повернула список рядків. Будь ласка, повідомте розробників про цю помилку."
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 "Ключі не знайдено. Будь ласка, перевірте чи вказано чинний шлях до ключів у "
 "конфігурації Chiasmus."
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Вибір ключа розшифровування Chiasmus"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Рушій Chiasmus не надає функцію \"x-decrypt\". Будь ласка, повідомте "
 "розробників про цю помилку."
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
@@ -5980,19 +5779,19 @@ msgstr ""
 "Функція \"x-decrypt\" не приймає очікувані параметри. Будь ласка, повідомте "
 "розробників про цю помилку."
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Помилка розшифровування Chiasmus"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Рушій Chiasmus повернув неочікуване значення: Функція \"x-decrypt\" не "
 "повернула масив байтів. Будь ласка, повідомте розробників про цю помилку."
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -6002,7 +5801,7 @@ msgstr ""
 "Кому: %2\n"
 "Тема: %3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "Пошта: %1"
@@ -6101,7 +5900,7 @@ msgstr "Розмір"
 msgid "Encoding"
 msgstr "Кодування"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Стиснути"
 
@@ -6113,7 +5912,7 @@ msgstr "Зашифрувати"
 msgid "Sign"
 msgstr "Підписати"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Назва долучення:"
 
@@ -6135,7 +5934,8 @@ msgstr "Основні адресати"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 "<qt>На адресу електронної пошти, яку ви вкажете у цьому полі, надійде копія "
 "повідомлення.</qt>"
@@ -6147,13 +5947,13 @@ msgstr "Додаткові адресати"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 "<qt>На адресу електронної пошти, яку ви вкажете у цьому полі, надійде копія "
-"повідомлення. Технічно це теж саме, що вказування адреси у полі <b>До:</b>"
-", але це вказує на те, що адресат отримав \"копію зроблену під копірку\" та є "
+"повідомлення. Технічно це теж саме, що вказування адреси у полі <b>До:</b>, "
+"але це вказує на те, що адресат отримав \"копію зроблену під копірку\" та є "
 "переглядачем, я не основним адресатом повідомлення.</qt>"
 
 #: kmcomposewin.cpp:1067
@@ -6162,12 +5962,11 @@ msgstr "Приховані адресати"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
-"<qt>Теж саме, що <b>Копія:</b>, але відрізняється тим, що всі інші адресати не "
-"побачать, хто отримав приховану копію.</qt>"
+"<qt>Теж саме, що <b>Копія:</b>, але відрізняється тим, що всі інші адресати "
+"не побачать, хто отримав приховану копію.</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -6177,7 +5976,7 @@ msgstr "&Відіслати пошту"
 msgid "&Send Mail Via"
 msgstr "&Відіслати пошту через"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Відіслати &пізніше"
@@ -6242,8 +6041,7 @@ msgstr "&Видалити символи цитати"
 msgid "Cl&ean Spaces"
 msgstr "Оч&истити пропуски"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Вживати &моноширинний шрифт"
@@ -6384,31 +6182,31 @@ msgstr "&Формат криптографічного повідомлення"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Стандартний"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "Список з пунктами (диски)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "Список з пунктами (кола)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "Список з пунктами (квадрати)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "Впорядкований список (числа)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "Впорядкований список (малі букви)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "Впорядкований список (великі букви)"
 
@@ -6515,64 +6313,62 @@ msgstr "Закрити редактор"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
-"Здається, що написане повідомлення посилається на файл з долученням, але ви не "
-"долучили жодного файла.\n"
+"Здається, що написане повідомлення посилається на файл з долученням, але ви "
+"не долучили жодного файла.\n"
 "Бажаєте долучити файл?"
 
 #: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Нагадування про долучення файла"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "Відіслати &як є"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>KMail не може розпізнати розташування долучення (%1).</p>"
-"<p>Вкажіть повний шлях, якщо ви бажаєте долучити файл.</p></qt>"
+"<qt><p>KMail не може розпізнати розташування долучення (%1).</p><p>Вкажіть "
+"повний шлях, якщо ви бажаєте долучити файл.</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
-"<qt>"
-"<p>Ваш адміністратор заборонив долучення файлів більших за %1 МБ.</p>"
+"<qt><p>Ваш адміністратор заборонив долучення файлів більших за %1 МБ.</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Долучити файл"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Долучити"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Вставити файл"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Вставити файл"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
-"<qt>"
-"<p>Виникла помилка при спробі експорту ключа за допомогою допоміжної "
-"програми:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>Виникла помилка при спробі експорту ключа за допомогою допоміжної "
+"програми:</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
@@ -6611,188 +6407,196 @@ msgid ""
 "View"
 msgstr "Переглянути"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Редагувати..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "Редагувати з..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Зберегти &як..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "В&ластивості"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Додати долучення..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "Програма KMail не змогла стиснути файл."
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "Стиснутий файл більше ніж оригінал. Чи залишити оригінал?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Залишити"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "Програма KMail не змогла розтиснути файл."
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Зберегти долучення як"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Додати як текст"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Додати як долучення"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "Вставити як текст чи долучення?"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "без назви"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ви запитали на шифрування повідомлень для себе, але поточний профіль не має "
-"налаштованого (OpenPGP чи S/MIME) ключа для шифрування.</p>"
-"<p>Виберіть, будь ласка, ключ(і) для цієї операції у діалозі налаштування "
+"<qt><p>Ви запитали на шифрування повідомлень для себе, але поточний профіль "
+"не має налаштованого (OpenPGP чи S/MIME) ключа для шифрування.</"
+"p><p>Виберіть, будь ласка, ключ(і) для цієї операції у діалозі налаштування "
 "профілю.</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "Невизначений ключ шифрування"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Щоб мати можливість підписати це повідомлення, спочатку, потрібно вказати "
-"(OpenPGP чи S/MIME) ключ, який потрібно використовувати для цього.</p>"
-"<p>Вкажіть, будь ласка, ключ, який потрібно використовувати для поточного "
+"<qt><p>Щоб мати можливість підписати це повідомлення, спочатку, потрібно "
+"вказати (OpenPGP чи S/MIME) ключ, який потрібно використовувати для цього.</"
+"p><p>Вкажіть, будь ласка, ключ, який потрібно використовувати для поточного "
 "профілю у діалозі налаштування профілів.</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "Ключ для підписування не вказано"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
-"KMail працює в автономному режимі, ваші повідомлення будуть у теці \"вихідні\", "
-"поки ви не з'єднаєтесь з мережею."
+"KMail працює в автономному режимі, ваші повідомлення будуть у теці \"вихідні"
+"\", поки ви не з'єднаєтесь з мережею."
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "В мережі/Поза мережею"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 "Потрібно ввести вашу адресу електронної пошти у поле \"Від:\". Додатково "
-"встановіть вашу адресу електронної пошти для кожного профілю, і вам не потрібно "
-"буде вводити її для кожного повідомлення окремо."
+"встановіть вашу адресу електронної пошти для кожного профілю, і вам не "
+"потрібно буде вводити її для кожного повідомлення окремо."
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
-"Ви повинні вказати щонайменше одного адресата в полях \"Кому\", \"Копія\" або "
-"\"Потайна копія\"."
+"Ви повинні вказати щонайменше одного адресата в полях \"Кому\", \"Копія\" "
+"або \"Потайна копія\"."
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "Ви не вказали адресата. Відіслати повідомлення попри все?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "Не вказано адресата"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Ви не вказали тему повідомлення. Відсилати його попри все?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Не вказано тему"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "Відіслати &як є"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Вказати тему"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Зберегти розмітку, не підписувати чи шифрувати"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "&Зберегти розмітку, не шифрувати"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "&Зберегти розмітку, не підписувати"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Підписати/зашифрувати (розмітку буде втрачено)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "Зашифрувати (розмітку буде втрачено)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "Підписати (розмітку буде втрачено)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Неможливо зробити підпис чи шифрування повідомлення вбудованими у HTML "
-"повідомлення.</p>"
-"<p>Хочете вилучити розмітку?</p></qt>"
+"<qt><p>Неможливо зробити підпис чи шифрування повідомлення вбудованими у "
+"HTML повідомлення.</p><p>Хочете вилучити розмітку?</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "Підписати/зашифрувати повідомлення?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
@@ -6800,73 +6604,74 @@ msgstr ""
 "Власна тека чернеток або шаблонів для профілю \"%1\" (більше) не існує. Тому "
 "буде використана типова тека для чернеток або шаблонів."
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Будь ласка, створіть рахунок для відсилання та спробуйте ще раз."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Збираюся відсилати електронного листа..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Відіслати підтвердження"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Відіслати &зараз"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "Адресатів немає"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Додаткові адресати"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "Правопис: увімкнено"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "Правопис: вимкнено"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Перевірку правопису припинено."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Перевірку правопису зупинено."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Перевірку правопису завершено."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Перевірка правопису"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
-"Будь ласка, спочатку налаштуйте рушій шифрування для використання в Chiasmus.\n"
+"Будь ласка, спочатку налаштуйте рушій шифрування для використання в "
+"Chiasmus.\n"
 "Це можна зробити у вкладці \"Втулки шифрування\" на сторінці налаштування "
 "безпеки."
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6874,32 +6679,32 @@ msgstr ""
 "Схоже, що бібліотека libkleopatra була скомпільована без підтримки Chiasmus. "
 "Мабуть, потрібно перекомпілювати libkleopatra з --enable-chiasmus."
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "Не налаштовано рушій Chiasmus"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "Не знайдено ключів Chiasmus"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Вибір ключів шифрування Chiasmus"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Повідомлення підписане %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "Повідомлення не буде підписане"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "Повідомлення буде зашифровано"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "Повідомлення не буде зашифровано"
 
@@ -6948,11 +6753,11 @@ msgstr "Перевірка правопису - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
-"Неможливо запустити ISpell/Aspell. Будь ласка, перевірте, що ISpell чи Aspell "
-"налаштовано вірно та він знаходиться у PATH."
+"Неможливо запустити ISpell/Aspell. Будь ласка, перевірте, що ISpell чи "
+"Aspell налаштовано вірно та він знаходиться у PATH."
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6985,12 +6790,10 @@ msgstr "<qt>Надто багато дій фільтру в правилі фі
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
-"<qt>Невідома дія фільтру <b>%1</b>"
-"<br>у правилі фільтру <b>%2</b>."
+"<qt>Невідома дія фільтру <b>%1</b><br>у правилі фільтру <b>%2</b>."
 "<br>Пропускаю.</qt>"
 
 #: kmfilteraction.cpp:601
@@ -7211,159 +7014,129 @@ msgstr "Програти звук"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Це список визначених фільтрів. Вони оброблюються зверху вниз.</p>"
-"<p>Клацніть на будь-якому; щоб змінити його, використовуйте віджети на вікні "
-"праворуч.</p></qt>"
+"<qt><p>Це список визначених фільтрів. Вони оброблюються зверху вниз.</"
+"p><p>Клацніть на будь-якому; щоб змінити його, використовуйте віджети на "
+"вікні праворуч.</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку для створення нового фільтру.</p>"
-"<p>Його буде вставлено перед вибраним зараз, але ви завжди можете змінити його "
-"положення пізніше.</p>"
-"<p>Якщо ви натиснули цю кнопку помилково, завжди можна все повернути клацнувши "
-"кнопку <em>Видалити</em>.</p></qt>"
+"<qt><p>Натисніть цю кнопку для створення нового фільтру.</p><p>Його буде "
+"вставлено перед вибраним зараз, але ви завжди можете змінити його положення "
+"пізніше.</p><p>Якщо ви натиснули цю кнопку помилково, завжди можна все "
+"повернути клацнувши кнопку <em>Видалити</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку, щоб зробити копію фільтру.</p>"
-"<p>Якщо ви натиснули цю кнопку помилково, завжди можна все повернути клацнувши "
-"кнопку <em>Видалити</em>.</p></qt>"
+"<qt><p>Натисніть цю кнопку, щоб зробити копію фільтру.</p><p>Якщо ви "
+"натиснули цю кнопку помилково, завжди можна все повернути клацнувши кнопку "
+"<em>Видалити</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку, щоб <em>видалити</em> вибраний фільтр зі списку "
-"вгорі.</p>"
-"<p>Відмінити цю дію неможливо, але ви завжди можете вийти з вікна діалогу "
-"натиснувши <em>Скасувати</em>, щоб відкинути зроблені зміни.</p></qt>"
+"<qt><p>Натисніть цю кнопку, щоб <em>видалити</em> вибраний фільтр зі списку "
+"вгорі.</p><p>Відмінити цю дію неможливо, але ви завжди можете вийти з вікна "
+"діалогу натиснувши <em>Скасувати</em>, щоб відкинути зроблені зміни.</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку, щоб пересунути вибраний фільтр на <em>першу позицію</em> "
-"списку вгорі.</p>"
-"<p>Це корисно тому, що порядок фільтрів визначає порядок їх застосування до "
-"повідомлень: найвищій фільтр спрацьовує першим.</p></qt>"
+"<qt><p>Натисніть цю кнопку, щоб пересунути вибраний фільтр на <em>першу "
+"позицію</em> списку вгорі.</p><p>Це корисно тому, що порядок фільтрів "
+"визначає порядок їх застосування до повідомлень: найвищій фільтр спрацьовує "
+"першим.</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку, щоб пересунути вибраний фільтр <em>вище</em> "
-"на одну позицію у списку в горі.</p>"
-"<p>Це корисно тому, що порядок фільтрів визначає порядок їх застосування до "
-"повідомлень: найвищій фільтр спрацьовує першим.</p>"
-"<p>Якщо ви натиснули цю кнопку випадково, ви можете вернути його назад "
-"клацнувши кнопку <em>нижче</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Натисніть цю кнопку, щоб пересунути вибраний фільтр <em>вище</em> на "
+"одну позицію у списку в горі.</p><p>Це корисно тому, що порядок фільтрів "
+"визначає порядок їх застосування до повідомлень: найвищій фільтр спрацьовує "
+"першим.</p><p>Якщо ви натиснули цю кнопку випадково, ви можете вернути його "
+"назад клацнувши кнопку <em>нижче</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку, щоб пересунути вибраний фільтр <em>нижче</em> "
-"на одну позицію у списку в горі.</p>"
-"<p>Це корисно тому, що порядок фільтрів визначає порядок їх застосування до "
-"повідомлень: найвищій фільтр спрацьовує першим.</p>"
-"<p>Якщо ви натиснули цю кнопку випадково, ви можете вернути його назад "
-"клацнувши кнопку <em>вище</em>.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
+msgstr ""
+"<qt><p>Натисніть цю кнопку, щоб пересунути вибраний фільтр <em>нижче</em> на "
+"одну позицію у списку в горі.</p><p>Це корисно тому, що порядок фільтрів "
+"визначає порядок їх застосування до повідомлень: найвищій фільтр спрацьовує "
+"першим.</p><p>Якщо ви натиснули цю кнопку випадково, ви можете вернути його "
+"назад клацнувши кнопку <em>вище</em>.</p></qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку, щоб пересунути вибраний фільтр на<em>"
-"останню позицію</em> списку вгорі.</p>"
-"<p>Це корисно тому, що порядок фільтрів визначає порядок їх застосування до "
-"повідомлень: найвищій фільтр спрацьовує першим.</p></qt>"
+"<qt><p>Натисніть цю кнопку, щоб пересунути вибраний фільтр на<em>останню "
+"позицію</em> списку вгорі.</p><p>Це корисно тому, що порядок фільтрів "
+"визначає порядок їх застосування до повідомлень: найвищій фільтр спрацьовує "
+"першим.</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Натисніть цю кнопку, щоб перейменувати вибраний фільтр.</p>"
-"<p>Фільтри іменуються автоматично, якщо вони починаються з \"&lt;\".</p>"
-"<p>Якщо ви перейменували фільтр випадково і хочете повернути його автоматичну "
-"назву, натисніть цю кнопку і виберіть <em>Очистити</em>, а потім<em>Гаразд</em> "
-"у вікні, що з'явиться.</p></qt>"
+"<qt><p>Натисніть цю кнопку, щоб перейменувати вибраний фільтр.</p><p>Фільтри "
+"іменуються автоматично, якщо вони починаються з \"&lt;\".</p><p>Якщо ви "
+"перейменували фільтр випадково і хочете повернути його автоматичну назву, "
+"натисніть цю кнопку і виберіть <em>Очистити</em>, а потім<em>Гаразд</em> у "
+"вікні, що з'явиться.</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ввімкніть цей параметр для виринання вікна підтвердження.</p>"
-"<p>Це може бути корисним, коли ви зробили фільтр для відкладеного звантаження. "
+"<qt><p>Ввімкніть цей параметр для виринання вікна підтвердження.</p><p>Це "
+"може бути корисним, коли ви зробили фільтр для відкладеного звантаження. "
 "Якщо це вікно не буде з'являтись, то ці повідомлення так і залишаться на "
-"сервері, поки не прийде ще одне велике повідомлення, або ви не вирішите змінити "
-"фільтр.</p></qt>"
+"сервері, поки не прийде ще одне велике повідомлення, або ви не вирішите "
+"змінити фільтр.</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -7373,6 +7146,16 @@ msgstr "Правила фільтру POP3"
 msgid "Filter Rules"
 msgstr "Правила фільтру"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Імпортувати"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Імпортувати"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Наявні фільтри"
@@ -7396,8 +7179,8 @@ msgstr "Глобальні параметри"
 #: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
-"&Завжди показувати повідомлення, які підпадають під дію звантажити пізніше, у "
-"вікні підтвердження"
+"&Завжди показувати повідомлення, які підпадають під дію звантажити пізніше, "
+"у вікні підтвердження"
 
 #: kmfilterdlg.cpp:188
 msgid "Filter Actions"
@@ -7455,6 +7238,11 @@ msgstr "Додатково додати цей фільтр у пенал"
 msgid "Icon for this filter:"
 msgstr "Піктограма для цього фільтру:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Кому"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Вгору"
@@ -7463,16 +7251,29 @@ msgstr "Вгору"
 msgid "Down"
 msgstr "Вниз"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Перейменувати"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Новий"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Копіювати в"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Видалено"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7481,20 +7282,20 @@ msgstr "Виберіть скорочення для теки"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 "Виявлено принаймні один фільтр, який пересилає повідомлення в теку мережного "
-"рахунка IMAP. Такі фільтри будуть застосовуватись під час ручного фільтрування "
-"і під час фільтрування вхідної пошти IMAP в мережі."
+"рахунка IMAP. Такі фільтри будуть застосовуватись під час ручного "
+"фільтрування і під час фільтрування вхідної пошти IMAP в мережі."
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
-"Наступні фільтри не було збережено тому, що вони не правильні (тобто не містять "
-"дій або правил для пошуку)."
+"Наступні фільтри не було збережено тому, що вони не правильні (тобто не "
+"містять дій або правил для пошуку)."
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -7542,16 +7343,16 @@ msgid ""
 "Folder names cannot contain the / (slash) character; please choose another "
 "folder name."
 msgstr ""
-"Назви тек не можуть містити символ \"/\", виберіть, будь ласка, іншу назву для "
-"теки."
+"Назви тек не можуть містити символ \"/\", виберіть, будь ласка, іншу назву "
+"для теки."
 
 #: kmfolder.cpp:913
 msgid ""
 "Folder names cannot start with a . (dot) character; please choose another "
 "folder name."
 msgstr ""
-"Назви тек не можуть починатися з символу \".\" (крапка); виберіть, будь ласка, "
-"іншу назву для теки."
+"Назви тек не можуть починатися з символу \".\" (крапка); виберіть, будь "
+"ласка, іншу назву для теки."
 
 #: kmfolder.cpp:932
 msgid ""
@@ -7568,28 +7369,24 @@ msgstr "Вирішення проблем з кешем IMAP"
 #: kmfoldercachedimap.cpp:122
 #, fuzzy
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>Вирішення проблем з кешем IMAP.</b></p>"
-"<p>Якщо виникли проблеми з синхронізацією теки IMAP, то вам потрібно спочатку "
-"спробувати перебудувати файл індексації. Це займе деякий час, але не призведе "
-"до проблем.</p>"
-"<p>Якщо цього виявиться замало, то можна спробувати освіжити кеш IMAP. Якщо ви "
-"це зробите, то буде втрачено всі локальні зміни зроблені в теці та всіх її "
+"<p><b>Вирішення проблем з кешем IMAP.</b></p><p>Якщо виникли проблеми з "
+"синхронізацією теки IMAP, то вам потрібно спочатку спробувати перебудувати "
+"файл індексації. Це займе деякий час, але не призведе до проблем.</p><p>Якщо "
+"цього виявиться замало, то можна спробувати освіжити кеш IMAP. Якщо ви це "
+"зробите, то буде втрачено всі локальні зміни зроблені в теці та всіх її "
 "підтеках.</p>"
 
 #: kmfoldercachedimap.cpp:135
@@ -7626,8 +7423,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 "Не вдалося записати файл кешу UID для теки %1. Можливо, існує проблема з "
 "правами доступу до файлової системи."
@@ -7667,11 +7464,11 @@ msgstr "Індекс для цієї теки було створено зано
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"Тека %1 не знаходиться в стані первісної синхронізації (був стан %2). Бажаєте "
-"скинути стан у первісний та синхронізувати її по при все?"
+"Тека %1 не знаходиться в стані первісної синхронізації (був стан %2). "
+"Бажаєте скинути стан у первісний та синхронізувати її по при все?"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7777,8 +7574,8 @@ msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
-"<p>Ваші права доступу до <b>%1</b> обмежено; ви вже не зможете додавати до цієї "
-"теки повідомлення.</p>"
+"<p>Ваші права доступу до <b>%1</b> обмежено; ви вже не зможете додавати до "
+"цієї теки повідомлення.</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7799,15 +7596,11 @@ msgstr "Створення підтек на сервері"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Пошту на сервері в теці <b>%1</b> було видалено. Хочете видалити цю пошту "
-"локально?"
-"<br>UID: %2</p></qt>"
+"<qt><p>Пошту на сервері в теці <b>%1</b> було видалено. Хочете видалити цю "
+"пошту локально?<br>UID: %2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7828,12 +7621,11 @@ msgstr "Отримання тек для простору назв %1"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Схоже, що теку <b>%1</b> було видалено. Чи видалити її з сервера?</p></qt>"
+"<qt><p>Схоже, що теку <b>%1</b> було видалено. Чи видалити її з сервера?</"
+"p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7841,16 +7633,16 @@ msgstr "Припинено"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 "Сервер IMAP %1 не підтримує анотації IMAP. Формат зберігання XML не можна "
 "застосовувати на цьому сервері, будь ласка, переналаштуйте KMail."
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 "Сервер IMAP %1 не підтримує анотації. Формат зберігання XML не можна "
 "застосовувати на цьому сервері, будь ласка, переналаштуйте KMail."
@@ -7866,18 +7658,18 @@ msgstr "lost+found"
 #: kmfoldercachedimap.cpp:3117
 #, fuzzy
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>Є нові повідомлення у цій теці (%1), які ще не були вивантажені на сервер, "
-"але, здається, у вас тепер недостатньо прав для вивантаження в цю теку. Щоб "
-"розв'язати цю проблему зв'яжіться з системним адміністратором, щоб він надав "
-"вам права вивантаження нових повідомлень, або пересуньте повідомлення з цієї "
-"теки.</p> "
-"<p>Пересунути ці повідомлення в іншу теку зараз?</p>"
+"<p>Є нові повідомлення у цій теці (%1), які ще не були вивантажені на "
+"сервер, але, здається, у вас тепер недостатньо прав для вивантаження в цю "
+"теку. Щоб розв'язати цю проблему зв'яжіться з системним адміністратором, щоб "
+"він надав вам права вивантаження нових повідомлень, або пересуньте "
+"повідомлення з цієї теки.</p> <p>Пересунути ці повідомлення в іншу теку "
+"зараз?</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7886,21 +7678,26 @@ msgstr "Недостатньо прав для доступу"
 #: kmfoldercachedimap.cpp:3129
 #, fuzzy
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>Є нові повідомлення у цій теці (%1), які ще не були вивантажені на сервер, "
-"але, здається, у вас тепер недостатньо прав для вивантаження в цю теку. Щоб "
-"розв'язати цю проблему зв'яжіться з системним адміністратором, щоб він надав "
-"вам права вивантаження нових повідомлень, або пересуньте повідомлення з цієї "
-"теки.</p> "
-"<p>Пересунути ці повідомлення в іншу теку зараз?</p>"
+"<p>Є нові повідомлення у цій теці (%1), які ще не були вивантажені на "
+"сервер, але, здається, у вас тепер недостатньо прав для вивантаження в цю "
+"теку. Щоб розв'язати цю проблему зв'яжіться з системним адміністратором, щоб "
+"він надав вам права вивантаження нових повідомлень, або пересуньте "
+"повідомлення з цієї теки.</p> <p>Пересунути ці повідомлення в іншу теку "
+"зараз?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Перес&унути до:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Не пересувати"
 
@@ -7912,8 +7709,7 @@ msgstr "Пересунути повідомлення в теку"
 msgid "Permissions (ACL)"
 msgstr "Права доступу (ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Загальні"
@@ -7937,8 +7733,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Вживати нетипові піктограми"
@@ -7957,24 +7752,22 @@ msgstr "Дії для нових/непрочитаних листів у цій
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Якщо ввімкнено, то будуть з'являтися сповіщення про нові/непрочитані листи в "
-"цій теці. Та ця тека буде перевірятися при пересуванні до "
-"наступного/попереднього непрочитаного повідомлення.</p>"
-"<p>Вимкніть, якщо не потрібно отримувати сповіщення про нові/непрочитані листи "
-"в цій теці. Та, у цьому випадку, вона не буде перевірятися при пересуванні до "
-"наступного/попереднього непрочитаного повідомлення. Така поведінка корисна для "
-"повного ігнорування нових/непрочитаних листів у теці смітника чи теці для "
-"спаму.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
+msgstr ""
+"<qt><p>Якщо ввімкнено, то будуть з'являтися сповіщення про нові/непрочитані "
+"листи в цій теці. Та ця тека буде перевірятися при пересуванні до наступного/"
+"попереднього непрочитаного повідомлення.</p><p>Вимкніть, якщо не потрібно "
+"отримувати сповіщення про нові/непрочитані листи в цій теці. Та, у цьому "
+"випадку, вона не буде перевірятися при пересуванні до наступного/"
+"попереднього непрочитаного повідомлення. Така поведінка корисна для повного "
+"ігнорування нових/непрочитаних листів у теці смітника чи теці для спаму.</"
+"p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7986,12 +7779,12 @@ msgstr "Залишати відповіді в цій теці"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
-"Ввімкніть, якщо бажаєте, щоб ваші відповіді на листи з цієї теки зберігалися у "
-"цій же самій теці після відсилання; замість того, щоб потрапляти до теки "
+"Ввімкніть, якщо бажаєте, щоб ваші відповіді на листи з цієї теки зберігалися "
+"у цій же самій теці після відсилання; замість того, щоб потрапляти до теки "
 "відісланих повідомлень."
 
 #: kmfolderdia.cpp:459
@@ -8002,17 +7795,21 @@ msgstr "Відображати стовпчик и відправник/адре
 msgid "Sho&w column:"
 msgstr "Від&ображати стовпчик:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Встановити як типовий"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Відправник"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Адресат"
@@ -8023,17 +7820,18 @@ msgstr "П&рофіль відправника:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 "Виберіть профіль відправника для використання при створенні нових листів і "
-"відповідей у цій теці. Це означає, що при знаходженні в одній з ваших робочих "
-"тек, KMail буде автоматично вживати відповідні адресу відправника, підпис та "
-"ключі для підписування і шифрування. Профілі можна налаштувати у головному "
-"конфігураційному діалоговому вікні (Параметри -> Налаштувати KMail)."
+"відповідей у цій теці. Це означає, що при знаходженні в одній з ваших "
+"робочих тек, KMail буде автоматично вживати відповідні адресу відправника, "
+"підпис та ключі для підписування і шифрування. Профілі можна налаштувати у "
+"головному конфігураційному діалоговому вікні (Параметри -> Налаштувати "
+"KMail)."
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -8051,27 +7849,28 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 "Цей параметр визначає хто з користувачів, що спільно використовують цю теку, "
-"буде отримувати інформацію про вільний/зайнятий час та бачити нагадування про "
-"події та завдання у цій теці. Цей параметр впливає тільки на теки з календарем "
-"та завданнями (для завдань тільки нагадування).\n"
+"буде отримувати інформацію про вільний/зайнятий час та бачити нагадування "
+"про події та завдання у цій теці. Цей параметр впливає тільки на теки з "
+"календарем та завданнями (для завдань тільки нагадування).\n"
 "\n"
 "Приклади використання параметра: якщо керівник має спільний доступ до теки "
 "разом з секретарем, то тільки в розкладі керівника час його зустрічі повинен "
 "буди помічений, як зайнятий; тому керівник повинен вибрати значення "
-"\"адміністратори\", тому що секретар немає прав адміністратора для цієї теки.\n"
+"\"адміністратори\", тому що секретар немає прав адміністратора для цієї "
+"теки.\n"
 "У іншому випадку, якщо робоча група має спільний календар для робочих "
-"зустрічей, то в розклад усіх читачів цієї теки потрібно заносити інформацію про "
-"зустрічі, як зайнятий час.\n"
-"Для теки з загальними подіями у компанії потрібно вибрати \"ніхто\", тому що не "
-"відомо хто візьме участь у цих подіях."
+"зустрічей, то в розклад усіх читачів цієї теки потрібно заносити інформацію "
+"про зустрічі, як зайнятий час.\n"
+"Для теки з загальними подіями у компанії потрібно вибрати \"ніхто\", тому що "
+"не відомо хто візьме участь у цих подіях."
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -8102,23 +7901,23 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"Ви налаштували цю теку на збереження інформації що стосується роботи в групі, "
-"та ввімкнуто параметр конфігурації, що вказує сховати групові теки. Це означає, "
-"що тека зникне відразу після закриття діалогового вікна. Щоб побачити цю теку "
-"(для повторного видалення цієї теки) потрібно буде тимчасово заборонити "
-"приховування групових тек."
+"Ви налаштували цю теку на збереження інформації що стосується роботи в "
+"групі, та ввімкнуто параметр конфігурації, що вказує сховати групові теки. "
+"Це означає, що тека зникне відразу після закриття діалогового вікна. Щоб "
+"побачити цю теку (для повторного видалення цієї теки) потрібно буде "
+"тимчасово заборонити приховування групових тек."
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -8187,11 +7986,13 @@ msgstr "Помилка при отриманні інформації про т�
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "Індекс листів \"%1\" здається з невідомої версії KMail (%2).\n"
-"Цей індекс може бути створено заново, але деяка інформація, включаючи прапорці "
-"статусу може бути втрачена. Хочете понизити версію вашого файла індексу?"
+"Цей індекс може бути створено заново, але деяка інформація, включаючи "
+"прапорці статусу може бути втрачена. Хочете понизити версію вашого файла "
+"індексу?"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -8216,11 +8017,11 @@ msgstr "Помилка відкриття %1. Тека відсутня."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"Помилка при відкритті %1. Або це не правильна тека в форматі maildir, або у вас "
-"не вистачає прав доступу."
+"Помилка при відкритті %1. Або це не правильна тека в форматі maildir, або у "
+"вас не вистачає прав доступу."
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -8263,21 +8064,18 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Схоже, що файл індексу для теки \"%2\" застарів. Для запобігання пошкодження "
-"повідомлень індекс буде перебудовано. В результаті чого видалені повідомлення "
-"можуть знову з'явитися, а позначки стану повідомлень можуть загубитися.</p>"
-"<p>Будь ласка прочитайте відповідну статтю у <a href=\"%1\">"
-"розділі FAQ довідки по KMail</a> для отримання інформації потрібної для того, "
-"щоб запобігти цій проблемі у майбутньому.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
+msgstr ""
+"<qt><p>Схоже, що файл індексу для теки \"%2\" застарів. Для запобігання "
+"пошкодження повідомлень індекс буде перебудовано. В результаті чого видалені "
+"повідомлення можуть знову з'явитися, а позначки стану повідомлень можуть "
+"загубитися.</p><p>Будь ласка прочитайте відповідну статтю у <a href="
+"\"%1\">розділі FAQ довідки по KMail</a> для отримання інформації потрібної "
+"для того, щоб запобігти цій проблемі у майбутньому.</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -8340,7 +8138,7 @@ msgstr ""
 "\"%1\" не схожий на теку.\n"
 "Будь ласка, пересуньте цей файл кудись."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -8348,7 +8146,7 @@ msgstr ""
 "Права доступу до теки \"%1\" неправильні.\n"
 "Будь ласка, впевнитись, що ви можете переглядати та змінювати зміст теки."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -8359,15 +8157,15 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "Не вдалося створити теку"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -8464,13 +8262,13 @@ msgstr "&Розв'язання проблем з кешем IMAP..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>Через недостатні права доступу на сервері не вдається створити теку <b>"
-"%1</b>. Якщо ви вважаєте, що ви повинні мати можливість створювати підтеки тут, "
-"то запитайте вашого адміністратора надати вам дозвіл на це.</qt> "
+"%1</b>. Якщо ви вважаєте, що ви повинні мати можливість створювати підтеки "
+"тут, то запитайте вашого адміністратора надати вам дозвіл на це.</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -8487,16 +8285,16 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt>Неможливо пересунути чи скопіювати теку <b>%1</b>"
-", тому що вже існує тека з такою самою назваю.</qt>"
+"<qt>Неможливо пересунути чи скопіювати теку <b>%1</b>, тому що вже існує "
+"тека з такою самою назваю.</qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr ""
-"<qt>Неможливо пересунути чи скопіювати теку <b>%1</b>"
-", тому що вона себе не цілком скопіювала.</qt>"
+"<qt>Неможливо пересунути чи скопіювати теку <b>%1</b>, тому що вона себе не "
+"цілком скопіювала.</qt>"
 
 #: kmfoldertree.cpp:2010
 msgid ""
@@ -8611,17 +8409,17 @@ msgstr "%1 Тека тільки для читання."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ви дійсно бажаєте видалити %n вибране повідомлення?"
-"<br>Якщо їх видалити, то їх не можна буде відновити.</qt>\n"
-"<qt>Ви дійсно бажаєте видалити %n вибрані повідомлення?"
-"<br>Якщо їх видалити, то їх не можна буде відновити.</qt>\n"
-"<qt>Ви дійсно бажаєте видалити %n вибраних повідомлень?"
-"<br>Якщо їх видалити, то їх не можна буде відновити.</qt>"
+"<qt>Ви дійсно бажаєте видалити %n вибране повідомлення?<br>Якщо їх видалити, "
+"то їх не можна буде відновити.</qt>\n"
+"<qt>Ви дійсно бажаєте видалити %n вибрані повідомлення?<br>Якщо їх видалити, "
+"то їх не можна буде відновити.</qt>\n"
+"<qt>Ви дійсно бажаєте видалити %n вибраних повідомлень?<br>Якщо їх видалити, "
+"то їх не можна буде відновити.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -8673,132 +8471,131 @@ msgstr ""
 "Помилка зміни %1\n"
 "(Можливо нема вільного місця на диску)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Запит підпису сертифіката"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 "Будь ласка, створіть з долучення сертифікат і поверніть до відправника."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail працює в автономному режимі; всі мережні дії не доступні"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail працює в мережі; всі мережні дії доступні"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail працює в автономному режимі. Що робити далі?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Працювати в мережі"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Працювати автономно"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "У вас немає прав для читання/запису в файл вхідних повідомлень."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "вихідні"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "У вас немає прав для читання/запису в файл вихідних повідомлень."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "відіслані"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "У вас немає прав для читання/запису в файл відісланих повідомлень."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "смітник"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "У вас немає прав для читання/запису в файл смітника."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "чернетки"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "У вас немає прав для читання/запису в теку чернеток."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "шаблони"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "У вас немає прав для читання/запису в теку шаблонів."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Останній пошук"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Тека <i>%4</i> вже існує. Програма %1 зараз використовує теку <i>%5</i> "
-"для власних повідомлень."
-"<p>%2 не може пересунути зміст <i>%6<i> у цю теку, втім можна перезаписати будь "
-"які з існуючих файлів з тим самим ім'ям у <i>%7</i>."
-"<p><strong>Чи повинна програма %3 пересунути фали з поштою?</strong></qt>"
+"для власних повідомлень.<p>%2 не може пересунути зміст <i>%6<i> у цю теку, "
+"втім можна перезаписати будь які з існуючих файлів з тим самим ім'ям у <i>"
+"%7</i>.<p><strong>Чи повинна програма %3 пересунути фали з поштою?</strong></"
+"qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 "<qt>Тека <i>%4</i> вже існує. Програма %1 зараз використовує теку <i>%5</i> "
 "для власних повідомлень. %2 не може пересунути зміст <i>%6<i> у цю теку."
 "<p><strong>Чи повинна програма %3 пересунути фали з поштою?</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "Пересунути файли з поштою?"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "У KMail знайдено невиправну помилку, і програму буде негайно закрито"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8809,11 +8606,11 @@ msgstr ""
 "Помилка:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Очистити смітник"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ви дійсно хочете очистити смітники на всіх рахунках?"
 
@@ -8889,8 +8686,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Надійшла нова пошта</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8930,11 +8726,11 @@ msgstr "Ви дійсно хочете очистити теку смітник�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>Ви дійсно хочете пересунути всі повідомлення з теки <b>%1</b> "
-"в смітник?</qt>"
+"<qt>Ви дійсно хочете пересунути всі повідомлення з теки <b>%1</b> в смітник?"
+"</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8958,11 +8754,11 @@ msgstr "Видалити пошук"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Ви дійсно хочете видалити пошук <b>%1</b>? "
-"<br>Повідомлення, що показуються, будуть доступні в їх оригінальних теках.</qt>"
+"<qt>Ви дійсно хочете видалити пошук <b>%1</b>? <br>Повідомлення, що "
+"показуються, будуть доступні в їх оригінальних теках.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8974,37 +8770,38 @@ msgstr "<qt>Ви дійсно хочете видалити порожню те�
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ви дійсно хочете видалити порожню теку <b>%1</b> "
-"та всі її підтеки? Вони можуть бути не порожніми, та їх буде видалено разом з "
-"їх змістом?"
-"<p><b>Увага:</b> видалені повідомлення не будуть збережені в теці Смітника, а "
-"видалені назавжди.</qt>"
+"<qt>Ви дійсно хочете видалити порожню теку <b>%1</b> та всі її підтеки? Вони "
+"можуть бути не порожніми, та їх буде видалено разом з їх змістом?<p><b>Увага:"
+"</b> видалені повідомлення не будуть збережені в теці Смітника, а видалені "
+"назавжди.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr "<qt>Ви дійсно хочете видалити теку <b>%1</b> разом з її вмістом?</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Ви дійсно хочете видалити теку <b>%1</b> та всі підтеки, разом з їх "
-"змістом? "
-"<p><b>Увага:</b> видалені повідомлення не будуть збережені в теці Смітника, а "
-"видалені назавжди.</qt>"
+"змістом? <p><b>Увага:</b> видалені повідомлення не будуть збережені в теці "
+"Смітника, а видалені назавжди.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Видалено"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -9020,12 +8817,13 @@ msgstr "Ви дійсно хочете вилучити всі застаріл�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
-"Використання HTML у пошті робить вас більш незахищеним до \"спаму\" та збільшує "
-"ймовірність використання інших присутніх та відомих послаблень безпеки."
+"Використання HTML у пошті робить вас більш незахищеним до \"спаму\" та "
+"збільшує ймовірність використання інших присутніх та відомих послаблень "
+"безпеки."
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -9038,12 +8836,12 @@ msgstr "Вживати HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
-"Завантаження зовнішніх посилань для html листів зробить вас більш незахищеним "
-"до \"спаму\" та збільшує ймовірність використання інших присутніх та відомих "
-"послаблень безпеки."
+"Завантаження зовнішніх посилань для html листів зробить вас більш "
+"незахищеним до \"спаму\" та збільшує ймовірність використання інших "
+"присутніх та відомих послаблень безпеки."
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -9059,8 +8857,8 @@ msgstr "Фільтр за списком розсилки %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "Можливості KMail по відсиланню повідомлень \"Мене немає\" залежать від "
@@ -9083,7 +8881,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Неможливо запустити переглядах журналу GnuPG (kwatchgnupg). Будь ласка, "
 "перевірте чи все встановлено правильно."
@@ -9407,8 +9206,7 @@ msgstr "&Зберегти долучення..."
 msgid "Appl&y All Filters"
 msgstr "Застос&увати всі фільтри"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "За&стосувати фільтр"
@@ -9521,7 +9319,6 @@ msgstr "Наступне н&епрочитане повідомлення"
 msgid "Go to the next unread message"
 msgstr "Перейти до наступного непрочитаного повідомлення"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Попередн&є повідомлення"
@@ -9569,8 +9366,8 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"Прокрутити поточне повідомлення вниз. Якщо це кінець повідомлення, перейти до "
-"наступного."
+"Прокрутити поточне повідомлення вниз. Якщо це кінець повідомлення, перейти "
+"до наступного."
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -9662,21 +9459,21 @@ msgstr " Ініціалізація..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Це повідомлення вимагає відсилання сповіщення про долю повідомлення.\n"
-"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою надати "
-"інформацію про долю повідомлення, або відіслати правильне сповіщення."
+"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою "
+"надати інформацію про долю повідомлення, або відіслати правильне сповіщення."
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "Це повідомлення вимагає відсилання сповіщення про долю повідомлення.\n"
@@ -9686,34 +9483,34 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Це повідомлення вимагає відсилання сповіщення про долю повідомлення,\n"
 "яке потрібно надіслати більш ніж на одну адресу.\n"
-"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою надати "
-"інформацію про долю повідомлення, або відіслати правильне сповіщення."
+"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою "
+"надати інформацію про долю повідомлення, або відіслати правильне сповіщення."
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 "Це повідомлення вимагає відсилання сповіщення про долю повідомлення,\n"
 "але зворотної адреси не вказано.\n"
-"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою надати "
-"інформацію про долю повідомлення, або відіслати правильне сповіщення."
+"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою "
+"надати інформацію про долю повідомлення, або відіслати правильне сповіщення."
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9722,8 +9519,8 @@ msgstr ""
 "Це повідомлення вимагає відсилання сповіщення про долю повідомлення,\n"
 "але зворотна адреса не збігається з адресою на яку потрібно відіслати "
 "сповіщення.\n"
-"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою надати "
-"інформацію про долю повідомлення, або відіслати правильне сповіщення."
+"Можна або проігнорувати цей запит, або відіслати сповіщення з відмовою "
+"надати інформацію про долю повідомлення, або відіслати правильне сповіщення."
 
 #: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
@@ -9742,23 +9539,23 @@ msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
-"Заголовок \"Disposition-Notification-Options\" містить обов'язковий, невідомий "
-"параметр"
+"Заголовок \"Disposition-Notification-Options\" містить обов'язковий, "
+"невідомий параметр"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Квитанція: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Долучення: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "Це долучення було вилучено."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "Долучення «%1» було вилучено."
 
@@ -9806,45 +9603,38 @@ msgstr "Властивості розділу повідомлення"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p><em>Тип MIME</em> файла:</p>"
-"<p>у більшості випадків, вам не потрібно змінювати цей параметр, тому що тип "
-"файла визначається автоматично. Але іноді, %1 може помилково визначати тип. "
-"Саме тоді ви можете виправити його.</p></qt>"
+"<qt><p><em>Тип MIME</em> файла:</p><p>у більшості випадків, вам не потрібно "
+"змінювати цей параметр, тому що тип файла визначається автоматично. Але "
+"іноді, %1 може помилково визначати тип. Саме тоді ви можете виправити його.</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Розмір долучення:</p>"
-"<p>іноді, %1 відображає приблизний розмір, тому що обчислення точного розміру "
-"може зайняти занадто багато часу. У цьому випадку, до рядка з розміром розділу "
-"буде додано \"(прибл.)\".</p></qt>"
+"<qt><p>Розмір долучення:</p><p>іноді, %1 відображає приблизний розмір, тому "
+"що обчислення точного розміру може зайняти занадто багато часу. У цьому "
+"випадку, до рядка з розміром розділу буде додано \"(прибл.)\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Назва файла для долучення:</p>"
-"<p>хоча типове значення цього параметра - є назва долученого файла, але сам "
-"параметр не є назвою файла, який долучено. Скоріше, це значення пропонує назву "
-"файла для поштової програми під час збереження цього розділу на диск.</p></qt>"
+"<qt><p>Назва файла для долучення:</p><p>хоча типове значення цього параметра "
+"- є назва долученого файла, але сам параметр не є назвою файла, який "
+"долучено. Скоріше, це значення пропонує назву файла для поштової програми "
+"під час збереження цього розділу на диск.</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9852,17 +9642,15 @@ msgstr "&Опис:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Опис розділу повідомлення:</p>"
-"<p>Це просто якась загальна інформація про розділ, як тема для повідомлення. "
-"Більшість поштових програм відображають цю інформацію в перегляді повідомлення, "
-"разом з піктограмою долучення.</p></qt>"
+"<qt><p>Опис розділу повідомлення:</p><p>Це просто якась загальна інформація "
+"про розділ, як тема для повідомлення. Більшість поштових програм "
+"відображають цю інформацію в перегляді повідомлення, разом з піктограмою "
+"долучення.</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9870,23 +9658,20 @@ msgstr "&Кодування:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Кодування розділу повідомлення:</p> "
-"<p>у більшості випадків, вам не потрібно змінювати цей параметр, тому що %1 "
-"типово використовує найкраще кодування в залежності від MIME типу. Але іноді "
-"можна значно зменшити розмір повідомлення. Напр. якщо файл PostScript не "
-"містить двійкових даних, а містить тільки латинський текст, то вибір "
-"\"quoted-printable\" замість типового \"base64\" зменшить розмір повідомлення "
-"до 25%.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>Кодування розділу повідомлення:</p> <p>у більшості випадків, вам не "
+"потрібно змінювати цей параметр, тому що %1 типово використовує найкраще "
+"кодування в залежності від MIME типу. Але іноді можна значно зменшити розмір "
+"повідомлення. Напр. якщо файл PostScript не містить двійкових даних, а "
+"містить тільки латинський текст, то вибір \"quoted-printable\" замість "
+"типового \"base64\" зменшить розмір повідомлення до 25%.</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9894,20 +9679,17 @@ msgstr "Запропонувати &автоматичний перегляд"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Якщо бажаєте запропонувати одержувачу автоматичний перегляд (перегляд в тілі "
-"повідомлення) цього розділу повідомлення при перегляді, замість піктограми, то "
-"ввімкніть цей параметр.</p>"
-"<p>Технічно, це робиться зміною значення заголовку <em>Content-Disposition</em> "
-"на \"inline\" замість типового значення \"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt><p>Якщо бажаєте запропонувати одержувачу автоматичний перегляд (перегляд "
+"в тілі повідомлення) цього розділу повідомлення при перегляді, замість "
+"піктограми, то ввімкніть цей параметр.</p><p>Технічно, це робиться зміною "
+"значення заголовку <em>Content-Disposition</em> на \"inline\" замість "
+"типового значення \"attachment\".</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9915,14 +9697,12 @@ msgstr "&Підписати розділ повідомлення"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ввімкніть цей параметр, якщо бажаєте підписати розділ повідомлення.</p>"
-"<p>Для підпису буде застосовано ключ, який встановлено для поточного "
+"<qt><p>Ввімкніть цей параметр, якщо бажаєте підписати розділ повідомлення.</"
+"p><p>Для підпису буде застосовано ключ, який встановлено для поточного "
 "профілю.</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
@@ -9931,13 +9711,12 @@ msgstr "З&ашифрувати розділ повідомлення"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ввімкніть цей параметр, якщо бажаєте зашифрувати цей розділ повідомлення.</p>"
-"<p>Розділ буде зашифровано для одержувачів цього повідомлення</p></qt>"
+"<qt><p>Ввімкніть цей параметр, якщо бажаєте зашифрувати цей розділ "
+"повідомлення.</p><p>Розділ буде зашифровано для одержувачів цього "
+"повідомлення</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9951,18 +9730,14 @@ msgstr "Фільтр POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 "На вашому POP рахунку <b>%1</b> знайдені повідомлення, що підпадають під дію "
-"фільтру."
-"<p>Розмір цих повідомлень перевищує поточне обмеження на максимальний розмір "
-"повідомлень для цього рахунку."
-"<br>Ви можете визначити, що робити з цими повідомленнями, натиснувши відповідну "
-"кнопку."
+"фільтру.<p>Розмір цих повідомлень перевищує поточне обмеження на "
+"максимальний розмір повідомлень для цього рахунку.<br>Ви можете визначити, "
+"що робити з цими повідомленнями, натиснувши відповідну кнопку."
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -10215,40 +9990,39 @@ msgstr "Поштовий клієнт для TDE."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Отримання вмісту тек</h2>"
-"<p>Зачекайте, будь ласка . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Отримання вмісту тек</h2><p>Зачекайте, будь "
+"ласка . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Автономний режим</h2>"
-"<p>KMail працює в автономному режимі. Натисніть <a href=\"kmail:goOnline\">"
-"тут</a>, щоб з'єднатись з мережею . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Автономний режим</h2><p>KMail працює в "
+"автономному режимі. Натисніть <a href=\"kmail:goOnline\">тут</a>, щоб "
+"з'єднатись з мережею . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -10256,18 +10030,16 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style=\"margin-top: 0px;\">Ласкаво просимо до KMail %1</h2> "
-"<p>KMail - це поштовий клієнт для TDE. Його було розроблено в повній "
-"відповідності до стандартів Інтернет, включаючи MIME, SMTP, POP3 та IMAP.</p>\n"
-"<ul>"
-"<li>KMail має багато можливостей, які описані в <A HREF=\"%2\">документації</A>"
-"</li>\n"
+"<h2 style=\"margin-top: 0px;\">Ласкаво просимо до KMail %1</h2> <p>KMail - "
+"це поштовий клієнт для TDE. Його було розроблено в повній відповідності до "
+"стандартів Інтернет, включаючи MIME, SMTP, POP3 та IMAP.</p>\n"
+"<ul><li>KMail має багато можливостей, які описані в <A HREF="
+"\"%2\">документації</A></li>\n"
 "<li><A HREF=\"%3\">Домашня сторінка KMail</A> пропонує інформацію про нові "
 "версії KMail </li></ul>\n"
 "%8\n"
-"<p>Деякі нові можливості цієї версії KMail (відносно KMail %4, яка є TDE "
-"%5):</p>"
-"<ul>\n"
+"<p>Деякі нові можливості цієї версії KMail (відносно KMail %4, яка є TDE %5):"
+"</p><ul>\n"
 "%6</ul>\n"
 "%7\n"
 "<p>Ми сподіваємось що ви отримаєте насолоду від KMail.</p>\n"
@@ -10275,22 +10047,20 @@ msgstr ""
 "<p style=\"margin-bottom: 0px\">&nbsp; &nbsp; Команда розробників KMail</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>Будь ласка, заповніть панель параметрів KMail у меню "
-"Параметри-&gt;Налаштування KMail.\n"
-"Вам потрібно принаймні створити типовий профіль та рахунки для вхідної пошти та "
-"для відправлення пошти.</p>\n"
+"<p>Будь ласка, заповніть панель параметрів KMail у меню Параметри-&gt;"
+"Налаштування KMail.\n"
+"Вам потрібно принаймні створити типовий профіль та рахунки для вхідної пошти "
+"та для відправлення пошти.</p>\n"
 
 #: kmreaderwin.cpp:1375
 msgid ""
@@ -10329,7 +10099,8 @@ msgstr "Переглянути долучення: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "[KMail: Долучення містить двійкові дані. Спроба показати перші %n символ.]\n"
@@ -10358,12 +10129,14 @@ msgstr "Відкрити долучення?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -10384,6 +10157,58 @@ msgstr "(задовольняти будь-якому з наступного)"
 msgid "(match all of the following)"
 msgstr "(задовольняти всім наступним)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Читати"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Старе"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Видалено"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "З відповіддю"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Перенаправлене"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "У черзі"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Відіслане"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Переглянуте"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Проігнороване"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Спам"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Не спам"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Завдання"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Має долучення"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "Завершити повідомлення"
@@ -10461,21 +10286,21 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
-"Помилка при пересуванні відісланого повідомлення \"%1\" з теки \"вихідні\" до "
-"теки \"відіслані\".\n"
+"Помилка при пересуванні відісланого повідомлення \"%1\" з теки \"вихідні\" "
+"до теки \"відіслані\".\n"
 "Можливі причини цього це нестача місця на диску або відсутність дозволів на "
 "запис. Спробуйте виправити проблему та пересунути повідомлення вручну."
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "Неможливо відсилати повідомлення не вказавши адресу відправника.\n"
 "Вкажіть адресу електронної пошти для профілю \"%1\" у розділі Профілі вікна "
@@ -10505,8 +10330,8 @@ msgstr "Запуск процесу відсилання..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 "Ви хочете надіслати всю пошту в черзі через незашифрований транспорт. "
 "Продовжити? "
@@ -10533,15 +10358,17 @@ msgstr "Помилка відсилання (деяких) повідомлен�
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "Відсилання перервано:\n"
 "%1\n"
-"Це повідомлення залишиться у теці \"вихідні\" до тих пір, поки ви або виправите "
-"помилку (напр. невірна адреса) або видалите повідомлення з теки \"вихідні\".\n"
+"Це повідомлення залишиться у теці \"вихідні\" до тих пір, поки ви або "
+"виправите помилку (напр. невірна адреса) або видалите повідомлення з теки "
+"\"вихідні\".\n"
 "Було використано транспортний протокол:\n"
 "  %2"
 
@@ -10551,21 +10378,17 @@ msgstr "Відсилання перервано."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>Помилка відсилання:</p>"
-"<p>%1</p>"
-"<p>Це повідомлення залишиться у теці \"вихідні\" до тих пір, поки ви або "
-"виправите помилку (напр. невірна адреса) або видалите повідомлення з теки "
-"\"вихідні\".</p>"
-"<p>Було використано транспортний протокол:  %2</p> "
-"<p>Продовжити відсилання повідомлень, що залишились?</p>"
+"<p>Помилка відсилання:</p><p>%1</p><p>Це повідомлення залишиться у теці "
+"\"вихідні\" до тих пір, поки ви або виправите помилку (напр. невірна адреса) "
+"або видалите повідомлення з теки \"вихідні\".</p><p>Було використано "
+"транспортний протокол:  %2</p> <p>Продовжити відсилання повідомлень, що "
+"залишились?</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -10583,15 +10406,17 @@ msgstr "Прип&инити відсилання"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "Помилка відсилання:\n"
 "%1\n"
-"Це повідомлення залишиться у теці \"вихідні\" до тих пір, поки ви або виправите "
-"помилку (напр. невірна адреса) або видалите повідомлення з теки \"вихідні\".\n"
+"Це повідомлення залишиться у теці \"вихідні\" до тих пір, поки ви або "
+"виправите помилку (напр. невірна адреса) або видалите повідомлення з теки "
+"\"вихідні\".\n"
 "Було використано транспортний протокол:\n"
 " %2"
 
@@ -10628,33 +10453,34 @@ msgstr "Програма sendmail завершилась аварійно."
 #: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
-"Ви повинні надати ім'я користувача та пароль для доступу до цього SMTP сервера."
+"Ви повинні надати ім'я користувача та пароль для доступу до цього SMTP "
+"сервера."
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
-"%1 вже виконується на іншому дисплеї на цьому комп'ютері. Запуск більше одного "
-"зразка %2 може призвести до втрати пошти. Ви не повинні запускати %1, якщо не "
-"впевнені, що вона зараз не виконується."
+"%1 вже виконується на іншому дисплеї на цьому комп'ютері. Запуск більше "
+"одного зразка %2 може призвести до втрати пошти. Ви не повинні запускати %1, "
+"якщо не впевнені, що вона зараз не виконується."
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
-"%1 вже виконується на іншому дисплеї на цьому комп'ютері. Одночасний запуск %1 "
-"та %2 може призвести до втрати пошти. Ви не повинні запускати %2, якщо не "
+"%1 вже виконується на іншому дисплеї на цьому комп'ютері. Одночасний запуск "
+"%1 та %2 може призвести до втрати пошти. Ви не повинні запускати %2, якщо не "
 "впевнені, що %1 зараз не виконується."
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 "%1 вже виконується на %2. Запуск більше одного зразка %1 може призвести до "
 "втрати пошти. Ви не повинні запускати %1, якщо не впевнені, що вона зараз не "
@@ -10662,13 +10488,13 @@ msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
-"%1 вже виконується на %3. Одночасний запуск %1 та %2 може призвести до втрати "
-"пошти. Ви не повинні запускати %2, якщо не впевнені, що %1 зараз не виконується "
-"на %3."
+"%1 вже виконується на %3. Одночасний запуск %1 та %2 може призвести до "
+"втрати пошти. Ви не повинні запускати %2, якщо не впевнені, що %1 зараз не "
+"виконується на %3."
 
 #: kmstartup.cpp:232
 #, c-format
@@ -10679,6 +10505,10 @@ msgstr "Запустити %1"
 msgid "Exit"
 msgstr "Вийти"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Нові повідомлення у"
@@ -10706,15 +10536,17 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet недоступний. Наполегливо рекомендується вживати TDEWallet для "
 "керування вашими паролями.\n"
 "Хоча, замість TDEWallet, KMail може зберігати пароль у своєму файлі "
 "конфігурації. Пароль зберігається у затемненому форматі, але цей формат не "
-"можна назвати захищеним від розшифрування у разі отримання файла конфігурації.\n"
+"можна назвати захищеним від розшифрування у разі отримання файла "
+"конфігурації.\n"
 "Чи зберігати пароль для рахунку \"%1\" у файлі конфігурації?"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -10793,11 +10625,12 @@ msgstr "Сервер вимага&є автентифікації"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
-"Ввімкніть цей параметр, якщо ваш SMTP сервер вимагає авторизації перед тим як "
-"почати приймати пошту. Це зветься \"Авторизований SMTP\" або скорочено ASTMP."
+"Ввімкніть цей параметр, якщо ваш SMTP сервер вимагає авторизації перед тим "
+"як почати приймати пошту. Це зветься \"Авторизований SMTP\" або скорочено "
+"ASTMP."
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -10817,15 +10650,14 @@ msgstr "Відси&лати нетипову назву вузла на серв
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 "Ввімкніть цей параметр, щоб вказати KMail відсилати не типову назву вузла на "
-"сервер."
-"<p>Це може стати в нагоді, якщо системну назву вашого комп'ютера встановлено "
-"неправильно, або, якщо потрібно сховати справжню назву комп'ютера."
+"сервер.<p>Це може стати в нагоді, якщо системну назву вашого комп'ютера "
+"встановлено неправильно, або, якщо потрібно сховати справжню назву "
+"комп'ютера."
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -10854,8 +10686,8 @@ msgstr "Дозволено тільки локальні файли."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 "Поле вузла не може бути порожнім. Будь ласка, введіть назву або адресу IP "
 "сервера SMTP."
@@ -10870,10 +10702,10 @@ msgstr "Помилка при отриманні змісту теки %1: "
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -11096,35 +10928,27 @@ msgstr "Редагувати п&овідомлення"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Не вдається правильно структурувати інформацію повернуту втулком шифрування; "
-"втулок мабуть пошкоджено.</p>"
-"<p>Будь ласка, зверніться до системного адміністратора.</p></qt>"
+"<qt><p>Не вдається правильно структурувати інформацію повернуту втулком "
+"шифрування; втулок мабуть пошкоджено.</p><p>Будь ласка, зверніться до "
+"системного адміністратора.</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>Не знайдено активних втулків шифрування та вбудований код OpenPGP завершився "
-"невдало.</p>"
-"<p>Щоб позбутися цього ви можете зробити дві речі:</p>"
-"<ul>"
-"<li><em>або</em> активувати втулок у діалоговому вікні Параметри->"
-"Налаштування KMail->Безпека->Втулки шифрування.</li>"
-"<li><em>або</em> налаштувати OpenPGP в цьому же вікні Профіль -> "
-"вкладка Додатково.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>Не знайдено активних втулків шифрування та вбудований код OpenPGP "
+"завершився невдало.</p><p>Щоб позбутися цього ви можете зробити дві речі:</"
+"p><ul><li><em>або</em> активувати втулок у діалоговому вікні Параметри-"
+">Налаштування KMail->Безпека->Втулки шифрування.</li><li><em>або</em> "
+"налаштувати OpenPGP в цьому же вікні Профіль -> вкладка Додатково.</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -11136,8 +10960,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 "Рушій Chiasmus не надає функцію \"x-encrypt\". Будь ласка, повідомте "
 "розробників про цю помилку."
@@ -11156,16 +10980,16 @@ msgstr "Помилка шифрування Chiasmus"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 "Рушій Chiasmus повернув неочікуване значення: Функція \"x-encrypt\" не "
 "повернула масив байтів. Будь ласка, повідомте розробників про цю помилку."
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "OpenPGP формат шифрування повідомлень в тілі повідомлення не підтримує "
@@ -11213,8 +11037,8 @@ msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
 msgstr ""
-"Адресати мають протиріччя у вподобаннях з підписування повідомлень відісланих "
-"до них.\n"
+"Адресати мають протиріччя у вподобаннях з підписування повідомлень "
+"відісланих до них.\n"
 "Підписати це повідомлення?"
 
 #: messagecomposer.cpp:804
@@ -11240,7 +11064,8 @@ msgid ""
 "Sign all parts instead?"
 msgstr ""
 "Деякі частини повідомлення не будуть підписані.\n"
-"Відсилання частково підписаних повідомлень може порушити правила листування.\n"
+"Відсилання частково підписаних повідомлень може порушити правила "
+"листування.\n"
 "Підписати всі частини?"
 
 #: messagecomposer.cpp:827
@@ -11279,8 +11104,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "В результаті дослідження вподобань з шифрування повідомлень для адресатів "
@@ -11308,8 +11133,8 @@ msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
-"Адресати мають протиріччя у вподобаннях з шифрування повідомлень відісланих до "
-"них.\n"
+"Адресати мають протиріччя у вподобаннях з шифрування повідомлень відісланих "
+"до них.\n"
 "Підписати це повідомлення?"
 
 #: messagecomposer.cpp:909
@@ -11318,11 +11143,12 @@ msgstr "&Не зашифровувати"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
-"Ви вказали зашифрувати це повідомлення, та зашифрувати його копію для себе, але "
-"для цього профілю не встановлено дійсних ключів для шифрування, що мають "
+"Ви вказали зашифрувати це повідомлення, та зашифрувати його копію для себе, "
+"але для цього профілю не встановлено дійсних ключів для шифрування, що мають "
 "довіру."
 
 #: messagecomposer.cpp:930
@@ -11332,12 +11158,13 @@ msgstr "Відіслати незашифрованим?"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "Деякі частини повідомлення не будуть зашифровані.\n"
-"Відсилання частково зашифрованих повідомлень може порушити правила листування.\n"
+"Відсилання частково зашифрованих повідомлень може порушити правила "
+"листування.\n"
 "Зашифрувати всі частини?"
 
 #: messagecomposer.cpp:950
@@ -11359,64 +11186,58 @@ msgstr "&Зашифровувати всі частини"
 msgid "Unencrypted Message Warning"
 msgstr "Попередження про незашифроване повідомлення"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Помилка: втулок не повернув даних.</p>"
-"<p>Будь ласка, повідомте про цю помилку:"
-"<br>%2</p></qt>"
+"<qt><p>Помилка: втулок не повернув даних.</p><p>Будь ласка, повідомте про цю "
+"помилку:<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>Не всі символи підпадають до даного кодування."
-"<br>"
-"<br>Відіслати повідомлення попри все?</qt>"
+"<qt>Не всі символи підпадають до даного кодування.<br><br>Відіслати "
+"повідомлення попри все?</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "Деякі символи буде втрачено"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "Втратити символи"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "Змінити кодування"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 "Це повідомлення неможливо підписати через те, що вибраний втулок здається не "
-"підтримує підписування. Така ситуація не повинна ніколи траплятися, будь ласка, "
-"надішліть звіт про помилку."
+"підтримує підписування. Така ситуація не повинна ніколи траплятися, будь "
+"ласка, надішліть звіт про помилку."
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 "Це повідомлення неможливо підписати через те, що вибраний втулок здається не "
-"підтримує підписування. Така ситуація не повинна ніколи траплятися, будь ласка, "
-"надішліть звіт про помилку."
+"підтримує підписування. Така ситуація не повинна ніколи траплятися, будь "
+"ласка, надішліть звіт про помилку."
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
@@ -11424,28 +11245,30 @@ msgstr ""
 "Помилка підписування. Будь ласка, переконайтеся, що програму gpg-agent "
 "запущено."
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
-"Це повідомлення неможливо зашифрувати через те, що вибраний втулок, здається, "
-"не підтримує шифрування. Така ситуація не повинна ніколи траплятися, будь "
-"ласка, надішліть звіт про помилку."
+"Це повідомлення неможливо зашифрувати через те, що вибраний втулок, "
+"здається, не підтримує шифрування. Така ситуація не повинна ніколи "
+"траплятися, будь ласка, надішліть звіт про помилку."
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 "Це повідомлення неможливо зашифрувати та підписати через те, що вибраний "
 "втулок, здається, не підтримує об'єднане шифрування та підписування. Така "
-"ситуація не повинна ніколи траплятися, будь ласка, надішліть звіт про помилку."
+"ситуація не повинна ніколи траплятися, будь ласка, надішліть звіт про "
+"помилку."
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -11466,16 +11289,16 @@ msgstr "Тип по&штової скриньки:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"Виберіть чи потрібно зберігати повідомлення у цій теці як одне повідомлення - "
-"один файл (maildir), чи всі повідомлення у одному великому файлі (mbox). "
+"Виберіть чи потрібно зберігати повідомлення у цій теці як одне повідомлення "
+"- один файл (maildir), чи всі повідомлення у одному великому файлі (mbox). "
 "Типово, KMail використовує перший формат зберігання повідомлень, і його "
-"потрібно змінювати тільки у дуже рідких випадках. Якщо не впевнені, залиште як "
-"є."
+"потрібно змінювати тільки у дуже рідких випадках. Якщо не впевнені, залиште "
+"як є."
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -11484,12 +11307,13 @@ msgstr "&Тека містить:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
-"Виберіть чи в новій теці будуть зберігатися звичайні листи, чи вона призначена "
-"для зберігання інформації для роботи в групі (такої як завдання чи нотатки). "
-"Типове значення - зберігання листів. Якщо не впевнені, залиште як є."
+"Виберіть чи в новій теці будуть зберігатися звичайні листи, чи вона "
+"призначена для зберігання інформації для роботи в групі (такої як завдання "
+"чи нотатки). Типове значення - зберігання листів. Якщо не впевнені, залиште "
+"як є."
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -11527,8 +11351,7 @@ msgstr "Відмінні результати для підписів"
 msgid "The crypto engine returned no cleartext data."
 msgstr "Механізм шифрування не повернув звичайного тексту."
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Стан: "
 
@@ -11557,11 +11380,11 @@ msgstr "Було знайдено втулок %1."
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
-"Повідомлення підписане, але чинність підпису неможливо перевірити.<br />"
-"Причина: %1"
+"Повідомлення підписане, але чинність підпису неможливо перевірити.<br /"
+">Причина: %1"
 
 #: objecttreeparser.cpp:737
 #, fuzzy
@@ -11595,28 +11418,28 @@ msgstr "Втулок шифрування \"%1\" не може розшифру�
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>Примітка:</b> Це повідомлення у HTML форматі може містити зовнішні посилання "
-"на зображення та ін. З міркувань безпеки та збереження особистих даних зовнішні "
-"посилання не завантажуються. Якщо ви довіряєте тому, хто надіслав вам листа, то "
-"можете ввімкнути завантаження зовнішніх посилань цього повідомлення клацнувши "
-"<a href=\"kmail:loadExternal\">тут</a>."
+"<b>Примітка:</b> Це повідомлення у HTML форматі може містити зовнішні "
+"посилання на зображення та ін. З міркувань безпеки та збереження особистих "
+"даних зовнішні посилання не завантажуються. Якщо ви довіряєте тому, хто "
+"надіслав вам листа, то можете ввімкнути завантаження зовнішніх посилань "
+"цього повідомлення клацнувши <a href=\"kmail:loadExternal\">тут</a>."
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 "<b>Примітка:</b> Це повідомлення у HTML форматі. З міркувань безпеки "
-"відображається тільки сирий HTML код. Якщо ви довіряєте тому, хто надіслав вам "
-"листа, то можете ввімкнути відтворення HTML для цього повідомлення клацнувши <a "
-"href=\"kmail:showHTML\">тут</a>."
+"відображається тільки сирий HTML код. Якщо ви довіряєте тому, хто надіслав "
+"вам листа, то можете ввімкнути відтворення HTML для цього повідомлення "
+"клацнувши <a href=\"kmail:showHTML\">тут</a>."
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -11872,8 +11695,8 @@ msgstr "збережено: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "Електронна адреса, що збережена у %1, та використана для підписування, "
 "відсутня, тому неможливо порівняти її з адресою відправника %2."
@@ -11991,13 +11814,14 @@ msgstr "Повідомлення про помилку Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"Ваш сервер POP3 (рахунок: %1) не підтримує команду UIDL. Ця команда потрібна, "
-"щоб визначити, які листи програма KMail вже завантажувала раніше.\n"
+"Ваш сервер POP3 (рахунок: %1) не підтримує команду UIDL. Ця команда "
+"потрібна, щоб визначити, які листи програма KMail вже завантажувала раніше.\n"
 "Отже можливість залишати листи на сервері буде працювати неправильно."
 
 #: popaccount.cpp:752
@@ -12020,7 +11844,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 "Отримання повідомлення %1 / %2 (%3 / %4 KB) для %5@%6 (%7 KБ залишається на "
 "сервері)."
@@ -12039,1867 +11864,15 @@ msgstr "Невірна відповідь від сервера"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "Перепрошую, але ваш сервер не підтримує команду TOP. Таким чином неможливо "
 "вибрати заголовки великих листів, перед тим, як завантажити їх."
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Перехід"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Тека"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "П&овідомлення"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "Особлива відповідь"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Переслати"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "Пенал HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Підписування"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Автоматично &підписувати повідомлення"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-"Коли цей параметр ввімкнено, то всі повідомлення, що відсилаються, будуть "
-"підписані. Звісно можливо вимикати підписування для кожного повідомлення "
-"окремо."
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "Шифрування"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-"Коли цей параметр ввімкнено, то повідомлення файл буде зашифровано не тільки "
-"відкритим ключем адресата, а і вашим ключем. Це дозволить вам розшифрувати "
-"повідомлення/файл пізніше. Загалом це гарна ідея."
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Показувати пі&дписаний/зашифрований текст його після створення"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"Коли цей параметр ввімкнено, підписаний/зашифрований текст буде відображено в "
-"окремому вікні, що дозволить дізнатися, як він виглядатиме перед його "
-"відсиланням. Це потрібно для перевірки роботи системи шифрування."
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Зберігати відіслані повідомлення &зашифрованими"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Ввімкніть, щоб зберігати повідомлення зашифрованими"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Зберігати повідомлення зашифрованими</h1>\n"
-"Якщо ввімкнено, відіслані повідомлення будуть зберігатися зашифрованими (у "
-"такому ж вигляді як їх було відіслано). Вмикання цього параметра не "
-"рекомендовано тому, що ви не зможете прочитати повідомлення після того, як "
-"сертифікат застаріє.\n"
-"<p>\n"
-"Проте, можуть існувати локальні правила, які вимагають вимкнення цього "
-"параметра. Якщо у вас є сумніви, то спитайте у вашого адміністратора.\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "Завжди показувати ключі шифрування &для схвалення"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"Коли цей параметр ввімкнено, програма завжди буде надавати список відкритих "
-"ключів, з яких можна буде вибрати ключ для шифрування. Якщо цей параметр "
-"вимкнено, то вікно зі списком ключів буде з'являтися тільки, якщо не вдалося "
-"знайти відповідний ключ або знайдено декілька відповідних ключів."
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "Авто&матично шифрувати повідомлення, якщо можливо"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-"Коли цей параметр ввімкнено, то всі повідомлення, що відсилаються, будуть "
-"зашифровані, якщо шифрування можливе та вимагається. Звісно можливо вимикати "
-"автоматичне шифрування для кожного повідомлення окремо."
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "Ніколи не підписувати/шифрувати при з&береженні чернетки"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "Як це працює."
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Кому: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Копія: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Універсальний"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Відповідь"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "Відповідь всім"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "Пересилання"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "Скороч&ення:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "&Тип шаблону:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Властивості теки"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "&Тека містить список розсилки"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "&Адреса списку:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "&Звичайне:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "&Непрочитане:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "Вилучення застарілих повідомлень"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "Вилу&чати через:"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "Влучити застарілі &прочитані повідомлення"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "Вилучати ч&ерез:"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "Вилучити застарілі &непрочитані повідомлення"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "День(ів)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Тиждень(нів)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Місяць(ів)"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Додатково"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "П&рофіль відправника:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "&Формат зберігання:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "Сп&исок відображає:"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Перевіряти сертифікати вживаючи CAC"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-"Якщо ввімкнено, S/MIME сертифікати будуть перевірятися на наявність у списках "
-"анулювання сертифікатів (САС)."
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "Вживати миттєву перевірку сертифікатів (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-"Якщо ввімкнено, S/MIME сертифікати будуть миттєво перевірятися через протокол "
-"OCSP (Online Certificates Status Protocol). Заповніть поле адреси "
-"OCSP-відповідача нижче."
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Миттєва перевірка сертифікатів"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Адреса OCSP-відповідача:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-"Введіть тут адресу адресу сервера для миттєвої перевірки сертифікатів "
-"(OCSP-відповідача). Типово адреса починається з http://."
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Підпис OCSP-відповідача:"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Ігнорувати службову адресу (URL) сертифікатів"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Не перевіряти правила сертифікатів"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-"Типово GnuPG використовує файл ~/.gnupg/policies.txt для перевірки чи дозволені "
-"правила сертифікатів. Якщо цей параметр ввімкнено, правила не перевіряються."
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "Ніколи не довідуватися у САС"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-"Якщо ввімкнено, то S/MIME сертифікати ніколи не будуть шукатися у списках "
-"анулювання сертифікатів."
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Діставати сертифікати джерела, яких не вистачає"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-"Якщо ввімкнено, то сертифікати джерела, яких не вистачає, будуть діставатися "
-"при потребі (це стосується до обох методів перевірки, САС та OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP запити"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "Не робити будь яких HTTP запитів"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "Повністю вимикає вживання HTTP для S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Вживати цей проксі для HTTP запитів: "
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Вживати системний проксі:"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-"Якщо ввімкнено, то для всіх HTTP запитів буде використовуватися HTTP проксі "
-"вказаний праворуч (це значення визначається змінною оточення http_proxy)."
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"Введіть тут адресу вашого HTTP проксі, який буде використовуватися для всіх "
-"HTTP запитів, що стосуються S/MIME. Синтаксис: вузол:порт, наприклад, "
-"myproxy.nowhere.com:3128."
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Ігнорувати HTTP-адреси для САС вказані в сертифікатах"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Сертифікат, що підлягає перевірці у САС, за звичай, містить записи з "
-"інформацією про \"адреси розповсюдження САС\". Ця інформація є адресою (URL), "
-"яка розповідає як отримати доступ до CAC. Використовується перша знайдена у "
-"сертифікаті адреса розповсюдження САС. Якщо ввімкнуто цей параметр, то при "
-"пошуку адреси розповсюдження САС, всі записи, що вказують використовувати HTTP "
-"протокол, будуть проігноровані."
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP запити"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "Не робити будь яких LDAP запитів"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "Повністю вимикає вживання LDAP для S/MIME."
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Ігнорувати LDAP-адреси для САС вказані в сертифікатах"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"Сертифікат, що підлягає перевірці у САС, за звичай, містить записи з "
-"інформацією про \"адреси розповсюдження САС\". Ця інформація є адресою (URL), "
-"яка розповідає як отримати доступ до CAC. Використовується перша знайдена у "
-"сертифікаті адреса розповсюдження САС. Якщо ввімкнуто цей параметр, то при "
-"пошуку адреси розповсюдження САС, всі записи, що вказують використовувати LDAP "
-"протокол, будуть проігноровані."
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "Основний вузол для LDAP запитів:"
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"Вказування LDAP сервера змусить спочатку робити всі LDAP запити до цього "
-"сервера. Більш точно, цей параметр змушує заміняти назву вузла та порт вказані "
-"у LDAP адресі (URL) та вказані тут назва вузла та порт будуть вживатись, якщо "
-"назва вузла та порт відсутні у LDAP адресі (URL). Інші LDAP сервери будуть "
-"вжиті тільки, якщо з'єднання до \"посередника\" зазнало невдачі.\n"
-"Синтаксис: \"ВУЗОЛ\" або \"ВУЗОЛ:ПОРТ\". Якщо ПОРТ не вказано, то буде "
-"використано порт №389 (стандартний LDAP порт)."
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "&Додати"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "Група:"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Скинути налаштування шрифту"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "Підказки"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "Змінні"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "Метод вводу змінних"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "Роздільник:"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Налаштування шаблонів"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "Відповіді відправнику"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Відповідь всім / Відповідь до списку"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "Пересилання повідомлення"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "Попереджувати при спробі відіслати &непідписане повідомлення"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-"Відмітьте, щоб отримувати попередження при спробі відіслати непідписане "
-"повідомлення."
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджувати при спробі відіслати непідписане повідомлення</h1>\n"
-"Коли ввімкнено, вас буде попереджено кожний раз при відсиланні повідомлення, що "
-"повністю не підписане, або не підписані деякі його частиниned.\n"
-"<p>Для збереження максимальної цілісності, рекомендовано ввімкнути цей "
-"параметр.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "Поперед&жати при відсиланні незашифрованих повідомлень"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-"Увімкніть, щоб вас попереджали, коли відсилаються незашифровані повідомлення."
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджати при відсиланні незашифрованих повідомлень</h1>\n"
-"Якщо ввімкнено, то вас будуть попереджати кожний раз при відсиланні "
-"незашифрованих повідомлень або повідомлень з незашифрованими частинами.\n"
-"<p>\n"
-"Для збереження максимальної цілісності, рекомендовано ввімкнути цей параметр.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "Попереджати якщо адреси ад&ресата немає у сертифікаті"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "Відмітьте, щоб вас попереджали, якщо адреси немає у сертифікаті"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджати якщо електронної адреси адресата немає у сертифікаті</h1>\n"
-"Якщо ввімкнено, то буде виникати попередження, якщо електронної адреси адресата "
-"немає у сертифікаті, що використовується для шифрування.\n"
-"<p>\n"
-"Рекомендується залишити цей параметр ввімкненою для максимальної безпеки.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-"&Попереджати якщо сертифікати/ключі скоро застаріють (вкажіть час нижче)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "Для підписування"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "Для шифрування"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " днів"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "Виберіть кількість днів"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджати якщо сертифікат для підписування втратить чинність</h1>\n"
-"Виберіть мінімальну кількість днів, на протязі яких сертифікат для підписування "
-"повинен бути чинним, для того щоб не показувати попередження.\n"
-"<p>\n"
-"Рекомендоване значення у SPHINX - 14 днів.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджати, якщо сертифікат для шифрування втратить чинність</h1>\n"
-"Виберіть мінімальну кількість днів, на протязі яких сертифікат для шифрування  "
-"повинен бути чинним, для того щоб не показувати попередження.\n"
-"<p>\n"
-"Рекомендоване значення у SPHINX - 14 днів.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджати, якщо сертифікат в низці втратить чинність</h1>\n"
-"Виберіть мінімальну кількість днів на протязі якої всі сертифікати у низці "
-"повинні бути дійсними, для того щоб не показувати попередження.\n"
-"<p>\n"
-"Рекомендоване значення у SPHINX - 14 днів.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджати якщо сертифікат гаранта сертифіката втратить чинність</h1>\n"
-"Виберіть мінімальну кількість днів, на протязі яких сертифікат гаранта "
-"сертифіката повинен бути чинним, для того щоб не показувати попередження.\n"
-"<p>\n"
-"Рекомендоване значення у SPHINX - 14 днів.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>Попереджати якщо кореневий сертифікат втратить чинність</h1>\n"
-"Виберіть мінімальну кількість днів, на протязі яких кореневий повинен бути "
-"чинним, для того щоб не показувати попередження.\n"
-"<p>\n"
-"Рекомендоване значення у SPHINX - 14 днів.\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "Для кореневих сертифікатів:"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Для проміжних сертифікатів гаранта:"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Для сертифікатів/ключів користувачів:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "Ввімкнути знову всі \"більше не питати\" попередження"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "Текст шаблону"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "Скорочення шаблону"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "Тип шаблону"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "Відсилати пошту з черги при перевірці пошти"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Виберіть чи бажано щоб KMail автоматично відсилала всі повідомлення з теки "
-"вихідні при ручній перевірці пошти або будь-якій перевірці пошити, чи бажано, "
-"щоб повідомлення не відсилалися автоматично.</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, fuzzy, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-"<p>Є нові повідомлення у цій теці (%1), які ще не були вивантажені на сервер, "
-"але, здається, у вас тепер недостатньо прав для вивантаження в цю теку. Щоб "
-"розв'язати цю проблему зв'яжіться з системним адміністратором, щоб він надав "
-"вам права вивантаження нових повідомлень, або пересуньте повідомлення з цієї "
-"теки.</p> "
-"<p>Пересунути ці повідомлення в іншу теку зараз?</p>"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Остання вибрана тека у діалоговому вікні вибирання тек."
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "Правила присутності у системному лотку"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Багатослівне сповіщення про надходження пошти"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-"Якщо ввімкнено, то у сповіщення про нову пошту для кожної теки буде показано "
-"кількість нових повідомлень, що надійшли останнім часом. У протилежному "
-"випадку, ви побачите тільки просте повідомлення \"Надійшла нова пошта\"."
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "В&кажіть редактор:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Використов&увати зовнішній редактор"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "&Ввімкнути роботу в робочій групі"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "Перекручувати заголовки Від:/Кому: у відповідях на запрошення"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Програма Microsoft Outlook має декілька дефектів у реалізації стандарту "
-"i-календаря; цей параметр враховує один з них. Якщо ті хто використовує Outlook "
-"не можуть отримати ваші відповіді, то спробуйте ввімкнути цей параметр."
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "Відсилати групові запрошення до в тілі листа"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Програма Microsoft Outlook має декілька дефектів у реалізації стандарту "
-"i-календаря; цей параметр враховує один з них. Якщо ті хто використовує Outlook "
-"не можуть отримати ваші запрошення, то спробуйте ввімкнути цей параметр."
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Автоматичне відсилання запрошень"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"Коли ввімкнено, ви не будете бачити вікно редактора. Замість цього, всі "
-"запрошення будуть відсилатися автоматично. Якщо ви бажаєте переглядати "
-"повідомлення перед відсиланням, то ви можете вимкнути цей параметр. Однак, "
-"пам'ятайте, текст у редакторі буде в форматі i-календаря, та ви не повинні "
-"змінювати його вручну."
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>Вмикання цього параметра уможливлює збереження даних з програм середовища "
-"Kontact (KOrganizer, KAddressBook та KNotes).</p>"
-"<p>Якщо увімкнете цей параметр, то додатково потрібно вказати програмам, щоб "
-"вони використовували ресурси IMAP. Це можна зробити в Центрі керування TDE.</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-"<p>Взагалі немає причин бачити теки що містять IMAP ресурси. Але якщо їх "
-"потрібно бачити з якихсь причин, то це налаштовується тут.</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>Виберіть формат зберігання групових тек. "
-"<ul>"
-"<li>Типовий формат - це вживання стандартів ical (для тек з календарями) та "
-"vcard (для тек з адресними книгами). Цей формат дозволяє використовувати всі "
-"функції програм середовища Kontact.</li>"
-"<li>Формат Kolab XML використовує власну модель зберігання даних, яка більш "
-"схожа на модель, що вживається в Outlook. Цей формат надає більшу сумісність з  "
-"Outlook, при вживанні сервера Kolab або сумісне з ним рішення.</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-"<p>Вибір батьківської теки для тек з IMAP ресурсами.</p>"
-"<p>Типово, сервер Kolab встановлює батьківською текою IMAP теку \"вхідні\".</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>Це Ід. рахунку, що містить теки IMAP ресурсів.</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>Якщо ви бажаєте встановити назви у IMAP сховищі до назв у вашій мові, то "
-"виберіть одну з наявних мов.</p>"
-"<p> Будь ласка зауважте, що єдиної причиною зробити це - є сумісність з "
-"Microsoft Outlook. А взагалі, це дуже погана ідея, тому що унеможливлює зміну "
-"мови. </p>"
-"<p>Не встановлюйте, якщо у вас немає причини робити це.</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-"Це значення використовується для того, щоб вирішити чи показати введення до "
-"KMail."
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Максимальна кількість з'єднань на кожний вузол"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-"Дозволяє обмежити кількість з'єднань окремого до вузла при перевірці нової "
-"пошти. Типове значення (0) - необмежена кількість з'єднань."
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "Показувати рядок швидкого пошуку"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-"Цей параметр вмикає або вимикає рядок пошуку над списком повідомлень; його "
-"можна використовувати для швидкого знаходження інформації у списку повідомлень."
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"Вживати початковий набір символів при відповіді або пересиланні (якщо можливо)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "&Автоматично вставляти підпис"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Запам'ятати цей профіль для подальшого його використання у редакторі "
-"повідомлень.\n"
-"       "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Запам'ятати цю теку відісланих повідомлень для подальшого її використання у "
-"редакторі повідомлень."
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-"Запам'ятати ці налаштування відсилання пошти для подальшого їх використання у "
-"редакторі повідомлень."
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"Запам'ятати цей профіль для подальшого його використання у редакторі "
-"повідомлень.\n"
-"       "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "П&ереносити слова на стовпчику:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Максимальна кількість рядків редактора адресатів."
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-"Ввімкніть цей параметр, щоб програма Outlook &#8482; могла зрозуміти назви "
-"долучень, що містять не латинські літери"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "&Автоматично запитувати за сповіщенням про долю листа"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Увімкніть, якщо ви бажаєте, щоб KMail запитувала на сповіщення про долю "
-"повідомлення для кожного відісланого листа.</p>"
-"<p>Вказане тут значення впливає тільки на типову поведінку програми, ви завжди "
-"матимете можливість ввімкнути чи вимкнути запит сповіщення для кожного окремого "
-"повідомлення у редакторі через пункт меню <em>Параметри</em>->&gt;<em>"
-"Запитати сповіщення про долю листа</em>.</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "Вживати для автозавершення недавні адреси"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-"Вимкніть цей параметр, якщо ви не хочете, щоб недавно вжиті адреси з'являлись в "
-"списку автозавершення в полі адреси."
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Інтервал автозбереження:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-"Редактор може автоматично створювати резервну копію тексту, який редагується в "
-"ньому. Інтервал часу між створеннями резервних копій вказується тут. Заборонити "
-"створення резервних копій можна встановивши значення, що дорівнює нулю."
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "Вставляти підпис перед цитованим текстом"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "&Заміняти відомий префікс на \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Заміняти відомий префікс на \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "В&живати кмітливе цитування"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Підпис застарів."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "Тип вікна для вибору адрес"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-"Встановлює тип діалогового вікна для вибору адресатів для \"Кому\",\n"
-"        \"Копія\" та \"Прихована копія\"."
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "Тип вікна для редагування адрес"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-"Встановлює тип діалогового вікна для редагування адресатів для \"Кому\",\n"
-"        \"Копія\" та \"Прихована копія\"."
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Максимальна кількість рядків редактора адресатів."
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"Вживати початковий набір символів при відповіді або пересиланні (якщо можливо)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"В деяких листах електронної пошти, особливо в створених автоматично, не вказано "
-"кодування, яке потрібно використовувати для правильно відображення цих листів. "
-"У таких випадках буде вживатися запасне кодування, яке можна вказати тут. "
-"Встановіть кодування яке найуживаніше у частині світу в якій ви знаходитесь. "
-"Типове значення - це системне кодування."
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-"Зміна значення з \"Автоматично\" змусить вживати вказане кодування для всіх "
-"листів електронної пошти, в незалежності від кодування вказаного в самих "
-"листах."
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-"Ввімкніть, якщо ви бажаєте щоб в тексті повідомлення символьні посмішки, "
-"наприклад \":-)\", були замінені на піктограми."
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-"Увімкніть цей параметр для показу різних рівнів цитування. Вимкніть, щоб "
-"сховати рівні."
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Рівень автоматичного згортання:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "Зменшити шрифт для цитат"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "Увімкніть цей параметр, щоб показувати цитати меншим шрифтом."
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Зберігати відіслані повідомлення &зашифрованими"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Показувати агента користувача у вишуканих заголовках"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "Відсилати сповіщення про долю повідомлення з порожнім відправником."
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-"Відсилати сповіщення про долю повідомлення з порожнім відправником. Деякі "
-"сервери можуть бути налаштованими, щоб не приймати такі повідомлення, тому якщо "
-"виникнуть проблеми зі сповіщеннями про долю повідомлення, то вимкніть цей "
-"параметр."
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "Фрази було перетворено в шаблони"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "Старі фрази було перетворено в шаблони"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "Шаблон повідомлення для нового повідомлення"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "Шаблон повідомлення відповіді"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "Шаблон повідомлення відповіді всім"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "Шаблон повідомлення пересилання"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "Символи цитати"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "%1 з %2 %3 вжито"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -14011,6 +11984,11 @@ msgstr "Додати як \"копія\""
 msgid "Add as BCC"
 msgstr "Додати як \"потайна копія\""
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Скасувати"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -14026,10 +12004,10 @@ msgstr "Вибрані адресати"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 "Ви вибрали %n адресат. Максимальна кількість адресатів - %1. Будь ласа, "
 "скоротіть вибір.\n"
@@ -14052,11 +12030,11 @@ msgstr "Скористатись діалоговим вікном для виб
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
-"Натискання цієї кнопки відкриває окреме діалогове вікно, де можна буде вибрати "
-"адресатів зі всіх наявних адрес."
+"Натискання цієї кнопки відкриває окреме діалогове вікно, де можна буде "
+"вибрати адресатів зі всіх наявних адрес."
 
 #: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
@@ -14158,13 +12136,22 @@ msgstr "більше ніж або дорівнює"
 msgid " bytes"
 msgstr " байтів"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " днів"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
-"Для виконання пошуку потрібно з сервера звантажити всі повідомлення, що у теці "
-"%1. Це може тривати досить довго. Продовжити виконання пошуку?"
+"Для виконання пошуку потрібно з сервера звантажити всі повідомлення, що у "
+"теці %1. Це може тривати досить довго. Продовжити виконання пошуку?"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -14317,16 +12304,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"Збирання даних для рахунка \"%1\"...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "Збирання даних для рахунка \"%1\"...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -14345,10 +12328,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"Вміст скрипту \"%1\":\n"
+msgid "Contents of script '%1':\n"
+msgstr "Вміст скрипту \"%1\":\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -14371,20 +12352,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"Функціональність Sieve:\n"
+msgid "Sieve capabilities:\n"
+msgstr "Функціональність Sieve:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(Немає особливої функціональності)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"Наявні скрипти Sieve:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "Наявні скрипти Sieve:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -14464,12 +12441,12 @@ msgstr "Вживайте це поле для введення будь яког
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
-"Вживайте цей тип додавання для підпису, для того щоб вказати текстовий файл, що "
-"містить текст з підписом. Зміст цього файла буде зчитуватися кожен раз при "
-"створенні нового повідомлення або при додаванні підпису."
+"Вживайте цей тип додавання для підпису, для того щоб вказати текстовий файл, "
+"що містить текст з підписом. Зміст цього файла буде зчитуватися кожен раз "
+"при створенні нового повідомлення або при додаванні підпису."
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -14485,23 +12462,28 @@ msgstr "Відкриває вказаний файл у текстовому р�
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 "Ви можете вказати будь яку команду. Вкажіть повний шлях до файла команди або "
 "тільки назву файла в залежності від того, чи знаходиться цей файл у каталозі "
 "вказаному в $PATH. KMail буде виконувати цю команду та вживати її вивід (до "
 "стандартного виводу), як підпис при створенні нового листа. Загальновживані "
-"команди для цього механізму отримання підпису - це \"fortune\" або \"ksig "
-"-random\"."
+"команди для цього механізму отримання підпису - це \"fortune\" або \"ksig -"
+"random\"."
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "Вкажіть команд&у:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Шлях"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Новий елемент:"
@@ -14536,6 +12518,11 @@ msgstr "Додати групу"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Ви дійсно хочете видалити профіль з назвою <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "Застосувати &до:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -14549,6 +12536,10 @@ msgstr "Редагувати групу"
 msgid "Edit &group..."
 msgstr "Редагувати &групу..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "&Редагувати..."
@@ -14586,9 +12577,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -14625,6 +12616,16 @@ msgstr "Не вмикати"
 msgid "Cannot insert content from file %1: %2"
 msgstr "Неможливо вставити вміст у файл %1: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Кому: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Копія: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -14654,61 +12655,52 @@ msgstr "Неможливо запустити програму каналу з �
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тут можна створити шаблони повідомлень, які використовуються при створенні, "
-"відповіді та пересиланні повідомлень.</p>"
-"<p>В шаблони повідомлень можна вставляти команди для підстановки тексту, це "
-"робиться шляхом введення цих команд вручну або вибору команди через кнопку <i>"
-"Вставити команду</i>.</p>"
-"<p>Шаболи, що вказані тут, прив'язані до теки. Вони мають перевагу як над "
-"загальними шаблонами, так і над шаблонами профілю (якщо вони вказані).</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Тут можна створити шаблони повідомлень, які використовуються при "
+"створенні, відповіді та пересиланні повідомлень.</p><p>В шаблони повідомлень "
+"можна вставляти команди для підстановки тексту, це робиться шляхом введення "
+"цих команд вручну або вибору команди через кнопку <i>Вставити команду</i>.</"
+"p><p>Шаболи, що вказані тут, прив'язані до теки. Вони мають перевагу як над "
+"загальними шаблонами, так і над шаблонами профілю (якщо вони вказані).</p></"
+"qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тут можна створити шаблони повідомлень, які використовуються при створенні, "
-"відповіді та пересиланні повідомлень.</p>"
-"<p>В шаблони повідомлень можна вставляти команди для підстановки тексту, це "
-"робиться шляхом введення цих команд вручну або вибору команди через кнопку <i>"
-"Вставити команду</i>.</p>"
-"<p>Шаболи, що вказані тут, прив'язані до профілю. Вони мають перевагу над "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Тут можна створити шаблони повідомлень, які використовуються при "
+"створенні, відповіді та пересиланні повідомлень.</p><p>В шаблони повідомлень "
+"можна вставляти команди для підстановки тексту, це робиться шляхом введення "
+"цих команд вручну або вибору команди через кнопку <i>Вставити команду</i>.</"
+"p><p>Шаболи, що вказані тут, прив'язані до профілю. Вони мають перевагу над "
 "загальними шаблонами, та можуть буди заміщені шаблонами теки (якщо вони "
 "вказані).</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Тут можна створити шаблони повідомлень, які використовуються при створенні, "
-"відповіді та пересиланні повідомлень.</p>"
-"<p>В шаблони повідомлень можна вставляти команди для підстановки тексту, це "
-"робиться шляхом введення цих команд вручну або вибору команди через кнопку <i>"
-"Вставити команду</i>.</p>"
-"<p>Шаболи, що вказані тут, це загальні (типові) шаблони. Вони можуть буди "
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
+msgstr ""
+"<qt><p>Тут можна створити шаблони повідомлень, які використовуються при "
+"створенні, відповіді та пересиланні повідомлень.</p><p>В шаблони повідомлень "
+"можна вставляти команди для підстановки тексту, це робиться шляхом введення "
+"цих команд вручну або вибору команди через кнопку <i>Вставити команду</i>.</"
+"p><p>Шаболи, що вказані тут, це загальні (типові) шаблони. Вони можуть буди "
 "заміщені шаблонами профілю та шаблонами теки (якщо вони вказані).</p></qt>"
 
 #: templatesconfiguration.cpp:343
@@ -14950,13 +12942,14 @@ msgstr ""
 #: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
-"Переслати в канал тіло оригінального повідомлення і вставити результат \"як є\""
+"Переслати в канал тіло оригінального повідомлення і вставити результат \"як є"
+"\""
 
 #: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
-"Переслати в канал оригінальне повідомлення з заголовками і вставити результат "
-"\"як є\""
+"Переслати в канал оригінальне повідомлення з заголовками і вставити "
+"результат \"як є\""
 
 #: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
@@ -14968,6 +12961,10 @@ msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 "Переслати в канал тіло поточного повідомлення і замінити його результатом"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "Встановити позицію курсора"
@@ -15000,115 +12997,6 @@ msgstr "Увімкнути зневадження"
 msgid "Turn Debug Off"
 msgstr "Вимкнути зневадження"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...можна переходити до наступного або попереднього повідомлення натискаючи \n"
-"кнопки праворуч або ліворуч відповідно?</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...можна швидко створювати фільтри за відправником, адресатом,\n"
-"темою та списком розсилки за допомогою команди меню <em>"
-"Повідомлення-&gt;Створити&nbsp;фільтр</em>?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...можна затирати &quot;[назва списку розсилки]&quot;\n"
-"вилучив його з теми повідомлення за допомогою дії фільтра <em>переписати\n"
-"заголовок</em>? Просто вкажіть\n"
-"<pre>переписати заголовок &quot;Subject&quot;\n"
-"   замінити &quot;\\s*\\[назва списку розсилки\\]\\s*&quot;\n"
-"   на &quot;&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...можна зв'язувати списки розсилки з теками\n"
-"у діалозі <em>Тека-&gt;Керування списком розсилки</em>"
-"? Далі ви зможете використовувати команду\n"
-"<em>Повідомлення-&gt;Відіслати&nbsp;у&nbsp;список&nbsp;розсилки...</em>"
-", і буде відкрито редактор повідомлення\n"
-"з встановленою адресою списку розсилки.\n"
-"Ви, також, можете робити це за допомогою клацання середньою кнопкою мишки на "
-"теці.</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...можна призначати окремі піктограми для кожної теки?\n"
-"Дивіться <em>Тека-&gt;Властивості</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...KMail може відображати кольорову панель з типом повідомлення\n"
-"(Звичайний текст/HTML/OpenPGP) для кожного повідомлення?</p>\n"
-"<p>Це перешкоджає спробам відсилання повідомлення зі спробою імітації "
-"правильного підпису повідомлення імітуючи рамку статусу підпису KMail.</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...можна відфільтрувати повідомлення по будь-якому заголовку, якщо ввести "
-"цей заголовок\n"
-"у першому полі для редагування у вікні пошуку?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...можна відфільтрувати тільки HTML повідомлення за допомогою правила \n"
-"<pre>&quot;Content-type&quot; містить &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...при відповіді тільки вибрана частина повідомлення цитується?</p>\n"
-"<p>Якщо нічого не вибрано, то цитується повне повідомлення.</p>\n"
-"<p>Це буде працювати навіть з текстом долучень, якщо встановлено\n"
-"<em>Вигляд-&gt;Долучення-&gt;В тілі повідомлення</em>.</p>\n"
-"<p>Це працює зі всіма типами відповідей за винятком\n"
-"<em>Повідомлення-&gt;Відповідь без цитування</em>.</p>\n"
-"<p align=\"right\"><em>пораду запропонував David F. Newman</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "Немає чого повертати."
@@ -15158,7 +13046,8 @@ msgstr "Згорнути цитату."
 #: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr ""
-"Не вдається запустити менеджер сертифікатів. Будь ласка, перевірте інсталяцію."
+"Не вдається запустити менеджер сертифікатів. Будь ласка, перевірте "
+"інсталяцію."
 
 #: urlhandlermanager.cpp:564
 #, c-format
@@ -15173,6 +13062,15 @@ msgstr "Долучення: № %1 (без назви)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "Файл з назвою \"%1\" вже існує. Хочете його перезаписати?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Перезаписати файл?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -15289,9 +13187,9 @@ msgstr "&Відіслати зображення з кожним повідом�
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 "Ввімкніть, якщо бажаєте, щоб KMail додавала, так званий, заголовок X-Face до "
 "повідомлень створених у цьому профілі. X-Face - це малі (48x48 пікселів) "
@@ -15323,13 +13221,13 @@ msgstr "Вибрати файл..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
-"Скористайтесь для вибору файла для створення зображення. Джерельне зображення "
-"повинно мати високу контрастність та буди майже квадратним. Додавання світлого "
-"тла допоможе покращити результат."
+"Скористайтесь для вибору файла для створення зображення. Джерельне "
+"зображення повинно мати високу контрастність та буди майже квадратним. "
+"Додавання світлого тла допоможе покращити результат."
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -15337,16 +13235,16 @@ msgstr "Вибрати з адресної книги"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 "Ви можете скористатися зменшеною версією зображення з вашої адресної книги."
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>KMail може відсилати малі (48x48 пікселів), низькоякісні, монохромні "
 "зображення з кожним повідомленням. Наприклад, це може бути малюнок з вашим "
@@ -15359,11 +13257,11 @@ msgstr "Вживайте це поля для вводу довільного р
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"Приклади можна взяти з <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Приклади можна взяти з <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
+"www.xs4all.nl/~ace/X-Faces/</a>."
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -15378,130 +13276,1775 @@ msgstr "Зображення не вказано"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Ви не вказали ваш власний контакт у вашій адресній книзі."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>Всього: %2<br>Непрочитано: %3<br>Розмір: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Підписування"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>Квота: %1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Автоматично &підписувати повідомлення"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Встановити тему повідомлення"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"Коли цей параметр ввімкнено, то всі повідомлення, що відсилаються, будуть "
+"підписані. Звісно можливо вимикати підписування для кожного повідомлення "
+"окремо."
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "Відіслати копію до вказаної адреси"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "Шифрування"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "Відіслати потайну копію до вказаної адреси"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Додати вказаний заголовок до повідомлення"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"Коли цей параметр ввімкнено, то повідомлення файл буде зашифровано не тільки "
+"відкритим ключем адресата, а і вашим ключем. Це дозволить вам розшифрувати "
+"повідомлення/файл пізніше. Загалом це гарна ідея."
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Зчитати тіло повідомлення з вказаного файла"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Показувати пі&дписаний/зашифрований текст його після створення"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "Встановити тіло повідомлення"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"Коли цей параметр ввімкнено, підписаний/зашифрований текст буде відображено "
+"в окремому вікні, що дозволить дізнатися, як він виглядатиме перед його "
+"відсиланням. Це потрібно для перевірки роботи системи шифрування."
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Додати долучення до листа. Можна вказати декілька раз"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Зберігати відіслані повідомлення &зашифрованими"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Тільки перевірити на нову пошту"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Ввімкніть, щоб зберігати повідомлення зашифрованими"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Тільки відкрити вікно редактора"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Зберігати повідомлення зашифрованими</h1>\n"
+"Якщо ввімкнено, відіслані повідомлення будуть зберігатися зашифрованими (у "
+"такому ж вигляді як їх було відіслано). Вмикання цього параметра не "
+"рекомендовано тому, що ви не зможете прочитати повідомлення після того, як "
+"сертифікат застаріє.\n"
+"<p>\n"
+"Проте, можуть існувати локальні правила, які вимагають вимкнення цього "
+"параметра. Якщо у вас є сумніви, то спитайте у вашого адміністратора.\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "Переглянути вказаний файл з повідомленням"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "Завжди показувати ключі шифрування &для схвалення"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
-"Відіслати повідомлення на \"address\" або долучити\n"
-"файл на який вказує \"URL\""
+"Коли цей параметр ввімкнено, програма завжди буде надавати список відкритих "
+"ключів, з яких можна буде вибрати ключ для шифрування. Якщо цей параметр "
+"вимкнено, то вікно зі списком ключів буде з'являтися тільки, якщо не вдалося "
+"знайти відповідний ключ або знайдено декілька відповідних ключів."
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Читати"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "Авто&матично шифрувати повідомлення, якщо можливо"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Старе"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"Коли цей параметр ввімкнено, то всі повідомлення, що відсилаються, будуть "
+"зашифровані, якщо шифрування можливе та вимагається. Звісно можливо вимикати "
+"автоматичне шифрування для кожного повідомлення окремо."
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Видалено"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "Ніколи не підписувати/шифрувати при з&береженні чернетки"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "З відповіддю"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "Як це працює."
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Перенаправлене"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Універсальний"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "У черзі"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Відповідь"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Відіслане"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "Відповідь всім"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Переглянуте"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "Пересилання"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Проігнороване"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "Скороч&ення:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Спам"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "&Тип шаблону:"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Не спам"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "Текст шаблону"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Завдання"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "Скорочення шаблону"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Має долучення"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "Тип шаблону"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "%1 з %2 %3 вжито"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Властивості теки"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Шлях"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "&Тека містить список розсилки"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "&Адреса списку:"
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "&Звичайне:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "&Непрочитане:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "Вилучення застарілих повідомлень"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "Вилу&чати через:"
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "Влучити застарілі &прочитані повідомлення"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "Вилучати ч&ерез:"
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "Вилучити застарілі &непрочитані повідомлення"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "День(ів)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Тиждень(нів)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Місяць(ів)"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Додатково"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "П&рофіль відправника:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "&Формат зберігання:"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "Сп&исок відображає:"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "Відсилати пошту з черги при перевірці пошти"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "Файл з назвою \"%1\" вже існує. Хочете його перезаписати?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>Виберіть чи бажано щоб KMail автоматично відсилала всі повідомлення з "
+"теки вихідні при ручній перевірці пошти або будь-якій перевірці пошити, чи "
+"бажано, щоб повідомлення не відсилалися автоматично.</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Перезаписати файл?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, fuzzy, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"<p>Є нові повідомлення у цій теці (%1), які ще не були вивантажені на "
+"сервер, але, здається, у вас тепер недостатньо прав для вивантаження в цю "
+"теку. Щоб розв'язати цю проблему зв'яжіться з системним адміністратором, щоб "
+"він надав вам права вивантаження нових повідомлень, або пересуньте "
+"повідомлення з цієї теки.</p> <p>Пересунути ці повідомлення в іншу теку "
+"зараз?</p>"
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Остання вибрана тека у діалоговому вікні вибирання тек."
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "Правила присутності у системному лотку"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Багатослівне сповіщення про надходження пошти"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"Якщо ввімкнено, то у сповіщення про нову пошту для кожної теки буде показано "
+"кількість нових повідомлень, що надійшли останнім часом. У протилежному "
+"випадку, ви побачите тільки просте повідомлення \"Надійшла нова пошта\"."
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "В&кажіть редактор:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Використов&увати зовнішній редактор"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "&Ввімкнути роботу в робочій групі"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "Перекручувати заголовки Від:/Кому: у відповідях на запрошення"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Програма Microsoft Outlook має декілька дефектів у реалізації стандарту i-"
+"календаря; цей параметр враховує один з них. Якщо ті хто використовує "
+"Outlook не можуть отримати ваші відповіді, то спробуйте ввімкнути цей "
+"параметр."
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "Відсилати групові запрошення до в тілі листа"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Програма Microsoft Outlook має декілька дефектів у реалізації стандарту i-"
+"календаря; цей параметр враховує один з них. Якщо ті хто використовує "
+"Outlook не можуть отримати ваші запрошення, то спробуйте ввімкнути цей "
+"параметр."
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Автоматичне відсилання запрошень"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"Коли ввімкнено, ви не будете бачити вікно редактора. Замість цього, всі "
+"запрошення будуть відсилатися автоматично. Якщо ви бажаєте переглядати "
+"повідомлення перед відсиланням, то ви можете вимкнути цей параметр. Однак, "
+"пам'ятайте, текст у редакторі буде в форматі i-календаря, та ви не повинні "
+"змінювати його вручну."
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>Вмикання цього параметра уможливлює збереження даних з програм середовища "
+"Kontact (KOrganizer, KAddressBook та KNotes).</p><p>Якщо увімкнете цей "
+"параметр, то додатково потрібно вказати програмам, щоб вони використовували "
+"ресурси IMAP. Це можна зробити в Центрі керування TDE.</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>Взагалі немає причин бачити теки що містять IMAP ресурси. Але якщо їх "
+"потрібно бачити з якихсь причин, то це налаштовується тут.</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>Виберіть формат зберігання групових тек. <ul><li>Типовий формат - це "
+"вживання стандартів ical (для тек з календарями) та vcard (для тек з "
+"адресними книгами). Цей формат дозволяє використовувати всі функції програм "
+"середовища Kontact.</li><li>Формат Kolab XML використовує власну модель "
+"зберігання даних, яка більш схожа на модель, що вживається в Outlook. Цей "
+"формат надає більшу сумісність з  Outlook, при вживанні сервера Kolab або "
+"сумісне з ним рішення.</li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>Вибір батьківської теки для тек з IMAP ресурсами.</p><p>Типово, сервер "
+"Kolab встановлює батьківською текою IMAP теку \"вхідні\".</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>Це Ід. рахунку, що містить теки IMAP ресурсів.</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>Якщо ви бажаєте встановити назви у IMAP сховищі до назв у вашій мові, то "
+"виберіть одну з наявних мов.</p><p> Будь ласка зауважте, що єдиної причиною "
+"зробити це - є сумісність з Microsoft Outlook. А взагалі, це дуже погана "
+"ідея, тому що унеможливлює зміну мови. </p><p>Не встановлюйте, якщо у вас "
+"немає причини робити це.</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+"Це значення використовується для того, щоб вирішити чи показати введення до "
+"KMail."
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Максимальна кількість з'єднань на кожний вузол"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"Дозволяє обмежити кількість з'єднань окремого до вузла при перевірці нової "
+"пошти. Типове значення (0) - необмежена кількість з'єднань."
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "Показувати рядок швидкого пошуку"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"Цей параметр вмикає або вимикає рядок пошуку над списком повідомлень; його "
+"можна використовувати для швидкого знаходження інформації у списку "
+"повідомлень."
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+"Вживати початковий набір символів при відповіді або пересиланні (якщо "
+"можливо)"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "&Автоматично вставляти підпис"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Запам'ятати цей профіль для подальшого його використання у редакторі "
+"повідомлень.\n"
+"       "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+"Запам'ятати цю теку відісланих повідомлень для подальшого її використання у "
+"редакторі повідомлень."
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+"Запам'ятати ці налаштування відсилання пошти для подальшого їх використання "
+"у редакторі повідомлень."
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"Запам'ятати цей профіль для подальшого його використання у редакторі "
+"повідомлень.\n"
+"       "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "П&ереносити слова на стовпчику:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Максимальна кількість рядків редактора адресатів."
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+"Ввімкніть цей параметр, щоб програма Outlook &#8482; могла зрозуміти назви "
+"долучень, що містять не латинські літери"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "&Автоматично запитувати за сповіщенням про долю листа"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>Увімкніть, якщо ви бажаєте, щоб KMail запитувала на сповіщення про "
+"долю повідомлення для кожного відісланого листа.</p><p>Вказане тут значення "
+"впливає тільки на типову поведінку програми, ви завжди матимете можливість "
+"ввімкнути чи вимкнути запит сповіщення для кожного окремого повідомлення у "
+"редакторі через пункт меню <em>Параметри</em>->&gt;<em>Запитати сповіщення "
+"про долю листа</em>.</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "Вживати для автозавершення недавні адреси"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"Вимкніть цей параметр, якщо ви не хочете, щоб недавно вжиті адреси "
+"з'являлись в списку автозавершення в полі адреси."
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Інтервал автозбереження:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"Редактор може автоматично створювати резервну копію тексту, який редагується "
+"в ньому. Інтервал часу між створеннями резервних копій вказується тут. "
+"Заборонити створення резервних копій можна встановивши значення, що дорівнює "
+"нулю."
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "Вставляти підпис перед цитованим текстом"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "&Заміняти відомий префікс на \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Заміняти відомий префікс на \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "В&живати кмітливе цитування"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Підпис застарів."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "Тип вікна для вибору адрес"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+"Встановлює тип діалогового вікна для вибору адресатів для \"Кому\",\n"
+"        \"Копія\" та \"Прихована копія\"."
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "Тип вікна для редагування адрес"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+"Встановлює тип діалогового вікна для редагування адресатів для \"Кому\",\n"
+"        \"Копія\" та \"Прихована копія\"."
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Максимальна кількість рядків редактора адресатів."
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+"Вживати початковий набір символів при відповіді або пересиланні (якщо "
+"можливо)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"В деяких листах електронної пошти, особливо в створених автоматично, не "
+"вказано кодування, яке потрібно використовувати для правильно відображення "
+"цих листів. У таких випадках буде вживатися запасне кодування, яке можна "
+"вказати тут. Встановіть кодування яке найуживаніше у частині світу в якій ви "
+"знаходитесь. Типове значення - це системне кодування."
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"Зміна значення з \"Автоматично\" змусить вживати вказане кодування для всіх "
+"листів електронної пошти, в незалежності від кодування вказаного в самих "
+"листах."
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"Ввімкніть, якщо ви бажаєте щоб в тексті повідомлення символьні посмішки, "
+"наприклад \":-)\", були замінені на піктограми."
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+"Увімкніть цей параметр для показу різних рівнів цитування. Вимкніть, щоб "
+"сховати рівні."
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Рівень автоматичного згортання:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "Зменшити шрифт для цитат"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "Увімкніть цей параметр, щоб показувати цитати меншим шрифтом."
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Зберігати відіслані повідомлення &зашифрованими"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Показувати агента користувача у вишуканих заголовках"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "Відсилати сповіщення про долю повідомлення з порожнім відправником."
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"Відсилати сповіщення про долю повідомлення з порожнім відправником. Деякі "
+"сервери можуть бути налаштованими, щоб не приймати такі повідомлення, тому "
+"якщо виникнуть проблеми зі сповіщеннями про долю повідомлення, то вимкніть "
+"цей параметр."
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "Фрази було перетворено в шаблони"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "Старі фрази було перетворено в шаблони"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "Шаблон повідомлення для нового повідомлення"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "Шаблон повідомлення відповіді"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "Шаблон повідомлення відповіді всім"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "Шаблон повідомлення пересилання"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "Символи цитати"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Ред&агувати файл"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Редагувати..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Перехід"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Тека"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "П&овідомлення"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "Особлива відповідь"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Переслати"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Підказки"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Скинути налаштування шрифту"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Пенал HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Спільні параметри"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "Пенал HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Перевіряти сертифікати вживаючи CAC"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+"Якщо ввімкнено, S/MIME сертифікати будуть перевірятися на наявність у "
+"списках анулювання сертифікатів (САС)."
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "Вживати миттєву перевірку сертифікатів (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"Якщо ввімкнено, S/MIME сертифікати будуть миттєво перевірятися через "
+"протокол OCSP (Online Certificates Status Protocol). Заповніть поле адреси "
+"OCSP-відповідача нижче."
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Миттєва перевірка сертифікатів"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Адреса OCSP-відповідача:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"Введіть тут адресу адресу сервера для миттєвої перевірки сертифікатів (OCSP-"
+"відповідача). Типово адреса починається з http://."
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Підпис OCSP-відповідача:"
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Ігнорувати службову адресу (URL) сертифікатів"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Не перевіряти правила сертифікатів"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"Типово GnuPG використовує файл ~/.gnupg/policies.txt для перевірки чи "
+"дозволені правила сертифікатів. Якщо цей параметр ввімкнено, правила не "
+"перевіряються."
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "Ніколи не довідуватися у САС"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+"Якщо ввімкнено, то S/MIME сертифікати ніколи не будуть шукатися у списках "
+"анулювання сертифікатів."
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Діставати сертифікати джерела, яких не вистачає"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"Якщо ввімкнено, то сертифікати джерела, яких не вистачає, будуть діставатися "
+"при потребі (це стосується до обох методів перевірки, САС та OCSP)"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP запити"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "Не робити будь яких HTTP запитів"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "Повністю вимикає вживання HTTP для S/MIME."
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Вживати цей проксі для HTTP запитів: "
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Вживати системний проксі:"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"Якщо ввімкнено, то для всіх HTTP запитів буде використовуватися HTTP проксі "
+"вказаний праворуч (це значення визначається змінною оточення http_proxy)."
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"Введіть тут адресу вашого HTTP проксі, який буде використовуватися для всіх "
+"HTTP запитів, що стосуються S/MIME. Синтаксис: вузол:порт, наприклад, "
+"myproxy.nowhere.com:3128."
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "Ігнорувати HTTP-адреси для САС вказані в сертифікатах"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Сертифікат, що підлягає перевірці у САС, за звичай, містить записи з "
+"інформацією про \"адреси розповсюдження САС\". Ця інформація є адресою "
+"(URL), яка розповідає як отримати доступ до CAC. Використовується перша "
+"знайдена у сертифікаті адреса розповсюдження САС. Якщо ввімкнуто цей "
+"параметр, то при пошуку адреси розповсюдження САС, всі записи, що вказують "
+"використовувати HTTP протокол, будуть проігноровані."
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP запити"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "Не робити будь яких LDAP запитів"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "Повністю вимикає вживання LDAP для S/MIME."
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "Ігнорувати LDAP-адреси для САС вказані в сертифікатах"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"Сертифікат, що підлягає перевірці у САС, за звичай, містить записи з "
+"інформацією про \"адреси розповсюдження САС\". Ця інформація є адресою "
+"(URL), яка розповідає як отримати доступ до CAC. Використовується перша "
+"знайдена у сертифікаті адреса розповсюдження САС. Якщо ввімкнуто цей "
+"параметр, то при пошуку адреси розповсюдження САС, всі записи, що вказують "
+"використовувати LDAP протокол, будуть проігноровані."
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "Основний вузол для LDAP запитів:"
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"Вказування LDAP сервера змусить спочатку робити всі LDAP запити до цього "
+"сервера. Більш точно, цей параметр змушує заміняти назву вузла та порт "
+"вказані у LDAP адресі (URL) та вказані тут назва вузла та порт будуть "
+"вживатись, якщо назва вузла та порт відсутні у LDAP адресі (URL). Інші LDAP "
+"сервери будуть вжиті тільки, якщо з'єднання до \"посередника\" зазнало "
+"невдачі.\n"
+"Синтаксис: \"ВУЗОЛ\" або \"ВУЗОЛ:ПОРТ\". Якщо ПОРТ не вказано, то буде "
+"використано порт №389 (стандартний LDAP порт)."
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "&Додати"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "Група:"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Скинути налаштування шрифту"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "Підказки"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "Змінні"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "Метод вводу змінних"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "Роздільник:"
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Налаштування шаблонів"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "Відповіді відправнику"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Відповідь всім / Відповідь до списку"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "Пересилання повідомлення"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "Попереджувати при спробі відіслати &непідписане повідомлення"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+"Відмітьте, щоб отримувати попередження при спробі відіслати непідписане "
+"повідомлення."
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджувати при спробі відіслати непідписане повідомлення</h1>\n"
+"Коли ввімкнено, вас буде попереджено кожний раз при відсиланні повідомлення, "
+"що повністю не підписане, або не підписані деякі його частиниned.\n"
+"<p>Для збереження максимальної цілісності, рекомендовано ввімкнути цей "
+"параметр.\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "Поперед&жати при відсиланні незашифрованих повідомлень"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+"Увімкніть, щоб вас попереджали, коли відсилаються незашифровані повідомлення."
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджати при відсиланні незашифрованих повідомлень</h1>\n"
+"Якщо ввімкнено, то вас будуть попереджати кожний раз при відсиланні "
+"незашифрованих повідомлень або повідомлень з незашифрованими частинами.\n"
+"<p>\n"
+"Для збереження максимальної цілісності, рекомендовано ввімкнути цей "
+"параметр.\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "Попереджати якщо адреси ад&ресата немає у сертифікаті"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "Відмітьте, щоб вас попереджали, якщо адреси немає у сертифікаті"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджати якщо електронної адреси адресата немає у сертифікаті</h1>\n"
+"Якщо ввімкнено, то буде виникати попередження, якщо електронної адреси "
+"адресата немає у сертифікаті, що використовується для шифрування.\n"
+"<p>\n"
+"Рекомендується залишити цей параметр ввімкненою для максимальної безпеки.\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+"&Попереджати якщо сертифікати/ключі скоро застаріють (вкажіть час нижче)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "Для підписування"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "Для шифрування"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "Виберіть кількість днів"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджати якщо сертифікат для підписування втратить чинність</h1>\n"
+"Виберіть мінімальну кількість днів, на протязі яких сертифікат для "
+"підписування повинен бути чинним, для того щоб не показувати попередження.\n"
+"<p>\n"
+"Рекомендоване значення у SPHINX - 14 днів.\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджати, якщо сертифікат для шифрування втратить чинність</h1>\n"
+"Виберіть мінімальну кількість днів, на протязі яких сертифікат для "
+"шифрування  повинен бути чинним, для того щоб не показувати попередження.\n"
+"<p>\n"
+"Рекомендоване значення у SPHINX - 14 днів.\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджати, якщо сертифікат в низці втратить чинність</h1>\n"
+"Виберіть мінімальну кількість днів на протязі якої всі сертифікати у низці "
+"повинні бути дійсними, для того щоб не показувати попередження.\n"
+"<p>\n"
+"Рекомендоване значення у SPHINX - 14 днів.\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджати якщо сертифікат гаранта сертифіката втратить чинність</h1>\n"
+"Виберіть мінімальну кількість днів, на протязі яких сертифікат гаранта "
+"сертифіката повинен бути чинним, для того щоб не показувати попередження.\n"
+"<p>\n"
+"Рекомендоване значення у SPHINX - 14 днів.\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>Попереджати якщо кореневий сертифікат втратить чинність</h1>\n"
+"Виберіть мінімальну кількість днів, на протязі яких кореневий повинен бути "
+"чинним, для того щоб не показувати попередження.\n"
+"<p>\n"
+"Рекомендоване значення у SPHINX - 14 днів.\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "Для кореневих сертифікатів:"
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Для проміжних сертифікатів гаранта:"
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Для сертифікатів/ключів користувачів:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "Ввімкнути знову всі \"більше не питати\" попередження"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+"<p>...можна переходити до наступного або попереднього повідомлення "
+"натискаючи \n"
+"кнопки праворуч або ліворуч відповідно?</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...можна швидко створювати фільтри за відправником, адресатом,\n"
+"темою та списком розсилки за допомогою команди меню <em>Повідомлення-&gt;"
+"Створити&nbsp;фільтр</em>?</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...можна затирати &quot;[назва списку розсилки]&quot;\n"
+"вилучив його з теми повідомлення за допомогою дії фільтра <em>переписати\n"
+"заголовок</em>? Просто вкажіть\n"
+"<pre>переписати заголовок &quot;Subject&quot;\n"
+"   замінити &quot;\\s*\\[назва списку розсилки\\]\\s*&quot;\n"
+"   на &quot;&quot;</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...можна зв'язувати списки розсилки з теками\n"
+"у діалозі <em>Тека-&gt;Керування списком розсилки</em>? Далі ви зможете "
+"використовувати команду\n"
+"<em>Повідомлення-&gt;Відіслати&nbsp;у&nbsp;список&nbsp;розсилки...</em>, і "
+"буде відкрито редактор повідомлення\n"
+"з встановленою адресою списку розсилки.\n"
+"Ви, також, можете робити це за допомогою клацання середньою кнопкою мишки на "
+"теці.</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...можна призначати окремі піктограми для кожної теки?\n"
+"Дивіться <em>Тека-&gt;Властивості</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...KMail може відображати кольорову панель з типом повідомлення\n"
+"(Звичайний текст/HTML/OpenPGP) для кожного повідомлення?</p>\n"
+"<p>Це перешкоджає спробам відсилання повідомлення зі спробою імітації "
+"правильного підпису повідомлення імітуючи рамку статусу підпису KMail.</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...можна відфільтрувати повідомлення по будь-якому заголовку, якщо ввести "
+"цей заголовок\n"
+"у першому полі для редагування у вікні пошуку?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...можна відфільтрувати тільки HTML повідомлення за допомогою правила \n"
+"<pre>&quot;Content-type&quot; містить &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...при відповіді тільки вибрана частина повідомлення цитується?</p>\n"
+"<p>Якщо нічого не вибрано, то цитується повне повідомлення.</p>\n"
+"<p>Це буде працювати навіть з текстом долучень, якщо встановлено\n"
+"<em>Вигляд-&gt;Долучення-&gt;В тілі повідомлення</em>.</p>\n"
+"<p>Це працює зі всіма типами відповідей за винятком\n"
+"<em>Повідомлення-&gt;Відповідь без цитування</em>.</p>\n"
+"<p align=\"right\"><em>пораду запропонував David F. Newman</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
diff --git a/tde-i18n-uz/messages/tdepim/kmail.po b/tde-i18n-uz/messages/tdepim/kmail.po
index 415e09191df..b99b28ea659 100644
--- a/tde-i18n-uz/messages/tdepim/kmail.po
+++ b/tde-i18n-uz/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-04-14 22:22+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mashrab Quvatov, Nurali Abdurahmonov"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -167,6 +167,12 @@ msgstr "&Yoʻq (ehtiyot bilan ishlating)"
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Tarixni tozalash"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -244,13 +250,13 @@ msgstr "&Foydalanuvchi:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Sizning Internet xizmat provayderingiz sizga oʻz serveri bilan bogʻlanish uchun "
-"<em>foydalanuvchi</em> beradi. Bu odatda elektron pochtangizni birinchi qismi "
-"boʻladi (<em>@</em> belgisidan oldingi qism)."
+"Sizning Internet xizmat provayderingiz sizga oʻz serveri bilan bogʻlanish "
+"uchun <em>foydalanuvchi</em> beradi. Bu odatda elektron pochtangizni "
+"birinchi qismi boʻladi (<em>@</em> belgisidan oldingi qism)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -271,12 +277,12 @@ msgstr "POP maxfiy soʻzini &eslab qolish"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -307,11 +313,13 @@ msgstr "Koʻrsatilgan hajmdan &ortiq xatlarni filtrlash"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
-"Belgilansa, POP filtrlari xatlar bilan nima qilishni belgilaydi. Keyin ularni "
-"serverdan olish, oʻchirish yoki qoldirish imkoniyatini tanlashingiz mumkin."
+"Belgilansa, POP filtrlari xatlar bilan nima qilishni belgilaydi. Keyin "
+"ularni serverdan olish, oʻchirish yoki qoldirish imkoniyatini tanlashingiz "
+"mumkin."
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -361,13 +369,15 @@ msgstr "Oddiy &matn"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -410,9 +420,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -471,9 +481,9 @@ msgstr "&Ilovalarni talabga binoan yuklash"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -513,7 +523,7 @@ msgstr "<yoʻq>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Qabul qilish qutisi"
 
@@ -521,28 +531,29 @@ msgstr "Qabul qilish qutisi"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -551,23 +562,23 @@ msgstr "Iltimos oldin Umumiy tabda server va portni koʻrsating."
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -575,8 +586,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -655,8 +666,8 @@ msgstr "IMAP hisobi"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Pochta qabul qilish uchun moslamalarning tarmoq qismiga hisob qoʻshishingiz "
 "kerak."
@@ -695,14 +706,14 @@ msgstr "KMail dasturiga marhamat"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Siz KMail'ni birinchi marta ishlatmoqdasiz. Pochta hisoblaringizni moslash "
-"uchun ushbu yordamchidan foydalanishingiz mumkin. Elektron pochta "
-"provayderingiz bilan oʻrnatiladigan aloqa maʼlumotlarini navbatdagi oynalarga "
-"kiriting.</qt>"
+"<qt>Siz KMail'ni birinchi marta ishlatmoqdasiz. Pochta hisoblaringizni "
+"moslash uchun ushbu yordamchidan foydalanishingiz mumkin. Elektron pochta "
+"provayderingiz bilan oʻrnatiladigan aloqa maʼlumotlarini navbatdagi "
+"oynalarga kiriting.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -764,8 +775,7 @@ msgstr "Lokal joʻnatishni qoʻllash"
 msgid "Server Information"
 msgstr "Server haqida maʼlumot"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Yoʻq"
@@ -904,17 +914,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -952,10 +961,9 @@ msgstr "Yangi xabar"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -966,8 +974,8 @@ msgstr "Xabarlarni antivirus yordamida tekshirish"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -977,8 +985,8 @@ msgstr "Virus bor deb aniqlangan xabarlarni tanlangan jildga koʻchirish"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -987,8 +995,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1179,8 +1187,8 @@ msgstr "Serverdagi %1 jildini oʻqishda xato roʻy berdi: "
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1200,8 +1208,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1231,15 +1239,15 @@ msgstr "Oʻchirilgan"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1269,15 +1277,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Profilni yuklash"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "KMail moslamasi"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Qoʻshish..."
@@ -1307,6 +1319,11 @@ msgstr "<qt><b>%1</b> nomli shaxsiyatni rostdan oʻchirishni istaysizmi?</qt>"
 msgid "Remove Identity"
 msgstr "Shaxsiyatni olib tashlash"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Olib tashlash"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Qoʻshish..."
@@ -1315,6 +1332,11 @@ msgstr "Qoʻshish..."
 msgid "Modify..."
 msgstr "Oʻzgartirish"
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Olib tashlash"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Andoza deb belgilash"
@@ -1331,17 +1353,15 @@ msgstr "&Joʻnatish"
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Nomi"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Turi"
@@ -1363,8 +1383,7 @@ msgstr "Andoza deb belgilash"
 msgid "Common Options"
 msgstr "Umumiy parametrlar"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Joʻnatishdan oldin &tasdiqlash"
@@ -1415,14 +1434,14 @@ msgstr "Ando&za domen:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1440,9 +1459,9 @@ msgstr ""
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Andoza)"
 
@@ -1521,6 +1540,10 @@ msgstr "Hisobni oʻzgartirish"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr ""
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Ranglar"
@@ -1629,8 +1652,7 @@ msgstr "Koʻrilgan bogʻ"
 msgid "Misspelled Words"
 msgstr "Notoʻgʻri yozilgan soʻzlar"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Yangi xabar"
@@ -1820,8 +1842,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1830,40 +1852,33 @@ msgstr "Sanani koʻrsatish"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1878,8 +1893,7 @@ msgstr ""
 msgid "Show s&pam status in fancy headers"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1888,8 +1902,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1917,8 +1930,7 @@ msgstr "Avto"
 msgid "&Override character encoding:"
 msgstr "Kodlash usuli"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr ""
@@ -2021,13 +2033,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2051,21 +2062,20 @@ msgstr "Hammaga j&avob berish:"
 msgid "&Forward:"
 msgstr "&Uzatish:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D, Siz yozgansiz:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D, %F yozgan:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Uzatilgan xabar"
 
@@ -2101,8 +2111,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2137,10 +2147,9 @@ msgstr "Qiymati"
 msgid "Ne&w"
 msgstr "&Yangi"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Nomi:"
@@ -2149,16 +2158,15 @@ msgstr "&Nomi:"
 msgid "&Value:"
 msgstr "&Qiymati:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2185,13 +2193,13 @@ msgstr "ilova qilingan"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2216,62 +2224,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2288,10 +2290,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2370,8 +2372,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "proksisiz"
@@ -2400,8 +2401,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2425,8 +2426,8 @@ msgstr ""
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2493,16 +2494,14 @@ msgstr ""
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2537,32 +2536,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2628,8 +2622,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2638,8 +2632,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2692,19 +2686,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2717,14 +2710,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2833,17 +2826,16 @@ msgstr "&Uzatish"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2860,15 +2852,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2937,8 +2929,8 @@ msgstr "Shaxsiyatni tahrirlash"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3193,6 +3185,11 @@ msgstr "Jildni tanlash"
 msgid "Filters"
 msgstr "Filter %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Hamma matnni tanlash"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3224,8 +3221,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3242,10 +3239,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3266,10 +3264,10 @@ msgstr "cheksiz"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3278,7 +3276,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail xato"
@@ -3319,9 +3317,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3371,8 +3369,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3383,8 +3381,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr "%1 serveri bilan aloqa oʻrnatilmoqda. Iltimos kutib turing..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "%1 serveri bilan aloqa oʻrnatishda xato roʻy berdi."
@@ -3410,8 +3407,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3441,7 +3438,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Jildni tanlash"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Lokal jildlar"
@@ -3467,9 +3464,9 @@ msgstr "&Qisqa jildlar roʻyxati"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3490,11 +3487,20 @@ msgstr "&Bekor qilish"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Nomaʼlum"
@@ -3612,55 +3618,16 @@ msgstr "Spem holati:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b>X<br>a<br>b<br>a<br>r<b><br><br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt><b>X"
-"<br>a"
-"<br>b"
-"<br>a"
-"<br>r<b>"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>"
-"<br>e"
-"<br>m"
-"<br>a"
-"<br>s</b></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><b>X<br>a<br>b<br>a<br>r<b><br><br>H<br>T<br>M<br>L<br><br>e<br>m<br>a<br>s</"
+"b></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3672,12 +3639,9 @@ msgstr "I&smingiz:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3686,11 +3650,9 @@ msgstr "&Tashkilot:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3699,14 +3661,11 @@ msgstr "&Elektron pochta:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3716,21 +3675,12 @@ msgstr "&Elektron pochta:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3753,12 +3703,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3771,20 +3720,18 @@ msgstr ""
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3803,11 +3750,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3820,18 +3766,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3852,14 +3797,12 @@ msgstr ""
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3868,15 +3811,12 @@ msgstr ""
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3917,7 +3857,7 @@ msgstr "&Imzo"
 msgid "&Picture"
 msgstr "&Rasm"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Xato elektron pochta manzili"
 
@@ -3936,8 +3876,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -3986,8 +3926,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Andoza)"
 
@@ -4033,14 +3973,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4078,14 +4018,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Xato: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4233,14 +4178,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4267,136 +4212,110 @@ msgstr ""
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4410,136 +4329,110 @@ msgstr ""
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4552,9 +4445,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4580,26 +4474,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4610,8 +4504,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4633,8 +4527,8 @@ msgstr ""
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4654,8 +4548,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4691,11 +4585,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4735,8 +4629,7 @@ msgid "Critical error: Unable to collect mail: "
 msgstr ""
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
 msgstr ""
 
 #: kmacctimap.cpp:300
@@ -4828,6 +4721,52 @@ msgstr "&Uzilgan IMAP"
 msgid "&Maildir mailbox"
 msgstr ""
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Xabar mavzusini koʻrsatish"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Xabarga sarlavha qoʻshish"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Xabar tarkibini fayldan oʻqish"
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Xabarlarni oʻchirish"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Xabarga ilova qoʻshish. Buni takrorlash mumkin."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Faqat yangi xabarga tekshirish"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Faqat xabar yaratish oynasini ochish"
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "Xabarning &hajmini koʻrsatish"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Xat"
@@ -4881,9 +4820,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4929,14 +4868,13 @@ msgstr "URL'dan xotiraga nusxa olindi."
 #: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
-"<qt><b>%1</b> nomli fayl mavjud."
-"<br>Uni almashtirishni istaysizmi?</qt>"
+"<qt><b>%1</b> nomli fayl mavjud.<br>Uni almashtirishni istaysizmi?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Faylga saqlash"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Almashtirish"
 
@@ -4954,7 +4892,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4974,207 +4912,207 @@ msgstr "Fayl tarkibida xabar mavjud emas."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Xabarlarni oʻchirish"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Xabarlarni oʻchirish"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Diskda boʻsh joy yetishmayaptimi?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Ushbu jildga koʻchirish"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Ushbu jildga nusxa olish"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Xabarlarni koʻchirish"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Xabarlarni oʻchirish"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL ochilmoqda..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Rostdan <b>%1</b>'ni ishga tushirishni istaysizmi?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Ishga tushirish"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Saqlash uchun ilova topilmadi."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Ilovani saqlash"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "ilova.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "ilova.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "%1 nomli fayl allaqachon mavjud. Uni almashtirishni istaysizmi?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Fayl allaqachon mavjud"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Almashtirish"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail savoli"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Qoldirilmasin"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Imzoni qoldirish"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "%1 faylini yozib boʻlmadi."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Xat"
@@ -5272,7 +5210,7 @@ msgstr "Hajmi"
 msgid "Encoding"
 msgstr "Kodlash usuli"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Qisish"
 
@@ -5284,7 +5222,7 @@ msgstr ""
 msgid "Sign"
 msgstr "Imzo"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Ilova nomi:"
 
@@ -5306,7 +5244,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5316,9 +5255,9 @@ msgstr "Qoʻshimcha qabul qiluvchilar"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5327,9 +5266,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5341,7 +5279,7 @@ msgstr "Xatni &joʻnatish"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&Keyinroq joʻnatish"
@@ -5410,8 +5348,7 @@ msgstr ""
 msgid "Cl&ean Spaces"
 msgstr "Boʻsh joylarni oʻchi&rish"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Eni oʻzgarmaydigan &shriftni qoʻllash"
@@ -5553,31 +5490,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Andoza"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5681,8 +5618,8 @@ msgstr "Xabar yaratuvchini yopish"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5690,42 +5627,44 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr ""
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Shunday joʻnatish"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Faylni ilova qilish"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Ilova"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Fayldan qoʻyish"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Fayldan qoʻyish"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5765,276 +5704,288 @@ msgid ""
 "View"
 msgstr "Koʻrish"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Tahrirlash"
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Skriptni tahrirlash..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "...sifatida s&aqlash"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Xossalari"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Ilova qoʻshish"
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Qoldirish"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Ilovani saqlash"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Matn sifatida qoʻshish"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Ilova sifatida qoʻshish"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "&Ilova sifatida qoʻyish"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "nomsiz"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Onlayn/oflayn"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Siz mavzuni aniqlamadingiz. Bunga qaramasdan xabarni joʻnataymi?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Mavzu aniqlanmagan"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Siz mavzuni aniqlamadingiz. Bunga qaramasdan xabarni joʻnataymi?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Mavzu aniqlanmagan"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr ""
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Mavzuni koʻrsatish"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 #, fuzzy
 msgid "Sign (delete markup)"
 msgstr "Jildni oʻch&irish"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Xabar joʻnatilish arafasida..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Joʻnatishni tasdiqlash"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Darhol joʻnatish"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<qabul qiluvchilar>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Qoʻshimcha qabul qiluvchilar"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Imloni tekshirish"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Imloni tekshirish"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Imloni tekshirish bekor qilindi."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Imloni tekshirish toʻxtatildi."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Imloni tekshirish tugadi."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Imloni tekshirish"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Xabar %1 tomonidan imzolangan."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Xabar %1 tomonidan imzolangan."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP xabar - kodlangan"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Xabar sarlavhasi:"
@@ -6082,8 +6033,8 @@ msgstr "Imloni tekshirish - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6117,9 +6068,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6341,102 +6291,86 @@ msgstr "Tovushni oʻynash"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6448,6 +6382,16 @@ msgstr "POP3 filter qoidalari"
 msgid "Filter Rules"
 msgstr "Filter qoidalari"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Import qilish"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Import qilish"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Mavjud filterlar"
@@ -6528,6 +6472,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "Bu filter uchun nishoncha:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Kimga"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Yuqoriga"
@@ -6536,16 +6485,29 @@ msgstr "Yuqoriga"
 msgid "Down"
 msgstr "Pastga"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Nomini oʻzgartirish"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Yangi"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Nusxa olish"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Oʻchirilgan"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6554,8 +6516,8 @@ msgstr "&Qisqa jildlar roʻyxati"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6627,19 +6589,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6677,8 +6636,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6714,8 +6673,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6843,14 +6802,11 @@ msgstr "Serverda tub jildlar yaratilmoqda"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p><b>%1</b> jildi oʻchirilganga oʻxshaydi. Uni serverdan ham oʻchirishni "
-"istaysizmi?</p></qt>"
+"<qt><p><b>%1</b> jildi oʻchirilganga oʻxshaydi. Uni serverdan ham "
+"oʻchirishni istaysizmi?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -6871,13 +6827,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p><b>%1</b> jildi oʻchirilganga oʻxshaydi. Uni serverdan ham oʻchirishni "
-"istaysizmi?</p></qt>"
+"<qt><p><b>%1</b> jildi oʻchirilganga oʻxshaydi. Uni serverdan ham "
+"oʻchirishni istaysizmi?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -6885,14 +6839,14 @@ msgstr "Toʻxtatildi"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6905,11 +6859,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6918,15 +6872,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Koʻchirish:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Koʻchirilmasin"
 
@@ -6939,8 +6898,7 @@ msgstr "Xabarlarni jilga koʻchirish"
 msgid "Permissions (ACL)"
 msgstr "Oʻqilgan"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Umumiy"
@@ -6965,8 +6923,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Boshqa nishonchalarni ishlatish"
@@ -6985,14 +6942,13 @@ msgstr ""
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7006,9 +6962,9 @@ msgstr "Javoblarni shu jildda saqlash"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7019,17 +6975,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Ustunni k&oʻrsatish:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Andoza deb belgilash"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Joʻnatuvchi"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Qabul qiluvchi"
@@ -7040,11 +7000,11 @@ msgstr "&Joʻnatuvchi shaxsiyati:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7063,12 +7023,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7099,17 +7059,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7181,7 +7141,8 @@ msgstr "Jild maʼlumotlarini olishda xato roʻy berdi."
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7205,8 +7166,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7245,13 +7206,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7307,13 +7266,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7321,8 +7280,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7330,7 +7289,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Jildni yaratib boʻlmadi"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7429,9 +7388,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7450,7 +7409,8 @@ msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr ""
-"<qt><b>%1</b> jildini yaratish muvaffaqiyatsiz tugadi. U allaqachon mavjud.</qt>"
+"<qt><b>%1</b> jildini yaratish muvaffaqiyatsiz tugadi. U allaqachon mavjud.</"
+"qt>"
 
 #: kmfoldertree.cpp:2000
 msgid ""
@@ -7463,7 +7423,8 @@ msgstr ""
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr ""
-"<qt><b>%1</b> jildini yaratish muvaffaqiyatsiz tugadi. U allaqachon mavjud.</qt>"
+"<qt><b>%1</b> jildini yaratish muvaffaqiyatsiz tugadi. U allaqachon mavjud.</"
+"qt>"
 
 #: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
@@ -7570,15 +7531,15 @@ msgstr "%1 Jild faqat oʻqish uchun."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Rostdan tanlangan xabarni oʻchirishni istaysizmi?"
-"<br>Oʻchirilgandan keyin uni tiklab boʻlmaydi.</qt>\n"
-"<qt>Rostdan tanlangan %n xabarni oʻchirishni istaysizmi?"
-"<br>Oʻchirilgandan keyin ularni tiklab boʻlmaydi.</qt>"
+"<qt>Rostdan tanlangan xabarni oʻchirishni istaysizmi?<br>Oʻchirilgandan "
+"keyin uni tiklab boʻlmaydi.</qt>\n"
+"<qt>Rostdan tanlangan %n xabarni oʻchirishni istaysizmi?<br>Oʻchirilgandan "
+"keyin ularni tiklab boʻlmaydi.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -7628,124 +7589,123 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Sertifikat imzosi talab qilinadi"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail hozir oflayn holatida. Qanday davom etmoqchisiz?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Onlaynda ishlash"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Oflaynda ishlash"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Joʻnatish qutisi"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Joʻnatilgan"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Chiqindilar qutisi"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr ""
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Almashtirish"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Oxirgi qidiruv"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7753,11 +7713,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Chiqindilar qutisini boʻshatish"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 "Chiqindilar qutisini hamma hisoblar uchun boʻshatishga ishonchingiz komilmi?"
@@ -7834,8 +7794,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Yangi xat keldi</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -7873,8 +7832,8 @@ msgstr "Chiqindilar qutisini boʻshatishga ishonchingiz komilmi?"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Hamma xabarlarni <b>%1</b> jildidan chiqindilar qutisiga koʻchirishga "
 "ishonchingiz komilmi?</qt>"
@@ -7901,8 +7860,8 @@ msgstr "Qidiruvni olib tashlash"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7915,37 +7874,39 @@ msgstr "<qt>Rostdan <b>%1</b> nomli boʻsh jildni oʻchirishni istaysizmi?</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 "<qt>Rostdan <b>%1</b> nomli boʻsh jildni uning tub jildlari bilan birga "
-"oʻchirishni istaysizmi? Ushbu tub jildlar boʻsh boʻlmasligi mumkin va u yerdagi "
-"narsalar ham oʻchiriladi."
-"<p><b>Esingizda tursin</b>, oʻchiriladigan xabarlar chiqindilar qutisiga "
-"saqlanmasdan butunlay oʻchiriladi.</qt>"
+"oʻchirishni istaysizmi? Ushbu tub jildlar boʻsh boʻlmasligi mumkin va u "
+"yerdagi narsalar ham oʻchiriladi.<p><b>Esingizda tursin</b>, oʻchiriladigan "
+"xabarlar chiqindilar qutisiga saqlanmasdan butunlay oʻchiriladi.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 "<qt>Rostdan <b>%1</b> nomli boʻsh jildni uning tub jildlari bilan birga "
-"oʻchirishni istaysizmi? Ushbu tub jildlar boʻsh boʻlmasligi mumkin va u yerdagi "
-"narsalar ham oʻchiriladi.</qt>"
+"oʻchirishni istaysizmi? Ushbu tub jildlar boʻsh boʻlmasligi mumkin va u "
+"yerdagi narsalar ham oʻchiriladi.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Oʻchirilgan"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -7959,9 +7920,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -7975,8 +7936,8 @@ msgstr "HTML'dan foydalanish"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -7993,8 +7954,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8010,7 +7971,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8346,8 +8308,7 @@ msgstr "Ilovalarni &saqlash"
 msgid "Appl&y All Filters"
 msgstr "Ham&ma filterlarni qoʻllash"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Fil&terni qoʻllash"
@@ -8460,7 +8421,6 @@ msgstr "Keyingi oʻqi&lmagan xabar"
 msgid "Go to the next unread message"
 msgstr "Keyingi oʻqilmagan xabarga oʻtish"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Oldingi xabar"
@@ -8596,25 +8556,25 @@ msgstr " Ishga tayyorlanmoqda..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8622,8 +8582,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8631,8 +8591,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8661,17 +8621,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr ""
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Ilova: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "&Ilovalarni talabga binoan yuklash"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8721,29 +8681,26 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8752,11 +8709,10 @@ msgstr "&Taʼrifi:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8765,14 +8721,13 @@ msgstr "&Kodlash usuli:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8781,13 +8736,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8796,9 +8749,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8808,9 +8760,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8825,11 +8776,9 @@ msgstr "POP filter"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9085,17 +9034,16 @@ msgstr "TDE uchun elektron pochta dasturi."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Jildning tarkibi olinmoqda</h2>"
-"<p>Iltimos kutib turing. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Jildning tarkibi olinmoqda</h2><p>Iltimos kutib "
+"turing. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9104,18 +9052,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9125,14 +9072,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr ""
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9172,7 +9118,8 @@ msgstr "Ilovani koʻrish: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9196,12 +9143,14 @@ msgstr "Ilovani ochaymi?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9223,6 +9172,58 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Oʻqilgan"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Eski"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Oʻchirilgan"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Javob berilgan"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Uzatilgan"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Navbatda"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Joʻnatilgan"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Nazoratda"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Eʼtibor berilmadi"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Spem"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Xem"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Vazifa"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Ilovali"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9302,17 +9303,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9338,8 +9339,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9364,8 +9365,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9376,13 +9378,11 @@ msgstr "Joʻnatish bekor qilindi."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9401,8 +9401,9 @@ msgstr "Joʻnatishni &bekor qilish"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9438,30 +9439,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9473,6 +9474,10 @@ msgstr ""
 msgid "Exit"
 msgstr "Chiqish"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Yangi xabar"
@@ -9499,8 +9504,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9577,8 +9583,8 @@ msgstr "Server &tasdiqlashni talab qiladi"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9599,10 +9605,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9632,8 +9637,8 @@ msgstr ""
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9646,10 +9651,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9872,22 +9877,18 @@ msgstr "Xabarni &tahrirlash"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9898,8 +9899,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9914,14 +9915,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10016,8 +10017,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10050,8 +10051,9 @@ msgstr "Keyingi xabarga oʻtish"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10061,8 +10063,8 @@ msgstr ""
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10082,71 +10084,69 @@ msgstr ""
 msgid "Unencrypted Message Warning"
 msgstr ""
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Kodlashni oʻzgartirish"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10168,10 +10168,10 @@ msgstr "Pochta qutisi &formati:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10181,8 +10181,8 @@ msgstr "Jild &tarkibi:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10205,7 +10205,8 @@ msgstr "Mavzu aniqlanmagan"
 #: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
-"<qt><b>%1</b> jildini yaratish muvaffaqiyatsiz tugadi. U allaqachon mavjud.</qt>"
+"<qt><b>%1</b> jildini yaratish muvaffaqiyatsiz tugadi. U allaqachon mavjud.</"
+"qt>"
 
 #: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
@@ -10223,8 +10224,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr ""
 
@@ -10253,8 +10253,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10290,18 +10290,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10549,8 +10549,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10666,10 +10666,11 @@ msgstr ""
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10686,7 +10687,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -10703,1643 +10705,12 @@ msgstr ""
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Oʻ&tish"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Jild"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Xabar"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Uzatish"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML asboblar paneli"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Imzolash"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Xabarlarni &avtomatik imzolash"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Tanlangan xabarlarni oʻqilmagan deb belgilash"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Kimga: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Nusxa: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Umumiy"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Javob berish"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Hammaga j&avob berish"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Uzatish"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Tugmalar birikmasi:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Almashtirish"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Jildning xossalari"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Od&diy:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Oʻ&qilmagan:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Kun"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Hafta"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Oy"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Qoʻshimcha"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Joʻnatuvchi &shaxsiyati:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Hech qanday sertifikat topilmadi"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Sertifikat qoidalari tekshirilmasin"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Qoʻshish..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Shrift moslamalarini tiklash"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "cheksiz"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Joʻnatishni tasdiqlash"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Joʻnatuvchiga javob berish:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Hammaga j&avob berish"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Uzatilgan xabar"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Kodlash"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " kun"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Jild tarkibi:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Almashtirish"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Almashtirish"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Tahrirchini &koʻrsatish:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Xabarlarni &avtomatik imzolash"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Avto-saqlash oraligʻi:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Imzoning muddati oʻtgan."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Tanlangan xabarlarni oʻqilmagan deb belgilash"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Xabarlar roʻyxati - Yangi xabarlar"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12454,6 +10825,11 @@ msgstr "Hisobni qoʻshish"
 msgid "Add as BCC"
 msgstr "Hisobni qoʻshish"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Bekor qilish"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12469,10 +10845,10 @@ msgstr "Tanlangan qabul qiluvchilar"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12490,8 +10866,8 @@ msgstr "Manzil tanlash oynasini ishlatish"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12599,10 +10975,19 @@ msgstr "dan katta yo teng"
 msgid " bytes"
 msgstr " bayt"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " kun"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12751,13 +11136,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -12775,8 +11158,7 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -12794,8 +11176,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -12804,8 +11185,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Mavjud filterlar"
 
 #: sievedebugdialog.cpp:358
@@ -12874,8 +11254,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12892,17 +11272,22 @@ msgstr "Tanlangan faylni matn tahrirchida ochish."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Buyruqni koʻrsatish:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Yangi yozuv:"
@@ -12939,6 +11324,10 @@ msgstr "Hisobni qoʻshish"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt><b>%1</b> nomli shaxsiyatni rostdan oʻchirishni istaysizmi?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+msgid "&Apply"
+msgstr ""
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -12953,6 +11342,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Skriptni tahrirlash..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -12992,9 +11385,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13033,6 +11426,16 @@ msgstr ""
 "\"%1\" faylini ochib boʻlmadi:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Kimga: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Nusxa: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13062,36 +11465,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13326,6 +11725,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13362,76 +11765,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13499,6 +11832,15 @@ msgstr "Ilova #%1 (nomsiz)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "\"%1\" nomli fayl allaqachon mavjud. Uni almashtirishni istaysizmi?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Faylni almashtirishni istaysizmi?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13601,9 +11943,9 @@ msgstr "Hamma xabarga r&asm qoʻshib joʻnatish"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13632,9 +11974,9 @@ msgstr "Faylni tanlash"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13643,15 +11985,15 @@ msgstr "Manzillar daftaridan"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13660,8 +12002,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13677,130 +12019,1509 @@ msgstr "Rasmsiz"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Imzolash"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Xabarlarni &avtomatik imzolash"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Xabar mavzusini koʻrsatish"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Xabarga sarlavha qoʻshish"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Xabar tarkibini fayldan oʻqish"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Tanlangan xabarlarni oʻqilmagan deb belgilash"
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Xabarlarni oʻchirish"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Xabarga ilova qoʻshish. Buni takrorlash mumkin."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Faqat yangi xabarga tekshirish"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Faqat xabar yaratish oynasini ochish"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "Xabarning &hajmini koʻrsatish"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Oʻqilgan"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Eski"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Oʻchirilgan"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Umumiy"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Javob berilgan"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Javob berish"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Uzatilgan"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Hammaga j&avob berish"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Navbatda"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Uzatish"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Joʻnatilgan"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Tugmalar birikmasi:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Nazoratda"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Almashtirish"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Eʼtibor berilmadi"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Jild tarkibi:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Spem"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Almashtirish"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Xem"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Almashtirish"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Vazifa"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Jildning xossalari"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Ilovali"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Od&diy:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Oʻ&qilmagan:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
 msgstr ""
 
-#: util.h:208
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Kun"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Hafta"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Oy"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Qoʻshimcha"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Joʻnatuvchi &shaxsiyati:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "\"%1\" nomli fayl allaqachon mavjud. Uni almashtirishni istaysizmi?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Faylni almashtirishni istaysizmi?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Tahrirchini &koʻrsatish:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Xabarlarni &avtomatik imzolash"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Avto-saqlash oraligʻi:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Imzoning muddati oʻtgan."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Tanlangan xabarlarni oʻqilmagan deb belgilash"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr ""
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Xabarlar roʻyxati - Yangi xabarlar"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Faylni tahrirlash"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Tahrirlash"
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Oʻ&tish"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Jild"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Xabar"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Uzatish"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Shrift moslamalarini tiklash"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML asboblar paneli"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Umumiy parametrlar"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML asboblar paneli"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Hech qanday sertifikat topilmadi"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Sertifikat qoidalari tekshirilmasin"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Qoʻshish..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr ""
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Shrift moslamalarini tiklash"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "cheksiz"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Joʻnatishni tasdiqlash"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Joʻnatuvchiga javob berish:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Hammaga j&avob berish"
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Uzatilgan xabar"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Kodlash"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -13857,8 +13578,5 @@ msgstr "Faylni almashtirishni istaysizmi?"
 #~ msgid "Attaching Image Failed"
 #~ msgstr "Rasmni ilova qilish muvaffaqiyatsiz tugadi"
 
-#~ msgid "Configure KMail"
-#~ msgstr "KMail moslamasi"
-
 #~ msgid "Open with..."
 #~ msgstr "...bilan ochish"
diff --git a/tde-i18n-uz@cyrillic/messages/tdepim/kmail.po b/tde-i18n-uz@cyrillic/messages/tdepim/kmail.po
index f2e5d47ab6f..ba5d26268be 100644
--- a/tde-i18n-uz@cyrillic/messages/tdepim/kmail.po
+++ b/tde-i18n-uz@cyrillic/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-04-14 22:22+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Машраб Қуватов, Нурали Абдураҳмонов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -167,6 +167,12 @@ msgstr "&Йўқ (эҳтиёт билан ишлатинг)"
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Тарихни тозалаш"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -244,13 +250,13 @@ msgstr "&Фойдаланувчи:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"Сизнинг Интернет хизмат провайдерингиз сизга ўз сервери билан боғланиш учун <em>"
-"фойдаланувчи</em> беради. Бу одатда электрон почтангизни биринчи қисми бўлади "
-"(<em>@</em> белгисидан олдинги қисм)."
+"Сизнинг Интернет хизмат провайдерингиз сизга ўз сервери билан боғланиш учун "
+"<em>фойдаланувчи</em> беради. Бу одатда электрон почтангизни биринчи қисми "
+"бўлади (<em>@</em> белгисидан олдинги қисм)."
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -271,12 +277,12 @@ msgstr "POP махфий сўзини &эслаб қолиш"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -307,8 +313,9 @@ msgstr "Кўрсатилган ҳажмдан &ортиқ хатларни фи�
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "Белгиланса, POP филтрлари хатлар билан нима қилишни белгилайди. Кейин уларни "
 "сервердан олиш, ўчириш ёки қолдириш имкониятини танлашингиз мумкин."
@@ -361,13 +368,15 @@ msgstr "Оддий &матн"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -410,9 +419,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -471,9 +480,9 @@ msgstr "&Иловаларни талабга биноан юклаш"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -513,7 +522,7 @@ msgstr "<йўқ>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "Қабул қилиш қутиси"
 
@@ -521,28 +530,29 @@ msgstr "Қабул қилиш қутиси"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -551,23 +561,23 @@ msgstr "Илтимос олдин Умумий табда сервер ва по
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -575,8 +585,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -655,8 +665,8 @@ msgstr "IMAP ҳисоби"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "Почта қабул қилиш учун мосламаларнинг тармоқ қисмига ҳисоб қўшишингиз керак."
 
@@ -694,13 +704,13 @@ msgstr "KMail дастурига марҳамат"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>Сиз KMail'ни биринчи марта ишлатмоқдасиз. Почта ҳисобларингизни мослаш учун "
-"ушбу ёрдамчидан фойдаланишингиз мумкин. Электрон почта провайдерингиз билан "
-"ўрнатиладиган алоқа маълумотларини навбатдаги ойналарга киритинг.</qt>"
+"<qt>Сиз KMail'ни биринчи марта ишлатмоқдасиз. Почта ҳисобларингизни мослаш "
+"учун ушбу ёрдамчидан фойдаланишингиз мумкин. Электрон почта провайдерингиз "
+"билан ўрнатиладиган алоқа маълумотларини навбатдаги ойналарга киритинг.</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -762,8 +772,7 @@ msgstr "Локал жўнатишни қўллаш"
 msgid "Server Information"
 msgstr "Сервер ҳақида маълумот"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Йўқ"
@@ -902,17 +911,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -950,10 +958,9 @@ msgstr "Янги хабар"
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -964,8 +971,8 @@ msgstr "Хабарларни антивирус ёрдамида текшири�
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -975,8 +982,8 @@ msgstr "Вирус бор деб аниқланган хабарларни та�
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -985,8 +992,8 @@ msgstr ""
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1176,8 +1183,8 @@ msgstr "Сервердаги %1 жилдини ўқишда хато рўй бе
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1197,8 +1204,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1228,15 +1235,15 @@ msgstr "Ўчирилган"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1266,15 +1273,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "&Профилни юклаш"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "KMail мосламаси"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Қўшиш..."
@@ -1304,6 +1315,11 @@ msgstr "<qt><b>%1</b> номли шахсиятни ростдан ўчириш�
 msgid "Remove Identity"
 msgstr "Шахсиятни олиб ташлаш"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Олиб ташлаш"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Қўшиш..."
@@ -1312,6 +1328,11 @@ msgstr "Қўшиш..."
 msgid "Modify..."
 msgstr "Ўзгартириш"
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Олиб ташлаш"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Андоза деб белгилаш"
@@ -1328,17 +1349,15 @@ msgstr "&Жўнатиш"
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Номи"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Тури"
@@ -1360,8 +1379,7 @@ msgstr "Андоза деб белгилаш"
 msgid "Common Options"
 msgstr "Умумий параметрлар"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Жўнатишдан олдин &тасдиқлаш"
@@ -1412,14 +1430,14 @@ msgstr "Андо&за домен:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1437,9 +1455,9 @@ msgstr ""
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (Андоза)"
 
@@ -1518,6 +1536,10 @@ msgstr "Ҳисобни ўзгартириш"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr ""
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "&Ранглар"
@@ -1626,8 +1648,7 @@ msgstr "Кўрилган боғ"
 msgid "Misspelled Words"
 msgstr "Нотўғри ёзилган сўзлар"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "Янги хабар"
@@ -1817,8 +1838,8 @@ msgstr ""
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1827,40 +1848,33 @@ msgstr "Санани кўрсатиш"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -1875,8 +1889,7 @@ msgstr ""
 msgid "Show s&pam status in fancy headers"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
@@ -1885,8 +1898,7 @@ msgstr ""
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -1914,8 +1926,7 @@ msgstr "Авто"
 msgid "&Override character encoding:"
 msgstr "Кодлаш усули"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr ""
@@ -2018,13 +2029,12 @@ msgstr ""
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2048,21 +2058,20 @@ msgstr "Ҳаммага ж&авоб бериш:"
 msgid "&Forward:"
 msgstr "&Узатиш:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr ""
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "%D, Сиз ёзгансиз:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "%D, %F ёзган:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Узатилган хабар"
 
@@ -2098,8 +2107,8 @@ msgstr ""
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2134,10 +2143,9 @@ msgstr "Қиймати"
 msgid "Ne&w"
 msgstr "&Янги"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&Номи:"
@@ -2146,16 +2154,15 @@ msgstr "&Номи:"
 msgid "&Value:"
 msgstr "&Қиймати:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2182,13 +2189,13 @@ msgstr "илова қилинган"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2213,62 +2220,56 @@ msgstr ""
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2285,10 +2286,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2367,8 +2368,7 @@ msgstr ""
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "проксисиз"
@@ -2397,8 +2397,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2422,8 +2422,8 @@ msgstr ""
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2490,16 +2490,14 @@ msgstr ""
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2534,32 +2532,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2625,8 +2618,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2635,8 +2628,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2689,19 +2682,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
@@ -2714,14 +2706,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2830,17 +2822,16 @@ msgstr "&Узатиш"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2857,15 +2848,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -2934,8 +2925,8 @@ msgstr "Шахсиятни таҳрирлаш"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3189,6 +3180,11 @@ msgstr "Жилдни танлаш"
 msgid "Filters"
 msgstr "Филтер %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "Ҳамма матнни танлаш"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3220,8 +3216,8 @@ msgstr ""
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3238,10 +3234,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3262,10 +3259,10 @@ msgstr "чексиз"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3274,7 +3271,7 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail хато"
@@ -3315,9 +3312,9 @@ msgstr ""
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3367,8 +3364,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3379,8 +3376,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr "%1 сервери билан алоқа ўрнатилмоқда. Илтимос кутиб туринг..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "%1 сервери билан алоқа ўрнатишда хато рўй берди."
@@ -3406,8 +3402,8 @@ msgstr ""
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3437,7 +3433,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Жилдни танлаш"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Локал жилдлар"
@@ -3463,9 +3459,9 @@ msgstr "&Қисқа жилдлар рўйхати"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3486,11 +3482,20 @@ msgstr "&Бекор қилиш"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Номаълум"
@@ -3608,55 +3613,16 @@ msgstr "Спэм ҳолати:"
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b>Х<br>а<br>б<br>а<br>р<b><br><br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt><b>Х"
-"<br>а"
-"<br>б"
-"<br>а"
-"<br>р<b>"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br>"
-"<br>э"
-"<br>м"
-"<br>а"
-"<br>с</b></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><b>Х<br>а<br>б<br>а<br>р<b><br><br>H<br>T<br>M<br>L<br><br>э<br>м<br>а<br>с</"
+"b></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3668,12 +3634,9 @@ msgstr "И&смингиз:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3682,11 +3645,9 @@ msgstr "&Ташкилот:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3695,14 +3656,11 @@ msgstr "&Электрон почта:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3712,21 +3670,12 @@ msgstr "&Электрон почта:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3749,12 +3698,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3767,20 +3715,18 @@ msgstr ""
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3799,11 +3745,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3816,18 +3761,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3848,14 +3792,12 @@ msgstr ""
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3864,15 +3806,12 @@ msgstr ""
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3913,7 +3852,7 @@ msgstr "&Имзо"
 msgid "&Picture"
 msgstr "&Расм"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "Хато электрон почта манзили"
 
@@ -3932,8 +3871,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -3982,8 +3921,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (Андоза)"
 
@@ -4029,14 +3968,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4074,14 +4013,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Хато: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4229,14 +4173,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4263,136 +4207,110 @@ msgstr ""
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4406,136 +4324,110 @@ msgstr ""
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4548,9 +4440,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4576,26 +4469,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4606,8 +4499,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4629,8 +4522,8 @@ msgstr ""
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4650,8 +4543,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4687,11 +4580,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4731,8 +4624,7 @@ msgid "Critical error: Unable to collect mail: "
 msgstr ""
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
 msgstr ""
 
 #: kmacctimap.cpp:300
@@ -4824,6 +4716,52 @@ msgstr "&Узилган IMAP"
 msgid "&Maildir mailbox"
 msgstr ""
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "Хабар мавзусини кўрсатиш"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "Хабарга сарлавҳа қўшиш"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "Хабар таркибини файлдан ўқиш"
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Хабарларни ўчириш"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Хабарга илова қўшиш. Буни такрорлаш мумкин."
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "Фақат янги хабарга текшириш"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "Фақат хабар яратиш ойнасини очиш"
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "Хабарнинг &ҳажмини кўрсатиш"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Хат"
@@ -4877,9 +4815,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -4926,11 +4864,11 @@ msgstr "URL'дан хотирага нусха олинди."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt><b>%1</b> номли файл мавжуд.<br>Уни алмаштиришни истайсизми?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Файлга сақлаш"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Алмаштириш"
 
@@ -4948,7 +4886,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4968,207 +4906,207 @@ msgstr "Файл таркибида хабар мавжуд эмас."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Хабарларни ўчириш"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Хабарларни ўчириш"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "Дискда бўш жой етишмаяптими?"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Ушбу жилдга кўчириш"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Ушбу жилдга нусха олиш"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "Хабарларни кўчириш"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "Хабарларни ўчириш"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "URL очилмоқда..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ростдан <b>%1</b>'ни ишга туширишни истайсизми?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Ишга тушириш"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "Сақлаш учун илова топилмади."
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "Иловани сақлаш"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "илова.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "илова.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "%1 номли файл аллақачон мавжуд. Уни алмаштиришни истайсизми?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Файл аллақачон мавжуд"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "&Алмаштириш"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail саволи"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "Қолдирилмасин"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "Имзони қолдириш"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "%1 файлини ёзиб бўлмади."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr ""
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Хат"
@@ -5266,7 +5204,7 @@ msgstr "Ҳажми"
 msgid "Encoding"
 msgstr "Кодлаш усули"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "Қисиш"
 
@@ -5278,7 +5216,7 @@ msgstr ""
 msgid "Sign"
 msgstr "Имзо"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "Илова номи:"
 
@@ -5300,7 +5238,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5310,9 +5249,9 @@ msgstr "Қўшимча қабул қилувчилар"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5321,9 +5260,8 @@ msgstr ""
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5335,7 +5273,7 @@ msgstr "Хатни &жўнатиш"
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "&Кейинроқ жўнатиш"
@@ -5404,8 +5342,7 @@ msgstr ""
 msgid "Cl&ean Spaces"
 msgstr "Бўш жойларни ўчи&риш"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Эни ўзгармайдиган &шрифтни қўллаш"
@@ -5547,31 +5484,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Андоза"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5675,8 +5612,8 @@ msgstr "Хабар яратувчини ёпиш"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5684,42 +5621,44 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr ""
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "&Шундай жўнатиш"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Файлни илова қилиш"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Илова"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Файлдан қўйиш"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Файлдан қўйиш"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5759,276 +5698,288 @@ msgid ""
 "View"
 msgstr "Кўриш"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Таҳрирлаш"
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Скриптни таҳрирлаш..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "...сифатида с&ақлаш"
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Хоссалари"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Илова қўшиш"
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Қолдириш"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr ""
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Иловани сақлаш"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "Матн сифатида қўшиш"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "Илова сифатида қўшиш"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "&Илова сифатида қўйиш"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "номсиз"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "Онлайн/офлайн"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Сиз мавзуни аниқламадингиз. Бунга қарамасдан хабарни жўнатайми?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Мавзу аниқланмаган"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Сиз мавзуни аниқламадингиз. Бунга қарамасдан хабарни жўнатайми?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "Мавзу аниқланмаган"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr ""
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "&Мавзуни кўрсатиш"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 #, fuzzy
 msgid "Sign (delete markup)"
 msgstr "Жилдни ўч&ириш"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr ""
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr ""
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "Хабар жўнатилиш арафасида..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "Жўнатишни тасдиқлаш"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Дарҳол жўнатиш"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<қабул қилувчилар>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Қўшимча қабул қилувчилар"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Имлони текшириш"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Имлони текшириш"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " Имлони текшириш бекор қилинди."
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " Имлони текшириш тўхтатилди."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " Имлони текшириш тугади."
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "Имлони текшириш"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Хабар %1 томонидан имзоланган."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Хабар %1 томонидан имзоланган."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP хабар - кодланган"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Хабар сарлавҳаси:"
@@ -6076,8 +6027,8 @@ msgstr "Имлони текшириш - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 
 #: kmedit.cpp:893
@@ -6111,9 +6062,8 @@ msgstr ""
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6335,102 +6285,86 @@ msgstr "Товушни ўйнаш"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6442,6 +6376,16 @@ msgstr "POP3 филтер қоидалари"
 msgid "Filter Rules"
 msgstr "Филтер қоидалари"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Импорт қилиш"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Импорт қилиш"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Мавжуд филтерлар"
@@ -6522,6 +6466,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "Бу филтер учун нишонча:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Кимга"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Юқорига"
@@ -6530,16 +6479,29 @@ msgstr "Юқорига"
 msgid "Down"
 msgstr "Пастга"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Номини ўзгартириш"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Янги"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Нусха олиш"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Ўчирилган"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6548,8 +6510,8 @@ msgstr "&Қисқа жилдлар рўйхати"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6621,19 +6583,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6671,8 +6630,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6707,8 +6666,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -6836,13 +6795,10 @@ msgstr "Серверда туб жилдлар яратилмоқда"
 #: kmfoldercachedimap.cpp:1707
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p><b>%1</b> жилди ўчирилганга ўхшайди. Уни сервердан ҳам ўчиришни "
+"<qt><p><b>%1</b> жилди ўчирилганга ўхшайди. Уни сервердан ҳам ўчиришни "
 "истайсизми?</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
@@ -6864,12 +6820,10 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
-"<qt>"
-"<p><b>%1</b> жилди ўчирилганга ўхшайди. Уни сервердан ҳам ўчиришни "
+"<qt><p><b>%1</b> жилди ўчирилганга ўхшайди. Уни сервердан ҳам ўчиришни "
 "истайсизми?</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -6878,14 +6832,14 @@ msgstr "Тўхтатилди"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -6898,11 +6852,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -6911,15 +6865,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "Кўчириш:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "Кўчирилмасин"
 
@@ -6932,8 +6891,7 @@ msgstr "Хабарларни жилга кўчириш"
 msgid "Permissions (ACL)"
 msgstr "Ўқилган"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Умумий"
@@ -6958,8 +6916,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "&Бошқа нишончаларни ишлатиш"
@@ -6978,14 +6935,13 @@ msgstr ""
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -6999,9 +6955,9 @@ msgstr "Жавобларни шу жилдда сақлаш"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7012,17 +6968,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Устунни к&ўрсатиш:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Андоза деб белгилаш"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Жўнатувчи"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Қабул қилувчи"
@@ -7033,11 +6993,11 @@ msgstr "&Жўнатувчи шахсияти:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7056,12 +7016,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7092,17 +7052,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7174,7 +7134,8 @@ msgstr "Жилд маълумотларини олишда хато рўй бе�
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7198,8 +7159,8 @@ msgstr ""
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7238,13 +7199,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7300,13 +7259,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7314,8 +7273,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7323,7 +7282,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Жилдни яратиб бўлмади"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7422,9 +7381,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7563,15 +7522,15 @@ msgstr "%1 Жилд фақат ўқиш учун."
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>Ростдан танланган хабарни ўчиришни истайсизми?"
-"<br>Ўчирилгандан кейин уни тиклаб бўлмайди.</qt>\n"
-"<qt>Ростдан танланган %n хабарни ўчиришни истайсизми?"
-"<br>Ўчирилгандан кейин уларни тиклаб бўлмайди.</qt>"
+"<qt>Ростдан танланган хабарни ўчиришни истайсизми?<br>Ўчирилгандан кейин уни "
+"тиклаб бўлмайди.</qt>\n"
+"<qt>Ростдан танланган %n хабарни ўчиришни истайсизми?<br>Ўчирилгандан кейин "
+"уларни тиклаб бўлмайди.</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -7621,124 +7580,123 @@ msgid ""
 "(No space left on device?)"
 msgstr ""
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "Сертификат имзоси талаб қилинади"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr ""
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail ҳозир офлайн ҳолатида. Қандай давом этмоқчисиз?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "Онлайнда ишлаш"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "Офлайнда ишлаш"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "Жўнатиш қутиси"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr ""
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "Жўнатилган"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "Чиқиндилар қутиси"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr ""
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr ""
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr ""
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "&Алмаштириш"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr ""
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Охирги қидирув"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7746,11 +7704,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Чиқиндилар қутисини бўшатиш"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Чиқиндилар қутисини ҳамма ҳисоблар учун бўшатишга ишончингиз комилми?"
 
@@ -7826,8 +7784,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>Янги хат келди</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -7865,8 +7822,8 @@ msgstr "Чиқиндилар қутисини бўшатишга ишончин�
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Ҳамма хабарларни <b>%1</b> жилдидан чиқиндилар қутисига кўчиришга "
 "ишончингиз комилми?</qt>"
@@ -7893,8 +7850,8 @@ msgstr "Қидирувни олиб ташлаш"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1214
@@ -7907,37 +7864,39 @@ msgstr "<qt>Ростдан <b>%1</b> номли бўш жилдни ўчириш
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>Ростдан <b>%1</b> номли бўш жилдни унинг туб жилдлари билан бирга ўчиришни "
-"истайсизми? Ушбу туб жилдлар бўш бўлмаслиги мумкин ва у ердаги нарсалар ҳам "
-"ўчирилади."
-"<p><b>Эсингизда турсин</b>, ўчириладиган хабарлар чиқиндилар қутисига "
-"сақланмасдан бутунлай ўчирилади.</qt>"
+"<qt>Ростдан <b>%1</b> номли бўш жилдни унинг туб жилдлари билан бирга "
+"ўчиришни истайсизми? Ушбу туб жилдлар бўш бўлмаслиги мумкин ва у ердаги "
+"нарсалар ҳам ўчирилади.<p><b>Эсингизда турсин</b>, ўчириладиган хабарлар "
+"чиқиндилар қутисига сақланмасдан бутунлай ўчирилади.</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>Ростдан <b>%1</b> номли бўш жилдни унинг туб жилдлари билан бирга ўчиришни "
-"истайсизми? Ушбу туб жилдлар бўш бўлмаслиги мумкин ва у ердаги нарсалар ҳам "
-"ўчирилади.</qt>"
+"<qt>Ростдан <b>%1</b> номли бўш жилдни унинг туб жилдлари билан бирга "
+"ўчиришни истайсизми? Ушбу туб жилдлар бўш бўлмаслиги мумкин ва у ердаги "
+"нарсалар ҳам ўчирилади.</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Ўчирилган"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -7951,9 +7910,9 @@ msgstr ""
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -7967,8 +7926,8 @@ msgstr "HTML'дан фойдаланиш"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -7985,8 +7944,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8002,7 +7961,8 @@ msgstr ""
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
 #: kmmainwidget.cpp:2508
@@ -8338,8 +8298,7 @@ msgstr "Иловаларни &сақлаш"
 msgid "Appl&y All Filters"
 msgstr "Ҳам&ма филтерларни қўллаш"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "Фил&терни қўллаш"
@@ -8452,7 +8411,6 @@ msgstr "Кейинги ўқи&лмаган хабар"
 msgid "Go to the next unread message"
 msgstr "Кейинги ўқилмаган хабарга ўтиш"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "&Олдинги хабар"
@@ -8588,25 +8546,25 @@ msgstr " Ишга тайёрланмоқда..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8614,8 +8572,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8623,8 +8581,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8653,17 +8611,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr ""
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Илова: %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "&Иловаларни талабга биноан юклаш"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -8713,29 +8671,26 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -8744,11 +8699,10 @@ msgstr "&Таърифи:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -8757,14 +8711,13 @@ msgstr "&Кодлаш усули:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -8773,13 +8726,11 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -8788,9 +8739,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -8800,9 +8750,8 @@ msgstr ""
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -8817,11 +8766,9 @@ msgstr "POP филтер"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9075,17 +9022,16 @@ msgstr "TDE учун электрон почта дастури."
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>Жилднинг таркиби олинмоқда</h2>"
-"<p>Илтимос кутиб туринг. . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Жилднинг таркиби олинмоқда</h2><p>Илтимос кутиб "
+"туринг. . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9094,18 +9040,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9115,14 +9060,13 @@ msgid ""
 msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr ""
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9162,7 +9106,8 @@ msgstr "Иловани кўриш: %1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9186,12 +9131,14 @@ msgstr "Иловани очайми?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9213,6 +9160,58 @@ msgstr ""
 msgid "(match all of the following)"
 msgstr ""
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Ўқилган"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "Эски"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Ўчирилган"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Жавоб берилган"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "Узатилган"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Навбатда"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Жўнатилган"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "Назоратда"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Эътибор берилмади"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "Спэм"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "Хэм"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "Вазифа"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "Иловали"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9292,17 +9291,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9328,8 +9327,8 @@ msgstr ""
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9354,8 +9353,9 @@ msgstr ""
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9366,13 +9366,11 @@ msgstr "Жўнатиш бекор қилинди."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -9391,8 +9389,9 @@ msgstr "Жўнатишни &бекор қилиш"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9427,30 +9426,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9462,6 +9461,10 @@ msgstr ""
 msgid "Exit"
 msgstr "Чиқиш"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "Янги хабар"
@@ -9488,8 +9491,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9566,8 +9570,8 @@ msgstr "Сервер &тасдиқлашни талаб қилади"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9588,10 +9592,9 @@ msgstr ""
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -9621,8 +9624,8 @@ msgstr ""
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -9635,10 +9638,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -9861,22 +9864,18 @@ msgstr "Хабарни &таҳрирлаш"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -9887,8 +9886,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -9903,14 +9902,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10005,8 +10004,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10039,8 +10038,9 @@ msgstr "Кейинги хабарга ўтиш"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10050,8 +10050,8 @@ msgstr ""
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10071,71 +10071,69 @@ msgstr ""
 msgid "Unencrypted Message Warning"
 msgstr ""
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Кодлашни ўзгартириш"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10157,10 +10155,10 @@ msgstr "Почта қутиси &формати:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10170,8 +10168,8 @@ msgstr "Жилд &таркиби:"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10212,8 +10210,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr ""
 
@@ -10242,8 +10239,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -10279,18 +10276,18 @@ msgstr ""
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -10538,8 +10535,8 @@ msgstr ""
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -10655,10 +10652,11 @@ msgstr ""
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -10675,7 +10673,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -10692,1643 +10691,12 @@ msgstr ""
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "Ў&тиш"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "&Жилд"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Хабар"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr ""
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "&Узатиш"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML асбоблар панели"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "Имзолаш"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Хабарларни &автоматик имзолаш"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Танланган хабарларни ўқилмаган деб белгилаш"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Кимга: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Нусха: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "Умумий"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "&Жавоб бериш"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Ҳаммага ж&авоб бериш"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "&Узатиш"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Тугмалар бирикмаси:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "&Алмаштириш"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Жилднинг хоссалари"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "Од&дий:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "Ў&қилмаган:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Кун"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Ҳафта"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Ой"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Қўшимча"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "Жўнатувчи &шахсияти:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Ҳеч қандай сертификат топилмади"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Сертификат қоидалари текширилмасин"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "&Қўшиш..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Шрифт мосламаларини тиклаш"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "чексиз"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Жўнатишни тасдиқлаш"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Жўнатувчига жавоб бериш:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Ҳаммага ж&авоб бериш"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Узатилган хабар"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Кодлаш"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " кун"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "&Жилд таркиби:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "&Алмаштириш"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "&Алмаштириш"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Таҳрирчини &кўрсатиш:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Хабарларни &автоматик имзолаш"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "Авто-сақлаш оралиғи:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr ""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Имзонинг муддати ўтган."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Танланган хабарларни ўқилмаган деб белгилаш"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Хабарлар рўйхати - Янги хабарлар"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12443,6 +10811,11 @@ msgstr "Ҳисобни қўшиш"
 msgid "Add as BCC"
 msgstr "Ҳисобни қўшиш"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Бекор қилиш"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12458,10 +10831,10 @@ msgstr "Танланган қабул қилувчилар"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12479,8 +10852,8 @@ msgstr "Манзил танлаш ойнасини ишлатиш"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -12588,10 +10961,19 @@ msgstr "дан катта ё тенг"
 msgid " bytes"
 msgstr " байт"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " кун"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -12740,13 +11122,11 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -12764,8 +11144,7 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -12783,8 +11162,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -12793,8 +11171,7 @@ msgstr ""
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Мавжуд филтерлар"
 
 #: sievedebugdialog.cpp:358
@@ -12863,8 +11240,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -12881,17 +11258,22 @@ msgstr "Танланган файлни матн таҳрирчида очиш."
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "&Буйруқни кўрсатиш:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Янги ёзув:"
@@ -12928,6 +11310,10 @@ msgstr "Ҳисобни қўшиш"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt><b>%1</b> номли шахсиятни ростдан ўчиришни истайсизми?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+msgid "&Apply"
+msgstr ""
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -12942,6 +11328,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Скриптни таҳрирлаш..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -12981,9 +11371,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13022,6 +11412,16 @@ msgstr ""
 "\"%1\" файлини очиб бўлмади:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Кимга: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Нусха: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13051,36 +11451,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13315,6 +11711,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13351,76 +11751,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr ""
@@ -13488,6 +11818,15 @@ msgstr "Илова #%1 (номсиз)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "\"%1\" номли файл аллақачон мавжуд. Уни алмаштиришни истайсизми?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Файлни алмаштиришни истайсизми?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -13590,9 +11929,9 @@ msgstr "Ҳамма хабарга р&асм қўшиб жўнатиш"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -13621,9 +11960,9 @@ msgstr "Файлни танлаш"
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -13632,15 +11971,15 @@ msgstr "Манзиллар дафтаридан"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -13649,8 +11988,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -13666,130 +12005,1509 @@ msgstr "Расмсиз"
 msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "Имзолаш"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Хабарларни &автоматик имзолаш"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "Хабар мавзусини кўрсатиш"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "Хабарга сарлавҳа қўшиш"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "Хабар таркибини файлдан ўқиш"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Танланган хабарларни ўқилмаган деб белгилаш"
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Хабарларни ўчириш"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Хабарга илова қўшиш. Буни такрорлаш мумкин."
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "Фақат янги хабарга текшириш"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "Фақат хабар яратиш ойнасини очиш"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "Хабарнинг &ҳажмини кўрсатиш"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Ўқилган"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "Эски"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Ўчирилган"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "Умумий"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Жавоб берилган"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "&Жавоб бериш"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "Узатилган"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Ҳаммага ж&авоб бериш"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Навбатда"
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "&Узатиш"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Жўнатилган"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Тугмалар бирикмаси:"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "Назоратда"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "&Алмаштириш"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Эътибор берилмади"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "&Жилд таркиби:"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "Спэм"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "&Алмаштириш"
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "Хэм"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "&Алмаштириш"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "Вазифа"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Жилднинг хоссалари"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "Иловали"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "Од&дий:"
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "Ў&қилмаган:"
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
 msgstr ""
 
-#: util.h:208
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr ""
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Кун"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Ҳафта"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Ой"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Қўшимча"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "Жўнатувчи &шахсияти:"
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr ""
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr ""
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "\"%1\" номли файл аллақачон мавжуд. Уни алмаштиришни истайсизми?"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Файлни алмаштиришни истайсизми?"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr ""
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr ""
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Таҳрирчини &кўрсатиш:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr ""
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Хабарларни &автоматик имзолаш"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr ""
+
+#: kmail.kcfg:368
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "Авто-сақлаш оралиғи:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr ""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr ""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr ""
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Имзонинг муддати ўтган."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr ""
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr ""
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr ""
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Танланган хабарларни ўқилмаган деб белгилаш"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr ""
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Хабарлар рўйхати - Янги хабарлар"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr ""
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Файлни таҳрирлаш"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Таҳрирлаш"
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "Ў&тиш"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "&Жилд"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Хабар"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr ""
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "&Узатиш"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Шрифт мосламаларини тиклаш"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML асбоблар панели"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Умумий параметрлар"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML асбоблар панели"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Ҳеч қандай сертификат топилмади"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr ""
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Сертификат қоидалари текширилмасин"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "&Қўшиш..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr ""
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Шрифт мосламаларини тиклаш"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "чексиз"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Жўнатишни тасдиқлаш"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Жўнатувчига жавоб бериш:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Ҳаммага ж&авоб бериш"
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Узатилган хабар"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr ""
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr ""
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr ""
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr ""
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Кодлаш"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr ""
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr ""
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr ""
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -13846,8 +13564,5 @@ msgstr "Файлни алмаштиришни истайсизми?"
 #~ msgid "Attaching Image Failed"
 #~ msgstr "Расмни илова қилиш муваффақиятсиз тугади"
 
-#~ msgid "Configure KMail"
-#~ msgstr "KMail мосламаси"
-
 #~ msgid "Open with..."
 #~ msgstr "...билан очиш"
diff --git a/tde-i18n-wa/messages/tdepim/kmail.po b/tde-i18n-wa/messages/tdepim/kmail.po
index 86e04892d6c..10941e5bed4 100644
--- a/tde-i18n-wa/messages/tdepim/kmail.po
+++ b/tde-i18n-wa/messages/tdepim/kmail.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2003-09-10 00:08+0200\n"
 "Last-Translator: Lorint Hendschel <lorint.hendschel@skynet.be>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -25,13 +25,13 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Lorint Hendschel"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -188,6 +188,12 @@ msgstr "&Nol eclawaedje (waitîz a vos!)"
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "Disfacer foto"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -270,9 +276,9 @@ msgstr "No d' e&lodjaedje:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
@@ -295,12 +301,12 @@ msgstr "&Ritni li mot di passe"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -333,8 +339,9 @@ msgstr "&Disfacer les emiles sol sierveu après k' i sont-st aberwetés"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 
 #: accountdialog.cpp:737
@@ -386,13 +393,15 @@ msgstr "Clair te&cse "
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr ""
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr ""
 
@@ -439,9 +448,9 @@ msgstr "Name=Vizaedjes"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -505,9 +514,9 @@ msgstr "Radjouter des ataetchmints a ci messaedje chal"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -548,7 +557,7 @@ msgstr "<nouk>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "dierins emiles"
 
@@ -556,28 +565,29 @@ msgstr "dierins emiles"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -586,23 +596,23 @@ msgstr ""
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -610,8 +620,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -619,8 +629,7 @@ msgstr ""
 msgid ""
 "_n:  day\n"
 " days"
-msgstr ""
-" djoûs\n"
+msgstr " djoûs\n"
 
 #: accountdialog.cpp:1740
 #, fuzzy
@@ -696,8 +705,8 @@ msgstr "Radjouter on conte"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 
 #: accountwizard.cpp:87
@@ -741,9 +750,9 @@ msgstr "Bénvnowe dins TDE"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -812,8 +821,7 @@ msgstr "Eployî on fitchî-sera"
 msgid "Server Information"
 msgstr "Infôrmåcions sol sierveu"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "Nouk"
@@ -959,24 +967,23 @@ msgstr ""
 #: antispamwizard.cpp:868
 #, fuzzy
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>Chal vos avoz on côp di spale po l' apontiaedje des rîles po les passetes di "
-"KMail po des usteyes siconte do spam les pus corantes.</p> "
-"Li macrea pout detecter les usteyes siconte do spam eyet fé des passetes avou "
-"des rîles po-z evoyî les emiles a ces usteyes la po k'  ele fjhexhe li "
-"diferince inte les bons emiles eyet les måvas spams. Li macrea ni prindrè nole "
-"rîle k' egzistêye dedja e consideråcion, mins i radjoutrè tofer al fén les "
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>Chal vos avoz on côp di spale po l' apontiaedje des rîles po les passetes "
+"di KMail po des usteyes siconte do spam les pus corantes.</p> Li macrea pout "
+"detecter les usteyes siconte do spam eyet fé des passetes avou des rîles po-"
+"z evoyî les emiles a ces usteyes la po k'  ele fjhexhe li diferince inte les "
+"bons emiles eyet les måvas spams. Li macrea ni prindrè nole rîle "
+"k' egzistêye dedja e consideråcion, mins i radjoutrè tofer al fén les "
 "noveles rîles.</p>"
 
 #: antispamwizard.cpp:919
@@ -1012,10 +1019,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -1027,8 +1033,8 @@ msgstr "Evoyî les messaedjes åzès usteyes siconte do spam"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -1039,8 +1045,8 @@ msgstr "Bodjî les messaedjes detectés come do spam viè l' ridant di tchoezi"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -1050,8 +1056,8 @@ msgstr "Description=Marker les messaedjes tchoezis come léjhous"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1237,8 +1243,8 @@ msgid ""
 "communication is here:"
 msgstr ""
 "Çoula pout esse ki vos n' avoz nén les permissions k' i fåt pol fé ou ki "
-"l' ridant egzistêye dedja sol sierveu. Li messaedje d' aroke evoyî på sierveu "
-"est chal pa dzo:"
+"l' ridant egzistêye dedja sol sierveu. Li messaedje d' aroke evoyî på "
+"sierveu est chal pa dzo:"
 
 #: cachedimapjob.cpp:629
 #, fuzzy
@@ -1255,8 +1261,8 @@ msgstr ""
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1276,8 +1282,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1307,15 +1313,15 @@ msgstr "Disfacé"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1350,9 +1356,8 @@ msgstr "Åk n' a nén stî tot metant a djoû les intrêyes crontab."
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
@@ -1360,6 +1365,11 @@ msgstr ""
 msgid "&Load Profile..."
 msgstr "Tcherdjî profil"
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "Apontyî Conte"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "R&adjouter..."
@@ -1389,6 +1399,11 @@ msgstr "<qt>Voloz po do bon disfacer l' idintité lomêye <b>%1</b>?</qt>"
 msgid "Remove Identity"
 msgstr "Oister idintité"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "&Oister"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Radjouter..."
@@ -1397,6 +1412,11 @@ msgstr "Radjouter..."
 msgid "Modify..."
 msgstr "Candjî..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "&Oister"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Mete come Prémetou"
@@ -1413,17 +1433,15 @@ msgstr "E&voyî"
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contes e rexhowe (radjoutez è onk pol moens!):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "No"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Sôre"
@@ -1446,8 +1464,7 @@ msgstr "Mete come Prémetou"
 msgid "Common Options"
 msgstr "Kimonès Tchuzes"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Acertiner &divant d' evoyî"
@@ -1505,14 +1522,14 @@ msgstr "Prémetou dominne:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr ""
 
@@ -1532,9 +1549,9 @@ msgstr "Radjouter Berwetaedje"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr ""
 
@@ -1617,6 +1634,10 @@ msgstr "Candjî l' conte"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "Dji n' sai trover wice kel conte %1 est"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 #, fuzzy
 msgid "Color&s"
@@ -1740,8 +1761,7 @@ msgstr "Hårdêye ddja shuvowe"
 msgid "Misspelled Words"
 msgstr "Mots k' ont-st a vey"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, fuzzy, no-c-format
 msgid "New Message"
 msgstr "Novea messaedje..."
@@ -1829,8 +1849,7 @@ msgstr ""
 #: configuredialog.cpp:1864
 #, fuzzy
 msgid "Lon&g folder list"
-msgstr ""
-"Djivêye des Ridants\n"
+msgstr "Djivêye des Ridants\n"
 
 #: configuredialog.cpp:1865
 #, fuzzy
@@ -1957,8 +1976,8 @@ msgstr "_Eployî les prémetowès coleurs do tinme"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
 
 #: configuredialog.cpp:2055
@@ -1968,40 +1987,33 @@ msgstr "Håynaedje del plake"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr ""
 
 #: configuredialog.cpp:2221
@@ -2018,8 +2030,7 @@ msgstr "Mostrer li bår ås messaedjes"
 msgid "Show s&pam status in fancy headers"
 msgstr "Håyner totes les tiestires do messaedje"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, fuzzy, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Replaecî les espåces avou des sorlignîs"
@@ -2029,8 +2040,7 @@ msgstr "Replaecî les espåces avou des sorlignîs"
 msgid "Use smaller font for quoted text"
 msgstr "Tchoezi les fontes pol sicribanne"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
@@ -2058,8 +2068,7 @@ msgstr "Tot seu"
 msgid "&Override character encoding:"
 msgstr "Prémetou ecôdaedje:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "_Håyner imådjete d' estat po l' aplikete:"
@@ -2167,13 +2176,12 @@ msgstr "«%f» serè replaecî avou l' no do fitchî a-z aspougnî."
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
 msgstr ""
 
 #: configuredialog.cpp:2943
@@ -2200,21 +2208,20 @@ msgstr "Responde a &tertos:"
 msgid "&Forward:"
 msgstr "Rica&ssî:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, fuzzy, no-c-format
 msgid "&Quote indicator:"
 msgstr "Corwaitoe do livea di tchedje do processeu"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "Li %D, vos scrijhîz:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "Li %D, %F scrijha:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "Messaedje rcassî"
 
@@ -2254,8 +2261,8 @@ msgstr "Dinez ene novele betchete di rcassaedje:"
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 
 #: configuredialog.cpp:3278
@@ -2291,10 +2298,9 @@ msgstr "Valixhance"
 msgid "Ne&w"
 msgstr "No&vea"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "&No:"
@@ -2303,16 +2309,15 @@ msgstr "&No:"
 msgid "&Value:"
 msgstr "&Valixhance:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
 
 #: configuredialog.cpp:3595
@@ -2343,13 +2348,13 @@ msgstr "Atatchî"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2377,62 +2382,56 @@ msgstr "Tchô&ke-divins di criptografeye"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2449,10 +2448,10 @@ msgstr ""
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 
 #: configuredialog.cpp:3824
@@ -2537,11 +2536,9 @@ msgstr ""
 #: configuredialog.cpp:4251
 #, fuzzy
 msgid "This option requires dirmngr >= 0.9.0"
-msgstr ""
-"%s: cisse tchuze a mezåjhe d' èn årgumint -- %c\n"
+msgstr "%s: cisse tchuze a mezåjhe d' èn årgumint -- %c\n"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, fuzzy, no-c-format
 msgid "no proxy"
 msgstr "Nou procsi"
@@ -2573,8 +2570,8 @@ msgstr ""
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr ""
 
@@ -2602,8 +2599,8 @@ msgstr ""
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
@@ -2674,16 +2671,14 @@ msgstr ""
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2721,32 +2716,27 @@ msgstr "Go"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2819,8 +2809,8 @@ msgstr "Ridant &måjhon:"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2829,8 +2819,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2884,19 +2874,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr ""
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Tchuzes otomatikes"
@@ -2909,14 +2898,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -3011,16 +3000,14 @@ msgstr "&Après"
 msgid ""
 "_: Message->\n"
 "Reply"
-msgstr ""
-"&Messaedje\n"
+msgstr "&Messaedje\n"
 
 #: customtemplates.cpp:102 customtemplates.cpp:182
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply to All"
-msgstr ""
-"Responde a &Tertos...\n"
+msgstr "Responde a &Tertos...\n"
 
 #: customtemplates.cpp:103 customtemplates.cpp:184
 #, fuzzy
@@ -3031,17 +3018,16 @@ msgstr "&Après"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -3058,15 +3044,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3116,8 +3102,8 @@ msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
-"I gn a di trop d' fitchîs d' drovous. I vs è fåt clôre sacwants et rsayî, s' i "
-"vs plait."
+"I gn a di trop d' fitchîs d' drovous. I vs è fåt clôre sacwants et rsayî, "
+"s' i vs plait."
 
 #: distributionlistdialog.cpp:184
 msgid "New Distribution List"
@@ -3140,8 +3126,8 @@ msgstr "Candjî l' idintité"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3405,6 +3391,11 @@ msgstr ""
 "Passete:\n"
 "%1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "_Tchoezi l' tecse"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3436,12 +3427,12 @@ msgstr "Fé on &djournå des activités del passete"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 "Vos ploz chal mete en alaedje ou dismete li rashiaedje en on djournå des "
-"activités del passete. Bén seur, l' infôrmåcion n' est ramexhnêye eyet håynêye "
-"ki cwand l' djournå est en alaedje. "
+"activités del passete. Bén seur, l' infôrmåcion n' est ramexhnêye eyet "
+"håynêye ki cwand l' djournå est en alaedje. "
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3457,15 +3448,17 @@ msgstr "Rashir l' evalouwaedje des &rîles del passete"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"Vos ploz controler çou k' est rashiou e djournå åd fwait di l' evalouwaedje des "
-"rîles del passete: si vos metoz cisse tchuze ci vos åroz des rashiaedjes e "
-"detay po tchaeke rîle, årvierdimint, si cisse tchuze ci est dismetowe, seulmint "
-"l' rizultat di l' evalouwaedje di totes les rîles d' ene passete serè rashiou."
+"Vos ploz controler çou k' est rashiou e djournå åd fwait di l' evalouwaedje "
+"des rîles del passete: si vos metoz cisse tchuze ci vos åroz des rashiaedjes "
+"e detay po tchaeke rîle, årvierdimint, si cisse tchuze ci est dismetowe, "
+"seulmint l' rizultat di l' evalouwaedje di totes les rîles d' ene passete "
+"serè rashiou."
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3485,15 +3478,16 @@ msgstr "sins limites"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 "Li ramexhnaedje des dnêyes a mezåjhe di memwere po wårder timporairmint "
-"l' infôrmåcion a rashir e djournå; chal vos ploz defini l' limite pol macsimom "
-"di memwere ki pout esse eployî: si les dnêyes ramexhnêyes prindèt pus ki cisse "
-"limite la, les pus viyès dnêyes seront oistêyes disk' a rivni pa dzo l' limite. "
+"l' infôrmåcion a rashir e djournå; chal vos ploz defini l' limite pol "
+"macsimom di memwere ki pout esse eployî: si les dnêyes ramexhnêyes prindèt "
+"pus ki cisse limite la, les pus viyès dnêyes seront oistêyes disk' a rivni "
+"pa dzo l' limite. "
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3503,7 +3497,7 @@ msgstr ""
 "Dji n' sai scrire li fitchî %1:\n"
 "«%2» est li spepieus discrijhaedje di l' aroke."
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Messaedje d' aroke di KMail"
@@ -3550,9 +3544,9 @@ msgstr "A vosse &Môde:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3608,8 +3602,8 @@ msgstr "Vos n' avoz nén les droets po scrire dins ç' fitchî la."
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3622,8 +3616,7 @@ msgstr "Mete come fond po _ci ridant chal"
 msgid "Connecting to server %1, please wait..."
 msgstr "Apontiaedje di vosse sistinme, tårdjîz s' i vs plait..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, fuzzy, c-format
 msgid "Error connecting to server %1"
 msgstr "Åk n' a nén stî come dji m' raloyive å sierveu."
@@ -3651,8 +3644,8 @@ msgstr "Sipepieusès permissions"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3688,7 +3681,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Tchoezi ridant"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Ridants locås"
@@ -3715,9 +3708,9 @@ msgstr "Tchoezixhoz li ridant des fontes"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3739,11 +3732,20 @@ msgstr "&Rinoncî"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Nén cnoxhu"
@@ -3773,8 +3775,7 @@ msgstr "Estat:"
 #: headerlistquicksearch.cpp:73
 #, fuzzy
 msgid "Any Status"
-msgstr ""
-"Estat\n"
+msgstr "Estat\n"
 
 #: headerlistquicksearch.cpp:93
 #, fuzzy
@@ -3871,71 +3872,17 @@ msgstr "Estat di Samba"
 #: htmlstatusbar.cpp:91
 #, fuzzy
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
-msgstr ""
-"<b>"
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>e"
-"<br>d"
-"<br>j"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
+msgstr ""
+"<b><br>M<br>e<br>s<br>s<br>a<br>e<br>d<br>j<br>e<br> <br>H<br>T<br>M<br>L</b>"
 
 #: htmlstatusbar.cpp:94
 #, fuzzy
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<b>"
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>e"
-"<br>d"
-"<br>j"
-"<br>e"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<b><br>M<br>e<br>s<br>s<br>a<br>e<br>d<br>j<br>e<br> <br>H<br>T<br>M<br>L</b>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3947,12 +3894,9 @@ msgstr "&Vosse no:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3961,11 +3905,9 @@ msgstr "So&ce:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3974,14 +3916,11 @@ msgstr "Adresse d' é&mile:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3991,21 +3930,12 @@ msgstr "Adresse d' é&mile:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -4030,12 +3960,11 @@ msgstr ""
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -4049,20 +3978,18 @@ msgstr "Sicrets et clés d' ecriptaedje"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -4083,11 +4010,10 @@ msgstr ""
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -4102,18 +4028,17 @@ msgstr "Acertineure d' ecriptaedje:"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -4136,14 +4061,12 @@ msgstr "Adresse po les &responses:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -4152,15 +4075,12 @@ msgstr "Adresses &BCC:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -4204,7 +4124,7 @@ msgstr "&Sinateure"
 msgid "&Picture"
 msgstr "&Imådje:"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 #, fuzzy
 msgid "Invalid Email Address"
 msgstr "Adresse emile nén valide ou mwaijhe"
@@ -4224,8 +4144,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4275,8 +4195,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr ""
 
@@ -4325,14 +4245,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4349,8 +4269,8 @@ msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
-"Dji n' a savou eberweter l' messaedje %1 sol sierveu a pårti do ridant %2 avou "
-"l' hårdêye %3."
+"Dji n' a savou eberweter l' messaedje %1 sol sierveu a pårti do ridant %2 "
+"avou l' hårdêye %3."
 
 #: imapaccountbase.cpp:888
 #, fuzzy
@@ -4373,14 +4293,19 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "Aroke: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
 
 #: imapaccountbase.cpp:965
@@ -4416,8 +4341,7 @@ msgstr "Infôrmåcions sol sierveu"
 #: imapjob.cpp:193
 #, fuzzy
 msgid "Source folder: %1 - Destination folder: %2"
-msgstr ""
-"Ridant &såme:\n"
+msgstr "Ridant &såme:\n"
 
 #: imapjob.cpp:315
 #, fuzzy
@@ -4543,14 +4467,14 @@ msgstr "Årtchives"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4578,136 +4502,110 @@ msgstr "Clé d' ecriptaedje"
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4722,136 +4620,110 @@ msgstr "Dimande d' acertinaedje S/MIME"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4866,9 +4738,10 @@ msgstr "Dimande d' acertinaedje S/MIME"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4895,26 +4768,26 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4926,8 +4799,8 @@ msgstr "Sinateure OpenPGP distaetcheye"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4951,8 +4824,8 @@ msgstr "L' astalaedje est possibe"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4973,8 +4846,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -5012,11 +4885,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -5060,8 +4933,7 @@ msgstr "Divintrinne aroke: nén moyén do tcherdjî l' passete."
 
 #: kmaccount.cpp:277
 #, fuzzy
-msgid ""
-"Failed to add message:\n"
+msgid "Failed to add message:\n"
 msgstr "Li radjoutaedje di l' uzeu a fwait berwete."
 
 #: kmacctimap.cpp:300
@@ -5161,6 +5033,59 @@ msgstr "Disraloyî"
 msgid "&Maildir mailbox"
 msgstr "Boesse Maildir locåle..."
 
+#: kmail_options.h:11
+#, fuzzy
+msgid "Set subject of message"
+msgstr "Metoz l' sudjet do messaedjes."
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr ""
+
+#: kmail_options.h:15
+#, fuzzy
+msgid "Send BCC: to 'address'"
+msgstr "Adresses &BCC:\n"
+
+#: kmail_options.h:17
+#, fuzzy
+msgid "Add 'header' to message"
+msgstr "Radjouter des ataetchmints a ci messaedje chal"
+
+#: kmail_options.h:18
+#, fuzzy
+msgid "Read message body from 'file'"
+msgstr "%d messaedje nén léjhou di %s\n"
+
+#: kmail_options.h:19
+#, fuzzy
+msgid "Set body of message"
+msgstr "Metoz l' sudjet do messaedjes."
+
+#: kmail_options.h:20
+#, fuzzy
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "Radjouter des ataetchmints a ci messaedje chal"
+
+#: kmail_options.h:21
+#, fuzzy
+msgid "Only check for new mail"
+msgstr "Cweri après des noveas messaedjes"
+
+#: kmail_options.h:22
+#, fuzzy
+msgid "Only open composer window"
+msgstr "Clôre li purnea d' aspougnaedje"
+
+#: kmail_options.h:23
+#, fuzzy
+msgid "View the given message file"
+msgstr "Vey li fitchî djournå do sistinme"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Emilaedje"
@@ -5216,9 +5141,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5273,11 +5198,11 @@ msgstr ""
 "Li fitchî %1 egzistêye dedja.\n"
 "El voloz-vs replaecî?"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "Schaper en on fitchî"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "&Replaecî"
 
@@ -5295,7 +5220,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5317,227 +5242,227 @@ msgstr "Ci tinme ci n' a pont d' imådje di prévoeyaedje."
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Messaedje d' adviertixhmint"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Dj' evoye li messaedje %1 di %2: %3"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 #, fuzzy
 msgid "Not enough free disk space?"
 msgstr "Nén del plaece assez sol plake."
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 #, fuzzy
 msgid "Move to This Folder"
 msgstr "Bodjî e ci ridant ci"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 #, fuzzy
 msgid "Copy to This Folder"
 msgstr "Copyî e ci ridant ci"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "Messaedje d' adviertixhmint"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "Disfaçant messaedjes"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "Drovant èn URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 #, fuzzy
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Voloz v' po do bon disfacer\n"
 " «<b>%1</b>»?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "Enonder"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 #, fuzzy
 msgid "Found no attachments to save."
 msgstr "Radjouter des ataetchmints a ci messaedje chal"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Schaper et Rlomer l' Ataetchmint"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 #, fuzzy
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "Li fitchî <quote>%1</quote> egzistêye dedja. Estoz seur(e) ki vos l' voloz "
 "spotchî?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "Ci fitchî la egzistêye dedja"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "Sip&otchî"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr ""
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "KMail Question"
 msgstr "Kesse"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Ecriptaedje"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Èn nén eployî"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr ""
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Sinateure"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "Dji n' sai scrire e fitchî %1."
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 #, fuzzy
 msgid "Chiasmus Backend Error"
 msgstr "Aroke di comande"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Tchoezi l' raloyaedje"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 #, fuzzy
 msgid "Chiasmus Decryption Error"
 msgstr "Åk n' a nén stî avou l' discriptaedje"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Emilaedje"
@@ -5637,7 +5562,7 @@ msgstr "Grandeu"
 msgid "Encoding"
 msgstr "Ecôdaedje"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "Rastrindaedje"
@@ -5650,7 +5575,7 @@ msgstr "Ecripter"
 msgid "Sign"
 msgstr "Siner"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "No d' l' éndjole:"
@@ -5674,7 +5599,8 @@ msgstr "<riçuveus>"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5685,9 +5611,9 @@ msgstr "Vos åroz dandjî eto di*"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5697,9 +5623,8 @@ msgstr "Rishuveu"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5712,7 +5637,7 @@ msgstr "Emiler"
 msgid "&Send Mail Via"
 msgstr "Emiler"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Evoyî &Pus Tård"
@@ -5787,8 +5712,7 @@ msgstr "caracteres pol citåcion dins les emiles"
 msgid "Cl&ean Spaces"
 msgstr "Rinetyî les Es&påçmints"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, fuzzy, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Eployî li prémetowe fonte"
@@ -5943,36 +5867,36 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "Sitandård"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 #, fuzzy
 msgid "Bulleted List (Disc)"
 msgstr "Djivêye avou des ponts"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 #, fuzzy
 msgid "Bulleted List (Circle)"
 msgstr "Djivêye avou des ponts"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 #, fuzzy
 msgid "Bulleted List (Square)"
 msgstr "Djivêye avou des ponts"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 #, fuzzy
 msgid "Ordered List (Decimal)"
 msgstr "Relîs (pus roed)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 #, fuzzy
 msgid "Ordered List (Alpha lower)"
 msgstr "Relîs (pus roed)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 #, fuzzy
 msgid "Ordered List (Alpha upper)"
 msgstr "Relîs (pus roed)"
@@ -6082,8 +6006,8 @@ msgstr "&Novea Purnea po Scrire"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -6092,43 +6016,45 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "Mostrer l' Ataetchmint:"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Send as Is"
 msgstr "Evoyî &come c' est"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Ataetchî on fitchî"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "&Ataetchî"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "Sititchî on Fitchî"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Sititchî on Fitchî"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -6173,299 +6099,311 @@ msgid ""
 "View"
 msgstr ""
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "Aspougnî..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Aspougnî l' scripe d' elodjaedje"
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "Sch&aper et rlomer..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "&Prôpietés"
+
 #: kmcomposewin.cpp:3224
 #, fuzzy
 msgid "Add Attachment..."
 msgstr "Come &Ataetchmint..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
-msgstr ""
-"Dji n' a savou drovi l' fitchî %s.\n"
+msgstr "Dji n' a savou drovi l' fitchî %s.\n"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr ""
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "Wårder"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
-msgstr ""
-"Dji n' a savou drovi l' fitchî %s.\n"
+msgstr "Dji n' a savou drovi l' fitchî %s.\n"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "Schaper et Rlomer l' Ataetchmint"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 #, fuzzy
 msgid "Add as Text"
 msgstr "Radjouter tecse"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Come &Ataetchmint..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Emiler en ataetchmint..."
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "co nou no"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 #, fuzzy
 msgid "Undefined Encryption Key"
 msgstr "Clé d' ecriptaedje"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 #, fuzzy
 msgid "Undefined Signing Key"
 msgstr "Valixhance nén defineye"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 #, fuzzy
 msgid "Online/Offline"
 msgstr "Raloyî dispoy"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr ""
-"Vos n' avoz pont metou di sudjet.  Fåt i tot l' minme evoyî li messaedje insi?"
+"Vos n' avoz pont metou di sudjet.  Fåt i tot l' minme evoyî li messaedje "
+"insi?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "Nén specifyî"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
-"Vos n' avoz pont metou di sudjet.  Fåt i tot l' minme evoyî li messaedje insi?"
+"Vos n' avoz pont metou di sudjet.  Fåt i tot l' minme evoyî li messaedje "
+"insi?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 #, fuzzy
 msgid "No Subject Specified"
 msgstr "Nén specifyî"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "S&end as Is"
 msgstr "Evoyî on facs"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr ""
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Siner/ecripter"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Ecripter li messaedje?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Fijhoz on conte po-z evoyî et s' rissayîz s' i vs plait."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 #, fuzzy
 msgid "About to send email..."
 msgstr "About=Revo&yî..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 #, fuzzy
 msgid "Send Confirmation"
 msgstr "Acertinaedje do metaedje e woeye"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Evoyî sol &Côp"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "<riçuveus>"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Vos åroz dandjî eto di*"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Waitî l' ortografeye"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Waitî l' ortografeye"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 #, fuzzy
 msgid " Spell check canceled."
 msgstr "Cweraedje annulé"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 #, fuzzy
 msgid " Spell check stopped."
 msgstr "Coridjaedje: enondé."
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 #, fuzzy
 msgid " Spell check complete."
 msgstr "Coridjaedje: %1% di fwait"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 #, fuzzy
 msgid "Spellchecker"
 msgstr "Coridjrece"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Nole sinateure di trovêye"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Tchoezi l' raloyaedje"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Li messaedje a stî siné di %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Li messaedje a stî siné di %1."
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Messaedje OpenPGP - ecripté"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Fonte pol sudjet des messaedjes"
@@ -6517,11 +6455,12 @@ msgstr "Waiti l' ôrtografeye - KMail"
 #: kmedit.cpp:884
 #, fuzzy
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ISpell èn pout nén esse enondé.\n"
-"Acertinez vs ki vos avoz ispell apontyî comifåt eyet dins vosse tchimin (PATH)."
+"Acertinez vs ki vos avoz ispell apontyî comifåt eyet dins vosse tchimin "
+"(PATH)."
 
 #: kmedit.cpp:893
 #, fuzzy
@@ -6561,9 +6500,8 @@ msgstr "<qt>I n' a nol uzeu lomé <b>%1</b>.</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 
 #: kmfilteraction.cpp:601
@@ -6677,8 +6615,7 @@ msgstr "Evoyî on facs"
 msgid ""
 "_: MDN type\n"
 "Ignore"
-msgstr ""
-"&Passer\n"
+msgstr "&Passer\n"
 
 #: kmfilteraction.cpp:892
 msgid ""
@@ -6815,102 +6752,86 @@ msgstr "Djouwer on son"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6923,6 +6844,16 @@ msgstr "Rûles po les Passetes"
 msgid "Filter Rules"
 msgstr "Rûles po les Passetes"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "&Aberweter"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "&Aberweter"
+
 #: kmfilterdlg.cpp:155
 #, fuzzy
 msgid "Available Filters"
@@ -7014,6 +6945,11 @@ msgstr ""
 msgid "Icon for this filter:"
 msgstr "L' imådjete po ci purnea chal"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "Po"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "Monter"
@@ -7022,16 +6958,29 @@ msgstr "Monter"
 msgid "Down"
 msgstr "Dischinde"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Rilomer..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "Novea"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "&Copyî dins"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "Disfacé"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -7040,8 +6989,8 @@ msgstr "Tchoezixhoz li ridant des fontes"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -7089,8 +7038,8 @@ msgstr "Dis&facer les emiles sol sierveu"
 #, fuzzy
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr ""
-"<qt>Åk n' a nén stî come dji sayive di drovi l' fitchî <nobr>%1<strong>"
-": %2</strong>"
+"<qt>Åk n' a nén stî come dji sayive di drovi l' fitchî <nobr>%1<strong>: %2</"
+"strong>"
 
 #: kmfolder.cpp:276
 #, fuzzy
@@ -7121,19 +7070,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -7175,8 +7121,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -7212,8 +7158,8 @@ msgstr "Li documint «%s» a stî rmetou come divant."
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7363,10 +7309,8 @@ msgstr "Dj' ahive li ridant %1"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7389,9 +7333,8 @@ msgstr "Riçuvaedje a pårti di %1..."
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7400,14 +7343,14 @@ msgstr "Côpé"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7422,11 +7365,11 @@ msgstr "Nén trové."
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7436,15 +7379,20 @@ msgstr "Nén des droets assez."
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "_Bodjî viè"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 #, fuzzy
 msgid "Do Not Move"
 msgstr "&Ni nén schaper"
@@ -7459,8 +7407,7 @@ msgstr "Bodjî li messaedje e ridant"
 msgid "Permissions (ACL)"
 msgstr "Permissions"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Djenerå"
@@ -7485,8 +7432,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Tchoezi vos prôpès &imådjetes"
@@ -7506,14 +7452,13 @@ msgstr "Prémetowès valixhances po les noveas fitchîs e ç' ridant ci"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7528,9 +7473,9 @@ msgstr "Prémetowès valixhances po les noveas fitchîs e ç' ridant ci"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7542,17 +7487,21 @@ msgstr ""
 msgid "Sho&w column:"
 msgstr "Mostrer colones"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "Mete come Prémetou"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Evoyeu"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Riçuveu"
@@ -7564,11 +7513,11 @@ msgstr "&Novele Idintité:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7588,12 +7537,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7626,17 +7575,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7718,7 +7667,8 @@ msgstr "Åk n' a nén stî tot coviersant l' infôrmåcion do platea!"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 
 #: kmfolderindex.cpp:372
@@ -7744,8 +7694,8 @@ msgstr "Dj' a aroké cwand dj' a volou drovi %1 po scrire."
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
 
 #: kmfoldermaildir.cpp:124
@@ -7786,13 +7736,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7859,13 +7807,13 @@ msgstr ""
 "Eployîz seulmint des fitchîs avou ene cawete come çouchal s' i vs plait:\n"
 "%2"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7873,8 +7821,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7882,7 +7830,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "L' askepiaedje do fitchî %s a fwait berwete."
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 #, fuzzy
 msgid ""
 "Cannot create file `%1' in %2.\n"
@@ -7992,9 +7940,9 @@ msgstr ""
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -8139,10 +8087,10 @@ msgstr ""
 #: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
 "Voloz vs vormint disfacer li tchoezi fitchî?\n"
 "Voloz vs vormint disfacer les %n tchoezis fitchîs?"
@@ -8159,8 +8107,7 @@ msgstr "Disfacer les Messaedjes"
 #: kmheaders.cpp:1624
 #, fuzzy
 msgid "Messages deleted successfully."
-msgstr ""
-"Li fitchî d' muchete a stî ahivé comifåt.\n"
+msgstr "Li fitchî d' muchete a stî ahivé comifåt.\n"
 
 #: kmheaders.cpp:1624
 #, fuzzy
@@ -8204,141 +8151,140 @@ msgid ""
 "(No space left on device?)"
 msgstr "I n' a pupont d' plaece so l' éndjin"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 #, fuzzy
 msgid "Certificate Signature Request"
 msgstr "Dimande d' acertineure SSL"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Fijhoz on conte po-z evoyî et s' rissayîz s' i vs plait."
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 #, fuzzy
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "Li programe est pol moumint e môde disraloyî.  Voloz vs vos raloyî?"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 #, fuzzy
 msgid "Work Online"
 msgstr "Ovrer _foû raloyaedje"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 #, fuzzy
 msgid "Work Offline"
 msgstr "Ovrer _foû raloyaedje"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 #, fuzzy
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Vos n' avoz nén les droets po scrire dins ç' fitchî la."
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 #, fuzzy
 msgid "outbox"
 msgstr "Messaedjes e rexhowe"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 #, fuzzy
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Vos n' avoz nén les droets po scrire dins ç' fitchî la."
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 #, fuzzy
 msgid "sent-mail"
 msgstr "emile"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 #, fuzzy
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "Vos n' avoz nén les droets po scrire dins ç' fitchî la."
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 #, fuzzy
 msgid "trash"
 msgstr "ktrash"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 #, fuzzy
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Vos n' avoz nén les droets po scrire dins ç' fitchî la."
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 #, fuzzy
 msgid "drafts"
 msgstr "Brouyon"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 #, fuzzy
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Vos n' avoz nén les droets po scrire dins ç' fitchî la."
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 #, fuzzy
 msgid "templates"
 msgstr "Modeles"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Vos n' avoz nén les droets po scrire dins ç' fitchî la."
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 #, fuzzy
 msgid "Last Search"
 msgstr "Rizultats do &dierin cweraedje"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 #, fuzzy
 msgid "Migrate Mail Files?"
 msgstr "Fitchîs d' apontiaedje"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8346,11 +8292,11 @@ msgid ""
 "%1"
 msgstr ""
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Vudî li batch"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Estoz seur di voleur vudî l' batch?"
@@ -8403,8 +8349,7 @@ msgstr "Come Novea Ridant"
 #: kmmainwidget.cpp:732
 #, fuzzy
 msgid "Focus on Previous Folder"
-msgstr ""
-"Ri&dant di dvant nén léjhou\n"
+msgstr "Ri&dant di dvant nén léjhou\n"
 
 #: kmmainwidget.cpp:737
 #, fuzzy
@@ -8438,8 +8383,7 @@ msgstr ""
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr ""
 
 #: kmmainwidget.cpp:971
@@ -8485,8 +8429,8 @@ msgstr "Estoz seur di voleur vudî l' batch?"
 #: kmmainwidget.cpp:1154
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
 "<qt>Voloz vs po do bon oister li soçon <b>%1</b> foû d' vosse djivêye du "
 "soçons?</qt>"
@@ -8515,11 +8459,11 @@ msgstr "Disfacer uzeu"
 #: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
-"<qt>Estoz vs seur di voleur oister li tinme do cursoe <i>%1</i>?<br />"
-"Çoula disfaçrè tos les fitchîs k' ont stî astalé på tinme.</qt>"
+"<qt>Estoz vs seur di voleur oister li tinme do cursoe <i>%1</i>?<br />Çoula "
+"disfaçrè tos les fitchîs k' ont stî astalé på tinme.</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8533,29 +8477,32 @@ msgstr ""
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
 
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "Disfacé"
+
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
@@ -8569,9 +8516,9 @@ msgstr "Estoz seur do voleur disfacer «%s» po do bon?"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
@@ -8586,8 +8533,8 @@ msgstr "HTML:"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
 #: kmmainwidget.cpp:1381
@@ -8605,8 +8552,8 @@ msgstr "Passete pol djåspinreye %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8626,7 +8573,8 @@ msgstr ""
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 "Li fitchî %s èn pola nén esse trové. Verifyîz vost astalaedje s' i vs plait."
 
@@ -8990,8 +8938,7 @@ msgstr "Schaper et r&lomer ataetchmint..."
 msgid "Appl&y All Filters"
 msgstr "Mete les &Passetes èn Alaedje"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Mete les &Passetes èn Alaedje"
@@ -9025,8 +8972,7 @@ msgstr ""
 msgid ""
 "_: View->\n"
 "&Total Column"
-msgstr ""
-"Colone totå\n"
+msgstr "Colone totå\n"
 
 #: kmmainwidget.cpp:3024
 msgid ""
@@ -9038,8 +8984,7 @@ msgstr ""
 msgid ""
 "_: View->\n"
 "&Size Column"
-msgstr ""
-"Colone totå\n"
+msgstr "Colone totå\n"
 
 #: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
@@ -9118,7 +9063,6 @@ msgstr "Messaedje &nén léjhou shuvant"
 msgid "Go to the next unread message"
 msgstr "Potchî å messaedje nén léjhou shuvant"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Messaedje di d&vant"
@@ -9264,25 +9208,25 @@ msgstr "Inicialijhaedje..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9290,8 +9234,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -9299,8 +9243,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -9331,17 +9275,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "Riçuvou:"
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, fuzzy, c-format
 msgid "Attachment: %1"
 msgstr "Ataetchmint:"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Håyner les ataetchmints come l' evoyeu l' a dmandé."
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9395,29 +9339,26 @@ msgstr "Prôpietés des pårteyes do messaedje"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9426,11 +9367,10 @@ msgstr "&Discrijhaedje:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9439,14 +9379,13 @@ msgstr "&Ecôdaedje"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9456,13 +9395,11 @@ msgstr "Defini l' ritcherdjaedje &tot seu"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9471,9 +9408,8 @@ msgstr "&Siner cisse pårteye chal"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
 
@@ -9483,9 +9419,8 @@ msgstr "Ecri&pter cisse pårteye chal."
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:224
@@ -9501,11 +9436,9 @@ msgstr "Passetes POP"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
 
 #: kmpopfiltercnfrmdlg.cpp:298
@@ -9658,8 +9591,8 @@ msgstr "Dins l' &Messaedje"
 #: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr ""
-"Mostrer tos les ataetchmints tot droet dins l' messaedjes, si do moens c' est "
-"possibe."
+"Mostrer tos les ataetchmints tot droet dins l' messaedjes, si do moens c' "
+"est possibe."
 
 #: kmreaderwin.cpp:565
 msgid ""
@@ -9777,15 +9710,14 @@ msgstr "Wilicome so l' evironmint di scribanne da TDE"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
 #: kmreaderwin.cpp:1335
@@ -9794,18 +9726,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9816,14 +9747,13 @@ msgstr ""
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 #, fuzzy
-msgid ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
 msgstr "<li>%1</li>"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9864,7 +9794,8 @@ msgstr "Mostrer l' Ataetchmint:"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 
@@ -9892,12 +9823,14 @@ msgstr "Drovi l' ataetchmint?"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9919,6 +9852,64 @@ msgstr "(tot l' minme cwè di çki shût)"
 msgid "(match all of the following)"
 msgstr "(tot çki shût)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "Lére"
+
+#: kmsearchpattern.h:222
+#, fuzzy
+msgid "Old"
+msgstr "Viyès tchansons"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "Disfacé"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "Respondou"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "Racassî"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "Metou el caweye"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "Evoyî"
+
+#: kmsearchpattern.h:228
+#, fuzzy
+msgid "Watched"
+msgstr "Riwaitî des videyos"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "Passé houte"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+#, fuzzy
+msgid "Ham"
+msgstr "AM"
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "Po: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "Ataetchmint"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -10001,17 +9992,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -10040,8 +10031,8 @@ msgstr "Inicialijhaedje di protocole ..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -10068,8 +10059,9 @@ msgstr "Li disfaçaedje di l' uzeu a fwait berwete."
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -10081,13 +10073,11 @@ msgstr "Eprimaedje aresté."
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 
 #: kmsender.cpp:730
@@ -10109,8 +10099,9 @@ msgstr "About=E&voyî"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -10148,30 +10139,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -10183,6 +10174,10 @@ msgstr "Enonder '%1'"
 msgid "Exit"
 msgstr "Moussî foû"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -10209,8 +10204,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -10295,8 +10291,8 @@ msgstr "I s' fåt &otintifyî sol sierveu"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -10320,10 +10316,9 @@ msgstr "Pôrt eployî po s' raloyî å sierveu"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -10355,8 +10350,8 @@ msgstr "Pol moumint seulmint les fitchîs locås sont sopoirtés."
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr ""
 
 #: kmtransport.cpp:788
@@ -10371,10 +10366,10 @@ msgstr "Åk n' a nén stî come dj' eberwetéve li ridant"
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10623,22 +10618,18 @@ msgstr "Aspou&gnî li Messaedje"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10649,8 +10640,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10666,14 +10657,14 @@ msgstr "Aroke di comunicaedje"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10777,8 +10768,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10814,8 +10805,9 @@ msgstr "&Ni nén Ecripter"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10826,8 +10818,8 @@ msgstr "Schaper nén E&cripté"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10848,73 +10840,71 @@ msgstr "&Ecripter tos les Bokets"
 msgid "Unencrypted Message Warning"
 msgstr "Messaedje ecripté"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "Tchoezi l' caractere al hintche"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Lose Characters"
 msgstr "Caracteres"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Candjî l' Administrateu"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10938,10 +10928,10 @@ msgstr "Cogne do fitchî:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10952,8 +10942,8 @@ msgstr "Imådjetes des ridants"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10999,8 +10989,7 @@ msgstr ""
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Sitatut: "
 
@@ -11032,8 +11021,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr ""
 
 #: objecttreeparser.cpp:737
@@ -11071,18 +11060,18 @@ msgstr "Li tchôke-divins di discriptaedje %1 èn sait discripter nou messaedje.
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: objecttreeparser.cpp:1227
@@ -11344,8 +11333,8 @@ msgstr "wårdé: "
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 
 #: objecttreeparser.cpp:2536
@@ -11467,10 +11456,11 @@ msgstr "Messaedje d' Aroke di KMail"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11487,7 +11477,8 @@ msgstr ""
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
 msgstr ""
 
 #: popaccount.cpp:912
@@ -11507,1644 +11498,14 @@ msgstr "Parametes nén valåves"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr ""
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "&Evoye"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "R&idant"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "&Messaedje"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, fuzzy, no-c-format
-msgid "Reply Special"
-msgstr "Sipeciå"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "En a&vant"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "HTML Toolbar"
-msgstr "Bår ås usteyes mdk"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, fuzzy, no-c-format
-msgid "Signing"
-msgstr "Siner"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, fuzzy, no-c-format
-msgid "&Automatically sign messages"
-msgstr "Tcherdjî &otomaticmint les imådjes"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, fuzzy, no-c-format
-msgid "Encrypting"
-msgstr "Ecriptaedje"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "Wårder &ecriptés les messaedjes schapés"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "Clitchiz po k' les messaedje soeyenxhe wårdés ecriptés"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Po: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "Cc: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "Univiersele"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "Responde"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "Responde a &Tertos..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "En avant"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "Rascourti:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "&Template type:"
-msgstr "Modele:"
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "Prôpietés do ridant"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "Ridant po ene &djåspinreye"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "List &address:"
-msgstr "Djivêye d' adresses:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, fuzzy, no-c-format
-msgid "N&ormal:"
-msgstr "Normå:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, fuzzy, no-c-format
-msgid "Unr&ead:"
-msgstr "Nén léjhou:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "Passaedje di messaedjes"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, fuzzy, no-c-format
-msgid "E&xpire after:"
-msgstr "URL dis&paretèt après"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "&Espirer les vîs messaedjes"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, fuzzy, no-c-format
-msgid "Expire a&fter:"
-msgstr "URL dis&paretèt après"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "&Espirer les vîs messaedjes"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "Djoû(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "Samwinne(s)"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "Moes"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "Sipepieus"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "Novele Idintité:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "Cogne del coûte date:"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, fuzzy, no-c-format
-msgid "&List displays:"
-msgstr "èn sont nén håynés"
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, fuzzy, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "Acertineure nén valide!"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "Fijhaedje d' ene acertineure"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, fuzzy, no-c-format
-msgid "OCSP responder URL:"
-msgstr "Response DLP:"
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "Mete li sinateure al _copete"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "Verifyî l' acertineure do sierveu"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "Èn nén evoyî d' acertineure"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "Å moumint di radjouter les acertineures"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, fuzzy, no-c-format
-msgid "HTTP Requests"
-msgstr "Si dmandé"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, fuzzy, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "Eployî l' procsi HTTP po les raloyaedjes HTTPS"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, fuzzy, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "Eployî fontes sistinme"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, fuzzy, no-c-format
-msgid "LDAP Requests"
-msgstr "Si dmandé"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "R&adjouter..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "Ovraedje e groupe"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "Apontiaedjes po les fontes"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "sins limites"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "Ritcherdjî l' apontiaedje"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "&Responde a l' evoyeu:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, fuzzy, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "Responde a tertos k' on rçuvou ci messaedje chal"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "Messaedje rcassî"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, fuzzy, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "M' ad&vierti cwand dji saye d' evoyî des messaedjes nén ecriptés"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, fuzzy, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Verifyî l' ortografeye do messaedje"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "M' ad&vierti cwand dji saye d' evoyî des messaedjes nén ecriptés"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, fuzzy, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "M' ad&vierti cwand dji saye d' evoyî des messaedjes nén ecriptés"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "Ecriptaedje"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " djoûs"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, fuzzy, no-c-format
-msgid "Select the number of days here"
-msgstr "Tchoezixhoz l' djoû d' ouy"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "Cweri après des ôtès acertineures"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "Èn nén evoyî d' acertineure"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "Acertineure di pair:"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "Modele"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, fuzzy, no-c-format
-msgid "Template shortcut"
-msgstr "Rascourti alternatif:"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, fuzzy, no-c-format
-msgid "Template type"
-msgstr "Modele"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, fuzzy, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "Li tite do purnea di tchoezixhaedje del coleur"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, fuzzy, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "_Håyner imådjete d' estat po l' aplikete:"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "Vos avoz des noveas emiles"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "Sipecifyîz l' &aspougneu a-z eployî:"
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "Eployô on d&foûtrin aspougneu d' tecse"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, fuzzy, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "Nombe macsimom d' intrêyes"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "Tcherdjî &otomaticmint les imådjes"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, fuzzy, no-c-format
-msgid "Word &wrap at column:"
-msgstr "Longueu del roye wice k' i fåt côper les mots : "
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "Nombe macsimom d' intrêyes"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, fuzzy, no-c-format
-msgid "Autosave interval:"
-msgstr "Tins inte deus schapaedjes otomatikes"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "Replaecî les ricno&xhowès betchetes avou «Re:»"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "Replaecî les ricnoxhowès betchetes avou «&Fwd:»"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, fuzzy, no-c-format
-msgid "Use smart &quoting"
-msgstr "Eployî li sûti cweraedje"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "Li sinateure est valide."
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, fuzzy, no-c-format
-msgid "Type of addressee selector"
-msgstr "Tchoezixhaedje des adresses"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, fuzzy, no-c-format
-msgid "Type of recipients editor"
-msgstr "Aspougneu XML oryinté åbes"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "Nombe macsimom d' intrêyes"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, fuzzy, no-c-format
-msgid "Automatic collapse level:"
-msgstr "Oto-Mostraedje"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "Wårder &ecriptés les messaedjes schapés"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "Håyner totes les tiestires do messaedje"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "Scrire on novea messaedje"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "caracteres pol citåcion dins les emiles"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr ""
+#: quotajobs.h:76
+#, fuzzy
+msgid "%1 of %2 %3 used"
+msgstr "%1 foû di %2 (%3% d' eployî)"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -13221,8 +11582,7 @@ msgstr ""
 msgid ""
 "_n: 1 email address\n"
 "%n email addresses"
-msgstr ""
-"Tchoezi les adresse(s) emile(s).\n"
+msgstr "Tchoezi les adresse(s) emile(s).\n"
 
 #: recipientspicker.cpp:160 recipientspicker.cpp:183
 #, fuzzy, c-format
@@ -13268,6 +11628,11 @@ msgstr "Radjouter ene clé"
 msgid "Add as BCC"
 msgstr "Radjouter ene clé"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Rinoncî"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -13285,10 +11650,10 @@ msgstr "Tchoezis fitchîs"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -13307,8 +11672,8 @@ msgstr "Tchoezixhaedje des adresses"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13425,10 +11790,19 @@ msgstr "est pus grand ou ewal ki"
 msgid " bytes"
 msgstr " octets"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " djoûs"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13592,13 +11966,11 @@ msgstr ""
 "infôrmåcions so ci siervice chal."
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:265
@@ -13616,8 +11988,7 @@ msgid ""
 msgstr "Sôre di conte: Conte imap"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
+msgid "Contents of script '%1':\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:320
@@ -13636,8 +12007,7 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
+msgid "Sieve capabilities:\n"
 msgstr ""
 
 #: sievedebugdialog.cpp:345
@@ -13647,8 +12017,7 @@ msgstr "Nole accion disponibe"
 
 #: sievedebugdialog.cpp:354
 #, fuzzy
-msgid ""
-"Available Sieve scripts:\n"
+msgid "Available Sieve scripts:\n"
 msgstr "Siervices k' i gn a"
 
 #: sievedebugdialog.cpp:358
@@ -13656,8 +12025,7 @@ msgstr "Siervices k' i gn a"
 msgid ""
 "(No Sieve scripts available on this server)\n"
 "\n"
-msgstr ""
-"I n' a pont d' estat po ci pacaedje ci\n"
+msgstr "I n' a pont d' estat po ci pacaedje ci\n"
 
 #: sievedebugdialog.cpp:366
 #, fuzzy
@@ -13720,8 +12088,8 @@ msgstr ""
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13740,11 +12108,11 @@ msgstr "I gn a ddja on ridant avou l' minme no ki l' no d' fitchî dné «%s�
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
@@ -13752,6 +12120,11 @@ msgstr ""
 msgid "S&pecify command:"
 msgstr "Comande ispell:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Tchimin"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "Novele intrêye:"
@@ -13790,6 +12163,11 @@ msgstr "Radjouter on conte"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>Voloz po do bon disfacer l' idintité lomêye <b>%1</b>?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "&Responde a:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13804,6 +12182,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "Aspougnî l' scripe d' elodjaedje"
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13843,9 +12225,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13884,6 +12266,16 @@ msgstr ""
 "Dji n' sai candjî li prôpietaire do fitchî %1.\n"
 "Aroke: %2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Po: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "Cc: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13914,36 +12306,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -14184,6 +12572,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
@@ -14224,76 +12616,6 @@ msgstr " Disbuguer "
 msgid "Turn Debug Off"
 msgstr " Disbuguer "
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 #, fuzzy
 msgid "There is nothing to undo."
@@ -14366,6 +12688,17 @@ msgstr "Ataetchmint:"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Li fitchî <quote>%1</quote> egzistêye dedja. Estoz seur(e) ki vos l' voloz "
+"spotchî?"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "Sipotchî l' fitchî?"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14473,9 +12806,9 @@ msgstr "Evoyî ci messaedje chal"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14509,9 +12842,9 @@ msgstr "Tchoezi fitchîs..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14521,15 +12854,15 @@ msgstr "Schaper l' calpin d' adresses"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 
 #: xfaceconfigurator.cpp:180
@@ -14538,8 +12871,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14558,148 +12891,1509 @@ msgstr "&Nole imådje"
 msgid "You do not have your own contact defined in the address book."
 msgstr "Vos n' avoz nén les droets po scrire dins ç' ridant la."
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Signing"
+msgstr "Siner"
+
+#: composercryptoconfiguration.ui:35
+#, fuzzy, no-c-format
+msgid "&Automatically sign messages"
+msgstr "Tcherdjî &otomaticmint les imådjes"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, fuzzy, no-c-format
+msgid "Encrypting"
+msgstr "Ecriptaedje"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-#, fuzzy
-msgid "Set subject of message"
-msgstr "Metoz l' sudjet do messaedjes."
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
 msgstr ""
 
-#: kmail_options.h:15
-#, fuzzy
-msgid "Send BCC: to 'address'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
-"Adresses &BCC:\n"
 
-#: kmail_options.h:17
-#, fuzzy
-msgid "Add 'header' to message"
-msgstr "Radjouter des ataetchmints a ci messaedje chal"
+#: composercryptoconfiguration.ui:81
+#, fuzzy, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "Wårder &ecriptés les messaedjes schapés"
 
-#: kmail_options.h:18
-#, fuzzy
-msgid "Read message body from 'file'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "Clitchiz po k' les messaedje soeyenxhe wårdés ecriptés"
+
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
 msgstr ""
-"%d messaedje nén léjhou di %s\n"
 
-#: kmail_options.h:19
-#, fuzzy
-msgid "Set body of message"
-msgstr "Metoz l' sudjet do messaedjes."
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr ""
 
-#: kmail_options.h:20
-#, fuzzy
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "Radjouter des ataetchmints a ci messaedje chal"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:21
-#, fuzzy
-msgid "Only check for new mail"
-msgstr "Cweri après des noveas messaedjes"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr ""
 
-#: kmail_options.h:22
-#, fuzzy
-msgid "Only open composer window"
-msgstr "Clôre li purnea d' aspougnaedje"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmail_options.h:23
-#, fuzzy
-msgid "View the given message file"
-msgstr "Vey li fitchî djournå do sistinme"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "Lére"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "Univiersele"
 
-#: kmsearchpattern.h:222
-#, fuzzy
-msgid "Old"
-msgstr "Viyès tchansons"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "Responde"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "Disfacé"
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "Responde a &Tertos..."
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "Respondou"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "En avant"
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
-msgstr "Racassî"
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "Rascourti:"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "Metou el caweye"
+#: customtemplates_base.ui:283
+#, fuzzy, no-c-format
+msgid "&Template type:"
+msgstr "Modele:"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "Evoyî"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "Modele"
 
-#: kmsearchpattern.h:228
-#, fuzzy
-msgid "Watched"
-msgstr "Riwaitî des videyos"
+#: customtemplates_kfg.kcfg:17
+#, fuzzy, no-c-format
+msgid "Template shortcut"
+msgstr "Rascourti alternatif:"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "Passé houte"
+#: customtemplates_kfg.kcfg:22
+#, fuzzy, no-c-format
+msgid "Template type"
+msgstr "Modele"
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "Prôpietés do ridant"
+
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "Ridant po ene &djåspinreye"
+
+#: folderpropertiesdialog.ui:91
+#, fuzzy, no-c-format
+msgid "List &address:"
+msgstr "Djivêye d' adresses:"
+
+#: folderpropertiesdialog.ui:122
+#, fuzzy, no-c-format
+msgid "N&ormal:"
+msgstr "Normå:"
+
+#: folderpropertiesdialog.ui:215
+#, fuzzy, no-c-format
+msgid "Unr&ead:"
+msgstr "Nén léjhou:"
+
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "Passaedje di messaedjes"
+
+#: folderpropertiesdialog.ui:283
+#, fuzzy, no-c-format
+msgid "E&xpire after:"
+msgstr "URL dis&paretèt après"
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "&Espirer les vîs messaedjes"
+
+#: folderpropertiesdialog.ui:339
+#, fuzzy, no-c-format
+msgid "Expire a&fter:"
+msgstr "URL dis&paretèt après"
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "&Espirer les vîs messaedjes"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "Djoû(s)"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "Samwinne(s)"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "Moes"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "Sipepieus"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "Novele Idintité:"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "Cogne del coûte date:"
+
+#: folderpropertiesdialog.ui:494
+#, fuzzy, no-c-format
+msgid "&List displays:"
+msgstr "èn sont nén håynés"
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
 msgstr ""
 
-#: kmsearchpattern.h:231
-#, fuzzy
-msgid "Ham"
-msgstr "AM"
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "Po: "
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr ""
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "Ataetchmint"
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
 
-#: quotajobs.h:76
-#, fuzzy
-msgid "%1 of %2 %3 used"
-msgstr "%1 foû di %2 (%3% d' eployî)"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "Tchimin"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:93
+#, fuzzy, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "Li tite do purnea di tchoezixhaedje del coleur"
+
+#: kmail.kcfg:101
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
 msgstr ""
-"Li fitchî <quote>%1</quote> egzistêye dedja. Estoz seur(e) ki vos l' voloz "
-"spotchî?"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "Sipotchî l' fitchî?"
+#: kmail.kcfg:109
+#, fuzzy, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "_Håyner imådjete d' estat po l' aplikete:"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "Vos avoz des noveas emiles"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "Sipecifyîz l' &aspougneu a-z eployî:"
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "Eployô on d&foûtrin aspougneu d' tecse"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr ""
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, fuzzy, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "Nombe macsimom d' intrêyes"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr ""
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "Tcherdjî &otomaticmint les imådjes"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, fuzzy, no-c-format
+msgid "Word &wrap at column:"
+msgstr "Longueu del roye wice k' i fåt côper les mots : "
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Nombe macsimom d' intrêyes"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr ""
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, fuzzy, no-c-format
+msgid "Autosave interval:"
+msgstr "Tins inte deus schapaedjes otomatikes"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "Replaecî les ricno&xhowès betchetes avou «Re:»"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "Replaecî les ricnoxhowès betchetes avou «&Fwd:»"
+
+#: kmail.kcfg:466
+#, fuzzy, no-c-format
+msgid "Use smart &quoting"
+msgstr "Eployî li sûti cweraedje"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Li sinateure est valide."
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, fuzzy, no-c-format
+msgid "Type of addressee selector"
+msgstr "Tchoezixhaedje des adresses"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, fuzzy, no-c-format
+msgid "Type of recipients editor"
+msgstr "Aspougneu XML oryinté åbes"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "Nombe macsimom d' intrêyes"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, fuzzy, no-c-format
+msgid "Automatic collapse level:"
+msgstr "Oto-Mostraedje"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr ""
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr ""
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Wårder &ecriptés les messaedjes schapés"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "Håyner totes les tiestires do messaedje"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "Scrire on novea messaedje"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "caracteres pol citåcion dins les emiles"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Aspougnî li F&itchî"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Aspougnî..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "&Evoye"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "R&idant"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "&Messaedje"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, fuzzy, no-c-format
+msgid "Reply Special"
+msgstr "Sipeciå"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "En a&vant"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Apontiaedjes po les fontes"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Bår ås usteyes mdk"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "Kimonès Tchuzes"
+
+#: kmcomposerui.rc:102
+#, fuzzy, no-c-format
+msgid "HTML Toolbar"
+msgstr "Bår ås usteyes mdk"
+
+#: smimeconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "Acertineure nén valide!"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "Fijhaedje d' ene acertineure"
+
+#: smimeconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "OCSP responder URL:"
+msgstr "Response DLP:"
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "Mete li sinateure al _copete"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "Verifyî l' acertineure do sierveu"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "Èn nén evoyî d' acertineure"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "Å moumint di radjouter les acertineures"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, fuzzy, no-c-format
+msgid "HTTP Requests"
+msgstr "Si dmandé"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, fuzzy, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "Eployî l' procsi HTTP po les raloyaedjes HTTPS"
+
+#: smimeconfiguration.ui:232
+#, fuzzy, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "Eployî fontes sistinme"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, fuzzy, no-c-format
+msgid "LDAP Requests"
+msgstr "Si dmandé"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "R&adjouter..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "Ovraedje e groupe"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "Apontiaedjes po les fontes"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "sins limites"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "Ritcherdjî l' apontiaedje"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "&Responde a l' evoyeu:"
+
+#: templatesconfiguration_base.ui:172
+#, fuzzy, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "Responde a tertos k' on rçuvou ci messaedje chal"
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "Messaedje rcassî"
+
+#: warningconfiguration.ui:24
+#, fuzzy, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "M' ad&vierti cwand dji saye d' evoyî des messaedjes nén ecriptés"
+
+#: warningconfiguration.ui:30
+#, fuzzy, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Verifyî l' ortografeye do messaedje"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "M' ad&vierti cwand dji saye d' evoyî des messaedjes nén ecriptés"
+
+#: warningconfiguration.ui:52
+#, fuzzy, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "M' ad&vierti cwand dji saye d' evoyî des messaedjes nén ecriptés"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr ""
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr ""
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr ""
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "Ecriptaedje"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, fuzzy, no-c-format
+msgid "Select the number of days here"
+msgstr "Tchoezixhoz l' djoû d' ouy"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "Cweri après des ôtès acertineures"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "Èn nén evoyî d' acertineure"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "Acertineure di pair:"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Standard (Ical / Vcard)"
@@ -14725,7 +14419,9 @@ msgstr "Sipotchî l' fitchî?"
 
 #, fuzzy
 #~ msgid "The error message from the server communication is here:"
-#~ msgstr "Çoula pout esse ki vos n' avoz nén les permissions k' i fåt pol fé. Li messaedje d' aroke evoyî på sierveu est chal pa dzo:"
+#~ msgstr ""
+#~ "Çoula pout esse ki vos n' avoz nén les permissions k' i fåt pol fé. Li "
+#~ "messaedje d' aroke evoyî på sierveu est chal pa dzo:"
 
 #, fuzzy
 #~ msgid "Todo"
@@ -14781,7 +14477,9 @@ msgstr "Sipotchî l' fitchî?"
 #~ msgstr "Ecr&ipter totes les pårteyes des messaedjes"
 
 #~ msgid "Check to have all message parts encrypted by default"
-#~ msgstr "Clitchîz po kel prémetowe dujhance soeye d' ecripter totes les pårteyes des messaedjes multipårt"
+#~ msgstr ""
+#~ "Clitchîz po kel prémetowe dujhance soeye d' ecripter totes les pårteyes "
+#~ "des messaedjes multipårt"
 
 #, fuzzy
 #~ msgid "Ask &before encrypting each part"
@@ -14792,7 +14490,8 @@ msgstr "Sipotchî l' fitchî?"
 #~ msgstr "Èn &nén ecripter les messaedjes"
 
 #~ msgid "Check for not encrypting a message by default"
-#~ msgstr "Clitchîz po kel prémetowe dujhance soeye di n' nén ecripter les messaedjes"
+#~ msgstr ""
+#~ "Clitchîz po kel prémetowe dujhance soeye di n' nén ecripter les messaedjes"
 
 #, fuzzy
 #~ msgid "Selects the encryption algorithm"
@@ -14818,7 +14517,9 @@ msgstr "Sipotchî l' fitchî?"
 
 #, fuzzy
 #~ msgid "Check here to have the whole certificate path checked"
-#~ msgstr "Li metaedje e plaece di l' acertineure cliyint pol session a fwait berwete."
+#~ msgstr ""
+#~ "Li metaedje e plaece di l' acertineure cliyint pol session a fwait "
+#~ "berwete."
 
 #, fuzzy
 #~ msgid "Check to use CRLs"
@@ -14830,7 +14531,9 @@ msgstr "Sipotchî l' fitchî?"
 
 #, fuzzy
 #~ msgid "Check to have encrypted messages also encrypted using your own key."
-#~ msgstr "Clitchîz po kel prémetowe dujhance soeye d' ecripter totes les pårteyes des messaedjes multipårt"
+#~ msgstr ""
+#~ "Clitchîz po kel prémetowe dujhance soeye d' ecripter totes les pårteyes "
+#~ "des messaedjes multipårt"
 
 #~ msgid "Signature Configuration"
 #~ msgstr "Apontiaedje del sinateure"
@@ -14861,7 +14564,9 @@ msgstr "Sipotchî l' fitchî?"
 
 #, fuzzy
 #~ msgid "Check to have all message parts signed by default"
-#~ msgstr "Clitchîz po kel prémetowe dujhance soeye d' ecripter totes les pårteyes des messaedjes multipårt"
+#~ msgstr ""
+#~ "Clitchîz po kel prémetowe dujhance soeye d' ecripter totes les pårteyes "
+#~ "des messaedjes multipårt"
 
 #, fuzzy
 #~ msgid "Do no&t sign messages"
@@ -14869,7 +14574,8 @@ msgstr "Sipotchî l' fitchî?"
 
 #, fuzzy
 #~ msgid "Check for not signing a message by default"
-#~ msgstr "Clitchîz po kel prémetowe dujhance soeye di n' nén ecripter les messaedjes"
+#~ msgstr ""
+#~ "Clitchîz po kel prémetowe dujhance soeye di n' nén ecripter les messaedjes"
 
 #, fuzzy
 #~ msgid "Selects the signature algorithm"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmail.po b/tde-i18n-zh_CN/messages/tdepim/kmail.po
index bf2e1f8e3f0..16b59e773ce 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmail.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 3.5\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-01-29 14:12+0800\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn),Funda Wang"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -173,6 +173,12 @@ msgstr "无(小心使用)(&E)"
 msgid "Account for semiautomatic resource handling"
 msgstr "半自动资源管理的账户"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "过时清除"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -247,12 +253,13 @@ msgstr "登录名(&L)："
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"您的互联网服务提供商(ISP)会给您一个<em>用户名</em>，您可以使用该用户名向他们的服务器验证您自己。该用户名通常就是您电子邮件地址的第一部分(<em>"
-"@</em>前面的部分)。"
+"您的互联网服务提供商(ISP)会给您一个<em>用户名</em>，您可以使用该用户名向他们"
+"的服务器验证您自己。该用户名通常就是您电子邮件地址的第一部分(<em>@</em>前面的"
+"部分)。"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -273,17 +280,17 @@ msgstr "存储 POP 密码(&R)"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "选中此选项后，KMail 将在其配置文件中存储密码。\n"
 "如果 TDEWallet 可用，那么密码将存储在钱包中，这样会更加安全。\n"
-"但是，如果 TDEWallet 不可用，密码将存储在 KMail "
-"的配置文件中。虽然该密码将以打乱的格式存储，但并不够安全，当获得配置文件访问权后被解密的可能性很大。"
+"但是，如果 TDEWallet 不可用，密码将存储在 KMail 的配置文件中。虽然该密码将以"
+"打乱的格式存储，但并不够安全，当获得配置文件访问权后被解密的可能性很大。"
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -311,9 +318,12 @@ msgstr "过滤信件，如果信件大于(&F)"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
-msgstr "如果您选中此选项，POP 过滤器将用于决定要对信件进行何种操作。您可以选择下载，从服务器删除，或是保留在服务器上。"
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
+msgstr ""
+"如果您选中此选项，POP 过滤器将用于决定要对信件进行何种操作。您可以选择下载，"
+"从服务器删除，或是保留在服务器上。"
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -362,13 +372,15 @@ msgstr "纯文本(&X)"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "&LOGIN"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "&PLAIN"
 
@@ -411,12 +423,13 @@ msgstr "命名空间："
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"您可以在这里看到您的 IMAP 服务器支持的各种命名空间。每个命名空间都描述了一个可区分一组文件夹的前缀。命名空间的作用比如允许 KMail "
-"在一个账户下同时显示个人文件夹和共享文件夹。"
+"您可以在这里看到您的 IMAP 服务器支持的各种命名空间。每个命名空间都描述了一个"
+"可区分一组文件夹的前缀。命名空间的作用比如允许 KMail 在一个账户下同时显示个人"
+"文件夹和共享文件夹。"
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -473,10 +486,12 @@ msgstr "按需装入附件(&M)"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
-msgstr "激活此选项将在您选中邮件的时候不自动装入附件，而仅当您单击附件的时候才装入。这样既便是很大的邮件也能快速显示出来。"
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
+msgstr ""
+"激活此选项将在您选中邮件的时候不自动装入附件，而仅当您单击附件的时候才装入。"
+"这样既便是很大的邮件也能快速显示出来。"
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -486,7 +501,9 @@ msgstr "只列出打开的文件夹"
 msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
-msgstr "仅有那些在文件夹树中打开(展开)的文件夹会被检查子文件夹。如果在服务器上有很多文件夹，请使用此选项。"
+msgstr ""
+"仅有那些在文件夹树中打开(展开)的文件夹会被检查子文件夹。如果在服务器上有很多"
+"文件夹，请使用此选项。"
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -514,7 +531,7 @@ msgstr "<无>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "收件箱"
 
@@ -522,8 +539,8 @@ msgstr "收件箱"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 "服务器似乎不支持唯一信件号，但是要在服务器上保留信件，必须使用此特性。\n"
 "由于某些服务器无法正确声明其能力，您仍然有机会关闭在服务器上保留信件的功能。"
@@ -532,27 +549,30 @@ msgstr ""
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "服务器似乎不支持获取信件头，但是要在服务器上过滤信件，必须使用此特性。\n"
 "由于某些服务器无法正确声明其能力，您仍然有机会关闭在服务器上过滤信件的功能。"
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "请注意该特性可能会引起不支持流水线的 POP3 服务器发送损坏的邮件；\n"
-"这是可以配置的，因为有些服务器支持流水线但是没有声明它们具有这种能力。要检查您的 POP3 "
-"服务器是否声明支持流水线，请点对话框底部的“检查服务器的支持情况”按钮；\n"
-"如果您的服务器并未声明支持，而您又希望得到更快的速度，您应该先测试一下，发送一批邮件给您自己，然后下载这些邮件看流水线方式是否正常。"
+"这是可以配置的，因为有些服务器支持流水线但是没有声明它们具有这种能力。要检查"
+"您的 POP3 服务器是否声明支持流水线，请点对话框底部的“检查服务器的支持情况”按"
+"钮；\n"
+"如果您的服务器并未声明支持，而您又希望得到更快的速度，您应该先测试一下，发送"
+"一批邮件给您自己，然后下载这些邮件看流水线方式是否正常。"
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -560,28 +580,31 @@ msgstr "请先在常规标签中指定服务器和端口。"
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "服务器似乎不支持流水线；因此，此选项已被禁用。\n"
-"由于某些服务器无法正确声明其能力，您仍然有机会关闭流水线特性。但是请注意，此特性可能导致某些不支持流水线的 POP "
-"服务器发送被破坏的信件。所以，在此使用此特性处理重要邮件之前，您应该先向您自己发送大量测试信件，然后从 POP 服务器一次性收取。"
+"由于某些服务器无法正确声明其能力，您仍然有机会关闭流水线特性。但是请注意，此"
+"特性可能导致某些不支持流水线的 POP 服务器发送被破坏的信件。所以，在此使用此特"
+"性处理重要邮件之前，您应该先向您自己发送大量测试信件，然后从 POP 服务器一次性"
+"收取。"
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"服务器似乎不支持唯一信件号，但是要在服务器上保留信件，必须使用此特性；因此，此选项已被禁用。\n"
+"服务器似乎不支持唯一信件号，但是要在服务器上保留信件，必须使用此特性；因此，"
+"此选项已被禁用。\n"
 "由于某些服务器无法正确声明其能力，您仍然有机会关闭在服务器上保留信件的功能。"
 
 #: accountdialog.cpp:1672
@@ -589,10 +612,11 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
-"服务器似乎不支持获取信件头，但是要在服务器上过滤信件，必须使用此特性；因此，此选项已被禁用。\n"
+"服务器似乎不支持获取信件头，但是要在服务器上过滤信件，必须使用此特性；因此，"
+"此选项已被禁用。\n"
 "由于某些服务器无法正确声明其能力，您仍然有机会关闭在服务器上过滤信件的功能。"
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -667,8 +691,8 @@ msgstr "IMAP 账户"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "您需要在网络设置部分添加一个账户才能接收邮件。"
 
 #: accountwizard.cpp:87
@@ -705,11 +729,12 @@ msgstr "欢迎使用 KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
-"<qt>似乎您是第一次启动 KMail。您可以使用此向导设置您的邮件账户。您只需在下面几步中输入从您的电子邮件提供者那里收到的连接数据。</qt>"
+"<qt>似乎您是第一次启动 KMail。您可以使用此向导设置您的邮件账户。您只需在下面"
+"几步中输入从您的电子邮件提供者那里收到的连接数据。</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -771,8 +796,7 @@ msgstr "使用本地投递"
 msgid "Server Information"
 msgstr "服务器信息"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "无"
@@ -864,7 +888,9 @@ msgstr "反病毒工具扫描完成。"
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
-msgstr "<p>未找到垃圾邮件检测工具。请安装您的垃圾邮件检测工具，然后重新运行此向导。</p>"
+msgstr ""
+"<p>未找到垃圾邮件检测工具。请安装您的垃圾邮件检测工具，然后重新运行此向导。</"
+"p>"
 
 #: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
@@ -902,27 +928,28 @@ msgstr "<p>向导将替换下列过滤器：<ul>"
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
-msgstr "向导将搜索可进行垃圾邮件检测的任何工具，并将 KMail 设置为与其共同工作。"
+msgstr ""
+"向导将搜索可进行垃圾邮件检测的任何工具，并将 KMail 设置为与其共同工作。"
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>这里能帮助您使用流行的反病毒工具来创建 KMail 过滤器规则。</p>"
-"<p>向导能够检测出您的计算机上安装反病毒工具，同时使用这些工具创建过滤器规则以便分类邮件并隔离包含病毒的邮件。向导在任何情况下都将添加规则，而不会考虑已有的过"
-"滤器规则。</p>"
-"<p><b>警告：</b>由于在扫描病毒的时候 KMail 将被锁死，您可能会遇到 KMail "
-"失去响应的情况，因为反病毒工具操作比较费时；如果想要返回到先前的行为，您应该考虑删除向导所创建的某些过滤规则。"
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>这里能帮助您使用流行的反病毒工具来创建 KMail 过滤器规则。</p><p>向导能够检"
+"测出您的计算机上安装反病毒工具，同时使用这些工具创建过滤器规则以便分类邮件并"
+"隔离包含病毒的邮件。向导在任何情况下都将添加规则，而不会考虑已有的过滤器规"
+"则。</p><p><b>警告：</b>由于在扫描病毒的时候 KMail 将被锁死，您可能会遇到 "
+"KMail 失去响应的情况，因为反病毒工具操作比较费时；如果想要返回到先前的行为，"
+"您应该考虑删除向导所创建的某些过滤规则。"
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -954,13 +981,12 @@ msgstr "将可能的垃圾邮件移动到(&P)："
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"默认文件夹是收件夹，但您可以在下面的文件夹视图中更改。"
-"<p>并非所有的工具都支持分类未不确定。如果您没有选择有这样的功能的工具，您就无法选择此处的文件夹。"
+"默认文件夹是收件夹，但您可以在下面的文件夹视图中更改。<p>并非所有的工具都支持"
+"分类未不确定。如果您没有选择有这样的功能的工具，您就无法选择此处的文件夹。"
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -970,10 +996,11 @@ msgstr "使用反病毒工具检查信件"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
-"让反病毒工具检查您的信件。向导会创建适当的过滤器。信件通常先由这些工具作标记，再让过滤器起作用，最后采取操作，例如，将感染病毒的信件移到特殊的文件夹。"
+"让反病毒工具检查您的信件。向导会创建适当的过滤器。信件通常先由这些工具作标"
+"记，再让过滤器起作用，最后采取操作，例如，将感染病毒的信件移到特殊的文件夹。"
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -982,9 +1009,11 @@ msgstr "将检测到的病毒信件移至选中的文件夹"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
-msgstr "过滤器已经创建成功，该过滤器会检测信件，将分类成染毒的信件移至预定的文件夹。默认的文件夹是废件夹，但您可以在文件夹视图中更改。"
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
+msgstr ""
+"过滤器已经创建成功，该过滤器会检测信件，将分类成染毒的信件移至预定的文件夹。"
+"默认的文件夹是废件夹，但您可以在文件夹视图中更改。"
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -992,8 +1021,8 @@ msgstr "另外将检测到的染毒邮件标为已读"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr "将分类为已感染病毒的信件标为已读，并将其移至选中的文件夹。"
 
 #: archivefolderdialog.cpp:48
@@ -1171,7 +1200,9 @@ msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
 "communication is here:"
-msgstr "这可能是因为您没有权限这样做，或者因为该文件夹已经存在于服务器上；和服务器通信中的错误消息如下："
+msgstr ""
+"这可能是因为您没有权限这样做，或者因为该文件夹已经存在于服务器上；和服务器通"
+"信中的错误消息如下："
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1184,8 +1215,8 @@ msgstr "读取服务器上的文件夹 %1 出错："
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1205,8 +1236,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1237,15 +1268,15 @@ msgstr "已删除"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr "<qt>您的身份中没有一个可以匹配此信件，<br>请选择下列哪个地址是您的："
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr "<qt>您的身份中有好几个可以匹配此信件，<br>请选择下列哪个地址是您的："
 
 #: callback.cpp:233
@@ -1275,15 +1306,21 @@ msgstr "压缩“%1”时发生了错误。压缩已终止。"
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
-msgstr "<qt><p>此设置已经被您的管理员固定。</p><p>如果您认为不应该这样设置，请联系管理员。</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
+msgstr ""
+"<qt><p>此设置已经被您的管理员固定。</p><p>如果您认为不应该这样设置，请联系管"
+"理员。</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "装入配置集文件(&L)..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "配置账户"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "添加(&A)..."
@@ -1313,6 +1350,11 @@ msgstr "<qt>您真的要删除名为 <b>%1</b> 的身份吗？</qt>"
 msgid "Remove Identity"
 msgstr "删除身份"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "删除(&E)"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "添加..."
@@ -1321,6 +1363,11 @@ msgstr "添加..."
 msgid "Modify..."
 msgstr "修改..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "删除(&E)"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "设置为默认"
@@ -1337,17 +1384,15 @@ msgstr "发送(&S)"
 msgid "Outgoing accounts (add at least one):"
 msgstr "发送账户(至少添加一个)："
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "名称"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "类型"
@@ -1369,8 +1414,7 @@ msgstr "设为默认"
 msgid "Common Options"
 msgstr "公共选项"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "发送前确认(&B)"
@@ -1421,14 +1465,14 @@ msgstr "默认域名(&T)："
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr "<qt><p>默认域名用于在只有用户名的情况下补全电子邮件地址。</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1446,9 +1490,9 @@ msgstr "添加传送方式"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (默认)"
 
@@ -1527,6 +1571,10 @@ msgstr "修改账户"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>无法定位账户 <b>%1</b>。</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "颜色(&S)"
@@ -1635,8 +1683,7 @@ msgstr "已访问链接"
 msgid "Misspelled Words"
 msgstr "拼错的单词"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "新信件"
@@ -1824,8 +1871,8 @@ msgstr "线索默认为关闭"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr "打开包含新的、或未读、或重要信件的以及关注的线索(&W)"
 
 #: configuredialog.cpp:2055
@@ -1834,67 +1881,48 @@ msgstr "日期显示"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>这些表达式可用于日期：</strong></p>"
-"<ul>"
-"<li>d - 天数的数字，没有前导零(1-31)</li>"
-"<li>dd - 天数的数字，有前导零(01-31)</li>"
-"<li>ddd - 星期短名称(周一 - 周日)</li>"
-"<li>dddd - 星期长名称(星期一 - 星期日)</li>"
-"<li>M - 月份的数字，没有前导零(1-12)</li>"
-"<li>MM - 月份的数字，有前导零(01-12)</li>"
-"<li>MMM - 月份短名称(一月 - 十二月)</li>"
-"<li>MMMM - 月份长名称(一月 - 十二月)</li>"
-"<li>yy - 两位数字的年份(00-99)</li>"
-"<li>yyyy - 四位数字的年份(0000-9999)</li></ul>"
-"<p><strong>这些表达式可用于时间：</string></p>"
-"<ul>"
-"<li>h - 没有前导零的小时数(0-23，若显示 AM/PM 则为 1-12)</li>"
-"<li>hh - 有前导零的小时数(00-23，若显示 AM/PM 则为 01-12)</li>"
-"<li>m - 没有前导零的分钟数(0-59)</li>"
-"<li>mm - 有前导零的分钟数(00-59)</li>"
-"<li>s - 没有前导零的秒钟数(0-59)</li>"
-"<li>ss - 有前导零的秒钟数(00-59)</li>"
-"<li>z - 没有前导零的毫秒数(0-999)</li>"
-"<li>zzz - 有前导零的毫秒数(000-999)</li>"
-"<li>AP - 切换到 AM/PM 显示。AP 将被替换为“AM”或“PM”。</li>"
-"<li>ap - 切换到 AM/PM 显示。ap 将被替换为“am”或“pm”。</li>"
-"<li>Z - 数字形式的时区(-0500)</li></ul>"
-"<p><strong>所有输入的其它字符都将被忽略。</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>这些表达式可用于日期：</strong></p><ul><li>d - 天数的数字，没"
+"有前导零(1-31)</li><li>dd - 天数的数字，有前导零(01-31)</li><li>ddd - 星期短"
+"名称(周一 - 周日)</li><li>dddd - 星期长名称(星期一 - 星期日)</li><li>M - 月份"
+"的数字，没有前导零(1-12)</li><li>MM - 月份的数字，有前导零(01-12)</"
+"li><li>MMM - 月份短名称(一月 - 十二月)</li><li>MMMM - 月份长名称(一月 - 十二"
+"月)</li><li>yy - 两位数字的年份(00-99)</li><li>yyyy - 四位数字的年份"
+"(0000-9999)</li></ul><p><strong>这些表达式可用于时间：</string></p><ul><li>h "
+"- 没有前导零的小时数(0-23，若显示 AM/PM 则为 1-12)</li><li>hh - 有前导零的小"
+"时数(00-23，若显示 AM/PM 则为 01-12)</li><li>m - 没有前导零的分钟数(0-59)</"
+"li><li>mm - 有前导零的分钟数(00-59)</li><li>s - 没有前导零的秒钟数(0-59)</"
+"li><li>ss - 有前导零的秒钟数(00-59)</li><li>z - 没有前导零的毫秒数(0-999)</"
+"li><li>zzz - 有前导零的毫秒数(000-999)</li><li>AP - 切换到 AM/PM 显示。AP 将"
+"被替换为“AM”或“PM”。</li><li>ap - 切换到 AM/PM 显示。ap 将被替换"
+"为“am”或“pm”。</li><li>Z - 数字形式的时区(-0500)</li></ul><p><strong>所有输入"
+"的其它字符都将被忽略。</strong></p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "改变全局的线索设置将会覆盖各个文件夹特定的设置。"
 
 #: configuredialog.cpp:2221
@@ -1909,8 +1937,7 @@ msgstr "显示 HTML 状态栏(&U)"
 msgid "Show s&pam status in fancy headers"
 msgstr "在亮丽信头中显示垃圾信状态(&P)"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "将表情以图形方式显示"
@@ -1919,8 +1946,7 @@ msgstr "将表情以图形方式显示"
 msgid "Use smaller font for quoted text"
 msgstr "引用的文本使用较小的字体"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "显示展开/折叠的引用标记"
@@ -1946,8 +1972,7 @@ msgstr "自动"
 msgid "&Override character encoding:"
 msgstr "覆盖字符编码(&O)："
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "启用系统托盘图标"
@@ -2049,20 +2074,18 @@ msgstr "<b>%f</b> 将被替换为要编辑的文件名。"
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>在回信中支持下列占位符："
-"<br><b>%D</b>：日期，<b>%S</b>：主题，"
-"<br><b>%e</b>：发送人地址，<b>%F</b>：发送人姓名，<b>%f</b>：发送人称谓，"
-"<br><b>%T</b>：收件人姓名，<b>%t</b>：收件人姓名和地址，"
-"<br><b>%C</b>：抄送人姓名，<b>%c</b>：抄送人姓名和地址，"
-"<br><b>%%</b>：百分号，<b>%_</b>：空格，<b>%L</b>：换行</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>在回信中支持下列占位符：<br><b>%D</b>：日期，<b>%S</b>：主题，<br><b>%e</"
+"b>：发送人地址，<b>%F</b>：发送人姓名，<b>%f</b>：发送人称谓，<br><b>%T</b>："
+"收件人姓名，<b>%t</b>：收件人姓名和地址，<br><b>%C</b>：抄送人姓名，<b>%c</"
+"b>：抄送人姓名和地址，<br><b>%%</b>：百分号，<b>%_</b>：空格，<b>%L</b>：换行"
+"</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2085,21 +2108,20 @@ msgstr "回复给所有人(&Y)："
 msgid "&Forward:"
 msgstr "转发(&F)："
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "引文符号(&Q)："
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "在 %D，您写道："
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "在 %D，%F 写道："
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "转发的信件"
 
@@ -2137,8 +2159,8 @@ msgstr "输入新的转发前缀："
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr "这个列表将会由上而下的检查哪个字符集包括发送信件需要的所有字符。"
 
 #: configuredialog.cpp:3278
@@ -2173,10 +2195,9 @@ msgstr "值"
 msgid "Ne&w"
 msgstr "新建(&W)"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "名称(&N)："
@@ -2185,16 +2206,15 @@ msgstr "名称(&N)："
 msgid "&Value:"
 msgstr "值(&V)："
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook 兼容的附件命名"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr "启用此选项，才能让 Outlook(tm) 理解包含非英语字符的附件名"
 
 #: configuredialog.cpp:3595
@@ -2221,16 +2241,18 @@ msgstr "附件"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"您选择了将包含非英语字符的附件名按照 Outlook(tm) 和其它不遵从标准编码附件名的邮件客户程序可理解的方式进行编码。\n"
-"请注意，KMail 可以创建不遵从标准的信件，但这将造成遵从标准的邮件客户程序无法读出这些信件；所以，除非您没有其它选择，您不应该启用此选项。"
+"您选择了将包含非英语字符的附件名按照 Outlook(tm) 和其它不遵从标准编码附件名的"
+"邮件客户程序可理解的方式进行编码。\n"
+"请注意，KMail 可以创建不遵从标准的信件，但这将造成遵从标准的邮件客户程序无法"
+"读出这些信件；所以，除非您没有其它选择，您不应该启用此选项。"
 
 #: configuredialog.cpp:3682
 msgid "&Reading"
@@ -2254,88 +2276,82 @@ msgstr "加密算法后端(&N)"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>有时候信件中包含两种格式。这个选项控制您希望显示HTML部分还是纯文本部分。</p>"
-"<p>显示HTML部分可以使信件看起来更加美观，但同时也增加了安全漏洞被利用的风险。</p>"
-"<p>显示纯文本可能会丢失一些信件的格式，但是几乎<em>不可能</em>让人利用HTML浏览器(Konqueror)的安全漏洞。</p>"
-"<p>下面的选项用于防范一个对HTML信件的普遍误用。但是它不能防范当前版本的KMail所不知道的安全问题。</p>"
-"<p>因此建议<em>不要</em>优先使用HTML。</p>"
-"<p><b>注意：</p>您可以在KMail主窗口中的<i>文件夹</i>菜单中为每个文件夹设置这个选项。</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>有时候信件中包含两种格式。这个选项控制您希望显示HTML部分还是纯文本部"
+"分。</p><p>显示HTML部分可以使信件看起来更加美观，但同时也增加了安全漏洞被利用"
+"的风险。</p><p>显示纯文本可能会丢失一些信件的格式，但是几乎<em>不可能</em>让"
+"人利用HTML浏览器(Konqueror)的安全漏洞。</p><p>下面的选项用于防范一个对HTML信"
+"件的普遍误用。但是它不能防范当前版本的KMail所不知道的安全问题。</p><p>因此建"
+"议<em>不要</em>优先使用HTML。</p><p><b>注意：</p>您可以在KMail主窗口中的<i>文"
+"件夹</i>菜单中为每个文件夹设置这个选项。</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>有些邮件广告是HTML格式的，并且包含了如图片等引用以使广告商知道您已经阅读了这封邮件(“Web 错误”)。</p>"
-"<p>其实并没有足够的理由像这样从网上引用图片，因为发送者总可以直接把图片作为附件发送。</p>"
-"<p>为了防止这种对KMail显示HTML功能的滥用，这个选项默认是<em>禁用</em>的。</p>"
-"<p>但是，如果您希望查看HTML信件中不是作为附件的图片链接，您可以打开该选项，但是您应该清楚可能存在的问题。</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>有些邮件广告是HTML格式的，并且包含了如图片等引用以使广告商知道您已经阅"
+"读了这封邮件(“Web 错误”)。</p><p>其实并没有足够的理由像这样从网上引用图片，因"
+"为发送者总可以直接把图片作为附件发送。</p><p>为了防止这种对KMail显示HTML功能"
+"的滥用，这个选项默认是<em>禁用</em>的。</p><p>但是，如果您希望查看HTML信件中"
+"不是作为附件的图片链接，您可以打开该选项，但是您应该清楚可能存在的问题。</"
+"p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>信件投递通知策略</h3>"
-"<p>MDN 是一组通常称为“阅读回执”的确认邮件。信件作者可以请求接收人的邮件程序发回处理回执，从而得知他的信件被如何处理了。常用的处理类型有<b>"
-"已显示</b>(即已读)、<b>已删除</b>和<b>已分发</b>(即已转发)。</p>"
-"<p>可以用如下的选项控制 KMail 如何发送 MDN 回复：</p>"
-"<ul>"
-"<li><em>忽略</em>：忽略任何回执请求。不自动发送 MDN 回复(推荐)。</li>"
-"<li><em>询问</em>：只有在询问用户允许后才回复请求。这样您可以只有选择地对某些信件发送 MDN 回复，但对其它信件则拒绝或者忽略 MDN "
-"请求。</li>"
-"<li><em>拒绝</em>：总是发送<b>拒绝</b>通知。这只比总是发送 MDN 回复<em>稍微</em>"
-"好一点。来信的作者仍然知道他的信件被处理了，只是无法判断是被删除还是阅读过。</li>"
-"<li><em>总是发送</em>：总是发送所请求的处理回执。这意味着来信的作者将知道他的信件已被处理，而且知道它是如何被处理的(已显示、删除等等)。强烈建议您"
-"不要使用这个选项，但因为它对某些场合很有意义，比如客户关系协调，所以软件还是提供这个功能。</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>信件投递通知策略</h3><p>MDN 是一组通常称为“阅读回执”的确认邮件。信件"
+"作者可以请求接收人的邮件程序发回处理回执，从而得知他的信件被如何处理了。常用"
+"的处理类型有<b>已显示</b>(即已读)、<b>已删除</b>和<b>已分发</b>(即已转发)。</"
+"p><p>可以用如下的选项控制 KMail 如何发送 MDN 回复：</p><ul><li><em>忽略</"
+"em>：忽略任何回执请求。不自动发送 MDN 回复(推荐)。</li><li><em>询问</em>：只"
+"有在询问用户允许后才回复请求。这样您可以只有选择地对某些信件发送 MDN 回复，但"
+"对其它信件则拒绝或者忽略 MDN 请求。</li><li><em>拒绝</em>：总是发送<b>拒绝</"
+"b>通知。这只比总是发送 MDN 回复<em>稍微</em>好一点。来信的作者仍然知道他的信"
+"件被处理了，只是无法判断是被删除还是阅读过。</li><li><em>总是发送</em>：总是"
+"发送所请求的处理回执。这意味着来信的作者将知道他的信件已被处理，而且知道它是"
+"如何被处理的(已显示、删除等等)。强烈建议您不要使用这个选项，但因为它对某些场"
+"合很有意义，比如客户关系协调，所以软件还是提供这个功能。</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2351,13 +2367,14 @@ msgstr "允许信件从网络上加载外部引用(&X)"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>警告：</b>在邮件中使用 HTML 会增大您的系统被已有的和将有的安全漏洞危及的风险。<a href=\"whatsthis:%1\">"
-"关于 HTML 信件的更多信息...</a> <a href=\"whatsthis:%2\">关于外部引用的更多信息...</a>"
+"<b>警告：</b>在邮件中使用 HTML 会增大您的系统被已有的和将有的安全漏洞危及的风"
+"险。<a href=\"whatsthis:%1\">关于 HTML 信件的更多信息...</a> <a href="
+"\"whatsthis:%2\">关于外部引用的更多信息...</a>"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2415,7 +2432,9 @@ msgstr "对加密信件的响应不发送 MDNs"
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
-msgstr "<b>警告：</b>无条件回复确认信件将可能会影响您的隐私。<a href=\"whatsthis:%1\">更多信息...</a>"
+msgstr ""
+"<b>警告：</b>无条件回复确认信件将可能会影响您的隐私。<a href=\"whatsthis:"
+"%1\">更多信息...</a>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2434,8 +2453,7 @@ msgstr "改变全局的 HTML 设置，将会替代所有文件夹特定的设置
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "此选项需要 dirmngr >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "无代理"
@@ -2464,8 +2482,8 @@ msgstr "重要邮件不过期(&X)"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "寻找未读信件时："
 
@@ -2489,8 +2507,8 @@ msgstr "在全部文件夹循环"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "进入文件夹时："
 
@@ -2559,23 +2577,21 @@ msgstr "目录(“maildir”格式)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>选择本地文件夹的默认邮箱格式：</p>"
-"<p><b>mbox：</b>KMail "
-"的文件夹是由单独的文件代表的。文件内各个邮件用“From”开头的行彼此分隔。这样可以节省磁盘空间，但可能会损失稳定性，比如，在文件夹之间移动邮件。</p>"
-"<p><b>maildir：</b>KMail "
-"的文件夹是由磁盘上的实际文件夹来表示。不同的邮件就是不同的文件。这样可能会浪费一些磁盘空间，但是应该更加稳定，比如，在文件夹之间移动邮件。</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>选择本地文件夹的默认邮箱格式：</p><p><b>mbox：</b>KMail 的文件夹是由单"
+"独的文件代表的。文件内各个邮件用“From”开头的行彼此分隔。这样可以节省磁盘空"
+"间，但可能会损失稳定性，比如，在文件夹之间移动邮件。</p><p><b>maildir：</"
+"b>KMail 的文件夹是由磁盘上的实际文件夹来表示。不同的邮件就是不同的文件。这样"
+"可能会浪费一些磁盘空间，但是应该更加稳定，比如，在文件夹之间移动邮件。</p></"
+"qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2608,43 +2624,38 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>如果跳转到下封未读信件，可能发生当前信件后没有未读信件的情况。</p>"
-"<p><b>不循环：</b>搜索将停在当前文件夹中最后一封信件处。</p>"
-"<p><b>在当前文件夹循环：</b>搜索将在信件列表顶端继续，但是不会进入其它文件夹。</p>"
-"<p><b>在全部文件夹循环：</b>搜索将在信件列表顶端继续。如果没有未读的信件，就转入下个文件夹。</p>"
-"<p>同样的，搜索上封未读信件时，搜索将从信件列表底部开始，并根据所选项继续到上一个文件夹。</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>如果跳转到下封未读信件，可能发生当前信件后没有未读信件的情况。</"
+"p><p><b>不循环：</b>搜索将停在当前文件夹中最后一封信件处。</p><p><b>在当前文"
+"件夹循环：</b>搜索将在信件列表顶端继续，但是不会进入其它文件夹。</p><p><b>在"
+"全部文件夹循环：</b>搜索将在信件列表顶端继续。如果没有未读的信件，就转入下个"
+"文件夹。</p><p>同样的，搜索上封未读信件时，搜索将从信件列表底部开始，并根据所"
+"选项继续到上一个文件夹。</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>全文索引有助于高速搜索信件内容。当启用此项后，搜索对话框的运作会非常快，同时搜索工具栏也会根据信件内容搜索信件。</p>"
-"<p>此功能会额外占用一些磁盘空间(大约是信件所占总空间的一半)。</p>"
-"<p>启用功能后会建立一次索引，但这期间您依然可继续使用 KMail。</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>全文索引有助于高速搜索信件内容。当启用此项后，搜索对话框的运作会非常"
+"快，同时搜索工具栏也会根据信件内容搜索信件。</p><p>此功能会额外占用一些磁盘空"
+"间(大约是信件所占总空间的一半)。</p><p>启用功能后会建立一次索引，但这期间您依"
+"然可继续使用 KMail。</p></qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2710,8 +2721,8 @@ msgstr "隐藏群件文件夹(&H)"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "选中此选项时，您将不会在文件夹树中看到 IMAP 资源文件夹。"
 
 #: configuredialog.cpp:4909
@@ -2720,8 +2731,8 @@ msgstr "仅显示此帐户的群件文件夹(&O)"
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "选中此选项时，您将不会在配置为群件的账户的文件夹树中看到普通邮件夹。"
 
 #: configuredialog.cpp:4921
@@ -2774,22 +2785,22 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"在 Microsoft Exchange 服务器和 Microsoft Outlook 协作时，处理标准兼容的群件邮件会有问题。如果您要以 Microsoft "
-"Exchange 可识别的形式发送群件邀请，请启用此选项。"
+"在 Microsoft Exchange 服务器和 Microsoft Outlook 协作时，处理标准兼容的群件邮"
+"件会有问题。如果您要以 Microsoft Exchange 可识别的形式发送群件邀请，请启用此"
+"选项。"
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook 兼容的附件命名"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "自动发送邀请"
@@ -2802,18 +2813,20 @@ msgstr "开启此选项时，用户将无法看到邮件撰写器窗口。邀请
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
-"<qt>邀请经常以邮件的附件发送。这一开关将把邀请邮件发送为邮件的文本；要与 Microsoft Outlook 之间发送邀请和回复邀请，必须选中此设置。"
-"<br>但是，当您执行此操作时，您将无法得到邮件程序可阅读的描述性文本；所以，对于那些使用无法理解邀请的电子邮件程序的人们，最后的信件可能看起来十分差劲。"
-"<br>如果用户所使用的电子邮件程序可以理解邀请，则仍没有什么问题。</qt>"
+"<qt>邀请经常以邮件的附件发送。这一开关将把邀请邮件发送为邮件的文本；要与 "
+"Microsoft Outlook 之间发送邀请和回复邀请，必须选中此设置。<br>但是，当您执行"
+"此操作时，您将无法得到邮件程序可阅读的描述性文本；所以，对于那些使用无法理解"
+"邀请的电子邮件程序的人们，最后的信件可能看起来十分差劲。<br>如果用户所使用的"
+"电子邮件程序可以理解邀请，则仍没有什么问题。</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -2917,24 +2930,23 @@ msgstr "转发"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>您可以在这里添加、编辑和删除自定义邮件模板，以便在撰写回复或转发信件时使用。要创建自定义模板，请右键选中它或使用工具栏菜单。另外，为操作方便考虑，您也可以"
-"绑定键盘快捷键到任一模板上。</p>"
-"<p>邮件模板支持替换命令，您可以简单地直接输入它们或在<i>插入命令<i>菜单下操作。</p>"
-"<p>自定义模板共有四类：<i>回复模板</i>、<i>全部回复模板</i>、<i>转发模板</i>以及适用各种场合的<i>通用模板</i>。注意您不能对<i>"
-"通用模板</i>绑定键盘快捷键。</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>您可以在这里添加、编辑和删除自定义邮件模板，以便在撰写回复或转发信件时"
+"使用。要创建自定义模板，请右键选中它或使用工具栏菜单。另外，为操作方便考虑，"
+"您也可以绑定键盘快捷键到任一模板上。</p><p>邮件模板支持替换命令，您可以简单地"
+"直接输入它们或在<i>插入命令<i>菜单下操作。</p><p>自定义模板共有四类：<i>回复"
+"模板</i>、<i>全部回复模板</i>、<i>转发模板</i>以及适用各种场合的<i>通用模板</"
+"i>。注意您不能对<i>通用模板</i>绑定键盘快捷键。</p></qt>"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -2951,15 +2963,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3027,8 +3039,8 @@ msgstr "编辑方式："
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr "KMail 无法探测所选编辑器何时关闭。为避免数据丢失，将中止附件编辑。"
 
 #: editorwatcher.cpp:163
@@ -3269,6 +3281,11 @@ msgstr "选择过滤器"
 msgid "Filters"
 msgstr "过滤器"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "选中所有文本"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3298,9 +3315,11 @@ msgstr "记录过滤器活动(&L)"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
-msgstr "您可以在此开启或关闭对过滤器操作的记录。当然，仅当开启记录功能时，才会收集并显示日志数据。"
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
+msgstr ""
+"您可以在此开启或关闭对过滤器操作的记录。当然，仅当开启记录功能时，才会收集并"
+"显示日志数据。"
 
 #: filterlogdlg.cpp:83
 msgid "Logging Details"
@@ -3316,12 +3335,14 @@ msgstr "记录过滤器规则评分(&R)"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
-"您可以控制日志中关于所应用过滤器的过滤规则评分的反馈：选中此选项将给出每个单独过滤器规则的详细反馈；否则的话，只会给出关于单个过滤器组合评分的结果。"
+"您可以控制日志中关于所应用过滤器的过滤规则评分的反馈：选中此选项将给出每个单"
+"独过滤器规则的详细反馈；否则的话，只会给出关于单个过滤器组合评分的结果。"
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3341,12 +3362,13 @@ msgstr "无限制"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
-"收集日志数据将会使用内存来临时存储日志数据；您可在此限制可使用的最大内存量：如果所收集的日志数据大小超过了此限制，则会丢弃旧数据，直至满足限制为止。"
+"收集日志数据将会使用内存来临时存储日志数据；您可在此限制可使用的最大内存量："
+"如果所收集的日志数据大小超过了此限制，则会丢弃旧数据，直至满足限制为止。"
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3356,7 +3378,7 @@ msgstr ""
 "写文件 %1 出错，\n"
 "详细错误信息：“%2”。"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail 错误"
@@ -3397,11 +3419,12 @@ msgstr "用户身份(&U)："
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
-"用户身份是 IMAP 服务器上用户的登录名。这可以是简单的用户名或者是用户完整的电子邮件地址；您在服务器上自己账户的登录名将会告诉您应该选用哪个。"
+"用户身份是 IMAP 服务器上用户的登录名。这可以是简单的用户名或者是用户完整的电"
+"子邮件地址；您在服务器上自己账户的登录名将会告诉您应该选用哪个。"
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3452,8 +3475,8 @@ msgstr "您没有权限读写您的废件夹。"
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "尚未从服务器获取过信息，请使用“检查邮件”。"
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3464,8 +3487,7 @@ msgstr "错误：未为此文件夹定义 IMAP 账户"
 msgid "Connecting to server %1, please wait..."
 msgstr "正在连接到服务器 %1，请稍候..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "连接到服务器 %1 出错"
@@ -3493,8 +3515,8 @@ msgstr "添加权限"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr "您真的想要从此文件夹中删除您自己的权限吗？您以后将无法访问该文件夹。"
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3526,7 +3548,7 @@ msgstr "用量："
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "本地文件夹"
@@ -3550,10 +3572,12 @@ msgstr "选择文件夹快捷键"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
-msgstr "<qt>要为当前文件夹选择按键或者按键组合，请单击下面的按钮，然后按下您想要与此文件夹关联的按键。</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
+msgstr ""
+"<qt>要为当前文件夹选择按键或者按键组合，请单击下面的按钮，然后按下您想要与此"
+"文件夹关联的按键。</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
@@ -3573,10 +3597,21 @@ msgstr "取消(&A)"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
-msgstr "<qt>您所删除的文件夹与账户 <b>%1</b> 投递的邮件关联。账户投递邮件的文件夹将重置为主收件箱。</qt>"
+msgstr ""
+"<qt>您所删除的文件夹与账户 <b>%1</b> 投递的邮件关联。账户投递邮件的文件夹将重"
+"置为主收件箱。</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>总共：%2<br>未读：%3<br>大小：%4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>配额：%1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3699,39 +3734,13 @@ msgstr "垃圾信状态："
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>信<br>件</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr "<qt><br>非<br> <br>H<br>T<br>M<br>L<br> <br>信<br>件</qt>"
 
 #: identitydialog.cpp:93
@@ -3744,17 +3753,13 @@ msgstr "您的名字(&Y)："
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>您的姓名</h3>"
-"<p>您应该在此域中输入您的姓名，即您想要在发信时出现在信头中的姓名；</p>"
-"<p>如果您将此域留空，将不会出现您真实的姓名，而仅仅是电子邮件地址。</p></qt>"
+"<qt><h3>您的姓名</h3><p>您应该在此域中输入您的姓名，即您想要在发信时出现在信"
+"头中的姓名；</p><p>如果您将此域留空，将不会出现您真实的姓名，而仅仅是电子邮件"
+"地址。</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3762,16 +3767,12 @@ msgstr "组织(&Z)："
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>组织</h3>"
-"<p>您应该在此域中输入您组织的名称，如果您想要在发出信的信头中显示组织名称的话。</p>"
-"<p>将此域留空很安全(也是较为普遍的)。</p></qt>"
+"<qt><h3>组织</h3><p>您应该在此域中输入您组织的名称，如果您想要在发出信的信头"
+"中显示组织名称的话。</p><p>将此域留空很安全(也是较为普遍的)。</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3780,19 +3781,14 @@ msgstr "电子邮件地址(&E)："
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>电子邮件地址</h3>"
-"<p>您应该在此域中输入您完整的电子邮件地址。</p>"
-"<p>如果您将此域留空，或者写错了，别人就无法回信给您。</p></qt>"
+"<qt><h3>电子邮件地址</h3><p>您应该在此域中输入您完整的电子邮件地址。</p><p>如"
+"果您将此域留空，或者写错了，别人就无法回信给您。</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -3801,21 +3797,12 @@ msgstr "电子邮件地址(&E)："
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3838,17 +3825,16 @@ msgstr "请选择用于签名您自己的信件时所使用的 OpenPGP 密钥。
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>您在此选择的 OpenPGP 密钥将用于自己签名和加密信件。您还可以使用 GnuPG 密钥。</p>"
-"<p>您可以将此处留空，但是 KMail 将无法使用 OpenPGP 签名邮件；普通的邮件功能不会因此受到影响。</p>"
-"<p>您可以在 <a>http://www.gnupg.org</a> 找到关于密钥得更多信息。</qt>"
+"<qt><p>您在此选择的 OpenPGP 密钥将用于自己签名和加密信件。您还可以使用 GnuPG "
+"密钥。</p><p>您可以将此处留空，但是 KMail 将无法使用 OpenPGP 签名邮件；普通的"
+"邮件功能不会因此受到影响。</p><p>您可以在 <a>http://www.gnupg.org</a> 找到关"
+"于密钥得更多信息。</qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -3860,25 +3846,24 @@ msgstr "您的 OpenPGP 加密密钥"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
-msgstr "选择要对您自己加密以及对撰写器中“附加我的公钥”特性时使用的 OpenPGP 密钥。"
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
+msgstr ""
+"选择要对您自己加密以及对撰写器中“附加我的公钥”特性时使用的 OpenPGP 密钥。"
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
-"<qt>"
-"<p>您在此选择的 OpenPGP 密钥将用于为自己加密信件和撰写器中“附加我的公钥”功能。您还可以使用 GnuPG 密钥。</p>"
-"<p>您可以将此处留空，但是 KMail 将无法使用 OpenPGP 对您寄出信件的副本进行加密；普通的邮件功能不会因此受到影响。</p>"
-"<p>您可以在 <a>http://www.gnupg.org</a> 找到关于密钥的更多信息</qt>"
+"<qt><p>您在此选择的 OpenPGP 密钥将用于为自己加密信件和撰写器中“附加我的公"
+"钥”功能。您还可以使用 GnuPG 密钥。</p><p>您可以将此处留空，但是 KMail 将无法"
+"使用 OpenPGP 对您寄出信件的副本进行加密；普通的邮件功能不会因此受到影响。</"
+"p><p>您可以在 <a>http://www.gnupg.org</a> 找到关于密钥的更多信息</qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -3896,15 +3881,14 @@ msgstr "请选择用于对信件数字签名信件所使用的 S/MIME 证书。"
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您在此选择的 S/MIME (X.509) 证书 将用于对信件进行数字签名。</p>"
-"<p>您可以将此处留空，但是 KMail 将无法使用 S/MIME 对电子邮件进行数字签名；普通的邮件功能不会因此受到影响。</p></qt>"
+"<qt><p>您在此选择的 S/MIME (X.509) 证书 将用于对信件进行数字签名。</p><p>您可"
+"以将此处留空，但是 KMail 将无法使用 S/MIME 对电子邮件进行数字签名；普通的邮件"
+"功能不会因此受到影响。</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -3916,22 +3900,21 @@ msgstr "您的 S/MIME 加密证书"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr "请选择用于对您自己和撰写器中“附加我的证书”特性所使用的 S/MIME 证书。"
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您在此选择的 S/MIME (X.509) 证书 将用于对您自己加密信件以及在撰写器中的“附加我的证书”功能。</p>"
-"<p>您可以将此处留空，但是 KMail 将无法使用 S/MIME 对电子邮件进行数字签名；普通的邮件功能不会因此受到影响。</p></qt>"
+"<qt><p>您在此选择的 S/MIME (X.509) 证书 将用于对您自己加密信件以及在撰写器中"
+"的“附加我的证书”功能。</p><p>您可以将此处留空，但是 KMail 将无法使用 S/MIME "
+"对电子邮件进行数字签名；普通的邮件功能不会因此受到影响。</p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -3951,21 +3934,18 @@ msgstr "回信地址(&R)："
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>回信地址</h3>"
-"<p>这会将 <tt>Reply-to:</tt> 信头设成不同于 <tt>From:</tt> 地址的电子邮件地址。</p>"
-"<p>如果您有一组人的工作角色比较类似，此选项将非常有用。例如，您可能想要将您发出邮件的 <tt>From:</tt> "
-"域设成您的邮件地址，但是却让回信发到一组地址。</p>"
-"<p>如果您对此选项不太确定的话，请将此域留空。</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>回信地址</h3><p>这会将 <tt>Reply-to:</tt> 信头设成不同于 <tt>From:</"
+"tt> 地址的电子邮件地址。</p><p>如果您有一组人的工作角色比较类似，此选项将非常"
+"有用。例如，您可能想要将您发出邮件的 <tt>From:</tt> 域设成您的邮件地址，但是"
+"却让回信发到一组地址。</p><p>如果您对此选项不太确定的话，请将此域留空。</p></"
+"qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -3973,22 +3953,17 @@ msgstr "密件抄送地址(&B)："
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>BCC (密件抄送)地址</h3>"
-"<p>您在此输入的地址将会作为收件地址添加到每封用此身份寄出的信件中。但这些地址其他收件人是看不到的。</p>"
-"<p>这通常用于将每封信件发送到您的另外一个账户中。</p>"
-"<p>要指定多个地址，请使用逗号分隔密件抄送收件人列表。</p>"
-"<p>如果您对此选项不太确定的话，请将此域留空。</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>BCC (密件抄送)地址</h3><p>您在此输入的地址将会作为收件地址添加到每封"
+"用此身份寄出的信件中。但这些地址其他收件人是看不到的。</p><p>这通常用于将每封"
+"信件发送到您的另外一个账户中。</p><p>要指定多个地址，请使用逗号分隔密件抄送收"
+"件人列表。</p><p>如果您对此选项不太确定的话，请将此域留空。</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4026,7 +4001,7 @@ msgstr "签名(&S)"
 msgid "&Picture"
 msgstr "图片(&P)"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "无效的电子邮件地址"
 
@@ -4047,8 +4022,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr "所配置的 OpenPGP 加密密钥之一不包含为此身份(%1)配置的电子邮件地址。"
 
 #: identitydialog.cpp:567
@@ -4099,8 +4074,8 @@ msgstr "身份“%1”的自定义模板文件夹不存在；因此会使用默�
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1(默认)"
 
@@ -4141,18 +4116,19 @@ msgstr "获取命名空间"
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
-msgstr "KMail 在账户“%1”的配置中检测到了前缀项，这已经被 IMAP 命名空间的支持所取代。"
+msgstr ""
+"KMail 在账户“%1”的配置中检测到了前缀项，这已经被 IMAP 命名空间的支持所取代。"
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr "配置将会自动迁移，但是您还应该再检查一下您的账户配置。"
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr "无法自动迁移您的配置，所以请检查您的账户配置。"
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4188,16 +4164,21 @@ msgstr "此文件夹容量已极接近配额限度。(%1)"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "您没有对此文件夹的写入权限，请向此文件夹的所有者请求释放部分空间。"
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "错误：%1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr "到服务器 %1 的连接意外关闭或超时。如果可能的话，系统会自动重新连接。"
 
 #: imapaccountbase.cpp:965
@@ -4345,16 +4326,18 @@ msgstr "邮件列表归档"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
-msgstr "您有一个或更多已配置的 OpenPGP 加密密钥或 S/MIME 证书对加密是不完全信任的。"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
+msgstr ""
+"您有一个或更多已配置的 OpenPGP 加密密钥或 S/MIME 证书对加密是不完全信任的。"
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
-msgstr "您有一个或更多已配置的 OpenPGP 加密密钥或 S/MIME 证书对加密是不完全信任的。"
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
+msgstr ""
+"您有一个或更多已配置的 OpenPGP 加密密钥或 S/MIME 证书对加密是不完全信任的。"
 
 #: keyresolver.cpp:315
 msgid ""
@@ -4388,178 +4371,146 @@ msgstr "不完全信任的加密密钥"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 OpenPGP 签名密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 OpenPGP 签名密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 OpenPGP 加密密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 OpenPGP 加密密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>的 OpenPGP 密钥即将于 %n 天内过期。</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>的 OpenPGP 密钥即将于 %n 天内过"
+"期。</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您 S/MIME 签名证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
-"(序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 签名证书的根证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您 S/MIME 加密证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
-"(序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 加密证书的根证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>您 S/MIME 证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
-"(序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>"
+"%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您 S/MIME 签名证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
-"%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 签名证书的中介 CA 证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您 S/MIME 加密证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
-"%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 加密证书的中介 CA 证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您 S/MIME 证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
-"%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 证书的中介 CA 证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 签名证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 S/MIME 签名证书</p><p align=center><b>%1</b> (序列号 %2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 S/MIME 加密证书</p><p align=center><b>%1</b> (序列号 %2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 S/MIME 证书</p><p align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n "
+"天内过期。</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4573,167 +4524,135 @@ msgstr "S/MIME 证书即将过期"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 OpenPGP 签名密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 OpenPGP 签名密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 OpenPGP 加密密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 OpenPGP 加密密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>的 OpenPGP 密钥即将于 %n 天内过期。</p>"
+"<p align=center><b>%1</b> (KeyID 0x%2)</p><p>的 OpenPGP 密钥即将于 %n 天内过"
+"期。</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您 S/MIME 签名证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
-"(序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 签名证书的根证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您 S/MIME 加密证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
-"(序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 加密证书的根证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>您 S/MIME 证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
-"(序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>"
+"%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您 S/MIME 签名证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
-"%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 签名证书的中介 CA 证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您 S/MIME 加密证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
-"%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 加密证书的中介 CA 证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您 S/MIME 证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
-"%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您 S/MIME 证书的中介 CA 证书</p><p align=center><b>%3</b></p><p "
+"align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 签名证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 S/MIME 签名证书</p><p align=center><b>%1</b> (序列号 %2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 S/MIME 加密证书</p><p align=center><b>%1</b> (序列号 %2)</p><p>即将"
+"于 %n 天内过期。</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
-"<p>即将于 %n 天内过期。</p>"
+"<p>您的 S/MIME 证书</p><p align=center><b>%1</b> (序列号 %2)</p><p>即将于 %n "
+"天内过期。</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -4745,13 +4664,15 @@ msgstr "S/MIME 证书即将过期"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"您所配置的 OpenPGP 加密密钥或 S/MIME 证书之一不可用于加密。请在身份配置对话框中重新配置您为此身份指定的加密密钥以及证书。\n"
+"您所配置的 OpenPGP 加密密钥或 S/MIME 证书之一不可用于加密。请在身份配置对话框"
+"中重新配置您为此身份指定的加密密钥以及证书。\n"
 "如果您选择继续的话，而稍后会用到密钥，您将需要指定要使用哪个密钥。"
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
@@ -4766,7 +4687,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"您所配置的 OpenPGP 签名密钥或 S/MIME 签名证书之一不可用于签名。请在身份配置对话框中重新配置您为此身份指定的签名密钥以及证书。\n"
+"您所配置的 OpenPGP 签名密钥或 S/MIME 签名证书之一不可用于签名。请在身份配置对"
+"话框中重新配置您为此身份指定的签名密钥以及证书。\n"
 "如果您选择继续的话，而稍后会用到密钥，您将需要指定要使用哪个密钥。"
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
@@ -4777,12 +4699,13 @@ msgstr "不可用的签名密钥"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"对收件人加密首选项的检查要求信件使用 OpenPGP 加密，至少某些收件人是这么要求的；\n"
+"对收件人加密首选项的检查要求信件使用 OpenPGP 加密，至少某些收件人是这么要求"
+"的；\n"
 "但是，您没有为此身份配置有效的可信 OpenPGP 加密密钥。\n"
 "您仍然可以继续，而不对自己加密。但请注意，您以后将无法阅读您自己的信件。"
 
@@ -4790,23 +4713,25 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
-"对收件人加密首选项的检查要求信件使用 S/MIME 加密，至少某些收件人是这么要求的；\n"
+"对收件人加密首选项的检查要求信件使用 S/MIME 加密，至少某些收件人是这么要求"
+"的；\n"
 "但是，您没有为此身份配置有效的可信 S/MIME 加密证书。\n"
 "您仍然可以继续，而不对自己加密。但请注意，您以后将无法阅读您自己的信件。"
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
-"对收件人签名首选项的检查要求信件使用 OpenPGP 签名，至少某些收件人是这么要求的；\n"
+"对收件人签名首选项的检查要求信件使用 OpenPGP 签名，至少某些收件人是这么要求"
+"的；\n"
 "但是，您没有为此身份配置有效的可信 OpenPGP 签名密钥。"
 
 #: keyresolver.cpp:1259
@@ -4815,12 +4740,13 @@ msgstr "不使用 OpenPGP 签名"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
-"对收件人签名首选项的检查要求信件使用 S/MIME 签名，至少某些收件人是这么要求的；\n"
+"对收件人签名首选项的检查要求信件使用 S/MIME 签名，至少某些收件人是这么要求"
+"的；\n"
 "但是，您没有为此身份配置有效的可信 S/MIME 签名证书。"
 
 #: keyresolver.cpp:1275
@@ -4842,9 +4768,11 @@ msgstr "没有可用的签名"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
-msgstr "您没有为您自己选择加密密钥(对自己加密)。如果您对信件加密的话，您自己将无法解密信件。"
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
+msgstr ""
+"您没有为您自己选择加密密钥(对自己加密)。如果您对信件加密的话，您自己将无法解"
+"密信件。"
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
@@ -4863,8 +4791,8 @@ msgstr "您没有为此信件的收件人选择加密密钥；因此，无法加
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr "您没有为此信件的任何一个收件人选择加密密钥；因此，无法加密此信件。"
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4875,13 +4803,17 @@ msgstr "不加密发送(&U)"
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "您没有为此信件的收件人之一选择加密密钥；因此，如果您加密的话，该收件人将无法解密此信件。"
+msgstr ""
+"您没有为此信件的收件人之一选择加密密钥；因此，如果您加密的话，该收件人将无法"
+"解密此信件。"
 
 #: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "您没有为此信件的某些收件人选择加密密钥；因此，如果您加密的话，这些收件人将无法解密此信件。"
+msgstr ""
+"您没有为此信件的某些收件人选择加密密钥；因此，如果您加密的话，这些收件人将无"
+"法解密此信件。"
 
 #: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
@@ -4905,11 +4837,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 "未找到“%1”的有效且信任的加密密钥。\n"
 "\n"
@@ -4958,10 +4890,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "严重错误：无法收集邮件："
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"无法添加信件：\n"
+msgid "Failed to add message:\n"
+msgstr "无法添加信件：\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5047,6 +4977,50 @@ msgstr "已断开的 IMAP(&D)"
 msgid "&Maildir mailbox"
 msgstr "Maildir 邮箱(&M)"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "设置信件主题"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "发送 CC 抄件到“address”"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "发送 BCC 密件到“address”"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "添加“header”到信件"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "从“file”中读入信件正文"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "设置信件正文"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "添加附件到邮件，可重复多次"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "只检查新邮件"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "只打开编写窗口"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "查看给定的信件文件"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "将信件发送给“address”，并且添加“URL”指向的附件"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "邮件"
@@ -5089,7 +5063,8 @@ msgstr "我的 %1"
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
-msgstr "KMail 将在 %1 下创建群件文件夹；如果您不想要这样做，请取消，IMAP 资源将被禁用"
+msgstr ""
+"KMail 将在 %1 下创建群件文件夹；如果您不想要这样做，请取消，IMAP 资源将被禁用"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5101,10 +5076,12 @@ msgstr "%1：找到了文件夹 %2。该文件夹将被设定为主群件文件�
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
-msgstr "<qt>KMail 在 %1 下找到了下列群件文件夹，并即将执行下列操作：%2<br>如果您不想要这样做，请取消，IMAP 资源将被禁用"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
+msgstr ""
+"<qt>KMail 在 %1 下找到了下列群件文件夹，并即将执行下列操作：%2<br>如果您不想"
+"要这样做，请取消，IMAP 资源将被禁用"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5150,11 +5127,11 @@ msgstr "URL 已复制到剪贴板中。"
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>文件 <b>%1</b> 已经存在。<br>您要替换它吗？</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "保存到文件"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "替换(&R)"
 
@@ -5172,7 +5149,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "此信件在保存过程中被删除，故未被保存。"
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5192,11 +5169,11 @@ msgstr "文件不包含信件。"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "文件包含多封信。仅会显示第一封信。"
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5205,111 +5182,111 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "过滤信件"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "正在过滤%2 封信件中的第 %1 封"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "没有足够的磁盘空间。"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "移动到此文件夹"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "复制到此文件夹"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr "在文件夹 %1 中检测到 IMAP 缓存已损坏。信件复制已中止。"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "移动信件"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "删除信件"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "正在打开 URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>您真的要执行 <b>%1</b>吗？</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "执行"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "没有发现要保存的附件。"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "附件保存至"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "attachment.1"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "attachment.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "名为 %1 的文件已经存在。您要覆盖它吗？"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "文件已存在"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "覆盖(&O)"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "信件的第 %1 部分经过加密。您想要在保存时保留加密吗？"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail 提问"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "保持加密"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "不保持"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "信件的第 %1 部分经过签名。您想要在保存时保留签名吗？"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "保持签名"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5318,19 +5295,21 @@ msgstr ""
 "无法写入文件 %1：\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "无法写入文件 %1。"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
-msgstr "没有此电子邮件地址所对应的地址簿项。请将其添加到地址簿，然后使用您喜爱的信使程序将即时消息地址添加进来。"
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
+msgstr ""
+"没有此电子邮件地址所对应的地址簿项。请将其添加到地址簿，然后使用您喜爱的信使"
+"程序将即时消息地址添加进来。"
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5340,59 +5319,61 @@ msgstr ""
 " %1\n"
 " 无法确定正与谁交谈。"
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr "Chiasmus 后端无法提供“x-obtain-keys”功能，请报告此错误。"
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus 后端出错"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
-msgstr "Chiasmus 后端有意外返回值：“x-obtain-keys”功能未返回字符串列表。请报告错误。"
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
+msgstr ""
+"Chiasmus 后端有意外返回值：“x-obtain-keys”功能未返回字符串列表。请报告错误。"
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr "未找到密钥。请检查 Chiasmus 配置中是否设定了有效的密钥路径。"
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus 解密密钥选择"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus 后端不提供“x-decrypt”功能。请报告错误。"
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr "“x-decrypt”功能不接受意外参数。请报告错误。"
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus 解密错误"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
-msgstr "Chiasmus 后端返回了意外返回值：“x-decrypt”功能未返回字节数组。请报告错误。"
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
+msgstr ""
+"Chiasmus 后端返回了意外返回值：“x-decrypt”功能未返回字节数组。请报告错误。"
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5402,7 +5383,7 @@ msgstr ""
 "收件人：%2\n"
 "主题：%3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "邮件：%1"
@@ -5501,7 +5482,7 @@ msgstr "大小"
 msgid "Encoding"
 msgstr "编码"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "压缩"
 
@@ -5513,7 +5494,7 @@ msgstr "加密"
 msgid "Sign"
 msgstr "签名"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "附件名："
 
@@ -5535,7 +5516,8 @@ msgstr "主收件人"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>您在此输入的电子邮件地址将会收到邮件的副本。</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -5545,12 +5527,13 @@ msgstr "额外收件人"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>填写在此字段处的邮件地址都会收到一份邮件。技术上来说，这跟将全部邮件地址放在<b>收件人：</b>"
-"字段处的结果一样，而不同之处只是象征性的，抄送(CC)的接收人只是旁听者，而不是主要的收件人。</qt>"
+"<qt>填写在此字段处的邮件地址都会收到一份邮件。技术上来说，这跟将全部邮件地址"
+"放在<b>收件人：</b>字段处的结果一样，而不同之处只是象征性的，抄送(CC)的接收人"
+"只是旁听者，而不是主要的收件人。</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5558,10 +5541,11 @@ msgstr "隐藏收件人"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
-msgstr "<qt>实际上与<b>抄送到：</b>字段一样，不同之处为，其他收件人并不知道谁收到这份邮件。</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
+msgstr ""
+"<qt>实际上与<b>抄送到：</b>字段一样，不同之处为，其他收件人并不知道谁收到这份"
+"邮件。</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -5571,7 +5555,7 @@ msgstr "发送邮件(&S)"
 msgid "&Send Mail Via"
 msgstr "发送邮件的身份(&S)"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "稍后发送(&L)"
@@ -5636,8 +5620,7 @@ msgstr "删除引用字符(&M)"
 msgid "Cl&ean Spaces"
 msgstr "清理空格(&E)"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "使用固定宽度字体(&X)"
@@ -5778,31 +5761,31 @@ msgstr "密文信件格式(&C)"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "标准"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "项目符号(圆点)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "项目符号(圆圈)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "项目符号(方点)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "编号列表(数字)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "编号列表(小写字母)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "编号列表(大写字母)"
 
@@ -5903,8 +5886,8 @@ msgstr "关闭撰写器"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "您撰写的信件好像引用附件，但是您没有附加任何文件。\n"
@@ -5914,42 +5897,46 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "文件附件提醒"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "原样发送(&S)"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
-msgstr "<qt><p>KMail 无法识别附件(%1)的位置；</p><p>如果您想要附加文件，您必须指定完整路径。</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
+msgstr ""
+"<qt><p>KMail 无法识别附件(%1)的位置；</p><p>如果您想要附加文件，您必须指定完"
+"整路径。</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr "<qt><p>您的系统管理员已禁止发送大于 %1MB 的附件。</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "附加文件"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "附件(&A)"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "插入文件"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "插入文件"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr "<qt><p>试图从后端导出密钥时发生了错误：</p><p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
@@ -5989,275 +5976,293 @@ msgid ""
 "View"
 msgstr "查看"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "编辑..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "编辑方式..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "另存为(&A)..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "属性(&P)"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "添加附件..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail 无法压缩文件。"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "压缩后的文件比原来还大。您想要保留原始文件吗？"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "保留"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail 无法解压缩文件。"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "附件另存为"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "添加为文本"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "添加为附件"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
-msgstr "请选择您是要将这些内容作为文本插入编辑器，还是作为关联文件追加到附件中。"
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
+msgstr ""
+"请选择您是要将这些内容作为文本插入编辑器，还是作为关联文件追加到附件中。"
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "粘贴为文本还是附件？"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "未命名"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您请求了信件对您自己加密，但目前所选的身份尚未定义此用途的加密密钥(OpenPGP 或 S/MIME)。</p>"
-"<p>请在身份配置中选择要使用的密钥。</p></qt>"
+"<qt><p>您请求了信件对您自己加密，但目前所选的身份尚未定义此用途的加密密钥"
+"(OpenPGP 或 S/MIME)。</p><p>请在身份配置中选择要使用的密钥。</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "未定义的加密密钥"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>为了对此信件签名，您必须首先定义要使用的签名密钥(OpenPGP 或 S/MIME)。</p>"
-"<p>请在身份配置中选择要使用的密钥。</p></qt>"
+"<qt><p>为了对此信件签名，您必须首先定义要使用的签名密钥(OpenPGP 或 S/MIME)。"
+"</p><p>请在身份配置中选择要使用的密钥。</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "未定义的签名密钥"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
-msgstr "KMail 目前位于脱机模式中，您的信件将存放在发件箱中，直到您转为联机模式。"
+msgstr ""
+"KMail 目前位于脱机模式中，您的信件将存放在发件箱中，直到您转为联机模式。"
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "联机/脱机"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
-msgstr "您必须在“发件人：”域中输入您自己的电子邮件地址。您还应该为全部身份都设置电子邮件地址，省得每封信都要重新输入一次。"
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
+msgstr ""
+"您必须在“发件人：”域中输入您自己的电子邮件地址。您还应该为全部身份都设置电子"
+"邮件地址，省得每封信都要重新输入一次。"
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "您必须在“收件人：”、CC 或 BCC 字段中指定至少一个接收者。"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "您没有指定收件人。仍然要发送吗？"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "未指定收件人"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "您没有指定主题。仍然要发送吗？"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "未指定主题"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "原样发送(&E)"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "指定主题(&S)"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "保留标记，不签名/加密(&K)"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "保留标记，不加密(&K)"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "保留标记，不签名(&K)"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "签名/加密(删除标记)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "加密(删除标记)"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "签名(删除标记)"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
-msgstr "<qt><p>无法对 HTML 信件进行嵌入式签名/加密；</p><p>您想要删除信件中的 HTML 标记吗？</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
+msgstr ""
+"<qt><p>无法对 HTML 信件进行嵌入式签名/加密；</p><p>您想要删除信件中的 HTML 标"
+"记吗？</p></qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "签名/加密信件吗？"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
-msgstr "身份“%1”的自定义草稿或模板文件夹不存在；因此会使用默认的草稿或模板文件夹。"
+msgstr ""
+"身份“%1”的自定义草稿或模板文件夹不存在；因此会使用默认的草稿或模板文件夹。"
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "请创建一个用于发送的账户然后重试。"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "即将发送信件..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "发送确认"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "立即发送(&S)"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "无收件人"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "额外收件人"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "拼写检查：开"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "拼写检查：关"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr "拼写检查已取消。"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr "拼写检查已停止。"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr "拼写检查已完成。"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "拼写检查器"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "要使用 Chiasmus 加密，请先配置 Chiasmus 后端。\n"
 "您可以在配置对话框安全节的 Chiasmus 后端中找到此功能。"
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"似乎 libkleopatra 编译时未开启 Chiasmus 支持。您可能想要用 --enable-chiasmus 重新编译 libkleopatra。"
+"似乎 libkleopatra 编译时未开启 Chiasmus 支持。您可能想要用 --enable-chiasmus "
+"重新编译 libkleopatra。"
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "未配置 Chiasmus 后端"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "未找到 Chiasmus 密钥"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus 加密密钥选择"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "信件会被签名"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "信件不会被签名"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "信件会被加密"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "信件不会被加密"
 
@@ -6306,9 +6311,11 @@ msgstr "拼写检查 - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
-msgstr "无法启动 ISpell/Aspell。请确定您正确地配置了 ISpell 或 Aspell，并且在您的 PATH 中。"
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
+msgstr ""
+"无法启动 ISpell/Aspell。请确定您正确地配置了 ISpell 或 Aspell，并且在您的 "
+"PATH 中。"
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6341,10 +6348,10 @@ msgstr "<qt>在过滤规则 <b>%1</b> 中的过滤动作太多</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
-msgstr "<qt>在过滤规则 <b>%2</b>中有未知的过滤动作 <b>%1</b>。<br>它将被忽略。</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
+msgstr ""
+"<qt>在过滤规则 <b>%2</b>中有未知的过滤动作 <b>%1</b>。<br>它将被忽略。</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6564,138 +6571,120 @@ msgstr "播放声音"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>这是所定义过滤器清单。程序将会从上到下进行处理。</p>"
-"<p>单击任意过滤器后，可以使用对话框右侧的控件对其进行编辑。</p></qt>"
+"<qt><p>这是所定义过滤器清单。程序将会从上到下进行处理。</p><p>单击任意过滤器"
+"后，可以使用对话框右侧的控件对其进行编辑。</p></qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>点击此按钮可以创建新过滤器。</p>"
-"<p>该过滤器将插入在当前选中的过滤器之前，但是稍后可以进行移动。</p>"
-"<p>如果不小心点错了此按钮，可以单击右侧的<em>删除</em>按钮撤消。"
-"<p></qt>"
+"<qt><p>点击此按钮可以创建新过滤器。</p><p>该过滤器将插入在当前选中的过滤器之"
+"前，但是稍后可以进行移动。</p><p>如果不小心点错了此按钮，可以单击右侧的<em>删"
+"除</em>按钮撤消。<p></qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr "<qt><p>点击此按钮可以复制过滤器。</p><p>如果不小心点错了此按钮，可以单击右侧的<em>删除</em>按钮撤消。<p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
+msgstr ""
+"<qt><p>点击此按钮可以复制过滤器。</p><p>如果不小心点错了此按钮，可以单击右侧"
+"的<em>删除</em>按钮撤消。<p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>点击此按钮<em>删除</em>来从上面的列表中删除当前选中的过滤器。</p>"
-"<p>过滤器一旦被删除，就不能再恢复，但是可以通过<em>取消</em>来放弃所做的修改。</p></qt>"
+"<qt><p>点击此按钮<em>删除</em>来从上面的列表中删除当前选中的过滤器。</p><p>过"
+"滤器一旦被删除，就不能再恢复，但是可以通过<em>取消</em>来放弃所做的修改。</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>点击此按钮把当前选中的过滤器移动到上面的列表的<em>顶端</em>。</p>"
-"<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
+"<qt><p>点击此按钮把当前选中的过滤器移动到上面的列表的<em>顶端</em>。</p><p>由"
+"于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过"
+"滤器最先被使用。</p>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr ""
-"<qt>"
-"<p>点击此按钮把当前选中的过滤器在上面的列表中<em>向上</em>移动一个位置。</p>"
-"<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
-"<p>如果不小心点了此按钮，您可以点右边的<em>下移</em>按钮来取消这个操作。</p></qt>"
+"<qt><p>点击此按钮把当前选中的过滤器在上面的列表中<em>向上</em>移动一个位置。"
+"</p><p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最"
+"上面的过滤器最先被使用。</p><p>如果不小心点了此按钮，您可以点右边的<em>下移</"
+"em>按钮来取消这个操作。</p></qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>点击此按钮把当前选中的过滤器在上面的列表中<em>向下</em>移动一个位置。</p>"
-"<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
-"<p>如果偶然点了此按钮，您可以点左边的<em>上移</em>按钮来取消这个操作</p>。</qt>"
+"<qt><p>点击此按钮把当前选中的过滤器在上面的列表中<em>向下</em>移动一个位置。"
+"</p><p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最"
+"上面的过滤器最先被使用。</p><p>如果偶然点了此按钮，您可以点左边的<em>上移</"
+"em>按钮来取消这个操作</p>。</qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>点击此按钮把当前选中的过滤器移移动到上面的列表中<em>底端</em>。</p>"
-"<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
+"<qt><p>点击此按钮把当前选中的过滤器移移动到上面的列表中<em>底端</em>。</p><p>"
+"由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的"
+"过滤器最先被使用。</p>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>点击此按钮可以重命名当前选中的过滤器。</p>"
-"<p>过滤器是自动命名的，只要它们以“&lt;”开头。</p>"
-"<p>如果偶然重命名了一个过滤器并且希望自动把名字改回去，点此按钮并选择<em>清除</em>，然后在出现的对话框中点<em>确定</em>按钮。</p>"
-"</qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
+msgstr ""
+"<qt><p>点击此按钮可以重命名当前选中的过滤器。</p><p>过滤器是自动命名的，只要"
+"它们以“&lt;”开头。</p><p>如果偶然重命名了一个过滤器并且希望自动把名字改回去，"
+"点此按钮并选择<em>清除</em>，然后在出现的对话框中点<em>确定</em>按钮。</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>选中此框会强制显示确认对话框。</p>"
-"<p>如果您定义了规则集会将信件稍后下载的话，则此选项非常有用。要是不可能强制对话框弹出，如果在服务器上没有大信件等待，或者如果您将规则集更改为将信件进行不同的"
-"标记，不强制显示对话框的话这些信件将永远不可能被下载。</p></qt>"
+"<qt><p>选中此框会强制显示确认对话框。</p><p>如果您定义了规则集会将信件稍后下"
+"载的话，则此选项非常有用。要是不可能强制对话框弹出，如果在服务器上没有大信件"
+"等待，或者如果您将规则集更改为将信件进行不同的标记，不强制显示对话框的话这些"
+"信件将永远不可能被下载。</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -6705,6 +6694,16 @@ msgstr "POP3 过滤规则"
 msgid "Filter Rules"
 msgstr "过滤规则"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "导入(&I)"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "导入(&I)"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "可用过滤器"
@@ -6785,6 +6784,11 @@ msgstr "另外将此过滤器添加到工具栏中"
 msgid "Icon for this filter:"
 msgstr "此过滤器的图标："
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "收件人"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "上移"
@@ -6793,16 +6797,29 @@ msgstr "上移"
 msgid "Down"
 msgstr "下移"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "重命名..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "新建"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "复制到(&C)"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "已删除"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6811,15 +6828,18 @@ msgstr "选择文件夹快捷键"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
-msgstr "至少有一个过滤器的目标是联机 IMAP 账户上的文件夹。当您要过滤联机 IMAP 上的新邮件时，只有手动执行这些过滤器才能生效。"
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
+msgstr ""
+"至少有一个过滤器的目标是联机 IMAP 账户上的文件夹。当您要过滤联机 IMAP 上的新"
+"邮件时，只有手动执行这些过滤器才能生效。"
 
 #: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
-msgstr "下列过滤器没有保存，原因是这些过滤器无效(如没有包含操作或者没有搜索规则)。"
+msgstr ""
+"下列过滤器没有保存，原因是这些过滤器无效(如没有包含操作或者没有搜索规则)。"
 
 #: kmfilterdlg.cpp:947
 msgid "Rename Filter"
@@ -6886,25 +6906,23 @@ msgstr "解决 IMAP 缓存的问题"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>解决 IMAP 缓存的问题。</b></p>"
-"<p>如果您在同步 IMAP 文件夹时遇到了问题，您应该先尝试重建索引文件。重建可能要花一些时间，但应该不会导致问题。</p>"
-"<p>如果这样还不行的话，您应该试着刷新 IMAP 缓存。如果您执行这一操作的话，您将丢失对此文件夹及其全部子文件夹的全部本地更改。</p>"
+"<p><b>解决 IMAP 缓存的问题。</b></p><p>如果您在同步 IMAP 文件夹时遇到了问题，"
+"您应该先尝试重建索引文件。重建可能要花一些时间，但应该不会导致问题。</p><p>如"
+"果这样还不行的话，您应该试着刷新 IMAP 缓存。如果您执行这一操作的话，您将丢失"
+"对此文件夹及其全部子文件夹的全部本地更改。</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -6934,12 +6952,13 @@ msgstr "刷新缓存(&C)"
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
-msgstr "文件夹 %1 的 UID 缓存文件不可读。可能是文件系统权限的问题，或是文件已损坏。"
+msgstr ""
+"文件夹 %1 的 UID 缓存文件不可读。可能是文件系统权限的问题，或是文件已损坏。"
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr "文件夹 %1 的 UID 缓存文件不可写。可能是文件系统权限的问题。"
 
 #: kmfoldercachedimap.cpp:612
@@ -6977,9 +6996,11 @@ msgstr "此文件夹的索引已被重建。"
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
-msgstr "文件夹 %1 未处于初始同步状态 (它的状态是%2)。您要将其重置到初始同步状态，并仍然进行同步吗？"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
+msgstr ""
+"文件夹 %1 未处于初始同步状态 (它的状态是%2)。您要将其重置到初始同步状态，并仍"
+"然进行同步吗？"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7081,7 +7102,8 @@ msgstr "将信件上传到服务器"
 msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
-msgstr "<p>您对文件夹 <b>%1</b> 的访问受限，以后将不能再向此文件夹内添加信件。</p>"
+msgstr ""
+"<p>您对文件夹 <b>%1</b> 的访问受限，以后将不能再向此文件夹内添加信件。</p>"
 
 #: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
@@ -7102,11 +7124,11 @@ msgstr "在服务器上创建子文件夹"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
-msgstr "<qt><p>服务器上文件夹 <b>%1</b> 内的邮件将被删除。您想要在本地删除它们吗？<br>UID：%2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
+msgstr ""
+"<qt><p>服务器上文件夹 <b>%1</b> 内的邮件将被删除。您想要在本地删除它们吗？"
+"<br>UID：%2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7127,9 +7149,8 @@ msgstr "获取命名空间 %1 的文件夹"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr "<qt><p>似乎文件夹 <b>%1</b> 已删除。您想要从服务器上删除吗？</p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
@@ -7138,15 +7159,19 @@ msgstr "已中止"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
-msgstr "IMAP 服务器 %1 不支持 IMAP 批注。此服务器无法使用 XML 存储；请重新用不同的方式配置 KMail。"
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
+msgstr ""
+"IMAP 服务器 %1 不支持 IMAP 批注。此服务器无法使用 XML 存储；请重新用不同的方"
+"式配置 KMail。"
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
-msgstr "IMAP 服务器 %1 不支持 IMAP 批注。此服务器无法使用 XML 存储，请重新用不同的方式配置 KMail"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
+msgstr ""
+"IMAP 服务器 %1 不支持 IMAP 批注。此服务器无法使用 XML 存储，请重新用不同的方"
+"式配置 KMail"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7158,14 +7183,15 @@ msgstr "待认领"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>文件夹 <b>%1</b> 中有尚未上传到服务器的新信件，而此文件夹似乎已在服务器上被删除，或者您没有上传这些信件至文件夹的足够权限。</p>"
-"<p>为避免数据丢失，所有受影响的信件将被移动到 <b>%2</b>。</p>"
+"<p>文件夹 <b>%1</b> 中有尚未上传到服务器的新信件，而此文件夹似乎已在服务器上"
+"被删除，或者您没有上传这些信件至文件夹的足够权限。</p><p>为避免数据丢失，所有"
+"受影响的信件将被移动到 <b>%2</b>。</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7173,19 +7199,24 @@ msgstr "访问权限不足"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>文件夹 <b>%1</b> "
-"中有尚未上传到服务器的新信件，而此文件夹似乎已在服务器上被删除，或者您没有上传这些信件至文件夹的足够权限。请联系您的系统管理员申请上传权限，或将这些信件移动到别"
-"的文件夹。</p>"
-"<p>您现在是否想要将这些信件移至另外一个文件夹？</p>"
+"<p>文件夹 <b>%1</b> 中有尚未上传到服务器的新信件，而此文件夹似乎已在服务器上"
+"被删除，或者您没有上传这些信件至文件夹的足够权限。请联系您的系统管理员申请上"
+"传权限，或将这些信件移动到别的文件夹。</p><p>您现在是否想要将这些信件移至另外"
+"一个文件夹？</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "移至："
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "不移动"
 
@@ -7197,8 +7228,7 @@ msgstr "移动信件到文件夹"
 msgid "Permissions (ACL)"
 msgstr "权限(ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "常规"
@@ -7222,8 +7252,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "使用自定义图标(&I)"
@@ -7242,19 +7271,19 @@ msgstr "通知此文件夹中的新邮件/未读邮件"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>如果启用此选项，在此文件夹有新/未读邮件到达时您会收到通知。此外，转到下一个/上一个有未读信件的文件夹的操作也会在此停住。</p>"
-"<p>如果您不想收到这类通知，或想要在转到下一个/上一个有未读信件的文件夹时略过此文件夹，请取消此选项。在需要忽略废件夹和垃圾信件夹中的新/未读邮件的场合下，这"
-"么做非常有用。</p></qt>"
+"<qt><p>如果启用此选项，在此文件夹有新/未读邮件到达时您会收到通知。此外，转到"
+"下一个/上一个有未读信件的文件夹的操作也会在此停住。</p><p>如果您不想收到这类"
+"通知，或想要在转到下一个/上一个有未读信件的文件夹时略过此文件夹，请取消此选"
+"项。在需要忽略废件夹和垃圾信件夹中的新/未读邮件的场合下，这么做非常有用。</"
+"p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7266,10 +7295,12 @@ msgstr "保留此文件夹中的回复"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
-msgstr "如果您想要将在此文件夹中撰写的回信在发送后仍然保存在同一文件夹，而不是系统配置的已发邮件文件夹，请选中此选项。"
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
+msgstr ""
+"如果您想要将在此文件夹中撰写的回信在发送后仍然保存在同一文件夹，而不是系统配"
+"置的已发邮件文件夹，请选中此选项。"
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7279,17 +7310,21 @@ msgstr "在信件列表中显示发件人/收件人列"
 msgid "Sho&w column:"
 msgstr "显示列(&W)："
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "设为默认"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "发件人"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "收件人"
@@ -7300,14 +7335,15 @@ msgstr "发送者身份(&S)："
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
-"选择针对此文件夹撰写新邮件或回复邮件的发件人身份。这意味着当您在一个工作文件夹中时，您可以使 KMail "
-"自动选用发件人地址、签名或加密密钥。在主配置对话框中也可以设定身份(设置->配置 KMail)。"
+"选择针对此文件夹撰写新邮件或回复邮件的发件人身份。这意味着当您在一个工作文件"
+"夹中时，您可以使 KMail 自动选用发件人地址、签名或加密密钥。在主配置对话框中也"
+"可以设定身份(设置->配置 KMail)。"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7325,19 +7361,23 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"此设定可定义哪个用户在共享此文件夹时可设定忙闲列表中的“忙碌”时期，且可以看到此文件夹内的事件或任务相关提醒。本设定仅对日历和任务文件夹有效(如果是任务文件夹只"
-"可用于提醒)。\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"此设定可定义哪个用户在共享此文件夹时可设定忙闲列表中的“忙碌”时期，且可以看到"
+"此文件夹内的事件或任务相关提醒。本设定仅对日历和任务文件夹有效(如果是任务文件"
+"夹只可用于提醒)。\n"
 "\n"
-"实用范例：如果老板要和他的秘书共享一个文件夹，只有老板才能将某次会议标记为“忙碌”，因此他应该选择“管理员”。因为秘书没有对此文件夹的管理权限。\n"
-"另一方面，如果一个工作组要为组会议共享日历，所有此文件夹的读者都应该为此次会议标记为“忙碌”。\n"
-"一个含有可选事件的面向全公司的文件夹应使用“无人”设定，因为不能确知会有谁参与此事件。"
+"实用范例：如果老板要和他的秘书共享一个文件夹，只有老板才能将某次会议标记为“忙"
+"碌”，因此他应该选择“管理员”。因为秘书没有对此文件夹的管理权限。\n"
+"另一方面，如果一个工作组要为组会议共享日历，所有此文件夹的读者都应该为此次会"
+"议标记为“忙碌”。\n"
+"一个含有可选事件的面向全公司的文件夹应使用“无人”设定，因为不能确知会有谁参与"
+"此事件。"
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7368,20 +7408,21 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
-"您将此文件夹配置为包含群件信息，但却在常规配置选项中隐藏群件文件夹。这意味着，关闭此对话框后，此文件夹将会立即消失。如果您想要再次删除此文件夹，您需要临时禁止隐"
-"藏群件文件夹才能看到此文件夹。"
+"您将此文件夹配置为包含群件信息，但却在常规配置选项中隐藏群件文件夹。这意味"
+"着，关闭此对话框后，此文件夹将会立即消失。如果您想要再次删除此文件夹，您需要"
+"临时禁止隐藏群件文件夹才能看到此文件夹。"
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7450,10 +7491,12 @@ msgstr "获取文件夹信息出错。"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "%1 的邮件索引是来自一个未知版本的KMail (%2)。\n"
-"这个索引可以从您的文件夹中重新生成，但是某些信息，包括状态标记，可能会丢失。您希望把您的索引文件降级吗？"
+"这个索引可以从您的文件夹中重新生成，但是某些信息，包括状态标记，可能会丢失。"
+"您希望把您的索引文件降级吗？"
 
 #: kmfolderindex.cpp:372
 msgid "Downgrade"
@@ -7468,7 +7511,9 @@ msgstr "不降级"
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
-msgstr "%1 的邮件索引已损坏，现在需要重新生成。但是包括状态标记在内的部分信息可能会丢失。"
+msgstr ""
+"%1 的邮件索引已损坏，现在需要重新生成。但是包括状态标记在内的部分信息可能会丢"
+"失。"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -7476,9 +7521,10 @@ msgstr "打开 %1 出错；此文件夹已丢失。"
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
-msgstr "打开 %1 出错；可能不是合法的 maildir 文件夹，或者您没有足够的访问权限。"
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
+msgstr ""
+"打开 %1 出错；可能不是合法的 maildir 文件夹，或者您没有足够的访问权限。"
 
 #: kmfoldermaildir.cpp:124
 msgid "Folder `%1' changed; recreating index."
@@ -7518,17 +7564,16 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>文件夹“%2”的索引可能已经过期。为了避免信件损坏，现在将重新生成索引。可能导致删除的信件重新出现，状态标记也可能丢失。</p>"
-"<p>请在 <a href=\"%1\">KMail 手册的常见问题解答章节</a>中的相关条目中查找如何避免此问题再次出现的信息。</p></qt>"
+"<qt><p>文件夹“%2”的索引可能已经过期。为了避免信件损坏，现在将重新生成索引。可"
+"能导致删除的信件重新出现，状态标记也可能丢失。</p><p>请在 <a href="
+"\"%1\">KMail 手册的常见问题解答章节</a>中的相关条目中查找如何避免此问题再次出"
+"现的信息。</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7585,7 +7630,7 @@ msgstr ""
 "“%1”好像不是文件夹。\n"
 "请先将文件移出。"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7593,7 +7638,7 @@ msgstr ""
 "文件夹“%1”的权限不正确；\n"
 "请确定您可以查看并修改此文件夹的内容。"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7603,15 +7648,17 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
-msgstr "在检查完最后一份邮件后同名文件夹会被删除。您需要在创建其它同名文件夹前先检查邮件。"
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
+msgstr ""
+"在检查完最后一份邮件后同名文件夹会被删除。您需要在创建其它同名文件夹前先检查"
+"邮件。"
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "无法创建文件夹"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7708,11 +7755,12 @@ msgstr "IMAP 缓存疑难解答(&T)..."
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
-"<qt>无法创建文件夹 <b>%1</b>，原因是服务器上的权限不够。如果您认为您应该可以在此创建子文件夹，请要求您的管理员给予您相应的权限。</qt> "
+"<qt>无法创建文件夹 <b>%1</b>，原因是服务器上的权限不够。如果您认为您应该可以"
+"在此创建子文件夹，请要求您的管理员给予您相应的权限。</qt> "
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -7839,10 +7887,10 @@ msgstr "%1 文件夹为只读。"
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr "<qt>您真要删除选中的 %n 封信件吗？<br>一旦删除将无法恢复。</qt>"
 
 #: kmheaders.cpp:1600
@@ -7895,128 +7943,128 @@ msgstr ""
 "无法修改 %1\n"
 "(设备中没有空间？)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "请求证书签名"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "请从附件创建证书，并返回发件人。"
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail 设置为脱机；所有的网络任务都将被推迟"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail 设置为联机；所有的网络任务都已恢复"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail 目前工作于脱机模式中。您是否想要继续？"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "联机工作"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "脱机工作"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "您没有权限读写您的收件夹。"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "发件箱"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "您没有权限读写您的发件夹。"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "已发邮件"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "您没有权限读写您的已发文件夹。"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "废件夹"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "您没有权限读写您的废件夹。"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "草稿"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "您没有权限读写您的草稿夹。"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "模板"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "您没有权限读写您的模板文件夹。"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "上次搜索"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i> 文件夹已存在。%1 现在将使用 <i>%5</i> 文件夹存储邮件。"
-"<p>%2 可为您将 <i>%6<i> 中的内容移至此文件夹，但是这可能替换 <i>%7</i> 中相同名称的任何文件。"
-"<p><strong>您是否想要 %3 现在移动邮件文件？</strong></qt>"
+"<qt><i>%4</i> 文件夹已存在。%1 现在将使用 <i>%5</i> 文件夹存储邮件。<p>%2 可"
+"为您将 <i>%6<i> 中的内容移至此文件夹，但是这可能替换 <i>%7</i> 中相同名称的任"
+"何文件。<p><strong>您是否想要 %3 现在移动邮件文件？</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt><i>%4</i> 文件夹已存在。%1 现在将使用 <i>%5</i> 文件夹存储邮件。%2 可为您将 <i>%6<i> 中的内容移至此文件夹。"
-"<p><strong>您是否想要 %3 现在移动邮件文件？</strong></qt>"
+"<qt><i>%4</i> 文件夹已存在。%1 现在将使用 <i>%5</i> 文件夹存储邮件。%2 可为您"
+"将 <i>%6<i> 中的内容移至此文件夹。<p><strong>您是否想要 %3 现在移动邮件文件？"
+"</strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "升迁邮件文件吗？"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail 遇到一个致命错误，即将退出。"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8027,11 +8075,11 @@ msgstr ""
 "错误是：\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "清空废件夹"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "您确定要清空全部账户的废件夹吗？"
 
@@ -8104,8 +8152,7 @@ msgstr "%1中有 %n 封新信"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>新邮件已到达</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8143,8 +8190,8 @@ msgstr "您确定要清空废件夹？"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr "<qt>您确定要将文件夹 <b>%1</b> 中的全部信件移动到废件夹？</qt>"
 
 #: kmmainwidget.cpp:1173
@@ -8169,9 +8216,11 @@ msgstr "删除搜索"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
-msgstr "<qt>您确定要删除搜索 <b>%1</b> 吗？<br>该搜索所显示的任何信件仍可从其原始文件夹访问。</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
+msgstr ""
+"<qt>您确定要删除搜索 <b>%1</b> 吗？<br>该搜索所显示的任何信件仍可从其原始文件"
+"夹访问。</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8183,34 +8232,38 @@ msgstr "<qt>您确定要删除空文件夹 <b>%1</b>？</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>您确定要删除空文件夹 <b>%1</b> 和它的子文件夹吗？这些子文件夹可能非空，而这些子邮件夹的内容也将被丢弃。"
-"<p><b>请注意</b>，丢弃的信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
+"<qt>您确定要删除空文件夹 <b>%1</b> 和它的子文件夹吗？这些子文件夹可能非空，而"
+"这些子邮件夹的内容也将被丢弃。<p><b>请注意</b>，丢弃的信件不会保存在您的回收"
+"站文件夹中，而是永久删除。</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>您确定要删除文件夹 <b>%1</b>，丢弃其中所有内容？"
-"<p><b>请注意</b>，丢弃的信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
+"<qt>您确定要删除文件夹 <b>%1</b>，丢弃其中所有内容？<p><b>请注意</b>，丢弃的"
+"信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>您确定要删除文件夹 <b>%1</b> 和它的子文件夹，丢弃其中所有内容？"
-"<p><b>请注意</b>，丢弃的信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
+"<qt>您确定要删除文件夹 <b>%1</b> 和它的子文件夹，丢弃其中所有内容？<p><b>请注"
+"意</b>，丢弃的信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "已删除"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8226,10 +8279,12 @@ msgstr "您确定要删除所有过期的旧信件？"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
-msgstr "在邮件中使用 HTML 将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已有的和将有的安全漏洞危及的可能性。"
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
+msgstr ""
+"在邮件中使用 HTML 将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已有的和将"
+"有的安全漏洞危及的可能性。"
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8242,9 +8297,11 @@ msgstr "使用 HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
-msgstr "在 HTML 邮件中装入外部引用将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已有的和将有的安全漏洞危及的可能性。"
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
+msgstr ""
+"在 HTML 邮件中装入外部引用将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已"
+"有的和将有的安全漏洞危及的可能性。"
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8260,8 +8317,8 @@ msgstr "按邮件列表 %1 过滤..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 "KMail 的自动回复功能要依靠服务器端的过滤。您还没有为此配置 IMAP 服务器。\n"
@@ -8280,7 +8337,8 @@ msgstr "无法启动证书管理器；请检查您的安装。"
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "无法启动 GnuPG LogViewer (kwatchgnupg)；请检查您的安装。"
 
 #: kmmainwidget.cpp:2508
@@ -8600,8 +8658,7 @@ msgstr "保存附件(&T)..."
 msgid "Appl&y All Filters"
 msgstr "应用全部过滤器(&Y)"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "应用过滤器(&P)"
@@ -8713,7 +8770,6 @@ msgstr "下一封未读信件(&U)"
 msgid "Go to the next unread message"
 msgstr "跳转到下一封未读的信件"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "上一封信件(&P)"
@@ -8848,8 +8904,8 @@ msgstr " 正在初始化..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -8858,10 +8914,10 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "此信件含有一个请求，希望您发送接收回执。\n"
@@ -8870,8 +8926,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8882,8 +8938,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8894,8 +8950,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8921,22 +8977,23 @@ msgstr "发送(&S)"
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
-msgstr "信头“处理回执选项 (Disposition-Notification-Options)”含有必需的、但未知的参数"
+msgstr ""
+"信头“处理回执选项 (Disposition-Notification-Options)”含有必需的、但未知的参数"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "收件人："
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "附件：%1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "附件已被删除。"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "附件“%1”已被删除。"
 
@@ -8984,39 +9041,34 @@ msgstr "信件部分属性"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>文件的 <em>MIME 类型</em>：</p>"
-"<p>通常情况下，您不需要更改此设置，因为文件的类型会被自动检查；但是有些时候，%1 可能无法正确检测——您可以在这里进行修正。</p></qt>"
+"<qt><p>文件的 <em>MIME 类型</em>：</p><p>通常情况下，您不需要更改此设置，因为"
+"文件的类型会被自动检查；但是有些时候，%1 可能无法正确检测——您可以在这里进行修"
+"正。</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>此部分的大小：</p>"
-"<p>有时候，%1 将给出一个估计大小，因为计算实际大小会太费时间。如果是这样的话，在显示的大小后面会出现“(估计)”字样。</p></qt>"
+"<qt><p>此部分的大小：</p><p>有时候，%1 将给出一个估计大小，因为计算实际大小会"
+"太费时间。如果是这样的话，在显示的大小后面会出现“(估计)”字样。</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>此部分的文件名：</p>"
-"<p>尽管此处默认为附件的名称，但是它并指定附加的文件；而是建议收件人的邮件程序在将该部分保存到磁盘时使用的文件名。</p></qt>"
+"<qt><p>此部分的文件名：</p><p>尽管此处默认为附件的名称，但是它并指定附加的文"
+"件；而是建议收件人的邮件程序在将该部分保存到磁盘时使用的文件名。</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -9024,15 +9076,13 @@ msgstr "描述(&D)："
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>此部分的描述：</p>"
-"<p>这只是此部分的描述性信息，与整封信件的主题类似。大多数邮件程序将把此信息显示在其信件预览中的附件图标旁。</p></qt>"
+"<qt><p>此部分的描述：</p><p>这只是此部分的描述性信息，与整封信件的主题类似。"
+"大多数邮件程序将把此信息显示在其信件预览中的附件图标旁。</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9040,21 +9090,19 @@ msgstr "编码(&E)："
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>此部分的传送编码：</p>"
-"<p>通常情况下，您不必更改此设置，因为 %1 会根据 MIME 类型自动选择对应的默认编码；但是在某些时候，这样可能显著减少结果信件的大小，比如一个 "
-"PostScript "
-"文件，不包含二进制数据，而由纯文本构成——在这种情况下，选择“quoted-printable”而不是默认的“base64”将把结果信件的大小缩减 "
-"25%。</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
+msgstr ""
+"<qt><p>此部分的传送编码：</p><p>通常情况下，您不必更改此设置，因为 %1 会根据 "
+"MIME 类型自动选择对应的默认编码；但是在某些时候，这样可能显著减少结果信件的大"
+"小，比如一个 PostScript 文件，不包含二进制数据，而由纯文本构成——在这种情况"
+"下，选择“quoted-printable”而不是默认的“base64”将把结果信件的大小缩减 25%。</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9062,18 +9110,16 @@ msgstr "建议自动显示(&A)"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
-"<qt>"
-"<p>选中此选项表明您想要建议收件人在信件预览中自动(内嵌)显示此部分，而不是显示默认的图标视图；</p>"
-"<p>从技术上来讲，实现的方法是设置此部分的 <em>Content-Disposition</em> "
-"信头字段为“inline”而不是默认的“attachment”。</p></qt>"
+"<qt><p>选中此选项表明您想要建议收件人在信件预览中自动(内嵌)显示此部分，而不是"
+"显示默认的图标视图；</p><p>从技术上来讲，实现的方法是设置此部分的 "
+"<em>Content-Disposition</em> 信头字段为“inline”而不是默认的“attachment”。</"
+"p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9081,11 +9127,12 @@ msgstr "给此部份签名(&S)"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
-msgstr "<qt><p>选中此选项表明您想要对此信件部分进行签名；</p><p>签名将用您为目前选中的身份所关联的密钥进行。</p></qt>"
+msgstr ""
+"<qt><p>选中此选项表明您想要对此信件部分进行签名；</p><p>签名将用您为目前选中"
+"的身份所关联的密钥进行。</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9093,10 +9140,11 @@ msgstr "加密此部分(&Y)"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
-msgstr "<qt><p>选中此选项表明您想要将此部分加密；</p><p>此部分将为此信件的收件人加密</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
+msgstr ""
+"<qt><p>选中此选项表明您想要将此部分加密；</p><p>此部分将为此信件的收件人加密"
+"</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9110,15 +9158,12 @@ msgstr "POP 过滤器"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"要过滤的 POP 账户上的信件：<b>%1</b>"
-"<p>此信件长度超过了您为此账户定义的最大大小。"
-"<br>您可以通过下面对应的按钮选择您想要执行的操作。"
+"要过滤的 POP 账户上的信件：<b>%1</b><p>此信件长度超过了您为此账户定义的最大大"
+"小。<br>您可以通过下面对应的按钮选择您想要执行的操作。"
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9368,37 +9413,37 @@ msgstr "K 桌面环境的电子邮件客户。"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
-msgstr "<h2 style='margin-top: 0px;'>正在接收文件夹内容</h2><p>请稍候……</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
+msgstr ""
+"<h2 style='margin-top: 0px;'>正在接收文件夹内容</h2><p>请稍候……</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>脱机</h2>"
-"<p>KMail 目前位于脱机模式，请单击<a href=\"kmail:goOnline\">此处</a>转为联机……</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>脱机</h2><p>KMail 目前位于脱机模式，请单击<a "
+"href=\"kmail:goOnline\">此处</a>转为联机……</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9406,10 +9451,11 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>欢迎使用 KMail %1</h2>"
-"<p>KMail 是 TDE 桌面环境下的邮件客户程序。它完全兼容 Internet 的邮件标准，包括 MIME、SMTP、POP3 和 IMAP。</p>\n"
-"<ul>"
-"<li>KMail 有许多强大的特性，在<a \"href=\"%2\">文档</a></li>中有详细描述。\n"
+"<h2 style='margin-top: 0px;'>欢迎使用 KMail %1</h2><p>KMail 是 TDE 桌面环境下"
+"的邮件客户程序。它完全兼容 Internet 的邮件标准，包括 MIME、SMTP、POP3 和 "
+"IMAP。</p>\n"
+"<ul><li>KMail 有许多强大的特性，在<a \"href=\"%2\">文档</a></li>中有详细描"
+"述。\n"
 "<li><a href=\"%3\">KMail 主页</a>提供了 KMail 新版本的信息</ul>\n"
 "%8\n"
 "<p>此版本的 KMail 中的新增特性包括(与 TDE %5 中的 KMail %4 相比)：</p>\n"
@@ -9421,15 +9467,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail 开发组</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9441,8 +9485,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>重要更改</span>"
-"(与 KMail %1 比较)：</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>重要更改</span>(与 KMail "
+"%1 比较)：</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -9473,7 +9517,8 @@ msgstr "查看附件：%1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr "[KMail：附件包含二进制数据。正在试图显示前 %n 个字符。]"
 
@@ -9499,12 +9544,14 @@ msgstr "打开附件？"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "删除附件可能使信件中的任何数字签名失效。"
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr "编辑附件可能使信件中的任何数字签名失效。"
 
 #: kmreaderwin.cpp:2956
@@ -9525,6 +9572,58 @@ msgstr "(匹配以下任意)"
 msgid "(match all of the following)"
 msgstr "(匹配以下全部)"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "已读"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "旧"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "已删除"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "已回复"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "已转发"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "已排队"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "已发送"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "已监视"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "已忽略"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "垃圾信"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "ham"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "待办"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "有附件"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "完整信件"
@@ -9600,10 +9699,10 @@ msgstr "严重错误: 无法处理已发信件(没有空间?)。失败的信件�
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "将已发送信件 %1 从“发件夹”移动到“已发文件夹”失败。\n"
 "可能的原因是缺少磁盘空间或写权限。请试着修复此问题然后手工移动信件。"
@@ -9611,8 +9710,8 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 "没有指定发件人地址，无法发送信件。\n"
 "请在配置对话框的身份一节中设置身份“%1”的电子邮件地址，然后再试一次。"
@@ -9638,8 +9737,8 @@ msgstr "正在初始化发送过程..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr "您选择了使用不加密传送发送队列中的邮件，您是否想要继续？"
 
 #: kmsender.cpp:505
@@ -9664,8 +9763,9 @@ msgstr "不能发出(一些)队列中的邮件。"
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9682,19 +9782,15 @@ msgstr "发送已中止。"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
-"<p>发送失败：</p>"
-"<p>%1</p>"
-"<p>这个邮件将留在“发件箱”文件夹中，直到您解决了问题(比如，错误的地址)或者把它从“发件箱”文件夹中删除。</p>"
-"<p>使用的是如下传送协议：%2</p>"
-"<p>您是否还想继续发送剩下的信件？</p>"
+"<p>发送失败：</p><p>%1</p><p>这个邮件将留在“发件箱”文件夹中，直到您解决了问题"
+"(比如，错误的地址)或者把它从“发件箱”文件夹中删除。</p><p>使用的是如下传送协"
+"议：%2</p><p>您是否还想继续发送剩下的信件？</p>"
 
 #: kmsender.cpp:730
 msgid "Continue Sending"
@@ -9712,14 +9808,16 @@ msgstr "中止发送(&A)"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "发送失败：\n"
 "%1\n"
-"这个邮件将留在“发件箱”文件夹中，直到您解决了问题(比如，错误的地址)或者把它从“发件箱”文件夹中删除。\n"
+"这个邮件将留在“发件箱”文件夹中，直到您解决了问题(比如，错误的地址)或者把它"
+"从“发件箱”文件夹中删除。\n"
 "使用的是如下传送协议：\n"
 "  %2"
 
@@ -9758,31 +9856,39 @@ msgstr "您需要提供用户名和密码来使用这个 SMTP 服务器。"
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
-msgstr "%1 似乎正在运行于本机的另外一个显示上。多次运行 %2 可能会导致丢失邮件。不应该启动 %1，除非您确定并未在运行。"
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
+msgstr ""
+"%1 似乎正在运行于本机的另外一个显示上。多次运行 %2 可能会导致丢失邮件。不应该"
+"启动 %1，除非您确定并未在运行。"
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
-msgstr "%1 似乎正在运行于本机的另外一个显示上。同时运行 %1 和 %2 可能会导致丢失邮件。不应该启动 %2，除非您确定 %1 未在运行。"
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
+msgstr ""
+"%1 似乎正在运行于本机的另外一个显示上。同时运行 %1 和 %2 可能会导致丢失邮件。"
+"不应该启动 %2，除非您确定 %1 未在运行。"
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
-msgstr "%1 似乎正在运行于 %2 上。多次运行 %1 可能会导致丢失邮件。不应该启动 %1，除非您确定它并未运行在 %2 上。"
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
+msgstr ""
+"%1 似乎正在运行于 %2 上。多次运行 %1 可能会导致丢失邮件。不应该启动 %1，除非"
+"您确定它并未运行在 %2 上。"
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
-msgstr "%1 似乎正在运行于 %3 上。同时运行 %1 和 %2 可能会导致丢失邮件。不应该启动 %2，除非您确定 %1 并未运行在 %3 上。"
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
+msgstr ""
+"%1 似乎正在运行于 %3 上。同时运行 %1 和 %2 可能会导致丢失邮件。不应该启动 "
+"%2，除非您确定 %1 并未运行在 %3 上。"
 
 #: kmstartup.cpp:232
 #, c-format
@@ -9793,6 +9899,10 @@ msgstr "启动 %1"
 msgid "Exit"
 msgstr "退出"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "新邮件位于"
@@ -9817,12 +9927,14 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "TDEWallet 不可用。强烈见您使用 TDEWallet 来管理您的密码。\n"
-"但是，KMail 也可以将密码保存在其配置文件中。虽然该密码将以打乱的格式存储，但并不够安全，当获得配置文件访问权后被解密的可能性很大。\n"
+"但是，KMail 也可以将密码保存在其配置文件中。虽然该密码将以打乱的格式存储，但"
+"并不够安全，当获得配置文件访问权后被解密的可能性很大。\n"
 "您是否想要在配置文件中存储账户“%1”的密码？"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -9890,7 +10002,9 @@ msgstr "前置命令(&M)："
 msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
-msgstr "发送邮件前在本地运行的命令。例如，这里可用于设置 ssh 隧道。如果无需运行命令，请将此处留空。"
+msgstr ""
+"发送邮件前在本地运行的命令。例如，这里可用于设置 ssh 隧道。如果无需运行命令，"
+"请将此处留空。"
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -9898,9 +10012,11 @@ msgstr "服务器需要认证(&R)"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
-msgstr "如果您的 SMTP 服务器在接受邮件前需要身份验证的话，请选中此选项。这被称为“需要验证的 SMTP”或简称 ASMTP。"
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"如果您的 SMTP 服务器在接受邮件前需要身份验证的话，请选中此选项。这被称为“需要"
+"验证的 SMTP”或简称 ASMTP。"
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -9920,13 +10036,12 @@ msgstr "向服务器发送自定义主机名(&D)"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"选中此选项后，在向邮件服务器进行身份验证时 KMail 会使用自定义主机名。"
-"<p>如果您的系统主机名设置不正确，或者为了隐藏真正的主机名，此选项将十分有用。"
+"选中此选项后，在向邮件服务器进行身份验证时 KMail 会使用自定义主机名。<p>如果"
+"您的系统主机名设置不正确，或者为了隐藏真正的主机名，此选项将十分有用。"
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -9955,8 +10070,8 @@ msgstr "只允许使用本地文件。"
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "主机不能为空。请输入 SMTP 服务器的域名或 IP 地址。"
 
 #: kmtransport.cpp:788
@@ -9969,13 +10084,14 @@ msgstr "列出文件夹 %1 时出错："
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"在本地取消订阅文件夹会删去所有对应这些文件夹的本地相关信息。这些文件夹以后将不会在服务器上有更改。如果您现在要先通过检查邮件来确认是否已向服务器写入所有发生过的"
-"本地更改，请按取消。"
+"在本地取消订阅文件夹会删去所有对应这些文件夹的本地相关信息。这些文件夹以后将"
+"不会在服务器上有更改。如果您现在要先通过检查邮件来确认是否已向服务器写入所有"
+"发生过的本地更改，请按取消。"
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10193,28 +10309,25 @@ msgstr "编辑信件(&E)"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
-msgstr "<qt><p>加密算法插件返回的结构信息无法正确处理；插件可能已经损坏。</p><p>请联系您的系统管理员。</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
+msgstr ""
+"<qt><p>加密算法插件返回的结构信息无法正确处理；插件可能已经损坏。</p><p>请联"
+"系您的系统管理员。</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>没有找到激活的加密算法插件，而且内建的 OpenPGP 代码也无法成功运行。</p>"
-"<p>您有两种方法可以解决这一问题：</p>"
-"<ul>"
-"<li><em>或者</em>使用设置->配置 KMail->插件对话框激活插件；</li>"
-"<li><em>或者</em>在同一对话框的身份->高级标签中指定传统的 OpenPGP 设置。</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>没有找到激活的加密算法插件，而且内建的 OpenPGP 代码也无法成功运行。</p><p>"
+"您有两种方法可以解决这一问题：</p><ul><li><em>或者</em>使用设置->配置 KMail->"
+"插件对话框激活插件；</li><li><em>或者</em>在同一对话框的身份->高级标签中指定"
+"传统的 OpenPGP 设置。</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10226,8 +10339,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus 后端不提供“x-encrypt”功能。请报告错误。"
 
 #: messagecomposer.cpp:565
@@ -10242,14 +10355,14 @@ msgstr "Chiasmus 加密出错"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr "Chiasmus 后端返回了意外值：“x-encrypt”功能未返回字节数组。请报告错误。"
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "内嵌的 OpenPGP 加密信件格式不支持附件的加密或签名。\n"
@@ -10358,8 +10471,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "对收件人加密首选项的检查要求询问您是否要对此信件加密。\n"
@@ -10393,9 +10506,12 @@ msgstr "不加密(&N)"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
-msgstr "您已要求加密此信件，并给自己保留一份加密副本，但是您还没有为此身份配置一个有效的可信任加密密钥。"
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
+msgstr ""
+"您已要求加密此信件，并给自己保留一份加密副本，但是您还没有为此身份配置一个有"
+"效的可信任加密密钥。"
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -10404,8 +10520,8 @@ msgstr "发送不加密信件？"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "此信件中有一部分不会被加密。\n"
@@ -10431,72 +10547,80 @@ msgstr "加密所有部分(&E)"
 msgid "Unencrypted Message Warning"
 msgstr "未加密信件警告"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
-msgstr "<qt><p>错误：后端没有返回任何编码后的数据。</p><p>请报告此错误：<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
+msgstr ""
+"<qt><p>错误：后端没有返回任何编码后的数据。</p><p>请报告此错误：<br>%2</p></"
+"qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr "<qt>不是所有的字符都符合所选的编码。<br><br>还是要发送吗？</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "某些字符将会丢失"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "丢失字符"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "更改编码"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
-msgstr "无法签名此信件，因为选中的后端似乎不支持签名。但这种情况绝对不该发生，请报告此错误。"
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
+msgstr ""
+"无法签名此信件，因为选中的后端似乎不支持签名。但这种情况绝对不该发生，请报告"
+"此错误。"
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
-msgstr "无法签名此信件，因为选中的后端似乎不支持签名。但这种情况绝对不该发生，请报告此错误。"
+msgstr ""
+"无法签名此信件，因为选中的后端似乎不支持签名。但这种情况绝对不该发生，请报告"
+"此错误。"
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "GnuPG 签名操作审核日志"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "签名操作失败。请确认 gpg-agent 程序正在运行。"
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
-msgstr "无法加密此信件，因为选中的后端似乎不支持加密。但这种情况绝对不该发生，请报告此错误。"
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
+msgstr ""
+"无法加密此信件，因为选中的后端似乎不支持加密。但这种情况绝对不该发生，请报告"
+"此错误。"
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "GnuPG 加密操作审核日志"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
-msgstr "无法签名并加密此信件，因为选中的后端似乎不支持签名和加密同时进行。但这种情况绝对不该发生，请报告此错误。"
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
+msgstr ""
+"无法签名并加密此信件，因为选中的后端似乎不支持签名和加密同时进行。但这种情况"
+"绝对不该发生，请报告此错误。"
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -10517,13 +10641,14 @@ msgstr "邮箱格式(&F)："
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"选择是将信件存储为每封信件一个文件(maildir)还是在统一在一个大文件中(mbox)。KMail 默认会使用 maildir "
-"格式，只有在很少的场合下您才需要更改此设定。如果您不确认是否要改动，请将此选项保留不变。"
+"选择是将信件存储为每封信件一个文件(maildir)还是在统一在一个大文件中(mbox)。"
+"KMail 默认会使用 maildir 格式，只有在很少的场合下您才需要更改此设定。如果您不"
+"确认是否要改动，请将此选项保留不变。"
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -10532,9 +10657,11 @@ msgstr "文件夹包含(&C)："
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
-msgstr "选择要将新文件夹设定为适用于邮件存储还是适用于任务或便笺一类群件项目的存储。默认为适用邮件，如果您不确认是否要改动，请将此选项保留不变。"
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
+msgstr ""
+"选择要将新文件夹设定为适用于邮件存储还是适用于任务或便笺一类群件项目的存储。"
+"默认为适用邮件，如果您不确认是否要改动，请将此选项保留不变。"
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -10572,8 +10699,7 @@ msgstr "签名结果不同"
 msgid "The crypto engine returned no cleartext data."
 msgstr "加密引擎没有纯文本数据返回。"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "状态："
 
@@ -10602,8 +10728,8 @@ msgstr "没有发现 %1 插件。"
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "信件已签名，但是无法校验签名的有效性。<br />原因：%1"
 
 #: objecttreeparser.cpp:737
@@ -10638,23 +10764,25 @@ msgstr "加密算法插件“%1”无法解密任何信件。"
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>注意：</b>这封 HTML 信件可能包含对外部图像的引用。为安全起见，外部引用不会装入。如果您信任此信件的发件人，您可以单击<a "
-"href=\"kmail:loadExternal\">此处</a>装入此新建的外部引用。"
+"<b>注意：</b>这封 HTML 信件可能包含对外部图像的引用。为安全起见，外部引用不会"
+"装入。如果您信任此信件的发件人，您可以单击<a href=\"kmail:loadExternal\">此处"
+"</a>装入此新建的外部引用。"
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>注意：</b>这是一封 HTML 信件。为安全起见，仅显示 HTML 源代码。如果您信任此信件的发件人，您可以单击<a "
-"href=\"kmail:showHTML\">此处</a>显示排版后的 HTML。"
+"<b>注意：</b>这是一封 HTML 信件。为安全起见，仅显示 HTML 源代码。如果您信任此"
+"信件的发件人，您可以单击<a href=\"kmail:showHTML\">此处</a>显示排版后的 "
+"HTML。"
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -10896,9 +11024,10 @@ msgstr "已存储的："
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
-msgstr "用于签名的 %1 中没有存储电子邮件地址，所以我们无法比较发件人的地址 %2。"
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
+msgstr ""
+"用于签名的 %1 中没有存储电子邮件地址，所以我们无法比较发件人的地址 %2。"
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -11013,12 +11142,14 @@ msgstr "Kioslave 错误消息"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"您的 POP3 服务器(帐户：%1)不支持 UIDL 命令：Kmail 需要该命令来可靠地判断服务器上的哪些邮件是否已经下载过；\n"
+"您的 POP3 服务器(帐户：%1)不支持 UIDL 命令：Kmail 需要该命令来可靠地判断服务"
+"器上的哪些邮件是否已经下载过；\n"
 "因此把邮件保留在服务器上的功能无法正常工作。"
 
 #: popaccount.cpp:752
@@ -11035,8 +11166,10 @@ msgstr "从 %1 收取了 %n 封信。正在终止传送..."
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
-msgstr "正在从 %5@%6 上取 %2 封信件中的第 %1 封(%4 KB 的 %3 KB)(服务器上还剩 %7 KB)。"
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
+msgstr ""
+"正在从 %5@%6 上取 %2 封信件中的第 %1 封(%4 KB 的 %3 KB)(服务器上还剩 %7 KB)。"
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11052,1737 +11185,15 @@ msgstr "服务器的响应无效"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr "您的邮件主机不支持 TOP 命令。因此，在下载大邮件前，将无法预先获取它们的邮件头。"
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "转到(&G)"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "文件夹(&O)"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "信件(&M)"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "特殊回复"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "转发(&F)"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML 工具栏"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "签名"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "自动签名信件(&A)"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr "若启用此选项，您发送的所有信件默认都会被签名；当然，如果您愿意的话也可以单独禁用每封信的签名。"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "加密"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr "如果启用此项，KMail 不仅会用收件人的公钥加密信件/文件，还会使用您的密钥。如此就允许您以后自行解密信件/文件，通常来说这是个好主意。"
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "在撰写后不显示签名/加密的文本(&I)"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr "如果启用此项，签名/加密文本会被显示在独立窗口内，让您知道它在发送前看上去是什么样子。如果您想验证自己的加密系统能否正常工作，这么做很合适。"
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "加密存储已发信件(&P)"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "选中此项将用加密方式保存信件"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>加密存储信件</h1>\n"
-"如果选中此选项，已发送信件将按照发送时原样加密存储。这并不推荐，因为如果当所需证书过期后，您将无法阅读该信件。\n"
-"<p>\n"
-"但是，可能有一些本地规则要求您将此选项打开。如果存有疑问的话，请咨询您的本地管理员。\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "总是显示备选的加密密钥(&F)"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"如果启用此项，程序将总是会显示一份公钥列表，供您从中选用作加密。如果关闭此项，只当您无法找到正确的公钥，或是只有部分公钥可用时程序才会显示此对话框。"
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "尽可能自动加密信件(&M)"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr "若启用此选项，只要可以并且您希望加密，您发送的所有信件都会被加密；当然，如果您愿意的话也可以单独禁用每封信的自动加密。"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "保存为草稿时从不签名/加密(&V)"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "工作方式"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "收件人："
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "抄送："
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "通用"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "回复"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "全部回复"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "转发"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "快捷键(&U)："
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "模板类型(&T)："
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "文件夹属性"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "文件夹存放邮件列表(&M)"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "列表地址(&A)："
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "普通(&O)："
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "未读(&E)："
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "信件过期"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "过期时间(&X)："
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "将已读的信件设成过期(&R)"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "过期时间(&F)："
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "将未读的信件设成过期(&U)"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "天"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "周"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "月"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "高级"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "发送者身份(&Y)："
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "存储格式(&S)："
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "列表显示(&L)："
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "使用 CRL 验证证书"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr "如果选中此项，程序会用证书吊销列表(CRL)校验 S/MIME 证书。"
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "在线验证证书(OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr "如果选中此项，程序会用在线证书状态协议(OCSP)校验 S/MIME 证书。请在下面填入 OCSP 响应者 URL。"
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "在线证书校验"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OCSP 响应者 URL："
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr "在此输入在线证书校验(OCSP 响应者)服务器的地址。此 URL 通常以 http:// 开头。"
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OCSP 回应签名："
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "忽略证书的服务 URL"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "不检查证书策略"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr "GnuPG 默认使用 ~/.gnupg/policies.txt 文件来检查特定证书策略是否被允许。如果选中此项，将不会检查策略。"
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "从不检查 CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr "如果选中此项，将永不使用证书吊销列表校验 S/MIME 证书。"
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "获取缺少的发行者证书"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr "如果选中此项。程序会在需要时自动获取缺失的发行者证书(对 CRL 和 OCSP 两种校验方式都有效)。"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP 请求"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "不执行任何 HTTP 请求"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "完全禁止为 S/MIME 使用 HTTP。"
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP 请求使用此代理："
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "使用系统 HTTP 代理："
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr "如果选中此项，右侧显示的 HTTP 代理设定(来自 http_proxy 环境变量)将被用于任何 HTTP 请求。"
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-"在此输入 HTTP 代理服务器地址，它将被用于所有 S/MIME 相关的 HTTP 请求。语法为主机名:端口，例如 "
-"myproxy.nowhere.com:3128。"
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "忽略证书的 HTTP CRL 发布点"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"在查询 CRL 的位置时，待测试的证书通常含有一般被称为“CRL 分发点(DP)”的条目，这是一组包含了访问方式描述信息的 URL。第一个找到的 DP "
-"条目会被使用。如果启用此项，在查询时将忽略所有使用 HTTP 访问方式的条目。"
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP 请求"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "不执行任何 LDAP 请求"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "完全禁用 S/MIMe 的 LDAP 用途。"
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "忽略证书的 LDAP CRL 发布点"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"在查询 CRL 的位置时，待测试的证书通常含有一般被称为“CRL 分发点(DP)”的条目，这是一组包含了访问方式描述信息的 URL。第一个找到的 DP "
-"条目会被使用。如果启用此项，在查询时将忽略所有使用 LDAP 访问方式的条目。"
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP 请求的主要主机："
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"在此输入一个 LDAP 服务器可使所有 LDAP 请求优先发往此服务器。确切地说，此设定会覆盖任何已指定的 LDAP URL 中的主机名和端口值，即使您在 "
-"URL 中省略了主机名和端口也不会抹消此设定。只有当您和代理服务器间的连接失败后才会使用其它 LDAP 服务器。\n"
-"语法为：“主机名”或“主机名:端口”。如果省略端口，则默认采用标准 LDAP 端口 389。"
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "添加片断"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "添加(&A)"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "片断(&S)："
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "群组："
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "片断设置"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "工具提示"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "在工具提示中显示片断文字(&T)"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "决定在工具提示中是否显示来自书签行的文字"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "变量"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "输入法变量"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "为每个片断内的变量显示单独对话框"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "将为每个片断内的变量显示单独的输入对话框"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "为所有片断内的变量显示一个对话框"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr "当您为所有片断内的变量输入值时只显示一个对话框"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "定界符："
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "模板配置"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "回复给发件人"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "回复所有人/回复到列表"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "转发的信件"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "试图发送未签名信件时警告(&U)"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "选中此选项会在发送未签名信件时得到警告。"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>试图发送未签名信件时警告</h1>\n"
-"如果选中此选项，当您试图发送未签名的信件部分或整个信件时将会得到警告。\n"
-"<p>\n"
-"推荐您打开此选项以获得最大的完整性。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "试图发送未加密信件时警告(&W)"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "选中此选项会在发送未加密信件时得到警告。"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>试图发送未加密信件时警告</h1>\n"
-"如果选中此选项，当您试图发送未加密的信件部分或整个信件时将会得到警告。\n"
-"<p>\n"
-"推荐您打开此选项以表示最大限度的诚实。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "若收件人的电子邮件地址不在证书中则警告(&R)"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "选中此选项会在地址不在证书中时得到警告"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>若收件人的电子邮件地址不在证书中则警告</h1>\n"
-"如果选中此选项，当收件人的电子邮件地址未包含在用于加密的证书中时，您会收到一个警告。\n"
-"<p>\n"
-"推荐您打开此选项以获得最大的安全性。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "如果证书/密钥即将过期则警告(配置下面的阀值)"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "对签名"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "对加密"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " 天"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "在这里选择天数"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>若签名证书过期则警告</h1>\n"
-"选择签名证书被认为合法而不给出警告的最小天数。\n"
-"<p>\n"
-"SPHINX 推荐设置为 14 天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>若加密证书过期则警告</h1>\n"
-"选择加密证书被认为合法而不给出警告的最小天数。\n"
-"<p>\n"
-"SPHINX 推荐的设置为 14 天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>若链中的证书即将在指定天数内过期则警告</h1>\n"
-"在此选择的天数，是证书链中所有证书被认为合法而不给出警告的最小天数。\n"
-"<p>\n"
-"SPHINX 推荐的设置为 14 天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>若 CA 证书过期则警告</h1>\n"
-"选择 CA 证书被认为合法而不给出警告的最小天数。\n"
-"<p>\n"
-"SPHINX 推荐设置为 14 天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>若根证书过期则警告</h1>\n"
-"选择根证书被认为合法而不给出警告的最小天数。\n"
-"<p>\n"
-"SPHINX 推荐设置为 14 天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "对根证书："
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "对中介 CA 证书："
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "对最终用户证书/密钥："
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "重新启用全部“不再询问”警告"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "模板内容"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "模板快捷键"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "模板类型"
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "检查邮件时发送队列中的邮件"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr "<qt><p>如果您不希望 KMail 自动寄出发件箱中的信件，或是在检查邮件时才自动寄出，请选择此项。</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr "自动从权限不足的文件夹中移出未同步的邮件"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr "如果在文件夹中中有尚未上传到服务器的新信件，但是您没有上传这些信件至文件夹的足够权限。这些信件将被自动移动到待认领文件夹。"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "允许在只读文件夹上设置本地标记"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"这里允许管理员设定两次邮件检查间的最小延时。\n"
-"普通用户无法选择比此设定更小的值。"
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "文件夹选择对话框中最近选择的文件夹。"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr "忽略用户的 umask 设定，改为“仅对用户可读写”设定。"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "系统托盘图标显示策略"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr "即使系统托盘图标已激活，在关闭主窗口时也同时关闭程序。"
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "详细的新邮件通知"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr "如果选中此项，每个文件夹都会在新信件到达时显示新邮件通知。反之，您只会获得一个简单的“新邮件到达”消息。"
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "指定编辑器(&D)："
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "使用外部编辑器(&X)"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr "决定何时警告用户文件夹配额即将超出限度的阈值。"
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "启用群件功能"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "在回复邀请时改动信头中的发件人/收件人"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"Microsoft Outlook 在实现 iCanlendar 标准时有很多缺点；此选项用来解决这个问题。如果 Outlook "
-"用户无法获得您的回复，请试着开启此选项。"
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "在邮件体中发送群件邀请"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"Microsoft Outlook 在实现 iCanlendar 标准时有很多缺点；此选项用来解决这个问题。如果 Outlook "
-"用户无法获得您的邀请，请试着开启此选项。"
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "Exchange 兼容的邀请命名形式"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"在 Microsoft Exchange 服务器和 Microsoft Outlook 协作时，处理标准兼容的群件邮件会有问题。如果您要以 Microsoft "
-"Exchange 可识别的形式发送群件邀请，请启用此选项。"
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"当此项被选中时，您将看不到邮件撰写器窗口。作为替代所有邀请信件都会被自动发送。如果您想先查看要发送的邮件，可以取消此选项。然而，注意撰写器窗口中的文本采用了 "
-"iCalendar 语法，您最好不要尝试手动修改它。"
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "在寄出回复信件后删除邀请函"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr "如果选中此项，已回复过的邀请函将被移动到废件箱。"
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>启用此项可让存储来自 Kontact 应用程序(KOrganizer、KAddressBook 和 KNotes)的数据项成为可能。</p>"
-"<p>如果您要设定此项，必须先将程序设为使用 IMAP 资源，在 TDE 控制中心里可以完成这些操作。</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr "<p>通常您没有必要查看正在占有 IMAP 资源的文件夹。但若您需要，可在此设定。</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>如果用于存储群件信息的账户未被用于管理普通邮件，\n"
-"可设定此项使 KMail 只显示群件文件夹。如果您通过另外的\n"
-"在线 IMAP 账户管理常规邮件，此功能会比较有用。</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>选择群件文件夹的存储格式。"
-"<ul>"
-"<li>默认格式为使用 ical(针对日历文件夹) 和 vcard(针对地址簿文件夹) 标准。此格式可激活 Kontact 的全部特性。</li>"
-"<li>Kolab XML 格式使用自定义的存储模型，形式上更加接近于 Outlook。在采用 Kolab 服务器或其它兼容的解决方案时，此格式可提供更佳的 "
-"Outlook 兼容性。</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr "<p>在此选择父级 IMAP 资源文件夹。</p><p>默认时，Kolabs 服务器会将 IMAP 收件箱设为父级文件夹。</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>这是 IMAP 资源文件夹在接受账户处理时的编号。<p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>如果您要用本地语言设定 IMAP 存储的文件夹名，请在下面选择可用的语言。</p>"
-"<p>请注意，这么做的唯一理由是为和 Microsoft Outlook 兼容，基本上我们认为这么做是个馊主意。因为它会使更改语言特性失效。</p>"
-"<p>所以，若非必要请不要设定此项。</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "过滤收取自群件文件夹的新邮件。"
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr "在联机时立即同步离线 IMAP 文件夹内发生过的群件更改。"
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "此值用于决定是否显示 KMail 介绍界面。"
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "每个主机的最大连接数"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr "此项用于限制检查新邮件时每个主机的最大连接数。默认为无限制(0)。"
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "显示快速搜索编辑框"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr "此选项启用或禁用信件列表上方的搜索编辑框，该框用来在信件列表中快速搜索信息。"
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "不使用时隐藏本地收件箱"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "按默认方式内联转发。"
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "允许在信件撰写器中使用分号(“;”)作为分隔符。"
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "在回复或转发时尽可能保持原有字符集"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "自动插入签名(&U)"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr "记住此身份，以后在撰写器窗口中可以用上。"
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr "记住这个存放已发邮件的文件夹，以后在撰写器窗口中可以用上。"
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "记住这个邮件传送，以后在撰写器窗口中可以用上。"
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr "记住此身份，以后在撰写器窗口中可以用上。"
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "到此列自动换行(&W)："
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "若根证书即将过期则警告(&L)："
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr "启用此选项，才能让 Outlook(tm) 理解包含非英语字符的附件名"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "自动请求信件投递通知(&M)"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>如果您想要 KMail 为您每封寄出的信请求信件投递通知(MDN)，则应启用此选项。</p>"
-"<p>此选项只会影响默认值；您仍然可以在每封信的撰写器中启用或禁用 MDN 请求，只需选择菜单项<em>选项</em>->&gt;<em>请求投递通知</em>"
-"。</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "使用最近的地址进行自动补全"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr "如果您不想最近使用过的地址出现在撰写器地址字段的补全列表中，请禁用此项。"
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "自动保存间隔："
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr "KMail 会定时创建撰写器窗口中文本的备份。您可以在此处设置创建备份的间隔。您将此处得值设置为 0 可禁用自动保存。"
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "在上面以引用文本形式插入签名"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "将识别出的前缀替换为“Re:”(&X)"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "将识别出的前缀替换为“Fwd:”(&F)"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "使用智能引用(&Q)"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "签名已过期。"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "收件人选择器类型"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr "设置用于选择收件人、抄送及密送对象的对话框类型。"
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "收件人编辑器类型"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "设置用于编辑收件人、抄送及密送对象的编辑器类型。"
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "收件人编辑器的最多行数。"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr "信件的部件类型列表，用于过滤内嵌了转发部分的邮件。"
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "允许的最大邮件附件大小(以 MB 计)。"
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "在撰写器中显示文本片断管理工具和插入面板。"
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr "在密文操作成功完成后显示 GnuPG 审核日志。"
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "在回复或转发时尽可能保持原有字符集"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"有些邮件，尤其是自动生成邮件往往不指定正确显示邮件所必需的字符编码。在这些时候，程序将使用一个回溯字符编码，您可以在这里配置它。请设定一个在您的网络交际圈中最常"
-"用的编码。默认会使用系统全局的配置。"
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr "更改此项为默认的“自动”以外的设定将强制使用指定编码显示所有邮件，且无视邮件自身的编码描述。"
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr "如果您想要把邮件文本中类似“:-)”这样的微笑符替换成小尺寸表情图片，请启用此项。"
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr "启用此项可显示出不同级别的引用文本。禁用则会隐藏引用文本的级别。"
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "自动折叠级别："
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "引用的文字以较小字体显示"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "启用此选项可以较小字体显示引用的文字。"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "加密存储已发信件(&P)"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
+"您的邮件主机不支持 TOP 命令。因此，在下载大邮件前，将无法预先获取它们的邮件"
+"头。"
 
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "在亮丽信头中显示用户端代理"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr "如果您使用亮丽信头，启用此项可以在信头行中显示用户代理和邮件客户端。"
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "允许删除已有邮件的附件。"
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "允许编辑已有邮件的附件。"
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "在浏览密件前总是先行试图解密。"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "使用空发件人发送信件投递通知。"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr "以空发件人字符串发送邮件投递通知。有些服务器会被配置为拒绝发送这类信件，所以如果您在发送 MDN 时遇到问题，请取消此选项。"
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "词组已转换为模板"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "旧词组已转换为模板"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "新信件模板"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "回复信件模板"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "回复全部信件模板"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "转发信件模板"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "引用字符"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "允许用户更改外出回复设置。"
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr "允许用户上传外出回复过滤脚本，但不允许更改其中的设定，如对域名的操作和垃圾信过滤规则等。"
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "只对来自此域的邮件发送外出回复。"
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "允许对已被标记为垃圾信的来信发送外出回复。"
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr "启动 KMail 时检查是否还有激活中的外出回复。"
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "已经使用了总共 %2 %3 中的 %1"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -12888,6 +11299,11 @@ msgstr "添加为抄送"
 msgid "Add as BCC"
 msgstr "添加为密件抄送"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "取消(&A)"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12903,10 +11319,10 @@ msgstr "已选收件人"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr "您选择了 %n 个收件人，而目前最多支持 %1 个收件人。请进行更改。"
 
 #: redirectdialog.cpp:57
@@ -12923,8 +11339,8 @@ msgstr "使用地址选择对话框"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr "此按钮将打开一个独立的对话框，您可从可用的地址中选择收件人。"
 
 #: redirectdialog.cpp:116
@@ -13027,11 +11443,22 @@ msgstr "大于或等于"
 msgid " bytes"
 msgstr " 字节"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " 天"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
-msgstr "要执行搜索，必须从服务器上下载 %1 中的全部信件。这将花费一些时间。您是否想要继续搜索？"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
+msgstr ""
+"要执行搜索，必须从服务器上下载 %1 中的全部信件。这将花费一些时间。您是否想要"
+"继续搜索？"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -13169,16 +11596,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"正在收集账户“%1”的数据...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "正在收集账户“%1”的数据...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -13197,10 +11620,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"脚本“%1”的内容：\n"
+msgid "Contents of script '%1':\n"
+msgstr "脚本“%1”的内容：\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13223,20 +11644,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"筛选能力：\n"
+msgid "Sieve capabilities:\n"
+msgstr "筛选能力：\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(无特殊的能力)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"可用的筛选脚本：\n"
+msgid "Available Sieve scripts:\n"
+msgstr "可用的筛选脚本：\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -13278,7 +11695,9 @@ msgstr "启用签名(&E)"
 msgid ""
 "Check this box if you want KMail to append a signature to mails written with "
 "this identity."
-msgstr "如果您想要 KMail 在您撰写的邮件末尾写上一小段文字签名，来代表您的身份，请选中此框。"
+msgstr ""
+"如果您想要 KMail 在您撰写的邮件末尾写上一小段文字签名，来代表您的身份，请选中"
+"此框。"
 
 #: signatureconfigurator.cpp:68 xfaceconfigurator.cpp:112
 msgid "Click on the widgets below to obtain help on the input methods."
@@ -13312,9 +11731,11 @@ msgstr "使用此框可输入显式静态签名。"
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
-msgstr "使用此功能可指定包含签名的文本文件。KMail 会在您每次创建新邮件或追加新签名时读取该文件。"
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
+msgstr ""
+"使用此功能可指定包含签名的文本文件。KMail 会在您每次创建新邮件或追加新签名时"
+"读取该文件。"
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -13330,19 +11751,25 @@ msgstr "在文本编辑器中打开指定的文件。"
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"您可在这里添加任意命令，是否要带路径取决于此命令在不在 PATH 环境变量里。对每封新邮件，KMail "
-"都会执行此命令并将其标准输出用作签名。对应此机制的常用相关命令有如“fortune”或“ksig -random”。"
+"您可在这里添加任意命令，是否要带路径取决于此命令在不在 PATH 环境变量里。对每"
+"封新邮件，KMail 都会执行此命令并将其标准输出用作签名。对应此机制的常用相关命"
+"令有如“fortune”或“ksig -random”。"
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "指定命令(&P)："
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "路径"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "新建条目："
@@ -13376,6 +11803,11 @@ msgstr "添加组"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "您真的要删除此组及其所有片断吗？"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "应用到(&T)："
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "编辑片断"
@@ -13388,6 +11820,10 @@ msgstr "编辑组"
 msgid "Edit &group..."
 msgstr "编辑组(&G)..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "编辑(&E)..."
@@ -13424,10 +11860,12 @@ msgstr "如果要将右边输入的值保存为此变量的默认值，请启用
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
-msgstr "如果您启用此项，在右边输入的值将被保存。如果您以后使用同名变量，即使是在其它片断里，此值也会被当作相应变量的默认值。"
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
+msgstr ""
+"如果您启用此项，在右边输入的值将被保存。如果您以后使用同名变量，即使是在其它"
+"片断里，此值也会被当作相应变量的默认值。"
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -13462,6 +11900,16 @@ msgstr "不启用"
 msgid "Cannot insert content from file %1: %2"
 msgstr "无法从文件 %1 插入内容：%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "收件人："
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "抄送："
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13491,49 +11939,42 @@ msgstr "无法启动模板的管道命令：%1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您可以在创建新信件、回复信件或转发信件的撰写模板。</p>"
-"<p>信件模板支持替换命令，只需简单地输入它们或选择<i>插入命令</i>菜单项来使用。</p>"
-"<p>在这里指定文件夹对应的模板。它们会覆盖全局模板和身份对应模板。</p></qt>"
+"<qt><p>您可以在创建新信件、回复信件或转发信件的撰写模板。</p><p>信件模板支持"
+"替换命令，只需简单地输入它们或选择<i>插入命令</i>菜单项来使用。</p><p>在这里"
+"指定文件夹对应的模板。它们会覆盖全局模板和身份对应模板。</p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您可以在创建新信件、回复信件或转发信件的撰写模板。</p>"
-"<p>信件模板支持替换命令，只需简单地输入它们或选择<i>插入命令</i>菜单项来使用。</p>"
-"<p>在这里指定身份对应的模板。它们会覆盖全局模板，并可以被文件夹对应模板覆盖。</p></qt>"
+"<qt><p>您可以在创建新信件、回复信件或转发信件的撰写模板。</p><p>信件模板支持"
+"替换命令，只需简单地输入它们或选择<i>插入命令</i>菜单项来使用。</p><p>在这里"
+"指定身份对应的模板。它们会覆盖全局模板，并可以被文件夹对应模板覆盖。</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您可以在创建新信件、回复信件或转发信件的撰写模板。</p>"
-"<p>信件模板支持替换命令，只需简单地输入它们或选择<i>插入命令</i>菜单项来使用。</p>"
-"<p>在这里指定全局(默认)模板。它们可以被身份对应模板和文件夹对应模板覆盖。</p></qt>"
+"<qt><p>您可以在创建新信件、回复信件或转发信件的撰写模板。</p><p>信件模板支持"
+"替换命令，只需简单地输入它们或选择<i>插入命令</i>菜单项来使用。</p><p>在这里"
+"指定全局(默认)模板。它们可以被身份对应模板和文件夹对应模板覆盖。</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -13785,6 +12226,10 @@ msgstr "管道输出当前信件正文并将处理结果以原始形态插入"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "管道输出原始信件正文并以处理结果将其替换"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "设置光标位置"
@@ -13817,102 +12262,6 @@ msgstr "打开调试模式"
 msgid "Turn Debug Off"
 msgstr "关闭调试模式"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>...您可以使用左右光标键相应的移动到上一封和下一封邮件。</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>...您可以用<em>工具-&gt;创建过滤器</em>根据发件人、收件人、主题和邮件\n"
-"列表快速创建过滤器。</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...您可以使用<em>改写信件头</em>过滤操作去掉某些邮件列表自动\n"
-"添加的“[邮件列表名称]”。只需使用\n"
-"<pre>改写信件头“主题”\n"
-"   替换“\\s*\\[邮件列表名称\\]\\s*”\n"
-"   为“”</pre>\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>...您可以在<em>文件夹-&gt;属性</em>对话框中将邮件列表与文件夹\n"
-"关联。您然后就能使用<em>信件-&gt;新建信件-&gt;到邮件列表...</em>打开已经预设\n"
-"邮件列表地址的撰写器。此外，您还可以在文件夹上单击鼠标中键。</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...您可以为每个文件夹单独指定自定义的图标。\n"
-"请查看<em>文件夹-&gt;属性</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>...KMail 可以显示表明目前显示信件类型(纯文本/HTML/OpenPGP)的彩色条。\n"
-"<p>这样就可以轻松识破发送模拟 KMail 的签名状态框架的 HTML 邮件。</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...您可以根据任意信件头过滤，只需简单的在搜索规则的第一个编辑框中\n"
-"输入其名称。</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...您可以用以下规则只过滤带 HTML 的信件\n"
-"<pre>“Content-type”包含“text/html”</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>...回复信件时，可以只引用原信件中所选择的部分？</p>\n"
-"<p>如果没有选择任何部分，则引用完整的信件原文。</p>\n"
-"<p>当您选择<em>用内嵌方式查看附件</em>时，附件文本都可以被引用。</p>\n"
-"<p>这个功能适用于除<em>信件-&gt;不引用原信件直接回复</em>之外的所有回复操作。</p>\n"
-"<p align=\"right\"><em>由 David F. Newman 提供</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "没有操作可供撤消。"
@@ -13976,6 +12325,15 @@ msgstr "附件 #%1(未命名)"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "显示此操作的 GnuPG 审核日志"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "名为“%1” 的文件已经存在。您要覆盖它吗？"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "覆盖文件吗？"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14091,12 +12449,12 @@ msgstr "每封信都发送图片(&S)"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"如果您想要 KMail 给以此身份撰写的信件添加被称为 X-Face 的信头，请选中此项。X-Face 是一种 48x48 "
-"像素的黑白小图像，有些邮件客户端可以显示它。"
+"如果您想要 KMail 给以此身份撰写的信件添加被称为 X-Face 的信头，请选中此项。X-"
+"Face 是一种 48x48 像素的黑白小图像，有些邮件客户端可以显示它。"
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -14124,10 +12482,12 @@ msgstr "选择文件..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
-msgstr "使用此选项可选择用来创建图片的图像文件。图像应该是高对比度线条明快的。浅色背景的效果可能会更好一点。"
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
+msgstr ""
+"使用此选项可选择用来创建图片的图像文件。图像应该是高对比度线条明快的。浅色背"
+"景的效果可能会更好一点。"
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14135,18 +12495,18 @@ msgstr "从地址簿中设置"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr "您可以使用在地址簿条目里设定过的缩小后的图片版本。"
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail 可以在每封信件中携送一种 48x48 "
-"像素的低质量黑白小图片。例如，它可以是您的头像或是一个符号。如果收件人的邮件客户端支持，它会被恰当显示。"
+"<qt>KMail 可以在每封信件中携送一种 48x48 像素的低质量黑白小图片。例如，它可以"
+"是您的头像或是一个符号。如果收件人的邮件客户端支持，它会被恰当显示。"
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14154,11 +12514,11 @@ msgstr "使用此框可输入显式 X-Face 字符串。"
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"示例可在 <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a> 找到。"
+"示例可在 <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/"
+"~ace/X-Faces/</a> 找到。"
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14173,128 +12533,1678 @@ msgstr "无图片"
 msgid "You do not have your own contact defined in the address book."
 msgstr "您没有在地址簿中定义您自己的联系人。"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>总共：%2<br>未读：%3<br>大小：%4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "签名"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>配额：%1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "自动签名信件(&A)"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "设置信件主题"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"若启用此选项，您发送的所有信件默认都会被签名；当然，如果您愿意的话也可以单独"
+"禁用每封信的签名。"
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "发送 CC 抄件到“address”"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "加密"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "发送 BCC 密件到“address”"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "添加“header”到信件"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"如果启用此项，KMail 不仅会用收件人的公钥加密信件/文件，还会使用您的密钥。如此"
+"就允许您以后自行解密信件/文件，通常来说这是个好主意。"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "从“file”中读入信件正文"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "在撰写后不显示签名/加密的文本(&I)"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "设置信件正文"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"如果启用此项，签名/加密文本会被显示在独立窗口内，让您知道它在发送前看上去是什"
+"么样子。如果您想验证自己的加密系统能否正常工作，这么做很合适。"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "添加附件到邮件，可重复多次"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "加密存储已发信件(&P)"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "只检查新邮件"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "选中此项将用加密方式保存信件"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "只打开编写窗口"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>加密存储信件</h1>\n"
+"如果选中此选项，已发送信件将按照发送时原样加密存储。这并不推荐，因为如果当所"
+"需证书过期后，您将无法阅读该信件。\n"
+"<p>\n"
+"但是，可能有一些本地规则要求您将此选项打开。如果存有疑问的话，请咨询您的本地"
+"管理员。\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "查看给定的信件文件"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "总是显示备选的加密密钥(&F)"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "将信件发送给“address”，并且添加“URL”指向的附件"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"如果启用此项，程序将总是会显示一份公钥列表，供您从中选用作加密。如果关闭此"
+"项，只当您无法找到正确的公钥，或是只有部分公钥可用时程序才会显示此对话框。"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "已读"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "尽可能自动加密信件(&M)"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "旧"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"若启用此选项，只要可以并且您希望加密，您发送的所有信件都会被加密；当然，如果"
+"您愿意的话也可以单独禁用每封信的自动加密。"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "已删除"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "保存为草稿时从不签名/加密(&V)"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "已回复"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "工作方式"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "已转发"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "通用"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "已排队"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "回复"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "已发送"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "全部回复"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "已监视"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "转发"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "已忽略"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "快捷键(&U)："
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "垃圾信"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "模板类型(&T)："
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "ham"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "模板内容"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "待办"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "模板快捷键"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "有附件"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "模板类型"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "已经使用了总共 %2 %3 中的 %1"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "文件夹属性"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "路径"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "文件夹存放邮件列表(&M)"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "列表地址(&A)："
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "普通(&O)："
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "未读(&E)："
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "信件过期"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "过期时间(&X)："
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "将已读的信件设成过期(&R)"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "过期时间(&F)："
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "将未读的信件设成过期(&U)"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "天"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "周"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "月"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "高级"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "发送者身份(&Y)："
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "存储格式(&S)："
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "列表显示(&L)："
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "检查邮件时发送队列中的邮件"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "名为“%1” 的文件已经存在。您要覆盖它吗？"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt><p>如果您不希望 KMail 自动寄出发件箱中的信件，或是在检查邮件时才自动寄"
+"出，请选择此项。</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "覆盖文件吗？"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr "自动从权限不足的文件夹中移出未同步的邮件"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"如果在文件夹中中有尚未上传到服务器的新信件，但是您没有上传这些信件至文件夹的"
+"足够权限。这些信件将被自动移动到待认领文件夹。"
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "允许在只读文件夹上设置本地标记"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"这里允许管理员设定两次邮件检查间的最小延时。\n"
+"普通用户无法选择比此设定更小的值。"
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "文件夹选择对话框中最近选择的文件夹。"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr "忽略用户的 umask 设定，改为“仅对用户可读写”设定。"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "系统托盘图标显示策略"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr "即使系统托盘图标已激活，在关闭主窗口时也同时关闭程序。"
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "详细的新邮件通知"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"如果选中此项，每个文件夹都会在新信件到达时显示新邮件通知。反之，您只会获得一"
+"个简单的“新邮件到达”消息。"
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "指定编辑器(&D)："
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "使用外部编辑器(&X)"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "决定何时警告用户文件夹配额即将超出限度的阈值。"
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "启用群件功能"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "在回复邀请时改动信头中的发件人/收件人"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"Microsoft Outlook 在实现 iCanlendar 标准时有很多缺点；此选项用来解决这个问"
+"题。如果 Outlook 用户无法获得您的回复，请试着开启此选项。"
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "在邮件体中发送群件邀请"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"Microsoft Outlook 在实现 iCanlendar 标准时有很多缺点；此选项用来解决这个问"
+"题。如果 Outlook 用户无法获得您的邀请，请试着开启此选项。"
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "Exchange 兼容的邀请命名形式"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"在 Microsoft Exchange 服务器和 Microsoft Outlook 协作时，处理标准兼容的群件邮"
+"件会有问题。如果您要以 Microsoft Exchange 可识别的形式发送群件邀请，请启用此"
+"选项。"
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"当此项被选中时，您将看不到邮件撰写器窗口。作为替代所有邀请信件都会被自动发"
+"送。如果您想先查看要发送的邮件，可以取消此选项。然而，注意撰写器窗口中的文本"
+"采用了 iCalendar 语法，您最好不要尝试手动修改它。"
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "在寄出回复信件后删除邀请函"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr "如果选中此项，已回复过的邀请函将被移动到废件箱。"
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>启用此项可让存储来自 Kontact 应用程序(KOrganizer、KAddressBook 和 KNotes)"
+"的数据项成为可能。</p><p>如果您要设定此项，必须先将程序设为使用 IMAP 资源，"
+"在 TDE 控制中心里可以完成这些操作。</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>通常您没有必要查看正在占有 IMAP 资源的文件夹。但若您需要，可在此设定。</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>如果用于存储群件信息的账户未被用于管理普通邮件，\n"
+"可设定此项使 KMail 只显示群件文件夹。如果您通过另外的\n"
+"在线 IMAP 账户管理常规邮件，此功能会比较有用。</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>选择群件文件夹的存储格式。<ul><li>默认格式为使用 ical(针对日历文件夹) 和 "
+"vcard(针对地址簿文件夹) 标准。此格式可激活 Kontact 的全部特性。</"
+"li><li>Kolab XML 格式使用自定义的存储模型，形式上更加接近于 Outlook。在采用 "
+"Kolab 服务器或其它兼容的解决方案时，此格式可提供更佳的 Outlook 兼容性。</"
+"li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>在此选择父级 IMAP 资源文件夹。</p><p>默认时，Kolabs 服务器会将 IMAP 收件箱"
+"设为父级文件夹。</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>这是 IMAP 资源文件夹在接受账户处理时的编号。<p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>如果您要用本地语言设定 IMAP 存储的文件夹名，请在下面选择可用的语言。</"
+"p><p>请注意，这么做的唯一理由是为和 Microsoft Outlook 兼容，基本上我们认为这"
+"么做是个馊主意。因为它会使更改语言特性失效。</p><p>所以，若非必要请不要设定此"
+"项。</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "过滤收取自群件文件夹的新邮件。"
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr "在联机时立即同步离线 IMAP 文件夹内发生过的群件更改。"
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "此值用于决定是否显示 KMail 介绍界面。"
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "每个主机的最大连接数"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr "此项用于限制检查新邮件时每个主机的最大连接数。默认为无限制(0)。"
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "显示快速搜索编辑框"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+"此选项启用或禁用信件列表上方的搜索编辑框，该框用来在信件列表中快速搜索信息。"
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "不使用时隐藏本地收件箱"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "按默认方式内联转发。"
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "允许在信件撰写器中使用分号(“;”)作为分隔符。"
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "在回复或转发时尽可能保持原有字符集"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "自动插入签名(&U)"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "记住此身份，以后在撰写器窗口中可以用上。"
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr "记住这个存放已发邮件的文件夹，以后在撰写器窗口中可以用上。"
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "记住这个邮件传送，以后在撰写器窗口中可以用上。"
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr "记住此身份，以后在撰写器窗口中可以用上。"
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "到此列自动换行(&W)："
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "若根证书即将过期则警告(&L)："
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr "启用此选项，才能让 Outlook(tm) 理解包含非英语字符的附件名"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "自动请求信件投递通知(&M)"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>如果您想要 KMail 为您每封寄出的信请求信件投递通知(MDN)，则应启用此选"
+"项。</p><p>此选项只会影响默认值；您仍然可以在每封信的撰写器中启用或禁用 MDN "
+"请求，只需选择菜单项<em>选项</em>->&gt;<em>请求投递通知</em>。</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "使用最近的地址进行自动补全"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+"如果您不想最近使用过的地址出现在撰写器地址字段的补全列表中，请禁用此项。"
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "自动保存间隔："
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"KMail 会定时创建撰写器窗口中文本的备份。您可以在此处设置创建备份的间隔。您将"
+"此处得值设置为 0 可禁用自动保存。"
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "在上面以引用文本形式插入签名"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "将识别出的前缀替换为“Re:”(&X)"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "将识别出的前缀替换为“Fwd:”(&F)"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "使用智能引用(&Q)"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "签名已过期。"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "收件人选择器类型"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr "设置用于选择收件人、抄送及密送对象的对话框类型。"
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "收件人编辑器类型"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "设置用于编辑收件人、抄送及密送对象的编辑器类型。"
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "收件人编辑器的最多行数。"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr "信件的部件类型列表，用于过滤内嵌了转发部分的邮件。"
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "允许的最大邮件附件大小(以 MB 计)。"
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "在撰写器中显示文本片断管理工具和插入面板。"
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr "在密文操作成功完成后显示 GnuPG 审核日志。"
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "在回复或转发时尽可能保持原有字符集"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"有些邮件，尤其是自动生成邮件往往不指定正确显示邮件所必需的字符编码。在这些时"
+"候，程序将使用一个回溯字符编码，您可以在这里配置它。请设定一个在您的网络交际"
+"圈中最常用的编码。默认会使用系统全局的配置。"
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"更改此项为默认的“自动”以外的设定将强制使用指定编码显示所有邮件，且无视邮件自"
+"身的编码描述。"
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+"如果您想要把邮件文本中类似“:-)”这样的微笑符替换成小尺寸表情图片，请启用此项。"
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr "启用此项可显示出不同级别的引用文本。禁用则会隐藏引用文本的级别。"
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "自动折叠级别："
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "引用的文字以较小字体显示"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "启用此选项可以较小字体显示引用的文字。"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "加密存储已发信件(&P)"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "在亮丽信头中显示用户端代理"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr "如果您使用亮丽信头，启用此项可以在信头行中显示用户代理和邮件客户端。"
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "允许删除已有邮件的附件。"
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "允许编辑已有邮件的附件。"
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "在浏览密件前总是先行试图解密。"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "使用空发件人发送信件投递通知。"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"以空发件人字符串发送邮件投递通知。有些服务器会被配置为拒绝发送这类信件，所以"
+"如果您在发送 MDN 时遇到问题，请取消此选项。"
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "词组已转换为模板"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "旧词组已转换为模板"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "新信件模板"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "回复信件模板"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "回复全部信件模板"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "转发信件模板"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "引用字符"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "允许用户更改外出回复设置。"
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"允许用户上传外出回复过滤脚本，但不允许更改其中的设定，如对域名的操作和垃圾信"
+"过滤规则等。"
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "只对来自此域的邮件发送外出回复。"
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "允许对已被标记为垃圾信的来信发送外出回复。"
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr "启动 KMail 时检查是否还有激活中的外出回复。"
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "编辑文件(&F)"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "编辑(&E)..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "转到(&G)"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "文件夹(&O)"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "信件(&M)"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "特殊回复"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "转发(&F)"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "工具提示"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "片断设置"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML 工具栏"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "公共选项"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML 工具栏"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "使用 CRL 验证证书"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr "如果选中此项，程序会用证书吊销列表(CRL)校验 S/MIME 证书。"
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "在线验证证书(OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"如果选中此项，程序会用在线证书状态协议(OCSP)校验 S/MIME 证书。请在下面填入 "
+"OCSP 响应者 URL。"
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "在线证书校验"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OCSP 响应者 URL："
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+"在此输入在线证书校验(OCSP 响应者)服务器的地址。此 URL 通常以 http:// 开头。"
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OCSP 回应签名："
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "忽略证书的服务 URL"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "不检查证书策略"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"GnuPG 默认使用 ~/.gnupg/policies.txt 文件来检查特定证书策略是否被允许。如果选"
+"中此项，将不会检查策略。"
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "从不检查 CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr "如果选中此项，将永不使用证书吊销列表校验 S/MIME 证书。"
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "获取缺少的发行者证书"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"如果选中此项。程序会在需要时自动获取缺失的发行者证书(对 CRL 和 OCSP 两种校验"
+"方式都有效)。"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP 请求"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "不执行任何 HTTP 请求"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "完全禁止为 S/MIME 使用 HTTP。"
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP 请求使用此代理："
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "使用系统 HTTP 代理："
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+"如果选中此项，右侧显示的 HTTP 代理设定(来自 http_proxy 环境变量)将被用于任何 "
+"HTTP 请求。"
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"在此输入 HTTP 代理服务器地址，它将被用于所有 S/MIME 相关的 HTTP 请求。语法为"
+"主机名:端口，例如 myproxy.nowhere.com:3128。"
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "忽略证书的 HTTP CRL 发布点"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"在查询 CRL 的位置时，待测试的证书通常含有一般被称为“CRL 分发点(DP)”的条目，这"
+"是一组包含了访问方式描述信息的 URL。第一个找到的 DP 条目会被使用。如果启用此"
+"项，在查询时将忽略所有使用 HTTP 访问方式的条目。"
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP 请求"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "不执行任何 LDAP 请求"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "完全禁用 S/MIMe 的 LDAP 用途。"
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "忽略证书的 LDAP CRL 发布点"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"在查询 CRL 的位置时，待测试的证书通常含有一般被称为“CRL 分发点(DP)”的条目，这"
+"是一组包含了访问方式描述信息的 URL。第一个找到的 DP 条目会被使用。如果启用此"
+"项，在查询时将忽略所有使用 LDAP 访问方式的条目。"
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP 请求的主要主机："
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"在此输入一个 LDAP 服务器可使所有 LDAP 请求优先发往此服务器。确切地说，此设定"
+"会覆盖任何已指定的 LDAP URL 中的主机名和端口值，即使您在 URL 中省略了主机名和"
+"端口也不会抹消此设定。只有当您和代理服务器间的连接失败后才会使用其它 LDAP 服"
+"务器。\n"
+"语法为：“主机名”或“主机名:端口”。如果省略端口，则默认采用标准 LDAP 端口 389。"
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "添加片断"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "添加(&A)"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "片断(&S)："
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "群组："
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "片断设置"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "工具提示"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "在工具提示中显示片断文字(&T)"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "决定在工具提示中是否显示来自书签行的文字"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "变量"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "输入法变量"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "为每个片断内的变量显示单独对话框"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "将为每个片断内的变量显示单独的输入对话框"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "为所有片断内的变量显示一个对话框"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr "当您为所有片断内的变量输入值时只显示一个对话框"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "定界符："
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "模板配置"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "回复给发件人"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "回复所有人/回复到列表"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "转发的信件"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "试图发送未签名信件时警告(&U)"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "选中此选项会在发送未签名信件时得到警告。"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>试图发送未签名信件时警告</h1>\n"
+"如果选中此选项，当您试图发送未签名的信件部分或整个信件时将会得到警告。\n"
+"<p>\n"
+"推荐您打开此选项以获得最大的完整性。\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "试图发送未加密信件时警告(&W)"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "选中此选项会在发送未加密信件时得到警告。"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>试图发送未加密信件时警告</h1>\n"
+"如果选中此选项，当您试图发送未加密的信件部分或整个信件时将会得到警告。\n"
+"<p>\n"
+"推荐您打开此选项以表示最大限度的诚实。\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "若收件人的电子邮件地址不在证书中则警告(&R)"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "选中此选项会在地址不在证书中时得到警告"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>若收件人的电子邮件地址不在证书中则警告</h1>\n"
+"如果选中此选项，当收件人的电子邮件地址未包含在用于加密的证书中时，您会收到一"
+"个警告。\n"
+"<p>\n"
+"推荐您打开此选项以获得最大的安全性。\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "如果证书/密钥即将过期则警告(配置下面的阀值)"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "对签名"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "对加密"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "在这里选择天数"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>若签名证书过期则警告</h1>\n"
+"选择签名证书被认为合法而不给出警告的最小天数。\n"
+"<p>\n"
+"SPHINX 推荐设置为 14 天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>若加密证书过期则警告</h1>\n"
+"选择加密证书被认为合法而不给出警告的最小天数。\n"
+"<p>\n"
+"SPHINX 推荐的设置为 14 天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>若链中的证书即将在指定天数内过期则警告</h1>\n"
+"在此选择的天数，是证书链中所有证书被认为合法而不给出警告的最小天数。\n"
+"<p>\n"
+"SPHINX 推荐的设置为 14 天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>若 CA 证书过期则警告</h1>\n"
+"选择 CA 证书被认为合法而不给出警告的最小天数。\n"
+"<p>\n"
+"SPHINX 推荐设置为 14 天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>若根证书过期则警告</h1>\n"
+"选择根证书被认为合法而不给出警告的最小天数。\n"
+"<p>\n"
+"SPHINX 推荐设置为 14 天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "对根证书："
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "对中介 CA 证书："
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "对最终用户证书/密钥："
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "重新启用全部“不再询问”警告"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr "<p>...您可以使用左右光标键相应的移动到上一封和下一封邮件。</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"<p>...您可以用<em>工具-&gt;创建过滤器</em>根据发件人、收件人、主题和邮件\n"
+"列表快速创建过滤器。</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...您可以使用<em>改写信件头</em>过滤操作去掉某些邮件列表自动\n"
+"添加的“[邮件列表名称]”。只需使用\n"
+"<pre>改写信件头“主题”\n"
+"   替换“\\s*\\[邮件列表名称\\]\\s*”\n"
+"   为“”</pre>\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>...您可以在<em>文件夹-&gt;属性</em>对话框中将邮件列表与文件夹\n"
+"关联。您然后就能使用<em>信件-&gt;新建信件-&gt;到邮件列表...</em>打开已经预"
+"设\n"
+"邮件列表地址的撰写器。此外，您还可以在文件夹上单击鼠标中键。</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...您可以为每个文件夹单独指定自定义的图标。\n"
+"请查看<em>文件夹-&gt;属性</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>...KMail 可以显示表明目前显示信件类型(纯文本/HTML/OpenPGP)的彩色条。\n"
+"<p>这样就可以轻松识破发送模拟 KMail 的签名状态框架的 HTML 邮件。</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...您可以根据任意信件头过滤，只需简单的在搜索规则的第一个编辑框中\n"
+"输入其名称。</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...您可以用以下规则只过滤带 HTML 的信件\n"
+"<pre>“Content-type”包含“text/html”</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>...回复信件时，可以只引用原信件中所选择的部分？</p>\n"
+"<p>如果没有选择任何部分，则引用完整的信件原文。</p>\n"
+"<p>当您选择<em>用内嵌方式查看附件</em>时，附件文本都可以被引用。</p>\n"
+"<p>这个功能适用于除<em>信件-&gt;不引用原信件直接回复</em>之外的所有回复操作。"
+"</p>\n"
+"<p align=\"right\"><em>由 David F. Newman 提供</em></p>\n"
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -14457,9 +14367,11 @@ msgstr "覆盖文件吗？"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Always encrypt to self</h1>\n"
-#~ "If this box is checked, encrypted messages sent by you will also be encrypted using your own key.\n"
+#~ "If this box is checked, encrypted messages sent by you will also be "
+#~ "encrypted using your own key.\n"
 #~ "<p>\n"
-#~ "It is recommended to leave this option turned on to enable you to read the messages you have sent.\n"
+#~ "It is recommended to leave this option turned on to enable you to read "
+#~ "the messages you have sent.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14479,9 +14391,12 @@ msgstr "覆盖文件吗？"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for encrypting that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for encrypting that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14533,7 +14448,8 @@ msgstr "覆盖文件吗？"
 #~ msgid "Do no&t sign messages"
 #~ msgstr "不签名信件(&T)"
 
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "签名证书配置于<em>证书</em>页面。"
 
 #~ msgid "RSA + SHA-1"
@@ -14579,9 +14495,12 @@ msgstr "覆盖文件吗？"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Certificate Expires</h1>\n"
-#~ "If this option is checked, then you will be warned when trying to use a certificate for signing that expires within the specified amount of days.\n"
+#~ "If this option is checked, then you will be warned when trying to use a "
+#~ "certificate for signing that expires within the specified amount of "
+#~ "days.\n"
 #~ "<p>\n"
-#~ "It is recommended to keep this option turned on to avoid using certificates that expire in the near future.\n"
+#~ "It is recommended to keep this option turned on to avoid using "
+#~ "certificates that expire in the near future.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
@@ -14600,14 +14519,16 @@ msgstr "覆盖文件吗？"
 #~ msgid ""
 #~ "<qt>\n"
 #~ "<h1>Warn If Signer's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of the signer is not contained in the certificate used for signing.\n"
+#~ "If this option is checked, a warning is issued if the email address of "
+#~ "the signer is not contained in the certificate used for signing.\n"
 #~ "<p>\n"
 #~ "It is recommended to leave this option turned on for maximum integrity.\n"
 #~ "</qt>"
 #~ msgstr ""
 #~ "<qt>\n"
 #~ "<h1>若收件人的电子邮件地址不在证书中则警告</h1>\n"
-#~ "如果选中此选项，当收件人的电子邮件地址未包含在用于加密的证书中时，您会收到一个警告。\n"
+#~ "如果选中此选项，当收件人的电子邮件地址未包含在用于加密的证书中时，您会收到"
+#~ "一个警告。\n"
 #~ "<p>\n"
 #~ "推荐您打开此选项以获得最大的安全性。\n"
 #~ "</qt>"
diff --git a/tde-i18n-zh_TW/messages/tdepim/kmail.po b/tde-i18n-zh_TW/messages/tdepim/kmail.po
index 781712069ff..9f252e681be 100644
--- a/tde-i18n-zh_TW/messages/tdepim/kmail.po
+++ b/tde-i18n-zh_TW/messages/tdepim/kmail.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2008-08-01 15:33+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -26,13 +26,13 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Frank Weng (Franklin)"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -178,6 +178,12 @@ msgstr "無（請小心使用）(&E)"
 msgid "Account for semiautomatic resource handling"
 msgstr "刪除所有跟這個帳號有關的資源"
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "清除過去"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -252,12 +258,12 @@ msgstr "登入(&L)："
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
-"帳號名稱是您的網路服務提供者（ISP）所提供您用來認證的<em>使用者名稱</em>，通常是您的電子郵件地址中前面的那一部份（也就是在 <em>@</em> "
-"前面的那一部份）。"
+"帳號名稱是您的網路服務提供者（ISP）所提供您用來認證的<em>使用者名稱</em>，通"
+"常是您的電子郵件地址中前面的那一部份（也就是在 <em>@</em> 前面的那一部份）。"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -278,16 +284,18 @@ msgstr "儲存 POP 密碼(&R)"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 "勾選這個選項，KMail 會將您的密碼儲存下來。\n"
-"如果您的系統中有使用 TDEWallet，密碼將會儲存在 TDEWallet 以提供較安全的保護。\n"
-"如果沒有 TDEWallet 的話，密碼將會儲存在 KMail 的設定檔中，並做簡單的加密。但是這仍然不保證密碼可以安全地不被破解。"
+"如果您的系統中有使用 TDEWallet，密碼將會儲存在 TDEWallet 以提供較安全的保"
+"護。\n"
+"如果沒有 TDEWallet 的話，密碼將會儲存在 KMail 的設定檔中，並做簡單的加密。但"
+"是這仍然不保證密碼可以安全地不被破解。"
 
 #: accountdialog.cpp:640
 msgid "Lea&ve fetched messages on the server"
@@ -315,9 +323,12 @@ msgstr "篩選信件，假如信件大於(&F)"
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
-msgstr "選擇這個選項表示使用 POP 過濾器來過濾信件。您可以選擇要下載、刪除還是保留在伺服器上。"
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
+msgstr ""
+"選擇這個選項表示使用 POP 過濾器來過濾信件。您可以選擇要下載、刪除還是保留在伺"
+"服器上。"
 
 #: accountdialog.cpp:737
 msgid "Chec&k interval:"
@@ -366,13 +377,15 @@ msgstr "明碼(&X)"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "LOGIN(&L)"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "PLAIN(&PLAIN)"
 
@@ -415,12 +428,13 @@ msgstr "命名空間"
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
-"您在這裡可以看到您的 IMAP "
-"伺服器上的不同的命名空間(namespace)。每一個都代表不同的群組與資料夾。命名空間可以讓您在一個帳號中同時顯示個人資料夾與共用的資料夾。"
+"您在這裡可以看到您的 IMAP 伺服器上的不同的命名空間(namespace)。每一個都代表不"
+"同的群組與資料夾。命名空間可以讓您在一個帳號中同時顯示個人資料夾與共用的資料"
+"夾。"
 
 #: accountdialog.cpp:914
 msgid "Reload the namespaces from the server. This overwrites any changes."
@@ -477,10 +491,12 @@ msgstr "有需要才載入附加檔 (&M)"
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
-msgstr "如果您開啟這個選項，附加檔只有在您點選它的時候才會下載下來。這樣一些很大的信件也可以很快地顯示。"
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
+msgstr ""
+"如果您開啟這個選項，附加檔只有在您點選它的時候才會下載下來。這樣一些很大的信"
+"件也可以很快地顯示。"
 
 #: accountdialog.cpp:1009
 msgid "List only open folders"
@@ -490,7 +506,9 @@ msgstr "只列出已展開的資料夾"
 msgid ""
 "Only folders that are open (expanded) in the folder tree are checked for "
 "subfolders. Use this if there are many folders on the server."
-msgstr "只列出已展開的資料夾中的子目錄。如果您系統上有很多很多資料夾的話，就可以使用這個選項。"
+msgstr ""
+"只列出已展開的資料夾中的子目錄。如果您系統上有很多很多資料夾的話，就可以使用"
+"這個選項。"
 
 #: accountdialog.cpp:1044
 msgid "Include in manual mail chec&k"
@@ -518,7 +536,7 @@ msgstr "<無>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "收件匣"
 
@@ -526,36 +544,41 @@ msgstr "收件匣"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個功能是必要的。\n"
-"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
+"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個"
+"功能是必要的。\n"
+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
+"功能打開。"
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "這個伺服器不提供信件的標頭，但是如果您要過濾信件的話，這個功能是必要的。\n"
-"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
+"功能打開。"
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 "請注意，這個功能可能會導致一些不支援此功能的 POP3 伺服器送信時發生問題。\n"
 "您可以用「檢查伺服器提供的協定」來看看這個伺服器有沒有提供此功能。\n"
-"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
+"功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
 msgid "Please specify a server and port on the General tab first."
@@ -563,39 +586,43 @@ msgstr "請先在「一般」頁中指定伺服器與連接埠號。"
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 "這個伺服器似乎不支援管線下載功能，所以此功能已被關閉。\n"
-"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
+"功能打開。只是建議您先送一些測試信件來確保不會發生問題。"
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
-"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個功能是必要的。\n"
-"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
+"這個伺服器似乎不支援單一的信件編號，但是如果您要將信件留在伺服器上的話，這個"
+"功能是必要的。\n"
+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
+"功能打開。"
 
 #: accountdialog.cpp:1672
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 "這個伺服器不提供信件的標頭，但是如果您要過濾信件的話，這個功能是必要的。\n"
-"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個功能打開。"
+"不過有些伺服器可能也搞不清楚它們到底有沒有支援這個功能，您還是可以試試將這個"
+"功能打開。"
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
@@ -669,8 +696,8 @@ msgstr "IMAP 帳號"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr "您必須在設定的網路區段中加入一個帳號才可接收信件。"
 
 #: accountwizard.cpp:87
@@ -707,10 +734,12 @@ msgstr "歡迎使用 KMail"
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
-msgstr "<qt>您似乎是第一次使用 KMail。您可以利用這個精靈來設定您的信件帳號。您只要輸入連線的資料即可。</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
+msgstr ""
+"<qt>您似乎是第一次使用 KMail。您可以利用這個精靈來設定您的信件帳號。您只要輸"
+"入連線的資料即可。</qt>"
 
 #: accountwizard.cpp:200
 msgid "Welcome"
@@ -772,8 +801,7 @@ msgstr "使用本地目錄"
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, no-c-format
 msgid "None"
 msgstr "無"
@@ -909,21 +937,22 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
-msgstr ""
-"<p>在這裡您可以設定 KMail 的一些過濾規則，以使用常見的防毒工具。</p>"
-"<p>這個精靈可以偵測這些工具，並產生過濾規則，來協助隔離病毒信件。這個精靈將不會影響已經存在的過濾規則，它會把新的規則放到最後面。</p>"
-"<p><b>警告：</b>KMail 在掃毒的過程中可能會停止一段時間沒有回應，因為掃毒通常都很耗時。如果經常發生這種狀況，您可能要考慮將這些規則拿掉。</p>"
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
+msgstr ""
+"<p>在這裡您可以設定 KMail 的一些過濾規則，以使用常見的防毒工具。</p><p>這個精"
+"靈可以偵測這些工具，並產生過濾規則，來協助隔離病毒信件。這個精靈將不會影響已"
+"經存在的過濾規則，它會把新的規則放到最後面。</p><p><b>警告：</b>KMail 在掃毒"
+"的過程中可能會停止一段時間沒有回應，因為掃毒通常都很耗時。如果經常發生這種狀"
+"況，您可能要考慮將這些規則拿掉。</p>"
 
 #: antispamwizard.cpp:919
 msgid ""
@@ -955,13 +984,12 @@ msgstr "將不確定信移到(&P)："
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
-"不確定信的預設去處為收件匣，不過您可以改變它。"
-"<p>不是所有的偵測軟體都有「標記為不確定(unsure)」的功能，如果您選擇的工具沒有這個功能，您就無法選擇資料夾。"
+"不確定信的預設去處為收件匣，不過您可以改變它。<p>不是所有的偵測軟體都有「標記"
+"為不確定(unsure)」的功能，如果您選擇的工具沒有這個功能，您就無法選擇資料夾。"
 
 #: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
@@ -971,9 +999,11 @@ msgstr "使用防毒軟體檢查信件"
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
-msgstr "讓防毒軟體檢查您的信件。這個精靈會產生適當的過濾規則來執行防毒。信件會經由防毒工具標記，並透過過濾規則來隔離到特定的資料夾。"
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
+msgstr ""
+"讓防毒軟體檢查您的信件。這個精靈會產生適當的過濾規則來執行防毒。信件會經由防"
+"毒工具標記，並透過過濾規則來隔離到特定的資料夾。"
 
 #: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
@@ -982,9 +1012,11 @@ msgstr "將所有標記為病毒的信件移入特定資料夾"
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
-msgstr "已產生一個新的過濾規則，將標記為病毒的信件搬到特定的資料夾中。預設的去處為資源回收桶，但您可以改變它。"
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
+msgstr ""
+"已產生一個新的過濾規則，將標記為病毒的信件搬到特定的資料夾中。預設的去處為資"
+"源回收桶，但您可以改變它。"
 
 #: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
@@ -992,8 +1024,8 @@ msgstr "另外，將標記為病毒的信件標為已讀"
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr "將標記為病毒的信件搬移到資料夾的同時標記成已讀。"
 
 #: archivefolderdialog.cpp:48
@@ -1171,7 +1203,9 @@ msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
 "communication is here:"
-msgstr "這有可能是您在伺服器上的權限不足，或試圖建立已存在的資料夾。從伺服器上傳來的錯誤訊息為："
+msgstr ""
+"這有可能是您在伺服器上的權限不足，或試圖建立已存在的資料夾。從伺服器上傳來的"
+"錯誤訊息為："
 
 #: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
@@ -1184,8 +1218,8 @@ msgstr "從伺服器上讀取資料夾 %1 時發生錯誤："
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1205,8 +1239,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1237,16 +1271,20 @@ msgstr "已刪除"
 #: callback.cpp:216
 #, fuzzy
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
-msgstr "<qt>收件人中沒有一個符合您所設定的身份。<br>請從以下的地址中選擇您的電子郵件地址："
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
+msgstr ""
+"<qt>收件人中沒有一個符合您所設定的身份。<br>請從以下的地址中選擇您的電子郵件"
+"地址："
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
-msgstr "<qt>有一個以上的收件人符合您所設定的身份。<br>請從以下的地址中選擇您的電子郵件地址："
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
+msgstr ""
+"<qt>有一個以上的收件人符合您所設定的身份。<br>請從以下的地址中選擇您的電子郵"
+"件地址："
 
 #: callback.cpp:233
 msgid "Select Address"
@@ -1275,15 +1313,21 @@ msgstr "整理資料夾 %1 時發生錯誤。動作已取消。"
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
-msgstr "<qt><p>這個設定已經被您的管理者修改過。</p><p>如果您覺得有問題，請與他聯絡。</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
+msgstr ""
+"<qt><p>這個設定已經被您的管理者修改過。</p><p>如果您覺得有問題，請與他聯絡。"
+"</p></qt>"
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "載入設定檔(&L)..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "設定帳號"
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "新增(&A)..."
@@ -1313,6 +1357,11 @@ msgstr "<qt>您確定要移除名為 <b>%1</b> 的身份？</qt>"
 msgid "Remove Identity"
 msgstr "移除身份(&R)"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "移除(&E)..."
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "新增..."
@@ -1321,6 +1370,11 @@ msgstr "新增..."
 msgid "Modify..."
 msgstr "修改..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "移除(&E)..."
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "設成預設"
@@ -1337,17 +1391,15 @@ msgstr "送信(&S)"
 msgid "Outgoing accounts (add at least one):"
 msgstr "發信帳號（至少新增一個帳號）："
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "名稱"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "類型"
@@ -1369,8 +1421,7 @@ msgstr "設成預設"
 msgid "Common Options"
 msgstr "一般選項"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "傳送前先確認(&B)"
@@ -1421,14 +1472,14 @@ msgstr "預設域名(&T)："
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr "<qt><p>預設域名是用來補齊所輸入的電子郵件地址。</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%2 %1"
 
@@ -1446,9 +1497,9 @@ msgstr "新增送信帳號"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (預設)"
 
@@ -1527,6 +1578,10 @@ msgstr "修改帳號"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>無法找到帳號 <b>%1</b>。</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "顏色(&S)"
@@ -1635,8 +1690,7 @@ msgstr "已瀏覽過的 URL 連結"
 msgid "Misspelled Words"
 msgstr "拼錯的字"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "新的信件"
@@ -1824,8 +1878,8 @@ msgstr "同主題排列預設關閉"
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr "展開內含有新的、未讀的、或是有重要信件的討論串(&W)"
 
 #: configuredialog.cpp:2055
@@ -1834,67 +1888,46 @@ msgstr "日期顯示"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
-msgstr ""
-"<qt>"
-"<p><strong>以下表示法用於表示日期：</strong></p> "
-"<ul>"
-"<li>d - 日 (不含開頭的 0) (1-31)</li>"
-"<li>dd - 日 (含開頭的 0)(01-31)</li>"
-"<li>ddd - 縮寫星期幾</li>"
-"<li>dddd - 完整表示星期幾</li>"
-"<li>M - 月 (不含開頭的 0) (1-12)</li>"
-"<li>MM - 月 (含開頭的 0) (01-12)</li>"
-"<li>MMM - 縮寫月份</li>"
-"<li>MMMM - 完整表示月份</li>"
-"<li>yy - 年份後兩碼</li>"
-"<li>yyyy - 完整表示年份</li></li>"
-"<p><strong>以下表示法用於表示時間：</strong></p>"
-"<ul>"
-"<li>h - 時 (不含開頭的 0) (0-23 或 1-12)</li>"
-"<li>hh - 時 (含開頭的 0) (00-23 或 01-12) </li>"
-"<li>m - 分 (不含開頭的 0) (0-59)</li>"
-"<li>mm - 分 (含開頭的 0) (00-59)</li>"
-"<li>s - 秒 (不含開頭的 0) (0-59)</li>"
-"<li>ss - 秒 (含開頭的 0) (00-59)</li>"
-"<li>z - 毫秒 (不含開頭的 0) (0-999)</li>"
-"<li>zzz - 毫秒 (含開頭的 0) (000-999)</li>"
-"<li>AP - 顯示上午或下午。AP會被取代為 AM 或 PM</li>"
-"<li>ap - 同 AP 但為小寫</li>"
-"<li>Z - 時區 (以數字顯示，如 +0800)</li></ul>"
-"<p><strong>其他的輸入字元都會被忽略</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
+msgstr ""
+"<qt><p><strong>以下表示法用於表示日期：</strong></p> <ul><li>d - 日 (不含開頭"
+"的 0) (1-31)</li><li>dd - 日 (含開頭的 0)(01-31)</li><li>ddd - 縮寫星期幾</"
+"li><li>dddd - 完整表示星期幾</li><li>M - 月 (不含開頭的 0) (1-12)</li><li>MM "
+"- 月 (含開頭的 0) (01-12)</li><li>MMM - 縮寫月份</li><li>MMMM - 完整表示月份"
+"</li><li>yy - 年份後兩碼</li><li>yyyy - 完整表示年份</li></li><p><strong>以下"
+"表示法用於表示時間：</strong></p><ul><li>h - 時 (不含開頭的 0) (0-23 或 "
+"1-12)</li><li>hh - 時 (含開頭的 0) (00-23 或 01-12) </li><li>m - 分 (不含開頭"
+"的 0) (0-59)</li><li>mm - 分 (含開頭的 0) (00-59)</li><li>s - 秒 (不含開頭的 "
+"0) (0-59)</li><li>ss - 秒 (含開頭的 0) (00-59)</li><li>z - 毫秒 (不含開頭的 "
+"0) (0-999)</li><li>zzz - 毫秒 (含開頭的 0) (000-999)</li><li>AP - 顯示上午或"
+"下午。AP會被取代為 AM 或 PM</li><li>ap - 同 AP 但為小寫</li><li>Z - 時區 (以"
+"數字顯示，如 +0800)</li></ul><p><strong>其他的輸入字元都會被忽略</strong></"
+"p></qt>"
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "改變全域的同主題討論串設定，將會覆蓋過個別資料夾之前的同主題設定。"
 
 #: configuredialog.cpp:2221
@@ -1909,8 +1942,7 @@ msgstr "顯示 HTML 狀態列 (&U)"
 msgid "Show s&pam status in fancy headers"
 msgstr "使用花俏格式顯示垃圾信判定狀態(&P)"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "使用表情符號"
@@ -1919,8 +1951,7 @@ msgstr "使用表情符號"
 msgid "Use smaller font for quoted text"
 msgstr "引言使用較小的字型"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "顯示展開/折疊引言符號"
@@ -1946,8 +1977,7 @@ msgstr "自動"
 msgid "&Override character encoding:"
 msgstr "預設編碼設定(&O)："
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "系統閘通知"
@@ -2049,20 +2079,18 @@ msgstr "<b>%f</b> 將取代為待編輯的檔名。"
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>回覆片語中支援下列保留符號："
-"<br> <b>%D</b>=日期，<b>%S</b>=主題，"
-"<br> <b>%e</b>=寄件者位址，<b>%F</b>=寄件者姓名，%f</b>=寄件者姓氏，"
-"<br> <b>%T</b>=收件者姓名，<b>%t</b>=收件者姓名及位址，"
-"<br> <b>%C</b>=複本收件者姓名，<b>%c</b>=複本收件者姓名及位址，"
-"<br> <b>%%</b>=百分比符號，<b>%_</b>=空格，<b>%L</b>=換行</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>回覆片語中支援下列保留符號：<br> <b>%D</b>=日期，<b>%S</b>=主題，<br> <b>"
+"%e</b>=寄件者位址，<b>%F</b>=寄件者姓名，%f</b>=寄件者姓氏，<br> <b>%T</b>=收"
+"件者姓名，<b>%t</b>=收件者姓名及位址，<br> <b>%C</b>=複本收件者姓名，<b>%c</"
+"b>=複本收件者姓名及位址，<br> <b>%%</b>=百分比符號，<b>%_</b>=空格，<b>%L</"
+"b>=換行</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2085,21 +2113,20 @@ msgstr "全部回覆(&Y)："
 msgid "&Forward:"
 msgstr "轉寄(&F)："
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "引文符號(&Q)："
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "在 %D，您寫道:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "在 %D，%F 寫道:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "已轉寄訊息"
 
@@ -2137,8 +2164,8 @@ msgstr "輸入新的轉寄前置文字："
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr "這個列表將會由上而下的檢查每封寄出信件的字元集內含所有要求的字元"
 
 #: configuredialog.cpp:3278
@@ -2173,10 +2200,9 @@ msgstr "數值"
 msgid "Ne&w"
 msgstr "新的(&W)"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "名稱(&N)："
@@ -2185,16 +2211,15 @@ msgstr "名稱(&N)："
 msgid "&Value:"
 msgstr "數值(&V)："
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "與 Outlook 相容的附檔命名方式"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr "這個選項是確保 Outlook 在非英語字元集的信件中認得附檔。"
 
 #: configuredialog.cpp:3595
@@ -2221,15 +2246,16 @@ msgstr "attached"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
-"您已經選擇使用 Outlook(tm) 可認得的附加檔名稱，要注意其他的收發信軟體可能會不認得附加檔。\n"
+"您已經選擇使用 Outlook(tm) 可認得的附加檔名稱，要注意其他的收發信軟體可能會不"
+"認得附加檔。\n"
 "所以，除非是不得已，否則不建議您開啟這個選項。"
 
 #: configuredialog.cpp:3682
@@ -2254,88 +2280,79 @@ msgstr "加密後端(&N)"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>有時信件中會同時含有 HTML 與純文字格式。這個選項讓您選擇您要顯示哪一部份。</p> "
-"<p>顯示 HTML 部份會比較好看，不過會有安全上的風險。</p> "
-"<p>顯示純文字部份有可能會把格式打亂，但是安全性相對提高許多。</p> "
-"<p>雖然目前已經設法解決一些安全上的問題，但是還是有可能有其他目前尚未被發現的安全漏洞存在。</p> "
-"<p>因此，建議<em>不要</em>開啟 HTML 預覽。</p> "
-"<p><b>注意：</b>您可以針對每個資料夾，在 KMail 的<i>資料夾</i>設定目錄中做不同的設定。</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>有時信件中會同時含有 HTML 與純文字格式。這個選項讓您選擇您要顯示哪一部"
+"份。</p> <p>顯示 HTML 部份會比較好看，不過會有安全上的風險。</p> <p>顯示純文"
+"字部份有可能會把格式打亂，但是安全性相對提高許多。</p> <p>雖然目前已經設法解"
+"決一些安全上的問題，但是還是有可能有其他目前尚未被發現的安全漏洞存在。</p> "
+"<p>因此，建議<em>不要</em>開啟 HTML 預覽。</p> <p><b>注意：</b>您可以針對每個"
+"資料夾，在 KMail 的<i>資料夾</i>設定目錄中做不同的設定。</p></qt>"
 
 #: configuredialog.cpp:3754
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>有些垃圾信件是用 HTML 格式，並且內含一些從遠端載入的圖片，如此發信者可以確定收件人有開啟該封信件。(這又稱之為&quot;web "
-"bugs&quot;)。</p> "
-"<p>不過實際上他們可以把圖檔直接夾在信件中，我們實在沒有理由讓發信者這樣浪費網路頻寬。</p> "
-"<p>因此，在 KMail 顯示設定中，預設是將遠端載入圖片的功能關閉的。</p>"
-"<p>您還是可以選擇將這個功能打開。</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>有些垃圾信件是用 HTML 格式，並且內含一些從遠端載入的圖片，如此發信者可"
+"以確定收件人有開啟該封信件。(這又稱之為&quot;web bugs&quot;)。</p> <p>不過實"
+"際上他們可以把圖檔直接夾在信件中，我們實在沒有理由讓發信者這樣浪費網路頻寬。"
+"</p> <p>因此，在 KMail 顯示設定中，預設是將遠端載入圖片的功能關閉的。</p><p>"
+"您還是可以選擇將這個功能打開。</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<h3>信件處理通知(MDN)</h3>"
-"<p>MDN 有點像張收據。發信人在信件中加入 MDN，而收信人的收信軟體會發出一個通知給發信人，告訴發信人這封信是被收件人如何處理。通常處理的方式包括：<b>"
-"被顯示</b>（也就是被開啟）、<b>被刪除</b>以及<b>被發送</b>（也就是被轉寄）。</p> "
-"<p>KMail 可以依如下選項選擇要如何回應 MDN：</p> "
-"<ul>"
-"<li><em>忽略</em>：忽略任何 MDN 的要求。KMail 不會回覆任何 MDN 要求。（建議選項）</li> "
-"<li><em>詢問使用者</em>：詢問使用者是否要回覆 MDN。</li> "
-"<li><em>回覆拒絕</em>：對所有 MDN 都回覆<b>拒絕</b>(denied)。這其實只比「自動回覆」要好<em>一點點</em>"
-"而已，KMail 還是會對每個 MDN 都做回覆，只是發信人分不出這封信是被開啟還是直接被刪除。</li> "
-"<li><em>自動回覆</em>：系統會自動回覆 "
-"MDN。我們完全不建議使用這個選項，但是因為這對處理顧客回應之類的事情是有作用的，所以還是讓您選擇。</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
+msgstr ""
+"<qt><h3>信件處理通知(MDN)</h3><p>MDN 有點像張收據。發信人在信件中加入 MDN，而"
+"收信人的收信軟體會發出一個通知給發信人，告訴發信人這封信是被收件人如何處理。"
+"通常處理的方式包括：<b>被顯示</b>（也就是被開啟）、<b>被刪除</b>以及<b>被發送"
+"</b>（也就是被轉寄）。</p> <p>KMail 可以依如下選項選擇要如何回應 MDN：</p> "
+"<ul><li><em>忽略</em>：忽略任何 MDN 的要求。KMail 不會回覆任何 MDN 要求。（建"
+"議選項）</li> <li><em>詢問使用者</em>：詢問使用者是否要回覆 MDN。</li> "
+"<li><em>回覆拒絕</em>：對所有 MDN 都回覆<b>拒絕</b>(denied)。這其實只比「自動"
+"回覆」要好<em>一點點</em>而已，KMail 還是會對每個 MDN 都做回覆，只是發信人分"
+"不出這封信是被開啟還是直接被刪除。</li> <li><em>自動回覆</em>：系統會自動回"
+"覆 MDN。我們完全不建議使用這個選項，但是因為這對處理顧客回應之類的事情是有作"
+"用的，所以還是讓您選擇。</li></ul></qt>"
 
 #: configuredialog.cpp:3800
 msgid "HTML Messages"
@@ -2351,14 +2368,15 @@ msgstr "允許從遠端下載連結"
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
-"<b>警告：</b> 在信件中使用 HTML 將會使你更容易受到的攻擊， 並且有可能會增加你的系統被其他已存在和將來的安全漏洞危害的機會。 請參閱<a "
-"href=\"whatsthis:%1\">關於 HTML 信件...</a>，<a href=\"whatsthis:%2\">關於遠端連結...</a>"
-"，取得選項進一步的資訊。"
+"<b>警告：</b> 在信件中使用 HTML 將會使你更容易受到的攻擊， 並且有可能會增加你"
+"的系統被其他已存在和將來的安全漏洞危害的機會。 請參閱<a href=\"whatsthis:"
+"%1\">關於 HTML 信件...</a>，<a href=\"whatsthis:%2\">關於遠端連結...</a>，取"
+"得選項進一步的資訊。"
 
 #: configuredialog.cpp:3824
 msgid "Encrypted Messages"
@@ -2417,7 +2435,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<b>警告：</b> 無條件的傳回確認，將會逐漸的破壞你的隱私。請參閱<a href=\"whatsthis:%1\">相關文件</a>取得更進一步的資訊。"
+"<b>警告：</b> 無條件的傳回確認，將會逐漸的破壞你的隱私。請參閱<a href="
+"\"whatsthis:%1\">相關文件</a>取得更進一步的資訊。"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2436,8 +2455,7 @@ msgstr "改變全域的 HTML 設定，將會覆蓋掉所有資料夾之前的設
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "這個選項需要 dirmngr 版本 >= 0.9.0"
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr "沒有 proxy"
@@ -2466,8 +2484,8 @@ msgstr "標記為重要的信件永不過期(&X)"
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "尋找未讀信件時："
 
@@ -2491,8 +2509,8 @@ msgstr "循環檢查所有的資料夾(&L)"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "進入資料夾時："
 
@@ -2561,22 +2579,19 @@ msgstr "目錄 (maildir 格式)"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>這個選項決定預設的資料夾格式：</p> "
-"<p><b>mbox:</b>每個資料夾用一個檔案來表示。檔案中用 From: "
-"標頭來區隔每封信。這樣比較節省空間，但是在不同資料夾間搬移信件時比較麻煩。</p> "
-"<p><b>maildir:</b>每個資料夾在硬碟中都有一個目錄。每一封信都用一個檔案。這樣比較佔硬碟空間，但是比較簡單省事。</p></qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
+msgstr ""
+"<qt><p>這個選項決定預設的資料夾格式：</p> <p><b>mbox:</b>每個資料夾用一個檔案"
+"來表示。檔案中用 From: 標頭來區隔每封信。這樣比較節省空間，但是在不同資料夾間"
+"搬移信件時比較麻煩。</p> <p><b>maildir:</b>每個資料夾在硬碟中都有一個目錄。每"
+"一封信都用一個檔案。這樣比較佔硬碟空間，但是比較簡單省事。</p></qt>"
 
 #: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
@@ -2609,44 +2624,38 @@ msgstr "GB"
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>當要跳到下一封未讀信件時，如果找不到未讀信件：</p> "
-"<p><b>不做循環檢查：</b>在找完目前資料夾後，就停止尋找。</p> "
-"<p><b>循環檢查目前的資料夾：</b>從目前資料夾的第一封繼續尋找，但不會跳到其他的資料夾去。</p> "
-"<p><b>循環檢查所有的資料夾：</b>跳到其他的資料夾的第一封開始尋找。</p> "
-"<p>同樣的，如果往前找到第一封信之後，它會看選項決定是要在同一個資料夾的最後一封信繼續往前找，還是跳下一個資料夾的最後一封信，還是就停止找尋。</p>"
-"</qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
+msgstr ""
+"<qt><p>當要跳到下一封未讀信件時，如果找不到未讀信件：</p> <p><b>不做循環檢"
+"查：</b>在找完目前資料夾後，就停止尋找。</p> <p><b>循環檢查目前的資料夾：</b>"
+"從目前資料夾的第一封繼續尋找，但不會跳到其他的資料夾去。</p> <p><b>循環檢查所"
+"有的資料夾：</b>跳到其他的資料夾的第一封開始尋找。</p> <p>同樣的，如果往前找"
+"到第一封信之後，它會看選項決定是要在同一個資料夾的最後一封信繼續往前找，還是"
+"跳下一個資料夾的最後一封信，還是就停止找尋。</p></qt>"
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>全文檢索可以在搜尋信件內容時變得快很多，搜尋工具列也可以依據信件內容來選擇信件。</p> "
-"<p>不過要建立索引會佔用不少硬碟空間(大約要信件大小的一半)。</p>"
-"<p>開啟這個選項後，要建立索引，不過建索引的同時您可以繼續使用 KMail。</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
+msgstr ""
+"<qt><p>全文檢索可以在搜尋信件內容時變得快很多，搜尋工具列也可以依據信件內容來"
+"選擇信件。</p> <p>不過要建立索引會佔用不少硬碟空間(大約要信件大小的一半)。</"
+"p><p>開啟這個選項後，要建立索引，不過建索引的同時您可以繼續使用 KMail。</p></"
+"qt>"
 
 #: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
@@ -2712,8 +2721,8 @@ msgstr "隱藏群組資料夾(&H)"
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr "勾選這個選項，您就看不到 IMAP 的資源資料夾。"
 
 #: configuredialog.cpp:4909
@@ -2722,8 +2731,8 @@ msgstr "只顯示此帳號的群組資料夾(&O)："
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr "勾選這個選項，您就看不到設定為群組的此帳號的一般郵件資料夾。"
 
 #: configuredialog.cpp:4921
@@ -2776,22 +2785,22 @@ msgid ""
 "Turn this option on to send groupware invitations and replies in an Exchange "
 "compatible way."
 msgstr ""
-"Microsoft Outlook 在與 Microsoft Exchange 伺服器一起使用時，會有個關於解讀群組電子郵件的問題。開啟此選項則會以 "
-"Microsoft Exchange 瞭解的方式來送出群組邀請函。"
+"Microsoft Outlook 在與 Microsoft Exchange 伺服器一起使用時，會有個關於解讀群"
+"組電子郵件的問題。開啟此選項則會以 Microsoft Exchange 瞭解的方式來送出群組邀"
+"請函。"
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "與 Outlook 相容的附檔命名方式"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "自動送出邀請函"
@@ -2804,18 +2813,19 @@ msgstr "這個選項打開的話，會自動送出邀請函，使用者不會看
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
-"<qt>邀請函(invitiations) 通常是用附檔的方式傳送的。這個選項可以讓您把邀請函改成直接用信件內文來傳送。如果對方是用 Microsoft "
-"Outlook，那麼傳送邀請函與回覆就必需用這種方式。"
-"<br> 不過，使用這種方式，其他軟體收信的人就有可能看到一團糟的東西。</qt>"
+"<qt>邀請函(invitiations) 通常是用附檔的方式傳送的。這個選項可以讓您把邀請函改"
+"成直接用信件內文來傳送。如果對方是用 Microsoft Outlook，那麼傳送邀請函與回覆"
+"就必需用這種方式。<br> 不過，使用這種方式，其他軟體收信的人就有可能看到一團糟"
+"的東西。</qt>"
 
 #: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
@@ -2919,23 +2929,22 @@ msgstr "轉寄"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>您可以在此新增、編輯與刪除自訂信件樣本，以用於編寫回覆或轉寄信件。用滑鼠右鍵選擇按鍵選單或工具列選單以建立自訂樣本。此外，您也可以指定樣本的組合鍵以提高效"
-"率。</p> "
-"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
-"<p>有四種型態的自訂樣本：<i>回覆</i>、<i>全部回覆</i>、<i>轉寄</i>與<i>通用</i>。您無法指定<i>通用</i>的樣本。"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
+msgstr ""
+"<qt><p>您可以在此新增、編輯與刪除自訂信件樣本，以用於編寫回覆或轉寄信件。用滑"
+"鼠右鍵選擇按鍵選單或工具列選單以建立自訂樣本。此外，您也可以指定樣本的組合鍵"
+"以提高效率。</p> <p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</"
+"i>即可。</p> <p>有四種型態的自訂樣本：<i>回覆</i>、<i>全部回覆</i>、<i>轉寄</"
+"i>與<i>通用</i>。您無法指定<i>通用</i>的樣本。"
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
@@ -2952,15 +2961,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3028,9 +3037,11 @@ msgstr "編輯方式："
 #: editorwatcher.cpp:161
 #, fuzzy
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
-msgstr "KMail 無法偵測到選取的編輯器會在何時關閉。為了避免資料遺失，將會中止編輯附件。"
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
+msgstr ""
+"KMail 無法偵測到選取的編輯器會在何時關閉。為了避免資料遺失，將會中止編輯附"
+"件。"
 
 #: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
@@ -3270,6 +3281,11 @@ msgstr "選擇過濾器"
 msgid "Filters"
 msgstr "過濾器"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "選取所有文字"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3299,8 +3315,8 @@ msgstr "紀錄過濾的動作(&L)"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr "您可以打開過濾紀錄功能。打開後過濾信件都將會有紀錄。"
 
 #: filterlogdlg.cpp:83
@@ -3317,11 +3333,14 @@ msgstr "紀錄過濾規則比對計算(&R)"
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
-msgstr "您可以控制要怎麼紀錄過濾的動作：這個選項打開後會紀錄跟每一個規則比對的結果，否則就只紀錄符合的規則。"
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
+msgstr ""
+"您可以控制要怎麼紀錄過濾的動作：這個選項打開後會紀錄跟每一個規則比對的結果，"
+"否則就只紀錄符合的規則。"
 
 #: filterlogdlg.cpp:112
 msgid "Log filter pattern evaluation"
@@ -3341,11 +3360,13 @@ msgstr "不限制"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
-msgstr "要紀錄過濾資料需要使用記憶體，這裡您可以限制使用記憶體的大小。如果超過的話，會將最舊的紀錄丟棄。"
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
+msgstr ""
+"要紀錄過濾資料需要使用記憶體，這裡您可以限制使用記憶體的大小。如果超過的話，"
+"會將最舊的紀錄丟棄。"
 
 #: filterlogdlg.cpp:258
 msgid ""
@@ -3355,7 +3376,7 @@ msgstr ""
 "無法寫入檔案 %1：\n"
 "%2 中有錯誤描述。"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail 錯誤"
@@ -3396,10 +3417,12 @@ msgstr "使用者身份(&U)："
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
-msgstr "使用者身份是要登入 IMAP 伺服器的身份。可以是簡單的使用者名稱，或是整個電子信件地址。您登入的 IMAP 伺服器會告訴你要用哪一個。"
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
+msgstr ""
+"使用者身份是要登入 IMAP 伺服器的身份。可以是簡單的使用者名稱，或是整個電子信"
+"件地址。您登入的 IMAP 伺服器會告訴你要用哪一個。"
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
 msgid "Se&lect..."
@@ -3450,8 +3473,8 @@ msgstr "您沒有權限讀寫資源回收桶。"
 #: folderdiaacltab.cpp:435
 #, fuzzy
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr "尚未從伺服器上取得資訊。請使用「檢查信件」。"
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3462,8 +3485,7 @@ msgstr "錯誤：這個資料夾沒有定義 IMAP 帳號"
 msgid "Connecting to server %1, please wait..."
 msgstr "連接到伺服器 %1。請稍候..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "無法連接至伺服器 %1"
@@ -3489,8 +3511,8 @@ msgstr "新增權限"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr "您確定要移除您對這個資料夾的權限嗎？此後您就無法再存取這個資料夾了。"
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3520,7 +3542,7 @@ msgstr "使用量："
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "本地資料夾"
@@ -3544,9 +3566,9 @@ msgstr "選擇資料夾捷徑"
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr "<qt>按底下的按鈕，並按下您要設定的熱鍵。</qt>"
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3567,10 +3589,21 @@ msgstr "取消(&A)"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
-msgstr "<qt>您刪除的資料夾是帳號 <b>%1</b> 所設定的收件匣。刪除後這個帳號將會改用預設的收件匣。</qt>"
+msgstr ""
+"<qt>您刪除的資料夾是帳號 <b>%1</b> 所設定的收件匣。刪除後這個帳號將會改用預設"
+"的收件匣。</qt>"
+
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr "<qt><b>%1</b><br>總計：%2<br>未讀：%3<br>大小：%4"
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr "<br>容量限制：%1"
 
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
@@ -3693,39 +3726,13 @@ msgstr "垃圾信判讀狀態："
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>H<br>T<br>M<br>L<br> <br>信<br>件</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
 msgstr "<qt><br>非<br> <br>H<br>T<br>M<br>L<br> <br>信<br>件</b></qt>"
 
 #: identitydialog.cpp:93
@@ -3738,17 +3745,12 @@ msgstr "您的姓名(&Y)："
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>您的姓名</h3>"
-"<p>這個欄位是您想要顯示在信件標頭中的名稱。</p> "
-"<p>如果空白，則標頭中只會顯示您的電子郵件地址。</p></qt>"
+"<qt><h3>您的姓名</h3><p>這個欄位是您想要顯示在信件標頭中的名稱。</p> <p>如果"
+"空白，則標頭中只會顯示您的電子郵件地址。</p></qt>"
 
 #: identitydialog.cpp:135
 msgid "Organi&zation:"
@@ -3756,16 +3758,12 @@ msgstr "組織(&Z)："
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>組織</h3>"
-"<p>如果您要在信件標頭中顯示您所工作的單位名稱，請填寫在這個欄位。</p>"
-"<p>這個欄位留空白並沒有影響。</p></qt>"
+"<qt><h3>組織</h3><p>如果您要在信件標頭中顯示您所工作的單位名稱，請填寫在這個"
+"欄位。</p><p>這個欄位留空白並沒有影響。</p></qt>"
 
 #: identitydialog.cpp:149
 msgid "&Email address:"
@@ -3774,19 +3772,14 @@ msgstr "電子郵件地址(&E)："
 #: identitydialog.cpp:151
 #, fuzzy
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
-"<qt>"
-"<h3>電子郵件地址</h3>"
-"<p>這個欄位應填入您完整的電子郵件地址。</p>"
-"<p>如果填寫錯誤或留空白，收信人就無法回信給您了。</p></qt>"
+"<qt><h3>電子郵件地址</h3><p>這個欄位應填入您完整的電子郵件地址。</p><p>如果填"
+"寫錯誤或留空白，收信人就無法回信給您了。</p></qt>"
 
 #: identitydialog.cpp:165
 #, fuzzy
@@ -3795,21 +3788,12 @@ msgstr "電子郵件地址(&E)："
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>first.last@example.org</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>first@example.org"
-"<br>last@example.org</td></tr></table>"
-"<p>Type one alias address per line.</p></qt>"
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary address:</"
+"th><td>first.last@example.org</td></tr><tr><th>Aliases:</"
+"th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3832,17 +3816,15 @@ msgstr "選取將附加在信件後並用來簽署數位簽章的金鑰"
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt>"
-"<p>OpenPGP 金鑰會用來做數位簽章。您也可以使用 GnuPG 金鑰。</p> "
-"<p>這個欄位您可以留白，但 KMail 就無法簽署數位簽章。</p> "
-"<p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>OpenPGP 金鑰會用來做數位簽章。您也可以使用 GnuPG 金鑰。</p> <p>這個欄"
+"位您可以留白，但 KMail 就無法簽署數位簽章。</p> <p>更多詳細資料請參閱"
+"<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
@@ -3854,25 +3836,22 @@ msgstr "您的 OpenPGP 加密金鑰"
 
 #: identitydialog.cpp:218
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr "選取將附加在信件後並用來加密的金鑰"
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
-"<qt>"
-"<p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使用 GnuPG 金鑰。</p> "
-"<p>您可以將這個欄位留白，不過 KMail 就無法用 OpenPGP 加密。</p> "
-"<p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使"
+"用 GnuPG 金鑰。</p> <p>您可以將這個欄位留白，不過 KMail 就無法用 OpenPGP 加"
+"密。</p> <p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
@@ -3890,15 +3869,13 @@ msgstr "使用 S/MIME 憑證來簽署您的信件。"
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您選擇的 S/MIME (X.509) 憑證是用來簽署數位簽章的。</p> "
-"<p>您可以將這個欄位留白，但 KMail 就無法使用 S/MIME 來簽署您的信件。</p></qt>"
+"<qt><p>您選擇的 S/MIME (X.509) 憑證是用來簽署數位簽章的。</p> <p>您可以將這個"
+"欄位留白，但 KMail 就無法使用 S/MIME 來簽署您的信件。</p></qt>"
 
 #: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
@@ -3910,23 +3887,21 @@ msgstr "您的 S/MIME 加密憑證"
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr "選取將附加在信件後並用來加密的 S/MIME 憑證"
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使用 GnuPG 金鑰。</p> "
-"<p>您可以將這個欄位留白，不過 KMail 就無法用 S/MIME 加密。</p> "
-"<p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>您所選擇的 OpenPGP 金鑰會用來加密您的信件，並附在信件之後。您也可以使"
+"用 GnuPG 金鑰。</p> <p>您可以將這個欄位留白，不過 KMail 就無法用 S/MIME 加"
+"密。</p> <p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
 
 #: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
@@ -3946,20 +3921,16 @@ msgstr "回信地址(&R)："
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>回信地址</h3>"
-"<p>這用來設定信件中的 <tt>Reply-to:</tt> 標頭。</p> "
-"<p>如果您要讓回信送到跟發信不同的位置，您可以設定這個欄位。</p> "
-"<p>如果不懂得怎麼使用，請留白即可。</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>回信地址</h3><p>這用來設定信件中的 <tt>Reply-to:</tt> 標頭。</p> <p>"
+"如果您要讓回信送到跟發信不同的位置，您可以設定這個欄位。</p> <p>如果不懂得怎"
+"麼使用，請留白即可。</p></qt>"
 
 #: identitydialog.cpp:343
 msgid "&BCC addresses:"
@@ -3967,22 +3938,17 @@ msgstr "密件副本(&B)："
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
-msgstr ""
-"<qt>"
-"<h3>密件副本 (BCC)</h3>"
-"<p>您輸入在這個欄位中的電子郵件地址都將不會被顯示出來，因此其他收件人都不會看到。</p> "
-"<p>通常是用來發送信件備份給自己。</p> "
-"<p>若要發送給一個以上的地址，請用逗號隔開。</p> "
-"<p>如果不懂得怎麼使用，請留白即可。</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+msgstr ""
+"<qt><h3>密件副本 (BCC)</h3><p>您輸入在這個欄位中的電子郵件地址都將不會被顯示"
+"出來，因此其他收件人都不會看到。</p> <p>通常是用來發送信件備份給自己。</p> "
+"<p>若要發送給一個以上的地址，請用逗號隔開。</p> <p>如果不懂得怎麼使用，請留白"
+"即可。</p></qt>"
 
 #: identitydialog.cpp:361
 msgid "D&ictionary:"
@@ -4020,7 +3986,7 @@ msgstr "簽名(&S)"
 msgid "&Picture"
 msgstr "圖案(&P)"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 msgid "Invalid Email Address"
 msgstr "不合法的電子郵件地址"
 
@@ -4036,14 +4002,17 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"其中一個 OpenPGP 簽署金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。\n"
+"其中一個 OpenPGP 簽署金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址"
+"(%1)。\n"
 "這樣可能導致收件人確認數位簽章時會接獲警告。"
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
-msgstr "其中一個 OpenPGP 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。"
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
+msgstr ""
+"其中一個 OpenPGP 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址"
+"(%1)。"
 
 #: identitydialog.cpp:567
 msgid ""
@@ -4052,14 +4021,17 @@ msgid ""
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 msgstr ""
-"其中一個 S/MIME 簽署憑證未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。\n"
+"其中一個 S/MIME 簽署憑證未含有任何屬於這個身份的使用者代號與電子郵件地址"
+"(%1)。\n"
 "這樣可能導致收件人確認數位簽章時會接獲警告。"
 
 #: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
-msgstr "其中一個 S/MIME 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址(%1)。"
+msgstr ""
+"其中一個 S/MIME 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址"
+"(%1)。"
 
 #: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
@@ -4093,8 +4065,8 @@ msgstr "身份 %1 的自訂樣本資料夾不存在。將使用預設的樣本�
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (預設)"
 
@@ -4139,14 +4111,14 @@ msgstr "KMail 偵測到帳號 %1 有一個舊的，無法使用 IMAP 命名空�
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr "這些設定已經自動被變更，不過請您還是確認一下。"
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr "無法自動變更您舊的設定，請您確定您的設定。"
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4182,16 +4154,21 @@ msgstr "此資料夾內容大小已非常接近配額限制。（%1）"
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 "\n"
 "既然您沒有此資料夾的權限，請先詢問此資料夾的使用者是否願意放出一些空間。"
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "錯誤： %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr "連到伺服器 %1 時發生逾時或被關閉連線。將會嘗試自動重新連線。"
 
 #: imapaccountbase.cpp:965
@@ -4339,15 +4316,15 @@ msgstr "論壇檔案"
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr "您設定的 OpenPGP 加密金鑰或 S/MIME 憑證並未完全被信任做加密。"
 
 #: keyresolver.cpp:309
 #, fuzzy
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr "您設定的 OpenPGP 加密金鑰或 S/MIME 憑證並未完全被信任做加密。"
 
 #: keyresolver.cpp:315
@@ -4382,179 +4359,148 @@ msgstr "非完全信任的加密金鑰"
 #: keyresolver.cpp:642
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 OpenPGP 簽署金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
-"<p>將在 %n 天內到期。</p>"
+"<p>您的 OpenPGP 簽署金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
+"在 %n 天內到期。</p>"
 
 #: keyresolver.cpp:647
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
-"<p>將在 %n 天內到期。</p>"
+"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
+"在 %n 天內到期。</p>"
 
 #: keyresolver.cpp:652
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
-"<p>將在 %n 天內到期。</p>"
+"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
+"在 %n 天內到期。</p>"
 
 #: keyresolver.cpp:662
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root "
+"certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:669
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root "
+"certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:676
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</"
+"p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:684
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA "
-"certificate)</p> <p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 "
+"(intermediate CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天"
+"內到期</p>"
 
 #: keyresolver.cpp:691
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA "
-"certificate)</p> <p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 "
+"(intermediate CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天"
+"內到期</p>"
 
 #: keyresolver.cpp:698
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate "
+"CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:707
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 簽署憑證 </p><p align=center><b>%1</b> (序號 %2) </p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 簽署憑證 </p><p align=center><b>%1</b> (序號 %2) </p> <p>將在 "
+"%n 天內到期</p>"
 
 #: keyresolver.cpp:712
 #, fuzzy
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密憑證</p><p align=center><b>%1</b> (序號 %2) </p>"
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 加密憑證</p><p align=center><b>%1</b> (序號 %2) </p><p>將在 "
+"%n 天內到期</p>"
 
 #: keyresolver.cpp:717
 #, fuzzy
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
-"<p><p align=center><b>%1</b></p>"
-"<p>的 S/MIME 憑證（序號 %2） </p>"
-"<p>將在 %n 天內到期</p>"
+"<p><p align=center><b>%1</b></p><p>的 S/MIME 憑證（序號 %2） </p><p>將在 %n "
+"天內到期</p>"
 
 #: keyresolver.cpp:724
 #, fuzzy
@@ -4568,168 +4514,137 @@ msgstr "S/MIME 憑證即將過期失效"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 OpenPGP 簽署金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
-"<p>將在 %n 天內到期。</p>"
+"<p>您的 OpenPGP 簽署金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
+"在 %n 天內到期。</p>"
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
-"<p>將在 %n 天內到期。</p>"
+"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
+"在 %n 天內到期。</p>"
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> "
-"<p>將在 %n 天內到期。</p>"
+"<p>您的 OpenPGP 加密金鑰</p> <p align=center><b>%1</b>(KeyID 0x%2)</p> <p>將"
+"在 %n 天內到期。</p>"
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root "
+"certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root "
+"certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的根憑證 (root certificate)</"
+"p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA "
-"certificate)</p> <p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 簽署憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 "
+"(intermediate CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天"
+"內到期</p>"
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA "
-"certificate)</p> <p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 加密憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 "
+"(intermediate CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天"
+"內到期</p>"
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate CA certificate)</p> "
-"<p align=center><b>%3</b></p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 憑證 <b>%1</b> (序號 %2) 所使用的中介 CA 憑證 (intermediate "
+"CA certificate)</p> <p align=center><b>%3</b></p> <p>將在 %n 天內到期</p>"
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 簽署憑證 </p><p align=center><b>%1</b> (序號 %2) </p> "
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 簽署憑證 </p><p align=center><b>%1</b> (序號 %2) </p> <p>將在 "
+"%n 天內到期</p>"
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p>您的 S/MIME 加密憑證</p><p align=center><b>%1</b> (序號 %2) </p>"
-"<p>將在 %n 天內到期</p>"
+"<p>您的 S/MIME 加密憑證</p><p align=center><b>%1</b> (序號 %2) </p><p>將在 "
+"%n 天內到期</p>"
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
-"<p><p align=center><b>%1</b></p>"
-"<p>的 S/MIME 憑證（序號 %2） </p>"
-"<p>將在 %n 天內到期</p>"
+"<p><p align=center><b>%1</b></p><p>的 S/MIME 憑證（序號 %2） </p><p>將在 %n "
+"天內到期</p>"
 
 #: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
@@ -4741,13 +4656,15 @@ msgstr "S/MIME 憑證即將過期失效"
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"您設定的 OpenPGP 加密金鑰或 S/MIME 加密憑證無法用於加密。請到您的身份設定重新設定您的加密金鑰或憑證。\n"
+"您設定的 OpenPGP 加密金鑰或 S/MIME 加密憑證無法用於加密。請到您的身份設定重新"
+"設定您的加密金鑰或憑證。\n"
 "如果您要繼續，而稍後會需要加密時，系統會詢問您要使用哪個金鑰。"
 
 #: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
@@ -4762,7 +4679,8 @@ msgid ""
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
-"您設定的 OpenPGP 簽署金鑰或 S/MIME 簽署憑證無法用於簽署數位簽章。請到您的身份設定重新設定您的簽署金鑰或憑證。\n"
+"您設定的 OpenPGP 簽署金鑰或 S/MIME 簽署憑證無法用於簽署數位簽章。請到您的身份"
+"設定重新設定您的簽署金鑰或憑證。\n"
 "如果您要繼續，而稍後會需要簽署時，系統會詢問您要使用哪個金鑰。"
 
 #: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
@@ -4773,10 +4691,10 @@ msgstr "此金鑰無法用於簽署"
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "根據您的設定，信件應該至少對部份的收件人使用 OpenPGP 加密。\n"
 "但是，您並未對這個身份設定可信任的 OpenPGP 加密金鑰。\n"
@@ -4786,10 +4704,10 @@ msgstr ""
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 "根據您的設定，信件應該至少對部份的收件人使用 S/MIME 加密。\n"
 "但是，您並未對這個身份設定可信任的 OpenPGP 加密金鑰。\n"
@@ -4797,8 +4715,8 @@ msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4811,8 +4729,8 @@ msgstr "不使用 OpenPGP 簽署"
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4838,8 +4756,8 @@ msgstr "無法簽署信件"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr "您沒有選擇對自己加密的金鑰。您將無法解開您自己所寫的信件。"
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4859,8 +4777,8 @@ msgstr "您沒有選擇對此收件人使用之加密金鑰。信件將不會加
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr "您沒有選擇對任一收件人使用之加密金鑰。信件將不會加密。"
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4898,11 +4816,11 @@ msgstr "%1 的加密金鑰有問題。請重新選擇使用之金鑰。"
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr "%1 的加密金鑰不合法。請重新選擇使用之金鑰。"
 
 #: keyresolver.cpp:1687
@@ -4945,10 +4863,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "嚴重錯誤: 無法收取信件"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"無法新增訊息：\n"
+msgid "Failed to add message:\n"
+msgstr "無法新增訊息：\n"
 
 #: kmacctimap.cpp:300
 #, c-format
@@ -5034,6 +4950,50 @@ msgstr "離線式 IMAP(&D)"
 msgid "&Maildir mailbox"
 msgstr "Maildir 信箱 (&M)"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "設定信件主題。"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "傳送複本至 'address'。"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "傳送密件複本至 'address'。"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "將'header'加入信件"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "從'file'讀取信件內文。"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "設定信件內文。"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "增加信件附件，這可以重複。"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "只檢查新信件。"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "只開啟編寫器視窗。"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "顯示指定的信件檔案"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr "將信件送到'address'，並附上'URL'指向的檔案。"
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "信件"
@@ -5075,7 +5035,9 @@ msgstr "我的 %1"
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
-msgstr "KMail 將會在 %1 下產生群組資料夾。如果您不要，請按下取消，IMAP 資源將會被關閉。"
+msgstr ""
+"KMail 將會在 %1 下產生群組資料夾。如果您不要，請按下取消，IMAP 資源將會被關"
+"閉。"
 
 #: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
@@ -5087,10 +5049,12 @@ msgstr "%1：找到資料夾 %2，將會設定為主要的群組資料夾。"
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
-msgstr "<qt>Kmail 發現在 %1 中的下列群組資料夾，即將進行下列動作：%2<br> 如果您不要，請按下取消，IMAP 資源將會被關閉。"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
+msgstr ""
+"<qt>Kmail 發現在 %1 中的下列群組資料夾，即將進行下列動作：%2<br> 如果您不要，"
+"請按下取消，IMAP 資源將會被關閉。"
 
 #: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
@@ -5136,11 +5100,11 @@ msgstr "URL 已複製到剪貼簿。"
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>檔案 <b>%1</b> 已存在。<br>您是否要取代它？</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "存入檔案"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "取代(&R)"
 
@@ -5158,7 +5122,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "這封信件在儲存的同時被移除了，因此並未成功儲存。"
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5178,11 +5142,11 @@ msgstr "檔案中未含有任何信件。"
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "檔案中有一封以上的信件。將只顯示第一封。"
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
@@ -5191,65 +5155,65 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "過濾信件中"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "過濾 %1 封信件（共 %2 封）"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 msgid "Not enough free disk space?"
 msgstr "磁碟空間不足？"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "移至此資料夾"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "複製至此資料夾"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr "偵測到資料夾 %1 中有已損毀的 IMAP 快取。複製信件將中止。"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Moving messages"
 msgstr "移動信件中"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 msgid "Deleting messages"
 msgstr "刪除信件中"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "正在開啟 URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>您確定要執行 <b>%1</b>？</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 msgid "Execute"
 msgstr "執行"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 msgid "Found no attachments to save."
 msgstr "找不到附檔"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 msgid "Save Attachments To"
 msgstr "附檔儲存於"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "附檔一"
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
@@ -5257,47 +5221,47 @@ msgstr ""
 "附檔\n"
 "附檔.%1"
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "檔案 %1 已存在，您是否要取代它？"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr "檔案已存在"
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr "覆蓋(&O)"
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "%1 這部份的信件有經過加密。你想要存檔時繼續保持加密嗎？"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "KMail 問題"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 msgid "Keep Encryption"
 msgstr "保持加密"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "Do Not Keep"
 msgstr "不要加密"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "%1 這部份的信件有簽署。你想要存檔時保存原先的簽章嗎？"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 msgid "Keep Signature"
 msgstr "保存簽章"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -5306,19 +5270,19 @@ msgstr ""
 "無法寫入檔案 %1：\n"
 "%2"
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, c-format
 msgid "Could not write the file %1."
 msgstr "無法寫入檔案 %1。"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr "在通訊錄中找不到這個電子郵件地址。請將它加入通訊錄及您使用的聊天軟體。"
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -5328,59 +5292,60 @@ msgstr ""
 "%1\n"
 "無法決定要跟誰聊天。"
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr "Chiasmus 後端無法提供 x-obtain-keys 功能。請回報錯誤。"
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus 後端發生錯誤。"
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
-msgstr "Chiasmus 後端傳回錯誤：x-obtain-keys 功能並未傳回字串列表。請回報錯誤。"
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
+msgstr ""
+"Chiasmus 後端傳回錯誤：x-obtain-keys 功能並未傳回字串列表。請回報錯誤。"
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr "找不到金鑰。請確定 Chiasmus 有設定好金鑰的路徑。"
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "選擇 Chiasmus 解密金鑰"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus 後端未提供 x-decrypt 功能。請回報錯誤。"
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr "x-decrypt 功能不接受應有的參數。請回報錯誤。"
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus 解密錯誤"
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr "Chiasmus 後端傳回錯誤：x-decrypt 功能沒有傳回位元陣列。請回報錯誤。"
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -5390,7 +5355,7 @@ msgstr ""
 "收件人：%2\n"
 "主旨：%3"
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, c-format
 msgid "Mail: %1"
 msgstr "郵件：%1"
@@ -5489,7 +5454,7 @@ msgstr "大小"
 msgid "Encoding"
 msgstr "編碼"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 msgid "Compress"
 msgstr "壓縮"
 
@@ -5501,7 +5466,7 @@ msgstr "加密"
 msgid "Sign"
 msgstr "簽章"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 msgid "Name of the attachment:"
 msgstr "附件名稱："
 
@@ -5523,7 +5488,8 @@ msgstr "<主要收件者>"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr "<qt>這個欄位中的電子郵件地址都將收到這封信件的一份複本。</qt>"
 
 #: kmcomposewin.cpp:1052
@@ -5533,12 +5499,13 @@ msgstr "其他的收件者。"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
-"<qt>這個欄位中的電子郵件地址都將收到這封信件的一份複本。基本上這跟把所有地址都放在「<b>收件人</b>"
-"」是一樣的，但是放在這裡表示這些收件者收到的是複本，而不是主要的收件人。</qt>"
+"<qt>這個欄位中的電子郵件地址都將收到這封信件的一份複本。基本上這跟把所有地址"
+"都放在「<b>收件人</b>」是一樣的，但是放在這裡表示這些收件者收到的是複本，而不"
+"是主要的收件人。</qt>"
 
 #: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
@@ -5546,10 +5513,11 @@ msgstr "隱藏的收件者"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
-msgstr "<qt>跟放在複本欄位中一樣，但是在信件中看不到密件副本收件人的電子郵件地址與資料。</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
+msgstr ""
+"<qt>跟放在複本欄位中一樣，但是在信件中看不到密件副本收件人的電子郵件地址與資"
+"料。</qt>"
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
@@ -5559,7 +5527,7 @@ msgstr "傳送(&S)"
 msgid "&Send Mail Via"
 msgstr "傳送經由(&S)"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "稍後傳送(&L)"
@@ -5624,8 +5592,7 @@ msgstr "刪除引言符號(&M)"
 msgid "Cl&ean Spaces"
 msgstr "清除空間(&E)"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "使用固定寬度文字(&X)"
@@ -5766,31 +5733,31 @@ msgstr "信件加密格式(&C)"
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "標準"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr "列表(Disc)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr "列表(Circle)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr "列表(Square)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr "順序列表(數字)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr "順序列表(字母由小而大)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr "順序列表(字母由大而小)"
 
@@ -5891,8 +5858,8 @@ msgstr "關閉信件編輯器"
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 "您似乎打算在信中附加檔案，但是忘了這麼做。\n"
@@ -5902,42 +5869,45 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "提醒附加檔"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 msgid "&Send as Is"
 msgstr "就這樣送吧(&S)"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
-msgstr "<qt> <p>KMail 無法辨識附加檔位置：(%1)</p> <p>您必須指定完整的路徑。</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
+msgstr ""
+"<qt> <p>KMail 無法辨識附加檔位置：(%1)</p> <p>您必須指定完整的路徑。</p></qt>"
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr "<qt><p>您的管理者不同意附加超過 %1 MB 的檔案。</p>"
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "附加檔案"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "附件(&A)"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "插入檔案"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "插入檔案"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr "<qt><p>從後端匯出金鑰時發生錯誤：</p> <p><b>%1</b></p></qt>"
 
 #: kmcomposewin.cpp:3133
@@ -5977,275 +5947,290 @@ msgid ""
 "View"
 msgstr "檢視"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "編輯..."
+
 #: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "編輯方式..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "另存新檔(&A)..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "內容(&P)"
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "新增附件..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 msgid "KMail could not compress the file."
 msgstr "KMail 無法壓縮此檔案。"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "壓縮過的檔案比原來還大。你想要保存原來的檔案嗎？"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "保存"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 msgid "KMail could not uncompress the file."
 msgstr "KMail 無法解壓縮此檔。"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "另存附檔"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "以文字加入"
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "以附件加入"
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr "請選則您是否要將此內容當成文字插入編輯器內，或是將它當成附檔。"
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 msgid "Paste as text or attachment?"
 msgstr "要當成文字貼上還是當成附檔？"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "未命名"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>您要求對自己加密，但目前的身份並未定義 OpenPGP 或 S/MIME 的加密金鑰或憑證。</p> "
-"<p>請在身份設定處選擇您要使用的金鑰。</p></qt>"
+"<qt> <p>您要求對自己加密，但目前的身份並未定義 OpenPGP 或 S/MIME 的加密金鑰或"
+"憑證。</p> <p>請在身份設定處選擇您要使用的金鑰。</p></qt>"
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "未定義的加密金鑰"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>為了要簽署信件，您必須指定加密用的 OpenPGP 金鑰或 S/MIME 憑證。</p> "
+"<qt><p>為了要簽署信件，您必須指定加密用的 OpenPGP 金鑰或 S/MIME 憑證。</p> "
 "<p>請在身份設定處選擇要使用的金鑰或憑證。</p></qt>"
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "未定義的簽署金鑰"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr "KMail 目前處於離線模式，您所寄出的信將會存放在寄件匣中等待上線。"
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "上線／離線"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
-msgstr "您必須在「寄件者」欄位中填入自己的電子郵件地址。您應該在身份設定中設定電子信件地址，這樣就不必每次送信都重新填寫。"
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
+msgstr ""
+"您必須在「寄件者」欄位中填入自己的電子郵件地址。您應該在身份設定中設定電子信"
+"件地址，這樣就不必每次送信都重新填寫。"
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "您必須在收件者、複本或密件複本欄位中指定最少一位收件者。"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 msgid "To field is missing.Send message anyway?"
 msgstr "沒有收件人欄位。還是要送出嗎？"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 msgid "No To: specified"
 msgstr "沒有指定收件者"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "您沒有寫主題。確定要送出訊息？"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "沒有主題"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "S&end as Is"
 msgstr "就這樣送吧(&E)"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 msgid "&Specify the Subject"
 msgstr "感謝提醒(&S)"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "保存標記，不要加密或簽署(&K)"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr "保存標記，不要加密(&K)"
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr "保存標記，不要簽署(&K)"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Sign/Encrypt (delete markup)"
 msgstr "加密或簽署信件，刪除標記"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr "加密信件，刪除標記"
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr "簽署信件，刪除標記"
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
-msgstr "<qt><p>無法對 HTML 信件做內含式簽署(Inline signing)或加密。</p> <p>您要刪除標記嗎？</p> </qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
+msgstr ""
+"<qt><p>無法對 HTML 信件做內含式簽署(Inline signing)或加密。</p> <p>您要刪除標"
+"記嗎？</p> </qt>"
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 msgid "Sign/Encrypt Message?"
 msgstr "要簽署或加密信件嗎？"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr "身份 %1 自訂的草稿或樣本資料夾已不存在。將使用預設的資料夾。"
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "請產生一個發信帳號並重試一次。"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "即將傳送信件..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "傳送確認"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "立即傳送(&S)"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "沒有收件者"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "其他的收件者。"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 msgid "Spellcheck: on"
 msgstr "拼字檢查：開啟"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 msgid "Spellcheck: off"
 msgstr "拼字檢查：關閉"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " 拼字檢查中止。"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " 拼字檢查停止。"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " 拼字檢查完成。"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "拼字檢查程式"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 "請先將 Chiasmus 設定為加密後端。\n"
 "您可以在「安全」頁中的「加密後端」設定。"
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
-"libkleopatra 函式庫沒有支援 Chiasmus。您可能必須重新編譯 libkleopatra，並打使用 --enable-chiasmus 選項。"
+"libkleopatra 函式庫沒有支援 Chiasmus。您可能必須重新編譯 libkleopatra，並打使"
+"用 --enable-chiasmus 選項。"
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr "沒有設定 Chiasmus 後端。"
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 msgid "No Chiasmus Keys Found"
 msgstr "找不到 Chiasmus 金鑰。"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 msgid "Chiasmus Encryption Key Selection"
 msgstr "選擇 Chiasmus 加密金鑰"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will be signed"
 msgstr "此信件將被簽署"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 msgid "Message will not be signed"
 msgstr "此信件將不會被簽署"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will be encrypted"
 msgstr "此信件將被加密"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 msgid "Message will not be encrypted"
 msgstr "此信件將不會被加密"
 
@@ -6294,9 +6279,10 @@ msgstr "拼字檢查 - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
-msgstr "ISpell/Aspell 無法啟動。請確定您已在 PATH 中正確設定 ISpell 或 Aspell。"
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
+msgstr ""
+"ISpell/Aspell 無法啟動。請確定您已在 PATH 中正確設定 ISpell 或 Aspell。"
 
 #: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
@@ -6329,10 +6315,10 @@ msgstr "<qt>過濾規則 %1 中有太多過濾動作。</qt>"
 
 #: kmfilter.cpp:289
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
-msgstr "<qt>在過濾規則 %2 中<br> 有未知的過濾動作 <b>%1</b>。<br> 將會忽略它。</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
+msgstr ""
+"<qt>在過濾規則 %2 中<br> 有未知的過濾動作 <b>%1</b>。<br> 將會忽略它。</qt>"
 
 #: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
@@ -6552,125 +6538,107 @@ msgstr "播放聲音"
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
-msgstr "<qt> <p>這裡是已定義的過濾器，由上而下。</p> <p>點選過濾器，並在右手邊修改。</p> </qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
+msgstr ""
+"<qt> <p>這裡是已定義的過濾器，由上而下。</p> <p>點選過濾器，並在右手邊修改。"
+"</p> </qt>"
 
 #: kmfilterdlg.cpp:61
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>按此鍵建立新的過濾規則。</p> "
-"<p>新的規則會插在目前規則的上面，不過您稍候可以調整它的順序。</p> "
-"<p>如果您不小心按到此鍵，您隨時可以刪除它。</p></qt>"
+"<qt> <p>按此鍵建立新的過濾規則。</p> <p>新的規則會插在目前規則的上面，不過您"
+"稍候可以調整它的順序。</p> <p>如果您不小心按到此鍵，您隨時可以刪除它。</p></"
+"qt>"
 
 #: kmfilterdlg.cpp:68
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
-msgstr "<qt> <p>按此鍵複製目前的過濾規則。</p> <p>如果您不小心按到此鍵，您隨時可以刪除它。</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
+msgstr ""
+"<qt> <p>按此鍵複製目前的過濾規則。</p> <p>如果您不小心按到此鍵，您隨時可以刪"
+"除它。</p></qt>"
 
 #: kmfilterdlg.cpp:72
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>按此鍵<em>刪除</em>目前選擇的過濾規則。</p> "
-"<p>規則一經刪除就無法救回來，但是您可以選擇<em>取消</em>來取消剛剛所有的變更。</p></qt>"
+"<qt> <p>按此鍵<em>刪除</em>目前選擇的過濾規則。</p> <p>規則一經刪除就無法救回"
+"來，但是您可以選擇<em>取消</em>來取消剛剛所有的變更。</p></qt>"
 
 #: kmfilterdlg.cpp:79
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>按此鍵將目前的規則移到清單的<em>最頂端</em>。</p> "
-"<p>在執行過濾時會依據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
+"<qt> <p>按此鍵將目前的規則移到清單的<em>最頂端</em>。</p> <p>在執行過濾時會依"
+"據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
 
 #: kmfilterdlg.cpp:85
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
 msgstr "<qt> <p>按此鍵將目前的規則往<em>上</em>移動。</p> </qt>"
 
 #: kmfilterdlg.cpp:93
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr "<qt> <p>按此鍵將目前的規則往<em>下</em>移動。</p> </qt>"
 
 #: kmfilterdlg.cpp:101
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>按此鍵將目前的規則移到清單的<em>最底端</em>。</p> "
-"<p>在執行過濾時會依據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
+"<qt> <p>按此鍵將目前的規則移到清單的<em>最底端</em>。</p> <p>在執行過濾時會依"
+"據此清單的過濾器順序依序執行。最頂端的過濾器會優先執行。</p></qt>"
 
 #: kmfilterdlg.cpp:107
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>按此鍵可以重新命名規則。</p> "
-"<p>新的規則會自動命名，您可以更改它的名稱。</p> "
-"<p>如果想要將名稱回覆到原先系統自動給的名稱，您可以選擇重新命名，然後按下<em>清除</em>後再按<em>確定</em>即可。</p></qt>"
+"<qt> <p>按此鍵可以重新命名規則。</p> <p>新的規則會自動命名，您可以更改它的名"
+"稱。</p> <p>如果想要將名稱回覆到原先系統自動給的名稱，您可以選擇重新命名，然"
+"後按下<em>清除</em>後再按<em>確定</em>即可。</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>勾選這個選項，則強制顯示確認對話框。</p> "
-"<p>如果您定義了一個規則，選擇等等要下載的信件，就應該開啟確認對話框。否則如果沒有其他大的信件在伺服器端等待，或是您要修改規則時，這些信件就有可能永遠不會被下"
-"載。</p></qt>"
+"<qt> <p>勾選這個選項，則強制顯示確認對話框。</p> <p>如果您定義了一個規則，選"
+"擇等等要下載的信件，就應該開啟確認對話框。否則如果沒有其他大的信件在伺服器端"
+"等待，或是您要修改規則時，這些信件就有可能永遠不會被下載。</p></qt>"
 
 #: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
@@ -6680,6 +6648,16 @@ msgstr "POP3 過濾規則"
 msgid "Filter Rules"
 msgstr "過濾規則"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "匯入(&I)"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "匯入(&I)"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "可用的過濾器"
@@ -6760,6 +6738,11 @@ msgstr "將這個過濾器放到工具列上"
 msgid "Icon for this filter:"
 msgstr "此過濾器的圖示"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "收件者"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "向上"
@@ -6768,16 +6751,29 @@ msgstr "向上"
 msgid "Down"
 msgstr "向下"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "重新命名"
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "新增"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "複製到(&C)"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "已刪除"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6786,8 +6782,8 @@ msgstr "選擇資料夾捷徑"
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr "至少有一個過濾器被套用在 IMAP 帳號上。這樣只能對新進信件用手動過濾。"
 
 #: kmfilterdlg.cpp:786
@@ -6861,25 +6857,23 @@ msgstr "如何解決 IMAP 快取的問題"
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
-"<p><b>如何解決 IMAP 快取的問題</b></p> "
-"<p>如果您在與 IMAP 資料夾同步時發生問題，您可以先試著重建索引檔。這會花一點時間，但不會有什麼問題。</p> "
-"<p>如果重建後仍然不行，試著更新 IMAP 快取內容。這樣會失去先前對本地端這個資料夾及其子資料夾所做的改變，回復到原先的設定。</p>"
+"<p><b>如何解決 IMAP 快取的問題</b></p> <p>如果您在與 IMAP 資料夾同步時發生問"
+"題，您可以先試著重建索引檔。這會花一點時間，但不會有什麼問題。</p> <p>如果重"
+"建後仍然不行，試著更新 IMAP 快取內容。這樣會失去先前對本地端這個資料夾及其子"
+"資料夾所做的改變，回復到原先的設定。</p>"
 
 #: kmfoldercachedimap.cpp:135
 msgid "Rebuild &Index"
@@ -6909,12 +6903,14 @@ msgstr "更新快取內容(&C)"
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
-msgstr "無法讀取資料夾 %1 的使用者代碼快取檔。有可能是因為檔案系統權限的問題，或該檔已損毀。"
+msgstr ""
+"無法讀取資料夾 %1 的使用者代碼快取檔。有可能是因為檔案系統權限的問題，或該檔"
+"已損毀。"
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr "無法寫入資料夾 %1 的使用者代碼快取檔。有可能是因為檔案系統權限的問題。"
 
 #: kmfoldercachedimap.cpp:612
@@ -6952,10 +6948,11 @@ msgstr "這個資料夾的索引已經重建。"
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
-"資料夾 %1 目前並不是在初始同步狀態(initial sync state)下。（目前狀態為 %2）。您確定要重置成初始同步狀態，並進行同步動作嗎？"
+"資料夾 %1 目前並不是在初始同步狀態(initial sync state)下。（目前狀態為 %2）。"
+"您確定要重置成初始同步狀態，並進行同步動作嗎？"
 
 #: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
@@ -7078,14 +7075,11 @@ msgstr "在伺服器上產生子資料夾中"
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
-"<qt>"
-"<p>伺服器中資料夾 <b>%1</b> 裡的郵件已經被刪除了。您要一起刪除本地端的資料嗎？"
-"<br> 使用者代碼：%2</p></qt>"
+"<qt><p>伺服器中資料夾 <b>%1</b> 裡的郵件已經被刪除了。您要一起刪除本地端的資"
+"料嗎？<br> 使用者代碼：%2</p></qt>"
 
 #: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
@@ -7106,10 +7100,11 @@ msgstr "讀取命名空間 %1 的資料夾中"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
-msgstr "<qt> <p>資料夾 <b>%1</b> 似乎已經被刪除了。您要一起刪除伺服器上的資料夾嗎？</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
+msgstr ""
+"<qt> <p>資料夾 <b>%1</b> 似乎已經被刪除了。您要一起刪除伺服器上的資料夾嗎？</"
+"p></qt>"
 
 #: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
@@ -7117,15 +7112,17 @@ msgstr "中止"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
-msgstr "IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
+msgstr ""
+"IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
-msgstr "IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
+msgstr ""
+"IMAP 伺服器 %1 不支援 annotations。無法使用 XML storage，請重新設定 KMail。"
 
 #: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
@@ -7137,14 +7134,15 @@ msgstr "lost+found"
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
-"<p>在資料夾 <b>%1</b> 中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺服器上被刪除，就是您沒有權限可以上傳。</p> "
-"<p>所有受影響的信件都會被移到 <b>%2</b> 以避免遺失。</p>"
+"<p>在資料夾 <b>%1</b> 中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺"
+"服器上被刪除，就是您沒有權限可以上傳。</p> <p>所有受影響的信件都會被移到 <b>"
+"%2</b> 以避免遺失。</p>"
 
 #: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
@@ -7152,19 +7150,24 @@ msgstr "權限不足"
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
-"<p>在資料夾 <b>%1</b> "
-"中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺服器上被刪除，就是您沒有權限可以上傳。請與您的管理員聯絡，以便讓您上傳，或是您可以將這些信件移到別的資料夾"
-"。</p> "
-"<p>您要現在將這些信件移到別的資料夾嗎？</p>"
+"<p>在資料夾 <b>%1</b> 中有新信件，尚未上傳到伺服器。不過此資料夾不是已經在伺"
+"服器上被刪除，就是您沒有權限可以上傳。請與您的管理員聯絡，以便讓您上傳，或是"
+"您可以將這些信件移到別的資料夾。</p> <p>您要現在將這些信件移到別的資料夾嗎？"
+"</p>"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "移至："
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "不要"
 
@@ -7176,8 +7179,7 @@ msgstr "搬吧"
 msgid "Permissions (ACL)"
 msgstr "權限（權限控制列表）"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "一般"
@@ -7201,8 +7203,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "使用自訂圖示(&I)"
@@ -7221,18 +7222,18 @@ msgstr "通知資料夾內有新的或未讀的信件"
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>這個選項被勾選的話，系統會通知您這個資料夾內有新的或未讀的信件，在找尋下一封未讀信件時也會在這個資料夾內搜尋。</p> "
-"<p>不勾選的話，系統就不會通知您，找未讀信件時也不會找這個資料夾。通常用於資源回收桶或存放垃圾信的資料夾。</p></qt>"
+"<qt> <p>這個選項被勾選的話，系統會通知您這個資料夾內有新的或未讀的信件，在找"
+"尋下一封未讀信件時也會在這個資料夾內搜尋。</p> <p>不勾選的話，系統就不會通知"
+"您，找未讀信件時也不會找這個資料夾。通常用於資源回收桶或存放垃圾信的資料夾。"
+"</p></qt>"
 
 #: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
@@ -7244,10 +7245,11 @@ msgstr "將回覆的信件也放在此資料夾"
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
-msgstr "這個選項勾選的話，您回覆的信件也會放在這個資料夾，而不是放到寄件備份中。"
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
+msgstr ""
+"這個選項勾選的話，您回覆的信件也會放在這個資料夾，而不是放到寄件備份中。"
 
 #: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
@@ -7257,17 +7259,21 @@ msgstr "信件列表中顯示寄件者與收件者欄位。"
 msgid "Sho&w column:"
 msgstr "顯示欄位(&W)："
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "設成預設"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "寄件者"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "收件者"
@@ -7278,12 +7284,14 @@ msgstr "寄件人身份(&S)："
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
-msgstr "您可以選擇要用哪一個身份做為寄件者，包括簽名檔、電子簽章與加密等等的設定都會套用您所選擇的身份的設定。"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
+msgstr ""
+"您可以選擇要用哪一個身份做為寄件者，包括簽名檔、電子簽章與加密等等的設定都會"
+"套用您所選擇的身份的設定。"
 
 #: kmfolderdia.cpp:500
 msgid "&Folder contents:"
@@ -7301,19 +7309,23 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
-msgstr ""
-"這個設定是針對日曆或行事曆資料夾（設定在行事曆上時，只用於提醒通知），設定哪些使用者在讀取這個資料夾的內容時，可以在清單中標記「忙碌」或「空閒」，並收到提醒通知"
-"。\n"
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
+msgstr ""
+"這個設定是針對日曆或行事曆資料夾（設定在行事曆上時，只用於提醒通知），設定哪"
+"些使用者在讀取這個資料夾的內容時，可以在清單中標記「忙碌」或「空閒」，並收到"
+"提醒通知。\n"
 "\n"
-"例如：如果老闆開了一個資料夾跟秘書共享，應該只有老闆可以設定是否忙碌，因此應該他應該將此設定設為「管理者」。\n"
-"再舉個例，如果一群共同進行一個專案的同事共享一份日曆設定，那設定會議時，所有人都應該同時被標上忙碌，並收到通知。\n"
-"如果是全公司都可以看到的資料夾紀錄某些事件，那就應該設定成「無」，因為不確定有哪些人會參與這些事件。"
+"例如：如果老闆開了一個資料夾跟秘書共享，應該只有老闆可以設定是否忙碌，因此應"
+"該他應該將此設定設為「管理者」。\n"
+"再舉個例，如果一群共同進行一個專案的同事共享一份日曆設定，那設定會議時，所有"
+"人都應該同時被標上忙碌，並收到通知。\n"
+"如果是全公司都可以看到的資料夾紀錄某些事件，那就應該設定成「無」，因為不確定"
+"有哪些人會參與這些事件。"
 
 #: kmfolderdia.cpp:555
 msgid "Nobody"
@@ -7344,18 +7356,20 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
-msgstr "您已經設定這個資料夾包含群組資訊，並設定為隱藏。如果您要移除這個資料夾的話，您必須取消隱藏狀態。"
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
+msgstr ""
+"您已經設定這個資料夾包含群組資訊，並設定為隱藏。如果您要移除這個資料夾的話，"
+"您必須取消隱藏狀態。"
 
 #: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
@@ -7424,7 +7438,8 @@ msgstr "讀取資料夾資訊時發生錯誤"
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "%1 的信件索引是由不知哪個版本的 KMail (%2) 產生的。\n"
 "索引可以重建，但是有些像是狀態之類的資訊可能會不見。您要重建索引嗎？"
@@ -7442,7 +7457,8 @@ msgstr "不要"
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
 "information, like status flags, might get lost."
-msgstr "%1 的信件索引已損毀，將會重新建立索引。但是有些像是狀態之類的資訊可能會不見。"
+msgstr ""
+"%1 的信件索引已損毀，將會重新建立索引。但是有些像是狀態之類的資訊可能會不見。"
 
 #: kmfoldermaildir.cpp:89
 msgid "Error opening %1; this folder is missing."
@@ -7450,8 +7466,8 @@ msgstr "無法開啟 %1，找不到資料夾。"
 
 #: kmfoldermaildir.cpp:92
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr "無法開啟 %1，它可能不是一個 maildir 的資料夾，或者是權限問題。"
 
 #: kmfoldermaildir.cpp:124
@@ -7492,17 +7508,15 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>資料夾 %2 的索引已經過期。為了避免信件被損毀，索引會被重建，不過之前刪除的訊息可能會重新跑出來，而信件狀態則可能會不見。</p> "
-"<p>請到 <a href=\"%1\">KMail FAQ</a>中閱讀相關資料，來看看如何避免這種狀況再發生。</p></qt>"
+"<qt><p>資料夾 %2 的索引已經過期。為了避免信件被損毀，索引會被重建，不過之前刪"
+"除的訊息可能會重新跑出來，而信件狀態則可能會不見。</p> <p>請到 <a href="
+"\"%1\">KMail FAQ</a>中閱讀相關資料，來看看如何避免這種狀況再發生。</p></qt>"
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
@@ -7559,7 +7573,7 @@ msgstr ""
 "%1 不是資料夾。\n"
 "請將此檔移到別處。"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7567,7 +7581,7 @@ msgstr ""
 "資料夾 %1 的權限錯誤。\n"
 "請確定您可以檢視並修改此資料夾的內容。"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7577,15 +7591,17 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
-msgstr "在上次檢查郵件之後，有一個同名的資料夾已經被刪除。您在建立同名資料夾前，必須先再檢查一次郵件。"
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
+msgstr ""
+"在上次檢查郵件之後，有一個同名的資料夾已經被刪除。您在建立同名資料夾前，必須"
+"先再檢查一次郵件。"
 
 #: kmfoldermgr.cpp:202
 msgid "Could Not Create Folder"
 msgstr "無法建立資料夾"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7682,10 +7698,12 @@ msgstr "解決 IMAP 快取的問題(&T)"
 #: kmfoldertree.cpp:1280
 #, fuzzy
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
-msgstr "<qt>無法產生資料夾<b>%1</b>，因為伺服器上的權限不足。請向您的管理員反應。</qt>"
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
+msgstr ""
+"<qt>無法產生資料夾<b>%1</b>，因為伺服器上的權限不足。請向您的管理員反應。</"
+"qt>"
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
 #: kmmainwidget.cpp:426 kmsearchpattern.h:220
@@ -7812,10 +7830,10 @@ msgstr "%1 資料夾設為唯讀。"
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr "<qt>您確定要刪除這 %n 封信件嗎？<br> 刪除後就無法回復了。</qt>"
 
 #: kmheaders.cpp:1600
@@ -7868,128 +7886,128 @@ msgstr ""
 "修改 %1 失敗\n"
 "（磁碟空間不足？）"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "要求憑證簽章"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "請從附件中產生憑證並回傳給寄件者。"
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail 目前設定為離線工作，所有網路相關的工作都將暫停。"
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail 目前設定為上線中，所有網路相關的工作都將繼續。"
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail 目前在離線模式。您要怎麼處理？"
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "回到線上"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "離線工作"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "您沒有權限讀/寫您的收件匣。"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "寄件匣"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "您沒有權限讀/寫您的寄件匣。"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "寄件備份"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "您沒有權限讀寫寄件備份。"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "資源回收桶"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "您沒有權限讀寫資源回收桶。"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "草稿匣"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "您沒有權限讀寫草稿匣。"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr "樣本"
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 msgid "You do not have read/write permission to your templates folder."
 msgstr "您沒有權限讀寫樣本資料夾。"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "最後搜尋"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。 "
-"<p>%2 可以將 <i>%6</i> 的內容搬到這個資料夾，不過可能會將資料夾 <i>%7</i> 中相同名稱的檔案給蓋掉。 "
-"<p><strong>您確定要 %3 搬移信件檔案嗎？</strong></qt>"
+"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。 <p>%2 "
+"可以將 <i>%6</i> 的內容搬到這個資料夾，不過可能會將資料夾 <i>%7</i> 中相同名"
+"稱的檔案給蓋掉。 <p><strong>您確定要 %3 搬移信件檔案嗎？</strong></qt>"
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
-"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。%2 可以將 <i>%6</i> 的內容搬到這個資料夾。"
-"<p><strong>您確定要 %3 搬移信件檔案嗎？</strong></qt>"
+"<qt>資料夾 <i>%4</i> 已存在。%1 目前使用資料夾 <i>%5</i> 來存放信件。%2 可以"
+"將 <i>%6</i> 的內容搬到這個資料夾。<p><strong>您確定要 %3 搬移信件檔案嗎？</"
+"strong></qt>"
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr "搬移信件嗎？"
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail 發生致命的錯誤，將立即結束程式。"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8000,11 +8018,11 @@ msgstr ""
 "錯誤訊息：\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "清空資源回收桶"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "你確定要將所有帳號的資源回收桶清空嗎？"
 
@@ -8077,8 +8095,7 @@ msgstr "在 %1 中有 %n 封新信件"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>有新信件來了！</b> <br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8116,8 +8133,8 @@ msgstr "你確定要清空資源回收桶嗎？"
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr "<qt>您確定要將 <b>%1</b> 中的信件都搬到資源回收桶嗎？</qt>"
 
 #: kmmainwidget.cpp:1173
@@ -8142,9 +8159,11 @@ msgstr "刪除搜尋結果"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
-msgstr "<qt>您確定要刪除搜尋 <b>%1</b> 的結果？<br> 您還是可以在原來的資料夾內找到相關內容。</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
+msgstr ""
+"<qt>您確定要刪除搜尋 <b>%1</b> 的結果？<br> 您還是可以在原來的資料夾內找到相"
+"關內容。</qt>"
 
 #: kmmainwidget.cpp:1214
 msgid "Delete Folder"
@@ -8156,40 +8175,46 @@ msgstr "<qt>您確定要移除名為 <b>%1</b> 的空資料夾？</qt>"
 
 #: kmmainwidget.cpp:1222
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>您確定要移除空資料夾 <b>%1</b> 以及所有子資料夾嗎？子資料夾可能不是空的，若您刪除則所有內容都會被刪除。 "
-"<p><b>請小心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt>"
+"<qt>您確定要移除空資料夾 <b>%1</b> 以及所有子資料夾嗎？子資料夾可能不是空的，"
+"若您刪除則所有內容都會被刪除。 <p><b>請小心</b>，刪除的信件將不會被移到資源回"
+"收桶，而是會被永久刪除。</qt>"
 
 #: kmmainwidget.cpp:1231
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"<qt>您確定要移除資料夾 <b>%1</b> ，並捨棄其內容？ "
-"<p><b>請小心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt>"
+"<qt>您確定要移除資料夾 <b>%1</b> ，並捨棄其內容？ <p><b>請小心</b>，刪除的信"
+"件將不會被移到資源回收桶，而是會被永久刪除。</qt>"
 
 #: kmmainwidget.cpp:1238
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"<qt>您確定要移除資料夾 <b>%1</b> 以及所有子資料夾，並捨棄其內容？ "
-"<p><b>請小心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt></qt>"
+"<qt>您確定要移除資料夾 <b>%1</b> 以及所有子資料夾，並捨棄其內容？ <p><b>請小"
+"心</b>，刪除的信件將不會被移到資源回收桶，而是會被永久刪除。</qt></qt>"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "已刪除"
 
 #: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
-msgstr "您確定要更新 IMAP 快取的內容嗎？ 這會將您對本地端 IMAP 資料夾做的改變通通丟棄。"
+msgstr ""
+"您確定要更新 IMAP 快取的內容嗎？ 這會將您對本地端 IMAP 資料夾做的改變通通丟"
+"棄。"
 
 #: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
@@ -8197,10 +8222,12 @@ msgstr "你確定要將所有舊信件設為過期信件？"
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
-msgstr "在信件中使用 HTML 將會使您更容易受到垃圾信的攻擊，並且有可能會增加您的系統被其他已存在和將來的安全漏洞危害的機會。"
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
+msgstr ""
+"在信件中使用 HTML 將會使您更容易受到垃圾信的攻擊，並且有可能會增加您的系統被"
+"其他已存在和將來的安全漏洞危害的機會。"
 
 #: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
@@ -8213,9 +8240,11 @@ msgstr "使用 HTML"
 #: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
-msgstr "在 HTML 信件中下載遠端的連結會使您更容易受到垃圾信的攻擊，並且有可能會增加您的系統被其他已存在和將來的安全漏洞危害的機會。"
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
+msgstr ""
+"在 HTML 信件中下載遠端的連結會使您更容易受到垃圾信的攻擊，並且有可能會增加您"
+"的系統被其他已存在和將來的安全漏洞危害的機會。"
 
 #: kmmainwidget.cpp:1381
 msgid "Load External References"
@@ -8231,11 +8260,12 @@ msgstr "過濾 Mailing-List %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
-"KMail 的自動回覆功能跟伺服器端的過濾設定有關。您目前還沒設定 IMAP 伺服器的相關功能。\n"
+"KMail 的自動回覆功能跟伺服器端的過濾設定有關。您目前還沒設定 IMAP 伺服器的相"
+"關功能。\n"
 "您可以在 IMAP 帳號設定中的「過濾」頁設定。"
 
 #: kmmainwidget.cpp:1743
@@ -8251,7 +8281,8 @@ msgstr "無法啟動憑證管理員。請檢查安裝是否完全！"
 
 #: kmmainwidget.cpp:1787
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "無法啟動 GnuPG 紀錄檢視器 (kwatchgnupg)，請檢查安裝是否完全！"
 
 #: kmmainwidget.cpp:2508
@@ -8571,8 +8602,7 @@ msgstr "儲存附件(&T)..."
 msgid "Appl&y All Filters"
 msgstr "套用所有的過濾器(&Y)"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "套用過濾器(&P)"
@@ -8684,7 +8714,6 @@ msgstr "下一封未讀信件(&U)"
 msgid "Go to the next unread message"
 msgstr "到下一封未讀信件"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "上一封信件(&P)"
@@ -8819,8 +8848,8 @@ msgstr " 正在初始化..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
@@ -8829,10 +8858,10 @@ msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 "這封信要求回覆信件處理通知給寄件者。\n"
@@ -8841,8 +8870,8 @@ msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8853,8 +8882,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8865,8 +8894,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8892,22 +8921,24 @@ msgstr "送出(&S)"
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
-msgstr "在 Disposition-Notification-Options 標頭中含有「要求回覆(required)」，但 KMail 無法處理。"
+msgstr ""
+"在 Disposition-Notification-Options 標頭中含有「要求回覆(required)」，但 "
+"KMail 無法處理。"
 
 #: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "收件者："
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "附件： %1"
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 msgid "This attachment has been deleted."
 msgstr "此附件已刪除。"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr "附件 %1 已經被刪除。"
 
@@ -8955,39 +8986,33 @@ msgstr "信件部份內容"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>檔案的 <em>MIME 型態</em>：</p> "
-"<p>通常您不需要去改變這個設定，系統會自動偵測檔案型態。但是有時候 %1 無法正確偵測，您可以在這裡修正。</p></qt>"
+"<qt> <p>檔案的 <em>MIME 型態</em>：</p> <p>通常您不需要去改變這個設定，系統會"
+"自動偵測檔案型態。但是有時候 %1 無法正確偵測，您可以在這裡修正。</p></qt>"
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>此部份的大小</p> "
-"<p>有時，%1 只會給大約的大小，因為要計算實際的大小可能要花很多的時間。此時在顯示大小時會附上「（大約）」的標記。</p></qt>"
+"<qt> <p>此部份的大小</p> <p>有時，%1 只會給大約的大小，因為要計算實際的大小可"
+"能要花很多的時間。此時在顯示大小時會附上「（大約）」的標記。</p></qt>"
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>此部份的檔案名稱</p> "
-"<p>雖然通常是指附檔本身的檔名，但是並不盡然。更正確地說，它只是用於建議收件者在儲存的時候使用什麼名稱。</p></qt>"
+"<qt> <p>此部份的檔案名稱</p> <p>雖然通常是指附檔本身的檔名，但是並不盡然。更"
+"正確地說，它只是用於建議收件者在儲存的時候使用什麼名稱。</p></qt>"
 
 #: kmmsgpartdlg.cpp:124
 msgid "&Description:"
@@ -8995,12 +9020,13 @@ msgstr "說明(&D)："
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
-msgstr "<qt> <p>此部份的說明：</p> <p>這是一些關於此部份的資訊，通常會顯示在附件圖示的說明。</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
+msgstr ""
+"<qt> <p>此部份的說明：</p> <p>這是一些關於此部份的資訊，通常會顯示在附件圖示"
+"的說明。</p></qt>"
 
 #: kmmsgpartdlg.cpp:139
 msgid "&Encoding:"
@@ -9008,19 +9034,18 @@ msgstr "編碼(&E)："
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
-"<qt> "
-"<p>此部份的傳送編碼方式</p> "
-"<p>通常您不需要去修改它，%1 會根據 MIME 型態來判斷使用哪一種編碼方式。但是您還是可以自行指定。有時自行指定可以節省一些空間，例如 "
-"PostScript 檔內以文字為主，使用 quoted-printable 而不是預設的 base64 可以省下約 25% 的大小。</p></qt>"
+"<qt> <p>此部份的傳送編碼方式</p> <p>通常您不需要去修改它，%1 會根據 MIME 型態"
+"來判斷使用哪一種編碼方式。但是您還是可以自行指定。有時自行指定可以節省一些空"
+"間，例如 PostScript 檔內以文字為主，使用 quoted-printable 而不是預設的 "
+"base64 可以省下約 25% 的大小。</p></qt>"
 
 #: kmmsgpartdlg.cpp:156
 msgid "Suggest &automatic display"
@@ -9028,18 +9053,15 @@ msgstr "建議自動顯示(&A)"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
-msgstr ""
-"<qt> "
-"<p>如果您要讓收件者那一端自動顯示出這部份的預覽，而不是只顯示圖示，就勾選這個選項。</p> "
-"<p>技術上，這只消在 <em>Content-Disposition</em> 標頭上使用 inline 而不是用 attachment 即可。</p>"
-"</qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
+msgstr ""
+"<qt> <p>如果您要讓收件者那一端自動顯示出這部份的預覽，而不是只顯示圖示，就勾"
+"選這個選項。</p> <p>技術上，這只消在 <em>Content-Disposition</em> 標頭上使用 "
+"inline 而不是用 attachment 即可。</p></qt>"
 
 #: kmmsgpartdlg.cpp:168
 msgid "&Sign this part"
@@ -9047,11 +9069,12 @@ msgstr "此部份使用簽章(&S)"
 
 #: kmmsgpartdlg.cpp:171
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
-msgstr "<qt> <p>如果您要簽署這部份，就勾選這個選項。</p> <p>系統會使用您發信的身份指定的簽章來簽署。</p></qt>"
+msgstr ""
+"<qt> <p>如果您要簽署這部份，就勾選這個選項。</p> <p>系統會使用您發信的身份指"
+"定的簽章來簽署。</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9059,10 +9082,11 @@ msgstr "此部份加密(&Y)"
 
 #: kmmsgpartdlg.cpp:181
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
-msgstr "<qt> <p>如果您要將這部份加密，就勾選此選項。</p> <p>這部份將會被加密。</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
+msgstr ""
+"<qt> <p>如果您要將這部份加密，就勾選此選項。</p> <p>這部份將會被加密。</p></"
+"qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9076,12 +9100,12 @@ msgstr "POP3 過濾規則"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
-msgstr "在 POP 帳號 <b>%1</b> 中過濾信件： <p>這封信件超過了您所設定的大小。<br> 您可以選擇要如何處理。"
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
+msgstr ""
+"在 POP 帳號 <b>%1</b> 中過濾信件： <p>這封信件超過了您所設定的大小。<br> 您可"
+"以選擇要如何處理。"
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9331,37 +9355,37 @@ msgstr "TDE 的郵件收發軟體"
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
-msgstr "<h2 style='margin-top: 0px;'>讀取資料夾內容中</h2><p>請稍候......</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
+msgstr ""
+"<h2 style='margin-top: 0px;'>讀取資料夾內容中</h2><p>請稍候......</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>離線模式</h2>"
-"<p>KMail 目前在離線模式中。點選<a href=\"kmail:goOnline\">這裡</a>恢復上線模式。</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>離線模式</h2><p>KMail 目前在離線模式中。點選<a "
+"href=\"kmail:goOnline\">這裡</a>恢復上線模式。</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
+#, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9369,13 +9393,13 @@ msgid ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
-"<h2 style='margin-top: 0px;'>歡迎來到 KMail %1</h2>"
-"<p>KMail 是 TDE 的郵件收發軟體。它支援完整的郵件標準，包括 MIME、SMTP、POP3 與 IMAP 等。</p>\n"
-"<ul>"
-"<li>KMail 擁有強大的功能，及完整的<a href=\"%2\">說明文件</a></li>\n"
+"<h2 style='margin-top: 0px;'>歡迎來到 KMail %1</h2><p>KMail 是 TDE 的郵件收發"
+"軟體。它支援完整的郵件標準，包括 MIME、SMTP、POP3 與 IMAP 等。</p>\n"
+"<ul><li>KMail 擁有強大的功能，及完整的<a href=\"%2\">說明文件</a></li>\n"
 "<li><a href=\"%3\">KMail 網站</A> 也提供了 Kmail 新版本的資訊。</li></ul>\n"
 "%8\n"
-"<p>與 TDE %5 中包含的 KMail %4 相較，在這一版的 KMail 中包含了一些新功能：</p>\n"
+"<p>與 TDE %5 中包含的 KMail %4 相較，在這一版的 KMail 中包含了一些新功能：</"
+"p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9384,15 +9408,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail 開發小組敬上</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
@@ -9404,8 +9426,8 @@ msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
-"<p><span style='font-size:125%; font-weight:bold;'>與 KMail %1 相比之重大改變</span>"
-"：</p>\n"
+"<p><span style='font-size:125%; font-weight:bold;'>與 KMail %1 相比之重大改變"
+"</span>：</p>\n"
 
 #: kmreaderwin.cpp:1518
 msgid "( body part )"
@@ -9436,7 +9458,8 @@ msgstr "檢視附件：%1"
 #: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr "[KMail：附件包含二進位資料。先嘗試顯示開頭 %n 個字元。]"
 
@@ -9462,12 +9485,14 @@ msgstr "開啟附件？"
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr "刪除附件可能會造成此信件的簽章不正確。"
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr "變更附件可能會造成此信件的簽章不正確。"
 
 #: kmreaderwin.cpp:2956
@@ -9488,6 +9513,58 @@ msgstr "符合下列任一規則"
 msgid "(match all of the following)"
 msgstr "符合下列全部規則"
 
+#: kmsearchpattern.h:221
+msgid "Read"
+msgstr "已讀"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr "舊信件"
+
+#: kmsearchpattern.h:223
+msgid "Deleted"
+msgstr "已刪除"
+
+#: kmsearchpattern.h:224
+msgid "Replied"
+msgstr "已回覆"
+
+#: kmsearchpattern.h:225
+msgid "Forwarded"
+msgstr "已轉寄"
+
+#: kmsearchpattern.h:226
+msgid "Queued"
+msgstr "佇列"
+
+#: kmsearchpattern.h:227
+msgid "Sent"
+msgstr "已傳送"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr "監測中"
+
+#: kmsearchpattern.h:229
+msgid "Ignored"
+msgstr "忽略"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr "垃圾信"
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr "正常信"
+
+#: kmsearchpattern.h:232
+msgid "To Do"
+msgstr "待辦"
+
+#: kmsearchpattern.h:234
+msgid "Has Attachment"
+msgstr "含附件"
+
 #: kmsearchpatternedit.cpp:34
 msgid "Complete Message"
 msgstr "整封信件"
@@ -9563,10 +9640,10 @@ msgstr "嚴重錯誤：無法傳送信件（磁碟空間不足？） 移動失�
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 "將已寄出的信件 %1 從寄件匣移到寄件備份時失敗。\n"
 "可能的原因是磁碟空間不夠，或權限問題。請試著修正問題後自行將它移動。"
@@ -9574,9 +9651,11 @@ msgstr ""
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
-msgstr "沒有指定寄件者就無法送出信件。請至少在身份 %1 設定中設定一個電子郵件地址，然後再試一次。"
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
+msgstr ""
+"沒有指定寄件者就無法送出信件。請至少在身份 %1 設定中設定一個電子郵件地址，然"
+"後再試一次。"
 
 #: kmsender.cpp:454
 #, c-format
@@ -9599,8 +9678,8 @@ msgstr "正在起始寄件者處理..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr "您選擇用不加密的方式送出所有佇列中的信件。確定要繼續嗎？"
 
 #: kmsender.cpp:505
@@ -9625,14 +9704,16 @@ msgstr "無法傳送（某些）佇列中的訊息。"
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
 "取消傳送：\n"
 "%1\n"
-"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。\n"
+"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中"
+"移除這個信件。\n"
 "使用下列傳送協定：\n"
 "  %2"
 
@@ -9642,18 +9723,14 @@ msgstr "傳送取消"
 
 #: kmsender.cpp:720
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
-msgstr ""
-"<p>傳送失敗：</p> "
-"<p>%1</p>"
-"<p>信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。</p>"
-"<p>使用下列傳送協定：%2</p> "
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
+msgstr ""
+"<p>傳送失敗：</p> <p>%1</p><p>信件將保留在寄件匣中直到你解決問題（例如修正錯"
+"誤的位址），不然請您從寄件匣中移除這個信件。</p><p>使用下列傳送協定：%2</p> "
 "<p>您要我傳送剩下的信件嗎？</p>"
 
 #: kmsender.cpp:730
@@ -9672,14 +9749,16 @@ msgstr "取消傳送(&A)"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
 "傳送失敗：\n"
 "%1\n"
-"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。\n"
+"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中"
+"移除這個信件。\n"
 "使用下列傳送協定：\n"
 " %2"
 
@@ -9698,7 +9777,8 @@ msgid ""
 msgstr ""
 "傳送失敗：\n"
 "%1\n"
-"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中移除這個信件。\n"
+"信件將保留在寄件匣中直到你解決問題（例如修正錯誤的位址），不然請您從寄件匣中"
+"移除這個信件。\n"
 "使用下列傳送協定：\n"
 " %2"
 
@@ -9717,31 +9797,39 @@ msgstr "您必須提供使用者名稱及密碼才能使用這個 SMTP 伺服器
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
-msgstr "%1 已經在其他地方執行中。重複執行 %2 可能會導致信件遺失。請您確定 %1 沒有被重複執行。"
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
+msgstr ""
+"%1 已經在其他地方執行中。重複執行 %2 可能會導致信件遺失。請您確定 %1 沒有被重"
+"複執行。"
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
-msgstr "%1 已經在其他地方執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前先確定 %1 沒有被執行。"
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
+msgstr ""
+"%1 已經在其他地方執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前"
+"先確定 %1 沒有被執行。"
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
-msgstr "%1 已經在 %2 執行中。重複執行 %1 可能會導致信件遺失。請您啟動 %1 前先確定沒有在 %2 上被執行。"
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
+msgstr ""
+"%1 已經在 %2 執行中。重複執行 %1 可能會導致信件遺失。請您啟動 %1 前先確定沒有"
+"在 %2 上被執行。"
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
-msgstr "%1 已經在 %3 執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前先確定 %1 沒有在 %3 上被執行。"
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
+msgstr ""
+"%1 已經在 %3 執行中。同時執行 %1 與 %2 可能會導致信件遺失。請您啟動 %2 前先確"
+"定 %1 沒有在 %3 上被執行。"
 
 #: kmstartup.cpp:232
 #, c-format
@@ -9752,6 +9840,10 @@ msgstr "啟動 %1"
 msgid "Exit"
 msgstr "離開"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "新信件在"
@@ -9776,12 +9868,14 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 "無法使用 TDEWallet。強烈建議您使用 TDEWallet 來管理您的密碼。\n"
-"如果沒有 TDEWallet 的話，密碼將會保存在 KMail 的設定檔中，並做簡單的加密。但是這仍然不保證密碼可以安全地不被破解。\n"
+"如果沒有 TDEWallet 的話，密碼將會保存在 KMail 的設定檔中，並做簡單的加密。但"
+"是這仍然不保證密碼可以安全地不被破解。\n"
 "您確定要將帳號 %1 的密碼存在設定檔中嗎？"
 
 #: kmtransport.cpp:149 networkaccount.cpp:228
@@ -9849,7 +9943,8 @@ msgstr "前置命令(&M)："
 msgid ""
 "A command to run locally, prior to sending email. This can be used to set up "
 "ssh tunnels, for example. Leave it empty if no command should be run."
-msgstr "在送信前執行的命令。例如可以設定 ssh 通道。如果沒有要執行的命令就請留白。"
+msgstr ""
+"在送信前執行的命令。例如可以設定 ssh 通道。如果沒有要執行的命令就請留白。"
 
 #: kmtransport.cpp:427
 msgid "Server &requires authentication"
@@ -9857,9 +9952,11 @@ msgstr "伺服器需要通過認證(&R)"
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
-msgstr "如果您的 SMTP 伺服器需要身份認證，請勾選這個選項。這就是所謂的 Authenticated SMTP 或 ASMTP。"
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"如果您的 SMTP 伺服器需要身份認證，請勾選這個選項。這就是所謂的 Authenticated "
+"SMTP 或 ASMTP。"
 
 #: kmtransport.cpp:442
 msgid "The user name to send to the server for authorization"
@@ -9879,13 +9976,12 @@ msgstr "送出不同的主機名稱到伺服器上(&D)"
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
-"這個選項讓 KMail 在與伺服器溝通時，使用不同的主機名稱。 "
-"<p>如果您的系統主機設定不正確，或是您不想讓其他人知道您的主機名稱時，可以使用這個選項。"
+"這個選項讓 KMail 在與伺服器溝通時，使用不同的主機名稱。 <p>如果您的系統主機設"
+"定不正確，或是您不想讓其他人知道您的主機名稱時，可以使用這個選項。"
 
 #: kmtransport.cpp:485
 msgid "Hos&tname:"
@@ -9914,8 +10010,8 @@ msgstr "只僅允許本地檔案。"
 
 #: kmtransport.cpp:786
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "主機欄位不能空白。請輸入 SMTP 伺服器的域名或 IP 位址。"
 
 #: kmtransport.cpp:788
@@ -9928,13 +10024,14 @@ msgstr "列出資料夾 %1 時發生錯誤："
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
-"從資料夾取消本地端訂閱會移除所有這些資料夾的本地資訊。在伺服器端的此資料夾將不會被改變。如果您要確認本地端的資料已經寫入伺服器，您可以按下取消鍵，並再度檢查郵件"
-"。"
+"從資料夾取消本地端訂閱會移除所有這些資料夾的本地資訊。在伺服器端的此資料夾將"
+"不會被改變。如果您要確認本地端的資料已經寫入伺服器，您可以按下取消鍵，並再度"
+"檢查郵件。"
 
 #: localsubscriptiondialog.cpp:124
 msgid "Local changes will be lost when unsubscribing"
@@ -10151,31 +10248,24 @@ msgstr "編輯信件(&E)"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>加密外掛程式 (Crypto Plug-In) 傳回的資訊結構錯誤，外掛程式可能已損毀。</p> "
-"<p>請與您的系統管理員聯絡。</p></qt>"
+"<qt> <p>加密外掛程式 (Crypto Plug-In) 傳回的資訊結構錯誤，外掛程式可能已損"
+"毀。</p> <p>請與您的系統管理員聯絡。</p></qt>"
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
-msgstr ""
-"<p>沒有可用的加密外掛程式，內建的 OpenPGP 沒有成功執行。</p> "
-"<p>您可以做以下動作：</p> "
-"<ul>"
-"<li>在 KMail 設定=>外掛程式設定中打開外掛程式。<em>或者是</em>，</li> "
-"<li>在身份=>進階中指定傳統的 OpenPGP 設定。</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
+msgstr ""
+"<p>沒有可用的加密外掛程式，內建的 OpenPGP 沒有成功執行。</p> <p>您可以做以下"
+"動作：</p> <ul><li>在 KMail 設定=>外掛程式設定中打開外掛程式。<em>或者是</"
+"em>，</li> <li>在身份=>進階中指定傳統的 OpenPGP 設定。</li></ul>"
 
 #: messagecomposer.cpp:445
 msgid ""
@@ -10187,8 +10277,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr "Chiasmus 後端沒有指定 x-encrypt 功能。請回報錯誤。"
 
 #: messagecomposer.cpp:565
@@ -10203,14 +10293,14 @@ msgstr "Chiasmus 加密錯誤"
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr "Chiasmus 後端傳回錯誤：x-encrypt 功能沒有傳回位元陣列。請回報錯誤。"
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 "內含式(inline) OpenPGP 加密格式不支援對附件加密或簽署。\n"
@@ -10319,8 +10409,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 "設定要求詢問您是否要加密這封信件。\n"
@@ -10356,9 +10446,12 @@ msgstr "不要加密信件(&N)"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
-msgstr "您已要求加密此信件，並送一份複本給自己，但是這個身份沒有合法可信任的加密金鑰。"
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
+msgstr ""
+"您已要求加密此信件，並送一份複本給自己，但是這個身份沒有合法可信任的加密金"
+"鑰。"
 
 #: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
@@ -10367,8 +10460,8 @@ msgstr "是否不加密送出？"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 "這封信的某些部份不會被加密。\n"
@@ -10394,72 +10487,74 @@ msgstr "加密全部信件(&E)"
 msgid "Unencrypted Message Warning"
 msgstr "未加密信件警告"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
-msgstr "<qt> <p>錯誤：後端沒有傳回編碼過的資料。</p> <p>請回報錯誤：<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
+msgstr ""
+"<qt> <p>錯誤：後端沒有傳回編碼過的資料。</p> <p>請回報錯誤：<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
-msgstr "<qt>不是所有的字元都符合所選擇的編碼方式。<br><br>確定要送出信件嗎？</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
+msgstr ""
+"<qt>不是所有的字元都符合所選擇的編碼方式。<br><br>確定要送出信件嗎？</qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 msgid "Some Characters Will Be Lost"
 msgstr "一些字元將會遺失"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr "遺失字元"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Change Encoding"
 msgstr "改變編碼"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 #, fuzzy
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr "因為後端似乎不支援簽署功能，所以這封信件沒有辦法簽署。請回報錯誤。"
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr "因為後端似乎不支援簽署功能，所以這封信件沒有辦法簽署。請回報錯誤。"
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "簽署動作的 GnuPG 稽核紀錄"
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "簽署失敗。請確定 gpg-agent 正在執行中。"
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr "因為後端似乎不支援加密功能，所以這封信件沒有辦法加密。請回報錯誤。"
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "加密動作的 GnuPG 稽核紀錄"
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
-msgstr "因為後端似乎不支援簽署同時加密功能，所以這封信件沒有辦法簽署與加密。請回報錯誤。"
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
+msgstr ""
+"因為後端似乎不支援簽署同時加密功能，所以這封信件沒有辦法簽署與加密。請回報錯"
+"誤。"
 
 #: newfolderdialog.cpp:59
 msgid "New Folder"
@@ -10480,13 +10575,14 @@ msgstr "信箱格式(&F)："
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
-"請選擇在這個資料夾中要用什麼格式儲存信件。您可以選擇每封信一個檔案（maildir 格式）或是把所有信件存成一個大檔（mbox 格式）。KMail 預設會使用 "
-"maildir，如果您不是很瞭解這是在幹嘛，就請不要修改此選項。"
+"請選擇在這個資料夾中要用什麼格式儲存信件。您可以選擇每封信一個檔案（maildir "
+"格式）或是把所有信件存成一個大檔（mbox 格式）。KMail 預設會使用 maildir，如果"
+"您不是很瞭解這是在幹嘛，就請不要修改此選項。"
 
 #: newfolderdialog.cpp:124
 msgid "Folder &contains:"
@@ -10495,9 +10591,11 @@ msgstr "資料夾包含(&C)："
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
-msgstr "請選擇您要讓這個資料夾儲存信件還是行事曆與便條等。預設是儲存信件。如果您不是很瞭解這是在幹嘛，就請不要修改此選項。"
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
+msgstr ""
+"請選擇您要讓這個資料夾儲存信件還是行事曆與便條等。預設是儲存信件。如果您不是"
+"很瞭解這是在幹嘛，就請不要修改此選項。"
 
 #: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
@@ -10535,8 +10633,7 @@ msgstr "簽章檢查結果不同"
 msgid "The crypto engine returned no cleartext data."
 msgstr "加密程式不會回覆明碼資料。"
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "狀態："
 
@@ -10565,8 +10662,8 @@ msgstr "找不到外掛程式 %1。"
 #: objecttreeparser.cpp:704
 #, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "信件已簽署，但無法確認簽章的合法信。<br> 原因：%1"
 
 #: objecttreeparser.cpp:737
@@ -10601,23 +10698,25 @@ msgstr "加密外掛程式 %1 無法解密信件。"
 
 #: objecttreeparser.cpp:1000
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>注意：</b>這封信件包含了要從遠端下載的連結圖片等。為了安全性與私密性的考量，這些遠端連結都沒有下載。如果您確信您可以下載這些連結不會發生問題，您可以<"
-"a href=\"kmail:loadExternal\">按這裡</a>來下載。"
+"<b>注意：</b>這封信件包含了要從遠端下載的連結圖片等。為了安全性與私密性的考"
+"量，這些遠端連結都沒有下載。如果您確信您可以下載這些連結不會發生問題，您可以"
+"<a href=\"kmail:loadExternal\">按這裡</a>來下載。"
 
 #: objecttreeparser.cpp:1010
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>注意：</b>這是一封 HTML 信件。因為安全考量，目前只顯示 HTML 原始碼。如果您確信來源沒有問題，您可以<a "
-"href=\"kmail:showHTML\">按這裡</a>來顯示 HTML 格式的郵件。"
+"<b>注意：</b>這是一封 HTML 信件。因為安全考量，目前只顯示 HTML 原始碼。如果您"
+"確信來源沒有問題，您可以<a href=\"kmail:showHTML\">按這裡</a>來顯示 HTML 格式"
+"的郵件。"
 
 #: objecttreeparser.cpp:1227
 msgid ""
@@ -10856,9 +10955,11 @@ msgstr "保存："
 
 #: objecttreeparser.cpp:2513
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
-msgstr "寄件者用於簽署的電子郵件地址沒有保存在 %1，因此我們無法與寄件者的地址 %2 做比較。"
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
+msgstr ""
+"寄件者用於簽署的電子郵件地址沒有保存在 %1，因此我們無法與寄件者的地址 %2 做比"
+"較。"
 
 #: objecttreeparser.cpp:2536
 #, c-format
@@ -10973,12 +11074,14 @@ msgstr "Kioslave 錯誤訊息"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
-"您的 POP3 伺服器（帳號：%1）不支援 UIDL 命令：這個命令用於決定 KMail 已經檢查過伺服器上哪些信件。\n"
+"您的 POP3 伺服器（帳號：%1）不支援 UIDL 命令：這個命令用於決定 KMail 已經檢查"
+"過伺服器上哪些信件。\n"
 "因此「將信件保留在伺服器上」的功能有可能無法正常運作。"
 
 #: popaccount.cpp:752
@@ -10995,8 +11098,11 @@ msgstr "從 %1 讀取 %n 封信件。結束傳輸..."
 
 #: popaccount.cpp:905
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
-msgstr "傳送 %5@%6 的信件中... 已傳送 %1 封（%3 KB），共 %2 封（%4 KB，伺服器上共有 %7 KB）。"
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
+msgstr ""
+"傳送 %5@%6 的信件中... 已傳送 %1 封（%3 KB），共 %2 封（%4 KB，伺服器上共有 "
+"%7 KB）。"
 
 #: popaccount.cpp:912
 msgid "Fetching message %1 of %2 (%3 of %4 KB) for %5@%6."
@@ -11012,1737 +11118,15 @@ msgstr "伺服器的回應無效"
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
-msgstr "您的信件主機不支援 TOP 指令。因此，在下載大信件前，將無法預先取得大信件的標頭。"
-
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "執行(&G)"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "資料夾(&O)"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "信件(&M)"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "特殊回應"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "轉寄(&F)"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "HTML 工具列"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "簽署"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "自動簽署信件(&A)"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr "這個選項被勾選之後，所有您送出的信件都會自動簽署。當然，您也可以針對個別信件將這個功能關閉。"
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "加密"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr "加密電子郵件時，總是使用我自己身份的憑證來加密(&Y)"
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr "這個選項勾選之後，信件不只會用收件者的公開金鑰加密，也會用您自己的公開金鑰加密。您自己稍後可以自行解密。我們通常都建議這樣做。"
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "信件發送前顯示簽署過或加密過的內容(&I)"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-"這個選項被勾選之後，系統會在信件送出前，先在另一個視窗讓您檢視簽署過或加密過後的內容。如果您要檢視您加密的系統是否運作良好，您可以選擇使用此選項。"
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "保存加密過後的已送出信件(&P)"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "勾選這個選項，您可以儲存加密過後的信件。"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>儲存加密過後的信件</h1>\n"
-"這個選項被勾選之後，寄件備份中的信件會保持加密。我們不建議這樣做，因為如果憑證過期之後，您將再也無法檢視您送出過的內容。\n"
-"<p>\n"
-"但是，有可能您的管理員會要求您這樣做。如果不確定，請與您的系統管理員聯絡。\n"
-"</qt>"
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "每次都確認使用的加密金鑰(&F)"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-"這個選項被勾選之後，系統在每次您要加密時，都會顯示清單讓您選擇要使用的公開金鑰。反之，則系統只會在它找不到正確的金鑰，或者是有多重選擇的時候才會要求您選擇。"
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "可能的話，自動加密信件(&M)"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr "這個選項被勾選的話，每次要送出信件時，只要能加密系統都會幫您加密。當然，您也可以針對個別信件將這個功能關閉。"
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "儲存到草稿匣的時候不做簽署或加密。(&V)"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr "這是怎麼運作的？"
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "收件者："
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "副本："
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, no-c-format
-msgid "Universal"
-msgstr "通用"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, no-c-format
-msgid "Reply"
-msgstr "回覆"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, no-c-format
-msgid "Reply to All"
-msgstr "全部回覆"
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, no-c-format
-msgid "Forward"
-msgstr "轉寄"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, no-c-format
-msgid "Shortc&ut:"
-msgstr "快捷鍵(&U)："
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr "樣本型態(&T)："
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, no-c-format
-msgid "Folder Properties"
-msgstr "資料夾內容"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "資料夾存放一個郵件論壇(&M)"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, no-c-format
-msgid "List &address:"
-msgstr "論壇地址(&A)："
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, no-c-format
-msgid "N&ormal:"
-msgstr "正常(&O)："
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, no-c-format
-msgid "Unr&ead:"
-msgstr "未讀(&E)："
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, no-c-format
-msgid "Message Expiring"
-msgstr "舊信件期滿"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, no-c-format
-msgid "E&xpire after:"
-msgstr "信件逾期時間(&X)："
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, no-c-format
-msgid "Expire &read messages"
-msgstr "將已讀信件設為過期(&R)"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, no-c-format
-msgid "Expire a&fter:"
-msgstr "信件逾期時間(&F)："
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, no-c-format
-msgid "Expire &unread messages"
-msgstr "將未讀信件設為過期(&U)"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "天"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "週"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "月"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, no-c-format
-msgid "Advanced"
-msgstr "進階"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, no-c-format
-msgid "Sender identit&y:"
-msgstr "寄件者身份(&Y)："
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, no-c-format
-msgid "&Storage format:"
-msgstr "儲存格式(&S)："
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr "論壇顯示(&L)："
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr "使用 CRL 確認憑證"
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr "選擇此選項的話，S/MIME 憑證會使用 CRL 來確認。"
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr "線上確認憑證 (OCSP)"
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr "選擇此選項的話，S/MIME 憑證會使用 OSCP 來做線上確認。請在底下輸入 OSCP 的 URL。"
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, no-c-format
-msgid "Online Certificate Validation"
-msgstr "線上確認憑證"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr "OSCP URL："
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr "請在此輸入 OSCP 伺服器的位址。通常是用 http://。"
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, no-c-format
-msgid "OCSP responder signature:"
-msgstr "OSCP 簽章："
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "忽略憑證服務 URL"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, no-c-format
-msgid "Do not check certificate policies"
-msgstr "不要檢查憑證原則"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr "預設 GnuPG 使用 ~/.gnupg/policies.txt 來檢查憑證原則。選擇這個選項的話就不做檢查。"
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr "不使用 CRL"
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr "勾選此選項的話，就不使用 CRL 來確認 S/MIME 憑證。"
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "取得消失的發行者憑證(issuer certificate)"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr "勾選此選項的話，消失的發行者憑證只要能找到就會抓取（包括 CRL 與 OSCP）。"
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr "HTTP 要求"
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr "不要執行 HTTP 要求"
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr "S/MIME 中完全不使用 HTTP"
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr "HTTP 使用這個 proxy"
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr "使用系統指定的 HTTP proxy"
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr "如果選擇這個選項，會使用右邊的 HTTP proxy（系統設定值）。"
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr "請在這裡輸入 HTTP proxy 的位址。語法為主機：埠號，例如 myproxy.nowhere.com:3128"
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "忽略憑證中的 HTTP CRL 發布點 (CRL distribution point)"
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。如果選擇此選項的話，使用 HTTP "
-"會忽略此設定，不會依據此設定去找 CRL DP。"
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr "LDAP 要求"
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr "不要執行 LDAP 要求"
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr "在 S/MIME 中完全不使用 LDAP。"
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "忽略憑證中的 LDAP CRL 發布點(distribution point)"
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。如果選擇此選項的話，使用 LDAP "
-"會忽略此設定，不會依據此設定去找 CRL DP。"
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr "LDAP 的主要主機："
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-"請在這裡輸入 LDAP 伺服器，所有的 LDAP 要求都會先送到該伺服器。這個設定也會忽略所有 LDAP URL 中指定的主機與埠號，若 LDAP URL "
-"中沒有指定主機與埠號的話也會送到此伺服器。除非無法連到這個伺服器，才會考慮其他的 LDAP 伺服器。 "
-"語法是「主機」或「主機：埠號」。如果沒有寫埠號的話，預設使用 389（預設的 LDAP 埠號）。"
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr "新增片段"
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, no-c-format
-msgid "&Add"
-msgstr "新增(&A)"
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr "片段(&S)："
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, no-c-format
-msgid "Group:"
-msgstr "群組："
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, no-c-format
-msgid "Snippet Settings"
-msgstr "片段設定"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr "工具提示"
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr "在工具提示中顯示片段文字(&T)"
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr "決定是否要顯示工具提示，裡面為書籤中的文字"
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr "變數"
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr "變數輸入法"
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr "片段中的每個變數都使用單一對話框"
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr "每個片段中的變數都會顯示一個輸入對話框"
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr "片段中的所有變數都使用同一個對話框"
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr "當您輸入片段中的變數值時，每個變數都顯示一個對話框"
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, no-c-format
-msgid "Delimiter:"
-msgstr "分隔符："
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "樣本設定"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, no-c-format
-msgid "Reply to Sender"
-msgstr "回覆寄件者"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr "全部回覆/回覆到清單中"
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, no-c-format
-msgid "Forward Message"
-msgstr "轉寄信件"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "送出未簽署信件時提出警告(&U)"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "勾選此選項，在送出未簽署信件時提出警告"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>送出未簽署信件時提出警告</h1>\n"
-"勾選此選項的話，送出部份或全部未簽署的信件時會提出警告。\n"
-"<p>\n"
-"建議使用此選項。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "送出未加密信件時提出警告(&W)"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "勾選此選項，在送出未加密信件時提出警告。"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>送出未加密信件時提出警告</h1>\n"
-"這個選項被勾選的話，在送出未加密信件前會提出警告。\n"
-"<p>\n"
-"建議您使用此選項。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "憑證中沒有收件者的電子郵件地址時提出警告(&R)"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr "勾選此選項，在憑證中沒有收件者的電子郵件信箱時會提出警告。"
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>如果憑證內沒有收件者的電子郵件地址則提出警告</h1>\n"
-"這個選項被勾選的話，在加密憑證中找不到收件者的電子郵件地址時會提出警告。"
-"<p>\n"
-"建議您使用此選項。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "憑證或金鑰即將到期時提出警告（於下方設定）"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, no-c-format
-msgid "For signing"
-msgstr "用來簽名"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, no-c-format
-msgid "For encryption"
-msgstr "用於加密"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " 天"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "在這裡選擇天數"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>簽署憑證逾期警告</h1>\n"
-"選擇簽署憑證在幾天後逾期時提出警告。\n"
-"<p>\n"
-"SPHINX 設定建議為十四天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>加密憑證逾期警告</h1>\n"
-"選擇加密憑證在幾天內逾期時提出警告。\n"
-"<p>\n"
-"SPHINX 設定建議為十四天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>憑證鍊中的憑證逾期前提出警告</h1>\n"
-"您可以設定在憑證鍊中的任一憑證在幾天後可能逾期時提出警告。\n"
-"<p>\n"
-"SPHINX 設定的建議為十四天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<h1>CA 憑證逾期警告</h1>\n"
-"選擇 CA 憑證在幾天後逾期時提出警告。\n"
-"<p>\n"
-"SPHINX 設定建議為十四天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
-"<qt>\n"
-"<h1>根憑證逾期警告</h1>\n"
-"選擇根憑證在幾天後逾期時提出警告。\n"
-"<p>\n"
-"SPHINX 設定建議為十四天。\n"
-"</qt>"
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, no-c-format
-msgid "For root certificates:"
-msgstr "用於根憑證："
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "用於中介 CA 憑證："
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "用於使用者端憑證或金鑰："
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr "把所有「不要再問我」的警告通通再打開"
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, no-c-format
-msgid "Template content"
-msgstr "樣本內容"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr "樣本快捷鍵"
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr "樣本型態"
+"您的信件主機不支援 TOP 指令。因此，在下載大信件前，將無法預先取得大信件的標"
+"頭。"
 
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr "檢查郵件時送出佇列中的信件"
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr "<qt> <p>如果您不要信件自動送出，或是要 KMail 在檢查信件時順便把寄件匣中的信件順便送出，就選擇此選項。</p></qt>"
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr "權限不足時自動將未同步的信件移到其他資料夾"
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr "若是在某資料夾中還有新的信件尚未上傳到伺服器，而您的權限似乎沒辦法上傳，則這些信件將會自動移到 lost+found 資料夾中。"
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr "在唯讀資料夾中允許使用本地旗標"
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-"這個設定值是讓管理者設定兩次郵件檢查之間的最小時間間隔。\n"
-"使用者不能選擇一個比此值還小的時間間隔。"
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr "最近選擇的資料夾"
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr "忽略使用者設定的 umask，儲存檔案時將權限直接設定為只有使用者可讀寫"
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr "系統閘中的顯示原則"
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr "當主視窗關閉時順便關閉此應用程式，即使系統匣圖示仍存在。"
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, no-c-format
-msgid "Verbose new mail notification"
-msgstr "詳細新信件通知"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr "這個選項打開的話，在新信寄達通知中會顯示有幾封新信件。不然您就只會看到「有新信件來了」的通知。"
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "指定編輯器(&D)："
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "使用外部編輯器取代內建編輯功能(&X)"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr "當資料夾的容量接近多少的時候警告使用者。"
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr "打開群組功能"
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr "在回覆回信時 Mangle From/To headers"
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使用 Outlook "
-"的使用者收不到您的回覆，請試著打開這個選項。"
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr "在信件主體中送出群組邀請函"
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使用 Outlook "
-"的使用者收不到您的邀請函，請試著打開這個選項。"
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "與 Exchange 相容的邀請函命名"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-"Microsoft Outlook 在與 Microsoft Exchange 伺服器一起使用時，會有個關於解讀群組電子郵件的問題。開啟此選項則會以 "
-"Microsoft Exchange 瞭解的方式來送出群組邀請函。"
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-"勾選這個選項的話，會自動送出邀請函，使用者不會看到信件編輯視窗。如果您要在送出之前先看到信件內容，您可以取消這個選項。不過信件內容會使用 iCalendar "
-"語法，請不要去修改它。"
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr "回覆後刪除邀請信函"
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr "勾選此項目的話，已接收的邀請信函會在回覆成功送出後移到資源回收桶。"
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-"<p>打開這個選項，您可以儲存 Kontact 應用程式（如 KOrganizer，KAddressBook 與 KNotes）中的內容。</p> "
-"<p>如果您要設定這個選項，您也必須設定這些應用程式使用 IMAP 資源。您可以在 TDE 控制中心裡設定。</p>"
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr "<p>通常您不會需要看到 IMAP 資源的資料夾。不過如果您堅持要看的話，可以在這裡設定。</p>"
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-"<p>如果儲存群組資訊的帳號不會用來管理一般郵件，則設定此選項讓 KMail 只顯示群組資料夾。若是您透過上線式 IMAP "
-"帳號管理一般郵件的話，這個選項會很有用。</p>"
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-"<p>請選擇群組資料夾的儲存格式。 "
-"<ul> "
-"<li>預設格式是用 ical（日曆資料夾）及 vcard（通訊錄資料夾）。這讓您可以使用 Kontact 的功能。</li> "
-"<li>另外 Kolab XML 格式使用另外一種模式，比較接近 Outlook。這個格式與 Outlook 較為相容。</li></ul></p>"
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr "<p>這裡選擇 IMAP 資源資料夾的母資料夾。</p> <p>Kolab 伺服器預設使用 IMAP 的收件匣為母資料夾。</p>"
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr "<p>這裡設定此 IMAP 資源資料夾的帳號代碼。</p>"
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-"<p>您可以將 IMAP 儲存資料夾的語言設定為您自己使用的語言。</p> "
-"<p>請注意，通常這樣做的目的只是為了跟 Microsoft Outlook 相容，但是您就不能再更換語言。</p> "
-"<p>除非必要，請不要設定。</p>"
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr "同時過濾在群組資料夾中收到的新郵件。"
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr "上線後將離線式 IMAP 資料夾做的群組變更立即同步。"
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr "這個值用來決定要不要顯示 KMail 介紹。"
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr "一個主機最大連接數"
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr "這可以用於設定檢查新郵件時每個主機最多可以幾個連結。預設是 0，也就是不限制。"
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr "顯示快速搜尋工具列"
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr "這個選項決定要不要在信件上方顯示搜尋工具列。"
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr "若不使用的話，隱藏本地端信箱"
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr "預設以內含方式轉寄。"
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr "在信件編輯器中允許使用分號（;）做為分隔符。"
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr "當回覆或轉寄時使用原本的字元集"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "自動附上簽名(&U)"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"記住這個身份，可以用於以後發信時。\n"
-"        "
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr "記住這個資料夾，以後發信時可以使用。"
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr "記住這個發送信件帳號，以後發信時可以使用。"
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, fuzzy, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-"記住這個身份，可以用於以後發信時。\n"
-"        "
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "自動換行在欄位(&W)："
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "收件者編輯器最大行數"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr "開啟這個選項，讓 Outlook 可以成功辨識含非英文字元的附加檔名。"
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr "自動要求信件處理通知(&M)"
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>開啟這個選項，KMail 會將您送出的信件都附上回覆信件處理通知的要求。</p>"
-"<p>您可以針對個別信件關掉此選項。</p></qt>"
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "自動補上最近使用的位置"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr "如果您不要讓系統自動補上最近使用的位址，就關掉這個選項。"
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "自動儲存間隔："
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr "在編寫新信時，系統會自動儲存備份。您可以設定要多久儲存一次。要關掉這個功能，請設定為 0。"
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr "將簽名插入在引言文字之前"
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "使用 Re: 取代已辨認的前置文字(&X)"
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "使用 Fwd: 取代已辨認的前置文字(&F)"
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "使用智慧引言功能(&Q)"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "簽章已經過期。"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr "位址選擇型態"
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr "設定選擇收件人、複本與密件複本的對話框型態"
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, no-c-format
-msgid "Type of recipients editor"
-msgstr "收件者編輯器型態"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr "設定選擇收件人、複本與密件複本的編輯器型態"
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "收件者編輯器最大行數"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr "用於除去被內含轉寄信件的部件型態清單。"
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr "信件中允許的附檔大小，單位為 MB。"
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr "在信件編輯器內顯示文字片段管理與插入面板。"
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr "即使加密成功也顯示 GnuPG 稽核紀錄。"
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr "當回覆或轉寄時使用原本的字元集"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-"有些信件，特別是那些自動產生的信件，不會指定使用的字元集。這種狀況下，系統會使用您所設定的「最後的字元集」。您可以將它設定為在您那裡人們最常使用的字元集。預設的"
-"是您的系統所使用的字元集。"
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr "改變這個選項不使用「自動」的話，系統會不管信件中的指示，使用您所設定的字元集。"
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr "如果您要在信件中使用圖示表情符號，您可以打開這個選項。"
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr "如果您要顯示出不同的引言層次，請打開這個選項。"
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "自動折疊層次："
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "引言字型變小"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "這個選項會讓引言使用較小的字型。"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "保存加密過後的已送出信件(&P)"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "使用花俏格式顯示使用者代理程式(&P)"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr "開啟此選項可以用花俏格式顯示使用者代理程式（User-Agent）與 X-Mailer 欄位。"
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr "允許刪除現存郵件的附加檔。"
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr "允許編輯現存郵件的附加檔。"
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr "檢視信件時總是自動解密，還是要在解密前必須先詢問"
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr "不設定寄件者而送出信件處理通知"
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr "送出信件處理通知時，將寄件者欄位清空。有些伺服器會拒絕這樣的信件處理通知，所以如果您在送出通知時遇到問題，試著將這個選項關閉。"
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr "片語已被轉換至樣本"
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr "舊片語已被轉換至樣本"
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, no-c-format
-msgid "Message template for new message"
-msgstr "新信件的樣本"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr "回覆信件的樣本"
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr "全部回覆信件的樣本"
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr "轉寄信件的樣本"
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, no-c-format
-msgid "Quote characters"
-msgstr "加入引言符號"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr "允許使用者變更「不在辦公室」的設定"
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr "允許使用者上傳「不在辦公室」的文稿，但不允許變更任何設定，如要回應的網域或是垃圾信件的處理等等。"
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr "只對此網域來的信件送出「不在辦公室」的回應。"
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr "允許對標記為垃圾信件的信件送出「不在辦公室」的回應。"
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
-msgstr "啟動 KMail 時檢查是否有設定「不在辦公室」的自動回覆。"
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
+msgstr "已使用 %2 %3 中的 %1。"
 
 #: recipientseditor.cpp:104
 msgid "BCC"
@@ -12847,6 +11231,11 @@ msgstr "新增成複本"
 msgid "Add as BCC"
 msgstr "新增成密件複本"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "取消(&A)"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12862,10 +11251,10 @@ msgstr "已選擇的收件者"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr "您選擇的 %n 個收件者，但最大只能容納 %1 個收件者。請修改。"
 
 #: redirectdialog.cpp:57
@@ -12882,8 +11271,8 @@ msgstr "使用選擇位址的對話框"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr "這個按鍵會另外開啟一個對話框，讓您選擇收件者的地址。"
 
 #: redirectdialog.cpp:116
@@ -12986,11 +11375,22 @@ msgstr "大於或等於"
 msgid " bytes"
 msgstr " 位元組"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " 天"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
-msgstr "要執行搜尋，所有資料夾 %1 內的信件都必須從伺服器上下載下來。這可能會花一些時間，您確定要繼續嗎？"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
+msgstr ""
+"要執行搜尋，所有資料夾 %1 內的信件都必須從伺服器上下載下來。這可能會花一些時"
+"間，您確定要繼續嗎？"
 
 #: searchjob.cpp:257
 msgid "Continue Search"
@@ -13126,16 +11526,12 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"收集帳號 %1 的資料中...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "收集帳號 %1 的資料中...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -13154,10 +11550,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"過濾器 %1 的內容：\n"
+msgid "Contents of script '%1':\n"
+msgstr "過濾器 %1 的內容：\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13180,20 +11574,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"過濾器容量：\n"
+msgid "Sieve capabilities:\n"
+msgstr "過濾器容量：\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "（沒有特定的容量）"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"可用的過濾器：\n"
+msgid "Available Sieve scripts:\n"
+msgstr "可用的過濾器：\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -13269,9 +11659,10 @@ msgstr "這個欄位可以輸入您要使用的簽名檔。"
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
-msgstr "這裡可以指定您要使用的簽名檔。每次開啟新信件或附加簽名時就會去讀取這個檔案。"
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
+msgstr ""
+"這裡可以指定您要使用的簽名檔。每次開啟新信件或附加簽名時就會去讀取這個檔案。"
 
 #: signatureconfigurator.cpp:126
 msgid "S&pecify file:"
@@ -13287,19 +11678,25 @@ msgstr "在文字編輯器中開啟這個檔案。"
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
-"您可以在這裡指定命令，並請注意命令是否在您所設定的執行路徑上。每次編寫新信件時，系統都會執行此命令，並將其送至標準輸出的內容做為簽名檔。通常這可以搭配 "
+"您可以在這裡指定命令，並請注意命令是否在您所設定的執行路徑上。每次編寫新信件"
+"時，系統都會執行此命令，並將其送至標準輸出的內容做為簽名檔。通常這可以搭配 "
 "fortune 或 ksig-random 等小程式使用。"
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "指定命令(&P)："
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "路徑"
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "新的資料："
@@ -13333,6 +11730,11 @@ msgstr "新增群組"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>您確定要移除此群組以及它的所有片段嗎？</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "回覆給(&T)："
+
 #: snippetwidget.cpp:242
 msgid "Edit Snippet"
 msgstr "編輯片段"
@@ -13345,6 +11747,10 @@ msgstr "編輯群組"
 msgid "Edit &group..."
 msgstr "編輯群組(&G)..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 msgid "&Edit..."
 msgstr "編輯(&E)..."
@@ -13381,10 +11787,12 @@ msgstr "開啟此項目將輸入的值儲存為此變數的預設值"
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
-msgstr "如果開啟此選項，則輸入的會儲存為預設值。稍後使用同一個變數時，預設使用此值，即使是在不同的片段中。"
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
+msgstr ""
+"如果開啟此選項，則輸入的會儲存為預設值。稍後使用同一個變數時，預設使用此值，"
+"即使是在不同的片段中。"
 
 #: snippetwidget.cpp:802
 msgid "Enter the replacement values for %1:"
@@ -13419,6 +11827,16 @@ msgstr "不要"
 msgid "Cannot insert content from file %1: %2"
 msgstr "無法從檔案 %1 插入內容：%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "收件者："
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "副本："
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13448,49 +11866,45 @@ msgstr "無法從樣本開啟管線命令：%1"
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> "
-"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
-"<p>在此指定的樣本以儲存資料夾為主。若額外指定也可以覆寫全域樣本及每個身份個別指定的樣本。</p></qt>"
+"<qt><p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> <p>信件樣本支"
+"援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> <p>在此指定的樣本"
+"以儲存資料夾為主。若額外指定也可以覆寫全域樣本及每個身份個別指定的樣本。</"
+"p></qt>"
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> "
-"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
-"<p>在此指定的樣本以個別身份為主。這些樣本會覆寫全域樣本，若額外指定也可以覆寫資料夾中的樣本。</p></qt>"
+"<qt><p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> <p>信件樣本支"
+"援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> <p>在此指定的樣本"
+"以個別身份為主。這些樣本會覆寫全域樣本，若額外指定也可以覆寫資料夾中的樣本。"
+"</p></qt>"
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> "
-"<p>信件樣本支援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> "
-"<p>在此指定的樣本以全域（預設）樣本為主。若額外指定，則會被每個身份個別指定的樣本及資料夾中的樣本覆寫。</p></qt>"
+"<qt><p>您可以在此建立用於編寫、回覆與轉寄信件時的信件樣本。</p> <p>信件樣本支"
+"援替代指令，只要輸入或從選單中選取<i>插入指令</i>即可。</p> <p>在此指定的樣本"
+"以全域（預設）樣本為主。若額外指定，則會被每個身份個別指定的樣本及資料夾中的"
+"樣本覆寫。</p></qt>"
 
 #: templatesconfiguration.cpp:343
 msgid ""
@@ -13742,6 +12156,10 @@ msgstr "將目前信件本文透過管線將結果插入"
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "將目前信件本文透過管線並以結果取代"
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "設定游標位置"
@@ -13774,101 +12192,6 @@ msgstr "開啟除錯"
 msgid "Turn Debug Off"
 msgstr "關閉除錯"
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-"<p>您可以用右鍵跟左鍵來到下一封或前一封信嗎？</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"<p>您可以用<em>工具->建立過濾器</em>來建立過濾規則嗎？</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>您可以利用<em>重寫標頭</em>過濾功能，\n"
-"來將郵件論壇的名稱從信件主題上丟掉嗎？\n"
-"只要"
-"<pre>重寫標頭 Subject，將 &quot;\\s*\\[mailing list name\\]\\s*&quot; 換成 "
-"&quot;&quot;</pre>即可。\n"
-"</p>\n"
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-"<p>您可以用<em>郵件論壇管理員</em>來將資料夾與郵件論壇建立關聯嗎？\n"
-"您可以用「信件->張貼到信件論壇」功能來編寫新信，郵件地址會自動填入。\n"
-"或者是您也可以在資料夾上按滑鼠中鍵即可。</p>\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>您可以指定每個資料夾的小圖示嗎？\n"
-"請看<em>資料夾內容</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-"<p>Kmail 可以對不同型態的信件（如純文字、HTML、OpenPGP 等）用不同顏色的光棒嗎？</p>\n"
-"<p>有些 HTML 信件中會含有假的 KMail 簽名確認狀態，使用這個功能可以清楚知道信件是不是經過確認。</p>\n"
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>您可以在過濾規則中只輸入標頭名稱就可以進行過濾嗎？</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>您可以用以下的規則過濾只有 HTML 的文件嗎？\n"
-"<pre>&quot;Content-type&quot; 含有 &quot;text/html&quot;</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-"<p>回信的時候，只有被選擇的部份才會被引入信件嗎？</p>\n"
-"<p>若是都沒有選擇的話，整封信都會被引入。</p>\n"
-" "
-"<p>甚至使用直列式附件也可以這樣做。</p>\n"
-"<p>除非您選擇<em>不要引言回覆</em>。</p>\n"
-"<p align=\"right\"><em>由 David F. Newman 提供</em></p>\n"
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "沒有可以復原的動作可作！"
@@ -13932,6 +12255,15 @@ msgstr "附件 #%1 （未命名）"
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "對此動作顯示 GnuPG 稽核紀錄"
 
+#: util.h:208
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "檔案 %1 已存在，您是否要取代它？"
+
+#: util.h:210
+msgid "Overwrite File?"
+msgstr "覆蓋檔案？"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14047,12 +12379,12 @@ msgstr "每封信件都附上圖片(&S)"
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
-"如果您要讓 KMail 在使用這個身份發信時加入一個 X-Face 標頭，您就勾選這個選項。X-Face 是一個 48x48 "
-"像素，黑白的圖片，可以讓收信軟體顯示。"
+"如果您要讓 KMail 在使用這個身份發信時加入一個 X-Face 標頭，您就勾選這個選項。"
+"X-Face 是一個 48x48 像素，黑白的圖片，可以讓收信軟體顯示。"
 
 #: xfaceconfigurator.cpp:100
 msgid "This is a preview of the picture selected/entered below."
@@ -14080,10 +12412,12 @@ msgstr "選擇檔案..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
-msgstr "選擇您要產生圖片的圖像檔。這個檔案最好是高反差，並且是接近方形的。如果背景較亮更好。"
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
+msgstr ""
+"選擇您要產生圖片的圖像檔。這個檔案最好是高反差，並且是接近方形的。如果背景較"
+"亮更好。"
 
 #: xfaceconfigurator.cpp:156
 msgid "Set From Address Book"
@@ -14091,17 +12425,18 @@ msgstr "從通訊錄中設定"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr "您可以用您設定在通訊錄中的圖片的縮小版。"
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
-"<qt>KMail 可以在每封信中附上一個 48x48 像素，低畫質，黑白的圖片。例如這可以是您的標誌。如果收件者使用的收信軟體有支援的話，就會顯示在上面。"
+"<qt>KMail 可以在每封信中附上一個 48x48 像素，低畫質，黑白的圖片。例如這可以是"
+"您的標誌。如果收件者使用的收信軟體有支援的話，就會顯示在上面。"
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14109,12 +12444,11 @@ msgstr "在這個欄位輸入 X-Face 字串。"
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
-"範例在<a "
-"href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</"
-"a>。"
+"範例在<a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/"
+"~ace/X-Faces/</a>。"
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
 msgid "No picture set for your address book entry."
@@ -14129,128 +12463,1664 @@ msgstr "沒有圖案"
 msgid "You do not have your own contact defined in the address book."
 msgstr "您在通訊錄中沒有聯絡人。"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
-msgstr "<qt><b>%1</b><br>總計：%2<br>未讀：%3<br>大小：%4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "簽署"
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
-msgstr "<br>容量限制：%1"
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "自動簽署信件(&A)"
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "設定信件主題。"
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
+msgstr ""
+"這個選項被勾選之後，所有您送出的信件都會自動簽署。當然，您也可以針對個別信件"
+"將這個功能關閉。"
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "傳送複本至 'address'。"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "加密"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "傳送密件複本至 'address'。"
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
+msgstr "加密電子郵件時，總是使用我自己身份的憑證來加密(&Y)"
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "將'header'加入信件"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
+"這個選項勾選之後，信件不只會用收件者的公開金鑰加密，也會用您自己的公開金鑰加"
+"密。您自己稍後可以自行解密。我們通常都建議這樣做。"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "從'file'讀取信件內文。"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "信件發送前顯示簽署過或加密過的內容(&I)"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "設定信件內文。"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
+"這個選項被勾選之後，系統會在信件送出前，先在另一個視窗讓您檢視簽署過或加密過"
+"後的內容。如果您要檢視您加密的系統是否運作良好，您可以選擇使用此選項。"
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "增加信件附件，這可以重複。"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "保存加密過後的已送出信件(&P)"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "只檢查新信件。"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "勾選這個選項，您可以儲存加密過後的信件。"
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "只開啟編寫器視窗。"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>儲存加密過後的信件</h1>\n"
+"這個選項被勾選之後，寄件備份中的信件會保持加密。我們不建議這樣做，因為如果憑"
+"證過期之後，您將再也無法檢視您送出過的內容。\n"
+"<p>\n"
+"但是，有可能您的管理員會要求您這樣做。如果不確定，請與您的系統管理員聯絡。\n"
+"</qt>"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "顯示指定的信件檔案"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "每次都確認使用的加密金鑰(&F)"
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
-msgstr "將信件送到'address'，並附上'URL'指向的檔案。"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
+"這個選項被勾選之後，系統在每次您要加密時，都會顯示清單讓您選擇要使用的公開金"
+"鑰。反之，則系統只會在它找不到正確的金鑰，或者是有多重選擇的時候才會要求您選"
+"擇。"
 
-#: kmsearchpattern.h:221
-msgid "Read"
-msgstr "已讀"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "可能的話，自動加密信件(&M)"
 
-#: kmsearchpattern.h:222
-msgid "Old"
-msgstr "舊信件"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
+"這個選項被勾選的話，每次要送出信件時，只要能加密系統都會幫您加密。當然，您也"
+"可以針對個別信件將這個功能關閉。"
 
-#: kmsearchpattern.h:223
-msgid "Deleted"
-msgstr "已刪除"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "儲存到草稿匣的時候不做簽署或加密。(&V)"
 
-#: kmsearchpattern.h:224
-msgid "Replied"
-msgstr "已回覆"
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
+msgstr "這是怎麼運作的？"
 
-#: kmsearchpattern.h:225
-msgid "Forwarded"
-msgstr "已轉寄"
+#: customtemplates_base.ui:234
+#, no-c-format
+msgid "Universal"
+msgstr "通用"
 
-#: kmsearchpattern.h:226
-msgid "Queued"
-msgstr "佇列"
+#: customtemplates_base.ui:239
+#, no-c-format
+msgid "Reply"
+msgstr "回覆"
 
-#: kmsearchpattern.h:227
-msgid "Sent"
-msgstr "已傳送"
+#: customtemplates_base.ui:244
+#, no-c-format
+msgid "Reply to All"
+msgstr "全部回覆"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
-msgstr "監測中"
+#: customtemplates_base.ui:249
+#, no-c-format
+msgid "Forward"
+msgstr "轉寄"
 
-#: kmsearchpattern.h:229
-msgid "Ignored"
-msgstr "忽略"
+#: customtemplates_base.ui:261
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr "快捷鍵(&U)："
 
-#: kmsearchpattern.h:230
-msgid "Spam"
-msgstr "垃圾信"
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
+msgstr "樣本型態(&T)："
 
-#: kmsearchpattern.h:231
-msgid "Ham"
-msgstr "正常信"
+#: customtemplates_kfg.kcfg:12
+#, no-c-format
+msgid "Template content"
+msgstr "樣本內容"
 
-#: kmsearchpattern.h:232
-msgid "To Do"
-msgstr "待辦"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr "樣本快捷鍵"
 
-#: kmsearchpattern.h:234
-msgid "Has Attachment"
-msgstr "含附件"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr "樣本型態"
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
-msgstr "已使用 %2 %3 中的 %1。"
+#: folderpropertiesdialog.ui:16
+#, no-c-format
+msgid "Folder Properties"
+msgstr "資料夾內容"
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
-msgstr "路徑"
+#: folderpropertiesdialog.ui:63
+#, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "資料夾存放一個郵件論壇(&M)"
 
-#: util.h:208
+#: folderpropertiesdialog.ui:91
+#, no-c-format
+msgid "List &address:"
+msgstr "論壇地址(&A)："
+
+#: folderpropertiesdialog.ui:122
+#, no-c-format
+msgid "N&ormal:"
+msgstr "正常(&O)："
+
+#: folderpropertiesdialog.ui:215
+#, no-c-format
+msgid "Unr&ead:"
+msgstr "未讀(&E)："
+
+#: folderpropertiesdialog.ui:269
+#, no-c-format
+msgid "Message Expiring"
+msgstr "舊信件期滿"
+
+#: folderpropertiesdialog.ui:283
+#, no-c-format
+msgid "E&xpire after:"
+msgstr "信件逾期時間(&X)："
+
+#: folderpropertiesdialog.ui:311
+#, no-c-format
+msgid "Expire &read messages"
+msgstr "將已讀信件設為過期(&R)"
+
+#: folderpropertiesdialog.ui:339
+#, no-c-format
+msgid "Expire a&fter:"
+msgstr "信件逾期時間(&F)："
+
+#: folderpropertiesdialog.ui:350
+#, no-c-format
+msgid "Expire &unread messages"
+msgstr "將未讀信件設為過期(&U)"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "天"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "週"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "月"
+
+#: folderpropertiesdialog.ui:451
+#, no-c-format
+msgid "Advanced"
+msgstr "進階"
+
+#: folderpropertiesdialog.ui:462
+#, no-c-format
+msgid "Sender identit&y:"
+msgstr "寄件者身份(&Y)："
+
+#: folderpropertiesdialog.ui:483
+#, no-c-format
+msgid "&Storage format:"
+msgstr "儲存格式(&S)："
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
+msgstr "論壇顯示(&L)："
+
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr "檢查郵件時送出佇列中的信件"
+
+#: kmail.kcfg:62
+#, no-c-format
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "檔案 %1 已存在，您是否要取代它？"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
+msgstr ""
+"<qt> <p>如果您不要信件自動送出，或是要 KMail 在檢查信件時順便把寄件匣中的信件"
+"順便送出，就選擇此選項。</p></qt>"
 
-#: util.h:210
-msgid "Overwrite File?"
-msgstr "覆蓋檔案？"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
+msgstr "權限不足時自動將未同步的信件移到其他資料夾"
+
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
+"若是在某資料夾中還有新的信件尚未上傳到伺服器，而您的權限似乎沒辦法上傳，則這"
+"些信件將會自動移到 lost+found 資料夾中。"
+
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr "在唯讀資料夾中允許使用本地旗標"
+
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
+msgstr ""
+"這個設定值是讓管理者設定兩次郵件檢查之間的最小時間間隔。\n"
+"使用者不能選擇一個比此值還小的時間間隔。"
+
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
+msgstr "最近選擇的資料夾"
+
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr "忽略使用者設定的 umask，儲存檔案時將權限直接設定為只有使用者可讀寫"
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr "系統閘中的顯示原則"
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr "當主視窗關閉時順便關閉此應用程式，即使系統匣圖示仍存在。"
+
+#: kmail.kcfg:121
+#, no-c-format
+msgid "Verbose new mail notification"
+msgstr "詳細新信件通知"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+"這個選項打開的話，在新信寄達通知中會顯示有幾封新信件。不然您就只會看到「有新"
+"信件來了」的通知。"
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "指定編輯器(&D)："
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "使用外部編輯器取代內建編輯功能(&X)"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr "當資料夾的容量接近多少的時候警告使用者。"
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr "打開群組功能"
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr "在回覆回信時 Mangle From/To headers"
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使"
+"用 Outlook 的使用者收不到您的回覆，請試著打開這個選項。"
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr "在信件主體中送出群組邀請函"
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+"在 Microsoft Outlook 中，關於 iCalendar 標準的實作中有許多缺點。如果有任何使"
+"用 Outlook 的使用者收不到您的邀請函，請試著打開這個選項。"
+
+#: kmail.kcfg:184
+#, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "與 Exchange 相容的邀請函命名"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+"Microsoft Outlook 在與 Microsoft Exchange 伺服器一起使用時，會有個關於解讀群"
+"組電子郵件的問題。開啟此選項則會以 Microsoft Exchange 瞭解的方式來送出群組邀"
+"請函。"
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+"勾選這個選項的話，會自動送出邀請函，使用者不會看到信件編輯視窗。如果您要在送"
+"出之前先看到信件內容，您可以取消這個選項。不過信件內容會使用 iCalendar 語法，"
+"請不要去修改它。"
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr "回覆後刪除邀請信函"
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr "勾選此項目的話，已接收的邀請信函會在回覆成功送出後移到資源回收桶。"
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+"<p>打開這個選項，您可以儲存 Kontact 應用程式（如 KOrganizer，KAddressBook 與 "
+"KNotes）中的內容。</p> <p>如果您要設定這個選項，您也必須設定這些應用程式使用 "
+"IMAP 資源。您可以在 TDE 控制中心裡設定。</p>"
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+"<p>通常您不會需要看到 IMAP 資源的資料夾。不過如果您堅持要看的話，可以在這裡設"
+"定。</p>"
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+"<p>如果儲存群組資訊的帳號不會用來管理一般郵件，則設定此選項讓 KMail 只顯示群"
+"組資料夾。若是您透過上線式 IMAP 帳號管理一般郵件的話，這個選項會很有用。</p>"
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+"<p>請選擇群組資料夾的儲存格式。 <ul> <li>預設格式是用 ical（日曆資料夾）及 "
+"vcard（通訊錄資料夾）。這讓您可以使用 Kontact 的功能。</li> <li>另外 Kolab "
+"XML 格式使用另外一種模式，比較接近 Outlook。這個格式與 Outlook 較為相容。</"
+"li></ul></p>"
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+"<p>這裡選擇 IMAP 資源資料夾的母資料夾。</p> <p>Kolab 伺服器預設使用 IMAP 的收"
+"件匣為母資料夾。</p>"
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr "<p>這裡設定此 IMAP 資源資料夾的帳號代碼。</p>"
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+"<p>您可以將 IMAP 儲存資料夾的語言設定為您自己使用的語言。</p> <p>請注意，通常"
+"這樣做的目的只是為了跟 Microsoft Outlook 相容，但是您就不能再更換語言。</p> "
+"<p>除非必要，請不要設定。</p>"
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr "同時過濾在群組資料夾中收到的新郵件。"
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr "上線後將離線式 IMAP 資料夾做的群組變更立即同步。"
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr "這個值用來決定要不要顯示 KMail 介紹。"
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr "一個主機最大連接數"
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+"這可以用於設定檢查新郵件時每個主機最多可以幾個連結。預設是 0，也就是不限制。"
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr "顯示快速搜尋工具列"
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr "這個選項決定要不要在信件上方顯示搜尋工具列。"
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr "若不使用的話，隱藏本地端信箱"
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr "預設以內含方式轉寄。"
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr "在信件編輯器中允許使用分號（;）做為分隔符。"
+
+#: kmail.kcfg:328
+#, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "當回覆或轉寄時使用原本的字元集"
+
+#: kmail.kcfg:332
+#, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "自動附上簽名(&U)"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"記住這個身份，可以用於以後發信時。\n"
+"        "
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr "記住這個資料夾，以後發信時可以使用。"
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr "記住這個發送信件帳號，以後發信時可以使用。"
+
+#: kmail.kcfg:349
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+"記住這個身份，可以用於以後發信時。\n"
+"        "
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "自動換行在欄位(&W)："
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "收件者編輯器最大行數"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr "開啟這個選項，讓 Outlook 可以成功辨識含非英文字元的附加檔名。"
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr "自動要求信件處理通知(&M)"
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+"<qt><p>開啟這個選項，KMail 會將您送出的信件都附上回覆信件處理通知的要求。</"
+"p><p>您可以針對個別信件關掉此選項。</p></qt>"
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "自動補上最近使用的位置"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr "如果您不要讓系統自動補上最近使用的位址，就關掉這個選項。"
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "自動儲存間隔："
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+"在編寫新信時，系統會自動儲存備份。您可以設定要多久儲存一次。要關掉這個功能，"
+"請設定為 0。"
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr "將簽名插入在引言文字之前"
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "使用 Re: 取代已辨認的前置文字(&X)"
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "使用 Fwd: 取代已辨認的前置文字(&F)"
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "使用智慧引言功能(&Q)"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "簽章已經過期。"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr "位址選擇型態"
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr "設定選擇收件人、複本與密件複本的對話框型態"
+
+#: kmail.kcfg:489
+#, no-c-format
+msgid "Type of recipients editor"
+msgstr "收件者編輯器型態"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr "設定選擇收件人、複本與密件複本的編輯器型態"
+
+#: kmail.kcfg:506
+#, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "收件者編輯器最大行數"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr "用於除去被內含轉寄信件的部件型態清單。"
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr "信件中允許的附檔大小，單位為 MB。"
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr "在信件編輯器內顯示文字片段管理與插入面板。"
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr "即使加密成功也顯示 GnuPG 稽核紀錄。"
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "當回覆或轉寄時使用原本的字元集"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+"有些信件，特別是那些自動產生的信件，不會指定使用的字元集。這種狀況下，系統會"
+"使用您所設定的「最後的字元集」。您可以將它設定為在您那裡人們最常使用的字元"
+"集。預設的是您的系統所使用的字元集。"
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+"改變這個選項不使用「自動」的話，系統會不管信件中的指示，使用您所設定的字元"
+"集。"
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr "如果您要在信件中使用圖示表情符號，您可以打開這個選項。"
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr "如果您要顯示出不同的引言層次，請打開這個選項。"
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "自動折疊層次："
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "引言字型變小"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "這個選項會讓引言使用較小的字型。"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "保存加密過後的已送出信件(&P)"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "使用花俏格式顯示使用者代理程式(&P)"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+"開啟此選項可以用花俏格式顯示使用者代理程式（User-Agent）與 X-Mailer 欄位。"
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr "允許刪除現存郵件的附加檔。"
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr "允許編輯現存郵件的附加檔。"
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr "檢視信件時總是自動解密，還是要在解密前必須先詢問"
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr "不設定寄件者而送出信件處理通知"
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+"送出信件處理通知時，將寄件者欄位清空。有些伺服器會拒絕這樣的信件處理通知，所"
+"以如果您在送出通知時遇到問題，試著將這個選項關閉。"
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr "片語已被轉換至樣本"
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr "舊片語已被轉換至樣本"
+
+#: kmail.kcfg:659
+#, no-c-format
+msgid "Message template for new message"
+msgstr "新信件的樣本"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr "回覆信件的樣本"
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr "全部回覆信件的樣本"
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr "轉寄信件的樣本"
+
+#: kmail.kcfg:679
+#, no-c-format
+msgid "Quote characters"
+msgstr "加入引言符號"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr "允許使用者變更「不在辦公室」的設定"
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+"允許使用者上傳「不在辦公室」的文稿，但不允許變更任何設定，如要回應的網域或是"
+"垃圾信件的處理等等。"
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr "只對此網域來的信件送出「不在辦公室」的回應。"
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr "允許對標記為垃圾信件的信件送出「不在辦公室」的回應。"
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr "啟動 KMail 時檢查是否有設定「不在辦公室」的自動回覆。"
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "編輯檔案(&F)"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "編輯(&E)..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "執行(&G)"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "資料夾(&O)"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "信件(&M)"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "特殊回應"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "轉寄(&F)"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "工具提示"
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "片段設定"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "HTML 工具列"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "一般選項"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "HTML 工具列"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr "使用 CRL 確認憑證"
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr "選擇此選項的話，S/MIME 憑證會使用 CRL 來確認。"
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr "線上確認憑證 (OCSP)"
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+"選擇此選項的話，S/MIME 憑證會使用 OSCP 來做線上確認。請在底下輸入 OSCP 的 "
+"URL。"
+
+#: smimeconfiguration.ui:49
+#, no-c-format
+msgid "Online Certificate Validation"
+msgstr "線上確認憑證"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr "OSCP URL："
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr "請在此輸入 OSCP 伺服器的位址。通常是用 http://。"
+
+#: smimeconfiguration.ui:94
+#, no-c-format
+msgid "OCSP responder signature:"
+msgstr "OSCP 簽章："
+
+#: smimeconfiguration.ui:126
+#, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "忽略憑證服務 URL"
+
+#: smimeconfiguration.ui:136
+#, no-c-format
+msgid "Do not check certificate policies"
+msgstr "不要檢查憑證原則"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+"預設 GnuPG 使用 ~/.gnupg/policies.txt 來檢查憑證原則。選擇這個選項的話就不做"
+"檢查。"
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr "不使用 CRL"
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr "勾選此選項的話，就不使用 CRL 來確認 S/MIME 憑證。"
+
+#: smimeconfiguration.ui:158
+#, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "取得消失的發行者憑證(issuer certificate)"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+"勾選此選項的話，消失的發行者憑證只要能找到就會抓取（包括 CRL 與 OSCP）。"
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr "HTTP 要求"
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr "不要執行 HTTP 要求"
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr "S/MIME 中完全不使用 HTTP"
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr "HTTP 使用這個 proxy"
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr "使用系統指定的 HTTP proxy"
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr "如果選擇這個選項，會使用右邊的 HTTP proxy（系統設定值）。"
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+"請在這裡輸入 HTTP proxy 的位址。語法為主機：埠號，例如 myproxy.nowhere."
+"com:3128"
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr "忽略憑證中的 HTTP CRL 發布點 (CRL distribution point)"
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。"
+"如果選擇此選項的話，使用 HTTP 會忽略此設定，不會依據此設定去找 CRL DP。"
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr "LDAP 要求"
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr "不要執行 LDAP 要求"
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr "在 S/MIME 中完全不使用 LDAP。"
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr "忽略憑證中的 LDAP CRL 發布點(distribution point)"
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+"在尋找 CRL 位址時，憑證裡通常會有所謂的 CRL 發布點 (CRL Distribution Point)。"
+"如果選擇此選項的話，使用 LDAP 會忽略此設定，不會依據此設定去找 CRL DP。"
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr "LDAP 的主要主機："
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+"請在這裡輸入 LDAP 伺服器，所有的 LDAP 要求都會先送到該伺服器。這個設定也會忽"
+"略所有 LDAP URL 中指定的主機與埠號，若 LDAP URL 中沒有指定主機與埠號的話也會"
+"送到此伺服器。除非無法連到這個伺服器，才會考慮其他的 LDAP 伺服器。 語法是「主"
+"機」或「主機：埠號」。如果沒有寫埠號的話，預設使用 389（預設的 LDAP 埠號）。"
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr "新增片段"
+
+#: snippetdlgbase.ui:52
+#, no-c-format
+msgid "&Add"
+msgstr "新增(&A)"
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr "片段(&S)："
+
+#: snippetdlgbase.ui:125
+#, no-c-format
+msgid "Group:"
+msgstr "群組："
+
+#: snippetsettingsbase.ui:16
+#, no-c-format
+msgid "Snippet Settings"
+msgstr "片段設定"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr "工具提示"
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr "在工具提示中顯示片段文字(&T)"
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr "決定是否要顯示工具提示，裡面為書籤中的文字"
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr "變數"
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr "變數輸入法"
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr "片段中的每個變數都使用單一對話框"
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr "每個片段中的變數都會顯示一個輸入對話框"
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr "片段中的所有變數都使用同一個對話框"
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr "當您輸入片段中的變數值時，每個變數都顯示一個對話框"
+
+#: snippetsettingsbase.ui:137
+#, no-c-format
+msgid "Delimiter:"
+msgstr "分隔符："
+
+#: templatesconfiguration_base.ui:30
+#, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "樣本設定"
+
+#: templatesconfiguration_base.ui:129
+#, no-c-format
+msgid "Reply to Sender"
+msgstr "回覆寄件者"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr "全部回覆/回覆到清單中"
+
+#: templatesconfiguration_base.ui:215
+#, no-c-format
+msgid "Forward Message"
+msgstr "轉寄信件"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "送出未簽署信件時提出警告(&U)"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "勾選此選項，在送出未簽署信件時提出警告"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>送出未簽署信件時提出警告</h1>\n"
+"勾選此選項的話，送出部份或全部未簽署的信件時會提出警告。\n"
+"<p>\n"
+"建議使用此選項。\n"
+"</qt>"
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "送出未加密信件時提出警告(&W)"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "勾選此選項，在送出未加密信件時提出警告。"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>送出未加密信件時提出警告</h1>\n"
+"這個選項被勾選的話，在送出未加密信件前會提出警告。\n"
+"<p>\n"
+"建議您使用此選項。\n"
+"</qt>"
+
+#: warningconfiguration.ui:68
+#, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "憑證中沒有收件者的電子郵件地址時提出警告(&R)"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr "勾選此選項，在憑證中沒有收件者的電子郵件信箱時會提出警告。"
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>如果憑證內沒有收件者的電子郵件地址則提出警告</h1>\n"
+"這個選項被勾選的話，在加密憑證中找不到收件者的電子郵件地址時會提出警告。<p>\n"
+"建議您使用此選項。\n"
+"</qt>"
+
+#: warningconfiguration.ui:90
+#, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "憑證或金鑰即將到期時提出警告（於下方設定）"
+
+#: warningconfiguration.ui:104
+#, no-c-format
+msgid "For signing"
+msgstr "用來簽名"
+
+#: warningconfiguration.ui:115
+#, no-c-format
+msgid "For encryption"
+msgstr "用於加密"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "在這裡選擇天數"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>簽署憑證逾期警告</h1>\n"
+"選擇簽署憑證在幾天後逾期時提出警告。\n"
+"<p>\n"
+"SPHINX 設定建議為十四天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>加密憑證逾期警告</h1>\n"
+"選擇加密憑證在幾天內逾期時提出警告。\n"
+"<p>\n"
+"SPHINX 設定建議為十四天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>憑證鍊中的憑證逾期前提出警告</h1>\n"
+"您可以設定在憑證鍊中的任一憑證在幾天後可能逾期時提出警告。\n"
+"<p>\n"
+"SPHINX 設定的建議為十四天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>CA 憑證逾期警告</h1>\n"
+"選擇 CA 憑證在幾天後逾期時提出警告。\n"
+"<p>\n"
+"SPHINX 設定建議為十四天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<h1>根憑證逾期警告</h1>\n"
+"選擇根憑證在幾天後逾期時提出警告。\n"
+"<p>\n"
+"SPHINX 設定建議為十四天。\n"
+"</qt>"
+
+#: warningconfiguration.ui:294
+#, no-c-format
+msgid "For root certificates:"
+msgstr "用於根憑證："
+
+#: warningconfiguration.ui:305
+#, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "用於中介 CA 憑證："
+
+#: warningconfiguration.ui:316
+#, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "用於使用者端憑證或金鑰："
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr "把所有「不要再問我」的警告通通再打開"
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr "<p>您可以用右鍵跟左鍵來到下一封或前一封信嗎？</p>\n"
+
+#: tips:10
+msgid ""
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr "<p>您可以用<em>工具->建立過濾器</em>來建立過濾規則嗎？</p>\n"
+
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>您可以利用<em>重寫標頭</em>過濾功能，\n"
+"來將郵件論壇的名稱從信件主題上丟掉嗎？\n"
+"只要<pre>重寫標頭 Subject，將 &quot;\\s*\\[mailing list name\\]\\s*&quot; 換"
+"成 &quot;&quot;</pre>即可。\n"
+"</p>\n"
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+"<p>您可以用<em>郵件論壇管理員</em>來將資料夾與郵件論壇建立關聯嗎？\n"
+"您可以用「信件->張貼到信件論壇」功能來編寫新信，郵件地址會自動填入。\n"
+"或者是您也可以在資料夾上按滑鼠中鍵即可。</p>\n"
+
+#: tips:39
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>您可以指定每個資料夾的小圖示嗎？\n"
+"請看<em>資料夾內容</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+"<p>Kmail 可以對不同型態的信件（如純文字、HTML、OpenPGP 等）用不同顏色的光棒"
+"嗎？</p>\n"
+"<p>有些 HTML 信件中會含有假的 KMail 簽名確認狀態，使用這個功能可以清楚知道信"
+"件是不是經過確認。</p>\n"
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr "<p>您可以在過濾規則中只輸入標頭名稱就可以進行過濾嗎？</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>您可以用以下的規則過濾只有 HTML 的文件嗎？\n"
+"<pre>&quot;Content-type&quot; 含有 &quot;text/html&quot;</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
+"<p>回信的時候，只有被選擇的部份才會被引入信件嗎？</p>\n"
+"<p>若是都沒有選擇的話，整封信都會被引入。</p>\n"
+" <p>甚至使用直列式附件也可以這樣做。</p>\n"
+"<p>除非您選擇<em>不要引言回覆</em>。</p>\n"
+"<p align=\"right\"><em>由 David F. Newman 提供</em></p>\n"
 
 #~ msgid "Show folder quick search field"
 #~ msgstr "顯示快速搜尋資料夾欄位"